diff options
author | Rodney Lorrimar <dev@rodney.id.au> | 2017-10-29 22:07:48 +0000 |
---|---|---|
committer | Domen Kožar <domen@enlambda.com> | 2017-10-30 18:23:45 +0100 |
commit | 9b0d50e3d0ff4a0ab783159c0efe6de9472fe7ed (patch) | |
tree | 8585dcc12fa37bd37c8938e6aca895b67ecbc0ff /pkgs/build-support/fetchbower/default.nix | |
parent | 0a5ecde8085122835a9c8ffa2025e8ccb49ddb14 (diff) | |
download | nixpkgs-9b0d50e3d0ff4a0ab783159c0efe6de9472fe7ed.tar nixpkgs-9b0d50e3d0ff4a0ab783159c0efe6de9472fe7ed.tar.gz nixpkgs-9b0d50e3d0ff4a0ab783159c0efe6de9472fe7ed.tar.bz2 nixpkgs-9b0d50e3d0ff4a0ab783159c0efe6de9472fe7ed.tar.lz nixpkgs-9b0d50e3d0ff4a0ab783159c0efe6de9472fe7ed.tar.xz nixpkgs-9b0d50e3d0ff4a0ab783159c0efe6de9472fe7ed.tar.zst nixpkgs-9b0d50e3d0ff4a0ab783159c0efe6de9472fe7ed.zip |
fetchbower: clean common uri characters from version string
Some bower.json files have URL dependencies missing a version. Fixes rvl/bower2nix#18
Diffstat (limited to 'pkgs/build-support/fetchbower/default.nix')
-rw-r--r-- | pkgs/build-support/fetchbower/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/build-support/fetchbower/default.nix b/pkgs/build-support/fetchbower/default.nix index dd0bac49cb6..3e1f0eff84a 100644 --- a/pkgs/build-support/fetchbower/default.nix +++ b/pkgs/build-support/fetchbower/default.nix @@ -4,13 +4,13 @@ let let components = lib.splitString "#" version; hash = lib.last components; - ver = if builtins.length components == 1 then version else hash; + ver = if builtins.length components == 1 then (cleanName version) else hash; in ver; - bowerName = name: lib.replaceStrings ["/"] ["-"] name; + cleanName = name: lib.replaceStrings ["/" ":"] ["-" "-"] name; fetchbower = name: version: target: outputHash: stdenv.mkDerivation { - name = "${bowerName name}-${bowerVersion version}"; + name = "${cleanName name}-${bowerVersion version}"; SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt"; buildCommand = '' fetch-bower --quiet --out=$PWD/out "${name}" "${target}" "${version}" |