diff options
| -rw-r--r-- | flake.lock | 40 | ||||
| -rw-r--r-- | flora/services/cgit.nix | 6 |
2 files changed, 21 insertions, 25 deletions
@@ -35,7 +35,7 @@ "blog": { "flake": false, "locked": { - "narHash": "sha256-FzljOB8PpukwCP1XxfJsAJSBX5Im0VK462P6rbk8LDc=", + "narHash": "sha256-rvo/7QNbTkD7a7h7zq5J8Eft5YdlwNJXB4lw012sPgo=", "path": "/home/stuebinm/projects/blog", "rev": "61d09465b5285f4c5d5420cc9aa3f483072fb765", "type": "path" @@ -55,11 +55,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1659725433, - "narHash": "sha256-1ZxuK67TL29YLw88vQ18Y2Y6iYg8Jb7I6/HVzmNB6nM=", + "lastModified": 1668166163, + "narHash": "sha256-XCuM+n98KcG0v+DT1HolGCO3j5FOBUjV4K8YcZsVeQw=", "owner": "serokell", "repo": "deploy-rs", - "rev": "41f15759dd8b638e7b4f299730d94d5aa46ab7eb", + "rev": "b011f13bc577b978f52aaefde5605332f7bca7e9", "type": "github" }, "original": { @@ -71,7 +71,7 @@ "feeds": { "flake": false, "locked": { - "narHash": "sha256-kUVP8HdLOhrYFjf5q+btB8nftU7ATu+aWufQ4h+E0wU=", + "narHash": "sha256-W9LCdDQ96pw/ewGznNpHeIv6EGYIxLfJmflmhwUdVjE=", "path": "/home/stuebinm/nonpublic.nix", "type": "path" }, @@ -151,11 +151,11 @@ ] }, "locked": { - "lastModified": 1656169755, - "narHash": "sha256-Nlnm4jeQWEGjYrE6hxi/7HYHjBSZ/E0RtjCYifnNsWk=", + "lastModified": 1667907331, + "narHash": "sha256-bHkAwkYlBjkupPUFcQjimNS8gxWSWjOTevEuwdnp5m0=", "owner": "nix-community", "repo": "home-manager", - "rev": "4a3d01fb53f52ac83194081272795aa4612c2381", + "rev": "6639e3a837fc5deb6f99554072789724997bc8e5", "type": "github" }, "original": { @@ -187,11 +187,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1667221253, - "narHash": "sha256-PGGT7D/qmi1E8D1Z32SLrzq7PJO5CajD64GfCCdslk0=", + "lastModified": 1668157555, + "narHash": "sha256-s5rt2FSmV4PWt89rjt4cvBGOhPizStsinkIB0BXnKrk=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "d5bacd34f54328f31bef9237098fdeaad83074be", + "rev": "062c3cca468a4b404ddd964fb444b665e4da982e", "type": "github" }, "original": { @@ -201,11 +201,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1664831710, - "narHash": "sha256-RBzKHMVbKuWICAUOz5hLuIWtnP8htLvbWxDcw+zI4pw=", + "lastModified": 1668281765, + "narHash": "sha256-6Tuj9CZ9HacMk7FJ8sF9XSVTBnUhVzlSY40Jo1krIaQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "574f4f298c3e37ce286c64eee5862bb11f652871", + "rev": "c5091eec689acc45d4d818109236da31d3685ca2", "type": "github" }, "original": { @@ -232,11 +232,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1664817920, - "narHash": "sha256-lGYXsICzTMOvFOcS4N/hmHxOuqnOeuHUGrETefq9u3c=", + "lastModified": 1668231603, + "narHash": "sha256-/4br947zgRqABb52iLF4DCHgD49Fw5aQ6/IdTwaM95E=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e166ced03f34f5c22a1a643aac860003d9c409b7", + "rev": "d8f2c4d846a2e65ad3f5a5e842b672f0b81588a2", "type": "github" }, "original": { @@ -325,11 +325,11 @@ "sfz": { "flake": false, "locked": { - "lastModified": 1663678523, - "narHash": "sha256-GtHsEdvBUG3xnnX02tQPs0zZi/nOiBemZhTTyv2LpqI=", + "lastModified": 1664983522, + "narHash": "sha256-825aD/faf/wS+dh6DAfWCXHQtLGKx93JRUQyn/ZxOC4=", "owner": "weihanglo", "repo": "sfz", - "rev": "de0761c6243fbc564dddfb8dbbb994cb05320627", + "rev": "174392788679424523a52c217dbf3e3ae784c3d8", "type": "github" }, "original": { diff --git a/flora/services/cgit.nix b/flora/services/cgit.nix index 11c6d72..046d837 100644 --- a/flora/services/cgit.nix +++ b/flora/services/cgit.nix @@ -54,10 +54,6 @@ let clone-url=https://stuebinm.eu/git/forks/$CGIT_REPO_URL scan-path=/var/git/forks ''; - - cgit = pkgs.cgit.overrideAttrs (old: { - patches = [ ./0001-main-instead-of-master-branch.patch ]; - }); in { services.fcgiwrap = { @@ -73,7 +69,7 @@ in locations."~ /git(/.*)".extraConfig = '' fastcgi_pass unix:${config.services.fcgiwrap.socketAddress}; include ${pkgs.nginx}/conf/fastcgi_params; - fastcgi_param SCRIPT_FILENAME ${cgit}/cgit/cgit.cgi; + fastcgi_param SCRIPT_FILENAME ${pkgs.cgit}/cgit/cgit.cgi; fastcgi_param CGIT_CONFIG ${pkgs.writeText "cgit.conf" cgitconf}; fastcgi_param PATH_INFO $1; ''; |