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: 346317b9fae0
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 915d2c3e69ca
Choose a head ref
  • 3 commits
  • 2 files changed
  • 1 contributor

Commits on Apr 25, 2020

  1. goocanvasmm2: fix update script attrPath 

    (cherry picked from commit 03c0ab3)
    @jtojnar
    jtojnar committed Apr 25, 2020
    Copy the full SHA
    189a0de View commit details

  2. 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.

(cherry picked from commit f544c29)
    @jtojnar
    jtojnar committed Apr 25, 2020
    Copy the full SHA
    eff0f82 View commit details

  3. gnome3.updateScript: optimize unfrozen updates 

    When the updates are not frozen, there is no need to try to extract versions from attributes.

(cherry picked from commit 4239bf1)
    @jtojnar
    jtojnar committed Apr 25, 2020
    Copy the full SHA
    915d2c3 View commit details
Showing with 3 additions and 2 deletions.
  1. +2 −2 pkgs/desktops/gnome-3/update.nix
  2. +1 −0 pkgs/development/libraries/goocanvasmm/default.nix
4 changes: 2 additions & 2 deletions pkgs/desktops/gnome-3/update.nix
View file
Original file line number Diff line number Diff line change
@@ -5,14 +5,14 @@ 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;
minorAvailable = builtins.length versionComponents > 1 && builtins.match "[0-9]+" minorVersion != null;
nextMinor = builtins.fromJSON minorVersion + 1;
upperBound = "${lib.versions.major packageVersion}.${builtins.toString nextMinor}";
in lib.optionalString (minorAvailable && freeze) ''--upper-bound="${upperBound}"'';
in lib.optionalString (freeze && minorAvailable) ''--upper-bound="${upperBound}"'';
updateScript = writeScript "gnome-update-script" ''
#!${stdenv.shell}
set -o errexit
1 change: 1 addition & 0 deletions pkgs/development/libraries/goocanvasmm/default.nix
View file
Original file line number Diff line number Diff line change
@@ -18,6 +18,7 @@ stdenv.mkDerivation rec {
passthru = {
updateScript = gnome3.updateScript {
packageName = pname;
attrPath = "goocanvasmm2";
};
};