From 895d3c890848aeed689aa29708430969ef3f35c6 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 27 Nov 2016 10:13:13 +0100 Subject: [PATCH 01/16] omake: 0.9.8.5 -> 0.10.1 --- .../development/tools/ocaml/omake/default.nix | 42 +++++++------------ .../ocaml/omake/omake-build-0.9.8.5.diff | 11 ----- .../ocaml/omake/omake-lm_printf-gcc44.diff | 22 ---------- pkgs/top-level/all-packages.nix | 6 ++- pkgs/top-level/ocaml-packages.nix | 1 - 5 files changed, 19 insertions(+), 63 deletions(-) delete mode 100644 pkgs/development/tools/ocaml/omake/omake-build-0.9.8.5.diff delete mode 100644 pkgs/development/tools/ocaml/omake/omake-lm_printf-gcc44.diff diff --git a/pkgs/development/tools/ocaml/omake/default.nix b/pkgs/development/tools/ocaml/omake/default.nix index 451d025aa3c..53152898fd6 100644 --- a/pkgs/development/tools/ocaml/omake/default.nix +++ b/pkgs/development/tools/ocaml/omake/default.nix @@ -1,38 +1,24 @@ -{stdenv, fetchurl, makeWrapper, ocaml, ncurses}: -let - pname = "omake"; - version = "0.9.8.5-3"; - webpage = "http://omake.metaprl.org"; -in -stdenv.mkDerivation { +{ stdenv, fetchurl, ocaml, ncurses }: - name = "${pname}-${version}"; +stdenv.mkDerivation rec { + + name = "omake-${version}"; + version = "0.10.1"; src = fetchurl { - url = "mirror://debian/pool/main/o/omake/omake_${version}.orig.tar.gz"; - sha256 = "1bfxbsimfivq0ar2g5fkzvr5ql97n5dg562pfyd29y4zyh4mwrsv"; + url = "http://download.camlcity.org/download/${name}.tar.gz"; + sha256 = "093ansbppms90hiqvzar2a46fj8gm9iwnf8gn38s6piyp70lrbsj"; }; - patchFlags = "-p0"; - patches = [ ./omake-build-0.9.8.5.diff ./omake-lm_printf-gcc44.diff ]; - buildInputs = [ ocaml makeWrapper ncurses ]; - - phases = "unpackPhase patchPhase buildPhase"; - buildPhase = '' - make bootstrap - make PREFIX=$out all - make PREFIX=$out install - ''; -# prefixKey = "-prefix "; -# -# configureFlags = if transitional then "--transitional" else "--strict"; -# -# buildFlags = "world.opt"; + buildInputs = [ ocaml ncurses ]; meta = { description = "A build system designed for scalability and portability"; - homepage = "${webpage}"; - license = "GPL"; - broken = true; + homepage = http://projects.camlcity.org/projects/omake.html; + license = with stdenv.lib.licenses; [ + mit /* scripts */ + gpl2 /* program */ + ]; + inherit (ocaml.meta) platforms; }; } diff --git a/pkgs/development/tools/ocaml/omake/omake-build-0.9.8.5.diff b/pkgs/development/tools/ocaml/omake/omake-build-0.9.8.5.diff deleted file mode 100644 index b0a091e341c..00000000000 --- a/pkgs/development/tools/ocaml/omake/omake-build-0.9.8.5.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- src/exec/omake_exec.ml 2006-12-08 23:52:01.000000000 +0100 -+++ src/exec/omake_exec.ml 2009-04-15 22:19:07.000000000 +0200 -@@ -46,7 +46,7 @@ - open Omake_options - open Omake_command_type - --external sync : unit -> unit = "caml_sync" -+(*external sync : unit -> unit = "caml_sync"*) - - module Exec = - struct diff --git a/pkgs/development/tools/ocaml/omake/omake-lm_printf-gcc44.diff b/pkgs/development/tools/ocaml/omake/omake-lm_printf-gcc44.diff deleted file mode 100644 index 03665340f5f..00000000000 --- a/pkgs/development/tools/ocaml/omake/omake-lm_printf-gcc44.diff +++ /dev/null @@ -1,22 +0,0 @@ ---- src/libmojave-external/cutil/lm_printf.c.orig 2007-07-15 19:55:23.000000000 +0200 -+++ src/libmojave-external/cutil/lm_printf.c 2009-06-21 19:20:40.000000000 +0200 -@@ -144,3 +144,3 @@ - if(bufp != buffer) -- free(buffer); -+ free(bufp); - failwith("ml_print_string"); -@@ -149,3 +149,3 @@ - if(bufp != buffer) -- free(buffer); -+ free(bufp); - return v_result; -@@ -192,3 +192,3 @@ - if(bufp != buffer) -- free(buffer); -+ free(bufp); - failwith("ml_print_string"); -@@ -197,3 +197,3 @@ - if(bufp != buffer) -- free(buffer); -+ free(bufp); - return v_result; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 01d8593a676..5eb3006d935 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6337,7 +6337,11 @@ in noweb = callPackage ../development/tools/literate-programming/noweb { }; nuweb = callPackage ../development/tools/literate-programming/nuweb { tex = texlive.combined.scheme-small; }; - inherit (ocamlPackages) omake omake_rc1; + omake = callPackage ../development/tools/ocaml/omake { + inherit (ocamlPackages_4_02) ocaml; + }; + + inherit (ocamlPackages) omake_rc1; omniorb = callPackage ../development/tools/omniorb { }; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 46f1ce4b023..6e3f98c7ba2 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -649,7 +649,6 @@ let trv = callPackage ../development/tools/misc/trv { }; - omake = callPackage ../development/tools/ocaml/omake { }; omake_rc1 = callPackage ../development/tools/ocaml/omake/0.9.8.6-rc1.nix { }; verasco = callPackage ../development/tools/analysis/verasco ( From 7f501d7f02ed614f2159ae8b0855f33d796d6819 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 2 Dec 2016 19:35:11 +0000 Subject: [PATCH 02/16] teyjus: 2.0b2 -> 2.1 --- pkgs/development/compilers/teyjus/default.nix | 10 ++++----- .../compilers/teyjus/fix-lex-to-flex.patch | 22 +++++++++---------- pkgs/top-level/all-packages.nix | 4 +--- 3 files changed, 17 insertions(+), 19 deletions(-) diff --git a/pkgs/development/compilers/teyjus/default.nix b/pkgs/development/compilers/teyjus/default.nix index 301915b7a26..fafc58371ef 100644 --- a/pkgs/development/compilers/teyjus/default.nix +++ b/pkgs/development/compilers/teyjus/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, omake, ocaml, flex, bison }: +{ stdenv, fetchzip, omake, ocaml, flex, bison }: stdenv.mkDerivation { - name = "teyjus-2.0b2"; + name = "teyjus-2.1"; - src = fetchurl { - url = "https://teyjus.googlecode.com/files/teyjus-source-2.0-b2.tar.gz"; - sha256 = "f589fb460d7095a6e674b7a6413772c41b98654c38602c3e8c477a976da99052"; + src = fetchzip { + url = https://github.com/teyjus/teyjus/archive/v2.1.tar.gz; + sha256 = "064jqf68zpmvndgyhilmxfhnvx1bzm8avhgw82csj5wxw5ky6glz"; }; patches = [ ./fix-lex-to-flex.patch ]; diff --git a/pkgs/development/compilers/teyjus/fix-lex-to-flex.patch b/pkgs/development/compilers/teyjus/fix-lex-to-flex.patch index d2da1d3facc..52d259bb64d 100644 --- a/pkgs/development/compilers/teyjus/fix-lex-to-flex.patch +++ b/pkgs/development/compilers/teyjus/fix-lex-to-flex.patch @@ -1,23 +1,23 @@ -diff --git a/source/OMakefile b/source/OMakefile -index 6b19d84..095b8b6 100644 ---- a/source/OMakefile -+++ b/source/OMakefile -@@ -164,12 +164,17 @@ LNK_MAIN = $(FNT)/linkerfront +--- a/source/OMakefile 1970-01-01 00:00:01.000000000 +0000 ++++ b/source/OMakefile 2016-12-02 08:48:42.000000000 +0000 +@@ -183,18 +183,18 @@ DEP_MAIN = $(FNT)/dependfront + PAR_MAIN = $(FNT)/parsefront - ############################################################ -+# Nixpkgs specific changes -+# -+ +LEX = flex + -+############################################################ + ############################################################ # Platform specific changes # + if $(mem $(SYSNAME), Linux) + YACC = bison -by +- LEX = flex + export + if $(mem $(OSTYPE), Cygwin Win32) YACC = bison -by - LEX = flex - CFLAGS += -mno-cygwin + CC = i686-pc-mingw32-gcc INC_C[] += $(INC)/byteswap $(INC)/search export diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5eb3006d935..a554f353d1e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5295,9 +5295,7 @@ in lua = lua5_1; }; - teyjus = callPackage ../development/compilers/teyjus { - omake = omake_rc1; - }; + teyjus = callPackage ../development/compilers/teyjus { }; thrust = callPackage ../development/tools/thrust { gconf = pkgs.gnome2.GConf; From 3d804da98322c4f7daf77bdab78b8a972ee8258f Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 2 Dec 2016 19:36:07 +0000 Subject: [PATCH 03/16] camlimages: use omake rather than omake_rc1 --- pkgs/development/ocaml-modules/camlimages/4.0.nix | 4 ++-- pkgs/development/ocaml-modules/camlimages/4.1.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/ocaml-modules/camlimages/4.0.nix b/pkgs/development/ocaml-modules/camlimages/4.0.nix index 4f47680dcec..0ec3a26d051 100644 --- a/pkgs/development/ocaml-modules/camlimages/4.0.nix +++ b/pkgs/development/ocaml-modules/camlimages/4.0.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, omake, ocaml, omake_rc1, libtiff, libjpeg, libpng, giflib, findlib, libXpm, freetype, graphicsmagick, ghostscript }: +{ stdenv, fetchurl, omake, ocaml, libtiff, libjpeg, libpng, giflib, findlib, libXpm, freetype, graphicsmagick, ghostscript }: let pname = "camlimages"; @@ -13,7 +13,7 @@ stdenv.mkDerivation { sha256 = "b40237c1505487049799a7af296eb3996b3fa08eab94415546f46d61355747c4"; }; - buildInputs = [ocaml omake_rc1 findlib graphicsmagick ghostscript ]; + buildInputs = [ ocaml omake findlib graphicsmagick ghostscript ]; propagatedBuildInputs = [libtiff libjpeg libpng giflib freetype libXpm ]; diff --git a/pkgs/development/ocaml-modules/camlimages/4.1.nix b/pkgs/development/ocaml-modules/camlimages/4.1.nix index f98d149c482..77a252de52f 100644 --- a/pkgs/development/ocaml-modules/camlimages/4.1.nix +++ b/pkgs/development/ocaml-modules/camlimages/4.1.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, omake, ocaml, omake_rc1, libtiff, libjpeg, libpng, giflib, findlib, libXpm, freetype, graphicsmagick, ghostscript }: +{stdenv, fetchurl, omake, ocaml, libtiff, libjpeg, libpng, giflib, findlib, libXpm, freetype, graphicsmagick, ghostscript }: assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.00"; @@ -15,7 +15,7 @@ stdenv.mkDerivation { sha256 = "1ppddhfknpirj1vilm5dxgyp82kf7ahpvjmh7z75a1fnaqv3kpki"; }; - buildInputs = [ocaml omake_rc1 findlib graphicsmagick ghostscript ]; + buildInputs = [ ocaml omake findlib graphicsmagick ghostscript ]; propagatedBuildInputs = [libtiff libjpeg libpng giflib freetype libXpm ]; From e672fbc6f0e0dd503f78e0c23e6de1795bf81b8f Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 2 Dec 2016 19:45:09 +0000 Subject: [PATCH 04/16] omake: remove 0.9.8.6-rc1 --- .../tools/ocaml/omake/0.9.8.6-rc1.nix | 38 ------------------- pkgs/development/tools/ocaml/omake/warn.patch | 10 ----- pkgs/top-level/all-packages.nix | 2 - pkgs/top-level/ocaml-packages.nix | 2 - 4 files changed, 52 deletions(-) delete mode 100644 pkgs/development/tools/ocaml/omake/0.9.8.6-rc1.nix delete mode 100644 pkgs/development/tools/ocaml/omake/warn.patch diff --git a/pkgs/development/tools/ocaml/omake/0.9.8.6-rc1.nix b/pkgs/development/tools/ocaml/omake/0.9.8.6-rc1.nix deleted file mode 100644 index 9f318afc67d..00000000000 --- a/pkgs/development/tools/ocaml/omake/0.9.8.6-rc1.nix +++ /dev/null @@ -1,38 +0,0 @@ -{stdenv, fetchurl, makeWrapper, ocaml, ncurses}: -let - pname = "omake"; - version = "0.9.8.6-0.rc1"; - webpage = "http://omake.metaprl.org"; -in -stdenv.mkDerivation { - - name = "${pname}-${version}"; - - src = fetchurl { - url = "http://pkgs.fedoraproject.org/repo/pkgs/ocaml-omake/${pname}-${version}.tar.gz/fe39a476ef4e33b7ba2ca77a6bcaded2/${pname}-${version}.tar.gz"; - sha256 = "1sas02pbj56m7wi5vf3vqrrpr4ynxymw2a8ybvfj2dkjf7q9ii13"; - }; - patchFlags = "-p0"; - patches = [ ./warn.patch ]; - - buildInputs = [ ocaml makeWrapper ncurses ]; - - phases = "unpackPhase patchPhase buildPhase"; - buildPhase = '' - make bootstrap - make PREFIX=$out all - make PREFIX=$out install - ''; -# prefixKey = "-prefix "; -# -# configureFlags = if transitional then "--transitional" else "--strict"; -# -# buildFlags = "world.opt"; - - meta = { - description = "Omake build system"; - homepage = "${webpage}"; - license = "GPL"; - platforms = ocaml.meta.platforms or []; - }; -} diff --git a/pkgs/development/tools/ocaml/omake/warn.patch b/pkgs/development/tools/ocaml/omake/warn.patch deleted file mode 100644 index 4459e89d7f9..00000000000 --- a/pkgs/development/tools/ocaml/omake/warn.patch +++ /dev/null @@ -1,10 +0,0 @@ -diff -p1 -aur ../omake-0.9.8.6.ori/lib/build/OCaml.om ./lib/build/OCaml.om ---- ../omake-0.9.8.6.ori/lib/build/OCaml.om 2008-03-05 01:07:25.000000000 +0000 -+++ ./lib/build/OCaml.om 2013-06-01 15:52:37.000000000 +0000 -@@ -178,3 +178,3 @@ declare OCAMLDEPFLAGS - public.OCAMLPPFLAGS = --public.OCAMLFLAGS = -warn-error A -+public.OCAMLFLAGS = - public.OCAMLCFLAGS = -g -Seulement dans ./lib/build: OCaml.om~ -Seulement dans .: warn.patch diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a554f353d1e..8f512db3895 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6339,8 +6339,6 @@ in inherit (ocamlPackages_4_02) ocaml; }; - inherit (ocamlPackages) omake_rc1; - omniorb = callPackage ../development/tools/omniorb { }; opengrok = callPackage ../development/tools/misc/opengrok { }; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 6e3f98c7ba2..dc497b125e6 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -649,8 +649,6 @@ let trv = callPackage ../development/tools/misc/trv { }; - omake_rc1 = callPackage ../development/tools/ocaml/omake/0.9.8.6-rc1.nix { }; - verasco = callPackage ../development/tools/analysis/verasco ( if system == "x86_64-linux" then { tools = pkgs.pkgsi686Linux.stdenv.cc; } From a63732ef9557c3f4baa74bf659efe4df6cd2ecf6 Mon Sep 17 00:00:00 2001 From: Daniel Brockman Date: Fri, 25 Nov 2016 19:10:02 +0100 Subject: [PATCH 05/16] solc: 0.4.4 -> 0.4.6 --- pkgs/development/compilers/solc/default.nix | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/pkgs/development/compilers/solc/default.nix b/pkgs/development/compilers/solc/default.nix index 928de23f04b..e38983cea6e 100644 --- a/pkgs/development/compilers/solc/default.nix +++ b/pkgs/development/compilers/solc/default.nix @@ -1,18 +1,17 @@ -{ stdenv, fetchFromGitHub, boost, cmake, jsoncpp }: +{ stdenv, fetchgit, boost, cmake, jsoncpp }: stdenv.mkDerivation rec { - version = "0.4.4"; + version = "0.4.6"; name = "solc-${version}"; - src = fetchFromGitHub { - owner = "ethereum"; - repo = "solidity"; - rev = "v${version}"; - sha256 = "150prr7m0jnx3vhq0wy3avzsijxd3pn7c8jxdvf6jkcc408dgn6z"; + src = fetchgit { + url = "https://github.com/ethereum/solidity"; + rev = "2dabbdf06f414750ef0425c664f861aeb3e470b8"; + sha256 = "0q1dvizx60f7l97w8241wra7vpghimc9x7gzb18vn34sxv4bqy9g"; }; patchPhase = '' - echo >commit_hash.txt 4633f3def897db0f91237f98cf46e5d84fb05e61 + echo >commit_hash.txt 2dabbdf06f414750ef0425c664f861aeb3e470b8 ''; buildInputs = [ boost cmake jsoncpp ]; From 63b0e869088e425bfca6e194faf6ffaa94e77b46 Mon Sep 17 00:00:00 2001 From: Daniel Brockman Date: Tue, 6 Dec 2016 13:54:52 +0100 Subject: [PATCH 06/16] solc: add explanation for why not fetchFromGitHub --- pkgs/development/compilers/solc/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/compilers/solc/default.nix b/pkgs/development/compilers/solc/default.nix index e38983cea6e..0935891dcbd 100644 --- a/pkgs/development/compilers/solc/default.nix +++ b/pkgs/development/compilers/solc/default.nix @@ -4,6 +4,7 @@ stdenv.mkDerivation rec { version = "0.4.6"; name = "solc-${version}"; + # Cannot use `fetchFromGitHub' because of submodules src = fetchgit { url = "https://github.com/ethereum/solidity"; rev = "2dabbdf06f414750ef0425c664f861aeb3e470b8"; From cffea60631714bb355e2993aaed93cb2145c86a4 Mon Sep 17 00:00:00 2001 From: Bruno Bzeznik Date: Tue, 6 Dec 2016 14:46:52 +0100 Subject: [PATCH 07/16] pythonPackages.pamela: init at 0.3.0 --- pkgs/top-level/python-packages.nix | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7b0825d0966..a84a1445767 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8392,7 +8392,24 @@ in { }; }; + pamela = buildPythonPackage rec { + name = "pamela-${version}"; + version = "0.3.0"; + src = pkgs.fetchurl { + url = "mirror://pypi/p/pamela/${name}.tar.gz"; + sha256 = "0ssxbqsshrm8p642g3h6wsq20z1fsqhpdvqdm827gn6dlr38868y"; + }; + + doCheck = false; + + meta = { + description = "PAM interface using ctypes"; + homepage = "http://github.com/minrk/pamela"; + license = licenses.mit; + }; + }; + pathtools = buildPythonPackage rec { name = "pathtools-${version}"; version = "0.1.2"; From a859f6cabe582a449d2d4966d9842c828f71e7be Mon Sep 17 00:00:00 2001 From: montag451 Date: Fri, 9 Dec 2016 19:14:27 +0100 Subject: [PATCH 08/16] gnome-control-center: provides access to the tracker gsettings schemas (#20862) gnome-control-center needs access to the tracker gsettings schemas to enable the settings button in the search panel. --- .../desktops/gnome-3/3.20/core/gnome-control-center/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/desktops/gnome-3/3.20/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/3.20/core/gnome-control-center/default.nix index 78fc82ebaed..726f47d0cde 100644 --- a/pkgs/desktops/gnome-3/3.20/core/gnome-control-center/default.nix +++ b/pkgs/desktops/gnome-3/3.20/core/gnome-control-center/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { shared_mime_info icu libtool docbook_xsl docbook_xsl_ns gnome3.grilo gdk_pixbuf gnome3.defaultIconTheme librsvg clutter clutter_gtk gnome3.vino udev libcanberra_gtk3 libgudev - networkmanager modemmanager makeWrapper gnome3.gnome-bluetooth grilo ]; + networkmanager modemmanager makeWrapper gnome3.gnome-bluetooth grilo tracker ]; preBuild = '' substituteInPlace panels/datetime/tz.h --replace "/usr/share/zoneinfo/zone.tab" "${tzdata}/share/zoneinfo/zone.tab" From e54650e92a4cd7dd578d514eca1a7300e06944d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Fri, 9 Dec 2016 19:15:41 +0100 Subject: [PATCH 09/16] gnome-control-center: port the parent commit to 3.22 ... and fixup duplicate grilo build input. --- .../gnome-3/3.22/core/gnome-control-center/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-control-center/default.nix index 78fc82ebaed..17a4514d6f8 100644 --- a/pkgs/desktops/gnome-3/3.22/core/gnome-control-center/default.nix +++ b/pkgs/desktops/gnome-3/3.22/core/gnome-control-center/default.nix @@ -24,10 +24,10 @@ stdenv.mkDerivation rec { libxml2 gnome_desktop gnome_settings_daemon polkit libxslt libgtop gnome-menus gnome_online_accounts libsoup colord libpulseaudio fontconfig colord-gtk libpwquality accountsservice libkrb5 networkmanagerapplet libwacom samba libnotify libxkbfile - shared_mime_info icu libtool docbook_xsl docbook_xsl_ns gnome3.grilo + shared_mime_info icu libtool docbook_xsl docbook_xsl_ns gdk_pixbuf gnome3.defaultIconTheme librsvg clutter clutter_gtk gnome3.vino udev libcanberra_gtk3 libgudev - networkmanager modemmanager makeWrapper gnome3.gnome-bluetooth grilo ]; + networkmanager modemmanager makeWrapper gnome3.gnome-bluetooth grilo tracker ]; preBuild = '' substituteInPlace panels/datetime/tz.h --replace "/usr/share/zoneinfo/zone.tab" "${tzdata}/share/zoneinfo/zone.tab" From c5b96ca8016d00794b690a451e8f946b8809aff8 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 9 Dec 2016 19:46:57 +0100 Subject: [PATCH 10/16] minisat: Fix build on Darwin --- .../science/logic/minisat/darwin.patch | 26 +++++++++++++++++++ .../science/logic/minisat/default.nix | 4 ++- 2 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 pkgs/applications/science/logic/minisat/darwin.patch diff --git a/pkgs/applications/science/logic/minisat/darwin.patch b/pkgs/applications/science/logic/minisat/darwin.patch new file mode 100644 index 00000000000..f2b618d6bb3 --- /dev/null +++ b/pkgs/applications/science/logic/minisat/darwin.patch @@ -0,0 +1,26 @@ +https://github.com/fasterthanlime/homebrew-mingw/blob/master/Library/Formula/minisat.rb + +diff --git a/utils/System.cc b/utils/System.cc +index a7cf53f..feeaf3c 100644 +--- a/utils/System.cc ++++ b/utils/System.cc +@@ -78,16 +78,17 @@ double Minisat::memUsed(void) { + struct rusage ru; + getrusage(RUSAGE_SELF, &ru); + return (double)ru.ru_maxrss / 1024; } +-double MiniSat::memUsedPeak(void) { return memUsed(); } ++double Minisat::memUsedPeak(void) { return memUsed(); } + + + #elif defined(__APPLE__) + #include + +-double Minisat::memUsed(void) { ++double Minisat::memUsed() { + malloc_statistics_t t; + malloc_zone_statistics(NULL, &t); + return (double)t.max_size_in_use / (1024*1024); } ++double Minisat::memUsedPeak() { return memUsed(); } + + #else + double Minisat::memUsed() { diff --git a/pkgs/applications/science/logic/minisat/default.nix b/pkgs/applications/science/logic/minisat/default.nix index 3ed055cc093..d980afee7c4 100644 --- a/pkgs/applications/science/logic/minisat/default.nix +++ b/pkgs/applications/science/logic/minisat/default.nix @@ -9,7 +9,9 @@ stdenv.mkDerivation rec { sha256 = "023qdnsb6i18yrrawlhckm47q8x0sl7chpvvw3gssfyw3j2pv5cj"; }; - patches = stdenv.lib.optionals stdenv.cc.isClang [ ./clang.diff ]; + patches = + [ ./darwin.patch ] + ++ stdenv.lib.optionals stdenv.cc.isClang [ ./clang.diff ]; buildInputs = [ zlib ]; From 2444bafbbbc3d3d0285f6b6f9b076e19924765b3 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Fri, 9 Dec 2016 21:19:32 +0100 Subject: [PATCH 11/16] include me in mention bot for darwin --- .mention-bot | 1 + 1 file changed, 1 insertion(+) diff --git a/.mention-bot b/.mention-bot index 2bbe4a40bd4..d8529bd9123 100644 --- a/.mention-bot +++ b/.mention-bot @@ -6,6 +6,7 @@ ], "alwaysNotifyForPaths": [ { "name": "FRidh", "files": ["pkgs/top-level/python-packages.nix", "pkgs/development/interpreters/python/*", "pkgs/development/python-modules/*" ] }, + { "name": "LnL7", "files": ["pkgs/stdenv/darwin/*", "pkgs/os-specific/darwin/*"] }, { "name": "copumpkin", "files": ["pkgs/stdenv/darwin/*", "pkgs/os-specific/darwin/apple-source-releases/*"] } ], "fileBlacklist": ["pkgs/top-level/all-packages.nix"] From 8c8abafc2de41cda33d50852379eb6d2a24fe46d Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 9 Dec 2016 15:34:25 -0500 Subject: [PATCH 12/16] atom: 1.12.6 -> 1.12.7 --- pkgs/applications/editors/atom/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix index 572b7085cbc..58eb2e568c1 100644 --- a/pkgs/applications/editors/atom/default.nix +++ b/pkgs/applications/editors/atom/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "atom-${version}"; - version = "1.12.6"; + version = "1.12.7"; src = fetchurl { url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb"; - sha256 = "0b85bjfxdd18i2v8py5jx4284m58zxad38c2vvqhgx7cxm9hn8k6"; + sha256 = "1kkw6wixri8iddnmscza1d4riq4m9yr78y0d9y76vdnxarma0bfq"; name = "${name}.deb"; }; From fc6d82cf7630a74697490a152a190b17844affae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Mon, 22 Aug 2016 17:52:23 +0200 Subject: [PATCH 13/16] cifs-utils: add 'talloc' to buildInputs, to build cifs.upcall Fixes this ./configure symptom: configure: WARNING: talloc.h not found, consider installing libtalloc-devel. Disabling cifs.upcall. and is needed to (eventually) fix CIFS + DFS kernel mount on NixOS. --- pkgs/os-specific/linux/cifs-utils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/cifs-utils/default.nix b/pkgs/os-specific/linux/cifs-utils/default.nix index 6dcf8e11a3e..f69319b5256 100644 --- a/pkgs/os-specific/linux/cifs-utils/default.nix +++ b/pkgs/os-specific/linux/cifs-utils/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, kerberos, keyutils, pam }: +{ stdenv, fetchurl, kerberos, keyutils, pam, talloc }: stdenv.mkDerivation rec { name = "cifs-utils-${version}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1xs9rwqfpx8qj5mcmagw6y1hzwc71zhzb5r8hv06sz16p1w6axz2"; }; - buildInputs = [ kerberos keyutils pam ]; + buildInputs = [ kerberos keyutils pam talloc ]; makeFlags = "root_sbindir=$(out)/sbin"; From d429520b1380599be900408513150c22f759e009 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Mon, 5 Sep 2016 12:05:32 +0200 Subject: [PATCH 14/16] kernel: add CONFIG_CIFS_* like Fedora, Ubuntu The plan is to fix mounting DFS shares on NixOS (for which some of these options are needed), but I figured it might be a good idea to enable all CONFIG_CIFS_* like Fedora 24 and Ubuntu 16.04 while at it. Ubuntu even has CONFIG_CIFS_SMB311, but as Fedora do not, I left it out. Mounting DFS shares still doesn't work; need to configure cifs.upcall and /etc/request-key.conf. Until then, using GVFS as a workaround. --- pkgs/os-specific/linux/kernel/common-config.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 2ae714ea089..e0abb745f34 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -260,6 +260,11 @@ with stdenv.lib; CIFS_XATTR y CIFS_POSIX y CIFS_FSCACHE y + CIFS_STATS y + CIFS_WEAK_PW_HASH y + CIFS_UPCALL y + CIFS_ACL y + CIFS_DFS_UPCALL y CIFS_SMB2 y ${optionalString (versionAtLeast version "3.12") '' CEPH_FSCACHE y From 20773854211f2b45af53e4a8cca7339cd47781d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Mon, 5 Sep 2016 16:15:45 +0200 Subject: [PATCH 15/16] kernel: enable CONFIG_DYNAMIC_DEBUG (like Fedora and Ubuntu) It was useful in tracking down CIFS + DFS issue, and it's apparently enabled by default in two major distros. --- pkgs/os-specific/linux/kernel/common-config.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index e0abb745f34..bd99a7979ee 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -31,6 +31,7 @@ with stdenv.lib; # Debugging. DEBUG_KERNEL y + DYNAMIC_DEBUG y TIMER_STATS y BACKTRACE_SELF_TEST n CPU_NOTIFIER_ERROR_INJECT? n From 10d9845a1a4a49f56aec3d473349511f9d95937a Mon Sep 17 00:00:00 2001 From: c0bw3b Date: Sat, 10 Dec 2016 00:36:28 +0100 Subject: [PATCH 16/16] nghttp2: 1.16.1 -> 1.17.0 See release notes : https://github.com/nghttp2/nghttp2/releases/tag/v1.17.0 --- pkgs/development/libraries/nghttp2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/nghttp2/default.nix b/pkgs/development/libraries/nghttp2/default.nix index 080a3e35138..a035cccda7f 100644 --- a/pkgs/development/libraries/nghttp2/default.nix +++ b/pkgs/development/libraries/nghttp2/default.nix @@ -7,12 +7,12 @@ stdenv.mkDerivation rec { name = "nghttp2-${version}"; - version = "1.16.1"; + version = "1.17.0"; # Don't use fetchFromGitHub since this needs a bootstrap curl src = fetchurl { url = "https://github.com/nghttp2/nghttp2/releases/download/v${version}/nghttp2-${version}.tar.bz2"; - sha256 = "069pw84f8gg21npapn7y1sizwn6w35692zaq5g45gy8hdbmcl8yc"; + sha256 = "7685b6717d205d3a251b7dd5e73a7ca5e643bc5c01f928b82bfeed30c243f28a"; }; # Configure script searches for a symbol which does not exist in jemalloc on Darwin