dev
/
nixfiles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Update nixpkgs and home-manager
CI / Check, build and cache Nix flake (push) Successful in 1h21m12s Details

This commit is contained in:
Jack O'Sullivan 2024-04-04 19:08:12 +01:00
parent 92896d8e52
commit d9d1150feb
9 changed files with 23 additions and 2242 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
devshell/commands.nix
View File

@ -52,7 +52,7 @@ in
name = "json2nix";
category = "utilities";
help = "Convert JSON to formatted Nix";
command = "nix eval --impure --expr 'builtins.fromJSON (builtins.readFile /dev/stdin)' | ${pkgs.nixfmt}/bin/nixfmt";
command = "nix eval --impure --expr 'builtins.fromJSON (builtins.readFile /dev/stdin)' | ${pkgs.nixfmt-rfc-style}/bin/nixfmt";
}
{

36
flake.lock
View File

@ -537,11 +537,11 @@
]
},
"locked": {
"lastModified": 1706981411,
"narHash": "sha256-cLbLPTL1CDmETVh4p0nQtvoF+FSEjsnJTFpTxhXywhQ=",
"lastModified": 1710888565,
"narHash": "sha256-s9Hi4RHhc6yut4EcYD50sZWRDKsugBJHSbON8KFwoTw=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "652fda4ca6dafeb090943422c34ae9145787af37",
"rev": "f33900124c23c4eca5831b9b5eb32ea5894375ce",
"type": "github"
},
"original": {
@ -557,11 +557,11 @@
]
},
"locked": {
"lastModified": 1710714957,
"narHash": "sha256-eZCxuF58YWgaJMMRrn8oRkwRhxooe5kBS/s2wRVr9PA=",
"lastModified": 1712212014,
"narHash": "sha256-s+lbaf3nLRn1++/X2eXwY9mYCA/m9l8AvyG8beeOaXE=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "7b3fca5adcf6c709874a8f2e0c364fe9c58db989",
"rev": "7e91f2a0ba4b62b88591279d54f741a13e36245b",
"type": "github"
},
"original": {
@ -623,11 +623,11 @@
},
"nixpkgs-mine": {
"locked": {
"lastModified": 1710779423,
"narHash": "sha256-p6g1xu9UOCKgptKJUibxWvz+E5kzcbd4YdP0pWeTD8U=",
"lastModified": 1712253442,
"narHash": "sha256-tRGZpTKQuMdKAuiRPaUkIGFlECMLA3pPv0pI7xzHT0I=",
"owner": "devplayer0",
"repo": "nixpkgs",
"rev": "9bcb3776d5c7ba6faf192761df3d3924f563de14",
"rev": "9b5a04c6fa83a3c7060d5576177ed96a9f67ad4a",
"type": "github"
},
"original": {
@ -639,11 +639,11 @@
},
"nixpkgs-mine-stable": {
"locked": {
"lastModified": 1710779149,
"narHash": "sha256-PPVvbwvboZpgWHDFqwLJgWoMmwKEjcv0uebKv21T+pE=",
"lastModified": 1712253482,
"narHash": "sha256-J6mDXmq50EdOtT9PJhOnlw64hFgi+iF9uqOWrJ7qgdI=",
"owner": "devplayer0",
"repo": "nixpkgs",
"rev": "3bc78f86abcc2e234b92beb0dd98f29c7ae88808",
"rev": "4d7f762c2a06b2fa24be9555532b42dd533e3398",
"type": "github"
},
"original": {
@ -655,11 +655,11 @@
},
"nixpkgs-stable": {
"locked": {
"lastModified": 1710695816,
"narHash": "sha256-3Eh7fhEID17pv9ZxrPwCLfqXnYP006RKzSs0JptsN84=",
"lastModified": 1712168706,
"narHash": "sha256-XP24tOobf6GGElMd0ux90FEBalUtw6NkBSVh/RlA6ik=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "614b4613980a522ba49f0d194531beddbb7220d3",
"rev": "1487bdea619e4a7a53a4590c475deabb5a9d1bfb",
"type": "github"
},
"original": {
@ -670,11 +670,11 @@
},
"nixpkgs-unstable": {
"locked": {
"lastModified": 1710631334,
"narHash": "sha256-rL5LSYd85kplL5othxK5lmAtjyMOBg390sGBTb3LRMM=",
"lastModified": 1712163089,
"narHash": "sha256-Um+8kTIrC19vD4/lUCN9/cU9kcOsD1O1m+axJqQPyMM=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "c75037bbf9093a2acb617804ee46320d6d1fea5a",
"rev": "fd281bd6b7d3e32ddfa399853946f782553163b5",
"type": "github"
},
"original": {

4
nixos/boxes/colony/vms/shill/containers/object.nix
View File

@ -226,10 +226,10 @@ in
wastebin = {
enable = true;
settings = {
WASTEBIN_MAX_BODY_SIZE = "67108864"; # 16 MiB
WASTEBIN_MAX_BODY_SIZE = 67108864; # 16 MiB
WASTEBIN_PASSWORD_SALT = "TeGhaemeer0Siez3";
};
extraSettingsFile = config.age.secrets."object/wastebin.env".path;
secretFile = config.age.secrets."object/wastebin.env".path;
};
};
}

1
nixos/modules/_list.nix
View File

@ -20,6 +20,5 @@
nvme = ./nvme;
spdk = ./spdk.nix;
librespeed = ./librespeed;
wastebin = ./wastebin.nix;
};
}

3
nixos/modules/tmproot.nix
View File

@ -492,7 +492,8 @@ in
}
];
})
(mkIf config.services.wastebin.enable {
# TODO: Wastebin is not in 23.11, remove check when 24.04 is released
(mkIf (config.services ? "wastebin" && config.services.wastebin.enable) {
my.tmproot.persistence.config.directories = [ "/var/lib/private/wastebin" ];
})
]))

35
nixos/modules/wastebin.nix
View File

@ -1,35 +0,0 @@
{ lib, pkgs, config, ... }:
let
inherit (lib) mkIf mkDefault;
inherit (lib.my) mkOpt' mkBoolOpt';
cfg = config.services.wastebin;
in
{
options.services.wastebin = with lib.types; {
enable = mkBoolOpt' false "Whether to enable wastebin.";
package = mkOpt' package pkgs.wastebin "Package to use.";
settings = mkOpt' (attrsOf str) { } "Environment variable settings.";
extraSettingsFile = mkOpt' (nullOr str) null "Extra environment file (e.g. for signing key).";
};
config = mkIf cfg.enable {
services.wastebin.settings = {
WASTEBIN_ADDRESS_PORT = mkDefault "[::]:8088";
WASTEBIN_DATABASE_PATH = mkDefault "/var/lib/wastebin/db.sqlite3";
};
systemd.services.wastebin = {
description = "wastebin minimal pastebin";
after = [ "network.target" ];
environment = cfg.settings;
serviceConfig = {
EnvironmentFile = mkIf (cfg.extraSettingsFile != null) cfg.extraSettingsFile;
DynamicUser = true;
StateDirectory = "wastebin";
ExecStart = "${cfg.package}/bin/wastebin";
};
wantedBy = [ "multi-user.target" ];
};
};
}

1
pkgs/default.nix
View File

@ -8,6 +8,5 @@ in
vfio-pci-bind = callPackage ./vfio-pci-bind.nix { };
librespeed-go = callPackage ./librespeed-go.nix { };
modrinth-app = callPackage ./modrinth-app { };
wastebin = callPackage ./wastebin { };
glfw-minecraft = callPackage ./glfw-minecraft { };
}

2161
pkgs/wastebin/Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

22
pkgs/wastebin/default.nix
View File

@ -1,22 +0,0 @@
{ lib
, fetchFromGitHub
, rustPlatform
}:
rustPlatform.buildRustPackage rec {
pname = "wastebin";
version = "2.4.2";
src = fetchFromGitHub {
owner = "matze";
repo = pname;
rev = version;
hash = "sha256-9SsNtIZfRK9HwWaqlsuSCs7eNK/7KnzDtCe0fFslXwA=";
};
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"rusqlite_migration-1.1.0" = "sha256-FpIwgISYWEg7IQxG4tJ3u6b8+qanaqanZrq0Bz5WlLs=";
};
};
}