From e1b5d3df44ba7d6a666e534688ab27c5455d03b8 Mon Sep 17 00:00:00 2001 From: OatmealDome Date: Wed, 18 Dec 2024 13:08:00 -0500 Subject: [PATCH 1/7] flake: Update nixpkgs to 24.11 --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 391fb7c..3196f00 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ description = "Central, Dolphin's CI/CD plumbing infrastructure"; inputs.flake-utils.url = "github:numtide/flake-utils"; - inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05"; + inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11"; inputs.poetry2nix.url = "github:nix-community/poetry2nix"; inputs.poetry2nix.inputs.nixpkgs.follows = "nixpkgs"; From c3b70e481bb0b05b9186006641fadd511d1a02f6 Mon Sep 17 00:00:00 2001 From: OatmealDome Date: Wed, 18 Dec 2024 13:08:59 -0500 Subject: [PATCH 2/7] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'flake-utils': 'github:numtide/flake-utils/b1d9ab70662946ef0850d488da1c9019f3a9752a?narHash=sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ%3D' (2024-03-11) → 'github:numtide/flake-utils/11707dc2f618dd54ca8739b309ec4fc024de578b?narHash=sha256-l0KFg5HjrsfsO/JpG%2Br7fRrqm12kzFHyUHqHCVpMMbI%3D' (2024-11-13) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/752c634c09ceb50c45e751f8791cb45cb3d46c9e?narHash=sha256-ZT7Oc1g4I4pHVGGjQFnewFVDRLH5cIZhEzODLz9YXeY%3D' (2024-06-15) → 'github:NixOS/nixpkgs/394571358ce82dff7411395829aa6a3aad45b907?narHash=sha256-m/lh6hYMIWDYHCAsn81CDAiXoT3gmxXI9J987W5tZrE%3D' (2024-12-16) • Updated input 'poetry2nix': 'github:nix-community/poetry2nix/48e7ed4ef7832efa5a5558e573986c4128fc478f?narHash=sha256-TFlVP4YXg6n%2BMbP/Iv/RIwqvRKuV9KA1JAPihoFmPfo%3D' (2024-06-18) → 'github:nix-community/poetry2nix/f554d27c1544d9c56e5f1f8e2b8aff399803674e?narHash=sha256-F7N1mxH1VrkVNHR3JGNMRvp9%2B98KYO4b832KS8Gl2xI%3D' (2024-11-10) • Updated input 'poetry2nix/flake-utils': 'github:numtide/flake-utils/b1d9ab70662946ef0850d488da1c9019f3a9752a?narHash=sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ%3D' (2024-03-11) → 'github:numtide/flake-utils/c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a?narHash=sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ%3D' (2024-09-17) • Updated input 'poetry2nix/nix-github-actions': 'github:nix-community/nix-github-actions/5163432afc817cf8bd1f031418d1869e4c9d5547?narHash=sha256-rXwqjtwiGKJheXB43ybM8NwWB8rO2dSRrEqes0S7F5Y%3D' (2023-12-29) → 'github:nix-community/nix-github-actions/e04df33f62cdcf93d73e9a04142464753a16db67?narHash=sha256-B4mzTcQ0FZHdpeWcpDYPERtyjJd/NIuaQ9%2BBV1h%2BMpA%3D' (2024-10-24) • Updated input 'poetry2nix/treefmt-nix': 'github:numtide/treefmt-nix/68eb1dc333ce82d0ab0c0357363ea17c31ea1f81?narHash=sha256-ULzoKzEaBOiLRtjeY3YoGFJMwWSKRYOic6VNw2UyTls%3D' (2024-06-16) → 'github:numtide/treefmt-nix/9ef337e492a5555d8e17a51c911ff1f02635be15?narHash=sha256-LqHYIxMrl/1p3/kvm2ir925tZ8DkI0KA10djk8wecSk%3D' (2024-10-28) --- flake.lock | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/flake.lock b/flake.lock index d223ef0..556edab 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -23,11 +23,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "lastModified": 1726560853, + "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", "type": "github" }, "original": { @@ -44,11 +44,11 @@ ] }, "locked": { - "lastModified": 1703863825, - "narHash": "sha256-rXwqjtwiGKJheXB43ybM8NwWB8rO2dSRrEqes0S7F5Y=", + "lastModified": 1729742964, + "narHash": "sha256-B4mzTcQ0FZHdpeWcpDYPERtyjJd/NIuaQ9+BV1h+MpA=", "owner": "nix-community", "repo": "nix-github-actions", - "rev": "5163432afc817cf8bd1f031418d1869e4c9d5547", + "rev": "e04df33f62cdcf93d73e9a04142464753a16db67", "type": "github" }, "original": { @@ -59,16 +59,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1718437845, - "narHash": "sha256-ZT7Oc1g4I4pHVGGjQFnewFVDRLH5cIZhEzODLz9YXeY=", + "lastModified": 1734323986, + "narHash": "sha256-m/lh6hYMIWDYHCAsn81CDAiXoT3gmxXI9J987W5tZrE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "752c634c09ceb50c45e751f8791cb45cb3d46c9e", + "rev": "394571358ce82dff7411395829aa6a3aad45b907", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-24.05", + "ref": "nixos-24.11", "repo": "nixpkgs", "type": "github" } @@ -84,11 +84,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1718745582, - "narHash": "sha256-TFlVP4YXg6n+MbP/Iv/RIwqvRKuV9KA1JAPihoFmPfo=", + "lastModified": 1731205797, + "narHash": "sha256-F7N1mxH1VrkVNHR3JGNMRvp9+98KYO4b832KS8Gl2xI=", "owner": "nix-community", "repo": "poetry2nix", - "rev": "48e7ed4ef7832efa5a5558e573986c4128fc478f", + "rev": "f554d27c1544d9c56e5f1f8e2b8aff399803674e", "type": "github" }, "original": { @@ -156,11 +156,11 @@ ] }, "locked": { - "lastModified": 1718522839, - "narHash": "sha256-ULzoKzEaBOiLRtjeY3YoGFJMwWSKRYOic6VNw2UyTls=", + "lastModified": 1730120726, + "narHash": "sha256-LqHYIxMrl/1p3/kvm2ir925tZ8DkI0KA10djk8wecSk=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "68eb1dc333ce82d0ab0c0357363ea17c31ea1f81", + "rev": "9ef337e492a5555d8e17a51c911ff1f02635be15", "type": "github" }, "original": { From 96a1285169789f5372c5e9ecd5f5c61d8a0797be Mon Sep 17 00:00:00 2001 From: OatmealDome Date: Wed, 18 Dec 2024 16:12:22 -0500 Subject: [PATCH 3/7] flake: Use wheel 0.45.1 to workaround a bug --- flake.nix | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/flake.nix b/flake.nix index 3196f00..fc39f9f 100644 --- a/flake.nix +++ b/flake.nix @@ -8,6 +8,22 @@ outputs = { self, nixpkgs, flake-utils, poetry2nix }: { overlay = nixpkgs.lib.composeManyExtensions [ + # Manually override wheel package to 0.45.1 until the change lands in nixos-24.11 + # https://github.com/NixOS/nixpkgs/pull/361930 + (self: super: rec { + python3 = super.python3.override { + packageOverrides = python-self: python-super: { + wheel = python-super.wheel.overridePythonAttrs (oldAttrs: rec { + version = "0.45.1"; + + src = oldAttrs.src.override { + rev = "refs/tags/0.45.1"; + hash = "sha256-tgueGEWByS5owdA5rhXGn3qh1Vtf0HGYC6+BHfrnGAs="; + }; + }); + }; + }; + }) poetry2nix.overlays.default (final: prev: { central = prev.poetry2nix.mkPoetryApplication { From a1495ce2434cae927bb0df007da6086f9084e66d Mon Sep 17 00:00:00 2001 From: OatmealDome Date: Wed, 18 Dec 2024 18:50:30 -0500 Subject: [PATCH 4/7] reorder --- flake.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.nix b/flake.nix index fc39f9f..3c431d4 100644 --- a/flake.nix +++ b/flake.nix @@ -8,6 +8,15 @@ outputs = { self, nixpkgs, flake-utils, poetry2nix }: { overlay = nixpkgs.lib.composeManyExtensions [ + poetry2nix.overlays.default + (final: prev: { + central = prev.poetry2nix.mkPoetryApplication { + projectDir = ./.; + overrides = prev.poetry2nix.defaultPoetryOverrides.extend (self: super: { + pypeul = super.pypeul.overridePythonAttrs (old: { buildInputs = (old.buildInputs or []) ++ [ super.poetry-core ]; }); + }); + }; + }) # Manually override wheel package to 0.45.1 until the change lands in nixos-24.11 # https://github.com/NixOS/nixpkgs/pull/361930 (self: super: rec { @@ -24,15 +33,6 @@ }; }; }) - poetry2nix.overlays.default - (final: prev: { - central = prev.poetry2nix.mkPoetryApplication { - projectDir = ./.; - overrides = prev.poetry2nix.defaultPoetryOverrides.extend (self: super: { - pypeul = super.pypeul.overridePythonAttrs (old: { buildInputs = (old.buildInputs or []) ++ [ super.poetry-core ]; }); - }); - }; - }) ]; } // (flake-utils.lib.eachDefaultSystem (system: let From c12b893c761513e9f154fd3e4426650bab1a5cee Mon Sep 17 00:00:00 2001 From: OatmealDome Date: Wed, 18 Dec 2024 23:20:10 -0500 Subject: [PATCH 5/7] 2 --- flake.nix | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/flake.nix b/flake.nix index 3c431d4..733521d 100644 --- a/flake.nix +++ b/flake.nix @@ -14,23 +14,17 @@ projectDir = ./.; overrides = prev.poetry2nix.defaultPoetryOverrides.extend (self: super: { pypeul = super.pypeul.overridePythonAttrs (old: { buildInputs = (old.buildInputs or []) ++ [ super.poetry-core ]; }); - }); - }; - }) - # Manually override wheel package to 0.45.1 until the change lands in nixos-24.11 - # https://github.com/NixOS/nixpkgs/pull/361930 - (self: super: rec { - python3 = super.python3.override { - packageOverrides = python-self: python-super: { - wheel = python-super.wheel.overridePythonAttrs (oldAttrs: rec { + # Manually override wheel package to 0.45.1 until the change lands in nixos-24.11 + # https://github.com/NixOS/nixpkgs/pull/361930 + wheel = super.wheel.overridePythonAttrs (old: { version = "0.45.1"; - src = oldAttrs.src.override { + src = old.src.override { rev = "refs/tags/0.45.1"; hash = "sha256-tgueGEWByS5owdA5rhXGn3qh1Vtf0HGYC6+BHfrnGAs="; }; }); - }; + }); }; }) ]; From 4ecfe703e74b351ed254abe7063f015cd20fa54f Mon Sep 17 00:00:00 2001 From: OatmealDome Date: Wed, 18 Dec 2024 23:41:59 -0500 Subject: [PATCH 6/7] 3 --- flake.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 733521d..0451aed 100644 --- a/flake.nix +++ b/flake.nix @@ -18,12 +18,17 @@ # https://github.com/NixOS/nixpkgs/pull/361930 wheel = super.wheel.overridePythonAttrs (old: { version = "0.45.1"; - src = old.src.override { rev = "refs/tags/0.45.1"; hash = "sha256-tgueGEWByS5owdA5rhXGn3qh1Vtf0HGYC6+BHfrnGAs="; }; }); + setuptools = super.setuptools.overridePythonAttrs (old: { + version = "75.2.0"; + src = old.src.override { + rev = "refs/tags/75.2.0"; + }; + }); }); }; }) From 81570307ebb3a69b6708bce909fefaf48c836143 Mon Sep 17 00:00:00 2001 From: OatmealDome Date: Thu, 19 Dec 2024 02:18:11 -0500 Subject: [PATCH 7/7] 4 --- flake.nix | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/flake.nix b/flake.nix index 0451aed..5782df2 100644 --- a/flake.nix +++ b/flake.nix @@ -8,27 +8,28 @@ outputs = { self, nixpkgs, flake-utils, poetry2nix }: { overlay = nixpkgs.lib.composeManyExtensions [ - poetry2nix.overlays.default + # Manually override wheel package to 0.45.1 until the change lands in nixos-24.11 + # https://github.com/NixOS/nixpkgs/pull/361930 (final: prev: { - central = prev.poetry2nix.mkPoetryApplication { - projectDir = ./.; - overrides = prev.poetry2nix.defaultPoetryOverrides.extend (self: super: { - pypeul = super.pypeul.overridePythonAttrs (old: { buildInputs = (old.buildInputs or []) ++ [ super.poetry-core ]; }); - # Manually override wheel package to 0.45.1 until the change lands in nixos-24.11 - # https://github.com/NixOS/nixpkgs/pull/361930 - wheel = super.wheel.overridePythonAttrs (old: { + pythonPackagesExtensions = prev.pythonPackagesExtensions ++ [ + (python-final: python-prev: { + wheel = python-prev.wheel.overrideAttrs (oldAttrs: { version = "0.45.1"; - src = old.src.override { + + src = oldAttrs.src.override { rev = "refs/tags/0.45.1"; hash = "sha256-tgueGEWByS5owdA5rhXGn3qh1Vtf0HGYC6+BHfrnGAs="; }; }); - setuptools = super.setuptools.overridePythonAttrs (old: { - version = "75.2.0"; - src = old.src.override { - rev = "refs/tags/75.2.0"; - }; - }); + }) + ]; + }) + poetry2nix.overlays.default + (final: prev: { + central = prev.poetry2nix.mkPoetryApplication { + projectDir = ./.; + overrides = prev.poetry2nix.defaultPoetryOverrides.extend (self: super: { + pypeul = super.pypeul.overridePythonAttrs (old: { buildInputs = (old.buildInputs or []) ++ [ super.poetry-core ]; }); }); }; })