Toast/nix-stuff
1
0
Fork 0
Code Issues Pull requests Projects 1 Wiki Activity

Flake: update lock file and remove unneeded patch

Browse source
This commit is contained in:
Toast 2024-06-23 13:22:51 +02:00
parent 67f3cf3fad
commit e4ec92a8f0
3 changed files with 36 additions and 77 deletions
Download patch file Download diff file Expand all files Collapse all files

72
flake.lock generated
View file

@ -25,11 +25,11 @@
},
"catppuccin": {
"locked": {
"lastModified": 1718339789,
"narHash": "sha256-Q3fgY7huFE+uaw7BNsAl1x+FvjDAi3EDWPnlALJt5pM=",
"lastModified": 1719059483,
"narHash": "sha256-JUGjp4P7Yi3ToxLW5iMSz7CI7mffprF8GsK1hkFdKzs=",
"owner": "catppuccin",
"repo": "nix",
"rev": "73e06d5bd7ed34bdd0168030893ef8364fdc1d4a",
"rev": "b6c854508d8c03f3ff06bf658d12b0ae8052d7a5",
"type": "github"
},
"original": {
@ -119,11 +119,11 @@
]
},
"locked": {
"lastModified": 1718243258,
"narHash": "sha256-abBpj2VU8p6qlRzTU8o22q68MmOaZ4v8zZ4UlYl5YRU=",
"lastModified": 1719037157,
"narHash": "sha256-aOKd8+mhBsLQChCu1mn/W5ww79ta5cXVE59aJFrifM8=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "8d5e27b4807d25308dfe369d5a923d87e7dbfda3",
"rev": "cd886711998fe5d9ff7979fdd4b4cbd17b1f1511",
"type": "github"
},
"original": {
@ -139,11 +139,11 @@
]
},
"locked": {
"lastModified": 1717527182,
"narHash": "sha256-vWSkg6AMok1UUQiSYVdGMOXKD2cDFnajITiSi0Zjd1A=",
"lastModified": 1718530513,
"narHash": "sha256-BmO8d0r+BVlwWtMLQEYnwmngqdXIuyFzMwvmTcLMee8=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "845a5c4c073f74105022533907703441e0464bc3",
"rev": "a1fddf0967c33754271761d91a3d921772b30d0e",
"type": "github"
},
"original": {
@ -161,11 +161,11 @@
]
},
"locked": {
"lastModified": 1718431241,
"narHash": "sha256-vOsklVeiGCvf9LBOz0sjHMNvohgUw8/Oe/8MpdFnF+Y=",
"lastModified": 1719032789,
"narHash": "sha256-MIPobSKR53T0Yrb8wu2fbjSVokhJeJy5AF6B1Hzckso=",
"owner": "Jovian-Experiments",
"repo": "Jovian-NixOS",
"rev": "f02a01aab60c68b7898043c2e7f5bc97c93fb07b",
"rev": "495a672a2024bdc0e86af95f4e338827f9bfb865",
"type": "github"
},
"original": {
@ -214,11 +214,11 @@
},
"nix-impermanence": {
"locked": {
"lastModified": 1717932370,
"narHash": "sha256-7C5lCpiWiyPoIACOcu2mukn/1JRtz6HC/1aEMhUdcw0=",
"lastModified": 1719067779,
"narHash": "sha256-c8UPWKErzLtukeZ2xdyeZZTkEtg7cP8ApvMgYvjT1ss=",
"owner": "nix-community",
"repo": "impermanence",
"rev": "27979f1c3a0d3b9617a3563e2839114ba7d48d3f",
"rev": "363b3e8622e964a96db90ab6430ddcc338212e79",
"type": "github"
},
"original": {
@ -234,11 +234,11 @@
]
},
"locked": {
"lastModified": 1718458449,
"narHash": "sha256-FcX3/lTbb+WIW783b18SPudPYhdmmNLQADf4S3SsZos=",
"lastModified": 1718507237,
"narHash": "sha256-xBEWCxWeRpWQggFFp8ugJCDa63cOJsVvx71R9F0Eowg=",
"owner": "Mic92",
"repo": "nix-index-database",
"rev": "963639a87fb7f746d45f14b8ab429d2c52dbb396",
"rev": "6af2c5e58c20311276f59d247341cafeebfcb6f4",
"type": "github"
},
"original": {
@ -254,11 +254,11 @@
]
},
"locked": {
"lastModified": 1718458449,
"narHash": "sha256-FcX3/lTbb+WIW783b18SPudPYhdmmNLQADf4S3SsZos=",
"lastModified": 1718507237,
"narHash": "sha256-xBEWCxWeRpWQggFFp8ugJCDa63cOJsVvx71R9F0Eowg=",
"owner": "Mic92",
"repo": "nix-index-database",
"rev": "963639a87fb7f746d45f14b8ab429d2c52dbb396",
"rev": "6af2c5e58c20311276f59d247341cafeebfcb6f4",
"type": "github"
},
"original": {
@ -269,11 +269,11 @@
},
"nixos-hardware": {
"locked": {
"lastModified": 1718459188,
"narHash": "sha256-umwY+ivE98n/6EwEtobOlqf1t9VddhPIIZ6rVmFXlHg=",
"lastModified": 1719069430,
"narHash": "sha256-d9KzCJv3UG6nX9Aur5OSEf4Uj+ywuxojhiCiRKYVzXA=",
"owner": "NixOS",
"repo": "nixos-hardware",
"rev": "0cd562157274df3783840bdcb0ce6d9c4cf4aa29",
"rev": "e8232c132a95ddc62df9d404120ad4ff53862910",
"type": "github"
},
"original": {
@ -301,11 +301,11 @@
},
"nixpkgs-raw": {
"locked": {
"lastModified": 1718208800,
"narHash": "sha256-US1tAChvPxT52RV8GksWZS415tTS7PV42KTc2PNDBmc=",
"lastModified": 1718835956,
"narHash": "sha256-wM9v2yIxClRYsGHut5vHICZTK7xdrUGfrLkXvSuv6s4=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "cc54fb41d13736e92229c21627ea4f22199fee6b",
"rev": "dd457de7e08c6d06789b1f5b88fc9327f4d96309",
"type": "github"
},
"original": {
@ -316,11 +316,11 @@
},
"nixpkgs-unstable-raw": {
"locked": {
"lastModified": 1718318537,
"narHash": "sha256-4Zu0RYRcAY/VWuu6awwq4opuiD//ahpc2aFHg2CWqFY=",
"lastModified": 1718895438,
"narHash": "sha256-k3JqJrkdoYwE3fHE6xGDY676AYmyh4U2Zw+0Bwe5DLU=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "e9ee548d90ff586a6471b4ae80ae9cfcbceb3420",
"rev": "d603719ec6e294f034936c0d0dc06f689d91b6c3",
"type": "github"
},
"original": {
@ -331,11 +331,11 @@
},
"nur": {
"locked": {
"lastModified": 1718462028,
"narHash": "sha256-7a1I+bIgjQYfSuursGmSJeZc0+gUZLd3D9zEkrnWObs=",
"lastModified": 1719081887,
"narHash": "sha256-xAmq1hOGDF5t5+bKgU/zaSsuv5Nbo+KdzK2BFvLL56w=",
"owner": "nix-community",
"repo": "NUR",
"rev": "d64b542f7f8f621ffcce3209184232024654bbac",
"rev": "768bf25fd49b2b2d95dd477fccfacf7f8638212a",
"type": "github"
},
"original": {
@ -444,11 +444,11 @@
]
},
"locked": {
"lastModified": 1718414742,
"narHash": "sha256-JxLg5LNDoP2pWlkaItaNfGijH+FC6S3q4cLcisIP/a0=",
"lastModified": 1719019506,
"narHash": "sha256-2lpbK6W3QHxc7BFeEDPumcBoNBx7dO7UE+ypwFVEOOc=",
"owner": "nix-community",
"repo": "nix-vscode-extensions",
"rev": "070ac4ec68b9faff64ee94e975ccf61b6909afab",
"rev": "935d522e2a0306083d15e09c7d17a9358c141f29",
"type": "github"
},
"original": {

1
flake.nix
View file

@ -79,7 +79,6 @@
name = "patched-nixpkgs-unstable";
src = nixpkgs-unstable-raw;
patches = [
./nixpkgs-patches/0001-Revert-handheld-daemon-undo-refactor.patch
];
};
nixpkgs-patched = nixpkgs-raw.legacyPackages.x86_64-linux.applyPatches {

40
nixpkgs-patches/0001-Revert-handheld-daemon-undo-refactor.patch
View file

@ -1,40 +0,0 @@
From 904067bc281924e86e936c7d0162131e8af86d64 Mon Sep 17 00:00:00 2001
From: Toast <39011842+toast003@users.noreply.github.com>
Date: Mon, 6 May 2024 12:26:54 +0200
Subject: [PATCH 1/1] Revert "handheld-daemon: undo refactor"
This reverts commit d9b487ae609a368378c1a9d89a5441c5c44121df.
---
pkgs/by-name/ha/handheld-daemon/package.nix | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/pkgs/by-name/ha/handheld-daemon/package.nix b/pkgs/by-name/ha/handheld-daemon/package.nix
index 246e3879bb5c..ad0554bec36d 100644
--- a/pkgs/by-name/ha/handheld-daemon/package.nix
+++ b/pkgs/by-name/ha/handheld-daemon/package.nix
@@ -34,15 +34,17 @@ python3.pkgs.buildPythonApplication rec {
doCheck = false;
postPatch = ''
+ # The generated udev rules point to /bin/chmod, which does not exist in NixOS
+ substituteInPlace src/hhd/controller/lib/hide.py \
+ --replace-fail /bin/chmod ${toybox}/bin/chmod
+
# handheld-daemon contains a fork of the python module `hid`, so this hook
# is borrowed from the `hid` derivation.
+ substituteInPlace src/hhd/controller/lib/hid.py \
+ --replace-fail libhidapi ${hidapi}/lib/libhidapi
+
hidapi=${hidapi}/lib/
test -d $hidapi || { echo "ERROR: $hidapi doesn't exist, please update/fix this build expression."; exit 1; }
- sed -i -e "s|libhidapi|$hidapi/libhidapi|" src/hhd/controller/lib/hid.py
-
- # The generated udev rules point to /bin/chmod, which does not exist in NixOS
- chmod=${toybox}/bin/chmod
- sed -i -e "s|/bin/chmod|$chmod|" src/hhd/controller/lib/hide.py
'';
postInstall = ''
--
2.44.0