From 13d725f6cd6a2ab6f2d76a1099f817f7c2c5fba8 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Sun, 19 Sep 2021 07:33:46 +0000 Subject: [PATCH 1/8] trezor-suite: 21.7.1 -> 21.9.2 https://github.com/trezor/trezor-suite/releases/tag/v21.8.1 https://github.com/trezor/trezor-suite/releases/tag/v21.9.1 https://github.com/trezor/trezor-suite/releases/tag/v21.9.2 --- pkgs/applications/blockchains/trezor-suite/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/blockchains/trezor-suite/default.nix b/pkgs/applications/blockchains/trezor-suite/default.nix index 8d2da4c36650..a0adc22af7b7 100644 --- a/pkgs/applications/blockchains/trezor-suite/default.nix +++ b/pkgs/applications/blockchains/trezor-suite/default.nix @@ -8,7 +8,7 @@ let pname = "trezor-suite"; - version = "21.7.1"; + version = "21.9.2"; name = "${pname}-${version}"; suffix = { @@ -18,10 +18,9 @@ let src = fetchurl { url = "https://github.com/trezor/${pname}/releases/download/v${version}/Trezor-Suite-${version}-${suffix}.AppImage"; - # sha512 hashes are obtained from latest-linux-arm64.yml and latest-linux.yml - sha512 = { - aarch64-linux = "sha512-GEu1Zx3IQws8wsVsZUaIKvC0kTe8l/BBPSdu5q44tDpszmPugz8G/8FDAO/Ra50dzyiHhRheybZPuf2BBGGb7A=="; - x86_64-linux = "sha512-ghPbQa/MstzfUOWve1KNwB1t9dxK0+eYunBSoShWKpb85hgK69+ncTmhY8HejT28OkjFnGk6h4PWbrnQetj8MA=="; + sha512 = { # curl -Lfs https://github.com/trezor/trezor-suite/releases/latest/download/latest-linux{-arm64,}.yml | rg ^sha512 | sed 's/: /-/' + aarch64-linux = "sha512-mgip818sGkrKwF4v2mj/JeTNxBoj7DgdNPoxZ8sp8OvojHB2sa0hm4YXfrzAdPf8CP6d5ChUmwccQyYilGUiOQ=="; + x86_64-linux = "sha512-f02m8Q6ITYhIXH1FS2BA/QYYsdtxklDDNYBXBarj8b1kA+yhDFZ3VL9vy+nZNdPQHQ2yMQreDzpcToXBQ67XyQ=="; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; From 22aa741604b4f4c01b6c0cceb66e3b81293a5d33 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 22 Sep 2021 04:44:55 +0000 Subject: [PATCH 2/8] dnsproxy: 0.39.5 -> 0.39.7 --- pkgs/tools/networking/dnsproxy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/dnsproxy/default.nix b/pkgs/tools/networking/dnsproxy/default.nix index 586f16ab3382..b7b75037ebb0 100644 --- a/pkgs/tools/networking/dnsproxy/default.nix +++ b/pkgs/tools/networking/dnsproxy/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "dnsproxy"; - version = "0.39.5"; + version = "0.39.7"; src = fetchFromGitHub { owner = "AdguardTeam"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ID40+moRAdceiEOwB4tmBE6U1om/aWBXIlxzfLtm5E4="; + sha256 = "sha256-jU5O+t8muaIM7JhuNhqfWh1pWezaFvdg+oRPYAQpIkk="; }; vendorSha256 = null; From 80b3ac2f65d085812e4cf7105daf108ade2bf4b9 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 22 Sep 2021 05:26:12 +0000 Subject: [PATCH 3/8] python38Packages.google-resumable-media: 2.0.2 -> 2.0.3 --- .../python-modules/google-resumable-media/default.nix | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/google-resumable-media/default.nix b/pkgs/development/python-modules/google-resumable-media/default.nix index 854b6304e7a8..ad5cc9922c06 100644 --- a/pkgs/development/python-modules/google-resumable-media/default.nix +++ b/pkgs/development/python-modules/google-resumable-media/default.nix @@ -12,18 +12,13 @@ buildPythonPackage rec { pname = "google-resumable-media"; - version = "2.0.2"; + version = "2.0.3"; src = fetchPypi { inherit pname version; - sha256 = "36d682161fdcbfa29681212c210fabecbf6849a505a0cbc54b7f70a10a5278a2"; + sha256 = "b4b4709d04a6a03cbec746c2b5cb18f1f9878bf1ef3cd61908842a3d94c20471"; }; - postPatch = '' - substituteInPlace setup.py \ - --replace "google-crc32c >= 1.0, <= 1.1.2" "google-crc32c~=1.0" - ''; - propagatedBuildInputs = [ google-auth google-crc32c requests ]; checkInputs = [ google-cloud-testutils mock pytestCheckHook pytest-asyncio ]; From e39bc2d9af19bf99628f59b8c7d370c7c3973d23 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Wed, 22 Sep 2021 10:40:22 +0000 Subject: [PATCH 4/8] electron_12: 12.1.1 -> 12.1.2 https://github.com/electron/electron/releases/tag/v12.1.2 --- pkgs/development/tools/electron/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix index 1f98857c592b..737d6bc864c3 100644 --- a/pkgs/development/tools/electron/default.nix +++ b/pkgs/development/tools/electron/default.nix @@ -105,14 +105,14 @@ rec { headers = "1zkdgpjrh1dc9j8qyrrrh49v24960yhvwi2c530qbpf2azgqj71b"; }; - electron_12 = mkElectron "12.1.1" { - x86_64-linux = "21bcd5d415c147307082890498240f9f096e60053ebd90e81765375ecc00add3"; - x86_64-darwin = "1ff96e9770dec3b61b7fcf8b2d5a334ed317cf271d91233604549df1e42cdc9b"; - i686-linux = "b1e64e953ec9168dfa6da65888637fa866a57c08e2c48f1f443474f7f96b2e2e"; - armv7l-linux = "f6a9c539df8c3699c45faeb5ffc5145b095af93604943e1e4c939f38fa1d6672"; - aarch64-linux = "35a51b39c53c4e79aa0af90401cbb94f0d9ea0e606d1f6226473015021c0ac48"; - aarch64-darwin = "5001583bd17cb3acb00f30c2a6e98e5f0b755d744c922d7eed9f166ac67964e0"; - headers = "1x7ilyiy3kk2b1crv0h8v6dcfv6yhf371pi14x7333bzhw558s2a"; + electron_12 = mkElectron "12.1.2" { + x86_64-linux = "e0ed1e223e956213f4f835573dd9c84aac3588c1d12ca67f81399534611a873d"; + x86_64-darwin = "6a0efef7cee47d5f7cff7edfe2f3eaa134368f9ac8741742dfcb49f59da51e59"; + i686-linux = "90c60083261bf86410f30d2588204276943cc7cbfe7751192723fdde6a67da72"; + armv7l-linux = "cdff93b3ee2ab175c45d1afa33c7dde38030abe54fe285804a0eb3f983f67bdd"; + aarch64-linux = "fe1351253cc8e9f6828de90957b40fab1cad31d38e88ef085c98a1b72d9cd14b"; + aarch64-darwin = "4b2a2b9986938f332894946b22fc6cac357f69aaa72afe61b6ca6084d48dce67"; + headers = "019rf1r9mk0hzhbl5fq48zr0l4y943biv2xwnpdhr5bm1wqpvz6l"; }; electron_13 = mkElectron "13.4.0" { From 4ecb3e87958eb65ce8c5dc07ed3c5c1d79af98f0 Mon Sep 17 00:00:00 2001 From: Robin Stumm Date: Tue, 21 Sep 2021 13:48:25 +0200 Subject: [PATCH 5/8] doc: rust: document cargoLock.lockFileContents --- doc/languages-frameworks/rust.section.md | 30 ++++++++++++++++++++---- 1 file changed, 26 insertions(+), 4 deletions(-) diff --git a/doc/languages-frameworks/rust.section.md b/doc/languages-frameworks/rust.section.md index 71f197af53da..09de57ff2bed 100644 --- a/doc/languages-frameworks/rust.section.md +++ b/doc/languages-frameworks/rust.section.md @@ -122,16 +122,38 @@ rustPlatform.buildRustPackage rec { cargoLock = { lockFile = ./Cargo.lock; - } + }; # ... } ``` This will retrieve the dependencies using fixed-output derivations from -the specified lockfile. Note that setting `cargoLock.lockFile` doesn't -add a `Cargo.lock` to your `src`, and a `Cargo.lock` is still required -to build a rust package. A simple fix is to use: +the specified lockfile. + +Alternatively, `cargoLock.lockFileContents` can be set to a string of +the contents of a `Cargo.lock` file, for example if you need to +preprocess or generate the file as part of your build: + + +```nix +rustPlatform.buildRustPackage rec { + pname = "myproject"; + version = "1.0.0"; + + cargoLock = let + fixupLockFile = path: /* ... */; + in { + lockFileContents = fixupLockFile ./Cargo.lock; + }; + + # ... +} +``` + +Note that setting `cargoLock.lockFile` or `cargoLock.lockFileContents` +doesn't add a `Cargo.lock` to your `src`, and a `Cargo.lock` is still +required to build a rust package. A simple fix is to use: ```nix postPatch = '' From 4ab63a8ca8883b05d0895df59e26e5e62c4a9ff8 Mon Sep 17 00:00:00 2001 From: Robin Stumm Date: Tue, 21 Sep 2021 14:58:40 +0200 Subject: [PATCH 6/8] doc: rust: improve clarity of example snippet Make it more clear that the return type is a string. Co-authored-by: figsoda --- doc/languages-frameworks/rust.section.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/languages-frameworks/rust.section.md b/doc/languages-frameworks/rust.section.md index 09de57ff2bed..70d31f4eab42 100644 --- a/doc/languages-frameworks/rust.section.md +++ b/doc/languages-frameworks/rust.section.md @@ -142,7 +142,7 @@ rustPlatform.buildRustPackage rec { version = "1.0.0"; cargoLock = let - fixupLockFile = path: /* ... */; + fixupLockFile = path: f (builtins.readFile path); in { lockFileContents = fixupLockFile ./Cargo.lock; }; From 4771684208a6beed8293baabfdaac103552614e7 Mon Sep 17 00:00:00 2001 From: Robin Stumm Date: Wed, 22 Sep 2021 12:20:24 +0200 Subject: [PATCH 7/8] doc: rust: simplify snippet Do not use recursive attribute sets where not needed, it could confuse the reader. --- doc/languages-frameworks/rust.section.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/languages-frameworks/rust.section.md b/doc/languages-frameworks/rust.section.md index 70d31f4eab42..cb14a7726e42 100644 --- a/doc/languages-frameworks/rust.section.md +++ b/doc/languages-frameworks/rust.section.md @@ -116,7 +116,7 @@ is updated after every change to `Cargo.lock`. Therefore, a `Cargo.lock` file using the `cargoLock` argument. For example: ```nix -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage { pname = "myproject"; version = "1.0.0"; @@ -137,7 +137,7 @@ preprocess or generate the file as part of your build: ```nix -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage { pname = "myproject"; version = "1.0.0"; From 5b0a3115c8ee42494ae0580b50702e090a017446 Mon Sep 17 00:00:00 2001 From: Robin Stumm Date: Wed, 22 Sep 2021 12:51:05 +0200 Subject: [PATCH 8/8] doc: rust: rephrase paragraph about `cargoLock.lockFileContents` mentioning that `Cargo.lock` cannot be patched in the `patchPhase` --- doc/languages-frameworks/rust.section.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/languages-frameworks/rust.section.md b/doc/languages-frameworks/rust.section.md index cb14a7726e42..b2f045b11b32 100644 --- a/doc/languages-frameworks/rust.section.md +++ b/doc/languages-frameworks/rust.section.md @@ -131,10 +131,10 @@ rustPlatform.buildRustPackage { This will retrieve the dependencies using fixed-output derivations from the specified lockfile. -Alternatively, `cargoLock.lockFileContents` can be set to a string of -the contents of a `Cargo.lock` file, for example if you need to -preprocess or generate the file as part of your build: - +One caveat is that `Cargo.lock` cannot be patched in the `patchPhase` +because it runs after the dependencies have already been fetched. If +you need to patch or generate the lockfile you can alternatively set +`cargoLock.lockFileContents` to a string of its contents: ```nix rustPlatform.buildRustPackage {