diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix index 19223d46f6b9..10834da35207 100644 --- a/nixos/release-combined.nix +++ b/nixos/release-combined.nix @@ -50,7 +50,7 @@ in rec { (onFullSupported "nixos.dummy") (onAllSupported "nixos.iso_minimal") (onSystems ["x86_64-linux" "aarch64-linux"] "nixos.amazonImage") - (onFullSupported "nixos.iso_plasma5") + (onFullSupported "nixos.iso_plasma6") (onFullSupported "nixos.iso_gnome") (onFullSupported "nixos.manual") (onSystems ["x86_64-linux"] "nixos.ova") diff --git a/nixos/tests/castopod.nix b/nixos/tests/castopod.nix index 3257cd3d363c..57e035354d23 100644 --- a/nixos/tests/castopod.nix +++ b/nixos/tests/castopod.nix @@ -98,6 +98,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: driver = Firefox(options=options, service=service) driver = Firefox(options=options) driver.implicitly_wait(30) + driver.set_page_load_timeout(60) # install ########################################################## @@ -207,7 +208,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: text = '' out=/tmp/podcast.mp3 sox -n -r 48000 -t wav - synth ${targetPodcastDuration} sine 440 ` - `| lame --noreplaygain -cbr -q 9 -b 320 - $out + `| lame --noreplaygain --cbr -q 9 -b 320 - $out FILESIZE="$(stat -c%s $out)" [ "$FILESIZE" -gt 0 ] [ "$FILESIZE" -le "${toString targetPodcastSize}" ] diff --git a/pkgs/applications/graphics/ImageMagick/6.x.nix b/pkgs/applications/graphics/ImageMagick/6.x.nix index a433cc6516de..9be6460d8f1d 100644 --- a/pkgs/applications/graphics/ImageMagick/6.x.nix +++ b/pkgs/applications/graphics/ImageMagick/6.x.nix @@ -36,13 +36,13 @@ in stdenv.mkDerivation (finalAttrs: { pname = "imagemagick"; - version = "6.9.12-68"; + version = "6.9.13-10"; src = fetchFromGitHub { owner = "ImageMagick"; repo = "ImageMagick6"; rev = finalAttrs.version; - sha256 = "sha256-slQcA0cblxtG/1DiJx5swUh7Kfwgz5HG70eqJFLaQJI="; + sha256 = "sha256-AdlJaCJOrN+NkkzzzgELtgAr5iZ9dvlVYVc7tYiM+R8="; }; outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big @@ -121,24 +121,30 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with maintainers; [ ]; license = licenses.asl20; knownVulnerabilities = [ - "CVE-2018-16328" - "CVE-2018-16329" "CVE-2019-13136" "CVE-2019-17547" "CVE-2020-25663" "CVE-2020-27768" - "CVE-2021-3596" - "CVE-2021-3596" - "CVE-2021-3596" - "CVE-2021-3610" - "CVE-2021-20244" + "CVE-2020-27769" + "CVE-2020-27829" + "CVE-2021-20243" "CVE-2021-20244" "CVE-2021-20310" "CVE-2021-20311" "CVE-2021-20312" "CVE-2021-20313" + "CVE-2021-3596" "CVE-2022-0284" "CVE-2022-2719" + "CVE-2023-1289" + "CVE-2023-2157" + "CVE-2023-34151" + "CVE-2023-34152" + "CVE-2023-34153" + "CVE-2023-3428" + "CVE-2023-34474" + "CVE-2023-34475" + "CVE-2023-5341" ]; }; }) diff --git a/pkgs/applications/networking/browsers/microsoft-edge/default.nix b/pkgs/applications/networking/browsers/microsoft-edge/default.nix index 8b9574916ce0..c99b245cadc0 100644 --- a/pkgs/applications/networking/browsers/microsoft-edge/default.nix +++ b/pkgs/applications/networking/browsers/microsoft-edge/default.nix @@ -1,20 +1,20 @@ { beta = import ./browser.nix { channel = "beta"; - version = "125.0.2535.37"; + version = "125.0.2535.51"; revision = "1"; - hash = "sha256-/fZcFIVj4stIxim2UYsxA5rNkyGf/i3eDf25npsdDi4="; + hash = "sha256-ZOuC4+1Vp+i/vA783h+ilz97YwPwLMwk5eoc2hR5Y9E="; }; dev = import ./browser.nix { channel = "dev"; - version = "126.0.2566.1"; + version = "126.0.2578.1"; revision = "1"; - hash = "sha256-PePosWGdkLm5OK82YP9LQbvVz5de8KL06I6rv0TKP3A="; + hash = "sha256-L1w8d0IdqCps7BuyL3AWMzPPkZtwLuiA+Z/dWSlEJU8="; }; stable = import ./browser.nix { channel = "stable"; - version = "124.0.2478.97"; + version = "125.0.2535.51"; revision = "1"; - hash = "sha256-hdCtHWOEez3VTw8hTRiitURiu0MpFTbnc60biym795k="; + hash = "sha256-bpI3ePjjJLAoF/+ygXWYV1RY/FxOjs6/V8N0XWcal70="; }; } diff --git a/pkgs/by-name/ht/htcondor/package.nix b/pkgs/by-name/ht/htcondor/package.nix index 4f400d1f009e..f0caa1d981d0 100644 --- a/pkgs/by-name/ht/htcondor/package.nix +++ b/pkgs/by-name/ht/htcondor/package.nix @@ -48,6 +48,7 @@ stdenv.mkDerivation rec { scitokens-cpp ]; + env.CXXFLAGS = "-fpermissive"; cmakeFlags = [ "-DSYSTEM_NAME=NixOS" "-DWITH_PYTHON_BINDINGS=false" ]; diff --git a/pkgs/by-name/hy/hyprwayland-scanner/package.nix b/pkgs/by-name/hy/hyprwayland-scanner/package.nix index fc9fb5a820a0..8a67503d804b 100644 --- a/pkgs/by-name/hy/hyprwayland-scanner/package.nix +++ b/pkgs/by-name/hy/hyprwayland-scanner/package.nix @@ -8,13 +8,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "hyprwayland-scanner"; - version = "0.3.7"; + version = "0.3.8"; src = fetchFromGitHub { owner = "hyprwm"; repo = "hyprwayland-scanner"; rev = "v${finalAttrs.version}"; - hash = "sha256-BPc9FdIzQAmP1JnYGfr+3O30Yp1BywUvKUz57ZOZ39A="; + hash = "sha256-/DwglRvj4XF4ECdNtrCIbthleszAZBwOiXG5A6r0K/c="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ma/makima/package.nix b/pkgs/by-name/ma/makima/package.nix index 93aea5d69024..92192f9a7add 100644 --- a/pkgs/by-name/ma/makima/package.nix +++ b/pkgs/by-name/ma/makima/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec{ pname = "makima"; - version = "0.7.2"; + version = "0.8.4"; src = fetchFromGitHub { owner = "cyber-sushi"; repo = "makima"; rev = "v${version}"; - hash = "sha256-pLEMKVi1CXp9Jqy+D0Wibhfq8PAH2bm3e1G7jShEKsU="; + hash = "sha256-11BSfnfD9JFsIwk7fHp4MM5/7UzZJHCHbOWisyQZS7s="; }; - cargoHash = "sha256-EiqmNu0GUE/zFrWkIqrcxZEpv26J39GeWa+tmTlJq4A="; + cargoHash = "sha256-cvd1sGzCWi269y7k0JubOmyTaNhrALAq3vv3al2Dznc="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ udev ]; diff --git a/pkgs/by-name/ma/malwoverview/package.nix b/pkgs/by-name/ma/malwoverview/package.nix index db29831b4eec..9724c4b162be 100644 --- a/pkgs/by-name/ma/malwoverview/package.nix +++ b/pkgs/by-name/ma/malwoverview/package.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "malwoverview"; - version = "5.4.2"; + version = "5.4.3"; pyproject = true; src = fetchFromGitHub { owner = "alexandreborges"; repo = "malwoverview"; rev = "refs/tags/v${version}"; - hash = "sha256-WAlVEEukPOynCGpRdQu3wP+JZ1UKuSR6pH5ek81L73E="; + hash = "sha256-eP2xYd/S/c4Z/cdK8IWghEUyF7pSTb5Cpg5pS/tpzUI="; }; pythonRemoveDeps = [ diff --git a/pkgs/by-name/of/offat/package.nix b/pkgs/by-name/of/offat/package.nix index 029fab3da789..80e092eab889 100644 --- a/pkgs/by-name/of/offat/package.nix +++ b/pkgs/by-name/of/offat/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "offat"; - version = "0.17.5"; + version = "0.18.0"; pyproject = true; src = fetchFromGitHub { owner = "OWASP"; repo = "OFFAT"; rev = "refs/tags/v${version}"; - hash = "sha256-61VJPsmSvKZKBWQNl7klqZqFjEjhM3n4LuafZh4d6g4="; + hash = "sha256-AROfhVVV9MN+yRGWrzC2y9lfErT4C3Mg8qPz8lSODFM="; }; sourceRoot = "${src.name}/src"; diff --git a/pkgs/by-name/pa/parabolic/deps.nix b/pkgs/by-name/pa/parabolic/deps.nix index 898fd49dac40..0d09f475e839 100644 --- a/pkgs/by-name/pa/parabolic/deps.nix +++ b/pkgs/by-name/pa/parabolic/deps.nix @@ -5,20 +5,20 @@ (fetchNuGet { pname = "Ace4896.DBus.Services.Secrets"; version = "1.2.0"; sha256 = "1i1rwv8z2dx0mjib7vair2w7ylngmrcpbd012sdlpvdjpx0af0bn"; }) (fetchNuGet { pname = "Cake.Tool"; version = "4.0.0"; sha256 = "11vc5fimi6w465081sqxs4zhw7grr6v8ga7nl1mscdl43wv33ql2"; }) (fetchNuGet { pname = "GetText.NET"; version = "1.9.14"; sha256 = "18z4cf0dldcf41z8xgj3gdlvj9w5a9ikgj72623r0i740ndnl094"; }) - (fetchNuGet { pname = "GirCore.Adw-1"; version = "0.5.0-preview.3"; sha256 = "090kg5v99myd7hi49cz933cl36hk5n586ywy78gf5djn5im3v19l"; }) - (fetchNuGet { pname = "GirCore.Cairo-1.0"; version = "0.5.0-preview.3"; sha256 = "0bh1h2hr6givrq6096bvzcsg4lab1hlm7r7h4bqifbw0zmmcfb7k"; }) - (fetchNuGet { pname = "GirCore.FreeType2-2.0"; version = "0.5.0-preview.3"; sha256 = "194p44gd7r69x70j3qynv5v8awlyxmdazmzpwzgj5ayy2xpdk3hy"; }) - (fetchNuGet { pname = "GirCore.Gdk-4.0"; version = "0.5.0-preview.3"; sha256 = "09p097nvs7vi7l14l024m39qyhg1gyqihanq7zv66xqys4hzim1g"; }) - (fetchNuGet { pname = "GirCore.GdkPixbuf-2.0"; version = "0.5.0-preview.3"; sha256 = "0lspyra1g1rd8hj3f3daxspin5dhgplzgjh4jwhlgzzn648942j0"; }) - (fetchNuGet { pname = "GirCore.Gio-2.0"; version = "0.5.0-preview.3"; sha256 = "090svrddgpliks5r29yncih3572w7gdc552nl16qbviqbmhr0lbs"; }) - (fetchNuGet { pname = "GirCore.GLib-2.0"; version = "0.5.0-preview.3"; sha256 = "1wxwf24gabd69yxpnhv30rn7pcv49w885jdw3nqbrakl7pvv9fza"; }) - (fetchNuGet { pname = "GirCore.GObject-2.0"; version = "0.5.0-preview.3"; sha256 = "0iajydyx79f3khx0fhv8izbxlzxwn6gpps2xzmi9c4v98ly221j3"; }) - (fetchNuGet { pname = "GirCore.Graphene-1.0"; version = "0.5.0-preview.3"; sha256 = "114fbgxils50jdy891nwj70yr43lnwgbq9fzxqzywd1kk70k7mww"; }) - (fetchNuGet { pname = "GirCore.Gsk-4.0"; version = "0.5.0-preview.3"; sha256 = "0f5s6f6pwc9vc3nm7xfaa06z2klgpg4rv5cdf0cwis3vlncd7dnj"; }) - (fetchNuGet { pname = "GirCore.Gtk-4.0"; version = "0.5.0-preview.3"; sha256 = "1fn0b8lwlrmjm9phjq4amqnq3q70fl214115652cap5rz4rjmpgg"; }) - (fetchNuGet { pname = "GirCore.HarfBuzz-0.0"; version = "0.5.0-preview.3"; sha256 = "0xska2l44l0j38mlgmrwly1qal9wzbv2w2jjj8gn90sxbygb8zky"; }) - (fetchNuGet { pname = "GirCore.Pango-1.0"; version = "0.5.0-preview.3"; sha256 = "0ccw3bd3kl24mnxbjzhya11i0ln6g1g7q876pyy54cwh48x4mdia"; }) - (fetchNuGet { pname = "GirCore.PangoCairo-1.0"; version = "0.5.0-preview.3"; sha256 = "0lds340p5cci7sjp58nh94jxkjvzfky9cbs2h4q98hglxndjm7r9"; }) + (fetchNuGet { pname = "GirCore.Adw-1"; version = "0.5.0"; sha256 = "130jwgkkphyhsk0c14kqmznx9ywfhiwa37lzjn2qgr68akgd3xd9"; }) + (fetchNuGet { pname = "GirCore.Cairo-1.0"; version = "0.5.0"; sha256 = "1x9d3jzzpf72gzxq6qf02ih2x79y9m5zqc874drl5wc8p1qbryzn"; }) + (fetchNuGet { pname = "GirCore.FreeType2-2.0"; version = "0.5.0"; sha256 = "1688rn8dycqcslfk850w8w2pbs4b93nmj1xa6g4n6ncy799780cy"; }) + (fetchNuGet { pname = "GirCore.Gdk-4.0"; version = "0.5.0"; sha256 = "1v2nl9gh941lqzfvryslhgsx9nwaf91q131xrpilrmk18xn3hpd6"; }) + (fetchNuGet { pname = "GirCore.GdkPixbuf-2.0"; version = "0.5.0"; sha256 = "0gbmckch435s2fxpxzqjwckfsxqsidv1nz3wil3v1a2iqvk3imnr"; }) + (fetchNuGet { pname = "GirCore.Gio-2.0"; version = "0.5.0"; sha256 = "1yx23jcyy7pzjkbcf0v0s4nw1n51rcaxf8dg7zqfzhvg9f0k2iwl"; }) + (fetchNuGet { pname = "GirCore.GLib-2.0"; version = "0.5.0"; sha256 = "169y390cgda0ps60g2j6vf5bkr6bfmxvgzga8k697bsl3dfzkkvv"; }) + (fetchNuGet { pname = "GirCore.GObject-2.0"; version = "0.5.0"; sha256 = "1w35a1kmn0ggnlwcsib9m4427299f9ylm7xkm69yzswdwzrfv1kj"; }) + (fetchNuGet { pname = "GirCore.Graphene-1.0"; version = "0.5.0"; sha256 = "16y836gzn9ah963lhg533hik8wh984j33gc60kzn8nziwxl6jplq"; }) + (fetchNuGet { pname = "GirCore.Gsk-4.0"; version = "0.5.0"; sha256 = "152c839l1lv6qc8pccmkzm72sfh45n9qpyyarxvllnn0lzhd50lf"; }) + (fetchNuGet { pname = "GirCore.Gtk-4.0"; version = "0.5.0"; sha256 = "0lj69qx9ksz9w94j4ryy8hr0ja60ijvx8wpr4l1i7ic01gsyxprc"; }) + (fetchNuGet { pname = "GirCore.HarfBuzz-0.0"; version = "0.5.0"; sha256 = "0cnic254jwkndcdg51wvi1vvh4f947ylwg63ag428gfbmx0684c4"; }) + (fetchNuGet { pname = "GirCore.Pango-1.0"; version = "0.5.0"; sha256 = "0p4ks9yk3d8pl9c58zc1ncdzw45fkkmgpwn29vj1wax73iml1k79"; }) + (fetchNuGet { pname = "GirCore.PangoCairo-1.0"; version = "0.5.0"; sha256 = "0j532ixh9adk2gwg55w81m5hwy0c6a3307jr4157pbjg2qm1x4mn"; }) (fetchNuGet { pname = "Markdig"; version = "0.33.0"; sha256 = "1dj06wgdqmjji4nfr1dysz7hwp5bjgsrk9qjkdq82d7gk6nmhs9r"; }) (fetchNuGet { pname = "Meziantou.Framework.Win32.CredentialManager"; version = "1.4.5"; sha256 = "1ikjxj6wir2jcjwlmd4q7zz0b4g40808gx59alvad31sb2aqp738"; }) (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.7.0"; sha256 = "0gd67zlw554j098kabg887b5a6pq9kzavpa3jjy5w53ccjzjfy8j"; }) diff --git a/pkgs/by-name/pa/parabolic/package.nix b/pkgs/by-name/pa/parabolic/package.nix index b386b09dd40a..d083896ff543 100644 --- a/pkgs/by-name/pa/parabolic/package.nix +++ b/pkgs/by-name/pa/parabolic/package.nix @@ -16,13 +16,13 @@ buildDotnetModule rec { pname = "parabolic"; - version = "2023.12.0"; + version = "2024.5.0"; src = fetchFromGitHub { owner = "NickvisionApps"; repo = "Parabolic"; rev = version; - hash = "sha256-mbGByw/wgovo81l2LDtDE5p+Mh6aJ5DOcZCNzVfmAtA="; + hash = "sha256-awbCn7W7RUSuEByXxLGrsmYjmxCrwywhhrMJq/iM1Uc="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/sc/screenly-cli/package.nix b/pkgs/by-name/sc/screenly-cli/package.nix index 360e1d2abb92..6306edc5731c 100644 --- a/pkgs/by-name/sc/screenly-cli/package.nix +++ b/pkgs/by-name/sc/screenly-cli/package.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "screenly-cli"; - version = "0.2.6"; + version = "0.2.7"; src = fetchFromGitHub { owner = "screenly"; repo = "cli"; rev = "refs/tags/v${version}"; - hash = "sha256-JHGtF6xwAiSZg8Z3F7RvimoMsrPhmKEgqCInBnU5VtE="; + hash = "sha256-ls8QnOfWRBAkW3q7eFKyoxvHlcI6j/zwIZNn8SMNzy8="; }; - cargoHash = "sha256-YaxOoHIuoxiB5VJ9Cd1l4EnSN7OL1c9GDZlraDXxM6I="; + cargoHash = "sha256-rRH9bmsVylGZqMy7qIZlOk4kWBzj7uCruj30/z1nqEE="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/sq/sqlmc/package.nix b/pkgs/by-name/sq/sqlmc/package.nix new file mode 100644 index 000000000000..995ab820543b --- /dev/null +++ b/pkgs/by-name/sq/sqlmc/package.nix @@ -0,0 +1,45 @@ +{ + lib, + python3, + fetchFromGitHub, +}: + +python3.pkgs.buildPythonApplication rec { + pname = "sqlmc"; + version = "1.0.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "malvads"; + repo = "sqlmc"; + rev = "refs/tags/${version}"; + hash = "sha256-VJSOOCFqDPTh7PoumAQqt+tdR05uGe/xTwxcJAAe//k="; + }; + + nativeBuildInputs = with python3.pkgs; [ setuptools ]; + + propagatedBuildInputs = with python3.pkgs; [ + aiohttp + aiosignal + attrs + beautifulsoup4 + frozenlist + idna + multidict + pyfiglet + soupsieve + tabulate + yarl + ]; + + pythonImportsCheck = [ "sqlmc" ]; + + meta = with lib; { + description = "Tool to check URLs of a domain for SQL injections"; + homepage = "https://github.com/malvads/sqlmc"; + changelog = "https://github.com/malvads/sqlmc/releases/tag/${version}"; + license = licenses.agpl3Only; + maintainers = with maintainers; [ fab ]; + mainProgram = "sqlmc"; + }; +} diff --git a/pkgs/by-name/te/templ/package.nix b/pkgs/by-name/te/templ/package.nix index a7a74e993f24..53fc9775300e 100644 --- a/pkgs/by-name/te/templ/package.nix +++ b/pkgs/by-name/te/templ/package.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "templ"; - version = "0.2.680"; + version = "0.2.697"; src = fetchFromGitHub { owner = "a-h"; repo = "templ"; rev = "v${version}"; - hash = "sha256-n5OSbVc+UhN0WeWzG1Lop5oX5Zc/hlp/aaBoFjpua64="; + hash = "sha256-z/sb4AlFOU20sBEAu12VSXqhHQuqvj3mUu7JTvyc1pI="; }; - vendorHash = "sha256-zYW2dM+g9RfiOrNjhIsfszy3yqTcAKzGbDPpQh5TP6E="; + vendorHash = "sha256-Fa6bmG0yfbICMfHlM52V+obxoVsQa4VNydIHXS+lGxw="; subPackages = [ "cmd/templ" ]; diff --git a/pkgs/by-name/ty/typstyle/package.nix b/pkgs/by-name/ty/typstyle/package.nix index 4a5d4a9807d5..bccbccfba9a7 100644 --- a/pkgs/by-name/ty/typstyle/package.nix +++ b/pkgs/by-name/ty/typstyle/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "typstyle"; - version = "0.11.21"; + version = "0.11.22"; src = fetchFromGitHub { owner = "Enter-tainer"; repo = "typstyle"; rev = "v${version}"; - hash = "sha256-dmHacYUL0Pig3SxSlRU4ddKzZmBJKDq/ulV3GDW7O1k="; + hash = "sha256-DyYx//KubbRN1zyBoBoL4MRuHZBDngXazC7HiuA+4Sk="; }; - cargoHash = "sha256-D1IabmWlPwWnSdltDN+DViVpm4ue+ZFIQZrhL+YNeUU="; + cargoHash = "sha256-+Hd1u9mUJ2SPfx0mOYT2KiDY7+/Q3EjkVyS++jgUtFs="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/development/interpreters/erlang/27-rc3.nix b/pkgs/development/interpreters/erlang/27-rc3.nix deleted file mode 100644 index 77e59672c156..000000000000 --- a/pkgs/development/interpreters/erlang/27-rc3.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ mkDerivation }: - -mkDerivation { - version = "27.0-rc3"; - sha256 = "sha256-c2DTIqBd7UxpSv84F1cCB9K+MkJb5OwnWSghtewnw/4="; -} diff --git a/pkgs/development/interpreters/erlang/27.nix b/pkgs/development/interpreters/erlang/27.nix new file mode 100644 index 000000000000..a6c12ce197a6 --- /dev/null +++ b/pkgs/development/interpreters/erlang/27.nix @@ -0,0 +1,6 @@ +{ mkDerivation }: + +mkDerivation { + version = "27.0"; + sha256 = "sha256-YZWBLcpkm8B4sjoQO7I9ywXcmxXL+Dvq/JYsLsr7TO0="; +} diff --git a/pkgs/development/ocaml-modules/eio/default.nix b/pkgs/development/ocaml-modules/eio/default.nix index 0eafead13cf1..d90b40d1fe2c 100644 --- a/pkgs/development/ocaml-modules/eio/default.nix +++ b/pkgs/development/ocaml-modules/eio/default.nix @@ -63,8 +63,8 @@ buildDunePackage rec { ]; meta = { - homepage = "https://github.com/ocaml-multicore/ocaml-${pname}"; - changelog = "https://github.com/ocaml-multicore/ocaml-${pname}/raw/v${version}/CHANGES.md"; + homepage = "https://github.com/ocaml-multicore/${pname}"; + changelog = "https://github.com/ocaml-multicore/${pname}/raw/v${version}/CHANGES.md"; description = "Effects-Based Parallel IO for OCaml"; license = with lib.licenses; [ isc ]; maintainers = with lib.maintainers; [ toastal ]; diff --git a/pkgs/development/python-modules/azure-mgmt-security/default.nix b/pkgs/development/python-modules/azure-mgmt-security/default.nix index 60271f7c0381..e6e347513422 100644 --- a/pkgs/development/python-modules/azure-mgmt-security/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-security/default.nix @@ -1,30 +1,29 @@ -{ lib -, azure-common -, azure-mgmt-core -, buildPythonPackage -, fetchPypi -, isodate -, pythonOlder -, setuptools +{ + lib, + azure-common, + azure-mgmt-core, + buildPythonPackage, + fetchPypi, + isodate, + pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "azure-mgmt-security"; - version = "6.0.0"; + version = "7.0.0"; fpyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-zq/BhpiZBnEQvYMMXMmLybjzLY6oQMofaTsaX1Kl+LA="; + hash = "sha256-WRLu1+nTdY/cqNJuHcJrQZQ9xHAyCKEYQmbiwlLhrWY="; }; - nativeBuildInputs = [ - setuptools - ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ azure-common azure-mgmt-core isodate @@ -40,7 +39,7 @@ buildPythonPackage rec { meta = with lib; { description = "Microsoft Azure Security Center Management Client Library for Python"; - homepage = "https://github.com/Azure/azure-sdk-for-python"; + homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/security/azure-mgmt-security"; changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-mgmt-security_${version}/sdk/security/azure-mgmt-security/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ jonringer ]; diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix index c4a35e42730f..00f7fae6999a 100644 --- a/pkgs/development/python-modules/boto3-stubs/default.nix +++ b/pkgs/development/python-modules/boto3-stubs/default.nix @@ -366,7 +366,7 @@ buildPythonPackage rec { pname = "boto3-stubs"; - version = "1.34.108"; + version = "1.34.109"; pyproject = true; disabled = pythonOlder "3.7"; @@ -374,7 +374,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "boto3_stubs"; inherit version; - hash = "sha256-4T5VsYHuwOwZD0qpHgxKuZ7KTBxBdOFq7cVLuygOYXk="; + hash = "sha256-h/soM0T7nH4jMl82FCy4C15aJJCdP6Bvf2doGYt+sWg="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/colormath/default.nix b/pkgs/development/python-modules/colormath/default.nix index 42469056b096..d13d9a37efe1 100644 --- a/pkgs/development/python-modules/colormath/default.nix +++ b/pkgs/development/python-modules/colormath/default.nix @@ -1,9 +1,12 @@ -{ buildPythonPackage -, fetchFromGitHub -, networkx -, nose -, numpy -, lib +{ + lib, + buildPythonPackage, + fetchFromGitHub, + networkx, + numpy, + pytestCheckHook, + pythonOlder, + setuptools, }: buildPythonPackage rec { @@ -11,8 +14,10 @@ buildPythonPackage rec { # Switch to unstable which fixes an deprecation issue with newer numpy # versions, should be included in versions > 3.0 # https://github.com/gtaylor/python-colormath/issues/104 - version = "unstable-2021-04-17"; - format = "setuptools"; + version = "3.0.0-unstable-2021-04-17"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "gtaylor"; @@ -21,17 +26,21 @@ buildPythonPackage rec { hash = "sha256-eACVPIQFgiGiVmQ/PjUxP/UH/hBOsCywz5PlgpA4dk4="; }; - propagatedBuildInputs = [ networkx numpy ]; + build-system = [ setuptools ]; - nativeCheckInputs = [ nose ]; + dependencies = [ + networkx + numpy + ]; - checkPhase = "nosetests"; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "colormath" ]; meta = with lib; { description = "Color math and conversion library"; homepage = "https://github.com/gtaylor/python-colormath"; + changelog = "https://github.com/gtaylor/python-colormath/releases/tag/${version}"; license = licenses.bsd2; maintainers = with maintainers; [ jonathanreeve ]; }; diff --git a/pkgs/development/python-modules/dask-image/default.nix b/pkgs/development/python-modules/dask-image/default.nix index 311d889929dd..b2d93687988d 100644 --- a/pkgs/development/python-modules/dask-image/default.nix +++ b/pkgs/development/python-modules/dask-image/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "dask-image"; - version = "2024.5.1"; + version = "2024.5.2"; pyproject = true; disabled = pythonOlder "3.9"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "dask"; repo = "dask-image"; rev = "refs/tags/v${version}"; - hash = "sha256-BNjftLs/hle2EWkLBOT8r2nSOxKZzPixAE4fOfNSFIs="; + hash = "sha256-smoiGSY7ou4zPRf0+6bRoViZDwNFBIwq+Mk8Tc9vniM="; }; build-system = [ diff --git a/pkgs/development/python-modules/dbus-fast/default.nix b/pkgs/development/python-modules/dbus-fast/default.nix index 736605ebece8..e26f2a522e17 100644 --- a/pkgs/development/python-modules/dbus-fast/default.nix +++ b/pkgs/development/python-modules/dbus-fast/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "dbus-fast"; - version = "2.21.2"; + version = "2.21.3"; pyproject = true; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = "dbus-fast"; rev = "refs/tags/v${version}"; - hash = "sha256-CLv8pNs6P2XRNK5wjo2SbRUuasJVXvd9LFABOwjDA9k="; + hash = "sha256-Wmv6R/aOBFPSzTVEElYsg/CrywB/pAYPWZBsMhpqtFQ="; }; # The project can build both an optimized cython version and an unoptimized @@ -62,6 +62,7 @@ buildPythonPackage rec { "test_aio_properties" "test_aio_proxy_object" "test_bus_disconnect_before_reply" + "test_error_handling" "test_export_alias" "test_export_introspection" "test_export_unexport" diff --git a/pkgs/development/python-modules/glances-api/default.nix b/pkgs/development/python-modules/glances-api/default.nix index 40c8d0698f18..a9a51a9723c6 100644 --- a/pkgs/development/python-modules/glances-api/default.nix +++ b/pkgs/development/python-modules/glances-api/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "glances-api"; - version = "0.6.0"; + version = "0.7.0"; pyproject = true; disabled = pythonOlder "3.11"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "home-assistant-ecosystem"; repo = "python-glances-api"; rev = "refs/tags/${version}"; - hash = "sha256-k/F4q1+bO6p/PW8iEiiCX6yXKbS8SHXVR8mEGezOrRE="; + hash = "sha256-BME73/xhNo+KmR5Fd/cFXieZ7fVTFukRg6Wkcw6r2cc="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/ipdbplugin/default.nix b/pkgs/development/python-modules/ipdbplugin/default.nix deleted file mode 100644 index 1dd69b112f56..000000000000 --- a/pkgs/development/python-modules/ipdbplugin/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, nose -, ipython -}: - -buildPythonPackage rec { - pname = "ipdbplugin"; - version = "1.5.0"; - format = "setuptools"; - - src = fetchPypi { - inherit pname version; - sha256 = "cdcd6bc1e995c3c2c4971ed95f207e680aa44980b716fa43fb675ff2dcc7894f"; - }; - - propagatedBuildInputs = [ nose ipython ]; - - meta = with lib; { - homepage = "https://github.com/flavioamieiro/nose-ipdb/tree/master"; - description = "Nose plugin to use iPdb instead of Pdb when tests fail"; - license = licenses.lgpl2; - maintainers = [ ]; - }; - -} diff --git a/pkgs/development/python-modules/monzopy/default.nix b/pkgs/development/python-modules/monzopy/default.nix new file mode 100644 index 000000000000..1c4513ea04f6 --- /dev/null +++ b/pkgs/development/python-modules/monzopy/default.nix @@ -0,0 +1,40 @@ +{ + lib, + aiohttp, + buildPythonPackage, + fetchFromGitHub, + setuptools, + pythonOlder, +}: + +buildPythonPackage rec { + pname = "monzopy"; + version = "1.2.0"; + pyproject = true; + + disabled = pythonOlder "3.10"; + + src = fetchFromGitHub { + owner = "JakeMartin-ICL"; + repo = "monzopy"; + rev = "refs/tags/v${version}"; + hash = "sha256-C2uJQWfDXQ19Tl4a8o3cjvCRDISRrexWZZmWPmNieS4="; + }; + + build-system = [ setuptools ]; + + dependencies = [ aiohttp ]; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ "monzopy" ]; + + meta = with lib; { + description = "Module to work with the Monzo API"; + homepage = "https://github.com/JakeMartin-ICL/monzopy"; + changelog = "https://github.com/JakeMartin-ICL/monzopy/releases/tag/v${version}"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/nbdev/default.nix b/pkgs/development/python-modules/nbdev/default.nix index 02e938ae7ed4..b014aed1ae01 100644 --- a/pkgs/development/python-modules/nbdev/default.nix +++ b/pkgs/development/python-modules/nbdev/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "nbdev"; - version = "2.3.22"; + version = "2.3.23"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-CO88zk4aPoaYokt98IYXpfTrhdVBgCwM9BSiKqWeKm4="; + hash = "sha256-+HbGHyJ2TX6qnBBPNivFVklrf+Ma2QM3u/2a67NxfIs="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/nose-cprof/default.nix b/pkgs/development/python-modules/nose-cprof/default.nix deleted file mode 100644 index 58ffc4a25c68..000000000000 --- a/pkgs/development/python-modules/nose-cprof/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, nose -}: - - -buildPythonPackage rec { - pname = "nose-cprof"; - version = "0.2.1"; - format = "setuptools"; - - src = fetchPypi { - inherit pname version; - sha256 = "0178834759b63dc50388444d4ff8d1ae84e1ba110bb167419afee6bf4699b119"; - }; - - buildInputs = [ nose ]; - - meta = with lib; { - description = "A python nose plugin to profile using cProfile rather than the default Hotshot profiler"; - homepage = "https://github.com/msherry/nose-cprof"; - license = licenses.bsd0; - }; - -} diff --git a/pkgs/development/python-modules/piccolo-theme/default.nix b/pkgs/development/python-modules/piccolo-theme/default.nix index b6406ca42269..56b51f1504ed 100644 --- a/pkgs/development/python-modules/piccolo-theme/default.nix +++ b/pkgs/development/python-modules/piccolo-theme/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "piccolo-theme"; - version = "0.21.0"; + version = "0.22.0"; format = "setuptools"; src = fetchPypi { pname = "piccolo_theme"; inherit version; - hash = "sha256-mQqZ6Rwx0VoDBVQ0zbvCOmAMKAMv67Xd1ksYW6w2QPM="; + hash = "sha256-TAbaUnPfAH17BYJqbkSYgNzwmpJkIXGCx1UkJmDML4g="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/piep/default.nix b/pkgs/development/python-modules/piep/default.nix index ec3a9f5ec53c..6fc53f1bec97 100644 --- a/pkgs/development/python-modules/piep/default.nix +++ b/pkgs/development/python-modules/piep/default.nix @@ -1,30 +1,35 @@ -{ lib -, buildPythonPackage -, fetchPypi -, nose -, pygments -, isPy3k +{ + lib, + buildPythonPackage, + fetchPypi, + setuptools, + pygments, + pytestCheckHook, }: buildPythonPackage rec { version = "0.10.0"; - format = "setuptools"; pname = "piep"; - disabled = !isPy3k; + pyproject = true; src = fetchPypi { inherit pname version; hash = "sha256-aM7KQJZr1P0Hs2ReyRj2ItGUo+fRJ+TU3lLAU2Mu8KA="; }; - propagatedBuildInputs = [ pygments ]; - nativeCheckInputs = [ nose ]; + build-system = [ setuptools ]; + + dependencies = [ pygments ]; + + pythonImportsCheck = [ "piep" ]; + + nativeCheckInputs = [ pytestCheckHook ]; meta = with lib; { description = "Bringing the power of python to stream editing"; homepage = "https://github.com/timbertson/piep"; maintainers = with maintainers; [ timbertson ]; - license = licenses.gpl3; + license = licenses.gpl3Only; + mainProgram = "piep"; }; - } diff --git a/pkgs/development/python-modules/plugwise/default.nix b/pkgs/development/python-modules/plugwise/default.nix index 9f70d36118df..eb9711c6ebd6 100644 --- a/pkgs/development/python-modules/plugwise/default.nix +++ b/pkgs/development/python-modules/plugwise/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "plugwise"; - version = "0.37.5"; + version = "0.37.8"; pyproject = true; disabled = pythonOlder "3.11"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "plugwise"; repo = "python-plugwise"; rev = "refs/tags/v${version}"; - hash = "sha256-37GnuF8Z2UC02TqP6f14qxct5QCWi+8k7KUDhd7EYRQ="; + hash = "sha256-Mh4BZ0Gnsy046I537R4SZ/rC9Jm7XjF0slAP/0e5Ov8="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pycron/default.nix b/pkgs/development/python-modules/pycron/default.nix index 2e607b50dd74..c861dfaa4b37 100644 --- a/pkgs/development/python-modules/pycron/default.nix +++ b/pkgs/development/python-modules/pycron/default.nix @@ -1,24 +1,40 @@ -{ lib, buildPythonPackage, fetchFromGitHub, udatetime, pytz, pendulum, nose -, delorean, coveralls, arrow +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + arrow, + delorean, + pendulum, + pynose, + pytestCheckHook, + pytz, + udatetime, }: buildPythonPackage rec { pname = "pycron"; version = "3.0.0"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "kipe"; - repo = pname; + repo = "pycron"; rev = version; - sha256 = "12hkqrdfg3jbqkmck8i00ssyaw1c4hhvdhjxkmh2gm9pd99z5bpv"; + hash = "sha256-+67yU2o31SdgnV3CtiEkLHDltQYgosnqxEuO51rGE4o="; }; - nativeCheckInputs = [ arrow coveralls delorean nose pendulum pytz udatetime ]; + build-system = [ setuptools ]; - checkPhase = '' - nosetests - ''; + nativeCheckInputs = [ + arrow + delorean + pendulum + pynose + pytestCheckHook + pytz + udatetime + ]; pythonImportsCheck = [ "pycron" ]; diff --git a/pkgs/development/python-modules/python-telegram-bot/default.nix b/pkgs/development/python-modules/python-telegram-bot/default.nix index a15e31941ecc..8cd1dc5ec7ff 100644 --- a/pkgs/development/python-modules/python-telegram-bot/default.nix +++ b/pkgs/development/python-modules/python-telegram-bot/default.nix @@ -1,27 +1,27 @@ -{ lib -, aiolimiter -, apscheduler -, beautifulsoup4 -, buildPythonPackage -, cachetools -, cryptography -, fetchFromGitHub -, flaky -, httpx -, pytest-asyncio -, pytest-timeout -, pytest-xdist -, pytestCheckHook -, pythonOlder -, pytz -, setuptools -, wheel -, tornado +{ + lib, + aiolimiter, + apscheduler, + beautifulsoup4, + buildPythonPackage, + cachetools, + cryptography, + fetchFromGitHub, + flaky, + httpx, + pytest-asyncio, + pytest-timeout, + pytest-xdist, + pytestCheckHook, + pythonOlder, + pytz, + setuptools, + tornado, }: buildPythonPackage rec { pname = "python-telegram-bot"; - version = "21.1.1"; + version = "21.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -30,24 +30,19 @@ buildPythonPackage rec { owner = "python-telegram-bot"; repo = "python-telegram-bot"; rev = "refs/tags/v${version}"; - hash = "sha256-BZrcYZxivrZIkHKqi+x9M4A9XE9dD//2PqzRwA3vuGU="; + hash = "sha256-l5twJbyZh30+pt9DsCpQRuSav8qYNGlIhQW0qY9BmO4="; }; - nativeBuildInputs = [ - setuptools - wheel - ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ aiolimiter apscheduler cachetools cryptography httpx pytz - ] - ++ httpx.optional-dependencies.socks - ++ httpx.optional-dependencies.http2; + ] ++ httpx.optional-dependencies.socks ++ httpx.optional-dependencies.http2; nativeCheckInputs = [ beautifulsoup4 @@ -59,9 +54,7 @@ buildPythonPackage rec { tornado ]; - pythonImportsCheck = [ - "telegram" - ]; + pythonImportsCheck = [ "telegram" ]; disabledTests = [ # Tests require network access @@ -129,6 +122,9 @@ buildPythonPackage rec { homepage = "https://python-telegram-bot.org"; changelog = "https://github.com/python-telegram-bot/python-telegram-bot/blob/v${version}/CHANGES.rst"; license = licenses.lgpl3Only; - maintainers = with maintainers; [ veprbl pingiun ]; + maintainers = with maintainers; [ + veprbl + pingiun + ]; }; } diff --git a/pkgs/development/python-modules/resend/default.nix b/pkgs/development/python-modules/resend/default.nix index ddd38de916f8..bbcb620123fc 100644 --- a/pkgs/development/python-modules/resend/default.nix +++ b/pkgs/development/python-modules/resend/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "resend"; - version = "1.0.2"; + version = "1.1.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "resend"; repo = "resend-python"; rev = "refs/tags/v${version}"; - hash = "sha256-lBeVHG3MuHtEEXPgH116yNs9pBX3kEj5Oyws2deui/o="; + hash = "sha256-xLrqkOHdynlwuY3+9aHWgCz8TX9v4RiVCvvPtu6k14c="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/stickytape/default.nix b/pkgs/development/python-modules/stickytape/default.nix index 71d5327ef5cf..405d7202a16d 100644 --- a/pkgs/development/python-modules/stickytape/default.nix +++ b/pkgs/development/python-modules/stickytape/default.nix @@ -1,32 +1,37 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "stickytape"; version = "0.2.1"; - format = "setuptools"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "mwilliamson"; - repo = pname; - rev = version; + repo = "stickytape"; + rev = "refs/tags/${version}"; hash = "sha256-KOZN9oxPb91l8QVU07I49UMNXqox8j+oekA1fMtj6l8="; }; + build-system = [ setuptools ]; + # Tests have additional requirements doCheck = false; - pythonImportsCheck = [ - "stickytape" - ]; + pythonImportsCheck = [ "stickytape" ]; meta = with lib; { description = "Python module to convert Python packages into a single script"; - mainProgram = "stickytape"; homepage = "https://github.com/mwilliamson/stickytape"; - license = with licenses; [ bsd2 ]; + license = licenses.bsd2; maintainers = with maintainers; [ fab ]; + mainProgram = "stickytape"; }; } diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix index 4ab9de4457cd..4f03293b2dba 100644 --- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix +++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "tencentcloud-sdk-python"; - version = "3.0.1150"; + version = "3.0.1151"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "TencentCloud"; repo = "tencentcloud-sdk-python"; rev = "refs/tags/${version}"; - hash = "sha256-EaTlhIH+XAxC2r7NbxUGId6Sc9XfxFL2YbiS0Htmjno="; + hash = "sha256-JxxTfpb+03rBv/RIZgRpASq+WEjsAzDhtNL78FqU/Oc="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/tools/earthly/default.nix b/pkgs/development/tools/earthly/default.nix index 6b07221f1749..0a266560d559 100644 --- a/pkgs/development/tools/earthly/default.nix +++ b/pkgs/development/tools/earthly/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "earthly"; - version = "0.8.10"; + version = "0.8.11"; src = fetchFromGitHub { owner = "earthly"; repo = "earthly"; rev = "v${version}"; - hash = "sha256-oChedGnyTGN3do/B38CMEiY5cW7qdiDeUz1FjPeLQNU="; + hash = "sha256-73Ftm5/eGqgjtYcvKcRuHGzKnKYdCJ5WqDBsMSSiMuA="; }; - vendorHash = "sha256-gKl5SZQ2pxipL918uup62IdaPokJ7q/7xkY4xgXwq8M="; + vendorHash = "sha256-Uj7GGRknXtcu64rzS7SSnwQyE84hnGAyiT62vyppDE4="; subPackages = [ "cmd/earthly" "cmd/debugger" ]; CGO_ENABLED = 0; diff --git a/pkgs/development/tools/language-servers/metals/default.nix b/pkgs/development/tools/language-servers/metals/default.nix index 5f9d87d839d6..bfb8561f6caa 100644 --- a/pkgs/development/tools/language-servers/metals/default.nix +++ b/pkgs/development/tools/language-servers/metals/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "metals"; - version = "1.3.0"; + version = "1.3.1"; deps = stdenv.mkDerivation { name = "${pname}-deps-${version}"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ''; outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "sha256-otN4sqV2a0itLOoJ7x+VSMe0tl3y4WVovbA1HOpZVDw="; + outputHash = "sha256-ugTYjXgD5SHagRtc1RNsnfcLAXPeWSHcos82ewr3UIs="; }; nativeBuildInputs = [ makeWrapper setJavaClassPath ]; diff --git a/pkgs/development/tools/misc/dart-sass/default.nix b/pkgs/development/tools/misc/dart-sass/default.nix index 6262260326ef..df446387b93a 100644 --- a/pkgs/development/tools/misc/dart-sass/default.nix +++ b/pkgs/development/tools/misc/dart-sass/default.nix @@ -21,13 +21,13 @@ let in buildDartApplication rec { pname = "dart-sass"; - version = "1.77.0"; + version = "1.77.2"; src = fetchFromGitHub { owner = "sass"; repo = pname; rev = version; - hash = "sha256-x42T8nDmwktfsd89PS8jrSIw2Dc1hKwrZxSn7h7FqAs="; + hash = "sha256-Spd21/IRNDtpgMecoO2ozKWEVSQneMGCOVCCePaFzus="; }; pubspecLock = lib.importJSON ./pubspec.lock.json; diff --git a/pkgs/development/tools/misc/dart-sass/pubspec.lock.json b/pkgs/development/tools/misc/dart-sass/pubspec.lock.json index a3f10f435ae1..22f85b690231 100644 --- a/pkgs/development/tools/misc/dart-sass/pubspec.lock.json +++ b/pkgs/development/tools/misc/dart-sass/pubspec.lock.json @@ -324,11 +324,11 @@ "dependency": "direct dev", "description": { "name": "lints", - "sha256": "cbf8d4b858bb0134ef3ef87841abdf8d63bfc255c266b7bf6b39daa1085c4290", + "sha256": "976c774dd944a42e83e2467f4cc670daef7eed6295b10b36ae8c85bcbf828235", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.0.0" + "version": "4.0.0" }, "logging": { "dependency": "transitive", @@ -784,11 +784,11 @@ "dependency": "transitive", "description": { "name": "web_socket", - "sha256": "bfe704c186c6e32a46f6607f94d079cd0b747b9a489fceeecc93cd3adb98edd5", + "sha256": "217f49b5213796cb508d6a942a5dc604ce1cb6a0a6b3d8cb3f0c314f0ecea712", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.1.3" + "version": "0.1.4" }, "web_socket_channel": { "dependency": "transitive", diff --git a/pkgs/development/tools/rust/cargo-tauri/default.nix b/pkgs/development/tools/rust/cargo-tauri/default.nix index b90dca46c77d..26f99c332a43 100644 --- a/pkgs/development/tools/rust/cargo-tauri/default.nix +++ b/pkgs/development/tools/rust/cargo-tauri/default.nix @@ -17,20 +17,20 @@ let in rustPlatform.buildRustPackage rec { pname = "tauri"; - version = "1.6.5"; + version = "1.6.6"; src = fetchFromGitHub { owner = "tauri-apps"; repo = pname; rev = "tauri-v${version}"; - hash = "sha256-5Hz6vJaClZ6/6KVN11dSinb4xerf/3Qiq230H8+j5q8="; + hash = "sha256-RttKRAjkD12E8gvOum/ynHecsvrZWw3br3OzQuvutcA="; }; # Manually specify the sourceRoot since this crate depends on other crates in the workspace. Relevant info at # https://discourse.nixos.org/t/difficulty-using-buildrustpackage-with-a-src-containing-multiple-cargo-workspaces/10202 sourceRoot = "${src.name}/tooling/cli"; - cargoHash = "sha256-eb33aBG3qcMqBVY9/gzEvodS2w5rqioPAmiEKBEJIEw="; + cargoHash = "sha256-vxLFw+tD6+IdV58A6nmFwuhcgbCBpcMfpej8VsBmJ1w="; buildInputs = [ openssl ] ++ lib.optionals stdenv.isLinux [ glibc libsoup cairo gtk3 webkitgtk ] ++ lib.optionals stdenv.isDarwin [ CoreServices Security SystemConfiguration ]; diff --git a/pkgs/development/web/deno/default.nix b/pkgs/development/web/deno/default.nix index 068bee73e1b2..ad9ef96a71e7 100644 --- a/pkgs/development/web/deno/default.nix +++ b/pkgs/development/web/deno/default.nix @@ -13,16 +13,16 @@ }: rustPlatform.buildRustPackage rec { pname = "deno"; - version = "1.43.1"; + version = "1.43.5"; src = fetchFromGitHub { owner = "denoland"; repo = pname; rev = "v${version}"; - hash = "sha256-Y/1c0b7CmT5jzgkRGzEnTNmUiLn5oDf5jTvzU2SU0RA="; + hash = "sha256-Kkm7tU+pV/GHAqiiylX2quC+NhzFBKxcp12f2bH93lY="; }; - cargoHash = "sha256-Hoe22bToJ+2nZeq9iy2XXwbXDEbfRjW1g3rhcT3Og04="; + cargoHash = "sha256-Lr8aMHMZlfgwQhl0R13f5C9fdicxgPSB+5VtNqbDP38="; postPatch = '' # upstream uses lld on aarch64-darwin for faster builds diff --git a/pkgs/development/web/deno/librusty_v8.nix b/pkgs/development/web/deno/librusty_v8.nix index c4b2d814ef30..9e98aba8af8a 100644 --- a/pkgs/development/web/deno/librusty_v8.nix +++ b/pkgs/development/web/deno/librusty_v8.nix @@ -10,11 +10,11 @@ let }; in fetch_librusty_v8 { - version = "0.91.0"; + version = "0.91.1"; shas = { - x86_64-linux = "sha256-xLQnHOUuZq24/LhXJ1PgspI/Mpip3XSLMVQE/nh4chE="; - aarch64-linux = "sha256-zt05idUKlyPuVk8+N219dTfhtlcObO+cBb41Z6TTwfs="; - x86_64-darwin = "sha256-AFEUZO3aKNy4rEk9Mi611cuduE5p5lkE23RzLOTPP4Q="; - aarch64-darwin = "sha256-fldGauOMYSwWWP/kF0Ifp5s20h6akbb5sI8iw1hj/6s="; + x86_64-linux = "sha256-2J/YDTtSCXo2nsO0Lx6mJqKSFu2hUc8HmNAL2SD9ImI="; + aarch64-linux = "sha256-NwuDVaEbYWZfF2epVPPhIKM1aw35e8Bp5siBoREpym8="; + x86_64-darwin = "sha256-JNf4Me4VMdvjgYM4OyCUlQW6Q/OdQ2BuDNWFKI4sbtg="; + aarch64-darwin = "sha256-WVBDiGWVBvMiKNgPaPw8KQChARkFDfx8Nt9QEobGNG4="; }; } diff --git a/pkgs/games/osu-lazer/bin.nix b/pkgs/games/osu-lazer/bin.nix index 945fe4ac91b3..ee8a20a86562 100644 --- a/pkgs/games/osu-lazer/bin.nix +++ b/pkgs/games/osu-lazer/bin.nix @@ -7,22 +7,22 @@ let pname = "osu-lazer-bin"; - version = "2024.412.1"; + version = "2024.521.2"; src = { aarch64-darwin = fetchzip { url = "https://github.com/ppy/osu/releases/download/${version}/osu.app.Apple.Silicon.zip"; - hash = "sha256-iV9m6w2bs2123uUmH1lgc+sZFG0NtvEIaQmADkaF/x8="; + hash = "sha256-YaCET5njEkjWEON3hDUwQ1vg7//7fiJ+5bDRKPRR6M0="; stripRoot = false; }; x86_64-darwin = fetchzip { url = "https://github.com/ppy/osu/releases/download/${version}/osu.app.Intel.zip"; - hash = "sha256-yuVoNApIp9g+Un2LHdDsvVo+BCflPT4rMPtOf1vltZA="; + hash = "sha256-M7fPOEcdOsPnrbyyh4JAiQnoffDK5Ba6lejtHwcqifM="; stripRoot = false; }; x86_64-linux = fetchurl { url = "https://github.com/ppy/osu/releases/download/${version}/osu.AppImage"; - hash = "sha256-9mMP8+Ee8lZcaIkZfcaDmgDqe/rFvEGc01oGwFpnhOY="; + hash = "sha256-QVDgY04PmGJ/eOfes/qBAbBKsk9uOaqLjwZSQH+F9ro="; }; }.${stdenv.system} or (throw "${pname}-${version}: ${stdenv.system} is unsupported."); diff --git a/pkgs/games/osu-lazer/default.nix b/pkgs/games/osu-lazer/default.nix index 43a7a9b3233e..67454d30a6e7 100644 --- a/pkgs/games/osu-lazer/default.nix +++ b/pkgs/games/osu-lazer/default.nix @@ -17,13 +17,13 @@ buildDotnetModule rec { pname = "osu-lazer"; - version = "2024.412.1"; + version = "2024.521.2"; src = fetchFromGitHub { owner = "ppy"; repo = "osu"; rev = version; - hash = "sha256-lpBQGNN91mV9Uy9NpyFYh3vsoMW1ZaiYA5wkoS6bgig="; + hash = "sha256-g/d+3389EDh2uDq+Zqvh87AioZ2s3IFBE4bhEy6NT1s="; }; projectFile = "osu.Desktop/osu.Desktop.csproj"; @@ -74,11 +74,13 @@ buildDotnetModule rec { name = "osu"; exec = "osu!"; icon = "osu!"; - comment = meta.description; + comment = "Rhythm is just a *click* away (no score submission or multiplayer, see osu-lazer-bin)"; type = "Application"; categories = [ "Game" ]; })]; + passthru.updateScript = ./update.sh; + meta = with lib; { description = "Rhythm is just a *click* away (no score submission or multiplayer, see osu-lazer-bin)"; homepage = "https://osu.ppy.sh"; @@ -91,5 +93,4 @@ buildDotnetModule rec { platforms = [ "x86_64-linux" ]; mainProgram = "osu!"; }; - passthru.updateScript = ./update.sh; } diff --git a/pkgs/games/osu-lazer/deps.nix b/pkgs/games/osu-lazer/deps.nix index f06dc41d286b..8e7a5c6d2eb7 100644 --- a/pkgs/games/osu-lazer/deps.nix +++ b/pkgs/games/osu-lazer/deps.nix @@ -131,8 +131,8 @@ (fetchNuGet { pname = "OpenTabletDriver.Native"; version = "0.6.4"; sha256 = "1jsw2kwxxskwppk65i52yrxjjgbfbhicpmz30iaxlm68d5m6gwz2"; }) (fetchNuGet { pname = "OpenTabletDriver.Plugin"; version = "0.6.4"; sha256 = "0lbd80yddsy7wqjw014kvj9an49h2rbgd9s86ifq38dyin5r2czn"; }) (fetchNuGet { pname = "PolySharp"; version = "1.10.0"; sha256 = "06qici3hhk6a0jmy0nyvspcnmhbapnic6iin3i28pkdvrii02hnz"; }) - (fetchNuGet { pname = "ppy.LocalisationAnalyser"; version = "2023.1117.0"; sha256 = "04q65q27nzjq0fmv8p62r5lmhzdbpfk6y65fxqmfmm7qz2wkiy27"; }) - (fetchNuGet { pname = "ppy.LocalisationAnalyser.Tools"; version = "2023.1117.0"; sha256 = "1yr0r628x5aaa1vqxpkr9ys1xnf4qnz6ypggms6v4a336gjz2734"; }) + (fetchNuGet { pname = "ppy.LocalisationAnalyser"; version = "2024.517.0"; sha256 = "06lhlsadcxd95cszqhy9sswcrifywzblnrra5myvj8ylq0h00l85"; }) + (fetchNuGet { pname = "ppy.LocalisationAnalyser.Tools"; version = "2024.517.0"; sha256 = "1d5y75l3ni4p4f19lv2q1wly7fsp5wcnj4r7kl1akav2h7z195q0"; }) (fetchNuGet { pname = "ppy.ManagedBass"; version = "2022.1216.0"; sha256 = "19nnj1hq2v21mrplnivjr9c4y3wg4hhfnc062sjgzkmiv1cchvf8"; }) (fetchNuGet { pname = "ppy.ManagedBass.Fx"; version = "2022.1216.0"; sha256 = "1vw573mkligpx9qiqasw1683cqaa1kgnxhlnbdcj9c4320b1pwjm"; }) (fetchNuGet { pname = "ppy.ManagedBass.Mix"; version = "2022.1216.0"; sha256 = "185bpvgbnd8y20r7vxb1an4pd1aal9b7b5wvmv3knz0qg8j0chd9"; }) @@ -140,7 +140,7 @@ (fetchNuGet { pname = "ppy.osu.Framework"; version = "2024.329.0"; sha256 = "1hpcgga80sliip6r1a7ps1bb2cwqfrg34sj2y473ijxbhk74swhr"; }) (fetchNuGet { pname = "ppy.osu.Framework.NativeLibs"; version = "2024.326.0-nativelibs"; sha256 = "14vx8gz249nr9zx0qqcd4lrz8nxddclki3mjf0xvc1pfkz7xnqdj"; }) (fetchNuGet { pname = "ppy.osu.Framework.SourceGeneration"; version = "2023.720.0"; sha256 = "001vvxyv483ibid25fdknvij77x0y983mp4psx2lbg3x2al7yxax"; }) - (fetchNuGet { pname = "ppy.osu.Game.Resources"; version = "2024.410.0"; sha256 = "0s43adha41fg56xdn4skridljhpi7mcwp6nqka7im772fj942rv4"; }) + (fetchNuGet { pname = "ppy.osu.Game.Resources"; version = "2024.517.0"; sha256 = "18jsxlp73ij4snns4dm95a31lynzvfrknk4nhhzldw8h3kfgb0ky"; }) (fetchNuGet { pname = "ppy.osuTK.NS20"; version = "1.0.211"; sha256 = "0j4a9n39pqm0cgdcps47p5n2mqph3h94r7hmf0bs59imif4jxvjy"; }) (fetchNuGet { pname = "ppy.SDL2-CS"; version = "1.0.741-alpha"; sha256 = "158h05lbw6m5anv8glsaylbrc4mbxm8m314cicrga815hcrgxmdi"; }) (fetchNuGet { pname = "ppy.Veldrid"; version = "4.9.9-ga61b647961"; sha256 = "1avi372bff89xzb4awbv96q479xknlxhwxnl0i2aylv7gz11yjad"; }) diff --git a/pkgs/tools/graphics/povray/default.nix b/pkgs/tools/graphics/povray/default.nix index 5e432a0d13c4..71a8fbdd7fed 100644 --- a/pkgs/tools/graphics/povray/default.nix +++ b/pkgs/tools/graphics/povray/default.nix @@ -11,22 +11,38 @@ , libpng , libjpeg , libtiff -, SDL +, pkg-config +, SDL2 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "povray"; - version = "3.8.0-x.10064738"; + version = "3.8.0-beta.2"; src = fetchFromGitHub { owner = "POV-Ray"; repo = "povray"; - rev = "v${version}"; - sha256 = "0hy5a3q5092szk2x3s9lpn1zkszgq9bp15rxzdncxlvnanyzsasf"; + rev = "v${finalAttrs.version}"; + sha256 = "sha256-BsWalXzEnymiRbBfE/gsNyWgAqzbxEzO/EQiJpbwoKs="; }; - nativeBuildInputs = [ automake autoconf ]; - buildInputs = [ boost zlib libX11 libICE libSM libpng libjpeg libtiff SDL ]; + nativeBuildInputs = [ + automake + autoconf + pkg-config + ]; + + buildInputs = [ + boost + libX11 + libICE + libSM + libpng + libjpeg + libtiff + SDL2 + zlib + ]; # the installPhase wants to put files into $HOME. I let it put the files # to $TMPDIR, so they don't get into the $out @@ -39,7 +55,11 @@ stdenv.mkDerivation rec { sed -i -e 's/^povgroup.*/povgroup=nogroup/' Makefile.{am,in} ''; - configureFlags = [ "COMPILED_BY='nix'" "--with-boost-thread=boost_thread" "--with-x" ]; + configureFlags = [ + "COMPILED_BY=NixOS" + "--with-boost-thread=boost_thread" + "--with-x" + ]; enableParallelBuilding = true; @@ -52,11 +72,12 @@ stdenv.mkDerivation rec { done ''; - meta = with lib; { + meta = { homepage = "http://www.povray.org/"; description = "Persistence of Vision Raytracer"; - license = licenses.free; - platforms = platforms.linux; + license = lib.licenses.free; + platforms = lib.platforms.linux; mainProgram = "povray"; + maintainers = with lib.maintainers; [ fgaz ]; }; -} +}) diff --git a/pkgs/tools/nix/npins/default.nix b/pkgs/tools/nix/npins/default.nix index 9d10464aa73c..06024fe789e0 100644 --- a/pkgs/tools/nix/npins/default.nix +++ b/pkgs/tools/nix/npins/default.nix @@ -21,7 +21,7 @@ in rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-YwMypBl+P1ygf4zUbkZlq4zPrOzf+lPOz2FLg2/xI3k="; - buildInputs = lib.optional stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Security ]); + buildInputs = lib.optional stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Security SystemConfiguration ]); nativeBuildInputs = [ makeWrapper ]; # (Almost) all tests require internet diff --git a/pkgs/tools/security/exploitdb/default.nix b/pkgs/tools/security/exploitdb/default.nix index 56367fcc64c2..6e16722f2373 100644 --- a/pkgs/tools/security/exploitdb/default.nix +++ b/pkgs/tools/security/exploitdb/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2024-05-16"; + version = "2024-05-20"; src = fetchFromGitLab { owner = "exploit-database"; repo = "exploitdb"; rev = "refs/tags/${version}"; - hash = "sha256-m00hnTu8PEUmWHO9ei9DYU10DAgn1zaKATt6yVJ7R1o="; + hash = "sha256-Cizs0dUP0wuwo3jYaL73gXUdxsMEBH91DgdQD6GbHrc="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 9794cee4473d..66114c9995fc 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -341,6 +341,7 @@ mapAliases ({ erlangR22 = erlang_22; erlang_23 = throw "erlangR23 has been removed in favor of newer versions."; # added 2023-09-11 erlangR23 = erlang_23; + erlang_27-rc3 = throw "erlang_27-rc3 has been removed in favor of erlang_27"; # added 2024-05-20 etcd_3_3 = throw "etcd_3_3 has been removed because upstream no longer maintains it"; # Added 2023-09-29 etcher = throw "'etcher' has been removed because it depended on an insecure version of Electron"; # Added 2024-03-14 eterm = throw "eterm was removed because it is still insecure: https://github.com/mej/Eterm/issues/7"; # Added 2023-09-10 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 077b9770a974..5f975f1c2473 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17174,7 +17174,7 @@ with pkgs; }; inherit (beam.interpreters) - erlang erlang_27-rc3 erlang_26 erlang_25 erlang_24 + erlang erlang_27 erlang_26 erlang_25 erlang_24 erlang_odbc erlang_javac erlang_odbc_javac elixir elixir_1_16 elixir_1_15 elixir_1_14 elixir_1_13 elixir_1_12 elixir_1_11 elixir_1_10 elixir-ls; diff --git a/pkgs/top-level/beam-packages.nix b/pkgs/top-level/beam-packages.nix index 24b162ec577f..dec1a5d734ce 100644 --- a/pkgs/top-level/beam-packages.nix +++ b/pkgs/top-level/beam-packages.nix @@ -41,7 +41,7 @@ in # Standard Erlang versions, using the generic builder. - erlang_27-rc3 = self.beamLib.callErlang ../development/interpreters/erlang/27-rc3.nix { + erlang_27 = self.beamLib.callErlang ../development/interpreters/erlang/27.nix { wxGTK = wxGTK32; parallelBuild = true; autoconf = buildPackages.autoconf269; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 675990653158..9e82a642cdff 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -229,6 +229,7 @@ mapAliases ({ imgaug = throw "imgaug has been removed as it is no longer maintained"; # added 2023-07-10 intreehook = throw "intreehooks has been removed because it is obsolete as a backend-path key was added to PEP 517"; # added 2023-04-11 ipaddress = throw "ipaddress has been removed because it is no longer required since python 2.7."; # added 2022-05-30 + ipdbplugin = throw "ipdbplugin has been removed because it has no longer maintained for 6 years"; # added 2024-05-21 ipython_genutils = ipython-genutils; # added 2023-10-12 influxgraph = throw "influxgraph has been removed because it is no longer maintained"; # added 2022-07-10 itanium_demangler = itanium-demangler; # added 2022-10-17 @@ -303,6 +304,7 @@ mapAliases ({ ninja-python = ninja; # add 2022-08-03 nosejs = throw "nosejs has been removed since it has not been maintained for 15 years and there are no dependent packages"; # added 2024-05-21 nose-cover3 = throw "nose-cover3 has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2022-02-16 + nose-cprof = throw "nose-cprof has been removed since it has not been maintained for 7 years and there are no dependent packages"; # added 2024-05-21 nose_progressive = throw "nose_progressive has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; #added 2023-02-21 nose_warnings_filters = nose-warnings-filters; # added 2024-01-07 notifymuch = throw "notifymuch has been promoted to a top-level attribute name: `pkgs.notifymuch`"; # added 2022-10-02 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1e4bed859bdc..967317d22bbd 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5867,8 +5867,6 @@ self: super: with self; { ipdb = callPackage ../development/python-modules/ipdb { }; - ipdbplugin = callPackage ../development/python-modules/ipdbplugin { }; - ipfshttpclient = callPackage ../development/python-modules/ipfshttpclient { }; i-pi = callPackage ../development/python-modules/i-pi { }; @@ -7661,6 +7659,8 @@ self: super: with self; { monty = callPackage ../development/python-modules/monty { }; + monzopy = callPackage ../development/python-modules/monzopy { }; + moonraker-api = callPackage ../development/python-modules/moonraker-api { }; mopeka-iot-ble = callPackage ../development/python-modules/mopeka-iot-ble { }; @@ -8863,8 +8863,6 @@ self: super: with self; { nose-cov = callPackage ../development/python-modules/nose-cov { }; - nose-cprof = callPackage ../development/python-modules/nose-cprof { }; - nose-exclude = callPackage ../development/python-modules/nose-exclude { }; nose-timer = callPackage ../development/python-modules/nose-timer { };