From 60ec5b88ff5a2e2c54ed89be35a54e3163e48088 Mon Sep 17 00:00:00 2001 From: Quentin Boyer Date: Mon, 6 Jan 2025 21:30:48 +0100 Subject: [PATCH] Avoid using nixpkgs staging --- flake.lock | 16 ++++++++-------- flake.nix | 2 +- neovim/pkg.nix | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/flake.lock b/flake.lock index ce8b343..4dd9ed5 100644 --- a/flake.lock +++ b/flake.lock @@ -962,18 +962,18 @@ "type": "github" } }, - "nixpkgs-staging": { + "nixpkgs-ts": { "locked": { - "lastModified": 1735513553, - "narHash": "sha256-gy0yBLs9Y6fNe7E5Rh+mFdU29XqjfyIaaHsZFlsOudQ=", - "owner": "nixos", + "lastModified": 1736195135, + "narHash": "sha256-k3Q/Gn8T51qv88d86yeOg/UE/H3Vka4IWslAtinMp0s=", + "owner": "traxys", "repo": "nixpkgs", - "rev": "84758abe5ac20edd899ad048e586d18ea1e8c911", + "rev": "a1c7c71d3840135700a23eb143094aae17d25f66", "type": "github" }, "original": { - "owner": "nixos", - "ref": "staging", + "owner": "traxys", + "ref": "ts", "repo": "nixpkgs", "type": "github" } @@ -1325,7 +1325,7 @@ "nix-ld": "nix-ld", "nixos-cosmic": "nixos-cosmic", "nixpkgs": "nixpkgs_11", - "nixpkgs-staging": "nixpkgs-staging", + "nixpkgs-ts": "nixpkgs-ts", "nixvim": "nixvim", "nur": "nur", "raclette": "raclette", diff --git a/flake.nix b/flake.nix index 8b46247..ec64136 100644 --- a/flake.nix +++ b/flake.nix @@ -3,7 +3,7 @@ inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; - nixpkgs-staging.url = "github:nixos/nixpkgs/staging"; + nixpkgs-ts.url = "github:traxys/nixpkgs/ts"; nix-gaming = { url = "github:fufexan/nix-gaming"; inputs.nixpkgs.follows = "nixpkgs"; diff --git a/neovim/pkg.nix b/neovim/pkg.nix index 96c8f51..388f719 100644 --- a/neovim/pkg.nix +++ b/neovim/pkg.nix @@ -20,7 +20,7 @@ pkgs = pkgs.extend ( final: prev: { - inherit (inputs'.nixpkgs-staging.legacyPackages) tree-sitter; + inherit (inputs'.nixpkgs-ts.legacyPackages) tree-sitter; vimPlugins = prev.vimPlugins.extend ( final': prev': { vim-headerguard = prev.vimUtils.buildVimPlugin {