From 4a7f99d55d299453a9c2397f90b33d1120669775 Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Mon, 11 Jan 2021 08:54:33 +0100 Subject: treewide: with stdenv.lib; in meta -> with lib; MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Part of: https://github.com/NixOS/nixpkgs/issues/108938 meta = with stdenv.lib; is a widely used pattern. We want to slowly remove the `stdenv.lib` indirection and encourage people to use `lib` directly. Thus let’s start with the meta field. This used a rewriting script to mostly automatically replace all occurances of this pattern, and add the `lib` argument to the package header if it doesn’t exist yet. The script in its current form is available at https://cs.tvl.fyi/depot@2f807d7f141068d2d60676a89213eaa5353ca6e0/-/blob/users/Profpatsch/nixpkgs-rewriter/default.nix --- pkgs/os-specific/linux/firmware/bt-fw-converter/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/os-specific/linux/firmware/bt-fw-converter/default.nix') diff --git a/pkgs/os-specific/linux/firmware/bt-fw-converter/default.nix b/pkgs/os-specific/linux/firmware/bt-fw-converter/default.nix index 5b4506a10ea..f9218b688a9 100644 --- a/pkgs/os-specific/linux/firmware/bt-fw-converter/default.nix +++ b/pkgs/os-specific/linux/firmware/bt-fw-converter/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, perl, perlPackages, bluez }: +{ lib, stdenv, fetchurl, makeWrapper, perl, perlPackages, bluez }: stdenv.mkDerivation rec { pname = "bt-fw-converter"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/bt-fw-converter --set PERL5LIB $PERL5LIB ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/winterheart/broadcom-bt-firmware/"; description = "A tool that converts hex to hcd based on inf file"; license = licenses.mit; -- cgit 1.4.1 From 31f5dd3f3655fbedac19f64f77844aa5ed79501c Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Wed, 20 Jan 2021 07:20:11 +1000 Subject: treewide: editorconfig fixes - remove trailing whitespace - use spaces for indentation --- pkgs/applications/editors/texmaker/default.nix | 8 ++++---- pkgs/applications/graphics/animbar/default.nix | 16 ++++++++-------- pkgs/applications/office/csv2odf/default.nix | 2 +- pkgs/applications/science/astronomy/xearth/default.nix | 2 +- pkgs/applications/science/biology/minimap2/default.nix | 2 +- pkgs/applications/science/biology/prodigal/default.nix | 2 +- .../applications/science/logic/cryptominisat/default.nix | 2 +- .../science/machine-learning/sc2-headless/maps.nix | 2 +- .../science/robotics/betaflight-configurator/default.nix | 6 +++--- .../science/robotics/sumorobot-manager/default.nix | 2 +- pkgs/applications/search/grepm/default.nix | 2 +- pkgs/applications/video/kazam/default.nix | 2 +- pkgs/applications/virtualization/xen/xsa-patches.nix | 2 +- .../window-managers/jwm/jwm-settings-manager.nix | 2 +- pkgs/applications/window-managers/lemonbar/default.nix | 10 +++++----- pkgs/applications/window-managers/vwm/default.nix | 6 +++--- pkgs/build-support/fetchbzr/default.nix | 2 +- pkgs/build-support/fetchmtn/default.nix | 2 +- pkgs/data/documentation/rnrs/common.nix | 2 +- pkgs/data/fonts/mno16/default.nix | 2 +- pkgs/desktops/gnustep/projectcenter/default.nix | 2 +- pkgs/development/compilers/ghc/8.10.1.nix | 2 +- pkgs/development/compilers/ghc/8.8.2.nix | 2 +- pkgs/development/compilers/ghc/8.8.3.nix | 2 +- pkgs/development/compilers/ghc/8.8.4.nix | 2 +- pkgs/development/compilers/ghc/head.nix | 2 +- pkgs/development/compilers/manticore/default.nix | 14 +++++++------- pkgs/development/compilers/ocaml/3.11.2.nix | 2 +- pkgs/development/idris-modules/tparsec.nix | 2 +- pkgs/development/libraries/SDL_Pango/default.nix | 2 +- pkgs/development/libraries/biblesync/default.nix | 2 +- pkgs/development/libraries/boost/1.71.nix | 2 +- pkgs/development/libraries/capstone/default.nix | 2 +- pkgs/development/libraries/classads/default.nix | 2 +- pkgs/development/libraries/cminpack/default.nix | 2 +- pkgs/development/libraries/concurrencykit/default.nix | 2 +- pkgs/development/libraries/dotnetfx35/default.nix | 8 ++++---- pkgs/development/libraries/dotnetfx40/default.nix | 8 ++++---- pkgs/development/libraries/elf-header/default.nix | 6 +++--- pkgs/development/libraries/fastpbkdf2/default.nix | 4 ++-- pkgs/development/libraries/frame/default.nix | 2 +- pkgs/development/libraries/glfw/2.x.nix | 6 +++--- pkgs/development/libraries/hyperscan/default.nix | 2 +- pkgs/development/libraries/jabcode/default.nix | 2 +- pkgs/development/libraries/java/geoipjava/default.nix | 2 +- pkgs/development/libraries/jemalloc/jemalloc450.nix | 2 +- pkgs/development/libraries/levmar/default.nix | 4 ++-- pkgs/development/libraries/lib3ds/default.nix | 4 ++-- pkgs/development/libraries/libavc1394/default.nix | 2 +- pkgs/development/libraries/libcangjie/default.nix | 2 +- pkgs/development/libraries/libcutl/default.nix | 2 +- pkgs/development/libraries/libdiscid/default.nix | 2 +- pkgs/development/libraries/libdvdread/4.9.9.nix | 2 +- pkgs/development/libraries/libmcrypt/default.nix | 2 +- pkgs/development/libraries/libofx/default.nix | 2 +- pkgs/development/libraries/liboop/default.nix | 2 +- pkgs/development/libraries/libredwg/default.nix | 2 +- pkgs/development/libraries/libwpd/default.nix | 4 ++-- pkgs/development/libraries/libx86/src-for-default.nix | 4 ++-- pkgs/development/libraries/martyr/default.nix | 10 +++++----- pkgs/development/libraries/opencore-amr/default.nix | 6 +++--- pkgs/development/libraries/qxt/default.nix | 2 +- .../libraries/science/biology/bpp-seq/default.nix | 2 +- pkgs/development/libraries/szip/default.nix | 2 +- pkgs/development/libraries/theft/default.nix | 4 ++-- pkgs/development/libraries/tix/default.nix | 4 ++-- pkgs/development/libraries/tnt/default.nix | 2 +- pkgs/development/libraries/udunits/default.nix | 2 +- pkgs/development/ocaml-modules/faillib/default.nix | 2 +- pkgs/development/ocaml-modules/lablgl/default.nix | 2 +- pkgs/development/ocaml-modules/ocamlsdl/default.nix | 4 ++-- pkgs/development/ocaml-modules/optcomp/default.nix | 2 +- pkgs/development/ocaml-modules/piqi/default.nix | 2 +- pkgs/development/ocaml-modules/rresult/default.nix | 2 +- pkgs/development/ocaml-modules/xml-light/default.nix | 2 +- pkgs/development/pure-modules/gsl/default.nix | 2 +- pkgs/development/python-modules/cbor2/default.nix | 2 +- pkgs/development/python-modules/deprecated/default.nix | 2 +- pkgs/development/python-modules/pint/default.nix | 2 +- pkgs/development/python-modules/wrf-python/default.nix | 2 +- pkgs/development/tools/analysis/emma/default.nix | 2 +- pkgs/development/tools/documentation/mkdocs/default.nix | 2 +- pkgs/development/tools/fmbt/default.nix | 2 +- pkgs/development/tools/ineffassign/default.nix | 2 +- pkgs/development/tools/makerpm/default.nix | 4 ++-- pkgs/development/tools/misc/doclifter/default.nix | 6 +++--- pkgs/development/tools/ocaml/omake/0.9.8.6-rc1.nix | 2 +- pkgs/development/tools/unity3d/default.nix | 2 +- pkgs/development/tools/yuicompressor/default.nix | 4 ++-- pkgs/development/web/kcgi/default.nix | 2 +- pkgs/development/web/remarkjs/default.nix | 2 +- pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix | 4 ++-- pkgs/games/dwarf-fortress/legends-browser/default.nix | 2 +- pkgs/games/dwarf-fortress/wrapper/default.nix | 2 +- pkgs/games/frogatto/data.nix | 4 ++-- pkgs/games/globulation/default.nix | 6 +++--- pkgs/games/rimshot/default.nix | 2 +- pkgs/games/snake4/default.nix | 2 +- pkgs/misc/drivers/epson-201106w/default.nix | 2 +- pkgs/misc/drivers/epson-escpr/default.nix | 2 +- pkgs/misc/drivers/epson-escpr2/default.nix | 2 +- pkgs/os-specific/linux/can-isotp/default.nix | 6 +++--- .../linux/firmware/bt-fw-converter/default.nix | 2 +- pkgs/os-specific/linux/input-utils/default.nix | 2 +- pkgs/os-specific/linux/mxu11x0/default.nix | 2 +- pkgs/os-specific/linux/powerstat/default.nix | 8 ++++---- pkgs/os-specific/linux/rewritefs/default.nix | 4 ++-- pkgs/servers/gopher/gofish/default.nix | 2 +- pkgs/servers/sickbeard/sickrage.nix | 2 +- pkgs/servers/wsdd/default.nix | 8 ++++---- pkgs/servers/xmpp/pyMAILt/default.nix | 10 +++++----- pkgs/shells/pash/default.nix | 2 +- pkgs/tools/X11/alttab/default.nix | 2 +- pkgs/tools/X11/xsettingsd/default.nix | 2 +- pkgs/tools/archivers/rpmextract/default.nix | 2 +- pkgs/tools/backup/hpe-ltfs/default.nix | 2 +- pkgs/tools/backup/ori/default.nix | 2 +- pkgs/tools/bluetooth/openobex/default.nix | 4 ++-- pkgs/tools/filesystems/bcache-tools/default.nix | 2 +- pkgs/tools/filesystems/ext4magic/default.nix | 2 +- pkgs/tools/filesystems/genext2fs/default.nix | 2 +- pkgs/tools/graphics/cfdg/src-for-default.nix | 4 ++-- pkgs/tools/graphics/scanbd/default.nix | 6 +++--- pkgs/tools/inputmethods/fcitx/default.nix | 4 ++-- pkgs/tools/misc/dumptorrent/default.nix | 2 +- pkgs/tools/misc/dvtm/default.nix | 2 +- pkgs/tools/misc/pg_top/default.nix | 4 ++-- pkgs/tools/misc/pubs/default.nix | 4 ++-- pkgs/tools/misc/rargs/default.nix | 2 +- pkgs/tools/misc/teamocil/default.nix | 2 +- pkgs/tools/misc/tty-clock/default.nix | 2 +- pkgs/tools/networking/openconnect_pa/default.nix | 6 +++--- pkgs/tools/networking/sshoogr/default.nix | 6 +++--- pkgs/tools/networking/wolfebin/default.nix | 2 +- pkgs/tools/package-management/python2nix/default.nix | 2 +- pkgs/tools/security/hashcash/default.nix | 6 +++--- pkgs/tools/security/libacr38u/default.nix | 2 +- pkgs/tools/system/stress/default.nix | 2 +- pkgs/tools/text/cconv/default.nix | 4 ++-- pkgs/tools/text/enca/default.nix | 2 +- pkgs/tools/video/untrunc-anthwlock/default.nix | 2 +- 141 files changed, 224 insertions(+), 224 deletions(-) (limited to 'pkgs/os-specific/linux/firmware/bt-fw-converter/default.nix') diff --git a/pkgs/applications/editors/texmaker/default.nix b/pkgs/applications/editors/texmaker/default.nix index 28b04723eae..75f22da2516 100644 --- a/pkgs/applications/editors/texmaker/default.nix +++ b/pkgs/applications/editors/texmaker/default.nix @@ -24,10 +24,10 @@ mkDerivation rec { meta = with lib; { description = "TeX and LaTeX editor"; longDescription='' - This editor is a full fledged IDE for TeX and - LaTeX editing with completion, structure viewer, preview, - spell checking and support of any compilation chain. - ''; + This editor is a full fledged IDE for TeX and + LaTeX editing with completion, structure viewer, preview, + spell checking and support of any compilation chain. + ''; homepage = "http://www.xm1math.net/texmaker/"; license = licenses.gpl2Plus; platforms = platforms.linux; diff --git a/pkgs/applications/graphics/animbar/default.nix b/pkgs/applications/graphics/animbar/default.nix index 771145d54b6..dda734363eb 100644 --- a/pkgs/applications/graphics/animbar/default.nix +++ b/pkgs/applications/graphics/animbar/default.nix @@ -22,14 +22,14 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Create your own animation on paper and transparancy"; longDescription = '' - Animbar lets you easily create your own animation on paper and - transparancy. From a set of input images two output images are - computed, that are printed one on paper and one on - transparency. By moving the transparency over the paper you - create a fascinating animation effect. This kind of animation - technique is hundreds of years old and known under several - names: picket fence animation, barrier grid animation, Moiré - animation, to name a few. + Animbar lets you easily create your own animation on paper and + transparancy. From a set of input images two output images are + computed, that are printed one on paper and one on + transparency. By moving the transparency over the paper you + create a fascinating animation effect. This kind of animation + technique is hundreds of years old and known under several + names: picket fence animation, barrier grid animation, Moiré + animation, to name a few. ''; homepage = "http://animbar.mnim.org"; maintainers = with maintainers; [ leenaars ]; diff --git a/pkgs/applications/office/csv2odf/default.nix b/pkgs/applications/office/csv2odf/default.nix index 7bab06ed4ab..436e8d97bdb 100644 --- a/pkgs/applications/office/csv2odf/default.nix +++ b/pkgs/applications/office/csv2odf/default.nix @@ -18,7 +18,7 @@ python3.pkgs.buildPythonApplication rec { creating reports from databases and other data sources that produce csv files. csv2odf can be combined with cron and shell scripts to automatically generate business reports. - + The output format (fonts, number formatting, etc.) is controlled by a template file that you can design in your office application of choice. ''; diff --git a/pkgs/applications/science/astronomy/xearth/default.nix b/pkgs/applications/science/astronomy/xearth/default.nix index 57054cc491a..bd92ae01ebb 100644 --- a/pkgs/applications/science/astronomy/xearth/default.nix +++ b/pkgs/applications/science/astronomy/xearth/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { longDescription = '' Xearth sets the X root window to an image of the Earth, as seen from your favorite vantage point in space, correctly shaded for the current position of the Sun. - By default, xearth updates the displayed image every five minutes. + By default, xearth updates the displayed image every five minutes. ''; maintainers = [ maintainers.mafo ]; license = "xearth"; diff --git a/pkgs/applications/science/biology/minimap2/default.nix b/pkgs/applications/science/biology/minimap2/default.nix index ae327e2c43f..d21ef8b3d7a 100644 --- a/pkgs/applications/science/biology/minimap2/default.nix +++ b/pkgs/applications/science/biology/minimap2/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { mkdir -p $out/share/man/man1 cp minimap2.1 $out/share/man/man1 ''; - + meta = with lib; { description = "A versatile pairwise aligner for genomic and spliced nucleotide sequences"; homepage = "https://lh3.github.io/minimap2"; diff --git a/pkgs/applications/science/biology/prodigal/default.nix b/pkgs/applications/science/biology/prodigal/default.nix index 70069fe541d..22883cc522f 100644 --- a/pkgs/applications/science/biology/prodigal/default.nix +++ b/pkgs/applications/science/biology/prodigal/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { "CC=cc" "INSTALLDIR=$(out)/bin" ]; - + meta = with lib; { description = "Fast, reliable protein-coding gene prediction for prokaryotic genomes"; homepage = "https://github.com/hyattpd/Prodigal"; diff --git a/pkgs/applications/science/logic/cryptominisat/default.nix b/pkgs/applications/science/logic/cryptominisat/default.nix index 042a4b23566..33de2d27dc9 100644 --- a/pkgs/applications/science/logic/cryptominisat/default.nix +++ b/pkgs/applications/science/logic/cryptominisat/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "00hmxdlyhn7pwk9jlvc5g0l5z5xqfchjzf5jgn3pkj9xhl8yqq50"; }; - patches = [ + patches = [ (fetchpatch { # https://github.com/msoos/cryptominisat/pull/621 url = "https://github.com/msoos/cryptominisat/commit/11a97003b0bfbfb61ed6c4e640212110d390c28c.patch"; diff --git a/pkgs/applications/science/machine-learning/sc2-headless/maps.nix b/pkgs/applications/science/machine-learning/sc2-headless/maps.nix index 6eec10e958c..47e14108e37 100644 --- a/pkgs/applications/science/machine-learning/sc2-headless/maps.nix +++ b/pkgs/applications/science/machine-learning/sc2-headless/maps.nix @@ -9,7 +9,7 @@ in sha256 = "19f873ilcdsf50g2v0s2zzmxil1bqncsk8nq99bzy87h0i7khkla"; stripRoot = false; }; - + melee = fetchzip' { url = "http://blzdistsc2-a.akamaihd.net/MapPacks/Melee.zip"; sha256 = "0z44pgy10jklsvgpr0kcn4c2mz3hw7nlcmvsy6a6lzpi3dvzf33i"; diff --git a/pkgs/applications/science/robotics/betaflight-configurator/default.nix b/pkgs/applications/science/robotics/betaflight-configurator/default.nix index 0b39c60b283..9a304272fe9 100644 --- a/pkgs/applications/science/robotics/betaflight-configurator/default.nix +++ b/pkgs/applications/science/robotics/betaflight-configurator/default.nix @@ -20,9 +20,9 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ wrapGAppsHook ]; - + buildInputs = [ unzip gsettings-desktop-schemas gtk3 ]; - + installPhase = '' mkdir -p $out/bin \ $out/opt/${pname} @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { description = "The Betaflight flight control system configuration tool"; longDescription = '' A crossplatform configuration tool for the Betaflight flight control system. - Various types of aircraft are supported by the tool and by Betaflight, e.g. + Various types of aircraft are supported by the tool and by Betaflight, e.g. quadcopters, hexacopters, octocopters and fixed-wing aircraft. ''; homepage = "https://github.com/betaflight/betaflight/wiki"; diff --git a/pkgs/applications/science/robotics/sumorobot-manager/default.nix b/pkgs/applications/science/robotics/sumorobot-manager/default.nix index bd056a2ec21..0b4b807a481 100644 --- a/pkgs/applications/science/robotics/sumorobot-manager/default.nix +++ b/pkgs/applications/science/robotics/sumorobot-manager/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, python3, qt5, fetchFromGitHub, wrapPython, pyqt5, pyserial }: - + stdenv.mkDerivation rec { pname = "sumorobot-manager"; version = "0.9.0"; diff --git a/pkgs/applications/search/grepm/default.nix b/pkgs/applications/search/grepm/default.nix index 7fef36d910e..1225f036a49 100644 --- a/pkgs/applications/search/grepm/default.nix +++ b/pkgs/applications/search/grepm/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { -e "s:^\( *\)mutt:\1${mutt}/bin/mutt:" \ $out/bin/grepm ''; - + meta = with lib; { description = "Wrapper for grepmail utilizing mutt"; homepage = "http://www.barsnick.net/sw/grepm.html"; diff --git a/pkgs/applications/video/kazam/default.nix b/pkgs/applications/video/kazam/default.nix index d47b5fddf88..e6e971ad438 100644 --- a/pkgs/applications/video/kazam/default.nix +++ b/pkgs/applications/video/kazam/default.nix @@ -19,7 +19,7 @@ python3.pkgs.buildPythonApplication rec { ]; propagatedBuildInputs = with python3.pkgs; [ pygobject3 pyxdg pycairo dbus-python ]; - + # workaround https://github.com/NixOS/nixpkgs/issues/56943 strictDeps = false; diff --git a/pkgs/applications/virtualization/xen/xsa-patches.nix b/pkgs/applications/virtualization/xen/xsa-patches.nix index 26cdbc1f65f..b1d1d7783c2 100644 --- a/pkgs/applications/virtualization/xen/xsa-patches.nix +++ b/pkgs/applications/virtualization/xen/xsa-patches.nix @@ -454,7 +454,7 @@ in { }) ]; - # 4.5 + # 4.5 XSA_248_45 = [ (xsaPatch { name = "248-4.5"; diff --git a/pkgs/applications/window-managers/jwm/jwm-settings-manager.nix b/pkgs/applications/window-managers/jwm/jwm-settings-manager.nix index 2f45ba36112..d3b685e7dcd 100644 --- a/pkgs/applications/window-managers/jwm/jwm-settings-manager.nix +++ b/pkgs/applications/window-managers/jwm/jwm-settings-manager.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { pname = "jwm-settings-manager"; version = "2018-10-19"; - + src = fetchFromGitHub { owner = "Israel-D"; repo = "jwm-settings-manager"; diff --git a/pkgs/applications/window-managers/lemonbar/default.nix b/pkgs/applications/window-managers/lemonbar/default.nix index 2a4004e5543..88d4b8360a5 100644 --- a/pkgs/applications/window-managers/lemonbar/default.nix +++ b/pkgs/applications/window-managers/lemonbar/default.nix @@ -2,21 +2,21 @@ stdenv.mkDerivation { name = "lemonbar-1.4"; - + src = fetchurl { url = "https://github.com/LemonBoy/bar/archive/v1.4.tar.gz"; sha256 = "0fa91vb968zh6fyg97kdaix7irvqjqhpsb6ks0ggcl59lkbkdzbv"; }; - + buildInputs = [ libxcb perl ]; - + prePatch = ''sed -i "s@/usr@$out@" Makefile''; - + meta = with lib; { description = "A lightweight xcb based bar"; homepage = "https://github.com/LemonBoy/bar"; maintainers = [ maintainers.meisternu ]; - license = "Custom"; + license = "Custom"; platforms = platforms.linux; }; } diff --git a/pkgs/applications/window-managers/vwm/default.nix b/pkgs/applications/window-managers/vwm/default.nix index 143ee83d2d1..9eea18f79d6 100644 --- a/pkgs/applications/window-managers/vwm/default.nix +++ b/pkgs/applications/window-managers/vwm/default.nix @@ -3,7 +3,7 @@ libvterm}: stdenv.mkDerivation rec { name = "vwm-2.1.3"; - + src = fetchurl { url = "mirror://sourceforge/vwm/${name}.tar.gz"; sha256 = "1r5wiqyfqwnyx7dfihixlnavbvg8rni36i4gq169aisjcg7laxaf"; @@ -19,10 +19,10 @@ stdenv.mkDerivation rec { preInstall = '' mkdir -p $out/bin $out/include ''; - + nativeBuildInputs = [ pkg-config ]; buildInputs = [ ncurses glib libviper libpseudo gpm libvterm ]; - + meta = with lib; { homepage = "http://vwm.sourceforge.net/"; description = "Dynamic window manager for the console"; diff --git a/pkgs/build-support/fetchbzr/default.nix b/pkgs/build-support/fetchbzr/default.nix index 2cf169de7a5..b7db9e9274d 100644 --- a/pkgs/build-support/fetchbzr/default.nix +++ b/pkgs/build-support/fetchbzr/default.nix @@ -10,6 +10,6 @@ stdenvNoCC.mkDerivation { outputHashAlgo = "sha256"; outputHashMode = "recursive"; outputHash = sha256; - + inherit url rev; } diff --git a/pkgs/build-support/fetchmtn/default.nix b/pkgs/build-support/fetchmtn/default.nix index 7ce67453d69..b5da0f80a31 100644 --- a/pkgs/build-support/fetchmtn/default.nix +++ b/pkgs/build-support/fetchmtn/default.nix @@ -4,7 +4,7 @@ # each is an url for sync # selector is mtn selector, like h:org.example.branch -# +# {name ? "mtn-checkout", dbs ? [], sha256 , selector ? "h:" + branch, branch}: diff --git a/pkgs/data/documentation/rnrs/common.nix b/pkgs/data/documentation/rnrs/common.nix index 3443846c83c..7ba5fe07450 100644 --- a/pkgs/data/documentation/rnrs/common.nix +++ b/pkgs/data/documentation/rnrs/common.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { buildInputs = [ texinfo ]; - # Tell the builder about the name of the report. + # Tell the builder about the name of the report. reportName = name; builder = ./builder.sh; diff --git a/pkgs/data/fonts/mno16/default.nix b/pkgs/data/fonts/mno16/default.nix index 1b311d2c25a..eeb53904fe1 100644 --- a/pkgs/data/fonts/mno16/default.nix +++ b/pkgs/data/fonts/mno16/default.nix @@ -15,7 +15,7 @@ in fetchzip rec { meta = with lib; { description = "minimalist monospaced font"; - homepage = "https://sev.dev/fonts/mno16"; + homepage = "https://sev.dev/fonts/mno16"; license = licenses.cc0; }; } diff --git a/pkgs/desktops/gnustep/projectcenter/default.nix b/pkgs/desktops/gnustep/projectcenter/default.nix index abfdac1e7af..afe47c6cef7 100644 --- a/pkgs/desktops/gnustep/projectcenter/default.nix +++ b/pkgs/desktops/gnustep/projectcenter/default.nix @@ -16,7 +16,7 @@ gsmakeDerivation { # 1. Framework/PCProjectLauncher.m, locate gdb (say among NIX_GNUSTEP_SYSTEM_TOOLS) # 2. Framework/PCProjectBuilder.m, locate gmake (similar) propagatedBuildInputs = [ base back gui gnumake gdb gorm ]; - + meta = { description = "GNUstep's integrated development environment"; }; diff --git a/pkgs/development/compilers/ghc/8.10.1.nix b/pkgs/development/compilers/ghc/8.10.1.nix index 42eb994b8fe..ce963e1c275 100644 --- a/pkgs/development/compilers/ghc/8.10.1.nix +++ b/pkgs/development/compilers/ghc/8.10.1.nix @@ -194,7 +194,7 @@ stdenv.mkDerivation (rec { strictDeps = true; # Don’t add -liconv to LDFLAGS automatically so that GHC will add it itself. - dontAddExtraLibs = true; + dontAddExtraLibs = true; nativeBuildInputs = [ perl autoconf automake m4 python3 sphinx diff --git a/pkgs/development/compilers/ghc/8.8.2.nix b/pkgs/development/compilers/ghc/8.8.2.nix index fbb75637df6..8663f16f023 100644 --- a/pkgs/development/compilers/ghc/8.8.2.nix +++ b/pkgs/development/compilers/ghc/8.8.2.nix @@ -189,7 +189,7 @@ stdenv.mkDerivation (rec { strictDeps = true; # Don’t add -liconv to LDFLAGS automatically so that GHC will add it itself. - dontAddExtraLibs = true; + dontAddExtraLibs = true; nativeBuildInputs = [ perl autoconf automake m4 python3 sphinx diff --git a/pkgs/development/compilers/ghc/8.8.3.nix b/pkgs/development/compilers/ghc/8.8.3.nix index 538655a0d05..deb19bb87b5 100644 --- a/pkgs/development/compilers/ghc/8.8.3.nix +++ b/pkgs/development/compilers/ghc/8.8.3.nix @@ -194,7 +194,7 @@ stdenv.mkDerivation (rec { strictDeps = true; # Don’t add -liconv to LDFLAGS automatically so that GHC will add it itself. - dontAddExtraLibs = true; + dontAddExtraLibs = true; nativeBuildInputs = [ perl autoconf automake m4 python3 sphinx diff --git a/pkgs/development/compilers/ghc/8.8.4.nix b/pkgs/development/compilers/ghc/8.8.4.nix index e69766bccda..c1b39a70e38 100644 --- a/pkgs/development/compilers/ghc/8.8.4.nix +++ b/pkgs/development/compilers/ghc/8.8.4.nix @@ -198,7 +198,7 @@ stdenv.mkDerivation (rec { strictDeps = true; # Don’t add -liconv to LDFLAGS automatically so that GHC will add it itself. - dontAddExtraLibs = true; + dontAddExtraLibs = true; nativeBuildInputs = [ perl autoconf automake m4 python3 sphinx diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index 6f9f577743f..c203f5cf19c 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -203,7 +203,7 @@ stdenv.mkDerivation (rec { strictDeps = true; # Don’t add -liconv to LDFLAGS automatically so that GHC will add it itself. - dontAddExtraLibs = true; + dontAddExtraLibs = true; nativeBuildInputs = [ perl autoconf autoreconfHook automake m4 python3 sphinx diff --git a/pkgs/development/compilers/manticore/default.nix b/pkgs/development/compilers/manticore/default.nix index 8d2ad8e6bbc..1919f999805 100644 --- a/pkgs/development/compilers/manticore/default.nix +++ b/pkgs/development/compilers/manticore/default.nix @@ -5,7 +5,7 @@ let in stdenv.mkDerivation { pname = "manticore"; version = "2019.12.03"; - + src = fetchFromGitHub { owner = "ManticoreProject"; repo = "manticore"; @@ -14,9 +14,9 @@ in stdenv.mkDerivation { }; enableParallelBuilding = false; - + nativeBuildInputs = [ autoreconfHook ]; - + buildInputs = [ coreutils smlnj ]; autoreconfFlags = "-Iconfig -vfi"; @@ -28,8 +28,8 @@ in stdenv.mkDerivation { mv source repo_checkout cd repo_checkout chmod u+w . -R - ''; - + ''; + postPatch = '' patchShebangs . substituteInPlace configure.ac --replace 'MANTICORE_ROOT=`pwd`' 'MANTICORE_ROOT=$out/repo_checkout' @@ -40,14 +40,14 @@ in stdenv.mkDerivation { meta = { description = "A parallel, pure variant of Standard ML"; - longDescription = '' + longDescription = '' Manticore is a high-level parallel programming language aimed at general-purpose applications running on multi-core processors. Manticore supports parallelism at multiple levels: explicit concurrency and coarse-grain parallelism via CML-style constructs and fine-grain parallelism via various light-weight notations, such as parallel tuple expressions and NESL/Nepal-style - parallel array comprehensions. + parallel array comprehensions. ''; homepage = "http://manticore.cs.uchicago.edu/"; diff --git a/pkgs/development/compilers/ocaml/3.11.2.nix b/pkgs/development/compilers/ocaml/3.11.2.nix index 946013562c2..8c9a6ef07fa 100644 --- a/pkgs/development/compilers/ocaml/3.11.2.nix +++ b/pkgs/development/compilers/ocaml/3.11.2.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { [ (fetchurl { name = "0007-Fix-ocamlopt-w.r.t.-binutils-2.21.patch"; url = "http://caml.inria.fr/mantis/file_download.php?file_id=418&type=bug"; - sha256 = "612a9ac108bbfce2238aa5634123da162f0315dedb219958be705e0d92dcdd8e"; + sha256 = "612a9ac108bbfce2238aa5634123da162f0315dedb219958be705e0d92dcdd8e"; }) ]; diff --git a/pkgs/development/idris-modules/tparsec.nix b/pkgs/development/idris-modules/tparsec.nix index 84f88e1598b..ce040bebe35 100644 --- a/pkgs/development/idris-modules/tparsec.nix +++ b/pkgs/development/idris-modules/tparsec.nix @@ -8,7 +8,7 @@ build-idris-package { version = "2020-02-11"; ipkgName = "TParsec"; - + idrisDeps = [ contrib ]; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/SDL_Pango/default.nix b/pkgs/development/libraries/SDL_Pango/default.nix index 56ffbfe34d2..f5191a116c9 100644 --- a/pkgs/development/libraries/SDL_Pango/default.nix +++ b/pkgs/development/libraries/SDL_Pango/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "197baw1dsg0p4pljs5k0fshbyki00r4l49m1drlpqw6ggawx6xbz"; }; - patches = [ + patches = [ (fetchpatch { url = "https://sources.debian.org/data/main/s/sdlpango/0.1.2-6/debian/patches/api_additions.patch"; sha256 = "00p5ry5gd3ixm257p9i2c4jg0qj8ipk8nf56l7c9fma8id3zxyld"; diff --git a/pkgs/development/libraries/biblesync/default.nix b/pkgs/development/libraries/biblesync/default.nix index 39591a3a05f..5286359b946 100644 --- a/pkgs/development/libraries/biblesync/default.nix +++ b/pkgs/development/libraries/biblesync/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { navigation, and handling of incoming packets. ''; license = licenses.publicDomain; - maintainers = [ maintainers.AndersonTorres ]; + maintainers = [ maintainers.AndersonTorres ]; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/boost/1.71.nix b/pkgs/development/libraries/boost/1.71.nix index f66bd4cd6fb..7b128e25bb6 100644 --- a/pkgs/development/libraries/boost/1.71.nix +++ b/pkgs/development/libraries/boost/1.71.nix @@ -5,7 +5,7 @@ callPackage ./generic.nix (args // rec { src = fetchurl { #url = "mirror://sourceforge/boost/boost_1_71_0.tar.bz2"; - urls = [ + urls = [ "mirror://sourceforge/boost/boost_1_71_0.tar.bz2" "https://dl.bintray.com/boostorg/release/1.71.0/source/boost_1_71_0.tar.bz2" ]; diff --git a/pkgs/development/libraries/capstone/default.nix b/pkgs/development/libraries/capstone/default.nix index b9cf52d62ed..1e518227035 100644 --- a/pkgs/development/libraries/capstone/default.nix +++ b/pkgs/development/libraries/capstone/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { installPhase = (stdenv.lib.optionalString stdenv.isDarwin "HOMEBREW_CAPSTONE=1 ") + "PREFIX=$out ./make.sh install"; - + nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/libraries/classads/default.nix b/pkgs/development/libraries/classads/default.nix index f2377a59e7b..68706c7b8d1 100644 --- a/pkgs/development/libraries/classads/default.nix +++ b/pkgs/development/libraries/classads/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { configureFlags = [ "--enable-namespace" "--enable-flexible-member" ]; - + meta = { homepage = "http://www.cs.wisc.edu/condor/classad/"; description = "The Classified Advertisements library provides a generic means for matching resources"; diff --git a/pkgs/development/libraries/cminpack/default.nix b/pkgs/development/libraries/cminpack/default.nix index 3b2d748a836..34678d9b37d 100644 --- a/pkgs/development/libraries/cminpack/default.nix +++ b/pkgs/development/libraries/cminpack/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "cminpack-1.3.6"; - + src = fetchurl { url = "http://devernay.free.fr/hacks/cminpack/${name}.tar.gz"; sha256 = "17yh695aim508x1kn9zf6g13jxwk3pi3404h5ix4g5lc60hzs1rw"; diff --git a/pkgs/development/libraries/concurrencykit/default.nix b/pkgs/development/libraries/concurrencykit/default.nix index a54bc754782..d5d9aa75e89 100644 --- a/pkgs/development/libraries/concurrencykit/default.nix +++ b/pkgs/development/libraries/concurrencykit/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { url = "http://concurrencykit.org/releases/ck-${version}.tar.gz"; sha256 = "1pv21p7sjwwmbs2xblpy1lqk53r2i212yrqyjlr5dr3rlv87vqnp"; }; - + #Deleting this line causes "Unknown option --disable-static" configurePhase = "./configure --prefix=$out"; diff --git a/pkgs/development/libraries/dotnetfx35/default.nix b/pkgs/development/libraries/dotnetfx35/default.nix index e1c59846aec..68569b516a9 100644 --- a/pkgs/development/libraries/dotnetfx35/default.nix +++ b/pkgs/development/libraries/dotnetfx35/default.nix @@ -12,12 +12,12 @@ in ln -s $src/MSBuild.exe $out/bin ''; }; - + assembly20Path = "/cygdrive/c/WINDOWS/Microsoft.NET/Framework/v2.0.50727"; - + wcfPath = "/cygdrive/c/WINDOWS/Microsoft.NET/Framework/v3.0/WINDOW~1"; - + referenceAssembly30Path = "/cygdrive/c/PROGRA~1/REFERE~1/Microsoft/Framework/v3.0"; - + referenceAssembly35Path = "/cygdrive/c/PROGRA~1/REFERE~1/Microsoft/Framework/v3.5"; } diff --git a/pkgs/development/libraries/dotnetfx40/default.nix b/pkgs/development/libraries/dotnetfx40/default.nix index 701464071d0..1ffc10cfc60 100644 --- a/pkgs/development/libraries/dotnetfx40/default.nix +++ b/pkgs/development/libraries/dotnetfx40/default.nix @@ -12,12 +12,12 @@ in ln -s $src/MSBuild.exe $out/bin ''; }; - + assembly20Path = "/cygdrive/c/WINDOWS/Microsoft.NET/Framework/v2.0.50727"; - + wcfPath = "/cygdrive/c/WINDOWS/Microsoft.NET/Framework/v3.0/WINDOW~1"; - + referenceAssembly30Path = "/cygdrive/c/PROGRA~1/REFERE~1/Microsoft/Framework/v3.0"; - + referenceAssembly35Path = "/cygdrive/c/PROGRA~1/REFERE~1/Microsoft/Framework/v3.5"; } diff --git a/pkgs/development/libraries/elf-header/default.nix b/pkgs/development/libraries/elf-header/default.nix index c1764e83c30..72166bb38ce 100644 --- a/pkgs/development/libraries/elf-header/default.nix +++ b/pkgs/development/libraries/elf-header/default.nix @@ -35,9 +35,9 @@ stdenvNoCC.mkDerivation { outputsToInstall = [ "out" ]; description = "The datastructures of ELF according to the target platform's libc"; longDescription = '' - The Executable and Linkable Format (ELF, formerly named Extensible Linking - Format), is usually defined in a header like this. - ''; + The Executable and Linkable Format (ELF, formerly named Extensible Linking + Format), is usually defined in a header like this. + ''; platforms = lib.platforms.all; maintainers = [ lib.maintainers.ericson2314 ]; }; diff --git a/pkgs/development/libraries/fastpbkdf2/default.nix b/pkgs/development/libraries/fastpbkdf2/default.nix index 59056a9b9a3..eb5cb251620 100644 --- a/pkgs/development/libraries/fastpbkdf2/default.nix +++ b/pkgs/development/libraries/fastpbkdf2/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation { name = "fastpbkdf2-1.0.0"; - + src = fetchFromGitHub { owner = "ctz"; repo = "fastpbkdf2"; rev = "v1.0.0"; sha256 = "09ax0h4ik3vhvp3s98lic93l3g9f4v1jkr5k6z4g1lvm7s3lrha2"; }; - + buildInputs = [ openssl ]; preBuild = '' diff --git a/pkgs/development/libraries/frame/default.nix b/pkgs/development/libraries/frame/default.nix index 30a97b01528..76549e728eb 100644 --- a/pkgs/development/libraries/frame/default.nix +++ b/pkgs/development/libraries/frame/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "bc2a20cd3ac1e61fe0461bd3ee8cb250dbcc1fa511fad0686d267744e9c78f3a"; }; - buildInputs = [ + buildInputs = [ stdenv pkg-config ] ++ stdenv.lib.optionals enableX11 [xorg.xorgserver xorg.libX11 xorg.libXext xorg.libXi]; diff --git a/pkgs/development/libraries/glfw/2.x.nix b/pkgs/development/libraries/glfw/2.x.nix index e749ca733da..ca65315e1cb 100644 --- a/pkgs/development/libraries/glfw/2.x.nix +++ b/pkgs/development/libraries/glfw/2.x.nix @@ -19,9 +19,9 @@ stdenv.mkDerivation rec { make x11-dist-install PREFIX=$out mv $out/lib/libglfw.so $out/lib/libglfw.so.2 ln -s libglfw.so.2 $out/lib/libglfw.so - ''; - - meta = with stdenv.lib; { + ''; + + meta = with stdenv.lib; { description = "Multi-platform library for creating OpenGL contexts and managing input, including keyboard, mouse, joystick and time"; homepage = "http://glfw.sourceforge.net/"; license = licenses.zlib; diff --git a/pkgs/development/libraries/hyperscan/default.nix b/pkgs/development/libraries/hyperscan/default.nix index 18e028b70ca..3ab52165b78 100644 --- a/pkgs/development/libraries/hyperscan/default.nix +++ b/pkgs/development/libraries/hyperscan/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { Hyperscan uses hybrid automata techniques to allow simultaneous matching of large numbers (up to tens of thousands) of regular - expressions and for the matching of regular expressions across + expressions and for the matching of regular expressions across streams of data. Hyperscan is typically used in a DPI library stack. diff --git a/pkgs/development/libraries/jabcode/default.nix b/pkgs/development/libraries/jabcode/default.nix index c875e4a3943..36c4c8c61c5 100644 --- a/pkgs/development/libraries/jabcode/default.nix +++ b/pkgs/development/libraries/jabcode/default.nix @@ -3,7 +3,7 @@ , lib , subproject ? "library" # one of "library", "reader" or "writer" , zlib, libpng, libtiff -, jabcode +, jabcode }: let subdir = lib.getAttr subproject { diff --git a/pkgs/development/libraries/java/geoipjava/default.nix b/pkgs/development/libraries/java/geoipjava/default.nix index 6d4dfbfe61c..fd4bfb29706 100644 --- a/pkgs/development/libraries/java/geoipjava/default.nix +++ b/pkgs/development/libraries/java/geoipjava/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation { sha256 = "1gb2d0qvvq7xankz7l7ymbr3qprwk9bifpy4hlgw0sq4i6a55ypd"; }; buildInputs = [ jdk unzip ]; - buildPhase = + buildPhase = '' cd source javac $(find . -name \*.java) diff --git a/pkgs/development/libraries/jemalloc/jemalloc450.nix b/pkgs/development/libraries/jemalloc/jemalloc450.nix index d328ab8016a..85b4fb100f7 100644 --- a/pkgs/development/libraries/jemalloc/jemalloc450.nix +++ b/pkgs/development/libraries/jemalloc/jemalloc450.nix @@ -1,4 +1,4 @@ import ./common.nix { version = "4.5.0"; sha256 = "10373xhpc10pgmai9fkc1z0rs029qlcb3c0qfnvkbwdlcibdh2cl"; -} +} diff --git a/pkgs/development/libraries/levmar/default.nix b/pkgs/development/libraries/levmar/default.nix index e8ef17081c9..7cf6329a77e 100644 --- a/pkgs/development/libraries/levmar/default.nix +++ b/pkgs/development/libraries/levmar/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl }: - + stdenv.mkDerivation rec { name = "levmar-2.6"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { cp liblevmar.a $out/lib ''; - meta = { + meta = { description = "ANSI C implementations of Levenberg-Marquardt, usable also from C++"; homepage = "https://www.ics.forth.gr/~lourakis/levmar/"; license = stdenv.lib.licenses.gpl2Plus; diff --git a/pkgs/development/libraries/lib3ds/default.nix b/pkgs/development/libraries/lib3ds/default.nix index 406b61e4393..39e3e2e660f 100644 --- a/pkgs/development/libraries/lib3ds/default.nix +++ b/pkgs/development/libraries/lib3ds/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, unzip }: - + stdenv.mkDerivation rec { name = "lib3ds-1.3.0"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { buildInputs = [ unzip ]; - meta = { + meta = { description = "Library for managing 3D-Studio Release 3 and 4 \".3DS\" files"; homepage = "http://lib3ds.sourceforge.net/"; license = "LGPL"; diff --git a/pkgs/development/libraries/libavc1394/default.nix b/pkgs/development/libraries/libavc1394/default.nix index 61bc655931f..8f4a678cb37 100644 --- a/pkgs/development/libraries/libavc1394/default.nix +++ b/pkgs/development/libraries/libavc1394/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ libraw1394 ]; - meta = { + meta = { description = "Programming interface for the 1394 Trade Association AV/C (Audio/Video Control) Digital Interface Command Set"; homepage = "https://sourceforge.net/projects/libavc1394/"; license = stdenv.lib.licenses.lgpl21Plus; diff --git a/pkgs/development/libraries/libcangjie/default.nix b/pkgs/development/libraries/libcangjie/default.nix index ca50126971b..506c3a3d3d6 100644 --- a/pkgs/development/libraries/libcangjie/default.nix +++ b/pkgs/development/libraries/libcangjie/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ automake autoconf libtool m4 sqlite ]; configureScript = "./autogen.sh"; - + preConfigure = '' find . -name '*.sh' -exec sed -e 's@#!/bin/bash@${bash}/bin/bash@' -i '{}' ';' ''; diff --git a/pkgs/development/libraries/libcutl/default.nix b/pkgs/development/libraries/libcutl/default.nix index b13805aa37a..d463e4af289 100644 --- a/pkgs/development/libraries/libcutl/default.nix +++ b/pkgs/development/libraries/libcutl/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { description = "C++ utility library from Code Synthesis"; longDescription = '' libcutl is a C++ utility library. - It contains a collection of generic and independent components such as + It contains a collection of generic and independent components such as meta-programming tests, smart pointers, containers, compiler building blocks, etc. ''; homepage = "https://codesynthesis.com/projects/libcutl/"; diff --git a/pkgs/development/libraries/libdiscid/default.nix b/pkgs/development/libraries/libdiscid/default.nix index 1ecb1f3d572..bdfb5d8b304 100644 --- a/pkgs/development/libraries/libdiscid/default.nix +++ b/pkgs/development/libraries/libdiscid/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.IOKit ]; - + src = fetchurl { url = "http://ftp.musicbrainz.org/pub/musicbrainz/libdiscid/${pname}-${version}.tar.gz"; sha256 = "1f9irlj3dpb5gyfdnb1m4skbjvx4d4hwiz2152f83m0d9jn47r7r"; diff --git a/pkgs/development/libraries/libdvdread/4.9.9.nix b/pkgs/development/libraries/libdvdread/4.9.9.nix index 33b04b0f7c0..7f35c651b92 100644 --- a/pkgs/development/libraries/libdvdread/4.9.9.nix +++ b/pkgs/development/libraries/libdvdread/4.9.9.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation { name = "libdvdread-4.9.9"; - + src = fetchurl { url = "http://dvdnav.mplayerhq.hu/releases/libdvdread-4.9.9.tar.xz"; sha256 = "d91275471ef69d488b05cf15c60e1cd65e17648bfc692b405787419f47ca424a"; diff --git a/pkgs/development/libraries/libmcrypt/default.nix b/pkgs/development/libraries/libmcrypt/default.nix index a29fca45a99..59498170a1d 100644 --- a/pkgs/development/libraries/libmcrypt/default.nix +++ b/pkgs/development/libraries/libmcrypt/default.nix @@ -4,7 +4,7 @@ with stdenv.lib; stdenv.mkDerivation { name = "libmcrypt-2.5.8"; - + src = fetchurl { url = "mirror://sourceforge/mcrypt/Libmcrypt/2.5.8/libmcrypt-2.5.8.tar.gz"; sha256 = "0gipgb939vy9m66d3k8il98rvvwczyaw2ixr8yn6icds9c3nrsz4"; diff --git a/pkgs/development/libraries/libofx/default.nix b/pkgs/development/libraries/libofx/default.nix index 3f6b3bcd5d7..f11489eaf9f 100644 --- a/pkgs/development/libraries/libofx/default.nix +++ b/pkgs/development/libraries/libofx/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config libtool autoconf automake gengetopt ]; buildInputs = [ opensp libxml2 curl ] ++ stdenv.lib.optional stdenv.isDarwin libiconv; - meta = { + meta = { description = "Opensource implementation of the Open Financial eXchange specification"; homepage = "http://libofx.sourceforge.net/"; license = "LGPL"; diff --git a/pkgs/development/libraries/liboop/default.nix b/pkgs/development/libraries/liboop/default.nix index 6438fd5eb32..75fa4a80a31 100644 --- a/pkgs/development/libraries/liboop/default.nix +++ b/pkgs/development/libraries/liboop/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation { name = "liboop-1.0"; - + src = fetchurl { url = "http://download.ofb.net/liboop/liboop.tar.gz"; sha256 = "34d83c6e0f09ee15cb2bc3131e219747c3b612bb57cf7d25318ab90da9a2d97c"; diff --git a/pkgs/development/libraries/libredwg/default.nix b/pkgs/development/libraries/libredwg/default.nix index 71667460e23..358a8490e69 100644 --- a/pkgs/development/libraries/libredwg/default.nix +++ b/pkgs/development/libraries/libredwg/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; - nativeBuildInputs = [ autoreconfHook pkg-config texinfo ] + nativeBuildInputs = [ autoreconfHook pkg-config texinfo ] ++ lib.optional enablePython swig; buildInputs = [ pcre2 ] diff --git a/pkgs/development/libraries/libwpd/default.nix b/pkgs/development/libraries/libwpd/default.nix index ee1f13b2a3e..7ddc7965c05 100644 --- a/pkgs/development/libraries/libwpd/default.nix +++ b/pkgs/development/libraries/libwpd/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "libwpd-0.10.0"; - + src = fetchurl { url = "mirror://sourceforge/libwpd/${name}.tar.xz"; sha256 = "0b6krzr6kxzm89g6bapn805kdayq70hn16n5b5wfs2lwrf0ag2wx"; }; - + buildInputs = [ glib libgsf libxml2 zlib librevenge ]; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/libraries/libx86/src-for-default.nix b/pkgs/development/libraries/libx86/src-for-default.nix index 30be467f9fd..a681d9e5890 100644 --- a/pkgs/development/libraries/libx86/src-for-default.nix +++ b/pkgs/development/libraries/libx86/src-for-default.nix @@ -4,6 +4,6 @@ rec { hash="0j6h6bc02c6qi0q7c1ncraz4d1hkm5936r35rfsp4x1jrc233wav"; url="http://www.codon.org.uk/~mjg59/libx86/downloads/libx86-${version}.tar.gz"; advertisedUrl="http://www.codon.org.uk/~mjg59/libx86/downloads/libx86-1.1.tar.gz"; - - + + } diff --git a/pkgs/development/libraries/martyr/default.nix b/pkgs/development/libraries/martyr/default.nix index 51fd6962e70..46f95148d82 100644 --- a/pkgs/development/libraries/martyr/default.nix +++ b/pkgs/development/libraries/martyr/default.nix @@ -1,12 +1,12 @@ {stdenv, fetchurl, ant, jdk}: stdenv.mkDerivation rec { - pname = "martyr"; + pname = "martyr"; version = "0.3.9"; - src = fetchurl { - url = "mirror://sourceforge/martyr/${pname}-${version}.tar.gz"; - sha256 = "1ks8j413bcby345kmq1i7av8kwjvz5vxdn1zpv0p7ywxq54i4z59"; - }; + src = fetchurl { + url = "mirror://sourceforge/martyr/${pname}-${version}.tar.gz"; + sha256 = "1ks8j413bcby345kmq1i7av8kwjvz5vxdn1zpv0p7ywxq54i4z59"; + }; buildInputs = [ ant jdk ]; diff --git a/pkgs/development/libraries/opencore-amr/default.nix b/pkgs/development/libraries/opencore-amr/default.nix index 4848ef864bf..f011def0eb9 100644 --- a/pkgs/development/libraries/opencore-amr/default.nix +++ b/pkgs/development/libraries/opencore-amr/default.nix @@ -2,7 +2,7 @@ let version = "0.1.5"; -in +in stdenv.mkDerivation { pname = "opencore-amr"; inherit version; @@ -10,10 +10,10 @@ stdenv.mkDerivation { url = "https://vorboss.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${version}.tar.gz"; sha256 = "0hfk9khz3by0119h3jdwgdfd7jgkdbzxnmh1wssvylgnsnwnq01c"; }; - + meta = { homepage = "https://opencore-amr.sourceforge.io/"; - description = "Library of OpenCORE Framework implementation of Adaptive Multi Rate Narrowband and Wideband (AMR-NB and AMR-WB) speech codec. + description = "Library of OpenCORE Framework implementation of Adaptive Multi Rate Narrowband and Wideband (AMR-NB and AMR-WB) speech codec. Library of VisualOn implementation of Adaptive Multi Rate Wideband (AMR-WB)"; license = stdenv.lib.licenses.asl20; maintainers = [ stdenv.lib.maintainers.kiloreux ]; diff --git a/pkgs/development/libraries/qxt/default.nix b/pkgs/development/libraries/qxt/default.nix index 3104aefb9ed..503e1b14c1f 100644 --- a/pkgs/development/libraries/qxt/default.nix +++ b/pkgs/development/libraries/qxt/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { pname = "qxt"; version = "0.6.2"; - + src = fetchzip { url = "https://bitbucket.org/libqxt/libqxt/get/v${version}.tar.gz"; sha256 = "0zmqfn0h8cpky7wgaaxlfh0l89r9r0isi87587kaicyap7a6kxwz"; diff --git a/pkgs/development/libraries/science/biology/bpp-seq/default.nix b/pkgs/development/libraries/science/biology/bpp-seq/default.nix index 79fd0fe6771..ef3f3d5756e 100644 --- a/pkgs/development/libraries/science/biology/bpp-seq/default.nix +++ b/pkgs/development/libraries/science/biology/bpp-seq/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { doCheck = !stdenv.isDarwin; - meta = bpp-core.meta // { + meta = bpp-core.meta // { changelog = "https://github.com/BioPP/bpp-seq/blob/master/ChangeLog"; }; } diff --git a/pkgs/development/libraries/szip/default.nix b/pkgs/development/libraries/szip/default.nix index 2419cf55442..4f11f42de52 100644 --- a/pkgs/development/libraries/szip/default.nix +++ b/pkgs/development/libraries/szip/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl }: - + stdenv.mkDerivation rec { pname = "szip"; version = "2.1.1"; diff --git a/pkgs/development/libraries/theft/default.nix b/pkgs/development/libraries/theft/default.nix index 646cc60406a..85dc2c75afb 100644 --- a/pkgs/development/libraries/theft/default.nix +++ b/pkgs/development/libraries/theft/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { doCheck = true; checkTarget = "test"; - + installFlags = [ "PREFIX=$(out)" ]; # fix the libtheft.pc file to use the right installation @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { substituteInPlace $out/lib/pkgconfig/libtheft.pc \ --replace "/usr/local" "$out" ''; - + meta = with stdenv.lib; { description = "A C library for property-based testing"; homepage = "https://github.com/silentbicycle/theft/"; diff --git a/pkgs/development/libraries/tix/default.nix b/pkgs/development/libraries/tix/default.nix index f0b460b6f3d..52fffb42aa2 100644 --- a/pkgs/development/libraries/tix/default.nix +++ b/pkgs/development/libraries/tix/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation { url = "mirror://sourceforge/tix/tix/8.4.3/Tix8.4.3-src.tar.gz"; sha256 = "1jq3dkyk9mqkj4cg7mdk5r0cclqsby9l2b7wrysi0zk5yw7h8bsn"; }; - patches = [ + patches = [ (fetchpatch { name = "tix-8.4.3-tcl8.5.patch"; url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/dev-tcltk/tix/files/tix-8.4.3-tcl8.5.patch?id=56bd759df1d0c750a065b8c845e93d5dfa6b549d"; @@ -23,7 +23,7 @@ stdenv.mkDerivation { buildInputs = [ tcl tk ]; # the configure script expects to find the location of the sources of # tcl and tk in {tcl,tk}Config.sh - # In fact, it only needs some private headers. We copy them in + # In fact, it only needs some private headers. We copy them in # the private_headers folders and trick the configure script into believing # the sources are here. preConfigure = '' diff --git a/pkgs/development/libraries/tnt/default.nix b/pkgs/development/libraries/tnt/default.nix index 7e8aa2983cf..93b760bc88f 100644 --- a/pkgs/development/libraries/tnt/default.nix +++ b/pkgs/development/libraries/tnt/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { pname = "tnt"; version = "3.0.12"; - + src = fetchurl { url = "https://math.nist.gov/tnt/tnt_3_0_12.zip"; sha256 = "1bzkfdb598584qlc058n8wqq9vbz714gr5r57401rsa9qaxhk5j7"; diff --git a/pkgs/development/libraries/udunits/default.nix b/pkgs/development/libraries/udunits/default.nix index 65e88f8fd8c..6b75b7e683f 100644 --- a/pkgs/development/libraries/udunits/default.nix +++ b/pkgs/development/libraries/udunits/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { pname = "udunits"; version = "2.2.27.6"; - + src = fetchFromGitHub { owner = "Unidata"; repo = "UDUNITS-2"; diff --git a/pkgs/development/ocaml-modules/faillib/default.nix b/pkgs/development/ocaml-modules/faillib/default.nix index d045bd5a37a..63040fadda5 100644 --- a/pkgs/development/ocaml-modules/faillib/default.nix +++ b/pkgs/development/ocaml-modules/faillib/default.nix @@ -11,7 +11,7 @@ buildOcaml rec { src = fetchurl { url = "https://github.com/janestreet/faillib/archive/${version}.tar.gz"; - sha256 = "12dvaxkmgf7yzzvbadcyk1n17llgh6p8qr33867d21npaljy7l9v"; + sha256 = "12dvaxkmgf7yzzvbadcyk1n17llgh6p8qr33867d21npaljy7l9v"; }; propagatedBuildInputs = [ camlp4 herelib ]; diff --git a/pkgs/development/ocaml-modules/lablgl/default.nix b/pkgs/development/ocaml-modules/lablgl/default.nix index a7b145c2d4e..3d57c4e40ed 100644 --- a/pkgs/development/ocaml-modules/lablgl/default.nix +++ b/pkgs/development/ocaml-modules/lablgl/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; version = "1.05"; - src = fetchurl { + src = fetchurl { url = "http://wwwfun.kurims.kyoto-u.ac.jp/soft/lsl/dist/lablgl-${version}.tar.gz"; sha256 = "0qabydd219i4ak7hxgc67496qnnscpnydya2m4ijn3cpbgih7zyq"; }; diff --git a/pkgs/development/ocaml-modules/ocamlsdl/default.nix b/pkgs/development/ocaml-modules/ocamlsdl/default.nix index bbfa2e4f6b5..7c782b5268f 100644 --- a/pkgs/development/ocaml-modules/ocamlsdl/default.nix +++ b/pkgs/development/ocaml-modules/ocamlsdl/default.nix @@ -1,4 +1,4 @@ -{stdenv, lib, fetchurl, ocaml, pkg-config, findlib, SDL, SDL_image, SDL_mixer, SDL_ttf, SDL_gfx, lablgl }: +{stdenv, lib, fetchurl, ocaml, pkg-config, findlib, SDL, SDL_image, SDL_mixer, SDL_ttf, SDL_gfx, lablgl }: let pname = "ocamlsdl"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; version = "0.9.1"; - src = fetchurl { + src = fetchurl { url = "mirror://sourceforge/project/ocamlsdl/OCamlSDL/ocamlsdl-0.9.1/ocamlsdl-0.9.1.tar.gz"; sha256 = "abfb295b263dc11e97fffdd88ea1a28b46df8cc2b196777093e4fe7f509e4f8f"; }; diff --git a/pkgs/development/ocaml-modules/optcomp/default.nix b/pkgs/development/ocaml-modules/optcomp/default.nix index 343fb28b6ad..b78d070962e 100644 --- a/pkgs/development/ocaml-modules/optcomp/default.nix +++ b/pkgs/development/ocaml-modules/optcomp/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { sha256 = "1n095lk94jq1rwi0l24g2wbgms7249wdd31n0ji895dr6755s93y"; }) ; - + createFindlibDestdir = true; buildInputs = [ ocaml findlib ocamlbuild camlp4 ]; diff --git a/pkgs/development/ocaml-modules/piqi/default.nix b/pkgs/development/ocaml-modules/piqi/default.nix index bbd7746d366..d7bc4b55b45 100644 --- a/pkgs/development/ocaml-modules/piqi/default.nix +++ b/pkgs/development/ocaml-modules/piqi/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { version = "0.6.15"; pname = "piqi"; name = "ocaml${ocaml.version}-${pname}-${version}"; - + src = fetchFromGitHub { owner = "alavrik"; repo = pname; diff --git a/pkgs/development/ocaml-modules/rresult/default.nix b/pkgs/development/ocaml-modules/rresult/default.nix index 2573c95c628..ac38657f776 100644 --- a/pkgs/development/ocaml-modules/rresult/default.nix +++ b/pkgs/development/ocaml-modules/rresult/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ ocaml findlib ocamlbuild topkg ]; propagatedBuildInputs = [ result ]; - + inherit (topkg) buildPhase installPhase; meta = { diff --git a/pkgs/development/ocaml-modules/xml-light/default.nix b/pkgs/development/ocaml-modules/xml-light/default.nix index 0ca48ebee28..a6db0dc7870 100644 --- a/pkgs/development/ocaml-modules/xml-light/default.nix +++ b/pkgs/development/ocaml-modules/xml-light/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { make all make opt ''; - + installPhase = '' make install_ocamlfind mkdir -p $out/share diff --git a/pkgs/development/pure-modules/gsl/default.nix b/pkgs/development/pure-modules/gsl/default.nix index a0407577037..3d11f29fed3 100644 --- a/pkgs/development/pure-modules/gsl/default.nix +++ b/pkgs/development/pure-modules/gsl/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { baseName = "gsl"; version = "0.12"; name = "pure-${baseName}-${version}"; - + src = fetchurl { url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz"; sha256 = "06bdd873d5417d90ca35093056a060b77365123ed24c3ac583cd3922d4c78a75"; diff --git a/pkgs/development/python-modules/cbor2/default.nix b/pkgs/development/python-modules/cbor2/default.nix index 8dcedac4212..f793ecfae37 100644 --- a/pkgs/development/python-modules/cbor2/default.nix +++ b/pkgs/development/python-modules/cbor2/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools_scm ]; - checkInputs = [ + checkInputs = [ pytest-cov pytestCheckHook ]; diff --git a/pkgs/development/python-modules/deprecated/default.nix b/pkgs/development/python-modules/deprecated/default.nix index bca1de711f2..a64ed0b9d99 100644 --- a/pkgs/development/python-modules/deprecated/default.nix +++ b/pkgs/development/python-modules/deprecated/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchPypi, buildPythonPackage, - wrapt, pytest, tox }: + wrapt, pytest, tox }: buildPythonPackage rec { pname = "Deprecated"; diff --git a/pkgs/development/python-modules/pint/default.nix b/pkgs/development/python-modules/pint/default.nix index bb2a20cf62f..c0aa86a3763 100644 --- a/pkgs/development/python-modules/pint/default.nix +++ b/pkgs/development/python-modules/pint/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { disabled = pythonOlder "3.6"; nativeBuildInputs = [ setuptools_scm ]; - + propagatedBuildInputs = [ packaging ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; diff --git a/pkgs/development/python-modules/wrf-python/default.nix b/pkgs/development/python-modules/wrf-python/default.nix index c4bc74a58d2..29279cc1a44 100644 --- a/pkgs/development/python-modules/wrf-python/default.nix +++ b/pkgs/development/python-modules/wrf-python/default.nix @@ -39,5 +39,5 @@ buildPythonPackage rec { homepage = "http://wrf-python.rtfd.org"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ mhaselsteiner ]; - }; + }; } diff --git a/pkgs/development/tools/analysis/emma/default.nix b/pkgs/development/tools/analysis/emma/default.nix index 3cc16c07ec5..56d3554bf75 100644 --- a/pkgs/development/tools/analysis/emma/default.nix +++ b/pkgs/development/tools/analysis/emma/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation { name = "emma-2.0.5312"; - + src = fetchurl { url = "mirror://sourceforge/emma/emma-2.0.5312.zip"; sha256 = "0xxy39s2lvgs56vicjzpcz936l1vjaplliwa0dm7v3iyvw6jn7vj"; diff --git a/pkgs/development/tools/documentation/mkdocs/default.nix b/pkgs/development/tools/documentation/mkdocs/default.nix index 8d4480945bd..f3b66394207 100644 --- a/pkgs/development/tools/documentation/mkdocs/default.nix +++ b/pkgs/development/tools/documentation/mkdocs/default.nix @@ -41,7 +41,7 @@ buildPythonApplication rec { MkDocs is a fast, simple and downright gorgeous static site generator that's geared towards building project documentation. Documentation source files are written in Markdown, and configured with a single YAML configuration file. - + MkDocs can also be used to generate general-purpose Websites. ''; homepage = "http://mkdocs.org/"; diff --git a/pkgs/development/tools/fmbt/default.nix b/pkgs/development/tools/fmbt/default.nix index a78b649aaea..46a13238961 100644 --- a/pkgs/development/tools/fmbt/default.nix +++ b/pkgs/development/tools/fmbt/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { python.pkgs.wrapPython ]; buildInputs = [ python gettext libedit glib imagemagick libxml2 boost - gnuplot graphviz tesseract gts + gnuplot graphviz tesseract gts ]; propagatedBuildInputs = with python.pkgs; [ diff --git a/pkgs/development/tools/ineffassign/default.nix b/pkgs/development/tools/ineffassign/default.nix index 85c643537af..0d0f6824ce7 100644 --- a/pkgs/development/tools/ineffassign/default.nix +++ b/pkgs/development/tools/ineffassign/default.nix @@ -6,7 +6,7 @@ buildGoPackage rec { pname = "ineffassign-unstable"; version = "2018-09-09"; - rev = "1003c8bd00dc2869cb5ca5282e6ce33834fed514"; + rev = "1003c8bd00dc2869cb5ca5282e6ce33834fed514"; goPackagePath = "github.com/gordonklaus/ineffassign"; excludedPackages = ''testdata''; diff --git a/pkgs/development/tools/makerpm/default.nix b/pkgs/development/tools/makerpm/default.nix index a05615a22d9..1577392c8bc 100644 --- a/pkgs/development/tools/makerpm/default.nix +++ b/pkgs/development/tools/makerpm/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, zlib, libarchive, openssl }: +{ stdenv, fetchFromGitHub, zlib, libarchive, openssl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation rec { version = "1.0"; pname = "makerpm"; diff --git a/pkgs/development/tools/misc/doclifter/default.nix b/pkgs/development/tools/misc/doclifter/default.nix index 3c6fa76616f..a1528cfca3e 100644 --- a/pkgs/development/tools/misc/doclifter/default.nix +++ b/pkgs/development/tools/misc/doclifter/default.nix @@ -7,16 +7,16 @@ stdenv.mkDerivation { sha256 = "1as6z7mdjrrkw2kism41q5ybvyzvwcmj9qzla2fz98v9f4jbj2s2"; }; buildInputs = [ python ]; - + makeFlags = [ "PREFIX=$(out)" ]; - + preInstall = '' mkdir -p $out/bin mkdir -p $out/share/man/man1 cp manlifter $out/bin cp manlifter.1 $out/share/man/man1 ''; - + meta = { description = "Lift documents in nroff markups to XML-DocBook"; homepage = "http://www.catb.org/esr/doclifter"; diff --git a/pkgs/development/tools/ocaml/omake/0.9.8.6-rc1.nix b/pkgs/development/tools/ocaml/omake/0.9.8.6-rc1.nix index 6a3c0c20d85..b840cb7736b 100644 --- a/pkgs/development/tools/ocaml/omake/0.9.8.6-rc1.nix +++ b/pkgs/development/tools/ocaml/omake/0.9.8.6-rc1.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation { # # configureFlags = if transitional then "--transitional" else "--strict"; # -# buildFlags = [ "world.opt" ]; +# buildFlags = [ "world.opt" ]; meta = { description = "Omake build system"; diff --git a/pkgs/development/tools/unity3d/default.nix b/pkgs/development/tools/unity3d/default.nix index 9441a3217b7..5c41a1dac93 100644 --- a/pkgs/development/tools/unity3d/default.nix +++ b/pkgs/development/tools/unity3d/default.nix @@ -29,7 +29,7 @@ in stdenv.mkDerivation { version = "${ver}x${build}"; src = fetchurl { - url = "https://beta.unity3d.com/download/6e9a27477296/LinuxEditorInstaller/Unity.tar.xz"; + url = "https://beta.unity3d.com/download/6e9a27477296/LinuxEditorInstaller/Unity.tar.xz"; sha1 = "083imikkrgha5w9sihjvv1m74naxm5yv"; }; diff --git a/pkgs/development/tools/yuicompressor/default.nix b/pkgs/development/tools/yuicompressor/default.nix index 549cc5046c4..05c1b62477b 100644 --- a/pkgs/development/tools/yuicompressor/default.nix +++ b/pkgs/development/tools/yuicompressor/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { pname = "yuicompressor"; version = "2.4.8"; - + src = fetchurl { url = "https://github.com/yui/yuicompressor/releases/download/v${version}/${pname}-${version}.jar"; sha256 = "1qjxlak9hbl9zd3dl5ks0w4zx5z64wjsbk7ic73r1r45fasisdrh"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { makeWrapper ${jre}/bin/java $out/bin/yuicompressor --add-flags \ "-cp $out/lib/yuicompressor.jar com.yahoo.platform.yui.compressor.YUICompressor" ''; - + meta = with lib; { description = "A JavaScript and CSS minifier"; homepage = "http://yui.github.io/yuicompressor/"; diff --git a/pkgs/development/web/kcgi/default.nix b/pkgs/development/web/kcgi/default.nix index 6c68f0d18e2..cd4b70624f5 100644 --- a/pkgs/development/web/kcgi/default.nix +++ b/pkgs/development/web/kcgi/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { patchPhase = ''substituteInPlace configure \ --replace /usr/local / ''; - + nativeBuildInputs = [ pkg-config ]; buildInputs = [ ] ++ stdenv.lib.optionals stdenv.isLinux [ libbsd ] ; diff --git a/pkgs/development/web/remarkjs/default.nix b/pkgs/development/web/remarkjs/default.nix index d9cc433fd84..ff4cd324b5d 100644 --- a/pkgs/development/web/remarkjs/default.nix +++ b/pkgs/development/web/remarkjs/default.nix @@ -10,7 +10,7 @@ let rev = "10b9500b67983f0a9c42d8ce8bf8e8c469f7078c"; sha256 = "1yy8by15kfklw8lwh17z1swpj067q0skjjih12yawbryraig41m0"; }; - + nodePackages = import ./nodepkgs.nix { inherit pkgs; inherit (stdenv.hostPlatform) system; diff --git a/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix b/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix index 6871a611784..bd75a66b487 100644 --- a/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix +++ b/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix @@ -6,10 +6,10 @@ let inifile = "linux/v0.${dwarf-fortress.baseVersion}.${dwarf-fortress.patchVersion}_${platformSlug}.ini"; in - + stdenv.mkDerivation { name = "dwarf-therapist-${dwarf-therapist.version}"; - + wrapper = ./dwarf-therapist.in; paths = [ dwarf-therapist ]; diff --git a/pkgs/games/dwarf-fortress/legends-browser/default.nix b/pkgs/games/dwarf-fortress/legends-browser/default.nix index 6da6d97ff24..1efae4d2802 100644 --- a/pkgs/games/dwarf-fortress/legends-browser/default.nix +++ b/pkgs/games/dwarf-fortress/legends-browser/default.nix @@ -8,7 +8,7 @@ let url = "https://github.com/robertjanetzko/LegendsBrowser/releases/download/${version}/legendsbrowser-${version}.jar"; sha256 = "05b4ksbl4481rh3ykfirbp6wvxhppcd5mvclhn9995gsrcaj8gx9"; }; - + script = writeShellScriptBin "legends-browser" '' set -eu BASE="$HOME/.local/share/df_linux/legends-browser/" diff --git a/pkgs/games/dwarf-fortress/wrapper/default.nix b/pkgs/games/dwarf-fortress/wrapper/default.nix index 79b63e3ce9e..73288ab659f 100644 --- a/pkgs/games/dwarf-fortress/wrapper/default.nix +++ b/pkgs/games/dwarf-fortress/wrapper/default.nix @@ -60,7 +60,7 @@ let '' + lib.optionalString enableTWBT '' substituteInPlace $out/data/init/init.txt \ --replace '[PRINT_MODE:2D]' '[PRINT_MODE:TWBT]' - '' + + '' + lib.optionalString enableTextMode '' substituteInPlace $out/data/init/init.txt \ --replace '[PRINT_MODE:2D]' '[PRINT_MODE:TEXT]' diff --git a/pkgs/games/frogatto/data.nix b/pkgs/games/frogatto/data.nix index a077d01f3b6..e911709dffc 100644 --- a/pkgs/games/frogatto/data.nix +++ b/pkgs/games/frogatto/data.nix @@ -1,9 +1,9 @@ { lib, stdenv, fetchFromGitHub }: - + stdenv.mkDerivation { pname = "frogatto-data"; version = "unstable-2018-12-18"; - + src = fetchFromGitHub { owner = "frogatto"; repo = "frogatto"; diff --git a/pkgs/games/globulation/default.nix b/pkgs/games/globulation/default.nix index f25b1084b85..9150541afd0 100644 --- a/pkgs/games/globulation/default.nix +++ b/pkgs/games/globulation/default.nix @@ -21,9 +21,9 @@ stdenv.mkDerivation rec { patches = [ ./header-order.patch ./public-buildproject.patch (fetchpatch { - url = "https://bitbucket.org/giszmo/glob2/commits/c9dc715624318e4fea4abb24e04f0ebdd9cd8d2a/raw"; - sha256 = "0017xg5agj3dy0hx71ijdcrxb72bjqv7x6aq7c9zxzyyw0mkxj0k"; - }) + url = "https://bitbucket.org/giszmo/glob2/commits/c9dc715624318e4fea4abb24e04f0ebdd9cd8d2a/raw"; + sha256 = "0017xg5agj3dy0hx71ijdcrxb72bjqv7x6aq7c9zxzyyw0mkxj0k"; + }) ]; postPatch = '' diff --git a/pkgs/games/rimshot/default.nix b/pkgs/games/rimshot/default.nix index 381d00bf992..e7f2f2e781a 100644 --- a/pkgs/games/rimshot/default.nix +++ b/pkgs/games/rimshot/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation { unpackPhase = '' unzip -j $src - ''; + ''; installPhase = '' diff --git a/pkgs/games/snake4/default.nix b/pkgs/games/snake4/default.nix index e5419cef249..c0cad5f05d3 100644 --- a/pkgs/games/snake4/default.nix +++ b/pkgs/games/snake4/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { --replace "-o \$(OWNER) -g \$(GROUP)" "" \ --replace "4755" "755" ''; - + installFlags = [ "INSTLIBDIR=$(out)/lib" "INSTBINDIR=$(out)/bin" "INSTMANDIR=$(out)/man" ]; diff --git a/pkgs/misc/drivers/epson-201106w/default.nix b/pkgs/misc/drivers/epson-201106w/default.nix index 690a4e4841e..a5a32644c3a 100644 --- a/pkgs/misc/drivers/epson-201106w/default.nix +++ b/pkgs/misc/drivers/epson-201106w/default.nix @@ -13,7 +13,7 @@ in # NOTE: Don't forget to update the webarchive link too! urls = [ "https://download.ebz.epson.net/dsc/op/stable/SRPMS/epson-inkjet-printer-201106w-${version}-1lsb3.2.src.rpm" - "https://web.archive.org/web/https://download.ebz.epson.net/dsc/op/stable/SRPMS/epson-inkjet-printer-201106w-${version}-1lsb3.2.src.rpm" + "https://web.archive.org/web/https://download.ebz.epson.net/dsc/op/stable/SRPMS/epson-inkjet-printer-201106w-${version}-1lsb3.2.src.rpm" ]; sha256 = "1yig1xrh1ikblbp7sx706n5nnc237wy4mbch23ymy6akbgqg4aig"; diff --git a/pkgs/misc/drivers/epson-escpr/default.nix b/pkgs/misc/drivers/epson-escpr/default.nix index 8d8951db249..bdb2839ab0b 100644 --- a/pkgs/misc/drivers/epson-escpr/default.nix +++ b/pkgs/misc/drivers/epson-escpr/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { # To find new versions, visit # http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX and search for # some printer like for instance "WF-7110" to get to the most recent - # version. + # version. # NOTE: Don't forget to update the webarchive link too! urls = [ "https://download3.ebz.epson.net/dsc/f/03/00/09/83/26/f90d0f70b33a9d7d77a2408364c47fba1ccbf943/epson-inkjet-printer-escpr-1.7.3-1lsb3.2.tar.gz" diff --git a/pkgs/misc/drivers/epson-escpr2/default.nix b/pkgs/misc/drivers/epson-escpr2/default.nix index 934f00d7492..f0289c22272 100644 --- a/pkgs/misc/drivers/epson-escpr2/default.nix +++ b/pkgs/misc/drivers/epson-escpr2/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { # To find new versions, visit # http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX and search for # some printer like for instance "WF-7210" to get to the most recent - # version. + # version. # NOTE: Don't forget to update the webarchive link too! urls = [ "https://download3.ebz.epson.net/dsc/f/03/00/12/09/63/b7d2bb6a97c9ad99a96ebc68f8abcb1254888e94/epson-inkjet-printer-escpr2-1.1.24-1lsb3.2.src.rpm" diff --git a/pkgs/os-specific/linux/can-isotp/default.nix b/pkgs/os-specific/linux/can-isotp/default.nix index 89857a35d92..9c30aae86fe 100644 --- a/pkgs/os-specific/linux/can-isotp/default.nix +++ b/pkgs/os-specific/linux/can-isotp/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { version = "20200910"; hardeningDisable = [ "pic" ]; - + src = fetchFromGitHub { owner = "hartkopp"; repo = "can-isotp"; @@ -25,7 +25,7 @@ stdenv.mkDerivation { ''; nativeBuildInputs = kernel.moduleBuildDependencies; - + meta = with lib; { description = "Kernel module for ISO-TP (ISO 15765-2)"; homepage = "https://github.com/hartkopp/can-isotp"; @@ -33,4 +33,4 @@ stdenv.mkDerivation { platforms = platforms.linux; maintainers = [ maintainers.evck ]; }; -} +} diff --git a/pkgs/os-specific/linux/firmware/bt-fw-converter/default.nix b/pkgs/os-specific/linux/firmware/bt-fw-converter/default.nix index f9218b688a9..a28189a9e47 100644 --- a/pkgs/os-specific/linux/firmware/bt-fw-converter/default.nix +++ b/pkgs/os-specific/linux/firmware/bt-fw-converter/default.nix @@ -32,4 +32,4 @@ stdenv.mkDerivation rec { platforms = platforms.linux; maintainers = with maintainers; [ zraexy ]; }; -} +} diff --git a/pkgs/os-specific/linux/input-utils/default.nix b/pkgs/os-specific/linux/input-utils/default.nix index 3be25867c33..36a203a47c7 100644 --- a/pkgs/os-specific/linux/input-utils/default.nix +++ b/pkgs/os-specific/linux/input-utils/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { pname = "input-utils"; version = "1.3"; - + src = fetchurl { url = "https://www.kraxel.org/releases/input/input-${version}.tar.gz"; sha256 = "11w0pp20knx6qpgzmawdbk1nj2z3fzp8yd6nag6s8bcga16w6hli"; diff --git a/pkgs/os-specific/linux/mxu11x0/default.nix b/pkgs/os-specific/linux/mxu11x0/default.nix index 730b03e93fe..ac9f27e2e6b 100644 --- a/pkgs/os-specific/linux/mxu11x0/default.nix +++ b/pkgs/os-specific/linux/mxu11x0/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { sed -i -e 's|/lib/modules|${kernel.dev}/lib/modules|' driver/mxconf sed -i -e 's|/lib/modules|${kernel.dev}/lib/modules|' driver/Makefile ''; - + installPhase = '' install -v -D -m 644 ./driver/mxu11x0.ko "$out/lib/modules/${kernel.modDirVersion}/kernel/drivers/usb/serial/mxu11x0.ko" install -v -D -m 644 ./driver/mxu11x0.ko "$out/lib/modules/${kernel.modDirVersion}/misc/mxu11x0.ko" diff --git a/pkgs/os-specific/linux/powerstat/default.nix b/pkgs/os-specific/linux/powerstat/default.nix index 6020139ad4b..12a92c36c69 100644 --- a/pkgs/os-specific/linux/powerstat/default.nix +++ b/pkgs/os-specific/linux/powerstat/default.nix @@ -3,19 +3,19 @@ stdenv.mkDerivation rec { pname = "powerstat"; version = "0.02.24"; - + src = fetchurl { url = "https://kernel.ubuntu.com/~cking/tarballs/${pname}/${pname}-${version}.tar.gz"; sha256 = "0yrc1xi9flxn2mvmzp0b0vd0md5z4p8fd4y8bszc67xy12qiqy0j"; }; - + installFlags = [ "DESTDIR=${placeholder "out"}" ]; - + postInstall = '' mv $out/usr/* $out rm -r $out/usr ''; - + meta = with lib; { description = "Laptop power measuring tool"; homepage = "https://kernel.ubuntu.com/~cking/powerstat/"; diff --git a/pkgs/os-specific/linux/rewritefs/default.nix b/pkgs/os-specific/linux/rewritefs/default.nix index 08356724c72..161db99114b 100644 --- a/pkgs/os-specific/linux/rewritefs/default.nix +++ b/pkgs/os-specific/linux/rewritefs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, fuse, pcre }: +{ lib, stdenv, fetchFromGitHub, pkg-config, fuse, pcre }: stdenv.mkDerivation { pname = "rewritefs"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { rev = "33fb844d8e8ff441a3fc80d2715e8c64f8563d81"; sha256 = "15bcxprkxf0xqxljsqhb0jpi7p1vwqcb00sjs7nzrj7vh2p7mqla"; }; - + nativeBuildInputs = [ pkg-config ]; buildInputs = [ fuse pcre ]; diff --git a/pkgs/servers/gopher/gofish/default.nix b/pkgs/servers/gopher/gofish/default.nix index 6468f6a9fcc..db3bcb47ecc 100644 --- a/pkgs/servers/gopher/gofish/default.nix +++ b/pkgs/servers/gopher/gofish/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { url = "mirror://sourceforge/project/gofish/gofish/${version}/${pname}-${version}.tar.gz"; sha256 = "0br5nvlna86k4ya4q13gz0i7nlmk225lqmpfiqlkldxkr473kf0s"; }; - + meta = with lib; { description = "A lightweight Gopher server"; homepage = "http://gofish.sourceforge.net/"; diff --git a/pkgs/servers/sickbeard/sickrage.nix b/pkgs/servers/sickbeard/sickrage.nix index 6b7d3e7b1ca..7bd971e86e7 100644 --- a/pkgs/servers/sickbeard/sickrage.nix +++ b/pkgs/servers/sickbeard/sickrage.nix @@ -7,7 +7,7 @@ python2.pkgs.buildPythonApplication rec { src = fetchFromGitHub { owner = "SickRage"; repo = "SickRage"; - rev = version; + rev = version; sha256 = "0lzklpsxqrb73inbv8almnhbnb681pmi44gzc8i4sjwmdksiiif9"; }; diff --git a/pkgs/servers/wsdd/default.nix b/pkgs/servers/wsdd/default.nix index 8fdd9a93a23..f1a385c6809 100644 --- a/pkgs/servers/wsdd/default.nix +++ b/pkgs/servers/wsdd/default.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { buildInputs = [ python3 ]; patches = [ - (fetchpatch { + (fetchpatch { # https://github.com/christgau/wsdd/issues/72 - name = "fix_send_messages_using_correct_socket.patch"; - url = "https://github.com/christgau/wsdd/commit/1ed74fe73a9fe2e2720859e2822116d65e4ffa5b.patch"; - sha256 = "1n9bqvh20nhnvnc5pxvzf9kk8nky6rmbmfryg65lfmr1hmg676zg"; + name = "fix_send_messages_using_correct_socket.patch"; + url = "https://github.com/christgau/wsdd/commit/1ed74fe73a9fe2e2720859e2822116d65e4ffa5b.patch"; + sha256 = "1n9bqvh20nhnvnc5pxvzf9kk8nky6rmbmfryg65lfmr1hmg676zg"; }) ]; diff --git a/pkgs/servers/xmpp/pyMAILt/default.nix b/pkgs/servers/xmpp/pyMAILt/default.nix index 68349214359..03ded7a5d5c 100644 --- a/pkgs/servers/xmpp/pyMAILt/default.nix +++ b/pkgs/servers/xmpp/pyMAILt/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { version = "20090101"; src = fetchcvs { - cvsRoot = ":pserver:anonymous@xmpppy.cvs.sourceforge.net:/cvsroot/xmpppy"; - module = "xmpppy/mail-transport"; - date = "2009-01-01"; - sha256 = "15301252e52b4ccb2156baefed8982a2a0cce3ae8eae3caf3cc28dfa615c8d6e"; - }; + cvsRoot = ":pserver:anonymous@xmpppy.cvs.sourceforge.net:/cvsroot/xmpppy"; + module = "xmpppy/mail-transport"; + date = "2009-01-01"; + sha256 = "15301252e52b4ccb2156baefed8982a2a0cce3ae8eae3caf3cc28dfa615c8d6e"; + }; pythonPath = [ xmpppy ]; buildInputs = [ pythonPackages.wrapPython ]; diff --git a/pkgs/shells/pash/default.nix b/pkgs/shells/pash/default.nix index 06ca2420798..8b2ac362959 100644 --- a/pkgs/shells/pash/default.nix +++ b/pkgs/shells/pash/default.nix @@ -3,7 +3,7 @@ buildDotnetPackage { baseName = "pash"; version = "git-2016-07-06"; - + src = fetchFromGitHub { owner = "Pash-Project"; repo = "Pash"; diff --git a/pkgs/tools/X11/alttab/default.nix b/pkgs/tools/X11/alttab/default.nix index 4bddee68f82..1a4f1daad51 100644 --- a/pkgs/tools/X11/alttab/default.nix +++ b/pkgs/tools/X11/alttab/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "026xd1bkg10fj2q1n6xx797xk1grpby25qj1pnw2lp4f3vc19qn6"; }; - nativeBuildInputs = [ + nativeBuildInputs = [ autoconf automake pkg-config diff --git a/pkgs/tools/X11/xsettingsd/default.nix b/pkgs/tools/X11/xsettingsd/default.nix index 0bb1e5172ff..7572e19fbf9 100644 --- a/pkgs/tools/X11/xsettingsd/default.nix +++ b/pkgs/tools/X11/xsettingsd/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { buildPhase = '' scons -j$NIX_BUILD_CORES -l$NIX_BUILD_CORES ''; - + installPhase = '' install -D -t "$out"/bin xsettingsd dump_xsettings install -D -t "$out"/usr/share/man/man1 xsettingsd.1 dump_xsettings.1 diff --git a/pkgs/tools/archivers/rpmextract/default.nix b/pkgs/tools/archivers/rpmextract/default.nix index d4bbbe77a2d..db768a5d14a 100644 --- a/pkgs/tools/archivers/rpmextract/default.nix +++ b/pkgs/tools/archivers/rpmextract/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { buildCommand = '' install -Dm755 $script $out/bin/rpmextract ''; - + script = substituteAll { src = ./rpmextract.sh; isExecutable = true; diff --git a/pkgs/tools/backup/hpe-ltfs/default.nix b/pkgs/tools/backup/hpe-ltfs/default.nix index e7ee67802c2..ec8e6392e9c 100644 --- a/pkgs/tools/backup/hpe-ltfs/default.nix +++ b/pkgs/tools/backup/hpe-ltfs/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = [ + buildInputs = [ fuse icu libxml2 libuuid ]; diff --git a/pkgs/tools/backup/ori/default.nix b/pkgs/tools/backup/ori/default.nix index 26a0ba29189..5e6e6a95ae7 100644 --- a/pkgs/tools/backup/ori/default.nix +++ b/pkgs/tools/backup/ori/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { sha256 = "8ce1a3dfbb6d1538885e993616bdfe71be44711d48f7f6798ff6bc0a39b3deca"; }; - buildInputs = [ + buildInputs = [ boost pkg-config scons util-linux fuse libevent openssl zlib ]; diff --git a/pkgs/tools/bluetooth/openobex/default.nix b/pkgs/tools/bluetooth/openobex/default.nix index 03828c51c01..1079623cf2a 100644 --- a/pkgs/tools/bluetooth/openobex/default.nix +++ b/pkgs/tools/bluetooth/openobex/default.nix @@ -1,8 +1,8 @@ { lib, stdenv, fetchurl, pkg-config, bluez, libusb-compat-0_1, cmake }: - + stdenv.mkDerivation rec { name = "openobex-1.7.2"; - + src = fetchurl { url = "mirror://sourceforge/openobex/${name}-Source.tar.gz"; sha256 = "1z6l7pbwgs5pjx3861cyd3r6vq5av984bdp4r3hgrw2jxam6120m"; diff --git a/pkgs/tools/filesystems/bcache-tools/default.nix b/pkgs/tools/filesystems/bcache-tools/default.nix index ea424865919..ba6cb79fbd5 100644 --- a/pkgs/tools/filesystems/bcache-tools/default.nix +++ b/pkgs/tools/filesystems/bcache-tools/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { Bcache is a Linux kernel block layer cache. It allows one or more fast disk drives such as flash-based solid state drives (SSDs) to act as a cache for one or more slower hard disk drives. - + This package contains the required user-space tools. User documentation is in Documentation/bcache.txt in the Linux kernel diff --git a/pkgs/tools/filesystems/ext4magic/default.nix b/pkgs/tools/filesystems/ext4magic/default.nix index a5f15c5fb2e..9917bf8d965 100644 --- a/pkgs/tools/filesystems/ext4magic/default.nix +++ b/pkgs/tools/filesystems/ext4magic/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { If the information in the journal are sufficient, ext4magic can recover the most file types, with original filename, owner and group, - file mode bits and also the old atime/mtime stamps. + file mode bits and also the old atime/mtime stamps. It's much more effective and works much better than extundelete. ''; diff --git a/pkgs/tools/filesystems/genext2fs/default.nix b/pkgs/tools/filesystems/genext2fs/default.nix index b4980e83bee..ccc048f7572 100644 --- a/pkgs/tools/filesystems/genext2fs/default.nix +++ b/pkgs/tools/filesystems/genext2fs/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation { name = "genext2fs-1.4.1"; - + src = fetchurl { url = "mirror://sourceforge/genext2fs/genext2fs-1.4.1.tar.gz"; sha256 = "1z7czvsf3ircvz2cw1cf53yifsq29ljxmj15hbgc79l6gbxbnka0"; diff --git a/pkgs/tools/graphics/cfdg/src-for-default.nix b/pkgs/tools/graphics/cfdg/src-for-default.nix index 6d98ea240de..7ff076a5b0a 100644 --- a/pkgs/tools/graphics/cfdg/src-for-default.nix +++ b/pkgs/tools/graphics/cfdg/src-for-default.nix @@ -4,6 +4,6 @@ hash="1pd1hjippbhad8l4s4lsglykh22i24qfrgmnxrsx71bvcqbr356p"; url="http://www.contextfreeart.org/download/ContextFreeSource3.0.2.tgz"; advertisedUrl="http://www.contextfreeart.org/download/ContextFreeSource3.0.2.tgz"; - - + + } diff --git a/pkgs/tools/graphics/scanbd/default.nix b/pkgs/tools/graphics/scanbd/default.nix index 2aec9be214e..2f2d0523469 100644 --- a/pkgs/tools/graphics/scanbd/default.nix +++ b/pkgs/tools/graphics/scanbd/default.nix @@ -35,18 +35,18 @@ stdenv.mkDerivation rec { scanbd polls a scanner's buttons, looking for button presses, function knob changes, or other scanner events such as paper inserts and removals, while at the same time allowing scan-applications to access the scanner. - + Various actions can be submitted (scan, copy, email, ...) via action scripts. The function knob values are passed to the action scripts as well. Scan actions are also signaled via dbus. This can be useful for foreign applications. Scans can also be triggered via dbus from foreign applications. - + On platforms which support signaling of dynamic device insertion/removal (libudev, dbus, hal), scanbd supports this as well. scanbd can use all sane-backends or some special backends from the (old) - scanbuttond project. + scanbuttond project. ''; homepage = "http://scanbd.sourceforge.net/"; downloadPage = "https://sourceforge.net/projects/scanbd/"; diff --git a/pkgs/tools/inputmethods/fcitx/default.nix b/pkgs/tools/inputmethods/fcitx/default.nix index 69e4425d8c3..fc28a08b4b7 100644 --- a/pkgs/tools/inputmethods/fcitx/default.nix +++ b/pkgs/tools/inputmethods/fcitx/default.nix @@ -1,11 +1,11 @@ { callPackage, plugins ? [] }: -let +let unwrapped = callPackage ./unwrapped.nix { }; wrapped = callPackage ./wrapper.nix { plugins = plugins; fcitx = unwrapped; }; -in if plugins == [] +in if plugins == [] then unwrapped else wrapped diff --git a/pkgs/tools/misc/dumptorrent/default.nix b/pkgs/tools/misc/dumptorrent/default.nix index 73dac5280bf..12232c414fd 100644 --- a/pkgs/tools/misc/dumptorrent/default.nix +++ b/pkgs/tools/misc/dumptorrent/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { pname = "dumptorrent"; version = "1.2"; - + src = fetchurl { url = "mirror://sourceforge/dumptorrent/dumptorrent-${version}.tar.gz"; sha256 = "073h03bmpfdy15qh37lvppayld2747i4acpyk0pm5nf2raiak0zm"; diff --git a/pkgs/tools/misc/dvtm/default.nix b/pkgs/tools/misc/dvtm/default.nix index bedfebd9681..695187b3e84 100644 --- a/pkgs/tools/misc/dvtm/default.nix +++ b/pkgs/tools/misc/dvtm/default.nix @@ -16,4 +16,4 @@ callPackage ./dvtm.nix rec { }) ]; } - + diff --git a/pkgs/tools/misc/pg_top/default.nix b/pkgs/tools/misc/pg_top/default.nix index a5d1baf1fd1..f5d42431e4f 100644 --- a/pkgs/tools/misc/pg_top/default.nix +++ b/pkgs/tools/misc/pg_top/default.nix @@ -12,8 +12,8 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A 'top' like tool for PostgreSQL"; - longDescription = '' - pg_top allows you to: + longDescription = '' + pg_top allows you to: * View currently running SQL statement of a process. * View query plan of a currently running SQL statement. * View locks held by a process. diff --git a/pkgs/tools/misc/pubs/default.nix b/pkgs/tools/misc/pubs/default.nix index 24367189ff0..82e7659d152 100644 --- a/pkgs/tools/misc/pubs/default.nix +++ b/pkgs/tools/misc/pubs/default.nix @@ -12,14 +12,14 @@ python3Packages.buildPythonApplication rec { }; propagatedBuildInputs = with python3Packages; [ - argcomplete dateutil configobj feedparser bibtexparser pyyaml requests six + argcomplete dateutil configobj feedparser bibtexparser pyyaml requests six beautifulsoup4 ]; checkInputs = with python3Packages; [ pyfakefs mock ddt ]; # Disabling git tests because they expect git to be preconfigured - # with the user's details. See + # with the user's details. See # https://github.com/NixOS/nixpkgs/issues/94663 preCheck = '' rm tests/test_git.py diff --git a/pkgs/tools/misc/rargs/default.nix b/pkgs/tools/misc/rargs/default.nix index c8eea974750..834a62803f6 100644 --- a/pkgs/tools/misc/rargs/default.nix +++ b/pkgs/tools/misc/rargs/default.nix @@ -19,6 +19,6 @@ rustPlatform.buildRustPackage rec { description = "xargs + awk with pattern matching support"; homepage = "https://github.com/lolabout/rargs"; license = with licenses; [ mit ]; - maintainers = with maintainers; [ pblkt ]; + maintainers = with maintainers; [ pblkt ]; }; } diff --git a/pkgs/tools/misc/teamocil/default.nix b/pkgs/tools/misc/teamocil/default.nix index b1f6c7cdcab..5218453d15e 100644 --- a/pkgs/tools/misc/teamocil/default.nix +++ b/pkgs/tools/misc/teamocil/default.nix @@ -13,7 +13,7 @@ bundlerEnv { license = licenses.mit; platforms = platforms.all; maintainers = with maintainers; [ - zachcoyle + zachcoyle nicknovitski ]; }; diff --git a/pkgs/tools/misc/tty-clock/default.nix b/pkgs/tools/misc/tty-clock/default.nix index 4d78e7f3f93..b6cca5fe5c3 100644 --- a/pkgs/tools/misc/tty-clock/default.nix +++ b/pkgs/tools/misc/tty-clock/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { rev = "v${version}"; sha256 = "16v3pmva13skpfjja96zacjpxrwzs1nb1iqmrp2qzvdbcm9061pp"; }; - + nativeBuildInputs = [ pkg-config ]; buildInputs = [ ncurses ]; diff --git a/pkgs/tools/networking/openconnect_pa/default.nix b/pkgs/tools/networking/openconnect_pa/default.nix index 3ca47897618..0f7a37e8831 100644 --- a/pkgs/tools/networking/openconnect_pa/default.nix +++ b/pkgs/tools/networking/openconnect_pa/default.nix @@ -5,14 +5,14 @@ assert (openssl != null) == (gnutls == null); stdenv.mkDerivation { version = "unstable-2018-10-08"; pname = "openconnect_pa"; - + outputs = [ "out" "dev" ]; src = fetchFromGitHub { owner = "dlenski"; repo = "openconnect"; rev = "e5fe063a087385c5b157ad7a9a3fa874181f6e3b"; - sha256 = "0ywacqs3nncr2gpjjcz2yc9c6v4ifjssh0vb07h0qff06whqhdax"; + sha256 = "0ywacqs3nncr2gpjjcz2yc9c6v4ifjssh0vb07h0qff06whqhdax"; }; preConfigure = '' @@ -29,7 +29,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkg-config autoreconfHook ]; propagatedBuildInputs = [ vpnc openssl gnutls gmp libxml2 stoken zlib ]; - + meta = with lib; { description = "OpenConnect client extended to support Palo Alto Networks' GlobalProtect VPN"; homepage = "https://github.com/dlenski/openconnect/"; diff --git a/pkgs/tools/networking/sshoogr/default.nix b/pkgs/tools/networking/sshoogr/default.nix index 9539c15f5ed..f3c9c1a31fb 100644 --- a/pkgs/tools/networking/sshoogr/default.nix +++ b/pkgs/tools/networking/sshoogr/default.nix @@ -24,8 +24,8 @@ stdenv.mkDerivation rec { ''; longDescription = '' The sshoogr (pronounced [ʃʊgə]) is a Groovy-based DSL library for working - with remote servers through SSH. The DSL allows: connecting, executing - remote commands, copying files and directories, creating tunnels in a + with remote servers through SSH. The DSL allows: connecting, executing + remote commands, copying files and directories, creating tunnels in a simple and concise way. ''; homepage = "https://github.com/aestasit/sshoogr"; @@ -33,4 +33,4 @@ stdenv.mkDerivation rec { platforms = platforms.all; maintainers = with maintainers; [ moaxcp ]; }; -} +} diff --git a/pkgs/tools/networking/wolfebin/default.nix b/pkgs/tools/networking/wolfebin/default.nix index 23458f2a396..2a07ada114d 100644 --- a/pkgs/tools/networking/wolfebin/default.nix +++ b/pkgs/tools/networking/wolfebin/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { version = "5.4"; pname = "wolfebin"; - + src = fetchFromGitHub { owner = "thejoshwolfe"; repo = "wolfebin"; diff --git a/pkgs/tools/package-management/python2nix/default.nix b/pkgs/tools/package-management/python2nix/default.nix index ceb919ecb82..3cce599c052 100644 --- a/pkgs/tools/package-management/python2nix/default.nix +++ b/pkgs/tools/package-management/python2nix/default.nix @@ -2,7 +2,7 @@ pythonPackages.buildPythonApplication { name = "python2nix-20140927"; - + src = fetchFromGitHub { owner = "proger"; repo = "python2nix"; diff --git a/pkgs/tools/security/hashcash/default.nix b/pkgs/tools/security/hashcash/default.nix index b13425b7205..f86684178fc 100644 --- a/pkgs/tools/security/hashcash/default.nix +++ b/pkgs/tools/security/hashcash/default.nix @@ -3,14 +3,14 @@ stdenv.mkDerivation rec { pname = "hashcash"; version = "1.22"; - + buildInputs = [ openssl ]; src = fetchurl { url = "http://www.hashcash.org/source/hashcash-${version}.tgz"; sha256 = "15kqaimwb2y8wvzpn73021bvay9mz1gqqfc40gk4hj6f84nz34h1"; }; - + makeFlags = [ "generic-openssl" "LIBCRYPTO=-lcrypto" @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { "MAN_INSTALL_PATH=${placeholder "out"}/share/man/man1" "DOC_INSTALL_PATH=${placeholder "out"}/share/doc/hashcash-$(version)" ]; - + meta = with lib; { description = "Proof-of-work algorithm used as spam and denial-of-service counter measure"; homepage = "http://hashcash.org"; diff --git a/pkgs/tools/security/libacr38u/default.nix b/pkgs/tools/security/libacr38u/default.nix index a2fe22dd2bd..314abba853d 100644 --- a/pkgs/tools/security/libacr38u/default.nix +++ b/pkgs/tools/security/libacr38u/default.nix @@ -38,4 +38,4 @@ stdenv.mkDerivation { maintainers = with maintainers; [ berce ]; platforms = with platforms; unix; }; -} +} diff --git a/pkgs/tools/system/stress/default.nix b/pkgs/tools/system/stress/default.nix index 2b9923eb571..33fbd15c5e6 100644 --- a/pkgs/tools/system/stress/default.nix +++ b/pkgs/tools/system/stress/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "stress-1.0.4"; - + src = fetchurl { url = "https://people.seas.harvard.edu/~apw/stress/${name}.tar.gz"; sha256 = "0nw210jajk38m3y7h8s130ps2qsbz7j75wab07hi2r3hlz14yzh5"; diff --git a/pkgs/tools/text/cconv/default.nix b/pkgs/tools/text/cconv/default.nix index de16854927b..9c5796c0b1d 100644 --- a/pkgs/tools/text/cconv/default.nix +++ b/pkgs/tools/text/cconv/default.nix @@ -3,14 +3,14 @@ let version = "0.6.3"; in stdenv.mkDerivation { pname = "cconv"; inherit version; - + src = fetchurl { url = "https://github.com/xiaoyjy/cconv/archive/v${version}.tar.gz"; sha256 = "82f46a94829f5a8157d6f686e302ff5710108931973e133d6e19593061b81d84"; }; nativeBuildInputs = [ autoreconfHook ]; - + meta = with lib; { description = "A iconv based simplified-traditional chinese conversion tool"; homepage = "https://github.com/xiaoyjy/cconv"; diff --git a/pkgs/tools/text/enca/default.nix b/pkgs/tools/text/enca/default.nix index 6c23acb86b4..7015bd4453c 100644 --- a/pkgs/tools/text/enca/default.nix +++ b/pkgs/tools/text/enca/default.nix @@ -23,6 +23,6 @@ stdenv.mkDerivation rec { ''; license = licenses.gpl2; - + }; } diff --git a/pkgs/tools/video/untrunc-anthwlock/default.nix b/pkgs/tools/video/untrunc-anthwlock/default.nix index 632f8c41463..4b950fd0f22 100644 --- a/pkgs/tools/video/untrunc-anthwlock/default.nix +++ b/pkgs/tools/video/untrunc-anthwlock/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "14i2lq68q990hnm2kkfamlsi67bcml85zl8yjsyxc5h8ncc2f3dp"; }; - + buildInputs = [ ffmpeg libui ]; postBuild = '' -- cgit 1.4.1