From ae52a3c76589523302fd731a9108cd9403891a2b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 22 Apr 2022 15:14:43 +0000 Subject: [PATCH 1/9] faudio: 22.02 -> 22.04 --- pkgs/development/libraries/faudio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/faudio/default.nix b/pkgs/development/libraries/faudio/default.nix index 58601c39a57f..f085f33827c3 100644 --- a/pkgs/development/libraries/faudio/default.nix +++ b/pkgs/development/libraries/faudio/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "faudio"; - version = "22.02"; + version = "22.04"; src = fetchFromGitHub { owner = "FNA-XNA"; repo = "FAudio"; rev = version; - sha256 = "sha256-qjXFpxoFF70aOaEq9/JfI2DtFxxHjyK2OnDaXMiqQMM="; + sha256 = "sha256-2XQpwPNWjK5FF9ex5QxrGEPsUXT/MBqjXy7P2D/SxZw="; }; nativeBuildInputs = [cmake]; From 55b54803f0a964dc4d63c12a735cec678912da5b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 22 Apr 2022 19:26:06 +0000 Subject: [PATCH 2/9] gcompris: 2.3 -> 2.4 --- pkgs/games/gcompris/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/gcompris/default.nix b/pkgs/games/gcompris/default.nix index 5343bae4a6cb..99ee63ed057f 100644 --- a/pkgs/games/gcompris/default.nix +++ b/pkgs/games/gcompris/default.nix @@ -18,11 +18,11 @@ mkDerivation rec { pname = "gcompris"; - version = "2.3"; + version = "2.4"; src = fetchurl { url = "https://download.kde.org/stable/gcompris/qt/src/gcompris-qt-${version}.tar.xz"; - sha256 = "sha256-UgWLp5IVqbeFFCO/PRFJ/X1sPm7nSkagVcgEp5SdzGI="; + sha256 = "sha256-/QZub48rarVHcD0PgOPc6NTlOKrsEzVK/qjHb5CjWS0="; }; cmakeFlags = [ From c64cc3fbd431c02b7a9faf190d5a7a152da897ae Mon Sep 17 00:00:00 2001 From: Luflosi Date: Mon, 27 Sep 2021 17:17:46 +0200 Subject: [PATCH 3/9] decoder: init at unstable-2021-11-20 --- pkgs/tools/security/decoder/default.nix | 39 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 41 insertions(+) create mode 100644 pkgs/tools/security/decoder/default.nix diff --git a/pkgs/tools/security/decoder/default.nix b/pkgs/tools/security/decoder/default.nix new file mode 100644 index 000000000000..baaacac5da8a --- /dev/null +++ b/pkgs/tools/security/decoder/default.nix @@ -0,0 +1,39 @@ +{ lib +, stdenv +, fetchFromGitHub +, openssl +}: + +stdenv.mkDerivation rec { + pname = "decoder"; + version = "unstable-2021-11-20"; + + src = fetchFromGitHub { + owner = "PeterPawn"; + repo = "decoder"; + rev = "da0f826629d4e7b873f9d1a39f24c50ff0a68cd2"; + sha256 = "sha256-1sT1/iwtc2ievmLuNuooy9b14pTs1ZC5noDwzFelk7w="; + }; + + buildInputs = [ + openssl + ]; + + makeFlags = [ "OPENSSL=y" ]; + + installPhase = '' + runHook preInstall + + install -Dm755 src/decoder "$out/bin/decoder" + + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://github.com/PeterPawn/decoder"; + description = ''"secrets" decoding for FRITZ!OS devices''; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ Luflosi ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e665d0bdc23d..331acab3da1e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6995,6 +6995,8 @@ with pkgs; deco = callPackage ../applications/misc/deco { }; + decoder = callPackage ../tools/security/decoder { }; + icoutils = callPackage ../tools/graphics/icoutils { }; idutils = callPackage ../tools/misc/idutils { }; From 53cf6df9d5dc6096a955c1b777911e5c0d75cc69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Soko=C5=82owski?= Date: Tue, 10 May 2022 17:56:39 +0200 Subject: [PATCH 4/9] gomobile: 2021-06-14 -> 2022-05-18 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Includes several important fixes for macOS and Catalyst, Android NDKs, and iOS builds. - https://go.googlesource.com/mobile/+/8578da9835fd365e78a6e63048c103b27a53a82c - https://go.googlesource.com/mobile/+/76c259c465ba39f84de7e2751a666612ddca556b - https://go.googlesource.com/mobile/+/9cba7bc03c0fdba1b8fe7dfd476c2001656dde9e - https://go.googlesource.com/mobile/+/80cb72e7af8e71b65e7d9e59fb4ec5d620134608 - https://go.googlesource.com/mobile/+/6d8ad35e460371e979b330d80492cba19676f933 - https://go.googlesource.com/mobile/+/b5eb1abba0f2d9331b29a29967d535890e026cec Also moves use of `wrapProgram` to `postFixup` and dropped `ANDROID_NDK_HOME`. No longer necessary as `8578da98` detects it from `ANDROID_HOME`. Signed-off-by: Jakub SokoĊ‚owski --- pkgs/development/mobile/gomobile/default.nix | 26 +++++++++++--------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/pkgs/development/mobile/gomobile/default.nix b/pkgs/development/mobile/gomobile/default.nix index 4087f1cca807..44841d889c43 100644 --- a/pkgs/development/mobile/gomobile/default.nix +++ b/pkgs/development/mobile/gomobile/default.nix @@ -9,15 +9,15 @@ buildGoModule { pname = "gomobile"; - version = "unstable-2021-06-14"; + version = "unstable-2022-05-18"; - vendorSha256 = "1irgkgv72rakg7snk1bnp10ibr64ykz9l40s59l4fnl63zsh12a0"; + vendorSha256 = "sha256-AmOy3X+d2OD7ZLbFuy+SptdlgWbZJaXYEgO79M64ufE="; src = fetchgit { - rev = "7c8f154d100840bc5828285bb390bbae1cb5a98c"; + rev = "8578da9835fd365e78a6e63048c103b27a53a82c"; name = "gomobile"; url = "https://go.googlesource.com/mobile"; - sha256 = "1w9mra1mqf60iafp0ywvja5196fjsjyfhvz4yizqq4qkyll5qmj1"; + sha256 = "sha256-AOR/p+DW83f2+BOxm2rFXBCrotcIyunK3UzQ/dnauWY="; }; subPackages = [ "bind" "cmd/gobind" "cmd/gomobile" ]; @@ -32,8 +32,7 @@ buildGoModule { postPatch = '' substituteInPlace cmd/gomobile/env.go --replace \ 'tmpdir, err = ioutil.TempDir("", "gomobile-work-")' \ - 'tmpdir = filepath.Join(os.Getenv("NIX_BUILD_TOP"), "gomobile-work")' \ - --replace '"io/ioutil"' "" + 'tmpdir = filepath.Join(os.Getenv("NIX_BUILD_TOP"), "gomobile-work")' substituteInPlace cmd/gomobile/init.go --replace \ 'tmpdir, err = ioutil.TempDir(gomobilepath, "work-")' \ 'tmpdir = filepath.Join(os.Getenv("NIX_BUILD_TOP"), "work")' @@ -43,13 +42,18 @@ buildGoModule { postInstall = '' mkdir -p $out/src/golang.org/x ln -s $src $out/src/golang.org/x/mobile - wrapProgram $out/bin/gomobile \ + ''; + + postFixup = '' + for bin in $(ls $out/bin); do + wrapProgram $out/bin/$bin \ + --suffix GOPATH : $out \ '' + lib.optionalString withAndroidPkgs '' - --prefix PATH : "${androidPkgs.androidsdk}/bin" \ - --set ANDROID_NDK_HOME "${androidPkgs.androidsdk}/libexec/android-sdk/ndk-bundle" \ - --set ANDROID_HOME "${androidPkgs.androidsdk}/libexec/android-sdk" \ + --prefix PATH : "${androidPkgs.androidsdk}/bin" \ + --set-default ANDROID_HOME "${androidPkgs.androidsdk}/libexec/android-sdk" \ '' + '' - --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ zlib ]}" + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ zlib ]}" + done ''; meta = with lib; { From 1bb76e9f8bf9b0524474b8e05fc22f4612873fc2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 20 Jun 2022 03:29:45 +0000 Subject: [PATCH 5/9] python310Packages.pglast: 3.11 -> 3.12 --- pkgs/development/python-modules/pglast/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pglast/default.nix b/pkgs/development/python-modules/pglast/default.nix index baef7ea8aad0..b45b2139e712 100644 --- a/pkgs/development/python-modules/pglast/default.nix +++ b/pkgs/development/python-modules/pglast/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pglast"; - version = "3.11"; + version = "3.12"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-JvWYrfo4HmvzwJ4vi8iGMfUKTMmpN6FS8fx2McKDj3Y="; + hash = "sha256-9lPyillQyCTXiHCCLq1DKG6YbKWSYu9h8AGijO3xN/M="; }; propagatedBuildInputs = [ From 91206fb78504cc9d97f445105d1be6157e562c4a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 20 Jun 2022 03:53:37 +0000 Subject: [PATCH 6/9] python310Packages.peaqevcore: 1.0.19 -> 1.1.1 --- pkgs/development/python-modules/peaqevcore/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/peaqevcore/default.nix b/pkgs/development/python-modules/peaqevcore/default.nix index 5104e011d948..6bffbd408ef5 100644 --- a/pkgs/development/python-modules/peaqevcore/default.nix +++ b/pkgs/development/python-modules/peaqevcore/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "peaqevcore"; - version = "1.0.19"; + version = "1.1.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-c+DTawzDwrNmv9RGRa5hEw+cKLTo3BKx3hK8zHW7tWk="; + hash = "sha256-hTHsY/Xs30DXD6T8pAS3NvGqBPeS3PKRRyH5UxaU57c="; }; postPatch = '' From 444d3a825a871c92230120a10a6ea15fe6ce92ee Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sun, 19 Jun 2022 01:51:01 +0100 Subject: [PATCH 7/9] treewide/python-modules: add sourceProvenance for several packages --- pkgs/applications/science/biology/neuron/default.nix | 5 +++++ pkgs/development/python-modules/JPype1/default.nix | 4 ++++ pkgs/development/python-modules/adb-enhanced/default.nix | 4 ++++ pkgs/development/python-modules/amazon-ion/default.nix | 4 ++++ .../python-modules/databricks-connect/default.nix | 1 + pkgs/development/python-modules/gurobipy/linux.nix | 1 + pkgs/development/python-modules/py4j/default.nix | 4 ++++ pkgs/development/python-modules/pyspark/default.nix | 4 ++++ pkgs/development/python-modules/python-ldap-test/default.nix | 4 ++++ pkgs/development/python-modules/qiskit-nature/default.nix | 4 ++++ 10 files changed, 35 insertions(+) diff --git a/pkgs/applications/science/biology/neuron/default.nix b/pkgs/applications/science/biology/neuron/default.nix index b9c4b16b359a..36f1b4c699a8 100644 --- a/pkgs/applications/science/biology/neuron/default.nix +++ b/pkgs/applications/science/biology/neuron/default.nix @@ -80,6 +80,11 @@ stdenv.mkDerivation rec { potential close to the membrane), and where cell membrane properties are complex, involving many ion-specific channels, ion accumulation, and second messengers"; + sourceProvenance = with sourceTypes; [ + fromSource + ] ++ lib.optionals (python != null) [ + binaryNativeCode # "geometry3d" bundled libraries + ]; license = licenses.bsd3; homepage = "http://www.neuron.yale.edu/neuron"; maintainers = [ maintainers.adev ]; diff --git a/pkgs/development/python-modules/JPype1/default.nix b/pkgs/development/python-modules/JPype1/default.nix index af435c5f088e..16ef7a71d1b8 100644 --- a/pkgs/development/python-modules/JPype1/default.nix +++ b/pkgs/development/python-modules/JPype1/default.nix @@ -31,6 +31,10 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://github.com/originell/jpype/"; + sourceProvenance = with sourceTypes; [ + fromSource + binaryBytecode + ]; license = licenses.asl20; description = "A Python to Java bridge"; }; diff --git a/pkgs/development/python-modules/adb-enhanced/default.nix b/pkgs/development/python-modules/adb-enhanced/default.nix index bf3f124b02e2..79fc34cc0ecb 100644 --- a/pkgs/development/python-modules/adb-enhanced/default.nix +++ b/pkgs/development/python-modules/adb-enhanced/default.nix @@ -40,6 +40,10 @@ buildPythonPackage rec { meta = with lib; { description = "Tool for Android testing and development"; homepage = "https://github.com/ashishb/adb-enhanced"; + sourceProvenance = with sourceTypes; [ + fromSource + binaryBytecode + ]; license = licenses.asl20; maintainers = with maintainers; [ vtuan10 ]; mainProgram = "adbe"; diff --git a/pkgs/development/python-modules/amazon-ion/default.nix b/pkgs/development/python-modules/amazon-ion/default.nix index eb83fcce471b..e8e63f41b62e 100644 --- a/pkgs/development/python-modules/amazon-ion/default.nix +++ b/pkgs/development/python-modules/amazon-ion/default.nix @@ -41,6 +41,10 @@ buildPythonPackage rec { meta = with lib; { description = "Python implementation of Amazon Ion"; homepage = "https://github.com/amzn/ion-python"; + sourceProvenance = with sourceTypes; [ + fromSource + binaryNativeCode + ]; license = licenses.asl20; maintainers = with maintainers; [ terlar ]; }; diff --git a/pkgs/development/python-modules/databricks-connect/default.nix b/pkgs/development/python-modules/databricks-connect/default.nix index b271861e2789..e9fcda9deda5 100644 --- a/pkgs/development/python-modules/databricks-connect/default.nix +++ b/pkgs/development/python-modules/databricks-connect/default.nix @@ -41,6 +41,7 @@ buildPythonPackage rec { meta = with lib; { description = "Client for connecting to remote Databricks clusters"; homepage = "https://pypi.org/project/databricks-connect"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.databricks; maintainers = with maintainers; [ kfollesdal ]; }; diff --git a/pkgs/development/python-modules/gurobipy/linux.nix b/pkgs/development/python-modules/gurobipy/linux.nix index ebcdc0e73f25..e9a72cbb5cba 100644 --- a/pkgs/development/python-modules/gurobipy/linux.nix +++ b/pkgs/development/python-modules/gurobipy/linux.nix @@ -22,6 +22,7 @@ buildPythonPackage { meta = with lib; { description = "The Gurobi Python interface"; homepage = "https://www.gurobi.com"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = [ "x86_64-linux" ]; }; diff --git a/pkgs/development/python-modules/py4j/default.nix b/pkgs/development/python-modules/py4j/default.nix index cdf8a3c49c37..dac1ecb9ec1f 100644 --- a/pkgs/development/python-modules/py4j/default.nix +++ b/pkgs/development/python-modules/py4j/default.nix @@ -16,6 +16,10 @@ buildPythonPackage rec { meta = with lib; { description = "Py4J enables Python programs running in a Python interpreter to dynamically access Java objects in a Java Virtual Machine. Methods are called as if the Java objects resided in the Python interpreter and Java collections can be accessed through standard Python collection methods. Py4J also enables Java programs to call back Python objects."; homepage = "https://www.py4j.org/"; + sourceProvenance = with sourceTypes; [ + fromSource + binaryBytecode + ]; license = licenses.bsd3; maintainers = [ maintainers.shlevy ]; }; diff --git a/pkgs/development/python-modules/pyspark/default.nix b/pkgs/development/python-modules/pyspark/default.nix index 2208558e4bd1..dfce66ee52df 100644 --- a/pkgs/development/python-modules/pyspark/default.nix +++ b/pkgs/development/python-modules/pyspark/default.nix @@ -35,6 +35,10 @@ buildPythonPackage rec { meta = with lib; { description = "Python bindings for Apache Spark"; homepage = "https://github.com/apache/spark/tree/master/python"; + sourceProvenance = with sourceTypes; [ + fromSource + binaryBytecode + ]; license = licenses.asl20; maintainers = [ maintainers.shlevy ]; }; diff --git a/pkgs/development/python-modules/python-ldap-test/default.nix b/pkgs/development/python-modules/python-ldap-test/default.nix index 379aaa5ab643..ed7a31b0cfe7 100644 --- a/pkgs/development/python-modules/python-ldap-test/default.nix +++ b/pkgs/development/python-modules/python-ldap-test/default.nix @@ -17,6 +17,10 @@ buildPythonPackage rec { meta = with lib; { description = "Tool for testing code speaking with LDAP server"; homepage = "https://github.com/zoldar/python-ldap-test"; + sourceProvenance = with sourceTypes; [ + fromSource + binaryBytecode + ]; license = licenses.mit; maintainers = with maintainers; [ psyanticy ]; }; diff --git a/pkgs/development/python-modules/qiskit-nature/default.nix b/pkgs/development/python-modules/qiskit-nature/default.nix index 7b652c507223..ab794c9e9643 100644 --- a/pkgs/development/python-modules/qiskit-nature/default.nix +++ b/pkgs/development/python-modules/qiskit-nature/default.nix @@ -64,6 +64,10 @@ buildPythonPackage rec { homepage = "https://qiskit.org"; downloadPage = "https://github.com/QISKit/qiskit-nature/releases"; changelog = "https://qiskit.org/documentation/release_notes.html"; + sourceProvenance = with sourceTypes; [ + fromSource + binaryNativeCode # drivers/gaussiand/gauopen/*.so + ]; license = licenses.asl20; maintainers = with maintainers; [ drewrisinger ]; }; From 2d1147930bc4d72b752890f21c9b71ca70d3fe5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 20 Jun 2022 11:16:24 +0200 Subject: [PATCH 8/9] android tools: fix meta license --- pkgs/development/mobile/androidenv/tools/25.nix | 2 +- pkgs/development/mobile/androidenv/tools/26.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/mobile/androidenv/tools/25.nix b/pkgs/development/mobile/androidenv/tools/25.nix index 7489569d5071..5ce21a2fee3e 100644 --- a/pkgs/development/mobile/androidenv/tools/25.nix +++ b/pkgs/development/mobile/androidenv/tools/25.nix @@ -58,5 +58,5 @@ deployAndroidPackage { ${postInstall} ''; - meta.licenses = lib.licenses.unfree; + meta.license = lib.licenses.unfree; } diff --git a/pkgs/development/mobile/androidenv/tools/26.nix b/pkgs/development/mobile/androidenv/tools/26.nix index 7a8f4cd660f1..361e02661f37 100644 --- a/pkgs/development/mobile/androidenv/tools/26.nix +++ b/pkgs/development/mobile/androidenv/tools/26.nix @@ -40,5 +40,5 @@ deployAndroidPackage { ${postInstall} ''; - meta.licenses = lib.licenses.unfree; + meta.license = lib.licenses.unfree; } From 9d6e2bde556f0ed4b946acb8358aa113a37f0446 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 18 Jun 2022 04:20:00 +0000 Subject: [PATCH 9/9] dune_3: 3.2.0 -> 3.3.1 https://github.com/ocaml/dune/releases/tag/3.3.0 https://github.com/ocaml/dune/releases/tag/3.3.1 --- pkgs/development/tools/ocaml/dune/3.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/ocaml/dune/3.nix b/pkgs/development/tools/ocaml/dune/3.nix index 009c3cb6fe20..299a337d276c 100644 --- a/pkgs/development/tools/ocaml/dune/3.nix +++ b/pkgs/development/tools/ocaml/dune/3.nix @@ -6,11 +6,11 @@ else stdenv.mkDerivation rec { pname = "dune"; - version = "3.2.0"; + version = "3.3.1"; src = fetchurl { - url = "https://github.com/ocaml/dune/releases/download/${version}/chrome-trace-${version}.tbz"; - sha256 = "sha256-vR+85q557R6yb6ibsuLiOXivzrP1P1V4zxvasIoa1bw="; + url = "https://github.com/ocaml/dune/releases/download/${version}/dune-${version}.tbz"; + sha256 = "sha256-hAyASRv+Erq18rmdSeFj8+TE0vxLSj5vsWwk3M1VAuE="; }; nativeBuildInputs = [ ocaml findlib ];