diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index b687c1572d67..e7e57f381246 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -187,6 +187,7 @@ /nixos/modules/services/networking/babeld.nix @mweinelt /nixos/modules/services/networking/kea.nix @mweinelt /nixos/modules/services/networking/knot.nix @mweinelt +/nixos/modules/services/monitoring/prometheus/exporters/kea.nix @mweinelt /nixos/tests/babeld.nix @mweinelt /nixos/tests/kea.nix @mweinelt /nixos/tests/knot.nix @mweinelt diff --git a/nixos/modules/misc/nixpkgs.nix b/nixos/modules/misc/nixpkgs.nix index 5bd7eb1408b2..00460a88d86c 100644 --- a/nixos/modules/misc/nixpkgs.nix +++ b/nixos/modules/misc/nixpkgs.nix @@ -358,7 +358,7 @@ in else "nixpkgs.localSystem"; pkgsSystem = finalPkgs.stdenv.targetPlatform.system; in { - assertion = !hasPlatform -> nixosExpectedSystem == pkgsSystem; + assertion = constructedByMe -> !hasPlatform -> nixosExpectedSystem == pkgsSystem; message = "The NixOS nixpkgs.pkgs option was set to a Nixpkgs invocation that compiles to target system ${pkgsSystem} but NixOS was configured for system ${nixosExpectedSystem} via NixOS option ${nixosOption}. The NixOS system settings must match the Nixpkgs target system."; } ) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 01e80d1f3e6a..e2ff4cc72708 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -1774,6 +1774,40 @@ let ms-vscode.cpptools = callPackage ./cpptools { }; + ms-vscode.cmake-tools = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "cmake-tools"; + publisher = "ms-vscode"; + version = "1.13.17"; + sha256 = "sha256-RF4KTHXnYBfRCD06GYmprwJNkdplyZyk4ioq5Nu+UDM="; + }; + meta.license = lib.licenses.mit; + }; + + ms-vscode.hexeditor = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "hexeditor"; + publisher = "ms-vscode"; + version = "1.9.9"; + sha256 = "0w7b9llgm6plzpkr5g8ikpyxdgfdjcd5v9xzhp6967j0xphisdbb"; + }; + meta = { + license = lib.licenses.mit; + }; + }; + + ms-vscode.makefile-tools = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "makefile-tools"; + publisher = "ms-vscode"; + version = "0.6.0"; + sha256 = "07zagq5ib9hd3w67yk2g728vypr4qazw0g9dyd5bax21shnmppa9"; + }; + meta = { + license = lib.licenses.mit; + }; + }; + ms-vscode.PowerShell = buildVscodeMarketplaceExtension { mktplcRef = { name = "PowerShell"; @@ -1839,8 +1873,44 @@ let }; }; + ms-toolsai.vscode-jupyter-cell-tags = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vscode-jupyter-cell-tags"; + publisher = "ms-toolsai"; + version = "0.1.6"; + sha256 = "1sb3za0ka8bl1kydlniwlaixldlgqxvfbx7pcyrg1a4sg6zwsvk1"; + }; + meta = { + license = lib.licenses.mit; + }; + }; + + ms-toolsai.vscode-jupyter-slideshow = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vscode-jupyter-slideshow"; + publisher = "ms-toolsai"; + version = "0.1.5"; + sha256 = "1p6r5vkzvwvxif3wxqi9599vplabzig27fzzz0bx9z0awfglzyi7"; + }; + meta = { + license = lib.licenses.mit; + }; + }; + ms-toolsai.jupyter = callPackage ./ms-toolsai-jupyter {}; + ms-toolsai.jupyter-keymap = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "jupyter-keymap"; + publisher = "ms-toolsai"; + version = "1.0.0"; + sha256 = "0wkwllghadil9hk6zamh9brhgn539yhz6dlr97bzf9szyd36dzv8"; + }; + meta = { + license = lib.licenses.mit; + }; + }; + ms-toolsai.jupyter-renderers = buildVscodeMarketplaceExtension { mktplcRef = { name = "jupyter-renderers"; @@ -2546,6 +2616,18 @@ let }; }; + twxs.cmake = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "cmake"; + publisher = "twxs"; + version = "0.0.17"; + sha256 = "11hzjd0gxkq37689rrr2aszxng5l9fwpgs9nnglq3zhfa1msyn08"; + }; + meta = { + license = lib.licenses.mit; + }; + }; + usernamehw.errorlens = buildVscodeMarketplaceExtension { mktplcRef = { name = "errorlens"; @@ -2633,6 +2715,18 @@ let }; }; + vscjava.vscode-java-dependency = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vscode-java-dependency"; + publisher = "vscjava"; + version = "0.21.0"; + sha256 = "0rjxjf137qrn91nxmvv4j0a25xgwv2p2w2a1vb7yykkqlkfazmm6"; + }; + meta = { + license = lib.licenses.mit; + }; + }; + vscjava.vscode-java-test = buildVscodeMarketplaceExtension { mktplcRef = { name = "vscode-java-test"; @@ -2645,6 +2739,30 @@ let }; }; + vscjava.vscode-maven = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vscode-maven"; + publisher = "vscjava"; + version = "0.39.0"; + sha256 = "1603s2s9abg1pqfakj43zp3dfl0y92pblra85wj2rccbzf3asba3"; + }; + meta = { + license = lib.licenses.mit; + }; + }; + + vscjava.vscode-spring-initializr = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vscode-spring-initializr"; + publisher = "vscjava"; + version = "0.11.0"; + sha256 = "1rbwbfz2wgw57vna8ip5b4k8mpk1d1y9vx0xr6gfqhmh6igigqil"; + }; + meta = { + license = lib.licenses.mit; + }; + }; + vscodevim.vim = buildVscodeMarketplaceExtension { mktplcRef = { name = "vim"; diff --git a/pkgs/applications/file-managers/lf/default.nix b/pkgs/applications/file-managers/lf/default.nix index dd267e7ce4d0..faff30377950 100644 --- a/pkgs/applications/file-managers/lf/default.nix +++ b/pkgs/applications/file-managers/lf/default.nix @@ -1,4 +1,9 @@ -{ buildGoModule, fetchFromGitHub, lib, installShellFiles }: +{ lib +, stdenv +, buildGoModule +, fetchFromGitHub +, installShellFiles +}: buildGoModule rec { pname = "lf"; @@ -17,6 +22,10 @@ buildGoModule rec { ldflags = [ "-s" "-w" "-X main.gVersion=r${version}" ]; + # Force the use of the pure-go implementation of the os/user library. + # Relevant issue: https://github.com/gokcehan/lf/issues/191 + tags = lib.optionals (!stdenv.isDarwin) [ "osusergo" ]; + postInstall = '' install -D --mode=444 lf.desktop $out/share/applications/lf.desktop installManPage lf.1 diff --git a/pkgs/applications/misc/waybar/default.nix b/pkgs/applications/misc/waybar/default.nix index 0053b8d873d8..115748635acf 100644 --- a/pkgs/applications/misc/waybar/default.nix +++ b/pkgs/applications/misc/waybar/default.nix @@ -14,30 +14,33 @@ , spdlog , gtk-layer-shell , howard-hinnant-date +, libinotify-kqueue , libxkbcommon -, runTests ? true, catch2 -, traySupport ? true, libdbusmenu-gtk3 -, pulseSupport ? true, libpulseaudio -, sndioSupport ? true, sndio -, nlSupport ? true, libnl -, udevSupport ? true, udev , evdevSupport ? true, libevdev -, swaySupport ? true, sway +, inputSupport ? true, libinput +, jackSupport ? true, libjack2 , mpdSupport ? true, libmpdclient +, nlSupport ? true, libnl +, pulseSupport ? true, libpulseaudio , rfkillSupport ? true -, upowerSupport ? true, upower +, runTests ? true, catch2_3 +, sndioSupport ? true, sndio +, swaySupport ? true, sway +, traySupport ? true, libdbusmenu-gtk3 +, udevSupport ? true, udev +, upowerSupport ? true, upower , withMediaPlayer ? false, glib, gobject-introspection, python3, python38Packages, playerctl }: stdenv.mkDerivation rec { pname = "waybar"; - version = "0.9.13"; + version = "0.9.14"; src = fetchFromGitHub { owner = "Alexays"; repo = "Waybar"; rev = version; - sha256 = "sha256-Uzg2IrCDD8uUdGAveA8IjvonJnnnobOrAgjGG1kQ3pU="; + sha256 = "sha256-1tnFBUB7/MjnrCkfKOR2SZ/GB5Ik115zsnwjkNMB05E="; }; nativeBuildInputs = [ @@ -53,31 +56,36 @@ stdenv.mkDerivation rec { buildInputs = with lib; [ wayland wlroots gtkmm3 libsigcxx jsoncpp spdlog gtk-layer-shell howard-hinnant-date libxkbcommon ] - ++ optional traySupport libdbusmenu-gtk3 + ++ optional (!stdenv.isLinux) libinotify-kqueue + ++ optional evdevSupport libevdev + ++ optional inputSupport libinput + ++ optional jackSupport libjack2 + ++ optional mpdSupport libmpdclient + ++ optional nlSupport libnl ++ optional pulseSupport libpulseaudio ++ optional sndioSupport sndio - ++ optional nlSupport libnl - ++ optional udevSupport udev - ++ optional evdevSupport libevdev ++ optional swaySupport sway - ++ optional mpdSupport libmpdclient + ++ optional traySupport libdbusmenu-gtk3 + ++ optional udevSupport udev ++ optional upowerSupport upower; - checkInputs = [ catch2 ]; + checkInputs = [ catch2_3 ]; doCheck = runTests; mesonFlags = (lib.mapAttrsToList (option: enable: "-D${option}=${if enable then "enabled" else "disabled"}") { dbusmenu-gtk = traySupport; - pulseaudio = pulseSupport; - sndio = sndioSupport; + jack = jackSupport; + libinput = inputSupport; libnl = nlSupport; libudev = udevSupport; mpd = mpdSupport; + pulseaudio = pulseSupport; rfkill = rfkillSupport; - upower_glib = upowerSupport; + sndio = sndioSupport; tests = runTests; + upower_glib = upowerSupport; } ) ++ [ "-Dsystemd=disabled" diff --git a/pkgs/applications/networking/cluster/temporal-cli/default.nix b/pkgs/applications/networking/cluster/temporal-cli/default.nix index 0d326d5ad458..6d86bc79e6b2 100644 --- a/pkgs/applications/networking/cluster/temporal-cli/default.nix +++ b/pkgs/applications/networking/cluster/temporal-cli/default.nix @@ -2,21 +2,27 @@ buildGoModule rec { pname = "temporal-cli"; - version = "1.16.2"; + version = "1.17.0"; src = fetchFromGitHub { owner = "temporalio"; repo = "tctl"; rev = "v${version}"; - sha256 = "sha256-KLcCFQJlFeioIhqrbkhgoNPcbAYvy1ESG8x9Y/I7+nw="; + sha256 = "sha256-XEN4Ntt7yHng1+3E5SlxthEWPXJ+kSx9L1GbW9bV03Y="; }; - vendorSha256 = "sha256-kczmoP32/V0HHeC3Mr+giuMB+McVTNeC2F+t1ohY4/U="; + vendorSha256 = "sha256-9bgovXVj+qddfDSI4DTaNYH4H8Uc4DZqeVYG5TWXTNw="; ldflags = [ "-s" "-w" ]; + preCheck = '' + export HOME=$(mktemp -d) + ''; + passthru.tests.version = testers.testVersion { package = temporal-cli; + # the app writes a default config file at startup + command = "HOME=$(mktemp -d) ${meta.mainProgram} --version"; }; meta = with lib; { diff --git a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix index 97f8e4ea1aea..7c4b95a06459 100644 --- a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix @@ -23,13 +23,13 @@ let pname = "wire-desktop"; version = { - x86_64-darwin = "3.28.4393"; - x86_64-linux = "3.28.2946"; + x86_64-darwin = "3.29.4477"; + x86_64-linux = "3.29.2997"; }.${system} or throwSystem; sha256 = { - x86_64-darwin = "03w8hafwxg4v85s8n3ss6bsr7fipksyjax30dnxxj72x947zygxw"; - x86_64-linux = "03f1qz0mwn6f14w4g1w72sd5idfyvmv18r5y1h279p56x0i919kq"; + x86_64-darwin = "19snbd53hjfcqgnz24r85a34fr120b1wps4pv4vymnkxjld2wifc"; + x86_64-linux = "0f5kkp93za4yr6ywdgph8zr6ivrbxq2gbskl8jysxawk1pz92pqf"; }.${system} or throwSystem; meta = with lib; { diff --git a/pkgs/desktops/gnome/apps/gnome-books/default.nix b/pkgs/desktops/gnome/apps/gnome-books/default.nix deleted file mode 100644 index ad815fca918a..000000000000 --- a/pkgs/desktops/gnome/apps/gnome-books/default.nix +++ /dev/null @@ -1,98 +0,0 @@ -{ stdenv -, lib -, meson -, ninja -, gettext -, fetchurl -, fetchpatch -, evince -, gjs -, pkg-config -, gtk3 -, glib -, tracker -, tracker-miners -, libxslt -, webkitgtk -, gnome-desktop -, libgepub -, gnome -, gdk-pixbuf -, gsettings-desktop-schemas -, adwaita-icon-theme -, docbook-xsl-nons -, docbook_xml_dtd_42 -, desktop-file-utils -, python3 -, gobject-introspection -, wrapGAppsHook -}: - -stdenv.mkDerivation rec { - pname = "gnome-books"; - version = "40.0"; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "0c41l8m2di8h39bmk2fnhpwglwp6qhljmwqqbihzp4ay9976zrc5"; - }; - - patches = [ - # Fix build with meson 0.61 - # https://gitlab.gnome.org/GNOME/gnome-books/-/merge_requests/62 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gnome-books/-/commit/2663dcdaaaa71f067a4c2d0005eecc0fdf940bf5.patch"; - sha256 = "v2mLzrxSWrkJ0N6seR8jNXX14FsneEPuE9ELLVUe6+E="; - }) - ]; - - nativeBuildInputs = [ - meson - ninja - pkg-config - gettext - libxslt - desktop-file-utils - docbook-xsl-nons - docbook_xml_dtd_42 - wrapGAppsHook - python3 - ]; - - buildInputs = [ - gtk3 - glib - gsettings-desktop-schemas - gdk-pixbuf - adwaita-icon-theme - evince - webkitgtk - gjs - gobject-introspection - tracker - tracker-miners - gnome-desktop - libgepub - ]; - - postPatch = '' - chmod +x meson_post_install.py # patchShebangs requires executable file - patchShebangs meson_post_install.py - ''; - - passthru = { - updateScript = gnome.updateScript { - packageName = "gnome-books"; - attrPath = "gnome.gnome-books"; - }; - }; - - meta = with lib; { - broken = true; # won't build with current meson; upstream is dead/archived - homepage = "https://wiki.gnome.org/Apps/Books"; - description = "An e-book manager application for GNOME"; - maintainers = teams.gnome.members; - license = licenses.gpl2Plus; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome/apps/gnome-boxes/default.nix index 08679b94e2fb..dfc7cb3a1cab 100644 --- a/pkgs/desktops/gnome/apps/gnome-boxes/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-boxes/default.nix @@ -51,11 +51,11 @@ stdenv.mkDerivation rec { pname = "gnome-boxes"; - version = "43.0"; + version = "43.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "V0UFCWQUyCC4COzQ9x4tGakzI1HhKj3YJvdi5DK/ayY="; + sha256 = "NB5qXO1RrVAPwd00ZZ1YhsP3YEViS1POZBv/Y8WwimE="; }; patches = [ diff --git a/pkgs/desktops/gnome/apps/gnome-documents/default.nix b/pkgs/desktops/gnome/apps/gnome-documents/default.nix deleted file mode 100644 index 3f7ac34696bf..000000000000 --- a/pkgs/desktops/gnome/apps/gnome-documents/default.nix +++ /dev/null @@ -1,127 +0,0 @@ -{ lib, stdenv -, meson -, ninja -, gettext -, fetchurl -, fetchpatch -, evince -, gjs -, pkg-config -, gtk3 -, glib -, tracker -, tracker-miners -, itstool -, libxslt -, webkitgtk -, libgdata -, gnome-desktop -, libzapojit -, libgepub -, gnome -, gdk-pixbuf -, libsoup -, docbook_xsl -, docbook_xml_dtd_42 -, gobject-introspection -, inkscape -, poppler_utils -, desktop-file-utils -, wrapGAppsHook -, python3 -, appstream-glib -, gsettings-desktop-schemas -}: - -stdenv.mkDerivation rec { - pname = "gnome-documents"; - version = "3.34.0"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-documents/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1qph567mapg3s1a26k7b8y57g9bklhj2mh8xm758z9zkms20xafq"; - }; - - patches = [ - # Fix inkscape 1.0 usage - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gnome-documents/commit/0f55a18c40a61e6ae4ec4652604775f139892350.diff"; - sha256 = "1yrisq69dl1dn7639drlbza20a5ic6xg04ksr9iq4sxdx3xj3d8s"; - }) - ]; - - nativeBuildInputs = [ - meson - ninja - pkg-config - gettext - itstool - libxslt - desktop-file-utils - docbook_xsl - docbook_xml_dtd_42 - wrapGAppsHook - python3 - appstream-glib - - # building getting started - inkscape - poppler_utils - ]; - - buildInputs = [ - gtk3 - glib - gsettings-desktop-schemas - gdk-pixbuf - gnome.adwaita-icon-theme - evince - libsoup - webkitgtk - gjs - gobject-introspection - tracker - tracker-miners - libgdata - gnome-desktop - libzapojit - libgepub - ]; - - doCheck = true; - - mesonFlags = [ - "-Dgetting_started=true" - ]; - - postPatch = '' - chmod +x meson_post_install.py # patchShebangs requires executable file - patchShebangs meson_post_install.py - ''; - - preFixup = '' - substituteInPlace $out/bin/gnome-documents --replace gapplication "${glib.bin}/bin/gapplication" - ''; - - preConfigure = - # To silence inkscape warnings regarding profile directory - '' - export INKSCAPE_PROFILE_DIR="$(mktemp -d)" - ''; - - passthru = { - updateScript = gnome.updateScript { - packageName = pname; - attrPath = "gnome.${pname}"; - }; - }; - - meta = with lib; { - broken = true; # Tracker 3 not supported and it cannot start Tracker 2. - homepage = "https://wiki.gnome.org/Apps/Documents"; - description = "Document manager application designed to work with GNOME 3"; - maintainers = teams.gnome.members; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome/core/evince/default.nix b/pkgs/desktops/gnome/core/evince/default.nix index 7138b9947632..30f8ed9fac97 100644 --- a/pkgs/desktops/gnome/core/evince/default.nix +++ b/pkgs/desktops/gnome/core/evince/default.nix @@ -42,13 +42,13 @@ stdenv.mkDerivation rec { pname = "evince"; - version = "43.0"; + version = "43.1"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/evince/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "Zr4N5LR7ETBIYQOYjMFSwErqlZULo+8W3CDC72toHUc="; + sha256 = "bXXKYrc7+7YA9xigmBA9xrgT+QULlZS+kp4ptFidIzU="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome/core/gucharmap/default.nix b/pkgs/desktops/gnome/core/gucharmap/default.nix index df546c6590de..a98d9f2ceea7 100644 --- a/pkgs/desktops/gnome/core/gucharmap/default.nix +++ b/pkgs/desktops/gnome/core/gucharmap/default.nix @@ -25,7 +25,7 @@ , runCommand , symlinkJoin , gobject-introspection -, nix-update-script +, gitUpdater }: let @@ -45,16 +45,16 @@ let }; in stdenv.mkDerivation rec { pname = "gucharmap"; - version = "15.0.0"; + version = "15.0.1"; outputs = [ "out" "lib" "dev" "devdoc" ]; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "GNOME"; - repo = pname; + repo = "gucharmap"; rev = version; - sha256 = "sha256-ymEtiOKdmQ1XWrGk40csX5O5BiwxH3aCPboVekcUukQ="; + sha256 = "sha256-uVXWgnNpPcky9N3FXkDu5oaqaEALECooFnf43Ed+zTY="; }; nativeBuildInputs = [ @@ -94,8 +94,7 @@ in stdenv.mkDerivation rec { ''; passthru = { - updateScript = nix-update-script { - attrPath = "gnome.gucharmap"; + updateScript = gitUpdater { }; }; diff --git a/pkgs/desktops/gnome/default.nix b/pkgs/desktops/gnome/default.nix index 08dd450043ac..52e37c05b39f 100644 --- a/pkgs/desktops/gnome/default.nix +++ b/pkgs/desktops/gnome/default.nix @@ -156,8 +156,6 @@ lib.makeScope pkgs.newScope (self: with self; { ghex = callPackage ./apps/ghex { }; - gnome-books = callPackage ./apps/gnome-books { }; - gnome-boxes = callPackage ./apps/gnome-boxes { }; gnome-calendar = callPackage ./apps/gnome-calendar { }; @@ -166,8 +164,6 @@ lib.makeScope pkgs.newScope (self: with self; { gnome-clocks = callPackage ./apps/gnome-clocks { }; - gnome-documents = callPackage ./apps/gnome-documents { }; - gnome-logs = callPackage ./apps/gnome-logs { }; gnome-maps = callPackage ./apps/gnome-maps { }; @@ -196,8 +192,6 @@ lib.makeScope pkgs.newScope (self: with self; { devhelp = callPackage ./devtools/devhelp { }; - gnome-devel-docs = callPackage ./devtools/gnome-devel-docs { }; - #### Games aisleriot = callPackage ./games/aisleriot { }; @@ -270,129 +264,12 @@ lib.makeScope pkgs.newScope (self: with self; { }) // lib.optionalAttrs config.allowAliases { #### Legacy aliases. They need to be outside the scope or they will shadow the attributes from parent scope. - gnome-desktop = pkgs.gnome-desktop; # added 2022-03-16 + gnome-desktop = throw "The ‘gnome.gnome-desktop’ alias was removed. Please use ‘pkgs.gnome-desktop’ directly."; # converted to throw on 2022-10-26 gnome-todo = pkgs.endeavour; # added 2022-07-30 - libgnome-games-support = pkgs.libgnome-games-support; # added 2022-02-19 + libgnome-games-support = throw "The ‘gnome.libgnome-games-support’ alias was removed. Please use ‘pkgs.libgnome-games-support’ directly."; # converted to throw on 2022-10-26 - bijiben = throw "The ‘gnome.bijiben’ alias was removed on 2022-01-13. Please use ‘gnome.gnome-notes’ directly."; # added 2018-09-26 - evolution_data_server = throw "The ‘gnome.evolution_data_server’ alias was removed on 2022-01-13. Please use ‘gnome.evolution-data-server’ directly."; # added 2018-02-25 - geocode_glib = throw "The ‘gnome.geocode_glib’ alias was removed on 2022-01-13. Please use ‘pkgs.geocode-glib’ directly."; # added 2018-02-25 - glib_networking = throw "The ‘gnome.glib_networking’ alias was removed on 2022-01-13. Please use ‘pkgs.glib-networking’ directly."; # added 2018-02-25 - gnome_common = throw "The ‘gnome.gnome_common’ alias was removed on 2022-01-13. Please use ‘gnome.gnome-common’ directly."; # added 2018-02-25 - gnome_control_center = throw "The ‘gnome.gnome_control_center’ alias was removed on 2022-01-13. Please use ‘gnome.gnome-control-center’ directly."; # added 2018-02-25 - gnome_desktop = throw "The ‘gnome.gnome_desktop’ alias was removed on 2022-01-13. Please use pkgs.gnome-desktop’ directly."; # added 2018-02-25 - gnome_keyring = throw "The ‘gnome.gnome_keyring’ alias was removed on 2022-01-13. Please use ‘gnome.gnome-keyring’ directly."; # added 2018-02-25 - gnome_online_accounts = throw "The ‘gnome.gnome_online_accounts’ alias was removed on 2022-01-13. Please use ‘gnome.gnome-online-accounts’ directly."; # added 2018-02-25 - gnome_session = throw "The ‘gnome.gnome_session’ alias was removed on 2022-01-13. Please use ‘gnome.gnome-session’ directly."; # added 2018-02-25 - gnome_settings_daemon = throw "The ‘gnome.gnome_settings_daemon’ alias was removed on 2022-01-13. Please use ‘gnome.gnome-settings-daemon’ directly."; # added 2018-02-25 - gnome_shell = throw "The ‘gnome.gnome_shell’ alias was removed on 2022-01-13. Please use ‘gnome.gnome-shell’ directly."; # added 2018-02-25 - gnome_terminal = throw "The ‘gnome.gnome_terminal’ alias was removed on 2022-01-13. Please use ‘gnome.gnome-terminal’ directly."; # added 2018-02-25 - gnome-themes-standard = throw "The ‘gnome.gnome-themes-standard’ alias was removed on 2022-01-13. Please use ‘gnome.gnome-themes-extra’ directly."; # added 2018-03-14 - gnome_themes_standard = throw "The ‘gnome.gnome_themes_standard’ alias was removed on 2022-01-13. Please use ‘gnome.gnome-themes-standard’ directly."; # added 2018-02-25 - gnome-tweak-tool = throw "The ‘gnome.gnome-tweak-tool’ alias was removed on 2022-01-13. Please use ‘gnome.gnome-tweaks’ directly."; # added 2018-03-21 - gsettings_desktop_schemas = throw "The ‘gnome.gsettings_desktop_schemas’ alias was removed on 2022-01-13. Please use ‘gnome.gsettings-desktop-schemas’ directly."; # added 2018-02-25 - libgames-support = throw "The ‘gnome.libgames-support’ alias was removed on 2022-01-13. Please use ‘pkgs.libgnome-games-support’ directly."; # added 2018-03-14 - libgnome_keyring = throw "The ‘gnome.libgnome_keyring’ alias was removed on 2022-01-13. Please use ‘gnome.libgnome-keyring’ directly."; # added 2018-02-25 - rarian = throw "The ‘gnome.rarian’ alias was removed on 2022-01-13. Please use ‘pkgs.rarian’ directly."; # added 2018-04-25 - networkmanager_fortisslvpn = throw "The ‘gnome.networkmanager_fortisslvpn’ alias was removed on 2022-01-13. Please use ‘gnome.networkmanager-fortisslvpn’ directly."; # added 2018-02-25 - networkmanager_iodine = throw "The ‘gnome.networkmanager_iodine’ alias was removed on 2022-01-13. Please use ‘gnome.networkmanager-iodine’ directly."; # added 2018-02-25 - networkmanager_l2tp = throw "The ‘gnome.networkmanager_l2tp’ alias was removed on 2022-01-13. Please use ‘gnome.networkmanager-l2tp’ directly."; # added 2018-02-25 - networkmanager_openconnect = throw "The ‘gnome.networkmanager_openconnect’ alias was removed on 2022-01-13. Please use ‘gnome.networkmanager-openconnect’ directly."; # added 2018-02-25 - networkmanager_openvpn = throw "The ‘gnome.networkmanager_openvpn’ alias was removed on 2022-01-13. Please use ‘gnome.networkmanager-openvpn’ directly."; # added 2018-02-25 - networkmanager_vpnc = throw "The ‘gnome.networkmanager_vpnc’ alias was removed on 2022-01-13. Please use ‘gnome.networkmanager-vpnc’ directly."; # added 2018-02-25 - yelp_xsl = throw "The ‘gnome.yelp_xsl’ alias was removed on 2022-01-13. Please use ‘gnome.yelp-xsl’ directly."; # added 2018-02-25 - yelp_tools = throw "The ‘gnome.yelp_tools’ alias was removed on 2022-01-13. Please use ‘gnome.yelp-tools’ directly."; # added 2018-02-25 + gnome-books = throw "The ‘gnome.gnome-books’ package was removed as it is broken and abandoned."; # added 2022-10-26 + gnome-documents = throw "The ‘gnome.gnome-documents’ package was removed as it is broken and abandoned."; # added 2022-10-26 + gnome-devel-docs = throw "The ‘gnome.gnome-devel-docs’ package was removed as it is outdated and no longer relevant."; # added 2022-10-26 - atk = throw "The ‘gnome.atk’ alias was removed on 2022-01-13. Please use ‘pkgs.atk’ directly."; # added 2019-02-08 - glib = throw "The ‘gnome.glib’ alias was removed on 2022-01-13. Please use ‘pkgs.glib’ directly."; # added 2019-02-08 - gobject-introspection = throw "The ‘gnome.gobject-introspection’ alias was removed on 2022-01-13. Please use ‘pkgs.gobject-introspection’ directly."; # added 2019-02-08 - gspell = throw "The ‘gnome.gspell’ alias was removed on 2022-01-13. Please use ‘pkgs.gspell’ directly."; # added 2019-02-08 - webkitgtk = throw "The ‘gnome.webkitgtk’ alias was removed on 2022-01-13. Please use ‘pkgs.webkitgtk’ directly."; # added 2019-02-08 - gtk3 = throw "The ‘gnome.gtk3’ alias was removed on 2022-01-13. Please use ‘pkgs.gtk3’ directly."; # added 2019-02-08 - gtkmm3 = throw "The ‘gnome.gtkmm3’ alias was removed on 2022-01-13. Please use ‘pkgs.gtkmm3’ directly."; # added 2019-02-08 - libgtop = throw "The ‘gnome.libgtop’ alias was removed on 2022-01-13. Please use ‘pkgs.libgtop’ directly."; # added 2019-02-08 - libgudev = throw "The ‘gnome.libgudev’ alias was removed on 2022-01-13. Please use ‘pkgs.libgudev’ directly."; # added 2019-02-08 - libhttpseverywhere = throw "The ‘gnome.libhttpseverywhere’ alias was removed on 2022-01-13. Please use ‘pkgs.libhttpseverywhere’ directly."; # added 2019-02-08 - librsvg = throw "The ‘gnome.librsvg’ alias was removed on 2022-01-13. Please use ‘pkgs.librsvg’ directly."; # added 2019-02-08 - libsecret = throw "The ‘gnome.libsecret’ alias was removed on 2022-01-13. Please use ‘pkgs.libsecret’ directly."; # added 2019-02-08 - gdk-pixbuf = throw "The ‘gnome.gdk-pixbuf’ alias was removed on 2022-01-13. Please use ‘pkgs.gdk-pixbuf’ directly."; # added 2019-02-08 - gtksourceview = throw "The ‘gnome.gtksourceview’ alias was removed on 2022-01-13. Please use ‘pkgs.gtksourceview’ directly."; # added 2019-02-08 - gtksourceviewmm = throw "The ‘gnome.gtksourceviewmm’ alias was removed on 2022-01-13. Please use ‘pkgs.gtksourceviewmm’ directly."; # added 2019-02-08 - gtksourceview4 = throw "The ‘gnome.gtksourceview4’ alias was removed on 2022-01-13. Please use ‘pkgs.gtksourceview4’ directly."; # added 2019-02-08 - easytag = throw "The ‘gnome.easytag’ alias was removed on 2022-01-13. Please use ‘pkgs.easytag’ directly."; # added 2019-02-08 - meld = throw "The ‘gnome.meld’ alias was removed on 2022-01-13. Please use ‘pkgs.meld’ directly."; # added 2019-02-08 - orca = throw "The ‘gnome.orca’ alias was removed on 2022-01-13. Please use ‘pkgs.orca’ directly."; # added 2019-02-08 - rhythmbox = throw "The ‘gnome.rhythmbox’ alias was removed on 2022-01-13. Please use ‘pkgs.rhythmbox’ directly."; # added 2019-02-08 - shotwell = throw "The ‘gnome.shotwell’ alias was removed on 2022-01-13. Please use ‘pkgs.shotwell’ directly."; # added 2019-02-08 - gnome-usage = throw "The ‘gnome.gnome-usage’ alias was removed on 2022-01-13. Please use ‘pkgs.gnome-usage’ directly."; # added 2019-02-08 - clutter = throw "The ‘gnome.clutter’ alias was removed on 2022-01-13. Please use ‘pkgs.clutter’ directly."; # added 2019-02-08 - clutter-gst = throw "The ‘gnome.clutter-gst’ alias was removed on 2022-01-13. Please use ‘pkgs.clutter-gst’ directly."; # added 2019-02-08 - clutter-gtk = throw "The ‘gnome.clutter-gtk’ alias was removed on 2022-01-13. Please use ‘pkgs.clutter-gtk’ directly."; # added 2019-02-08 - cogl = throw "The ‘gnome.cogl’ alias was removed on 2022-01-13. Please use ‘pkgs.cogl’ directly."; # added 2019-02-08 - gtk-vnc = throw "The ‘gnome.gtk-vnc’ alias was removed on 2022-01-13. Please use ‘pkgs.gtk-vnc’ directly."; # added 2019-02-08 - libdazzle = throw "The ‘gnome.libdazzle’ alias was removed on 2022-01-13. Please use ‘pkgs.libdazzle’ directly."; # added 2019-02-08 - libgda = throw "The ‘gnome.libgda’ alias was removed on 2022-01-13. Please use ‘pkgs.libgda’ directly."; # added 2019-02-08 - libgit2-glib = throw "The ‘gnome.libgit2-glib’ alias was removed on 2022-01-13. Please use ‘pkgs.libgit2-glib’ directly."; # added 2019-02-08 - libgxps = throw "The ‘gnome.libgxps’ alias was removed on 2022-01-13. Please use ‘pkgs.libgxps’ directly."; # added 2019-02-08 - libgdata = throw "The ‘gnome.libgdata’ alias was removed on 2022-01-13. Please use ‘pkgs.libgdata’ directly."; # added 2019-02-08 - libgepub = throw "The ‘gnome.libgepub’ alias was removed on 2022-01-13. Please use ‘pkgs.libgepub’ directly."; # added 2019-02-08 - libpeas = throw "The ‘gnome.libpeas’ alias was removed on 2022-01-13. Please use ‘pkgs.libpeas’ directly."; # added 2019-02-08 - libgee = throw "The ‘gnome.libgee’ alias was removed on 2022-01-13. Please use ‘pkgs.libgee’ directly."; # added 2019-02-08 - geocode-glib = throw "The ‘gnome.geocode-glib’ alias was removed on 2022-01-13. Please use ‘pkgs.geocode-glib’ directly."; # added 2019-02-08 - libgweather = throw "The ‘gnome.libgweather’ alias was removed on 2022-01-13. Please use ‘pkgs.libgweather’ directly."; # added 2019-02-08 - librest = throw "The ‘gnome.librest’ alias was removed on 2022-01-13. Please use ‘pkgs.librest’ directly."; # added 2019-02-08 - libzapojit = throw "The ‘gnome.libzapojit’ alias was removed on 2022-01-13. Please use ‘pkgs.libzapojit’ directly."; # added 2019-02-08 - libmediaart = throw "The ‘gnome.libmediaart’ alias was removed on 2022-01-13. Please use ‘pkgs.libmediaart’ directly."; # added 2019-02-08 - gfbgraph = throw "The ‘gnome.gfbgraph’ alias was removed on 2022-01-13. Please use ‘pkgs.gfbgraph’ directly."; # added 2019-02-08 - gexiv2 = throw "The ‘gnome.gexiv2’ alias was removed on 2022-01-13. Please use ‘pkgs.gexiv2’ directly."; # added 2019-02-08 - folks = throw "The ‘gnome.folks’ alias was removed on 2022-01-13. Please use ‘pkgs.folks’ directly."; # added 2019-02-08 - totem-pl-parser = throw "The ‘gnome.totem-pl-parser’ alias was removed on 2022-01-13. Please use ‘pkgs.totem-pl-parser’ directly."; # added 2019-02-08 - gcr = throw "The ‘gnome.gcr’ alias was removed on 2022-01-13. Please use ‘pkgs.gcr’ directly."; # added 2019-02-08 - gsound = throw "The ‘gnome.gsound’ alias was removed on 2022-01-13. Please use ‘pkgs.gsound’ directly."; # added 2019-02-08 - libgnomekbd = throw "The ‘gnome.libgnomekbd’ alias was removed on 2022-01-13. Please use ‘pkgs.libgnomekbd’ directly."; # added 2019-02-08 - vte = throw "The ‘gnome.vte’ alias was removed on 2022-01-13. Please use ‘pkgs.vte’ directly."; # added 2019-02-08 - vte_290 = throw "The ‘gnome.vte_290’ alias was removed on 2022-01-13. Please use ‘pkgs.vte_290’ directly."; # added 2019-02-08 - gnome-menus = throw "The ‘gnome.gnome-menus’ alias was removed on 2022-01-13. Please use ‘pkgs.gnome-menus’ directly."; # added 2019-02-08 - gdl = throw "The ‘gnome.gdl’ alias was removed on 2022-01-13. Please use ‘pkgs.gdl’ directly."; # added 2019-02-08 - - - gsettings-desktop-schemas = throw "The ‘gnome.gsettings-desktop-schemas’ alias was removed on 2022-01-13. Please use ‘pkgs.gsettings-desktop-schemas’ directly."; # added 2019-04-16 - gnome-video-effects = throw "The ‘gnome.gnome-video-effects’ alias was removed on 2022-01-13. Please use ‘pkgs.gnome-video-effects’ directly."; # added 2019-08-19 - gnome-online-accounts = throw "The ‘gnome.gnome-online-accounts’ alias was removed on 2022-01-13. Please use ‘pkgs.gnome-online-accounts’ directly."; # added 2019-08-23 - grilo = throw "The ‘gnome.grilo’ alias was removed on 2022-01-13. Please use ‘pkgs.grilo’ directly."; # added 2019-08-23 - grilo-plugins = throw "The ‘gnome.grilo-plugins’ alias was removed on 2022-01-13. Please use ‘pkgs.grilo-plugins’ directly."; # added 2019-08-23 - tracker = throw "The ‘gnome.tracker’ alias was removed on 2022-01-13. Please use ‘pkgs.tracker’ directly."; # added 2019-08-23 - tracker-miners = throw "The ‘gnome.tracker-miners’ alias was removed on 2022-01-13. Please use ‘pkgs.tracker-miners’ directly."; # added 2019-08-23 - gnome-photos = throw "The ‘gnome.gnome-photos’ alias was removed on 2022-01-13. Please use ‘pkgs.gnome-photos’ directly."; # added 2019-08-23 - glib-networking = throw "The ‘gnome.glib-networking’ alias was removed on 2022-01-13. Please use ‘pkgs.glib-networking’ directly."; # added 2019-09-02 - nemiver = throw "The ‘gnome.nemiver’ alias was removed on 2022-01-13. Please use ‘pkgs.nemiver’ directly."; # added 2019-09-09 - - defaultIconTheme = throw "The ‘gnome.defaultIconTheme’ alias was removed on 2022-01-13. Please use ‘gnome.adwaita-icon-theme’ directly."; # added 2019-02-08 - gtk = throw "The ‘gnome.gtk’ alias was removed on 2022-01-13. Please use ‘pkgs.gtk3’ directly."; # added 2019-02-08 - gtkmm = throw "The ‘gnome.gtkmm’ alias was removed on 2022-01-13. Please use ‘pkgs.gtkmm3’ directly."; # added 2019-02-08 - rest = throw "The ‘gnome.rest’ alias was removed on 2022-01-13. Please use ‘pkgs.librest’ directly."; # added 2019-02-08 - - pidgin-im-gnome-shell-extension = throw "The ‘gnome.pidgin-im-gnome-shell-extension’ alias was removed on 2022-01-13. Please use ‘pkgs.gnomeExtensions.pidgin-im-integration’ directly."; # added 2019-08-01 - - vala = throw "The ‘gnome.vala’ alias was removed on 2022-01-13. Please use ‘pkgs.vala’ directly."; # added 2019-10-10 - - gnome-user-docs = throw "The ‘gnome.gnome-user-docs’ alias was removed on 2022-01-13. Please use ‘pkgs.gnome-user-docs’ directly."; # added 2019-11-20 - - gjs = throw "The ‘gnome.gjs’ alias was removed on 2022-01-13. Please use ‘pkgs.gjs’ directly."; # added 2019-01-05 - - yelp-tools = throw "The ‘gnome.yelp-tools’ alias was removed on 2022-01-13. Please use ‘pkgs.yelp-tools’ directly."; # added 2019-11-20 - - dconf = throw "The ‘gnome.dconf’ alias was removed on 2022-01-13. Please use ‘pkgs.dconf’ directly."; # added 2019-11-30 - - networkmanagerapplet = throw "The ‘gnome.networkmanagerapplet’ alias was removed on 2022-01-13. Please use ‘pkgs.networkmanagerapplet’ directly."; # added 2019-12-12 - - glade = throw "The ‘gnome.glade’ alias was removed on 2022-01-13. Please use ‘pkgs.glade’ directly."; # added 2020-05-15 - - maintainers = throw "The ‘gnome.maintainers’ alias was removed on 2022-01-13. Please use ‘lib.teams.gnome.members’ directly."; # added 2020-04-01 - - mutter328 = throw "Removed as Pantheon is upgraded to mutter338."; - - mutter334 = throw "Removed as Pantheon is upgraded to mutter338."; - - gnome-getting-started-docs = throw "Removed in favour of gnome-tour."; } diff --git a/pkgs/desktops/gnome/devtools/gnome-devel-docs/default.nix b/pkgs/desktops/gnome/devtools/gnome-devel-docs/default.nix deleted file mode 100644 index e2f556c48694..000000000000 --- a/pkgs/desktops/gnome/devtools/gnome-devel-docs/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib, stdenv, fetchurl, gnome, intltool, itstool, libxml2 }: - -stdenv.mkDerivation rec { - pname = "gnome-devel-docs"; - version = "40.3"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-devel-docs/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "v+jyHcqx70sRVlThchK8sDtqEAgzQIA/SW8ia0oILPY="; - }; - - passthru = { - updateScript = gnome.updateScript { packageName = "gnome-devel-docs"; attrPath = "gnome.gnome-devel-docs"; }; - }; - - nativeBuildInputs = [ intltool ]; - buildInputs = [ itstool libxml2 ]; - - meta = with lib; { - homepage = "https://github.com/GNOME/gnome-devel-docs"; - description = "Developer documentation for GNOME"; - maintainers = teams.gnome.members; - license = licenses.fdl12; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome/extensions/gnome-browser-connector/default.nix b/pkgs/desktops/gnome/extensions/gnome-browser-connector/default.nix index 57052ddf3c56..835fa31dd29b 100644 --- a/pkgs/desktops/gnome/extensions/gnome-browser-connector/default.nix +++ b/pkgs/desktops/gnome/extensions/gnome-browser-connector/default.nix @@ -1,6 +1,6 @@ { stdenv , lib -, fetchFromGitLab +, fetchurl , meson , ninja , python3 @@ -14,16 +14,13 @@ let in buildPythonApplication rec { pname = "gnome-browser-connector"; - version = "42.0"; + version = "42.1"; format = "other"; - src = fetchFromGitLab { - domain = "gitlab.gnome.org"; - owner = "nE0sIghT"; - repo = "gnome-browser-connector"; - rev = "v${version}"; - sha256 = "pYbV/qCmSrM2nrrKxbxHnJYMDOiW0aeNbFlsm5kKWdk="; + src = fetchurl { + url = "mirror://gnome/sources/gnome-browser-connector/${lib.versions.major version}/gnome-browser-connector-${version}.tar.xz"; + sha256 = "vZcCzhwWNgbKMrjBPR87pugrJHz4eqxgYQtBHfFVYhI="; }; nativeBuildInputs = [ @@ -53,6 +50,12 @@ buildPythonApplication rec { makeWrapperArgs+=("''${gappsWrapperArgs[@]}") ''; + passthru = { + updateScript = gnome.updateScript { + packageName = "gnome-browser-connector"; + }; + }; + meta = with lib; { description = "Native host connector for the GNOME Shell browser extension"; homepage = "https://wiki.gnome.org/Projects/GnomeShellIntegration"; diff --git a/pkgs/desktops/gnome/games/aisleriot/default.nix b/pkgs/desktops/gnome/games/aisleriot/default.nix index 8092a212d7d0..5983b89f37f4 100644 --- a/pkgs/desktops/gnome/games/aisleriot/default.nix +++ b/pkgs/desktops/gnome/games/aisleriot/default.nix @@ -1,7 +1,7 @@ { stdenv , lib , fetchFromGitLab -, nix-update-script +, gitUpdater , pkg-config , itstool , gtk3 @@ -19,14 +19,14 @@ stdenv.mkDerivation rec { pname = "aisleriot"; - version = "3.22.25"; + version = "3.22.26"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "GNOME"; - repo = pname; + repo = "aisleriot"; rev = version; - sha256 = "sha256-ur29fKSYRGzQBv14L5efN+UuAdTE8e8ooop6DGvO+Rg="; + sha256 = "sha256-enUDJ6KM3QDsPb3ckKOxpRzMe4I0bj4TQR94oZWJJJY="; }; nativeBuildInputs = [ @@ -60,8 +60,7 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = nix-update-script { - attrPath = "gnome.${pname}"; + updateScript = gitUpdater { }; }; diff --git a/pkgs/desktops/pantheon/services/elementary-notifications/default.nix b/pkgs/desktops/pantheon/services/elementary-notifications/default.nix index 98fda866d6ca..27b76ce340c1 100644 --- a/pkgs/desktops/pantheon/services/elementary-notifications/default.nix +++ b/pkgs/desktops/pantheon/services/elementary-notifications/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "elementary-notifications"; - version = "6.0.2"; + version = "6.0.3"; src = fetchFromGitHub { owner = "elementary"; repo = "notifications"; rev = version; - sha256 = "sha256-kM//T3P8gMGnCMDJ1caQQGgD6HBOQo0wp2wZGMUUPuU="; + sha256 = "sha256-B1wo1N4heG872klFJOBKOEds0+6aqtvkTGefi97bdU8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/compilers/gleam/default.nix b/pkgs/development/compilers/gleam/default.nix index 19dba43d8e05..96cb84cf8c6d 100644 --- a/pkgs/development/compilers/gleam/default.nix +++ b/pkgs/development/compilers/gleam/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "gleam"; - version = "0.23.0"; + version = "0.24.0"; src = fetchFromGitHub { owner = "gleam-lang"; repo = pname; rev = "v${version}"; - sha256 = "sha256-7KoJ00EMFWv14Zs9thCHqS7i7V4TdWIGcnEaOtHpKF4="; + sha256 = "sha256-MywgFoydV58oBJ2dGK1lWSu7o3SkuOhLpKhy7WDAJ3I="; }; nativeBuildInputs = [ pkg-config ]; @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security libiconv ]; - cargoSha256 = "sha256-YgQQK8Ojz+s+OohhpcsweW8hEdhmba/YcgDj6M6Ae00="; + cargoSha256 = "sha256-VcC7G0m/GYpxUZ+c+orFkCaqiNO3fUjymE29Z1pMqek="; meta = with lib; { description = "A statically typed language for the Erlang VM"; diff --git a/pkgs/development/compilers/graalvm/community-edition/default.nix b/pkgs/development/compilers/graalvm/community-edition/default.nix index b371ae02c8df..17ecd5060ba2 100644 --- a/pkgs/development/compilers/graalvm/community-edition/default.nix +++ b/pkgs/development/compilers/graalvm/community-edition/default.nix @@ -15,8 +15,8 @@ let Don't change these values! They will be updated by the update script, see ./update.nix. */ - graalvm11-ce-release-version = "22.2.0"; - graalvm17-ce-release-version = "22.2.0"; + graalvm11-ce-release-version = "22.3.0"; + graalvm17-ce-release-version = "22.3.0"; products = [ "graalvm-ce" diff --git a/pkgs/development/compilers/graalvm/community-edition/graalvm11-ce-sources.json b/pkgs/development/compilers/graalvm/community-edition/graalvm11-ce-sources.json index bb1e2b40dd78..c9145e9654f8 100644 --- a/pkgs/development/compilers/graalvm/community-edition/graalvm11-ce-sources.json +++ b/pkgs/development/compilers/graalvm/community-edition/graalvm11-ce-sources.json @@ -1,42 +1,42 @@ { "darwin-aarch64": { - "graalvm-ce|java11|22.2.0": { - "sha256": "ee513cec2ef7b34ae6fbb8a3015c227ab2a24bfb2771c16152f15a1846df01f4", - "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.2.0/graalvm-ce-java11-darwin-aarch64-22.2.0.tar.gz" + "graalvm-ce|java11|22.3.0": { + "sha256": "c9657e902c2ba674931c3cf233a38c4de3d5186ae5d70452f9df75ac0c4cacff", + "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.0/graalvm-ce-java11-darwin-aarch64-22.3.0.tar.gz" }, - "native-image-installable-svm|java11|22.2.0": { - "sha256": "aba76d671017f93cdaae5102607d0bc7a1398adc5de8a4b1e308fa366d5983f9", - "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.2.0/native-image-installable-svm-java11-darwin-aarch64-22.2.0.jar" + "native-image-installable-svm|java11|22.3.0": { + "sha256": "dd9f91a970c7270b3f7fe8e711ba1ae081d34ed433c75f2bb0459aaf19e0fbe7", + "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.0/native-image-installable-svm-java11-darwin-aarch64-22.3.0.jar" } }, "darwin-amd64": { - "graalvm-ce|java11|22.2.0": { - "sha256": "3c6aca6faefa9e1f73de45fc56cc07d6f7864f63ce0b95148002dadb8f78cd86", - "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.2.0/graalvm-ce-java11-darwin-amd64-22.2.0.tar.gz" + "graalvm-ce|java11|22.3.0": { + "sha256": "b8b39d6a3e3a9ed6348c2776ff071fc64ca90f98999ee846e6ca7e5fdc746a8b", + "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.0/graalvm-ce-java11-darwin-amd64-22.3.0.tar.gz" }, - "native-image-installable-svm|java11|22.2.0": { - "sha256": "de9bf830d000a54934a01149691a9a8d4ef6e33414776abd14f95c65b149c908", - "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.2.0/native-image-installable-svm-java11-darwin-amd64-22.2.0.jar" + "native-image-installable-svm|java11|22.3.0": { + "sha256": "00fe13c42813f581955eb35370bb8409ba17c7fdc83971d000baf695be2a0cb5", + "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.0/native-image-installable-svm-java11-darwin-amd64-22.3.0.jar" } }, "linux-aarch64": { - "graalvm-ce|java11|22.2.0": { - "sha256": "1ab64b35ed2478160bc6725d13ff5a2b9e31676b59ea3aaa9aca7a3a3db47132", - "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.2.0/graalvm-ce-java11-linux-aarch64-22.2.0.tar.gz" + "graalvm-ce|java11|22.3.0": { + "sha256": "c6646149dad486a0b02c5fc10649786240f275efda65aa14a25d01d2f5bafe15", + "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.0/graalvm-ce-java11-linux-aarch64-22.3.0.tar.gz" }, - "native-image-installable-svm|java11|22.2.0": { - "sha256": "0454b699ad969791984f4d1200c1834decb33c1f1e15e95b35f8f484b18c7783", - "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.2.0/native-image-installable-svm-java11-linux-aarch64-22.2.0.jar" + "native-image-installable-svm|java11|22.3.0": { + "sha256": "0886e214f03f8a44962ecab459a94afb5c6a0f20910cb128d9ff775f4a9e4162", + "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.0/native-image-installable-svm-java11-linux-aarch64-22.3.0.jar" } }, "linux-amd64": { - "graalvm-ce|java11|22.2.0": { - "sha256": "882363c75d1b1782a48bbf7dd8b155ab231b0957fd5885941376d90b69f21b9e", - "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.2.0/graalvm-ce-java11-linux-amd64-22.2.0.tar.gz" + "graalvm-ce|java11|22.3.0": { + "sha256": "d4200bcc43e5ad4e6949c1b1edc1e59f63066e3a2280d5bd82d0c9b1d67c3f2c", + "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.0/graalvm-ce-java11-linux-amd64-22.3.0.tar.gz" }, - "native-image-installable-svm|java11|22.2.0": { - "sha256": "84e5fb2391272e69f3e08f385b178d314b9b096d7837277a67fcdc597a4e1ca3", - "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.2.0/native-image-installable-svm-java11-linux-amd64-22.2.0.jar" + "native-image-installable-svm|java11|22.3.0": { + "sha256": "17843f92dc9de74b161a63c52cc2a4597e5472cf3f6f6d71930fb655b35f9208", + "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.0/native-image-installable-svm-java11-linux-amd64-22.3.0.jar" } } } diff --git a/pkgs/development/compilers/graalvm/community-edition/graalvm17-ce-sources.json b/pkgs/development/compilers/graalvm/community-edition/graalvm17-ce-sources.json index 7685e35ebe5d..dc2da450b699 100644 --- a/pkgs/development/compilers/graalvm/community-edition/graalvm17-ce-sources.json +++ b/pkgs/development/compilers/graalvm/community-edition/graalvm17-ce-sources.json @@ -1,42 +1,42 @@ { "darwin-aarch64": { - "graalvm-ce|java17|22.2.0": { - "sha256": "cfbeb38cd707a330048ab2140cb185176201c5cb654df752fcb4bd95e899b4ec", - "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.2.0/graalvm-ce-java17-darwin-aarch64-22.2.0.tar.gz" + "graalvm-ce|java17|22.3.0": { + "sha256": "dfc0c8998b8d00fcca87ef1c866c6e4985fd20b0beba3021f9677f9b166dfaf8", + "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.0/graalvm-ce-java17-darwin-aarch64-22.3.0.tar.gz" }, - "native-image-installable-svm|java17|22.2.0": { - "sha256": "c6584429fe443f5415a7ec0545072b069f2e10bef1dbd6e7cb7fdec6ddb89b62", - "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.2.0/native-image-installable-svm-java17-darwin-aarch64-22.2.0.jar" + "native-image-installable-svm|java17|22.3.0": { + "sha256": "b6e44cb03f560bb43db1fd0aa862af36ba1df6717765920d91c18519712adfe9", + "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.0/native-image-installable-svm-java17-darwin-aarch64-22.3.0.jar" } }, "darwin-amd64": { - "graalvm-ce|java17|22.2.0": { - "sha256": "b92b6f5f7f11282f20c8f8b94ea1c16d776cbadd7b254119836a7ace9f513b0d", - "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.2.0/graalvm-ce-java17-darwin-amd64-22.2.0.tar.gz" + "graalvm-ce|java17|22.3.0": { + "sha256": "422cd6abecfb8b40238460c09c42c5a018cb92fab4165de9691be2e3c3d0e8d1", + "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.0/graalvm-ce-java17-darwin-amd64-22.3.0.tar.gz" }, - "native-image-installable-svm|java17|22.2.0": { - "sha256": "a751d0c0dcdc7e06dd0166d731a482a6937f36a1b69ef62f9e9f443922e85861", - "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.2.0/native-image-installable-svm-java17-darwin-amd64-22.2.0.jar" + "native-image-installable-svm|java17|22.3.0": { + "sha256": "9ce13874e62877d3bbe3faa4a57fbbffc766fdc8191971e7b25de0226fe86598", + "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.0/native-image-installable-svm-java17-darwin-amd64-22.3.0.jar" } }, "linux-aarch64": { - "graalvm-ce|java17|22.2.0": { - "sha256": "3025cc887bdaa088c89601b42931abc61dfd108aaad386abee8c1e08c913504d", - "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.2.0/graalvm-ce-java17-linux-aarch64-22.2.0.tar.gz" + "graalvm-ce|java17|22.3.0": { + "sha256": "e27249d9eef4504deb005cf14c6a028aad1adfa37209e12e9d7407710c08ed90", + "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.0/graalvm-ce-java17-linux-aarch64-22.3.0.tar.gz" }, - "native-image-installable-svm|java17|22.2.0": { - "sha256": "eeac78046e059e77542eec1fac7c0423bf5fa73eb6fb01b25100d8a6f81eecc0", - "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.2.0/native-image-installable-svm-java17-linux-aarch64-22.2.0.jar" + "native-image-installable-svm|java17|22.3.0": { + "sha256": "d5b833c44d37fbe4df75906f73144e2db01e683bca3386fe185f4abbc8fbc798", + "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.0/native-image-installable-svm-java17-linux-aarch64-22.3.0.jar" } }, "linux-amd64": { - "graalvm-ce|java17|22.2.0": { - "sha256": "cd903566d030bf44a8c5c0f50914fc9c9d89cb2954e1f90512b137a0bfedc3ca", - "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.2.0/graalvm-ce-java17-linux-amd64-22.2.0.tar.gz" + "graalvm-ce|java17|22.3.0": { + "sha256": "3473d8b3b1bc682e95adfb3ac1d9a59b51b0f43e2b752f2a5b550e4ebfa2fd17", + "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.0/graalvm-ce-java17-linux-amd64-22.3.0.tar.gz" }, - "native-image-installable-svm|java17|22.2.0": { - "sha256": "74656070429f8b24dd6770c2d274f272542116e3963291de74abed74c38ed08a", - "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.2.0/native-image-installable-svm-java17-linux-amd64-22.2.0.jar" + "native-image-installable-svm|java17|22.3.0": { + "sha256": "d1f5c58b65c57ad8a0c7da0c4569ce815ebf1ae503b0741ba1facf27b816d398", + "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.0/native-image-installable-svm-java17-linux-amd64-22.3.0.jar" } } } diff --git a/pkgs/development/compilers/ligo/default.nix b/pkgs/development/compilers/ligo/default.nix index 5fb879b21f02..0858711c9033 100644 --- a/pkgs/development/compilers/ligo/default.nix +++ b/pkgs/development/compilers/ligo/default.nix @@ -9,12 +9,12 @@ ocamlPackages.buildDunePackage rec { pname = "ligo"; - version = "0.53.0"; + version = "0.54.0"; src = fetchFromGitLab { owner = "ligolang"; repo = "ligo"; rev = version; - sha256 = "sha256-WNiN9UrwXCwfxWnR5oPm9sGWelQCpooCXh43T2QaOnI="; + sha256 = "sha256-Iq72gDaS05yhxAYjIUrqiCwBkx5aWbVpYPcQlgojhNU="; fetchSubmodules = true; }; @@ -78,6 +78,7 @@ ocamlPackages.buildDunePackage rec { ipaddr bls12-381 bls12-381-legacy + bls12-381-signature ptime mtime lwt_log diff --git a/pkgs/development/libraries/cairomm/1.16.nix b/pkgs/development/libraries/cairomm/1.16.nix index df9b8572ad0f..10e5286c5010 100644 --- a/pkgs/development/libraries/cairomm/1.16.nix +++ b/pkgs/development/libraries/cairomm/1.16.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "cairomm"; - version = "1.16.1"; + version = "1.16.2"; outputs = [ "out" "dev" ]; src = fetchurl { - url = "https://www.cairographics.org/releases/${pname}-${version}.tar.xz"; - sha256 = "sha256-b2Bg2OmN1Lis/uIpX92904z0h8B8JqrY0ag7ub/0osY="; + url = "https://www.cairographics.org/releases/cairomm-${version}.tar.xz"; + sha256 = "amO/mKl92isPVeNNG18/uQnvi3D5uNOCyx/zl459wT8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/cairomm/default.nix b/pkgs/development/libraries/cairomm/default.nix index 384b1b0e7cb1..9a5ebfb289ea 100644 --- a/pkgs/development/libraries/cairomm/default.nix +++ b/pkgs/development/libraries/cairomm/default.nix @@ -1,25 +1,45 @@ -{ fetchurl, lib, stdenv, pkg-config, darwin, cairo, fontconfig, freetype, libsigcxx, meson, ninja }: +{ fetchurl +, stdenv +, lib +, pkg-config +, darwin +, cairo +, fontconfig +, freetype +, libsigcxx +, meson +, ninja +}: stdenv.mkDerivation rec { pname = "cairomm"; - version = "1.14.3"; - - src = fetchurl { - url = "https://www.cairographics.org/releases/${pname}-${version}.tar.xz"; - # gnome doesn't have the latest version ATM; beware: same name but different hash - #url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-DTfgZ8XEyngIt87dq/4ZMsW9KnUK1k+zIeEhNTYpfng="; - }; + version = "1.14.4"; outputs = [ "out" "dev" ]; - nativeBuildInputs = [ pkg-config meson ninja ]; - propagatedBuildInputs = [ cairo libsigcxx ]; - buildInputs = [ fontconfig freetype ] - ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + src = fetchurl { + url = "https://www.cairographics.org/releases/cairomm-${version}.tar.xz"; + sha256 = "R0nSWisu9nzAwBTKr1yH+kZ5L8Sz7eGG+w/JMtIFUVg="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + ]; + + buildInputs = [ + fontconfig + freetype + ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ ApplicationServices ]); + propagatedBuildInputs = [ + cairo + libsigcxx + ]; + doCheck = true; meta = with lib; { diff --git a/pkgs/development/libraries/tracker-miners/default.nix b/pkgs/development/libraries/tracker-miners/default.nix index fa0e30f1abc4..55793719dd81 100644 --- a/pkgs/development/libraries/tracker-miners/default.nix +++ b/pkgs/development/libraries/tracker-miners/default.nix @@ -46,11 +46,11 @@ stdenv.mkDerivation rec { pname = "tracker-miners"; - version = "3.4.0"; + version = "3.4.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "ouA2XjCBG7YelcghSzP0eCo6BODGJGoG7NnAFBfNhOY="; + sha256 = "L84OyF+3YXyLKIfCJ5d0DV3shOwDbbdNbCCLurXFjCQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/vte/default.nix b/pkgs/development/libraries/vte/default.nix index 8fa3c0862248..07ec683bf05a 100644 --- a/pkgs/development/libraries/vte/default.nix +++ b/pkgs/development/libraries/vte/default.nix @@ -30,13 +30,13 @@ stdenv.mkDerivation rec { pname = "vte"; - version = "0.70.0"; + version = "0.70.1"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-k+DdShvCp6GmLaZBYKJ0zORWl26hVn2YWR2pbi0mWuY="; + sha256 = "sha256-H0YBy/6lMCuWkCIIyPGF5bGLJZtTWLyTzzkr9ZhxxbY="; }; patches = [ @@ -48,11 +48,6 @@ stdenv.mkDerivation rec { url = "https://git.alpinelinux.org/aports/plain/community/vte3/fix-W_EXITCODE.patch?id=4d35c076ce77bfac7655f60c4c3e4c86933ab7dd"; sha256 = "FkVyhsM0mRUzZmS2Gh172oqwcfXv6PyD6IEgjBhy2uU="; }) - # error: implicit declaration of function 'cfmakeraw' is invalid in C99 [-Werror,-Wimplicit-function-declaration] - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/vte/-/commit/1f1f177ff797ac2bb453168951135865cfded900.patch"; - sha256 = "sha256-VRVhq8JAshtcFejJkNUpMilo7tLgcojlEnCTrAtGVa0="; - }) ]; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix index 9a03680e3224..59d258e9d98d 100644 --- a/pkgs/development/libraries/webkitgtk/default.nix +++ b/pkgs/development/libraries/webkitgtk/default.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "webkitgtk"; - version = "2.38.0"; + version = "2.38.1"; name = "${finalAttrs.pname}-${finalAttrs.version}+abi=${if lib.versionAtLeast gtk3.version "4.0" then "5.0" else "4.${if lib.versions.major libsoup.version == "2" then "0" else "1"}"}"; outputs = [ "out" "dev" "devdoc" ]; @@ -77,7 +77,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "https://webkitgtk.org/releases/webkitgtk-${finalAttrs.version}.tar.xz"; - sha256 = "sha256-+c5jdaO24TKbC2CfRpIeJifcetYiSze5Z6supkO8D70="; + sha256 = "AuGVs/ueBXdDszZO5/HuwT9xYUImhJVEwHwypzuPGEg="; }; patches = lib.optionals stdenv.isLinux [ diff --git a/pkgs/development/ocaml-modules/bls12-381/default.nix b/pkgs/development/ocaml-modules/bls12-381/default.nix index 720f5b7a1069..ed2fbeb3158a 100644 --- a/pkgs/development/ocaml-modules/bls12-381/default.nix +++ b/pkgs/development/ocaml-modules/bls12-381/default.nix @@ -4,12 +4,12 @@ buildDunePackage rec { pname = "bls12-381"; - version = "4.0.0"; + version = "5.0.0"; src = fetchFromGitLab { owner = "dannywillems"; repo = "ocaml-bls12-381"; rev = version; - sha256 = "sha256-K9AsYUAUdk4XnspUalJKX5kycDFwO8PZx4bGaD3qZv8="; + sha256 = "sha256-Hy/I+743HSToZgGPFFiAbx7nrybHsE2PwycDsu3DuHM="; }; minimalOCamlVersion = "4.08"; diff --git a/pkgs/development/ocaml-modules/janestreet/0.15.nix b/pkgs/development/ocaml-modules/janestreet/0.15.nix index dcb5d62c362d..1ef9f72bb746 100644 --- a/pkgs/development/ocaml-modules/janestreet/0.15.nix +++ b/pkgs/development/ocaml-modules/janestreet/0.15.nix @@ -338,6 +338,23 @@ with self; propagatedBuildInputs = [ base ]; }; + file_path = janePackage { + pname = "file_path"; + minimumOCamlVersion = "4.11"; + hash = "0vjvxviryywwwfdazcijwhpajp2d4mavlki7lj4qaafjrw62x14k"; + meta.description = + "A library for typed manipulation of UNIX-style file paths"; + propagatedBuildInputs = [ + async + core + core_kernel + core_unix + expect_test_helpers_async + expect_test_helpers_core + ppx_jane + ]; + }; + fuzzy_match = janePackage { pname = "fuzzy_match"; hash = "0s5w81698b07l5m11nwx8xbjcpmp54dnf5fcrnlva22jrlsf14h4"; @@ -345,6 +362,14 @@ with self; propagatedBuildInputs = [ core ppx_jane ]; }; + fzf = janePackage { + pname = "fzf"; + minimumOCamlVersion = "4.08"; + hash = "1ha0i6dx5bgwzbdi4rn98wjwi2imv5p2i7qs7hy0c6cmg88xbdry"; + meta.description = "A library for running the fzf command line tool"; + propagatedBuildInputs = [ async core_kernel ppx_jane ]; + }; + higher_kinded = janePackage { pname = "higher_kinded"; minimumOCamlVersion = "4.09"; @@ -631,6 +656,16 @@ with self; propagatedBuildInputs = [ base_quickcheck ppx_bin_prot ppx_disable_unused_warnings ppx_expect ppx_fixed_literal ppx_ignore_instrumentation ppx_log ppx_module_timer ppx_optcomp ppx_optional ppx_pipebang ppx_stable ppx_string ppx_typerep_conv ppx_variants_conv ]; }; + ppx_jsonaf_conv = janePackage { + pname = "ppx_jsonaf_conv"; + version = "0.15.1"; + hash = "0wprs7qmscklyskj4famhaqqisi6jypy414aqba14qdyi43w0cv3"; + minimumOCamlVersion = "4.08"; + meta.description = + "[@@deriving] plugin to generate Jsonaf conversion functions"; + propagatedBuildInputs = [ base jsonaf ppx_jane ppxlib ]; + }; + ppx_js_style = janePackage { pname = "ppx_js_style"; hash = "0q2p9pvmlncgv0hprph95xiv7s6q44ynvp4yl4dckf1qx68rb3ba"; @@ -814,6 +849,13 @@ with self; propagatedBuildInputs = [ base ppx_jane ]; }; + redis-async = janePackage { + pname = "redis-async"; + hash = "0pccf4gkm880yyk8x4kgy5rwblkbscxav2sbis13abpms9vr7jfn"; + meta.description = "Redis client for Async applications"; + propagatedBuildInputs = [ async bignum core core_kernel ppx_jane ]; + }; + resource_cache = janePackage { pname = "resource_cache"; hash = "13wzx8ixgbb7jj5yrps890irw2wvkchnihsn7rfrcvnvrjzzjshm"; diff --git a/pkgs/development/ocaml-modules/ocamline/default.nix b/pkgs/development/ocaml-modules/ocamline/default.nix new file mode 100644 index 000000000000..694988df7dc7 --- /dev/null +++ b/pkgs/development/ocaml-modules/ocamline/default.nix @@ -0,0 +1,21 @@ +{ buildDunePackage, linenoise, fetchFromGitHub, lib }: + +buildDunePackage rec { + pname = "ocamline"; + version = "1.2"; + src = fetchFromGitHub { + owner = "chrisnevers"; + repo = pname; + rev = version; + sha256 = "Sljm/Bfr2Eo0d75tmJRuWUkkfHUYQ0g27+FzXBePnVg="; + }; + + propagatedBuildInputs = [ linenoise ]; + + meta = with lib; { + homepage = "https://chrisnevers.github.io/ocamline/"; + description = "Command line interface for user input"; + license = licenses.bsd3; + maintainers = with maintainers; [ mgttlinger ]; + }; +} diff --git a/pkgs/development/ocaml-modules/resto/default.nix b/pkgs/development/ocaml-modules/resto/default.nix index 14a295e27696..03795e5e1cf2 100644 --- a/pkgs/development/ocaml-modules/resto/default.nix +++ b/pkgs/development/ocaml-modules/resto/default.nix @@ -2,12 +2,12 @@ buildDunePackage rec { pname = "resto"; - version = "0.7"; + version = "1.0"; src = fetchFromGitLab { owner = "nomadic-labs"; repo = "resto"; rev = "v${version}"; - sha256 = "sha256-aX7w/rsoOmbni8BOXa0WnoQ47Y5zl91vWvMobuNFT3Y="; + sha256 = "sha256-DIm7fmISsCgRDi4p3NsUk7Cvs/dHpIKMdAOVdYLX2mc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/boto/default.nix b/pkgs/development/python-modules/boto/default.nix index 586f023f8009..9d0248003778 100644 --- a/pkgs/development/python-modules/boto/default.nix +++ b/pkgs/development/python-modules/boto/default.nix @@ -12,7 +12,6 @@ buildPythonPackage rec { pname = "boto"; version = "2.49.0"; - disabled = pythonAtLeast "3.10"; # cannot import name 'Mapping' from 'collections' src = fetchPypi { inherit pname version; @@ -25,6 +24,14 @@ buildPythonPackage rec { ./bug-953970_python3.8-compat.patch ]; + # boto is deprecated by upstream as of 2021-05-27 (https://github.com/boto/boto/commit/4980ac58764c3d401cb0b9552101f9c61c18f445) + # this patch is a bit simpler than https://github.com/boto/boto/pull/3898 + # as we don't have to take care of pythonOlder "3.3". + postPatch = '' + substituteInPlace boto/dynamodb/types.py --replace 'from collections import Mapping' 'from collections.abc import Mapping' + substituteInPlace boto/mws/connection.py --replace 'import collections' 'import collections.abc as collections' + ''; + checkPhase = '' ${python.interpreter} tests/test.py default ''; diff --git a/pkgs/development/tools/metal-cli/default.nix b/pkgs/development/tools/metal-cli/default.nix index 609455595edb..005d5d746d81 100644 --- a/pkgs/development/tools/metal-cli/default.nix +++ b/pkgs/development/tools/metal-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "metal-cli"; - version = "0.10.2"; + version = "0.10.3"; src = fetchFromGitHub { owner = "equinix"; repo = pname; rev = "v${version}"; - sha256 = "sha256-DjsJ/pJu62hn89KhOgQAT5gZcMD+5fF4IXU0PL7Pzdo="; + sha256 = "sha256-8T5GzdzKYkdzE5Lq6q9L/OoZkJ7y7s4i2GNcLzdGYMg="; }; - vendorSha256 = "sha256-eH/T5KlFvZx7sCZHLn0GNIAwTizLglvv9BoDndcJivo="; + vendorSha256 = "sha256-drsNZXLNUWICLI8D+IvJE4X8GmWrP9U3dmpf9HnKCWw="; ldflags = [ "-s" "-w" diff --git a/pkgs/development/tools/misc/pahole/default.nix b/pkgs/development/tools/misc/pahole/default.nix index ab4db7a8cc8c..7a60da1e53a3 100644 --- a/pkgs/development/tools/misc/pahole/default.nix +++ b/pkgs/development/tools/misc/pahole/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "pahole"; - version = "1.24"; + version = "1.23"; src = fetchgit { url = "https://git.kernel.org/pub/scm/devel/pahole/pahole.git"; rev = "v${version}"; - sha256 = "sha256-OPseVKt5kIKgK096+ufKrWMS1E/7Z0uxNqCMN6wKfKg="; + sha256 = "sha256-Dt3ZcUfjwdtTTv6qRFRgwK5GFWXdpN7fvb9KhpS1O94="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/development/tools/wxformbuilder/default.nix b/pkgs/development/tools/wxformbuilder/default.nix index 5c78d730d203..b8db2d4aac43 100644 --- a/pkgs/development/tools/wxformbuilder/default.nix +++ b/pkgs/development/tools/wxformbuilder/default.nix @@ -1,35 +1,56 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub -, wxGTK31 -, meson -, ninja +, cmake +, makeWrapper +, shared-mime-info +, wxGTK32 +, boost +, Cocoa }: stdenv.mkDerivation { pname = "wxFormBuilder"; - version = "unstable-2020-08-18"; + version = "unstable-2022-09-26"; src = fetchFromGitHub { owner = "wxFormBuilder"; repo = "wxFormBuilder"; - rev = "d053665cc33a79dd935b518b5e7aea6baf493c92"; - sha256 = "sha256-hTO7Fyp5ZWpq2CfIYEXB85oOkNrqr6Njfh8h0t9B6wU="; + rev = "e2e4764f1f4961c654733287c6e84d7738b4ba2b"; fetchSubmodules = true; + sha256 = "sha256-DLdwQH3s/ZNVq+A/qtZRy7dA/Ctp2qkOmi6M+rSb4MM="; }; nativeBuildInputs = [ - ninja - meson + cmake + ] ++ lib.optionals stdenv.isDarwin [ + makeWrapper + ] ++ lib.optionals stdenv.isLinux [ + shared-mime-info ]; buildInputs = [ - wxGTK31 + wxGTK32 + boost + ] ++ lib.optionals stdenv.isDarwin [ + Cocoa ]; + preConfigure = '' + sed -i 's/FATAL_ERROR/WARNING/' cmake/revision-git*.cmake + sed -i '/fixup_bundle/d;/codesign/d' cmake/macros.cmake + ''; + + postInstall = lib.optionalString stdenv.isDarwin '' + mkdir -p $out/{Applications,bin} + mv $out/wxFormBuilder.app $out/Applications + makeWrapper $out/{Applications/wxFormBuilder.app/Contents/MacOS,bin}/wxFormBuilder + ''; + meta = with lib; { description = "RAD tool for wxWidgets GUI design"; homepage = "https://github.com/wxFormBuilder/wxFormBuilder"; - license = licenses.gpl2; - maintainers = with maintainers; [ matthuszagh ]; + license = licenses.gpl2Only; + maintainers = with maintainers; [ matthuszagh wegank ]; }; } diff --git a/pkgs/games/eduke32/default.nix b/pkgs/games/eduke32/default.nix index ec65db97ce43..38bfed7ca7d8 100644 --- a/pkgs/games/eduke32/default.nix +++ b/pkgs/games/eduke32/default.nix @@ -58,8 +58,6 @@ in stdenv.mkDerivation rec { done ''; - NIX_CFLAGS_COMPILE = "-I${lib.getDev SDL2}/include/SDL2 -I${lib.getDev SDL2_mixer}/include/SDL2"; - makeFlags = [ "SDLCONFIG=${SDL2}/bin/sdl2-config" ] ++ lib.optionals stdenv.isDarwin [ diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 95ef57ece2d9..c53cc1098b69 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -2,61 +2,71 @@ "4.14": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-4.14.295-hardened1.patch", - "sha256": "0jync3d52qif0pxnmbx7js7zgxnrhrjxiiyp0n57cmdxi9jcjc8j", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.295-hardened1/linux-hardened-4.14.295-hardened1.patch" + "name": "linux-hardened-4.14.296-hardened1.patch", + "sha256": "1shbnrzdl0zpyq1wpd610l5xf0j1nsnbgd6yg88gjacgd2hpx143", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.296-hardened1/linux-hardened-4.14.296-hardened1.patch" }, - "sha256": "0svalywqmrhav63vw0ns06c25sgyvzwfngljpham3nm7jjxbkk32", - "version": "4.14.295" + "sha256": "1n4vngqbywwkqrq9fwp3lp4w6d3z588hbnzfngcp07z1ffrcvm9d", + "version": "4.14.296" }, "4.19": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-4.19.261-hardened1.patch", - "sha256": "1hs9jg2n9i89li0p1mbkfhy8r5pv5wrl3gw3b3xvp0n8283cy631", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.261-hardened1/linux-hardened-4.19.261-hardened1.patch" + "name": "linux-hardened-4.19.262-hardened1.patch", + "sha256": "117l4azj4j6jydrgrjs96xgab0g3ail4q75hkyqn85if7bjjnymk", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.262-hardened1/linux-hardened-4.19.262-hardened1.patch" }, - "sha256": "1cicb3zydpka9yjx875hbh305bsdvni2kp674pkvaw04pnc35hxy", - "version": "4.19.261" + "sha256": "07xnslqvmspqizng50yyprzrydwp0qdjmpsq2l1gjxr1lf3n8r5v", + "version": "4.19.262" }, "5.10": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.10.148-hardened1.patch", - "sha256": "1r4s7qpwjhhbp1phkk2dd8rbm3x9l3i3g10jz865l1vp253pmb65", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.148-hardened1/linux-hardened-5.10.148-hardened1.patch" + "name": "linux-hardened-5.10.150-hardened1.patch", + "sha256": "0sx7y7027yb05djwvpx44rmz47aybqc8r9j8z8kdiyx521fy5a56", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.150-hardened1/linux-hardened-5.10.150-hardened1.patch" }, - "sha256": "0mp9qs8f50hxf72b6cgh8izkyjbhrrmij6slxja701i1w9mkylhj", - "version": "5.10.148" + "sha256": "1qfyfhyz0b078qp2m14cxldx0m1mlfx2gdp4dnrbxc3hblybq4sq", + "version": "5.10.150" }, "5.15": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.15.74-hardened1.patch", - "sha256": "0ygfz210zz0k5fza2530vwayjz3r32973lbhfsyyc0fq6vghqhn2", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.74-hardened1/linux-hardened-5.15.74-hardened1.patch" + "name": "linux-hardened-5.15.75-hardened1.patch", + "sha256": "1qyk468v9bvx5jv3h610l1xy86klradb3ayxxmhw57xgh6964gbc", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.75-hardened1/linux-hardened-5.15.75-hardened1.patch" }, - "sha256": "0ra2ijpw7w07gm3kjwyszlwfq2rbnmq84z50qhv5r0svz2i3j59c", - "version": "5.15.74" + "sha256": "1ijzqkp9mbfvm8ii5rash401b6wqywkql9j2rxdgbk2r6vfmp9nr", + "version": "5.15.75" }, "5.19": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.19.16-hardened1.patch", - "sha256": "1y9c26pyyvifkza7anl9gphnn3jpw7jwiqwjw6i748wwxynhx596", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.19.16-hardened1/linux-hardened-5.19.16-hardened1.patch" + "name": "linux-hardened-5.19.17-hardened1.patch", + "sha256": "0fs9zdwxbcc3fi4w1qylvvv387ih3g0dnagw5pvq3r2k2g5fflya", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.19.17-hardened1/linux-hardened-5.19.17-hardened1.patch" }, - "sha256": "13g0c6ljxk3sd0ja39ndih5vrzp2ssj78qxaf8nswn8hgrkazsx1", - "version": "5.19.16" + "sha256": "12cly10lad12idjwlgh2g0pp4hhj57h2qi4fy6jg1lbsm62b6fy9", + "version": "5.19.17" }, "5.4": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.4.218-hardened1.patch", - "sha256": "1ylhkhkm4vamdap0kb6vnw9w0rjaacdfgly1yin75dxxymy0x026", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.218-hardened1/linux-hardened-5.4.218-hardened1.patch" + "name": "linux-hardened-5.4.220-hardened1.patch", + "sha256": "04c81ydfwk4zz28sdjlhkil5ymzigkq440w47slnzwxdny8wn5gw", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.220-hardened1/linux-hardened-5.4.220-hardened1.patch" }, - "sha256": "0f7lm5qq763zrnwwq9jmfpgvskhzi3gwy5rbq2q7gmiphl179p9x", - "version": "5.4.218" + "sha256": "0mh2p0hxb971mv3jjld5c85cbs85b5nmcq5j9akvq8y2jbai6b4d", + "version": "5.4.220" + }, + "6.0": { + "patch": { + "extra": "-hardened1", + "name": "linux-hardened-6.0.5-hardened1.patch", + "sha256": "1iksmyf0n3jx97ssqfw4878gxk9fcdx934rqq1hy6dky5lz67kwl", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/6.0.5-hardened1/linux-hardened-6.0.5-hardened1.patch" + }, + "sha256": "13j1c25g48688fbgiw416d7svld7jrc9dyxbz880riak5gr2wcv1", + "version": "6.0.5" } } diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index 655bba0c8977..e94263de28e6 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "4.14.295"; + version = "4.14.296"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0svalywqmrhav63vw0ns06c25sgyvzwfngljpham3nm7jjxbkk32"; + sha256 = "1n4vngqbywwkqrq9fwp3lp4w6d3z588hbnzfngcp07z1ffrcvm9d"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix index cd07e1a91446..7a4c0dff7ae6 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "4.19.261"; + version = "4.19.262"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1cicb3zydpka9yjx875hbh305bsdvni2kp674pkvaw04pnc35hxy"; + sha256 = "07xnslqvmspqizng50yyprzrydwp0qdjmpsq2l1gjxr1lf3n8r5v"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index c9b002abd784..f85b78a8f54f 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,12 +1,12 @@ { buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args: buildLinux (args // rec { - version = "4.9.330"; + version = "4.9.331"; extraMeta.branch = "4.9"; extraMeta.broken = stdenv.isAarch64; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0psrl8fcbp1bsanjmllic503dlyhkj8bjzfc20p2ksahlhv1j0mz"; + sha256 = "0v3vv02i9aqgx4g4kw0vpixxsms7w3s5fhry4wlqmsq0gkmqv3j8"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-5.10.nix b/pkgs/os-specific/linux/kernel/linux-5.10.nix index 68515e2e84c3..1dfc423feaf8 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.10.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.10.149"; + version = "5.10.150"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1lv5q0m24ccbiqywy03s9s3wyxzm0v7f691rag89qfsn6z2k8q8g"; + sha256 = "1qfyfhyz0b078qp2m14cxldx0m1mlfx2gdp4dnrbxc3hblybq4sq"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-5.15.nix b/pkgs/os-specific/linux/kernel/linux-5.15.nix index 0bab77b4ade9..5e7d7bc49a1c 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.15.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.15.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.15.74"; + version = "5.15.75"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0ra2ijpw7w07gm3kjwyszlwfq2rbnmq84z50qhv5r0svz2i3j59c"; + sha256 = "1ijzqkp9mbfvm8ii5rash401b6wqywkql9j2rxdgbk2r6vfmp9nr"; }; } // (args.argsOverride or { })) diff --git a/pkgs/os-specific/linux/kernel/linux-5.19.nix b/pkgs/os-specific/linux/kernel/linux-5.19.nix index 4dc67c2b90ce..6137c36cb5c9 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.19.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.19.16"; + version = "5.19.17"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "13g0c6ljxk3sd0ja39ndih5vrzp2ssj78qxaf8nswn8hgrkazsx1"; + sha256 = "12cly10lad12idjwlgh2g0pp4hhj57h2qi4fy6jg1lbsm62b6fy9"; }; } // (args.argsOverride or { })) diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix index 57d4d41add94..f6001712b962 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.4.219"; + version = "5.4.220"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0qd2a0cx6bq11qq2513xmm5jxzfrq6axvsc0pjbvdpv9fa9av4sj"; + sha256 = "0mh2p0hxb971mv3jjld5c85cbs85b5nmcq5j9akvq8y2jbai6b4d"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-6.0.nix b/pkgs/os-specific/linux/kernel/linux-6.0.nix index 574f04c386c4..901594363d3d 100644 --- a/pkgs/os-specific/linux/kernel/linux-6.0.nix +++ b/pkgs/os-specific/linux/kernel/linux-6.0.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "6.0.3"; + version = "6.0.5"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v6.x/linux-${version}.tar.xz"; - sha256 = "1krx3kp7ivgp91fkcvgvqsb698b3l0dk6zd6yf54sy8530j25mdh"; + sha256 = "13j1c25g48688fbgiw416d7svld7jrc9dyxbz880riak5gr2wcv1"; }; } // (args.argsOverride or { })) diff --git a/pkgs/servers/dendrite/default.nix b/pkgs/servers/dendrite/default.nix index b65bdf15bdbf..9d778e0ce3bc 100644 --- a/pkgs/servers/dendrite/default.nix +++ b/pkgs/servers/dendrite/default.nix @@ -3,16 +3,16 @@ buildGoModule rec { pname = "matrix-dendrite"; - version = "0.10.3"; + version = "0.10.4"; src = fetchFromGitHub { owner = "matrix-org"; repo = "dendrite"; rev = "v${version}"; - sha256 = "sha256-ziKVv5ql1gIAIYpsRCV9f9y711hYz24M1Z+mGWO1vqs="; + sha256 = "sha256-CJ83blu8xpXpcgIS7l2ya/2xJaPau5JaT4+PV+bAEhU="; }; - vendorSha256 = "sha256-p1UmHIM4h6oe5PRSPD8rtEJpwypTxN1IHzge0Me/9mQ="; + vendorSha256 = "sha256-i7lICrsQ5I5IFsrkey0jcJeYnRPAURTOGdYU+BCR+js="; subPackages = [ # The server as a monolith: https://matrix-org.github.io/dendrite/installation/install/monolith diff --git a/pkgs/servers/web-apps/wordpress/packages/plugins.json b/pkgs/servers/web-apps/wordpress/packages/plugins.json index 74be4614dfeb..047b26d1a9dc 100644 --- a/pkgs/servers/web-apps/wordpress/packages/plugins.json +++ b/pkgs/servers/web-apps/wordpress/packages/plugins.json @@ -77,6 +77,12 @@ "sha256": "050ip4vd514nlfw69ax9x8acszlcsqzd7zw5bdvy1xk3dlva6fkb", "version": "3.101.0" }, + "merge-minify-refresh": { + "path": "merge-minify-refresh/trunk", + "rev": "2749953", + "sha256": "1k3d59jfz4v6fjsm37gy0i32b6cr4vxv8rrrgll82fpwxs60i866", + "version": "1.13.2" + }, "opengraph": { "path": "opengraph/tags/1.11.0", "rev": "2730257", diff --git a/pkgs/servers/web-apps/wordpress/packages/wordpress-plugins.json b/pkgs/servers/web-apps/wordpress/packages/wordpress-plugins.json index e0e6458684da..4e4e84ab8ccc 100644 --- a/pkgs/servers/web-apps/wordpress/packages/wordpress-plugins.json +++ b/pkgs/servers/web-apps/wordpress/packages/wordpress-plugins.json @@ -12,6 +12,7 @@ , "jetpack-lite" , "lightbox-photoswipe" , "mailpoet" +, "merge-minify-refresh" , "opengraph" , "simple-login-captcha" , "static-mail-sender-configurator" diff --git a/pkgs/tools/networking/flannel/plugin.nix b/pkgs/tools/networking/flannel/plugin.nix index 957d5415164e..1433b94b9131 100644 --- a/pkgs/tools/networking/flannel/plugin.nix +++ b/pkgs/tools/networking/flannel/plugin.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "cni-plugin-flannel"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "flannel-io"; repo = "cni-plugin"; rev = "v${version}"; - sha256 = "sha256-Rq1hVZazeF39YGiuuWC8adff3AhPsSLnnfVpGCaMqgc="; + sha256 = "sha256-9AVXm3+VJFLQwe7EHwI8LmWKxfX1r0yjmKeaReQvxR4="; }; - vendorSha256 = "sha256-ddwNJZzdyO/wEdy0C7Z8IoOWXY4jggcgIHxmRUGGf9s="; + vendorSha256 = "sha256-DhvaXC/n4yiVDibB8kymzltNhEIxKdTsEDN9Sfc/wxU="; ldflags = [ "-s" "-w" diff --git a/pkgs/tools/networking/imapsync/default.nix b/pkgs/tools/networking/imapsync/default.nix index 2782a854554e..5dd9ef122200 100644 --- a/pkgs/tools/networking/imapsync/default.nix +++ b/pkgs/tools/networking/imapsync/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "imapsync"; - version = "2.200"; + version = "2.229"; src = fetchFromGitHub { owner = "imapsync"; repo = "imapsync"; rev = "imapsync-${version}"; - sha256 = "sha256-EM8nT9v6ZHpEG33/ibPqvfgFoAF36nhq6Y+RUWK4vR0="; + sha256 = "sha256-nlNePOV3Y0atEPSRByRo3dHj/WjIaefEDeWdMKTo4gc="; }; postPatch = '' @@ -47,6 +47,7 @@ stdenv.mkDerivation rec { NTLM PackageStash PackageStashXS + ProcProcessTable Readonly RegexpCommon SysMemInfo diff --git a/pkgs/tools/networking/mosh/default.nix b/pkgs/tools/networking/mosh/default.nix index fa33d42c2fde..bea16b809d19 100644 --- a/pkgs/tools/networking/mosh/default.nix +++ b/pkgs/tools/networking/mosh/default.nix @@ -1,14 +1,16 @@ -{ lib, stdenv, fetchurl, fetchpatch, zlib, protobuf, ncurses, pkg-config +{ lib, stdenv, fetchFromGitHub, zlib, protobuf, ncurses, pkg-config , makeWrapper, perl, openssl, autoreconfHook, openssh, bash-completion , withUtempter ? stdenv.isLinux && !stdenv.hostPlatform.isMusl, libutempter }: stdenv.mkDerivation rec { pname = "mosh"; - version = "1.3.2"; + version = "1.4.0"; - src = fetchurl { - url = "https://mosh.org/mosh-${version}.tar.gz"; - sha256 = "05hjhlp6lk8yjcy59zywpf0r6s0h0b9zxq0lw66dh9x8vxrhaq6s"; + src = fetchFromGitHub { + owner = "mobile-shell"; + repo = pname; + rev = "mosh-${version}"; + hash = "sha256-tlSsHu7JnXO+sorVuWWubNUNdb9X0/pCaiGG5Y0X/g8="; }; nativeBuildInputs = [ autoreconfHook pkg-config makeWrapper protobuf perl ]; @@ -23,24 +25,11 @@ stdenv.mkDerivation rec { ./ssh_path.patch ./mosh-client_path.patch ./utempter_path.patch - # Fix w/c++17, ::bind vs std::bind - (fetchpatch { - url = "https://github.com/mobile-shell/mosh/commit/e5f8a826ef9ff5da4cfce3bb8151f9526ec19db0.patch"; - sha256 = "15518rb0r5w1zn4s6981bf1sz6ins6gpn2saizfzhmr13hw4gmhm"; - }) # Fix build with bash-completion 2.10 ./bash_completion_datadir.patch ]; postPatch = '' - # Fix build with Xcode 12.5 toolchain/case-insensitive filesystems - # Backport of https://github.com/mobile-shell/mosh/commit/12199114fe4234f791ef4c306163901643b40538; - # remove on next upstream release. - patch -p0 < ${fetchpatch { - url = "https://raw.githubusercontent.com/macports/macports-ports/70ca3f65e622c17582fd938602d800157ed951c3/net/mosh/files/patch-version-subdir.diff"; - sha256 = "1yyh6d07y9zbdx4fb0r56zkq9nd9knwzj22v4dfi55k4k42qxapd"; - }} - substituteInPlace scripts/mosh.pl \ --subst-var-by ssh "${openssh}/bin/ssh" \ --subst-var-by mosh-client "$out/bin/mosh-client" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1cbcc4c037e1..14027d69b80c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -450,9 +450,7 @@ with pkgs; databricks-sql-cli = python3Packages.callPackage ../applications/misc/databricks-sql-cli { }; - datalad = callPackage ../applications/version-management/datalad { - python3 = python39; # `boto` currently broken with Python3.10 - }; + datalad = callPackage ../applications/version-management/datalad { }; dhallDirectoryToNix = callPackage ../build-support/dhall/directory-to-nix.nix { }; @@ -17309,9 +17307,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - pahole = callPackage ../development/tools/misc/pahole { - libbpf = libbpf_1; - }; + pahole = callPackage ../development/tools/misc/pahole {}; panopticon = callPackage ../development/tools/analysis/panopticon {}; @@ -22752,7 +22748,9 @@ with pkgs; wt3 wt4; - wxformbuilder = callPackage ../development/tools/wxformbuilder { }; + wxformbuilder = callPackage ../development/tools/wxformbuilder { + inherit (darwin.apple_sdk.frameworks) Cocoa; + }; wxGTK = wxGTK28; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index ae1536402941..e929a59cd70f 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -984,6 +984,8 @@ let ocamlify = callPackage ../development/tools/ocaml/ocamlify { }; + ocamline = callPackage ../development/ocaml-modules/ocamline { }; + jsonrpc = callPackage ../development/ocaml-modules/ocaml-lsp/jsonrpc.nix { }; lsp = callPackage ../development/ocaml-modules/ocaml-lsp/lsp.nix { }; ocaml-lsp = callPackage ../development/ocaml-modules/ocaml-lsp { };