JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 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
commit 68936edfb3
39 changed files with 182 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
nixos/modules/hardware/video/amdgpu.nix Normal file
View File

@ -0,0 +1,9 @@
{ config, lib, ... }:
with lib;
{
config = mkIf (elem "amdgpu" config.services.xserver.videoDrivers) {
boot.blacklistedKernelModules = [ "radeon" ];
};
}

3
nixos/modules/module-list.nix
View File

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

9
nixos/modules/services/continuous-integration/hydra/default.nix
View File

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

2
pkgs/applications/backup/areca/default.nix
View File

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

2
pkgs/applications/editors/ht/default.nix
View File

@ -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 = [

33
pkgs/applications/graphics/ao/default.nix Normal file
View File

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

5
pkgs/applications/graphics/ao/src.json Normal file
View File

@ -0,0 +1,5 @@
{
"url": "https://github.com/mkeeter/ao",
"rev": "69fadb81543cc9031e4a7ec2036c7f2ab505a620",
"sha256": "1717k72vr0i5j7bvxmd6q16fpvkljnqfa1hr3i4yq8cjdsj69my7"
}

2
pkgs/applications/misc/gammu/default.nix
View File

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

2
pkgs/applications/misc/mlterm/default.nix
View File

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

2
pkgs/applications/misc/xautoclick/default.nix
View File

@ -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 ]

2
pkgs/applications/science/misc/openmodelica/default.nix
View File

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

2
pkgs/applications/window-managers/windowmaker/dockapps/wmsystemtray.nix
View File

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

2
pkgs/desktops/lxde/core/lxmenu-data.nix
View File

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

4
pkgs/development/compilers/fpc/binary.nix
View File

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

8
pkgs/development/compilers/mlton/default.nix
View File

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

2
pkgs/development/compilers/mozart/binary.nix
View File

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

3
pkgs/development/haskell-modules/configuration-common.nix
View File

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

5
pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
View File

@ -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";
@ -203,6 +205,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;
@ -210,7 +213,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

4
pkgs/development/libraries/libvirt/default.nix
View File

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

2
pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
View File

@ -131,7 +131,7 @@ stdenv.mkDerivation {
-rpath
-optimized-qmake
-strip
-reduce-relocations
-no-reduce-relocations
-system-proxies
-pkg-config

5
pkgs/development/libraries/qt-5/5.5/qtbase/setup-hook.sh
View File

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

2
pkgs/development/libraries/qt-5/5.6/qtbase/default.nix
View File

@ -107,7 +107,7 @@ stdenv.mkDerivation {
-rpath
-optimized-qmake
-strip
-reduce-relocations
-no-reduce-relocations
-system-proxies
-pkg-config

5
pkgs/development/libraries/qt-5/5.6/qtbase/setup-hook.sh
View File

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

2
pkgs/development/libraries/qt-5/5.7/qtbase/default.nix
View File

@ -106,7 +106,7 @@ stdenv.mkDerivation {
-rpath
-optimized-qmake
-strip
-reduce-relocations
-no-reduce-relocations
-system-proxies
-pkg-config

5
pkgs/development/libraries/qt-5/5.7/qtbase/setup-hook.sh
View File

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

28
pkgs/development/libraries/torch/default.nix Normal file
View File

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

6
pkgs/development/libraries/torch/src.json Normal file
View File

@ -0,0 +1,6 @@
{
"url": "https://github.com/torch/distro",
"rev": "8b6a834f8c8755f6f5f84ef9d8da9cfc79c5ce1f",
"sha256": "120hnz82d7izinsmv5smyqww71dhpix23pm43s522dfcglpql8xy",
"fetchSubmodules": true
}

2
pkgs/development/ocaml-modules/magick/default.nix
View File

@ -12,6 +12,8 @@ stdenv.mkDerivation {
createFindlibDestdir = true;
preConfigure = "substituteInPlace Makefile --replace gcc $CC";
installTargets = [ "find_install" ];
meta = {

22
pkgs/development/perl-modules/CatalystXScriptServerStarman-fork-arg.patch Normal file
View File

@ -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)

2
pkgs/development/tools/omniorb/default.nix
View File

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

11
pkgs/servers/x11/xorg/default.nix
View File

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

4
pkgs/servers/x11/xorg/overrides.nix
View File

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

1
pkgs/servers/x11/xorg/tarballs-7.7.list
View File

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

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

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

@ -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 { };
@ -12286,6 +12288,8 @@ in
antiword = callPackage ../applications/office/antiword {};
ao = callPackage ../applications/graphics/ao {};
ardour = self.ardour4;
ardour3 = callPackage ../applications/audio/ardour/ardour3.nix {

18
pkgs/top-level/perl-packages.nix
View File

@ -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 = {
@ -3324,10 +3328,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 {
@ -11662,14 +11669,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 ];
};

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

@ -3321,7 +3321,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";
};
@ -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 ];