From b3221d06291cbe902d75d7a5579754aaa93454eb Mon Sep 17 00:00:00 2001 From: Artemis Tosini Date: Sun, 14 Jul 2024 04:37:20 +0000 Subject: [PATCH] update nixpkgs, add workarounds --- flake.lock | 97 ++++++++++++++++++++--------------------------- sets/base.nix | 3 ++ sets/hardware.nix | 1 - sets/packages.nix | 6 +-- 4 files changed, 48 insertions(+), 59 deletions(-) diff --git a/flake.lock b/flake.lock index 31984fe..af7001d 100644 --- a/flake.lock +++ b/flake.lock @@ -63,11 +63,11 @@ ] }, "locked": { - "lastModified": 1719845423, - "narHash": "sha256-ZLHDmWAsHQQKnmfyhYSHJDlt8Wfjv6SQhl2qek42O7A=", + "lastModified": 1720845312, + "narHash": "sha256-yPhAsJTpyoIPQZJGC8Fw8W2lAXyhLoTn+HP20bmfkfk=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "ec12b88104d6c117871fad55e931addac4626756", + "rev": "5ce8503cf402cf76b203eba4b7e402bea8e44abc", "type": "github" }, "original": { @@ -128,22 +128,6 @@ "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz" } }, - "flake-compat_3": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, "flake-parts": { "inputs": { "nixpkgs-lib": [ @@ -173,11 +157,11 @@ ] }, "locked": { - "lastModified": 1719877454, - "narHash": "sha256-g5N1yyOSsPNiOlFfkuI/wcUjmtah+nxdImJqrSATjOU=", + "lastModified": 1719994518, + "narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "4e3583423212f9303aa1a6337f8dffb415920e4f", + "rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7", "type": "github" }, "original": { @@ -247,7 +231,10 @@ }, "git-hooks": { "inputs": { - "flake-compat": "flake-compat_3", + "flake-compat": [ + "nixvim", + "flake-compat" + ], "gitignore": "gitignore_2", "nixpkgs": [ "nixvim", @@ -259,11 +246,11 @@ ] }, "locked": { - "lastModified": 1719259945, - "narHash": "sha256-F1h+XIsGKT9TkGO3omxDLEb/9jOOsI6NnzsXFsZhry4=", + "lastModified": 1720524665, + "narHash": "sha256-ni/87oHPZm6Gv0ECYxr1f6uxB0UKBWJ6HvS7lwLU6oY=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "0ff4381bbb8f7a52ca4a851660fc7a437a4c6e07", + "rev": "8d6a17d0cdf411c55f12602624df6368ad86fac1", "type": "github" }, "original": { @@ -323,11 +310,11 @@ ] }, "locked": { - "lastModified": 1719992360, - "narHash": "sha256-SRq0ZRkqagqpMGVf4z9q9CIWRbPYjO7FTqSJyWh7nes=", + "lastModified": 1720734513, + "narHash": "sha256-neWQ8eNtLTd+YMesb7WjKl1SVCbDyCm46LUgP/g/hdo=", "owner": "nix-community", "repo": "home-manager", - "rev": "36e2f9da91ce8b63a549a47688ae60d47c50de4b", + "rev": "90ae324e2c56af10f20549ab72014804a3064c7f", "type": "github" }, "original": { @@ -344,11 +331,11 @@ ] }, "locked": { - "lastModified": 1719982578, - "narHash": "sha256-NBI3jN7NH784t+6XiEWvfIzxZnCqOBLCIIe9mbXHJ10=", + "lastModified": 1720697445, + "narHash": "sha256-IvFFc57vljkR1eP4VeNMuXJTS/POClq+ytFAadigSY0=", "owner": "jovian-experiments", "repo": "jovian-nixos", - "rev": "b4b7577219500b93d60d9d85781a8b6aeeff672c", + "rev": "bba994424596df09228f5437bcf8ef7fde1fe56e", "type": "github" }, "original": { @@ -389,11 +376,11 @@ "lix": { "flake": false, "locked": { - "lastModified": 1719959194, - "narHash": "sha256-iFIP240ZElHfAhv9xjSeYuHV0+PmL0yac6AaE80/Fdk=", - "rev": "45ac449d3970bc6abc4c04e0b3a3b6768a9cb753", + "lastModified": 1720825173, + "narHash": "sha256-YZ7043PFS6LalHAyGeO7qRLeZIevwjHRbbMkpixjwhM=", + "rev": "a8f443d96011c11ad726c2a28a37752bd56c12cc", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/45ac449d3970bc6abc4c04e0b3a3b6768a9cb753.tar.gz" + "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/a8f443d96011c11ad726c2a28a37752bd56c12cc.tar.gz" }, "original": { "type": "tarball", @@ -414,11 +401,11 @@ ] }, "locked": { - "lastModified": 1719353937, - "narHash": "sha256-86NBqDxAP20ET/UoKX0WvSItblNQ97czXb2q7lkMrwk=", - "rev": "5d9d94089fb1ca96222a34bfe245ef5c5ebefd37", + "lastModified": 1720695775, + "narHash": "sha256-8Oqzl9QPjEe/n8y0R2tC6+2v/H6xBgABHXOJwxmnBg0=", + "rev": "d70318fb946a0e720dfdd1fb10b0645c14e2a02a", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/5d9d94089fb1ca96222a34bfe245ef5c5ebefd37.tar.gz" + "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/d70318fb946a0e720dfdd1fb10b0645c14e2a02a.tar.gz" }, "original": { "type": "tarball", @@ -432,11 +419,11 @@ ] }, "locked": { - "lastModified": 1719832725, - "narHash": "sha256-dr8DkeS74KVNTgi8BE0BiUKALb+EKlMIV86G2xPYO64=", + "lastModified": 1720926593, + "narHash": "sha256-fW6e27L6qY6s+TxInwrS2EXZZfhMAlaNqT0sWS49qMA=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "2917972ed34ce292309b3a4976286f8b5c08db27", + "rev": "5fe5b0cdf1268112dc96319388819b46dc051ef4", "type": "github" }, "original": { @@ -447,11 +434,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1719895800, - "narHash": "sha256-xNbjISJTFailxass4LmdWeV4jNhAlmJPwj46a/GxE6M=", + "lastModified": 1720737798, + "narHash": "sha256-G/OtEAts7ZUvW5lrGMXSb8HqRp2Jr9I7reBuvCOL54w=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "6e253f12b1009053eff5344be5e835f604bb64cd", + "rev": "c5013aa7ce2c7ec90acee5d965d950c8348db751", "type": "github" }, "original": { @@ -462,11 +449,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1719848872, - "narHash": "sha256-H3+EC5cYuq+gQW8y0lSrrDZfH71LB4DAf+TDFyvwCNA=", + "lastModified": 1720768451, + "narHash": "sha256-EYekUHJE2gxeo2pM/zM9Wlqw1Uw2XTJXOSAO79ksc4Y=", "owner": "nixos", "repo": "nixpkgs", - "rev": "00d80d13810dbfea8ab4ed1009b09100cca86ba8", + "rev": "7e7c39ea35c5cdd002cd4588b03a3fb9ece6fad9", "type": "github" }, "original": { @@ -510,11 +497,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1719929751, - "narHash": "sha256-CaXyTEyn5le7ad13CzigKAf8TI1iSy+PQFRkZZIatpM=", + "lastModified": 1720910388, + "narHash": "sha256-gCudumUXHH+o0KFemXecDYySVCzjz7jYDGjdJbrN7gA=", "owner": "nix-community", "repo": "nixvim", - "rev": "3d969603481c745f8faa411f1e8b7c97517c67a3", + "rev": "ac9a1cbf9c7145687e66a1c033d68fc72eca3fd8", "type": "github" }, "original": { @@ -675,11 +662,11 @@ ] }, "locked": { - "lastModified": 1719887753, - "narHash": "sha256-p0B2r98UtZzRDM5miGRafL4h7TwGRC4DII+XXHDHqek=", + "lastModified": 1720818892, + "narHash": "sha256-f52x9srIcqQm1Df3T+xYR5P6VfdnDFa2vkkcLhlTp6U=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "bdb6355009562d8f9313d9460c0d3860f525bc6c", + "rev": "5b002f8a53ed04c1a4177e7b00809d57bd2c696f", "type": "github" }, "original": { diff --git a/sets/base.nix b/sets/base.nix index 1b131cf..3987736 100644 --- a/sets/base.nix +++ b/sets/base.nix @@ -29,6 +29,9 @@ overlays = [ inputs.artemist.overlays.default inputs.fonts.overlays.default + (final: prev: { + kicad = prev.kicad.override { python3 = final.python311; }; + }) ]; config.allowUnfreePredicate = pkg: diff --git a/sets/hardware.nix b/sets/hardware.nix index bfe572d..e579a2a 100644 --- a/sets/hardware.nix +++ b/sets/hardware.nix @@ -21,7 +21,6 @@ platformio proxmark3-rrg pulseview - pyocd stlink ]; diff --git a/sets/packages.nix b/sets/packages.nix index 6fb549d..37ecafd 100644 --- a/sets/packages.nix +++ b/sets/packages.nix @@ -93,10 +93,10 @@ # GUI tools dino + eog evince gimp - gnome3.eog - gnome3.gnome-system-monitor + gnome-system-monitor inkscape libreoffice-fresh nheko @@ -106,7 +106,7 @@ qalculate-gtk # Gnome configuration - gnome3.adwaita-icon-theme + adwaita-icon-theme gsettings-desktop-schemas gnome-themes-extra hicolor-icon-theme