From f7b31ed3cfe12960996e19cc3e42682ea51ef20e Mon Sep 17 00:00:00 2001 From: EdenEast Date: Fri, 27 Dec 2024 14:08:52 -0500 Subject: [PATCH] chore: update nixpkgs from 24.05 to 24.11 --- flake.lock | 16 +++++------ flake.nix | 4 +-- nix/overlays/vhs/default.nix | 52 ------------------------------------ 3 files changed, 10 insertions(+), 62 deletions(-) delete mode 100644 nix/overlays/vhs/default.nix diff --git a/flake.lock b/flake.lock index 01a400b3..9243104f 100644 --- a/flake.lock +++ b/flake.lock @@ -204,16 +204,16 @@ ] }, "locked": { - "lastModified": 1726989464, - "narHash": "sha256-Vl+WVTJwutXkimwGprnEtXc/s/s8sMuXzqXaspIGlwM=", + "lastModified": 1733050161, + "narHash": "sha256-lYnT+EYE47f5yY3KS/Kd4pJ6CO9fhCqumkYYkQ3TK20=", "owner": "nix-community", "repo": "home-manager", - "rev": "2f23fa308a7c067e52dfcc30a0758f47043ec176", + "rev": "62d536255879be574ebfe9b87c4ac194febf47c5", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-24.05", + "ref": "release-24.11", "repo": "home-manager", "type": "github" } @@ -276,16 +276,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1729691686, - "narHash": "sha256-BAuPWW+9fa1moZTU+jFh+1cUtmsuF8asgzFwejM4wac=", + "lastModified": 1733261153, + "narHash": "sha256-eq51hyiaIwtWo19fPEeE0Zr2s83DYMKJoukNLgGGpek=", "owner": "nixos", "repo": "nixpkgs", - "rev": "32e940c7c420600ef0d1ef396dc63b04ee9cad37", + "rev": "b681065d0919f7eb5309a93cea2cfa84dec9aa88", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-24.05", + "ref": "nixos-24.11", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index a67c75d5..d7cb38ef 100644 --- a/flake.nix +++ b/flake.nix @@ -5,11 +5,11 @@ ''; inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11"; nixos-hardware.url = "github:nixos/nixos-hardware"; - home-manager.url = "github:nix-community/home-manager/release-24.05"; + home-manager.url = "github:nix-community/home-manager/release-24.11"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; darwin.url = "github:lnl7/nix-darwin/master"; diff --git a/nix/overlays/vhs/default.nix b/nix/overlays/vhs/default.nix deleted file mode 100644 index dba3f272..00000000 --- a/nix/overlays/vhs/default.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ ... }: - -_final: prev: - -let - sha256 = "sha256-t6n4uID7KTu/BqsmndJOft0ifxZNfv9lfqlzFX0ApKw="; - version = "0.2.0"; -in -{ - # https://github.com/NixOS/nixpkgs/issues/86349 - vhs = (prev.callPackage "${prev.path}/pkgs/applications/misc/vhs" { - buildGoModule = args: prev.buildGoModule (args // { - version = version; - src = prev.fetchFromGitHub { - owner = "charmbracelet"; - repo = "vhs"; - rev = "v${version}"; - sha256 = "sha256-t6n4uID7KTu/BqsmndJOft0ifxZNfv9lfqlzFX0ApKw="; - }; - - vendorHash = "sha256-9nkRr5Jh1nbI+XXbPj9KB0ZbLybv5JUVovpB311fO38="; - }); - }); - - # (self: super: { - # bazel-gazelle = (super.callPackage "${super.path}/pkgs/development/tools/bazel-gazelle" { - # buildGoModule = args: super.buildGoModule (args // { - # modSha256 = "13yx70p0x7hpdp2zn7zrl0i88fk6dhcryp0lmn0zwdn92ldm3n5y"; - # patches = (args.patches or []) ++ super.lib.lists.singleton (super.fetchpatch { - # url = "https://github.com/bazelbuild/bazel-gazelle/pull/749.patch"; - # sha256 = "03sxbgwvb6hxwpmk9mckwjzgxank9difc0bgvzl6x3rir76ivwmj"; - # }); - # }); - # }); - # }) - - # vhs = prev.vhs.overrideAttrs ( - # old: rec { - # version = "0.2.0"; - # src = prev.fetchFromGitHub { - # owner = "charmbracelet"; - # repo = "vhs"; - # rev = "v${version}"; - # sha256 = sha256; - # }; - # - # modSha256 = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA="; - # vendorHash = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA="; - # vendorSha256 = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA="; - # } - # ); -}