commit 80fda29977520c2725a039631e7463a36ec7a6b9 parent b7053fcdb951dd159565ad3f67bf0d3b54e5173f Author: Nikolay Korotkiy <sikmir@gmail.com> Date: Fri, 19 Feb 2021 14:10:02 +0300 Move some tools to misc Diffstat:
12 files changed, 50 insertions(+), 53 deletions(-)
diff --git a/pkgs/default.nix b/pkgs/default.nix @@ -89,13 +89,6 @@ lib.makeScope newScope ( callPackage ./data/themes/goldendict-themes/dark-theme.nix { }; qtpbfimageplugin-styles = callPackage ./data/themes/qtpbfimageplugin-styles { }; - ### DEVELOPMENT / TOOLS - - gef = callPackage ./development/tools/gef { }; - how-to-use-pvs-studio-free = callPackage ./development/tools/pvs-studio/how-to-use-pvs-studio-free.nix { }; - pvs-studio = callPackage ./development/tools/pvs-studio { }; - xtr = callPackage ./development/tools/xtr { }; - ### DEVELOPMENT / LIBRARIES foma = callPackage ./development/libraries/foma { @@ -135,11 +128,7 @@ lib.makeScope newScope ( ### TOOLS - aamath = callPackage ./tools/text/aamath { }; - csvquote = callPackage ./tools/text/csvquote { }; - csvtools = callPackage ./tools/text/csvtools { }; datamaps = callPackage ./tools/geo/datamaps { }; - docx2csv = callPackage ./tools/text/docx2csv { }; elevation = callPackage ./tools/geo/elevation { click = click-6-7; }; @@ -232,11 +221,17 @@ lib.makeScope newScope ( ### MISC + aamath = callPackage ./misc/aamath { }; apibackuper = callPackage ./misc/apibackuper { }; ascii-dash = callPackage ./misc/ascii-dash { }; cfiles = callPackage ./misc/cfiles { }; + csvquote = callPackage ./misc/csvquote { }; + csvtools = callPackage ./misc/csvtools { }; docker-reg-tool = callPackage ./misc/docker-reg-tool { }; + docx2csv = callPackage ./misc/docx2csv { }; + gef = callPackage ./misc/gef { }; glauth = callPackage ./misc/glauth { }; + how-to-use-pvs-studio-free = callPackage ./misc/how-to-use-pvs-studio-free.nix { }; ht = callPackage ./misc/ht { }; ish = callPackage ./misc/ish { }; lazyscraper = callPackage ./misc/lazyscraper { }; @@ -246,8 +241,10 @@ lib.makeScope newScope ( inherit sources; }; ptunnel = callPackage ./misc/ptunnel { }; + pvs-studio = callPackage ./misc/pvs-studio { }; taskcoach = callPackage ./misc/taskcoach { }; xfractint = callPackage ./misc/xfractint { }; + xtr = callPackage ./misc/xtr { }; ### NAKARTE diff --git a/pkgs/misc/aamath/default.nix b/pkgs/misc/aamath/default.nix @@ -0,0 +1,41 @@ +{ lib, stdenv, fetchurl, fetchpatch, readline, ncurses, bison, flex }: + +stdenv.mkDerivation rec { + pname = "aamath"; + version = "0.3"; + + src = fetchurl { + url = "http://fuse.superglue.se/aamath/aamath-${version}.tar.gz"; + sha256 = "0cdnfy7zdwyxvkhnk5gdcl75w9ag3n95i3sxrrawvqlmhrcg8hwq"; + }; + + patches = (fetchpatch { + url = "https://raw.githubusercontent.com/macports/macports-ports/6c3088afddcf34ca2bcc5c209f85f264dcf0bc69/math/aamath/files/patch-expr.h.diff"; + sha256 = "0ls6xpjhldrivfbva2529i6maid44w33by38g80wzzvas2lxrli6"; + }); + + patchFlags = [ "-p0" ]; + + postPatch = '' + substituteInPlace Makefile \ + --replace "lex " "flex " \ + --replace "-ltermcap" "-lncurses" + ''; + + nativeBuildInputs = [ bison flex ]; + + buildInputs = [ readline ncurses ]; + + installPhase = '' + install -Dm755 aamath -t $out/bin + install -Dm644 aamath.1 -t $out/share/man/man1 + ''; + + meta = with lib; { + description = "ASCII art mathematics"; + homepage = "http://fuse.superglue.se/aamath/"; + license = licenses.gpl2Only; + maintainers = [ maintainers.sikmir ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/text/csvquote/default.nix b/pkgs/misc/csvquote/default.nix diff --git a/pkgs/tools/text/csvtools/default.nix b/pkgs/misc/csvtools/default.nix diff --git a/pkgs/tools/text/docx2csv/default.nix b/pkgs/misc/docx2csv/default.nix diff --git a/pkgs/development/tools/gef/default.nix b/pkgs/misc/gef/default.nix diff --git a/pkgs/development/tools/pvs-studio/default.nix b/pkgs/misc/pvs-studio/default.nix diff --git a/pkgs/development/tools/pvs-studio/how-to-use-pvs-studio-free.nix b/pkgs/misc/pvs-studio/how-to-use-pvs-studio-free.nix diff --git a/pkgs/development/tools/xtr/cargo-lock.patch b/pkgs/misc/xtr/cargo-lock.patch diff --git a/pkgs/development/tools/xtr/default.nix b/pkgs/misc/xtr/default.nix diff --git a/pkgs/suckless/sfm/default.nix b/pkgs/suckless/sfm/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { description = "Simple file manager"; homepage = "https://github.com/afify/sfm"; license = licenses.isc; - platforms = platforms.unix; + platforms = platforms.linux; maintainers = [ maintainers.sikmir ]; }; } diff --git a/pkgs/tools/text/aamath/default.nix b/pkgs/tools/text/aamath/default.nix @@ -1,41 +0,0 @@ -{ lib, stdenv, fetchurl, fetchpatch, readline, ncurses, bison, flex }: - -stdenv.mkDerivation rec { - pname = "aamath"; - version = "0.3"; - - src = fetchurl { - url = "http://fuse.superglue.se/aamath/aamath-${version}.tar.gz"; - sha256 = "0cdnfy7zdwyxvkhnk5gdcl75w9ag3n95i3sxrrawvqlmhrcg8hwq"; - }; - - patches = (fetchpatch { - url = "https://raw.githubusercontent.com/macports/macports-ports/6c3088afddcf34ca2bcc5c209f85f264dcf0bc69/math/aamath/files/patch-expr.h.diff"; - sha256 = "0ls6xpjhldrivfbva2529i6maid44w33by38g80wzzvas2lxrli6"; - }); - - patchFlags = [ "-p0" ]; - - postPatch = '' - substituteInPlace Makefile \ - --replace "lex " "flex " \ - --replace "-ltermcap" "-lncurses" - ''; - - nativeBuildInputs = [ bison flex ]; - - buildInputs = [ readline ncurses ]; - - installPhase = '' - install -Dm755 aamath -t $out/bin - install -Dm644 aamath.1 -t $out/share/man/man1 - ''; - - meta = with lib; { - description = "ASCII art mathematics"; - homepage = "http://fuse.superglue.se/aamath/"; - license = licenses.gpl2Only; - maintainers = [ maintainers.sikmir ]; - platforms = platforms.unix; - }; -}