From 344a873c4b2776593f52844054a85cee9a193768 Mon Sep 17 00:00:00 2001
From: sterni <sternenseemann@systemli.org>
Date: Thu, 14 Aug 2025 00:13:47 +0000
Subject: [PATCH 1/2] shell.nix, release.nix: just use <nixpkgs>

These files are irrelevant for CI as far as TVL is concerned, but
may be used during development. In this case just use what the
developer does as a default.
---
 release.nix | 2 +-
 shell.nix   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/release.nix b/release.nix
index 2e71f3796000..8a2c7b8dcbfd 100644
--- a/release.nix
+++ b/release.nix
@@ -1,5 +1,5 @@
 { nix ? builtins.fetchGit ./.
-, nixpkgs ? builtins.fetchTarball https://github.com/NixOS/nixpkgs/archive/nixos-21.05-small.tar.gz
+, nixpkgs ? <nixpkgs>
 , officialRelease ? false
 , systems ? [ "x86_64-linux" "i686-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ]
 }:
diff --git a/shell.nix b/shell.nix
index e8026f8e40b1..c23f99ce9c44 100644
--- a/shell.nix
+++ b/shell.nix
@@ -1,6 +1,6 @@
 { useClang ? false }:
 
-with import (builtins.fetchTarball https://github.com/NixOS/nixpkgs-channels/archive/nixos-19.03.tar.gz) {};
+with (import <nixpkgs> {});
 
 with import ./release-common.nix { inherit pkgs; };
 

From 48ff57dcf673c4d45956b763c898e0464526e1b1 Mon Sep 17 00:00:00 2001
From: sterni <sternenseemann@systemli.org>
Date: Thu, 14 Aug 2025 11:59:12 +0000
Subject: [PATCH 2/2] release-common.nix: disable AWS

---
 release-common.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/release-common.nix b/release-common.nix
index 209ae540415d..0be6341a27cf 100644
--- a/release-common.nix
+++ b/release-common.nix
@@ -59,7 +59,7 @@ rec {
     ]
     ++ lib.optionals stdenv.isLinux [libseccomp (pkgs.util-linuxMinimal or pkgs.utillinuxMinimal)]
     ++ lib.optional (stdenv.isLinux || stdenv.isDarwin) libsodium
-    ++ lib.optional (stdenv.isLinux || stdenv.isDarwin)
+    ++ lib.optional (false && (stdenv.isLinux || stdenv.isDarwin))
       ((aws-sdk-cpp.override {
         apis = ["s3" "transfer"];
         customMemoryManagement = false;