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

Fix allowUnfreePredicate example following the introduction of pname. #72981

Merged
merged 1 commit into from Nov 9, 2019

Conversation

@Zimmi48
Copy link
Member

Zimmi48 commented Nov 7, 2019

Motivation for this change

The introduction of pname (making name optional) apparently broke the example code provided in the documentation (tested with package skype which only defines a pname and no name). This change fixes it. Note that if specifying a pname became compulsory, we could further simplify the example.

doc/using/configuration.xml Outdated Show resolved Hide resolved
…name

Co-Authored-By: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
@Zimmi48 Zimmi48 force-pushed the Zimmi48:fix-doc-allowUnfreePredicate branch from 690c93f to b9ac365 Nov 8, 2019
@Zimmi48

This comment has been minimized.

Copy link
Member Author

Zimmi48 commented Nov 8, 2019

Thanks for the suggestion @veprbl! Updated.

@bjornfor bjornfor merged commit eebdaa9 into NixOS:master Nov 9, 2019
12 checks passed
12 checks passed
Evaluation Performance Report Evaluator Performance Report
Details
grahamcofborg-eval ^.^!
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A darwin-tested
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release-combined.nix -A tested
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A manual
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A options
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A manual
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A tarball
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A unstable
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
@bjornfor

This comment has been minimized.

Copy link
Contributor

bjornfor commented Nov 9, 2019

Tip: if the PR needs a "motivation for this change" section, so does the commit message. 😊

@Zimmi48 Zimmi48 deleted the Zimmi48:fix-doc-allowUnfreePredicate branch Nov 9, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants
You can’t perform that action at this time.