libkookie: general refactoring after nixpkgs upgrade

wip/nixpkgs-raku
Katharina Fey 3 years ago
parent b050fb1e1d
commit 5eff0ad3e9
Signed by: kookie
GPG Key ID: F972AEEA2887D547
  1. 2
      infra/libkookie/build
  2. 2
      infra/libkookie/configuration/nix/default.nix
  3. 4
      infra/libkookie/configuration/workstation/redshift/default.nix
  4. 4
      infra/libkookie/overlays/kookie/barrel-blog/default.nix
  5. 2
      infra/libkookie/overlays/kookie/brook-frontend/default.nix
  6. 6
      infra/libkookie/overlays/kookie/invoice/default.nix
  7. 6
      infra/libkookie/overlays/patches/iosevka/default.nix
  8. 4
      infra/libkookie/overlays/staging/nodemcu-uploader/default.nix

@ -17,7 +17,7 @@ function build {
NIXPKGS_ALLOW_UNFREE=1 \
nix build -f '<nixpkgs/nixos>' system \
-I nixos-config="$ROOT" \
-I "nixpkgs=$DIR/nixpkgs" \
-I "nixpkgs=$DIR/nixpkgs/unstable" \
-I "nixpkgs-overlays=$DIR/overlays" \
-I "home-manager=$DIR/home-manager" \
-I "modules=$DIR/modules" \

@ -7,7 +7,7 @@
"nixos-config=/run/current-system/libkookie/roots/${config.networking.hostName}.nix"
"home-manager=/run/current-system/libkookie/home-manager"
"nixpkgs-overlays=/run/current-system/libkookie/overlays"
"nixpkgs=/run/current-system/libkookie/nixpkgs"
"nixpkgs=/run/current-system/libkookie/nixpkgs/unstable"
];
system.extraSystemBuilderCmds = ''

@ -4,7 +4,9 @@
services.redshift = {
enable = true;
temperature.night = 3000;
provider = "geoclue2";
provider = "manual";
latitude = "52.52";
longitude = "13.40";
tray = true;
};
}

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, pythonPackages }:
{ lib, stdenv, fetchFromGitHub, pythonPackages }:
let
json = with builtins; fromJSON (readFile ./meta.json);
@ -23,7 +23,7 @@ in
cp -rv output $out
'';
meta = with stdenv.lib; {
meta = with lib; {
description = "A static website running on https://barrel.spacekookie.de";
homepage = "https://barrel.spacekookie.de";
license = licenses.mit;

@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
mkdir $out
'';
meta = with stdenv.lib; {
meta = with lib; {
description = "The brook streaming web frontend";
homepage = "https://git.spacekookie.de/kookienomicon/apps/servers/brook";
license = licenses.agpl3;

@ -1,4 +1,4 @@
{ stdenv, makeWrapper, coreutils, findutils,
{ lib, stdenv, makeWrapper, coreutils, findutils,
gawk, pandoc, gnumake, texlive }:
stdenv.mkDerivation {
@ -14,13 +14,13 @@ stdenv.mkDerivation {
cp template.tex $out/share/
wrapProgram $out/bin/invoice \
--set PATH $out/bin:${stdenv.lib.makeBinPath
--set PATH $out/bin:${lib.makeBinPath
[ coreutils findutils gawk gnumake pandoc texlive.combined.scheme-full ]} \
--set TEMPLATE_FILE $out/share/template.tex
'';
meta = with stdenv.lib; {
meta = with lib; {
description = "Generate dynamic invoices based on yaml descriptors";
homepage = "https://git.sr.ht/~spacekookie/libkookie/";
license = licenses.gpl3;

@ -12,8 +12,8 @@ iosevka.override {
capital-j = "serifless";
a = "double-storey-tailed";
b = "toothless-corner";
d = "toothless-corner";
f = "tailed";
d = "toothless-corner-serifless";
f = "flat-hook-tailed";
g = "earless-corner";
i = "tailed";
j = "serifless";
@ -36,7 +36,7 @@ iosevka.override {
eight = "two-circles";
nine = "open-contour";
asterisk = "low";
asterisk = "hex-low";
at = "short";
dollar = "open";
number-sign = "upright";

@ -1,4 +1,4 @@
{ stdenv, python2, python2Packages, ... }:
{ lib, stdenv, python2, python2Packages }:
python2.pkgs.buildPythonApplication rec {
pname = "nodemcu-uploader";
@ -13,7 +13,7 @@ python2.pkgs.buildPythonApplication rec {
doCheck = false;
meta = with stdenv.lib; {
meta = with lib; {
description = "Lalalala";
homepage = https://www.foo.org;
license = licenses.mit;

Loading…
Cancel
Save