diff options
| author | Martin Weinelt <hexa@darmstadt.ccc.de> | 2023-01-11 03:51:33 +0100 |
|---|---|---|
| committer | Martin Weinelt <hexa@darmstadt.ccc.de> | 2023-01-11 03:51:33 +0100 |
| commit | c1e6c6af692c2cf07b4982c0f573acc9f16b78fc (patch) | |
| tree | c436a224f5f71c2a2d91926240b76ceab78d77b9 /pkgs/misc | |
| parent | 33aa224777a5077ff1dfa4c8f4653d8aab268d76 (diff) | |
| parent | b0644b461f97d4f7240b089074084c18f521f497 (diff) | |
Merge remote-tracking branch 'origin/master' into staging-next
Diffstat (limited to 'pkgs/misc')
| -rw-r--r-- | pkgs/misc/dxvk/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/misc/fastly/default.nix | 6 |
2 files changed, 4 insertions, 5 deletions
diff --git a/pkgs/misc/dxvk/default.nix b/pkgs/misc/dxvk/default.nix index 7d5af28d81072..b93c46f09100b 100644 --- a/pkgs/misc/dxvk/default.nix +++ b/pkgs/misc/dxvk/default.nix @@ -1,6 +1,5 @@ { lib , pkgs -, hostPlatform , stdenvNoCC , fetchFromGitHub , pkgsCross @@ -8,7 +7,7 @@ stdenvNoCC.mkDerivation (finalAttrs: let - inherit (hostPlatform.uname) system; + inherit (stdenvNoCC.hostPlatform.uname) system; # DXVK needs to be a separate derivation because it’s actually a set of DLLs for Windows that # needs to be built with a cross-compiler. dxvk32 = pkgsCross.mingw32.callPackage ./dxvk.nix { diff --git a/pkgs/misc/fastly/default.nix b/pkgs/misc/fastly/default.nix index 081a063cdbaa7..0a888acd9bb8e 100644 --- a/pkgs/misc/fastly/default.nix +++ b/pkgs/misc/fastly/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "fastly"; - version = "4.5.0"; + version = "4.6.1"; src = fetchFromGitHub { owner = "fastly"; repo = "cli"; rev = "refs/tags/v${version}"; - hash = "sha256-l/EnlyrSofuk4/69R2VUdP6MyKOVAOI7cIOW1TLeBww="; + hash = "sha256-r8k8fB40WQoLWtw+6RCsAOSKDJhN967uNAwbT137rQs="; # The git commit is part of the `fastly version` original output; # leave that output the same in nixpkgs. Use the `.git` directory # to retrieve the commit SHA, and remove the directory afterwards, @@ -31,7 +31,7 @@ buildGoModule rec { "cmd/fastly" ]; - vendorHash = "sha256-cXO5zhc9RZlweoU6pva2sBvcjNWBeFSUz+k9BbQpUX0="; + vendorHash = "sha256-lfypuPCLBBekFWwocdFLUw5sONCBM8clnwHVAebAkZ8="; nativeBuildInputs = [ installShellFiles |