public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into add-missing-licenses

Browse Source 
Conflicts:
	pkgs/applications/version-management/subversion/default.nix
This commit is contained in:
Pascal Wittmann
2018-08-09 13:10:27 +02:00
parent 8915ed06b3 1d4de0d552
commit af8cd3c74e
279 changed files with 12381 additions and 9643 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/data/misc/hackage/default.nix
View File

@@ -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";
}

18
pkgs/data/misc/iana-etc/default.nix
View File

@@ -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; {