From 3775a9070193de40c36e65ef065dfeb9efb90b19 Mon Sep 17 00:00:00 2001 From: Armijn Hemel Date: Sat, 13 May 2017 21:08:43 +0200 Subject: [PATCH 001/117] gimp: 2.8.20 -> 2.8.22 --- pkgs/applications/graphics/gimp/2.8.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/gimp/2.8.nix b/pkgs/applications/graphics/gimp/2.8.nix index 8c430435dd7..47004a02500 100644 --- a/pkgs/applications/graphics/gimp/2.8.nix +++ b/pkgs/applications/graphics/gimp/2.8.nix @@ -8,7 +8,7 @@ let inherit (python2Packages) pygtk wrapPython python; in stdenv.mkDerivation rec { name = "gimp-${version}"; - version = "2.8.20"; + version = "2.8.22"; # This declarations for `gimp-with-plugins` wrapper, # (used for determining $out/lib/gimp/${majorVersion}/ paths) @@ -18,7 +18,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "http://download.gimp.org/pub/gimp/v2.8/${name}.tar.bz2"; - sha256 = "939ca1df70be865c672ffd654f4e20f188121d01601c5c90237214101533c805"; + sha256 = "12k3lp938qdc9cqj29scg55f3bb8iav2fysd29w0s49bqmfa71wi"; }; buildInputs = From 27aaea0cd265b6b9fe5679a902fe7aa0b6b758f1 Mon Sep 17 00:00:00 2001 From: romildo Date: Fri, 26 May 2017 09:23:47 -0300 Subject: [PATCH 002/117] qt5ct: 0.30 -> 0.32 --- pkgs/tools/misc/qt5ct/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/qt5ct/default.nix b/pkgs/tools/misc/qt5ct/default.nix index 4377b386d85..dd62fe461c6 100644 --- a/pkgs/tools/misc/qt5ct/default.nix +++ b/pkgs/tools/misc/qt5ct/default.nix @@ -1,17 +1,18 @@ -{stdenv, fetchurl, qtbase, qtsvg, qttools, qmakeHook, makeQtWrapper}: +{ stdenv, fetchurl, qtbase, qtsvg, qttools, qmakeHook, makeQtWrapper }: stdenv.mkDerivation rec { name = "qt5ct-${version}"; - version = "0.30"; + version = "0.32"; src = fetchurl { url = "mirror://sourceforge/qt5ct/qt5ct-${version}.tar.bz2"; - sha256 = "1k0ywd440qvf84chadjb4fnkn8dkfl56cc3a6wqg6a59drslvng6"; + sha256 = "0gzmqx6j8g8vgdg5sazfw31h825jdsjbkj8lk167msvahxgrf0fm"; }; - buildInputs = [ qtbase qtsvg ]; nativeBuildInputs = [ makeQtWrapper qmakeHook qttools ]; + buildInputs = [ qtbase qtsvg ]; + preConfigure = '' qmakeFlags="$qmakeFlags PLUGINDIR=$out/lib/qt5/plugins" ''; From d55c21d89d8a43ecf36ee0871a9509a6b50a1027 Mon Sep 17 00:00:00 2001 From: Winnie Quinn Date: Sat, 27 May 2017 13:00:26 -0400 Subject: [PATCH 003/117] vscode: 1.12.1 -> 1.12.2 --- pkgs/applications/editors/vscode/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/editors/vscode/default.nix b/pkgs/applications/editors/vscode/default.nix index 81aca06267b..47fb24ca2cc 100644 --- a/pkgs/applications/editors/vscode/default.nix +++ b/pkgs/applications/editors/vscode/default.nix @@ -2,7 +2,7 @@ makeWrapper, libXScrnSaver, libxkbfile }: let - version = "1.12.1"; + version = "1.12.2"; channel = "stable"; plat = { @@ -12,9 +12,9 @@ let }.${stdenv.system}; sha256 = { - "i686-linux" = "0i4zqxbq7bm2afzyny3a53sq1fghlz5an1z8fkqh5i3029s635h9"; - "x86_64-linux" = "0kwmfiyb70if4svamnivbc9w65c14j3lrn5vysqkc4b8hlk4r75i"; - "x86_64-darwin" = "1dgs4k4m885qzammhj0x9k6pd8rayxn61iq3fiazp0w8v5bhl4l5"; + "i686-linux" = "0221s8vx32haqr31wkkm637gya3vljbkim59i7a2hhwxh2gcs2fk"; + "x86_64-linux" = "0p6ck2lc9lln96lib5r5yfbrd04rgsbzhvf1lx2kykn428ddxi9s"; + "x86_64-darwin" = "1s7hyr245v4z2g357m7ajnh8y1cqixricpkx329xls4292qb7rh4"; }.${stdenv.system}; archive_fmt = if stdenv.system == "x86_64-darwin" then "zip" else "tar.gz"; From 63b3212471e1e6f4f65064c2b60167097edbdd64 Mon Sep 17 00:00:00 2001 From: Winnie Quinn Date: Sat, 27 May 2017 13:04:08 -0400 Subject: [PATCH 004/117] gitkraken: 2.5.0 -> 2.6.0 --- pkgs/applications/version-management/gitkraken/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix index 1404bd97599..23a3ab7fa5e 100644 --- a/pkgs/applications/version-management/gitkraken/default.nix +++ b/pkgs/applications/version-management/gitkraken/default.nix @@ -9,11 +9,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "gitkraken-${version}"; - version = "2.5.0"; + version = "2.6.0"; src = fetchurl { url = "https://release.gitkraken.com/linux/v${version}.deb"; - sha256 = "1in8caxsc8fld1sl6d9nzch86s9x0770qi6amh573zmb80yyd743"; + sha256 = "1msdwqp20pwaxv1a6maqb7wmaq00m8jpdga7fmbjcnpvkcdz49l7"; }; libPath = makeLibraryPath [ From 663d369211d9a62233d69b159ff43fb051b7f532 Mon Sep 17 00:00:00 2001 From: Aaron Bull Schaefer Date: Fri, 26 May 2017 15:55:15 -0700 Subject: [PATCH 005/117] pythonPackages.ntlm-auth: init at 1.0.3 --- .../python-modules/ntlm-auth/default.nix | 37 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 39 insertions(+) create mode 100644 pkgs/development/python-modules/ntlm-auth/default.nix diff --git a/pkgs/development/python-modules/ntlm-auth/default.nix b/pkgs/development/python-modules/ntlm-auth/default.nix new file mode 100644 index 00000000000..03890f712af --- /dev/null +++ b/pkgs/development/python-modules/ntlm-auth/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, mock +, pytest +, unittest2 +, six +}: + +buildPythonPackage rec { + pname = "ntlm-auth"; + version = "1.0.3"; + name = "${pname}-${version}"; + + src = fetchFromGitHub { + owner = "jborean93"; + repo = "ntlm-auth"; + rev = "v${version}"; + sha256 = "09f2g4ivfi9lh1kr30hlg0q4n2imnvmd79w83gza11q9nmhhiwpz"; + }; + + checkInputs = [ mock pytest unittest2 ]; + propagatedBuildInputs = [ six ]; + + # Functional tests require networking + checkPhase = '' + py.test --ignore=tests/functional/test_iis.py + ''; + + meta = with lib; { + description = "Calculates NTLM Authentication codes"; + homepage = https://github.com/jborean93/ntlm-auth; + license = licenses.lgpl3; + maintainers = with maintainers; [ elasticdog ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 83baa3a9312..18a0d7ac718 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -234,6 +234,8 @@ in { nltk = callPackage ../development/python-modules/nltk.nix { }; + ntlm-auth = callPackage ../development/python-modules/ntlm-auth { }; + pitz = callPackage ../applications/misc/pitz { }; plantuml = callPackage ../tools/misc/plantuml { }; From 65587984e4576b07ffa31faa076fe016077579bb Mon Sep 17 00:00:00 2001 From: Aaron Bull Schaefer Date: Fri, 26 May 2017 15:55:51 -0700 Subject: [PATCH 006/117] pythonPackages.requests_ntlm: init at 1.0.0 --- .../python-modules/requests_ntlm/default.nix | 30 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/development/python-modules/requests_ntlm/default.nix diff --git a/pkgs/development/python-modules/requests_ntlm/default.nix b/pkgs/development/python-modules/requests_ntlm/default.nix new file mode 100644 index 00000000000..c475ff85ff3 --- /dev/null +++ b/pkgs/development/python-modules/requests_ntlm/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildPythonPackage +, fetchPypi +, ntlm-auth +, requests +}: + +buildPythonPackage rec { + pname = "requests_ntlm"; + version = "1.0.0"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "0hb689p2jyb867c2wlq5mjkqxgc0jq6lxv3rmhw8rq9qangk3jjk"; + }; + + propagatedBuildInputs = [ ntlm-auth requests ]; + + # Tests require networking + doCheck = false; + + meta = with lib; { + description = "HTTP NTLM authentication support for python-requests"; + homepage = https://github.com/requests/requests-ntlm; + license = licenses.isc; + maintainers = with maintainers; [ elasticdog ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 18a0d7ac718..451eafaf5df 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -21373,6 +21373,8 @@ in { }; }; + requests_ntlm = callPackage ../development/python-modules/requests_ntlm { }; + requests_oauthlib = callPackage ../development/python-modules/requests-oauthlib.nix { }; requests_toolbelt = buildPythonPackage rec { From c5b1a9da4bdf600eb9c33e1565536b7f0ea0f72f Mon Sep 17 00:00:00 2001 From: Aaron Bull Schaefer Date: Fri, 26 May 2017 15:56:48 -0700 Subject: [PATCH 007/117] pythonPackages.pywinrm: 0.1.1 -> 0.2.2 --- .../python-modules/pywinrm/default.nix | 32 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 20 +----------- 2 files changed, 33 insertions(+), 19 deletions(-) create mode 100644 pkgs/development/python-modules/pywinrm/default.nix diff --git a/pkgs/development/python-modules/pywinrm/default.nix b/pkgs/development/python-modules/pywinrm/default.nix new file mode 100644 index 00000000000..b2b5ba20801 --- /dev/null +++ b/pkgs/development/python-modules/pywinrm/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchPypi +, mock +, pytest +, requests +, requests_ntlm +, six +, xmltodict +}: + +buildPythonPackage rec { + pname = "pywinrm"; + version = "0.2.2"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "06xc0mbqf718vmsp0fq0rb64nql66l5w2x23bmqnzl6nzc0gfc1h"; + }; + + checkInputs = [ mock pytest ]; + propagatedBuildInputs = [ requests requests_ntlm six xmltodict ]; + + meta = with lib; { + description = "Python library for Windows Remote Management"; + homepage = "http://github.com/diyan/pywinrm/"; + license = licenses.mit; + maintainers = with maintainers; [ elasticdog ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 451eafaf5df..37466daace2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -21092,25 +21092,7 @@ in { }; }; - pywinrm = buildPythonPackage rec { - version = "0.1.1"; - name = "pywinrm-${version}"; - - src = pkgs.fetchurl { - url = "https://github.com/diyan/pywinrm/archive/v${version}.tar.gz"; - sha256 = "1pc0987f6q5sxcgm50a1k1xz2pk45ny9xxnyapaf60662rcavvfb"; - }; - - propagatedBuildInputs = with self; [ isodate kerberos xmltodict ]; - - meta = { - homepage = "http://github.com/diyan/pywinrm/"; - description = "Python library for Windows Remote Management"; - license = licenses.mit; - # error: libgssapi_krb5.so: cannot open shared object file: No such file or directory - broken = true; # - }; - }; + pywinrm = callPackage ../development/python-modules/pywinrm { }; PyXAPI = stdenv.mkDerivation rec { name = "PyXAPI-0.1"; From 9e56cddf136837d30820783228299b600d98e8b6 Mon Sep 17 00:00:00 2001 From: Rodney Lorrimar Date: Mon, 29 May 2017 12:17:15 +0100 Subject: [PATCH 008/117] emacsWithPackages: support installing larger packages MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit I was getting the following error building tide from Melpa: nix-build -E '(import {}).emacs25WithPackages (p: [p.melpaPackages.tide])' File tide-20170509.1134.tar is large (10.2M), really open? (y or n) Error reading from stdin builder for ‘/nix/store/gs9ik7yf8iilsikkfing74i70m0diax3-emacs-tide-20170509.1134.drv’ failed with exit code 255 cannot build derivation ‘/nix/store/m3p080aani4rw82llp8nqk93cw2nvirk-emacs-with-packages-25.2.drv’: 1 dependencies couldn't be built Solution was to disable the large file warning threshold when installing packages. --- pkgs/build-support/emacs/elpa2nix.el | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/build-support/emacs/elpa2nix.el b/pkgs/build-support/emacs/elpa2nix.el index 7eef81b9e7a..64587c0fad1 100644 --- a/pkgs/build-support/emacs/elpa2nix.el +++ b/pkgs/build-support/emacs/elpa2nix.el @@ -28,3 +28,6 @@ The file can either be a tar file or an Emacs Lisp file." (insert-file-contents file)) (when is-tar (tar-mode)) (elpa2nix-install-from-buffer)))) + +;; Allow installing package tarfiles larger than 10MB +(setq large-file-warning-threshold nil) From a9f66fa4cf446abfd4f3d86d7c88a7b94a8708a4 Mon Sep 17 00:00:00 2001 From: Rodney Lorrimar Date: Mon, 29 May 2017 21:39:40 +0100 Subject: [PATCH 009/117] csound: add optional libraries Adds extra bells and whistles: - jack - ladspa - fluidsynth - fltk (for the virtual keyboard) - curl - gettext The most important one is jack but I added other dependencies which seemed sensible and were mentioned by the configure script. --- pkgs/applications/audio/csound/default.nix | 29 ++++++++++++++-------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/audio/csound/default.nix b/pkgs/applications/audio/csound/default.nix index 4f58ae48390..2395fe6ccea 100644 --- a/pkgs/applications/audio/csound/default.nix +++ b/pkgs/applications/audio/csound/default.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchFromGitHub, cmake, libsndfile, flex, bison, boost +{ stdenv, fetchFromGitHub, cmake, libsndfile, libsamplerate, flex, bison, boost, gettext , alsaLib ? null , libpulseaudio ? null -, tcltk ? null +, libjack2 ? null , liblo ? null - -# maybe csound can be compiled with support for those, see configure output -# , ladspa ? null -# , fluidsynth ? null -# , jack ? null -# , gmm ? null -# , wiiuse ? null +, ladspa-sdk ? null +, fluidsynth ? null +# , gmm ? null # opcodes don't build with gmm 5.1 +, eigen ? null +, curl ? null +, tcltk ? null +, fltk ? null }: stdenv.mkDerivation rec { @@ -27,8 +27,15 @@ stdenv.mkDerivation rec { sha256 = "03xnva17sw35ga3n96x1zdfgw913dga1hccly85wzfn0kxz4rld9"; }; - nativeBuildInputs = [ cmake flex bison ]; - buildInputs = [ libsndfile alsaLib libpulseaudio tcltk boost liblo ]; + cmakeFlags = [ "-DBUILD_CSOUND_AC=0" ] # fails to find Score.hpp + ++ stdenv.lib.optional (libjack2 != null) "-DJACK_HEADER=${libjack2}/include/jack/jack.h"; + + nativeBuildInputs = [ cmake flex bison gettext ]; + buildInputs = [ libsndfile libsamplerate boost ] + ++ builtins.filter (optional: optional != null) [ + alsaLib libpulseaudio libjack2 + liblo ladspa-sdk fluidsynth eigen + curl tcltk fltk ]; meta = with stdenv.lib; { description = "Sound design, audio synthesis, and signal processing system, providing facilities for music composition and performance on all major operating systems and platforms"; From 9007ebd627ff3af3905248ef51086f286b5da501 Mon Sep 17 00:00:00 2001 From: Rodney Lorrimar Date: Mon, 29 May 2017 21:36:36 +0100 Subject: [PATCH 010/117] csound: 6.08.1 -> 6.09.0 --- pkgs/applications/audio/csound/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/csound/default.nix b/pkgs/applications/audio/csound/default.nix index 2395fe6ccea..dc0c8eabcac 100644 --- a/pkgs/applications/audio/csound/default.nix +++ b/pkgs/applications/audio/csound/default.nix @@ -13,8 +13,8 @@ }: stdenv.mkDerivation rec { - name = "csound-6.08.1"; - version = "6.08.1"; + name = "csound-${version}"; + version = "6.09.0"; enableParallelBuilding = true; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { owner = "csound"; repo = "csound"; rev = version; - sha256 = "03xnva17sw35ga3n96x1zdfgw913dga1hccly85wzfn0kxz4rld9"; + sha256 = "1vfb0mab89psfwidadjrn5mbzq3bhjbyrrmyp98yp0xm6a8cssih"; }; cmakeFlags = [ "-DBUILD_CSOUND_AC=0" ] # fails to find Score.hpp From 31d5363228989a62cb81fb97f14e33e5051c6ac9 Mon Sep 17 00:00:00 2001 From: Alexandre Peyroux Date: Tue, 30 May 2017 13:10:45 +0200 Subject: [PATCH 011/117] ctop: init at 2017-05-28 --- pkgs/tools/system/ctop/default.nix | 25 ++++++ pkgs/tools/system/ctop/deps.nix | 120 +++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 147 insertions(+) create mode 100644 pkgs/tools/system/ctop/default.nix create mode 100644 pkgs/tools/system/ctop/deps.nix diff --git a/pkgs/tools/system/ctop/default.nix b/pkgs/tools/system/ctop/default.nix new file mode 100644 index 00000000000..a0bda0c4335 --- /dev/null +++ b/pkgs/tools/system/ctop/default.nix @@ -0,0 +1,25 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "ctop-unstable-${version}"; + version = "2017-05-28"; + rev = "b4e1fbf29073625ec803025158636bdbcf2357f4"; + + goPackagePath = "github.com/bcicen/ctop"; + + src = fetchFromGitHub { + inherit rev; + owner = "bcicen"; + repo = "ctop"; + sha256 = "162pc7gds66cgznqlq9gywr0qij5pymn7xszlq9rn4w2fm64qgg3"; + }; + + goDeps = ./deps.nix; + + meta = with stdenv.lib; { + description = "Concise commandline monitoring for containers"; + homepage = "http://ctop.sh/"; + license = licenses.mit; + maintainers = with maintainers; [ apeyroux ]; + }; +} diff --git a/pkgs/tools/system/ctop/deps.nix b/pkgs/tools/system/ctop/deps.nix new file mode 100644 index 00000000000..4fb75cdcd3d --- /dev/null +++ b/pkgs/tools/system/ctop/deps.nix @@ -0,0 +1,120 @@ +# This file was generated by https://github.com/kamilchm/go2nix v1.2.0 +[ + { + goPackagePath = "github.com/docker/docker"; + fetch = { + type = "git"; + url = "https://github.com/docker/docker"; + rev = "599f207b45e74648a8a6a7ac87d77e40930504e9"; + sha256 = "1n0r9ahcx5h2f97ap5fy5hgnpamzzrgihknx7wgvvpm4hrzxm31r"; + }; + } + { + goPackagePath = "github.com/docker/go-units"; + fetch = { + type = "git"; + url = "https://github.com/docker/go-units"; + rev = "0dadbb0345b35ec7ef35e228dabb8de89a65bf52"; + sha256 = "1sqwvcszxqpv77xf2d8fxvryxphdwj9v8f93231wpnk9kpilhyii"; + }; + } + { + goPackagePath = "github.com/fsouza/go-dockerclient"; + fetch = { + type = "git"; + url = "https://github.com/fsouza/go-dockerclient"; + rev = "c933ed18bef34ec2955de03de8ef9a3bb996e3df"; + sha256 = "1qci2m5ifmz3lcmc4y6k9baz9z1i77xnrrcq6zi9mpclhhfr0qzd"; + }; + } + { + goPackagePath = "github.com/gizak/termui"; + fetch = { + type = "git"; + url = "https://github.com/gizak/termui"; + rev = "ea10e6ccee219e572ffad0ac1909f1a17f6db7d6"; + sha256 = "1nxihx4vwxwgq3vnccc8a1v34raqvvsl0p10v1nlvs61rjvs9g32"; + }; + } + { + goPackagePath = "github.com/hashicorp/go-cleanhttp"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/go-cleanhttp"; + rev = "3573b8b52aa7b37b9358d966a898feb387f62437"; + sha256 = "1pbl6p7w5wp1c70x7fp94h4ynk2ajfa76rqin3d2hq1w2fcb7byr"; + }; + } + { + goPackagePath = "github.com/jgautheron/codename-generator"; + fetch = { + type = "git"; + url = "https://github.com/jgautheron/codename-generator"; + rev = "16d037c7cc3c9b552fe4af9828b7338d752dbaf9"; + sha256 = "0v6fji5swnrdjlp3bahv65chnbhxzl25j3hwwnyvvbb4iwa9a376"; + }; + } + { + goPackagePath = "github.com/maruel/panicparse"; + fetch = { + type = "git"; + url = "https://github.com/maruel/panicparse"; + rev = "ae43f192cef2add653fe1481a3070ed00a4a6981"; + sha256 = "11q8v4adbrazqvh24235s5nifck0d1083gbwv4dh5lhd10xlwdvr"; + }; + } + { + goPackagePath = "github.com/mattn/go-runewidth"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-runewidth"; + rev = "97311d9f7767e3d6f422ea06661bc2c7a19e8a5d"; + sha256 = "0dxlrzn570xl7gb11hjy1v4p3gw3r41yvqhrffgw95ha3q9p50cg"; + }; + } + { + goPackagePath = "github.com/mitchellh/go-wordwrap"; + fetch = { + type = "git"; + url = "https://github.com/mitchellh/go-wordwrap"; + rev = "ad45545899c7b13c020ea92b2072220eefad42b8"; + sha256 = "0ny1ddngvwfj3njn7pmqnf3l903lw73ynddw15x8ymp7hidv27v9"; + }; + } + { + goPackagePath = "github.com/nsf/termbox-go"; + fetch = { + type = "git"; + url = "https://github.com/nsf/termbox-go"; + rev = "7994c181db7761ca3c67a217068cf31826113f5f"; + sha256 = "0ssc54wamn3h8z68kv4fdgvk3kjii95psi2kk0slsilmg5v6jzhj"; + }; + } + { + goPackagePath = "github.com/nu7hatch/gouuid"; + fetch = { + type = "git"; + url = "https://github.com/nu7hatch/gouuid"; + rev = "179d4d0c4d8d407a32af483c2354df1d2c91e6c3"; + sha256 = "1isyfix5w1wm26y3a15ha3nnpsxqaxz5ngq06hnh6c6y0inl2fwj"; + }; + } + { + goPackagePath = "github.com/op/go-logging"; + fetch = { + type = "git"; + url = "https://github.com/op/go-logging"; + rev = "970db520ece77730c7e4724c61121037378659d9"; + sha256 = "1cpna2x5l071z1vrnk7zipdkka8dzwsjyx7m79xk0lr08rip0kcj"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "3da985ce5951d99de868be4385f21ea6c2b22f24"; + sha256 = "0mhqa53pyj9gxg4m0c9s0f4r5jp0rihlni1nrpkd1d921xxzh714"; + }; + } +] diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1e52201f745..e1b90bcefb8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13440,6 +13440,8 @@ with pkgs; liblapack = liblapackWithoutAtlas; }; + ctop = callPackage ../tools/system/ctop { }; + cuneiform = callPackage ../tools/graphics/cuneiform {}; cutecom = callPackage ../tools/misc/cutecom { }; From 479ddf0f139648a716c9110957e3cf3485f82558 Mon Sep 17 00:00:00 2001 From: Jens Binkert Date: Tue, 30 May 2017 15:50:10 +0200 Subject: [PATCH 012/117] networkmanager_dmenu: unstable-2017-04-13 -> unstable-2017-05-28 --- pkgs/tools/networking/networkmanager_dmenu/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/networkmanager_dmenu/default.nix b/pkgs/tools/networking/networkmanager_dmenu/default.nix index f9b84be6015..79fad953a2c 100644 --- a/pkgs/tools/networking/networkmanager_dmenu/default.nix +++ b/pkgs/tools/networking/networkmanager_dmenu/default.nix @@ -4,13 +4,13 @@ let inherit (python3Packages) python pygobject3; in stdenv.mkDerivation rec { name = "networkmanager_dmenu-unstable-${version}"; - version = "2017-04-13"; + version = "2017-05-28"; src = fetchFromGitHub { owner = "firecat53"; repo = "networkmanager-dmenu"; - rev = "fbc0704702b32c2efb30ba6b5c0ad6f054a71a18"; - sha256 = "1584zrhla1njvkrbvb1rq66q06gs510f0l1ls3z7x7jmn322y6yr"; + rev = "eeb8e6922dee887890884f129b51bb21b0047d30"; + sha256 = "00n82sjjqk76sfxi92f5vnzpngk66cqwyzqdanbszpl019ajr5h6"; }; buildInputs = [ glib python pygobject3 gobjectIntrospection networkmanager python3Packages.wrapPython ]; From b67d01a0e9d89757561bd9e4181fba8e861fed38 Mon Sep 17 00:00:00 2001 From: Mathias Schreck Date: Wed, 24 May 2017 23:30:33 +0200 Subject: [PATCH 013/117] nodejs: init at 8.0.0 --- pkgs/development/web/nodejs/v8.nix | 22 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 9 +++++++++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/development/web/nodejs/v8.nix diff --git a/pkgs/development/web/nodejs/v8.nix b/pkgs/development/web/nodejs/v8.nix new file mode 100644 index 00000000000..bee323176d8 --- /dev/null +++ b/pkgs/development/web/nodejs/v8.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl, openssl, python2, zlib, libuv, v8, utillinux, http-parser +, pkgconfig, runCommand, which, libtool, fetchpatch +, callPackage +, darwin ? null +, enableNpm ? true +}@args: + +let + nodejs = import ./nodejs.nix args; + baseName = if enableNpm then "nodejs" else "nodejs-slim"; +in + stdenv.mkDerivation (nodejs // rec { + version = "8.0.0"; + name = "${baseName}-${version}"; + src = fetchurl { + url = "https://nodejs.org/download/release/v${version}/node-v${version}.tar.xz"; + sha256 = "072g2zv58aa5zxs8fs9bdsi3mqklf2yj9mf58yjg5frbcfikm395"; + }; + + patches = stdenv.lib.optionals stdenv.isDarwin [ ./no-xcode-v7.patch ]; + }) + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 20d04741120..e9475c0c6cc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2794,6 +2794,15 @@ with pkgs; enableNpm = false; }; + nodejs-8_x = callPackage ../development/web/nodejs/v8.nix { + libtool = darwin.cctools; + }; + + nodejs-slim-8_x = callPackage ../development/web/nodejs/v8.nix { + libtool = darwin.cctools; + enableNpm = false; + }; + nodePackages_6_x = callPackage ../development/node-packages/default-v6.nix { nodejs = pkgs.nodejs-6_x; }; From 87ed14b9413c7e81057e6bee08fa9d3301e3d501 Mon Sep 17 00:00:00 2001 From: Anthony Cowley Date: Wed, 31 May 2017 14:19:28 -0400 Subject: [PATCH 014/117] rtags: 2.8-p1 -> 2.10 --- pkgs/development/tools/rtags/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/rtags/default.nix b/pkgs/development/tools/rtags/default.nix index 4f396e26bf9..da55afbd1fb 100644 --- a/pkgs/development/tools/rtags/default.nix +++ b/pkgs/development/tools/rtags/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "rtags-${version}"; - version = "2.8-p1"; + version = "2.10"; buildInputs = [ cmake llvmPackages.llvm openssl llvmPackages.clang emacs ] ++ lib.optionals stdenv.isDarwin [ apple_sdk.libs.xpc apple_sdk.frameworks.CoreServices ]; @@ -13,11 +13,10 @@ stdenv.mkDerivation rec { ''; src = fetchgit { - # rev = "refs/tags/v${version}"; # TODO Renable if sha1 below is tagged as release - rev = "f85bd60f00d51748ea159b00fda7b5bfa78ef571"; + rev = "refs/tags/v${version}"; fetchSubmodules = true; url = "https://github.com/andersbakken/rtags.git"; - sha256 = "0g9sgc763c5d695hjffhis19sbaqk8z4884szljf7kbrjxl17y78"; + sha256 = "0z32yncn3x1pm2l6r349kfwi6mi83vll820kka87agcla64pl1f2"; }; enableParallelBuilding = true; From 0925f79d561b077c40c53e3fb213df461bdf2b06 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 30 May 2017 06:55:03 +0200 Subject: [PATCH 015/117] programs.zsh.syntaxHighlighting: refactor to use attr sets rather than recursive lists for patterns The idea has been described here: https://github.com/NixOS/nixpkgs/pull/25323#issuecomment-298677369 --- .../programs/zsh/zsh-syntax-highlighting.nix | 27 ++++++++++--------- 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/nixos/modules/programs/zsh/zsh-syntax-highlighting.nix b/nixos/modules/programs/zsh/zsh-syntax-highlighting.nix index 39176b28784..1dded038795 100644 --- a/nixos/modules/programs/zsh/zsh-syntax-highlighting.nix +++ b/nixos/modules/programs/zsh/zsh-syntax-highlighting.nix @@ -39,12 +39,12 @@ in patterns = mkOption { default = []; - type = types.listOf(types.listOf(types.string)); + type = types.attrsOf types.string; example = literalExample '' - [ - ["rm -rf *" "fg=white,bold,bg=red"] - ] + { + "rm -rf *" = "fg=white,bold,bg=red"; + } ''; description = '' @@ -67,14 +67,17 @@ in "ZSH_HIGHLIGHT_HIGHLIGHTERS=(${concatStringsSep " " cfg.highlighters})" } - ${optionalString (length(cfg.patterns) > 0) - (assert(elem "pattern" cfg.highlighters); (foldl ( - a: b: - assert(length(b) == 2); '' - ${a} - ZSH_HIGHLIGHT_PATTERNS+=('${elemAt b 0}' '${elemAt b 1}') - '' - ) "") cfg.patterns) + ${let + n = attrNames cfg.patterns; + in + optionalString (length(n) > 0) + (assert(elem "pattern" cfg.highlighters); (foldl ( + a: b: + '' + ${a} + ZSH_HIGHLIGHT_PATTERNS+=('${b}' '${attrByPath [b] "" cfg.patterns}') + '' + ) "") n) } ''; }; From c4e4071ed115aca6ad8e7a15429638b2c497e790 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 30 May 2017 14:40:25 +0200 Subject: [PATCH 016/117] programs.zsh.syntax-highlighting: simplify enable option by using `mkEnableOption` --- nixos/modules/programs/zsh/zsh-syntax-highlighting.nix | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/nixos/modules/programs/zsh/zsh-syntax-highlighting.nix b/nixos/modules/programs/zsh/zsh-syntax-highlighting.nix index 1dded038795..3bd7ab81896 100644 --- a/nixos/modules/programs/zsh/zsh-syntax-highlighting.nix +++ b/nixos/modules/programs/zsh/zsh-syntax-highlighting.nix @@ -8,13 +8,7 @@ in { options = { programs.zsh.syntaxHighlighting = { - enable = mkOption { - default = false; - type = types.bool; - description = '' - Enable zsh-syntax-highlighting. - ''; - }; + enable = mkEnableOption "zsh-syntax-highlighting"; highlighters = mkOption { default = [ "main" ]; From 32e12ff4ed94797960a842410ca96dc2c29bc97b Mon Sep 17 00:00:00 2001 From: romildo Date: Wed, 31 May 2017 16:16:24 -0300 Subject: [PATCH 017/117] cmdliner_1_0: init at 1.0.0 Version 1.0 breaks API and some packages does currently not compile with it. So it is added as a new package. --- .../ocaml-modules/cmdliner/1.0.nix | 42 +++++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 2 + 2 files changed, 44 insertions(+) create mode 100644 pkgs/development/ocaml-modules/cmdliner/1.0.nix diff --git a/pkgs/development/ocaml-modules/cmdliner/1.0.nix b/pkgs/development/ocaml-modules/cmdliner/1.0.nix new file mode 100644 index 00000000000..9448610a378 --- /dev/null +++ b/pkgs/development/ocaml-modules/cmdliner/1.0.nix @@ -0,0 +1,42 @@ +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg, result }: + +let + pname = "cmdliner"; +in + +assert stdenv.lib.versionAtLeast ocaml.version "4.01.0"; + +stdenv.mkDerivation rec { + name = "ocaml-${pname}-${version}"; + version = "1.0.0"; + + src = fetchurl { + url = "http://erratique.ch/software/${pname}/releases/${pname}-${version}.tbz"; + sha256 = "1ryn7qis0izg0wcal8zdlikzzl689l75y6f4zc6blrm93y5agy9x"; + }; + + unpackCmd = "tar xjf $src"; + + nativeBuildInputs = [ ocamlbuild opam topkg ]; + buildInputs = [ ocaml findlib ]; + propagatedBuildInputs = [ result ]; + + createFindlibDestdir = true; + + buildPhase = '' + ocaml -I ${findlib}/lib/ocaml/${ocaml.version}/site-lib pkg/pkg.ml build + ''; + + installPhase = '' + opam-installer --script --prefix=$out | sh + ln -s $out/lib/${pname} $out/lib/ocaml/${ocaml.version}/site-lib/ + ''; + + meta = with stdenv.lib; { + homepage = http://erratique.ch/software/cmdliner; + description = "An OCaml module for the declarative definition of command line interfaces"; + license = licenses.bsd3; + platforms = ocaml.meta.platforms or []; + maintainers = [ maintainers.vbgl ]; + }; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 83c7d610c72..bf0ea759abd 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -130,6 +130,8 @@ let cmdliner = callPackage ../development/ocaml-modules/cmdliner { }; + cmdliner_1_0 = callPackage ../development/ocaml-modules/cmdliner/1.0.nix { }; + cohttp = callPackage ../development/ocaml-modules/cohttp { lwt = ocaml_lwt; }; From 61b8fddf5251e418eda3e93d63a0a608e56cc848 Mon Sep 17 00:00:00 2001 From: romildo Date: Wed, 31 May 2017 16:22:35 -0300 Subject: [PATCH 018/117] cmdliner: 1.0.0 -> 0.9.8 Downgrade to version 0.9.8 because the new version 1.0.0 breaks API and some pacakges do not yet compile with it. --- .../ocaml-modules/cmdliner/default.nix | 21 ++++++++----------- 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/pkgs/development/ocaml-modules/cmdliner/default.nix b/pkgs/development/ocaml-modules/cmdliner/default.nix index 9448610a378..e8824f31807 100644 --- a/pkgs/development/ocaml-modules/cmdliner/default.nix +++ b/pkgs/development/ocaml-modules/cmdliner/default.nix @@ -1,33 +1,30 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg, result }: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam }: let pname = "cmdliner"; in -assert stdenv.lib.versionAtLeast ocaml.version "4.01.0"; +assert stdenv.lib.versionAtLeast ocaml.version "3.12"; stdenv.mkDerivation rec { + name = "ocaml-${pname}-${version}"; - version = "1.0.0"; + version = "0.9.8"; src = fetchurl { url = "http://erratique.ch/software/${pname}/releases/${pname}-${version}.tbz"; - sha256 = "1ryn7qis0izg0wcal8zdlikzzl689l75y6f4zc6blrm93y5agy9x"; + sha256 = "0hdxlkgiwjml9dpaa80282a8350if7mc1m6yz2mrd7gci3fszykx"; }; unpackCmd = "tar xjf $src"; - - nativeBuildInputs = [ ocamlbuild opam topkg ]; + nativeBuildInputs = [ ocamlbuild opam ]; buildInputs = [ ocaml findlib ]; - propagatedBuildInputs = [ result ]; createFindlibDestdir = true; - buildPhase = '' - ocaml -I ${findlib}/lib/ocaml/${ocaml.version}/site-lib pkg/pkg.ml build - ''; - - installPhase = '' + configurePhase = "ocaml pkg/git.ml"; + buildPhase = "ocaml pkg/build.ml native=true native-dynlink=true"; + installPhase = '' opam-installer --script --prefix=$out | sh ln -s $out/lib/${pname} $out/lib/ocaml/${ocaml.version}/site-lib/ ''; From 98058ef4447158761f5fb501f6f78de69e22aaa8 Mon Sep 17 00:00:00 2001 From: romildo Date: Wed, 31 May 2017 17:13:28 -0300 Subject: [PATCH 019/117] ocp-indent: depends on cmdliner minimum version 1.0.0 --- pkgs/top-level/ocaml-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index bf0ea759abd..4c8bf5ce14d 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -388,7 +388,7 @@ let ocpBuild = callPackage ../development/tools/ocaml/ocp-build { }; - ocpIndent = callPackage ../development/tools/ocaml/ocp-indent { }; + ocpIndent = callPackage ../development/tools/ocaml/ocp-indent { cmdliner = cmdliner_1_0; }; ocp-index = callPackage ../development/tools/ocaml/ocp-index { }; From 29acc510c05d853f4be464c715fde285db422a5f Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Fri, 26 May 2017 00:11:03 -0500 Subject: [PATCH 020/117] lldb: fix on Darwin This gives a few fixes for LLDB on Darwin. Note: you will have to do code signing for it to work outside of root! --- pkgs/development/compilers/llvm/4/lldb.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/llvm/4/lldb.nix b/pkgs/development/compilers/llvm/4/lldb.nix index a71c2332dc1..a3c46a4c7e9 100644 --- a/pkgs/development/compilers/llvm/4/lldb.nix +++ b/pkgs/development/compilers/llvm/4/lldb.nix @@ -32,17 +32,21 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake python which swig ]; buildInputs = [ ncurses zlib libedit libxml2 llvm ] - ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.libobjc darwin.apple_sdk.libs.xpc ]; + ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.libobjc darwin.apple_sdk.libs.xpc darwin.apple_sdk.frameworks.Foundation darwin.bootstrap_cmds darwin.apple_sdk.frameworks.Carbon darwin.apple_sdk.frameworks.Cocoa ]; CXXFLAGS = "-fno-rtti"; hardeningDisable = [ "format" ]; + cmakeFlags = [ + "-DLLDB_CODESIGN_IDENTITY=" # codesigning makes nondeterministic + ]; + enableParallelBuilding = true; meta = with stdenv.lib; { description = "A next-generation high-performance debugger"; homepage = http://llvm.org/; license = licenses.ncsa; - platforms = platforms.allBut platforms.darwin; + platforms = platforms.all; }; } From 156ee07f3cf9fe38c5c5421bc85580bb1396890d Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Thu, 1 Jun 2017 20:30:50 +0100 Subject: [PATCH 021/117] python.pkgs.magic-wormhole: fix build mostly through adding new dependencies --- .../python-modules/magic-wormhole/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/magic-wormhole/default.nix b/pkgs/development/python-modules/magic-wormhole/default.nix index 62f40ce8337..a777094aea1 100644 --- a/pkgs/development/python-modules/magic-wormhole/default.nix +++ b/pkgs/development/python-modules/magic-wormhole/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, pythonAtLeast , nettools , glibcLocales , autobahn @@ -12,6 +13,10 @@ , tqdm , python , mock +, ipaddress +, humanize +, pyopenssl +, service-identity }: buildPythonPackage rec { @@ -26,7 +31,7 @@ buildPythonPackage rec { checkInputs = [ mock ]; buildInputs = [ nettools glibcLocales ]; - propagatedBuildInputs = [ autobahn cffi click hkdf pynacl spake2 tqdm ]; + propagatedBuildInputs = [ autobahn cffi click hkdf pynacl spake2 tqdm ipaddress humanize pyopenssl service-identity ]; postPatch = '' sed -i -e "s|'ifconfig'|'${nettools}/bin/ifconfig'|" src/wormhole/ipaddrs.py @@ -34,6 +39,8 @@ buildPythonPackage rec { # XXX: disable one test due to warning: # setlocale: LC_ALL: cannot change locale (en_US.UTF-8) sed -i -e "s|def test_text_subprocess|def skip_test_text_subprocess|" src/wormhole/test/test_scripts.py + '' + lib.optionalString (pythonAtLeast "3.3") '' + sed -i -e 's|"ipaddress",||' setup.py ''; checkPhase = '' From 5ae61ce156d9b7d77f09ecd87dc86f31119e2a8f Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Thu, 1 Jun 2017 22:05:26 +0200 Subject: [PATCH 022/117] pythonPackages.uncertainties: move to development/python-modules --- .../python-modules/uncertainties/default.nix | 24 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 22 +---------------- 2 files changed, 25 insertions(+), 21 deletions(-) create mode 100644 pkgs/development/python-modules/uncertainties/default.nix diff --git a/pkgs/development/python-modules/uncertainties/default.nix b/pkgs/development/python-modules/uncertainties/default.nix new file mode 100644 index 00000000000..a0aa1478944 --- /dev/null +++ b/pkgs/development/python-modules/uncertainties/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchPypi, buildPythonPackage, nose, numpy }: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "uncertainties"; + version = "3.0.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "de0765cac6911e5afa93ee941063a07b4a98dbd9c314c5eea4ab14bfff0054a4"; + }; + + buildInputs = [ nose numpy ]; + + # No tests included + doCheck = false; + + meta = with stdenv.lib; { + homepage = "http://pythonhosted.org/uncertainties/"; + description = "Transparent calculations with uncertainties on the quantities involved (aka error propagation)"; + maintainer = with maintainers; [ rnhmjoj ]; + license = licenses.bsd3; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c146ea70b2c..958f730b61d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -28148,27 +28148,7 @@ EOF }; - uncertainties = buildPythonPackage rec { - name = "uncertainties-${version}"; - version = "3.0.1"; - - src = pkgs.fetchurl { - url = "mirror://pypi/u/uncertainties/${name}.tar.gz"; - sha256 = "de0765cac6911e5afa93ee941063a07b4a98dbd9c314c5eea4ab14bfff0054a4"; - }; - - buildInputs = with self; [ nose numpy ]; - - meta = { - homepage = "http://pythonhosted.org/uncertainties/"; - description = "Transparent calculations with uncertainties on the quantities involved (aka error propagation)"; - license = licenses.bsd3; - }; - - # No tests included - doCheck = false; - }; - + uncertainties = callPackage ../development/python-modules/uncertainties { }; funcy = buildPythonPackage rec { name = "funcy-1.6"; From 624887a3546ad691bc27a803a08fa4a321e693f2 Mon Sep 17 00:00:00 2001 From: Pascal Bach Date: Thu, 1 Jun 2017 23:16:19 +0200 Subject: [PATCH 023/117] php: set extension dir to correct location The extension dir was no longer correctly set to $out/lib/php/extensions as PHP expects the EXTENSION_DIR as environment variable not config flag. --- pkgs/development/interpreters/php/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index b1fdb9e81f9..709f0fad41e 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -274,9 +274,10 @@ let #[[ -z "$libxml2" ]] || addToSearchPath PATH $libxml2/bin + export EXTENSION_DIR=$out/lib/php/extensions + configureFlags+=(--with-config-file-path=$out/etc \ - --includedir=$dev/include \ - EXTENSION_DIR=$out/lib/php/extensions) + --includedir=$dev/include) ''; configureFlags = [ From 7ba979cac370ebe4bbb4af565b198e116a4a6214 Mon Sep 17 00:00:00 2001 From: romildo Date: Thu, 1 Jun 2017 18:43:27 -0300 Subject: [PATCH 024/117] ocp-indent: readd old version 1.5.2 Some packages (ocp-index, for instance) are not yet compatible with newer versions of ocp-indent. So version 1.5.2 is still needed. --- .../tools/ocaml/ocp-indent/1.5.2.nix | 37 +++++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 1 + 2 files changed, 38 insertions(+) create mode 100644 pkgs/development/tools/ocaml/ocp-indent/1.5.2.nix diff --git a/pkgs/development/tools/ocaml/ocp-indent/1.5.2.nix b/pkgs/development/tools/ocaml/ocp-indent/1.5.2.nix new file mode 100644 index 00000000000..ee70a80b6af --- /dev/null +++ b/pkgs/development/tools/ocaml/ocp-indent/1.5.2.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchzip, ocaml, findlib, ocpBuild, opam, cmdliner }: + +let inherit (stdenv.lib) getVersion versionAtLeast; in + +assert versionAtLeast (getVersion ocaml) "3.12.1"; +assert versionAtLeast (getVersion ocpBuild) "1.99.6-beta"; +assert versionAtLeast "0.9.8" (getVersion cmdliner); + +stdenv.mkDerivation { + + name = "ocp-indent-1.5.2"; + + src = fetchzip { + url = "https://github.com/OCamlPro/ocp-indent/archive/1.5.2.tar.gz"; + sha256 = "0ynv2yhm7akpvqp72pdabhddwr352s1k85q8m1khsvspgg1mkiqz"; + }; + + nativeBuildInputs = [ ocpBuild opam ]; + + buildInputs = [ ocaml findlib cmdliner ]; + + createFindlibDestdir = true; + + preConfigure = "patchShebangs ./install.sh"; + + postInstall = '' + mv $out/lib/{ocp-indent,ocaml/${getVersion ocaml}/site-lib/} + ''; + + meta = with stdenv.lib; { + homepage = "http://typerex.ocamlpro.com/ocp-indent.html"; + description = "A customizable tool to indent OCaml code"; + license = licenses.gpl3; + platforms = ocaml.meta.platforms or []; + maintainers = [ maintainers.jirkamarsik ]; + }; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 4c8bf5ce14d..ff6e12b63c1 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -389,6 +389,7 @@ let ocpBuild = callPackage ../development/tools/ocaml/ocp-build { }; ocpIndent = callPackage ../development/tools/ocaml/ocp-indent { cmdliner = cmdliner_1_0; }; + ocpIndent_1_5_2 = callPackage ../development/tools/ocaml/ocp-indent/1.5.2.nix { }; ocp-index = callPackage ../development/tools/ocaml/ocp-index { }; From 4103994414cf55ede5242ea19b8ca7a8982376d7 Mon Sep 17 00:00:00 2001 From: romildo Date: Thu, 1 Jun 2017 18:47:59 -0300 Subject: [PATCH 025/117] ocp-index: add explicitly dependency on ocpIndent_1_5_2 ocp-index does not yet compile with newer versions of ocp-indent. --- pkgs/top-level/ocaml-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index ff6e12b63c1..ab82597b9e5 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -391,7 +391,7 @@ let ocpIndent = callPackage ../development/tools/ocaml/ocp-indent { cmdliner = cmdliner_1_0; }; ocpIndent_1_5_2 = callPackage ../development/tools/ocaml/ocp-indent/1.5.2.nix { }; - ocp-index = callPackage ../development/tools/ocaml/ocp-index { }; + ocp-index = callPackage ../development/tools/ocaml/ocp-index { ocpIndent = ocpIndent_1_5_2; }; ocplib-endian = callPackage ../development/ocaml-modules/ocplib-endian { }; From 20730dc2805bdc030938518b90050f033ec580cd Mon Sep 17 00:00:00 2001 From: Tyson Whitehead Date: Tue, 30 May 2017 16:06:16 -0400 Subject: [PATCH 026/117] TheanoWithCuda: cudnn shouldn't be optional or list wrapped #26263 * python27.withPackages drops nested propagatedBuildInputs * not clear why cudnn was optional to begin with --- .../python-modules/Theano/theano-with-cuda/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/Theano/theano-with-cuda/default.nix b/pkgs/development/python-modules/Theano/theano-with-cuda/default.nix index c9ea79bef9a..f65733557cb 100644 --- a/pkgs/development/python-modules/Theano/theano-with-cuda/default.nix +++ b/pkgs/development/python-modules/Theano/theano-with-cuda/default.nix @@ -56,7 +56,8 @@ buildPythonPackage rec { pycuda cudatoolkit libgpuarray - ] ++ (stdenv.lib.optional (cudnn != null) [ cudnn ]); + cudnn + ]; passthru.cudaSupport = true; } From 46793d98876080f0e3738b07490aece6468b0cd0 Mon Sep 17 00:00:00 2001 From: Tyson Whitehead Date: Tue, 30 May 2017 16:08:48 -0400 Subject: [PATCH 027/117] TheanoWithCuda: depend on future for older pythons #26103 --- .../python-modules/Theano/theano-with-cuda/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/Theano/theano-with-cuda/default.nix b/pkgs/development/python-modules/Theano/theano-with-cuda/default.nix index f65733557cb..f8b7a713d08 100644 --- a/pkgs/development/python-modules/Theano/theano-with-cuda/default.nix +++ b/pkgs/development/python-modules/Theano/theano-with-cuda/default.nix @@ -1,5 +1,7 @@ { buildPythonPackage , fetchFromGitHub +, pythonOlder +, future , numpy , six , scipy @@ -57,7 +59,7 @@ buildPythonPackage rec { cudatoolkit libgpuarray cudnn - ]; + ] ++ (stdenv.lib.optional (pythonOlder "3.0") future); passthru.cudaSupport = true; } From ceedd0b04abe1c1d790f800fbb7e06551099a7a1 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Fri, 2 Jun 2017 00:36:59 +0200 Subject: [PATCH 028/117] pirate-get: 0.2.9 -> 0.2.10 --- pkgs/tools/networking/pirate-get/default.nix | 26 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ pkgs/top-level/python-packages.nix | 23 ----------------- 3 files changed, 28 insertions(+), 23 deletions(-) create mode 100644 pkgs/tools/networking/pirate-get/default.nix diff --git a/pkgs/tools/networking/pirate-get/default.nix b/pkgs/tools/networking/pirate-get/default.nix new file mode 100644 index 00000000000..bd7e87e2c10 --- /dev/null +++ b/pkgs/tools/networking/pirate-get/default.nix @@ -0,0 +1,26 @@ +{ stdenv, python3Packages }: + +with python3Packages; + +buildPythonApplication rec { + name = "${pname}-${version}"; + pname = "pirate-get"; + version = "0.2.10"; + + doCheck = false; + + src = fetchPypi { + inherit pname version; + sha256 = "04gsilbyq2plldzi495dcf19h5xfldfyn6zdczj2fdki1m29jyr0"; + }; + + propagatedBuildInputs = [ colorama veryprettytable beautifulsoup4 ]; + + meta = with stdenv.lib; { + description = "A command line interface for The Pirate Bay"; + homepage = https://github.com/vikstrous/pirate-get; + license = licenses.gpl1; + maintainers = with maintainers; [ rnhmjoj ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index aecb500995f..5ac94943f04 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3630,6 +3630,8 @@ with pkgs; pingtcp = callPackage ../tools/networking/pingtcp { }; + pirate-get = callPackage ../tools/networking/pirate-get { }; + pius = callPackage ../tools/security/pius { }; pixiewps = callPackage ../tools/networking/pixiewps {}; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c146ea70b2c..589b1a85592 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8508,29 +8508,6 @@ in { }; }; - pirate-get = buildPythonPackage rec { - name = "pirate-get-${version}"; - version = "0.2.9"; - - disabled = !isPy3k; - doCheck = false; - - src = pkgs.fetchurl { - url = "mirror://pypi/p/pirate-get/${name}.tar.gz"; - sha256 = "1djmfghnwsn3z525h6d98r0lllayvzsg71z0gskk25zr24kjs24a"; - }; - - propagatedBuildInputs = with self; [ colorama veryprettytable beautifulsoup4 ]; - - meta = { - description = "A command line interface for The Pirate Bay"; - homepage = https://github.com/vikstrous/pirate-get; - license = licenses.gpl1; - maintainers = with maintainers; [ rnhmjoj ]; - platforms = platforms.unix; - }; - }; - plotly = callPackage ../development/python-modules/plotly { }; podcastparser = callPackage ../development/python-modules/podcastparser { }; From 50f53da9eff3e7a1686ff439b341ada5bd63ddcd Mon Sep 17 00:00:00 2001 From: Mateusz Kowalczyk Date: Fri, 2 Jun 2017 07:50:41 +0100 Subject: [PATCH 029/117] datadog: Properly use configured package. --- nixos/modules/services/monitoring/dd-agent/dd-agent.nix | 8 ++++---- pkgs/tools/networking/dd-agent/default.nix | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/nixos/modules/services/monitoring/dd-agent/dd-agent.nix b/nixos/modules/services/monitoring/dd-agent/dd-agent.nix index e55faed8e07..04a21871519 100644 --- a/nixos/modules/services/monitoring/dd-agent/dd-agent.nix +++ b/nixos/modules/services/monitoring/dd-agent/dd-agent.nix @@ -23,7 +23,7 @@ let etcfiles = map (i: { source = if builtins.hasAttr "config" i then pkgs.writeText "${i.name}.yaml" i.config - else "${pkgs.dd-agent}/agent/conf.d-system/${i.name}.yaml"; + else "${cfg.agent}/agent/conf.d-system/${i.name}.yaml"; target = "dd-agent/conf.d/${i.name}.yaml"; } ) cfg.integrations ++ @@ -119,13 +119,13 @@ in { path = [ cfg.agent pkgs.python pkgs.sysstat pkgs.procps ]; wantedBy = [ "multi-user.target" ]; serviceConfig = { - ExecStart = "${pkgs.dd-agent}/bin/dd-agent foreground"; + ExecStart = "${cfg.agent}/bin/dd-agent foreground"; User = "datadog"; Group = "datadog"; Restart = "always"; RestartSec = 2; }; - restartTriggers = [ pkgs.dd-agent ddConf ] ++ etcSources; + restartTriggers = [ cfg.agent ddConf ] ++ etcSources; }; systemd.services.dd-jmxfetch = lib.mkIf (builtins.any (i: i.name == "jmx") cfg.integrations) { @@ -133,7 +133,7 @@ in { path = [ cfg.agent pkgs.python pkgs.sysstat pkgs.procps pkgs.jdk ]; wantedBy = [ "multi-user.target" ]; serviceConfig = { - ExecStart = "${pkgs.dd-agent}/bin/dd-jmxfetch"; + ExecStart = "${cfg.agent}/bin/dd-jmxfetch"; User = "datadog"; Group = "datadog"; Restart = "always"; diff --git a/pkgs/tools/networking/dd-agent/default.nix b/pkgs/tools/networking/dd-agent/default.nix index 2556287570f..338804aa26b 100644 --- a/pkgs/tools/networking/dd-agent/default.nix +++ b/pkgs/tools/networking/dd-agent/default.nix @@ -5,7 +5,7 @@ # wrapper with their PYTHONPATH. This means overrideAttrs is not # strong enough (it overrides too late), we need to call it # beforehand. -, extraBuildInputs ? [ pythonPackages.psutil ] }: +, extraBuildInputs ? [ ] }: let inherit (pythonPackages) python; docker_1_10 = pythonPackages.buildPythonPackage rec { From 28cbb4ae6a10a44b40883479608b178d0be9c16c Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Thu, 1 Jun 2017 22:22:24 +0200 Subject: [PATCH 030/117] pythonPackages.colorama: move to development/python-modules --- .../python-modules/colorama/default.nix | 22 +++++++ pkgs/top-level/python-packages.nix | 60 +++++++------------ 2 files changed, 44 insertions(+), 38 deletions(-) create mode 100644 pkgs/development/python-modules/colorama/default.nix diff --git a/pkgs/development/python-modules/colorama/default.nix b/pkgs/development/python-modules/colorama/default.nix new file mode 100644 index 00000000000..99a59ae8fd4 --- /dev/null +++ b/pkgs/development/python-modules/colorama/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchPypi, buildPythonPackage }: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "colorama"; + version = "0.3.9"; + + src = fetchPypi { + inherit pname version; + sha256 = "1wd1szk0z3073ghx26ynw43gnc140ibln1safgsis6s6z3s25ss8"; + }; + + # No tests in archive + doCheck = false; + + meta = with stdenv.lib; { + homepage = https://github.com/tartley/colorama; + license = licenses.bsd3; + description = "Cross-platform colored terminal text"; + }; +} + diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c146ea70b2c..c8b147a399e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1519,13 +1519,26 @@ in { }; }; - awscli = buildPythonPackage rec { - name = "awscli-${version}"; - version = "1.11.75"; - namePrefix = ""; - src = pkgs.fetchurl { - url = "mirror://pypi/a/awscli/${name}.tar.gz"; - sha256 = "0bkjyrgb78f29vvr8j2id0386d30w340wrl7krwiha725c9y3pz1"; + awscli = + let + colorama_3_7 = self.colorama.overrideAttrs (old: rec { + name = "${pname}-${version}"; + pname = "colorama"; + version = "0.3.7"; + src = fetchPypi { + inherit pname version; + sha256 = "0avqkn6362v7k2kg3afb35g4sfdvixjgy890clip4q174p9whhz0"; + }; + }); + in buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "awscli"; + version = "1.11.95"; + namePrefix = ""; + + src = fetchPypi { + inherit pname version; + sha256 = "1f99cg5x5kw1p1awny64adp07rvva57srdfrbi81yl2kpw33ybjc"; }; # No tests included @@ -1536,7 +1549,7 @@ in { bcdoc s3transfer six - colorama_3_3 + colorama_3_7 docutils rsa pyyaml @@ -3846,36 +3859,7 @@ in { }; }; - - colorama = buildPythonPackage rec { - name = "colorama-${version}"; - version = "0.3.7"; - - src = pkgs.fetchurl { - url = "mirror://pypi/c/colorama/${name}.tar.gz"; - sha256 = "e043c8d32527607223652021ff648fbb394d5e19cba9f1a698670b338c9d782b"; - }; - - # No tests in archive - doCheck = false; - - meta = { - homepage = https://github.com/tartley/colorama; - license = "bsd"; - description = "Cross-platform colored terminal text"; - }; - }; - - # Needed for awscli - colorama_3_3 = self.colorama.override rec { - name = "colorama-${version}"; - version = "0.3.3"; - src = pkgs.fetchurl { - url = "mirror://pypi/c/colorama/${name}.tar.gz"; - sha256 = "eb21f2ba718fbf357afdfdf6f641ab393901c7ca8d9f37edd0bee4806ffa269c"; - }; - }; - + colorama = callPackage ../development/python-modules/colorama { }; CommonMark = buildPythonPackage rec { name = "CommonMark-${version}"; From ffedf3fa1cafcd69f997b782f1bb302a9c640b5b Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Thu, 1 Jun 2017 22:40:54 +0200 Subject: [PATCH 031/117] pythonPackages.botocore: 1.5.38 -> 1.5.58 --- pkgs/top-level/python-packages.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c8b147a399e..6eff8c13d7d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3070,11 +3070,13 @@ in { }; botocore = buildPythonPackage rec { - version = "1.5.38"; # This version is required by awscli - name = "botocore-${version}"; - src = pkgs.fetchurl { - url = "mirror://pypi/b/botocore/${name}.tar.gz"; - sha256 = "04cvsi8g8p3r5vr3vr2nb5ldyrsm0y4c2phimabbpk33wv718qyx"; + name = "${pname}-${version}"; + pname = "botocore"; + version = "1.5.58"; + + src = fetchPypi { + inherit pname version; + sha256 = "1kd9hngdqvpjm01amizsmsnc08h2a0dxiasdk0f4kg1pibpqdni5"; }; propagatedBuildInputs = From 805ee69aa3f04e1d58a2f651fcebc63db2014d43 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Thu, 1 Jun 2017 23:32:05 +0200 Subject: [PATCH 032/117] tmuxp: 1.2.7 -> 1.3.1 --- pkgs/tools/misc/tmuxp/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/tmuxp/default.nix b/pkgs/tools/misc/tmuxp/default.nix index c254490555c..03950d601d0 100644 --- a/pkgs/tools/misc/tmuxp/default.nix +++ b/pkgs/tools/misc/tmuxp/default.nix @@ -2,17 +2,17 @@ pythonPackages.buildPythonApplication rec { name = "tmuxp-${version}"; - version = "1.2.7"; + version = "1.3.1"; namePrefix = ""; src = fetchurl { url = "mirror://pypi/t/tmuxp/${name}.tar.gz"; - sha256 = "19s17frgyjvyvmr16fs0gl5mnbaxbmdffmkckadwhd5mg0pz2i4s"; + sha256 = "189mxnb2pxj3wjijn56j8y5x1r23fil00fn2q7d6bd13vgr0f85s"; }; patchPhase = '' - sed -i 's/==.*$//' requirements/test.txt + sed -i 's/==.*$//' requirements/base.txt requirements/test.txt ''; buildInputs = with pythonPackages; [ From d6051936afd4c54b7870333140772c6ab8c84403 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 2 Jun 2017 07:13:06 -0400 Subject: [PATCH 033/117] ammonite: 0.9.5 -> 0.9.6 --- pkgs/development/tools/ammonite/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/ammonite/default.nix b/pkgs/development/tools/ammonite/default.nix index 4f253c06186..62a373f2c07 100644 --- a/pkgs/development/tools/ammonite/default.nix +++ b/pkgs/development/tools/ammonite/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "ammonite-${version}"; - version = "0.9.5"; + version = "0.9.6"; scalaVersion = "2.12"; src = fetchurl { url = "https://github.com/lihaoyi/Ammonite/releases/download/${version}/${scalaVersion}-${version}"; - sha256 = "1ni829qpdm5wflc1n827b9ywpv836r2068rmj9yd2nyh8b6q2him"; + sha256 = "113h8i2i6mlm4f4r2wfj9bggg46lpvamdw3c112qji2y74iriljq"; }; propagatedBuildInputs = [ jre ] ; From a087081ebb1f5b3943b2ebd94e14e6d1ef221428 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Fri, 2 Jun 2017 19:05:22 +0800 Subject: [PATCH 034/117] network-manager: add support for internal DHCP --- .../services/networking/networkmanager.nix | 21 +++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix index 876dbe1524e..f8b7f26f5f2 100644 --- a/nixos/modules/services/networking/networkmanager.nix +++ b/nixos/modules/services/networking/networkmanager.nix @@ -12,6 +12,7 @@ let configFile = writeText "NetworkManager.conf" '' [main] plugins=keyfile + dhcp=${cfg.dhcp} dns=${if cfg.useDnsmasq then "dnsmasq" else "default"} [keyfile] @@ -21,7 +22,7 @@ let ''unmanaged-devices=${lib.concatStringsSep ";" cfg.unmanaged}''} [logging] - level=WARN + level=${cfg.logLevel} [connection] ipv6.ip6-privacy=2 @@ -138,6 +139,22 @@ in { apply = list: (attrValues cfg.basePackages) ++ list; }; + dhcp = mkOption { + type = types.enum [ "dhclient" "dhcpcd" "internal" ]; + default = "dhclient"; + description = '' + Which program (or internal library) should be used for DHCP. + ''; + }; + + logLevel = mkOption { + type = types.enum [ "OFF" "ERR" "WARN" "INFO" "DEBUG" "TRACE" ]; + default = "WARN"; + description = '' + Set the default logging verbosity level. + ''; + }; + appendNameservers = mkOption { type = types.listOf types.str; default = []; @@ -181,7 +198,7 @@ in { }; type = mkOption { - type = types.enum (attrNames dispatcherTypesSubdirMap); + type = types.enum (attrNames dispatcherTypesSubdirMap); default = "basic"; description = '' Dispatcher hook type. Only basic hooks are currently available. From e367d69fccef4a732715baab059e748872ceae74 Mon Sep 17 00:00:00 2001 From: Bas van Dijk Date: Fri, 2 Jun 2017 13:53:45 +0200 Subject: [PATCH 035/117] strongswan: 5.5.2 -> 5.5.3 --- pkgs/tools/networking/strongswan/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/strongswan/default.nix b/pkgs/tools/networking/strongswan/default.nix index 5a9cf8f1f4b..2225df308ac 100644 --- a/pkgs/tools/networking/strongswan/default.nix +++ b/pkgs/tools/networking/strongswan/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "strongswan-${version}"; - version = "5.5.2"; + version = "5.5.3"; src = fetchurl { url = "http://download.strongswan.org/${name}.tar.bz2"; - sha256 = "0slzrr5amn1rs9lrjca0fv5n1ya5jwlspfiqg9xzq1bghg56z5ys"; + sha256 = "1m7qq0l5pwj1wy0f7h2b7msb1d98rx78z6xg27g0hiqpk6qm9sn5"; }; dontPatchELF = true; From 27aac7afcfe1bb5ac4cb2f53a0c25e3074b7aec7 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Fri, 2 Jun 2017 20:53:26 +0800 Subject: [PATCH 036/117] qtox: 1.10.1 -> 1.10.2 --- .../networking/instant-messengers/qtox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/qtox/default.nix b/pkgs/applications/networking/instant-messengers/qtox/default.nix index bb5e26f3310..d1773456df2 100644 --- a/pkgs/applications/networking/instant-messengers/qtox/default.nix +++ b/pkgs/applications/networking/instant-messengers/qtox/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { name = "qtox-${version}"; - version = "1.10.1"; + version = "1.10.2"; src = fetchFromGitHub { owner = "tux3"; repo = "qTox"; rev = "v${version}"; - sha256 = "1c5y7fwhsq1f6z8208xl1jd6bl1r6k8g0fjqxf0z10373c9395jq"; + sha256 = "0c2633rc9l73q9qs9hybn11hmlqbwsvih3sf6jk1jp4151k5wp1y"; }; buildInputs = [ From daf674491eab3e68a653308ba36f5e5005fd58a7 Mon Sep 17 00:00:00 2001 From: georgewhewell Date: Fri, 2 Jun 2017 14:19:04 +0100 Subject: [PATCH 037/117] broadcom-sta: add patch for kernel 4.11+ --- .../linux/broadcom-sta/default.nix | 2 + .../linux/broadcom-sta/linux-4.11.patch | 52 +++++++++++++++++++ 2 files changed, 54 insertions(+) create mode 100644 pkgs/os-specific/linux/broadcom-sta/linux-4.11.patch diff --git a/pkgs/os-specific/linux/broadcom-sta/default.nix b/pkgs/os-specific/linux/broadcom-sta/default.nix index 8b2bac38438..2723e662b79 100644 --- a/pkgs/os-specific/linux/broadcom-sta/default.nix +++ b/pkgs/os-specific/linux/broadcom-sta/default.nix @@ -27,6 +27,8 @@ stdenv.mkDerivation { ./linux-4.7.patch # source: https://git.archlinux.org/svntogit/community.git/tree/trunk/004-linux48.patch?h=packages/broadcom-wl-dkms ./linux-4.8.patch + # source: https://aur.archlinux.org/cgit/aur.git/tree/linux411.patch?h=broadcom-wl + ./linux-4.11.patch ./null-pointer-fix.patch ./gcc.patch ]; diff --git a/pkgs/os-specific/linux/broadcom-sta/linux-4.11.patch b/pkgs/os-specific/linux/broadcom-sta/linux-4.11.patch new file mode 100644 index 00000000000..a779f8c84cf --- /dev/null +++ b/pkgs/os-specific/linux/broadcom-sta/linux-4.11.patch @@ -0,0 +1,52 @@ +diff --git a/src/wl/sys/wl_cfg80211_hybrid.c b/src/wl/sys/wl_cfg80211_hybrid.c +index a9671e2..da36405 100644 +--- a/src/wl/sys/wl_cfg80211_hybrid.c ++++ b/src/wl/sys/wl_cfg80211_hybrid.c +@@ -30,6 +30,9 @@ + #include + #include + #include ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0) ++#include ++#endif + #include + #include + #include +diff --git a/src/wl/sys/wl_linux.c b/src/wl/sys/wl_linux.c +index 489c9f5..f8278ad 100644 +--- a/src/wl/sys/wl_linux.c ++++ b/src/wl/sys/wl_linux.c +@@ -117,6 +117,9 @@ int wl_found = 0; + + typedef struct priv_link { + wl_if_t *wlif; ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0) ++ unsigned long last_rx; ++#endif + } priv_link_t; + + #define WL_DEV_IF(dev) ((wl_if_t*)((priv_link_t*)DEV_PRIV(dev))->wlif) +@@ -2450,6 +2453,9 @@ wl_monitor(wl_info_t *wl, wl_rxsts_t *rxsts, void *p) + { + struct sk_buff *oskb = (struct sk_buff *)p; + struct sk_buff *skb; ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0) ++ priv_link_t *priv_link; ++#endif + uchar *pdata; + uint len; + +@@ -2916,7 +2922,13 @@ wl_monitor(wl_info_t *wl, wl_rxsts_t *rxsts, void *p) + if (skb == NULL) return; + + skb->dev = wl->monitor_dev; ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0) ++ priv_link = MALLOC(wl->osh, sizeof(priv_link_t)); ++ priv_link = netdev_priv(skb->dev); ++ priv_link->last_rx = jiffies; ++#else + skb->dev->last_rx = jiffies; ++#endif + #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 22) + skb_reset_mac_header(skb); + #else From 7eadf66244c26c70cf52bc1f19fb81d473093956 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Fri, 2 Jun 2017 21:41:03 +0800 Subject: [PATCH 038/117] neomutt: 20170428 -> 20170602 --- .../mailreaders/neomutt/default.nix | 24 +++++++++++++------ 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/neomutt/default.nix b/pkgs/applications/networking/mailreaders/neomutt/default.nix index ad2f6e7b3ca..d9ec66a53e7 100644 --- a/pkgs/applications/networking/mailreaders/neomutt/default.nix +++ b/pkgs/applications/networking/mailreaders/neomutt/default.nix @@ -1,21 +1,29 @@ { stdenv, fetchFromGitHub, which, autoreconfHook, ncurses, perl -, cyrus_sasl, gdbm, gpgme, kerberos, libidn, notmuch, openssl, lmdb }: +, cyrus_sasl, gdbm, gpgme, kerberos, libidn, notmuch, openssl, lmdb, libxslt, docbook_xsl }: stdenv.mkDerivation rec { - version = "20170428"; + version = "20170602"; name = "neomutt-${version}"; src = fetchFromGitHub { owner = "neomutt"; repo = "neomutt"; rev = "neomutt-${version}"; - sha256 = "1p6214agfv9plskkzalh03r5naiiyg1habrnknnjgck3nypb78ik"; + sha256 = "0rpvxmv10ypl7la4nmp0s02ixmm9g5pn9g9ms8ygzsix9pa86w45"; }; - nativeBuildInputs = [ which autoreconfHook ]; - buildInputs = - [ cyrus_sasl gdbm gpgme kerberos libidn ncurses - notmuch openssl perl lmdb ]; + nativeBuildInputs = [ autoreconfHook docbook_xsl libxslt.bin which ]; + buildInputs = [ + cyrus_sasl gdbm gpgme kerberos libidn ncurses + notmuch openssl perl lmdb + ]; + + postPatch = '' + for f in doc/*.xsl ; do + substituteInPlace $f \ + --replace http://docbook.sourceforge.net/release/xsl/current ${docbook_xsl}/share/xml/docbook-xsl + done + ''; configureFlags = [ "--enable-debug" @@ -46,6 +54,8 @@ stdenv.mkDerivation rec { configureScript = "./prepare"; + enableParallelBuilding = true; + meta = with stdenv.lib; { description = "A small but very powerful text-based mail client"; homepage = http://www.neomutt.org; From ed93e8e16b57578e37aaefca0da941de6e3026fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Fri, 2 Jun 2017 16:21:35 +0200 Subject: [PATCH 039/117] libressl: work around some problem with man pages https://github.com/NixOS/nixpkgs/commit/20ffc3cd73#commitcomment-22368612 --- pkgs/development/libraries/libressl/2.5.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/libressl/2.5.nix b/pkgs/development/libraries/libressl/2.5.nix index 2284db5ad7d..6ab07248655 100644 --- a/pkgs/development/libraries/libressl/2.5.nix +++ b/pkgs/development/libraries/libressl/2.5.nix @@ -13,6 +13,8 @@ stdenv.mkDerivation rec { outputs = [ "bin" "dev" "out" "man" ]; + dontGzipMan = if stdenv.isDarwin then true else null; # not sure what's wrong + meta = with stdenv.lib; { description = "Free TLS/SSL implementation"; homepage = "http://www.libressl.org"; From 0fbe724172a1a54704f22d06b209f2a4122032a9 Mon Sep 17 00:00:00 2001 From: Drakonis Date: Fri, 2 Jun 2017 12:02:34 -0300 Subject: [PATCH 040/117] gzdoom: 3.0.1 -> 3.1.0 --- pkgs/games/gzdoom/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/gzdoom/default.nix b/pkgs/games/gzdoom/default.nix index 6e1a98bf258..dc51a6f0cc0 100644 --- a/pkgs/games/gzdoom/default.nix +++ b/pkgs/games/gzdoom/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "gzdoom-${version}"; - version = "3.0.1"; + version = "3.1.0"; src = fetchFromGitHub { owner = "coelckers"; repo = "gzdoom"; rev = "g${version}"; - sha256 = "0s0hl7pa2gr3cm884q7np5naybhv4hqhbfd3s45a8hdf72n6c9cm"; + sha256 = "02287xvlk4a07ssm9y9h5vfsvdssshz13n5bbz13pfcani5d9flv"; }; nativeBuildInputs = [ cmake makeWrapper ]; From 779767e650ea60dea1b7d27cc4463b2e6af089d6 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 2 Jun 2017 17:04:03 +0200 Subject: [PATCH 041/117] python.pkgs.nbformat: move expression --- .../python-modules/nbformat/default.nix | 36 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 23 +----------- 2 files changed, 37 insertions(+), 22 deletions(-) create mode 100644 pkgs/development/python-modules/nbformat/default.nix diff --git a/pkgs/development/python-modules/nbformat/default.nix b/pkgs/development/python-modules/nbformat/default.nix new file mode 100644 index 00000000000..143c57321b6 --- /dev/null +++ b/pkgs/development/python-modules/nbformat/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytest +, glibcLocales +, ipython_genutils +, traitlets +, testpath +, jsonschema +, jupyter_core +}: + +buildPythonPackage rec { + pname = "nbformat"; + version = "4.3.0"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "5febcce872672f1c97569e89323992bdcb8573fdad703f835e6521253191478b"; + }; + LC_ALL="en_US.UTF-8"; + + checkInputs = [ pytest glibcLocales ]; + propagatedBuildInputs = [ ipython_genutils traitlets testpath jsonschema jupyter_core ]; + + # Failing tests and permission issues + doCheck = false; + + meta = { + description = "The Jupyter Notebook format"; + homepage = "http://jupyter.org/"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ fridh ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 98c7fb77cb3..221d1f40a69 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -14834,28 +14834,7 @@ in { }; }; - nbformat = buildPythonPackage rec { - version = "4.3.0"; - name = "nbformat-${version}"; - - src = pkgs.fetchurl { - url = "mirror://pypi/n/nbformat/${name}.tar.gz"; - sha256 = "5febcce872672f1c97569e89323992bdcb8573fdad703f835e6521253191478b"; - }; - LC_ALL="en_US.UTF-8"; - buildInputs = with self; [ pytest pkgs.glibcLocales ]; - propagatedBuildInputs = with self; [ipython_genutils traitlets testpath jsonschema jupyter_core]; - - # Failing tests and permission issues - doCheck = false; - - meta = { - description = "The Jupyter Notebook format"; - homepage = "http://jupyter.org/"; - license = licenses.bsd3; - maintainers = with maintainers; [ fridh ]; - }; - }; + nbformat = callPackage ../development/python-modules/nbformat { }; nbxmpp = buildPythonPackage rec { name = "nbxmpp-${version}"; From 2957786355a12a9a0fba898fbdcf4d2e652a9138 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 2 Jun 2017 17:05:29 +0200 Subject: [PATCH 042/117] python.pkgs.nbconvert: 5.1.1 -> 5.2.1 --- .../python-modules/nbconvert/default.nix | 52 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 28 +--------- 2 files changed, 53 insertions(+), 27 deletions(-) create mode 100644 pkgs/development/python-modules/nbconvert/default.nix diff --git a/pkgs/development/python-modules/nbconvert/default.nix b/pkgs/development/python-modules/nbconvert/default.nix new file mode 100644 index 00000000000..881895ba6ba --- /dev/null +++ b/pkgs/development/python-modules/nbconvert/default.nix @@ -0,0 +1,52 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytest +, nose +, entrypoints +, bleach +, mistune +, jinja2 +, pygments +, traitlets +, testpath +, jupyter_core +, nbformat +, nbconvert +, ipykernel +, pandocfilters +, tornado +, jupyter_client +}: + +buildPythonPackage rec { + pname = "nbconvert"; + version = "5.2.1"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "9ed68ec7fe90a8672b43795b29ea91cc75ea355c83debc83ebd12171521ec274"; + }; + + checkInputs = [ nose pytest ]; + + propagatedBuildInputs = [ + entrypoints bleach mistune jinja2 pygments traitlets testpath + jupyter_core nbformat ipykernel pandocfilters tornado jupyter_client + ]; + + checkPhase = '' + nosetests -v + ''; + + # PermissionError. Likely due to being in a chroot + doCheck = false; + + meta = { + description = "Converting Jupyter Notebooks"; + homepage = http://jupyter.org/; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ fridh ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 221d1f40a69..8e6ba055206 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -14806,33 +14806,7 @@ in { }; }; - nbconvert = buildPythonPackage rec { - version = "5.1.1"; - name = "nbconvert-${version}"; - - src = pkgs.fetchurl { - url = "mirror://pypi/n/nbconvert/${name}.tar.gz"; - sha256 = "847731bc39829d0eb1e15a450ac98c71730e3598e53683d4d76a3f3b3fc5017d"; - }; - - buildInputs = with self; [nose ipykernel ]; - - propagatedBuildInputs = with self; [ entrypoints bleach mistune jinja2 pygments traitlets testpath jupyter_core nbformat ipykernel pandocfilters tornado jupyter_client]; - - checkPhase = '' - nosetests -v - ''; - - # PermissionError. Likely due to being in a chroot - doCheck = false; - - meta = { - description = "Converting Jupyter Notebooks"; - homepage = http://jupyter.org/; - license = licenses.bsd3; - maintainers = with maintainers; [ fridh ]; - }; - }; + nbconvert = callPackage ../development/python-modules/nbconvert { }; nbformat = callPackage ../development/python-modules/nbformat { }; From c7867b8b34b7647edf04c654dfcf99514e48e3e5 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 2 Jun 2017 17:05:50 +0200 Subject: [PATCH 043/117] python.pkgs.dask: 0.14.1 -> 0.14.3 --- .../python-modules/dask/default.nix | 39 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 28 +------------ 2 files changed, 40 insertions(+), 27 deletions(-) create mode 100644 pkgs/development/python-modules/dask/default.nix diff --git a/pkgs/development/python-modules/dask/default.nix b/pkgs/development/python-modules/dask/default.nix new file mode 100644 index 00000000000..6d5388a443c --- /dev/null +++ b/pkgs/development/python-modules/dask/default.nix @@ -0,0 +1,39 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytest +, cloudpickle +, numpy +, toolz +, dill +, pandas +, partd +}: + +buildPythonPackage rec { + pname = "dask"; + version = "0.14.3"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "9bf007f9cedc08f73089f0621ff65ec0882fc0a834acef56830dfd2872908211"; + }; + + checkInputs = [ pytest ]; + propagatedBuildInputs = [ cloudpickle numpy toolz dill pandas partd ]; + + checkPhase = '' + py.test dask + ''; + + # URLError + doCheck = false; + + meta = { + description = "Minimal task scheduling abstraction"; + homepage = "http://github.com/ContinuumIO/dask/"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ fridh ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8e6ba055206..6554d5b5306 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5354,33 +5354,7 @@ in { }; }); - dask = buildPythonPackage rec { - pname = "dask"; - name = "${pname}-${version}"; - version = "0.14.1"; - - src = fetchPypi { - inherit pname version; - sha256 = "46c8ef9aa41a5755f2194b535bff7fdef1343d3993ab294b198caf95155ec94e"; - }; - - buildInputs = with self; [ pytest ]; - propagatedBuildInputs = with self; [ cloudpickle numpy toolz dill pandas partd ]; - - checkPhase = '' - py.test dask - ''; - - # URLError - doCheck = false; - - meta = { - description = "Minimal task scheduling abstraction"; - homepage = "http://github.com/ContinuumIO/dask/"; - license = licenses.bsd3; - maintainers = with maintainers; [ fridh ]; - }; - }; + dask = callPackage ../development/python-modules/dask { }; datrie = buildPythonPackage rec { name = "datrie"; From 9cc17871c51ab13a4116c858e92a11b6b2e74cde Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 2 Jun 2017 17:10:02 +0200 Subject: [PATCH 044/117] python.pkgs.ipython: 6.0.0 -> 6.1.0 --- pkgs/development/python-modules/ipython/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ipython/default.nix b/pkgs/development/python-modules/ipython/default.nix index de7d0a8d81b..af5bf5c4faa 100644 --- a/pkgs/development/python-modules/ipython/default.nix +++ b/pkgs/development/python-modules/ipython/default.nix @@ -21,12 +21,12 @@ buildPythonPackage rec { pname = "ipython"; - version = "6.0.0"; + version = "6.1.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "f429b82b8d9807068da734b15965768bd21b15d0b706340b6d1b4d6f6f5b98a4"; + sha256 = "5c53e8ee4d4bec27879982b9f3b4aa2d6e3cfd7b26782d250fa117f85bb29814"; }; prePatch = lib.optionalString stdenv.isDarwin '' From 48c9e09190e1f43dbf811df8a56b9b6738a65603 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Fri, 2 Jun 2017 16:10:23 +0000 Subject: [PATCH 045/117] libnetfilter_log: init at 1.0.1 --- .../libraries/libnetfilter_log/default.nix | 29 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/development/libraries/libnetfilter_log/default.nix diff --git a/pkgs/development/libraries/libnetfilter_log/default.nix b/pkgs/development/libraries/libnetfilter_log/default.nix new file mode 100644 index 00000000000..e3c8447549d --- /dev/null +++ b/pkgs/development/libraries/libnetfilter_log/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl, pkgconfig, libnfnetlink, libmnl }: + +stdenv.mkDerivation rec { + name = "libnetfilter_log-${version}"; + version = "1.0.1"; + + src = fetchurl { + url = "http://netfilter.org/projects/libnetfilter_log/files/${name}.tar.bz2"; + sha256 = "089vjcfxl5qjqpswrbgklf4wflh44irmw6sk2k0kmfixfmszxq3l"; + }; + + buildInputs = [ libmnl ]; + propagatedBuildInputs = [ libnfnetlink ]; + nativeBuildInputs = [ pkgconfig ]; + + meta = with stdenv.lib; { + description = "Userspace library providing interface to packets that have been logged by the kernel packet filter"; + longDescription = '' + libnetfilter_log is a userspace library providing interface to packets + that have been logged by the kernel packet filter. It is is part of a + system that deprecates the old syslog/dmesg based packet logging. This + library has been previously known as libnfnetlink_log. + ''; + homepage = http://netfilter.org/projects/libnetfilter_log/; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ orivej nckx ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a40e8e38d99..29f2b8efc14 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8912,6 +8912,8 @@ with pkgs; libnetfilter_cttimeout = callPackage ../development/libraries/libnetfilter_cttimeout { }; + libnetfilter_log = callPackage ../development/libraries/libnetfilter_log { }; + libnetfilter_queue = callPackage ../development/libraries/libnetfilter_queue { }; libnfnetlink = callPackage ../development/libraries/libnfnetlink { }; From fc9937657d752feeafb0d268c6d4146ab563e2f2 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Fri, 2 Jun 2017 16:23:29 +0000 Subject: [PATCH 046/117] libmnl: fix license --- pkgs/development/libraries/libmnl/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libmnl/default.nix b/pkgs/development/libraries/libmnl/default.nix index 02e86cc688b..33ccccea2e9 100644 --- a/pkgs/development/libraries/libmnl/default.nix +++ b/pkgs/development/libraries/libmnl/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { re-inventing the wheel. ''; homepage = http://netfilter.org/projects/libmnl/index.html; - license = stdenv.lib.licenses.gpl2Plus; + license = stdenv.lib.licenses.lgpl21Plus; platforms = stdenv.lib.platforms.linux; }; From e37f970d00ca93134afa91a7a9088636aec8008c Mon Sep 17 00:00:00 2001 From: Pascal Bach Date: Wed, 31 May 2017 23:35:26 +0200 Subject: [PATCH 047/117] uwsgi: fix php plugin build --- pkgs/servers/uwsgi/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/uwsgi/default.nix b/pkgs/servers/uwsgi/default.nix index 36d6fc3a62d..f871e6adf2b 100644 --- a/pkgs/servers/uwsgi/default.nix +++ b/pkgs/servers/uwsgi/default.nix @@ -34,7 +34,7 @@ let pythonPlugin = pkg : lib.nameValuePair "python${if pkg ? isPy2 then "2" else # usage: https://uwsgi-docs.readthedocs.io/en/latest/PHP.html#running-php-apps-with-nginx path = "plugins/php"; preBuild = "touch unix.h"; - inputs = [ php-embed php-embed.nativeBuildInputs ]; + inputs = [ php-embed ] ++ php-embed.buildInputs; }) ]; From ad7bee4eb406b88c77cb53edbe9d4de44e7e692d Mon Sep 17 00:00:00 2001 From: Itai Zukerman Date: Sun, 28 May 2017 11:04:25 -0700 Subject: [PATCH 048/117] steam: Added extraPkgs option to chroot env. --- pkgs/games/steam/chrootenv.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/games/steam/chrootenv.nix b/pkgs/games/steam/chrootenv.nix index 1fbf5a9dd1a..ace8e9888a7 100644 --- a/pkgs/games/steam/chrootenv.nix +++ b/pkgs/games/steam/chrootenv.nix @@ -2,6 +2,7 @@ , steam-runtime, steam-runtime-i686 ? null , withJava ? false , withPrimus ? false +, extraPkgs ? pkgs: [ ] # extra packages to add to targetPkgs , nativeOnly ? false , runtimeOnly ? false , newStdcpp ? false @@ -37,7 +38,8 @@ let # Zoneinfo etc-zoneinfo ] ++ lib.optional withJava jdk - ++ lib.optional withPrimus primus2; + ++ lib.optional withPrimus primus2 + ++ extraPkgs pkgs; in buildFHSUserEnv rec { name = "steam"; From d5fe7d15343982baf23da77dd096f9945f5bc993 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Katona=20L=C3=A1szl=C3=B3?= Date: Fri, 2 Jun 2017 16:20:51 +0200 Subject: [PATCH 049/117] pythonPackages.Pmw: init at 2.0.1 --- .../python-modules/Pmw/default.nix | 24 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/development/python-modules/Pmw/default.nix diff --git a/pkgs/development/python-modules/Pmw/default.nix b/pkgs/development/python-modules/Pmw/default.nix new file mode 100644 index 00000000000..893caa88d67 --- /dev/null +++ b/pkgs/development/python-modules/Pmw/default.nix @@ -0,0 +1,24 @@ +{ lib , buildPythonPackage , fetchPypi, tkinter }: + +buildPythonPackage rec { + pname = "Pmw"; + version = "2.0.1"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "080iml3868nxniyn56kcwnbghm10j7fw74a5nj0s19sm4zsji78b"; + }; + + propagatedBuildInputs = [ tkinter ]; + + # Disable tests due to their xserver requirement + doCheck = false; + + meta = { + description = "A toolkit for building high-level compound widgets in Python using the Tkinter module"; + homepage = "http://pmw.sourceforge.net/"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ mounium ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 98c7fb77cb3..fedb255773e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -240,6 +240,8 @@ in { plantuml = callPackage ../tools/misc/plantuml { }; + Pmw = callPackage ../development/python-modules/Pmw { }; + pyaes = callPackage ../development/python-modules/pyaes.nix { }; pyatspi = if isPy3k then callPackage ../development/python-modules/pyatspi { } else throw "pyatspi not supported for interpreter ${python.executable}"; From 2a1c535b7ed8cf294b559fd76e4ca2b8c872e4a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Katona=20L=C3=A1szl=C3=B3?= Date: Fri, 2 Jun 2017 16:34:16 +0200 Subject: [PATCH 050/117] pymol: added Pmw + python version bump --- .../science/chemistry/pymol/default.nix | 34 +++++++++++++++---- 1 file changed, 28 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/science/chemistry/pymol/default.nix b/pkgs/applications/science/chemistry/pymol/default.nix index af0c2e85549..200d00395e2 100644 --- a/pkgs/applications/science/chemistry/pymol/default.nix +++ b/pkgs/applications/science/chemistry/pymol/default.nix @@ -1,24 +1,46 @@ -{ stdenv, fetchurl, python27Packages, glew, freeglut, libpng, libxml2, tk, freetype }: +{ stdenv, fetchurl, makeDesktopItem, python3Packages, glew, freeglut, libpng, libxml2, tk, freetype }: let - version = "1.8.4.0"; + pname = "pymol"; + ver_maj = "1.8"; + ver_min = "4"; + version = "${ver_maj}.${ver_min}.0"; + description = "A Python-enhanced molecular graphics tool"; + + desktopItem = makeDesktopItem { + name = "${pname}"; + exec = "${pname}"; + desktopName = "PyMol Molecular Graphics System"; + genericName = "Molecular Modeller"; + comment = description; + mimeType = "chemical/x-pdb;chemical/x-mdl-molfile;chemical/x-mol2;chemical/seq-aa-fasta;chemical/seq-na-fasta;chemical/x-xyz;chemical/x-mdl-sdf;"; + categories = "Graphics;Education;Science;Chemistry;"; + }; in -python27Packages.buildPythonApplication { +python3Packages.buildPythonApplication { name = "pymol-${version}"; src = fetchurl { - url = "mirror://sourceforge/project/pymol/pymol/1.8/pymol-v1.8.4.0.tar.bz2"; + url = "mirror://sourceforge/project/pymol/pymol/${ver_maj}/pymol-v${version}.tar.bz2"; sha256 = "0yfj8g5yic9zz6f0bw2n8h6ifvgsn8qvhq84alixsi28wzppn55n"; }; - buildInputs = [ python27Packages.numpy glew freeglut libpng libxml2 tk freetype ]; + buildInputs = [ python3Packages.numpy glew freeglut libpng libxml2 tk freetype ]; NIX_CFLAGS_COMPILE = "-I ${libxml2.dev}/include/libxml2"; installPhase = '' python setup.py install --home=$out + cp -r ${desktopItem}/share/ $out/ + runHook postInstall + ''; + + postInstall = '' + wrapProgram $out/bin/pymol \ + --prefix PYTHONPATH : ${python3Packages.Pmw}/lib/python3.6/site-packages \ + --prefix PYTHONPATH : ${python3Packages.tkinter}/lib/python3.6/site-packages ''; meta = with stdenv.lib; { - description = "A Python-enhanced molecular graphics tool"; + description = description; homepage = "https://www.pymol.org/"; license = licenses.psfl; }; From 2bd5c13af5033e10366aa99060d81c533391ed8e Mon Sep 17 00:00:00 2001 From: Kjartan Ovmilk Date: Thu, 1 Jun 2017 16:48:13 +0200 Subject: [PATCH 051/117] resilio-sync: init at 2.5.2 --- .../networking/resilio-sync/default.nix | 41 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 43 insertions(+) create mode 100644 pkgs/applications/networking/resilio-sync/default.nix diff --git a/pkgs/applications/networking/resilio-sync/default.nix b/pkgs/applications/networking/resilio-sync/default.nix new file mode 100644 index 00000000000..706bc7841ca --- /dev/null +++ b/pkgs/applications/networking/resilio-sync/default.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchurl, ... }: + +let + arch = { + "x86_64-linux" = "x64"; + "i686-linux" = "i386"; + }.${stdenv.system}; + sha256s = { + "x86_64-linux" = "15gji5zqs1py92bpwvvq0r1spl0yynbrsnh4ajphwq17bqys3192"; + "i686-linux" = "1y67bd63b95va7g2676rgp2clvcy09pnmivy00r2w46y7kwwwbj8"; + }; + libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.libc ]; +in + +stdenv.mkDerivation rec { + name = "resilio-sync-${version}"; + version = "2.5.2"; + + src = fetchurl { + urls = [ + "https://download-cdn.resilio.com/${version}/linux-${arch}/resilio-sync_${arch}.tar.gz" + ]; + sha256 = sha256s.${stdenv.system}; + }; + + dontStrip = true; # Don't strip, otherwise patching the rpaths breaks + sourceRoot = "."; + + installPhase = '' + install -D rslsync "$out/bin/rslsync" + patchelf --interpreter "$(< $NIX_CC/nix-support/dynamic-linker)" --set-rpath ${libPath} "$out/bin/rslsync" + ''; + + meta = { + description = "Automatically sync files via secure, distributed technology"; + homepage = https://www.resilio.com/; + license = stdenv.lib.licenses.unfreeRedistributable; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ domenkozar thoughtpolice cwoac ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a40e8e38d99..ef6b8bb80a5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15823,6 +15823,8 @@ with pkgs; sxiv = callPackage ../applications/graphics/sxiv { }; + resilio-sync = callPackage ../applications/networking/resilio-sync { }; + bittorrentSync = bittorrentSync14; bittorrentSync14 = callPackage ../applications/networking/bittorrentsync/1.4.x.nix { }; bittorrentSync20 = callPackage ../applications/networking/bittorrentsync/2.0.x.nix { }; From 919b39bb7c70a99b090b8e3debde5addc736c469 Mon Sep 17 00:00:00 2001 From: Kjartan Ovmilk Date: Thu, 1 Jun 2017 16:50:17 +0200 Subject: [PATCH 052/117] resilio service: replaces btsync service, which is no longer supported upstream. --- nixos/modules/misc/ids.nix | 2 + nixos/modules/module-list.nix | 1 + nixos/modules/services/networking/resilio.nix | 315 ++++++++++++++++++ 3 files changed, 318 insertions(+) create mode 100644 nixos/modules/services/networking/resilio.nix diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index d217b3452fb..d7459e3fe91 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -294,6 +294,7 @@ jackett = 276; aria2 = 277; clickhouse = 278; + rslsync = 279; # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399! @@ -557,6 +558,7 @@ jackett = 276; aria2 = 277; clickhouse = 278; + rslsync = 279; # When adding a gid, make sure it doesn't match an existing # uid. Users and groups with the same name should have equal diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 7afcb9051bd..47adfa334ee 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -485,6 +485,7 @@ ./services/networking/radvd.nix ./services/networking/rdnssd.nix ./services/networking/redsocks.nix + ./services/networking/resilio.nix ./services/networking/rpcbind.nix ./services/networking/sabnzbd.nix ./services/networking/searx.nix diff --git a/nixos/modules/services/networking/resilio.nix b/nixos/modules/services/networking/resilio.nix new file mode 100644 index 00000000000..45274991d81 --- /dev/null +++ b/nixos/modules/services/networking/resilio.nix @@ -0,0 +1,315 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.resilio; + + resilioSync = pkgs.resilio; + + listenAddr = cfg.httpListenAddr + ":" + (toString cfg.httpListenPort); + + boolStr = x: if x then "true" else "false"; + optionalEmptyStr = b: v: optionalString (b != "") v; + + webUIConfig = optionalString cfg.enableWebUI + '' + "webui": + { + ${optionalEmptyStr cfg.httpLogin "\"login\": \"${cfg.httpLogin}\","} + ${optionalEmptyStr cfg.httpPass "\"password\": \"${cfg.httpPass}\","} + ${optionalEmptyStr cfg.apiKey "\"api_key\": \"${cfg.apiKey}\","} + ${optionalEmptyStr cfg.directoryRoot "\"directory_root\": \"${cfg.directoryRoot}\","} + "listen": "${listenAddr}" + } + ''; + + knownHosts = e: + optionalString (e ? "knownHosts") + (concatStringsSep "," (map (v: "\"${v}\"") e."knownHosts")); + + sharedFoldersRecord = + concatStringsSep "," (map (entry: + let helper = attr: v: + if (entry ? attr) then boolStr entry.attr else boolStr v; + in + '' + { + "secret": "${entry.secret}", + "dir": "${entry.directory}", + + "use_relay_server": ${helper "useRelayServer" true}, + "use_tracker": ${helper "useTracker" true}, + "use_dht": ${helper "useDHT" false}, + + "search_lan": ${helper "searchLAN" true}, + "use_sync_trash": ${helper "useSyncTrash" true}, + + "known_hosts": [${knownHosts entry}] + } + '') cfg.sharedFolders); + + sharedFoldersConfig = optionalString (cfg.sharedFolders != []) + '' + "shared_folders": + [ + ${sharedFoldersRecord} + ] + ''; + + configFile = pkgs.writeText "config.json" + '' + { + "device_name": "${cfg.deviceName}", + "storage_path": "${cfg.storagePath}", + "listening_port": ${toString cfg.listeningPort}, + "use_gui": false, + + "check_for_updates": ${boolStr cfg.checkForUpdates}, + "use_upnp": ${boolStr cfg.useUpnp}, + "download_limit": ${toString cfg.downloadLimit}, + "upload_limit": ${toString cfg.uploadLimit}, + "lan_encrypt_data": ${boolStr cfg.encryptLAN}, + + ${webUIConfig} + ${sharedFoldersConfig} + } + ''; +in +{ + options = { + services.resilio = { + enable = mkOption { + type = types.bool; + default = false; + description = '' + If enabled, start the Resilio Sync daemon. Once enabled, you can + interact with the service through the Web UI, or configure it in your + NixOS configuration. Enabling the resilio service + also installs a systemd user unit which can be used to start + user-specific copies of the daemon. Once installed, you can use + systemctl --user start resilio as your user to start + the daemon using the configuration file located at + $HOME/.config/resilio-sync/config.json. + ''; + }; + + deviceName = mkOption { + type = types.str; + example = "Voltron"; + description = '' + Name of the Resilio Sync device. + ''; + }; + + listeningPort = mkOption { + type = types.int; + default = 0; + example = 44444; + description = '' + Listening port. Defaults to 0 which randomizes the port. + ''; + }; + + checkForUpdates = mkOption { + type = types.bool; + default = true; + description = '' + Determines whether to check for updates and alert the user + about them in the UI. + ''; + }; + + useUpnp = mkOption { + type = types.bool; + default = true; + description = '' + Use Universal Plug-n-Play (UPnP) + ''; + }; + + downloadLimit = mkOption { + type = types.int; + default = 0; + example = 1024; + description = '' + Download speed limit. 0 is unlimited (default). + ''; + }; + + uploadLimit = mkOption { + type = types.int; + default = 0; + example = 1024; + description = '' + Upload speed limit. 0 is unlimited (default). + ''; + }; + + httpListenAddr = mkOption { + type = types.str; + default = "0.0.0.0"; + example = "1.2.3.4"; + description = '' + HTTP address to bind to. + ''; + }; + + httpListenPort = mkOption { + type = types.int; + default = 9000; + description = '' + HTTP port to bind on. + ''; + }; + + httpLogin = mkOption { + type = types.str; + example = "allyourbase"; + default = ""; + description = '' + HTTP web login username. + ''; + }; + + httpPass = mkOption { + type = types.str; + example = "arebelongtous"; + default = ""; + description = '' + HTTP web login password. + ''; + }; + + encryptLAN = mkOption { + type = types.bool; + default = true; + description = "Encrypt LAN data."; + }; + + enableWebUI = mkOption { + type = types.bool; + default = false; + description = '' + Enable Web UI for administration. Bound to the specified + httpListenAddress and + httpListenPort. + ''; + }; + + storagePath = mkOption { + type = types.path; + default = "/var/lib/resilio-sync/"; + description = '' + Where BitTorrent Sync will store it's database files (containing + things like username info and licenses). Generally, you should not + need to ever change this. + ''; + }; + + apiKey = mkOption { + type = types.str; + default = ""; + description = "API key, which enables the developer API."; + }; + + directoryRoot = mkOption { + type = types.str; + default = ""; + example = "/media"; + description = "Default directory to add folders in the web UI."; + }; + + sharedFolders = mkOption { + default = []; + example = + [ { secret = "AHMYFPCQAHBM7LQPFXQ7WV6Y42IGUXJ5Y"; + directory = "/home/user/sync_test"; + useRelayServer = true; + useTracker = true; + useDHT = false; + searchLAN = true; + useSyncTrash = true; + knownHosts = + [ "192.168.1.2:4444" + "192.168.1.3:4444" + ]; + } + ]; + description = '' + Shared folder list. If enabled, web UI must be + disabled. Secrets can be generated using rslsync + --generate-secret. Note that this secret will be + put inside the Nix store, so it is realistically not very + secret. + + If you would like to be able to modify the contents of this + directories, it is recommended that you make your user a + member of the resilio group. + + Directories in this list should be in the + resilio group, and that group must have + write access to the directory. It is also recommended that + chmod g+s is applied to the directory + so that any sub directories created will also belong to + the resilio group. Also, + setfacl -d -m group:resilio:rwx and + setfacl -m group:resilio:rwx should also + be applied so that the sub directories are writable by + the group. + ''; + }; + }; + }; + + config = mkIf cfg.enable { + assertions = + [ { assertion = cfg.deviceName != ""; + message = "Device name cannot be empty."; + } + { assertion = cfg.enableWebUI -> cfg.sharedFolders == []; + message = "If using shared folders, the web UI cannot be enabled."; + } + { assertion = cfg.apiKey != "" -> cfg.enableWebUI; + message = "If you're using an API key, you must enable the web server."; + } + ]; + + services.resilio.package = mkOptionDefault pkgs.resilio; + + users.extraUsers.rslsync = { + description = "Resilio Sync Service user"; + home = cfg.storagePath; + createHome = true; + uid = config.ids.uids.rslsync; + group = "rslsync"; + }; + + users.extraGroups = [ { name = "rslsync"; } ]; + + systemd.services.resilio = with pkgs; { + description = "Resilio Sync Service"; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" "local-fs.target" ]; + serviceConfig = { + Restart = "on-abort"; + UMask = "0002"; + User = "rslsync"; + ExecStart = + "${resilioSync}/bin/rslsync --nodaemon --config ${configFile}"; + }; + }; + + systemd.user.services.resilio = with pkgs; { + description = "Resilio Sync user service"; + after = [ "network.target" "local-fs.target" ]; + serviceConfig = { + Restart = "on-abort"; + ExecStart = + "${resilioSync}/bin/rslsync --nodaemon --config %h/.config/resilio-sync/config.json"; + }; + }; + + environment.systemPackages = [ cfg.package ]; + }; +} From b6e384732e34008e37d0b48fffed7d0dc0880621 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 1 Jun 2017 20:49:38 +0100 Subject: [PATCH 053/117] resilio-sync: cosmetic changes --- .../networking/resilio-sync/default.nix | 28 +++++++++---------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/pkgs/applications/networking/resilio-sync/default.nix b/pkgs/applications/networking/resilio-sync/default.nix index 706bc7841ca..7622cb76ad2 100644 --- a/pkgs/applications/networking/resilio-sync/default.nix +++ b/pkgs/applications/networking/resilio-sync/default.nix @@ -5,22 +5,18 @@ let "x86_64-linux" = "x64"; "i686-linux" = "i386"; }.${stdenv.system}; - sha256s = { - "x86_64-linux" = "15gji5zqs1py92bpwvvq0r1spl0yynbrsnh4ajphwq17bqys3192"; - "i686-linux" = "1y67bd63b95va7g2676rgp2clvcy09pnmivy00r2w46y7kwwwbj8"; - }; libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.libc ]; -in -stdenv.mkDerivation rec { +in stdenv.mkDerivation rec { name = "resilio-sync-${version}"; version = "2.5.2"; src = fetchurl { - urls = [ - "https://download-cdn.resilio.com/${version}/linux-${arch}/resilio-sync_${arch}.tar.gz" - ]; - sha256 = sha256s.${stdenv.system}; + url = "https://download-cdn.resilio.com/${version}/linux-${arch}/resilio-sync_${arch}.tar.gz"; + sha256 = { + "x86_64-linux" = "15gji5zqs1py92bpwvvq0r1spl0yynbrsnh4ajphwq17bqys3192"; + "i686-linux" = "1y67bd63b95va7g2676rgp2clvcy09pnmivy00r2w46y7kwwwbj8"; + }.${stdenv.system}; }; dontStrip = true; # Don't strip, otherwise patching the rpaths breaks @@ -28,14 +24,16 @@ stdenv.mkDerivation rec { installPhase = '' install -D rslsync "$out/bin/rslsync" - patchelf --interpreter "$(< $NIX_CC/nix-support/dynamic-linker)" --set-rpath ${libPath} "$out/bin/rslsync" + patchelf \ + --interpreter "$(< $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath ${libPath} "$out/bin/rslsync" ''; - meta = { + meta = with stdenv.lib; { description = "Automatically sync files via secure, distributed technology"; homepage = https://www.resilio.com/; - license = stdenv.lib.licenses.unfreeRedistributable; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ domenkozar thoughtpolice cwoac ]; + license = licenses.unfreeRedistributable; + platforms = platforms.linux; + maintainers = with maintainers; [ domenkozar thoughtpolice cwoac ]; }; } From c611d03842803c2d1bf081f6432449f34b1cebb7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 1 Jun 2017 21:53:13 +0100 Subject: [PATCH 054/117] resilio: generate configuration with toJSON --- nixos/modules/services/networking/resilio.nix | 117 +++++++----------- 1 file changed, 42 insertions(+), 75 deletions(-) diff --git a/nixos/modules/services/networking/resilio.nix b/nixos/modules/services/networking/resilio.nix index 45274991d81..33ac24aabc4 100644 --- a/nixos/modules/services/networking/resilio.nix +++ b/nixos/modules/services/networking/resilio.nix @@ -5,76 +5,41 @@ with lib; let cfg = config.services.resilio; - resilioSync = pkgs.resilio; + resilioSync = pkgs.resilio-sync; - listenAddr = cfg.httpListenAddr + ":" + (toString cfg.httpListenPort); + sharedFoldersRecord = map (entry: { + secret = entry.secret; + dir = entry.directory; - boolStr = x: if x then "true" else "false"; - optionalEmptyStr = b: v: optionalString (b != "") v; + use_relay_server = entry.useRelayServer; + use_tracker = entry.useTracker; + use_dht = entry.useDHT; - webUIConfig = optionalString cfg.enableWebUI - '' - "webui": - { - ${optionalEmptyStr cfg.httpLogin "\"login\": \"${cfg.httpLogin}\","} - ${optionalEmptyStr cfg.httpPass "\"password\": \"${cfg.httpPass}\","} - ${optionalEmptyStr cfg.apiKey "\"api_key\": \"${cfg.apiKey}\","} - ${optionalEmptyStr cfg.directoryRoot "\"directory_root\": \"${cfg.directoryRoot}\","} - "listen": "${listenAddr}" - } - ''; + search_lan = entry.searchLAN; + use_sync_trash = entry.useSyncTrash; + known_hosts = knownHosts; + }) cfg.sharedFolders; - knownHosts = e: - optionalString (e ? "knownHosts") - (concatStringsSep "," (map (v: "\"${v}\"") e."knownHosts")); + configFile = pkgs.writeText "config.json" (builtins.toJSON ({ + device_name = cfg.deviceName; + storage_path = cfg.storagePath; + listening_port = cfg.listeningPort; + use_gui = false; + check_for_updates = cfg.checkForUpdates; + use_upnp = cfg.useUpnp; + download_limit = cfg.downloadLimit; + upload_limit = cfg.uploadLimit; + lan_encrypt_data = cfg.encryptLAN; + } // optionalAttrs cfg.enableWebUI { + webui = { listen = "${cfg.httpListenAddr}:${toString cfg.httpListenPort}"; } // + (optionalAttrs (cfg.httpLogin != "") { login = cfg.httpLogin; }) // + (optionalAttrs (cfg.httpPass != "") { password = cfg.httpPass; }) // + (optionalAttrs (cfg.apiKey != "") { api_key = cfg.apiKey; }) // + (optionalAttrs (cfg.directoryRoot != "") { directory_root = cfg.directoryRoot; }); + } // optionalAttrs (sharedFoldersRecord != []) { + shared_folders = sharedFoldersRecord; + })); - sharedFoldersRecord = - concatStringsSep "," (map (entry: - let helper = attr: v: - if (entry ? attr) then boolStr entry.attr else boolStr v; - in - '' - { - "secret": "${entry.secret}", - "dir": "${entry.directory}", - - "use_relay_server": ${helper "useRelayServer" true}, - "use_tracker": ${helper "useTracker" true}, - "use_dht": ${helper "useDHT" false}, - - "search_lan": ${helper "searchLAN" true}, - "use_sync_trash": ${helper "useSyncTrash" true}, - - "known_hosts": [${knownHosts entry}] - } - '') cfg.sharedFolders); - - sharedFoldersConfig = optionalString (cfg.sharedFolders != []) - '' - "shared_folders": - [ - ${sharedFoldersRecord} - ] - ''; - - configFile = pkgs.writeText "config.json" - '' - { - "device_name": "${cfg.deviceName}", - "storage_path": "${cfg.storagePath}", - "listening_port": ${toString cfg.listeningPort}, - "use_gui": false, - - "check_for_updates": ${boolStr cfg.checkForUpdates}, - "use_upnp": ${boolStr cfg.useUpnp}, - "download_limit": ${toString cfg.downloadLimit}, - "upload_limit": ${toString cfg.uploadLimit}, - "lan_encrypt_data": ${boolStr cfg.encryptLAN}, - - ${webUIConfig} - ${sharedFoldersConfig} - } - ''; in { options = { @@ -97,6 +62,7 @@ in deviceName = mkOption { type = types.str; example = "Voltron"; + default = config.networking.hostName; description = '' Name of the Resilio Sync device. ''; @@ -230,10 +196,10 @@ in useDHT = false; searchLAN = true; useSyncTrash = true; - knownHosts = - [ "192.168.1.2:4444" - "192.168.1.3:4444" - ]; + knownHosts = [ + "192.168.1.2:4444" + "192.168.1.3:4444" + ]; } ]; description = '' @@ -275,7 +241,6 @@ in } ]; - services.resilio.package = mkOptionDefault pkgs.resilio; users.extraUsers.rslsync = { description = "Resilio Sync Service user"; @@ -295,8 +260,9 @@ in Restart = "on-abort"; UMask = "0002"; User = "rslsync"; - ExecStart = - "${resilioSync}/bin/rslsync --nodaemon --config ${configFile}"; + ExecStart = '' + ${resilioSync}/bin/rslsync --nodaemon --config ${configFile} + ''; }; }; @@ -305,11 +271,12 @@ in after = [ "network.target" "local-fs.target" ]; serviceConfig = { Restart = "on-abort"; - ExecStart = - "${resilioSync}/bin/rslsync --nodaemon --config %h/.config/resilio-sync/config.json"; + ExecStart = '' + ${resilioSync}/bin/rslsync --nodaemon --config %h/.config/resilio-sync/config.json + ''; }; }; - environment.systemPackages = [ cfg.package ]; + environment.systemPackages = [ resilioSync ]; }; } From 3d17573cd41587311d21d38b39d508b6234e39ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 2 Jun 2017 21:18:59 +0100 Subject: [PATCH 055/117] resilio: remove systemd user service this used to be part of the upstream btsync package fixes #26303 --- nixos/modules/services/networking/resilio.nix | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/nixos/modules/services/networking/resilio.nix b/nixos/modules/services/networking/resilio.nix index 33ac24aabc4..6d2b7bdbca1 100644 --- a/nixos/modules/services/networking/resilio.nix +++ b/nixos/modules/services/networking/resilio.nix @@ -241,7 +241,6 @@ in } ]; - users.extraUsers.rslsync = { description = "Resilio Sync Service user"; home = cfg.storagePath; @@ -265,18 +264,5 @@ in ''; }; }; - - systemd.user.services.resilio = with pkgs; { - description = "Resilio Sync user service"; - after = [ "network.target" "local-fs.target" ]; - serviceConfig = { - Restart = "on-abort"; - ExecStart = '' - ${resilioSync}/bin/rslsync --nodaemon --config %h/.config/resilio-sync/config.json - ''; - }; - }; - - environment.systemPackages = [ resilioSync ]; }; } From 4a62364c17819e953d943296e716c4910e57595b Mon Sep 17 00:00:00 2001 From: Lorenzo Manacorda Date: Fri, 2 Jun 2017 22:40:17 +0200 Subject: [PATCH 056/117] youtube-dl: 2017.05.23 -> 2017.05.29 (#26329) * youtube-dl: add pycryptodome dependency The pycrypto library is used for HLS streams with encrypted segments. See https://github.com/rg3/youtube-dl/pull/8201 * youtube-dl: 2017.05.23 -> 2017.05.29 --- pkgs/tools/misc/youtube-dl/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index 1acf0e65dea..853f644634d 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, buildPythonApplication -, zip, ffmpeg, rtmpdump, atomicparsley, pandoc +, zip, ffmpeg, rtmpdump, atomicparsley, pycryptodome, pandoc # Pandoc is required to build the package's man page. Release tarballs contain a # formatted man page already, though, it will still be installed. We keep the # manpage argument in place in case someone wants to use this derivation to @@ -8,21 +8,23 @@ , generateManPage ? false , ffmpegSupport ? true , rtmpSupport ? true +, hlsEncryptedSupport ? true , makeWrapper }: with stdenv.lib; buildPythonApplication rec { name = "youtube-dl-${version}"; - version = "2017.05.23"; + version = "2017.05.29"; src = fetchurl { url = "https://yt-dl.org/downloads/${version}/${name}.tar.gz"; - sha256 = "1na2ccja8p18i3ypf7vjrxlh653906746l966fwm06b5q6867iwd"; + sha256 = "11zh0h4hwwx39iv6qbkqbvf5a5mgj71ngj2kp7zmq7g0qh37x9rx"; }; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ zip ] ++ optional generateManPage pandoc; + propagatedBuildInputs = optional hlsEncryptedSupport pycryptodome; # Ensure ffmpeg is available in $PATH for post-processing & transcoding support. # rtmpdump is required to download files over RTMP From c972f01e2d670f9483a980312c0e12b81094cebb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 2 Jun 2017 21:55:16 +0100 Subject: [PATCH 057/117] pymol: set PYTHONPATH in a future way --- .../science/chemistry/pymol/default.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/science/chemistry/pymol/default.nix b/pkgs/applications/science/chemistry/pymol/default.nix index 200d00395e2..ed208014f7d 100644 --- a/pkgs/applications/science/chemistry/pymol/default.nix +++ b/pkgs/applications/science/chemistry/pymol/default.nix @@ -1,4 +1,9 @@ -{ stdenv, fetchurl, makeDesktopItem, python3Packages, glew, freeglut, libpng, libxml2, tk, freetype }: +{ stdenv, fetchurl, makeDesktopItem +, python3, python3Packages +, glew, freeglut, libpng, libxml2, tk, freetype }: + + +with stdenv.lib; let pname = "pymol"; @@ -33,13 +38,12 @@ python3Packages.buildPythonApplication { runHook postInstall ''; - postInstall = '' + postInstall = with python3Packages; '' wrapProgram $out/bin/pymol \ - --prefix PYTHONPATH : ${python3Packages.Pmw}/lib/python3.6/site-packages \ - --prefix PYTHONPATH : ${python3Packages.tkinter}/lib/python3.6/site-packages + --prefix PYTHONPATH : ${makeSearchPathOutput "lib" python3.sitePackages [ Pmw tkinter ]} ''; - meta = with stdenv.lib; { + meta = { description = description; homepage = "https://www.pymol.org/"; license = licenses.psfl; From bafcdbbb67d2cb1b273e61614b739a6942dd3baa Mon Sep 17 00:00:00 2001 From: Judson Lester Date: Fri, 2 Jun 2017 14:23:19 -0700 Subject: [PATCH 058/117] bcc: 0.2.0 -> 0.3.0 (#26315) --- pkgs/os-specific/linux/bcc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/bcc/default.nix b/pkgs/os-specific/linux/bcc/default.nix index f3b262f1f7d..88242df76d4 100644 --- a/pkgs/os-specific/linux/bcc/default.nix +++ b/pkgs/os-specific/linux/bcc/default.nix @@ -2,14 +2,14 @@ flex, bison, elfutils, python, pythonPackages, luajit, netperf, iperf }: stdenv.mkDerivation rec { - version = "0.2.0"; + version = "0.3.0"; name = "bcc-${version}"; src = fetchFromGitHub { owner = "iovisor"; repo = "bcc"; rev = "v${version}"; - sha256 = "1xifh8lcqmn4mk6w4srjf4zk6mlwgck4fpcyhhliy39963ch5k08"; + sha256 = "19lkqmilfjmj7bnhxlacd0waa5db8gf4lng12fy2zgji0d77vm1d"; }; buildInputs = [ makeWrapper cmake llvmPackages.llvm llvmPackages.clang-unwrapped kernel From 4576e8dddd17fd8c25aa02a917e89982cf7e3e37 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Sat, 3 Jun 2017 00:37:48 +0200 Subject: [PATCH 059/117] trash-cli: fix build on Python 3.6 --- pkgs/tools/misc/trash-cli/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/misc/trash-cli/default.nix b/pkgs/tools/misc/trash-cli/default.nix index 40fc72a0d71..77308ecf2ed 100644 --- a/pkgs/tools/misc/trash-cli/default.nix +++ b/pkgs/tools/misc/trash-cli/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, coreutils +{ stdenv, fetchFromGitHub, fetchpatch, coreutils , python3, python3Packages, substituteAll }: assert stdenv.isLinux; @@ -21,6 +21,12 @@ python3Packages.buildPythonApplication rec { df = "${coreutils}/bin/df"; libc = "${stdenv.cc.libc.out}/lib/libc.so.6"; }) + + # Fix build on Python 3.6. + (fetchpatch { + url = "https://github.com/andreafrancia/trash-cli/commit/a21b80d1e69783bb09376c3f60dd2f2a10578805.patch"; + sha256 = "0w49rjh433sjfc2cl5a9wlbr6kcn9f1qg905qsyv7ay3ar75wvyp"; + }) ]; buildInputs = with python3Packages; [ nose mock ]; From 4bee34dcc5e6886aac8c868410f12a670da03062 Mon Sep 17 00:00:00 2001 From: Emmanuel Rosa Date: Fri, 2 Jun 2017 20:58:41 -0400 Subject: [PATCH 060/117] doc: clarify building-nixos CD/DVD instructions This change updates the instructions for building a NixOS ISO so that it's clear how to do it. Previously, the instructions stated to set NIXOS_CONFIG prior to running `nix-build`, yet the example provided by-passed NIXOS_CONFIG anyway. But the *really* important missing piece is the need for nixos/default.nix. See #21840. This change removes the NIXOS_CONFIG verbiage, and adds steps to clone nixpkgs and (most importantly) cd'ing into nixpkgs/nixos. That way, the reader may think: *Oh, so I need a default.nix and a configuration.nix. Ahhh, OK.* I purposely added the redundant default.nix argument. --- nixos/doc/manual/development/building-nixos.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nixos/doc/manual/development/building-nixos.xml b/nixos/doc/manual/development/building-nixos.xml index 150fa1d7017..2f963f8666f 100644 --- a/nixos/doc/manual/development/building-nixos.xml +++ b/nixos/doc/manual/development/building-nixos.xml @@ -12,12 +12,12 @@ your configuration.nix to configure the system that would be installed on the CD. Default CD/DVD configurations are available -inside nixos/modules/installer/cd-dvd. To build them -you have to set NIXOS_CONFIG before -running nix-build to build the ISO. +inside nixos/modules/installer/cd-dvd. -$ nix-build -A config.system.build.isoImage -I nixos-config=modules/installer/cd-dvd/installation-cd-minimal.nix +$ git clone https://github.com/NixOS/nixpkgs.git +$ cd nixpkgs/nixos +$ nix-build -A config.system.build.isoImage -I nixos-config=modules/installer/cd-dvd/installation-cd-minimal.nix default.nix From edaf76a99db739a04fb043678b2fcde422e2da71 Mon Sep 17 00:00:00 2001 From: Eric Sagnes Date: Sat, 3 Jun 2017 09:45:22 +0900 Subject: [PATCH 061/117] albert: 0.11.1 -> 0.11.3 --- pkgs/applications/misc/albert/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/albert/default.nix b/pkgs/applications/misc/albert/default.nix index 80e77858a06..f3c011e3333 100644 --- a/pkgs/applications/misc/albert/default.nix +++ b/pkgs/applications/misc/albert/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "albert-${version}"; - version = "0.11.1"; + version = "0.11.3"; src = fetchFromGitHub { owner = "albertlauncher"; repo = "albert"; rev = "v${version}"; - sha256 = "1ai0h3lbdac0a4xzd6pm3i0r8w0gfdnw9rdkj0szyzvm428f88s6"; + sha256 = "0ddz6h1334b9kqy1lfi7qa21znm3l0b9h0d4s62llxdasv103jh5"; }; nativeBuildInputs = [ cmake makeQtWrapper ]; From fe1f560fefc5510dd3d649893e440b62432b4c60 Mon Sep 17 00:00:00 2001 From: Eric Sagnes Date: Sat, 3 Jun 2017 09:31:06 +0900 Subject: [PATCH 062/117] groonga: 7.0.0 -> 7.0.3 --- pkgs/servers/search/groonga/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/search/groonga/default.nix b/pkgs/servers/search/groonga/default.nix index e71c570f736..500913b5eec 100644 --- a/pkgs/servers/search/groonga/default.nix +++ b/pkgs/servers/search/groonga/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { name = "groonga-${version}"; - version = "7.0.0"; + version = "7.0.3"; src = fetchurl { url = "http://packages.groonga.org/source/groonga/${name}.tar.gz"; - sha256 = "0c3vzw2ias0xpz1hwywlib1qqfjvvzwj1zggswd5l2cj87f1krfd"; + sha256 = "17pp4sbfa6wpiiiqvdbnvd1qxrchmj7zh27zdrmmnbvwpyc5g2n6"; }; buildInputs = with stdenv.lib; From 3badf79b48d2d29edcc385702e0c8020eae98138 Mon Sep 17 00:00:00 2001 From: Alexandre Peyroux Date: Thu, 1 Jun 2017 01:38:41 +0200 Subject: [PATCH 063/117] insync: Check if arch is x86_64 before downloading the binary. --- pkgs/applications/networking/insync/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/insync/default.nix b/pkgs/applications/networking/insync/default.nix index 7beb489178b..5690705d1f2 100644 --- a/pkgs/applications/networking/insync/default.nix +++ b/pkgs/applications/networking/insync/default.nix @@ -3,10 +3,14 @@ stdenv.mkDerivation rec { name = "insync-${version}"; version = "1.3.16.36155"; - src = fetchurl { - url = "http://s.insynchq.com/builds/insync-portable_${version}_amd64.tar.bz2"; - sha256 = "1gf1qg7mkbcgqhwxkiljmd1w2zvarq6vhxhips3w06bqdyg12210"; - }; + src = + if stdenv.system == "x86_64-linux" then + fetchurl { + url = "http://s.insynchq.com/builds/insync-portable_${version}_amd64.tar.bz2"; + sha256 = "1gf1qg7mkbcgqhwxkiljmd1w2zvarq6vhxhips3w06bqdyg12210"; + } + else + throw "${name} is not supported on ${stdenv.system}"; buildInputs = [ makeWrapper ]; From 2606d395fce36e77c542ace1f0f318a57130a522 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Sat, 3 Jun 2017 11:59:34 +0200 Subject: [PATCH 064/117] dnschain: allow different bind and external addresses --- nixos/modules/services/networking/dnschain.nix | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/networking/dnschain.nix b/nixos/modules/services/networking/dnschain.nix index b6492996057..ab7bbb15ad4 100644 --- a/nixos/modules/services/networking/dnschain.nix +++ b/nixos/modules/services/networking/dnschain.nix @@ -17,7 +17,7 @@ let host = ${cfg.dns.address} port = ${toString cfg.dns.port} oldDNSMethod = NO_OLD_DNS - externalIP = ${cfg.dns.address} + externalIP = ${cfg.dns.externalAddress} [http] host = ${cfg.api.hostname} @@ -47,8 +47,18 @@ in type = types.str; default = "127.0.0.1"; description = '' - The IP address that will be used to reach this machine. - Leave this unchanged if you do not wish to directly expose the DNSChain resolver. + The IP address the DNSChain resolver will bind to. + Leave this unchanged if you do not wish to directly expose the resolver. + ''; + }; + + dns.externalAddress = mkOption { + type = types.str; + default = cfg.dns.address; + description = '' + The IP address used by clients to reach the resolver and the value of + the namecoin.dns record. Set this in case the bind address + is not the actual IP address (e.g. the machine is behind a NAT). ''; }; From 43f9c60e92fffb11a61932f3c58c8e777cfc6a86 Mon Sep 17 00:00:00 2001 From: Francois-Rene Rideau Date: Fri, 2 Jun 2017 20:26:44 -0400 Subject: [PATCH 065/117] gambit: 4.8.5 -> 4.8.6 Use higher optimization settings and include openssl interface. --- pkgs/development/compilers/gambit/default.nix | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/pkgs/development/compilers/gambit/default.nix b/pkgs/development/compilers/gambit/default.nix index 99a4d6fc4d1..7e17cee9abd 100644 --- a/pkgs/development/compilers/gambit/default.nix +++ b/pkgs/development/compilers/gambit/default.nix @@ -1,16 +1,25 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, openssl }: stdenv.mkDerivation rec { name = "gambit-${version}"; - version = "4.8.5"; - devver = "4_8_5"; + version = "4.8.6"; + devver = "4_8_6"; src = fetchurl { url = "http://www.iro.umontreal.ca/~gambit/download/gambit/v4.8/source/gambit-v${devver}-devel.tgz"; - sha256 = "02b5bm06k2qr0lvdwwsl0ygxs7n8410rrkq95picn4s02kxszqnq"; + sha256 = "0j3ka76cfb007rlcc3nv5p1s6vh31cwp87hwwabawf16vs1jb7bl"; }; - configureFlags = [ "--enable-shared" "--enable-single-host" ]; + configureFlags = [ + "--enable-single-host" + "--enable-shared" + "--enable-absolute-shared-libs" + "--enable-c-opt=-O6" "--enable-gcc-opts" "--enable-inline-jumps" + "--enable-thread-system=posix" "--enable-dynamic-tls" + "--enable-openssl" + ]; + + buildInputs = [ openssl ]; meta = { description = "Optimizing Scheme to C compiler"; From 7cbdb10576ea6271c7fd080176494babfa4ce24c Mon Sep 17 00:00:00 2001 From: Francois-Rene Rideau Date: Fri, 2 Jun 2017 20:26:52 -0400 Subject: [PATCH 066/117] gerbil: init at 0.10 --- pkgs/development/compilers/gerbil/default.nix | 74 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 75 insertions(+) create mode 100644 pkgs/development/compilers/gerbil/default.nix diff --git a/pkgs/development/compilers/gerbil/default.nix b/pkgs/development/compilers/gerbil/default.nix new file mode 100644 index 00000000000..1bad0a86071 --- /dev/null +++ b/pkgs/development/compilers/gerbil/default.nix @@ -0,0 +1,74 @@ +{ stdenv, fetchurl, fetchgit, gambit, openssl, zlib, coreutils, rsync, bash }: + +stdenv.mkDerivation rec { + name = "gerbil-${version}"; + + version = "0.10"; + src = fetchurl { + url = "https://github.com/vyzo/gerbil/archive/v${version}.tar.gz"; + sha256 = "14wzdnifr99g1mvm2xwks97nhaq62hfx43pxcw9gs647i7cymbly"; + }; + + #version = "v0.7-49-g767926d"; + #src = fetchgit { + # url = "https://github.com/vyzo/gerbil.git"; + # rev = "767926d7d6dde7e717cc51307f07e21859c79989"; + # sha256 = "089lzsjmb43nns70pvn3kqg1gx6alsarbphvmh2a6qimnscdgv5z"; + #}; + # src = /home/fare/src/scheme/gerbil ; + + buildInputs = [ gambit openssl zlib coreutils rsync ]; + + patchPhase = '' + SCRIPTS=( + src/*.sh + src/gerbil/gx? + src/gerbil/runtime/build.scm + src/lang/build*ss + src/std/build*.ss + src/std/run-tests.ss + src/std/web/fastcgi-test.ss + src/std/web/rack-test.ss + src/tutorial/lang/build.ss + ) + for f in "''${SCRIPTS[@]}" ; do + substituteInPlace "$f" --replace '#!/usr/bin/env bash' '#!${bash}/bin/bash' + substituteInPlace "$f" --replace '#!/usr/bin/env gsi-script' '#!${gambit}/bin/gsi-script' + substituteInPlace "$f" --replace '#!/usr/bin/env' '#!${coreutils}/bin/env' + done + ''; + + buildPhase = '' + ( cd src && sh build.sh ) + ''; + + installPhase = '' + ( mkdir -p $out/ + cp -fa bin lib etc doc $out/ + cd $out/bin + for f in "''${SCRIPTS[@]}" ; do + substituteInPlace gxc --replace "${coreutils}/bin/env gxi" "$out/bin/gxi" + done + ( echo '#!${bash}/bin/bash -e' + echo "GERBIL_HOME=$out" + echo 'export GERBIL_HOME' + echo 'case "$1" in -:*) GSIOPTIONS=$1 ; shift ;; esac' + echo 'if [[ $# = 0 ]] ; then ' + echo ' ${gambit}/bin/gsi $GSIOPTIONS $GERBIL_HOME/lib/gxi-init $GERBIL_HOME/lib/gxi-interactive - ;' + echo 'else' + echo ' ${gambit}/bin/gsi $GSIOPTIONS $GERBIL_HOME/lib/gxi-init "$@"' + echo 'fi' ) > $out/bin/gxi + ) + ''; + + dontStrip = true; + #dontFixup = true; + + meta = { + description = "Gerbil"; + homepage = "https://github.com/vyzo/gerbil"; + license = stdenv.lib.licenses.lgpl2; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ fare ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 713a16ee113..51c4248ee79 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5110,6 +5110,7 @@ with pkgs; fpc = callPackage ../development/compilers/fpc { }; gambit = callPackage ../development/compilers/gambit { }; + gerbil = callPackage ../development/compilers/gerbil { }; gcc = gcc5; gcc-unwrapped = gcc.cc; From de0d0da1fdb393572fc24d93f771ada9aa06a028 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sat, 3 Jun 2017 10:17:44 +0100 Subject: [PATCH 067/117] gerbil: simplify shebang patching fixes #26338 --- pkgs/development/compilers/gerbil/default.nix | 61 +++++++------------ 1 file changed, 21 insertions(+), 40 deletions(-) diff --git a/pkgs/development/compilers/gerbil/default.nix b/pkgs/development/compilers/gerbil/default.nix index 1bad0a86071..1bffd1bd1c8 100644 --- a/pkgs/development/compilers/gerbil/default.nix +++ b/pkgs/development/compilers/gerbil/default.nix @@ -9,60 +9,41 @@ stdenv.mkDerivation rec { sha256 = "14wzdnifr99g1mvm2xwks97nhaq62hfx43pxcw9gs647i7cymbly"; }; - #version = "v0.7-49-g767926d"; - #src = fetchgit { - # url = "https://github.com/vyzo/gerbil.git"; - # rev = "767926d7d6dde7e717cc51307f07e21859c79989"; - # sha256 = "089lzsjmb43nns70pvn3kqg1gx6alsarbphvmh2a6qimnscdgv5z"; - #}; - # src = /home/fare/src/scheme/gerbil ; + buildInputs = [ gambit openssl zlib coreutils rsync bash ]; - buildInputs = [ gambit openssl zlib coreutils rsync ]; + postPatch = '' + patchShebangs . - patchPhase = '' - SCRIPTS=( - src/*.sh - src/gerbil/gx? - src/gerbil/runtime/build.scm - src/lang/build*ss - src/std/build*.ss - src/std/run-tests.ss - src/std/web/fastcgi-test.ss - src/std/web/rack-test.ss - src/tutorial/lang/build.ss - ) - for f in "''${SCRIPTS[@]}" ; do - substituteInPlace "$f" --replace '#!/usr/bin/env bash' '#!${bash}/bin/bash' - substituteInPlace "$f" --replace '#!/usr/bin/env gsi-script' '#!${gambit}/bin/gsi-script' + find . -type f -executable -print0 | while IFS= read -r -d ''$'\0' f; do substituteInPlace "$f" --replace '#!/usr/bin/env' '#!${coreutils}/bin/env' done ''; buildPhase = '' + runHook preBuild ( cd src && sh build.sh ) + runHook postBuild ''; installPhase = '' - ( mkdir -p $out/ - cp -fa bin lib etc doc $out/ - cd $out/bin - for f in "''${SCRIPTS[@]}" ; do - substituteInPlace gxc --replace "${coreutils}/bin/env gxi" "$out/bin/gxi" - done - ( echo '#!${bash}/bin/bash -e' - echo "GERBIL_HOME=$out" - echo 'export GERBIL_HOME' - echo 'case "$1" in -:*) GSIOPTIONS=$1 ; shift ;; esac' - echo 'if [[ $# = 0 ]] ; then ' - echo ' ${gambit}/bin/gsi $GSIOPTIONS $GERBIL_HOME/lib/gxi-init $GERBIL_HOME/lib/gxi-interactive - ;' - echo 'else' - echo ' ${gambit}/bin/gsi $GSIOPTIONS $GERBIL_HOME/lib/gxi-init "$@"' - echo 'fi' ) > $out/bin/gxi - ) + runHook preInstall + mkdir -p $out/ + cp -fa bin lib etc doc $out/ + + cat > $out/bin/gxi < Date: Sat, 3 Jun 2017 12:27:43 +0100 Subject: [PATCH 068/117] Revert "datadog: Properly use configured package." This reverts commit 50f53da9eff3e7a1686ff439b341ada5bd63ddcd. --- nixos/modules/services/monitoring/dd-agent/dd-agent.nix | 8 ++++---- pkgs/tools/networking/dd-agent/default.nix | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/nixos/modules/services/monitoring/dd-agent/dd-agent.nix b/nixos/modules/services/monitoring/dd-agent/dd-agent.nix index 04a21871519..e55faed8e07 100644 --- a/nixos/modules/services/monitoring/dd-agent/dd-agent.nix +++ b/nixos/modules/services/monitoring/dd-agent/dd-agent.nix @@ -23,7 +23,7 @@ let etcfiles = map (i: { source = if builtins.hasAttr "config" i then pkgs.writeText "${i.name}.yaml" i.config - else "${cfg.agent}/agent/conf.d-system/${i.name}.yaml"; + else "${pkgs.dd-agent}/agent/conf.d-system/${i.name}.yaml"; target = "dd-agent/conf.d/${i.name}.yaml"; } ) cfg.integrations ++ @@ -119,13 +119,13 @@ in { path = [ cfg.agent pkgs.python pkgs.sysstat pkgs.procps ]; wantedBy = [ "multi-user.target" ]; serviceConfig = { - ExecStart = "${cfg.agent}/bin/dd-agent foreground"; + ExecStart = "${pkgs.dd-agent}/bin/dd-agent foreground"; User = "datadog"; Group = "datadog"; Restart = "always"; RestartSec = 2; }; - restartTriggers = [ cfg.agent ddConf ] ++ etcSources; + restartTriggers = [ pkgs.dd-agent ddConf ] ++ etcSources; }; systemd.services.dd-jmxfetch = lib.mkIf (builtins.any (i: i.name == "jmx") cfg.integrations) { @@ -133,7 +133,7 @@ in { path = [ cfg.agent pkgs.python pkgs.sysstat pkgs.procps pkgs.jdk ]; wantedBy = [ "multi-user.target" ]; serviceConfig = { - ExecStart = "${cfg.agent}/bin/dd-jmxfetch"; + ExecStart = "${pkgs.dd-agent}/bin/dd-jmxfetch"; User = "datadog"; Group = "datadog"; Restart = "always"; diff --git a/pkgs/tools/networking/dd-agent/default.nix b/pkgs/tools/networking/dd-agent/default.nix index 338804aa26b..2556287570f 100644 --- a/pkgs/tools/networking/dd-agent/default.nix +++ b/pkgs/tools/networking/dd-agent/default.nix @@ -5,7 +5,7 @@ # wrapper with their PYTHONPATH. This means overrideAttrs is not # strong enough (it overrides too late), we need to call it # beforehand. -, extraBuildInputs ? [ ] }: +, extraBuildInputs ? [ pythonPackages.psutil ] }: let inherit (pythonPackages) python; docker_1_10 = pythonPackages.buildPythonPackage rec { From dcf171bc79c99ef1326136b5eb49fd81525d6ec5 Mon Sep 17 00:00:00 2001 From: Mateusz Kowalczyk Date: Sat, 3 Jun 2017 12:27:56 +0100 Subject: [PATCH 069/117] Revert "dd-agent: 5.11.2 -> 5.13.2 + service rework" This reverts commit af096c8bff1e534be9c69f50eed13e6b48427d0e. --- .../monitoring/dd-agent/dd-agent-defaults.nix | 8 + .../services/monitoring/dd-agent/dd-agent.nix | 190 +++++++++++++----- .../dd-agent/update-dd-agent-defaults | 9 + pkgs/tools/networking/dd-agent/default.nix | 57 ++---- 4 files changed, 169 insertions(+), 95 deletions(-) create mode 100644 nixos/modules/services/monitoring/dd-agent/dd-agent-defaults.nix create mode 100755 nixos/modules/services/monitoring/dd-agent/update-dd-agent-defaults diff --git a/nixos/modules/services/monitoring/dd-agent/dd-agent-defaults.nix b/nixos/modules/services/monitoring/dd-agent/dd-agent-defaults.nix new file mode 100644 index 00000000000..04512819742 --- /dev/null +++ b/nixos/modules/services/monitoring/dd-agent/dd-agent-defaults.nix @@ -0,0 +1,8 @@ +# Generated using update-dd-agent-default, please re-run after updating dd-agent. DO NOT EDIT MANUALLY. +[ + "auto_conf" + "agent_metrics.yaml.default" + "disk.yaml.default" + "network.yaml.default" + "ntp.yaml.default" +] diff --git a/nixos/modules/services/monitoring/dd-agent/dd-agent.nix b/nixos/modules/services/monitoring/dd-agent/dd-agent.nix index e55faed8e07..8d3d4f2065e 100644 --- a/nixos/modules/services/monitoring/dd-agent/dd-agent.nix +++ b/nixos/modules/services/monitoring/dd-agent/dd-agent.nix @@ -16,24 +16,100 @@ let forwarder_log_file: /var/log/datadog/forwarder.log dogstatsd_log_file: /var/log/datadog/dogstatsd.log pup_log_file: /var/log/datadog/pup.log + + # proxy_host: my-proxy.com + # proxy_port: 3128 + # proxy_user: user + # proxy_password: password + + # tags: mytag0, mytag1 ${optionalString (cfg.tags != null ) "tags: ${concatStringsSep "," cfg.tags }"} - ${cfg.extraDdConfig} + + # collect_ec2_tags: no + # recent_point_threshold: 30 + # use_mount: no + # listen_port: 17123 + # graphite_listen_port: 17124 + # non_local_traffic: no + # use_curl_http_client: False + # bind_host: localhost + + # use_pup: no + # pup_port: 17125 + # pup_interface: localhost + # pup_url: http://localhost:17125 + + # dogstatsd_port : 8125 + # dogstatsd_interval : 10 + # dogstatsd_normalize : yes + # statsd_forward_host: address_of_own_statsd_server + # statsd_forward_port: 8125 + + # device_blacklist_re: .*\/dev\/mapper\/lxc-box.* + + # ganglia_host: localhost + # ganglia_port: 8651 ''; - etcfiles = - map (i: { source = if builtins.hasAttr "config" i - then pkgs.writeText "${i.name}.yaml" i.config - else "${pkgs.dd-agent}/agent/conf.d-system/${i.name}.yaml"; - target = "dd-agent/conf.d/${i.name}.yaml"; - } - ) cfg.integrations ++ - [ { source = ddConf; - target = "dd-agent/datadog.conf"; - } - ]; + diskConfig = pkgs.writeText "disk.yaml" '' + init_config: - # restart triggers - etcSources = map (i: i.source) etcfiles; + instances: + - use_mount: no + ''; + + networkConfig = pkgs.writeText "network.yaml" '' + init_config: + + instances: + # Network check only supports one configured instance + - collect_connection_state: false + excluded_interfaces: + - lo + - lo0 + ''; + + postgresqlConfig = pkgs.writeText "postgres.yaml" cfg.postgresqlConfig; + nginxConfig = pkgs.writeText "nginx.yaml" cfg.nginxConfig; + mongoConfig = pkgs.writeText "mongo.yaml" cfg.mongoConfig; + jmxConfig = pkgs.writeText "jmx.yaml" cfg.jmxConfig; + processConfig = pkgs.writeText "process.yaml" cfg.processConfig; + + etcfiles = + let + defaultConfd = import ./dd-agent-defaults.nix; + in (map (f: { source = "${pkgs.dd-agent}/agent/conf.d-system/${f}"; + target = "dd-agent/conf.d/${f}"; + }) defaultConfd) ++ [ + { source = ddConf; + target = "dd-agent/datadog.conf"; + } + { source = diskConfig; + target = "dd-agent/conf.d/disk.yaml"; + } + { source = networkConfig; + target = "dd-agent/conf.d/network.yaml"; + } ] ++ + (optional (cfg.postgresqlConfig != null) + { source = postgresqlConfig; + target = "dd-agent/conf.d/postgres.yaml"; + }) ++ + (optional (cfg.nginxConfig != null) + { source = nginxConfig; + target = "dd-agent/conf.d/nginx.yaml"; + }) ++ + (optional (cfg.mongoConfig != null) + { source = mongoConfig; + target = "dd-agent/conf.d/mongo.yaml"; + }) ++ + (optional (cfg.processConfig != null) + { source = processConfig; + target = "dd-agent/conf.d/process.yaml"; + }) ++ + (optional (cfg.jmxConfig != null) + { source = jmxConfig; + target = "dd-agent/conf.d/jmx.yaml"; + }); in { options.services.dd-agent = { @@ -63,46 +139,44 @@ in { type = types.uniq (types.nullOr types.string); }; - agent = mkOption { - description = "The dd-agent package to use. Useful when overriding the package."; - default = pkgs.dd-agent; - type = types.package; + postgresqlConfig = mkOption { + description = "Datadog PostgreSQL integration configuration"; + default = null; + type = types.uniq (types.nullOr types.string); }; - integrations = mkOption { + nginxConfig = mkOption { + description = "Datadog nginx integration configuration"; + default = null; + type = types.uniq (types.nullOr types.string); + }; + + mongoConfig = mkOption { + description = "MongoDB integration configuration"; + default = null; + type = types.uniq (types.nullOr types.string); + }; + + jmxConfig = mkOption { + description = "JMX integration configuration"; + default = null; + type = types.uniq (types.nullOr types.string); + }; + + processConfig = mkOption { description = '' - Any integrations to use. Default config used if none - specified. It is currently up to the user to make sure that - the dd-agent package used has all the dependencies chosen - integrations require in scope. - ''; - type = types.listOf (types.attrsOf types.string); - default = []; - example = '' - [ { name = "elastic"; - config = ''' - init_config: - - instances: - - url: http://localhost:9200 - '''; - } - { name = "nginx"; } - { name = "ntp"; } - { name = "network"; } - ] + Process integration configuration + + See http://docs.datadoghq.com/integrations/process/ ''; + default = null; + type = types.uniq (types.nullOr types.string); }; - extraDdConfig = mkOption { - description = "Extra settings to append to datadog agent config."; - default = ""; - type = types.string; - }; }; config = mkIf cfg.enable { - environment.systemPackages = [ cfg.agent pkgs.sysstat pkgs.procps ]; + environment.systemPackages = [ pkgs."dd-agent" pkgs.sysstat pkgs.procps ]; users.extraUsers.datadog = { description = "Datadog Agent User"; @@ -116,7 +190,7 @@ in { systemd.services.dd-agent = { description = "Datadog agent monitor"; - path = [ cfg.agent pkgs.python pkgs.sysstat pkgs.procps ]; + path = [ pkgs."dd-agent" pkgs.python pkgs.sysstat pkgs.procps ]; wantedBy = [ "multi-user.target" ]; serviceConfig = { ExecStart = "${pkgs.dd-agent}/bin/dd-agent foreground"; @@ -125,12 +199,28 @@ in { Restart = "always"; RestartSec = 2; }; - restartTriggers = [ pkgs.dd-agent ddConf ] ++ etcSources; + restartTriggers = [ pkgs.dd-agent ddConf diskConfig networkConfig postgresqlConfig nginxConfig mongoConfig jmxConfig processConfig ]; }; - systemd.services.dd-jmxfetch = lib.mkIf (builtins.any (i: i.name == "jmx") cfg.integrations) { + systemd.services.dogstatsd = { + description = "Datadog statsd"; + path = [ pkgs."dd-agent" pkgs.python pkgs.procps ]; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + ExecStart = "${pkgs.dd-agent}/bin/dogstatsd start"; + User = "datadog"; + Group = "datadog"; + Type = "forking"; + PIDFile = "/tmp/dogstatsd.pid"; + Restart = "always"; + RestartSec = 2; + }; + restartTriggers = [ pkgs.dd-agent ddConf diskConfig networkConfig postgresqlConfig nginxConfig mongoConfig jmxConfig processConfig ]; + }; + + systemd.services.dd-jmxfetch = lib.mkIf (cfg.jmxConfig != null) { description = "Datadog JMX Fetcher"; - path = [ cfg.agent pkgs.python pkgs.sysstat pkgs.procps pkgs.jdk ]; + path = [ pkgs."dd-agent" pkgs.python pkgs.sysstat pkgs.procps pkgs.jdk ]; wantedBy = [ "multi-user.target" ]; serviceConfig = { ExecStart = "${pkgs.dd-agent}/bin/dd-jmxfetch"; @@ -139,7 +229,7 @@ in { Restart = "always"; RestartSec = 2; }; - restartTriggers = [ cfg.agent ddConf ] ++ etcSources; + restartTriggers = [ pkgs.dd-agent ddConf diskConfig networkConfig postgresqlConfig nginxConfig mongoConfig jmxConfig ]; }; environment.etc = etcfiles; diff --git a/nixos/modules/services/monitoring/dd-agent/update-dd-agent-defaults b/nixos/modules/services/monitoring/dd-agent/update-dd-agent-defaults new file mode 100755 index 00000000000..76724173171 --- /dev/null +++ b/nixos/modules/services/monitoring/dd-agent/update-dd-agent-defaults @@ -0,0 +1,9 @@ +#!/usr/bin/env bash +dd=$(nix-build --no-out-link -A dd-agent ../../../..) +echo '# Generated using update-dd-agent-default, please re-run after updating dd-agent. DO NOT EDIT MANUALLY.' > dd-agent-defaults.nix +echo '[' >> dd-agent-defaults.nix +echo ' "auto_conf"' >> dd-agent-defaults.nix +for f in $(find $dd/agent/conf.d-system -maxdepth 1 -type f | grep -v '\.example' | sort); do + echo " \"$(basename $f)\"" >> dd-agent-defaults.nix +done +echo ']' >> dd-agent-defaults.nix diff --git a/pkgs/tools/networking/dd-agent/default.nix b/pkgs/tools/networking/dd-agent/default.nix index 2556287570f..d1171a3c835 100644 --- a/pkgs/tools/networking/dd-agent/default.nix +++ b/pkgs/tools/networking/dd-agent/default.nix @@ -1,11 +1,5 @@ { stdenv, fetchFromGitHub, pythonPackages -, sysstat, unzip, makeWrapper -# We need extraBuildInputs as we want to be able to override this -# package with python packages _and_ have the produced binaries -# wrapper with their PYTHONPATH. This means overrideAttrs is not -# strong enough (it overrides too late), we need to call it -# beforehand. -, extraBuildInputs ? [ pythonPackages.psutil ] }: +, sysstat, unzip, makeWrapper }: let inherit (pythonPackages) python; docker_1_10 = pythonPackages.buildPythonPackage rec { @@ -32,42 +26,33 @@ let # due to flake8 doCheck = false; }; - version = "5.13.2"; - - integrations = fetchFromGitHub { - owner = "datadog"; - repo = "integrations-core"; - rev = version; - sha256 = "1nbjmkq0wdfndmx0qap69h2rkwkkb0632j87h9d3j99bykyav3y3"; - }; in stdenv.mkDerivation rec { + version = "5.11.2"; name = "dd-agent-${version}"; src = fetchFromGitHub { owner = "datadog"; repo = "dd-agent"; rev = version; - sha256 = "0x2bxi70l2yf0wi232qksvcscjdpjg8l7dmgg1286vqryyfazfjb"; + sha256 = "1iqxvgpsqibqw3vk79158l2pnb6y4pjhjp2d6724lm5rpz4825lx"; }; buildInputs = [ python unzip makeWrapper - pythonPackages.boto - docker_1_10 - pythonPackages.kazoo - pythonPackages.ntplib - pythonPackages.consul - pythonPackages.python-etcd - pythonPackages.pyyaml pythonPackages.requests + pythonPackages.psycopg2 + pythonPackages.psutil + pythonPackages.ntplib pythonPackages.simplejson - pythonPackages.supervisor - pythonPackages.tornado - pythonPackages.uptime - ] ++ extraBuildInputs; + pythonPackages.pyyaml + pythonPackages.pymongo_2_9_1 + pythonPackages.python-etcd + pythonPackages.consul + docker_1_10 + ]; propagatedBuildInputs = with pythonPackages; [ python tornado ]; buildCommand = '' @@ -82,24 +67,6 @@ in stdenv.mkDerivation rec { # Move out default conf.d so that /etc/dd-agent/conf.d is used mv $out/agent/conf.d $out/agent/conf.d-system - # Sometime between 5.11.2 and 5.13.2 datadog moved out all its - # checks into separate repository. Copy them back in so dd-agent - # service can easily pick and choose by copying out configs into - # its etc files. - mkdir -p $out/agent/checks.d - for i in ${toString integrations}/* # */ - do - if [ -f "$i/check.py" ]; then - if [ -f "$i/conf.yaml.default" -o -f "$i/conf.yaml.example" ]; then - local name=$(basename $i) - cp $i/check.py $out/agent/checks.d/$name.py - # Copy .default file first unless it doesn't exist then copy .default - cp $i/conf.yaml.default $out/agent/conf.d-system/$name.yaml &> /dev/null || \ - cp $i/conf.yaml.example $out/agent/conf.d-system/$name.yaml - fi - fi - done - cat > $out/bin/dd-jmxfetch < Date: Sat, 3 Jun 2017 13:30:40 +0200 Subject: [PATCH 070/117] inspectrum: unstable-2017-02-18 -> unstable-2017-05-31 (#26284) * Upgrades Inspectrum to new version to work with QT5.8 * inspectrum: also increment version number --- pkgs/applications/misc/inspectrum/default.nix | 7 +++---- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/misc/inspectrum/default.nix b/pkgs/applications/misc/inspectrum/default.nix index 6ec968ecc94..5097496d399 100644 --- a/pkgs/applications/misc/inspectrum/default.nix +++ b/pkgs/applications/misc/inspectrum/default.nix @@ -10,14 +10,13 @@ }: stdenv.mkDerivation rec { - name = "inspectrum-${version}"; - version = "20170218"; + name = "inspectrum-unstable-2017-05-31"; src = fetchFromGitHub { owner = "miek"; repo = "inspectrum"; - rev = "d8d1969a4cceeee0ebfd2f39e791fddd5155d4de"; - sha256 = "05sarfin9wqkvgwn3fil1r4bay03cwzzhjwbdjslibc5chdrr2cn"; + rev = "a89d1337efb31673ccb6a6681bb89c21894c76f7"; + sha256 = "1fvnr8gca25i6s9mg9b2hyqs0zzr4jicw13mimc9dhrgxklrr1yv"; }; buildInputs = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 51c4248ee79..77db57d110d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14532,7 +14532,7 @@ with pkgs; lcms = lcms2; }; - inspectrum = callPackage ../applications/misc/inspectrum { }; + inspectrum = libsForQt5.callPackage ../applications/misc/inspectrum { }; ion3 = callPackage ../applications/window-managers/ion-3 { lua = lua5_1; From 11236d9baaa825bad45a72ff9ee1640da4d2d95e Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Sat, 3 Jun 2017 13:49:35 +0200 Subject: [PATCH 071/117] pythonPackages.libtmux: 0.6.4 -> 0.7.3 --- .../python-modules/libtmux/default.nix | 26 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 23 +--------------- 2 files changed, 27 insertions(+), 22 deletions(-) create mode 100644 pkgs/development/python-modules/libtmux/default.nix diff --git a/pkgs/development/python-modules/libtmux/default.nix b/pkgs/development/python-modules/libtmux/default.nix new file mode 100644 index 00000000000..203b9e6bf75 --- /dev/null +++ b/pkgs/development/python-modules/libtmux/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchPypi, buildPythonPackage, pytest_29 }: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "libtmux"; + version = "0.7.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "111qbgq28za12la5b0aa9rr7hg8235zy0kyzzryn7fa6z3i5k5z8"; + }; + + buildInputs = [ pytest_29 ]; + patchPhase = '' + sed -i 's/==.*$//' requirements/test.txt + ''; + + meta = with stdenv.lib; { + description = "Scripting library for tmux"; + homepage = https://libtmux.readthedocs.io/; + license = licenses.bsd3; + platforms = platforms.linux; + maintainers = with maintainers; [ jgeerds ]; + }; +} + diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6eff8c13d7d..da72a8f1d62 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5516,28 +5516,7 @@ in { libais = callPackage ../development/python-modules/libais { }; - libtmux = buildPythonPackage rec { - name = "libtmux-${version}"; - version = "0.6.4"; - - src = pkgs.fetchurl { - url = "mirror://pypi/l/libtmux/${name}.tar.gz"; - sha256 = "0kmw7x8cxb2hj2mzibmg9nxaijhsm1kcm0vdihn99fhm5kw1phh5"; - }; - - buildInputs = with self; [ pytest_29 ]; - patchPhase = '' - sed -i 's/==.*$//' requirements/test.txt - ''; - - meta = with stdenv.lib; { - description = "Scripting library for tmux"; - homepage = https://libtmux.readthedocs.io/; - license = licenses.bsd3; - platforms = platforms.linux; - maintainers = with maintainers; [ jgeerds ]; - }; - }; + libtmux = callPackage ../development/python-modules/libtmux { }; locket = buildPythonPackage rec { name = "locket-${version}"; From f4844e91f0be2f9f36c3ece40b5623b29c6e5c6e Mon Sep 17 00:00:00 2001 From: Francois-Rene Rideau Date: Fri, 2 Jun 2017 20:26:29 -0400 Subject: [PATCH 072/117] Add fare to maintainers. --- lib/maintainers.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index db40b36fd6a..7bf7b43df65 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -178,6 +178,7 @@ exlevan = "Alexey Levan "; expipiplus1 = "Joe Hermaszewski "; fadenb = "Tristan Helmich "; + fare = "Francois-Rene Rideau "; falsifian = "James Cook "; flosse = "Markus Kohlhase "; fluffynukeit = "Daniel Austin "; From 0886c1b3213da969c9571d17a591e6359ec2507a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sat, 3 Jun 2017 13:11:55 +0100 Subject: [PATCH 073/117] wireguard: 0.0.20170517 -> 0.0.20170531 --- pkgs/os-specific/linux/wireguard/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/wireguard/default.nix b/pkgs/os-specific/linux/wireguard/default.nix index 10c84948a49..696166f3947 100644 --- a/pkgs/os-specific/linux/wireguard/default.nix +++ b/pkgs/os-specific/linux/wireguard/default.nix @@ -6,11 +6,11 @@ assert kernel != null -> stdenv.lib.versionAtLeast kernel.version "3.10"; let name = "wireguard-${version}"; - version = "0.0.20170517"; + version = "0.0.20170531"; src = fetchurl { url = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz"; - sha256 = "7303e973654a3585039f4789e89a562f807f0d6010c7787b9b69ca72aa7a6908"; + sha256 = "1k6asxx7qzmxasvdwkvlalvav643fqfbndv80vjkbjqxy6mdkdrf"; }; meta = with stdenv.lib; { From 4e32f5bda32cd580a7ec731beb381b14bbf2b528 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sat, 3 Jun 2017 09:37:36 -0400 Subject: [PATCH 074/117] docbook-xsl: Install dbtoepub --- .../data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix b/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix index a955f5cf8a4..a527765688d 100644 --- a/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix +++ b/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl }: +{ lib, stdenv, fetchurl, ruby }: let @@ -10,6 +10,8 @@ let inherit sha256; }; + buildInputs = [ ruby ]; + dontBuild = true; installPhase = '' @@ -21,6 +23,9 @@ let # Backwards compatibility. Will remove eventually. mkdir -p $out/xml/xsl ln -s $dst $out/xml/xsl/docbook + + ln -sv $dst/epub/bin $out + chmod +x $out/bin/dbtoepub ''; meta = { From ede0d138fdbb2bf93ff8ab0a09c3969c189c0d6b Mon Sep 17 00:00:00 2001 From: Volth Date: Sat, 3 Jun 2017 13:46:35 +0000 Subject: [PATCH 075/117] half: init at 1.12.0 --- pkgs/development/libraries/half/default.nix | 25 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/development/libraries/half/default.nix diff --git a/pkgs/development/libraries/half/default.nix b/pkgs/development/libraries/half/default.nix new file mode 100644 index 00000000000..d235c6cb086 --- /dev/null +++ b/pkgs/development/libraries/half/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchzip }: + +stdenv.mkDerivation rec { + version = "1.12.0"; + name = "half-${version}"; + + src = fetchzip { + url = "mirror://sourceforge/half/${version}/half-${version}.zip"; + sha256 = "0096xiw8nj86vxnn3lfcl94vk9qbi5i8lnydri9ws358ly6002vc"; + stripRoot = false; + }; + + buildCommand = '' + mkdir -p $out/include $out/share/doc + cp $src/include/half.hpp $out/include/ + cp $src/{ChangeLog,LICENSE,README}.txt $out/share/doc/ + ''; + + meta = with stdenv.lib; { + description = "C++ library for half precision floating point arithmetics"; + platforms = platforms.all; + license = licenses.mit; + maintainers = [ maintainers.volth ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index be01bc6a5a7..dcf644ac8dd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2327,6 +2327,8 @@ with pkgs; hal-flash = callPackage ../os-specific/linux/hal-flash { }; + half = callPackage ../development/libraries/half { }; + halibut = callPackage ../tools/typesetting/halibut { }; hardinfo = callPackage ../tools/system/hardinfo { }; From d0b4c5fef7bba8865ac210b7a5ad089ddc419bdb Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sat, 3 Jun 2017 10:33:56 -0400 Subject: [PATCH 076/117] Disable travis email notifications. Travis checks on nixpkgs are a waste of time, if people insist on keeping them they can at least not spam our inboxes --- .travis.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2bd784ed30a..a83e0c5c495 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,8 +24,3 @@ matrix: env: global: - GITHUB_TOKEN=5edaaf1017f691ed34e7f80878f8f5fbd071603f - -notifications: - email: - on_success: never - on_failure: change From bdb106860a03e9f201dcbd1b6610d351bf454305 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sat, 3 Jun 2017 12:13:29 -0400 Subject: [PATCH 077/117] Actually disable travis emails --- .travis.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.travis.yml b/.travis.yml index a83e0c5c495..8ecd12642a7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,3 +24,6 @@ matrix: env: global: - GITHUB_TOKEN=5edaaf1017f691ed34e7f80878f8f5fbd071603f + +notifications: + email: false From 2bbced71ebb55e14a4105849fb6dd2b53f3fc366 Mon Sep 17 00:00:00 2001 From: mimadrid Date: Sat, 3 Jun 2017 19:52:20 +0200 Subject: [PATCH 078/117] skypeforlinux: 5.2.0.1 -> 5.3.0.1 --- .../instant-messengers/skypeforlinux/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix index aa89e802cb2..9bad366b8ef 100644 --- a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix +++ b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix @@ -4,7 +4,7 @@ let - version = "5.2.0.1"; + version = "5.3.0.1"; rpath = stdenv.lib.makeLibraryPath [ alsaLib @@ -24,7 +24,7 @@ let gnome2.pango gnome2.gnome_keyring - + libnotify nspr nss @@ -49,8 +49,8 @@ let src = if stdenv.system == "x86_64-linux" then fetchurl { - url = "https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_5.2.0.1_amd64.deb"; - sha256 = "1dwyj5wm2amkysbnzxsskq6sl7rbqggm6n4sabnq7wd5xnbq4i06"; + url = "https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb"; + sha256 = "08sf9nqnznsydw4965w7ixwwba54hjc02ga7vcnz9vpx5hln3nrz"; } else throw "Skype for linux is not supported on ${stdenv.system}"; From 5b3c1e8a78d438ce13824b506ae3f4670ad2f50d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Luis=20Lafuente?= Date: Sat, 3 Jun 2017 20:32:14 +0200 Subject: [PATCH 079/117] pgcli: 1.5.1 -> 1.6.0 --- pkgs/development/tools/database/pgcli/default.nix | 7 ++++--- pkgs/top-level/python-packages.nix | 5 +++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/database/pgcli/default.nix b/pkgs/development/tools/database/pgcli/default.nix index 2b278e0416f..bcb0cf1d5e4 100644 --- a/pkgs/development/tools/database/pgcli/default.nix +++ b/pkgs/development/tools/database/pgcli/default.nix @@ -2,10 +2,10 @@ pythonPackages.buildPythonApplication rec { name = "pgcli-${version}"; - version = "1.5.1"; + version = "1.6.0"; src = fetchFromGitHub { - sha256 = "1wp8pzi9hwz16fpcr0mq3ffydwdscfg5whhzc91757dw995sgl0s"; + sha256 = "0f1zv4kwi2991pclf8chrhgjwf8jkqxdh5ndc9qx6igh56iyyncz"; rev = "v${version}"; repo = "pgcli"; owner = "dbcli"; @@ -13,7 +13,8 @@ pythonPackages.buildPythonApplication rec { buildInputs = with pythonPackages; [ pytest mock ]; checkPhase = '' - py.test tests -k 'not test_missing_rc_dir and not test_quoted_db_uri and not test_port_db_uri' + mkdir /tmp/homeless-shelter + HOME=/tmp/homeless-shelter py.test tests -k 'not test_missing_rc_dir and not test_quoted_db_uri and not test_port_db_uri' ''; propagatedBuildInputs = with pythonPackages; [ diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4e292dbcb0c..1c7ef881804 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -17679,17 +17679,18 @@ in { pgspecial = buildPythonPackage rec { pname = "pgspecial"; - version = "1.7.0"; + version = "1.8.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "0jnv8mr75pjhj2azb2ljhhkd7s1b0b59f7xps322kqbpmwf26zi9"; + sha256 = "1dwlv3m4jl34zsakmvxg6hgbfv786jl8dcffxsrlnmcpks829xc9"; }; buildInputs = with self; [ pytest psycopg2 ]; checkPhase = '' + find tests -name \*.pyc -delete py.test tests ''; From a604f14184db07fc502b87538d200d87f98c5fd8 Mon Sep 17 00:00:00 2001 From: mimadrid Date: Sat, 3 Jun 2017 20:47:09 +0200 Subject: [PATCH 080/117] sqlite3_analyzer: 3.17.0 -> 3.19.2 --- pkgs/development/libraries/sqlite/sqlite3_analyzer.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/sqlite/sqlite3_analyzer.nix b/pkgs/development/libraries/sqlite/sqlite3_analyzer.nix index d450cd21aec..e5fffc076f7 100644 --- a/pkgs/development/libraries/sqlite/sqlite3_analyzer.nix +++ b/pkgs/development/libraries/sqlite/sqlite3_analyzer.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl, unzip, tcl }: stdenv.mkDerivation { - name = "sqlite3_analyzer-3.17.0"; + name = "sqlite3_analyzer-3.19.2"; src = fetchurl { - url = "https://www.sqlite.org/2017/sqlite-src-3170000.zip"; - sha256 = "1hs8nzk2pjr4fhhrwcyqwpa24gd4ndp6f0japykg5wfadgp4nxc6"; + url = "https://www.sqlite.org/2017/sqlite-src-3190200.zip"; + sha256 = "1hdbs41mdyyy641gix87pllsd29p8dim7gj4qvmiyfra2q5kg749"; }; nativeBuildInputs = [ unzip ]; From 7567c5c1ee4afde01d798c8419b8a7f89ed081d8 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Sat, 3 Jun 2017 20:45:51 +0200 Subject: [PATCH 081/117] fetchgit: add postFetch argument --- pkgs/build-support/fetchgit/builder.sh | 1 + pkgs/build-support/fetchgit/default.nix | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/build-support/fetchgit/builder.sh b/pkgs/build-support/fetchgit/builder.sh index 4bbef1d6e62..6ae46469738 100644 --- a/pkgs/build-support/fetchgit/builder.sh +++ b/pkgs/build-support/fetchgit/builder.sh @@ -12,4 +12,5 @@ $SHELL $fetcher --builder --url "$url" --out "$out" --rev "$rev" \ ${fetchSubmodules:+--fetch-submodules} \ ${branchName:+--branch-name "$branchName"} +runHook postFetch stopNest diff --git a/pkgs/build-support/fetchgit/default.nix b/pkgs/build-support/fetchgit/default.nix index d85d2c893c5..a5f81ef1794 100644 --- a/pkgs/build-support/fetchgit/default.nix +++ b/pkgs/build-support/fetchgit/default.nix @@ -15,6 +15,9 @@ in , fetchSubmodules ? true, deepClone ? false , branchName ? null , name ? urlToName url rev +, # Shell code executed after the file has been fetched + # successfully. This can do things like check or transform the file. + postFetch ? "" }: /* NOTE: @@ -54,7 +57,7 @@ stdenv.mkDerivation { outputHashMode = "recursive"; outputHash = sha256; - inherit url rev leaveDotGit fetchSubmodules deepClone branchName; + inherit url rev leaveDotGit fetchSubmodules deepClone branchName postFetch; GIT_SSL_CAINFO = "${cacert}/etc/ssl/certs/ca-bundle.crt"; From 045515a54a25a30e98b4c1f8f7945473930be2dc Mon Sep 17 00:00:00 2001 From: Mateusz Kowalczyk Date: Sat, 3 Jun 2017 19:57:35 +0100 Subject: [PATCH 082/117] jenkins: 2.62 -> 2.63 --- .../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 2c1a8135012..db7002d163e 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 = "2.62"; + version = "2.63"; src = fetchurl { url = "http://mirrors.jenkins-ci.org/war/${version}/jenkins.war"; - sha256 = "1dqmvbl5sa82zsc03ns5i7ppjmdlg3pyk676xjxyr0p5ccbqlxxh"; + sha256 = "024bzbca2ikk3904df4f8ri37qjq7nzzmg58jax8cbvcbxcik699"; }; buildCommand = '' From a81f45386b21b3c430f94c2ad5c5e1f7c58cbef2 Mon Sep 17 00:00:00 2001 From: Joe Hermaszewski Date: Sat, 3 Jun 2017 20:35:37 +0100 Subject: [PATCH 083/117] fetchdarcs: Use NIX_SSL_CERT_FILE MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit `SSL_CERT_FILE` has been replaced with `NIX_SSL_CERT_FILE`. Before this change using `fetchdarcs` resulted in an error message like: ``` Identifying repository http://hub.darcs.net/scravy/easyplot inventory darcs failed: Not a repository: http://hub.darcs.net/scravy/easyplot (Peer certificate cannot be authenticated with given CA certificates) HINT: Do you have the right URI for the repository? builder for ‘/nix/store/imyvcs6lvb5yva66krc5wk39931sam8v-fetchdarcs.drv’ failed with exit code 2 ``` --- pkgs/build-support/fetchdarcs/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/fetchdarcs/default.nix b/pkgs/build-support/fetchdarcs/default.nix index c28cc35219c..2df1b136c55 100644 --- a/pkgs/build-support/fetchdarcs/default.nix +++ b/pkgs/build-support/fetchdarcs/default.nix @@ -7,7 +7,7 @@ if md5 != "" then else stdenv.mkDerivation { name = "fetchdarcs"; - SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt"; + NIX_SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt"; builder = ./builder.sh; buildInputs = [darcs]; From 62653064a0dee52810bc6c5b1d68dc55368d7115 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sat, 3 Jun 2017 22:50:33 +0200 Subject: [PATCH 084/117] gollum: 4.0.1 -> 4.1.1 --- pkgs/applications/misc/gollum/Gemfile.lock | 57 ++-- pkgs/applications/misc/gollum/default.nix | 13 +- pkgs/applications/misc/gollum/gemset.nix | 340 +++++++++++---------- 3 files changed, 218 insertions(+), 192 deletions(-) diff --git a/pkgs/applications/misc/gollum/Gemfile.lock b/pkgs/applications/misc/gollum/Gemfile.lock index 074a0c6fa43..4322b408843 100644 --- a/pkgs/applications/misc/gollum/Gemfile.lock +++ b/pkgs/applications/misc/gollum/Gemfile.lock @@ -2,48 +2,53 @@ GEM remote: https://rubygems.org/ specs: charlock_holmes (0.7.3) - diff-lcs (1.2.5) - github-markup (1.3.3) - gitlab-grit (2.7.3) + diff-lcs (1.3) + gemojione (3.2.0) + json + github-markup (1.6.0) + gitlab-grit (2.8.1) charlock_holmes (~> 0.6) diff-lcs (~> 1.1) - mime-types (~> 1.15) + mime-types (>= 1.16, < 3) posix-spawn (~> 0.3) - gollum (4.0.1) + gollum (4.1.1) + gemojione (~> 3.2) gollum-lib (~> 4.0, >= 4.0.1) - kramdown (~> 1.8.0) + kramdown (~> 1.9.0) mustache (>= 0.99.5, < 1.0.0) sinatra (~> 1.4, >= 1.4.4) - useragent (~> 0.14.0) - gollum-grit_adapter (1.0.0) + useragent (~> 0.16.2) + gollum-grit_adapter (1.0.1) gitlab-grit (~> 2.7, >= 2.7.1) - gollum-lib (4.1.0) - github-markup (~> 1.3.3) + gollum-lib (4.2.5) + gemojione (~> 3.2) + github-markup (~> 1.6) gollum-grit_adapter (~> 1.0) nokogiri (~> 1.6.4) - rouge (~> 1.9) - sanitize (~> 2.1.0) - stringex (~> 2.5.1) - kramdown (1.8.0) - mime-types (1.25.1) - mini_portile2 (2.0.0) + rouge (~> 2.0) + sanitize (~> 2.1) + stringex (~> 2.6) + json (2.1.0) + kramdown (1.9.0) + mime-types (2.99.3) + mini_portile2 (2.1.0) mustache (0.99.8) - nokogiri (1.6.7.2) - mini_portile2 (~> 2.0.0.rc2) - posix-spawn (0.3.11) - rack (1.6.4) + nokogiri (1.6.8.1) + mini_portile2 (~> 2.1.0) + posix-spawn (0.3.13) + rack (1.6.8) rack-protection (1.5.3) rack - rouge (1.10.1) + rouge (2.0.7) sanitize (2.1.0) nokogiri (>= 1.4.4) - sinatra (1.4.7) + sinatra (1.4.8) rack (~> 1.5) rack-protection (~> 1.4) tilt (>= 1.3, < 3) - stringex (2.5.2) - tilt (2.0.2) - useragent (0.14.0) + stringex (2.7.1) + tilt (2.0.7) + useragent (0.16.8) PLATFORMS ruby @@ -52,4 +57,4 @@ DEPENDENCIES gollum BUNDLED WITH - 1.10.6 + 1.15.0 diff --git a/pkgs/applications/misc/gollum/default.nix b/pkgs/applications/misc/gollum/default.nix index 1f3cc9e27c0..db401a2dbdc 100644 --- a/pkgs/applications/misc/gollum/default.nix +++ b/pkgs/applications/misc/gollum/default.nix @@ -1,16 +1,21 @@ -{ stdenv, lib, bundlerEnv, ruby_2_2, icu, zlib }: +{ stdenv, lib, bundlerEnv, ruby +, icu, zlib }: bundlerEnv rec { name = "gollum-${version}"; - version = "4.0.1"; + version = (import gemset).gollum.version; - ruby = ruby_2_2; + inherit ruby; gemdir = ./.; + gemset = ./gemset.nix; + + # FIXME: Add Git as runtime dependency. meta = with lib; { description = "A simple, Git-powered wiki"; + homepage = "https://github.com/gollum/gollum"; license = licenses.mit; - maintainers = with maintainers; [ jgillich ]; + maintainers = with maintainers; [ jgillich primeos ]; platforms = platforms.unix; }; } diff --git a/pkgs/applications/misc/gollum/gemset.nix b/pkgs/applications/misc/gollum/gemset.nix index f0c71fa455c..2ad724b2bc7 100644 --- a/pkgs/applications/misc/gollum/gemset.nix +++ b/pkgs/applications/misc/gollum/gemset.nix @@ -1,170 +1,186 @@ { - useragent = { - version = "0.14.0"; - source = { - type = "gem"; - remotes = ["https://rubygems.org"]; - sha256 = "124r3mgkw1zjymsqq9r25zh1vwjrjgiji5fm620z53lpmmryj22j"; - }; - }; - tilt = { - version = "2.0.2"; - source = { - type = "gem"; - remotes = ["https://rubygems.org"]; - sha256 = "0lkd40xfdqkp333vdfhrfjmi2y7k2hjs4azawfb62mrkfp7ivj84"; - }; - }; - stringex = { - version = "2.5.2"; - source = { - type = "gem"; - remotes = ["https://rubygems.org"]; - sha256 = "150adm7rfh6r9b5ra6vk75mswf9m3wwyslcf8f235a08m29fxa17"; - }; - }; - sinatra = { - version = "1.4.7"; - source = { - type = "gem"; - remotes = ["https://rubygems.org"]; - sha256 = "1b81kbr65mmcl9cdq2r6yc16wklyp798rxkgmm5pr9fvsj7jwmxp"; - }; - }; - sanitize = { - version = "2.1.0"; - source = { - type = "gem"; - remotes = ["https://rubygems.org"]; - sha256 = "0xsv6xqrlz91rd8wifjknadbl3z5h6qphmxy0hjb189qbdghggn3"; - }; - }; - rouge = { - version = "1.10.1"; - source = { - type = "gem"; - remotes = ["https://rubygems.org"]; - sha256 = "0wp8as9ypdy18kdj9h70kny1rdfq71mr8cj2bpahr9vxjjvjasqz"; - }; - }; - rack-protection = { - version = "1.5.3"; - source = { - type = "gem"; - remotes = ["https://rubygems.org"]; - sha256 = "0cvb21zz7p9wy23wdav63z5qzfn4nialik22yqp6gihkgfqqrh5r"; - }; - }; - rack = { - version = "1.6.4"; - source = { - type = "gem"; - remotes = ["https://rubygems.org"]; - sha256 = "09bs295yq6csjnkzj7ncj50i6chfxrhmzg1pk6p0vd2lb9ac8pj5"; - }; - }; - posix-spawn = { - version = "0.3.11"; - source = { - type = "gem"; - remotes = ["https://rubygems.org"]; - sha256 = "052lnxbkvlnwfjw4qd7vn2xrlaaqiav6f5x5bcjin97bsrfq6cmr"; - }; - }; - nokogiri = { - version = "1.6.7.2"; - source = { - type = "gem"; - remotes = ["https://rubygems.org"]; - sha256 = "11sbmpy60ynak6s3794q32lc99hs448msjy8rkp84ay7mq7zqspv"; - }; - }; - mustache = { - version = "0.99.8"; - source = { - type = "gem"; - remotes = ["https://rubygems.org"]; - sha256 = "1g5hplm0k06vwxwqzwn1mq5bd02yp0h3rym4zwzw26aqi7drcsl2"; - }; - }; - mini_portile2 = { - version = "2.0.0"; - source = { - type = "gem"; - remotes = ["https://rubygems.org"]; - sha256 = "056drbn5m4khdxly1asmiik14nyllswr6sh3wallvsywwdiryz8l"; - }; - }; - mime-types = { - version = "1.25.1"; - source = { - type = "gem"; - remotes = ["https://rubygems.org"]; - sha256 = "0mhzsanmnzdshaba7gmsjwnv168r1yj8y0flzw88frw1cickrvw8"; - }; - }; - kramdown = { - version = "1.8.0"; - source = { - type = "gem"; - remotes = ["https://rubygems.org"]; - sha256 = "0ryqq055h5n10c1cfba6pxsssa907l2hkw29anp0d41ryh47ca2l"; - }; - }; - gollum-lib = { - version = "4.1.0"; - source = { - type = "gem"; - remotes = ["https://rubygems.org"]; - sha256 = "01s8pgzhc3cgcmsy6hh79wrcbn5vbadniq2a7d4qw87kpq7mzfdm"; - }; - }; - gollum-grit_adapter = { - version = "1.0.0"; - source = { - type = "gem"; - remotes = ["https://rubygems.org"]; - sha256 = "02c5qfq0s0kx2ifnpbnbgz6258fl7rchzzzc7vpx72shi8gbpac7"; - }; - }; - gollum = { - version = "4.0.1"; - source = { - type = "gem"; - remotes = ["https://rubygems.org"]; - sha256 = "02pgx083sns75zgnqx94p5h5bpr7cfiw5mys4ayb4k33hcjm6ydg"; - }; - }; - gitlab-grit = { - version = "2.7.3"; - source = { - type = "gem"; - remotes = ["https://rubygems.org"]; - sha256 = "0nv8shx7w7fww8lf5a2rbvf7bq173rllm381m6x7g1i0qqc68q1b"; - }; - }; - github-markup = { - version = "1.3.3"; - source = { - type = "gem"; - remotes = ["https://rubygems.org"]; - sha256 = "01r901wcgn0gs0n9h684gs5n90y1vaj9lxnx4z5ig611jwa43ivq"; - }; - }; - diff-lcs = { - version = "1.2.5"; - source = { - type = "gem"; - remotes = ["https://rubygems.org"]; - sha256 = "1vf9civd41bnqi6brr5d9jifdw73j9khc6fkhfl1f8r9cpkdvlx1"; - }; - }; charlock_holmes = { - version = "0.7.3"; source = { - type = "gem"; remotes = ["https://rubygems.org"]; sha256 = "0jsl6k27wjmssxbwv9wpf7hgp9r0nvizcf6qpjnr7qs2nia53lf7"; + type = "gem"; }; + version = "0.7.3"; + }; + diff-lcs = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "18w22bjz424gzafv6nzv98h0aqkwz3d9xhm7cbr1wfbyas8zayza"; + type = "gem"; + }; + version = "1.3"; + }; + gemojione = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0svj3hsmwyr306vg75cd7p9i4bwnajrda60n2vhiav2cvhnkawik"; + type = "gem"; + }; + version = "3.2.0"; + }; + github-markup = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1g538d7kcj2iw4d9ll8266d8n526hz2fbx7zlx8z7gxg1gzwiki9"; + type = "gem"; + }; + version = "1.6.0"; + }; + gitlab-grit = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0lf1cr6pzqrbnxiiwym6q74b1a2ihdi91dynajk8hi1p093hl66n"; + type = "gem"; + }; + version = "2.8.1"; + }; + gollum = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0jrafhy8p9pgvya0gj2g6knrpg58g65s7j9bcyfj6fp4n2dz2w7s"; + type = "gem"; + }; + version = "4.1.1"; + }; + gollum-grit_adapter = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0fcibm63v1afc0fj5rki0mm51m7nndil4cjcjjvkh3yigfn4nr4b"; + type = "gem"; + }; + version = "1.0.1"; + }; + gollum-lib = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0399lfqv3hbpr7v14p9snyimva440d2mb8y7xm2zlgwv7l0n9z0z"; + type = "gem"; + }; + version = "4.2.5"; + }; + json = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "01v6jjpvh3gnq6sgllpfqahlgxzj50ailwhj9b3cd20hi2dx0vxp"; + type = "gem"; + }; + version = "2.1.0"; + }; + kramdown = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "12sral2xli39mnr4b9m2sxdlgam4ni0a1mkxawc5311z107zj3p0"; + type = "gem"; + }; + version = "1.9.0"; + }; + mime-types = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "03j98xr0qw2p2jkclpmk7pm29yvmmh0073d8d43ajmr0h3w7i5l9"; + type = "gem"; + }; + version = "2.99.3"; + }; + mini_portile2 = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1y25adxb1hgg1wb2rn20g3vl07qziq6fz364jc5694611zz863hb"; + type = "gem"; + }; + version = "2.1.0"; + }; + mustache = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1g5hplm0k06vwxwqzwn1mq5bd02yp0h3rym4zwzw26aqi7drcsl2"; + type = "gem"; + }; + version = "0.99.8"; + }; + nokogiri = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "045xdg0w7nnsr2f2gb7v7bgx53xbc9dxf0jwzmh2pr3jyrzlm0cj"; + type = "gem"; + }; + version = "1.6.8.1"; + }; + posix-spawn = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1pmxmpins57qrbr31bs3bm7gidhaacmrp4md6i962gvpq4gyfcjw"; + type = "gem"; + }; + version = "0.3.13"; + }; + rack = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "19m7aixb2ri7p1n0iqaqx8ldi97xdhvbxijbyrrcdcl6fv5prqza"; + type = "gem"; + }; + version = "1.6.8"; + }; + rack-protection = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0cvb21zz7p9wy23wdav63z5qzfn4nialik22yqp6gihkgfqqrh5r"; + type = "gem"; + }; + version = "1.5.3"; + }; + rouge = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0sfikq1q8xyqqx690iiz7ybhzx87am4w50w8f2nq36l3asw4x89d"; + type = "gem"; + }; + version = "2.0.7"; + }; + sanitize = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0xsv6xqrlz91rd8wifjknadbl3z5h6qphmxy0hjb189qbdghggn3"; + type = "gem"; + }; + version = "2.1.0"; + }; + sinatra = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0byxzl7rx3ki0xd7aiv1x8mbah7hzd8f81l65nq8857kmgzj1jqq"; + type = "gem"; + }; + version = "1.4.8"; + }; + stringex = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1zc93v00av643lc6njl09wwki7h5yqayhh1din8zqfylw814l1dv"; + type = "gem"; + }; + version = "2.7.1"; + }; + tilt = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1is1ayw5049z8pd7slsk870bddyy5g2imp4z78lnvl8qsl8l0s7b"; + type = "gem"; + }; + version = "2.0.7"; + }; + useragent = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1139cjqyv1hk1qcw89k81ajjkqyakqgbcyvmfrsmjqi8yn9kgqhq"; + type = "gem"; + }; + version = "0.16.8"; }; } \ No newline at end of file From 0dc54737306051cf8649394b96f5e9513616fa8b Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Fri, 26 May 2017 03:47:08 +0300 Subject: [PATCH 085/117] gcc7: init at 7.1.0 --- pkgs/development/compilers/gcc/7/default.nix | 551 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 15 + 2 files changed, 566 insertions(+) create mode 100644 pkgs/development/compilers/gcc/7/default.nix diff --git a/pkgs/development/compilers/gcc/7/default.nix b/pkgs/development/compilers/gcc/7/default.nix new file mode 100644 index 00000000000..a14fc0ce246 --- /dev/null +++ b/pkgs/development/compilers/gcc/7/default.nix @@ -0,0 +1,551 @@ +{ stdenv, fetchurl, noSysDirs +, langC ? true, langCC ? true, langFortran ? false +, langObjC ? stdenv.isDarwin +, langObjCpp ? stdenv.isDarwin +, langJava ? false +, langAda ? false +, langVhdl ? false +, langGo ? false +, profiledCompiler ? false +, staticCompiler ? false +, enableShared ? true +, texinfo ? null +, perl ? null # optional, for texi2pod (then pod2man); required for Java +, gmp, mpfr, libmpc, gettext, which +, libelf # optional, for link-time optimizations (LTO) +, isl ? null # optional, for the Graphite optimization framework. +, zlib ? null, boehmgc ? null +, zip ? null, unzip ? null, pkgconfig ? null +, gtk2 ? null, libart_lgpl ? null +, libX11 ? null, libXt ? null, libSM ? null, libICE ? null, libXtst ? null +, libXrender ? null, xproto ? null, renderproto ? null, xextproto ? null +, libXrandr ? null, libXi ? null, inputproto ? null, randrproto ? null +, x11Support ? langJava +, gnatboot ? null +, enableMultilib ? false +, enablePlugin ? true # whether to support user-supplied plug-ins +, name ? "gcc" +, cross ? null +, libcCross ? null +, crossStageStatic ? true +, gnat ? null +, libpthread ? null, libpthreadCross ? null # required for GNU/Hurd +, stripped ? true +, gnused ? null +, binutils ? null +, cloog # unused; just for compat with gcc4, as we override the parameter on some places +, darwin ? null +, flex ? null +, buildPlatform, hostPlatform, targetPlatform +}: + +assert langJava -> zip != null && unzip != null + && zlib != null && boehmgc != null + && perl != null; # for `--enable-java-home' +assert langAda -> gnatboot != null; +assert langVhdl -> gnat != null; + +# LTO needs libelf and zlib. +assert libelf != null -> zlib != null; + +# Make sure we get GNU sed. +assert stdenv.isDarwin -> gnused != null; + +# Need c++filt on darwin +assert stdenv.isDarwin -> binutils != null; + +# The go frontend is written in c++ +assert langGo -> langCC; + +with stdenv.lib; +with builtins; + +let version = "7.1.0"; + + # Whether building a cross-compiler for GNU/Hurd. + crossGNU = cross != null && cross.config == "i586-pc-gnu"; + + enableParallelBuilding = true; + + patches = + [ ] + ++ optional (cross != null) ../libstdc++-target.patch + ++ optional noSysDirs ../no-sys-dirs.patch + # The GNAT Makefiles did not pay attention to CFLAGS_FOR_TARGET for its + # target libraries and tools. + ++ optional langAda ../gnat-cflags.patch + ++ optional langFortran ../gfortran-driving.patch; + + javaEcj = fetchurl { + # The `$(top_srcdir)/ecj.jar' file is automatically picked up at + # `configure' time. + + # XXX: Eventually we might want to take it from upstream. + url = "ftp://sourceware.org/pub/java/ecj-4.3.jar"; + sha256 = "0jz7hvc0s6iydmhgh5h2m15yza7p2rlss2vkif30vm9y77m97qcx"; + }; + + # Antlr (optional) allows the Java `gjdoc' tool to be built. We want a + # binary distribution here to allow the whole chain to be bootstrapped. + javaAntlr = fetchurl { + url = http://www.antlr.org/download/antlr-4.4-complete.jar; + sha256 = "02lda2imivsvsis8rnzmbrbp8rh1kb8vmq4i67pqhkwz7lf8y6dz"; + }; + + xlibs = [ + libX11 libXt libSM libICE libXtst libXrender libXrandr libXi + xproto renderproto xextproto inputproto randrproto + ]; + + javaAwtGtk = langJava && x11Support; + + /* Platform flags */ + platformFlags = let + gccArch = stdenv.platform.gcc.arch or null; + gccCpu = stdenv.platform.gcc.cpu or null; + gccAbi = stdenv.platform.gcc.abi or null; + gccFpu = stdenv.platform.gcc.fpu or null; + gccFloat = stdenv.platform.gcc.float or null; + gccMode = stdenv.platform.gcc.mode or null; + withArch = if gccArch != null then " --with-arch=${gccArch}" else ""; + withCpu = if gccCpu != null then " --with-cpu=${gccCpu}" else ""; + withAbi = if gccAbi != null then " --with-abi=${gccAbi}" else ""; + withFpu = if gccFpu != null then " --with-fpu=${gccFpu}" else ""; + withFloat = if gccFloat != null then " --with-float=${gccFloat}" else ""; + withMode = if gccMode != null then " --with-mode=${gccMode}" else ""; + in + withArch + + withCpu + + withAbi + + withFpu + + withFloat + + withMode; + + /* Cross-gcc settings */ + crossMingw = cross != null && cross.libc == "msvcrt"; + crossDarwin = cross != null && cross.libc == "libSystem"; + crossConfigureFlags = let + gccArch = targetPlatform.gcc.arch or null; + gccCpu = targetPlatform.gcc.cpu or null; + gccAbi = targetPlatform.gcc.abi or null; + gccFpu = targetPlatform.gcc.fpu or null; + gccFloat = targetPlatform.gcc.float or null; + gccMode = targetPlatform.gcc.mode or null; + withArch = if gccArch != null then " --with-arch=${gccArch}" else ""; + withCpu = if gccCpu != null then " --with-cpu=${gccCpu}" else ""; + withAbi = if gccAbi != null then " --with-abi=${gccAbi}" else ""; + withFpu = if gccFpu != null then " --with-fpu=${gccFpu}" else ""; + withFloat = if gccFloat != null then " --with-float=${gccFloat}" else ""; + withMode = if gccMode != null then " --with-mode=${gccMode}" else ""; + in + "--target=${cross.config}" + + withArch + + withCpu + + withAbi + + withFpu + + withFloat + + withMode + + # Ensure that -print-prog-name is able to find the correct programs. + " --with-as=${binutils}/bin/${cross.config}-as" + + " --with-ld=${binutils}/bin/${cross.config}-ld" + + (if crossMingw && crossStageStatic then + " --with-headers=${libcCross}/include" + + " --with-gcc" + + " --with-gnu-as" + + " --with-gnu-ld" + + " --with-gnu-ld" + + " --disable-shared" + + " --disable-nls" + + " --disable-debug" + + " --enable-sjlj-exceptions" + + " --enable-threads=win32" + + " --disable-win32-registry" + else if crossStageStatic then + " --disable-libssp --disable-nls" + + " --without-headers" + + " --disable-threads " + + " --disable-libgomp " + + " --disable-libquadmath" + + " --disable-shared" + + " --disable-libatomic " + # libatomic requires libc + " --disable-decimal-float" # libdecnumber requires libc + else + (if crossDarwin then " --with-sysroot=${getLib libcCross}/share/sysroot" + else " --with-headers=${getDev libcCross}/include") + + # Ensure that -print-prog-name is able to find the correct programs. + " --enable-__cxa_atexit" + + " --enable-long-long" + + (if crossMingw then + " --enable-threads=win32" + + " --enable-sjlj-exceptions" + + " --enable-hash-synchronization" + + " --disable-libssp" + + " --disable-nls" + + " --with-dwarf2" + + # I think noone uses shared gcc libs in mingw, so we better do the same. + # In any case, mingw32 g++ linking is broken by default with shared libs, + # unless adding "-lsupc++" to any linking command. I don't know why. + " --disable-shared" + + # To keep ABI compatibility with upstream mingw-w64 + " --enable-fully-dynamic-string" + else (if cross.libc == "uclibc" then + # libsanitizer requires netrom/netrom.h which is not + # available in uclibc. + " --disable-libsanitizer" + + # In uclibc cases, libgomp needs an additional '-ldl' + # and as I don't know how to pass it, I disable libgomp. + " --disable-libgomp" else "") + + " --enable-threads=posix" + + " --enable-nls" + + " --disable-decimal-float") # No final libdecnumber (it may work only in 386) + ); + stageNameAddon = if crossStageStatic then "-stage-static" else "-stage-final"; + crossNameAddon = if cross != null then "-${cross.config}" + stageNameAddon else ""; + + bootstrap = cross == null; + +in + +# We need all these X libraries when building AWT with GTK+. +assert x11Support -> (filter (x: x == null) ([ gtk2 libart_lgpl ] ++ xlibs)) == []; + +stdenv.mkDerivation ({ + name = "${name}${if stripped then "" else "-debug"}-${version}" + crossNameAddon; + + builder = ../builder.sh; + + src = fetchurl { + url = "mirror://gcc/releases/gcc-${version}/gcc-${version}.tar.bz2"; + sha256 = "05xwps0ci7wgxh50askpa2r9p8518qxdgh6ad7pnyk7n6p13d0ca"; + }; + + inherit patches; + + outputs = [ "out" "lib" "man" "info" ]; + setOutputFlags = false; + NIX_NO_SELF_RPATH = true; + + libc_dev = stdenv.cc.libc_dev; + + hardeningDisable = [ "format" ]; + + postPatch = + if (stdenv.isHurd + || (libcCross != null # e.g., building `gcc.crossDrv' + && libcCross ? crossConfig + && libcCross.crossConfig == "i586-pc-gnu") + || (crossGNU && libcCross != null)) + then + # On GNU/Hurd glibc refers to Hurd & Mach headers and libpthread is not + # in glibc, so add the right `-I' flags to the default spec string. + assert libcCross != null -> libpthreadCross != null; + let + libc = if libcCross != null then libcCross else stdenv.glibc; + gnu_h = "gcc/config/gnu.h"; + extraCPPDeps = + libc.propagatedBuildInputs + ++ stdenv.lib.optional (libpthreadCross != null) libpthreadCross + ++ stdenv.lib.optional (libpthread != null) libpthread; + extraCPPSpec = + concatStrings (intersperse " " + (map (x: "-I${x.dev or x}/include") extraCPPDeps)); + extraLibSpec = + if libpthreadCross != null + then "-L${libpthreadCross}/lib ${libpthreadCross.TARGET_LDFLAGS}" + else "-L${libpthread}/lib"; + in + '' echo "augmenting \`CPP_SPEC' in \`${gnu_h}' with \`${extraCPPSpec}'..." + sed -i "${gnu_h}" \ + -es'|CPP_SPEC *"\(.*\)$|CPP_SPEC "${extraCPPSpec} \1|g' + + echo "augmenting \`LIB_SPEC' in \`${gnu_h}' with \`${extraLibSpec}'..." + sed -i "${gnu_h}" \ + -es'|LIB_SPEC *"\(.*\)$|LIB_SPEC "${extraLibSpec} \1|g' + + echo "setting \`NATIVE_SYSTEM_HEADER_DIR' and \`STANDARD_INCLUDE_DIR' to \`${libc.dev}/include'..." + sed -i "${gnu_h}" \ + -es'|#define STANDARD_INCLUDE_DIR.*$|#define STANDARD_INCLUDE_DIR "${libc.dev}/include"|g' + '' + else if cross != null || stdenv.cc.libc != null then + # On NixOS, use the right path to the dynamic linker instead of + # `/lib/ld*.so'. + let + libc = if libcCross != null then libcCross else stdenv.cc.libc; + in + '' echo "fixing the \`GLIBC_DYNAMIC_LINKER' and \`UCLIBC_DYNAMIC_LINKER' macros..." + for header in "gcc/config/"*-gnu.h "gcc/config/"*"/"*.h + do + grep -q LIBC_DYNAMIC_LINKER "$header" || continue + echo " fixing \`$header'..." + sed -i "$header" \ + -e 's|define[[:blank:]]*\([UCG]\+\)LIBC_DYNAMIC_LINKER\([0-9]*\)[[:blank:]]"\([^\"]\+\)"$|define \1LIBC_DYNAMIC_LINKER\2 "${libc.out}\3"|g' + done + '' + else null; + + inherit noSysDirs staticCompiler langJava crossStageStatic + libcCross crossMingw; + + nativeBuildInputs = [ texinfo which gettext ] + ++ (optional (perl != null) perl) + ++ (optional javaAwtGtk pkgconfig); + + buildInputs = [ gmp mpfr libmpc libelf flex ] + ++ (optional (isl != null) isl) + ++ (optional (zlib != null) zlib) + ++ (optionals langJava [ boehmgc zip unzip ]) + ++ (optionals javaAwtGtk ([ gtk2 libart_lgpl ] ++ xlibs)) + ++ (optionals (cross != null) [binutils]) + ++ (optionals langAda [gnatboot]) + ++ (optionals langVhdl [gnat]) + + # The builder relies on GNU sed (for instance, Darwin's `sed' fails with + # "-i may not be used with stdin"), and `stdenvNative' doesn't provide it. + ++ (optional stdenv.isDarwin gnused) + ++ (optional stdenv.isDarwin binutils) + ; + + NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isSunOS "-lm -ldl"; + + preConfigure = stdenv.lib.optionalString (stdenv.isSunOS && stdenv.is64bit) '' + export NIX_LDFLAGS=`echo $NIX_LDFLAGS | sed -e s~$prefix/lib~$prefix/lib/amd64~g` + export LDFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $LDFLAGS_FOR_TARGET" + export CXXFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $CXXFLAGS_FOR_TARGET" + export CFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $CFLAGS_FOR_TARGET" + ''; + + dontDisableStatic = true; + + configureFlags = " + ${if stdenv.isSunOS then + " --enable-long-long --enable-libssp --enable-threads=posix --disable-nls --enable-__cxa_atexit " + + # On Illumos/Solaris GNU as is preferred + " --with-gnu-as --without-gnu-ld " + else ""} + --enable-lto + ${if enableMultilib then "--enable-multilib --disable-libquadmath" else "--disable-multilib"} + ${if enableShared then "" else "--disable-shared"} + ${if enablePlugin then "--enable-plugin" else "--disable-plugin"} + ${optionalString (isl != null) "--with-isl=${isl}"} + ${if langJava then + "--with-ecj-jar=${javaEcj} " + + + # Follow Sun's layout for the convenience of IcedTea/OpenJDK. See + # . + "--enable-java-home --with-java-home=\${prefix}/lib/jvm/jre " + else ""} + ${if javaAwtGtk then "--enable-java-awt=gtk" else ""} + ${if langJava && javaAntlr != null then "--with-antlr-jar=${javaAntlr}" else ""} + --with-gmp-include=${gmp.dev}/include + --with-gmp-lib=${gmp.out}/lib + --with-mpfr-include=${mpfr.dev}/include + --with-mpfr-lib=${mpfr.out}/lib + --with-mpc=${libmpc} + ${if libelf != null then "--with-libelf=${libelf}" else ""} + --disable-libstdcxx-pch + --without-included-gettext + --with-system-zlib + --enable-static + --enable-languages=${ + concatStrings (intersperse "," + ( optional langC "c" + ++ optional langCC "c++" + ++ optional langFortran "fortran" + ++ optional langJava "java" + ++ optional langAda "ada" + ++ optional langVhdl "vhdl" + ++ optional langGo "go" + ++ optional langObjC "objc" + ++ optional langObjCpp "obj-c++" + ++ optionals crossDarwin [ "objc" "obj-c++" ] + ) + ) + } + ${if cross == null + then if stdenv.isDarwin + then " --with-native-system-header-dir=${darwin.usr-include}" + else " --with-native-system-header-dir=${getDev stdenv.cc.libc}/include" + else ""} + ${if langAda then " --enable-libada" else ""} + ${if cross == null && stdenv.isi686 then "--with-arch=i686" else ""} + ${if cross != null then crossConfigureFlags else ""} + ${if !bootstrap then "--disable-bootstrap" else ""} + ${if cross == null then platformFlags else ""} + "; + + targetConfig = if cross != null then cross.config else null; + + buildFlags = if bootstrap then + (if profiledCompiler then "profiledbootstrap" else "bootstrap") + else ""; + + installTargets = + if stripped + then "install-strip" + else "install"; + + crossAttrs = let + xgccArch = targetPlatform.gcc.arch or null; + xgccCpu = targetPlatform.gcc.cpu or null; + xgccAbi = targetPlatform.gcc.abi or null; + xgccFpu = targetPlatform.gcc.fpu or null; + xgccFloat = targetPlatform.gcc.float or null; + xwithArch = if xgccArch != null then " --with-arch=${xgccArch}" else ""; + xwithCpu = if xgccCpu != null then " --with-cpu=${xgccCpu}" else ""; + xwithAbi = if xgccAbi != null then " --with-abi=${xgccAbi}" else ""; + xwithFpu = if xgccFpu != null then " --with-fpu=${xgccFpu}" else ""; + xwithFloat = if xgccFloat != null then " --with-float=${xgccFloat}" else ""; + in { + AR = "${targetPlatform.config}-ar"; + LD = "${targetPlatform.config}-ld"; + CC = "${targetPlatform.config}-gcc"; + CXX = "${targetPlatform.config}-gcc"; + AR_FOR_TARGET = "${targetPlatform.config}-ar"; + LD_FOR_TARGET = "${targetPlatform.config}-ld"; + CC_FOR_TARGET = "${targetPlatform.config}-gcc"; + NM_FOR_TARGET = "${targetPlatform.config}-nm"; + CXX_FOR_TARGET = "${targetPlatform.config}-g++"; + # If we are making a cross compiler, cross != null + NIX_CC_CROSS = if cross == null then "${stdenv.ccCross}" else ""; + dontStrip = true; + configureFlags = '' + ${if enableMultilib then "" else "--disable-multilib"} + ${if enableShared then "" else "--disable-shared"} + ${if langJava then "--with-ecj-jar=${javaEcj.crossDrv}" else ""} + ${if javaAwtGtk then "--enable-java-awt=gtk" else ""} + ${if langJava && javaAntlr != null then "--with-antlr-jar=${javaAntlr.crossDrv}" else ""} + --with-gmp=${gmp.crossDrv} + --with-mpfr=${mpfr.crossDrv} + --with-mpc=${libmpc.crossDrv} + --disable-libstdcxx-pch + --without-included-gettext + --with-system-zlib + --enable-languages=${ + concatStrings (intersperse "," + ( optional langC "c" + ++ optional langCC "c++" + ++ optional langFortran "fortran" + ++ optional langJava "java" + ++ optional langAda "ada" + ++ optional langVhdl "vhdl" + ++ optional langGo "go" + ) + ) + } + ${if langAda then " --enable-libada" else ""} + --target=${targetPlatform.config} + ${xwithArch} + ${xwithCpu} + ${xwithAbi} + ${xwithFpu} + ${xwithFloat} + ''; + buildFlags = ""; + }; + + + # Needed for the cross compilation to work + AR = "ar"; + LD = "ld"; + # http://gcc.gnu.org/install/specific.html#x86-64-x-solaris210 + CC = if stdenv.system == "x86_64-solaris" then "gcc -m64" else "gcc"; + + # Setting $CPATH and $LIBRARY_PATH to make sure both `gcc' and `xgcc' find + # the library headers and binaries, regarless of the language being + # compiled. + + # Note: When building the Java AWT GTK+ peer, the build system doesn't + # honor `--with-gmp' et al., e.g., when building + # `libjava/classpath/native/jni/java-math/gnu_java_math_GMP.c', so we just + # add them to $CPATH and $LIBRARY_PATH in this case. + # + # Likewise, the LTO code doesn't find zlib. + + CPATH = makeSearchPathOutput "dev" "include" ([] + ++ optional (zlib != null) zlib + ++ optional langJava boehmgc + ++ optionals javaAwtGtk xlibs + ++ optionals javaAwtGtk [ gmp mpfr ] + ++ optional (libpthread != null) libpthread + ++ optional (libpthreadCross != null) libpthreadCross + + # On GNU/Hurd glibc refers to Mach & Hurd + # headers. + ++ optionals (libcCross != null && libcCross ? "propagatedBuildInputs") + libcCross.propagatedBuildInputs); + + LIBRARY_PATH = makeLibraryPath ([] + ++ optional (zlib != null) zlib + ++ optional langJava boehmgc + ++ optionals javaAwtGtk xlibs + ++ optionals javaAwtGtk [ gmp mpfr ] + ++ optional (libpthread != null) libpthread); + + EXTRA_TARGET_CFLAGS = + if cross != null && libcCross != null then [ + "-idirafter ${getDev libcCross}/include" + ] + ++ optionals (! crossStageStatic) [ + "-B${libcCross.out}/lib" + ] + else null; + + EXTRA_TARGET_LDFLAGS = + if cross != null && libcCross != null then [ + "-Wl,-L${libcCross.out}/lib" + ] + ++ (if crossStageStatic then [ + "-B${libcCross.out}/lib" + ] else [ + "-Wl,-rpath,${libcCross.out}/lib" + "-Wl,-rpath-link,${libcCross.out}/lib" + ]) + ++ optionals (libpthreadCross != null) [ + "-L${libpthreadCross}/lib" + "-Wl,${libpthreadCross.TARGET_LDFLAGS}" + ] + else null; + + passthru = + { inherit langC langCC langObjC langObjCpp langAda langFortran langVhdl langGo version; isGNU = true; }; + + inherit enableParallelBuilding enableMultilib; + + inherit (stdenv) is64bit; + + meta = { + homepage = http://gcc.gnu.org/; + license = stdenv.lib.licenses.gpl3Plus; # runtime support libraries are typically LGPLv3+ + description = "GNU Compiler Collection, version ${version}" + + (if stripped then "" else " (with debugging info)"); + + longDescription = '' + The GNU Compiler Collection includes compiler front ends for C, C++, + Objective-C, Fortran, OpenMP for C/C++/Fortran, Java, and Ada, as well + as libraries for these languages (libstdc++, libgcj, libgomp,...). + + GCC development is a part of the GNU Project, aiming to improve the + compiler used in the GNU system including the GNU/Linux variant. + ''; + + maintainers = with stdenv.lib.maintainers; [ ]; + + # gnatboot is not available out of linux platforms, so we disable the darwin build + # for the gnat (ada compiler). + platforms = + stdenv.lib.platforms.linux ++ + stdenv.lib.platforms.freebsd ++ + optionals (langAda == false) stdenv.lib.platforms.darwin; + }; +} + +// optionalAttrs (cross != null && cross.libc == "msvcrt" && crossStageStatic) { + makeFlags = [ "all-gcc" "all-target-libgcc" ]; + installTargets = "install-gcc install-target-libgcc"; +} + +# Strip kills static libs of other archs (hence cross != null) +// optionalAttrs (!stripped || cross != null) { dontStrip = true; NIX_STRIP_DEBUG = 0; } + +// optionalAttrs (enableMultilib) { dontMoveLib64 = true; } +) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dcf644ac8dd..ad0cfb1bad5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5261,6 +5261,21 @@ with pkgs; isl = if !stdenv.isDarwin then isl_0_14 else null; })); + gcc7 = lowPrio (wrapCC (callPackage ../development/compilers/gcc/7 { + inherit noSysDirs; + + # PGO seems to speed up compilation by gcc by ~10%, see #445 discussion + profiledCompiler = with stdenv; (!isDarwin && (isi686 || isx86_64)); + + # When building `gcc.crossDrv' (a "Canadian cross", with host == target + # and host != build), `cross' must be null but the cross-libc must still + # be passed. + cross = null; + libcCross = if targetPlatform != buildPlatform then libcCross else null; + + isl = if !stdenv.isDarwin then isl_0_17 else null; + })); + gcc-snapshot = lowPrio (wrapCC (callPackage ../development/compilers/gcc/snapshot { inherit noSysDirs; From d0074286212761d27b86386681e09a4a844a1efc Mon Sep 17 00:00:00 2001 From: Benjamin Staffin Date: Sat, 3 Jun 2017 17:34:31 -0400 Subject: [PATCH 086/117] dex: init at 2.4.1 There is already another thing called "dex" that manipulates .desktop files, so I called this one "dex-oidc" in all-packages.nix. --- pkgs/servers/dex/default.nix | 32 ++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/servers/dex/default.nix diff --git a/pkgs/servers/dex/default.nix b/pkgs/servers/dex/default.nix new file mode 100644 index 00000000000..119d5f03f62 --- /dev/null +++ b/pkgs/servers/dex/default.nix @@ -0,0 +1,32 @@ +{ lib, buildGoPackage, fetchFromGitHub }: + +let version = "2.4.1"; in + +buildGoPackage rec { + name = "dex-${version}"; + + goPackagePath = "github.com/coreos/dex"; + + src = fetchFromGitHub { + rev = "v${version}"; + owner = "coreos"; + repo = "dex"; + sha256 = "11qpn3wh74mq16xgl9l50n2v02ffqcd14xccf77j5il04xr764nx"; + }; + + subPackages = [ + "cmd/dex" + ]; + + buildFlagsArray = [ + "-ldflags=-w -X ${goPackagePath}/version.Version=${src.rev}" + ]; + + meta = { + description = "OpenID Connect and OAuth2 identity provider with pluggable connectors"; + license = lib.licenses.asl20; + homepage = https://github.com/coreos/dex; + maintainers = with lib.maintainers; [benley]; + platforms = lib.platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7a4864faa6d..23f8cc17494 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10871,6 +10871,8 @@ with pkgs; couchpotato = callPackage ../servers/couchpotato {}; + dex-oidc = callPackage ../servers/dex { }; + dico = callPackage ../servers/dico { }; dict = callPackage ../servers/dict { From 2d0a7c4eeecd22f26eb37f6077a0397c32250375 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sat, 27 May 2017 20:44:00 +0300 Subject: [PATCH 087/117] aliases: don't distribute on Hydra --- lib/meta.nix | 5 +++++ pkgs/top-level/aliases.nix | 17 ++++++++++++----- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/lib/meta.nix b/lib/meta.nix index ae652e579c3..8f77bbe0148 100644 --- a/lib/meta.nix +++ b/lib/meta.nix @@ -17,6 +17,11 @@ rec { drv // { meta = (drv.meta or {}) // newAttrs; }; + /* Disable Hydra builds of given derivation. + */ + dontDistribute = drv: addMetaAttrs { hydraPlatforms = []; } drv; + + /* Change the symbolic name of a package for presentation purposes (i.e., so that nix-env users can tell them apart). */ diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 7fb271682d0..a14732fb859 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -5,18 +5,25 @@ with self; let # Removing recurseForDerivation prevents derivations of aliased attribute # set to appear while listing all the packages available. - removeRecurseForDerivations = _n: alias: with lib; + removeRecurseForDerivations = alias: with lib; if alias.recurseForDerivations or false then removeAttrs alias ["recurseForDerivations"] else alias; - doNotDisplayTwice = aliases: - lib.mapAttrs removeRecurseForDerivations aliases; + # Disabling distribution prevents top-level aliases for non-recursed package + # sets from building on Hydra. + removeDistribute = alias: with lib; + if isDerivation alias then + dontDistribute alias + else alias; + + mapAliases = aliases: + lib.mapAttrs (n: alias: removeDistribute (removeRecurseForDerivations alias)) aliases; in ### Deprecated aliases - for backward compatibility -doNotDisplayTwice rec { +mapAliases (rec { accounts-qt = libsForQt5.accounts-qt; # added 2015-12-19 adobeReader = adobe-reader; aircrackng = aircrack-ng; # added 2016-01-14 @@ -156,4 +163,4 @@ doNotDisplayTwice rec { ocaml_4_02 = ocamlPackages_4_02.ocaml; ocaml_4_03 = ocamlPackages_4_03.ocaml; ocaml = ocamlPackages.ocaml; -}) +})) From e7530e6a5a1d8858e48f1a2c7ea90a5b6aba9478 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sat, 27 May 2017 14:12:36 +0300 Subject: [PATCH 088/117] wine: reorganize packages Move most of wine configurations to winePackages which is not built on Hydra. Leave two top-level packages: wine: stable release with an "office" configuration; wineStaging: staging release with a "full" configuration. --- pkgs/applications/audio/airwave/default.nix | 5 +- pkgs/misc/emulators/wine/base.nix | 10 ++- pkgs/top-level/aliases.nix | 6 ++ pkgs/top-level/all-packages.nix | 92 ++++++++++++--------- 4 files changed, 67 insertions(+), 46 deletions(-) diff --git a/pkgs/applications/audio/airwave/default.nix b/pkgs/applications/audio/airwave/default.nix index 39946fd5c7d..5a6901a9434 100644 --- a/pkgs/applications/audio/airwave/default.nix +++ b/pkgs/applications/audio/airwave/default.nix @@ -1,5 +1,5 @@ { stdenv, cmake, fetchFromGitHub, file, gcc_multi, libX11, makeWrapper -, overrideCC, qt5, requireFile, unzip, wineStable +, overrideCC, qt5, requireFile, unzip, wine }: let @@ -26,7 +26,8 @@ let installPhase = "cp -r . $out"; }; - wine-wow64 = wineStable.override { + wine-wow64 = wine.override { + wineRelease = "stable"; wineBuild = "wineWow"; }; diff --git a/pkgs/misc/emulators/wine/base.nix b/pkgs/misc/emulators/wine/base.nix index 80070dec2d9..92815ffaa0a 100644 --- a/pkgs/misc/emulators/wine/base.nix +++ b/pkgs/misc/emulators/wine/base.nix @@ -91,9 +91,13 @@ stdenv.mkDerivation ((lib.optionalAttrs (! isNull buildScript) { ((map (links "share/wine/gecko") geckos) ++ (map (links "share/wine/mono") monos))} '' + lib.optionalString supportFlags.gstreamerSupport '' - wrapProgram "$out/bin/wine" \ - --argv0 "" \ - --prefix GST_PLUGIN_SYSTEM_PATH_1_0 ":" "$GST_PLUGIN_SYSTEM_PATH_1_0" + for i in wine wine64; do + if [ -e "$out/bin/$i" ]; then + wrapProgram "$out/bin/$i" \ + --argv0 "" \ + --prefix GST_PLUGIN_SYSTEM_PATH_1_0 ":" "$GST_PLUGIN_SYSTEM_PATH_1_0" + fi + done ''; enableParallelBuilding = true; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index a14732fb859..c47e3fe325b 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -148,6 +148,12 @@ mapAliases (rec { xlibs = xorg; # added 2015-09 youtubeDL = youtube-dl; # added 2014-10-26 + # added 2017-05-27 + wineMinimal = winePackages.minimal; + wineFull = winePackages.full; + wineStable = winePackages.stable; + wineUnstable = winePackages.unstable; + inherit (ocaml-ng) # added 2016-09-14 ocamlPackages_3_10_0 ocamlPackages_3_11_2 ocamlPackages_3_12_1 ocamlPackages_4_00_1 ocamlPackages_4_01_0 ocamlPackages_4_02 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2fabc84c569..a579ea3f587 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18640,49 +18640,59 @@ with pkgs; pythonPackages = python3Packages; }; - wineMinimal = callPackage ../misc/emulators/wine { - wineRelease = config.wine.release or "stable"; - wineBuild = config.wine.build or "wine32"; + winePackages = rec { + minimal = callPackage ../misc/emulators/wine { + wineRelease = config.wine.release or "stable"; + wineBuild = config.wine.build or "wine32"; + }; + + base = minimal.override { + pngSupport = true; + jpegSupport = true; + tiffSupport = true; + gettextSupport = true; + fontconfigSupport = true; + alsaSupport = true; + openglSupport = true; + tlsSupport = true; + cupsSupport = true; + dbusSupport = true; + cairoSupport = true; + cursesSupport = true; + saneSupport = true; + pulseaudioSupport = config.pulseaudio or stdenv.isLinux; + udevSupport = true; + xineramaSupport = true; + xmlSupport = true; + }; + + full = base.override { + gtkSupport = true; + gstreamerSupport = true; + colorManagementSupport = true; + mpg123Support = true; + openalSupport = true; + openclSupport = true; + odbcSupport = true; + netapiSupport = true; + vaSupport = true; + pcapSupport = true; + v4lSupport = true; + gsmSupport = true; + gphoto2Support = true; + ldapSupport = true; + }; + + stable = base.override { wineRelease = "stable"; }; + unstable = base.override { wineRelease = "unstable"; }; + staging = base.override { wineRelease = "staging"; }; }; - wine = lowPrio (self.wineMinimal.override { - pngSupport = true; - jpegSupport = true; - tiffSupport = true; - gettextSupport = true; - fontconfigSupport = true; - alsaSupport = true; - openglSupport = true; - tlsSupport = true; - cupsSupport = true; - colorManagementSupport = true; - dbusSupport = true; - mpg123Support = true; - openalSupport = true; - cairoSupport = true; - cursesSupport = true; - pulseaudioSupport = config.pulseaudio or stdenv.isLinux; - xineramaSupport = true; - xmlSupport = true; + + wine = winePackages.base; + + wineStaging = lowPrio (winePackages.full.override { + wineRelease = "staging"; }); - wineFull = lowPrio (self.wine.override { - gtkSupport = true; - gstreamerSupport = true; - openclSupport = true; - odbcSupport = true; - netapiSupport = true; - vaSupport = true; - pcapSupport = true; - v4lSupport = true; - saneSupport = true; - gsmSupport = true; - gphoto2Support = true; - ldapSupport = true; - pulseaudioSupport = true; - udevSupport = true; - }); - wineStable = self.wine.override { wineRelease = "stable"; }; - wineUnstable = lowPrio (self.wine.override { wineRelease = "unstable"; }); - wineStaging = lowPrio (self.wine.override { wineRelease = "staging"; }); winetricks = callPackage ../misc/emulators/wine/winetricks.nix { inherit (gnome2) zenity; From 7123cad74262177b73d6b29af303a65313b85921 Mon Sep 17 00:00:00 2001 From: Winnie Quinn Date: Sat, 27 May 2017 13:08:34 -0400 Subject: [PATCH 089/117] slack: 2.5.2 -> 2.6.2 --- .../networking/instant-messengers/slack/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/pkgs/applications/networking/instant-messengers/slack/default.nix index c0d50a86c71..edd66bd900b 100644 --- a/pkgs/applications/networking/instant-messengers/slack/default.nix +++ b/pkgs/applications/networking/instant-messengers/slack/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, dpkg -, alsaLib, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, glib, gnome2 -, libnotify, nspr, nss, systemd, xorg }: +, alsaLib, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, glib +, gnome2, libnotify, libxcb, nspr, nss, systemd, xorg }: let - version = "2.5.2"; + version = "2.6.2"; rpath = stdenv.lib.makeLibraryPath [ alsaLib @@ -22,6 +22,7 @@ let gnome2.gtk gnome2.pango libnotify + libxcb nspr nss stdenv.cc.cc @@ -45,7 +46,7 @@ let if stdenv.system == "x86_64-linux" then fetchurl { url = "https://downloads.slack-edge.com/linux_releases/slack-desktop-${version}-amd64.deb"; - sha256 = "0mg8js18lnnwyvqksrhpym7d04bin16bh7sdmxbm36iijb9ajxmi"; + sha256 = "01zdzzpnv8qpmcpy6h9x7izrnwm0y015j5p5rnjwx8ki712wnmm8"; } else throw "Slack is not supported on ${stdenv.system}"; From f5edcbde8f78b5ef9a7c30cad92461220be2b775 Mon Sep 17 00:00:00 2001 From: Winnie Quinn Date: Sat, 3 Jun 2017 19:04:40 -0400 Subject: [PATCH 090/117] iosevka: 1.12.5 -> 1.13.0 --- pkgs/data/fonts/iosevka/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/fonts/iosevka/default.nix b/pkgs/data/fonts/iosevka/default.nix index 5fde19e0128..10bc5787e40 100644 --- a/pkgs/data/fonts/iosevka/default.nix +++ b/pkgs/data/fonts/iosevka/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "iosevka-${version}"; - version = "1.12.5"; + version = "1.13.0"; buildInputs = [ unzip ]; src = fetchurl { url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/iosevka-pack-${version}.zip"; - sha256 = "0s3g6mk0ngwsrw9h9dqinb50cd9i8zhqdcmmh93fhyf4d87yfwyi"; + sha256 = "03jc8a10177wk35gyp0n317azakyy5qzc6vbh331552asawckswr"; }; sourceRoot = "."; From 1845a2d7352450fd726d77042190a3d64dd4f8df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= Date: Sun, 4 Jun 2017 03:20:30 +0200 Subject: [PATCH 091/117] retroarch: 1.3.4 -> 1.6.0 --- pkgs/misc/emulators/retroarch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/emulators/retroarch/default.nix b/pkgs/misc/emulators/retroarch/default.nix index ac8e1e46112..171453b89d5 100644 --- a/pkgs/misc/emulators/retroarch/default.nix +++ b/pkgs/misc/emulators/retroarch/default.nix @@ -23,12 +23,12 @@ in stdenv.mkDerivation rec { name = "retroarch-bare-${version}"; - version = "1.3.4"; + version = "1.6.0"; src = fetchFromGitHub { owner = "libretro"; repo = "RetroArch"; - sha256 = "0ccp17580w0884baxj5kcynlm03jgd7i62dprz1ajxbi2s7b3mi3"; + sha256 = "1ym2kws58fbavkc3giz5xqaqiqqdbf7wrz7y7iw53p1bnkc3l8yi"; rev = "v${version}"; }; From f270376cd771ce6b97317d5bee56cf75e57fe50d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= Date: Sun, 4 Jun 2017 03:24:18 +0200 Subject: [PATCH 092/117] libretro.*: 2015-11-20 -> 2017-06-04 --- pkgs/misc/emulators/retroarch/cores.nix | 121 ++++++++++++------------ 1 file changed, 62 insertions(+), 59 deletions(-) diff --git a/pkgs/misc/emulators/retroarch/cores.nix b/pkgs/misc/emulators/retroarch/cores.nix index b7b720af508..9d311760298 100644 --- a/pkgs/misc/emulators/retroarch/cores.nix +++ b/pkgs/misc/emulators/retroarch/cores.nix @@ -1,6 +1,6 @@ { stdenv, fetchgit, pkgconfig, makeWrapper, python27, retroarch , alsaLib, fluidsynth, mesa, portaudio, SDL, ffmpeg, libpng, libjpeg -, libvorbis, zlib }: +, libvorbis, xorg, zlib }: let @@ -10,7 +10,7 @@ let stdenv.lib.makeOverridable stdenv.mkDerivation rec { name = "libretro-${core}-${version}"; - version = "2015-11-20"; + version = "2017-06-04"; inherit src; buildInputs = [ makeWrapper retroarch zlib ] ++ a.extraBuildInputs or []; @@ -54,8 +54,8 @@ in core = "4do"; src = fetchRetro { repo = core + "-libretro"; - rev = "cbd700e2bb95f08f241ca24330fa732aa6af8018"; - sha256 = "1xp43hpd23rhj96pns13fz9mjp66gmxzl5frqa8q9fqcn2qkx7b1"; + rev = "52d881743dd8614d96b4de8bd153cb725b87d474"; + sha256 = "1n42f70vni2zavppayaq8xmsyx5cn40qi4zk4pgq1w3hh2q8mj72"; }; description = "Port of 4DO/libfreedo to libretro"; }).override { @@ -66,8 +66,8 @@ in core = "mednafen-pce-fast"; src = fetchRetro { repo = "beetle-pce-fast-libretro"; - rev = "6e2eaf75da2eb3dfcf2fd64413f471c8c90cf885"; - sha256 = "0m946108wzawg0c4xvqpv6yzfmjngz6lji5hn4swgk0z5f2bj5a5"; + rev = "2954e645d668ee73d93803dc30da4462fc7a459b"; + sha256 = "0p0k7kqfd6xg1qh6vgzgwp122miprb2bpzljgxd9kvigxihsl6f7"; }; description = "Port of Mednafen's PC Engine core to libretro"; }).override { @@ -79,8 +79,8 @@ in core = "mednafen-psx"; src = fetchRetro { repo = "beetle-psx-libretro"; - rev = "20c9b0eb0062b8768cc40aca0e2b2d626f1002a2"; - sha256 = "192xzvdbjjqlxrnxxn45hmrr6yjpxw3gapkbax6nhrabnxhva43k"; + rev = "76862abefdde9097561e2b795e75b49247deff17"; + sha256 = "1k4b7g50ajzchjrm6d3v68hvri4k3hzvacn2l99i5yq3hxp7vs7x"; }; description = "Port of Mednafen's PSX Engine core to libretro"; }).override { @@ -92,8 +92,8 @@ in core = "mednafen-saturn"; src = fetchRetro { repo = "beetle-saturn-libretro"; - rev = "bb5d0c126feb25cf980f5cc1fc57d6a5a6f6e7ab"; - sha256 = "0bnsdy27378b71y6aa65k4jxxy2xw6ky2ici3z53hkky2jnnjq0b"; + rev = "3f1661b39ef249e105e6e2e655854ad0c87cd497"; + sha256 = "1d1brysynwr6inlwfgv7gwkl3i9mf4lsaxd9wm2szw86g4diyn4c"; }; description = "Port of Mednafen's Saturn core to libretro"; }).override { @@ -106,8 +106,8 @@ in core = bname + "-accuracy"; src = fetchRetro { repo = bname; - rev = "0bfe7f4f895af0927cec1c06dcae096b59416159"; - sha256 = "0dmaa1vy6nfj9jk6xkvrbbcxa9j3f3zrp24zflnqbizc088vncb9"; + rev = "e89c9a2e0a12d588366ee4f5c76b7d75139d938b"; + sha256 = "0vkn1f38vwazpp3kbvvv8c467ghak6yfx00s48wkxwvhmak74a3s"; }; description = "Fork of bsnes with HLE DSP emulation restored"; }).override { @@ -118,8 +118,8 @@ in core = "desmume"; src = fetchRetro { repo = core; - rev = "cae5945149a72b1dc0b130d6e60e2690b88a925a"; - sha256 = "1qzlbw0vy87zi3w6hp5zj9dxdkj3qc9czjf41sj70irwyvqi0kii"; + rev = "ce1f93abb4c3aa55099f56298e5438a03a3c2bbd"; + sha256 = "064gzfbr7yizmvi91ry5y6bzikj633kdqhvzycb9f1g6kspf8yyl"; }; description = "libretro wrapper for desmume NDS emulator"; }).override { @@ -130,15 +130,15 @@ in core = "fba"; src = fetchRetro { repo = core + "-libretro"; - rev = "b642e054a1f581fbac16c08f4b8df9ab6c474203"; - sha256 = "0jxbzjhpyw1fzipm2ai2nv62vb0q5cb203m093vakr1zdsx7si2n"; + rev = "9146c18ac989c619256d1cb8954d49e728e44ea3"; + sha256 = "159dww8mxi95xz4ypw38vsn1g4k6z8sv415qqf0qriydwhw6mh2m"; }; description = "Port of Final Burn Alpha to libretro"; }).override { buildPhase = '' cd svn-current/trunk \ && make -f makefile.libretro \ - && mv fb_alpha_libretro.so fba_libretro.so + && mv fbalpha2012_libretro.so fba_libretro.so ''; }; @@ -146,30 +146,28 @@ in core = "fceumm"; src = fetchRetro { repo = "libretro-" + core; - rev = "eb19d48804ebeb381b20e74db7033c321f6b6d04"; - sha256 = "18wm6yzwshqfkd75kkcv035p1s2yhnchn98bcn9aj15aw5qyhvd4"; + rev = "45f773a1c221121746bbe2680e3aaaf92776a87e"; + sha256 = "0jnwh1338q710x47bzrx319g5xbq9ipv35kyjlbkrzhqjq1blz0b"; }; description = "FCEUmm libretro port"; }; - gambatte = (mkLibRetroCore rec { + gambatte = mkLibRetroCore rec { core = "gambatte"; src = fetchRetro { repo = core + "-libretro"; - rev = "59fb6a652e0de3c3a3b29e58af5ac035958da37e"; - sha256 = "0n2416lgqbzah1q3ji1hhpcdi9h29563gz739kf9libmnz86vd6f"; + rev = "db7af6cf6ea39fd5e39eea137ff752649599a4e4"; + sha256 = "0h7hyj630nk1s32wx02y4q9x2lp6wbnh6nkc9ihf4pygcsignmwr"; }; description = "Gambatte libretro port"; - }).override { - configurePhase = "cd libgambatte"; }; genesis-plus-gx = mkLibRetroCore rec { core = "genesis-plus-gx"; src = fetchRetro { repo = "Genesis-Plus-GX"; - rev = "7d8d5f1026af8cfd00cdf32c67a999bd1e454a09"; - sha256 = "16jm97h66bb2sqlimjlks31sapb23x4q8sr16wdqn1xgi670xw3c"; + rev = "365a28c7349b691e6aaa3ad59b055261c42bd130"; + sha256 = "0s11ddpnb44q4xjkl7dylldhi9y5zqywqavpk0bbwyj84r1cbz3c"; }; description = "Enhanced Genesis Plus libretro port"; }; @@ -178,20 +176,20 @@ in core = "mame"; src = fetchRetro { repo = "mame"; - rev = "8da2303292bb8530f9f4ffad8bf1df95ee4cab74"; - sha256 = "0afsxsm1d4x9jn28qz6v47hhnp7q9i0yqk62i4lk4d7i7m4dq5j9"; + rev = "9f8a36adeb4dc54ec2ecac992ce91bcdb377519e"; + sha256 = "0blfvq28hgv9kkpijd8c9d9sa5g2qr448clwi7wrj8kqfdnrr8m1"; }; description = "Port of MAME to libretro"; - extraBuildInputs = [ alsaLib portaudio python27 ]; + extraBuildInputs = [ alsaLib mesa portaudio python27 xorg.libX11 ]; }; mgba = mkLibRetroCore rec { core = "mgba"; src = fetchRetro { repo = core; - rev = "4000128339b535896615c994cafcd777637573f4"; - sha256 = "1yar78rvgfqx7jdna9chkmmbnpcf7k9ckbzj506f7k7m7zv819fn"; + rev = "fdaaaee661e59f28c94c7cfa4e82e70b71e24a9d"; + sha256 = "1b30sa861r4bhbqkx6vkklh4iy625bpzki2ks4ivvjns1ijczvc7"; }; description = "Port of mGBA to libretro"; }; @@ -200,12 +198,12 @@ in core = "mupen64plus"; src = fetchRetro { repo = core + "-libretro"; - rev = "7db9296453629a44de806589f3ff64e824e775ad"; - sha256 = "075lpmwmj99yf9d9905x7apawd4bqz0whr37mh2fgr3jf730yiyl"; + rev = "407bcd40b3a42bff6b856a6d6f88a7d5d670bf9e"; + sha256 = "0q5kvjz7rpk7mp75cdywqjgmy10c0h7ky26hh1x90d39y94idcd8"; }; description = "Libretro port of Mupen64 Plus, GL only"; - extraBuildInputs = [ mesa ]; + extraBuildInputs = [ mesa libpng ]; }).override { buildPhase = "make WITH_DYNAREC=${if stdenv.system == "x86_64-linux" then "x86_64" else "x86"}"; }; @@ -214,8 +212,8 @@ in core = "nestopia"; src = fetchRetro { repo = core; - rev = "dcaed965760669161d6fd44755887545ea393041"; - sha256 = "03fy5hb181ffx8sk9wmm415k084zqqhfqga4crgc7hdqi16s3r5v"; + rev = "ecfa170a582e5b8ec11225ca645843fa064955ca"; + sha256 = "17ac7dhasch6f4lpill8c5scsvaix0jvbf1cp797qbll4hk84f2q"; }; description = "nestopia undead libretro port"; }).override { @@ -226,8 +224,8 @@ in core = "picodrive"; src = fetchRetro { repo = core; - rev = "e912fdf26376bfa5d7d6488055fe6fdbd13c2e49"; - sha256 = "1mi36y8kx6s76cgygpj11zw35p44gd66mxygmxliz7k6xsd7ww41"; + rev = "cbc93b68dca1d72882d07b54bbe1ef25b980558a"; + sha256 = "0fl9r6jj2x9231md5zc4scra79j5hfn1n2z67scff1375xg1k64h"; }; description = "Fast MegaDrive/MegaCD/32X emulator"; @@ -241,8 +239,8 @@ in core = "ppsspp"; src = fetchRetro { repo = "libretro-" + core; - rev = "ea17e27fcf16b9f875718b6550fe7145c6257c06"; - sha256 = "0w5njj5pamqc4a022hdplb7vapwkf34ad1w4acz3c8b05vkl457d"; + rev = "5f7bcf7bfc15f83d405bcecd7a163a55ad1e7573"; + sha256 = "06k1gzmypz61dslynrw4b5i161rhj43y6wnr2nhbzvwcv5bw8w8r"; }; description = "ppsspp libretro port"; extraBuildInputs = [ mesa ffmpeg ]; @@ -254,8 +252,8 @@ in core = "prboom"; src = fetchRetro { repo = "libretro-" + core; - rev = "90ad0db331c53e8851581e1547b7377fb9fffe5b"; - sha256 = "0jk73nakrs9jxj3d0dmjs0csskjhddn8a4sky3mpk9vp30csx0ll"; + rev = "4c690eb6b569a276c5b2a87680718f715477eae2"; + sha256 = "02vkl3y5dmyzifsviphspqv03a2rdyf36zpjpgfg7x0s226f56ja"; }; description = "Prboom libretro port"; }).override { @@ -266,8 +264,8 @@ in core = "quicknes"; src = fetchRetro { repo = "QuickNES_Core"; - rev = "518638b8064c9d0cb1b5aa29d96419f8528c9de5"; - sha256 = "0jv1z65m4j3hbfnb3chklh0dhwlc4gdqr0asswdsc1y4iwp0331c"; + rev = "8613b48cee97f1472145bbafa76e543854b2bbd5"; + sha256 = "18lizdb9zjlfhh8ibvmcscldlf3mw4aj8nds3pah68cd2lw170w1"; }; description = "QuickNES libretro port"; }).override { @@ -278,8 +276,8 @@ in core = "reicast"; src = fetchRetro { repo = core + "-emulator"; - rev = "ed47c72cf2e124d9d753285fd61d12ea8e071d0d"; - sha256 = "05dw7qjnprf1lw3ps0sb7sp73hsh1a27rxbwjqd26j85zr84g3r9"; + rev = "40d4e8af2dd67a3f317c14224873c8ec0e1f9d11"; + sha256 = "0d8wzpv7pcyh437gmvi439vim26wyrjmi5hj97wvyvggywjwrx8m"; }; description = "Reicast libretro port"; extraBuildInputs = [ mesa ]; @@ -291,8 +289,8 @@ in core = "scummvm"; src = fetchRetro { repo = core; - rev = "c3e719acc08c1873609bab3578939b7c9e606511"; - sha256 = "03wvffy3h62qc7f3d8042wd234m8ikd843ggp903y285sgh54r9y"; + rev = "de8d7e58caa23f071ce9d1bc5133f45d16c3ff1c"; + sha256 = "097i2dq3hw14hicsplrs36j1qa3r45vhzny5v4aw6qw4aj34hksy"; }; description = "Libretro port of ScummVM"; extraBuildInputs = [ fluidsynth libjpeg libvorbis mesa SDL ]; @@ -304,30 +302,35 @@ in core = "snes9x"; src = fetchRetro { repo = core; - rev = "ccf1ee2eae73ed1e4044c8dd9536dd4ac1be6d8b"; - sha256 = "1bwjk817m8v69s13fc9kcj605ig6707rsj57wmz2ri2ggmydhvcb"; + rev = "db4bfaba3b0d5a067fe9aea323503656837a8d9a"; + sha256 = "02f04ss45km32lp68diyfkix1gryx89qy8cc80189ipwnx80pgip"; }; description = "Port of SNES9x git to libretro"; }).override { buildPhase = "cd libretro && make"; }; - snes9x-next = mkLibRetroCore rec { + snes9x-next = (mkLibRetroCore rec { core = "snes9x-next"; src = fetchRetro { repo = core; - rev = "dfb7eef46d6bc2dbcc98f25e2bfadc9d2cff5cfd"; - sha256 = "0vdfjdwr6b5izh3gy63lcfnrdvr99qhlqfibjw4mmyqk9gkjrwm8"; + rev = "b2a69de0df1eb39ed362806f9c9633f4544272af"; + sha256 = "1vhgsrg9l562nincfvpj2h2dqkkblg1qmh0v47jqlqgmgl2b1zij"; }; description = "Optimized port/rewrite of SNES9x 1.52+ to Libretro"; + }).override { + buildPhase = '' + make -f Makefile.libretro + mv snes9x2010_libretro.so snes9x_next_libretro.so + ''; }; stella = (mkLibRetroCore rec { core = "stella"; src = fetchRetro { repo = core + "-libretro"; - rev = "ada5c57d632ace0ba915ce7a470d504a5d89ebcc"; - sha256 = "090isch1l5hm07l22l8hja31cdiaxc0vgc3i01qs8zgdyvsx4vvg"; + rev = "bbe65db0e344dcb38905586bd853076b65963e5a"; + sha256 = "18r1yyfzvjq2hq04d94y37kzsq6aywh1aim69a3imk8kh46gwrh0"; }; description = "Port of Stella to libretro"; }).override { @@ -338,8 +341,8 @@ in core = "vba-next"; src = fetchRetro { repo = core; - rev = "0c20cd92bc8684340d7a1bcae14a603001ad5e4a"; - sha256 = "016vm2xyjfkkcqkqfw3n09if4bxxppk3g6p92waa9bv2ni4xli69"; + rev = "e7734756d228ea604f8fa872cea1bba987780791"; + sha256 = "03s4rh7dbbhbfc4pfdvr9jcbxrp4ijg8yp49s1xhr7sxsblj2vpv"; }; description = "VBA-M libretro port with modifications for speed"; }; @@ -348,8 +351,8 @@ in core = "vbam"; src = fetchRetro { repo = core + "-libretro"; - rev = "bedddba614bc4fcbcf5b0d8565f94619b094c20c"; - sha256 = "1hvq4wsznb2vzg11iqmy5dnfjpiga368p1lmsx9d7ci7dcqyw7wy"; + rev = "1b82fc2d761f027567632692f787482d1e287ec2"; + sha256 = "043djmqvh2grc25hwjw4b5kfx57b89ryp6fcl8v632sm35l3dd6z"; }; description = "vanilla VBA-M libretro port"; }).override { From a8c48bb68b955e3552b8d7515f20f08e224c1509 Mon Sep 17 00:00:00 2001 From: Alastair Pharo Date: Sun, 4 Jun 2017 13:49:46 +1000 Subject: [PATCH 093/117] binaryen: add package --- .../compilers/binaryen/default.nix | 24 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/development/compilers/binaryen/default.nix diff --git a/pkgs/development/compilers/binaryen/default.nix b/pkgs/development/compilers/binaryen/default.nix new file mode 100644 index 00000000000..31f5845cc86 --- /dev/null +++ b/pkgs/development/compilers/binaryen/default.nix @@ -0,0 +1,24 @@ +{ stdenv, cmake, fetchFromGitHub }: + +stdenv.mkDerivation rec { + version = "32"; + rev = "version_${version}"; + name = "binaryen-${version}"; + + src = fetchFromGitHub { + owner = "WebAssembly"; + repo = "binaryen"; + sha256 = "0zclw6pa2pkzrnp8ib9qwbjvq38r2h5ynfg8fjl99b5lcyz5m590"; + inherit rev; + }; + + nativeBuildInputs = [ cmake ]; + + meta = with stdenv.lib; { + homepage = https://github.com/WebAssembly/binaryen; + description = "Compiler infrastructure and toolchain library for WebAssembly, in C++"; + platforms = platforms.all; + maintainers = with maintainers; [ asppsa ]; + license = licenses.asl20; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8bca3cee890..bd71c17b352 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5014,6 +5014,8 @@ with pkgs; stdenv = overrideCC stdenv gcc49; }; + binaryen = callPackage ../development/compilers/binaryen { }; + boo = callPackage ../development/compilers/boo { inherit (gnome2) gtksourceview; }; From 8f33800061eff8a8b1ef7a89f66893247a93ab8b Mon Sep 17 00:00:00 2001 From: Alastair Pharo Date: Sun, 4 Jun 2017 13:50:51 +1000 Subject: [PATCH 094/117] emscripten: add binaryen dep for compiling to WASM --- pkgs/development/compilers/emscripten/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/emscripten/default.nix b/pkgs/development/compilers/emscripten/default.nix index ad1cd437ffa..f118a11e419 100644 --- a/pkgs/development/compilers/emscripten/default.nix +++ b/pkgs/development/compilers/emscripten/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchFromGitHub, emscriptenfastcomp, python, nodejs, closurecompiler, jre }: +{ stdenv, fetchFromGitHub, emscriptenfastcomp, python, nodejs, closurecompiler +, jre, binaryen, enableWasm ? true +}: let rev = "1.37.10"; @@ -36,6 +38,9 @@ stdenv.mkDerivation { echo "COMPILER_ENGINE = NODE_JS" >> $out/${appdir}/config echo "CLOSURE_COMPILER = '${closurecompiler}/share/java/closure-compiler-v${closurecompiler.version}.jar'" >> $out/${appdir}/config echo "JAVA = '${jre}/bin/java'" >> $out/${appdir}/config + '' + + stdenv.lib.optionalString enableWasm '' + echo "BINARYEN_ROOT = '${binaryen}'" >> $out/share/emscripten/config ''; meta = with stdenv.lib; { From 5029b39b44f4be140d3fa6bb0b945c0b612eeb20 Mon Sep 17 00:00:00 2001 From: David Asabina Date: Sun, 4 Jun 2017 03:30:21 +0200 Subject: [PATCH 095/117] apvlv: copy main_menubar.glade to out dir The application requires the main_menubar.glade alongside the Startup.pdf. Just making sure all required assets are present :wink:. Currently `apvlv` fails with the `(apvlv:16999): Gtk-ERROR **: failed to add UI: Failed to open file '${store-path}-apvlv-0.1.5/share/doc/apvlv/main_menubar.glade': No such file or directory zsh: trace trap apvlv` error. --- pkgs/applications/misc/apvlv/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/misc/apvlv/default.nix b/pkgs/applications/misc/apvlv/default.nix index 977f5e94e5d..6dca5b30f4a 100644 --- a/pkgs/applications/misc/apvlv/default.nix +++ b/pkgs/applications/misc/apvlv/default.nix @@ -41,6 +41,7 @@ stdenv.mkDerivation rec { # displays pdfStartup.pdf as default pdf entry mkdir -p $out/share/doc/apvlv/ cp ../Startup.pdf $out/share/doc/apvlv/Startup.pdf + cp ../main_menubar.glade $out/share/doc/apvlv/main_menubar.glade ''; meta = with stdenv.lib; { From c57d0be40af780f3971deeee03836090a21e4bb9 Mon Sep 17 00:00:00 2001 From: geistesk Date: Sun, 4 Jun 2017 09:20:55 +0200 Subject: [PATCH 096/117] racket: 6.8 -> 6.9 --- pkgs/development/interpreters/racket/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix index 72217a860b4..245ff7b006f 100644 --- a/pkgs/development/interpreters/racket/default.nix +++ b/pkgs/development/interpreters/racket/default.nix @@ -33,11 +33,11 @@ in stdenv.mkDerivation rec { name = "racket-${version}"; - version = "6.8"; + version = "6.9"; src = fetchurl { url = "http://mirror.racket-lang.org/installers/${version}/${name}-src.tgz"; - sha256 = "1l9z1a0r5zydr50cklx9xjw3l0pwnf64i10xq7112fl1r89q3qgv"; + sha256 = "1cd218ee2ba1dc683de858a866c6666eb72a11adee8d1df6cdd59c5c5a47b714"; }; FONTCONFIG_FILE = fontsConf; From 5fcdd6c562e2e63c9cff33222bc4a87b5ad5e289 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 4 Jun 2017 11:00:09 +0100 Subject: [PATCH 097/117] apvlv: use wrapGAppsHook --- pkgs/applications/misc/apvlv/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/apvlv/default.nix b/pkgs/applications/misc/apvlv/default.nix index 6dca5b30f4a..a07e0b6db61 100644 --- a/pkgs/applications/misc/apvlv/default.nix +++ b/pkgs/applications/misc/apvlv/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, fetchpatch, cmake, pkgconfig, pcre, libxkbcommon, epoxy -, gtk3, poppler, freetype, libpthreadstubs, libXdmcp, libxshmfence +, gtk3, poppler, freetype, libpthreadstubs, libXdmcp, libxshmfence, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -22,6 +22,10 @@ stdenv.mkDerivation rec { libpthreadstubs libXdmcp libxshmfence # otherwise warnings in compilation ]; + nativeBuildInputs = [ + wrapGAppsHook + ]; + patches = [ (fetchpatch { url = "https://github.com/naihe2010/apvlv/commit/d432635b9c5ea6c052a2ae1fb71aedec5c4ad57a.patch"; From a3b69c0d5c80062acf19a8858da2032d7b1b85b3 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Sat, 3 Jun 2017 20:45:51 +0200 Subject: [PATCH 098/117] fetchgit: add postFetch argument --- pkgs/build-support/fetchgit/builder.sh | 1 + pkgs/build-support/fetchgit/default.nix | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/build-support/fetchgit/builder.sh b/pkgs/build-support/fetchgit/builder.sh index 4bbef1d6e62..6ae46469738 100644 --- a/pkgs/build-support/fetchgit/builder.sh +++ b/pkgs/build-support/fetchgit/builder.sh @@ -12,4 +12,5 @@ $SHELL $fetcher --builder --url "$url" --out "$out" --rev "$rev" \ ${fetchSubmodules:+--fetch-submodules} \ ${branchName:+--branch-name "$branchName"} +runHook postFetch stopNest diff --git a/pkgs/build-support/fetchgit/default.nix b/pkgs/build-support/fetchgit/default.nix index d85d2c893c5..a5f81ef1794 100644 --- a/pkgs/build-support/fetchgit/default.nix +++ b/pkgs/build-support/fetchgit/default.nix @@ -15,6 +15,9 @@ in , fetchSubmodules ? true, deepClone ? false , branchName ? null , name ? urlToName url rev +, # Shell code executed after the file has been fetched + # successfully. This can do things like check or transform the file. + postFetch ? "" }: /* NOTE: @@ -54,7 +57,7 @@ stdenv.mkDerivation { outputHashMode = "recursive"; outputHash = sha256; - inherit url rev leaveDotGit fetchSubmodules deepClone branchName; + inherit url rev leaveDotGit fetchSubmodules deepClone branchName postFetch; GIT_SSL_CAINFO = "${cacert}/etc/ssl/certs/ca-bundle.crt"; From 0ff914b6600c9eef4df03d2555238277f94a5bc1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 4 Jun 2017 11:21:42 +0100 Subject: [PATCH 099/117] rtags: fix platform dependent checksum --- pkgs/development/tools/rtags/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/rtags/default.nix b/pkgs/development/tools/rtags/default.nix index da55afbd1fb..23ee6dec86a 100644 --- a/pkgs/development/tools/rtags/default.nix +++ b/pkgs/development/tools/rtags/default.nix @@ -12,11 +12,17 @@ stdenv.mkDerivation rec { LIBCLANG_LIBDIR="${llvmPackages.clang.cc}/lib" ''; + src = fetchgit { rev = "refs/tags/v${version}"; fetchSubmodules = true; url = "https://github.com/andersbakken/rtags.git"; - sha256 = "0z32yncn3x1pm2l6r349kfwi6mi83vll820kka87agcla64pl1f2"; + sha256 = "0rv5hz4cfc1adpxvp4j4227nfc0p0yrjdc6l9i32jj11p69a5401"; + # unicode file names lead to different checksums on HFS+ vs. other + # filesystems because of unicode normalisation + postFetch = '' + rm $out/src/rct/tests/testfile_*.txt + ''; }; enableParallelBuilding = true; From 56a850701bffd4b230e0cb3b4ff3690885491152 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 4 Jun 2017 12:24:32 +0200 Subject: [PATCH 100/117] python.pkgs.aiofiles: init at 0.3.1 --- .../python-modules/aiofiles/default.nix | 33 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/development/python-modules/aiofiles/default.nix diff --git a/pkgs/development/python-modules/aiofiles/default.nix b/pkgs/development/python-modules/aiofiles/default.nix new file mode 100644 index 00000000000..d1c6e279064 --- /dev/null +++ b/pkgs/development/python-modules/aiofiles/default.nix @@ -0,0 +1,33 @@ +{ lib +, buildPythonPackage +, fetchPypi +, isPy33 +, pythonOlder +, asyncio +, singledispatch +}: + +buildPythonPackage rec { + pname = "aiofiles"; + version = "0.3.1"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "6c4936cea65175277183553dbc27d08b286a24ae5bd86f44fbe485dfcf77a14a"; + }; + + disabled = pythonOlder "3.3"; + + propagatedBuildInputs = lib.optionals isPy33 [ asyncio singledispatch ]; + + # No tests in archive + doCheck = false; + + meta = { + description = "File support for asyncio"; + homepage = https://github.com/Tinche/aiofiles; + license = with lib.licenses; [ asl20 ]; + maintainer = with lib.maintainers; [ fridh ]; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1c7ef881804..0a1d8932972 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -600,6 +600,8 @@ in { }; }; + aiofiles = callPackage ../development/python-modules/aiofiles { }; + aiohttp = buildPythonPackage rec { name = "aiohttp-${version}"; version = "1.1.6"; From 2c84e814e8261e2910595e40ee4e3e6b74ed5302 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Sun, 4 Jun 2017 17:18:58 +0200 Subject: [PATCH 101/117] randoop: init at 3.1.5 --- .../tools/analysis/randoop/default.nix | 28 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/development/tools/analysis/randoop/default.nix diff --git a/pkgs/development/tools/analysis/randoop/default.nix b/pkgs/development/tools/analysis/randoop/default.nix new file mode 100644 index 00000000000..4fc85c30166 --- /dev/null +++ b/pkgs/development/tools/analysis/randoop/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchurl, unzip }: + +stdenv.mkDerivation rec { + version = "3.1.5"; + name = "randoop-${version}"; + + src = fetchurl { + url = "https://github.com/randoop/randoop/releases/download/v${version}/${name}.zip"; + sha256 = "13zspyi9fgnqc90qfqqnj0hb7869l0aixv0vwgj8m4m1hggpadlx"; + }; + + buildInputs = [ unzip ]; + + installPhase = '' + mkdir -p $out/lib $out/doc + + cp -R *.jar $out/lib + cp README.txt $out/doc + ''; + + meta = with stdenv.lib; { + description = "Automatic test generation for Java"; + homepage = https://randoop.github.io/randoop/; + license = licenses.mit; + maintainers = with maintainers; [ pSub ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8bca3cee890..ce212b7482e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7072,6 +7072,8 @@ with pkgs; ragel = ragelStable; + randoop = callPackage ../development/tools/analysis/randoop { }; + inherit (callPackages ../development/tools/parsing/ragel { tex = texlive.combined.scheme-small; }) ragelStable ragelDev; From 84da90074399cdee7a1afc6360a65a3dbf65bfa2 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Sun, 4 Jun 2017 17:37:52 +0200 Subject: [PATCH 102/117] perlPackages.DataGUID: 0.048 -> 0.049 --- 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 eaa46c16e5a..14d47410857 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2941,11 +2941,11 @@ let self = _self // overrides; _self = with self; { }; }; - DataGUID = buildPerlPackage { - name = "Data-GUID-0.048"; + DataGUID = buildPerlPackage rec { + name = "Data-GUID-0.049"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Data-GUID-0.048.tar.gz; - sha256 = "cb263b1e6eeecc5797de6f945d42ace2db26c156172883550b73fa2ecdab29dc"; + url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz"; + sha256 = "0yx7d4qwsr9n85gslip0y3mdwr5fkncfbwxz7si2a17x95yl7bxq"; }; propagatedBuildInputs = [ DataUUID SubExporter SubInstall ]; meta = { From f39a047dacc48db0c7873cf1a001c4aa37db0250 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Sun, 4 Jun 2017 17:48:25 +0200 Subject: [PATCH 103/117] yara: 3.5.0 > 3.6.0, fixes CVE-2017-5924 --- pkgs/tools/security/yara/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/yara/default.nix b/pkgs/tools/security/yara/default.nix index a3b3c1c0290..21e5c3ffcef 100644 --- a/pkgs/tools/security/yara/default.nix +++ b/pkgs/tools/security/yara/default.nix @@ -5,14 +5,14 @@ }: stdenv.mkDerivation rec { - version = "3.5.0"; + version = "3.6.0"; name = "yara-${version}"; src = fetchFromGitHub { owner = "VirusTotal"; repo = "yara"; rev = "v${version}"; - sha256 = "18hn6acfj0cha9cv70f6hyaqf8qbgj0c0dm9db4v2q8z7cgi1681"; + sha256 = "05nadqpvihdyxym11mn6n02rzv2ng8ga7j9l0g5gnjx366gcai42"; }; # FIXME: this is probably not the right way to make it work From 5cb03b9538e25929b93c7d5cfd8d9ec23d9fd092 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Sun, 4 Jun 2017 18:16:59 +0200 Subject: [PATCH 104/117] xlockmore: 5.53 -> 5.54 --- 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 bed8c605245..f87e24efe18 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.53"; + name = "xlockmore-5.54"; src = fetchurl { url = "http://sillycycle.com/xlock/${name}.tar.xz"; - sha256 = "0rs9vc22xgk9gi88ifimdyrhqfjgs2jybwr9kvklg5qx7ff6aws9"; + sha256 = "0mdgl20619iii1i04pj2dq29nwvasbngy48cvd819h0wfawsqkwz"; curlOpts = "--user-agent 'Mozilla/5.0'"; }; From beb04aabac132833e4f33e6ecbb92d6ae7380ed1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= Date: Sun, 4 Jun 2017 10:10:14 +0200 Subject: [PATCH 105/117] libretro.dolphin: init at 2017-06-04 --- pkgs/misc/emulators/retroarch/cores.nix | 35 ++++++++++++++++++++++--- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 33 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/emulators/retroarch/cores.nix b/pkgs/misc/emulators/retroarch/cores.nix index 9d311760298..79dc382c92d 100644 --- a/pkgs/misc/emulators/retroarch/cores.nix +++ b/pkgs/misc/emulators/retroarch/cores.nix @@ -1,6 +1,7 @@ -{ stdenv, fetchgit, pkgconfig, makeWrapper, python27, retroarch -, alsaLib, fluidsynth, mesa, portaudio, SDL, ffmpeg, libpng, libjpeg -, libvorbis, xorg, zlib }: +{ stdenv, fetchgit, cmake, pkgconfig, makeWrapper, python27, retroarch +, alsaLib, fluidsynth, curl, hidapi, mesa, gettext, glib, gtk2, portaudio, SDL +, ffmpeg, pcre, libevdev, libpng, libjpeg, libudev, libvorbis +, miniupnpc, sfml, xorg, zlib }: let @@ -126,6 +127,34 @@ in configurePhase = "cd desmume"; }; + dolphin = (mkLibRetroCore { + core = "dolphin"; + src = fetchRetro { + repo = "dolphin"; + rev = "a6ad451fdd4ac8753fd1a8e2234ec34674677754"; + sha256 = "1cshlfmhph8dl3vgvn37imvp2b7xs2cx1r1ifp5js5psvhycrbz3"; + }; + description = "Port of Dolphin to libretro"; + + extraBuildInputs = [ + cmake curl mesa pcre pkgconfig sfml miniupnpc + gettext glib gtk2 hidapi + libevdev libudev + ] ++ (with xorg; [ libSM libX11 libXi libpthreadstubs libxcb xcbutil ]); + }).override { + cmakeFlags = [ + "-DLINUX_LOCAL_DEV=true" + "-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2.out}/lib/gtk-2.0/include" + "-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include" + "-DGTK2_INCLUDE_DIRS=${gtk2.dev}/include/gtk-2.0" + ]; + dontUseCmakeBuildDir = "yes"; + buildPhase = '' + cd Source/Core/DolphinLibretro + make + ''; + }; + fba = (mkLibRetroCore rec { core = "fba"; src = fetchRetro { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ce212b7482e..375ec6818bb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16483,6 +16483,7 @@ with pkgs; ++ optional (cfg.enableBeetleSaturn or false) beetle-saturn ++ optional (cfg.enableBsnesMercury or false) bsnes-mercury ++ optional (cfg.enableDesmume or false) desmume + ++ optional (cfg.enableDolphin or false) dolphin ++ optional (cfg.enableFBA or false) fba ++ optional (cfg.enableFceumm or false) fceumm ++ optional (cfg.enableGambatte or false) gambatte From b8ebc60abdec00a219d2cffb0246787f292f34f5 Mon Sep 17 00:00:00 2001 From: Daniel Fullmer Date: Sun, 4 Jun 2017 15:23:34 -0400 Subject: [PATCH 106/117] programs.zsh.syntaxHighlighting: Fix default value for patterns --- nixos/modules/programs/zsh/zsh-syntax-highlighting.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/programs/zsh/zsh-syntax-highlighting.nix b/nixos/modules/programs/zsh/zsh-syntax-highlighting.nix index 3bd7ab81896..9452489e2fb 100644 --- a/nixos/modules/programs/zsh/zsh-syntax-highlighting.nix +++ b/nixos/modules/programs/zsh/zsh-syntax-highlighting.nix @@ -32,7 +32,7 @@ in }; patterns = mkOption { - default = []; + default = {}; type = types.attrsOf types.string; example = literalExample '' From 96faeb19144277c73a0975ef161dd6ea384fd714 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sun, 4 Jun 2017 16:02:42 +0200 Subject: [PATCH 107/117] gollum: Add Git as runtime dependency Now "nix-shell -p gollum --pure --run gollum" should work properly. --- pkgs/applications/misc/gollum/default.nix | 31 +++++++++++++++-------- 1 file changed, 21 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/misc/gollum/default.nix b/pkgs/applications/misc/gollum/default.nix index db401a2dbdc..160b38463b6 100644 --- a/pkgs/applications/misc/gollum/default.nix +++ b/pkgs/applications/misc/gollum/default.nix @@ -1,17 +1,28 @@ -{ stdenv, lib, bundlerEnv, ruby -, icu, zlib }: +{ stdenv, bundlerEnv, ruby, makeWrapper +, git }: -bundlerEnv rec { - name = "gollum-${version}"; - version = (import gemset).gollum.version; +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "gollum"; + version = (import ./gemset.nix).gollum.version; - inherit ruby; - gemdir = ./.; - gemset = ./gemset.nix; + nativeBuildInputs = [ makeWrapper ]; - # FIXME: Add Git as runtime dependency. + env = bundlerEnv { + name = "${name}-gems"; + inherit pname ruby; + gemdir = ./.; + }; - meta = with lib; { + phases = [ "installPhase" ]; + + installPhase = '' + mkdir -p $out/bin + makeWrapper ${env}/bin/gollum $out/bin/gollum \ + --prefix PATH ":" ${stdenv.lib.makeBinPath [ git ]} + ''; + + meta = with stdenv.lib; { description = "A simple, Git-powered wiki"; homepage = "https://github.com/gollum/gollum"; license = licenses.mit; From 9caa9220a7f806c69182a5379fa9b1000781b31f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Isma=C3=AFl=20Senhaji?= Date: Sun, 4 Jun 2017 16:57:28 +0200 Subject: [PATCH 108/117] i3lock-color: 2.7-2017-04-01 -> 2.9.1-c --- pkgs/applications/window-managers/i3/lock-color.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/window-managers/i3/lock-color.nix b/pkgs/applications/window-managers/i3/lock-color.nix index aa4001f62de..ade6182ec7b 100644 --- a/pkgs/applications/window-managers/i3/lock-color.nix +++ b/pkgs/applications/window-managers/i3/lock-color.nix @@ -2,14 +2,14 @@ , xcbutilimage, pam, libX11, libev, cairo, libxkbcommon, libxkbfile }: stdenv.mkDerivation rec { - version = "2.7-2017-04-01"; + version = "2.9.1-c"; name = "i3lock-color-${version}"; src = fetchFromGitHub { owner = "chrjguill"; repo = "i3lock-color"; - rev = "61f6428aedbe4829d3e0f51d137283c8aec1e206"; - sha256 = "0h4nzx46kcsp6b1i2lm9y4d1w1icrpvjl8g1h3wbpa5x4crh4703"; + rev = version; + sha256 = "0qnw71qbppgp3ywj1k07av7wkl9syfb8j6izrkhj143q2ks4rkvl"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ which libxcb xcbutilkeysyms xcbutilimage pam libX11 From 970ad2b93afb67df8e9b557763aa5ef62eecd916 Mon Sep 17 00:00:00 2001 From: Daniel Fullmer Date: Sun, 4 Jun 2017 23:21:38 -0400 Subject: [PATCH 109/117] pythonPackages.systemd: 231 -> 233 --- pkgs/top-level/python-packages.nix | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0a1d8932972..6a3b424780b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -24043,21 +24043,18 @@ in { }; systemd = buildPythonPackage rec { - version = "231"; + version = "233"; name = "python-systemd-${version}"; src = pkgs.fetchurl { url = "https://github.com/systemd/python-systemd/archive/v${version}.tar.gz"; - sha256 = "1sifq7mdg0y5ngab8vjy8995nz9c0hxny35dxs5qjx0k0hyzb71c"; + sha256 = "1ryzv0d5y448mxpf2cx97rk0403w2w44bha8rqgww1fasx0c9dgg"; }; buildInputs = with pkgs; [ systemd pkgconfig ]; - patchPhase = '' - substituteInPlace setup.py \ - --replace "/usr/include" "${pkgs.systemd.dev}/include" - echo '#include ' >> systemd/pyutil.h - ''; + # Certain tests only run successfully on a machine w/ systemd. + doCheck = false; meta = { description = "Python module for native access to the systemd facilities"; From 2e08839cbe430a1e47d08467a55dd3c2dd9facad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 5 Jun 2017 06:11:51 +0100 Subject: [PATCH 110/117] sysdig: fix unified cgroup handling --- pkgs/os-specific/linux/sysdig/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/os-specific/linux/sysdig/default.nix b/pkgs/os-specific/linux/sysdig/default.nix index e7c101918ac..ed0e0849721 100644 --- a/pkgs/os-specific/linux/sysdig/default.nix +++ b/pkgs/os-specific/linux/sysdig/default.nix @@ -12,6 +12,14 @@ stdenv.mkDerivation rec { sha256 = "1h3f9nkc5fkvks6va0maq377m9qxnsf4q3f2dc14rdzfvnzidy06"; }; + patches = [ + (fetchpatch { + # Sysdig fails to run on linux kernels with unified cgroups enabled + url = https://github.com/draios/sysdig/files/909689/0001-Fix-for-linux-kernels-with-cgroup-v2-API-enabled.patch.txt; + sha256 = "10nmisifa500hzpa3899rs837bcal72pnqidxmrnr1js187z8j84"; + }) + ]; + buildInputs = [ cmake zlib luajit ncurses perl jsoncpp libb64 openssl curl jq gcc ]; From e6550cb5c19599d7016bab488f94e8f59d0c924c Mon Sep 17 00:00:00 2001 From: Guillaume Maudoux Date: Mon, 5 Jun 2017 07:10:49 +0200 Subject: [PATCH 111/117] calibre: fix RPATH problems It took quite some discussions to find a good solution: close #26201, close #26209. (Authorship assigned to the author of the idea.) --- pkgs/applications/misc/calibre/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 6dcd96216cb..5d228d264d0 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -62,6 +62,8 @@ stdenv.mkDerivation rec { ]); installPhase = '' + runHook preInstall + export HOME=$TMPDIR/fakehome export POPPLER_INC_DIR=${poppler_utils.dev}/include/poppler export POPPLER_LIB_DIR=${poppler_utils.out}/lib @@ -92,6 +94,8 @@ stdenv.mkDerivation rec { for entry in $out/share/applications/*.desktop; do substituteAllInPlace $entry done + + runHook postInstall ''; calibreDesktopItem = makeDesktopItem { From 68eb2c2379826ea8ada3403e737fefcb963a1e4a Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 31 May 2017 07:45:28 +0000 Subject: [PATCH 112/117] ocamlPackages.re2: mark broken on darwin --- pkgs/development/ocaml-modules/janestreet/default.nix | 9 ++------- pkgs/tools/misc/patdiff/default.nix | 1 - pkgs/top-level/ocaml-packages.nix | 2 +- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/pkgs/development/ocaml-modules/janestreet/default.nix b/pkgs/development/ocaml-modules/janestreet/default.nix index 98a303e2a67..d6acbaa7142 100644 --- a/pkgs/development/ocaml-modules/janestreet/default.nix +++ b/pkgs/development/ocaml-modules/janestreet/default.nix @@ -1,4 +1,4 @@ -{ lib, janePackage, ocamlbuild, cryptokit, ctypes, magic-mime, +{ stdenv, lib, janePackage, ocamlbuild, cryptokit, ctypes, magic-mime, ocaml-migrate-parsetree, octavius, ounit, ppx_deriving, re, zarith, openssl }: @@ -328,7 +328,7 @@ rec { propagatedBuildInputs = [ core_kernel ]; meta = { description = "OCaml bindings for RE2"; - platforms = lib.platforms.linux; + broken = stdenv.isDarwin; }; }; @@ -348,7 +348,6 @@ rec { ''; meta = { description = "Jane Street Capital's standard library overlay"; - inherit (re2.meta) platforms; }; }; @@ -416,7 +415,6 @@ rec { propagatedBuildInputs = [ core_extended async ]; meta = { description = "Shell helpers for Async"; - inherit (core_extended.meta) platforms; }; }; @@ -479,7 +477,6 @@ rec { propagatedBuildInputs = [ core_extended ]; meta = { description = "Micro-benchmarking library for OCaml"; - inherit (core_extended.meta) platforms; }; }; @@ -489,7 +486,6 @@ rec { propagatedBuildInputs = [ core_extended ]; meta = { description = "Profiling library"; - inherit (core_extended.meta) platforms; }; }; @@ -513,7 +509,6 @@ rec { propagatedBuildInputs = [ async core_extended cryptokit magic-mime ounit ]; meta = { description = "E-mail message parser"; - inherit (core_extended.meta) platforms; }; }; diff --git a/pkgs/tools/misc/patdiff/default.nix b/pkgs/tools/misc/patdiff/default.nix index 6e3c635f87a..908da587d4b 100644 --- a/pkgs/tools/misc/patdiff/default.nix +++ b/pkgs/tools/misc/patdiff/default.nix @@ -8,6 +8,5 @@ janePackage { buildInputs = [ core_extended expect_test_helpers patience_diff ocaml_pcre ]; meta = { description = "File Diff using the Patience Diff algorithm"; - inherit (core_extended.meta) platforms; }; } diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index ab82597b9e5..708cb374880 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -594,7 +594,7 @@ let janeStreet = import ../development/ocaml-modules/janestreet { inherit lib janePackage ocamlbuild ctypes cryptokit magic-mime; inherit ocaml-migrate-parsetree octavius ounit ppx_deriving re zarith; - openssl = pkgs.openssl; + inherit (pkgs) stdenv openssl; }; js_build_tools = callPackage ../development/ocaml-modules/janestreet/js-build-tools.nix {}; From e6b5a7e6272642589e692bf9af612c12b45b81eb Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 5 Jun 2017 05:46:44 +0000 Subject: [PATCH 113/117] gnome-backgrounds: build on all unices --- pkgs/desktops/gnome-3/3.22/core/gnome-backgrounds/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-backgrounds/default.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-backgrounds/default.nix index 32d6d6e7535..eb801caf565 100644 --- a/pkgs/desktops/gnome-3/3.22/core/gnome-backgrounds/default.nix +++ b/pkgs/desktops/gnome-3/3.22/core/gnome-backgrounds/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig intltool ]; meta = with stdenv.lib; { - platforms = platforms.linux; + platforms = platforms.unix; maintainers = gnome3.maintainers; }; } From dd1471b4c4d60f59ff8328d8da78af0411068b15 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 5 Jun 2017 05:50:46 +0000 Subject: [PATCH 114/117] libvirt: fix build on darwin --- pkgs/development/libraries/libvirt/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index 9449a8f538f..511f97eb3cd 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -24,10 +24,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper pkgconfig ]; buildInputs = [ libxml2 gnutls perl python2 readline gettext libtasn1 libgcrypt yajl - attr libxslt xhtml1 perlPackages.XMLXPath curl libpcap parted + libxslt xhtml1 perlPackages.XMLXPath curl libpcap ] ++ optionals stdenv.isLinux [ libpciaccess devicemapper lvm2 utillinux systemd libnl numad zfs - libapparmor libcap_ng numactl xen + libapparmor libcap_ng numactl xen attr parted ] ++ optionals stdenv.isDarwin [ libiconv gmp ]; @@ -50,7 +50,6 @@ stdenv.mkDerivation rec { "--with-test" "--with-esx" "--with-remote" - "--with-storage-disk" ] ++ optionals stdenv.isLinux [ "--with-attr" "--with-apparmor" @@ -59,6 +58,7 @@ stdenv.mkDerivation rec { "--with-macvtap" "--with-virtualport" "--with-init-script=systemd+redhat" + "--with-storage-disk" "--with-storage-zfs" ] ++ optionals stdenv.isDarwin [ "--with-init-script=none" @@ -74,8 +74,8 @@ stdenv.mkDerivation rec { substituteInPlace $out/libexec/libvirt-guests.sh \ --replace "$out/bin" "${gettext}/bin" \ --replace "lock/subsys" "lock" - rm $out/lib/systemd/system/{virtlockd,virtlogd}.* '' + optionalString stdenv.isLinux '' + rm $out/lib/systemd/system/{virtlockd,virtlogd}.* wrapProgram $out/sbin/libvirtd \ --prefix PATH : ${makeBinPath [ iptables iproute pmutils numad numactl ]} ''; From 5b747cc7c458f4a20d4773c29c4676a41ba04340 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Mon, 5 Jun 2017 15:37:48 +0800 Subject: [PATCH 115/117] paperkey: 1.3 -> 1.4 --- pkgs/tools/security/paperkey/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/security/paperkey/default.nix b/pkgs/tools/security/paperkey/default.nix index c3b1d64c3a3..97a8c0af2c8 100644 --- a/pkgs/tools/security/paperkey/default.nix +++ b/pkgs/tools/security/paperkey/default.nix @@ -1,17 +1,16 @@ { fetchurl, stdenv }: stdenv.mkDerivation rec { - - version = "1.3"; name = "paperkey-${version}"; - + version = "1.4"; + src = fetchurl { url = "http://www.jabberwocky.com/software/paperkey/${name}.tar.gz"; - sha256 = "5b57d7522336fb65c4c398eec27bf44ec0aaa35926157b79a76423231792cbfb"; + sha256 = "0vrkryxqbsjcmqalsnxvc3pahg6vvyrn139aj8md29sihgnb0az1"; }; enableParallelBuilding = true; - + meta = with stdenv.lib; { description = "Store OpenPGP or GnuPG on paper"; longDescription = '' @@ -23,6 +22,6 @@ stdenv.mkDerivation rec { homepage = "http://www.jabberwocky.com/software/paperkey/"; license = licenses.gpl2; platforms = platforms.linux; - maintainers = [ maintainers.skeidel ]; + maintainers = with maintainers; [ skeidel ]; }; } From 1890b1fe9f1470d07f1649d5e142e3947ea44c8a Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Fri, 2 Jun 2017 21:00:43 +0800 Subject: [PATCH 116/117] wp-cli: 1.1.0 -> 1.2.0 --- pkgs/development/tools/wp-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/wp-cli/default.nix b/pkgs/development/tools/wp-cli/default.nix index c52f2553e3d..9e692e214b9 100644 --- a/pkgs/development/tools/wp-cli/default.nix +++ b/pkgs/development/tools/wp-cli/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchurl, php }: let - version = "1.1.0"; + version = "1.2.0"; bin = "bin/wp"; ini = "etc/php/wp-cli.ini"; @@ -17,7 +17,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/wp-cli/wp-cli/releases/download/v${version}/${name}.phar"; - sha256 = "08b2lzc8fa9f5xldbdza6x3lg6jsp3wfwpyy187gxqw5pmqp11xc"; + sha256 = "1v51230gpw3ghz8vp3s1ykrwnmka9gj0r7xjad79bc9y250vr920"; }; buildCommand = '' From a0598f9b347c197f979c513d6d3034aeb1855780 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Mon, 5 Jun 2017 18:02:03 +0800 Subject: [PATCH 117/117] tomb: clean up and use gnupg 2 instead of gnupg 1 --- pkgs/os-specific/linux/tomb/default.nix | 44 ++++++++++++++----------- 1 file changed, 24 insertions(+), 20 deletions(-) diff --git a/pkgs/os-specific/linux/tomb/default.nix b/pkgs/os-specific/linux/tomb/default.nix index 141af86a337..f1347c197bf 100644 --- a/pkgs/os-specific/linux/tomb/default.nix +++ b/pkgs/os-specific/linux/tomb/default.nix @@ -1,18 +1,23 @@ -{ stdenv, fetchurl, zsh, pinentry, cryptsetup, gnupg1orig, makeWrapper }: - -let - version = "2.4"; -in +{ stdenv, lib, fetchFromGitHub, gettext, zsh, pinentry, cryptsetup, gnupg, makeWrapper }: stdenv.mkDerivation rec { name = "tomb-${version}"; + version = "2.4"; - src = fetchurl { - url = "https://files.dyne.org/tomb/Tomb-${version}.tar.gz"; - sha256 = "1hv1w79as7swqj0n137vz8n8mwvcgwlvd91sdyssz41jarg7f1vr"; + src = fetchFromGitHub { + owner = "dyne"; + repo = "Tomb"; + rev = "v${version}"; + sha256 = "192jpgn02mvi4d4inbq2q11zl7xw6njymvali7al8wmygkkycrw4"; }; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; + + postPatch = '' + # if not, it shows .tomb-wrapped when running + substituteInPlace tomb \ + --replace 'TOMBEXEC=$0' 'TOMBEXEC=tomb' + ''; buildPhase = '' # manually patch the interpreter @@ -20,22 +25,21 @@ stdenv.mkDerivation rec { ''; installPhase = '' - mkdir -p $out/bin - mkdir -p $out/share/man/man1 + install -Dm755 tomb $out/bin/tomb + install -Dm644 doc/tomb.1 $out/share/man/man1/tomb.1 - cp tomb $out/bin/tomb - cp doc/tomb.1 $out/share/man/man1 + # it works fine with gnupg v2, but it looks for an executable named gpg + ln -s ${gnupg}/bin/gpg2 $out/bin/gpg wrapProgram $out/bin/tomb \ - --prefix PATH : "${pinentry}/bin" \ - --prefix PATH : "${cryptsetup}/bin" \ - --prefix PATH : "${gnupg1orig}/bin" + --prefix PATH : $out/bin:${lib.makeBinPath [ cryptsetup gettext pinentry ]} ''; - meta = { + meta = with stdenv.lib; { description = "File encryption on GNU/Linux"; - homepage = https://www.dyne.org/software/tomb/; - license = stdenv.lib.licenses.gpl3; - platforms = stdenv.lib.platforms.linux; + homepage = https://www.dyne.org/software/tomb/; + license = licenses.gpl3; + maintainers = with maintainers; [ peterhoeg ]; + platforms = platforms.linux; }; }