colin/nix-files
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

cargo-docset: replace with nixpkgs-level patch (for upstreaming)

Browse Source
This commit is contained in:
Colin 2023-05-10 22:36:27 +00:00
parent 99eb0962ad
commit e71079b354
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
nixpatches/list.nix
View File

@ -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";

2
pkgs/default.nix
View File

@ -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 { };