From add9d281cef6ec0960347cbae6203186fdcd08e5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 1 Sep 2022 18:57:34 +0000 Subject: [PATCH 01/11] jmol: 14.32.68 -> 14.32.73 --- pkgs/applications/science/chemistry/jmol/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/chemistry/jmol/default.nix b/pkgs/applications/science/chemistry/jmol/default.nix index 4e1497acc055..67a6f150efad 100644 --- a/pkgs/applications/science/chemistry/jmol/default.nix +++ b/pkgs/applications/science/chemistry/jmol/default.nix @@ -25,14 +25,14 @@ let }; in stdenv.mkDerivation rec { - version = "14.32.68"; + version = "14.32.73"; pname = "jmol"; src = let baseVersion = "${lib.versions.major version}.${lib.versions.minor version}"; in fetchurl { url = "mirror://sourceforge/jmol/Jmol/Version%20${baseVersion}/Jmol%20${version}/Jmol-${version}-binary.tar.gz"; - sha256 = "sha256-CCVy+24O5rlAxnd01TeYqcOhDoSrxebfR1Ez7VDDrW4="; + sha256 = "sha256-95bZ6SYPKH+CGHETfdt/0YcUiZaP1gBiNf70GfUd4+M="; }; patchPhase = '' From 8b0c26c7a1467ef08408ca77b8e546c68c72c553 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 5 Sep 2022 22:35:02 +0000 Subject: [PATCH 02/11] haproxy: 2.6.4 -> 2.6.5 --- pkgs/tools/networking/haproxy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/haproxy/default.nix b/pkgs/tools/networking/haproxy/default.nix index be7cde851009..2a51d9ac0755 100644 --- a/pkgs/tools/networking/haproxy/default.nix +++ b/pkgs/tools/networking/haproxy/default.nix @@ -11,11 +11,11 @@ assert usePcre -> pcre != null; stdenv.mkDerivation rec { pname = "haproxy"; - version = "2.6.4"; + version = "2.6.5"; src = fetchurl { url = "https://www.haproxy.org/download/${lib.versions.majorMinor version}/src/${pname}-${version}.tar.gz"; - sha256 = "sha256-8H1nraL/Opmf7U40RZwEiVNjMaVJZlrJDLao35H0ook="; + sha256 = "sha256-zp4Z6/zdQ+Ua+KYJDx341RLZct33QvpkimQ7uxkFZgU="; }; buildInputs = [ openssl zlib ] From b5dbb07543e8ccd6031a7e04d908a26759917cae Mon Sep 17 00:00:00 2001 From: Michael Adler Date: Fri, 2 Sep 2022 10:50:26 +0200 Subject: [PATCH 03/11] brave: 1.42.88 -> 1.43.89 --- pkgs/applications/networking/browsers/brave/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix index 932e33026f78..81066a86558e 100644 --- a/pkgs/applications/networking/browsers/brave/default.nix +++ b/pkgs/applications/networking/browsers/brave/default.nix @@ -90,11 +90,11 @@ in stdenv.mkDerivation rec { pname = "brave"; - version = "1.42.88"; + version = "1.43.89"; src = fetchurl { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - sha256 = "sha256-Or3eTLwap6KFhO7ieLyAXS0NKga5eUbd3KyFq/YNg+c="; + sha256 = "sha256-eqwqn4cvVzoEmh206ybG6PWWg56ct53wYyRBOQ8wN5g="; }; dontConfigure = true; From f094ede0abcb9e77fa363978b009914a5a3e9643 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 6 Sep 2022 14:07:07 +0000 Subject: [PATCH 04/11] gum: 0.5.0 -> 0.6.0 --- pkgs/applications/misc/gum/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/gum/default.nix b/pkgs/applications/misc/gum/default.nix index b552b6083258..8d77d75dafeb 100644 --- a/pkgs/applications/misc/gum/default.nix +++ b/pkgs/applications/misc/gum/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "gum"; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "charmbracelet"; repo = pname; rev = "v${version}"; - sha256 = "sha256-S+sbfo7F6+bJeHywxM3jkZN+7MNQh9YRyLPHTC4wZnk="; + sha256 = "sha256-pEULArQDwKZzpD0GVH21L1v9xVZiBz91kL/jPJjJav4="; }; vendorSha256 = "sha256-vvNoO5eABGVwvAzK33uPelmo3BKxfqiYgEXZI7kgeSo="; From 8173ccd23cfdb58a4a261e81d2d20f45f31f1ddf Mon Sep 17 00:00:00 2001 From: 0x4A6F <0x4A6F@users.noreply.github.com> Date: Tue, 6 Sep 2022 08:46:36 +0200 Subject: [PATCH 05/11] freenukum: 0.3.5 -> 0.4.0 --- pkgs/games/freenukum/default.nix | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/pkgs/games/freenukum/default.nix b/pkgs/games/freenukum/default.nix index 0d2f833671e3..89c26099db09 100644 --- a/pkgs/games/freenukum/default.nix +++ b/pkgs/games/freenukum/default.nix @@ -6,6 +6,7 @@ , dejavu_fonts , SDL2 , SDL2_ttf +, SDL2_image }: let pname = "freenukum"; @@ -24,16 +25,17 @@ let in rustPlatform.buildRustPackage rec { inherit pname; - version = "0.3.5"; + version = "0.4.0"; src = fetchFromGitLab { + domain = "salsa.debian.org"; owner = "silwol"; - repo = pname; + repo = "freenukum"; rev = "v${version}"; - sha256 = "0yqfzh0c8fqk92q9kmidy15dc5li0ak1gbn3v7p3xw5fkrzf99gy"; + sha256 = "sha256-Tk9n2gPwyPin6JZ4RSO8d/+xVpEz4rF8C2eGKwrAXU0="; }; - cargoSha256 = "1nss5zbdvxkr1mfb6vi6yjxcih99w836kvfr4r3n5dvzlkvga2vf"; + cargoSha256 = "sha256-8RfiObWDqZJg+sjjDBk+sRoS5CiECIdNPH79T+O8e8M="; nativeBuildInputs = [ installShellFiles @@ -42,6 +44,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ SDL2 SDL2_ttf + SDL2_image ]; postPatch = '' @@ -55,13 +58,15 @@ rustPlatform.buildRustPackage rec { ${dejavu_fonts}/share/fonts/truetype/DejaVuSans.ttf \ $out/share/fonts/truetype/dejavu/DejaVuSans.ttf mkdir -p $out/share/doc/freenukum - install -Dm644 README.md CHANGELOG.md COPYING $out/share/doc/freenukum/ + install -Dm644 README.md CHANGELOG.md $out/share/doc/freenukum/ installManPage doc/freenukum.6 install -Dm644 "${desktopItem}/share/applications/"* -t $out/share/applications/ ''; meta = with lib; { description = "Clone of the original Duke Nukum 1 Jump'n Run game"; + homepage = "https://salsa.debian.org/silwol/freenukum"; + changelog = "https://salsa.debian.org/silwol/freenukum/-/blob/v${version}/CHANGELOG.md"; license = licenses.agpl3Plus; maintainers = with maintainers; [ _0x4A6F ]; broken = stdenv.isDarwin; From f367b52ccb85cbecb62de134f3851432e8614aec Mon Sep 17 00:00:00 2001 From: ifurther <55025025+ifurther@users.noreply.github.com> Date: Wed, 7 Sep 2022 00:54:37 +0800 Subject: [PATCH 06/11] maintainers: add ifurther --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 08fd6cca03cd..7294ffcb8aff 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -5562,6 +5562,12 @@ githubId = 1550265; name = "Dominic Steinitz"; }; + ifurther = { + email = "55025025+ifurther@users.noreply.github.com"; + github = "ifurther"; + githubId = 55025025; + name = "Feather Lin"; + }; igsha = { email = "igor.sharonov@gmail.com"; github = "igsha"; From dbd69e7feda41f1381ded06caa27ea540a2cf5da Mon Sep 17 00:00:00 2001 From: ifurther <55025025+ifurther@users.noreply.github.com> Date: Wed, 7 Sep 2022 00:57:33 +0800 Subject: [PATCH 07/11] python3Packages.pyjnius: init at 1.4.0 --- .../python-modules/pyjnius/default.nix | 31 +++++++++++++++++++ pkgs/development/tools/pipenv/default.nix | 4 +++ pkgs/top-level/python-packages.nix | 2 ++ 3 files changed, 37 insertions(+) create mode 100644 pkgs/development/python-modules/pyjnius/default.nix diff --git a/pkgs/development/python-modules/pyjnius/default.nix b/pkgs/development/python-modules/pyjnius/default.nix new file mode 100644 index 000000000000..b53dd83205f3 --- /dev/null +++ b/pkgs/development/python-modules/pyjnius/default.nix @@ -0,0 +1,31 @@ +{ buildPythonPackage +, cython +, fetchPypi +, jdk +, lib +, six +}: + +buildPythonPackage rec { + pname = "pyjnius"; + version = "1.4.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "8bc1a1b06fb11df8dd8b8d56f5ecceab614d4ba70cf559c64ae2f146423d53ce"; + }; + propagatedBuildInputs = [ + six + ]; + + nativeBuildInputs = [ jdk cython ]; + + pythonImportsCheck = [ "jnius" ]; + + meta = with lib; { + description = "A Python module to access Java classes as Python classes using the Java Native Interface (JNI)"; + homepage = "https://github.com/kivy/pyjnius"; + license = licenses.mit; + maintainers = with maintainers; [ ifurther ]; + }; +} diff --git a/pkgs/development/tools/pipenv/default.nix b/pkgs/development/tools/pipenv/default.nix index 6f51eb892df8..2a8a78f7b52b 100644 --- a/pkgs/development/tools/pipenv/default.nix +++ b/pkgs/development/tools/pipenv/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , python3 , installShellFiles }: @@ -13,6 +14,9 @@ let pip virtualenv virtualenv-clone + ] + ++ lib.optionals stdenv.hostPlatform.isAndroid [ + pyjnius ]; pythonEnv = python3.withPackages runtimeDeps; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b5d038c87287..03eb188e0730 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7823,6 +7823,8 @@ in { pyjks = callPackage ../development/python-modules/pyjks { }; + pyjnius = callPackage ../development/python-modules/pyjnius { }; + pyjsparser = callPackage ../development/python-modules/pyjsparser { }; pyjwkest = callPackage ../development/python-modules/pyjwkest { }; From cdeffa7ca8c8d5b1b3de2d0ae1ae3689a799839c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 6 Sep 2022 19:45:55 +0000 Subject: [PATCH 08/11] python310Packages.google-cloud-bigquery-storage: 2.14.2 -> 2.15.0 --- .../python-modules/google-cloud-bigquery-storage/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix b/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix index a4f9e638c3d9..bd872ab7a710 100644 --- a/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "google-cloud-bigquery-storage"; - version = "2.14.2"; + version = "2.15.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-VUCQSpykLuwYrzgz3YImODesRLdr1NuSreGShX2+oEw="; + sha256 = "sha256-v0g6gK4cmELH1cmRl9EDJceEOW3vKgR9GSZ2oHKzrG0="; }; propagatedBuildInputs = [ From 977ab682f1bb709b49e3a1a1b6069d86abfe6c52 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 6 Sep 2022 19:46:57 +0000 Subject: [PATCH 09/11] python310Packages.google-cloud-dlp: 3.8.1 -> 3.9.0 --- pkgs/development/python-modules/google-cloud-dlp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-dlp/default.nix b/pkgs/development/python-modules/google-cloud-dlp/default.nix index a5bf4ccfa4d5..4b50072264ad 100644 --- a/pkgs/development/python-modules/google-cloud-dlp/default.nix +++ b/pkgs/development/python-modules/google-cloud-dlp/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "google-cloud-dlp"; - version = "3.8.1"; + version = "3.9.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-jNsIpg5M8r7SfzldmcsAqoyKI/7pwwo/Zk7KBwdOxJQ="; + hash = "sha256-fTBNCox9Hbk4iNQfxZZRfNiOozaIL5HTrsN/Parc6m0="; }; propagatedBuildInputs = [ From 3cbd5ebddd0ad16f190f3cc4a5a499a51f801cf4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 6 Sep 2022 19:53:12 +0000 Subject: [PATCH 10/11] python310Packages.google-cloud-translate: 3.8.1 -> 3.8.2 --- .../python-modules/google-cloud-translate/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-translate/default.nix b/pkgs/development/python-modules/google-cloud-translate/default.nix index ce0184b8d719..dfe50519c428 100644 --- a/pkgs/development/python-modules/google-cloud-translate/default.nix +++ b/pkgs/development/python-modules/google-cloud-translate/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "google-cloud-translate"; - version = "3.8.1"; + version = "3.8.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-1g+bCXNeSMm166qlNU/ZwhC9IMdmPkGAtaxpYfmxOU8="; + hash = "sha256-wxKWoRQ8DW94De9Z0sOYjm+oTXuEcW5Vw3Iu4YITBQ0="; }; propagatedBuildInputs = [ From 7aeff12e66ba830770fa0dbf34a2be8f262804a4 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Wed, 7 Sep 2022 08:08:53 +1200 Subject: [PATCH 11/11] emacs: Enable Xaw3d by default It's a really small closure size increase and has nicer scroll bars for those that use them. --- pkgs/top-level/all-packages.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5d2f6ac66b91..e50949aef8b8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27150,7 +27150,6 @@ with pkgs; emacs28 = callPackage ../applications/editors/emacs/28.nix { # use override to enable additional features libXaw = xorg.libXaw; - Xaw3d = null; gconf = null; alsa-lib = null; acl = null;