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

Merge branch 'master' into staging

Browse Source
This commit is contained in:
obadz
2016-08-21 12:03:41 +01:00
parent 15b07f4b8e c2192c664a
commit 68936edfb3
39 changed files with 182 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/tools/filesystems/fuseiso/default.nix
View File

@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
name = "fuseiso-20070708";
src = fetchurl {
url = "http://sourceforge.net/projects/fuseiso/files/fuseiso/20070708/fuseiso-20070708.tar.bz2";
url = "mirror://sourceforge/project/fuseiso/fuseiso/20070708/fuseiso-20070708.tar.bz2";
sha1 = "fe142556ad35dd7e5dc31a16183232a6e2da7692";
};

2
pkgs/tools/networking/srelay/default.nix
View File

@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
name = "srelay-0.4.8b6";
src = fetchurl {
url = "https://sourceforge.net/projects/socks-relay/files/socks-relay/srelay-0.4.8/srelay-0.4.8b6.tar.gz";
url = "mirror://sourceforge/project/socks-relay/socks-relay/srelay-0.4.8/srelay-0.4.8b6.tar.gz";
sha256 = "1az9ds10hpmpw6bqk7fcd1w70001kz0mm48v3vgg2z6vrbmgn0qj";
};

2
pkgs/tools/security/gnupg/1compat.nix
View File

@@ -19,6 +19,6 @@ stdenv.mkDerivation {
'';
meta = {
platforms = stdenv.lib.platforms.linux;
platforms = stdenv.lib.platforms.unix;
};
}