From da450f6b1d4614ae6d060fa75e99eb5906f18b8d Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Thu, 17 Mar 2022 17:54:19 +0000 Subject: [PATCH] treewide: clean up obsolete version checks MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit These checks are all redundant with the check for Nix ≥2.2 in default.nix. --- pkgs/build-support/fetchipfs/default.nix | 2 -- pkgs/build-support/fetchurl/default.nix | 2 -- pkgs/build-support/nix-gitignore/default.nix | 6 ------ pkgs/top-level/all-packages.nix | 1 - 4 files changed, 11 deletions(-) diff --git a/pkgs/build-support/fetchipfs/default.nix b/pkgs/build-support/fetchipfs/default.nix index 7a66999ec569..0cbb094d6003 100644 --- a/pkgs/build-support/fetchipfs/default.nix +++ b/pkgs/build-support/fetchipfs/default.nix @@ -17,8 +17,6 @@ , preferLocalBuild ? true }: -assert sha512 != "" -> builtins.compareVersions "1.11" builtins.nixVersion <= 0; - let hasHash = (outputHash != "" && outputHashAlgo != "") diff --git a/pkgs/build-support/fetchurl/default.nix b/pkgs/build-support/fetchurl/default.nix index 776089dab999..dcab471fc839 100644 --- a/pkgs/build-support/fetchurl/default.nix +++ b/pkgs/build-support/fetchurl/default.nix @@ -100,8 +100,6 @@ in , nativeBuildInputs ? [ ] }: -assert sha512 != "" -> builtins.compareVersions "1.11" builtins.nixVersion <= 0; - let urls_ = if urls != [] && url == "" then diff --git a/pkgs/build-support/nix-gitignore/default.nix b/pkgs/build-support/nix-gitignore/default.nix index 497dcb0660b0..d55465302e44 100644 --- a/pkgs/build-support/nix-gitignore/default.nix +++ b/pkgs/build-support/nix-gitignore/default.nix @@ -12,11 +12,6 @@ with builtins; let debug = a: trace a a; last = l: elemAt l ((length l) - 1); - - throwIfOldNix = let required = "2.0"; in - if compareVersions nixVersion required == -1 - then throw "nix (v${nixVersion} =< v${required}) is too old for nix-gitignore" - else true; in rec { # [["good/relative/source/file" true] ["bad.tmpfile" false]] -> root -> path filterPattern = patterns: root: @@ -31,7 +26,6 @@ in rec { # string -> [[regex bool]] gitignoreToPatterns = gitignore: - assert throwIfOldNix; let # ignore -> bool isComment = i: (match "^(#.*|$)" i) != null; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5eadc4a2c85c..959422f326e6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -33779,7 +33779,6 @@ with pkgs; nix-repl = throw ( "nix-repl has been removed because it's not maintained anymore, " + - (lib.optionalString (!lib.versionAtLeast "2" (lib.versions.major builtins.nixVersion)) "ugrade your Nix installation to a newer version and ") + "use `nix repl` instead. Also see https://github.com/NixOS/nixpkgs/pull/44903" );