From f3dab1a1e9698d157163fb1e6916c1b7bbc775bb Mon Sep 17 00:00:00 2001 From: ndowens Date: Sat, 11 Mar 2017 08:55:45 -0600 Subject: [PATCH 01/45] armadillo: 7.700.0 -> 7.800.0 armadillo: Added forgotton version update --- pkgs/development/libraries/armadillo/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/armadillo/default.nix b/pkgs/development/libraries/armadillo/default.nix index 7f173b21156..bea592a6d20 100644 --- a/pkgs/development/libraries/armadillo/default.nix +++ b/pkgs/development/libraries/armadillo/default.nix @@ -1,24 +1,25 @@ { stdenv, fetchurl, cmake, openblasCompat, superlu, hdf5 }: stdenv.mkDerivation rec { - version = "7.700.0"; + version = "7.800.1"; name = "armadillo-${version}"; src = fetchurl { url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz"; - sha256 = "152x274hd3f59xgd27k9d3ikwb3w62v1v5hpw4lp1yzdyy8980pr"; + sha256 = "1nxq2jp4jlvinynv0l04rpdzpnkzdsng0d5vi3hilc0hlsjnbnjs"; }; - buildInputs = [ cmake openblasCompat superlu hdf5 ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ openblasCompat superlu hdf5 ]; cmakeFlags = [ "-DDETECT_HDF5=ON" ]; - patches = [ ./use-unix-config-on-OS-X.patch ]; + patches = [ ./use-unix-config-on-OS-X.patch ]; meta = with stdenv.lib; { description = "C++ linear algebra library"; homepage = http://arma.sourceforge.net; - license = licenses.mpl20; + license = licenses.apl2; platforms = platforms.unix; maintainers = with maintainers; [ juliendehos knedlsepp ]; }; From 112a91c2f77dd2312b581a22b14e578ab013cacf Mon Sep 17 00:00:00 2001 From: ndowens Date: Sun, 12 Mar 2017 13:45:02 -0500 Subject: [PATCH 02/45] enginepkcs11: libp11 version 0.4.0 and above contain enginepkcs11 enginepkcs11: Removed from all-packages.nix --- .../libraries/enginepkcs11/default.nix | 21 ------------------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 23 deletions(-) delete mode 100644 pkgs/development/libraries/enginepkcs11/default.nix diff --git a/pkgs/development/libraries/enginepkcs11/default.nix b/pkgs/development/libraries/enginepkcs11/default.nix deleted file mode 100644 index ff40a110a33..00000000000 --- a/pkgs/development/libraries/enginepkcs11/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{stdenv, fetchurl, libp11, pkgconfig, openssl}: - -stdenv.mkDerivation rec { - name = "engine_pkcs11-0.1.8"; - - src = fetchurl { - urls = [ - "http://www.opensc-project.org/files/engine_pkcs11/${name}.tar.gz" - "http://www.openadk.org/distfiles/${name}.tar.gz" - ]; - sha256 = "1rd20rxy12rfx3kwwvk5sqvc1ll87z60rqak1ksfwbf4wx0pwzfy"; - }; - - buildInputs = [ libp11 pkgconfig openssl ]; - - meta = { - homepage = http://www.opensc-project.org/engine_pkcs11/; - license = stdenv.lib.licenses.bsdOriginal; - description = "Engine for OpenSSL to use smart cards in PKCS#11 format"; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0d30d2197ce..b15e1bd7534 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7225,8 +7225,6 @@ with pkgs; enet = callPackage ../development/libraries/enet { }; - enginepkcs11 = callPackage ../development/libraries/enginepkcs11 { }; - epoxy = callPackage ../development/libraries/epoxy {}; esdl = callPackage ../development/libraries/esdl { }; From d016d4fea2f31701a4ebf07f31912b3b0e588f00 Mon Sep 17 00:00:00 2001 From: ndowens Date: Sat, 18 Mar 2017 16:05:56 -0500 Subject: [PATCH 03/45] shout: 0.51.1 -> 0.53.0 --- pkgs/applications/networking/irc/shout/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/irc/shout/default.nix b/pkgs/applications/networking/irc/shout/default.nix index 9d3e3ba449c..bf041a8845a 100644 --- a/pkgs/applications/networking/irc/shout/default.nix +++ b/pkgs/applications/networking/irc/shout/default.nix @@ -11,7 +11,7 @@ let in nodePackages.buildNodePackage rec { name = "shout-${version}"; - version = "0.51.1"; + version = "0.53.0"; src = fetchFromGitHub { owner = "erming"; From 98b9b07a98414805241944a9c7b7087a813099f9 Mon Sep 17 00:00:00 2001 From: ndowens Date: Sat, 18 Mar 2017 16:38:41 -0500 Subject: [PATCH 04/45] alchemy: 007 -> 008 --- pkgs/applications/graphics/alchemy/default.nix | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/graphics/alchemy/default.nix b/pkgs/applications/graphics/alchemy/default.nix index 263c411a8db..848f132060f 100644 --- a/pkgs/applications/graphics/alchemy/default.nix +++ b/pkgs/applications/graphics/alchemy/default.nix @@ -1,12 +1,14 @@ {stdenv, fetchurl, jre}: -stdenv.mkDerivation { - name = "alchemy-007"; +stdenv.mkDerivation rec { + name = "alchemy-${version}"; + version = "008"; + enableParallelBuilding = true; src = fetchurl { - url = http://al.chemy.org/files/Alchemy-007.tar.gz; - sha256 = "1pk00m4iajvv9jzv96in10czpcf7zc3d4nmd9biqagpsg28mr70b"; + url = "http://al.chemy.org/files/Alchemy-${version}.tar.gz"; + sha256 = "0449bvdccgx1jqnws1bckzs4nv2d230523qs0jx015gi81s1q7li"; }; installPhase = '' @@ -20,7 +22,7 @@ stdenv.mkDerivation { chmod +x $out/bin/alchemy ''; - meta = { + meta = with stdenv.lib; { description = "Drawing application"; longDescription = '' Alchemy is an open drawing project aimed at exploring how we can sketch, @@ -31,8 +33,8 @@ stdenv.mkDerivation { an expanded range of ideas and possibilities in a serendipitous way. ''; homepage = http://al.chemy.org/; - license = stdenv.lib.licenses.gpl3Plus; - maintainers = [stdenv.lib.maintainers.marcweber]; - platforms = stdenv.lib.platforms.linux; + license = licenses.gpl3Plus; + maintainers = [ maintainers.marcweber ]; + platforms = platforms.linux; }; } From 35e7df6bee6dc67889771b01b7fed08fa7204922 Mon Sep 17 00:00:00 2001 From: ndowens Date: Sat, 18 Mar 2017 16:42:47 -0500 Subject: [PATCH 05/45] ahoviewer: 1.4.6 -> 1.4.8 --- .../graphics/ahoviewer/default.nix | 24 ++++++++++++------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/graphics/ahoviewer/default.nix b/pkgs/applications/graphics/ahoviewer/default.nix index 2a78f509429..dc974aed057 100644 --- a/pkgs/applications/graphics/ahoviewer/default.nix +++ b/pkgs/applications/graphics/ahoviewer/default.nix @@ -1,15 +1,20 @@ { stdenv, pkgs, fetchurl, fetchFromGitHub, pkgconfig, libconfig, gtkmm2, glibmm, libxml2, libsecret, curl, unrar, libzip, librsvg, gst_all_1, autoreconfHook, makeWrapper }: -stdenv.mkDerivation { - name = "ahoviewer-1.4.6"; + +stdenv.mkDerivation rec { + name = "ahoviewer-${version}"; + version = "1.4.8"; + src = fetchFromGitHub { owner = "ahodesuka"; repo = "ahoviewer"; - rev = "414cb91d66d96fab4b48593a7ef4d9ad461306aa"; - sha256 = "081jgfmbwf2av0cn229cf4qyv6ha80ridymsgwq45124b78y2bmb"; + rev = version; + sha256 = "0fsak22hpi2r8zqysswdyngaf3n635qvclqh1p0g0wrkfza4dbc4"; }; + enableParallelBuilding = true; + nativeBuildInputs = [ autoreconfHook pkgconfig makeWrapper ]; buildInputs = [ glibmm libconfig gtkmm2 glibmm libxml2 libsecret curl unrar libzip librsvg @@ -18,18 +23,21 @@ stdenv.mkDerivation { gst_all_1.gst-plugins-bad gst_all_1.gst-libav gst_all_1.gst-plugins-base ]; + postPatch = ''patchShebangs version.sh''; + postInstall = '' wrapProgram $out/bin/ahoviewer \ --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" \ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" ''; - meta = { + + meta = with stdenv.lib; { homepage = "https://github.com/ahodesuka/ahoviewer"; description = "A GTK2 image viewer, manga reader, and booru browser"; - maintainers = [ stdenv.lib.maintainers.skrzyp ]; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.allBut [ "darwin" "cygwin" ]; + maintainers = [ maintainers.skrzyp ]; + license = licenses.mit; + platforms = platforms.allBut [ "darwin" "cygwin" ]; }; } From 4024c6354e306c5cff511b7d352c249feef0d3ef Mon Sep 17 00:00:00 2001 From: ndowens Date: Sat, 18 Mar 2017 18:30:57 -0500 Subject: [PATCH 06/45] fontmatrix: Changed URL & homepage; they no longer exist --- .../graphics/fontmatrix/default.nix | 22 +++++++++++-------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/graphics/fontmatrix/default.nix b/pkgs/applications/graphics/fontmatrix/default.nix index fc30a355910..ced6a5f7258 100644 --- a/pkgs/applications/graphics/fontmatrix/default.nix +++ b/pkgs/applications/graphics/fontmatrix/default.nix @@ -1,10 +1,14 @@ -{ stdenv, fetchurl, cmake, qt4 }: +{ stdenv, fetchFromGitHub, cmake, qt4 }: stdenv.mkDerivation rec { - name = "fontmatrix-0.6.0"; - src = fetchurl { - url = "http://fontmatrix.be/archives/${name}-Source.tar.gz"; - sha256 = "bcc5e929d95d2a0c9481d185144095c4e660255220a7ae6640298163ee77042c"; + name = "fontmatrix-${version}"; + version = "0.6.0"; + + src = fetchFromGitHub { + owner = "fontmatrix"; + repo = "fontmatrix"; + rev = "v${version}"; + sha256 = "0aqndj1jhm6hjpwmj1qm92z2ljh7w78a5ff5ag47qywqha1ngn05"; }; buildInputs = [ qt4 ]; @@ -13,10 +17,10 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - meta = { + meta = with stdenv.lib; { description = "Fontmatrix is a free/libre font explorer for Linux, Windows and Mac"; - homepage = http://fontmatrix.be/; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; + homepage = http://github.com/fontmatrix/fontmatrix; + license = licenses.gpl2; + platforms = platforms.linux; }; } From 3dfd03b38288b7c272bc6090cc4f86d076d31cee Mon Sep 17 00:00:00 2001 From: ndowens Date: Sat, 18 Mar 2017 18:38:47 -0500 Subject: [PATCH 07/45] glabels: 3.2.1 -> 3.4.0 --- .../applications/graphics/glabels/default.nix | 22 +++++++++---------- 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/graphics/glabels/default.nix b/pkgs/applications/graphics/glabels/default.nix index cf1ab1942e5..6dcf8223777 100644 --- a/pkgs/applications/graphics/glabels/default.nix +++ b/pkgs/applications/graphics/glabels/default.nix @@ -1,23 +1,23 @@ -{ stdenv, fetchFromGitHub, autoconf, automake, barcode, gnome3 +{ stdenv, fetchurl, barcode, gnome3, autoreconfHook , gtk3, gtk_doc, libxml2, librsvg , libtool, libe-book , intltool, itstool, makeWrapper, pkgconfig, which }: stdenv.mkDerivation rec { name = "glabels-${version}"; - version = "3.2.1"; - src = fetchFromGitHub { - owner = "jimevins"; - repo = "glabels"; - rev = "glabels-3_2_1"; - sha256 = "1y6gz0v9si3cvdzhakbgkyc94fajg19rmykfgnc37alrc21vs9zg"; + version = "3.4.0"; + + src = fetchurl { + url = "http://ftp.gnome.org/pub/GNOME/sources/glabels/3.4/glabels-3.4.0.tar.xz"; + sha256 = "04345crf5yrhq6rlrymz630rxnm8yw41vx04hb6xn2nkjn9hf3nl"; }; + nativeBuildInputs = [ autoreconfHook pkgconfig makeWrapper intltool ]; buildInputs = [ - autoconf automake barcode gtk3 gtk_doc gnome3.yelp_tools + barcode gtk3 gtk_doc gnome3.yelp_tools gnome3.gnome_common gnome3.gsettings_desktop_schemas - intltool itstool libxml2 librsvg libe-book libtool - makeWrapper pkgconfig + itstool libxml2 librsvg libe-book libtool + ]; preFixup = '' @@ -26,8 +26,6 @@ stdenv.mkDerivation rec { --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" ''; - preConfigure = "./autogen.sh"; - meta = { description = "Create labels and business cards"; homepage = http://glabels.org/; From 1ef5a381082aa2be7dea59f129ccd90dc5c0b3a7 Mon Sep 17 00:00:00 2001 From: neeasade Date: Sat, 18 Mar 2017 18:20:01 -0500 Subject: [PATCH 08/45] xrq: init at unstable-2016-01-15 --- pkgs/applications/misc/xrq/default.nix | 27 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/applications/misc/xrq/default.nix diff --git a/pkgs/applications/misc/xrq/default.nix b/pkgs/applications/misc/xrq/default.nix new file mode 100644 index 00000000000..c0c5616db79 --- /dev/null +++ b/pkgs/applications/misc/xrq/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitHub, libX11}: + +stdenv.mkDerivation rec { + name = "xrq-unstable-2016-01-15"; + + src = fetchFromGitHub { + owner = "arianon"; + repo = "xrq"; + rev = "d5dc19c63881ebdd1287a02968e3a1447dde14a9"; + sha256 = "1bxf6h3fjw3kjraz7028m7p229l423y1ngy88lqvf0xl1g3dhp36"; + }; + + installPhase = '' + make PREFIX=$out install + ''; + + outputs = [ "out" "doc" ]; + + buildInputs = [ libX11 ]; + + meta = { + description = "X utility for querying xrdb"; + homepage = https://github.com/arianon/xrq; + license = stdenv.lib.licenses.mit; + platforms = with stdenv.lib.platforms; unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 648a232d010..34ba3a7014e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18345,6 +18345,8 @@ with pkgs; xulrunner = firefox-unwrapped; + xrq = callPackage ../applications/misc/xrq { }; + nitrokey-app = callPackage ../tools/security/nitrokey-app { }; fpm2 = callPackage ../tools/security/fpm2 { }; From 7364b6c2524ba70edbacc5525b5e2f612a8fba1a Mon Sep 17 00:00:00 2001 From: ndowens Date: Sat, 18 Mar 2017 19:09:17 -0500 Subject: [PATCH 09/45] jpegoptim: 1.4.3 -> 1.4.4 --- pkgs/applications/graphics/jpegoptim/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/graphics/jpegoptim/default.nix b/pkgs/applications/graphics/jpegoptim/default.nix index 5bb577011e7..b7063a0c4e7 100644 --- a/pkgs/applications/graphics/jpegoptim/default.nix +++ b/pkgs/applications/graphics/jpegoptim/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, libjpeg }: stdenv.mkDerivation rec { - version = "1.4.3"; + version = "1.4.4"; name = "jpegoptim-${version}"; src = fetchurl { url = "http://www.kokkonen.net/tjko/src/${name}.tar.gz"; - sha256 = "0k53q7dc8w5ashz8v261x2b5vvz7gdvg8w962rz9gjvkjbh4lg93"; + sha256 = "1cn1i0g1xjdwa12w0ifbnzgb1vqbpr8ji6h05vxksj79vyi3x849"; }; # There are no checks, it seems. @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { buildInputs = [ libjpeg ]; - meta = { + meta = with stdenv.lib; { description = "Optimize JPEG files"; homepage = http://www.kokkonen.net/tjko/projects.html ; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.aristid ]; - platforms = stdenv.lib.platforms.all; + license = licenses.gpl2; + maintainers = [ maintainers.aristid ]; + platforms = platforms.all; }; } From 7b1e1f3cd79e46ae83819a0d1324524be17c89d9 Mon Sep 17 00:00:00 2001 From: ndowens Date: Sat, 18 Mar 2017 19:32:30 -0500 Subject: [PATCH 10/45] leocad: 0.81 -> 17.02 --- pkgs/applications/graphics/leocad/default.nix | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/graphics/leocad/default.nix b/pkgs/applications/graphics/leocad/default.nix index 96384765bd0..0de170a1cac 100644 --- a/pkgs/applications/graphics/leocad/default.nix +++ b/pkgs/applications/graphics/leocad/default.nix @@ -3,24 +3,26 @@ To use aditional parts libraries set the variable LEOCAD_LIB=/path/to/libs/ or use option -l /path/to/libs/ */ -{ stdenv, fetchsvn, qt4, qmake4Hook, zlib }: +{ stdenv, fetchFromGitHub, qt4, qmake4Hook, zlib }: stdenv.mkDerivation rec { name = "leocad-${version}"; - version = "0.81"; + version = "17.02"; - src = fetchsvn { - url = "http://svn.leocad.org/tags/${name}"; - sha256 = "1190gb437ls51hhfiwa79fq131026kywpy3j3k4fkdgfr8a9v3q8"; + src = fetchFromGitHub { + owner = "leozide"; + repo = "leocad"; + rev = "v${version}"; + sha256 = "0d7l2il6r4swnmrmaf1bsrgpjgai5xwhwk2mkpcsddnk59790mmc"; }; - buildInputs = [ qt4 qmake4Hook zlib ]; - + nativeBuildInputs = [ qmake4Hook ]; + buildInputs = [ qt4 zlib ]; postPatch = '' sed '1i#include ' -i common/camera.cpp substituteInPlace common/camera.cpp --replace "isnan(" "std::isnan(" export qmakeFlags="$qmakeFlags INSTALL_PREFIX=$out" - ''; + ''; meta = with stdenv.lib; { description = "CAD program for creating virtual LEGO models"; From f5d6dd6e83a73392bb4ff4509a8a84e0bf240002 Mon Sep 17 00:00:00 2001 From: ndowens Date: Sat, 18 Mar 2017 20:22:54 -0500 Subject: [PATCH 11/45] openimageio: 1.6.11 -> 1.7.12 --- .../graphics/openimageio/default.nix | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/graphics/openimageio/default.nix b/pkgs/applications/graphics/openimageio/default.nix index d16800dc881..44faeea007d 100644 --- a/pkgs/applications/graphics/openimageio/default.nix +++ b/pkgs/applications/graphics/openimageio/default.nix @@ -1,20 +1,24 @@ -{ stdenv, fetchurl, boost, cmake, ilmbase, libjpeg, libpng, libtiff +{ stdenv, fetchFromGitHub, boost, cmake, ilmbase, libjpeg, libpng, libtiff , opencolorio, openexr, unzip }: stdenv.mkDerivation rec { name = "openimageio-${version}"; - version = "1.6.11"; + version = "1.7.12"; - src = fetchurl { - url = "https://github.com/OpenImageIO/oiio/archive/Release-${version}.zip"; - sha256 = "0cr0z81a41bg193dx9crcq1mns7mmzz7qys4lrbm18cmdbwkk88x"; + src = fetchFromGitHub { + owner = "OpenImageIO"; + repo = "oiio"; + rev = "Release-${version}"; + sha256 = "1ganx4f7zis5lkxxrwc83dbgngaxww2846bsc4vrg5dhjnns6n4y"; }; outputs = [ "bin" "out" "dev" "doc" ]; + nativeBuildInputs = [ cmake ]; buildInputs = [ - boost cmake ilmbase libjpeg libpng libtiff opencolorio openexr + boost ilmbase libjpeg libpng + libtiff opencolorio openexr unzip ]; From 8f9e2c6e6bda21533f01c3dd5cad34b049e1cd1b Mon Sep 17 00:00:00 2001 From: "Rommel M. Martinez" Date: Sun, 19 Mar 2017 09:25:58 +0800 Subject: [PATCH 12/45] emem: 0.2.42 -> 0.2.43 --- pkgs/applications/misc/emem/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/emem/default.nix b/pkgs/applications/misc/emem/default.nix index 57d3539d271..0ac6f21b9fd 100644 --- a/pkgs/applications/misc/emem/default.nix +++ b/pkgs/applications/misc/emem/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "emem"; - version = "0.2.42"; + version = "0.2.43"; name = "${pname}-${version}"; inherit jdk; src = fetchurl { url = "https://github.com/ebzzry/${pname}/releases/download/v${version}/${pname}.jar"; - sha256 = "0zm3sqgbiaj44nkgkjiifxwwyrcjs42nry6zmbg3dnnpd0v82v8j"; + sha256 = "0p3v28vjqyx961sfsd1h2cg2g2q0v03qd87dppbxqp7g5ppls91x"; }; phases = [ "buildPhase" "installPhase" ]; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { installPhase = '' cp $src $out/share/java/${pname}.jar - cat > $out/bin/${pname} < $out/bin/${pname} << EOF #! $SHELL $jdk/bin/java -jar $out/share/java/${pname}.jar "\$@" EOF From d18f55269c3a0d83c0c34875b6047adb12e4b581 Mon Sep 17 00:00:00 2001 From: Kosyrev Serge <_deepfire@feelingofgreen.ru> Date: Sun, 19 Mar 2017 05:27:17 +0300 Subject: [PATCH 13/45] nvidia-x11: don't patch things if libsOnly requested --- pkgs/os-specific/linux/nvidia-x11/generic.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/nvidia-x11/generic.nix b/pkgs/os-specific/linux/nvidia-x11/generic.nix index eb4d3ae224a..4573766b78b 100644 --- a/pkgs/os-specific/linux/nvidia-x11/generic.nix +++ b/pkgs/os-specific/linux/nvidia-x11/generic.nix @@ -43,7 +43,7 @@ let else throw "nvidia-x11 does not support platform ${stdenv.system}"; # patch to get the nvidia and nvidiaBeta driver to compile on kernel 4.10 - patches = if versionOlder version "375" + patches = if libsOnly || versionOlder version "375" then null else [ (fetchurl { url = https://git.archlinux.org/svntogit/packages.git/plain/trunk/kernel_4.10.patch?h=packages/nvidia; sha256 = "0zhpx3baq2pca2pmz1af5cp2nzjxjx0j9w5xrdy204mnv3v2708z"; From d860a68fd0f203983a734094ef6eb78707c586c2 Mon Sep 17 00:00:00 2001 From: Kosyrev Serge <_deepfire@feelingofgreen.ru> Date: Sun, 19 Mar 2017 05:28:02 +0300 Subject: [PATCH 14/45] nvidia-x11: $bin can be empty --- pkgs/os-specific/linux/nvidia-x11/builder.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/nvidia-x11/builder.sh b/pkgs/os-specific/linux/nvidia-x11/builder.sh index 24a2e2cf06f..99813d38236 100755 --- a/pkgs/os-specific/linux/nvidia-x11/builder.sh +++ b/pkgs/os-specific/linux/nvidia-x11/builder.sh @@ -78,7 +78,7 @@ installPhase() { fi # All libs except GUI-only are installed now, so fixup them. - for libname in `find "$out/lib/" -name '*.so.*'` `find "$bin/lib/" -name '*.so.*'` + for libname in `find "$out/lib/" -name '*.so.*'` `test -z "$bin" || find "$bin/lib/" -name '*.so.*'` do # I'm lazy to differentiate needed libs per-library, as the closure is the same. # Unfortunately --shrink-rpath would strip too much. From 474078ac05081076a28d389dafd26dcc7aff44b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20Th=C3=B6rne?= Date: Sun, 19 Mar 2017 13:40:22 +0100 Subject: [PATCH 15/45] clog-cli: 0.9.2 -> 0.9.3 --- pkgs/development/tools/clog-cli/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/clog-cli/default.nix b/pkgs/development/tools/clog-cli/default.nix index 1d6ac8493f1..f64ead3e107 100644 --- a/pkgs/development/tools/clog-cli/default.nix +++ b/pkgs/development/tools/clog-cli/default.nix @@ -4,16 +4,16 @@ with rustPlatform; buildRustPackage rec { name = "clog-cli-${version}"; - version = "0.9.2"; + version = "0.9.3"; src = fetchFromGitHub { owner = "clog-tool"; repo = "clog-cli"; - rev = "${version}"; - sha256 = "00sfbchyf50z6mb5dq1837hlrki88rrf043idy6qd1r90488jsbv"; + rev = "v${version}"; + sha256 = "1wxglc4n1dar5qphhj5pab7ps34cjr7jy611fwn72lz0f6c7jp3z"; }; - depsSha256 = "0czv190r6xhbw33l0jhlri6rgspxb8f6dakcamh52qr3z9m0xs2x"; + depsSha256 = "0gkg3bxx7nxsvff33n7pif731djfvlzk0msia27h0wq0mazq7kw3"; meta = { description = "Generate changelogs from local git metadata"; From 64a880faa6c890ca11ed12b8b1aef4df8e5b1397 Mon Sep 17 00:00:00 2001 From: ndowens Date: Sun, 19 Mar 2017 08:40:15 -0500 Subject: [PATCH 16/45] djview: 4.10.5 -> 4.10.6 (#24029) --- pkgs/applications/graphics/djview/default.nix | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/graphics/djview/default.nix b/pkgs/applications/graphics/djview/default.nix index 2276b868b59..2ce1ebb257d 100644 --- a/pkgs/applications/graphics/djview/default.nix +++ b/pkgs/applications/graphics/djview/default.nix @@ -1,19 +1,18 @@ -{ stdenv, fetchurl, pkgconfig, djvulibre, qt4, xorg, libtiff }: +{ stdenv, fetchurl, pkgconfig +, djvulibre, qt4, xorg, libtiff }: -let - qt = qt4; - # TODO: qt = qt5.base; # should work but there's a mysterious "-silent" error -in stdenv.mkDerivation rec { - name = "djview-4.10.5"; + name = "djview-${version}"; + version = "4.10.6"; + src = fetchurl { url = "mirror://sourceforge/djvu/${name}.tar.gz"; - sha256 = "0gbvbly7w3cr8wgpyh76nf9w7cf7740vp7k5hccks186f6005cx0"; + sha256 = "08bwv8ppdzhryfcnifgzgdilb12jcnivl4ig6hd44f12d76z6il4"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ djvulibre qt xorg.libXt libtiff ]; + buildInputs = [ djvulibre qt4 xorg.libXt libtiff ]; passthru = { mozillaPlugin = "/lib/netscape/plugins"; @@ -23,7 +22,7 @@ stdenv.mkDerivation rec { homepage = http://djvu.sourceforge.net/djview4.html; description = "A portable DjVu viewer and browser plugin"; license = licenses.gpl2; - inherit (qt.meta) platforms; + platforms = platforms.unix; maintainers = [ maintainers.urkud ]; }; } From 02126b69e5f5744cc677a0a025ccabb3b3ca865a Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Sun, 19 Mar 2017 14:51:04 +0100 Subject: [PATCH 17/45] lib.readPathsFromFile: simplify, /cc #24036 This part isn't needed after 36de745e1b7. --- lib/strings.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/lib/strings.nix b/lib/strings.nix index 44b6f8780c8..ffa93c8e454 100644 --- a/lib/strings.nix +++ b/lib/strings.nix @@ -476,9 +476,7 @@ rec { readPathsFromFile = rootPath: file: let root = toString rootPath; - lines = - builtins.map (lib.removeSuffix "\n") - (lib.splitString "\n" (builtins.readFile file)); + lines = lib.splitString "\n" (builtins.readFile file); removeComments = lib.filter (line: line != "" && !(lib.hasPrefix "#" line)); relativePaths = removeComments lines; absolutePaths = builtins.map (path: builtins.toPath (root + "/" + path)) relativePaths; From b51093a75e979990c5869030c738a1afba49ae72 Mon Sep 17 00:00:00 2001 From: ndowens Date: Sun, 19 Mar 2017 09:19:57 -0500 Subject: [PATCH 18/45] libevdev: 1.4.6 -> 1.5.6 (#23940) --- pkgs/development/libraries/libevdev/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libevdev/default.nix b/pkgs/development/libraries/libevdev/default.nix index 3ff40141b16..fd7eef14b65 100644 --- a/pkgs/development/libraries/libevdev/default.nix +++ b/pkgs/development/libraries/libevdev/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, python }: stdenv.mkDerivation rec { - name = "libevdev-1.4.6"; + name = "libevdev-1.5.6"; src = fetchurl { url = "http://www.freedesktop.org/software/libevdev/${name}.tar.xz"; - sha256 = "1lrja526iyg48yw6i0dxdhyj63q9gwbgvj6xk1hskxzrqyhf2akv"; + sha256 = "1256ypz93039n6km4macg158fpmjgylhmcmk20pnklxicsfpxv7c"; }; buildInputs = [ python ]; From bd0d64730a90c8447245e415a2d10982ca95ba35 Mon Sep 17 00:00:00 2001 From: Leandro Lisboa Penz Date: Sun, 19 Mar 2017 14:25:56 +0000 Subject: [PATCH 19/45] gnu global: set path of default gtags.conf in wrapper GNU global's gtags and global tools were unable to find the default gtags.conf, necessary to use gtagslabels. The error could be seen when gtags was invoked with -v: $ gtags -v --gtagslabel=pygments [Sun Mar 19 14:13:17 UTC 2017] Gtags started. Using default configuration. GTAGSLABEL(--gtagslabel) ignored since configuration file not found. Using 'gtags.files' as a file list. [Sun Mar 19 14:13:17 UTC 2017] Creating 'GTAGS' and 'GRTAGS'. [Sun Mar 19 14:13:17 UTC 2017] Done. The wrapper now points to the default gtags.conf using the GTAGSCONF environment variable. --- pkgs/development/tools/misc/global/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/tools/misc/global/default.nix b/pkgs/development/tools/misc/global/default.nix index bd111c4ffbb..62d96b2158f 100644 --- a/pkgs/development/tools/misc/global/default.nix +++ b/pkgs/development/tools/misc/global/default.nix @@ -34,8 +34,10 @@ stdenv.mkDerivation rec { cp -v *.el "$out/share/emacs/site-lisp" wrapProgram $out/bin/gtags \ + --prefix GTAGSCONF : "$out/share/gtags/gtags.conf" \ --prefix PYTHONPATH : "$(toPythonPath ${pythonPackages.pygments})" wrapProgram $out/bin/global \ + --prefix GTAGSCONF : "$out/share/gtags/gtags.conf" \ --prefix PYTHONPATH : "$(toPythonPath ${pythonPackages.pygments})" ''; From 9c7b771a6e2cd72e2285d8402a7c15fd21a94347 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Sun, 19 Mar 2017 15:54:54 +0100 Subject: [PATCH 20/45] rapidsvn: fix build --- .../version-management/rapidsvn/default.nix | 15 ++- .../rapidsvn/fix-build.patch | 122 ++++++++++++++++++ 2 files changed, 132 insertions(+), 5 deletions(-) create mode 100644 pkgs/applications/version-management/rapidsvn/fix-build.patch diff --git a/pkgs/applications/version-management/rapidsvn/default.nix b/pkgs/applications/version-management/rapidsvn/default.nix index 9397aa8a1e1..7b3c7aafa44 100644 --- a/pkgs/applications/version-management/rapidsvn/default.nix +++ b/pkgs/applications/version-management/rapidsvn/default.nix @@ -1,11 +1,12 @@ -{stdenv, fetchurl, wxGTK, subversion, apr, aprutil, python}: +{ stdenv, fetchurl, fetchpatch, wxGTK, subversion, apr, aprutil, python }: -stdenv.mkDerivation { - name = "rapidsvn-0.12.0-1"; +stdenv.mkDerivation rec { + name = "rapidsvn-${version}"; + version = "0.12.1"; src = fetchurl { - url = http://www.rapidsvn.org/download/release/0.12/rapidsvn-0.12.0-1.tar.gz; - sha256 = "1i3afjmx99ljw1bj54q47fs0g1q9dmxxvr4ciq7ncp5s52shszgg"; + url = "http://www.rapidsvn.org/download/release/${version}/${name}.tar.gz"; + sha256 = "1bmcqjc12k5w0z40k7fkk8iysqv4fw33i80gvcmbakby3d4d4i4p"; }; buildInputs = [ wxGTK subversion apr aprutil python ]; @@ -13,6 +14,10 @@ stdenv.mkDerivation { configureFlags = [ "--with-svn-include=${subversion.dev}/include" "--with-svn-lib=${subversion.out}/lib" ]; + patches = [ + ./fix-build.patch + ]; + meta = { description = "Multi-platform GUI front-end for the Subversion revision system"; homepage = http://rapidsvn.tigris.org/; diff --git a/pkgs/applications/version-management/rapidsvn/fix-build.patch b/pkgs/applications/version-management/rapidsvn/fix-build.patch new file mode 100644 index 00000000000..ca4bc394c2c --- /dev/null +++ b/pkgs/applications/version-management/rapidsvn/fix-build.patch @@ -0,0 +1,122 @@ +--- a/src/svncpp/client_ls.cpp ++++ b/src/svncpp/client_ls.cpp +@@ -25,6 +25,7 @@ + #include "svn_client.h" + #include "svn_path.h" + #include "svn_sorts.h" ++#include "svn_version.h" + //#include "svn_utf.h" + + // svncpp +@@ -35,6 +36,7 @@ + #include "m_is_empty.hpp" + + ++#if SVN_VER_MAJOR == 1 && SVN_VER_MINOR < 8 + static int + compare_items_as_paths(const svn_sort__item_t *a, const svn_sort__item_t *b) + { +@@ -84,6 +86,72 @@ namespace svn + } + } + ++#else ++ ++#include ++ ++static svn_error_t* store_entry( ++ void *baton, ++ const char *path, ++ const svn_dirent_t *dirent, ++ const svn_lock_t *, ++ const char *abs_path, ++ const char *, ++ const char *, ++ apr_pool_t *scratch_pool) ++{ ++ svn::DirEntries *entries = reinterpret_cast(baton); ++ if (path[0] == '\0') { ++ if (dirent->kind == svn_node_file) { ++ // for compatibility with svn_client_ls behaviour, listing a file ++ // stores that file name ++ entries->push_back(svn::DirEntry(svn_path_basename(abs_path, scratch_pool), dirent)); ++ } ++ } else { ++ entries->push_back(svn::DirEntry(path, dirent)); ++ } ++ return SVN_NO_ERROR; ++} ++ ++static bool sort_by_path(svn::DirEntry const& a, svn::DirEntry const& b) ++{ ++ return svn_path_compare_paths(a.name(), b.name()) < 0; ++} ++ ++namespace svn ++{ ++ DirEntries ++ Client::list(const char * pathOrUrl, ++ svn_opt_revision_t * revision, ++ bool recurse) throw(ClientException) ++ { ++ Pool pool; ++ DirEntries entries; ++ ++ svn_error_t * error = ++ svn_client_list3(pathOrUrl, ++ revision, ++ revision, ++ SVN_DEPTH_INFINITY_OR_IMMEDIATES(recurse), ++ SVN_DIRENT_ALL, ++ FALSE, // fetch locks ++ FALSE, // include externals ++ &store_entry, ++ &entries, ++ *m_context, ++ pool); ++ ++ if (error != SVN_NO_ERROR) ++ throw ClientException(error); ++ ++ std::sort(entries.begin(), entries.end(), &sort_by_path); ++ ++ return entries; ++ } ++} ++ ++#endif ++ + /* ----------------------------------------------------------------- + * local variables: + * eval: (load-file "../../rapidsvn-dev.el") +--- a/src/svncpp/dirent.cpp 2017-03-19 15:48:58.956827337 +0100 ++++ b/src/svncpp/dirent.cpp 2017-03-19 15:50:19.111527279 +0100 +@@ -47,7 +47,7 @@ + { + } + +- Data(const char * _name, svn_dirent_t * dirEntry) ++ Data(const char * _name, const svn_dirent_t * dirEntry) + : name(_name), kind(dirEntry->kind), size(dirEntry->size), + hasProps(dirEntry->has_props != 0), + createdRev(dirEntry->created_rev), time(dirEntry->time) +@@ -78,7 +78,7 @@ + { + } + +- DirEntry::DirEntry(const char * name, svn_dirent_t * DirEntry) ++ DirEntry::DirEntry(const char * name, const svn_dirent_t * DirEntry) + : m(new Data(name, DirEntry)) + { + } +--- a/include/svncpp/dirent.hpp 2017-03-19 15:50:54.860506116 +0100 ++++ b/include/svncpp/dirent.hpp 2017-03-19 15:50:58.314407598 +0100 +@@ -41,7 +41,7 @@ + /** + * constructor for existing @a svn_dirent_t entries + */ +- DirEntry(const char * name, svn_dirent_t * dirEntry); ++ DirEntry(const char * name, const svn_dirent_t * dirEntry); + + /** + * copy constructor From a4c5fc068aa0bed04f1d17ba3630a0057c0b8499 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 19 Mar 2017 16:08:47 +0100 Subject: [PATCH 21/45] createrepo_c: add missing patches --- .../createrepo_c/fix-bash-completion-path.patch | 11 +++++++++++ .../createrepo_c/fix-python-install-path.patch | 11 +++++++++++ 2 files changed, 22 insertions(+) create mode 100644 pkgs/tools/package-management/createrepo_c/fix-bash-completion-path.patch create mode 100644 pkgs/tools/package-management/createrepo_c/fix-python-install-path.patch diff --git a/pkgs/tools/package-management/createrepo_c/fix-bash-completion-path.patch b/pkgs/tools/package-management/createrepo_c/fix-bash-completion-path.patch new file mode 100644 index 00000000000..e184cc8facc --- /dev/null +++ b/pkgs/tools/package-management/createrepo_c/fix-bash-completion-path.patch @@ -0,0 +1,11 @@ +--- createrepo_c-0.10.0-src.orig/CMakeLists.txt 2017-03-19 11:01:02.703173617 +0100 ++++ createrepo_c-0.10.0-src/CMakeLists.txt 2017-03-19 11:02:38.617448248 +0100 +@@ -100,7 +100,7 @@ + + pkg_check_modules(BASHCOMP bash-completion) + if (BASHCOMP_FOUND) +- execute_process(COMMAND ${PKG_CONFIG_EXECUTABLE} --variable=completionsdir bash-completion OUTPUT_VARIABLE BASHCOMP_DIR OUTPUT_STRIP_TRAILING_WHITESPACE) ++ SET(BASHCOMP_DIR "@BASHCOMP_DIR@") + message("Bash completion directory: ${BASHCOMP_DIR}") + INSTALL(FILES createrepo_c.bash DESTINATION ${BASHCOMP_DIR} RENAME createrepo_c) + INSTALL(CODE " diff --git a/pkgs/tools/package-management/createrepo_c/fix-python-install-path.patch b/pkgs/tools/package-management/createrepo_c/fix-python-install-path.patch new file mode 100644 index 00000000000..a247c6d9fe4 --- /dev/null +++ b/pkgs/tools/package-management/createrepo_c/fix-python-install-path.patch @@ -0,0 +1,11 @@ +--- createrepo_c-0.10.0-src.orig/src/python/CMakeLists.txt 2017-03-19 10:50:33.796342953 +0100 ++++ createrepo_c-0.10.0-src/src/python/CMakeLists.txt 2017-03-19 10:53:51.207580073 +0100 +@@ -19,7 +19,7 @@ + FIND_PACKAGE(PythonInterp 3.0 REQUIRED) + endif() + +-EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "from sys import stdout; from distutils import sysconfig; stdout.write(sysconfig.get_python_lib(True))" OUTPUT_VARIABLE PYTHON_INSTALL_DIR) ++SET(PYTHON_INSTALL_DIR "@PYTHON_INSTALL_DIR@") + INCLUDE_DIRECTORIES (${PYTHON_INCLUDE_PATH}) + + MESSAGE(STATUS "Python install dir is ${PYTHON_INSTALL_DIR}") From 3caba31f8e94da23d7038ed2918465a861a3d298 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Sun, 19 Mar 2017 15:09:02 +0000 Subject: [PATCH 22/45] libircclient: disable on darwin --- pkgs/development/libraries/libircclient/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libircclient/default.nix b/pkgs/development/libraries/libircclient/default.nix index 14e41961e0a..fef5e7278b8 100644 --- a/pkgs/development/libraries/libircclient/default.nix +++ b/pkgs/development/libraries/libircclient/default.nix @@ -26,6 +26,6 @@ stdenv.mkDerivation rec { homepage = http://www.ulduzsoft.com/libircclient/; license = licenses.lgpl3; maintainers = with maintainers; [ obadz ]; - platforms = platforms.all; + platforms = platforms.linux; }; } From 6a851cde94194abddf5d9ccfaa1b596e22fc8dd4 Mon Sep 17 00:00:00 2001 From: ndowens Date: Sun, 19 Mar 2017 10:26:22 -0500 Subject: [PATCH 23/45] awesomewm: 4.0 -> 4.1 --- .../window-managers/awesome/default.nix | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/window-managers/awesome/default.nix b/pkgs/applications/window-managers/awesome/default.nix index 0a1256d67a4..8a088daec1a 100644 --- a/pkgs/applications/window-managers/awesome/default.nix +++ b/pkgs/applications/window-managers/awesome/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, luaPackages, cairo, cmake, imagemagick, pkgconfig, gdk_pixbuf +{ stdenv, fetchFromGitHub, luaPackages, cairo, cmake, imagemagick, pkgconfig, gdk_pixbuf , xorg, libstartup_notification, libxdg_basedir, libpthreadstubs , xcb-util-cursor, makeWrapper, pango, gobjectIntrospection, unclutter , compton, procps, iproute, coreutils, curl, alsaUtils, findutils, xterm @@ -9,10 +9,13 @@ with luaPackages; stdenv.mkDerivation rec { name = "awesome-${version}"; - version = "4.0"; - src = fetchurl { - url = "http://github.com/awesomeWM/awesome-releases/raw/master/${name}.tar.xz"; - sha256 = "0czkcz67sab63gf5m2p2pgg05yinjx60hfb9rfyzdkkg28q9f02w"; + version = "4.1"; + + src = fetchFromGitHub { + owner = "awesomewm"; + repo = "awesome"; + rev = "v${version}"; + sha256 = "1qik8h5nwjq4535lpdpal85vas1k7am3s6l5r763kpdzxhfcyyaj"; }; nativeBuildInputs = [ @@ -22,8 +25,10 @@ with luaPackages; stdenv.mkDerivation rec { imagemagick makeWrapper pkgconfig - xmlto docbook_xml_dtd_45 docbook_xsl findXMLCatalogs + xmlto docbook_xml_dtd_45 + docbook_xsl findXMLCatalogs ]; + propagatedUserEnvPkgs = [ hicolor_icon_theme ]; buildInputs = [ cairo dbus gdk_pixbuf gobjectIntrospection git lgi libpthreadstubs libstartup_notification From 8e8302cc1f672fdf83ddc5a12a610550a354ebff Mon Sep 17 00:00:00 2001 From: Daniel Fullmer Date: Sun, 19 Mar 2017 11:56:59 -0400 Subject: [PATCH 24/45] rclone: 1.35 -> 1.36 --- pkgs/applications/networking/sync/rclone/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/sync/rclone/default.nix b/pkgs/applications/networking/sync/rclone/default.nix index adbadba411c..93b4fc76467 100644 --- a/pkgs/applications/networking/sync/rclone/default.nix +++ b/pkgs/applications/networking/sync/rclone/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "rclone-${version}"; - version = "1.35"; + version = "1.36"; goPackagePath = "github.com/ncw/rclone"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "ncw"; repo = "rclone"; rev = "v${version}"; - sha256 = "15dmppb7qgr3vg76dsv770l51lmsl8n8k3rvbnhhks5a2cz0kf2i"; + sha256 = "1vx75ihg2j0chml8hwvngjkjw647cai9gicfy8ss6xsrm46w59b3"; }; meta = with stdenv.lib; { From 9f21f4578c530b909b689d457d48e908b62f7d38 Mon Sep 17 00:00:00 2001 From: ndowens Date: Sun, 19 Mar 2017 11:12:16 -0500 Subject: [PATCH 25/45] libevdev: Fix url --- pkgs/development/libraries/libevdev/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libevdev/default.nix b/pkgs/development/libraries/libevdev/default.nix index fd7eef14b65..a91acb23052 100644 --- a/pkgs/development/libraries/libevdev/default.nix +++ b/pkgs/development/libraries/libevdev/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "libevdev-1.5.6"; src = fetchurl { - url = "http://www.freedesktop.org/software/libevdev/${name}.tar.xz"; + url = "https://www.freedesktop.org/software/libevdev/${name}.tar.xz"; sha256 = "1256ypz93039n6km4macg158fpmjgylhmcmk20pnklxicsfpxv7c"; }; From 6879d560cb1a20c15e9196c7b2df47ab4cad115b Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sun, 19 Mar 2017 12:13:36 -0400 Subject: [PATCH 26/45] linux: 4.10.3 -> 4.10.4 --- pkgs/os-specific/linux/kernel/linux-4.10.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.10.nix b/pkgs/os-specific/linux/kernel/linux-4.10.nix index 13052bf8913..0311ea518c5 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.10.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.10.3"; + version = "4.10.4"; extraMeta.branch = "4.10"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1m18hlcimxj42lbg7mc9lh3hmmwpyk6y2c92xf0svmlfpzv6ah8r"; + sha256 = "18cglngl42hcm0578hrsn962g2r1z9x6p5h9c6d3g0ac8siascqp"; }; kernelPatches = args.kernelPatches; From bef5607e20f2568ca1bcfbd26caa65693c9bad36 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sun, 19 Mar 2017 12:18:46 -0400 Subject: [PATCH 27/45] linux: 4.4.54 -> 4.4.55 --- pkgs/os-specific/linux/kernel/linux-4.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index 7a606045603..dd6bba4567a 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.4.54"; + version = "4.4.55"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0h2b0zv7dfa8nica7cxf2ysiqdva0bb2pmhi0kz4gyhvp2cm3rjk"; + sha256 = "14inh7ps6zkvkwifqgxnwj02a7907ighdj96dv66ydckwqcmyj4j"; }; kernelPatches = args.kernelPatches; From b800655639b468fc0abe191de021b717245c060b Mon Sep 17 00:00:00 2001 From: Drew Hess Date: Sat, 18 Mar 2017 20:20:24 -0700 Subject: [PATCH 28/45] emacs25Macport: fix for new macOS 10.10 frameworks. See https://github.com/NixOS/nixpkgs/pull/23907#issuecomment-286627100. --- pkgs/applications/editors/emacs/macport.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/editors/emacs/macport.nix b/pkgs/applications/editors/emacs/macport.nix index 9169c12417a..90812fb802c 100644 --- a/pkgs/applications/editors/emacs/macport.nix +++ b/pkgs/applications/editors/emacs/macport.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { "--enable-mac-app=$$out/Applications" ]; - CFLAGS = "-O3 -DMAC_OS_X_VERSION_MAX_ALLOWED=1090 -DMAC_OS_X_VERSION_MIN_REQUIRED=1090"; + CFLAGS = "-O3 -DMAC_OS_X_VERSION_MAX_ALLOWED=MAC_OS_X_VERSION_10_10 -DMAC_OS_X_VERSION_MIN_REQUIRED=MAC_OS_X_VERSION_10_10"; LDFLAGS = "-O3 -L${ncurses.out}/lib"; postInstall = '' From b82f3f694388f23986a84240ea949c883155687f Mon Sep 17 00:00:00 2001 From: Nathan Isom Date: Sun, 19 Mar 2017 12:17:52 -0500 Subject: [PATCH 29/45] mpvc: init at unstable-2017-03-18 (#24037) * mpvc: init at unstable-2017-03-18 * mpvc: simplify build * mpvc: add maintainer --- lib/maintainers.nix | 1 + pkgs/applications/misc/mpvc/default.nix | 29 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 32 insertions(+) create mode 100644 pkgs/applications/misc/mpvc/default.nix diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 0c90d2cadd2..e8d6293ea97 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -344,6 +344,7 @@ nathan-gs = "Nathan Bijnens "; nckx = "Tobias Geerinckx-Rice "; ndowens = "Nathan Owens "; + neeasade = "Nathan Isom "; nequissimus = "Tim Steinbach "; nfjinjing = "Jinjing Wang "; nhooyr = "Anmol Sethi "; diff --git a/pkgs/applications/misc/mpvc/default.nix b/pkgs/applications/misc/mpvc/default.nix new file mode 100644 index 00000000000..fffa9595262 --- /dev/null +++ b/pkgs/applications/misc/mpvc/default.nix @@ -0,0 +1,29 @@ +{ stdenv, socat, fetchFromGitHub, makeWrapper }: + +stdenv.mkDerivation rec { + name = "mpvc-unstable-2017-03-18"; + + src = fetchFromGitHub { + owner = "wildefyr"; + repo = "mpvc"; + rev = "aea5c661455248cde7ac9ddba5f63cc790d26512"; + sha256 = "0qiyvb3ck1wyd3izajwvlq4bwgsbq7x8ya3fgi5i0g2qr39a1qml"; + }; + + makeFlags = [ "PREFIX=$(out)" ]; + installFlags = [ "PREFIX=$(out)" ]; + + postInstall = '' + wrapProgram $out/bin/mpvc --prefix PATH : "${socat}/bin/" + ''; + + buildInputs = [ socat makeWrapper ]; + + meta = with stdenv.lib; { + description = "A mpc-like control interface for mpv"; + homepage = https://github.com/wildefyr/mpvc; + license = licenses.mit; + maintainers = [ maintainers.neeasade ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4d8e6b2b987..a5b1dcd757d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18322,6 +18322,8 @@ with pkgs; mg = callPackage ../applications/editors/mg { }; + mpvc = callPackage ../applications/misc/mpvc { }; + aucdtect = callPackage ../tools/audio/aucdtect { }; togglesg-download = callPackage ../tools/misc/togglesg-download { }; From 01f706b30b6016103401492bfa2c767cbc119650 Mon Sep 17 00:00:00 2001 From: Frank Lanitz Date: Sun, 19 Mar 2017 18:39:39 +0100 Subject: [PATCH 30/45] Geany: 1.30 -> 1.30.1 --- pkgs/applications/editors/geany/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/geany/default.nix b/pkgs/applications/editors/geany/default.nix index 5a27a8efeb0..85b7ccb0be6 100644 --- a/pkgs/applications/editors/geany/default.nix +++ b/pkgs/applications/editors/geany/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, gtk2, which, pkgconfig, intltool, file }: let - version = "1.30"; + version = "1.30.1"; in stdenv.mkDerivation rec { @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://download.geany.org/${name}.tar.bz2"; - sha256 = "b2dec920c77bc3e88d5f7b0f1dbe4f5200f36df3b346d1aba39323bc30afae6d"; + sha256 = "0ac360f1f3d6c28790a81d570252a7d40421f6e1d8e5a8d653756bd041d88491"; }; NIX_LDFLAGS = if stdenv.isDarwin then "-lintl" else null; From 736ee614422a9333e71a844ead8f9d2504c58e95 Mon Sep 17 00:00:00 2001 From: ndowens Date: Sun, 19 Mar 2017 12:41:36 -0500 Subject: [PATCH 31/45] dashpay: 0.12.055 -> 0.12.1.3 (#23761) - fixed mistype - Cosmetic change; camelCase - removed gui option, causes build issue - cmake flag issue fixed --- pkgs/applications/altcoins/dashpay.nix | 36 ++++++++++++++++---------- 1 file changed, 23 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/altcoins/dashpay.nix b/pkgs/applications/altcoins/dashpay.nix index ef42560ee9a..ff0f2407cfe 100644 --- a/pkgs/applications/altcoins/dashpay.nix +++ b/pkgs/applications/altcoins/dashpay.nix @@ -1,25 +1,35 @@ -{ fetchzip, stdenv, pkgconfig, autoreconfHook +{ fetchFromGitHub, stdenv, pkgconfig, autoreconfHook , openssl, db48, boost, zlib, miniupnpc -, qt4, qrencode, glib, protobuf, yasm -, utillinux }: +, qrencode, glib, protobuf, yasm, libevent +, utillinux +, enable_Upnp ? false +, disable_Wallet ? false +, disable_Daemon ? false }: with stdenv.lib; stdenv.mkDerivation rec { + name = "dashpay-${version}"; + version = "0.12.1.3"; - name = "dashpay-${meta.version}"; - - src = fetchzip { - url = "https://github.com/dashpay/dash/archive/v${meta.version}.tar.gz"; - sha256 = "19bk7cviy3n2dpj4kr3i6i0i3ac2l5ri8ln1a51nd3n90k016wnx"; + src = fetchFromGitHub { + owner = "dashpay"; + repo= "dash"; + rev = "v${version}"; + sha256 = "0h0fxhh30wy5vp06l1mkswhz565qs6j9y0dm84fmn28rdfvhv2aj"; }; - buildInputs = [ pkgconfig autoreconfHook glib openssl db48 yasm - boost zlib miniupnpc protobuf qt4 qrencode utillinux ]; + nativeBuildInputs = [ pkgconfig autoreconfHook ]; + buildInputs = [ glib openssl db48 yasm boost zlib libevent + miniupnpc protobuf qrencode utillinux ]; + - configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ]; + configureFlags = [ "--with-boost-libdir=${boost.out}/lib --with-gui=no" ] + ++ optional enable_Upnp "--enable-upnp-default" + ++ optional disable_Wallet "--disable-wallet" + ++ optional disable_Daemon "--disable-daemon" + ; - meta = with stdenv.lib; { - version = "0.12.0.55"; + meta = { description = "A decentralized key/value registration and transfer system"; longDescription = '' Dash (DASH) is an open sourced, privacy-centric digital currency From e8a395079a8d4cfee9c15e7687145a10abe7aaad Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Sun, 19 Mar 2017 18:42:12 +0100 Subject: [PATCH 32/45] opkg: 0.3.3 -> 0.3.4 --- pkgs/tools/package-management/opkg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/opkg/default.nix b/pkgs/tools/package-management/opkg/default.nix index 9d99af2e59a..3b636ab0e29 100644 --- a/pkgs/tools/package-management/opkg/default.nix +++ b/pkgs/tools/package-management/opkg/default.nix @@ -2,11 +2,11 @@ , autoreconfHook }: stdenv.mkDerivation rec { - version = "0.3.3"; + version = "0.3.4"; name = "opkg-${version}"; src = fetchurl { url = "http://downloads.yoctoproject.org/releases/opkg/opkg-${version}.tar.gz"; - sha256 = "03nhz0ralc3cqsrwyc310n8kbk2m9im0m2r2za8lqphs29rrxnqr"; + sha256 = "1glkxjhsaaji172phd1gv8g0k0fs09pij6k01cl9namnac5r02vm"; }; nativeBuildInputs = [ pkgconfig autoreconfHook ]; From 8afdae07b25afe6a7a70b1225f305a6519511f2c Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sat, 18 Mar 2017 23:44:34 +0100 Subject: [PATCH 33/45] nextcloud: 11.0.1 -> 11.0.2 --- pkgs/servers/nextcloud/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index d37b53398b6..4bbff8b86ad 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name= "nextcloud-${version}"; - version = "11.0.1"; + version = "11.0.2"; src = fetchurl { url = "https://download.nextcloud.com/server/releases/${name}.tar.bz2"; - sha256 = "0aa6gzcbpjkk7ss3c1sg0scinhczvg4lgb59wv5jljliaks2n5h0"; + sha256 = "0047kfl73720w7y2r7ivzj2gqg84rcfp98svq130nd0ziyfz27jx"; }; installPhase = '' From 2baf0a568a142757feb58442525d8b1643da66d6 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 19 Mar 2017 00:33:41 +0100 Subject: [PATCH 34/45] owncloud-client: build with qt5 instead of qt4 --- pkgs/applications/networking/owncloud-client/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/owncloud-client/default.nix b/pkgs/applications/networking/owncloud-client/default.nix index 1323c312121..ccd1b5cfeae 100644 --- a/pkgs/applications/networking/owncloud-client/default.nix +++ b/pkgs/applications/networking/owncloud-client/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, qt4, pkgconfig, qtkeychain, sqlite }: +{ stdenv, fetchurl, cmake, qt5, pkgconfig, qtkeychain, sqlite }: stdenv.mkDerivation rec { name = "owncloud-client-${version}"; @@ -10,10 +10,10 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig cmake ]; - buildInputs = [ qt4 qtkeychain sqlite]; + buildInputs = [ qt5.qtbase qt5.qtwebkit qtkeychain sqlite ]; cmakeFlags = [ - "-UCMAKE_INSTALL_LIBDIR" + "-UCMAKE_INSTALL_LIBDIR" ]; enableParallelBuilding = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a5b1dcd757d..5c832dff9f2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3303,7 +3303,9 @@ with pkgs; owncloud90 owncloud91; - owncloud-client = callPackage ../applications/networking/owncloud-client { }; + owncloud-client = callPackage ../applications/networking/owncloud-client { + inherit (libsForQt5) qtkeychain; + }; p2pvc = callPackage ../applications/video/p2pvc {}; From 64d9947c7644e8ff2dbed6b147f450a0dd8f3475 Mon Sep 17 00:00:00 2001 From: ndowens Date: Fri, 17 Mar 2017 16:44:16 -0500 Subject: [PATCH 35/45] cfitsio: 3.21 -> 3.41 cfitsio: Changed platforms to Linux, due to failing to build on Darwin cfitsio: Fixed missing semicolon cfitsio: Removed undefined variable --- pkgs/development/libraries/cfitsio/default.nix | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/pkgs/development/libraries/cfitsio/default.nix b/pkgs/development/libraries/cfitsio/default.nix index a3d1a46e818..d49bd7eac1b 100644 --- a/pkgs/development/libraries/cfitsio/default.nix +++ b/pkgs/development/libraries/cfitsio/default.nix @@ -1,24 +1,21 @@ { fetchurl, stdenv }: -stdenv.mkDerivation { - name = "cfitsio-3.21"; + stdenv.mkDerivation { + name = "cfitsio-3.41"; src = fetchurl { - url = ftp://heasarc.gsfc.nasa.gov/software/fitsio/c/cfitsio3210.tar.gz; - sha256 = "1ffr3p5dy2b1vj9j4li5zf22naavi9wcxsvqy236fc0ykfyip96i"; + url = "ftp://heasarc.gsfc.nasa.gov/software/fitsio/c/cfitsio3410.tar.gz"; + sha256 = "0k3knn5hz1vhzzvm46xa1y6fnpliwkwgw76lnkf4amcnl5zaqmm5"; }; # Shared-only build buildFlags = "shared"; - patchPhase = - '' sed -e '/^install:/s/libcfitsio.a //' -e 's@/bin/@@g' -i Makefile.in + patchPhase = '' sed -e '/^install:/s/libcfitsio.a //' -e 's@/bin/@@g' -i Makefile.in ''; - meta = { + meta = with stdenv.lib; { homepage = http://heasarc.gsfc.nasa.gov/fitsio/; - description = "Library for reading and writing FITS data files"; - longDescription = '' CFITSIO is a library of C and Fortran subroutines for reading and writing data files in FITS (Flexible Image Transport System) data @@ -28,9 +25,8 @@ stdenv.mkDerivation { advanced features for manipulating and filtering the information in FITS files. ''; - # Permissive BSD-style license. license = "permissive"; - platforms = stdenv.lib.platforms.unix; + platforms = platforms.linux; }; } From 5498dd6364f102e1d5a15433f49c97447da45e65 Mon Sep 17 00:00:00 2001 From: Rahul Gopinath Date: Sun, 19 Mar 2017 10:40:49 -0700 Subject: [PATCH 36/45] guile: 2.0 -> 2.2 --- .../interpreters/guile/clang.patch | 14 --------- .../interpreters/guile/default.nix | 29 ++++++------------- .../guile/disable-gc-sensitive-tests.patch | 25 ---------------- .../{setup-hook-2.0.sh => setup-hook-2.2.sh} | 6 ++-- pkgs/top-level/all-packages.nix | 4 +-- 5 files changed, 14 insertions(+), 64 deletions(-) delete mode 100644 pkgs/development/interpreters/guile/clang.patch delete mode 100644 pkgs/development/interpreters/guile/disable-gc-sensitive-tests.patch rename pkgs/development/interpreters/guile/{setup-hook-2.0.sh => setup-hook-2.2.sh} (77%) diff --git a/pkgs/development/interpreters/guile/clang.patch b/pkgs/development/interpreters/guile/clang.patch deleted file mode 100644 index 4d0f342b211..00000000000 --- a/pkgs/development/interpreters/guile/clang.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/lib/stdint.in.h b/lib/stdint.in.h -index 889bca7..15d39b0 100644 ---- a/lib/stdint.in.h -+++ b/lib/stdint.in.h -@@ -74,7 +74,8 @@ - in would reinclude us, skipping our contents because - _@GUARD_PREFIX@_STDINT_H is defined. - The include_next requires a split double-inclusion guard. */ --# @INCLUDE_NEXT@ @NEXT_STDINT_H@ -+# include -+// # @INCLUDE_NEXT@ @NEXT_STDINT_H@ - #endif - - #if ! defined _@GUARD_PREFIX@_STDINT_H && ! defined _GL_JUST_INCLUDE_SYSTEM_STDINT_H diff --git a/pkgs/development/interpreters/guile/default.nix b/pkgs/development/interpreters/guile/default.nix index 04f31dda26a..8a2deeddff6 100644 --- a/pkgs/development/interpreters/guile/default.nix +++ b/pkgs/development/interpreters/guile/default.nix @@ -7,11 +7,12 @@ else stdenv.mkDerivation) (rec { - name = "guile-2.0.13"; + name = "guile-${version}"; + version = "2.2.0"; src = fetchurl { url = "mirror://gnu/guile/${name}.tar.xz"; - sha256 = "12yqkr974y91ylgw6jnmci2v90i90s7h9vxa4zk0sai8vjnz4i1p"; + sha256 = "05dmvhd1y135x7w5qfw4my42cfp6l8bbhjfxvchcc1cbdvzri0f1"; }; outputs = [ "out" "dev" "info" ]; @@ -32,12 +33,8 @@ enableParallelBuilding = true; - patches = [ ./disable-gc-sensitive-tests.patch ./eai_system.patch ./clang.patch - (fetchpatch { - # Fixes stability issues with 00-repl-server.test - url = "http://git.savannah.gnu.org/cgit/guile.git/patch/?id=2fbde7f02adb8c6585e9baf6e293ee49cd23d4c4"; - sha256 = "0p6c1lmw1iniq03z7x5m65kg3lq543kgvdb4nrxsaxjqf3zhl77v"; - }) + patches = [ + ./eai_system.patch ] ++ (stdenv.lib.optional (coverageAnalysis != null) ./gcov-file-name.patch); @@ -47,7 +44,7 @@ # don't have "libgcc_s.so.1" on darwin LDFLAGS = stdenv.lib.optionalString (!stdenv.isDarwin) "-lgcc_s"; - configureFlags = [ "--with-libreadline-prefix" ] + configureFlags = [ "--with-libreadline-prefix=${readline.dev}" ] ++ stdenv.lib.optionals stdenv.isSunOS [ # Make sure the right is found, and not the incompatible # /usr/include/mp.h from OpenSolaris. See @@ -56,7 +53,6 @@ "--with-libgmp-prefix=${gmp.dev}" # Same for these (?). - "--with-libreadline-prefix=${readline.dev}" "--with-libunistring-prefix=${libunistring}" # See below. @@ -69,7 +65,7 @@ # XXX: See http://thread.gmane.org/gmane.comp.lib.gnulib.bugs/18903 for # why `--with-libunistring-prefix' and similar options coming from # `AC_LIB_LINKFLAGS_BODY' don't work on NixOS/x86_64. - sed -i "$out/lib/pkgconfig/guile-2.0.pc" \ + sed -i "$out/lib/pkgconfig/guile-2.2.pc" \ -e "s|-lunistring|-L${libunistring}/lib -lunistring|g ; s|^Cflags:\(.*\)$|Cflags: -I${libunistring}/include \1|g ; s|-lltdl|-L${libtool.lib}/lib -lltdl|g ; @@ -81,7 +77,7 @@ # On Linuxes+Hydra the tests are flaky; feel free to investigate deeper. doCheck = false; - setupHook = ./setup-hook-2.0.sh; + setupHook = ./setup-hook-2.2.sh; crossAttrs.preConfigure = stdenv.lib.optionalString (stdenv.cross.config == "i586-pc-gnu") @@ -96,7 +92,7 @@ description = "Embeddable Scheme implementation"; homepage = http://www.gnu.org/software/guile/; license = stdenv.lib.licenses.lgpl3Plus; - maintainers = with stdenv.lib.maintainers; [ ludo lovek323 ]; + maintainers = with stdenv.lib.maintainers; [ ludo lovek323 vrthra ]; platforms = stdenv.lib.platforms.all; longDescription = '' @@ -111,10 +107,3 @@ }; }) -// - -(stdenv.lib.optionalAttrs (!stdenv.isLinux) { - # Work around . - SHELL = "/bin/sh"; - CONFIG_SHELL = "/bin/sh"; -}) diff --git a/pkgs/development/interpreters/guile/disable-gc-sensitive-tests.patch b/pkgs/development/interpreters/guile/disable-gc-sensitive-tests.patch deleted file mode 100644 index 076091a702a..00000000000 --- a/pkgs/development/interpreters/guile/disable-gc-sensitive-tests.patch +++ /dev/null @@ -1,25 +0,0 @@ -This patch disable GC-sensitive tests. This is particularly useful when -compiling with `-O0' (as is done with coverage analysis) since there may -be many false references held on the stack, leading to the failure of -such tests. - ---- a/test-suite/tests/gc.test -+++ b/test-suite/tests/gc.test -@@ -67,6 +67,7 @@ - - (with-test-prefix "gc" - (pass-if "Unused modules are removed" -+ (throw 'unresolved) - (let* ((guard (make-guardian)) - (total 1000)) - ---- a/test-suite/tests/threads.test -+++ b/test-suite/tests/threads.test -@@ -366,6 +366,7 @@ - (not (mutex-owner m)))) - - (pass-if "mutex with owner not retained (bug #27450)" -+ (throw 'unresolved) - (let ((g (make-guardian))) - (g (let ((m (make-mutex))) (lock-mutex m) m)) - diff --git a/pkgs/development/interpreters/guile/setup-hook-2.0.sh b/pkgs/development/interpreters/guile/setup-hook-2.2.sh similarity index 77% rename from pkgs/development/interpreters/guile/setup-hook-2.0.sh rename to pkgs/development/interpreters/guile/setup-hook-2.2.sh index fd1dc944ed4..86c1e0d3e4a 100644 --- a/pkgs/development/interpreters/guile/setup-hook-2.0.sh +++ b/pkgs/development/interpreters/guile/setup-hook-2.2.sh @@ -1,8 +1,8 @@ addGuileLibPath () { - if test -d "$1/share/guile/site/2.0" + if test -d "$1/share/guile/site/2.2" then - export GUILE_LOAD_PATH="${GUILE_LOAD_PATH}${GUILE_LOAD_PATH:+:}$1/share/guile/site/2.0" - export GUILE_LOAD_COMPILED_PATH="${GUILE_LOAD_COMPILED_PATH}${GUILE_LOAD_COMPILED_PATH:+:}$1/share/guile/site/2.0" + export GUILE_LOAD_PATH="${GUILE_LOAD_PATH}${GUILE_LOAD_PATH:+:}$1/share/guile/site/2.2" + export GUILE_LOAD_COMPILED_PATH="${GUILE_LOAD_COMPILED_PATH}${GUILE_LOAD_COMPILED_PATH:+:}$1/share/guile/site/2.2" elif test -d "$1/share/guile/site" then export GUILE_LOAD_PATH="${GUILE_LOAD_PATH}${GUILE_LOAD_PATH:+:}$1/share/guile/site" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a5b1dcd757d..cdedfe71568 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5790,9 +5790,9 @@ with pkgs; guile_1_8 = callPackage ../development/interpreters/guile/1.8.nix { }; - guile_2_0 = callPackage ../development/interpreters/guile { }; + guile_2_2 = callPackage ../development/interpreters/guile { }; - guile = guile_2_0; + guile = guile_2_2; hadoop = callPackage ../applications/networking/cluster/hadoop { }; From 9fae97b7199d2e9ef34e79ca6cae4e9ba9b7f92e Mon Sep 17 00:00:00 2001 From: ndowens Date: Sun, 19 Mar 2017 13:02:08 -0500 Subject: [PATCH 37/45] Update default.nix Cosmetic change --- pkgs/applications/editors/geany/default.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/editors/geany/default.nix b/pkgs/applications/editors/geany/default.nix index 85b7ccb0be6..680542cfdfe 100644 --- a/pkgs/applications/editors/geany/default.nix +++ b/pkgs/applications/editors/geany/default.nix @@ -1,5 +1,7 @@ { stdenv, fetchurl, gtk2, which, pkgconfig, intltool, file }: +with stdenv.lib; + let version = "1.30.1"; in @@ -13,8 +15,9 @@ stdenv.mkDerivation rec { }; NIX_LDFLAGS = if stdenv.isDarwin then "-lintl" else null; - - buildInputs = [ gtk2 which pkgconfig intltool file ]; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk2 which intltool file ]; doCheck = true; @@ -47,9 +50,9 @@ stdenv.mkDerivation rec { - Simple project management - Plugin interface ''; - homepage = "http://www.geany.org/"; + homepage = http://www.geany.org/; license = "GPL"; - maintainers = [ stdenv.lib.maintainers.bbenoist ]; - platforms = stdenv.lib.platforms.all; + maintainers = [ maintainers.bbenoist ]; + platforms = platforms.all; }; } From 6b71f32fb5985c9495c0164b4a5b9d272eb09a65 Mon Sep 17 00:00:00 2001 From: ndowens Date: Sun, 19 Mar 2017 13:15:40 -0500 Subject: [PATCH 38/45] Move intltool to nativeBuildInputs --- pkgs/applications/editors/geany/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/geany/default.nix b/pkgs/applications/editors/geany/default.nix index 680542cfdfe..3649beb41c6 100644 --- a/pkgs/applications/editors/geany/default.nix +++ b/pkgs/applications/editors/geany/default.nix @@ -16,8 +16,8 @@ stdenv.mkDerivation rec { NIX_LDFLAGS = if stdenv.isDarwin then "-lintl" else null; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gtk2 which intltool file ]; + nativeBuildInputs = [ pkgconfig intltool ]; + buildInputs = [ gtk2 which file ]; doCheck = true; From f66e06a828fb92581bd5e35024f23d406b9fa94b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 19 Mar 2017 19:17:21 +0100 Subject: [PATCH 39/45] leocad: remove unnessary patches --- pkgs/applications/graphics/leocad/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/applications/graphics/leocad/default.nix b/pkgs/applications/graphics/leocad/default.nix index 0de170a1cac..5f27cb44699 100644 --- a/pkgs/applications/graphics/leocad/default.nix +++ b/pkgs/applications/graphics/leocad/default.nix @@ -19,10 +19,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ qmake4Hook ]; buildInputs = [ qt4 zlib ]; postPatch = '' - sed '1i#include ' -i common/camera.cpp - substituteInPlace common/camera.cpp --replace "isnan(" "std::isnan(" export qmakeFlags="$qmakeFlags INSTALL_PREFIX=$out" - ''; + ''; meta = with stdenv.lib; { description = "CAD program for creating virtual LEGO models"; From 0cf93fda072ce44fe3a52420de8151b191ada680 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 19 Mar 2017 20:05:14 +0100 Subject: [PATCH 40/45] guile_2_0: init at 2.0.13 Reinstate guile 2.0.x. Use it for autogen --- pkgs/development/interpreters/guile/2.0.nix | 120 ++++++++++++++++++ .../interpreters/guile/clang.patch | 14 ++ .../guile/disable-gc-sensitive-tests.patch | 25 ++++ .../interpreters/guile/setup-hook-2.0.sh | 13 ++ pkgs/top-level/all-packages.nix | 7 +- 5 files changed, 178 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/interpreters/guile/2.0.nix create mode 100644 pkgs/development/interpreters/guile/clang.patch create mode 100644 pkgs/development/interpreters/guile/disable-gc-sensitive-tests.patch create mode 100644 pkgs/development/interpreters/guile/setup-hook-2.0.sh diff --git a/pkgs/development/interpreters/guile/2.0.nix b/pkgs/development/interpreters/guile/2.0.nix new file mode 100644 index 00000000000..04f31dda26a --- /dev/null +++ b/pkgs/development/interpreters/guile/2.0.nix @@ -0,0 +1,120 @@ +{ fetchurl, stdenv, libtool, readline, gmp, pkgconfig, boehmgc, libunistring +, libffi, gawk, makeWrapper, fetchpatch, coverageAnalysis ? null, gnu ? null }: + +# Do either a coverage analysis build or a standard build. +(if coverageAnalysis != null + then coverageAnalysis + else stdenv.mkDerivation) + +(rec { + name = "guile-2.0.13"; + + src = fetchurl { + url = "mirror://gnu/guile/${name}.tar.xz"; + sha256 = "12yqkr974y91ylgw6jnmci2v90i90s7h9vxa4zk0sai8vjnz4i1p"; + }; + + outputs = [ "out" "dev" "info" ]; + setOutputFlags = false; # $dev gets into the library otherwise + + nativeBuildInputs = [ makeWrapper gawk pkgconfig ]; + buildInputs = [ readline libtool libunistring libffi ]; + propagatedBuildInputs = [ gmp boehmgc ] + + # XXX: These ones aren't normally needed here, but since + # `libguile-2.0.la' reads `-lltdl -lunistring', adding them here will add + # the needed `-L' flags. As for why the `.la' file lacks the `-L' flags, + # see below. + ++ [ libtool libunistring ]; + + # A native Guile 2.0 is needed to cross-build Guile. + selfNativeBuildInput = true; + + enableParallelBuilding = true; + + patches = [ ./disable-gc-sensitive-tests.patch ./eai_system.patch ./clang.patch + (fetchpatch { + # Fixes stability issues with 00-repl-server.test + url = "http://git.savannah.gnu.org/cgit/guile.git/patch/?id=2fbde7f02adb8c6585e9baf6e293ee49cd23d4c4"; + sha256 = "0p6c1lmw1iniq03z7x5m65kg3lq543kgvdb4nrxsaxjqf3zhl77v"; + }) + ] ++ + (stdenv.lib.optional (coverageAnalysis != null) ./gcov-file-name.patch); + + # Explicitly link against libgcc_s, to work around the infamous + # "libgcc_s.so.1 must be installed for pthread_cancel to work". + + # don't have "libgcc_s.so.1" on darwin + LDFLAGS = stdenv.lib.optionalString (!stdenv.isDarwin) "-lgcc_s"; + + configureFlags = [ "--with-libreadline-prefix" ] + ++ stdenv.lib.optionals stdenv.isSunOS [ + # Make sure the right is found, and not the incompatible + # /usr/include/mp.h from OpenSolaris. See + # + # for details. + "--with-libgmp-prefix=${gmp.dev}" + + # Same for these (?). + "--with-libreadline-prefix=${readline.dev}" + "--with-libunistring-prefix=${libunistring}" + + # See below. + "--without-threads" + ]; + + postInstall = '' + wrapProgram $out/bin/guile-snarf --prefix PATH : "${gawk}/bin" + + # XXX: See http://thread.gmane.org/gmane.comp.lib.gnulib.bugs/18903 for + # why `--with-libunistring-prefix' and similar options coming from + # `AC_LIB_LINKFLAGS_BODY' don't work on NixOS/x86_64. + sed -i "$out/lib/pkgconfig/guile-2.0.pc" \ + -e "s|-lunistring|-L${libunistring}/lib -lunistring|g ; + s|^Cflags:\(.*\)$|Cflags: -I${libunistring}/include \1|g ; + s|-lltdl|-L${libtool.lib}/lib -lltdl|g ; + s|includedir=$out|includedir=$dev|g + " + ''; + + # make check doesn't work on darwin + # On Linuxes+Hydra the tests are flaky; feel free to investigate deeper. + doCheck = false; + + setupHook = ./setup-hook-2.0.sh; + + crossAttrs.preConfigure = + stdenv.lib.optionalString (stdenv.cross.config == "i586-pc-gnu") + # On GNU, libgc depends on libpthread, but the cross linker doesn't + # know where to find libpthread, which leads to erroneous test failures + # in `configure', where `-pthread' and `-lpthread' aren't explicitly + # passed. So it needs some help (XXX). + "export LDFLAGS=-Wl,-rpath-link=${gnu.libpthreadCross}/lib"; + + + meta = { + description = "Embeddable Scheme implementation"; + homepage = http://www.gnu.org/software/guile/; + license = stdenv.lib.licenses.lgpl3Plus; + maintainers = with stdenv.lib.maintainers; [ ludo lovek323 ]; + platforms = stdenv.lib.platforms.all; + + longDescription = '' + GNU Guile is an implementation of the Scheme programming language, with + support for many SRFIs, packaged for use in a wide variety of + environments. In addition to implementing the R5RS Scheme standard + and a large subset of R6RS, Guile includes a module system, full access + to POSIX system calls, networking support, multiple threads, dynamic + linking, a foreign function call interface, and powerful string + processing. + ''; + }; +}) + +// + +(stdenv.lib.optionalAttrs (!stdenv.isLinux) { + # Work around . + SHELL = "/bin/sh"; + CONFIG_SHELL = "/bin/sh"; +}) diff --git a/pkgs/development/interpreters/guile/clang.patch b/pkgs/development/interpreters/guile/clang.patch new file mode 100644 index 00000000000..4d0f342b211 --- /dev/null +++ b/pkgs/development/interpreters/guile/clang.patch @@ -0,0 +1,14 @@ +diff --git a/lib/stdint.in.h b/lib/stdint.in.h +index 889bca7..15d39b0 100644 +--- a/lib/stdint.in.h ++++ b/lib/stdint.in.h +@@ -74,7 +74,8 @@ + in would reinclude us, skipping our contents because + _@GUARD_PREFIX@_STDINT_H is defined. + The include_next requires a split double-inclusion guard. */ +-# @INCLUDE_NEXT@ @NEXT_STDINT_H@ ++# include ++// # @INCLUDE_NEXT@ @NEXT_STDINT_H@ + #endif + + #if ! defined _@GUARD_PREFIX@_STDINT_H && ! defined _GL_JUST_INCLUDE_SYSTEM_STDINT_H diff --git a/pkgs/development/interpreters/guile/disable-gc-sensitive-tests.patch b/pkgs/development/interpreters/guile/disable-gc-sensitive-tests.patch new file mode 100644 index 00000000000..076091a702a --- /dev/null +++ b/pkgs/development/interpreters/guile/disable-gc-sensitive-tests.patch @@ -0,0 +1,25 @@ +This patch disable GC-sensitive tests. This is particularly useful when +compiling with `-O0' (as is done with coverage analysis) since there may +be many false references held on the stack, leading to the failure of +such tests. + +--- a/test-suite/tests/gc.test ++++ b/test-suite/tests/gc.test +@@ -67,6 +67,7 @@ + + (with-test-prefix "gc" + (pass-if "Unused modules are removed" ++ (throw 'unresolved) + (let* ((guard (make-guardian)) + (total 1000)) + +--- a/test-suite/tests/threads.test ++++ b/test-suite/tests/threads.test +@@ -366,6 +366,7 @@ + (not (mutex-owner m)))) + + (pass-if "mutex with owner not retained (bug #27450)" ++ (throw 'unresolved) + (let ((g (make-guardian))) + (g (let ((m (make-mutex))) (lock-mutex m) m)) + diff --git a/pkgs/development/interpreters/guile/setup-hook-2.0.sh b/pkgs/development/interpreters/guile/setup-hook-2.0.sh new file mode 100644 index 00000000000..fd1dc944ed4 --- /dev/null +++ b/pkgs/development/interpreters/guile/setup-hook-2.0.sh @@ -0,0 +1,13 @@ +addGuileLibPath () { + if test -d "$1/share/guile/site/2.0" + then + export GUILE_LOAD_PATH="${GUILE_LOAD_PATH}${GUILE_LOAD_PATH:+:}$1/share/guile/site/2.0" + export GUILE_LOAD_COMPILED_PATH="${GUILE_LOAD_COMPILED_PATH}${GUILE_LOAD_COMPILED_PATH:+:}$1/share/guile/site/2.0" + elif test -d "$1/share/guile/site" + then + export GUILE_LOAD_PATH="${GUILE_LOAD_PATH}${GUILE_LOAD_PATH:+:}$1/share/guile/site" + export GUILE_LOAD_COMPILED_PATH="${GUILE_LOAD_COMPILED_PATH}${GUILE_LOAD_COMPILED_PATH:+:}$1/share/guile/site" + fi +} + +envHooks+=(addGuileLibPath) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 07384cf779c..7347a0ea69f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -574,7 +574,9 @@ with pkgs; atftp = callPackage ../tools/networking/atftp { }; - autogen = callPackage ../development/tools/misc/autogen { }; + autogen = callPackage ../development/tools/misc/autogen { + guile = guile_2_0; + }; autojump = callPackage ../tools/misc/autojump { }; @@ -5792,6 +5794,9 @@ with pkgs; guile_1_8 = callPackage ../development/interpreters/guile/1.8.nix { }; + # Needed for autogen + guile_2_0 = callPackage ../development/interpreters/guile/2.0.nix { }; + guile_2_2 = callPackage ../development/interpreters/guile { }; guile = guile_2_2; From 5a81c669065f86eb657b60fd0f6513b8435170eb Mon Sep 17 00:00:00 2001 From: Dan Peebles Date: Sun, 19 Mar 2017 00:36:15 -0400 Subject: [PATCH 41/45] erlang: patch all versions to work with clang 4 --- pkgs/development/interpreters/erlang/R16.nix | 5 ++++ .../interpreters/erlang/R16B02-8-basho.nix | 27 +++++++++++-------- pkgs/development/interpreters/erlang/R17.nix | 7 ++++- pkgs/development/interpreters/erlang/R18.nix | 7 ++++- pkgs/development/interpreters/erlang/R19.nix | 3 +++ 5 files changed, 36 insertions(+), 13 deletions(-) diff --git a/pkgs/development/interpreters/erlang/R16.nix b/pkgs/development/interpreters/erlang/R16.nix index ed30fe1522b..e2e0151de37 100644 --- a/pkgs/development/interpreters/erlang/R16.nix +++ b/pkgs/development/interpreters/erlang/R16.nix @@ -27,6 +27,11 @@ stdenv.mkDerivation rec { ++ optional odbcSupport unixODBC ++ optionals stdenv.isDarwin [ Carbon Cocoa ]; + # Clang 4 (rightfully) thinks signed comparisons of pointers with NULL are nonsense + prePatch = '' + substituteInPlace lib/wx/c_src/wxe_impl.cpp --replace 'temp > NULL' 'temp != NULL' + ''; + patchPhase = '' sed -i "s@/bin/rm@rm@" lib/odbc/configure erts/configure ''; preConfigure = '' diff --git a/pkgs/development/interpreters/erlang/R16B02-8-basho.nix b/pkgs/development/interpreters/erlang/R16B02-8-basho.nix index 5745ea5d98b..80f524019df 100644 --- a/pkgs/development/interpreters/erlang/R16B02-8-basho.nix +++ b/pkgs/development/interpreters/erlang/R16B02-8-basho.nix @@ -2,7 +2,7 @@ , gnused, gawk, makeWrapper , odbcSupport ? false, unixODBC ? null , wxSupport ? false, mesa ? null, wxGTK ? null, xorg ? null -, enableDebugInfo ? false +, enableDebugInfo ? false , Carbon ? null, Cocoa ? null }: assert wxSupport -> mesa != null && wxGTK != null && xorg != null; @@ -24,11 +24,16 @@ stdenv.mkDerivation rec { debugInfo = enableDebugInfo; buildInputs = - [ perl gnum4 ncurses openssl makeWrapper autoconf264 gcc + [ perl gnum4 ncurses openssl makeWrapper autoconf264 gcc ] ++ optional wxSupport [ mesa wxGTK xorg.libX11 ] ++ optional odbcSupport [ unixODBC ] ++ optionals stdenv.isDarwin [ Carbon Cocoa ]; + # Clang 4 (rightfully) thinks signed comparisons of pointers with NULL are nonsense + prePatch = '' + substituteInPlace lib/wx/c_src/wxe_impl.cpp --replace 'temp > NULL' 'temp != NULL' + ''; + patchPhase = '' sed -i "s@/bin/rm@rm@" lib/odbc/configure.in erts/configure.in ''; preConfigure = '' @@ -36,22 +41,22 @@ stdenv.mkDerivation rec { export LANG=C export ERL_TOP=$(pwd) sed -e s@/bin/pwd@pwd@g -i otp_build - sed -e s@"/usr/bin/env escript"@${erlang}/bin/escript@g -i lib/diameter/bin/diameterc + sed -e s@"/usr/bin/env escript"@${erlang}/bin/escript@g -i lib/diameter/bin/diameterc ''; configureFlags= [ "--with-ssl=${openssl.dev}" - "--enable-smp-support" - "--enable-threads" - "--enable-kernel-poll" - "--disable-hipe" - "${optionalString odbcSupport "--with-odbc=${unixODBC}"}" - "${optionalString stdenv.isDarwin "--enable-darwin-64bit"}" + "--enable-smp-support" + "--enable-threads" + "--enable-kernel-poll" + "--disable-hipe" + "${optionalString odbcSupport "--with-odbc=${unixODBC}"}" + "${optionalString stdenv.isDarwin "--enable-darwin-64bit"}" "${optionalString stdenv.isLinux "--enable-m64-build"}" ]; buildPhase = '' - ./otp_build autoconf + ./otp_build autoconf ./otp_build setup -a --prefix=$out $configureFlags ''; @@ -89,7 +94,7 @@ stdenv.mkDerivation rec { telephony and instant messaging. Erlang's runtime system has built-in support for concurrency, distribution and fault tolerance. - This version of Erlang is Basho's version, forked from Ericsson's + This version of Erlang is Basho's version, forked from Ericsson's repository. ''; diff --git a/pkgs/development/interpreters/erlang/R17.nix b/pkgs/development/interpreters/erlang/R17.nix index 57323a587f8..0869285d496 100644 --- a/pkgs/development/interpreters/erlang/R17.nix +++ b/pkgs/development/interpreters/erlang/R17.nix @@ -35,7 +35,12 @@ stdenv.mkDerivation rec { ++ optional javacSupport openjdk ++ stdenv.lib.optionals stdenv.isDarwin [ Carbon Cocoa ]; - patchPhase = '' sed -i "s@/bin/rm@rm@" lib/odbc/configure erts/configure ''; + patchPhase = '' + # Clang 4 (rightfully) thinks signed comparisons of pointers with NULL are nonsense + substituteInPlace lib/wx/c_src/wxe_impl.cpp --replace 'temp > NULL' 'temp != NULL' + + sed -i "s@/bin/rm@rm@" lib/odbc/configure erts/configure + ''; debugInfo = enableDebugInfo; diff --git a/pkgs/development/interpreters/erlang/R18.nix b/pkgs/development/interpreters/erlang/R18.nix index f9b6edc3fa4..1ed9bfbd70a 100644 --- a/pkgs/development/interpreters/erlang/R18.nix +++ b/pkgs/development/interpreters/erlang/R18.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchFromGitHub, perl, gnum4, ncurses, openssl +{ stdenv, fetchurl, fetchpatch, fetchFromGitHub, perl, gnum4, ncurses, openssl , gnused, gawk, autoconf, libxslt, libxml2, makeWrapper , Carbon, Cocoa , odbcSupport ? false, unixODBC ? null @@ -53,6 +53,11 @@ stdenv.mkDerivation rec { sha256 = "10h5348p6g279b4q01i5jdqlljww5chcvrx5b4b0dv79pk0p0m9f"; }; + # Clang 4 (rightfully) thinks signed comparisons of pointers with NULL are nonsense + prePatch = '' + substituteInPlace lib/wx/c_src/wxe_impl.cpp --replace 'temp > NULL' 'temp != NULL' + ''; + patches = [ rmAndPwdPatch envAndCpPatch diff --git a/pkgs/development/interpreters/erlang/R19.nix b/pkgs/development/interpreters/erlang/R19.nix index 11f50b40fb3..4b1e3f4cb2f 100644 --- a/pkgs/development/interpreters/erlang/R19.nix +++ b/pkgs/development/interpreters/erlang/R19.nix @@ -46,6 +46,9 @@ stdenv.mkDerivation rec { prePatch = '' substituteInPlace configure.in \ --replace '`sw_vers -productVersion`' '10.10' + + # Clang 4 (rightfully) thinks signed comparisons of pointers with NULL are nonsense + substituteInPlace lib/wx/c_src/wxe_impl.cpp --replace 'temp > NULL' 'temp != NULL' ''; preConfigure = '' From de0849d18098ba8521ef8ae33aa4971068ebb9e3 Mon Sep 17 00:00:00 2001 From: Dan Peebles Date: Sun, 19 Mar 2017 14:41:55 -0400 Subject: [PATCH 42/45] erlangR14: delete unreferenced ancient file --- pkgs/development/interpreters/erlang/R14.nix | 64 -------------------- 1 file changed, 64 deletions(-) delete mode 100644 pkgs/development/interpreters/erlang/R14.nix diff --git a/pkgs/development/interpreters/erlang/R14.nix b/pkgs/development/interpreters/erlang/R14.nix deleted file mode 100644 index 0a93726fc0a..00000000000 --- a/pkgs/development/interpreters/erlang/R14.nix +++ /dev/null @@ -1,64 +0,0 @@ -{ stdenv, fetchurl, perl, gnum4, ncurses, openssl -, makeWrapper, gnused, gawk }: - -let version = "14B04"; in - -stdenv.mkDerivation { - name = "erlang-" + version; - - src = fetchurl { - url = "http://www.erlang.org/download/otp_src_R${version}.tar.gz"; - sha256 = "0vlvjlg8vzcy6inb4vj00bnj0aarvpchzxwhmi492nv31s8kb6q9"; - }; - - buildInputs = [ perl gnum4 ncurses openssl makeWrapper ]; - - patchPhase = '' sed -i "s@/bin/rm@rm@" lib/odbc/configure erts/configure ''; - - preConfigure = '' - export HOME=$PWD/../ - sed -e s@/bin/pwd@pwd@g -i otp_build - ''; - - configureFlags = "--with-ssl=${openssl.dev}"; - - hardeningDisable = [ "format" ]; - - postInstall = let - manpages = fetchurl { - url = "http://www.erlang.org/download/otp_doc_man_R${version}.tar.gz"; - sha256 = "1nh7l7wilyyaxvlwkjxgm3cq7wpd90sk6vxhgpvg7hwai8g52545"; - }; - in '' - tar xf "${manpages}" -C "$out/lib/erlang" - for i in "$out"/lib/erlang/man/man[0-9]/*.[0-9]; do - prefix="''${i%/*}" - ensureDir "$out/share/man/''${prefix##*/}" - ln -s "$i" "$out/share/man/''${prefix##*/}/''${i##*/}erl" - done - ''; - - # Some erlang bin/ scripts run sed and awk - postFixup = '' - wrapProgram $out/lib/erlang/bin/erl --prefix PATH ":" "${gnused}/bin/" - wrapProgram $out/lib/erlang/bin/start_erl --prefix PATH ":" "${gnused}/bin/:${gawk}/bin" - ''; - - setupHook = ./setup-hook.sh; - - meta = { - homepage = "http://www.erlang.org/"; - description = "Programming language used for massively scalable soft real-time systems"; - - longDescription = '' - Erlang is a programming language used to build massively scalable - soft real-time systems with requirements on high availability. - Some of its uses are in telecoms, banking, e-commerce, computer - telephony and instant messaging. Erlang's runtime system has - built-in support for concurrency, distribution and fault - tolerance. - ''; - - platforms = stdenv.lib.platforms.linux; - }; -} From 9748828e78c2b22d782321532b81de0f259d1860 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 19 Mar 2017 21:19:45 +0300 Subject: [PATCH 43/45] steamPackages.steam-runtime-wrapped: override vulkan-loader This way we get /run/opengl-driver as a search path. Fixes #24056. --- pkgs/games/steam/runtime-wrapped.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/games/steam/runtime-wrapped.nix b/pkgs/games/steam/runtime-wrapped.nix index 1988463d61a..74548fcfb8c 100644 --- a/pkgs/games/steam/runtime-wrapped.nix +++ b/pkgs/games/steam/runtime-wrapped.nix @@ -88,6 +88,7 @@ let openalSoft libva openssl-steam + vulkan-loader ] ++ lib.optional newStdcpp gcc.cc; ourRuntime = if runtimeOnly then [] From a4e736e2d1ca9c1bd5a0c6bea43f9e872548a4dd Mon Sep 17 00:00:00 2001 From: neeasade Date: Sun, 19 Mar 2017 14:40:03 -0500 Subject: [PATCH 44/45] colort: add maintainer --- pkgs/applications/misc/colort/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/misc/colort/default.nix b/pkgs/applications/misc/colort/default.nix index a9e7e57fc8d..554c7d8c78b 100644 --- a/pkgs/applications/misc/colort/default.nix +++ b/pkgs/applications/misc/colort/default.nix @@ -17,5 +17,6 @@ stdenv.mkDerivation { homepage = https://github.com/neeasade/colort; license = licenses.mit; platforms = platforms.all; + maintainers = [ maintainers.neeasade ]; }; } From 9ec0e9676f9c3c04fa779024310e51a6188b8561 Mon Sep 17 00:00:00 2001 From: Nathan Isom Date: Sun, 19 Mar 2017 14:41:17 -0500 Subject: [PATCH 45/45] bevelbar: init at 16.11 (#24072) * bevelbar: init at 16.11 * bevelbar: use fetchFromGitHub --- .../window-managers/bevelbar/default.nix | 26 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/applications/window-managers/bevelbar/default.nix diff --git a/pkgs/applications/window-managers/bevelbar/default.nix b/pkgs/applications/window-managers/bevelbar/default.nix new file mode 100644 index 00000000000..b7bc7628488 --- /dev/null +++ b/pkgs/applications/window-managers/bevelbar/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchFromGitHub, libX11, libXrandr, libXft }: + +stdenv.mkDerivation rec { + name = "bevelbar-${version}"; + version = "16.11"; + + src = fetchFromGitHub { + owner = "vain"; + repo = "bevelbar"; + rev = "v${version}"; + sha256 = "1hbwg3vdxw9fyshy85skv476p0zr4ynvhcz2xkijydpzm2j3rmjm"; + }; + + buildInputs = [ libX11 libXrandr libXft ]; + + makeFlags = [ "prefix=$(out)" ]; + installFlags = [ "prefix=$(out)" ]; + + meta = with stdenv.lib; { + description = "An X11 status bar with fancy schmancy 1985-ish beveled borders"; + inherit (src.meta) homepage; + license = licenses.mit; + platforms = platforms.all; + maintainers = [ maintainers.neeasade ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7347a0ea69f..11ccfd1a30a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12883,6 +12883,8 @@ with pkgs; guile = guile_1_8; }; + bevelbar = callPackage ../applications/window-managers/bevelbar { }; + bibletime = callPackage ../applications/misc/bibletime { }; bitkeeper = callPackage ../applications/version-management/bitkeeper {