chore: update nix flake to remove deprecation warning (#113)

* chore: update nix flake to remove deprecation warning * feat: update-nix script changes --------- Co-authored-by: joerdav <[email protected]>
joerdav · Feb 27, 2024 · 67d4117 · 67d4117
1 parent aaef84a
commit 67d4117
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 20 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,4 @@
+coverage.out
 dist/
 doc/public/
-
-coverage.out
+result
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -1,20 +1,20 @@
 {
   inputs = {
+    nixpkgs.url = "github:NixOS/nixpkgs/23.11";
     flake-utils.url = "github:numtide/flake-utils";
-    flake-utils.inputs.nixpkgs.follows = "nixpkgs";
   };
 
   outputs = { self, nixpkgs, flake-utils }:
     flake-utils.lib.eachDefaultSystem (system:
-      let 
+      let
         pkgs = import nixpkgs {
           system = system;
         };
-        xc = pkgs.callPackage ./xc.nix {};
+        xc = pkgs.callPackage ./xc.nix { };
       in
       {
         defaultPackage = xc;
-        packages = { 
+        packages = {
           xc = xc;
         };
         devShells = {

diff --git a/update-nix.sh b/update-nix.sh
@@ -5,9 +5,9 @@ sed -e "s/__VERSION__/$(git describe --tags --abbrev=0)/g" xc.nix.tmpl > xc.nix
 # We first try to build and it fails with hash mismatch, and we use it to populate sha256.
 nix-build -E 'with import <nixpkgs> { }; callPackage ./xc.nix { }'
 SRC_SHA256="$(nix-build -E 'with import <nixpkgs> { }; callPackage ./xc.nix { }' 2>&1 | grep -oE 'got:\s+sha256-\S+' | cut -d "-" -f 2)"
-sed -i -e "s|sha256 = lib.fakeSha256;|sha256 = \"$SRC_SHA256\";|g" xc.nix
+sed -i -e "s|sha256 = \"\";|sha256 = \"$SRC_SHA256\";|g" xc.nix
 
 # We try again to build and it fails with hash mismatch, and we use it to populate vendorSha256.
 VENDOR_SHA256="$(nix-build -E 'with import <nixpkgs> { }; callPackage ./xc.nix { }' 2>&1 | grep -oE 'got:\s+sha256-\S+' | cut -d "-" -f 2)"
-sed -i -e "s|vendorSha256 = lib.fakeSha256;|vendorSha256 = \"$VENDOR_SHA256\";|g" xc.nix
+sed -i -e "s|vendorHash = \"\";|vendorHash = \"sha256-$VENDOR_SHA256\";|g" xc.nix
 
diff --git a/xc.nix b/xc.nix
@@ -1,14 +1,14 @@
-{ config, lib, pkgs, fetchFromGitHub, ... }:
+{ config, pkgs, fetchFromGitHub, ... }:
 
 pkgs.buildGoModule rec {
   pname = "xc";
   version = "v0.8.0";
-  subPackages = ["cmd/xc"];
+  subPackages = [ "cmd/xc" ];
   src = pkgs.fetchFromGitHub {
     owner = "joerdav";
     repo = "xc";
     rev = version;
     sha256 = "vTyCS85xbJnAgbasWD6LFxij9EezzlJ1pyvCJptqmOU=";
   };
-  vendorSha256 = "EbIuktQ2rExa2DawyCamTrKRC1yXXMleRB8/pcKFY5c=";
+  vendorHash = "sha256-EbIuktQ2rExa2DawyCamTrKRC1yXXMleRB8/pcKFY5c=";
 }
diff --git a/xc.nix.tmpl b/xc.nix.tmpl
@@ -1,14 +1,14 @@
-{ config, lib, pkgs, fetchFromGitHub, ... }:
+{ config, pkgs, fetchFromGitHub, ... }:
 
 pkgs.buildGoModule rec {
   pname = "xc";
   version = "__VERSION__";
-  subPackages = ["cmd/xc"];
+  subPackages = [ "cmd/xc" ];
   src = pkgs.fetchFromGitHub {
     owner = "joerdav";
     repo = "xc";
     rev = version;
-    sha256 = lib.fakeSha256;
+    sha256 = "";
   };
-  vendorSha256 = lib.fakeSha256;
+  vendorHash = "";
 }