From 64b4a1b6cbef38365c4c470fb6ff63b57f0ac348 Mon Sep 17 00:00:00 2001 From: Toast Date: Sun, 18 Aug 2024 15:31:29 +0200 Subject: [PATCH 1/2] Flake: update lock file --- flake.lock | 90 +++++++++++++++++++++++++++--------------------------- 1 file changed, 45 insertions(+), 45 deletions(-) diff --git a/flake.lock b/flake.lock index f04ae27..69b6ffa 100644 --- a/flake.lock +++ b/flake.lock @@ -10,11 +10,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1722339003, - "narHash": "sha256-ZeS51uJI30ehNkcZ4uKqT4ZDARPyqrHADSKAwv5vVCU=", + "lastModified": 1723293904, + "narHash": "sha256-b+uqzj+Wa6xgMS9aNbX4I+sXeb5biPDi39VgvSFqFvU=", "owner": "ryantm", "repo": "agenix", - "rev": "3f1dae074a12feb7327b4bf43cbac0d124488bb7", + "rev": "f6291c5935fdc4e0bef208cfc0dcab7e3f7a1c41", "type": "github" }, "original": { @@ -25,11 +25,11 @@ }, "catppuccin": { "locked": { - "lastModified": 1722661201, - "narHash": "sha256-2JX3S1hmmUhHuyGyGWnaM4xT0SiaDdVkNzmBrEowwK0=", + "lastModified": 1723691425, + "narHash": "sha256-F25VvHFMaqr26b7goaVWspXaK6XTRFz8RnILV+9OPkk=", "owner": "catppuccin", "repo": "nix", - "rev": "19a0f144f0204a12a89243363efb6a493b8cfc83", + "rev": "552056779a136092eb6358c573d925630172fc30", "type": "github" }, "original": { @@ -185,11 +185,11 @@ ] }, "locked": { - "lastModified": 1722630065, - "narHash": "sha256-QfM/9BMRkCmgWzrPDK+KbgJOUlSJnfX4OvsUupEUZvA=", + "lastModified": 1723399884, + "narHash": "sha256-97wn0ihhGqfMb8WcUgzzkM/TuAxce2Gd20A8oiruju4=", "owner": "nix-community", "repo": "home-manager", - "rev": "afc892db74d65042031a093adb6010c4c3378422", + "rev": "086f619dd991a4d355c07837448244029fc2d9ab", "type": "github" }, "original": { @@ -227,11 +227,11 @@ ] }, "locked": { - "lastModified": 1722666143, - "narHash": "sha256-uTr3LiytFHFUYmIrhs5NoGlm5DCJxQlfyaZEKCU/DS8=", + "lastModified": 1723916191, + "narHash": "sha256-wbkh2Tyo1dUwY+35OtF2117u1QqdVAlvDx4vgaW/InU=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "bcfe9dc708c92590fec676692b3ed79443eda819", + "rev": "dcc9afeea9d086cde9731ca90362c7bda62db6d0", "type": "github" }, "original": { @@ -243,11 +243,11 @@ "lix": { "flake": false, "locked": { - "lastModified": 1722643724, - "narHash": "sha256-FrM0DN/i5kKB06/4KYNkY3mMGpC5hYQhaKtx1mneReU=", - "rev": "66469fc281fc4abb3284574f77a8051fee8116b9", + "lastModified": 1723972205, + "narHash": "sha256-Y2lrLNXJAibZJ4YTtNp7l3Cm/3WNsWTTVJO3WF627zM=", + "rev": "7506d680ac540f39944c2a9f573900c5b1e4a023", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/66469fc281fc4abb3284574f77a8051fee8116b9.tar.gz" + "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/7506d680ac540f39944c2a9f573900c5b1e4a023.tar.gz?rev=7506d680ac540f39944c2a9f573900c5b1e4a023" }, "original": { "type": "tarball", @@ -266,11 +266,11 @@ ] }, "locked": { - "lastModified": 1722485024, - "narHash": "sha256-+7RReWaFQUO8MfAhJYNm4FkALuM3rPGy2AlXXv9Jmc8=", - "rev": "e350380d72f94035c309e19fda2fd550f6ab7376", + "lastModified": 1723511483, + "narHash": "sha256-rT/OkVXKkns2YvyF1nFvl+8Gc3sld1c1sXPtGkbqaDY=", + "rev": "cecf70b77539c1a593f60ec9d0305b5e537ab6a9", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/e350380d72f94035c309e19fda2fd550f6ab7376.tar.gz" + "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/cecf70b77539c1a593f60ec9d0305b5e537ab6a9.tar.gz?rev=cecf70b77539c1a593f60ec9d0305b5e537ab6a9" }, "original": { "type": "tarball", @@ -289,11 +289,11 @@ ] }, "locked": { - "lastModified": 1722485024, - "narHash": "sha256-+7RReWaFQUO8MfAhJYNm4FkALuM3rPGy2AlXXv9Jmc8=", - "rev": "e350380d72f94035c309e19fda2fd550f6ab7376", + "lastModified": 1723511483, + "narHash": "sha256-rT/OkVXKkns2YvyF1nFvl+8Gc3sld1c1sXPtGkbqaDY=", + "rev": "cecf70b77539c1a593f60ec9d0305b5e537ab6a9", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/e350380d72f94035c309e19fda2fd550f6ab7376.tar.gz" + "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/cecf70b77539c1a593f60ec9d0305b5e537ab6a9.tar.gz?rev=cecf70b77539c1a593f60ec9d0305b5e537ab6a9" }, "original": { "type": "tarball", @@ -360,11 +360,11 @@ ] }, "locked": { - "lastModified": 1722740924, - "narHash": "sha256-UQPgA5d8azLZuDHZMPmvDszhuKF1Ek89SrTRtqsQ4Ss=", + "lastModified": 1723950649, + "narHash": "sha256-dHMkGjwwCGj0c2MKyCjRXVBXq2Sz3TWbbM23AS7/5Hc=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "97ca0a0fca0391de835f57e44f369a283e37890f", + "rev": "392828aafbed62a6ea6ccab13728df2e67481805", "type": "github" }, "original": { @@ -380,11 +380,11 @@ ] }, "locked": { - "lastModified": 1722740924, - "narHash": "sha256-UQPgA5d8azLZuDHZMPmvDszhuKF1Ek89SrTRtqsQ4Ss=", + "lastModified": 1723950649, + "narHash": "sha256-dHMkGjwwCGj0c2MKyCjRXVBXq2Sz3TWbbM23AS7/5Hc=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "97ca0a0fca0391de835f57e44f369a283e37890f", + "rev": "392828aafbed62a6ea6ccab13728df2e67481805", "type": "github" }, "original": { @@ -395,11 +395,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1722332872, - "narHash": "sha256-2xLM4sc5QBfi0U/AANJAW21Bj4ZX479MHPMPkB+eKBU=", + "lastModified": 1723310128, + "narHash": "sha256-IiH8jG6PpR4h9TxSGMYh+2/gQiJW9MwehFvheSb5rPc=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "14c333162ba53c02853add87a0000cbd7aa230c2", + "rev": "c54cf53e022b0b3c1d3b8207aa0f9b194c24f0cf", "type": "github" }, "original": { @@ -427,11 +427,11 @@ }, "nixpkgs-raw": { "locked": { - "lastModified": 1722651103, - "narHash": "sha256-IRiJA0NVAoyaZeKZluwfb2DoTpBAj+FLI0KfybBeDU0=", + "lastModified": 1723688146, + "narHash": "sha256-sqLwJcHYeWLOeP/XoLwAtYjr01TISlkOfz+NG82pbdg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a633d89c6dc9a2a8aae11813a62d7c58b2c0cc51", + "rev": "c3d4ac725177c030b1e289015989da2ad9d56af0", "type": "github" }, "original": { @@ -442,11 +442,11 @@ }, "nixpkgs-unstable-raw": { "locked": { - "lastModified": 1722630782, - "narHash": "sha256-hMyG9/WlUi0Ho9VkRrrez7SeNlDzLxalm9FwY7n/Noo=", + "lastModified": 1723637854, + "narHash": "sha256-med8+5DSWa2UnOqtdICndjDAEjxr5D7zaIiK4pn0Q7c=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d04953086551086b44b6f3c6b7eeb26294f207da", + "rev": "c3aa7b8938b17aebd2deecf7be0636000d62a2b9", "type": "github" }, "original": { @@ -457,11 +457,11 @@ }, "nur": { "locked": { - "lastModified": 1722864865, - "narHash": "sha256-W271AVeWwMXYRCpTGmdku2/Sg0yfbgylO75/TMVhRnA=", + "lastModified": 1723976478, + "narHash": "sha256-eF815/buOMQlX2XbtNgN3GtA9bwv4psLbckU9iTBsxs=", "owner": "nix-community", "repo": "NUR", - "rev": "d3ba11250bf54f978969bdf202560321520ed336", + "rev": "575ee4dc4dc7c031663bdcfe2e8779abacc80d0a", "type": "github" }, "original": { @@ -603,11 +603,11 @@ ] }, "locked": { - "lastModified": 1722821408, - "narHash": "sha256-FMCo35ZmMfvAcae+9neKfu6QzXjU3WL6vW2OFMXx6wI=", + "lastModified": 1723944889, + "narHash": "sha256-602FSRKgF9gRywuLZjMu/dnbfmgv8mlkfakH+LnsIgU=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "f25962fbd632afea744dc7e6868f24d2e73ccedb", + "rev": "5ea2b85a16c2d4b3c847854e7c8c188f3e0c6db8", "type": "github" }, "original": { From 6d6dab1764bf4e32e22a0756140da4122cffc68a Mon Sep 17 00:00:00 2001 From: Toast Date: Sun, 18 Aug 2024 15:32:25 +0200 Subject: [PATCH 2/2] Flake: add nixpkgs patches --- flake.nix | 2 ++ nixpkgs-patches/fix-cemu.patch | 30 +++++++++++++++++++++++++++++ nixpkgs-patches/fix-delta.patch | 34 +++++++++++++++++++++++++++++++++ 3 files changed, 66 insertions(+) create mode 100644 nixpkgs-patches/fix-cemu.patch create mode 100644 nixpkgs-patches/fix-delta.patch diff --git a/flake.nix b/flake.nix index 7eff150..6877338 100644 --- a/flake.nix +++ b/flake.nix @@ -95,6 +95,8 @@ 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 new file mode 100644 index 0000000..94209c5 --- /dev/null +++ b/nixpkgs-patches/fix-cemu.patch @@ -0,0 +1,30 @@ +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 new file mode 100644 index 0000000..1ac5c2a --- /dev/null +++ b/nixpkgs-patches/fix-delta.patch @@ -0,0 +1,34 @@ +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