nixpkgs mirror (for testing) github.com/NixOS/nixpkgs
nix
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge pull request #118530 from SuperSandro2000/fetchzip-urls

authored by

Sandro and committed by
GitHub
add1a1cd c53e14fb

+12 -9
+2 -2
pkgs/applications/editors/sublime/2/default.nix
··· 9 9 if stdenv.hostPlatform.system == "i686-linux" then 10 10 fetchurl { 11 11 name = "sublimetext-2.0.2.tar.bz2"; 12 - url = [ 12 + urls = [ 13 13 "http://c758482.r82.cf2.rackcdn.com/Sublime%20Text%202.0.2.tar.bz2" 14 14 "https://download.sublimetext.com/Sublime%20Text%202.0.2.tar.bz2" 15 15 ]; ··· 18 18 else 19 19 fetchurl { 20 20 name = "sublimetext-2.0.2.tar.bz2"; 21 - url = [ 21 + urls = [ 22 22 "http://c758482.r82.cf2.rackcdn.com/Sublime%20Text%202.0.2.tar.bz2" 23 23 "https://download.sublimetext.com/Sublime%20Text%202.0.2%20x64.tar.bz2" 24 24 ];
+7 -4
pkgs/build-support/fetchzip/default.nix
··· 5 5 # (e.g. due to minor changes in the compression algorithm, or changes 6 6 # in timestamps). 7 7 8 - { fetchurl, unzip }: 8 + { lib, fetchurl, unzip }: 9 9 10 10 { # Optionally move the contents of the unpacked tree up one level. 11 11 stripRoot ? true 12 - , url 12 + , url ? "" 13 + , urls ? [] 13 14 , extraPostFetch ? "" 14 15 , name ? "source" 15 16 , ... } @ args: 16 17 17 - (fetchurl ({ 18 + (fetchurl (let 19 + basename = baseNameOf (if url != "" then url else builtins.head urls); 20 + in { 18 21 inherit name; 19 22 20 23 recursiveHash = true; ··· 30 27 mkdir "$unpackDir" 31 28 cd "$unpackDir" 32 29 33 - renamed="$TMPDIR/${baseNameOf url}" 30 + renamed="$TMPDIR/${basename}" 34 31 mv "$downloadedFile" "$renamed" 35 32 unpackFile "$renamed" 36 33 ''
+1 -1
pkgs/data/fonts/paratype-pt/mono.nix
··· 3 3 fetchzip { 4 4 name = "paratype-pt-mono"; 5 5 6 - url = [ 6 + urls = [ 7 7 "https://company.paratype.com/system/attachments/631/original/ptmono.zip" 8 8 "http://rus.paratype.ru/system/attachments/631/original/ptmono.zip" 9 9 ];
+1 -1
pkgs/data/fonts/paratype-pt/sans.nix
··· 3 3 fetchzip { 4 4 name = "paratype-pt-sans"; 5 5 6 - url = [ 6 + urls = [ 7 7 "https://company.paratype.com/system/attachments/629/original/ptsans.zip" 8 8 "http://rus.paratype.ru/system/attachments/629/original/ptsans.zip" 9 9 ];
+1 -1
pkgs/data/fonts/paratype-pt/serif.nix
··· 3 3 fetchzip { 4 4 name = "paratype-pt-serif"; 5 5 6 - url = [ 6 + urls = [ 7 7 "https://company.paratype.com/system/attachments/634/original/ptserif.zip" 8 8 "http://rus.paratype.ru/system/attachments/634/original/ptserif.zip" 9 9 ];