From ae8f8961eaeaafc3ee8251821495bcaf764a2af0 Mon Sep 17 00:00:00 2001 From: clerie Date: Mon, 21 Apr 2025 22:29:43 +0200 Subject: [PATCH 1/5] flake.lock: Update rainbowrss --- flake.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index e7345fc..21964dc 100644 --- a/flake.lock +++ b/flake.lock @@ -590,11 +590,11 @@ ] }, "locked": { - "lastModified": 1736087671, - "narHash": "sha256-zWeiCs+8SAS1wN5M3w3vSNNpILoKXqX9aj/ZZcgfMms=", + "lastModified": 1744739483, + "narHash": "sha256-IqWxR1fo+DdAo5zboKaDXfS/z5a5J1EY0TtGh7LRGWA=", "ref": "refs/heads/main", - "rev": "ceab6a148233ffb23de19411a3e5579e3394a35b", - "revCount": 9, + "rev": "7f713330d7c10480a4147d1ba4be78fa141144d9", + "revCount": 10, "type": "git", "url": "https://git.clerie.de/clerie/rainbowrss.git" }, From 04f8df6c08435f02066ac251b89e733c3f0ccae8 Mon Sep 17 00:00:00 2001 From: clerie Date: Mon, 21 Apr 2025 22:32:53 +0200 Subject: [PATCH 2/5] pkgs/iot-data: Remove package --- pkgs/iot-data/default.nix | 30 ------------------------------ pkgs/pkgs.nix | 1 - 2 files changed, 31 deletions(-) delete mode 100644 pkgs/iot-data/default.nix diff --git a/pkgs/iot-data/default.nix b/pkgs/iot-data/default.nix deleted file mode 100644 index 8fa9898..0000000 --- a/pkgs/iot-data/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ - pkgs, - buildPythonPackage, - flask, - python3, -}: - -let - src = pkgs.fetchgit { - url = "https://git.clerie.de/clerie/iot-data.git"; - rev = "f60e3a3f89549b4ce88df20888c08a01062d086a"; - sha256 = "sha256-D8wusJfYbOkL/Nq6yfYBvhnkBmRcDktORicUpDsIrUE="; - }; - pname = "iot-data"; - version = "0.0.1"; - - -in buildPythonPackage rec { - inherit src pname version; - - propagatedBuildInputs = [ - flask - ]; - - postInstall = '' - mkdir -p $out/${python3.sitePackages}/iot_data - ''; - - doCheck = false; -} diff --git a/pkgs/pkgs.nix b/pkgs/pkgs.nix index 5e8c91d..ac6b08a 100644 --- a/pkgs/pkgs.nix +++ b/pkgs/pkgs.nix @@ -16,7 +16,6 @@ git-diff-word = final: prev: final.callPackage ./git-diff-word {}; git-pp = final: prev: final.callPackage ./git-pp {}; git-show-link = final: prev: final.callPackage ./git-show-link {}; - iot-data = final: prev: final.python3.pkgs.callPackage ./iot-data {}; nix-remove-result-links = final: prev: final.callPackage ./nix-remove-result-links {}; nixfiles-auto-install = final: prev: final.callPackage ./nixfiles/nixfiles-auto-install.nix {}; nixfiles-generate-config = final: prev: final.callPackage ./nixfiles/nixfiles-generate-config.nix {}; From 6e2b11e6962c9381a322ab66176b810dd01e299f Mon Sep 17 00:00:00 2001 From: clerie Date: Mon, 21 Apr 2025 23:30:51 +0200 Subject: [PATCH 3/5] pkgs/uptimestatus: Use python instead of python3 --- pkgs/uptimestatus/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/uptimestatus/default.nix b/pkgs/uptimestatus/default.nix index 74a127a..8deb996 100644 --- a/pkgs/uptimestatus/default.nix +++ b/pkgs/uptimestatus/default.nix @@ -3,7 +3,7 @@ buildPythonPackage, flask, requests, - python3, + python, }: let @@ -25,9 +25,9 @@ in buildPythonPackage rec { ]; postInstall = '' - mkdir -p $out/${python3.sitePackages}/uptimestatus - cp -r uptimestatus/static $out/${python3.sitePackages}/uptimestatus/static - cp -r uptimestatus/templates $out/${python3.sitePackages}/uptimestatus/templates + mkdir -p $out/${python.sitePackages}/uptimestatus + cp -r uptimestatus/static $out/${python.sitePackages}/uptimestatus/static + cp -r uptimestatus/templates $out/${python.sitePackages}/uptimestatus/templates ''; doCheck = false; From c285e4db89cd7ef50c60c65fb5dbeb0497e36362 Mon Sep 17 00:00:00 2001 From: clerie Date: Tue, 22 Apr 2025 00:03:40 +0200 Subject: [PATCH 4/5] flake.lock: Update lix --- flake.lock | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/flake.lock b/flake.lock index 21964dc..5373919 100644 --- a/flake.lock +++ b/flake.lock @@ -263,11 +263,11 @@ ] }, "locked": { - "lastModified": 1737885770, - "narHash": "sha256-neRDOoeJj4svdSAxXW8ZJOYWQzzOCRYppkaLaHPfs3A=", + "lastModified": 1744102671, + "narHash": "sha256-/y92PMLAG1ueMInNKaar27H6voo5m1jDnJhxcIYOp5M=", "ref": "lix-2.92", - "rev": "7b3d065a13b21ec8109a250ac6148553bda52d5e", - "revCount": 4233, + "rev": "dd8114c53075524d06ba1de3346e39610923427b", + "revCount": 4235, "type": "git", "url": "https://git.lix.systems/lix-project/hydra.git" }, @@ -288,11 +288,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1741509550, - "narHash": "sha256-O7+c7MYOvKnGhE5qwRqV+q0NePEtiz6spM1Mfu/Heck=", + "lastModified": 1742250400, + "narHash": "sha256-be2mY7VFiWcPw7GcaJBbUvpnpoLd39wxqTXagBNTR5w=", "ref": "release-2.92", - "rev": "0d1f794178d42bfa1ef40ecb80be514139779184", - "revCount": 16641, + "rev": "d8db15010d2059a23a17f70ef542b4d1e7d2c640", + "revCount": 16651, "type": "git", "url": "https://git.lix.systems/lix-project/lix.git" }, @@ -314,11 +314,11 @@ ] }, "locked": { - "lastModified": 1741892773, - "narHash": "sha256-8oUT6D7VlsuLkms3zBsUaPBUoxucmFq62QdtyVpjq0Y=", + "lastModified": 1742943028, + "narHash": "sha256-fprwZKE1uMzO9tiWWOrmLWBW3GPkMayQfb0xOvVFIno=", "ref": "release-2.92", - "rev": "ed7a2fa83145868ecb830d6b3c73ebfd81a9e911", - "revCount": 130, + "rev": "3fae818597ca2f1474de62022f850c23be50528d", + "revCount": 134, "type": "git", "url": "https://git.lix.systems/lix-project/nixos-module.git" }, @@ -364,15 +364,16 @@ "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1737237917, - "narHash": "sha256-xd3/Wr4aPc2MY61qyQ6qQ8AGoG3H/DDcJWziP4EhhXY=", - "ref": "refs/heads/main", - "rev": "6482bee40b89ab2c28d2e988848aa9ae0429d78c", + "lastModified": 1737237842, + "narHash": "sha256-tPr61X9v/OMVt7VXOs1RRStciwN8gDGxEKx+h0/Fg48=", + "ref": "release-2.92", + "rev": "fdaeb722d05a3ac58daaa24d4b5fa8db4457d82e", "revCount": 621, "type": "git", "url": "https://git.lix.systems/lix-project/nix-eval-jobs" }, "original": { + "ref": "release-2.92", "type": "git", "url": "https://git.lix.systems/lix-project/nix-eval-jobs" } From 2004f41b83d3d84249dfd785b723277a2a3de7f3 Mon Sep 17 00:00:00 2001 From: Flake Update Bot Date: Tue, 22 Apr 2025 03:03:06 +0200 Subject: [PATCH 5/5] Update nixpkgs 2025-04-22-01-03 --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 5373919..07bf746 100644 --- a/flake.lock +++ b/flake.lock @@ -534,11 +534,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1742069588, - "narHash": "sha256-C7jVfohcGzdZRF6DO+ybyG/sqpo1h6bZi9T56sxLy+k=", + "lastModified": 1744932701, + "narHash": "sha256-fusHbZCyv126cyArUwwKrLdCkgVAIaa/fQJYFlCEqiU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c80f6a7e10b39afcc1894e02ef785b1ad0b0d7e5", + "rev": "b024ced1aac25639f8ca8fdfc2f8c4fbd66c48ef", "type": "github" }, "original": {