Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 22133c6bf3cf
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: f544c293ecc5
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Apr 25, 2020

  1. gnome3.updateScript: fix tarball eval on nonexisting attrpaths 

    As reported in 974f11c#commitcomment-38735081,
the tarball will fail to evaluate when updateScript is given a non-existing attrPath because getAttrFromPath
uses abort, which terminates the evaluation.
    @jtojnar
    jtojnar committed Apr 25, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    vszakats Viktor Szakats
    GPG key ID: B5ABD165E2AEF201
    Verified
    Learn about vigilant mode
    Copy the full SHA
    f544c29 View commit details
Showing with 1 addition and 1 deletion.
  1. +1 −1 pkgs/desktops/gnome-3/update.nix
2 changes: 1 addition & 1 deletion pkgs/desktops/gnome-3/update.nix
View file
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@ let
python = python3.withPackages (p: [ p.requests ]);
upperBoundFlag =
let
package = lib.getAttrFromPath (lib.splitString "." attrPath) pkgs;
package = lib.attrByPath (lib.splitString "." attrPath) (throw "Cannot find attribute ‘${attrPath}’.") pkgs;
packageVersion = lib.getVersion package;
versionComponents = lib.versions.splitVersion packageVersion;
minorVersion = lib.versions.minor packageVersion;