diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 8a468301ea5d..670e7a0d2138 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -13294,7 +13294,7 @@ }; piturnah = { email = "peterhebden6@gmail.com"; - github = "piturnah"; + github = "Piturnah"; githubId = 20472367; name = "Peter Hebden"; }; diff --git a/nixos/modules/services/network-filesystems/kubo.nix b/nixos/modules/services/network-filesystems/kubo.nix index a5c370b5be89..5a355f3441d8 100644 --- a/nixos/modules/services/network-filesystems/kubo.nix +++ b/nixos/modules/services/network-filesystems/kubo.nix @@ -278,6 +278,12 @@ in You can't set services.kubo.settings.Pinning.RemoteServices because the ``config replace`` subcommand used at startup does not work with it. ''; } + { + assertion = !((lib.versionAtLeast cfg.package.version "0.21") && (builtins.hasAttr "Experimental" cfg.settings) && (builtins.hasAttr "AcceleratedDHTClient" cfg.settings.Experimental)); + message = '' + The `services.kubo.settings.Experimental.AcceleratedDHTClient` option was renamed to `services.kubo.settings.Routing.AcceleratedDHTClient` in Kubo 0.21. + ''; + } ]; environment.systemPackages = [ cfg.package ]; diff --git a/pkgs/applications/audio/carla/default.nix b/pkgs/applications/audio/carla/default.nix index fdb3ea1e7149..bf374866278f 100644 --- a/pkgs/applications/audio/carla/default.nix +++ b/pkgs/applications/audio/carla/default.nix @@ -26,13 +26,13 @@ assert withQt -> wrapQtAppsHook != null; stdenv.mkDerivation (finalAttrs: { pname = "carla"; - version = "2.5.5"; + version = "2.5.6"; src = fetchFromGitHub { owner = "falkTX"; repo = finalAttrs.pname; rev = "v${finalAttrs.version}"; - hash = "sha256-kXQ0dv4KrwvfxdP73zimof9XKpAz5E6hQrFOjLG4hKU="; + hash = "sha256-/ZIproky1AHJHvV62xWm0nrzNBOjvBBv93V0KespVjU="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/audio/ft2-clone/default.nix b/pkgs/applications/audio/ft2-clone/default.nix index 5dd1d5c376d2..6c63a584fc8d 100644 --- a/pkgs/applications/audio/ft2-clone/default.nix +++ b/pkgs/applications/audio/ft2-clone/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "ft2-clone"; - version = "1.68"; + version = "1.69"; src = fetchFromGitHub { owner = "8bitbubsy"; repo = "ft2-clone"; rev = "v${version}"; - sha256 = "sha256-mO8GrLyO7Zr9+lRy2WQ4OeRWDGmo22mPnZbajL78hJ8="; + sha256 = "sha256-tm0yTh46UKnsjH9hv3cMW0YL2x3OTRL+14x4c7w124U="; }; # Adapt the linux-only CMakeLists to darwin (more reliable than make-macos.sh) diff --git a/pkgs/applications/audio/kid3/default.nix b/pkgs/applications/audio/kid3/default.nix index 3b59806592fd..5dacefa2955c 100644 --- a/pkgs/applications/audio/kid3/default.nix +++ b/pkgs/applications/audio/kid3/default.nix @@ -1,13 +1,13 @@ -{ lib -, stdenv -, fetchurl -, chromaprint +{ + chromaprint , cmake , docbook_xml_dtd_45 , docbook_xsl +, fetchurl , ffmpeg , flac , id3lib +, lib , libogg , libvorbis , libxslt @@ -20,18 +20,19 @@ , qtquickcontrols , qttools , readline +, stdenv , taglib , wrapQtAppsHook , zlib }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "kid3"; version = "3.9.4"; src = fetchurl { - url = "https://download.kde.org/stable/${pname}/${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-xBCWDpYiXeChxIiMPqHG3CyiRau2kUdDJtzcPtvWpSA="; + url = "https://download.kde.org/stable/kid3/${finalAttrs.version}/kid3-${finalAttrs.version}.tar.xz"; + hash = "sha256-xBCWDpYiXeChxIiMPqHG3CyiRau2kUdDJtzcPtvWpSA="; }; nativeBuildInputs = [ @@ -42,6 +43,7 @@ stdenv.mkDerivation rec { python3 wrapQtAppsHook ]; + buildInputs = [ chromaprint ffmpeg @@ -68,9 +70,10 @@ stdenv.mkDerivation rec { export DOCBOOKDIR="${docbook_xsl}/xml/xsl/docbook/" ''; - meta = with lib; { - homepage = "https://kid3.kde.org/"; + meta = { description = "A simple and powerful audio tag editor"; + homepage = "https://kid3.kde.org/"; + license = lib.licenses.lgpl2Plus; longDescription = '' If you want to easily tag multiple MP3, Ogg/Vorbis, FLAC, MPC, MP4/AAC, MP2, Opus, Speex, TrueAudio, WavPack, WMA, WAV and AIFF files (e.g. full @@ -100,8 +103,7 @@ stdenv.mkDerivation rec { - Edit synchronized lyrics and event timing codes, import and export LRC files. ''; - license = licenses.lgpl2Plus; - maintainers = [ maintainers.AndersonTorres ]; - platforms = platforms.linux; + maintainers = [ lib.maintainers.AndersonTorres ]; + platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/applications/audio/mda-lv2/default.nix b/pkgs/applications/audio/mda-lv2/default.nix index 92f8506483f5..98812bec4d87 100644 --- a/pkgs/applications/audio/mda-lv2/default.nix +++ b/pkgs/applications/audio/mda-lv2/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ fftwSinglePrec lv2 ]; meta = with lib; { - homepage = "http://drobilla.net/software/mda-lv2/"; + homepage = "http://drobilla.net/software/mda-lv2.html"; description = "An LV2 port of the MDA plugins by Paul Kellett"; license = licenses.gpl2Plus; maintainers = [ maintainers.goibhniu ]; diff --git a/pkgs/applications/audio/praat/default.nix b/pkgs/applications/audio/praat/default.nix index 7faa8fcc6b13..352a52e42f76 100644 --- a/pkgs/applications/audio/praat/default.nix +++ b/pkgs/applications/audio/praat/default.nix @@ -1,38 +1,63 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, wrapGAppsHook, alsa-lib, gtk3, libpulseaudio }: +{ + alsa-lib +, fetchFromGitHub +, gtk3 +, lib +, libpulseaudio +, pkg-config +, stdenv +, wrapGAppsHook +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "praat"; - version = "6.3.10"; + version = "6.3.14"; src = fetchFromGitHub { owner = "praat"; repo = "praat"; - rev = "v${version}"; - sha256 = "sha256-wnw8GKMukiraZgMMzd3S2NldC/cnRSILNo+D1Rqhr4k="; + rev = "v${finalAttrs.version}"; + hash = "sha256-HN4w7n0nh7voL/QKhGQwCcGfzn+nyFOwluESlP3B6VM="; }; - configurePhase = '' - cp makefiles/makefile.defs.linux.pulse makefile.defs - ''; + nativeBuildInputs = [ + pkg-config + wrapGAppsHook + ]; + + buildInputs = [ + alsa-lib + gtk3 + libpulseaudio + ]; makeFlags = [ "AR=${stdenv.cc.targetPrefix}ar" ]; - installPhase = '' - install -Dt $out/bin praat + configurePhase = '' + runHook preConfigure + + cp makefiles/makefile.defs.linux.pulse makefile.defs + + runHook postConfigure ''; - nativeBuildInputs = [ pkg-config wrapGAppsHook ]; - buildInputs = [ alsa-lib gtk3 libpulseaudio ]; + installPhase = '' + runHook preInstall + + install -Dt $out/bin praat + + runHook postInstall + ''; enableParallelBuilding = true; - meta = with lib; { + meta = { description = "Doing phonetics by computer"; homepage = "https://www.fon.hum.uva.nl/praat/"; - license = licenses.gpl2Plus; # Has some 3rd-party code in it though - maintainers = with maintainers; [ orivej ]; - platforms = platforms.linux; + license = lib.licenses.gpl2Plus; # Has some 3rd-party code in it though + maintainers = with lib.maintainers; [ orivej ]; + platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/applications/editors/heh/default.nix b/pkgs/applications/editors/heh/default.nix new file mode 100644 index 000000000000..ca044168b845 --- /dev/null +++ b/pkgs/applications/editors/heh/default.nix @@ -0,0 +1,27 @@ +{ lib +, stdenv +, rustPlatform +, fetchFromGitHub +}: + +rustPlatform.buildRustPackage rec { + pname = "heh"; + version = "0.4.1"; + + src = fetchFromGitHub { + owner = "ndd7xv"; + repo = pname; + rev = "v${version}"; + hash = "sha256-IIF/bkTLwR8pCs/hJ625T3NsiKf/6Zf1cW2i4lsiK4U="; + }; + + cargoHash = "sha256-tDvqaNVuzv1BlS/oNI1D/WV1b5uHreT3Ak/6ruqKXQc="; + + meta = with lib; { + description = "A cross-platform terminal UI used for modifying file data in hex or ASCII."; + homepage = "https://github.com/ndd7xv/heh"; + changelog = "https://github.com/ndd7xv/heh/releases/tag/${src.rev}"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ piturnah ]; + }; +} diff --git a/pkgs/applications/editors/vscode/generic.nix b/pkgs/applications/editors/vscode/generic.nix index 22a40259424d..0b30d44908d8 100644 --- a/pkgs/applications/editors/vscode/generic.nix +++ b/pkgs/applications/editors/vscode/generic.nix @@ -2,7 +2,7 @@ , unzip, libsecret, libXScrnSaver, libxshmfence, buildPackages , atomEnv, at-spi2-atk, autoPatchelfHook , systemd, fontconfig, libdbusmenu, glib, buildFHSEnv, wayland -, libglvnd +, libglvnd, libkrb5 # Populate passthru.tests , tests @@ -71,7 +71,7 @@ let }; buildInputs = [ libsecret libXScrnSaver libxshmfence ] - ++ lib.optionals (!stdenv.isDarwin) ([ at-spi2-atk ] ++ atomEnv.packages); + ++ lib.optionals (!stdenv.isDarwin) ([ at-spi2-atk libkrb5 ] ++ atomEnv.packages); runtimeDependencies = lib.optionals stdenv.isLinux [ (lib.getLib systemd) fontconfig.lib libdbusmenu wayland ]; diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index da75dff14de0..95123502295e 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -24,21 +24,21 @@ let archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "05yl6v11ndayz081m3j6dhclj0hshsf0ism7z31hmq6qvfl1sw0k"; - x86_64-darwin = "16x1ppfi3n9gnxg2la2pzj67mlj507879hpqinhpz57dvys421h8"; - aarch64-linux = "0m5k9rm14isj9x1j3nw3zvcxxz523396id7yhi8bpncr4ac8a087"; - aarch64-darwin = "1kbhf3v71qhw4ql6pp8x5m68lgycjzxzm17c9ri0zn0b86ffp8d3"; - armv7l-linux = "07lp0schicpnzs52gfbi9y8zfkwxhh92zv29afzy6vxdlqvmrf21"; + x86_64-linux = "0hc1pfrhmdydwgyz3mjp45nmzs101iffam7ciximqmnhf1s1x4qf"; + x86_64-darwin = "1snrr4lsa5qdpdl80wx8ymxp8h1bhd5ablhcgkhzvmj5dh7jrywk"; + aarch64-linux = "0pm5znbjm79ziwdx37cc75qnbf0jv3yrm2xg7cykavn43gz97abw"; + aarch64-darwin = "0bq5hvgv228x7vby4475cc65g24kpv9kvj06p6c0y6a2a79j45by"; + armv7l-linux = "11gxpqflakp4cwzkpqrwsd6m5fls1vnaigppc4bq9flfknwkjfrx"; }.${system} or throwSystem; in callPackage ./generic.nix rec { # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.80.2"; + version = "1.81.0"; pname = "vscode"; # This is used for VS Code - Remote SSH test - rev = "2ccd690cbff1569e4a83d7c43d45101f817401dc"; + rev = "6445d93c81ebe42c4cbd7a60712e0b17d9463e97"; executableName = "code" + lib.optionalString isInsiders "-insiders"; longName = "Visual Studio Code" + lib.optionalString isInsiders " - Insiders"; @@ -62,7 +62,7 @@ in src = fetchurl { name = "vscode-server-${rev}.tar.gz"; url = "https://update.code.visualstudio.com/commit:${rev}/server-linux-x64/stable"; - sha256 = "1425bngv0n2xpd7yp9xbmxv95adr9vv0vzy1wvqvgpd8p6h05r7n"; + sha256 = "07x9lmkyhra4hplsgdhh97dixsx92i7lab5z5ihs2wqvvzl69ah2"; }; }; diff --git a/pkgs/applications/emulators/ryujinx/default.nix b/pkgs/applications/emulators/ryujinx/default.nix index 199edc8e9180..bb5c5c2a7395 100644 --- a/pkgs/applications/emulators/ryujinx/default.nix +++ b/pkgs/applications/emulators/ryujinx/default.nix @@ -28,13 +28,13 @@ buildDotnetModule rec { pname = "ryujinx"; - version = "1.1.968"; # Based off of the official github actions builds: https://github.com/Ryujinx/Ryujinx/actions/workflows/release.yml + version = "1.1.974"; # Based off of the official github actions builds: https://github.com/Ryujinx/Ryujinx/actions/workflows/release.yml src = fetchFromGitHub { owner = "Ryujinx"; repo = "Ryujinx"; - rev = "487261592eb9e9c31cacd08860f8894027bb1a07"; - sha256 = "002qgnh7xb9i9yqm4a3m9m7sbx1iz7ng8k5nnanlq897djs3hy0g"; + rev = "5a0aa074b661753d8f0202a73d9f6f3ac6e2ab11"; + sha256 = "0f1wivwf7hnsqi7sgqjrikxvakrk8dmywpmyd36a3s5lbk878wp3"; }; dotnet-sdk = dotnetCorePackages.sdk_7_0; diff --git a/pkgs/applications/emulators/ryujinx/deps.nix b/pkgs/applications/emulators/ryujinx/deps.nix index 3a509ea5fc60..8de8a7293e56 100644 --- a/pkgs/applications/emulators/ryujinx/deps.nix +++ b/pkgs/applications/emulators/ryujinx/deps.nix @@ -20,7 +20,7 @@ (fetchNuGet { pname = "Avalonia.X11"; version = "0.10.21"; sha256 = "08vbdiv2k9vp8gp59rk0z63jyn8hlv8a4956jczy05ail5qfl94v"; }) (fetchNuGet { pname = "CommandLineParser"; version = "2.9.1"; sha256 = "1sldkj8lakggn4hnyabjj1fppqh50fkdrr1k99d4gswpbk5kv582"; }) (fetchNuGet { pname = "Concentus"; version = "1.1.7"; sha256 = "0y5z444wrbhlmsqpy2sxmajl1fbf74843lvgj3y6vz260dn2q0l0"; }) - (fetchNuGet { pname = "DiscordRichPresence"; version = "1.1.3.18"; sha256 = "0p4bhaggjjfd4gl06yiphqgncxgcq2bws4sjkrw0n2ldf3hgrps3"; }) + (fetchNuGet { pname = "DiscordRichPresence"; version = "1.2.1.24"; sha256 = "0maw0yd6xgwy0cgk593z3zva0r5j267zpdmmpq8avj3zbna6n4x1"; }) (fetchNuGet { pname = "DynamicData"; version = "7.14.2"; sha256 = "07k79w4702masq71rk865mi3h1kaxamyp7dgl08ny4n22gg8482k"; }) (fetchNuGet { pname = "ExCSS"; version = "4.1.4"; sha256 = "1y50xp6rihkydbf5l73mr3qq2rm6rdfjrzdw9h1dw9my230q5lpd"; }) (fetchNuGet { pname = "Fizzler"; version = "1.2.1"; sha256 = "1w5jb1d0figbv68dydbnlcsfmqlc3sv9z1zxp7d79dg2dkarc4qm"; }) @@ -40,9 +40,9 @@ (fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "2.9.6"; sha256 = "18mr1f0wpq0fir8vjnq0a8pz50zpnblr7sabff0yqx37c975934a"; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "3.3.4"; sha256 = "0wd6v57p53ahz5z9zg4iyzmy3src7rlsncyqpcag02jjj1yx6g58"; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "3.4.0"; sha256 = "12rn6gl4viycwk3pz5hp5df63g66zvba4hnkwr3f0876jj5ivmsw"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "4.5.0"; sha256 = "0hjzca7v3qq4wqzi9chgxzycbaysnjgj28ps20695x61sia6i3da"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "4.6.0"; sha256 = "0qvkwkbqz4dhkxsisanax1lwm3nzyyb4kgb40qczxbl8g251cjp2"; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; version = "3.4.0"; sha256 = "0rhylcwa95bxawcgixk64knv7p7xrykdjcabmx3gknk8hvj1ai9y"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; version = "4.5.0"; sha256 = "1l6v0ii5lapmfnfpjwi3j5bwlx8v9nvyani5pwvqzdfqsd5m7mp5"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; version = "4.6.0"; sha256 = "1yfvwygx795c9lswpiv8q19zydifarzljdmvv67vjmi559cm8b1q"; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp.Scripting"; version = "3.4.0"; sha256 = "1h2f0z9xnw987x8bydka1sd42ijqjx973md6v1gvpy1qc6ad244g"; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.Scripting.Common"; version = "3.4.0"; sha256 = "195gqnpwqkg2wlvk8x6yzm7byrxfq9bki20xmhf6lzfsdw3z4mf2"; }) (fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "17.6.3"; sha256 = "1xxzd2yxlbq2h4k6flp7lvffmmwrjlyha2z1yvrxxymiyyggk2zg"; }) @@ -164,7 +164,7 @@ (fetchNuGet { pname = "System.Collections"; version = "4.3.0"; sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; }) (fetchNuGet { pname = "System.Collections.Concurrent"; version = "4.0.12"; sha256 = "07y08kvrzpak873pmyxs129g1ch8l27zmg51pcyj2jvq03n0r0fc"; }) (fetchNuGet { pname = "System.Collections.Immutable"; version = "1.5.0"; sha256 = "1d5gjn5afnrf461jlxzawcvihz195gayqpcfbv6dd7pxa9ialn06"; }) - (fetchNuGet { pname = "System.Collections.Immutable"; version = "6.0.0"; sha256 = "1js98kmjn47ivcvkjqdmyipzknb9xbndssczm8gq224pbaj1p88c"; }) + (fetchNuGet { pname = "System.Collections.Immutable"; version = "7.0.0"; sha256 = "1n9122cy6v3qhsisc9lzwa1m1j62b8pi2678nsmnlyvfpk0zdagm"; }) (fetchNuGet { pname = "System.ComponentModel.Annotations"; version = "4.5.0"; sha256 = "1jj6f6g87k0iwsgmg3xmnn67a14mq88np0l1ys5zkxhkvbc8976p"; }) (fetchNuGet { pname = "System.Console"; version = "4.0.0"; sha256 = "0ynxqbc3z1nwbrc11hkkpw9skw116z4y9wjzn7id49p9yi7mzmlf"; }) (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.0.11"; sha256 = "0gmjghrqmlgzxivd2xl50ncbglb7ljzb66rlx8ws6dv8jm0d5siz"; }) @@ -218,7 +218,7 @@ (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.0.1"; sha256 = "0m7wqwq0zqq9gbpiqvgk3sr92cbrw7cp3xn53xvw7zj6rz6fdirn"; }) (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.3.0"; sha256 = "02bly8bdc98gs22lqsfx9xicblszr2yan7v2mmw3g7hy6miq5hwq"; }) (fetchNuGet { pname = "System.Reflection.Metadata"; version = "1.6.0"; sha256 = "1wdbavrrkajy7qbdblpbpbalbdl48q3h34cchz24gvdgyrlf15r4"; }) - (fetchNuGet { pname = "System.Reflection.Metadata"; version = "6.0.1"; sha256 = "0fjqifk4qz9lw5gcadpfalpplyr0z2b3p9x7h0ll481a9sqvppc9"; }) + (fetchNuGet { pname = "System.Reflection.Metadata"; version = "7.0.0"; sha256 = "1wilasn2qmj870h2bhw348lspamm7pbinpb4m89icg113510l00v"; }) (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.0.1"; sha256 = "1bangaabhsl4k9fg8khn83wm6yial8ik1sza7401621jc6jrym28"; }) (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.3.0"; sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"; }) (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.1.0"; sha256 = "1bjli8a7sc7jlxqgcagl9nh8axzfl11f4ld3rjqsyxc516iijij7"; }) @@ -257,7 +257,7 @@ (fetchNuGet { pname = "System.Text.Encoding"; version = "4.0.11"; sha256 = "1dyqv0hijg265dwxg6l7aiv74102d6xjiwplh2ar1ly6xfaa4iiw"; }) (fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; }) (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "4.5.1"; sha256 = "1z21qyfs6sg76rp68qdx0c9iy57naan89pg7p6i3qpj8kyzn921w"; }) - (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "6.0.0"; sha256 = "0gm2kiz2ndm9xyzxgi0jhazgwslcs427waxgfa30m7yqll1kcrww"; }) + (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "7.0.0"; sha256 = "0sn6hxdjm7bw3xgsmg041ccchsa4sp02aa27cislw3x61dbr68kq"; }) (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.0.11"; sha256 = "08nsfrpiwsg9x5ml4xyl3zyvjfdi4mvbqf93kjdh11j4fwkznizs"; }) (fetchNuGet { pname = "System.Text.Encodings.Web"; version = "4.7.2"; sha256 = "0ap286ykazrl42if59bxhzv81safdfrrmfqr3112siwyajx4wih9"; }) (fetchNuGet { pname = "System.Text.Encodings.Web"; version = "6.0.0"; sha256 = "06n9ql3fmhpjl32g3492sj181zjml5dlcc5l76xq2h38c4f87sai"; }) diff --git a/pkgs/applications/misc/tuba/default.nix b/pkgs/applications/misc/tuba/default.nix index 5b97307abcf1..6d2ba9e3f54e 100644 --- a/pkgs/applications/misc/tuba/default.nix +++ b/pkgs/applications/misc/tuba/default.nix @@ -26,12 +26,12 @@ stdenv.mkDerivation rec { pname = "tuba"; - version = "0.4.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "GeopJr"; repo = "Tuba"; rev = "v${version}"; - hash = "sha256-sLdkSIevz2spL+Q5sS+ugqEbqJTXrLxmszzijtKvY6k="; + hash = "sha256-1XbgsdIcnlXJtNEzDgEfHVJHF9naz3HplCPc2cKFUWw="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/cluster/clusterctl/default.nix b/pkgs/applications/networking/cluster/clusterctl/default.nix index a87bbbb700c1..9e89ebee618a 100644 --- a/pkgs/applications/networking/cluster/clusterctl/default.nix +++ b/pkgs/applications/networking/cluster/clusterctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "clusterctl"; - version = "1.4.4"; + version = "1.5.0"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = "cluster-api"; rev = "v${version}"; - hash = "sha256-ohk3CKcB6LD1gRKDDNYK+MbFxWa7QEiqmRYYpSkwj8E="; + hash = "sha256-rbKPI5hG7R6mRILuvY9BoRDvosw3txFs2q696abrpjY="; }; - vendorHash = "sha256-QzD0Stbr8QuQ8n9l9qv16KFqSFBsRbxETmQ8LHdk3nI="; + vendorHash = "sha256-t494o9orCVva81v7t0HfKkL8H3cr26scyFSeYZQyqcM="; subPackages = [ "cmd/clusterctl" ]; @@ -43,6 +43,6 @@ buildGoModule rec { description = "Kubernetes cluster API tool"; homepage = "https://cluster-api.sigs.k8s.io/"; license = licenses.asl20; - maintainers = with maintainers; [ zowoq qjoly ]; + maintainers = with maintainers; [ qjoly ]; }; } diff --git a/pkgs/applications/networking/cluster/linkerd/edge.nix b/pkgs/applications/networking/cluster/linkerd/edge.nix index fdf85c435149..865937adaffa 100644 --- a/pkgs/applications/networking/cluster/linkerd/edge.nix +++ b/pkgs/applications/networking/cluster/linkerd/edge.nix @@ -2,7 +2,7 @@ (callPackage ./generic.nix { }) { channel = "edge"; - version = "23.7.2"; - sha256 = "0wc829dzk0in0srq0vbcagrd5ylz2d758032anzlzkf4m3lr9hdw"; - vendorSha256 = "sha256-16j5B96UDZITY1LEWZKtfAnww7ZcUjKh/cARLaYy9wk="; + version = "23.8.1"; + sha256 = "0ajcxfqbaimrj8ylbk3s2djv2jpczm4c6z39b4fdak68sylmvb9z"; + vendorSha256 = "sha256-sj3KJLPO4pxnGov2Oiqj1FgAQ2atf3FJPINmeKjPUZQ="; } diff --git a/pkgs/applications/networking/gnmic/default.nix b/pkgs/applications/networking/gnmic/default.nix index 5f2eb548791c..43884541cdd1 100644 --- a/pkgs/applications/networking/gnmic/default.nix +++ b/pkgs/applications/networking/gnmic/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "gnmic"; - version = "0.31.3"; + version = "0.31.7"; src = fetchFromGitHub { owner = "openconfig"; repo = pname; rev = "v${version}"; - hash = "sha256-+TxOl+at/SQIC1x/LwCgk4JmvOPY2el7HE1reAkmVn8="; + hash = "sha256-bX8oZk0psPqoXFU8b2JQmfFaPz18yiuSVXDmhoOnpFg="; }; - vendorHash = "sha256-4cmFoDMgD9TKacZ2RD73kQKDrpN5xuSKZ4ikcWAd5Rw="; + vendorHash = "sha256-hIG3kG2e9Y2hnHJ+96cPLgnlp5ParsLgWQY0HZTDggY="; ldflags = [ "-s" "-w" diff --git a/pkgs/applications/networking/kubo/default.nix b/pkgs/applications/networking/kubo/default.nix index 2c270199f127..d403f76e61f7 100644 --- a/pkgs/applications/networking/kubo/default.nix +++ b/pkgs/applications/networking/kubo/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "kubo"; - version = "0.20.0"; # When updating, also check if the repo version changed and adjust repoVersion below + version = "0.21.0"; # When updating, also check if the repo version changed and adjust repoVersion below rev = "v${version}"; - passthru.repoVersion = "13"; # Also update kubo-migrator when changing the repo version + passthru.repoVersion = "14"; # Also update kubo-migrator when changing the repo version # Kubo makes changes to it's source tarball that don't match the git source. src = fetchurl { url = "https://github.com/ipfs/kubo/releases/download/${rev}/kubo-source.tar.gz"; - hash = "sha256-3Oj/x3EkceNO8/Ik7+U43wi1aL0lYJi1FA0AjtdJRDI="; + hash = "sha256-tS7hiv7KnALR+hCn/TPUwqp/xIOLnQ3ReSb1bNBnwUY="; }; # tarball contains multiple files/directories diff --git a/pkgs/applications/science/biology/cmtk/default.nix b/pkgs/applications/science/biology/cmtk/default.nix index 3eef64837255..a131c6645499 100644 --- a/pkgs/applications/science/biology/cmtk/default.nix +++ b/pkgs/applications/science/biology/cmtk/default.nix @@ -1,31 +1,47 @@ -{ lib, stdenv, fetchurl, cmake }: +{ lib +, stdenv +, bzip2 +, cmake +, fetchurl +, fftw +, llvmPackages +, zlib +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "cmtk"; - version = "3.3.1"; + version = "3.3.2"; src = fetchurl { name = "cmtk-source.tar.gz"; - url = "https://www.nitrc.org/frs/download.php/8198/CMTK-${version}-Source.tar.gz//?i_agree=1&download_now=1"; - sha256 = "1nmsga9m7vcc4y4a6zl53ra3mwlgjwdgsq1j291awkn7zr1az6qs"; + url = "https://www.nitrc.org/frs/download.php/13188/CMTK-${finalAttrs.version}-Source.tar.gz//?i_agree=1&download_now=1"; + hash = "sha256-iE164NCOSOypZLLZfZy9RTyrS+YnY9ECqfb4QhlsMS4="; }; nativeBuildInputs = [ cmake ]; + buildInputs = [ + bzip2 + fftw + zlib + ] ++ lib.optionals stdenv.cc.isClang [ + llvmPackages.openmp + ]; + env.NIX_CFLAGS_COMPILE = toString [ - "-std=c++11" - (lib.optional stdenv.cc.isClang "-Wno-error=c++11-narrowing") + (lib.optionalString stdenv.cc.isGNU "-std=c++11") + (lib.optionalString stdenv.cc.isClang "-Wno-error=c++11-narrowing") + (lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) "-Dfinite=isfinite") ]; meta = with lib; { - broken = stdenv.isDarwin; - description = "Computational Morphometry Toolkit "; + description = "Computational Morphometry Toolkit"; longDescription = ''A software toolkit for computational morphometry of biomedical images, CMTK comprises a set of command line tools and a back-end general-purpose library for processing and I/O''; maintainers = with maintainers; [ tbenst ]; platforms = platforms.all; - license = licenses.gpl3; + license = licenses.gpl3Plus; homepage = "https://www.nitrc.org/projects/cmtk/"; }; -} +}) diff --git a/pkgs/applications/version-management/github-desktop/default.nix b/pkgs/applications/version-management/github-desktop/default.nix index 16fdebe670f3..33233fe9cf86 100644 --- a/pkgs/applications/version-management/github-desktop/default.nix +++ b/pkgs/applications/version-management/github-desktop/default.nix @@ -19,13 +19,13 @@ , openssl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "github-desktop"; - version = "3.2.1"; + version = "3.2.5"; src = fetchurl { - url = "https://github.com/shiftkey/desktop/releases/download/release-${version}-linux1/GitHubDesktop-linux-${version}-linux1.deb"; - hash = "sha256-OdvebRvOTyadgNjzrv6CGDPkljfpo4RVvVAc+X9hjSo="; + url = "https://github.com/shiftkey/desktop/releases/download/release-${finalAttrs.version}-linux1/GitHubDesktop-linux-${finalAttrs.version}-linux1.deb"; + hash = "sha256-p+qr9/aEQcfkKArC3oTyIijHkaNzLum3xXeSnNexgbU="; }; nativeBuildInputs = [ @@ -50,16 +50,16 @@ stdenv.mkDerivation rec { ]; unpackPhase = '' - mkdir -p $TMP/${pname} $out/{opt,bin} - cp $src $TMP/${pname}.deb - ar vx ${pname}.deb - tar --no-overwrite-dir -xvf data.tar.xz -C $TMP/${pname}/ + mkdir -p $TMP/${finalAttrs.pname} $out/{opt,bin} + cp $src $TMP/${finalAttrs.pname}.deb + ar vx ${finalAttrs.pname}.deb + tar --no-overwrite-dir -xvf data.tar.xz -C $TMP/${finalAttrs.pname}/ ''; installPhase = '' - cp -R $TMP/${pname}/usr/share $out/ - cp -R $TMP/${pname}/usr/lib/${pname}/* $out/opt/ - ln -sf $out/opt/${pname} $out/bin/${pname} + cp -R $TMP/${finalAttrs.pname}/usr/share $out/ + cp -R $TMP/${finalAttrs.pname}/usr/lib/${finalAttrs.pname}/* $out/opt/ + ln -sf $out/opt/${finalAttrs.pname} $out/bin/${finalAttrs.pname} ''; preFixup = '' @@ -72,12 +72,12 @@ stdenv.mkDerivation rec { (lib.getLib systemd) ]; - meta = with lib; { + meta = { description = "GUI for managing Git and GitHub."; homepage = "https://desktop.github.com/"; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = licenses.mit; - maintainers = with maintainers; [ dan4ik605743 ]; - platforms = platforms.linux; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ dan4ik605743 ]; + platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/applications/video/obs-studio/plugins/advanced-scene-switcher/default.nix b/pkgs/applications/video/obs-studio/plugins/advanced-scene-switcher/default.nix index f2df05ceca30..484a8efbb4e2 100644 --- a/pkgs/applications/video/obs-studio/plugins/advanced-scene-switcher/default.nix +++ b/pkgs/applications/video/obs-studio/plugins/advanced-scene-switcher/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "advanced-scene-switcher"; - version = "1.22.1"; + version = "1.23.0"; src = fetchFromGitHub { owner = "WarmUpTill"; repo = "SceneSwitcher"; rev = version; - hash = "sha256-SV5hnTIRJ6ZruA5t/G6zRAC/+oalTABor3h66eF+KHM="; + hash = "sha256-X1qeMNTC2Hsl3Yh3E7PYVWAMGjGylF/EBkgW4WrtH40="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/build-support/fetchrepoproject/default.nix b/pkgs/build-support/fetchrepoproject/default.nix index 69b1bd1aef74..78b8caeb8091 100644 --- a/pkgs/build-support/fetchrepoproject/default.nix +++ b/pkgs/build-support/fetchrepoproject/default.nix @@ -60,7 +60,7 @@ in stdenvNoCC.mkDerivation { ${optionalString (local_manifests != []) '' mkdir .repo/local_manifests for local_manifest in ${concatMapStringsSep " " toString local_manifests}; do - cp $local_manifest .repo/local_manifests/$(stripHash $local_manifest; echo $strippedName) + cp $local_manifest .repo/local_manifests/$(stripHash $local_manifest) done ''} diff --git a/pkgs/data/fonts/noto-fonts/default.nix b/pkgs/data/fonts/noto-fonts/default.nix index c9474db7abd9..65daffe0ee58 100644 --- a/pkgs/data/fonts/noto-fonts/default.nix +++ b/pkgs/data/fonts/noto-fonts/default.nix @@ -35,13 +35,13 @@ rec { }: stdenvNoCC.mkDerivation rec { inherit pname; - version = "23.7.1"; + version = "23.8.1"; src = fetchFromGitHub { owner = "notofonts"; repo = "notofonts.github.io"; rev = "noto-monthly-release-${version}"; - hash = "sha256-+P0mQ3PaGGPGK3SFPtCe7wrjMgOgZeRpkEQulLeu/zs="; + hash = "sha256-TYCJzioZcNFV8N5wLr7Fo69g/p5GQF/tbGgYoLUV7Us="; }; _variants = map (variant: builtins.replaceStrings [ " " ] [ "" ] variant) variants; diff --git a/pkgs/development/compilers/assemblyscript/default.nix b/pkgs/development/compilers/assemblyscript/default.nix index ebb059f6bbb9..a2b1954e645e 100644 --- a/pkgs/development/compilers/assemblyscript/default.nix +++ b/pkgs/development/compilers/assemblyscript/default.nix @@ -5,13 +5,13 @@ buildNpmPackage rec { pname = "assemblyscript"; - version = "0.27.6"; + version = "0.27.8"; src = fetchFromGitHub { owner = "AssemblyScript"; repo = pname; rev = "v${version}"; - sha256 = "sha256-jN8P3EL3giDIZSExkjm5ZUwgkN3EIQhVpMqfx273yZU="; + sha256 = "sha256-EwpIUD9+IjJlWOnUEXgvx60i59ftQyHcPTQVWVoOGNQ="; }; npmDepsHash = "sha256-9ILa1qY2GpP2RckcZYcCMmgCwdXIImOm+D8nldeoQL8="; diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix index 48dd456bcb2f..9f2e17dad09d 100644 --- a/pkgs/development/compilers/crystal/default.nix +++ b/pkgs/development/compilers/crystal/default.nix @@ -17,7 +17,8 @@ , libxml2 , libyaml , libffi -, llvmPackages +, llvmPackages_13 +, llvmPackages_15 , makeWrapper , openssl , pcre2 @@ -53,28 +54,29 @@ let "https://github.com/crystal-lang/crystal/releases/download/${version}/crystal-${version}-${toString rel}-${arch}.tar.gz"; genericBinary = { version, sha256s, rel ? 1 }: - stdenv.mkDerivation rec { - pname = "crystal-binary"; - inherit version; + stdenv.mkDerivation rec { + pname = "crystal-binary"; + inherit version; - src = fetchurl { - url = binaryUrl version rel; - sha256 = sha256s.${stdenv.system}; - }; - - buildCommand = '' - mkdir -p $out - tar --strip-components=1 -C $out -xf ${src} - patchShebangs $out/bin/crystal - ''; - - meta.platforms = lib.attrNames sha256s; + src = fetchurl { + url = binaryUrl version rel; + sha256 = sha256s.${stdenv.system}; }; - generic = ( + buildCommand = '' + mkdir -p $out + tar --strip-components=1 -C $out -xf ${src} + patchShebangs $out/bin/crystal + ''; + + meta.platforms = lib.attrNames sha256s; + }; + + generic = { version , sha256 , binary + , llvmPackages , doCheck ? true , extraBuildInputs ? [ ] , buildFlags ? [ "all" "docs" "release=1"] @@ -244,9 +246,7 @@ let license = licenses.asl20; maintainers = with maintainers; [ david50407 manveru peterhoeg donovanglover ]; }; - }) - ); - + }); in rec { binaryCrystal_1_2 = genericBinary { @@ -263,6 +263,7 @@ rec { version = "1.2.2"; sha256 = "sha256-nyOXhsutVBRdtJlJHe2dALl//BUXD1JeeQPgHU4SwiU="; binary = binaryCrystal_1_2; + llvmPackages = llvmPackages_13; extraBuildInputs = [ libatomic_ops ]; }; @@ -270,18 +271,21 @@ rec { version = "1.7.3"; sha256 = "sha256-ULhLGHRIZbsKhaMvNhc+W74BwNgfEjHcMnVNApWY+EE="; binary = binaryCrystal_1_2; + llvmPackages = llvmPackages_13; }; crystal_1_8 = generic { version = "1.8.2"; sha256 = "sha256-YAORdipzpC9CrFgZUFlFfjzlJQ6ZeA2ekVu8IfPOxR8="; binary = binaryCrystal_1_2; + llvmPackages = llvmPackages_15; }; crystal_1_9 = generic { version = "1.9.2"; sha256 = "sha256-M1oUFs7/8ljszga3StzLOLM1aA4fSfVPQlsbuDHGd84="; binary = binaryCrystal_1_2; + llvmPackages = llvmPackages_15; }; crystal = crystal_1_9; diff --git a/pkgs/development/compilers/edk2/default.nix b/pkgs/development/compilers/edk2/default.nix index 34b75b05d87f..3a039014db84 100644 --- a/pkgs/development/compilers/edk2/default.nix +++ b/pkgs/development/compilers/edk2/default.nix @@ -5,7 +5,6 @@ , libuuid , python3 , bc -, llvmPackages_9 , lib , buildPackages }: @@ -24,17 +23,12 @@ else if stdenv.isAarch64 then else throw "Unsupported architecture"; -buildStdenv = if stdenv.isDarwin then - llvmPackages_9.stdenv -else - stdenv; - buildType = if stdenv.isDarwin then "CLANGPDB" else "GCC5"; -edk2 = buildStdenv.mkDerivation { +edk2 = stdenv.mkDerivation { pname = "edk2"; version = "202305"; @@ -42,7 +36,7 @@ edk2 = buildStdenv.mkDerivation { # pass targetPrefix as an env var (fetchpatch { url = "https://src.fedoraproject.org/rpms/edk2/raw/08f2354cd280b4ce5a7888aa85cf520e042955c3/f/0021-Tweak-the-tools_def-to-support-cross-compiling.patch"; - sha256 = "sha256-E1/fiFNVx0aB1kOej2DJ2DlBIs9tAAcxoedym2Zhjxw="; + hash = "sha256-E1/fiFNVx0aB1kOej2DJ2DlBIs9tAAcxoedym2Zhjxw="; }) ]; @@ -62,8 +56,7 @@ edk2 = buildStdenv.mkDerivation { # trick taken from https://src.fedoraproject.org/rpms/edk2/blob/08f2354cd280b4ce5a7888aa85cf520e042955c3/f/edk2.spec#_319 ${"GCC5_${targetArch}_PREFIX"}=stdenv.cc.targetPrefix; - makeFlags = [ "-C BaseTools" ] - ++ lib.optionals (stdenv.cc.isClang) [ "CXX=llvm BUILD_AR=ar BUILD_CC=clang BUILD_CXX=clang++ BUILD_AS=clang BUILD_LD=ld" ]; + makeFlags = [ "-C BaseTools" ]; env.NIX_CFLAGS_COMPILE = "-Wno-return-type" + lib.optionalString (stdenv.cc.isGNU) " -Wno-error=stringop-truncation"; @@ -89,7 +82,7 @@ edk2 = buildStdenv.mkDerivation { }; passthru = { - mkDerivation = projectDscPath: attrsOrFun: buildStdenv.mkDerivation (finalAttrs: + mkDerivation = projectDscPath: attrsOrFun: stdenv.mkDerivation (finalAttrs: let attrs = lib.toFunction attrsOrFun finalAttrs; in diff --git a/pkgs/development/guile-modules/guile-fibers/default.nix b/pkgs/development/guile-modules/guile-fibers/default.nix index cbad7323f505..c5b9b07a6124 100644 --- a/pkgs/development/guile-modules/guile-fibers/default.nix +++ b/pkgs/development/guile-modules/guile-fibers/default.nix @@ -19,17 +19,23 @@ stdenv.mkDerivation rec { hash = "sha256-jJKA5JEHsmqQ/IKb1aNmOtoVaGKNjcgTKyo5VCiJbXM="; }; + strictDeps = true; + nativeBuildInputs = [ autoreconfHook + guile pkg-config + texinfo # for makeinfo ]; + buildInputs = [ guile libevent - texinfo ]; - autoreconfPhase = "./autogen.sh"; + makeFlags = [ + "GUILE_AUTO_COMPILE=0" + ]; meta = with lib; { homepage = "https://github.com/wingo/fibers"; diff --git a/pkgs/development/libraries/LASzip/default.nix b/pkgs/development/libraries/LASzip/default.nix index f170ea44c0ee..ee6e74aa7bc2 100644 --- a/pkgs/development/libraries/LASzip/default.nix +++ b/pkgs/development/libraries/LASzip/default.nix @@ -1,25 +1,33 @@ -{ lib, stdenv, fetchFromGitHub, cmake }: +{ lib +, stdenv +, fetchFromGitHub +, cmake +, fixDarwinDylibNames +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "3.4.3"; pname = "LASzip"; src = fetchFromGitHub { owner = "LASzip"; repo = "LASzip"; - rev = version; - sha256 = "09lcsgxwv0jq50fhsgfhx0npbf1zcwn3hbnq6q78fshqksbxmz7m"; + rev = finalAttrs.version; + hash = "sha256-9fzal54YaocONtguOCxnP7h1LejQPQ0dKFiCzfvTjCY="; }; nativeBuildInputs = [ cmake + ] ++ lib.optionals stdenv.isDarwin [ + fixDarwinDylibNames ]; meta = { description = "Turn quickly bulky LAS files into compact LAZ files without information loss"; homepage = "https://laszip.org"; + changelog = "https://github.com/LASzip/LASzip/releases/tag/${finalAttrs.src.rev}"; license = lib.licenses.lgpl2; maintainers = [ lib.maintainers.michelk ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/development/libraries/liblinear/default.nix b/pkgs/development/libraries/liblinear/default.nix index 56d81e0481d0..b75aba83de69 100644 --- a/pkgs/development/libraries/liblinear/default.nix +++ b/pkgs/development/libraries/liblinear/default.nix @@ -4,13 +4,13 @@ let soVersion = "5"; in stdenv.mkDerivation rec { pname = "liblinear"; - version = "2.46"; + version = "2.47"; src = fetchFromGitHub { owner = "cjlin1"; repo = "liblinear"; rev = "v${builtins.replaceStrings ["."] [""] version}"; - sha256 = "sha256-mKd6idfr6mIIDEie8DCS+drtfpgKoS/5UXI0JenTxlA="; + sha256 = "sha256-so7uCc/52NdN0V2Ska8EUdw/wSegaudX5AF+c0xe5jk="; }; makeFlags = [ "AR=${stdenv.cc.targetPrefix}ar" "RANLIB=${stdenv.cc.targetPrefix}ranlib" ]; diff --git a/pkgs/development/libraries/mbedtls/2.nix b/pkgs/development/libraries/mbedtls/2.nix index 2dd5ae6dae58..3711e2d2b4ff 100644 --- a/pkgs/development/libraries/mbedtls/2.nix +++ b/pkgs/development/libraries/mbedtls/2.nix @@ -1,6 +1,6 @@ { callPackage }: callPackage ./generic.nix { - version = "2.28.3"; - hash = "sha256-w5bJErCNRZLE8rHcuZlK3bOqel97gPPMKH2cPGUR6Zw="; + version = "2.28.4"; + hash = "sha256-88Lnj9NgS5PWg2hydvb9cwi6s6BG3UMvkUH2Ny1jmtE="; } diff --git a/pkgs/development/libraries/mbedtls/3.nix b/pkgs/development/libraries/mbedtls/3.nix index 67269717bb99..01df03bbbadb 100644 --- a/pkgs/development/libraries/mbedtls/3.nix +++ b/pkgs/development/libraries/mbedtls/3.nix @@ -1,6 +1,6 @@ { callPackage }: callPackage ./generic.nix { - version = "3.4.0"; - hash = "sha256-1YA4hp/VEjph5k0qJqhhH4nBbTP3Qu2pl7WpuvPkVfg="; + version = "3.4.1"; + hash = "sha256-NIjyRcVbg6lT6+RlTz5Jt6V9T85mvta5grOSLIAK9Ts="; } diff --git a/pkgs/development/libraries/mbedtls/generic.nix b/pkgs/development/libraries/mbedtls/generic.nix index adc46adb75fb..3ca0b491fb89 100644 --- a/pkgs/development/libraries/mbedtls/generic.nix +++ b/pkgs/development/libraries/mbedtls/generic.nix @@ -42,6 +42,12 @@ stdenv.mkDerivation rec { "-DGEN_FILES=off" ]; + doCheck = true; + + # Parallel checking causes test failures + # https://github.com/Mbed-TLS/mbedtls/issues/4980 + enableParallelChecking = false; + meta = with lib; { homepage = "https://www.trustedfirmware.org/projects/mbed-tls/"; changelog = "https://github.com/Mbed-TLS/mbedtls/blob/${pname}-${version}/ChangeLog"; diff --git a/pkgs/development/python-modules/cohere/default.nix b/pkgs/development/python-modules/cohere/default.nix index 14c82fe059d7..dddb7e892e0c 100644 --- a/pkgs/development/python-modules/cohere/default.nix +++ b/pkgs/development/python-modules/cohere/default.nix @@ -3,21 +3,22 @@ , fetchPypi , poetry-core , pythonOlder -, requests , aiohttp , backoff +, importlib-metadata +, requests }: buildPythonPackage rec { pname = "cohere"; - version = "4.9.0"; + version = "4.16.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-4d89x+Pg5HZSUyxryH6OuMMGiMfeHXQX5Wy0XS++obY="; + hash = "sha256-i6kbjugulAcmmInFb+rH4WB50dM7SDO1HNW/JgD4OTQ="; }; nativeBuildInputs = [ @@ -25,9 +26,10 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - requests aiohttp backoff + importlib-metadata + requests ]; # tests require CO_API_KEY diff --git a/pkgs/development/python-modules/getjump/default.nix b/pkgs/development/python-modules/getjump/default.nix new file mode 100644 index 000000000000..a3c4c4ffa6ec --- /dev/null +++ b/pkgs/development/python-modules/getjump/default.nix @@ -0,0 +1,43 @@ +{ lib +, beautifulsoup4 +, buildPythonPackage +, fetchPypi +, pillow +, poetry-core +, requests +, rich +}: + +buildPythonPackage rec { + pname = "getjump"; + version = "2.4.0"; + format = "pyproject"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-gu6h9Yb0xdfvdmoeZGQPFCJhBJxuQ4iWlQquig1ljnY="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + beautifulsoup4 + pillow + requests + rich + ]; + + pythonImportsCheck = [ + "getjump" + ]; + + meta = with lib; { + description = "Get and save images from jump web viewer"; + homepage = "https://github.com/eggplants/getjump"; + license = licenses.mit; + maintainers = [ maintainers.marsam ]; + mainProgram = "jget"; + }; +} diff --git a/pkgs/development/python-modules/langchain/default.nix b/pkgs/development/python-modules/langchain/default.nix index 8b537122e439..a2471639bd2f 100644 --- a/pkgs/development/python-modules/langchain/default.nix +++ b/pkgs/development/python-modules/langchain/default.nix @@ -80,7 +80,7 @@ buildPythonPackage rec { pname = "langchain"; - version = "0.0.240"; + version = "0.0.247"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -89,7 +89,7 @@ buildPythonPackage rec { owner = "hwchase17"; repo = "langchain"; rev = "refs/tags/v${version}"; - hash = "sha256-7UwAdOzEgu3K/Gfq8D/GHNGxD6KhSx0xGMxtmpdnYxQ="; + hash = "sha256-Eq9jXfVJuoiNWkJanol/tqQU+kOrftMii90743DeI3Y="; }; sourceRoot = "source/libs/langchain"; diff --git a/pkgs/development/python-modules/laspy/default.nix b/pkgs/development/python-modules/laspy/default.nix index 43366105532a..69b4af29f01b 100644 --- a/pkgs/development/python-modules/laspy/default.nix +++ b/pkgs/development/python-modules/laspy/default.nix @@ -3,28 +3,33 @@ , fetchPypi , numpy , laszip +, setuptools , pytestCheckHook , pythonOlder }: buildPythonPackage rec { pname = "laspy"; - version = "2.4.1"; - format = "setuptools"; + version = "2.5.1"; + format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-E8rsxzJcsiQsslOUmE0hs7X3lsiLy0S8LtLTzxuXKsQ="; + hash = "sha256-uqPJxswVVjbxYRSREfnPwkPb0U9synKclLNWsxxmjy4="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ numpy laszip ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; @@ -36,7 +41,7 @@ buildPythonPackage rec { meta = with lib; { description = "Interface for reading/modifying/creating .LAS LIDAR files"; homepage = "https://github.com/laspy/laspy"; - changelog = "https://github.com/laspy/laspy/blob/2.4.1/CHANGELOG.md"; + changelog = "https://github.com/laspy/laspy/blob/${version}/CHANGELOG.md"; license = licenses.bsd2; maintainers = with maintainers; [ matthewcroughan ]; }; diff --git a/pkgs/development/python-modules/laszip/default.nix b/pkgs/development/python-modules/laszip/default.nix index cefd2d5f6e1a..2c6f4196595f 100644 --- a/pkgs/development/python-modules/laszip/default.nix +++ b/pkgs/development/python-modules/laszip/default.nix @@ -1,48 +1,44 @@ { lib +, stdenv , buildPythonPackage , fetchFromGitHub , scikit-build-core -, distlib -, pytestCheckHook -, pyproject-metadata -, pathspec , pybind11 , cmake , LASzip +, pythonOlder }: buildPythonPackage rec { pname = "laszip-python"; - version = "0.2.1"; + version = "0.2.3"; format = "pyproject"; + disabled = pythonOlder "3.7"; + src = fetchFromGitHub { owner = "tmontaigu"; repo = pname; rev = version; - sha256 = "sha256-ujKoUm2Btu25T7ZrSGqjRc3NR1qqsQU8OwHQDSx8grY="; + hash = "sha256-MiPzL9TDCf1xnCv7apwdfcpkFnBRi4PO/atTQxqL8cw="; }; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isGNU "-std=c++17"; + nativeBuildInputs = [ + cmake + pybind11 scikit-build-core scikit-build-core.optional-dependencies.pyproject - cmake ]; + dontUseCmakeConfigure = true; + buildInputs = [ - pybind11 LASzip ]; - checkInputs = [ - pytestCheckHook - ]; - - preBuild = '' - cd .. - ''; - # There are no tests doCheck = false; @@ -51,6 +47,7 @@ buildPythonPackage rec { meta = with lib; { description = "Unofficial bindings between Python and LASzip made using pybind11"; homepage = "https://github.com/tmontaigu/laszip-python"; + changelog = "https://github.com/tmontaigu/laszip-python/blob/${src.rev}/Changelog.md"; license = licenses.mit; maintainers = with maintainers; [ matthewcroughan ]; }; diff --git a/pkgs/development/python-modules/mpv/default.nix b/pkgs/development/python-modules/mpv/default.nix index c79842de3db9..c956bb90aa8f 100644 --- a/pkgs/development/python-modules/mpv/default.nix +++ b/pkgs/development/python-modules/mpv/default.nix @@ -1,19 +1,27 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, python, isPy27 +{ lib +, stdenv +, buildPythonPackage +, fetchFromGitHub , mpv +, setuptools }: buildPythonPackage rec { pname = "mpv"; - version = "1.0.1"; - disabled = isPy27; + version = "1.0.4"; + format = "pyproject"; src = fetchFromGitHub { owner = "jaseg"; repo = "python-mpv"; rev = "v${version}"; - hash = "sha256-UCJ1PknnWQiFciTEMxTUqDzz0Z8HEWycLuQqYeyQhoM="; + hash = "sha256-qP5Biw4sTLioAhmMZX+Pemue2PWc3N7afAe38dwJv3U="; }; + nativeBuildInputs = [ + setuptools + ]; + buildInputs = [ mpv ]; postPatch = '' @@ -30,5 +38,6 @@ buildPythonPackage rec { description = "A python interface to the mpv media player"; homepage = "https://github.com/jaseg/python-mpv"; license = licenses.agpl3Plus; + maintainers = with maintainers; [ onny ]; }; } diff --git a/pkgs/development/python-modules/pyradiomics/default.nix b/pkgs/development/python-modules/pyradiomics/default.nix new file mode 100644 index 000000000000..606f542f8f96 --- /dev/null +++ b/pkgs/development/python-modules/pyradiomics/default.nix @@ -0,0 +1,71 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, pytestCheckHook +, numpy +, pykwalify +, pywavelets +, setuptools +, simpleitk +, six +, versioneer +}: + +buildPythonPackage rec { + pname = "pyradiomics"; + version = "3.1.0"; + format = "pyproject"; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "AIM-Harvard"; + repo = "pyradiomics"; + rev = "refs/tags/v${version}"; + hash = "sha256-/qFNN63Bbq4DUZDPmwUGj1z5pY3ujsbqFJpVXbO+b8E="; + name = "pyradiomics"; + }; + + nativeBuildInputs = [ setuptools versioneer ]; + + propagatedBuildInputs = [ + numpy + pykwalify + pywavelets + simpleitk + six + ]; + + nativeCheckInputs = [ pytestCheckHook ]; + preCheck = '' + rm -rf radiomics + ''; + # tries to access network at collection time: + disabledTestPaths = [ "tests/test_wavelet.py" ]; + # various urllib download errors and (probably related) missing feature errors: + disabledTests = [ + "brain1_shape2D-original_shape2D" + "brain2_shape2D-original_shape2D" + "breast1_shape2D-original_shape2D" + "lung1_shape2D-original_shape2D" + "lung2_shape2D-original_shape2D" + ]; + # note the above elements of disabledTests are patterns, not exact tests, + # so simply setting `disabledTests` does not suffice: + pytestFlagsArray = [ + "-k '${toString (lib.intersperse "and" (lib.forEach disabledTests (t: "not ${t}")))}'" + ]; + + pythonImportsCheck = [ + "radiomics" + ]; + + meta = with lib; { + homepage = "https://pyradiomics.readthedocs.io"; + description = "Extraction of Radiomics features from 2D and 3D images and binary masks"; + changelog = "https://github.com/AIM-Harvard/pyradiomics/releases/tag/v${version}"; + license = licenses.bsd3; + maintainers = with maintainers; [ bcdarwin ]; + }; +} diff --git a/pkgs/applications/science/machine-learning/streamlit/default.nix b/pkgs/development/python-modules/streamlit/default.nix similarity index 71% rename from pkgs/applications/science/machine-learning/streamlit/default.nix rename to pkgs/development/python-modules/streamlit/default.nix index 36b03152f787..2ab4d11e640d 100755 --- a/pkgs/applications/science/machine-learning/streamlit/default.nix +++ b/pkgs/development/python-modules/streamlit/default.nix @@ -1,38 +1,43 @@ { lib +, stdenv , altair , blinker -, buildPythonApplication +, buildPythonPackage , cachetools , click , fetchPypi , gitpython , importlib-metadata -, jinja2 +, numpy +, packaging +, pandas , pillow , protobuf3 , pyarrow , pydeck , pympler +, python-dateutil +, pythonOlder , requests , rich -, semver -, setuptools , tenacity , toml -, tornado +, typing-extensions , tzlocal , validators , watchdog }: -buildPythonApplication rec { +buildPythonPackage rec { pname = "streamlit"; - version = "1.24.0"; + version = "1.24.1"; format = "setuptools"; + disabled = pythonOlder "3.8"; + src = fetchPypi { inherit pname version format; - hash = "sha256-NSX6zpTHh5JzPFbWOja0iEUVDjume7UKGa20xZdagiU="; + hash = "sha256-/V8LZHmOlwY2RAj7WJt3WVMUpjFdE7LXULljx66X82I="; }; propagatedBuildInputs = [ @@ -42,21 +47,23 @@ buildPythonApplication rec { click gitpython importlib-metadata - jinja2 + numpy + packaging + pandas pillow protobuf3 pyarrow pydeck pympler + python-dateutil requests rich - semver - setuptools tenacity toml - tornado + typing-extensions tzlocal validators + ] ++ lib.optionals (!stdenv.isDarwin) [ watchdog ]; @@ -75,7 +82,7 @@ buildPythonApplication rec { homepage = "https://streamlit.io/"; changelog = "https://github.com/streamlit/streamlit/releases/tag/${version}"; description = "The fastest way to build custom ML tools"; - maintainers = with maintainers; [ yrashk ]; + maintainers = with maintainers; [ natsukium yrashk ]; license = licenses.asl20; }; } diff --git a/pkgs/development/tools/api-linter/default.nix b/pkgs/development/tools/api-linter/default.nix index e58d5f093a3b..550cdb8e56b6 100644 --- a/pkgs/development/tools/api-linter/default.nix +++ b/pkgs/development/tools/api-linter/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "api-linter"; - version = "1.55.0"; + version = "1.55.2"; src = fetchFromGitHub { owner = "googleapis"; repo = "api-linter"; rev = "v${version}"; - hash = "sha256-aywqb//fhygphjX3suVfqNIG0saPPnhgLPA/DBpSVQY="; + hash = "sha256-OBx8zlxDLlPy6hfA8A9+F0bOglAzY81d9U7uCje0vyo="; }; - vendorHash = "sha256-oK1d9aQ43Zj+Xt4tMhn+Lz1Q09psqqdTUqbgEdkuBvg="; + vendorHash = "sha256-x8mncoXVK7p6xxgaZL/Fv6dHgeOj2rWr55ovvk6zwQE="; subPackages = [ "cmd/api-linter" ]; @@ -23,7 +23,7 @@ buildGoModule rec { "-w" ]; - # reference: https://github.com/googleapis/api-linter/blob/v1.55.0/.github/workflows/release.yaml#L76 + # reference: https://github.com/googleapis/api-linter/blob/v1.55.2/.github/workflows/release.yaml#L76 preBuild = '' cat > cmd/api-linter/version.go <