From 8d04ae7014991319e97d4280f0e9d7a70c89f10b Mon Sep 17 00:00:00 2001
From: Alex Auvolat <alex@adnab.me>
Date: Thu, 13 Oct 2022 14:35:39 +0200
Subject: cargo2nix unstable (patched), rust 1.63.0, nixpkgs 22.05 (32-bit
 builds are broken)

---
 nix/common.nix | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

(limited to 'nix/common.nix')

diff --git a/nix/common.nix b/nix/common.nix
index aa59cdc0..031a75c0 100644
--- a/nix/common.nix
+++ b/nix/common.nix
@@ -4,19 +4,27 @@ rec {
    */
   pkgsSrc = fetchTarball {
     # As of 2021-10-04
-    url = "https://github.com/NixOS/nixpkgs/archive/b27d18a412b071f5d7991d1648cfe78ee7afe68a.tar.gz";
-    sha256 = "1xy9zpypqfxs5gcq5dcla4bfkhxmh5nzn9dyqkr03lqycm9wg5cr";
+    #url = "https://github.com/NixOS/nixpkgs/archive/b27d18a412b071f5d7991d1648cfe78ee7afe68a.tar.gz";
+    #sha256 = "1xy9zpypqfxs5gcq5dcla4bfkhxmh5nzn9dyqkr03lqycm9wg5cr";
+
+    # NixOS 22.05
+    url = "https://github.com/NixOS/nixpkgs/archive/refs/tags/22.05.zip";
+    sha256 = "0d643wp3l77hv2pmg2fi7vyxn4rwy0iyr8djcw1h5x72315ck9ik";
+
+    # As of 2022-10-13
+    #url = "https://github.com/NixOS/nixpkgs/archive/a3073c49bc0163fea6a121c276f526837672b555.zip";
+    #sha256 = "1bz632psfbpmicyzjb8b4265y50shylccvfm6ry6mgnv5hvz324s";
   };
   cargo2nixSrc = fetchGit {
-    # As of 2022-08-29, stacking two patches: superboum@dedup_propagate and Alexis211@fix_fetchcrategit
+    # As of 2022-10-14: (TODO)
     url = "https://github.com/Alexis211/cargo2nix";
-    ref = "fix_fetchcrategit";
-    rev = "4b31c0cc05b6394916d46e9289f51263d81973b9";
+    ref = "custom_unstable";
+    rev = "15543df35485bef9e2092391ecafa78eae5fa740";
   };
 
   /*
    * Shared objects
    */
   cargo2nix = import cargo2nixSrc;
-  cargo2nixOverlay = import "${cargo2nixSrc}/overlay";
+  cargo2nixOverlay = cargo2nix.overlays.default;
 }
-- 
cgit v1.2.3


From e89e047c5af33ac47dabbcfdc12305d544a13ade Mon Sep 17 00:00:00 2001
From: Alex Auvolat <alex@adnab.me>
Date: Fri, 14 Oct 2022 15:45:37 +0200
Subject: Fix i386 build with custom toolchain (armv6 unknown state)

---
 nix/common.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'nix/common.nix')

diff --git a/nix/common.nix b/nix/common.nix
index 031a75c0..2b9cc751 100644
--- a/nix/common.nix
+++ b/nix/common.nix
@@ -8,12 +8,12 @@ rec {
     #sha256 = "1xy9zpypqfxs5gcq5dcla4bfkhxmh5nzn9dyqkr03lqycm9wg5cr";
 
     # NixOS 22.05
-    url = "https://github.com/NixOS/nixpkgs/archive/refs/tags/22.05.zip";
-    sha256 = "0d643wp3l77hv2pmg2fi7vyxn4rwy0iyr8djcw1h5x72315ck9ik";
+    #url = "https://github.com/NixOS/nixpkgs/archive/refs/tags/22.05.zip";
+    #sha256 = "0d643wp3l77hv2pmg2fi7vyxn4rwy0iyr8djcw1h5x72315ck9ik";
 
     # As of 2022-10-13
-    #url = "https://github.com/NixOS/nixpkgs/archive/a3073c49bc0163fea6a121c276f526837672b555.zip";
-    #sha256 = "1bz632psfbpmicyzjb8b4265y50shylccvfm6ry6mgnv5hvz324s";
+    url = "https://github.com/NixOS/nixpkgs/archive/a3073c49bc0163fea6a121c276f526837672b555.zip";
+    sha256 = "1bz632psfbpmicyzjb8b4265y50shylccvfm6ry6mgnv5hvz324s";
   };
   cargo2nixSrc = fetchGit {
     # As of 2022-10-14: (TODO)
-- 
cgit v1.2.3


From 00cf076412b88ae0c6254fc16b9bbe661c4f01f2 Mon Sep 17 00:00:00 2001
From: Alex Auvolat <alex@adnab.me>
Date: Tue, 18 Oct 2022 12:15:45 +0200
Subject: Fix cargo2nix feature discovery

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

(limited to 'nix/common.nix')

diff --git a/nix/common.nix b/nix/common.nix
index 2b9cc751..576121e4 100644
--- a/nix/common.nix
+++ b/nix/common.nix
@@ -19,7 +19,7 @@ rec {
     # As of 2022-10-14: (TODO)
     url = "https://github.com/Alexis211/cargo2nix";
     ref = "custom_unstable";
-    rev = "15543df35485bef9e2092391ecafa78eae5fa740";
+    rev = "a7a61179b66054904ef6a195d8da736eaaa06c36";
   };
 
   /*
-- 
cgit v1.2.3


From 667ca9d3e3971d57d1c95defbff790ab5dc26221 Mon Sep 17 00:00:00 2001
From: Alex Auvolat <alex@adnab.me>
Date: Tue, 18 Oct 2022 12:48:31 +0200
Subject: Cleanup nix scripts

---
 nix/common.nix | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

(limited to 'nix/common.nix')

diff --git a/nix/common.nix b/nix/common.nix
index 576121e4..90e3afaf 100644
--- a/nix/common.nix
+++ b/nix/common.nix
@@ -3,20 +3,12 @@ rec {
    * Fixed dependencies
    */
   pkgsSrc = fetchTarball {
-    # As of 2021-10-04
-    #url = "https://github.com/NixOS/nixpkgs/archive/b27d18a412b071f5d7991d1648cfe78ee7afe68a.tar.gz";
-    #sha256 = "1xy9zpypqfxs5gcq5dcla4bfkhxmh5nzn9dyqkr03lqycm9wg5cr";
-
-    # NixOS 22.05
-    #url = "https://github.com/NixOS/nixpkgs/archive/refs/tags/22.05.zip";
-    #sha256 = "0d643wp3l77hv2pmg2fi7vyxn4rwy0iyr8djcw1h5x72315ck9ik";
-
     # As of 2022-10-13
     url = "https://github.com/NixOS/nixpkgs/archive/a3073c49bc0163fea6a121c276f526837672b555.zip";
     sha256 = "1bz632psfbpmicyzjb8b4265y50shylccvfm6ry6mgnv5hvz324s";
   };
   cargo2nixSrc = fetchGit {
-    # As of 2022-10-14: (TODO)
+    # As of 2022-10-18: two small patches over unstable branch, one for clippy and one to fix feature detection
     url = "https://github.com/Alexis211/cargo2nix";
     ref = "custom_unstable";
     rev = "a7a61179b66054904ef6a195d8da736eaaa06c36";
-- 
cgit v1.2.3