diff options
Diffstat (limited to 'pkgs/build-support/fetchurl')
-rw-r--r-- | pkgs/build-support/fetchurl/default.nix | 5 | ||||
-rw-r--r-- | pkgs/build-support/fetchurl/mirrors.nix | 7 |
2 files changed, 8 insertions, 4 deletions
diff --git a/pkgs/build-support/fetchurl/default.nix b/pkgs/build-support/fetchurl/default.nix index 2e5fa9162926c..7ec831c61ac70 100644 --- a/pkgs/build-support/fetchurl/default.nix +++ b/pkgs/build-support/fetchurl/default.nix @@ -14,6 +14,7 @@ let mirrorsFile = buildPackages.stdenvNoCC.mkDerivation ({ name = "mirrors-list"; + strictDeps = true; builder = ./write-mirror-list.sh; preferLocalBuild = true; } // mirrors); @@ -105,8 +106,6 @@ in , nativeBuildInputs ? [ ] }: -assert sha512 != "" -> builtins.compareVersions "1.11" builtins.nixVersion <= 0; - let urls_ = if urls != [] && url == "" then @@ -174,5 +173,5 @@ stdenvNoCC.mkDerivation { ''; inherit meta; - inherit passthru; + passthru = { inherit url; } // passthru; } diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix index 954c88d1bafa2..3a765089bd2e2 100644 --- a/pkgs/build-support/fetchurl/mirrors.nix +++ b/pkgs/build-support/fetchurl/mirrors.nix @@ -18,6 +18,7 @@ # Apache apache = [ + "https://dlcdn.apache.org/" "https://www-eu.apache.org/dist/" "https://ftp.wayne.edu/apache/" "https://www.apache.org/dist/" @@ -164,6 +165,11 @@ "https://ftp.postgresql.org/pub/" ]; + # Qt + qt = [ + "https://download.qt.io/" + ]; + # Roy marples mirrors roy = [ "https://roy.marples.name/downloads/" @@ -317,7 +323,6 @@ "https://luarocks.org/" "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/" "https://luafr.org/moonrocks/" - "http://luarocks.logiceditor.com/rocks/" ]; # Python PyPI |