From 67337972484fbf4cc9870a8376837b4c46e23f89 Mon Sep 17 00:00:00 2001 From: Florian Date: Fri, 29 Jul 2016 12:55:35 +0200 Subject: [PATCH 01/81] ndjbdns: build from latest sources which adds Darwin compatibility --- pkgs/tools/networking/ndjbdns/default.nix | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/networking/ndjbdns/default.nix b/pkgs/tools/networking/ndjbdns/default.nix index 256f50e5c54..3269f92d7f4 100644 --- a/pkgs/tools/networking/ndjbdns/default.nix +++ b/pkgs/tools/networking/ndjbdns/default.nix @@ -1,17 +1,22 @@ -{ stdenv, fetchurl, systemd, pkgconfig }: +{ stdenv, fetchFromGitHub, autoreconfHook, systemd, pkgconfig }: + +with stdenv.lib; stdenv.mkDerivation rec { version = "1.06"; name = "ndjbdns-${version}"; - src = fetchurl { - url = "http://pjp.dgplug.org/ndjbdns/${name}.tar.gz"; - sha256 = "09qi5a9abqm08iqmxj74fzzq9x1w5lzr1jlbzj2hl8hz0g2sgraw"; + src = fetchFromGitHub { + owner = "pjps"; + repo = "ndjbdns"; + rev = "64d371b6f887621de7bf8bd495be10442b2accd0"; + sha256 = "0gjyvn8r66kp49gasd6sqfvg2pj0c6v67hnq7cqwl04kj69rfy86"; }; - buildInputs = [ pkgconfig systemd ]; + buildInputs = [ autoreconfHook pkgconfig ] + ++ optional stdenv.isLinux systemd; - meta = with stdenv.lib; { + meta = { description = "A brand new release of the Djbdns"; longDescription = '' Djbdns is a fully‐fledged Domain Name System(DNS), originally written by the eminent author of qmail, Dr. D J Bernstein. @@ -19,7 +24,7 @@ stdenv.mkDerivation rec { homepage = http://pjp.dgplug.org/ndjbdns/; license = licenses.gpl2; maintainers = [ maintainers.msackman ]; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; }; } From e2bb0c5da85bf66648103395fe926a9c8f274840 Mon Sep 17 00:00:00 2001 From: Florent Becker Date: Thu, 20 Oct 2016 10:19:57 +0200 Subject: [PATCH 02/81] js_of_ocaml: propagate dependency on ppx_deriving ppx_deriving is needed by js_of_ocaml even when it is not used in the code to be compiled by js_of_ocaml --- pkgs/development/tools/ocaml/js_of_ocaml/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/default.nix b/pkgs/development/tools/ocaml/js_of_ocaml/default.nix index b19f078d9a2..33a7fe52c39 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/default.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/default.nix @@ -8,9 +8,9 @@ stdenv.mkDerivation { sha256 = "1dali1akyd4zmkwav0d957ynxq2jj6cc94r4xiaql7ca89ajz4jj"; }; - buildInputs = [ ocaml findlib menhir ocsigen_deriving ppx_deriving + buildInputs = [ ocaml findlib menhir ocsigen_deriving cmdliner tyxml reactivedata cppo which base64]; - propagatedBuildInputs = [ ocaml_lwt camlp4 ]; + propagatedBuildInputs = [ ocaml_lwt camlp4 ppx_deriving ]; patches = [ ./Makefile.conf.diff ]; From 51e0173c284aecc857fd81533df36e541ae66f08 Mon Sep 17 00:00:00 2001 From: Florent Becker Date: Sat, 22 Oct 2016 11:03:56 +0200 Subject: [PATCH 03/81] ocamlPackages.ocaml_pcre: change name from ocaml-ocaml-pcre to ocaml-pcre The old name was confusing some dependencies when searching for dllpcrestubs.so --- pkgs/development/ocaml-modules/pcre/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/ocaml-modules/pcre/default.nix b/pkgs/development/ocaml-modules/pcre/default.nix index dd152262ca7..d2e0e0aa727 100644 --- a/pkgs/development/ocaml-modules/pcre/default.nix +++ b/pkgs/development/ocaml-modules/pcre/default.nix @@ -1,7 +1,7 @@ {stdenv, buildOcaml, fetchurl, pcre, ocaml, findlib}: buildOcaml { - name = "ocaml-pcre"; + name = "pcre"; version = "7.1.1"; src = fetchurl { From a52c1b484017d57ec1a7a9bb3a7add8bcabc11a1 Mon Sep 17 00:00:00 2001 From: Florent Becker Date: Sat, 22 Oct 2016 11:05:39 +0200 Subject: [PATCH 04/81] pgocaml: 2.2 -> 2.3 Changes the build system from mkDerivation to buildOcaml --- .../ocaml-modules/pgocaml/default.nix | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/pkgs/development/ocaml-modules/pgocaml/default.nix b/pkgs/development/ocaml-modules/pgocaml/default.nix index 6b9ae97ad54..a8b3ed15862 100644 --- a/pkgs/development/ocaml-modules/pgocaml/default.nix +++ b/pkgs/development/ocaml-modules/pgocaml/default.nix @@ -1,14 +1,17 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, camlp4, calendar, csv, ocaml_pcre }: +{ stdenv, fetchurl, buildOcaml, calendar, csv, re }: -stdenv.mkDerivation { - name = "ocaml-pgocaml-2.2"; +buildOcaml { + name = "pgocaml"; + version = "2.3"; src = fetchurl { - url = http://forge.ocamlcore.org/frs/download.php/1506/pgocaml-2.2.tgz; - sha256 = "0x0dhlz2rqxpwfdqi384f9fn0ng2irifadmxfm2b4gcz7y1cl9rh"; + url = https://github.com/darioteixeira/pgocaml/archive/v2.3.tar.gz; + sha256 = "18lymxlvcf4nwxawkidq3pilsp5rhl0l8ifq6pjk3ssjlx9w53pg"; }; - buildInputs = [ ocaml findlib ocamlbuild camlp4 ]; - propagatedBuildInputs = [ calendar csv ocaml_pcre ]; + buildInputs = [ ]; + propagatedBuildInputs = [ calendar csv re ]; + + configureFlags = [ "--enable-p4" ]; createFindlibDestdir = true; @@ -16,7 +19,6 @@ stdenv.mkDerivation { description = "An interface to PostgreSQL databases for OCaml applications"; homepage = http://pgocaml.forge.ocamlcore.org/; license = licenses.lgpl2; - platforms = ocaml.meta.platforms or []; maintainers = with maintainers; [ vbgl ]; }; } From ac69382453c61a17ec0669e449dac33d7e13c3a6 Mon Sep 17 00:00:00 2001 From: Florent Becker Date: Sat, 22 Oct 2016 11:08:27 +0200 Subject: [PATCH 05/81] eliom: modernize derivation --- .../ocaml-modules/eliom/default.nix | 26 +++++++------------ 1 file changed, 9 insertions(+), 17 deletions(-) diff --git a/pkgs/development/ocaml-modules/eliom/default.nix b/pkgs/development/ocaml-modules/eliom/default.nix index 219f104271d..293faad2301 100644 --- a/pkgs/development/ocaml-modules/eliom/default.nix +++ b/pkgs/development/ocaml-modules/eliom/default.nix @@ -1,15 +1,10 @@ -{ stdenv, fetchurl, ocaml, findlib, which, ocsigen_server, ocsigen_deriving, +{ buildOcaml, stdenv, fetchurl, which, ocsigen_server, ocsigen_deriving, ocaml, js_of_ocaml, ocaml_react, ocaml_lwt, calendar, cryptokit, tyxml, ipaddr, ocamlnet, ocaml_ssl, ocaml_pcre, ocaml_optcomp, - reactivedata, opam, ppx_tools, camlp4}: + reactivedata, opam, ppx_tools, ppx_deriving, camlp4}: -let ocamlVersion = (stdenv.lib.getVersion ocaml); - in - -( -assert stdenv.lib.versionAtLeast ocamlVersion "4"; - -stdenv.mkDerivation rec +let ocamlVersion = (stdenv.lib.getVersion ocaml); in +buildOcaml rec { pname = "eliom"; version = "5.0.0"; @@ -22,12 +17,11 @@ stdenv.mkDerivation rec patches = [ ./camlp4.patch ]; - buildInputs = [ocaml which ocsigen_server findlib ocsigen_deriving - js_of_ocaml ocaml_optcomp opam ppx_tools camlp4 ]; + buildInputs = [ which ocaml_optcomp opam ppx_tools camlp4 ]; - propagatedBuildInputs = [ ocaml_lwt reactivedata tyxml ipaddr - calendar cryptokit ocamlnet ocaml_react ocaml_ssl - ocaml_pcre ]; + propagatedBuildInputs = [ ocaml_lwt reactivedata tyxml ipaddr ocsigen_server ppx_deriving + ocsigen_deriving js_of_ocaml + calendar cryptokit ocamlnet ocaml_react ocaml_ssl ocaml_pcre ]; preConfigure = stdenv.lib.optionalString (!stdenv.lib.versionAtLeast ocamlVersion "4.02") '' export PPX=false @@ -57,8 +51,6 @@ stdenv.mkDerivation rec license = stdenv.lib.licenses.lgpl21; - platforms = ocaml.meta.platforms or []; - maintainers = [ stdenv.lib.maintainers.gal_bolle ]; }; -}) +} From 10728c25b0fe4b91ac25d4b40c2de84ab6a944c2 Mon Sep 17 00:00:00 2001 From: Alexander Ried Date: Fri, 28 Oct 2016 00:59:56 +0200 Subject: [PATCH 06/81] replaceDependency: fix syntax error --- pkgs/build-support/replace-dependency.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/replace-dependency.nix b/pkgs/build-support/replace-dependency.nix index b0174ca24ab..15ab50bf397 100644 --- a/pkgs/build-support/replace-dependency.nix +++ b/pkgs/build-support/replace-dependency.nix @@ -22,7 +22,7 @@ with lib; let - warn = if verbose then builtins.trace else (x:y:y); + warn = if verbose then builtins.trace else (x: y: y); references = import (runCommand "references.nix" { exportReferencesGraph = [ "graph" drv ]; } '' (echo { while read path From 41fcb036eb19b6aef8f4f11d7eb6135247afc8bd Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Mon, 28 Nov 2016 14:52:41 +0300 Subject: [PATCH 07/81] releaseTools.debBuild: split checkinstall into separate phase and allow to override them --- pkgs/build-support/release/debian-build.nix | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/pkgs/build-support/release/debian-build.nix b/pkgs/build-support/release/debian-build.nix index f4bc3e73056..74e061966bc 100644 --- a/pkgs/build-support/release/debian-build.nix +++ b/pkgs/build-support/release/debian-build.nix @@ -16,17 +16,14 @@ with stdenv.lib; vmTools.runInLinuxImage (stdenv.mkDerivation ( { + name = name + "-" + diskImage.name + (if src ? version then "-" + src.version else ""); + doCheck = true; prefix = "/usr"; - prePhases = "installExtraDebsPhase sysInfoPhase"; - } - - // removeAttrs args ["vmTools"] // - - { - name = name + "-" + diskImage.name + (if src ? version then "-" + src.version else ""); + prePhases = [ "installExtraDebsPhase" "sysInfoPhase" ]; + postPhases = [ "debInstallPhase" ]; # !!! cut&paste from rpm-build.nix postHook = '' @@ -72,6 +69,12 @@ vmTools.runInLinuxImage (stdenv.mkDerivation ( mkdir -p $out/debs find . -name "*.deb" -exec cp {} $out/debs \; + eval "$postInstall" + ''; + + debInstallPhase = '' + eval "$preDebInstall" + [ "$(echo $out/debs/*.deb)" != "" ] for i in $out/debs/*.deb; do @@ -87,12 +90,12 @@ vmTools.runInLinuxImage (stdenv.mkDerivation ( echo "file deb-extra $(ls $i/debs/*.deb | sort | head -1)" >> $out/nix-support/hydra-build-products done - eval "$postInstall" + eval "$postDebInstall" ''; # */ meta = (if args ? meta then args.meta else {}) // { description = "Deb package for ${diskImage.fullName}"; }; - } + } // removeAttrs args ["name" "meta" "vmTools"] )) From b0bfa88848cddb3011db8fb3465a25ec80e54da9 Mon Sep 17 00:00:00 2001 From: Tom Hinton Date: Fri, 16 Dec 2016 15:10:23 +0000 Subject: [PATCH 08/81] Fiddle LD_LIBRARY_PATH to include GDAL Some GRASS functions dlopen GDAL, and don't get patched in the install. To make them work I have to export LD_LIBRARY_PATH from within grass again with pkgs.gdal/lib. Alternatively this does the trick - there might be a better way to do this, if the configure script can take the true path to gdal and reflect it in the dlopen calls or something? --- pkgs/applications/gis/grass/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/gis/grass/default.nix b/pkgs/applications/gis/grass/default.nix index 44e07cc22c0..7d2828115f7 100644 --- a/pkgs/applications/gis/grass/default.nix +++ b/pkgs/applications/gis/grass/default.nix @@ -60,6 +60,7 @@ stdenv.mkDerivation { wrapProgram $out/bin/grass70 \ --set PYTHONPATH $PYTHONPATH \ --set GRASS_PYTHON ${python2Packages.python}/bin/${python2Packages.python.executable} + --suffix LD_LIBRARY_PATH ':' '${gdal}/lib' ln -s $out/grass-*/lib $out/lib ''; From 4c1d8b4347cf4a3e566165bb16551108ea4b4af1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1rton=20Boros?= Date: Tue, 20 Dec 2016 00:28:23 +0100 Subject: [PATCH 09/81] idrisPackages.httpclient: init --- pkgs/development/idris-modules/httpclient.nix | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 pkgs/development/idris-modules/httpclient.nix diff --git a/pkgs/development/idris-modules/httpclient.nix b/pkgs/development/idris-modules/httpclient.nix new file mode 100644 index 00000000000..ec41956b963 --- /dev/null +++ b/pkgs/development/idris-modules/httpclient.nix @@ -0,0 +1,30 @@ +{ pkgs +, build-idris-package +, fetchFromGitHub +, lightyear +, contrib +, lib +, idris +}: + +let + date = "2016-12-20"; +in +build-idris-package { + name = "httpclient-${date}"; + + src = fetchFromGitHub { + owner = "justjoheinz"; + repo = "idris-httpclient"; + rev = "4a7296d572d7f7fde87d27da07d5c9566dc4ff14"; + sha256 = "0sy0q7gri9lwbqdmx9720pby3w1470w7wzn62bf2rir532219hhl"; + }; + + propagatedBuildInputs = [ pkgs.curl lightyear contrib ]; + + meta = { + description = "HTTP Client for Idris"; + homepage = https://github.com/justjoheinz/idris-httpclient; + inherit (idris.meta) platforms; + }; +} From 6eead52e1252413ea835fa1261bbf73ff569d23d Mon Sep 17 00:00:00 2001 From: Christopher League Date: Tue, 27 Dec 2016 13:39:53 -0500 Subject: [PATCH 10/81] gphoto2: nixos programs module to configure udev Closes #21420. --- lib/maintainers.nix | 1 + nixos/modules/module-list.nix | 1 + nixos/modules/programs/gphoto2.nix | 31 +++++++++++++++++++ .../libraries/libgphoto2/default.nix | 6 +++- 4 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 nixos/modules/programs/gphoto2.nix diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 7ed8ae953bc..a06f1695294 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -240,6 +240,7 @@ lassulus = "Lassulus "; layus = "Guillaume Maudoux "; ldesgoui = "Lucas Desgouilles "; + league = "Christopher League "; lebastr = "Alexander Lebedev "; leenaars = "Michiel Leenaars "; leonardoce = "Leonardo Cecchi "; diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index cd12fe4f9b3..b3177589716 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -71,6 +71,7 @@ ./programs/environment.nix ./programs/fish.nix ./programs/freetds.nix + ./programs/gphoto2.nix ./programs/info.nix ./programs/java.nix ./programs/kbdlight.nix diff --git a/nixos/modules/programs/gphoto2.nix b/nixos/modules/programs/gphoto2.nix new file mode 100644 index 00000000000..47822562aee --- /dev/null +++ b/nixos/modules/programs/gphoto2.nix @@ -0,0 +1,31 @@ +{ config, lib, pkgs, ... }: + +with lib; + +{ + meta.maintainers = [ maintainers.league ]; + + ###### interface + options = { + programs.gphoto2 = { + enable = mkOption { + default = false; + example = true; + type = types.bool; + description = '' + Whether to configure system to use gphoto2. + To grant digital camera access to a user, the user must + be part of the camera group: + users.extraUsers.alice.extraGroups = ["camera"]; + ''; + }; + }; + }; + + ###### implementation + config = mkIf config.programs.gphoto2.enable { + services.udev.packages = [ pkgs.libgphoto2 ]; + environment.systemPackages = [ pkgs.gphoto2 ]; + users.extraGroups.camera = {}; + }; +} diff --git a/pkgs/development/libraries/libgphoto2/default.nix b/pkgs/development/libraries/libgphoto2/default.nix index 68736608ad4..e9b6968d13b 100644 --- a/pkgs/development/libraries/libgphoto2/default.nix +++ b/pkgs/development/libraries/libgphoto2/default.nix @@ -25,6 +25,11 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; + postInstall = '' + mkdir -p $out/lib/udev/rules.d + $out/lib/libgphoto2/print-camera-list udev-rules version 175 group camera >$out/lib/udev/rules.d/40-gphoto2.rules + ''; + meta = { homepage = http://www.gphoto.org/proj/libgphoto2/; description = "A library for accessing digital cameras"; @@ -41,4 +46,3 @@ stdenv.mkDerivation rec { maintainers = with stdenv.lib.maintainers; [ jcumming ]; }; } - From 2990cd8aeac6b6a05121eebb0f5ca997eb73a650 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Wed, 28 Dec 2016 12:19:09 +0100 Subject: [PATCH 11/81] clblas-cuda: use system gtest library Without this the build attempts to download the library. --- .../development/libraries/science/math/clblas/cuda/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/libraries/science/math/clblas/cuda/default.nix b/pkgs/development/libraries/science/math/clblas/cuda/default.nix index c142514b262..6d3faa2fb7f 100644 --- a/pkgs/development/libraries/science/math/clblas/cuda/default.nix +++ b/pkgs/development/libraries/science/math/clblas/cuda/default.nix @@ -7,6 +7,7 @@ , python , cudatoolkit , nvidia_x11 +, gtest }: stdenv.mkDerivation rec { @@ -40,6 +41,7 @@ stdenv.mkDerivation rec { cmake ../src -DCMAKE_INSTALL_PREFIX=$out \ -DCMAKE_BUILD_TYPE=Release \ -DOPENCL_ROOT=${cudatoolkit} \ + -DUSE_SYSTEM_GTEST=ON ''; dontStrip = true; @@ -51,6 +53,7 @@ stdenv.mkDerivation rec { python cudatoolkit nvidia_x11 + gtest ]; meta = with stdenv.lib; { From e243ec43f3728a7e1ddf617af58f18f72b79415d Mon Sep 17 00:00:00 2001 From: Jeremy Shaw Date: Wed, 28 Dec 2016 13:48:50 -0500 Subject: [PATCH 12/81] netbpm: tell config.mk where to find JPEGLIB and JPEGHDR_DIR or jpegtopnm and friends will not be built. --- pkgs/tools/graphics/netpbm/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/graphics/netpbm/default.nix b/pkgs/tools/graphics/netpbm/default.nix index d0381e91251..7fafc5218e9 100644 --- a/pkgs/tools/graphics/netpbm/default.nix +++ b/pkgs/tools/graphics/netpbm/default.nix @@ -24,7 +24,9 @@ stdenv.mkDerivation rec { echo "STATICLIB_TOO = n" >> config.mk substituteInPlace "config.mk" \ --replace "TIFFLIB = NONE" "TIFFLIB = ${libtiff.out}/lib/libtiff.so" \ - --replace "TIFFHDR_DIR =" "TIFFHDR_DIR = ${libtiff.dev}/include" + --replace "TIFFHDR_DIR =" "TIFFHDR_DIR = ${libtiff.dev}/include" \ + --replace "JPEGLIB = NONE" "JPEGLIB = ${libjpeg.out}/lib/libjpeg.so" \ + --replace "JPEGHDR_DIR =" "JPEGHDR_DIR = ${libjpeg.dev}/include" '' + stdenv.lib.optionalString stdenv.isDarwin '' echo "LDSHLIB=-dynamiclib -install_name $out/lib/libnetpbm.\$(MAJ).dylib" >> config.mk echo "NETPBMLIBTYPE = dylib" >> config.mk From 86d55f0380188d6e91c76cbbd79af82182842455 Mon Sep 17 00:00:00 2001 From: mimadrid Date: Wed, 28 Dec 2016 20:06:14 +0100 Subject: [PATCH 13/81] openbabel: 2.3.2 -> 2.4.1 --- pkgs/development/libraries/openbabel/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/openbabel/default.nix b/pkgs/development/libraries/openbabel/default.nix index 3c4cd8bb6c8..b124e592f36 100644 --- a/pkgs/development/libraries/openbabel/default.nix +++ b/pkgs/development/libraries/openbabel/default.nix @@ -1,23 +1,23 @@ -{stdenv, fetchurl, cmake, zlib, libxml2, eigen, python, cairo, pkgconfig }: +{stdenv, fetchurl, cmake, zlib, libxml2, eigen, python, cairo, pcre, pkgconfig }: stdenv.mkDerivation rec { - name = "openbabel-2.3.2"; + name = "openbabel-${version}"; + version = "2.4.1"; src = fetchurl { - url = "mirror://sourceforge/openbabel/${name}.tar.gz"; - sha256 = "122if0jkm71ngd1b0dic8k567b3j2hcikbwnpxgchv5ag5ka5b2f"; + url = "https://github.com/openbabel/openbabel/archive/openbabel-${stdenv.lib.replaceStrings ["."] ["-"] version}.tar.gz"; + sha256 = "0xm7y859ivq2cp0q08mwshfxm0jq31xkyr4x8s0j6l7khf57yk2r"; }; # TODO : perl & python bindings; # TODO : wxGTK: I have no time to compile # TODO : separate lib and apps - buildInputs = [ zlib libxml2 eigen python cairo ]; + buildInputs = [ zlib libxml2 eigen python cairo pcre ]; nativeBuildInputs = [ cmake pkgconfig ]; meta = { platforms = stdenv.lib.platforms.all; maintainers = [ stdenv.lib.maintainers.urkud ]; - broken = true; # doesn't build with GCC 5; fix in GitHub }; } From e5cd7189749588e3f07f813a03b8dc9c37bc57cd Mon Sep 17 00:00:00 2001 From: Roman Naumann Date: Tue, 27 Dec 2016 23:41:44 +0100 Subject: [PATCH 14/81] gorilla: init at 1.5.3.7 --- lib/maintainers.nix | 1 + pkgs/tools/security/gorilla-bin/default.nix | 41 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 44 insertions(+) create mode 100644 pkgs/tools/security/gorilla-bin/default.nix diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 7ed8ae953bc..89d17213239 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -314,6 +314,7 @@ mudri = "James Wood "; muflax = "Stefan Dorn "; myrl = "Myrl Hex "; + namore = "Roman Naumann "; nand0p = "Fernando Jose Pando "; Nate-Devv = "Nathan Moore "; nathan-gs = "Nathan Bijnens "; diff --git a/pkgs/tools/security/gorilla-bin/default.nix b/pkgs/tools/security/gorilla-bin/default.nix new file mode 100644 index 00000000000..cbd260455d8 --- /dev/null +++ b/pkgs/tools/security/gorilla-bin/default.nix @@ -0,0 +1,41 @@ +{ fetchurl, makeWrapper, patchelf, pkgs, stdenv, libXft, libX11, freetype, fontconfig, libXrender, libXScrnSaver, libXext }: + +stdenv.mkDerivation rec { + name = "gorilla-bin-${version}"; + version = "1.5.3.7"; + + src = fetchurl { + name = "gorilla1537_64.bin"; + url = "http://gorilla.dp100.com/downloads/gorilla1537_64.bin"; + sha256 = "19ir6x4c01825hpx2wbbcxkk70ymwbw4j03v8b2xc13ayylwzx0r"; + }; + + buildInputs = [ patchelf makeWrapper ]; + phases = [ "unpackPhase" "installPhase" ]; + + unpackCmd = '' + mkdir gorilla; + cp $curSrc gorilla/gorilla-${version}; + ''; + + installPhase = let + interpreter = "$(< \"$NIX_CC/nix-support/dynamic-linker\")"; + libPath = stdenv.lib.makeLibraryPath [ libXft libX11 freetype fontconfig libXrender libXScrnSaver libXext ]; + in '' + mkdir -p $out/opt/password-gorilla + mkdir -p $out/bin + cp gorilla-${version} $out/opt/password-gorilla + chmod ugo+x $out/opt/password-gorilla/gorilla-${version} + patchelf --set-interpreter "${interpreter}" "$out/opt/password-gorilla/gorilla-${version}" + makeWrapper "$out/opt/password-gorilla/gorilla-${version}" "$out/bin/gorilla" \ + --prefix LD_LIBRARY_PATH : "${libPath}" + ''; + + meta = { + description = "Password Gorilla is a Tk based password manager"; + homepage = https://github.com/zdia/gorilla/wiki; + maintainers = [ stdenv.lib.maintainers.namore ]; + platforms = [ "x86_64-linux" ]; + license = stdenv.lib.licenses.gpl2; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index beeed44ba78..bce15bdb9b7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -902,6 +902,8 @@ in goa = callPackage ../development/tools/goa { }; + gorilla-bin = callPackage ../tools/security/gorilla-bin { }; + gringo = callPackage ../tools/misc/gringo { }; gti = callPackage ../tools/misc/gti { }; From e948a6d1f9da64302804e9b5d196be9db7eb714b Mon Sep 17 00:00:00 2001 From: Ricardo Ardissone Date: Wed, 28 Dec 2016 16:52:42 -0200 Subject: [PATCH 15/81] freeorion: 0.4.5 -> 0.4.6 --- pkgs/games/freeorion/92455f9.patch | 19 ------------------- pkgs/games/freeorion/default.nix | 11 ++++++----- pkgs/games/freeorion/fix_rpaths.patch | 11 +++++++++++ 3 files changed, 17 insertions(+), 24 deletions(-) delete mode 100644 pkgs/games/freeorion/92455f9.patch create mode 100644 pkgs/games/freeorion/fix_rpaths.patch diff --git a/pkgs/games/freeorion/92455f9.patch b/pkgs/games/freeorion/92455f9.patch deleted file mode 100644 index e40ee78de6d..00000000000 --- a/pkgs/games/freeorion/92455f9.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -Naur GG/src/Font.cpp ---- /GG/src/Font.cpp -+++ /GG/src/Font.cpp -@@ -1586,8 +1586,13 @@ - using boost::lexical_cast; - FT_UInt index = FT_Get_Char_Index(face, ch); - if (index) { -- if (FT_Load_Glyph(face, index, FT_LOAD_DEFAULT)) -- ThrowBadGlyph("GG::Font::GetGlyphBitmap : Freetype could not load the glyph for character '%1%'", ch); -+ if (FT_Load_Glyph(face, index, FT_LOAD_DEFAULT)) { -+ // loading of a glpyh failed so we replace it with -+ // the 'Replacement Character' at codepoint 0xFFFD -+ FT_UInt tmp_index = FT_Get_Char_Index(face, 0xFFFD); -+ if (FT_Load_Glyph(face, tmp_index, FT_LOAD_DEFAULT)) -+ ThrowBadGlyph("GG::Font::GetGlyphBitmap : Freetype could not load the glyph for character '%1%'", ch); -+ } - - FT_GlyphSlot glyph = face->glyph; - diff --git a/pkgs/games/freeorion/default.nix b/pkgs/games/freeorion/default.nix index e143b6ebcf3..91d4db32b68 100644 --- a/pkgs/games/freeorion/default.nix +++ b/pkgs/games/freeorion/default.nix @@ -2,18 +2,19 @@ , libxslt, makeWrapper }: stdenv.mkDerivation rec { - version = "0.4.5"; + version = "0.4.6"; name = "freeorion-${version}"; src = fetchurl { - url = "https://github.com/freeorion/freeorion/releases/download/v0.4.5/FreeOrion_v0.4.5_2015-09-01.f203162_Source.tar.gz"; - sha256 = "3b99b92eeac72bd059566dbabfab54368989ba83f72e769bc94eb8dd4fe414c0"; + url = "https://github.com/freeorion/freeorion/releases/download/v0.4.6/FreeOrion_v0.4.6_2016-09-16.49f9123_Source.tar.gz"; + sha256 = "04g3x1cymf7mnmc2f5mm3c2r5izjmy7z3pvk2ykzz8f8b2kz6gry"; }; buildInputs = [ cmake boost SDL2 python2 freetype openal libogg libvorbis zlib libpng libtiff libjpeg mesa glew doxygen makeWrapper ]; - # cherry pick for acceptable performance https://github.com/freeorion/freeorion/commit/92455f97c28055e296718230d2e3744eccd738ec - patches = [ ./92455f9.patch ]; + patches = [ + ./fix_rpaths.patch + ]; enableParallelBuilding = true; diff --git a/pkgs/games/freeorion/fix_rpaths.patch b/pkgs/games/freeorion/fix_rpaths.patch new file mode 100644 index 00000000000..f53e9821e5d --- /dev/null +++ b/pkgs/games/freeorion/fix_rpaths.patch @@ -0,0 +1,11 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -46,7 +46,7 @@ + set(FreeOrion_INSTALL_LIBDIR "${CMAKE_INSTALL_LIBDIR}/freeorion") + endif() + +-set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${FreeOrion_INSTALL_LIBDIR}") ++set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_FULL_LIBDIR}/freeorion") + set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) + + if (WIN32) From 7fa4b0f2c94156dfcb177ed8fbadc8c8d1162dad Mon Sep 17 00:00:00 2001 From: Tadas Barzdzius Date: Thu, 29 Dec 2016 09:55:38 +0200 Subject: [PATCH 16/81] rustc: 1.13.0 -> 1.14.0 --- pkgs/development/compilers/rust/bootstrap.nix | 12 ++++++------ pkgs/development/compilers/rust/default.nix | 14 +++++++------- .../patches/disable-lockfile-check-stable.patch | 3 ++- 3 files changed, 15 insertions(+), 14 deletions(-) diff --git a/pkgs/development/compilers/rust/bootstrap.nix b/pkgs/development/compilers/rust/bootstrap.nix index b912a9d7933..93deee01e56 100644 --- a/pkgs/development/compilers/rust/bootstrap.nix +++ b/pkgs/development/compilers/rust/bootstrap.nix @@ -14,16 +14,16 @@ let then "x86_64-apple-darwin" else abort "missing boostrap url for platform ${stdenv.system}"; - # fetch hashes by running `print-hashes.sh 1.12.1` + # fetch hashes by running `print-hashes.sh 1.13.0` bootstrapHash = if stdenv.system == "i686-linux" - then "ede9b9d14d1ddbc29975d1ead73fcf2758719b4b371363afe1c32eb8d6e96bb3" + then "239734113f6750d31085c7a08c260d492991cc1ef10817b6d44154515f3f9439" else if stdenv.system == "x86_64-linux" - then "9e546aec13e389429ba2d86c8f4e67eba5af146c979e4faa16ffb40ddaf9984c" + then "95f4c372b1b81ac1038161e87e932dd7ab875d25c167a861c3949b0f6a65516d" else if stdenv.system == "i686-darwin" - then "2648645c4fe1ecf36beb7de63501dd99e9547a7a6d5683acf2693b919a550b69" + then "f6e01cab3bf8d0a6fe9cc2447aa10ce894569daaa72d44063c229da918b96023" else if stdenv.system == "x86_64-darwin" - then "0ac5e58dba3d24bf09dcc90eaac02d2df053122b0def945ec4cfe36ac6d4d011" + then "f538ca5732b844cf7f00fc4aaaf200a49a845b58b4ec8aef38da0b00e2cf6efe" else throw "missing boostrap hash for platform ${stdenv.system}"; needsPatchelf = stdenv.isLinux; @@ -33,7 +33,7 @@ let sha256 = bootstrapHash; }; - version = "1.12.1"; + version = "1.13.0"; in rec { diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rust/default.nix index c090cc07d01..4d9668da2e3 100644 --- a/pkgs/development/compilers/rust/default.nix +++ b/pkgs/development/compilers/rust/default.nix @@ -7,12 +7,12 @@ in rec { rustc = callPackage ./rustc.nix { - shortVersion = "1.13"; + shortVersion = "1.14"; isRelease = true; forceBundledLLVM = false; configureFlags = [ "--release-channel=stable" ]; - srcRev = "2c6933acc05c61e041be764cb1331f6281993f3f"; - srcSha = "1w0alyyc29cy2lczrqvg1kfycjxy0xg8fpzdac80m88fxpv23glp"; + srcRev = "e8a0123241f0d397d39cd18fcc4e5e7edde22730"; + srcSha = "1sla3gnx9dqvivnyhvwz299mc3jmdy805q2y5xpmpi1vhfk0bafx"; patches = [ ./patches/disable-lockfile-check-stable.patch @@ -25,10 +25,10 @@ rec { }; cargo = callPackage ./cargo.nix rec { - version = "0.14.0"; - srcRev = "eca9e159b6b0d484788ac757cf23052eba75af55"; - srcSha = "1zm5rzw1mvixnkzr4775pcxx6k235qqxbysyp179cbxsw3dm045s"; - depsSha256 = "0gpn0cpwgpzwhc359qn6qplx371ag9pqbwayhqrsydk1zm5bm3zr"; + version = "0.15.0"; + srcRev = "298a0127f703d4c2500bb06d309488b92ef84ae1"; + srcSha = "0v74r18vszapw2rfk7w72czkp9gbq4s1sggphm5vx0kyh058dxc5"; + depsSha256 = "0ksiywli8r4lkprfknm0yz1w27060psi3db6wblqmi8sckzdm44h"; inherit rustc; # the rustc that will be wrapped by cargo inherit rustPlatform; # used to build cargo diff --git a/pkgs/development/compilers/rust/patches/disable-lockfile-check-stable.patch b/pkgs/development/compilers/rust/patches/disable-lockfile-check-stable.patch index 0c01cb1a7f1..c5009b7ba67 100644 --- a/pkgs/development/compilers/rust/patches/disable-lockfile-check-stable.patch +++ b/pkgs/development/compilers/rust/patches/disable-lockfile-check-stable.patch @@ -11,12 +11,13 @@ diff --git a/src/tools/tidy/src/main.rs b/src/tools/tidy/src/main.rs index 2839bbd..50142ff 100644 --- a/src/tools/tidy/src/main.rs +++ b/src/tools/tidy/src/main.rs -@@ -47,7 +47,7 @@ fn main() { +@@ -48,7 +48,7 @@ fn main() { errors::check(&path, &mut bad); cargo::check(&path, &mut bad); features::check(&path, &mut bad); - cargo_lock::check(&path, &mut bad); + //cargo_lock::check(&path, &mut bad); + pal::check(&path, &mut bad); if bad { panic!("some tidy checks failed"); From 31ec0795f6bcad548ae6b73097ce1d045400bd78 Mon Sep 17 00:00:00 2001 From: Tadas Barzdzius Date: Thu, 29 Dec 2016 09:56:19 +0200 Subject: [PATCH 17/81] cargo: 0.14 -> 0.15 --- pkgs/development/compilers/rust/cargo.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/rust/cargo.nix b/pkgs/development/compilers/rust/cargo.nix index 537764ebca2..2b544d754d7 100644 --- a/pkgs/development/compilers/rust/cargo.nix +++ b/pkgs/development/compilers/rust/cargo.nix @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { LIBGIT2_SYS_USE_PKG_CONFIG=1; configurePhase = '' - ./configure --enable-optimize --prefix=$out --local-cargo=${rustPlatform.rust.cargo}/bin/cargo + ./configure --enable-optimize --prefix=$out ''; buildPhase = "make"; @@ -60,7 +60,7 @@ rustPlatform.buildRustPackage rec { cargo test ''; - # Disable check phase as there are failures (author_prefers_cargo test fails) + # Disable check phase as there are failures (4 tests fail) doCheck = false; meta = with stdenv.lib; { From 38793dd995c7ab0b9b82b19f67bf930ad2a85e88 Mon Sep 17 00:00:00 2001 From: Tadas Barzdzius Date: Thu, 29 Dec 2016 09:57:03 +0200 Subject: [PATCH 18/81] rustRegistry: 2016-12-16 -> 2016-12-28 --- pkgs/top-level/rust-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/rust-packages.nix b/pkgs/top-level/rust-packages.nix index 29fbac38bd0..14ef3cfef43 100644 --- a/pkgs/top-level/rust-packages.nix +++ b/pkgs/top-level/rust-packages.nix @@ -7,9 +7,9 @@ { runCommand, fetchFromGitHub, git }: let - version = "2016-12-16"; - rev = "1da5a7d0cd31d72324481760067bde5cf2e07be5"; - sha256 = "0kbh3aq738sqns8w6yfia17fwrk98g6m763wqsqwhnrg2ndqrp8d"; + version = "2016-12-28"; + rev = "3399254d4a021d07736944b339a8794eddcda517"; + sha256 = "1vbixbgzv21anqayz8ya0x1qlzndb7fpdf9dyh4yyscl1kaibvg9"; src = fetchFromGitHub { inherit rev; From cfbbac7cb407cba2082e19581efa034034d26381 Mon Sep 17 00:00:00 2001 From: Tadas Barzdzius Date: Thu, 29 Dec 2016 09:57:22 +0200 Subject: [PATCH 19/81] cfdyndns: mark as broken --- pkgs/applications/networking/dyndns/cfdyndns/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/networking/dyndns/cfdyndns/default.nix b/pkgs/applications/networking/dyndns/cfdyndns/default.nix index d3be9c28df3..a79404e77c8 100644 --- a/pkgs/applications/networking/dyndns/cfdyndns/default.nix +++ b/pkgs/applications/networking/dyndns/cfdyndns/default.nix @@ -27,5 +27,6 @@ buildRustPackage rec { license = stdenv.lib.licenses.mit; maintainers = with maintainers; [ colemickens ]; platforms = with platforms; linux; + broken = true; }; } From d27a6588467fc80ca5ef7970509448f56bf83b16 Mon Sep 17 00:00:00 2001 From: Tadas Barzdzius Date: Thu, 29 Dec 2016 09:57:39 +0200 Subject: [PATCH 20/81] pijul: mark as broken --- pkgs/applications/version-management/pijul/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/version-management/pijul/default.nix b/pkgs/applications/version-management/pijul/default.nix index 4f1f28a7aac..04a91a6b4a4 100644 --- a/pkgs/applications/version-management/pijul/default.nix +++ b/pkgs/applications/version-management/pijul/default.nix @@ -33,5 +33,6 @@ buildRustPackage rec { license = licenses.gpl3; platforms = stdenv.lib.platforms.x86_64; # i686 builds fail due to lmdb maintainers = with maintainers; [ puffnfresh ]; + broken = true; }; } From 3705b1a429cff4047f6e4dd98c085fe86263e76a Mon Sep 17 00:00:00 2001 From: Ricardo Ardissone Date: Wed, 28 Dec 2016 20:09:14 -0200 Subject: [PATCH 21/81] opendungeons: 0.6.0 -> 0.7.1 --- pkgs/games/opendungeons/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/games/opendungeons/default.nix b/pkgs/games/opendungeons/default.nix index fe3a381c7f5..94a44446b6c 100644 --- a/pkgs/games/opendungeons/default.nix +++ b/pkgs/games/opendungeons/default.nix @@ -1,17 +1,19 @@ -{ stdenv, fetchurl, ogre, cegui, boost, sfml, openal, cmake, ois }: +{ stdenv, fetchFromGitHub, ogre, cegui, boost, sfml, openal, cmake, ois, pkgconfig }: stdenv.mkDerivation rec { name = "opendungeons-${version}"; - version = "0.6.0"; + version = "0.7.1"; - src = fetchurl { - url = "ftp://download.tuxfamily.org/opendungeons/${version}/${name}.tar.xz"; - sha256 = "1g0sjh732794h26cbkr0p96i3c0avm0mx9ip5zbvb2y3sbpjcbib"; + src = fetchFromGitHub { + owner = "OpenDungeons"; + repo = "OpenDungeons"; + rev = version; + sha256 = "0nipb2h0gn628yxlahjgnfhmpfqa19mjdbj3aqabimdfqds9pryh"; }; patches = [ ./cmakepaths.patch ]; - buildInputs = [ cmake ogre cegui boost sfml openal ois ]; + buildInputs = [ cmake ogre cegui boost sfml openal ois pkgconfig ]; meta = with stdenv.lib; { description = "An open source, real time strategy game sharing game elements with the Dungeon Keeper series and Evil Genius."; From 1cc599307fcb01775f5fe97eab1bf04fdc3fd049 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 30 Dec 2016 03:59:33 +0100 Subject: [PATCH 22/81] neomutt: 20161104 -> 20161126 --- .../networking/mailreaders/neomutt/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/neomutt/default.nix b/pkgs/applications/networking/mailreaders/neomutt/default.nix index 2033dfc8e91..57f633d2c99 100644 --- a/pkgs/applications/networking/mailreaders/neomutt/default.nix +++ b/pkgs/applications/networking/mailreaders/neomutt/default.nix @@ -1,20 +1,20 @@ { stdenv, fetchFromGitHub, which, autoconf, automake, ncurses, perl -, cyrus_sasl, gdbm, gpgme, kerberos, libidn, notmuch, openssl }: +, cyrus_sasl, gdbm, gpgme, kerberos, libidn, notmuch, openssl, lmdb }: stdenv.mkDerivation rec { - version = "20161104"; + version = "20161126"; name = "neomutt-${version}"; src = fetchFromGitHub { owner = "neomutt"; repo = "neomutt"; rev = "neomutt-${version}"; - sha256 = "070p18khvxsrcn30jhyrnagka5mgza9mi5vmrrr6xl8mpgkyrlaw"; + sha256 = "10ycfya11pvwv0rdyyak56r6f8ia8yf0h8qyi904bbpvm8lqvqfd"; }; buildInputs = [ autoconf automake cyrus_sasl gdbm gpgme kerberos libidn ncurses - notmuch which openssl perl ]; + notmuch which openssl perl lmdb ]; configureFlags = [ "--enable-debug" @@ -36,6 +36,7 @@ stdenv.mkDerivation rec { "--with-curses" "--with-regex" "--with-idn" + "--with-lmdb" # Look in $PATH at runtime, instead of hardcoding /usr/bin/sendmail "ac_cv_path_SENDMAIL=sendmail" From a6df66e0d8a58a1eaa1f72a42cb319fde55a3488 Mon Sep 17 00:00:00 2001 From: Chris Martin Date: Fri, 30 Dec 2016 00:34:13 -0500 Subject: [PATCH 23/81] ppl-address-book: init at 2.4.0 --- .../office/ppl-address-book/Gemfile | 2 + .../office/ppl-address-book/Gemfile.lock | 34 +++++++ .../office/ppl-address-book/default.nix | 38 ++++++++ .../office/ppl-address-book/gemset.nix | 90 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 5 files changed, 166 insertions(+) create mode 100644 pkgs/applications/office/ppl-address-book/Gemfile create mode 100644 pkgs/applications/office/ppl-address-book/Gemfile.lock create mode 100644 pkgs/applications/office/ppl-address-book/default.nix create mode 100644 pkgs/applications/office/ppl-address-book/gemset.nix diff --git a/pkgs/applications/office/ppl-address-book/Gemfile b/pkgs/applications/office/ppl-address-book/Gemfile new file mode 100644 index 00000000000..0039c436696 --- /dev/null +++ b/pkgs/applications/office/ppl-address-book/Gemfile @@ -0,0 +1,2 @@ +source 'https://rubygems.org' +gem 'ppl' diff --git a/pkgs/applications/office/ppl-address-book/Gemfile.lock b/pkgs/applications/office/ppl-address-book/Gemfile.lock new file mode 100644 index 00000000000..5054bb8b9c8 --- /dev/null +++ b/pkgs/applications/office/ppl-address-book/Gemfile.lock @@ -0,0 +1,34 @@ +GEM + remote: https://rubygems.org/ + specs: + colored (1.2) + greencard (0.0.5) + i18n (0.7.0) + inifile (2.0.2) + mail (2.5.3) + i18n (>= 0.4.0) + mime-types (~> 1.16) + treetop (~> 1.4.8) + mime-types (1.25.1) + morphine (0.1.1) + polyglot (0.3.5) + ppl (2.4.0) + colored (= 1.2) + greencard (= 0.0.5) + inifile (= 2.0.2) + mail (= 2.5.3) + morphine (= 0.1.1) + rugged (= 0.17.0.b6) + rugged (0.17.0.b6) + treetop (1.4.15) + polyglot + polyglot (>= 0.3.1) + +PLATFORMS + ruby + +DEPENDENCIES + ppl + +BUNDLED WITH + 1.12.5 diff --git a/pkgs/applications/office/ppl-address-book/default.nix b/pkgs/applications/office/ppl-address-book/default.nix new file mode 100644 index 00000000000..1c48fc50842 --- /dev/null +++ b/pkgs/applications/office/ppl-address-book/default.nix @@ -0,0 +1,38 @@ +{ stdenv, lib, bundlerEnv, ruby, makeWrapper, which }: + +let + pname = "ppl-address-book"; + + version = (import ./gemset.nix).ppl.version; + + env = bundlerEnv rec { + name = "${pname}-env-${version}"; + inherit ruby; + gemfile = ./Gemfile; + lockfile = ./Gemfile.lock; + gemset = ./gemset.nix; + + gemConfig.rugged = attrs: { buildInputs = [ which ]; }; + }; + +in stdenv.mkDerivation { + name = "${pname}-${version}"; + + phases = [ "installPhase" ]; + + buildInputs = [ env makeWrapper ]; + + installPhase = '' + mkdir -p $out/bin + makeWrapper ${env}/bin/ppl $out/bin/ppl + ''; + + meta = with lib; { + description = "Address book software for command-line users"; + homepage = http://ppladdressbook.org/; + license = with licenses; mit; + maintainers = with maintainers; [ chris-martin ]; + platforms = platforms.unix; + }; + +} diff --git a/pkgs/applications/office/ppl-address-book/gemset.nix b/pkgs/applications/office/ppl-address-book/gemset.nix new file mode 100644 index 00000000000..e8229f6153f --- /dev/null +++ b/pkgs/applications/office/ppl-address-book/gemset.nix @@ -0,0 +1,90 @@ +{ + colored = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0b0x5jmsyi0z69bm6sij1k89z7h0laag3cb4mdn7zkl9qmxb90lx"; + type = "gem"; + }; + version = "1.2"; + }; + greencard = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "11pxrl1w8c7m7rmnnmdaplrv53qgylyvkv8bzsfyjna7k16hynvq"; + type = "gem"; + }; + version = "0.0.5"; + }; + i18n = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1i5z1ykl8zhszsxcs8mzl8d0dxgs3ylz8qlzrw74jb0gplkx6758"; + type = "gem"; + }; + version = "0.7.0"; + }; + inifile = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "03rpacxnrnisjhd2zhc7629ica958bkdbakicl5kipw1wbprck25"; + type = "gem"; + }; + version = "2.0.2"; + }; + mail = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1afr3acz7vsvr4gp6wnrkw1iwbjhf14mh8g8mlm40r86wcwzr39k"; + type = "gem"; + }; + version = "2.5.3"; + }; + mime-types = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0mhzsanmnzdshaba7gmsjwnv168r1yj8y0flzw88frw1cickrvw8"; + type = "gem"; + }; + version = "1.25.1"; + }; + morphine = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "05aw93cijd1gq39ikw2dw3i2c79bjq05kvxrs81mqxqdlini5wwa"; + type = "gem"; + }; + version = "0.1.1"; + }; + polyglot = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1bqnxwyip623d8pr29rg6m8r0hdg08fpr2yb74f46rn1wgsnxmjr"; + type = "gem"; + }; + version = "0.3.5"; + }; + ppl = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0vpp4s12ggbk5kpl9z1i7vi9vvghgxrc8my35yk8knckg5waxg47"; + type = "gem"; + }; + version = "2.4.0"; + }; + rugged = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "025rj3rkj5yxf4pjj1s8x4yzshlyni3hgrjwhggg54nvw6b688qi"; + type = "gem"; + }; + version = "0.17.0.b6"; + }; + treetop = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1zqj5y0mvfvyz11nhsb4d5ch0i0rfcyj64qx19mw4qhg3hh8z9pz"; + type = "gem"; + }; + version = "1.4.15"; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d9842aaede3..23b70e40998 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14441,6 +14441,8 @@ in posterazor = callPackage ../applications/misc/posterazor { }; + ppl-address-book = callPackage ../applications/office/ppl-address-book { }; + pqiv = callPackage ../applications/graphics/pqiv { }; qiv = callPackage ../applications/graphics/qiv { }; From 57c4ed837cf80b2566f3c7a5c833f5c0ea5e09fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Fri, 30 Dec 2016 18:12:53 +0100 Subject: [PATCH 24/81] chessx: disable parallel make http://hydra.nixos.org/build/45653907 /cc maintainer @luispedro. --- pkgs/games/chessx/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/games/chessx/default.nix b/pkgs/games/chessx/default.nix index 404b3b90d7c..f1dd86d67b9 100644 --- a/pkgs/games/chessx/default.nix +++ b/pkgs/games/chessx/default.nix @@ -17,7 +17,9 @@ stdenv.mkDerivation rec { qmakeHook ]; - enableParallelBuilding = true; + # RCC: Error in 'resources.qrc': Cannot find file 'i18n/chessx_da.qm' + #enableParallelBuilding = true; + installPhase = '' runHook preInstall mkdir -p "$out/bin" From 456cf826e01506ecf88bc0740ff3433fa5cc10f6 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sat, 24 Dec 2016 15:16:19 -0500 Subject: [PATCH 25/81] rivet: 2.5.2 -> 2.5.3 --- pkgs/development/libraries/physics/rivet/default.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/physics/rivet/default.nix b/pkgs/development/libraries/physics/rivet/default.nix index 775ee75f61f..b42ee7a3411 100644 --- a/pkgs/development/libraries/physics/rivet/default.nix +++ b/pkgs/development/libraries/physics/rivet/default.nix @@ -2,19 +2,15 @@ stdenv.mkDerivation rec { name = "rivet-${version}"; - version = "2.5.2"; + version = "2.5.3"; src = fetchurl { url = "http://www.hepforge.org/archive/rivet/Rivet-${version}.tar.bz2"; - sha256 = "01agf0bswqvci8nwp67kvrlwc2k0sg1s0lxpq2a9q58l99v2gakh"; + sha256 = "1r0x575ivvm68nnh9qlfvdra5298i047qcbxcg37ki2aaqq07qcr"; }; pythonPath = []; # python wrapper support - patches = [ - ./key_val.patch - ./zaxis_fix.patch - ]; latex = texlive.combine { inherit (texlive) scheme-basic From 3dbf6b4a093fc42a2da85fe08daac69973125fae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Fri, 30 Dec 2016 18:58:32 +0100 Subject: [PATCH 26/81] font-manager: fix missing icons Fixes #21454, or at least most of it. --- pkgs/applications/misc/font-manager/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/misc/font-manager/default.nix b/pkgs/applications/misc/font-manager/default.nix index 5f8d00ce996..6d67d3a340f 100644 --- a/pkgs/applications/misc/font-manager/default.nix +++ b/pkgs/applications/misc/font-manager/default.nix @@ -35,6 +35,7 @@ stdenv.mkDerivation rec { gnome3.gucharmap gnome3.libgee gnome3.file-roller + gnome3.defaultIconTheme ]; enableParallelBuilding = true; From 10836bdd3675babf9898d729838be99ffa5904d0 Mon Sep 17 00:00:00 2001 From: Matthew Daiter Date: Fri, 30 Dec 2016 19:16:20 +0100 Subject: [PATCH 27/81] wxGTK29: fixed Darwin build --- pkgs/development/libraries/wxGTK-2.9/default.nix | 14 ++++++++++---- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/wxGTK-2.9/default.nix b/pkgs/development/libraries/wxGTK-2.9/default.nix index 82ba9daed80..b2f40978f51 100644 --- a/pkgs/development/libraries/wxGTK-2.9/default.nix +++ b/pkgs/development/libraries/wxGTK-2.9/default.nix @@ -1,6 +1,7 @@ { stdenv, fetchurl, pkgconfig, gtk2, libXinerama, libSM, libXxf86vm, xf86vidmodeproto , gstreamer, gst_plugins_base, GConf, setfile -, withMesa ? true, mesa ? null, compat24 ? false, compat26 ? true, unicode ? true, +, withMesa ? true, mesa ? null, compat24 ? false, compat26 ? true, unicode ? true +, Carbon ? null, Cocoa ? null, Kernel ? null, QuickTime ? null, AGL ? null }: assert withMesa -> mesa != null; @@ -22,10 +23,12 @@ stdenv.mkDerivation { [ gtk2 libXinerama libSM libXxf86vm xf86vidmodeproto gstreamer gst_plugins_base GConf ] ++ optional withMesa mesa - ++ optional stdenv.isDarwin setfile; + ++ optionals stdenv.isDarwin [ setfile Carbon Cocoa Kernel QuickTime ]; nativeBuildInputs = [ pkgconfig ]; + propagatedBuildInputs = optional stdenv.isDarwin AGL; + configureFlags = [ "--enable-gtk2" "--disable-precomp-headers" "--enable-mediactrl" (if compat24 then "--enable-compat24" else "--disable-compat24") @@ -34,7 +37,7 @@ stdenv.mkDerivation { ++ optional withMesa "--with-opengl" ++ optionals stdenv.isDarwin # allow building on 64-bit - [ "--with-cocoa" "--enable-universal-binaries" ]; + [ "--with-cocoa" "--enable-universal-binaries" "--with-macosx-version-min=10.7" ]; SEARCH_LIB = optionalString withMesa "${mesa}/lib"; @@ -46,6 +49,9 @@ stdenv.mkDerivation { substituteInPlace configure --replace \ 'ac_cv_prog_SETFILE="/Developer/Tools/SetFile"' \ 'ac_cv_prog_SETFILE="${setfile}/bin/SetFile"' + substituteInPlace configure --replace \ + "-framework System" \ + -lSystem ''; postInstall = " @@ -60,6 +66,6 @@ stdenv.mkDerivation { enableParallelBuilding = true; meta = { - platforms = stdenv.lib.platforms.linux; + platforms = with stdenv.lib.platforms; darwin ++ linux; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a9c86813cf1..dbc70dbb416 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9670,6 +9670,7 @@ in wxGTK29 = callPackage ../development/libraries/wxGTK-2.9/default.nix { inherit (gnome2) GConf; inherit (darwin.stubs) setfile; + inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QuickTime; withMesa = lib.elem system lib.platforms.mesaPlatforms; }; From d8659f24e62a3867f5fce630e978a907c6cf9856 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Tue, 27 Dec 2016 19:20:23 +0100 Subject: [PATCH 28/81] dnscrypt-proxy service: order before nss-lookup.target --- nixos/modules/services/networking/dnscrypt-proxy.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/services/networking/dnscrypt-proxy.nix b/nixos/modules/services/networking/dnscrypt-proxy.nix index 82bf178f4cb..462039803f8 100644 --- a/nixos/modules/services/networking/dnscrypt-proxy.nix +++ b/nixos/modules/services/networking/dnscrypt-proxy.nix @@ -263,6 +263,8 @@ in systemd.services.dnscrypt-proxy = { description = "dnscrypt-proxy daemon"; + before = [ "nss-lookup.target" ]; + after = [ "network.target" ] ++ optional apparmorEnabled "apparmor.service" ++ optional useUpstreamResolverList "init-dnscrypt-proxy-statedir.service"; From b4c5916e85301bb39148678a069fb7b35a3d8dba Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Fri, 30 Dec 2016 19:54:42 +0100 Subject: [PATCH 29/81] cvsps: get source from Debian, fix build The cobite.com urls seem to have disappeared or been moved. I've failed to find where they might have gone, so use debian's mirrored sources instead. --- pkgs/applications/version-management/cvsps/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/cvsps/default.nix b/pkgs/applications/version-management/cvsps/default.nix index 9bc4401e068..9137cc16c3b 100644 --- a/pkgs/applications/version-management/cvsps/default.nix +++ b/pkgs/applications/version-management/cvsps/default.nix @@ -1,9 +1,10 @@ { fetchurl, stdenv, cvs, zlib }: stdenv.mkDerivation rec { - name = "cvsps-2.1"; + name = "cvsps-${version}"; + version = "2.1"; src = fetchurl { - url = "http://www.cobite.com/cvsps/${name}.tar.gz"; + url = "mirror://debian/pool/main/c/cvsps/cvsps_${version}.orig.tar.gz"; sha256 = "0nh7q7zcmagx0i63h6fqqkkq9i55k77myvb8h6jn2f266f5iklwi"; }; @@ -17,6 +18,7 @@ stdenv.mkDerivation rec { installPhase = "make install prefix=$out"; meta = { + description = ''A tool to generate CVS patch set information''; longDescription = '' CVSps is a program for generating `patchset' information from a CVS repository. A patchset in this case is defined as a set of @@ -25,5 +27,6 @@ stdenv.mkDerivation rec { ''; homepage = http://www.cobite.com/cvsps/; license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.unix; }; } From 25164720501d143fc27c2cea921c1ea92f14584d Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Fri, 30 Dec 2016 20:05:13 +0100 Subject: [PATCH 30/81] cvsps: fetch patches from debian 2.1-7 sources --- .../cvsps/01_ignoretrunk.dpatch | 23 ---- .../cvsps/02_dynamicbufferalloc.dpatch | 125 ------------------ .../cvsps/03_diffoptstypo.dpatch | 19 --- .../version-management/cvsps/default.nix | 39 +++++- 4 files changed, 34 insertions(+), 172 deletions(-) delete mode 100644 pkgs/applications/version-management/cvsps/01_ignoretrunk.dpatch delete mode 100644 pkgs/applications/version-management/cvsps/02_dynamicbufferalloc.dpatch delete mode 100644 pkgs/applications/version-management/cvsps/03_diffoptstypo.dpatch diff --git a/pkgs/applications/version-management/cvsps/01_ignoretrunk.dpatch b/pkgs/applications/version-management/cvsps/01_ignoretrunk.dpatch deleted file mode 100644 index 39185ae2bfa..00000000000 --- a/pkgs/applications/version-management/cvsps/01_ignoretrunk.dpatch +++ /dev/null @@ -1,23 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 01_ignoretrunk.dpatch by -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Ignore TRUNK branch name patch - -@DPATCH@ - -diff -urN cvsps-2.1.orig/cvsps.c cvsps-2.1/cvsps.c ---- cvsps-2.1.orig/cvsps.c 2005-05-25 22:39:40.000000000 -0500 -+++ cvsps-2.1/cvsps.c 2005-06-19 23:07:20.000000000 -0500 -@@ -2104,6 +2109,11 @@ - - if (!get_branch_ext(rev, eot, &leaf)) - { -+ if (strcmp(tag, "TRUNK") == 0) -+ { -+ debug(DEBUG_STATUS, "ignoring the TRUNK branch/tag"); -+ return; -+ } - debug(DEBUG_APPERROR, "malformed revision"); - exit(1); - } diff --git a/pkgs/applications/version-management/cvsps/02_dynamicbufferalloc.dpatch b/pkgs/applications/version-management/cvsps/02_dynamicbufferalloc.dpatch deleted file mode 100644 index 70ffb02a21a..00000000000 --- a/pkgs/applications/version-management/cvsps/02_dynamicbufferalloc.dpatch +++ /dev/null @@ -1,125 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 02_dynamicbufferalloc.dpatch by -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Dynamic buffer allocation - -@DPATCH@ - -diff -urN cvsps-2.1-orig/cache.c cvsps-2.1/cache.c ---- cvsps-2.1-orig/cache.c 2005-05-25 22:39:40.000000000 -0500 -+++ cvsps-2.1/cache.c 2005-07-26 15:21:29.716569500 -0500 -@@ -108,10 +108,19 @@ - int tag_flags = 0; - char branchbuff[LOG_STR_MAX] = ""; - int branch_add = 0; -- char logbuff[LOG_STR_MAX] = ""; -+ int logbufflen = LOG_STR_MAX + 1; -+ char * logbuff = malloc(logbufflen); - time_t cache_date = -1; - int read_version; - -+ if (logbuff == NULL) -+ { -+ debug(DEBUG_SYSERROR, "could not malloc %d bytes for logbuff in read_cache", logbufflen); -+ exit(1); -+ } -+ -+ logbuff[0] = 0; -+ - if (!(fp = cache_open("r"))) - goto out; - -@@ -299,8 +308,19 @@ - else - { - /* Make sure we have enough in the buffer */ -- if (strlen(logbuff)+strlen(buff)= LOG_STR_MAX) -+ { -+ logbufflen += (len >= LOG_STR_MAX ? (len+1) : LOG_STR_MAX); -+ char * newlogbuff = realloc(logbuff, logbufflen); -+ if (newlogbuff == NULL) -+ { -+ debug(DEBUG_SYSERROR, "could not realloc %d bytes for logbuff in read_cache", logbufflen); -+ exit(1); -+ } -+ logbuff = newlogbuff; -+ } -+ strcat(logbuff, buff); - } - break; - case CACHE_NEED_PS_MEMBERS: -@@ -332,6 +352,7 @@ - out_close: - fclose(fp); - out: -+ free(logbuff); - return cache_date; - } - -diff -urN cvsps-2.1-orig/cvsps.c cvsps-2.1/cvsps.c ---- cvsps-2.1-orig/cvsps.c 2005-05-25 22:39:40.000000000 -0500 -+++ cvsps-2.1/cvsps.c 2005-07-26 15:22:02.558230700 -0500 -@@ -265,7 +265,8 @@ - PatchSetMember * psm = NULL; - char datebuff[20]; - char authbuff[AUTH_STR_MAX]; -- char logbuff[LOG_STR_MAX + 1]; -+ int logbufflen = LOG_STR_MAX + 1; -+ char * logbuff = malloc(logbufflen); - int loglen = 0; - int have_log = 0; - char cmd[BUFSIZ]; -@@ -273,6 +274,12 @@ - char use_rep_buff[PATH_MAX]; - char * ltype; - -+ if (logbuff == NULL) -+ { -+ debug(DEBUG_SYSERROR, "could not malloc %d bytes for logbuff in load_from_cvs", logbufflen); -+ exit(1); -+ } -+ - if (!no_rlog && !test_log_file && cvs_check_cap(CAP_HAVE_RLOG)) - { - ltype = "rlog"; -@@ -480,24 +487,22 @@ - */ - if (have_log || !is_revision_metadata(buff)) - { -- /* if the log buffer is full, that's it. -- * -- * Also, read lines (fgets) always have \n in them -- * which we count on. So if truncation happens, -- * be careful to put a \n on. -- * -- * Buffer has LOG_STR_MAX + 1 for room for \0 if -- * necessary -- */ -- if (loglen < LOG_STR_MAX) -+ /* If the log buffer is full, try to reallocate more. */ -+ if (loglen < logbufflen) - { - int len = strlen(buff); - -- if (len >= LOG_STR_MAX - loglen) -+ if (len >= logbufflen - loglen) - { -- debug(DEBUG_APPMSG1, "WARNING: maximum log length exceeded, truncating log"); -- len = LOG_STR_MAX - loglen; -- buff[len - 1] = '\n'; -+ debug(DEBUG_STATUS, "reallocating logbufflen to %d bytes for file %s", logbufflen, file->filename); -+ logbufflen += (len >= LOG_STR_MAX ? (len+1) : LOG_STR_MAX); -+ char * newlogbuff = realloc(logbuff, logbufflen); -+ if (newlogbuff == NULL) -+ { -+ debug(DEBUG_SYSERROR, "could not realloc %d bytes for logbuff in load_from_cvs", logbufflen); -+ exit(1); -+ } -+ logbuff = newlogbuff; - } - - debug(DEBUG_STATUS, "appending %s to log", buff); diff --git a/pkgs/applications/version-management/cvsps/03_diffoptstypo.dpatch b/pkgs/applications/version-management/cvsps/03_diffoptstypo.dpatch deleted file mode 100644 index eb3818ed97e..00000000000 --- a/pkgs/applications/version-management/cvsps/03_diffoptstypo.dpatch +++ /dev/null @@ -1,19 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 03_diffoptstypo.dpatch by -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Diff opts typo fix - -@DPATCH@ - ---- cvsps-2.1-orig/cvsps.1 2005-05-26 05:39:40.000000000 +0200 -+++ cvsps-2.1/cvsps.1 2005-07-28 15:17:48.885112048 +0200 -@@ -83,7 +83,7 @@ - disable the use of rlog internally. Note: rlog is - required for stable PatchSet numbering. Use with care. - .TP --.B \-\-diffs\-opts