diff options
| author | Pascal Wittmann <mail@pascal-wittmann.de> | 2018-08-09 13:10:27 +0200 |
|---|---|---|
| committer | Pascal Wittmann <mail@pascal-wittmann.de> | 2018-08-09 13:10:27 +0200 |
| commit | af8cd3c74e80ff532b17568039ecc4f143992813 (patch) | |
| tree | 58f3d9e423eec59b42a6a7533a094fabeeb17c12 /pkgs/data | |
| parent | 8915ed06b30f6d48d99d0d9d2bc713b40a8db063 (diff) | |
| parent | 1d4de0d552ae9aa66a5b8dee5fb0650a4372d148 (diff) | |
| download | nixlib-af8cd3c74e80ff532b17568039ecc4f143992813.tar nixlib-af8cd3c74e80ff532b17568039ecc4f143992813.tar.gz nixlib-af8cd3c74e80ff532b17568039ecc4f143992813.tar.bz2 nixlib-af8cd3c74e80ff532b17568039ecc4f143992813.tar.lz nixlib-af8cd3c74e80ff532b17568039ecc4f143992813.tar.xz nixlib-af8cd3c74e80ff532b17568039ecc4f143992813.tar.zst nixlib-af8cd3c74e80ff532b17568039ecc4f143992813.zip | |
Merge branch 'master' into add-missing-licenses
Conflicts: pkgs/applications/version-management/subversion/default.nix
Diffstat (limited to 'pkgs/data')
| -rw-r--r-- | pkgs/data/misc/hackage/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/data/misc/iana-etc/default.nix | 18 |
2 files changed, 11 insertions, 11 deletions
diff --git a/pkgs/data/misc/hackage/default.nix b/pkgs/data/misc/hackage/default.nix index a8af8f791a92..631597263482 100644 --- a/pkgs/data/misc/hackage/default.nix +++ b/pkgs/data/misc/hackage/default.nix @@ -1,6 +1,6 @@ { fetchurl }: fetchurl { - url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/92b4fe519b988dee70e2ef8f2f1d05edf610ba8a.tar.gz"; - sha256 = "15sh85v57k635q5ir8pwa605cchj12h4sflss8zd1xshy7ywi673"; + url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/ed2029405786768b4c0f8bdbbd7aee8193394eb9.tar.gz"; + sha256 = "0s6cbz7ylflpnqhxlpch48zb0l6xcp5501dj1qzvzldvwh46r8dc"; } diff --git a/pkgs/data/misc/iana-etc/default.nix b/pkgs/data/misc/iana-etc/default.nix index f3b9bf150e00..e6c33fc260e8 100644 --- a/pkgs/data/misc/iana-etc/default.nix +++ b/pkgs/data/misc/iana-etc/default.nix @@ -1,16 +1,16 @@ -{stdenv, fetchurl}: +{ stdenv, fetchzip }: -stdenv.mkDerivation rec { - name = "iana-etc-${version}"; +let version = "20180711"; +in fetchzip { + name = "iana-etc-${version}"; - src = fetchurl { - url = "https://github.com/Mic92/iana-etc/releases/download/${version}/iana-etc-${version}.tar.gz"; - sha256 = "0xigkz6pcqx55px7fap7j6p3hz27agv056crbl5pgfcdix7y8z26"; - }; + url = "https://github.com/Mic92/iana-etc/releases/download/${version}/iana-etc-${version}.tar.gz"; + sha256 = "0vbgk3paix2v4rlh90a8yh1l39s322awng06izqj44zcg704fjbj"; - installPhase = '' - install -D -t $out/etc services protocols + postFetch = '' + tar -xzvf $downloadedFile --strip-components=1 + install -D -m0644 -t $out/etc services protocols ''; meta = with stdenv.lib; { |