From 83c8525ac99cdd0635a6a320e5a24f0b58ec5a9f Mon Sep 17 00:00:00 2001 From: Aaron Bieber Date: Fri, 1 Dec 2023 14:27:57 -0700 Subject: [PATCH] all: update stable to 23.11 --- configs/neovim.nix | 4 ++-- flake.lock | 8 ++++---- flake.nix | 6 +++--- templates/ada/flake.nix | 2 +- templates/fyne/flake.nix | 2 +- templates/go/flake.nix | 2 +- templates/mojo/flake.nix | 2 +- templates/ocaml/flake.nix | 2 +- templates/perl/flake.nix | 2 +- 9 files changed, 15 insertions(+), 15 deletions(-) diff --git a/configs/neovim.nix b/configs/neovim.nix index b842dee..f056093 100644 --- a/configs/neovim.nix +++ b/configs/neovim.nix @@ -1,7 +1,7 @@ -{ pkgs, isUnstable, ... }: +{ pkgs, ... }: with pkgs; let - vimBuildTool = if isUnstable then pkgs.vimUtils.buildVimPlugin else pkgs.vimUtils.buildVimPluginFrom2Nix; + vimBuildTool = pkgs.vimUtils.buildVimPlugin; parchment = vimBuildTool rec { pname = "parchment"; version = "0.4.0"; diff --git a/flake.lock b/flake.lock index 7a74455..73e69e7 100644 --- a/flake.lock +++ b/flake.lock @@ -338,16 +338,16 @@ }, "stable": { "locked": { - "lastModified": 1701362232, - "narHash": "sha256-GVdzxL0lhEadqs3hfRLuj+L1OJFGiL/L7gCcelgBlsw=", + "lastModified": 1701374686, + "narHash": "sha256-xaJPtgvTuUGSPba8p3+ezCJjKnVij77ai8OE2bnTC0E=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d2332963662edffacfddfad59ff4f709dde80ffe", + "rev": "1bce6a1791a513af2727e5b668b3cd9ba76cb0bf", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-23.05-small", + "ref": "nixos-23.11-small", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index 98da763..31f4bcb 100644 --- a/flake.nix +++ b/flake.nix @@ -5,7 +5,7 @@ unstable.url = "github:NixOS/nixpkgs"; unstableSmall.url = "github:NixOS/nixpkgs/nixos-unstable-small"; - stable.url = "github:NixOS/nixpkgs/nixos-23.05-small"; + stable.url = "github:NixOS/nixpkgs/nixos-23.11-small"; sops-nix = { url = "github:Mic92/sops-nix"; @@ -210,7 +210,7 @@ europa = buildSys "x86_64-linux" unstable [ ] "europa"; pwntie = buildSys "x86_64-linux" stable [ ] "pwntie"; stan = buildSys "x86_64-linux" unstable [ ] "stan"; - weather = buildSys "aarch64-linux" stable [ ] "weather"; + #weather = buildSys "aarch64-linux" stable [ ] "weather"; octo = buildSys "aarch64-linux" stable [ ] "octo"; faf = buildSys "x86_64-linux" stable [ ./configs/hardened.nix ] "faf"; @@ -371,7 +371,7 @@ checks = let - buildList = [ "europa" "stan" "h" "box" "faf" "weather" ]; + buildList = [ "europa" "stan" "h" "box" "faf" ]; in with unstable.lib; foldl' recursiveUpdate { } (mapAttrsToList diff --git a/templates/ada/flake.nix b/templates/ada/flake.nix index e888fb2..4c4e645 100644 --- a/templates/ada/flake.nix +++ b/templates/ada/flake.nix @@ -1,7 +1,7 @@ { description = "thing: stuff and things"; - inputs.nixpkgs.url = "nixpkgs/nixos-23.05"; + inputs.nixpkgs.url = "nixpkgs/nixos-23.11"; outputs = { self diff --git a/templates/fyne/flake.nix b/templates/fyne/flake.nix index 191c4de..60e4a7e 100644 --- a/templates/fyne/flake.nix +++ b/templates/fyne/flake.nix @@ -1,7 +1,7 @@ { description = "thing: stuff and things"; - inputs.nixpkgs.url = "nixpkgs/nixos-23.05"; + inputs.nixpkgs.url = "nixpkgs/nixos-23.11"; outputs = { self diff --git a/templates/go/flake.nix b/templates/go/flake.nix index f3a2c3c..836b8ad 100644 --- a/templates/go/flake.nix +++ b/templates/go/flake.nix @@ -1,7 +1,7 @@ { description = "thing: stuff and things"; - inputs.nixpkgs.url = "nixpkgs/nixos-23.05"; + inputs.nixpkgs.url = "nixpkgs/nixos-23.11"; outputs = { self diff --git a/templates/mojo/flake.nix b/templates/mojo/flake.nix index 84545ab..7308059 100644 --- a/templates/mojo/flake.nix +++ b/templates/mojo/flake.nix @@ -1,7 +1,7 @@ { description = "thing: stuff and things"; - inputs.nixpkgs.url = "nixpkgs/nixos-23.05"; + inputs.nixpkgs.url = "nixpkgs/nixos-23.11"; outputs = { self diff --git a/templates/ocaml/flake.nix b/templates/ocaml/flake.nix index 0226f57..df3cd22 100644 --- a/templates/ocaml/flake.nix +++ b/templates/ocaml/flake.nix @@ -1,7 +1,7 @@ { description = "thing: stuff and things"; - inputs.nixpkgs.url = "nixpkgs/nixos-23.05"; + inputs.nixpkgs.url = "nixpkgs/nixos-23.11"; outputs = { self diff --git a/templates/perl/flake.nix b/templates/perl/flake.nix index e2cb3b6..77b8111 100644 --- a/templates/perl/flake.nix +++ b/templates/perl/flake.nix @@ -1,7 +1,7 @@ { description = "thing: stuff and things"; - inputs.nixpkgs.url = "nixpkgs/nixos-23.05"; + inputs.nixpkgs.url = "nixpkgs/nixos-23.11"; outputs = { self