From 21f984f59029a3c68d4a70d1c52173a29c6a2daf Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Wed, 27 Apr 2016 14:11:02 +0300 Subject: [PATCH 001/128] xfce service: add noDesktop option --- .../services/x11/desktop-managers/xfce.nix | 43 ++++++++++++------- 1 file changed, 27 insertions(+), 16 deletions(-) diff --git a/nixos/modules/services/x11/desktop-managers/xfce.nix b/nixos/modules/services/x11/desktop-managers/xfce.nix index 33b6dd32c19..23bef2e44d5 100644 --- a/nixos/modules/services/x11/desktop-managers/xfce.nix +++ b/nixos/modules/services/x11/desktop-managers/xfce.nix @@ -12,20 +12,29 @@ in { options = { - services.xserver.desktopManager.xfce.enable = mkOption { - type = types.bool; - default = false; - description = "Enable the Xfce desktop environment."; + services.xserver.desktopManager.xfce = { + enable = mkOption { + type = types.bool; + default = false; + description = "Enable the Xfce desktop environment."; + }; + + thunarPlugins = mkOption { + default = []; + type = types.listOf types.package; + example = literalExample "[ pkgs.xfce.thunar-archive-plugin ]"; + description = '' + A list of plugin that should be installed with Thunar. + ''; + }; + + noDesktop = mkOption { + type = types.bool; + default = false; + description = "Don't install XFCE desktop components (xfdesktop, panel and notification daemon)."; + }; }; - services.xserver.desktopManager.xfce.thunarPlugins = mkOption { - default = []; - type = types.listOf types.package; - example = literalExample "[ pkgs.xfce.thunar-archive-plugin ]"; - description = '' - A list of plugin that should be installed with Thunar. - ''; - }; }; @@ -59,14 +68,12 @@ in pkgs.xfce.terminal (pkgs.xfce.thunar.override { thunarPlugins = cfg.thunarPlugins; }) pkgs.xfce.xfce4icontheme - pkgs.xfce.xfce4panel pkgs.xfce.xfce4session pkgs.xfce.xfce4settings pkgs.xfce.xfce4mixer pkgs.xfce.xfce4volumed pkgs.xfce.xfce4screenshooter pkgs.xfce.xfconf - pkgs.xfce.xfdesktop pkgs.xfce.xfwm4 # This supplies some "abstract" icons such as # "utilities-terminal" and "accessories-text-editor". @@ -78,9 +85,13 @@ in pkgs.xfce.gvfs pkgs.xfce.xfce4_appfinder pkgs.xfce.tumbler # found via dbus - pkgs.xfce.xfce4notifyd # found via dbus ] - ++ optional config.powerManagement.enable pkgs.xfce.xfce4_power_manager; + ++ optional config.powerManagement.enable pkgs.xfce.xfce4_power_manager + ++ optionals (!cfg.noDesktop) + [ pkgs.xfce.xfce4panel + pkgs.xfce.xfdesktop + pkgs.xfce.xfce4notifyd # found via dbus + ]; environment.pathsToLink = [ "/share/xfce4" "/share/themes" "/share/mime" "/share/desktop-directories" "/share/gtksourceview-2.0" ]; From e7e22333f680db058c13d8fce5efe11d57582240 Mon Sep 17 00:00:00 2001 From: Rahul Gopinath Date: Mon, 9 May 2016 10:39:02 -0700 Subject: [PATCH 002/128] pythonpackages.dbf: init dbf at 0.94.003 Pure python package for reading/writing dBase, FoxPro, and Visual FoxPro .dbf files --- pkgs/top-level/python-packages.nix | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index bdfb79138d7..459096f449d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -91,6 +91,24 @@ in modules // { bugseverywhere = callPackage ../applications/version-management/bugseverywhere {}; + dbf = buildPythonPackage rec { + name = "dbf-0.94.003"; + disabled = isPy3k; + + meta = { + description = "Pure python package for reading/writing dBase, FoxPro, and Visual FoxPro .dbf files"; + homepage = "https://pypi.python.org/pypi/dbf"; + license = licenses.bsd2; + maintainers = with maintainers; [ vrthra ]; + }; + + src = pkgs.fetchurl { + url = "mirror://pypi/d/dbf/${name}.tar.gz"; + sha256 = "0i2454hwg67079jb56x663wqmmwr55pcr6c76q2415185y6nhny9"; + }; + }; + + dbus = callPackage ../development/python-modules/dbus { dbus = pkgs.dbus; }; From b83a9036ec1f3d09324bdd02a863c71575b686d7 Mon Sep 17 00:00:00 2001 From: Rahul Gopinath Date: Mon, 9 May 2016 10:39:12 -0700 Subject: [PATCH 003/128] pythonpackages.dbfread: init dbfread at 2.0.5 This library reads DBF files and returns the data as native Python data types for further processing. It is primarily intended for batch jobs and one-off scripts. --- pkgs/top-level/python-packages.nix | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 459096f449d..66aa6fb9c27 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -109,6 +109,25 @@ in modules // { }; + dbfread = buildPythonPackage rec { + name = "dbfread-2.0.5"; + disabled = isPy3k; + + meta = { + description = "Read DBF Files with Python"; + homepage = "http://dbfread.readthedocs.org/"; + license = licenses.mit; + maintainers = with maintainers; [ vrthra ]; + }; + + src = pkgs.fetchurl { + url = "mirror://pypi/d/dbfread/${name}.tar.gz"; + sha256 = "0r5axq9ax0czyapm7b69krcv22r1nyb4vci7c5x8mx8pq1axim93"; + }; + }; + + + dbus = callPackage ../development/python-modules/dbus { dbus = pkgs.dbus; }; From 248ebe9b43d6043be184bf5a35d8c3bbdf176a8c Mon Sep 17 00:00:00 2001 From: Rahul Gopinath Date: Mon, 9 May 2016 10:39:15 -0700 Subject: [PATCH 004/128] pythonpackages.pytimeparse: init pytimeparse at 1.1.5 A small Python library to parse various kinds of time expressions --- pkgs/top-level/python-packages.nix | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 66aa6fb9c27..b31a61813d3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -222,6 +222,25 @@ in modules // { pysideTools = callPackage ../development/python-modules/pyside/tools.nix { }; + pytimeparse = buildPythonPackage rec { + name = "pytimeparse-1.1.5"; + disabled = isPy3k; + + meta = { + description = "A small Python library to parse various kinds of time expressions"; + homepage = "https://github.com/wroberts/pytimeparse"; + license = licenses.mit; + maintainers = with maintainers; [ vrthra ]; + }; + + propagatedBuildInputs = with self; [ nose ]; + + src = pkgs.fetchurl { + url = "mirror://pypi/p/pytimeparse/${name}.tar.gz"; + sha256 = "01xj31m5brydm4gvc6lwx26r74903wvm1jx3g05633k3mqlvvpcs"; + }; + }; + pyxml = if !isPy3k then callPackage ../development/python-modules/pyxml{ } else throw "pyxml not supported for interpreter ${python.executable}"; rhpl = if !isPy3k then callPackage ../development/python-modules/rhpl {} else throw "rhpl not supported for interpreter ${python.executable}"; From b4706b52cceac4098e544c13f7bf6973c849c724 Mon Sep 17 00:00:00 2001 From: Rahul Gopinath Date: Mon, 9 May 2016 10:39:18 -0700 Subject: [PATCH 005/128] pythonpackages.agate: init agate at 1.2.2 agate is a Python data analysis library that is optimized for humans instead of machines. It is an alternative to numpy and pandas that solves real-world problems with readable code. --- pkgs/top-level/python-packages.nix | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b31a61813d3..7f7dc9a660f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -85,6 +85,25 @@ in modules // { setuptools = callPackage ../development/python-modules/setuptools { }; + agate = buildPythonPackage rec { + name = "agate-1.2.2"; + disabled = isPy3k; + + meta = { + description = "A Python data analysis library that is optimized for humans instead of machines"; + homepage = "https://github.com/wireservice/agate"; + license = licenses.mit; + maintainers = with maintainers; [ vrthra ]; + }; + + propagatedBuildInputs = with self; [ discid six parsedatetime isodate Babel pytimeparse ]; + + src = pkgs.fetchurl { + url = "mirror://pypi/a/agate/${name}.tar.gz"; + sha256 = "0h2w30a0zhylivz86d823a05hvg8w8p61lmm855z1wwkgml9l9d4"; + }; + }; + # packages defined elsewhere blivet = callPackage ../development/python-modules/blivet { }; From b8fc7dffbf284e11dad28408fe79e9842fc9055a Mon Sep 17 00:00:00 2001 From: Rahul Gopinath Date: Mon, 9 May 2016 10:39:21 -0700 Subject: [PATCH 006/128] pythonpackages.agate-dbf: init agate-dbf at 0.1.0 agate is a Python data analysis library that is optimized for humans instead of machines. It is an alternative to numpy and pandas that helps you solve real-world problems with readable code. --- pkgs/top-level/python-packages.nix | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7f7dc9a660f..7ff9f4286d4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -104,6 +104,25 @@ in modules // { }; }; + agate-dbf = buildPythonPackage rec { + name = "agate-dbf-0.1.0"; + disabled = isPy3k; + + meta = { + description = "Adds read support for dbf files to agate"; + homepage = "https://github.com/wireservice/agate-dbf"; + license = licenses.mit; + maintainers = with maintainers; [ vrthra ]; + }; + + propagatedBuildInputs = with self; [ agate dbf dbfread ]; + + src = pkgs.fetchurl { + url = "mirror://pypi/a/agate-dbf/${name}.tar.gz"; + sha256 = "0xzz834lh4xbl342c6wmxqy7ynmsrjp42bsjahfcxhsgq33vzngz"; + }; + }; + # packages defined elsewhere blivet = callPackage ../development/python-modules/blivet { }; From d9a704418d46e9c29d5dd1877c3d25e6a3b93232 Mon Sep 17 00:00:00 2001 From: Igor Sharonov Date: Mon, 9 May 2016 23:08:28 +0300 Subject: [PATCH 007/128] pyqt5: fix --- pkgs/top-level/python-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index fe97b927b8d..e689df55778 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -173,6 +173,7 @@ in modules // { pyqt5 = pkgs.qt55.callPackage ../development/python-modules/pyqt/5.x.nix { sip = self.sip_4_16; pythonDBus = self.dbus; + python = self.python; }; pyside = callPackage ../development/python-modules/pyside { }; From 8aca7a394f5e105f544b2730b21610a4bdae9776 Mon Sep 17 00:00:00 2001 From: Rahul Gopinath Date: Mon, 9 May 2016 10:39:27 -0700 Subject: [PATCH 008/128] pythonpackages.agate-excel: init agate-excel at 0.1.0 --- pkgs/top-level/python-packages.nix | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7ff9f4286d4..6f75f43fb5d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -123,6 +123,25 @@ in modules // { }; }; + agate-excel = buildPythonPackage rec { + name = "agate-excel-0.1.0"; + disabled = isPy3k; + + meta = { + description = "Adds read support for excel files to agate"; + homepage = "https://github.com/wireservice/agate-excel"; + license = licenses.mit; + maintainers = with maintainers; [ vrthra ]; + }; + + propagatedBuildInputs = with self; [ agate openpyxl xlrd ]; + + src = pkgs.fetchurl { + url = "mirror://pypi/a/agate-excel/${name}.tar.gz"; + sha256 = "08zvj3pwqw8zhd58iyymiwblrk92y4gl6yyrb2svb0k8za7v0hak"; + }; + }; + # packages defined elsewhere blivet = callPackage ../development/python-modules/blivet { }; From 038cb56df6b7e564ac42d5792404ea27b97c5bdb Mon Sep 17 00:00:00 2001 From: Rahul Gopinath Date: Mon, 9 May 2016 10:39:27 -0700 Subject: [PATCH 009/128] pythonpackages.agate-excel: init agate-excel at 0.1.0 --- pkgs/top-level/python-packages.nix | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7ff9f4286d4..6f75f43fb5d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -123,6 +123,25 @@ in modules // { }; }; + agate-excel = buildPythonPackage rec { + name = "agate-excel-0.1.0"; + disabled = isPy3k; + + meta = { + description = "Adds read support for excel files to agate"; + homepage = "https://github.com/wireservice/agate-excel"; + license = licenses.mit; + maintainers = with maintainers; [ vrthra ]; + }; + + propagatedBuildInputs = with self; [ agate openpyxl xlrd ]; + + src = pkgs.fetchurl { + url = "mirror://pypi/a/agate-excel/${name}.tar.gz"; + sha256 = "08zvj3pwqw8zhd58iyymiwblrk92y4gl6yyrb2svb0k8za7v0hak"; + }; + }; + # packages defined elsewhere blivet = callPackage ../development/python-modules/blivet { }; From d6881e53c9ebc5228a7bd3fffda98aea185a4a0e Mon Sep 17 00:00:00 2001 From: Rahul Gopinath Date: Sun, 8 May 2016 22:51:37 -0700 Subject: [PATCH 010/128] pythonpackages.dateutil: init dateutil at 2.2 dateutil_2.2 is required by the csvkit 0.9.1 --- pkgs/top-level/python-packages.nix | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6f75f43fb5d..74acd93b827 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4909,6 +4909,27 @@ in modules // { }; }); + # csvkit 0.9.1 needs dateutil==2.2 + dateutil_2_2 = buildPythonPackage (rec { + name = "dateutil-2.2"; + disabled = isPy3k; + + propagatedBuildInputs = with self; [ self.six ]; + + buildInputs = [ pkgs.glibcLocales ]; + + src = pkgs.fetchurl { + url = "mirror://pypi/p/python-dateutil/python-${name}.tar.gz"; + sha256 = "0s74ad6r789810s10dxgvaf48ni6adac2icrdad34zxygqq6bj7f"; + }; + + meta = { + description = "Powerful extensions to the standard datetime module"; + homepage = http://pypi.python.org/pypi/python-dateutil; + license = "BSD-style"; + }; + }); + # Buildbot 0.8.7p1 needs dateutil==1.5 dateutil_1_5 = buildPythonPackage (rec { name = "dateutil-1.5"; @@ -7034,7 +7055,7 @@ in modules // { license = licenses.lgpl3; }; }; - + pathtools = buildPythonPackage rec { name = "pathtools-${version}"; From 2833788f94490c4064097c57d698efbabf27a00f Mon Sep 17 00:00:00 2001 From: Rahul Gopinath Date: Sun, 8 May 2016 22:52:38 -0700 Subject: [PATCH 011/128] pythonpackages.openpyxl: init openpyxl at 2.2.0-b1 openpyxl-2.2.0-b1 is needed by csvkit-0.9.1 --- pkgs/top-level/python-packages.nix | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 74acd93b827..2cbc7da28ca 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -13885,6 +13885,31 @@ in modules // { doCheck = false; }; + openpyxl_2_2_0_b1 = buildPythonPackage rec { + version = "2.2.0-b1"; + name = "openpyxl-${version}"; + + src = pkgs.fetchurl { + url = "mirror://pypi/o/openpyxl/${name}.tar.gz"; + sha256 = "0n10pawp2558jrrmppyhkrv7889k3g4mifqj3fp68qbr20ldk51k"; + }; + + buildInputs = with self; [ pytest ]; + propagatedBuildInputs = with self; [ jdcal et_xmlfile lxml ]; + + # Tests are not included in archive. + # https://bitbucket.org/openpyxl/openpyxl/issues/610 + doCheck = false; + + meta = { + description = "A Python library to read/write Excel 2007 xlsx/xlsm files"; + homepage = https://openpyxl.readthedocs.org; + license = licenses.mit; + maintainers = with maintainers; [ lihop sjourdois ]; + platforms = platforms.all; + }; + }; + openpyxl = buildPythonPackage rec { version = "2.3.3"; name = "openpyxl-${version}"; From eed48a2c90b183fb2d9d13a845ed9fc3c61c6fb5 Mon Sep 17 00:00:00 2001 From: Rahul Gopinath Date: Sun, 8 May 2016 22:50:25 -0700 Subject: [PATCH 012/128] pythonpackages.csvkit: init csvkit at 0.9.1 csvkit is a suite of utilities for converting to and working with CSV, the king of tabular file formats. --- pkgs/top-level/python-packages.nix | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2cbc7da28ca..08e3014317f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2056,6 +2056,26 @@ in modules // { doCheck = false; # lazy packager }; + csvkit = buildPythonPackage rec { + name = "csvkit-${version}"; + version = "0.9.1"; + disabled = isPy3k; + + src = pkgs.fetchurl { + url = "mirror://pypi/c/csvkit/${name}.tar.gz"; + sha256 = "0fprr4wgp0bq8kl5qims88np11af7ahr5bxkrhfwpdgcgdjbiy4j"; + }; + + propagatedBuildInputs = with self; [ dateutil_2_2 dbf xlrd sqlalchemy openpyxl_2_2_0_b1 ]; + + meta = { + description = "A library of utilities for working with CSV, the king of tabular file formats"; + maintainers = with maintainers; [ vrthra ]; + license = licenses.mit; + homepage = "https://github.com/wireservice/csvkit"; + }; + }; + cx_Freeze = buildPythonPackage rec { name = "cx_freeze-${version}"; version = "4.3.4"; From aab15222878e36b4dbd8fd68532b0b1ba44c9d09 Mon Sep 17 00:00:00 2001 From: Alexander Ried Date: Tue, 10 May 2016 12:48:14 +0200 Subject: [PATCH 013/128] libinput: 1.2.3 -> 1.3.0 --- pkgs/development/libraries/libinput/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix index 2c29482227a..5c42626caa3 100644 --- a/pkgs/development/libraries/libinput/default.nix +++ b/pkgs/development/libraries/libinput/default.nix @@ -15,11 +15,11 @@ in with stdenv.lib; stdenv.mkDerivation rec { - name = "libinput-1.2.3"; + name = "libinput-1.3.0"; src = fetchurl { url = "http://www.freedesktop.org/software/libinput/${name}.tar.xz"; - sha256 = "1wp937sn2dzqhrbl2bhapqb0pvybc80z8ynw7yfkm5ycl39skch9"; + sha256 = "1sn1s1bz06fa49izqkqf519sjclsvhf42i6slzx1w5hx4vxpb2lr"; }; configureFlags = [ From f4a2ea2203cd7aac3b3672f1ebec8d64d193f3ac Mon Sep 17 00:00:00 2001 From: Aneesh Agrawal Date: Wed, 11 May 2016 00:45:41 -0400 Subject: [PATCH 014/128] ccacheStdenv: inherit lib output from wrapped gcc --- pkgs/development/tools/misc/ccache/default.nix | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/misc/ccache/default.nix b/pkgs/development/tools/misc/ccache/default.nix index f344156f6bc..bc1f348040c 100644 --- a/pkgs/development/tools/misc/ccache/default.nix +++ b/pkgs/development/tools/misc/ccache/default.nix @@ -20,9 +20,14 @@ let ccache = stdenv.mkDerivation rec { passthru = { # A derivation that provides gcc and g++ commands, but that # will end up calling ccache for the given cacheDir - links = extraConfig: (runCommand "ccache-links" - { passthru.gcc = gcc; passthru.isGNU = true; } - '' + links = extraConfig: stdenv.mkDerivation rec { + name = "ccache-links"; + passthru = { + inherit gcc; + isGNU = true; + }; + inherit (gcc.cc) lib; + buildCommand = '' mkdir -p $out/bin if [ -x "${gcc.cc}/bin/gcc" ]; then cat > $out/bin/gcc << EOF @@ -48,7 +53,8 @@ let ccache = stdenv.mkDerivation rec { for file in $(ls ${gcc.cc} | grep -vw bin); do ln -s ${gcc.cc}/$file $out/$file done - ''); + ''; + }; }; meta = with stdenv.lib; { From ce7a544b92c5d22db028f5f3fe0d82e260a9ffd7 Mon Sep 17 00:00:00 2001 From: Alexei Robyn Date: Wed, 11 May 2016 22:16:38 +1000 Subject: [PATCH 015/128] nixos: ensure TERMINFO is set before user shells are run --- nixos/modules/config/shells-environment.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/nixos/modules/config/shells-environment.nix b/nixos/modules/config/shells-environment.nix index 9642981803b..89b8a04b5e7 100644 --- a/nixos/modules/config/shells-environment.nix +++ b/nixos/modules/config/shells-environment.nix @@ -150,6 +150,10 @@ in system.build.binsh = pkgs.bashInteractive; + # Ensure TERMINFO is set appropriately *before* user shells are run, + # as they may depend on it + environment.sessionVariables.TERMINFO = "/run/current-system/sw/share/terminfo"; + # Set session variables in the shell as well. This is usually # unnecessary, but it allows changes to session variables to take # effect without restarting the session (e.g. by opening a new From d91e736de553995df31d47392896c2b1a578be66 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 11 May 2016 10:01:59 -0500 Subject: [PATCH 016/128] ats2: 0.2.4 -> 0.2.6 --- pkgs/development/compilers/ats2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/ats2/default.nix b/pkgs/development/compilers/ats2/default.nix index 280ed180344..0989880df7f 100644 --- a/pkgs/development/compilers/ats2/default.nix +++ b/pkgs/development/compilers/ats2/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "ats2-${version}"; - version = "0.2.4"; + version = "0.2.6"; src = fetchurl { url = "mirror://sourceforge/ats2-lang/ATS2-Postiats-${version}.tgz"; - sha256 = "0dx3r2vxmarj3aqm0xlcmls1h08pll9y9k4820df41awyrwmfvcy"; + sha256 = "0hfaw8mrxrmb9kdbz5sp4nfjsmncmq6zqwm1n2x2p6arn0za6y9i"; }; buildInputs = [ gmp ]; From 3f74ac1f348eef9598a4e9747f5396daae78a30a Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 11 May 2016 10:02:09 -0500 Subject: [PATCH 017/128] ats2: add ttuegel to maintainers --- pkgs/development/compilers/ats2/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/ats2/default.nix b/pkgs/development/compilers/ats2/default.nix index 0989880df7f..8b4ea36330c 100644 --- a/pkgs/development/compilers/ats2/default.nix +++ b/pkgs/development/compilers/ats2/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { setupHook = ./setup-hook.sh; - meta = { + meta = with stdenv.lib; { description = "Functional programming language with dependent types"; homepage = "http://www.ats-lang.org"; - license = stdenv.lib.licenses.gpl3Plus; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ thoughtpolice ttuegel ]; }; } From c90d5eb2988995e8e7bd387a5d1899d935882680 Mon Sep 17 00:00:00 2001 From: Alexei Robyn Date: Wed, 11 May 2016 20:52:49 +1000 Subject: [PATCH 018/128] rsnapshot module: Avoid package rebuild, pass config file explicitly. --- nixos/modules/services/backup/rsnapshot.nix | 48 ++++++++------------- 1 file changed, 17 insertions(+), 31 deletions(-) diff --git a/nixos/modules/services/backup/rsnapshot.nix b/nixos/modules/services/backup/rsnapshot.nix index 96657cf17fc..05dc83372be 100644 --- a/nixos/modules/services/backup/rsnapshot.nix +++ b/nixos/modules/services/backup/rsnapshot.nix @@ -2,7 +2,19 @@ with lib; -let cfg = config.services.rsnapshot; +let + cfg = config.services.rsnapshot; + cfgfile = pkgs.writeText "rsnapshot.conf" '' + config_version 1.2 + cmd_cp ${pkgs.coreutils}/bin/cp + cmd_rsync ${pkgs.rsync}/bin/rsync + cmd_ssh ${pkgs.openssh}/bin/ssh + cmd_logger ${pkgs.inetutils}/bin/logger + cmd_du ${pkgs.coreutils}/bin/du + lockfile /run/rsnapshot.pid + + ${cfg.extraConfig} + ''; in { options = { @@ -39,37 +51,11 @@ in as retain options. ''; }; - - package = mkOption { - type = types.package; - default = pkgs.rsnapshot; - defaultText = "pkgs.rsnapshot"; - example = literalExample "pkgs.rsnapshotGit"; - description = '' - RSnapshot package to use. - ''; - }; }; }; - config = mkIf cfg.enable (let - myRsnapshot = cfg.package.override { configFile = rsnapshotCfg; }; - rsnapshotCfg = with pkgs; writeText "gen-rsnapshot.conf" ('' - config_version 1.2 - cmd_cp ${coreutils}/bin/cp - cmd_rsync ${rsync}/bin/rsync - cmd_ssh ${openssh}/bin/ssh - cmd_logger ${inetutils}/bin/logger - cmd_du ${coreutils}/bin/du - lockfile /run/rsnapshot.pid - - ${cfg.extraConfig} - ''); - in { - environment.systemPackages = [ myRsnapshot ]; - - services.cron.systemCronJobs = - mapAttrsToList (interval: time: "${time} root ${myRsnapshot}/bin/rsnapshot ${interval}") cfg.cronIntervals; - } - ); + config = mkIf cfg.enable { + services.cron.systemCronJobs = + mapAttrsToList (interval: time: "${time} root ${pkgs.rsnapshot}/bin/rsnapshot -c ${cfgfile} ${interval}") cfg.cronIntervals; + }; } From 3f35d670de2285293ed14c2623e86c27868da6b8 Mon Sep 17 00:00:00 2001 From: Alexei Robyn Date: Thu, 12 May 2016 09:19:16 +1000 Subject: [PATCH 019/128] rsnapshot: Remove unnecessary argument, refactor one-line patch to flags. --- pkgs/tools/backup/rsnapshot/default.nix | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-) diff --git a/pkgs/tools/backup/rsnapshot/default.nix b/pkgs/tools/backup/rsnapshot/default.nix index f46a2c20de4..e4ecb4becde 100644 --- a/pkgs/tools/backup/rsnapshot/default.nix +++ b/pkgs/tools/backup/rsnapshot/default.nix @@ -1,20 +1,5 @@ -{ fetchurl, stdenv, writeText, perl, openssh, rsync, logger, - configFile ? "/etc/rsnapshot.conf" }: +{ fetchurl, stdenv, writeText, perl, openssh, rsync, logger }: -let patch = writeText "rsnapshot-config.patch" '' ---- rsnapshot-program.pl 2013-10-05 20:31:08.715991442 +0200 -+++ rsnapshot-program.pl 2013-10-05 20:31:42.496193633 +0200 -@@ -383,7 +383,7 @@ - } - - # set global variable -- $config_file = $default_config_file; -+ $config_file = '${configFile}'; - } - - # accepts no args -''; -in stdenv.mkDerivation rec { name = "rsnapshot-1.4.1"; @@ -25,10 +10,12 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [perl openssh rsync logger]; + configureFlags = [ "--sysconfdir=/etc --prefix=/" ]; + makeFlags = [ "DESTDIR=$(out)" ]; + patchPhase = '' substituteInPlace "Makefile.in" --replace \ "/usr/bin/pod2man" "${perl}/bin/pod2man" - patch -p0 <${patch} ''; meta = with stdenv.lib; { From 1e2ec5817c6f5642df34285fd2c74f100064c485 Mon Sep 17 00:00:00 2001 From: Alexei Robyn Date: Wed, 11 May 2016 21:21:56 +1000 Subject: [PATCH 020/128] rsnapshot module: Enable manual rsnapshot usage with module config. --- nixos/modules/services/backup/rsnapshot.nix | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/nixos/modules/services/backup/rsnapshot.nix b/nixos/modules/services/backup/rsnapshot.nix index 05dc83372be..ce628a72036 100644 --- a/nixos/modules/services/backup/rsnapshot.nix +++ b/nixos/modules/services/backup/rsnapshot.nix @@ -20,6 +20,12 @@ in options = { services.rsnapshot = { enable = mkEnableOption "rsnapshot backups"; + enableManualRsnapshot = mkOption { + description = "Whether to enable manual usage of the rsnapshot command with this module."; + default = true; + example = false; + type = types.bool; + }; extraConfig = mkOption { default = ""; @@ -54,8 +60,14 @@ in }; }; - config = mkIf cfg.enable { - services.cron.systemCronJobs = - mapAttrsToList (interval: time: "${time} root ${pkgs.rsnapshot}/bin/rsnapshot -c ${cfgfile} ${interval}") cfg.cronIntervals; - }; + config = mkIf cfg.enable (mkMerge [ + { + services.cron.systemCronJobs = + mapAttrsToList (interval: time: "${time} root ${pkgs.rsnapshot}/bin/rsnapshot -c ${cfgfile} ${interval}") cfg.cronIntervals; + } + (mkIf cfg.enableManualRsnapshot { + environment.systemPackages = [ pkgs.rsnapshot ]; + environment.etc."rsnapshot.conf".source = cfgfile; + }) + ]); } From e634488cc3084445e5233de78d0cc6e118c2b33e Mon Sep 17 00:00:00 2001 From: Alexei Robyn Date: Mon, 4 Apr 2016 14:29:17 +1000 Subject: [PATCH 021/128] pidgin-with-plugins: Add plugin support for Finch, the CLI version of Pidgin. --- .../networking/instant-messengers/pidgin/wrapper.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/networking/instant-messengers/pidgin/wrapper.nix b/pkgs/applications/networking/instant-messengers/pidgin/wrapper.nix index cff0f0818ee..914b3480a95 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin/wrapper.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/wrapper.nix @@ -13,5 +13,8 @@ in symlinkJoin { wrapProgram $out/bin/pidgin \ --suffix-each PURPLE_PLUGIN_PATH ':' "$out/lib/purple-${pidgin.majorVersion} $out/lib/pidgin" \ ${toString extraArgs} + wrapProgram $out/bin/finch \ + --suffix-each PURPLE_PLUGIN_PATH ':' "$out/lib/purple-${pidgin.majorVersion}" \ + ${toString extraArgs} ''; } From 9d9a20e98b79da37459825a9c2ad08336bda680c Mon Sep 17 00:00:00 2001 From: Alexei Robyn Date: Mon, 4 Apr 2016 14:29:58 +1000 Subject: [PATCH 022/128] pidgin-opensteamworks: Change install location to work with Finch as well as Pidgin. --- .../pidgin-plugins/pidgin-opensteamworks/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks/default.nix index e4c0697605d..2324ad464ed 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks/default.nix @@ -13,9 +13,9 @@ stdenv.mkDerivation rec { preConfigure = "cd steam-mobile"; postInstall = '' - mkdir -p $out/lib/pidgin/ + mkdir -p $out/lib/purple-2 mkdir -p $out/share/pixmaps/pidgin/protocols/ - cp libsteam.so $out/lib/pidgin/ + cp libsteam.so $out/lib/purple-2/ unzip releases/icons.zip -d $out/share/pixmaps/pidgin/protocols/ ''; From 5ac6c666a128aa7248896645237a787684f36d0e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 11 May 2016 15:16:32 +0200 Subject: [PATCH 023/128] man-pages: 4.05 -> 4.06 --- pkgs/data/documentation/man-pages/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/data/documentation/man-pages/default.nix b/pkgs/data/documentation/man-pages/default.nix index 3ee2242adec..06ba18d1b92 100644 --- a/pkgs/data/documentation/man-pages/default.nix +++ b/pkgs/data/documentation/man-pages/default.nix @@ -2,17 +2,19 @@ stdenv.mkDerivation rec { name = "man-pages-${version}"; - version = "4.05"; + version = "4.06"; src = fetchurl { url = "mirror://kernel/linux/docs/man-pages/${name}.tar.xz"; - sha256 = "03d6aqgvhcsyciwdhl50h9bwn53iivvd7rbnh8als2ia9jwm2026"; + sha256 = "0vv056k9yyf05dqal9m2pq3pv9c8lnp7i5rjxvcnic6aq7vyrafb"; }; # keep developer docs separately (man2 and man3) outputs = [ "out" "docdev" ]; makeFlags = [ "MANDIR=$(out)/share/man" ]; - postFixup = ''moveToOutput share/man/man2 "$docdev" ''; + postFixup = '' + moveToOutput share/man/man2 "$docdev" + ''; meta = with stdenv.lib; { description = "Linux development manual pages"; From a64c5729484c80406a83ea32c2c8c86a79e4bcb5 Mon Sep 17 00:00:00 2001 From: Robert Irelan Date: Wed, 11 May 2016 22:35:26 -0700 Subject: [PATCH 024/128] subsonic: 5.3 -> 6.0 --- pkgs/servers/misc/subsonic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/misc/subsonic/default.nix b/pkgs/servers/misc/subsonic/default.nix index 0a4087fd5e9..1495693b16b 100644 --- a/pkgs/servers/misc/subsonic/default.nix +++ b/pkgs/servers/misc/subsonic/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, jre }: -let version = "5.3"; in +let version = "6.0"; in stdenv.mkDerivation rec { name = "subsonic-${version}"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://sourceforge/subsonic/subsonic-${version}-standalone.tar.gz"; - sha256 = "11ylg89r9dbxyas7jcyij6fpm84dixskdkahb3hdi4ig0wqwswfw"; + sha256 = "0aw7lz7bkhqvjj3lkk68n2aqr5l84s91cgifg2379w2j7dgd056z"; }; inherit jre; From b874447eefdcb3ba8542fd4caed147742b98890b Mon Sep 17 00:00:00 2001 From: Alexei Robyn Date: Thu, 12 May 2016 14:31:28 +1000 Subject: [PATCH 025/128] teamspeak-server: 3.0.10.3 -> 3.0.12.4, also tsdnsserver binary now in output --- .../instant-messengers/teamspeak/server.nix | 28 +++++++++++-------- 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/server.nix b/pkgs/applications/networking/instant-messengers/teamspeak/server.nix index 1da719845a3..f95d3f0490a 100644 --- a/pkgs/applications/networking/instant-messengers/teamspeak/server.nix +++ b/pkgs/applications/networking/instant-messengers/teamspeak/server.nix @@ -1,11 +1,8 @@ { stdenv, fetchurl, makeWrapper }: let - - version = "3.0.10.3"; - + version = "3.0.12.4"; arch = if stdenv.is64bit then "amd64" else "x86"; - libDir = if stdenv.is64bit then "lib64" else "lib"; in @@ -14,25 +11,30 @@ stdenv.mkDerivation { src = fetchurl { urls = [ - "http://dl.4players.de/ts/releases/${version}/teamspeak3-server_linux-${arch}-${version}.tar.gz" - "http://teamspeak.gameserver.gamed.de/ts3/releases/${version}/teamspeak3-server_linux-${arch}-${version}.tar.gz" + "http://dl.4players.de/ts/releases/${version}/teamspeak3-server_linux_${arch}-${version}.tar.bz2" + "http://teamspeak.gameserver.gamed.de/ts3/releases/${version}/teamspeak3-server_linux_${arch}-${version}.tar.bz2" ]; sha256 = if stdenv.is64bit - then "9606dd5c0c3677881b1aab833cb99f4f12ba08cc77ef4a97e9e282d9e10b0702" - else "8b8921e0df04bf74068a51ae06d744f25d759a8c267864ceaf7633eb3f81dbe5"; + then "1n8vgbgnfbllfvsl82ai6smv6hl32a3nd071j2dp79agjz4fic3b" + else "19vkcgb0h71amixry8r72qqwaxwplzyz9nrxg5bdjjg8r2mkh4bc"; }; buildInputs = [ makeWrapper ]; buildPhase = '' - mv ts3server_linux_${arch} ts3server echo "patching ts3server" patchelf \ --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath $(cat $NIX_CC/nix-support/orig-cc)/${libDir} \ --force-rpath \ ts3server + cp tsdns/tsdnsserver tsdnsserver + patchelf \ + --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath $(cat $NIX_CC/nix-support/orig-cc)/${libDir} \ + --force-rpath \ + tsdnsserver ''; installPhase = @@ -44,17 +46,19 @@ stdenv.mkDerivation { mkdir -p $out/lib/teamspeak mv * $out/lib/teamspeak/ - # Make a symlink to the binary from bin. + # Make symlinks to the binaries from bin. mkdir -p $out/bin/ ln -s $out/lib/teamspeak/ts3server $out/bin/ts3server + ln -s $out/lib/teamspeak/tsdnsserver $out/bin/tsdnsserver wrapProgram $out/lib/teamspeak/ts3server --prefix LD_LIBRARY_PATH : $out/lib/teamspeak + wrapProgram $out/lib/teamspeak/tsdnsserver --prefix LD_LIBRARY_PATH : $out/lib/tsdnsserver ''; dontStrip = true; dontPatchELF = true; - - meta = { + + meta = { description = "TeamSpeak voice communication server"; homepage = http://teamspeak.com/; license = stdenv.lib.licenses.unfreeRedistributable; From 6360ad48af0321ba33c154bb41c89105205ae351 Mon Sep 17 00:00:00 2001 From: Anthony Cowley Date: Thu, 12 May 2016 01:50:13 -0400 Subject: [PATCH 026/128] libass: darwin compatibility --- pkgs/development/libraries/libass/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libass/default.nix b/pkgs/development/libraries/libass/default.nix index 1acd71c30c8..4b579524a52 100644 --- a/pkgs/development/libraries/libass/default.nix +++ b/pkgs/development/libraries/libass/default.nix @@ -5,6 +5,7 @@ , harfbuzzSupport ? true, harfbuzz ? null # harfbuzz support , rasterizerSupport ? false # Internal rasterizer , largeTilesSupport ? false # Use larger tiles in the rasterizer +, libiconv }: assert encaSupport -> enca != null; @@ -38,7 +39,8 @@ stdenv.mkDerivation rec { buildInputs = [ freetype fribidi ] ++ optional encaSupport enca ++ optional fontconfigSupport fontconfig - ++ optional harfbuzzSupport harfbuzz; + ++ optional harfbuzzSupport harfbuzz + ++ optional stdenv.isDarwin libiconv; meta = { description = "Portable ASS/SSA subtitle renderer"; From d077506443d56c72c8f3fa9124532643597691df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carles=20Pag=C3=A8s?= Date: Thu, 12 May 2016 09:12:43 +0200 Subject: [PATCH 027/128] assimp: 3.1.1 -> 3.2 --- pkgs/development/libraries/assimp/default.nix | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/assimp/default.nix b/pkgs/development/libraries/assimp/default.nix index 38d7e50bdf8..ef75ad3fe87 100644 --- a/pkgs/development/libraries/assimp/default.nix +++ b/pkgs/development/libraries/assimp/default.nix @@ -1,17 +1,16 @@ -{ stdenv, fetchurl, unzip, cmake, boost, zlib }: +{ stdenv, fetchFromGitHub, unzip, cmake, boost, zlib }: let - major = "3"; - minor = "1"; - revision = "1"; - version = "${major}.${minor}.${revision}"; + version = "3.2"; in stdenv.mkDerivation { name = "assimp-${version}"; - src = fetchurl { - url = "mirror://sourceforge/project/assimp/assimp-${major}.${minor}/assimp-${version}_no_test_models.zip"; - sha256 = "17nyzsqzqpafamhi779f1bkh5mfgj8rpas034x3v9a0hdy3jg66s"; + src = fetchFromGitHub{ + owner = "assimp"; + repo = "assimp"; + rev = "v${version}"; + sha256 = "09fsksbq9a8gykwmw6gaicwh2ladrln1jc1xc5yk7w6x180cbb1x"; }; buildInputs = [ unzip cmake boost zlib ]; From 48d760c650f813dc4419a8d717bc98bd15db2670 Mon Sep 17 00:00:00 2001 From: obadz Date: Thu, 12 May 2016 09:23:13 +0100 Subject: [PATCH 028/128] dosfstools: temporarily revert upgrade that breaks tests See #15394 Revert "dosfstools: Enable compat symlinks" This reverts commit 346482c8d586de299ff8f457d69653917a4d62e2. Revert "dosfstools: 3.0.28 -> 4.0" This reverts commit 135fe56183a2c125a777ce59aa5e78f51f3dfec2. --- pkgs/tools/filesystems/dosfstools/default.nix | 21 ++++++++++--------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/pkgs/tools/filesystems/dosfstools/default.nix b/pkgs/tools/filesystems/dosfstools/default.nix index c2691491ba3..76df4f41257 100644 --- a/pkgs/tools/filesystems/dosfstools/default.nix +++ b/pkgs/tools/filesystems/dosfstools/default.nix @@ -1,21 +1,22 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { name = "dosfstools-${version}"; - version = "4.0"; + version = "3.0.28"; - src = fetchurl { - sha256 = "1bvxbv1w6vhbx0nx7ygp700wq5k2hjv0hm7w0kz1x7amaf4p6dwh"; - url = "https://github.com/dosfstools/dosfstools/releases/download/v${version}/${name}.tar.xz"; + src = fetchFromGitHub { + owner = "dosfstools"; + repo = "dosfstools"; + rev = "v${version}"; + sha256 = "0lqirpxcn8ml0anq8aqmaljfsji9h6mdzz0jrs0yqqfhgg90bkg2"; }; - configureFlags = [ "--enable-compat-symlinks" ]; + makeFlags = "PREFIX=$(out)"; - meta = with stdenv.lib; { + meta = { description = "Utilities for creating and checking FAT and VFAT file systems"; + repositories.git = git://daniel-baumann.ch/git/software/dosfstools.git; homepage = http://www.daniel-baumann.ch/software/dosfstools/; - license = licenses.gpl3Plus; - platforms = platforms.linux; - maintainers = with maintainers; [ nckx ]; + platforms = stdenv.lib.platforms.linux; }; } From a74984d6604c4b22e2cbaf05ec1b2e2421c33a1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=94=D0=B0=D0=BD=D0=B8=D0=BB=D0=BE=20=D0=93=D0=BB=D0=B8?= =?UTF-8?q?=D0=BD=D1=81=D1=8C=D0=BA=D0=B8=D0=B9=20=28Danylo=20Hlynskyi=29?= Date: Thu, 12 May 2016 11:39:12 +0300 Subject: [PATCH 029/128] nixpart-0.4: fix build of multipath-tools dependency (#15359) --- pkgs/tools/filesystems/nixpart/0.4/multipath-tools.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/nixpart/0.4/multipath-tools.nix b/pkgs/tools/filesystems/nixpart/0.4/multipath-tools.nix index b78605504bf..48fa0069d6f 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/multipath-tools.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/multipath-tools.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { sourceRoot = "."; - buildInputs = [ lvm2 libaio readline ]; + buildInputs = [ lvm2 libaio readline gzip ]; preBuild = '' - makeFlagsArray=(GZIP="${gzip}/bin/gzip -9 -c" prefix=$out mandir=$out/share/man/man8 man5dir=$out/share/man/man5 LIB=lib) + makeFlagsArray=(GZIP="-9" prefix=$out mandir=$out/share/man/man8 man5dir=$out/share/man/man5 LIB=lib) substituteInPlace multipath/Makefile --replace /etc $out/etc substituteInPlace kpartx/Makefile --replace /etc $out/etc From 323cd39016cd49a58bd5c8c6ffd80bb8a261a005 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Thu, 12 May 2016 10:10:53 +0100 Subject: [PATCH 030/128] thunderbird: set requiredSystemFeatures to big-parallel --- pkgs/applications/networking/mailreaders/thunderbird/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index cdb52ec8d23..d67bf085481 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -90,6 +90,7 @@ stdenv.mkDerivation rec { ''; enableParallelBuilding = true; + requiredSystemFeatures = [ "big-parallel" ]; buildPhase = "../mozilla/mach build"; From 25e3c091a07374f49ff74d0a69a4515715bff43b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Thu, 12 May 2016 11:02:43 +0100 Subject: [PATCH 031/128] Revert "nixos/nat: Allow nat without an externalInterface" This reverts commit 431a98b12b5e1cc51181da815870dda5e23709f8. Breaks nixos tests: http://hydra.nixos.org/build/35538207 --- nixos/modules/services/networking/nat.nix | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/nixos/modules/services/networking/nat.nix b/nixos/modules/services/networking/nat.nix index f35b0f68e3e..9d163e60d5e 100644 --- a/nixos/modules/services/networking/nat.nix +++ b/nixos/modules/services/networking/nat.nix @@ -12,9 +12,6 @@ let dest = if cfg.externalIP == null then "-j MASQUERADE" else "-j SNAT --to-source ${cfg.externalIP}"; - externalInterfaceFilter = param: - optionalString (cfg.externalInterface != null) "${param} ${cfg.externalInterface}"; - flushNat = '' iptables -w -t nat -D PREROUTING -j nixos-nat-pre 2>/dev/null|| true iptables -w -t nat -F nixos-nat-pre 2>/dev/null || true @@ -39,20 +36,19 @@ let # NAT the marked packets. ${optionalString (cfg.internalInterfaces != []) '' iptables -w -t nat -A nixos-nat-post -m mark --mark 1 \ - ${externalInterfaceFilter "-o"} ${dest} + -o ${cfg.externalInterface} ${dest} ''} # NAT packets coming from the internal IPs. ${concatMapStrings (range: '' iptables -w -t nat -A nixos-nat-post \ - -s '${range}' \! -d '${range}' - ${externalInterfaceFilter "-o"} ${dest} + -s '${range}' -o ${cfg.externalInterface} ${dest} '') cfg.internalIPs} # NAT from external ports to internal ports. ${concatMapStrings (fwd: '' iptables -w -t nat -A nixos-nat-pre \ - ${externalInterfaceFilter "-i"} -p tcp \ + -i ${cfg.externalInterface} -p tcp \ --dport ${builtins.toString fwd.sourcePort} \ -j DNAT --to-destination ${fwd.destination} '') cfg.forwardPorts} @@ -104,8 +100,7 @@ in }; networking.nat.externalInterface = mkOption { - type = types.nullOr types.str; - default = null; + type = types.str; example = "eth1"; description = '' From 11b0972544d6761a56d922af9a48b9e05863d6b2 Mon Sep 17 00:00:00 2001 From: Alexei Robyn Date: Thu, 12 May 2016 15:10:17 +1000 Subject: [PATCH 032/128] teamspeak-server module: Create data directory by leveraging users.users..createHome instead of a preStart script. preStart script is still required to ensure proper creation of logging directory. --- .../services/networking/teamspeak3.nix | 47 +++++++++---------- 1 file changed, 23 insertions(+), 24 deletions(-) diff --git a/nixos/modules/services/networking/teamspeak3.nix b/nixos/modules/services/networking/teamspeak3.nix index b3656d73dec..5f04926eed2 100644 --- a/nixos/modules/services/networking/teamspeak3.nix +++ b/nixos/modules/services/networking/teamspeak3.nix @@ -10,13 +10,12 @@ let in { - + ###### interface options = { services.teamspeak3 = { - enable = mkOption { type = types.bool; default = false; @@ -96,34 +95,32 @@ in ###### implementation - config = mkIf cfg.enable { - - users.extraUsers.teamspeak = - { name = "teamspeak"; + config = mkMerge [ + (mkIf cfg.enable { + users.users.teamspeak = { description = "Teamspeak3 voice communication server daemon"; group = group; uid = config.ids.uids.teamspeak; + home = cfg.dataDir; + createHome = true; }; - users.extraGroups.teamspeak = - { name = "teamspeak"; + users.groups.teamspeak = { gid = config.ids.gids.teamspeak; }; - systemd.services.teamspeak3-server = { - description = "Teamspeak3 voice communication server daemon"; - after = [ "network.target" ]; - wantedBy = [ "multi-user.target" ]; + systemd.services.teamspeak3-server = { + description = "Teamspeak3 voice communication server daemon"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; - preStart = '' - mkdir -p ${cfg.dataDir} - mkdir -p ${cfg.logPath} - chown ${user}:${group} ${cfg.dataDir} - chown ${user}:${group} ${cfg.logPath} - ''; + preStart = '' + mkdir -p ${cfg.logPath} + chown ${user}:${group} ${cfg.logPath} + ''; - serviceConfig = - { ExecStart = '' + serviceConfig = { + ExecStart = '' ${ts3}/bin/ts3server \ dbsqlpath=${ts3}/lib/teamspeak/sql/ logpath=${cfg.logPath} \ voice_ip=${cfg.voiceIP} default_voice_port=${toString cfg.defaultVoicePort} \ @@ -133,10 +130,12 @@ in WorkingDirectory = cfg.dataDir; User = user; Group = group; - PermissionsStartOnly = true; # preStart needs to run with root permissions + PermissionsStartOnly = true; }; }; - - }; - + }) + { + meta.maintainers = with lib.maintainers; [ arobyn ]; + } + ]; } From 4e3566678e93dae323aecdff6e600175600b13c8 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 12 May 2016 14:27:38 +0200 Subject: [PATCH 033/128] pythonPackages.pip: 8.1.1 -> 8.1.2 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e5ec0dd1e8e..5d762a8065c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -15993,12 +15993,12 @@ in modules // { }; pip = buildPythonPackage rec { - version = "8.1.1"; + version = "8.1.2"; name = "pip-${version}"; src = pkgs.fetchurl { url = "mirror://pypi/p/pip/pip-${version}.tar.gz"; - sha256 = "160pa7xg0vybidhszd1n0ik2xah0yz6gsym5hp8k7dmfd83d6y1y"; + sha256 = "0cmpsy9lr9diskkypswm9s8glgr7w3crzh1im4zqlqv7z8zv092d"; }; # pip detects that we already have bootstrapped_pip "installed", so we need From 5d68baa8dbcf8f9970ea0174949cb1dd67c87ae4 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 12 May 2016 14:27:51 +0200 Subject: [PATCH 034/128] Python bootstrapped-pip: 8.1.1 -> 8.1.2 --- pkgs/development/python-modules/bootstrapped-pip/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bootstrapped-pip/default.nix b/pkgs/development/python-modules/bootstrapped-pip/default.nix index dfa5f86944a..a905503b440 100644 --- a/pkgs/development/python-modules/bootstrapped-pip/default.nix +++ b/pkgs/development/python-modules/bootstrapped-pip/default.nix @@ -15,11 +15,11 @@ let }; in stdenv.mkDerivation rec { name = "python-${python.version}-bootstrapped-pip-${version}"; - version = "8.1.1"; + version = "8.1.2"; src = fetchurl { url = "https://pypi.python.org/packages/py2.py3/p/pip/pip-${version}-py2.py3-none-any.whl"; - sha256 = "0p62v87lm595kwmxrnqxc81dr7h6maaxj1y28b00bf9ag11c7fa4"; + sha256 = "18cjrd66mn4a0gwa99zzs89lrb0xn4xmajdzya6zqd7v16cdsr34"; }; unpackPhase = '' From 742e72eded29746086ef11f40fba0908d1550886 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 12 May 2016 14:27:57 +0200 Subject: [PATCH 035/128] pythonPackages.psutil: Drop busybox dependency This broke the build on OS X. And we're not even running the tests anyway. --- pkgs/top-level/python-packages.nix | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5d762a8065c..4414d2602b1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -16471,12 +16471,7 @@ in modules // { # See also the older issue: https://code.google.com/p/psutil/issues/detail?id=434 doCheck = false; - checkPhase = '' - ${python.interpreter} test/test_psutil.py - ''; - - # Test suite needs `free`, therefore we have pkgs.busybox - buildInputs = with self; [ mock pkgs.busybox] ++ optionals stdenv.isDarwin [ pkgs.darwin.IOKit ]; + buildInputs = with self; [ mock ] ++ optionals stdenv.isDarwin [ pkgs.darwin.IOKit ]; meta = { description = "Process and system utilization information interface for python"; From 8c525431c8579fdd6a229ad97ccc9f9e21b662b6 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Thu, 12 May 2016 07:35:14 -0500 Subject: [PATCH 036/128] postiats-utilities: init at 2.0.1 --- .../tools/postiats-utilities/default.nix | 37 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 39 insertions(+) create mode 100644 pkgs/development/tools/postiats-utilities/default.nix diff --git a/pkgs/development/tools/postiats-utilities/default.nix b/pkgs/development/tools/postiats-utilities/default.nix new file mode 100644 index 00000000000..4b6d230becd --- /dev/null +++ b/pkgs/development/tools/postiats-utilities/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchurl, python3, python3Packages }: + +stdenv.mkDerivation { + name = "postiats-utilities-2.0.1"; + src = fetchurl { + url = "https://github.com/Hibou57/PostiATS-Utilities/archive/v2.0.1.tar.gz"; + sha256 = "12jlzqigmaa9m37x0nq5v3gq8v61m73i5kzdnsm06chf0przpaix"; + }; + + meta = with stdenv.lib; { + homepage = "https://github.com/Hibou57/PostiATS-Utilities"; + license = licenses.bsd2; + platforms = platforms.linux; + maintainers = [ maintainers.ttuegel ]; + }; + + buildInputs = [ python3 python3Packages.wrapPython ]; + + phases = "unpackPhase patchPhase installPhase"; + + postPatch = '' + for f in pats-* postiats/*.py; do + sed -i "$f" -e "1 s,python3,python," + done + ''; + + installPhase = '' + libdir="$out/lib/${python3.libPrefix}/site-packages" + mkdir -p "$libdir" + cp -r postiats "$libdir" + + mkdir -p "$out/bin" + install pats-* "$out/bin" + + wrapPythonPrograms + ''; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 19b389a633f..f32e20a3d9e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6287,6 +6287,8 @@ in }); pkgconfigUpstream = lowPrio (pkgconfig.override { vanilla = true; }); + postiats-utilities = callPackage ../development/tools/postiats-utilities {}; + prelink = callPackage ../development/tools/misc/prelink { }; premake3 = callPackage ../development/tools/misc/premake/3.nix { }; From eb4e6b821bd9206720fa56a282e7dc4627741bcc Mon Sep 17 00:00:00 2001 From: taku0 Date: Thu, 12 May 2016 03:39:03 +0900 Subject: [PATCH 037/128] thunderbird-bin: 45.0 -> 45.1.0 --- .../mailreaders/thunderbird-bin/default.nix | 2 +- .../thunderbird-bin/generate_sources.rb | 74 +++--- .../mailreaders/thunderbird-bin/sources.nix | 238 +++++++++--------- 3 files changed, 148 insertions(+), 166 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix index bbb51c7c186..a1d386d1c45 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://download-installer.cdn.mozilla.net/pub/thunderbird/releases/${version}/${source.arch}/${source.locale}/thunderbird-${version}.tar.bz2"; - inherit (source) sha256; + inherit (source) sha512; }; phases = "unpackPhase installPhase"; diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/generate_sources.rb b/pkgs/applications/networking/mailreaders/thunderbird-bin/generate_sources.rb index 1bf623a4b77..07374a827f2 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/generate_sources.rb +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/generate_sources.rb @@ -1,61 +1,43 @@ -version = if ARGV.empty? - "latest" - else - ARGV[0] - end +require "open-uri" -base_path = "archive.mozilla.org/pub/thunderbird/releases" +version = + if ARGV.empty? + $stderr.puts("Usage: ruby generate_sources.rb > sources.nix") + exit(-1) + else + ARGV[0] + end + +base_path = "http://archive.mozilla.org/pub/thunderbird/releases" + +Source = Struct.new(:hash, :arch, :locale, :filename) + +sources = open("#{base_path}/#{version}/SHA512SUMS") do |input| + input.readlines +end.select do |line| + /\/thunderbird-.*\.tar\.bz2$/ === line && !(/source/ === line) +end.map do |line| + hash, name = line.chomp.split(/ +/) + Source.new(hash, *(name.split("/"))) +end.sort_by do |source| + [source.locale, source.arch] +end arches = ["linux-i686", "linux-x86_64"] -arches.each do |arch| - system("wget", "--recursive", "--continue", "--no-parent", "--reject-regex", ".*\\?.*", "--reject", "xpi", "http://#{base_path}/#{version}/#{arch}/") -end - -locales = Dir.glob("#{base_path}/#{version}/#{arches[0]}/*").map do |path| - File.basename(path) -end.sort - -locales.delete("index.html") -locales.delete("xpi") - -# real version number, e.g. "30.0" instead of "latest". -real_version = Dir.glob("#{base_path}/#{version}/#{arches[0]}/#{locales[0]}/thunderbird-*")[0].match(/thunderbird-([0-9.]*)/)[1][0..-2] - -locale_arch_path_tuples = locales.flat_map do |locale| - arches.map do |arch| - path = Dir.glob("#{base_path}/#{version}/#{arch}/#{locale}/thunderbird-*")[0] - - [locale, arch, path] - end -end - -paths = locale_arch_path_tuples.map do |tuple| tuple[2] end - -hashes = IO.popen(["sha256sum", "--binary", *paths]) do |input| - input.each_line.map do |line| - $stderr.puts(line) - - line.match(/^[0-9a-f]*/)[0] - end -end - - puts(<<"EOH") # This file is generated from generate_sources.rb. DO NOT EDIT. -# Execute the following command in a temporary directory to update the file. +# Execute the following command to update the file. # -# ruby generate_sources.rb > sources.nix +# ruby generate_sources.rb 45.1.0 > sources.nix { - version = "#{real_version}"; + version = "#{version}"; sources = [ EOH -locale_arch_path_tuples.zip(hashes) do |tuple, hash| - locale, arch, path = tuple - - puts(%Q| { locale = "#{locale}"; arch = "#{arch}"; sha256 = "#{hash}"; }|) +sources.each do |source| + puts(%Q| { locale = "#{source.locale}"; arch = "#{source.arch}"; sha512 = "#{source.hash}"; }|) end puts(<<'EOF') diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix index 936481472a9..20cedee8ef3 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix @@ -1,126 +1,126 @@ # This file is generated from generate_sources.rb. DO NOT EDIT. -# Execute the following command in a temporary directory to update the file. +# Execute the following command to update the file. # -# ruby generate_sources.rb > sources.nix +# ruby generate_sources.rb 45.1.0 > sources.nix { - version = "45.0"; + version = "45.1.0"; sources = [ - { locale = "ar"; arch = "linux-i686"; sha256 = "1edc09feab9b25f333f192c07b33e0f4b3ee093145d32f4eca4e93003a396ce4"; } - { locale = "ar"; arch = "linux-x86_64"; sha256 = "0681fca92f04ae1c4b3a306756f050f128b0534ee93ca6bc7fa0b5d5272a3bf3"; } - { locale = "ast"; arch = "linux-i686"; sha256 = "f16600e6cfa49a99c6a827231e1411fefb6a0c83f9cfc44e862b3a97f7c778fc"; } - { locale = "ast"; arch = "linux-x86_64"; sha256 = "9c37be63be7dc3f338af3326d5917592096b94df2423d1dc81daea4e31cd8658"; } - { locale = "be"; arch = "linux-i686"; sha256 = "1779ec20a630b02543f51eb735f33e1b920061e328a8c0966209096f47051a18"; } - { locale = "be"; arch = "linux-x86_64"; sha256 = "826d926a96ec9e8d5b46ed4649ac67ebe1a67db1eb746ee5e37b1fdf0f09ddb0"; } - { locale = "bg"; arch = "linux-i686"; sha256 = "aa6d3070ffebb5fe9f9205cab6c6bb3b57033e5d6acbafc45ca3fc89fa35f849"; } - { locale = "bg"; arch = "linux-x86_64"; sha256 = "e21460bf056e8b1fe683a11b688307580a13b51db03ffb235dc32c6e50ce8ac7"; } - { locale = "bn-BD"; arch = "linux-i686"; sha256 = "77d6dd2686b8bd5962c70a8ea09c10cbc0f60a0c7effdf00ac346bca9b6af313"; } - { locale = "bn-BD"; arch = "linux-x86_64"; sha256 = "a417f6bcd228afa2be0c71206af9f06841a8dc29950a8975e6455af215911e1f"; } - { locale = "br"; arch = "linux-i686"; sha256 = "920c81326f5f33e1e1a3a4229d0544360aa9f7bbe5eb32db3ea30dc34764e515"; } - { locale = "br"; arch = "linux-x86_64"; sha256 = "be967c23e45a06532dd8a2611a31bc842ff79c6da6b63444bd9f6a3db7f834a2"; } - { locale = "ca"; arch = "linux-i686"; sha256 = "98d88b01ed35dbbaf5b06418a26018c86d6b07f9ce9fe999b007ce6844e3832c"; } - { locale = "ca"; arch = "linux-x86_64"; sha256 = "616a724f6a0a1493c321a83c274895ba7234977f2d7ab264d44dda39d34dddaf"; } - { locale = "cs"; arch = "linux-i686"; sha256 = "ebebf6d26d900103851e1f8ccc5cb26506902a996a5c92674f165c79ad090fde"; } - { locale = "cs"; arch = "linux-x86_64"; sha256 = "43b1a4ad27868b968112c86893465d8c765d383a9653b64dc27609644b7c4bfc"; } - { locale = "cy"; arch = "linux-i686"; sha256 = "52b7a40c87adac16d77e9a03827c0db49286f1576ead85c6a5bff3b8ab33d546"; } - { locale = "cy"; arch = "linux-x86_64"; sha256 = "2c413971b22bafac67729e6f5967513f4dabbff441cad4aecaa3fa363aed807a"; } - { locale = "da"; arch = "linux-i686"; sha256 = "aab8b9b66d9b80c94ff9b26102cec7cb9ff9c7dc859f4606bba8d48d47ebebf4"; } - { locale = "da"; arch = "linux-x86_64"; sha256 = "24daf3a574619b2be424b4f5bbda732b500bd6ea5eff6e3b858dfe4bb0b2cfa1"; } - { locale = "de"; arch = "linux-i686"; sha256 = "385860c48089394ba0bd939cc60506c62f9d4b54903ee3c0e04006e6af619408"; } - { locale = "de"; arch = "linux-x86_64"; sha256 = "e0e61f60915f7562151e47e3458830aa1323519ce76cbd9638559ec177da1093"; } - { locale = "dsb"; arch = "linux-i686"; sha256 = "e2a19f5fc03bb3ea1a97ed501540b42fea923033592b0790aa4bcd93ff619421"; } - { locale = "dsb"; arch = "linux-x86_64"; sha256 = "95fa2341481aa869ef1d417c617ccbe54cc0f57ac0b4cb7266c6399887e1f04a"; } - { locale = "el"; arch = "linux-i686"; sha256 = "3dc35863b9aea5cfdb28ecd71ad798eee711c859d27acb46fb2294861ba713d7"; } - { locale = "el"; arch = "linux-x86_64"; sha256 = "546a4cf57c52ef054c2c58b9792b5b8ed0933368d8f4343f78604328c4117d42"; } - { locale = "en-GB"; arch = "linux-i686"; sha256 = "74194c95fba578feec4ac92569be45a9b948a4ae403d62bce5e11f5047ebbf11"; } - { locale = "en-GB"; arch = "linux-x86_64"; sha256 = "9da80fa8d1c96e08c2338c77c67548e4a16e151c8ebddfb28da779f1bfeabefe"; } - { locale = "en-US"; arch = "linux-i686"; sha256 = "c4e1d0a902ab04db666ac90cf1003f8b48ed88e3291fbbf1d6b2606e805a45b0"; } - { locale = "en-US"; arch = "linux-x86_64"; sha256 = "843ce88b796c4705c61ab5a68a215fc82c2ee32e655c2c4d0dd244e97ae0705d"; } - { locale = "es-AR"; arch = "linux-i686"; sha256 = "4fe05cbcf9b1d5aee936c29f19675c1d9658630cfe0c68570244ac57a5e8612e"; } - { locale = "es-AR"; arch = "linux-x86_64"; sha256 = "0c3b83406c1b38249e52e0c8f17389e9861cfd5578a15a66c9bad89784d21b31"; } - { locale = "es-ES"; arch = "linux-i686"; sha256 = "937a41e69189e50ac893d06abcd5ab032281f0531a2cb5acbd60bfdd4fff6a75"; } - { locale = "es-ES"; arch = "linux-x86_64"; sha256 = "3d58ed89c2dd316fdbcf218666ca837b5200dc35462a89f41e8a83c4eb7620fa"; } - { locale = "et"; arch = "linux-i686"; sha256 = "46e211a049ca3e3e986db7620b087a4ec41b73b1f4051aece68881c73b342bf7"; } - { locale = "et"; arch = "linux-x86_64"; sha256 = "69c968a92241703e4cc71e905b35a74e4326f6b8e32cad84dbeb3ea1b802c7a1"; } - { locale = "eu"; arch = "linux-i686"; sha256 = "dc638be813979a640e12f1fc4bed727ce639bc8d50b1b1d084e8733a067155ef"; } - { locale = "eu"; arch = "linux-x86_64"; sha256 = "26362027c5e5b3d69ebaecbed10c300d232dd3ccdbf96e113f720518584f5c03"; } - { locale = "fi"; arch = "linux-i686"; sha256 = "947481357bacb8a91b0a49956007e8ffaf0575815d5dcff0750f4cb2890f9e22"; } - { locale = "fi"; arch = "linux-x86_64"; sha256 = "35716446800a69a71aaf6f91e8bab850f8f681e6acaa6f36429f71a2bdd0e04a"; } - { locale = "fr"; arch = "linux-i686"; sha256 = "27aeb7724e1d76d1d81bf583b94580d3745177b1983b63e4dd88ec6ae204ba13"; } - { locale = "fr"; arch = "linux-x86_64"; sha256 = "482aba9f35f2026e4b9dfb009f45925f87a71a21c9338fd27a52ca1113d9759e"; } - { locale = "fy-NL"; arch = "linux-i686"; sha256 = "7adb9045525b10914173092731ed3a4194e68b3b3661a83b008e8cb651518b0c"; } - { locale = "fy-NL"; arch = "linux-x86_64"; sha256 = "4177e0f51a0877633cde98bc0d81a8f6391c6a87932546dfc094deea30ea5190"; } - { locale = "ga-IE"; arch = "linux-i686"; sha256 = "c77fd8481fe999f3e0b63952137762947c58a397be82027755bbe2aa8bee9c8a"; } - { locale = "ga-IE"; arch = "linux-x86_64"; sha256 = "39c2da28763cccabf86c6713bc62862edd37605c117d9c197cdeaabbb1cab31d"; } - { locale = "gd"; arch = "linux-i686"; sha256 = "2be49f3b06a46ed89687de23459c42052b7a50814d32127121007c620fc56f8a"; } - { locale = "gd"; arch = "linux-x86_64"; sha256 = "e0f9d78a12263fe8b8d40332bcc52a7c8db374c655564394e4ed850cf4567593"; } - { locale = "gl"; arch = "linux-i686"; sha256 = "2f66892cf58b1aa63a748b9be966fbd07077a369a46ee4e4d241be37abfe083d"; } - { locale = "gl"; arch = "linux-x86_64"; sha256 = "235b01ed0a702de629a61ee0a69ff4564fe479782d85c95a69fc121e5bf96df1"; } - { locale = "he"; arch = "linux-i686"; sha256 = "5a3486d56950a6b14dcacf8cb40a55a7d2024c2838c52f77acc745fcbba6863e"; } - { locale = "he"; arch = "linux-x86_64"; sha256 = "fae68a673712cb7929baf4e54358c851846901d519359ab53b270cfd215ecc5c"; } - { locale = "hr"; arch = "linux-i686"; sha256 = "e2044cda9fd387af1368115a47e56c5a81d2f9fbf9135dc7b5441b88ac5bda1d"; } - { locale = "hr"; arch = "linux-x86_64"; sha256 = "7205a8f3b20a5a1a7af08860a99d2be2d4ec78873f7e0cb579040285c3ef85f8"; } - { locale = "hsb"; arch = "linux-i686"; sha256 = "a2357944e25f3d1434d33cade62d079b0dee878c8f6d1aa2d3cae94500dce14a"; } - { locale = "hsb"; arch = "linux-x86_64"; sha256 = "3bb4658ecd2bce8d2204859cf95f8a85f90c6eb6f15e44ac50c1824aaa884da3"; } - { locale = "hu"; arch = "linux-i686"; sha256 = "31da7a7cde19de47455b6cd855ed0e77efaa30e76989a26df71bce73134e384e"; } - { locale = "hu"; arch = "linux-x86_64"; sha256 = "4703c48e899d36eb8d6aeb0f1d0101bf39f12c921716b7aaf041068b42046dfb"; } - { locale = "hy-AM"; arch = "linux-i686"; sha256 = "bec4ef424007894fe85a06cf8af03da2bc48c7d68e6ecde3287a6863408e6392"; } - { locale = "hy-AM"; arch = "linux-x86_64"; sha256 = "028bd4d92f502c4b4b0af52f5d992abfdf4d988974d8b991194284aa5ccb25b3"; } - { locale = "id"; arch = "linux-i686"; sha256 = "5718068cd54ecb06e0ce7a4ddc87b923b76d7341a989a946717e2b34b1b49a0e"; } - { locale = "id"; arch = "linux-x86_64"; sha256 = "112928c75789795e21050b8202d49b50fdb3b10f21c3d2c140e9cbd7ba96bafe"; } - { locale = "is"; arch = "linux-i686"; sha256 = "4bd5abdb8fb9c389601b9e6c8fcd18e53e8c24097ee338199ee12b03f580faff"; } - { locale = "is"; arch = "linux-x86_64"; sha256 = "e4ee538f072398ae16c70ebcd32e06129b2d94a88104710a2b165af1b1da8541"; } - { locale = "it"; arch = "linux-i686"; sha256 = "2269ea4101db9f9bb961d79fa30ecece49178a747cb10fb5f90f09d14dcbacd6"; } - { locale = "it"; arch = "linux-x86_64"; sha256 = "04cef93ee74ff13d6ddc9cfe60440d128bc8b432be62d988094d73461138cff1"; } - { locale = "ja"; arch = "linux-i686"; sha256 = "762e6c0879c0983dc059f3b4550681d947b0ceb2dd82331a587463d881c7fb65"; } - { locale = "ja"; arch = "linux-x86_64"; sha256 = "90748465b87b0bffcf70e7c6d83d2f6ce7873b751a5c1dc2d63d18cc60a8c25a"; } - { locale = "ko"; arch = "linux-i686"; sha256 = "ce867efb9452465ae1f6ab0eebbe06721c3987614b42c901a12e43ce3e5a6ad5"; } - { locale = "ko"; arch = "linux-x86_64"; sha256 = "9aab21893818eb86a7da148650873c4e6e1faa047d35e1ff6845001d4eabb2d4"; } - { locale = "lt"; arch = "linux-i686"; sha256 = "3f8fec266c7e612183ea1d60e44f90c8f5c713b2af0038ca10fef9964662c0a9"; } - { locale = "lt"; arch = "linux-x86_64"; sha256 = "f7efb6a495e57439c287ed8cdeacbdff6980ff89493497ab384a3c3c33fccaea"; } - { locale = "nb-NO"; arch = "linux-i686"; sha256 = "02b0002e52a7e1c91a4f200ece1c9e1b133b7d50688e483c041cdf57ef7d8a06"; } - { locale = "nb-NO"; arch = "linux-x86_64"; sha256 = "d4d6f125a9af64ad1967e414cb4f5d7a4cdc636c805f9790bf1c79573900aeef"; } - { locale = "nl"; arch = "linux-i686"; sha256 = "16b9e1d15b64b7d44ba3f2e39aa5a772a6d26ec347170b86c6455f4591bae22b"; } - { locale = "nl"; arch = "linux-x86_64"; sha256 = "0d8b130e681ca5a2ebd7b2f032b5779eb148540d7802097df8430f6cf095a5f8"; } - { locale = "nn-NO"; arch = "linux-i686"; sha256 = "37d08bbf72c34ee677dd0fe39016f75a13e5e078ce23236b742a0de2131421dd"; } - { locale = "nn-NO"; arch = "linux-x86_64"; sha256 = "c76e50a850ef98f07e030564fa8ec7411ca31aa128e8b6393227e40c91b47938"; } - { locale = "pa-IN"; arch = "linux-i686"; sha256 = "3aef7a6aef6d05c17f757603c81f2f550c0681b3f3ae38abd02d8224c10754c0"; } - { locale = "pa-IN"; arch = "linux-x86_64"; sha256 = "b5434c9a814f6ece725ef1bf7f47381fe7b56e2c1c05832a75e95152b8706725"; } - { locale = "pl"; arch = "linux-i686"; sha256 = "215845fbfd3e76c73861b59324df380b794413b25efd1189975589bc843b9d28"; } - { locale = "pl"; arch = "linux-x86_64"; sha256 = "0f07a3c7f6518dbe056814e0ab257036ffabd3770bebdf2ccd053eaee499654c"; } - { locale = "pt-BR"; arch = "linux-i686"; sha256 = "28f668d318a441cd57c9e85dda1de98502a545933b7af2a3d2aef066952a3eb9"; } - { locale = "pt-BR"; arch = "linux-x86_64"; sha256 = "eae9dee3c5677e40ec3ce0c6594937671ae07be49b8488abbe94d1ba52bd3f16"; } - { locale = "pt-PT"; arch = "linux-i686"; sha256 = "36d9ae4720d5e673c02e2fe850f3e66786b853f1e5e81368e3e62715b612cc57"; } - { locale = "pt-PT"; arch = "linux-x86_64"; sha256 = "bb5156054e96d515bac61cf942560d73166c27f052abf05344d81544b3d09938"; } - { locale = "rm"; arch = "linux-i686"; sha256 = "79322d60677bfeb493f0ebc64d336201ff75f34af6131a8fda742518c45c7cc0"; } - { locale = "rm"; arch = "linux-x86_64"; sha256 = "7544877e762913619dda73a3ebbc48d81aa2519a014284b79d7fdb65de678f20"; } - { locale = "ro"; arch = "linux-i686"; sha256 = "d1ab21feb037542faf032668ba6875157775f5efa95b3c1a8a31cc0fc8ea0a40"; } - { locale = "ro"; arch = "linux-x86_64"; sha256 = "8f2ef95bd7d82086dd8369e2ec144348d085527cab8e89b33d938c93103c4e15"; } - { locale = "ru"; arch = "linux-i686"; sha256 = "99390a8350cdf26c69203670458fbc7b6700797a55fa37f498148dca0fbca7b7"; } - { locale = "ru"; arch = "linux-x86_64"; sha256 = "6a52e3d8db23fd0c1e091f1b90dc80603cd8ce345d488228f3b595f1b707bb60"; } - { locale = "si"; arch = "linux-i686"; sha256 = "15e8ca12df3192e174f2787aca1d4a5b992ca2f45525a5d2f06683b2e8864bd3"; } - { locale = "si"; arch = "linux-x86_64"; sha256 = "6b7d66bbe8cb6ed0c4a1f44a3885d5c7e4a5db79a1db98530a099e6bb7a417bc"; } - { locale = "sk"; arch = "linux-i686"; sha256 = "4ce5be3d7455c72ec7c6ecb56824220ab74712b1c4ee27212010cb8e12959edb"; } - { locale = "sk"; arch = "linux-x86_64"; sha256 = "1a3911a18156a2dce9417c84bff20b7f41b8e5f5e2a578ffe33b26db0b4bcb30"; } - { locale = "sl"; arch = "linux-i686"; sha256 = "a43200e303054b34c4e4e7c81f561a8c1d33c122af61e23b89b3a8cb8c0d26d5"; } - { locale = "sl"; arch = "linux-x86_64"; sha256 = "f7e456499b7acf5e8eae4d04abcf43210f00bab8b4b7f42e047f2ee13473f3f6"; } - { locale = "sq"; arch = "linux-i686"; sha256 = "9a444b55077da2817c72538c72f53e6ff945e4f88ba6c222e2676de21bae2435"; } - { locale = "sq"; arch = "linux-x86_64"; sha256 = "96eb242e79a7155fe85dcd7eb1b1606f9d84c72aebffed2244cb149d7d77740f"; } - { locale = "sr"; arch = "linux-i686"; sha256 = "79c98c7d34b327b596f0a3e417508d5bbe77fd61b761995635559cc5f88d85e7"; } - { locale = "sr"; arch = "linux-x86_64"; sha256 = "0041421d294f06d993dd4184b66f6fa6c58244b231a64da1b20dd76b5becb4b4"; } - { locale = "sv-SE"; arch = "linux-i686"; sha256 = "a17ab2cc74b4c9367c21a176eb1cd83fce74bea24996b4987644659f9ef0bc68"; } - { locale = "sv-SE"; arch = "linux-x86_64"; sha256 = "0fd181a6d7425db8f0077175b8905f3a646af081a9db1a2b635f8c95c99e01b2"; } - { locale = "ta-LK"; arch = "linux-i686"; sha256 = "34eca4b0d4d808b280045381def6976106e3e78c43d901bc512b9aea83537876"; } - { locale = "ta-LK"; arch = "linux-x86_64"; sha256 = "4633828b594d330c252b5e4931e85f98797ec2aa17400e546dea7a4099bfe543"; } - { locale = "tr"; arch = "linux-i686"; sha256 = "b8584087e44d967ec5badeee5d9ac86653709f858e65b4356e0fa8d3ea5e3369"; } - { locale = "tr"; arch = "linux-x86_64"; sha256 = "dda18542ba3f27cf0b2a1499121c43dc5c085ada40cd825dad119135a1fd4385"; } - { locale = "uk"; arch = "linux-i686"; sha256 = "5cb1e2fdbf857f93851ee1b1aa3ad00c538def17641f14742b446414706f74c1"; } - { locale = "uk"; arch = "linux-x86_64"; sha256 = "84dc247e8a46f0ff1b5bd7f25956e0988edab18e72649b7d4c264b6160a47de2"; } - { locale = "vi"; arch = "linux-i686"; sha256 = "a38fde2cbdb45552950db906b19eed3135e930da8242791811683bb2fb850fb4"; } - { locale = "vi"; arch = "linux-x86_64"; sha256 = "5eff491a6d6ec1b54788beb300f61fbd98be72037a769054967af7a062afec61"; } - { locale = "zh-CN"; arch = "linux-i686"; sha256 = "c4644e65f6d1a1cb710806026814c416268453b571531e87d71800deb3625128"; } - { locale = "zh-CN"; arch = "linux-x86_64"; sha256 = "dd8d802b34d76ccdeb569b86aec75f27d29c23b6c74ce6d5bfb0a5239ee581af"; } - { locale = "zh-TW"; arch = "linux-i686"; sha256 = "1a9e7322512caa10247f58674fbbf55d5a624ef36a9d570d8ebdb6e1c5c6889a"; } - { locale = "zh-TW"; arch = "linux-x86_64"; sha256 = "a84310a24bfe845e9c3992fe5441e9cbc049054fdc53f659dbea997ae17e937f"; } + { locale = "ar"; arch = "linux-i686"; sha512 = "f07bdaa53396e4135585f513d79668ebc47e2ea6008724b25ea8b20e6421f9951018ce4f3f0cef3b4318b9a2dc5d7835c310f90599245ab6182a8aff67e31824"; } + { locale = "ar"; arch = "linux-x86_64"; sha512 = "b7e21034dcb85cd0c8fe5faf99db1fc939d058dc49e229bf8e5886ca39bb940ffa79ef6255a408703a99506b724664b1a39c3c38dd7df5b87a138e23799bd923"; } + { locale = "ast"; arch = "linux-i686"; sha512 = "c6c38930e02fe3c52c5da390b24655441f3470b04ac6b2d12e23d7a6ee880d68b80c3c18c1d1c62f662677cf78a25f5f5aab02975b05b46771ed057e4ed61ead"; } + { locale = "ast"; arch = "linux-x86_64"; sha512 = "3a2b26610231115c3e974ee1474632647ad1eb6b9611c9eeaef253fc94adcdd312d108bb6add23e45e64b7f46c073b853c3b07919bc8124c82509f52c8a6afe7"; } + { locale = "be"; arch = "linux-i686"; sha512 = "a8569095bec1c87af03739665bd47878e9b762e6dc993f3d25f77f0d8eae98d9b074492521e54470b16d37232d49665eed5a64c7fa640f2e9c7c609327d215d3"; } + { locale = "be"; arch = "linux-x86_64"; sha512 = "2ad4c5e61200368234ff55cf7c1a524f7579c4f585834770b761172ec59aa213c2b2e368fa78399a5384c24500ba98cc8a41546417ef1a09562ed836ff6d4dd9"; } + { locale = "bg"; arch = "linux-i686"; sha512 = "523f1c502d76aaa328508a8c6679715104b459b51231d6e24d59f299523808161ca81a1198d6a55587d688296b194f4983ebfca2f266a8aad2440ec79a4be096"; } + { locale = "bg"; arch = "linux-x86_64"; sha512 = "e65d7253a75b0296139766cf8215cb900aa0e29beeebd1ca0229773a19ff0e2083fd82133d404214c3af200123137b95ec2b887e3d2c5d9a295ecd79087558bd"; } + { locale = "bn-BD"; arch = "linux-i686"; sha512 = "12d895ece57a2add45ffa82a8ad332c377ae8a091972f9f8824ddaee6f9b859ab4bfeacddb0b861296b1b4b913767826997cc5e0147788eae78dea1833255a94"; } + { locale = "bn-BD"; arch = "linux-x86_64"; sha512 = "09979e0ca185cf59d8aa135382cda296a0c635620e9bb77eb61c6ecdd06ba424334ef21d7208715f75b4f421b19dadcaa68942adf6a827a991930baa71b1074b"; } + { locale = "br"; arch = "linux-i686"; sha512 = "48c9881b5e452e30848bb9b4a2d0fd1a2b25e42a962acdaa79c3af1fdca7382dee9a8560fd78e84a4147af4681ee2f1c6c369a5854f7a82404cf6c78079420b7"; } + { locale = "br"; arch = "linux-x86_64"; sha512 = "49bb2fb147312d431c3f6184a499366f7059524b126b4233f3195651675401628ebfcb3f2bea33edd5e0d7eafd8f64fc54528e48e46cc9874c5e8c8924d1b8fb"; } + { locale = "ca"; arch = "linux-i686"; sha512 = "954785700f3ec5abd4700203f653023277a1c866f9acc703f501d5de5f9f0b600b8b8e634c1d7b2ed5b5892e8c92d750e192b630d3f21ba8d4477794f0a3791e"; } + { locale = "ca"; arch = "linux-x86_64"; sha512 = "93eaa656195dc2e69646f6127511725fb805b99509ab53561c58b23bf272a51e0effd674c59a414003e3d106aea06277baef280a06b7cb2678a1332e79ab65b1"; } + { locale = "cs"; arch = "linux-i686"; sha512 = "d7fd9f68e9db4e8b194110399537d584b1c3dfb27af26f0151070edbc716ef15172d4d3b4668d324b152689cd7f1048c27582705a03e903e3cad97686a5b46c6"; } + { locale = "cs"; arch = "linux-x86_64"; sha512 = "7bb0c4f17ee2672b61d364da90fad387d5ebdd44f3e6e89d3b0db0e00c8165aa02b60d33c74a2eb7e4752334327c71bbff9162a9f4e35d3c7480b454fe770772"; } + { locale = "cy"; arch = "linux-i686"; sha512 = "7290bde6396f6c44c92ee4494ab039e3d91fc9ebb3636fa0f4fd083fd92e8e68e0f6f4e327f4ccaa12fded1c3ea9af703f99c01e11c380385f97aff1c61ebd2d"; } + { locale = "cy"; arch = "linux-x86_64"; sha512 = "239a310abba653b649b37470741cba5bd151f9783ca1f536cba27bddbd9d42e49798d592cb08ad132d2e126d5710e3cd83c8da5b7216e2020ec6040d6b0fddf5"; } + { locale = "da"; arch = "linux-i686"; sha512 = "f9d778b8724181495df36e65841fea9b6aada84b754ed0405e988c617f27ff9250dbe23a2f7ce9b44418e4260d2b16c2b15fe4ad4a925b0d862c3451da789176"; } + { locale = "da"; arch = "linux-x86_64"; sha512 = "17a3c221f55be21bf58c6b47471e3fb4d1415f8fd2ddcd4301115c6771b7a837b4c50d9b054bee02cc25a96961ca0b55aff952b1ed1890ef120b6b84711aed36"; } + { locale = "de"; arch = "linux-i686"; sha512 = "cc63b30bef02a96bfbdd0f36c18ea2e142ed7285880e6d28e41726067e55b53adf3a863deea98397d0b1e3dec0237d0911f4ba86860841a5147522d0b269cea6"; } + { locale = "de"; arch = "linux-x86_64"; sha512 = "4a6c4e48278b6a95cd91b71027cb2dd8e44d1904c287e36ca85ebae80dbf526ae58de359c759f0e8878f36e7c8e22d66ec3a1bc16f583d6619d3519de0bd27fa"; } + { locale = "dsb"; arch = "linux-i686"; sha512 = "a7bbc58a4c8d60f74308fdda9ce431ff11b12e1b7e5059649b7636e6547dc84f43b0a3f96f59a80e3aef3a2c13435431dd62a3932489f0dc1ff5b58d8e0fabd2"; } + { locale = "dsb"; arch = "linux-x86_64"; sha512 = "f472bd612938d16d708eb62b9f472b37e5694bc5d54270515a5b37e29986bfae7081d628950cff6599fade83e50039b1d6c9d1f23932591c80f4645dd6f3b4ec"; } + { locale = "el"; arch = "linux-i686"; sha512 = "401837b5cc0ddc491a034c78c1b71f8d4ccd96ebf3f11eb99919b3c20d0c3a31b48e61599794f826f91273fbe2545465743c6ca4bb48d4b2bbe57dcabcc9725c"; } + { locale = "el"; arch = "linux-x86_64"; sha512 = "d69b96264e6d56235dc8f2217ac8192d531fe5ab97fad58a35948ded8fbd9d37e68687516a862a81b87f8ae27487f1c288866b93e6ab5e9182272f6b261eb508"; } + { locale = "en-GB"; arch = "linux-i686"; sha512 = "de081ed39200214b27fe249498c6f5a3381f35a2fbd74816e45dc5403239c3a3a9218b9de05ac6b970b2e7479e96e86eed45591594a723833e7fd8b535efaae6"; } + { locale = "en-GB"; arch = "linux-x86_64"; sha512 = "4acbbbac6ed26b76b93b2ba469f12498840dd5f9f5a49e2b7002dd57abd984f3bbecf9e0af89f2684da13326ba994d7ae69e1333162c65429a1c47692c542101"; } + { locale = "en-US"; arch = "linux-i686"; sha512 = "e30f11ffbf7ade1e46923a52bccbbfc3722229d15a323cd5f812f1287004f7d2f09a688c29205de3baa06c9314bed892747ed8a6a15eacd36fb1b8494b78965b"; } + { locale = "en-US"; arch = "linux-x86_64"; sha512 = "53dc9169aeb45fde1bf96897dc49e113a24bf851cf19b9d428d4362856267a4974dd06c1ffaebc1b0a4db120175677dd3867dcff66be98c2aa4815f89910f5a7"; } + { locale = "es-AR"; arch = "linux-i686"; sha512 = "3e1ace4acda96fc6997fa8b10b2c1926105bdaebbbda3341fa5c3c87d3e88400b436c8ba09eaf4ed5fc100440fffbfbddb0ceea19986bffb33291a5d1ac52737"; } + { locale = "es-AR"; arch = "linux-x86_64"; sha512 = "f000230d1cf00a1423bd441a93dcb4c384ea6a0071f15910c2cd814f65181022951e1eea6bb1179c4315c861a01caff137bb846edb65b5d4fbf6642fa7849dd1"; } + { locale = "es-ES"; arch = "linux-i686"; sha512 = "34948a7e78f7d8a0830397977ff13b1c76032eb7d909903f2ea1d4579082db9cf1e91ae804082af189b03ba89fa283a1392380b8c4e45956ef339c64da546681"; } + { locale = "es-ES"; arch = "linux-x86_64"; sha512 = "d0204eb82b8c8a80e5d3bc82ca9a8e9c25c6e0d8dbb7da9a43f25a10088a819b4c8695c88528b1ebd76328eab23da474ec2e539c31b6947b282602a593f75c1d"; } + { locale = "et"; arch = "linux-i686"; sha512 = "41484b954518e5f75dd8fc21ffd803f1a7f3e8dae0a35df98f0c9fac8e3cde11dd085f026536c752c1c34d9c8d11b55eb9b55fbbec57e36b65806608ad24b471"; } + { locale = "et"; arch = "linux-x86_64"; sha512 = "79a38b25ee9e465cfba965b6451aed749e5aecd2c8c62741d0caa4918a1c1c3cde8b3c7aa905dc205e8d3a8bffc6a795faece4da9017d2bc48064aaee641c909"; } + { locale = "eu"; arch = "linux-i686"; sha512 = "d7b370fa6f36cb218f8cbab7be9c42ecefa9ee4b6760bb2097f9bbf337a3c6a5ae9cf2051abc97a7ed5b7de14685252288d07af3ee0c25d5b371aa638944e3e4"; } + { locale = "eu"; arch = "linux-x86_64"; sha512 = "3efe13a25a3f72441001bc04054009536b98a852e29dd8b012c0014c990db1078f0e95266d3b6c0c4b8edcd1928ae32f557ef82ccbd1a9545b2a6111254ae04f"; } + { locale = "fi"; arch = "linux-i686"; sha512 = "7599bad72c5536e41d23ebac041389dbd868af9e6180655b67eb402df80c47ed454e26c982666056444f6813250d824cab913319ccfeb50645278f46ca88284e"; } + { locale = "fi"; arch = "linux-x86_64"; sha512 = "77a5adfc44a95f358a6c376ccb49b2ff526b164be92f190000698e97b5391a38b026e2923010c41cdda6c5c8d21e25710c92cff84a7e7a23cb8e9cf845d1c8a8"; } + { locale = "fr"; arch = "linux-i686"; sha512 = "b14e26ba3a2f729e4a3014220578ef4aba28bc6064a19afbaf622c1bc4f52b05245d0b689f7e62e1d46e5dde4732a255032ca94587f5d1eb9986c5313d8849ea"; } + { locale = "fr"; arch = "linux-x86_64"; sha512 = "4d2644b8fe269d4698cb5655dd76bde4162be36682403a803995f3a47adc7da53ddd2c70553228e1564cc1c99dc1ef408002ca17e55de358e4cf8afc966a9c57"; } + { locale = "fy-NL"; arch = "linux-i686"; sha512 = "94e31d2828dec13e6fe454a88515de3254c7f646bda3589f362367c35963043c8e97f5562727032af8228dff6fb59d1d5590a9128e686777708895d7030b1117"; } + { locale = "fy-NL"; arch = "linux-x86_64"; sha512 = "4b42d9e722e4f1e1e99f23bb6cf7650711deab5ed18ac49c3f4b6b7829d4e201990f8065ef65e01345772bb5c6ff3b9231430713e14e3bb5a032b52398782e46"; } + { locale = "ga-IE"; arch = "linux-i686"; sha512 = "3d44f51dc1e770bfeec3dd8f55e346cfc5b272430ecc4034704ac71e7c63bc6c9c5b907edcdefec0c4d98be94265f444cc067ff7ee6851031edae56a931ea898"; } + { locale = "ga-IE"; arch = "linux-x86_64"; sha512 = "51d849d608697b1c2c2b8fd2da90d8c5777ec90fa0aad9bb99e660bf69819576fb97a235512b710b41a76f96e07b9d4676a31583012d78341fcafef9cee7de9c"; } + { locale = "gd"; arch = "linux-i686"; sha512 = "d22933ad961fc061cf89db77c12b46bbd7f47d2b4c43fb348b17c373328805c9d2563626deb28ae405b9f4bd53237139b4ae07d99c8aebb7aa55d6fc3688e4c9"; } + { locale = "gd"; arch = "linux-x86_64"; sha512 = "a1636bfbbafe782ad4ac2b32c32555b0420434203b340b716a1af783fa7e079bd1017c72f8c7f9df6d194463658c3c2d420e7c76bfad73fbf4b01ba248849a84"; } + { locale = "gl"; arch = "linux-i686"; sha512 = "4e9429fc676c541f28fedf04e47b833814077ca39ab6bfcd69f9113942ec1e0988440fd0cbe76a02adbfff532c4526d52bd9e8480c3c34f1a5e31ce81d4d2552"; } + { locale = "gl"; arch = "linux-x86_64"; sha512 = "6ff7d7c0216e6df3c2d21dc066c7a1a9efb153cc5341f9b8886e162300f2bb9d35f3bbe04b1524aba7af7e11feadb4d5bf2fd3b3a87176ee469cc019dd5b2318"; } + { locale = "he"; arch = "linux-i686"; sha512 = "d73580ad744a7f0d1b33656c804f34cec7fadd434cfe2983bd766562c0839787c1f7d24d46e0a8750d39099964bbab50c4a4f11e284b7ae1a4a51ac72780f7ab"; } + { locale = "he"; arch = "linux-x86_64"; sha512 = "f4a3dbd3aa8bb63e77a2870a815ba393bd8eef5966e267d16d5509214bd542956b3f522001d21950899ff6134c27c7076bc8284988b9a3097e8e85b22c9d0283"; } + { locale = "hr"; arch = "linux-i686"; sha512 = "ee46234fae33de0b773dcc425134bcd63dc84e9928d3aa2327b9f4c4ac518460e780f14bac3dff5c1c8983e6e27fd90ea13e0a63ac8c764c5206fcff1ce1dc21"; } + { locale = "hr"; arch = "linux-x86_64"; sha512 = "f00506936eeac1d6ccbfbcc4f1ec3ff7435013c4bb547c3ed8d75771aa20c23207349bb1850a58df054a16669897118a4e163a3629da5d612b3d7de1ef4c824a"; } + { locale = "hsb"; arch = "linux-i686"; sha512 = "3c507f80021faa40302a1e28c74f561cacf65519f30a947ad8a518e605a53354293a3c50de3bfc486dec2d9876e1d391a653ce99d97a7551ce4e8ed937831556"; } + { locale = "hsb"; arch = "linux-x86_64"; sha512 = "0c17827cbcd6198c763b940d4ac1b2ea9d94f6d985bf680874ea2c8902b819d383ef011290ee75b824994a15cb4bf509e137ec05ce98fd17f5d416d8c7f9d8b5"; } + { locale = "hu"; arch = "linux-i686"; sha512 = "7454371f38c9c58fb7c3f4b278898fd8963162e718d0208cb0536d28621849337e1550abc95b3eacd4b244ffd074595744433ed1454c4964e709252c12dcc48d"; } + { locale = "hu"; arch = "linux-x86_64"; sha512 = "3641018778dd4d27ea47393c8529272ede548fa1a8fa055ec686bd444fef1b3599f5a5a43c51ebd40a7e71f72e3105bb5c51ad0c55824ead48b4d627b76cab95"; } + { locale = "hy-AM"; arch = "linux-i686"; sha512 = "44c12b5f7a364b6968742a23641472c4ced9ae0f0da1c6d8b2f7e2f5c1b1f9f68574bdc268fdb80c2236b58ac9a2e65eb9c5de69622b4ff837a3f3d223cf599d"; } + { locale = "hy-AM"; arch = "linux-x86_64"; sha512 = "36c4a325bc850011805665a23191ff2577d012fb6610c8665c79b7576ba381b8017f96fafd3e6f5975cdaed1c608204bc42963d618163c73f8df2d07f8d60183"; } + { locale = "id"; arch = "linux-i686"; sha512 = "a57d8c4d0ec83ff986ba9e0d41fdf883910d68a70ef47f5f6c88fa375b5f2d7c4811c8d9c9405b96c1ea5661be9daa26aac929a4a5a3727e7b34ba1baa14c716"; } + { locale = "id"; arch = "linux-x86_64"; sha512 = "9e742f9afe17eb4837d8fdfc963c3dcffd270fdab5d44f63ed8feb01596bf1c7ed153ad2877ffff62e67eafdddd304172a9da04a50f20b4f63050da5a50c60cf"; } + { locale = "is"; arch = "linux-i686"; sha512 = "a6911ac57b9ff4775713ca3e2e0046578a4cac3e5704ff22c078df38f0df39203684732f576cc309c5aeb1912ab88ce8dea4b48860e7f659abac1ed29db6e37a"; } + { locale = "is"; arch = "linux-x86_64"; sha512 = "9a914a3662c5b3f32800a0b75ea0f2dc5c7d4a8ae8284e2f4dc8a0cceb3fab5c6ff49e5b73fa351705754e3febf4a100f638d1e17d6d9b2b5c2ecdee1e343d23"; } + { locale = "it"; arch = "linux-i686"; sha512 = "88d38d5f614e218fd6b11a033b6b09a4801a4f2b3cb75cb3f4402189f741bbcb4070ce5e34358b796fdc8912ca886f6e793aaaec960e11cec0e5dd812e136ea9"; } + { locale = "it"; arch = "linux-x86_64"; sha512 = "ac57b1bb5a13c150c8ceab677a4f58156dc01e5f6b53c07ce3333fdc27eb0b41b781b485490aa0bc7c25ec84d20a10f92fa961b7aa8a5e5a816d95bcce60463f"; } + { locale = "ja"; arch = "linux-i686"; sha512 = "1ec20b0069c6397219da16c650de6eda4d7f5b8a552152473929cd45cc7039cbf8a114199057499ac8471746ac43437e3acc8bbf4601afd12174926c4f8be4d9"; } + { locale = "ja"; arch = "linux-x86_64"; sha512 = "6d5b2fab683f3b7c2f2fc885670ae37ff3e326a6b78df27aaf44996d39ab5a2bce3c69a61e7e01ffa488e37563f8df2961c1f24d916cec371a04f4058444f547"; } + { locale = "ko"; arch = "linux-i686"; sha512 = "7d580958ce1d876d9de4aac6262a8caa3e8c3b36f9e5b9262ce90a1d3ca58611bad4acf633802bd1e83e7ce4a20488f5b9f8ecc8747a325fd7ca451a3461b491"; } + { locale = "ko"; arch = "linux-x86_64"; sha512 = "d47061f406703e89c38b0547ffabe8ad5ebfc1139ddd381b57bc7ccf53897f2dd5d57bc0df0e017a31ecfdf5a65b546a095fea8d3950ae8ace5bbeb1cd8cc29b"; } + { locale = "lt"; arch = "linux-i686"; sha512 = "ed76ca4c087c40f0d08ede83d652a00754a6abec26d17c3c7294ee3c77d39d8cb90613535817d81358876a11f11cc79fa9ae024c81d37a5e82496630003383d5"; } + { locale = "lt"; arch = "linux-x86_64"; sha512 = "07a028860cf5fdf633cbecbde1f44706be95d27ed96c9c71103fe2b3342a9129807755605b30b720d146568145f3ae3d4ff624b88ed9f5df004f1ce9732ffcfb"; } + { locale = "nb-NO"; arch = "linux-i686"; sha512 = "268e74b8be4229e28858a0a7bd76186b28cfde52fa70baf599bd0ec5da2a20c70647b32d3f4e3c58934dab873ebaa6b5dcf4762a9aed7d8710f14809bb154325"; } + { locale = "nb-NO"; arch = "linux-x86_64"; sha512 = "687925509d18fab5830071e60670de0850522153a76d560d96c5d482ddb3e0bf1416f10a816e151f2ee7d2f2ef09bb2b86d23d65b1348ea62bfca700e0d09be3"; } + { locale = "nl"; arch = "linux-i686"; sha512 = "4e395c48adb2fed27824dc763360f135c2ad787ff7cd6258b50055cd9ae44c92dcab2de458270fcd18b365817218889fe363205253f781dbcbd337800d727c76"; } + { locale = "nl"; arch = "linux-x86_64"; sha512 = "8fdd6ed769f239abce3ad7dce2c86c1a29fe4c7c13c2018f4225b23e7a23da37fa8661273eade4ebafec1d7989d922f40075805966e306e19764d78b54d48b72"; } + { locale = "nn-NO"; arch = "linux-i686"; sha512 = "4d71dbbecce1f3865d56510c20b7d27feabaf4ca2f98b1942c729b72e084ef3a90d6e96d43a77143a33c31dbe71a978fdca550905469f04fcb01a3c0edb82f62"; } + { locale = "nn-NO"; arch = "linux-x86_64"; sha512 = "ddd787da7709c09dafa91bb979931d0d48b93c93d7937f3717e9d7a39b718be4f7acb4766f908e7065b7ef791c105c2b79ffa54f5faee2d040a63687d5cf2ee1"; } + { locale = "pa-IN"; arch = "linux-i686"; sha512 = "6720b2608293b0eb5638f3e25779bf9ce0ffcf86b8cc82c2d5136d96f9139d208ff5e7d6d3c1a95f1cad8d1d782935633da766ab77141d086f821bb23dff1e0f"; } + { locale = "pa-IN"; arch = "linux-x86_64"; sha512 = "3f89c3f02dfbc90e6f4e6d3b4f4c42654137cfe813be4ac65f88a469af90d25b2d0cc298ea5014d01ef10ff789e71afd723ab66916fd67daab4e2bf9cf40c904"; } + { locale = "pl"; arch = "linux-i686"; sha512 = "01e6168dd32d5e03574fa79614cb5acdd9eb61639f6ad13e90e890314315b53a7cb98434ff39e71a261fc5d1c6483a5ba9792cc3f0cf013eef766d6d4a792eac"; } + { locale = "pl"; arch = "linux-x86_64"; sha512 = "7e4a33bfe95a204cba81a6c8e849a121754ee6a0e52b54d571af2806cb139230a7b2e8fd7a336c0ab262da5a8e61ba6ec89bb9b4481aa23cf45a2955beb86713"; } + { locale = "pt-BR"; arch = "linux-i686"; sha512 = "f4b4ac433e491808d2078b0d1289dae2904ac7e00bdbd9dd60d6b3a92fadac09a9c794c708b3fa75e6c03c15ba0c5ebfe1db51aee191237f4fc7a2420052dcfc"; } + { locale = "pt-BR"; arch = "linux-x86_64"; sha512 = "9429227039305cc49303878a24d77e34ddcade34da293879ac8112375c06644ecdd3651c899c14b2c821684967851557858040433f40a455370dd6da53e197fe"; } + { locale = "pt-PT"; arch = "linux-i686"; sha512 = "48f0a0844eb8773ce0af33acf39483a47f5801810115f5424898fc7750f7b53dde5145152a61a82967ff0186876851d65e5a6352476ee27731780d17a2436a71"; } + { locale = "pt-PT"; arch = "linux-x86_64"; sha512 = "f835bd03c3b0f548bd451044232be5a2a267bb8e3fa2cdefb792f85012ede6bb3d9561ccfa8d62046337ce9cf4c7700e9b12468cd4f7d60406a7ff9f1f691f79"; } + { locale = "rm"; arch = "linux-i686"; sha512 = "523c68231e9d435dbdcb923a30a30b5b24496e6889168d5351d5bad19bb0a33d8ce744b65450ab2884ec34690cdc27f81e03614dbe7996735edde0ff47afadc4"; } + { locale = "rm"; arch = "linux-x86_64"; sha512 = "cb6438f3fdf5d6486b170acc779c5f9930099c36a914fdf58649f85552eb92d13637290a160ad7c4b9384aa102f5e8cbea7eaf5017c8eccc4331d6ce80de4e5b"; } + { locale = "ro"; arch = "linux-i686"; sha512 = "3e7064e268e5539eba92ec30a3a17fbfc4bc958fe40ad96bc1140c6c8e4b2427b94ce1e51c1e41623c0c439c1881107a9b47493f6f92905b64194ec336b62a77"; } + { locale = "ro"; arch = "linux-x86_64"; sha512 = "5b9f1d7e6ddeb878ea440d1761212df3060815d2a12ae4bd9516b111b8bfc1f432a73243c97d106de0ebc0184a873d5b331b979f42c74c156f5c0b6bd8ade711"; } + { locale = "ru"; arch = "linux-i686"; sha512 = "e6044379ca3214e84103ce9fe71bec73d943b16534f1eba374d6f9f1a019d40731424d49e9dc54f2e4731677288373e23645073dfa8a092675f94860ea41835b"; } + { locale = "ru"; arch = "linux-x86_64"; sha512 = "3eafca9f2d67b22e1e12435145825cfb71631fc24e53f556a6e903d81671092e25a1efabf92eee3455d24a2669cb7a17a28dea94932a65ac02ddd9a2971d5806"; } + { locale = "si"; arch = "linux-i686"; sha512 = "ad52b55de7bb04b3907df881ceb9c8a21ca227bbf52316b1bf2e0b20bdcab4049cf1291d054ab7f8ff40678359bff9b7ae90394409fdf11c74cd7165be0f02d6"; } + { locale = "si"; arch = "linux-x86_64"; sha512 = "0670fca36e7a83d203693f2e554a64455a24f638a4d72f2f1c7ede8b6e20e4b3dc1234d4525b07a305f8b74d11e676f5dbcd4303ec859d4096a1367d758be6a4"; } + { locale = "sk"; arch = "linux-i686"; sha512 = "99cdde9e68a878ff6ad00531a738b5cf8fa82342e7287ecf9ed57815bb9e9e599021b068c2ec128cc527c9f1ff21abcaeb8f694a34dd8661fc19610df30231fc"; } + { locale = "sk"; arch = "linux-x86_64"; sha512 = "6fe5511d7bb8a44a6cb1a91837f96636a57d8c9c180213ad785e254c30db1c26d854681f1bde120c64a9171f371649a42b23f8bb5a44ebe0fc2834c9013b05ea"; } + { locale = "sl"; arch = "linux-i686"; sha512 = "3774102fce53a1f7f680b1105372c50c8bdf5bfd90dc752a4eae21fadb7fe8e55e16a1bf3f5a625fb14e432a6ce2f3f5afd11f770a2d05a093af9b2962f7d57e"; } + { locale = "sl"; arch = "linux-x86_64"; sha512 = "c181d6505c8b7702cb361e0eab902fa7fa6afabeaa5391419a54909f865063c1695f65e22134cfd4ae0f17b224a540edd82c359f325469cb989f5116d901a674"; } + { locale = "sq"; arch = "linux-i686"; sha512 = "cdf379fd3459828a5d3b397f5ab5680426163519b5ac3107673714792d39cfa811c57f7e796f0fdba439a372ffaee12f4dca335ca31f4c64fb7030e0b334ff8b"; } + { locale = "sq"; arch = "linux-x86_64"; sha512 = "e4d9e888bbcdc2ef729dc0d0eee0a84e0fdd8b7983f43146b8f0c0cf674bcdd0e74f34e8d172e83e38dc6c0736729ad7386bb1c21309d4dd5d665eaa334185cf"; } + { locale = "sr"; arch = "linux-i686"; sha512 = "7f9b792229152f204722a58e8db073f464393d3871c84c7c1b38eddc39551e08aaf3dd537438baa9f802b42305ddb79aa903cbd9a8da9823af202ff784f26df2"; } + { locale = "sr"; arch = "linux-x86_64"; sha512 = "0d318caf92c8efaf9af26e245c34f6eb133dbacc50fce93dfaa38c099d7bf3e84c2f37f38bbdcc24220525a18707c0790041230c8533b602c72e222bd6ad8c81"; } + { locale = "sv-SE"; arch = "linux-i686"; sha512 = "5b1b22d1df530ce164df04d537081378a56ab574a83ed4e489d01aa590ced55132d1f9d79eb93f397063a781ee96d55e732c5d19061bdb9d048238de0a6fdc3a"; } + { locale = "sv-SE"; arch = "linux-x86_64"; sha512 = "860b8f4a3d6ef9173bb74285a2c8e1a5163b64c153372f7945de87811e9e108b7e9bc45c412af65fc4678aa3d037a647673e1f8ffd13dac01312c2fddbbff9bd"; } + { locale = "ta-LK"; arch = "linux-i686"; sha512 = "3655a5902ab96979bd63631ed03da20378117968b3543f397ef1ed276784cda3dc07e296b9cc0b394f5d3d7781ff5011fcf0f52d4f1937a835f9aa10700fd301"; } + { locale = "ta-LK"; arch = "linux-x86_64"; sha512 = "e7552e32fbeebcd183f30ecbe5f24aeac7c331be03e46ed953a62395a6ea2b1d417ac1cf7f1b2983fdfface7dc5a74fd0e2cce365248a581adde0ed3ea16ee90"; } + { locale = "tr"; arch = "linux-i686"; sha512 = "c853f1fead6155ffc1af4b9630907e68d1253baed19a8a957b7a5d977e45ca9d095e41bb2a1aea5cbde92d7680b4242915586d4cd7cc6b97350ae8c3ab2f4a82"; } + { locale = "tr"; arch = "linux-x86_64"; sha512 = "84db95b4af21962210a5975b41736e73ed6f0d773717664043fcc80133c21dfede2c8a4522c5c8aaa3452f7bb9802f6de589eeec6d4408f7a90b132431e22a13"; } + { locale = "uk"; arch = "linux-i686"; sha512 = "6feead54fd7a40888dd57d187fdfd8dd0863b34135af1aa2baaed72bbc0ee3ba6322f182679b8f025068ee98872d5e5429636f19643f2373fd9b377218d568a6"; } + { locale = "uk"; arch = "linux-x86_64"; sha512 = "705075b18ba24d01c35f42ae1ca5cc570971290717a0b134083d694514553b5932228abaa22e606605737007522d4436fb77827810b506d9fe037b0de5c10b6e"; } + { locale = "vi"; arch = "linux-i686"; sha512 = "e45dbee20425ee413eca5d2985fb507be89e6d0b49c7b73109a6bba79d4f58c6630efa83334bb280963fc9a20a0de1bfa0103a562f0fefb67c513380a2e80f0e"; } + { locale = "vi"; arch = "linux-x86_64"; sha512 = "b66e350c022fe14043482fa1112aa43508924e1e34044900416a8063a284c1df30bcb36a3694db161fced1f0e8bb26064cb4d088a862c477ba6991af75882798"; } + { locale = "zh-CN"; arch = "linux-i686"; sha512 = "c16d4336e251b690452a483349429dde336101e5224445584311b5b7e68723e30e58a734839902e87c34c473e84f9f4b7d3c0b2e4d0c1e5da0b2a23e7dedcda8"; } + { locale = "zh-CN"; arch = "linux-x86_64"; sha512 = "5184083066f18dfc22735e25a551f6a68f8f2f1363c77f562912275c6364326386ccf435388bb4626f74b31243072fe9af3be0c023400ecd73736375272024ee"; } + { locale = "zh-TW"; arch = "linux-i686"; sha512 = "19d9ac5f5f1343343ea32b53c4fd5f56f77148bcae210f2f1aebc7d63dd7db75a7bf63a68a90c8d19e5a8ea2c3b7ce87ae893ad5e58a3e0c35f1207b1ef0c912"; } + { locale = "zh-TW"; arch = "linux-x86_64"; sha512 = "d571188f33f526cb04af913486eb37ba7ba1597db0145958de8158857a47c1f5a42fe97d6c0891620fdeade4fd691f1a9e875c134398c85a9007eed1f5f55bef"; } ]; } From cade2f36e556c9defa601e408bd793b21c7d8aca Mon Sep 17 00:00:00 2001 From: taku0 Date: Thu, 12 May 2016 21:58:26 +0900 Subject: [PATCH 038/128] flashplayer: 11.2.202.616 -> 11.2.202.621 --- .../browsers/mozilla-plugins/flashplayer-11/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix index d1a00f1bd04..959348fa65e 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix @@ -70,11 +70,11 @@ let in stdenv.mkDerivation rec { name = "flashplayer-${version}"; - version = "11.2.202.616"; + version = "11.2.202.621"; src = fetchurl { url = "https://fpdownload.macromedia.com/pub/flashplayer/installers/archive/fp_${version}_archive.zip"; - sha256 = "0y4bjkla6ils4crmx61pi31s4gscy8rgiv7xccx1z0g6hba9j73l"; + sha256 = "0xv7pzna4pfmi9bjwfbr0kf92xvdgpirm97kks4kphwngf3bzrm0"; }; nativeBuildInputs = [ unzip ]; From 9e929f3eb635181afbfdf66e5943a55869f52db7 Mon Sep 17 00:00:00 2001 From: Joel Moberg Date: Thu, 12 May 2016 15:03:00 +0200 Subject: [PATCH 039/128] netbeans: 8.0.2 -> 8.1 --- pkgs/applications/editors/netbeans/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/netbeans/default.nix b/pkgs/applications/editors/netbeans/default.nix index 3ea0c71f125..4fb4006c567 100644 --- a/pkgs/applications/editors/netbeans/default.nix +++ b/pkgs/applications/editors/netbeans/default.nix @@ -13,10 +13,10 @@ let }; in stdenv.mkDerivation { - name = "netbeans-8.0.2"; + name = "netbeans-8.1"; src = fetchurl { - url = http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905.zip; - sha256 = "1h9cqpwsnrhcnn4fqz3rr4s5jln8cfwki8af9zikq9j6aza337xv"; + url = http://download.netbeans.org/netbeans/8.1/final/zip/netbeans-8.1-201510222201.zip; + sha256 = "1aaf132mndpgfbd5v8izqzp37hjs5gwqwd6zrb519fx0viz9aq5r"; }; buildCommand = '' From f225e35a0b3cc82ecafd9dec90fb0debd273ede7 Mon Sep 17 00:00:00 2001 From: Tristan Helmich Date: Thu, 12 May 2016 16:01:39 +0200 Subject: [PATCH 040/128] graylog: 2.0.0 -> 2.0.1 --- pkgs/tools/misc/graylog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/graylog/default.nix b/pkgs/tools/misc/graylog/default.nix index a3952f7903b..3613625b3a2 100644 --- a/pkgs/tools/misc/graylog/default.nix +++ b/pkgs/tools/misc/graylog/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - version = "2.0.0"; + version = "2.0.1"; name = "graylog-${version}"; src = fetchurl { url = "https://packages.graylog2.org/releases/graylog/graylog-${version}.tgz"; - sha256 = "0qn2rf2aarfr34387fiv34rmav20c66b4zs9bkm8gpvj0laxrqh2"; + sha256 = "0i9nng361qnnws7jnk5m91nj5ifg4h78yayahsfjn37665rsrdga"; }; dontBuild = true; From bc2fe9f2cd3144bfe061801b8cb13b9ca60a1542 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=94=D0=B0=D0=BD=D0=B8=D0=BB=D0=BE=20=D0=93=D0=BB=D0=B8?= =?UTF-8?q?=D0=BD=D1=81=D1=8C=D0=BA=D0=B8=D0=B9=20=28Danylo=20Hlynskyi=29?= Date: Thu, 12 May 2016 18:01:17 +0300 Subject: [PATCH 041/128] typo in authorizedKeysFiles --- nixos/modules/services/networking/ssh/sshd.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix index 5971a5a250d..a464733a6a0 100644 --- a/nixos/modules/services/networking/ssh/sshd.nix +++ b/nixos/modules/services/networking/ssh/sshd.nix @@ -195,7 +195,7 @@ in authorizedKeysFiles = mkOption { type = types.listOf types.str; default = []; - description = "Files from with authorized keys are read."; + description = "Files from which authorized keys are read."; }; extraConfig = mkOption { From 046ee5ac3ffbc7e5daa706bd3ad405bd30c7aad5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= Date: Tue, 3 May 2016 10:54:49 +0200 Subject: [PATCH 042/128] ati-drivers: 15.7 -> 15.12 Also addresses breakage due to the multiple-outputs merge. --- pkgs/os-specific/linux/ati-drivers/builder.sh | 26 ++++------ .../os-specific/linux/ati-drivers/default.nix | 50 +++++++++---------- 2 files changed, 34 insertions(+), 42 deletions(-) diff --git a/pkgs/os-specific/linux/ati-drivers/builder.sh b/pkgs/os-specific/linux/ati-drivers/builder.sh index 844f30e0c60..4394e785960 100644 --- a/pkgs/os-specific/linux/ati-drivers/builder.sh +++ b/pkgs/os-specific/linux/ati-drivers/builder.sh @@ -1,4 +1,3 @@ -# What is LIBGL_DRIVERS_PATH used for? # TODO gentoo removes some tools because there are xorg sources (?) source $stdenv/setup @@ -6,15 +5,10 @@ set -x die(){ echo $@; exit 1; } -mkdir fglrx # custom unpack: -cd fglrx unzip $src -cd .. -run_file=$(echo fglrx/amd-driver-installer-*) +run_file=fglrx-$build/amd-driver-installer-$build-x86.x86_64.run sh $run_file --extract . -eval "$patchPhase1" - case "$system" in x86_64-linux) arch=x86_64 @@ -33,9 +27,9 @@ esac if test -z "$libsOnly"; then - kernelVersion=$(cd ${kernel}/lib/modules && ls) - kernelBuild=$(echo ${kernel}/lib/modules/$kernelVersion/build) - linuxsources=$(echo ${kernel}/lib/modules/$kernelVersion/source) + kernelVersion=$(cd ${kernelDir}/lib/modules && ls) + kernelBuild=$(echo ${kernelDir}/lib/modules/$kernelVersion/build) + linuxsources=$(echo ${kernelDir}/lib/modules/$kernelVersion/source) # note: maybe the .config file should be used to determine this ? # current kbuild infrastructure allows using CONFIG_* defines @@ -231,7 +225,7 @@ fi fglrx_dri.so \ libaticaldd.so do - patchelf --set-rpath $gcc/$lib_arch/ $out/lib/$pelib2 + patchelf --set-rpath $glibcDir/lib/:$libStdCxx/lib/ $out/lib/$pelib2 done } @@ -245,12 +239,12 @@ if test -z "$libsOnly"; then eval "$patchPhaseSamples" ( # build and install fgl_glxgears - cd fgl_glxgears; + cd fgl_glxgears; gcc -DGL_ARB_texture_multisample=1 -g \ -I$mesa/include \ -I$out/include \ -L$mesa/lib -lGL -lGLU -lX11 -lm \ - -o $out/bin/fgl_glxgears -Wall fgl_glxgears.c + -o $out/bin/fgl_glxgears -Wall fgl_glxgears.c ) true || ( # build and install @@ -267,12 +261,12 @@ if test -z "$libsOnly"; then -I${xf86vidmodeproto}/include \ -I$out/X11R6/include \ -L$out/lib \ - -Wall -lm -lfglrx_gamma -lX11 -lXext -o $out/bin/fglrx_xgamma fglrx_xgamma.c + -Wall -lm -lfglrx_gamma -lX11 -lXext -o $out/bin/fglrx_xgamma fglrx_xgamma.c ) { # patch and copy statically linked qt libs used by amdcccle - patchelf --set-interpreter $(echo $glibc/lib/ld-linux*.so.2) $TMP/arch/$arch/usr/share/ati/$lib_arch/libQtCore.so.4 && + patchelf --set-interpreter $(echo $glibcDir/lib/ld-linux*.so.2) $TMP/arch/$arch/usr/share/ati/$lib_arch/libQtCore.so.4 && patchelf --set-rpath $gcc/$lib_arch/ $TMP/arch/$arch/usr/share/ati/$lib_arch/libQtCore.so.4 && patchelf --set-rpath $gcc/$lib_arch/:$out/share/ati/:$libXrender/lib/:$libSM/lib/:$libICE/lib/:$libfontconfig/lib/:$libfreetype/lib/ $TMP/arch/$arch/usr/share/ati/$lib_arch/libQtGui.so.4 && mkdir -p $out/share/ati @@ -285,7 +279,7 @@ if test -z "$libsOnly"; then patchelf --shrink-rpath $BIN/amdcccle for prog in $BIN/*; do cp -f $prog $out/bin && - patchelf --set-interpreter $(echo $glibc/lib/ld-linux*.so.2) $out/bin/$(basename $prog) && + patchelf --set-interpreter $(echo $glibcDir/lib/ld-linux*.so.2) $out/bin/$(basename $prog) && wrapProgram $out/bin/$(basename $prog) --prefix LD_LIBRARY_PATH : $out/lib/:$gcc/lib/:$out/share/ati/:$libXinerama/lib/:$libXrandr/lib/:$libfontconfig/lib/:$libfreetype/lib/:$LD_LIBRARY_PATH done } diff --git a/pkgs/os-specific/linux/ati-drivers/default.nix b/pkgs/os-specific/linux/ati-drivers/default.nix index 78903da1f1a..a4f8b707c08 100644 --- a/pkgs/os-specific/linux/ati-drivers/default.nix +++ b/pkgs/os-specific/linux/ati-drivers/default.nix @@ -11,10 +11,6 @@ assert (!libsOnly) -> kernel != null; with stdenv.lib; -let - version = "15.7"; -in - # This derivation requires a maximum of gcc49, Linux kernel 4.1 and xorg.xserver 1.17 # and will not build or run using versions newer @@ -31,11 +27,14 @@ in # http://wiki.cchtml.com/index.php/Main_Page -# # /usr/lib/dri/fglrx_dri.so must point to /run/opengl-driver/lib/fglrx_dri.so # This is done in the builder script. -stdenv.mkDerivation { +stdenv.mkDerivation rec { + + version = "15.12"; + pname = "ati-drivers"; + build = "15.302"; linuxonly = if stdenv.system == "i686-linux" then @@ -44,7 +43,7 @@ stdenv.mkDerivation { true else throw "ati-drivers are Linux only. Sorry. The build was stopped."; - name = "ati-drivers-${version}" + (optionalString (!libsOnly) "-${kernel.version}"); + name = pname + "-" + version + (optionalString (!libsOnly) "-${kernelDir.version}"); builder = ./builder.sh; gcc = stdenv.cc.cc; @@ -57,15 +56,16 @@ stdenv.mkDerivation { libICE = xorg.libICE; libfreetype = freetype; libfontconfig = fontconfig; + libStdCxx = stdenv.cc.cc.lib; src = fetchurl { - url = "http://www2.ati.com/drivers/linux/amd-driver-installer-15.20.1046-x86.x86_64.zip"; - sha256 = "ffde64203f49d9288eaa25f4d744187b6f4f14a87a444bab6a001d822b327a9d"; - curlOpts = "--referer http://support.amd.com/en-us/download/desktop?os=Linux%20x86_64"; + url = + "https://www2.ati.com/drivers/linux/radeon-crimson-15.12-15.302-151217a-297685e.zip"; + sha256 = "0n0ynqmjkjp5dl5q07as7ps3rlyyn63hq4mlwgd7c7v82ky2skvh"; + curlOpts = "--referer http://support.amd.com/en-us/download/desktop?os=Linux+x86_64"; }; patchPhaseSamples = "patch -p2 < ${./patch-samples.patch}"; - patchPhase1 = "patch -p1 < ${./kernel-api-fixes.patch}"; buildInputs = [ xorg.libXrender xorg.libXext xorg.libX11 xorg.libXinerama xorg.libSM @@ -81,28 +81,28 @@ stdenv.mkDerivation { inherit libsOnly; - kernel = if libsOnly then null else kernel.dev; + kernelDir = if libsOnly then null else kernel.dev; - inherit glibc /* glibc only used for setting interpreter */; + # glibc only used for setting the binaries interpreter + glibcDir = glibc.out; # outputs TODO: probably many fixes are needed; - # this in particular would be much better by lib.makeLibraryPath - LD_LIBRARY_PATH = stdenv.lib.concatStringsSep ":" - [ "${xorg.libXrandr.out}/lib/" - "${xorg.libXrender.out}/lib/" - "${xorg.libXext.out}/lib/" - "${xorg.libX11.out}/lib/" - "${xorg.libXinerama.out}/lib/" - "${xorg.libSM.out}/lib/" - "${xorg.libICE.out}/lib/" - "${stdenv.cc.cc.out}/lib/" + LD_LIBRARY_PATH = makeLibraryPath + [ xorg.libXrender xorg.libXext xorg.libX11 xorg.libXinerama xorg.libSM + xorg.libXrandr xorg.libXxf86vm xorg.xf86vidmodeproto xorg.imake xorg.libICE + mesa + fontconfig + freetype + stdenv.cc.cc ]; # without this some applications like blender don't start, but they start # with nvidia. This causes them to be symlinked to $out/lib so that they # appear in /run/opengl-driver/lib which get's added to LD_LIBRARY_PATH - extraDRIlibs = [ xorg.libXrandr xorg.libXrender xorg.libXext xorg.libX11 xorg.libXinerama xorg.libSM xorg.libICE ]; + extraDRIlibs = [ xorg.libXrandr.out xorg.libXrender.out xorg.libXext.out + xorg.libX11.out xorg.libXinerama.out xorg.libSM.out + xorg.libICE.out ]; inherit mesa; # only required to build the examples @@ -119,6 +119,4 @@ stdenv.mkDerivation { priority = 4; }; - - } From c3b28c08575e5a4b973c8ab2ecc6a86e5d31d434 Mon Sep 17 00:00:00 2001 From: Arseniy Seroka Date: Thu, 12 May 2016 18:39:27 +0300 Subject: [PATCH 043/128] rustRegistry: 2016-04-24 -> 2016-05-12 --- 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 d3a84d416d1..7eb902ef28c 100644 --- a/pkgs/top-level/rust-packages.nix +++ b/pkgs/top-level/rust-packages.nix @@ -7,15 +7,15 @@ { runCommand, fetchFromGitHub, git }: let - version = "2016-04-23"; - rev = "ae2c4051b5df822213c3382bf0d1daaef38ea90c"; + version = "2016-05-12"; + rev = "5b7ac517f63cfc380f018445920aac322ae19b6f"; src = fetchFromGitHub { inherit rev; owner = "rust-lang"; repo = "crates.io-index"; - sha256 = "17ypnb59w4j2f51qpyx5jidkgqvsrk3c7b3mc5s85niy7mvk8wy4"; + sha256 = "0g50hjbvfjgi7j26b9n018vgh7sxvzq8lwzchk0zavirsxhnzxni"; }; in From 6b6bba486e4e3c5f9ac90a79e27b029699b4f784 Mon Sep 17 00:00:00 2001 From: Tom Hunger Date: Thu, 12 May 2016 17:01:25 +0100 Subject: [PATCH 044/128] cloudpickle: 0.1.1 -> 0.2.1 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3b5f1a10d36..ef654966f46 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3319,11 +3319,11 @@ in modules // { cloudpickle = buildPythonPackage rec { name = "cloudpickle-${version}"; - version = "0.1.1"; + version = "0.2.1"; src = pkgs.fetchurl { url = "mirror://pypi/c/cloudpickle/${name}.tar.gz"; - sha256 = "3418303f44c6c4daa184f1dc36c8c0b7ff8261c56d1f922ffd8d09e79caa4b74"; + sha256 = "0fsw28nmzrpk0g02y84d7pigkqr64a3x2jhhkfixplxfwravd97f"; }; buildInputs = with self; [ pytest mock ]; From 5b782924c1dc9d66d7aefaf99650ff52119b6358 Mon Sep 17 00:00:00 2001 From: Tom Hunger Date: Thu, 12 May 2016 17:03:34 +0100 Subject: [PATCH 045/128] tornado: disable tests, see #14634 --- pkgs/top-level/python-packages.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ef654966f46..342ad3a1a44 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -23893,6 +23893,10 @@ in modules // { propagatedBuildInputs = with self; [ backports_ssl_match_hostname_3_4_0_2 certifi ]; + # Tests fail: + # ValueError: _type_ 'v' not supported + # See https://github.com/NixOS/nixpkgs/issues/14634 + doCheck = false; src = pkgs.fetchurl { url = "mirror://pypi/t/tornado/${name}.tar.gz"; sha256 = "a16fcdc4f76b184cb82f4f9eaeeacef6113b524b26a2cb331222e4a7fa6f2969"; From d2c6b93892af58ffa0018090747ccb2a7fff91e7 Mon Sep 17 00:00:00 2001 From: Tom Hunger Date: Thu, 12 May 2016 17:01:52 +0100 Subject: [PATCH 046/128] dask: 0.7.6 -> 0.9.0 --- pkgs/top-level/python-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 342ad3a1a44..fd6863688ba 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4584,15 +4584,15 @@ in modules // { dask = buildPythonPackage rec { name = "dask-${version}"; - version = "0.7.6"; + version = "0.9.0"; src = pkgs.fetchurl { url = "mirror://pypi/d/dask/${name}.tar.gz"; - sha256 = "ff27419e059715907afefe6cbcc1f8c748855c7a93be25be211dabcb689cee3b"; + sha256 = "1jm6riz6fbbd554i0dg0w1xfcmx3f9ryp4jrlavsy4zambilm6b3"; }; buildInputs = with self; [ pytest ]; - propagatedBuildInputs = with self; [numpy toolz dill pandas ]; + propagatedBuildInputs = with self; [ numpy toolz dill pandas ]; checkPhase = '' py.test dask From dacbeea15b75d624fe08949e688b8df6c9b64674 Mon Sep 17 00:00:00 2001 From: Tom Hunger Date: Thu, 12 May 2016 17:02:14 +0100 Subject: [PATCH 047/128] locket: init at 0.2.0 --- lib/maintainers.nix | 1 + pkgs/top-level/python-packages.nix | 23 +++++++++++++++++++++++ 2 files changed, 24 insertions(+) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 19f9300fe5d..80f5cf3876d 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -353,6 +353,7 @@ tailhook = "Paul Colomiets "; taktoa = "Remy Goldschmidt "; tavyc = "Octavian Cerna "; + teh = "Tom Hunger "; telotortium = "Robert Irelan "; thall = "Niclas Thall "; thammers = "Tobias Hammerschmidt "; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index fd6863688ba..2dcbd23723c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4609,6 +4609,29 @@ in modules // { }; }; + locket = buildPythonPackage rec { + name = "locket-${version}"; + version = "0.2.0"; + + src = pkgs.fetchurl { + url = "mirror://pypi/l/locket/${name}.tar.gz"; + sha256 = "1d4z2zngrpqkrfhnd4yhysh66kjn4mblys2l06sh5dix2p0n7vhz"; + }; + + buildInputs = with self; [ pytest ]; + propagatedBuildInputs = with self; [ ]; + + # weird test requirements (spur.local>=0.3.7,<0.4) + doCheck = false; + + meta = { + description = "Locket implements a lock that can be used by multiple processes provided they use the same path."; + homepage = "https://github.com/mwilliamson/locket.py"; + license = licenses.bsd2; + maintainers = with maintainers; [ teh ]; + }; + }; + datashape = buildPythonPackage rec { name = "datashape-${version}"; version = "0.5.1"; From b42226732e78d6dcf7e62777800971e93562023c Mon Sep 17 00:00:00 2001 From: Tom Hunger Date: Thu, 12 May 2016 17:02:35 +0100 Subject: [PATCH 048/128] s3fs: init at 0.0.4 --- pkgs/top-level/python-packages.nix | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2dcbd23723c..0e45ff5d9d2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4632,6 +4632,31 @@ in modules // { }; }; + s3fs = buildPythonPackage rec { + name = "s3fs-${version}"; + version = "0.0.4"; + + src = pkgs.fetchurl { + url = "mirror://pypi/s/s3fs/${name}.tar.gz"; + sha256 = "0gxs9zf0j97liby038i89k5njfrpvdgw0jw34ghzvlp1nzbwxwzl"; + }; + + buildInputs = with self; [ docutils ]; + propagatedBuildInputs = with self; [ boto3 ]; + + # Depends on `moto` which has a long dependency chain with exact + # version requirements that can't be made to work with current + # pythonPackages. + doCheck = false; + + meta = { + description = "S3FS builds on boto3 to provide a convenient Python filesystem interface for S3."; + homepage = "http://github.com/dask/s3fs/"; + license = licenses.bsd3; + maintainers = with maintainers; [ teh ]; + }; + }; + datashape = buildPythonPackage rec { name = "datashape-${version}"; version = "0.5.1"; From d25a6b0eb39a4a92b1763bd6c9863e589d5e90dc Mon Sep 17 00:00:00 2001 From: Tom Hunger Date: Thu, 12 May 2016 17:02:54 +0100 Subject: [PATCH 049/128] tblib: init at 1.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 0e45ff5d9d2..6035798e5c8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4632,6 +4632,23 @@ in modules // { }; }; + tblib = buildPythonPackage rec { + name = "tblib-${version}"; + version = "1.3.0"; + + src = pkgs.fetchurl { + url = "mirror://pypi/t/tblib/${name}.tar.gz"; + sha256 = "02iahfkfa927hb4jq2bak36ldihwapzacfiq5lyxg8llwn98a1yi"; + }; + + meta = { + description = "Traceback fiddling library. Allows you to pickle tracebacks."; + homepage = "https://github.com/ionelmc/python-tblib"; + license = licenses.bsd2; + maintainers = with maintainers; [ teh ]; + }; + }; + s3fs = buildPythonPackage rec { name = "s3fs-${version}"; version = "0.0.4"; From 3c600a45153a274a5d65751595b414cc73f0990f Mon Sep 17 00:00:00 2001 From: Tom Hunger Date: Thu, 12 May 2016 17:03:11 +0100 Subject: [PATCH 050/128] distributed: init at 1.10.0 --- pkgs/top-level/python-packages.nix | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6035798e5c8..cb78e00066f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4609,6 +4609,34 @@ in modules // { }; }; + distributed = buildPythonPackage rec { + + name = "distributed-${version}"; + version = "1.10.0"; + + src = pkgs.fetchurl { + url = "mirror://pypi/d/distributed/${name}.tar.gz"; + sha256 = "11bp2rs52fhcqlgyrlh3cf31ck07mys38mrkf98vjl380lyjj357"; + }; + + buildInputs = with self; [ pytest docutils ]; + propagatedBuildInputs = with self; [ + dask six boto3 s3fs tblib locket msgpack click cloudpickle tornado + psutil botocore + ] ++ (if !isPy3k then [ singledispatch ] else []); + + checkPhase = '' + py.test -m "not avoid_travis" distributed --verbose + ''; + + meta = { + description = "Distributed computation in Python."; + homepage = "http://distributed.readthedocs.io/en/latest/"; + license = licenses.bsd3; + maintainers = with maintainers; [ teh ]; + }; + }; + locket = buildPythonPackage rec { name = "locket-${version}"; version = "0.2.0"; From 3098547ebc0bd4e9e06ea949fc476b0284053482 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Thu, 12 May 2016 18:49:19 +0300 Subject: [PATCH 051/128] haskell.packages.ghc801: 8.0.0.20160421 -> 8.0.1 --- pkgs/development/compilers/ghc/8.0.1.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/ghc/8.0.1.nix b/pkgs/development/compilers/ghc/8.0.1.nix index 656dedc922d..092d9d7820a 100644 --- a/pkgs/development/compilers/ghc/8.0.1.nix +++ b/pkgs/development/compilers/ghc/8.0.1.nix @@ -7,12 +7,12 @@ let in stdenv.mkDerivation rec { - version = "8.0.0.20160421"; + version = "8.0.1"; name = "ghc-${version}"; src = fetchurl { - url = "https://downloads.haskell.org/~ghc/8.0.1-rc4/${name}-src.tar.xz"; - sha256 = "183p1ilk8rlndi1vmg2vmlx00s18q3j31kin85qpbvicsxb8j1j1"; + url = "https://downloads.haskell.org/~ghc/8.0.1/${name}-src.tar.xz"; + sha256 = "0riyry246a6km4mw1q9iiw6p75ww2f8s81i34g151zwwdygk7qpf"; }; patches = [ From c008bfff1625427e896e51520f9987dc10d2c0c7 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Thu, 12 May 2016 20:32:04 +0200 Subject: [PATCH 052/128] zsh-navigation-tools: 2.1.6 -> 2.1.9 --- pkgs/tools/misc/zsh-navigation-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/zsh-navigation-tools/default.nix b/pkgs/tools/misc/zsh-navigation-tools/default.nix index 797b6c74f38..21ae0aabca3 100644 --- a/pkgs/tools/misc/zsh-navigation-tools/default.nix +++ b/pkgs/tools/misc/zsh-navigation-tools/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "zsh-navigation-tools-${version}"; - version = "2.1.6"; + version = "2.1.9"; src = fetchFromGitHub { owner = "psprint"; repo = "zsh-navigation-tools"; rev = "v${version}"; - sha256 = "1q0232hg64walnxcfdb5d1qjfg0pdr1781k7q5rwwm8ka0xalzcd"; + sha256 = "0b5a6wnzpkvakyn2zvrizz9lsgkhgkrxcqpq4aclcia7halr1fhb"; }; dontBuild = true; From 2f334b9a0f22c3549aaabb728b74fc3d9ce4bb4b Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Thu, 12 May 2016 20:33:46 +0200 Subject: [PATCH 053/128] zsh-navigation-tools: 2.1.9 -> 2.1.10 --- pkgs/tools/misc/zsh-navigation-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/zsh-navigation-tools/default.nix b/pkgs/tools/misc/zsh-navigation-tools/default.nix index 21ae0aabca3..47e9c73116f 100644 --- a/pkgs/tools/misc/zsh-navigation-tools/default.nix +++ b/pkgs/tools/misc/zsh-navigation-tools/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "zsh-navigation-tools-${version}"; - version = "2.1.9"; + version = "2.1.10"; src = fetchFromGitHub { owner = "psprint"; repo = "zsh-navigation-tools"; rev = "v${version}"; - sha256 = "0b5a6wnzpkvakyn2zvrizz9lsgkhgkrxcqpq4aclcia7halr1fhb"; + sha256 = "08l62pp01f83c390chcnjq51hyhkrhabfzxwd831cmp2s0xgj2rq"; }; dontBuild = true; From 8db3b2a2ca8a9e52912a7f7e911c08f4f350c1f5 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Thu, 12 May 2016 20:34:59 +0200 Subject: [PATCH 054/128] parallel: 20160322 -> 20160422 --- pkgs/tools/misc/parallel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix index b4e793976c7..659a12dde6b 100644 --- a/pkgs/tools/misc/parallel/default.nix +++ b/pkgs/tools/misc/parallel/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, perl, makeWrapper, procps }: stdenv.mkDerivation rec { - name = "parallel-20160322"; + name = "parallel-20160422"; src = fetchurl { url = "mirror://gnu/parallel/${name}.tar.bz2"; - sha256 = "020vfcwapla6b4c9pr5ik7kg47fswszdds2mr52kc907xi4zcc34"; + sha256 = "0hmcr5lcg3701rh804fch6qp6pcrmgwcaigbm4c14dk6293qynh6"; }; nativeBuildInputs = [ makeWrapper ]; From 2a300d6aa52f0270a67bca089c81ba698e27e49d Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Thu, 12 May 2016 20:37:04 +0200 Subject: [PATCH 055/128] axel: 2.6 -> 2.7 --- pkgs/tools/networking/axel/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/networking/axel/default.nix b/pkgs/tools/networking/axel/default.nix index 53392857f2a..4f05220232f 100644 --- a/pkgs/tools/networking/axel/default.nix +++ b/pkgs/tools/networking/axel/default.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchurl, gettext }: +{ stdenv, fetchurl, gettext, autoreconfHook }: stdenv.mkDerivation rec { name = "axel-${version}"; - version = "2.6"; + version = "2.7"; src = fetchurl { url = "mirror://debian/pool/main/a/axel/axel_${version}.orig.tar.gz"; - sha256 = "17j6kp4askr1q5459ak71m1bm0qa3dyqbxvi5ifh2bjvjlp516mx"; + sha256 = "174x4bp4gcwmpf94hdsdxlpk7q7ldgpsicry7x2pa9zw4yz86wl0"; }; - buildInputs = [ gettext ]; + buildInputs = [ gettext autoreconfHook ]; installFlags = [ "ETCDIR=$(out)/etc" ]; From cfd899c00fe64e1f5187ac5f4e601ca6cff6353f Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Thu, 12 May 2016 20:41:30 +0200 Subject: [PATCH 056/128] checkstyle: 6.17 -> 6.18 --- pkgs/development/tools/analysis/checkstyle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/checkstyle/default.nix b/pkgs/development/tools/analysis/checkstyle/default.nix index 0d961ab5c23..fc1e8e5d54e 100644 --- a/pkgs/development/tools/analysis/checkstyle/default.nix +++ b/pkgs/development/tools/analysis/checkstyle/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - version = "6.17"; + version = "6.18"; name = "checkstyle-${version}"; src = fetchurl { url = "mirror://sourceforge/checkstyle/${name}-bin.tar.gz"; - sha256 = "1cfcjz1fg9ilqqaqlbzd5n7nsx1kzy6sabjp92b9d8mwy15bn5ql"; + sha256 = "1ls2q6zvnfsvb3b5d9s1p6c5gcdnwm2mlj2dm8jr4nifkymi6q5m"; }; installPhase = '' From be482b2314163d9904df88519bbda40069bd4048 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Thu, 12 May 2016 20:57:46 +0200 Subject: [PATCH 057/128] groovy: 2.4.5 -> 2.4.6 --- pkgs/development/interpreters/groovy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/groovy/default.nix b/pkgs/development/interpreters/groovy/default.nix index 747ecf4210d..30a2f05f0e0 100644 --- a/pkgs/development/interpreters/groovy/default.nix +++ b/pkgs/development/interpreters/groovy/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "groovy-${version}"; - version = "2.4.5"; + version = "2.4.6"; src = fetchurl { url = "http://dl.bintray.com/groovy/maven/apache-groovy-binary-${version}.zip"; - sha256 = "1ajcrma18z0zr7h69bg4v2brxnxa4ljc9a55pk4q92vi3ypyks47"; + sha256 = "0s474wy7db7j1pans5ks986b52bdmn40l29zl6xl44y23fsvagwv"; }; buildInputs = [ unzip makeWrapper ]; From 8ce822665599ba4779b55866f7121066597ac454 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Thu, 12 May 2016 20:59:15 +0200 Subject: [PATCH 058/128] libfilezilla: 0.5.0 -> 0.5.1 --- pkgs/development/libraries/libfilezilla/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libfilezilla/default.nix b/pkgs/development/libraries/libfilezilla/default.nix index 4381f9e6c73..3e0310736dd 100644 --- a/pkgs/development/libraries/libfilezilla/default.nix +++ b/pkgs/development/libraries/libfilezilla/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libfilezilla-${version}"; - version = "0.5.0"; + version = "0.5.1"; src = fetchurl { url = "mirror://sourceforge/project/filezilla/libfilezilla/${version}/${name}.tar.bz2"; - sha256 = "07f5hk5izqgqjadrwy608gi0w3scm3zvpsv63j7bgfqk67qilslc"; + sha256 = "1ydpk6i5vjd78i0531cxlkjvlmvvrsfyc7hv7wx81ws3rkp5hnsq"; }; meta = with stdenv.lib; { From 67394f91528e8e7031de1174b56619ae56cddd01 Mon Sep 17 00:00:00 2001 From: Samuel Rivas Date: Thu, 12 May 2016 22:15:40 +0200 Subject: [PATCH 059/128] emacs: hide wrapper dependencies Move all the dependencies to their own derivation, so that we don't publish all of them if the wrapper is installed in a profile. The previous solution just moved them to a custom directory to avoid conflicts, this refactors that and completely hides them, while preserving the desired improvement of adding only one directory to each of the emacs search paths --- pkgs/build-support/emacs/wrapper.nix | 98 ++++++++++++++-------------- pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/emacs-packages.nix | 4 +- 3 files changed, 53 insertions(+), 51 deletions(-) diff --git a/pkgs/build-support/emacs/wrapper.nix b/pkgs/build-support/emacs/wrapper.nix index 7be4d21bfa8..45931e6914a 100644 --- a/pkgs/build-support/emacs/wrapper.nix +++ b/pkgs/build-support/emacs/wrapper.nix @@ -32,7 +32,7 @@ in customEmacsPackages.emacsWithPackages (epkgs: [ epkgs.evil epkgs.magit ]) */ -{ lib, lndir, makeWrapper, stdenv }: self: +{ lib, lndir, makeWrapper, runCommand, stdenv }: self: with lib; let inherit (self) emacs; in @@ -49,67 +49,69 @@ stdenv.mkDerivation { name = (appendToName "with-packages" emacs).name; nativeBuildInputs = [ emacs lndir makeWrapper ]; inherit emacs explicitRequires; - phases = [ "installPhase" ]; - installPhase = '' - readonly SHARE="share/emacs-with-packages" - mkdir -p "$out/bin" - mkdir -p "$out/$SHARE/bin" - mkdir -p "$out/$SHARE/site-lisp" + # Store all paths we want to add to emacs here, so that we only need to add + # one path to the load lists + deps = runCommand "emacs-packages-deps" + { inherit explicitRequires lndir emacs; } + '' + mkdir -p $out/bin + mkdir -p $out/share/emacs/site-lisp - local requires - for pkg in $explicitRequires; do - findInputs $pkg requires propagated-user-env-packages - done - # requires now holds all requested packages and their transitive dependencies + local requires + for pkg in $explicitRequires; do + findInputs $pkg requires propagated-user-env-packages + done + # requires now holds all requested packages and their transitive dependencies - siteStart="$out/$SHARE/site-lisp/site-start.el" + linkPath() { + local pkg=$1 + local origin_path=$2 + local dest_path=$3 - # Begin the new site-start.el by loading the original, which sets some - # NixOS-specific paths. Paths are searched in the reverse of the order - # they are specified in, so user and system profile paths are searched last. - cat >"$siteStart" <"$siteStart" < Date: Thu, 12 May 2016 13:54:32 -0700 Subject: [PATCH 060/128] fix pip URL --- pkgs/development/python-modules/bootstrapped-pip/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/bootstrapped-pip/default.nix b/pkgs/development/python-modules/bootstrapped-pip/default.nix index a905503b440..f510c5c884b 100644 --- a/pkgs/development/python-modules/bootstrapped-pip/default.nix +++ b/pkgs/development/python-modules/bootstrapped-pip/default.nix @@ -18,7 +18,7 @@ in stdenv.mkDerivation rec { version = "8.1.2"; src = fetchurl { - url = "https://pypi.python.org/packages/py2.py3/p/pip/pip-${version}-py2.py3-none-any.whl"; + url = "https://pypi.python.org/packages/9c/32/004ce0852e0a127f07f358b715015763273799bd798956fa930814b60f39/pip-${version}-py2.py3-none-any.whl"; sha256 = "18cjrd66mn4a0gwa99zzs89lrb0xn4xmajdzya6zqd7v16cdsr34"; }; From 79914075f478272d5355515d6034d480d8d95940 Mon Sep 17 00:00:00 2001 From: Ricardo Ardissone Date: Thu, 12 May 2016 18:40:33 -0300 Subject: [PATCH 061/128] SDL: Revert "SDL: use mesa_noglu instead of mesa" This reverts commit a9a94df4e644168de200c3689d3c53100256bf74. --- pkgs/development/libraries/SDL/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/SDL/default.nix b/pkgs/development/libraries/SDL/default.nix index 5d97a7fa59e..6c3920ff8aa 100644 --- a/pkgs/development/libraries/SDL/default.nix +++ b/pkgs/development/libraries/SDL/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchpatch, pkgconfig, audiofile, libcap -, openglSupport ? false, mesa_noglu ? null +, openglSupport ? false, mesa ? null , alsaSupport ? true, alsaLib ? null , x11Support ? true, xlibsWrapper ? null, libXrandr ? null , pulseaudioSupport ? true, libpulseaudio ? null @@ -10,7 +10,7 @@ # PulseAudio. assert (stdenv.isLinux && !(stdenv ? cross)) -> alsaSupport || pulseaudioSupport; -assert openglSupport -> (mesa_noglu != null && x11Support); +assert openglSupport -> (mesa != null && x11Support); assert x11Support -> (xlibsWrapper != null && libXrandr != null); assert alsaSupport -> alsaLib != null; assert pulseaudioSupport -> libpulseaudio != null; @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { optionals x11Support [ xlibsWrapper libXrandr ] ++ optional alsaSupport alsaLib ++ optional stdenv.isLinux libcap ++ - optional openglSupport mesa_noglu ++ + optional openglSupport mesa ++ optional pulseaudioSupport libpulseaudio ++ optional stdenv.isDarwin Cocoa; From 06436894a7c66f84d91e287296f920e2464f812b Mon Sep 17 00:00:00 2001 From: Ricardo Ardissone Date: Wed, 11 May 2016 10:29:13 -0300 Subject: [PATCH 062/128] scorched3d: fix build by adding fftwSinglePrec --- pkgs/games/scorched3d/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/games/scorched3d/default.nix b/pkgs/games/scorched3d/default.nix index 3a32e12101c..f64f9e38f00 100644 --- a/pkgs/games/scorched3d/default.nix +++ b/pkgs/games/scorched3d/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ mesa glew openalSoft freealut wxGTK libogg freetype libvorbis - SDL SDL_net expat libjpeg libpng + SDL SDL_net expat libjpeg libpng fftwSinglePrec ]; nativeBuildInputs = [ pkgconfig ]; From df8958435e1fd0c6d55394e95d3d3d2e0edca474 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Fri, 13 May 2016 02:28:24 +0200 Subject: [PATCH 063/128] grafana: 2.6.0 -> 3.0.1 (#15395) * grafana: 2.6.0 -> 3.0.1 * grafana module: Fix anonymous auth & add analytics config --- nixos/modules/services/monitoring/grafana.nix | 14 ++++++++++++-- pkgs/servers/monitoring/grafana/default.nix | 11 +++++------ 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/nixos/modules/services/monitoring/grafana.nix b/nixos/modules/services/monitoring/grafana.nix index 5c6f063b149..defbd9289dc 100644 --- a/nixos/modules/services/monitoring/grafana.nix +++ b/nixos/modules/services/monitoring/grafana.nix @@ -36,7 +36,9 @@ let USERS_AUTO_ASSIGN_ORG = b2s cfg.users.autoAssignOrg; USERS_AUTO_ASSIGN_ORG_ROLE = cfg.users.autoAssignOrgRole; - AUTH_ANONYMOUS_ENABLE = b2s cfg.auth.anonymous.enable; + AUTH_ANONYMOUS_ENABLED = b2s cfg.auth.anonymous.enable; + + ANALYTICS_REPORTING_ENABLED = b2s cfg.analytics.reporting.enable; } // cfg.extraOptions; in { @@ -196,6 +198,14 @@ in { }; }; + analytics.reporting = { + enable = mkOption { + description = "Whether to allow anonymous usage reporting to stats.grafana.net"; + default = true; + type = types.bool; + }; + }; + extraOptions = mkOption { description = '' Extra configuration options passed as env variables as specified in @@ -218,7 +228,7 @@ in { after = ["networking.target"]; environment = mapAttrs' (n: v: nameValuePair "GF_${n}" (toString v)) envOptions; serviceConfig = { - ExecStart = "${cfg.package}/bin/grafana -homepath ${cfg.dataDir}"; + ExecStart = "${cfg.package}/bin/grafana-server -homepath ${cfg.dataDir}"; WorkingDirectory = cfg.dataDir; User = "grafana"; }; diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index e9ba8aa7aa8..55ef139624c 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -1,21 +1,20 @@ { lib, goPackages, fetchurl, fetchFromGitHub }: goPackages.buildGoPackage rec { - version = "2.6.0"; + version = "3.0.1"; name = "grafana-v${version}"; goPackagePath = "github.com/grafana/grafana"; - subPackages = [ "./" ]; src = fetchFromGitHub { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "160jarvmfvrzpk8agbl44761qz4rw273d59jg6kzd0ghls03wipr"; + sha256 = "1zykgf8xq7m040d4yljcbz23gh8ppaqnxj50ncj1cjyi5k88i3i9"; }; srcStatic = fetchurl { - url = "https://grafanarel.s3.amazonaws.com/builds/grafana-${version}.linux-x64.tar.gz"; - sha256 = "1i4aw5jvamgqfaanxlh3l83sn8xx10wpihciihvf7s3846s623ab"; + url = "https://grafanarel.s3.amazonaws.com/builds/grafana-${version}-.linux-x64.tar.gz"; + sha256 = "14wq2cbf4djnwbbyfbhnwmwqpfh5g4yp1dckg5zzf2109ymkjrqd"; }; preBuild = "export GOPATH=$GOPATH:$NIX_BUILD_TOP/go/src/${goPackagePath}/Godeps/_workspace"; @@ -29,7 +28,7 @@ goPackages.buildGoPackage rec { description = "Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB & OpenTSDB"; license = licenses.asl20; homepage = http://grafana.org/; - maintainers = with maintainers; [ offline ]; + maintainers = with maintainers; [ offline fpletz ]; platforms = platforms.linux; }; } From 3aa2992bc10d80ad9a3b3090f6b8ea5a5206f60b Mon Sep 17 00:00:00 2001 From: zimbatm Date: Fri, 13 May 2016 09:25:01 +0100 Subject: [PATCH 064/128] packer: 0.8.6 -> 0.10.1 --- pkgs/development/tools/packer/default.nix | 54 +- pkgs/development/tools/packer/deps.nix | 965 ++++++++++++---------- 2 files changed, 551 insertions(+), 468 deletions(-) diff --git a/pkgs/development/tools/packer/default.nix b/pkgs/development/tools/packer/default.nix index 716b489d3d7..fc8ef5ff964 100644 --- a/pkgs/development/tools/packer/default.nix +++ b/pkgs/development/tools/packer/default.nix @@ -1,35 +1,53 @@ -{ stdenv, lib, go, gox, fetchgit, fetchhg, fetchbzr, fetchFromGitHub }: +{ stdenv, lib, go, gox, goPackages, fetchFromGitHub +, fetchgit, fetchhg, fetchbzr, fetchsvn }: stdenv.mkDerivation rec { - name = "packer-0.8.6"; + name = "packer-${version}"; + version = "0.10.1"; src = import ./deps.nix { - inherit stdenv lib fetchgit fetchhg fetchbzr fetchFromGitHub; + inherit stdenv lib go gox goPackages fetchgit fetchhg fetchbzr fetchsvn; }; - buildInputs = [ go gox ]; + buildInputs = [ go gox goPackages.tools ]; + + configurePhase = '' + export GOPATH=$PWD/share/go + export XC_ARCH=$(go env GOARCH) + export XC_OS=$(go env GOOS) + + mkdir $GOPATH/bin + + cd $GOPATH/src/github.com/mitchellh/packer + + # Don't fetch the deps + substituteInPlace "Makefile" --replace ': deps' ':' + + # Avoid using git + sed \ + -e "s|GITBRANCH:=.*||" \ + -e "s|GITSHA:=.*|GITSHA=${src.rev}|" \ + -i Makefile + sed \ + -e "s|GIT_COMMIT=.*|GIT_COMMIT=${src.rev}|" \ + -e "s|GIT_DIRTY=.*|GIT_DIRTY=|" \ + -i "scripts/build.sh" + ''; + + buildPhase = '' + make generate releasebin + ''; installPhase = '' - export GOPATH=$src - XC_ARCH=$(go env GOARCH) - XC_OS=$(go env GOOS) - mkdir -p $out/bin - - cd $src/src/github.com/mitchellh/packer - gox \ - -os="''${XC_OS}" \ - -arch="''${XC_ARCH}" \ - -output "$out/bin/packer-{{.Dir}}" \ - ./... - mv $out/bin/packer{*packer*,} + mv bin/* $out/bin ''; meta = with stdenv.lib; { description = "A tool for creating identical machine images for multiple platforms from a single source configuration"; - homepage = "http://www.packer.io"; + homepage = http://www.packer.io; license = licenses.mpl20; - maintainers = with maintainers; [ cstrahan ]; + maintainers = with maintainers; [ cstrahan zimbatm ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/packer/deps.nix b/pkgs/development/tools/packer/deps.nix index 5f8e69679c1..2be1911cf91 100644 --- a/pkgs/development/tools/packer/deps.nix +++ b/pkgs/development/tools/packer/deps.nix @@ -1,507 +1,572 @@ # This file was generated by go2nix. -{ stdenv, lib, fetchFromGitHub, fetchgit, fetchhg, fetchbzr }: +{ stdenv, lib, go, gox, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }: -let - goDeps = [ +with goPackages; + +buildGoPackage rec { + name = "packer-${version}"; + version = "20160507-${stdenv.lib.strings.substring 0 7 rev}"; + rev = "4e5f65131b5491ab44ff8aa0626abe4a85597ac0"; + + buildInputs = [ go gox goPackages.tools ]; + + goPackagePath = "github.com/mitchellh/packer"; + + src = fetchgit { + inherit rev; + url = "https://github.com/mitchellh/packer"; + sha256 = "1a61f022h4ygnkp1lyr7vhq5w32a3f061dymgkqmz4c3b8fzcc10"; + }; + + extraSrcs = [ { - root = "github.com/mitchellh/packer"; - src = fetchFromGitHub { - owner = "mitchellh"; - repo = "packer"; - rev = "f8f7b7a34c1be06058f5aca23a51247db12cdbc5"; - sha256 = "162ja4klyb3nv44rhdg2gd3xrr4n0l0gi49cn1mr1s2h9yznphyp"; - }; - } - { - root = "github.com/mitchellh/gox"; - src = fetchFromGitHub { - owner = "mitchellh"; - repo = "gox"; - rev = "ef1967b9f538fe467e6a82fc42ec5dff966ad4ea"; - sha256 = "0i9s8fp6m2igx93ffv3rf5v5hz7cwrx7pbxrz4cg94hba3sy3nfj"; - }; - } - { - root = "github.com/mitchellh/iochan"; - src = fetchFromGitHub { - owner = "mitchellh"; - repo = "iochan"; - rev = "87b45ffd0e9581375c491fef3d32130bb15c5bd7"; - sha256 = "1435kdcx3j1xgr6mm5c7w7hjx015jb20yfqlkp93q143hspf02fx"; - }; - } - { - root = "github.com/hashicorp/atlas-go"; - src = fetchFromGitHub { - owner = "hashicorp"; - repo = "atlas-go"; - rev = "d1d08e8e25f0659388ede7bb8157aaa4895f5347"; - sha256 = "0bbqh94i8qllp51ln1mmcjy5srny7s4xg0l353kccvk3c7s68m03"; - }; - } - { - root = "github.com/hashicorp/go-checkpoint"; - src = fetchFromGitHub { - owner = "hashicorp"; - repo = "go-checkpoint"; - rev = "88326f6851319068e7b34981032128c0b1a6524d"; - sha256 = "1npasn9lmvx57nw3wkswwvl5k0wmn01jpalbwv832x5wq4r0nsz4"; - }; - } - { - root = "github.com/hashicorp/go-msgpack"; - src = fetchFromGitHub { - owner = "hashicorp"; - repo = "go-msgpack"; - rev = "fa3f63826f7c23912c15263591e65d54d080b458"; - sha256 = "1f6rd6bm2dm2rk46x8cqrxh5nks1gpk6dvvsag7s5pdjgdxy951k"; - }; - } - { - root = "github.com/hashicorp/go-multierror"; - src = fetchFromGitHub { - owner = "hashicorp"; - repo = "go-multierror"; - rev = "56912fb08d85084aa318edcf2bba735b97cf35c5"; - sha256 = "0s01cqdab2f7fxkkjjk2wqx05a1shnwlvfn45h2pi3i4gapvcn0r"; - }; - } - { - root = "github.com/hashicorp/go-version"; - src = fetchFromGitHub { - owner = "hashicorp"; - repo = "go-version"; - rev = "999359b6b7a041ce16e695d51e92145b83f01087"; - sha256 = "0z2bzphrdkaxh5vnvjh3g25d6cykchshwwbyqgji91mpgjd30pbm"; - }; - } - { - root = "github.com/hashicorp/yamux"; - src = fetchFromGitHub { - owner = "hashicorp"; - repo = "yamux"; - rev = "ae139c4ae7fe21e9d99459d2acc57967cebb6918"; - sha256 = "1p5h2wklj8lb1vnjnd5kw7cshfmiw7jmzw9radln955hzd5xzbnl"; - }; - } - { - root = "github.com/mitchellh/cli"; - src = fetchFromGitHub { - owner = "mitchellh"; - repo = "cli"; - rev = "8102d0ed5ea2709ade1243798785888175f6e415"; - sha256 = "08mj1l94pww72jy34gk9a483hpic0rrackskfw13r3ycy997w7m2"; - }; - } - { - root = "github.com/mitchellh/mapstructure"; - src = fetchFromGitHub { - owner = "mitchellh"; - repo = "mapstructure"; - rev = "281073eb9eb092240d33ef253c404f1cca550309"; - sha256 = "1zjx9fv29639sp1fn84rxs830z7gp7bs38yd5y1hl5adb8s5x1mh"; - }; - } - { - root = "github.com/mitchellh/osext"; - src = fetchFromGitHub { - owner = "mitchellh"; - repo = "osext"; - rev = "0dd3f918b21bec95ace9dc86c7e70266cfc5c702"; - sha256 = "02pczqml6p1mnfdrygm3rs02g0r65qx8v1bi3x24dx8wv9dr5y23"; - }; - } - { - root = "github.com/mitchellh/panicwrap"; - src = fetchFromGitHub { - owner = "mitchellh"; - repo = "panicwrap"; - rev = "45cbfd3bae250c7676c077fb275be1a2968e066a"; - sha256 = "0mbha0nz6zcgp2pny2x03chq1igf9ylpz55xxq8z8g2jl6cxaghn"; - }; - } - { - root = "github.com/mitchellh/prefixedio"; - src = fetchFromGitHub { - owner = "mitchellh"; - repo = "prefixedio"; - rev = "89d9b535996bf0a185f85b59578f2e245f9e1724"; - sha256 = "0lc64rlizb412msd32am2fixkh0536pjv7czvgyw5fskn9kgk3y2"; - }; - } - { - root = "github.com/mitchellh/reflectwalk"; - src = fetchFromGitHub { - owner = "mitchellh"; - repo = "reflectwalk"; - rev = "eecf4c70c626c7cfbb95c90195bc34d386c74ac6"; - sha256 = "1nm2ig7gwlmf04w7dbqd8d7p64z2030fnnfbgnd56nmd7dz8gpxq"; - }; - } - { - root = "github.com/mitchellh/go-fs"; - src = fetchFromGitHub { - owner = "mitchellh"; - repo = "go-fs"; - rev = "a34c1b9334e86165685a9449b782f20465eb8c69"; - sha256 = "11sy85p77ffmavpiichzybrfvjm1ilsi4clx98n3363arksavs5i"; - }; - } - { - root = "github.com/mitchellh/goamz"; - src = fetchFromGitHub { - owner = "mitchellh"; - repo = "goamz"; - rev = "caaaea8b30ee15616494ee68abd5d8ebbbef05cf"; - sha256 = "0bshq69ir9h2nszbr74yvcg5wnd9a5skfmr9bgk014k9wwk7dc72"; - }; - } - { - root = "github.com/mitchellh/multistep"; - src = fetchFromGitHub { - owner = "mitchellh"; - repo = "multistep"; - rev = "162146fc57112954184d90266f4733e900ed05a5"; - sha256 = "0ydhbxziy9204qr43pjdh88y2jg34g2mhzdapjyfpf8a1rin6dn3"; - }; - } - { - root = "github.com/ActiveState/tail"; - src = fetchFromGitHub { - owner = "ActiveState"; - repo = "tail"; - rev = "4b368d1590196ade29993d6a0896591403180bbd"; - sha256 = "183y44skn75lkpsjd3zlbx8vc3b930p3nkpc1ybq3k50s4bzhsll"; - }; - } - { - root = "google.golang.org/api"; + goPackagePath = "github.com/ActiveState/tail"; + src = fetchgit { - url = "https://github.com/google/google-api-go-client.git"; - rev = "a5c3e2a4792aff40e59840d9ecdff0542a202a80"; - sha256 = "1kigddnbyrl9ddpj5rs8njvf1ck54ipi4q1282k0d6b3am5qfbj8"; + url = "https://github.com/ActiveState/tail"; + rev = "1a0242e795eeefe54261ff308dc685f7d29cc58c"; + sha256 = "0hhr2962xmbqzbf2p79xfrzbmjm33h61fj5zlazj7a55bwxn688d"; }; } { - root = "golang.org/x/crypto"; + goPackagePath = "github.com/Azure/azure-sdk-for-go"; + src = fetchgit { - url = "https://go.googlesource.com/crypto.git"; - rev = "81bf7719a6b7ce9b665598222362b50122dfc13b"; - sha256 = "0rwzc2ls842d0g588b5xik59srwzawch3nb1dlcqwm4a1132mvmr"; + url = "https://github.com/Azure/azure-sdk-for-go"; + rev = "a1883f7b98346e4908a6c25230c95a8a3026a10c"; + sha256 = "0pxqi0b8qwcc687si3zh6w1d594rxd6kn2wzx23clbp2nc5w3wf4"; }; } { - root = "golang.org/x/oauth2"; + goPackagePath = "github.com/Azure/go-autorest"; + src = fetchgit { - url = "https://go.googlesource.com/oauth2.git"; - rev = "397fe7649477ff2e8ced8fc0b2696f781e53745a"; - sha256 = "0fza0l7iwh6llkq2yzqn7dxi138vab0da64lnghfj1p71fprjzn8"; + url = "https://github.com/Azure/go-autorest"; + rev = "b01ec2b60f95678fa759f796bac3c6b9bceaead4"; + sha256 = "1vqwy4m26ps5lmp066zgiz04s7r2dwa832zjlfmpgha7id16pa0c"; }; } { - root = "golang.org/x/net"; + goPackagePath = "github.com/Azure/go-ntlmssp"; + src = fetchgit { - url = "https://go.googlesource.com/net.git"; - rev = "7654728e381988afd88e58cabfd6363a5ea91810"; - sha256 = "08i6kkzbckbc5k15bdlqkbird48zmc24qr505hlxlb11djjgdiml"; + url = "https://github.com/Azure/go-ntlmssp"; + rev = "e0b63eb299a769ea4b04dadfe530f6074b277afb"; + sha256 = "19bn9ds12cyf8y3w5brnxwg8lwdkg16ww9hmnq14y2kmli42l14m"; }; } { - root = "google.golang.org/appengine"; + goPackagePath = "github.com/armon/go-radix"; + src = fetchgit { - url = "https://github.com/golang/appengine.git"; - rev = "cdd515334b113fdc9b35cb1e7a3b457eeb5ad5cf"; - sha256 = "0l0rddpfbddbi8kizg2n25w7bdhf99f0iz7ghwz7fq6k4rmq44ws"; + url = "https://github.com/armon/go-radix"; + rev = "4239b77079c7b5d1243b7b4736304ce8ddb6f0f2"; + sha256 = "0md8li1gv4ji4vr63cfa2bcmslba94dzw6awzn5ndnpmdb7np6vh"; }; } { - root = "google.golang.org/cloud"; + goPackagePath = "github.com/aws/aws-sdk-go"; + src = fetchgit { - url = "https://github.com/GoogleCloudPlatform/gcloud-golang.git"; - rev = "e34a32f9b0ecbc0784865fb2d47f3818c09521d4"; - sha256 = "1rzac44kzhd7r6abdy5qyj69y64wy9r73vnxsdalfr5m0i55fqk4"; + url = "https://github.com/aws/aws-sdk-go"; + rev = "8041be5461786460d86b4358305fbdf32d37cfb2"; + sha256 = "06ilyl1z5mn6i0afd8ila4lr2vwqdgq5zby8v4v2g3dd39qi6jq2"; }; } { - root = "github.com/golang/protobuf"; - src = fetchFromGitHub { - owner = "golang"; - repo = "protobuf"; - rev = "59b73b37c1e45995477aae817e4a653c89a858db"; - sha256 = "1dx22jvhvj34ivpr7gw01fncg9yyx35mbpal4mpgnqka7ajmgjsa"; - }; - } - { - root = "github.com/mitchellh/gophercloud-fork-40444fb"; - src = fetchFromGitHub { - owner = "mitchellh"; - repo = "gophercloud-fork-40444fb"; - rev = "40444fbc2b10960682b34e6822eb9179216e1ae1"; - sha256 = "06bm7hfi03c75npzy51wbl9qyln35c3kzj9yn2w4fhn0k9dia9s3"; - }; - } - { - root = "github.com/racker/perigee"; - src = fetchFromGitHub { - owner = "racker"; - repo = "perigee"; - rev = "44a7879d89b7040bcdb51164a83292ef5bf9deec"; - sha256 = "04wscffagpbcfjs6br96n46aqy43cq6ndq16nlpvank0m98jaax0"; - }; - } - { - root = "github.com/going/toolkit"; - src = fetchFromGitHub { - owner = "going"; - repo = "toolkit"; - rev = "5bff591dc40da25dcc875d3fa1a3373d74d45411"; - sha256 = "15gnlqignm7xcp2chrz7d7qqlibkbfrrsvbcysk8lrj9l7md8vjf"; - }; - } - { - root = "github.com/mitchellh/go-vnc"; - src = fetchFromGitHub { - owner = "mitchellh"; - repo = "go-vnc"; - rev = "723ed9867aed0f3209a81151e52ddc61681f0b01"; - sha256 = "0nlya2rbmwb3jycqsyah1pn4386712mfrfiprprkbzcna9q7lp1h"; - }; - } - { - root = "github.com/howeyc/fsnotify"; - src = fetchFromGitHub { - owner = "howeyc"; - repo = "fsnotify"; - rev = "4894fe7efedeeef21891033e1cce3b23b9af7ad2"; - sha256 = "09r3h200nbw8a4d3rn9wxxmgma2a8i6ssaplf3zbdc2ykizsq7mn"; - }; - } - { - root = "gopkg.in/tomb.v1"; + goPackagePath = "github.com/bgentry/speakeasy"; + src = fetchgit { - url = "https://gopkg.in/tomb.v1.git"; - rev = "dd632973f1e7218eb1089048e0798ec9ae7dceb8"; - sha256 = "1lqmq1ag7s4b3gc3ddvr792c5xb5k6sfn0cchr3i2s7f1c231zjv"; + url = "https://github.com/bgentry/speakeasy"; + rev = "36e9cfdd690967f4f690c6edcc9ffacd006014a0"; + sha256 = "0grr82p10dk51l082xaqkpq3izj5bhby3l15gj866kngybfb4nzr"; }; } { - root = "github.com/vaughan0/go-ini"; - src = fetchFromGitHub { - owner = "vaughan0"; - repo = "go-ini"; - rev = "a98ad7ee00ec53921f08832bc06ecf7fd600e6a1"; - sha256 = "1l1isi3czis009d9k5awsj4xdxgbxn4n9yqjc1ac7f724x6jacfa"; + goPackagePath = "github.com/dgrijalva/jwt-go"; + + src = fetchgit { + url = "https://github.com/dgrijalva/jwt-go"; + rev = "f2193411bd642f7db03249fd79d5292c9b34916a"; + sha256 = "0nkzn8i5f7x3wyi7mhhj9vpdbkdjvrb9hhrw0fqy6vcghia6dhrj"; }; } { - root = "github.com/aws/aws-sdk-go"; - src = fetchFromGitHub { - owner = "aws"; - repo = "aws-sdk-go"; - rev = "f096b7d61df3d7d6d97f0e701f92616d1ea5420d"; - sha256 = "0z2fknqxdyb5vw4am46cn60m15p9fjsqzpzaj2pamp436l0cpjkw"; + goPackagePath = "github.com/digitalocean/godo"; + + src = fetchgit { + url = "https://github.com/digitalocean/godo"; + rev = "6ca5b770f203b82a0fca68d0941736458efa8a4f"; + sha256 = "00di15gdv47jfdr1l8cqphmlv5bzalxk7dk53g3mif7vwhs8749j"; }; } { - root = "github.com/digitalocean/godo"; - src = fetchFromGitHub { - owner = "digitalocean"; - repo = "godo"; - rev = "2a0d64a42bb60a95677748a4d5729af6184330b4"; - sha256 = "0854577b08fw9bjflk044ph16p15agxhh6xbzn71rhfvxg5yg5mi"; - }; - } - { - root = "github.com/dylanmei/winrmtest"; - src = fetchFromGitHub { - owner = "dylanmei"; - repo = "winrmtest"; - rev = "025617847eb2cf9bd1d851bc3b22ed28e6245ce5"; - sha256 = "1i0wq6r1vm3nhnia3ycm5l590gyia7cwh6971ppnn4rrdmvsw2qh"; - }; - } - { - root = "github.com/klauspost/pgzip"; - src = fetchFromGitHub { - owner = "klauspost"; - repo = "pgzip"; - rev = "47f36e165cecae5382ecf1ec28ebf7d4679e307d"; - sha256 = "1bfka02xrhp4fg9pz2v4ppxa46b59bwy5n88c7hbbxqxm8z30yca"; - }; - } - { - root = "github.com/masterzen/winrm"; - src = fetchFromGitHub { - owner = "masterzen"; - repo = "winrm"; - rev = "54ea5d01478cfc2afccec1504bd0dfcd8c260cfa"; - sha256 = "0qzdmsjgcf5n0jzjf4gd22lhqwn9yagynk1izjz3978gr025p2zm"; - }; - } - { - root = "github.com/google/go-querystring"; - src = fetchFromGitHub { - owner = "google"; - repo = "go-querystring"; - rev = "2a60fc2ba6c19de80291203597d752e9ba58e4c0"; - sha256 = "0raf6r3dd8rxxppzrbhp1y6k5csgfkfs7b0jylj65sbg0hbzxvbr"; - }; - } - { - root = "github.com/go-ini/ini"; - src = fetchFromGitHub { - owner = "go-ini"; - repo = "ini"; - rev = "afbd495e5aaea13597b5e14fe514ddeaa4d76fc3"; - sha256 = "0xi8zr9qw38sdbv95c2ip31yczbm4axdvmj3ljyivn9xh2nbxfia"; - }; - } - { - root = "github.com/klauspost/compress"; - src = fetchFromGitHub { - owner = "klauspost"; - repo = "compress"; - rev = "112706bf3743c241303219f9c5ce2e6635f69221"; - sha256 = "1gyf5hf8wivbx6s99x2rxq2a335b49av2xb43nikgbzm4qn7win7"; - }; - } - { - root = "github.com/masterzen/simplexml"; - src = fetchFromGitHub { - owner = "masterzen"; - repo = "simplexml"; - rev = "95ba30457eb1121fa27753627c774c7cd4e90083"; - sha256 = "0pwsis1f5n4is0nmn6dnggymj32mldhbvihv8ikn3nglgxclz4kz"; - }; - } - { - root = "github.com/masterzen/xmlpath"; - src = fetchFromGitHub { - owner = "masterzen"; - repo = "xmlpath"; - rev = "13f4951698adc0fa9c1dda3e275d489a24201161"; - sha256 = "1y81h7ymk3dp3w3a2iy6qd1dkm323rkxa27dzxw8vwy888j5z8bk"; - }; - } - { - root = "github.com/jmespath/go-jmespath"; - src = fetchFromGitHub { - owner = "jmespath"; - repo = "go-jmespath"; - rev = "c01cf91b011868172fdcd9f41838e80c9d716264"; - sha256 = "0gfrqwl648qngp77g8m1g9g7difggq2cac4ydjw9bpx4bd7mw1rw"; - }; - } - { - root = "github.com/klauspost/cpuid"; - src = fetchFromGitHub { - owner = "klauspost"; - repo = "cpuid"; - rev = "349c675778172472f5e8f3a3e0fe187e302e5a10"; - sha256 = "1s8baj42k66ny77qkm3n06kwayk4srwf4b9ss42612f3h86ka5i2"; - }; - } - { - root = "github.com/nu7hatch/gouuid"; - src = fetchFromGitHub { - owner = "nu7hatch"; - repo = "gouuid"; - rev = "179d4d0c4d8d407a32af483c2354df1d2c91e6c3"; - sha256 = "1isyfix5w1wm26y3a15ha3nnpsxqaxz5ngq06hnh6c6y0inl2fwj"; - }; - } - { - root = "github.com/klauspost/crc32"; - src = fetchFromGitHub { - owner = "klauspost"; - repo = "crc32"; - rev = "999f3125931f6557b991b2f8472172bdfa578d38"; - sha256 = "00ws3hrszxdnyj0cjk9b8b44xc8x5hizm0h22x6m3bb4c5b487wv"; - }; - } - { - root = "github.com/pierrec/lz4"; - src = fetchFromGitHub { - owner = "pierrec"; - repo = "lz4"; - rev = "383c0d87b5dd7c090d3cddefe6ff0c2ffbb88470"; - sha256 = "0l23bmzqfvgh61zlikj6iakg0kz7lybs8zf0nscylskl2hlr09rp"; - }; - } - { - root = "github.com/packer-community/winrmcp"; - src = fetchFromGitHub { - owner = "packer-community"; - repo = "winrmcp"; - rev = "3d184cea22ee1c41ec1697e0d830ff0c78f7ea97"; - sha256 = "0g2rwwhykm1z099gwkg1nmb1ggnizqlm2pbmy3qsdvjnl5246ca4"; - }; - } - { - root = "github.com/dylanmei/iso8601"; - src = fetchFromGitHub { - owner = "dylanmei"; - repo = "iso8601"; + goPackagePath = "github.com/dylanmei/iso8601"; + + src = fetchgit { + url = "https://github.com/dylanmei/iso8601"; rev = "2075bf119b58e5576c6ed9f867b8f3d17f2e54d4"; sha256 = "0px5aq4w96yyjii586h3049xm7rvw5r8w7ph3axhyismrqddqgx1"; }; } { - root = "github.com/pierrec/xxHash"; - src = fetchFromGitHub { - owner = "pierrec"; - repo = "xxHash"; + goPackagePath = "github.com/dylanmei/winrmtest"; + + src = fetchgit { + url = "https://github.com/dylanmei/winrmtest"; + rev = "025617847eb2cf9bd1d851bc3b22ed28e6245ce5"; + sha256 = "1i0wq6r1vm3nhnia3ycm5l590gyia7cwh6971ppnn4rrdmvsw2qh"; + }; + } + { + goPackagePath = "github.com/go-ini/ini"; + + src = fetchgit { + url = "https://github.com/go-ini/ini"; + rev = "afbd495e5aaea13597b5e14fe514ddeaa4d76fc3"; + sha256 = "0dl5ibrrq2i887i0bf8a9m887rhnpgv6wmwyc1sj8a75c0yd02da"; + }; + } + { + goPackagePath = "github.com/google/go-querystring"; + + src = fetchgit { + url = "https://github.com/google/go-querystring"; + rev = "2a60fc2ba6c19de80291203597d752e9ba58e4c0"; + sha256 = "117211606pv0p3p4cblpnirrrassprrvvcq2svwpplsq5vff1rka"; + }; + } + { + goPackagePath = "github.com/hashicorp/atlas-go"; + + src = fetchgit { + url = "https://github.com/hashicorp/atlas-go"; + rev = "95fa852edca41c06c4ce526af4bb7dec4eaad434"; + sha256 = "002lpvxi6my8dk4d4ks091ad66bj6rnz4xchbzpqwvp7n8097aqz"; + }; + } + { + goPackagePath = "github.com/hashicorp/errwrap"; + + src = fetchgit { + url = "https://github.com/hashicorp/errwrap"; + rev = "7554cd9344cec97297fa6649b055a8c98c2a1e55"; + sha256 = "0kmv0p605di6jc8i1778qzass18m0mv9ks9vxxrfsiwcp4la82jf"; + }; + } + { + goPackagePath = "github.com/hashicorp/go-checkpoint"; + + src = fetchgit { + url = "https://github.com/hashicorp/go-checkpoint"; + rev = "e4b2dc34c0f698ee04750bf2035d8b9384233e1b"; + sha256 = "0qjfk1fh5zmn04yzxn98zam8j4ay5mzd5kryazqj01hh7szd0sh5"; + }; + } + { + goPackagePath = "github.com/hashicorp/go-cleanhttp"; + + src = fetchgit { + url = "https://github.com/hashicorp/go-cleanhttp"; + rev = "875fb671b3ddc66f8e2f0acc33829c8cb989a38d"; + sha256 = "0ammv6gn9cmh6padaaw76wa6xvg22a9b3sw078v9chcvfk2bggha"; + }; + } + { + goPackagePath = "github.com/hashicorp/go-multierror"; + + src = fetchgit { + url = "https://github.com/hashicorp/go-multierror"; + rev = "d30f09973e19c1dfcd120b2d9c4f168e68d6b5d5"; + sha256 = "0dc02mvv11hvanh12nhw8jsislnxf6i4gkh6vcil0x23kj00z3iz"; + }; + } + { + goPackagePath = "github.com/hashicorp/go-rootcerts"; + + src = fetchgit { + url = "https://github.com/hashicorp/go-rootcerts"; + rev = "6bb64b370b90e7ef1fa532be9e591a81c3493e00"; + sha256 = "1a81fcm1i0ji2iva0dcimiichgwpbcb7lx0vyaks87zj5wf04qy9"; + }; + } + { + goPackagePath = "github.com/hashicorp/go-version"; + + src = fetchgit { + url = "https://github.com/hashicorp/go-version"; + rev = "7e3c02b30806fa5779d3bdfc152ce4c6f40e7b38"; + sha256 = "0ibqaq6z02himzci4krbfhqdi8fw2gzj9a8z375nl3qbzdgzqnm7"; + }; + } + { + goPackagePath = "github.com/hashicorp/yamux"; + + src = fetchgit { + url = "https://github.com/hashicorp/yamux"; + rev = "df949784da9ed028ee76df44652e42d37a09d7e4"; + sha256 = "080bmbdaq88ri2pn63mcjc4kq2y2sy1742ypqfgrvwssa1ynvnhy"; + }; + } + { + goPackagePath = "github.com/hpcloud/tail"; + + src = fetchgit { + url = "https://github.com/hpcloud/tail"; + rev = "1a0242e795eeefe54261ff308dc685f7d29cc58c"; + sha256 = "0hhr2962xmbqzbf2p79xfrzbmjm33h61fj5zlazj7a55bwxn688d"; + }; + } + { + goPackagePath = "github.com/jmespath/go-jmespath"; + + src = fetchgit { + url = "https://github.com/jmespath/go-jmespath"; + rev = "c01cf91b011868172fdcd9f41838e80c9d716264"; + sha256 = "0lp2m33a6x2pjbv5xlbbcr48qri32s84hcgm3xmgvmrx6zyi74zg"; + }; + } + { + goPackagePath = "github.com/kardianos/osext"; + + src = fetchgit { + url = "https://github.com/kardianos/osext"; + rev = "29ae4ffbc9a6fe9fb2bc5029050ce6996ea1d3bc"; + sha256 = "1mawalaz84i16njkz6f9fd5jxhcbxkbsjnav3cmqq2dncv2hyv8a"; + }; + } + { + goPackagePath = "github.com/klauspost/compress"; + + src = fetchgit { + url = "https://github.com/klauspost/compress"; + rev = "f86d2e6d8a77c6a2c4e42a87ded21c6422f7557e"; + sha256 = "17f9zxrs2k8q5kghppjnbn0xzl3i4fgl4852kj8cg94b51s5ll9f"; + }; + } + { + goPackagePath = "github.com/klauspost/cpuid"; + + src = fetchgit { + url = "https://github.com/klauspost/cpuid"; + rev = "349c675778172472f5e8f3a3e0fe187e302e5a10"; + sha256 = "1y7gqpcpcb29ws77328vfm30s8nsrbxyylfpb8ksb8wwg062yv6v"; + }; + } + { + goPackagePath = "github.com/klauspost/crc32"; + + src = fetchgit { + url = "https://github.com/klauspost/crc32"; + rev = "999f3125931f6557b991b2f8472172bdfa578d38"; + sha256 = "1sxnq3i7wvcdqx0l91jc04nf5584ym8dxzkz3xvivm8p7kz2xjns"; + }; + } + { + goPackagePath = "github.com/klauspost/pgzip"; + + src = fetchgit { + url = "https://github.com/klauspost/pgzip"; + rev = "47f36e165cecae5382ecf1ec28ebf7d4679e307d"; + sha256 = "00jcx3pdwxi4r2l3m4b8jb17b2srckz488cmjvd1vqkr85a0jp2x"; + }; + } + { + goPackagePath = "github.com/kr/fs"; + + src = fetchgit { + url = "https://github.com/kr/fs"; + rev = "2788f0dbd16903de03cb8186e5c7d97b69ad387b"; + sha256 = "1c0fipl4rsh0v5liq1ska1dl83v3llab4k6lm8mvrx9c4dyp71ly"; + }; + } + { + goPackagePath = "github.com/masterzen/simplexml"; + + src = fetchgit { + url = "https://github.com/masterzen/simplexml"; + rev = "95ba30457eb1121fa27753627c774c7cd4e90083"; + sha256 = "0pwsis1f5n4is0nmn6dnggymj32mldhbvihv8ikn3nglgxclz4kz"; + }; + } + { + goPackagePath = "github.com/masterzen/winrm"; + + src = fetchgit { + url = "https://github.com/masterzen/winrm"; + rev = "54ea5d01478cfc2afccec1504bd0dfcd8c260cfa"; + sha256 = "1d4khg7c4vw645id0x301zkgidm4ah6nkmiq52j8wsivi85yhn66"; + }; + } + { + goPackagePath = "github.com/masterzen/xmlpath"; + + src = fetchgit { + url = "https://github.com/masterzen/xmlpath"; + rev = "13f4951698adc0fa9c1dda3e275d489a24201161"; + sha256 = "1y81h7ymk3dp3w3a2iy6qd1dkm323rkxa27dzxw8vwy888j5z8bk"; + }; + } + { + goPackagePath = "github.com/mattn/go-isatty"; + + src = fetchgit { + url = "https://github.com/mattn/go-isatty"; + rev = "56b76bdf51f7708750eac80fa38b952bb9f32639"; + sha256 = "0l8lcp8gcqgy0g1cd89r8vk96nami6sp9cnkx60ms1dn6cqwf5n3"; + }; + } + { + goPackagePath = "github.com/mitchellh/cli"; + + src = fetchgit { + url = "https://github.com/mitchellh/cli"; + rev = "5c87c51cedf76a1737bf5ca3979e8644871598a6"; + sha256 = "1ajxzh3winjnmqhd4yn6b6f155vfzi0dszhzl4a00zb5pdppp1rd"; + }; + } + { + goPackagePath = "github.com/mitchellh/go-fs"; + + src = fetchgit { + url = "https://github.com/mitchellh/go-fs"; + rev = "a34c1b9334e86165685a9449b782f20465eb8c69"; + sha256 = "11sy85p77ffmavpiichzybrfvjm1ilsi4clx98n3363arksavs5i"; + }; + } + { + goPackagePath = "github.com/mitchellh/go-homedir"; + + src = fetchgit { + url = "https://github.com/mitchellh/go-homedir"; + rev = "d682a8f0cf139663a984ff12528da460ca963de9"; + sha256 = "0vsiby9fbkaz7q067wmc6s5pzgpq4gdfx66cj2a1lbdarf7j1kbs"; + }; + } + { + goPackagePath = "github.com/mitchellh/go-vnc"; + + src = fetchgit { + url = "https://github.com/mitchellh/go-vnc"; + rev = "723ed9867aed0f3209a81151e52ddc61681f0b01"; + sha256 = "0nlya2rbmwb3jycqsyah1pn4386712mfrfiprprkbzcna9q7lp1h"; + }; + } + { + goPackagePath = "github.com/mitchellh/iochan"; + + src = fetchgit { + url = "https://github.com/mitchellh/iochan"; + rev = "87b45ffd0e9581375c491fef3d32130bb15c5bd7"; + sha256 = "1435kdcx3j1xgr6mm5c7w7hjx015jb20yfqlkp93q143hspf02fx"; + }; + } + { + goPackagePath = "github.com/mitchellh/mapstructure"; + + src = fetchgit { + url = "https://github.com/mitchellh/mapstructure"; + rev = "281073eb9eb092240d33ef253c404f1cca550309"; + sha256 = "1zjx9fv29639sp1fn84rxs830z7gp7bs38yd5y1hl5adb8s5x1mh"; + }; + } + { + goPackagePath = "github.com/mitchellh/multistep"; + + src = fetchgit { + url = "https://github.com/mitchellh/multistep"; + rev = "162146fc57112954184d90266f4733e900ed05a5"; + sha256 = "0ydhbxziy9204qr43pjdh88y2jg34g2mhzdapjyfpf8a1rin6dn3"; + }; + } + { + goPackagePath = "github.com/mitchellh/packer"; + + src = fetchgit { + url = "https://github.com/mitchellh/packer"; + rev = "4e5f65131b5491ab44ff8aa0626abe4a85597ac0"; + sha256 = "1a61f022h4ygnkp1lyr7vhq5w32a3f061dymgkqmz4c3b8fzcc10"; + }; + } + { + goPackagePath = "github.com/mitchellh/panicwrap"; + + src = fetchgit { + url = "https://github.com/mitchellh/panicwrap"; + rev = "a1e50bc201f387747a45ffff020f1af2d8759e88"; + sha256 = "0w5y21psgrl1afsap613c3qw84ik7zhnalnv3bf6r51hyv187y69"; + }; + } + { + goPackagePath = "github.com/mitchellh/prefixedio"; + + src = fetchgit { + url = "https://github.com/mitchellh/prefixedio"; + rev = "6e6954073784f7ee67b28f2d22749d6479151ed7"; + sha256 = "0an2pnnda33ns94v7x0sv9kmsnk62r8xm0cj4d69f2p63r85fdp6"; + }; + } + { + goPackagePath = "github.com/mitchellh/reflectwalk"; + + src = fetchgit { + url = "https://github.com/mitchellh/reflectwalk"; + rev = "eecf4c70c626c7cfbb95c90195bc34d386c74ac6"; + sha256 = "1nm2ig7gwlmf04w7dbqd8d7p64z2030fnnfbgnd56nmd7dz8gpxq"; + }; + } + { + goPackagePath = "github.com/nu7hatch/gouuid"; + + src = fetchgit { + url = "https://github.com/nu7hatch/gouuid"; + rev = "179d4d0c4d8d407a32af483c2354df1d2c91e6c3"; + sha256 = "175alsrjb2a1qzwp1l323vwwpirzaj95yfqqfi780698myhpb52k"; + }; + } + { + goPackagePath = "github.com/packer-community/winrmcp"; + + src = fetchgit { + url = "https://github.com/packer-community/winrmcp"; + rev = "f1bcf36a69fa2945e65dd099eee11b560fbd3346"; + sha256 = "0pj5gfbmx507lp1w3gfn23x0rn0x5rih9nqij9g8d9c4m1sx3275"; + }; + } + { + goPackagePath = "github.com/pierrec/lz4"; + + src = fetchgit { + url = "https://github.com/pierrec/lz4"; + rev = "383c0d87b5dd7c090d3cddefe6ff0c2ffbb88470"; + sha256 = "0l23bmzqfvgh61zlikj6iakg0kz7lybs8zf0nscylskl2hlr09rp"; + }; + } + { + goPackagePath = "github.com/pierrec/xxHash"; + + src = fetchgit { + url = "https://github.com/pierrec/xxHash"; rev = "5a004441f897722c627870a981d02b29924215fa"; sha256 = "146ibrgvgh61jhbbv9wks0mabkci3s0m68sg6shmlv1yixkw6gja"; }; } { - root = "github.com/satori/go.uuid"; - src = fetchFromGitHub { - owner = "satori"; - repo = "go.uuid"; + goPackagePath = "github.com/pkg/sftp"; + + src = fetchgit { + url = "https://github.com/pkg/sftp"; + rev = "e84cc8c755ca39b7b64f510fe1fffc1b51f210a5"; + sha256 = "0v6g9j9pnkqz72x5409y8gd8ycniziydvsjb4298dkd21d3b94dg"; + }; + } + { + goPackagePath = "github.com/rackspace/gophercloud"; + + src = fetchgit { + url = "https://github.com/rackspace/gophercloud"; + rev = "53d1dc4400e1ebcd37a0e01d8c1fe2f4db3b99d2"; + sha256 = "0rdyljj395k1w7xnxw1i76w29fgl517mvs7bsqll35lss2gbhan2"; + }; + } + { + goPackagePath = "github.com/satori/go.uuid"; + + src = fetchgit { + url = "https://github.com/satori/go.uuid"; rev = "d41af8bb6a7704f00bc3b7cba9355ae6a5a80048"; sha256 = "0lw8k39s7hab737rn4nngpbsganrniiv7px6g41l6f6vci1skyn2"; }; } { - root = "github.com/rackspace/gophercloud"; - src = fetchFromGitHub { - owner = "rackspace"; - repo = "gophercloud"; - rev = "680aa02616313d8399abc91f17a444cf9292f0e1"; - sha256 = "0pxzvhh6l1gfn31k6g8fz3x4b6mz88cx2rgpims0ys5cl212zrp1"; - }; - } - { - root = "gopkg.in/fsnotify.v0"; - src = fetchFromGitHub { - owner = "go-fsnotify"; - repo = "fsnotify"; - rev = "ea925a0a47d225b2ca7f9932b01d2ed4f3ec74f6"; - sha256 = "15wqjpkfzsxnaxbz6y4r91hw6812g3sc4ipagxw1bya9klbnkdc9"; - }; - } - { - root = "github.com/tent/http-link-go"; - src = fetchFromGitHub { - owner = "tent"; - repo = "http-link-go"; + goPackagePath = "github.com/tent/http-link-go"; + + src = fetchgit { + url = "https://github.com/tent/http-link-go"; rev = "ac974c61c2f990f4115b119354b5e0b47550e888"; - sha256 = "1fph21b6vp4cm73fkkykffggi57m656x9fd1k369fr6jbvq5fffj"; + sha256 = "0iwq842pvp5y77cr25yanj1cgqzmkz1aw6jzgjrrmlqqkdad5z8c"; + }; + } + { + goPackagePath = "github.com/ugorji/go"; + + src = fetchgit { + url = "https://github.com/ugorji/go"; + rev = "646ae4a518c1c3be0739df898118d9bccf993858"; + sha256 = "0njncpdbh115l5mxyks08jh91kdmy0mvbmxj9mr1psv5k97gf0pn"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + + src = fetchgit { + url = "https://go.googlesource.com/crypto"; + rev = "1f22c0103821b9390939b6776727195525381532"; + sha256 = "05ahvn9g9cj7797n8ryfxv2g26v3lx1pza9d9pg97iw0rvar9i1h"; + }; + } + { + goPackagePath = "golang.org/x/net"; + + src = fetchgit { + url = "https://go.googlesource.com/net"; + rev = "6ccd6698c634f5d835c40c1c31848729e0cecda1"; + sha256 = "05c7kdjkvf7hrdiv1k12nyss6s8chhakqn1adxbrrahr6rl1nhpj"; + }; + } + { + goPackagePath = "golang.org/x/oauth2"; + + src = fetchgit { + url = "https://go.googlesource.com/oauth2"; + rev = "8a57ed94ffd43444c0879fe75701732a38afc985"; + sha256 = "10pxnbsy1lnx7a1x6g3cna5gdm11aal1r446dpmpgj94xiw96mxv"; + }; + } + { + goPackagePath = "google.golang.org/api"; + + src = fetchgit { + url = "https://code.googlesource.com/google-api-go-client"; + rev = "ddff2aff599105a55549cf173852507dfa094b7f"; + sha256 = "03058zh0v997fxmlvd8r4m63r3z0fzg6fval6wnxw3wq22m7h3yx"; + }; + } + { + goPackagePath = "google.golang.org/cloud"; + + src = fetchgit { + url = "https://code.googlesource.com/gocloud"; + rev = "5a3b06f8b5da3b7c3a93da43163b872c86c509ef"; + sha256 = "03zrw3mgh82gvfgz17k97n8hivnvvplc42c7vyr76i90n1mv29g7"; + }; + } + { + goPackagePath = "gopkg.in/fsnotify.v1"; + + src = fetchgit { + url = "https://gopkg.in/fsnotify.v1"; + rev = "8611c35ab31c1c28aa903d33cf8b6e44a399b09e"; + sha256 = "17a7z88860hhmbgmpc2si1n67s8zk3vzwv5r4wyhrsljcq0bcv9q"; + }; + } + { + goPackagePath = "gopkg.in/tomb.v1"; + + src = fetchgit { + url = "https://gopkg.in/tomb.v1"; + rev = "dd632973f1e7218eb1089048e0798ec9ae7dceb8"; + sha256 = "1lqmq1ag7s4b3gc3ddvr792c5xb5k6sfn0cchr3i2s7f1c231zjv"; + }; + } + { + goPackagePath = "gopkg.in/xmlpath.v2"; + + src = fetchgit { + url = "https://gopkg.in/xmlpath.v2"; + rev = "860cbeca3ebcc600db0b213c0e83ad6ce91f5739"; + sha256 = "0jgvd0y78fir4vkcj8acs0pdvlc0xr7i7cspbkm2yjm8wv23p63h"; }; } ]; - -in - -stdenv.mkDerivation rec { - name = "go-deps"; - - buildCommand = - lib.concatStrings - (map (dep: '' - mkdir -p $out/src/`dirname ${dep.root}` - ln -s ${dep.src} $out/src/${dep.root} - '') goDeps); } From 7d0570a253af460ae953f85265fa577fc7eb04c8 Mon Sep 17 00:00:00 2001 From: Chris Martin Date: Fri, 13 May 2016 04:52:14 -0400 Subject: [PATCH 065/128] idea.android-studio: 2.0.0.20 -> 2.1.1.0 --- pkgs/applications/editors/idea/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix index d51eee6817f..931c607c7d5 100644 --- a/pkgs/applications/editors/idea/default.nix +++ b/pkgs/applications/editors/idea/default.nix @@ -146,16 +146,16 @@ in { - android-studio = buildAndroidStudio rec { + android-studio = let buildNumber = "143.2821654"; in buildAndroidStudio rec { name = "android-studio-${version}"; - version = "2.0.0.20"; - build = "143.2739321"; + version = "2.1.1.0"; + build = "AI-${buildNumber}"; description = "Android development environment based on IntelliJ IDEA"; license = stdenv.lib.licenses.asl20; src = fetchurl { url = "https://dl.google.com/dl/android/studio/ide-zips/${version}" + - "/android-studio-ide-${build}-linux.zip"; - sha256 = "14bb4ha868015wm8v8vivxfylfzm7gbvf01h82w4bhzdbzgn1zpr"; + "/android-studio-ide-${buildNumber}-linux.zip"; + sha256 = "1zxxzyhny7j4vzlydrhwz3g8l8zcml84mhkcf5ckx8xr50j3m101"; }; }; From 9fe577bdc07c90969dd20b70921c7cbdb06f4376 Mon Sep 17 00:00:00 2001 From: Chris Martin Date: Fri, 13 May 2016 04:53:22 -0400 Subject: [PATCH 066/128] idea.clion: 1.2.4 -> 1.2.5 --- pkgs/applications/editors/idea/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix index 931c607c7d5..bd71d30b8c2 100644 --- a/pkgs/applications/editors/idea/default.nix +++ b/pkgs/applications/editors/idea/default.nix @@ -161,13 +161,13 @@ in clion = buildClion rec { name = "clion-${version}"; - version = "1.2.4"; - build = "143.1186"; + version = "1.2.5"; + build = "CL-143.2370.46"; description = "C/C++ IDE. New. Intelligent. Cross-platform"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/cpp/${name}.tar.gz"; - sha256 = "0asjgfshbximjk6i57fz3d2ykby5qw5x6nhw91cpzrzszc59dmm2"; + sha256 = "0ll1rcnnbd1if6x5rp3qw35lvp5zdzmvyg9n1lha89i34xiw36jp"; }; }; From 149ba81f793c67bb1519d799a640a8e146a34dfd Mon Sep 17 00:00:00 2001 From: Chris Martin Date: Fri, 13 May 2016 04:53:55 -0400 Subject: [PATCH 067/128] idea.idea14-community: 14.1.6 -> 14.1.7 --- pkgs/applications/editors/idea/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix index bd71d30b8c2..28910f5c383 100644 --- a/pkgs/applications/editors/idea/default.nix +++ b/pkgs/applications/editors/idea/default.nix @@ -173,13 +173,13 @@ in idea14-community = buildIdea rec { name = "idea-community-${version}"; - version = "14.1.6"; - build = "IC-141.3056.4"; + version = "14.1.7"; + build = "IC-141.3058.30"; description = "Integrated Development Environment (IDE) by Jetbrains, community edition"; license = stdenv.lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz"; - sha256 = "157969b37sbafby1r1gva2xm3a3y0dgj7pisgxmk8k1d5rgncvil"; + sha256 = "1i4mdjm9dd6zvxlpdgd3bqg45ir0cfc9hl55cdc0hg5qwbz683fz"; }; }; From 4217743b94c718691d8d57e616fd4d59385c4071 Mon Sep 17 00:00:00 2001 From: Chris Martin Date: Fri, 13 May 2016 04:54:25 -0400 Subject: [PATCH 068/128] idea.idea-community: 2016.1.1 -> 2016.1.2 --- pkgs/applications/editors/idea/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix index 28910f5c383..7b4b6732ed5 100644 --- a/pkgs/applications/editors/idea/default.nix +++ b/pkgs/applications/editors/idea/default.nix @@ -185,13 +185,13 @@ in idea-community = buildIdea rec { name = "idea-community-${version}"; - version = "2016.1.1"; - build = "IC-145.597"; + version = "2016.1.2"; + build = "IC-145.971.21"; description = "Integrated Development Environment (IDE) by Jetbrains, community edition"; license = stdenv.lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz"; - sha256 = "1r0kvq8vk8ln4cabqjvfqp0lfy9vf8c8vddh76sd41d635pamba6"; + sha256 = "15c92wsfw16j48k12x4vw78886yf9yjx7hwwjamgf28lmzvc37iz"; }; }; From ac076eeb207ec46e2ab291c5cee0b11ec44d5dff Mon Sep 17 00:00:00 2001 From: Chris Martin Date: Fri, 13 May 2016 04:54:48 -0400 Subject: [PATCH 069/128] idea.idea15-ultimate: 15.0.5 -> 15.0.6 --- pkgs/applications/editors/idea/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix index 7b4b6732ed5..fdb6e1306b4 100644 --- a/pkgs/applications/editors/idea/default.nix +++ b/pkgs/applications/editors/idea/default.nix @@ -197,13 +197,13 @@ in idea15-ultimate = buildIdea rec { name = "idea-ultimate-${version}"; - version = "15.0.5"; - build = "IU-143.2332.3"; + version = "15.0.6"; + build = "IU-143.2370.31"; description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/idea/ideaIU-${version}.tar.gz"; - sha256 = "1hvc5cmbfpp0qad0236ffh3g7zwfk64rh5bkkb750h3387jz7nr2"; + sha256 = "012aap2qn0jx4x34bdv9ivrsr86vvf683srb5vpj27hc4l6rw6ll"; }; }; From 69448be7760e45a7a1c72cde5d9ba369889d58c0 Mon Sep 17 00:00:00 2001 From: Chris Martin Date: Fri, 13 May 2016 04:55:10 -0400 Subject: [PATCH 070/128] idea.idea-ultimate: 2016.1.1 -> 2016.1.2 --- pkgs/applications/editors/idea/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix index fdb6e1306b4..aa3c9082a93 100644 --- a/pkgs/applications/editors/idea/default.nix +++ b/pkgs/applications/editors/idea/default.nix @@ -209,13 +209,13 @@ in idea-ultimate = buildIdea rec { name = "idea-ultimate-${version}"; - version = "2016.1.1"; - build = "IU-145.597"; + version = "2016.1.2"; + build = "IU-145.971.21"; description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/idea/ideaIU-${version}.tar.gz"; - sha256 = "d5a7d2d657fe2ad170716054c6ccd164e509cf50ee6eee8b61fe3490071940df"; + sha256 = "0dxpx4nx845vgqxl5qz029d3w3kn3hi98wgzympidplxrphgalgy"; }; }; From 22b8bb4bd07b66aeb79277469ebbd0e03ae39503 Mon Sep 17 00:00:00 2001 From: Chris Martin Date: Fri, 13 May 2016 04:55:32 -0400 Subject: [PATCH 071/128] idea.ruby-mine: 7.1.2 -> 7.1.5 --- pkgs/applications/editors/idea/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix index aa3c9082a93..0e8527a712b 100644 --- a/pkgs/applications/editors/idea/default.nix +++ b/pkgs/applications/editors/idea/default.nix @@ -221,13 +221,13 @@ in ruby-mine = buildRubyMine rec { name = "ruby-mine-${version}"; - version = "7.1.2"; - build = "141.1119"; + version = "7.1.5"; + build = "RM-141.3058.29"; description = "The Most Intelligent Ruby and Rails IDE"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/ruby/RubyMine-${version}.tar.gz"; - sha256 = "1gz14lv5jhnrnshp7lkx3wgrdf0y60abs4q78yhv2x9dc6ld1gmj"; + sha256 = "04fcxj1xlap9mxmwf051s926p2darlj5kwl4lms2gy5d8b2lhd5l"; }; }; From 89f46ab3e38d3066971c7e91d8903219a65ed460 Mon Sep 17 00:00:00 2001 From: Chris Martin Date: Fri, 13 May 2016 04:55:57 -0400 Subject: [PATCH 072/128] idea.pycharm-community: 2016.1.2 -> 2016.1.3 --- pkgs/applications/editors/idea/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix index 0e8527a712b..e370e0abf06 100644 --- a/pkgs/applications/editors/idea/default.nix +++ b/pkgs/applications/editors/idea/default.nix @@ -233,13 +233,13 @@ in pycharm-community = buildPycharm rec { name = "pycharm-community-${version}"; - version = "2016.1.2"; - build = "145.844"; + version = "2016.1.3"; + build = "PC-145.971.25"; description = "PyCharm Community Edition"; license = stdenv.lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "1kxwjg5l2fzpn6hr0iir0dv1n5l02jl02aff9wrj95186wxivg3a"; + sha256 = "1ks7crrfnhzkdxban2hh2pnr986vqwmac5zybmb1ighcyamhdi4q"; }; }; From 8cf2a2dbeba55e4d1ac62601f616e127433a7b41 Mon Sep 17 00:00:00 2001 From: Chris Martin Date: Fri, 13 May 2016 04:56:36 -0400 Subject: [PATCH 073/128] idea.pycharm-professional: 2016.1.2 -> 2016.1.3 --- pkgs/applications/editors/idea/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix index e370e0abf06..8a8e33477c2 100644 --- a/pkgs/applications/editors/idea/default.nix +++ b/pkgs/applications/editors/idea/default.nix @@ -245,13 +245,13 @@ in pycharm-professional = buildPycharm rec { name = "pycharm-professional-${version}"; - version = "2016.1.2"; - build = "145.844"; + version = "2016.1.3"; + build = "PY-145.971.25"; description = "PyCharm Professional Edition"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "1kwi9d80r2yp5ivbvslrj70iam966rv4a8diajbwpcc26m7rj3kk"; + sha256 = "1rn0i5qbvfjbl4v571ngmyslispibcq5ab0fb7xjl38vr1y417f2"; }; }; From ee511456fcc1471e2a91301f444017b5c09e03c4 Mon Sep 17 00:00:00 2001 From: Chris Martin Date: Fri, 13 May 2016 04:57:03 -0400 Subject: [PATCH 074/128] idea.phpstorm: 10.0.1 -> 10.0.4 --- pkgs/applications/editors/idea/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix index 8a8e33477c2..951b7f22b40 100644 --- a/pkgs/applications/editors/idea/default.nix +++ b/pkgs/applications/editors/idea/default.nix @@ -257,13 +257,13 @@ in phpstorm = buildPhpStorm rec { name = "phpstorm-${version}"; - version = "10.0.1"; - build = "PS-143.382"; + version = "10.0.4"; + build = "PS-143.2370.33"; description = "Professional IDE for Web and PHP developers"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz"; - sha256 = "12bqil8pxzmbv8a7pxn2529ph2x7szr3wvkvgxaisydm463kpdk8"; + sha256 = "0fi042zvjpg5pn2mnhj3bbrdkl1b9vmhpf2l6ca4nr0rhjjv7dsm"; }; }; From ff48229c4271cd1aa7c6e4b3c818edb1cb548ec1 Mon Sep 17 00:00:00 2001 From: Chris Martin Date: Fri, 13 May 2016 04:57:20 -0400 Subject: [PATCH 075/128] idea.webstorm: 10.0.4 -> 10.0.5 --- pkgs/applications/editors/idea/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix index 951b7f22b40..f3bca7bce77 100644 --- a/pkgs/applications/editors/idea/default.nix +++ b/pkgs/applications/editors/idea/default.nix @@ -269,13 +269,13 @@ in webstorm = buildWebStorm rec { name = "webstorm-${version}"; - version = "10.0.4"; - build = "141.1550"; + version = "10.0.5"; + build = "WS-141.3058.35"; description = "Professional IDE for Web and JavaScript development"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/webstorm/WebStorm-${version}.tar.gz"; - sha256 = "171i544ssvjnbr1vq6ncxlj38swsygacavsa427qa4s5wzyvdipj"; + sha256 = "0a5s6f99wyql5pgjl94pf4ljdbviik3b8dbr1s6b7c6jn1gk62ic"; }; }; From bb73e25cdc0dfdf2509d0c6f87b6549fa658c09a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Fri, 13 May 2016 11:41:17 +0200 Subject: [PATCH 076/128] coreutils: disable checks when using non-standard storeDir That should help with https://github.com/NixOS/nix/issues/512 --- pkgs/tools/misc/coreutils/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix index 377e2d62eef..1ad4f473e9d 100644 --- a/pkgs/tools/misc/coreutils/default.nix +++ b/pkgs/tools/misc/coreutils/default.nix @@ -68,7 +68,8 @@ let # (http://thread.gmane.org/gmane.comp.gnu.core-utils.bugs/19025), # Darwin (http://thread.gmane.org/gmane.comp.gnu.core-utils.bugs/19351), # and {Open,Free}BSD. - doCheck = stdenv ? glibc; + # With non-standard storeDir: https://github.com/NixOS/nix/issues/512 + doCheck = stdenv ? glibc && builtins.storeDir == "/nix/store"; # Saw random failures like ‘help2man: can't get '--help' info from # man/sha512sum.td/sha512sum’. From 0d4dfbd57040d0629d2651cdc089bf2146053918 Mon Sep 17 00:00:00 2001 From: Michael Alan Dorman Date: Fri, 13 May 2016 06:34:44 -0400 Subject: [PATCH 077/128] Revert "Remove obsolete xml-rpc version" This reverts commit 5017e24756199689b197db81f8b3e0de3ba5d454. --- .../editors/emacs-modes/xml-rpc/default.nix | 32 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/applications/editors/emacs-modes/xml-rpc/default.nix diff --git a/pkgs/applications/editors/emacs-modes/xml-rpc/default.nix b/pkgs/applications/editors/emacs-modes/xml-rpc/default.nix new file mode 100644 index 00000000000..661430516b7 --- /dev/null +++ b/pkgs/applications/editors/emacs-modes/xml-rpc/default.nix @@ -0,0 +1,32 @@ +{stdenv, fetchurl, emacs}: + +stdenv.mkDerivation rec { + name = "xml-rpc-1.6.8"; + + src = fetchurl { + url = https://launchpadlibrarian.net/40270196/xml-rpc.el; + sha256 = "0i8hf90yhrjwqrv7q1f2g1cff6ld8apqkka42fh01wkdys1fbm7b"; + }; + + phases = [ "buildPhase" "installPhase"]; + + buildInputs = [ emacs ]; + + buildPhase = '' + cp $src xml-rpc.el + emacs --batch -f batch-byte-compile xml-rpc.el + ''; + + installPhase = '' + install -d $out/share/emacs/site-lisp + install xml-rpc.el* $out/share/emacs/site-lisp + ''; + + meta = { + description = "Elisp implementation of clientside XML-RPC"; + homepage = https://launchpad.net/xml-rpc-el; + license = stdenv.lib.licenses.gpl3Plus; + + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7317adaf4ec..bb765438e9a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12383,6 +12383,8 @@ in writeGood = callPackage ../applications/editors/emacs-modes/writegood { }; + xmlRpc = callPackage ../applications/editors/emacs-modes/xml-rpc { }; + cask = callPackage ../applications/editors/emacs-modes/cask { }; }; From ada0d47b3e6c73948c2e5e6dfd014b5adf0979cc Mon Sep 17 00:00:00 2001 From: Michael Alan Dorman Date: Fri, 13 May 2016 06:35:06 -0400 Subject: [PATCH 078/128] Revert "Remove obsolete s version" This reverts commit 7ccdbff95b71af79976b247fb11da9d4ea238b83. --- .../editors/emacs-modes/s/default.nix | 23 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/applications/editors/emacs-modes/s/default.nix diff --git a/pkgs/applications/editors/emacs-modes/s/default.nix b/pkgs/applications/editors/emacs-modes/s/default.nix new file mode 100644 index 00000000000..b818348939e --- /dev/null +++ b/pkgs/applications/editors/emacs-modes/s/default.nix @@ -0,0 +1,23 @@ +{stdenv, fetchurl, emacs}: + +let version = "1.9.0"; + +in stdenv.mkDerivation { + name = "emacs-s-${version}"; + + src = fetchurl { + url = "https://github.com/magnars/s.el/archive/${version}.tar.gz"; + sha256 = "1gah2k577gvnmxlpw7zrz0jr571vghzhdv2hbgchlgah07czd091"; + }; + + buildInputs = [ emacs ]; + + buildPhase = '' + emacs -L . --batch -f batch-byte-compile *.el + ''; + + installPhase = '' + install -d $out/share/emacs/site-lisp + install *.el *.elc $out/share/emacs/site-lisp + ''; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bb765438e9a..a064a187bd5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12368,6 +12368,8 @@ in rudel = callPackage ../applications/editors/emacs-modes/rudel { }; + s = callPackage ../applications/editors/emacs-modes/s { }; + sbtMode = callPackage ../applications/editors/emacs-modes/sbt-mode { }; scalaMode1 = callPackage ../applications/editors/emacs-modes/scala-mode/v1.nix { }; From 1b314a70c25aafa49e76addbbde1f567f1e54834 Mon Sep 17 00:00:00 2001 From: Michael Alan Dorman Date: Fri, 13 May 2016 06:35:19 -0400 Subject: [PATCH 079/128] Revert "Remove obsolete pcache version" This reverts commit 5cc4ff09fac74ba9717b8663e5713faf88d71386. --- .../editors/emacs-modes/pcache/default.nix | 30 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/applications/editors/emacs-modes/pcache/default.nix diff --git a/pkgs/applications/editors/emacs-modes/pcache/default.nix b/pkgs/applications/editors/emacs-modes/pcache/default.nix new file mode 100644 index 00000000000..f4dcf03dee8 --- /dev/null +++ b/pkgs/applications/editors/emacs-modes/pcache/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchgit, emacs }: + +stdenv.mkDerivation rec { + name = "pcache-0.2.3"; + + src = fetchgit { + url = "https://github.com/sigma/pcache.git"; + rev = "fa8f863546e2e8f2fc0a70f5cc766a7f584e01b6"; + sha256 = "f7cdad5a729b24f96ec69db4adfd19daf45c27aaf3a0267385b252cb2e59daa0"; + }; + + buildInputs = [ emacs ]; + + buildPhase = '' + emacs --batch -f batch-byte-compile pcache.el + ''; + + installPhase = '' + install -d $out/share/emacs/site-lisp + install pcache.el pcache.elc $out/share/emacs/site-lisp + ''; + + meta = { + description = "Persistent caching for Emacs"; + homepage = https://github.com/sigma/pcache.el; + license = stdenv.lib.licenses.gpl2Plus; + + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a064a187bd5..60ea94f2b5d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12340,6 +12340,8 @@ in org2blog = callPackage ../applications/editors/emacs-modes/org2blog { }; + pcache = callPackage ../applications/editors/emacs-modes/pcache { }; + phpMode = callPackage ../applications/editors/emacs-modes/php { }; prologMode = callPackage ../applications/editors/emacs-modes/prolog { }; From dabef63eafa4d1e8cd8834442fc5dcc22dcdd406 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Fri, 13 May 2016 11:36:50 +0100 Subject: [PATCH 080/128] sublime3: 3103 -> 3114 --- pkgs/applications/editors/sublime3/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/editors/sublime3/default.nix b/pkgs/applications/editors/sublime3/default.nix index 153c6920b47..4eb428f37d8 100644 --- a/pkgs/applications/editors/sublime3/default.nix +++ b/pkgs/applications/editors/sublime3/default.nix @@ -6,7 +6,7 @@ assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"; assert gksuSupport -> gksu != null; let - build = "3103"; + build = "3114"; libPath = stdenv.lib.makeLibraryPath [glib xorg.libX11 gtk cairo pango]; redirects = [ "/usr/bin/pkexec=${pkexecPath}" ] ++ stdenv.lib.optional gksuSupport "/usr/bin/gksudo=${gksu}/bin/gksudo"; @@ -20,13 +20,13 @@ in let fetchurl { name = "sublimetext-${build}.tar.bz2"; url = "https://download.sublimetext.com/sublime_text_3_build_${build}_x32.tar.bz2"; - sha256 = "1qidnczndyhyp9rfzmpqah00lrx7z1a0fy7a13lzwqq3gslhwf1l"; + sha256 = "0xrfx76ilw5hlx26hv9zx1kw8q9qf76646yyjmn36p6mq9vs6y0d"; } else fetchurl { name = "sublimetext-${build}.tar.bz2"; url = "https://download.sublimetext.com/sublime_text_3_build_${build}_x64.tar.bz2"; - sha256 = "1x8kb3prs6wa5s5rj0gfq96zx6k5q3s168yhfsa36x2szi6x6y4x"; + sha256 = "0nmi2gkpz56a47a0f56nx6nl3sl7gif035517gx2v82113y9nh66"; }; dontStrip = true; @@ -76,7 +76,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "Sophisticated text editor for code, markup and prose"; homepage = https://www.sublimetext.com/; - maintainers = with maintainers; [ wmertens demin-dmitriy ]; + maintainers = with maintainers; [ wmertens demin-dmitriy zimbatm ]; license = licenses.unfree; platforms = platforms.linux; }; From 8fa6930d8451f65a18bb46a5336e379c9fb48b22 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 13 May 2016 13:34:29 +0200 Subject: [PATCH 081/128] pythonPackages.aws_shell: use futures 3.0, not 2.2 --- pkgs/top-level/python-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5df1f1dd927..c2eec6d9d2e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2624,7 +2624,7 @@ in modules // { }; propagatedBuildInputs = [ self.botocore self.jmespath ] ++ - (if isPy3k then [] else [self.futures_2_2]); + (if isPy3k then [] else [self.futures]); buildInputs = [ self.docutils self.nose self.mock ]; checkPhase = '' runHook preCheck From 74883be684140fb691992a415bda87595a1b6a7b Mon Sep 17 00:00:00 2001 From: Adam Russell Date: Mon, 9 May 2016 07:24:43 -0500 Subject: [PATCH 082/128] idea.idea14-ultimate: init at 14.1.7 (cherry picked from commit a4f13a8baeab85376d6eb0a49382a927ef3049ed) --- pkgs/applications/editors/idea/default.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix index f3bca7bce77..3bb63114a63 100644 --- a/pkgs/applications/editors/idea/default.nix +++ b/pkgs/applications/editors/idea/default.nix @@ -195,6 +195,18 @@ in }; }; + idea14-ultimate = buildIdea rec { + name = "idea-ultimate-${version}"; + version = "14.1.7"; + build = "IU-141.3058.30"; + description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license"; + license = stdenv.lib.licenses.unfree; + src = fetchurl { + url = "https://download.jetbrains.com/idea/ideaIU-${version}.tar.gz"; + sha256 = "a2259249f6e7bf14ba17b0af90a18d24d9b4670af60d24f0bb51af2f62500fc2"; + }; + }; + idea15-ultimate = buildIdea rec { name = "idea-ultimate-${version}"; version = "15.0.6"; From 993dadd2136ffca9a6f81d7e4d6acd5116da83a0 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Fri, 13 May 2016 02:31:33 +0200 Subject: [PATCH 083/128] gnuradio: 3.7.9.1 -> 3.7.9.2 --- pkgs/applications/misc/gnuradio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/gnuradio/default.nix b/pkgs/applications/misc/gnuradio/default.nix index 734ffee51e2..543f84bdfbc 100644 --- a/pkgs/applications/misc/gnuradio/default.nix +++ b/pkgs/applications/misc/gnuradio/default.nix @@ -23,11 +23,11 @@ stdenv.mkDerivation rec { name = "gnuradio-${version}"; - version = "3.7.9.1"; + version = "3.7.9.2"; src = fetchurl { url = "http://gnuradio.org/releases/gnuradio/${name}.tar.gz"; - sha256 = "0zlnxyqq3dyrg0nz2hpydlhyzv26vlkdavs8w01k448lxkqz01lw"; + sha256 = "0qdmakvgq3jxnnqpcn3k4q07vj8ycrbyzv32h76k71cv13w2yrki"; }; buildInputs = [ From c6ff91912b3ae2793d4b89e3d6eb2c90448ad292 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Fri, 13 May 2016 00:15:54 +0200 Subject: [PATCH 084/128] ncmpcpp: 0.7.3 -> 0.7.4 --- pkgs/applications/audio/ncmpcpp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/ncmpcpp/default.nix b/pkgs/applications/audio/ncmpcpp/default.nix index f0fd29697b1..528a0dcda05 100644 --- a/pkgs/applications/audio/ncmpcpp/default.nix +++ b/pkgs/applications/audio/ncmpcpp/default.nix @@ -15,11 +15,11 @@ assert taglibSupport -> (taglib != null); with stdenv.lib; stdenv.mkDerivation rec { name = "ncmpcpp-${version}"; - version = "0.7.3"; + version = "0.7.4"; src = fetchurl { url = "http://ncmpcpp.rybczak.net/stable/${name}.tar.bz2"; - sha256 = "04mj6r0whikliblxfbz92pibwcd7a3ywkryf01a89zd4bi1jk2rc"; + sha256 = "0qqy3w2vw3i9rxz0z8n0plmwwfv6gzrxip86l894l1xbvzqja16p"; }; configureFlags = [ "BOOST_LIB_SUFFIX=" ] From c7e69de43b5aee838742a1ea17acf98085fc57a1 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Fri, 13 May 2016 00:13:22 +0200 Subject: [PATCH 085/128] p0f: 3.08b -> 3.09b --- pkgs/tools/security/p0f/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/p0f/default.nix b/pkgs/tools/security/p0f/default.nix index 3ffc19b5ca9..0b6a9644424 100644 --- a/pkgs/tools/security/p0f/default.nix +++ b/pkgs/tools/security/p0f/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "p0f-${version}"; - version = "3.08b"; + version = "3.09b"; src = fetchurl { url = "http://lcamtuf.coredump.cx/p0f3/releases/${name}.tgz"; - sha256 = "1v4afs66qxk53h8vhfk5x17xvgj32qixwjvz4023gnx59gzag2fs"; + sha256 = "0zqfq3gdnha29ckvlqmyp36c0jhj7f69bhqqx31yb6vkirinhfsl"; }; buildInputs = [ libpcap ]; From 54e87bad04f49ca7b1923b42f031326218b7ce94 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Thu, 12 May 2016 23:54:58 +0200 Subject: [PATCH 086/128] tinc: 1.0.26 -> 1.0.28 --- pkgs/tools/networking/tinc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/tinc/default.nix b/pkgs/tools/networking/tinc/default.nix index df3465969bb..7fbbc55dd61 100644 --- a/pkgs/tools/networking/tinc/default.nix +++ b/pkgs/tools/networking/tinc/default.nix @@ -1,12 +1,12 @@ {stdenv, fetchurl, lzo, openssl, zlib}: stdenv.mkDerivation rec { - version = "1.0.26"; + version = "1.0.28"; name = "tinc-${version}"; src = fetchurl { url = "http://www.tinc-vpn.org/packages/tinc-${version}.tar.gz"; - sha256 = "08ds8s32cjslms1q227ihd6jz35583v378ij4pknfa5xngfijhrb"; + sha256 = "0i5kx3hza359nclyhb60kxlzqyx0phmg175350hww28g6scjcl0b"; }; buildInputs = [ lzo openssl zlib ]; From d51056383731b41a027778249e356bacc46a9385 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Fri, 13 May 2016 17:23:23 +0200 Subject: [PATCH 087/128] oraclejdk8: jmc is only available in jdk, not in jre --- pkgs/development/compilers/oraclejdk/jdk-linux-base.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix index 79d962cd7ce..775971821aa 100644 --- a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix +++ b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix @@ -165,8 +165,10 @@ let result = stdenv.mkDerivation rec { EOF # Oracle Java Mission Control needs to know where libgtk-x11 and related is - wrapProgram "$out/bin/jmc" \ - --suffix-each LD_LIBRARY_PATH ':' "${rpath}" \ + if test -n "$installjdk"; then + wrapProgram "$out/bin/jmc" \ + --suffix-each LD_LIBRARY_PATH ':' "${rpath}" + fi ''; inherit installjdk pluginSupport; From 9e56f3a9b50d56afd26440f697ac73bd73eaf2ee Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Fri, 13 May 2016 17:23:43 +0200 Subject: [PATCH 088/128] oraclejdk8: 8u91 -> 8u92 --- pkgs/development/compilers/oraclejdk/jdk8-linux.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/oraclejdk/jdk8-linux.nix b/pkgs/development/compilers/oraclejdk/jdk8-linux.nix index 0a9792f2b4a..d6d783b8a30 100644 --- a/pkgs/development/compilers/oraclejdk/jdk8-linux.nix +++ b/pkgs/development/compilers/oraclejdk/jdk8-linux.nix @@ -1,9 +1,9 @@ import ./jdk-linux-base.nix { productVersion = "8"; - patchVersion = "91"; + patchVersion = "92"; downloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html; - sha256_i686 = "0lndni81vfpz2l6zb8zsshaavk0483q5jc8yzj4fdjv6wnshbkay"; - sha256_x86_64 = "0lkm3fz1vdi69f34sysavvh3abx603j1frc9hxvr08pwvmm536vg"; + sha256_i686 = "095j2hh2xas05jajy4qdj9hxq3k460x4m12rcaxkaxw754imj0vj"; + sha256_x86_64 = "11wrqd3qbkhimbw9n4g9i0635pjhhnijwxyid7lvjv26kdgg58vr"; jceName = "jce_policy-8.zip"; jceDownloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html; sha256JCE = "0n8b6b8qmwb14lllk2lk1q1ahd3za9fnjigz5xn65mpg48whl0pk"; From 9458198868570f736291378cf1e93c1f0ecc7330 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Thu, 12 May 2016 23:31:23 +0200 Subject: [PATCH 089/128] f2fs-tools: 1.5.0 -> 1.6.1 --- pkgs/tools/filesystems/f2fs-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/f2fs-tools/default.nix b/pkgs/tools/filesystems/f2fs-tools/default.nix index 36e95ab2d6a..3173c13dc57 100644 --- a/pkgs/tools/filesystems/f2fs-tools/default.nix +++ b/pkgs/tools/filesystems/f2fs-tools/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "f2fs-tools-${version}"; - version = "1.5.0"; + version = "1.6.1"; src = fetchurl { url = "http://git.kernel.org/cgit/linux/kernel/git/jaegeuk/f2fs-tools.git/snapshot/${name}.tar.gz"; - sha256 = "1pdgl78xkagxlmavy6x118wjzz8yvl8n08fc1m6wah9bf93qlhdf"; + sha256 = "1fkq1iqr5kxs6ihhbmjk4i19q395azcl60mnslqwfrlbrd3p40gm"; }; nativeBuildInputs = [ autoreconfHook ]; From 006f6d9437bdb56b3e189df056b831068e61ae42 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Thu, 12 May 2016 23:51:20 +0200 Subject: [PATCH 090/128] linux: 4.5.3 -> 4.5.4 --- pkgs/os-specific/linux/kernel/linux-4.5.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.5.nix b/pkgs/os-specific/linux/kernel/linux-4.5.nix index 469ca05bb91..09bd490ccfe 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.5.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.5.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.5.3"; + version = "4.5.4"; extraMeta.branch = "4.5"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1z0265cxv63br147vridmcqbz3cx3q3finy40hwljwv1r2lggid4"; + sha256 = "1s0mhhxx2sw93a9cin5mvjl82ah93a4sa2lfkvs6ay73mw3ifp2p"; }; kernelPatches = args.kernelPatches; From 6b633b15e976122397e07a0dcae63f9eb2722a4e Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Fri, 13 May 2016 00:01:57 +0200 Subject: [PATCH 091/128] sslh: 1.17 -> 1.18 --- pkgs/servers/sslh/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/sslh/default.nix b/pkgs/servers/sslh/default.nix index 0de4dfff153..7b98ded5dc1 100644 --- a/pkgs/servers/sslh/default.nix +++ b/pkgs/servers/sslh/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "sslh-${version}"; - version = "1.17"; + version = "1.18"; src = fetchurl { - url = "https://github.com/yrutschle/sslh/archive/v${version}.tar.gz"; - sha256 = "1l8ssm47f0hwiisgfj0ca5j2z8j98pir4pf2acrj1798fnzw6mxm"; + url = "http://www.rutschle.net/tech/sslh/sslh-v${version}.tar.gz"; + sha256 = "1ba5fxd2s6jh9n3wbp2a782q7syc4m6qvfrggnscdbywfyrsa08n"; }; postPatch = "patchShebangs *.sh"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { description = "Applicative Protocol Multiplexer (e.g. share SSH and HTTPS on the same port)"; license = licenses.gpl2Plus; homepage = http://www.rutschle.net/tech/sslh.shtml; - maintainers = [ maintainers.koral ]; + maintainers = with maintainers; [ koral fpletz ]; platforms = platforms.all; }; } From f743e56744335a73354357ee73de9ad3ce41b643 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Fri, 13 May 2016 00:03:15 +0200 Subject: [PATCH 092/128] radvd: 2.12 -> 2.13 --- pkgs/tools/networking/radvd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/radvd/default.nix b/pkgs/tools/networking/radvd/default.nix index 84db01dc4ba..42d4a817756 100644 --- a/pkgs/tools/networking/radvd/default.nix +++ b/pkgs/tools/networking/radvd/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libdaemon, bison, flex, check }: stdenv.mkDerivation rec { - name = "radvd-2.12"; + name = "radvd-2.13"; src = fetchurl { url = "http://www.litech.org/radvd/dist/${name}.tar.xz"; - sha256 = "0yvlzzdxz2h5fm7grbf1xfs8008bzcdjpficm2cf52g771rffw5h"; + sha256 = "1lzgg6zpizcldb78n5gkykjnpr7sqm4r1xy9bm4ig0chbrink4ka"; }; buildInputs = [ pkgconfig libdaemon bison flex check ]; From 4d750ae2c7e73154bd8af94f112b220b017f0de2 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Fri, 13 May 2016 00:07:42 +0200 Subject: [PATCH 093/128] php: 7.0.5 -> 7.0.6 --- pkgs/development/interpreters/php/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index 8c51cd2b3a8..5856604c53d 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -302,8 +302,8 @@ in { }; php70 = generic { - version = "7.0.5"; - sha256 = "1s8xnnxwq5big2rnbp3w7zw7wh5d5ra9p2q9bxwylds5wrzsy29c"; + version = "7.0.6"; + sha256 = "1dr9cglqvw3n1ln1fmkmp16lmwz2dd2n2akl3s68ap4nm69g3p8l"; }; } From 9e01c46e4a3bf3f6d0aaa38a0f2cdc92f850a0fe Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Fri, 13 May 2016 00:11:41 +0200 Subject: [PATCH 094/128] ccid: 1.4.20 -> 1.4.23 --- pkgs/tools/security/ccid/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/ccid/default.nix b/pkgs/tools/security/ccid/default.nix index 2d17c9e8ba6..cfa9f69b386 100644 --- a/pkgs/tools/security/ccid/default.nix +++ b/pkgs/tools/security/ccid/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, pcsclite, pkgconfig, libusb1, perl }: stdenv.mkDerivation rec { - version = "1.4.20"; + version = "1.4.23"; name = "ccid-${version}"; src = fetchurl { - url = "https://alioth.debian.org/frs/download.php/file/4140/ccid-1.4.20.tar.bz2"; - sha256 = "1g0w4pv6q30d8lhs3kd6nywkhh34nhf9fbcbcvbxdvk3pdjvh320"; + url = "https://alioth.debian.org/frs/download.php/file/4169/ccid-1.4.23.tar.bz2"; + sha256 = "0s7c2g8idnnh19958aswaa2s51ncr2j7gqrkk5g95qpfnv7asdh8"; }; patchPhase = '' From 11dee6fa17d9cadfca3a5c79b41dff63fdd2903f Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Fri, 13 May 2016 00:11:55 +0200 Subject: [PATCH 095/128] pcsclite: 1.8.14 -> 1.8.16 --- pkgs/tools/security/pcsclite/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/pcsclite/default.nix b/pkgs/tools/security/pcsclite/default.nix index 41c10685435..e75b6a8372c 100644 --- a/pkgs/tools/security/pcsclite/default.nix +++ b/pkgs/tools/security/pcsclite/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, udev, dbus_libs, perl, python2 }: stdenv.mkDerivation rec { - name = "pcsclite-1.8.14"; + name = "pcsclite-1.8.16"; src = fetchurl { - url = "https://alioth.debian.org/frs/download.php/file/4138/pcsc-lite-1.8.14.tar.bz2"; - sha256 = "0kik09dif6hih09vvprd7zvj31lnrclrbrh5y10mlca2c209f7xr"; + url = "https://alioth.debian.org/frs/download.php/file/4164/pcsc-lite-1.8.16.tar.bz2"; + sha256 = "12k8q0ckyy1fqcfh7x0b7kfrlfiscrqaqmidcggnzs4pi2iqml77"; }; configureFlags = [ From 4a3a92d5c8996a713269ae6d8ab227b35df5f16b Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Thu, 12 May 2016 03:21:51 +0200 Subject: [PATCH 096/128] jenkins: 1.653 -> 2.3 --- .../tools/continuous-integration/jenkins/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix index ca154469dfd..827fb4e05a5 100644 --- a/pkgs/development/tools/continuous-integration/jenkins/default.nix +++ b/pkgs/development/tools/continuous-integration/jenkins/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "jenkins-${version}"; - version = "1.653"; + version = "2.3"; src = fetchurl { url = "http://mirrors.jenkins-ci.org/war/${version}/jenkins.war"; - sha256 = "1z24vddr8v64g4x3s7qx5n30sjcm2xpz7mn23zlc0n8lhnmkzqs8"; + sha256 = "0x59dbvh6y25ki5jy51djbfbhf8g2j3yd9f3n66f7bkdfw8p78g1"; }; meta = with stdenv.lib; { description = "An extendable open source continuous integration server"; From 939c80c26f073961c104a38f02e5ea5d97b81046 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Thu, 12 May 2016 03:22:39 +0200 Subject: [PATCH 097/128] jenkins module: Check for 200 & 403 response codes The new jenkins version shows a setup wizard on first startup that will throw a 403 HTTP response code instead of 200. --- .../services/continuous-integration/jenkins/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/continuous-integration/jenkins/default.nix b/nixos/modules/services/continuous-integration/jenkins/default.nix index 4a6ffb9c261..ae3f186c1d0 100644 --- a/nixos/modules/services/continuous-integration/jenkins/default.nix +++ b/nixos/modules/services/continuous-integration/jenkins/default.nix @@ -161,8 +161,8 @@ in { ''; postStart = '' - until ${pkgs.curl.bin}/bin/curl -s -L --fail --head http://${cfg.listenAddress}:${toString cfg.port}${cfg.prefix} >/dev/null; do - sleep 2 + until [[ $(${pkgs.curl.bin}/bin/curl -s --head -w '\n%{http_code}' http://${cfg.listenAddress}:${toString cfg.port}${cfg.prefix} | tail -n1) =~ ^(200|403)$ ]]; do + sleep 1 done ''; From 6d1fe178c3160a108fb7b51438822974b9bde1b4 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Thu, 12 May 2016 22:35:13 +0200 Subject: [PATCH 098/128] mpd: 0.19.12 -> 0.19.15 --- pkgs/servers/mpd/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix index cce893d17ee..fb9efc45616 100644 --- a/pkgs/servers/mpd/default.nix +++ b/pkgs/servers/mpd/default.nix @@ -23,19 +23,20 @@ , icuSupport ? true, icu , clientSupport ? true, mpd_clientlib , opusSupport ? true, libopus +, soundcloudSupport ? true, yajl }: let opt = stdenv.lib.optional; mkFlag = c: f: if c then "--enable-${f}" else "--disable-${f}"; major = "0.19"; - minor = "12"; + minor = "15"; in stdenv.mkDerivation rec { name = "mpd-${major}.${minor}"; src = fetchurl { url = "http://www.musicpd.org/download/mpd/${major}/${name}.tar.xz"; - sha256 = "0xg8w5vn6xd0yfw55qj6wnav7v14nmr00s3d4w5gixbjrv3ycvvv"; + sha256 = "12wvqb5r3q77x78wigmrsz3vv8rykcfnavffcvlqq0sbi4is5f8c"; }; buildInputs = [ pkgconfig glib boost ] @@ -65,7 +66,8 @@ in stdenv.mkDerivation rec { ++ opt gmeSupport game-music-emu ++ opt icuSupport icu ++ opt clientSupport mpd_clientlib - ++ opt opusSupport libopus; + ++ opt opusSupport libopus + ++ opt soundcloudSupport yajl; configureFlags = [ (mkFlag (!stdenv.isDarwin && alsaSupport) "alsa") @@ -94,6 +96,7 @@ in stdenv.mkDerivation rec { (mkFlag gmeSupport "gme") (mkFlag clientSupport "libmpdclient") (mkFlag opusSupport "opus") + (mkFlag soundcloudSupport "soundcloud") "--enable-debug" ] ++ opt stdenv.isLinux From 2d727237261d6702f55fc7ce0a982e53b2ce59bb Mon Sep 17 00:00:00 2001 From: vbgl Date: Fri, 13 May 2016 18:08:17 +0200 Subject: [PATCH 099/128] ocaml-batteries: 2.4.0 -> 2.5.2 (#15424) --- pkgs/development/ocaml-modules/batteries/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/batteries/default.nix b/pkgs/development/ocaml-modules/batteries/default.nix index ae4dcc93076..0c01a946e5a 100644 --- a/pkgs/development/ocaml-modules/batteries/default.nix +++ b/pkgs/development/ocaml-modules/batteries/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchzip, ocaml, findlib, qtest }: -let version = "2.4.0"; in +let version = "2.5.2"; in stdenv.mkDerivation { name = "ocaml-batteries-${version}"; src = fetchzip { url = "https://github.com/ocaml-batteries-team/batteries-included/archive/v${version}.tar.gz"; - sha256 = "0bxp5d05w1igwh9vcgvhd8sd6swf2ddsjphw0mkakdck9afnimmd"; + sha256 = "01v7sp8vsqlfrmpji5pkrsjl43r3q8hk1a4z4lmyy9y2i0fqwl07"; }; buildInputs = [ ocaml findlib qtest ]; From ec2ddf284d5d435f75a284cb3b840f15ab371741 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Mon, 9 May 2016 19:27:27 +0200 Subject: [PATCH 100/128] systemd: get linuxHeaders from stdenv Building against anything other than the headers used to build libc doesn't really make any sense. --- pkgs/os-specific/linux/systemd/default.nix | 3 ++- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index d6a928cd0cf..3af702982fb 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -1,7 +1,8 @@ { stdenv, fetchFromGitHub, pkgconfig, intltool, gperf, libcap, kmod , zlib, xz, pam, acl, cryptsetup, libuuid, m4, utillinux, libffi , glib, kbd, libxslt, coreutils, libgcrypt, libgpgerror, libapparmor, audit, lz4 -, kexectools, libmicrohttpd, linuxHeaders, libseccomp, iptables +, kexectools, libmicrohttpd, linuxHeaders ? stdenv.cc.libc.linuxHeaders, libseccomp +, iptables , autoreconfHook, gettext, docbook_xsl, docbook_xml_dtd_42, docbook_xml_dtd_45 , enableKDbus ? false }: diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b31b2b8c8fd..a401ca24611 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11202,7 +11202,6 @@ in sysstat = callPackage ../os-specific/linux/sysstat { }; systemd = callPackage ../os-specific/linux/systemd { - linuxHeaders = linuxHeaders_3_18; utillinux = utillinuxMinimal; # break the cyclic dependency } // { From e0c07070b1fca1ec237f3a4ab04cbec0b6c75282 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Mon, 9 May 2016 19:28:24 +0200 Subject: [PATCH 101/128] duperemove: get linuxHeaders from stdenv Building against anything other than the headers used to build libc doesn't really make any sense. Also: this package is Linux specific, so mark it as such. --- pkgs/tools/filesystems/duperemove/default.nix | 12 ++++++------ pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/filesystems/duperemove/default.nix b/pkgs/tools/filesystems/duperemove/default.nix index 146414a47e1..d333334d394 100644 --- a/pkgs/tools/filesystems/duperemove/default.nix +++ b/pkgs/tools/filesystems/duperemove/default.nix @@ -1,5 +1,5 @@ -{ lib, stdenv, fetchFromGitHub, libgcrypt -, pkgconfig, glib, linuxHeaders, sqlite }: +{ stdenv, fetchFromGitHub, libgcrypt +, pkgconfig, glib, linuxHeaders ? stdenv.cc.libc.linuxHeaders, sqlite }: stdenv.mkDerivation rec { name = "duperemove-${version}"; @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { makeFlags = [ "DESTDIR=$(out)" "PREFIX=" ]; - meta = { + meta = with stdenv.lib; { description = "A simple tool for finding duplicated extents and submitting them for deduplication"; homepage = https://github.com/markfasheh/duperemove; - license = lib.licenses.gpl2; - maintainers = with lib.maintainers; [ bluescreen303 thoughtpolice ]; - platforms = lib.platforms.all; + license = licenses.gpl2; + maintainers = with maintainers; [ bluescreen303 thoughtpolice ]; + platforms = platforms.linux; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a401ca24611..779a1c225c7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -759,9 +759,7 @@ in dtrx = callPackage ../tools/compression/dtrx { }; - duperemove = callPackage ../tools/filesystems/duperemove { - linuxHeaders = linuxHeaders_3_18; - }; + duperemove = callPackage ../tools/filesystems/duperemove { }; dynamic-colors = callPackage ../tools/misc/dynamic-colors { }; From 10aaca8c1f711db6c413d75ccaed336aa1eb18c3 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Fri, 13 May 2016 20:10:26 +0200 Subject: [PATCH 102/128] grsecurity_4_5: 4.5.3-201605080858 -> 4.5.4-201605112030 --- pkgs/os-specific/linux/kernel/linux-grsecurity-4.5.nix | 4 ++-- pkgs/os-specific/linux/kernel/patches.nix | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-grsecurity-4.5.nix b/pkgs/os-specific/linux/kernel/linux-grsecurity-4.5.nix index 469ca05bb91..09bd490ccfe 100644 --- a/pkgs/os-specific/linux/kernel/linux-grsecurity-4.5.nix +++ b/pkgs/os-specific/linux/kernel/linux-grsecurity-4.5.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.5.3"; + version = "4.5.4"; extraMeta.branch = "4.5"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1z0265cxv63br147vridmcqbz3cx3q3finy40hwljwv1r2lggid4"; + sha256 = "1s0mhhxx2sw93a9cin5mvjl82ah93a4sa2lfkvs6ay73mw3ifp2p"; }; kernelPatches = args.kernelPatches; diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 213d8e73dbe..6787ad01970 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -105,9 +105,9 @@ rec { grsecurity_4_5 = grsecPatch { kernel = pkgs.grsecurity_base_linux_4_5; patches = [ grsecurity_fix_path_4_5 ]; - kversion = "4.5.3"; - revision = "201605080858"; - sha256 = "0m6x45n9ayn4022r64dx7lxfxg3s632hlrr0260ac9gc0abyk06j"; + kversion = "4.5.4"; + revision = "201605112030"; + sha256 = "06asa9v7hqbbxzg3v47qr0axjgdbc5dzkkrkh1xsbb21bwx700q4"; }; grsecurity_latest = grsecurity_4_5; From e4602677370b6fa017968ae2a9538e32783d9921 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Fri, 13 May 2016 01:29:30 +0300 Subject: [PATCH 103/128] bind: Attempt to fix Darwin OpenSSL linking MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Issue #15279 reports: ```` Checking for OpenSSL library... using OpenSSL from /nix/store/c6kijfc5py2805lmqczvmcws5cm9jg1l-openssl-1.0.2g-dev/lib and /nix/store/c6kijfc5py2805lmqczvmcws5cm9jg1l-openssl-1.0.2g-dev/include checking whether linking with OpenSSL works... no configure: error: Could not run test program using OpenSSL from /nix/store/c6kijfc5py2805lmqczvmcws5cm9jg1l-openssl-1.0.2g-dev/lib and /nix/store/c6kijfc5py2805lmqczvmcws5cm9jg1l-openssl-1.0.2g-dev/include. Please check the argument to --with-openssl and your shared library configuration (e.g., LD_LIBRARY_PATH). builder for ‘/nix/store/54nni99j4ycwws6zfjwcvv8vxsdk895i-bind-9.10.4.drv’ failed with exit code 1 ```` --- .../dns/bind/darwin-openssl-linking-fix.patch | 26 +++++++++++++++++++ pkgs/servers/dns/bind/default.nix | 3 ++- 2 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 pkgs/servers/dns/bind/darwin-openssl-linking-fix.patch diff --git a/pkgs/servers/dns/bind/darwin-openssl-linking-fix.patch b/pkgs/servers/dns/bind/darwin-openssl-linking-fix.patch new file mode 100644 index 00000000000..b7e7bfc73bf --- /dev/null +++ b/pkgs/servers/dns/bind/darwin-openssl-linking-fix.patch @@ -0,0 +1,26 @@ +diff --git a/configure b/configure +index 6779cc3..4275520 100755 +--- a/configure ++++ b/configure +@@ -15707,21 +15707,6 @@ $as_echo "not found" >&6; } + *-hp-hpux*) + DST_OPENSSL_LIBS="-L$use_openssl/lib -Wl,+b: -lcrypto" + ;; +- *-apple-darwin*) +- # +- # Apple's ld seaches for serially for dynamic +- # then static libraries. This means you can't +- # use -L to override dynamic system libraries +- # with static ones when linking. Instead +- # we specify a absolute path. +- # +- if test -f "$use_openssl/lib/libcrypto.dylib" +- then +- DST_OPENSSL_LIBS="-L$use_openssl/lib -lcrypto" +- else +- DST_OPENSSL_LIBS="$use_openssl/lib/libcrypto.a" +- fi +- ;; + *) + DST_OPENSSL_LIBS="-L$use_openssl/lib -lcrypto" + ;; diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix index a92da7f35ed..9afb622eb5e 100644 --- a/pkgs/servers/dns/bind/default.nix +++ b/pkgs/servers/dns/bind/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { sha256 = "0mmhzi4483mkak47wj255a36g3v0yilxwfwlbckr1hssinri5m7q"; }; - patches = [ ./remove-mkdir-var.patch ]; + patches = [ ./remove-mkdir-var.patch ] ++ + stdenv.lib.optional stdenv.isDarwin ./darwin-openssl-linking-fix.patch; buildInputs = [ openssl libtool perl libxml2 ]; From 7fdce2feb0ddc201a2af1affd2c0eff74e61f213 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Fri, 13 May 2016 23:06:28 +0200 Subject: [PATCH 104/128] kernelPatches.grsecurity_4_5: 4.5.4-201605112030 -> 4.5.4-201605122039 --- pkgs/os-specific/linux/kernel/patches.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 6787ad01970..2fa0b561a15 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -106,8 +106,8 @@ rec { { kernel = pkgs.grsecurity_base_linux_4_5; patches = [ grsecurity_fix_path_4_5 ]; kversion = "4.5.4"; - revision = "201605112030"; - sha256 = "06asa9v7hqbbxzg3v47qr0axjgdbc5dzkkrkh1xsbb21bwx700q4"; + revision = "201605122039"; + sha256 = "10jcwz9lxb4w2p0g6mjsq515s3p0m81rr1a9mw0hqwvm23dba3fs"; }; grsecurity_latest = grsecurity_4_5; From c40323558599a4762b9caa7b2d8482f409cf7938 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sat, 14 May 2016 02:03:54 +0300 Subject: [PATCH 105/128] xgboost: init at 2016-05-14 --- .../development/libraries/xgboost/default.nix | 30 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ pkgs/top-level/python-packages.nix | 22 ++++++++++++++ 3 files changed, 54 insertions(+) create mode 100644 pkgs/development/libraries/xgboost/default.nix diff --git a/pkgs/development/libraries/xgboost/default.nix b/pkgs/development/libraries/xgboost/default.nix new file mode 100644 index 00000000000..0006792ed2a --- /dev/null +++ b/pkgs/development/libraries/xgboost/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchgit }: + +stdenv.mkDerivation rec { + name = "xgboost-${version}"; + version = "2016-05-14"; + + # needs submodules + src = fetchgit { + url = "https://github.com/dmlc/xgboost"; + rev = "9c26566eb09733423f821f139938ff4105c3775d"; + sha256 = "0nmhgl70mnc2igkfppdw2in66zdczzsqxrlsb4bknrglpp3axnm1"; + }; + + enableParallelBuilding = true; + + installPhase = '' + mkdir -p $out + cp -r include $out + install -Dm755 lib/libxgboost.so $out/lib/libxgboost.so + install -Dm755 xgboost $out/bin/xgboost + ''; + + meta = with stdenv.lib; { + description = "Scalable, Portable and Distributed Gradient Boosting (GBDT, GBRT or GBM) Library"; + homepage = "https://github.com/dmlc/xgboost"; + license = licenses.apl20; + platforms = platforms.linux; + maintainers = with maintainers; [ abbradar ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b31b2b8c8fd..690dab41d41 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9297,6 +9297,8 @@ in xalanc = callPackage ../development/libraries/xalanc {}; + xgboost = callPackage ../development/libraries/xgboost { }; + # Avoid using this. It isn't really a wrapper anymore, but we keep the name. xlibsWrapper = callPackage ../development/libraries/xlibs-wrapper { packages = [ diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c2eec6d9d2e..1df9397f33e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -26610,6 +26610,28 @@ in modules // { }; }; + xgboost = buildPythonPackage rec { + name = "xgboost-${version}"; + + inherit (pkgs.xgboost) version src meta; + + propagatedBuildInputs = with self; [ scipy ]; + buildInputs = with self; [ nose ]; + + postPatch = '' + cd python-package + + cat <xgboost/libpath.py + def find_lib_path(): + return ["${pkgs.xgboost}/lib/libxgboost.so"] + EOF + ''; + + postInstall = '' + rm -rf $out/xgboost + ''; + }; + xkcdpass = buildPythonPackage rec { name = "xkcdpass-${version}"; version = "1.4.2"; From 4cb218b76ae70d237395677d318f52933062d5f8 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sat, 14 May 2016 02:38:12 +0300 Subject: [PATCH 106/128] xgboost: fix license Looks like `nix-env -qaP --drv-path` is not enough and one need to either add `--json` too to catch problems like this... or just use `nox-review wip`. --- pkgs/development/libraries/xgboost/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/xgboost/default.nix b/pkgs/development/libraries/xgboost/default.nix index 0006792ed2a..afe4ce4448b 100644 --- a/pkgs/development/libraries/xgboost/default.nix +++ b/pkgs/development/libraries/xgboost/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Scalable, Portable and Distributed Gradient Boosting (GBDT, GBRT or GBM) Library"; homepage = "https://github.com/dmlc/xgboost"; - license = licenses.apl20; + license = licenses.asl20; platforms = platforms.linux; maintainers = with maintainers; [ abbradar ]; }; From 4ed271893f05acd172ed5e246f7b8d90ef9e2adb Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sat, 14 May 2016 04:04:41 +0300 Subject: [PATCH 107/128] pythonPackages.pygobject{,3}: let python.buildEnv detect it --- pkgs/development/python-modules/pygobject/3.nix | 2 ++ pkgs/development/python-modules/pygobject/default.nix | 2 ++ 2 files changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/pygobject/3.nix b/pkgs/development/python-modules/pygobject/3.nix index 6a58550e7c5..77a52990646 100644 --- a/pkgs/development/python-modules/pygobject/3.nix +++ b/pkgs/development/python-modules/pygobject/3.nix @@ -13,6 +13,8 @@ stdenv.mkDerivation rec { buildInputs = [ python pkgconfig glib gobjectIntrospection ]; propagatedBuildInputs = [ pycairo cairo ]; + passthru.pythonPath = []; + meta = { homepage = http://live.gnome.org/PyGObject; description = "Python bindings for Glib"; diff --git a/pkgs/development/python-modules/pygobject/default.nix b/pkgs/development/python-modules/pygobject/default.nix index fb2df329fbc..b5cad09d9e1 100644 --- a/pkgs/development/python-modules/pygobject/default.nix +++ b/pkgs/development/python-modules/pygobject/default.nix @@ -20,6 +20,8 @@ stdenv.mkDerivation rec { buildInputs = [ python pkgconfig glib ]; + passthru.pythonPath = []; + # in a "normal" setup, pygobject and pygtk are installed into the # same site-packages: we need a pth file for both. pygtk.py would be # used to select a specific version, in our setup it should have no From 38ef2df4a66faf492c717cbb9fe57591e6c8845f Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sat, 14 May 2016 04:22:50 +0300 Subject: [PATCH 108/128] pythonPackages.pyqt{,5}: let python.buildEnv detect it --- pkgs/development/python-modules/pyqt/4.x.nix | 2 ++ pkgs/development/python-modules/pyqt/5.x.nix | 2 ++ 2 files changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/pyqt/4.x.nix b/pkgs/development/python-modules/pyqt/4.x.nix index 31294c8dc98..b2d5b93d9f7 100644 --- a/pkgs/development/python-modules/pyqt/4.x.nix +++ b/pkgs/development/python-modules/pyqt/4.x.nix @@ -40,6 +40,8 @@ stdenv.mkDerivation { enableParallelBuilding = true; + passthru.pythonPath = []; + meta = { description = "Python bindings for Qt"; license = "GPL"; diff --git a/pkgs/development/python-modules/pyqt/5.x.nix b/pkgs/development/python-modules/pyqt/5.x.nix index 0e5f5604a98..71fb5cb3657 100644 --- a/pkgs/development/python-modules/pyqt/5.x.nix +++ b/pkgs/development/python-modules/pyqt/5.x.nix @@ -53,4 +53,6 @@ in stdenv.mkDerivation { ''; enableParallelBuilding = true; + + passthru.pythonPath = []; } From c6a61092e78873ff0300e1660838194693a53911 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sat, 14 May 2016 04:29:22 +0300 Subject: [PATCH 109/128] pythonPackages.sip: let python.buildEnv detect it --- pkgs/development/python-modules/sip/4.16.nix | 2 ++ pkgs/development/python-modules/sip/default.nix | 2 ++ 2 files changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/sip/4.16.nix b/pkgs/development/python-modules/sip/4.16.nix index adb6c7ef80d..2861816885f 100644 --- a/pkgs/development/python-modules/sip/4.16.nix +++ b/pkgs/development/python-modules/sip/4.16.nix @@ -16,6 +16,8 @@ if isPyPy then throw "sip not supported for interpreter ${python.executable}" el buildInputs = [ python ]; + passthru.pythonPath = []; + meta = with stdenv.lib; { description = "Creates C++ bindings for Python modules"; homepage = "http://www.riverbankcomputing.co.uk/"; diff --git a/pkgs/development/python-modules/sip/default.nix b/pkgs/development/python-modules/sip/default.nix index cf3a0149844..6c455b3bb1b 100644 --- a/pkgs/development/python-modules/sip/default.nix +++ b/pkgs/development/python-modules/sip/default.nix @@ -19,6 +19,8 @@ if isPyPy then throw "sip not supported for interpreter ${python.executable}" el buildInputs = [ python ]; + passthru.pythonPath = []; + meta = with stdenv.lib; { description = "Creates C++ bindings for Python modules"; homepage = "http://www.riverbankcomputing.co.uk/"; From ac8cd3e9a60ca88a060ea02fe740059d91bd480e Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Sat, 14 May 2016 03:15:25 +0200 Subject: [PATCH 110/128] pythonPackages.psycopg2: 2.5.4 -> 2.6.1 --- pkgs/top-level/python-packages.nix | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e92736c9ff2..96041398002 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -16582,27 +16582,21 @@ in modules // { }); psycopg2 = buildPythonPackage rec { - name = "psycopg2-2.5.4"; + name = "psycopg2-2.6.1"; disabled = isPyPy; - - # error: invalid command 'test' - doCheck = false; - src = pkgs.fetchurl { url = "mirror://pypi/p/psycopg2/${name}.tar.gz"; - sha256 = "07ivzl7bq8bjcq5n90w4bsl29gjfm5l8yamw0paxh25si8r3zfi4"; + sha256 = "0k4hshvrwsh8yagydyxgmd0pjm29lwdxkngcq9fzfzkmpsxrmkva"; }; - buildInputs = optional stdenv.isDarwin pkgs.openssl; propagatedBuildInputs = with self; [ pkgs.postgresql ]; - + doCheck = false; meta = { description = "PostgreSQL database adapter for the Python programming language"; license = with licenses; [ gpl2 zpt20 ]; }; }; - publicsuffix = buildPythonPackage rec { name = "publicsuffix-${version}"; version = "1.0.2"; From cd5dd9f82e141a4d7f570bf483ee5e278b188480 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sat, 14 May 2016 05:12:52 +0300 Subject: [PATCH 111/128] udev service: fix packages' paths --- nixos/modules/services/hardware/udev.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/hardware/udev.nix b/nixos/modules/services/hardware/udev.nix index 8e883ed7775..e7741083d1a 100644 --- a/nixos/modules/services/hardware/udev.nix +++ b/nixos/modules/services/hardware/udev.nix @@ -193,6 +193,7 @@ in pkg/lib/udev/rules.d will be included. ''; + apply = map getBin; }; path = mkOption { From 6194e9d801d31d6241deb5c6dc534975887f143d Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Sat, 14 May 2016 05:05:08 +0200 Subject: [PATCH 112/128] kernelPatches.grsecurity: 4.5.4-201605122039 -> 4.5.4-201605131918 Also revert to using the grsecurity-scrape mirror; relying on upstream just isn't viable. Lately, updates have been so frequent that a new version is released before Hydra even gets around to building the previous one. --- pkgs/os-specific/linux/kernel/patches.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 2fa0b561a15..efa3cb2eb86 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -22,8 +22,11 @@ let assert kversion == kernel.version; { name = "grsecurity-${grversion}-${kversion}"; inherit grversion kernel patches kversion revision; + # When updating versions/hashes, ALWAYS use the official version; we use + # this mirror only because upstream removes sources files immediately upon + # releasing a new version ... patch = fetchurl { - url = "https://grsecurity.net/${branch}/grsecurity-${grversion}-${kversion}-${revision}.patch"; + url = "https://raw.githubusercontent.com/slashbeast/grsecurity-scrape/master/test/grsecurity-${grversion}-${kversion}-${revision}.patch"; inherit sha256; }; features.grsecurity = true; @@ -106,8 +109,8 @@ rec { { kernel = pkgs.grsecurity_base_linux_4_5; patches = [ grsecurity_fix_path_4_5 ]; kversion = "4.5.4"; - revision = "201605122039"; - sha256 = "10jcwz9lxb4w2p0g6mjsq515s3p0m81rr1a9mw0hqwvm23dba3fs"; + revision = "201605131918"; + sha256 = "0f5s8lj6zc4jp2cpxm7r891px3dmb6m3ximfigwq809yydg5aimv"; }; grsecurity_latest = grsecurity_4_5; From ea018f83390a353be4c9634b7fae7aae3c147069 Mon Sep 17 00:00:00 2001 From: Brandon Kase Date: Sun, 20 Mar 2016 00:29:47 -0700 Subject: [PATCH 113/128] racerd: init at 0.1.1 Needed for Rust YouCompleteMe support --- .../development/tools/rust/racerd/default.nix | 34 +++++++++++++++++++ pkgs/misc/vim-plugins/default.nix | 6 +++- .../vim2nix/additional-nix-code/youcompleteme | 4 +++ pkgs/top-level/all-packages.nix | 2 ++ 4 files changed, 45 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/tools/rust/racerd/default.nix diff --git a/pkgs/development/tools/rust/racerd/default.nix b/pkgs/development/tools/rust/racerd/default.nix new file mode 100644 index 00000000000..e315ab38344 --- /dev/null +++ b/pkgs/development/tools/rust/racerd/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchgit, rustPlatform, makeWrapper }: + +with rustPlatform; + +buildRustPackage rec { + name = "racerd-${version}"; + version = "0.1.1"; + src = fetchgit { + url = "git://github.com/jwilm/racerd.git"; + rev = "dcbb7885e84eb5e2fbb2072e185701ad1abbd93a"; + sha256 = "18c6a1x0li5yxif9qqnsnyas6if0m6srbqh0h0nywgx0lm8bpgly"; + }; + + doCheck = false; + + depsSha256 = "0ca0lc8mm8kczll5m03n5fwsr0540c2xbfi4nn9ksn0s4sap50yn"; + + buildInputs = [ makeWrapper ]; + + RUST_SRC_PATH = ''${rustc.src}/src''; + + installPhase = '' + mkdir -p $out/bin + cp -p target/release/racerd $out/bin/ + wrapProgram $out/bin/racerd --set RUST_SRC_PATH "$RUST_SRC_PATH" + ''; + + meta = with stdenv.lib; { + description = "JSON/HTTP Server based on racer for adding Rust support to editors and IDEs"; + homepage = "https://github.com/jwilm/racerd"; + license = licenses.asl20; + platforms = platforms.all; + }; +} diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index 1bc2570f157..fcb5ebba9d8 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -1,7 +1,7 @@ # TODO check that no license information gets lost { fetchurl, bash, stdenv, python, go, cmake, vim, vimUtils, perl, ruby, unzip , which, fetchgit, fetchFromGitHub, fetchhg, fetchzip, llvmPackages_38, zip -, vim_configurable, vimPlugins, xkb_switch, git +, vim_configurable, vimPlugins, xkb_switch, git, racerdRust , Cocoa ? null }: @@ -953,6 +953,10 @@ rec { llvmPackages_38.llvm ] ++ stdenv.lib.optional stdenv.isDarwin Cocoa; + propogatedBuildInputs = [ + racerdRust + ]; + buildPhase = '' patchShebangs . substituteInPlace plugin/youcompleteme.vim \ diff --git a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/youcompleteme b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/youcompleteme index cb90adfdc39..12bcf53f1e0 100644 --- a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/youcompleteme +++ b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/youcompleteme @@ -4,6 +4,10 @@ llvmPackages.llvm ] ++ stdenv.lib.optional stdenv.isDarwin Cocoa; + propogatedBuildInputs = [ + racerdRust + ]; + buildPhase = '' patchShebangs . substituteInPlace plugin/youcompleteme.vim \ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 690dab41d41..a2635b3f458 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6309,6 +6309,8 @@ in racerRust = callPackage ../development/tools/rust/racer { }; + racerdRust = callPackage ../development/tools/rust/racerd { }; + radare = callPackage ../development/tools/analysis/radare { inherit (gnome) vte; lua = lua5; From 3b6550c29bee1431d876c5aaf348c34b2e08f95c Mon Sep 17 00:00:00 2001 From: Louis Taylor Date: Sat, 14 May 2016 10:05:37 +0100 Subject: [PATCH 114/128] sailsd: 0.1.1 -> 0.2.0 (#15445) Sails has now been split into a few subcomponents, sailsd being the main one. This package has been renamed to sailsd, the sailing simulation daemon. --- pkgs/misc/sails/default.nix | 26 -------------------- pkgs/misc/sailsd/default.nix | 42 +++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 43 insertions(+), 27 deletions(-) delete mode 100644 pkgs/misc/sails/default.nix create mode 100644 pkgs/misc/sailsd/default.nix diff --git a/pkgs/misc/sails/default.nix b/pkgs/misc/sails/default.nix deleted file mode 100644 index ed965f73b92..00000000000 --- a/pkgs/misc/sails/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ stdenv, fetchurl, cmake, pkgconfig, gtk3, librsvg }: - -stdenv.mkDerivation rec { - version = "0.1.1"; - name = "sails-${version}"; - src = fetchurl { - url = "https://github.com/kragniz/sails/archive/v${version}.tar.gz"; - sha256 = "0k55ib6cb78filgq3yrdib69qrzsny0209bq6h0v1yigry0sa62v"; - }; - - buildInputs = [ cmake pkgconfig gtk3 librsvg ]; - - NIX_CFLAGS_COMPILE = "-Wno-error"; - - meta = with stdenv.lib; { - description = "Simulator for autonomous sailing boats"; - homepage = https://github.com/kragniz/sails; - license = licenses.gpl3; - longDescription = '' - Sails is a simulator designed to test the AI of autonomous sailing - robots. It emulates the basic physics of sailing a small single sail - boat''; - maintainers = with maintainers; [ kragniz ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/misc/sailsd/default.nix b/pkgs/misc/sailsd/default.nix new file mode 100644 index 00000000000..7ae0ebbf84a --- /dev/null +++ b/pkgs/misc/sailsd/default.nix @@ -0,0 +1,42 @@ +{ stdenv, fetchFromGitHub, pkgconfig, jansson }: + +let + libsailing = fetchFromGitHub { + owner = "sails-simulator"; + repo = "libsailing"; + rev = "c24cddb717f81cd432868b8d41e04486c0a440fd"; + sha256 = "0mna0c9n8lvfdf4y1iigjy3dlks70hq6jik52zkik2yxvkqv949f"; + }; +in +stdenv.mkDerivation rec { + version = "0.2.0"; + name = "sailsd-${version}"; + src = fetchFromGitHub { + owner = "sails-simulator"; + repo = "sailsd"; + rev = "${version}"; + sha256 = "147cr4aw1kw4gv3bhn0cska855kmyah8m70vdw1q2lwz56lbf4mb"; + }; + + buildInputs = [ pkgconfig jansson libsailing ]; + + INSTALL_PATH = "$(out)"; + + postUnpack = '' + rmdir $sourceRoot/libsailing + cp -r ${libsailing} $sourceRoot/libsailing + chmod 755 -R $sourceRoot/libsailing + ''; + + meta = with stdenv.lib; { + description = "Simulator daemon for autonomous sailing boats"; + homepage = https://github.com/sails-simulator/sailsd; + license = licenses.gpl3; + longDescription = '' + Sails is a simulator designed to test the AI of autonomous sailing + robots. It emulates the basic physics of sailing a small single sail + boat''; + maintainers = with maintainers; [ kragniz ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bfce29ac8e1..4c1bcd6ad41 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16539,7 +16539,7 @@ in xtrlock-pam = callPackage ../misc/screensavers/xtrlock-pam { }; - sails = callPackage ../misc/sails { }; + sailsd = callPackage ../misc/sailsd { }; canon-cups-ufr2 = callPackage ../misc/cups/drivers/canon { }; From b638f18ce91bea5c90c3ae3412ed46fa39bfd125 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Sat, 14 May 2016 11:29:03 +0200 Subject: [PATCH 115/128] zsh-navigation-tools: 2.1.10 -> 2.1.12 --- pkgs/tools/misc/zsh-navigation-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/zsh-navigation-tools/default.nix b/pkgs/tools/misc/zsh-navigation-tools/default.nix index 47e9c73116f..ce1d0b84012 100644 --- a/pkgs/tools/misc/zsh-navigation-tools/default.nix +++ b/pkgs/tools/misc/zsh-navigation-tools/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "zsh-navigation-tools-${version}"; - version = "2.1.10"; + version = "2.1.12"; src = fetchFromGitHub { owner = "psprint"; repo = "zsh-navigation-tools"; rev = "v${version}"; - sha256 = "08l62pp01f83c390chcnjq51hyhkrhabfzxwd831cmp2s0xgj2rq"; + sha256 = "0ih7k6sbhjskwxhqq0hm0j3ydzrzi56wzb656clgnc6zihsjr2m2"; }; dontBuild = true; From da061d06f9aafadb9264915ffb4448465a88089c Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Sat, 14 May 2016 11:56:23 +0200 Subject: [PATCH 116/128] calibre: 2.55.0 -> 2.56.0 --- pkgs/applications/misc/calibre/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 8e4551713d2..c80c6e9d346 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -5,12 +5,12 @@ }: stdenv.mkDerivation rec { - version = "2.55.0"; + version = "2.56.0"; name = "calibre-${version}"; src = fetchurl { url = "http://download.calibre-ebook.com/${version}/${name}.tar.xz"; - sha256 = "12412d5vjp141xp5qvif50fskd1vsmr15h956z3bh6j99n8z5953"; + sha256 = "0xv5s664l72idqbi7ymapj1k3gr47r9fbx41fqplsih0ckcg3njj"; }; inherit python; From df0e0adb1184ac0ce7f1cacc7b95c33b92b8ec6a Mon Sep 17 00:00:00 2001 From: Matt McHenry Date: Wed, 11 May 2016 10:11:45 -0400 Subject: [PATCH 117/128] crashplan: fix .out in LD_LIBRARY_PATH Closes #15388 --- pkgs/applications/backup/crashplan/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/backup/crashplan/default.nix b/pkgs/applications/backup/crashplan/default.nix index ef2a19c8451..3b67cdc7b1a 100644 --- a/pkgs/applications/backup/crashplan/default.nix +++ b/pkgs/applications/backup/crashplan/default.nix @@ -81,6 +81,6 @@ in stdenv.mkDerivation rec { --replace crashplan/skin skin \ --replace bin/CrashPlanDesktop CrashPlanDesktop - wrapProgram $out/bin/CrashPlanDesktop --prefix LD_LIBRARY_PATH ":" "${gtk2}/lib:${glib}/lib:${libXtst}/lib" + wrapProgram $out/bin/CrashPlanDesktop --prefix LD_LIBRARY_PATH ":" "${stdenv.lib.makeLibraryPath [ gtk2 glib libXtst ]}" ''; } From 537f0fb297f4410c438db656fe16bd1f6da234f6 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 12 May 2016 22:46:23 +0200 Subject: [PATCH 118/128] securefs: 0.3.1 -> 0.3.2 --- pkgs/tools/filesystems/securefs/default.nix | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/filesystems/securefs/default.nix b/pkgs/tools/filesystems/securefs/default.nix index 8e483853672..0cd1d818f8c 100644 --- a/pkgs/tools/filesystems/securefs/default.nix +++ b/pkgs/tools/filesystems/securefs/default.nix @@ -1,27 +1,23 @@ { stdenv, fetchFromGitHub +, cmake , fuse }: stdenv.mkDerivation rec { name = "securefs-${version}"; - version = "0.3.1"; + version = "0.3.2"; src = fetchFromGitHub { - sha256 = "1n9kgrvc600lfclrk8cj2zy8md1brqhs8kvzdwfxgxavdh0wakkc"; + sha256 = "1drksvwfgfpgcn2mzb65ljqlg2kgn6nald9fnz60hliw8f1wiqvh"; rev = version; repo = "securefs"; owner = "netheril96"; }; + nativeBuildInputs = [ cmake ]; buildInputs = [ fuse ]; enableParallelBuilding = true; - doCheck = false; # tests require the fuse module to be loaded - - installPhase = '' - install -D -m0755 {.,$out/bin}/securefs - ''; - meta = with stdenv.lib; { inherit (src.meta) homepage; description = "Transparent encryption filesystem"; From f2c7f9a677d15396d9351e10e1f6a8715e1076a6 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 13 May 2016 18:03:27 +0200 Subject: [PATCH 119/128] zstd: 0.6.0 -> 0.6.1 --- pkgs/tools/compression/zstd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/compression/zstd/default.nix b/pkgs/tools/compression/zstd/default.nix index 45c91d46a2e..382ded98e53 100644 --- a/pkgs/tools/compression/zstd/default.nix +++ b/pkgs/tools/compression/zstd/default.nix @@ -3,10 +3,10 @@ stdenv.mkDerivation rec { name = "zstd-${version}"; - version = "0.6.0"; + version = "0.6.1"; src = fetchFromGitHub { - sha256 = "1r1l4pak289bjnkak2yrw65yhxfvqcmdsh10c1k0hi0wm7k3qcbw"; + sha256 = "19pp2sjrv8qwzfc9c1mf0idhkicjhr41fsc9d1fyncc34f9riavl"; rev = "v${version}"; repo = "zstd"; owner = "Cyan4973"; From 2cf6c67d1533a47f546af7aa1fa539fccf592299 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 13 May 2016 16:36:48 +0200 Subject: [PATCH 120/128] dpkg: 1.18.6 -> 1.18.7 --- pkgs/tools/package-management/dpkg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/dpkg/default.nix b/pkgs/tools/package-management/dpkg/default.nix index a14602de64e..78ab51bfaac 100644 --- a/pkgs/tools/package-management/dpkg/default.nix +++ b/pkgs/tools/package-management/dpkg/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "dpkg-${version}"; - version = "1.18.6"; + version = "1.18.7"; src = fetchurl { url = "mirror://debian/pool/main/d/dpkg/dpkg_${version}.tar.xz"; - sha256 = "18nywp0gs8bnywll9qrcg8g1fli4p5xd6h8sazhsmrxgp8iw62yx"; + sha256 = "0yxqv7b5a1qhhas9dzxr5gwj22jqxisrwzvrmwms8l67dlx6vqxc"; }; postPatch = '' From 9385353a99f8e20d9b7a83651c15f15e8f1e88f3 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 12 May 2016 19:19:19 +0200 Subject: [PATCH 121/128] btrfs-progs: 4.5.2 -> 4.5.3 --- pkgs/tools/filesystems/btrfs-progs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/btrfs-progs/default.nix b/pkgs/tools/filesystems/btrfs-progs/default.nix index e88c0088ef3..a7470384ad4 100644 --- a/pkgs/tools/filesystems/btrfs-progs/default.nix +++ b/pkgs/tools/filesystems/btrfs-progs/default.nix @@ -2,14 +2,14 @@ , asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl, libxslt }: -let version = "4.5.2"; in +let version = "4.5.3"; in stdenv.mkDerivation rec { name = "btrfs-progs-${version}"; src = fetchurl { url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz"; - sha256 = "09qjz3idz8y3rlrb0sxshc1bnpmrr4v9lqg5aimp09i9ywa8kyxf"; + sha256 = "1lzbw275xgv69v4z8hmsf3jnip38116hxhkpv0madk8wv049drz6"; }; buildInputs = [ From bf2834a10578e2eb2c8fad669b1ce42cf7871272 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 14 May 2016 16:12:21 +0200 Subject: [PATCH 122/128] pyexiv2: 0.3.0 -> 0.3.2 --- pkgs/development/python-modules/pyexiv2/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pyexiv2/default.nix b/pkgs/development/python-modules/pyexiv2/default.nix index ab086aed3bf..d4402ec9ebd 100644 --- a/pkgs/development/python-modules/pyexiv2/default.nix +++ b/pkgs/development/python-modules/pyexiv2/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, python, exiv2, scons, boost }: -let version = "0.3.0"; in +let version = "0.3.2"; in -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "pyexiv2-${version}"; src = fetchurl { - url = "http://launchpad.net/pyexiv2/0.3.x/0.3/+download/pyexiv2-0.3.0.tar.bz2"; - sha256 = "1y7r2z0ja166cx8fmykq7gaif02drknqqbxaf18fhv9nmgz4jrg9"; + url = "http://launchpad.net/pyexiv2/0.3.x/0.3.2/+download/${name}.tar.bz2"; + sha256 = "09r1ga6kj5cnmrldpkqzvdhh7xi7aad9g4fbcr1gawgsd9y13g0a"; }; buildPhase = '' From 934be04e195103d3471470630eeff1a47d865250 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 13 May 2016 19:31:23 +0200 Subject: [PATCH 123/128] perlPackages.URIFind: 20111103 -> 20140709 --- pkgs/top-level/perl-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 497cccf386d..c3ef9214273 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -13524,11 +13524,11 @@ let self = _self // overrides; _self = with self; { }; }; - URIFind = buildPerlModule { - name = "URI-Find-20111103"; + URIFind = buildPerlModule rec { + name = "URI-Find-20140709"; src = fetchurl { - url = mirror://cpan/authors/id/M/MS/MSCHWERN/URI-Find-20111103.tar.gz; - sha256 = "1igbbj14j5fssdqrbr60mg3w95wldfxdikplqdmqgf2zn5j65ibr"; + url = "mirror://cpan/authors/id/M/MS/MSCHWERN/${name}.tar.gz"; + sha256 = "0czc4h182s7sx3k123m7qlg7yybnwxgh369hap3c3b6xgrglrhy0"; }; propagatedBuildInputs = [ URI ]; meta = { From b596fd4a429b21658ec792471b1b2ebcb67ca2d2 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Sat, 14 May 2016 18:27:13 +0200 Subject: [PATCH 124/128] xlockmore: 5.46 -> 5.47 --- pkgs/misc/screensavers/xlockmore/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/screensavers/xlockmore/default.nix b/pkgs/misc/screensavers/xlockmore/default.nix index cef143e309a..a278b059d48 100644 --- a/pkgs/misc/screensavers/xlockmore/default.nix +++ b/pkgs/misc/screensavers/xlockmore/default.nix @@ -3,10 +3,10 @@ stdenv.mkDerivation rec { - name = "xlockmore-5.46"; + name = "xlockmore-5.47"; src = fetchurl { url = "http://www.tux.org/~bagleyd/xlock/${name}.tar.xz"; - sha256 = "1ps0dmnh912x8mwns94y2607xk90rjxrjn5s1pkmmpjg5h9bxcrj"; + sha256 = "138d79b8zc2hambbr9fnxp3fhihlcljgqns04zf0kv2f53pavqwl"; }; # Optionally, it can use GTK+. From 34f451505163e4eb4ed0a68592e64c219fa24554 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Sat, 14 May 2016 19:48:30 +0200 Subject: [PATCH 125/128] filezilla: 3.17.0 -> 3.17.0.1 --- pkgs/applications/networking/ftp/filezilla/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/ftp/filezilla/default.nix b/pkgs/applications/networking/ftp/filezilla/default.nix index c9745a084c6..7fa944d86c0 100644 --- a/pkgs/applications/networking/ftp/filezilla/default.nix +++ b/pkgs/applications/networking/ftp/filezilla/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, dbus, gnutls, wxGTK30, libidn, tinyxml, gettext , pkgconfig, xdg_utils, gtk2, sqlite, pugixml, libfilezilla, nettle }: -let version = "3.17.0"; in +let version = "3.17.0.1"; in stdenv.mkDerivation { name = "filezilla-${version}"; src = fetchurl { url = "mirror://sourceforge/project/filezilla/FileZilla_Client/${version}/FileZilla_${version}_src.tar.bz2"; - sha256 = "0vb5zqpvh0fi0a7nkz79cdmbzjk1cpmbyqx77nfkvd1kz1fcsqrp"; + sha256 = "0ai3a0nys3yjmlvlv57nli77x6x0a2r409b4f5w4kr9mi6f4z4a7"; }; configureFlags = [ From b7437eb012b6ec57c9151e48c1a95e5f7d12245f Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sat, 14 May 2016 21:05:58 +0300 Subject: [PATCH 126/128] tcp_wrappers: Remove separate builder.sh and use standard stdenv phases For instance, this means that the binaries get stripped properly (previously this package retained a reference to glibc headers). --- .../os-specific/linux/tcp-wrappers/builder.sh | 39 ------------------- .../linux/tcp-wrappers/default.nix | 37 +++++++++++++++++- 2 files changed, 35 insertions(+), 41 deletions(-) delete mode 100644 pkgs/os-specific/linux/tcp-wrappers/builder.sh diff --git a/pkgs/os-specific/linux/tcp-wrappers/builder.sh b/pkgs/os-specific/linux/tcp-wrappers/builder.sh deleted file mode 100644 index 7ea574fcf23..00000000000 --- a/pkgs/os-specific/linux/tcp-wrappers/builder.sh +++ /dev/null @@ -1,39 +0,0 @@ -source "$stdenv/setup" || exit 1 - -# Unpack -unpackPhase -cd "$sourceRoot/upstream/tarballs" -tar xzvf * -cd tcp_wrappers_7.6 - -# Patch -patchPhase -for patch in debian/patches/* -do - echo "applying Debian patch \`$(basename $patch)'..." - patch --batch -p1 < $patch -done - -substituteInPlace "Makefile" --replace \ - "REAL_DAEMON_DIR=/usr/sbin" "REAL_DAEMON_DIR=$out/sbin" \ - --replace "/tmp" '$$TMPDIR' - -echo "building..." -make REAL_DAEMON_DIR="$out/sbin" linux - -# Install -mkdir -p "$out/sbin" -cp -v safe_finger tcpd tcpdchk tcpdmatch try-from "$out/sbin" - -mkdir -p "$out/lib" -cp -v shared/lib*.so* "$out/lib" - -mkdir -p "$out/include" -cp -v *.h "$out/include" - -mkdir -p "$out/man" -for i in 3 5 8; -do - mkdir -p "$out/man/man$i" - cp *.$i "$out/man/man$i" ; -done diff --git a/pkgs/os-specific/linux/tcp-wrappers/default.nix b/pkgs/os-specific/linux/tcp-wrappers/default.nix index a3f79cd05a8..eb50fc0abce 100644 --- a/pkgs/os-specific/linux/tcp-wrappers/default.nix +++ b/pkgs/os-specific/linux/tcp-wrappers/default.nix @@ -15,7 +15,40 @@ stdenv.mkDerivation { }) ]; - builder = ./builder.sh; + prePatch = '' + cd upstream/tarballs + tar xzvf * + cd tcp_wrappers_7.6 + ''; + + postPatch = '' + for patch in debian/patches/*; do + echo "applying Debian patch \`$(basename $patch)'..." + patch --batch -p1 < $patch + done + ''; + + buildPhase = '' + make REAL_DAEMON_DIR="$out/sbin" linux + ''; + + installPhase = '' + mkdir -p "$out/sbin" + cp -v safe_finger tcpd tcpdchk tcpdmatch try-from "$out/sbin" + + mkdir -p "$out/lib" + cp -v shared/lib*.so* "$out/lib" + + mkdir -p "$out/include" + cp -v *.h "$out/include" + + mkdir -p "$out/man" + for i in 3 5 8; + do + mkdir -p "$out/man/man$i" + cp *.$i "$out/man/man$i" ; + done + ''; meta = { description = "TCP Wrappers, a network logger, also known as TCPD or LOG_TCP"; @@ -32,7 +65,7 @@ stdenv.mkDerivation { ''; homepage = ftp://ftp.porcupine.org/pub/security/index.html; - license = "BSD-style"; + platforms = stdenv.lib.platforms.unix; }; } From d359ce90e88456c374c788d342a8cf1ab8c2853c Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sat, 14 May 2016 21:10:23 +0300 Subject: [PATCH 127/128] nix-prefetch-scripts: Use correct output of 'nix' --- pkgs/tools/package-management/nix-prefetch-scripts/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/package-management/nix-prefetch-scripts/default.nix b/pkgs/tools/package-management/nix-prefetch-scripts/default.nix index aa109ab80fe..6c5cb467a8f 100644 --- a/pkgs/tools/package-management/nix-prefetch-scripts/default.nix +++ b/pkgs/tools/package-management/nix-prefetch-scripts/default.nix @@ -18,7 +18,7 @@ let mkPrefetchScript = tool: src: deps: wrapArgs="$wrapArgs --prefix PATH : $dep/bin" done wrapArgs="$wrapArgs --prefix PATH : ${gnused}/bin" - wrapArgs="$wrapArgs --prefix PATH : ${nix}/bin" # For nix-hash + wrapArgs="$wrapArgs --prefix PATH : ${nix.out}/bin" # For nix-hash wrapArgs="$wrapArgs --set HOME : /homeless-shelter" wrapProgram $out/bin/$name $wrapArgs ''; From 0561e14c3b91893fcd55e78cde9fbd216c0f3d18 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Fri, 30 Oct 2015 23:12:29 +0200 Subject: [PATCH 128/128] bind: Split into multiple outputs A patch is needed to make bind not print its configure flags on 'named -V'. --- nixos/modules/services/networking/bind.nix | 2 +- pkgs/servers/dns/bind/default.nix | 9 ++++- .../dns/bind/dont-keep-configure-flags.patch | 40 +++++++++++++++++++ 3 files changed, 49 insertions(+), 2 deletions(-) create mode 100644 pkgs/servers/dns/bind/dont-keep-configure-flags.patch diff --git a/nixos/modules/services/networking/bind.nix b/nixos/modules/services/networking/bind.nix index b9e0eecf417..08afafceff2 100644 --- a/nixos/modules/services/networking/bind.nix +++ b/nixos/modules/services/networking/bind.nix @@ -154,7 +154,7 @@ in chown ${bindUser} /var/run/named ''; - script = "${pkgs.bind}/sbin/named -u ${bindUser} ${optionalString cfg.ipv4Only "-4"} -c ${cfg.configFile} -f"; + script = "${pkgs.bind.bin}/sbin/named -u ${bindUser} ${optionalString cfg.ipv4Only "-4"} -c ${cfg.configFile} -f"; }; }; } diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix index 9afb622eb5e..03cee0fe55b 100644 --- a/pkgs/servers/dns/bind/default.nix +++ b/pkgs/servers/dns/bind/default.nix @@ -10,7 +10,9 @@ stdenv.mkDerivation rec { sha256 = "0mmhzi4483mkak47wj255a36g3v0yilxwfwlbckr1hssinri5m7q"; }; - patches = [ ./remove-mkdir-var.patch ] ++ + outputs = [ "dev" "bin" "out" "man" ]; + + patches = [ ./dont-keep-configure-flags.patch ./remove-mkdir-var.patch ] ++ stdenv.lib.optional stdenv.isDarwin ./darwin-openssl-linking-fix.patch; buildInputs = [ openssl libtool perl libxml2 ]; @@ -31,6 +33,11 @@ stdenv.mkDerivation rec { "--without-python" ]; + postInstall = '' + moveToOutput bin/bind9-config $dev + moveToOutput bin/isc-config.sh $dev + ''; + meta = { homepage = "http://www.isc.org/software/bind"; description = "Domain name server"; diff --git a/pkgs/servers/dns/bind/dont-keep-configure-flags.patch b/pkgs/servers/dns/bind/dont-keep-configure-flags.patch new file mode 100644 index 00000000000..91cae62b171 --- /dev/null +++ b/pkgs/servers/dns/bind/dont-keep-configure-flags.patch @@ -0,0 +1,40 @@ +diff --git a/bin/named/include/named/globals.h b/bin/named/include/named/globals.h +index f354cfb..2aa0cc5 100644 +--- a/bin/named/include/named/globals.h ++++ b/bin/named/include/named/globals.h +@@ -71,7 +71,9 @@ EXTERN const char * ns_g_version INIT(VERSION); + EXTERN const char * ns_g_product INIT(PRODUCT); + EXTERN const char * ns_g_description INIT(DESCRIPTION); + EXTERN const char * ns_g_srcid INIT(SRCID); ++#if 0 + EXTERN const char * ns_g_configargs INIT(CONFIGARGS); ++#endif + EXTERN const char * ns_g_builder INIT(BUILDER); + EXTERN in_port_t ns_g_port INIT(0); + EXTERN isc_dscp_t ns_g_dscp INIT(-1); +diff --git a/bin/named/main.c b/bin/named/main.c +index 556db54..edab41d 100644 +--- a/bin/named/main.c ++++ b/bin/named/main.c +@@ -636,8 +636,10 @@ parse_command_line(int argc, char *argv[]) { + (*ns_g_description != '\0') ? " " : "", + ns_g_description, ns_g_srcid); + printf("running on %s\n", ns_os_uname()); ++#if 0 + printf("built by %s with %s\n", + ns_g_builder, ns_g_configargs); ++#endif + #ifdef __clang__ + printf("compiled by CLANG %s\n", __VERSION__); + #else +@@ -998,8 +1000,10 @@ setup(void) { + isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN, + ISC_LOG_NOTICE, "running on %s", ns_os_uname()); + ++#if 0 + isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN, + ISC_LOG_NOTICE, "built with %s", ns_g_configargs); ++#endif + + isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN, + ISC_LOG_NOTICE,