From 7a313a8eca789aab4b5557078e6ddb76d4740918 Mon Sep 17 00:00:00 2001 From: Jairo Llopis Date: Mon, 27 Nov 2023 08:40:44 +0000 Subject: [PATCH] build(nix): update flake inputs Includes https://github.com/nix-community/poetry2nix/pull/1428 and many other thousands of changes. --- .github/workflows/ci.yml | 2 +- flake.lock | 96 +++++++++++++++++++++++----------------- flake.nix | 4 +- 3 files changed, 59 insertions(+), 43 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2943fc271..a333d5433 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -125,7 +125,7 @@ jobs: - run: copier --version # Run nix checks - - run: nix flake check -L + - run: nix flake check -L --accept-flake-config publish: if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/') diff --git a/flake.lock b/flake.lock index f79c0eb5d..fe600f3b6 100644 --- a/flake.lock +++ b/flake.lock @@ -41,11 +41,11 @@ "flake-compat_2": { "flake": false, "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", "owner": "edolstra", "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", "type": "github" }, "original": { @@ -92,11 +92,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1689068808, - "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=", + "lastModified": 1694529238, + "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", "owner": "numtide", "repo": "flake-utils", - "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4", + "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", "type": "github" }, "original": { @@ -107,11 +107,7 @@ }, "gitignore": { "inputs": { - "nixpkgs": [ - "devenv", - "pre-commit-hooks", - "nixpkgs" - ] + "nixpkgs": ["devenv", "pre-commit-hooks", "nixpkgs"] }, "locked": { "lastModified": 1660459072, @@ -146,10 +142,7 @@ "nix": { "inputs": { "lowdown-src": "lowdown-src", - "nixpkgs": [ - "devenv", - "nixpkgs" - ], + "nixpkgs": ["devenv", "nixpkgs"], "nixpkgs-regression": "nixpkgs-regression" }, "locked": { @@ -169,17 +162,14 @@ }, "nix-github-actions": { "inputs": { - "nixpkgs": [ - "poetry2nix", - "nixpkgs" - ] + "nixpkgs": ["poetry2nix", "nixpkgs"] }, "locked": { - "lastModified": 1688870561, - "narHash": "sha256-4UYkifnPEw1nAzqqPOTL2MvWtm3sNGw1UTYTalkTcGY=", + "lastModified": 1698974481, + "narHash": "sha256-yPncV9Ohdz1zPZxYHQf47S8S0VrnhV7nNhCawY46hDA=", "owner": "nix-community", "repo": "nix-github-actions", - "rev": "165b1650b753316aa7f1787f3005a8d2da0f5301", + "rev": "4bb5e752616262457bc7ca5882192a564c0472d2", "type": "github" }, "original": { @@ -238,16 +228,16 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1696148245, - "narHash": "sha256-WhUH+ya0x4JUn8T7x3IvKNU+zs1B8LRqr4LCA70n2+k=", + "lastModified": 1701069268, + "narHash": "sha256-DUotrFaAqFMze0+K1fttMzKyq8RTQapzcbjVkYnsNeM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "96c84127d72c3b9f002cc072629ab96bc5531717", + "rev": "45be9e40f50c6cff87b24342cf54559640a833cb", "type": "github" }, "original": { "owner": "NixOS", - "ref": "release-23.05", + "ref": "release-23.11", "repo": "nixpkgs", "type": "github" } @@ -256,16 +246,16 @@ "inputs": { "flake-utils": "flake-utils_3", "nix-github-actions": "nix-github-actions", - "nixpkgs": [ - "nixpkgs" - ] + "nixpkgs": ["nixpkgs"], + "systems": "systems_3", + "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1697895523, - "narHash": "sha256-RYv4JbchRkzWv1KRuWhHe1pNw+0H40NQAI5aqYwelMM=", + "lastModified": 1701038883, + "narHash": "sha256-gF/OTqn7LYsSNHKmk8Ijq0d3uSJWRNtxMoNz3MOzagA=", "owner": "nix-community", "repo": "poetry2nix", - "rev": "8ffbc64abe7f432882cb5d96941c39103622ae5e", + "rev": "add5dfd40aba10fb6dc82b6abf9495fdf9f33427", "type": "github" }, "original": { @@ -276,16 +266,10 @@ }, "pre-commit-hooks": { "inputs": { - "flake-compat": [ - "devenv", - "flake-compat" - ], + "flake-compat": ["devenv", "flake-compat"], "flake-utils": "flake-utils", "gitignore": "gitignore", - "nixpkgs": [ - "devenv", - "nixpkgs" - ], + "nixpkgs": ["devenv", "nixpkgs"], "nixpkgs-stable": "nixpkgs-stable" }, "locked": { @@ -340,6 +324,38 @@ "repo": "default", "type": "github" } + }, + "systems_3": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "id": "systems", + "type": "indirect" + } + }, + "treefmt-nix": { + "inputs": { + "nixpkgs": ["poetry2nix", "nixpkgs"] + }, + "locked": { + "lastModified": 1699786194, + "narHash": "sha256-3h3EH1FXQkIeAuzaWB+nK0XK54uSD46pp+dMD3gAcB4=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "e82f32aa7f06bbbd56d7b12186d555223dc399d1", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index eb8a40678..8bcea7160 100644 --- a/flake.nix +++ b/flake.nix @@ -20,7 +20,7 @@ flake = false; }; flake-utils.url = github:numtide/flake-utils; - nixpkgs.url = github:NixOS/nixpkgs/release-23.05; + nixpkgs.url = github:NixOS/nixpkgs/release-23.11; poetry2nix.url = github:nix-community/poetry2nix; poetry2nix.inputs.nixpkgs.follows = "nixpkgs"; }; @@ -35,7 +35,7 @@ // flake-utils.lib.eachDefaultSystem (system: let pkgs = import nixpkgs { inherit system; - overlays = [poetry2nix.overlay]; + overlays = [poetry2nix.overlays.default]; }; lastRelease = (pkgs.lib.importTOML ./pyproject.toml).tool.commitizen.version; version = "${lastRelease}.dev${self.sourceInfo.lastModifiedDate}+nix-git-${self.sourceInfo.shortRev or "dirty"}";