diff --git a/doc/stdenv/meta.chapter.md b/doc/stdenv/meta.chapter.md index e626e7942996..f6da0bb84be0 100644 --- a/doc/stdenv/meta.chapter.md +++ b/doc/stdenv/meta.chapter.md @@ -70,7 +70,7 @@ A list of the maintainers of this Nix expression. Maintainers are defined in [`n ### `mainProgram` {#var-meta-mainProgram} -The name of the main binary for the package. This affects the binary `nix run` executes and falls back to the name of the package. Example: `"rg"` +The name of the main binary for the package. This affects the binary `nix run` executes. Example: `"rg"` ### `priority` {#var-meta-priority} diff --git a/lib/meta.nix b/lib/meta.nix index d32a37fe61d7..21404b3a2bfa 100644 --- a/lib/meta.nix +++ b/lib/meta.nix @@ -132,10 +132,9 @@ rec { { shortName = licstr; } ); - /* Get the path to the main program of a derivation with either - meta.mainProgram or pname or name + /* Get the path to the main program of a package based on meta.mainProgram - Type: getExe :: derivation -> string + Type: getExe :: package -> string Example: getExe pkgs.hello diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index c3dac5d13841..8a468301ea5d 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -650,6 +650,13 @@ githubId = 82811; name = "Aldo Borrero"; }; + alejandrosame = { + email = "alejandrosanchzmedina@gmail.com"; + matrix = "@alejandrosame:matrix.org"; + github = "alejandrosame"; + githubId = 1078000; + name = "Alejandro Sánchez Medina"; + }; aleksana = { email = "me@aleksana.moe"; github = "Aleksanaa"; diff --git a/pkgs/applications/audio/denemo/default.nix b/pkgs/applications/audio/denemo/default.nix index 7e27bf783705..80018ecc395b 100644 --- a/pkgs/applications/audio/denemo/default.nix +++ b/pkgs/applications/audio/denemo/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, pkg-config -, libjack2, gettext, intltool, guile_2_0, lilypond +, libjack2, gettext, intltool, guile_2_2, lilypond , glib, libxml2, librsvg, libsndfile, aubio , gtk3, gtksourceview, evince, fluidsynth, rubberband , portaudio, portmidi, fftw, wrapGAppsHook }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - libjack2 guile_2_0 lilypond glib libxml2 librsvg libsndfile + libjack2 guile_2_2 lilypond glib libxml2 librsvg libsndfile aubio gtk3 gtksourceview evince fluidsynth rubberband portaudio fftw portmidi ]; diff --git a/pkgs/applications/audio/plexamp/default.nix b/pkgs/applications/audio/plexamp/default.nix index 6729e05ce6e0..d39b0217dc83 100644 --- a/pkgs/applications/audio/plexamp/default.nix +++ b/pkgs/applications/audio/plexamp/default.nix @@ -2,12 +2,12 @@ let pname = "plexamp"; - version = "4.8.1"; + version = "4.8.2"; src = fetchurl { url = "https://plexamp.plex.tv/plexamp.plex.tv/desktop/Plexamp-${version}.AppImage"; name="${pname}-${version}.AppImage"; - sha512 = "iPCiBbb6alQspEPccxn1XHik0GbksZoe5jb0u8VuUdybO+xVb6sIxTNi6sxTG32uSRH6o16EHNUhLKeb6OcEtA=="; + sha512 = "7NQmH42yzItReQ5WPdcbNPr/xed74H4UyDNlX5PGmoJRBpV1RdeuW1KRweIWfYNhw0KeqULVTjr/aCggoWp4WA=="; }; appimageContents = appimageTools.extractType2 { @@ -33,7 +33,7 @@ in appimageTools.wrapType2 { meta = with lib; { description = "A beautiful Plex music player for audiophiles, curators, and hipsters"; homepage = "https://plexamp.com/"; - changelog = "https://forums.plex.tv/t/plexamp-release-notes/221280/51"; + changelog = "https://forums.plex.tv/t/plexamp-release-notes/221280/52"; license = licenses.unfree; maintainers = with maintainers; [ killercup synthetica ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/audio/qpwgraph/default.nix b/pkgs/applications/audio/qpwgraph/default.nix index 0c36a8b3ecca..c4955e15e894 100644 --- a/pkgs/applications/audio/qpwgraph/default.nix +++ b/pkgs/applications/audio/qpwgraph/default.nix @@ -5,14 +5,14 @@ mkDerivation rec { pname = "qpwgraph"; - version = "0.4.5"; + version = "0.5.1"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "rncbc"; repo = "qpwgraph"; rev = "v${version}"; - sha256 = "sha256-VMTVaJJHMgx5mJT4ZRL5CDOJp7UPOkZOjqulCFSd7xo="; + sha256 = "sha256-HVeuqgqYf/gO1KdteXV4dWd13Q58GqHUz8CAYpruc18="; }; nativeBuildInputs = [ cmake pkg-config ]; @@ -29,6 +29,6 @@ mkDerivation rec { homepage = "https://gitlab.freedesktop.org/rncbc/qpwgraph"; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = with maintainers; [ kanashimia exi ]; + maintainers = with maintainers; [ kanashimia exi Scrumplex ]; }; } diff --git a/pkgs/applications/emulators/cemu/default.nix b/pkgs/applications/emulators/cemu/default.nix index 49d9779c4095..d38865adc205 100644 --- a/pkgs/applications/emulators/cemu/default.nix +++ b/pkgs/applications/emulators/cemu/default.nix @@ -128,5 +128,6 @@ stdenv.mkDerivation rec { license = licenses.mpl20; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ zhaofengli baduhai ]; + mainProgram = "cemu"; }; } diff --git a/pkgs/applications/emulators/craftos-pc/default.nix b/pkgs/applications/emulators/craftos-pc/default.nix index 67950e0ed8a4..b147af8d02b7 100644 --- a/pkgs/applications/emulators/craftos-pc/default.nix +++ b/pkgs/applications/emulators/craftos-pc/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , callPackage , patchelf , unzip @@ -15,18 +16,18 @@ }: let - version = "2.7.4"; + version = "2.7.5"; craftos2-lua = fetchFromGitHub { owner = "MCJack123"; repo = "craftos2-lua"; rev = "v${version}"; - sha256 = "sha256-JMBsSoO/yTLw7K1Ri3BzKr5bz5UirXiPr/Q0YoMumhY="; + hash = "sha256-JMBsSoO/yTLw7K1Ri3BzKr5bz5UirXiPr/Q0YoMumhY="; }; craftos2-rom = fetchFromGitHub { owner = "McJack123"; repo = "craftos2-rom"; - rev = "v${version}"; - sha256 = "sha256-BXTsBMlsymQHABWQCiv22Ia5jm2xv1jNy7Unwymtyp0="; + rev = "v${version}.1"; # Author released a hotfix; remove trailing '.1' on next update + hash = "sha256-WZs/KIdpqLLzvpH2hiJpe/AehluoQMtewBbAb4htz8k="; }; in @@ -38,7 +39,7 @@ stdenv.mkDerivation rec { owner = "MCJack123"; repo = "craftos2"; rev = "v${version}"; - sha256 = "sha256-9XMc7zmtPxlt3WgS93lUJNMFtUJ/llG9SFGtgdFqZEA="; + hash = "sha256-t2yhSuNPFCF2NaQFWuN9Nos5ZPinAvecV6EZNO0Cy9I="; }; buildInputs = [ patchelf poco openssl SDL2 SDL2_mixer ncurses libpng pngpp libwebp ]; diff --git a/pkgs/applications/emulators/dosbox/default.nix b/pkgs/applications/emulators/dosbox/default.nix index a8d4df2e5feb..4a6d229762b0 100644 --- a/pkgs/applications/emulators/dosbox/default.nix +++ b/pkgs/applications/emulators/dosbox/default.nix @@ -77,5 +77,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; maintainers = with maintainers; [ matthewbauer ]; platforms = platforms.unix; + mainProgram = "dosbox"; }; } diff --git a/pkgs/applications/emulators/emulationstation/default.nix b/pkgs/applications/emulators/emulationstation/default.nix index aa8192d3ec1d..170a3c30e547 100644 --- a/pkgs/applications/emulators/emulationstation/default.nix +++ b/pkgs/applications/emulators/emulationstation/default.nix @@ -37,5 +37,6 @@ stdenv.mkDerivation { maintainers = [ lib.maintainers.edwtjo ]; license = lib.licenses.mit; platforms = lib.platforms.linux; + mainProgram = "emulationstation"; }; } diff --git a/pkgs/applications/emulators/mame/default.nix b/pkgs/applications/emulators/mame/default.nix index 3a7e06509197..6fe3e4455d9f 100644 --- a/pkgs/applications/emulators/mame/default.nix +++ b/pkgs/applications/emulators/mame/default.nix @@ -196,5 +196,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ thiagokokada ]; platforms = platforms.unix; broken = stdenv.isDarwin; + mainProgram = "mame"; }; } diff --git a/pkgs/applications/emulators/melonDS/default.nix b/pkgs/applications/emulators/melonDS/default.nix index 06ef3d99088e..50389db2b45e 100644 --- a/pkgs/applications/emulators/melonDS/default.nix +++ b/pkgs/applications/emulators/melonDS/default.nix @@ -49,5 +49,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ artemist benley shamilton xfix ]; platforms = platforms.linux; + mainProgram = "melonDS"; }; } diff --git a/pkgs/applications/emulators/mgba/default.nix b/pkgs/applications/emulators/mgba/default.nix index 8537a0511286..a52ee7ca30ce 100644 --- a/pkgs/applications/emulators/mgba/default.nix +++ b/pkgs/applications/emulators/mgba/default.nix @@ -81,5 +81,6 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.mpl20; maintainers = with maintainers; [ MP2E AndersonTorres ]; platforms = platforms.linux; + mainProgram = "mgba"; }; }) diff --git a/pkgs/applications/emulators/mupen64plus/default.nix b/pkgs/applications/emulators/mupen64plus/default.nix index 82908a166d46..ba8c69cfb3e0 100644 --- a/pkgs/applications/emulators/mupen64plus/default.nix +++ b/pkgs/applications/emulators/mupen64plus/default.nix @@ -38,5 +38,6 @@ stdenv.mkDerivation rec { homepage = "http://www.mupen64plus.org/"; maintainers = [ maintainers.sander ]; platforms = [ "x86_64-linux" ]; + mainProgram = "mupen64plus"; }; } diff --git a/pkgs/applications/emulators/nestopia/default.nix b/pkgs/applications/emulators/nestopia/default.nix index fa55c2e9635d..b42a5786394e 100644 --- a/pkgs/applications/emulators/nestopia/default.nix +++ b/pkgs/applications/emulators/nestopia/default.nix @@ -67,6 +67,7 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ MP2E ]; + mainProgram = "nestopia"; }; } diff --git a/pkgs/applications/emulators/pcsxr/default.nix b/pkgs/applications/emulators/pcsxr/default.nix index 101fb829c6e3..b80c32bd9eda 100644 --- a/pkgs/applications/emulators/pcsxr/default.nix +++ b/pkgs/applications/emulators/pcsxr/default.nix @@ -92,5 +92,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ rardiol ]; license = licenses.gpl2Plus; platforms = platforms.all; + mainProgram = "pcsxr"; }; } diff --git a/pkgs/applications/emulators/rpcs3/default.nix b/pkgs/applications/emulators/rpcs3/default.nix index bea72c7ca44f..88b3ddbb1750 100644 --- a/pkgs/applications/emulators/rpcs3/default.nix +++ b/pkgs/applications/emulators/rpcs3/default.nix @@ -101,5 +101,6 @@ stdenv.mkDerivation { maintainers = with maintainers; [ abbradar neonfuz ilian zane ]; license = licenses.gpl2Only; platforms = [ "x86_64-linux" "aarch64-linux" ]; + mainProgram = "rpcs3"; }; } diff --git a/pkgs/applications/emulators/snes9x/default.nix b/pkgs/applications/emulators/snes9x/default.nix index 82efe6b42af4..34c2f72c7dd4 100644 --- a/pkgs/applications/emulators/snes9x/default.nix +++ b/pkgs/applications/emulators/snes9x/default.nix @@ -123,5 +123,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ qknight xfix thiagokokada ]; platforms = platforms.unix; broken = (withGtk && stdenv.isDarwin); + mainProgram = "snes9x"; }; } diff --git a/pkgs/applications/emulators/xemu/default.nix b/pkgs/applications/emulators/xemu/default.nix index 3e985f336a65..311935b84676 100644 --- a/pkgs/applications/emulators/xemu/default.nix +++ b/pkgs/applications/emulators/xemu/default.nix @@ -133,5 +133,6 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ AndersonTorres genericnerdyusername ]; platforms = lib.platforms.linux; + mainProgram = "xemu"; }; }) diff --git a/pkgs/applications/file-managers/krusader/default.nix b/pkgs/applications/file-managers/krusader/default.nix index 9895cc108ef6..a8635a416396 100644 --- a/pkgs/applications/file-managers/krusader/default.nix +++ b/pkgs/applications/file-managers/krusader/default.nix @@ -43,5 +43,6 @@ mkDerivation rec { description = "Norton/Total Commander clone for KDE"; license = licenses.gpl2Only; maintainers = with maintainers; [ sander turion ]; + mainProgram = "krusader"; }; } diff --git a/pkgs/applications/file-managers/mc/default.nix b/pkgs/applications/file-managers/mc/default.nix index a61b0980d851..65211bb54391 100644 --- a/pkgs/applications/file-managers/mc/default.nix +++ b/pkgs/applications/file-managers/mc/default.nix @@ -93,5 +93,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; maintainers = with maintainers; [ sander ]; platforms = with platforms; linux ++ darwin; + mainProgram = "mc"; }; } diff --git a/pkgs/applications/file-managers/nnn/default.nix b/pkgs/applications/file-managers/nnn/default.nix index 6386018348a0..eb3e943676e4 100644 --- a/pkgs/applications/file-managers/nnn/default.nix +++ b/pkgs/applications/file-managers/nnn/default.nix @@ -78,5 +78,6 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.bsd2; platforms = platforms.all; maintainers = with maintainers; [ jfrankenau Br1ght0ne ]; + mainProgram = "nnn"; }; }) diff --git a/pkgs/applications/file-managers/pcmanfm/default.nix b/pkgs/applications/file-managers/pcmanfm/default.nix index deb9a98a517c..bfbe68d885e6 100644 --- a/pkgs/applications/file-managers/pcmanfm/default.nix +++ b/pkgs/applications/file-managers/pcmanfm/default.nix @@ -39,5 +39,6 @@ stdenv.mkDerivation rec { description = "File manager with GTK interface"; maintainers = [ maintainers.ttuegel ]; platforms = platforms.linux; + mainProgram = "pcmanfm"; }; } diff --git a/pkgs/applications/file-managers/ranger/default.nix b/pkgs/applications/file-managers/ranger/default.nix index a192edb0b32a..96d43dc8f247 100644 --- a/pkgs/applications/file-managers/ranger/default.nix +++ b/pkgs/applications/file-managers/ranger/default.nix @@ -55,5 +55,6 @@ python3Packages.buildPythonApplication rec { license = licenses.gpl3Only; platforms = platforms.unix; maintainers = with maintainers; [ toonn magnetophon ]; + mainProgram = "ranger"; }; } diff --git a/pkgs/applications/misc/1password-gui/default.nix b/pkgs/applications/misc/1password-gui/default.nix index cfcf1d7f891b..7dbae3e43b46 100644 --- a/pkgs/applications/misc/1password-gui/default.nix +++ b/pkgs/applications/misc/1password-gui/default.nix @@ -61,6 +61,7 @@ let license = licenses.unfree; maintainers = with maintainers; [ timstott savannidgerinel maxeaubrey sebtm ]; platforms = builtins.attrNames sources.${channel}; + mainProgram = "1password"; }; in if stdenv.isDarwin diff --git a/pkgs/applications/misc/authy/default.nix b/pkgs/applications/misc/authy/default.nix index dd5585c35b0a..199e89dc0ba5 100644 --- a/pkgs/applications/misc/authy/default.nix +++ b/pkgs/applications/misc/authy/default.nix @@ -63,5 +63,6 @@ stdenv.mkDerivation rec { license = licenses.unfree; maintainers = with maintainers; [ iammrinal0 ]; platforms = [ "x86_64-linux" ]; + mainProgram = "authy"; }; } diff --git a/pkgs/applications/misc/barrier/default.nix b/pkgs/applications/misc/barrier/default.nix index 66ad4046d1fb..f068667948c2 100644 --- a/pkgs/applications/misc/barrier/default.nix +++ b/pkgs/applications/misc/barrier/default.nix @@ -49,5 +49,6 @@ mkDerivation rec { license = lib.licenses.gpl2; maintainers = [ lib.maintainers.phryneas ]; platforms = lib.platforms.linux; + mainProgram = "barrier"; }; } diff --git a/pkgs/applications/misc/bleachbit/default.nix b/pkgs/applications/misc/bleachbit/default.nix index 7a667b187566..c6e4adf8a560 100644 --- a/pkgs/applications/misc/bleachbit/default.nix +++ b/pkgs/applications/misc/bleachbit/default.nix @@ -65,5 +65,6 @@ python3Packages.buildPythonApplication rec { longDescription = "BleachBit helps you easily clean your computer to free space and maintain privacy."; license = licenses.gpl3; maintainers = with maintainers; [ leonardoce mbprtpmnr ]; + mainProgram = "bleachbit"; }; } diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index 58cdf9592cdc..448eb1477136 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -196,5 +196,6 @@ stdenv.mkDerivation rec { platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" ]; broken = stdenv.isDarwin; maintainers = with maintainers; [ goibhniu veprbl ]; + mainProgram = "blender"; }; } diff --git a/pkgs/applications/misc/bottles/default.nix b/pkgs/applications/misc/bottles/default.nix index 34f0f3236101..64f0df2e4a7f 100644 --- a/pkgs/applications/misc/bottles/default.nix +++ b/pkgs/applications/misc/bottles/default.nix @@ -109,5 +109,6 @@ python3Packages.buildPythonApplication rec { license = licenses.gpl3Only; maintainers = with maintainers; [ psydvl shamilton ]; platforms = platforms.linux; + mainProgram = "bottles"; }; } diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix index 0e89c7b1b057..15dbb33118b8 100644 --- a/pkgs/applications/misc/dbeaver/default.nix +++ b/pkgs/applications/misc/dbeaver/default.nix @@ -135,5 +135,6 @@ mavenJdk17.buildMavenPackage rec { license = licenses.asl20; platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ]; maintainers = with maintainers; [ jojosch mkg20001 ]; + mainProgram = "dbeaver"; }; } diff --git a/pkgs/applications/misc/dmenu/default.nix b/pkgs/applications/misc/dmenu/default.nix index 71fba4e51524..b53fab409b04 100644 --- a/pkgs/applications/misc/dmenu/default.nix +++ b/pkgs/applications/misc/dmenu/default.nix @@ -30,5 +30,6 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = with maintainers; [ pSub globin ]; platforms = platforms.all; + mainProgram = "dmenu"; }; } diff --git a/pkgs/applications/misc/dunst/default.nix b/pkgs/applications/misc/dunst/default.nix index ec3024d48d1d..47dbaa62c3c1 100644 --- a/pkgs/applications/misc/dunst/default.nix +++ b/pkgs/applications/misc/dunst/default.nix @@ -57,5 +57,6 @@ stdenv.mkDerivation rec { # NOTE: 'unix' or even 'all' COULD work too, I'm not sure platforms = platforms.linux; maintainers = with maintainers; [ domenkozar ]; + mainProgram = "dunst"; }; } diff --git a/pkgs/applications/misc/dupeguru/default.nix b/pkgs/applications/misc/dupeguru/default.nix index c485375137ea..36fa71b1d9c7 100644 --- a/pkgs/applications/misc/dupeguru/default.nix +++ b/pkgs/applications/misc/dupeguru/default.nix @@ -63,5 +63,6 @@ python3Packages.buildPythonApplication rec { license = licenses.bsd3; platforms = platforms.unix; maintainers = [ maintainers.novoxd ]; + mainProgram = "dupeguru"; }; } diff --git a/pkgs/applications/misc/fontpreview/default.nix b/pkgs/applications/misc/fontpreview/default.nix index 7fa2e4d89102..0f02eeed1769 100644 --- a/pkgs/applications/misc/fontpreview/default.nix +++ b/pkgs/applications/misc/fontpreview/default.nix @@ -36,5 +36,6 @@ stdenv.mkDerivation rec { license = licenses.mit; platforms = platforms.unix; maintainers = [ maintainers.erictapen ]; + mainProgram = "fontpreview"; }; } diff --git a/pkgs/applications/misc/keepass/default.nix b/pkgs/applications/misc/keepass/default.nix index 022eba1fd6cb..bde5bd4b44ae 100644 --- a/pkgs/applications/misc/keepass/default.nix +++ b/pkgs/applications/misc/keepass/default.nix @@ -117,5 +117,6 @@ in buildDotnetPackage rec { maintainers = with lib.maintainers; [ amorsillo obadz ]; platforms = with lib.platforms; all; license = lib.licenses.gpl2; + mainProgram = "keepass"; }; } diff --git a/pkgs/applications/misc/lutris/default.nix b/pkgs/applications/misc/lutris/default.nix index 2836b14cd716..730737a8bbb6 100644 --- a/pkgs/applications/misc/lutris/default.nix +++ b/pkgs/applications/misc/lutris/default.nix @@ -147,5 +147,6 @@ buildPythonApplication rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ Madouura ]; platforms = platforms.linux; + mainProgram = "lutris"; }; } diff --git a/pkgs/applications/misc/mediainfo-gui/default.nix b/pkgs/applications/misc/mediainfo-gui/default.nix index 877572396be7..4aebb67ac981 100644 --- a/pkgs/applications/misc/mediainfo-gui/default.nix +++ b/pkgs/applications/misc/mediainfo-gui/default.nix @@ -32,5 +32,6 @@ stdenv.mkDerivation rec { license = licenses.bsd2; platforms = platforms.unix; maintainers = [ maintainers.devhell ]; + mainProgram = "mediainfo-gui"; }; } diff --git a/pkgs/applications/misc/mediainfo/default.nix b/pkgs/applications/misc/mediainfo/default.nix index ea2adeab95b7..ffa7f68378db 100644 --- a/pkgs/applications/misc/mediainfo/default.nix +++ b/pkgs/applications/misc/mediainfo/default.nix @@ -28,5 +28,6 @@ stdenv.mkDerivation rec { license = licenses.bsd2; platforms = platforms.unix; maintainers = [ maintainers.devhell ]; + mainProgram = "mediainfo"; }; } diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix index c9523581b0a9..d00b9103d8f0 100644 --- a/pkgs/applications/misc/mupdf/default.nix +++ b/pkgs/applications/misc/mupdf/default.nix @@ -152,5 +152,6 @@ stdenv.mkDerivation rec { license = licenses.agpl3Plus; maintainers = with maintainers; [ vrthra fpletz ]; platforms = platforms.unix; + mainProgram = "mupdf"; }; } diff --git a/pkgs/applications/misc/mya/argp.patch b/pkgs/applications/misc/mya/argp.patch new file mode 100644 index 000000000000..352f8a077adc --- /dev/null +++ b/pkgs/applications/misc/mya/argp.patch @@ -0,0 +1,26 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 273968c..236e5fb 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -3,10 +3,6 @@ project(mya) + set(CMAKE_C_STANDARD 11 ) + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -Wall") + +-if(UNIX) +- set(LINUX TRUE) +-endif() +- + set(SRC_DIR src) + set(INC_DIR include) + +@@ -17,7 +13,8 @@ set_target_properties(mya PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DI + target_include_directories(mya PRIVATE ${INC_DIR}) + + set(LIBS curl json-c bsd) +-if(LINUX) +- list(APPEND LIBS) ++find_library(ARGP argp) ++if(ARGP) ++ list(APPEND LIBS argp) + endif() + target_link_libraries(mya ${LIBS}) diff --git a/pkgs/applications/misc/mya/default.nix b/pkgs/applications/misc/mya/default.nix new file mode 100644 index 000000000000..d33e6aecdf29 --- /dev/null +++ b/pkgs/applications/misc/mya/default.nix @@ -0,0 +1,67 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, ninja +, curl +, json_c +, libbsd +, argp-standalone +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "mya"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "jmakhack"; + repo = "myanimelist-cli"; + rev = "refs/tags/v${finalAttrs.version}"; + hash = "sha256-EmdkPpYEUIk9hr6rbnixjvznKSEnTCSMZz/17BfHGCk="; + }; + + nativeBuildInputs = [ + cmake + ninja + ]; + + buildInputs = [ + curl + json_c + libbsd + ] ++ lib.optionals (!stdenv.hostPlatform.isGnu) [ + argp-standalone + ]; + + patches = [ + ./argp.patch + ]; + + installPhase = '' + runHook preInstall + + # Based on the upstream PKGBUILD + mkdir -p $out/share/doc/${finalAttrs.pname} + cp -a bin $out + cp $cmakeDir/README.md $out/share/doc/${finalAttrs.pname} + + runHook postInstall + ''; + + meta = with lib; { + description = "Minimalistic command line interface for fetching user anime data from MyAnimeList"; + longDescription = '' + Minimalistic command line interface for fetching user anime data from MyAnimeList. + + You have to run this with the MYANIMELIST_CLIENT_ID environ variable set. + Where to get one: . + Select the type `other`. + ''; + homepage = "https://github.com/jmakhack/myanimelist-cli"; + changelog = "https://github.com/jmakhack/myanimelist-cli/releases/tag/v${finalAttrs.version}"; + license = licenses.mit; + maintainers = with maintainers; [ pbsds ]; + mainProgram = "mya"; + platforms = platforms.all; + }; +}) diff --git a/pkgs/applications/misc/mysql-workbench/default.nix b/pkgs/applications/misc/mysql-workbench/default.nix index 866583d497c9..ff9fb7c6b2cb 100644 --- a/pkgs/applications/misc/mysql-workbench/default.nix +++ b/pkgs/applications/misc/mysql-workbench/default.nix @@ -196,5 +196,6 @@ in stdenv.mkDerivation rec { license = licenses.gpl2; maintainers = [ ]; platforms = platforms.linux; + mainProgram = "mysql-workbench"; }; } diff --git a/pkgs/applications/misc/nwg-displays/default.nix b/pkgs/applications/misc/nwg-displays/default.nix index 56691d3ce14a..943861a3d71e 100644 --- a/pkgs/applications/misc/nwg-displays/default.nix +++ b/pkgs/applications/misc/nwg-displays/default.nix @@ -55,5 +55,6 @@ python310Packages.buildPythonApplication rec { license = lib.licenses.mit; platforms = lib.platforms.linux; maintainers = [ ]; + mainProgram = "nwg-displays"; }; } diff --git a/pkgs/applications/misc/openrgb/default.nix b/pkgs/applications/misc/openrgb/default.nix index bd1664e85ff5..41d855cd333f 100644 --- a/pkgs/applications/misc/openrgb/default.nix +++ b/pkgs/applications/misc/openrgb/default.nix @@ -54,5 +54,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ jonringer ]; license = licenses.gpl2Plus; platforms = platforms.linux; + mainProgram = "openrgb"; }; } diff --git a/pkgs/applications/misc/qdirstat/default.nix b/pkgs/applications/misc/qdirstat/default.nix index 3b1bdca19533..92949ad4a893 100644 --- a/pkgs/applications/misc/qdirstat/default.nix +++ b/pkgs/applications/misc/qdirstat/default.nix @@ -53,5 +53,6 @@ mkDerivation { license = licenses.gpl2Plus; maintainers = with maintainers; [ ]; platforms = platforms.linux; + mainProgram = "qdirstat"; }; } diff --git a/pkgs/applications/misc/rofi/default.nix b/pkgs/applications/misc/rofi/default.nix index a505ad13a1af..edd012034115 100644 --- a/pkgs/applications/misc/rofi/default.nix +++ b/pkgs/applications/misc/rofi/default.nix @@ -67,5 +67,6 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = with maintainers; [ bew ]; platforms = with platforms; linux; + mainProgram = "rofi"; }; } diff --git a/pkgs/applications/misc/safeeyes/default.nix b/pkgs/applications/misc/safeeyes/default.nix index 4b845737e7c8..6c839f65d942 100644 --- a/pkgs/applications/misc/safeeyes/default.nix +++ b/pkgs/applications/misc/safeeyes/default.nix @@ -18,11 +18,11 @@ with python3.pkgs; buildPythonApplication rec { pname = "safeeyes"; - version = "2.1.5"; + version = "2.1.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-IjFDhkqtMitdcQORerRqwty3ZMP8jamPtb9oMHdre4I="; + hash = "sha256-tvsBTf6+zKBzB5aL+LUcEvE4jmVHnnoY0L4xoKMJ0vM="; }; nativeBuildInputs = [ @@ -51,7 +51,7 @@ buildPythonApplication rec { postInstall = '' mkdir -p $out/share/applications cp -r safeeyes/platform/icons $out/share/icons/ - cp safeeyes/platform/safeeyes.desktop $out/share/applications/safeeyes.desktop + cp safeeyes/platform/io.github.slgobinath.SafeEyes.desktop $out/share/applications/io.github.slgobinath.SafeEyes.desktop ''; preFixup = '' diff --git a/pkgs/applications/misc/spicetify-cli/default.nix b/pkgs/applications/misc/spicetify-cli/default.nix index e9cacc00652e..3f77420a5634 100644 --- a/pkgs/applications/misc/spicetify-cli/default.nix +++ b/pkgs/applications/misc/spicetify-cli/default.nix @@ -38,5 +38,6 @@ buildGoModule rec { homepage = "https://github.com/spicetify/spicetify-cli/"; license = licenses.gpl3Plus; maintainers = with maintainers; [ jonringer mdarocha ]; + mainProgram = "spicetify-cli"; }; } diff --git a/pkgs/applications/misc/waybar/default.nix b/pkgs/applications/misc/waybar/default.nix index 3e082bf0811e..c4a764fec97b 100644 --- a/pkgs/applications/misc/waybar/default.nix +++ b/pkgs/applications/misc/waybar/default.nix @@ -142,5 +142,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ FlorianFranzen minijackson synthetica lovesegfault rodrgz ]; platforms = platforms.unix; homepage = "https://github.com/alexays/waybar"; + mainProgram = "waybar"; }; } diff --git a/pkgs/applications/misc/wofi/default.nix b/pkgs/applications/misc/wofi/default.nix index 0b76fb278d98..e64426365ecc 100644 --- a/pkgs/applications/misc/wofi/default.nix +++ b/pkgs/applications/misc/wofi/default.nix @@ -39,5 +39,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Only; maintainers = with maintainers; [ ]; platforms = with platforms; linux; + mainProgram = "wofi"; }; } diff --git a/pkgs/applications/misc/wttrbar/default.nix b/pkgs/applications/misc/wttrbar/default.nix index 90ec71e97575..4e4a84988115 100644 --- a/pkgs/applications/misc/wttrbar/default.nix +++ b/pkgs/applications/misc/wttrbar/default.nix @@ -25,5 +25,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/bjesus/wttrbar"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ khaneliman ]; + mainProgram = "wttrbar"; }; } diff --git a/pkgs/applications/networking/cloudflared/default.nix b/pkgs/applications/networking/cloudflared/default.nix index eea7abd62e64..68dd94b5ca99 100644 --- a/pkgs/applications/networking/cloudflared/default.nix +++ b/pkgs/applications/networking/cloudflared/default.nix @@ -79,5 +79,6 @@ buildGoModule rec { license = licenses.asl20; platforms = platforms.unix ++ platforms.windows; maintainers = with maintainers; [ bbigras enorris thoughtpolice piperswe ]; + mainProgram = "cloudflared"; }; } diff --git a/pkgs/applications/networking/davmail/default.nix b/pkgs/applications/networking/davmail/default.nix index 5f5283738c06..3f6c52a4d473 100644 --- a/pkgs/applications/networking/davmail/default.nix +++ b/pkgs/applications/networking/davmail/default.nix @@ -57,5 +57,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.all; + mainProgram = "davmail"; }; } diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix index 9a0b718293ab..cf2edf767316 100644 --- a/pkgs/applications/networking/dropbox/default.nix +++ b/pkgs/applications/networking/dropbox/default.nix @@ -86,5 +86,6 @@ buildFHSEnv { license = licenses.unfree; maintainers = with maintainers; [ ttuegel ]; platforms = [ "i686-linux" "x86_64-linux" ]; + mainProgram = "dropbox"; }; } diff --git a/pkgs/applications/networking/instant-messengers/freetalk/default.nix b/pkgs/applications/networking/instant-messengers/freetalk/default.nix index ffe82e6708aa..fdfbbc5b275b 100644 --- a/pkgs/applications/networking/instant-messengers/freetalk/default.nix +++ b/pkgs/applications/networking/instant-messengers/freetalk/default.nix @@ -1,43 +1,31 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch +{ lib, stdenv, fetchurl , guile, pkg-config, glib, loudmouth, gmp, libidn, readline, libtool , libunwind, ncurses, curl, jansson, texinfo -, automake, autoconf }: +, argp-standalone }: stdenv.mkDerivation rec { pname = "freetalk"; - version = "4.1"; + version = "4.2"; - src = fetchFromGitHub { - owner = "GNUFreetalk"; - repo = "freetalk"; - rev = "v${version}"; - sha256 = "09jwk2i8qd8c7wrn9xbqcwm32720dwxis22kf3jpbg8mn6w6i757"; + src = fetchurl { + url = "mirror://gnu/freetalk/freetalk-${version}.tar.gz"; + hash = "sha256-u1tPKacGry+JGYeAIgDia3N7zs5EM4FyQZdV8e7htYA="; }; - patches = [ - # Pull pending patch for -fno-common tuulchain support: - # https://github.com/GNUFreetalk/freetalk/pull/39 - (fetchpatch { - name = "fno-common.patch"; - url = "https://github.com/GNUFreetalk/freetalk/commit/f04d6bc8422be44cdf51b29c9a4310f20a18775a.patch"; - sha256 = "1zjm56cdibnqabgcwl2bx79dj6dmqjf40zghqwwb0lfi60v1njqf"; - }) - ]; - - preConfigure = '' - ./autogen.sh - ''; - - nativeBuildInputs = [ pkg-config texinfo autoconf automake ]; + nativeBuildInputs = [ pkg-config texinfo ]; buildInputs = [ guile glib loudmouth gmp libidn readline libtool libunwind ncurses curl jansson + ] ++ lib.optionals stdenv.isDarwin [ + argp-standalone ]; + env.NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-largp"; + meta = with lib; { description = "Console XMPP client"; license = licenses.gpl3Plus ; maintainers = with maintainers; [ raskin ]; - platforms = platforms.linux; + platforms = platforms.unix; downloadPage = "https://www.gnu.org/software/freetalk/"; }; } diff --git a/pkgs/applications/networking/p2p/flood/default.nix b/pkgs/applications/networking/p2p/flood/default.nix index 3f577289502a..8ee94f17e50c 100644 --- a/pkgs/applications/networking/p2p/flood/default.nix +++ b/pkgs/applications/networking/p2p/flood/default.nix @@ -21,5 +21,6 @@ buildNpmPackage rec { homepage = "https://flood.js.org"; license = licenses.gpl3Only; maintainers = with maintainers; [ thiagokokada winter ]; + mainProgram = "flood"; }; } diff --git a/pkgs/applications/networking/p2p/rakshasa-rtorrent/default.nix b/pkgs/applications/networking/p2p/rakshasa-rtorrent/default.nix index a6f59374db88..c454c3ad2053 100644 --- a/pkgs/applications/networking/p2p/rakshasa-rtorrent/default.nix +++ b/pkgs/applications/networking/p2p/rakshasa-rtorrent/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "rakshasa-rtorrent"; - version = "0.9.8+date=2021-08-07"; + version = "0.9.8+date=2022-06-20"; src = fetchFromGitHub { owner = "rakshasa"; repo = "rtorrent"; - rev = "a6bc99bb821d86b3b0633552db3fbd0a22497657"; - hash = "sha256-HTwAs8dfZVXfLRNiT6QpjKGnuahHfoMfYWqdKkedUL0="; + rev = "92bec88d0904bfb31c808085c2fd0f22d0ec8db7"; + hash = "sha256-er7UdIb+flhq0ye76UmomgfHV2ZSBROpXmfrNDHwTWw="; }; passthru = { diff --git a/pkgs/applications/science/biology/picard-tools/default.nix b/pkgs/applications/science/biology/picard-tools/default.nix index 8bd1af4b11d7..e0555055c1a4 100644 --- a/pkgs/applications/science/biology/picard-tools/default.nix +++ b/pkgs/applications/science/biology/picard-tools/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "picard-tools"; - version = "3.0.0"; + version = "3.1.0"; src = fetchurl { url = "https://github.com/broadinstitute/picard/releases/download/${version}/picard.jar"; - sha256 = "sha256-DV4oqzAfrTsCAw0BkjiIEpuoLF9yKsXMstQYq3asVJk="; + sha256 = "sha256-6nnKYnml6BjLb6aKNHbd55nH6gP/5Somo8poxx7yhVk="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/science/electronics/geda/default.nix b/pkgs/applications/science/electronics/geda/default.nix index 6b77f75b11bb..775bae981339 100644 --- a/pkgs/applications/science/electronics/geda/default.nix +++ b/pkgs/applications/science/electronics/geda/default.nix @@ -1,32 +1,20 @@ -{ lib, stdenv, fetchurl, fetchpatch, pkg-config, guile, gtk2, flex, gawk, perl }: +{ lib, stdenv, fetchurl, groff, pkg-config, python2, guile, gtk2, flex, gawk, perl }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "geda"; - version = "1.8.2-20130925"; + version = "1.10.2"; src = fetchurl { - url = "http://ftp.geda-project.org/geda-gaf/stable/v1.8/1.8.2/geda-gaf-1.8.2.tar.gz"; - sha256 = "08dpa506xk4gjbbi8vnxcb640wq4ihlgmhzlssl52nhvxwx7gx5v"; + url = "http://ftp.geda-project.org/geda-gaf/stable/v${lib.versions.majorMinor version}/${version}/geda-gaf-${version}.tar.gz"; + hash = "sha256-6GKrJBUoU4+jvuJzkmH1aAERArYMXjmi8DWGY8BCyKQ="; }; - patches = [ - # Pull upstream patch for -fno-common toolchains - (fetchpatch { - name = "fno-common-p1.patch"; - url = "http://git.geda-project.org/geda-gaf/patch/?id=cb6bac898fe43c5a59b577123ba8698ec04deef6"; - sha256 = "0njlh20qjrlqf5m8p92vmkl0jsm747f4mbqwvldnf8nd2j608nkq"; - }) - (fetchpatch { - name = "fno-common-p2.patch"; - url = "http://git.geda-project.org/geda-gaf/patch/?id=7b9d523a3558290b4487c3ff9a4a5b43e8941158"; - sha256 = "1z9gzz5ngsbq6c9dw2dfz7kpsq97zhs1ma9saxm7hiybwadbj18k"; - }) - ]; - configureFlags = [ "--disable-update-xdg-database" + "--without-libfam" ]; - nativeBuildInputs = [ pkg-config ]; + + nativeBuildInputs = [ groff pkg-config python2 ]; buildInputs = [ guile gtk2 flex gawk perl ]; meta = with lib; { diff --git a/pkgs/applications/science/logic/beluga/default.nix b/pkgs/applications/science/logic/beluga/default.nix index e44506cebcb2..3cb06c4e7b14 100644 --- a/pkgs/applications/science/logic/beluga/default.nix +++ b/pkgs/applications/science/logic/beluga/default.nix @@ -8,7 +8,7 @@ ocamlPackages.buildDunePackage rec { owner = "Beluga-lang"; repo = "Beluga"; rev = "refs/tags/v${version}"; - hash = "sha256-GN4ZOlhs8ktAcCu7iE4lh6HxhTu+KCJJbIvcI4MGcr0="; + hash = "sha256-0E7rmiLmQPfOAQ1qKiqxeLdqviVl+Thkl6KfOWkGZRc="; }; duneVersion = "3"; diff --git a/pkgs/applications/window-managers/wayfire/default.nix b/pkgs/applications/window-managers/wayfire/default.nix index ab68bc58ee06..133b561be621 100644 --- a/pkgs/applications/window-managers/wayfire/default.nix +++ b/pkgs/applications/window-managers/wayfire/default.nix @@ -21,16 +21,16 @@ , xorg }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "wayfire"; version = "0.7.5"; src = fetchFromGitHub { owner = "WayfireWM"; - repo = pname; - rev = "v${version}"; + repo = "wayfire"; + rev = "v${finalAttrs.version}"; fetchSubmodules = true; - sha256 = "sha256-Z+rR9pY244I3i/++XZ4ROIkq3vtzMgcxxHvJNxFD9is="; + hash = "sha256-Z+rR9pY244I3i/++XZ4ROIkq3vtzMgcxxHvJNxFD9is="; }; nativeBuildInputs = [ @@ -40,7 +40,6 @@ stdenv.mkDerivation rec { wayland-scanner ]; - buildInputs = [ wf-config libdrm @@ -78,11 +77,12 @@ stdenv.mkDerivation rec { passthru.providedSessions = [ "wayfire" ]; - meta = with lib; { + meta = { homepage = "https://wayfire.org/"; description = "3D Wayland compositor"; - license = licenses.mit; - maintainers = with maintainers; [ qyliss wucke13 rewine ]; - platforms = platforms.unix; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ qyliss wucke13 rewine ]; + platforms = lib.platforms.unix; + mainProgram = "wayfire"; }; -} +}) diff --git a/pkgs/applications/window-managers/wayfire/wcm.nix b/pkgs/applications/window-managers/wayfire/wcm.nix index a67702185521..48be049560b5 100644 --- a/pkgs/applications/window-managers/wayfire/wcm.nix +++ b/pkgs/applications/window-managers/wayfire/wcm.nix @@ -16,16 +16,16 @@ , libxml2 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "wcm"; version = "0.7.5"; src = fetchFromGitHub { owner = "WayfireWM"; - repo = pname; - rev = "v${version}"; + repo = "wcm"; + rev = "v${finalAttrs.version}"; fetchSubmodules = true; - sha256 = "sha256-LJR9JGl49o4O6LARofz3jOeAqseGcmzVhMnhk/aobUU="; + hash = "sha256-LJR9JGl49o4O6LARofz3jOeAqseGcmzVhMnhk/aobUU="; }; nativeBuildInputs = [ @@ -51,11 +51,12 @@ stdenv.mkDerivation rec { "-Denable_wdisplays=false" ]; - meta = with lib; { + meta = { homepage = "https://github.com/WayfireWM/wcm"; description = "Wayfire Config Manager"; - license = licenses.mit; - maintainers = with maintainers; [ qyliss wucke13 rewine ]; - platforms = platforms.unix; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ qyliss wucke13 rewine ]; + platforms = lib.platforms.unix; + mainProgram = "wcm"; }; -} +}) diff --git a/pkgs/applications/window-managers/wayfire/wf-config.nix b/pkgs/applications/window-managers/wayfire/wf-config.nix index 19435a87395b..923c3930c9b8 100644 --- a/pkgs/applications/window-managers/wayfire/wf-config.nix +++ b/pkgs/applications/window-managers/wayfire/wf-config.nix @@ -11,15 +11,15 @@ , libxml2 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "wf-config"; version = "0.7.1"; src = fetchFromGitHub { owner = "WayfireWM"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-ADUBvDJcPYEB9ZvaFIgTfemo1WYwiWgCWX/z2yrEPtA="; + repo = "wf-config"; + rev = "v${finalAttrs.version}"; + hash = "sha256-ADUBvDJcPYEB9ZvaFIgTfemo1WYwiWgCWX/z2yrEPtA="; }; nativeBuildInputs = [ @@ -50,11 +50,11 @@ stdenv.mkDerivation rec { doCheck = true; - meta = with lib; { + meta = { homepage = "https://github.com/WayfireWM/wf-config"; description = "Library for managing configuration files, written for Wayfire"; - license = licenses.mit; - maintainers = with maintainers; [ qyliss wucke13 rewine ]; - platforms = platforms.unix; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ qyliss wucke13 rewine ]; + platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/applications/window-managers/wayfire/wf-shell.nix b/pkgs/applications/window-managers/wayfire/wf-shell.nix index 10e16a6573e1..7af794db7886 100644 --- a/pkgs/applications/window-managers/wayfire/wf-shell.nix +++ b/pkgs/applications/window-managers/wayfire/wf-shell.nix @@ -13,16 +13,16 @@ , pulseaudio }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "wf-shell"; version = "0.7.0"; src = fetchFromGitHub { owner = "WayfireWM"; - repo = pname; - rev = "v${version}"; + repo = "wf-shell"; + rev = "v${finalAttrs.version}"; fetchSubmodules = true; - sha256 = "sha256-iQUBuNjbZuf51A69RC6NsMHFZCFRv+d9XZ0HtP6OpOA="; + hash = "sha256-iQUBuNjbZuf51A69RC6NsMHFZCFRv+d9XZ0HtP6OpOA="; }; nativeBuildInputs = [ @@ -43,11 +43,11 @@ stdenv.mkDerivation rec { mesonFlags = [ "--sysconfdir /etc" ]; - meta = with lib; { + meta = { homepage = "https://github.com/WayfireWM/wf-shell"; description = "GTK3-based panel for Wayfire"; - license = licenses.mit; - maintainers = with maintainers; [ qyliss wucke13 rewine ]; - platforms = platforms.unix; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ qyliss wucke13 rewine ]; + platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/desktops/gnome/core/gnome-software/default.nix b/pkgs/desktops/gnome/core/gnome-software/default.nix index bee1f9e86db5..99ab7e4d5ca2 100644 --- a/pkgs/desktops/gnome/core/gnome-software/default.nix +++ b/pkgs/desktops/gnome/core/gnome-software/default.nix @@ -45,11 +45,11 @@ in stdenv.mkDerivation rec { pname = "gnome-software"; - version = "44.3"; + version = "44.4"; src = fetchurl { url = "mirror://gnome/sources/gnome-software/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "Mlq7ciyrILaqZ/FY6i/y6omYMMoKiD4kWU2d74X9FiI="; + sha256 = "i1N2fvbMVKLbWI7xxZJoOLDWe42bIRc95ROc0PvSgJU="; }; patches = [ diff --git a/pkgs/desktops/gnome/core/rygel/default.nix b/pkgs/desktops/gnome/core/rygel/default.nix index 6fe843282614..059fcde8ea3c 100644 --- a/pkgs/desktops/gnome/core/rygel/default.nix +++ b/pkgs/desktops/gnome/core/rygel/default.nix @@ -28,14 +28,14 @@ stdenv.mkDerivation rec { pname = "rygel"; - version = "0.42.3"; + version = "0.42.4"; # TODO: split out lib outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "D97CEoU36LVcPFQNCoDcfCSaspFT9L4Bl6XzECWlpaA="; + sha256 = "YxDfqi0zK2YRm5sCD61qS9J9m8Yfr3gMpcoLYoEzA/c="; }; patches = [ diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix index 8fe6748c08f6..48dd456bcb2f 100644 --- a/pkgs/development/compilers/crystal/default.nix +++ b/pkgs/development/compilers/crystal/default.nix @@ -279,8 +279,8 @@ rec { }; crystal_1_9 = generic { - version = "1.9.0"; - sha256 = "sha256-FFpAL1U8WtfwDCLaUP+axSnJlGaKp/jzBs54rit9T2A="; + version = "1.9.2"; + sha256 = "sha256-M1oUFs7/8ljszga3StzLOLM1aA4fSfVPQlsbuDHGd84="; binary = binaryCrystal_1_2; }; diff --git a/pkgs/development/guile-modules/guile-xcb/default.nix b/pkgs/development/guile-modules/guile-xcb/default.nix index d009901bbf2e..19a790db77a4 100644 --- a/pkgs/development/guile-modules/guile-xcb/default.nix +++ b/pkgs/development/guile-modules/guile-xcb/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, autoreconfHook , guile , pkg-config , texinfo @@ -8,16 +9,17 @@ stdenv.mkDerivation rec { pname = "guile-xcb"; - version = "1.3"; + version = "unstable-2017-05-29"; src = fetchFromGitHub { owner = "mwitmer"; repo = pname; - rev = version; - hash = "sha256-8iaYil2wiqnu9p7Gj93GE5akta1A0zqyApRwHct5RSs="; + rev = "db7d5a393cc37a56f66541b3f33938b40c6f35b3"; + hash = "sha256-zbIsEIPwNJ1YXMZTDw2DfzufC+IZWfcWgZHbuv7bhJs="; }; nativeBuildInputs = [ + autoreconfHook pkg-config ]; buildInputs = [ @@ -30,6 +32,10 @@ stdenv.mkDerivation rec { "--with-guile-site-ccache-dir=$out/share/guile/site" ]; + makeFlags = [ + "GUILE_AUTO_COMPILE=0" + ]; + meta = with lib; { homepage = "https://github.com/mwitmer/guile-xcb"; description = "XCB bindings for Guile"; diff --git a/pkgs/development/libraries/libmatheval/default.nix b/pkgs/development/libraries/libmatheval/default.nix index b0fe1c35ef3a..fcf4167c1901 100644 --- a/pkgs/development/libraries/libmatheval/default.nix +++ b/pkgs/development/libraries/libmatheval/default.nix @@ -1,10 +1,13 @@ -{ lib, stdenv, fetchurl, pkg-config, guile, autoconf, flex, fetchpatch }: +{ lib, stdenv, fetchurl, pkg-config, guile, flex, fetchpatch }: +let + guileVersion = lib.versions.majorMinor guile.version; +in stdenv.mkDerivation rec { version = "1.1.11"; pname = "libmatheval"; - nativeBuildInputs = [ pkg-config autoconf flex ]; + nativeBuildInputs = [ pkg-config flex ]; buildInputs = [ guile ]; src = fetchurl { @@ -14,19 +17,23 @@ stdenv.mkDerivation rec { # Patches coming from debian package # https://packages.debian.org/source/sid/libs/libmatheval - patches = [ (fetchpatch { - url = "https://salsa.debian.org/science-team/libmatheval/raw/debian/1.1.11+dfsg-3/debian/patches/002-skip-docs.patch"; - sha256 = "1nnkk9aw4jj6nql46zhwq6vx74zrmr1xq5ix0xyvpawhabhgjg62"; - } ) - (fetchpatch { - url = "https://salsa.debian.org/science-team/libmatheval/raw/debian/1.1.11+dfsg-3/debian/patches/003-guile2.0.patch"; - sha256 = "1xgfw4finfvr20kjbpr4yl2djxmyr4lmvfa11pxirfvhrdi602qj"; - } ) - (fetchpatch { - url = "https://salsa.debian.org/science-team/libmatheval/raw/debian/1.1.11+dfsg-3/debian/patches/disable_coth_test.patch"; - sha256 = "0bai8jrd5azfz5afmjixlvifk34liq58qb7p9kb45k6kc1fqqxzm"; - } ) - ]; + patches = [ + (fetchpatch { + url = "https://sources.debian.org/data/main/libm/libmatheval/1.1.11%2Bdfsg-5/debian/patches/002-skip-docs.patch"; + hash = "sha256-wjz54FKQq7t9Bz0W3EOu+ZPTt8EcfkMotkZKwlWa09o="; + }) + (fetchpatch { + url = "https://sources.debian.org/data/main/libm/libmatheval/1.1.11%2Bdfsg-5/debian/patches/003-guile3.0.patch"; + hash = "sha256-H3E/2m4MfQAbjpXbVFyNhikVifi3spVThzaVU5srmjI="; + }) + (fetchpatch { + url = "https://sources.debian.org/data/main/libm/libmatheval/1.1.11%2Bdfsg-5/debian/patches/disable_coth_test.patch"; + hash = "sha256-9XeMXWDTzELWTPcsjAqOlIzp4qY9yupU+e6r0rJEUS0="; + }) + ]; + + env.NIX_CFLAGS_COMPILE = "-I${lib.getDev guile}/include/guile/${guileVersion}"; + env.NIX_LDFLAGS = "-L${guile}/lib -lguile-${guileVersion}"; meta = { description = "A library to parse and evaluate symbolic expressions input as text"; @@ -40,7 +47,7 @@ stdenv.mkDerivation rec { homepage = "https://www.gnu.org/software/libmatheval/"; license = lib.licenses.gpl3; maintainers = [ lib.maintainers.bzizou ]; - platforms = lib.platforms.linux; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/loudmouth/default.nix b/pkgs/development/libraries/loudmouth/default.nix index fb5409a7e727..d1a8c4887249 100644 --- a/pkgs/development/libraries/loudmouth/default.nix +++ b/pkgs/development/libraries/loudmouth/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, openssl, libidn, glib, pkg-config, zlib }: +{ lib, stdenv, fetchurl, openssl, libidn, glib, pkg-config, zlib, darwin }: stdenv.mkDerivation rec { version = "1.5.3"; @@ -9,15 +9,17 @@ stdenv.mkDerivation rec { sha256 = "0b6kd5gpndl9nzis3n6hcl0ldz74bnbiypqgqa1vgb0vrcar8cjl"; }; - patches = [ - ]; - configureFlags = [ "--with-ssl=openssl" ]; propagatedBuildInputs = [ openssl libidn glib zlib ]; nativeBuildInputs = [ pkg-config ]; + buildInputs = lib.optionals (stdenv.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "11") [ + darwin.apple_sdk.frameworks.AppKit + darwin.apple_sdk.frameworks.Foundation + ]; + meta = with lib; { description = "A lightweight C library for the Jabber protocol"; platforms = platforms.all; diff --git a/pkgs/development/node-packages/main-programs.nix b/pkgs/development/node-packages/main-programs.nix index c327b3b9a5bb..494a69e8a3c2 100644 --- a/pkgs/development/node-packages/main-programs.nix +++ b/pkgs/development/node-packages/main-programs.nix @@ -1,5 +1,4 @@ -# Use this file to add `meta.mainProgram` to packages in `nodePackages`, that don't provide an -# executable that matches that packages name, so that they'll work with `nix run`. +# Use this file to add `meta.mainProgram` to packages in `nodePackages`. { # Packages that provide multiple executables where one is clearly the `mainProgram`. "@antfu/ni" = "ni"; @@ -11,7 +10,7 @@ vue-cli = "vue"; "@withgraphite/graphite-cli" = "gt"; - # Packages that provide a single executable whose name differs from the package's `name`. + # Packages that provide a single executable. "@angular/cli" = "ng"; "@antora/cli" = "antora"; "@astrojs/language-server" = "astro-ls"; @@ -47,7 +46,6 @@ 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/python-modules/add-trailing-comma/default.nix b/pkgs/development/python-modules/add-trailing-comma/default.nix index 37c0a26b3b00..b0af50573ad9 100644 --- a/pkgs/development/python-modules/add-trailing-comma/default.nix +++ b/pkgs/development/python-modules/add-trailing-comma/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "add-trailing-comma"; - version = "3.0.0"; + version = "3.0.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "asottile"; repo = pname; rev = "v${version}"; - hash = "sha256-uknXi7fsCWK5ngCEyfpkjovCtvL5v6OwN5kVoBpNZsY="; + hash = "sha256-wCqCKomnkYgvxDWtjBwyqKb09sTPqPgWbYohgosUaHA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/aiounifi/default.nix b/pkgs/development/python-modules/aiounifi/default.nix index 9798938070c3..d99ff10cfa8d 100644 --- a/pkgs/development/python-modules/aiounifi/default.nix +++ b/pkgs/development/python-modules/aiounifi/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "aiounifi"; - version = "50"; + version = "51"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "Kane610"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-ydSKXydtOJaAI2PCPX+8jh4w9otX64Lj7QwbasTdWf0="; + hash = "sha256-XR/yZLxTHVHxm/QLCKrp9XFJ7yZybPjPxKEhf1SOzD0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/bc-detect-secrets/default.nix b/pkgs/development/python-modules/bc-detect-secrets/default.nix index 9d173187ef73..0b7d04c69e85 100644 --- a/pkgs/development/python-modules/bc-detect-secrets/default.nix +++ b/pkgs/development/python-modules/bc-detect-secrets/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "bc-detect-secrets"; - version = "1.4.29"; + version = "1.4.30"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "bridgecrewio"; repo = "detect-secrets"; rev = "refs/tags/${version}"; - hash = "sha256-oMJMiXS4/OU5/LWV2i2CcDQZL5yuusXGwgZG2OMMlaQ="; + hash = "sha256-wq+SKOiMcVO7OiK+RdRk4RNsjSAT7lBdAjLHfurSIRo="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/commandparse/default.nix b/pkgs/development/python-modules/commandparse/default.nix index 68da870f4e2d..e146649604f0 100644 --- a/pkgs/development/python-modules/commandparse/default.nix +++ b/pkgs/development/python-modules/commandparse/default.nix @@ -1,20 +1,27 @@ { lib , buildPythonPackage , fetchPypi +, pythonOlder }: buildPythonPackage rec { pname = "commandparse"; - version = "1.1.1"; + version = "1.1.2"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "06mcxc0vs5qdcywalgyx5zm18z4xcsrg5g0wsqqv5qawkrvmvl53"; + sha256 = "sha256-S9e90BtS6qMjFtYUmgC0w4IKQP8q1iR2tGqq5l2+n6o="; }; # tests only distributed upstream source, not PyPi doCheck = false; - pythonImportsCheck = [ "commandparse" ]; + + pythonImportsCheck = [ + "commandparse" + ]; meta = with lib; { description = "Python module to parse command based CLI application"; diff --git a/pkgs/development/python-modules/confection/default.nix b/pkgs/development/python-modules/confection/default.nix index 40e388b0659b..d4b3152c3b46 100644 --- a/pkgs/development/python-modules/confection/default.nix +++ b/pkgs/development/python-modules/confection/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "confection"; - version = "0.1.0"; + version = "0.1.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "explosion"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-yF+rG0UblGk6BCrqFrWXkB8ET0NPCL7v+4IJTmkYoTY="; + hash = "sha256-OpUMx8hcTnBdaATzRXBICwF6eAGsdyA0jFvX4nVBiM4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/dbus-fast/default.nix b/pkgs/development/python-modules/dbus-fast/default.nix index 42e10168f3db..ec01d5ab3327 100644 --- a/pkgs/development/python-modules/dbus-fast/default.nix +++ b/pkgs/development/python-modules/dbus-fast/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "dbus-fast"; - version = "1.88.0"; + version = "1.90.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-sx2q/we7f8IfoqdsTiDo1QqMY6TSVMW//vKTtkqcrY8="; + hash = "sha256-B+NW7ORKIBtjxeR0W0tX7V1MgBtNoyGFX35TXUl7rVE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/faraday-agent-parameters-types/default.nix b/pkgs/development/python-modules/faraday-agent-parameters-types/default.nix index cadde12cafd1..7e7624020d5f 100644 --- a/pkgs/development/python-modules/faraday-agent-parameters-types/default.nix +++ b/pkgs/development/python-modules/faraday-agent-parameters-types/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "faraday-agent-parameters-types"; - version = "1.3.0"; + version = "1.3.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "faraday_agent_parameters_types"; inherit version; - hash = "sha256-XWuWg8PzXdLIuUTZ5dnpFmFmqEhOReqIEmBbCpzdzrg="; + hash = "sha256-yWDZPa9+DZh2Bj9IIeIVFpAt9nhQOk2tTZh02difsCs="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/gitignore-parser/default.nix b/pkgs/development/python-modules/gitignore-parser/default.nix index 3446f653d468..7003443f1736 100644 --- a/pkgs/development/python-modules/gitignore-parser/default.nix +++ b/pkgs/development/python-modules/gitignore-parser/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "gitignore-parser"; - version = "0.1.4"; + version = "0.1.5"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "mherrmann"; repo = "gitignore_parser"; rev = "refs/tags/v${version}"; - hash = "sha256-kc1Y3kHcVVao9zqQMbUeMi/9s+W2aUAapCx3h8VyWRQ="; + hash = "sha256-Z2x09XwFDMf6sUoKXJ240abp7zctbVCN4dsoQmWVSn8="; }; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-securitycenter/default.nix b/pkgs/development/python-modules/google-cloud-securitycenter/default.nix index 2b985e96e728..4063ad21ae9c 100644 --- a/pkgs/development/python-modules/google-cloud-securitycenter/default.nix +++ b/pkgs/development/python-modules/google-cloud-securitycenter/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "google-cloud-securitycenter"; - version = "1.23.1"; + version = "1.23.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-GlFoeifExNS7pd+vDnYWsGWPNDkQ4SmnFFnTnsjTN6Q="; + hash = "sha256-3QdHomKKN8bSUtyFCZJliw/FxNixVj9pdkzMwJWT880="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/karton-core/default.nix b/pkgs/development/python-modules/karton-core/default.nix index 43d65c4f0f75..8805636080cd 100644 --- a/pkgs/development/python-modules/karton-core/default.nix +++ b/pkgs/development/python-modules/karton-core/default.nix @@ -2,6 +2,7 @@ , boto3 , buildPythonPackage , fetchFromGitHub +, orjson , unittestCheckHook , pythonOlder , redis @@ -9,7 +10,7 @@ buildPythonPackage rec { pname = "karton-core"; - version = "5.1.0"; + version = "5.2.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,11 +19,12 @@ buildPythonPackage rec { owner = "CERT-Polska"; repo = "karton"; rev = "refs/tags/v${version}"; - hash = "sha256-IhxMei6KkPsDnUkV4+zxSMI7rgZgOvbHQFqJAC1b5iw="; + hash = "sha256-1Bv0e218cvLuv/go0L13C39fFAeo0FJeCoU+XFUBhzk="; }; propagatedBuildInputs = [ boto3 + orjson redis ]; diff --git a/pkgs/development/python-modules/karton-yaramatcher/default.nix b/pkgs/development/python-modules/karton-yaramatcher/default.nix index f85c756b811e..2c6dc57d9966 100644 --- a/pkgs/development/python-modules/karton-yaramatcher/default.nix +++ b/pkgs/development/python-modules/karton-yaramatcher/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "karton-yaramatcher"; - version = "1.2.0"; + version = "1.3.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "CERT-Polska"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-ulWwPXbjqQXwSRi8MFdcx7vC7P19yu66Ll8jkuTesao="; + hash = "sha256-URGW8FyJZ3ktrwolls5ElSWn8FD6vWCA+Eu0aGtPh6U="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/mat2/default.nix b/pkgs/development/python-modules/mat2/default.nix index 3737bea08243..97b9090cc250 100644 --- a/pkgs/development/python-modules/mat2/default.nix +++ b/pkgs/development/python-modules/mat2/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "mat2"; - version = "0.13.3"; + version = "0.13.4"; disabled = pythonOlder "3.5"; @@ -34,7 +34,7 @@ buildPythonPackage rec { owner = "jvoisin"; repo = "mat2"; rev = version; - hash = "sha256-x3vGltGuFjI435lEXZU3p4eQcgRm0Oodqd6pTWO7ZX8="; + hash = "sha256-SuN62JjSb5O8gInvBH+elqv/Oe7j+xjCo+dmPBU7jEY="; }; patches = [ @@ -97,6 +97,7 @@ buildPythonPackage rec { homepage = "https://0xacab.org/jvoisin/mat2"; changelog = "https://0xacab.org/jvoisin/mat2/-/blob/${version}/CHANGELOG.md"; license = licenses.lgpl3Plus; + mainProgram = "mat2"; maintainers = with maintainers; [ dotlambda ]; }; } diff --git a/pkgs/development/python-modules/moderngl_window/default.nix b/pkgs/development/python-modules/moderngl_window/default.nix index 36294fab76fe..e2d498bc4215 100644 --- a/pkgs/development/python-modules/moderngl_window/default.nix +++ b/pkgs/development/python-modules/moderngl_window/default.nix @@ -1,4 +1,5 @@ -{ lib +{ stdenv +, lib , buildPythonPackage , fetchFromGitHub , isPy3k @@ -11,14 +12,14 @@ }: buildPythonPackage rec { - pname = "moderngl_window"; - version = "2.4.2"; + pname = "moderngl-window"; + version = "2.4.4"; src = fetchFromGitHub { owner = "moderngl"; - repo = pname; + repo = "moderngl_window"; rev = "refs/tags/${version}"; - hash = "sha256-jsASGYrsH9UNanswX2bZyWS3co/2Y1joaQ98virWcBE="; + hash = "sha256-mg3j5ZoMwdk39L5xjcoEJo9buqssM1VLJtndSFsuCB0="; }; propagatedBuildInputs = [ numpy moderngl pyglet pillow pyrr glcontext ]; @@ -28,11 +29,14 @@ buildPythonPackage rec { # Tests need a display to run. doCheck = false; + pythonImportsCheck = [ "moderngl_window" ]; + meta = with lib; { homepage = "https://github.com/moderngl/moderngl_window"; description = "Cross platform helper library for ModernGL making window creation and resource loading simple"; license = licenses.mit; - platforms = platforms.linux; # should be mesaPlatforms, darwin build breaks. + broken = stdenv.isDarwin; # darwin build breaks + platforms = platforms.mesaPlatforms; maintainers = with maintainers; [ c0deaddict ]; }; } diff --git a/pkgs/development/python-modules/mypy-boto3-builder/default.nix b/pkgs/development/python-modules/mypy-boto3-builder/default.nix index 4f46289634bc..239dccb7e2a0 100644 --- a/pkgs/development/python-modules/mypy-boto3-builder/default.nix +++ b/pkgs/development/python-modules/mypy-boto3-builder/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "mypy-boto3-builder"; - version = "7.17.1"; + version = "7.17.2"; format = "pyproject"; disabled = pythonOlder "3.10"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "youtype"; repo = "mypy_boto3_builder"; rev = "refs/tags/${version}"; - hash = "sha256-QzofWNnYTAlxoeJm8HRaGBOV5rqkhjHHOEwYNrXTh/I="; + hash = "sha256-YuHq3pfx3dNgi9M4dGSmIOC3iZaLe9lqrRL0q3ggCTs="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/opower/default.nix b/pkgs/development/python-modules/opower/default.nix index f0e07dc09bf1..299de618087f 100644 --- a/pkgs/development/python-modules/opower/default.nix +++ b/pkgs/development/python-modules/opower/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "opower"; - version = "0.0.18"; + version = "0.0.20"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "tronikos"; repo = "opower"; rev = "refs/tags/v${version}"; - hash = "sha256-IlM4BPwZ42Bequs3edzP+iclOsHRf6bsDaaZOg+ynx4="; + hash = "sha256-hb+TVnCAAnsoKPk9N1bDXj463CErp7nn2cteOumKhLs="; }; pythonRemoveDeps = [ diff --git a/pkgs/development/python-modules/publicsuffixlist/default.nix b/pkgs/development/python-modules/publicsuffixlist/default.nix index c671d929a143..3a46c99691f9 100644 --- a/pkgs/development/python-modules/publicsuffixlist/default.nix +++ b/pkgs/development/python-modules/publicsuffixlist/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "publicsuffixlist"; - version = "0.10.0.20230730"; + version = "0.10.0.20230804"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-HNOEfsHrwCBpcVYwlYrWe9/rfn+fNfaZ0w/EEpjO7aw="; + hash = "sha256-J8yeq9CuzXGlqPjGf8hnV0IeI+Wg0Q5GS69/8z+FLp8="; }; passthru.optional-dependencies = { diff --git a/pkgs/development/python-modules/pyatv/default.nix b/pkgs/development/python-modules/pyatv/default.nix index 4c1374373964..5cddd154aa3f 100644 --- a/pkgs/development/python-modules/pyatv/default.nix +++ b/pkgs/development/python-modules/pyatv/default.nix @@ -19,12 +19,13 @@ , pythonOlder , requests , srptools +, stdenv , zeroconf }: buildPythonPackage rec { pname = "pyatv"; - version = "0.13.2"; + version = "0.13.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -33,7 +34,7 @@ buildPythonPackage rec { owner = "postlund"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-7jXxnZLruwNzYVOn3c+YlF2olwezwjpwXInDem44/vE="; + hash = "sha256-lg7gsCB8zn+q+ZTkIoGkIls10xS7bp8Svd749a10bWA="; }; postPatch = '' @@ -87,6 +88,11 @@ buildPythonPackage rec { "--asyncio-mode=legacy" ]; + disabledTests = lib.optionals (stdenv.isDarwin) [ + # tests/protocols/raop/test_raop_functional.py::test_stream_retransmission[raop_properties2-2-True] - assert False + "test_stream_retransmission" + ]; + disabledTestPaths = [ # Test doesn't work in the sandbox "tests/protocols/companion/test_companion_auth.py" diff --git a/pkgs/development/python-modules/python-roborock/default.nix b/pkgs/development/python-modules/python-roborock/default.nix index f7aa10c9b2b7..ade8f0cfd76b 100644 --- a/pkgs/development/python-modules/python-roborock/default.nix +++ b/pkgs/development/python-modules/python-roborock/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "python-roborock"; - version = "0.31.1"; + version = "0.32.0"; format = "pyproject"; disabled = pythonOlder "3.10"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "humbertogontijo"; repo = "python-roborock"; rev = "refs/tags/v${version}"; - hash = "sha256-t5UYdoaKqUrEIgRQy1URtNhFmlkB2sgGwsLrclqH6Tg="; + hash = "sha256-DojIfAmYW/asvpAkcBj/pN1rdCPFD4nwkEqpGVBkMoE="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/qcs-api-client/default.nix b/pkgs/development/python-modules/qcs-api-client/default.nix index 8de6ba9e6dc5..e140c949b631 100644 --- a/pkgs/development/python-modules/qcs-api-client/default.nix +++ b/pkgs/development/python-modules/qcs-api-client/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "qcs-api-client"; - version = "0.21.5"; + version = "0.21.6"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "rigetti"; repo = "qcs-api-client-python"; rev = "refs/tags/v${version}"; - hash = "sha256-lw6jswIaqDFExz/hjIrpZf4BC757l83MeCfOyZaTbfg="; + hash = "sha256-1vXqwir3lAM+m/HGHWuXl20muAOasEWo1H0RjUCShTM="; }; patches = [ diff --git a/pkgs/development/python-modules/sentry-sdk/default.nix b/pkgs/development/python-modules/sentry-sdk/default.nix index f5ec7a21b5a1..94cb5ab003cc 100644 --- a/pkgs/development/python-modules/sentry-sdk/default.nix +++ b/pkgs/development/python-modules/sentry-sdk/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { pname = "sentry-sdk"; - version = "1.28.1"; + version = "1.29.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -49,7 +49,7 @@ buildPythonPackage rec { owner = "getsentry"; repo = "sentry-python"; rev = "refs/tags/${version}"; - hash = "sha256-toyZAOtAZl38UfLs8+DbAb/EqX+sl/ndKGb7/pFI10Q="; + hash = "sha256-etn7vkKgCN7a8Dxv4gDSVaG6mvCltVh6rTOLaKEyNRA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/ypy-websocket/default.nix b/pkgs/development/python-modules/ypy-websocket/default.nix index 11b0b3b00707..796118abc25c 100644 --- a/pkgs/development/python-modules/ypy-websocket/default.nix +++ b/pkgs/development/python-modules/ypy-websocket/default.nix @@ -9,12 +9,13 @@ , pytest-asyncio , pytestCheckHook , pythonRelaxDepsHook +, uvicorn , websockets }: buildPythonPackage rec { pname = "ypy-websocket"; - version = "0.9.0"; + version = "0.12.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -23,7 +24,7 @@ buildPythonPackage rec { owner = "y-crdt"; repo = "ypy-websocket"; rev = "refs/tags/v${version}"; - hash = "sha256-dHcXJavzR1BDAM9Xjm144gfNMSDEkenumI3POBfCjvQ="; + hash = "sha256-JsSOh7CSHUnGJmNAP87fMMsRgdj6nNna1XVe15MYqoA="; }; pythonRelaxDeps = [ @@ -48,6 +49,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytest-asyncio pytestCheckHook + uvicorn websockets ]; diff --git a/pkgs/development/python-modules/zeep/default.nix b/pkgs/development/python-modules/zeep/default.nix index dc37c5315ac4..ab5f7b8147c8 100644 --- a/pkgs/development/python-modules/zeep/default.nix +++ b/pkgs/development/python-modules/zeep/default.nix @@ -3,10 +3,8 @@ , aioresponses , attrs , buildPythonPackage -, cached-property , defusedxml , fetchFromGitHub -, fetchpatch , freezegun , httpx , isodate @@ -29,6 +27,7 @@ buildPythonPackage rec { pname = "zeep"; version = "4.2.1"; + format = "setuptools"; disabled = pythonOlder "3.6"; @@ -41,9 +40,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ attrs - cached-property defusedxml - httpx isodate lxml platformdirs @@ -51,7 +48,19 @@ buildPythonPackage rec { requests requests-file requests-toolbelt - xmlsec + ]; + + passthru.optional-dependencies = { + async_require = [ + httpx + ]; + xmlsec_require = [ + xmlsec + ]; + }; + + pythonImportsCheck = [ + "zeep" ]; nativeCheckInputs = [ @@ -64,26 +73,15 @@ buildPythonPackage rec { pytest-httpx pytestCheckHook requests-mock - ]; + ] + ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); preCheck = '' - export HOME=$(mktemp -d); + export HOME=$TMPDIR ''; - disabledTests = [ - # lxml.etree.XMLSyntaxError: Extra content at the end of the document, line 2, column 64 - "test_mime_content_serialize_text_xml" - # Tests are outdated - "test_load" - "test_load_cache" - "test_post" - ]; - - pythonImportsCheck = [ - "zeep" - ]; - meta = with lib; { + changelog = "https://github.com/mvantellingen/python-zeep/releases/tag/${version}"; description = "Python SOAP client"; homepage = "http://docs.python-zeep.org"; license = licenses.mit; diff --git a/pkgs/development/python-modules/zeroconf/default.nix b/pkgs/development/python-modules/zeroconf/default.nix index 5265b9ae7a39..6cd8253cfc32 100644 --- a/pkgs/development/python-modules/zeroconf/default.nix +++ b/pkgs/development/python-modules/zeroconf/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "zeroconf"; - version = "0.72.0"; + version = "0.74.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "jstasiak"; repo = "python-zeroconf"; rev = "refs/tags/${version}"; - hash = "sha256-Km7qZEXp0Srzt7XAq9D/U8WI/7go81Lvgx3Xck24XDc="; + hash = "sha256-0QmAq1+dRfRkomZgh4Q0YF20omQBDUTgGt8cP1L6cx0="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/zigpy-znp/default.nix b/pkgs/development/python-modules/zigpy-znp/default.nix index 8faa6bafe2c8..6b5c0fd41a85 100644 --- a/pkgs/development/python-modules/zigpy-znp/default.nix +++ b/pkgs/development/python-modules/zigpy-znp/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "zigpy-znp"; - version = "0.11.3"; + version = "0.11.4"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-3pK6H926awUuQGmwyqirFKPnnz+XCGg2/ChuwvaHoDY="; + hash = "sha256-wt7ZsMXOh+CbhJCUMS7RhzozYlyINRs0xOF7ecwkNCU="; }; postPatch = '' diff --git a/pkgs/development/python-modules/zigpy/default.nix b/pkgs/development/python-modules/zigpy/default.nix index e852746d7b69..fb08f30623e2 100644 --- a/pkgs/development/python-modules/zigpy/default.nix +++ b/pkgs/development/python-modules/zigpy/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "zigpy"; - version = "0.56.2"; + version = "0.56.4"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zigpy"; rev = "refs/tags/${version}"; - hash = "sha256-VUnt2rk1nQZqmoS8ytBCX2q3E4zxSz2A0Hg7AUXmtJo="; + hash = "sha256-PxvTg/z7WmJaH/iwHoJu2bQDLR4G5nkMS5fSP46C3mQ="; }; postPatch = '' diff --git a/pkgs/development/tools/database/sqlfluff/default.nix b/pkgs/development/tools/database/sqlfluff/default.nix index 338b1d22e053..3968a5de6018 100644 --- a/pkgs/development/tools/database/sqlfluff/default.nix +++ b/pkgs/development/tools/database/sqlfluff/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "sqlfluff"; - version = "2.1.2"; + version = "2.2.0"; format = "setuptools"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-XxaQlXXxd0CpVK2iIt2aJ5PoGWvanFf7oeCdnjOTaeI="; + hash = "sha256-3NNig7zt6ZQUXuzONKlE5h/uOrY8/0/oVbw+BZ99mPk="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/development/tools/guile/g-wrap/default.nix b/pkgs/development/tools/guile/g-wrap/default.nix index 6bb80306e68e..516076012423 100644 --- a/pkgs/development/tools/guile/g-wrap/default.nix +++ b/pkgs/development/tools/guile/g-wrap/default.nix @@ -17,6 +17,8 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ libffi ]; + env.NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; + doCheck = true; meta = with lib; { diff --git a/pkgs/development/tools/language-servers/neocmakelsp/default.nix b/pkgs/development/tools/language-servers/neocmakelsp/default.nix index d900046701bb..fde707ec6641 100644 --- a/pkgs/development/tools/language-servers/neocmakelsp/default.nix +++ b/pkgs/development/tools/language-servers/neocmakelsp/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "neocmakelsp"; - version = "0.5.18"; + version = "0.6.1"; src = fetchFromGitHub { owner = "Decodetalkers"; repo = "neocmakelsp"; rev = "v${version}"; - hash = "sha256-3Bv1tRskxQ4Fk+gEGCYRq8WtkBHYP2VjirtTZ3SWJlQ="; + hash = "sha256-wwFek9668tC+j2F12b9YiYbYJWp5z4J4F09dlj+hlq0="; }; - cargoHash = "sha256-O8E5PmXYrNOB8fXFs5ar30c1X5flIQZ/lrRSl/3XH+o="; + cargoHash = "sha256-XmacBalkevCmYxWFcez/++1ng2yyURge466VX6QZC9M="; meta = with lib; { description = "A cmake lsp based on tower-lsp and treesitter"; @@ -22,5 +22,6 @@ rustPlatform.buildRustPackage rec { license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ rewine ]; + mainProgram = "neocmakelsp"; }; } diff --git a/pkgs/development/tools/memray/default.nix b/pkgs/development/tools/memray/default.nix index 4ca4b6cb2771..600316e295b3 100644 --- a/pkgs/development/tools/memray/default.nix +++ b/pkgs/development/tools/memray/default.nix @@ -8,14 +8,14 @@ python3.pkgs.buildPythonApplication rec { pname = "memray"; - version = "1.9.0"; + version = "1.9.1"; format = "setuptools"; src = fetchFromGitHub { owner = "bloomberg"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-fXA98kw+2NlbWTLXWK875t1RBIXH2a0SgS+0OseODKI="; + hash = "sha256-DaJ1Hhg7q4ckA5feUx0twOsmy28v5aBBCTUAkn43xAo="; }; nativeBuildInputs = [ diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index aed44fb5808e..521f73dbb72e 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "2023.8.0"; + version = "2023.8.1"; components = { "3_day_blinds" = ps: with ps; [ ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 8e7ee3237448..ad390836d707 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -295,7 +295,7 @@ let extraBuildInputs = extraPackages python.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "2023.8.0"; + hassVersion = "2023.8.1"; in python.pkgs.buildPythonApplication rec { pname = "homeassistant"; @@ -311,7 +311,7 @@ in python.pkgs.buildPythonApplication rec { # Primary source is the pypi sdist, because it contains translations src = fetchPypi { inherit pname version; - hash = "sha256-Nvh52oVovcmicqYuXJcQveTTjTd/ZHjrKTMh2rtQKdU="; + hash = "sha256-u20hEdVoxp2MzLo6OonQZnkoxqK+myt4LwqB+mz3ipE="; }; # Secondary source is git for tests @@ -319,7 +319,7 @@ in python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = "refs/tags/${version}"; - hash = "sha256-WGM7xo2iOS1q19eVzBIh4t8B8s1kw7E1gsFChR8SPc0="; + hash = "sha256-CrfVokUk3KnkavM+/ci70ela7aJ60TSNymoCzZdxaIY="; }; nativeBuildInputs = with python.pkgs; [ diff --git a/pkgs/servers/home-assistant/intents.nix b/pkgs/servers/home-assistant/intents.nix index 282662ccded1..0255d97da6b6 100644 --- a/pkgs/servers/home-assistant/intents.nix +++ b/pkgs/servers/home-assistant/intents.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "home-assistant-intents"; - version = "2023.7.25"; + version = "2023.8.2"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "home-assistant"; repo = "intents-package"; rev = "refs/tags/${version}"; - hash = "sha256-/9+d22CqlEi+ukjIZRsyCuPPeTCD+XZp8+5iUM3Nc3o="; + hash = "sha256-pNLH3GGfY8upKi7uYGZ466cIQkpdA16tR1tjwuiQ3JI="; fetchSubmodules = true; }; diff --git a/pkgs/servers/nosql/victoriametrics/default.nix b/pkgs/servers/nosql/victoriametrics/default.nix index 2ff96b760f16..a1344969de6c 100644 --- a/pkgs/servers/nosql/victoriametrics/default.nix +++ b/pkgs/servers/nosql/victoriametrics/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "VictoriaMetrics"; - version = "1.91.3"; + version = "1.92.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-xW31Lm+WiJ1quMaIDa7tbZuKhILTMdUviIDTRJT1Cqg="; + hash = "sha256-s4OxOyOfPd98ZTdn/VYr9Z12zrQM5ZCsoJBx6nwz1Ww="; }; vendorHash = null; diff --git a/pkgs/servers/unpackerr/default.nix b/pkgs/servers/unpackerr/default.nix index 269faed8961b..140f4ddfa793 100644 --- a/pkgs/servers/unpackerr/default.nix +++ b/pkgs/servers/unpackerr/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "unpackerr"; - version = "0.11.2"; + version = "0.12.0"; src = fetchFromGitHub { owner = "davidnewhall"; repo = "unpackerr"; rev = "v${version}"; - sha256 = "sha256-Jxg1gaMTJ/BbL8TQfPcyt1hYnT/LcL4j+m+jSeh5QyA="; + sha256 = "sha256-yMmn733j6k9r8I/lvVOZNL6o35eSPJZ5G8jw9xaJZRg="; }; - vendorHash = "sha256-yXFIBWOF72nXmT8+OSvF1aKBhCMBloLmGTfvNbV9ir4="; + vendorHash = "sha256-1VMeRB34JS9EwyGhPxFsRIgKaY6NyIMsa132PQKoPYY="; buildInputs = lib.optionals stdenv.isDarwin [ Cocoa WebKit ]; diff --git a/pkgs/tools/X11/xbindkeys/default.nix b/pkgs/tools/X11/xbindkeys/default.nix index ed9e5ba43c99..5b2f5c8a1968 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_2_2 }: +{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, libX11, guile }: stdenv.mkDerivation rec { pname = "xbindkeys"; @@ -8,14 +8,14 @@ stdenv.mkDerivation rec { sha256 = "1wl2vc5alisiwyk8m07y1ryq8w3ll9ym83j27g4apm4ixjl8d6x2"; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libX11 guile_2_2 ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; + buildInputs = [ libX11 guile ]; meta = { homepage = "https://www.nongnu.org/xbindkeys/xbindkeys.html"; description = "Launch shell commands with your keyboard or your mouse under X Window"; license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [viric]; + maintainers = with lib.maintainers; [ viric ]; platforms = with lib.platforms; linux; }; } diff --git a/pkgs/tools/compression/flips/default.nix b/pkgs/tools/compression/flips/default.nix index 024ff5fbe9f1..4ba618556a70 100644 --- a/pkgs/tools/compression/flips/default.nix +++ b/pkgs/tools/compression/flips/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation { pname = "flips"; - version = "unstable-2021-10-28"; + version = "unstable-2023-03-15"; src = fetchFromGitHub { owner = "Alcaro"; repo = "Flips"; - rev = "3a8733e74c9bdbb6b89da2b45913a0be3d0e1866"; - sha256 = "1jik580mz2spik5mgh60h93ryaj5x8dffncnr1lwija0v803xld7"; + rev = "fdd5c6e34285beef5b9be759c9b91390df486c66"; + hash = "sha256-uuHgpt7aWqiMTUILm5tAEGGeZrls3g/DdylYQgsfpTw="; }; nativeBuildInputs = [ pkg-config wrapGAppsHook ]; diff --git a/pkgs/tools/compression/flips/use-system-libdivsufsort.patch b/pkgs/tools/compression/flips/use-system-libdivsufsort.patch index aa741decb019..d621fe3a9f40 100644 --- a/pkgs/tools/compression/flips/use-system-libdivsufsort.patch +++ b/pkgs/tools/compression/flips/use-system-libdivsufsort.patch @@ -1,12 +1,12 @@ diff --git a/Makefile b/Makefile -index c9d8b6d..9d66b0b 100644 +index b3d5aeb..a5acc08 100644 --- a/Makefile +++ b/Makefile -@@ -79,9 +79,7 @@ endif +@@ -83,9 +83,7 @@ endif + MOREFLAGS := $(CFLAGS_$(TARGET)) - --DIVSUF := libdivsufsort-2.0.1 +-DIVSUF := $(SRCDIR)/libdivsufsort-2.0.1 -SOURCES += $(DIVSUF)/lib/divsufsort.c $(DIVSUF)/lib/sssort.c $(DIVSUF)/lib/trsort.c -MOREFLAGS += -I$(DIVSUF)/include -DHAVE_CONFIG_H -D__STDC_FORMAT_MACROS +MOREFLAGS += -ldivsufsort diff --git a/pkgs/tools/networking/gupnp-tools/default.nix b/pkgs/tools/networking/gupnp-tools/default.nix index 8341cf1e7e22..a54ea88b1ce9 100644 --- a/pkgs/tools/networking/gupnp-tools/default.nix +++ b/pkgs/tools/networking/gupnp-tools/default.nix @@ -17,11 +17,11 @@ stdenv.mkDerivation rec { pname = "gupnp-tools"; - version = "0.12.0"; + version = "0.12.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "XqdgfuNlZCxVWSf+3FteH+COdPBh0MPrCL2QG16yAII="; + sha256 = "U8+TEj85fo+PC46eQ2TIanUCpTNPTAvi4FSoJEeL1bo="; }; nativeBuildInputs = [ @@ -42,6 +42,7 @@ stdenv.mkDerivation rec { ]; # new libxml2 version + # TODO: can be dropped on next update NIX_CFLAGS_COMPILE = [ "-Wno-error=deprecated-declarations" ]; passthru = { diff --git a/pkgs/tools/networking/nzbget/default.nix b/pkgs/tools/networking/nzbget/default.nix index 9141a2932bbb..4e67e81a7de8 100644 --- a/pkgs/tools/networking/nzbget/default.nix +++ b/pkgs/tools/networking/nzbget/default.nix @@ -1,11 +1,12 @@ { lib , stdenv -, fetchurl -, fetchpatch +, fetchFromGitHub +, autoreconfHook , pkg-config , gnutls , libgcrypt , libpar2 +, libcap , libsigcxx , libxml2 , ncurses @@ -14,31 +15,24 @@ , nixosTests }: -stdenv.mkDerivation rec { - pname = "nzbget"; - version = "21.1"; +stdenv.mkDerivation (finalAttrs: { + pname = "nzbget-ng"; + version = "21.4-rc2"; - src = fetchurl { - url = "https://github.com/nzbget/nzbget/releases/download/v${version}/nzbget-${version}-src.tar.gz"; - hash = "sha256-To/BvrgNwq8tajajOjP0Te3d1EhgAsZE9MR5MEMHICU="; + src = fetchFromGitHub { + owner = "nzbget-ng"; + repo = "nzbget"; + rev = "v${finalAttrs.version}"; + hash = "sha256-JJML5mtAog5xC7DkthCtoyn5QeC2Z+fdzSuEa/Te0Ew="; }; - patches = [ - # openssl 3 compatibility - # https://github.com/nzbget/nzbget/pull/793 - (fetchpatch { - name = "daemon-connect-dont-use-fips-mode-set-with-openssl-3.patch"; - url = "https://github.com/nzbget/nzbget/commit/f76e8555504e3af4cf8dd4a8c8e374b3ca025099.patch"; - hash = "sha256-39lvnhBK4126TYsRbJOUxsV9s9Hjuviw7CH/wWn/VkM="; - }) - ]; - - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ gnutls libgcrypt libpar2 + libcap libsigcxx libxml2 ncurses @@ -46,15 +40,20 @@ stdenv.mkDerivation rec { zlib ]; + prePatch = '' + sed -i 's/AC_INIT.*/AC_INIT( nzbget, m4_esyscmd_s( echo ${finalAttrs.version} ) )/' configure.ac + ''; + enableParallelBuilding = true; passthru.tests = { inherit (nixosTests) nzbget; }; meta = with lib; { - homepage = "https://nzbget.net"; + homepage = "https://nzbget-ng.github.io/"; + changelog = "https://github.com/nzbget-ng/nzbget/releases/tag/v${finalAttrs.version}"; license = licenses.gpl2Plus; description = "A command line tool for downloading files from news servers"; maintainers = with maintainers; [ pSub ]; platforms = with platforms; unix; }; -} +}) diff --git a/pkgs/tools/security/pass/default.nix b/pkgs/tools/security/pass/default.nix index 1b840999e6af..3437b19e3a30 100644 --- a/pkgs/tools/security/pass/default.nix +++ b/pkgs/tools/security/pass/default.nix @@ -29,8 +29,7 @@ let selected = [ pass ] ++ extensions passExtensions ++ lib.optional tombPluginSupport passExtensions.tomb; in buildEnv { - # lib.getExe looks for name, so we keep it the same as mainProgram - name = "pass"; + name = "pass-env"; paths = selected; nativeBuildInputs = [ makeWrapper ]; buildInputs = lib.concatMap (x: x.buildInputs) selected; @@ -51,6 +50,7 @@ let wrapProgram $out/bin/pass \ --set SYSTEM_EXTENSION_DIR "$out/lib/password-store/extensions" ''; + meta.mainProgram = "pass"; }; in diff --git a/pkgs/tools/security/trufflehog/default.nix b/pkgs/tools/security/trufflehog/default.nix index 2067a358cfcc..6b6e970a38ca 100644 --- a/pkgs/tools/security/trufflehog/default.nix +++ b/pkgs/tools/security/trufflehog/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "trufflehog"; - version = "3.45.3"; + version = "3.46.3"; src = fetchFromGitHub { owner = "trufflesecurity"; repo = "trufflehog"; rev = "refs/tags/v${version}"; - hash = "sha256-ZjoX1E9zusni8ZRaTiaj41wpVP+f7r5PcsgPAnzZF/s="; + hash = "sha256-IdLNDJYg86dTj+E2w7+sXmNf/MY7eqW9NMAmuhrzm10="; }; - vendorHash = "sha256-VaNNfdY2CXR0sJb9efxTwkm12l20SbO5Q3OvcBs4cKA="; + vendorHash = "sha256-ecEms2Zf4EckP2OLoL41S1ZTTnGJhpdMDhknq/mO7qI="; ldflags = [ "-s" diff --git a/pkgs/tools/security/vaultwarden/default.nix b/pkgs/tools/security/vaultwarden/default.nix index 9321537539e0..cfe65eb332c1 100644 --- a/pkgs/tools/security/vaultwarden/default.nix +++ b/pkgs/tools/security/vaultwarden/default.nix @@ -9,13 +9,13 @@ in rustPlatform.buildRustPackage rec { pname = "vaultwarden"; - version = "1.29.0"; + version = "1.29.1"; src = fetchFromGitHub { owner = "dani-garcia"; repo = pname; rev = version; - hash = "sha256-dF27b29n4JUHdXG68UfQwlacZE1SXqk0h854cMR8Ii8="; + hash = "sha256-uASoPZRBQ9IKJHtMGeeZzmr0fCYDWl56EzaJVj6LwMk="; }; cargoLock = { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4aeee3b2181d..6728616a86c9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1040,6 +1040,8 @@ with pkgs; mongosh = callPackage ../development/tools/mongosh { }; + mya = callPackage ../applications/misc/mya { }; + mysql-shell = callPackage ../development/tools/mysql-shell { inherit (darwin) cctools developer_cmds DarwinTools; inherit (darwin.apple_sdk.frameworks) CoreServices; @@ -8113,9 +8115,7 @@ with pkgs; freeipmi = callPackage ../tools/system/freeipmi { }; - freetalk = callPackage ../applications/networking/instant-messengers/freetalk { - guile = guile_2_0; - }; + freetalk = callPackage ../applications/networking/instant-messengers/freetalk { }; freetds = callPackage ../development/libraries/freetds { }; @@ -18073,7 +18073,7 @@ with pkgs; guile-ssh = callPackage ../development/guile-modules/guile-ssh { }; guile-xcb = callPackage ../development/guile-modules/guile-xcb { - guile = guile_2_0; + guile = guile_2_2; }; inav-blackbox-tools = callPackage ../tools/misc/inav-blackbox-tools { }; @@ -19184,7 +19184,7 @@ with pkgs; }; gwrap = callPackage ../development/tools/guile/g-wrap { - guile = guile_2_0; + guile = guile_2_2; }; hadolint = haskell.lib.compose.justStaticExecutables haskellPackages.hadolint; @@ -22925,10 +22925,7 @@ with pkgs; libmatchbox = callPackage ../development/libraries/libmatchbox { }; - libmatheval = callPackage ../development/libraries/libmatheval { - autoconf = buildPackages.autoconf269; - guile = guile_2_0; - }; + libmatheval = callPackage ../development/libraries/libmatheval { }; libmatthew_java = callPackage ../development/libraries/java/libmatthew-java { jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 @@ -39325,7 +39322,7 @@ with pkgs; fparser = callPackage ../applications/science/electronics/fparser { }; geda = callPackage ../applications/science/electronics/geda { - guile = guile_2_0; + guile = guile_2_2; }; gedit = callPackage ../applications/editors/gedit { };