From a538959ca07de128369fcde3e15fdafc9feba863 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Sun, 7 Feb 2016 11:31:19 +0000 Subject: [PATCH 1/8] lib.maintainers.globin: use my normal mail address --- lib/maintainers.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 03b56bf15622..49304e27f5bb 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -125,7 +125,7 @@ gfxmonk = "Tim Cuthbertson "; giogadi = "Luis G. Torres "; gleber = "Gleb Peregud "; - globin = "Robin Gloster "; + globin = "Robin Gloster "; goibhniu = "Cillian de Róiste "; gridaphobe = "Eric Seidel "; guibert = "David Guibert "; From 1e04d875db7b16348318f53589e92b190e9322ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 7 Feb 2016 13:18:48 +0100 Subject: [PATCH 2/8] videolan.org sources: prefer http://get.videolan.org Some of the original URLs were broken now. It seems that set of mirrors is preferred and faster than the others. In the x264 case the source isn't there so http://download.videolan.org is used instead. --- pkgs/applications/video/vlc/default.nix | 2 +- pkgs/development/libraries/libaacs/default.nix | 2 +- pkgs/development/libraries/libbdplus/default.nix | 2 +- pkgs/development/libraries/libbluray/default.nix | 2 +- pkgs/development/libraries/libdvbpsi/default.nix | 8 ++++---- pkgs/development/libraries/libdvdcss/default.nix | 9 +++++---- pkgs/development/libraries/libdvdnav/default.nix | 2 +- pkgs/development/libraries/libdvdread/default.nix | 2 +- pkgs/development/libraries/x264/default.nix | 6 +++--- pkgs/development/libraries/x265/default.nix | 5 ++++- 10 files changed, 22 insertions(+), 18 deletions(-) diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix index 12df7e41dd88..ebfa2f0484d3 100644 --- a/pkgs/applications/video/vlc/default.nix +++ b/pkgs/applications/video/vlc/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { version = "2.2.1"; src = fetchurl { - url = "http://download.videolan.org/vlc/${version}/${name}.tar.xz"; + url = "http://get.videolan.org/vlc/${version}/${name}.tar.xz"; sha256 = "1jqzrzrpw6932lbkf863xk8cfmn4z2ngbxz7w8ggmh4f6xz9sgal"; }; diff --git a/pkgs/development/libraries/libaacs/default.nix b/pkgs/development/libraries/libaacs/default.nix index 119a46bfc31d..e12929e9f696 100644 --- a/pkgs/development/libraries/libaacs/default.nix +++ b/pkgs/development/libraries/libaacs/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { name = "${baseName}-${version}"; 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"; }; diff --git a/pkgs/development/libraries/libbdplus/default.nix b/pkgs/development/libraries/libbdplus/default.nix index 8cc2e8069320..67428f132495 100644 --- a/pkgs/development/libraries/libbdplus/default.nix +++ b/pkgs/development/libraries/libbdplus/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { name = "${baseName}-${version}"; 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"; }; diff --git a/pkgs/development/libraries/libbluray/default.nix b/pkgs/development/libraries/libbluray/default.nix index 7d7689bf23ed..08905455d353 100644 --- a/pkgs/development/libraries/libbluray/default.nix +++ b/pkgs/development/libraries/libbluray/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { name = "${baseName}-${version}"; 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"; }; diff --git a/pkgs/development/libraries/libdvbpsi/default.nix b/pkgs/development/libraries/libdvbpsi/default.nix index f8b9e9ecef90..ecfa14a43c9a 100644 --- a/pkgs/development/libraries/libdvbpsi/default.nix +++ b/pkgs/development/libraries/libdvbpsi/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl}: -stdenv.mkDerivation { - - name = "libdvbpsi-0.2.2"; +stdenv.mkDerivation rec { + name = "libdvbpsi-${version}"; + version = "0.2.2"; 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"; }; diff --git a/pkgs/development/libraries/libdvdcss/default.nix b/pkgs/development/libraries/libdvdcss/default.nix index 8632da12c735..d68b0a367517 100644 --- a/pkgs/development/libraries/libdvdcss/default.nix +++ b/pkgs/development/libraries/libdvdcss/default.nix @@ -1,10 +1,11 @@ {stdenv, fetchurl}: -stdenv.mkDerivation { - name = "libdvdcss-1.3.0"; - +stdenv.mkDerivation rec { + name = "libdvdcss-${version}"; + version = "1.3.0"; + 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"; }; diff --git a/pkgs/development/libraries/libdvdnav/default.nix b/pkgs/development/libraries/libdvdnav/default.nix index fe625aa69e12..5c931f4d6f4c 100644 --- a/pkgs/development/libraries/libdvdnav/default.nix +++ b/pkgs/development/libraries/libdvdnav/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "5.0.3"; 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"; }; diff --git a/pkgs/development/libraries/libdvdread/default.nix b/pkgs/development/libraries/libdvdread/default.nix index 311bc6dc4058..493be4c8f86b 100644 --- a/pkgs/development/libraries/libdvdread/default.nix +++ b/pkgs/development/libraries/libdvdread/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "5.0.2"; 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"; }; diff --git a/pkgs/development/libraries/x264/default.nix b/pkgs/development/libraries/x264/default.nix index 6c541f1aa682..3c2423434939 100644 --- a/pkgs/development/libraries/x264/default.nix +++ b/pkgs/development/libraries/x264/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, yasm, enable10bit ? false}: stdenv.mkDerivation rec { - version = "snapshot-20141218-2245-stable"; - name = "x264-20141218-2245"; + version = "20141218-2245"; + name = "x264-${version}"; 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"; }; diff --git a/pkgs/development/libraries/x265/default.nix b/pkgs/development/libraries/x265/default.nix index 1598fec61948..1473910e004f 100644 --- a/pkgs/development/libraries/x265/default.nix +++ b/pkgs/development/libraries/x265/default.nix @@ -19,7 +19,10 @@ stdenv.mkDerivation rec { version = "1.7"; 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"; }; From 98ffc61e2f846c4818280a4cccce3fdad3eb9677 Mon Sep 17 00:00:00 2001 From: Tony White Date: Sat, 6 Feb 2016 20:41:40 +0000 Subject: [PATCH 3/8] curl: Change default src url (close #12851) - Changes the default src url away from http://curl.haxx.se to an official mirror because haxx.se resolves to https and bootstrap curl doesn't have https support. Please see https://github.com/NixOS/nixpkgs/issues/12816 for more info. --- pkgs/tools/networking/curl/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index 3c77d2a6c8d6..7101a9cbb1e0 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { name = "curl-7.45.0"; src = fetchurl { - url = "http://curl.haxx.se/download/${name}.tar.bz2"; + url = "http://ngcobalt13.uxnr.de/mirror/curl/${name}.tar.bz2"; sha256 = "1slq5c0v9wa8hajgimhkxhvsrd07jmih8sa3gjsl597qp5k4w5b5"; }; From f91f99aff827e43c10373e393636e9af12c28f66 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 7 Feb 2016 15:54:49 +0300 Subject: [PATCH 4/8] dwarf-fortress: fix help --- pkgs/games/dwarf-fortress/wrapper/dwarf-fortress-init.in | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/games/dwarf-fortress/wrapper/dwarf-fortress-init.in b/pkgs/games/dwarf-fortress/wrapper/dwarf-fortress-init.in index 1fd6178895db..c5157e82d8a5 100644 --- a/pkgs/games/dwarf-fortress/wrapper/dwarf-fortress-init.in +++ b/pkgs/games/dwarf-fortress/wrapper/dwarf-fortress-init.in @@ -39,3 +39,4 @@ done forcecopy_path data/index # For some reason, it's needed to be writable... forcecopy_path data/announcement +forcecopy_path data/help From c6e94f9fa0dd88ee4b8c0124b08ce787509c7301 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 7 Feb 2016 14:42:22 +0100 Subject: [PATCH 5/8] sc-im: fix download by using fetchFromGitHub Otherwise the hashes would change periodically. Also refactor meta. /cc maintainer @matthiasbeyer. --- pkgs/applications/misc/sc-im/default.nix | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/misc/sc-im/default.nix b/pkgs/applications/misc/sc-im/default.nix index 29f347522fa4..cb18278d1ed4 100644 --- a/pkgs/applications/misc/sc-im/default.nix +++ b/pkgs/applications/misc/sc-im/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, yacc, ncurses, libxml2 }: +{ stdenv, fetchFromGitHub, yacc, ncurses, libxml2 }: let version = "0.2.1"; @@ -7,9 +7,11 @@ stdenv.mkDerivation rec { name = "sc-im-${version}"; - src = fetchurl { - url = "https://github.com/andmarti1424/sc-im/archive/v${version}.tar.gz"; - sha256 = "08yks8grj5w434r81dy2knzbdhdnkc23r0d9v848mcl706xnjl6j"; + src = fetchFromGitHub { + owner = "andmarti1424"; + repo = "sc-im"; + rev = "v${version}"; + sha256 = "0v6b8xksvd12vmz198vik2ranyr5mhnp85hl9yxh9svibs7jxsbb"; }; buildInputs = [ yacc ncurses libxml2 ]; @@ -28,12 +30,12 @@ stdenv.mkDerivation rec { make install prefix= ''; - meta = { + meta = with stdenv.lib; { homepage = "https://github.com/andmarti1424/sc-im"; description = "SC-IM - Spreadsheet Calculator Improvised - SC fork"; - license = stdenv.lib.licenses.bsdOriginal; - maintainers = [ stdenv.lib.maintainers.matthiasbeyer ]; - platforms = with stdenv.lib.platforms; linux; # Cannot test others + license = licenses.bsdOriginal; + maintainers = [ maintainers.matthiasbeyer ]; + platforms = platforms.linux; # Cannot test others }; } From 4b4d5c96c8ef976384fd00e67d1e21a1bb818fe7 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Sun, 7 Feb 2016 12:11:31 +0100 Subject: [PATCH 6/8] bats: init at 4.0.4 --- .../development/interpreters/bats/default.nix | 21 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 23 insertions(+) create mode 100644 pkgs/development/interpreters/bats/default.nix diff --git a/pkgs/development/interpreters/bats/default.nix b/pkgs/development/interpreters/bats/default.nix new file mode 100644 index 000000000000..4eb86460be9a --- /dev/null +++ b/pkgs/development/interpreters/bats/default.nix @@ -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; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fdc8acfd4947..be51cff6fe5b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -988,6 +988,8 @@ let bareos = callPackage ../tools/backup/bareos { }; + bats = callPackage ../development/interpreters/bats { }; + beanstalkd = callPackage ../servers/beanstalkd { }; beets = callPackage ../tools/audio/beets { }; From ea85ac9f15a129453b37bb9a6426887a5b767942 Mon Sep 17 00:00:00 2001 From: Cole Mickens Date: Sat, 6 Feb 2016 18:04:11 -0800 Subject: [PATCH 7/8] powerline-fonts: 2015-06-29 -> 2015-12-11 (close #12856) --- pkgs/data/fonts/powerline-fonts/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/data/fonts/powerline-fonts/default.nix b/pkgs/data/fonts/powerline-fonts/default.nix index 63b4ad1ea04a..6d620c09f06d 100644 --- a/pkgs/data/fonts/powerline-fonts/default.nix +++ b/pkgs/data/fonts/powerline-fonts/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation { - name = "powerline-fonts-2015-06-29"; + name = "powerline-fonts-2015-12-11"; src = fetchFromGitHub { owner = "powerline"; repo = "fonts"; - rev = "97dc451724fb24e1dd9892c988642b239b5dc67c"; - sha256 = "1m0a8k916s74iv2k0kk36dz7d2hfb2zgf8m0b9hg71w4yd3bmj4w"; + rev = "a44abd0e742ad6e7fd8d8bc4c3cad5155c9f3a92"; + sha256 = "1pwz83yh28yd8aj6fbyfz8z3q3v67psszpd9mp4vv0ms9w8b5ajn"; }; buildPhase = "true"; From 75739fd05b5d646d007e4df3c94bdefb5c12845d Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Sun, 7 Feb 2016 14:43:10 +0000 Subject: [PATCH 8/8] python3Packages.samplerate: fix revision --- pkgs/top-level/python-packages.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8ff7b67d6505..04312ca1f234 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7054,15 +7054,15 @@ in modules // { name = "scikits.samplerate-${version}"; version = "0.3.3"; src = pkgs.fetchgit { - url = https://github.com/ThomasLecocq/samplerate; - rev = "7edb22b23f5aa8e7342aea0b538bdd0434988510"; - sha256 = "ec2a09819c38028283505090ee9839963d3557e73f6e8eb3348ff8884d0d67ed"; - }; + url = https://github.com/cournape/samplerate; + rev = "a536c97eb2d6195b5f266ea3cc3a35364c4c2210"; + sha256 = "0mgic7bs5zv5ji05vr527jlxxlb70f9dg93hy1lzyz2plm1kf7gg"; + }; + buildInputs = with self; [ pkgs.libsamplerate ]; propagatedBuildInputs = with self; [ numpy ]; - preConfigure = '' cat > site.cfg << END [samplerate]