diff --git a/pkgs/misc/base16-shell-preview/default.nix b/pkgs/by-name/ba/base16-shell-preview/package.nix similarity index 100% rename from pkgs/misc/base16-shell-preview/default.nix rename to pkgs/by-name/ba/base16-shell-preview/package.nix diff --git a/pkgs/applications/emulators/dosbox-staging/default.nix b/pkgs/by-name/do/dosbox-staging/package.nix similarity index 100% rename from pkgs/applications/emulators/dosbox-staging/default.nix rename to pkgs/by-name/do/dosbox-staging/package.nix diff --git a/pkgs/applications/terminal-emulators/germinal/default.nix b/pkgs/by-name/ge/germinal/package.nix similarity index 66% rename from pkgs/applications/terminal-emulators/germinal/default.nix rename to pkgs/by-name/ge/germinal/package.nix index aef24f675b1ae..4d7409bf4a43d 100644 --- a/pkgs/applications/terminal-emulators/germinal/default.nix +++ b/pkgs/by-name/ge/germinal/package.nix @@ -1,29 +1,35 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub -, autoreconfHook -, pkg-config , appstream-glib +, autoreconfHook , dbus , pango , pcre2 +, pkg-config , tmux , vte , wrapGAppsHook , nixosTests }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "germinal"; version = "26"; src = fetchFromGitHub { owner = "Keruspe"; repo = "Germinal"; - rev = "v${version}"; - sha256 = "sha256-HUi+skF4bJj5CY2cNTOC4tl7jhvpXYKqBx2rqKzjlo0="; + rev = "v${finalAttrs.version}"; + hash = "sha256-HUi+skF4bJj5CY2cNTOC4tl7jhvpXYKqBx2rqKzjlo0="; }; - nativeBuildInputs = [ autoreconfHook pkg-config wrapGAppsHook ]; + nativeBuildInputs = [ + autoreconfHook + pkg-config + wrapGAppsHook + ]; + buildInputs = [ appstream-glib dbus @@ -48,11 +54,12 @@ stdenv.mkDerivation rec { passthru.tests.test = nixosTests.terminal-emulators.germinal; - meta = with lib; { + meta = { description = "A minimal terminal emulator"; homepage = "https://github.com/Keruspe/Germinal"; - license = with licenses; gpl3Plus; - platforms = with platforms; unix; - maintainers = with maintainers; [ AndersonTorres ]; + license = lib.licenses.gpl3Plus; + mainProgram = "germinal"; + maintainers = with lib.maintainers; [ AndersonTorres ]; + platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/applications/misc/haunt/default.nix b/pkgs/by-name/ha/haunt/package.nix similarity index 85% rename from pkgs/applications/misc/haunt/default.nix rename to pkgs/by-name/ha/haunt/package.nix index c5794591edf68..989fce392b284 100644 --- a/pkgs/applications/misc/haunt/default.nix +++ b/pkgs/by-name/ha/haunt/package.nix @@ -3,6 +3,7 @@ , fetchurl , fetchpatch , autoreconfHook +, callPackage , guile , guile-commonmark , guile-reader @@ -10,12 +11,12 @@ , pkg-config }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "haunt"; version = "0.2.6"; src = fetchurl { - url = "https://files.dthompson.us/${pname}/${pname}-${version}.tar.gz"; + url = "https://files.dthompson.us/haunt/haunt-${finalAttrs.version}.tar.gz"; hash = "sha256-vPKLQ9hDJdimEAXwIBGgRRlefM8/77xFQoI+0J/lkNs="; }; @@ -40,6 +41,7 @@ stdenv.mkDerivation rec { makeWrapper pkg-config ]; + buildInputs = [ guile guile-commonmark @@ -55,14 +57,13 @@ stdenv.mkDerivation rec { --prefix GUILE_LOAD_COMPILED_PATH : "$out/${guile.siteCcacheDir}:$GUILE_LOAD_COMPILED_PATH" ''; - doInstallCheck = true; - installCheckPhase = '' - runHook preInstallCheck - $out/bin/haunt --version - runHook postInstallCheck - ''; + passthru = { + tests = { + expectVersion = callPackage ./tests/001-test-version.nix { }; + }; + }; - meta = with lib; { + meta = { homepage = "https://dthompson.us/projects/haunt.html"; description = "Guile-based static site generator"; longDescription = '' @@ -81,8 +82,8 @@ stdenv.mkDerivation rec { feeds, authors should feel empowered to tweak, replace, or create builders to do things that aren't provided out-of-the-box. ''; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ AndersonTorres AluisioASG ]; - platforms = guile.meta.platforms; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ AndersonTorres AluisioASG ]; + inherit (guile.meta) platforms; }; -} +}) diff --git a/pkgs/by-name/ha/haunt/tests/001-test-version.nix b/pkgs/by-name/ha/haunt/tests/001-test-version.nix new file mode 100644 index 0000000000000..726a7ac957133 --- /dev/null +++ b/pkgs/by-name/ha/haunt/tests/001-test-version.nix @@ -0,0 +1,21 @@ +{ lib +, stdenv +, haunt +}: + +stdenv.mkDerivation { + pname = "haunt-test-version"; + inherit (haunt) version; + + nativeBuildInputs = [ haunt ]; + + dontInstall = true; + + buildCommand = '' + haunt --version + + touch $out + ''; + + meta.timeout = 10; +} diff --git a/pkgs/applications/terminal-emulators/havoc/default.nix b/pkgs/by-name/ha/havoc/package.nix similarity index 58% rename from pkgs/applications/terminal-emulators/havoc/default.nix rename to pkgs/by-name/ha/havoc/package.nix index fa161a8147493..ed9f77ec56562 100644 --- a/pkgs/applications/terminal-emulators/havoc/default.nix +++ b/pkgs/by-name/ha/havoc/package.nix @@ -3,19 +3,19 @@ , fetchFromGitHub , libxkbcommon , pkg-config +, wayland , wayland-protocols , wayland-scanner -, wayland }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "havoc"; version = "0.5.0"; src = fetchFromGitHub { owner = "ii8"; - repo = pname; - rev = version; + repo = "havoc"; + rev = finalAttrs.version; hash = "sha256-jvGm2gFdMS61otETF7gOEpYn6IuLfqI95IpEVfIv+C4="; }; @@ -38,19 +38,19 @@ stdenv.mkDerivation rec { installFlags = [ "PREFIX=$$out" ]; postInstall = '' - install -D -m 644 havoc.cfg -t $out/etc/${pname}/ - install -D -m 644 README.md -t $out/share/doc/${pname}-${version}/ + install -Dm 644 havoc.cfg -t $out/etc/havoc/ + install -Dm 644 README.md -t $out/share/doc/havoc-${finalAttrs.version}/ ''; enableParallelBuilding = true; - meta = with lib; { + meta = { homepage = "https://github.com/ii8/havoc"; description = "A minimal terminal emulator for Wayland"; - license = with licenses; [ mit publicDomain ]; - platforms = with platforms; unix; - maintainers = with maintainers; [ AndersonTorres ]; - # fatal error: 'sys/epoll.h' file not found - broken = stdenv.isDarwin; + license = with lib.licenses; [ mit publicDomain ]; + mainProgram = "havoc"; + maintainers = with lib.maintainers; [ AndersonTorres ]; + inherit (wayland.meta) platforms; + broken = stdenv.isDarwin; # fatal error: 'sys/epoll.h' file not found }; -} +}) diff --git a/pkgs/applications/terminal-emulators/kermit-terminal/default.nix b/pkgs/by-name/ke/kermit-terminal/package.nix similarity index 75% rename from pkgs/applications/terminal-emulators/kermit-terminal/default.nix rename to pkgs/by-name/ke/kermit-terminal/package.nix index 4bcd3191af7dc..a0c0008917a46 100644 --- a/pkgs/applications/terminal-emulators/kermit-terminal/default.nix +++ b/pkgs/by-name/ke/kermit-terminal/package.nix @@ -15,11 +15,13 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "orhun"; - repo = finalAttrs.pname; + repo = "kermit"; rev = finalAttrs.version; hash = "sha256-XPHF33Nu+H8OcQFwsuUOhDBDWKm8sh5B36sfROeSWPg="; }; + outputs = [ "out" "man" ]; + nativeBuildInputs = [ cmake pkg-config @@ -33,12 +35,13 @@ stdenv.mkDerivation (finalAttrs: { passthru.tests.test = nixosTests.terminal-emulators.kermit; - meta = with lib; { + meta = { homepage = "https://github.com/orhun/kermit"; description = "A VTE-based, simple and froggy terminal emulator"; changelog = "https://github.com/orhun/kermit/releases/tag/${finalAttrs.version}"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ AndersonTorres ]; - platforms = with platforms; unix; + license = lib.licenses.gpl3Only; + mainProgram = "kermit"; + maintainers = with lib.maintainers; [ AndersonTorres ]; + platforms = lib.platforms.unix; }; }) diff --git a/pkgs/tools/text/pru/Gemfile b/pkgs/by-name/pr/pru/Gemfile similarity index 100% rename from pkgs/tools/text/pru/Gemfile rename to pkgs/by-name/pr/pru/Gemfile diff --git a/pkgs/tools/text/pru/Gemfile.lock b/pkgs/by-name/pr/pru/Gemfile.lock similarity index 100% rename from pkgs/tools/text/pru/Gemfile.lock rename to pkgs/by-name/pr/pru/Gemfile.lock diff --git a/pkgs/tools/text/pru/gemset.nix b/pkgs/by-name/pr/pru/gemset.nix similarity index 100% rename from pkgs/tools/text/pru/gemset.nix rename to pkgs/by-name/pr/pru/gemset.nix diff --git a/pkgs/tools/text/pru/default.nix b/pkgs/by-name/pr/pru/package.nix similarity index 100% rename from pkgs/tools/text/pru/default.nix rename to pkgs/by-name/pr/pru/package.nix diff --git a/pkgs/tools/text/pyp/default.nix b/pkgs/by-name/py/pyp/package.nix similarity index 100% rename from pkgs/tools/text/pyp/default.nix rename to pkgs/by-name/py/pyp/package.nix diff --git a/pkgs/tools/text/robodoc/default.nix b/pkgs/by-name/ro/robodoc/package.nix similarity index 91% rename from pkgs/tools/text/robodoc/default.nix rename to pkgs/by-name/ro/robodoc/package.nix index 83881cee29b34..bc64a8315fe3e 100644 --- a/pkgs/tools/text/robodoc/default.nix +++ b/pkgs/by-name/ro/robodoc/package.nix @@ -4,15 +4,15 @@ , autoreconfHook }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "robodoc"; version = "4.99.44"; src = fetchFromGitHub { owner = "gumpu"; repo = "ROBODoc"; - rev = "v${version}"; - sha256 = "l3prSdaGhOvXmZfCPbsZJNocO7y20zJjLQpajRTJOqE="; + rev = "v${finalAttrs.version}"; + hash = "sha256-l3prSdaGhOvXmZfCPbsZJNocO7y20zJjLQpajRTJOqE="; }; postConfigure = lib.optionalString stdenv.isDarwin '' @@ -48,6 +48,6 @@ stdenv.mkDerivation rec { ''; license = with licenses; gpl3Plus; maintainers = with maintainers; [ AndersonTorres ]; - platforms = with platforms; all; + platforms = platforms.all; }; -} +}) diff --git a/pkgs/tools/text/rs/default.nix b/pkgs/by-name/rs/rs/package.nix similarity index 100% rename from pkgs/tools/text/rs/default.nix rename to pkgs/by-name/rs/rs/package.nix diff --git a/pkgs/tools/text/rst2html5/default.nix b/pkgs/by-name/rs/rst2html5/package.nix similarity index 100% rename from pkgs/tools/text/rst2html5/default.nix rename to pkgs/by-name/rs/rst2html5/package.nix diff --git a/pkgs/misc/scimark/default.nix b/pkgs/by-name/sc/scimark/package.nix similarity index 53% rename from pkgs/misc/scimark/default.nix rename to pkgs/by-name/sc/scimark/package.nix index 5726556e687fe..c9a88e6d2b59e 100644 --- a/pkgs/misc/scimark/default.nix +++ b/pkgs/by-name/sc/scimark/package.nix @@ -4,12 +4,12 @@ , unzip }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "scimark"; version = "4c"; src = fetchurl { - url = "https://math.nist.gov/scimark2/${pname}${version}.zip"; + url = "https://math.nist.gov/scimark2/scimark${finalAttrs.version}.zip"; hash = "sha256-kcg5vKYp0B7+bC/CmFMO/tMwxf9q6nvuFv0vRSy3MbE="; }; @@ -20,17 +20,21 @@ stdenv.mkDerivation rec { dontConfigure = true; installPhase = '' - install -d $out/bin/ - install scimark4 $out/bin/ + runHook preInstall + + install -Dm755 scimark4 -t $out/bin/ + + runHook postInstall ''; - meta = with lib; { + meta = { homepage = "https://math.nist.gov/scimark2/index.html"; description = "Scientific and numerical computing benchmark (ANSI C version)"; - license = licenses.publicDomain; - maintainers = with maintainers; [ AndersonTorres ]; + downloadPage = "https://math.nist.gov/scimark2/download_c.html"; + license = lib.licenses.publicDomain; mainProgram = "scimark4"; - platforms = platforms.all; + maintainers = with lib.maintainers; [ AndersonTorres ]; + platforms = lib.platforms.all; }; -} +}) # TODO [ AndersonTorres ]: Java version diff --git a/pkgs/misc/sound-of-sorting/default.nix b/pkgs/by-name/so/sound-of-sorting/package.nix similarity index 73% rename from pkgs/misc/sound-of-sorting/default.nix rename to pkgs/by-name/so/sound-of-sorting/package.nix index 23529f6b0a185..c6cb6e6a1cf90 100644 --- a/pkgs/misc/sound-of-sorting/default.nix +++ b/pkgs/by-name/so/sound-of-sorting/package.nix @@ -7,9 +7,9 @@ , darwin }: -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "sound-of-sorting"; - version = "unstable-2022-10-12"; + version = "0.6.5-unstable-2022-10-12"; src = fetchFromGitHub { owner = "bingmann"; @@ -26,13 +26,16 @@ stdenv.mkDerivation { wxGTK32 SDL2 ] - ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Cocoa ; + ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Cocoa + ]; meta = { description = "Audibilization and Visualization of Sorting Algorithms"; homepage = "https://panthema.net/2013/sound-of-sorting/"; license = lib.licenses.gpl3Plus; + mainProgram = "sound-of-sorting"; maintainers = with lib.maintainers; [ AndersonTorres ]; - platforms = lib.platforms.unix; + inherit (SDL2.meta) platforms; }; -} +}) diff --git a/pkgs/applications/terminal-emulators/tilda/default.nix b/pkgs/by-name/ti/tilda/package.nix similarity index 62% rename from pkgs/applications/terminal-emulators/tilda/default.nix rename to pkgs/by-name/ti/tilda/package.nix index 01cc4f527a91e..031d3225a3911 100644 --- a/pkgs/applications/terminal-emulators/tilda/default.nix +++ b/pkgs/by-name/ti/tilda/package.nix @@ -1,40 +1,47 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , autoreconfHook -, pkg-config , expat , gettext -, gtk +, gtk3 , libconfuse +, makeWrapper , pcre2 +, pkg-config , vte -, makeWrapper , nixosTests }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "tilda"; version = "1.5.4"; src = fetchFromGitHub { owner = "lanoxx"; repo = "tilda"; - rev = "${pname}-${version}"; - sha256 = "sha256-uDx28jmjNUyzJbgTJiHbjI9U5mYb9bnfl/9AjbxNUWA="; + rev = "tilda-${finalAttrs.version}"; + hash = "sha256-uDx28jmjNUyzJbgTJiHbjI9U5mYb9bnfl/9AjbxNUWA="; }; - nativeBuildInputs = [ autoreconfHook makeWrapper pkg-config ]; + nativeBuildInputs = [ + autoreconfHook + makeWrapper + pkg-config + ]; + buildInputs = [ gettext - gtk + gtk3 libconfuse pcre2 vte ]; - LD_LIBRARY_PATH = "${expat.out}/lib"; # ugly hack for xgettext to work during build + # ugly hack for xgettext to work during build + env.LD_LIBRARY_PATH = "${lib.getLib expat}/lib"; - # The config locking scheme relies on the binary being called "tilda", + # The config locking scheme relies on the binary being called "tilda" # (`pgrep -C tilda`), so a simple `wrapProgram` won't suffice: postInstall = '' mkdir $out/bin/wrapped @@ -45,12 +52,11 @@ stdenv.mkDerivation rec { passthru.tests.test = nixosTests.terminal-emulators.tilda; - meta = with lib; { - description = "A Gtk based drop down terminal for Linux and Unix"; + meta = { homepage = "https://github.com/lanoxx/tilda/"; - license = licenses.gpl3Plus; - maintainers = [ maintainers.AndersonTorres ]; - platforms = platforms.linux; + description = "A Gtk based drop down terminal for Linux and Unix"; + license = lib.licenses.gpl3Plus; + maintainers = [ lib.maintainers.AndersonTorres ]; + platforms = lib.platforms.linux; }; -} - +}) diff --git a/pkgs/tools/text/txr/default.nix b/pkgs/by-name/tx/txr/package.nix similarity index 100% rename from pkgs/tools/text/txr/default.nix rename to pkgs/by-name/tx/txr/package.nix diff --git a/pkgs/os-specific/linux/uclibc-ng/default.nix b/pkgs/by-name/uc/uclibc-ng/package.nix similarity index 91% rename from pkgs/os-specific/linux/uclibc-ng/default.nix rename to pkgs/by-name/uc/uclibc-ng/package.nix index 43c9bbfa8f3f6..b1d4a6474e213 100644 --- a/pkgs/os-specific/linux/uclibc-ng/default.nix +++ b/pkgs/by-name/uc/uclibc-ng/package.nix @@ -56,12 +56,12 @@ let UCLIBC_HAS_FPU n ''; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "uclibc-ng"; version = "1.0.44"; src = fetchurl { - url = "https://downloads.uclibc-ng.org/releases/${version}/uClibc-ng-${version}.tar.xz"; + url = "https://downloads.uclibc-ng.org/releases/${finalAttrs.version}/uClibc-ng-${finalAttrs.version}.tar.xz"; sha256 = "sha256-ffnZh5VYJzgvHCQA2lE0Vr7Ltvhovf03c3Jl8cvuyZQ="; }; @@ -108,7 +108,13 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with lib; { + passthru = { + # Derivations may check for the existance of this attribute, to know what to + # link to. + libiconv = libiconvReal; + }; + + meta = { homepage = "https://uclibc-ng.org"; description = "Embedded C library"; longDescription = '' @@ -126,16 +132,9 @@ stdenv.mkDerivation rec { processors. Alpha, FR-V, HPPA, IA64, LM32, NIOS2, Tile and Sparc64 are experimental and need more testing. ''; - license = licenses.lgpl2Plus; - maintainers = with maintainers; [ rasendubi AndersonTorres ]; - platforms = platforms.linux; - badPlatforms = platforms.aarch64; + license = lib.licenses.lgpl2Plus; + maintainers = with lib.maintainers; [ rasendubi AndersonTorres ]; + platforms = lib.platforms.linux; + badPlatforms = lib.platforms.aarch64; }; - - passthru = { - # Derivations may check for the existance of this attribute, to know what to - # link to. - libiconv = libiconvReal; - }; - -} +}) diff --git a/pkgs/misc/screensavers/xscreensaver/default.nix b/pkgs/by-name/xs/xscreensaver/package.nix similarity index 100% rename from pkgs/misc/screensavers/xscreensaver/default.nix rename to pkgs/by-name/xs/xscreensaver/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b05e6813e1dc1..fd8602077e7d2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2623,8 +2623,6 @@ with pkgs; SDL = if stdenv.isDarwin then SDL else SDL_compat; }; - dosbox-staging = callPackage ../applications/emulators/dosbox-staging { }; - dosbox-x = darwin.apple_sdk_11_0.callPackage ../applications/emulators/dosbox-x { inherit (darwin.apple_sdk_11_0.frameworks) AudioUnit Carbon Cocoa; }; @@ -3009,18 +3007,12 @@ with pkgs; foot = callPackage ../applications/terminal-emulators/foot { }; - germinal = callPackage ../applications/terminal-emulators/germinal { }; - guake = callPackage ../applications/terminal-emulators/guake { }; - havoc = callPackage ../applications/terminal-emulators/havoc { }; - hyper = callPackage ../applications/terminal-emulators/hyper { }; iterm2 = callPackage ../applications/terminal-emulators/iterm2 { }; - kermit-terminal = callPackage ../applications/terminal-emulators/kermit-terminal { }; - kitty = darwin.apple_sdk_11_0.callPackage ../applications/terminal-emulators/kitty { go = go_1_21; harfbuzz = harfbuzz.override { withCoreText = stdenv.isDarwin; }; @@ -3091,10 +3083,6 @@ with pkgs; termonad = callPackage ../applications/terminal-emulators/termonad { }; - tilda = callPackage ../applications/terminal-emulators/tilda { - gtk = gtk3; - }; - tilix = callPackage ../applications/terminal-emulators/tilix { }; tym = callPackage ../applications/terminal-emulators/tym { }; @@ -4271,8 +4259,6 @@ with pkgs; bar = callPackage ../tools/system/bar { }; - base16-shell-preview = callPackage ../misc/base16-shell-preview { }; - base16-builder = callPackage ../misc/base16-builder { }; basex = callPackage ../tools/text/xml/basex { }; @@ -8902,8 +8888,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - robodoc = callPackage ../tools/text/robodoc { }; - grive2 = callPackage ../tools/filesystems/grive2 { }; groff = callPackage ../tools/text/groff { }; @@ -12665,10 +12649,6 @@ with pkgs; rlci = callPackage ../development/interpreters/rlci { }; - rs = callPackage ../tools/text/rs { }; - - rst2html5 = callPackage ../tools/text/rst2html5 { }; - rst2pdf = with python3Packages; toPythonApplication rst2pdf; rstcheck = with python3Packages; toPythonApplication rstcheck; @@ -13022,8 +13002,6 @@ with pkgs; scream = callPackage ../applications/audio/scream { }; - scimark = callPackage ../misc/scimark { }; - screen = callPackage ../tools/misc/screen { inherit (darwin.apple_sdk.libs) utmp; }; @@ -14213,8 +14191,6 @@ with pkgs; twurl = callPackage ../tools/misc/twurl { }; - txr = callPackage ../tools/text/txr { }; - txt2man = callPackage ../tools/misc/txt2man { }; txt2tags = callPackage ../tools/text/txt2tags { }; @@ -24564,10 +24540,6 @@ with pkgs; buildPythonApplication click future six; }; - pyp = callPackage ../tools/text/pyp { }; - - pru = callPackage ../tools/text/pru { }; - prospector = callPackage ../development/tools/prospector { }; protobuf = protobuf3_24; @@ -28894,9 +28866,7 @@ with pkgs; buildBarebox bareboxTools; - uclibc-ng = callPackage ../os-specific/linux/uclibc-ng { }; - - uclibc-ng-cross = callPackage ../os-specific/linux/uclibc-ng { + uclibc-ng-cross = uclibc-ng.override { stdenv = crossLibcStdenv; }; @@ -32461,8 +32431,6 @@ with pkgs; wxGTK = wxGTK32; }; - haunt = callPackage ../applications/misc/haunt { }; - huggle = libsForQt5.callPackage ../applications/misc/huggle { }; hugo = callPackage ../applications/misc/hugo { }; @@ -36794,8 +36762,6 @@ with pkgs; xscope = callPackage ../applications/misc/xscope { }; - xscreensaver = callPackage ../misc/screensavers/xscreensaver { }; - xsubfind3r = callPackage ../tools/security/xsubfind3r { }; xsuspender = callPackage ../applications/misc/xsuspender { }; @@ -41117,8 +41083,6 @@ with pkgs; soundmodem = callPackage ../applications/radio/soundmodem { }; - sound-of-sorting = callPackage ../misc/sound-of-sorting { }; - sourceAndTags = callPackage ../misc/source-and-tags { hasktags = haskellPackages.hasktags; };