makefu/nixos-config
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

pkgs: overlay with final,prev

Browse source
This commit is contained in:
makefu 2024-05-31 20:40:34 +02:00
parent f41a22a97d
commit 66d2369111
No known key found for this signature in database
GPG key ID: 36F7711F3FC0F225
1 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
5pkgs/default.nix
View file

@ -1,10 +1,10 @@
self: super: final: prev:
with super.lib; with builtins; let with prev.lib; with builtins; let
# This callPackage will try to detect obsolete overrides. # This callPackage will try to detect obsolete overrides.
callPackage = path: args: let callPackage = path: args: let
override = super.callPackage path args; override = prev.callPackage path args;
upstream = optionalAttrs (override ? "name") upstream = optionalAttrs (override ? "name")
(super.${(parseDrvName override.name).name} or {}); (prev.${(parseDrvName override.name).name} or {});
in if upstream ? "name" && in if upstream ? "name" &&
override ? "name" && override ? "name" &&
compareVersions upstream.name override.name != -1 compareVersions upstream.name override.name != -1
@ -20,12 +20,12 @@ with super.lib; with builtins; let
(filterAttrs (_: eq "directory") (readDir path)); (filterAttrs (_: eq "directory") (readDir path));
in { in {
quodlibet = verrideDerivation super.quodlibet (old: { quodlibet = verrideDerivation prev.quodlibet (old: {
doCheck = false; # 1 error because of warnings (possibly upstream) doCheck = false; # 1 error because of warnings (possibly upstream)
patches = [ ./custom/quodlibet/single-digit-discnumber.patch patches = [ ./custom/quodlibet/single-digit-discnumber.patch
./custom/quodlibet/remove-override-warning.patch ]; ./custom/quodlibet/remove-override-warning.patch ];
}); });
#rclone = super.pkgs.lib.overrideDerivation super.rclone (old: { #rclone = prev.pkgs.lib.overrideDerivation prev.rclone (old: {
# postInstall = old.postInstall + '' # postInstall = old.postInstall + ''
# $out/bin/rclone genautocomplete zsh _rclone # $out/bin/rclone genautocomplete zsh _rclone
@ -36,20 +36,20 @@ in {
#}); #});
# Hotfix for https://github.com/NixOS/nixpkgs/issues/157543 # Hotfix for https://github.com/NixOS/nixpkgs/issues/157543
collectd = super.collectd.override { xen = null; }; collectd = prev.collectd.override { xen = null; };
alsa-hdspconf = callPackage ./custom/alsa-tools { alsaToolTarget="hdspconf";}; alsa-hdspconf = callPackage ./custom/alsa-tools { alsaToolTarget="hdspconf";};
alsa-hdspmixer = callPackage ./custom/alsa-tools { alsaToolTarget="hdspmixer";}; alsa-hdspmixer = callPackage ./custom/alsa-tools { alsaToolTarget="hdspmixer";};
alsa-hdsploader = callPackage ./custom/alsa-tools { alsaToolTarget="hdsploader";}; alsa-hdsploader = callPackage ./custom/alsa-tools { alsaToolTarget="hdsploader";};
brother_ql_web = (builtins.getFlake "github:makefu/brother_ql_web?rev=a3f8625f48111da8cd6f8e562c966cdca445b82d").packages.x86_64-linux.default; brother_ql_web = (builtins.getFlake "github:makefu/brother_ql_web?rev=a3f8625f48111da8cd6f8e562c966cdca445b82d").packages.x86_64-linux.default;
qcma = super.libsForQt5.callPackage ./custom/qcma { }; qcma = prev.libsForQt5.callPackage ./custom/qcma { };
inherit (callPackage ./devpi {}) devpi-web ; inherit (callPackage ./devpi {}) devpi-web ;
nodemcu-uploader = super.pkgs.callPackage ./nodemcu-uploader {}; nodemcu-uploader = prev.pkgs.callPackage ./nodemcu-uploader {};
liveproxy = super.pkgs.python3Packages.callPackage ./custom/liveproxy {}; liveproxy = prev.pkgs.python3Packages.callPackage ./custom/liveproxy {};
mediawiki-matrix-bot = super.pkgs.python3Packages.callPackage ./custom/mediawiki-matrix-bot {}; mediawiki-matrix-bot = prev.pkgs.python3Packages.callPackage ./custom/mediawiki-matrix-bot {};
hydra-check = super.pkgs.python3Packages.callPackage ./custom/hydra-check {}; hydra-check = prev.pkgs.python3Packages.callPackage ./custom/hydra-check {};
pwqgen-ger = super.pkgs.passwdqc-utils.override { pwqgen-ger = prev.pkgs.passwdqc-utils.override {
wordset-file = super.pkgs.fetchurl { wordset-file = prev.pkgs.fetchurl {
urls = [ urls = [
https://gist.githubusercontent.com/makefu/b56f5554c9ef03fe6e09878962e6fd8d/raw/1f147efec51325bc9f80c823bad8381d5b7252f6/wordset_4k.c https://gist.githubusercontent.com/makefu/b56f5554c9ef03fe6e09878962e6fd8d/raw/1f147efec51325bc9f80c823bad8381d5b7252f6/wordset_4k.c
https://archive.org/download/nixos-stockholm-tarballs/pviar5j1gxiqcf3l34b4n2pil06xc8zf-wordset_4k.c https://archive.org/download/nixos-stockholm-tarballs/pviar5j1gxiqcf3l34b4n2pil06xc8zf-wordset_4k.c