From 176d6d45f3e49c4b4675d5df87856634b3575aff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Charlotte=20=F0=9F=A6=9D=20Delenk?= Date: Wed, 11 Sep 2024 09:42:11 +0200 Subject: [PATCH 1/5] update attic --- flake.lock | 60 ++++++++++++++++++++++++++++++++++++++++-------------- flake.nix | 3 --- 2 files changed, 45 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index e064053d..06096819 100644 --- a/flake.lock +++ b/flake.lock @@ -87,31 +87,24 @@ }, "attic": { "inputs": { - "cargo2nix": [ - "cargo2nix" - ], "crane": [ "crane" ], "flake-compat": [ "flake-compat" ], - "flake-utils": [ - "flake-utils" - ], + "flake-parts": "flake-parts", "nixpkgs": [ "nixpkgs" ], - "rust-overlay": [ - "rust-overlay" - ] + "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1718545268, - "narHash": "sha256-kYnM1kr1U/+mARR3kYd1Yh9atRofKnpNQF5wd4xf8Cc=", + "lastModified": 1726040335, + "narHash": "sha256-vR3faBFRqLBAQ3u8u/69A+Za4g1eeB5LyEAYmh6AICg=", "owner": "DarkKirb", "repo": "attic", - "rev": "7634b861f606cd21719e350da5c74475047a456d", + "rev": "49448a36b24b9f66ff15c4d36a3e11e6b7f4e885", "type": "github" }, "original": { @@ -265,6 +258,27 @@ } }, "flake-parts": { + "inputs": { + "nixpkgs-lib": [ + "attic", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1725234343, + "narHash": "sha256-+ebgonl3NbiKD2UD0x4BszCZQ6sTfL4xioaM49o5B3Y=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "567b938d64d4b4112ee253b9274472dc3a346eb6", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_2": { "inputs": { "nixpkgs-lib": [ "nixpkgs" @@ -696,6 +710,22 @@ "type": "github" } }, + "nixpkgs-stable": { + "locked": { + "lastModified": 1725826545, + "narHash": "sha256-L64N1rpLlXdc94H+F6scnrbuEu+utC03cDDVvvJGOME=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "f4c846aee8e1e29062aa8514d5e0ab270f4ec2f9", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-24.05", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs_2": { "locked": { "lastModified": 1725905123, @@ -772,7 +802,7 @@ "devshell": "devshell", "dns": "dns", "flake-compat": "flake-compat", - "flake-parts": "flake-parts", + "flake-parts": "flake-parts_2", "flake-utils": "flake-utils", "flakey-profile": "flakey-profile", "gitignore": "gitignore", @@ -892,12 +922,12 @@ "rev": "3af25f44079f4a09ccd618501bb72ab368d033d3", "revCount": 714, "type": "git", - "url": "https://github.com/Open-Wine-Components/umu-launcher/?dir=packaging/nix" + "url": "https://github.com/Open-Wine-Components/umu-launcher/" }, "original": { "dir": "packaging/nix", "type": "git", - "url": "https://github.com/Open-Wine-Components/umu-launcher/?dir=packaging/nix" + "url": "https://github.com/Open-Wine-Components/umu-launcher/" } } }, diff --git a/flake.nix b/flake.nix index fd92b814..23888c53 100644 --- a/flake.nix +++ b/flake.nix @@ -27,12 +27,9 @@ rec { }; attic = { url = "github:DarkKirb/attic"; - inputs.cargo2nix.follows = "cargo2nix"; inputs.crane.follows = "crane"; inputs.flake-compat.follows = "flake-compat"; - inputs.flake-utils.follows = "flake-utils"; inputs.nixpkgs.follows = "nixpkgs"; - inputs.rust-overlay.follows = "rust-overlay"; }; cargo2nix = { url = "github:DarkKirb/cargo2nix/master"; From 78abae634777fd9ef9d2c6b3d967261999860346 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Charlotte=20=F0=9F=A6=9D=20Delenk?= Date: Wed, 11 Sep 2024 09:45:00 +0200 Subject: [PATCH 2/5] switch to postgresql --- config/services/hydra.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/config/services/hydra.nix b/config/services/hydra.nix index 52adaad4..0145309e 100644 --- a/config/services/hydra.nix +++ b/config/services/hydra.nix @@ -174,6 +174,15 @@ in { key = "attic/config.toml"; path = "/var/lib/hydra/queue-runner/.config/attic/config.toml"; }; + services.postgresql.ensureDatabases = [ + "hydra-queue-runner" + ]; + services.postgresql.ensureUsers = [ + { + name = "hydra-queue-runner"; + ensureDBOwnership = true; + } + ]; systemd.services."attic-queue" = { description = "Upload build results"; @@ -184,7 +193,7 @@ in { }; script = '' export QUEUE_PATH=/var/lib/hydra/queue-runner/upload - export DATABASE_PATH=/var/lib/hydra/queue-runner/queue.db + export DATABASE_PATH=postgresql:///hydra-queue-runner export RUST_LOG=info exec ${attic.packages.${system}.attic-queue}/bin/attic-queue ''; From d6e0bc17dd534d565a6b8c444db65337c5ea6455 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Charlotte=20=F0=9F=A6=9D=20Delenk?= Date: Wed, 11 Sep 2024 10:40:41 +0200 Subject: [PATCH 3/5] update attic --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 06096819..92c25529 100644 --- a/flake.lock +++ b/flake.lock @@ -100,11 +100,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1726040335, - "narHash": "sha256-vR3faBFRqLBAQ3u8u/69A+Za4g1eeB5LyEAYmh6AICg=", + "lastModified": 1726044022, + "narHash": "sha256-/7zh6sqWsUrydTNIIPa93OVmJjInoJsJE4kydhjqAWI=", "owner": "DarkKirb", "repo": "attic", - "rev": "49448a36b24b9f66ff15c4d36a3e11e6b7f4e885", + "rev": "f516e19a6e79b2b0453b315235155acd18f9b851", "type": "github" }, "original": { From 8acff8e93a05ada07154ce24d7d2905c2f226214 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Charlotte=20=F0=9F=A6=9D=20Delenk?= Date: Wed, 11 Sep 2024 11:09:59 +0200 Subject: [PATCH 4/5] update app-queue --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 92c25529..946afd78 100644 --- a/flake.lock +++ b/flake.lock @@ -100,11 +100,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1726044022, - "narHash": "sha256-/7zh6sqWsUrydTNIIPa93OVmJjInoJsJE4kydhjqAWI=", + "lastModified": 1726045776, + "narHash": "sha256-2NSYSFJfH+y7tglOPKrtty03C6DUQXcPlCAyPoBWong=", "owner": "DarkKirb", "repo": "attic", - "rev": "f516e19a6e79b2b0453b315235155acd18f9b851", + "rev": "c633937767fdb060b744dbefabd275b02e40e308", "type": "github" }, "original": { From 34d0b2327969f0431e59ea513d7f9cf719f7ffc2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Charlotte=20=F0=9F=A6=9D=20Delenk?= Date: Wed, 11 Sep 2024 15:11:30 +0200 Subject: [PATCH 5/5] update attic --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 946afd78..741d5fc3 100644 --- a/flake.lock +++ b/flake.lock @@ -100,11 +100,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1726045776, - "narHash": "sha256-2NSYSFJfH+y7tglOPKrtty03C6DUQXcPlCAyPoBWong=", + "lastModified": 1726060175, + "narHash": "sha256-Iw13A9W1ud7qJlOS76jCRd8bdH8w5qSortgHQJ10xnU=", "owner": "DarkKirb", "repo": "attic", - "rev": "c633937767fdb060b744dbefabd275b02e40e308", + "rev": "79a43f39e3f5f4ff7488b47f16fbe7ddbc1ca6f1", "type": "github" }, "original": {