summary refs log tree commit diff
diff options
context:
space:
mode:
authorJan Tojnar <jtojnar@gmail.com>2020-04-25 15:32:16 +0200
committerJan Tojnar <jtojnar@gmail.com>2020-04-25 15:32:20 +0200
commit4239bf17ec3c9a7583162dee93b2005dab956b77 (patch)
treecfdbed8e4d6f38a0fbca1846c303abd75cb93566
parentf544c293ecc59a2e7c7be2deabe5f1cb5b7c160b (diff)
downloadnixpkgs-4239bf17ec3c9a7583162dee93b2005dab956b77.tar
nixpkgs-4239bf17ec3c9a7583162dee93b2005dab956b77.tar.gz
nixpkgs-4239bf17ec3c9a7583162dee93b2005dab956b77.tar.bz2
nixpkgs-4239bf17ec3c9a7583162dee93b2005dab956b77.tar.lz
nixpkgs-4239bf17ec3c9a7583162dee93b2005dab956b77.tar.xz
nixpkgs-4239bf17ec3c9a7583162dee93b2005dab956b77.tar.zst
nixpkgs-4239bf17ec3c9a7583162dee93b2005dab956b77.zip
gnome3.updateScript: optimize unfrozen updates
When the updates are not frozen, there is no need to try to extract versions from attributes.
-rw-r--r--pkgs/desktops/gnome-3/update.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/desktops/gnome-3/update.nix b/pkgs/desktops/gnome-3/update.nix
index 506c265270c..1bceddf77eb 100644
--- a/pkgs/desktops/gnome-3/update.nix
+++ b/pkgs/desktops/gnome-3/update.nix
@@ -12,7 +12,7 @@ let
       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