env: add whalebird Pleroma client

This commit is contained in:
colin 2022-05-23 20:45:33 -07:00
parent 4c8a0f7562
commit 743eaec331
3 changed files with 27 additions and 4 deletions

View File

@ -118,6 +118,21 @@
"type": "indirect"
}
},
"pkgs-unstable": {
"locked": {
"lastModified": 1653060744,
"narHash": "sha256-kfRusllRumpt33J1hPV+CeCCylCXEU7e0gn2/cIM7cY=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "dfd82985c273aac6eced03625f454b334daae2e8",
"type": "github"
},
"original": {
"id": "nixpkgs",
"ref": "nixos-unstable",
"type": "indirect"
}
},
"root": {
"inputs": {
"home-manager": "home-manager",
@ -125,7 +140,8 @@
"nixpkgs": "nixpkgs",
"nurpkgs": "nurpkgs",
"pkgs-gitea": "pkgs-gitea",
"pkgs-mobile": "pkgs-mobile"
"pkgs-mobile": "pkgs-mobile",
"pkgs-unstable": "pkgs-unstable"
}
}
},

View File

@ -13,6 +13,7 @@
{
inputs = {
nixpkgs.url = "nixpkgs/nixos-21.11";
pkgs-unstable.url = "nixpkgs/nixos-unstable";
pkgs-gitea.url = "nixpkgs/c777cdf5c564015d5f63b09cc93bef4178b19b01";
# pkgs-mobile.url = "nixpkgs/6daa4a5c045d40e6eae60a3b6e427e8700f1c07f"; # currently pinned to mobile-nixos tip -> fails building lvgui
pkgs-mobile.url = "nixpkgs/7e567a3d092b7de69cdf5deaeb8d9526de230916"; # 2021/06/21, coordinated with mobile-nixos 85557dca93ae574eaa7dc7b1877edf681a280d35 ; builds linux, but no errors after running for 4 hours
@ -36,7 +37,7 @@
nurpkgs.url = "github:nix-community/NUR";
};
outputs = { self, nixpkgs, pkgs-gitea, pkgs-mobile, mobile-nixos, home-manager, nurpkgs }: {
outputs = { self, nixpkgs, pkgs-unstable, pkgs-gitea, pkgs-mobile, mobile-nixos, home-manager, nurpkgs }: {
machines.uninsane = self.decl-bootable-machine { name = "uninsane"; system = "aarch64-linux"; };
machines.desko = self.decl-bootable-machine { name = "desko"; system = "x86_64-linux"; };
machines.lappy = self.decl-bootable-machine { name = "lappy"; system = "x86_64-linux"; };
@ -122,14 +123,18 @@
# fix abrupt HDD poweroffs as during reboot. patching systemd requires rebuilding nearly every package.
# systemd = import ./pkgs/systemd { pkgs = prev; };
# patch rpi uboot with something that fixes USB HDD boot
ubootRaspberryPi4_64bit = next.callPackage ./pkgs/ubootRaspberryPi4_64bit { pkgs = prev; };
#### nixos-unstable packages
# gitea: 1.16.5 contains a fix which makes manual user approval *actually* work.
# https://github.com/go-gitea/gitea/pull/19119
# safe to remove after 1.16.5 (or 1.16.7 if we need db compat?)
gitea = pkgs-gitea.legacyPackages."${system}".gitea;
# patch rpi uboot with something that fixes USB HDD boot
ubootRaspberryPi4_64bit = next.callPackage ./pkgs/ubootRaspberryPi4_64bit { pkgs = prev; };
# nixos-21.11 whalebird uses an insecure electron version.
# TODO: remove this on next nixos release.
whalebird = pkgs-unstable.legacyPackages.${system}.whalebird;
})
];
};

View File

@ -142,6 +142,8 @@
pkgs.libreoffice-fresh # XXX colin: maybe don't want this on mobile
pkgs.mesa-demos
pkgs.tdesktop
# pleroma client. TODO: port this to nix: https://craftplacer.moe/projects/kaiteki/
pkgs.whalebird
pkgs.vlc
] else [])
++ (if gui == "gnome" then