diff --git a/pkgs/base16-builder-go/default.nix b/pkgs/base16-builder-go/default.nix index 741a93a1..69f337fa 100644 --- a/pkgs/base16-builder-go/default.nix +++ b/pkgs/base16-builder-go/default.nix @@ -1,7 +1,4 @@ -{ lib -, fetchFromGitHub -, buildGoModule -}: +{ lib, fetchFromGitHub, buildGoModule }: buildGoModule rec { pname = "base16-builder-go"; diff --git a/pkgs/blender-blendergis/default.nix b/pkgs/blender-blendergis/default.nix index 63160851..fdee7307 100644 --- a/pkgs/blender-blendergis/default.nix +++ b/pkgs/blender-blendergis/default.nix @@ -1,9 +1,4 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, imageio -, openimageio -}: +{ lib, buildPythonPackage, fetchFromGitHub, imageio, openimageio }: buildPythonPackage rec { pname = "blender-blendergis"; diff --git a/pkgs/blender-machin3tools/default.nix b/pkgs/blender-machin3tools/default.nix index 0712c326..860acd27 100644 --- a/pkgs/blender-machin3tools/default.nix +++ b/pkgs/blender-machin3tools/default.nix @@ -1,7 +1,4 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -}: +{ lib, buildPythonPackage, fetchFromGitHub }: buildPythonPackage rec { pname = "blender-machin3tools"; diff --git a/pkgs/ctrld/default.nix b/pkgs/ctrld/default.nix index 793a1df0..747b8f10 100644 --- a/pkgs/ctrld/default.nix +++ b/pkgs/ctrld/default.nix @@ -1,8 +1,4 @@ -{ - lib, - fetchFromGitHub, - buildGoModule, -}: +{ lib, fetchFromGitHub, buildGoModule, }: buildGoModule rec { pname = "ctrld"; diff --git a/pkgs/default.nix b/pkgs/default.nix index 186b96f8..8c22d9c6 100644 --- a/pkgs/default.nix +++ b/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 { }; diff --git a/pkgs/distant.nix b/pkgs/distant.nix index 90df14bf..a67164e8 100644 --- a/pkgs/distant.nix +++ b/pkgs/distant.nix @@ -1,10 +1,4 @@ -{ stdenv -, lib -, rustPlatform -, fetchFromGitHub -, pkg-config -, openssl -}: +{ stdenv, lib, rustPlatform, fetchFromGitHub, pkg-config, openssl }: rustPlatform.buildRustPackage rec { version = "0.20.0"; diff --git a/pkgs/domterm/default.nix b/pkgs/domterm/default.nix index 6deff2a1..82eedebf 100644 --- a/pkgs/domterm/default.nix +++ b/pkgs/domterm/default.nix @@ -1,33 +1,14 @@ -{ lib -, stdenv -, fetchFromGitHub -, autoreconfHook -, desktop-file-utils -, pkg-config -, libwebsockets -, ncurses -, openssl -, unixtools -, zlib -, rustPlatform -, perl -, qtbase -, qtwebchannel -, qtwebengine -, wrapQtAppsHook +{ lib, stdenv, fetchFromGitHub, autoreconfHook, desktop-file-utils, pkg-config +, libwebsockets, ncurses, openssl, unixtools, zlib, rustPlatform, perl, qtbase +, qtwebchannel, qtwebengine, wrapQtAppsHook , withQtDocking ? false -, withKddockwidgets ? false -, kddockwidgets +, withKddockwidgets ? false, kddockwidgets -, withAsciidoctor ? true -, asciidoctor +, withAsciidoctor ? true, asciidoctor -, withDocbook ? true -, docbook-xsl-ns -, libxslt -}: +, withDocbook ? true, docbook-xsl-ns, libxslt }: stdenv.mkDerivation rec { pname = "domterm"; @@ -40,15 +21,12 @@ stdenv.mkDerivation rec { hash = "sha256-H1Nzqzz7dv4j9hkb08FCExLeq69EkFNXGzhhl/e+uxI="; }; - configureFlags = [ - "--with-libwebsockets" - "--enable-compiled-in-resources" - "--with-qt" - ] - ++ lib.optional withAsciidoctor "--with-asciidoctor" - ++ lib.optional withQtDocking "--with-qt-docking" - ++ lib.optional withKddockwidgets "--with-kddockwidgets" - ++ lib.optional withDocbook "--with-docbook"; + configureFlags = + [ "--with-libwebsockets" "--enable-compiled-in-resources" "--with-qt" ] + ++ lib.optional withAsciidoctor "--with-asciidoctor" + ++ 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 withAsciidoctor asciidoctor - ++ lib.optionals withDocbook [ - docbook-xsl-ns - libxslt - ]; + ] ++ lib.optional withKddockwidgets kddockwidgets + ++ lib.optional withAsciidoctor asciidoctor + ++ lib.optionals withDocbook [ docbook-xsl-ns libxslt ]; meta = with lib; { homepage = "https://domterm.org/"; diff --git a/pkgs/fastn/default.nix b/pkgs/fastn/default.nix index 7779b674..c62cc11f 100644 --- a/pkgs/fastn/default.nix +++ b/pkgs/fastn/default.nix @@ -1,10 +1,4 @@ -{ lib -, rustPlatform -, fetchFromGitHub -, cmake -, pkg-config -, openssl -}: +{ lib, 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 = [ - "--skip=tests::fbt" - ]; + checkFlags = [ "--skip=tests::fbt" ]; meta = with lib; { homepage = "https://fastn.com/"; diff --git a/pkgs/flatsync/default.nix b/pkgs/flatsync/default.nix index 000d76b4..883f1386 100644 --- a/pkgs/flatsync/default.nix +++ b/pkgs/flatsync/default.nix @@ -1,22 +1,6 @@ -{ stdenv -, lib -, fetchFromGitLab -, rustPlatform -, cargo -, rustc -, meson -, ninja -, pkg-config -, glib -, gobject-introspection -, libadwaita -, wrapGAppsHook4 -, openssl -, appstream-glib -, desktop-file-utils -, blueprint-compiler -, flatpak -}: +{ stdenv, lib, fetchFromGitLab, 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 = [ - glib - flatpak - libadwaita - openssl - ]; + buildInputs = [ glib flatpak libadwaita openssl ]; meta = with lib; { homepage = "https://gitlab.gnome.org/Cogitri/flatsync"; diff --git a/pkgs/gnome-search-provider-recoll.nix b/pkgs/gnome-search-provider-recoll.nix index 5ec12e27..51b8b597 100644 --- a/pkgs/gnome-search-provider-recoll.nix +++ b/pkgs/gnome-search-provider-recoll.nix @@ -1,14 +1,5 @@ -{ stdenv -, lib -, fetchurl -, autoreconfHook -, recoll -, python3Packages -, glib -, gobject-introspection -, wrapGAppsHook3 -, gnome-shell -}: +{ stdenv, lib, fetchurl, autoreconfHook, recoll, python3Packages, glib +, gobject-introspection, wrapGAppsHook3, gnome-shell }: python3Packages.buildPythonPackage rec { pname = "gnome-search-provider-recoll"; diff --git a/pkgs/graphite-design-tool/default.nix b/pkgs/graphite-design-tool/default.nix index e6510a1e..2b96fe6b 100644 --- a/pkgs/graphite-design-tool/default.nix +++ b/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"; diff --git a/pkgs/hush-shell.nix b/pkgs/hush-shell.nix index 0cc0814d..967de4ba 100644 --- a/pkgs/hush-shell.nix +++ b/pkgs/hush-shell.nix @@ -1,9 +1,4 @@ -{ stdenv -, lib -, fetchFromGitHub -, rustPlatform -, toybox -}: +{ stdenv, lib, fetchFromGitHub, rustPlatform, toybox }: rustPlatform.buildRustPackage rec { pname = "hush"; @@ -23,10 +18,8 @@ rustPlatform.buildRustPackage rec { ''; checkInputs = [ toybox ]; - checkFlags = [ - "--skip=tests::test_token_kind_size" - "--skip=tests::test_positive" - ]; + checkFlags = + [ "--skip=tests::test_token_kind_size" "--skip=tests::test_positive" ]; meta = with lib; { homepage = "https://github.com/hush-shell/hush"; diff --git a/pkgs/lazyjj/default.nix b/pkgs/lazyjj/default.nix index 77618dd3..15f68414 100644 --- a/pkgs/lazyjj/default.nix +++ b/pkgs/lazyjj/default.nix @@ -1,14 +1,7 @@ -{ - lib, - rustPlatform, - fetchFromGitHub, - jujutsu, -}: +{ lib, rustPlatform, fetchFromGitHub, jujutsu, }: -let - version = "0.3.1"; -in -rustPlatform.buildRustPackage { +let version = "0.3.1"; +in rustPlatform.buildRustPackage { inherit version; pname = "lazyjj"; diff --git a/pkgs/lwp/default.nix b/pkgs/lwp/default.nix index dbf10159..5da20ad8 100644 --- a/pkgs/lwp/default.nix +++ b/pkgs/lwp/default.nix @@ -1,12 +1,4 @@ -{ stdenv -, lib -, fetchFromGitHub -, cmake -, SDL2 -, xorg -, xwayland -, libconfig -}: +{ stdenv, lib, fetchFromGitHub, cmake, SDL2, xorg, xwayland, libconfig }: stdenv.mkDerivation rec { pname = "lwp"; @@ -20,12 +12,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake ]; - buildInputs = [ - SDL2 - xorg.libX11 - xwayland - libconfig - ]; + buildInputs = [ 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 = [ - "-DPROGRAM_VERSION=${version}" - ]; + cmakeFlags = [ "-DPROGRAM_VERSION=${version}" ]; meta = with lib; { homepage = "https://github.com/jszczerbinsky/lwp"; diff --git a/pkgs/nautilus-annotations/default.nix b/pkgs/nautilus-annotations/default.nix index 93653b08..8be6fedc 100644 --- a/pkgs/nautilus-annotations/default.nix +++ b/pkgs/nautilus-annotations/default.nix @@ -1,14 +1,5 @@ -{ stdenv -, lib -, fetchFromGitLab -, glib -, nautilus -, gtksourceview5 -, libadwaita -, autoreconfHook -, wrapGAppsHook4 -, pkg-config -}: +{ stdenv, lib, 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 = [ - autoreconfHook - glib - nautilus - pkg-config - wrapGAppsHook4 - ]; + nativeBuildInputs = + [ autoreconfHook glib nautilus pkg-config wrapGAppsHook4 ]; - buildInputs = [ - libadwaita - gtksourceview5 - ]; + buildInputs = [ libadwaita gtksourceview5 ]; preConfigure = '' ./bootstrap diff --git a/pkgs/pd-l2ork/default.nix b/pkgs/pd-l2ork/default.nix index 7ba4895e..2762663d 100644 --- a/pkgs/pd-l2ork/default.nix +++ b/pkgs/pd-l2ork/default.nix @@ -1,14 +1,5 @@ -{ stdenv, - lib, - fetchFromGitHub, - autoreconfHook, - bison, - fftw, - libtool, - libjack2, - bluez, - udev -}: +{ stdenv, lib, 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 = [ - libtool - ]; + nativeBuildInputs = [ libtool ]; - buildInputs = [ - bison - fftw - libjack2 - bluez - udev - ]; + buildInputs = [ bison fftw libjack2 bluez udev ]; meta = with lib; { homepage = "http://l2ork.music.vt.edu/"; diff --git a/pkgs/pigeon-mail/default.nix b/pkgs/pigeon-mail/default.nix index cfec0702..f4924bdb 100644 --- a/pkgs/pigeon-mail/default.nix +++ b/pkgs/pigeon-mail/default.nix @@ -1,9 +1,4 @@ -{ lib -, fetchFromGitHub -, rustPlatform -, pkg-config -, openssl -}: +{ lib, fetchFromGitHub, rustPlatform, pkg-config, openssl }: rustPlatform.buildRustPackage rec { pname = "pigeon-mail"; @@ -18,9 +13,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-MRSO89qg08GyyIuzEpSO4qQTZS876U3SeGJ6eCO+3BA="; - env = { - OPENSSL_NO_VENDOR = "1"; - }; + env = { OPENSSL_NO_VENDOR = "1"; }; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ]; diff --git a/pkgs/purr-data/default.nix b/pkgs/purr-data/default.nix index 8f34cc53..f0d09a19 100644 --- a/pkgs/purr-data/default.nix +++ b/pkgs/purr-data/default.nix @@ -1,14 +1,5 @@ -{ stdenv, - lib, - fetchFromGitHub, - bison, - fftw, - libtool, - libjack2, - bluez, - udev, - wget, -}: +{ stdenv, lib, 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 = [ - libtool - ]; + nativeBuildInputs = [ libtool ]; - buildInputs = [ - bison - fftw - libjack2 - bluez - udev - wget - ]; + buildInputs = [ bison fftw libjack2 bluez udev wget ]; preBuild = '' patchShebangs l2ork_addons/*.sh ''; - buildFlags = [ - "prefix=${placeholder "out"}" - ]; + buildFlags = [ "prefix=${placeholder "out"}" ]; meta = with lib; { homepage = "http://l2ork.music.vt.edu/"; diff --git a/pkgs/rotp-fusion/default.nix b/pkgs/rotp-fusion/default.nix index 69d47a3f..605464d9 100644 --- a/pkgs/rotp-fusion/default.nix +++ b/pkgs/rotp-fusion/default.nix @@ -1,9 +1,4 @@ -{ lib, - fetchFromGitHub, - maven, - libwebp, - vorbis-tools, -}: +{ lib, fetchFromGitHub, maven, libwebp, vorbis-tools, }: maven.buildMavenPackage rec { pname = "rotp-fusion"; @@ -20,10 +15,7 @@ maven.buildMavenPackage rec { mvnHash = ""; - nativeBuildInputs = [ - libwebp - vorbis-tools - ]; + nativeBuildInputs = [ libwebp vorbis-tools ]; meta = with lib; { description = "Mod of Remnants of the Precursors with more features"; diff --git a/pkgs/rotp-modnar/default.nix b/pkgs/rotp-modnar/default.nix index d70e0c66..19cdb846 100644 --- a/pkgs/rotp-modnar/default.nix +++ b/pkgs/rotp-modnar/default.nix @@ -1,8 +1,4 @@ -{ - lib, - rotp, - fetchFromGitHub, -}: +{ lib, rotp, fetchFromGitHub, }: rotp.overrideAttrs (finalAttrs: prevAttrs: { src = fetchFromGitHub { diff --git a/pkgs/sessiond/default.nix b/pkgs/sessiond/default.nix index 32882829..cd4efac9 100644 --- a/pkgs/sessiond/default.nix +++ b/pkgs/sessiond/default.nix @@ -1,19 +1,6 @@ -{ lib -, fetchFromGitHub -, fetchpatch -, meson -, ninja -, pkg-config -, coreutils -, glib -, gobject-introspection -, xorg -, udev -, wireplumber -, pipewire -, perl -, python3Packages -}: +{ lib, fetchFromGitHub, fetchpatch, 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 = [ - meson - ninja - pkg-config - glib - gobject-introspection - perl - ]; + nativeBuildInputs = + [ meson ninja pkg-config glib gobject-introspection perl ]; - buildInputs = [ - udev - xorg.libXi - xorg.libX11 - xorg.libXext - wireplumber - pipewire - ]; + buildInputs = + [ udev xorg.libXi xorg.libX11 xorg.libXext wireplumber pipewire ]; - propagatedBuildInputs = with python3Packages; [ - dbus-python - ]; + propagatedBuildInputs = with python3Packages; [ dbus-python ]; postPatch = '' substituteInPlace ./systemd/sessiond.service \ diff --git a/pkgs/smile/default.nix b/pkgs/smile/default.nix index 7ad5dc4f..e36814e3 100644 --- a/pkgs/smile/default.nix +++ b/pkgs/smile/default.nix @@ -1,19 +1,6 @@ -{ stdenv -, lib -, fetchFromGitHub -, meson -, ninja -, appstream-glib -, desktop-file-utils -, gettext -, glib -, gtk4 -, libwnck -, wrapGAppsHook4 -, pkg-config -, python3Packages -, gobject-introspection -}: +{ stdenv, lib, fetchFromGitHub, 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 = [ - gobject-introspection - ]; + propagatedNativeBuildInputs = [ gobject-introspection ]; propagatedBuildInputs = with python3Packages; [ pygobject3 @@ -59,10 +44,7 @@ python3Packages.buildPythonApplication rec { dbus-python ]; - buildInputs = [ - libwnck - gtk4 - ]; + buildInputs = [ libwnck gtk4 ]; dontWrapGApps = true; preFixup = '' diff --git a/pkgs/software-heritage/aiohttp-utils.nix b/pkgs/software-heritage/aiohttp-utils.nix index ce7fb586..8482f48a 100644 --- a/pkgs/software-heritage/aiohttp-utils.nix +++ b/pkgs/software-heritage/aiohttp-utils.nix @@ -13,11 +13,7 @@ buildPythonPackage rec { doCheck = false; - propagatedBuildInputs = [ - aiohttp - gunicorn - python-mimeparse - ]; + propagatedBuildInputs = [ aiohttp gunicorn python-mimeparse ]; meta = with lib; { homepage = "https://github.com/sloria/aiohttp-utils"; diff --git a/pkgs/software-heritage/attrs-strict.nix b/pkgs/software-heritage/attrs-strict.nix index b4fc52db..dbd1da91 100644 --- a/pkgs/software-heritage/attrs-strict.nix +++ b/pkgs/software-heritage/attrs-strict.nix @@ -10,10 +10,7 @@ buildPythonPackage rec { sha256 = "sha256-YybB5RxP0v/8ndYH3sBsMa3WTu29N6ZR6oj2Y6N8Pxg"; }; - propagatedBuildInputs = [ - setuptools-scm - attrs - ]; + propagatedBuildInputs = [ setuptools-scm attrs ]; meta = with lib; { homepage = "https://github.com/bloomberg/attrs-strict"; diff --git a/pkgs/software-heritage/default.nix b/pkgs/software-heritage/default.nix index 93e6b032..f44b0d59 100644 --- a/pkgs/software-heritage/default.nix +++ b/pkgs/software-heritage/default.nix @@ -1,16 +1,16 @@ { lib, callPackage, newScope, python3Packages, ... }: lib.fix' (self: -let - callPackage = newScope self; -in -lib.recurseIntoAttrs { - attrs-strict = callPackage ./attrs-strict.nix { inherit python3Packages; }; - aiohttp-utils = callPackage ./aiohttp-utils.nix { inherit python3Packages; }; + let callPackage = newScope self; + in lib.recurseIntoAttrs { + attrs-strict = callPackage ./attrs-strict.nix { inherit python3Packages; }; + aiohttp-utils = + callPackage ./aiohttp-utils.nix { inherit python3Packages; }; - swh-fuse = callPackage ./swh-fuse.nix { inherit python3Packages; }; - swh-core = callPackage ./swh-core.nix { inherit python3Packages; }; - swh-model = callPackage ./swh-model.nix { inherit python3Packages; }; - swh-web-client = callPackage ./swh-web-client.nix { inherit python3Packages; }; - swh-auth = callPackage ./swh-auth.nix { inherit python3Packages; }; -}) + swh-fuse = callPackage ./swh-fuse.nix { inherit python3Packages; }; + swh-core = callPackage ./swh-core.nix { inherit python3Packages; }; + swh-model = callPackage ./swh-model.nix { inherit python3Packages; }; + swh-web-client = + callPackage ./swh-web-client.nix { inherit python3Packages; }; + swh-auth = callPackage ./swh-auth.nix { inherit python3Packages; }; + }) diff --git a/pkgs/software-heritage/swh-auth.nix b/pkgs/software-heritage/swh-auth.nix index 6ed19561..c0af3a3b 100644 --- a/pkgs/software-heritage/swh-auth.nix +++ b/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 diff --git a/pkgs/speki/default.nix b/pkgs/speki/default.nix index 90996c75..d96dea80 100644 --- a/pkgs/speki/default.nix +++ b/pkgs/speki/default.nix @@ -1,10 +1,4 @@ -{ rustPlatform -, lib -, fetchFromGitHub -, pkg-config -, openssl -, alsa-lib -}: +{ rustPlatform, 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 = { - lockFile = ./Cargo.lock; - }; + cargoLock = { lockFile = ./Cargo.lock; }; env.OPENSSL_NO_VENDOR = "1"; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/tailcall/default.nix b/pkgs/tailcall/default.nix index 9b339d06..58a53199 100644 --- a/pkgs/tailcall/default.nix +++ b/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="; - "posthog-rs-0.2.3" = "sha256-1HxOEzc8GROStxuxG0cfCNa4iA04sCD7jD6uWT5bl2o="; - "serde_json_borrow-0.7.0" = "sha256-UcgIWjdSCkYRYxEcWbwQs+BxX41ITqkvFSFtzEJchVk="; + "htpasswd-verify-0.3.0" = + "sha256-GbkY590xWEZ+lVT9nffs4HIRW6CwBjll4rGIk27waxo="; + "posthog-rs-0.2.3" = + "sha256-1HxOEzc8GROStxuxG0cfCNa4iA04sCD7jD6uWT5bl2o="; + "serde_json_borrow-0.7.0" = + "sha256-UcgIWjdSCkYRYxEcWbwQs+BxX41ITqkvFSFtzEJchVk="; }; }; diff --git a/pkgs/tic-80/default.nix b/pkgs/tic-80/default.nix index e49ef519..c93b73a0 100644 --- a/pkgs/tic-80/default.nix +++ b/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 -, lib -, SDL2 -, SDL2_sound -, alsa-lib -, cmake -, fetchFromGitHub -, freeglut -, git -, gtk3 -, dbus -, libGLU -, libX11 -, libglvnd -, libsamplerate -, mesa -, pkg-config -, sndio +{ stdenv, lib, SDL2, SDL2_sound, alsa-lib, cmake, fetchFromGitHub, freeglut, git +, gtk3, dbus, libGLU, libX11, libglvnd, libsamplerate, mesa, pkg-config, sndio , zlib -, pulseaudioSupport ? stdenv.isLinux -, libpulseaudio +, pulseaudioSupport ? stdenv.isLinux, libpulseaudio -, waylandSupport ? true -, wayland -, libxkbcommon -, libdecor +, waylandSupport ? true, wayland, libxkbcommon, libdecor -, esoundSupport ? true -, espeak +, esoundSupport ? true, espeak -, jackSupport ? true -, jack2 +, jackSupport ? true, jack2 - # Ruby support requires compiling mruby so we'll skip it for now. -, rubySupport ? false -, ruby -, rake +# Ruby support requires compiling mruby so we'll skip it for now. +, rubySupport ? false, ruby, rake -, pythonSupport ? true -, python3 +, pythonSupport ? true, 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 jackSupport jack2 - ++ lib.optional esoundSupport espeak - ++ lib.optionals rubySupport [ - ruby - rake - ] - ++ lib.optional pythonSupport python3 - ++ lib.optionals (stdenv.isLinux && waylandSupport) [ - wayland - libxkbcommon - libdecor - ]; + ] ++ lib.optional pulseaudioSupport libpulseaudio + ++ lib.optional jackSupport jack2 ++ lib.optional esoundSupport espeak + ++ lib.optionals rubySupport [ ruby rake ] + ++ lib.optional pythonSupport python3 + ++ lib.optionals (stdenv.isLinux && waylandSupport) [ + wayland + libxkbcommon + libdecor + ]; cmakeFlags = lib.optional withPro "-DBUILD_PRO=ON"; diff --git a/pkgs/uwsm/default.nix b/pkgs/uwsm/default.nix index 27f31ec6..fe59c4ba 100644 --- a/pkgs/uwsm/default.nix +++ b/pkgs/uwsm/default.nix @@ -1,13 +1,7 @@ -{ lib -, python311Packages -, fetchFromGitHub -, meson -, ninja -, pkg-config +{ lib, python311Packages, fetchFromGitHub, meson, ninja, pkg-config - # This is for substituting shebangs in its plugins. -, coreutils -}: +# This is for substituting shebangs in its plugins. +, coreutils }: python311Packages.buildPythonPackage rec { pname = "uwsm"; @@ -21,20 +15,11 @@ python311Packages.buildPythonPackage rec { hash = "sha256-n80FZ6rEguTN9ouEqI+bc5FOSeFQ8ynV+XDL2K/ZIxI="; }; - patches = [ - ./0001-chore-add-build-backend-for-pyproject.patch - ]; + patches = [ ./0001-chore-add-build-backend-for-pyproject.patch ]; - nativeBuildInputs = [ - meson - ninja - pkg-config - ]; + nativeBuildInputs = [ meson ninja pkg-config ]; - propagatedBuildInputs = with python311Packages; [ - pyxdg - dbus-python - ]; + propagatedBuildInputs = with python311Packages; [ pyxdg dbus-python ]; postFixup = '' substituteInPlace $out/share/uwsm/plugins/*.sh \ diff --git a/pkgs/vgc/default.nix b/pkgs/vgc/default.nix index 50b1e7ca..2fbd98e1 100644 --- a/pkgs/vgc/default.nix +++ b/pkgs/vgc/default.nix @@ -1,15 +1,5 @@ -{ stdenv -, lib -, fetchFromGitHub -, wrapQtAppsHook -, qtbase -, cmake -, python3 -, harfbuzz -, freetype -, libGLU -, git -}: +{ stdenv, lib, 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/set-reproducible-build.patch - ]; + patches = [ ./patches/set-reproducible-build.patch ]; nativeBuildInputs = [ wrapQtAppsHook cmake ]; - buildInputs = [ - python3 - git - freetype - harfbuzz - libGLU - qtbase - ]; + buildInputs = [ python3 git freetype harfbuzz libGLU qtbase ]; meta = with lib; { homepage = "https://www.vgc.io/"; diff --git a/pkgs/willow/default.nix b/pkgs/willow/default.nix index 0c69b51a..fb94dd31 100644 --- a/pkgs/willow/default.nix +++ b/pkgs/willow/default.nix @@ -1,7 +1,4 @@ -{ lib -, buildGoModule -, fetchFromGitHub -}: +{ lib, 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; [ - mit - asl20 - ]; + license = with licenses; [ mit asl20 ]; maintainers = with maintainers; [ foo-dogsquared ]; mainProgram = "willow"; platforms = platforms.unix; diff --git a/pkgs/xs/default.nix b/pkgs/xs/default.nix index cc46eee3..c7b47b8d 100644 --- a/pkgs/xs/default.nix +++ b/pkgs/xs/default.nix @@ -1,16 +1,5 @@ -{ stdenv -, lib -, fetchFromGitHub -, boost -, boehmgc -, bison -, meson -, ninja -, pkg-config -, libffi -, readline -, git -}: +{ stdenv, lib, 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 = [ - meson - ninja - pkg-config - ]; + nativeBuildInputs = [ meson ninja pkg-config ]; - buildInputs = [ - boost - bison - boehmgc - libffi - readline - git - ]; + buildInputs = [ 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;