diff options
Diffstat (limited to 'pkgs')
55 files changed, 168 insertions, 46 deletions
diff --git a/pkgs/applications/audio/cadence/default.nix b/pkgs/applications/audio/cadence/default.nix index ebf72588df0d1..a5d1a783b4124 100644 --- a/pkgs/applications/audio/cadence/default.nix +++ b/pkgs/applications/audio/cadence/default.nix @@ -107,5 +107,6 @@ mkDerivation rec { license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ ]; platforms = [ "x86_64-linux" ]; + mainProgram = "cadence"; }; } diff --git a/pkgs/applications/audio/cava/default.nix b/pkgs/applications/audio/cava/default.nix index 752e1d2dfcfa2..e898f17d9345c 100644 --- a/pkgs/applications/audio/cava/default.nix +++ b/pkgs/applications/audio/cava/default.nix @@ -28,5 +28,6 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = with maintainers; [ offline mirrexagon ]; platforms = platforms.linux; + mainProgram = "cava"; }; } diff --git a/pkgs/applications/audio/easyeffects/default.nix b/pkgs/applications/audio/easyeffects/default.nix index faffd14576ae5..ac286d499f1a2 100644 --- a/pkgs/applications/audio/easyeffects/default.nix +++ b/pkgs/applications/audio/easyeffects/default.nix @@ -107,5 +107,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ ]; platforms = platforms.linux; + mainProgram = "easyeffects"; }; } diff --git a/pkgs/applications/audio/helvum/default.nix b/pkgs/applications/audio/helvum/default.nix index c293c3384d57a..76a1ce2d27ead 100644 --- a/pkgs/applications/audio/helvum/default.nix +++ b/pkgs/applications/audio/helvum/default.nix @@ -58,5 +58,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Only; maintainers = with maintainers; [ fufexan ]; platforms = platforms.linux; + mainProgram = "helvum"; }; } diff --git a/pkgs/applications/audio/lollypop/default.nix b/pkgs/applications/audio/lollypop/default.nix index 005bef77d4567..34dbf0318a71c 100644 --- a/pkgs/applications/audio/lollypop/default.nix +++ b/pkgs/applications/audio/lollypop/default.nix @@ -106,5 +106,6 @@ python3.pkgs.buildPythonApplication rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ lovesegfault ]; platforms = platforms.linux; + mainProgram = "lollypop"; }; } diff --git a/pkgs/applications/audio/mpc/default.nix b/pkgs/applications/audio/mpc/default.nix index cebf08f19084c..9f7d8a06e206b 100644 --- a/pkgs/applications/audio/mpc/default.nix +++ b/pkgs/applications/audio/mpc/default.nix @@ -58,5 +58,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; maintainers = with maintainers; [ AndersonTorres ]; platforms = with platforms; unix; + mainProgram = "mpc"; }; } diff --git a/pkgs/applications/audio/mpdevil/default.nix b/pkgs/applications/audio/mpdevil/default.nix index 35fe314958c74..92f66d375d3bd 100644 --- a/pkgs/applications/audio/mpdevil/default.nix +++ b/pkgs/applications/audio/mpdevil/default.nix @@ -51,5 +51,6 @@ python3Packages.buildPythonApplication rec { license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = with maintainers; [ apfelkuchen6 ]; + mainProgram = "mpdevil"; }; } diff --git a/pkgs/applications/audio/ncmpcpp/default.nix b/pkgs/applications/audio/ncmpcpp/default.nix index e97bb2c130e55..e88ce8c9e3397 100644 --- a/pkgs/applications/audio/ncmpcpp/default.nix +++ b/pkgs/applications/audio/ncmpcpp/default.nix @@ -48,5 +48,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; maintainers = with maintainers; [ jfrankenau koral lovek323 ]; platforms = platforms.all; + mainProgram = "ncmpcpp"; }; } diff --git a/pkgs/applications/audio/pavucontrol/default.nix b/pkgs/applications/audio/pavucontrol/default.nix index d57c56a2adb71..5cec295d0a75f 100644 --- a/pkgs/applications/audio/pavucontrol/default.nix +++ b/pkgs/applications/audio/pavucontrol/default.nix @@ -51,5 +51,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ abbradar globin ]; platforms = platforms.linux; + mainProgram = "pavucontrol"; }; } diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix index 398d3a6ad9700..df6d762c65efd 100644 --- a/pkgs/applications/audio/spotify/default.nix +++ b/pkgs/applications/audio/spotify/default.nix @@ -15,6 +15,7 @@ let sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ]; + mainProgram = "spotify"; }; in if stdenv.isDarwin diff --git a/pkgs/applications/audio/strawberry/default.nix b/pkgs/applications/audio/strawberry/default.nix index ee9cf4ff3d31d..25193d1b78e43 100644 --- a/pkgs/applications/audio/strawberry/default.nix +++ b/pkgs/applications/audio/strawberry/default.nix @@ -116,5 +116,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ peterhoeg ]; # upstream says darwin should work but they lack maintainers as of 0.6.6 platforms = platforms.linux; + mainProgram = "strawberry"; }; } diff --git a/pkgs/applications/audio/tageditor/default.nix b/pkgs/applications/audio/tageditor/default.nix index efac5170249e4..4360defc18d43 100644 --- a/pkgs/applications/audio/tageditor/default.nix +++ b/pkgs/applications/audio/tageditor/default.nix @@ -50,5 +50,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2; maintainers = [ maintainers.matthiasbeyer ]; platforms = platforms.linux; + mainProgram = "tageditor"; }; } diff --git a/pkgs/applications/audio/youtube-music/default.nix b/pkgs/applications/audio/youtube-music/default.nix index 802af13137fa4..91cf74e65d0cd 100644 --- a/pkgs/applications/audio/youtube-music/default.nix +++ b/pkgs/applications/audio/youtube-music/default.nix @@ -34,5 +34,6 @@ appimageTools.wrapType2 rec { sourceProvenance = with sourceTypes; [ binaryNativeCode ]; platforms = platforms.linux; maintainers = [ maintainers.aacebedo ]; + mainProgram = "youtube-music"; }; } diff --git a/pkgs/applications/audio/ytmdesktop/default.nix b/pkgs/applications/audio/ytmdesktop/default.nix index be2b85199b7b6..534bee41a9830 100644 --- a/pkgs/applications/audio/ytmdesktop/default.nix +++ b/pkgs/applications/audio/ytmdesktop/default.nix @@ -32,5 +32,6 @@ in appimageTools.wrapType2 rec { license = licenses.cc0; platforms = platforms.linux; maintainers = [ maintainers.lgcl ]; + mainProgram = "ytmdesktop"; }; } diff --git a/pkgs/applications/misc/rofi-rbw/default.nix b/pkgs/applications/misc/rofi-rbw/default.nix index 02bae9322907f..0aac8045023c2 100644 --- a/pkgs/applications/misc/rofi-rbw/default.nix +++ b/pkgs/applications/misc/rofi-rbw/default.nix @@ -31,5 +31,6 @@ buildPythonApplication rec { license = licenses.mit; maintainers = with maintainers; [ equirosa dit7ya ]; platforms = platforms.linux; + mainProgram = "rofi-rbw"; }; } diff --git a/pkgs/applications/networking/instant-messengers/armcord/default.nix b/pkgs/applications/networking/instant-messengers/armcord/default.nix index f6fd6553c7f3d..82da4dedc943c 100644 --- a/pkgs/applications/networking/instant-messengers/armcord/default.nix +++ b/pkgs/applications/networking/instant-messengers/armcord/default.nix @@ -136,5 +136,6 @@ stdenv.mkDerivation rec { license = licenses.osl3; maintainers = with maintainers; [ wrmilling ]; platforms = [ "x86_64-linux" "aarch64-linux" ]; + mainProgram = "armcord"; }; } diff --git a/pkgs/applications/networking/instant-messengers/caprine-bin/default.nix b/pkgs/applications/networking/instant-messengers/caprine-bin/default.nix index c6e020cdc2526..dc32382113bd0 100644 --- a/pkgs/applications/networking/instant-messengers/caprine-bin/default.nix +++ b/pkgs/applications/networking/instant-messengers/caprine-bin/default.nix @@ -21,5 +21,6 @@ in passthru = (oldAttrs.passthru or { }) // { inherit x86_64-appimage x86_64-dmg; }; meta = oldAttrs.meta // { platforms = x86_64-appimage.meta.platforms ++ x86_64-dmg.meta.platforms; + mainProgram = "caprine"; }; }) diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index e56a47a3ff4d1..8bc1c7cb5984b 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -61,6 +61,7 @@ let license = licenses.unfree; maintainers = with maintainers; [ MP2E Scrumplex artturin infinidoge jopejoe1 ]; platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ]; + mainProgram = "discord"; }; package = if stdenv.isLinux diff --git a/pkgs/applications/networking/instant-messengers/element/element-desktop.nix b/pkgs/applications/networking/instant-messengers/element/element-desktop.nix index 3f2d5a99fe67a..f3ec46f3641c0 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-desktop.nix +++ b/pkgs/applications/networking/instant-messengers/element/element-desktop.nix @@ -149,5 +149,6 @@ stdenv.mkDerivation (finalAttrs: builtins.removeAttrs pinData [ "hashes" ] // { license = licenses.asl20; maintainers = teams.matrix.members; inherit (electron.meta) platforms; + mainProgram = "element-desktop"; }; }) diff --git a/pkgs/applications/networking/instant-messengers/slack-term/default.nix b/pkgs/applications/networking/instant-messengers/slack-term/default.nix index e2135734bd7f0..99b8b4563d232 100644 --- a/pkgs/applications/networking/instant-messengers/slack-term/default.nix +++ b/pkgs/applications/networking/instant-messengers/slack-term/default.nix @@ -17,5 +17,6 @@ buildGoModule rec { homepage = "https://github.com/erroneousboat/slack-term"; license = licenses.mit; maintainers = with maintainers; [ dtzWill ]; + mainProgram = "slack-term"; }; } diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/pkgs/applications/networking/instant-messengers/slack/default.nix index 44846df1c7408..3a03a5fce847b 100644 --- a/pkgs/applications/networking/instant-messengers/slack/default.nix +++ b/pkgs/applications/networking/instant-messengers/slack/default.nix @@ -85,6 +85,7 @@ let license = licenses.unfree; maintainers = with maintainers; [ mmahut maxeaubrey ]; platforms = [ "x86_64-darwin" "x86_64-linux" "aarch64-darwin" ]; + mainProgram = "slack"; }; linux = stdenv.mkDerivation rec { diff --git a/pkgs/applications/networking/instant-messengers/teams/default.nix b/pkgs/applications/networking/instant-messengers/teams/default.nix index 1f21891c799e7..be4334438c330 100644 --- a/pkgs/applications/networking/instant-messengers/teams/default.nix +++ b/pkgs/applications/networking/instant-messengers/teams/default.nix @@ -39,6 +39,7 @@ let license = licenses.unfree; maintainers = with maintainers; [ liff tricktron ]; platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ]; + mainProgram = "teams"; }; linux = stdenv.mkDerivation rec { diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix index 4de6ce1bce4cb..7a7835ede42c8 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix @@ -209,5 +209,6 @@ stdenv.mkDerivation rec { homepage = "https://desktop.telegram.org/"; changelog = "https://github.com/telegramdesktop/tdesktop/releases/tag/v${version}"; maintainers = with maintainers; [ nickcao ]; + mainProgram = "telegram-desktop"; }; } diff --git a/pkgs/applications/science/logic/hol_light/default.nix b/pkgs/applications/science/logic/hol_light/default.nix index 9f379252fd529..5f4bc89db397c 100644 --- a/pkgs/applications/science/logic/hol_light/default.nix +++ b/pkgs/applications/science/logic/hol_light/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, runtimeShell, fetchFromGitHub, fetchpatch, ocaml, num, camlp5 }: +{ lib, stdenv, runtimeShell, fetchFromGitHub, fetchpatch, ocaml, findlib, num, camlp5, camlp-streams }: let load_num = @@ -15,19 +15,23 @@ let exec ${ocaml}/bin/ocaml \ -I \`${camlp5}/bin/camlp5 -where\` \ ${load_num} \ + -I ${camlp-streams}/lib/ocaml/${ocaml.version}/site-lib/camlp-streams camlp_streams.cma -init make.ml ''; in +lib.throwIf (lib.versionAtLeast ocaml.version "5.0") + "hol_light is not available for OCaml ${ocaml.version}" + stdenv.mkDerivation { pname = "hol_light"; - version = "unstable-2019-10-06"; + version = "unstable-2023-07-21"; src = fetchFromGitHub { owner = "jrh13"; repo = "hol-light"; - rev = "5c91b2ded8a66db571824ecfc18b4536c103b23e"; - sha256 = "0sxsk8z08ba0q5aixdyczcx5l29lb51ba4ip3d2fry7y604kjsx6"; + rev = "29b3e114f5c166584f4fbcfd1e1f9b13a25b7349"; + hash = "sha256-Z5/4dCfLRwLMHBmth3xMdFW1M6NzUT/aPEEwSz1/S2E="; }; patches = [ @@ -39,8 +43,8 @@ stdenv.mkDerivation { strictDeps = true; - nativeBuildInputs = [ ocaml camlp5 ]; - propagatedBuildInputs = [ num ]; + nativeBuildInputs = [ ocaml findlib camlp5 ]; + propagatedBuildInputs = [ camlp-streams num ]; installPhase = '' mkdir -p "$out/lib/hol_light" "$out/bin" diff --git a/pkgs/data/fonts/sketchybar-app-font/default.nix b/pkgs/data/fonts/sketchybar-app-font/default.nix new file mode 100644 index 0000000000000..77b352e33d9a2 --- /dev/null +++ b/pkgs/data/fonts/sketchybar-app-font/default.nix @@ -0,0 +1,34 @@ +{ lib +, stdenvNoCC +, fetchurl +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "sketchybar-app-font"; + version = "1.0.13"; + + src = fetchurl { + url = "https://github.com/kvndrsslr/sketchybar-app-font/releases/download/v${finalAttrs.version}/sketchybar-app-font.ttf"; + hash = "sha256-vlvSrN6yxabKnzPmqI9VNkOdR3yLa1QUieZjOOW6w3c="; + }; + + dontUnpack = true; + + installPhase = '' + runHook preInstall + + install -Dm644 $src $out/share/fonts/truetype/sketchybar-app-font.ttf + + runHook postInstall + ''; + + meta = { + description = "A ligature-based symbol font and a mapping function for sketchybar"; + longDescription = '' + A ligature-based symbol font and a mapping function for sketchybar, inspired by simple-bar's usage of community-contributed minimalistic app icons. + ''; + homepage = "https://github.com/kvndrsslr/sketchybar-app-font"; + license = lib.licenses.unlicense; + maintainers = with lib.maintainers; [ khaneliman ]; + }; +}) diff --git a/pkgs/development/guile-modules/guile-commonmark/default.nix b/pkgs/development/guile-modules/guile-commonmark/default.nix index 113fad13600cd..c103635d37afe 100644 --- a/pkgs/development/guile-modules/guile-commonmark/default.nix +++ b/pkgs/development/guile-modules/guile-commonmark/default.nix @@ -4,22 +4,24 @@ , autoreconfHook , guile , pkg-config +, texinfo }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "guile-commonmark"; - version = "0.1.2"; + version = "unstable-2020-04-30"; src = fetchFromGitHub { owner = "OrangeShark"; - repo = pname; - rev = "v${version}"; - hash = "sha256-qYDcIiObKOU8lmcfk327LMPx/2Px9ecI3QLrSWWLxMo="; + repo = "guile-commonmark"; + rev = "538ffea25ca69d9f3ee17033534ba03cc27ba468"; + hash = "sha256-9cA7iQ/GGEx+HwsdAxKC3IssqkT/Yg8ZxaiIprS5VuI="; }; nativeBuildInputs = [ autoreconfHook pkg-config + texinfo # for makeinfo ]; buildInputs = [ guile diff --git a/pkgs/development/guile-modules/guile-git/default.nix b/pkgs/development/guile-modules/guile-git/default.nix index b106b8ad1c946..84d53b66e19b4 100644 --- a/pkgs/development/guile-modules/guile-git/default.nix +++ b/pkgs/development/guile-modules/guile-git/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ libgit2 scheme-bytestructures ]; - doCheck = true; + doCheck = !stdenv.isDarwin; makeFlags = [ "GUILE_AUTO_COMPILE=0" ]; enableParallelBuilding = true; diff --git a/pkgs/development/guile-modules/guile-lib/default.nix b/pkgs/development/guile-modules/guile-lib/default.nix index 6d6a88808e382..2678bcb2c058c 100644 --- a/pkgs/development/guile-modules/guile-lib/default.nix +++ b/pkgs/development/guile-modules/guile-lib/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { makeFlags = [ "GUILE_AUTO_COMPILE=0" ]; - doCheck = true; + doCheck = !stdenv.isDarwin; preCheck = '' # Make `libgcc_s.so' visible for `pthread_cancel'. diff --git a/pkgs/development/guile-modules/guile-ncurses/default.nix b/pkgs/development/guile-modules/guile-ncurses/default.nix index abfa144ee57c0..f982ff600b8bc 100644 --- a/pkgs/development/guile-modules/guile-ncurses/default.nix +++ b/pkgs/development/guile-modules/guile-ncurses/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "guile-ncurses"; - version = "1.7"; + version = "3.1"; src = fetchurl { url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz"; - hash = "sha256-JZPNoQuIl5XayUpm0RdWNg8TT2LZGDOuFoae9crZe5Q="; + hash = "sha256-7onozq/Kud0O8/wazJsQ9NIbpLJW0ynYQtYYPmP41zM="; }; nativeBuildInputs = [ @@ -25,19 +25,20 @@ stdenv.mkDerivation rec { ncurses ]; - preConfigure = '' - configureFlags="$configureFlags --with-guilesitedir=$out/share/guile/site" - ''; - - postFixup = '' - for f in $out/share/guile/site/ncurses/**.scm; do \ - substituteInPlace $f \ - --replace "libguile-ncurses" "$out/lib/libguile-ncurses"; \ - done - ''; + configureFlags = [ + "--with-gnu-filesystem-hierarchy" + ]; - # Undefined symbols for architecture arm64: "_u32_conv_from_encoding" - env.NIX_LDFLAGS = "-lunistring"; + postFixup = + let + guileVersion = lib.versions.majorMinor guile.version; + in + '' + for f in $out/share/guile/site/ncurses/**.scm; do \ + substituteInPlace $f \ + --replace "libguile-ncurses" "$out/lib/guile/${guileVersion}/libguile-ncurses"; \ + done + ''; # XXX: 1 of 65 tests failed. doCheck = false; diff --git a/pkgs/development/node-packages/main-programs.nix b/pkgs/development/node-packages/main-programs.nix index 132024e58e68b..c327b3b9a5bb3 100644 --- a/pkgs/development/node-packages/main-programs.nix +++ b/pkgs/development/node-packages/main-programs.nix @@ -47,6 +47,7 @@ firebase-tools = "firebase"; fkill-cli = "fkill"; fleek-cli = "fleek"; + flood = "flood"; git-run = "gr"; gitmoji-cli = "gitmoji"; graphql-cli = "graphql"; diff --git a/pkgs/development/ocaml-modules/trace/default.nix b/pkgs/development/ocaml-modules/trace/default.nix new file mode 100644 index 0000000000000..208a879b1d1c2 --- /dev/null +++ b/pkgs/development/ocaml-modules/trace/default.nix @@ -0,0 +1,21 @@ +{ lib, fetchurl, buildDunePackage }: + +buildDunePackage rec { + pname = "trace"; + version = "0.2"; + + minimalOCamlVersion = "4.05"; + + src = fetchurl { + url = "https://github.com/c-cube/trace/releases/download/v${version}/trace-${version}.tbz"; + hash = "sha256-iScnZxjgzDqZFxbDDXB0K4TkdDJDcrMC03sK/ltbqJQ="; + }; + + meta = { + description = "Common interface for tracing/instrumentation libraries in OCaml"; + license = lib.licenses.mit; + homepage = "https://c-cube.github.io/trace/"; + maintainers = [ lib.maintainers.vbgl ]; + }; + +} diff --git a/pkgs/development/ocaml-modules/trace/tef.nix b/pkgs/development/ocaml-modules/trace/tef.nix new file mode 100644 index 0000000000000..c1a6f9251554e --- /dev/null +++ b/pkgs/development/ocaml-modules/trace/tef.nix @@ -0,0 +1,15 @@ +{ buildDunePackage, trace, mtime }: + +buildDunePackage { + pname = "trace-tef"; + inherit (trace) src version; + + propagatedBuildInputs = [ mtime trace ]; + + doCheck = true; + + meta = trace.meta // { + description = "A simple backend for trace, emitting Catapult JSON into a file"; + }; + +} diff --git a/pkgs/development/python-modules/gehomesdk/default.nix b/pkgs/development/python-modules/gehomesdk/default.nix index 0c1aa9fbf2d10..81a8e3678272e 100644 --- a/pkgs/development/python-modules/gehomesdk/default.nix +++ b/pkgs/development/python-modules/gehomesdk/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "gehomesdk"; - version = "0.5.13"; + version = "0.5.20"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-gkHAIrsk6LKNjieTiSU0ZH6WI2+wJB68edNqJ7n86tY="; + hash = "sha256-5nu7pewkxCZ/F6m7xOwvMwuhFsanQKHtdwGqNto3/zk="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/tools/continuous-integration/drone-runner-docker/default.nix b/pkgs/development/tools/continuous-integration/drone-runner-docker/default.nix index f71068188049d..974cd8f464cb6 100644 --- a/pkgs/development/tools/continuous-integration/drone-runner-docker/default.nix +++ b/pkgs/development/tools/continuous-integration/drone-runner-docker/default.nix @@ -18,5 +18,6 @@ buildGoModule rec { license = licenses.unfreeRedistributable; homepage = "https://github.com/drone-runners/drone-runner-docker"; description = "Drone pipeline runner that executes builds inside Docker containers"; + mainProgram = "drone-runner-docker"; }; } diff --git a/pkgs/development/tools/continuous-integration/drone-runner-exec/default.nix b/pkgs/development/tools/continuous-integration/drone-runner-exec/default.nix index 373c6183725d5..c40d94645d1ef 100644 --- a/pkgs/development/tools/continuous-integration/drone-runner-exec/default.nix +++ b/pkgs/development/tools/continuous-integration/drone-runner-exec/default.nix @@ -22,5 +22,6 @@ buildGoModule rec { # https://polyformproject.org/licenses/small-business/1.0.0/ license = licenses.unfree; maintainers = with maintainers; [ mic92 ]; + mainProgram = "drone-runner-exec"; }; } diff --git a/pkgs/development/tools/continuous-integration/drone-runner-ssh/default.nix b/pkgs/development/tools/continuous-integration/drone-runner-ssh/default.nix index 1d15cdc604790..92a015f8e95ae 100644 --- a/pkgs/development/tools/continuous-integration/drone-runner-ssh/default.nix +++ b/pkgs/development/tools/continuous-integration/drone-runner-ssh/default.nix @@ -18,5 +18,6 @@ buildGoModule rec { homepage = "https://github.com/drone-runners/drone-runner-ssh"; license = licenses.unfreeRedistributable; maintainers = teams.c3d2.members; + mainProgram = "drone-runner-ssh"; }; } diff --git a/pkgs/development/tools/continuous-integration/woodpecker/cli.nix b/pkgs/development/tools/continuous-integration/woodpecker/cli.nix index efe6d5facb390..d1f1da8816811 100644 --- a/pkgs/development/tools/continuous-integration/woodpecker/cli.nix +++ b/pkgs/development/tools/continuous-integration/woodpecker/cli.nix @@ -12,5 +12,6 @@ buildGoModule { meta = common.meta // { description = "Command line client for the Woodpecker Continuous Integration server"; + mainProgram = "woodpecker-cli"; }; } diff --git a/pkgs/development/tools/jq/default.nix b/pkgs/development/tools/jq/default.nix index 9c3d3c09ea5f7..3c6d85e8ddcc2 100644 --- a/pkgs/development/tools/jq/default.nix +++ b/pkgs/development/tools/jq/default.nix @@ -76,5 +76,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ raskin globin artturin ]; platforms = platforms.unix; downloadPage = "https://stedolan.github.io/jq/download/"; + mainProgram = "jq"; }; } diff --git a/pkgs/development/tools/misc/autogen/default.nix b/pkgs/development/tools/misc/autogen/default.nix index 61df38f68ce98..4e776b34ded3c 100644 --- a/pkgs/development/tools/misc/autogen/default.nix +++ b/pkgs/development/tools/misc/autogen/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPackages, fetchurl, fetchpatch, autoreconfHook, which, pkg-config, perl, guile, libxml2 }: +{ lib, stdenv, buildPackages, fetchurl, fetchpatch, autoreconfHook, which, pkg-config, perl, guile_2_2, libxml2 }: stdenv.mkDerivation rec { pname = "autogen"; @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { buildPackages.buildPackages.autogen buildPackages.texinfo ]; buildInputs = [ - guile libxml2 + guile_2_2 libxml2 ]; preConfigure = '' diff --git a/pkgs/development/tools/prettierd/default.nix b/pkgs/development/tools/prettierd/default.nix index a95a0c1b7f164..b3ba24db42c89 100644 --- a/pkgs/development/tools/prettierd/default.nix +++ b/pkgs/development/tools/prettierd/default.nix @@ -41,6 +41,7 @@ mkYarnPackage rec { doDist = false; meta = with lib; { + mainProgram = "prettierd"; description = "Prettier, as a daemon, for improved formatting speed"; homepage = "https://github.com/fsouza/prettierd"; license = licenses.isc; diff --git a/pkgs/games/ckan/default.nix b/pkgs/games/ckan/default.nix index 4a6f8d0c8ef22..960798cde2225 100644 --- a/pkgs/games/ckan/default.nix +++ b/pkgs/games/ckan/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ckan"; - version = "1.32.0"; + version = "1.33.2"; src = fetchurl { url = "https://github.com/KSP-CKAN/CKAN/releases/download/v${version}/ckan.exe"; - sha256 = "sha256-cD8S5UcS5tBJoW1IExrmtoYn8k/P7RjCRAx7BEhAWGk="; + sha256 = "sha256-FIndxRyGDgXinP8ZX0o6LEJgGNNw84tCPw5FdVAU3TI="; }; dontUnpack = true; diff --git a/pkgs/games/steam/steam.nix b/pkgs/games/steam/steam.nix index 13d63117b7f8c..2687ee7febdd4 100644 --- a/pkgs/games/steam/steam.nix +++ b/pkgs/games/steam/steam.nix @@ -49,5 +49,6 @@ in stdenv.mkDerivation { homepage = "https://store.steampowered.com/"; license = licenses.unfreeRedistributable; maintainers = with maintainers; [ jagajaga jonringer ]; + mainProgram = "steam"; }; } diff --git a/pkgs/misc/brightnessctl/default.nix b/pkgs/misc/brightnessctl/default.nix index 2fab8b4bd676c..43a37ad764eeb 100644 --- a/pkgs/misc/brightnessctl/default.nix +++ b/pkgs/misc/brightnessctl/default.nix @@ -22,6 +22,7 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = with maintainers; [ megheaiulian ]; platforms = platforms.linux; + mainProgram = "brightnessctl"; }; } diff --git a/pkgs/misc/lilypond/default.nix b/pkgs/misc/lilypond/default.nix index ef861068fa496..b9f59934efea1 100644 --- a/pkgs/misc/lilypond/default.nix +++ b/pkgs/misc/lilypond/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, ghostscript, gyre-fonts, texinfo, imagemagick, texi2html, guile +{ stdenv, lib, fetchurl, ghostscript, gyre-fonts, texinfo, imagemagick, texi2html, guile_2_2 , python3, gettext, flex, perl, bison, pkg-config, autoreconfHook, dblatex , fontconfig, freetype, pango, fontforge, help2man, zip, netpbm, groff , freefont_ttf, makeFontsConf @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook bison flex makeWrapper pkg-config ]; buildInputs = - [ ghostscript texinfo imagemagick texi2html guile dblatex tex zip netpbm + [ ghostscript texinfo imagemagick texi2html guile_2_2 dblatex tex zip netpbm python3 gettext perl fontconfig freetype pango fontforge help2man groff t1utils boehmgc rsync ]; diff --git a/pkgs/servers/nginx-sso/default.nix b/pkgs/servers/nginx-sso/default.nix index 8928234f96721..3b3dd52be6eff 100644 --- a/pkgs/servers/nginx-sso/default.nix +++ b/pkgs/servers/nginx-sso/default.nix @@ -31,5 +31,6 @@ buildGoModule rec { homepage = "https://github.com/Luzifer/nginx-sso"; license = licenses.asl20; maintainers = with maintainers; [ delroth ]; + mainProgram = "nginx-sso"; }; } diff --git a/pkgs/tools/X11/xbindkeys/default.nix b/pkgs/tools/X11/xbindkeys/default.nix index 17e0ca66e3f37..ed9e5ba43c99b 100644 --- a/pkgs/tools/X11/xbindkeys/default.nix +++ b/pkgs/tools/X11/xbindkeys/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, libX11, guile }: +{ lib, stdenv, fetchurl, pkg-config, libX11, guile_2_2 }: stdenv.mkDerivation rec { pname = "xbindkeys"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libX11 guile ]; + buildInputs = [ libX11 guile_2_2 ]; meta = { homepage = "https://www.nongnu.org/xbindkeys/xbindkeys.html"; diff --git a/pkgs/tools/networking/junkie/default.nix b/pkgs/tools/networking/junkie/default.nix index 9f7b4350f1b13..87c0fc6ae2a79 100644 --- a/pkgs/tools/networking/junkie/default.nix +++ b/pkgs/tools/networking/junkie/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, pkg-config, libpcap, guile, openssl }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, pkg-config, libpcap, guile_2_2, openssl }: stdenv.mkDerivation rec { pname = "junkie"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { sed -i '10i#undef IP_DONTFRAG' include/junkie/proto/ip.h ''; - buildInputs = [ libpcap guile openssl ]; + buildInputs = [ libpcap guile_2_2 openssl ]; nativeBuildInputs = [ autoreconfHook pkg-config ]; configureFlags = [ "GUILELIBDIR=\${out}/share/guile/site" diff --git a/pkgs/tools/networking/mailutils/default.nix b/pkgs/tools/networking/mailutils/default.nix index 6ed8b2fc4b5b1..2fa7f78f4937e 100644 --- a/pkgs/tools/networking/mailutils/default.nix +++ b/pkgs/tools/networking/mailutils/default.nix @@ -12,7 +12,7 @@ , gdbm , gnutls , gss -, guile +, guile_2_2 , libmysqlclient , mailcap , nettools @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { libxcrypt ] ++ lib.optionals stdenv.isLinux [ nettools ] ++ lib.optionals pythonSupport [ python3 ] - ++ lib.optionals guileSupport [ guile ]; + ++ lib.optionals guileSupport [ guile_2_2 ]; patches = [ ./fix-build-mb-len-max.patch diff --git a/pkgs/tools/security/rage/default.nix b/pkgs/tools/security/rage/default.nix index ea8e304099c0b..44b67e96a1e0c 100644 --- a/pkgs/tools/security/rage/default.nix +++ b/pkgs/tools/security/rage/default.nix @@ -46,5 +46,6 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/str4d/rage/raw/v${version}/rage/CHANGELOG.md"; license = with licenses; [ asl20 mit ]; # either at your option maintainers = with maintainers; [ marsam ryantm ]; + mainProgram = "rage"; }; } diff --git a/pkgs/tools/text/gawk/default.nix b/pkgs/tools/text/gawk/default.nix index 8fe044a9e2185..d85880e82e155 100644 --- a/pkgs/tools/text/gawk/default.nix +++ b/pkgs/tools/text/gawk/default.nix @@ -82,5 +82,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; platforms = platforms.unix ++ platforms.windows; maintainers = [ ]; + mainProgram = "gawk"; }; } diff --git a/pkgs/tools/typesetting/skribilo/default.nix b/pkgs/tools/typesetting/skribilo/default.nix index 24b579c49a333..264eeea52e384 100644 --- a/pkgs/tools/typesetting/skribilo/default.nix +++ b/pkgs/tools/typesetting/skribilo/default.nix @@ -10,9 +10,9 @@ , imagemagick , makeWrapper , pkg-config -, ploticus , enableEmacs ? false, emacs -, enableLout ? true, lout +, enableLout ? stdenv.isLinux, lout +, enablePloticus ? stdenv.isLinux, ploticus , enableTex ? true, tex }: @@ -40,10 +40,10 @@ in stdenv.mkDerivation (finalAttrs: { guile-lib guile-reader imagemagick - ploticus ] ++ optional enableEmacs emacs ++ optional enableLout lout + ++ optional enablePloticus ploticus ++ optional enableTex tex; postInstall = diff --git a/pkgs/tools/wayland/gtklock/default.nix b/pkgs/tools/wayland/gtklock/default.nix index 3d74344a4e76c..c5146532e4428 100644 --- a/pkgs/tools/wayland/gtklock/default.nix +++ b/pkgs/tools/wayland/gtklock/default.nix @@ -52,5 +52,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3; maintainers = with maintainers; [ dit7ya ]; platforms = platforms.linux; + mainProgram = "gtklock"; }; } diff --git a/pkgs/tools/wayland/wlogout/default.nix b/pkgs/tools/wayland/wlogout/default.nix index de150c3af3091..2be33bee6ac08 100644 --- a/pkgs/tools/wayland/wlogout/default.nix +++ b/pkgs/tools/wayland/wlogout/default.nix @@ -59,6 +59,7 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = with maintainers; [ AndersonTorres ]; platforms = platforms.linux; + mainProgram = "wlogout"; }; } # TODO: shell completions diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fbf4de76cd56d..c692e4b4ee9d8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12912,6 +12912,8 @@ with pkgs; inherit (darwin.apple_sdk_11_0.frameworks) Carbon Cocoa CoreWLAN DisplayServices MediaRemote SkyLight; }; + sketchybar-app-font = callPackage ../data/fonts/sketchybar-app-font { }; + skippy-xd = callPackage ../tools/X11/skippy-xd { }; sks = callPackage ../servers/sks { @@ -18034,7 +18036,7 @@ with pkgs; guile_3_0 = callPackage ../development/interpreters/guile/3.0.nix { }; - guile = guile_2_2; + guile = guile_3_0; guile-cairo = callPackage ../development/guile-modules/guile-cairo { }; @@ -18060,7 +18062,9 @@ with pkgs; guile-reader = callPackage ../development/guile-modules/guile-reader { }; - guile-sdl = callPackage ../development/guile-modules/guile-sdl { }; + guile-sdl = callPackage ../development/guile-modules/guile-sdl { + guile = guile_2_2; + }; guile-sdl2 = callPackage ../development/guile-modules/guile-sdl2 { }; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 02e659de3a994..de2acdd372dae 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -1643,6 +1643,10 @@ let inherit (pkgs.python3Packages) torch; }; + trace = callPackage ../development/ocaml-modules/trace { }; + + trace-tef = callPackage ../development/ocaml-modules/trace/tef.nix { }; + trie = callPackage ../development/ocaml-modules/trie { }; tsdl = callPackage ../development/ocaml-modules/tsdl { |