diff --git a/flake.lock b/flake.lock index 815856b..b88b941 100644 --- a/flake.lock +++ b/flake.lock @@ -31,26 +31,6 @@ "type": "github" } }, - "deploy-rs": { - "inputs": { - "flake-compat": "flake-compat", - "nixpkgs": "nixpkgs_4", - "utils": "utils_2" - }, - "locked": { - "lastModified": 1674127017, - "narHash": "sha256-QO1xF7stu5ZMDLbHN30LFolMAwY6TVlzYvQoUs1RD68=", - "owner": "serokell", - "repo": "deploy-rs", - "rev": "8c9ea9605eed20528bf60fae35a2b613b901fd77", - "type": "github" - }, - "original": { - "owner": "serokell", - "repo": "deploy-rs", - "type": "github" - } - }, "ema": { "flake": false, "locked": { @@ -113,22 +93,6 @@ } }, "flake-compat": { - "flake": false, - "locked": { - "lastModified": 1668681692, - "narHash": "sha256-Ht91NGdewz8IQLtWZ9LCeNXMSXHUss+9COoqu6JLmXU=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "009399224d5e398d03b22badca40a37ac85412a1", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_2": { "flake": false, "locked": { "lastModified": 1606424373, @@ -144,7 +108,7 @@ "type": "github" } }, - "flake-compat_3": { + "flake-compat_2": { "flake": false, "locked": { "lastModified": 1668681692, @@ -160,6 +124,26 @@ "type": "github" } }, + "flake-outputs": { + "inputs": { + "flake-parts": "flake-parts_4", + "nixpkgs": "nixpkgs_4", + "nuenv": "nuenv" + }, + "locked": { + "lastModified": 1681156618, + "narHash": "sha256-laldpiJau/8nVkMx6HjG2bYSfwimSJnRf1MduqxvAt8=", + "owner": "srid", + "repo": "flake-outputs", + "rev": "3c3c5d5488170983e5f3069dee3e95628951635d", + "type": "github" + }, + "original": { + "owner": "srid", + "repo": "flake-outputs", + "type": "github" + } + }, "flake-parts": { "inputs": { "nixpkgs-lib": "nixpkgs-lib" @@ -219,11 +203,11 @@ "nixpkgs-lib": "nixpkgs-lib_4" }, "locked": { - "lastModified": 1678379998, - "narHash": "sha256-TZdfNqftHhDuIFwBcN9MUThx5sQXCTeZk9je5byPKRw=", + "lastModified": 1679737941, + "narHash": "sha256-srSD9CwsVPnUMsIZ7Kt/UegkKUEBcTyU1Rev7mO45S0=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "c13d60b89adea3dc20704c045ec4d50dd964d447", + "rev": "3502ee99d6dade045bdeaf7b0cd8ec703484c25c", "type": "github" }, "original": { @@ -296,6 +280,21 @@ } }, "flake-utils_3": { + "locked": { + "lastModified": 1659877975, + "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_4": { "locked": { "lastModified": 1623875721, "narHash": "sha256-A8BU7bjS5GirpAUv4QA+QnJ4CceLHkcXdRp4xITDB0s=", @@ -310,7 +309,7 @@ "type": "github" } }, - "flake-utils_4": { + "flake-utils_5": { "locked": { "lastModified": 1659877975, "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", @@ -416,19 +415,15 @@ }, "jenkins-nix-ci": { "inputs": { - "deploy-rs": "deploy-rs", - "flake-parts": "flake-parts_4", - "jenkinsPlugins2nix": "jenkinsPlugins2nix", - "nixos-flake": "nixos-flake", - "nixpkgs": "nixpkgs_6", - "sops-nix": "sops-nix" + "flake-outputs": "flake-outputs", + "jenkinsPlugins2nix": "jenkinsPlugins2nix" }, "locked": { - "lastModified": 1679953801, - "narHash": "sha256-N/DvYtN8aXnrujpNypD1Pzu3B+Q1FLlAfUVGcsaqOdk=", + "lastModified": 1681310499, + "narHash": "sha256-F6UO1UWph1uOb0/FnwHcPICbqk/ef4T6H/mddBrgIAM=", "owner": "juspay", "repo": "jenkins-nix-ci", - "rev": "358f0f400ec6976209e87b2c2ec24ff52e6a93d8", + "rev": "f4e51d15743fd44e6d2ba7eb2fdba90d4ce26f96", "type": "github" }, "original": { @@ -439,9 +434,9 @@ }, "jenkinsPlugins2nix": { "inputs": { - "flake-compat": "flake-compat_2", - "flake-utils": "flake-utils_3", - "nixpkgs": "nixpkgs_5" + "flake-compat": "flake-compat", + "flake-utils": "flake-utils_4", + "nixpkgs": "nixpkgs_6" }, "locked": { "lastModified": 1629079129, @@ -501,9 +496,9 @@ }, "nix-serve-ng": { "inputs": { - "flake-compat": "flake-compat_3", - "nixpkgs": "nixpkgs_8", - "utils": "utils_3" + "flake-compat": "flake-compat_2", + "nixpkgs": "nixpkgs_7", + "utils": "utils_2" }, "locked": { "lastModified": 1669427214, @@ -520,21 +515,6 @@ } }, "nixos-flake": { - "locked": { - "lastModified": 1679404711, - "narHash": "sha256-RNrCfkA9yGhuy3HrXY9NZsUg6yu8qcxwPoc9o9NwiI0=", - "owner": "srid", - "repo": "nixos-flake", - "rev": "0d1ae4383d9bc18fcd3857917616188f6ae61ff4", - "type": "github" - }, - "original": { - "owner": "srid", - "repo": "nixos-flake", - "type": "github" - } - }, - "nixos-flake_2": { "locked": { "lastModified": 1679328115, "narHash": "sha256-LHd+h6YY7ftxn8DpTjHLfsjh477KiGsD6ddulUpTvNQ=", @@ -566,7 +546,7 @@ }, "nixos-shell": { "inputs": { - "nixpkgs": "nixpkgs_9" + "nixpkgs": "nixpkgs_8" }, "locked": { "lastModified": 1646257415, @@ -703,7 +683,7 @@ "nixpkgs-match": { "inputs": { "flake-parts": "flake-parts_5", - "nixpkgs": "nixpkgs_11" + "nixpkgs": "nixpkgs_10" }, "locked": { "lastModified": 1672924430, @@ -735,39 +715,7 @@ "type": "github" } }, - "nixpkgs-stable_2": { - "locked": { - "lastModified": 1679748960, - "narHash": "sha256-BP8XcYHyj1NxQi04RpyNW8e7KiXSoI+Fy1tXIK2GfdA=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "da26ae9f6ce2c9ab380c0f394488892616fc5a6a", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "release-22.11", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_10": { - "locked": { - "lastModified": 1680758185, - "narHash": "sha256-sCVWwfnk7zEX8Z+OItiH+pcSklrlsLZ4TJTtnxAYREw=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "0e19daa510e47a40e06257e205965f3b96ce0ac9", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_11": { "locked": { "lastModified": 1672756850, "narHash": "sha256-Smbq3+fitwA13qsTMeaaurv09/KVbZfW7m7lINwzDGA=", @@ -783,7 +731,7 @@ "type": "github" } }, - "nixpkgs_12": { + "nixpkgs_11": { "locked": { "lastModified": 1679793451, "narHash": "sha256-JafTtgMDATE8dZOImBhWMA9RCn9AP8FVOpN+9K/tTlg=", @@ -797,7 +745,7 @@ "type": "indirect" } }, - "nixpkgs_13": { + "nixpkgs_12": { "locked": { "lastModified": 1679734080, "narHash": "sha256-z846xfGLlon6t9lqUzlNtBOmsgQLQIZvR6Lt2dImk1M=", @@ -847,11 +795,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1671417167, - "narHash": "sha256-JkHam6WQOwZN1t2C2sbp1TqMv3TVRjzrdoejqfefwrM=", + "lastModified": 1680151711, + "narHash": "sha256-7vMCXF4t7E07C1jDNzLMDXvPDAuDjNFMX3Zin+8nYY4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "bb31220cca6d044baa6dc2715b07497a2a7c4bc7", + "rev": "e608c90a1cf381dde6ac9e0f085337150f2af3e2", "type": "github" }, "original": { @@ -862,6 +810,20 @@ } }, "nixpkgs_5": { + "locked": { + "lastModified": 1679793451, + "narHash": "sha256-JafTtgMDATE8dZOImBhWMA9RCn9AP8FVOpN+9K/tTlg=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "0cd51a933d91078775b300cf0f29aa3495231aa2", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, + "nixpkgs_6": { "locked": { "lastModified": 1622516815, "narHash": "sha256-ZjBd81a6J3TwtlBr3rHsZspYUwT9OdhDk+a/SgSEf7I=", @@ -877,39 +839,7 @@ "type": "github" } }, - "nixpkgs_6": { - "locked": { - "lastModified": 1679172431, - "narHash": "sha256-XEh5gIt5otaUbEAPUY5DILUTyWe1goAyeqQtmwaFPyI=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "1603d11595a232205f03d46e635d919d1e1ec5b9", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_7": { - "locked": { - "lastModified": 1679734080, - "narHash": "sha256-z846xfGLlon6t9lqUzlNtBOmsgQLQIZvR6Lt2dImk1M=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "dbf5322e93bcc6cfc52268367a8ad21c09d76fea", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_8": { "locked": { "lastModified": 1669391192, "narHash": "sha256-f/2TqduZWcdq/pPddu1E7plNmcOuzt1IN4Fh3LSUKmM=", @@ -925,7 +855,7 @@ "type": "github" } }, - "nixpkgs_9": { + "nixpkgs_8": { "locked": { "lastModified": 1628465643, "narHash": "sha256-QSNw9bDq9uGUniQQtakRuw4m21Jxugm23SXLVgEV4DM=", @@ -940,11 +870,46 @@ "type": "indirect" } }, + "nixpkgs_9": { + "locked": { + "lastModified": 1680758185, + "narHash": "sha256-sCVWwfnk7zEX8Z+OItiH+pcSklrlsLZ4TJTtnxAYREw=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "0e19daa510e47a40e06257e205965f3b96ce0ac9", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nuenv": { "inputs": { - "nixpkgs": "nixpkgs_12", + "nixpkgs": "nixpkgs_5", "rust-overlay": "rust-overlay" }, + "locked": { + "lastModified": 1680179528, + "narHash": "sha256-Ax88cHZt90fG/IHjkdXXfuCcks1rpBxge3m/LuInDMg=", + "owner": "DeterminateSystems", + "repo": "nuenv", + "rev": "8f654fae8465aa8dbf1219e5430710c328392e0b", + "type": "github" + }, + "original": { + "owner": "DeterminateSystems", + "repo": "nuenv", + "type": "github" + } + }, + "nuenv_2": { + "inputs": { + "nixpkgs": "nixpkgs_11", + "rust-overlay": "rust-overlay_2" + }, "locked": { "lastModified": 1680273459, "narHash": "sha256-HqD+HJUKvofCAFrQWj1D8m4g8aAWT6m37BK2mhCLX94=", @@ -992,20 +957,44 @@ "jenkins-nix-ci": "jenkins-nix-ci", "nix-darwin": "nix-darwin_2", "nix-serve-ng": "nix-serve-ng", - "nixos-flake": "nixos-flake_2", + "nixos-flake": "nixos-flake", "nixos-hardware": "nixos-hardware", "nixos-shell": "nixos-shell", "nixos-vscode-server": "nixos-vscode-server", - "nixpkgs": "nixpkgs_10", + "nixpkgs": "nixpkgs_9", "nixpkgs-match": "nixpkgs-match", - "nuenv": "nuenv", - "sops-nix": "sops-nix_2", + "nuenv": "nuenv_2", + "sops-nix": "sops-nix", "zk-nvim": "zk-nvim" } }, "rust-overlay": { "inputs": { - "flake-utils": "flake-utils_4", + "flake-utils": "flake-utils_3", + "nixpkgs": [ + "jenkins-nix-ci", + "flake-outputs", + "nuenv", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1679970108, + "narHash": "sha256-8OfySbY1hhBzj0Iz90k4se6oFCGS3+ke31vkd0d4k/o=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "26ef1a2029239e204e51ab3402f8aae5aa1187ed", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, + "rust-overlay_2": { + "inputs": { + "flake-utils": "flake-utils_5", "nixpkgs": [ "nuenv", "nixpkgs" @@ -1027,7 +1016,7 @@ }, "sops-nix": { "inputs": { - "nixpkgs": "nixpkgs_7", + "nixpkgs": "nixpkgs_12", "nixpkgs-stable": "nixpkgs-stable" }, "locked": { @@ -1044,25 +1033,6 @@ "type": "github" } }, - "sops-nix_2": { - "inputs": { - "nixpkgs": "nixpkgs_13", - "nixpkgs-stable": "nixpkgs-stable_2" - }, - "locked": { - "lastModified": 1679799335, - "narHash": "sha256-YrnDyftm0Mk4JLuw3sDBPNfSjk054N0dqQx8FW4JqDM=", - "owner": "Mic92", - "repo": "sops-nix", - "rev": "4740f80ca6e756915aaaa0a9c5fbb61ba09cc145", - "type": "github" - }, - "original": { - "owner": "Mic92", - "repo": "sops-nix", - "type": "github" - } - }, "treefmt-nix": { "locked": { "lastModified": 1672170030, @@ -1108,21 +1078,6 @@ "type": "github" } }, - "utils_3": { - "locked": { - "lastModified": 1667395993, - "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "zk-nvim": { "flake": false, "locked": { diff --git a/nixos/jenkins.nix b/nixos/jenkins.nix index c6e0094..e07c782 100644 --- a/nixos/jenkins.nix +++ b/nixos/jenkins.nix @@ -14,6 +14,8 @@ "workflow-aggregator" "ssh-slaves" "configuration-as-code" + "pipeline-graph-view" + "pipeline-utility-steps" ]; plugins-file = "nixos/jenkins/plugins.nix"; @@ -21,6 +23,7 @@ cachix.enable = true; docker.enable = true; githubApp.enable = true; + nix.enable = true; }; }; diff --git a/nixos/jenkins/plugins.nix b/nixos/jenkins/plugins.nix index c801e30..4680721 100644 --- a/nixos/jenkins/plugins.nix +++ b/nixos/jenkins/plugins.nix @@ -122,8 +122,8 @@ configuration-as-code = mkJenkinsPlugin { name = "configuration-as-code"; src = fetchurl { - url = "https://updates.jenkins-ci.org/download/plugins/configuration-as-code/1616.v11393eccf675/configuration-as-code.hpi"; - sha256 = "0ee4caff28f4df2faea0b71698d93bfc0a0e3fc1a61226d4ada1c8a9af0fa1d6"; + url = "https://updates.jenkins-ci.org/download/plugins/configuration-as-code/1625.v27444588cc3d/configuration-as-code.hpi"; + sha256 = "413a8a73982f2e87dc3a55110ab8d8f292f4b6b5508de21f4fbae6c7005f2ecf"; }; }; credentials = mkJenkinsPlugin { @@ -381,15 +381,29 @@ pipeline-build-step = mkJenkinsPlugin { name = "pipeline-build-step"; src = fetchurl { - url = "https://updates.jenkins-ci.org/download/plugins/pipeline-build-step/487.va_823138eee8b_/pipeline-build-step.hpi"; - sha256 = "01db32de84bd43857590788a9cca2f60578f5c67fdb3816eab46b3eda7594774"; + url = "https://updates.jenkins-ci.org/download/plugins/pipeline-build-step/488.v8993df156e8d/pipeline-build-step.hpi"; + sha256 = "e546e1443229a93cd9adcf05033f499b12cda0b29156974fb5e5e98a5f57e795"; + }; + }; + pipeline-graph-analysis = mkJenkinsPlugin { + name = "pipeline-graph-analysis"; + src = fetchurl { + url = "https://updates.jenkins-ci.org/download/plugins/pipeline-graph-analysis/202.va_d268e64deb_3/pipeline-graph-analysis.hpi"; + sha256 = "3ea34acec187c036d5e688192dcd75e70fc1c6b1018969c1c04ae7f1e6bb3410"; + }; + }; + pipeline-graph-view = mkJenkinsPlugin { + name = "pipeline-graph-view"; + src = fetchurl { + url = "https://updates.jenkins-ci.org/download/plugins/pipeline-graph-view/183.v9e27732d970f/pipeline-graph-view.hpi"; + sha256 = "b59c385a5ae48db674e6d060f85da453b1141e98f8ca81b017bdd8ca6f1cf67f"; }; }; pipeline-groovy-lib = mkJenkinsPlugin { name = "pipeline-groovy-lib"; src = fetchurl { - url = "https://updates.jenkins-ci.org/download/plugins/pipeline-groovy-lib/629.vb_5627b_ee2104/pipeline-groovy-lib.hpi"; - sha256 = "f8a10d0784b6548678ba6758effc1267df0fa62fa86191648355c303cd042746"; + url = "https://updates.jenkins-ci.org/download/plugins/pipeline-groovy-lib/656.va_a_ceeb_6ffb_f7/pipeline-groovy-lib.hpi"; + sha256 = "80648aa71176b01695886288a89c56487ad9195ea678a4cdd033c69b7147e026"; }; }; pipeline-input-step = mkJenkinsPlugin { @@ -441,6 +455,13 @@ sha256 = "fd2b092b8472f24bbbba3b95477782fd1aece3e6e64382461b94da1821d04350"; }; }; + pipeline-utility-steps = mkJenkinsPlugin { + name = "pipeline-utility-steps"; + src = fetchurl { + url = "https://updates.jenkins-ci.org/download/plugins/pipeline-utility-steps/2.15.1/pipeline-utility-steps.hpi"; + sha256 = "cf415612a7fe9f6f3155a50b751ebf71bfa1a72c0a7b889105bb4c2df059c260"; + }; + }; plain-credentials = mkJenkinsPlugin { name = "plain-credentials"; src = fetchurl { @@ -598,22 +619,22 @@ workflow-cps = mkJenkinsPlugin { name = "workflow-cps"; src = fetchurl { - url = "https://updates.jenkins-ci.org/download/plugins/workflow-cps/3641.vf58904a_b_b_5d8/workflow-cps.hpi"; - sha256 = "e2d62c1dd6d2d51b3cf1d3bff9901052dfca3f0f0da5b4df670cc7c7b4379771"; + url = "https://updates.jenkins-ci.org/download/plugins/workflow-cps/3653.v07ea_433c90b_4/workflow-cps.hpi"; + sha256 = "7e9d151fd51747f2727274044113dd939255e136eb2c3f3d26d9243ebe153f64"; }; }; workflow-durable-task-step = mkJenkinsPlugin { name = "workflow-durable-task-step"; src = fetchurl { - url = "https://updates.jenkins-ci.org/download/plugins/workflow-durable-task-step/1234.v019404b_3832a/workflow-durable-task-step.hpi"; - sha256 = "d3a1eebc10aece2a9c5cafd3c4c457d641dc201cf92b86ef80ae0e151ea11507"; + url = "https://updates.jenkins-ci.org/download/plugins/workflow-durable-task-step/1241.v1a_63e465f943/workflow-durable-task-step.hpi"; + sha256 = "e59161dc69c6189ffb6dd2c5a0e8603a7b1861d7a7b09ed1c2b5e025a9fa73d5"; }; }; workflow-job = mkJenkinsPlugin { name = "workflow-job"; src = fetchurl { - url = "https://updates.jenkins-ci.org/download/plugins/workflow-job/1284.v2fe8ed4573d4/workflow-job.hpi"; - sha256 = "c1eda23a02c4599b209901cd8340bc705e472432a73337b8d6e01b329ca3f3f2"; + url = "https://updates.jenkins-ci.org/download/plugins/workflow-job/1289.vd1c337fd5354/workflow-job.hpi"; + sha256 = "5bd44193b84159d118ee8aa0fd163d8d4a7aa062f113f9043a2a5c0e9938c617"; }; }; workflow-multibranch = mkJenkinsPlugin {