From f5da7c0260a3bd2f3871624f321f90a6a0b5fcf8 Mon Sep 17 00:00:00 2001 From: yemou Date: Sun, 11 May 2025 15:19:19 -0400 Subject: [PATCH] flake.nix: switch nixpkgs from nixos-24.11 to nixos-unstable NixOS 24.11 doesn't provide go-1.24 which is now required for this project. Additionally fix the `CGO_ENABLED` warnings that comes with the newer nixpkgs version. --- flake.lock | 10 +++++----- flake.nix | 15 +++++++-------- 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/flake.lock b/flake.lock index c7155603..219e15e6 100644 --- a/flake.lock +++ b/flake.lock @@ -64,7 +64,7 @@ "inter-fonts-src": { "flake": false, "locked": { - "lastModified": 1731680160, + "lastModified": 1731705360, "narHash": "sha256-5vdKKvHAeZi6igrfpbOdhZlDX2/5+UvzlnCQV6DdqoQ=", "type": "tarball", "url": "https://github.com/rsms/inter/releases/download/v4.1/Inter-4.1.zip" @@ -89,16 +89,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1746055187, - "narHash": "sha256-3dqArYSMP9hM7Qpy5YWhnSjiqniSaT2uc5h2Po7tmg0=", + "lastModified": 1746663147, + "narHash": "sha256-Ua0drDHawlzNqJnclTJGf87dBmaO/tn7iZ+TCkTRpRc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "3e362ce63e16b9572d8c2297c04f7c19ab6725a5", + "rev": "dda3dcd3fe03e991015e9a74b22d35950f264a54", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-24.11", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index 4beefe6b..76ed17ce 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ description = "atproto github"; inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; indigo = { url = "github:oppiliappan/indigo"; flake = false; @@ -49,7 +49,7 @@ inherit (gitignore.lib) gitignoreSource; in { overlays.default = final: prev: let - goModHash = "sha256-CmBuvv3duQQoc8iTW4244w1rYLGeqMQS+qQ3wwReZZg="; + goModHash = "sha256-zcfTNo7QsiihzLa4qHEX8uGGtbcmBn8TlSm0YHBRNw8="; buildCmdPackage = name: final.buildGoModule { pname = name; @@ -57,7 +57,7 @@ src = gitignoreSource ./.; subPackages = ["cmd/${name}"]; vendorHash = goModHash; - CGO_ENABLED = 0; + env.CGO_ENABLED = 0; }; in { indigo-lexgen = final.buildGoModule { @@ -88,7 +88,7 @@ doCheck = false; subPackages = ["cmd/appview"]; vendorHash = goModHash; - CGO_ENABLED = 1; + env.CGO_ENABLED = 1; stdenv = pkgsStatic.stdenv; }; @@ -111,7 +111,7 @@ runHook postInstall ''; - CGO_ENABLED = 1; + env.CGO_ENABLED = 1; }; knotserver-unwrapped = final.pkgsStatic.buildGoModule { pname = "knotserver"; @@ -119,7 +119,7 @@ src = gitignoreSource ./.; subPackages = ["cmd/knotserver"]; vendorHash = goModHash; - CGO_ENABLED = 1; + env.CGO_ENABLED = 1; }; repoguard = buildCmdPackage "repoguard"; keyfetch = buildCmdPackage "keyfetch"; @@ -163,7 +163,7 @@ cp -f ${inter-fonts-src}/web/InterDisplay*.woff2 appview/pages/static/fonts/ cp -f ${ibm-plex-mono-src}/fonts/complete/woff2/IBMPlexMono-Regular.woff2 appview/pages/static/fonts/ ''; - CGO_ENABLED=1; + env.CGO_ENABLED = 1; }; }); apps = forAllSystems (system: let @@ -447,4 +447,3 @@ }; }; } - -- 2.51.2