diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 18b4118d6310..adaf6d0661b6 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3855,6 +3855,12 @@ githubId = 39825; name = "Dominik Honnef"; }; + doriath = { + email = "tomasz.zurkowski@gmail.com"; + github = "doriath"; + githubId = 150959; + name = "Tomasz Zurkowski"; + }; doronbehar = { email = "me@doronbehar.com"; github = "doronbehar"; diff --git a/nixos/modules/services/matrix/appservice-discord.nix b/nixos/modules/services/matrix/appservice-discord.nix index 15f0f0cc0cdb..f579c2529c0a 100644 --- a/nixos/modules/services/matrix/appservice-discord.nix +++ b/nixos/modules/services/matrix/appservice-discord.nix @@ -5,7 +5,6 @@ with lib; let dataDir = "/var/lib/matrix-appservice-discord"; registrationFile = "${dataDir}/discord-registration.yaml"; - appDir = "${pkgs.matrix-appservice-discord}/${pkgs.matrix-appservice-discord.passthru.nodeAppDir}"; cfg = config.services.matrix-appservice-discord; opt = options.services.matrix-appservice-discord; # TODO: switch to configGen.json once RFC42 is implemented @@ -16,6 +15,15 @@ in { services.matrix-appservice-discord = { enable = mkEnableOption (lib.mdDoc "a bridge between Matrix and Discord"); + package = mkOption { + type = types.package; + default = pkgs.matrix-appservice-discord; + defaultText = literalExpression "pkgs.matrix-appservice-discord"; + description = lib.mdDoc '' + Which package of matrix-appservice-discord to use. + ''; + }; + settings = mkOption rec { # TODO: switch to types.config.json as prescribed by RFC42 once it's implemented type = types.attrs; @@ -114,7 +122,7 @@ in { preStart = '' if [ ! -f '${registrationFile}' ]; then - ${pkgs.matrix-appservice-discord}/bin/matrix-appservice-discord \ + ${cfg.package}/bin/matrix-appservice-discord \ --generate-registration \ --url=${escapeShellArg cfg.url} \ ${optionalString (cfg.localpart != null) "--localpart=${escapeShellArg cfg.localpart}"} \ @@ -135,13 +143,13 @@ in { DynamicUser = true; PrivateTmp = true; - WorkingDirectory = appDir; + WorkingDirectory = "${cfg.package}/${cfg.package.passthru.nodeAppDir}"; StateDirectory = baseNameOf dataDir; UMask = "0027"; EnvironmentFile = cfg.environmentFile; ExecStart = '' - ${pkgs.matrix-appservice-discord}/bin/matrix-appservice-discord \ + ${cfg.package}/bin/matrix-appservice-discord \ --file='${registrationFile}' \ --config='${settingsFile}' \ --port='${toString cfg.port}' diff --git a/pkgs/applications/emulators/dolphin-emu/default.nix b/pkgs/applications/emulators/dolphin-emu/default.nix index ad9c470bf427..b9ef4682e87d 100644 --- a/pkgs/applications/emulators/dolphin-emu/default.nix +++ b/pkgs/applications/emulators/dolphin-emu/default.nix @@ -1,126 +1,190 @@ -{ stdenv -, lib -, fetchpatch -, pkg-config -, cmake -, bluez -, ffmpeg -, libao -, gtk3 -, glib -, libGLU -, libGL -, gettext -, libpthreadstubs -, libXrandr -, libXext -, readline -, openal -, libXdmcp -, portaudio +{ lib +, stdenv , fetchFromGitHub -, libusb1 -, libevdev -, wxGTK30 -, soundtouch -, miniupnpc -, mbedtls_2 +, cmake +, pkg-config +, wrapQtAppsHook +, alsa-lib +, bluez +, bzip2 +, cubeb , curl -, lzo +, enet +, ffmpeg +, fmt_8 +, hidapi +, libevdev +, libGL +, libiconv +, libpulseaudio +, libspng +, libusb1 +, libXdmcp +, libXext +, libXrandr +, mbedtls_2 +, mgba +, miniupnpc +, minizip-ng +, openal +, pugixml +, qtbase , sfml -, libpulseaudio ? null +, soundtouch +, udev +, vulkan-loader +, xxHash +, xz + + # Used in passthru +, common-updater-scripts +, dolphin-emu +, jq +, testers +, writeShellScript + + # Darwin-only dependencies +, CoreBluetooth +, ForceFeedback +, IOKit +, moltenvk +, OpenGL +, VideoToolbox }: stdenv.mkDerivation rec { pname = "dolphin-emu"; - version = "5.0"; + version = "5.0-18498"; src = fetchFromGitHub { owner = "dolphin-emu"; repo = "dolphin"; - rev = version; - sha256 = "07mlfnh0hwvk6xarcg315x7z2j0qbg9g7cm040df9c8psiahc3g6"; + rev = "46b99671d9158e0ca840c1d8ef249db0f321ced7"; + sha256 = "sha256-K+OF8o8I1XDLQQcsWC8p8jUuWeb+RoHlBG3cEZ1aWIU="; + fetchSubmodules = true; }; - patches = [ - # Fix FTBFS with glibc 2.26 - (fetchpatch { - url = "https://salsa.debian.org/games-team/dolphin-emu/raw/8c952b1fcd46259e9d8cce836df433e0a8b88f8c/debian/patches/02_glibc-2.26.patch"; - name = "02_glibc-2.26.patch"; - sha256 = "sha256-LBXT3rf5klwmX9YQXt4/iv06GghsWZprNhLGYlKiDqk="; - }) - # Fix FTBFS with GCC 8 - (fetchpatch { - url = "https://salsa.debian.org/games-team/dolphin-emu/raw/8c952b1fcd46259e9d8cce836df433e0a8b88f8c/debian/patches/03_gcc8.patch"; - name = "03_gcc8.patch"; - sha256 = "sha256-uWP6zMjoHYbX6K+oPSQdBn2xWQpvNyhZabMkhtYrSbU="; - }) - # Fix FTBFS with SoundTouch 2.1.2 - (fetchpatch { - url = "https://salsa.debian.org/games-team/dolphin-emu/raw/8c952b1fcd46259e9d8cce836df433e0a8b88f8c/debian/patches/05_soundtouch-2.1.2.patch"; - name = "05_soundtouch-2.1.2.patch"; - sha256 = "sha256-Y7CNM6GQC9GRhlOBLZlxkIpj1CFhIwA5L8lGXur/bwY="; - }) - # Use GTK+3 wxWidgets backend - (fetchpatch { - url = "https://salsa.debian.org/games-team/dolphin-emu/raw/8c952b1fcd46259e9d8cce836df433e0a8b88f8c/debian/patches/06_gtk3.patch"; - name = "06_gtk3.patch"; - sha256 = "sha256-pu5Q0+8kNwmpf2DoXCXHFqxF0EGTnFXJipkBz1Vh2cs="; - }) - ]; - - cmakeFlags = [ - "-DENABLE_LTO=True" - ]; - nativeBuildInputs = [ - pkg-config cmake + pkg-config + wrapQtAppsHook ]; buildInputs = [ - bluez - ffmpeg - libao - libGLU - libGL - gtk3 - glib - gettext - libpthreadstubs - libXrandr - libXext - readline - openal - libevdev - libXdmcp - portaudio - libpulseaudio - libevdev - libXdmcp - portaudio - libusb1 - libpulseaudio - wxGTK30 - soundtouch - miniupnpc - mbedtls_2 + bzip2 + cubeb curl - lzo + enet + ffmpeg + fmt_8 + hidapi + libGL + libiconv + libpulseaudio + libspng + libusb1 + libXdmcp + mbedtls_2 + miniupnpc + minizip-ng + openal + pugixml + qtbase sfml + soundtouch + xxHash + xz + ] ++ lib.optionals stdenv.isLinux [ + alsa-lib + bluez + libevdev + libXext + libXrandr + mgba # Derivation doesn't support Darwin + udev + vulkan-loader + ] ++ lib.optionals stdenv.isDarwin [ + CoreBluetooth + ForceFeedback + IOKit + moltenvk + OpenGL + VideoToolbox ]; + cmakeFlags = [ + "-DDISTRIBUTOR=NixOS" + "-DUSE_SHARED_ENET=ON" + "-DDOLPHIN_WC_REVISION=${src.rev}" + "-DDOLPHIN_WC_DESCRIBE=${version}" + "-DDOLPHIN_WC_BRANCH=master" + ] ++ lib.optionals stdenv.isDarwin [ + "-DOSX_USE_DEFAULT_SEARCH_PATH=True" + "-DUSE_BUNDLED_MOLTENVK=OFF" + # Bundles the application folder into a standalone executable, so we cannot devendor libraries + "-DSKIP_POSTPROCESS_BUNDLE=ON" + # Needs xcode so compilation fails with it enabled. We would want the version to be fixed anyways. + # Note: The updater isn't available on linux, so we dont need to disable it there. + "-DENABLE_AUTOUPDATE=OFF" + ]; + + qtWrapperArgs = lib.optionals stdenv.isLinux [ + "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ vulkan-loader ]}" + # https://bugs.dolphin-emu.org/issues/11807 + # The .desktop file should already set this, but Dolphin may be launched in other ways + "--set QT_QPA_PLATFORM xcb" + ]; + + # https://github.com/NixOS/nixpkgs/issues/201254 + NIX_LDFLAGS = lib.optionalString (stdenv.isLinux && stdenv.isAarch64 && stdenv.cc.isGNU) "-lgcc"; + + # Use nix-provided libraries instead of submodules + postPatch = lib.optionalString stdenv.isDarwin '' + substituteInPlace CMakeLists.txt \ + --replace "if(NOT APPLE)" "if(true)" \ + --replace "if(LIBUSB_FOUND AND NOT APPLE)" "if(LIBUSB_FOUND)" + ''; + postInstall = lib.optionalString stdenv.hostPlatform.isLinux '' install -D $src/Data/51-usb-device.rules $out/etc/udev/rules.d/51-usb-device.rules + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' + # Only gets installed automatically if the standalone executable is used + mkdir -p $out/Applications + cp -r ./Binaries/Dolphin.app $out/Applications + ln -s $out/Applications/Dolphin.app/Contents/MacOS/Dolphin $out/bin ''; + passthru = { + tests.version = testers.testVersion { + package = dolphin-emu; + command = "dolphin-emu-nogui --version"; + }; + + updateScript = writeShellScript "dolphin-update-script" '' + set -eou pipefail + export PATH=${lib.makeBinPath [ curl jq common-updater-scripts ]} + + json="$(curl -s https://dolphin-emu.org/update/latest/beta)" + version="$(jq -r '.shortrev' <<< "$json")" + rev="$(jq -r '.hash' <<< "$json")" + update-source-version dolphin-emu "$version" --rev="$rev" + ''; + }; + meta = with lib; { - homepage = "https://dolphin-emu.org/"; + homepage = "https://dolphin-emu.org"; description = "Gamecube/Wii/Triforce emulator for x86_64 and ARMv8"; + mainProgram = if stdenv.hostPlatform.isDarwin then "Dolphin" else "dolphin-emu"; + branch = "master"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ MP2E ashkitten ]; - # x86_32 is an unsupported platform. - # Enable generic build if you really want a JIT-less binary. - platforms = [ "x86_64-linux" "aarch64-linux" ]; + platforms = platforms.unix; + maintainers = with maintainers; [ + MP2E + ashkitten + xfix + ivar + ]; + # Requires both LLVM and SDK bump + broken = stdenv.isDarwin && stdenv.isx86_64; }; } diff --git a/pkgs/applications/emulators/dolphin-emu/master.nix b/pkgs/applications/emulators/dolphin-emu/master.nix deleted file mode 100644 index 7f68b5821495..000000000000 --- a/pkgs/applications/emulators/dolphin-emu/master.nix +++ /dev/null @@ -1,196 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, pkg-config -, cmake -, wrapQtAppsHook -, qtbase -, bluez -, ffmpeg -, libGL -, libXrandr -, libusb1 -, libXdmcp -, libXext -, openal -, udev -, libevdev -, cubeb -, curl -, alsa-lib -, miniupnpc -, enet -, mbedtls_2 -, soundtouch -, sfml -, minizip-ng -, xz -, hidapi -, fmt_8 -, vulkan-loader -, libpulseaudio -, bzip2 -, libiconv -, pugixml -, xxHash - - # Used in passthru -, testers -, dolphin-emu-beta -, writeShellScript -, common-updater-scripts -, jq - - # Darwin-only dependencies -, CoreBluetooth -, ForceFeedback -, IOKit -, VideoToolbox -, OpenGL -, libpng -, moltenvk -}: - -stdenv.mkDerivation rec { - pname = "dolphin-emu"; - version = "5.0-17995"; - - src = fetchFromGitHub { - owner = "dolphin-emu"; - repo = "dolphin"; - rev = "8bad821019721b9b72701b495da95656ace5fea5"; - sha256 = "sha256-uxHzn+tXRBr11OPpZ4ELBw7DTJH4mnqUBOeyPlXNAh8="; - fetchSubmodules = true; - }; - - patches = [ - # On x86_64-darwin CMake reportedly does not work without this in some cases. - # See https://github.com/NixOS/nixpkgs/pull/190373#issuecomment-1241310765 - ./minizip-external-missing-include.patch - ]; - - nativeBuildInputs = [ - cmake - pkg-config - wrapQtAppsHook - ]; - - buildInputs = [ - cubeb - curl - ffmpeg - pugixml - xxHash - libGL - libpulseaudio - openal - libusb1 - libiconv - libpng - libXdmcp - hidapi - miniupnpc - enet - mbedtls_2 - soundtouch - sfml - minizip-ng - xz - qtbase - fmt_8 - bzip2 - ] ++ lib.optionals stdenv.isLinux [ - libXrandr - libXext - bluez - udev - libevdev - alsa-lib - vulkan-loader - ] ++ lib.optionals stdenv.isDarwin [ - CoreBluetooth - OpenGL - ForceFeedback - IOKit - VideoToolbox - moltenvk - ]; - - cmakeFlags = [ - "-DDISTRIBUTOR=NixOS" - "-DUSE_SHARED_ENET=ON" - "-DDOLPHIN_WC_REVISION=${src.rev}" - "-DDOLPHIN_WC_DESCRIBE=${version}" - "-DDOLPHIN_WC_BRANCH=master" - ] ++ lib.optionals stdenv.isDarwin [ - "-DOSX_USE_DEFAULT_SEARCH_PATH=True" - "-DUSE_BUNDLED_MOLTENVK=OFF" - # Bundles the application folder into a standalone executable, so we cannot devendor libraries - "-DSKIP_POSTPROCESS_BUNDLE=ON" - # Needs xcode so compilation fails with it enabled. We would want the version to be fixed anyways. - # Note: The updater isn't available on linux, so we dont need to disable it there. - "-DENABLE_AUTOUPDATE=OFF" - ]; - - qtWrapperArgs = lib.optionals stdenv.isLinux [ - "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ vulkan-loader ]}" - # https://bugs.dolphin-emu.org/issues/11807 - # The .desktop file should already set this, but Dolphin may be launched in other ways - "--set QT_QPA_PLATFORM xcb" - # https://bugs.dolphin-emu.org/issues/12913 - "--set QT_XCB_NO_XI2 1" - ]; - - # https://github.com/NixOS/nixpkgs/issues/201254 - NIX_LDFLAGS = lib.optionalString (stdenv.isLinux && stdenv.isAarch64 && stdenv.cc.isGNU) "-lgcc"; - - # Use nix-provided libraries instead of submodules - postPatch = lib.optionalString stdenv.isDarwin '' - substituteInPlace CMakeLists.txt \ - --replace "if(NOT APPLE)" "if(true)" \ - --replace "if(LIBUSB_FOUND AND NOT APPLE)" "if(LIBUSB_FOUND)" - ''; - - postInstall = lib.optionalString stdenv.hostPlatform.isLinux '' - install -D $src/Data/51-usb-device.rules $out/etc/udev/rules.d/51-usb-device.rules - '' + lib.optionalString stdenv.hostPlatform.isDarwin '' - # Only gets installed automatically if the standalone executable is used - mkdir -p $out/Applications - cp -r ./Binaries/Dolphin.app $out/Applications - ln -s $out/Applications/Dolphin.app/Contents/MacOS/Dolphin $out/bin - ''; - - passthru = { - tests.version = testers.testVersion { - package = dolphin-emu-beta; - command = "dolphin-emu-nogui --version"; - }; - - updateScript = writeShellScript "dolphin-update-script" '' - set -eou pipefail - export PATH=${lib.makeBinPath [ curl jq common-updater-scripts ]} - - json="$(curl -s https://dolphin-emu.org/update/latest/beta)" - version="$(jq -r '.shortrev' <<< "$json")" - rev="$(jq -r '.hash' <<< "$json")" - update-source-version dolphin-emu-beta "$version" --rev="$rev" - ''; - }; - - meta = with lib; { - homepage = "https://dolphin-emu.org"; - description = "Gamecube/Wii/Triforce emulator for x86_64 and ARMv8"; - mainProgram = if stdenv.hostPlatform.isDarwin then "Dolphin" else "dolphin-emu"; - branch = "master"; - license = licenses.gpl2Plus; - platforms = platforms.unix; - maintainers = with maintainers; [ - MP2E - ashkitten - xfix - ivar - ]; - # Requires both LLVM and SDK bump - broken = stdenv.isDarwin && stdenv.isx86_64; - }; -} diff --git a/pkgs/applications/emulators/dolphin-emu/minizip-external-missing-include.patch b/pkgs/applications/emulators/dolphin-emu/minizip-external-missing-include.patch deleted file mode 100644 index 7da013ecd8f6..000000000000 --- a/pkgs/applications/emulators/dolphin-emu/minizip-external-missing-include.patch +++ /dev/null @@ -1,18 +0,0 @@ -commit 5e0cb8066fb1653399c54e93e42375295c2562bd -Author: Ivar Scholten -Date: Fri Sep 9 14:27:55 2022 +0200 - - Externals/minizip: add missing include to CheckFunctionExists - -diff --git a/Externals/minizip/CMakeLists.txt b/Externals/minizip/CMakeLists.txt -index c3d7c5512e..f59f8b295c 100644 ---- a/Externals/minizip/CMakeLists.txt -+++ b/Externals/minizip/CMakeLists.txt -@@ -60,6 +60,7 @@ if (HAVE_INTTYPES_H) - target_compile_definitions(minizip PRIVATE HAVE_INTTYPES_H) - endif() - -+include(CheckFunctionExists) - check_function_exists(fseeko HAVE_FSEEKO) - if (NOT HAVE_FSEEKO) - target_compile_definitions(minizip PRIVATE NO_FSEEKO) diff --git a/pkgs/applications/graphics/jpegoptim/default.nix b/pkgs/applications/graphics/jpegoptim/default.nix index 951bb9d7d894..ff00d565f47d 100644 --- a/pkgs/applications/graphics/jpegoptim/default.nix +++ b/pkgs/applications/graphics/jpegoptim/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, libjpeg }: stdenv.mkDerivation rec { - version = "1.5.1"; + version = "1.5.2"; pname = "jpegoptim"; src = fetchFromGitHub { owner = "tjko"; repo = pname; rev = "v${version}"; - sha256 = "sha256-QPipwBk+BS/u3YxB8ACeFXQSuoW1aynEyG3tEMrhcaE="; + sha256 = "sha256-PROQvOqsis8we58OOZ/kuY+L/CoV7XfnY9wvrpsTJu8="; }; # There are no checks, it seems. diff --git a/pkgs/applications/graphics/paraview/default.nix b/pkgs/applications/graphics/paraview/default.nix index 7a05114a1e98..54f956981ee9 100644 --- a/pkgs/applications/graphics/paraview/default.nix +++ b/pkgs/applications/graphics/paraview/default.nix @@ -6,7 +6,7 @@ }: let - version = "5.10.0"; + version = "5.11.0"; docFiles = [ (fetchurl { @@ -35,7 +35,7 @@ in stdenv.mkDerivation rec { owner = "paraview"; repo = "paraview"; rev = "v${version}"; - sha256 = "0ipx6zq44hpic7gvv0s2jvjncak6vlmrz5sp9ypc15b15bna0gs2"; + sha256 = "sha256-WvkKGl5lG+apX6m4ULVZZVtDsSUjEVXe/seh95b+LmI="; fetchSubmodules = true; }; diff --git a/pkgs/applications/networking/cluster/linkerd/edge.nix b/pkgs/applications/networking/cluster/linkerd/edge.nix index 365016eb672d..a124d633b37d 100644 --- a/pkgs/applications/networking/cluster/linkerd/edge.nix +++ b/pkgs/applications/networking/cluster/linkerd/edge.nix @@ -2,7 +2,7 @@ (callPackage ./generic.nix { }) { channel = "edge"; - version = "23.1.2"; - sha256 = "1c8l5zzy5pjilp1a84084g3dgdm0rxkx7hj7lqcn0iihfvhxc1xq"; - vendorSha256 = "sha256-6dOX3SsKjpwC/dEUO2SnVna99lpav7kIEKrMUy4YfhA="; + version = "23.2.1"; + sha256 = "0qjl6qxfg6bj22fwm2y01if5dqp2w79y45ibrg46r33pf6gbwjxj"; + vendorSha256 = "sha256-YxWBjbE3aBFfCbQeSTfQv5QzP5n4IRHHqNrFwrJPQ7g="; } diff --git a/pkgs/applications/networking/cluster/pluto/default.nix b/pkgs/applications/networking/cluster/pluto/default.nix index c9af58b1a8a8..fc2aa83aa430 100644 --- a/pkgs/applications/networking/cluster/pluto/default.nix +++ b/pkgs/applications/networking/cluster/pluto/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "pluto"; - version = "5.12.0"; + version = "5.13.3"; src = fetchFromGitHub { owner = "FairwindsOps"; repo = "pluto"; rev = "v${version}"; - sha256 = "sha256-WE/XWNBy5p8PEQ11s8nmW+HoVEkQB9cKoj5ZS8Suvs8="; + sha256 = "sha256-6kbfsqhALf7LFl0GS4VAMTVDFKP+CaEr6IPfpTZ33Fo="; }; - vendorHash = "sha256-F5Vh9wPd53bifLStk6wEwidPZvOjN87jn4RxJbSuW4o="; + vendorHash = "sha256-lXW1yHrGLwZdhfkMLeu7zm0w2HxXk1DW+QEY+rfGZpE="; ldflags = [ "-w" "-s" diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index e74084e14c52..3b171070a573 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -4,13 +4,13 @@ let common = { stname, target, postInstall ? "" }: buildGoModule rec { pname = stname; - version = "1.23.0"; + version = "1.23.1"; src = fetchFromGitHub { owner = "syncthing"; repo = "syncthing"; rev = "v${version}"; - hash = "sha256-Z4YVU45na4BgIbN/IlORpTCuf2EuSuOyppDRzswn3EI="; + hash = "sha256-Jbg56Nn+5ZjIv1KZrThkqWY+P13MglLE78E6jc0rbY0="; }; vendorHash = "sha256-q63iaRxJRvPY0Np20O6JmdMEjSg/kxRneBfs8fRTwXk="; diff --git a/pkgs/applications/office/paperwork/paperwork-shell.nix b/pkgs/applications/office/paperwork/paperwork-shell.nix index ee621df4d837..ca6cab2c1e4f 100644 --- a/pkgs/applications/office/paperwork/paperwork-shell.nix +++ b/pkgs/applications/office/paperwork/paperwork-shell.nix @@ -11,6 +11,7 @@ , fabulous , getkey , psutil +, shared-mime-info , pkgs }: @@ -39,6 +40,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ + shared-mime-info openpaperwork-gtk ]; diff --git a/pkgs/applications/office/paperwork/src.nix b/pkgs/applications/office/paperwork/src.nix index 980a4aabf7ab..6323c2c417b8 100644 --- a/pkgs/applications/office/paperwork/src.nix +++ b/pkgs/applications/office/paperwork/src.nix @@ -1,13 +1,13 @@ {fetchFromGitLab}: rec { - version = "2.1.1"; + version = "2.1.2"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; repo = "paperwork"; group = "World"; owner = "OpenPaperwork"; rev = version; - sha256 = "2M2eMP54F3RRDMBuAZ1gBiBoMmTRJaHTUwtTjj4ZU+4="; + sha256 = "/5k+zUtTE+Dr879xbHDCAYrqlEJLsbkcRSG3GbA/PCg="; }; sample_documents = fetchFromGitLab { domain = "gitlab.gnome.org"; diff --git a/pkgs/applications/version-management/commitizen/default.nix b/pkgs/applications/version-management/commitizen/default.nix index f53c6fb153b4..04a810cf9e8c 100644 --- a/pkgs/applications/version-management/commitizen/default.nix +++ b/pkgs/applications/version-management/commitizen/default.nix @@ -26,13 +26,13 @@ buildPythonApplication rec { pname = "commitizen"; - version = "2.41.0"; + version = "2.42.0"; src = fetchFromGitHub { owner = "commitizen-tools"; repo = pname; rev = "v${version}"; - hash = "sha256-dzAIRfUdyHSefDRDuPMsr8l2Dsiall2ZUDB6GufTbXE="; + hash = "sha256-13WEbF6in+zYZXWYqlYA98qJkKxjmcpQY9GuGS+DDtk="; }; format = "pyproject"; diff --git a/pkgs/data/fonts/iosevka/bin.nix b/pkgs/data/fonts/iosevka/bin.nix index 7e3a662fda80..5baa9374a544 100644 --- a/pkgs/data/fonts/iosevka/bin.nix +++ b/pkgs/data/fonts/iosevka/bin.nix @@ -11,7 +11,7 @@ let (builtins.attrNames (builtins.removeAttrs variantHashes [ "iosevka" ])); in stdenv.mkDerivation rec { pname = "${name}-bin"; - version = "18.0.0"; + version = "19.0.0"; src = fetchurl { url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/ttc-${name}-${version}.zip"; diff --git a/pkgs/data/fonts/iosevka/variants.nix b/pkgs/data/fonts/iosevka/variants.nix index 6d387516e8a4..7c5525c85d00 100644 --- a/pkgs/data/fonts/iosevka/variants.nix +++ b/pkgs/data/fonts/iosevka/variants.nix @@ -1,95 +1,95 @@ # This file was autogenerated. DO NOT EDIT! { - iosevka = "03f2rabj2w2l7jwqyl2awj42jhh0l3picqgyfcv3q067i34abfyn"; - iosevka-aile = "0p1r5sysy6djfd1sx0pfxf42bv7ayqgk1nvil33jr925w96i2dp6"; - iosevka-curly = "0r33wcgvh315avgkkic27qpf3bavrqwbig1kj4wm5rdr957ldk40"; - iosevka-curly-slab = "0yd7grhnx7z27xmd3wr8x2xx2002hmfi1y3ndmqq1sc9gab5gcb7"; - iosevka-etoile = "0jhd49vxxxaqi1rxfkmpc3v1q96ak1b5wyggchngqi3739pjgqy3"; - iosevka-slab = "00wk15kj9b1nr3b0bmarx6gqx3jg8z1pm9qqf9x09s72b3ng8adm"; - iosevka-ss01 = "1kp6zv8zyx50la7zrfz4fis68s41kplibagny61w5v3w36xpm3cs"; - iosevka-ss02 = "1c0dl28a3wwa5g4793jyb4n4c8p5vjlyh1b8j2i5da31dqrqm9gj"; - iosevka-ss03 = "0vs8x6l8gwqi47g1c5ainsk5fb2i6j4wv7mgdyw5j5l3blnba5yh"; - iosevka-ss04 = "1caf4xqd1dywzbq06ip042rw88833yk9ws7y3vjvsp93g7a2r675"; - iosevka-ss05 = "008aphj4w6ri3fgnydrxavvpm3bfywv4cym10fqi9xgd84jhm9m1"; - iosevka-ss06 = "00dkagqiwzwzvv75zss82yx0gdcbmh9xvr8swhi5zk0y0bc3xk2y"; - iosevka-ss07 = "1acnva081awp76xyspksq9jkvlyswh3q1jy9gnsc6kh4vyn17vjs"; - iosevka-ss08 = "0lmkglcjlppvfd7k2pz57r476fa4c0q5l4gqzfy1mlklh0mc5hqb"; - iosevka-ss09 = "04r2k2z54iszwfnif872p5br0dm4fvc5341cpbxv4almpzxjyqnr"; - iosevka-ss10 = "1c6gs9g8dhywpd2ha7kx2l7g7bwj7i5a78645ipx8126f749y0y9"; - iosevka-ss11 = "0286k56r12a2yjylxynvzd0idrcv4ykrmpkn3b5xv9f74qq6irmf"; - iosevka-ss12 = "0ab4x5lh8spbg0djb092vcq1cnvjhazwkia8byq1q47iwiyh756l"; - iosevka-ss13 = "0kva71mfkl9xzz8khjzgrj47zg2505rg0hv5hxflawxsqwi4iwvl"; - iosevka-ss14 = "1gk7m3xh4v3jm6s5g2prd27w4p0r1blbxsxdy3b020bdwikxcaga"; - iosevka-ss15 = "0frxjc3hhay8izsx4ywff4j39qxp9ljz6hvw0rjcya3vny515jq5"; - iosevka-ss16 = "1g299yhn0kfc7vn8vbgwq4798w5lcl72j6hj91k90i1yq11lg13i"; - iosevka-ss17 = "02z83x73bhpgf44kq0gw46bdnpqzr4vm37h78bh19vydzqaj8hg0"; - iosevka-ss18 = "1b7vhhbspi98xzmk4hpiw08jmscm7f7nibqxhkfmppl6y0ymbm9d"; - sgr-iosevka = "1n60dgprl2p22wwfhxpwy9v9xf6vyv3qwm2jdc0m9m0q9jwjashr"; - sgr-iosevka-aile = "1k195vqv2wajhmyma43xgda3s2z86kl2gksgdrm95s9sx7ijns2s"; - sgr-iosevka-curly = "15yq1fs7knp9gxgqjxslpmlx85c6kvpm31sf81llpf4k5f9dmlcp"; - sgr-iosevka-curly-slab = "0fa68lm6iwlf2s5k8388dwgk015c55zg1wkhhhjmixwn7p8gifxz"; - sgr-iosevka-etoile = "1ry1zc7cdx6g927d1752ipz39v4wsnfrnn8n9cfwamz8v458wld1"; - sgr-iosevka-fixed = "173v09dx5pwsbh9jac5qxi7nk95dqyryg747hl58bchby6kmnc3k"; - sgr-iosevka-fixed-curly = "11y8bj9vmdq48n370f1r4zsk72ci3cq7c9ff6y40hn5w40s8k379"; - sgr-iosevka-fixed-curly-slab = "1a4gmz6sl67l23awkfl8f3xdr8hbb2mi1lsc0ain1wvvyx1bi56m"; - sgr-iosevka-fixed-slab = "11xv18ykrfg2fdvbrlcx7k3qvp5yqbm278ks3gm0gbck1awvfckg"; - sgr-iosevka-fixed-ss01 = "1yb96x53wjks537vs0gd7rss6piszs139k1kgb1swrpq7519awaz"; - sgr-iosevka-fixed-ss02 = "10yy0yg2i9nm00lzpmrfbdh7jjcll37wql3fcsaxha57gcxf9nf0"; - sgr-iosevka-fixed-ss03 = "1fpjfqlqq6lz3gya1q24nzy2xls6nxn567lhglj0ykjnh3prkll8"; - sgr-iosevka-fixed-ss04 = "1kwa5mwd6ihsyj2y70hrrvgy41cs19i0f7nvl4khs3i69a1l58ag"; - sgr-iosevka-fixed-ss05 = "08v8in8s8p2nayazq60w1kc1jpq48nwdwh6wbxv7ij7lfwii8xws"; - sgr-iosevka-fixed-ss06 = "03jzylw99xa3b6hpy6bpwhyii6d9fggy9synfl54sn7smwqk08wr"; - sgr-iosevka-fixed-ss07 = "13yzd6r51gka03fcl3bvx6d97b4m4px2cnsd724maqkqrcxkbxgb"; - sgr-iosevka-fixed-ss08 = "1xghlj7drx9328jr1cb051nkwv47r5ykkyy6ydff1c4amc1xabsq"; - sgr-iosevka-fixed-ss09 = "12l6lbz4m1lwyqqmv583777r9ymssy9x34rz72y3dch0mqhmjjzg"; - sgr-iosevka-fixed-ss10 = "1flrh6a7m0dw7na30nhbxjld54517z77ff3s9fjrpmgyb9wz7i2j"; - sgr-iosevka-fixed-ss11 = "1j4v4h6k505gkxyswcjf61kj9cfgkalxjg1arms9zb351p8rrkda"; - sgr-iosevka-fixed-ss12 = "00qwnsxc08bm5cq3ljz2pjqsiw019ah4z0crqcwaysijicxmbckc"; - sgr-iosevka-fixed-ss13 = "0jrw0amhfi28mc4i7a74qvgjamvymijlf3akskaw9qrmzvks8wn1"; - sgr-iosevka-fixed-ss14 = "0rvh842zkxdrna9nh2ylsjs3q90sq39658l0mafi85b8z5asdwai"; - sgr-iosevka-fixed-ss15 = "0j5yrr1biqfhgj6qg6359xg9rfv6qzqiqdqjgfjwbhijs6xfn8f1"; - sgr-iosevka-fixed-ss16 = "06jrfhb257nmldnxxyc5rh869r5y62v2y034c0r9j7354s7gcq7a"; - sgr-iosevka-fixed-ss17 = "0cgmsh0478963k1dgpkhy6j1b383gx2q09z3shr6j87knjjwqgp0"; - sgr-iosevka-fixed-ss18 = "0r4nyd459aqgna7dyzvxnznclqihxdb888g949kdzhxykfchq53s"; - sgr-iosevka-slab = "1bv8asz66hn80xvjxa7b0vgywha1bpmhd8q95cssc3085dprz1r6"; - sgr-iosevka-ss01 = "0sv19w0adnddzarf8dlz0n73jzqnp0xfb2lgh4xcpjkhm66j3fhh"; - sgr-iosevka-ss02 = "1ih10a666r77pvj57crdgyn7ll15giwxj0nis501r1fkp1bzkscn"; - sgr-iosevka-ss03 = "180hkjzzgasf9a58vi0n0cishnbyjgbjmkh60awcpxwvh85qd4hf"; - sgr-iosevka-ss04 = "1i4rpg9j967xaxg8h9dmachd3896f4jgwxa0mfjlizls2hfvnbsi"; - sgr-iosevka-ss05 = "1ca2z4dincjk7jl16pa6d7dnnzq3w3il7fr2lphvrjvdrxbci615"; - sgr-iosevka-ss06 = "08dj9dcq58grnp6lh16yvvzjqhzlm765v4ci1rys0wbjnp72xxda"; - sgr-iosevka-ss07 = "13k6plhdgxhp5gjs8z98wb480hh5wy6p2zmc4xvhp88y93fy8kk7"; - sgr-iosevka-ss08 = "1zfxamanq6a06fazn1jkaswh5g6iw22qnycg5dnxn4flk8nas1db"; - sgr-iosevka-ss09 = "0qaxp4fsvl26il16h78y2l8013m49cbk2nzxcs1k9g5if11a49d3"; - sgr-iosevka-ss10 = "1qvvm6rvhrbp83qjfb3dfsbam20f6aw52kg1i5ggfrqj35niv0hd"; - sgr-iosevka-ss11 = "1v2b456qj8kyacm7308gsim5p25wnyg8qabyrfvdj00h81s31akl"; - sgr-iosevka-ss12 = "1rsi6ir5vccar0n3ychisc40axiyhqj5yvcx450ppd33f3sd5rc7"; - sgr-iosevka-ss13 = "12x4q5l1pdxi065zs913dqd7zb8qpi4bbgd43h3k5azsrwxwvixr"; - sgr-iosevka-ss14 = "1snzdv23jqmbz25k9i2zl7px7yysk5hn74q1x251s07ghdx3nfdj"; - sgr-iosevka-ss15 = "0hbmj6wij6cv9yh76npp4xrl7fdm8jjx03398anfcsa02gkvg8zz"; - sgr-iosevka-ss16 = "0v6vhg0vp5ig6ngs96q5mxa2snfp08nk68a9772sm1ny61q3chrq"; - sgr-iosevka-ss17 = "0268b85yhdfsbjyhi0vlxwrpwxa8h919np53s060z94094h6jd9x"; - sgr-iosevka-ss18 = "13vnhh8181h36y6iz2p2x6rjgjv5w3d0gqbcdkwhgmvx7s03k122"; - sgr-iosevka-term = "05c2sxb4aris90mhjxyfkw1b0ga0hplfas669076h7yjsimw647l"; - sgr-iosevka-term-curly = "1j0b4fhcivkdgka9zyqf732hcxj8rchqxkwv2bwxib1a17fmwn6c"; - sgr-iosevka-term-curly-slab = "0dvv2n3plfxm8z2xi1ihzn4rncyk1kz8xbgyprnb0lvqiyf18igy"; - sgr-iosevka-term-slab = "0i7wrvq6c96q8v6zw9iym42b6sbm0vc04ysljghpblnnfymq5yv9"; - sgr-iosevka-term-ss01 = "1n23qp50pr466blpn2h9dhjbn0wnbbxyzb0sz751bk8db41lpyqb"; - sgr-iosevka-term-ss02 = "0ghvfhkdsfsjb8yjwvwlwhn66lmy8dx34126ccnvj0g77ww2nwa9"; - sgr-iosevka-term-ss03 = "03hnmy9wijqwsc36cg5b3pxj7mb1cbyacii00pcvrpcns2w1ssbw"; - sgr-iosevka-term-ss04 = "0fv9xhhii0h5ii4yxsdnywn45254494mgq1n5aajasq494cgxhp4"; - sgr-iosevka-term-ss05 = "0qa4l77sjpxd9l4nb555bhgzm0f1c74w6014md2rpljjvyy2mzwg"; - sgr-iosevka-term-ss06 = "05y7rmghvhmzw3spn7b3v6hmpcqg5p32flm437a1aljdr46sbxli"; - sgr-iosevka-term-ss07 = "1lzqgpr1vchi4ricqp1v49nv62rl3anbdvzpvddby81wr5jcyd1y"; - sgr-iosevka-term-ss08 = "1sxicv2gspc39fyja370dpiq12xd1bgndiw5r6cqfkkd8x8dgpdv"; - sgr-iosevka-term-ss09 = "0ax9pgm3d171kksrqd2z8xpr68kdxkqg9h344an55gjk01q7dzay"; - sgr-iosevka-term-ss10 = "1rgvadmvdldcaqa0r76kzmrck814qwksdqficaxcd7wk8bx64n81"; - sgr-iosevka-term-ss11 = "02if14ff5kax4p1aa2wkbidhwlzgyxi7lxir2ildahwfkvkp971y"; - sgr-iosevka-term-ss12 = "0sj8n12is4094nbj67wkk88953jp9235kvvr4230abql1g6s263r"; - sgr-iosevka-term-ss13 = "006sdcj8qw247b63d647ykm8razyb0apsfd0cjmlikj9hdmyzrr2"; - sgr-iosevka-term-ss14 = "0i7d3ldp9rj1f4kwdk8hkxq0s38df6i25qfx6hwfjj1c5bl3a843"; - sgr-iosevka-term-ss15 = "15gjqz7zc6wwy1l61pgpnz7wwyyaij43dcrwcwyi6h10jhm8b3ia"; - sgr-iosevka-term-ss16 = "1c1i1iyqzgh3pz4fzjp26d71lphmcgqbjp2s91yyqg3nfhwbzvyc"; - sgr-iosevka-term-ss17 = "0kr58576vlx81nb2ia5z9226m6h0ybd5vzfj5li9b721l4q0rpky"; - sgr-iosevka-term-ss18 = "1zjs40i4dmw2l45k8wydngl4g3a88nhbmmjwd5lsz8a40pq4bw15"; + iosevka = "0m8z67daj1gwb3yiw8qw3n1nxp96xb11fvb5183bh02r7ncym0da"; + iosevka-aile = "02jhyzk3bpsjng3b1jfffwvr2inhhjsm4jdahzj05j381fp717c4"; + iosevka-curly = "1si2kzv7qhlpyaaa954vnjmfk1c5rjxjimvckinpkjz30cnvg1bl"; + iosevka-curly-slab = "1ngk3r6kdqngksga3s3m615jkqrxdcplj8srvlb6642vcc38w6vh"; + iosevka-etoile = "1yg38x8dk5nyyjyy71v5j4x2x701hmp8gjwvphf5scf6vn52lvxz"; + iosevka-slab = "1bw6lyy8lg4vpalnrsrnkrm9dlyl6vm6faigy2y9bfvh7nxrd8qa"; + iosevka-ss01 = "1p02d8mdqx6mbnycs9d2r0qwqsxjrlgbl7skf8y66dsmjn6xxd0y"; + iosevka-ss02 = "0ds8ad38h7h8250hdm89v2imya6jdzgk1h5jgsf983ls1gqjikhc"; + iosevka-ss03 = "1s6rc4qhlfgvr7g8ywmlmsl58hfrqx0w24ivx5zz4jr5zqj70j7l"; + iosevka-ss04 = "1lc8kx0p8m8nm4ql6ylcw9g4iq0j65hv6x48273cclqqcmqdn4qj"; + iosevka-ss05 = "1wx02ysbj0rpr623jp1jy64ywrj8rm3n2fqzq05f4qv996bij11k"; + iosevka-ss06 = "1bf0qnpvbq94d42gvbzikfkk20d788cicsyk8kz1vsf5xbg37kla"; + iosevka-ss07 = "1ybl5gfyz4dnarimamshf002p9k6148wbbrbarpswb85kab502hd"; + iosevka-ss08 = "1llp8iryr5dixdarwls9iw8mmnhzhlr7q8fzq969p64ygk76rkn4"; + iosevka-ss09 = "14b49k0zv49xybdwrbf0p1krrga3jjviwzy0alxrwn0zf7vlbnbi"; + iosevka-ss10 = "1xs1dkq62pml17dii2lhsianhzr22059i17sw2b334wbszc00j7y"; + iosevka-ss11 = "0mrjzmk74vlq69ih4gm2iza4qdzyznn42bk3jwlvpd67z5vq36ag"; + iosevka-ss12 = "0z16a8wrydi0ch9zj0lcz6cxbvawkr0ck03bzdbb81waggk4fxin"; + iosevka-ss13 = "1rv8n3vbhwqv7bks6v86v4w13fr4a015xpvprzfz76xp98hb9dmc"; + iosevka-ss14 = "0m7kpvy8bknmrfsql9b24w7n15hybnkisjxzzmrxkf8a60jrydni"; + iosevka-ss15 = "006jkgww0hdb0c1wgby0y5535xapjpk1w8vm51d3yyrp04pwr1r1"; + iosevka-ss16 = "1mmc7cyyk64lcavb2gib64b64zcr7qcn0m3cmlwnr1zgm6nb3w64"; + iosevka-ss17 = "0wanv1h8qg5jyx7w380h7jkbc22slg9566pzw7dv7dg1nw0h2v3k"; + iosevka-ss18 = "1y1daxghw3jbfn785935906j76l0230yixdmwlrzyra2svyaql3w"; + sgr-iosevka = "182nzxxrxfz8xc3w8g9bsr0can71671w4xplyvyi7b1v9f62g9f5"; + sgr-iosevka-aile = "1arjiwx5qf8j6pzb8mpd1g46z0kn80341wvcmsnx42d97b2m64jx"; + sgr-iosevka-curly = "1lyh0rh2pswbaxsqyxicyknhla4gm2h0jb2rg0wx9vib9h53lazn"; + sgr-iosevka-curly-slab = "0h2j7dwcyd5v1acpwjsz9li5g4r1ssx715x5pj4gdvskq4calff4"; + sgr-iosevka-etoile = "15ag0w6sv24rc91mxh4c89gq6jwnq37bxml6a41rvn54fy0h1jnd"; + sgr-iosevka-fixed = "0935zbk5x0mk06al11nig74b2rv1x8zc3waxs8hvbri0ryzykzk4"; + sgr-iosevka-fixed-curly = "1i8cqfwcdsaxdlh87kaya8bp33fwlyz984r757122qnqbywcfm30"; + sgr-iosevka-fixed-curly-slab = "0ba77jxn8n5dssjpwj4iyvwxw3mxqizrvsz5jyv9a4f3gfvwi18k"; + sgr-iosevka-fixed-slab = "0qfhc7pg30ashpx504lln4h2w36icrbgij7fga07z2a715qxmfq9"; + sgr-iosevka-fixed-ss01 = "1597hn4vzh0r8j22k7866blj3kw2bhp70z7msfr2hbszpscwxwqg"; + sgr-iosevka-fixed-ss02 = "1ygrsvamgp6f26zg5qysk6dn4fa1im02dzsrlpgpv3sl4gh0cv44"; + sgr-iosevka-fixed-ss03 = "0936ggnzaavqn4d7fsmmf54bwp0v31sz0n1w15ky7c5bsqp9h8ja"; + sgr-iosevka-fixed-ss04 = "1xjslygh3f5nv0k8fiby0cgg22wr0a9jh79fbzallx3zh4d60a2a"; + sgr-iosevka-fixed-ss05 = "0vnm398zdvkzymhw41gljpf9jq52wq3vawiyw5xsdr75d4n63fpb"; + sgr-iosevka-fixed-ss06 = "1pnk8ijb193h85sk702ar0m0wk03xz1xcnvx8iq4k52q3a3vdd40"; + sgr-iosevka-fixed-ss07 = "0qfcf6r2gzc5zwjfrcq1hjp9c5s13fc34lwwmxkj8224d42543jn"; + sgr-iosevka-fixed-ss08 = "1ram9wm14k2sncfqpak23vss3pyqbwd1ndhm1i4ib7bpq8skd3wi"; + sgr-iosevka-fixed-ss09 = "0r8zy1fwih42clxm2rsjqks5rxgy1qxirz396r25gvwxng2503y4"; + sgr-iosevka-fixed-ss10 = "1v44s7n1gwz7mcybjsi1amv6xc8z47k20miycngjcy1cccrds2da"; + sgr-iosevka-fixed-ss11 = "1fdclqvzq45shpj97awc7636ymgrnfd69iaizwxy49y2krpa7dx9"; + sgr-iosevka-fixed-ss12 = "07f7i0qh9z6hlgy0ak3myxmiy4rbrixcap52lhk8wwapbnf21r7l"; + sgr-iosevka-fixed-ss13 = "07z3hfi5vynwl15dqfsldwjj5i9fldmm6i1nypm28cxbya3izj60"; + sgr-iosevka-fixed-ss14 = "1r001yna7ydf24bkgygld2kh47pvsz1yr9s57ssvdql37q24wzf1"; + sgr-iosevka-fixed-ss15 = "1757lzbp9payykcdywdbfilhgm1yij8gsnazc7bywpc4sv806vhz"; + sgr-iosevka-fixed-ss16 = "18mr7wvz5q60kgz0h2k05ahd0krz3ng7wgg1amd3292cji61vxvw"; + sgr-iosevka-fixed-ss17 = "1bykqwspssv1vbx2nns8dfckijqmd633g57glmlhjmxlavv5gxnw"; + sgr-iosevka-fixed-ss18 = "034w2yv2ihybkz03zalcsixrmjs7as62v8jhk8xkyckqc3bk0kc7"; + sgr-iosevka-slab = "04b1w9ij6dgy5gyvi7d47g9xadpb230mlgbdrk36fyhvfyw048y1"; + sgr-iosevka-ss01 = "077d4dan7f41ydi64xv0z0784j5vcj98vmqagmy1c1xyr0p68dac"; + sgr-iosevka-ss02 = "1hmy2cwnsb3f60yp66lznas78432518xkj2jmpqy8ad05d2zmmc8"; + sgr-iosevka-ss03 = "1bs1hb6magmbc2zh4fzx7h6j6bdllbvv85fv5krs3b888w3fzjw1"; + sgr-iosevka-ss04 = "1c3wb8nz0xz57crwn151b5sgzm320jkirsajyjf0srdaid1gkjkx"; + sgr-iosevka-ss05 = "1dx33y8rk3nzgdfikz262javq4v3n76hvv5b7rx7kxlkxycpy8ya"; + sgr-iosevka-ss06 = "1s54xx4w3zvbz2w7f5sl5vlqazwsm033jsq8ljrdh4c2l88mpcq3"; + sgr-iosevka-ss07 = "03zfq3jib2df6dhj1pbmw8hq57i0fx98gkawxzk13sfgrzz1zv47"; + sgr-iosevka-ss08 = "09k220gha919lv18bs6y2zlcjqa5j7jsq8mfqx8xddcwq1v9v094"; + sgr-iosevka-ss09 = "0plvxhqwkr52sich4kwzqs3xq5s5x61hq7n423ar2zaskx007sjv"; + sgr-iosevka-ss10 = "0c42h417sir120cp6fbnbhv3s1ys8pxky56v6f44h50w7p6qhlx1"; + sgr-iosevka-ss11 = "03sp7z0s5sb9bnhxb9liainpiqmq1r0lpmigscl6wr1rpaxq2l7i"; + sgr-iosevka-ss12 = "0y2xs0qv3b1k4s4my9c69j94ql2kwmqmm3f626vjj8rar8r0wab0"; + sgr-iosevka-ss13 = "1pyv3i1972n5gxr16fl68gydjsxndh7kbba3d15bmkankahgll6c"; + sgr-iosevka-ss14 = "1c7y8h8jv937wnlxkgdswb0ixa5v747z598pd0yhvwid3ksxb1px"; + sgr-iosevka-ss15 = "08wzzkr0l0xz4l7qk9kbhvybr4favl0qz0cjr7raw0hibqkw17sp"; + sgr-iosevka-ss16 = "0q63x71mq19gqqiaqbqsp0lvf3knhckx5d17caq6ipv5gs3xxmzr"; + sgr-iosevka-ss17 = "04054qbvyfvp1aqs3likyh85kqyckkg2ac83s65lvkj3f46r50sg"; + sgr-iosevka-ss18 = "1ckrfx3f4mncm1hbc2bcsbk97kkzsi524wfgvhz10jw1yk5yyd60"; + sgr-iosevka-term = "1ygfsc86fihkxpwm2q3j2y3ibpb7lkrjwrld7dg9ymb83hah29xm"; + sgr-iosevka-term-curly = "1qz8x2z23m5yvdpf0055a7xb5z77dabwbf3hkmh4r77rp1h6idv4"; + sgr-iosevka-term-curly-slab = "011n7qpcx2abvp5i9z6picy5bcjvvfx7pjqy8m7sf02fdm14s2jl"; + sgr-iosevka-term-slab = "1iwgcqnxbjf25k6bbx3iwcqy2ghwnnxvfinjp5slwr7bhjjjbl9y"; + sgr-iosevka-term-ss01 = "09s813a8ywqpncmq0iqkjjnh1sb5zn267fzp2dz92cmw5929627s"; + sgr-iosevka-term-ss02 = "1yyvnxdwi6caq6b6pgviad5l7b7znx4xkxdg1np23a7imr94vb1c"; + sgr-iosevka-term-ss03 = "1hrdipmf54z2hrl7g8m8z17aq3lp5v66xy24f58qsm4c1pfab3i7"; + sgr-iosevka-term-ss04 = "1h54glwrzblg61y4f1sxm78mci47wjry4h4gdrbpx96snf31ynbb"; + sgr-iosevka-term-ss05 = "1xzzj36817nsw15s3a1f740d89gc4634dnczjjj6vrddli8ilann"; + sgr-iosevka-term-ss06 = "0c07i831bmfz6y7jqaip6il4cvqzc51d0w17s2dnjrnj4x3ndgmx"; + sgr-iosevka-term-ss07 = "0x9wzf0w4pzjmzzbmzj56nkhhz5834chvxqn9519fbq1md4pfl3b"; + sgr-iosevka-term-ss08 = "1gf1l17d8hrf1aq4pq9ai05kan8m86z8s2d7masjkvg1zaw2lb4s"; + sgr-iosevka-term-ss09 = "1nnhciib413ll2h7ps3vyghiayz9iwniwr7byyn9pdimm0j5vq07"; + sgr-iosevka-term-ss10 = "0qvficwhpya5sy5myxsjjfmrn9z2d9lpzyi88l8dhz3dfvyr1yzs"; + sgr-iosevka-term-ss11 = "0ml6swvyddhz2nvq14skfh1d9d98c3d6ir0qgf97pc0qxyqbcfp2"; + sgr-iosevka-term-ss12 = "01nxs1m2iif6lswx22h58i45zxab0nbqpf0rzlp6v3wnb8ylpbi5"; + sgr-iosevka-term-ss13 = "0zadj9fakpqmibnxz883hwbcgqfssjvsi6kcvzik5cnamlk2jz8c"; + sgr-iosevka-term-ss14 = "1dwfm8lcbgf8rfw11i2alrv98f9332cqyk9zvzfrjrdp9camr7j0"; + sgr-iosevka-term-ss15 = "0z7ad7vy2faq33kpbl1x2w6i3s4af8v8fzj05rdyadws35ra3idd"; + sgr-iosevka-term-ss16 = "1fzzkmk7ppcbmg7s50nknc7nwavfpqsja12af8qidzba9z535w2g"; + sgr-iosevka-term-ss17 = "1rcpfgf5blg3nbf6prw9h2ylc2ji8vl6cxqlck482kncz8ph9swk"; + sgr-iosevka-term-ss18 = "1nksii5xyi97lsrf1hxl06m0pdlk8rnsbg1s81amkzz8fxlyhzlc"; } diff --git a/pkgs/data/misc/papirus-folders/default.nix b/pkgs/data/misc/papirus-folders/default.nix index 92bfe362bcda..24fbeb0b0e23 100644 --- a/pkgs/data/misc/papirus-folders/default.nix +++ b/pkgs/data/misc/papirus-folders/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "papirus-folders"; - version = "1.12.0"; + version = "1.12.1"; src = fetchFromGitHub { owner = "PapirusDevelopmentTeam"; repo = "papirus-folders"; rev = "v${version}"; - sha256 = "sha256-ZZMEZCWO+qW76eqa+TgxWGVz69VkSCPcttLoCrH7ppY="; + sha256 = "sha256-Dus9f2m5Wj46Url7N3UYEvBAankppzGzdJHGPH3CT3g="; }; buildInputs = [ diff --git a/pkgs/desktops/gnome/core/gnome-contacts/default.nix b/pkgs/desktops/gnome/core/gnome-contacts/default.nix index 760af24880c4..560d40ddc115 100644 --- a/pkgs/desktops/gnome/core/gnome-contacts/default.nix +++ b/pkgs/desktops/gnome/core/gnome-contacts/default.nix @@ -26,11 +26,11 @@ stdenv.mkDerivation rec { pname = "gnome-contacts"; - version = "43.0"; + version = "43.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-contacts/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "VbYd9+k/Cr4f+kZeGOPF3k9JqQ8mjqnRHtyGrwbQceE="; + sha256 = "Ug3IjJAce4/n4SoBOhQlz+2R8vhAhIWitJ+SxnWZACA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/compilers/gnu-cim/default.nix b/pkgs/development/compilers/gnu-cim/default.nix new file mode 100644 index 000000000000..b1cb9f08597e --- /dev/null +++ b/pkgs/development/compilers/gnu-cim/default.nix @@ -0,0 +1,45 @@ +{ lib +, stdenv +, fetchurl +}: + +stdenv.mkDerivation rec { + pname = "gnu-cim"; + version = "5.1"; + + outputs = ["out" "lib" "man" "info"]; + + src = fetchurl { + url = "mirror://gnu/cim/cim-${version}.tar.gz"; + hash = "sha256-uQcXtm7EAFA73WnlN+i38+ip0QbDupoIoErlc2mgaak="; + }; + + postPatch = '' + for fname in lib/{simulation,simset}.c; do + substituteInPlace "$fname" \ + --replace \ + '#include "../../lib/cim.h"' \ + '#include "../lib/cim.h"' + done + ''; + + CFLAGS = lib.optionalString stdenv.cc.isClang "-Wno-return-type"; + + doCheck = true; + + meta = with lib; { + description = "A GNU compiler for the programming language Simula"; + longDescription = '' + GNU Cim is a compiler for the programming language Simula. + It offers a class concept, separate compilation with full type checking, + interface to external C routines, an application package for process + simulation and a coroutine concept. Commonly used with the Demos for + discrete event modelling. + ''; + homepage = "https://www.gnu.org/software/cim/"; + license = licenses.gpl2; + platforms = platforms.all; + badPlatforms = [ "aarch64-darwin" ]; + maintainers = with maintainers; [ pbsds ]; + }; +} diff --git a/pkgs/development/libraries/cosmopolitan/default.nix b/pkgs/development/libraries/cosmopolitan/default.nix index 88e5bcf5d9d7..6f4cdb1cf687 100644 --- a/pkgs/development/libraries/cosmopolitan/default.nix +++ b/pkgs/development/libraries/cosmopolitan/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "cosmopolitan"; - version = "2.1.1"; + version = "2.2"; src = fetchFromGitHub { owner = "jart"; repo = pname; rev = version; - sha256 = "sha256-2Q4lutSIQ6tBwTy01lPSMepNAww9Kb7BwNyEcsSdWZ0="; + sha256 = "sha256-DTL1dXH+LhaxWpiCrsNjV74Bw5+kPbhEAA2Z1NKiPDk="; }; patches = [ @@ -34,6 +34,9 @@ stdenv.mkDerivation rec { rm test/libc/calls/sched_setscheduler_test.c rm test/libc/thread/pthread_create_test.c rm test/libc/calls/getgroups_test.c + + # fails + rm test/libc/stdio/posix_spawn_test.c ''; installPhase = '' diff --git a/pkgs/development/libraries/example-robot-data/default.nix b/pkgs/development/libraries/example-robot-data/default.nix index 08a650dbca00..5fbb03a9fa2b 100644 --- a/pkgs/development/libraries/example-robot-data/default.nix +++ b/pkgs/development/libraries/example-robot-data/default.nix @@ -8,14 +8,14 @@ stdenv.mkDerivation rec { pname = "example-robot-data"; - version = "4.0.3"; + version = "4.0.4"; src = fetchFromGitHub { owner = "Gepetto"; repo = pname; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-rxVyka8tcF/CmGTVNyh3FPR1LVa6JOAN+9zjElgqCak="; + sha256 = "sha256-5FqMRChv/YGeoZq/jLSEJI5iQazQIDwslT78fbERVfs="; }; strictDeps = true; diff --git a/pkgs/development/libraries/fizz/default.nix b/pkgs/development/libraries/fizz/default.nix index 2addb5748263..f00980cdd9be 100644 --- a/pkgs/development/libraries/fizz/default.nix +++ b/pkgs/development/libraries/fizz/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "fizz"; - version = "2023.01.30.00"; + version = "2023.02.06.00"; src = fetchFromGitHub { owner = "facebookincubator"; repo = "fizz"; rev = "v${version}"; - sha256 = "sha256-WyqDVoByBP91qGohNadr3iGpKEwZrURjr9mEaAdbfvs="; + sha256 = "sha256-JwRoIiSumT1jw5/VX/TkxpTJbrmLLke27xH8UHtrs2c="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/physics/clhep/default.nix b/pkgs/development/libraries/physics/clhep/default.nix index a8d853a23b04..b3ba508220f5 100644 --- a/pkgs/development/libraries/physics/clhep/default.nix +++ b/pkgs/development/libraries/physics/clhep/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "clhep"; - version = "2.4.6.3"; + version = "2.4.6.4"; src = fetchurl { url = "https://proj-clhep.web.cern.ch/proj-clhep/dist1/clhep-${version}.tgz"; - hash = "sha256-/NAH8RsQukryjQJyIrYxSNDrRP96CC7uNTvfkh+caEo="; + hash = "sha256-SciTMPGQPvcH08XXnBanxabyyQ/CkOIDTuODSAlInlc="; }; prePatch = '' diff --git a/pkgs/development/libraries/pico-sdk/default.nix b/pkgs/development/libraries/pico-sdk/default.nix index 991d2e661f14..8b5f33599cd2 100644 --- a/pkgs/development/libraries/pico-sdk/default.nix +++ b/pkgs/development/libraries/pico-sdk/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "pico-sdk"; - version = "1.4.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "raspberrypi"; repo = pname; rev = version; - sha256 = "sha256-i3IAaNcd0EfKNvU104a776O1poDAChlx1m+nP8iFn8E="; + sha256 = "sha256-p69go8KXQR21szPb+R1xuonyFj+ZJDunNeoU7M3zIsE="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/python-modules/asf-search/default.nix b/pkgs/development/python-modules/asf-search/default.nix index b0d2b1f72386..686a9e92cebf 100644 --- a/pkgs/development/python-modules/asf-search/default.nix +++ b/pkgs/development/python-modules/asf-search/default.nix @@ -1,17 +1,19 @@ { lib , buildPythonPackage -, dateparser , fetchFromGitHub +, pythonOlder +, requests +, shapely +, python-dateutil +, pytz , importlib-metadata , numpy +, dateparser +, jinja2 +, remotezip , pytestCheckHook -, python-dateutil -, pythonOlder -, pytz -, requests , requests-mock -, shapely -, wktutils +, defusedxml }: buildPythonPackage rec { @@ -29,25 +31,25 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ - dateparser - importlib-metadata - numpy - python-dateutil - pytz requests shapely - wktutils + python-dateutil + pytz + importlib-metadata + numpy + dateparser + jinja2 + remotezip ]; nativeCheckInputs = [ pytestCheckHook - requests-mock ]; - postPatch = '' - substituteInPlace setup.py \ - --replace "WKTUtils==" "WKTUtils>=" - ''; + checkInputs = [ + requests-mock + defusedxml + ]; pythonImportsCheck = [ "asf_search" diff --git a/pkgs/development/python-modules/awswrangler/default.nix b/pkgs/development/python-modules/awswrangler/default.nix index 54de986d4c35..f1b937f3ecdc 100644 --- a/pkgs/development/python-modules/awswrangler/default.nix +++ b/pkgs/development/python-modules/awswrangler/default.nix @@ -1,5 +1,5 @@ { backoff -, SPARQLWrapper +, sparqlwrapper , boto3 , buildPythonPackage , fetchFromGitHub @@ -75,7 +75,7 @@ buildPythonPackage rec { passthru.optional-dependencies = { sqlserver = [ pyodbc ]; - sparql = [ SPARQLWrapper ]; + sparql = [ sparqlwrapper ]; }; meta = { diff --git a/pkgs/development/python-modules/fiona/default.nix b/pkgs/development/python-modules/fiona/default.nix index fec7fac990cd..3e9430ef318b 100644 --- a/pkgs/development/python-modules/fiona/default.nix +++ b/pkgs/development/python-modules/fiona/default.nix @@ -1,29 +1,46 @@ -{ stdenv, lib, buildPythonPackage, fetchPypi, isPy3k, pythonOlder, cython -, attrs, click, cligj, click-plugins, six, munch, enum34 -, pytestCheckHook, boto3, mock, giflib, pytz -, gdal, certifi +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, cython +, gdal +, setuptools +, attrs +, certifi +, click +, click-plugins +, cligj +, munch +, shapely +, boto3 +, pytestCheckHook +, pytz }: buildPythonPackage rec { pname = "fiona"; - version = "1.9.0"; + version = "1.9.1"; - src = fetchPypi { - pname = "Fiona"; - inherit version; - hash = "sha256-bkh8v7pahJ+98G5FFp/X4fFmL0Tz1xerS5RgRrJFfq4="; + disabled = pythonOlder "3.7"; + + format = "pyproject"; + + src = fetchFromGitHub { + owner = "Toblerity"; + repo = "Fiona"; + rev = "refs/tags/${version}"; + hash = "sha256-2CGLkgnpCAh9G+ILol5tmRj9S6/XeKk8eLzGEODiyP8="; }; - CXXFLAGS = lib.optionalString stdenv.cc.isClang "-std=c++11"; - nativeBuildInputs = [ cython gdal # for gdal-config + setuptools ]; buildInputs = [ gdal - ] ++ lib.optionals stdenv.cc.isClang [ giflib ]; + ]; propagatedBuildInputs = [ attrs @@ -31,32 +48,33 @@ buildPythonPackage rec { click cligj click-plugins - six munch - pytz - ] ++ lib.optional (!isPy3k) enum34; + setuptools + ]; + + passthru.optional-dependencies = { + calc = [ shapely ]; + s3 = [ boto3 ]; + }; nativeCheckInputs = [ pytestCheckHook - boto3 - ] ++ lib.optional (pythonOlder "3.4") mock; + pytz + ] ++ passthru.optional-dependencies.s3; preCheck = '' rm -r fiona # prevent importing local fiona - # disable gdal deprecation warnings - export GDAL_ENABLE_DEPRECATED_DRIVER_GTM=YES ''; disabledTests = [ # Some tests access network, others test packaging "http" "https" "wheel" - # https://github.com/Toblerity/Fiona/issues/1164 - "test_no_append_driver_cannot_append" ]; pythonImportsCheck = [ "fiona" ]; meta = with lib; { + changelog = "https://github.com/Toblerity/Fiona/blob/${src.rev}/CHANGES.txt"; description = "OGR's neat, nimble, no-nonsense API for Python"; homepage = "https://fiona.readthedocs.io/"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/pyweatherflowrest/default.nix b/pkgs/development/python-modules/pyweatherflowrest/default.nix index b1384496325b..c03a4d01b170 100644 --- a/pkgs/development/python-modules/pyweatherflowrest/default.nix +++ b/pkgs/development/python-modules/pyweatherflowrest/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "pyweatherflowrest"; - version = "1.0.8"; + version = "1.0.9"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -16,8 +16,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "briis"; repo = pname; - rev = "v${version}"; - sha256 = "1swyqdnvhwaigqhjn5a22gi8if4bl8alfrigln4qa0jl9z03kg09"; + rev = "refs/tags/v${version}"; + hash = "sha256-LFA1GJCYFIWl7/YblRrYgAB4lbELpzhCJyjB8aCkJ/E="; }; nativeBuildInputs = [ @@ -44,6 +44,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module to get data from WeatherFlow Weather Stations"; homepage = "https://github.com/briis/pyweatherflowrest"; + changelog = "https://github.com/briis/pyweatherflowrest/blob/v${version}/CHANGELOG.md"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/remotezip/default.nix b/pkgs/development/python-modules/remotezip/default.nix new file mode 100644 index 000000000000..5a79b68e6b85 --- /dev/null +++ b/pkgs/development/python-modules/remotezip/default.nix @@ -0,0 +1,47 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, requests +, tabulate +, pytestCheckHook +, requests-mock +}: + +buildPythonPackage { + pname = "remotezip"; + version = "0.12.1"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "gtsystem"; + repo = "python-remotezip"; + # upstream does not tag releases, determined with git blame + # pypi archive lacks files for tests + rev = "da62e115bdb2071ad08a8c91f7ae48f2c1827e0c"; + hash = "sha256-su4dlV8KZuewf/yGdTnGHK9hNLHwGe10ditmFcne4Us="; + }; + + propagatedBuildInputs = [ + requests + tabulate + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + checkInputs = [ + requests-mock + ]; + + pythonImportsCheck = [ + "remotezip" + ]; + + meta = with lib; { + description = "Python module to access single members of a zip archive without downloading the full content"; + homepage = "https://github.com/gtsystem/python-remotezip"; + license = licenses.mit; + maintainers = with maintainers; [ nickcao ]; + }; +} diff --git a/pkgs/development/tools/analysis/tflint/default.nix b/pkgs/development/tools/analysis/tflint/default.nix index bb3d37f4f876..df6a7976de3e 100644 --- a/pkgs/development/tools/analysis/tflint/default.nix +++ b/pkgs/development/tools/analysis/tflint/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "tflint"; - version = "0.44.1"; + version = "0.45.0"; src = fetchFromGitHub { owner = "terraform-linters"; repo = pname; rev = "v${version}"; - sha256 = "sha256-O758CU70NqRFlbtiy5cmfIHiHdQLxH88BHNZLQVvZ+M="; + sha256 = "sha256-tsnW6KoLHEWd/uDZrK2cnVZ2IWftoxZ5zGdYhRdUp9Q="; }; - vendorSha256 = "sha256-4ODf6Er7V5KsVUdWjqjv+dfH84PPR+5T29V1AJluoJA="; + vendorSha256 = "sha256-crGs7j9hAnGCCFjhigIJVpTM0rr9WgvBq3/ZGt6hwqQ="; doCheck = false; diff --git a/pkgs/development/tools/coder/default.nix b/pkgs/development/tools/coder/default.nix index 30d22bc183dc..e5f017de1e1e 100644 --- a/pkgs/development/tools/coder/default.nix +++ b/pkgs/development/tools/coder/default.nix @@ -5,19 +5,19 @@ }: buildGoModule rec { pname = "coder"; - version = "0.16.0"; + version = "0.17.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-3rGpyJzGkZYUEvKKDzj2I5sqrUImmmX7cXWM9UClPLY="; + hash = "sha256-FHBaefwSGZXwn1jdU7zK8WhwjarknvyeUJTlhmk/hPM="; }; # integration tests require network access doCheck = false; - vendorHash = "sha256-bb9jBno7elO6qKGjacpX3rxgrpJpGpTxMQtdBYjBzMk="; + vendorHash = "sha256-+AvmJkZCFovE2+5Lg98tUvA7f2kBHUMzhl5IyrEGuy8="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/tools/continuous-integration/fly/default.nix b/pkgs/development/tools/continuous-integration/fly/default.nix index 20ba407e3d03..fbdcbcde7c45 100644 --- a/pkgs/development/tools/continuous-integration/fly/default.nix +++ b/pkgs/development/tools/continuous-integration/fly/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "fly"; - version = "7.9.0"; + version = "7.9.1"; src = fetchFromGitHub { owner = "concourse"; repo = "concourse"; rev = "v${version}"; - sha256 = "sha256-YatN0VG3oEUK+vzJzthRnX+EkvUgKq2uIunAoPMoRag="; + sha256 = "sha256-ySyarky92+VSo/KzQFrWeh35KDMTQDV34F5iFrARHJs="; }; - vendorSha256 = "sha256-nX0r/7V+rgJb3/9O91QskYzBpWXIca7m3Do1QtGuHgg="; + vendorHash = "sha256-Oy1wP82ZhdpGHs/gpfdveOK/jI9yuo0D3JtxjLg+W/w="; subPackages = [ "fly" ]; diff --git a/pkgs/development/tools/gci/default.nix b/pkgs/development/tools/gci/default.nix index 170b9c41dc9f..0dfd153e2199 100644 --- a/pkgs/development/tools/gci/default.nix +++ b/pkgs/development/tools/gci/default.nix @@ -5,16 +5,16 @@ }: buildGoModule rec { pname = "gci"; - version = "0.9.0"; + version = "0.9.1"; src = fetchFromGitHub { owner = "daixiang0"; repo = pname; rev = "v${version}"; - sha256 = "sha256-qWEEcIbTgYmGVnnTW+hM8e8nw5VLWN1TwzdUIZrxF3s="; + sha256 = "sha256-VbN4lRK+6stOApMEdtX32JhKGkCSrafMJbizpWmHRXA="; }; - vendorSha256 = "sha256-dlt+i/pEP3RzW4JwndKTU7my2Nn7/2rLFlk8n1sFR60="; + vendorHash = "sha256-dlt+i/pEP3RzW4JwndKTU7my2Nn7/2rLFlk8n1sFR60="; meta = with lib; { description = "Controls golang package import order and makes it always deterministic"; diff --git a/pkgs/development/tools/kustomize/kustomize-sops.nix b/pkgs/development/tools/kustomize/kustomize-sops.nix index 28c80444650d..6136c5b6cb22 100644 --- a/pkgs/development/tools/kustomize/kustomize-sops.nix +++ b/pkgs/development/tools/kustomize/kustomize-sops.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kustomize-sops"; - version = "4.0.0"; + version = "4.1.0"; src = fetchFromGitHub { owner = "viaduct-ai"; repo = pname; rev = "v${version}"; - sha256 = "sha256-8CZcPZLainc7iRZ5Ul27QxW3oK7sikCjzCBEkfCeNUc="; + sha256 = "sha256-piCsae2B+FC+wi/vCCtPY76O4eMXJeNufFo31QkHCAU="; }; - vendorHash = "sha256-GBjMN6pyB+48e5LNqLBbh6a5fC9P0T53CZUPGNcbBDc="; + vendorHash = "sha256-vTP2wM7MqiSfP+3Gd0Ab5t0al5xL8rw3kl7bOT19zU4="; installPhase = '' mkdir -p $out/lib/viaduct.ai/v1/ksops-exec/ diff --git a/pkgs/development/tools/picotool/default.nix b/pkgs/development/tools/picotool/default.nix index f76e0287b564..ecd80d626049 100644 --- a/pkgs/development/tools/picotool/default.nix +++ b/pkgs/development/tools/picotool/default.nix @@ -2,25 +2,19 @@ stdenv.mkDerivation rec { pname = "picotool"; - version = "1.1.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "raspberrypi"; repo = pname; rev = version; - sha256 = "sha256-YjDHoRcDoezyli42bJ0bnfjdNNY8l6ZilrxhOudqvwE="; + sha256 = "sha256-KP5Cq6pYKQI5dV6S4lLapu9EcwAgLgYpK0qreNDZink="; }; buildInputs = [ libusb1 pico-sdk ]; nativeBuildInputs = [ cmake pkg-config ]; cmakeFlags = [ "-DPICO_SDK_PATH=${pico-sdk}/lib/pico-sdk" ]; - installPhase = '' - runHook preInstall - install -Dm755 ./picotool -t $out/bin - runHook postInstall - ''; - meta = with lib; { homepage = "https://github.com/raspberrypi/picotool"; description = "Tool for interacting with a RP2040 device in BOOTSEL mode, or with a RP2040 binary"; diff --git a/pkgs/os-specific/darwin/xcode/default.nix b/pkgs/os-specific/darwin/xcode/default.nix index 6d1929ef982c..ec98a0b1cfb6 100644 --- a/pkgs/os-specific/darwin/xcode/default.nix +++ b/pkgs/os-specific/darwin/xcode/default.nix @@ -41,31 +41,44 @@ let requireXcode = version: sha256: in app.overrideAttrs ( oldAttrs: oldAttrs // { inherit meta; }); in lib.makeExtensible (self: { - xcode_8_1 = requireXcode "8.1" "18xjvfipwzia66gm3r9p770xdd4r375vak7chw5vgqnv9yyjiq2n"; - xcode_8_2 = requireXcode "8.2" "13nd1zsfqcp9hwp15hndr0rsbb8rgprrz7zr2ablj4697qca06m2"; - xcode_9_1 = requireXcode "9.1" "0ab1403wy84ys3yn26fj78cazhpnslmh3nzzp1wxib3mr1afjvic"; - xcode_9_2 = requireXcode "9.2" "1bgfgdp266cbbqf2axcflz92frzvhi0qw0jdkcw6r85kdpc8dj4c"; - xcode_9_3 = requireXcode "9.3" "12m9kb4759s2ky42b1vf7y38qqxn2j99s99adzc6ljnmy26ii12w"; - xcode_9_4 = requireXcode "9.4" "00az1cf9pm8zmvzs6yq04prdmxp8xi3ymxw94jjh4mh7hlbkhcb7"; - xcode_9_4_1 = requireXcode "9.4.1" "0y9kphj86c14jl6aibv57sd7ln0w06vdhzm8ysp0s98rfgyq2lbw"; - xcode_10_1 = requireXcode "10.1" "1ssdbg4v8r11fjf4jl38pwyry2aia1qihbxyxapz0v0n5gfnp05v"; - xcode_10_2 = requireXcode "10.2" "1xzybl1gvb3q5qwlwchanzpws4sb70i3plf0vrzvlfdp2hsb3pg7"; - xcode_10_2_1 = requireXcode "10.2.1" "11sdb54nr0x7kp987qq839x6k5gdx7vqdxjiy5xm5279n1n47bmg"; - xcode_10_3 = requireXcode "10.3" "1i628vfn6zad81fsz3zpc6z15chhskvyp8qnajp2wnpzvrwl6ngb"; - xcode_11 = requireXcode "11" "1r03j3kkp4blfp2kqpn538w3dx57ms930fj8apjkq6dk7fv3jcqh"; - xcode_11_1 = requireXcode "11.1" "1c2gzc4jhhx5a7ncg19sh1r99izhipybaqxl1ll52x5y8689awc1"; - xcode_11_2 = requireXcode "11.2" "1lm3q8zpvm184246h5j9mw4c1y9kk9sxnr3j98kfm0312n0l98gj"; - xcode_11_3 = requireXcode "11.3" "04rv6xlywy8xqfx9ma8ygsdw4yhckk2mq0qnklxnfly899iw4wza"; - xcode_11_3_1 = requireXcode "11.3.1" "1p6nicj91kr6ad3rmycahd1i7z4hj7ccjs93ixsiximjzaahx3q4"; - xcode_11_4 = requireXcode "11.4" "065rpb3rdk19nv3rwyf9bk32ccbd0lld12gj12l89cyg65mhpyy7"; - xcode_11_5 = requireXcode "11.5" "1dizazq9nz1vjkc5gy7dd4x760mkfjiifk1hf6d9mscchdq8rfkw"; - xcode_11_6 = requireXcode "11.6" "1y4fhw1kiphzxdb4wpv697z5r0algvaldwq5iqv266797rnfql4x"; - xcode_11_7 = requireXcode "11.7" "0422rdc4j5qwyk59anbybxyfv0p26x0xryszm0wd8i44g66smlmj"; - xcode_12 = requireXcode "12" "1w3xm268pyn5m04wv22invd5kr2k4jqllgrzapv6n1sxxynxrh8z"; - xcode_12_0_1 = requireXcode "12.0.1" "1p6vd5ai0hh3cq6aflh4h21ar0shxnz8wlkaxwq7liwsdmkwzbl0"; - xcode_12_1 = requireXcode "12.1" "1widy74dk43wx8iqgd7arzf6q4kzdmaz8pfwymzs8chnq9dqr3wp"; - xcode_12_2 = requireXcode "12.2" "17i0wf4pwrxwfgjw7rpw9mcd59nkmys1k5h2rqsw81snzyxy9j0v"; - xcode_12_3 = requireXcode "12.3" "0kwf1y4llysf1p0nsbqyzccn7d77my0ldagr5fi3by4k0xy3d189"; + xcode_8_1 = requireXcode "8.1" "sha256-VuAovU/b4rcLh+xMtcsZmbTWwTk35VGfMSp+fqPbsqM="; + xcode_8_2 = requireXcode "8.2" "sha256-ohqgGD7JEEmXEvmfn/N9Ga2lM8jNwhIuh+ky7PQPzY4="; + xcode_9_1 = requireXcode "9.1" "sha256-LG7pVMh1rNh5uP/bASvV9sKvGDrSGWH90J4gzwcgYSk="; + xcode_9_2 = requireXcode "9.2" "sha256-jMiG2G2zoGw4m00CjkGE+2cn0qeOdSUcXosZI2577q0="; + xcode_9_3 = requireXcode "9.3" "sha256-XIQYjfDVSmrYbyolnZIUtmOMhj9uhyWIn0KncsiaqYo="; + xcode_9_4 = requireXcode "9.4" "sha256-ZzE4F4UHVgKlJIn36kfs6Pba8iUAe6P/rh/VmxwLXwE="; + xcode_9_4_1 = requireXcode "9.4.1" "sha256-fFGB/XMZJQ2u9qh+2LYBHFh6mj5lr6gMlSQwgyS8M3k="; + xcode_10_1 = requireXcode "10.1" "sha256-u4Br3SsWbPCv6r4vGHFQUQmfPb9oUEmcdCFktMlbTes="; + xcode_10_2 = requireXcode "10.2" "sha256-592xNBS3Obp/3sDROyI4SxPN77cKMk45Lnis/QJd/vc="; + xcode_10_2_1 = requireXcode "10.2.1" "sha256-r65DbLDpiFJ78VH2hvfp7ZVpehoI44PSnaeDbElZTYc="; + xcode_10_3 = requireXcode "10.3" "sha256-61lDed7/Wi6uVBaj6/fUELISvmH3j69dQE19Y91GwsQ="; + xcode_11 = requireXcode "11" "sha256-EDM5tjuzGTzlVUg6MJKup/Q2OBrFXjzFdXSRO+eQA+Q="; + xcode_11_1 = requireXcode "11.1" "sha256-gXGVkEG+dFEoDbRjtfyN8MeUcoA6hcfsUaVDKAn7T7A="; + xcode_11_2 = requireXcode "11.2" "sha256-8qFEgRVhgOomSnJk23WaM/nACK9JFmiIICjUfT/Co9I="; + xcode_11_3 = requireXcode "11.3" "sha256-6nPCY0rIU2c7nRYDXMWcDHrCm34eqZq6wx157mk3OxM="; + xcode_11_3_1 = requireXcode "11.3.1" "sha256-BI8Olfqyxh51jyNpydiRkPwTQ4OK+ZpHUybPkCSL1tw="; + xcode_11_4 = requireXcode "11.4" "sha256-x/sLazHPs4SoCPKJ0CgFbTEmxlzJeZ7HtinMlse6uRg="; + xcode_11_5 = requireXcode "11.5" "sha256-fLqMcIOM6ZqacTBMF6N0swJzOmnt+FfYlDt8m/BXP7Y="; + xcode_11_6 = requireXcode "11.6" "sha256-nVDsbD7pGCM2jgXzRtV+VIFc/klmX05W6x/eOAOHjvg="; + xcode_11_7 = requireXcode "11.7" "sha256-stKqjXmERNQ4qF/73EE34oLtfF9+WZXK9BwXSVjLQhA="; + xcode_12 = requireXcode "12" "sha256-H8Hcre9dB2v2VT8/SrEkU+RZ2rZRiM0JqMX6i4yoffA="; + xcode_12_0_1 = requireXcode "12.0.1" "sha256-gK7PZ22aR3ow72pSjr7tUIOsgoAEUqcMZgNCEFVp29w="; + xcode_12_1 = requireXcode "12.1" "sha256-l4+MW8IWMqR/9dxd9FVtfxJs3M/qtIcj6nyQ2cjxLfI="; + xcode_12_2 = requireXcode "12.2" "sha256-G8jku/9WB8Q1zgKWGbSv06bSWE385sPlc7xnfonjIJ4="; + xcode_12_3 = requireXcode "12.3" "sha256-CYU2fAeT+DWiK/mpRoGv57RjGfseL23BDU57SokPjk8="; + xcode_12_4 = requireXcode "12.4" "sha256-Qw4j+XFry85/AviHQVhjjjKLAfmRNNwMGN5G8FheJwQ="; + xcode_12_5 = requireXcode "12.5" "sha256-xiGffnV0P9Ojd6IrJSXILUX4oznPif7zm00WAksn3qU="; + xcode_12_5_1 = requireXcode "12.5.1" "sha256-zL0kS86ZzBkIrKLPKvWguDvXj9Tqbr7uR/VZaT/uZ9A="; + xcode_13 = requireXcode "13" "sha256-uTY6d5DBu4OOQLkxs3ExDfLXh50rE2LLlqtCbk3Qn6E="; + xcode_13_1 = requireXcode "13.1" "sha256-vd+4eFVaAyvXsdaExcfbDZSXOwkpt+rEbkBYSMjdUEA="; + xcode_13_2 = requireXcode "13.2" "sha256-guJXm/QnMfvUZwAcJwoy0QeO+DpDcUhs8AxVKvm9tYQ="; + xcode_13_2_1 = requireXcode "13.2.1" "sha256-r832Uu+Q8utK4zN0CtwiMCvMYT5HstWInyq4cNIaZJM="; + xcode_13_3 = requireXcode "13.3" "sha256-p2zaWMpmUeNHQtYOOaVdhCt3cgapvzL3l73/J+UwzCE="; + xcode_13_3_1 = requireXcode "13.3.1" "sha256-j71vpJVJpyj/IOlL+4+5lYgOlhf/zn+7ExIHbxL51cQ="; + xcode_13_4 = requireXcode "13.4" "sha256-IY1coss90GlBeJg/HQPMU8v2rOOxsqlY5q+2Qxe8nnY="; + xcode_13_4_1 = requireXcode "13.4.1" "sha256-Jk8fLgvnODoIhuVJqfV0KrpBBL40fRrHJbFmm44NRKE="; + xcode_14 = requireXcode "14" "sha256-E+wjPgQx/lbYAsauksdmGsygL5VPBA8R9pHB93eA7T0="; + xcode_14_1 = requireXcode "14.1" "sha256-QJGAUVIhuDYyzDNttBPv5lIGOfvkYqdOFSUAr5tlkfs="; xcode = self."xcode_${lib.replaceStrings ["."] ["_"] (if (stdenv.targetPlatform ? xcodeVer) then stdenv.targetPlatform.xcodeVer else "12.3")}"; }) diff --git a/pkgs/servers/gemini/molly-brown/default.nix b/pkgs/servers/gemini/molly-brown/default.nix index 354412a4b73f..351f54f21d49 100644 --- a/pkgs/servers/gemini/molly-brown/default.nix +++ b/pkgs/servers/gemini/molly-brown/default.nix @@ -1,19 +1,18 @@ -{ lib, buildGoPackage, fetchgit, nixosTests }: +{ lib, buildGoModule, fetchgit, nixosTests }: -buildGoPackage rec { +buildGoModule rec { pname = "molly-brown"; - version = "unstable-2020-08-19"; - rev = "48f9a206c03c0470e1c132b9667c6daa3583dada"; - - goPackagePath = "tildegit.org/solderpunk/molly-brown"; + version = "unstable-2023-02-10"; src = fetchgit { - inherit rev; url = "https://tildegit.org/solderpunk/molly-brown.git"; - sha256 = "1w79a25mbgav95p78fkdm9j62chwwpkqv0m2wmh5my03yq398gya"; + rev = "56d8dde14abc90b784b7844602f12100af9756e0"; + hash = "sha256-kfopRyCrDaiVjKYseyWacIT9MJ8PzB8LAs6YMgYqCrs="; }; - goDeps = ./deps.nix; + vendorHash = "sha256-czfHnXS9tf5vQQNXhWH7DStmhsorSc4Di/yZuv4LHRk="; + + ldflags = [ "-s" "-w" ]; passthru.tests.basic = nixosTests.molly-brown; diff --git a/pkgs/servers/gemini/molly-brown/deps.nix b/pkgs/servers/gemini/molly-brown/deps.nix deleted file mode 100644 index 95427e8f7907..000000000000 --- a/pkgs/servers/gemini/molly-brown/deps.nix +++ /dev/null @@ -1,12 +0,0 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.3.0 -[ - { - goPackagePath = "github.com/BurntSushi/toml"; - fetch = { - type = "git"; - url = "https://github.com/BurntSushi/toml"; - rev = "3012a1dbe2e4bd1391d42b32f0577cb7bbc7f005"; - sha256 = "1fjdwwfzyzllgiwydknf1pwjvy49qxfsczqx5gz3y0izs7as99j6"; - }; - } -] diff --git a/pkgs/servers/pounce/default.nix b/pkgs/servers/pounce/default.nix index e03d6e6827a1..7ad43825b151 100644 --- a/pkgs/servers/pounce/default.nix +++ b/pkgs/servers/pounce/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "pounce"; - version = "3.0"; + version = "3.1"; src = fetchzip { url = "https://git.causal.agency/pounce/snapshot/pounce-${version}.tar.gz"; - sha256 = "17vmbfr7ika6kmq9jqa3rpd4cr71arapav7hlmggnj7a9yw5b9mg"; + sha256 = "sha256-6PGiaU5sOwqO4V2PKJgIi3kI2jXsBOldEH51D7Sx9tg="; }; buildInputs = [ libressl libxcrypt ]; diff --git a/pkgs/tools/filesystems/httm/default.nix b/pkgs/tools/filesystems/httm/default.nix index 5a917602c43b..e1edac0c6104 100644 --- a/pkgs/tools/filesystems/httm/default.nix +++ b/pkgs/tools/filesystems/httm/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "httm"; - version = "0.20.5"; + version = "0.21.1"; src = fetchFromGitHub { owner = "kimono-koans"; repo = pname; rev = version; - sha256 = "sha256-8SizRNjA+lvp8ZD14SoRcymhYmJXlwoeZQjrekIbdL4="; + sha256 = "sha256-uSCFm6aWNPFPcja+KB6TU7iVVYkDdD82pFjA9dOpSs8="; }; - cargoHash = "sha256-tXV1G0qWN0jLOKlnZfHHlOZw+wUItLzQtSg4o2f96u0="; + cargoHash = "sha256-uxtZ+aUUhfWGCLysOcWi5En1eRui8Ja+nyD3S2WEWQM="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/misc/steampipe/default.nix b/pkgs/tools/misc/steampipe/default.nix index 7ef202202c19..6d9ff83d75ff 100644 --- a/pkgs/tools/misc/steampipe/default.nix +++ b/pkgs/tools/misc/steampipe/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "steampipe"; - version = "0.18.4"; + version = "0.18.5"; src = fetchFromGitHub { owner = "turbot"; repo = "steampipe"; rev = "v${version}"; - sha256 = "sha256-sCnKnBxZuueH8XgXPqCLrJvS4zUbraz3mZr/2Xn+7YU="; + sha256 = "sha256-Y/Nn2jAkz135HxRNpeotoPRvyexG9QgtvIcTdXsj034="; }; vendorHash = "sha256-W30f7QYgm+QyLDJICpjMn7mtUIziTR1igThEbv+Aa7M="; diff --git a/pkgs/tools/networking/frp/default.nix b/pkgs/tools/networking/frp/default.nix index 4d6c54564bb2..030de9840fe3 100644 --- a/pkgs/tools/networking/frp/default.nix +++ b/pkgs/tools/networking/frp/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "frp"; - version = "0.46.1"; + version = "0.47.0"; src = fetchFromGitHub { owner = "fatedier"; repo = pname; rev = "v${version}"; - sha256 = "sha256-/itziNmIDIuj3sKpB+SEiiwvJqdH5nmTkpFdMSY5L0g="; + sha256 = "sha256-S2qccDzS+Kj1tEAUR4a0G/4Eu3DAF7lY7ffxU6aykVU="; }; - vendorHash = "sha256-dU9rhYgYgP1qTPR3ykUgyg+B1bBVJwizWooyCpdpnm0="; + vendorHash = "sha256-ffkXNE3LkgdCGfO6K9lGxEMxT/9Q1o0m3BMtu6tDHdk="; doCheck = false; diff --git a/pkgs/tools/networking/grpc_cli/default.nix b/pkgs/tools/networking/grpc_cli/default.nix new file mode 100644 index 000000000000..b68ff100b70b --- /dev/null +++ b/pkgs/tools/networking/grpc_cli/default.nix @@ -0,0 +1,31 @@ +{ lib, stdenv, fetchFromGitHub, automake, cmake, autoconf, curl, numactl }: + +stdenv.mkDerivation rec { + pname = "grpc_cli"; + version = "1.46.6"; + src = fetchFromGitHub { + owner = "grpc"; + repo = "grpc"; + rev = "v${version}"; + hash = "sha256-UPenQh6+FBryQiOoeijsXkCZjlMzYljkg2aUtSFJFL4="; + fetchSubmodules = true; + }; + nativeBuildInputs = [ automake cmake autoconf ]; + buildInputs = [ curl numactl ]; + cmakeFlags = [ "-DgRPC_BUILD_TESTS=ON" ]; + makeFlags = [ "grpc_cli" ]; + installPhase = '' + runHook preInstall + + install -Dm555 grpc_cli "$out/bin/grpc_cli" + + runHook postInstall + ''; + meta = with lib; { + description = "The command line tool for interacting with grpc services."; + homepage = "https://github.com/grpc/grpc"; + license = licenses.asl20; + maintainers = with maintainers; [ doriath ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/tools/system/ddrescue/default.nix b/pkgs/tools/system/ddrescue/default.nix index 829d249da5b0..d18225a93b9b 100644 --- a/pkgs/tools/system/ddrescue/default.nix +++ b/pkgs/tools/system/ddrescue/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "ddrescue"; - version = "1.26"; + version = "1.27"; src = fetchurl { url = "mirror://gnu/ddrescue/ddrescue-${version}.tar.lz"; - sha256 = "sha256-5RPNOpDZgQ392RGX1AqkD23wFZe/tez9+yBd4RJ8VR8="; + sha256 = "sha256-OMgMmMWkTxXlNmPkUQCX/WjW7CB1jv3zqSUDfBgyMus="; }; nativeBuildInputs = [ lzip ]; diff --git a/pkgs/tools/system/kanata/default.nix b/pkgs/tools/system/kanata/default.nix index 2ef4d13c366b..d9b1bc06b205 100644 --- a/pkgs/tools/system/kanata/default.nix +++ b/pkgs/tools/system/kanata/default.nix @@ -1,4 +1,5 @@ { fetchFromGitHub +, fetchpatch , lib , rustPlatform , withCmd ? false @@ -6,16 +7,24 @@ rustPlatform.buildRustPackage rec { pname = "kanata"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "jtroo"; repo = pname; rev = "v${version}"; - sha256 = "sha256-/v3P5C0F/FVPJqJ38dzSnAc7ua2fOs3BeX9BDoQ8bDw="; + sha256 = "sha256-mQSbsJ+3mKoDMg0ewwR7UvXUq+5WA9aTPKWCaTz8nDE="; }; - cargoHash = "sha256-KXsW0fgbBy0tf/He0vH9Xq8yGuz77H/jeIabgw3ppy8="; + cargoHash = "sha256-Pu96OGfnXNaIse/IcwFJWxGMlKOVhZ6DtvgXJkHh+Ao="; + + cargoPatches = [ + (fetchpatch { + name = "serialize-cfg-parsing-tests-for-1.2.0.patch"; + url = "https://github.com/jtroo/kanata/commit/9ef1e80fbcb40402262e08bd9196d000f73f686d.patch"; + hash = "sha256-/FhyaYx4usDjGoVfRktf9dtwjY4oXdMQKqxLz00/NPY="; + }) + ]; buildFeatures = lib.optional withCmd "cmd"; diff --git a/pkgs/tools/text/dos2unix/default.nix b/pkgs/tools/text/dos2unix/default.nix index 6a0c5fc57ee9..c6c92b876ffa 100644 --- a/pkgs/tools/text/dos2unix/default.nix +++ b/pkgs/tools/text/dos2unix/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "dos2unix"; - version = "7.4.3"; + version = "7.4.4"; src = fetchurl { url = "https://waterlan.home.xs4all.nl/dos2unix/${pname}-${version}.tar.gz"; - sha256 = "sha256-to20GVba+TOChCOqMFEOAMEtKe9ZFucV6NTmlP5mynI="; + sha256 = "sha256-KKhB2wvVgn1kXKup2AFeOnGYPcbjmAcLUofuE3rkQ24="; }; nativeBuildInputs = [ perl gettext ]; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 736f5faebb3c..e37d309a2146 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -380,6 +380,7 @@ mapAliases ({ docker_compose = throw "'docker_compose' has been renamed to/replaced by 'docker-compose'"; # Converted to throw 2022-02-22 docker-compose_2 = throw "'docker-compose_2' has been renamed to 'docker-compose'"; # Added 2022-06-05 docker-edge = throw "'docker-edge' has been removed, it was an alias for 'docker'"; # Added 2022-06-05 + dolphin-emu-beta = dolphin-emu; # Added 2023-02-11 dolphinEmu = dolphin-emu; # Added 2021-11-10 dolphinEmuMaster = dolphin-emu-beta; # Added 2021-11-10 dot-http = throw "'dot-http' has been removed: abandoned by upstream. Use hurl instead."; # Added 2023-01-16 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 35f09fabd814..cacecc25fd66 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2278,9 +2278,7 @@ with pkgs; ### APPLICATIONS/EMULATORS/DOLPHIN-EMU - dolphin-emu = callPackage ../applications/emulators/dolphin-emu { }; - - dolphin-emu-beta = qt6Packages.callPackage ../applications/emulators/dolphin-emu/master.nix { + dolphin-emu = qt6Packages.callPackage ../applications/emulators/dolphin-emu { inherit (darwin.apple_sdk_11_0.frameworks) CoreBluetooth ForceFeedback IOKit OpenGL VideoToolbox; inherit (darwin) moltenvk; stdenv = @@ -7733,6 +7731,8 @@ with pkgs; gnucap = callPackage ../applications/science/electronics/gnucap { }; + gnu-cim = callPackage ../development/compilers/gnu-cim { }; + gnu-cobol = callPackage ../development/compilers/gnu-cobol { }; gnuclad = callPackage ../applications/graphics/gnuclad { }; @@ -7941,6 +7941,8 @@ with pkgs; grpcurl = callPackage ../tools/networking/grpcurl { }; + grpc_cli = callPackage ../tools/networking/grpc_cli { }; + grpc-gateway = callPackage ../development/tools/grpc-gateway { }; grpcui = callPackage ../tools/networking/grpcui { }; @@ -32098,9 +32100,7 @@ with pkgs; pavucontrol = callPackage ../applications/audio/pavucontrol { }; - paraview = libsForQt5.callPackage ../applications/graphics/paraview { - python3 = python39; - }; + paraview = libsForQt5.callPackage ../applications/graphics/paraview { }; parlatype = callPackage ../applications/audio/parlatype { }; diff --git a/pkgs/top-level/darwin-packages.nix b/pkgs/top-level/darwin-packages.nix index b067f5cbbc1e..f9aa50a01d71 100644 --- a/pkgs/top-level/darwin-packages.nix +++ b/pkgs/top-level/darwin-packages.nix @@ -182,9 +182,12 @@ impure-cmds // appleSourcePackages // chooseLibs // { inherit (pkgs.callPackages ../os-specific/darwin/xcode { }) xcode_8_1 xcode_8_2 - xcode_9_1 xcode_9_2 xcode_9_4 xcode_9_4_1 - xcode_10_2 xcode_10_2_1 xcode_10_3 - xcode_11 + xcode_9_1 xcode_9_2 xcode_9_3 xcode_9_4 xcode_9_4_1 + xcode_10_1 xcode_10_2 xcode_10_2_1 xcode_10_3 + xcode_11 xcode_11_1 xcode_11_2 xcode_11_3_1 xcode_11_4 xcode_11_5 xcode_11_6 xcode_11_7 + xcode_12 xcode_12_0_1 xcode_12_1 xcode_12_2 xcode_12_3 xcode_12_4 xcode_12_5 xcode_12_5_1 + xcode_13 xcode_13_1 xcode_13_2 xcode_13_3 xcode_13_3_1 xcode_13_4 xcode_13_4_1 + xcode_14 xcode_14_1 xcode; CoreSymbolication = callPackage ../os-specific/darwin/CoreSymbolication { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0b17b2bd163a..b5f87726d81e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9945,6 +9945,8 @@ self: super: with self; { remote-pdb = callPackage ../development/python-modules/remote-pdb { }; + remotezip = callPackage ../development/python-modules/remotezip { }; + renault-api = callPackage ../development/python-modules/renault-api { }; rencode = callPackage ../development/python-modules/rencode { };