pkgs: reformat codebase

pkgs/base16-builder-go/default.nix

@@ -1,7 +1,4 @@
-{ lib
+{ lib, fetchFromGitHub, buildGoModule }:
-, fetchFromGitHub
-, buildGoModule
-}:
 
 buildGoModule rec {
   pname = "base16-builder-go";

pkgs/blender-blendergis/default.nix

@@ -1,9 +1,4 @@
-{ lib
+{ lib, buildPythonPackage, fetchFromGitHub, imageio, openimageio }:
-, buildPythonPackage
-, fetchFromGitHub
-, imageio
-, openimageio
-}:
 
 buildPythonPackage rec {
   pname = "blender-blendergis";

pkgs/blender-machin3tools/default.nix

@@ -1,7 +1,4 @@
-{ lib
+{ lib, buildPythonPackage, fetchFromGitHub }:
-, buildPythonPackage
-, fetchFromGitHub
-}:
 
 buildPythonPackage rec {
   pname = "blender-machin3tools";

pkgs/ctrld/default.nix

@@ -1,8 +1,4 @@
-{
+{ lib, fetchFromGitHub, buildGoModule, }:
-  lib,
-  fetchFromGitHub,
-  buildGoModule,
-}:
 
 buildGoModule rec {
   pname = "ctrld";

pkgs/default.nix

@@ -23,6 +23,7 @@ in lib.makeScope pkgs.newScope (self: {
   distant = callPackage ./distant.nix { };
   gnome-search-provider-recoll =
     callPackage ./gnome-search-provider-recoll.nix { };
+  #graphite-design-tool = callPackage ./graphite-design-tool { };
   go-avahi-cname = callPackage ./go-avahi-cname { };
   hush-shell = callPackage ./hush-shell.nix { };
   lazyjj = callPackage ./lazyjj { };
@@ -43,6 +44,10 @@ in lib.makeScope pkgs.newScope (self: {
   swh = callPackage ./software-heritage {
     python3Packages = pkgs.python310Packages;
   };
+  #pd-l2ork = callPackage ./pd-l2ork { };
+  #rotp-modnar = callPackage ./rotp-modnar { };
+  #rotp-fusion = callPackage ./rotp-fusion { };
+  #purrdata = callPackage ./purr-data { };
   speki = callPackage ./speki { };
   tic-80 = callPackage ./tic-80 { };
   smile = callPackage ./smile { };

pkgs/distant.nix

@@ -1,10 +1,4 @@
-{ stdenv
+{ stdenv, lib, rustPlatform, fetchFromGitHub, pkg-config, openssl }:
-, lib
-, rustPlatform
-, fetchFromGitHub
-, pkg-config
-, openssl
-}:
 
 rustPlatform.buildRustPackage rec {
   version = "0.20.0";

pkgs/domterm/default.nix

@@ -1,33 +1,14 @@
-{ lib
+{ lib, stdenv, fetchFromGitHub, autoreconfHook, desktop-file-utils, pkg-config
-, stdenv
+, libwebsockets, ncurses, openssl, unixtools, zlib, rustPlatform, perl, qtbase
-, fetchFromGitHub
+, qtwebchannel, qtwebengine, wrapQtAppsHook
-, autoreconfHook
-, desktop-file-utils
-, pkg-config
-, libwebsockets
-, ncurses
-, openssl
-, unixtools
-, zlib
-, rustPlatform
-, perl
-, qtbase
-, qtwebchannel
-, qtwebengine
-, wrapQtAppsHook
 
 , withQtDocking ? false
 
-, withKddockwidgets ? false
+, withKddockwidgets ? false, kddockwidgets
-, kddockwidgets
 
-, withAsciidoctor ? true
+, withAsciidoctor ? true, asciidoctor
-, asciidoctor
 
-, withDocbook ? true
+, withDocbook ? true, docbook-xsl-ns, libxslt }:
-, docbook-xsl-ns
-, libxslt
-}:
 
 stdenv.mkDerivation rec {
   pname = "domterm";
@@ -40,15 +21,12 @@ stdenv.mkDerivation rec {
     hash = "sha256-H1Nzqzz7dv4j9hkb08FCExLeq69EkFNXGzhhl/e+uxI=";
   };
 
-  configureFlags = [
+  configureFlags =
-    "--with-libwebsockets"
+    [ "--with-libwebsockets" "--enable-compiled-in-resources" "--with-qt" ]
-    "--enable-compiled-in-resources"
+    ++ lib.optional withAsciidoctor "--with-asciidoctor"
-    "--with-qt"
+    ++ lib.optional withQtDocking "--with-qt-docking"
-  ]
+    ++ lib.optional withKddockwidgets "--with-kddockwidgets"
-  ++ lib.optional withAsciidoctor "--with-asciidoctor"
+    ++ lib.optional withDocbook "--with-docbook";
-  ++ lib.optional withQtDocking "--with-qt-docking"
-  ++ lib.optional withKddockwidgets "--with-kddockwidgets"
-  ++ lib.optional withDocbook "--with-docbook";
 
   nativeBuildInputs = [
     autoreconfHook
@@ -68,13 +46,9 @@ stdenv.mkDerivation rec {
     perl
     unixtools.xxd
     zlib
-  ]
+  ] ++ lib.optional withKddockwidgets kddockwidgets
-  ++ lib.optional withKddockwidgets kddockwidgets
+    ++ lib.optional withAsciidoctor asciidoctor
-  ++ lib.optional withAsciidoctor asciidoctor
+    ++ lib.optionals withDocbook [ docbook-xsl-ns libxslt ];
-  ++ lib.optionals withDocbook [
-    docbook-xsl-ns
-    libxslt
-  ];
 
   meta = with lib; {
     homepage = "https://domterm.org/";

pkgs/fastn/default.nix

@@ -1,10 +1,4 @@
-{ lib
+{ lib, rustPlatform, fetchFromGitHub, cmake, pkg-config, openssl }:
-, rustPlatform
-, fetchFromGitHub
-, cmake
-, pkg-config
-, openssl
-}:
 
 rustPlatform.buildRustPackage rec {
   pname = "fastn";
@@ -20,7 +14,8 @@ rustPlatform.buildRustPackage rec {
   cargoLock = {
     lockFile = ./Cargo.lock;
     outputHashes = {
-      "fastn-observer-0.1.0" = "sha256-D7ch6zB1xw54vGbpcQ3hf+zG11Le/Fy01W3kHhc8bOg=";
+      "fastn-observer-0.1.0" =
+        "sha256-D7ch6zB1xw54vGbpcQ3hf+zG11Le/Fy01W3kHhc8bOg=";
     };
   };
 
@@ -28,9 +23,7 @@ rustPlatform.buildRustPackage rec {
   nativeBuildInputs = [ cmake pkg-config ];
   buildInputs = [ openssl ];
 
-  checkFlags = [
+  checkFlags = [ "--skip=tests::fbt" ];
-    "--skip=tests::fbt"
-  ];
 
   meta = with lib; {
     homepage = "https://fastn.com/";

pkgs/flatsync/default.nix

@@ -1,22 +1,6 @@
-{ stdenv
+{ stdenv, lib, fetchFromGitLab, rustPlatform, cargo, rustc, meson, ninja
-, lib
+, pkg-config, glib, gobject-introspection, libadwaita, wrapGAppsHook4, openssl
-, fetchFromGitLab
+, appstream-glib, desktop-file-utils, blueprint-compiler, flatpak }:
-, rustPlatform
-, cargo
-, rustc
-, meson
-, ninja
-, pkg-config
-, glib
-, gobject-introspection
-, libadwaita
-, wrapGAppsHook4
-, openssl
-, appstream-glib
-, desktop-file-utils
-, blueprint-compiler
-, flatpak
-}:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "flatsync";
@@ -52,12 +36,7 @@ stdenv.mkDerivation (finalAttrs: {
     wrapGAppsHook4
   ];
 
-  buildInputs = [
+  buildInputs = [ glib flatpak libadwaita openssl ];
-    glib
-    flatpak
-    libadwaita
-    openssl
-  ];
 
   meta = with lib; {
     homepage = "https://gitlab.gnome.org/Cogitri/flatsync";

pkgs/gnome-search-provider-recoll.nix

@@ -1,14 +1,5 @@
-{ stdenv
+{ stdenv, lib, fetchurl, autoreconfHook, recoll, python3Packages, glib
-, lib
+, gobject-introspection, wrapGAppsHook3, gnome-shell }:
-, fetchurl
-, autoreconfHook
-, recoll
-, python3Packages
-, glib
-, gobject-introspection
-, wrapGAppsHook3
-, gnome-shell
-}:
 
 python3Packages.buildPythonPackage rec {
   pname = "gnome-search-provider-recoll";

pkgs/graphite-design-tool/default.nix

@@ -1,4 +1,5 @@
-{ rustPlatform, cargo-tauri_1, fetchFromGitHub, wrapGAppsHook, wasm-bindgen-cli, pkg-config, lib }:
+{ rustPlatform, cargo-tauri_1, fetchFromGitHub, wrapGAppsHook, wasm-bindgen-cli
+, pkg-config, lib }:
 
 rustPlatform.buildRustPackage rec {
   pname = "graphite-design-tool";
@@ -14,11 +15,13 @@ rustPlatform.buildRustPackage rec {
   useFetchCargoVendor = true;
   cargoHash = "sha256-+p9bpj+cSd0Bkpg+e4lwo4C7XqxZBc0McYYsNxAqzaA=";
 
-  nativeBuildInputs = [ cargo-tauri_1 pkg-config wrapGAppsHook wasm-bindgen-cli ];
+  nativeBuildInputs =
+    [ cargo-tauri_1 pkg-config wrapGAppsHook wasm-bindgen-cli ];
 
   meta = with lib; {
     homepage = "https://graphite.rs/";
-    description = "2D vector & raster editor that melds traditional layers & tools with a modern node-based, non-destructive, procedural workflow";
+    description =
+      "2D vector & raster editor that melds traditional layers & tools with a modern node-based, non-destructive, procedural workflow";
     license = licenses.asl20;
     maintainers = with maintainers; [ foo-dogsquared ];
     mainProgram = "graphite";

pkgs/hush-shell.nix

@@ -1,9 +1,4 @@
-{ stdenv
+{ stdenv, lib, fetchFromGitHub, rustPlatform, toybox }:
-, lib
-, fetchFromGitHub
-, rustPlatform
-, toybox
-}:
 
 rustPlatform.buildRustPackage rec {
   pname = "hush";
@@ -23,10 +18,8 @@ rustPlatform.buildRustPackage rec {
   '';
 
   checkInputs = [ toybox ];
-  checkFlags = [
+  checkFlags =
-    "--skip=tests::test_token_kind_size"
+    [ "--skip=tests::test_token_kind_size" "--skip=tests::test_positive" ];
-    "--skip=tests::test_positive"
-  ];
 
   meta = with lib; {
     homepage = "https://github.com/hush-shell/hush";

pkgs/lazyjj/default.nix

@@ -1,14 +1,7 @@
-{
+{ lib, rustPlatform, fetchFromGitHub, jujutsu, }:
-  lib,
-  rustPlatform,
-  fetchFromGitHub,
-  jujutsu,
-}:
 
-let
+let version = "0.3.1";
-  version = "0.3.1";
+in rustPlatform.buildRustPackage {
-in
-rustPlatform.buildRustPackage {
   inherit version;
   pname = "lazyjj";
 

pkgs/lwp/default.nix

@@ -1,12 +1,4 @@
-{ stdenv
+{ stdenv, lib, fetchFromGitHub, cmake, SDL2, xorg, xwayland, libconfig }:
-, lib
-, fetchFromGitHub
-, cmake
-, SDL2
-, xorg
-, xwayland
-, libconfig
-}:
 
 stdenv.mkDerivation rec {
   pname = "lwp";
@@ -20,12 +12,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ cmake ];
-  buildInputs = [
+  buildInputs = [ SDL2 xorg.libX11 xwayland libconfig ];
-    SDL2
-    xorg.libX11
-    xwayland
-    libconfig
-  ];
 
   # TODO: Add conditional for Mac systems.
   postPatch = ''
@@ -36,9 +23,7 @@ stdenv.mkDerivation rec {
       --replace "usr/local" "${placeholder "out"}"
   '';
 
-  cmakeFlags = [
+  cmakeFlags = [ "-DPROGRAM_VERSION=${version}" ];
-    "-DPROGRAM_VERSION=${version}"
-  ];
 
   meta = with lib; {
     homepage = "https://github.com/jszczerbinsky/lwp";

pkgs/nautilus-annotations/default.nix

@@ -1,14 +1,5 @@
-{ stdenv
+{ stdenv, lib, fetchFromGitLab, glib, nautilus, gtksourceview5, libadwaita
-, lib
+, autoreconfHook, wrapGAppsHook4, pkg-config }:
-, fetchFromGitLab
-, glib
-, nautilus
-, gtksourceview5
-, libadwaita
-, autoreconfHook
-, wrapGAppsHook4
-, pkg-config
-}:
 
 stdenv.mkDerivation rec {
   pname = "nautilus-annotations";
@@ -22,18 +13,10 @@ stdenv.mkDerivation rec {
     hash = "sha256-BivnmsACnpxdd6FV+ncdDd5ZwtJSSzNExoiCXeXIFkA=";
   };
 
-  nativeBuildInputs = [
+  nativeBuildInputs =
-    autoreconfHook
+    [ autoreconfHook glib nautilus pkg-config wrapGAppsHook4 ];
-    glib
-    nautilus
-    pkg-config
-    wrapGAppsHook4
-  ];
 
-  buildInputs = [
+  buildInputs = [ libadwaita gtksourceview5 ];
-    libadwaita
-    gtksourceview5
-  ];
 
   preConfigure = ''
     ./bootstrap

pkgs/pd-l2ork/default.nix

@@ -1,14 +1,5 @@
-{ stdenv,
+{ stdenv, lib, fetchFromGitHub, autoreconfHook, bison, fftw, libtool, libjack2
-  lib,
+, bluez, udev }:
-  fetchFromGitHub,
-  autoreconfHook,
-  bison,
-  fftw,
-  libtool,
-  libjack2,
-  bluez,
-  udev
-}:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "pd-l2ork";
@@ -21,17 +12,9 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-A+ETptD1R+Pb4r2qgD0YxV7KYeAb9iLBwENhYQyjBc4=";
   };
 
-  nativeBuildInputs = [
+  nativeBuildInputs = [ libtool ];
-    libtool
-  ];
 
-  buildInputs = [
+  buildInputs = [ bison fftw libjack2 bluez udev ];
-    bison
-    fftw
-    libjack2
-    bluez
-    udev
-  ];
 
   meta = with lib; {
     homepage = "http://l2ork.music.vt.edu/";

pkgs/pigeon-mail/default.nix

@@ -1,9 +1,4 @@
-{ lib
+{ lib, fetchFromGitHub, rustPlatform, pkg-config, openssl }:
-, fetchFromGitHub
-, rustPlatform
-, pkg-config
-, openssl
-}:
 
 rustPlatform.buildRustPackage rec {
   pname = "pigeon-mail";
@@ -18,9 +13,7 @@ rustPlatform.buildRustPackage rec {
 
   cargoHash = "sha256-MRSO89qg08GyyIuzEpSO4qQTZS876U3SeGJ6eCO+3BA=";
 
-  env = {
+  env = { OPENSSL_NO_VENDOR = "1"; };
-    OPENSSL_NO_VENDOR = "1";
-  };
 
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [ openssl ];

pkgs/purr-data/default.nix

@@ -1,14 +1,5 @@
-{ stdenv,
+{ stdenv, lib, fetchFromGitHub, bison, fftw, libtool, libjack2, bluez, udev
-  lib,
+, wget, }:
-  fetchFromGitHub,
-  bison,
-  fftw,
-  libtool,
-  libjack2,
-  bluez,
-  udev,
-  wget,
-}:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "pd-l2ork";
@@ -21,26 +12,15 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-A+ETptD1R+Pb4r2qgD0YxV7KYeAb9iLBwENhYQyjBc4=";
   };
 
-  nativeBuildInputs = [
+  nativeBuildInputs = [ libtool ];
-    libtool
-  ];
 
-  buildInputs = [
+  buildInputs = [ bison fftw libjack2 bluez udev wget ];
-    bison
-    fftw
-    libjack2
-    bluez
-    udev
-    wget
-  ];
 
   preBuild = ''
     patchShebangs l2ork_addons/*.sh
   '';
 
-  buildFlags = [
+  buildFlags = [ "prefix=${placeholder "out"}" ];
-    "prefix=${placeholder "out"}"
-  ];
 
   meta = with lib; {
     homepage = "http://l2ork.music.vt.edu/";

pkgs/rotp-fusion/default.nix

@@ -1,9 +1,4 @@
-{ lib,
+{ lib, fetchFromGitHub, maven, libwebp, vorbis-tools, }:
-  fetchFromGitHub,
-  maven,
-  libwebp,
-  vorbis-tools,
-}:
 
 maven.buildMavenPackage rec {
   pname = "rotp-fusion";
@@ -20,10 +15,7 @@ maven.buildMavenPackage rec {
 
   mvnHash = "";
 
-  nativeBuildInputs = [
+  nativeBuildInputs = [ libwebp vorbis-tools ];
-    libwebp
-    vorbis-tools
-  ];
 
   meta = with lib; {
     description = "Mod of Remnants of the Precursors with more features";

pkgs/rotp-modnar/default.nix

@@ -1,8 +1,4 @@
-{
+{ lib, rotp, fetchFromGitHub, }:
-  lib,
-  rotp,
-  fetchFromGitHub,
-}:
 
 rotp.overrideAttrs (finalAttrs: prevAttrs: {
   src = fetchFromGitHub {

pkgs/sessiond/default.nix

@@ -1,19 +1,6 @@
-{ lib
+{ lib, fetchFromGitHub, fetchpatch, meson, ninja, pkg-config, coreutils, glib
-, fetchFromGitHub
+, gobject-introspection, xorg, udev, wireplumber, pipewire, perl
-, fetchpatch
+, python3Packages }:
-, meson
-, ninja
-, pkg-config
-, coreutils
-, glib
-, gobject-introspection
-, xorg
-, udev
-, wireplumber
-, pipewire
-, perl
-, python3Packages
-}:
 
 python3Packages.buildPythonPackage rec {
   pname = "sessiond";
@@ -29,34 +16,21 @@ python3Packages.buildPythonPackage rec {
 
   patches = [
     (fetchpatch {
-      url = "https://github.com/jcrd/sessiond/commit/217ed63e2033c46c637e0564ef44ceaedff3e102.patch";
+      url =
+        "https://github.com/jcrd/sessiond/commit/217ed63e2033c46c637e0564ef44ceaedff3e102.patch";
       hash = "sha256-/GFPwJ4OBskavUJYhR5LGpt+HZABDOCpx6cVYDCYTNE=";
     })
 
     ./0002-meson-Add-python-sessiond-installation.patch
   ];
 
-  nativeBuildInputs = [
+  nativeBuildInputs =
-    meson
+    [ meson ninja pkg-config glib gobject-introspection perl ];
-    ninja
-    pkg-config
-    glib
-    gobject-introspection
-    perl
-  ];
 
-  buildInputs = [
+  buildInputs =
-    udev
+    [ udev xorg.libXi xorg.libX11 xorg.libXext wireplumber pipewire ];
-    xorg.libXi
-    xorg.libX11
-    xorg.libXext
-    wireplumber
-    pipewire
-  ];
 
-  propagatedBuildInputs = with python3Packages; [
+  propagatedBuildInputs = with python3Packages; [ dbus-python ];
-    dbus-python
-  ];
 
   postPatch = ''
     substituteInPlace ./systemd/sessiond.service \

pkgs/smile/default.nix

@@ -1,19 +1,6 @@
-{ stdenv
+{ stdenv, lib, fetchFromGitHub, meson, ninja, appstream-glib, desktop-file-utils
-, lib
+, gettext, glib, gtk4, libwnck, wrapGAppsHook4, pkg-config, python3Packages
-, fetchFromGitHub
+, gobject-introspection }:
-, meson
-, ninja
-, appstream-glib
-, desktop-file-utils
-, gettext
-, glib
-, gtk4
-, libwnck
-, wrapGAppsHook4
-, pkg-config
-, python3Packages
-, gobject-introspection
-}:
 
 python3Packages.buildPythonApplication rec {
   pname = "smile";
@@ -49,9 +36,7 @@ python3Packages.buildPythonApplication rec {
     wrapGAppsHook4
   ];
 
-  propagatedNativeBuildInputs = [
+  propagatedNativeBuildInputs = [ gobject-introspection ];
-    gobject-introspection
-  ];
 
   propagatedBuildInputs = with python3Packages; [
     pygobject3
@@ -59,10 +44,7 @@ python3Packages.buildPythonApplication rec {
     dbus-python
   ];
 
-  buildInputs = [
+  buildInputs = [ libwnck gtk4 ];
-    libwnck
-    gtk4
-  ];
 
   dontWrapGApps = true;
   preFixup = ''

pkgs/software-heritage/aiohttp-utils.nix

@@ -13,11 +13,7 @@ buildPythonPackage rec {
 
   doCheck = false;
 
-  propagatedBuildInputs = [
+  propagatedBuildInputs = [ aiohttp gunicorn python-mimeparse ];
-    aiohttp
-    gunicorn
-    python-mimeparse
-  ];
 
   meta = with lib; {
     homepage = "https://github.com/sloria/aiohttp-utils";

pkgs/software-heritage/attrs-strict.nix

@@ -10,10 +10,7 @@ buildPythonPackage rec {
     sha256 = "sha256-YybB5RxP0v/8ndYH3sBsMa3WTu29N6ZR6oj2Y6N8Pxg";
   };
 
-  propagatedBuildInputs = [
+  propagatedBuildInputs = [ setuptools-scm attrs ];
-    setuptools-scm
-    attrs
-  ];
 
   meta = with lib; {
     homepage = "https://github.com/bloomberg/attrs-strict";

pkgs/software-heritage/default.nix

@@ -1,16 +1,16 @@
 { lib, callPackage, newScope, python3Packages, ... }:
 
 lib.fix' (self:
-let
+  let callPackage = newScope self;
-  callPackage = newScope self;
+  in lib.recurseIntoAttrs {
-in
+    attrs-strict = callPackage ./attrs-strict.nix { inherit python3Packages; };
-lib.recurseIntoAttrs {
+    aiohttp-utils =
-  attrs-strict = callPackage ./attrs-strict.nix { inherit python3Packages; };
+      callPackage ./aiohttp-utils.nix { inherit python3Packages; };
-  aiohttp-utils = callPackage ./aiohttp-utils.nix { inherit python3Packages; };
 
-  swh-fuse = callPackage ./swh-fuse.nix { inherit python3Packages; };
+    swh-fuse = callPackage ./swh-fuse.nix { inherit python3Packages; };
-  swh-core = callPackage ./swh-core.nix { inherit python3Packages; };
+    swh-core = callPackage ./swh-core.nix { inherit python3Packages; };
-  swh-model = callPackage ./swh-model.nix { inherit python3Packages; };
+    swh-model = callPackage ./swh-model.nix { inherit python3Packages; };
-  swh-web-client = callPackage ./swh-web-client.nix { inherit python3Packages; };
+    swh-web-client =
-  swh-auth = callPackage ./swh-auth.nix { inherit python3Packages; };
+      callPackage ./swh-web-client.nix { inherit python3Packages; };
-})
+    swh-auth = callPackage ./swh-auth.nix { inherit python3Packages; };
+  })

pkgs/software-heritage/swh-auth.nix

@@ -28,7 +28,8 @@ buildPythonPackage rec {
         pname = "python_keycloak";
         hash = "sha256-zIaBJvU1qk8yDcnqsk5GrzgcE7zIjZsHAbBCk+p1zSQ=";
       };
-      propagatedBuildInputs = prev.propagatedBuildInputs ++ [ setuptools deprecation ];
+      propagatedBuildInputs = prev.propagatedBuildInputs
+        ++ [ setuptools deprecation ];
     }))
 
     swh-core

pkgs/speki/default.nix

@@ -1,10 +1,4 @@
-{ rustPlatform
+{ rustPlatform, lib, fetchFromGitHub, pkg-config, openssl, alsa-lib }:
-, lib
-, fetchFromGitHub
-, pkg-config
-, openssl
-, alsa-lib
-}:
 
 rustPlatform.buildRustPackage rec {
   pname = "speki";
@@ -17,9 +11,7 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-cvtMXtg2c9T4CaWAobagS9pW4pX4Q+nwdBvP+9A0er0=";
   };
 
-  cargoLock = {
+  cargoLock = { lockFile = ./Cargo.lock; };
-    lockFile = ./Cargo.lock;
-  };
 
   env.OPENSSL_NO_VENDOR = "1";
   nativeBuildInputs = [ pkg-config ];

pkgs/tailcall/default.nix

@@ -15,9 +15,12 @@ rustPlatform.buildRustPackage rec {
     lockFile = "${src}/Cargo.lock";
     outputHashes = {
       "genai-0.1.7-wip" = "sha256-peqM0rBLnL4F0M6o8CO/+ttv9eOLV4VkDEy2e4x7dn0=";
-      "htpasswd-verify-0.3.0" = "sha256-GbkY590xWEZ+lVT9nffs4HIRW6CwBjll4rGIk27waxo=";
+      "htpasswd-verify-0.3.0" =
-      "posthog-rs-0.2.3" = "sha256-1HxOEzc8GROStxuxG0cfCNa4iA04sCD7jD6uWT5bl2o=";
+        "sha256-GbkY590xWEZ+lVT9nffs4HIRW6CwBjll4rGIk27waxo=";
-      "serde_json_borrow-0.7.0" = "sha256-UcgIWjdSCkYRYxEcWbwQs+BxX41ITqkvFSFtzEJchVk=";
+      "posthog-rs-0.2.3" =
+        "sha256-1HxOEzc8GROStxuxG0cfCNa4iA04sCD7jD6uWT5bl2o=";
+      "serde_json_borrow-0.7.0" =
+        "sha256-UcgIWjdSCkYRYxEcWbwQs+BxX41ITqkvFSFtzEJchVk=";
     };
   };
 

pkgs/tic-80/default.nix

@@ -1,50 +1,24 @@
 # Build the TIC-80 virtual computer console with the PRO version. The
 # developers are kind enough to make it easy to compile it if you know
 # how.
-{ stdenv
+{ stdenv, lib, SDL2, SDL2_sound, alsa-lib, cmake, fetchFromGitHub, freeglut, git
-, lib
+, gtk3, dbus, libGLU, libX11, libglvnd, libsamplerate, mesa, pkg-config, sndio
-, SDL2
-, SDL2_sound
-, alsa-lib
-, cmake
-, fetchFromGitHub
-, freeglut
-, git
-, gtk3
-, dbus
-, libGLU
-, libX11
-, libglvnd
-, libsamplerate
-, mesa
-, pkg-config
-, sndio
 , zlib
 
-, pulseaudioSupport ? stdenv.isLinux
+, pulseaudioSupport ? stdenv.isLinux, libpulseaudio
-, libpulseaudio
 
-, waylandSupport ? true
+, waylandSupport ? true, wayland, libxkbcommon, libdecor
-, wayland
-, libxkbcommon
-, libdecor
 
-, esoundSupport ? true
+, esoundSupport ? true, espeak
-, espeak
 
-, jackSupport ? true
+, jackSupport ? true, jack2
-, jack2
 
-  # Ruby support requires compiling mruby so we'll skip it for now.
+# Ruby support requires compiling mruby so we'll skip it for now.
-, rubySupport ? false
+, rubySupport ? false, ruby, rake
-, ruby
-, rake
 
-, pythonSupport ? true
+, pythonSupport ? true, python3
-, python3
 
-, withPro ? true
+, withPro ? true }:
-}:
 
 # TODO: Fix the timestamp in the help section.
 stdenv.mkDerivation rec {
@@ -73,20 +47,15 @@ stdenv.mkDerivation rec {
     SDL2_sound
     zlib
     sndio
-  ]
+  ] ++ lib.optional pulseaudioSupport libpulseaudio
-  ++ lib.optional pulseaudioSupport libpulseaudio
+    ++ lib.optional jackSupport jack2 ++ lib.optional esoundSupport espeak
-  ++ lib.optional jackSupport jack2
+    ++ lib.optionals rubySupport [ ruby rake ]
-  ++ lib.optional esoundSupport espeak
+    ++ lib.optional pythonSupport python3
-  ++ lib.optionals rubySupport [
+    ++ lib.optionals (stdenv.isLinux && waylandSupport) [
-    ruby
+      wayland
-    rake
+      libxkbcommon
-  ]
+      libdecor
-  ++ lib.optional pythonSupport python3
+    ];
-  ++ lib.optionals (stdenv.isLinux && waylandSupport) [
-    wayland
-    libxkbcommon
-    libdecor
-  ];
 
   cmakeFlags = lib.optional withPro "-DBUILD_PRO=ON";
 

pkgs/uwsm/default.nix

@@ -1,13 +1,7 @@
-{ lib
+{ lib, python311Packages, fetchFromGitHub, meson, ninja, pkg-config
-, python311Packages
-, fetchFromGitHub
-, meson
-, ninja
-, pkg-config
 
-  # This is for substituting shebangs in its plugins.
+# This is for substituting shebangs in its plugins.
-, coreutils
+, coreutils }:
-}:
 
 python311Packages.buildPythonPackage rec {
   pname = "uwsm";
@@ -21,20 +15,11 @@ python311Packages.buildPythonPackage rec {
     hash = "sha256-n80FZ6rEguTN9ouEqI+bc5FOSeFQ8ynV+XDL2K/ZIxI=";
   };
 
-  patches = [
+  patches = [ ./0001-chore-add-build-backend-for-pyproject.patch ];
-    ./0001-chore-add-build-backend-for-pyproject.patch
-  ];
 
-  nativeBuildInputs = [
+  nativeBuildInputs = [ meson ninja pkg-config ];
-    meson
-    ninja
-    pkg-config
-  ];
 
-  propagatedBuildInputs = with python311Packages; [
+  propagatedBuildInputs = with python311Packages; [ pyxdg dbus-python ];
-    pyxdg
-    dbus-python
-  ];
 
   postFixup = ''
     substituteInPlace $out/share/uwsm/plugins/*.sh \

pkgs/vgc/default.nix

@@ -1,15 +1,5 @@
-{ stdenv
+{ stdenv, lib, fetchFromGitHub, wrapQtAppsHook, qtbase, cmake, python3, harfbuzz
-, lib
+, freetype, libGLU, git }:
-, fetchFromGitHub
-, wrapQtAppsHook
-, qtbase
-, cmake
-, python3
-, harfbuzz
-, freetype
-, libGLU
-, git
-}:
 
 stdenv.mkDerivation rec {
   pname = "vgc";
@@ -23,20 +13,11 @@ stdenv.mkDerivation rec {
     fetchSubmodules = true;
   };
 
-  patches = [
+  patches = [ ./patches/set-reproducible-build.patch ];
-    ./patches/set-reproducible-build.patch
-  ];
 
   nativeBuildInputs = [ wrapQtAppsHook cmake ];
 
-  buildInputs = [
+  buildInputs = [ python3 git freetype harfbuzz libGLU qtbase ];
-    python3
-    git
-    freetype
-    harfbuzz
-    libGLU
-    qtbase
-  ];
 
   meta = with lib; {
     homepage = "https://www.vgc.io/";

pkgs/willow/default.nix

@@ -1,7 +1,4 @@
-{ lib
+{ lib, buildGoModule, fetchFromGitHub }:
-, buildGoModule
-, fetchFromGitHub
-}:
 
 buildGoModule {
   pname = "willow";
@@ -19,10 +16,7 @@ buildGoModule {
   meta = with lib; {
     homepage = "https://github.com/Amolith/willow";
     description = "Forge-agnostic release tracker";
-    license = with licenses; [
+    license = with licenses; [ mit asl20 ];
-      mit
-      asl20
-    ];
     maintainers = with maintainers; [ foo-dogsquared ];
     mainProgram = "willow";
     platforms = platforms.unix;

pkgs/xs/default.nix

@@ -1,16 +1,5 @@
-{ stdenv
+{ stdenv, lib, fetchFromGitHub, boost, boehmgc, bison, meson, ninja, pkg-config
-, lib
+, libffi, readline, git }:
-, fetchFromGitHub
-, boost
-, boehmgc
-, bison
-, meson
-, ninja
-, pkg-config
-, libffi
-, readline
-, git
-}:
 
 stdenv.mkDerivation rec {
   pname = "xs";
@@ -23,20 +12,9 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-Yx6zWLZlnlckZyTljgTVCjCPtNfUbM+o4RfuOPpn8ZQ=";
   };
 
-  nativeBuildInputs = [
+  nativeBuildInputs = [ meson ninja pkg-config ];
-    meson
-    ninja
-    pkg-config
-  ];
 
-  buildInputs = [
+  buildInputs = [ boost bison boehmgc libffi readline git ];
-    boost
-    bison
-    boehmgc
-    libffi
-    readline
-    git
-  ];
 
   patches = [ ./update-build.patch ];
   postPatch = ''
@@ -45,7 +23,8 @@ stdenv.mkDerivation rec {
 
   meta = with lib; {
     homepage = "https://github.com/TieDyedDevil/XS";
-    description = "Extensible shell with functional semantics and conventional syntax";
+    description =
+      "Extensible shell with functional semantics and conventional syntax";
 
     # See doc/ANCENSTORS and doc/COPYING files for more details.
     license = licenses.publicDomain;