diff options
100 files changed, 1603 insertions, 1176 deletions
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 557542772cf7c..b9f69a6ce7b80 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -48,6 +48,7 @@ /pkgs/build-support/writers @lassulus @Profpatsch # Nixpkgs documentation +/doc @fricklerhandwerk /maintainers/scripts/db-to-md.sh @jtojnar @ryantm /maintainers/scripts/doc @jtojnar @ryantm /doc/build-aux/pandoc-filters @jtojnar @@ -256,8 +257,8 @@ /pkgs/development/go-packages @kalbasit @Mic92 @zowoq # GNOME -/pkgs/desktops/gnome @jtojnar @hedning -/pkgs/desktops/gnome/extensions @piegamesde @jtojnar @hedning +/pkgs/desktops/gnome @jtojnar +/pkgs/desktops/gnome/extensions @piegamesde @jtojnar # Cinnamon /pkgs/desktops/cinnamon @mkg20001 diff --git a/doc/stdenv/stdenv.chapter.md b/doc/stdenv/stdenv.chapter.md index b57698cb90b34..4daaea5c17fff 100644 --- a/doc/stdenv/stdenv.chapter.md +++ b/doc/stdenv/stdenv.chapter.md @@ -77,7 +77,7 @@ where the builder can do anything it wants, but typically starts with source $stdenv/setup ``` -to let `stdenv` set up the environment (e.g., process the `buildInputs`). If you want, you can still use `stdenv`’s generic builder: +to let `stdenv` set up the environment (e.g. by resetting `PATH` and populating it from build inputs). If you want, you can still use `stdenv`’s generic builder: ```bash source $stdenv/setup @@ -698,12 +698,12 @@ Hook executed at the end of the install phase. ### The fixup phase {#ssec-fixup-phase} -The fixup phase performs some (Nix-specific) post-processing actions on the files installed under `$out` by the install phase. The default `fixupPhase` does the following: +The fixup phase performs (Nix-specific) post-processing actions on the files installed under `$out` by the install phase. The default `fixupPhase` does the following: - It moves the `man/`, `doc/` and `info/` subdirectories of `$out` to `share/`. - It strips libraries and executables of debug information. - On Linux, it applies the `patchelf` command to ELF executables and libraries to remove unused directories from the `RPATH` in order to prevent unnecessary runtime dependencies. -- It rewrites the interpreter paths of shell scripts to paths found in `PATH`. E.g., `/usr/bin/perl` will be rewritten to `/nix/store/some-perl/bin/perl` found in `PATH`. +- It rewrites the interpreter paths of shell scripts to paths found in `PATH`. E.g., `/usr/bin/perl` will be rewritten to `/nix/store/some-perl/bin/perl` found in `PATH`. See [](#patch-shebangs.sh) for details. #### Variables controlling the fixup phase {#variables-controlling-the-fixup-phase} @@ -749,7 +749,7 @@ If set, the `patchelf` command is not used to remove unnecessary `RPATH` entries ##### `dontPatchShebangs` {#var-stdenv-dontPatchShebangs} -If set, scripts starting with `#!` do not have their interpreter paths rewritten to paths in the Nix store. +If set, scripts starting with `#!` do not have their interpreter paths rewritten to paths in the Nix store. See [](#patch-shebangs.sh) on how patching shebangs works. ##### `dontPruneLibtoolFiles` {#var-stdenv-dontPruneLibtoolFiles} @@ -983,7 +983,7 @@ addEnvHooks "$hostOffset" myBashFunction The *existence* of setups hooks has long been documented and packages inside Nixpkgs are free to use this mechanism. Other packages, however, should not rely on these mechanisms not changing between Nixpkgs versions. Because of the existing issues with this system, there’s little benefit from mandating it be stable for any period of time. -First, let’s cover some setup hooks that are part of Nixpkgs default stdenv. This means that they are run for every package built using `stdenv.mkDerivation`. Some of these are platform specific, so they may run on Linux but not Darwin or vice-versa. +First, let’s cover some setup hooks that are part of Nixpkgs default `stdenv`. This means that they are run for every package built using `stdenv.mkDerivation` or when using a custom builder that has `source $stdenv/setup`. Some of these are platform specific, so they may run on Linux but not Darwin or vice-versa. ### `move-docs.sh` {#move-docs.sh} @@ -999,7 +999,70 @@ This runs the strip command on installed binaries and libraries. This removes un ### `patch-shebangs.sh` {#patch-shebangs.sh} -This setup hook patches installed scripts to use the full path to the shebang interpreter. A shebang interpreter is the first commented line of a script telling the operating system which program will run the script (e.g `#!/bin/bash`). In Nix, we want an exact path to that interpreter to be used. This often replaces `/bin/sh` with a path in the Nix store. +This setup hook patches installed scripts to add Nix store paths to their shebang interpreter as found in the build environment. The [shebang](https://en.wikipedia.org/wiki/Shebang_(Unix)) line tells a Unix-like operating system which interpreter to use to execute the script's contents. + +::: note +The [generic builder][generic-builder] populates `PATH` from inputs of the derivation. +::: + +[generic-builder]: https://github.com/NixOS/nixpkgs/blob/19d4f7dc485f74109bd66ef74231285ff797a823/pkgs/stdenv/generic/builder.sh + +#### Invocation {#patch-shebangs.sh-invocation} + +Multiple paths can be specified. + +``` +patchShebangs [--build | --host] PATH... +``` + +##### Flags + +`--build` +: Look up commands available at build time + +`--host` +: Look up commands available at run time + +##### Examples + +```sh +patchShebangs --host /nix/store/<hash>-hello-1.0/bin +``` + +```sh +patchShebangs --build configure +``` + +`#!/bin/sh` will be rewritten to `#!/nix/store/<hash>-some-bash/bin/sh`. + +`#!/usr/bin/env` gets special treatment: `#!/usr/bin/env python` is rewritten to `/nix/store/<hash>/bin/python`. + +Interpreter paths that point to a valid Nix store location are not changed. + +::: note +A script file must be marked as executable, otherwise it will not be +considered. +::: + +This mechanism ensures that the interpreter for a given script is always found and is exactly the one specified by the build. + +It can be disabled by setting [`dontPatchShebangs`](#var-stdenv-dontPatchShebangs): + +```nix +stdenv.mkDerivation { + # ... + dontPatchShebangs = true; + # ... +} +``` + +The file [`patch-shebangs.sh`][patch-shebangs.sh] defines the [`patchShebangs`][patchShebangs] function. It is used to implement [`patchShebangsAuto`][patchShebangsAuto], the [setup hook](#ssec-setup-hooks) that is registered to run during the [fixup phase](#ssec-fixup-phase) by default. + +If you need to run `patchShebangs` at build time, it must be called explicitly within [one of the build phases](#sec-stdenv-phases). + +[patch-shebangs.sh]: https://github.com/NixOS/nixpkgs/blob/19d4f7dc485f74109bd66ef74231285ff797a823/pkgs/build-support/setup-hooks/patch-shebangs.sh +[patchShebangs]: https://github.com/NixOS/nixpkgs/blob/19d4f7dc485f74109bd66ef74231285ff797a823/pkgs/build-support/setup-hooks/patch-shebangs.sh#L24-L105 +[patchShebangsAuto]: https://github.com/NixOS/nixpkgs/blob/19d4f7dc485f74109bd66ef74231285ff797a823/pkgs/build-support/setup-hooks/patch-shebangs.sh#L107-L119 ### `audit-tmpdir.sh` {#audit-tmpdir.sh} @@ -1316,7 +1379,7 @@ If the libraries lack `-fPIE`, you will get the error `recompile with -fPIE`. [^footnote-stdenv-ignored-build-platform]: The build platform is ignored because it is a mere implementation detail of the package satisfying the dependency: As a general programming principle, dependencies are always *specified* as interfaces, not concrete implementation. [^footnote-stdenv-native-dependencies-in-path]: Currently, this means for native builds all dependencies are put on the `PATH`. But in the future that may not be the case for sake of matching cross: the platforms would be assumed to be unique for native and cross builds alike, so only the `depsBuild*` and `nativeBuildInputs` would be added to the `PATH`. -[^footnote-stdenv-propagated-dependencies]: Nix itself already takes a package’s transitive dependencies into account, but this propagation ensures nixpkgs-specific infrastructure like setup hooks (mentioned above) also are run as if the propagated dependency. +[^footnote-stdenv-propagated-dependencies]: Nix itself already takes a package’s transitive dependencies into account, but this propagation ensures nixpkgs-specific infrastructure like [setup hooks](#ssec-setup-hooks) also are run as if it were a propagated dependency. [^footnote-stdenv-find-inputs-location]: The `findInputs` function, currently residing in `pkgs/stdenv/generic/setup.sh`, implements the propagation logic. [^footnote-stdenv-sys-lib-search-path]: It clears the `sys_lib_*search_path` variables in the Libtool script to prevent Libtool from using libraries in `/usr/lib` and such. [^footnote-stdenv-build-time-guessing-impurity]: Eventually these will be passed building natively as well, to improve determinism: build-time guessing, as is done today, is a risk of impurity. diff --git a/nixos/modules/services/networking/ddclient.nix b/nixos/modules/services/networking/ddclient.nix index faee99b175eb4..43a50af8f9b59 100644 --- a/nixos/modules/services/networking/ddclient.nix +++ b/nixos/modules/services/networking/ddclient.nix @@ -13,7 +13,7 @@ let foreground=YES use=${cfg.use} login=${cfg.username} - password=${lib.optionalString (cfg.protocol == "nsupdate") "/run/${RuntimeDirectory}/ddclient.key"} + password=${if cfg.protocol == "nsupdate" then "/run/${RuntimeDirectory}/ddclient.key" else "@password_placeholder@"} protocol=${cfg.protocol} ${lib.optionalString (cfg.script != "") "script=${cfg.script}"} ${lib.optionalString (cfg.server != "") "server=${cfg.server}"} @@ -33,10 +33,9 @@ let ${lib.optionalString (cfg.configFile == null) (if (cfg.protocol == "nsupdate") then '' install ${cfg.passwordFile} /run/${RuntimeDirectory}/ddclient.key '' else if (cfg.passwordFile != null) then '' - password=$(printf "%q" "$(head -n 1 "${cfg.passwordFile}")") - sed -i "s|^password=$|password=$password|" /run/${RuntimeDirectory}/ddclient.conf + "${pkgs.replace-secret}/bin/replace-secret" "@password_placeholder@" "${cfg.passwordFile}" "/run/${RuntimeDirectory}/ddclient.conf" '' else '' - sed -i '/^password=$/d' /run/${RuntimeDirectory}/ddclient.conf + sed -i '/^password=@password_placeholder@$/d' /run/${RuntimeDirectory}/ddclient.conf '')} ''; diff --git a/nixos/modules/virtualisation/proxmox-image.nix b/nixos/modules/virtualisation/proxmox-image.nix index c537d5aed4471..e07d1d1eb3fc6 100644 --- a/nixos/modules/virtualisation/proxmox-image.nix +++ b/nixos/modules/virtualisation/proxmox-image.nix @@ -127,16 +127,26 @@ with lib; name = "proxmox-${cfg.filenameSuffix}"; postVM = let # Build qemu with PVE's patch that adds support for the VMA format - vma = pkgs.qemu_kvm.overrideAttrs ( super: { + vma = pkgs.qemu_kvm.overrideAttrs ( super: rec { + + # proxmox's VMA patch doesn't work with qemu 7.0 yet + version = "6.2.0"; + src = pkgs.fetchurl { + url= "https://download.qemu.org/qemu-${version}.tar.xz"; + hash = "sha256-aOFdjkWsVjJuC5pK+otJo9/oq6NIgiHQmMhGmLymW0U="; + }; + patches = let - rev = "cc707c362ea5c8d832aac270d1ffa7ac66a8908f"; - path = "debian/patches/pve/0025-PVE-Backup-add-vma-backup-format-code.patch"; + rev = "b37b17c286da3d32945fbee8ee4fd97a418a50db"; + path = "debian/patches/pve/0026-PVE-Backup-add-vma-backup-format-code.patch"; vma-patch = pkgs.fetchpatch { - url = "https://git.proxmox.com/?p=pve-qemu.git;a=blob_plain;hb=${rev};f=${path}"; - sha256 = "1z467xnmfmry3pjy7p34psd5xdil9x0apnbvfz8qbj0bf9fgc8zf"; + url = "https://git.proxmox.com/?p=pve-qemu.git;a=blob_plain;h=${rev};f=${path}"; + hash = "sha256-siuDWDUnM9Zq0/L2Faww3ELAOUHhVIHu5RAQn6L4Atc="; }; - in super.patches ++ [ vma-patch ]; + in [ vma-patch ]; + buildInputs = super.buildInputs ++ [ pkgs.libuuid ]; + }); in '' diff --git a/nixos/release.nix b/nixos/release.nix index f533aebf34c17..f70b02c4292b4 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -221,6 +221,29 @@ in rec { ); + # KVM image for proxmox in VMA format + proxmoxImage = forMatchingSystems [ "x86_64-linux" ] (system: + with import ./.. { inherit system; }; + + hydraJob ((import lib/eval-config.nix { + inherit system; + modules = [ + ./modules/virtualisation/proxmox-image.nix + ]; + }).config.system.build.VMA) + ); + + # LXC tarball for proxmox + proxmoxLXC = forMatchingSystems [ "x86_64-linux" ] (system: + with import ./.. { inherit system; }; + + hydraJob ((import lib/eval-config.nix { + inherit system; + modules = [ + ./modules/virtualisation/proxmox-lxc.nix + ]; + }).config.system.build.tarball) + ); # A disk image that can be imported to Amazon EC2 and registered as an AMI amazonImage = forMatchingSystems [ "x86_64-linux" "aarch64-linux" ] (system: diff --git a/pkgs/applications/blockchains/exodus/default.nix b/pkgs/applications/blockchains/exodus/default.nix index 654da25261d3f..3a85544705666 100644 --- a/pkgs/applications/blockchains/exodus/default.nix +++ b/pkgs/applications/blockchains/exodus/default.nix @@ -4,11 +4,11 @@ cups, vivaldi-ffmpeg-codecs, libpulseaudio, at-spi2-core, libxkbcommon, mesa }: stdenv.mkDerivation rec { pname = "exodus"; - version = "22.2.25"; + version = "22.6.17"; src = fetchurl { url = "https://downloads.exodus.io/releases/${pname}-linux-x64-${version}.zip"; - sha256 = "sha256-YbApI9rIk1653Hp3hsXJrxBMpaGn6Wv3WhZiQWAfPQM="; + sha256 = "1gllmrmc1gylw54yrgy1ggpn3kvkyxf7ydjvd5n5kvd8d9xh78ng"; }; sourceRoot = "."; diff --git a/pkgs/applications/editors/neovim/neovim-remote.nix b/pkgs/applications/editors/neovim/neovim-remote.nix index ef3b1590c1090..b18811dd09805 100644 --- a/pkgs/applications/editors/neovim/neovim-remote.nix +++ b/pkgs/applications/editors/neovim/neovim-remote.nix @@ -33,6 +33,8 @@ with python3.pkgs; buildPythonApplication rec { "test_escape_double_quotes_in_filenames" ]; + doCheck = !stdenv.isDarwin; + meta = with lib; { description = "A tool that helps controlling nvim processes from a terminal"; homepage = "https://github.com/mhinz/neovim-remote/"; diff --git a/pkgs/applications/emulators/craftos-pc/default.nix b/pkgs/applications/emulators/craftos-pc/default.nix index 3bc9e0b81cc05..d2668c473a628 100644 --- a/pkgs/applications/emulators/craftos-pc/default.nix +++ b/pkgs/applications/emulators/craftos-pc/default.nix @@ -1,26 +1,45 @@ -{ lib, stdenv, fetchFromGitHub, poco, openssl, SDL2, SDL2_mixer }: +{ lib +, stdenv +, fetchFromGitHub +, patchelf +, unzip +, poco +, openssl +, SDL2 +, SDL2_mixer +, ncurses +, libpng +, pngpp +, libwebp +}: let craftos2-lua = fetchFromGitHub { owner = "MCJack123"; repo = "craftos2-lua"; - rev = "v2.4.4"; - sha256 = "1q63ki4sxx8bxaa6ag3xj153p7a8a12ivm0k33k935p41k6y2k64"; + rev = "v2.6.6"; + sha256 = "cCXH1GTRqJQ57/6sWIxik366YBx/ii3nzQwx4YpEh1w="; + }; + craftos2-rom = fetchFromGitHub { + owner = "McJack123"; + repo = "craftos2-rom"; + rev = "v2.6.6"; + sha256 = "VzIqvf83k121DxuH5zgZfFS9smipDonyqqhVgj2kgYw="; }; in stdenv.mkDerivation rec { pname = "craftos-pc"; - version = "2.4.5"; + version = "2.6.6"; src = fetchFromGitHub { owner = "MCJack123"; repo = "craftos2"; rev = "v${version}"; - sha256 = "00a4p365krbdprlv4979d13mm3alhxgzzj3vqz2g67795plf64j4"; + sha256 = "9lpAWYFli3/OBfmu2dQxKi+/TaHaBQNpZsCURvl0h/E="; }; - buildInputs = [ poco openssl SDL2 SDL2_mixer ]; + buildInputs = [ patchelf poco openssl SDL2 SDL2_mixer ncurses libpng pngpp libwebp ]; preBuild = '' cp -R ${craftos2-lua}/* ./craftos2-lua/ @@ -28,16 +47,23 @@ stdenv.mkDerivation rec { make -C craftos2-lua linux ''; + dontStrip = true; + installPhase = '' - mkdir -p $out/bin + mkdir -p $out/bin $out/lib $out/share/craftos $out/include DESTDIR=$out/bin make install + cp ./craftos2-lua/src/liblua.so $out/lib + patchelf --replace-needed craftos2-lua/src/liblua.so liblua.so $out/bin/craftos + cp -R api $out/include/CraftOS-PC + cp -R ${craftos2-rom}/* $out/share/craftos ''; meta = with lib; { description = "An implementation of the CraftOS-PC API written in C++ using SDL"; homepage = "https://www.craftos-pc.cc"; - license = licenses.mit; + license = with licenses; [ mit free ]; platforms = platforms.linux; maintainers = [ maintainers.siraben ]; + mainProgram = "craftos"; }; } diff --git a/pkgs/applications/misc/albert/default.nix b/pkgs/applications/misc/albert/default.nix index c862872a7938b..1239d22f1f3e5 100644 --- a/pkgs/applications/misc/albert/default.nix +++ b/pkgs/applications/misc/albert/default.nix @@ -1,45 +1,75 @@ -{ mkDerivation, lib, fetchFromGitHub, makeWrapper, qtbase, - qtdeclarative, qtsvg, qtx11extras, muparser, cmake, python3, - qtcharts }: +{ lib +, stdenv +, fetchFromGitHub +, cmake +, muparser +, python3 +, qtbase +, qtcharts +, qtdeclarative +, qtgraphicaleffects +, qtsvg +, qtx11extras +, wrapQtAppsHook +, nix-update-script +}: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "albert"; - version = "0.17.2"; + version = "0.17.3"; src = fetchFromGitHub { - owner = "albertlauncher"; - repo = "albert"; - rev = "v${version}"; - sha256 = "0lpp8rqx5b6rwdpcdldfdlw5327harr378wnfbc6rp3ajmlb4p7w"; + owner = "albertlauncher"; + repo = "albert"; + rev = "v${version}"; + sha256 = "sha256-UIG6yLkIcdf5IszhNPwkBcSfZe4/CyI5shK/QPOmpPE="; fetchSubmodules = true; }; - nativeBuildInputs = [ cmake makeWrapper ]; + nativeBuildInputs = [ + cmake + wrapQtAppsHook + ]; - buildInputs = [ qtbase qtdeclarative qtsvg qtx11extras muparser python3 qtcharts ]; - - # We don't have virtualbox sdk so disable plugin - cmakeFlags = [ "-DBUILD_VIRTUALBOX=OFF" "-DCMAKE_INSTALL_LIBDIR=libs" ]; + buildInputs = [ + muparser + python3 + qtbase + qtcharts + qtdeclarative + qtgraphicaleffects + qtsvg + qtx11extras + ]; postPatch = '' - sed -i "/QStringList dirs = {/a \"$out/libs\"," \ - src/app/main.cpp - ''; + find -type f -name CMakeLists.txt -exec sed -i {} -e '/INSTALL_RPATH/d' \; - preBuild = '' - mkdir -p "$out/" - ln -s "$PWD/lib" "$out/lib" + sed -i src/app/main.cpp \ + -e "/QStringList dirs = {/a QFileInfo(\"$out/lib\").canonicalFilePath()," ''; - postBuild = '' - rm "$out/lib" + postFixup = '' + for i in $out/{bin/.albert-wrapped,lib/albert/plugins/*.so}; do + patchelf $i --add-rpath $out/lib/albert + done ''; + passthru.updateScript = nix-update-script { + attrPath = pname; + }; + meta = with lib; { - homepage = "https://albertlauncher.github.io/"; - description = "Desktop agnostic launcher"; - license = licenses.gpl3Plus; + description = "A fast and flexible keyboard launcher"; + longDescription = '' + Albert is a desktop agnostic launcher. Its goals are usability and beauty, + performance and extensibility. It is written in C++ and based on the Qt + framework. + ''; + homepage = "https://albertlauncher.github.io"; + changelog = "https://github.com/albertlauncher/albert/blob/${src.rev}/CHANGELOG.md"; + license = licenses.gpl3Plus; maintainers = with maintainers; [ ericsagnes synthetica ]; - platforms = platforms.linux; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix index 2d131b4279a6e..f17bdcd8f9fde 100644 --- a/pkgs/applications/networking/browsers/brave/default.nix +++ b/pkgs/applications/networking/browsers/brave/default.nix @@ -90,11 +90,11 @@ in stdenv.mkDerivation rec { pname = "brave"; - version = "1.39.122"; + version = "1.40.113"; src = fetchurl { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - sha256 = "sha256-UJtVFvcVzfpdDbCkXs9UetS/1IUIn1mxUy7TcaXL5Jo="; + sha256 = "sha256-+lJjLfxEOf82uvcVaRbWYQ93KEzWGVrzXvI9Rt1U9Bc="; }; dontConfigure = true; diff --git a/pkgs/applications/networking/cluster/hadoop/default.nix b/pkgs/applications/networking/cluster/hadoop/default.nix index ff5d0403f4a58..e1019b0cd3d68 100644 --- a/pkgs/applications/networking/cluster/hadoop/default.nix +++ b/pkgs/applications/networking/cluster/hadoop/default.nix @@ -26,12 +26,13 @@ with lib; assert elem stdenv.system [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ]; let - common = { pname, version, untarDir ? "${pname}-${version}", sha256, jdk, openssl ? null, nativeLibs ? [ ], libPatches ? "", tests }: + common = { pname, versions, untarDir ? "${pname}-${version}", hash, jdk, openssl ? null, nativeLibs ? [ ], libPatches ? "", tests }: stdenv.mkDerivation rec { - inherit pname version jdk libPatches untarDir openssl; + inherit pname jdk libPatches untarDir openssl; + version = versions.${stdenv.system}; src = fetchurl { url = "mirror://apache/hadoop/common/hadoop-${version}/hadoop-${version}" + optionalString stdenv.isAarch64 "-aarch64" + ".tar.gz"; - sha256 = sha256.${stdenv.system}; + hash = hash.${stdenv.system}; }; doCheck = true; @@ -79,7 +80,7 @@ let computers, each of which may be prone to failures. ''; maintainers = with maintainers; [ illustris ]; - platforms = attrNames sha256; + platforms = attrNames hash; }; }; in @@ -88,12 +89,17 @@ in # https://cwiki.apache.org/confluence/display/HADOOP/Hadoop+Java+Versions hadoop_3_3 = common rec { pname = "hadoop"; - version = "3.3.1"; + versions = rec { + x86_64-linux = "3.3.3"; + x86_64-darwin = x86_64-linux; + aarch64-linux = "3.3.1"; + aarch64-darwin = aarch64-linux; + }; untarDir = "${pname}-${version}"; - sha256 = rec { - x86_64-linux = "1b3v16ihysqaxw8za1r5jlnphy8dwhivdx2d0z64309w57ihlxxd"; + hash = rec { + x86_64-linux = "sha256-+nHGG7qkJxKa7wn+wCizTdVCxlrZD9zOxefvk9g7h2Q="; x86_64-darwin = x86_64-linux; - aarch64-linux = "00ln18vpi07jq2slk3kplyhcj8ad41n0yl880q5cihilk7daclxz"; + aarch64-linux = "sha256-v1Om2pk0wsgKBghRD2wgTSHJoKd3jkm1wPKAeDcKlgI="; aarch64-darwin = aarch64-linux; }; jdk = jdk11_headless; @@ -116,8 +122,8 @@ in }; hadoop_3_2 = common rec { pname = "hadoop"; - version = "3.2.2"; - sha256.x86_64-linux = "1hxq297cqvkfgz2yfdiwa3l28g44i2abv5921k2d6b4pqd33prwp"; + versions.x86_64-linux = "3.2.3"; + hash.x86_64-linux = "sha256-Q2/a1LcKutpJoGySB0qlCcYE2bvC/HoG/dp9nBikuNU="; jdk = jdk8_headless; # not using native libs because of broken openssl_1_0_2 dependency # can be manually overriden @@ -125,8 +131,8 @@ in }; hadoop2 = common rec { pname = "hadoop"; - version = "2.10.1"; - sha256.x86_64-linux = "1w31x4bk9f2swnx8qxx0cgwfg8vbpm6cy5lvfnbbpl3rsjhmyg97"; + versions.x86_64-linux = "2.10.2"; + hash.x86_64-linux = "sha256-xhA4zxqIRGNhIeBnJO9dLKf/gx/Bq+uIyyZwsIafEyo="; jdk = jdk8_headless; tests = nixosTests.hadoop2; }; diff --git a/pkgs/applications/networking/cluster/velero/default.nix b/pkgs/applications/networking/cluster/velero/default.nix index 5685b0b65072c..f5672820601dc 100644 --- a/pkgs/applications/networking/cluster/velero/default.nix +++ b/pkgs/applications/networking/cluster/velero/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { ldflags = [ "-s" "-w" - "-X github.com/vmware-tanzu/velero/pkg/buildinfo.Version=${version}" + "-X github.com/vmware-tanzu/velero/pkg/buildinfo.Version=v${version}" "-X github.com/vmware-tanzu/velero/pkg/buildinfo.ImageRegistry=velero" "-X github.com/vmware-tanzu/velero/pkg/buildinfo.GitTreeState=clean" "-X github.com/vmware-tanzu/velero/pkg/buildinfo.GitSHA=none" diff --git a/pkgs/applications/networking/instant-messengers/zulip-term/default.nix b/pkgs/applications/networking/instant-messengers/zulip-term/default.nix index 1775ce9a48179..ad16c84c69894 100644 --- a/pkgs/applications/networking/instant-messengers/zulip-term/default.nix +++ b/pkgs/applications/networking/instant-messengers/zulip-term/default.nix @@ -7,30 +7,28 @@ python3.pkgs.buildPythonApplication rec { pname = "zulip-term"; - version = "0.6.0"; + version = "0.7.0"; # no tests on PyPI src = fetchFromGitHub { owner = "zulip"; repo = "zulip-terminal"; rev = version; - sha256 = "sha256-nlvZaGMVRRCu8PZHxPWjNSxkqhZs0T/tE1js/3pDUFk="; + sha256 = "sha256-ZouUU4p1FSGMxPuzDo5P971R+rDXpBdJn2MqvkJO+Fw="; }; - patches = [ - ./pytest-executable-name.patch - ]; - propagatedBuildInputs = with python3.pkgs; [ - urwid - zulip - urwid-readline beautifulsoup4 lxml - typing-extensions + pygments + pyperclip python-dateutil pytz + typing-extensions tzlocal + urwid + urwid-readline + zulip ]; checkInputs = [ @@ -45,6 +43,12 @@ python3.pkgs.buildPythonApplication rec { "--prefix" "PATH" ":" (lib.makeBinPath [ libnotify ]) ]; + disabledTests = [ + # IndexError: list index out of range + "test_main_multiple_notify_options" + "test_main_multiple_autohide_options" + ]; + meta = with lib; { description = "Zulip's official terminal client"; homepage = "https://github.com/zulip/zulip-terminal"; diff --git a/pkgs/applications/networking/instant-messengers/zulip-term/pytest-executable-name.patch b/pkgs/applications/networking/instant-messengers/zulip-term/pytest-executable-name.patch deleted file mode 100644 index 4602a254ab88a..0000000000000 --- a/pkgs/applications/networking/instant-messengers/zulip-term/pytest-executable-name.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/tests/cli/test_run.py b/tests/cli/test_run.py -index 459aa82..c6e434e 100644 ---- a/tests/cli/test_run.py -+++ b/tests/cli/test_run.py -@@ -180,7 +180,7 @@ def test_main_multiple_autohide_options(capsys, options): - assert str(e.value) == "2" - captured = capsys.readouterr() - lines = captured.err.strip('\n') -- lines = lines.split("pytest: ", 1)[1] -+ lines = lines.split("__main__.py: ", 1)[1] - expected = ("error: argument {}: not allowed " - "with argument {}".format(options[1], options[0])) - assert lines == expected diff --git a/pkgs/applications/networking/sync/rsync/rrsync.nix b/pkgs/applications/networking/sync/rsync/rrsync.nix index d1e6b6ad96eb5..c18f454d87ce4 100644 --- a/pkgs/applications/networking/sync/rsync/rrsync.nix +++ b/pkgs/applications/networking/sync/rsync/rrsync.nix @@ -1,11 +1,13 @@ -{ lib, stdenv, fetchurl, perl, rsync, fetchpatch }: +{ stdenv, python3, rsync }: stdenv.mkDerivation { pname = "rrsync"; inherit (rsync) version srcs; - buildInputs = [ rsync perl ]; - + buildInputs = [ + rsync + (python3.withPackages (pythonPackages: with pythonPackages; [ braceexpand ])) + ]; # Skip configure and build phases. # We just want something from the support directory dontConfigure = true; diff --git a/pkgs/applications/office/qownnotes/default.nix b/pkgs/applications/office/qownnotes/default.nix index 7df8a607f4dfa..7c6159bf741be 100644 --- a/pkgs/applications/office/qownnotes/default.nix +++ b/pkgs/applications/office/qownnotes/default.nix @@ -5,13 +5,13 @@ mkDerivation rec { pname = "qownnotes"; - version = "22.6.1"; + version = "22.7.1"; src = fetchurl { url = "https://download.tuxfamily.org/${pname}/src/${pname}-${version}.tar.xz"; # Fetch the checksum of current version with curl: # curl https://download.tuxfamily.org/qownnotes/src/qownnotes-<version>.tar.xz.sha256 - sha256 = "c5b2075d42298d28f901ad2df8eb65f5a61aa59727fae9eeb1f92dac1b63d8ba"; + sha256 = "9431a3315a533799525217e5ba03757b3c39e8259bf307c81330304f043b8b77"; }; nativeBuildInputs = [ qmake qttools ]; diff --git a/pkgs/applications/science/machine-learning/nengo-gui/default.nix b/pkgs/applications/science/machine-learning/nengo-gui/default.nix index 6380f25177cbe..9a100c03293ea 100644 --- a/pkgs/applications/science/machine-learning/nengo-gui/default.nix +++ b/pkgs/applications/science/machine-learning/nengo-gui/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonPackage rec { pname = "nengo-gui"; - version = "0.4.8"; + version = "0.4.9"; src = fetchFromGitHub { owner = "nengo"; repo = "nengo-gui"; - rev = "v${version}"; - sha256 = "1awb0h2l6yifb77zah7a4qzxqvkk4ac5fynangalidr10sk9rzk3"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-aBi4roe9pqPmpbW5zrbDoIvyH5mTKgIzL2O5j1+VBMY="; }; propagatedBuildInputs = with python3Packages; [ nengo ]; diff --git a/pkgs/applications/science/math/lp_solve/default.nix b/pkgs/applications/science/math/lp_solve/default.nix index 876222772e86d..f4c117267d568 100644 --- a/pkgs/applications/science/math/lp_solve/default.nix +++ b/pkgs/applications/science/math/lp_solve/default.nix @@ -1,7 +1,12 @@ -{ lib, stdenv, fetchurl, cctools, fixDarwinDylibNames }: +{ lib +, stdenv +, fetchurl +, cctools +, fixDarwinDylibNames +, autoSignDarwinBinariesHook +}: stdenv.mkDerivation rec { - pname = "lp_solve"; version = "5.5.2.11"; @@ -13,20 +18,24 @@ stdenv.mkDerivation rec { nativeBuildInputs = lib.optionals stdenv.isDarwin [ cctools fixDarwinDylibNames + ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + autoSignDarwinBinariesHook ]; dontConfigure = true; - buildPhase = let - ccc = if stdenv.isDarwin then "ccc.osx" else "ccc"; - in '' - runHook preBuild + buildPhase = + let + ccc = if stdenv.isDarwin then "ccc.osx" else "ccc"; + in + '' + runHook preBuild - (cd lpsolve55 && bash -x -e ${ccc}) - (cd lp_solve && bash -x -e ${ccc}) + (cd lpsolve55 && bash -x -e ${ccc}) + (cd lp_solve && bash -x -e ${ccc}) - runHook postBuild - ''; + runHook postBuild + ''; installPhase = '' runHook preInstall @@ -44,9 +53,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A Mixed Integer Linear Programming (MILP) solver"; - homepage = "http://lpsolve.sourceforge.net"; - license = licenses.gpl2Plus; + homepage = "http://lpsolve.sourceforge.net"; + license = licenses.gpl2Plus; maintainers = with maintainers; [ smironov ]; - platforms = platforms.unix; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/science/misc/graphia/breakpad-sigstksz.patch b/pkgs/applications/science/misc/graphia/breakpad-sigstksz.patch new file mode 100644 index 0000000000000..6e90faf9f0373 --- /dev/null +++ b/pkgs/applications/science/misc/graphia/breakpad-sigstksz.patch @@ -0,0 +1,13 @@ +diff --git a/source/thirdparty/breakpad/src/client/linux/handler/exception_handler.cc b/source/thirdparty/breakpad/src/client/linux/handler/exception_handler.cc +index ca353c4099..499be0a986 100644 +--- a/source/thirdparty/breakpad/src/client/linux/handler/exception_handler.cc ++++ b/source/thirdparty/breakpad/src/client/linux/handler/exception_handler.cc +@@ -138,7 +138,7 @@ void InstallAlternateStackLocked() { + // SIGSTKSZ may be too small to prevent the signal handlers from overrunning + // the alternative stack. Ensure that the size of the alternative stack is + // large enough. +- static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ); ++ const unsigned kSigStackSize = std::max<unsigned>(16384, SIGSTKSZ); + + // Only set an alternative stack if there isn't already one, or if the current + // one is too small. diff --git a/pkgs/applications/science/misc/graphia/default.nix b/pkgs/applications/science/misc/graphia/default.nix index 30677d6067e9a..c397e19fcf0c2 100644 --- a/pkgs/applications/science/misc/graphia/default.nix +++ b/pkgs/applications/science/misc/graphia/default.nix @@ -1,22 +1,36 @@ -{ stdenv, lib, cmake, fetchFromGitHub -, wrapQtAppsHook, qtbase, qtquickcontrols2, qtgraphicaleffects +{ stdenv +, lib +, cmake +, fetchFromGitHub +, wrapQtAppsHook +, qtbase +, qtquickcontrols2 +, qtgraphicaleffects }: stdenv.mkDerivation rec { pname = "graphia"; - version = "2.2"; + version = "3.0"; src = fetchFromGitHub { owner = "graphia-app"; repo = "graphia"; rev = version; - sha256 = "sha256:05givvvg743sawqy2vhljkfgn5v1s907sflsnsv11ddx6x51na1w"; + sha256 = "sha256-9JIVMtu8wlux7vIapOQQIemE7ehIol2XZuIvwLfB8fY="; }; + patches = [ + # Fix for a breakpad incompatibility with glibc>2.33 + # https://github.com/pytorch/pytorch/issues/70297 + # https://github.com/google/breakpad/commit/605c51ed96ad44b34c457bbca320e74e194c317e + ./breakpad-sigstksz.patch + ]; + nativeBuildInputs = [ cmake wrapQtAppsHook ]; + buildInputs = [ qtbase qtquickcontrols2 diff --git a/pkgs/applications/system/glances/default.nix b/pkgs/applications/system/glances/default.nix index dae9d5cd5195f..60339bf2e5811 100644 --- a/pkgs/applications/system/glances/default.nix +++ b/pkgs/applications/system/glances/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonApplication, fetchFromGitHub, isPyPy, lib +{ stdenv, buildPythonApplication, fetchFromGitHub, fetchpatch, isPyPy, lib , defusedxml, future, packaging, psutil, setuptools # Optional dependencies: , bottle, pysnmp @@ -20,7 +20,17 @@ buildPythonApplication rec { }; # Some tests fail in the sandbox (they e.g. require access to /sys/class/power_supply): - patches = lib.optional (doCheck && stdenv.isLinux) ./skip-failing-tests.patch; + patches = lib.optional (doCheck && stdenv.isLinux) ./skip-failing-tests.patch + ++ lib.optional (doCheck && stdenv.isDarwin) + [ + # Fix "TypeError: unsupported operand type(s) for +=: 'int' and 'NoneType'" on darwin + # https://github.com/nicolargo/glances/pull/2082 + (fetchpatch { + name = "fix-typeerror-when-testing-on-darwin.patch"; + url = "https://patch-diff.githubusercontent.com/raw/nicolargo/glances/pull/2082.patch"; + sha256 = "sha256-MIePPywZ2dTTqXjf7EJiHlQ7eltiHzgocqrnLeLJwZ4="; + }) + ]; # On Darwin this package segfaults due to mismatch of pure and impure # CoreFoundation. This issues was solved for binaries but for interpreted diff --git a/pkgs/applications/terminal-emulators/gnome-console/default.nix b/pkgs/applications/terminal-emulators/gnome-console/default.nix index 9b4b460550ff3..be3808327b57b 100644 --- a/pkgs/applications/terminal-emulators/gnome-console/default.nix +++ b/pkgs/applications/terminal-emulators/gnome-console/default.nix @@ -22,11 +22,11 @@ stdenv.mkDerivation rec { pname = "gnome-console"; - version = "42.beta"; + version = "42.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-console/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "Lq/shyAhDcwB5HqpihvGx2+xwVU2Xax7/NerFwR36DQ="; + sha256 = "Fae8i72047ZZ//DFK2GdxilxkPhnRp2D4wOvSzibuaM="; }; buildInputs = [ diff --git a/pkgs/applications/version-management/git-and-tools/gh/default.nix b/pkgs/applications/version-management/git-and-tools/gh/default.nix index 37ceaaff514c2..b21e9b8555f59 100644 --- a/pkgs/applications/version-management/git-and-tools/gh/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gh/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gh"; - version = "2.13.0"; + version = "2.14.1"; src = fetchFromGitHub { owner = "cli"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-9FWmEujTUWexyqNQVagU/U9AyOZJdWL5y4Q0ZHRBxcc="; + sha256 = "sha256-Mp8frinjAdsNYIFLFsk8yCeQLgo6cW33B4JadNHbifE="; }; - vendorSha256 = "sha256-a/+Dj66zT/W8rxvvXnJSdoyYhajMY1T3kEbrpC24tMU="; + vendorSha256 = "sha256-yhUP6BaR2xloy3/g7pKhn5ljwTEm8XwPaOiZCIfIM7E="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/version-management/git-and-tools/tig/default.nix b/pkgs/applications/version-management/git-and-tools/tig/default.nix index e81bf81dd3cd9..bf8168b5ca5f0 100644 --- a/pkgs/applications/version-management/git-and-tools/tig/default.nix +++ b/pkgs/applications/version-management/git-and-tools/tig/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "tig"; - version = "2.5.5"; + version = "2.5.6"; src = fetchFromGitHub { owner = "jonas"; repo = pname; rev = "${pname}-${version}"; - sha256 = "1yx63jfbaa5h0d3lfqlczs9l7j2rnhp5jpa8qcjn4z1n415ay2x5"; + sha256 = "sha256-WJtva3LbzVqtcAt0kmnti3RZTPg/CBjk6JQYa2VzpSQ="; }; nativeBuildInputs = [ makeWrapper autoreconfHook asciidoc xmlto docbook_xsl docbook_xml_dtd_45 findXMLCatalogs pkg-config ]; diff --git a/pkgs/applications/video/media-downloader/default.nix b/pkgs/applications/video/media-downloader/default.nix new file mode 100644 index 0000000000000..332f8ef78eead --- /dev/null +++ b/pkgs/applications/video/media-downloader/default.nix @@ -0,0 +1,39 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, qt5 +, ffmpeg-full +, aria2 +, yt-dlp +, python3 +}: + +stdenv.mkDerivation rec { + pname = "media-downloader"; + version = "2.4.0"; + + src = fetchFromGitHub { + owner = "mhogomchungu"; + repo = pname; + rev = "${version}"; + sha256 = "sha256-EyfhomwBtdAt6HGRwnpiijm2D1LfaCAoG5qk3orDG98="; + }; + + nativeBuildInputs = [ cmake qt5.wrapQtAppsHook ]; + + preFixup = '' + qtWrapperArgs+=( + --prefix PATH : "${lib.makeBinPath [ ffmpeg-full aria2 yt-dlp python3 ]}" + ) + ''; + + meta = with lib; { + description = "A Qt/C++ GUI front end to youtube-dl"; + homepage = "https://github.com/mhogomchungu/media-downloader"; + license = licenses.gpl2Plus; + broken = stdenv.isDarwin; + platforms = platforms.unix; + maintainers = with maintainers; [ zendo ]; + }; +} diff --git a/pkgs/build-support/dotnet/nuget-to-nix/nuget-to-nix.sh b/pkgs/build-support/dotnet/nuget-to-nix/nuget-to-nix.sh index 879a87b3341ce..d3796f88e449a 100755 --- a/pkgs/build-support/dotnet/nuget-to-nix/nuget-to-nix.sh +++ b/pkgs/build-support/dotnet/nuget-to-nix/nuget-to-nix.sh @@ -25,7 +25,7 @@ while read pkg_spec; do pkg_src="$(jq --raw-output '.source' "$(dirname "$pkg_spec")/.nupkg.metadata")" if [[ $pkg_src != https://api.nuget.org/* ]]; then - pkg_source_url="${nuget_sources_cache[$pkg_src]:=$(curl --fail "$pkg_src" | jq --raw-output '.resources[] | select(."@type" == "PackageBaseAddress/3.0.0")."@id"')}" + pkg_source_url="${nuget_sources_cache[$pkg_src]:=$(curl -n --fail "$pkg_src" | jq --raw-output '.resources[] | select(."@type" == "PackageBaseAddress/3.0.0")."@id"')}" pkg_url="$pkg_source_url${pkg_name,,}/${pkg_version,,}/${pkg_name,,}.${pkg_version,,}.nupkg" echo " (fetchNuGet { pname = \"$pkg_name\"; version = \"$pkg_version\"; sha256 = \"$pkg_sha256\"; url = \"$pkg_url\"; })" >> ${tmpfile} else diff --git a/pkgs/data/icons/papirus-icon-theme/default.nix b/pkgs/data/icons/papirus-icon-theme/default.nix index 911758c3071ca..4980f36312c1e 100644 --- a/pkgs/data/icons/papirus-icon-theme/default.nix +++ b/pkgs/data/icons/papirus-icon-theme/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenvNoCC, fetchFromGitHub, fetchurl, gtk3, pantheon, breeze-icons, gnome-icon-theme, hicolor-icon-theme, papirus-folders, color ? "blue" }: +{ lib, stdenvNoCC, fetchFromGitHub, fetchurl, gtk3, pantheon, breeze-icons, gnome-icon-theme, hicolor-icon-theme, papirus-folders, color ? null }: stdenvNoCC.mkDerivation rec { pname = "papirus-icon-theme"; @@ -28,8 +28,8 @@ stdenvNoCC.mkDerivation rec { mv {,e}Papirus* $out/share/icons for theme in $out/share/icons/*; do - ${papirus-folders}/bin/papirus-folders -t $theme -o -C ${color} - gtk-update-icon-cache $theme + ${lib.optionalString (color != null) "${papirus-folders}/bin/papirus-folders -t $theme -o -C ${color}"} + gtk-update-icon-cache --force $theme done runHook postInstall diff --git a/pkgs/data/icons/zafiro-icons/default.nix b/pkgs/data/icons/zafiro-icons/default.nix index d7315e1005cca..d9a62462e97c1 100644 --- a/pkgs/data/icons/zafiro-icons/default.nix +++ b/pkgs/data/icons/zafiro-icons/default.nix @@ -1,14 +1,25 @@ -{ lib, stdenvNoCC, fetchFromGitHub, gtk3, breeze-icons, gnome-icon-theme, numix-icon-theme, numix-icon-theme-circle, hicolor-icon-theme, jdupes }: +{ lib +, stdenvNoCC +, fetchFromGitHub +, gtk3 +, breeze-icons +, gnome-icon-theme +, numix-icon-theme +, numix-icon-theme-circle +, hicolor-icon-theme +, jdupes +, gitUpdater +}: stdenvNoCC.mkDerivation rec { pname = "zafiro-icons"; - version = "1.2"; + version = "1.3"; src = fetchFromGitHub { owner = "zayronxio"; repo = pname; rev = version; - sha256 = "sha256-Awc5Sw4X25pXEd4Ob0u6A6Uu0e8FYfwp0fEl90vrsUE="; + sha256 = "sha256-IbFnlUOSADYMNMfvRuRPndxcQbnV12BqMDb9bJRjnoU="; }; nativeBuildInputs = [ @@ -33,19 +44,28 @@ stdenvNoCC.mkDerivation rec { installPhase = '' runHook preInstall - # remove copy file, as it is there clearly by mistake - rm "apps/scalable/android-sdk (copia 1).svg" + mkdir -p $out/share/icons - mkdir -p $out/share/icons/Zafiro-icons - cp -a * $out/share/icons/Zafiro-icons + for theme in Dark Light; do + cp -a $theme $out/share/icons/Zafiro-icons-$theme - gtk-update-icon-cache $out/share/icons/Zafiro-icons + # remove unneeded files + rm $out/share/icons/Zafiro-icons-$theme/_config.yml + + # remove files with non-ascii characters in name + # https://github.com/zayronxio/Zafiro-icons/issues/111 + rm $out/share/icons/Zafiro-icons-$theme/apps/scalable/βTORRENT.svg + + gtk-update-icon-cache $out/share/icons/Zafiro-icons-$theme + done jdupes --link-soft --recurse $out/share runHook postInstall ''; + passthru.updateScript = gitUpdater { inherit pname version; }; + meta = with lib; { description = "Icon pack flat with light colors"; homepage = "https://github.com/zayronxio/Zafiro-icons"; diff --git a/pkgs/data/misc/hackage/pin.json b/pkgs/data/misc/hackage/pin.json index d78722b89491e..46c63d1fb5bf4 100644 --- a/pkgs/data/misc/hackage/pin.json +++ b/pkgs/data/misc/hackage/pin.json @@ -1,6 +1,6 @@ { - "commit": "e304e8df4de976f80d5d58e47cf560be91055799", - "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/e304e8df4de976f80d5d58e47cf560be91055799.tar.gz", - "sha256": "10xws4lazlx8bx26xc8h6c7ab7gkzc01an7nwip3bghc1h92zr4m", - "msg": "Update from Hackage at 2022-07-02T15:59:48Z" + "commit": "c096b9d83b86ab92dffac5d97927e8458ebd4dfa", + "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/c096b9d83b86ab92dffac5d97927e8458ebd4dfa.tar.gz", + "sha256": "1j9j97zn8qhxsigi73319l0dairkymjk6mknsgindzgsvrrag9xg", + "msg": "Update from Hackage at 2022-07-07T10:54:07Z" } diff --git a/pkgs/data/themes/flat-remix-gtk/default.nix b/pkgs/data/themes/flat-remix-gtk/default.nix index 7f99478b187c7..a569a3758357a 100644 --- a/pkgs/data/themes/flat-remix-gtk/default.nix +++ b/pkgs/data/themes/flat-remix-gtk/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "flat-remix-gtk"; - version = "20220527"; + version = "20220627"; src = fetchFromGitHub { owner = "daniruiz"; repo = pname; rev = version; - sha256 = "sha256-mT7dRhLnJg5vZCmT0HbP6GXSjKFQ55BqisvCMwV3Zxc="; + sha256 = "sha256-z/ILu8UPbyEN/ejsxZ3CII3y3dI04ZNa1i6nyjKFis8="; }; dontBuild = true; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix index 5228938a1db95..90695fc176c39 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "wingpanel-indicator-notifications"; - version = "6.0.5"; + version = "6.0.6"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "sha256-Y/oDD/AsA9ZiKsfEV3/jnT3tmQYAIIToAZjMRVriK98="; + sha256 = "sha256-wAoLU59hEYubWn9o7cVlZ/mJoxJJjEkJA9xu9gwxQ7o="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/plasma-5/fetch.sh b/pkgs/desktops/plasma-5/fetch.sh index 2b8bcdd6ef1f1..ad12c222566aa 100644 --- a/pkgs/desktops/plasma-5/fetch.sh +++ b/pkgs/desktops/plasma-5/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/plasma/5.25.2/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/plasma/5.25.3/ -A '*.tar.xz' ) diff --git a/pkgs/desktops/plasma-5/srcs.nix b/pkgs/desktops/plasma-5/srcs.nix index b2c8f40909383..f7c02d8699df1 100644 --- a/pkgs/desktops/plasma-5/srcs.nix +++ b/pkgs/desktops/plasma-5/srcs.nix @@ -4,427 +4,427 @@ { bluedevil = { - version = "5.25.2"; + version = "5.25.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.2/bluedevil-5.25.2.tar.xz"; - sha256 = "0sx8qbmig787jmfixmv6ajawv6j846gcbj67szkfw4r4yqpsagr1"; - name = "bluedevil-5.25.2.tar.xz"; + url = "${mirror}/stable/plasma/5.25.3/bluedevil-5.25.3.tar.xz"; + sha256 = "059nm5rd5l8ql78slrjcgkjhka7g1rnh0f1nbgf57qccs7wp6qb5"; + name = "bluedevil-5.25.3.tar.xz"; }; }; breeze = { - version = "5.25.2"; + version = "5.25.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.2/breeze-5.25.2.tar.xz"; - sha256 = "198vzmhljbwrzn48x7g8caj2qwj3q82n6xlj50lpvxcmc0cv740w"; - name = "breeze-5.25.2.tar.xz"; + url = "${mirror}/stable/plasma/5.25.3/breeze-5.25.3.tar.xz"; + sha256 = "0za75ckgfcdxrh2qxgyl2c1273g2xqwmd55njsis1yvwryadypqw"; + name = "breeze-5.25.3.tar.xz"; }; }; breeze-grub = { - version = "5.25.2"; + version = "5.25.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.2/breeze-grub-5.25.2.tar.xz"; - sha256 = "1fnqfmjzlhw1lizax0225qypdm7k4zpxc90s57f2n2173qgi3qfc"; - name = "breeze-grub-5.25.2.tar.xz"; + url = "${mirror}/stable/plasma/5.25.3/breeze-grub-5.25.3.tar.xz"; + sha256 = "12l6skbbr4wv86k5f8969lg9m30x2nrgm38w0mr7fnsqavpbm7v6"; + name = "breeze-grub-5.25.3.tar.xz"; }; }; breeze-gtk = { - version = "5.25.2"; + version = "5.25.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.2/breeze-gtk-5.25.2.tar.xz"; - sha256 = "0vzl0nf39ky3f4jdsmm7hz9kj6yacjjx5mawgzv417zaa6khg8id"; - name = "breeze-gtk-5.25.2.tar.xz"; + url = "${mirror}/stable/plasma/5.25.3/breeze-gtk-5.25.3.tar.xz"; + sha256 = "1nmnxrhidv420bqm97cgmck44kzi6sdqaqg3bim07hbnzbq76d6r"; + name = "breeze-gtk-5.25.3.tar.xz"; }; }; breeze-plymouth = { - version = "5.25.2"; + version = "5.25.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.2/breeze-plymouth-5.25.2.tar.xz"; - sha256 = "026np3kkh6sd0rji7bl2x84za0bpgsljl2dmb3lhwydn93vpv9n1"; - name = "breeze-plymouth-5.25.2.tar.xz"; + url = "${mirror}/stable/plasma/5.25.3/breeze-plymouth-5.25.3.tar.xz"; + sha256 = "1lvsr48mrfjjvs132x2bn4dpwals8k8xinddn9nxykvqw5fiw3wd"; + name = "breeze-plymouth-5.25.3.tar.xz"; }; }; discover = { - version = "5.25.2"; + version = "5.25.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.2/discover-5.25.2.tar.xz"; - sha256 = "1cgalkajbpnpn6vzr84sqkvfdvsanx5l9pxhdkrd94s27gbr9l8c"; - name = "discover-5.25.2.tar.xz"; + url = "${mirror}/stable/plasma/5.25.3/discover-5.25.3.tar.xz"; + sha256 = "0bdg5gxl4zymmy44pvxs9nlk71psdra3778z20ss1j1k3x8dhlrs"; + name = "discover-5.25.3.tar.xz"; }; }; drkonqi = { - version = "5.25.2"; + version = "5.25.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.2/drkonqi-5.25.2.tar.xz"; - sha256 = "1a9y88vkq6qiaiabwy1a13cycj4n79ikn4zdk10zrkgqlnvbyq3y"; - name = "drkonqi-5.25.2.tar.xz"; + url = "${mirror}/stable/plasma/5.25.3/drkonqi-5.25.3.tar.xz"; + sha256 = "11g6pqxb4gjcg9jsm3z9yiqljkks30i2mvanvas5ds1y4py3q7a1"; + name = "drkonqi-5.25.3.tar.xz"; }; }; kactivitymanagerd = { - version = "5.25.2"; + version = "5.25.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.2/kactivitymanagerd-5.25.2.tar.xz"; - sha256 = "06arr36kapjq0gbvk7wnwdgzn8bj64h2cpcrhvzjwmgh4azsz2ww"; - name = "kactivitymanagerd-5.25.2.tar.xz"; + url = "${mirror}/stable/plasma/5.25.3/kactivitymanagerd-5.25.3.tar.xz"; + sha256 = "1095rmvgc9fzflpd9l1kzwdgk5zh7wxyyx7vzzb1kpdhvg4nwx57"; + name = "kactivitymanagerd-5.25.3.tar.xz"; }; }; kde-cli-tools = { - version = "5.25.2"; + version = "5.25.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.2/kde-cli-tools-5.25.2.tar.xz"; - sha256 = "1s6v8xnx1d51lax02fkrx191jxiw6mbsixiw4hvh91viwdckmwr3"; - name = "kde-cli-tools-5.25.2.tar.xz"; + url = "${mirror}/stable/plasma/5.25.3/kde-cli-tools-5.25.3.tar.xz"; + sha256 = "0m8v51ngxfwjianvw1ydr2dpblgik8kv7zw8mi95361kck9jh31h"; + name = "kde-cli-tools-5.25.3.tar.xz"; }; }; kde-gtk-config = { - version = "5.25.2"; + version = "5.25.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.2/kde-gtk-config-5.25.2.tar.xz"; - sha256 = "1v5j2jy90mi309v43fgn3fadk0gapzvn48zizns6avc9v6h9kgvq"; - name = "kde-gtk-config-5.25.2.tar.xz"; + url = "${mirror}/stable/plasma/5.25.3/kde-gtk-config-5.25.3.tar.xz"; + sha256 = "0xjb0vff7mw1kfj5b472plclk80hdqxi2858m3nmkh41bl6a523r"; + name = "kde-gtk-config-5.25.3.tar.xz"; }; }; kdecoration = { - version = "5.25.2"; + version = "5.25.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.2/kdecoration-5.25.2.tar.xz"; - sha256 = "1ynghykyv0h4g3micdc3qf8xxy3vxrdd01gy31jskisksgjkyvw7"; - name = "kdecoration-5.25.2.tar.xz"; + url = "${mirror}/stable/plasma/5.25.3/kdecoration-5.25.3.tar.xz"; + sha256 = "0b6ynqkndmlac89hv339k365m7wykp9y238df62jlq4vpr1r9x9y"; + name = "kdecoration-5.25.3.tar.xz"; }; }; kdeplasma-addons = { - version = "5.25.2"; + version = "5.25.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.2/kdeplasma-addons-5.25.2.tar.xz"; - sha256 = "04n00s6z2cvwax1i8vs1f3by72qzpicsyw3c366kxnaiz3lklqzk"; - name = "kdeplasma-addons-5.25.2.tar.xz"; + url = "${mirror}/stable/plasma/5.25.3/kdeplasma-addons-5.25.3.tar.xz"; + sha256 = "0z976qy49dbvn8nskkrwc1zfnjd3gdzbxzwkg0ini6vypfysybqm"; + name = "kdeplasma-addons-5.25.3.tar.xz"; }; }; kgamma5 = { - version = "5.25.2"; + version = "5.25.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.2/kgamma5-5.25.2.tar.xz"; - sha256 = "0z784j2lyrwl0rlxivgcb91rcpziqnvvfhxzdjk8mkc7j9cxznkx"; - name = "kgamma5-5.25.2.tar.xz"; + url = "${mirror}/stable/plasma/5.25.3/kgamma5-5.25.3.tar.xz"; + sha256 = "10750h6pb98c39s6ijk353jahwjhnj2nqmsmspx9jdz8ig20ygm0"; + name = "kgamma5-5.25.3.tar.xz"; }; }; khotkeys = { - version = "5.25.2"; + version = "5.25.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.2/khotkeys-5.25.2.tar.xz"; - sha256 = "1yr0zydpsl26gmn4n72lql9n4fxrfbzi405srd2694yaxl5xyzl1"; - name = "khotkeys-5.25.2.tar.xz"; + url = "${mirror}/stable/plasma/5.25.3/khotkeys-5.25.3.tar.xz"; + sha256 = "1v4c7lljdvl56mkk8hgbrrx13jdsq7mg8ggrf3qnv1x48yi31rdj"; + name = "khotkeys-5.25.3.tar.xz"; }; }; kinfocenter = { - version = "5.25.2"; + version = "5.25.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.2/kinfocenter-5.25.2.tar.xz"; - sha256 = "004sgb89h0024bliha0bzfzx82d0qi62zicnq68jqngbj5hkmaqm"; - name = "kinfocenter-5.25.2.tar.xz"; + url = "${mirror}/stable/plasma/5.25.3/kinfocenter-5.25.3.tar.xz"; + sha256 = "17hkyraqk4cwrv3rnlbw5jby7v8yv4mfxign1f3n5ldq76v9van1"; + name = "kinfocenter-5.25.3.tar.xz"; }; }; kmenuedit = { - version = "5.25.2"; + version = "5.25.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.2/kmenuedit-5.25.2.tar.xz"; - sha256 = "0d9ldili1zjv4ri1b779zl0kyfxl818n3r7j8cqd3jyfrmh45jgi"; - name = "kmenuedit-5.25.2.tar.xz"; + url = "${mirror}/stable/plasma/5.25.3/kmenuedit-5.25.3.tar.xz"; + sha256 = "0y374al92r0v5adi7jxj6lghbhjg07ym78xsx09qn48h5c0s34pp"; + name = "kmenuedit-5.25.3.tar.xz"; }; }; kscreen = { - version = "5.25.2"; + version = "5.25.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.2/kscreen-5.25.2.tar.xz"; - sha256 = "0llassqfn24vkc88pagd0haqdlblg5ha09rw5q4cc6irvqwrvaxa"; - name = "kscreen-5.25.2.tar.xz"; + url = "${mirror}/stable/plasma/5.25.3/kscreen-5.25.3.tar.xz"; + sha256 = "0p9pzigll9b5jj232sz05znf5syycif0dzvccxds6z0yr124jlvz"; + name = "kscreen-5.25.3.tar.xz"; }; }; kscreenlocker = { - version = "5.25.2"; + version = "5.25.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.2/kscreenlocker-5.25.2.tar.xz"; - sha256 = "15zkmxwcv9cdaczxvjpipngv77dqhn0s26678831axfjzh7v89iy"; - name = "kscreenlocker-5.25.2.tar.xz"; + url = "${mirror}/stable/plasma/5.25.3/kscreenlocker-5.25.3.tar.xz"; + sha256 = "1kii3r3j89avwyb00wrw80k5sj0q4wqgmy1q0yxfps9jk729k3wc"; + name = "kscreenlocker-5.25.3.tar.xz"; }; }; ksshaskpass = { - version = "5.25.2"; + version = "5.25.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.2/ksshaskpass-5.25.2.tar.xz"; - sha256 = "1zwhrzclbg3mxdwif13f9avv01kykwi8b3j9qk4ycfrwdvwidnd6"; - name = "ksshaskpass-5.25.2.tar.xz"; + url = "${mirror}/stable/plasma/5.25.3/ksshaskpass-5.25.3.tar.xz"; + sha256 = "0sfl77szvfq9c7v0gsv5nnf7h5kxigyy2z2p1cwmhm1pq4n606nk"; + name = "ksshaskpass-5.25.3.tar.xz"; }; }; ksystemstats = { - version = "5.25.2"; + version = "5.25.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.2/ksystemstats-5.25.2.tar.xz"; - sha256 = "1i6sg5j97w4nl508yl80v2rnr9zmb5f6ymvjvvkfbigp62yz8gcf"; - name = "ksystemstats-5.25.2.tar.xz"; + url = "${mirror}/stable/plasma/5.25.3/ksystemstats-5.25.3.tar.xz"; + sha256 = "0s08mazc081wxbccmb4s35i7p57an8nlxmw25lh1j83jj06gyd4f"; + name = "ksystemstats-5.25.3.tar.xz"; }; }; kwallet-pam = { - version = "5.25.2"; + version = "5.25.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.2/kwallet-pam-5.25.2.tar.xz"; - sha256 = "0pffi0jkfib01aqqif5401avkljxsi468wg5nva1fg3h8w9i7xqd"; - name = "kwallet-pam-5.25.2.tar.xz"; + url = "${mirror}/stable/plasma/5.25.3/kwallet-pam-5.25.3.tar.xz"; + sha256 = "1i345vl0sfzg8zmz6h8hsxmx9cbdb7072avc6yz42ra9yf4372jb"; + name = "kwallet-pam-5.25.3.tar.xz"; }; }; kwayland-integration = { - version = "5.25.2"; + version = "5.25.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.2/kwayland-integration-5.25.2.tar.xz"; - sha256 = "1praxpzsbwb7b1p6rsnrmv9wdn5p0j28vch6ydj2qc25f8h7nvfj"; - name = "kwayland-integration-5.25.2.tar.xz"; + url = "${mirror}/stable/plasma/5.25.3/kwayland-integration-5.25.3.tar.xz"; + sha256 = "0d45wigxspvv561fjam8yiyq6277n5wgv2sn8ymvqbal8v801bjf"; + name = "kwayland-integration-5.25.3.tar.xz"; }; }; kwin = { - version = "5.25.2"; + version = "5.25.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.2/kwin-5.25.2.tar.xz"; - sha256 = "1mskwppqv3ismlg4r8fmlrya455mds8ng36lma4acj13vsh1wx2l"; - name = "kwin-5.25.2.tar.xz"; + url = "${mirror}/stable/plasma/5.25.3/kwin-5.25.3.tar.xz"; + sha256 = "1vyh5ymvkzxsgs4904ijac6xrb5fgxpypc8mlnwcca1gd9xpr4jj"; + name = "kwin-5.25.3.tar.xz"; }; }; kwrited = { - version = "5.25.2"; + version = "5.25.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.2/kwrited-5.25.2.tar.xz"; - sha256 = "02c24ywwrzyz5k54ywh32lx2yrjd0xydn1f20h9h6cx16fmlwdq3"; - name = "kwrited-5.25.2.tar.xz"; + url = "${mirror}/stable/plasma/5.25.3/kwrited-5.25.3.tar.xz"; + sha256 = "133ampgha0348m5ild1dg48jpblk4c16d6nk759yywz8125wyapc"; + name = "kwrited-5.25.3.tar.xz"; }; }; layer-shell-qt = { - version = "5.25.2"; + version = "5.25.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.2/layer-shell-qt-5.25.2.tar.xz"; - sha256 = "14xk9hjxm267dfb8dxgwdjmws95nqc9ygr51mdzsyxqwis9v1i4m"; - name = "layer-shell-qt-5.25.2.tar.xz"; + url = "${mirror}/stable/plasma/5.25.3/layer-shell-qt-5.25.3.tar.xz"; + sha256 = "06rxqm4wh4mcszrwb2dbgpxj3dqfx0rccyyjp091lbsncqm1gib0"; + name = "layer-shell-qt-5.25.3.tar.xz"; }; }; libkscreen = { - version = "5.25.2"; + version = "5.25.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.2/libkscreen-5.25.2.tar.xz"; - sha256 = "0jy2p87jj39c75jmj95jqpilphwhzqf7m1qljhbrjgr2w1adnz9p"; - name = "libkscreen-5.25.2.tar.xz"; + url = "${mirror}/stable/plasma/5.25.3/libkscreen-5.25.3.tar.xz"; + sha256 = "1mxkrk04wcyw4xbfiyxbp5iwnhqr10yk39zx5bbjd9zag0vdi7z5"; + name = "libkscreen-5.25.3.tar.xz"; }; }; libksysguard = { - version = "5.25.2"; + version = "5.25.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.2/libksysguard-5.25.2.tar.xz"; - sha256 = "020wxlkj03sj0d81r1f8axw4i78gg45cm3zf6ikhyvka9hbh5xcy"; - name = "libksysguard-5.25.2.tar.xz"; + url = "${mirror}/stable/plasma/5.25.3/libksysguard-5.25.3.tar.xz"; + sha256 = "1mrrrxjvqmrnkjwafvqrd2hlvl9gr9y4hn7dv0gf70lp5bl06i89"; + name = "libksysguard-5.25.3.tar.xz"; }; }; milou = { - version = "5.25.2"; + version = "5.25.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.2/milou-5.25.2.tar.xz"; - sha256 = "15gf3mgbx8z4cahw6w978r5inpn9rfhzj7x5sfhi6w631nasd1yl"; - name = "milou-5.25.2.tar.xz"; + url = "${mirror}/stable/plasma/5.25.3/milou-5.25.3.tar.xz"; + sha256 = "1xb3i5dn6r4mglci8llchjz484zsw3kqyl9ag8wch54b5cjmz4ap"; + name = "milou-5.25.3.tar.xz"; }; }; oxygen = { - version = "5.25.2"; + version = "5.25.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.2/oxygen-5.25.2.tar.xz"; - sha256 = "0d7705s5lp4lac7rn7q7sy2l0n5519zqfpx6746434z505zc1krc"; - name = "oxygen-5.25.2.tar.xz"; + url = "${mirror}/stable/plasma/5.25.3/oxygen-5.25.3.tar.xz"; + sha256 = "0ynkmnmd1x36zn6x4chvpsrsi5rfqmk45qqxdx60x0w1hhi3x6bh"; + name = "oxygen-5.25.3.tar.xz"; }; }; oxygen-sounds = { - version = "5.25.2"; + version = "5.25.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.2/oxygen-sounds-5.25.2.tar.xz"; - sha256 = "13hhvfndz57gsdb70jnb12vcich4bfrm0rvb12zaza5j1qk939k7"; - name = "oxygen-sounds-5.25.2.tar.xz"; + url = "${mirror}/stable/plasma/5.25.3/oxygen-sounds-5.25.3.tar.xz"; + sha256 = "1hdqdq3qxpcyfs5gsmlpb3pjvixyr1ny4qwqq18givz8jbah3vkz"; + name = "oxygen-sounds-5.25.3.tar.xz"; }; }; plasma-browser-integration = { - version = "5.25.2"; + version = "5.25.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.2/plasma-browser-integration-5.25.2.tar.xz"; - sha256 = "0fyqd160c0ap3z8k2p16x4k8hvbdmnfp2hbx0p93d3acpi9vpqa3"; - name = "plasma-browser-integration-5.25.2.tar.xz"; + url = "${mirror}/stable/plasma/5.25.3/plasma-browser-integration-5.25.3.tar.xz"; + sha256 = "1krf9fchs3w0r1irzrdrxgwcgfsyhm2384q0c5vp5xg7dh10xvz2"; + name = "plasma-browser-integration-5.25.3.tar.xz"; }; }; plasma-desktop = { - version = "5.25.2"; + version = "5.25.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.2/plasma-desktop-5.25.2.tar.xz"; - sha256 = "09pnxh29xzag90sxdcjw8jafwrlpm8d4bl0xws74df94kqkcira1"; - name = "plasma-desktop-5.25.2.tar.xz"; + url = "${mirror}/stable/plasma/5.25.3/plasma-desktop-5.25.3.tar.xz"; + sha256 = "134dgqqak5d3427znlj138f0k48qhkzs7pqi19yn89fbzw5vg8s8"; + name = "plasma-desktop-5.25.3.tar.xz"; }; }; plasma-disks = { - version = "5.25.2"; + version = "5.25.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.2/plasma-disks-5.25.2.tar.xz"; - sha256 = "1fvka372hjqb2m6m5479g9w9z96hygiaqm2jzh9f5qn6aj4baq84"; - name = "plasma-disks-5.25.2.tar.xz"; + url = "${mirror}/stable/plasma/5.25.3/plasma-disks-5.25.3.tar.xz"; + sha256 = "1dyxa5x4v6w8fn8956wcc9mvncnjf43cpn0algp54f9ndy1jaalw"; + name = "plasma-disks-5.25.3.tar.xz"; }; }; plasma-firewall = { - version = "5.25.2"; + version = "5.25.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.2/plasma-firewall-5.25.2.tar.xz"; - sha256 = "0gciy4nl7dcghgwcy7kx3zbsgvygs90wfrzr1nkk2vgphgvr4c6c"; - name = "plasma-firewall-5.25.2.tar.xz"; + url = "${mirror}/stable/plasma/5.25.3/plasma-firewall-5.25.3.tar.xz"; + sha256 = "0cwk4scadk4pd7v93arkrn1wgyc4d81995znp23vd9pmlaazyikv"; + name = "plasma-firewall-5.25.3.tar.xz"; }; }; plasma-integration = { - version = "5.25.2"; + version = "5.25.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.2/plasma-integration-5.25.2.tar.xz"; - sha256 = "1mvzxasr3m2jf7kvx5df0ijilbs7nvw3kxpsa543c2bmp6ib9zla"; - name = "plasma-integration-5.25.2.tar.xz"; + url = "${mirror}/stable/plasma/5.25.3/plasma-integration-5.25.3.tar.xz"; + sha256 = "1wsz0vbb0kj4542h7zca9yc6xz90ziv4lbm39d7dxr9hm94cdbjk"; + name = "plasma-integration-5.25.3.tar.xz"; }; }; plasma-mobile = { - version = "5.25.2"; + version = "5.25.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.2/plasma-mobile-5.25.2.tar.xz"; - sha256 = "0jgrw9wp0l289sygpr0mg7zcjg97bdgl039vdabf4ixd721swmz8"; - name = "plasma-mobile-5.25.2.tar.xz"; + url = "${mirror}/stable/plasma/5.25.3/plasma-mobile-5.25.3.tar.xz"; + sha256 = "1dzfbqg2zmdr0dlm99c3pj9iy6yagshlfj9x018sa0bzjysf29g3"; + name = "plasma-mobile-5.25.3.tar.xz"; }; }; plasma-nano = { - version = "5.25.2"; + version = "5.25.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.2/plasma-nano-5.25.2.tar.xz"; - sha256 = "1byhcnbjy691jkmhd7pch0rxhi6bbrzhzx47c97mqgxid5a8j0bk"; - name = "plasma-nano-5.25.2.tar.xz"; + url = "${mirror}/stable/plasma/5.25.3/plasma-nano-5.25.3.tar.xz"; + sha256 = "00m95c1cb3g8v8w0d4vnbnjhjmr5hw7gljn8nc705mpxsx03c3kd"; + name = "plasma-nano-5.25.3.tar.xz"; }; }; plasma-nm = { - version = "5.25.2"; + version = "5.25.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.2/plasma-nm-5.25.2.tar.xz"; - sha256 = "1hwxsprrwxap5q707jv9w8i7l3rql33dwh66fwqrjjm5v3ncac48"; - name = "plasma-nm-5.25.2.tar.xz"; + url = "${mirror}/stable/plasma/5.25.3/plasma-nm-5.25.3.tar.xz"; + sha256 = "0k8zwjjy8d5lp1slky13fx5j6kjsbs4irz3x5fm54aki15hdcjx7"; + name = "plasma-nm-5.25.3.tar.xz"; }; }; plasma-pa = { - version = "5.25.2"; + version = "5.25.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.2/plasma-pa-5.25.2.tar.xz"; - sha256 = "1k925flcmgi78rln7nb0vh43gdf1001wk68n3zdx6wmhscpbjwwd"; - name = "plasma-pa-5.25.2.tar.xz"; + url = "${mirror}/stable/plasma/5.25.3/plasma-pa-5.25.3.tar.xz"; + sha256 = "17881v0fff5mbgh6rgx4a2hk9m35flqijckwlyj2kcrcsqi3aq21"; + name = "plasma-pa-5.25.3.tar.xz"; }; }; plasma-sdk = { - version = "5.25.2"; + version = "5.25.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.2/plasma-sdk-5.25.2.tar.xz"; - sha256 = "15iaw4lggsmd4hhgdkwcp4q3j1y9rxjngc5gxh7ah28ijmq6fnr1"; - name = "plasma-sdk-5.25.2.tar.xz"; + url = "${mirror}/stable/plasma/5.25.3/plasma-sdk-5.25.3.tar.xz"; + sha256 = "1hhffvqvxlhdyg8v7b7drb0n4fnkxlvy0xfffnnln66pknxk7s5w"; + name = "plasma-sdk-5.25.3.tar.xz"; }; }; plasma-systemmonitor = { - version = "5.25.2"; + version = "5.25.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.2/plasma-systemmonitor-5.25.2.tar.xz"; - sha256 = "02jw59b7190wqkhyz4w8zcdydxpp9kq1dxd9x51wy0wpcp6igina"; - name = "plasma-systemmonitor-5.25.2.tar.xz"; + url = "${mirror}/stable/plasma/5.25.3/plasma-systemmonitor-5.25.3.tar.xz"; + sha256 = "07mxkm0ynq0xiqc1p4iqjc4c1x7198hr15r9ysajgs0sf9bcd6hx"; + name = "plasma-systemmonitor-5.25.3.tar.xz"; }; }; plasma-tests = { - version = "5.25.2"; + version = "5.25.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.2/plasma-tests-5.25.2.tar.xz"; - sha256 = "0zq4w8js35b9p0gih7x92iscmm2snwgm7bclrh29gvxyfsjir8wa"; - name = "plasma-tests-5.25.2.tar.xz"; + url = "${mirror}/stable/plasma/5.25.3/plasma-tests-5.25.3.tar.xz"; + sha256 = "0d7vhb75p2rhfbysa7bg80836ycryg4jcn91grag8y7pcq6m6zzn"; + name = "plasma-tests-5.25.3.tar.xz"; }; }; plasma-thunderbolt = { - version = "5.25.2"; + version = "5.25.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.2/plasma-thunderbolt-5.25.2.tar.xz"; - sha256 = "1mjh14yfap7jr181xvkar9hgmqzvghb4rs2d45b1ddwz3n340ak6"; - name = "plasma-thunderbolt-5.25.2.tar.xz"; + url = "${mirror}/stable/plasma/5.25.3/plasma-thunderbolt-5.25.3.tar.xz"; + sha256 = "05bdq7vdwpyyrfgvp48m8dbsjhvnaf84zhbcyjvjygvlhzdm8j57"; + name = "plasma-thunderbolt-5.25.3.tar.xz"; }; }; plasma-vault = { - version = "5.25.2"; + version = "5.25.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.2/plasma-vault-5.25.2.tar.xz"; - sha256 = "12z4kcrsp5jy16x4kssc9l7d2acbkg30jyg6f77jqh1ra671y1a5"; - name = "plasma-vault-5.25.2.tar.xz"; + url = "${mirror}/stable/plasma/5.25.3/plasma-vault-5.25.3.tar.xz"; + sha256 = "1phb7rygvm2c0n0yf5xyj3xpm1apfq3knfyiasgbjl4z6aimq406"; + name = "plasma-vault-5.25.3.tar.xz"; }; }; plasma-workspace = { - version = "5.25.2"; + version = "5.25.3.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.2/plasma-workspace-5.25.2.tar.xz"; - sha256 = "16chbhmby9ixyh46xqsa0nd6yhpf3xlk2sv43g34my1hkhp63r6w"; - name = "plasma-workspace-5.25.2.tar.xz"; + url = "${mirror}/stable/plasma/5.25.3/plasma-workspace-5.25.3.1.tar.xz"; + sha256 = "09hgd1k0095s18a4147qihbsl5v8hadj7hm3zixf362sydgkal51"; + name = "plasma-workspace-5.25.3.1.tar.xz"; }; }; plasma-workspace-wallpapers = { - version = "5.25.2"; + version = "5.25.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.2/plasma-workspace-wallpapers-5.25.2.tar.xz"; - sha256 = "12r2zfz63xgfv0sxv1px7hbwan9pv3ik5h7lkfhcjbi9bhav2pyr"; - name = "plasma-workspace-wallpapers-5.25.2.tar.xz"; + url = "${mirror}/stable/plasma/5.25.3/plasma-workspace-wallpapers-5.25.3.tar.xz"; + sha256 = "15swpsqjdxxzkjw0phs4h7p3l4lfshsqv6pk3qbfbp91dd05cplh"; + name = "plasma-workspace-wallpapers-5.25.3.tar.xz"; }; }; plymouth-kcm = { - version = "5.25.2"; + version = "5.25.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.2/plymouth-kcm-5.25.2.tar.xz"; - sha256 = "04wfd5a63zbnvsngxpj0jvvhjhcchk2nd0ln8i2zdhhr0xlsbiw1"; - name = "plymouth-kcm-5.25.2.tar.xz"; + url = "${mirror}/stable/plasma/5.25.3/plymouth-kcm-5.25.3.tar.xz"; + sha256 = "0sb0gh0sh8lc13pbqkl8icjakzk0h7r3l6v3kwg0jyvmk0if1bpj"; + name = "plymouth-kcm-5.25.3.tar.xz"; }; }; polkit-kde-agent = { - version = "1-5.25.2"; + version = "1-5.25.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.2/polkit-kde-agent-1-5.25.2.tar.xz"; - sha256 = "1hcyw7qzryvqlszqv7lmhmhz7fbjd4961xq7hh18glm53rrz3z31"; - name = "polkit-kde-agent-1-5.25.2.tar.xz"; + url = "${mirror}/stable/plasma/5.25.3/polkit-kde-agent-1-5.25.3.tar.xz"; + sha256 = "0j067ps86zk38r0spcfpv33mxiagdnrkyy033v8gnsiayhrp9pcm"; + name = "polkit-kde-agent-1-5.25.3.tar.xz"; }; }; powerdevil = { - version = "5.25.2"; + version = "5.25.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.2/powerdevil-5.25.2.tar.xz"; - sha256 = "1ahq10mrnryq87ihj5b6a1ifjnyam7sxcgbr3avc2jpb4q8njmb6"; - name = "powerdevil-5.25.2.tar.xz"; + url = "${mirror}/stable/plasma/5.25.3/powerdevil-5.25.3.tar.xz"; + sha256 = "1lfws0rj2kbqvgm7gb4h6gmrpa71jbqgfmvmd2n4l9bxxx73rbh2"; + name = "powerdevil-5.25.3.tar.xz"; }; }; qqc2-breeze-style = { - version = "5.25.2"; + version = "5.25.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.2/qqc2-breeze-style-5.25.2.tar.xz"; - sha256 = "1l8133qlqhdq8y42yiy0njgfv9lzxlc6fdicfmr21bfvj3aj20mk"; - name = "qqc2-breeze-style-5.25.2.tar.xz"; + url = "${mirror}/stable/plasma/5.25.3/qqc2-breeze-style-5.25.3.tar.xz"; + sha256 = "1j714iaysfqkr997q94pv2abj433ps43myy37p8ss0v8pra9hn5c"; + name = "qqc2-breeze-style-5.25.3.tar.xz"; }; }; sddm-kcm = { - version = "5.25.2"; + version = "5.25.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.2/sddm-kcm-5.25.2.tar.xz"; - sha256 = "0idr9ckrbyh66m0lbza66z2v24pfzwx04np84242p79kyqgjlljf"; - name = "sddm-kcm-5.25.2.tar.xz"; + url = "${mirror}/stable/plasma/5.25.3/sddm-kcm-5.25.3.tar.xz"; + sha256 = "1mipvf25vjhdrww9cinp4v7g73swk364zfkyk4fypw8bccrbfpsd"; + name = "sddm-kcm-5.25.3.tar.xz"; }; }; systemsettings = { - version = "5.25.2"; + version = "5.25.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.2/systemsettings-5.25.2.tar.xz"; - sha256 = "1bz00nnrmpm2kjcapzaxkhx0j4a2vn0nhshgch65h7f3kjp4z0nm"; - name = "systemsettings-5.25.2.tar.xz"; + url = "${mirror}/stable/plasma/5.25.3/systemsettings-5.25.3.tar.xz"; + sha256 = "00n4r51qp03cwfsdrsza2nv5558zs8dyd6fywcycjd1ryqiyrl4r"; + name = "systemsettings-5.25.3.tar.xz"; }; }; xdg-desktop-portal-kde = { - version = "5.25.2"; + version = "5.25.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.2/xdg-desktop-portal-kde-5.25.2.tar.xz"; - sha256 = "1sjm15z83s6vna78ffn390sdr4pnyw5yl8lq0jz79mkxyz2w4y2h"; - name = "xdg-desktop-portal-kde-5.25.2.tar.xz"; + url = "${mirror}/stable/plasma/5.25.3/xdg-desktop-portal-kde-5.25.3.tar.xz"; + sha256 = "07pcpxq7j1b62wwds6q2niyh74dc9i2lwvka77g1ii55syybm7n7"; + name = "xdg-desktop-portal-kde-5.25.3.tar.xz"; }; }; } diff --git a/pkgs/development/compilers/crystal2nix/default.nix b/pkgs/development/compilers/crystal2nix/default.nix index b1f36b02090cd..3a53525b47717 100644 --- a/pkgs/development/compilers/crystal2nix/default.nix +++ b/pkgs/development/compilers/crystal2nix/default.nix @@ -2,13 +2,13 @@ crystal.buildCrystalPackage rec { pname = "crystal2nix"; - version = "0.1.1"; + version = "0.3.0"; src = fetchFromGitHub { owner = "peterhoeg"; repo = "crystal2nix"; rev = "v${version}"; - sha256 = "sha256-LKZychkhWy/rVdrP3Yo6g8CL1pGdiZlBykzFjnWh0fg="; + hash = "sha256-gb2vgKWVXwYWfUUcFvOLFF0qB4CTBekEllpyKduU1Mo="; }; format = "shards"; @@ -25,8 +25,7 @@ crystal.buildCrystalPackage rec { # temporarily off. We need the checks to execute the wrapped binary doCheck = false; - # it requires an internet connection when run - doInstallCheck = false; + doInstallCheck = true; meta = with lib; { description = "Utility to convert Crystal's shard.lock files to a Nix file"; diff --git a/pkgs/development/compilers/crystal2nix/shards.nix b/pkgs/development/compilers/crystal2nix/shards.nix index abfc0f93072d7..728aefb805028 100644 --- a/pkgs/development/compilers/crystal2nix/shards.nix +++ b/pkgs/development/compilers/crystal2nix/shards.nix @@ -1,14 +1,12 @@ { - json_mapping = { - owner = "crystal-lang"; - repo = "json_mapping.cr"; - rev = "v0.1.0"; - sha256 = "1qq5vs2085x7cwmp96rrjns0yz9kiz1lycxynfbz5psxll6b8p55"; + spectator = { + url = "https://gitlab.com/arctic-fox/spectator.git"; + rev = "v0.10.5"; + sha256 = "1fgjz5vg59h4m25v4fjklimcdn62ngqbchm00kw1160ggjpgpzw2"; }; - yaml_mapping = { - owner = "crystal-lang"; - repo = "yaml_mapping.cr"; - rev = "v0.1.0"; - sha256 = "02spz1521g59ar6rp0znnr01di766kknbjxjnygs39yn0cmpzqc1"; + version_from_shard = { + url = "https://github.com/hugopl/version_from_shard.git"; + rev = "v1.2.5"; + sha256 = "0xizj0q4rd541rwjbx04cjifc2gfx4l5v6q2y7gmd0ndjmkgb8ik"; }; } diff --git a/pkgs/development/compilers/mono/6.nix b/pkgs/development/compilers/mono/6.nix index 1a7297af918ec..8de3d92ab056b 100644 --- a/pkgs/development/compilers/mono/6.nix +++ b/pkgs/development/compilers/mono/6.nix @@ -2,8 +2,8 @@ callPackage ./generic.nix ({ inherit Foundation libobjc; - version = "6.12.0.122"; + version = "6.12.0.182"; srcArchiveSuffix = "tar.xz"; - sha256 = "sha256-KcJ3Zg/F51ExB67hy/jFBXyTcKTN/tovx4G+aYbYnSM="; + sha256 = "sha256-VzZqarTztezxEdSFSAMWFbOhANuHxnn8AG6Mik79lCQ="; enableParallelBuilding = true; }) diff --git a/pkgs/development/compilers/mono/generic.nix b/pkgs/development/compilers/mono/generic.nix index e79a06cae7f5b..8336f76b5253a 100644 --- a/pkgs/development/compilers/mono/generic.nix +++ b/pkgs/development/compilers/mono/generic.nix @@ -76,8 +76,7 @@ stdenv.mkDerivation rec { inherit enableParallelBuilding; meta = with lib; { - # Per nixpkgs#151720 the build failures for aarch64-darwin are fixed upstream, but a - # stable release with the fix is not available yet. + # Per nixpkgs#151720 the build failures for aarch64-darwin are fixed since 6.12.0.129 broken = stdenv.isDarwin && stdenv.isAarch64 && lib.versionOlder version "6.12.0.129"; homepage = "https://mono-project.com/"; description = "Cross platform, open source .NET development framework"; diff --git a/pkgs/development/compilers/terra/default.nix b/pkgs/development/compilers/terra/default.nix index 56f5cea5f9190..2d853795cf9c9 100644 --- a/pkgs/development/compilers/terra/default.nix +++ b/pkgs/development/compilers/terra/default.nix @@ -2,14 +2,14 @@ , symlinkJoin, breakpointHook, cudaPackages, enableCUDA ? false }: let - luajitRev = "9143e86498436892cb4316550be4d45b68a61224"; + luajitRev = "6053b04815ecbc8eec1e361ceb64e68fb8fac1b3"; luajitBase = "LuaJIT-${luajitRev}"; luajitArchive = "${luajitBase}.tar.gz"; luajitSrc = fetchFromGitHub { owner = "LuaJIT"; repo = "LuaJIT"; rev = luajitRev; - sha256 = "1zw1yr0375d6jr5x20zvkvk76hkaqamjynbswpl604w6r6id070b"; + sha256 = "1caxm1js877mky8hci1km3ycz2hbwpm6xbyjha72gfc7lr6pc429"; }; llvmMerged = symlinkJoin { @@ -30,13 +30,13 @@ let in stdenv.mkDerivation rec { pname = "terra"; - version = "1.0.0-beta5"; + version = "1.0.4"; src = fetchFromGitHub { owner = "terralang"; repo = "terra"; - rev = "bcc5a81649cb91aaaff33790b39c87feb5f7a4c2"; - sha256 = "0jb147vbvix3zvrq6ln321jdxjgr6z68pdrirjp4zqmx78yqlcx3"; + rev = "release-${version}"; + sha256 = "07715qsc316h0mmsjifr1ja5fbp216ji70hpq665r0v5ikiqjfsv"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/compilers/zig/0.8.1.nix b/pkgs/development/compilers/zig/0.8.1.nix deleted file mode 100644 index 385b68a79291b..0000000000000 --- a/pkgs/development/compilers/zig/0.8.1.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ lib -, fetchFromGitHub -, cmake -, llvmPackages -, libxml2 -, zlib -}: - -let - inherit (llvmPackages) stdenv; -in -stdenv.mkDerivation rec { - pname = "zig"; - version = "0.8.1"; - - src = fetchFromGitHub { - owner = "ziglang"; - repo = pname; - rev = version; - hash = "sha256-zMSOH8ZWcvzHRwOgGIbLO9Q6jf1P5QL5KCMD+frp+JA="; - }; - - nativeBuildInputs = [ - cmake - llvmPackages.llvm.dev - ]; - buildInputs = [ - libxml2 - zlib - ] ++ (with llvmPackages; [ - libclang - lld - llvm - ]); - - preBuild = '' - export HOME=$TMPDIR; - ''; - - doCheck = true; - checkPhase = '' - runHook preCheck - ./zig test --cache-dir "$TMPDIR" -I $src/test $src/test/behavior.zig - runHook postCheck - ''; - - meta = with lib; { - homepage = "https://ziglang.org/"; - description = - "General-purpose programming language and toolchain for maintaining robust, optimal, and reusable software"; - license = licenses.mit; - maintainers = with maintainers; [ andrewrk AndersonTorres ]; - platforms = platforms.unix; - broken = stdenv.isDarwin; # See https://github.com/NixOS/nixpkgs/issues/86299 - }; -} - diff --git a/pkgs/development/coq-modules/coqeal/default.nix b/pkgs/development/coq-modules/coqeal/default.nix index 563e2dc22d6df..4efc776e28da7 100644 --- a/pkgs/development/coq-modules/coqeal/default.nix +++ b/pkgs/development/coq-modules/coqeal/default.nix @@ -10,12 +10,14 @@ with lib; inherit version; defaultVersion = with versions; switch [ coq.version mathcomp.version ] [ + { cases = [ (range "8.13" "8.15") (isGe "1.13.0") ]; out = "1.1.1"; } { cases = [ (range "8.10" "8.15") (isGe "1.12.0") ]; out = "1.1.0"; } { cases = [ (isGe "8.10") (range "1.11.0" "1.12.0") ]; out = "1.0.5"; } { cases = [ (isGe "8.7") "1.11.0" ]; out = "1.0.4"; } { cases = [ (isGe "8.7") "1.10.0" ]; out = "1.0.3"; } ] null; + release."1.1.1".sha256 = "sha256-ExAdC3WuArNxS+Sa1r4x5aT7ylbCvP/BZXfkdQNAvZ8="; release."1.1.0".sha256 = "1vyhfna5frkkq2fl1fkg2mwzpg09k3sbzxxpyp14fjay81xajrxr"; release."1.0.6".sha256 = "0lqkyfj4qbq8wr3yk8qgn7mclw582n3fjl9l19yp8cnchspzywx0"; release."1.0.5".sha256 = "0cmvky8glb5z2dy3q62aln6qbav4lrf2q1589f6h1gn5bgjrbzkm"; diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 40b7efc96bd0b..478e7ed82b582 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -352,10 +352,14 @@ self: super: { lvmrun = disableHardening ["format"] (dontCheck super.lvmrun); matplotlib = dontCheck super.matplotlib; + brick_0_71_1 = super.brick_0_71_1.overrideScope (self: super: { + vty = self.vty_5_36; + }); + # https://github.com/matterhorn-chat/matterhorn/issues/679 they do not want to be on stackage # Needs brick ^>= 0.70 matterhorn = doJailbreak (super.matterhorn.overrideScope (self: super: { - brick = self.brick_0_70_1; + brick = self.brick_0_71_1; })); memcache = dontCheck super.memcache; @@ -628,12 +632,6 @@ self: super: { # 2022-03-19: Testsuite is failing: https://github.com/puffnfresh/haskell-jwt/issues/2 jwt = dontCheck super.jwt; - # 2022-03-16: ghc 9 support has not been merged: https://github.com/hasura/monad-validate/pull/5 - monad-validate = appendPatch (fetchpatch { - url = "https://github.com/hasura/monad-validate/commit/7ba916e23c219a8cd397e2a1801c74682b52fcf0.patch"; - sha256 = "sha256-udJ+/2VvfWA5Bm36nftH0sbPNuMkWj8rCh9cNN2f9Zw="; - }) (dontCheck super.monad-validate); - # Build the latest git version instead of the official release. This isn't # ideal, but Chris doesn't seem to make official releases any more. structured-haskell-mode = overrideCabal (drv: { @@ -1294,10 +1292,6 @@ self: super: { # 2021-12-26: Too strict bounds on doctest polysemy-plugin = doJailbreak super.polysemy-plugin; - # Test suite requires running a database server. Testing is done upstream. - hasql-notifications = dontCheck super.hasql-notifications; - hasql-pool = dontCheck super.hasql-pool; - # hasn‘t bumped upper bounds # upstream: https://github.com/obsidiansystems/which/pull/6 which = doJailbreak super.which; @@ -2558,21 +2552,9 @@ self: super: { lsp-types = self.lsp-types_1_5_0_0; }); - # A delay between futhark package uploads caused us to end up with conflicting - # versions of futhark and futhark-manifest - futhark = assert super.futhark.version == "0.21.12"; overrideCabal (drv: { - editedCabalFile = null; - revision = null; - version = "0.21.13"; - sha256 = "0bzqlsaaqbbi47zvmvv7hd6hcz54hzw676rh9nxcjxgff3hzqb08"; - libraryHaskellDepends = drv.libraryHaskellDepends or [] ++ [ - self.fgl - self.fgl-visualize - self.co-log-core - ]; - }) (super.futhark.override { + futhark = super.futhark.override { lsp = self.lsp_1_5_0_0; - }); + }; } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super // (let # We need to build purescript with these dependencies and thus also its reverse diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix index 57f4bad82a1b5..334b402dae7c6 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix @@ -155,16 +155,6 @@ self: super: { ] ++ drv.testFlags or []; }) (doJailbreak super.hpack); - validity = pkgs.lib.pipe super.validity [ - # head.hackage patch - (appendPatch (pkgs.fetchpatch { - url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/9110e6972b5daf085e19cad41f97920d3ddac499/patches/validity-0.12.0.0.patch"; - sha256 = "0hzns596dxvyn8irgi7aflx76wak1qi13chkkvl0055pkgykm08f"; - })) - # head.hackage ignores test suite - dontCheck - ]; - # lens >= 5.1 supports 9.2.1 lens = doDistribute self.lens_5_1_1; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 67c5b5255fa85..5bbf52a77e35e 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -821,7 +821,6 @@ broken-packages: - config-parser - Configurable - configuration - - configurator-pg - config-value-getopt - confsolve - congruence-relation @@ -2073,7 +2072,6 @@ broken-packages: - hasql-cursor-transaction - hasql-explain-tests - hasql-generic - - hasql-implicits - hasql-resource-pool - hasql-simple - hasql-streams-example @@ -2458,7 +2456,6 @@ broken-packages: - hspec-snap - hspec-structured-formatter - hspec-tables - - hspec-wai-json - HsPerl5 - hs-pgms - hspkcs11 @@ -2677,6 +2674,7 @@ broken-packages: - interval - interval-algebra - interval-patterns + - interval-tree-clock - IntFormats - int-multimap - intricacy @@ -4012,6 +4010,7 @@ broken-packages: - postgresql-tx-simple - postgresql-tx-squeal - postgresql-typed-lifted + - postgrest - postgres-tmp - postgrest-ws - postgres-websockets @@ -4142,6 +4141,7 @@ broken-packages: - push-notifications - putlenses - puzzle-draw + - pvector - pyffi - pyfi - python-pickle diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 8d07653534210..c10397ec1dd05 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -141,6 +141,7 @@ extra-packages: - fourmolu == 0.6.0.0 # 2022-06-05: Last fourmolu version compatible with hls 1.7/ hls-fourmolu-plugin 1.0.3.0 - hnix-store-core == 0.5.0.0 # 2022-06-17: Until hnix 0.17 - hnix-store-remote == 0.5.0.0 # 2022-06-17: Until hnix 0.17 + - vty == 5.35.1 # 2022-07-08: needed for glirc-2.39.0.1 package-maintainers: abbradar: @@ -347,6 +348,8 @@ package-maintainers: - hercules-ci-cnix-store - inline-c - inline-c-cpp + roosemberth: + - git-annex rvl: - taffybar - arbtt diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml index f9c9d161a6924..d4c6491955fea 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml @@ -1,4 +1,4 @@ -# Stackage LTS 19.13 +# Stackage LTS 19.14 # This file is auto-generated by # maintainers/scripts/haskell/update-stackage.sh default-package-overrides: @@ -279,7 +279,7 @@ default-package-overrides: - cached-json-file ==0.1.1 - cacophony ==0.10.1 - calendar-recycling ==0.0.0.1 - - call-alloy ==0.3.0.1 + - call-alloy ==0.3.0.2 - call-stack ==0.4.0 - can-i-haz ==0.3.1.0 - capability ==0.5.0.1 @@ -720,7 +720,7 @@ default-package-overrides: - extrapolate ==0.4.6 - fail ==4.9.0.0 - failable ==1.2.4.0 - - fakedata ==1.0.2 + - fakedata ==1.0.3 - fakedata-parser ==0.1.0.0 - fakedata-quickcheck ==0.2.0 - fakefs ==0.3.0.2 @@ -796,7 +796,7 @@ default-package-overrides: - foundation ==0.0.28 - fourmolu ==0.4.0.0 - Frames ==0.7.3 - - free ==5.1.8 + - free ==5.1.9 - free-categories ==0.2.0.2 - freenect ==1.2.1 - freer-simple ==1.2.1.2 @@ -820,7 +820,7 @@ default-package-overrides: - fuzzy ==0.1.0.1 - fuzzy-dates ==0.1.1.2 - fuzzyset ==0.2.3 - - fuzzy-time ==0.2.0.0 + - fuzzy-time ==0.2.0.1 - gauge ==0.2.5 - gd ==3000.7.3 - gdp ==0.0.3.0 @@ -1004,13 +1004,13 @@ default-package-overrides: - haskintex ==0.8.0.0 - haskoin-core ==0.21.2 - hasktags ==0.72.0 - - hasql ==1.5.0.4 + - hasql ==1.5.0.5 - hasql-migration ==0.3.0 - hasql-notifications ==0.2.0.1 - hasql-optparse-applicative ==0.3.0.9 - hasql-pool ==0.5.2.2 - hasql-queue ==1.2.0.2 - - hasql-th ==0.4.0.15 + - hasql-th ==0.4.0.16 - hasql-transaction ==1.0.1.1 - has-transformers ==0.1.0.4 - hasty-hamiltonian ==1.3.4 @@ -1337,7 +1337,7 @@ default-package-overrides: - junit-xml ==0.1.0.2 - justified-containers ==0.3.0.0 - jwt ==0.11.0 - - kan-extensions ==5.2.4 + - kan-extensions ==5.2.5 - kanji ==3.5.0 - katip ==0.8.7.2 - katip-logstash ==0.1.0.2 @@ -1536,7 +1536,7 @@ default-package-overrides: - minio-hs ==1.6.0 - miniutter ==0.5.1.1 - min-max-pqueue ==0.1.0.2 - - mintty ==0.1.3 + - mintty ==0.1.4 - missing-foreign ==0.1.1 - MissingH ==1.5.0.1 - mixed-types-num ==0.5.9.1 @@ -1943,6 +1943,7 @@ default-package-overrides: - proto-lens-protoc ==0.7.1.1 - proto-lens-runtime ==0.7.0.2 - proto-lens-setup ==0.4.0.6 + - protolude ==0.3.2 - proxied ==0.3.1 - psql-helpers ==0.1.0.0 - psqueues ==0.2.7.3 @@ -2067,7 +2068,7 @@ default-package-overrides: - resistor-cube ==0.0.1.4 - resolv ==0.1.2.0 - resource-pool ==0.2.3.2 - - resourcet ==1.2.5 + - resourcet ==1.2.6 - result ==0.2.6.0 - retry ==0.9.2.1 - rev-state ==0.1.2 @@ -2304,7 +2305,7 @@ default-package-overrides: - srt-attoparsec ==0.1.0.0 - srt-dhall ==0.1.0.0 - srt-formatting ==0.1.0.0 - - stache ==2.3.2 + - stache ==2.3.3 - stack-all ==0.4.0.1 - stack-clean-old ==0.4.6 - stackcollapse-ghc ==0.0.1.4 @@ -2376,7 +2377,7 @@ default-package-overrides: - subcategories ==0.2.0.0 - sum-type-boilerplate ==0.1.1 - sundown ==0.6 - - superbuffer ==0.3.1.1 + - superbuffer ==0.3.1.2 - svg-builder ==0.1.1 - SVGFonts ==1.8.0.1 - svg-tree ==0.6.2.4 @@ -2743,9 +2744,9 @@ default-package-overrides: - wcwidth ==0.0.2 - webex-teams-api ==0.2.0.1 - webex-teams-conduit ==0.2.0.1 - - webgear-core ==1.0.2 - - webgear-openapi ==1.0.2 - - webgear-server ==1.0.2 + - webgear-core ==1.0.3 + - webgear-openapi ==1.0.3 + - webgear-server ==1.0.3 - webpage ==0.0.5.1 - web-plugins ==0.4.1 - web-routes ==0.27.14.4 diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index a68cf2b513a33..d1b7c029bfd2e 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -2026,7 +2026,6 @@ dont-distribute-packages: - hasloGUI - hasparql-client - hasql-cursor-query - - hasql-dynamic-statements - hasql-postgres - hasql-postgres-options - hasqlator-mysql @@ -2418,6 +2417,10 @@ dont-distribute-packages: - jobqueue - join - jordan-openapi + - jordan-servant + - jordan-servant-client + - jordan-servant-openapi + - jordan-servant-server - jsc - jsmw - json-ast-json-encoder @@ -3134,7 +3137,6 @@ dont-distribute-packages: - postgresql-simple-typed - postgresql-tx-query - postgresql-tx-squeal-compat-simple - - postgrest - postmark - potoki - potoki-cereal @@ -3559,7 +3561,6 @@ dont-distribute-packages: - shady-graphics - shake-ats - shake-bindist - - shake-futhark - shake-minify-css - shake-plus-extended - shakebook @@ -4054,7 +4055,6 @@ dont-distribute-packages: - vty-ui-extras - waargonaut - wahsp - - wai-control - wai-devel - wai-dispatch - wai-handler-snap diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 14c6dd6667194..c05a207e89e93 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -167,9 +167,6 @@ self: super: builtins.intersectAttrs super { digitalocean-kzs = dontCheck super.digitalocean-kzs; # https://github.com/KazumaSATO/digitalocean-kzs/issues/1 github-types = dontCheck super.github-types; # http://hydra.cryp.to/build/1114046/nixlog/1/raw hadoop-rpc = dontCheck super.hadoop-rpc; # http://hydra.cryp.to/build/527461/nixlog/2/raw - hasql = dontCheck super.hasql; # http://hydra.cryp.to/build/502489/nixlog/4/raw - hasql-interpolate = dontCheck super.hasql-interpolate; # wants to connect to postgresql - hasql-transaction = dontCheck super.hasql-transaction; # wants to connect to postgresql hjsonschema = overrideCabal (drv: { testTarget = "local"; }) super.hjsonschema; marmalade-upload = dontCheck super.marmalade-upload; # http://hydra.cryp.to/build/501904/nixlog/1/raw mongoDB = dontCheck super.mongoDB; @@ -208,6 +205,14 @@ self: super: builtins.intersectAttrs super { mustache = dontCheck super.mustache; arch-web = dontCheck super.arch-web; + # Test suite requires running a database server. Testing is done upstream. + hasql = dontCheck super.hasql; + hasql-dynamic-statements = dontCheck super.hasql-dynamic-statements; + hasql-interpolate = dontCheck super.hasql-interpolate; + hasql-notifications = dontCheck super.hasql-notifications; + hasql-pool = dontCheck super.hasql-pool; + hasql-transaction = dontCheck super.hasql-transaction; + # Tries to mess with extended POSIX attributes, but can't in our chroot environment. xattr = dontCheck super.xattr; diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 2e945a16b4595..7c0e3eaeac72a 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -2063,20 +2063,21 @@ self: { "Blammo" = callPackage ({ mkDerivation, aeson, base, bytestring, case-insensitive, clock - , containers, envparse, exceptions, fast-logger, hspec, http-types - , lens, markdown-unlit, monad-logger-aeson, text, time - , unliftio-core, unordered-containers, vector, wai + , containers, dlist, envparse, exceptions, fast-logger, hspec + , http-types, lens, markdown-unlit, monad-logger-aeson, mtl, text + , time, unliftio, unliftio-core, unordered-containers, vector, wai }: mkDerivation { pname = "Blammo"; - version = "1.0.1.1"; - sha256 = "1ysfy8crdm6j3l80hw9rdr4rqsxyhywp3rf8m9yjygmhrndx38ih"; + version = "1.0.2.1"; + sha256 = "0ym6j8ysng4kqdzbkhr4i4wgq1lsl70c3arm3g8z976lzc7612m5"; libraryHaskellDepends = [ - aeson base bytestring case-insensitive clock containers envparse - exceptions fast-logger http-types lens monad-logger-aeson text time - unliftio-core unordered-containers vector wai + aeson base bytestring case-insensitive clock containers dlist + envparse exceptions fast-logger http-types lens monad-logger-aeson + mtl text time unliftio unliftio-core unordered-containers vector + wai ]; - testHaskellDepends = [ aeson base hspec markdown-unlit text ]; + testHaskellDepends = [ aeson base hspec markdown-unlit mtl text ]; testToolDepends = [ markdown-unlit ]; description = "Batteries-included Structured Logging library"; license = lib.licenses.mit; @@ -35383,6 +35384,19 @@ self: { license = lib.licenses.bsd3; }) {}; + "assert-failure_0_1_2_6" = callPackage + ({ mkDerivation, base, pretty-show, text }: + mkDerivation { + pname = "assert-failure"; + version = "0.1.2.6"; + sha256 = "198bvr7wgshwmbl8gcgq91hz7d87ar6gkqhhp1xgsg1mqikqi02z"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ base pretty-show text ]; + description = "Syntactic sugar improving 'assert' and 'error'"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "assert4hs" = callPackage ({ mkDerivation, base, data-default, pretty-diff, tasty, text }: mkDerivation { @@ -39767,12 +39781,12 @@ self: { broken = true; }) {}; - "base_4_16_1_0" = callPackage + "base_4_16_2_0" = callPackage ({ mkDerivation, ghc-bignum, ghc-prim, rts }: mkDerivation { pname = "base"; - version = "4.16.1.0"; - sha256 = "1n6w97xxdsspa34w417sakx1ysv4qgp5l00r6lkf09rwfmani7vl"; + version = "4.16.2.0"; + sha256 = "015qxwjg47nk5kfp53xlv6pnl6sv7gv9szlvscnglhc00p6iasr9"; libraryHaskellDepends = [ ghc-bignum ghc-prim rts ]; description = "Basic libraries"; license = lib.licenses.bsd3; @@ -41519,8 +41533,8 @@ self: { pname = "bench"; version = "1.0.12"; sha256 = "1sy97qpv6paar2d5syppk6lc06wjx6qyz5aidsmh30jq853nydx6"; - revision = "3"; - editedCabalFile = "1lprgyc8jnfys70mxnpynrkgy1m4ss2dhf7mhj9kvxkahkkqdqm2"; + revision = "4"; + editedCabalFile = "1x1d74c9898dxwv0j35i62p6d2k675zk8snqcxn973j7x6p0103d"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -47988,7 +48002,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "brick_0_70_1" = callPackage + "brick_0_71_1" = callPackage ({ mkDerivation, base, bytestring, config-ini, containers , contravariant, data-clist, deepseq, directory, dlist, exceptions , filepath, microlens, microlens-mtl, microlens-th, QuickCheck, stm @@ -47997,8 +48011,8 @@ self: { }: mkDerivation { pname = "brick"; - version = "0.70.1"; - sha256 = "18i1i06ll6pklzaazcl2bzbi3w5zdn43l9wvkclhfcmddjy19lp4"; + version = "0.71.1"; + sha256 = "0m6j49izmmgqvqp3jnp5lc8b84a87hmhmv0bclqv2d2571k18w29"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -48008,7 +48022,7 @@ self: { unix vector vty word-wrap ]; testHaskellDepends = [ - base containers microlens QuickCheck vector + base containers microlens QuickCheck vector vty ]; description = "A declarative terminal user interface library"; license = lib.licenses.bsd3; @@ -53040,29 +53054,6 @@ self: { }: mkDerivation { pname = "call-alloy"; - version = "0.3.0.1"; - sha256 = "1a8fgbaxmvjrp82qjyfgkhv9qi0n7l94zfx3c80c0bd5q758spmp"; - libraryHaskellDepends = [ - base bytestring containers directory extra file-embed filepath - hashable mtl process split trifecta unix - ]; - testHaskellDepends = [ - base bytestring containers directory extra file-embed filepath - hashable hspec mtl process split trifecta unix - ]; - description = "A simple library to call Alloy given a specification"; - license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; - }) {}; - - "call-alloy_0_3_0_2" = callPackage - ({ mkDerivation, base, bytestring, containers, directory, extra - , file-embed, filepath, hashable, hspec, mtl, process, split - , trifecta, unix - }: - mkDerivation { - pname = "call-alloy"; version = "0.3.0.2"; sha256 = "1bigpy4338zkvcxccnri3xfav7wdz3zblkzzwm0nrnyz7an4mgy6"; libraryHaskellDepends = [ @@ -55935,8 +55926,8 @@ self: { }: mkDerivation { pname = "cgroup-rts-threads"; - version = "0.2.1.0"; - sha256 = "1fzv3bgfr7r1c8m02z887ml2mzh2j571zcjjp6al272iaax8ymx0"; + version = "0.2.1.1"; + sha256 = "0hj2ny3rbxb9aw83zjslygh2qc75w5my4bpm2fgx0qm10n6whavn"; libraryHaskellDepends = [ base directory megaparsec path text ]; testHaskellDepends = [ base hspec-core hspec-expectations path path-io @@ -65769,8 +65760,6 @@ self: { ]; description = "Reduced parser for configurator-ng config files"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "confsolve" = callPackage @@ -66605,8 +66594,8 @@ self: { }: mkDerivation { pname = "context"; - version = "0.2.0.0"; - sha256 = "1s915v2wbmhwp3qwk5p7n1iz510wfdmi4nq2zg1m04q7dpzhl0xz"; + version = "0.2.0.1"; + sha256 = "089v5dkpmlqrpdghhhmwca91dzzigsxwygjpg71ig5352cdfwdf4"; libraryHaskellDepends = [ base containers exceptions ]; testHaskellDepends = [ async base ghc-prim hspec ]; testToolDepends = [ hspec-discover ]; @@ -66668,8 +66657,8 @@ self: { }: mkDerivation { pname = "context-http-client"; - version = "0.2.0.0"; - sha256 = "0d7hdqcvfay8m1inbl19z4hj8qqi2a00qsxh7n7s03075rd8wzs0"; + version = "0.2.0.1"; + sha256 = "1sm36mrnc80pnafpyikcalajy2kz1rxp7d40sgqng1s48k6d8js1"; libraryHaskellDepends = [ base context http-client ]; testHaskellDepends = [ async base bytestring case-insensitive context hspec http-client @@ -66686,8 +66675,8 @@ self: { }: mkDerivation { pname = "context-resource"; - version = "0.2.0.0"; - sha256 = "0jjy6i6vcg3b9chrkw7l2yza8kdxl8d4bdlrqp0anpaxwm1q34da"; + version = "0.2.0.1"; + sha256 = "1hcmzd82nxbxask6qckb9ivpxlrxhph9pwk379vkx235jgqy79gj"; libraryHaskellDepends = [ base context exceptions ]; testHaskellDepends = [ async base context hspec ]; testToolDepends = [ hspec-discover ]; @@ -66716,8 +66705,8 @@ self: { }: mkDerivation { pname = "context-wai-middleware"; - version = "0.2.0.0"; - sha256 = "017zwjq4kl3jjmrdp0x6zxbsd9k5xnvcgf4r1cjk7cnlch36cwmn"; + version = "0.2.0.1"; + sha256 = "1y34137h0zjqxs4f5mbjyq500sazsryl20sfx4p5b227nb8lyplh"; libraryHaskellDepends = [ base context wai ]; testHaskellDepends = [ async base bytestring case-insensitive context hspec http-client @@ -81046,8 +81035,8 @@ self: { }: mkDerivation { pname = "discord-haskell-voice"; - version = "2.3.0"; - sha256 = "0rzzgggw02rc5pw3wyimimghf3mrxfwhb91fhg2lmzq2dwqghzva"; + version = "2.3.1"; + sha256 = "0j6gb0f63i70xqwq2yn8mfkn5nph3vmbbgnzid976cllcnwdxz5v"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -82580,8 +82569,8 @@ self: { }: mkDerivation { pname = "dns-patterns"; - version = "0.1"; - sha256 = "01ap0j5ar81v5k9dm0vsd03271xkqwi0a1dx3s9yflg7ll98yjs8"; + version = "0.1.1"; + sha256 = "1x2qrn4nvpvmxyby0p6mcgicz3xspd7x390gnz6p7vpanx72r0w3"; libraryHaskellDepends = [ attoparsec base bytestring parser-combinators text ]; @@ -93117,6 +93106,8 @@ self: { pname = "expiring-cache-map"; version = "0.0.6.1"; sha256 = "1fb47hsn06ybn2yzw7r6pjkmvvfpbdx7wjhbpxcywilbjyac4fqf"; + revision = "1"; + editedCabalFile = "1k5wqilafxp3ksqb7qy90cwipk0db568f15amn3mnf9krc1qjabg"; libraryHaskellDepends = [ base containers hashable unordered-containers ]; @@ -94235,41 +94226,6 @@ self: { }: mkDerivation { pname = "fakedata"; - version = "1.0.2"; - sha256 = "1xbp0wif3dfk4880f8lr8zj07jdqhbxalqm7bfpw6r0cv354w3l8"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - aeson attoparsec base bytestring containers directory exceptions - fakedata-parser filepath hashable random string-random - template-haskell text time transformers unordered-containers vector - yaml - ]; - testHaskellDepends = [ - aeson attoparsec base bytestring containers directory exceptions - fakedata-parser filepath hashable hspec QuickCheck random - regex-tdfa string-random template-haskell text time transformers - unordered-containers vector yaml - ]; - testToolDepends = [ hspec-discover ]; - benchmarkHaskellDepends = [ - aeson attoparsec base bytestring containers deepseq directory - exceptions fakedata-parser filepath gauge hashable random - string-random template-haskell text time transformers - unordered-containers vector yaml - ]; - description = "Library for producing fake data"; - license = lib.licenses.bsd3; - }) {}; - - "fakedata_1_0_3" = callPackage - ({ mkDerivation, aeson, attoparsec, base, bytestring, containers - , deepseq, directory, exceptions, fakedata-parser, filepath, gauge - , hashable, hspec, hspec-discover, QuickCheck, random, regex-tdfa - , string-random, template-haskell, text, time, transformers - , unordered-containers, vector, yaml - }: - mkDerivation { - pname = "fakedata"; version = "1.0.3"; sha256 = "12sldxpn14zx5zwblw28k593rdqz50d246rz8j3zj41ljmnbwj4i"; enableSeparateDataOutput = true; @@ -94294,7 +94250,6 @@ self: { ]; description = "Library for producing fake data"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "fakedata-parser" = callPackage @@ -99646,8 +99601,8 @@ self: { pname = "foldl"; version = "1.4.12"; sha256 = "0zf4yljh3s2ddxa7dhzdglmylj14kfldhkclc44g37zvjq6kcnag"; - revision = "3"; - editedCabalFile = "1xijnq8qkmrj2w7h6gr2vy8a0ajhiapzi2fain5pgcllli2fny2r"; + revision = "4"; + editedCabalFile = "122bj1kc28sy6xi7r9h5nlsamxf0bg4gziza5a259jndpbikcbm9"; libraryHaskellDepends = [ base bytestring comonad containers contravariant hashable primitive profunctors random semigroupoids text transformers @@ -101165,8 +101120,8 @@ self: { }: mkDerivation { pname = "freckle-app"; - version = "1.2.0.2"; - sha256 = "0wwzyg695h63azfdxd2i0clvjwkj4shj0rgrlvr6c830yn94i8q5"; + version = "1.3.0.0"; + sha256 = "1h2ckdjq4h7qv7r5dm28gbs5ja125wi2inzjg3436css9qn1s7v9"; libraryHaskellDepends = [ aeson base Blammo bugsnag bytestring case-insensitive conduit containers datadog dlist doctest ekg-core envparse errors @@ -101218,24 +101173,6 @@ self: { }: mkDerivation { pname = "free"; - version = "5.1.8"; - sha256 = "0h43a7w6yjnvqp3rl8qvcjl9a0hg86l0h7zxkikd0mw8n65l8xvr"; - libraryHaskellDepends = [ - base comonad containers distributive exceptions indexed-traversable - mtl profunctors semigroupoids template-haskell th-abstraction - transformers transformers-base - ]; - description = "Monads for free"; - license = lib.licenses.bsd3; - }) {}; - - "free_5_1_9" = callPackage - ({ mkDerivation, base, comonad, containers, distributive - , exceptions, indexed-traversable, mtl, profunctors, semigroupoids - , template-haskell, th-abstraction, transformers, transformers-base - }: - mkDerivation { - pname = "free"; version = "5.1.9"; sha256 = "1vlzis9sqxh7xrmh3habbgiw3skkhkn710bhqb6fnl45804i6x9f"; libraryHaskellDepends = [ @@ -101245,7 +101182,6 @@ self: { ]; description = "Monads for free"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "free-algebras" = callPackage @@ -103503,40 +103439,40 @@ self: { "futhark" = callPackage ({ mkDerivation, aeson, alex, ansi-terminal, array, base , base16-bytestring, binary, blaze-html, bmp, bytestring - , bytestring-to-vector, cmark-gfm, containers, cryptohash-md5, Diff - , directory, directory-tree, dlist, file-embed, filepath, free - , futhark-data, futhark-manifest, futhark-server, githash, half - , happy, haskeline, hslogger, language-c-quote, lens, lsp - , mainland-pretty, megaparsec, mtl, mwc-random, neat-interpolation - , parallel, parser-combinators, process, process-extras, QuickCheck - , random, regex-tdfa, srcloc, statistics, tasty, tasty-hunit - , tasty-quickcheck, template-haskell, temporary, terminal-size - , text, time, transformers, vector, versions, zip-archive, zlib + , bytestring-to-vector, cmark-gfm, co-log-core, containers + , cryptohash-md5, Diff, directory, directory-tree, dlist, fgl + , fgl-visualize, file-embed, filepath, free, futhark-data + , futhark-manifest, futhark-server, githash, half, happy, haskeline + , language-c-quote, lens, lsp, mainland-pretty, megaparsec, mtl + , mwc-random, neat-interpolation, parallel, process, process-extras + , QuickCheck, random, regex-tdfa, srcloc, statistics, tasty + , tasty-hunit, tasty-quickcheck, template-haskell, temporary + , terminal-size, text, time, transformers, vector, versions + , zip-archive, zlib }: mkDerivation { pname = "futhark"; - version = "0.21.12"; - sha256 = "1pjrq70x4qxgjjx5yy8zk9v6k3d01kk42bq5jrrb5f27id4dyn6v"; - revision = "2"; - editedCabalFile = "1m6rn5amxikflgli0izq9lsdc2s4qcwmmhiila54mnk1c6l2q7zv"; + version = "0.21.13"; + sha256 = "0bzqlsaaqbbi47zvmvv7hd6hcz54hzw676rh9nxcjxgff3hzqb08"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson ansi-terminal array base base16-bytestring binary blaze-html - bmp bytestring bytestring-to-vector cmark-gfm containers - cryptohash-md5 Diff directory directory-tree dlist file-embed - filepath free futhark-data futhark-manifest futhark-server githash - half haskeline hslogger language-c-quote lens lsp mainland-pretty - megaparsec mtl mwc-random neat-interpolation parallel process - process-extras random regex-tdfa srcloc statistics template-haskell - temporary terminal-size text time transformers vector versions - zip-archive zlib + bmp bytestring bytestring-to-vector cmark-gfm co-log-core + containers cryptohash-md5 Diff directory directory-tree dlist fgl + fgl-visualize file-embed filepath free futhark-data + futhark-manifest futhark-server githash half haskeline + language-c-quote lens lsp mainland-pretty megaparsec mtl mwc-random + neat-interpolation parallel process process-extras random + regex-tdfa srcloc statistics template-haskell temporary + terminal-size text time transformers vector versions zip-archive + zlib ]; libraryToolDepends = [ alex happy ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ - base containers megaparsec mtl parser-combinators QuickCheck tasty - tasty-hunit tasty-quickcheck text + base containers megaparsec QuickCheck tasty tasty-hunit + tasty-quickcheck text ]; description = "An optimising compiler for a functional, array-oriented language"; license = lib.licenses.isc; @@ -103733,27 +103669,12 @@ self: { }: mkDerivation { pname = "fuzzy-time"; - version = "0.2.0.0"; - sha256 = "0gf6bj0jrd8jh30n1cdjc31ynjpsrikwacp3mysa76kqb4mxl3xz"; - libraryHaskellDepends = [ - base containers deepseq megaparsec text time validity validity-time - ]; - license = lib.licenses.mit; - }) {}; - - "fuzzy-time_0_2_0_1" = callPackage - ({ mkDerivation, base, containers, deepseq, megaparsec, text, time - , validity, validity-time - }: - mkDerivation { - pname = "fuzzy-time"; version = "0.2.0.1"; sha256 = "1wlcq37q71q3565dc73jcr42p970lml0gmpjqwn3k5xf8d63ridj"; libraryHaskellDepends = [ base containers deepseq megaparsec text time validity validity-time ]; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "fuzzy-time-gen" = callPackage @@ -107122,7 +107043,7 @@ self: { mainProgram = "gh-pocket-knife"; }) {}; - "ghc_9_2_2" = callPackage + "ghc_9_2_3" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers , deepseq, directory, exceptions, filepath, ghc-boot, ghc-heap , ghci, hpc, process, template-haskell, terminfo, time @@ -107130,8 +107051,8 @@ self: { }: mkDerivation { pname = "ghc"; - version = "9.2.2"; - sha256 = "125cx0zycc5gkj6awg5lgc6zhlr0iklw18g20dhpbgiyzplx2gqb"; + version = "9.2.3"; + sha256 = "09bwgzdj0bvasl8cqz93g03d79bcgpmr5p8dpc05kjxdl24ydrmp"; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory exceptions filepath ghc-boot ghc-heap ghci hpc process @@ -111091,7 +111012,7 @@ self: { description = "manage files with git, without checking their contents into git"; license = lib.licenses.agpl3Only; mainProgram = "git-annex"; - maintainers = [ lib.maintainers.peti ]; + maintainers = [ lib.maintainers.peti lib.maintainers.roosemberth ]; }) {inherit (pkgs) bup; inherit (pkgs) curl; inherit (pkgs) git; inherit (pkgs) gnupg; inherit (pkgs) lsof; inherit (pkgs) openssh; inherit (pkgs) perl; inherit (pkgs) rsync; inherit (pkgs) wget; @@ -123426,8 +123347,8 @@ self: { }: mkDerivation { pname = "hapistrano"; - version = "0.4.5.0"; - sha256 = "0pjm9flkqkpwmiv6jqgghf3isvq2hqxy2z80jnj4slm7gkm8kq40"; + version = "0.4.6.0"; + sha256 = "1bischj5ndbv33is36537gd3180m9i76mlyjxrfcawzlqf8h3p66"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -129592,32 +129513,6 @@ self: { }: mkDerivation { pname = "hasql"; - version = "1.5.0.4"; - sha256 = "01jfjx9l10f28w395r1990r6l5i15bw1333d968m2qgnx5l04vw3"; - libraryHaskellDepends = [ - attoparsec base bytestring bytestring-strict-builder contravariant - dlist hashable hashtables mtl postgresql-binary postgresql-libpq - profunctors text text-builder transformers vector - ]; - testHaskellDepends = [ - contravariant-extras QuickCheck quickcheck-instances rerebase tasty - tasty-hunit tasty-quickcheck - ]; - benchmarkHaskellDepends = [ gauge rerebase ]; - description = "An efficient PostgreSQL driver with a flexible mapping API"; - license = lib.licenses.mit; - }) {}; - - "hasql_1_5_0_5" = callPackage - ({ mkDerivation, attoparsec, base, bytestring - , bytestring-strict-builder, contravariant, contravariant-extras - , dlist, gauge, hashable, hashtables, mtl, postgresql-binary - , postgresql-libpq, profunctors, QuickCheck, quickcheck-instances - , rerebase, tasty, tasty-hunit, tasty-quickcheck, text - , text-builder, transformers, vector - }: - mkDerivation { - pname = "hasql"; version = "1.5.0.5"; sha256 = "029bsr8966q6r1ig7x2ykj5jmrg64990c00zqpjq48acc39ap0qw"; libraryHaskellDepends = [ @@ -129632,7 +129527,6 @@ self: { benchmarkHaskellDepends = [ gauge rerebase ]; description = "An efficient PostgreSQL driver with a flexible mapping API"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "hasql-backend" = callPackage @@ -129737,7 +129631,6 @@ self: { ]; description = "Toolkit for constructing Hasql statements dynamically"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "hasql-explain-tests" = callPackage @@ -129792,8 +129685,6 @@ self: { ]; description = "Implicit definitions for Hasql, such as default codecs for standard types"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hasql-interpolate" = callPackage @@ -130161,24 +130052,6 @@ self: { }: mkDerivation { pname = "hasql-th"; - version = "0.4.0.15"; - sha256 = "0h8cg8w16hn315hwdgamik9vwqslpgrbrhsd109w0lrv5l27xywz"; - libraryHaskellDepends = [ - base bytestring containers contravariant foldl hasql - postgresql-syntax template-haskell template-haskell-compat-v0208 - text uuid vector - ]; - description = "Template Haskell utilities for Hasql"; - license = lib.licenses.mit; - }) {}; - - "hasql-th_0_4_0_16" = callPackage - ({ mkDerivation, base, bytestring, containers, contravariant, foldl - , hasql, postgresql-syntax, template-haskell - , template-haskell-compat-v0208, text, uuid, vector - }: - mkDerivation { - pname = "hasql-th"; version = "0.4.0.16"; sha256 = "029zmhwmr8wp432hf33ffvns5nkfqzk1cnh663cln5f2ryllxxx3"; libraryHaskellDepends = [ @@ -130188,7 +130061,6 @@ self: { ]; description = "Template Haskell utilities for Hasql"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "hasql-transaction" = callPackage @@ -135810,8 +135682,8 @@ self: { pname = "hiedb"; version = "0.4.1.0"; sha256 = "1389qmlga5rq8has02rn35pzag5wnfpx3w77r60mzl3b4pkpzi7i"; - revision = "2"; - editedCabalFile = "1mlsjdd41a89znafqssafwghlvk6bkijk5qkbgrm61h1h7flir2j"; + revision = "3"; + editedCabalFile = "0y6vsx4n3hbpbl6d9qpb5d40s2rh0pkqm76gnjvx045zvrdkxi66"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -136371,6 +136243,42 @@ self: { mainProgram = "hindent"; }) {}; + "hindent_5_3_4" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, criterion + , deepseq, Diff, directory, exceptions, filepath, ghc-prim + , haskell-src-exts, hspec, monad-loops, mtl, optparse-applicative + , path, path-io, text, transformers, unix-compat, utf8-string, yaml + }: + mkDerivation { + pname = "hindent"; + version = "5.3.4"; + sha256 = "1pc20iza3v0ljzbx6cycm1j1kbmz8h95xwfq47fd6zfmsrx9w6vn"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base bytestring Cabal containers directory exceptions filepath + haskell-src-exts monad-loops mtl text transformers utf8-string yaml + ]; + executableHaskellDepends = [ + base bytestring deepseq directory exceptions ghc-prim + haskell-src-exts optparse-applicative path path-io text + transformers unix-compat utf8-string yaml + ]; + testHaskellDepends = [ + base bytestring deepseq Diff directory exceptions haskell-src-exts + hspec monad-loops mtl utf8-string + ]; + benchmarkHaskellDepends = [ + base bytestring criterion deepseq directory exceptions ghc-prim + haskell-src-exts mtl utf8-string + ]; + description = "Extensible Haskell pretty printer"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "hindent"; + }) {}; + "hindley-milner" = callPackage ({ mkDerivation, base, containers, data-fix, hspec, mtl , transformers @@ -138744,6 +138652,8 @@ self: { pname = "hls-graph"; version = "1.7.0.0"; sha256 = "1mq1pvn5z8fnlsj9iqck05shm8fak9zf05mbcbrxb5jvq0a31ypd"; + revision = "1"; + editedCabalFile = "090jis882l9pjg6dlw8dbf7qzq4g2rbrfwkl96rk7p4yw0hdgd01"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson async base bytestring containers deepseq directory exceptions @@ -138853,6 +138763,8 @@ self: { pname = "hls-plugin-api"; version = "1.4.0.0"; sha256 = "0yk2y6qw88vhww8z10d2kgn57wsarfnp6z1gmjl1ik2w96a8g3mv"; + revision = "1"; + editedCabalFile = "0mqwnvq892qa793pv68fsfhnkysm386vrkyx28qaaraqfnbxkysn"; libraryHaskellDepends = [ aeson base containers data-default dependent-map dependent-sum Diff dlist extra ghc hashable hls-graph lens lens-aeson lsp @@ -144056,6 +143968,8 @@ self: { pname = "hs-php-session"; version = "0.0.9.3"; sha256 = "1xwdikiqy2dxyzr6wx51wy51vifsvshblx7kkhfqd7izjf87ww8f"; + revision = "1"; + editedCabalFile = "1dj1r73v31bd2091pqvrg7vdc3lgjh373ynxn49dlhqmyw45kiw8"; libraryHaskellDepends = [ base bytestring ]; description = "PHP session and values serialization"; license = lib.licenses.bsd3; @@ -148093,8 +148007,6 @@ self: { testHaskellDepends = [ base hspec hspec-wai ]; description = "Testing JSON APIs with hspec-wai"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hspec-webdriver" = callPackage @@ -158960,6 +158872,20 @@ self: { broken = true; }) {}; + "interval-tree-clock" = callPackage + ({ mkDerivation, base, hspec, QuickCheck }: + mkDerivation { + pname = "interval-tree-clock"; + version = "0.1.0.2"; + sha256 = "1v1sdhf43akmnlhp6y10nbp44pj93m7pmbwpss9skam5dasmnzs1"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base hspec QuickCheck ]; + description = "Interval Tree Clocks"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "intervals" = callPackage ({ mkDerivation, array, base, distributive, ghc-prim, QuickCheck }: mkDerivation { @@ -159160,6 +159086,29 @@ self: { license = lib.licenses.bsd2; }) {}; + "invariant_0_6" = callPackage + ({ mkDerivation, array, base, bifunctors, comonad, containers + , contravariant, ghc-prim, hspec, hspec-discover, profunctors + , QuickCheck, StateVar, stm, tagged, template-haskell + , th-abstraction, transformers, transformers-compat + , unordered-containers + }: + mkDerivation { + pname = "invariant"; + version = "0.6"; + sha256 = "07ffgcfpacsdihcmcmx2m1gp8czlg28657bxncxjykjiiiwjlaxm"; + libraryHaskellDepends = [ + array base bifunctors comonad containers contravariant ghc-prim + profunctors StateVar stm tagged template-haskell th-abstraction + transformers transformers-compat unordered-containers + ]; + testHaskellDepends = [ base hspec QuickCheck template-haskell ]; + testToolDepends = [ hspec-discover ]; + description = "Haskell98 invariant functors"; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; + }) {}; + "inventory" = callPackage ({ mkDerivation, appendmap, array, base, bytestring, containers , directory, filepath, ghc, ghc-paths, mtl, tasty, tasty-hunit @@ -162593,21 +162542,21 @@ self: { "jordan" = callPackage ({ mkDerivation, attoparsec, base, bytestring, containers - , contravariant, hspec, hspec-megaparsec, megaparsec + , contravariant, deepseq, ghc-prim, hspec, hspec-megaparsec , parser-combinators, QuickCheck, quickcheck-text, raw-strings-qq , scientific, text }: mkDerivation { pname = "jordan"; - version = "0.1.0.0"; - sha256 = "1qi83jc05ggakf0v7l7xf8c4xdfb29fb9yl54fi7wv9a4sqzk3hi"; + version = "0.2.0.0"; + sha256 = "1w4qld656ax7aggviznrvvjc99hyg6gvx3lmbcv8gmyb4899zqbx"; libraryHaskellDepends = [ - attoparsec base bytestring containers contravariant megaparsec - parser-combinators scientific text + attoparsec base bytestring containers contravariant deepseq + ghc-prim parser-combinators scientific text ]; testHaskellDepends = [ - attoparsec base bytestring containers contravariant hspec - hspec-megaparsec megaparsec parser-combinators QuickCheck + attoparsec base bytestring containers contravariant deepseq + ghc-prim hspec hspec-megaparsec parser-combinators QuickCheck quickcheck-text raw-strings-qq scientific text ]; description = "JSON with Structure"; @@ -162618,19 +162567,19 @@ self: { "jordan-openapi" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, contravariant - , hspec, insert-ordered-containers, jordan, openapi3, optics-core - , text + , hspec, http-types, insert-ordered-containers, jordan, openapi3 + , optics-core, text }: mkDerivation { pname = "jordan-openapi"; - version = "0.1.0.0"; - sha256 = "0a9m1kx4v6vdzyd93lpc9jvqkhb9sw6adhyv2rvp1v0x7vbcqr0v"; + version = "0.2.0.0"; + sha256 = "0r079zj8w3n0px1ajmklhy5yrh4rwwh8gcny4lm2aj2x7zy2rihv"; libraryHaskellDepends = [ - aeson base bytestring containers contravariant + aeson base bytestring containers contravariant http-types insert-ordered-containers jordan openapi3 optics-core text ]; testHaskellDepends = [ - aeson base bytestring containers contravariant hspec + aeson base bytestring containers contravariant hspec http-types insert-ordered-containers jordan openapi3 optics-core text ]; description = "OpenAPI Definitions for Jordan, Automatically"; @@ -162638,6 +162587,100 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "jordan-servant" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, contravariant, hspec + , http-media, http-types, jordan, parallel, QuickCheck + , quickcheck-text, scientific, servant, text, transformers + }: + mkDerivation { + pname = "jordan-servant"; + version = "0.1.0.0"; + sha256 = "1al0f6cm9sdlzjgzw9wpmgl4l23yflxib2a3nvxfs9q6k4z4x5v5"; + libraryHaskellDepends = [ + attoparsec base bytestring contravariant http-media http-types + jordan parallel scientific servant text transformers + ]; + testHaskellDepends = [ + attoparsec base bytestring contravariant hspec http-media + http-types jordan parallel QuickCheck quickcheck-text scientific + servant text transformers + ]; + description = "Servant Combinators for Jordan"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + + "jordan-servant-client" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, http-media + , http-types, jordan, jordan-servant, servant, servant-client-core + , servant-server, text, transformers + }: + mkDerivation { + pname = "jordan-servant-client"; + version = "0.1.0.0"; + sha256 = "0sa9ays4k4ma5aflfr87rc9c67cyk4nk19vkcf6q55vm8zyii2fy"; + libraryHaskellDepends = [ + attoparsec base bytestring http-media http-types jordan + jordan-servant servant servant-client-core servant-server text + transformers + ]; + testHaskellDepends = [ + attoparsec base bytestring http-media http-types jordan + jordan-servant servant servant-client-core servant-server text + transformers + ]; + description = "Servant Client Instances for Jordan Servant Types"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + + "jordan-servant-openapi" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, contravariant + , http-media, http-types, jordan, jordan-openapi, jordan-servant + , lens, openapi3, scientific, servant, servant-openapi3, text + , transformers + }: + mkDerivation { + pname = "jordan-servant-openapi"; + version = "0.1.0.0"; + sha256 = "092x7cfp562g87rcj6wdnp6wimkcscnyqibjai8fbcwjq2gjnqdp"; + libraryHaskellDepends = [ + attoparsec base bytestring contravariant http-media http-types + jordan jordan-openapi jordan-servant lens openapi3 scientific + servant servant-openapi3 text transformers + ]; + testHaskellDepends = [ + attoparsec base bytestring contravariant http-media http-types + jordan jordan-openapi jordan-servant lens openapi3 scientific + servant servant-openapi3 text transformers + ]; + description = "OpenAPI schemas for Jordan-Powered Servant APIs"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + + "jordan-servant-server" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, generics-sop + , http-media, http-types, jordan, jordan-servant, servant + , servant-server, text, transformers, wai + }: + mkDerivation { + pname = "jordan-servant-server"; + version = "0.1.0.0"; + sha256 = "11pj4hccql2sp3cryzv5p84nn2k9jq4apcca4i1wrynj1w52iql3"; + libraryHaskellDepends = [ + attoparsec base bytestring generics-sop http-media http-types + jordan jordan-servant servant servant-server text transformers wai + ]; + testHaskellDepends = [ + attoparsec base bytestring generics-sop http-media http-types + jordan jordan-servant servant servant-server text transformers wai + ]; + description = "Servers for Jordan-Based Servant Combinators"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "jort" = callPackage ({ mkDerivation, array, base, gtk }: mkDerivation { @@ -165005,24 +165048,6 @@ self: { }: mkDerivation { pname = "kan-extensions"; - version = "5.2.4"; - sha256 = "0qnds0vwhsqznirqalm8f4c0qsmp1awfhc4fn2rx5agl5az3zip8"; - libraryHaskellDepends = [ - adjunctions array base comonad containers contravariant - distributive free invariant mtl profunctors semigroupoids tagged - transformers transformers-compat - ]; - description = "Kan extensions, Kan lifts, the Yoneda lemma, and (co)density (co)monads"; - license = lib.licenses.bsd3; - }) {}; - - "kan-extensions_5_2_5" = callPackage - ({ mkDerivation, adjunctions, array, base, comonad, containers - , contravariant, distributive, free, invariant, mtl, profunctors - , semigroupoids, tagged, transformers, transformers-compat - }: - mkDerivation { - pname = "kan-extensions"; version = "5.2.5"; sha256 = "08mddsk9v75mahp1jqn28vglygmdil1g37drcj3ivbqc0k6dq55r"; libraryHaskellDepends = [ @@ -165032,7 +165057,6 @@ self: { ]; description = "Kan extensions, Kan lifts, the Yoneda lemma, and (co)density (co)monads"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "kangaroo" = callPackage @@ -170543,6 +170567,8 @@ self: { pname = "large-anon"; version = "0.1.0.0"; sha256 = "15rrqpfd7jmm391lxhz2ag1sa17nw8x3wjqm0f9naidgmyv9x1z2"; + revision = "1"; + editedCabalFile = "1541ak37yk8431wiwjmcn0yp12f07wjhr8vsjs1hgmh124dm9295"; libraryHaskellDepends = [ aeson base containers ghc ghc-tcplugin-api hashable large-generics mtl optics-core primitive record-hasfield sop-core syb tagged @@ -170621,6 +170647,8 @@ self: { pname = "large-records"; version = "0.2.1.0"; sha256 = "0gmgrkh9fsyy6ww64l4warsilxkxwfzfl43d36d8a5dcgvn49ip2"; + revision = "1"; + editedCabalFile = "1j366mm61j7xxy5lhppc0an8249iskhd3dqxazfwmc3vi23a044k"; libraryHaskellDepends = [ base containers ghc large-generics mtl primitive record-hasfield syb template-haskell transformers @@ -182876,6 +182904,30 @@ self: { pname = "massiv-persist"; version = "1.0.0.2"; sha256 = "1hqmwbrxv664y4rfm37ziym25l9218pd21lz4180c0k3hfpdfsxy"; + revision = "1"; + editedCabalFile = "06vlaj1f4619knz7k087dppihas4cglvyy9iwg4bkgvagb968aj4"; + libraryHaskellDepends = [ + base bytestring deepseq massiv persist primitive + ]; + testHaskellDepends = [ + base doctest hspec massiv massiv-test persist QuickCheck + ]; + testToolDepends = [ hspec-discover ]; + description = "Compatibility of 'massiv' with 'persist'"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + + "massiv-persist_1_0_0_3" = callPackage + ({ mkDerivation, base, bytestring, deepseq, doctest, hspec + , hspec-discover, massiv, massiv-test, persist, primitive + , QuickCheck + }: + mkDerivation { + pname = "massiv-persist"; + version = "1.0.0.3"; + sha256 = "0qpnrqjhj6y2spg9izxc3jzqs4jcqzn6zlgi87816ycpdgxq6s02"; libraryHaskellDepends = [ base bytestring deepseq massiv persist primitive ]; @@ -184211,18 +184263,17 @@ self: { }) {}; "mealy" = callPackage - ({ mkDerivation, adjunctions, base, containers, folds, matrix - , mwc-probability, numhask, numhask-array, optics-core, primitive - , profunctors, tdigest, text, vector, vector-algorithms + ({ mkDerivation, adjunctions, base, containers, mwc-probability + , numhask, optics-core, primitive, profunctors, tdigest, text + , vector, vector-algorithms }: mkDerivation { pname = "mealy"; - version = "0.2.0"; - sha256 = "0rc1c7l2g7b1xr66dga3p6lg49pykxhsy24jg5rl4ag255axlfyv"; + version = "0.3.0"; + sha256 = "15p60a4kywazy5dlcs66bzyq8phcrpkrfl655p22bnqq1lsl7yjh"; libraryHaskellDepends = [ - adjunctions base containers folds matrix mwc-probability numhask - numhask-array optics-core primitive profunctors tdigest text vector - vector-algorithms + adjunctions base containers mwc-probability numhask optics-core + primitive profunctors tdigest text vector vector-algorithms ]; description = "Mealy machines for processing time-series and ordered data"; license = lib.licenses.bsd3; @@ -187191,6 +187242,23 @@ self: { license = lib.licenses.bsd3; }) {}; + "minimorph_0_3_0_1" = callPackage + ({ mkDerivation, base, HUnit, test-framework, test-framework-hunit + , text + }: + mkDerivation { + pname = "minimorph"; + version = "0.3.0.1"; + sha256 = "05z2y36q2m7lvrqnv5q40r8nr09q7bfbjvi5nca62xlnzxw1gy0g"; + libraryHaskellDepends = [ base text ]; + testHaskellDepends = [ + base HUnit test-framework test-framework-hunit text + ]; + description = "English spelling functions with an emphasis on simplicity"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "minimung" = callPackage ({ mkDerivation, base, GLUT, haskell98, unix }: mkDerivation { @@ -187394,6 +187462,24 @@ self: { license = lib.licenses.bsd3; }) {}; + "miniutter_0_5_1_2" = callPackage + ({ mkDerivation, base, binary, containers, HUnit, minimorph + , test-framework, test-framework-hunit, text + }: + mkDerivation { + pname = "miniutter"; + version = "0.5.1.2"; + sha256 = "04xpb9jyhvi8cs61xv3192kwis4nh1dib4s33c747j8yfg3q90m6"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ base binary containers minimorph text ]; + testHaskellDepends = [ + base containers HUnit test-framework test-framework-hunit text + ]; + description = "Simple English clause creation from arbitrary words"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "minizinc-process" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, containers , directory, hashable, hedgehog, hspec, hspec-hedgehog, process @@ -187449,23 +187535,11 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "mintty"; - version = "0.1.3"; - sha256 = "07gy5w0zbx9q64kdr6rzkwdxrgxh2h188bkdvbbgxwk86m9q9i7x"; - libraryHaskellDepends = [ base ]; - description = "A reliable way to detect the presence of a MinTTY console on Windows"; - license = lib.licenses.bsd3; - }) {}; - - "mintty_0_1_4" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "mintty"; version = "0.1.4"; sha256 = "0zla9cg6fcjgpjjsgq7mi0xl753j5zmvhy5kwsagb5pp2gc48l3b"; libraryHaskellDepends = [ base ]; description = "A reliable way to detect the presence of a MinTTY console on Windows"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "mios" = callPackage @@ -189530,8 +189604,8 @@ self: { }: mkDerivation { pname = "monad-logger-aeson"; - version = "0.3.0.1"; - sha256 = "1bfz5z836m9fn7sd6r5mlgsnavb8ih0d3x9nm0m3zlx654llvpmq"; + version = "0.3.0.2"; + sha256 = "1y5iw0k9y8i4sgak04nh6fbl4ahljy7av8pn4fq09827v54qgx70"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -190201,6 +190275,19 @@ self: { license = lib.licenses.bsd3; }) {}; + "monad-time_0_4_0_0" = callPackage + ({ mkDerivation, base, mtl, time }: + mkDerivation { + pname = "monad-time"; + version = "0.4.0.0"; + sha256 = "0q1935ldnwx19fszpd6fngxvz4z4bn257pgwrjs9r0vzkvgkwjdl"; + libraryHaskellDepends = [ base mtl time ]; + testHaskellDepends = [ base mtl time ]; + description = "Type class for monads which carry the notion of the current time"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "monad-timing" = callPackage ({ mkDerivation, base, containers, exceptions, hlint, hspec , monad-control, mtl, time, transformers, transformers-base @@ -190296,13 +190383,13 @@ self: { "monad-validate" = callPackage ({ mkDerivation, aeson, aeson-qq, base, exceptions, hspec - , monad-control, mtl, scientific, text, transformers - , transformers-base, unordered-containers, vector + , hspec-discover, monad-control, mtl, scientific, text + , transformers, transformers-base, unordered-containers, vector }: mkDerivation { pname = "monad-validate"; - version = "1.2.0.0"; - sha256 = "1wqiifcwm24mfshlh0xaq9b4blpsccqxglwgjqmg4jqbav3143zm"; + version = "1.2.0.1"; + sha256 = "1xhpqdslsjxqz6wv4qcvz0bnkzdq3f5z481bjhpi2n3wlyf9asyq"; libraryHaskellDepends = [ base exceptions monad-control mtl transformers transformers-base ]; @@ -190310,6 +190397,7 @@ self: { aeson aeson-qq base exceptions hspec monad-control mtl scientific text transformers transformers-base unordered-containers vector ]; + testToolDepends = [ hspec-discover ]; description = "A monad transformer for data validation"; license = lib.licenses.isc; }) {}; @@ -197241,8 +197329,8 @@ self: { }: mkDerivation { pname = "net-mqtt"; - version = "0.8.2.0"; - sha256 = "0krh8imyjls1incrsz8pnn3zww0yxygy3hy15r55gbs80x5w7j13"; + version = "0.8.2.1"; + sha256 = "052y6mqj8bgfyjv7bxm5vyhd14bpg694ybji2ar2zww30jx5g6ib"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -208650,7 +208738,7 @@ self: { mainProgram = "pandoc-plot"; }) {}; - "pandoc-plot_1_5_3" = callPackage + "pandoc-plot_1_5_4" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, criterion , data-default, directory, filepath, gitrev, hashable , hspec-expectations, lifted-async, lifted-base, mtl @@ -208660,8 +208748,8 @@ self: { }: mkDerivation { pname = "pandoc-plot"; - version = "1.5.3"; - sha256 = "0d73b9lnbm041an47sx0cmywga0p51dgbmh1gbfad90w6vi4cxpc"; + version = "1.5.4"; + sha256 = "1bmnzl5aqqhfrl7gk0083xkrckl11yhmvf2lf1w1jg4hcfknj6a8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -219760,8 +219848,8 @@ self: { ({ mkDerivation, base, optics, polysemy, polysemy-zoo }: mkDerivation { pname = "polysemy-optics"; - version = "0.1.0.1"; - sha256 = "1503qfi0kp8p4h723nkwidgxp46wmfxi93vsyvdp6i7zwvg09yy2"; + version = "0.1.0.2"; + sha256 = "0lclq8kbagxpabxzn56wqcwik9swjpadwqyr15drg0wjhdsmx2s5"; libraryHaskellDepends = [ base optics polysemy polysemy-zoo ]; description = "Optics for Polysemy"; license = lib.licenses.bsd2; @@ -222134,6 +222222,7 @@ self: { license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; mainProgram = "postgrest"; + broken = true; }) {}; "postgrest-ws" = callPackage @@ -228312,6 +228401,32 @@ self: { hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) libdevil;}; + "pvector" = callPackage + ({ mkDerivation, base, containers, criterion, deepseq, hspec + , hspec-discover, persistent-vector, primitive, QuickCheck + , quickcheck-instances, rrb-vector, unordered-containers, vector + , vector-stream + }: + mkDerivation { + pname = "pvector"; + version = "0.1.0.1"; + sha256 = "1z0bwm5d1ci7b8s5w8jq5jpihjhsbykgv7210p9iqqdqns3y845a"; + libraryHaskellDepends = [ base deepseq primitive vector-stream ]; + testHaskellDepends = [ + base deepseq hspec primitive QuickCheck quickcheck-instances + vector-stream + ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ + base containers criterion deepseq persistent-vector primitive + rrb-vector unordered-containers vector vector-stream + ]; + description = "Fast persistent vectors"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "pvss" = callPackage ({ mkDerivation, base, binary, bytestring, cryptonite , cryptonite-openssl, deepseq, foundation, hourglass, integer-gmp @@ -229344,8 +229459,8 @@ self: { }: mkDerivation { pname = "quibble-core"; - version = "0.0.0.1"; - sha256 = "1dzgha5c827x0gb9fhqa13rz0wkdn0wpxfw3sxnxq8g9rr8myb0g"; + version = "0.1.0.1"; + sha256 = "108cqh3xzl73ijh7fg91cyw0lpn2svm13l8nn922ab9401jy9x8c"; libraryHaskellDepends = [ base bytestring containers mono-traversable optics-core text text-conversions time uuid @@ -234858,6 +234973,48 @@ self: { broken = true; }) {chrome-test-utils = null;}; + "reflex-dom-core_0_7_0_2" = callPackage + ({ mkDerivation, aeson, async, base, bifunctors, bimap + , blaze-builder, bytestring, case-insensitive, chrome-test-utils + , commutative-semigroups, constraints, constraints-extras + , containers, contravariant, data-default, dependent-map + , dependent-sum, dependent-sum-template, directory + , exception-transformers, exceptions, filepath, ghcjs-dom, hlint + , hspec, hspec-core, hspec-webdriver, http-types, HUnit, jsaddle + , jsaddle-warp, keycode, lens, lifted-base, monad-control, mtl + , network, network-uri, primitive, process, random, ref-tf, reflex + , semialign, semigroups, silently, stm, template-haskell, temporary + , text, these, transformers, unix, wai, wai-websockets, warp + , webdriver, websockets, which, zenc + }: + mkDerivation { + pname = "reflex-dom-core"; + version = "0.7.0.2"; + sha256 = "1piwllxvq2fkfrfrvmnpz802vrwa9izhg8irlk19nmxy02rcx9ra"; + libraryHaskellDepends = [ + aeson base bifunctors bimap blaze-builder bytestring + case-insensitive commutative-semigroups constraints containers + contravariant data-default dependent-map dependent-sum + dependent-sum-template directory exception-transformers ghcjs-dom + jsaddle keycode lens monad-control mtl network-uri primitive random + ref-tf reflex semialign semigroups stm template-haskell text these + transformers unix zenc + ]; + testHaskellDepends = [ + aeson async base bytestring chrome-test-utils constraints + constraints-extras containers dependent-map dependent-sum + dependent-sum-template directory exceptions filepath ghcjs-dom + hlint hspec hspec-core hspec-webdriver http-types HUnit jsaddle + jsaddle-warp lens lifted-base network process random ref-tf reflex + silently temporary text wai wai-websockets warp webdriver + websockets which + ]; + description = "Functional Reactive Web Apps with Reflex"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {chrome-test-utils = null;}; + "reflex-dom-fragment-shader-canvas" = callPackage ({ mkDerivation, base, containers, ghcjs-dom, jsaddle, lens , reflex-dom, text, transformers @@ -236423,8 +236580,8 @@ self: { }: mkDerivation { pname = "registry"; - version = "0.3.0.9"; - sha256 = "1w4qs28q5gb5v896hb7rpkbjix7jwgni5ky0wddas04l7ap3an0d"; + version = "0.3.2.0"; + sha256 = "12xs0gdpjgh28yix0562d035nnw2x8zi5n06iaysxvz7d796sd37"; libraryHaskellDepends = [ base containers exceptions hashable mmorph mtl protolude resourcet semigroupoids semigroups template-haskell text transformers-base @@ -238600,22 +238757,6 @@ self: { }: mkDerivation { pname = "resourcet"; - version = "1.2.5"; - sha256 = "0bj98srdlz2yx3nx030m0nzv6yyz1ry50v6bwdff5a6xi256jz7n"; - libraryHaskellDepends = [ - base containers exceptions mtl primitive transformers unliftio-core - ]; - testHaskellDepends = [ base exceptions hspec transformers ]; - description = "Deterministic allocation and freeing of scarce resources"; - license = lib.licenses.bsd3; - }) {}; - - "resourcet_1_2_6" = callPackage - ({ mkDerivation, base, containers, exceptions, hspec, mtl - , primitive, transformers, unliftio-core - }: - mkDerivation { - pname = "resourcet"; version = "1.2.6"; sha256 = "0d7xnpysrick56gxzkkj0mpblywbxaaldhziyl77am3822r3afzq"; libraryHaskellDepends = [ @@ -238624,7 +238765,6 @@ self: { testHaskellDepends = [ base exceptions hspec transformers ]; description = "Deterministic allocation and freeing of scarce resources"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "resourcet-pool" = callPackage @@ -239695,8 +239835,8 @@ self: { }: mkDerivation { pname = "rhine"; - version = "0.8.0.0"; - sha256 = "0axhfv3vwd12k5c21fd34hw4dvn0bydyzr50b62z8wl0009vq01x"; + version = "0.8.0.1"; + sha256 = "07cw0xlj0nwbx0wjb3k4hpw5y6ksp25c1fa8xrrbaqv2jspv7z75"; libraryHaskellDepends = [ base containers deepseq dunai free MonadRandom random simple-affine-space time time-domain transformers vector-sized @@ -239710,8 +239850,8 @@ self: { ({ mkDerivation, base, dunai, gloss, rhine, transformers }: mkDerivation { pname = "rhine-gloss"; - version = "0.8.0.0"; - sha256 = "00mc1kbxvh4ilxkgpmxzfac50hziq6x6j7f1h7rfdlxhjhfyzh6y"; + version = "0.8.0.1"; + sha256 = "0qpza2n84illhlmqsz2xqj5k6a3jxb1kb9qhw6gz5fh4p4k8jqyl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base dunai gloss rhine transformers ]; @@ -251567,6 +251707,31 @@ self: { license = lib.licenses.mit; }) {}; + "serversession_1_0_3" = callPackage + ({ mkDerivation, aeson, base, base64-bytestring, bytestring + , containers, data-default, hashable, hspec, nonce, path-pieces + , persistent-test, QuickCheck, text, time, transformers + , unordered-containers + }: + mkDerivation { + pname = "serversession"; + version = "1.0.3"; + sha256 = "0hzyvz3jkv248lbq4pgy92dm054wj2s4d19rjr096ymcaznhxgfl"; + libraryHaskellDepends = [ + aeson base base64-bytestring bytestring data-default hashable nonce + path-pieces persistent-test text time transformers + unordered-containers + ]; + testHaskellDepends = [ + aeson base base64-bytestring bytestring containers data-default + hspec nonce path-pieces QuickCheck text time transformers + unordered-containers + ]; + description = "Secure, modular server-side sessions"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "serversession-backend-acid-state" = callPackage ({ mkDerivation, acid-state, base, containers, hspec, mtl, safecopy , serversession, unordered-containers @@ -252743,7 +252908,6 @@ self: { ]; description = "Dependency tracking for Futhark"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "shake-google-closure-compiler" = callPackage @@ -253010,6 +253174,33 @@ self: { maintainers = [ lib.maintainers.psibi ]; }) {}; + "shakespeare_2_0_30" = callPackage + ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring + , containers, directory, exceptions, file-embed, ghc-prim, hspec + , HUnit, parsec, process, scientific, template-haskell, text + , th-lift, time, transformers, unordered-containers, vector + }: + mkDerivation { + pname = "shakespeare"; + version = "2.0.30"; + sha256 = "038yprj9yig2xbjs2pqsjzs4pl9ir2frdz9wn2pklc4kvdazx3aw"; + libraryHaskellDepends = [ + aeson base blaze-html blaze-markup bytestring containers directory + exceptions file-embed ghc-prim parsec process scientific + template-haskell text th-lift time transformers + unordered-containers vector + ]; + testHaskellDepends = [ + aeson base blaze-html blaze-markup bytestring containers directory + exceptions ghc-prim hspec HUnit parsec process template-haskell + text time transformers + ]; + description = "A toolkit for making compile-time interpolated templates"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.psibi ]; + }) {}; + "shakespeare-babel" = callPackage ({ mkDerivation, base, classy-prelude, data-default, directory , process, shakespeare, template-haskell @@ -261839,6 +262030,32 @@ self: { broken = true; }) {}; + "spirv-reflect-types" = callPackage + ({ mkDerivation, base, containers, text, vector }: + mkDerivation { + pname = "spirv-reflect-types"; + version = "0.1"; + sha256 = "11q09i9scqd4msqylisyxnim9qga66yhqlb4650dx7ky6w1xzhws"; + libraryHaskellDepends = [ base containers text vector ]; + description = "Data types from spirv-reflect tool"; + license = lib.licenses.bsd3; + }) {}; + + "spirv-reflect-yaml" = callPackage + ({ mkDerivation, base, bytestring, HsYAML, spirv-reflect-types + , text, vector + }: + mkDerivation { + pname = "spirv-reflect-yaml"; + version = "0.1"; + sha256 = "1rxz5fbgwfr1p5mhhgc085chpi88an6zp4sxiq3iygny20cw1q73"; + libraryHaskellDepends = [ + base bytestring HsYAML spirv-reflect-types text vector + ]; + description = "YAML loader for spirv-reflect tool"; + license = lib.licenses.bsd3; + }) {}; + "splay" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -263249,41 +263466,6 @@ self: { }: mkDerivation { pname = "stache"; - version = "2.3.2"; - sha256 = "1ya9hnxvwqh1qhlci7aqpbj9abmsi2n13251b8nffmpvlpls6lk8"; - revision = "1"; - editedCabalFile = "1dirydqnbnvyasdpsncf1c9vlcfb9h8c8ff3fancsbrdwfbdjlbj"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - aeson base bytestring containers deepseq directory filepath - megaparsec mtl template-haskell text vector - ]; - executableHaskellDepends = [ - aeson base filepath gitrev optparse-applicative text yaml - ]; - testHaskellDepends = [ - aeson base bytestring containers file-embed hspec hspec-megaparsec - megaparsec template-haskell text yaml - ]; - testToolDepends = [ hspec-discover ]; - benchmarkHaskellDepends = [ - aeson base criterion deepseq megaparsec text - ]; - description = "Mustache templates for Haskell"; - license = lib.licenses.bsd3; - mainProgram = "stache"; - }) {}; - - "stache_2_3_3" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, criterion - , deepseq, directory, file-embed, filepath, gitrev, hspec - , hspec-discover, hspec-megaparsec, megaparsec, mtl - , optparse-applicative, template-haskell, text, vector, yaml - }: - mkDerivation { - pname = "stache"; version = "2.3.3"; sha256 = "1naqj54qm59f04x310lvj4fsrp3xar1v643i79gp7h48kyn1c2vy"; isLibrary = true; @@ -263306,7 +263488,6 @@ self: { ]; description = "Mustache templates for Haskell"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; mainProgram = "stache"; }) {}; @@ -265807,15 +265988,16 @@ self: { }) {}; "stooq-api" = callPackage - ({ mkDerivation, aeson, base, bytestring, lens, text, time - , utf8-string, vector, wreq + ({ mkDerivation, aeson, base, bytestring, lens, stringsearch, text + , time, utf8-string, vector, wreq }: mkDerivation { pname = "stooq-api"; - version = "0.2.0.0"; - sha256 = "1fsfy2ira8bhkzh6bf72p0wvgq970y1nrgkqsbngbq2p8yx5s2ay"; + version = "0.3.0.0"; + sha256 = "1ax4ar3f0vnh1gcybxmf4vf0hvj1shs8mhin046jmgjqj14ss6zn"; libraryHaskellDepends = [ - aeson base bytestring lens text time utf8-string vector wreq + aeson base bytestring lens stringsearch text time utf8-string + vector wreq ]; doHaddock = false; description = "A simple wrapper around stooq.pl API for downloading market data."; @@ -266114,8 +266296,8 @@ self: { }: mkDerivation { pname = "stratosphere"; - version = "0.59.1"; - sha256 = "1gcvz8gpyj495jr5qa2jx2yay7ip3hs1dd4bqckmam8llyz2gvxv"; + version = "0.60.0"; + sha256 = "0vp5m82h9axvvzqqxf4q5jxcjgym1b8h4x4y4a367bpiy7xk4kwf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -268267,8 +268449,8 @@ self: { }: mkDerivation { pname = "strongweak"; - version = "0.3.0"; - sha256 = "00cl7dbqbaq81rsk3xzkdzyxra16kcz4dfdm0w7l1ysrgpfa1kbp"; + version = "0.3.1"; + sha256 = "1n46qw6hkdfbsfpyhpkalkw19fx152925hnpwmm2gr0rjzvwyn2p"; libraryHaskellDepends = [ base either prettyprinter refined vector vector-sized ]; @@ -269356,23 +269538,6 @@ self: { }: mkDerivation { pname = "superbuffer"; - version = "0.3.1.1"; - sha256 = "0y3c2v2ca5lzz6265bcn9g04j6aihm7kw8w91ywfl7bkg1agp9fp"; - libraryHaskellDepends = [ base bytestring ]; - testHaskellDepends = [ async base bytestring HTF QuickCheck ]; - benchmarkHaskellDepends = [ - async base buffer-builder bytestring criterion - ]; - description = "Efficiently build a bytestring from smaller chunks"; - license = lib.licenses.bsd3; - }) {}; - - "superbuffer_0_3_1_2" = callPackage - ({ mkDerivation, async, base, buffer-builder, bytestring, criterion - , HTF, QuickCheck - }: - mkDerivation { - pname = "superbuffer"; version = "0.3.1.2"; sha256 = "024mcjmayirwxqqyr9w1zfsxihi680clzngkpmgccv10phb8qpsp"; libraryHaskellDepends = [ base bytestring ]; @@ -269382,7 +269547,6 @@ self: { ]; description = "Efficiently build a bytestring from smaller chunks"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "supercollider-ht" = callPackage @@ -285566,6 +285730,17 @@ self: { license = lib.licenses.publicDomain; }) {}; + "truthy" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "truthy"; + version = "0.3.0.1"; + sha256 = "164jxd8cyjb4qkmwqchzcpvd5fh7d124gbpryi26y8cbabmhfm8z"; + libraryHaskellDepends = [ base ]; + description = "Generalized booleans and truthy values"; + license = lib.licenses.mit; + }) {}; + "tsession" = callPackage ({ mkDerivation, base, containers, mtl, time, transformers }: mkDerivation { @@ -286061,14 +286236,29 @@ self: { ({ mkDerivation, base, ghc-prim, hspec, template-haskell }: mkDerivation { pname = "tuple-append"; - version = "0.1.0.0"; - sha256 = "1lmpwf5fdgs6xzfbgp5mr9090m7323gmrn8fbclmr1kr2xfribnw"; + version = "0.1.1.0"; + sha256 = "00qj8rhnga8d18ylw7hjsizijh9qzdm50n4czrx941np5vn1lff2"; libraryHaskellDepends = [ base ghc-prim template-haskell ]; testHaskellDepends = [ base ghc-prim hspec ]; description = "A package to append items and tuples into new tuples"; license = lib.licenses.bsd3; }) {}; + "tuple-append-instances" = callPackage + ({ mkDerivation, base, bytestring, dlist, text, tuple-append + , vector + }: + mkDerivation { + pname = "tuple-append-instances"; + version = "0.1.0.0"; + sha256 = "0gbrl03q10392lrym8mvav3hfh5nbds0li1bpkv4r1c8g80m5kg7"; + libraryHaskellDepends = [ + base bytestring dlist text tuple-append vector + ]; + description = "Extra instances for the typeclasses in the tuple-append package"; + license = lib.licenses.bsd3; + }) {}; + "tuple-gen" = callPackage ({ mkDerivation, base, combinat }: mkDerivation { @@ -288389,13 +288579,13 @@ self: { "typesafe-precure" = callPackage ({ mkDerivation, aeson, aeson-pretty, autoexporter, base - , bytestring, dlist, hspec, monad-skeleton, template-haskell, text - , th-data-compat, th-strict-compat + , bytestring, dlist, hspec, hspec-discover, monad-skeleton + , template-haskell, text, th-data-compat, th-strict-compat }: mkDerivation { pname = "typesafe-precure"; - version = "0.8.2.2"; - sha256 = "1lrp190lb5432bc5kxfcjx3a4pf1y6krl3x74181448x2sx7fh1g"; + version = "0.9.0.1"; + sha256 = "10965lqb2f2fk5zyzdvk72bc9ja9kl17fqpb9b96pazw74qjm7a5"; libraryHaskellDepends = [ aeson aeson-pretty autoexporter base bytestring dlist monad-skeleton template-haskell text th-data-compat @@ -288403,6 +288593,7 @@ self: { ]; libraryToolDepends = [ autoexporter ]; testHaskellDepends = [ base hspec ]; + testToolDepends = [ hspec-discover ]; description = "Type-safe transformations and purifications of PreCures (Japanese Battle Heroine)"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -296592,6 +296783,42 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "vty_5_36" = callPackage + ({ mkDerivation, ansi-terminal, base, binary, blaze-builder + , bytestring, Cabal, containers, deepseq, directory, filepath + , hashable, HUnit, microlens, microlens-mtl, microlens-th, mtl + , parallel, parsec, QuickCheck, quickcheck-assertions, random + , smallcheck, stm, string-qq, terminfo, test-framework + , test-framework-hunit, test-framework-smallcheck, text + , transformers, unix, utf8-string, vector + }: + mkDerivation { + pname = "vty"; + version = "5.36"; + sha256 = "19841hwr0s1s05dlxw5386vnrxka9567bn309d002y263wb8vfzi"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ansi-terminal base binary blaze-builder bytestring containers + deepseq directory filepath hashable microlens microlens-mtl + microlens-th mtl parallel parsec stm terminfo text transformers + unix utf8-string vector + ]; + executableHaskellDepends = [ + base containers directory filepath microlens microlens-mtl mtl + ]; + testHaskellDepends = [ + base blaze-builder bytestring Cabal containers deepseq HUnit + microlens microlens-mtl mtl QuickCheck quickcheck-assertions random + smallcheck stm string-qq terminfo test-framework + test-framework-hunit test-framework-smallcheck text unix + utf8-string vector + ]; + description = "A simple terminal UI library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "vty-examples" = callPackage ({ mkDerivation, array, base, bytestring, Cabal, containers , data-default, deepseq, lens, mtl, parallel, parsec, QuickCheck @@ -296964,20 +297191,18 @@ self: { }) {}; "wai-control" = callPackage - ({ mkDerivation, base, monad-control-identity, transformers-base - , wai, wai-websockets, websockets + ({ mkDerivation, base, unliftio-core, wai, wai-websockets + , websockets }: mkDerivation { pname = "wai-control"; - version = "0.1.0.2"; - sha256 = "0ygcqxyp8mmw81rrlk20ziyghi6snrzyyqgfllbh5b6jhx6z017h"; + version = "0.2.0.0"; + sha256 = "091plz38ixm4h54hycgyz5g24h2w1wg25bqsbsfyjyhjjzh4a150"; libraryHaskellDepends = [ - base monad-control-identity transformers-base wai wai-websockets - websockets + base unliftio-core wai wai-websockets websockets ]; description = "Run wai Applications in IO based monads"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "wai-cors" = callPackage @@ -300368,25 +300593,6 @@ self: { }: mkDerivation { pname = "webgear-core"; - version = "1.0.2"; - sha256 = "18zzi1gs0sxa8x061lqavipjn82zzvpnlff02cz7k8lvyyivyn60"; - libraryHaskellDepends = [ - arrows base bytestring case-insensitive filepath http-api-data - http-media http-types jose mime-types network safe-exceptions - tagged template-haskell text unordered-containers wai - ]; - description = "Composable, type-safe library to build HTTP APIs"; - license = lib.licenses.mpl20; - }) {}; - - "webgear-core_1_0_3" = callPackage - ({ mkDerivation, arrows, base, bytestring, case-insensitive - , filepath, http-api-data, http-media, http-types, jose, mime-types - , network, safe-exceptions, tagged, template-haskell, text - , unordered-containers, wai - }: - mkDerivation { - pname = "webgear-core"; version = "1.0.3"; sha256 = "1617gc4hlhgx5xyd5b5l1syhpqdq801ifpdgsbrk3z3madhn8vag"; libraryHaskellDepends = [ @@ -300396,7 +300602,6 @@ self: { ]; description = "Composable, type-safe library to build HTTP APIs"; license = lib.licenses.mpl20; - hydraPlatforms = lib.platforms.none; }) {}; "webgear-openapi" = callPackage @@ -300405,22 +300610,6 @@ self: { }: mkDerivation { pname = "webgear-openapi"; - version = "1.0.2"; - sha256 = "0k3smna51wm9rc00nzv8cf7pd16l4ddldr27niw11gy27viyzpj2"; - libraryHaskellDepends = [ - arrows base http-media http-types insert-ordered-containers lens - openapi3 text webgear-core - ]; - description = "Composable, type-safe library to build HTTP API servers"; - license = lib.licenses.mpl20; - }) {}; - - "webgear-openapi_1_0_3" = callPackage - ({ mkDerivation, arrows, base, http-media, http-types - , insert-ordered-containers, lens, openapi3, text, webgear-core - }: - mkDerivation { - pname = "webgear-openapi"; version = "1.0.3"; sha256 = "0j0xdqg43qsphsnk0lhy5di3hk77a0n5bbw0qp8n371lk90464hd"; libraryHaskellDepends = [ @@ -300429,7 +300618,6 @@ self: { ]; description = "Composable, type-safe library to build HTTP API servers"; license = lib.licenses.mpl20; - hydraPlatforms = lib.platforms.none; }) {}; "webgear-server" = callPackage @@ -300441,31 +300629,6 @@ self: { }: mkDerivation { pname = "webgear-server"; - version = "1.0.2"; - sha256 = "0zy0sxm3jcq8889494v7y1ydka739yw2gh38w60h2fw7awqlbj5w"; - libraryHaskellDepends = [ - aeson arrows base base64-bytestring bytestring - bytestring-conversion http-api-data http-media http-types jose - monad-time mtl text unordered-containers wai webgear-core - ]; - testHaskellDepends = [ - base base64-bytestring bytestring http-types QuickCheck - quickcheck-instances tasty tasty-hunit tasty-quickcheck text wai - webgear-core - ]; - description = "Composable, type-safe library to build HTTP API servers"; - license = lib.licenses.mpl20; - }) {}; - - "webgear-server_1_0_3" = callPackage - ({ mkDerivation, aeson, arrows, base, base64-bytestring, bytestring - , bytestring-conversion, http-api-data, http-media, http-types - , jose, monad-time, mtl, QuickCheck, quickcheck-instances, tasty - , tasty-hunit, tasty-quickcheck, text, unordered-containers, wai - , webgear-core - }: - mkDerivation { - pname = "webgear-server"; version = "1.0.3"; sha256 = "1qj297wgrhzkg7sb9lrmp5jfi77k09fnfmz4mn74vbwwpr90ahaw"; libraryHaskellDepends = [ @@ -300480,7 +300643,6 @@ self: { ]; description = "Composable, type-safe library to build HTTP API servers"; license = lib.licenses.mpl20; - hydraPlatforms = lib.platforms.none; }) {}; "webidl" = callPackage diff --git a/pkgs/development/libraries/cimg/default.nix b/pkgs/development/libraries/cimg/default.nix index 4a482c9da454f..c22d819b3be09 100644 --- a/pkgs/development/libraries/cimg/default.nix +++ b/pkgs/development/libraries/cimg/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "cimg"; - version = "3.0.2"; + version = "3.1.4"; src = fetchFromGitHub { owner = "dtschump"; repo = "CImg"; rev = "v.${version}"; - hash = "sha256-OWpztnyVXCg+uoAb6e/2eUK2ebBalDlz6Qcjf17IeMk="; + hash = "sha256-nHYRs8X8I0B76SlgqWez3qubrsG7iBfa0I/G78v7H8g="; }; outputs = [ "out" "doc" ]; diff --git a/pkgs/development/libraries/gjs/default.nix b/pkgs/development/libraries/gjs/default.nix index 4ceea50d16bf9..9d621e584860d 100644 --- a/pkgs/development/libraries/gjs/default.nix +++ b/pkgs/development/libraries/gjs/default.nix @@ -31,13 +31,13 @@ let ]; in stdenv.mkDerivation rec { pname = "gjs"; - version = "1.72.0"; + version = "1.72.1"; outputs = [ "out" "dev" "installedTests" ]; src = fetchurl { url = "mirror://gnome/sources/gjs/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-PvDK9xbjkg3WH3dI9tVuR2zA/Bg1GtBUjn3xoKub3K0="; + sha256 = "sha256-F8Cx7D8JZnH/i/q6bku/FBmMcBPGBL/Wd6mFjaB5wKs="; }; patches = [ diff --git a/pkgs/development/libraries/gnome-desktop/default.nix b/pkgs/development/libraries/gnome-desktop/default.nix index 32f491c97cec6..c806636ff8dc2 100644 --- a/pkgs/development/libraries/gnome-desktop/default.nix +++ b/pkgs/development/libraries/gnome-desktop/default.nix @@ -27,13 +27,13 @@ stdenv.mkDerivation rec { pname = "gnome-desktop"; - version = "42.2"; + version = "42.3"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/gnome-desktop/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-9CsU6sjRRWwr/B+8l+9q/knI3W9XeW6P1f6zkzHtVb0="; + sha256 = "sha256-2lBBC48Z/X53WwDR/g26Z/xeEVHe0pkVjcJd2tw/qKk="; }; patches = [ diff --git a/pkgs/development/libraries/libfprint/default.nix b/pkgs/development/libraries/libfprint/default.nix index d2766c4d29ab5..e05f67e01fa6b 100644 --- a/pkgs/development/libraries/libfprint/default.nix +++ b/pkgs/development/libraries/libfprint/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { pname = "libfprint"; - version = "1.94.3"; + version = "1.94.4"; outputs = [ "out" "devdoc" ]; src = fetchFromGitLab { @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { owner = "libfprint"; repo = pname; rev = "v${version}"; - sha256 = "sha256-uOFWF+CDyK4+fY+NhiDnRKaptAN/vfH32Vzj+LAxWqg="; + sha256 = "sha256-C8vBjk0cZm/GSqc6mgNbXG8FycnWRaXhj9wIrLcWzfE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/libressl/default.nix b/pkgs/development/libraries/libressl/default.nix index 8ec7b2b87f5f7..82974fe072838 100644 --- a/pkgs/development/libraries/libressl/default.nix +++ b/pkgs/development/libraries/libressl/default.nix @@ -92,5 +92,14 @@ in { libressl_3_5 = generic { version = "3.5.3"; hash = "sha256-OrXl6u9pziDGsXDuZNeFtCI19I8uYrCV/KXXtmcriyg="; + + patches = [ + # Fix endianness detection on aarch64-darwin, issue #181187 + (fetchpatch { + name = "fix-endian-header-detection.patch"; + url = "https://patch-diff.githubusercontent.com/raw/libressl-portable/portable/pull/771.patch"; + sha256 = "sha256-in5U6+sl0HB9qMAtUL6Py4X2rlv0HsqRMIQhhM1oThE="; + }) + ]; }; } diff --git a/pkgs/development/libraries/librest/1.0.nix b/pkgs/development/libraries/librest/1.0.nix index d51f9e31b178f..30482a510274b 100644 --- a/pkgs/development/libraries/librest/1.0.nix +++ b/pkgs/development/libraries/librest/1.0.nix @@ -7,20 +7,21 @@ , gi-docgen , glib , json-glib -, libsoup +, libsoup_3 +, libxml2 , gobject-introspection , gnome }: stdenv.mkDerivation rec { pname = "rest"; - version = "0.9.0"; + version = "0.9.1"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "hbK8k0ESgTlTm1PuU/BTMxC8ljkv1kWGOgQEELgevmY="; + sha256 = "kmalwQ7OOD4ZPft/+we1CcwfUVIauNrXavlu0UISwuM="; }; nativeBuildInputs = [ @@ -34,7 +35,8 @@ stdenv.mkDerivation rec { buildInputs = [ glib json-glib - libsoup + libsoup_3 + libxml2 ]; mesonFlags = [ diff --git a/pkgs/development/libraries/ntl/default.nix b/pkgs/development/libraries/ntl/default.nix index f204ae68fb52c..9335bec35ce87 100644 --- a/pkgs/development/libraries/ntl/default.nix +++ b/pkgs/development/libraries/ntl/default.nix @@ -35,6 +35,11 @@ stdenv.mkDerivation rec { dontAddPrefix = true; # DEF_PREFIX instead + # Written in perl, does not support autoconf-style + # --build=/--host= options: + # Error: unrecognized option: --build=x86_64-unknown-linux-gnu + configurePlatforms = [ ]; + # reference: http://shoup.net/ntl/doc/tour-unix.html configureFlags = [ "DEF_PREFIX=$(out)" diff --git a/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix b/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix index 6468c80519665..d7bbabf5e688b 100644 --- a/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix +++ b/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "qtstyleplugin-kvantum"; - version = "1.0.2"; + version = "1.0.3"; src = fetchFromGitHub { owner = "tsujan"; repo = "Kvantum"; rev = "V${version}"; - sha256 = "NPMqd7j9Unvw8p/cUNMYWmgrb2ysdMvSSGJ6lJWh4/M="; + sha256 = "hY8QQVcP3E+GAdLOqtVbqCWBcxS2M6sMOr/vr+DryyQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/ailment/default.nix b/pkgs/development/python-modules/ailment/default.nix index 6b165bbaa570e..024fa0bed62f3 100644 --- a/pkgs/development/python-modules/ailment/default.nix +++ b/pkgs/development/python-modules/ailment/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "ailment"; - version = "9.2.9"; + version = "9.2.10"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-NvSbv/lMWEWZDHqo/peND8YsaZBKMm2SandDozyDoNs="; + hash = "sha256-l2rnCtzHeK9B/sb8EQUeTRiapE3Dzcysej1zqO0rrV0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/angr/default.nix b/pkgs/development/python-modules/angr/default.nix index 1774e0e60f0ad..f98f3ef3f966b 100644 --- a/pkgs/development/python-modules/angr/default.nix +++ b/pkgs/development/python-modules/angr/default.nix @@ -46,7 +46,7 @@ in buildPythonPackage rec { pname = "angr"; - version = "9.2.9"; + version = "9.2.10"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -55,7 +55,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-8tIqAs3TPoc4G6h91Y7tQVy4KowmyJA5HwFbFwQTgjc="; + hash = "sha256-GkNpcYY9BEdLlWWOZQt2Ahdp8474RGbvV4UWTdBTKjc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/archinfo/default.nix b/pkgs/development/python-modules/archinfo/default.nix index 64aebd5b39936..f674cf567ce76 100644 --- a/pkgs/development/python-modules/archinfo/default.nix +++ b/pkgs/development/python-modules/archinfo/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "archinfo"; - version = "9.2.9"; + version = "9.2.10"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-TEW5aoBMBZCoW4nMFOVkg3xlHIM8TsKhdmijCoIOFoM="; + hash = "sha256-pd7QnJr+XXx+seGDlaLKBIew0Ldcnfsf7d1DgxZFREM="; }; checkInputs = [ diff --git a/pkgs/development/python-modules/channels-redis/default.nix b/pkgs/development/python-modules/channels-redis/default.nix index 803104d85471e..6ee3dc340c635 100644 --- a/pkgs/development/python-modules/channels-redis/default.nix +++ b/pkgs/development/python-modules/channels-redis/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "channels-redis"; - version = "3.4.0"; + version = "3.4.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit version; pname = "channels_redis"; - sha256 = "sha256-Xf/UzBYXQSW9QEP8j+dGLKdAPPgB1Zqfp0EO0QH6alc="; + sha256 = "sha256-eOSi8rKnRP5ah4SOw2te5J9SLGgIzv5sWDZj0NUx+qg="; }; buildInputs = [ redis hiredis ]; diff --git a/pkgs/development/python-modules/claripy/default.nix b/pkgs/development/python-modules/claripy/default.nix index 2b411204cf0c3..1b2998e6a50df 100644 --- a/pkgs/development/python-modules/claripy/default.nix +++ b/pkgs/development/python-modules/claripy/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "claripy"; - version = "9.2.9"; + version = "9.2.10"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-8uavNI/Zhvt7jf8+bOvnExp7Jx/By+rgIc5MbNtrSdY="; + hash = "sha256-viQC8FgZ/La3fdlBcFd3Lm+YiiPzNyxw41caRfZU0/I="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/cle/default.nix b/pkgs/development/python-modules/cle/default.nix index 7f3f7f1fcb29a..b4f1e5fb65e5c 100644 --- a/pkgs/development/python-modules/cle/default.nix +++ b/pkgs/development/python-modules/cle/default.nix @@ -15,7 +15,7 @@ let # The binaries are following the argr projects release cycle - version = "9.2.9"; + version = "9.2.10"; # Binary files from https://github.com/angr/binaries (only used for testing and only here) binaries = fetchFromGitHub { @@ -37,7 +37,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-TnDJFBCejMyV6UdgvuywxXeE/OKe4XCE1+lIGl6YEjc="; + hash = "sha256-2B+yeQAWVTECW5M4/GFF4wvw3q6y/I6QQC+pYkUObN0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-iot/default.nix b/pkgs/development/python-modules/google-cloud-iot/default.nix index 77dd863f2b52a..33da23b93ff4c 100644 --- a/pkgs/development/python-modules/google-cloud-iot/default.nix +++ b/pkgs/development/python-modules/google-cloud-iot/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "google-cloud-iot"; - version = "2.5.1"; + version = "2.6.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Y71v505bwXEV1u28WFAHs12Qx0tKY7BDjFCc+oBgZcw="; + sha256 = "sha256-XfF4+F4+LmRyxn8Zs3gI2RegFb3Y+uoAinEqcLeWCGM="; }; propagatedBuildInputs = [ grpc-google-iam-v1 google-api-core libcst proto-plus ]; diff --git a/pkgs/development/python-modules/google-cloud-logging/default.nix b/pkgs/development/python-modules/google-cloud-logging/default.nix index 8dd27b463d98e..658c145bddad1 100644 --- a/pkgs/development/python-modules/google-cloud-logging/default.nix +++ b/pkgs/development/python-modules/google-cloud-logging/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "google-cloud-logging"; - version = "3.1.2"; + version = "3.2.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-PtAKi9IHb+56HcBTiA/LPJcxhIB+JA+MPAkp3XSOr38="; + hash = "sha256-DHFg4s1saEVhTk+IDqrmLaIM4nwjmBj72osp16YnruY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-runtimeconfig/default.nix b/pkgs/development/python-modules/google-cloud-runtimeconfig/default.nix index 0ff3e076f2e94..3b435ac5adac4 100644 --- a/pkgs/development/python-modules/google-cloud-runtimeconfig/default.nix +++ b/pkgs/development/python-modules/google-cloud-runtimeconfig/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "google-cloud-runtimeconfig"; - version = "0.33.1"; + version = "0.33.2"; src = fetchPypi { inherit pname version; - sha256 = "sha256-SKinB6fiBh+oe+lb2IGMD6248DDOrG7g3kiFpMGX4BU="; + sha256 = "sha256-MPmyvm2FSrUzb1y5i4xl5Cqea6sxixLoZ7V1hxNi7hw="; }; propagatedBuildInputs = [ google-api-core google-cloud-core ]; diff --git a/pkgs/development/python-modules/google-cloud-spanner/default.nix b/pkgs/development/python-modules/google-cloud-spanner/default.nix index 74537b37d0110..88643251bbbb2 100644 --- a/pkgs/development/python-modules/google-cloud-spanner/default.nix +++ b/pkgs/development/python-modules/google-cloud-spanner/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "google-cloud-spanner"; - version = "3.15.1"; + version = "3.16.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-VmHmje3fJfiCT2CeJgk98qdFhZnxGZudfHP1MgW6Mtw="; + sha256 = "sha256-vkjAkxpk50zFVbhvdN76U5n6KbrTXilughac73La9yM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/meilisearch/default.nix b/pkgs/development/python-modules/meilisearch/default.nix index b7f0f049db70f..5b2acecf6369e 100644 --- a/pkgs/development/python-modules/meilisearch/default.nix +++ b/pkgs/development/python-modules/meilisearch/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "meilisearch"; - version = "0.18.3"; + version = "0.19.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,8 +15,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "meilisearch"; repo = "meilisearch-python"; - rev = "v${version}"; - hash = "sha256-Ym3AbIEf8eMSrtP8W1dPXqL0mTVN2bd8hlxdFhW/dkQ="; + rev = "refs/tags/v${version}"; + hash = "sha256-ky5Z1bu+JFpnSGfzaEB6g/nl/F/QJQGVpgb+Jf/o/tM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyvex/default.nix b/pkgs/development/python-modules/pyvex/default.nix index f104c9b0cc8fe..fc109115c0567 100644 --- a/pkgs/development/python-modules/pyvex/default.nix +++ b/pkgs/development/python-modules/pyvex/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pyvex"; - version = "9.2.9"; + version = "9.2.10"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-QlgfiKQv1kMgGhtasOvuRFrciyFH7rsehbhOUxXSABk="; + hash = "sha256-0dUUEhkFedoZLW/HOhJQQgPmfcJbDYtyup4jCZBUhSI="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/sentry-sdk/default.nix b/pkgs/development/python-modules/sentry-sdk/default.nix index e434310f56f04..1b55414ca5b14 100644 --- a/pkgs/development/python-modules/sentry-sdk/default.nix +++ b/pkgs/development/python-modules/sentry-sdk/default.nix @@ -46,7 +46,7 @@ buildPythonPackage rec { pname = "sentry-sdk"; - version = "1.6.0"; + version = "1.7.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -55,7 +55,7 @@ buildPythonPackage rec { owner = "getsentry"; repo = "sentry-python"; rev = version; - hash = "sha256-X831uMlxvcgxQz8xWQZkJOp/fTmF62J95esJY23DZQw="; + hash = "sha256-Wee4toHLbiwYXMtsxALetAJ+JxxN/DsNPIiZeeWNuI0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/types-pyyaml/default.nix b/pkgs/development/python-modules/types-pyyaml/default.nix index 113e2bd887787..e2c74aa1a466f 100644 --- a/pkgs/development/python-modules/types-pyyaml/default.nix +++ b/pkgs/development/python-modules/types-pyyaml/default.nix @@ -5,13 +5,13 @@ buildPythonPackage rec { pname = "types-pyyaml"; - version = "6.0.8"; + version = "6.0.9"; format = "setuptools"; src = fetchPypi { pname = "types-PyYAML"; inherit version; - sha256 = "0f349hmw597f2gcja445fsrlnfzb0dj7fy62g8wcbydlgcvmsjfr"; + sha256 = "sha256-M651yEuPYf3fDGPpx+VX252xaUrTwu6GKOxe/rtaXps="; }; # Module doesn't have tests diff --git a/pkgs/development/python-modules/types-redis/default.nix b/pkgs/development/python-modules/types-redis/default.nix index 4e2d5950efa30..f1ce15b68227d 100644 --- a/pkgs/development/python-modules/types-redis/default.nix +++ b/pkgs/development/python-modules/types-redis/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-redis"; - version = "4.3.2"; + version = "4.3.3"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-oZNQj6poxT3sRcwwUV6rlMMxMlr4oMPIAJX2Dyq22qY="; + sha256 = "sha256-064pr/eZk2HJ+XlJi9LiV/ky9ikbh2qsC0S18AEGxuE="; }; # Module doesn't have tests diff --git a/pkgs/development/python-modules/types-setuptools/default.nix b/pkgs/development/python-modules/types-setuptools/default.nix index 19708ad5733d6..be41acffdd6fc 100644 --- a/pkgs/development/python-modules/types-setuptools/default.nix +++ b/pkgs/development/python-modules/types-setuptools/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-setuptools"; - version = "62.6.0"; + version = "62.6.1"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-x3oytRZ7ng2Zwfezm39aPsABxxCZMd1jxRZS+eRmPQc="; + sha256 = "sha256-r/2WijpyGOHJbxgG60V/QCfqyAOzyq3cz5ik5XdrFyQ="; }; # Module doesn't have tests diff --git a/pkgs/development/python-modules/zigpy-znp/default.nix b/pkgs/development/python-modules/zigpy-znp/default.nix index a37f22a386a3f..789a152b6220e 100644 --- a/pkgs/development/python-modules/zigpy-znp/default.nix +++ b/pkgs/development/python-modules/zigpy-znp/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "zigpy-znp"; - version = "0.8.0"; + version = "0.8.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -26,8 +26,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "zigpy"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-sGwZL2AOCEWO9xl3HPHBGEFQ5NVk6CeuX9lt8ez8MFE="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-GKdhzmSQZ+D7o9OJZ5880mRI1mIcckW+dY5DnP7zIuo="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/tools/analysis/frama-c/default.nix b/pkgs/development/tools/analysis/frama-c/default.nix index 0b962a97ef1f4..869222e560b83 100644 --- a/pkgs/development/tools/analysis/frama-c/default.nix +++ b/pkgs/development/tools/analysis/frama-c/default.nix @@ -4,15 +4,6 @@ , gdk-pixbuf, wrapGAppsHook }: -let why3_1_5 = why3; in -let why3 = why3_1_5.overrideAttrs (o: rec { - version = "1.4.1"; - src = fetchurl { - url = "https://why3.gitlabpages.inria.fr/releases/${o.pname}-${version}.tar.gz"; - sha256 = "sha256:1rqyypzlvagrn43ykl0c5wxyvnry5fl1ykn3xcvlzgghk96yq3jq"; - }; -}); in - let mkocamlpath = p: "${p}/lib/ocaml/${ocamlPackages.ocaml.version}/site-lib"; runtimeDeps = with ocamlPackages; [ @@ -24,9 +15,12 @@ let mlgmpidl num ocamlgraph + ppx_deriving + ppx_import stdlib-shims why3 re + result seq sexplib sexplib0 @@ -40,21 +34,24 @@ in stdenv.mkDerivation rec { pname = "frama-c"; - version = "24.0"; - slang = "Chromium"; + version = "25.0"; + slang = "Manganese"; src = fetchurl { url = "https://frama-c.com/download/frama-c-${version}-${slang}.tar.gz"; - sha256 = "sha256:0x1xgip50jdz1phsb9rzwf2ra8lshn1hmd9g967xia402wrg3sjf"; + sha256 = "sha256-Ii3O/NJyBTVAv1ts/zae/Ee4HCjzYOthZmnD8wqLwp8="; }; preConfigure = lib.optionalString stdenv.cc.isClang "configureFlagsArray=(\"--with-cpp=clang -E -C\")"; + postConfigure = "patchShebangs src/plugins/value/gen-api.sh"; + nativeBuildInputs = [ autoconf wrapGAppsHook ]; buildInputs = with ocamlPackages; [ ncurses ocaml findlib ltl2ba ocamlgraph yojson menhirLib camlzip lablgtk3 lablgtk3-sourceview3 coq graphviz zarith apron why3 mlgmpidl doxygen + ppx_deriving ppx_import gdk-pixbuf ]; diff --git a/pkgs/development/tools/continuous-integration/drone-runner-docker/default.nix b/pkgs/development/tools/continuous-integration/drone-runner-docker/default.nix index fa2957be986d1..bff410bdc9220 100644 --- a/pkgs/development/tools/continuous-integration/drone-runner-docker/default.nix +++ b/pkgs/development/tools/continuous-integration/drone-runner-docker/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "drone-runner-docker"; - version = "1.8.0"; + version = "1.8.1"; src = fetchFromGitHub { owner = "drone-runners"; repo = pname; rev = "v${version}"; - sha256 = "sha256-F04h9kwrVvQEenzw1QTeNnQun9tHzu8HT24gNEMcRro="; + sha256 = "sha256-3SbvnW+mCwaBCF77rAnDMqZRHX9wDCjXvFGq9w0E5Qw="; }; vendorSha256 = "sha256-E18ykjQc1eoHpviYok+NiLaeH01UMQmigl9JDwtR+zo="; diff --git a/pkgs/development/tools/misc/d-spy/default.nix b/pkgs/development/tools/misc/d-spy/default.nix index a1fbecd5b263f..a4a49172c234c 100644 --- a/pkgs/development/tools/misc/d-spy/default.nix +++ b/pkgs/development/tools/misc/d-spy/default.nix @@ -1,9 +1,9 @@ { stdenv , lib , desktop-file-utils -, fetchpatch , fetchurl , glib +, gettext , gtk4 , libadwaita , meson @@ -15,30 +15,23 @@ stdenv.mkDerivation rec { pname = "d-spy"; - version = "1.2.0"; + version = "1.2.1"; outputs = [ "out" "lib" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/dspy/${lib.versions.majorMinor version}/dspy-${version}.tar.xz"; - sha256 = "XKL0z00w0va9m1OfuVq5YJyE1jzeynBxb50jc+O99tQ="; + sha256 = "TjnA1to687eJASJd0VEjOFe+Ihtfs62CwdsVhyNrZlI="; }; - patches = [ - # Remove pointless dependencies - # https://gitlab.gnome.org/GNOME/d-spy/-/merge_requests/6 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/d-spy/-/commit/5a0ec8d53d006e95e93c6d6e32a381eb248b12a1.patch"; - sha256 = "jalfdAXcH8GZ50qb2peG+2841cGan4EhwN88z5Ewf+k="; - }) - ]; - nativeBuildInputs = [ meson ninja pkg-config desktop-file-utils wrapGAppsHook4 + gettext + glib ]; buildInputs = [ diff --git a/pkgs/development/tools/zls/default.nix b/pkgs/development/tools/zls/default.nix index 0fbe7bc31140e..a48dbf9e30f9f 100644 --- a/pkgs/development/tools/zls/default.nix +++ b/pkgs/development/tools/zls/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "zls"; - version = "unstable-2021-06-06"; + version = "0.9.0"; src = fetchFromGitHub { owner = "zigtools"; repo = pname; - rev = "39d87188647bd8c8eed304ee18f2dd1df6942f60"; - sha256 = "sha256-22N508sVkP1OLySAijhtTPzk2fGf+FVnX9LTYRbRpB4="; + rev = version; + sha256 = "sha256-MVo21qNCZop/HXBqrPcosGbRY+W69KNCc1DfnH47GsI="; fetchSubmodules = true; }; diff --git a/pkgs/development/web/lucky-cli/default.nix b/pkgs/development/web/lucky-cli/default.nix index 3d2901bc9acee..b62464d2649a2 100644 --- a/pkgs/development/web/lucky-cli/default.nix +++ b/pkgs/development/web/lucky-cli/default.nix @@ -2,13 +2,13 @@ crystal.buildCrystalPackage rec { pname = "lucky-cli"; - version = "0.29.0"; + version = "0.30.0"; src = fetchFromGitHub { owner = "luckyframework"; repo = "lucky_cli"; rev = "v${version}"; - sha256 = "sha256-OmvKd35jR003qQnA/NBI4MjGRw044bYUYa59RKbz+lI="; + hash = "sha256-fgrfVqRcb8xdvZ33XW3lBwR1GhjF/WeAglrPH2Fw31I="; }; # the integration tests will try to clone a remote repos diff --git a/pkgs/development/web/lucky-cli/shard.lock b/pkgs/development/web/lucky-cli/shard.lock index 854a755b0df89..a81bcf48300bb 100644 --- a/pkgs/development/web/lucky-cli/shard.lock +++ b/pkgs/development/web/lucky-cli/shard.lock @@ -2,12 +2,16 @@ version: 2.0 shards: ameba: git: https://github.com/crystal-ameba/ameba.git - version: 0.14.3 + version: 1.0.0 lucky_task: git: https://github.com/luckyframework/lucky_task.git version: 0.1.1 + nox: + git: https://github.com/matthewmcgarvey/nox.git + version: 0.2.0 + teeplate: git: https://github.com/luckyframework/teeplate.git version: 0.8.5 diff --git a/pkgs/development/web/lucky-cli/shards.nix b/pkgs/development/web/lucky-cli/shards.nix index 78c0b4b133854..ea85b4b52e9b0 100644 --- a/pkgs/development/web/lucky-cli/shards.nix +++ b/pkgs/development/web/lucky-cli/shards.nix @@ -1,19 +1,21 @@ { ameba = { - owner = "crystal-ameba"; - repo = "ameba"; - rev = "v0.14.3"; - sha256 = "1cfr95xi6hsyxw1wlrh571hc775xhwmssk3k14i8b7dgbwfmm5x1"; + url = "https://github.com/crystal-ameba/ameba.git"; + rev = "v1.0.0"; + sha256 = "01cgapdpk8dg7sdgnq6ql42g3kv5z2fmsc90z07d9zvjp9vs2idp"; }; lucky_task = { - owner = "luckyframework"; - repo = "lucky_task"; + url = "https://github.com/luckyframework/lucky_task.git"; rev = "v0.1.1"; sha256 = "0w0rnf22pvj3lp5z8c4sshzwhqgwpbjpm7nry9mf0iz3fa0v48f7"; }; + nox = { + url = "https://github.com/matthewmcgarvey/nox.git"; + rev = "v0.2.0"; + sha256 = "041wh7nbi8jxg314p5s4080ll9ywc48knpxmrzwj5h4rgmk7g231"; + }; teeplate = { - owner = "luckyframework"; - repo = "teeplate"; + url = "https://github.com/luckyframework/teeplate.git"; rev = "v0.8.5"; sha256 = "1kr05qrp674rph1324wry57gzvgvcvlz0w27brlvdgd3gi4s8sdj"; }; diff --git a/pkgs/games/steam/fhsenv.nix b/pkgs/games/steam/fhsenv.nix index 86c04b5757a25..0d765d0c11708 100644 --- a/pkgs/games/steam/fhsenv.nix +++ b/pkgs/games/steam/fhsenv.nix @@ -195,6 +195,8 @@ in buildFHSUserEnv rec { SDL2_ttf SDL2_mixer libappindicator-gtk2 + libdbusmenu-gtk2 + libindicator-gtk2 libcaca libcanberra libgcrypt diff --git a/pkgs/misc/pylode/default.nix b/pkgs/misc/pylode/default.nix index b37ff23666948..581baf0e9c808 100644 --- a/pkgs/misc/pylode/default.nix +++ b/pkgs/misc/pylode/default.nix @@ -5,7 +5,7 @@ python3.pkgs.buildPythonApplication rec { pname = "pylode"; - version = "2.12.0"; + version = "2.13.3"; format = "setuptools"; disabled = python3.pythonOlder "3.6"; @@ -13,8 +13,8 @@ python3.pkgs.buildPythonApplication rec { src = fetchFromGitHub { owner = "RDFLib"; repo = pname; - rev = version; - sha256 = "sha256-X/YiJduAJNiceIrlCFwD2PFiMn3HVlzr9NzyDvYcql8="; + rev = "refs/tags/${version}"; + sha256 = "sha256-AtqkxnpEL+580S/iKCaRcsQO6LLYhkJxyNx6fi3atbE="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/os-specific/linux/kernel/zen-kernels.nix b/pkgs/os-specific/linux/kernel/zen-kernels.nix index 10245a00a9b88..1e9ca540ea9f4 100644 --- a/pkgs/os-specific/linux/kernel/zen-kernels.nix +++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix @@ -4,16 +4,16 @@ let # comments with variant added for update script # ./update-zen.py zen zenVariant = { - version = "5.18.10"; #zen + version = "5.18.11"; #zen suffix = "zen1"; #zen - sha256 = "0kqzs3g9w1sfin61sapc403pc65acsy18qk8ldkhzhjzv90fw4im"; #zen + sha256 = "11dp4wxn4ilndzpp16aazf7569w3r46qh31f5lhbryqwfpa8vzb1"; #zen isLqx = false; }; # ./update-zen.py lqx lqxVariant = { - version = "5.18.10"; #lqx + version = "5.18.11"; #lqx suffix = "lqx1"; #lqx - sha256 = "0b666lwqhiydkikca2x55ljgpw9sba8r7jvcvp6nghm4yf3a11mp"; #lqx + sha256 = "0q0n88sszq6kpy3s0n0a8nd0rxa7xh4hklkbvv8z2r43l8d4zazr"; #lqx isLqx = true; }; zenKernelsFor = { version, suffix, sha256, isLqx }: buildLinux (args // { @@ -32,7 +32,7 @@ let extraMeta = { branch = lib.versions.majorMinor version + "/master"; - maintainers = with lib.maintainers; [ atemu andresilva psydvl ]; + maintainers = with lib.maintainers; [ atemu andresilva pedrohlc psydvl ]; description = "Built using the best configuration and kernel sources for desktop, multimedia, and gaming workloads." + lib.optionalString isLqx " (Same as linux_zen but less aggressive release schedule)"; }; diff --git a/pkgs/tools/X11/ffcast/default.nix b/pkgs/tools/X11/ffcast/default.nix index 3f6122e4093d7..2146853e6a7ee 100644 --- a/pkgs/tools/X11/ffcast/default.nix +++ b/pkgs/tools/X11/ffcast/default.nix @@ -1,30 +1,40 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, perl, libX11 }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, makeWrapper, perl +, ffmpeg, imagemagick, xdpyinfo, xprop, xrectsel, xwininfo +}: stdenv.mkDerivation rec { pname = "ffcast"; version = "2.5.0"; src = fetchFromGitHub { - owner = "lolilolicon"; + owner = "ropery"; repo = "FFcast"; rev = version; sha256 = "047y32bixhc8ksr98vwpgd0k1xxgsv2vs0n3kc2xdac4krc9454h"; }; - nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ perl libX11 ]; + nativeBuildInputs = [ autoreconfHook makeWrapper perl /*for pod2man*/ ]; configureFlags = [ "--disable-xrectsel" ]; - postBuild = '' - make install + postInstall = let + binPath = lib.makeBinPath [ + ffmpeg + imagemagick + xdpyinfo + xprop + xrectsel + xwininfo + ]; + in '' + wrapProgram $out/bin/ffcast --prefix PATH : ${binPath} ''; meta = with lib; { description = "Run commands on rectangular screen regions"; - homepage = "https://github.com/lolilolicon/FFcast"; - license = licenses.gpl3; - maintainers = [ maintainers.guyonvarch ]; + homepage = "https://github.com/ropery/FFcast"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ sikmir ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/X11/xrectsel/default.nix b/pkgs/tools/X11/xrectsel/default.nix index 0189e52ede9f9..8b37a6792424b 100644 --- a/pkgs/tools/X11/xrectsel/default.nix +++ b/pkgs/tools/X11/xrectsel/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "0.3.2"; src = fetchFromGitHub { - owner = "lolilolicon"; + owner = "ropery"; repo = "xrectsel"; rev = version; sha256 = "0prl4ky3xzch6xcb673mcixk998d40ngim5dqc5374b1ls2r6n7l"; @@ -14,15 +14,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ libX11 ]; - postBuild = '' - make install - ''; - meta = with lib; { description = "Print the geometry of a rectangular screen region"; - homepage = "https://github.com/lolilolicon/xrectsel"; - license = licenses.gpl3; - maintainers = [ maintainers.guyonvarch ]; + homepage = "https://github.com/ropery/xrectsel"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ sikmir ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/admin/trivy/default.nix b/pkgs/tools/admin/trivy/default.nix index 7488ad331bcb8..121c854f929e7 100644 --- a/pkgs/tools/admin/trivy/default.nix +++ b/pkgs/tools/admin/trivy/default.nix @@ -6,15 +6,15 @@ buildGoModule rec { pname = "trivy"; - version = "0.29.1"; + version = "0.29.2"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - sha256 = "sha256-L1MjPgypKWVTdR16grloRY1JoJ6giXqihsWFa8yWXd0="; + sha256 = "sha256-IZ94kYnZ1iNX4sgYF/XvRNvycXJ4fNmRwFgSpYcSopU="; }; - vendorSha256 = "sha256-wM8OOOVw8Pb37/JMpz0AWbpJyHeDBQ0+DO15AiDduUU="; + vendorSha256 = "sha256-C1dOeVt+ocqj3s3tSXn8B/vHTRRWj8XU5RWmlQ0lZdA="; excludedPackages = "misc"; diff --git a/pkgs/tools/graphics/agi/default.nix b/pkgs/tools/graphics/agi/default.nix index cad785372dce3..ec7832de26b30 100644 --- a/pkgs/tools/graphics/agi/default.nix +++ b/pkgs/tools/graphics/agi/default.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { pname = "agi"; - version = "3.1.0-dev-20220314"; + version = "3.1.0-dev-20220627"; src = fetchzip { url = "https://github.com/google/agi-dev-releases/releases/download/v${version}/agi-${version}-linux.zip"; - sha256 = "sha256-j/ozkIoRM+G7fi0qBG8UGKPtrn6DR6KNK0Hc53dxsMw="; + sha256 = "sha256-gJ7vz95KqmTQp+sf1q99Sk7aYooLHVAyYliKzfM/fWU="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/graphics/gmic-qt/default.nix b/pkgs/tools/graphics/gmic-qt/default.nix index 8cc39c1f44af9..29d326439d7fc 100644 --- a/pkgs/tools/graphics/gmic-qt/default.nix +++ b/pkgs/tools/graphics/gmic-qt/default.nix @@ -1,10 +1,10 @@ { lib , mkDerivation -, fetchurl , variant ? "standalone" , fetchFromGitHub , cmake , pkg-config +, ninja , opencv3 , openexr , graphicsmagick @@ -16,6 +16,8 @@ , curl , krita ? null , gimp ? null +, gmic +, cimg , qtbase , qttools , writeShellScript @@ -56,48 +58,24 @@ assert lib.assertMsg (builtins.all (d: d != null) variants.${variant}.extraDeps mkDerivation rec { pname = "gmic-qt${lib.optionalString (variant != "standalone") "-${variant}"}"; - version = "3.0.0"; + version = "3.1.5"; - gmic-community = fetchFromGitHub { - owner = "dtschump"; - repo = "gmic-community"; - rev = "df23b08bc52767762f0e38d040cd8ffeea4b865e"; - sha256 = "euk5RsFPBgx2czAukPRdi/O4ahgXO8J8VJdiGHNge5M="; - }; - - CImg = fetchFromGitHub { - owner = "dtschump"; - repo = "CImg"; - rev = "v.${version}"; - sha256 = "dC4VuWTz0uyFxLjBQ+2ggndHaCErcoI7tJMfkqbWmeg="; - }; - - gmic_stdlib = fetchurl { - name = "gmic_stdlib.h"; - url = "http://gmic.eu/gmic_stdlib${lib.replaceStrings ["."] [""] version}.h"; - sha256 = "CAYSxw5NCmE29hie1/J1csBcdQvIrmZ/+mNMl0sLLGI="; - }; - - gmic = fetchFromGitHub { - owner = "dtschump"; - repo = "gmic"; - rev = "v.${version}"; - sha256 = "PyeJmjOqjbHlZ1Xl3IpoOD6oZEcUrHNHqF7Ft1RZDL4="; - }; - - gmic_qt = fetchFromGitHub { + src = fetchFromGitHub { owner = "c-koi"; repo = "gmic-qt"; rev = "v.${version}"; - sha256 = "nENXumOArRAHENqnBUjM7m+I5hf/WAFTVfm6cJgnv+0="; + sha256 = "rSBdh6jhiVZogZADEKn3g7bkGPnWWOEnRF0jNCe1BCk="; }; nativeBuildInputs = [ cmake pkg-config + ninja ]; buildInputs = [ + gmic + cimg qtbase qttools fftw @@ -113,18 +91,13 @@ mkDerivation rec { cmakeFlags = [ "-DGMIC_QT_HOST=${if variant == "standalone" then "none" else variant}" + "-DENABLE_SYSTEM_GMIC:BOOL=ON" ]; - unpackPhase = '' - cp -r ${gmic} gmic - ln -s ${gmic-community} gmic-community - cp -r ${gmic_qt} gmic_qt - chmod -R +w gmic gmic_qt - ln -s ${CImg} CImg - - cp ${gmic_stdlib} gmic/src/gmic_stdlib.h - - cd gmic_qt + postPatch = '' + patchShebangs \ + translations/filters/csv2ts.sh \ + translations/lrelease.sh ''; postFixup = lib.optionalString (variant == "gimp") '' @@ -132,33 +105,6 @@ mkDerivation rec { wrapQtApp "$out/${gimp.targetPluginDir}/gmic_gimp_qt/gmic_gimp_qt" ''; - passthru = { - updateScript = writeShellScript "${pname}-update-script" '' - set -o errexit - PATH=${lib.makeBinPath [ common-updater-scripts curl gnugrep gnused coreutils jq ]} - - latestVersion=$(curl 'https://gmic.eu/files/source/' | grep -E 'gmic_[^"]+\.tar\.gz' | sed -E 's/.+<a href="gmic_([^"]+)\.tar\.gz".+/\1/g' | sort --numeric-sort --reverse | head -n1) - - if [[ "${version}" = "$latestVersion" ]]; then - echo "The new version same as the old version." - exit 0 - fi - - # gmic-community is not versioned so let’s just update to master. - communityLatestCommit=$(curl "https://api.github.com/repos/dtschump/gmic-community/commits/master") - communityLatestSha=$(echo "$communityLatestCommit" | jq .sha --raw-output) - communityLatestDate=$(echo "$communityLatestCommit" | jq .commit.committer.date --raw-output | sed 's/T.\+//') - update-source-version --source-key=gmic-community "gmic-qt" "unstable-$communityLatestDate" --rev="$communityLatestSha" - - for component in CImg gmic_stdlib gmic gmic_qt; do - # The script will not perform an update when the version attribute is up to date from previous platform run - # We need to clear it before each run - update-source-version "--source-key=$component" "gmic-qt" 0 "$(printf '0%.0s' {1..64})" - update-source-version "--source-key=$component" "gmic-qt" $latestVersion - done - ''; - }; - meta = with lib; { description = variants.${variant}.description; homepage = "http://gmic.eu/"; diff --git a/pkgs/tools/graphics/gmic/default.nix b/pkgs/tools/graphics/gmic/default.nix index a046aca799c95..42bfe8ad05210 100644 --- a/pkgs/tools/graphics/gmic/default.nix +++ b/pkgs/tools/graphics/gmic/default.nix @@ -1,4 +1,6 @@ -{ lib, stdenv +{ stdenv +, lib +, fetchFromGitHub , fetchurl , cmake , ninja @@ -6,22 +8,40 @@ , opencv , openexr , graphicsmagick +, cimg , fftw , zlib , libjpeg , libtiff , libpng +, writeShellScript +, common-updater-scripts +, curl +, gnugrep +, gnused +, coreutils +, jq }: stdenv.mkDerivation rec { pname = "gmic"; - version = "3.0.0"; + version = "3.1.5"; outputs = [ "out" "lib" "dev" "man" ]; - src = fetchurl { - url = "https://gmic.eu/files/source/gmic_${version}.tar.gz"; - sha256 = "sha256-PwVruebb8GdK9Mjc5Z9BmBchh2Yvf7s2zGPryMG3ESA="; + src = fetchFromGitHub { + owner = "dtschump"; + repo = "gmic"; + rev = "326ea9b7dc320b3624fe660d7b7d81669ca12e6d"; + sha256 = "RRCzYMN/IXViiUNnacJV3DNpku3hIHQkHbIrtixExT0="; + }; + + # TODO: build this from source + # https://github.com/dtschump/gmic/blob/b36b2428db5926af5eea5454f822f369c2d9907e/src/Makefile#L675-L729 + gmic_stdlib = fetchurl { + name = "gmic_stdlib.h"; + url = "http://gmic.eu/gmic_stdlib${lib.replaceStrings ["."] [""] version}.h"; + sha256 = "FM8RscCrt6jYlwVB2DtpqYrh9B3pO0I6Y69tkf9W1/o="; }; nativeBuildInputs = [ @@ -31,6 +51,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ + cimg fftw zlib libjpeg @@ -45,8 +66,38 @@ stdenv.mkDerivation rec { "-DBUILD_LIB_STATIC=OFF" "-DENABLE_CURL=OFF" "-DENABLE_DYNAMIC_LINKING=ON" + "-DUSE_SYSTEM_CIMG=ON" ]; + postPatch = '' + # TODO: build from source + cp -r ${gmic_stdlib} src/gmic_stdlib.h + + # CMake build files were moved to subdirectory. + mv resources/CMakeLists.txt resources/cmake . + ''; + + passthru = { + updateScript = writeShellScript "${pname}-update-script" '' + set -o errexit + PATH=${lib.makeBinPath [ common-updater-scripts curl gnugrep gnused coreutils jq ]} + + latestVersion=$(curl 'https://gmic.eu/files/source/' | grep -E 'gmic_[^"]+\.tar\.gz' | sed -E 's/.+<a href="gmic_([^"]+)\.tar\.gz".+/\1/g' | sort --numeric-sort --reverse | head -n1) + + if [[ "${version}" = "$latestVersion" ]]; then + echo "The new version same as the old version." + exit 0 + fi + + for component in src gmic_stdlib; do + # The script will not perform an update when the version attribute is up to date from previous platform run + # We need to clear it before each run + update-source-version "--source-key=$component" "gmic" 0 "$(printf '0%.0s' {1..64})" + update-source-version "--source-key=$component" "gmic" $latestVersion + done + ''; + }; + meta = with lib; { description = "Open and full-featured framework for image processing"; homepage = "https://gmic.eu/"; diff --git a/pkgs/tools/graphics/wkhtmltopdf/default.nix b/pkgs/tools/graphics/wkhtmltopdf/default.nix index 093ab9ad5c435..7f1e40a695e49 100644 --- a/pkgs/tools/graphics/wkhtmltopdf/default.nix +++ b/pkgs/tools/graphics/wkhtmltopdf/default.nix @@ -1,8 +1,8 @@ -{ mkDerivation, lib, fetchFromGitHub, qtwebkit, qtsvg, qtxmlpatterns -, fontconfig, freetype, libpng, zlib, libjpeg +{ stdenv, lib, fetchFromGitHub, qtwebkit, qtsvg, qtxmlpatterns +, fontconfig, freetype, libpng, zlib, libjpeg, wrapQtAppsHook , openssl, libX11, libXext, libXrender }: -mkDerivation rec { +stdenv.mkDerivation rec { version = "0.12.6"; pname = "wkhtmltopdf"; @@ -13,6 +13,10 @@ mkDerivation rec { sha256 = "0m2zy986kzcpg0g3bvvm815ap9n5ann5f6bdy7pfj6jv482bm5mg"; }; + nativeBuildInputs = [ + wrapQtAppsHook + ]; + buildInputs = [ fontconfig freetype libpng zlib libjpeg openssl libX11 libXext libXrender @@ -25,6 +29,12 @@ mkDerivation rec { done ''; + # rewrite library path + postInstall = lib.optionalString stdenv.isDarwin '' + install_name_tool -change libwkhtmltox.0.dylib $out/lib/libwkhtmltox.0.dylib $out/bin/wkhtmltopdf + install_name_tool -change libwkhtmltox.0.dylib $out/lib/libwkhtmltox.0.dylib $out/bin/wkhtmltoimage + ''; + configurePhase = "qmake wkhtmltopdf.pro INSTALLBASE=$out"; enableParallelBuilding = true; @@ -42,6 +52,6 @@ mkDerivation rec { ''; license = licenses.gpl3Plus; maintainers = with maintainers; [ jb55 ]; - platforms = with platforms; linux; + platforms = platforms.unix; }; } diff --git a/pkgs/tools/inputmethods/remote-touchpad/default.nix b/pkgs/tools/inputmethods/remote-touchpad/default.nix index 4df476eb5cd87..c07cff71def68 100644 --- a/pkgs/tools/inputmethods/remote-touchpad/default.nix +++ b/pkgs/tools/inputmethods/remote-touchpad/default.nix @@ -9,19 +9,19 @@ buildGoModule rec { pname = "remote-touchpad"; - version = "1.2.0"; + version = "1.2.1"; src = fetchFromGitHub { owner = "unrud"; repo = pname; rev = "v${version}"; - sha256 = "sha256-GjXcQyv55yJSAFeNNB+YeCVWav7vMGo/d1FCPoujYjA="; + sha256 = "sha256-A7/NLopJkIXwS5rAsf7J6tDL10kNOKCoyAj0tCTW6jQ="; }; buildInputs = [ libX11 libXi libXt libXtst ]; tags = [ "portal,x11" ]; - vendorSha256 = "sha256-WG8OjtfVemtmHkrMg4O0oofsjtFKmIvcmCn9AYAGIrc="; + vendorSha256 = "sha256-UbDbUjC8R6LcYUPVWZID5dtu5tCV4NB268K6qTXYmZY="; meta = with lib; { description = "Control mouse and keyboard from the webbrowser of a smartphone."; diff --git a/pkgs/tools/misc/figlet/default.nix b/pkgs/tools/misc/figlet/default.nix index b16b6821e3181..b297b03d86ba0 100644 --- a/pkgs/tools/misc/figlet/default.nix +++ b/pkgs/tools/misc/figlet/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch }: +{ lib, stdenv, fetchurl, fetchpatch, fetchzip }: stdenv.mkDerivation rec { pname = "figlet"; @@ -10,6 +10,11 @@ stdenv.mkDerivation rec { sha256 = "0za1ax15x7myjl8jz271ybly8ln9kb9zhm1gf6rdlxzhs07w925z"; }; + contributed = fetchzip { + url = "ftp://ftp.figlet.org/pub/figlet/fonts/contributed.tar.gz"; + hash = "sha256-AyvAoc3IqJeKWgJftBahxb/KJjudeJIY4KD6mElNagQ="; + }; + patches = [ (fetchpatch { url = "https://git.alpinelinux.org/aports/plain/main/figlet/musl-fix-cplusplus-decls.patch?h=3.4-stable&id=71776c73a6f04b6f671430f702bcd40b29d48399"; @@ -20,12 +25,15 @@ stdenv.mkDerivation rec { makeFlags = [ "prefix=$(out)" "CC:=$(CC)" "LD:=$(CC)" ]; + postInstall = "cp -ar ${contributed}/* $out/share/figlet/"; + doCheck = true; meta = { description = "Program for making large letters out of ordinary text"; homepage = "http://www.figlet.org/"; license = lib.licenses.afl21; + maintainers = with lib.maintainers; [ ehmry ]; platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/misc/ncdu/default.nix b/pkgs/tools/misc/ncdu/default.nix index 66429f338ac14..d1c185c0f2397 100644 --- a/pkgs/tools/misc/ncdu/default.nix +++ b/pkgs/tools/misc/ncdu/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ncdu"; - version = "1.16"; + version = "1.17"; src = fetchurl { url = "https://dev.yorhel.nl/download/${pname}-${version}.tar.gz"; - sha256 = "1m0gk09jaz114piidiw8fkg0id5l6nhz1cg5nlaf1yl3l595g49b"; + sha256 = "sha256-gQdFqO0as3iMh9OupMwaFO327iJvdkvMOD4CS6Vq2/E="; }; buildInputs = [ ncurses ]; diff --git a/pkgs/tools/misc/phrase-cli/default.nix b/pkgs/tools/misc/phrase-cli/default.nix index d5a4c0e429850..36749fcedfac6 100644 --- a/pkgs/tools/misc/phrase-cli/default.nix +++ b/pkgs/tools/misc/phrase-cli/default.nix @@ -2,16 +2,18 @@ buildGoModule rec { pname = "phrase-cli"; - version = "2.4.4"; + version = "2.4.12"; src = fetchFromGitHub { owner = "phrase"; repo = "phrase-cli"; rev = version; - sha256 = "0xlfcj0jd6x4ynzg6d0p3wlmfq660w3zm13nzx04jfcjnks9sqvl"; + sha256 = "sha256-+/hs6v3ereja2NtGApVBA3rTib5gAiGndbDg+FybWco="; }; - vendorSha256 = "1ablrs3prw011bpad8vn87y3c81q44mps873nhj278hlkz6im34g"; + vendorSha256 = "sha256-Pt+F2ICuOQZBjMccK1qq/ueGOvnjDmAM5YLRINk2u/g="; + + ldflags = [ "-X=github.com/phrase/phrase-cli/cmd.PHRASE_CLIENT_VERSION=${version}" ]; postInstall = '' ln -s $out/bin/phrase-cli $out/bin/phrase diff --git a/pkgs/tools/networking/wakeonlan/default.nix b/pkgs/tools/networking/wakeonlan/default.nix index 48b99cadf2b9b..3fcae6ee2de2a 100644 --- a/pkgs/tools/networking/wakeonlan/default.nix +++ b/pkgs/tools/networking/wakeonlan/default.nix @@ -2,18 +2,20 @@ perlPackages.buildPerlPackage rec { pname = "wakeonlan"; - version = "0.41"; + version = "0.42"; src = fetchFromGitHub { owner = "jpoliv"; repo = pname; - rev = "wakeonlan-${version}"; - sha256 = "0m48b39lz0yc5ckx2jx8y2p4c8npjngxl9wy86k43xgsd8mq1g3c"; + rev = "v${version}"; + sha256 = "sha256-zCOpp5iNrWwh2knBGWhiEyG9IPAnFRwH5jJLEVLBISM="; }; outputs = [ "out" ]; nativeBuildInputs = [ installShellFiles ]; + # checkInputs = [ perl534Packages.TestPerlCritic perl534Packages.TestPod perl534Packages.TestPodCoverage ]; + doCheck = false; # Missing package for https://github.com/genio/test-spelling to run tests installPhase = '' install -Dt $out/bin wakeonlan diff --git a/pkgs/tools/security/exploitdb/default.nix b/pkgs/tools/security/exploitdb/default.nix index 0df20deaaff64..2325374d9617e 100644 --- a/pkgs/tools/security/exploitdb/default.nix +++ b/pkgs/tools/security/exploitdb/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2022-07-02"; + version = "2022-07-12"; src = fetchFromGitHub { owner = "offensive-security"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-1iUlbkdC7lLxBI/zb135l61foH2A2pTOz34YjQhym2g="; + hash = "sha256-fnhiLB5Ga2yWhj0/w94d9gl874ekPJBwiIgK8DapN+w="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/security/fprintd/tod.nix b/pkgs/tools/security/fprintd/tod.nix index 4900124f8d19a..e1c836e76b25a 100644 --- a/pkgs/tools/security/fprintd/tod.nix +++ b/pkgs/tools/security/fprintd/tod.nix @@ -1,21 +1,51 @@ -{ fetchFromGitLab +{ lib +, fetchFromGitLab +, fetchpatch , fprintd , libfprint-tod }: -(fprintd.override { libfprint = libfprint-tod; }).overrideAttrs (oldAttrs: - let +(fprintd.override { libfprint = libfprint-tod; }).overrideAttrs (oldAttrs: rec { pname = "fprintd-tod"; version = "1.90.9"; - in - { - inherit pname version; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "libfprint"; - repo = "${oldAttrs.pname}"; + repo = "fprintd"; rev = "v${version}"; sha256 = "sha256-rOTVThHOY/Q2IIu2RGiv26UE2V/JFfWWnfKZQfKl5Mg="; }; + + patches = oldAttrs.patches or [] ++ [ + (fetchpatch { + name = "use-more-idiomatic-correct-embedded-shell-scripting"; + url = "https://gitlab.freedesktop.org/libfprint/fprintd/-/commit/f4256533d1ffdc203c3f8c6ee42e8dcde470a93f.patch"; + sha256 = "sha256-4uPrYEgJyXU4zx2V3gwKKLaD6ty0wylSriHlvKvOhek="; + }) + (fetchpatch { + name = "remove-pointless-copying-of-files-into-build-directory"; + url = "https://gitlab.freedesktop.org/libfprint/fprintd/-/commit/2c34cef5ef2004d8479475db5523c572eb409a6b.patch"; + sha256 = "sha256-2pZBbMF1xjoDKn/jCAIldbeR2JNEVduXB8bqUrj2Ih4="; + }) + (fetchpatch { + name = "build-Do-not-use-positional-arguments-in-i18n.merge_file"; + url = "https://gitlab.freedesktop.org/libfprint/fprintd/-/commit/50943b1bd4f18d103c35233f0446ce7a31d1817e.patch"; + sha256 = "sha256-ANkAq6fr0VRjkS0ckvf/ddVB2mH4b2uJRTI4H8vPPes="; + }) + ]; + + postPatch = oldAttrs.postPatch or "" + '' + # part of "remove-pointless-copying-of-files-into-build-directory" but git-apply doesn't handle renaming + mv src/device.xml src/net.reactivated.Fprint.Device.xml + mv src/manager.xml src/net.reactivated.Fprint.Manager.xml + ''; + + meta = { + homepage = "https://fprint.freedesktop.org/"; + description = "fprintd built with libfprint-tod to support Touch OEM Drivers"; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ hmenke ]; + }; }) diff --git a/pkgs/tools/system/netdata/default.nix b/pkgs/tools/system/netdata/default.nix index 7db1472431e57..0d5b7e23c1218 100644 --- a/pkgs/tools/system/netdata/default.nix +++ b/pkgs/tools/system/netdata/default.nix @@ -1,12 +1,15 @@ { lib, stdenv, callPackage, fetchFromGitHub, autoreconfHook, pkg-config, makeWrapper , CoreFoundation, IOKit, libossp_uuid , nixosTests -, curl, libcap, libuuid, lm_sensors, zlib, protobuf +, curl, jemalloc, libuv, zlib +, libcap, libuuid, lm_sensors, protobuf , withCups ? false, cups -, withDBengine ? true, libuv, lz4, judy +, withDBengine ? true, judy, lz4 , withIpmi ? (!stdenv.isDarwin), freeipmi , withNetfilter ? (!stdenv.isDarwin), libmnl, libnetfilter_acct , withCloud ? (!stdenv.isDarwin), json_c +, withConnPubSub ? false, google-cloud-cpp, grpc +, withConnPrometheus ? false, snappy , withSsl ? true, openssl , withDebug ? false }: @@ -30,14 +33,17 @@ in stdenv.mkDerivation rec { strictDeps = true; nativeBuildInputs = [ autoreconfHook pkg-config makeWrapper protobuf ]; - buildInputs = [ curl.dev zlib.dev protobuf ] + buildInputs = [ curl.dev jemalloc libuv zlib.dev ] ++ optionals stdenv.isDarwin [ CoreFoundation IOKit libossp_uuid ] ++ optionals (!stdenv.isDarwin) [ libcap.dev libuuid.dev ] ++ optionals withCups [ cups ] - ++ optionals withDBengine [ libuv lz4.dev judy ] + ++ optionals withDBengine [ judy lz4.dev ] ++ optionals withIpmi [ freeipmi ] ++ optionals withNetfilter [ libmnl libnetfilter_acct ] ++ optionals withCloud [ json_c ] + ++ optionals withConnPubSub [ google-cloud-cpp grpc ] + ++ optionals withConnPrometheus [ snappy ] + ++ optionals (withCloud || withConnPrometheus) [ protobuf ] ++ optionals withSsl [ openssl.dev ]; patches = [ @@ -92,9 +98,11 @@ in stdenv.mkDerivation rec { "--localstatedir=/var" "--sysconfdir=/etc" "--disable-ebpf" - ] ++ optionals withCloud [ - "--enable-cloud" - "--with-aclk-ng" + "--with-jemalloc=${jemalloc}" + ] ++ optional (!withDBengine) [ + "--disable-dbengine" + ] ++ optional (!withCloud) [ + "--disable-cloud" ]; postFixup = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 41dd402624639..baea2f275fdb3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6154,7 +6154,7 @@ with pkgs; }; lp_solve = callPackage ../applications/science/math/lp_solve { - inherit (darwin) cctools; + inherit (darwin) cctools autoSignDarwinBinariesHook; }; fabric-installer = callPackage ../tools/games/minecraft/fabric-installer { }; @@ -16859,9 +16859,7 @@ with pkgs; ytt = callPackage ../development/tools/ytt {}; - zls = callPackage ../development/tools/zls { - zig = zig_0_8_1; - }; + zls = callPackage ../development/tools/zls { }; zydis = callPackage ../development/libraries/zydis { }; @@ -17749,7 +17747,11 @@ with pkgs; ghcid = haskellPackages.ghcid.bin; - graphia = libsForQt5.callPackage ../applications/science/misc/graphia { }; + graphia = libsForQt514.callPackage ../applications/science/misc/graphia { + # Using gcc 10 because this fails to build with gcc 11 + # Error similar to this https://github.com/RPCS3/rpcs3/issues/10291 + stdenv = gcc10Stdenv; + }; icon-lang = callPackage ../development/interpreters/icon-lang { }; @@ -21678,9 +21680,6 @@ with pkgs; zig = callPackage ../development/compilers/zig { llvmPackages = llvmPackages_13; }; - zig_0_8_1 = callPackage ../development/compilers/zig/0.8.1.nix { - llvmPackages = llvmPackages_12; - }; zimlib = callPackage ../development/libraries/zimlib { }; @@ -28486,6 +28485,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) CoreServices; }; + media-downloader = callPackage ../applications/video/media-downloader { }; + mediaelch = libsForQt5.callPackage ../applications/misc/mediaelch { }; mediainfo = callPackage ../applications/misc/mediainfo { }; diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix index ba4f998296e23..8e951611bbc06 100644 --- a/pkgs/top-level/release-cross.nix +++ b/pkgs/top-level/release-cross.nix @@ -1,4 +1,11 @@ /* This file defines some basic smoke tests for cross compilation. + Individual jobs can be tested by running: + + $ nix-build pkgs/top-level/release-cross.nix -A <jobname>.<package> --arg supportedSystems '[builtins.currentSystem]' + + e.g. + + $ nix-build pkgs/top-level/release-cross.nix -A crossMingw32.nixUnstable --arg supportedSystems '[builtins.currentSystem]' */ { # The platforms *from* which we cross compile. |