diff --git a/nixpatches/list.nix b/nixpatches/list.nix index 0cf887c8..16f78f6d 100644 --- a/nixpatches/list.nix +++ b/nixpatches/list.nix @@ -1,4 +1,9 @@ -{ fetchpatch, fetchurl }: [ +{ fetchpatch, fetchurl }: +let + sane = { commit, hash ? null }: fetchpatch ({ + url = "https://git.uninsane.org/colin/nixpkgs/commit/${commit}.diff"; + } // (if hash != null then { inherit hash; } else {})); +in [ # splatmoji: init at 1.2.0 (fetchpatch { @@ -40,6 +45,11 @@ ./2023-04-29-lemmy.patch + (sane { + commit = "5a09e84c6159ce545029483384580708bc04c08f"; + hash = "sha256-Z1HOps3w/WvxAiyUAHWszKqwS9EwA6rf4XfgPGp+2sQ="; + }) + # 2023-04-20: perl: fix modules for compatibility with miniperl # (fetchpatch { # url = "https://github.com/NixOS/nixpkgs/pull/225640.diff"; diff --git a/pkgs/default.nix b/pkgs/default.nix index 91dffe8f..9830dac6 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -13,7 +13,6 @@ let ### ADDITIONAL PACKAGES bootpart-uefi-x86_64 = callPackage ./additional/bootpart-uefi-x86_64 { }; browserpass-extension = callPackage ./additional/browserpass-extension { }; - cargo-docset = callPackage ./additional/cargo-docset { }; cargoDocsetHook = callPackage ./additional/cargo-docset/hook.nix { }; feeds = lib.recurseIntoAttrs (callPackage ./additional/feeds { }); gopass-native-messaging-host = callPackage ./additional/gopass-native-messaging-host { }; @@ -41,6 +40,7 @@ let # ubootRaspberryPi4_64bit = callPackage ./additional/ubootRaspberryPi4_64bit { }; # provided by nixpkgs patch or upstream PR + # cargo-docset = callPackage ./additional/cargo-docset { }; # splatmoji = callPackage ./additional/splatmoji { };