diff --git a/pkgs/applications/audio/gbsplay/default.nix b/pkgs/applications/audio/gbsplay/default.nix deleted file mode 100644 index 5c7d302346e3..000000000000 --- a/pkgs/applications/audio/gbsplay/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, installShellFiles, libpulseaudio, nas }: - -stdenv.mkDerivation rec { - pname = "gbsplay"; - version = "0.0.97"; - - src = fetchFromGitHub { - owner = "mmitch"; - repo = "gbsplay"; - rev = version; - sha256 = "sha256-O4t5OzXcrGoxzSXr0nzc01bItjcp1LvFeWnbdSUDwFU="; - }; - - configureFlags = [ - "--without-test" # See mmitch/gbsplay#62 - "--without-contrib" - ]; - - nativeBuildInputs = [ installShellFiles ]; - buildInputs = [ libpulseaudio nas ]; - - postInstall = '' - installShellCompletion --bash --name gbsplay contrib/gbsplay.bashcompletion - ''; - - meta = with lib; { - description = "Gameboy sound player"; - license = licenses.gpl1Plus; - platforms = [ "i686-linux" "x86_64-linux" ]; - maintainers = with maintainers; [ ]; - }; -} diff --git a/pkgs/applications/editors/fte/default.nix b/pkgs/applications/editors/fte/default.nix deleted file mode 100644 index 1c5d1f15ecb8..000000000000 --- a/pkgs/applications/editors/fte/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib, stdenv, fetchurl, unzip, perl, libX11, libXpm, gpm, ncurses, slang }: - -stdenv.mkDerivation rec { - pname = "fte"; - version = "0.50.02"; - - nativeBuildInputs = [ unzip ]; - buildInputs = [ perl libX11 libXpm gpm ncurses slang ]; - - ftesrc = fetchurl { - url = "mirror://sourceforge/fte/fte-20110708-src.zip"; - sha256 = "17j9akr19w19myglw5mljjw2g3i2cwxiqrjaln82h3rz5ma1qcfn"; - }; - ftecommon = fetchurl { - url = "mirror://sourceforge/fte/fte-20110708-common.zip"; - sha256 = "1xva4kh0674sj2b9rhf2amlr37yxmsvjkgyj89gpcn0rndw1ahaq"; - }; - src = [ ftesrc ftecommon ]; - - env.NIX_CFLAGS_COMPILE = "-DHAVE_STRLCAT -DHAVE_STRLCPY"; - - buildFlags = [ "PREFIX=$(out)" ]; - - installFlags = [ "PREFIX=$(out)" "INSTALL_NONROOT=1" ]; - - meta = with lib; { - description = "A free text editor for developers"; - homepage = "https://fte.sourceforge.net/"; - license = licenses.gpl2; - maintainers = [ ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/applications/editors/hexedit/default.nix b/pkgs/applications/editors/hexedit/default.nix deleted file mode 100644 index efdfac33f09b..000000000000 --- a/pkgs/applications/editors/hexedit/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, ncurses }: - -stdenv.mkDerivation rec { - pname = "hexedit"; - version = "1.6"; - - src = fetchFromGitHub { - owner = "pixel"; - repo = "hexedit"; - rev = version; - sha256 = "sha256-fIgPbr7qmxyEga2YaAD0+NBM8LeDm/tVAq99ub7aiAI="; - }; - - nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ ncurses ]; - - meta = with lib; { - description = "View and edit files in hexadecimal or in ASCII"; - homepage = "http://rigaux.org/hexedit.html"; - license = licenses.gpl2Plus; - platforms = platforms.unix; - maintainers = with maintainers; [ ]; - mainProgram = "hexedit"; - }; -} diff --git a/pkgs/applications/misc/tipp10/default.nix b/pkgs/applications/misc/tipp10/default.nix index d61e0deabbd7..090d192b5240 100644 --- a/pkgs/applications/misc/tipp10/default.nix +++ b/pkgs/applications/misc/tipp10/default.nix @@ -20,7 +20,7 @@ mkDerivation rec { mainProgram = "tipp10"; homepage = "https://gitlab.com/tipp10/tipp10"; license = licenses.gpl2Only; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ sigmanificient ]; platforms = platforms.all; }; } diff --git a/pkgs/applications/misc/unipicker/default.nix b/pkgs/applications/misc/unipicker/default.nix deleted file mode 100644 index e13d27ce4408..000000000000 --- a/pkgs/applications/misc/unipicker/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ stdenv, fetchFromGitHub, lib, fzf, xclip }: - -stdenv.mkDerivation rec { - pname = "unipicker"; - version = "2.0.1"; - - src = fetchFromGitHub { - owner = "jeremija"; - repo = pname; - rev = "v${version}"; - sha256 = "1k4v53pm3xivwg9vq2kndpcmah0yn4679r5jzxvg38bbkfdk86c1"; - }; - - buildInputs = [ - fzf - xclip - ]; - - preInstall = '' - substituteInPlace unipicker \ - --replace "/etc/unipickerrc" "$out/etc/unipickerrc" \ - --replace "fzf" "${fzf}/bin/fzf" - substituteInPlace unipickerrc \ - --replace "/usr/local" "$out" \ - --replace "fzf" "${fzf}/bin/fzf" - ''; - - makeFlags = [ - "PREFIX=$(out)" - "DESTDIR=$(out)" - ]; - - meta = with lib; { - description = "A CLI utility for searching unicode characters by description and optionally copying them to clipboard"; - homepage = "https://github.com/jeremija/unipicker"; - license = licenses.mit; - maintainers = with maintainers; [ ]; - platforms = platforms.unix; - mainProgram = "unipicker"; - }; -} diff --git a/pkgs/applications/terminal-emulators/kitty/themes.nix b/pkgs/applications/terminal-emulators/kitty/themes.nix index 46993343bd53..facfa34cf140 100644 --- a/pkgs/applications/terminal-emulators/kitty/themes.nix +++ b/pkgs/applications/terminal-emulators/kitty/themes.nix @@ -3,7 +3,7 @@ , fetchFromGitHub }: -stdenvNoCC.mkDerivation rec { +stdenvNoCC.mkDerivation { pname = "kitty-themes"; version = "unstable-2024-04-23"; @@ -30,7 +30,7 @@ stdenvNoCC.mkDerivation rec { homepage = "https://github.com/kovidgoyal/kitty-themes"; description = "Themes for the kitty terminal emulator"; license = lib.licenses.gpl3Only; - maintainers = with lib.maintainers; [ ]; + maintainers = with lib.maintainers; [ sigmanificient ]; platforms = lib.platforms.all; }; } diff --git a/pkgs/by-name/ft/fte/package.nix b/pkgs/by-name/ft/fte/package.nix new file mode 100644 index 000000000000..149bb4adf9b5 --- /dev/null +++ b/pkgs/by-name/ft/fte/package.nix @@ -0,0 +1,59 @@ +{ + lib, + stdenv, + fetchurl, + unzip, + perl, + libX11, + libXpm, + gpm, + ncurses, + slang, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "fte"; + version = "0.50.02"; + + ftesrc = fetchurl { + url = "mirror://sourceforge/fte/fte-20110708-src.zip"; + hash = "sha256-1jEcVC0/DyiQpUpmHDtnIo4nuJS0Fk6frynwFPJUSZ4="; + }; + + ftecommon = fetchurl { + url = "mirror://sourceforge/fte/fte-20110708-common.zip"; + hash = "sha256-WEEVeLMZWHZfQtK/Kbeu3Z+RaVXCwZyWkJocA+Akavc="; + }; + + src = [ + finalAttrs.ftesrc + finalAttrs.ftecommon + ]; + + nativeBuildInputs = [ unzip ]; + buildInputs = [ + perl + libX11 + libXpm + gpm + ncurses + slang + ]; + + hardeningDisable = [ "all" ]; + enableParallelBuilding = true; + + env.NIX_CFLAGS_COMPILE = "-DHAVE_STRLCAT -DHAVE_STRLCPY"; + installFlags = [ "INSTALL_NONROOT=1" ]; + + # not setting it cause fte to not find xfte + makeFlags = [ "PREFIX=${placeholder "out"}" ]; + + meta = { + description = "A free text editor for developers"; + homepage = "https://fte.sourceforge.net/"; + license = lib.licenses.gpl2; + maintainers = with lib.maintainers; [ sigmanificient ]; + platforms = lib.platforms.all; + }; +}) diff --git a/pkgs/by-name/gb/gbsplay/package.nix b/pkgs/by-name/gb/gbsplay/package.nix new file mode 100644 index 000000000000..64df774af5c2 --- /dev/null +++ b/pkgs/by-name/gb/gbsplay/package.nix @@ -0,0 +1,43 @@ +{ + lib, + stdenv, + fetchFromGitHub, + installShellFiles, + libpulseaudio, + nas, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "gbsplay"; + version = "0.0.97"; + + src = fetchFromGitHub { + owner = "mmitch"; + repo = "gbsplay"; + rev = finalAttrs.version; + hash = "sha256-O4t5OzXcrGoxzSXr0nzc01bItjcp1LvFeWnbdSUDwFU="; + }; + + configureFlags = [ + "--without-test" # See mmitch/gbsplay#62 + "--without-contrib" + ]; + + nativeBuildInputs = [ installShellFiles ]; + buildInputs = [ + libpulseaudio + nas + ]; + + postInstall = '' + installShellCompletion --bash --name gbsplay contrib/gbsplay.bashcompletion + ''; + + meta = { + description = "Gameboy sound player"; + license = lib.licenses.gpl1Plus; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ sigmanificient ]; + mainProgram = "gbsplay"; + }; +}) diff --git a/pkgs/applications/version-management/git-standup/default.nix b/pkgs/by-name/gi/git-standup/package.nix similarity index 72% rename from pkgs/applications/version-management/git-standup/default.nix rename to pkgs/by-name/gi/git-standup/package.nix index 2c4cdc02564b..d40d100869ee 100644 --- a/pkgs/applications/version-management/git-standup/default.nix +++ b/pkgs/by-name/gi/git-standup/package.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchFromGitHub, makeWrapper, git }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "git-standup"; version = "2.3.2"; src = fetchFromGitHub { owner = "kamranahmedse"; - repo = pname; - rev = version; + repo = "git-standup"; + rev = finalAttrs.version; sha256 = "1xnn0jjha56v7l2vj45zzxncl6m5x2hq6nkffgc1bcikhp1pidn7"; }; @@ -22,12 +22,12 @@ stdenv.mkDerivation rec { --prefix PATH : "${lib.makeBinPath [ git ]}" ''; - meta = with lib; { + meta = { description = "Recall what you did on the last working day"; homepage = "https://github.com/kamranahmedse/git-standup"; - license = licenses.mit; - maintainers = [ ]; - platforms = platforms.all; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ sigmanificient ]; + platforms = lib.platforms.all; mainProgram = "git-standup"; }; -} +}) diff --git a/pkgs/by-name/he/hexedit/package.nix b/pkgs/by-name/he/hexedit/package.nix new file mode 100644 index 000000000000..e592d6633b6c --- /dev/null +++ b/pkgs/by-name/he/hexedit/package.nix @@ -0,0 +1,31 @@ +{ + lib, + stdenv, + fetchFromGitHub, + autoreconfHook, + ncurses, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "hexedit"; + version = "1.6"; + + src = fetchFromGitHub { + owner = "pixel"; + repo = "hexedit"; + rev = finalAttrs.version; + hash = "sha256-fIgPbr7qmxyEga2YaAD0+NBM8LeDm/tVAq99ub7aiAI="; + }; + + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ ncurses ]; + + meta = { + description = "View and edit files in hexadecimal or in ASCII"; + homepage = "http://rigaux.org/hexedit.html"; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ sigmanificient ]; + mainProgram = "hexedit"; + }; +}) diff --git a/pkgs/by-name/un/unipicker/package.nix b/pkgs/by-name/un/unipicker/package.nix new file mode 100644 index 000000000000..5f0bca5ef962 --- /dev/null +++ b/pkgs/by-name/un/unipicker/package.nix @@ -0,0 +1,47 @@ +{ + stdenv, + fetchFromGitHub, + lib, + fzf, + xclip, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "unipicker"; + version = "2.0.1"; + + src = fetchFromGitHub { + owner = "jeremija"; + repo = "unipicker"; + rev = "v${finalAttrs.version}"; + hash = "sha256-Br9nCK5eWoSN1i4LM2F31B62L9vuN5KzjS9pC9lq9oM="; + }; + + buildInputs = [ + fzf + xclip + ]; + + preInstall = '' + substituteInPlace unipicker \ + --replace-fail "/etc/unipickerrc" "$out/etc/unipickerrc" \ + --replace-fail "fzf" "${fzf}/bin/fzf" + substituteInPlace unipickerrc \ + --replace-fail "/usr/local" "$out" \ + --replace-fail "fzf" "${fzf}/bin/fzf" + ''; + + makeFlags = [ + "PREFIX=${placeholder "out"}" + "DESTDIR=${placeholder "out"}" + ]; + + meta = { + description = "A CLI utility for searching unicode characters by description and optionally copying them to clipboard"; + homepage = "https://github.com/jeremija/unipicker"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ sigmanificient ]; + platforms = lib.platforms.unix; + mainProgram = "unipicker"; + }; +}) diff --git a/pkgs/data/fonts/apl386/default.nix b/pkgs/data/fonts/apl386/default.nix index 15c61d41aa69..e1bab248f394 100644 --- a/pkgs/data/fonts/apl386/default.nix +++ b/pkgs/data/fonts/apl386/default.nix @@ -23,7 +23,7 @@ stdenvNoCC.mkDerivation { homepage = "https://abrudz.github.io/APL386/"; description = "APL385 Unicode font evolved"; license = lib.licenses.unlicense; - maintainers = with lib.maintainers; [ ]; + maintainers = with lib.maintainers; [ sigmanificient ]; platforms = lib.platforms.all; }; } diff --git a/pkgs/development/compilers/rasm/default.nix b/pkgs/development/compilers/rasm/default.nix index 3246e014145f..c131e4b79980 100644 --- a/pkgs/development/compilers/rasm/default.nix +++ b/pkgs/development/compilers/rasm/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { mainProgram = "rasm"; # use -n option to display all licenses license = licenses.mit; # expat version - maintainers = [ ]; + maintainers = with lib.maintainers; [ sigmanificient ]; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/parson/default.nix b/pkgs/development/libraries/parson/default.nix index 6ba47491ecb4..3ee5c73290a1 100644 --- a/pkgs/development/libraries/parson/default.nix +++ b/pkgs/development/libraries/parson/default.nix @@ -18,6 +18,6 @@ stdenv.mkDerivation { homepage = "https://github.com/kgabis/parson"; license = licenses.mit; platforms = platforms.all; - maintainers = [ ]; + maintainers = with lib.maintainers; [ sigmanificient ]; }; } diff --git a/pkgs/development/libraries/yyjson/default.nix b/pkgs/development/libraries/yyjson/default.nix index 82d4e1322f20..e1d42ccce7b6 100644 --- a/pkgs/development/libraries/yyjson/default.nix +++ b/pkgs/development/libraries/yyjson/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/ibireme/yyjson"; changelog = "https://github.com/ibireme/yyjson/blob/${finalAttrs.src.rev}/CHANGELOG.md"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ ]; + maintainers = with lib.maintainers; [ sigmanificient ]; platforms = lib.platforms.all; }; }) diff --git a/pkgs/development/misc/loc/default.nix b/pkgs/development/misc/loc/default.nix index 405c45cd4ae9..23453e92e7f8 100644 --- a/pkgs/development/misc/loc/default.nix +++ b/pkgs/development/misc/loc/default.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { description = "Count lines of code quickly"; mainProgram = "loc"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ ]; + maintainers = with lib.maintainers; [ sigmanificient ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/python-modules/gcovr/default.nix b/pkgs/development/python-modules/gcovr/default.nix index 7b8b32b2c5de..98051cc1a40c 100644 --- a/pkgs/development/python-modules/gcovr/default.nix +++ b/pkgs/development/python-modules/gcovr/default.nix @@ -46,6 +46,6 @@ buildPythonPackage rec { homepage = "https://www.gcovr.com/"; changelog = "https://github.com/gcovr/gcovr/blob/${version}/CHANGELOG.rst"; license = licenses.bsd0; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ sigmanificient ]; }; } diff --git a/pkgs/development/tools/misc/cppi/default.nix b/pkgs/development/tools/misc/cppi/default.nix index d8144dd5e9b0..ef783b748cbc 100644 --- a/pkgs/development/tools/misc/cppi/default.nix +++ b/pkgs/development/tools/misc/cppi/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl3Plus; - maintainers = [ ]; + maintainers = with lib.maintainers; [ sigmanificient ]; platforms = lib.platforms.all; }; } diff --git a/pkgs/shells/ksh/default.nix b/pkgs/shells/ksh/default.nix index cfd278aaca65..ae9dba16aedf 100644 --- a/pkgs/shells/ksh/default.nix +++ b/pkgs/shells/ksh/default.nix @@ -1,14 +1,23 @@ -{ lib, stdenv, meson, ninja, fetchFromGitHub, which, python3, fetchpatch -, libiconv }: +{ + lib, + stdenv, + meson, + ninja, + fetchFromGitHub, + which, + python3, + fetchpatch, + libiconv, +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ksh"; version = "2020.0.0"; src = fetchFromGitHub { - owner = "att"; - repo = "ast"; - rev = version; + owner = "att"; + repo = "ast"; + rev = finalAttrs.version; sha256 = "0cdxz0nhpq03gb9rd76fn0x1yzs2c8q289b7vcxnzlsrz1imz65j"; }; @@ -19,13 +28,18 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ meson ninja which python3 ]; + nativeBuildInputs = [ + meson + ninja + which + python3 + ]; buildInputs = [ libiconv ]; strictDeps = true; - meta = with lib; { + meta = { description = "KornShell Command And Programming Language"; longDescription = '' The KornShell language was designed and developed by David G. Korn at @@ -34,12 +48,12 @@ stdenv.mkDerivation rec { many different computers and workstations on which it is implemented. ''; homepage = "https://github.com/att/ast"; - license = licenses.cpl10; - maintainers = with maintainers; [ ]; - platforms = platforms.all; + license = lib.licenses.cpl10; + maintainers = with lib.maintainers; [ sigmanificient ]; + platforms = lib.platforms.all; }; passthru = { shellPath = "/bin/ksh"; }; -} +}) diff --git a/pkgs/tools/misc/wakatime/default.nix b/pkgs/tools/misc/wakatime/default.nix index be311cb2e28e..d27cfa112afc 100644 --- a/pkgs/tools/misc/wakatime/default.nix +++ b/pkgs/tools/misc/wakatime/default.nix @@ -44,7 +44,7 @@ buildGoModule rec { homepage = "https://wakatime.com/"; description = "WakaTime command line interface"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ sigmanificient ]; mainProgram = "wakatime-cli"; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 41373f6bbe80..3dfb71748bff 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2441,8 +2441,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - git-standup = callPackage ../applications/version-management/git-standup { }; - git-stree = callPackage ../applications/version-management/git-stree { }; git-subrepo = callPackage ../applications/version-management/git-subrepo { }; @@ -5346,8 +5344,6 @@ with pkgs; gb-backup = callPackage ../tools/backup/gamerbackup { }; - gbsplay = callPackage ../applications/audio/gbsplay { }; - gdrive = callPackage ../applications/networking/gdrive { }; gdrive3 = callPackage ../applications/networking/gdrive3 { }; @@ -31185,8 +31181,6 @@ with pkgs; python3Packages = python39Packages; }; - fte = callPackage ../applications/editors/fte { }; - g933-utils = callPackage ../tools/misc/g933-utils { }; gavrasm = callPackage ../development/compilers/gavrasm { }; @@ -31506,8 +31500,6 @@ with pkgs; hexdino = callPackage ../applications/editors/hexdino { }; - hexedit = callPackage ../applications/editors/hexedit { }; - hydrogen-web-unwrapped = callPackage ../applications/networking/instant-messengers/hydrogen-web/unwrapped.nix { }; hydrogen-web = callPackage ../applications/networking/instant-messengers/hydrogen-web/wrapper.nix { @@ -35074,8 +35066,6 @@ with pkgs; unigine-superposition = libsForQt5.callPackage ../applications/graphics/unigine-superposition { }; - unipicker = callPackage ../applications/misc/unipicker { }; - unpaper = callPackage ../tools/graphics/unpaper { }; unison-ucm = callPackage ../development/compilers/unison { };