Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

trilium: 0.40.7 -> 0.42.1 #86192

Merged
merged 2 commits into from May 7, 2020
Merged

trilium: 0.40.7 -> 0.42.1 #86192

merged 2 commits into from May 7, 2020

Conversation

@kampka
Copy link
Contributor

kampka commented Apr 28, 2020

Motivation for this change

We currently have two package names for the trilium desktop app, trilium and trilium-desktop, which feels like a sensible distinction as the server package trilium-server also exists.
With this change, we deprecate the original trilium package in favor of the more explicit naming scheme.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.
@kampka
Copy link
Contributor Author

kampka commented Apr 28, 2020

@GrahamcOfBorg build trilium-desktop
@GrahamcOfBorg build trilium-server
@GrahamcOfBorg test trilium-server

Copy link
Member

cole-h left a comment

I think the the deprecation and update should be done in two separate commits. trilium: deprecate for trilium-desktop and trilium-desktop: 0.40.7 -> 0.41.6 maybe?

EDIT: As noted below, since both packages are updated in tandem, trilium: 0.40.7 -> 0.41.6 is the correct commit message.

pkgs/top-level/all-packages.nix Outdated Show resolved Hide resolved
@kampka kampka force-pushed the kampka:trilium branch 2 times, most recently from 0023ad3 to 86cf1f9 Apr 29, 2020
@kampka
Copy link
Contributor Author

kampka commented Apr 29, 2020

I think the the deprecation and update should be done in two separate commits. trilium: deprecate for trilium-desktop and trilium-desktop: 0.40.7 -> 0.41.6 maybe?

I split the commits. As for the commit message: trilium is currently updated as one (server and desktop) as they are built from the same source release. I'd therefore opt to keep the generic trilium commit message name.

pkgs/top-level/aliases.nix Outdated Show resolved Hide resolved
@kampka kampka force-pushed the kampka:trilium branch from 86cf1f9 to 1911d26 Apr 29, 2020
@cole-h
cole-h approved these changes Apr 29, 2020
Copy link
Member

cole-h left a comment

Diff LGTM, builds fine, runs fine.

[6 built, 4 copied (0.7 MiB), 0.1 MiB DL]
https://github.com/NixOS/nixpkgs/pull/86192
2 packages built:
trilium-desktop trilium-server
kampka added 2 commits Apr 29, 2020
…-desktop
@kampka kampka force-pushed the kampka:trilium branch from 1911d26 to fb4cff3 May 7, 2020
@kampka kampka changed the title trilium: 0.40.7 -> 0.41.6 trilium: 0.40.7 -> 0.42.1 May 7, 2020
@kampka kampka requested a review from cole-h May 7, 2020
@kampka
Copy link
Contributor Author

kampka commented May 7, 2020

@GrahamcOfBorg build trilium-desktop
@GrahamcOfBorg build trilium-server
@GrahamcOfBorg test trilium-server

@Mic92
Copy link
Contributor

Mic92 commented May 7, 2020

Result of nixpkgs-review pr 86192 1

2 packages built:
- trilium-desktop
- trilium-server
@Mic92 Mic92 merged commit 8dba666 into NixOS:master May 7, 2020
20 checks passed
20 checks passed
trilium-desktop on aarch64-linux No attempt
Details
trilium-server on aarch64-linux No attempt
Details
Evaluation Performance Report Evaluator Performance Report
Details
grahamcofborg-eval ^.^!
Details
grahamcofborg-eval-check-maintainers matching changed paths to changed attrs...
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="fb4cff3"; rev="fb4cff356759230a3c0ada01dc73ed724b9ba881"; } ./pkgs/t
Details
grahamcofborg-eval-lib-tests nix-build --arg pkgs import ./. {} ./lib/tests/release.nix
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="fb4cff3"; rev="fb4cff356759230a3c0ada01dc73ed724b9ba881"; } ./nixos/
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="fb4cff3"; rev="fb4cff356759230a3c0ada01dc73ed724b9ba881"; } ./nixos/
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="fb4cff3"; rev="fb4cff356759230a3c0ada01dc73ed724b9ba881"; } ./nixos/
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="fb4cff3"; rev="fb4cff356759230a3c0ada01dc73ed724b9ba881"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="fb4cff3"; rev="fb4cff356759230a3c0ada01dc73ed724b9ba881"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="fb4cff3"; rev="fb4cff356759230a3c0ada01dc73ed724b9ba881"; } ./pkgs/t
Details
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
tests.trilium-server on aarch64-linux Success
Details
tests.trilium-server on x86_64-linux Success
Details
trilium-desktop on x86_64-linux Success
Details
trilium-server on x86_64-linux Success
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants
You can’t perform that action at this time.