From 455d61e30b9a5f0e52970cccdb24de43ae090348 Mon Sep 17 00:00:00 2001 From: HaimKortovich Date: Wed, 1 Apr 2026 10:33:53 -0500 Subject: [PATCH] update flake correctly --- build/flake.lock | 20 ++++---------------- build/flake.nix | 12 +++++------- 2 files changed, 9 insertions(+), 23 deletions(-) diff --git a/build/flake.lock b/build/flake.lock index 2e9c99c..f123c7e 100644 --- a/build/flake.lock +++ b/build/flake.lock @@ -19,18 +19,6 @@ } }, "nixpkgs": { - "locked": { - "lastModified": 0, - "narHash": "sha256-7Fu7oazPoYCbDzb9k8D/DdbKrC3aU1zlnc39Y8jy/s8=", - "path": "/nix/store/m4wcdchjxw2fdyzjp8i6irpc613pchkr-source", - "type": "path" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, - "nixpkgs-unstable": { "locked": { "lastModified": 1774709303, "narHash": "sha256-D3Q07BbIA2KnTcSXIqqu9P586uWxN74zNoCH3h2ESHg=", @@ -40,16 +28,16 @@ "type": "github" }, "original": { - "id": "nixpkgs", + "owner": "NixOS", "ref": "nixos-unstable", - "type": "indirect" + "repo": "nixpkgs", + "type": "github" } }, "root": { "inputs": { "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs", - "nixpkgs-unstable": "nixpkgs-unstable" + "nixpkgs": "nixpkgs" } }, "systems": { diff --git a/build/flake.nix b/build/flake.nix index dbbeffd..0850eac 100644 --- a/build/flake.nix +++ b/build/flake.nix @@ -3,15 +3,14 @@ inputs = { flake-utils.url = "github:numtide/flake-utils"; - nixpkgs-unstable.url = "nixpkgs/nixos-unstable"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; }; - outputs = { self, nixpkgs, nixpkgs-unstable, flake-utils }: + outputs = { self, nixpkgs, flake-utils }: flake-utils.lib.eachDefaultSystem (system: let - unstable = nixpkgs-unstable.legacyPackages.${system}; pkgs = nixpkgs.legacyPackages.${system}; - package = unstable.buildGoModule { + package = pkgs.buildGoModule { pname = "zitadel-resources-operator"; version = "0.0.0"; src = ../src; @@ -45,8 +44,7 @@ in with pkgs; { packages.default = package; packages.dockerImage = dockerPackage; - devShells.default = mkShell { - buildInputs = [ nixfmt unstable.gopls operator-sdk unstable.go ]; - }; + devShells.default = + mkShell { buildInputs = [ nixfmt gopls operator-sdk go ]; }; }); }