From d5dc7479c489d17e6dcacf081c0f1b5242d99bd9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= Date: Sun, 8 Jan 2023 11:25:01 +0100 Subject: Format using Alejandra --- pkgs/bigclown-leds/default.nix | 53 ++++++++-------- pkgs/default.nix | 45 +++++++------- pkgs/dev/default.nix | 41 +++++++------ pkgs/lorem-text/default.nix | 8 +-- pkgs/luks-hw-password/default.nix | 15 +++-- pkgs/sdcv/default.nix | 19 ++++-- pkgs/shvspy/default.nix | 81 ++++++++++++++---------- pkgs/stardict/cz.nix | 7 ++- pkgs/stardict/de-cz.nix | 7 ++- pkgs/stardict/default.nix | 126 +++++++++++++++++++++++--------------- pkgs/stardict/en-cz.nix | 7 ++- pkgs/stardict/wrapper.nix | 36 ++++++----- pkgs/theme/background-lnxpcs.nix | 10 ++- pkgs/theme/delft-icon-theme.nix | 15 +++-- pkgs/theme/myswaylock.nix | 21 ++++--- pkgs/theme/swaybackground.nix | 20 +++--- 16 files changed, 296 insertions(+), 215 deletions(-) (limited to 'pkgs') diff --git a/pkgs/bigclown-leds/default.nix b/pkgs/bigclown-leds/default.nix index 8ebac59..0d2f8a9 100644 --- a/pkgs/bigclown-leds/default.nix +++ b/pkgs/bigclown-leds/default.nix @@ -1,28 +1,29 @@ -{ lib, stdenvNoCC, fetchgit -, makeWrapper, python3 +{ + lib, + stdenvNoCC, + fetchgit, + makeWrapper, + python3, }: +with lib; let + python = python3.withPackages (pypkgs: + with pypkgs; [ + paho-mqtt + ]); +in + stdenvNoCC.mkDerivation rec { + name = "personal-devshells"; + src = fetchgit { + url = "https://git.cynerd.cz/bigclown-leds"; + rev = "1a2c69a2152c315a964c0eb9b2673c70e52051b4"; + hash = "sha256-alApXwHZeUnNFkO2S+yw0qG18Wr5fF3ErGc0QIgPFU8="; + }; -with lib; - -let - - python = python3.withPackages (pypkgs: with pypkgs; [ - paho-mqtt - ]); - -in stdenvNoCC.mkDerivation rec { - name = "personal-devshells"; - src = fetchgit { - url = "https://git.cynerd.cz/bigclown-leds"; - rev = "1a2c69a2152c315a964c0eb9b2673c70e52051b4"; - hash = "sha256-alApXwHZeUnNFkO2S+yw0qG18Wr5fF3ErGc0QIgPFU8="; - }; - - nativeBuildInputs = [ makeWrapper ]; - installPhase = '' - mkdir -p $out/bin - cp bigclown-leds $out/bin/ - wrapProgram $out/bin/bigclown-leds \ - --prefix PATH : ${lib.makeBinPath [ python ]} - ''; -} + nativeBuildInputs = [makeWrapper]; + installPhase = '' + mkdir -p $out/bin + cp bigclown-leds $out/bin/ + wrapProgram $out/bin/bigclown-leds \ + --prefix PATH : ${lib.makeBinPath [python]} + ''; + } diff --git a/pkgs/default.nix b/pkgs/default.nix index 9b7cf3b..bb3bd42 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -1,31 +1,31 @@ -{ self, nixpkgs }: - -let +{ + self, + nixpkgs, +}: let callPackage = nixpkgs.newScope personalpkgs; personalpkgs = rec { - - luks-hw-password = callPackage ./luks-hw-password { }; + luks-hw-password = callPackage ./luks-hw-password {}; dev = callPackage ./dev { devShells = self.devShells.${nixpkgs.system}; }; - delft-icon-theme = callPackage ./theme/delft-icon-theme.nix { }; - background-lnxpcs = callPackage ./theme/background-lnxpcs.nix { }; - swaybackground = callPackage ./theme/swaybackground.nix { }; - myswaylock = callPackage ./theme/myswaylock.nix { }; + delft-icon-theme = callPackage ./theme/delft-icon-theme.nix {}; + background-lnxpcs = callPackage ./theme/background-lnxpcs.nix {}; + swaybackground = callPackage ./theme/swaybackground.nix {}; + myswaylock = callPackage ./theme/myswaylock.nix {}; - stardict-unwrapped = callPackage ./stardict { }; - stardict = callPackage ./stardict/wrapper.nix { stardict = stardict-unwrapped; }; - stardict-en-cz = callPackage ./stardict/en-cz.nix { }; - stardict-de-cz = callPackage ./stardict/de-cz.nix { }; - stardict-cz = callPackage ./stardict/cz.nix { }; - sdcv-unwrapped = callPackage ./sdcv { }; - sdcv = callPackage ./stardict/wrapper.nix { stardict = sdcv-unwrapped; }; + stardict-unwrapped = callPackage ./stardict {}; + stardict = callPackage ./stardict/wrapper.nix {stardict = stardict-unwrapped;}; + stardict-en-cz = callPackage ./stardict/en-cz.nix {}; + stardict-de-cz = callPackage ./stardict/de-cz.nix {}; + stardict-cz = callPackage ./stardict/cz.nix {}; + sdcv-unwrapped = callPackage ./sdcv {}; + sdcv = callPackage ./stardict/wrapper.nix {stardict = sdcv-unwrapped;}; - lorem-text = callPackage ./lorem-text { }; + lorem-text = callPackage ./lorem-text {}; - bigclown-leds = callPackage ./bigclown-leds { }; + bigclown-leds = callPackage ./bigclown-leds {}; # Package to be installed to the user's profile cynerd-profile = nixpkgs.symlinkJoin { @@ -37,9 +37,9 @@ let }; # Elektroline packages - shvspy = callPackage ./shvspy { }; + shvspy = callPackage ./shvspy {}; qcoro_task_exception_handling = nixpkgs.libsForQt5.qcoro.overrideAttrs (oldAttrs: { - version = "0.6.0"; + version = "0.6.0"; src = nixpkgs.fetchFromGitHub { owner = "danvratil"; repo = "qcoro"; @@ -47,7 +47,6 @@ let sha256 = "OAYJpoW3b0boSYBfuzLrFvlYSmP3SON8O6HsDQoi+I8="; }; }); - }; - -in personalpkgs +in + personalpkgs diff --git a/pkgs/dev/default.nix b/pkgs/dev/default.nix index d9b7d52..dfc0cd7 100644 --- a/pkgs/dev/default.nix +++ b/pkgs/dev/default.nix @@ -1,24 +1,25 @@ -{ lib, stdenvNoCC -, makeShellWrapper, bash, nix -, devShells +{ + lib, + stdenvNoCC, + makeShellWrapper, + bash, + nix, + devShells, }: - -with lib; - -let - +with lib; let shells = concatStringsSep ":" (mapAttrsToList ( n: v: "${n}=${v.drvPath}=${v}" - ) devShells); - -in stdenvNoCC.mkDerivation rec { - name = "personal-devshells"; - src = ./.; + ) + devShells); +in + stdenvNoCC.mkDerivation rec { + name = "personal-devshells"; + src = ./.; - nativeBuildInputs = [ makeShellWrapper ]; - installPhase = '' - makeShellWrapper ${./dev.sh} $out/bin/dev \ - --prefix PATH : ${lib.makeBinPath [ bash nix ]} \ - --set DEV_SHELLS "${shells}" - ''; -} + nativeBuildInputs = [makeShellWrapper]; + installPhase = '' + makeShellWrapper ${./dev.sh} $out/bin/dev \ + --prefix PATH : ${lib.makeBinPath [bash nix]} \ + --set DEV_SHELLS "${shells}" + ''; + } diff --git a/pkgs/lorem-text/default.nix b/pkgs/lorem-text/default.nix index 7927346..07cb402 100644 --- a/pkgs/lorem-text/default.nix +++ b/pkgs/lorem-text/default.nix @@ -1,9 +1,7 @@ { python3Packages, fetchFromGitHub, -}: -let - +}: let pypkg = { buildPythonPackage, click, @@ -20,5 +18,5 @@ let propagatedBuildInputs = [click]; passthru.pythonPackage = pypkg; }; - -in python3Packages.callPackage pypkg { } +in + python3Packages.callPackage pypkg {} diff --git a/pkgs/luks-hw-password/default.nix b/pkgs/luks-hw-password/default.nix index 9797735..9ca3e35 100644 --- a/pkgs/luks-hw-password/default.nix +++ b/pkgs/luks-hw-password/default.nix @@ -1,7 +1,10 @@ -{ lib, stdenvNoCC, makeWrapper -, dmidecode, coreutils +{ + lib, + stdenvNoCC, + makeWrapper, + dmidecode, + coreutils, }: - stdenvNoCC.mkDerivation { pname = "luks-hw-password"; version = "1.0"; @@ -10,11 +13,11 @@ stdenvNoCC.mkDerivation { platforms = platforms.linux; }; - nativeBuildInputs = [ makeWrapper ]; - phases = [ "installPhase" ]; + nativeBuildInputs = [makeWrapper]; + phases = ["installPhase"]; installPhase = '' mkdir -p $out/bin makeWrapper ${./luks-hw-password.sh} $out/bin/luks-hw-password \ - --prefix PATH : ${lib.makeBinPath [ dmidecode coreutils ]} + --prefix PATH : ${lib.makeBinPath [dmidecode coreutils]} ''; } diff --git a/pkgs/sdcv/default.nix b/pkgs/sdcv/default.nix index 7e9527f..6a9147d 100644 --- a/pkgs/sdcv/default.nix +++ b/pkgs/sdcv/default.nix @@ -1,8 +1,15 @@ -{ lib, stdenv, fetchFromGitHub -, cmake, pkg-config, gettext -, zlib, glib, pcre, readline +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + pkg-config, + gettext, + zlib, + glib, + pcre, + readline, }: - stdenv.mkDerivation rec { pname = "sdcv"; version = "0.5.3"; @@ -14,8 +21,8 @@ stdenv.mkDerivation rec { hash = "sha256-mJ9LrQ/l0SRmueg+IfGnS0NcNheGdOZ2Gl7KMFiK6is="; }; - nativeBuildInputs = [ cmake pkg-config gettext ]; - buildInputs = [ zlib glib pcre readline ]; + nativeBuildInputs = [cmake pkg-config gettext]; + buildInputs = [zlib glib pcre readline]; makeFlags = "sdcv lang"; meta = with lib; { diff --git a/pkgs/shvspy/default.nix b/pkgs/shvspy/default.nix index edc0bd4..7f5e31d 100644 --- a/pkgs/shvspy/default.nix +++ b/pkgs/shvspy/default.nix @@ -1,39 +1,52 @@ -{ lib, stdenv, fetchFromGitHub -, cmake, doctest, libsForQt5, qcoro_task_exception_handling -, makeDesktopItem, copyDesktopItems +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + doctest, + libsForQt5, + qcoro_task_exception_handling, + makeDesktopItem, + copyDesktopItems, }: -with libsForQt5; +with libsForQt5; + stdenv.mkDerivation rec { + name = "shvspy"; -stdenv.mkDerivation rec { - name = "shvspy"; + src = fetchFromGitHub { + owner = "silicon-heaven"; + repo = "shvspy"; + rev = "a922e963bf7884164fe2b124a7a4366f7fc802a3"; + sha256 = "ExA+sFlkxFKXk69DKoGzKm80ypiNFwN281MwZkMgaVY="; + fetchSubmodules = true; + }; - src = fetchFromGitHub { - owner = "silicon-heaven"; - repo = "shvspy"; - rev = "a922e963bf7884164fe2b124a7a4366f7fc802a3"; - sha256 = "ExA+sFlkxFKXk69DKoGzKm80ypiNFwN281MwZkMgaVY="; - fetchSubmodules = true; - }; + nativeBuildInputs = [ + cmake + doctest + wrapQtAppsHook + copyDesktopItems + ]; + buildInputs = [ + qtbase + qtserialport + qtwebsockets + doctest + qcoro_task_exception_handling + ]; - nativeBuildInputs = [ - cmake doctest wrapQtAppsHook copyDesktopItems - ]; - buildInputs = [ - qtbase qtserialport qtwebsockets doctest qcoro_task_exception_handling - ]; + desktopItems = [ + (makeDesktopItem { + name = "shvspy"; + exec = "shvspy"; + desktopName = "SHVSpy"; + categories = ["Network" "RemoteAccess"]; + }) + ]; - desktopItems = [ - (makeDesktopItem { - name = "shvspy"; - exec = "shvspy"; - desktopName = "SHVSpy"; - categories = [ "Network" "RemoteAccess" ]; - }) - ]; - - meta = with lib; { - description = "Console version of Stardict program"; - homepage = "https://dushistov.github.io/sdcv/"; - license = licenses.gpl2; - }; -} + meta = with lib; { + description = "Console version of Stardict program"; + homepage = "https://dushistov.github.io/sdcv/"; + license = licenses.gpl2; + }; + } diff --git a/pkgs/stardict/cz.nix b/pkgs/stardict/cz.nix index 7b4eeb0..0ce4100 100644 --- a/pkgs/stardict/cz.nix +++ b/pkgs/stardict/cz.nix @@ -1,5 +1,8 @@ -{ lib, stdenvNoCC, fetchurl }: - +{ + lib, + stdenvNoCC, + fetchurl, +}: stdenvNoCC.mkDerivation rec { pname = "stardict-cz"; version = "20171101"; diff --git a/pkgs/stardict/de-cz.nix b/pkgs/stardict/de-cz.nix index 8ef3923..93f0744 100644 --- a/pkgs/stardict/de-cz.nix +++ b/pkgs/stardict/de-cz.nix @@ -1,5 +1,8 @@ -{ lib, stdenvNoCC, fetchurl }: - +{ + lib, + stdenvNoCC, + fetchurl, +}: stdenvNoCC.mkDerivation rec { pname = "stardict-de-cz"; version = "20200501"; diff --git a/pkgs/stardict/default.nix b/pkgs/stardict/default.nix index 9669c3d..cca761a 100644 --- a/pkgs/stardict/default.nix +++ b/pkgs/stardict/default.nix @@ -1,55 +1,81 @@ -{ lib, stdenv, fetchurl -, autoreconfHook, wrapGAppsHook -, pkg-config, automake, autoconf, libtool, intltool, gnome-doc-utils, libxslt -, gnome2, gtk2, libxml2, enchant , mariadb-connector-c, pcre -, speech-tools, speech-toolsDisable ? false -, espeak, espeakDisable ? false +{ + lib, + stdenv, + fetchurl, + autoreconfHook, + wrapGAppsHook, + pkg-config, + automake, + autoconf, + libtool, + intltool, + gnome-doc-utils, + libxslt, + gnome2, + gtk2, + libxml2, + enchant, + mariadb-connector-c, + pcre, + speech-tools, + speech-toolsDisable ? false, + espeak, + espeakDisable ? false, }: - with lib; + stdenv.mkDerivation rec { + pname = "stardict"; + version = "3.0.6"; -stdenv.mkDerivation rec { - pname = "stardict"; - version = "3.0.6"; - - src = fetchurl { - url = "https://downloads.sourceforge.net/project/stardict-4/${version}/stardict-${version}.tar.bz2"; - sha256 = "1rw2dg1d489gjjx9957j2jdmjlvylv31pnx3142lwq3pi5d6j2ka"; - }; - patches = [ - ./enchant2.patch - ./gcc46.patch - ./gconf.patch - ./glib2.patch - ./makefile.patch - ./mariadb.patch - ]; + src = fetchurl { + url = "https://downloads.sourceforge.net/project/stardict-4/${version}/stardict-${version}.tar.bz2"; + sha256 = "1rw2dg1d489gjjx9957j2jdmjlvylv31pnx3142lwq3pi5d6j2ka"; + }; + patches = [ + ./enchant2.patch + ./gcc46.patch + ./gconf.patch + ./glib2.patch + ./makefile.patch + ./mariadb.patch + ]; - nativeBuildInputs = [ - autoreconfHook wrapGAppsHook - pkg-config intltool gnome-doc-utils libxslt - ]; - buildInputs = [ - gnome2.gnome-common gnome2.GConf - gtk2 libxml2 enchant mariadb-connector-c pcre - ] - ++ optional (!speech-toolsDisable) speech-tools - ++ optional (!espeakDisable) espeak; - configureFlags = [ - "--disable-gnome-support" - "--disable-gucharmap" - "--disable-scrollkeeper" - "--disable-festival" - "--disable-gpe-support" - "--disable-schemas-install" - ] - ++ optional speech-toolsDisable "--disable-speech-tools" - ++ optional espeakDisable "--disable-espeak"; + nativeBuildInputs = [ + autoreconfHook + wrapGAppsHook + pkg-config + intltool + gnome-doc-utils + libxslt + ]; + buildInputs = + [ + gnome2.gnome-common + gnome2.GConf + gtk2 + libxml2 + enchant + mariadb-connector-c + pcre + ] + ++ optional (!speech-toolsDisable) speech-tools + ++ optional (!espeakDisable) espeak; + configureFlags = + [ + "--disable-gnome-support" + "--disable-gucharmap" + "--disable-scrollkeeper" + "--disable-festival" + "--disable-gpe-support" + "--disable-schemas-install" + ] + ++ optional speech-toolsDisable "--disable-speech-tools" + ++ optional espeakDisable "--disable-espeak"; - meta = with lib; { - description = "Cross-platform and international dictionary software"; - homepage = "http://stardict-4.sourceforge.net/"; - platforms = platforms.linux; - license = licenses.gpl3; - }; -} + meta = with lib; { + description = "Cross-platform and international dictionary software"; + homepage = "http://stardict-4.sourceforge.net/"; + platforms = platforms.linux; + license = licenses.gpl3; + }; + } diff --git a/pkgs/stardict/en-cz.nix b/pkgs/stardict/en-cz.nix index 353334c..ead1a31 100644 --- a/pkgs/stardict/en-cz.nix +++ b/pkgs/stardict/en-cz.nix @@ -1,5 +1,8 @@ -{ lib, stdenvNoCC, fetchurl }: - +{ + lib, + stdenvNoCC, + fetchurl, +}: stdenvNoCC.mkDerivation rec { pname = "stardict-en-cz"; version = "20210401"; diff --git a/pkgs/stardict/wrapper.nix b/pkgs/stardict/wrapper.nix index 6547728..e99fa01 100644 --- a/pkgs/stardict/wrapper.nix +++ b/pkgs/stardict/wrapper.nix @@ -1,20 +1,23 @@ -{ lib, stdenv, makeBinaryWrapper -, stardict +{ + lib, + stdenv, + makeBinaryWrapper, + stardict, }: - -with stardict; - -let - - drv = stdenv.mkDerivation rec { +with stardict; let + drv = stdenv.mkDerivation rec { inherit pname; inherit version; inherit meta; - nativeBuildInputs = [ stardict makeBinaryWrapper ]; - dictionaries = [ /* empty and expecting override */ ]; + nativeBuildInputs = [stardict makeBinaryWrapper]; + dictionaries = [ + /* + empty and expecting override + */ + ]; - phases = [ "installPhase" ]; + phases = ["installPhase"]; installPhase = '' mkdir -p $out/bin $out/usr/share/stardict/dic for dic in $dictionaries; do @@ -32,9 +35,10 @@ let done ''; - passthru.withDictionaries = dicts: drv.overrideAttrs (oldAttrs: { - dictionaries = dicts; - }); + passthru.withDictionaries = dicts: + drv.overrideAttrs (oldAttrs: { + dictionaries = dicts; + }); }; - -in drv +in + drv diff --git a/pkgs/theme/background-lnxpcs.nix b/pkgs/theme/background-lnxpcs.nix index a3983af..c6e61db 100644 --- a/pkgs/theme/background-lnxpcs.nix +++ b/pkgs/theme/background-lnxpcs.nix @@ -1,5 +1,9 @@ -{ lib, stdenvNoCC, fetchFromGitHub, imagemagick }: - +{ + lib, + stdenvNoCC, + fetchFromGitHub, + imagemagick, +}: stdenvNoCC.mkDerivation rec { pname = "background-lnxpcs"; version = "20190411"; @@ -11,7 +15,7 @@ stdenvNoCC.mkDerivation rec { sha256 = "vtyyG0EHRmgWlxHmHgeckwtOv7t3C+hsuTt/vBdrRQM="; }; - nativeBuildInputs = [ imagemagick ]; + nativeBuildInputs = [imagemagick]; wallpapers = "bash cron gcc gnu gnu-linux iptables kernel kill python root su sudo vim"; buildPhase = '' diff --git a/pkgs/theme/delft-icon-theme.nix b/pkgs/theme/delft-icon-theme.nix index 08ed773..1dcd904 100644 --- a/pkgs/theme/delft-icon-theme.nix +++ b/pkgs/theme/delft-icon-theme.nix @@ -1,5 +1,12 @@ -{ lib, stdenv, stdenvNoCC, fetchFromGitHub, gtk3, gnome-icon-theme, hicolor-icon-theme }: - +{ + lib, + stdenv, + stdenvNoCC, + fetchFromGitHub, + gtk3, + gnome-icon-theme, + hicolor-icon-theme, +}: stdenv.mkDerivation rec { pname = "delft-icon-theme"; version = "1.15"; @@ -11,9 +18,9 @@ stdenv.mkDerivation rec { sha256 = "fluSh2TR1CdIW54wkUp1QRB0m9akFKnSn4d+0z6gkLA="; }; - nativeBuildInputs = [ gtk3 ]; + nativeBuildInputs = [gtk3]; - propagatedBuildInputs = [ gnome-icon-theme hicolor-icon-theme ]; + propagatedBuildInputs = [gnome-icon-theme hicolor-icon-theme]; dontDropIconThemeCache = true; diff --git a/pkgs/theme/myswaylock.nix b/pkgs/theme/myswaylock.nix index 64f55f2..44d7bda 100644 --- a/pkgs/theme/myswaylock.nix +++ b/pkgs/theme/myswaylock.nix @@ -1,8 +1,13 @@ -{ lib, stdenvNoCC, makeWrapper -, bash, jq, sway, swaylock -, background-lnxpcs +{ + lib, + stdenvNoCC, + makeWrapper, + bash, + jq, + sway, + swaylock, + background-lnxpcs, }: - stdenvNoCC.mkDerivation { pname = "myswaylock"; version = "1.0"; @@ -11,13 +16,13 @@ stdenvNoCC.mkDerivation { platforms = platforms.linux; }; - nativeBuildInputs = [ makeWrapper ]; - phases = [ "installPhase" ]; + nativeBuildInputs = [makeWrapper]; + phases = ["installPhase"]; installPhase = '' mkdir -p $out/bin cp ${./myswaylock.sh} $out/bin/myswaylock wrapProgram $out/bin/myswaylock \ - --prefix PATH : ${lib.makeBinPath [ bash jq sway swaylock ]} \ - --prefix BACKGROUND_LNXPCS : ${ background-lnxpcs } + --prefix PATH : ${lib.makeBinPath [bash jq sway swaylock]} \ + --prefix BACKGROUND_LNXPCS : ${background-lnxpcs} ''; } diff --git a/pkgs/theme/swaybackground.nix b/pkgs/theme/swaybackground.nix index 6675d24..8b4be5a 100644 --- a/pkgs/theme/swaybackground.nix +++ b/pkgs/theme/swaybackground.nix @@ -1,8 +1,12 @@ -{ lib, stdenvNoCC, makeWrapper -, bash, jq, sway -, background-lnxpcs +{ + lib, + stdenvNoCC, + makeWrapper, + bash, + jq, + sway, + background-lnxpcs, }: - stdenvNoCC.mkDerivation { pname = "swaybackground"; version = "1.0"; @@ -11,13 +15,13 @@ stdenvNoCC.mkDerivation { platforms = platforms.linux; }; - nativeBuildInputs = [ makeWrapper ]; - phases = [ "installPhase" ]; + nativeBuildInputs = [makeWrapper]; + phases = ["installPhase"]; installPhase = '' mkdir -p $out/bin cp ${./swaybackground.sh} $out/bin/swaybackground wrapProgram $out/bin/swaybackground \ - --prefix PATH : ${lib.makeBinPath [ bash jq sway ]} \ - --prefix BACKGROUND_LNXPCS : ${ background-lnxpcs } + --prefix PATH : ${lib.makeBinPath [bash jq sway]} \ + --prefix BACKGROUND_LNXPCS : ${background-lnxpcs} ''; } -- cgit v1.2.3