diff --git a/config/instance-20221213-1915.nix b/config/instance-20221213-1915.nix index 010ce821..f026b2b9 100644 --- a/config/instance-20221213-1915.nix +++ b/config/instance-20221213-1915.nix @@ -3,8 +3,7 @@ lib, modulesPath, ... -}@args: -{ +} @ args: { networking.hostName = "instance-20221213-1915"; networking.hostId = "746d4523"; @@ -33,9 +32,9 @@ "virtio_pci" "usbhid" ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ ]; - boot.extraModulePackages = [ ]; + boot.initrd.kernelModules = []; + boot.kernelModules = []; + boot.extraModulePackages = []; fileSystems."/" = { device = "tank/local/root"; @@ -94,7 +93,7 @@ services.postgresql.dataDir = "/persist/var/lib/postgresql/${config.services.postgresql.package.psqlSchema}"; - networking.wireguard.interfaces."wg0".ips = [ "fd0d:a262:1fa6:e621:746d:4523:5c04:1453/64" ]; + networking.wireguard.interfaces."wg0".ips = ["fd0d:a262:1fa6:e621:746d:4523:5c04:1453/64"]; home-manager.users.darkkirb = import ./home-manager/darkkirb.nix { desktop = false; inherit args; @@ -127,8 +126,8 @@ owner = "root"; path = "/etc/secrets/initrd/ssh_host_ed25519_key"; }; - sops.age.sshKeyPaths = lib.mkForce [ "/persist/ssh/ssh_host_ed25519_key" ]; - services.bind.forwarders = lib.mkForce [ ]; + sops.age.sshKeyPaths = lib.mkForce ["/persist/ssh/ssh_host_ed25519_key"]; + services.bind.forwarders = lib.mkForce []; boot.loader.systemd-boot.configurationLimit = lib.mkForce 1; services.tailscale.useRoutingFeatures = "server"; services.postgresql.settings = { @@ -150,5 +149,5 @@ max_parallel_maintenance_workers = 2; }; - services.restic.backups.sysbackup.paths = [ "/persist" ]; + services.restic.backups.sysbackup.paths = ["/persist"]; } diff --git a/config/nix.nix b/config/nix.nix index 0a2c0d63..0b2dc010 100644 --- a/config/nix.nix +++ b/config/nix.nix @@ -5,8 +5,7 @@ system, attic, ... -}: -{ +}: { imports = [ ./workarounds ]; @@ -38,8 +37,7 @@ dates = "weekly"; options = "--delete-older-than 7d"; }; - buildMachines = - with lib; + buildMachines = with lib; mkMerge [ (mkIf (config.networking.hostName != "instance-20221213-1915") [ { @@ -175,7 +173,9 @@ #!${pkgs.bash}/bin/bash set -ex builds=$(${pkgs.curl}/bin/curl -H 'accept: application/json' https://hydra.int.chir.rs/jobset/flakes/${ - if config.networking.hostName != "vf2" then "nixos-config" else "nixos-config-riscv" + if config.networking.hostName != "vf2" + then "nixos-config" + else "nixos-config-riscv" }/evals | ${pkgs.jq}/bin/jq -r '.evals[0].builds[]') for build in $builds; do doc=$(${pkgs.curl}/bin/curl -H 'accept: application/json' https://hydra.int.chir.rs/build/$build) @@ -187,32 +187,31 @@ ${pkgs.nix}/bin/nix-env -p /nix/var/nix/profiles/system --set $output ${ - if config.networking.hostName != "nixos-8gb-fsn1-1" then - '' - $output/bin/switch-to-configuration boot - booted="$(${pkgs.coreutils}/bin/readlink /run/booted-system/{initrd,kernel,kernel-modules})" - built="$(${pkgs.coreutils}/bin/readlink $output/{initrd,kernel,kernel-modules})" - if [ "$booted" = "$built" ]; then - $output/bin/switch-to-configuration switch - else - ${pkgs.systemd}/bin/shutdown -r +1 - fi - exit - '' - else - "$output/bin/switch-to-configuration switch" - } + if config.networking.hostName != "nixos-8gb-fsn1-1" + then '' + $output/bin/switch-to-configuration boot + booted="$(${pkgs.coreutils}/bin/readlink /run/booted-system/{initrd,kernel,kernel-modules})" + built="$(${pkgs.coreutils}/bin/readlink $output/{initrd,kernel,kernel-modules})" + if [ "$booted" = "$built" ]; then + $output/bin/switch-to-configuration switch + else + ${pkgs.systemd}/bin/shutdown -r +1 + fi + exit + '' + else "$output/bin/switch-to-configuration switch" + } fi done ''; - after = [ "network-online.target" ]; - wants = [ "network-online.target" ]; + after = ["network-online.target"]; + wants = ["network-online.target"]; }; systemd.timers.nixos-upgrade = { enable = true; description = "Automatically update nixos"; - requires = [ "nixos-upgrade.service" ]; - wantedBy = [ "multi-user.target" ]; + requires = ["nixos-upgrade.service"]; + wantedBy = ["multi-user.target"]; timerConfig = { OnUnitActiveSec = "30min"; RandomizedDelaySec = "1h"; diff --git a/config/services/hydra.nix b/config/services/hydra.nix index 2ae6a0be..56b8aa55 100644 --- a/config/services/hydra.nix +++ b/config/services/hydra.nix @@ -7,8 +7,7 @@ hydra, nix-eval-jobs, ... -}: -let +}: let machines = pkgs.writeText "machines" '' localhost armv7l-linux,powerpc-linux,powerpc64-linux,powerpc64le-linux,wasm32-wasi,x86_64-linux,i686-linux,riscv32-linux,riscv64-linux - 12 1 kvm,nixos-test,big-parallel,benchmark,gccarch-znver1,gccarch-skylake,ca-derivations - build-aarch64 aarch64-linux,riscv32-linux,riscv64-linux - 4 1 nixos-test,benchmark,ca-derivations,gccarch-armv8-a,gccarch-armv8.1-a,gccarch-armv8.2-a,big-parallel - @@ -65,8 +64,7 @@ let --subst-var-by ssh ${pkgs.openssh}/bin/ssh ''; }; -in -{ +in { imports = [ ./postgres.nix ../../modules/hydra.nix @@ -80,17 +78,21 @@ in package = hydra.packages.${system}.hydra.overrideAttrs (super: { doCheck = false; doInstallCheck = false; - patches = super.patches or [ ] ++ [ - ./hydra/0001-add-gitea-pulls.patch - ./hydra/0002-unlimit-output.patch - ./hydra/0003-remove-pr-number-from-github-job-name.patch - ./hydra/0004-use-pulls-instead-of-issues.patch - ./hydra/0005-only-list-open-prs.patch - ./hydra/0006-status-state.patch - ./hydra/0007-hydra-server-findLog-fix-issue-with-ca-derivations-e.patch - ]; + patches = + super.patches + or [] + ++ [ + ./hydra/0001-add-gitea-pulls.patch + ./hydra/0002-unlimit-output.patch + ./hydra/0003-remove-pr-number-from-github-job-name.patch + ./hydra/0004-use-pulls-instead-of-issues.patch + ./hydra/0005-only-list-open-prs.patch + ./hydra/0006-status-state.patch + ./hydra/0007-hydra-server-findLog-fix-issue-with-ca-derivations-e.patch + ]; postPatch = - super.postPatch or "" + super.postPatch + or "" + '' substituteInPlace src/script/hydra-eval-jobset --replace-fail nix-eval-jobs ${nix-eval-jobs-script} ''; @@ -138,8 +140,8 @@ in "https://" "http://" ]; - sops.secrets."services/hydra/gitea_token" = { }; - sops.secrets."services/hydra/github_token" = { }; + sops.secrets."services/hydra/gitea_token" = {}; + sops.secrets."services/hydra/github_token" = {}; sops.secrets."services/hydra/cache-key" = { owner = "hydra-www"; mode = "0440"; @@ -158,7 +160,7 @@ in sops.secrets."services/hydra/aws_credentials" = { owner = "hydra-queue-runner"; path = "/var/lib/hydra/queue-runner/.aws/credentials"; - restartUnits = [ "hydra-notify.service" ]; + restartUnits = ["hydra-notify.service"]; }; systemd.services.update-hydra-hosts = { description = "Update hydra hosts"; @@ -176,21 +178,21 @@ in systemd.timers.update-hydra-hosts = { enable = true; description = "Update hydra hosts"; - requires = [ "update-hydra-hosts.service" ]; - wantedBy = [ "multi-user.target" ]; + requires = ["update-hydra-hosts.service"]; + wantedBy = ["multi-user.target"]; timerConfig = { OnBootSec = 300; OnUnitActiveSec = 300; }; }; - nix.settings.trusted-users = [ "@hydra" ]; + nix.settings.trusted-users = ["@hydra"]; sops.secrets."hydra/ssh/builder_id_ed25519" = { sopsFile = ../../secrets/shared.yaml; owner = "hydra-queue-runner"; key = "ssh/builder_id_ed25519"; path = "/var/lib/hydra/queue-runner/.ssh/builder_id_ed25519"; }; - system.activationScripts.setupHydraSshConfig = lib.stringAfter [ "var" ] '' + system.activationScripts.setupHydraSshConfig = lib.stringAfter ["var"] '' mkdir -p /var/lib/hydra/queue-runner/.ssh/ chown -Rv hydra-queue-runner /var/lib/hydra/queue-runner ln -svf ${sshConfig} /var/lib/hydra/queue-runner/.ssh/config @@ -212,7 +214,7 @@ in systemd.services."attic-queue" = { description = "Upload build results"; - wantedBy = [ "multi-user.target" ]; + wantedBy = ["multi-user.target"]; serviceConfig = { User = "hydra-queue-runner"; Group = "hydra"; diff --git a/config/services/jellyfin.nix b/config/services/jellyfin.nix index aab6ad60..1461fcf3 100644 --- a/config/services/jellyfin.nix +++ b/config/services/jellyfin.nix @@ -1,5 +1,4 @@ -{ pkgs, ... }: -{ +{pkgs, ...}: { services.jellyfin.enable = true; environment.systemPackages = [ pkgs.jellyfin diff --git a/flake.lock b/flake.lock index c79bf8ce..d090b79b 100644 --- a/flake.lock +++ b/flake.lock @@ -272,11 +272,11 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "lastModified": 1732722421, + "narHash": "sha256-HRJ/18p+WoXpWJkcdsk9St5ZiukCqSDgbOGFa8Okehg=", "owner": "edolstra", "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "rev": "9ed2ac151eada2306ca8c418ebd97807bb08f6ac", "type": "github" }, "original": { @@ -501,11 +501,11 @@ ] }, "locked": { - "lastModified": 1732482255, - "narHash": "sha256-GUffLwzawz5WRVfWaWCg78n/HrBJrOG7QadFY6rtV8A=", + "lastModified": 1733045511, + "narHash": "sha256-n8AldXJRNVMm2UZ6yN0HwVxlARY2Cm/uhdOw76tQ0OI=", "owner": "nix-community", "repo": "home-manager", - "rev": "a9953635d7f34e7358d5189751110f87e3ac17da", + "rev": "4964f3c6fc17ae4578e762d3dc86b10fe890860e", "type": "github" }, "original": { @@ -521,11 +521,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1732604572, - "narHash": "sha256-wvYmjilEDJIEbu59sAcd07zAzVc+SKWKG0Q4+Nilm5s=", + "lastModified": 1732915394, + "narHash": "sha256-OIPFkXbL1DzswQvNuds9Sm6r7lwRA5Fnalr/PNXTGtQ=", "ref": "refs/heads/main", - "rev": "4acb1959a175bad08a7ca29479063aa0ad11397c", - "revCount": 4224, + "rev": "6285440304e74fdad01490f95419a6fe04cdc718", + "revCount": 4226, "type": "git", "url": "https://git.lix.systems/lix-project/hydra" }, @@ -559,11 +559,11 @@ ] }, "locked": { - "lastModified": 1732450403, - "narHash": "sha256-qYjJeHYUHDgfDsvMpIf9TRz0oAoMwvYP75XHObDjWIg=", + "lastModified": 1733055216, + "narHash": "sha256-yB2y7tGJxDI/SDQ0D7b6ocRtLTPm93u8ybdIKQGXRDE=", "owner": "nix-community", "repo": "lib-aggregate", - "rev": "c817444fb8a3042c26be57d8640fb744bc1b516c", + "rev": "f67bf0781c69a46bf3a1469f83c98518aa3054c3", "type": "github" }, "original": { @@ -643,11 +643,11 @@ ] }, "locked": { - "lastModified": 1732112222, - "narHash": "sha256-H7GN4++a4vE49SUNojZx+FSk4mmpb2ifJUtJMJHProI=", + "lastModified": 1732899308, + "narHash": "sha256-1jsQqcbMbaWuFim3sqEUdB1/E2KqHa0+cHbTzd/GYFE=", "ref": "refs/heads/main", - "rev": "66f6dbda32959dd5cf3a9aaba15af72d037ab7ff", - "revCount": 16513, + "rev": "2e5780ebc848f3b021f11dd94533b0b68362d989", + "revCount": 16545, "type": "git", "url": "https://git.lix.systems/lix-project/lix" }, @@ -779,11 +779,11 @@ "umu": "umu" }, "locked": { - "lastModified": 1732543374, - "narHash": "sha256-suhk41NhdsnN3aa7gpsr8KnYJtbaLeZBJMB2vqWbkzA=", + "lastModified": 1733018215, + "narHash": "sha256-RIvcgs8yGix6g6694omcGpvAza5LxZfV5LmyXsw8c0I=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "18b8f0796f3e9dd8b9d9f262a56f2914a0586a22", + "rev": "59363ec701ee3e994a6c8afc88b61d1fab40c66a", "type": "github" }, "original": { @@ -1040,11 +1040,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1732608009, - "narHash": "sha256-QahkuKC73o7oRsxkMKuxRBCgRj7YaM3s/cUzBQA55j4=", + "lastModified": 1733052534, + "narHash": "sha256-fqmu39j1Y0FEhF/KZcGUW9MjAGotAaTfN2gyb1a2LZ0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "53cbef91e4a3cf142edd886f20a0cc10309facf7", + "rev": "10f06c512e429ffd497761a5a49e31ada70e85ca", "type": "github" }, "original": { @@ -1158,11 +1158,11 @@ ] }, "locked": { - "lastModified": 1732588352, - "narHash": "sha256-J2/hxOO1VtBA/u+a+9E+3iJpWT3xsBdghgYAVfoGCJo=", + "lastModified": 1733020719, + "narHash": "sha256-Chv9+3zrf1DhdB9JyskjoV0vJbCQEgkVqrU3p4RPLv8=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "414e748aae5c9e6ca63c5aafffda03e5dad57ceb", + "rev": "8e18f10703112e6c33e1c0d8b93e8305f6f0a75c", "type": "github" }, "original": { @@ -1279,11 +1279,11 @@ }, "locked": { "dir": "packaging/nix", - "lastModified": 1732483970, - "narHash": "sha256-WO+oXVHr0se8P2Ay8T6av+B5j0+73VX+emON0aGSq+Y=", + "lastModified": 1733037609, + "narHash": "sha256-HkS24indfMaQbVZ+9GY5BHc+rqPvh8htF0rWYhvgPKI=", "ref": "refs/heads/main", - "rev": "5f7599fa7afc8990e48dd5ff9631f109117d3d26", - "revCount": 854, + "rev": "e559e2e50999093c3e837d33886f9e14e34ead0a", + "revCount": 863, "submodules": true, "type": "git", "url": "https://github.com/Open-Wine-Components/umu-launcher/" diff --git a/flake.nix b/flake.nix index f89bac2d..8d2dfc41 100644 --- a/flake.nix +++ b/flake.nix @@ -161,213 +161,210 @@ rec { sops-nix = { url = "github:Mic92/sops-nix"; inputs.nixpkgs.follows = "nixpkgs"; - inputs.nixpkgs-stable.follows = "nixpkgs"; }; systems.url = "github:nix-systems/default"; }; - outputs = - { - self, - nixpkgs, - sops-nix, - home-manager, - lix-module, - ... - }@args: - let - systems = [ + outputs = { + self, + nixpkgs, + sops-nix, + home-manager, + lix-module, + ... + } @ args: let + systems = [ + { + name = "nixos-8gb-fsn1-1"; # Hetzner Server + system = "x86_64-linux"; + } + { + name = "nas"; # My nas + system = "x86_64-linux"; + } + { + name = "instance-20221213-1915"; # Oracle server + system = "aarch64-linux"; + } + /* { - name = "nixos-8gb-fsn1-1"; # Hetzner Server - system = "x86_64-linux"; - } - { - name = "nas"; # My nas - system = "x86_64-linux"; - } - { - name = "instance-20221213-1915"; # Oracle server - system = "aarch64-linux"; - } - /* - { - name = "devterm"; - system = "aarch64-linux"; - } - */ - ]; - mkPackages = - system: - let - pkgs = import nixpkgs { - inherit system; - overlays = [ - args.gomod2nix.overlays.default - self.overlays.${system} - args.hydra.overlays.default - ]; - config.allowUnfree = true; - config.permittedInsecurePackages = [ - "olm-3.2.16" - ]; - }; - common = { - inherit (pkgs) - emoji-lotte - emoji-volpeon-blobfox - emoji-volpeon-blobfox-flip - emoji-volpeon-bunhd - emoji-volpeon-bunhd-flip - emoji-volpeon-drgn - emoji-volpeon-fox - emoji-volpeon-gphn - emoji-volpeon-raccoon - emoji-volpeon-vlpn - emoji-volpeon-neofox - emoji-volpeon-neocat - emoji-volpeon-floof - emoji-rosaflags - emoji-raccoon - emoji-caro - lotte-art - alco-sans - constructium - fairfax - fairfax-hd - kreative-square - nasin-nanpa - matrix-media-repo - mautrix-discord - mautrix-whatsapp - mautrix-telegram - mautrix-slack - python-mautrix - python-tulir-telethon - papermc - python-plover-stroke - python-rtf-tokenize - plover - plover-plugins-manager - python-simplefuzzyset - plover-plugin-emoji - plover-plugin-tapey-tape - plover-plugin-yaml-dictionary - plover-plugin-machine-hid - plover-plugin-rkb1-hid - plover-plugin-dotool-output - plover-dict-didoesdigital - miifox-net - plover-plugin-python-dictionary - plover-plugin-stenotype-extended - asar-asm - bsnes-plus - yiffstash - plover-plugin-dict-commands - plover-plugin-last-translation - plover-plugin-modal-dictionary - plover-plugin-stitching - plover-plugin-lapwing-aio - mgba-dev - ; - }; - perSystem = { - aarch64-linux = { - #inherit (pkgs) linux-devterm; - }; - }; - in - common // perSystem.${system} or { }; + name = "devterm"; + system = "aarch64-linux"; + } + */ + ]; + mkPackages = system: let + pkgs = import nixpkgs { + inherit system; + overlays = [ + args.gomod2nix.overlays.default + self.overlays.${system} + args.hydra.overlays.default + ]; + config.allowUnfree = true; + config.permittedInsecurePackages = [ + "olm-3.2.16" + ]; + }; + common = { + inherit + (pkgs) + emoji-lotte + emoji-volpeon-blobfox + emoji-volpeon-blobfox-flip + emoji-volpeon-bunhd + emoji-volpeon-bunhd-flip + emoji-volpeon-drgn + emoji-volpeon-fox + emoji-volpeon-gphn + emoji-volpeon-raccoon + emoji-volpeon-vlpn + emoji-volpeon-neofox + emoji-volpeon-neocat + emoji-volpeon-floof + emoji-rosaflags + emoji-raccoon + emoji-caro + lotte-art + alco-sans + constructium + fairfax + fairfax-hd + kreative-square + nasin-nanpa + matrix-media-repo + mautrix-discord + mautrix-whatsapp + mautrix-telegram + mautrix-slack + python-mautrix + python-tulir-telethon + papermc + python-plover-stroke + python-rtf-tokenize + plover + plover-plugins-manager + python-simplefuzzyset + plover-plugin-emoji + plover-plugin-tapey-tape + plover-plugin-yaml-dictionary + plover-plugin-machine-hid + plover-plugin-rkb1-hid + plover-plugin-dotool-output + plover-dict-didoesdigital + miifox-net + plover-plugin-python-dictionary + plover-plugin-stenotype-extended + asar-asm + bsnes-plus + yiffstash + plover-plugin-dict-commands + plover-plugin-last-translation + plover-plugin-modal-dictionary + plover-plugin-stitching + plover-plugin-lapwing-aio + mgba-dev + ; + }; + perSystem = { + aarch64-linux = { + #inherit (pkgs) linux-devterm; + }; + }; in - rec { - nixosConfigurations = builtins.listToAttrs ( + common // perSystem.${system} or {}; + in rec { + nixosConfigurations = builtins.listToAttrs ( + map ( + { + name, + system, + configName ? name, + }: { + inherit name; + value = nixpkgs.lib.nixosSystem { + inherit system; + specialArgs = + args + // { + inherit system; + }; + modules = [ + (./config + "/${configName}.nix") + ./config/default.nix + sops-nix.nixosModules.sops + home-manager.nixosModules.home-manager + ( + {pkgs, ...}: { + home-manager.extraSpecialArgs = + args + // { + inherit system; + }; + } + ) + (import utils/link-input.nix args) + lix-module.nixosModules.default + ]; + }; + } + ) + systems + ); + overlays = { + x86_64-linux = import ./overlays args "x86_64-linux"; + aarch64-linux = import ./overlays args "aarch64-linux"; + }; + devShell.x86_64-linux = let + pkgs = import nixpkgs { + system = "x86_64-linux"; + overlays = [ + args.gomod2nix.overlays.default + self.overlays.x86_64-linux + ]; + }; + in + pkgs.mkShell { + nativeBuildInputs = with pkgs; [ + age + sops + ssh-to-age + nix-prefetch + nix-prefetch-git + jq + bundix + python3 + python3Packages.yapf + github-cli + statix + alejandra + ]; + }; + formatter.x86_64-linux = nixpkgs.legacyPackages.x86_64-linux.alejandra; + packages.x86_64-linux = mkPackages "x86_64-linux"; + packages.aarch64-linux = mkPackages "aarch64-linux"; + hydraJobs = + (builtins.listToAttrs ( map ( { name, system, - configName ? name, - }: - { + ... + }: { inherit name; - value = nixpkgs.lib.nixosSystem { - inherit system; - specialArgs = args // { - inherit system; - }; - modules = [ - (./config + "/${configName}.nix") - ./config/default.nix - sops-nix.nixosModules.sops - home-manager.nixosModules.home-manager - ( - { pkgs, ... }: - { - home-manager.extraSpecialArgs = args // { - inherit system; - }; - } - ) - (import utils/link-input.nix args) - lix-module.nixosModules.default - ]; + value = { + ${system} = nixosConfigurations.${name}.config.system.build.toplevel; }; } - ) systems - ); - overlays = { - x86_64-linux = import ./overlays args "x86_64-linux"; - aarch64-linux = import ./overlays args "aarch64-linux"; + ) + systems + )) + // { + inherit devShell; + inherit packages; + # Uncomment the line to build an installer image + # This is EXTREMELY LARGE and will make builds take forever + # installer.x86_64-linux = nixosConfigurations.installer.config.system.build.isoImage; }; - devShell.x86_64-linux = - let - pkgs = import nixpkgs { - system = "x86_64-linux"; - overlays = [ - args.gomod2nix.overlays.default - self.overlays.x86_64-linux - ]; - }; - in - pkgs.mkShell { - nativeBuildInputs = with pkgs; [ - age - sops - ssh-to-age - nix-prefetch - nix-prefetch-git - jq - bundix - python3 - python3Packages.yapf - github-cli - statix - alejandra - ]; - }; - formatter.x86_64-linux = nixpkgs.legacyPackages.x86_64-linux.alejandra; - packages.x86_64-linux = mkPackages "x86_64-linux"; - packages.aarch64-linux = mkPackages "aarch64-linux"; - hydraJobs = - (builtins.listToAttrs ( - map ( - { - name, - system, - ... - }: - { - inherit name; - value = { - ${system} = nixosConfigurations.${name}.config.system.build.toplevel; - }; - } - ) systems - )) - // { - inherit devShell; - inherit packages; - # Uncomment the line to build an installer image - # This is EXTREMELY LARGE and will make builds take forever - # installer.x86_64-linux = nixosConfigurations.installer.config.system.build.isoImage; - }; - }; + }; } diff --git a/packages/emulator/mgba-dev/source.json b/packages/emulator/mgba-dev/source.json index ae2caeb4..48d272fe 100644 --- a/packages/emulator/mgba-dev/source.json +++ b/packages/emulator/mgba-dev/source.json @@ -1,12 +1,12 @@ { - "url": "https://github.com/mgba-emu/mgba", - "rev": "cfd30b7a95edf1dafaf5cfb6d691578d8b6554c5", - "date": "2024-11-08T21:38:25-08:00", - "path": "/nix/store/jcsrdhn7a1cxpy96sgjyc11j0gzlcc6m-mgba", - "sha256": "1q83dgsnf4pdz2li2ip6z7rnf1c7w8qf82jr1q5ck499rhv3v689", - "hash": "sha256-CZk9NswpkckKDlkK5DDihwVn8/nmRhGp+O0SZ/VrA+E=", - "fetchLFS": false, - "fetchSubmodules": false, - "deepClone": false, - "leaveDotGit": false -} \ No newline at end of file + "url": "https://github.com/mgba-emu/mgba", + "rev": "a9bddb92e3152f58df6242f1f773fc8d9421af79", + "date": "2024-11-25T19:29:23-08:00", + "path": "/nix/store/hl7pw6pqmcn9nq9sm0iaw0pn7hsi1k8y-mgba", + "sha256": "13slpj5zzmh007caar3dqc985idc4pbdj9mf2pcizbgyz89sbhrd", + "hash": "sha256-LcOlE/r+rR/ZFa4m2dYlrMWCEsNtZKXYAQDW/4u8VI8=", + "fetchLFS": false, + "fetchSubmodules": false, + "deepClone": false, + "leaveDotGit": false +} diff --git a/packages/matrix/mautrix-discord/gomod2nix.toml b/packages/matrix/mautrix-discord/gomod2nix.toml index acbac89e..12be6da8 100644 --- a/packages/matrix/mautrix-discord/gomod2nix.toml +++ b/packages/matrix/mautrix-discord/gomod2nix.toml @@ -2,8 +2,8 @@ schema = 3 [mod] [mod."github.com/bwmarrin/discordgo"] - version = "v0.0.0-20231013182643-f333f2578a3c" - hash = "sha256-5S/9DqVPRZSjaKkqjnr23vJHk1iMY0QepIbwFBWvAgw=" + version = "v0.0.0-20241129182205-d6dffc9bf133" + hash = "sha256-5Ar2jOU046hw3Cgy4qeFKAYg/4BUu7q//P9Gnj2+77c=" replaced = "github.com/beeper/discordgo" [mod."github.com/coreos/go-systemd/v22"] version = "v22.5.0" @@ -12,8 +12,8 @@ schema = 3 version = "v1.1.1" hash = "sha256-nhzSUrE1fCkN0+RL04N4h8jWmRFPPPWbCuDc7Ss0akI=" [mod."github.com/gabriel-vasile/mimetype"] - version = "v1.4.3" - hash = "sha256-EDmlRi3av27dq/ISVTglv08z4yZzMQ/SxL1c46EJro0=" + version = "v1.4.7" + hash = "sha256-q5p6DbKNn148tq38X2FLDg0sBteXoRZSiqgkMYC7ldE=" [mod."github.com/google/shlex"] version = "v0.0.0-20191202100458-e7afc7fbc510" hash = "sha256-1f392pCmS7AXVKXIC1SvKlYtK/rvW47F5CCkGT2G6JM=" @@ -33,8 +33,8 @@ schema = 3 version = "v0.0.19" hash = "sha256-wYQqGxeqV3Elkmn26Md8mKZ/viw598R4Ych3vtt72YE=" [mod."github.com/mattn/go-sqlite3"] - version = "v1.14.22" - hash = "sha256-CWF2Hjg43658NhaePWbGzS19gHJXjuTroG5c0W3hgYQ=" + version = "v1.14.24" + hash = "sha256-taGKFZFQlR5++5b2oZ1dYS3RERKv6yh1gniNWhb4egg=" [mod."github.com/pmezard/go-difflib"] version = "v1.0.0" hash = "sha256-/FtmHnaGjdvEIKAJtrUfEhV7EVo5A/eYrtdnUkuxLDA=" @@ -45,8 +45,8 @@ schema = 3 version = "v0.0.0-20200617195104-da1b6568686e" hash = "sha256-ST9t4/b7WFXUb8wra4ZYVDNZJGrEykw8dkWhLrxp8F0=" [mod."github.com/stretchr/testify"] - version = "v1.8.4" - hash = "sha256-MoOmRzbz9QgiJ+OOBo5h5/LbilhJfRUryvzHJmXAWjo=" + version = "v1.10.0" + hash = "sha256-fJ4gnPr0vnrOhjQYQwJ3ARDKPsOtA7d4olQmQWR+wpI=" [mod."github.com/tidwall/gjson"] version = "v1.17.0" hash = "sha256-eS+Ble3UZClAH/XpulH+MuxyZFsF7/yvWeBIn1D9ryk=" @@ -69,20 +69,20 @@ schema = 3 version = "v0.1.2" hash = "sha256-xf4p2Z5Pl9In3ne9BVmy7YvtooSRBzqxP4Pl2jdVN8w=" [mod."golang.org/x/crypto"] - version = "v0.15.0" - hash = "sha256-ABytl19ORbe9xcY4Ao76AcAkqqPduUCd8OrD4Sl5jyU=" + version = "v0.29.0" + hash = "sha256-sqckobR2VWucCgb7xpY2wLktnAA+XyXJbhCm80yCo78=" [mod."golang.org/x/exp"] - version = "v0.0.0-20231219180239-dc181d75b848" - hash = "sha256-K35MT3O16IlvqhDZBVBF4lJZIM7T/15PxOmeyGYv01A=" + version = "v0.0.0-20241108190413-2d47ceb2692f" + hash = "sha256-uRR1wFVGutfXAQIG69BD4g5Y8Ejw+ugw28F6ayu2BPY=" [mod."golang.org/x/net"] - version = "v0.18.0" - hash = "sha256-7c3GBByVmRjd7CXf4STGTAnnUWtHVH4S0HjSYUHCcCA=" + version = "v0.31.0" + hash = "sha256-G+vGyCnn8jywmX3KvsIwhZkOv3+oAERNNeCeiQqfIL0=" [mod."golang.org/x/sync"] - version = "v0.5.0" - hash = "sha256-EAKeODSsct5HhXPmpWJfulKSCkuUu6kkDttnjyZMNcI=" + version = "v0.9.0" + hash = "sha256-sGvzGqaaXE5dxohKkpbJMnu+bMmismsSqr8YMtrK+Rc=" [mod."golang.org/x/sys"] - version = "v0.14.0" - hash = "sha256-ReIRQmONicRW9idzGVPCBx5TTcKacmQTF1vPC3L4SxY=" + version = "v0.27.0" + hash = "sha256-BXQcF9RrJ55Pq7Nl67TeFGkgkyuKkQ8hHKN4/L4ggWc=" [mod."gopkg.in/natefinch/lumberjack.v2"] version = "v2.2.1" hash = "sha256-GaXWRDxhGy4Z4mgE+bJ8OE9SVvYUa9TnNiydnp2s1Ms=" diff --git a/packages/matrix/mautrix-discord/source.json b/packages/matrix/mautrix-discord/source.json index 840c5485..205c725b 100644 --- a/packages/matrix/mautrix-discord/source.json +++ b/packages/matrix/mautrix-discord/source.json @@ -1,13 +1,12 @@ { "url": "https://github.com/mautrix/discord", - "rev": "ce1f401ddcf57305a9782702c72619c86eb3595d", - "date": "2024-07-16T11:28:58+03:00", - "path": "/nix/store/s1pdfswh85c82m8rqbmddnl9z0cbw94d-discord", - "sha256": "1ck61zs67dfg0jf51gv2bf27kr8jr411bfm853479swgzyj9x81p", - "hash": "sha256-N6CepP+P63TIKKi6FQLJEuV5hFtiv1CcBM+1Y/QPZrI=", + "rev": "5a029367b3ca24247213a0ff8ff2589298bfb8a6", + "date": "2024-11-29T20:22:31+02:00", + "path": "/nix/store/wxb3fdz6ffdd3pq0cw50prswamw2xwbs-discord", + "sha256": "0alwgcl3q3hyfh8wsnflkip4swk6417bqnmbsg92g2jfv03vnj52", + "hash": "sha256-oki7B9hOiifS06tavE4gZnJNbpzUWc0RdB4OPCh7nCo=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false } - diff --git a/packages/minecraft/papermc/paper.json b/packages/minecraft/papermc/paper.json index 604b2396..4ac275d0 100644 --- a/packages/minecraft/papermc/paper.json +++ b/packages/minecraft/papermc/paper.json @@ -1,6 +1,6 @@ { "version": "1.21.1", - "build": 131, - "name": "paper-1.21.1-131.jar", - "sha256": "dc7dd1b6a3093641f182e874e52637682e9fa9bbcc8025a1f761c5bbec2dd341" + "build": 132, + "name": "paper-1.21.1-132.jar", + "sha256": "49716b013342c75f5fa141c8cda2647aa0a1e1818d2a61aae0a43299e35ff418" } diff --git a/packages/plover/plover-lapwing-aio.nix b/packages/plover/plover-lapwing-aio.nix index ab2da080..dc5e2edc 100644 --- a/packages/plover/plover-lapwing-aio.nix +++ b/packages/plover/plover-lapwing-aio.nix @@ -14,10 +14,10 @@ in buildPythonPackage rec { pname = "plover_lapwing_aio"; - version = "1.3.5"; + version = "1.3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-wE/enSIds7BJqwlHbye/u+PC4riuLkcH9QpeGemjEUM="; + sha256 = "sha256-3w0ASJ7CeQ/fO02AOcWCRB7AiuzHkvVOJy7TkemzTcY="; }; postPatch = '' diff --git a/packages/web/miifox-net.nix b/packages/web/miifox-net.nix index 56356f27..d0dec931 100644 --- a/packages/web/miifox-net.nix +++ b/packages/web/miifox-net.nix @@ -13,7 +13,10 @@ in src = fetchgit { inherit (source) url rev sha256; }; - nativeBuildInputs = [chevron lndir]; + nativeBuildInputs = [ + chevron + lndir + ]; buildPhase = '' chevron -d index.json index.handlebars > index.html ''; @@ -27,5 +30,5 @@ in description = "miifox.net"; license = lib.licenses.unfree; }; - passthru.updateScript = [../scripts/update-git.sh "https://git.chir.rs/CarolineHusky/MiiFox.net" "web/miifox.json"]; + #passthru.updateScript = [../scripts/update-git.sh "https://git.chir.rs/CarolineHusky/MiiFox.net" "web/miifox.json"]; }