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

Merge branch 'master.upstream' into staging.upstream

Browse Source
This commit is contained in:
William A. Kennington III 2015-11-05 18:29:42 -08:00
commit 1e7aa4f17d
23 changed files with 125 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/maintainers.nix
View File

@ -190,6 +190,7 @@
mirdhyn = "Merlin Gaillard <mirdhyn@gmail.com>";
mschristiansen = "Mikkel Christiansen <mikkel@rheosystems.com>";
modulistic = "Pablo Costa <modulistic@gmail.com>";
mog = "Matthew O'Gorman <mog-lists@rldn.net>";
mornfall = "Petr Ročkai <me@mornfall.net>";
MP2E = "Cray Elliott <MP2E@archlinux.us>";
msackman = "Matthew Sackman <matthew@wellquite.org>";

36
pkgs/applications/misc/gnuradio-nacl/default.nix Normal file
View File

@ -0,0 +1,36 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig, boost, gnuradio, uhd
, makeWrapper, libsodium, cppunit
, pythonSupport ? true, python, swig
}:
assert pythonSupport -> python != null && swig != null;
stdenv.mkDerivation rec {
name = "gnuradio-nacl-${version}";
version = "2015-11-05";
src = fetchFromGitHub {
owner = "stwunsch";
repo = "gr-nacl";
rev = "d6dd3c02dcda3f601979908b61b1595476f6bf95";
sha256 = "0q28lgkndcw9921hm6cw5ilxd83n65hjajwl78j50mh6yc3bim35";
};
buildInputs = [
cmake pkgconfig boost gnuradio uhd makeWrapper libsodium cppunit
] ++ stdenv.lib.optionals pythonSupport [ python swig ];
postInstall = ''
for prog in "$out"/bin/*; do
wrapProgram "$prog" --set PYTHONPATH $PYTHONPATH:$(toPythonPath "$out")
done
'';
meta = with stdenv.lib; {
description = "Gnuradio block for encryption";
homepage = https://github.com/stwunsch/gr-nacl;
license = licenses.gpl3Plus;
platforms = platforms.linux;
maintainers = with maintainers; [ mog ];
};
}

14
pkgs/applications/office/calligra/default.nix
View File

@ -2,7 +2,7 @@
, exiv2, boost, sqlite, icu, vc, shared_mime_info, librevenge, libodfgen, libwpg
, libwpd, poppler_qt4, ilmbase, gsl, qca2, marble, libvisio, libmysql, postgresql
, freetds, fftw, glew, libkdcraw, pstoedit, opencolorio, kdepimlibs
, kactivities, okular, git
, kactivities, okular, git, oxygen_icons, makeWrapper
# TODO: not found
#, xbase, openjpeg
# TODO: package libWPS, Spnav, m2mml, LibEtonyek
@ -16,18 +16,26 @@ stdenv.mkDerivation rec {
sha256 = "08a5k8gjmzp9yzq46xy0p1sw7dpvxmxh8zz6dyj8q1dq29719kkc";
};
nativeBuildInputs = [ automoc4 cmake perl pkgconfig ];
nativeBuildInputs = [ automoc4 cmake perl pkgconfig makeWrapper ];
buildInputs = [
kdelibs lcms2 libpng eigen
exiv2 boost sqlite icu vc shared_mime_info librevenge libodfgen libwpg
libwpd poppler_qt4 ilmbase gsl qca2 marble libvisio libmysql postgresql
freetds fftw glew libkdcraw pstoedit opencolorio kdepimlibs
freetds fftw glew libkdcraw opencolorio kdepimlibs
kactivities okular git
];
enableParallelBuilding = true;
postInstall = ''
for i in $out/bin/*; do
wrapProgram $i \
--prefix PATH ':' "${pstoedit}/bin" \
--prefix XDG_DATA_DIRS ':' "${oxygen_icons}/share"
done
'';
meta = {
description = "A suite of productivity applications";
longDescription = ''

4
pkgs/applications/version-management/git-and-tools/git/default.nix
View File

@ -9,7 +9,7 @@
}:
let
version = "2.6.2";
version = "2.6.3";
svn = subversionClient.override { perlBindings = true; };
in
@ -18,7 +18,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz";
sha256 = "0w56027asrc5s20l5d4rnki7dla66gn84373afqw3mb9pjmkfvk4";
sha256 = "18vxb5fmwmrps504m23a4xdl29m7ibca3hmz0mn9jc38sz9y95yn";
};
patches = [

5
pkgs/applications/virtualization/openstack/neutron.nix
View File

@ -28,6 +28,11 @@ pythonPackages.buildPythonPackage rec {
oslo-versionedobjects
];
# make sure we include migrations
patchPhase = ''
echo "graft neutron" >> MANIFEST.in
'';
buildInputs = with pythonPackages; [
cliff coverage fixtures mock subunit requests-mock oslosphinx testrepository
testtools testresources testscenarios webtest oslotest os-testr tempest-lib

4
pkgs/applications/virtualization/qemu/default.nix
View File

@ -11,7 +11,7 @@
with stdenv.lib;
let
version = "2.4.0.1";
version = "2.4.1";
audio = optionalString (hasSuffix "linux" stdenv.system) "alsa,"
+ optionalString pulseSupport "pa,"
+ optionalString sdlSupport "sdl,";
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "http://wiki.qemu.org/download/qemu-${version}.tar.bz2";
sha256 = "1nqv5p94zpnhcaqkifnn83ap7dd0qrb0qiicswbyhhby0f48pzpc";
sha256 = "0xx1wc7lj5m3r2ab7f0axlfknszvbd8rlclpqz4jk48zid6czmg3";
};
buildInputs =

20
pkgs/development/interpreters/groovy/default.nix
View File

@ -1,26 +1,34 @@
{ stdenv, fetchurl, unzip }:
{ stdenv, fetchurl, unzip, which, makeWrapper, jdk }:
# at runtime, need jdk
stdenv.mkDerivation rec {
name = "groovy-${version}";
version = "2.4.3";
version = "2.4.5";
src = fetchurl {
url = "http://dl.bintray.com/groovy/maven/groovy-binary-${version}.zip";
sha256 = "1qfvw49fbw9svk4gsniw0g0ghal0dqm2hf1i77qmcf80lln1vhdh";
url = "http://dl.bintray.com/groovy/maven/apache-groovy-binary-${version}.zip";
sha256 = "1ajcrma18z0zr7h69bg4v2brxnxa4ljc9a55pk4q92vi3ypyks47";
};
buildInputs = [ unzip makeWrapper ];
installPhase = ''
mkdir -p $out
rm bin/*.bat
mv * $out
sed -i 's#which#${which}/bin/which#g' $out/bin/startGroovy
for p in grape java2groovy groovy{,doc,c,sh,Console}; do
wrapProgram $out/bin/$p \
--set JAVA_HOME "${jdk}" \
--prefix PATH ":" "${jdk}/bin"
done
'';
phases = "unpackPhase installPhase";
buildInputs = [ unzip ];
meta = with stdenv.lib; {
description = "An agile dynamic language for the Java Platform";
homepage = http://groovy-lang.org/;

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

@ -6,12 +6,12 @@
stdenv.mkDerivation rec {
name = "accelio-${version}${stdenv.lib.optionalString (kernel != null) "-kernel"}";
version = "2015-08-30";
version = "1.5";
src = fetchFromGitHub {
owner = "accelio";
repo = "accelio";
rev = "3d1f2b2d311aa70de9856832fd02647266624e82";
rev = "v1.5";
sha256 = "172frqk2n43g0arhazgcwfvj0syf861vdzdpxl7idr142bb0ykf7";
};

6
pkgs/development/libraries/gmp/6.x.nix
View File

@ -3,11 +3,11 @@
with { inherit (stdenv.lib) optional optionalString; };
stdenv.mkDerivation rec {
name = "gmp-6.0.0a";
name = "gmp-6.1.0";
src = fetchurl { # we need to use bz2, others aren't in bootstrapping stdenv
urls = [ "mirror://gnu/gmp/${name}.tar.bz2" "ftp://ftp.gmplib.org/pub/${name}/${name}.tar.bz2" ];
sha256 = "1bwsfmf0vrx3rwl4xmi5jhhy3v1qx1xj0m7p9hb0fvcw9f09m3kz";
sha256 = "1s3kddydvngqrpc6i1vbz39raya2jdcl042wi0ksbszgjjllk129";
};
nativeBuildInputs = [ m4 ];
@ -33,8 +33,6 @@ stdenv.mkDerivation rec {
configureFlagsArray+=("--build=$(./configfsf.guess)")
'';
patches = [ ./l0m4_tmp.patch ];
doCheck = true;
dontDisableStatic = withStatic;

27
pkgs/development/libraries/gmp/l0m4_tmp.patch
View File

@ -1,27 +0,0 @@
# HG changeset patch
# User Torbjorn Granlund <tege@gmplib.org>
# Date 1396470504 -7200
# Node ID 1fab0adc5ff7d9ecddcbda96f407da58347bb49c
# Parent db645603dcdb41afcf78b19b551ecd5a01c3841c
Workaround for Darwin assembler quirk.
diff -r db645603dcdb -r 1fab0adc5ff7 mpn/x86_64/k8/redc_1.asm
--- a/mpn/x86_64/k8/redc_1.asm Mon Mar 31 23:04:32 2014 +0200
+++ b/mpn/x86_64/k8/redc_1.asm Wed Apr 02 22:28:24 2014 +0200
@@ -114,7 +114,7 @@
JUMPTABSECT
ALIGN(8)
-L(tab): JMPENT( L(0m4), L(tab))
+L(tab): JMPENT( L(0), L(tab))
JMPENT( L(1), L(tab))
JMPENT( L(2), L(tab))
JMPENT( L(3), L(tab))
@@ -397,6 +397,7 @@
ALIGN(16)
+L(0):
L(0m4):
L(lo0): mov (mp,nneg,8), %rax
mov nneg, i

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

@ -1,11 +1,11 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "libsodium-1.0.3";
name = "libsodium-1.0.6";
src = fetchurl {
url = "https://download.libsodium.org/libsodium/releases/${name}.tar.gz";
sha256 = "120jkda2q58p0n68banh64vsfm3hgqnacagj425d218cr4ycdkyb";
sha256 = "0ngvcjwg6m9nivzi208yvz8yvmk6kxnvyr25w907kaicgpm063cl";
};
NIX_LDFLAGS = stdenv.lib.optionalString stdenv.cc.isGNU "-lssp";

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

@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, cmake, zlib, openssl, libsodium }:
stdenv.mkDerivation rec {
name = "libssh-0.7.1";
name = "libssh-0.7.2";
src = fetchurl {
url = "https://red.libssh.org/attachments/download/154/libssh-0.7.1.tar.xz";
sha256 = "0v84zm957z31yyrj47n62hby38nrjk5ih0ajmgccnqrjdpwwrirg";
url = "https://red.libssh.org/attachments/download/154/libssh-0.7.2.tar.xz";
sha256 = "0v84zm957z31yyrj47n62hby38nrjk5ih0ajmgccnqrjdpwwrira";
};
postPatch = ''

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

@ -13,13 +13,13 @@ let
in
stdenv.mkDerivation rec {
name = "rocksdb-${version}";
version = "3.13.1";
version = "4.0";
src = fetchFromGitHub {
owner = "facebook";
repo = "rocksdb";
rev = "rocksdb-${version}";
sha256 = "1jw2sjvpixz565wvmgls4rly3wylcmyypka4pvd9mhxkq8d699h9";
rev = "v${version}";
sha256 = "0zm4165h5fklcf4n8dar6mdj36g2kzp2pwf7fqnify1r48xwm8hx";
};
buildInputs = [ snappy google-gflags zlib bzip2 lz4 numactl malloc ];

4
pkgs/os-specific/linux/bluez/bluez5.nix
View File

@ -5,11 +5,11 @@
assert stdenv.isLinux;
stdenv.mkDerivation rec {
name = "bluez-5.35";
name = "bluez-5.36";
src = fetchurl {
url = "mirror://kernel/linux/bluetooth/${name}.tar.xz";
sha256 = "1qphz25hganfnd5ipfscbj7s70anv5favmwqmi9ig2saciaf1zhs";
sha256 = "1wkqwmi5krr37mxcqqlp5m2xnw7vw70v3ww7j09vvlskxcdflhx3";
};
pythonPath = with pythonPackages;

6
pkgs/os-specific/linux/cryptsetup/default.nix
View File

@ -5,11 +5,11 @@
assert enablePython -> python != null;
stdenv.mkDerivation rec {
name = "cryptsetup-1.6.7";
name = "cryptsetup-1.7.0";
src = fetchurl {
url = "mirror://kernel/linux/utils/cryptsetup/v1.6/${name}.tar.xz";
sha256 = "0878vwblazms1dac2ds7vyz8pgi1aac8870ccnl2s0v2sv428g62";
url = "mirror://kernel/linux/utils/cryptsetup/v1.7/${name}.tar.xz";
sha256 = "0j6iwf64pdrl4nm5ypc2r33b3k0aflb939wz2496vcqdrjkj8m87";
};
configureFlags = [ "--enable-cryptsetup-reencrypt" "--with-crypto_backend=openssl" ]

4
pkgs/servers/pulseaudio/default.nix
View File

@ -34,11 +34,11 @@
stdenv.mkDerivation rec {
name = "${if libOnly then "lib" else ""}pulseaudio-${version}";
version = "7.0";
version = "7.1";
src = fetchurl {
url = "http://freedesktop.org/software/pulseaudio/releases/pulseaudio-${version}.tar.xz";
sha256 = "1yp8x8z4wigrzik131kjdyhn7hznazvbkbp2zz1vy9l9gqvy26na";
sha256 = "1ndrac0j528lsg3b8wcsgvzds38ml0ja4m57xsn953rj51552rz6";
};
patches = [ ./caps-fix.patch ];

25
pkgs/tools/filesystems/ceph/9.0.3-i686-fix.patch
View File

@ -1,25 +0,0 @@
From 1213dde3d207d0d91ccecfca4dd6af1bdee0ed65 Mon Sep 17 00:00:00 2001
From: Kefu Chai <kchai@redhat.com>
Date: Fri, 17 Jul 2015 01:12:03 +0800
Subject: [PATCH] cls: fix the build on i386
this is a leftover of 0dae022
Signed-off-by: Kefu Chai <kchai@redhat.com>
---
src/cls/cephfs/cls_cephfs.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/cls/cephfs/cls_cephfs.h b/src/cls/cephfs/cls_cephfs.h
index 3cee0db..d4a5f23 100644
--- a/src/cls/cephfs/cls_cephfs.h
+++ b/src/cls/cephfs/cls_cephfs.h
@@ -118,7 +118,7 @@ class AccumulateResult
// Largest object seen
uint64_t max_obj_size;
// Highest mtime seen
- time_t max_mtime;
+ int64_t max_mtime;
AccumulateResult()
: ceiling_obj_index(0), ceiling_obj_size(0), max_obj_size(0), max_mtime(0)

13
pkgs/tools/filesystems/ceph/9.nix Normal file
View File

@ -0,0 +1,13 @@
{ callPackage, fetchgit, ... } @ args:
callPackage ./generic.nix (args // rec {
version = "9.2.0";
src = fetchgit {
url = "https://github.com/ceph/ceph.git";
rev = "refs/tags/v${version}";
sha256 = "1f8z0dxl945370ifz2ila9bc55d81h41bmdq241y9z4pvaynl6pa";
};
patches = [ ./fix-pythonpath.patch ];
})

1
pkgs/tools/filesystems/ceph/default.nix
View File

@ -1 +0,0 @@
0.94.nix

13
pkgs/tools/filesystems/ceph/default.nix Normal file
View File

@ -0,0 +1,13 @@
{ callPackage, fetchgit, ... } @ args:
callPackage ./generic.nix (args // rec {
version = "9.2.0";
src = fetchgit {
url = "https://github.com/ceph/ceph.git";
rev = "refs/tags/v${version}";
sha256 = "1lcal0jbpnm6y91s2v0g2zdnq7q0i5ql4bky294cz7g011di12vc";
};
patches = [ ./fix-pythonpath.patch ];
})

13
pkgs/tools/filesystems/ceph/dev.nix
View File

@ -1,13 +0,0 @@
{ callPackage, fetchgit, ... } @ args:
callPackage ./generic.nix (args // rec {
version = "9.1.0";
src = fetchgit {
url = "https://github.com/ceph/ceph.git";
rev = "refs/tags/v${version}";
sha256 = "1f8z0dxl945370ifz2ila9bc55d81h41bmdq241y9z4pvaynl6pz";
};
patches = [ ./fix-pythonpath.patch ];
})

1
pkgs/tools/filesystems/ceph/dev.nix Symbolic link
View File

@ -0,0 +1 @@
9.nix

4
pkgs/tools/misc/vdirsyncer/default.nix
View File

@ -1,13 +1,13 @@
{ stdenv, fetchurl, pythonPackages }:
pythonPackages.buildPythonPackage rec {
version = "0.7.0";
version = "0.7.3";
name = "vdirsyncer-${version}";
namePrefix = "";
src = fetchurl {
url = "https://pypi.python.org/packages/source/v/vdirsyncer/${name}.tar.gz";
sha256 = "0ahpi62yk6l06zjkpbhw1gp75x3qi9gcvm3yx6xcg5sz105y5yfx";
sha256 = "0ahi5ngqwsrv30bgziz35dx4gif7rbn9vqv340pigbzmywjxz1ry";
};
propagatedBuildInputs = with pythonPackages; [

4
pkgs/tools/networking/iperf/3.nix
View File

@ -1,11 +1,11 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "iperf-3.0.11";
name = "iperf-3.1";
src = fetchurl {
url = "http://downloads.es.net/pub/iperf/${name}.tar.gz";
sha256 = "0vkzx7yxhah49l83jb5r3y4zzfdqypj5y2b3fjc7rxj7dyzba7g0";
sha256 = "0mp6bhfbkkcrdc2sl65k0g5x5csnccqrjk3bc3a0kjr5rqpa71a3";
};
postInstall = ''

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

@ -1024,6 +1024,7 @@ let
libceph = ceph.lib;
ceph-0_80 = callPackage ../tools/filesystems/ceph/0.80.nix { };
ceph-0_94 = callPackage ../tools/filesystems/ceph/0.94.nix { };
ceph-9 = callPackage ../tools/filesystems/ceph/9.nix { };
ceph = callPackage ../tools/filesystems/ceph { };
ceph-dev = lowPrio (callPackage ../tools/filesystems/ceph/dev.nix { });
ceph-git = lowPrio (callPackage ../tools/filesystems/ceph/git.nix { });
@ -11521,9 +11522,11 @@ let
};
gnuradio-with-packages = callPackage ../applications/misc/gnuradio/wrapper.nix {
extraPackages = [ gnuradio-osmosdr ];
extraPackages = [ gnuradio-nacl gnuradio-osmosdr ];
};
gnuradio-nacl = callPackage ../applications/misc/gnuradio-nacl { };
gnuradio-osmosdr = callPackage ../applications/misc/gnuradio-osmosdr { };
goldendict = callPackage ../applications/misc/goldendict { };