From 0099f8e8de0b6a735015942d0215ebfed8c50a5a Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Mon, 15 Jan 2024 10:27:16 +0100
Subject: [PATCH 1/2] Add best-effort flake.nix

The purpose for this flake is to make `nix run nix/2.3-maintenance` work,
so that it's easier to answer questions about this old series of releases.
---
 flake.lock | 27 ++++++++++++++++++++++++++
 flake.nix  | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 83 insertions(+)
 create mode 100644 flake.lock
 create mode 100644 flake.nix

diff --git a/flake.lock b/flake.lock
new file mode 100644
index 00000000000..588ac8d77fd
--- /dev/null
+++ b/flake.lock
@@ -0,0 +1,27 @@
+{
+  "nodes": {
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1705133751,
+        "narHash": "sha256-rCIsyE80jgiOU78gCWN3A0wE0tR2GI5nH6MlS+HaaSQ=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "9b19f5e77dd906cb52dade0b7bd280339d2a1f3d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "root": {
+      "inputs": {
+        "nixpkgs": "nixpkgs"
+      }
+    }
+  },
+  "root": "root",
+  "version": 7
+}
diff --git a/flake.nix b/flake.nix
new file mode 100644
index 00000000000..771f6650152
--- /dev/null
+++ b/flake.nix
@@ -0,0 +1,56 @@
+{
+  inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
+  # A very basic flake to conveniently `nix run nix/2.3` for testing.
+  # Note that this release has no built-in support for flakes,
+  # and this flake declaration is provided on a best-effort basis.
+  outputs = { self, nixpkgs, ... }:
+    let
+      inherit (nixpkgs) lib;
+      inherit (lib) flip genAttrs mapAttrs substring;
+      rev = self.sourceInfo.rev or self.sourceInfo.dirtyRev or "";
+      revCount = self.sourceInfo.revCount or 0;
+      shortRev = self.sourceInfo.shortRev or (substring 0 7 rev);
+      release = import ./release.nix {
+        nix = {
+          outPath = ./.;
+          inherit rev revCount shortRev;
+        };
+        nixpkgs = nixpkgs.outPath;
+        officialRelease = false;
+      };
+    in
+  {
+    # inherit release;
+    packages =
+      mapAttrs
+        (system: nix: {
+          default = nix;
+          nix = nix;
+        })
+        release.build;
+    apps =
+      mapAttrs
+        (system: packages:
+          let
+            appFor = mainProgram: {
+              type = "app";
+              program = lib.getExe' packages.nix mainProgram;
+            };
+          in flip genAttrs appFor [
+            "nix"
+            "nix-build"
+            "nix-channel"
+            "nix-collect-garbage"
+            "nix-copy-closure"
+            "nix-daemon"
+            "nix-env"
+            "nix-hash"
+            "nix-instantiate"
+            "nix-prefetch-url"
+            "nix-shell"
+            "nix-store"
+          ])
+        self.packages;
+  };
+}
+

From 0776aa11c9e5864e8666dc9dfa670b55e9d6764f Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Mon, 15 Jan 2024 11:40:53 +0100
Subject: [PATCH 2/2] tests/check.sh: Fix a race

Based on 02dd6bb610e55a009cd7a4c83639698d3a7acaa2
---
 tests/add.sh    | 2 +-
 tests/check.nix | 2 +-
 tests/check.sh  | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/add.sh b/tests/add.sh
index e26e05843d7..5c3eed7931a 100644
--- a/tests/add.sh
+++ b/tests/add.sh
@@ -9,7 +9,7 @@ echo $path2
 if test "$path1" != "$path2"; then
     echo "nix-store --add and --add-fixed mismatch"
     exit 1
-fi    
+fi
 
 path3=$(nix-store --add-fixed sha256 ./dummy)
 echo $path3
diff --git a/tests/check.nix b/tests/check.nix
index 56c82e565a8..32f0f9733a6 100644
--- a/tests/check.nix
+++ b/tests/check.nix
@@ -11,7 +11,7 @@ with import ./config.nix;
   };
 
   hashmismatch = import <nix/fetchurl.nix> {
-    url = "file://" + toString ./dummy;
+    url = "file://" + builtins.getEnv "TMPDIR" + "/dummy";
     sha256 = "0mdqa9w1p6cmli6976v4wi0sw9r4p5prkj7lzfd1877wk11c9c73";
   };
 
diff --git a/tests/check.sh b/tests/check.sh
index bc23a6634ca..45d29fd99a7 100644
--- a/tests/check.sh
+++ b/tests/check.sh
@@ -34,9 +34,9 @@ nix-build check.nix -A fetchurl --no-out-link --repair --hashed-mirrors ''
 nix-build check.nix -A hashmismatch --no-out-link --hashed-mirrors '' || status=$?
 [ "$status" = "102" ]
 
-echo -n > ./dummy
+echo -n > $TMPDIR/dummy
 nix-build check.nix -A hashmismatch --no-out-link --hashed-mirrors ''
-echo 'Hello World' > ./dummy
+echo 'Hello World' > $TMPDIR/dummy
 
 nix-build check.nix -A hashmismatch --no-out-link --check --hashed-mirrors '' || status=$?
 [ "$status" = "102" ]