From 096ab865ee7a3db51618f489b89ee6a542e66864 Mon Sep 17 00:00:00 2001 From: Victor Date: Tue, 20 Jun 2023 11:20:10 +0200 Subject: [PATCH] updates --- flake.lock | 100 ++++++++++++++-------------- flake.nix | 4 +- nixos/pkgs/default.nix | 2 - nixos/pkgs/weave-gitops/default.nix | 26 -------- 4 files changed, 52 insertions(+), 80 deletions(-) delete mode 100644 nixos/pkgs/weave-gitops/default.nix diff --git a/flake.lock b/flake.lock index 7f77b17..680ed4e 100644 --- a/flake.lock +++ b/flake.lock @@ -131,11 +131,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1686077956, - "narHash": "sha256-zkkjqU5NZipqakDfPSve85ljyZJ8aQtfk9mPkJ+w3IE=", + "lastModified": 1687186099, + "narHash": "sha256-J5/LWwTqpSphwgvzZl4AJ6TlrJpdEG8PRLjlGr8D24U=", "owner": "nix-community", "repo": "comma", - "rev": "59a88b9b86bc35ee6c5ec02fab6819ad68bdaa3f", + "rev": "3c039932f6032454db850296b1ea73537a06ff3f", "type": "github" }, "original": { @@ -248,11 +248,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1674282107, - "narHash": "sha256-0wBK+1IMJdAkckR715ssMPFUhCAqRpRcppGwraiWREU=", + "lastModified": 1686896497, + "narHash": "sha256-IphIS1KpiFXp/j0v7mEMhtw51uvU5F0mqF2j4//7VAA=", "owner": "nix-community", "repo": "fenix", - "rev": "18fc1446c44e05165437c5900b95670166a09270", + "rev": "9c69d11badcd78710d7d8665bc3d2e1adc450ffe", "type": "github" }, "original": { @@ -665,11 +665,11 @@ ] }, "locked": { - "lastModified": 1686852570, - "narHash": "sha256-Hzufya/HxjSliCwpuLJCGY0WCQajzcpsnhFGa+TCkCM=", + "lastModified": 1687204608, + "narHash": "sha256-rZ0e0iAIQM7vlsMd2/pcGfymZzNBRawObFgqIpxE94c=", "owner": "nix-community", "repo": "home-manager", - "rev": "4e09c83255c5b23d58714d56672d3946faf1bcef", + "rev": "f06a43dca05fb7f1aa44742bf861d9c827b45122", "type": "github" }, "original": { @@ -689,11 +689,11 @@ "pre-commit-hooks-nix": "pre-commit-hooks-nix" }, "locked": { - "lastModified": 1686692834, - "narHash": "sha256-EFjJ/r4iYVKO+XdL15g9bzOKbCExTGeqNEVHSn0H7/E=", + "lastModified": 1687124707, + "narHash": "sha256-BEC2y7zwDI/Saeupr9rijLvwb0OoqTD9vntlcyciyrM=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "823ad6b70bf09b91c3a9dd9a64678ec80ba3c1ee", + "rev": "c758cdad465e0c8174db57dc493f51a89f0e3372", "type": "github" }, "original": { @@ -787,11 +787,11 @@ ] }, "locked": { - "lastModified": 1671096816, - "narHash": "sha256-ezQCsNgmpUHdZANDCILm3RvtO1xH8uujk/+EqNvzIOg=", + "lastModified": 1686572087, + "narHash": "sha256-jXTut7ZSYqLEgm/nTk7TuVL2ExahTip605bLINklAnQ=", "owner": "nix-community", "repo": "naersk", - "rev": "d998160d6a076cfe8f9741e56aeec7e267e3e114", + "rev": "8507af04eb40c5520bd35d9ce6f9d2342cea5ad1", "type": "github" }, "original": { @@ -837,11 +837,11 @@ }, "nixlib": { "locked": { - "lastModified": 1685840432, - "narHash": "sha256-VJIbiKsY7Xy4E4WcgwUt/UiwYDmN5BAk8tngAjcWsqY=", + "lastModified": 1687049841, + "narHash": "sha256-FBNZQfWtA7bb/rwk92mfiWc85x4hXta2OAouDqO5W8w=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "961e99baaaa57f5f7042fe7ce089a88786c839f4", + "rev": "908af6d1fa3643c5818ea45aa92b21d6385fbbe5", "type": "github" }, "original": { @@ -858,11 +858,11 @@ ] }, "locked": { - "lastModified": 1686644215, - "narHash": "sha256-FYa25w7gt8FqzWLl4UuwLLG7BiKZiAW/PFGbXWW6UAc=", + "lastModified": 1687183443, + "narHash": "sha256-foX4pkph2AwUdJL3JURa7IHog+YRIheZ54vwHwxqwhU=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "f17fb67fc81a9f3b166cee711089466ba6617154", + "rev": "09140f23f5ffce828db4ef040070bdd9595b1f3a", "type": "github" }, "original": { @@ -1050,26 +1050,26 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1686718773, - "narHash": "sha256-x+4xs6+jWhFaYwt6REH7e91rm5vt2GCPEfmRdNcHyi4=", + "lastModified": 1686960236, + "narHash": "sha256-AYCC9rXNLpUWzD9hm+askOfpliLEC9kwAo7ITJc4HIw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ba1a6ec548000d4a50719d14e6f73f63016674d5", + "rev": "04af42f3b31dba0ef742d254456dc4c14eedac86", "type": "github" }, "original": { "id": "nixpkgs", - "ref": "nixos-unstable-small", + "ref": "nixos-unstable", "type": "indirect" } }, "nixpkgs_5": { "locked": { - "lastModified": 1686319658, - "narHash": "sha256-tGWdoUAqKnE866mYFlEfc2a99kxFy31hOQJH5YQKrTQ=", + "lastModified": 1686960236, + "narHash": "sha256-AYCC9rXNLpUWzD9hm+askOfpliLEC9kwAo7ITJc4HIw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ae766d59b07c450e0f1de8a1bfd6529089f40849", + "rev": "04af42f3b31dba0ef742d254456dc4c14eedac86", "type": "github" }, "original": { @@ -1081,16 +1081,16 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1672580127, - "narHash": "sha256-3lW3xZslREhJogoOkjeZtlBtvFMyxHku7I/9IVehhT8=", + "lastModified": 1686736559, + "narHash": "sha256-YyUSVoOKIDAscTx7IZhF9x3qgZ9dPNF19fKk+4c5irc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "0874168639713f547c05947c76124f78441ea46c", + "rev": "ddf4688dc7aeb14e8a3c549cb6aa6337f187a884", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-22.05", + "ref": "nixos-23.05", "repo": "nixpkgs", "type": "github" } @@ -1143,11 +1143,11 @@ }, "nixpkgs_stable": { "locked": { - "lastModified": 1686736559, - "narHash": "sha256-YyUSVoOKIDAscTx7IZhF9x3qgZ9dPNF19fKk+4c5irc=", + "lastModified": 1687193290, + "narHash": "sha256-3bknptEbd9LLlCiFRFkMwmciHB+QXET41gH/RX+Nr1A=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ddf4688dc7aeb14e8a3c549cb6aa6337f187a884", + "rev": "ad157fe26e74211e7dde0456cb3fd9ab78b6e552", "type": "github" }, "original": { @@ -1164,11 +1164,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1686822953, - "narHash": "sha256-O7famU9SxDRJqa4fob1Ja2Aclr9XqKu3k4uhpvPnZ+c=", + "lastModified": 1687172883, + "narHash": "sha256-7i9eGpvo9uYSOQ07acTfVpIk/r2okIumWBA4apOiO7Y=", "owner": "pta2002", "repo": "nixvim", - "rev": "9fd431366acf7a6cb8e38c9b19a70b6376b16014", + "rev": "885a7460735c3547f06a5f8af30ed22e39642806", "type": "github" }, "original": { @@ -1179,11 +1179,11 @@ }, "nur": { "locked": { - "lastModified": 1686894171, - "narHash": "sha256-QyEdSgyOdSGM3kS6N/r+0i47VbeZI41OZik37ipkQBs=", + "lastModified": 1687242811, + "narHash": "sha256-PHdt+saMHnW6vcUGDnJxBWSBx8tDI7lePpgNdfujEfQ=", "owner": "nix-community", "repo": "NUR", - "rev": "1c14e580cdf9e778d76a15ff13d6d302da628a30", + "rev": "75d50b0fe99a652e80ce00c64e8c9adf395dd807", "type": "github" }, "original": { @@ -1248,11 +1248,11 @@ "nixpkgs-stable": "nixpkgs-stable_3" }, "locked": { - "lastModified": 1686213770, - "narHash": "sha256-Re6xXLEqQ/HRnThryumyGzEf3Uv0Pl4cuG50MrDofP8=", + "lastModified": 1686668298, + "narHash": "sha256-AADh9NqHh6X2LOem4BvI7oCkMm+JPCSCE7iIw5nn0VA=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "182af51202998af5b64ddecaa7ff9be06425399b", + "rev": "5b6b54d3f722aa95cbf4ddbe35390a0af8c0015a", "type": "github" }, "original": { @@ -1326,11 +1326,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1677774593, - "narHash": "sha256-Drh8t1PPm7xSU8EzDkL2tJf7u75/jUiUKnVBarQkFro=", + "lastModified": 1686943106, + "narHash": "sha256-rTYwDvTLFCCbyGHDM/Si7v7RR7A6pcnXyO85NtMmAH4=", "owner": "DeterminateSystems", "repo": "riff", - "rev": "330868ae137cd8baefa6fb53e1cf5847ad7d2320", + "rev": "2e19c1097c922cdeb90fdaec60f9bc592b8c4ffe", "type": "github" }, "original": { @@ -1362,11 +1362,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1674253028, - "narHash": "sha256-OzdEJpxIZw50DuZ1aBJlZnJ/GxHfKhexhn4Eu53YnEo=", + "lastModified": 1686818168, + "narHash": "sha256-yyoJmC17T6mXqthzgGiTKSdUJ0cTEuqQmkmd3iW4ay8=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "9a6294d7038e7eab00beafdf64ec4aa50a4c66a2", + "rev": "ff864fbb9fc21f0cdae408fe8f5b2f43141b45a7", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 885e1e6..8e9cfe4 100644 --- a/flake.nix +++ b/flake.nix @@ -5,7 +5,7 @@ # * https://github.com/Infinidoge/nix-minecraft inputs = { - nixpkgs.url = "nixpkgs/nixos-unstable-small"; + nixpkgs.url = "nixpkgs/nixos-unstable"; nixpkgs_stable.url = "nixpkgs/nixos-23.05"; @@ -145,7 +145,7 @@ (vault-push-approle-envs self { }) (vault-push-approles self { }) fast-repl - v.weave-gitops + weave-gitops ]; }; }; diff --git a/nixos/pkgs/default.nix b/nixos/pkgs/default.nix index 52134ad..5f7180f 100644 --- a/nixos/pkgs/default.nix +++ b/nixos/pkgs/default.nix @@ -3,8 +3,6 @@ _final: prev: { v = { glitch-soc = prev.callPackage ./glitch-soc { }; - weave-gitops = prev.callPackage ./weave-gitops { }; - unbound = prev.unbound.override { withSystemd = true; withDoH = true; diff --git a/nixos/pkgs/weave-gitops/default.nix b/nixos/pkgs/weave-gitops/default.nix deleted file mode 100644 index 9faf7e9..0000000 --- a/nixos/pkgs/weave-gitops/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib, fetchFromGitHub, buildGoModule }: -buildGoModule rec { - pname = "weave-gitops"; - version = "0.23.0"; - - src = fetchFromGitHub { - owner = "weaveworks"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-nXFR+X63yp9IFTeW41ncBt77bCD3QFTs4phJMMLWrxs="; - }; - - ldflags = [ "-s" "-w" "-X github.com/weaveworks/weave-gitops/cmd/gitops/version.Version=${version}" ]; - - vendorSha256 = "sha256-3CgR9F3Bz4k1MVOufaF/E2GD6+bTOnnUqOXkNO9ZFrc="; - - subPackages = [ "cmd/gitops" ]; - - meta = with lib; { - homepage = "https://github.com/weaveworks/weave-gitops"; - description = "Weave Gitops CLI"; - license = licenses.mpl20; - platforms = platforms.linux; - maintainers = with maintainers; [ nullx76 ]; - }; -}