public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

treewide: editorconfig fixes

Browse Source 
- remove trailing whitespace
- use spaces for indentation
This commit is contained in:
zowoq 2021-01-21 10:55:55 +10:00
parent fa2e1dd70a
commit 932941b79c
32 changed files with 74 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/applications/science/chemistry/molden/default.nix
View File

@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
--replace '-I/usr/X11R6/include' "" \ --replace '-I/usr/X11R6/include' "" \
--replace '/usr/local/' $out/ \ --replace '/usr/local/' $out/ \
--replace 'sudo' "" \ --replace 'sudo' "" \
--replace '-C surf depend' '-C surf' --replace '-C surf depend' '-C surf'
sed -in '/^# DO NOT DELETE THIS LINE/q;' surf/Makefile sed -in '/^# DO NOT DELETE THIS LINE/q;' surf/Makefile
''; '';
@ -41,4 +41,3 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ markuskowa ]; maintainers = with maintainers; [ markuskowa ];
}; };
} }

8
pkgs/development/compilers/bigloo/default.nix
View File

@ -32,14 +32,14 @@ stdenv.mkDerivation rec {
# Fix absolute paths. # Fix absolute paths.
sed -e 's=/bin/mv=mv=g' -e 's=/bin/rm=rm=g' \ sed -e 's=/bin/mv=mv=g' -e 's=/bin/rm=rm=g' \
-e 's=/tmp=$TMPDIR=g' -i autoconf/* \ -e 's=/tmp=$TMPDIR=g' -i autoconf/* \
[Mm]akefile* */[Mm]akefile* */*/[Mm]akefile* \ [Mm]akefile* */[Mm]akefile* */*/[Mm]akefile* \
*/*/*/[Mm]akefile* */*/*/*/[Mm]akefile* \ */*/*/[Mm]akefile* */*/*/*/[Mm]akefile* \
comptime/Cc/cc.scm gc/install-* comptime/Cc/cc.scm gc/install-*
# Make sure we don't change string lengths in the generated # Make sure we don't change string lengths in the generated
# C files. # C files.
sed -e 's=/bin/rm= rm=g' -e 's=/bin/mv= mv=g' \ sed -e 's=/bin/rm= rm=g' -e 's=/bin/mv= mv=g' \
-i comptime/Cc/cc.c -i comptime/Cc/cc.c
''; '';
checkTarget = "test"; checkTarget = "test";

4
pkgs/development/python-modules/pyregion/default.nix
View File

@ -33,8 +33,8 @@ buildPythonPackage rec {
name = "conftest-astropy-3-fix.patch"; name = "conftest-astropy-3-fix.patch";
url = "https://github.com/astropy/pyregion/pull/136.patch"; url = "https://github.com/astropy/pyregion/pull/136.patch";
sha256 = "13yxjxiqnhjy9gh24hvv6pnwx7qic2mcx3ccr1igjrc3f881d59m"; sha256 = "13yxjxiqnhjy9gh24hvv6pnwx7qic2mcx3ccr1igjrc3f881d59m";
}) })
]; ];
nativeBuildInputs = [ astropy-helpers ]; nativeBuildInputs = [ astropy-helpers ];

2
pkgs/development/tools/dtools/default.nix
View File

@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
installPhase = '' installPhase = ''
$makeCmd INSTALL_DIR=$out install $makeCmd INSTALL_DIR=$out install
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Ancillary tools for the D programming language compiler"; description = "Ancillary tools for the D programming language compiler";

2
pkgs/development/tools/gtk-mac-bundler/default.nix
View File

@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
}; };
installPhase = '' installPhase = ''
mkdir -p $out/bin mkdir -p $out/bin
substitute gtk-mac-bundler.in $out/bin/gtk-mac-bundler \ substitute gtk-mac-bundler.in $out/bin/gtk-mac-bundler \
--subst-var-by PATH $out/share --subst-var-by PATH $out/share
chmod a+x $out/bin/gtk-mac-bundler chmod a+x $out/bin/gtk-mac-bundler

28
pkgs/development/tools/ocaml/obelisk/default.nix
View File

@ -1,20 +1,20 @@
{ lib, fetchurl, ocamlPackages }: { lib, fetchurl, ocamlPackages }:
ocamlPackages.buildDunePackage rec { ocamlPackages.buildDunePackage rec {
pname = "obelisk"; pname = "obelisk";
version = "0.5.2"; version = "0.5.2";
useDune2 = true; useDune2 = true;
src = fetchurl { src = fetchurl {
url = "https://github.com/Lelio-Brun/Obelisk/releases/download/v${version}/obelisk-v${version}.tbz"; url = "https://github.com/Lelio-Brun/Obelisk/releases/download/v${version}/obelisk-v${version}.tbz";
sha256 = "0s86gkypyrkrp83xnay258ijri3yjwj3marsjnjf8mz58z0zd9g6"; sha256 = "0s86gkypyrkrp83xnay258ijri3yjwj3marsjnjf8mz58z0zd9g6";
}; };
buildInputs = with ocamlPackages; [ menhir re ]; buildInputs = with ocamlPackages; [ menhir re ];
meta = { meta = {
description = "A simple tool which produces pretty-printed output from a Menhir parser file (.mly)"; description = "A simple tool which produces pretty-printed output from a Menhir parser file (.mly)";
license = lib.licenses.mit; license = lib.licenses.mit;
maintainers = [ lib.maintainers.vbgl ]; maintainers = [ lib.maintainers.vbgl ];
homepage = "https://github.com/Lelio-Brun/Obelisk"; homepage = "https://github.com/Lelio-Brun/Obelisk";
}; };
} }

6
pkgs/tools/networking/guardian-agent/default.nix
View File

@ -30,9 +30,9 @@ buildGoPackage rec {
''; '';
postFixup = '' postFixup = ''
wrapProgram $out/bin/sga-guard \ wrapProgram $out/bin/sga-guard \
--prefix PATH : "$out/bin" \ --prefix PATH : "$out/bin" \
--prefix PATH : "${autossh}/bin" --prefix PATH : "${autossh}/bin"
''; '';
meta = with lib; { meta = with lib; {