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

Merge remote-tracking branch 'upstream/master' into hardened-stdenv

Browse Source
This commit is contained in:
Robin Gloster 2016-02-07 14:44:27 +00:00
commit 9492e06315
18 changed files with 66 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/maintainers.nix
View File

@ -125,7 +125,7 @@
gfxmonk = "Tim Cuthbertson <tim@gfxmonk.net>"; gfxmonk = "Tim Cuthbertson <tim@gfxmonk.net>";
giogadi = "Luis G. Torres <lgtorres42@gmail.com>"; giogadi = "Luis G. Torres <lgtorres42@gmail.com>";
gleber = "Gleb Peregud <gleber.p@gmail.com>"; gleber = "Gleb Peregud <gleber.p@gmail.com>";
globin = "Robin Gloster <robin@glob.in>"; globin = "Robin Gloster <mail@glob.in>";
goibhniu = "Cillian de Róiste <cillian.deroiste@gmail.com>"; goibhniu = "Cillian de Róiste <cillian.deroiste@gmail.com>";
gridaphobe = "Eric Seidel <eric@seidel.io>"; gridaphobe = "Eric Seidel <eric@seidel.io>";
guibert = "David Guibert <david.guibert@gmail.com>"; guibert = "David Guibert <david.guibert@gmail.com>";

18
pkgs/applications/misc/sc-im/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, yacc, ncurses, libxml2 }: { stdenv, fetchFromGitHub, yacc, ncurses, libxml2 }:
let let
version = "0.2.1"; version = "0.2.1";
@ -7,9 +7,11 @@ stdenv.mkDerivation rec {
name = "sc-im-${version}"; name = "sc-im-${version}";
src = fetchurl { src = fetchFromGitHub {
url = "https://github.com/andmarti1424/sc-im/archive/v${version}.tar.gz"; owner = "andmarti1424";
sha256 = "08yks8grj5w434r81dy2knzbdhdnkc23r0d9v848mcl706xnjl6j"; repo = "sc-im";
rev = "v${version}";
sha256 = "0v6b8xksvd12vmz198vik2ranyr5mhnp85hl9yxh9svibs7jxsbb";
}; };
buildInputs = [ yacc ncurses libxml2 ]; buildInputs = [ yacc ncurses libxml2 ];
@ -28,12 +30,12 @@ stdenv.mkDerivation rec {
make install prefix= make install prefix=
''; '';
meta = { meta = with stdenv.lib; {
homepage = "https://github.com/andmarti1424/sc-im"; homepage = "https://github.com/andmarti1424/sc-im";
description = "SC-IM - Spreadsheet Calculator Improvised - SC fork"; description = "SC-IM - Spreadsheet Calculator Improvised - SC fork";
license = stdenv.lib.licenses.bsdOriginal; license = licenses.bsdOriginal;
maintainers = [ stdenv.lib.maintainers.matthiasbeyer ]; maintainers = [ maintainers.matthiasbeyer ];
platforms = with stdenv.lib.platforms; linux; # Cannot test others platforms = platforms.linux; # Cannot test others
}; };
} }

2
pkgs/applications/video/vlc/default.nix
View File

@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
version = "2.2.1"; version = "2.2.1";
src = fetchurl { src = fetchurl {
url = "http://download.videolan.org/vlc/${version}/${name}.tar.xz"; url = "http://get.videolan.org/vlc/${version}/${name}.tar.xz";
sha256 = "1jqzrzrpw6932lbkf863xk8cfmn4z2ngbxz7w8ggmh4f6xz9sgal"; sha256 = "1jqzrzrpw6932lbkf863xk8cfmn4z2ngbxz7w8ggmh4f6xz9sgal";
}; };

6
pkgs/data/fonts/powerline-fonts/default.nix
View File

@ -1,13 +1,13 @@
{ stdenv, fetchFromGitHub }: { stdenv, fetchFromGitHub }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "powerline-fonts-2015-06-29"; name = "powerline-fonts-2015-12-11";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "powerline"; owner = "powerline";
repo = "fonts"; repo = "fonts";
rev = "97dc451724fb24e1dd9892c988642b239b5dc67c"; rev = "a44abd0e742ad6e7fd8d8bc4c3cad5155c9f3a92";
sha256 = "1m0a8k916s74iv2k0kk36dz7d2hfb2zgf8m0b9hg71w4yd3bmj4w"; sha256 = "1pwz83yh28yd8aj6fbyfz8z3q3v67psszpd9mp4vv0ms9w8b5ajn";
}; };
buildPhase = "true"; buildPhase = "true";

21
pkgs/development/interpreters/bats/default.nix Normal file
View File

@ -0,0 +1,21 @@
{ stdenv, fetchzip }:
stdenv.mkDerivation rec {
name = "bats-${version}";
version = "0.4.0";
src = fetchzip {
url = "https://github.com/sstephenson/bats/archive/v${version}.tar.gz";
sha256 = "05xpvfm0xky1532i3hd2l3wznxzh99bv2hxgykwdpxh18h6jr6jm";
};
installPhase = "./install.sh $out";
meta = with stdenv.lib; {
homepage = https://github.com/sstephenson/bats;
description = "Bash Automated Testing System";
maintainers = [ maintainers.lnl7 ];
license = licenses.mit;
platforms = platforms.unix;
};
}

2
pkgs/development/libraries/libaacs/default.nix
View File

@ -15,7 +15,7 @@ stdenv.mkDerivation {
name = "${baseName}-${version}"; name = "${baseName}-${version}";
src = fetchurl { src = fetchurl {
url = "http://download.videolan.org/pub/videolan/${baseName}/${version}/${baseName}-${version}.tar.bz2"; url = "http://get.videolan.org/${baseName}/${version}/${baseName}-${version}.tar.bz2";
sha256 = "1s5v075hnbs57995r6lljm79wgrip3gnyf55a0y7bja75jh49hwm"; sha256 = "1s5v075hnbs57995r6lljm79wgrip3gnyf55a0y7bja75jh49hwm";
}; };

2
pkgs/development/libraries/libbdplus/default.nix
View File

@ -16,7 +16,7 @@ stdenv.mkDerivation {
name = "${baseName}-${version}"; name = "${baseName}-${version}";
src = fetchurl { src = fetchurl {
url = "http://download.videolan.org/pub/videolan/${baseName}/${version}/${baseName}-${version}.tar.bz2"; url = "http://get.videolan.org/${baseName}/${version}/${baseName}-${version}.tar.bz2";
sha256 = "02n87lysqn4kg2qk7d1ffrp96c44zkdlxdj0n16hbgrlrpiwlcd6"; sha256 = "02n87lysqn4kg2qk7d1ffrp96c44zkdlxdj0n16hbgrlrpiwlcd6";
}; };

2
pkgs/development/libraries/libbluray/default.nix
View File

@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
name = "${baseName}-${version}"; name = "${baseName}-${version}";
src = fetchurl { src = fetchurl {
url = "ftp://ftp.videolan.org/pub/videolan/${baseName}/${version}/${name}.tar.bz2"; url = "http://get.videolan.org/${baseName}/${version}/${name}.tar.bz2";
sha256 = "1sp71j4agcsg17g6b85cqz78pn5vknl5pl39rvr6mkib5ps99jgg"; sha256 = "1sp71j4agcsg17g6b85cqz78pn5vknl5pl39rvr6mkib5ps99jgg";
}; };

8
pkgs/development/libraries/libdvbpsi/default.nix
View File

@ -1,11 +1,11 @@
{stdenv, fetchurl}: {stdenv, fetchurl}:
stdenv.mkDerivation { stdenv.mkDerivation rec {
name = "libdvbpsi-${version}";
name = "libdvbpsi-0.2.2"; version = "0.2.2";
src = fetchurl { src = fetchurl {
url = http://download.videolan.org/pub/libdvbpsi/0.2.2/libdvbpsi-0.2.2.tar.bz2; url = "http://get.videolan.org/libdvbpsi/${version}/${name}.tar.bz2";
sha256 = "1lry2swxqm8mhq0a4rjnc819ngsf2pxnfjajb57lml7yr12j79ls"; sha256 = "1lry2swxqm8mhq0a4rjnc819ngsf2pxnfjajb57lml7yr12j79ls";
}; };

9
pkgs/development/libraries/libdvdcss/default.nix
View File

@ -1,10 +1,11 @@
{stdenv, fetchurl}: {stdenv, fetchurl}:
stdenv.mkDerivation { stdenv.mkDerivation rec {
name = "libdvdcss-1.3.0"; name = "libdvdcss-${version}";
version = "1.3.0";
src = fetchurl { src = fetchurl {
url = http://download.videolan.org/pub/libdvdcss/1.3.0/libdvdcss-1.3.0.tar.bz2; url = "http://get.videolan.org/libdvdcss/${version}/${name}.tar.bz2";
sha256 = "158k9zagmbk5bkbz96l6lwhh7xcgfcnzflkr4vblskhcab6llhbw"; sha256 = "158k9zagmbk5bkbz96l6lwhh7xcgfcnzflkr4vblskhcab6llhbw";
}; };

2
pkgs/development/libraries/libdvdnav/default.nix
View File

@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
version = "5.0.3"; version = "5.0.3";
src = fetchurl { src = fetchurl {
url = "http://download.videolan.org/pub/videolan/libdvdnav/${version}/libdvdnav-${version}.tar.bz2"; url = "http://get.videolan.org/libdvdnav/${version}/${name}.tar.bz2";
sha256 = "5097023e3d2b36944c763f1df707ee06b19dc639b2b68fb30113a5f2cbf60b6d"; sha256 = "5097023e3d2b36944c763f1df707ee06b19dc639b2b68fb30113a5f2cbf60b6d";
}; };

2
pkgs/development/libraries/libdvdread/default.nix
View File

@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
version = "5.0.2"; version = "5.0.2";
src = fetchurl { src = fetchurl {
url = "http://download.videolan.org/pub/videolan/libdvdread/${version}/libdvdread-${version}.tar.bz2"; url = "http://get.videolan.org/libdvdread/${version}/${name}.tar.bz2";
sha256 = "82cbe693f2a3971671e7428790b5498392db32185b8dc8622f7b9cd307d3cfbf"; sha256 = "82cbe693f2a3971671e7428790b5498392db32185b8dc8622f7b9cd307d3cfbf";
}; };

6
pkgs/development/libraries/x264/default.nix
View File

@ -1,11 +1,11 @@
{stdenv, fetchurl, yasm, enable10bit ? false}: {stdenv, fetchurl, yasm, enable10bit ? false}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "snapshot-20141218-2245-stable"; version = "20141218-2245";
name = "x264-20141218-2245"; name = "x264-${version}";
src = fetchurl { src = fetchurl {
url = "ftp://ftp.videolan.org/pub/videolan/x264/snapshots/x264-${version}.tar.bz2"; url = "http://download.videolan.org/x264/snapshots/x264-snapshot-${version}-stable.tar.bz2";
sha256 = "1gp1f0382vh2hmgc23ldqyywcfljg8lsgl2849ymr14r6gxfh69m"; sha256 = "1gp1f0382vh2hmgc23ldqyywcfljg8lsgl2849ymr14r6gxfh69m";
}; };

5
pkgs/development/libraries/x265/default.nix
View File

@ -19,7 +19,10 @@ stdenv.mkDerivation rec {
version = "1.7"; version = "1.7";
src = fetchurl { src = fetchurl {
url = "https://github.com/videolan/x265/archive/${version}.tar.gz"; urls = [
"http://get.videolan.org/x265/x265_${version}.tar.gz"
"https://github.com/videolan/x265/archive/${version}.tar.gz"
];
sha256 = "18w3whmbjlalvysny51kdq9b228iwg3rdav4kmifazksvrm4yacq"; sha256 = "18w3whmbjlalvysny51kdq9b228iwg3rdav4kmifazksvrm4yacq";
}; };

1
pkgs/games/dwarf-fortress/wrapper/dwarf-fortress-init.in
View File

@ -39,3 +39,4 @@ done
forcecopy_path data/index forcecopy_path data/index
# For some reason, it's needed to be writable... # For some reason, it's needed to be writable...
forcecopy_path data/announcement forcecopy_path data/announcement
forcecopy_path data/help

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

@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
name = "curl-7.45.0"; name = "curl-7.45.0";
src = fetchurl { src = fetchurl {
url = "http://curl.haxx.se/download/${name}.tar.bz2"; url = "http://ngcobalt13.uxnr.de/mirror/curl/${name}.tar.bz2";
sha256 = "1slq5c0v9wa8hajgimhkxhvsrd07jmih8sa3gjsl597qp5k4w5b5"; sha256 = "1slq5c0v9wa8hajgimhkxhvsrd07jmih8sa3gjsl597qp5k4w5b5";
}; };

2
pkgs/top-level/all-packages.nix
View File

@ -988,6 +988,8 @@ let
bareos = callPackage ../tools/backup/bareos { }; bareos = callPackage ../tools/backup/bareos { };
bats = callPackage ../development/interpreters/bats { };
beanstalkd = callPackage ../servers/beanstalkd { }; beanstalkd = callPackage ../servers/beanstalkd { };
beets = callPackage ../tools/audio/beets { }; beets = callPackage ../tools/audio/beets { };

10
pkgs/top-level/python-packages.nix
View File

@ -7054,15 +7054,15 @@ in modules // {
name = "scikits.samplerate-${version}"; name = "scikits.samplerate-${version}";
version = "0.3.3"; version = "0.3.3";
src = pkgs.fetchgit { src = pkgs.fetchgit {
url = https://github.com/ThomasLecocq/samplerate; url = https://github.com/cournape/samplerate;
rev = "7edb22b23f5aa8e7342aea0b538bdd0434988510"; rev = "a536c97eb2d6195b5f266ea3cc3a35364c4c2210";
sha256 = "ec2a09819c38028283505090ee9839963d3557e73f6e8eb3348ff8884d0d67ed"; sha256 = "0mgic7bs5zv5ji05vr527jlxxlb70f9dg93hy1lzyz2plm1kf7gg";
}; };
buildInputs = with self; [ pkgs.libsamplerate ]; buildInputs = with self; [ pkgs.libsamplerate ];
propagatedBuildInputs = with self; [ numpy ]; propagatedBuildInputs = with self; [ numpy ];
preConfigure = '' preConfigure = ''
cat > site.cfg << END cat > site.cfg << END
[samplerate] [samplerate]