From 5981d50a726258ea00e47a2c12555c3df3206911 Mon Sep 17 00:00:00 2001 From: Toast Date: Wed, 28 Aug 2024 03:42:55 +0200 Subject: [PATCH 1/3] Flake: update lock file --- flake.lock | 80 +++++++++++++++++++++++++++--------------------------- 1 file changed, 40 insertions(+), 40 deletions(-) diff --git a/flake.lock b/flake.lock index b8eecd2..572ff1b 100644 --- a/flake.lock +++ b/flake.lock @@ -25,11 +25,11 @@ }, "catppuccin": { "locked": { - "lastModified": 1723691425, - "narHash": "sha256-F25VvHFMaqr26b7goaVWspXaK6XTRFz8RnILV+9OPkk=", + "lastModified": 1724469296, + "narHash": "sha256-p3R4LUNk6gC+fTKRUm9ByXaoRIocnQMwVuJSIxECQ8o=", "owner": "catppuccin", "repo": "nix", - "rev": "552056779a136092eb6358c573d925630172fc30", + "rev": "874e668ddaf3687e8d38ccd0188a641ffefe1cfb", "type": "github" }, "original": { @@ -219,11 +219,11 @@ ] }, "locked": { - "lastModified": 1723399884, - "narHash": "sha256-97wn0ihhGqfMb8WcUgzzkM/TuAxce2Gd20A8oiruju4=", + "lastModified": 1724435763, + "narHash": "sha256-UNky3lJNGQtUEXT2OY8gMxejakSWPTfWKvpFkpFlAfM=", "owner": "nix-community", "repo": "home-manager", - "rev": "086f619dd991a4d355c07837448244029fc2d9ab", + "rev": "c2cd2a52e02f1dfa1c88f95abeb89298d46023be", "type": "github" }, "original": { @@ -261,11 +261,11 @@ ] }, "locked": { - "lastModified": 1723916191, - "narHash": "sha256-wbkh2Tyo1dUwY+35OtF2117u1QqdVAlvDx4vgaW/InU=", + "lastModified": 1724753550, + "narHash": "sha256-idw4NE/j9j6LVD7nrw7lWq77z2J6S5oCHjJdIaPyGvw=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "dcc9afeea9d086cde9731ca90362c7bda62db6d0", + "rev": "1bda3a989a5785e09d710452c817ee2699c89a3a", "type": "github" }, "original": { @@ -277,11 +277,11 @@ "lix": { "flake": false, "locked": { - "lastModified": 1723972205, - "narHash": "sha256-Y2lrLNXJAibZJ4YTtNp7l3Cm/3WNsWTTVJO3WF627zM=", - "rev": "7506d680ac540f39944c2a9f573900c5b1e4a023", + "lastModified": 1724714224, + "narHash": "sha256-Fn72c2ycgYERAdwWEPmIUhuOmgOwuvZhTNdqOuiR0uw=", + "rev": "0dc486a5bf218870aafd5552586ab4330881647e", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/7506d680ac540f39944c2a9f573900c5b1e4a023.tar.gz?rev=7506d680ac540f39944c2a9f573900c5b1e4a023" + "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/0dc486a5bf218870aafd5552586ab4330881647e.tar.gz?rev=0dc486a5bf218870aafd5552586ab4330881647e" }, "original": { "type": "tarball", @@ -374,11 +374,11 @@ }, "nix-impermanence": { "locked": { - "lastModified": 1719091691, - "narHash": "sha256-AxaLX5cBEcGtE02PeGsfscSb/fWMnyS7zMWBXQWDKbE=", + "lastModified": 1724489415, + "narHash": "sha256-ey8vhwY/6XCKoh7fyTn3aIQs7WeYSYtLbYEG87VCzX4=", "owner": "nix-community", "repo": "impermanence", - "rev": "23c1f06316b67cb5dabdfe2973da3785cfe9c34a", + "rev": "c7f5b394397398c023000cf843986ee2571a1fd7", "type": "github" }, "original": { @@ -394,11 +394,11 @@ ] }, "locked": { - "lastModified": 1723950649, - "narHash": "sha256-dHMkGjwwCGj0c2MKyCjRXVBXq2Sz3TWbbM23AS7/5Hc=", + "lastModified": 1724576102, + "narHash": "sha256-uM7n5nNL6fmA0bwMJBNll11f4cMWOFa2Ni6F5KeIldM=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "392828aafbed62a6ea6ccab13728df2e67481805", + "rev": "e333d62b70b179da1dd78d94315e8a390f2d12e5", "type": "github" }, "original": { @@ -414,11 +414,11 @@ ] }, "locked": { - "lastModified": 1723950649, - "narHash": "sha256-dHMkGjwwCGj0c2MKyCjRXVBXq2Sz3TWbbM23AS7/5Hc=", + "lastModified": 1724576102, + "narHash": "sha256-uM7n5nNL6fmA0bwMJBNll11f4cMWOFa2Ni6F5KeIldM=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "392828aafbed62a6ea6ccab13728df2e67481805", + "rev": "e333d62b70b179da1dd78d94315e8a390f2d12e5", "type": "github" }, "original": { @@ -436,11 +436,11 @@ ] }, "locked": { - "lastModified": 1724377000, - "narHash": "sha256-TITxaXuhO8vDScZoE7i7E2BTXoJzZmKTk6qRkmI2d+o=", + "lastModified": 1724722703, + "narHash": "sha256-5xhQLp0tLY/1nWlcU5uYsCUawxcwqEzAGi0b8wAQKxA=", "owner": "Infinidoge", "repo": "nix-minecraft", - "rev": "b464de49b4d6ea8faf1988e02fc59c4908a7ff91", + "rev": "f74de364f4354e509cc12399de4d4df834a0a45f", "type": "github" }, "original": { @@ -451,11 +451,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1723310128, - "narHash": "sha256-IiH8jG6PpR4h9TxSGMYh+2/gQiJW9MwehFvheSb5rPc=", + "lastModified": 1724575805, + "narHash": "sha256-OB/kEL3GAhUZmUfkbPfsPhKs0pRqJKs0EEBiLfyKZw8=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "c54cf53e022b0b3c1d3b8207aa0f9b194c24f0cf", + "rev": "9fc19be21f0807d6be092d70bf0b1de0c00ac895", "type": "github" }, "original": { @@ -483,11 +483,11 @@ }, "nixpkgs-raw": { "locked": { - "lastModified": 1723688146, - "narHash": "sha256-sqLwJcHYeWLOeP/XoLwAtYjr01TISlkOfz+NG82pbdg=", + "lastModified": 1724531977, + "narHash": "sha256-XROVLf9ti4rrNCFLr+DmXRZtPjCQTW4cYy59owTEmxk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c3d4ac725177c030b1e289015989da2ad9d56af0", + "rev": "2527da1ef492c495d5391f3bcf9c1dd9f4514e32", "type": "github" }, "original": { @@ -498,11 +498,11 @@ }, "nixpkgs-unstable-raw": { "locked": { - "lastModified": 1723637854, - "narHash": "sha256-med8+5DSWa2UnOqtdICndjDAEjxr5D7zaIiK4pn0Q7c=", + "lastModified": 1724479785, + "narHash": "sha256-pP3Azj5d6M5nmG68Fu4JqZmdGt4S4vqI5f8te+E/FTw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c3aa7b8938b17aebd2deecf7be0636000d62a2b9", + "rev": "d0e1602ddde669d5beb01aec49d71a51937ed7be", "type": "github" }, "original": { @@ -513,11 +513,11 @@ }, "nur": { "locked": { - "lastModified": 1723976478, - "narHash": "sha256-eF815/buOMQlX2XbtNgN3GtA9bwv4psLbckU9iTBsxs=", + "lastModified": 1724775364, + "narHash": "sha256-agN3Oaph2+2DH3+m6Jp4d1ji5s93joohKcV35DfJWQk=", "owner": "nix-community", "repo": "NUR", - "rev": "575ee4dc4dc7c031663bdcfe2e8779abacc80d0a", + "rev": "95f1862227c883581265a8801ea28af99635dd97", "type": "github" }, "original": { @@ -675,11 +675,11 @@ ] }, "locked": { - "lastModified": 1723944889, - "narHash": "sha256-602FSRKgF9gRywuLZjMu/dnbfmgv8mlkfakH+LnsIgU=", + "lastModified": 1724722238, + "narHash": "sha256-DLtiPBpKBIL4+lxu7H8e6gPZvZ3Rb7D8mMh8OieBURM=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "5ea2b85a16c2d4b3c847854e7c8c188f3e0c6db8", + "rev": "ad07ef4512e976b9537d05b7d2e4a5d7a2965ff7", "type": "github" }, "original": { From 8bc792fb2dc2ec9ab402e73b3f5cfd4fada2c9cb Mon Sep 17 00:00:00 2001 From: Toast Date: Wed, 28 Aug 2024 03:43:17 +0200 Subject: [PATCH 2/3] Flake: remove uneeded patches --- flake.nix | 2 -- nixpkgs-patches/fix-cemu.patch | 30 ----------------------------- nixpkgs-patches/fix-delta.patch | 34 --------------------------------- 3 files changed, 66 deletions(-) delete mode 100644 nixpkgs-patches/fix-cemu.patch delete mode 100644 nixpkgs-patches/fix-delta.patch diff --git a/flake.nix b/flake.nix index 3522f18..a227c04 100644 --- a/flake.nix +++ b/flake.nix @@ -100,8 +100,6 @@ src = nixpkgs-unstable-raw; patches = [ ./nixpkgs-patches/handheld-daemon-ui-init.patch - ./nixpkgs-patches/fix-cemu.patch - ./nixpkgs-patches/fix-delta.patch ]; }; nixpkgs-patched = nixpkgs-raw.legacyPackages.x86_64-linux.applyPatches { diff --git a/nixpkgs-patches/fix-cemu.patch b/nixpkgs-patches/fix-cemu.patch deleted file mode 100644 index 94209c5..0000000 --- a/nixpkgs-patches/fix-cemu.patch +++ /dev/null @@ -1,30 +0,0 @@ -From e01163e1ddcf90ecd57a5ea271979c6a68890d61 Mon Sep 17 00:00:00 2001 -From: Reno Dakota <170618376+paparodeo@users.noreply.github.com> -Date: Fri, 16 Aug 2024 03:21:07 +0000 -Subject: [PATCH] cemu: move glslang to buildInputs - -fix build perhaps after change 9b7f1a3913168bc9b9c070dbc9720dad1d06b49c ---- - pkgs/by-name/ce/cemu/package.nix | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/pkgs/by-name/ce/cemu/package.nix b/pkgs/by-name/ce/cemu/package.nix -index ad70bc9c79f9d76..a9808577c9c0258 100644 ---- a/pkgs/by-name/ce/cemu/package.nix -+++ b/pkgs/by-name/ce/cemu/package.nix -@@ -69,7 +69,6 @@ in stdenv.mkDerivation (finalAttrs: { - addDriverRunpath - wrapGAppsHook3 - cmake -- glslang - nasm - ninja - pkg-config -@@ -83,6 +82,7 @@ in stdenv.mkDerivation (finalAttrs: { - curl - fmt_9 - glm -+ glslang - gtk3 - hidapi - imgui' diff --git a/nixpkgs-patches/fix-delta.patch b/nixpkgs-patches/fix-delta.patch deleted file mode 100644 index 1ac5c2a..0000000 --- a/nixpkgs-patches/fix-delta.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 01bcd715f54030bb3fb20e4c63b0795c2cfd821e Mon Sep 17 00:00:00 2001 -From: zowoq <59103226+zowoq@users.noreply.github.com> -Date: Thu, 15 Aug 2024 19:20:26 +1000 -Subject: [PATCH] delta: 0.17.0 -> 0.17.0-unstable-2024-08-12 - ---- - pkgs/applications/version-management/delta/default.nix | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/pkgs/applications/version-management/delta/default.nix b/pkgs/applications/version-management/delta/default.nix -index 40f474f2c4c1de1..1547632119fd412 100644 ---- a/pkgs/applications/version-management/delta/default.nix -+++ b/pkgs/applications/version-management/delta/default.nix -@@ -11,16 +11,16 @@ - - rustPlatform.buildRustPackage rec { - pname = "delta"; -- version = "0.17.0"; -+ version = "0.17.0-unstable-2024-08-12"; - - src = fetchFromGitHub { - owner = "dandavison"; - repo = pname; -- rev = version; -- hash = "sha256-r0ED9o2UP91fe6Bng5ioJra5S1bg+UEXMLeSQPkMswI="; -+ rev = "a01141b72001f4c630d77cf5274267d7638851e4"; -+ hash = "sha256-My51pQw5a2Y2VTu39MmnjGfmCavg8pFqOmOntUildS0="; - }; - -- cargoHash = "sha256-3CxRNhcjfDK/xUuM3w+GwqE0+X6WT92/LGj/qRp0TwA="; -+ cargoHash = "sha256-Rlc3Bc6Jh89KLLEWBWQB5GjoeIuHnwIVZN/MVFMjY24="; - - nativeBuildInputs = [ - installShellFiles From f836354767a9a60d613658e1734c8639befa6436 Mon Sep 17 00:00:00 2001 From: Toast Date: Wed, 28 Aug 2024 03:44:18 +0200 Subject: [PATCH 3/3] Kde/neochat: disable temporarely --- roles/kde/programs/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/roles/kde/programs/default.nix b/roles/kde/programs/default.nix index bbfc028..4ede2bd 100644 --- a/roles/kde/programs/default.nix +++ b/roles/kde/programs/default.nix @@ -3,7 +3,8 @@ ./kate.nix ./firefox.nix ./skanpage.nix - ./neochat.nix + # Neochat depends on olm which is unsafe now + # ./neochat.nix ./konsole.nix ./git.nix ];