diff --git a/flake.lock b/flake.lock index 02e5e86a5..e811a63d2 100644 --- a/flake.lock +++ b/flake.lock @@ -45,19 +45,19 @@ }, "nixpkgs": { "locked": { - "lastModified": 1753904442, - "narHash": "sha256-XHeb6yarZ9YLd3aQsnc0c8FrpnBGtHckQGZBPYXF7Uk=", - "ref": "nixos-unstable-small", - "rev": "d02f407d2bb5a5cb2f2f75c2a7c30d5b854be11b", + "lastModified": 1754093972, + "narHash": "sha256-lfyvxIl86eLS7OefNDUKxewlo/9QXuxCeWo8PD5S/6Y=", + "ref": "buildbot", + "rev": "1d1071ef8d909af63b32ec050f840de494394cba", "shallow": true, "type": "git", - "url": "https://github.com/NixOS/nixpkgs" + "url": "https://github.com/qowoz/nixpkgs" }, "original": { - "ref": "nixos-unstable-small", + "ref": "buildbot", "shallow": true, "type": "git", - "url": "https://github.com/NixOS/nixpkgs" + "url": "https://github.com/qowoz/nixpkgs" } }, "root": { diff --git a/flake.nix b/flake.nix index 3b14381c1..1e79ccee6 100644 --- a/flake.nix +++ b/flake.nix @@ -3,7 +3,7 @@ description = "A nixos module to make buildbot a proper Nix-CI."; inputs = { - nixpkgs.url = "git+https://github.com/NixOS/nixpkgs?shallow=1&ref=nixos-unstable-small"; + nixpkgs.url = "git+https://github.com/qowoz/nixpkgs?shallow=1&ref=buildbot"; flake-parts.url = "github:hercules-ci/flake-parts"; flake-parts.inputs.nixpkgs-lib.follows = "nixpkgs"; diff --git a/nixosModules/master.nix b/nixosModules/master.nix index 55be4f32a..c5a51419e 100644 --- a/nixosModules/master.nix +++ b/nixosModules/master.nix @@ -678,10 +678,10 @@ in assertions = [ { - assertion = lib.versionAtLeast packages.buildbot.version "4.0.0"; + assertion = lib.versionAtLeast packages.buildbot.version "4.3.0"; message = '' - `buildbot-nix` requires `buildbot` 4.0.0 or greater to function. - Set services.buildbot-nix.packages.buildbot to a nixpkgs with buildbot >= 4.0.0, + `buildbot-nix` requires `buildbot` 4.3.0 or greater to function. + Set services.buildbot-nix.packages.buildbot to a nixpkgs with buildbot >= 4.3.0, i.e. nixpkgs-unstable. ''; } diff --git a/packages/buildbot.nix b/packages/buildbot.nix index f84125d15..2926710db 100644 --- a/packages/buildbot.nix +++ b/packages/buildbot.nix @@ -1,15 +1 @@ -{ buildbot, fetchpatch }: -buildbot.overrideAttrs (o: { - patches = o.patches ++ [ - (fetchpatch { - name = "add-Build.skipBuildIf.patch"; - url = "https://github.com/buildbot/buildbot/commit/f08eeef96e15c686a4f6ad52368ad08246314751.patch"; - hash = "sha256-ACPYXMbjIfw02gsKwmDKIIZkGSxxLWCaW7ceEcgbtIU="; - }) - (fetchpatch { - name = "fix-deprecation-warnings.patch"; - url = "https://github.com/buildbot/buildbot/commit/a894300c5085be925f5021bae2058492625a786b.patch"; - hash = "sha256-agxubz/5PSw4WL3/d63GVnTKy67mLmL9pbVeImvbrYA="; - }) - ]; -}) +{ buildbot, fetchpatch }: buildbot