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

Merge branch 'master' into staging-next

Browse Source
This commit is contained in:
Vladimír Čunát
2018-11-26 10:28:00 +01:00
parent e41154d1ab 4fef4fbb4b
commit a5de78b7d7
198 changed files with 2486 additions and 1200 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/libraries/SDL/default.nix
+1 -1
View File
@@ -91,7 +91,7 @@ stdenv.mkDerivation rec {
# Ticket: https://bugs.freedesktop.org/show_bug.cgi?id=27222
(fetchpatch {
name = "SDL_SetGamma.patch";
url = "http://src.fedoraproject.org/cgit/rpms/SDL.git/plain/SDL-1.2.15-x11-Bypass-SetGammaRamp-when-changing-gamma.patch?id=04a3a7b1bd88c2d5502292fad27e0e02d084698d";
url = "https://src.fedoraproject.org/cgit/rpms/SDL.git/plain/SDL-1.2.15-x11-Bypass-SetGammaRamp-when-changing-gamma.patch?id=04a3a7b1bd88c2d5502292fad27e0e02d084698d";
sha256 = "0x52s4328kilyq43i7psqkqg7chsfwh0aawr50j566nzd7j51dlv";
})
# Fix a build failure on OS X Mavericks
pkgs/development/libraries/confuse/default.nix
-17
View File
@@ -1,17 +0,0 @@
{stdenv, fetchurl}:
stdenv.mkDerivation rec {
name = "confuse-${version}";
version = "3.2.1";
src = fetchurl {
url = "https://github.com/martinh/libconfuse/releases/download/v${version}/${name}.tar.xz";
sha256 = "0pnjmlj9i0alp407qd7c0vq83sz7gpsjrbdgpcn4xvzjp9r35ii3";
};
meta = {
homepage = http://www.nongnu.org/confuse/;
description = "Configuration file parser library";
license = stdenv.lib.licenses.isc;
platforms = stdenv.lib.platforms.unix;
};
}
pkgs/development/libraries/cyrus-sasl/default.nix
+1 -1
View File
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
./missing-size_t.patch # https://bugzilla.redhat.com/show_bug.cgi?id=906519
(fetchpatch {
name = "CVE-2013-4122.patch";
url = "http://sourceforge.net/projects/miscellaneouspa/files/glibc217/cyrus-sasl-2.1.26-glibc217-crypt.diff";
url = "mirror://sourceforge/miscellaneouspa/files/glibc217/cyrus-sasl-2.1.26-glibc217-crypt.diff";
sha256 = "05l7dh1w9d5fvzg0pjwzqh0fy4ah8y5cv6v67s4ssbq8xwd4pkf2";
})
] ++ lib.optional stdenv.isFreeBSD (
pkgs/development/libraries/dssi/default.nix
+1 -1
View File
@@ -24,6 +24,6 @@ stdenv.mkDerivation rec {
];
platforms = platforms.linux;
license = licenses.lgpl21;
downloadPage = "http://sourceforge.net/projects/dssi/files/dssi/";
downloadPage = "https://sourceforge.net/projects/dssi/files/dssi/";
};
}
pkgs/development/libraries/kyotocabinet/default.nix
+1 -1
View File
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
patches = [(fetchurl {
name = "gcc6.patch";
url = "http://src.fedoraproject.org/rpms/kyotocabinet/raw/master/f/kyotocabinet-1.2.76-gcc6.patch";
url = "https://src.fedoraproject.org/rpms/kyotocabinet/raw/master/f/kyotocabinet-1.2.76-gcc6.patch";
sha256 = "1h5k38mkiq7lz8nd2gbn7yvimcz49g3z7phn1cr560bzjih8rz23";
})];
pkgs/development/libraries/libftdi/1.x.nix
+3 -3
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, cmake, pkgconfig, libusb1, confuse
{ stdenv, fetchurl, cmake, pkgconfig, libusb1, libconfuse
, cppSupport ? true, boost ? null
, pythonSupport ? true, python ? null, swig ? null
, docSupport ? true, doxygen ? null
@@ -16,8 +16,8 @@ stdenv.mkDerivation rec {
sha256 = "0x0vncf6i92slgrn0h7ghkskqbglbs534220qa84d0qg114zndpc";
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = with stdenv.lib; [ cmake confuse ]
nativeBuildInputs = [ cmake pkgconfig ];
buildInputs = with stdenv.lib; [ libconfuse ]
++ optionals cppSupport [ boost ]
++ optionals pythonSupport [ python swig ]
++ optionals docSupport [ doxygen ];
pkgs/development/libraries/libipfix/default.nix
+1 -1
View File
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
name = "libipfix-${version}";
version = "110209";
src = fetchurl {
url = "http://sourceforge.net/projects/libipfix/files/libipfix/libipfix_110209.tgz";
url = "mirror://sourceforge/libipfix/files/libipfix/libipfix_110209.tgz";
sha256 = "0h7v0sxjjdc41hl5vq2x0yhyn04bczl11bqm97825mivrvfymhn6";
};
meta = with stdenv.lib; {
pkgs/development/libraries/libmatheval/default.nix
+8 -8
View File
@@ -15,26 +15,26 @@ stdenv.mkDerivation rec {
# Patches coming from debian package
# https://packages.debian.org/source/sid/libs/libmatheval
patches = [ (fetchpatch {
url = "http://anonscm.debian.org/cgit/debian-science/packages/libmatheval.git/plain/debian/patches/002-skip-docs.patch";
url = "https://salsa.debian.org/science-team/libmatheval/raw/debian/1.1.11+dfsg-3/debian/patches/002-skip-docs.patch";
sha256 = "1nnkk9aw4jj6nql46zhwq6vx74zrmr1xq5ix0xyvpawhabhgjg62";
} )
(fetchpatch {
url = "http://anonscm.debian.org/cgit/debian-science/packages/libmatheval.git/plain/debian/patches/003-guile2.0.patch";
url = "https://salsa.debian.org/science-team/libmatheval/raw/debian/1.1.11+dfsg-3/debian/patches/003-guile2.0.patch";
sha256 = "1xgfw4finfvr20kjbpr4yl2djxmyr4lmvfa11pxirfvhrdi602qj";
} )
(fetchpatch {
url = "http://anonscm.debian.org/cgit/debian-science/packages/libmatheval.git/plain/debian/patches/disable_coth_test.patch";
url = "https://salsa.debian.org/science-team/libmatheval/raw/debian/1.1.11+dfsg-3/debian/patches/disable_coth_test.patch";
sha256 = "0bai8jrd5azfz5afmjixlvifk34liq58qb7p9kb45k6kc1fqqxzm";
} )
];
meta = {
description = "A library to parse and evaluate symbolic expressions input as text";
longDescription = ''
GNU libmatheval is a library (callable from C and Fortran) to parse and evaluate symbolic
expressions input as text. It supports expressions in any number of variables of arbitrary
names, decimal and symbolic constants, basic unary and binary operators, and elementary
mathematical functions. In addition to parsing and evaluation, libmatheval can also compute
GNU libmatheval is a library (callable from C and Fortran) to parse and evaluate symbolic
expressions input as text. It supports expressions in any number of variables of arbitrary
names, decimal and symbolic constants, basic unary and binary operators, and elementary
mathematical functions. In addition to parsing and evaluation, libmatheval can also compute
symbolic derivatives and output expressions to strings.
'';
homepage = https://www.gnu.org/software/libmatheval/;
pkgs/development/libraries/libp11/default.nix
+2 -2
View File
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "libp11-${version}";
version = "0.4.7";
version = "0.4.9";
src = fetchFromGitHub {
owner = "OpenSC";
repo = "libp11";
rev = name;
sha256 = "0n1i0pxj6l0vdq8gpdwfp5p9qd7wkymg0lpy6a17ix8hpqsljlhr";
sha256 = "1f0ir1mnr4wxxnql8ld2aa6288fn04fai5pr0sics7kbdm1g0cki";
};
makeFlags = [ "DESTDIR=$(out)" "PREFIX=" ];
pkgs/development/libraries/libtar/default.nix
+2 -2
View File
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
patches = let
fp = name: sha256:
fetchpatch {
url = "http://sources.debian.net/data/main/libt/libtar/1.2.20-4/debian/patches/${name}.patch";
url = "https://sources.debian.net/data/main/libt/libtar/1.2.20-4/debian/patches/${name}.patch";
inherit sha256;
};
in [
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "C library for manipulating POSIX tar files";
homepage = http://repo.or.cz/libtar;
homepage = https://repo.or.cz/libtar;
license = licenses.bsd3;
platforms = with platforms; linux ++ darwin;
maintainers = [ maintainers.bjornfor ];
pkgs/development/libraries/ntrack/default.nix
+1 -1
View File
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
name = "ntrack-${version}";
src = fetchurl {
url = "http://launchpad.net/ntrack/main/${version}/+download/${name}.tar.gz";
url = "https://launchpad.net/ntrack/main/${version}/+download/${name}.tar.gz";
sha256 = "037ig5y0mp327m0hh4pnfr3vmsk3wrxgfjy3645q4ws9vdhx807w";
};
pkgs/development/libraries/spice-gtk/default.nix
+1 -1
View File
@@ -74,7 +74,7 @@ in stdenv.mkDerivation rec {
Python bindings are available too.
'';
homepage = http://www.spice-space.org/;
homepage = https://www.spice-space.org/;
license = licenses.lgpl21;
maintainers = [ maintainers.xeji ];
platforms = platforms.linux;
pkgs/development/libraries/spice-protocol/default.nix
+1 -1
View File
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Protocol headers for the SPICE protocol";
homepage = http://www.spice-space.org;
homepage = https://www.spice-space.org/;
license = licenses.bsd3;
maintainers = with maintainers; [ bluescreen303 ];
platforms = platforms.linux;
pkgs/development/libraries/spice/default.nix
+1 -1
View File
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
VD-Interfaces. The VD-Interfaces (VDI) enable both ends of the solution to be easily
utilized by a third-party component.
'';
homepage = http://www.spice-space.org/;
homepage = https://www.spice-space.org/;
license = licenses.lgpl21;
maintainers = [ maintainers.bluescreen303 ];
pkgs/development/libraries/taglib/1.9.nix
+2 -2
View File
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
name = "taglib-1.9.1";
src = fetchurl {
url = http://taglib.github.io/releases/taglib-1.9.1.tar.gz;
url = https://taglib.github.io/releases/taglib-1.9.1.tar.gz;
sha256 = "06n7gnbcqa3r6c9gv00y0y1r48dyyazm6yj403i7ma0r2k6p3lvj";
};
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
buildInputs = [ zlib ];
meta = {
homepage = http://developer.kde.org/~wheeler/taglib.html;
homepage = https://taglib.org/;
repositories.git = git://github.com/taglib/taglib.git;
description = "A library for reading and editing the meta-data of several popular audio formats";
inherit (cmake.meta) platforms;