From 30609333b9771ac432194e8a075362ba94416732 Mon Sep 17 00:00:00 2001 From: TheSola10 Date: Fri, 15 Sep 2023 11:17:38 +0200 Subject: [PATCH] Fixed #11 and bumped Nixpkgs --- builder/default.nix | 2 +- builder/nixie/__init__.py | 2 +- builder/pyproject.toml | 2 +- flake.lock | 30 ++++++++++++++++++++++++------ static-bins/default.nix | 5 ++--- 5 files changed, 29 insertions(+), 12 deletions(-) diff --git a/builder/default.nix b/builder/default.nix index a4355f3..933f781 100644 --- a/builder/default.nix +++ b/builder/default.nix @@ -1,7 +1,7 @@ { lib, python3Packages, fetchPypi, nix-index, nix, ... }: let - nixie_ver = "2023.09-a0"; + nixie_ver = "2023.09-a1"; pzp = python3Packages.buildPythonPackage rec { pname = "pzp"; version = "0.0.22"; diff --git a/builder/nixie/__init__.py b/builder/nixie/__init__.py index 33d1410..eae2074 100644 --- a/builder/nixie/__init__.py +++ b/builder/nixie/__init__.py @@ -3,4 +3,4 @@ This is the Nixie tool for setting up Nixie in a Git repository. ''' -__version__ = '2023.09-a0' +__version__ = '2023.09-a1' diff --git a/builder/pyproject.toml b/builder/pyproject.toml index 00e5551..cc0ef4f 100644 --- a/builder/pyproject.toml +++ b/builder/pyproject.toml @@ -26,7 +26,7 @@ nixie = "nixie.cli:main" "nixie.output" = ["*.in"] [tool.bumpver] -current_version = "2023.09-a0" +current_version = "2023.09-a1" version_pattern = "YYYY.0M-PYTAGNUM" commit_message = "bump version {old_version} -> {new_version}" commit = true diff --git a/flake.lock b/flake.lock index 516b7d7..f39dc1e 100644 --- a/flake.lock +++ b/flake.lock @@ -24,12 +24,15 @@ } }, "flake-utils": { + "inputs": { + "systems": "systems" + }, "locked": { - "lastModified": 1676283394, - "narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=", + "lastModified": 1694529238, + "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", "owner": "numtide", "repo": "flake-utils", - "rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073", + "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", "type": "github" }, "original": { @@ -79,11 +82,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1676997914, - "narHash": "sha256-//iV9iLIsJ0zrPrCl4+6/bReZ9Up8xJaLrKjWbwwv9M=", + "lastModified": 1694767346, + "narHash": "sha256-5uH27SiVFUwsTsqC5rs3kS7pBoNhtoy9QfTP9BmknGk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "38593bc3c0ee89bbee1ee58519e7585a356850c6", + "rev": "ace5093e36ab1e95cb9463863491bee90d5a4183", "type": "github" }, "original": { @@ -115,6 +118,21 @@ "nix": "nix", "nixpkgs": "nixpkgs" } + }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } } }, "root": "root", diff --git a/static-bins/default.nix b/static-bins/default.nix index 3d98be1..39c47f7 100644 --- a/static-bins/default.nix +++ b/static-bins/default.nix @@ -25,9 +25,8 @@ let ]; systemsPkgs = map (s: - let parsedSystem = pkgs.lib.systems.parse.mkSystemFromString s; - in import nixpkgs ({ localSystem = s; } - // (if parsedSystem.kernel.name == "darwin" + import nixpkgs ({ localSystem = s; } + // (if s == "x86_64-darwin" then { overlays = [ (import ./nixpkgs-darwin-static.nix) ];