pkgs: clean up the imports to not explicitly pass pkgs
This commit is contained in:
parent
c6850aff23
commit
364a598324
|
|
@ -85,7 +85,8 @@ let
|
|||
# XXX by default fractal stores its state in ~/.local/share/<UUID>.
|
||||
# after logging in, manually change ~/.local/share/keyrings/... to point it to some predictable subdir.
|
||||
# then reboot (so that libsecret daemon re-loads the keyring...?)
|
||||
{ pkg = fractal-next; private = ".local/share/fractal"; }
|
||||
{ pkg = fractal-latest; private = ".local/share/fractal"; }
|
||||
# { pkg = fractal-next; private = ".local/share/fractal"; }
|
||||
|
||||
gajim # XMPP client
|
||||
gimp # broken on phosh
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
{ stdenv, pkgs }:
|
||||
{ stdenv, tow-boot-rp4, raspberrypifw, raspberrypi-armstubs }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bootpart-tow-boot-rpi-aarch64";
|
||||
version = "1";
|
||||
|
||||
buildInputs = with pkgs; [
|
||||
buildInputs = with [
|
||||
tow-boot-rpi4 # for Tow-Boot.*.bin
|
||||
raspberrypifw # for bootcode.bin, *.dat, *.elf, *.dtb
|
||||
raspberrypi-armstubs # for armstub*
|
||||
|
|
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
dontUnpack = true;
|
||||
|
||||
installPhase = with pkgs; ''
|
||||
installPhase = ''
|
||||
mkdir "$out"
|
||||
cp ${tow-boot-rpi4}/Tow-Boot.noenv.*.bin "$out"/
|
||||
cp -R ${raspberrypifw}/share/raspberrypi/boot/*.dtb "$out"/
|
||||
|
|
|
|||
|
|
@ -1,10 +1,14 @@
|
|||
{ stdenv, pkgs }:
|
||||
{ stdenv
|
||||
, ubootRaspberryPi4_64bit
|
||||
, raspberrypifw
|
||||
, raspberrypi-armstubs
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bootpart-u-boot-rpi-aarch64";
|
||||
version = "1";
|
||||
|
||||
buildInputs = with pkgs; [
|
||||
buildInputs = [
|
||||
ubootRaspberryPi4_64bit
|
||||
raspberrypifw # for bootcode.bin, *.dat, *.elf, *.dtb
|
||||
raspberrypi-armstubs # for armstub*
|
||||
|
|
@ -15,7 +19,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
dontUnpack = true;
|
||||
|
||||
installPhase = with pkgs; ''
|
||||
installPhase = ''
|
||||
mkdir "$out"
|
||||
cp ${ubootRaspberryPi4_64bit}/u-boot.bin "$out"/
|
||||
cp ${ubootRaspberryPi4_64bit}/*.dtb "$out"/
|
||||
|
|
|
|||
|
|
@ -1,14 +1,14 @@
|
|||
{ stdenv, pkgs }:
|
||||
{ stdenv, syslinux }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bootpart-uefi-x86_64";
|
||||
version = "1";
|
||||
|
||||
buildInputs = [ pkgs.syslinux ];
|
||||
buildInputs = [ syslinux ];
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
installPhase = with pkgs; ''
|
||||
installPhase = ''
|
||||
# populate the EFI directory with syslinux, and configure it to read that extlinux.conf file managed by nixos
|
||||
mkdir -p "$out/EFI/syslinux" "$out/EFI/BOOT" "$out/syslinux"
|
||||
cp -R "${syslinux}/share/syslinux/efi64"/* "$out/EFI/syslinux"
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
{ pkgs
|
||||
{ lib
|
||||
, browserpass
|
||||
, bash
|
||||
, fetchFromGitea
|
||||
, gnused
|
||||
, lib
|
||||
, sane-scripts
|
||||
, sops
|
||||
, stdenv
|
||||
|
|
@ -26,7 +26,7 @@ let
|
|||
|
||||
};
|
||||
in
|
||||
(pkgs.browserpass.overrideAttrs (upstream: {
|
||||
(browserpass.overrideAttrs (upstream: {
|
||||
src = fetchFromGitea {
|
||||
domain = "git.uninsane.org";
|
||||
owner = "colin";
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{ pkgs }:
|
||||
{ firefox-unwrapped }:
|
||||
|
||||
(pkgs.firefox-unwrapped.overrideAttrs (upstream: {
|
||||
(firefox-unwrapped.overrideAttrs (upstream: {
|
||||
# NB: firefox takes about 1hr to build on my 24-thread ryzen desktop
|
||||
patches = (upstream.patches or []) ++ [
|
||||
# see https://gitlab.com/librewolf-community/browser/source/-/blob/main/patches/sed-patches/allow-searchengines-non-esr.patch
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
{ pkgs }:
|
||||
{ symlinkJoin, fluffychat, makeWrapper }:
|
||||
|
||||
(pkgs.symlinkJoin {
|
||||
(symlinkJoin {
|
||||
name = "fluffychat-moby";
|
||||
paths = [ pkgs.fluffychat ];
|
||||
buildInputs = [ pkgs.makeWrapper ];
|
||||
paths = [ fluffychat ];
|
||||
buildInputs = [ makeWrapper ];
|
||||
|
||||
# ordinary fluffychat on moby displays blank window;
|
||||
# > Failed to start Flutter renderer: Unable to create a GL context
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{ pkgs, lib, ... }:
|
||||
{ gocryptfs, fuse, util-linux, lib }:
|
||||
|
||||
(pkgs.gocryptfs.overrideAttrs (upstream: {
|
||||
(gocryptfs.overrideAttrs (upstream: {
|
||||
# XXX `su colin` hangs when pam_mount tries to mount a gocryptfs system
|
||||
# unless `logger` (util-linux) is accessible from gocryptfs.
|
||||
# this is surprising: the code LOOKS like it's meant to handle logging failures.
|
||||
|
|
@ -9,7 +9,7 @@
|
|||
# TODO: see about upstreaming this
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/gocryptfs \
|
||||
--suffix PATH : ${lib.makeBinPath [ pkgs.fuse pkgs.util-linux ]}
|
||||
--suffix PATH : ${lib.makeBinPath [ fuse util-linux ]}
|
||||
ln -s $out/bin/gocryptfs $out/bin/mount.fuse.gocryptfs
|
||||
'';
|
||||
}))
|
||||
|
|
|
|||
|
|
@ -1,12 +1,14 @@
|
|||
{ pkgs
|
||||
{ makeWrapper
|
||||
, gpodder
|
||||
, symlinkJoin
|
||||
, writeShellScript
|
||||
, config
|
||||
}:
|
||||
|
||||
(pkgs.symlinkJoin {
|
||||
(symlinkJoin {
|
||||
name = "gpodder-configured";
|
||||
paths = [ pkgs.gpodder ];
|
||||
buildInputs = [ pkgs.makeWrapper ];
|
||||
paths = [ gpodder ];
|
||||
buildInputs = [ makeWrapper ];
|
||||
|
||||
# gpodder keeps all its feeds in a sqlite3 database.
|
||||
# we can configure the feeds externally by wrapping gpodder and just instructing it to import
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{ pkgs }:
|
||||
{ jackett }:
|
||||
|
||||
(pkgs.jackett.overrideAttrs (upstream: {
|
||||
(jackett.overrideAttrs (upstream: {
|
||||
# 2022-07-29: check phase segfaults on arm (with or without my patches)
|
||||
doCheck = false;
|
||||
patches = (upstream.patches or []) ++ [
|
||||
|
|
|
|||
|
|
@ -3,14 +3,14 @@
|
|||
sane-scripts = prev.callPackage ./sane-scripts { };
|
||||
tow-boot-pinephone = prev.callPackage ./tow-boot-pinephone { };
|
||||
tow-boot-rpi4 = prev.callPackage ./tow-boot-rpi4 { };
|
||||
bootpart-uefi-x86_64 = prev.callPackage ./bootpart-uefi-x86_64 { pkgs = prev; };
|
||||
bootpart-uefi-x86_64 = prev.callPackage ./bootpart-uefi-x86_64 { };
|
||||
bootpart-tow-boot-rpi-aarch64 = prev.callPackage ./bootpart-tow-boot-rpi-aarch64 {
|
||||
# not sure why i can't just do pkgs = next here
|
||||
pkgs = prev // { inherit tow-boot-rpi4; };
|
||||
# not sure why i can't just do `next.callPackage` instead
|
||||
inherit tow-boot-rpi4;
|
||||
};
|
||||
bootpart-u-boot-rpi-aarch64 = prev.callPackage ./bootpart-u-boot-rpi-aarch64 {
|
||||
# not sure why i can't just do pkgs = next here
|
||||
pkgs = prev // { inherit ubootRaspberryPi4_64bit; };
|
||||
# not sure why i can't just do `next.callPackage` instead
|
||||
inherit ubootRaspberryPi4_64bit;
|
||||
};
|
||||
rtl8723cs-firmware = prev.callPackage ./rtl8723cs-firmware { };
|
||||
linux-megous = prev.callPackage ./linux-megous {
|
||||
|
|
@ -23,27 +23,27 @@
|
|||
sublime-music-mobile = prev.callPackage ./sublime-music-mobile { };
|
||||
|
||||
#### customized packages
|
||||
fluffychat-moby = prev.callPackage ./fluffychat-moby { pkgs = prev; };
|
||||
gpodder-configured = prev.callPackage ./gpodder-configured { pkgs = prev; };
|
||||
fluffychat-moby = prev.callPackage ./fluffychat-moby { };
|
||||
gpodder-configured = prev.callPackage ./gpodder-configured { };
|
||||
# nixos-unstable pleroma is too far out-of-date for our db
|
||||
pleroma = prev.callPackage ./pleroma { };
|
||||
# jackett doesn't allow customization of the bind address: this will probably always be here.
|
||||
jackett = prev.callPackage ./jackett { pkgs = prev; };
|
||||
jackett = prev.callPackage ./jackett { inherit (prev) jackett; };
|
||||
# mozilla keeps nerfing itself and removing configuration options
|
||||
firefox-unwrapped = prev.callPackage ./firefox-unwrapped { pkgs = prev; };
|
||||
firefox-unwrapped = prev.callPackage ./firefox-unwrapped { };
|
||||
|
||||
# patch rpi uboot with something that fixes USB HDD boot
|
||||
ubootRaspberryPi4_64bit = prev.callPackage ./ubootRaspberryPi4_64bit { pkgs = prev; };
|
||||
ubootRaspberryPi4_64bit = prev.callPackage ./ubootRaspberryPi4_64bit { };
|
||||
|
||||
gocryptfs = prev.callPackage ./gocryptfs { pkgs = prev; };
|
||||
gocryptfs = prev.callPackage ./gocryptfs { inherit (prev) gocryptfs; };
|
||||
|
||||
browserpass = prev.callPackage ./browserpass { pkgs = prev; inherit sane-scripts; };
|
||||
browserpass = prev.callPackage ./browserpass { inherit (prev) browserpass; inherit sane-scripts; };
|
||||
|
||||
fractal-latest = prev.callPackage ./fractal-latest { };
|
||||
|
||||
#### TEMPORARY: PACKAGES WAITING TO BE UPSTREAMED
|
||||
kaiteki = prev.callPackage ./kaiteki { };
|
||||
lightdm-mobile-greeter = prev.callPackage ./lightdm-mobile-greeter { pkgs = next; };
|
||||
lightdm-mobile-greeter = prev.callPackage ./lightdm-mobile-greeter { };
|
||||
browserpass-extension = prev.callPackage ./browserpass-extension { };
|
||||
gopass-native-messaging-host = prev.callPackage ./gopass-native-messaging-host { };
|
||||
tokodon = prev.libsForQt5.callPackage ./tokodon { };
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{ pkgs, fetchurl }:
|
||||
{ buildUBoot, fetchurl }:
|
||||
|
||||
(pkgs.buildUBoot {
|
||||
(buildUBoot {
|
||||
# nixos-22.05 is on 2022.01 at time of writing, which lacks rpi-4 dtb.
|
||||
# TODO: remove this version/src override once upstream bumps u-boot version.
|
||||
version = "2022.04";
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user