From bf1da61606a0075fd3f646e074abdfcd24deaadf Mon Sep 17 00:00:00 2001 From: Sridhar Ratnakumar Date: Sun, 29 Oct 2023 12:49:02 -0400 Subject: [PATCH] Use latest nixci --- flake.lock | 423 +++++++++++++++++++++++++++++++++++++++---- flake.nix | 1 + nixos/nix.nix | 2 +- packages/overlay.nix | 3 + 4 files changed, 388 insertions(+), 41 deletions(-) diff --git a/flake.lock b/flake.lock index d01da73..aac53d8 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,20 @@ { "nodes": { + "cargo-doc-live": { + "locked": { + "lastModified": 1692743000, + "narHash": "sha256-7lxG/r72hECceIir+Y+N3vM0f7FcudZD5cq+KhZj4MI=", + "owner": "srid", + "repo": "cargo-doc-live", + "rev": "575b9d0733cac0448219d7bc5746ebd594baedb5", + "type": "github" + }, + "original": { + "owner": "srid", + "repo": "cargo-doc-live", + "type": "github" + } + }, "check-flake": { "locked": { "lastModified": 1662502605, @@ -31,6 +46,30 @@ "type": "github" } }, + "crane": { + "inputs": { + "flake-compat": "flake-compat_4", + "flake-utils": "flake-utils_5", + "nixpkgs": [ + "nixci", + "nixpkgs" + ], + "rust-overlay": "rust-overlay_2" + }, + "locked": { + "lastModified": 1693787605, + "narHash": "sha256-rwq5U8dy+a9JFny/73L0SJu1GfWwATMPMTp7D+mjHy8=", + "owner": "ipetkov", + "repo": "crane", + "rev": "8b4f7a4dab2120cf41e7957a28a853f45016bd9d", + "type": "github" + }, + "original": { + "owner": "ipetkov", + "repo": "crane", + "type": "github" + } + }, "devour-flake": { "flake": false, "locked": { @@ -47,6 +86,23 @@ "type": "github" } }, + "devour-flake_2": { + "flake": false, + "locked": { + "lastModified": 1694098737, + "narHash": "sha256-O51F4YFOzlaQAc9b6xjkAqpvrvCtw/Os2M7TU0y4SKQ=", + "owner": "srid", + "repo": "devour-flake", + "rev": "30a34036b29b0d12989ef6c8be77aa949d85aef5", + "type": "github" + }, + "original": { + "owner": "srid", + "ref": "master", + "repo": "devour-flake", + "type": "github" + } + }, "disko": { "inputs": { "nixpkgs": [ @@ -323,6 +379,22 @@ "type": "github" } }, + "flake-compat_4": { + "flake": false, + "locked": { + "lastModified": 1673956053, + "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "flake-outputs": { "inputs": { "flake-parts": "flake-parts_3", @@ -401,6 +473,24 @@ "inputs": { "nixpkgs-lib": "nixpkgs-lib_4" }, + "locked": { + "lastModified": 1688466019, + "narHash": "sha256-VeM2akYrBYMsb4W/MmBo1zmaMfgbL4cH3Pu8PGyIwJ0=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "8e8d955c22df93dbe24f19ea04f47a74adbdc5ec", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_5": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib_5" + }, "locked": { "lastModified": 1685662779, "narHash": "sha256-cKDDciXGpMEjP1n6HlzKinN0H+oLmNpgeCTzYnsA2po=", @@ -415,9 +505,9 @@ "type": "github" } }, - "flake-parts_5": { + "flake-parts_6": { "inputs": { - "nixpkgs-lib": "nixpkgs-lib_5" + "nixpkgs-lib": "nixpkgs-lib_6" }, "locked": { "lastModified": 1672877861, @@ -518,6 +608,24 @@ "inputs": { "systems": "systems_3" }, + "locked": { + "lastModified": 1692799911, + "narHash": "sha256-3eihraek4qL744EvQXsK1Ha6C3CR7nnT8X2qWap4RNk=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "f9e7cf818399d17d347f847525c5a5a8032e4e44", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_6": { + "inputs": { + "systems": "systems_4" + }, "locked": { "lastModified": 1681202837, "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", @@ -532,7 +640,25 @@ "type": "github" } }, - "flake-utils_6": { + "flake-utils_7": { + "inputs": { + "systems": "systems_6" + }, + "locked": { + "lastModified": 1681202837, + "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "cfacdce06f30d2b68473a46042957675eebb3401", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_8": { "locked": { "lastModified": 1659877975, "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", @@ -769,10 +895,36 @@ "type": "github" } }, + "nixci": { + "inputs": { + "cargo-doc-live": "cargo-doc-live", + "crane": "crane", + "devour-flake": "devour-flake_2", + "flake-parts": "flake-parts_4", + "nixpkgs": "nixpkgs_8", + "process-compose-flake": "process-compose-flake", + "rust-overlay": "rust-overlay_3", + "systems": "systems_5", + "treefmt-nix": "treefmt-nix_2" + }, + "locked": { + "lastModified": 1698598109, + "narHash": "sha256-LHLP4lixuvSBtH6NOmjdJXn74aYOx0xULKDo98P3dnk=", + "owner": "srid", + "repo": "nixci", + "rev": "49a15197c4d6258a50c1d7fad1c7465f36effd1f", + "type": "github" + }, + "original": { + "owner": "srid", + "repo": "nixci", + "type": "github" + } + }, "nixd": { "inputs": { - "flake-parts": "flake-parts_4", - "nixpkgs": "nixpkgs_8" + "flake-parts": "flake-parts_5", + "nixpkgs": "nixpkgs_11" }, "locked": { "lastModified": 1687572024, @@ -821,7 +973,7 @@ }, "nixos-shell": { "inputs": { - "nixpkgs": "nixpkgs_9" + "nixpkgs": "nixpkgs_12" }, "locked": { "lastModified": 1646257415, @@ -839,8 +991,8 @@ }, "nixos-vscode-server": { "inputs": { - "flake-utils": "flake-utils_5", - "nixpkgs": "nixpkgs_10" + "flake-utils": "flake-utils_7", + "nixpkgs": "nixpkgs_13" }, "locked": { "lastModified": 1684517665, @@ -927,6 +1079,24 @@ } }, "nixpkgs-lib_4": { + "locked": { + "dir": "lib", + "lastModified": 1688049487, + "narHash": "sha256-100g4iaKC9MalDjUW9iN6Jl/OocTDtXdeAj7pEGIRh4=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "4bc72cae107788bf3f24f30db2e2f685c9298dc9", + "type": "github" + }, + "original": { + "dir": "lib", + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-lib_5": { "locked": { "dir": "lib", "lastModified": 1685564631, @@ -944,7 +1114,7 @@ "type": "github" } }, - "nixpkgs-lib_5": { + "nixpkgs-lib_6": { "locked": { "dir": "lib", "lastModified": 1672350804, @@ -964,8 +1134,8 @@ }, "nixpkgs-match": { "inputs": { - "flake-parts": "flake-parts_5", - "nixpkgs": "nixpkgs_12" + "flake-parts": "flake-parts_6", + "nixpkgs": "nixpkgs_15" }, "locked": { "lastModified": 1672924430, @@ -1014,6 +1184,53 @@ } }, "nixpkgs_10": { + "locked": { + "lastModified": 1680945546, + "narHash": "sha256-8FuaH5t/aVi/pR1XxnF0qi4WwMYC+YxlfdsA0V+TEuQ=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "d9f759f2ea8d265d974a6e1259bd510ac5844c5d", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_11": { + "locked": { + "lastModified": 1686398752, + "narHash": "sha256-nGWNQVhSw4VSL+S0D0cbrNR9vs9Bq7rlYR+1K5f5j6w=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "a30520bf8eabf8a5c37889d661e67a2dbcaa59e6", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_12": { + "locked": { + "lastModified": 1628465643, + "narHash": "sha256-QSNw9bDq9uGUniQQtakRuw4m21Jxugm23SXLVgEV4DM=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "6ef4f522d63f22b40004319778761040d3197390", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "ref": "nixos-unstable", + "type": "indirect" + } + }, + "nixpkgs_13": { "locked": { "lastModified": 1682526928, "narHash": "sha256-2cKh4O6t1rQ8Ok+v16URynmb0rV7oZPEbXkU0owNLQs=", @@ -1026,7 +1243,7 @@ "type": "indirect" } }, - "nixpkgs_11": { + "nixpkgs_14": { "locked": { "lastModified": 1698318101, "narHash": "sha256-gUihHt3yPD7bVqg+k/UVHgngyaJ3DMEBchbymBMvK1E=", @@ -1042,7 +1259,7 @@ "type": "github" } }, - "nixpkgs_12": { + "nixpkgs_15": { "locked": { "lastModified": 1672756850, "narHash": "sha256-Smbq3+fitwA13qsTMeaaurv09/KVbZfW7m7lINwzDGA=", @@ -1058,7 +1275,7 @@ "type": "github" } }, - "nixpkgs_13": { + "nixpkgs_16": { "locked": { "lastModified": 1679793451, "narHash": "sha256-JafTtgMDATE8dZOImBhWMA9RCn9AP8FVOpN+9K/tTlg=", @@ -1072,7 +1289,7 @@ "type": "indirect" } }, - "nixpkgs_14": { + "nixpkgs_17": { "locked": { "lastModified": 1683475240, "narHash": "sha256-sy6MYoCaIZsOenYplbzVXI4Ce9Bp/vIOpuFa97+a6wc=", @@ -1088,7 +1305,7 @@ "type": "github" } }, - "nixpkgs_15": { + "nixpkgs_18": { "locked": { "lastModified": 1680945546, "narHash": "sha256-8FuaH5t/aVi/pR1XxnF0qi4WwMYC+YxlfdsA0V+TEuQ=", @@ -1199,11 +1416,27 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1686398752, - "narHash": "sha256-nGWNQVhSw4VSL+S0D0cbrNR9vs9Bq7rlYR+1K5f5j6w=", + "lastModified": 1688590700, + "narHash": "sha256-ZF055rIUP89cVwiLpG5xkJzx00gEuuGFF60Bs/LM3wc=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "f292b4964cb71f9dfbbd30dc9f511d6165cd109b", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_9": { + "locked": { + "lastModified": 1681358109, + "narHash": "sha256-eKyxW4OohHQx9Urxi7TQlFBTDWII+F+x2hklDOQPB50=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a30520bf8eabf8a5c37889d661e67a2dbcaa59e6", + "rev": "96ba1c52e54e74c3197f4d43026b3f3d92e83ff9", "type": "github" }, "original": { @@ -1213,21 +1446,6 @@ "type": "github" } }, - "nixpkgs_9": { - "locked": { - "lastModified": 1628465643, - "narHash": "sha256-QSNw9bDq9uGUniQQtakRuw4m21Jxugm23SXLVgEV4DM=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "6ef4f522d63f22b40004319778761040d3197390", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "ref": "nixos-unstable", - "type": "indirect" - } - }, "nose": { "flake": false, "locked": { @@ -1265,8 +1483,8 @@ }, "nuenv_2": { "inputs": { - "nixpkgs": "nixpkgs_13", - "rust-overlay": "rust-overlay_2" + "nixpkgs": "nixpkgs_16", + "rust-overlay": "rust-overlay_4" }, "locked": { "lastModified": 1680273459, @@ -1362,6 +1580,21 @@ "type": "github" } }, + "process-compose-flake": { + "locked": { + "lastModified": 1693927910, + "narHash": "sha256-qPKHnWWzHS2bAi/SsFePQkGFeC2E1jklUjEidfQwYLc=", + "owner": "Platonic-Systems", + "repo": "process-compose-flake", + "rev": "5494afa0b6a7bc4ccf82ef1c36fe1fcdb4217255", + "type": "github" + }, + "original": { + "owner": "Platonic-Systems", + "repo": "process-compose-flake", + "type": "github" + } + }, "revealjs": { "flake": false, "locked": { @@ -1390,16 +1623,17 @@ "nix-darwin": "nix-darwin", "nix-doom-emacs": "nix-doom-emacs", "nix-serve-ng": "nix-serve-ng", + "nixci": "nixci", "nixd": "nixd", "nixos-flake": "nixos-flake", "nixos-hardware": "nixos-hardware", "nixos-shell": "nixos-shell", "nixos-vscode-server": "nixos-vscode-server", - "nixpkgs": "nixpkgs_11", + "nixpkgs": "nixpkgs_14", "nixpkgs-match": "nixpkgs-match", "nuenv": "nuenv_2", "sops-nix": "sops-nix", - "treefmt-nix": "treefmt-nix_2", + "treefmt-nix": "treefmt-nix_3", "zk-nvim": "zk-nvim" } }, @@ -1444,8 +1678,54 @@ } }, "rust-overlay_2": { + "inputs": { + "flake-utils": [ + "nixci", + "crane", + "flake-utils" + ], + "nixpkgs": [ + "nixci", + "crane", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1693707092, + "narHash": "sha256-HR1EnynBSPqbt+04/yxxqsG1E3n6uXrOl7SPco/UnYo=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "98ccb73e6eefc481da6039ee57ad8818d1ca8d56", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, + "rust-overlay_3": { "inputs": { "flake-utils": "flake-utils_6", + "nixpkgs": "nixpkgs_9" + }, + "locked": { + "lastModified": 1694052649, + "narHash": "sha256-+eBEU3dw3/fCfi8ZHFNutINxehMazGkQxqNcpeNbTo4=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "a795148ffbcc77f2b592d50ceebe36147e623a77", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, + "rust-overlay_4": { + "inputs": { + "flake-utils": "flake-utils_8", "nixpkgs": [ "nuenv", "nixpkgs" @@ -1483,7 +1763,7 @@ }, "sops-nix": { "inputs": { - "nixpkgs": "nixpkgs_14", + "nixpkgs": "nixpkgs_17", "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { @@ -1546,6 +1826,51 @@ "type": "github" } }, + "systems_4": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_5": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_6": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "treefmt-nix": { "locked": { "lastModified": 1672170030, @@ -1563,7 +1888,25 @@ }, "treefmt-nix_2": { "inputs": { - "nixpkgs": "nixpkgs_15" + "nixpkgs": "nixpkgs_10" + }, + "locked": { + "lastModified": 1688026376, + "narHash": "sha256-qJmkr9BWDpqblk4E9/rCsAEl39y2n4Ycw6KRopvpUcY=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "df3f32b0cc253dfc7009b7317e8f0e7ccd70b1cf", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } + }, + "treefmt-nix_3": { + "inputs": { + "nixpkgs": "nixpkgs_18" }, "locked": { "lastModified": 1689243103, diff --git a/flake.nix b/flake.nix index 8c7e190..e935df0 100644 --- a/flake.nix +++ b/flake.nix @@ -28,6 +28,7 @@ nixpkgs-match.url = "github:srid/nixpkgs-match"; nuenv.url = "github:DeterminateSystems/nuenv"; nixd.url = "github:nix-community/nixd"; + nixci.url = "github:srid/nixci"; # Emacs emacs-overlay.url = "github:nix-community/emacs-overlay"; diff --git a/nixos/nix.nix b/nixos/nix.nix index 65c09a8..7b65d7e 100644 --- a/nixos/nix.nix +++ b/nixos/nix.nix @@ -12,7 +12,7 @@ flake.inputs.nuenv.overlays.nuenv flake.inputs.nixd.overlays.default flake.inputs.nuenv.overlays.default - (import ../packages/overlay.nix) + (import ../packages/overlay.nix { inherit flake; inherit (pkgs) system; }) ]; }; diff --git a/packages/overlay.nix b/packages/overlay.nix index ee6d923..93f8d90 100644 --- a/packages/overlay.nix +++ b/packages/overlay.nix @@ -1,3 +1,6 @@ +{flake, system, ... }: + self: super: { fuckport = self.callPackage ./fuckport.nix { }; + nixci = flake.inputs.nixci.packages.${system}.default; }