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

nixos/lorri: add package option #97314

Merged
merged 1 commit into from Sep 7, 2020
Merged

Conversation

@evanjs
Copy link
Member

@evanjs evanjs commented Sep 6, 2020

Motivation for this change

Sometimes I need lorri to track master for changes that have not yet made it into nixpkgs.
Previously, I did this by overriding src as shown here.
As of target/lorri#168 / target/lorri@0ccdfa7, this is no longer possible.

I did try to utilize overrideAttrs, but encountered issues simply setting the rev and etc., due to the nature of lorri's src.

Things done
  • Add a package option to the lorri module
  • Tested via nixos-rebuild switch -I nixpkgs=. (from a local nixpkgs clone)
@Profpatsch Profpatsch merged commit a317361 into NixOS:master Sep 7, 2020
17 checks passed
17 checks passed
tests tests
Details
action
Details
Evaluation Performance Report Evaluator Performance Report
Details
Wait for ofborg
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="f035a2f"; rev="f035a2fbc3eeb711e17af6e3bb2d42be50c465c8"; } ./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="f035a2f"; rev="f035a2fbc3eeb711e17af6e3bb2d42be50c465c8"; } ./nixos/
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="f035a2f"; rev="f035a2fbc3eeb711e17af6e3bb2d42be50c465c8"; } ./nixos/
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="f035a2f"; rev="f035a2fbc3eeb711e17af6e3bb2d42be50c465c8"; } ./nixos/
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="f035a2f"; rev="f035a2fbc3eeb711e17af6e3bb2d42be50c465c8"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="f035a2f"; rev="f035a2fbc3eeb711e17af6e3bb2d42be50c465c8"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="f035a2f"; rev="f035a2fbc3eeb711e17af6e3bb2d42be50c465c8"; } ./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
@evanjs evanjs deleted the evanjs:lorri/package-option branch Sep 7, 2020
evanjs added a commit to evanjs/nixos_cfg that referenced this pull request Sep 17, 2020
- Now that lorri provides a package option
  (NixOS/nixpkgs#97314), utilize this to set the
  package used by the service

- Note: this is disabled until we encounter a change that requires the master branch, etc.
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

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