From 40de82611b9ebd15b2c5649415ae95cfaff26bb2 Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Mon, 8 Jan 2018 17:39:37 +0100 Subject: [PATCH 01/31] pythonPackages.django: 1.11.8 -> 1.11.9 See https://docs.djangoproject.com/en/2.0/releases/1.11.9/ for release information --- pkgs/development/python-modules/django/1_11.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django/1_11.nix b/pkgs/development/python-modules/django/1_11.nix index 9079fd86e1c2..ca0322cf607c 100644 --- a/pkgs/development/python-modules/django/1_11.nix +++ b/pkgs/development/python-modules/django/1_11.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "Django"; name = "${pname}-${version}"; - version = "1.11.8"; + version = "1.11.9"; disabled = pythonOlder "2.7"; src = fetchurl { url = "http://www.djangoproject.com/m/releases/1.11/${name}.tar.gz"; - sha256 = "04gphaarwj1yrhhpi9im6gsg77i2vv0iwyjc0pmxba53nndyglzy"; + sha256 = "0d0hh9sh2rwazi7z2lnqvz1424bq6ps6c5h6ss04klp14agi4g9m"; }; patches = stdenv.lib.optionals withGdal [ From 0d54f987daa30407e127ee9cc1fd4af8b406aef9 Mon Sep 17 00:00:00 2001 From: Ashley Gillman Date: Tue, 16 Jan 2018 13:39:02 +1000 Subject: [PATCH 02/31] pythonPackages.nimfa: init at 1.3.1 --- pkgs/top-level/python-packages.nix | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 10705d02d6bc..8f8672e4ec88 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11343,6 +11343,28 @@ in { nilearn = callPackage ../development/python-modules/nilearn {}; + nimfa = buildPythonPackage rec { + pname = "nimfa"; + version = "1.3.1"; + name = "${pname}-${version}"; + + src = pkgs.fetchurl { + url = "mirror://pypi/n/${pname}/${name}.tar.gz"; + sha256 = "05d0m5n96bg6wj94r7m1har48f93797gk5v9s62zdv7x83a6n6j5"; + }; + + propagatedBuildInputs = with self; [ numpy scipy ]; + buildInputs = with self; [ matplotlib pytest ]; + doCheck = false; # errors + + meta = with pkgs.stdenv.lib; { + description = "Nonnegative matrix factorization library"; + homepage = "http://nimfa.biolab.si"; + license = licenses.bsd3; + maintainers = with maintainers; [ ashgillman ]; + }; + }; + nipy = buildPythonPackage rec { version = "0.4.0"; name = "nipy-${version}"; From 99e035ac7084667e5bd019dc9964092c30b7029b Mon Sep 17 00:00:00 2001 From: Ashley Gillman Date: Tue, 16 Jan 2018 13:41:16 +1000 Subject: [PATCH 03/31] pythonPackages.progressbar2: init at 3.12.0 --- pkgs/top-level/python-packages.nix | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 10705d02d6bc..cb012ed84b4b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -14580,6 +14580,29 @@ in { }; }); + progressbar2 = buildPythonPackage (rec { + name = "progressbar2-${version}"; + version = "3.12.0"; + + src = pkgs.fetchFromGitHub { + owner = "WoLpH"; + repo = "python-progressbar"; + rev = "v${version}"; + sha256 = "1gk45sh8cd0kkyvzcvx95z6nlblmyx0x189mjfv3vfa43cr1mb0f"; + }; + + buildInputs = with self; [ pytest ]; + propagatedBuildInputs = with self; [ python-utils ]; + doCheck = false; + + meta = { + homepage = https://progressbar-2.readthedocs.io/en/latest/; + description = "Text progressbar library for python"; + license = licenses.bsd3; + maintainers = with maintainers; [ ashgillman ]; + }; + }); + ldap = callPackage ../development/python-modules/ldap { inherit (pkgs) openldap cyrus_sasl openssl; }; From 19b3b1638439de3d5c8c7461298fa5f80bba4fa9 Mon Sep 17 00:00:00 2001 From: Ashley Gillman Date: Tue, 16 Jan 2018 18:46:30 +1000 Subject: [PATCH 04/31] pythonPackages.progressbar2: move to separate file. --- .../python-modules/progressbar2/default.nix | 28 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 23 +-------------- 2 files changed, 29 insertions(+), 22 deletions(-) create mode 100644 pkgs/development/python-modules/progressbar2/default.nix diff --git a/pkgs/development/python-modules/progressbar2/default.nix b/pkgs/development/python-modules/progressbar2/default.nix new file mode 100644 index 000000000000..ab2fa895b22e --- /dev/null +++ b/pkgs/development/python-modules/progressbar2/default.nix @@ -0,0 +1,28 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, pytest +, python-utils +}: + +buildPythonPackage (rec { + name = "${pname}-${version}"; + pname = "progressbar2"; + version = "3.12.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "16r21cpjvv0spf4mymgpy7hx6977iy11k44n2w9kipwg4lhwh02k"; + }; + + buildInputs = [ pytest ]; + propagatedBuildInputs = [ python-utils ]; + doCheck = false; + + meta = with stdenv.lib; { + homepage = https://progressbar-2.readthedocs.io/en/latest/; + description = "Text progressbar library for python"; + license = licenses.bsd3; + maintainers = with maintainers; [ ashgillman ]; + }; +}) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index cb012ed84b4b..28cc851121c6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -14580,28 +14580,7 @@ in { }; }); - progressbar2 = buildPythonPackage (rec { - name = "progressbar2-${version}"; - version = "3.12.0"; - - src = pkgs.fetchFromGitHub { - owner = "WoLpH"; - repo = "python-progressbar"; - rev = "v${version}"; - sha256 = "1gk45sh8cd0kkyvzcvx95z6nlblmyx0x189mjfv3vfa43cr1mb0f"; - }; - - buildInputs = with self; [ pytest ]; - propagatedBuildInputs = with self; [ python-utils ]; - doCheck = false; - - meta = { - homepage = https://progressbar-2.readthedocs.io/en/latest/; - description = "Text progressbar library for python"; - license = licenses.bsd3; - maintainers = with maintainers; [ ashgillman ]; - }; - }); + progressbar2 = callPackage ../development/python-modules/progressbar2 { }; ldap = callPackage ../development/python-modules/ldap { inherit (pkgs) openldap cyrus_sasl openssl; From b9e126d2d1396e90389fee80b9905fc1f28d6d38 Mon Sep 17 00:00:00 2001 From: Ashley Gillman Date: Tue, 16 Jan 2018 18:55:56 +1000 Subject: [PATCH 05/31] pythonPackages.nimfa: Move to own file. --- .../python-modules/nimfa/default.nix | 30 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 22 +------------- 2 files changed, 31 insertions(+), 21 deletions(-) create mode 100644 pkgs/development/python-modules/nimfa/default.nix diff --git a/pkgs/development/python-modules/nimfa/default.nix b/pkgs/development/python-modules/nimfa/default.nix new file mode 100644 index 000000000000..87f7755fcf2b --- /dev/null +++ b/pkgs/development/python-modules/nimfa/default.nix @@ -0,0 +1,30 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, numpy +, scipy +, matplotlib +, pytest +}: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "nimfa"; + version = "1.3.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "05d0m5n96bg6wj94r7m1har48f93797gk5v9s62zdv7x83a6n6j5"; + }; + + propagatedBuildInputs = [ numpy scipy ]; + buildInputs = [ matplotlib pytest ]; + doCheck = false; # errors + + meta = with stdenv.lib; { + description = "Nonnegative matrix factorization library"; + homepage = "http://nimfa.biolab.si"; + license = licenses.bsd3; + maintainers = with maintainers; [ ashgillman ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8f8672e4ec88..1670655e6869 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11343,27 +11343,7 @@ in { nilearn = callPackage ../development/python-modules/nilearn {}; - nimfa = buildPythonPackage rec { - pname = "nimfa"; - version = "1.3.1"; - name = "${pname}-${version}"; - - src = pkgs.fetchurl { - url = "mirror://pypi/n/${pname}/${name}.tar.gz"; - sha256 = "05d0m5n96bg6wj94r7m1har48f93797gk5v9s62zdv7x83a6n6j5"; - }; - - propagatedBuildInputs = with self; [ numpy scipy ]; - buildInputs = with self; [ matplotlib pytest ]; - doCheck = false; # errors - - meta = with pkgs.stdenv.lib; { - description = "Nonnegative matrix factorization library"; - homepage = "http://nimfa.biolab.si"; - license = licenses.bsd3; - maintainers = with maintainers; [ ashgillman ]; - }; - }; + nimfa = callPackage ../development/python-modules/nimfa {}; nipy = buildPythonPackage rec { version = "0.4.0"; From 356eeb0d4fd6dd52d8f2778701d0c1d46edd8d88 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Thu, 4 Jan 2018 17:19:54 +0000 Subject: [PATCH 06/31] nixos/mighttpd2: init --- nixos/modules/misc/ids.nix | 2 + nixos/modules/module-list.nix | 1 + .../services/web-servers/mighttpd2.nix | 132 ++++++++++++++++++ 3 files changed, 135 insertions(+) create mode 100644 nixos/modules/services/web-servers/mighttpd2.nix diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index c6440dd906fd..415be580e974 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -301,6 +301,7 @@ pykms = 282; kodi = 283; restya-board = 284; + mighttpd2 = 285; # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399! @@ -570,6 +571,7 @@ pykms = 282; kodi = 283; restya-board = 284; + mighttpd2 = 285; # 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 eaa5f606cb6b..a8718bd77871 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -633,6 +633,7 @@ ./services/web-servers/lighttpd/default.nix ./services/web-servers/lighttpd/gitweb.nix ./services/web-servers/lighttpd/inginious.nix + ./services/web-servers/mighttpd2.nix ./services/web-servers/minio.nix ./services/web-servers/nginx/default.nix ./services/web-servers/phpfpm/default.nix diff --git a/nixos/modules/services/web-servers/mighttpd2.nix b/nixos/modules/services/web-servers/mighttpd2.nix new file mode 100644 index 000000000000..a888f623616e --- /dev/null +++ b/nixos/modules/services/web-servers/mighttpd2.nix @@ -0,0 +1,132 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.mighttpd2; + configFile = pkgs.writeText "mighty-config" cfg.config; + routingFile = pkgs.writeText "mighty-routing" cfg.routing; +in { + options.services.mighttpd2 = { + enable = mkEnableOption "Mighttpd2 web server"; + + config = mkOption { + default = ""; + example = '' + # Example configuration for Mighttpd 2 + Port: 80 + # IP address or "*" + Host: * + Debug_Mode: Yes # Yes or No + # If available, "nobody" is much more secure for User:. + User: root + # If available, "nobody" is much more secure for Group:. + Group: root + Pid_File: /var/run/mighty.pid + Logging: Yes # Yes or No + Log_File: /var/log/mighty # The directory must be writable by User: + Log_File_Size: 16777216 # bytes + Log_Backup_Number: 10 + Index_File: index.html + Index_Cgi: index.cgi + Status_File_Dir: /usr/local/share/mighty/status + Connection_Timeout: 30 # seconds + Fd_Cache_Duration: 10 # seconds + # Server_Name: Mighttpd/3.x.y + Tls_Port: 443 + Tls_Cert_File: cert.pem # should change this with an absolute path + # should change this with comma-separated absolute paths + Tls_Chain_Files: chain.pem + # Currently, Tls_Key_File must not be encrypted. + Tls_Key_File: privkey.pem # should change this with an absolute path + Service: 0 # 0 is HTTP only, 1 is HTTPS only, 2 is both + ''; + type = types.lines; + description = '' + Verbatim config file to use + (see http://www.mew.org/~kazu/proj/mighttpd/en/config.html) + ''; + }; + + routing = mkOption { + default = ""; + example = '' + # Example routing for Mighttpd 2 + + # Domain lists + [localhost www.example.com] + + # Entries are looked up in the specified order + # All paths must end with "/" + + # A path to CGI scripts should be specified with "=>" + /~alice/cgi-bin/ => /home/alice/public_html/cgi-bin/ + + # A path to static files should be specified with "->" + /~alice/ -> /home/alice/public_html/ + /cgi-bin/ => /export/cgi-bin/ + + # Reverse proxy rules should be specified with ">>" + # /path >> host:port/path2 + # Either "host" or ":port" can be committed, but not both. + /app/cal/ >> example.net/calendar/ + # Yesod app in the same server + /app/wiki/ >> 127.0.0.1:3000/ + + / -> /export/www/ + ''; + type = types.lines; + description = '' + Verbatim routing file to use + (see http://www.mew.org/~kazu/proj/mighttpd/en/config.html) + ''; + }; + + cores = mkOption { + default = null; + type = types.nullOr types.int; + description = '' + How many cores to use. + If null it will be determined automatically + ''; + }; + + }; + + config = mkIf cfg.enable { + assertions = + [ { assertion = cfg.routing != ""; + message = "You need at least one rule in mighttpd2.routing"; + } + ]; + systemd.services.mighttpd2 = { + description = "Mighttpd2 web server"; + after = [ "network-online.target" ]; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + ExecStart = '' + ${pkgs.haskellPackages.mighttpd2}/bin/mighty \ + ${configFile} \ + ${routingFile} \ + +RTS -N${optionalString (cfg.cores != null) "${cfg.cores}"} + ''; + Type = "simple"; + User = "mighttpd2"; + Group = "mighttpd2"; + Restart = "on-failure"; + AmbientCapabilities = "cap_net_bind_service"; + CapabilityBoundingSet = "cap_net_bind_service"; + }; + }; + + users.extraUsers.mighttpd2 = { + group = "mighttpd2"; + uid = config.ids.uids.mighttpd2; + isSystemUser = true; + }; + + users.extraGroups.mighttpd2.gid = config.ids.gids.mighttpd2; + }; + + meta.maintainers = with lib.maintainers; [ fgaz ]; +} From 74bcd87ed9ab48755984fb3529fa67bf06120204 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 16 Jan 2018 15:05:42 -0600 Subject: [PATCH 07/31] lldb-{4,5}: install manpage --- pkgs/development/compilers/llvm/4/lldb.nix | 5 +++++ pkgs/development/compilers/llvm/5/lldb.nix | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/pkgs/development/compilers/llvm/4/lldb.nix b/pkgs/development/compilers/llvm/4/lldb.nix index 7d33179913be..5ffc346a479e 100644 --- a/pkgs/development/compilers/llvm/4/lldb.nix +++ b/pkgs/development/compilers/llvm/4/lldb.nix @@ -43,6 +43,11 @@ stdenv.mkDerivation { enableParallelBuilding = true; + postInstall = '' + mkdir -p $out/share/man/man1 + cp ../docs/lldb.1 $out/share/man/man1/ + ''; + meta = with stdenv.lib; { description = "A next-generation high-performance debugger"; homepage = http://llvm.org/; diff --git a/pkgs/development/compilers/llvm/5/lldb.nix b/pkgs/development/compilers/llvm/5/lldb.nix index 03e65dde0e4d..559c52831cd2 100644 --- a/pkgs/development/compilers/llvm/5/lldb.nix +++ b/pkgs/development/compilers/llvm/5/lldb.nix @@ -42,6 +42,11 @@ stdenv.mkDerivation { enableParallelBuilding = true; + postInstall = '' + mkdir -p $out/share/man/man1 + cp ../docs/lldb.1 $out/share/man/man1/ + ''; + meta = with stdenv.lib; { description = "A next-generation high-performance debugger"; homepage = http://llvm.org/; From 0f84673f3dd72c3194ca861a5eafb218bbbcc43a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 16 Jan 2018 22:59:13 +0100 Subject: [PATCH 08/31] Remove nckx as a maintainer for all packages Goodbye, and thanks for all the Nix... --- pkgs/applications/audio/dfasma/default.nix | 1 - pkgs/applications/audio/fmit/default.nix | 1 - pkgs/applications/audio/id3v2/default.nix | 1 - pkgs/applications/audio/keyfinder-cli/default.nix | 1 - pkgs/applications/audio/keyfinder/default.nix | 1 - pkgs/applications/audio/seq24/default.nix | 2 +- pkgs/applications/editors/neovim/default.nix | 2 +- pkgs/applications/editors/tiled/default.nix | 1 - pkgs/applications/graphics/apitrace/default.nix | 1 - pkgs/applications/graphics/sane/backends/generic.nix | 2 +- pkgs/applications/graphics/swingsane/default.nix | 1 - pkgs/applications/misc/ganttproject-bin/default.nix | 1 - pkgs/applications/misc/ocropus/default.nix | 2 +- pkgs/applications/misc/redshift/default.nix | 2 +- pkgs/applications/misc/workrave/default.nix | 2 +- .../networking/feedreaders/rawdog/default.nix | 1 - .../networking/feedreaders/rsstail/default.nix | 1 - .../networking/remote/x2goclient/default.nix | 1 - pkgs/applications/networking/vnstat/default.nix | 1 - .../git-and-tools/git-bz/default.nix | 1 - .../git-and-tools/git-hub/default.nix | 1 - pkgs/applications/video/clipgrab/default.nix | 1 - pkgs/applications/video/gnome-mpv/default.nix | 1 - pkgs/applications/video/minitube/default.nix | 1 - pkgs/applications/virtualization/remotebox/default.nix | 1 - pkgs/data/documentation/man-pages/default.nix | 1 - pkgs/data/fonts/hack/default.nix | 1 - pkgs/data/misc/geolite-legacy/default.nix | 2 +- pkgs/data/misc/sound-theme-freedesktop/default.nix | 1 - pkgs/data/misc/wireless-regdb/default.nix | 2 +- pkgs/desktops/gnome-3/core/simple-scan/default.nix | 1 - pkgs/development/compilers/squeak/default.nix | 1 - pkgs/development/interpreters/picoc/default.nix | 1 - pkgs/development/libraries/accounts-qt/default.nix | 1 - pkgs/development/libraries/bobcat/default.nix | 1 - pkgs/development/libraries/cpp-netlib/default.nix | 1 - pkgs/development/libraries/ip2location-c/default.nix | 1 - pkgs/development/libraries/libcli/default.nix | 1 - pkgs/development/libraries/libconfuse/default.nix | 1 - pkgs/development/libraries/libkeyfinder/default.nix | 1 - .../libraries/libnetfilter_conntrack/default.nix | 1 - .../development/libraries/libnetfilter_log/default.nix | 2 +- pkgs/development/libraries/libpsl/default.nix | 1 - pkgs/development/libraries/libxcomp/default.nix | 1 - pkgs/development/libraries/lzo/default.nix | 1 - pkgs/development/libraries/rote/default.nix | 1 - pkgs/development/python-modules/Pygments/default.nix | 2 +- .../python-modules/prompt_toolkit/default.nix | 1 - pkgs/development/tools/alloy/default.nix | 1 - pkgs/development/tools/analysis/coan/default.nix | 1 - pkgs/development/tools/analysis/egypt/default.nix | 1 - .../tools/analysis/include-what-you-use/default.nix | 1 - .../tools/build-managers/icmake/default.nix | 2 +- pkgs/development/tools/database/pgcli/default.nix | 1 - pkgs/development/tools/java/cfr/default.nix | 1 - .../tools/misc/bin_replace_string/default.nix | 1 - pkgs/development/tools/misc/ccache/default.nix | 1 - pkgs/development/tools/misc/yodl/default.nix | 2 +- pkgs/development/tools/parsing/flexc++/default.nix | 1 - pkgs/development/tools/parsing/lemon/default.nix | 1 - pkgs/games/2048-in-terminal/default.nix | 1 - pkgs/games/eduke32/default.nix | 2 +- pkgs/games/soi/default.nix | 2 +- pkgs/misc/cups/drivers/samsung/4.00.39/default.nix | 1 - pkgs/misc/cups/drivers/samsung/default.nix | 1 - pkgs/os-specific/linux/acpid/default.nix | 1 - pkgs/os-specific/linux/cifs-utils/default.nix | 1 - pkgs/os-specific/linux/conntrack-tools/default.nix | 2 +- pkgs/os-specific/linux/crda/default.nix | 1 - pkgs/os-specific/linux/dstat/default.nix | 2 +- pkgs/os-specific/linux/fatrace/default.nix | 1 - .../linux/firmware/b43-firmware/6.30.163.46.nix | 1 - pkgs/os-specific/linux/freefall/default.nix | 1 - pkgs/os-specific/linux/ftop/default.nix | 1 - pkgs/os-specific/linux/jfbview/default.nix | 1 - pkgs/os-specific/linux/kexectools/default.nix | 1 - pkgs/os-specific/linux/mcelog/default.nix | 1 - pkgs/os-specific/linux/pagemon/default.nix | 1 - pkgs/os-specific/linux/phc-intel/default.nix | 1 - pkgs/os-specific/linux/radeontop/default.nix | 2 +- pkgs/os-specific/linux/sdparm/default.nix | 1 - pkgs/servers/nosql/cassandra/generic.nix | 2 +- pkgs/servers/p910nd/default.nix | 1 - pkgs/shells/mksh/default.nix | 2 +- pkgs/tools/admin/nxproxy/default.nix | 1 - pkgs/tools/admin/simp_le/default.nix | 2 +- pkgs/tools/archivers/unarj/default.nix | 1 - pkgs/tools/archivers/zpaq/default.nix | 2 +- pkgs/tools/archivers/zpaq/zpaqd.nix | 2 +- pkgs/tools/backup/borg/default.nix | 2 +- pkgs/tools/cd-dvd/bashburn/default.nix | 1 - pkgs/tools/cd-dvd/dvdisaster/default.nix | 2 +- pkgs/tools/compression/lz4/default.nix | 1 - pkgs/tools/compression/xdelta/default.nix | 1 - pkgs/tools/compression/xdelta/unstable.nix | 1 - pkgs/tools/compression/zopfli/default.nix | 2 +- pkgs/tools/compression/zstd/default.nix | 2 +- pkgs/tools/filesystems/boxfs/default.nix | 1 - pkgs/tools/filesystems/btrfs-progs/default.nix | 2 +- pkgs/tools/filesystems/duff/default.nix | 1 - pkgs/tools/filesystems/encfs/default.nix | 1 - pkgs/tools/filesystems/exfat/default.nix | 1 - pkgs/tools/filesystems/gpart/default.nix | 1 - pkgs/tools/filesystems/mp3fs/default.nix | 1 - pkgs/tools/filesystems/s3backer/default.nix | 1 - pkgs/tools/filesystems/securefs/default.nix | 1 - pkgs/tools/graphics/enblend-enfuse/default.nix | 1 - pkgs/tools/graphics/scanbd/default.nix | 1 - pkgs/tools/misc/bandwidth/default.nix | 2 +- pkgs/tools/misc/clex/default.nix | 1 - pkgs/tools/misc/gparted/default.nix | 1 - pkgs/tools/misc/ipad_charge/default.nix | 1 - pkgs/tools/misc/ms-sys/default.nix | 1 - pkgs/tools/misc/snapper/default.nix | 2 +- pkgs/tools/misc/tldr/default.nix | 2 +- pkgs/tools/misc/wakatime/default.nix | 1 - pkgs/tools/networking/aircrack-ng/default.nix | 2 +- pkgs/tools/networking/darkstat/default.nix | 1 - pkgs/tools/networking/dhcping/default.nix | 1 - pkgs/tools/networking/gandi-cli/default.nix | 1 - pkgs/tools/networking/hans/default.nix | 1 - pkgs/tools/networking/httping/default.nix | 2 +- pkgs/tools/networking/ip2location/default.nix | 1 - pkgs/tools/networking/ipv6calc/default.nix | 1 - pkgs/tools/networking/minissdpd/default.nix | 1 - pkgs/tools/networking/miniupnpd/default.nix | 1 - pkgs/tools/networking/netsniff-ng/default.nix | 1 - pkgs/tools/networking/pcapc/default.nix | 1 - pkgs/tools/networking/pingtcp/default.nix | 1 - pkgs/tools/package-management/dpkg/default.nix | 2 +- pkgs/tools/package-management/packagekit/default.nix | 2 +- pkgs/tools/security/bruteforce-luks/default.nix | 1 - pkgs/tools/security/eid-mw/default.nix | 1 - pkgs/tools/security/eid-viewer/default.nix | 1 - pkgs/tools/security/sshuttle/default.nix | 2 +- pkgs/tools/system/foremost/default.nix | 1 - pkgs/tools/system/gptfdisk/default.nix | 1 - pkgs/tools/system/htop/default.nix | 2 +- pkgs/tools/system/proot/default.nix | 2 +- pkgs/tools/system/stress-ng/default.nix | 1 - pkgs/tools/system/suid-chroot/default.nix | 1 - pkgs/tools/system/thinkfan/default.nix | 2 +- pkgs/tools/text/aha/default.nix | 1 - pkgs/tools/text/colordiff/default.nix | 1 - pkgs/top-level/perl-packages.nix | 5 ----- pkgs/top-level/python-packages.nix | 10 ---------- 146 files changed, 38 insertions(+), 159 deletions(-) diff --git a/pkgs/applications/audio/dfasma/default.nix b/pkgs/applications/audio/dfasma/default.nix index 125df237dfe5..d16534b03d32 100644 --- a/pkgs/applications/audio/dfasma/default.nix +++ b/pkgs/applications/audio/dfasma/default.nix @@ -62,6 +62,5 @@ in stdenv.mkDerivation rec { homepage = http://gillesdegottex.github.io/dfasma/; license = [ licenses.gpl3Plus reaperFork.meta.license ]; platforms = platforms.linux; - maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/applications/audio/fmit/default.nix b/pkgs/applications/audio/fmit/default.nix index 66f82226b507..ba3f31d05014 100644 --- a/pkgs/applications/audio/fmit/default.nix +++ b/pkgs/applications/audio/fmit/default.nix @@ -49,6 +49,5 @@ stdenv.mkDerivation rec { homepage = http://gillesdegottex.github.io/fmit/; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/applications/audio/id3v2/default.nix b/pkgs/applications/audio/id3v2/default.nix index 6653526c6e2f..d2720fcace67 100644 --- a/pkgs/applications/audio/id3v2/default.nix +++ b/pkgs/applications/audio/id3v2/default.nix @@ -23,7 +23,6 @@ stdenv.mkDerivation rec { description = "A command line editor for id3v2 tags"; homepage = http://id3v2.sourceforge.net/; license = licenses.gpl2Plus; - maintainers = with maintainers; [ nckx ]; platforms = with platforms; unix; }; } diff --git a/pkgs/applications/audio/keyfinder-cli/default.nix b/pkgs/applications/audio/keyfinder-cli/default.nix index 6a013e8c604f..344e6894baf5 100644 --- a/pkgs/applications/audio/keyfinder-cli/default.nix +++ b/pkgs/applications/audio/keyfinder-cli/default.nix @@ -27,6 +27,5 @@ stdenv.mkDerivation rec { ''; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/applications/audio/keyfinder/default.nix b/pkgs/applications/audio/keyfinder/default.nix index f011e909052c..55039e8508bc 100644 --- a/pkgs/applications/audio/keyfinder/default.nix +++ b/pkgs/applications/audio/keyfinder/default.nix @@ -37,6 +37,5 @@ stdenv.mkDerivation rec { homepage = http://www.ibrahimshaath.co.uk/keyfinder/; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/applications/audio/seq24/default.nix b/pkgs/applications/audio/seq24/default.nix index ebeef301e103..11ee00adc887 100644 --- a/pkgs/applications/audio/seq24/default.nix +++ b/pkgs/applications/audio/seq24/default.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation rec { homepage = http://www.filter24.org/seq24; license = licenses.gpl2; platforms = platforms.linux; - maintainers = with maintainers; [ goibhniu nckx ]; + maintainers = with maintainers; [ goibhniu ]; }; } diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix index d7cfcf34a4d2..97627b00e2f8 100644 --- a/pkgs/applications/editors/neovim/default.nix +++ b/pkgs/applications/editors/neovim/default.nix @@ -32,7 +32,7 @@ let description = "VT220/xterm/ECMA-48 terminal emulator library"; homepage = http://www.leonerd.org.uk/code/libvterm/; license = licenses.mit; - maintainers = with maintainers; [ nckx garbas ]; + maintainers = with maintainers; [ garbas ]; platforms = platforms.unix; }; }; diff --git a/pkgs/applications/editors/tiled/default.nix b/pkgs/applications/editors/tiled/default.nix index 0dde8fbe7297..1c5767d17f4b 100644 --- a/pkgs/applications/editors/tiled/default.nix +++ b/pkgs/applications/editors/tiled/default.nix @@ -25,6 +25,5 @@ stdenv.mkDerivation rec { gpl2Plus # all the rest ]; platforms = platforms.linux; - maintainers = [ maintainers.nckx ]; }; } diff --git a/pkgs/applications/graphics/apitrace/default.nix b/pkgs/applications/graphics/apitrace/default.nix index 9b1dd4c25aeb..459e07f9838b 100644 --- a/pkgs/applications/graphics/apitrace/default.nix +++ b/pkgs/applications/graphics/apitrace/default.nix @@ -22,6 +22,5 @@ stdenv.mkDerivation rec { description = "Tools to trace OpenGL, OpenGL ES, Direct3D, and DirectDraw APIs"; license = licenses.mit; platforms = platforms.linux; - maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/applications/graphics/sane/backends/generic.nix b/pkgs/applications/graphics/sane/backends/generic.nix index 5d35857f05e1..2ca1fead84c8 100644 --- a/pkgs/applications/graphics/sane/backends/generic.nix +++ b/pkgs/applications/graphics/sane/backends/generic.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation { homepage = http://www.sane-project.org/; license = licenses.gpl2Plus; - maintainers = with maintainers; [ nckx peti ]; + maintainers = with maintainers; [ peti ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/graphics/swingsane/default.nix b/pkgs/applications/graphics/swingsane/default.nix index 53bdbcd12740..94666531c0c8 100644 --- a/pkgs/applications/graphics/swingsane/default.nix +++ b/pkgs/applications/graphics/swingsane/default.nix @@ -57,6 +57,5 @@ stdenv.mkDerivation rec { homepage = http://swingsane.com/; license = licenses.asl20; platforms = platforms.all; - maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/applications/misc/ganttproject-bin/default.nix b/pkgs/applications/misc/ganttproject-bin/default.nix index 1b29def11ad8..2257b2a98fb7 100644 --- a/pkgs/applications/misc/ganttproject-bin/default.nix +++ b/pkgs/applications/misc/ganttproject-bin/default.nix @@ -51,6 +51,5 @@ stdenv.mkDerivation rec { # ‘GPL3-compatible’. See ${downloadPage} for detailed information. license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/applications/misc/ocropus/default.nix b/pkgs/applications/misc/ocropus/default.nix index ad3d72e9ef50..35931707ed6b 100644 --- a/pkgs/applications/misc/ocropus/default.nix +++ b/pkgs/applications/misc/ocropus/default.nix @@ -53,7 +53,7 @@ pythonPackages.buildPythonApplication rec { description = "Open source document analysis and OCR system"; license = licenses.asl20; homepage = https://github.com/tmbdev/ocropy/; - maintainers = with maintainers; [ domenkozar nckx viric ]; + maintainers = with maintainers; [ domenkozar viric ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/redshift/default.nix b/pkgs/applications/misc/redshift/default.nix index b4f37719046d..77f27d9fa376 100644 --- a/pkgs/applications/misc/redshift/default.nix +++ b/pkgs/applications/misc/redshift/default.nix @@ -58,6 +58,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; homepage = http://jonls.dk/redshift; platforms = platforms.linux; - maintainers = with maintainers; [ mornfall nckx ]; + maintainers = with maintainers; [ mornfall ]; }; } diff --git a/pkgs/applications/misc/workrave/default.nix b/pkgs/applications/misc/workrave/default.nix index 8c554da03621..fbf68f317dee 100644 --- a/pkgs/applications/misc/workrave/default.nix +++ b/pkgs/applications/misc/workrave/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { homepage = http://www.workrave.org/; downloadPage = https://github.com/rcaelers/workrave/releases; license = licenses.gpl3; - maintainers = with maintainers; [ nckx prikhi ]; + maintainers = with maintainers; [ prikhi ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/networking/feedreaders/rawdog/default.nix b/pkgs/applications/networking/feedreaders/rawdog/default.nix index 72a98a996046..3a5983c2e276 100644 --- a/pkgs/applications/networking/feedreaders/rawdog/default.nix +++ b/pkgs/applications/networking/feedreaders/rawdog/default.nix @@ -18,6 +18,5 @@ python2Packages.buildPythonApplication rec { description = "RSS Aggregator Without Delusions Of Grandeur"; license = licenses.gpl2; platforms = platforms.unix; - maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/applications/networking/feedreaders/rsstail/default.nix b/pkgs/applications/networking/feedreaders/rsstail/default.nix index fd349b320d28..a7fd31cac2ff 100644 --- a/pkgs/applications/networking/feedreaders/rsstail/default.nix +++ b/pkgs/applications/networking/feedreaders/rsstail/default.nix @@ -32,6 +32,5 @@ stdenv.mkDerivation rec { homepage = http://www.vanheusden.com/rsstail/; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/applications/networking/remote/x2goclient/default.nix b/pkgs/applications/networking/remote/x2goclient/default.nix index 3edf45d9acd9..904a6812c489 100644 --- a/pkgs/applications/networking/remote/x2goclient/default.nix +++ b/pkgs/applications/networking/remote/x2goclient/default.nix @@ -33,6 +33,5 @@ stdenv.mkDerivation rec { homepage = http://x2go.org/; license = licenses.gpl2; platforms = platforms.linux; - maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/applications/networking/vnstat/default.nix b/pkgs/applications/networking/vnstat/default.nix index c3424e2fc779..7c059b6f9fde 100644 --- a/pkgs/applications/networking/vnstat/default.nix +++ b/pkgs/applications/networking/vnstat/default.nix @@ -26,7 +26,6 @@ stdenv.mkDerivation rec { ''; homepage = http://humdi.net/vnstat/; license = licenses.gpl2Plus; - maintainers = with maintainers; [ nckx ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/version-management/git-and-tools/git-bz/default.nix b/pkgs/applications/version-management/git-and-tools/git-bz/default.nix index 4ed9c5c0509c..c14a027b4abe 100644 --- a/pkgs/applications/version-management/git-and-tools/git-bz/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-bz/default.nix @@ -49,7 +49,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; homepage = http://git.fishsoup.net/cgit/git-bz/; - maintainers = with maintainers; [ nckx ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/version-management/git-and-tools/git-hub/default.nix b/pkgs/applications/version-management/git-and-tools/git-hub/default.nix index f308073f1f1e..1c264739588a 100644 --- a/pkgs/applications/version-management/git-and-tools/git-hub/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-hub/default.nix @@ -40,6 +40,5 @@ stdenv.mkDerivation rec { ''; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/applications/video/clipgrab/default.nix b/pkgs/applications/video/clipgrab/default.nix index 69f58fe94bd8..e9f172aad76e 100644 --- a/pkgs/applications/video/clipgrab/default.nix +++ b/pkgs/applications/video/clipgrab/default.nix @@ -49,6 +49,5 @@ stdenv.mkDerivation rec { homepage = https://clipgrab.org/; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/applications/video/gnome-mpv/default.nix b/pkgs/applications/video/gnome-mpv/default.nix index 2f073d1731dc..3e5d49f80303 100644 --- a/pkgs/applications/video/gnome-mpv/default.nix +++ b/pkgs/applications/video/gnome-mpv/default.nix @@ -38,6 +38,5 @@ stdenv.mkDerivation rec { homepage = https://github.com/gnome-mpv/gnome-mpv; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/applications/video/minitube/default.nix b/pkgs/applications/video/minitube/default.nix index bef3a78d782e..8b94204cd627 100644 --- a/pkgs/applications/video/minitube/default.nix +++ b/pkgs/applications/video/minitube/default.nix @@ -36,6 +36,5 @@ stdenv.mkDerivation rec { homepage = https://flavio.tordini.org/minitube; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/applications/virtualization/remotebox/default.nix b/pkgs/applications/virtualization/remotebox/default.nix index a99e6f569564..cb84ad49aebd 100644 --- a/pkgs/applications/virtualization/remotebox/default.nix +++ b/pkgs/applications/virtualization/remotebox/default.nix @@ -37,7 +37,6 @@ stdenv.mkDerivation rec { RemoteBox aims to fill this gap by providing a graphical VirtualBox client which is able to manage a VirtualBox server installation. ''; - maintainers = with maintainers; [ nckx ]; platforms = platforms.all; }; } diff --git a/pkgs/data/documentation/man-pages/default.nix b/pkgs/data/documentation/man-pages/default.nix index b77b79338c75..f292ef4d52d9 100644 --- a/pkgs/data/documentation/man-pages/default.nix +++ b/pkgs/data/documentation/man-pages/default.nix @@ -21,7 +21,6 @@ stdenv.mkDerivation rec { description = "Linux development manual pages"; homepage = https://www.kernel.org/doc/man-pages/; repositories.git = http://git.kernel.org/pub/scm/docs/man-pages/man-pages; - maintainers = with maintainers; [ nckx ]; platforms = with platforms; unix; }; } diff --git a/pkgs/data/fonts/hack/default.nix b/pkgs/data/fonts/hack/default.nix index f997f10db1dd..0edd27dab0e3 100644 --- a/pkgs/data/fonts/hack/default.nix +++ b/pkgs/data/fonts/hack/default.nix @@ -37,6 +37,5 @@ in fetchzip rec { */ license = licenses.free; platforms = platforms.all; - maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/data/misc/geolite-legacy/default.nix b/pkgs/data/misc/geolite-legacy/default.nix index 5f4497020319..309ae47a8516 100644 --- a/pkgs/data/misc/geolite-legacy/default.nix +++ b/pkgs/data/misc/geolite-legacy/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { homepage = https://geolite.maxmind.com/download/geoip; license = licenses.cc-by-sa-30; platforms = platforms.all; - maintainers = with maintainers; [ nckx fpletz ]; + maintainers = with maintainers; [ fpletz ]; }; builder = ./builder.sh; diff --git a/pkgs/data/misc/sound-theme-freedesktop/default.nix b/pkgs/data/misc/sound-theme-freedesktop/default.nix index 7c3f045b1b7e..043d3d65b84e 100644 --- a/pkgs/data/misc/sound-theme-freedesktop/default.nix +++ b/pkgs/data/misc/sound-theme-freedesktop/default.nix @@ -16,7 +16,6 @@ stdenv.mkDerivation rec { homepage = http://freedesktop.org/wiki/Specifications/sound-theme-spec; # See http://cgit.freedesktop.org/sound-theme-freedesktop/tree/CREDITS: license = with licenses; [ cc-by-30 cc-by-sa-25 gpl2 gpl2Plus ]; - maintainers = with maintainers; [ nckx ]; platforms = with platforms; unix; }; } diff --git a/pkgs/data/misc/wireless-regdb/default.nix b/pkgs/data/misc/wireless-regdb/default.nix index b69762d933fa..c714dc6cf1b0 100644 --- a/pkgs/data/misc/wireless-regdb/default.nix +++ b/pkgs/data/misc/wireless-regdb/default.nix @@ -21,6 +21,6 @@ stdenv.mkDerivation rec { homepage = http://wireless.kernel.org/en/developers/Regulatory/; license = licenses.isc; platforms = platforms.all; - maintainers = with maintainers; [ nckx fpletz ]; + maintainers = with maintainers; [ fpletz ]; }; } diff --git a/pkgs/desktops/gnome-3/core/simple-scan/default.nix b/pkgs/desktops/gnome-3/core/simple-scan/default.nix index a30467c1862d..19f05ad6d119 100644 --- a/pkgs/desktops/gnome-3/core/simple-scan/default.nix +++ b/pkgs/desktops/gnome-3/core/simple-scan/default.nix @@ -54,6 +54,5 @@ stdenv.mkDerivation rec { homepage = https://launchpad.net/simple-scan; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/development/compilers/squeak/default.nix b/pkgs/development/compilers/squeak/default.nix index af56026b43a2..25ea47978fcd 100644 --- a/pkgs/development/compilers/squeak/default.nix +++ b/pkgs/development/compilers/squeak/default.nix @@ -43,6 +43,5 @@ stdenv.mkDerivation rec { downloadPage = http://squeakvm.org/unix/index.html; license = with licenses; [ asl20 mit ]; platforms = platforms.linux; - maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/development/interpreters/picoc/default.nix b/pkgs/development/interpreters/picoc/default.nix index e78b74347198..62ab7b02585e 100644 --- a/pkgs/development/interpreters/picoc/default.nix +++ b/pkgs/development/interpreters/picoc/default.nix @@ -47,6 +47,5 @@ stdenv.mkDerivation rec { downloadPage = https://code.google.com/p/picoc/downloads/list; license = licenses.bsd3; platforms = platforms.linux; - maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/development/libraries/accounts-qt/default.nix b/pkgs/development/libraries/accounts-qt/default.nix index e45a9f2f3871..e7a90e405489 100644 --- a/pkgs/development/libraries/accounts-qt/default.nix +++ b/pkgs/development/libraries/accounts-qt/default.nix @@ -25,7 +25,6 @@ stdenv.mkDerivation rec { description = "Qt library for accessing the online accounts database"; homepage = https://gitlab.com/accounts-sso; license = licenses.lgpl21; - maintainers = with maintainers; [ nckx ]; platforms = with platforms; linux; }; } diff --git a/pkgs/development/libraries/bobcat/default.nix b/pkgs/development/libraries/bobcat/default.nix index 9805930c7bfa..dd7d6a348671 100644 --- a/pkgs/development/libraries/bobcat/default.nix +++ b/pkgs/development/libraries/bobcat/default.nix @@ -39,6 +39,5 @@ stdenv.mkDerivation rec { homepage = https://fbb-git.github.io/bobcat/; license = licenses.gpl3; platforms = platforms.linux; - maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/development/libraries/cpp-netlib/default.nix b/pkgs/development/libraries/cpp-netlib/default.nix index ecc730597c31..e5391e7100d5 100644 --- a/pkgs/development/libraries/cpp-netlib/default.nix +++ b/pkgs/development/libraries/cpp-netlib/default.nix @@ -26,6 +26,5 @@ stdenv.mkDerivation rec { homepage = http://cpp-netlib.org; license = licenses.boost; platforms = platforms.all; - maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/development/libraries/ip2location-c/default.nix b/pkgs/development/libraries/ip2location-c/default.nix index 109510df79b1..82a4ec337555 100644 --- a/pkgs/development/libraries/ip2location-c/default.nix +++ b/pkgs/development/libraries/ip2location-c/default.nix @@ -28,6 +28,5 @@ stdenv.mkDerivation rec { homepage = http://www.ip2location.com/developers/c-7; license = with licenses; [ gpl3Plus lgpl3Plus ]; platforms = platforms.linux; - maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/development/libraries/libcli/default.nix b/pkgs/development/libraries/libcli/default.nix index 587e72409c45..f101eb223106 100644 --- a/pkgs/development/libraries/libcli/default.nix +++ b/pkgs/development/libraries/libcli/default.nix @@ -27,6 +27,5 @@ stdenv.mkDerivation rec { homepage = http://sites.dparrish.com/libcli; license = licenses.lgpl21Plus; platforms = platforms.linux; - maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/development/libraries/libconfuse/default.nix b/pkgs/development/libraries/libconfuse/default.nix index a89bdec2c8af..1ef550238d15 100644 --- a/pkgs/development/libraries/libconfuse/default.nix +++ b/pkgs/development/libraries/libconfuse/default.nix @@ -32,6 +32,5 @@ stdenv.mkDerivation rec { ''; license = licenses.isc; platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/development/libraries/libkeyfinder/default.nix b/pkgs/development/libraries/libkeyfinder/default.nix index 326d9c4f9d78..93f3b2a4f84d 100644 --- a/pkgs/development/libraries/libkeyfinder/default.nix +++ b/pkgs/development/libraries/libkeyfinder/default.nix @@ -34,6 +34,5 @@ stdenv.mkDerivation rec { homepage = http://www.ibrahimshaath.co.uk/keyfinder/; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/development/libraries/libnetfilter_conntrack/default.nix b/pkgs/development/libraries/libnetfilter_conntrack/default.nix index a94bf28cd972..17dea7b3d7d2 100644 --- a/pkgs/development/libraries/libnetfilter_conntrack/default.nix +++ b/pkgs/development/libraries/libnetfilter_conntrack/default.nix @@ -24,6 +24,5 @@ stdenv.mkDerivation rec { homepage = http://netfilter.org/projects/libnetfilter_conntrack/; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/development/libraries/libnetfilter_log/default.nix b/pkgs/development/libraries/libnetfilter_log/default.nix index e3c8447549d1..f660cd7a7814 100644 --- a/pkgs/development/libraries/libnetfilter_log/default.nix +++ b/pkgs/development/libraries/libnetfilter_log/default.nix @@ -24,6 +24,6 @@ stdenv.mkDerivation rec { homepage = http://netfilter.org/projects/libnetfilter_log/; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = with maintainers; [ orivej nckx ]; + maintainers = with maintainers; [ orivej ]; }; } diff --git a/pkgs/development/libraries/libpsl/default.nix b/pkgs/development/libraries/libpsl/default.nix index c35c7e1bc0f5..b1100d00f3e0 100644 --- a/pkgs/development/libraries/libpsl/default.nix +++ b/pkgs/development/libraries/libpsl/default.nix @@ -64,6 +64,5 @@ in stdenv.mkDerivation rec { homepage = http://rockdaboot.github.io/libpsl/; license = licenses.mit; platforms = with platforms; linux ++ darwin; - maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/development/libraries/libxcomp/default.nix b/pkgs/development/libraries/libxcomp/default.nix index f38c7a900329..68f8c44a8ec8 100644 --- a/pkgs/development/libraries/libxcomp/default.nix +++ b/pkgs/development/libraries/libxcomp/default.nix @@ -23,6 +23,5 @@ stdenv.mkDerivation rec { homepage = http://wiki.x2go.org/doku.php/wiki:libs:nx-libs; license = licenses.gpl2; platforms = platforms.linux; - maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/development/libraries/lzo/default.nix b/pkgs/development/libraries/lzo/default.nix index df5cb7c67f38..c7667b554f4e 100644 --- a/pkgs/development/libraries/lzo/default.nix +++ b/pkgs/development/libraries/lzo/default.nix @@ -30,6 +30,5 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; platforms = platforms.all; - maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/development/libraries/rote/default.nix b/pkgs/development/libraries/rote/default.nix index 524afd7cf4d2..195db9a16858 100644 --- a/pkgs/development/libraries/rote/default.nix +++ b/pkgs/development/libraries/rote/default.nix @@ -26,6 +26,5 @@ stdenv.mkDerivation rec { homepage = http://rote.sourceforge.net/; license = licenses.lgpl21; platforms = platforms.linux; - maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/development/python-modules/Pygments/default.nix b/pkgs/development/python-modules/Pygments/default.nix index 11a6fc96eb2f..8ab846986f06 100644 --- a/pkgs/development/python-modules/Pygments/default.nix +++ b/pkgs/development/python-modules/Pygments/default.nix @@ -23,6 +23,6 @@ buildPythonPackage rec { homepage = http://pygments.org/; description = "A generic syntax highlighter"; license = lib.licenses.bsd2; - maintainers = with lib.maintainers; [ nckx garbas ]; + maintainers = with lib.maintainers; [ garbas ]; }; } \ No newline at end of file diff --git a/pkgs/development/python-modules/prompt_toolkit/default.nix b/pkgs/development/python-modules/prompt_toolkit/default.nix index 9704f1b92c96..59aec94ff90e 100644 --- a/pkgs/development/python-modules/prompt_toolkit/default.nix +++ b/pkgs/development/python-modules/prompt_toolkit/default.nix @@ -35,6 +35,5 @@ buildPythonPackage rec { ''; homepage = https://github.com/jonathanslenders/python-prompt-toolkit; license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ nckx ]; }; } \ No newline at end of file diff --git a/pkgs/development/tools/alloy/default.nix b/pkgs/development/tools/alloy/default.nix index fbf784db0cc6..c965e5a937a4 100644 --- a/pkgs/development/tools/alloy/default.nix +++ b/pkgs/development/tools/alloy/default.nix @@ -54,6 +54,5 @@ stdenv.mkDerivation rec { downloadPage = http://alloy.mit.edu/alloy/download.html; license = licenses.mit; platforms = platforms.linux; - maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/development/tools/analysis/coan/default.nix b/pkgs/development/tools/analysis/coan/default.nix index 3ce5f23f6457..2b4a87ffcb8d 100644 --- a/pkgs/development/tools/analysis/coan/default.nix +++ b/pkgs/development/tools/analysis/coan/default.nix @@ -29,6 +29,5 @@ stdenv.mkDerivation rec { homepage = http://coan2.sourceforge.net/; license = licenses.bsd3; platforms = platforms.linux; - maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/development/tools/analysis/egypt/default.nix b/pkgs/development/tools/analysis/egypt/default.nix index 572e2f744714..a7f29017fbe0 100644 --- a/pkgs/development/tools/analysis/egypt/default.nix +++ b/pkgs/development/tools/analysis/egypt/default.nix @@ -28,6 +28,5 @@ buildPerlPackage rec { homepage = http://www.gson.org/egypt/; license = with licenses; [ artistic1 gpl1Plus ]; platforms = platforms.linux; - maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/development/tools/analysis/include-what-you-use/default.nix b/pkgs/development/tools/analysis/include-what-you-use/default.nix index 7f34ec0fd630..f2481013fbbd 100644 --- a/pkgs/development/tools/analysis/include-what-you-use/default.nix +++ b/pkgs/development/tools/analysis/include-what-you-use/default.nix @@ -30,6 +30,5 @@ stdenv.mkDerivation rec { homepage = http://include-what-you-use.org; license = licenses.bsd3; platforms = platforms.linux; - maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/development/tools/build-managers/icmake/default.nix b/pkgs/development/tools/build-managers/icmake/default.nix index ac9bfee815e7..2744dac2500b 100644 --- a/pkgs/development/tools/build-managers/icmake/default.nix +++ b/pkgs/development/tools/build-managers/icmake/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { description = "A program maintenance (make) utility using a C-like grammar"; homepage = https://fbb-git.github.io/icmake/; license = licenses.gpl3; - maintainers = with maintainers; [ nckx pSub ]; + maintainers = with maintainers; [ pSub ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/tools/database/pgcli/default.nix b/pkgs/development/tools/database/pgcli/default.nix index bcb0cf1d5e4c..4ea3589476bd 100644 --- a/pkgs/development/tools/database/pgcli/default.nix +++ b/pkgs/development/tools/database/pgcli/default.nix @@ -35,6 +35,5 @@ pythonPackages.buildPythonApplication rec { ''; homepage = https://pgcli.com; license = licenses.bsd3; - maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/development/tools/java/cfr/default.nix b/pkgs/development/tools/java/cfr/default.nix index 46170341437c..bfb37fc5f03b 100644 --- a/pkgs/development/tools/java/cfr/default.nix +++ b/pkgs/development/tools/java/cfr/default.nix @@ -35,6 +35,5 @@ stdenv.mkDerivation rec { homepage = http://www.benf.org/other/cfr/; license = licenses.mit; platforms = platforms.all; - maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/development/tools/misc/bin_replace_string/default.nix b/pkgs/development/tools/misc/bin_replace_string/default.nix index fda527ee905a..ac7eb557f2ed 100644 --- a/pkgs/development/tools/misc/bin_replace_string/default.nix +++ b/pkgs/development/tools/misc/bin_replace_string/default.nix @@ -27,6 +27,5 @@ stdenv.mkDerivation rec { downloadPage = ftp://ohnopub.net/mirror/; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/development/tools/misc/ccache/default.nix b/pkgs/development/tools/misc/ccache/default.nix index 65c7e633f8e2..88556d7395d9 100644 --- a/pkgs/development/tools/misc/ccache/default.nix +++ b/pkgs/development/tools/misc/ccache/default.nix @@ -69,7 +69,6 @@ let ccache = stdenv.mkDerivation rec { homepage = http://ccache.samba.org/; downloadPage = https://ccache.samba.org/download.html; license = licenses.gpl3Plus; - maintainers = with maintainers; [ nckx ]; platforms = platforms.unix; }; }; diff --git a/pkgs/development/tools/misc/yodl/default.nix b/pkgs/development/tools/misc/yodl/default.nix index e0bf9eac6963..06588e60a5e4 100644 --- a/pkgs/development/tools/misc/yodl/default.nix +++ b/pkgs/development/tools/misc/yodl/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { description = "A package that implements a pre-document language and tools to process it"; homepage = https://fbb-git.github.io/yodl/; license = licenses.gpl3; - maintainers = with maintainers; [ nckx pSub ]; + maintainers = with maintainers; [ pSub ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/tools/parsing/flexc++/default.nix b/pkgs/development/tools/parsing/flexc++/default.nix index c782df507580..681f90bbe5a6 100644 --- a/pkgs/development/tools/parsing/flexc++/default.nix +++ b/pkgs/development/tools/parsing/flexc++/default.nix @@ -43,6 +43,5 @@ stdenv.mkDerivation rec { homepage = https://fbb-git.github.io/flexcpp/; license = licenses.gpl3; platforms = platforms.linux; - maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/development/tools/parsing/lemon/default.nix b/pkgs/development/tools/parsing/lemon/default.nix index 480ee5b88f6a..108576d0b11c 100644 --- a/pkgs/development/tools/parsing/lemon/default.nix +++ b/pkgs/development/tools/parsing/lemon/default.nix @@ -41,6 +41,5 @@ in stdenv.mkDerivation rec { homepage = http://www.hwaci.com/sw/lemon/; license = licenses.publicDomain; platforms = platforms.unix; - maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/games/2048-in-terminal/default.nix b/pkgs/games/2048-in-terminal/default.nix index 30e930c294a6..9d274673494c 100644 --- a/pkgs/games/2048-in-terminal/default.nix +++ b/pkgs/games/2048-in-terminal/default.nix @@ -25,6 +25,5 @@ stdenv.mkDerivation rec { description = "Animated console version of the 2048 game"; license = licenses.mit; platforms = platforms.linux; - maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/games/eduke32/default.nix b/pkgs/games/eduke32/default.nix index 185295a20b64..42a3339594a5 100644 --- a/pkgs/games/eduke32/default.nix +++ b/pkgs/games/eduke32/default.nix @@ -70,7 +70,7 @@ in stdenv.mkDerivation rec { description = "Enhanched port of Duke Nukem 3D for various platforms"; license = licenses.gpl2Plus; homepage = http://eduke32.com; - maintainers = with maintainers; [ nckx sander ]; + maintainers = with maintainers; [ sander ]; platforms = with platforms; linux; }; } diff --git a/pkgs/games/soi/default.nix b/pkgs/games/soi/default.nix index 9fcab8b1ec9a..96a38a10c6c8 100644 --- a/pkgs/games/soi/default.nix +++ b/pkgs/games/soi/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A physics-based puzzle game"; - maintainers = with maintainers; [ raskin nckx ]; + maintainers = with maintainers; [ raskin ]; platforms = platforms.linux; license = licenses.free; downloadPage = http://sourceforge.net/projects/soi/files/; diff --git a/pkgs/misc/cups/drivers/samsung/4.00.39/default.nix b/pkgs/misc/cups/drivers/samsung/4.00.39/default.nix index 16b40798a5da..18dd6c14822b 100644 --- a/pkgs/misc/cups/drivers/samsung/4.00.39/default.nix +++ b/pkgs/misc/cups/drivers/samsung/4.00.39/default.nix @@ -38,6 +38,5 @@ in stdenv.mkDerivation rec { homepage = http://www.samsung.com/; license = licenses.unfree; platforms = platforms.linux; - maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/misc/cups/drivers/samsung/default.nix b/pkgs/misc/cups/drivers/samsung/default.nix index 556c408012d2..e8da0541f6c5 100644 --- a/pkgs/misc/cups/drivers/samsung/default.nix +++ b/pkgs/misc/cups/drivers/samsung/default.nix @@ -94,6 +94,5 @@ in stdenv.mkDerivation rec { # Tested on linux-x86_64. Might work on linux-i386. # Probably won't work on anything else. platforms = platforms.linux; - maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/os-specific/linux/acpid/default.nix b/pkgs/os-specific/linux/acpid/default.nix index 95efbab5be4f..c209cf6e3162 100644 --- a/pkgs/os-specific/linux/acpid/default.nix +++ b/pkgs/os-specific/linux/acpid/default.nix @@ -13,6 +13,5 @@ stdenv.mkDerivation rec { description = "A daemon for delivering ACPI events to userspace programs"; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/os-specific/linux/cifs-utils/default.nix b/pkgs/os-specific/linux/cifs-utils/default.nix index 08c6d997795f..8c9e7a9ade56 100644 --- a/pkgs/os-specific/linux/cifs-utils/default.nix +++ b/pkgs/os-specific/linux/cifs-utils/default.nix @@ -18,6 +18,5 @@ stdenv.mkDerivation rec { description = "Tools for managing Linux CIFS client filesystems"; platforms = platforms.linux; license = licenses.lgpl3; - maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/os-specific/linux/conntrack-tools/default.nix b/pkgs/os-specific/linux/conntrack-tools/default.nix index ea09050fc60e..9736d7a8f4bd 100644 --- a/pkgs/os-specific/linux/conntrack-tools/default.nix +++ b/pkgs/os-specific/linux/conntrack-tools/default.nix @@ -22,6 +22,6 @@ stdenv.mkDerivation rec { description = "Connection tracking userspace tools"; platforms = platforms.linux; license = licenses.gpl2Plus; - maintainers = with maintainers; [ nckx fpletz ]; + maintainers = with maintainers; [ fpletz ]; }; } diff --git a/pkgs/os-specific/linux/crda/default.nix b/pkgs/os-specific/linux/crda/default.nix index 63330020afe6..940913d6a6c8 100644 --- a/pkgs/os-specific/linux/crda/default.nix +++ b/pkgs/os-specific/linux/crda/default.nix @@ -53,6 +53,5 @@ stdenv.mkDerivation rec { homepage = http://drvbp1.linux-foundation.org/~mcgrof/rel-html/crda/; license = licenses.free; # "copyleft-next 0.3.0", as yet without a web site platforms = platforms.linux; - maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/os-specific/linux/dstat/default.nix b/pkgs/os-specific/linux/dstat/default.nix index 366cc9787f28..81cc6b4fbd8e 100644 --- a/pkgs/os-specific/linux/dstat/default.nix +++ b/pkgs/os-specific/linux/dstat/default.nix @@ -19,6 +19,6 @@ python2Packages.buildPythonApplication rec { description = "Versatile resource statistics tool"; license = licenses.gpl2; platforms = platforms.linux; - maintainers = with maintainers; [ jgeerds nckx ]; + maintainers = with maintainers; [ jgeerds ]; }; } diff --git a/pkgs/os-specific/linux/fatrace/default.nix b/pkgs/os-specific/linux/fatrace/default.nix index f68856f6b86e..fd955676775a 100644 --- a/pkgs/os-specific/linux/fatrace/default.nix +++ b/pkgs/os-specific/linux/fatrace/default.nix @@ -32,7 +32,6 @@ stdenv.mkDerivation rec { Requires a Linux kernel with the FANOTIFY configuration option enabled. Enabling X86_MSR is also recommended for power-usage-report on x86. ''; - maintainers = with maintainers; [ nckx ]; platforms = platforms.linux; }; } diff --git a/pkgs/os-specific/linux/firmware/b43-firmware/6.30.163.46.nix b/pkgs/os-specific/linux/firmware/b43-firmware/6.30.163.46.nix index 4f09410c75e5..2637beb517a3 100644 --- a/pkgs/os-specific/linux/firmware/b43-firmware/6.30.163.46.nix +++ b/pkgs/os-specific/linux/firmware/b43-firmware/6.30.163.46.nix @@ -25,6 +25,5 @@ stdenv.mkDerivation rec { homepage = http://wireless.kernel.org/en/users/Drivers/b43; downloadPage = http://www.lwfinger.com/b43-firmware; license = licenses.unfree; - maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/os-specific/linux/freefall/default.nix b/pkgs/os-specific/linux/freefall/default.nix index 54be786d10d6..a091b2f17c5e 100644 --- a/pkgs/os-specific/linux/freefall/default.nix +++ b/pkgs/os-specific/linux/freefall/default.nix @@ -29,6 +29,5 @@ stdenv.mkDerivation rec { ''; platforms = platforms.linux; - maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/os-specific/linux/ftop/default.nix b/pkgs/os-specific/linux/ftop/default.nix index 73a6d18fc8b7..915431c0cb1f 100644 --- a/pkgs/os-specific/linux/ftop/default.nix +++ b/pkgs/os-specific/linux/ftop/default.nix @@ -32,7 +32,6 @@ stdenv.mkDerivation rec { generally all that is of interest to the user). As with top, the items are displayed in order from most to least active. ''; - maintainers = with maintainers; [ nckx ]; platforms = platforms.linux; }; } diff --git a/pkgs/os-specific/linux/jfbview/default.nix b/pkgs/os-specific/linux/jfbview/default.nix index fab66a329e2e..89a220c85e2d 100644 --- a/pkgs/os-specific/linux/jfbview/default.nix +++ b/pkgs/os-specific/linux/jfbview/default.nix @@ -64,6 +64,5 @@ stdenv.mkDerivation rec { homepage = https://seasonofcode.com/pages/jfbview.html; license = licenses.asl20; platforms = platforms.linux; - maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/os-specific/linux/kexectools/default.nix b/pkgs/os-specific/linux/kexectools/default.nix index 3c5a0694a5d7..021353c47091 100644 --- a/pkgs/os-specific/linux/kexectools/default.nix +++ b/pkgs/os-specific/linux/kexectools/default.nix @@ -20,6 +20,5 @@ stdenv.mkDerivation rec { homepage = http://horms.net/projects/kexec/kexec-tools; description = "Tools related to the kexec Linux feature"; platforms = platforms.linux; - maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/os-specific/linux/mcelog/default.nix b/pkgs/os-specific/linux/mcelog/default.nix index a7f5ffaae4a2..a65f983bb36d 100644 --- a/pkgs/os-specific/linux/mcelog/default.nix +++ b/pkgs/os-specific/linux/mcelog/default.nix @@ -47,6 +47,5 @@ stdenv.mkDerivation rec { homepage = http://mcelog.org/; license = licenses.gpl2; platforms = platforms.linux; - maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/os-specific/linux/pagemon/default.nix b/pkgs/os-specific/linux/pagemon/default.nix index 414338702cc8..aec6e57e9144 100644 --- a/pkgs/os-specific/linux/pagemon/default.nix +++ b/pkgs/os-specific/linux/pagemon/default.nix @@ -33,6 +33,5 @@ stdenv.mkDerivation rec { ''; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/os-specific/linux/phc-intel/default.nix b/pkgs/os-specific/linux/phc-intel/default.nix index 356939fe2946..a766c2bb3b4a 100644 --- a/pkgs/os-specific/linux/phc-intel/default.nix +++ b/pkgs/os-specific/linux/phc-intel/default.nix @@ -49,6 +49,5 @@ in stdenv.mkDerivation rec { downloadPage = "http://www.linux-phc.org/forum/viewtopic.php?f=7&t=267"; license = licenses.gpl2; platforms = [ "x86_64-linux" "i686-linux" ]; - maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/os-specific/linux/radeontop/default.nix b/pkgs/os-specific/linux/radeontop/default.nix index cb720c206348..c87bec3a5264 100644 --- a/pkgs/os-specific/linux/radeontop/default.nix +++ b/pkgs/os-specific/linux/radeontop/default.nix @@ -40,6 +40,6 @@ stdenv.mkDerivation rec { homepage = https://github.com/clbr/radeontop; platforms = platforms.linux; license = licenses.gpl3; - maintainers = with maintainers; [ rycee nckx ]; + maintainers = with maintainers; [ rycee ]; }; } diff --git a/pkgs/os-specific/linux/sdparm/default.nix b/pkgs/os-specific/linux/sdparm/default.nix index 39bec26e07f1..a8d5112c63b9 100644 --- a/pkgs/os-specific/linux/sdparm/default.nix +++ b/pkgs/os-specific/linux/sdparm/default.nix @@ -13,7 +13,6 @@ stdenv.mkDerivation rec { homepage = http://sg.danny.cz/sg/sdparm.html; description = "A utility to access SCSI device parameters"; license = licenses.bsd3; - maintainers = with maintainers; [ nckx ]; platforms = with platforms; linux; }; } diff --git a/pkgs/servers/nosql/cassandra/generic.nix b/pkgs/servers/nosql/cassandra/generic.nix index f5f29bcdac78..50b56213b308 100644 --- a/pkgs/servers/nosql/cassandra/generic.nix +++ b/pkgs/servers/nosql/cassandra/generic.nix @@ -65,6 +65,6 @@ stdenv.mkDerivation rec { description = "A massively scalable open source NoSQL database"; platforms = platforms.unix; license = licenses.asl20; - maintainers = with maintainers; [ nckx cransom ]; + maintainers = with maintainers; [ cransom ]; }; } diff --git a/pkgs/servers/p910nd/default.nix b/pkgs/servers/p910nd/default.nix index 0f7cc19339d8..bcf1255ff4a9 100644 --- a/pkgs/servers/p910nd/default.nix +++ b/pkgs/servers/p910nd/default.nix @@ -40,6 +40,5 @@ stdenv.mkDerivation rec { downloadPage = http://sourceforge.net/projects/p910nd/; license = licenses.gpl2; platforms = platforms.linux; - maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/shells/mksh/default.nix b/pkgs/shells/mksh/default.nix index 969392309833..28d60eb6128e 100644 --- a/pkgs/shells/mksh/default.nix +++ b/pkgs/shells/mksh/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { ''; homepage = https://www.mirbsd.org/mksh.htm; license = licenses.bsd3; - maintainers = with maintainers; [ AndersonTorres nckx joachifm ]; + maintainers = with maintainers; [ AndersonTorres joachifm ]; platforms = platforms.unix; }; diff --git a/pkgs/tools/admin/nxproxy/default.nix b/pkgs/tools/admin/nxproxy/default.nix index cebe90855fae..bee9c53d02a9 100644 --- a/pkgs/tools/admin/nxproxy/default.nix +++ b/pkgs/tools/admin/nxproxy/default.nix @@ -25,6 +25,5 @@ stdenv.mkDerivation rec { homepage = http://wiki.x2go.org/doku.php/wiki:libs:nx-libs; license = licenses.gpl2; platforms = platforms.linux; - maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/tools/admin/simp_le/default.nix b/pkgs/tools/admin/simp_le/default.nix index f66fd6b00afb..ce416e7cd250 100644 --- a/pkgs/tools/admin/simp_le/default.nix +++ b/pkgs/tools/admin/simp_le/default.nix @@ -20,7 +20,7 @@ pythonPackages.buildPythonApplication rec { homepage = https://github.com/zenhack/simp_le; description = "Simple Let's Encrypt client"; license = licenses.gpl3; - maintainers = with maintainers; [ gebner nckx ]; + maintainers = with maintainers; [ gebner ]; platforms = platforms.all; }; } diff --git a/pkgs/tools/archivers/unarj/default.nix b/pkgs/tools/archivers/unarj/default.nix index f3c566596c46..9537701ebe7f 100644 --- a/pkgs/tools/archivers/unarj/default.nix +++ b/pkgs/tools/archivers/unarj/default.nix @@ -17,7 +17,6 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Unarchiver of ARJ files"; license = licenses.free; - maintainers = with maintainers; [ nckx ]; # Vulnerable to CVE-2015-0557 & possibly CVE-2015-0556, CVE-2015-2782: broken = true; }; diff --git a/pkgs/tools/archivers/zpaq/default.nix b/pkgs/tools/archivers/zpaq/default.nix index 30b05b2b2340..309604999ba2 100644 --- a/pkgs/tools/archivers/zpaq/default.nix +++ b/pkgs/tools/archivers/zpaq/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { description = "Incremental journaling backup utility and archiver"; homepage = http://mattmahoney.net/dc/zpaq.html; license = licenses.gpl3Plus ; - maintainers = with maintainers; [ raskin nckx ]; + maintainers = with maintainers; [ raskin ]; platforms = platforms.linux; inherit version; }; diff --git a/pkgs/tools/archivers/zpaq/zpaqd.nix b/pkgs/tools/archivers/zpaq/zpaqd.nix index 5e63c7cfaabf..3004c7e2132c 100644 --- a/pkgs/tools/archivers/zpaq/zpaqd.nix +++ b/pkgs/tools/archivers/zpaq/zpaqd.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "ZPAQ archive (de)compressor and algorithm development tool"; license = licenses.gpl3Plus ; - maintainers = with maintainers; [ raskin nckx ]; + maintainers = with maintainers; [ raskin ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/backup/borg/default.nix b/pkgs/tools/backup/borg/default.nix index 12a7d484bf7b..19b375137e48 100644 --- a/pkgs/tools/backup/borg/default.nix +++ b/pkgs/tools/backup/borg/default.nix @@ -49,6 +49,6 @@ python3Packages.buildPythonApplication rec { homepage = https://borgbackup.github.io/; license = licenses.bsd3; platforms = platforms.unix; # Darwin and FreeBSD mentioned on homepage - maintainers = with maintainers; [ nckx flokli ]; + maintainers = with maintainers; [ flokli ]; }; } diff --git a/pkgs/tools/cd-dvd/bashburn/default.nix b/pkgs/tools/cd-dvd/bashburn/default.nix index ada58e87fd0a..63a429e50de8 100644 --- a/pkgs/tools/cd-dvd/bashburn/default.nix +++ b/pkgs/tools/cd-dvd/bashburn/default.nix @@ -59,6 +59,5 @@ stdenv.mkDerivation rec { homepage = http://bashburn.dose.se/; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/tools/cd-dvd/dvdisaster/default.nix b/pkgs/tools/cd-dvd/dvdisaster/default.nix index 7e3c2cda48b8..e70d259df683 100644 --- a/pkgs/tools/cd-dvd/dvdisaster/default.nix +++ b/pkgs/tools/cd-dvd/dvdisaster/default.nix @@ -84,6 +84,6 @@ stdenv.mkDerivation rec { ''; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = with maintainers; [ jgeerds nckx ]; + maintainers = with maintainers; [ jgeerds ]; }; } diff --git a/pkgs/tools/compression/lz4/default.nix b/pkgs/tools/compression/lz4/default.nix index bc8666a26907..04c83fa03fcf 100644 --- a/pkgs/tools/compression/lz4/default.nix +++ b/pkgs/tools/compression/lz4/default.nix @@ -38,6 +38,5 @@ stdenv.mkDerivation rec { homepage = https://lz4.github.io/lz4/; license = with licenses; [ bsd2 gpl2Plus ]; platforms = platforms.unix; - maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/tools/compression/xdelta/default.nix b/pkgs/tools/compression/xdelta/default.nix index 8bc5e464ee74..32de493ec77d 100644 --- a/pkgs/tools/compression/xdelta/default.nix +++ b/pkgs/tools/compression/xdelta/default.nix @@ -57,6 +57,5 @@ in stdenv.mkDerivation rec { homepage = http://xdelta.org/; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/tools/compression/xdelta/unstable.nix b/pkgs/tools/compression/xdelta/unstable.nix index dd7277c4e8fb..c870e501209b 100644 --- a/pkgs/tools/compression/xdelta/unstable.nix +++ b/pkgs/tools/compression/xdelta/unstable.nix @@ -61,6 +61,5 @@ in stdenv.mkDerivation rec { homepage = http://xdelta.org/; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/tools/compression/zopfli/default.nix b/pkgs/tools/compression/zopfli/default.nix index cc4edf64c4fe..2697d22a0e01 100644 --- a/pkgs/tools/compression/zopfli/default.nix +++ b/pkgs/tools/compression/zopfli/default.nix @@ -55,6 +55,6 @@ stdenv.mkDerivation rec { ''; platforms = platforms.unix; license = licenses.asl20; - maintainers = with maintainers; [ bobvanderlinden nckx ]; + maintainers = with maintainers; [ bobvanderlinden ]; }; } diff --git a/pkgs/tools/compression/zstd/default.nix b/pkgs/tools/compression/zstd/default.nix index b28311657a1c..457170013ce5 100644 --- a/pkgs/tools/compression/zstd/default.nix +++ b/pkgs/tools/compression/zstd/default.nix @@ -45,6 +45,6 @@ stdenv.mkDerivation rec { license = with licenses; [ gpl2Plus bsd2 ]; platforms = platforms.unix; - maintainers = with maintainers; [ nckx orivej ]; + maintainers = with maintainers; [ orivej ]; }; } diff --git a/pkgs/tools/filesystems/boxfs/default.nix b/pkgs/tools/filesystems/boxfs/default.nix index 99a118160b7e..9c9dbede83f4 100644 --- a/pkgs/tools/filesystems/boxfs/default.nix +++ b/pkgs/tools/filesystems/boxfs/default.nix @@ -56,6 +56,5 @@ in stdenv.mkDerivation rec { homepage = https://github.com/drotiro/boxfs2; license = licenses.gpl3; platforms = platforms.linux; - maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/tools/filesystems/btrfs-progs/default.nix b/pkgs/tools/filesystems/btrfs-progs/default.nix index 921d359616e8..46c5bc6071f5 100644 --- a/pkgs/tools/filesystems/btrfs-progs/default.nix +++ b/pkgs/tools/filesystems/btrfs-progs/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { description = "Utilities for the btrfs filesystem"; homepage = https://btrfs.wiki.kernel.org/; license = licenses.gpl2; - maintainers = with maintainers; [ nckx raskin wkennington ]; + maintainers = with maintainers; [ raskin wkennington ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/filesystems/duff/default.nix b/pkgs/tools/filesystems/duff/default.nix index 078c80a8b703..e1b11a370553 100644 --- a/pkgs/tools/filesystems/duff/default.nix +++ b/pkgs/tools/filesystems/duff/default.nix @@ -36,6 +36,5 @@ stdenv.mkDerivation rec { homepage = http://duff.dreda.org/; license = licenses.zlib; platforms = platforms.all; - maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/tools/filesystems/encfs/default.nix b/pkgs/tools/filesystems/encfs/default.nix index 3df76d828318..e415f57e707e 100644 --- a/pkgs/tools/filesystems/encfs/default.nix +++ b/pkgs/tools/filesystems/encfs/default.nix @@ -29,7 +29,6 @@ stdenv.mkDerivation rec { description = "An encrypted filesystem in user-space via FUSE"; homepage = https://vgough.github.io/encfs; license = with licenses; [ gpl3 lgpl3 ]; - maintainers = with maintainers; [ nckx ]; platforms = with platforms; linux; }; } diff --git a/pkgs/tools/filesystems/exfat/default.nix b/pkgs/tools/filesystems/exfat/default.nix index aba0418e9dea..f404d06eda46 100644 --- a/pkgs/tools/filesystems/exfat/default.nix +++ b/pkgs/tools/filesystems/exfat/default.nix @@ -19,6 +19,5 @@ stdenv.mkDerivation rec { description = "Free exFAT file system implementation"; platforms = platforms.linux; license = licenses.gpl2Plus; - maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/tools/filesystems/gpart/default.nix b/pkgs/tools/filesystems/gpart/default.nix index b0e4d5029e08..ca2d0a627ab8 100644 --- a/pkgs/tools/filesystems/gpart/default.nix +++ b/pkgs/tools/filesystems/gpart/default.nix @@ -28,7 +28,6 @@ stdenv.mkDerivation rec { or device. ''; license = licenses.gpl2Plus; - maintainers = with maintainers; [ nckx ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/filesystems/mp3fs/default.nix b/pkgs/tools/filesystems/mp3fs/default.nix index 3a0e8e2fd467..cc8ca8411248 100644 --- a/pkgs/tools/filesystems/mp3fs/default.nix +++ b/pkgs/tools/filesystems/mp3fs/default.nix @@ -28,6 +28,5 @@ stdenv.mkDerivation rec { homepage = https://khenriks.github.io/mp3fs/; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/tools/filesystems/s3backer/default.nix b/pkgs/tools/filesystems/s3backer/default.nix index b39be214d89f..1007d04036e2 100644 --- a/pkgs/tools/filesystems/s3backer/default.nix +++ b/pkgs/tools/filesystems/s3backer/default.nix @@ -25,7 +25,6 @@ stdenv.mkDerivation rec { homepage = https://github.com/archiecobbs/s3backer; description = "FUSE-based single file backing store via Amazon S3"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ nckx ]; platforms = with platforms; linux; }; } diff --git a/pkgs/tools/filesystems/securefs/default.nix b/pkgs/tools/filesystems/securefs/default.nix index 0cd1d818f8c7..233034792e15 100644 --- a/pkgs/tools/filesystems/securefs/default.nix +++ b/pkgs/tools/filesystems/securefs/default.nix @@ -33,6 +33,5 @@ stdenv.mkDerivation rec { ''; license = with licenses; [ bsd2 mit ]; platforms = platforms.linux; - maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/tools/graphics/enblend-enfuse/default.nix b/pkgs/tools/graphics/enblend-enfuse/default.nix index 2a0796699fb8..d0f78f80c3e9 100644 --- a/pkgs/tools/graphics/enblend-enfuse/default.nix +++ b/pkgs/tools/graphics/enblend-enfuse/default.nix @@ -25,7 +25,6 @@ stdenv.mkDerivation rec { homepage = http://enblend.sourceforge.net/; description = "Blends away the seams in a panoramic image mosaic using a multiresolution spline"; license = licenses.gpl2; - maintainers = with maintainers; [ nckx ]; platforms = with platforms; linux; }; } diff --git a/pkgs/tools/graphics/scanbd/default.nix b/pkgs/tools/graphics/scanbd/default.nix index 86b4cb91de07..ba376af1c3cd 100644 --- a/pkgs/tools/graphics/scanbd/default.nix +++ b/pkgs/tools/graphics/scanbd/default.nix @@ -52,6 +52,5 @@ stdenv.mkDerivation rec { downloadPage = http://sourceforge.net/projects/scanbd/; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/tools/misc/bandwidth/default.nix b/pkgs/tools/misc/bandwidth/default.nix index 143918baa9c2..899fb5f643ab 100644 --- a/pkgs/tools/misc/bandwidth/default.nix +++ b/pkgs/tools/misc/bandwidth/default.nix @@ -34,6 +34,6 @@ stdenv.mkDerivation rec { description = "Artificial benchmark for identifying weaknesses in the memory subsystem"; license = licenses.mit; platforms = platforms.unix; - maintainers = with maintainers; [ nckx wkennington ]; + maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/tools/misc/clex/default.nix b/pkgs/tools/misc/clex/default.nix index b9e3fc179d50..2f442a7a9c10 100644 --- a/pkgs/tools/misc/clex/default.nix +++ b/pkgs/tools/misc/clex/default.nix @@ -25,6 +25,5 @@ stdenv.mkDerivation rec { homepage = http://www.clex.sk; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/tools/misc/gparted/default.nix b/pkgs/tools/misc/gparted/default.nix index be002a8c3ad9..71cfedcaec72 100644 --- a/pkgs/tools/misc/gparted/default.nix +++ b/pkgs/tools/misc/gparted/default.nix @@ -33,6 +33,5 @@ stdenv.mkDerivation rec { homepage = http://gparted.org; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/tools/misc/ipad_charge/default.nix b/pkgs/tools/misc/ipad_charge/default.nix index 9fbc915ad2eb..9b09fb35cf5a 100644 --- a/pkgs/tools/misc/ipad_charge/default.nix +++ b/pkgs/tools/misc/ipad_charge/default.nix @@ -36,6 +36,5 @@ stdenv.mkDerivation rec { ''; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/tools/misc/ms-sys/default.nix b/pkgs/tools/misc/ms-sys/default.nix index 3b7f3019998c..4a50f7200bbb 100644 --- a/pkgs/tools/misc/ms-sys/default.nix +++ b/pkgs/tools/misc/ms-sys/default.nix @@ -19,7 +19,6 @@ stdenv.mkDerivation rec { description = "A program for writing Microsoft-compatible boot records"; homepage = http://ms-sys.sourceforge.net/; license = licenses.gpl2Plus; - maintainers = with maintainers; [ nckx ]; platforms = with platforms; linux; }; } diff --git a/pkgs/tools/misc/snapper/default.nix b/pkgs/tools/misc/snapper/default.nix index 4b7857d60e7b..52a57629cd10 100644 --- a/pkgs/tools/misc/snapper/default.nix +++ b/pkgs/tools/misc/snapper/default.nix @@ -70,6 +70,6 @@ stdenv.mkDerivation rec { homepage = http://snapper.io; license = licenses.gpl2; platforms = platforms.linux; - maintainers = with maintainers; [ nckx tstrobel ]; + maintainers = with maintainers; [ tstrobel ]; }; } diff --git a/pkgs/tools/misc/tldr/default.nix b/pkgs/tools/misc/tldr/default.nix index 5cf29c5cd428..bb03b9a809bf 100644 --- a/pkgs/tools/misc/tldr/default.nix +++ b/pkgs/tools/misc/tldr/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ''; homepage = http://tldr-pages.github.io; license = licenses.mit; - maintainers = with maintainers; [ taeer nckx ]; + maintainers = with maintainers; [ taeer ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/misc/wakatime/default.nix b/pkgs/tools/misc/wakatime/default.nix index ba760496a729..9899e38c854e 100644 --- a/pkgs/tools/misc/wakatime/default.nix +++ b/pkgs/tools/misc/wakatime/default.nix @@ -32,6 +32,5 @@ buildPythonApplication rec { to install the wakatime CLI interface manually. ''; license = licenses.bsd3; - maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/tools/networking/aircrack-ng/default.nix b/pkgs/tools/networking/aircrack-ng/default.nix index d7e1b2289dca..2e982d0f912d 100644 --- a/pkgs/tools/networking/aircrack-ng/default.nix +++ b/pkgs/tools/networking/aircrack-ng/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { description = "Wireless encryption cracking tools"; homepage = http://www.aircrack-ng.org/; license = licenses.gpl2Plus; - maintainers = with maintainers; [ domenkozar viric garbas chaoflow nckx ]; + maintainers = with maintainers; [ domenkozar viric garbas chaoflow ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/networking/darkstat/default.nix b/pkgs/tools/networking/darkstat/default.nix index ce371e74ee02..4ec23862522e 100644 --- a/pkgs/tools/networking/darkstat/default.nix +++ b/pkgs/tools/networking/darkstat/default.nix @@ -26,7 +26,6 @@ stdenv.mkDerivation rec { ''; homepage = http://unix4lyfe.org/darkstat; license = licenses.gpl2; - maintainers = with maintainers; [ nckx ]; platforms = with platforms; unix; }; } diff --git a/pkgs/tools/networking/dhcping/default.nix b/pkgs/tools/networking/dhcping/default.nix index 19c2383c1c28..2599e822529f 100644 --- a/pkgs/tools/networking/dhcping/default.nix +++ b/pkgs/tools/networking/dhcping/default.nix @@ -28,6 +28,5 @@ stdenv.mkDerivation rec { homepage = http://www.mavetju.org/unix/general.php; license = licenses.bsd2; platforms = platforms.linux; - maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/tools/networking/gandi-cli/default.nix b/pkgs/tools/networking/gandi-cli/default.nix index c2bf6702c5f6..be488e788b41 100644 --- a/pkgs/tools/networking/gandi-cli/default.nix +++ b/pkgs/tools/networking/gandi-cli/default.nix @@ -22,7 +22,6 @@ buildPythonPackage rec { description = "Command-line interface to the public Gandi.net API"; homepage = http://cli.gandi.net/; license = licenses.gpl3Plus; - maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/tools/networking/hans/default.nix b/pkgs/tools/networking/hans/default.nix index 2e84aa960079..82e105c3a3be 100644 --- a/pkgs/tools/networking/hans/default.nix +++ b/pkgs/tools/networking/hans/default.nix @@ -34,6 +34,5 @@ stdenv.mkDerivation rec { homepage = http://code.gerade.org/hans/; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/tools/networking/httping/default.nix b/pkgs/tools/networking/httping/default.nix index ce58da880d63..bfe9f115133c 100644 --- a/pkgs/tools/networking/httping/default.nix +++ b/pkgs/tools/networking/httping/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { latency of the webserver + network. It supports IPv6. ''; license = licenses.agpl3; - maintainers = with maintainers; [ nckx rickynils ]; + maintainers = with maintainers; [ rickynils ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/networking/ip2location/default.nix b/pkgs/tools/networking/ip2location/default.nix index 22eb31384a19..0506c8580296 100644 --- a/pkgs/tools/networking/ip2location/default.nix +++ b/pkgs/tools/networking/ip2location/default.nix @@ -24,6 +24,5 @@ stdenv.mkDerivation rec { homepage = http://www.ip2location.com/free/applications; license = with licenses; [ gpl3Plus lgpl3Plus ]; platforms = platforms.linux; - maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/tools/networking/ipv6calc/default.nix b/pkgs/tools/networking/ipv6calc/default.nix index b28ea0dbbe52..f28c75774db5 100644 --- a/pkgs/tools/networking/ipv6calc/default.nix +++ b/pkgs/tools/networking/ipv6calc/default.nix @@ -51,6 +51,5 @@ stdenv.mkDerivation rec { homepage = http://www.deepspace6.net/projects/ipv6calc.html; license = licenses.gpl2; platforms = platforms.linux; - maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/tools/networking/minissdpd/default.nix b/pkgs/tools/networking/minissdpd/default.nix index 307b17a7a7c0..e81297e6dd82 100644 --- a/pkgs/tools/networking/minissdpd/default.nix +++ b/pkgs/tools/networking/minissdpd/default.nix @@ -31,6 +31,5 @@ stdenv.mkDerivation rec { downloadPage = http://miniupnp.free.fr/files/; license = licenses.bsd3; platforms = platforms.linux; - maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/tools/networking/miniupnpd/default.nix b/pkgs/tools/networking/miniupnpd/default.nix index 3e3b4ec34a30..a623b9fbfe9d 100644 --- a/pkgs/tools/networking/miniupnpd/default.nix +++ b/pkgs/tools/networking/miniupnpd/default.nix @@ -24,6 +24,5 @@ stdenv.mkDerivation rec { homepage = http://miniupnp.free.fr/; description = "A daemon that implements the UPnP Internet Gateway Device (IGD) specification"; platforms = platforms.linux; - maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/tools/networking/netsniff-ng/default.nix b/pkgs/tools/networking/netsniff-ng/default.nix index 6619d0a0f693..aca7643e7ac3 100644 --- a/pkgs/tools/networking/netsniff-ng/default.nix +++ b/pkgs/tools/networking/netsniff-ng/default.nix @@ -58,6 +58,5 @@ stdenv.mkDerivation rec { homepage = http://netsniff-ng.org/; license = licenses.gpl2; platforms = platforms.linux; - maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/tools/networking/pcapc/default.nix b/pkgs/tools/networking/pcapc/default.nix index 28b1c961a3ff..71d1e6fa6d6e 100644 --- a/pkgs/tools/networking/pcapc/default.nix +++ b/pkgs/tools/networking/pcapc/default.nix @@ -25,6 +25,5 @@ stdenv.mkDerivation rec { description = "Compile libpcap filter expressions into BPF opcodes"; license = licenses.gpl3; platforms = platforms.linux; - maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/tools/networking/pingtcp/default.nix b/pkgs/tools/networking/pingtcp/default.nix index 484eab3a221c..8fb9b066bf1c 100644 --- a/pkgs/tools/networking/pingtcp/default.nix +++ b/pkgs/tools/networking/pingtcp/default.nix @@ -26,6 +26,5 @@ stdenv.mkDerivation rec { homepage = https://github.com/LanetNetwork/pingtcp; license = licenses.gpl3; platforms = platforms.linux; - maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/tools/package-management/dpkg/default.nix b/pkgs/tools/package-management/dpkg/default.nix index 63431e29facb..cf239e261d7b 100644 --- a/pkgs/tools/package-management/dpkg/default.nix +++ b/pkgs/tools/package-management/dpkg/default.nix @@ -69,6 +69,6 @@ stdenv.mkDerivation rec { homepage = https://wiki.debian.org/Teams/Dpkg; license = licenses.gpl2Plus; platforms = platforms.unix; - maintainers = with maintainers; [ mornfall nckx ]; + maintainers = with maintainers; [ mornfall ]; }; } diff --git a/pkgs/tools/package-management/packagekit/default.nix b/pkgs/tools/package-management/packagekit/default.nix index d4e6885d8f36..78ef19706d18 100644 --- a/pkgs/tools/package-management/packagekit/default.nix +++ b/pkgs/tools/package-management/packagekit/default.nix @@ -64,6 +64,6 @@ stdenv.mkDerivation rec { homepage = http://www.packagekit.org/; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = with maintainers; [ nckx matthewbauer ]; + maintainers = with maintainers; [ matthewbauer ]; }; } diff --git a/pkgs/tools/security/bruteforce-luks/default.nix b/pkgs/tools/security/bruteforce-luks/default.nix index 7b505722efaf..bcd0593e88f8 100644 --- a/pkgs/tools/security/bruteforce-luks/default.nix +++ b/pkgs/tools/security/bruteforce-luks/default.nix @@ -31,6 +31,5 @@ stdenv.mkDerivation rec { ''; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/tools/security/eid-mw/default.nix b/pkgs/tools/security/eid-mw/default.nix index f26b2d3308b7..a11b70917c8d 100644 --- a/pkgs/tools/security/eid-mw/default.nix +++ b/pkgs/tools/security/eid-mw/default.nix @@ -57,7 +57,6 @@ stdenv.mkDerivation rec { and remove all ~/.pki and/or /etc/pki directories no longer needed. ''; - maintainers = with maintainers; [ nckx ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/security/eid-viewer/default.nix b/pkgs/tools/security/eid-viewer/default.nix index d1b29e137df9..10cc314fe1db 100644 --- a/pkgs/tools/security/eid-viewer/default.nix +++ b/pkgs/tools/security/eid-viewer/default.nix @@ -37,7 +37,6 @@ stdenv.mkDerivation rec { Belgian electronic identity cards. Independent of the eid-mw package, which is required to actually use your eID for authentication or signing. ''; - maintainers = with maintainers; [ nckx ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/security/sshuttle/default.nix b/pkgs/tools/security/sshuttle/default.nix index 960d11521a74..8674de1fceed 100644 --- a/pkgs/tools/security/sshuttle/default.nix +++ b/pkgs/tools/security/sshuttle/default.nix @@ -44,7 +44,7 @@ python3Packages.buildPythonApplication rec { target network (though it does require Python 2 at both ends). Works with Linux and Mac OS and supports DNS tunneling. ''; - maintainers = with maintainers; [ domenkozar nckx ]; + maintainers = with maintainers; [ domenkozar ]; platforms = platforms.unix; }; } diff --git a/pkgs/tools/system/foremost/default.nix b/pkgs/tools/system/foremost/default.nix index 0114c1d41ff6..b3048f2fcb7f 100644 --- a/pkgs/tools/system/foremost/default.nix +++ b/pkgs/tools/system/foremost/default.nix @@ -35,6 +35,5 @@ stdenv.mkDerivation rec { homepage = http://foremost.sourceforge.net/; license = licenses.publicDomain; platforms = platforms.linux; - maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/tools/system/gptfdisk/default.nix b/pkgs/tools/system/gptfdisk/default.nix index f5ab6276c818..f9fba2dde91d 100644 --- a/pkgs/tools/system/gptfdisk/default.nix +++ b/pkgs/tools/system/gptfdisk/default.nix @@ -39,7 +39,6 @@ stdenv.mkDerivation rec { description = "Set of text-mode partitioning tools for Globally Unique Identifier (GUID) Partition Table (GPT) disks"; license = licenses.gpl2; homepage = http://www.rodsbooks.com/gdisk/; - maintainers = with maintainers; [ nckx ]; platforms = platforms.all; }; } diff --git a/pkgs/tools/system/htop/default.nix b/pkgs/tools/system/htop/default.nix index 76d659efc52d..750ff8e59ef2 100644 --- a/pkgs/tools/system/htop/default.nix +++ b/pkgs/tools/system/htop/default.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation rec { homepage = https://hisham.hm/htop/; license = licenses.gpl2Plus; platforms = with platforms; linux ++ freebsd ++ openbsd ++ darwin; - maintainers = with maintainers; [ rob relrod nckx ]; + maintainers = with maintainers; [ rob relrod ]; }; } diff --git a/pkgs/tools/system/proot/default.nix b/pkgs/tools/system/proot/default.nix index 8cf7f81381ff..d75be0ff5bce 100644 --- a/pkgs/tools/system/proot/default.nix +++ b/pkgs/tools/system/proot/default.nix @@ -40,7 +40,7 @@ description = "User-space implementation of chroot, mount --bind and binfmt_misc"; platforms = platforms.linux; license = licenses.gpl2; - maintainers = with maintainers; [ ianwookim nckx makefu ]; + maintainers = with maintainers; [ ianwookim makefu ]; }; }) (if stdenv.isAarch64 then rec { diff --git a/pkgs/tools/system/stress-ng/default.nix b/pkgs/tools/system/stress-ng/default.nix index cdc7122fcc4b..22080db908cc 100644 --- a/pkgs/tools/system/stress-ng/default.nix +++ b/pkgs/tools/system/stress-ng/default.nix @@ -40,6 +40,5 @@ stdenv.mkDerivation rec { downloadPage = http://kernel.ubuntu.com/~cking/tarballs/stress-ng/; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/tools/system/suid-chroot/default.nix b/pkgs/tools/system/suid-chroot/default.nix index ebedf5f544e6..f407be7c5854 100644 --- a/pkgs/tools/system/suid-chroot/default.nix +++ b/pkgs/tools/system/suid-chroot/default.nix @@ -17,7 +17,6 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Setuid-safe wrapper for chroot"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ nckx ]; platforms = with platforms; unix; }; } diff --git a/pkgs/tools/system/thinkfan/default.nix b/pkgs/tools/system/thinkfan/default.nix index 11066dfd5939..b9467902c1f4 100644 --- a/pkgs/tools/system/thinkfan/default.nix +++ b/pkgs/tools/system/thinkfan/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { license = stdenv.lib.licenses.gpl3; homepage = http://thinkfan.sourceforge.net/; - maintainers = with stdenv.lib.maintainers; [ domenkozar nckx ]; + maintainers = with stdenv.lib.maintainers; [ domenkozar ]; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/text/aha/default.nix b/pkgs/tools/text/aha/default.nix index 7382078f114f..d8c42a0f20d2 100644 --- a/pkgs/tools/text/aha/default.nix +++ b/pkgs/tools/text/aha/default.nix @@ -23,6 +23,5 @@ stdenv.mkDerivation rec { homepage = https://github.com/theZiz/aha; license = with licenses; [ lgpl2Plus mpl11 ]; platforms = platforms.linux; - maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/tools/text/colordiff/default.nix b/pkgs/tools/text/colordiff/default.nix index 381dc8dd4577..c46f96241551 100644 --- a/pkgs/tools/text/colordiff/default.nix +++ b/pkgs/tools/text/colordiff/default.nix @@ -22,6 +22,5 @@ stdenv.mkDerivation rec { homepage = https://www.colordiff.org/; license = licenses.gpl3; platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index bd77ac1d55b2..be25ad03dc93 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -925,7 +925,6 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://gtk2-perl.sourceforge.net/; description = "Perl interface to the cairo 2D vector graphics library"; - maintainers = with maintainers; [ nckx ]; license = stdenv.lib.licenses.lgpl21Plus; }; }; @@ -6102,7 +6101,6 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://gtk2-perl.sourceforge.net/; description = "Perl wrappers for the GLib utility and Object libraries"; - maintainers = with maintainers; [ nckx ]; license = stdenv.lib.licenses.lgpl21Plus; }; }; @@ -6294,7 +6292,6 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://gtk2-perl.sourceforge.net/; description = "Perl interface to the 2.x series of the Gimp Toolkit library"; - maintainers = with maintainers; [ nckx ]; license = stdenv.lib.licenses.lgpl21Plus; }; }; @@ -10778,7 +10775,6 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://gtk2-perl.sourceforge.net/; description = "Layout and render international text"; - maintainers = with maintainers; [ nckx ]; license = stdenv.lib.licenses.lgpl21Plus; }; }; @@ -10879,7 +10875,6 @@ let self = _self // overrides; _self = with self; { meta = with stdenv.lib; { homepage = http://search.cpan.org/~jaybonci/Parse-DebControl; license = with licenses; [ artistic1 gpl1Plus ]; - maintainers = with maintainers; [ nckx ]; }; }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5f76212bdbb6..a488f95b4939 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1304,7 +1304,6 @@ in { homepage = https://github.com/AmesCornish/buttersink/wiki; license = licenses.gpl3; platforms = platforms.linux; - maintainers = with maintainers; [ nckx ]; }; propagatedBuildInputs = with self; [ boto crcmod psutil ]; @@ -2393,7 +2392,6 @@ in { composable way, with as little code as necessary. ''; license = licenses.bsd3; - maintainers = with maintainers; [ nckx ]; }; }; @@ -8396,7 +8394,6 @@ in { homepage = https://github.com/terencehonles/fusepy; license = licenses.isc; platforms = platforms.unix; - maintainers = with maintainers; [ nckx ]; }; }; @@ -8490,7 +8487,6 @@ in { homepage = https://github.com/dsoprea/GDriveFS; license = licenses.gpl2; platforms = platforms.unix; - maintainers = with maintainers; [ nckx ]; }; }; @@ -8623,7 +8619,6 @@ in { ''; homepage = http://gehrcke.de/gipc; license = licenses.mit; - maintainers = with maintainers; [ nckx ]; }; }; @@ -12858,7 +12853,6 @@ in { description = "Meta-commands handler for Postgres Database"; homepage = https://pypi.python.org/pypi/pgspecial; license = licenses.bsd3; - maintainers = with maintainers; [ nckx ]; }; }; @@ -15056,7 +15050,6 @@ in { # From the README: "pythonwifi is licensed under LGPLv2+, however, the # examples (e.g. iwconfig.py and iwlist.py) are licensed under GPLv2+." license = with licenses; [ lgpl2Plus gpl2Plus ]; - maintainers = with maintainers; [ nckx ]; }; }; @@ -15449,7 +15442,6 @@ in { inherit (src.meta) homepage; description = "Check the status of code repositories under a root directory"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ nckx ]; }; }; @@ -17308,7 +17300,6 @@ in { ''; homepage = https://github.com/andialbrecht/sqlparse; license = licenses.bsd3; - maintainers = with maintainers; [ nckx ]; }; }; @@ -18622,7 +18613,6 @@ EOF ''; homepage = https://github.com/jquast/wcwidth; license = licenses.mit; - maintainers = with maintainers; [ nckx ]; }; }; From 6f41c5d80596406df9074047c9f0a8a1b9a2ff78 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Tue, 16 Jan 2018 21:15:25 +0100 Subject: [PATCH 09/31] rabbitmq-c: 0.7.1 -> 0.8.0 --- pkgs/development/libraries/rabbitmq-c/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/rabbitmq-c/default.nix b/pkgs/development/libraries/rabbitmq-c/default.nix index 0ab9cd1df041..13c0198ba505 100644 --- a/pkgs/development/libraries/rabbitmq-c/default.nix +++ b/pkgs/development/libraries/rabbitmq-c/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "rabbitmq-c-${version}"; - version = "0.7.1"; + version = "0.8.0"; src = fetchFromGitHub { owner = "alanxz"; repo = "rabbitmq-c"; rev = "v${version}"; - sha256 = "084zlir59zc505nxd4m2g9d355m9a8y94gbjaqmjz9kym8lpayd1"; + sha256 = "0vjh1q3hyzrq1iiddy28vvwpwwn4px00mjc2hqp4zgfpis2xlqbj"; }; buildInputs = [ cmake openssl popt xmlto ]; From 1522a47ed359cdd3cb7aa879da5fea33db770956 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Tue, 16 Jan 2018 21:27:24 +0100 Subject: [PATCH 10/31] claws-mail: 3.15.1 -> 3.16.0 --- .../networking/mailreaders/claws-mail/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/claws-mail/default.nix b/pkgs/applications/networking/mailreaders/claws-mail/default.nix index cccfdbc75608..aee4d8ca04e6 100644 --- a/pkgs/applications/networking/mailreaders/claws-mail/default.nix +++ b/pkgs/applications/networking/mailreaders/claws-mail/default.nix @@ -32,19 +32,17 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "claws-mail-${version}"; - version = "3.15.1"; + version = "3.16.0"; src = fetchurl { url = "http://www.claws-mail.org/download.php?file=releases/claws-mail-${version}.tar.xz"; - sha256 = "0hlm2jipyr4z6izlrpvabpz4ivh49i13avnm848kr1nv68pkq2cd"; + sha256 = "1awpr3s7n8bq8p3w10a4j6lg5bizjxyiqp4rqzc2j8cn7lyi64n2"; }; outputs = [ "out" "dev" ]; patches = [ ./mime.patch ]; - hardeningDisable = [ "format" ]; - postPatch = '' substituteInPlace src/procmime.c \ --subst-var-by MIMEROOTDIR ${shared_mime_info}/share From 0e834998b20928e0bdbcdd27425112780456b5d8 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Tue, 16 Jan 2018 21:38:04 +0100 Subject: [PATCH 11/31] phpPackages.composer: 1.5.1 -> 1.6.2 --- pkgs/top-level/php-packages.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index fc922775cf4c..80cc5ba05db6 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -339,12 +339,13 @@ let composer = pkgs.stdenv.mkDerivation rec { name = "composer-${version}"; - version = "1.5.1"; + version = "1.6.2"; src = pkgs.fetchurl { url = "https://getcomposer.org/download/${version}/composer.phar"; - sha256 = "107v8hdgmi2s15zsd9ffrr3jyw01qkwv174y9gw9fbpdrjwffi97"; + sha256 = "0xjjnbpzar6ybpad77r0b4a96bwrayza8s1s9vz6s634ir98dhvf"; }; + unpackPhase = ":"; buildInputs = [ pkgs.makeWrapper ]; From 1729c657368d980ef87f5b1ecedd032a79af81d3 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Tue, 16 Jan 2018 21:45:59 +0100 Subject: [PATCH 12/31] libressl_2_6: 2.6.2 -> 2.6.4 --- pkgs/development/libraries/libressl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libressl/default.nix b/pkgs/development/libraries/libressl/default.nix index 4818a720a30c..ae03ef7ecb97 100644 --- a/pkgs/development/libraries/libressl/default.nix +++ b/pkgs/development/libraries/libressl/default.nix @@ -33,7 +33,7 @@ in { }; libressl_2_6 = generic { - version = "2.6.2"; - sha256 = "0y64grb2zx98rjp2lbwihyhbml4z5ih3v7ydbxdvmabj5d4x4adh"; + version = "2.6.4"; + sha256 = "07yi37a2ghsgj2b4w30q1s4d2inqnix7ika1m21y57p9z71212k3"; }; } From d0f2aab67ca43b118b3902cc445e3578f0cc5917 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Tue, 16 Jan 2018 21:52:18 +0100 Subject: [PATCH 13/31] errbot: 5.1.2 -> 5.1.3 --- pkgs/applications/networking/errbot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/errbot/default.nix b/pkgs/applications/networking/errbot/default.nix index 611d7904991a..8664e38a8ed6 100644 --- a/pkgs/applications/networking/errbot/default.nix +++ b/pkgs/applications/networking/errbot/default.nix @@ -2,11 +2,11 @@ pythonPackages.buildPythonApplication rec { name = "errbot-${version}"; - version = "5.1.2"; + version = "5.1.3"; src = fetchurl { url = "mirror://pypi/e/errbot/${name}.tar.gz"; - sha256 = "1r9w7pmdw77h1hwxns6d0sdg8cndsq1lwkq0y5qiiqr91jz93ajm"; + sha256 = "0nkfq6fx87g7kvxrb5lp8gkb75658cmyffnacpy8jq3a16py3jrr"; }; disabled = !pythonPackages.isPy3k; From 1d70a52528b7a1d6b5f5a59f28ecfd056037bde9 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Tue, 16 Jan 2018 21:55:16 +0100 Subject: [PATCH 14/31] moonlight-embedded: 2.4.4 -> 2.4.6 --- pkgs/applications/misc/moonlight-embedded/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/moonlight-embedded/default.nix b/pkgs/applications/misc/moonlight-embedded/default.nix index c95f935b8555..42f1b58061ef 100644 --- a/pkgs/applications/misc/moonlight-embedded/default.nix +++ b/pkgs/applications/misc/moonlight-embedded/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { name = "moonlight-embedded-${version}"; - version = "2.4.2"; + version = "2.4.6"; # fetchgit used to ensure submodules are available src = fetchgit { url = "git://github.com/irtimmer/moonlight-embedded"; rev = "refs/tags/v${version}"; - sha256 = "0khdbwfclvpjgyk5ar1fs4j66zsjikaj422wlvrvqhyzi1v5arpr"; + sha256 = "0vs6rjmz8058s9lscagiif6pcizwfrvfpk9rxxgacfi0xisfgmf1"; }; outputs = [ "out" "man" ]; From 1d3038956ced13b38e05ffe160aa352f2ac3b69d Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Tue, 16 Jan 2018 22:07:44 +0100 Subject: [PATCH 15/31] python.pkgs.terminado: 0.6.0 -> 0.8.1 --- .../python-modules/terminado/default.nix | 24 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 18 +------------- 2 files changed, 25 insertions(+), 17 deletions(-) create mode 100644 pkgs/development/python-modules/terminado/default.nix diff --git a/pkgs/development/python-modules/terminado/default.nix b/pkgs/development/python-modules/terminado/default.nix new file mode 100644 index 000000000000..7ebd2f1c967a --- /dev/null +++ b/pkgs/development/python-modules/terminado/default.nix @@ -0,0 +1,24 @@ +{ lib +, buildPythonPackage +, fetchPypi +, ptyprocess +, tornado +}: + +buildPythonPackage rec { + pname = "terminado"; + version = "0.8.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "0yh69k6579g848rmjyllb5h75pkvgcy27r1l3yzgkf33wnnzkasm"; + }; + + propagatedBuildInputs = [ ptyprocess tornado ]; + + meta = with lib; { + description = "Terminals served by Tornado websockets"; + homepage = https://github.com/jupyter/terminado; + license = licenses.bsd2; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a488f95b4939..d812e395a4ab 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -17584,23 +17584,7 @@ in { }; }; - terminado = buildPythonPackage rec { - name = "terminado-${version}"; - version = "0.6"; - - src = pkgs.fetchurl { - url = "mirror://pypi/t/terminado/${name}.tar.gz"; - sha256 = "2c0ba1f624067dccaaead7d2247cfe029806355cef124dc2ccb53c83229f0126"; - }; - - propagatedBuildInputs = with self; [ ptyprocess tornado ]; - - meta = { - description = "Terminals served to term.js using Tornado websockets"; - homepage = https://github.com/takluyver/terminado; - license = licenses.bsd2; - }; - }; + terminado = callPackage ../development/python-modules/terminado { }; terminaltables = buildPythonPackage rec { name = "terminaltables-${version}"; From ea0bfbe4f6c6cf55ece9abcc6a85cb900c9cf4a9 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Tue, 16 Jan 2018 22:27:59 +0100 Subject: [PATCH 16/31] python.pkgs.send2trash: 1.3.0 -> 1.4.2 --- .../python-modules/send2trash/default.nix | 27 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 18 +------------ 2 files changed, 28 insertions(+), 17 deletions(-) create mode 100644 pkgs/development/python-modules/send2trash/default.nix diff --git a/pkgs/development/python-modules/send2trash/default.nix b/pkgs/development/python-modules/send2trash/default.nix new file mode 100644 index 000000000000..379f5677bd1c --- /dev/null +++ b/pkgs/development/python-modules/send2trash/default.nix @@ -0,0 +1,27 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytest +, configparser +}: + +buildPythonPackage rec { + pname = "Send2Trash"; + version = "1.4.2"; + + src = fetchFromGitHub { + owner = "hsoft"; + repo = "send2trash"; + rev = version; + sha256 = "1w502i5h8xaqf03g6h95h4vs1wqfv6kg925dn63phrwmg1hfz2xx"; + }; + + checkPhase = "HOME=. py.test"; + checkInputs = [ pytest configparser ]; + + meta = with lib; { + description = "Send file to trash natively under macOS, Windows and Linux"; + homepage = https://github.com/hsoft/send2trash; + license = licenses.bsd3; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d812e395a4ab..1dc82363ca73 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -21877,23 +21877,7 @@ EOF }; }; - send2trash = buildPythonPackage (rec { - name = "Send2Trash-1.3.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/S/Send2Trash/${name}.tar.gz"; - sha256 = "1zjq5ki02l0vl4f1xymsnqyxipx6q81a435p46db07l3mqg4dx1k"; - }; - - # no tests - doCheck = false; - - meta = { - description = "Send file to trash natively under macOS, Windows and Linux"; - homepage = https://github.com/hsoft/send2trash; - license = licenses.bsd3; - }; - }); + send2trash = callPackage ../development/python-modules/send2trash { }; sigtools = buildPythonPackage rec { name = "sigtools-${version}"; From 7189e0a5419e5c8eb601f2efcd3b42f0b38801bb Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Tue, 16 Jan 2018 22:08:03 +0100 Subject: [PATCH 17/31] python.pkgs.notebook: 5.2.2 -> 5.3.1 --- pkgs/development/python-modules/notebook/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/notebook/default.nix b/pkgs/development/python-modules/notebook/default.nix index 71261fb1f406..77ff31934c3f 100644 --- a/pkgs/development/python-modules/notebook/default.nix +++ b/pkgs/development/python-modules/notebook/default.nix @@ -17,17 +17,17 @@ , ipykernel , terminado , requests +, send2trash , pexpect }: buildPythonPackage rec { pname = "notebook"; - version = "5.2.2"; - name = "${pname}-${version}"; + version = "5.3.1"; src = fetchPypi { inherit pname version; - sha256 = "7bb54fb61b9c5426bc116f840541b973431198e00ea2896122d05fc122dbbd67"; + sha256 = "12vk3shylx61whdchxbg71mdlwiw2l31vl227sqwpb0p67bbw2rq"; }; LC_ALL = "en_US.utf8"; @@ -36,7 +36,7 @@ buildPythonPackage rec { ++ (if isPy3k then [ nose_warnings_filters ] else [ mock ]); propagatedBuildInputs = [ - jinja2 tornado ipython_genutils traitlets jupyter_core + jinja2 tornado ipython_genutils traitlets jupyter_core send2trash jupyter_client nbformat nbconvert ipykernel terminado requests pexpect ]; From 93f8f6f53043143b77a641aa76bb75a95002d8d7 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Tue, 16 Jan 2018 22:35:27 +0100 Subject: [PATCH 18/31] qlcplus: 4.1.10 -> 4.1.11 --- pkgs/applications/misc/qlcplus/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/qlcplus/default.nix b/pkgs/applications/misc/qlcplus/default.nix index 60a8cf2c6cd1..e162d0d317f7 100644 --- a/pkgs/applications/misc/qlcplus/default.nix +++ b/pkgs/applications/misc/qlcplus/default.nix @@ -5,13 +5,13 @@ mkDerivation rec { name = "qlcplus-${version}"; - version = "4.11.0"; + version = "4.11.1"; src = fetchFromGitHub { owner = "mcallegari"; repo = "qlcplus"; rev = "QLC+_${version}"; - sha256 = "0a45ww341yjx9k54j5s8b5wj83rgbwxkdvgy0v5jbbdf9m78ifrg"; + sha256 = "0lb1mdp7kbnkja14phgyknr65irwkxcmzk96rqacysvwrvzvfzyd"; }; nativeBuildInputs = [ qmake pkgconfig ]; @@ -34,5 +34,6 @@ mkDerivation rec { maintainers = [ maintainers.globin ]; license = licenses.asl20; platforms = platforms.all; + homepage = "http://www.qlcplus.org/"; }; } From a669adb381a7f0f4fbdb427d1af6de63ef9e39d7 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Tue, 16 Jan 2018 22:42:54 +0100 Subject: [PATCH 19/31] sslscan: 1.11.10 -> 1.11.11 --- pkgs/tools/security/sslscan/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/sslscan/default.nix b/pkgs/tools/security/sslscan/default.nix index 87fda1467f0d..782341923fab 100644 --- a/pkgs/tools/security/sslscan/default.nix +++ b/pkgs/tools/security/sslscan/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "sslscan-${version}"; - version = "1.11.10"; + version = "1.11.11"; src = fetchFromGitHub { owner = "rbsec"; repo = "sslscan"; rev = "${version}-rbsec"; - sha256 = "1bxr7p7nhg4b8wkcm7j2xk10gf370sqcvl06vbgnqd3azp55fhpf"; + sha256 = "0k1agdz52pdgihwfwbygp0mlwkf757vcwhvwc0mrz606l2wbmwmr"; }; buildInputs = [ openssl ]; From e842ffbb334293bd6d83a2b1eb9ae9039af29b43 Mon Sep 17 00:00:00 2001 From: Bas van Dijk Date: Wed, 17 Jan 2018 01:03:31 +0100 Subject: [PATCH 20/31] elk: 6.1.1 -> 6.1.2 Contains a security fix for kibana: CVE-2018-3818. https://www.elastic.co/guide/en/elasticsearch/reference/current/release-notes-6.1.2.html https://www.elastic.co/guide/en/logstash/6.1/logstash-6-1-2.html https://www.elastic.co/guide/en/kibana/6.1/release-notes-6.1.2.html https://www.elastic.co/guide/en/beats/libbeat/6.1/release-notes-6.1.2.html --- pkgs/development/tools/misc/kibana/6.x.nix | 4 ++-- pkgs/misc/logging/beats/6.x.nix | 2 +- pkgs/servers/search/elasticsearch/6.x.nix | 2 +- pkgs/tools/misc/logstash/6.x.nix | 2 +- pkgs/top-level/all-packages.nix | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/tools/misc/kibana/6.x.nix b/pkgs/development/tools/misc/kibana/6.x.nix index bfa1d92eb52a..d7013ef46eb2 100644 --- a/pkgs/development/tools/misc/kibana/6.x.nix +++ b/pkgs/development/tools/misc/kibana/6.x.nix @@ -7,8 +7,8 @@ let arch = elemAt info 0; plat = elemAt info 1; shas = { - "x86_64-linux" = "0847flk4sfimcdx9wqkaglk7bvbnz1iyindz10z0d1fvbldivp46"; - "x86_64-darwin" = "03f7l91r6nczzzlqxsxkpzzwafpy45fx4lss4g6kg022rwisdma7"; + "x86_64-linux" = "0kgsafjn8wzrmiklfc8jg0h3cx25lhlkby8yz35wgpx4wbk3vfjx"; + "x86_64-darwin" = "0i2kq9vyjv151kk7h3dl3hjrqqgxsg0qqxdqwjwlz9ja5axzlxhd"; }; in stdenv.mkDerivation rec { name = "kibana-${version}"; diff --git a/pkgs/misc/logging/beats/6.x.nix b/pkgs/misc/logging/beats/6.x.nix index 48c2fb6973fe..2883604491c6 100644 --- a/pkgs/misc/logging/beats/6.x.nix +++ b/pkgs/misc/logging/beats/6.x.nix @@ -8,7 +8,7 @@ let beat = package : extraArgs : buildGoPackage (rec { owner = "elastic"; repo = "beats"; rev = "v${version}"; - sha256 = "1vifxa0v6ha29ijvgnrkx02syckhydg6vjxjqbm8y8zysvnh1869"; + sha256 = "05ay6hdc1jgi6b00bd998zc39ca8jhnk7i6m3mw70s0baqv1scik"; }; goPackagePath = "github.com/elastic/beats"; diff --git a/pkgs/servers/search/elasticsearch/6.x.nix b/pkgs/servers/search/elasticsearch/6.x.nix index 23d60ca0bef3..6057c2dee82c 100644 --- a/pkgs/servers/search/elasticsearch/6.x.nix +++ b/pkgs/servers/search/elasticsearch/6.x.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://artifacts.elastic.co/downloads/elasticsearch/${name}.tar.gz"; - sha256 = "1dkl7crha5g8h9c1zs1ahcmv221cpipzkvk574g99gdi586ckb8c"; + sha256 = "03xwd8r0l0a29wl6wrp4bh7xr1b79q2rqfmsq3d5k35pv85sw3lw"; }; patches = [ ./es-home-6.x.patch ]; diff --git a/pkgs/tools/misc/logstash/6.x.nix b/pkgs/tools/misc/logstash/6.x.nix index b59fb9012efa..3eb2648a4412 100644 --- a/pkgs/tools/misc/logstash/6.x.nix +++ b/pkgs/tools/misc/logstash/6.x.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://artifacts.elastic.co/downloads/logstash/${name}.tar.gz"; - sha256 = "07apb0135rlbraqw3pmwf13jjhzgflr6qik0b0qxp8im0hwx082p"; + sha256 = "18680qpdvhr16dx66jfia1zrg52005sgdy9yhl7vdhm4gcr7pxwc"; }; dontBuild = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 79a2afba643a..5d8fc96aaaa3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1981,7 +1981,7 @@ with pkgs; # The latest version used by elasticsearch, logstash, kibana and the the beats from elastic. elk5Version = "5.6.5"; - elk6Version = "6.1.1"; + elk6Version = "6.1.2"; elasticsearch = callPackage ../servers/search/elasticsearch { }; elasticsearch2 = callPackage ../servers/search/elasticsearch/2.x.nix { }; From 843f37dc127c9a4cd77130cf223be6cb669cc162 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Wed, 17 Jan 2018 00:26:52 +0100 Subject: [PATCH 21/31] bzflag: 2.4.10 -> 2.4.12 --- pkgs/games/bzflag/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/bzflag/default.nix b/pkgs/games/bzflag/default.nix index 1269b4346344..9962e0e71054 100644 --- a/pkgs/games/bzflag/default.nix +++ b/pkgs/games/bzflag/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "bzflag"; - version = "2.4.10"; + version = "2.4.12"; src = fetchurl { url = "https://download.bzflag.org/${pname}/source/${version}/${name}.tar.bz2"; - sha256 = "1ylyd5safpraaym9fvnrqj2506dqrraaaqhrb2aa9zmjwi54aiqa"; + sha256 = "0380y47kgl97ld3dybjgjr2zwxqky8f938k9z7vad647cic3m8d8"; }; nativeBuildInputs = [ pkgconfig ]; From 231f434a4d3206d537bf4bdccc734259778c5e3b Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Wed, 17 Jan 2018 01:33:30 +0100 Subject: [PATCH 22/31] gitlab: 10.3.3 -> 10.3.4 Fixes: - CVE-2017-0915 - CVE-2018-3710 - CVE-2017-0918 - CVE-2017-0923 - CVE-2017-0925 - CVE-2017-0926 - CVE-2017-0924 - CVE-2017-0914 - CVE-2017-0916 - CVE-2017-0917 - CVE-2017-0927 - CVE-2017-0922 See https://about.gitlab.com/2018/01/16/gitlab-10-dot-3-dot-4-released/ for details. --- pkgs/applications/version-management/gitlab/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix index ea4c9c8731d2..d13e61395827 100644 --- a/pkgs/applications/version-management/gitlab/default.nix +++ b/pkgs/applications/version-management/gitlab/default.nix @@ -18,11 +18,11 @@ let }; }; - version = "10.3.3"; + version = "10.3.4"; gitlabDeb = fetchurl { url = "https://packages.gitlab.com/gitlab/gitlab-ce/packages/debian/jessie/gitlab-ce_${version}-ce.0_amd64.deb/download"; - sha256 = "0bnafl7mpm3vjhfkqwgf5ff1y1iixfdfvv25zmpl0yjd70fwx2aq"; + sha256 = "0b6508hcahvhfpxyrqs05kz9a7c1wv658asm6a7ccish6hnwcica"; }; in @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { owner = "gitlabhq"; repo = "gitlabhq"; rev = "v${version}"; - sha256 = "1fhjijs8rvxrgx43fc7vp6f3vwshwq74gjwk41fi2yam8bri8p6k"; + sha256 = "0cvp4wwkc04qffsq738867j31igwzj7zlmahdl24yddbmpa5x8r1"; }; buildInputs = [ From b6d615ff7e8664bd5900517a95ad4639c7cf99c1 Mon Sep 17 00:00:00 2001 From: Ashley Gillman Date: Wed, 17 Jan 2018 10:56:19 +1000 Subject: [PATCH 23/31] pythonPackages.nimfa: Follow conventions. --- pkgs/development/python-modules/nimfa/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/nimfa/default.nix b/pkgs/development/python-modules/nimfa/default.nix index 87f7755fcf2b..cfe7180fac22 100644 --- a/pkgs/development/python-modules/nimfa/default.nix +++ b/pkgs/development/python-modules/nimfa/default.nix @@ -1,6 +1,7 @@ { stdenv , buildPythonPackage , fetchPypi +, isPy3k , numpy , scipy , matplotlib @@ -8,7 +9,6 @@ }: buildPythonPackage rec { - name = "${pname}-${version}"; pname = "nimfa"; version = "1.3.1"; @@ -18,8 +18,8 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ numpy scipy ]; - buildInputs = [ matplotlib pytest ]; - doCheck = false; # errors + checkInputs = [ matplotlib pytest ]; + doCheck = !isPy3k; # https://github.com/marinkaz/nimfa/issues/42 meta = with stdenv.lib; { description = "Nonnegative matrix factorization library"; From 4c990112145003ec62de4eda5b444372c2a7ee2d Mon Sep 17 00:00:00 2001 From: Ashley Gillman Date: Wed, 17 Jan 2018 10:57:35 +1000 Subject: [PATCH 24/31] pythonPackages.nimfa: 1.3.1 -> 1.3.2 --- pkgs/development/python-modules/nimfa/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nimfa/default.nix b/pkgs/development/python-modules/nimfa/default.nix index cfe7180fac22..b38aea7d28c0 100644 --- a/pkgs/development/python-modules/nimfa/default.nix +++ b/pkgs/development/python-modules/nimfa/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "nimfa"; - version = "1.3.1"; + version = "1.3.2"; src = fetchPypi { inherit pname version; - sha256 = "05d0m5n96bg6wj94r7m1har48f93797gk5v9s62zdv7x83a6n6j5"; + sha256 = "0iqcrr48jwy7nh8g13xf4rvpw9wq5qs3hyd6gqlh30mgyn9i85w7"; }; propagatedBuildInputs = [ numpy scipy ]; From af47db6a3ae6e838d10bd3579781cb8e37dbf244 Mon Sep 17 00:00:00 2001 From: Bas van Dijk Date: Wed, 17 Jan 2018 01:27:23 +0100 Subject: [PATCH 25/31] elk: 5.6.5 -> 5.6.6 Security fix for CVE-2018-3818. https://www.elastic.co/guide/en/kibana/5.6/release-notes-5.6.6.html https://www.elastic.co/guide/en/logstash/5.6/logstash-5-6-6.html --- pkgs/development/tools/misc/kibana/5.x.nix | 6 +++--- pkgs/misc/logging/beats/5.x.nix | 2 +- pkgs/servers/search/elasticsearch/5.x.nix | 2 +- pkgs/tools/misc/logstash/5.x.nix | 2 +- pkgs/top-level/all-packages.nix | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/misc/kibana/5.x.nix b/pkgs/development/tools/misc/kibana/5.x.nix index 428f24cd4e92..78b5df21fdea 100644 --- a/pkgs/development/tools/misc/kibana/5.x.nix +++ b/pkgs/development/tools/misc/kibana/5.x.nix @@ -11,9 +11,9 @@ let elasticArch = archOverrides."${arch}" or arch; plat = elemAt info 1; shas = { - "x86_64-linux" = "09bck05dfq4j1csyghlpw86nzn28kpx8ikli3v1s4si2hbxb1ifr"; - "i686-linux" = "0ql1611wg7i9vwqr4wmz04606hjj7w224ak34svfsn6qxyrh2dbb"; - "x86_64-darwin" = "1x24rqkkc9slm7jbyy41q5c2rbn17h85m0k6h3ijiafky6cv0cz2"; + "x86_64-linux" = "1a9n7s9r0klqvpyr5d3a410cchbsb0syx6cqwbhhnihqyw8dcx1i"; + "i686-linux" = "0snnm5jwynvk6ahgl42yzl2jhld0ykn79rlcq9dsv2gpqnjb2mmv"; + "x86_64-darwin" = "0qw3xkj3n3aja8s8n9r4hbr65jm9m6dgfjhhnrln434648rx7z4v"; }; in stdenv.mkDerivation rec { name = "kibana-${version}"; diff --git a/pkgs/misc/logging/beats/5.x.nix b/pkgs/misc/logging/beats/5.x.nix index ed2a2eadb65a..ba2a8b2448ef 100644 --- a/pkgs/misc/logging/beats/5.x.nix +++ b/pkgs/misc/logging/beats/5.x.nix @@ -8,7 +8,7 @@ let beat = package : extraArgs : buildGoPackage (rec { owner = "elastic"; repo = "beats"; rev = "v${version}"; - sha256 = "0pp4in66byggcfmvf8yx0m1vra98cs77m7mbr45sdla4hinvaqar"; + sha256 = "0ri2l8pyl1fnx0zypliwprkk1wkaxz8ywkgz8h2f08v7h1zgq1m6"; }; goPackagePath = "github.com/elastic/beats"; diff --git a/pkgs/servers/search/elasticsearch/5.x.nix b/pkgs/servers/search/elasticsearch/5.x.nix index e6bbc787251d..0d27e4fefcc8 100644 --- a/pkgs/servers/search/elasticsearch/5.x.nix +++ b/pkgs/servers/search/elasticsearch/5.x.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://artifacts.elastic.co/downloads/elasticsearch/${name}.tar.gz"; - sha256 = "1cks75227mxyri2r0hykc7jlvk6c4f4vaxh14mgmfmw4krwvrzxs"; + sha256 = "0wjjvzjbdgdv9qznk1b8dx63zgs7s6jnrrbrnd5dn27lhymxiwpl"; }; patches = [ ./es-home-5.x.patch ./es-classpath-5.x.patch ]; diff --git a/pkgs/tools/misc/logstash/5.x.nix b/pkgs/tools/misc/logstash/5.x.nix index da165446d397..e528e3e0285f 100644 --- a/pkgs/tools/misc/logstash/5.x.nix +++ b/pkgs/tools/misc/logstash/5.x.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://artifacts.elastic.co/downloads/logstash/${name}.tar.gz"; - sha256 = "18k2bhyzpxc2pad64wz0rpy43xp0nv843igjflav53jsglifh1yk"; + sha256 = "0cpim121ydxdjr251by9jw6pidh5b52jl5ldcm7gp015q49x1nl7"; }; dontBuild = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5d8fc96aaaa3..324ae5dd93ff 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1980,7 +1980,7 @@ with pkgs; evemu = callPackage ../tools/system/evemu { }; # The latest version used by elasticsearch, logstash, kibana and the the beats from elastic. - elk5Version = "5.6.5"; + elk5Version = "5.6.6"; elk6Version = "6.1.2"; elasticsearch = callPackage ../servers/search/elasticsearch { }; From d2b852fe7d3d0d00fda963c0931dc0120d0a24fd Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Wed, 17 Jan 2018 02:26:25 +0100 Subject: [PATCH 26/31] bind: 9.11.2 -> 9.11.2-P1 (fixes CVE-2017-3145, CVE-2017-3143, CVE-2017-3141 & CVE-2017-3140) For more details see [1]. [1] http://ftp.isc.org/isc/bind9/9.11.2-P1/RELEASE-NOTES-bind-9.11.2-P1.html --- pkgs/servers/dns/bind/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix index 3d8b825cc921..3e1d065a6699 100644 --- a/pkgs/servers/dns/bind/default.nix +++ b/pkgs/servers/dns/bind/default.nix @@ -3,14 +3,14 @@ assert enableSeccomp -> libseccomp != null; -let version = "9.11.2"; in +let version = "9.11.2-P1"; in stdenv.mkDerivation rec { name = "bind-${version}"; src = fetchurl { url = "http://ftp.isc.org/isc/bind9/${version}/${name}.tar.gz"; - sha256 = "0yn7wgi2y8mpmvbjbkl4va7p0xsnn48m4yjx6ynb1hzp423asikz"; + sha256 = "04hjvwvs7ssgj69lqparx0wj0w3xkc0x8y2iv62kzjighd41bhyf"; }; outputs = [ "out" "lib" "dev" "man" "dnsutils" "host" ]; From ca094d7af2d34882edb6a9c3f26689804a75844e Mon Sep 17 00:00:00 2001 From: adisbladis Date: Wed, 17 Jan 2018 09:39:20 +0800 Subject: [PATCH 27/31] bind: License changed to MPL 2.0 --- pkgs/servers/dns/bind/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix index 3e1d065a6699..fa00e3edf977 100644 --- a/pkgs/servers/dns/bind/default.nix +++ b/pkgs/servers/dns/bind/default.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.isc.org/software/bind; description = "Domain name server"; - license = stdenv.lib.licenses.isc; + license = stdenv.lib.licenses.mpl20; maintainers = with stdenv.lib.maintainers; [viric peti]; platforms = with stdenv.lib.platforms; unix; From 1eb62129d970177188a1b13313e00acf17a3adea Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Wed, 17 Jan 2018 02:46:29 +0100 Subject: [PATCH 28/31] batman-adv: add missing nativeBuildInputs --- pkgs/os-specific/linux/batman-adv/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/os-specific/linux/batman-adv/default.nix b/pkgs/os-specific/linux/batman-adv/default.nix index 4f8a85d5d887..9766f99a6d36 100644 --- a/pkgs/os-specific/linux/batman-adv/default.nix +++ b/pkgs/os-specific/linux/batman-adv/default.nix @@ -10,6 +10,8 @@ stdenv.mkDerivation rec { sha256 = "1m541czjwgi4rfhjr6rg9r9c3cp2ncnif4ln7ri926zigwlxs3l3"; }; + nativeBuildInputs = kernel.moduleBuildDependencies; + hardeningDisable = [ "pic" ]; preBuild = '' From 4774356724184ddda1b5f17a18c9422b04e95983 Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Wed, 17 Jan 2018 02:55:13 +0100 Subject: [PATCH 29/31] batman-adv: 2017.3 -> 2017.4 --- pkgs/os-specific/linux/batman-adv/alfred.nix | 4 ++-- pkgs/os-specific/linux/batman-adv/batctl.nix | 4 ++-- pkgs/os-specific/linux/batman-adv/default.nix | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/os-specific/linux/batman-adv/alfred.nix b/pkgs/os-specific/linux/batman-adv/alfred.nix index 002e458b24de..f41278b1f7cb 100644 --- a/pkgs/os-specific/linux/batman-adv/alfred.nix +++ b/pkgs/os-specific/linux/batman-adv/alfred.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, pkgconfig, gpsd, libcap, libnl }: let - ver = "2017.3"; + ver = "2017.4"; in stdenv.mkDerivation rec { name = "alfred-${ver}"; src = fetchurl { url = "http://downloads.open-mesh.org/batman/releases/batman-adv-${ver}/${name}.tar.gz"; - sha256 = "0202mxp7hwflkqnkkajx5lv1nxjng45q5gcvvdv68x46p8ikb5n2"; + sha256 = "126wfmng4x19k8n4930v03qbjhwrikq9bvhl7mlng1k2fpx1msn4"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/os-specific/linux/batman-adv/batctl.nix b/pkgs/os-specific/linux/batman-adv/batctl.nix index 6ff3903c4f2f..17776f1ad217 100644 --- a/pkgs/os-specific/linux/batman-adv/batctl.nix +++ b/pkgs/os-specific/linux/batman-adv/batctl.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, pkgconfig, libnl }: let - ver = "2017.3"; + ver = "2017.4"; in stdenv.mkDerivation rec { name = "batctl-${ver}"; src = fetchurl { url = "http://downloads.open-mesh.org/batman/releases/batman-adv-${ver}/${name}.tar.gz"; - sha256 = "1a48kc2v8cb1757pxlli96qf3d7x7k3qw04rjadfs0iy09sz1ir9"; + sha256 = "0r742krc9mn677wmfwbhwhqq9739n74vpw0xfasvy7d59nn6lz84"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/os-specific/linux/batman-adv/default.nix b/pkgs/os-specific/linux/batman-adv/default.nix index 9766f99a6d36..db56c8d04125 100644 --- a/pkgs/os-specific/linux/batman-adv/default.nix +++ b/pkgs/os-specific/linux/batman-adv/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, kernel }: -let base = "batman-adv-2017.3"; in +let base = "batman-adv-2017.4"; in stdenv.mkDerivation rec { name = "${base}-${kernel.version}"; src = fetchurl { url = "http://downloads.open-mesh.org/batman/releases/${base}/${base}.tar.gz"; - sha256 = "1m541czjwgi4rfhjr6rg9r9c3cp2ncnif4ln7ri926zigwlxs3l3"; + sha256 = "0k4sf52sbk39m25w6plk8spwcf4kzc3axckyk2r6anxxsangyl4a"; }; nativeBuildInputs = kernel.moduleBuildDependencies; From f4508a0adfe87f2a891e9a3188e193ed31b96011 Mon Sep 17 00:00:00 2001 From: Ashley Gillman Date: Wed, 17 Jan 2018 12:58:27 +1000 Subject: [PATCH 30/31] pythonPackages.progressbar2: Get tests running. --- .../python-modules/progressbar2/default.nix | 40 ++++++++++++++----- 1 file changed, 31 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/progressbar2/default.nix b/pkgs/development/python-modules/progressbar2/default.nix index ab2fa895b22e..214f81ef0de3 100644 --- a/pkgs/development/python-modules/progressbar2/default.nix +++ b/pkgs/development/python-modules/progressbar2/default.nix @@ -1,23 +1,45 @@ { stdenv +, python , buildPythonPackage -, fetchPypi +, fetchFromGitHub +, isPy3k , pytest , python-utils +, sphinx +, coverage +, execnet +, flake8 +, pytestpep8 +, pytestflakes +, pytestcov +, pytestcache +, pep8 }: -buildPythonPackage (rec { - name = "${pname}-${version}"; +buildPythonPackage rec { pname = "progressbar2"; version = "3.12.0"; - src = fetchPypi { - inherit pname version; - sha256 = "16r21cpjvv0spf4mymgpy7hx6977iy11k44n2w9kipwg4lhwh02k"; + # Use source from GitHub, PyPI is missing tests + # https://github.com/WoLpH/python-progressbar/issues/151 + src = fetchFromGitHub { + owner = "WoLpH"; + repo = "python-progressbar"; + rev = "v${version}"; + sha256 = "1gk45sh8cd0kkyvzcvx95z6nlblmyx0x189mjfv3vfa43cr1mb0f"; }; - buildInputs = [ pytest ]; propagatedBuildInputs = [ python-utils ]; - doCheck = false; + checkInputs = [ + pytest sphinx coverage execnet flake8 pytestpep8 pytestflakes pytestcov + pytestcache pep8 + ]; + # ignore tests on the nix wrapped setup.py and don't flake .eggs directory + checkPhase = '' + runHook preCheck + ${python.interpreter} setup.py test --addopts "--ignore=nix_run_setup.py --ignore=.eggs" + runHook postCheck + ''; meta = with stdenv.lib; { homepage = https://progressbar-2.readthedocs.io/en/latest/; @@ -25,4 +47,4 @@ buildPythonPackage (rec { license = licenses.bsd3; maintainers = with maintainers; [ ashgillman ]; }; -}) +} From 846b5c42f19fe2ea8deb58f072d5c2df56605d19 Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Wed, 17 Jan 2018 04:48:16 +0000 Subject: [PATCH 31/31] redshift: add myself to maintainers --- pkgs/applications/misc/redshift/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/redshift/default.nix b/pkgs/applications/misc/redshift/default.nix index 77f27d9fa376..59a8440500aa 100644 --- a/pkgs/applications/misc/redshift/default.nix +++ b/pkgs/applications/misc/redshift/default.nix @@ -58,6 +58,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; homepage = http://jonls.dk/redshift; platforms = platforms.linux; - maintainers = with maintainers; [ mornfall ]; + maintainers = with maintainers; [ mornfall yegortimoshenko ]; }; }