diff --git a/nixos/modules/apps.nix b/nixos/modules/apps.nix index d2c4849b..dca17214 100644 --- a/nixos/modules/apps.nix +++ b/nixos/modules/apps.nix @@ -94,6 +94,7 @@ in { nixpkgs-review nodePackages_latest.prettier nodejs + pacman ruff shellcheck shfmt diff --git a/nixos/modules/development.nix b/nixos/modules/development.nix index bf60b7d5..fb2032b5 100644 --- a/nixos/modules/development.nix +++ b/nixos/modules/development.nix @@ -6,6 +6,13 @@ }: with lib; let cfg = config.dr460nixed.development; + + # Retrieve updpksums script from Arch - fix me: shebang + updpkgsums = pkgs.writeScriptBin "updpkgsums" (builtins.readFile updpkgsumsSrc); + updpkgsumsSrc = builtins.fetchurl { + url = "https://gitlab.archlinux.org/pacman/pacman-contrib/-/raw/master/src/updpkgsums.sh.in"; + sha256 = "0c7fmvhdwkfmh715kwj4dkls3xzrzxxhqw2930r69yfzr1ijsppl"; + }; in { options.dr460nixed.development = { enable = @@ -43,6 +50,12 @@ in { # Allow building sdcard images for Raspi nixpkgs.config.allowUnsupportedSystem = true; + # Supply makepkg.conf for pacman + environment = { + etc."makepkg.conf".source = "${pkgs.pacman}/etc/makepkg.conf"; + systemPackages = [updpkgsums]; + }; + # Wireshark programs.wireshark.enable = true;