From 128389b60c801aa5cd7f2ca9e2ef28d9a1784f5e Mon Sep 17 00:00:00 2001 From: Eric Sagnes Date: Wed, 3 Aug 2016 11:53:09 +0900 Subject: [PATCH 01/32] hydra-module: honor user and group ids --- .../services/continuous-integration/hydra/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/continuous-integration/hydra/default.nix b/nixos/modules/services/continuous-integration/hydra/default.nix index c8edfaf18537..3eed9ba89821 100644 --- a/nixos/modules/services/continuous-integration/hydra/default.nix +++ b/nixos/modules/services/continuous-integration/hydra/default.nix @@ -193,7 +193,9 @@ in config = mkIf cfg.enable { - users.extraGroups.hydra = { }; + users.extraGroups.hydra = { + gid = config.ids.gids.hydra; + }; users.extraUsers.hydra = { description = "Hydra"; @@ -201,6 +203,7 @@ in createHome = true; home = baseDir; useDefaultShell = true; + uid = config.ids.uids.hydra; }; users.extraUsers.hydra-queue-runner = @@ -208,12 +211,14 @@ in group = "hydra"; useDefaultShell = true; home = "${baseDir}/queue-runner"; # really only to keep SSH happy + uid = config.ids.uids.hydra-queue-runner; }; users.extraUsers.hydra-www = { description = "Hydra web server"; group = "hydra"; useDefaultShell = true; + uid = config.ids.uids.hydra-www; }; nix.trustedUsers = [ "hydra-queue-runner" ]; From 338c425e081ef078749c5a68fa880347ac0bade6 Mon Sep 17 00:00:00 2001 From: Eric Sagnes Date: Wed, 3 Aug 2016 11:56:53 +0900 Subject: [PATCH 02/32] hydra-module: add default to buildMachinesFiles --- nixos/modules/services/continuous-integration/hydra/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/continuous-integration/hydra/default.nix b/nixos/modules/services/continuous-integration/hydra/default.nix index 3eed9ba89821..b1b3404add09 100644 --- a/nixos/modules/services/continuous-integration/hydra/default.nix +++ b/nixos/modules/services/continuous-integration/hydra/default.nix @@ -166,7 +166,7 @@ in buildMachinesFiles = mkOption { type = types.listOf types.path; - default = []; + default = [ "/etc/nix/machines" ]; example = [ "/etc/nix/machines" "/var/lib/hydra/provisioner/machines" ]; description = "List of files containing build machines."; }; From 7a3c15dd13d468e5ac0c38b5713112076c01c3c4 Mon Sep 17 00:00:00 2001 From: Renzo Carbonara Date: Thu, 11 Aug 2016 16:28:59 -0300 Subject: [PATCH 03/32] perl module: patch CatalystXScriptServerStarman Fixes #16074 and #17624 --- ...atalystXScriptServerStarman-fork-arg.patch | 22 +++++++++++++++++++ pkgs/top-level/perl-packages.nix | 4 ++++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/development/perl-modules/CatalystXScriptServerStarman-fork-arg.patch diff --git a/pkgs/development/perl-modules/CatalystXScriptServerStarman-fork-arg.patch b/pkgs/development/perl-modules/CatalystXScriptServerStarman-fork-arg.patch new file mode 100644 index 000000000000..5a1c6746e603 --- /dev/null +++ b/pkgs/development/perl-modules/CatalystXScriptServerStarman-fork-arg.patch @@ -0,0 +1,22 @@ +diff --git a/lib/CatalystX/Script/Server/Starman.pm b/lib/CatalystX/Script/Server/Starman.pm +index 670bd74..7b3bd2e 100644 +--- a/lib/CatalystX/Script/Server/Starman.pm ++++ b/lib/CatalystX/Script/Server/Starman.pm +@@ -9,7 +9,7 @@ our $VERSION = '0.02'; + + extends 'Catalyst::Script::Server'; + +-has '+fork' => ( default => 1, init_arg => undef ); ++has '+fork' => ( default => 1 ); + + has [qw/ keepalive restart restart_delay restart_regex restart_directory/] => ( init_arg => undef, is => 'ro' ); + +@@ -70,7 +70,7 @@ CatalystX::Script::Server::Starman - Replace the development server with Starman + + -d --debug force debug mode + -f --fork handle each request in a new process +- (defaults to false) ++ (defaults to true) + -? --help display this help and exits + -h --host host (defaults to all) + -p --port port (defaults to 3000) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 95a762df33ee..cd93440c01cd 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1508,6 +1508,10 @@ let self = _self // overrides; _self = with self; { url = mirror://cpan/authors/id/A/AB/ABRAXXA/CatalystX-Script-Server-Starman-0.02.tar.gz; sha256 = "0h02mpkc4cmi3jpvcd7iw7xyzx55bqvvl1qkf967gqkvpklm0qx5"; }; + patches = [ + # See Nixpkgs issues #16074 and #17624 + ../development/perl-modules/CatalystXScriptServerStarman-fork-arg.patch + ]; buildInputs = [ TestWWWMechanizeCatalyst ]; propagatedBuildInputs = [ CatalystRuntime Moose namespaceautoclean Starman ]; meta = { From 6154fecdbd5f5363f67a3fcce3bfcb97b6bf1fe0 Mon Sep 17 00:00:00 2001 From: Jezen Thomas Date: Fri, 19 Aug 2016 19:51:33 +0200 Subject: [PATCH 04/32] Declare dependencies for yesod-auth-oauth2 --- pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix index bf2ca43fc875..2294e30d24b6 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix @@ -65,6 +65,8 @@ self: super: { hoauth2 = overrideCabal super.hoauth2 (drv: { testDepends = (drv.testDepends or []) ++ [ self.wai self.warp ]; }); + yesod-auth-oauth2 = overrideCabal super.yesod-auth-oauth2 (drv: { testDepends = (drv.testDepends or []) ++ [ self.load-env self.yesod ]; }); + # Setup: At least the following dependencies are missing: base <4.8 hspec-expectations = overrideCabal super.hspec-expectations (drv: { postPatch = "sed -i -e 's|base < 4.8|base|' hspec-expectations.cabal"; From 7a6cfe944ad2c63e06d0ec81cb971676060277d8 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sat, 20 Aug 2016 00:05:35 +0200 Subject: [PATCH 05/32] ocaml-magick: fix darwin build --- pkgs/development/ocaml-modules/magick/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/ocaml-modules/magick/default.nix b/pkgs/development/ocaml-modules/magick/default.nix index 2d24fefa2053..021962154bd0 100644 --- a/pkgs/development/ocaml-modules/magick/default.nix +++ b/pkgs/development/ocaml-modules/magick/default.nix @@ -12,6 +12,8 @@ stdenv.mkDerivation { createFindlibDestdir = true; + preConfigure = "substituteInPlace Makefile --replace gcc $CC"; + installTargets = [ "find_install" ]; meta = { From f15bff8202fcf119e4a19617841ff2f36816d5c1 Mon Sep 17 00:00:00 2001 From: J Phani Mahesh Date: Wed, 20 Jul 2016 10:50:43 +0530 Subject: [PATCH 06/32] areca: switch sf downloads to mirror:// This allows fallback to all configured mirrors for sourceforge to download, instead of relying on just downloads.sourceforge.net --- pkgs/applications/backup/areca/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/backup/areca/default.nix b/pkgs/applications/backup/areca/default.nix index 76913356b04f..90d38712317b 100644 --- a/pkgs/applications/backup/areca/default.nix +++ b/pkgs/applications/backup/areca/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "areca-7.5"; src = fetchurl { - url = "http://downloads.sourceforge.net/project/areca/areca-stable/areca-7.5/areca-7.5-src.tar.gz"; + url = "mirror://sourceforge/project/areca/areca-stable/areca-7.5/areca-7.5-src.tar.gz"; sha256 = "1q4ha9s96c1syplxm04bh1v1gvjq16l4pa8w25w95d2ywwvyq1xb"; }; From e5c53a08bd82fdf9ab377f998021222c7d24d135 Mon Sep 17 00:00:00 2001 From: J Phani Mahesh Date: Wed, 20 Jul 2016 10:55:25 +0530 Subject: [PATCH 07/32] mlterm: switch sf downloads to mirror:// This allows fallback to all configured mirrors for sourceforge to download, instead of relying on just downloads.sourceforge.net --- pkgs/applications/misc/mlterm/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/mlterm/default.nix b/pkgs/applications/misc/mlterm/default.nix index 80d0c136628e..d9b03fd86e1d 100644 --- a/pkgs/applications/misc/mlterm/default.nix +++ b/pkgs/applications/misc/mlterm/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "3.3.8"; src = fetchurl { - url = "https://downloads.sourceforge.net/project/mlterm/01release/${name}/${name}.tar.gz"; + url = "mirror://sourceforge/project/mlterm/01release/${name}/${name}.tar.gz"; sha256 = "088pgxynzxxii7wdmjp2fdkxydirx4k05588zkhlzalkb5l8ji1i"; }; From 29cff20045842a83f246b849383ffcef491f6422 Mon Sep 17 00:00:00 2001 From: J Phani Mahesh Date: Wed, 20 Jul 2016 10:58:40 +0530 Subject: [PATCH 08/32] xautoclick: switch sf downloads to mirror:// This allows fallback to all configured mirrors for sourceforge to download, instead of relying on just downloads.sourceforge.net --- pkgs/applications/misc/xautoclick/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/xautoclick/default.nix b/pkgs/applications/misc/xautoclick/default.nix index 19d8a15fbfa0..1a71a2756d15 100644 --- a/pkgs/applications/misc/xautoclick/default.nix +++ b/pkgs/applications/misc/xautoclick/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { version = "0.31"; name = "xautoclick-${version}"; src = fetchurl { - url = "http://downloads.sourceforge.net/project/xautoclick/xautoclick/xautoclick-0.31/xautoclick-0.31.tar.gz"; + url = "mirror://sourceforge/project/xautoclick/xautoclick/xautoclick-0.31/xautoclick-0.31.tar.gz"; sha256 = "0h522f12a7v2b89411xm51iwixmjp2mp90rnizjgiakx9ajnmqnm"; }; buildInputs = [ xorg.libX11 xorg.libXtst xorg.xinput xorg.libXi xorg.libXext pkgconfig ] From 72624867433b6a8f5e9e5105b2048ad58b3112bf Mon Sep 17 00:00:00 2001 From: J Phani Mahesh Date: Wed, 20 Jul 2016 11:02:35 +0530 Subject: [PATCH 09/32] lxmenu-data: switch sf downloads to mirror:// This allows fallback to all configured mirrors for sourceforge to download, instead of relying on just downloads.sourceforge.net --- pkgs/desktops/lxde/core/lxmenu-data.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/desktops/lxde/core/lxmenu-data.nix b/pkgs/desktops/lxde/core/lxmenu-data.nix index b75c09d2909d..27a5903a61b5 100644 --- a/pkgs/desktops/lxde/core/lxmenu-data.nix +++ b/pkgs/desktops/lxde/core/lxmenu-data.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "0.1.5"; src = fetchurl { - url = "http://downloads.sourceforge.net/lxde/${name}.tar.xz"; + url = "mirror://sourceforge/lxde/${name}.tar.xz"; sha256 = "9fe3218d2ef50b91190162f4f923d6524c364849f87bcda8b4ed8eb59b80bab8"; }; From dda6c4d5f427de26ed7d4769e85c6cb72dcb162b Mon Sep 17 00:00:00 2001 From: J Phani Mahesh Date: Wed, 20 Jul 2016 11:03:45 +0530 Subject: [PATCH 10/32] python:cgkit: switch sf downloads to mirror:// This allows fallback to all configured mirrors for sourceforge to download, instead of relying on just downloads.sourceforge.net --- pkgs/top-level/python-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d39c8d85cdd2..6f94a8fa40b4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3308,7 +3308,7 @@ in modules // { disabled = isPy3k; src = pkgs.fetchurl { - url = "http://downloads.sourceforge.net/project/cgkit/cgkit/cgkit-${version}/cgkit-${version}-py2k.tar.gz"; + url = "mirror://sourceforge/project/cgkit/cgkit/cgkit-${version}/cgkit-${version}-py2k.tar.gz"; sha256 = "0vvllc42mdyma3c7yqhahs4bfxymm2kvmc4va7dxqr5x0rzh6rd6"; }; From 6f1167b7bb373a2ad80b4a3185a5c6394c62c8a7 Mon Sep 17 00:00:00 2001 From: J Phani Mahesh Date: Sat, 20 Aug 2016 18:51:13 +0530 Subject: [PATCH 11/32] gammu: switch sf downloads to mirror:// This allows fallback to all configured mirrors for sourceforge to download, instead of relying on just downloads.sourceforge.net --- pkgs/applications/misc/gammu/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/gammu/default.nix b/pkgs/applications/misc/gammu/default.nix index fc88bb3e354f..10ee8272f380 100644 --- a/pkgs/applications/misc/gammu/default.nix +++ b/pkgs/applications/misc/gammu/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { version = "1.33.0"; src = fetchurl { - url = "http://sourceforge.net/projects/gammu/files/gammu/${version}/gammu-${version}.tar.xz"; + url = "mirror://sourceforge/project/gammu/gammu/${version}/gammu-${version}.tar.xz"; sha256 = "18gplx1v9d70k1q86d5i4n4dfpx367g34pj3zscppx126vwhv112"; }; From aa1ff9ef7db99f08b770cf137ad256282386012b Mon Sep 17 00:00:00 2001 From: J Phani Mahesh Date: Sat, 20 Aug 2016 19:07:28 +0530 Subject: [PATCH 12/32] omniorb: switch sf downloads to mirror:// This allows fallback to all configured mirrors for sourceforge to download, instead of relying on just downloads.sourceforge.net --- pkgs/development/tools/omniorb/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/omniorb/default.nix b/pkgs/development/tools/omniorb/default.nix index 0fe4b191e503..09955ca5d70d 100644 --- a/pkgs/development/tools/omniorb/default.nix +++ b/pkgs/development/tools/omniorb/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { version = "4.2.0"; src = fetchurl rec { - url = "http://sourceforge.net/projects/omniorb/files/omniORB/omniORB-${version}/omniORB-${version}.tar.bz2"; + url = "mirror://sourceforge/project/omniorb/omniORB/omniORB-${version}/omniORB-${version}.tar.bz2"; sha256 = "1g58xcw4641wyisp9wscrkzaqrz0vf123dgy52qq2a3wk7y77hkl"; }; From 8e3eae86d652d9fbaeb1bf833bd8bd924d02642d Mon Sep 17 00:00:00 2001 From: J Phani Mahesh Date: Sat, 20 Aug 2016 19:06:33 +0530 Subject: [PATCH 13/32] mlton: switch sf downloads to mirror:// This allows fallback to all configured mirrors for sourceforge to download, instead of relying on just downloads.sourceforge.net --- pkgs/development/compilers/mlton/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/mlton/default.nix b/pkgs/development/compilers/mlton/default.nix index c4890c1ca886..2a72387028d2 100644 --- a/pkgs/development/compilers/mlton/default.nix +++ b/pkgs/development/compilers/mlton/default.nix @@ -15,22 +15,22 @@ stdenv.mkDerivation rec { binSrc = if stdenv.system == "i686-linux" then (fetchurl { - url = "http://sourceforge.net/projects/mlton/files/mlton/${version}/${name}-1.x86-linux.tgz"; + url = "mirror://sourceforge/project/mlton/mlton/${version}/${name}-1.x86-linux.tgz"; sha256 = "1kxjjmnw4xk2d9hpvz43w9dvyhb3025k4zvjx785c33nrwkrdn4j"; }) else if stdenv.system == "x86_64-linux" then (fetchurl { - url = "http://sourceforge.net/projects/mlton/files/mlton/${version}/${name}-1.amd64-linux.tgz"; + url = "mirror://sourceforge/project/mlton/mlton/${version}/${name}-1.amd64-linux.tgz"; sha256 = "0fyhwxb4nmpirjbjcvk9f6w67gmn2gkz7xcgz0xbfih9kc015ygn"; }) else if stdenv.system == "x86_64-darwin" then (fetchurl { - url = "http://sourceforge.net/projects/mlton/files/mlton/${version}/${name}-1.amd64-darwin.gmp-macports.tgz"; + url = "mirror://sourceforge/project/mlton/mlton/${version}/${name}-1.amd64-darwin.gmp-macports.tgz"; sha256 = "044wnh9hhg6if886xy805683k0as347xd37r0r1yi4x7qlxzzgx9"; }) else throw "Architecture not supported"; codeSrc = fetchurl { - url = "http://sourceforge.net/projects/mlton/files/mlton/${version}/${name}.src.tgz"; + url = "mirror://sourceforge/project/mlton/mlton/${version}/${name}.src.tgz"; sha256 = "0v1x2hrh9hiqkvnbq11kf34v4i5a2x0ffxbzqaa8skyl26nmfn11"; }; From cb4a888206a164fe6eb8b884c605b2ad22e0e3f4 Mon Sep 17 00:00:00 2001 From: J Phani Mahesh Date: Sat, 20 Aug 2016 19:05:07 +0530 Subject: [PATCH 14/32] fpc: switch sf downloads to mirror:// This allows fallback to all configured mirrors for sourceforge to download, instead of relying on just downloads.sourceforge.net --- pkgs/development/compilers/fpc/binary.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/fpc/binary.nix b/pkgs/development/compilers/fpc/binary.nix index 57e670750db7..0ecf4437c9a2 100644 --- a/pkgs/development/compilers/fpc/binary.nix +++ b/pkgs/development/compilers/fpc/binary.nix @@ -6,12 +6,12 @@ stdenv.mkDerivation { src = if stdenv.system == "i686-linux" then fetchurl { - url = "http://sourceforge.net/projects/freepascal/files/Linux/2.6.0/fpc-2.6.0.i386-linux.tar"; + url = "mirror://sourceforge/project/freepascal/Linux/2.6.0/fpc-2.6.0.i386-linux.tar"; sha256 = "08yklvrfxvk59bxsd4rh1i6s3cjn0q06dzjs94h9fbq3n1qd5zdf"; } else if stdenv.system == "x86_64-linux" then fetchurl { - url = "http://sourceforge.net/projects/freepascal/files/Linux/2.6.0/fpc-2.6.0.x86_64-linux.tar"; + url = "mirror://sourceforge/project/freepascal/Linux/2.6.0/fpc-2.6.0.x86_64-linux.tar"; sha256 = "0k9vi75k39y735fng4jc2vppdywp82j4qhzn7x4r6qjkad64d8lx"; } else throw "Not supported on ${stdenv.system}."; From 64fb9bb0e24b863aa0583900e1e88b466af06c95 Mon Sep 17 00:00:00 2001 From: J Phani Mahesh Date: Sat, 20 Aug 2016 19:03:27 +0530 Subject: [PATCH 15/32] ht: switch sf downloads to mirror:// This allows fallback to all configured mirrors for sourceforge to download, instead of relying on just downloads.sourceforge.net --- pkgs/applications/editors/ht/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/editors/ht/default.nix b/pkgs/applications/editors/ht/default.nix index b7acdb7f1d53..0ca4f19b4afe 100644 --- a/pkgs/applications/editors/ht/default.nix +++ b/pkgs/applications/editors/ht/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "ht-${version}"; version = "2.1.0"; src = fetchurl { - url = "http://sourceforge.net/projects/hte/files/ht-source/ht-${version}.tar.bz2"; + url = "mirror://sourceforge/project/hte/ht-source/ht-${version}.tar.bz2"; sha256 = "0w2xnw3z9ws9qrdpb80q55h6ynhh3aziixcfn45x91bzrbifix9i"; }; buildInputs = [ From 1894880b3158ced9cda4c12dedd768232340ffd2 Mon Sep 17 00:00:00 2001 From: J Phani Mahesh Date: Sat, 20 Aug 2016 19:01:55 +0530 Subject: [PATCH 16/32] fuseiso: switch sf downloads to mirror:// This allows fallback to all configured mirrors for sourceforge to download, instead of relying on just downloads.sourceforge.net --- pkgs/tools/filesystems/fuseiso/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/filesystems/fuseiso/default.nix b/pkgs/tools/filesystems/fuseiso/default.nix index 161425ad137b..7ea5d581a59b 100644 --- a/pkgs/tools/filesystems/fuseiso/default.nix +++ b/pkgs/tools/filesystems/fuseiso/default.nix @@ -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"; }; From c4a746af683d17a1d06ab4ba0c953e59357e6ca3 Mon Sep 17 00:00:00 2001 From: J Phani Mahesh Date: Sat, 20 Aug 2016 19:00:03 +0530 Subject: [PATCH 17/32] mozart: switch sf downloads to mirror:// This allows fallback to all configured mirrors for sourceforge to download, instead of relying on just downloads.sourceforge.net --- pkgs/development/compilers/mozart/binary.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/mozart/binary.nix b/pkgs/development/compilers/mozart/binary.nix index ae040297313c..e3dd950e0d1a 100644 --- a/pkgs/development/compilers/mozart/binary.nix +++ b/pkgs/development/compilers/mozart/binary.nix @@ -10,7 +10,7 @@ in stdenv.mkDerivation { name = "mozart-binary-${version}"; src = fetchurl { - url = "http://sourceforge.net/projects/mozart-oz/files/v${version}-alpha.0/mozart2-${version}-alpha.0+build.4105.5c06ced-x86_64-linux.tar.gz"; + url = "mirror://sourceforge/project/mozart-oz/v${version}-alpha.0/mozart2-${version}-alpha.0+build.4105.5c06ced-x86_64-linux.tar.gz"; sha256 = "0rsfrjimjxqbwprpzzlmydl3z3aiwg5qkb052jixdxjyad7gyh5z"; }; From 049f5e44e2bbf9abb1e7eaf70495ac72205c9c61 Mon Sep 17 00:00:00 2001 From: J Phani Mahesh Date: Sat, 20 Aug 2016 18:58:12 +0530 Subject: [PATCH 18/32] srelay: switch sf downloads to mirror:// This allows fallback to all configured mirrors for sourceforge to download, instead of relying on just downloads.sourceforge.net --- pkgs/tools/networking/srelay/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/networking/srelay/default.nix b/pkgs/tools/networking/srelay/default.nix index 853a21da73c4..8c413174cfb2 100644 --- a/pkgs/tools/networking/srelay/default.nix +++ b/pkgs/tools/networking/srelay/default.nix @@ -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"; }; From 3b79ab30a599113e0d69ffd13be659c8aa48ed18 Mon Sep 17 00:00:00 2001 From: J Phani Mahesh Date: Sat, 20 Aug 2016 18:45:20 +0530 Subject: [PATCH 19/32] wmsystemtray: switch sf downloads to mirror:// This allows fallback to all configured mirrors for sourceforge to download, instead of relying on just downloads.sourceforge.net --- .../window-managers/windowmaker/dockapps/wmsystemtray.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/window-managers/windowmaker/dockapps/wmsystemtray.nix b/pkgs/applications/window-managers/windowmaker/dockapps/wmsystemtray.nix index c28d090e0bd7..e7994eaf05f7 100644 --- a/pkgs/applications/window-managers/windowmaker/dockapps/wmsystemtray.nix +++ b/pkgs/applications/window-managers/windowmaker/dockapps/wmsystemtray.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "wmsystemtray-1.4"; src = fetchurl { - url = http://sourceforge.net/projects/wmsystemtray/files/wmsystemtray/wmsystemtray-1.4.tar.gz; + url = mirror://sourceforge/project/wmsystemtray/wmsystemtray/wmsystemtray-1.4.tar.gz; sha256 = "8edef43691e9fff071000e29166c7c1ad420c0956e9068151061e881c8ac97e9"; }; From 602d32534261701c16a869ba88270e814286fa18 Mon Sep 17 00:00:00 2001 From: Chris Williams Date: Sat, 20 Aug 2016 11:31:08 -0400 Subject: [PATCH 20/32] gnupg: change 1compat platform to unix --- pkgs/tools/security/gnupg/1compat.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/security/gnupg/1compat.nix b/pkgs/tools/security/gnupg/1compat.nix index 7ff19c212e83..0fe294e5a117 100644 --- a/pkgs/tools/security/gnupg/1compat.nix +++ b/pkgs/tools/security/gnupg/1compat.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation { ''; meta = { - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } From 306083f7d2d6d2d4493a3f0354bc94fe16927361 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Sat, 20 Aug 2016 18:11:08 +0200 Subject: [PATCH 21/32] perl-Sub-Name: 0.15 -> 0.19 --- pkgs/top-level/perl-packages.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 8e4896b3fee7..30ce3f21b9a6 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -11662,14 +11662,15 @@ let self = _self // overrides; _self = with self; { }; SubName = buildPerlPackage rec { - name = "Sub-Name-0.15"; + name = "Sub-Name-0.19"; src = fetchurl { url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz"; - sha256 = "dabc9a4abcbe067d120ce005b4203b8a44291cbda013900152ba19a1e7c1c8c8"; + sha256 = "b06ba8252ce3b1bb88fa0ea0fe9ec8b572e5ed36c69f55e9e3d9db8a73efe22b"; }; + buildInputs = [ self."if" ]; meta = { homepage = https://github.com/p5sagit/Sub-Name; - description = "(re)name a sub"; + description = "(Re)name a sub"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = [ maintainers.rycee ]; }; From 2095c5947daa1ad9d0126df6b6da261e1f8a9624 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Sat, 20 Aug 2016 18:29:38 +0200 Subject: [PATCH 22/32] perl-DateTime-Format-SQLite: add meta section --- pkgs/top-level/perl-packages.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 30ce3f21b9a6..6e8d59ba5dfc 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3324,10 +3324,13 @@ let self = _self // overrides; _self = with self; { name = "DateTime-Format-SQLite-0.11"; src = fetchurl { url = "mirror://cpan/authors/id/C/CF/CFAERBER/${name}.tar.gz"; - sha256 = "1d4ln8x5bjpqmgnbbi2h16knfz674dsgvk6x7m60v6ykw454w7yc"; + sha256 = "cc1f4e0ae1d39b0d4c3dddccfd7423c77c67a70950c4b5ecabf8ca553ab294b4"; }; - propagatedBuildInputs = [ DateTime DateTimeFormatBuilder ]; + meta = { + description = "Parse and format SQLite dates and times"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; }; DateTimeFormatW3CDTF = buildPerlPackage { From 14736fcf4ccc7f4255a0ce6328f18e9ebd825c81 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sat, 20 Aug 2016 21:51:41 +0200 Subject: [PATCH 23/32] openmodelica: fix libgfortran.so search --- pkgs/applications/science/misc/openmodelica/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/science/misc/openmodelica/default.nix b/pkgs/applications/science/misc/openmodelica/default.nix index 30e7fa6f50ff..8ea670c38189 100644 --- a/pkgs/applications/science/misc/openmodelica/default.nix +++ b/pkgs/applications/science/misc/openmodelica/default.nix @@ -26,6 +26,8 @@ stdenv.mkDerivation { ''; configurePhase = '' + export NIX_LDFLAGS="$NIX_LDFLAGS -L${gfortran.cc.lib}/lib" + autoconf ./configure CC=${clang}/bin/clang CXX=${clang}/bin/clang++ --prefix=$out ''; From 3581a00d69b83e05610bd9804980c87598d55ab2 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sat, 20 Aug 2016 23:41:34 +0200 Subject: [PATCH 24/32] torch: init at 0.0-pre20160820 --- pkgs/development/libraries/torch/default.nix | 28 ++++++++++++++++++++ pkgs/development/libraries/torch/src.json | 6 +++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 36 insertions(+) create mode 100644 pkgs/development/libraries/torch/default.nix create mode 100644 pkgs/development/libraries/torch/src.json diff --git a/pkgs/development/libraries/torch/default.nix b/pkgs/development/libraries/torch/default.nix new file mode 100644 index 000000000000..8700378ae75d --- /dev/null +++ b/pkgs/development/libraries/torch/default.nix @@ -0,0 +1,28 @@ +{stdenv, fetchgit, luajit, openblas, imagemagick, cmake, curl, fftw, gnuplot, + libjpeg_turbo, zeromq3, ncurses, openssl, libpng, qt4, readline, unzip}: +stdenv.mkDerivation rec{ + version = "0.0pre20160820"; + name = "torch-${version}"; + buildInputs = [ + luajit openblas imagemagick cmake curl fftw gnuplot unzip qt4 + libjpeg_turbo zeromq3 ncurses openssl libpng readline + ]; + src = fetchgit (stdenv.lib.importJSON ./src.json); + configurePhase = '' + ''; + buildPhase = '' + cd .. + export PREFIX=$out + mkdir "$out" + sh install.sh -s + ''; + installPhase = '' + ''; + meta = { + inherit version; + description = ''A scientific computing framework with wide support for machine learning algorithms''; + license = stdenv.lib.licenses.bsd3 ; + maintainers = [stdenv.lib.maintainers.raskin]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/development/libraries/torch/src.json b/pkgs/development/libraries/torch/src.json new file mode 100644 index 000000000000..37c7a20ce54c --- /dev/null +++ b/pkgs/development/libraries/torch/src.json @@ -0,0 +1,6 @@ +{ + "url": "https://github.com/torch/distro", + "rev": "8b6a834f8c8755f6f5f84ef9d8da9cfc79c5ce1f", + "sha256": "120hnz82d7izinsmv5smyqww71dhpix23pm43s522dfcglpql8xy", + "fetchSubmodules": true +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index be823f2dfbed..0f674e22b151 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9568,6 +9568,8 @@ in tokyotyrant = callPackage ../development/libraries/tokyo-tyrant { }; + torch = callPackage ../development/libraries/torch {}; + tremor = callPackage ../development/libraries/tremor { }; udns = callPackage ../development/libraries/udns { }; From dedc6716e4878ae2db1633125f887a3aa03789b3 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 20 Aug 2016 15:06:33 -0500 Subject: [PATCH 25/32] qt5: build without -reduce-relocations Fixes #17862. --- pkgs/development/libraries/qt-5/5.5/qtbase/default.nix | 2 +- pkgs/development/libraries/qt-5/5.5/qtbase/setup-hook.sh | 5 ----- pkgs/development/libraries/qt-5/5.6/qtbase/default.nix | 2 +- pkgs/development/libraries/qt-5/5.6/qtbase/setup-hook.sh | 5 ----- pkgs/development/libraries/qt-5/5.7/qtbase/default.nix | 2 +- pkgs/development/libraries/qt-5/5.7/qtbase/setup-hook.sh | 5 ----- 6 files changed, 3 insertions(+), 18 deletions(-) diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix index ef64a87d0e28..43eb71ede18f 100644 --- a/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix +++ b/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix @@ -131,7 +131,7 @@ stdenv.mkDerivation { -rpath -optimized-qmake -strip - -reduce-relocations + -no-reduce-relocations -system-proxies -pkg-config diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/setup-hook.sh b/pkgs/development/libraries/qt-5/5.5/qtbase/setup-hook.sh index 6d8989281eba..304919831140 100644 --- a/pkgs/development/libraries/qt-5/5.5/qtbase/setup-hook.sh +++ b/pkgs/development/libraries/qt-5/5.5/qtbase/setup-hook.sh @@ -61,11 +61,6 @@ _qtMultioutDevs() { preFixupHooks+=(_qtMultioutDevs) -if [[ -z "$NIX_QT_PIC" ]]; then - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE${NIX_CFLAGS_COMPILE:+ }-fPIC" - export NIX_QT_PIC=1 -fi - _qtSetCMakePrefix() { export CMAKE_PREFIX_PATH="$NIX_QT5_TMP${CMAKE_PREFIX_PATH:+:}${CMAKE_PREFIX_PATH}" } diff --git a/pkgs/development/libraries/qt-5/5.6/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.6/qtbase/default.nix index 82b54ebd3a11..6c52b29b35ec 100644 --- a/pkgs/development/libraries/qt-5/5.6/qtbase/default.nix +++ b/pkgs/development/libraries/qt-5/5.6/qtbase/default.nix @@ -107,7 +107,7 @@ stdenv.mkDerivation { -rpath -optimized-qmake -strip - -reduce-relocations + -no-reduce-relocations -system-proxies -pkg-config diff --git a/pkgs/development/libraries/qt-5/5.6/qtbase/setup-hook.sh b/pkgs/development/libraries/qt-5/5.6/qtbase/setup-hook.sh index 6d8989281eba..304919831140 100644 --- a/pkgs/development/libraries/qt-5/5.6/qtbase/setup-hook.sh +++ b/pkgs/development/libraries/qt-5/5.6/qtbase/setup-hook.sh @@ -61,11 +61,6 @@ _qtMultioutDevs() { preFixupHooks+=(_qtMultioutDevs) -if [[ -z "$NIX_QT_PIC" ]]; then - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE${NIX_CFLAGS_COMPILE:+ }-fPIC" - export NIX_QT_PIC=1 -fi - _qtSetCMakePrefix() { export CMAKE_PREFIX_PATH="$NIX_QT5_TMP${CMAKE_PREFIX_PATH:+:}${CMAKE_PREFIX_PATH}" } diff --git a/pkgs/development/libraries/qt-5/5.7/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.7/qtbase/default.nix index 94ddb21f3b60..f9d56612375c 100644 --- a/pkgs/development/libraries/qt-5/5.7/qtbase/default.nix +++ b/pkgs/development/libraries/qt-5/5.7/qtbase/default.nix @@ -106,7 +106,7 @@ stdenv.mkDerivation { -rpath -optimized-qmake -strip - -reduce-relocations + -no-reduce-relocations -system-proxies -pkg-config diff --git a/pkgs/development/libraries/qt-5/5.7/qtbase/setup-hook.sh b/pkgs/development/libraries/qt-5/5.7/qtbase/setup-hook.sh index 6d8989281eba..304919831140 100644 --- a/pkgs/development/libraries/qt-5/5.7/qtbase/setup-hook.sh +++ b/pkgs/development/libraries/qt-5/5.7/qtbase/setup-hook.sh @@ -61,11 +61,6 @@ _qtMultioutDevs() { preFixupHooks+=(_qtMultioutDevs) -if [[ -z "$NIX_QT_PIC" ]]; then - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE${NIX_CFLAGS_COMPILE:+ }-fPIC" - export NIX_QT_PIC=1 -fi - _qtSetCMakePrefix() { export CMAKE_PREFIX_PATH="$NIX_QT5_TMP${CMAKE_PREFIX_PATH:+:}${CMAKE_PREFIX_PATH}" } From a28ca06298056e57020ebb768b6ec567990a56aa Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 21 Aug 2016 00:55:30 +0200 Subject: [PATCH 26/32] ao: init at 0.0pre20160820 --- pkgs/applications/graphics/ao/default.nix | 33 +++++++++++++++++++++++ pkgs/applications/graphics/ao/src.json | 5 ++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 40 insertions(+) create mode 100644 pkgs/applications/graphics/ao/default.nix create mode 100644 pkgs/applications/graphics/ao/src.json diff --git a/pkgs/applications/graphics/ao/default.nix b/pkgs/applications/graphics/ao/default.nix new file mode 100644 index 000000000000..2a2d280d6b22 --- /dev/null +++ b/pkgs/applications/graphics/ao/default.nix @@ -0,0 +1,33 @@ +{stdenv, fetchgit, cmake, ninja, boost, libpng, glfw3, epoxy, guile, pkgconfig +, mesa, libX11, libpthreadstubs, libXau, libXdmcp, libXrandr, libXext +, libXinerama, libXxf86vm, libXcursor, libXfixes +}: +stdenv.mkDerivation rec { + version = "0.0pre20160820"; + name = "ao-${version}"; + buildInputs = [ + cmake ninja boost libpng glfw3 epoxy guile pkgconfig mesa libX11 + libpthreadstubs libXau libXdmcp libXrandr libXext libXinerama libXxf86vm + libXcursor libXfixes + ]; + src = fetchgit (stdenv.lib.importJSON ./src.json); + cmakeFlags = "-G Ninja"; + buildPhase = "ninja"; + installPhase = '' + ninja install + cd .. + cp lib/lib* bind/lib* "$out/lib" + cp -r bin "$out/bin" + mkdir "$out/doc" + cp -r doc "$out/doc/ao" + cp -r examples "$out/doc/ao/examples" + cp -r bind "$out/bind" + ''; + meta = { + inherit version; + description = ''Homoiconic CAD package''; + license = stdenv.lib.licenses.gpl2Plus ; # Some parts can be extracted and used under LGPL2+ + maintainers = [stdenv.lib.maintainers.raskin]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/applications/graphics/ao/src.json b/pkgs/applications/graphics/ao/src.json new file mode 100644 index 000000000000..0fa10dc3b0f4 --- /dev/null +++ b/pkgs/applications/graphics/ao/src.json @@ -0,0 +1,5 @@ +{ + "url": "https://github.com/mkeeter/ao", + "rev": "69fadb81543cc9031e4a7ec2036c7f2ab505a620", + "sha256": "1717k72vr0i5j7bvxmd6q16fpvkljnqfa1hr3i4yq8cjdsj69my7" +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0f674e22b151..fded25cd70f1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12288,6 +12288,8 @@ in antiword = callPackage ../applications/office/antiword {}; + ao = callPackage ../applications/graphics/ao {}; + ardour = self.ardour4; ardour3 = callPackage ../applications/audio/ardour/ardour3.nix { From 04a022be6d9db1942f9fa4a6d5f151613b68a0a4 Mon Sep 17 00:00:00 2001 From: Brian McKenna Date: Sun, 21 Aug 2016 12:57:57 +1000 Subject: [PATCH 27/32] idris: fix build not finding dynamic library --- pkgs/development/haskell-modules/configuration-common.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 12bfbd475f0d..7cba0d1599fd 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -839,6 +839,9 @@ self: super: { # https://github.com/guillaume-nargeot/hpc-coveralls/issues/52 hpc-coveralls = disableSharedExecutables super.hpc-coveralls; + # Can't find libHSidris-*.so during build. + idris = disableSharedExecutables super.idris; + # https://github.com/fpco/stackage/issues/838 cryptonite = dontCheck super.cryptonite; From f47ec8c744482505c4d3ddf65c5574a5a81a1c1d Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Sun, 21 Aug 2016 09:50:35 +0200 Subject: [PATCH 28/32] haskellPackages.Glob: Fix version in configuration-ghc-7.10.x --- pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix index bf2ca43fc875..d801d3b2cb8d 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix @@ -210,7 +210,7 @@ self: super: { semigroups_0_18_1 = addBuildDepends super.semigroups (with self; [hashable tagged text unordered-containers]); semigroups = addBuildDepends super.semigroups (with self; [hashable tagged text unordered-containers]); intervals = addBuildDepends super.intervals (with self; [doctest QuickCheck]); - Glob_0_7_9 = addBuildDepends super.Glob_0_7_9 (with self; [semigroups]); + Glob_0_7_10 = addBuildDepends super.Glob_0_7_10 (with self; [semigroups]); Glob = addBuildDepends super.Glob (with self; [semigroups]); # cereal must have `fail` in pre-ghc-8.0.x versions # also tests require bytestring>=0.10.8.1 From 17c86df7934df6e54fb834674ec3fa791f7fc8ac Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Sun, 21 Aug 2016 09:50:52 +0200 Subject: [PATCH 29/32] haskellPackages.aeson: Fix version in configuration-ghc-7.10.x --- pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix index d801d3b2cb8d..9f7db937814d 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix @@ -203,6 +203,7 @@ self: super: { hackage-security = dontHaddock (dontCheck super.hackage-security); # GHC versions prior to 8.x require additional build inputs. + aeson_0_11_2_0 = disableCabalFlag (addBuildDepend super.aeson_0_11_2_0 self.semigroups) "old-locale"; aeson = disableCabalFlag (addBuildDepend super.aeson self.semigroups) "old-locale"; case-insensitive = addBuildDepend super.case-insensitive self.semigroups; bytes = addBuildDepend super.bytes self.doctest; From 7a3260c590321272152976e66038ad80f296f6cf Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Sun, 21 Aug 2016 09:51:24 +0200 Subject: [PATCH 30/32] libvirt and pythonPackages.libvirt: 2.0.0 -> 2.1.0 --- pkgs/development/libraries/libvirt/default.nix | 4 ++-- pkgs/top-level/python-packages.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index 12b4459cbca0..1d585ce17faf 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -9,11 +9,11 @@ # if you update, also bump pythonPackages.libvirt or it will break stdenv.mkDerivation rec { name = "libvirt-${version}"; - version = "2.0.0"; + version = "2.1.0"; src = fetchurl { url = "http://libvirt.org/sources/${name}.tar.xz"; - sha256 = "1jwszhpjn09zkqji8w1x97rw0wqcl71ll2y6vp056fb1bvshms8h"; + sha256 = "0sriasjc573c519yqw1hcfb3qqjcsm9hm8vayw0anwkl6di9ay8s"; }; patches = [ ./build-on-bsd.patch ]; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6f94a8fa40b4..08271940c5a4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -26532,13 +26532,13 @@ in modules // { }; libvirt = let - version = "2.0.0"; + version = "2.1.0"; in assert version == pkgs.libvirt.version; pkgs.stdenv.mkDerivation rec { name = "libvirt-python-${version}"; src = pkgs.fetchurl { url = "http://libvirt.org/sources/python/${name}.tar.gz"; - sha256 = "0h0x5lpsx97bvw20pzfcsdmmivximddq4qmn8fk0n55dqv0wn5kq"; + sha256 = "1jxsxnhy303l3wpxzkyip39yq65zwc0pxni6ww0jgnv0pshpz23l"; }; buildInputs = with self; [ python pkgs.pkgconfig pkgs.libvirt lxml ]; From ab95a3ff7fdef556e35508677e5d104224be041a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 21 Aug 2016 11:28:41 +0200 Subject: [PATCH 31/32] xorg xf86-video-amdgpu: init at 1.1.0 Fixes #17682, closes #17857. The resulting binary is the same as in the PR, but this uses auto-generated expression with override. --- pkgs/servers/x11/xorg/default.nix | 11 +++++++++++ pkgs/servers/x11/xorg/overrides.nix | 4 ++++ pkgs/servers/x11/xorg/tarballs-7.7.list | 1 + 3 files changed, 16 insertions(+) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 4a2ac2469d82..da74fcb4ca6d 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1678,6 +1678,17 @@ let meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; + xf86videoamdgpu = (mkDerivation "xf86videoamdgpu" { + name = "xf86-video-amdgpu-1.1.0"; + builder = ./builder.sh; + src = fetchurl { + url = mirror://xorg/individual/driver/xf86-video-amdgpu-1.1.0.tar.bz2; + sha256 = "0cbrqpmi1hgbsi0i93v0yp7lv3wf4s0vbdlrj19cxmglv7gd1xb9"; + }; + buildInputs = [pkgconfig fontsproto mesa libdrm udev randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ]; + meta.platforms = stdenv.lib.platforms.unix; + }) // {inherit fontsproto mesa libdrm udev randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;}; + xf86videoark = (mkDerivation "xf86videoark" { name = "xf86-video-ark-0.7.5"; builder = ./builder.sh; diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index c6f28bcb645c..ebd09e3096ee 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -323,6 +323,10 @@ in ]; }; + xf86videoamdgpu = attrs: attrs // { + configureFlags = [ "--with-xorg-conf-dir=$(out)/share/X11/xorg.conf.d" ]; + }; + xf86videoati = attrs: attrs // { NIX_CFLAGS_COMPILE = "-I${xorg.xorgserver}/include/xorg"; }; diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list index 3dae9846335d..8a512144fdce 100644 --- a/pkgs/servers/x11/xorg/tarballs-7.7.list +++ b/pkgs/servers/x11/xorg/tarballs-7.7.list @@ -127,6 +127,7 @@ mirror://xorg/individual/driver/xf86-input-mouse-1.9.1.tar.bz2 mirror://xorg/individual/driver/xf86-input-synaptics-1.8.3.tar.bz2 mirror://xorg/individual/driver/xf86-input-vmmouse-13.1.0.tar.bz2 mirror://xorg/individual/driver/xf86-input-void-1.4.1.tar.bz2 +mirror://xorg/individual/driver/xf86-video-amdgpu-1.1.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-ark-0.7.5.tar.bz2 mirror://xorg/individual/driver/xf86-video-ast-1.1.5.tar.bz2 mirror://xorg/individual/driver/xf86-video-ati-7.7.0.tar.bz2 From b4821ece01818a4702b332e9bc54b093c50d5d7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 21 Aug 2016 11:58:14 +0200 Subject: [PATCH 32/32] nixos: blacklist radeon module if using amdgpu --- nixos/modules/hardware/video/amdgpu.nix | 9 +++++++++ nixos/modules/module-list.nix | 3 ++- 2 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 nixos/modules/hardware/video/amdgpu.nix diff --git a/nixos/modules/hardware/video/amdgpu.nix b/nixos/modules/hardware/video/amdgpu.nix new file mode 100644 index 000000000000..42fc8fa362de --- /dev/null +++ b/nixos/modules/hardware/video/amdgpu.nix @@ -0,0 +1,9 @@ +{ config, lib, ... }: + +with lib; +{ + config = mkIf (elem "amdgpu" config.services.xserver.videoDrivers) { + boot.blacklistedKernelModules = [ "radeon" ]; + }; +} + diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 41615a8a9dc3..eb89ff83e2ce 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -37,9 +37,10 @@ ./hardware/network/rtl8192c.nix ./hardware/opengl.nix ./hardware/pcmcia.nix + ./hardware/video/amdgpu.nix + ./hardware/video/ati.nix ./hardware/video/bumblebee.nix ./hardware/video/nvidia.nix - ./hardware/video/ati.nix ./hardware/video/webcam/facetimehd.nix ./i18n/input-method/default.nix ./i18n/input-method/fcitx.nix