From 7ba548dc78d57ee64b5e6ef46f10603c333fb0a7 Mon Sep 17 00:00:00 2001 From: Ilan Joselevich Date: Sun, 11 Jun 2023 14:08:38 +0300 Subject: [PATCH] treewide: 22.11 -> 23.05 --- bors.toml | 4 ++-- flake.lock | 43 ++++++++++++++++++++---------------------- flake.nix | 4 ++-- src/nixos-anywhere.sh | 2 +- tests/flake-module.nix | 8 ++++---- 5 files changed, 29 insertions(+), 32 deletions(-) diff --git a/bors.toml b/bors.toml index fb5bf8c..8210dd5 100644 --- a/bors.toml +++ b/bors.toml @@ -2,9 +2,9 @@ cut_body_after = "" # don't include text from the PR body in the merge commit me status = [ "Evaluate flake.nix", "check from-nixos [x86_64-linux]", - "check from-nixos-2211 [x86_64-linux]", + "check from-nixos-2305 [x86_64-linux]", "check from-nixos-with-sudo [x86_64-linux]", - "check from-nixos-with-sudo-2211 [x86_64-linux]", + "check from-nixos-with-sudo-2305 [x86_64-linux]", "check treefmt [x86_64-linux]", "deploy", "devShell default [x86_64-linux]", diff --git a/flake.lock b/flake.lock index 6cbb60d..1466b6c 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1685450011, - "narHash": "sha256-/Az50GoWePZHL+Pkxy2ZuKW9zwIk+oVdzkR9xWomnpo=", + "lastModified": 1686222354, + "narHash": "sha256-dtqnAwzucKZv54dTrLetIXhOavUrCsdqOe+JtFH9riE=", "owner": "nix-community", "repo": "disko", - "rev": "0d270372b21818eba342954220c1a30a7bdaba19", + "rev": "5d9f362aecd7a4c2e8a3bf2afddb49051988cab9", "type": "github" }, "original": { @@ -28,11 +28,11 @@ ] }, "locked": { - "lastModified": 1685546676, - "narHash": "sha256-XDbjJyAg6odX5Vj0Q22iI/gQuFvEkv9kamsSbQ+npaI=", + "lastModified": 1685662779, + "narHash": "sha256-cKDDciXGpMEjP1n6HlzKinN0H+oLmNpgeCTzYnsA2po=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "6ef2707776c6379bc727faf3f83c0dd60b06e0c6", + "rev": "71fb97f0d875fd4de4994dfb849f2c75e17eb6c3", "type": "github" }, "original": { @@ -41,40 +41,37 @@ "type": "github" } }, - "nixos-2211": { + "nixos-2305": { "locked": { - "lastModified": 1685650716, - "narHash": "sha256-sDd7QIcMbIb37nuqMrJElvuyE5eVgWuKGtIPP8IWwCc=", + "lastModified": 1686478675, + "narHash": "sha256-EBm0oKY+B+BF/wQzegHCLPZQ2BxfgRSfEJhAd9N2XyA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f7c1500e2eefa58f3c80dd046cba256e10440201", + "rev": "207e4680b5ffe797038955949ab20ddc4a31c835", "type": "github" }, "original": { "owner": "NixOS", - "ref": "release-22.11", + "ref": "release-23.05", "repo": "nixpkgs", "type": "github" } }, "nixos-images": { "inputs": { - "disko": [ - "disko" - ], - "nixos-2211": [ - "nixos-2211" + "nixos-2305": [ + "nixos-2305" ], "nixos-unstable": [ "nixpkgs" ] }, "locked": { - "lastModified": 1684162811, - "narHash": "sha256-MUph0dhV+54+9rhfqu6uwDzL6KJyNfoomWX9CkHF7j4=", + "lastModified": 1686466496, + "narHash": "sha256-HYSUVZ85+POkLOo1Om7yw1870xqwJp3ABu+Fz7hBJY8=", "owner": "nix-community", "repo": "nixos-images", - "rev": "dd0801f58578658ba9877c135dddbf398394eb6e", + "rev": "13e5db35e8b5a646d0efa81ff1dd003336ffe65f", "type": "github" }, "original": { @@ -85,11 +82,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1685576448, - "narHash": "sha256-CaPA2UoHf4ydSZ3H3KIydVEojlb54GtrxYtPGHT5wfU=", + "lastModified": 1686406799, + "narHash": "sha256-/MHAr6x5/DDEAWFQLgIlyFT9jCXl5O6OWCoNGmfnL3g=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a11f65c77752b5dd561e7453e1a603cf812a50b5", + "rev": "9166729004aef4db3390d7199a45f6c7331275a2", "type": "github" }, "original": { @@ -103,7 +100,7 @@ "inputs": { "disko": "disko", "flake-parts": "flake-parts", - "nixos-2211": "nixos-2211", + "nixos-2305": "nixos-2305", "nixos-images": "nixos-images", "nixpkgs": "nixpkgs", "treefmt-nix": "treefmt-nix" diff --git a/flake.nix b/flake.nix index 7fef2e9..c7bb0ee 100644 --- a/flake.nix +++ b/flake.nix @@ -6,10 +6,10 @@ flake-parts = { url = "github:hercules-ci/flake-parts"; inputs.nixpkgs-lib.follows = "nixpkgs"; }; disko = { url = "github:nix-community/disko/master"; inputs.nixpkgs.follows = "nixpkgs"; }; # used for testing - nixos-2211.url = "github:NixOS/nixpkgs/release-22.11"; + nixos-2305.url = "github:NixOS/nixpkgs/release-23.05"; nixos-images.url = "github:nix-community/nixos-images"; nixos-images.inputs.nixos-unstable.follows = "nixpkgs"; - nixos-images.inputs.nixos-2211.follows = "nixos-2211"; + nixos-images.inputs.nixos-2305.follows = "nixos-2305"; nixos-images.inputs.disko.follows = "disko"; # used for development treefmt-nix = { url = "github:numtide/treefmt-nix"; inputs.nixpkgs.follows = "nixpkgs"; }; diff --git a/src/nixos-anywhere.sh b/src/nixos-anywhere.sh index 7e2bb05..55c9d4d 100755 --- a/src/nixos-anywhere.sh +++ b/src/nixos-anywhere.sh @@ -49,7 +49,7 @@ step() { echo "### $* ###" } -default_kexec_url=https://github.com/nix-community/nixos-images/releases/download/nixos-22.11/nixos-kexec-installer-noninteractive-x86_64-linux.tar.gz +default_kexec_url=https://github.com/nix-community/nixos-images/releases/download/nixos-23.05/nixos-kexec-installer-noninteractive-x86_64-linux.tar.gz kexec_url="$default_kexec_url" enable_debug="" maybe_reboot="sleep 6 && reboot" diff --git a/tests/flake-module.nix b/tests/flake-module.nix index 8fa93bc..98abb0f 100644 --- a/tests/flake-module.nix +++ b/tests/flake-module.nix @@ -9,14 +9,14 @@ nixos-anywhere = config.packages.nixos-anywhere; kexec-installer = "${inputs'.nixos-images.packages.kexec-installer-nixos-unstable-noninteractive}/nixos-kexec-installer-noninteractive-${system}.tar.gz"; }; - testInputs2211 = testInputs // { - kexec-installer = "${inputs'.nixos-images.packages.kexec-installer-nixos-2211-noninteractive}/nixos-kexec-installer-noninteractive-${system}.tar.gz"; + testInputs2305 = testInputs // { + kexec-installer = "${inputs'.nixos-images.packages.kexec-installer-nixos-2305-noninteractive}/nixos-kexec-installer-noninteractive-${system}.tar.gz"; }; in { from-nixos = import ./from-nixos.nix testInputs; - from-nixos-2211 = import ./from-nixos.nix testInputs2211; + from-nixos-2305 = import ./from-nixos.nix testInputs2305; from-nixos-with-sudo = import ./from-nixos-with-sudo.nix testInputs; - from-nixos-with-sudo-2211 = import ./from-nixos-with-sudo.nix testInputs2211; + from-nixos-with-sudo-2305 = import ./from-nixos-with-sudo.nix testInputs2305; }); }