From 87f04c6e541232abbe26bc7d65004f4857892c43 Mon Sep 17 00:00:00 2001 From: Kenny Shen Date: Sat, 20 Jun 2020 18:21:10 +0800 Subject: [PATCH 01/21] plr: init at REL8_4_1 Co-authored-by: Sandro --- pkgs/servers/sql/postgresql/ext/plr.nix | 31 ++++++++++++++++++++++++ pkgs/servers/sql/postgresql/packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/servers/sql/postgresql/ext/plr.nix diff --git a/pkgs/servers/sql/postgresql/ext/plr.nix b/pkgs/servers/sql/postgresql/ext/plr.nix new file mode 100644 index 00000000000..0bd727e7acf --- /dev/null +++ b/pkgs/servers/sql/postgresql/ext/plr.nix @@ -0,0 +1,31 @@ +{ lib, stdenv, fetchFromGitHub, pkg-config, R, postgresql }: + +stdenv.mkDerivation rec { + pname = "plr"; + version = "8.4.1"; + + src = fetchFromGitHub { + owner = "postgres-plr"; + repo = "plr"; + rev = "REL${builtins.replaceStrings ["."] ["_"] version}"; + sha256 = "1wy4blg8jl30kzhrkvbncl4gmy6k71zipnq89ykwi1vmx89v3ab7"; + }; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ R postgresql ]; + preBuild = '' + export USE_PGXS=1 + ''; + installPhase = '' + install -D plr.so -t $out/lib/ + install -D {plr--unpackaged--8.4.1.sql,plr--8.4.1.sql,plr.control} -t $out/share/postgresql/extension + ''; + + meta = with lib; { + description = "PL/R - R Procedural Language for PostgreSQL"; + homepage = "https://github.com/postgres-plr/plr"; + maintainers = with maintainers; [ qoelet ]; + platforms = [ "x86_64-linux" ]; + license = licenses.gpl2Only; + }; +} diff --git a/pkgs/servers/sql/postgresql/packages.nix b/pkgs/servers/sql/postgresql/packages.nix index d45c2d37c8d..e8b2f4130a5 100644 --- a/pkgs/servers/sql/postgresql/packages.nix +++ b/pkgs/servers/sql/postgresql/packages.nix @@ -27,6 +27,8 @@ self: super: { plpgsql_check = super.callPackage ./ext/plpgsql_check.nix { }; + plr = super.callPackage ./ext/plr.nix { }; + plv8 = super.callPackage ./ext/plv8.nix { v8 = super.callPackage ../../../development/libraries/v8/plv8_6_x.nix { python = self.python2; From 9a0574ca8dee28620bfaa71a600b5e992a0ca670 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 3 Feb 2021 03:42:20 +0000 Subject: [PATCH 02/21] visidata: 2.1.1 -> 2.2 --- pkgs/applications/misc/visidata/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/visidata/default.nix b/pkgs/applications/misc/visidata/default.nix index 2d0a5598343..62be9393a0a 100644 --- a/pkgs/applications/misc/visidata/default.nix +++ b/pkgs/applications/misc/visidata/default.nix @@ -15,13 +15,13 @@ }: buildPythonApplication rec { pname = "visidata"; - version = "2.1.1"; + version = "2.2"; src = fetchFromGitHub { owner = "saulpw"; repo = "visidata"; rev = "v${version}"; - sha256 = "018z06bfcw0l4k2zdwbgxna9fss4wdqj64ckw5qjis14sb3zkr28"; + sha256 = "14169q74vpighxnmpxf3nwi19vrv7p76ybb1zp7h8q2harysxkgl"; }; propagatedBuildInputs = [ From bcbfb00f81cb4704e4e0a4116c42efee115fa8ec Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 3 Feb 2021 05:02:01 +0000 Subject: [PATCH 03/21] python37Packages.azure-mgmt-batch: 14.0.0 -> 15.0.0 --- pkgs/development/python-modules/azure-mgmt-batch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-batch/default.nix b/pkgs/development/python-modules/azure-mgmt-batch/default.nix index 033ef0cccea..5f4b005b6ef 100644 --- a/pkgs/development/python-modules/azure-mgmt-batch/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-batch/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-mgmt-batch"; - version = "14.0.0"; + version = "15.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "1d3b2c9ebd57c8874e11d29e7dd05a1f078d2156fc9683e2f2ad41024e448bf6"; + sha256 = "9b793bb31a0d4dc8c29186db61db24d83795851a75846aadb187cf95bf853ccb"; }; propagatedBuildInputs = [ From ae20fdba25161ba2a3fb42ce6936eceef967d156 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 3 Feb 2021 06:20:28 +0000 Subject: [PATCH 04/21] python37Packages.bids-validator: 1.5.10 -> 1.6.0 --- pkgs/development/python-modules/bids-validator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bids-validator/default.nix b/pkgs/development/python-modules/bids-validator/default.nix index ab12f409750..d62c929e877 100644 --- a/pkgs/development/python-modules/bids-validator/default.nix +++ b/pkgs/development/python-modules/bids-validator/default.nix @@ -4,12 +4,12 @@ }: buildPythonPackage rec { - version = "1.5.10"; + version = "1.6.0"; pname = "bids-validator"; src = fetchPypi { inherit pname version; - sha256 = "ae421596b6b69670bd5a4ed3e586c6147e04448704b14b0705fd2bfe03d16b41"; + sha256 = "6858eab83068d34a9d41155c931ca8db9faef2272710d9730c2135915c19be82"; }; # needs packages which are not available in nixpkgs From ff9d510a160bb9016d548c0ffca7f4eadf4fbc29 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 3 Feb 2021 05:33:24 +0000 Subject: [PATCH 05/21] python37Packages.casbin: 0.16.0 -> 0.16.1 --- pkgs/development/python-modules/casbin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/casbin/default.nix b/pkgs/development/python-modules/casbin/default.nix index d1b795a9ef4..2587772127b 100644 --- a/pkgs/development/python-modules/casbin/default.nix +++ b/pkgs/development/python-modules/casbin/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "casbin"; - version = "0.16.0"; + version = "0.16.1"; disabled = isPy27; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = pname; repo = "pycasbin"; rev = "v${version}"; - sha256 = "1983p8pkbdj6yaclkdng7fn0pmlbz1yc75a4a847ppw47075ryph"; + sha256 = "1bjrg0ig40rjk5x65x7ac9xsl332r0ypqgrqjdivb5dvplifnw36"; }; propagatedBuildInputs = [ From da14ca5933ae710416dc48dbe238af6676385487 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 3 Feb 2021 06:37:57 +0000 Subject: [PATCH 06/21] python37Packages.cftime: 1.3.1 -> 1.4.1 --- pkgs/development/python-modules/cftime/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cftime/default.nix b/pkgs/development/python-modules/cftime/default.nix index 78dcecfb6a9..1f52c04e9a9 100644 --- a/pkgs/development/python-modules/cftime/default.nix +++ b/pkgs/development/python-modules/cftime/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "cftime"; - version = "1.3.1"; + version = "1.4.1"; src = fetchPypi { inherit pname version; - sha256 = "77fd86e69b234d41fa8634d627e9e9ee0501c2a8a95268c2b524d38e0a33f090"; + sha256 = "7c55540bc164746c3c4f86a07c9c7b9ed4dfb0b0d988348ec63cec065c58766d"; }; checkInputs = [ From 8cc2318965c748c2a68137dc60775abc7145cff9 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 3 Feb 2021 06:09:43 +0000 Subject: [PATCH 07/21] datasette: 0.54 -> 0.54.1 --- pkgs/development/python-modules/datasette/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/datasette/default.nix b/pkgs/development/python-modules/datasette/default.nix index 026c93f2378..1d919de6ee8 100644 --- a/pkgs/development/python-modules/datasette/default.nix +++ b/pkgs/development/python-modules/datasette/default.nix @@ -27,13 +27,13 @@ buildPythonPackage rec { pname = "datasette"; - version = "0.54"; + version = "0.54.1"; src = fetchFromGitHub { owner = "simonw"; repo = "datasette"; rev = version; - sha256 = "sha256-7cfoKteBOnwFsViBegAYhb/NLUSwMSyFVbwDF9ngD8w="; + sha256 = "sha256-Ixh56X9dI/FIJPXHXXGnFiYj3qeBmvW5L1FF7/0ofUQ="; }; nativeBuildInputs = [ pytestrunner ]; From c52310890612b9b5fc68ee865bc8051550b61aed Mon Sep 17 00:00:00 2001 From: Mikhail Klementev Date: Fri, 29 Jan 2021 12:18:10 +0000 Subject: [PATCH 08/21] python3Packages.keystone-engine: init at 0.9.2 --- .../keystone-engine/default.nix | 28 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/development/python-modules/keystone-engine/default.nix diff --git a/pkgs/development/python-modules/keystone-engine/default.nix b/pkgs/development/python-modules/keystone-engine/default.nix new file mode 100644 index 00000000000..ed9f3a6bb70 --- /dev/null +++ b/pkgs/development/python-modules/keystone-engine/default.nix @@ -0,0 +1,28 @@ +{ lib, buildPythonPackage, fetchPypi, keystone }: + +buildPythonPackage rec { + pname = "keystone-engine"; + version = "0.9.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "1xahdr6bh3dw5swrc2r8kqa8ljhqlb7k2kxv5mrw5rhcmcnzcyig"; + }; + + preConfigure = '' + substituteInPlace setup.py --replace \ + "libkeystone" "${keystone}/lib/libkeystone" + ''; + + # No tests + doCheck = false; + + pythonImportsCheck = [ "keystone" ]; + + meta = with lib; { + description = "Lightweight multi-platform, multi-architecture assembler framework"; + homepage = "https://www.keystone-engine.org"; + maintainers = with maintainers; [ dump_stack ]; + license = licenses.gpl2Only; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 507f0019171..2e344fde7df 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3479,6 +3479,8 @@ in { keyrings-alt = callPackage ../development/python-modules/keyrings-alt { }; + keystone-engine = callPackage ../development/python-modules/keystone-engine { }; + keyutils = callPackage ../development/python-modules/keyutils { inherit (pkgs) keyutils; }; kicad = disabledIf isPy27 (toPythonModule (pkgs.kicad.override { python3 = python; }).src); From 94bb7a9ca2eb7a6593050bd38bbefe1f9e187a8f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 3 Feb 2021 05:41:12 +0000 Subject: [PATCH 09/21] python37Packages.cmd2: 1.4.0 -> 1.5.0 --- pkgs/development/python-modules/cmd2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cmd2/default.nix b/pkgs/development/python-modules/cmd2/default.nix index bafdb9cb95d..a6b49d32bcb 100644 --- a/pkgs/development/python-modules/cmd2/default.nix +++ b/pkgs/development/python-modules/cmd2/default.nix @@ -6,11 +6,11 @@ }: buildPythonPackage rec { pname = "cmd2"; - version = "1.4.0"; + version = "1.5.0"; src = fetchPypi { inherit pname version; - sha256 = "e59fa932418603af4e046a96c8985812b05af8a73bfd9d7a386cd1b02c6ab687"; + sha256 = "701a8c9975c4abc45e5d13906ab149f959f812869106347323a3f89ac0e82a62"; }; LC_ALL="en_US.UTF-8"; From f3e8b9c6bf3770c5fe949afa546afcb3c81003d7 Mon Sep 17 00:00:00 2001 From: Morgan Jones Date: Fri, 29 Jan 2021 23:32:07 -0700 Subject: [PATCH 10/21] armagetronad: 0.2.8.3.5 -> 0.2.9.1.0 --- pkgs/games/armagetronad/default.nix | 38 +++++++++++++++++++---------- 1 file changed, 25 insertions(+), 13 deletions(-) diff --git a/pkgs/games/armagetronad/default.nix b/pkgs/games/armagetronad/default.nix index e271db86734..27f509c3f72 100644 --- a/pkgs/games/armagetronad/default.nix +++ b/pkgs/games/armagetronad/default.nix @@ -1,30 +1,42 @@ -{ lib, stdenv, fetchurl, SDL, libxml2, SDL_image, libjpeg, libpng, libGLU, libGL, zlib }: +{ lib, stdenv, fetchurl +, pkg-config, SDL, libxml2, SDL_image, libjpeg, libpng, libGLU, libGL, zlib +, dedicatedServer ? false }: let - versionMajor = "0.2.8"; - versionMinor = "3.5"; + versionMajor = "0.2.9"; + versionMinor = "1.0"; version = "${versionMajor}.${versionMinor}"; in - stdenv.mkDerivation { - pname = "armagetron"; + pname = if dedicatedServer then "armagetronad-dedicated" else "armagetronad"; inherit version; src = fetchurl { - url = "https://launchpad.net/armagetronad/${versionMajor}/${versionMajor}.${versionMinor}/+download/armagetronad-${version}.src.tar.bz2"; - sha256 = "1vyja7mzivs3pacxb7kznndsgqhq4p0f7x2zg55dckvzqwprdhqx"; + url = "https://launchpad.net/armagetronad/${versionMajor}/${version}/+download/armagetronad-${version}.tbz"; + sha256 = "sha256-WbbHwBzj+MylQ34z+XSmN1KVQaEapPUsGlwXSZ4m9qE"; }; - NIX_LDFLAGS = "-lSDL_image"; - enableParallelBuilding = true; - configureFlags = [ "--disable-etc" ]; - buildInputs = [ SDL SDL_image libxml2 libjpeg libpng libGLU libGL zlib ]; + configureFlags = [ + "--enable-memmanager" + "--enable-automakedefaults" + "--disable-useradd" + "--disable-initscripts" + "--disable-etc" + "--disable-uninstall" + "--disable-sysinstall" + ] ++ lib.optional dedicatedServer "--enable-dedicated"; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ libxml2 zlib ] + ++ lib.optionals (!dedicatedServer) [ SDL SDL_image libxml2 libjpeg libpng libGLU libGL ]; meta = with lib; { homepage = "http://armagetronad.org"; - description = "An multiplayer networked arcade racing game in 3D similar to Tron"; - license = licenses.gpl2; + description = "A multiplayer networked arcade racing game in 3D similar to Tron"; + maintainers = with maintainers; [ numinit ]; + license = licenses.gpl2Plus; platforms = platforms.linux; }; } From 813d14b9b7769a4550fbf9a42fa8af779ab6c475 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jarl=20G=2E=20Taxer=C3=A5s=20Flaten?= <1269436+jarlg@users.noreply.github.com> Date: Wed, 3 Feb 2021 02:34:47 -0500 Subject: [PATCH 11/21] coq: 8.13+beta1 -> 8.13.0 (#109479) --- pkgs/applications/science/logic/coq/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index 7a5c1e4da14..62600ea90c2 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -41,7 +41,7 @@ let "8.12.0".sha256 = "18dc7k0piv6v064zgdadpw6mkkxk7j663hb3svgj5236fihjr0cz"; "8.12.1".sha256 = "1rkcyjjrzcqw9xk93hsq0vvji4f8r5iq0f739mghk60bghkpnb7q"; "8.12.2".sha256 = "18gscfm039pqhq4msq01nraig5dm9ab98bjca94zldf8jvdv0x2n"; - "8.13+beta1".sha256 = "1v4a6dpj41flspa4ihcr7m5ahqz10kbn62fmrldmv7gzq6jsyfyq"; + "8.13.0".sha256 = "0sjbqmz6qcvnz0hv87xha80qbhvmmyd675wyc5z4rgr34j2l1ymd"; }; releaseRev = v: "V${v}"; fetched = import ../../../../build-support/coq/meta-fetch/default.nix From bed33d185a246b62de5a5105f86ecc10032ea59a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 3 Feb 2021 05:53:00 +0000 Subject: [PATCH 12/21] python37Packages.cvxpy: 1.1.7 -> 1.1.8 --- pkgs/development/python-modules/cvxpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cvxpy/default.nix b/pkgs/development/python-modules/cvxpy/default.nix index 58d06e60d39..1f5a2edc989 100644 --- a/pkgs/development/python-modules/cvxpy/default.nix +++ b/pkgs/development/python-modules/cvxpy/default.nix @@ -17,13 +17,13 @@ buildPythonPackage rec { pname = "cvxpy"; - version = "1.1.7"; + version = "1.1.8"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "330eb76e8369c360b68d9231c6eb350848e373b5952134f9bfebaed1a4c4211f"; + sha256 = "444068d4eda9ffcd43578895174489d4cef36b28ba7ae8a96ab9ef9571d2b4ff"; }; propagatedBuildInputs = [ From 833ccbaf6317e22fe44e78a8c9aaa9b6efe6c770 Mon Sep 17 00:00:00 2001 From: Morgan Jones Date: Wed, 3 Feb 2021 00:47:57 -0700 Subject: [PATCH 13/21] armagetronad-dedicated: init at 0.2.9.1.0 --- pkgs/top-level/all-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7cfc754d311..c4ebb78e47d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26248,6 +26248,8 @@ in armagetronad = callPackage ../games/armagetronad { }; + armagetronad-dedicated = callPackage ../games/armagetronad { dedicatedServer = true; }; + arena = callPackage ../games/arena {}; arx-libertatis = libsForQt5.callPackage ../games/arx-libertatis { }; From a3773da14260b53fbb32aebe92957b36b810091b Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Sun, 31 Jan 2021 20:40:19 +0800 Subject: [PATCH 14/21] pykms: 2019-06-11 -> 2021-01-25 --- pkgs/tools/networking/pykms/default.nix | 55 +++++++++---------- .../log-to-current-directory-by-default.patch | 20 ------- 2 files changed, 27 insertions(+), 48 deletions(-) delete mode 100644 pkgs/tools/networking/pykms/log-to-current-directory-by-default.patch diff --git a/pkgs/tools/networking/pykms/default.nix b/pkgs/tools/networking/pykms/default.nix index 0d001e7aeef..d648ff3ec1e 100644 --- a/pkgs/tools/networking/pykms/default.nix +++ b/pkgs/tools/networking/pykms/default.nix @@ -1,9 +1,13 @@ -{ lib, runtimeShell, fetchFromGitHub, python3, writeText, writeScript -, coreutils, sqlite }: - -with python3.pkgs; - +{ lib +, fetchFromGitHub +, python3 +, writeText +, writeShellScript +, sqlite +}: let + pypkgs = python3.pkgs; + dbSql = writeText "create_pykms_db.sql" '' CREATE TABLE clients( clientMachineId TEXT, @@ -17,35 +21,31 @@ let ); ''; - dbScript = writeScript "create_pykms_db.sh" (with lib; '' - #!${runtimeShell} - + dbScript = writeShellScript "create_pykms_db.sh" '' set -eEuo pipefail - db=$1 + db=''${1:-/var/lib/pykms/clients.db} if [ ! -e $db ] ; then - ${getBin sqlite}/bin/sqlite3 $db < ${dbSql} + ${lib.getBin sqlite}/bin/sqlite3 $db < ${dbSql} fi - ''); + ''; -in buildPythonApplication rec { +in +pypkgs.buildPythonApplication rec { pname = "pykms"; - version = "20190611"; + version = "unstable-2021-01-25"; src = fetchFromGitHub { - owner = "SystemRage"; - repo = "py-kms"; - rev = "dead208b1593655377fe8bc0d74cc4bead617103"; - sha256 = "065qpkfqrahsam1rb43vnasmzrangan5z1pr3p6s0sqjz5l2jydp"; + owner = "SystemRage"; + repo = "py-kms"; + rev = "a3b0c85b5b90f63b33dfa5ae6085fcd52c6da2ff"; + sha256 = "sha256-u0R0uJMQxHnJUDenxglhQkZza3/1DcyXCILcZVceygA="; }; sourceRoot = "source/py-kms"; - propagatedBuildInputs = [ systemd pytz tzlocal ]; - - # Fix https://github.com/SystemRage/py-kms/issues/64 : - patches = [ ./log-to-current-directory-by-default.patch ]; + propagatedBuildInputs = with pypkgs; [ systemd pytz tzlocal ]; postPatch = '' siteDir=$out/${python3.sitePackages} @@ -66,25 +66,24 @@ in buildPythonApplication rec { mv * $siteDir for b in Client Server ; do - makeWrapper ${python.interpreter} $out/bin/''${b,,} \ - --argv0 ''${b,,} \ - --add-flags $siteDir/pykms_$b.py \ - --prefix PYTHONPATH : "$(toPythonPath ${systemd})" + makeWrapper ${python3.interpreter} $out/bin/''${b,,} \ + --argv0 pykms-''${b,,} \ + --add-flags $siteDir/pykms_$b.py done install -Dm755 ${dbScript} $out/libexec/create_pykms_db.sh install -Dm644 ../README.md -t $out/share/doc/pykms - ${python.interpreter} -m compileall $siteDir + ${python3.interpreter} -m compileall $siteDir runHook postInstall ''; meta = with lib; { description = "Windows KMS (Key Management Service) server written in Python"; - homepage = "https://github.com/SystemRage/py-kms"; - license = licenses.mit; + homepage = "https://github.com/SystemRage/py-kms"; + license = licenses.unlicense; maintainers = with maintainers; [ peterhoeg ]; }; } diff --git a/pkgs/tools/networking/pykms/log-to-current-directory-by-default.patch b/pkgs/tools/networking/pykms/log-to-current-directory-by-default.patch deleted file mode 100644 index 7c8c65b63a2..00000000000 --- a/pkgs/tools/networking/pykms/log-to-current-directory-by-default.patch +++ /dev/null @@ -1,20 +0,0 @@ -# By default, create log files in current directory, instead of the script directory. ---- ../original/py-kms/pykms_Client.py -+++ py-kms/pykms_Client.py -@@ -48,5 +48,5 @@ - 'choi' : ["CRITICAL", "ERROR", "WARNING", "INFO", "DEBUG", "MINI"]}, - 'lfile' : {'help' : 'Use this option to set an output log file. The default is \"pykms_logclient.log\" or type \"STDOUT\" to view log info on stdout.', -- 'def' : os.path.dirname(os.path.abspath( __file__ )) + "/pykms_logclient.log", 'des' : "logfile"}, -+ 'def' : "pykms_logclient.log", 'des' : "logfile"}, - 'lsize' : {'help' : 'Use this flag to set a maximum size (in MB) to the output log file. Desactivated by default.', 'def' : 0, 'des': "logsize"}, - } ---- ../original/py-kms/pykms_Server.py -+++ py-kms/pykms_Server.py -@@ -85,5 +85,5 @@ - 'choi' : ["CRITICAL", "ERROR", "WARNING", "INFO", "DEBUG", "MINI"]}, - 'lfile' : {'help' : 'Use this option to set or not an output log file. The default is \"pykms_logserver.log\" or type \"STDOUT\" to view log info on stdout.', -- 'def' : os.path.dirname(os.path.abspath( __file__ )) + "/pykms_logserver.log", 'des' : "logfile"}, -+ 'def' : "pykms_logserver.log", 'des' : "logfile"}, - 'lsize' : {'help' : 'Use this flag to set a maximum size (in MB) to the output log file. Desactivated by default.', 'def' : 0, 'des': "logsize"}, - } - ''); From c9091a9def1a92697ba929a3fe6f37784addb773 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Sun, 31 Jan 2021 20:40:45 +0800 Subject: [PATCH 15/21] nixos/pykms: fix launcher --- nixos/modules/services/misc/pykms.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/nixos/modules/services/misc/pykms.nix b/nixos/modules/services/misc/pykms.nix index d6aeae48ccb..2f752bcc7ed 100644 --- a/nixos/modules/services/misc/pykms.nix +++ b/nixos/modules/services/misc/pykms.nix @@ -1,12 +1,12 @@ { config, lib, pkgs, ... }: with lib; - let cfg = config.services.pykms; libDir = "/var/lib/pykms"; -in { +in +{ meta.maintainers = with lib.maintainers; [ peterhoeg ]; imports = [ @@ -46,14 +46,14 @@ in { }; logLevel = mkOption { - type = types.enum [ "CRITICAL" "ERROR" "WARNING" "INFO" "DEBUG" "MINI" ]; + type = types.enum [ "CRITICAL" "ERROR" "WARNING" "INFO" "DEBUG" "MININFO" ]; default = "INFO"; description = "How much to log"; }; extraArgs = mkOption { type = types.listOf types.str; - default = []; + default = [ ]; description = "Additional arguments"; }; }; @@ -74,8 +74,9 @@ in { ExecStartPre = "${getBin pykms}/libexec/create_pykms_db.sh ${libDir}/clients.db"; ExecStart = lib.concatStringsSep " " ([ "${getBin pykms}/bin/server" - "--logfile STDOUT" - "--loglevel ${cfg.logLevel}" + "--logfile=STDOUT" + "--loglevel=${cfg.logLevel}" + "--sqlite=${libDir}/clients.db" ] ++ cfg.extraArgs ++ [ cfg.listenAddress (toString cfg.port) From c6c186f4107ae7636a8d464bc013c49b99acc3f9 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Wed, 3 Feb 2021 10:41:46 +0700 Subject: [PATCH 16/21] uutils-coreutils: 2019-05-03 -> 0.0.3 --- pkgs/tools/misc/uutils-coreutils/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/misc/uutils-coreutils/default.nix b/pkgs/tools/misc/uutils-coreutils/default.nix index f18deb0c83d..44871b07a8e 100644 --- a/pkgs/tools/misc/uutils-coreutils/default.nix +++ b/pkgs/tools/misc/uutils-coreutils/default.nix @@ -1,20 +1,21 @@ { stdenv, fetchFromGitHub, rustPlatform, cargo, cmake, sphinx, lib, prefix ? "uutils-" , Security }: +rustPlatform.buildRustPackage rec { + pname = "uutils-coreutils"; + version = "0.0.3"; -rustPlatform.buildRustPackage { - name = "uutils-coreutils-2019-05-03"; src = fetchFromGitHub { owner = "uutils"; repo = "coreutils"; - rev = "036dd812958ace22d973acf7b370f58072049dac"; - sha256 = "0d9w3iiphhsk7l5l34682wayp90rgq5a3d94l3qdvhcqkfmpg727"; + rev = version; + sha256 = "QWiEHk8aciiwQeyNgrr0M0c1EeAgE3gSqw0ly/YTwTQ="; }; # too many impure/platform-dependent tests doCheck = false; - cargoSha256 = "186hwzdpy7j0gw7491qx02vy4di5md47hipf1xxi1qccvmcfghwh"; + cargoSha256 = "m2a7WNkF5TxjJlytjdoQ/JZIF9gp9qBkH+UU/NVRJzA="; makeFlags = [ "CARGO=${cargo}/bin/cargo" "PREFIX=$(out)" "PROFILE=release" "INSTALLDIR_MAN=$(out)/share/man/man1" ] @@ -34,7 +35,7 @@ rustPlatform.buildRustPackage { CLI utils in Rust. This repo is to aggregate the GNU coreutils rewrites. ''; homepage = "https://github.com/uutils/coreutils"; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ siraben ]; license = licenses.mit; platforms = platforms.unix; }; From 246907936671536034c20979c9def3f2bdc6c4fb Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 3 Feb 2021 11:08:31 +0100 Subject: [PATCH 17/21] crunch: add license --- pkgs/tools/security/crunch/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/security/crunch/default.nix b/pkgs/tools/security/crunch/default.nix index 2422a2278bb..0c7620124d1 100644 --- a/pkgs/tools/security/crunch/default.nix +++ b/pkgs/tools/security/crunch/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, which }: -stdenv.mkDerivation rec { +stdenv.mkDerivation rec { pname = "crunch"; version = "3.6"; @@ -24,6 +24,7 @@ stdenv.mkDerivation rec { description = "Wordlist generator"; homepage = "https://sourceforge.net/projects/crunch-wordlist/"; platforms = platforms.unix; + license = with licenses; [ gpl2Only ]; maintainers = with maintainers; [ lethalman lnl7 ]; }; } From e7288c3f8d90d91f77285ad1f03ea58d6e92a083 Mon Sep 17 00:00:00 2001 From: "P. R. d. O" Date: Wed, 3 Feb 2021 04:42:17 -0600 Subject: [PATCH 18/21] signumone-ks: removing libav_0_8 (#111693) --- pkgs/applications/misc/signumone-ks/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/signumone-ks/default.nix b/pkgs/applications/misc/signumone-ks/default.nix index aeea3ff5daa..eb0af95d58d 100644 --- a/pkgs/applications/misc/signumone-ks/default.nix +++ b/pkgs/applications/misc/signumone-ks/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, dpkg, autoPatchelfHook, makeWrapper, - atk, ffmpeg, gdk-pixbuf, glibc, gtk3, libav_0_8, libXtst }: + atk, ffmpeg, gdk-pixbuf, gtk3, libXtst }: stdenv.mkDerivation rec { pname = "signumone-ks"; @@ -20,8 +20,8 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - atk glibc gdk-pixbuf stdenv.cc.cc ffmpeg - libav_0_8 gtk3 libXtst + atk gdk-pixbuf ffmpeg + gtk3 libXtst ]; libPath = lib.makeLibraryPath buildInputs; From 0e784a2a3b027dd87ecf432fca9b0fdc9bed5d08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 3 Feb 2021 11:40:51 +0100 Subject: [PATCH 19/21] nixos/zfs: fix reference to awk broken in 648a6c4348f19c5c50bbff20ed683f783194574b --- nixos/modules/tasks/filesystems/zfs.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix index df867aa896f..d69a161b896 100644 --- a/nixos/modules/tasks/filesystems/zfs.nix +++ b/nixos/modules/tasks/filesystems/zfs.nix @@ -513,7 +513,7 @@ in script = (importLib { # See comments at importLib definition. zpoolCmd = "${cfgZfs.package}/sbin/zpool"; - zfsCmd = "${cfgZfs.package}/sbin/zfs"; + awkCmd = "${pkgs.gawk}/bin/awk"; inherit cfgZfs; }) + '' poolImported "${pool}" && exit From 5b9bfe5625f68a72f215341ef4601793eb58cb8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 3 Feb 2021 11:45:31 +0100 Subject: [PATCH 20/21] zfs: fix invalid package references --- nixos/modules/tasks/filesystems/zfs.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix index d69a161b896..b750820bfa5 100644 --- a/nixos/modules/tasks/filesystems/zfs.nix +++ b/nixos/modules/tasks/filesystems/zfs.nix @@ -528,7 +528,7 @@ in ${optionalString (if isBool cfgZfs.requestEncryptionCredentials then cfgZfs.requestEncryptionCredentials else cfgZfs.requestEncryptionCredentials != []) '' - ${packages.zfsUser}/sbin/zfs list -rHo name,keylocation ${pool} | while IFS=$'\t' read ds kl; do + ${cfgZfs.package}/sbin/zfs list -rHo name,keylocation ${pool} | while IFS=$'\t' read ds kl; do (${optionalString (!isBool cfgZfs.requestEncryptionCredentials) '' if ! echo '${concatStringsSep "\n" cfgZfs.requestEncryptionCredentials}' | grep -qFx "$ds"; then continue @@ -538,10 +538,10 @@ in none ) ;; prompt ) - ${config.systemd.package}/bin/systemd-ask-password "Enter key for $ds:" | ${packages.zfsUser}/sbin/zfs load-key "$ds" + ${config.systemd.package}/bin/systemd-ask-password "Enter key for $ds:" | ${cfgZfs.package}/sbin/zfs load-key "$ds" ;; * ) - ${packages.zfsUser}/sbin/zfs load-key "$ds" + ${cfgZfs.package}/sbin/zfs load-key "$ds" ;; esac) < /dev/null # To protect while read ds kl in case anything reads stdin done From a5b95a5cf9562a4fd5ecf5a91ed6ac6b589cf267 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 3 Feb 2021 11:09:34 +0000 Subject: [PATCH 21/21] clojure-lsp: 2021.01.28-03.03.16 -> 2021.02.02-14.02.23 --- pkgs/development/tools/misc/clojure-lsp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/clojure-lsp/default.nix b/pkgs/development/tools/misc/clojure-lsp/default.nix index e70067600a7..a2d28bf7d04 100644 --- a/pkgs/development/tools/misc/clojure-lsp/default.nix +++ b/pkgs/development/tools/misc/clojure-lsp/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "clojure-lsp"; - version = "2021.01.28-03.03.16"; + version = "2021.02.02-14.02.23"; src = fetchurl { url = "https://github.com/clojure-lsp/clojure-lsp/releases/download/${version}/${pname}.jar"; - sha256 = "sha256-7Mj0yZD8WKpeekEkLZfQhHaPDRzcKO9arOCo0pwUflY="; + sha256 = "sha256-NwaUIaGkSB+oVd/OArp+bs01ZDAFy5JJ4ic5sMDYg8s="; }; dontUnpack = true;