diff --git a/doc/stdenv/stdenv.chapter.md b/doc/stdenv/stdenv.chapter.md
index 2562d149cb1e..a12d68c0934f 100644
--- a/doc/stdenv/stdenv.chapter.md
+++ b/doc/stdenv/stdenv.chapter.md
@@ -626,7 +626,7 @@ Before and after running `make`, the hooks `preBuild` and `postBuild` are called
### The check phase {#ssec-check-phase}
-The check phase checks whether the package was built correctly by running its test suite. The default `checkPhase` calls `make check`, but only if the `doCheck` variable is enabled.
+The check phase checks whether the package was built correctly by running its test suite. The default `checkPhase` calls `make $checkTarget`, but only if the `doCheck` variable is enabled (see below).
#### Variables controlling the check phase {#variables-controlling-the-check-phase}
@@ -646,7 +646,7 @@ See the [build phase](#var-stdenv-makeFlags) for details.
##### `checkTarget` {#var-stdenv-checkTarget}
-The make target that runs the tests. Defaults to `check`.
+The make target that runs the tests. Defaults to `check` if it exists, otherwise `test`; if neither is found, do nothing.
##### `checkFlags` / `checkFlagsArray` {#var-stdenv-checkFlags}
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 17394ed5870b..3ef847be6d1f 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -11760,6 +11760,12 @@
githubId = 131856;
name = "Arnout Engelen";
};
+ raehik = {
+ email = "thefirstmuffinman@gmail.com";
+ github = "raehik";
+ githubId = 3764592;
+ name = "Ben Orchard";
+ };
rafael = {
name = "Rafael";
email = "pr9@tuta.io";
diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix
index 2a29892e5dbf..b813948db1d6 100644
--- a/maintainers/team-list.nix
+++ b/maintainers/team-list.nix
@@ -168,6 +168,15 @@ with lib.maintainers; {
shortName = "Cosmopolitan";
};
+ deepin = {
+ members = [
+ rewine
+ ];
+ scope = "Maintain deepin desktop environment and related packages.";
+ shortName = "DDE";
+ enableFeatureFreezePing = true;
+ };
+
deshaw = {
# Verify additions to this team with at least one already existing member of the team.
members = [
diff --git a/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml
index 7457b785f205..908b0cc60465 100644
--- a/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml
+++ b/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml
@@ -536,6 +536,17 @@
nixos/modules/profiles/minimal.nix profile.
+
+
+ The ghcWithPackages and
+ ghcWithHoogle wrappers will now also
+ symlink GHC’s and all included libraries’ documentation to
+ $out/share/doc for convenience. If
+ undesired, the old behavior can be restored by overriding the
+ builders with
+ { installDocumentation = false; }.
+
+
mastodon now supports connection to a
diff --git a/nixos/doc/manual/release-notes/rl-2305.section.md b/nixos/doc/manual/release-notes/rl-2305.section.md
index 9566751b07cf..372cd8f06661 100644
--- a/nixos/doc/manual/release-notes/rl-2305.section.md
+++ b/nixos/doc/manual/release-notes/rl-2305.section.md
@@ -137,6 +137,11 @@ In addition to numerous new and upgraded packages, this release has the followin
- The minimal ISO image now uses the `nixos/modules/profiles/minimal.nix` profile.
+- The `ghcWithPackages` and `ghcWithHoogle` wrappers will now also symlink GHC's
+ and all included libraries' documentation to `$out/share/doc` for convenience.
+ If undesired, the old behavior can be restored by overriding the builders with
+ `{ installDocumentation = false; }`.
+
- `mastodon` now supports connection to a remote `PostgreSQL` database.
- `services.peertube` now requires you to specify the secret file `secrets.secretsFile`. It can be generated by running `openssl rand -hex 32`.
diff --git a/nixos/modules/installer/tools/nix-fallback-paths.nix b/nixos/modules/installer/tools/nix-fallback-paths.nix
index 3eca901bdbf7..c9cb65dbbe5a 100644
--- a/nixos/modules/installer/tools/nix-fallback-paths.nix
+++ b/nixos/modules/installer/tools/nix-fallback-paths.nix
@@ -1,7 +1,7 @@
{
- x86_64-linux = "/nix/store/h88w1442c7hzkbw8sgpcsbqp4lhz6l5p-nix-2.12.0";
- i686-linux = "/nix/store/j23527l1c3hfx17nssc0v53sq6c741zs-nix-2.12.0";
- aarch64-linux = "/nix/store/zgzmdymyh934y3r4vqh8z337ba4cwsjb-nix-2.12.0";
- x86_64-darwin = "/nix/store/wnlrzllazdyg1nrw9na497p4w0m7i7mm-nix-2.12.0";
- aarch64-darwin = "/nix/store/7n5yamgzg5dpp5vb6ipdqgfh6cf30wmn-nix-2.12.0";
+ x86_64-linux = "/nix/store/lsr79q5xqd9dv97wn87x12kzax8s8i1s-nix-2.13.2";
+ i686-linux = "/nix/store/wky9xjwiwzpifgk0s3f2nrg8nr67bi7x-nix-2.13.2";
+ aarch64-linux = "/nix/store/v8drr3x1ia6bdr8y4vl79mlz61xynrpm-nix-2.13.2";
+ x86_64-darwin = "/nix/store/1l14si31p4aw7c1gwgjy0nq55k38j9nj-nix-2.13.2";
+ aarch64-darwin = "/nix/store/6x7nr1r780fgn254zhkwhih3f3i8cr45-nix-2.13.2";
}
diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index b92561ed4859..d8a18cfcc6dc 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -50,7 +50,6 @@ with lib;
(mkRemovedOptionModule [ "services" "chronos" ] "The corresponding package was removed from nixpkgs.")
(mkRemovedOptionModule [ "services" "couchpotato" ] "The corresponding package was removed from nixpkgs.")
(mkRemovedOptionModule [ "services" "dd-agent" ] "dd-agent was removed from nixpkgs in favor of the newer datadog-agent.")
- (mkRemovedOptionModule [ "services" "deepin" ] "The corresponding packages were removed from nixpkgs.")
(mkRemovedOptionModule [ "services" "dnscrypt-proxy" ] "Use services.dnscrypt-proxy2 instead")
(mkRemovedOptionModule [ "services" "firefox" "syncserver" ] "The corresponding package was removed from nixpkgs.")
(mkRemovedOptionModule [ "services" "flashpolicyd" ] "The flashpolicyd module has been removed. Adobe Flash Player is deprecated.")
diff --git a/nixos/modules/services/hardware/fwupd.nix b/nixos/modules/services/hardware/fwupd.nix
index a3bb61a6cb0c..2431cb2a57c4 100644
--- a/nixos/modules/services/hardware/fwupd.nix
+++ b/nixos/modules/services/hardware/fwupd.nix
@@ -18,12 +18,6 @@ let
fwupd = cfg.daemonSettings;
};
};
- "fwupd/uefi_capsule.conf" = {
- source = pkgs.writeText "uefi_capsule.conf" ''
- [uefi_capsule]
- OverrideESPMountPoint=${config.boot.loader.efi.efiSysMountPoint}
- '';
- };
};
originalEtc =
@@ -147,7 +141,10 @@ in {
###### implementation
config = mkIf cfg.enable {
# Disable test related plug-ins implicitly so that users do not have to care about them.
- services.fwupd.daemonSettings.DisabledPlugins = cfg.package.defaultDisabledPlugins;
+ services.fwupd.daemonSettings = {
+ DisabledPlugins = cfg.package.defaultDisabledPlugins;
+ EspLocation = config.boot.loader.efi.efiSysMountPoint;
+ };
environment.systemPackages = [ cfg.package ];
diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix
index 07243fe10ed9..948b32172489 100644
--- a/pkgs/applications/networking/browsers/firefox/common.nix
+++ b/pkgs/applications/networking/browsers/firefox/common.nix
@@ -471,6 +471,7 @@ buildStdenv.mkDerivation ({
separateDebugInfo = enableDebugSymbols;
enableParallelBuilding = true;
+ # https://github.com/NixOS/nixpkgs/issues/201254
NIX_LDFLAGS = if (with stdenv; isAarch64 && isLinux) then [ "-lgcc" ] else null;
# tests were disabled in configureFlags
diff --git a/pkgs/applications/science/misc/root/default.nix b/pkgs/applications/science/misc/root/default.nix
index af6aed851e09..cfda819a42ca 100644
--- a/pkgs/applications/science/misc/root/default.nix
+++ b/pkgs/applications/science/misc/root/default.nix
@@ -207,6 +207,7 @@ stdenv.mkDerivation rec {
"-Druntime_cxxmodules=OFF"
];
+ # https://github.com/NixOS/nixpkgs/issues/201254
NIX_LDFLAGS = lib.optionalString (stdenv.isLinux && stdenv.isAarch64 && stdenv.cc.isGNU) "-lgcc";
# Workaround the xrootd runpath bug #169677 by prefixing [DY]LD_LIBRARY_PATH with ${lib.makeLibraryPath xrootd}.
diff --git a/pkgs/applications/system/glances/default.nix b/pkgs/applications/system/glances/default.nix
index f4ec3126976e..cf9e8ec05fd4 100644
--- a/pkgs/applications/system/glances/default.nix
+++ b/pkgs/applications/system/glances/default.nix
@@ -1,5 +1,5 @@
{ stdenv, buildPythonApplication, fetchFromGitHub, fetchpatch, isPyPy, lib
-, defusedxml, future, packaging, psutil, setuptools
+, defusedxml, future, ujson, packaging, psutil, setuptools
# Optional dependencies:
, bottle, pysnmp
, hddtemp
@@ -9,14 +9,14 @@
buildPythonApplication rec {
pname = "glances";
- version = "3.3.0";
+ version = "3.3.1";
disabled = isPyPy;
src = fetchFromGitHub {
owner = "nicolargo";
repo = "glances";
rev = "refs/tags/v${version}";
- sha256 = "sha256-4EZjr8oW5759U20YS6eWVZ0pelTCDj75FBc7IkAzd3M=";
+ sha256 = "sha256-93fghrNktcz+YyPkRl6ZiSZC+3a5TDql6eFZMy6veJc=";
};
# On Darwin this package segfaults due to mismatch of pure and impure
@@ -36,6 +36,7 @@ buildPythonApplication rec {
bottle
defusedxml
future
+ ujson
netifaces
packaging
psutil
diff --git a/pkgs/applications/system/zxfer/default.nix b/pkgs/applications/system/zxfer/default.nix
new file mode 100644
index 000000000000..b62c1262430c
--- /dev/null
+++ b/pkgs/applications/system/zxfer/default.nix
@@ -0,0 +1,86 @@
+{ lib
+, bash
+, fetchFromGitHub
+, installShellFiles
+, coreutils
+, gawk
+, gnugrep
+, gnused
+, openssh
+, resholve
+, rsync
+, which
+, zfs
+}:
+
+resholve.mkDerivation rec {
+ pname = "zxfer";
+ version = "1.1.7";
+
+ src = fetchFromGitHub {
+ owner = "allanjude";
+ repo = pname;
+ rev = "v${version}";
+ hash = "sha256-11SQJcD3GqPYBIgaycyKkc62/diVKPuuj2Or97j+NZY=";
+ };
+
+ nativeBuildInputs = [ installShellFiles ];
+
+ # these may point to paths on remote systems, calculated at runtime, thus we cannot fix them
+ # we can only set their initial values, and let them remain dynamic
+ postPatch = ''
+ substituteInPlace zxfer \
+ --replace 'LCAT=""' 'LCAT=${coreutils}/bin/cat' \
+ --replace 'LZFS=$( which zfs )' 'LZFS=${zfs}/bin/zfs'
+ '';
+
+ installPhase = ''
+ runHook preInstall
+
+ installManPage zxfer.1m zxfer.8
+ install -Dm755 zxfer -t $out/bin/
+
+ runHook postInstall
+ '';
+
+ solutions.default = {
+ scripts = [ "bin/zxfer" ];
+ interpreter = "${bash}/bin/sh";
+ inputs = [
+ coreutils
+ gawk
+ gnugrep
+ gnused
+ openssh
+ rsync
+ which
+ ];
+ fake.external = [
+ "kldload" # bsd builtin
+ "kldstat" # bsd builtin
+ "svcadm" # solaris builtin
+ ];
+ keep = {
+ "$LCAT" = true;
+ "$LZFS" = true;
+ "$PROGRESS_DIALOG" = true;
+ "$RZFS" = true;
+ "$input_optionts" = true;
+ "$option_O" = true;
+ "$option_T" = true;
+ };
+ fix = {
+ "$AWK" = [ "awk" ];
+ "$RSYNC" = [ "rsync" ];
+ };
+ execer = [ "cannot:${rsync}/bin/rsync" ];
+ };
+
+ meta = with lib; {
+ description = "A popular script for managing ZFS snapshot replication";
+ homepage = "https://github.com/allanjude/zxfer";
+ changelog = "https://github.com/allanjude/zxfer/releases/tag/v${version}";
+ license = licenses.bsd2;
+ maintainers = with lib.maintainers; [ urandom ];
+ };
+}
diff --git a/pkgs/applications/version-management/lab/default.nix b/pkgs/applications/version-management/lab/default.nix
index 754fa778fed9..38531775b99e 100644
--- a/pkgs/applications/version-management/lab/default.nix
+++ b/pkgs/applications/version-management/lab/default.nix
@@ -22,14 +22,14 @@ buildGoModule rec {
ldflags = [ "-s" "-w" "-X main.version=${version}" ];
postInstall = ''
- # make xdg-open overrideable at runtime
- wrapProgram $out/bin/lab \
- --prefix PATH ":" "${lib.makeBinPath [ git ]}" \
- --suffix PATH ":" "${lib.makeBinPath [ xdg-utils ]}"
+ # create shell completions before wrapProgram so that lab detects the right path for itself
installShellCompletion --cmd lab \
--bash <($out/bin/lab completion bash) \
--fish <($out/bin/lab completion fish) \
--zsh <($out/bin/lab completion zsh)
+ # make xdg-open overrideable at runtime
+ wrapProgram $out/bin/lab \
+ --suffix PATH ":" "${lib.makeBinPath [ git xdg-utils ]}"
'';
meta = with lib; {
diff --git a/pkgs/applications/video/streamlink/default.nix b/pkgs/applications/video/streamlink/default.nix
index 6a8207e7bc16..d10fd2e21a79 100644
--- a/pkgs/applications/video/streamlink/default.nix
+++ b/pkgs/applications/video/streamlink/default.nix
@@ -6,12 +6,12 @@
python3Packages.buildPythonApplication rec {
pname = "streamlink";
- version = "5.1.2";
+ version = "5.2.1";
format = "pyproject";
src = python3Packages.fetchPypi {
inherit pname version;
- hash = "sha256-UB9gTT2/rQXV1Q7UQywEHlGBCJDMDmXupD8nYII4dno=";
+ hash = "sha256-/YcFH5t9x9EsmK7oPvSECmhL2ypHYgPvsMdL1IupEfw=";
};
nativeCheckInputs = with python3Packages; [
@@ -35,6 +35,7 @@ python3Packages.buildPythonApplication rec {
requests
websocket-client
urllib3
+ certifi
]) ++ [
ffmpeg
];
diff --git a/pkgs/data/misc/hackage/pin.json b/pkgs/data/misc/hackage/pin.json
index 9e14413b745c..3cb903245f89 100644
--- a/pkgs/data/misc/hackage/pin.json
+++ b/pkgs/data/misc/hackage/pin.json
@@ -1,6 +1,6 @@
{
- "commit": "39a6ef760cb2f514e170dc40e7ec1f7699722e7d",
- "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/39a6ef760cb2f514e170dc40e7ec1f7699722e7d.tar.gz",
- "sha256": "1s9w4g4dar9blr3vvy9pf18qxcgyvrrdnc65jrkx75gr9dr3247w",
- "msg": "Update from Hackage at 2023-01-08T15:35:40Z"
+ "commit": "75d1bbbd68d9ae36d527666e2f140343323b02fa",
+ "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/75d1bbbd68d9ae36d527666e2f140343323b02fa.tar.gz",
+ "sha256": "018lz90f12bw8n8g4rbwfbnpmw6g3vblc12pd4qzq727h1d27p5l",
+ "msg": "Update from Hackage at 2023-01-12T12:18:29Z"
}
diff --git a/pkgs/data/misc/v2ray-geoip/default.nix b/pkgs/data/misc/v2ray-geoip/default.nix
index 439845d79ab6..5f33ff70c150 100644
--- a/pkgs/data/misc/v2ray-geoip/default.nix
+++ b/pkgs/data/misc/v2ray-geoip/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "v2ray-geoip";
- version = "202301190046";
+ version = "202301260045";
src = fetchFromGitHub {
owner = "v2fly";
repo = "geoip";
- rev = "83ea735314fbc2c3404cb4b9aa044b476e67bc8b";
- sha256 = "sha256-8u2xhpoA6BH9e+kgDwxPsjD4RSuUw05h39aUo7ivM3U=";
+ rev = "dda29e7611d13ff6f580cf389a7b84194363f75c";
+ sha256 = "sha256-9X9Oh4WFFpuRG1jQyQHTqNOCcW5f+uNOjH1iv1i6Je0=";
};
installPhase = ''
diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix
new file mode 100644
index 000000000000..9711fe514806
--- /dev/null
+++ b/pkgs/desktops/deepin/default.nix
@@ -0,0 +1,24 @@
+{ lib, pkgs, libsForQt5 }:
+let
+ packages = self:
+ let
+ inherit (self) callPackage;
+ in {
+ #### LIBRARIES
+ dtkcommon = callPackage ./library/dtkcommon { };
+ dtkcore = callPackage ./library/dtkcore { };
+ dtkgui = callPackage ./library/dtkgui { };
+ dtkwidget = callPackage ./library/dtkwidget { };
+ qt5platform-plugins = callPackage ./library/qt5platform-plugins { };
+ qt5integration = callPackage ./library/qt5integration { };
+ deepin-wayland-protocols = callPackage ./library/deepin-wayland-protocols { };
+ dwayland = callPackage ./library/dwayland { };
+ dde-qt-dbus-factory = callPackage ./library/dde-qt-dbus-factory { };
+ disomaster = callPackage ./library/disomaster { };
+ docparser = callPackage ./library/docparser { };
+ gio-qt = callPackage ./library/gio-qt { };
+ image-editor = callPackage ./library/image-editor { };
+ udisks2-qt5 = callPackage ./library/udisks2-qt5 { };
+ };
+in
+lib.makeScope libsForQt5.newScope packages
diff --git a/pkgs/desktops/deepin/library/dde-qt-dbus-factory/default.nix b/pkgs/desktops/deepin/library/dde-qt-dbus-factory/default.nix
new file mode 100644
index 000000000000..ef302c5b7222
--- /dev/null
+++ b/pkgs/desktops/deepin/library/dde-qt-dbus-factory/default.nix
@@ -0,0 +1,53 @@
+{ stdenv
+, lib
+, fetchFromGitHub
+, qmake
+, qtbase
+, wrapQtAppsHook
+, python3
+, dtkcore
+}:
+
+stdenv.mkDerivation rec {
+ pname = "dde-qt-dbus-factory";
+ version = "5.5.22";
+
+ src = fetchFromGitHub {
+ owner = "linuxdeepin";
+ repo = pname;
+ rev = version;
+ sha256 = "sha256-jqk04S+i3py3rVJcHmkPKHsU+eNEN1yoUBBlfXBbcwM=";
+ };
+
+ nativeBuildInputs = [
+ qmake
+ wrapQtAppsHook
+ python3
+ ];
+
+ buildInputs = [
+ qtbase
+ dtkcore
+ ];
+
+ qmakeFlags = [
+ "INSTALL_ROOT=${placeholder "out"}"
+ "LIB_INSTALL_DIR=${placeholder "out"}/lib"
+ ];
+
+ postPatch = ''
+ substituteInPlace libdframeworkdbus/libdframeworkdbus.pro \
+ --replace "/usr" ""
+
+ substituteInPlace libdframeworkdbus/DFrameworkdbusConfig.in \
+ --replace "/usr/include" "$out/include"
+ '';
+
+ meta = with lib; {
+ description = "Repo of auto-generated D-Bus source code which DDE used";
+ homepage = "https://github.com/linuxdeepin/dde-qt-dbus-factory";
+ license = licenses.gpl3Plus;
+ platforms = platforms.linux;
+ maintainers = teams.deepin.members;
+ };
+}
diff --git a/pkgs/desktops/deepin/library/deepin-wayland-protocols/default.nix b/pkgs/desktops/deepin/library/deepin-wayland-protocols/default.nix
new file mode 100644
index 000000000000..ad3dce815c91
--- /dev/null
+++ b/pkgs/desktops/deepin/library/deepin-wayland-protocols/default.nix
@@ -0,0 +1,31 @@
+{ stdenv
+, lib
+, fetchFromGitHub
+, cmake
+, extra-cmake-modules
+}:
+
+stdenv.mkDerivation rec {
+ pname = "deepin-wayland-protocols";
+ version = "1.6.0-deepin.1.2";
+
+ src = fetchFromGitHub {
+ owner = "linuxdeepin";
+ repo = pname;
+ rev = version;
+ sha256 = "sha256-8Im3CueC8sYA5mwRU/Z7z8HA4mPQvVSqcTD813QCYxo=";
+ };
+
+ nativeBuildInputs = [
+ cmake
+ extra-cmake-modules
+ ];
+
+ meta = with lib; {
+ description = "XML files of the non-standard wayland protocols use in deepin";
+ homepage = "https://github.com/linuxdeepin/deepin-wayland-protocols";
+ license = licenses.lgpl21Plus;
+ platforms = platforms.linux;
+ maintainers = teams.deepin.members;
+ };
+}
diff --git a/pkgs/desktops/deepin/library/disomaster/default.nix b/pkgs/desktops/deepin/library/disomaster/default.nix
new file mode 100644
index 000000000000..3f65505e0af5
--- /dev/null
+++ b/pkgs/desktops/deepin/library/disomaster/default.nix
@@ -0,0 +1,40 @@
+{ stdenv
+, lib
+, fetchFromGitHub
+, pkg-config
+, qmake
+, qttools
+, wrapQtAppsHook
+, libisoburn
+}:
+
+stdenv.mkDerivation rec {
+ pname = "disomaster";
+ version = "5.0.8";
+
+ src = fetchFromGitHub {
+ owner = "linuxdeepin";
+ repo = pname;
+ rev = version;
+ sha256 = "sha256-wN8mhddqqzYXkT6rRWsHVCWzaG2uRcF2iiFHlZx2LfY=";
+ };
+
+ nativeBuildInputs = [
+ qmake
+ qttools
+ pkg-config
+ wrapQtAppsHook
+ ];
+
+ buildInputs = [ libisoburn ];
+
+ qmakeFlags = [ "VERSION=${version}" ];
+
+ meta = with lib; {
+ description = "A libisoburn wrapper class for Qt";
+ homepage = "https://github.com/linuxdeepin/disomaster";
+ license = licenses.gpl3Plus;
+ platforms = platforms.linux;
+ maintainers = teams.deepin.members;
+ };
+}
diff --git a/pkgs/desktops/deepin/library/docparser/default.nix b/pkgs/desktops/deepin/library/docparser/default.nix
new file mode 100644
index 000000000000..8605a0d214b7
--- /dev/null
+++ b/pkgs/desktops/deepin/library/docparser/default.nix
@@ -0,0 +1,40 @@
+{ stdenv
+, lib
+, fetchFromGitHub
+, pkg-config
+, qmake
+, qttools
+, wrapQtAppsHook
+, poppler
+}:
+
+stdenv.mkDerivation rec {
+ pname = "docparser";
+ version = "1.0.3";
+
+ src = fetchFromGitHub {
+ owner = "linuxdeepin";
+ repo = pname;
+ rev = version;
+ sha256 = "sha256-iWRWSu8fALTTLLWdQGbpunN/1tpvKxuN/ZWJg34x0mU=";
+ };
+
+ nativeBuildInputs = [
+ qmake
+ qttools
+ pkg-config
+ wrapQtAppsHook
+ ];
+
+ buildInputs = [ poppler ];
+
+ qmakeFlags = [ "VERSION=${version}" ];
+
+ meta = with lib; {
+ description = "A document parser library ported from document2html";
+ homepage = "https://github.com/linuxdeepin/docparser";
+ license = licenses.gpl3Plus;
+ platforms = platforms.linux;
+ maintainers = teams.deepin.members;
+ };
+}
diff --git a/pkgs/desktops/deepin/library/dtkcommon/default.nix b/pkgs/desktops/deepin/library/dtkcommon/default.nix
new file mode 100644
index 000000000000..24e22e99c502
--- /dev/null
+++ b/pkgs/desktops/deepin/library/dtkcommon/default.nix
@@ -0,0 +1,45 @@
+{ stdenv
+, lib
+, fetchFromGitHub
+, pkg-config
+, cmake
+, qtbase
+, qttools
+, wrapQtAppsHook
+, glib
+}:
+
+stdenv.mkDerivation rec {
+ pname = "dtkcommon";
+ version = "5.6.3";
+
+ src = fetchFromGitHub {
+ owner = "linuxdeepin";
+ repo = pname;
+ rev = version;
+ sha256 = "sha256-9gFJ0Uun0q/XVaegxTUu4Kkc+/GE09eAV68VZgWurrM=";
+ };
+
+ nativeBuildInputs = [
+ cmake
+ pkg-config
+ qttools
+ wrapQtAppsHook
+ ];
+
+ buildInputs = [ qtbase ];
+
+ qmakeFlags = [ "PREFIX=${placeholder "out"}" ];
+
+ preFixup = ''
+ glib-compile-schemas ${glib.makeSchemaPath "$out" "${pname}-${version}"}
+ '';
+
+ meta = with lib; {
+ description = "A public project for building DTK Library";
+ homepage = "https://github.com/linuxdeepin/dtkcommon";
+ license = licenses.gpl3Plus;
+ platforms = platforms.linux;
+ maintainers = teams.deepin.members;
+ };
+}
diff --git a/pkgs/desktops/deepin/library/dtkcore/default.nix b/pkgs/desktops/deepin/library/dtkcore/default.nix
new file mode 100644
index 000000000000..282d079570d3
--- /dev/null
+++ b/pkgs/desktops/deepin/library/dtkcore/default.nix
@@ -0,0 +1,55 @@
+{ stdenv
+, lib
+, fetchFromGitHub
+, pkg-config
+, cmake
+, gsettings-qt
+, wrapQtAppsHook
+, lshw
+, dtkcommon
+}:
+
+stdenv.mkDerivation rec {
+ pname = "dtkcore";
+ version = "5.6.3";
+
+ src = fetchFromGitHub {
+ owner = "linuxdeepin";
+ repo = pname;
+ rev = version;
+ sha256 = "sha256-DEpo/eKMjtTVGEkq5JofkRNSHtTOZ1t2QNjrdulUtPQ=";
+ };
+
+ postPatch = ''
+ substituteInPlace src/dsysinfo.cpp \
+ --replace "/usr/share/deepin/distribution.info" "/etc/distribution.info" \
+ '';
+
+ nativeBuildInputs = [
+ cmake
+ pkg-config
+ wrapQtAppsHook
+ ];
+
+ buildInputs = [
+ gsettings-qt
+ lshw
+ ];
+
+ propagatedBuildInputs = [ dtkcommon ];
+
+ cmakeFlags = [
+ "-DDVERSION=${version}"
+ "-DBUILD_DOCS=OFF"
+ "-DDSG_PREFIX_PATH='/run/current-system/sw'"
+ "-DMKSPECS_INSTALL_DIR=${placeholder "out"}/mkspecs/modules"
+ ];
+
+ meta = with lib; {
+ description = "Deepin tool kit core library";
+ homepage = "https://github.com/linuxdeepin/dtkcore";
+ license = licenses.lgpl3Plus;
+ platforms = platforms.linux;
+ maintainers = teams.deepin.members;
+ };
+}
diff --git a/pkgs/desktops/deepin/library/dtkgui/default.nix b/pkgs/desktops/deepin/library/dtkgui/default.nix
new file mode 100644
index 000000000000..0cc40768285a
--- /dev/null
+++ b/pkgs/desktops/deepin/library/dtkgui/default.nix
@@ -0,0 +1,57 @@
+{ stdenv
+, lib
+, fetchFromGitHub
+, pkg-config
+, cmake
+, qttools
+, wrapQtAppsHook
+, librsvg
+, lxqt
+, dtkcore
+, qtimageformats
+, freeimage
+}:
+
+stdenv.mkDerivation rec {
+ pname = "dtkgui";
+ version = "5.6.3";
+
+ src = fetchFromGitHub {
+ owner = "linuxdeepin";
+ repo = pname;
+ rev = version;
+ sha256 = "sha256-r6ZwGPiK6CcKEg8RoHV07wJbQI3idJFV3WFtuKim8n4=";
+ };
+
+ nativeBuildInputs = [
+ cmake
+ qttools
+ pkg-config
+ wrapQtAppsHook
+ ];
+
+ buildInputs = [
+ lxqt.libqtxdg
+ ];
+
+ propagatedBuildInputs = [
+ dtkcore
+ librsvg
+ qtimageformats
+ freeimage
+ ];
+
+ cmakeFlags = [
+ "-DDVERSION=${version}"
+ "-DBUILD_DOCS=OFF"
+ "-DMKSPECS_INSTALL_DIR=${placeholder "out"}/mkspecs/modules"
+ ];
+
+ meta = with lib; {
+ description = "Deepin Toolkit, gui module for DDE look and feel";
+ homepage = "https://github.com/linuxdeepin/dtkgui";
+ license = licenses.lgpl3Plus;
+ platforms = platforms.linux;
+ maintainers = teams.deepin.members;
+ };
+}
diff --git a/pkgs/desktops/deepin/library/dtkwidget/default.nix b/pkgs/desktops/deepin/library/dtkwidget/default.nix
new file mode 100644
index 000000000000..170ae821eba2
--- /dev/null
+++ b/pkgs/desktops/deepin/library/dtkwidget/default.nix
@@ -0,0 +1,67 @@
+{ stdenv
+, lib
+, fetchFromGitHub
+, dtkgui
+, pkg-config
+, cmake
+, qttools
+, qtmultimedia
+, qtsvg
+, qtx11extras
+, wrapQtAppsHook
+, cups
+, gsettings-qt
+, libstartup_notification
+, xorg
+}:
+
+stdenv.mkDerivation rec {
+ pname = "dtkwidget";
+ version = "5.6.3";
+
+ src = fetchFromGitHub {
+ owner = "linuxdeepin";
+ repo = pname;
+ rev = version;
+ sha256 = "sha256-APk2p8pdLsaKvPp95HtEI1F1LM4ySUL+fhGsC5vHasU=";
+ };
+
+ postPatch = ''
+ substituteInPlace src/widgets/dapplication.cpp \
+ --replace "auto dataDirs = DStandardPaths::standardLocations(QStandardPaths::GenericDataLocation);" \
+ "auto dataDirs = DStandardPaths::standardLocations(QStandardPaths::GenericDataLocation) << \"$out/share\";"
+ '';
+
+ nativeBuildInputs = [
+ cmake
+ qttools
+ pkg-config
+ wrapQtAppsHook
+ ];
+
+ buildInputs = [
+ qtmultimedia
+ qtsvg
+ qtx11extras
+ cups
+ gsettings-qt
+ libstartup_notification
+ xorg.libXdmcp
+ ];
+
+ propagatedBuildInputs = [ dtkgui ];
+
+ cmakeFlags = [
+ "-DDVERSION=${version}"
+ "-DBUILD_DOCS=OFF"
+ "-DMKSPECS_INSTALL_DIR=${placeholder "out"}/mkspecs/modules"
+ ];
+
+ meta = with lib; {
+ description = "Deepin graphical user interface library";
+ homepage = "https://github.com/linuxdeepin/dtkwidget";
+ license = licenses.lgpl3Plus;
+ platforms = platforms.linux;
+ maintainers = teams.deepin.members;
+ };
+}
diff --git a/pkgs/desktops/deepin/library/dwayland/default.nix b/pkgs/desktops/deepin/library/dwayland/default.nix
new file mode 100644
index 000000000000..a1797344a0b0
--- /dev/null
+++ b/pkgs/desktops/deepin/library/dwayland/default.nix
@@ -0,0 +1,48 @@
+{ stdenv
+, lib
+, fetchFromGitHub
+, cmake
+, qtbase
+, qtwayland
+, wayland
+, wayland-protocols
+, extra-cmake-modules
+, deepin-wayland-protocols
+, qttools
+}:
+
+stdenv.mkDerivation rec {
+ pname = "dwayland";
+ version = "5.24.3-deepin.1.4";
+
+ src = fetchFromGitHub {
+ owner = "linuxdeepin";
+ repo = pname;
+ rev = version;
+ sha256 = "sha256-/aWS4uvhxi9azxJWjRE+Bw+veURFO+mC8l9yypseclU=";
+ };
+
+ nativeBuildInputs = [
+ cmake
+ extra-cmake-modules
+ qttools
+ ];
+
+ buildInputs = [
+ qtbase
+ qtwayland
+ wayland
+ wayland-protocols
+ deepin-wayland-protocols
+ ];
+
+ dontWrapQtApps = true;
+
+ meta = with lib; {
+ description = "Qt-style API to interact with the wayland-client and wayland-server";
+ homepage = "https://github.com/linuxdeepin/dwayland";
+ license = licenses.lgpl21Plus;
+ platforms = platforms.linux;
+ maintainers = teams.deepin.members;
+ };
+}
diff --git a/pkgs/desktops/deepin/library/gio-qt/default.nix b/pkgs/desktops/deepin/library/gio-qt/default.nix
new file mode 100644
index 000000000000..a38e89bfc5bd
--- /dev/null
+++ b/pkgs/desktops/deepin/library/gio-qt/default.nix
@@ -0,0 +1,42 @@
+{ stdenv
+, lib
+, fetchFromGitHub
+, cmake
+, pkg-config
+, wrapQtAppsHook
+, glibmm
+, doxygen
+, buildDocs ? false
+}:
+
+stdenv.mkDerivation rec {
+ pname = "gio-qt";
+ version = "0.0.11";
+
+ src = fetchFromGitHub {
+ owner = "linuxdeepin";
+ repo = pname;
+ rev = version;
+ sha256 = "sha256-dlY1CTlXywgGZUonBBe3cDwx8h2xXrPY6Ft/D59nlug=";
+ };
+
+ nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ];
+
+ cmakeFlags = [
+ "-DCMAKE_INSTALL_LIBDIR=lib"
+ "-DPROJECT_VERSION=${version}"
+ ]
+ ++ lib.optional (!buildDocs) [ "-DBUILD_DOCS=OFF" ];
+
+ buildInputs = lib.optional buildDocs doxygen;
+
+ propagatedBuildInputs = [ glibmm ];
+
+ meta = with lib; {
+ description = "Gio wrapper for Qt applications";
+ homepage = "https://github.com/linuxdeepin/gio-qt";
+ license = licenses.lgpl3Plus;
+ platforms = platforms.linux;
+ maintainers = teams.deepin.members;
+ };
+}
diff --git a/pkgs/desktops/deepin/library/image-editor/default.nix b/pkgs/desktops/deepin/library/image-editor/default.nix
new file mode 100644
index 000000000000..ec5f3568fbd6
--- /dev/null
+++ b/pkgs/desktops/deepin/library/image-editor/default.nix
@@ -0,0 +1,69 @@
+{ stdenv
+, lib
+, fetchFromGitHub
+, fetchpatch
+, dtkwidget
+, cmake
+, qttools
+, pkg-config
+, wrapQtAppsHook
+, opencv
+, freeimage
+, libmediainfo
+, ffmpegthumbnailer
+, pcre
+}:
+
+stdenv.mkDerivation rec {
+ pname = "image-editor";
+ version = "1.0.24";
+
+ src = fetchFromGitHub {
+ owner = "linuxdeepin";
+ repo = pname;
+ rev = version;
+ sha256 = "sha256-0p/aicuBfaEyvfZomnz49IJLospWIdl23ZreDe+Bzqc=";
+ };
+
+ patches = [
+ (fetchpatch {
+ name = "feat_check_PREFIX_value_before_set";
+ url = "https://github.com/linuxdeepin/image-editor/commit/dae86e848cf53ba0ece879d81e8d5335d61a7473.patch";
+ sha256 = "sha256-lxmR+nIrMWVyhl1jpA17x2yqJ40h5vnpqKKcjd8j9RY=";
+ })
+ (fetchpatch {
+ name = "feat_use_FULL_install_path";
+ url = "https://github.com/linuxdeepin/image-editor/commit/855ae53a0444ac628aa0fe893932df6263b82e2e.patch";
+ sha256 = "sha256-3Dynlwl/l/b6k6hOHjTdoDQ/VGBDfyRz9b8QY8FEsCc=";
+ })
+ ];
+
+ postPatch = ''
+ substituteInPlace libimageviewer/service/ffmpegvideothumbnailer.cpp \
+ --replace 'libPath("libffmpegthumbnailer.so")' 'QString("${ffmpegthumbnailer.out}/lib/libffmpegthumbnailer.so")'
+
+ substituteInPlace libimageviewer/CMakeLists.txt --replace '/usr' '$out'
+ substituteInPlace libimagevisualresult/CMakeLists.txt --replace '/usr' '$out'
+ '';
+
+ nativeBuildInputs = [ cmake pkg-config qttools wrapQtAppsHook ];
+
+ buildInputs = [
+ dtkwidget
+ opencv
+ freeimage
+ libmediainfo
+ ffmpegthumbnailer
+ pcre
+ ];
+
+ cmakeFlags = [ "-DVERSION=${version}" ];
+
+ meta = with lib; {
+ description = "Image editor lib for dtk";
+ homepage = "https://github.com/linuxdeepin/image-editor";
+ license = licenses.gpl3Plus;
+ platforms = platforms.linux;
+ maintainers = teams.deepin.members;
+ };
+}
diff --git a/pkgs/desktops/deepin/library/qt5integration/default.nix b/pkgs/desktops/deepin/library/qt5integration/default.nix
new file mode 100644
index 000000000000..af34c6cfb766
--- /dev/null
+++ b/pkgs/desktops/deepin/library/qt5integration/default.nix
@@ -0,0 +1,55 @@
+{ stdenv
+, lib
+, fetchFromGitHub
+, dtkwidget
+, qmake
+, qtbase
+, qtsvg
+, pkg-config
+, wrapQtAppsHook
+, qtx11extras
+, qt5platform-plugins
+, lxqt
+, mtdev
+, xorg
+, gtest
+}:
+
+stdenv.mkDerivation rec {
+ pname = "qt5integration";
+ version = "5.6.3";
+
+ src = fetchFromGitHub {
+ owner = "linuxdeepin";
+ repo = pname;
+ rev = version;
+ sha256 = "sha256-GXxPoBM4tlWezTfv/f+/IJezzcAsuMbr/OOGaSOpn2g=";
+ };
+
+ nativeBuildInputs = [ qmake pkg-config wrapQtAppsHook ];
+
+ buildInputs = [
+ dtkwidget
+ qtx11extras
+ qt5platform-plugins
+ mtdev
+ lxqt.libqtxdg
+ xorg.xcbutilrenderutil
+ gtest
+ ];
+
+ installPhase = ''
+ runHook preInstall
+ mkdir -p $out/${qtbase.qtPluginPrefix}
+ cp -r bin/plugins/* $out/${qtbase.qtPluginPrefix}/
+ runHook postInstall
+ '';
+
+ meta = with lib; {
+ description = "Qt platform theme integration plugins for DDE";
+ homepage = "https://github.com/linuxdeepin/qt5integration";
+ license = licenses.lgpl3Plus;
+ platforms = platforms.linux;
+ maintainers = teams.deepin.members;
+ };
+}
diff --git a/pkgs/desktops/deepin/library/qt5platform-plugins/default.nix b/pkgs/desktops/deepin/library/qt5platform-plugins/default.nix
new file mode 100644
index 000000000000..6ebe542398b7
--- /dev/null
+++ b/pkgs/desktops/deepin/library/qt5platform-plugins/default.nix
@@ -0,0 +1,55 @@
+{ stdenv
+, lib
+, fetchFromGitHub
+, qmake
+, pkg-config
+, qtbase
+, qtx11extras
+, wrapQtAppsHook
+, mtdev
+, cairo
+, xorg
+, waylandSupport ? false
+}:
+
+stdenv.mkDerivation rec {
+ pname = "qt5platform-plugins";
+ version = "5.6.3";
+
+ src = fetchFromGitHub {
+ owner = "linuxdeepin";
+ repo = pname;
+ rev = version;
+ sha256 = "sha256-AySltMI9x5mfquy532h1QfGpfwSfI9+h6BtIHPyNWGk=";
+ };
+
+ ## https://github.com/linuxdeepin/qt5platform-plugins/pull/119
+ postPatch = ''
+ rm -r xcb/libqt5xcbqpa-dev/
+ mkdir -p xcb/libqt5xcbqpa-dev/${qtbase.version}
+ cp -r ${qtbase.src}/src/plugins/platforms/xcb/*.h xcb/libqt5xcbqpa-dev/${qtbase.version}/
+ '';
+
+ nativeBuildInputs = [ qmake pkg-config wrapQtAppsHook ];
+
+ buildInputs = [
+ mtdev
+ cairo
+ qtbase
+ qtx11extras
+ xorg.libSM
+ ];
+
+ qmakeFlags = [
+ "INSTALL_PATH=${placeholder "out"}/${qtbase.qtPluginPrefix}/platforms"
+ ]
+ ++ lib.optional (!waylandSupport) [ "CONFIG+=DISABLE_WAYLAND" ];
+
+ meta = with lib; {
+ description = "Qt platform plugins for DDE";
+ homepage = "https://github.com/linuxdeepin/qt5platform-plugins";
+ license = licenses.gpl3Plus;
+ platforms = platforms.linux;
+ maintainers = teams.deepin.members;
+ };
+}
diff --git a/pkgs/desktops/deepin/library/udisks2-qt5/default.nix b/pkgs/desktops/deepin/library/udisks2-qt5/default.nix
new file mode 100644
index 000000000000..84321809ebeb
--- /dev/null
+++ b/pkgs/desktops/deepin/library/udisks2-qt5/default.nix
@@ -0,0 +1,34 @@
+{ stdenv
+, lib
+, fetchFromGitHub
+, qmake
+, pkg-config
+, wrapQtAppsHook
+, udisks
+}:
+
+stdenv.mkDerivation rec {
+ pname = "udisks2-qt5";
+ version = "5.0.6";
+
+ src = fetchFromGitHub {
+ owner = "linuxdeepin";
+ repo = pname;
+ rev = version;
+ sha256 = "sha256-WS4fmqEYXi5dkn8RvyJBzy3+r+UgFcGDFFpQlbblLu4=";
+ };
+
+ nativeBuildInputs = [ qmake pkg-config wrapQtAppsHook ];
+
+ buildInputs = [ udisks ];
+
+ qmakeFlags = [ "VERSION=${version}" ];
+
+ meta = with lib; {
+ description = "UDisks2 D-Bus interfaces binding for Qt5";
+ homepage = "https://github.com/linuxdeepin/udisks2-qt5";
+ license = licenses.gpl3Plus;
+ platforms = platforms.linux;
+ maintainers = teams.deepin.members;
+ };
+}
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/0001-Remove-Install-Unlisted-Engines-function.patch b/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/0001-Remove-Install-Unlisted-Engines-function.patch
index 550aefbb1f10..ead8bafaa125 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/0001-Remove-Install-Unlisted-Engines-function.patch
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/0001-Remove-Install-Unlisted-Engines-function.patch
@@ -263,7 +263,7 @@ deleted file mode 100644
index 275c302..0000000
--- a/src/InputMethod/Installer/InstallList.vala
+++ /dev/null
-@@ -1,73 +0,0 @@
+@@ -1,75 +0,0 @@
-/*
-* 2019-2020 elementary, Inc. (https://elementary.io)
-*
@@ -306,7 +306,7 @@ index 275c302..0000000
- case KO:
- return { "ibus-hangul" };
- case ZH:
-- return { "ibus-cangjie", "ibus-chewing", "ibus-pinyin" };
+- return { "ibus-cangjie", "ibus-chewing", "ibus-pinyin", "ibus-rime" };
- default:
- assert_not_reached ();
- }
@@ -328,6 +328,8 @@ index 275c302..0000000
- return ZH;
- case "ibus-pinyin":
- return ZH;
+- case "ibus-rime":
+- return ZH;
- default:
- assert_not_reached ();
- }
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix
index 8b7ec684dbea..5ff6a7de4b05 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix
@@ -1,6 +1,7 @@
{ lib
, stdenv
, fetchFromGitHub
+, fetchpatch
, nix-update-script
, substituteAll
, meson
@@ -23,20 +24,33 @@
stdenv.mkDerivation rec {
pname = "switchboard-plug-keyboard";
- version = "2.7.0";
+ version = "3.1.1";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
- sha256 = "sha256-ge87rctbd7iR9x9Xq4sMIC09DiPHbpbWBgMZUuJNWbw=";
+ sha256 = "sha256-DofAOv7sCe7RAJpgz9PEYm+C8RAl0a1KgFm9jToMsEY=";
};
patches = [
./0001-Remove-Install-Unlisted-Engines-function.patch
(substituteAll {
src = ./fix-paths.patch;
- inherit ibus onboard;
+ inherit ibus onboard libgnomekbd;
+ })
+
+ # Revert schema key change that requires new GSD and Gala.
+ # TODO(@bobby285271): drop these in #196511.
+ (fetchpatch {
+ url = "https://github.com/elementary/switchboard-plug-keyboard/commit/555e9650bb8f74a7664e2393c589fe6664954a88.patch";
+ sha256 = "sha256-koSTYLPRh9rOyxmJPtrj/fPuu2jb1SKZu6BwKsMvAmc=";
+ revert = true;
+ })
+ (fetchpatch {
+ url = "https://github.com/elementary/switchboard-plug-keyboard/commit/6ebd57673b45cc64e1caf895134efc0d5f6cf2be.patch";
+ sha256 = "sha256-Ezsh0t1/909MHCB2EJEnl4kcnXngshNYgrmqUQsfsaY=";
+ revert = true;
})
];
@@ -55,7 +69,6 @@ stdenv.mkDerivation rec {
gtk3
ibus
libgee
- libgnomekbd
libhandy
libxklavier
switchboard
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/fix-paths.patch b/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/fix-paths.patch
index 0b5c8b8fd27e..bed4ca5573c8 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/fix-paths.patch
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/fix-paths.patch
@@ -24,3 +24,16 @@ index 75d2d805..b86252a4 100644
appinfo.launch (null, null);
} catch (Error e) {
warning ("Unable to launch onboard-settings: %s", e.message);
+diff --git a/src/Dialogs/AddLayoutDialog.vala b/src/Dialogs/AddLayoutDialog.vala
+index 7c2efda3..de77094f 100644
+--- a/src/Dialogs/AddLayoutDialog.vala
++++ b/src/Dialogs/AddLayoutDialog.vala
+@@ -197,7 +197,7 @@ public class Pantheon.Keyboard.LayoutPage.AddLayoutDialog : Granite.Dialog {
+ });
+
+ keyboard_map_button.clicked.connect (() => {
+- string command = "gkbd-keyboard-display \"--layout=" + layout_id + "\"";
++ string command = "@libgnomekbd@/bin/gkbd-keyboard-display \"--layout=" + layout_id + "\"";
+ try {
+ AppInfo.create_from_commandline (command, null, AppInfoCreateFlags.NONE).launch (null, null);
+ } catch (Error e) {
diff --git a/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix b/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix
index 7a9a0dd8fbd8..cd151ee19430 100644
--- a/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix
+++ b/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix
@@ -13,13 +13,13 @@
stdenvNoCC.mkDerivation rec {
pname = "elementary-icon-theme";
- version = "7.1.0";
+ version = "7.2.0";
src = fetchFromGitHub {
owner = "elementary";
repo = "icons";
rev = version;
- sha256 = "sha256-SMeVu4RbXodbxtVkQE2tvv6LaVWzrq7UBlwmi30ns2Q=";
+ sha256 = "sha256-Hh7RiD85N48IpO2sfWSybhS7kJYXH4VOhQ6PVIP9IS8=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/beam-modules/default.nix b/pkgs/development/beam-modules/default.nix
index 86f7d94eed1b..23982fb2a789 100644
--- a/pkgs/development/beam-modules/default.nix
+++ b/pkgs/development/beam-modules/default.nix
@@ -43,7 +43,7 @@ let
elvis-erlang = callPackage ./elvis-erlang { };
# BEAM-based languages.
- elixir = elixir_1_13;
+ elixir = elixir_1_14;
elixir_1_14 = lib'.callElixir ../interpreters/elixir/1.14.nix {
inherit erlang;
diff --git a/pkgs/development/compilers/ghc/9.2.4-binary.nix b/pkgs/development/compilers/ghc/9.2.4-binary.nix
index 4cd22a358e14..57e0db560a98 100644
--- a/pkgs/development/compilers/ghc/9.2.4-binary.nix
+++ b/pkgs/development/compilers/ghc/9.2.4-binary.nix
@@ -263,20 +263,6 @@ stdenv.mkDerivation rec {
lib.optionalString stdenv.isLinux ''
find . -type f -executable -exec patchelf \
--interpreter ${stdenv.cc.bintools.dynamicLinker} {} \;
- '' +
- # The hadrian install Makefile uses 'xxx' as a temporary placeholder in path
- # substitution. Which can break the build if the store path / prefix happens
- # to contain this string. This will be fixed with 9.2.3 bindists.
- # https://gitlab.haskell.org/ghc/ghc/-/issues/21402
- ''
- # Detect hadrian Makefile by checking for the target that has the problem
- if grep '^update_package_db' ghc-${version}*/Makefile > /dev/null; then
- echo Hadrian bindist, applying workaround for xxx path substitution.
- # based on https://gitlab.haskell.org/ghc/ghc/-/commit/dd5fecb0e2990b192d92f4dfd7519ecb33164fad.patch
- substituteInPlace ghc-${version}*/Makefile --replace 'xxx' '\0xxx\0'
- else
- echo Not a hadrian bindist, not applying xxx path workaround.
- fi
'';
# fix for `configure: error: Your linker is affected by binutils #16177`
diff --git a/pkgs/development/compilers/paco/default.nix b/pkgs/development/compilers/paco/default.nix
index 69e7b2628787..d8014dd8e51b 100644
--- a/pkgs/development/compilers/paco/default.nix
+++ b/pkgs/development/compilers/paco/default.nix
@@ -1,6 +1,6 @@
-{ lib, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub, fetchpatch }:
-buildGoPackage rec {
+buildGoModule rec {
pname = "paco";
version = "1.0";
@@ -8,11 +8,22 @@ buildGoPackage rec {
owner = "pacolang";
repo = "paco";
rev = "v${version}";
- sha256 = "03x75h40dhjswbf2g1408krj9b1w05y9pjzygzhklldc75r3n9dh";
+ hash = "sha256-sCU7cjmsUTrhf/7Lm3wBPKwk80SAhCfc4lrCBggspw8=";
};
- goPackagePath = "github.com/pacolang/paco";
- goDeps = ./deps.nix;
+ vendorHash = "sha256-J0TKp1df5IWq3Irlzf1lvhWlXnP//MsVqs9M8TtEraw=";
+
+ patches = [
+ # Set correct package path in go.mod
+ (fetchpatch {
+ url = "https://github.com/pacolang/paco/pull/1/commits/886f0407e94418d34c7e062c6857834aea3c99ac.patch";
+ hash = "sha256-HRNJSyWz1OY+kCV+eaRJbaDXkH4n1NaMpFxCuEhocK4=";
+ })
+ ];
+
+ subPackages = [ "." ];
+
+ ldflags = [ "-s" "-w" ];
meta = with lib; {
description = "A simple compiled programming language";
diff --git a/pkgs/development/compilers/paco/deps.nix b/pkgs/development/compilers/paco/deps.nix
deleted file mode 100644
index a3ec48b7f1e7..000000000000
--- a/pkgs/development/compilers/paco/deps.nix
+++ /dev/null
@@ -1,93 +0,0 @@
-# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix)
-[
- {
- goPackagePath = "github.com/davecgh/go-spew";
- fetch = {
- type = "git";
- url = "https://github.com/davecgh/go-spew";
- rev = "v1.1.0";
- sha256 = "0d4jfmak5p6lb7n2r6yvf5p1zcw0l8j74kn55ghvr7zr7b7axm6c";
- };
- }
- {
- goPackagePath = "github.com/gookit/color";
- fetch = {
- type = "git";
- url = "https://github.com/gookit/color";
- rev = "v1.1.7";
- sha256 = "02gq82i9srr8bv5yhgkmn5j1r3pn8wspiisvhpbyhykm1fn736mz";
- };
- }
- {
- goPackagePath = "github.com/kr/pty";
- fetch = {
- type = "git";
- url = "https://github.com/kr/pty";
- rev = "v1.1.1";
- sha256 = "0383f0mb9kqjvncqrfpidsf8y6ns5zlrc91c6a74xpyxjwvzl2y6";
- };
- }
- {
- goPackagePath = "github.com/kr/text";
- fetch = {
- type = "git";
- url = "https://github.com/kr/text";
- rev = "v0.1.0";
- sha256 = "1gm5bsl01apvc84bw06hasawyqm4q84vx1pm32wr9jnd7a8vjgj1";
- };
- }
- {
- goPackagePath = "github.com/niemeyer/pretty";
- fetch = {
- type = "git";
- url = "https://github.com/niemeyer/pretty";
- rev = "a10e7caefd8e";
- sha256 = "1jmazh4xzaa3v6g46hz60q2z7nmqs9l9cxdzmmscn3kbcs2znq4v";
- };
- }
- {
- goPackagePath = "github.com/pmezard/go-difflib";
- fetch = {
- type = "git";
- url = "https://github.com/pmezard/go-difflib";
- rev = "v1.0.0";
- sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw";
- };
- }
- {
- goPackagePath = "github.com/stretchr/objx";
- fetch = {
- type = "git";
- url = "https://github.com/stretchr/objx";
- rev = "v0.1.0";
- sha256 = "19ynspzjdynbi85xw06mh8ad5j0qa1vryvxjgvbnyrr8rbm4vd8w";
- };
- }
- {
- goPackagePath = "github.com/stretchr/testify";
- fetch = {
- type = "git";
- url = "https://github.com/stretchr/testify";
- rev = "v1.3.0";
- sha256 = "0wjchp2c8xbgcbbq32w3kvblk6q6yn533g78nxl6iskq6y95lxsy";
- };
- }
- {
- goPackagePath = "gopkg.in/check.v1";
- fetch = {
- type = "git";
- url = "https://gopkg.in/check.v1";
- rev = "8fa46927fb4f";
- sha256 = "0fx03x0nx9mjwnqphnx852q9p76qg7cazrachvgr1bj357lplrcw";
- };
- }
- {
- goPackagePath = "gopkg.in/pipe.v2";
- fetch = {
- type = "git";
- url = "https://gopkg.in/pipe.v2";
- rev = "3c2ca4d52544";
- sha256 = "090wrj4n6a6pzdlakcxy9qnkngc8hp6m49ipbnlszs0hyj2hnngv";
- };
- }
-]
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index ec9b70f4a0ce..548110cafc11 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -200,9 +200,10 @@ self: super: {
# base bound
digit = doJailbreak super.digit;
- # matterhorn-50200.17.0 won't work with brick >= 0.71
+ # matterhorn-50200.17.0 won't work with brick >= 0.71, brick-skylighting >= 1.0
matterhorn = doJailbreak (super.matterhorn.overrideScope (self: super: {
brick = self.brick_0_70_1;
+ brick-skylighting = self.brick-skylighting_0_3;
}));
# 2020-06-05: HACK: does not pass own build suite - `dontCheck`
@@ -2328,4 +2329,8 @@ self: super: {
# posix-api has had broken tests since 2020 (until at least 2023-01-11)
# raehik has a fix pending: https://github.com/andrewthad/posix-api/pull/14
posix-api = dontCheck super.posix-api;
+
+ # bytestring <0.11.0, optparse-applicative <0.13.0
+ # https://github.com/kseo/sfnt2woff/issues/1
+ sfnt2woff = doJailbreak super.sfnt2woff;
} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super
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 c77a86913f61..54994347dd93 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix
@@ -90,10 +90,6 @@ self: super: {
# https://github.com/sjakobi/bsb-http-chunked/issues/38
bsb-http-chunked = dontCheck super.bsb-http-chunked;
- # need bytestring >= 0.11 which is only bundled with GHC >= 9.2
- regex-rure = doDistribute (markUnbroken super.regex-rure);
- jacinda = doDistribute super.jacinda;
-
# 2022-08-01: Tests are broken on ghc 9.2.4: https://github.com/wz1000/HieDb/issues/46
hiedb = dontCheck super.hiedb;
diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix
index b65479335393..e927b040417c 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix
@@ -104,6 +104,7 @@ in {
resolv = doJailbreak super.resolv;
singleton-bool = doJailbreak super.singleton-bool;
rope-utf16-splay = doDistribute self.rope-utf16-splay_0_4_0_0;
+ shake-cabal = doDistribute self.shake-cabal_0_2_2_3;
base-orphans = dontCheck super.base-orphans;
diff --git a/pkgs/development/haskell-modules/configuration-ghc-head.nix b/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix
similarity index 91%
rename from pkgs/development/haskell-modules/configuration-ghc-head.nix
rename to pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix
index a2546c3dc5f4..b96526640bb0 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-head.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix
@@ -53,9 +53,7 @@ self: super: {
time = null;
transformers = null;
unix = null;
- # GHC only bundles the xhtml library if haddock is enabled, check if this is
- # still the case when updating: https://gitlab.haskell.org/ghc/ghc/-/blob/0198841877f6f04269d6050892b98b5c3807ce4c/ghc.mk#L463
- xhtml = if self.ghc.hasHaddock or true then null else self.xhtml_3000_2_2_1;
+ xhtml = null;
# https://github.com/tibbe/unordered-containers/issues/214
unordered-containers = dontCheck super.unordered-containers;
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
index 22ce6fd8f9e8..e1ee3b669e66 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
@@ -224,6 +224,7 @@ broken-packages:
- ascii-string
- ascii-vector-avc
- asif
+ - asn1-ber-syntax
- asn1-codec
- asn1-data
- AspectAG
@@ -400,7 +401,6 @@ broken-packages:
- bindings-wlc
- bind-marshal
- binembed
- - binrep
- binsm
- bio
- BiobaseNewick
@@ -472,7 +472,6 @@ broken-packages:
- brick-dropdownmenu
- brick-filetree
- bricks-internal
- - brick-skylighting
- brillig
- brittany
- broadcast-chan-tests
@@ -512,6 +511,7 @@ broken-packages:
- byline
- by-other-names
- bytearray-parsing
+ - bytepatch
- bytestring-aeson-orphans
- bytestring-arbitrary
- bytestring-class
@@ -1486,6 +1486,7 @@ broken-packages:
- fenfire
- fernet
- FerryCore
+ - festival
- Feval
- fez-conf
- ffeed
@@ -3386,6 +3387,7 @@ broken-packages:
- monad-control-aligned
- monadcryptorandom
- monad-fork
+ - monadic-bang
- monadiccp
- monadic-recursion-schemes
- monad-introspect
@@ -4721,7 +4723,6 @@ broken-packages:
- SFML
- sfml-audio
- sfmt
- - sfnt2woff
- SG
- sgd
- SGplus
@@ -5824,7 +5825,6 @@ broken-packages:
- X11-rm
- X11-xdamage
- X11-xfixes
- - xcffib
- xchat-plugin
- xcp
- x-dsp
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
index 52ba243cb0d0..d61ab5200ceb 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
@@ -76,8 +76,6 @@ default-package-overrides:
- http-client-restricted < 0.0.5
# Downgrade hasql-dynamic-statements until hasql 1.6 is in Stackage
- hasql-dynamic-statements < 0.3.1.2
- # Its dependency brick >= 1.0 is not yet in stackage
- - brick-skylighting < 1.0
- rope-utf16-splay < 0.4.0.0
# hnix < 0.17 (unreleased) needs hnix-store-* 0.5.*
- hnix-store-core == 0.5.0.0 # 2022-06-17: Until hnix 0.17
@@ -86,6 +84,8 @@ default-package-overrides:
- reflex < 0.9.0.0
# reqired by haskell-language-server 1.9.0.0
- implicit-hie < 0.1.3
+ # latest version requires Cabal >= 3.8
+ - shake-cabal < 0.2.2.3
extra-packages:
- Cabal == 2.2.* # required for jailbreak-cabal etc.
@@ -101,6 +101,7 @@ extra-packages:
- basement < 0.0.15 # 2022-08-30: last version to support GHC < 8.10
- bower-json == 1.0.0.1 # 2022-05-21: Needed for spago 0.20.9
- brick == 0.70.* # 2022-08-13: needed by matterhorn-50200.17.0
+ - brick-skylighting < 1.0 # 2022-08-13: needed by matterhorn-50200.17.0 to match brick
- brick == 1.3 # 2022-11-03: needed by swarm 0.2.0.0
- brittany == 0.13.1.2 # 2022-09-20: needed for hls on ghc 8.8
- cabal-install-parsers < 0.5 # 2022-08-31: required by haskell-ci 0.14.3
@@ -310,6 +311,7 @@ package-maintainers:
- pandoc
- paths
- postgresql-simple
+ - purebred-email
- reflex-dom
- releaser
- replace-megaparsec
@@ -357,6 +359,10 @@ package-maintainers:
- persistent-sqlite
- persistent-template
- shakespeare
+ raehik:
+ - strongweak
+ - binrep
+ - bytepatch
roberth:
- arion-compose
- cabal-pkg-config-version-hook
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml
index 99e542eed090..dff7577fedca 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 20.5
+# Stackage LTS 20.6
# This file is auto-generated by
# maintainers/scripts/haskell/update-stackage.sh
default-package-overrides:
@@ -87,15 +87,15 @@ default-package-overrides:
- arrow-extras ==0.1.0.1
- arrows ==0.4.4.2
- ascii ==1.2.4.0
- - ascii-case ==1.0.1.1
- - ascii-char ==1.0.0.16
+ - ascii-case ==1.0.1.2
+ - ascii-char ==1.0.0.17
- asciidiagram ==1.3.3.3
- - ascii-group ==1.0.0.14
- - ascii-numbers ==1.1.0.0
- - ascii-predicates ==1.0.1.0
+ - ascii-group ==1.0.0.15
+ - ascii-numbers ==1.1.0.2
+ - ascii-predicates ==1.0.1.2
- ascii-progress ==0.3.3.0
- - ascii-superset ==1.0.1.13
- - ascii-th ==1.0.0.11
+ - ascii-superset ==1.0.1.15
+ - ascii-th ==1.0.0.14
- asn1-encoding ==0.9.6
- asn1-parse ==0.9.5
- asn1-types ==0.3.4
@@ -126,11 +126,11 @@ default-package-overrides:
- autodocodec ==0.2.0.1
- autodocodec-openapi3 ==0.2.1.1
- autodocodec-schema ==0.1.0.2
- - autodocodec-yaml ==0.2.0.2
+ - autodocodec-yaml ==0.2.0.3
- autoexporter ==2.0.0.2
- auto-update ==0.1.6
- avro ==0.6.1.2
- - aws-cloudfront-signed-cookies ==0.2.0.11
+ - aws-cloudfront-signed-cookies ==0.2.0.12
- aws-xray-client ==0.1.0.2
- aws-xray-client-persistent ==0.1.0.5
- aws-xray-client-wai ==0.1.0.2
@@ -379,7 +379,7 @@ default-package-overrides:
- colour ==2.3.6
- columnar ==1.0.0.0
- combinatorial ==0.1.0.1
- - comfort-array ==0.5.1.1
+ - comfort-array ==0.5.2
- comfort-array-shape ==0.0
- comfort-fftw ==0.0
- comfort-graph ==0.0.3.2
@@ -445,7 +445,7 @@ default-package-overrides:
- control-monad-free ==0.6.2
- control-monad-omega ==0.3.2
- convertible ==1.1.1.1
- - cookie ==0.4.5
+ - cookie ==0.4.6
- copr-api ==0.1.0
- core-data ==0.3.8.0
- core-program ==0.6.1.1
@@ -505,7 +505,7 @@ default-package-overrides:
- cursor-gen ==0.4.0.0
- cyclotomic ==1.1.1
- czipwith ==1.0.1.4
- - d10 ==1.0.1.0
+ - d10 ==1.0.1.2
- data-accessor ==0.2.3
- data-accessor-mtl ==0.2.0.4
- data-accessor-transformers ==0.2.1.7
@@ -638,6 +638,7 @@ default-package-overrides:
- domain-optics ==0.1.0.3
- do-notation ==0.1.0.2
- dot ==0.3
+ - dotenv ==0.10.0.0
- dotgen ==0.4.3
- dotnet-timespan ==0.0.1.0
- double-conversion ==2.0.4.2
@@ -1023,7 +1024,7 @@ default-package-overrides:
- harp ==0.4.3.5
- HasBigDecimal ==0.2.0.0
- hasbolt ==0.1.6.2
- - hashable ==1.4.1.0
+ - hashable ==1.4.2.0
- hashids ==1.0.2.7
- hashmap ==1.3.3
- hashtables ==1.3.1
@@ -1032,7 +1033,7 @@ default-package-overrides:
- haskell-gi-base ==0.26.3
- haskell-gi-overloading ==1.0
- haskell-lexer ==1.1.1
- - HaskellNet ==0.6.0.1
+ - HaskellNet ==0.6.0.2
- HaskellNet-SSL ==0.3.4.4
- haskell-src ==1.0.4
- haskell-src-exts ==1.23.1
@@ -1056,7 +1057,7 @@ default-package-overrides:
- hasql-transaction ==1.0.1.2
- has-transformers ==0.1.0.4
- hasty-hamiltonian ==1.3.4
- - HaTeX ==3.22.3.1
+ - HaTeX ==3.22.3.2
- HaXml ==1.25.12
- haxr ==3000.11.4.1
- HCodecs ==0.5.2
@@ -1083,7 +1084,7 @@ default-package-overrides:
- hexml ==0.3.4
- hexml-lens ==0.2.2
- hexpat ==0.20.13
- - hex-text ==0.1.0.7
+ - hex-text ==0.1.0.8
- hformat ==0.3.3.1
- hfsevents ==0.1.6
- hgeometry ==0.14
@@ -1163,7 +1164,7 @@ default-package-overrides:
- hslua-module-doclayout ==1.0.4
- hslua-module-path ==1.0.3
- hslua-module-system ==1.0.2
- - hslua-module-text ==1.0.2
+ - hslua-module-text ==1.0.3.1
- hslua-module-version ==1.0.3
- hslua-objectorientation ==2.2.1
- hslua-packaging ==2.2.1
@@ -1530,7 +1531,7 @@ default-package-overrides:
- markdown-unlit ==0.5.1
- markov-chain ==0.0.3.4
- markov-chain-usage-model ==0.0.0
- - mason ==0.2.5
+ - mason ==0.2.6
- massiv ==1.0.3.0
- massiv-io ==1.0.0.1
- massiv-persist ==1.0.0.3
@@ -1555,7 +1556,7 @@ default-package-overrides:
- mega-sdist ==0.4.2.1
- membership ==0.0.1
- memcache ==0.3.0.1
- - memfd ==1.0.1.0
+ - memfd ==1.0.1.1
- memory ==0.17.0
- MemoTrie ==0.6.10
- mergeful ==0.3.0.0
@@ -1705,7 +1706,7 @@ default-package-overrides:
- netlib-carray ==0.1
- netlib-comfort-array ==0.0.0.2
- netlib-ffi ==0.1.1
- - net-mqtt ==0.8.2.4
+ - net-mqtt ==0.8.2.5
- net-mqtt-lens ==0.1.1.0
- netpbm ==1.0.4
- netrc ==0.2.0.0
@@ -1930,7 +1931,7 @@ default-package-overrides:
- pointedlist ==0.6.1
- pointless-fun ==1.1.0.8
- poll ==0.0.0.2
- - poly ==0.5.0.0
+ - poly ==0.5.1.0
- poly-arity ==0.1.0
- polynomials-bernstein ==1.1.2
- polyparse ==1.13
@@ -1952,7 +1953,7 @@ default-package-overrides:
- possibly ==1.0.0.0
- postgres-options ==0.2.0.0
- postgresql-binary ==0.13.1
- - postgresql-libpq ==0.9.4.3
+ - postgresql-libpq ==0.9.5.0
- postgresql-libpq-notify ==0.2.0.0
- postgresql-migration ==0.2.1.6
- postgresql-query ==3.10.0
@@ -2200,8 +2201,8 @@ default-package-overrides:
- safe-money ==0.9.1
- SafeSemaphore ==0.10.1
- salve ==2.0.0.1
- - sample-frame ==0.0.3
- - sample-frame-np ==0.0.4.1
+ - sample-frame ==0.0.4
+ - sample-frame-np ==0.0.5
- sampling ==0.3.5
- sandi ==0.5
- sandwich ==0.1.2.0
@@ -2483,7 +2484,7 @@ default-package-overrides:
- SVGFonts ==1.8.0.1
- svg-tree ==0.6.2.4
- swagger2 ==2.8.6
- - swish ==0.10.2.0
+ - swish ==0.10.3.0
- syb ==0.7.2.2
- syb-with-class ==0.6.1.14
- sydtest ==0.13.0.0
@@ -2507,7 +2508,7 @@ default-package-overrides:
- symbol ==0.2.4
- symengine ==0.1.2.0
- symmetry-operations-symbols ==0.0.2.1
- - synthesizer-core ==0.8.2.1
+ - synthesizer-core ==0.8.3
- sysinfo ==0.1.1
- system-argv0 ==0.1.1
- systemd ==2.3.0
@@ -2602,7 +2603,7 @@ default-package-overrides:
- text-rope ==0.2
- text-short ==0.1.5
- text-show ==3.10
- - text-show-instances ==3.9.3
+ - text-show-instances ==3.9.4
- text-zipper ==0.12
- tfp ==1.0.2
- tf-random ==0.5
@@ -2739,7 +2740,7 @@ default-package-overrides:
- unconstrained ==0.1.0.2
- unexceptionalio ==0.5.1
- unexceptionalio-trans ==0.5.1
- - unfork ==1.0.0.0
+ - unfork ==1.0.0.1
- unicode ==0.0.1.1
- unicode-collation ==0.1.3.3
- unicode-data ==0.3.1
@@ -2900,7 +2901,7 @@ default-package-overrides:
- Win32 ==2.12.0.1
- Win32-notify ==0.3.0.3
- windns ==0.1.0.1
- - witch ==1.1.5.0
+ - witch ==1.1.6.0
with-compiler: ghc-9.2.5
- withdependencies ==0.3.0
- witherable ==0.4.2
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml
index 70a3c7525df4..136fe881b2b5 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml
@@ -874,7 +874,6 @@ dont-distribute-packages:
- bv-sized
- bv-sized-lens
- bytable
- - bytepatch
- bytestring-builder-varword
- bytestring-read
- ca
@@ -1029,7 +1028,6 @@ dont-distribute-packages:
- comark
- comfort-array
- comfort-array-shape
- - comfort-array_0_5_2
- comfort-fftw
- comfort-glpk
- commsec
@@ -2731,7 +2729,6 @@ dont-distribute-packages:
- mathblog
- mathlink
- matsuri
- - matterhorn
- maxent
- maxent-learner-hw-gui
- maxsharing
@@ -3820,7 +3817,6 @@ dont-distribute-packages:
- synthesizer
- synthesizer-alsa
- synthesizer-core
- - synthesizer-core_0_8_3
- synthesizer-dimensional
- synthesizer-filter
- synthesizer-llvm
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 175ffe274db0..3fb5c3e88a3e 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -9999,26 +9999,6 @@ self: {
}) {};
"HaTeX" = callPackage
- ({ mkDerivation, base, bibtex, bytestring, containers, hashable
- , matrix, parsec, prettyprinter, QuickCheck, tasty
- , tasty-quickcheck, text, transformers
- }:
- mkDerivation {
- pname = "HaTeX";
- version = "3.22.3.1";
- sha256 = "0vgyixd8j3nzpy8s04cy3q7gj2gfblba2z0ppr58rdm8qgj16j5c";
- libraryHaskellDepends = [
- base bibtex bytestring containers hashable matrix parsec
- prettyprinter QuickCheck text transformers
- ];
- testHaskellDepends = [
- base parsec QuickCheck tasty tasty-quickcheck text
- ];
- description = "The Haskell LaTeX library";
- license = lib.licenses.bsd3;
- }) {};
-
- "HaTeX_3_22_3_2" = callPackage
({ mkDerivation, base, bibtex, bytestring, containers, hashable
, matrix, parsec, prettyprinter, QuickCheck, tasty
, tasty-quickcheck, text, transformers
@@ -10036,7 +10016,6 @@ self: {
];
description = "The Haskell LaTeX library";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
}) {};
"HaTeX-meta" = callPackage
@@ -10486,24 +10465,6 @@ self: {
}) {};
"HaskellNet" = callPackage
- ({ mkDerivation, array, base, base64, bytestring, cryptohash-md5
- , mime-mail, mtl, network, network-bsd, old-time, pretty, text
- }:
- mkDerivation {
- pname = "HaskellNet";
- version = "0.6.0.1";
- sha256 = "08rwi28q46md2d25l1h6s6hdqf8c2c47is5w5vyydbqx6pmfdc73";
- revision = "1";
- editedCabalFile = "0c5ixp7nl0h9nixr3g079wvjvs7j6hra2va5hnj93bsjbcm350k3";
- libraryHaskellDepends = [
- array base base64 bytestring cryptohash-md5 mime-mail mtl network
- network-bsd old-time pretty text
- ];
- description = "Client support for POP3, SMTP, and IMAP";
- license = lib.licenses.bsd3;
- }) {};
-
- "HaskellNet_0_6_0_2" = callPackage
({ mkDerivation, array, base, base64, bytestring, cryptohash-md5
, mime-mail, mtl, network, network-bsd, old-time, pretty, text
}:
@@ -10517,7 +10478,6 @@ self: {
];
description = "Client support for POP3, SMTP, and IMAP";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
}) {};
"HaskellNet-SSL" = callPackage
@@ -14276,8 +14236,8 @@ self: {
pname = "MonadRandom";
version = "0.5.3";
sha256 = "17qaw1gg42p9v6f87dj5vih7l88lddbyd8880ananj8avanls617";
- revision = "2";
- editedCabalFile = "1diy29if7w1c9ckc465mrrb52fm0zmd8zzym1h5ryh5a58qafwhr";
+ revision = "3";
+ editedCabalFile = "0317qhagxgn41ql1w7isnw4jqddnw394wglqahm3c569pbr3lmdv";
libraryHaskellDepends = [
base mtl primitive random transformers transformers-compat
];
@@ -14293,8 +14253,8 @@ self: {
pname = "MonadRandom";
version = "0.6";
sha256 = "0i6h9s2iqj71q06i9al3s2akmdjjx16h015qb81nhgjwi4q8cf69";
- revision = "1";
- editedCabalFile = "1swvjlsazh6wj1k8yj7ijarmw1sfmk9fv53h1hbfqcxva4gbhnkp";
+ revision = "2";
+ editedCabalFile = "0pkfprfr4386s2a67dk0kazn2x3m2nfr3w5r32y75rb2aa25dbmy";
libraryHaskellDepends = [
base mtl primitive random transformers transformers-compat
];
@@ -34234,8 +34194,8 @@ self: {
}:
mkDerivation {
pname = "arduino-copilot";
- version = "1.7.4";
- sha256 = "1yin826p57pmabv763l9igz6lk6c43f0y6cg2f5lqi6q1662x03w";
+ version = "1.7.5";
+ sha256 = "1rmxahc4fp62c00k9j4p3952wl2cqny9adlhd7l1h4z3wml7mwsv";
libraryHaskellDepends = [
base containers copilot copilot-c99 copilot-language directory
filepath mtl optparse-applicative sketch-frp-copilot temporary
@@ -35190,18 +35150,6 @@ self: {
}) {};
"ascii-case" = callPackage
- ({ mkDerivation, ascii-char, base, hashable, hspec }:
- mkDerivation {
- pname = "ascii-case";
- version = "1.0.1.1";
- sha256 = "1vsqjxh8mhzd960p30lbzakfa3acfqpk646a61jhn0j3yv7lq7p3";
- libraryHaskellDepends = [ ascii-char base hashable ];
- testHaskellDepends = [ ascii-char base hspec ];
- description = "ASCII letter case";
- license = lib.licenses.asl20;
- }) {};
-
- "ascii-case_1_0_1_2" = callPackage
({ mkDerivation, ascii-char, base, hashable, hspec }:
mkDerivation {
pname = "ascii-case";
@@ -35211,7 +35159,6 @@ self: {
testHaskellDepends = [ ascii-char base hspec ];
description = "ASCII letter case";
license = lib.licenses.asl20;
- hydraPlatforms = lib.platforms.none;
}) {};
"ascii-caseless" = callPackage
@@ -35232,8 +35179,8 @@ self: {
({ mkDerivation, base, hashable, hspec }:
mkDerivation {
pname = "ascii-char";
- version = "1.0.0.16";
- sha256 = "06iig5p15ip0wpg330dq8kclq7g7j2xkrkk0dbl3z509d44mg049";
+ version = "1.0.0.17";
+ sha256 = "1562gkfvrcjygs9qpyswsk25d4m2pxblmmbb0hw8jsaml2jwsyss";
libraryHaskellDepends = [ base hashable ];
testHaskellDepends = [ base hspec ];
description = "A Char type representing an ASCII character";
@@ -35283,20 +35230,6 @@ self: {
}) {};
"ascii-group" = callPackage
- ({ mkDerivation, ascii-char, base, hashable, hedgehog }:
- mkDerivation {
- pname = "ascii-group";
- version = "1.0.0.14";
- sha256 = "0rk3lvs4b6d4cfzb5zc87f42wdmziprpfd4fww5r68ry3ccyn1ps";
- revision = "1";
- editedCabalFile = "0iwf48cq67qzgw4ih6532yxl03bpnzrhz68y0yfk87r1y3hsdxfx";
- libraryHaskellDepends = [ ascii-char base hashable ];
- testHaskellDepends = [ ascii-char base hedgehog ];
- description = "ASCII character groups";
- license = lib.licenses.asl20;
- }) {};
-
- "ascii-group_1_0_0_15" = callPackage
({ mkDerivation, ascii-char, base, hashable, hedgehog }:
mkDerivation {
pname = "ascii-group";
@@ -35306,7 +35239,6 @@ self: {
testHaskellDepends = [ ascii-char base hedgehog ];
description = "ASCII character groups";
license = lib.licenses.asl20;
- hydraPlatforms = lib.platforms.none;
}) {};
"ascii-holidays" = callPackage
@@ -35326,27 +35258,6 @@ self: {
}) {};
"ascii-numbers" = callPackage
- ({ mkDerivation, ascii-case, ascii-char, ascii-superset, base
- , bytestring, hashable, hedgehog, invert, text
- }:
- mkDerivation {
- pname = "ascii-numbers";
- version = "1.1.0.0";
- sha256 = "041qyhgksqchj3x09fbirxba7s31aicaqnk8185g2l70zgxjz6iv";
- revision = "2";
- editedCabalFile = "0nw6iy42ql53gl4i74ilmdar5r4l2wbn5ihv1yqbqm7rm9bqda8p";
- libraryHaskellDepends = [
- ascii-case ascii-char ascii-superset base bytestring hashable text
- ];
- testHaskellDepends = [
- ascii-case ascii-char ascii-superset base bytestring hashable
- hedgehog invert text
- ];
- description = "ASCII representations of numbers";
- license = lib.licenses.asl20;
- }) {};
-
- "ascii-numbers_1_1_0_2" = callPackage
({ mkDerivation, ascii-case, ascii-char, ascii-superset, base
, bytestring, hashable, hedgehog, invert, text
}:
@@ -35365,24 +35276,9 @@ self: {
];
description = "ASCII representations of numbers";
license = lib.licenses.asl20;
- hydraPlatforms = lib.platforms.none;
}) {};
"ascii-predicates" = callPackage
- ({ mkDerivation, ascii-char, base, hedgehog }:
- mkDerivation {
- pname = "ascii-predicates";
- version = "1.0.1.0";
- sha256 = "1zqlly878qlrkjw2m4mgs4cgw6xspn0alx6xnvnrp1r2b412ykyn";
- revision = "2";
- editedCabalFile = "15jb8yq55dwwbbq0k0vzcznsk4xvxylm61i2jspyhjhgzq9w34ik";
- libraryHaskellDepends = [ ascii-char base ];
- testHaskellDepends = [ ascii-char base hedgehog ];
- description = "Various categorizations of ASCII characters";
- license = lib.licenses.asl20;
- }) {};
-
- "ascii-predicates_1_0_1_2" = callPackage
({ mkDerivation, ascii-char, base, hedgehog }:
mkDerivation {
pname = "ascii-predicates";
@@ -35392,7 +35288,6 @@ self: {
testHaskellDepends = [ ascii-char base hedgehog ];
description = "Various categorizations of ASCII characters";
license = lib.licenses.asl20;
- hydraPlatforms = lib.platforms.none;
}) {};
"ascii-progress" = callPackage
@@ -35445,10 +35340,8 @@ self: {
}:
mkDerivation {
pname = "ascii-superset";
- version = "1.0.1.13";
- sha256 = "0pf1awrx0bfpgyc96r1ycybgpy801iqxr8qf3vp9pvbnfava1v8s";
- revision = "2";
- editedCabalFile = "1551j1x284zdv9w233ma5r15bwmwizh5zi2ifcsp86d09c38505n";
+ version = "1.0.1.15";
+ sha256 = "0jq2kfc6mmpavljrv89xqwn0iskf3z9l3m3hjcm3bw03wlyv6clp";
libraryHaskellDepends = [
ascii-char base bytestring hashable text
];
@@ -35495,19 +35388,19 @@ self: {
"ascii-th" = callPackage
({ mkDerivation, ascii-char, ascii-superset, base, bytestring
- , hedgehog, template-haskell, text
+ , hspec, template-haskell, text
}:
mkDerivation {
pname = "ascii-th";
- version = "1.0.0.11";
- sha256 = "14a50pxmri17nch7bcmrdflrqq5qq2z5012aiqh260iq4qsw74xq";
- revision = "1";
- editedCabalFile = "037i6n02c9xsxj5zz1nxihwgzhksbzjzd0s2a2m8ndsq3a5hgc61";
+ version = "1.0.0.14";
+ sha256 = "0wm0n7wr7bypdqs1cpgkcbmcwgz84lm7la2xkqflwc2kn0wr839h";
+ revision = "2";
+ editedCabalFile = "0a74410lmbd11j6bfh5x1rk3gyp7sybl7lqfxkkz5qws413ijli6";
libraryHaskellDepends = [
ascii-char ascii-superset base template-haskell
];
testHaskellDepends = [
- ascii-char ascii-superset base bytestring hedgehog text
+ ascii-char ascii-superset base bytestring hspec text
];
description = "Template Haskell support for ASCII";
license = lib.licenses.asl20;
@@ -35706,6 +35599,31 @@ self: {
license = lib.licenses.bsd3;
}) {};
+ "asn1-ber-syntax" = callPackage
+ ({ mkDerivation, array-chunks, base, base16, bytebuild, byteslice
+ , bytesmith, bytestring, contiguous, filepath, natural-arithmetic
+ , pretty-simple, primitive, QuickCheck, tasty, tasty-golden
+ , tasty-hunit, tasty-quickcheck, text-short, vector
+ }:
+ mkDerivation {
+ pname = "asn1-ber-syntax";
+ version = "0.1.0.0";
+ sha256 = "0rdn482cdbx149m1048lk894yhdh12ac8iw0d9wmx245627j4cvd";
+ libraryHaskellDepends = [
+ array-chunks base bytebuild byteslice bytesmith bytestring
+ contiguous natural-arithmetic primitive text-short vector
+ ];
+ testHaskellDepends = [
+ base base16 byteslice bytestring filepath pretty-simple primitive
+ QuickCheck tasty tasty-golden tasty-hunit tasty-quickcheck
+ text-short
+ ];
+ description = "ASN.1 BER Encode and Decode";
+ license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
+ }) {};
+
"asn1-codec" = callPackage
({ mkDerivation, aeson, base, base16-bytestring, bytestring
, containers, contravariant, cryptonite, directory, hashable, HUnit
@@ -37350,6 +37268,17 @@ self: {
license = lib.licenses.bsd3;
}) {};
+ "attoparsec-run" = callPackage
+ ({ mkDerivation, attoparsec, base, bytestring, text }:
+ mkDerivation {
+ pname = "attoparsec-run";
+ version = "0.0.1.0";
+ sha256 = "0sdia624pxc0xj7lvai0hw41zjnkfz2da3vpc9mlhldiwzdwa815";
+ libraryHaskellDepends = [ attoparsec base bytestring text ];
+ description = "Conveniently run Attoparsec parsers";
+ license = lib.licenses.asl20;
+ }) {};
+
"attoparsec-text" = callPackage
({ mkDerivation, array, attoparsec, base, containers, text }:
mkDerivation {
@@ -37748,6 +37677,18 @@ self: {
broken = true;
}) {};
+ "auto-lift-classes" = callPackage
+ ({ mkDerivation, base, reflection }:
+ mkDerivation {
+ pname = "auto-lift-classes";
+ version = "1";
+ sha256 = "02809ihgynxc20riycghgiw016xpgqh7234bs8m1ilvr7hnnwpr1";
+ libraryHaskellDepends = [ base reflection ];
+ testHaskellDepends = [ base ];
+ description = "Deriving (Show|Read)(1|2)";
+ license = lib.licenses.bsd3;
+ }) {};
+
"auto-update" = callPackage
({ mkDerivation, base, exceptions, hspec, HUnit, retry }:
mkDerivation {
@@ -37866,24 +37807,6 @@ self: {
}) {};
"autodocodec-yaml" = callPackage
- ({ mkDerivation, autodocodec, autodocodec-schema, base, bytestring
- , containers, path, path-io, safe-coloured-text, scientific, text
- , unordered-containers, vector, yaml
- }:
- mkDerivation {
- pname = "autodocodec-yaml";
- version = "0.2.0.2";
- sha256 = "164nrmpxrwyr49f0gczi2sixzrs3sv2pn8j293s9avw684aq2prx";
- libraryHaskellDepends = [
- autodocodec autodocodec-schema base bytestring containers path
- path-io safe-coloured-text scientific text unordered-containers
- vector yaml
- ];
- description = "Autodocodec interpreters for yaml";
- license = lib.licenses.mit;
- }) {};
-
- "autodocodec-yaml_0_2_0_3" = callPackage
({ mkDerivation, autodocodec, autodocodec-schema, base, bytestring
, containers, path, path-io, safe-coloured-text, scientific, text
, unordered-containers, vector, yaml
@@ -37899,7 +37822,6 @@ self: {
];
description = "Autodocodec interpreters for yaml";
license = lib.licenses.mit;
- hydraPlatforms = lib.platforms.none;
}) {};
"autoexporter" = callPackage
@@ -38531,32 +38453,6 @@ self: {
}) {};
"aws-cloudfront-signed-cookies" = callPackage
- ({ mkDerivation, aeson, aeson-pretty, asn1-encoding, asn1-types
- , base, base64-bytestring, bytestring, cookie, cryptonite, hedgehog
- , lens, lens-aeson, neat-interpolation, optparse-applicative, pem
- , text, time, vector
- }:
- mkDerivation {
- pname = "aws-cloudfront-signed-cookies";
- version = "0.2.0.11";
- sha256 = "018a3q443h19pbcc178ns7zdmsdd3pz8ww3yfixrhr4jfghws3r9";
- revision = "4";
- editedCabalFile = "1rkwa74h6kwpypr7z0fjv8l83n06b27zan1fxgpzsdrhq6d700vj";
- isLibrary = true;
- isExecutable = true;
- libraryHaskellDepends = [
- aeson aeson-pretty asn1-encoding asn1-types base base64-bytestring
- bytestring cookie cryptonite lens lens-aeson optparse-applicative
- pem text time vector
- ];
- executableHaskellDepends = [ base ];
- testHaskellDepends = [ base hedgehog neat-interpolation ];
- description = "Generate signed cookies for AWS CloudFront";
- license = lib.licenses.mit;
- mainProgram = "aws-cloudfront-signed-cookies";
- }) {};
-
- "aws-cloudfront-signed-cookies_0_2_0_12" = callPackage
({ mkDerivation, aeson, aeson-pretty, asn1-encoding, asn1-types
, base, base64-bytestring, bytestring, cookie, cryptonite, hedgehog
, lens, lens-aeson, neat-interpolation, optparse-applicative, pem
@@ -38577,7 +38473,6 @@ self: {
testHaskellDepends = [ base hedgehog neat-interpolation ];
description = "Generate signed cookies for AWS CloudFront";
license = lib.licenses.mit;
- hydraPlatforms = lib.platforms.none;
mainProgram = "aws-cloudfront-signed-cookies";
}) {};
@@ -43243,6 +43138,25 @@ self: {
license = lib.licenses.mit;
}) {};
+ "binary-parser_0_5_7_3" = callPackage
+ ({ mkDerivation, base, base-prelude, bytestring, mtl, QuickCheck
+ , quickcheck-instances, tasty, tasty-hunit, tasty-quickcheck, text
+ , transformers
+ }:
+ mkDerivation {
+ pname = "binary-parser";
+ version = "0.5.7.3";
+ sha256 = "1l739h7aixw6dlwbblk7g2cablyn6265715mwywwjq7wb73va1vd";
+ libraryHaskellDepends = [ base bytestring mtl text transformers ];
+ testHaskellDepends = [
+ base base-prelude bytestring mtl QuickCheck quickcheck-instances
+ tasty tasty-hunit tasty-quickcheck text transformers
+ ];
+ description = "An efficient but limited parser API specialised to bytestrings";
+ license = lib.licenses.mit;
+ hydraPlatforms = lib.platforms.none;
+ }) {};
+
"binary-parsers" = callPackage
({ mkDerivation, attoparsec, base, binary, bytestring
, bytestring-lexing, case-insensitive, criterion, deepseq
@@ -44440,6 +44354,8 @@ self: {
pname = "binrep";
version = "0.3.1";
sha256 = "01adzragxiick3l2q4cm0x1xd2pmrxw9xl8m39ysk9l8d15b0n4n";
+ revision = "1";
+ editedCabalFile = "17l5x2vpdwdp6x14n1wayh6751cpsxsywj205n94khnm1cgcfp1a";
libraryHaskellDepends = [
aeson base bytestring either flatparse mason megaparsec refined
strongweak text text-icu vector vector-sized
@@ -44452,8 +44368,7 @@ self: {
testToolDepends = [ hspec-discover ];
description = "Encode precise binary representations directly in types";
license = lib.licenses.mit;
- hydraPlatforms = lib.platforms.none;
- broken = true;
+ maintainers = [ lib.maintainers.raehik ];
}) {};
"bins" = callPackage
@@ -46669,20 +46584,19 @@ self: {
"blockfrost-api" = callPackage
({ mkDerivation, aeson, base, bytestring, containers, data-default
- , data-default-class, deriving-aeson, hspec, lens, QuickCheck
- , quickcheck-instances, raw-strings-qq, safe-money, servant
- , servant-docs, servant-multipart-api, tasty, tasty-discover
- , tasty-hspec, tasty-hunit, template-haskell, text, time, vector
+ , data-default-class, deriving-aeson, hspec, lens, raw-strings-qq
+ , safe-money, servant, servant-docs, servant-multipart-api, tasty
+ , tasty-discover, tasty-hspec, tasty-hunit, template-haskell, text
+ , time, vector
}:
mkDerivation {
pname = "blockfrost-api";
- version = "0.7.1.0";
- sha256 = "0dy2xspnmy9487zgjaws250kp5qnip3ir8qwnn57ah92h3z1w0mj";
+ version = "0.8.0.0";
+ sha256 = "030q47qxk8hzrff1dz0m7409kg3a7fg978c0776dw1l0bljk0v0a";
libraryHaskellDepends = [
aeson base bytestring containers data-default-class deriving-aeson
- lens QuickCheck quickcheck-instances safe-money servant
- servant-docs servant-multipart-api template-haskell text time
- vector
+ lens safe-money servant servant-docs servant-multipart-api
+ template-haskell text time vector
];
testHaskellDepends = [
aeson base bytestring containers data-default hspec raw-strings-qq
@@ -46697,12 +46611,12 @@ self: {
({ mkDerivation, base, blockfrost-api, blockfrost-client-core
, bytestring, data-default, directory, filepath, hspec, mtl
, servant, servant-client, servant-client-core, tasty
- , tasty-discover, tasty-hspec, tasty-hunit, tasty-quickcheck, text
+ , tasty-discover, tasty-hspec, tasty-hunit, text
}:
mkDerivation {
pname = "blockfrost-client";
- version = "0.7.1.0";
- sha256 = "1cr3zb69hradfc02di523vhykp0y8v8mpyzc37xw8i3phrgasw57";
+ version = "0.7.1.1";
+ sha256 = "1k795lar667y5ai484cmrv5cvzdcca165cgvai9234b721by80jx";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -46710,9 +46624,7 @@ self: {
directory filepath mtl servant servant-client servant-client-core
text
];
- testHaskellDepends = [
- base hspec tasty tasty-hspec tasty-hunit tasty-quickcheck
- ];
+ testHaskellDepends = [ base hspec tasty tasty-hspec tasty-hunit ];
testToolDepends = [ tasty-discover ];
description = "blockfrost.io basic client";
license = lib.licenses.asl20;
@@ -48781,7 +48693,7 @@ self: {
mainProgram = "mywork-example";
}) {};
- "brick-skylighting" = callPackage
+ "brick-skylighting_0_3" = callPackage
({ mkDerivation, base, brick, containers, skylighting-core, text
, vty
}:
@@ -48797,10 +48709,9 @@ self: {
description = "Show syntax-highlighted text in your Brick UI";
license = lib.licenses.bsd3;
hydraPlatforms = lib.platforms.none;
- broken = true;
}) {};
- "brick-skylighting_1_0" = callPackage
+ "brick-skylighting" = callPackage
({ mkDerivation, base, brick, containers, skylighting-core, text
, vty
}:
@@ -48815,8 +48726,6 @@ self: {
];
description = "Show syntax-highlighted text in your Brick UI";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
- broken = true;
}) {};
"bricks" = callPackage
@@ -50726,6 +50635,8 @@ self: {
license = lib.licenses.mit;
hydraPlatforms = lib.platforms.none;
mainProgram = "bytepatch";
+ maintainers = [ lib.maintainers.raehik ];
+ broken = true;
}) {};
"bytes" = callPackage
@@ -51809,6 +51720,18 @@ self: {
license = lib.licenses.agpl3Only;
}) {};
+ "cabal-appimage_0_4_0_0" = callPackage
+ ({ mkDerivation, base, Cabal, filepath }:
+ mkDerivation {
+ pname = "cabal-appimage";
+ version = "0.4.0.0";
+ sha256 = "1ws5alrffpzr6yikwsq6yvazdqbclbsa509rc4csc7dmka8xc4dp";
+ libraryHaskellDepends = [ base Cabal filepath ];
+ description = "Cabal support for creating AppImage applications";
+ license = lib.licenses.agpl3Only;
+ hydraPlatforms = lib.platforms.none;
+ }) {};
+
"cabal-audit" = callPackage
({ mkDerivation, base, Cabal, directory, filepath, HTTP
, optparse-applicative
@@ -55729,9 +55652,7 @@ self: {
testHaskellDepends = [ base bytestring primitive text ];
description = "Portable CRC-32C";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
- broken = true;
- }) {primitive-slice = null;};
+ }) {};
"caster" = callPackage
({ mkDerivation, base, bytestring, directory, fast-builder, mtl
@@ -61860,8 +61781,8 @@ self: {
}:
mkDerivation {
pname = "co-log-json";
- version = "0.0.1.0";
- sha256 = "1ap62gq3s08fif96jwssp7aj6kldsiwf2qx0f5yffl3zna4h6j2p";
+ version = "0.1.0.0";
+ sha256 = "0212dcaw4anjn569a8gpv30k09b9lk99r70bbsh7kb8hb268rk83";
libraryHaskellDepends = [
aeson base bytestring co-log-core containers string-conv text
];
@@ -63376,30 +63297,6 @@ self: {
}) {};
"comfort-array" = callPackage
- ({ mkDerivation, base, ChasingBottoms, containers, deepseq
- , doctest-exitcode-stdio, doctest-lib, guarded-allocation
- , non-empty, prelude-compat, primitive, QuickCheck, semigroups
- , storable-record, storablevector, tagged, transformers, utility-ht
- }:
- mkDerivation {
- pname = "comfort-array";
- version = "0.5.1.1";
- sha256 = "07rajrpp495g17naywybkrydd67ixiav5g8rayavwabvyrybnmgy";
- libraryHaskellDepends = [
- base containers deepseq guarded-allocation non-empty prelude-compat
- primitive QuickCheck semigroups storable-record storablevector
- tagged transformers utility-ht
- ];
- testHaskellDepends = [
- base ChasingBottoms containers doctest-exitcode-stdio doctest-lib
- QuickCheck tagged
- ];
- description = "Arrays where the index type is a function of the shape type";
- license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
- }) {};
-
- "comfort-array_0_5_2" = callPackage
({ mkDerivation, base, ChasingBottoms, containers, deepseq
, doctest-exitcode-stdio, doctest-lib, guarded-allocation
, non-empty, prelude-compat, primitive, QuickCheck, semigroups
@@ -65541,6 +65438,8 @@ self: {
pname = "concurrent-output";
version = "1.10.16";
sha256 = "0l4k0bkq5bddqraf14g3ngyzwff17f3ngg4axlilcl3zf3c4bamh";
+ revision = "1";
+ editedCabalFile = "0ak0nnfznsvq3vs8czsnlrw586hw4hj3299y75p7rhqi5jyvi932";
libraryHaskellDepends = [
ansi-terminal async base directory exceptions process stm
terminal-size text transformers unix
@@ -65549,6 +65448,23 @@ self: {
license = lib.licenses.bsd2;
}) {};
+ "concurrent-output_1_10_17" = callPackage
+ ({ mkDerivation, ansi-terminal, async, base, directory, exceptions
+ , process, stm, terminal-size, text, transformers, unix
+ }:
+ mkDerivation {
+ pname = "concurrent-output";
+ version = "1.10.17";
+ sha256 = "12dmpjdiv3y1jnljvsbx258plzjvsjnizn25csmy7w4scfbrjl0b";
+ libraryHaskellDepends = [
+ ansi-terminal async base directory exceptions process stm
+ terminal-size text transformers unix
+ ];
+ description = "Ungarble output from several threads or commands";
+ license = lib.licenses.bsd2;
+ hydraPlatforms = lib.platforms.none;
+ }) {};
+
"concurrent-resource-map" = callPackage
({ mkDerivation, base, containers, random, stm }:
mkDerivation {
@@ -68609,26 +68525,6 @@ self: {
}) {};
"cookie" = callPackage
- ({ mkDerivation, base, bytestring, data-default-class, deepseq
- , HUnit, QuickCheck, tasty, tasty-hunit, tasty-quickcheck, text
- , time
- }:
- mkDerivation {
- pname = "cookie";
- version = "0.4.5";
- sha256 = "10rmdasb7mypbwxdj2mhr810vqhkakpik7hyd8fvj60hng8r8zvh";
- libraryHaskellDepends = [
- base bytestring data-default-class deepseq text time
- ];
- testHaskellDepends = [
- base bytestring HUnit QuickCheck tasty tasty-hunit tasty-quickcheck
- text time
- ];
- description = "HTTP cookie parsing and rendering";
- license = lib.licenses.mit;
- }) {};
-
- "cookie_0_4_6" = callPackage
({ mkDerivation, base, bytestring, data-default-class, deepseq
, HUnit, QuickCheck, tasty, tasty-hunit, tasty-quickcheck, text
, time
@@ -68646,7 +68542,6 @@ self: {
];
description = "HTTP cookie parsing and rendering";
license = lib.licenses.mit;
- hydraPlatforms = lib.platforms.none;
}) {};
"cookies" = callPackage
@@ -73116,6 +73011,23 @@ self: {
hydraPlatforms = lib.platforms.none;
}) {};
+ "custom-interpolation" = callPackage
+ ({ mkDerivation, base, data-default-class, haskell-src-meta, mtl
+ , parsec, template-haskell
+ }:
+ mkDerivation {
+ pname = "custom-interpolation";
+ version = "0.1.0.1";
+ sha256 = "158ljlw17486n46p5vhbmsn8y1c4zs7i7piwhd6mjigzhv5hr4vd";
+ libraryHaskellDepends = [
+ base data-default-class haskell-src-meta mtl parsec
+ template-haskell
+ ];
+ testHaskellDepends = [ base template-haskell ];
+ description = "Customizable string interpolation quasiquoters";
+ license = lib.licenses.bsd3;
+ }) {};
+
"custom-prelude" = callPackage
({ mkDerivation, base, basic-prelude, monad-loops }:
mkDerivation {
@@ -73337,21 +73249,6 @@ self: {
}) {};
"d10" = callPackage
- ({ mkDerivation, base, hashable, hedgehog, template-haskell }:
- mkDerivation {
- pname = "d10";
- version = "1.0.1.0";
- sha256 = "0494hnk99nski7xsas06kbskvi4m9k7h5hizn1w8034xc34n0ppg";
- libraryHaskellDepends = [
- base hashable hedgehog template-haskell
- ];
- testHaskellDepends = [ base hashable hedgehog template-haskell ];
- doHaddock = false;
- description = "Digits 0-9";
- license = lib.licenses.mit;
- }) {};
-
- "d10_1_0_1_2" = callPackage
({ mkDerivation, base, hashable, hedgehog, template-haskell }:
mkDerivation {
pname = "d10";
@@ -73364,7 +73261,6 @@ self: {
doHaddock = false;
description = "Digits 0-9";
license = lib.licenses.mit;
- hydraPlatforms = lib.platforms.none;
}) {};
"d3d11binding" = callPackage
@@ -74949,6 +74845,8 @@ self: {
pname = "data-functor-logistic";
version = "0.0";
sha256 = "0k2r4jpm7sa3hgd6i08sg9xbgjzkgzx44z5ai5zpw32b7pqr9xqm";
+ revision = "1";
+ editedCabalFile = "135950pg0gxqhzmvzq9lmvvy5qnsd3q8963fslasgj01bixb3k0f";
libraryHaskellDepends = [ base distributive ];
description = "Updatable analogue of Distributive functors";
license = lib.licenses.bsd3;
@@ -78256,8 +78154,8 @@ self: {
}:
mkDerivation {
pname = "dep-t";
- version = "0.6.5.0";
- sha256 = "19jhxcmh6qf3nhixjjp7sqcpn4jpl6cdnaccvfn8375h83v1dbp9";
+ version = "0.6.6.0";
+ sha256 = "1r3pd00jlbqc8z61a1s5iwzp9y1lbqvs55sc9f495fg8m35zxcqz";
libraryHaskellDepends = [ base mtl transformers unliftio-core ];
testHaskellDepends = [
aeson barbies base bytestring containers doctest mtl rank2classes
@@ -78956,16 +78854,17 @@ self: {
}) {};
"deriving-trans" = callPackage
- ({ mkDerivation, base, monad-control, monad-control-identity, mtl
- , transformers, transformers-base
+ ({ mkDerivation, base, exceptions, monad-control
+ , monad-control-identity, mtl, transformers, transformers-base
+ , unliftio-core
}:
mkDerivation {
pname = "deriving-trans";
- version = "0.5.0.1";
- sha256 = "1d9mrld6c6hcjzw2rhss83zhlsjy9fddfhg55fdrwsajr87zsppl";
+ version = "0.5.1.0";
+ sha256 = "1k6j66v2wcqhcbf7rrj4qsm7fdf68g0i6yslcjdrricdh8b7r9w2";
libraryHaskellDepends = [
- base monad-control monad-control-identity mtl transformers
- transformers-base
+ base exceptions monad-control monad-control-identity mtl
+ transformers transformers-base unliftio-core
];
description = "Derive instances for monad transformer stacks";
license = lib.licenses.bsd3;
@@ -80640,8 +80539,8 @@ self: {
}:
mkDerivation {
pname = "diagrams-input";
- version = "0.1";
- sha256 = "1ap1qark5f746fgvnzr0fam9csxqqbpvlsyr7smxgwxzhqhsjdjy";
+ version = "0.1.1";
+ sha256 = "0wad5xdvw33dp5fzqq9h52px3m81nsic35k9wd27ss23bfzgbb6b";
libraryHaskellDepends = [
attoparsec base base64-bytestring blaze-builder blaze-markup
bytestring colour conduit conduit-extra containers css-text
@@ -81407,6 +81306,8 @@ self: {
pname = "digest";
version = "0.0.1.4";
sha256 = "05pc5l4bwddszc6vy1hazwi1dnrxg323521gdkis9cvh7zs2a4gr";
+ revision = "1";
+ editedCabalFile = "1x9wr09q0rx0v4lc1f3a3mq2md412bq6zhhyvs5njffb7bi8mpdi";
libraryHaskellDepends = [ base bytestring ];
libraryPkgconfigDepends = [ zlib ];
description = "Various hashes for bytestrings; CRC32 and Adler32 for now";
@@ -88581,6 +88482,31 @@ self: {
license = lib.licenses.bsd3;
}) {};
+ "effectful_2_2_2_0" = callPackage
+ ({ mkDerivation, async, base, bytestring, containers, directory
+ , effectful-core, exceptions, lifted-base, primitive, process, stm
+ , tasty, tasty-bench, tasty-hunit, text, time, unix, unliftio
+ }:
+ mkDerivation {
+ pname = "effectful";
+ version = "2.2.2.0";
+ sha256 = "1j6p28d5701v0a5fhgra1mhnzsqbxj44mpnixrh8jy34rcbq02bi";
+ libraryHaskellDepends = [
+ async base bytestring directory effectful-core process stm time
+ unliftio
+ ];
+ testHaskellDepends = [
+ base containers effectful-core exceptions lifted-base primitive
+ tasty tasty-hunit unliftio
+ ];
+ benchmarkHaskellDepends = [
+ async base tasty-bench text unix unliftio
+ ];
+ description = "An easy to use, performant extensible effects library";
+ license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ }) {};
+
"effectful-core" = callPackage
({ mkDerivation, base, containers, exceptions, monad-control
, primitive, transformers-base, unliftio-core
@@ -88598,6 +88524,23 @@ self: {
license = lib.licenses.bsd3;
}) {};
+ "effectful-core_2_2_2_1" = callPackage
+ ({ mkDerivation, base, containers, exceptions, monad-control
+ , primitive, transformers-base, unliftio-core
+ }:
+ mkDerivation {
+ pname = "effectful-core";
+ version = "2.2.2.1";
+ sha256 = "1k3l79rh7whfm7yrdxmxyjggmwm912g8r6brwxjkla5d4phg4azp";
+ libraryHaskellDepends = [
+ base containers exceptions monad-control primitive
+ transformers-base unliftio-core
+ ];
+ description = "An easy to use, performant extensible effects library";
+ license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ }) {};
+
"effectful-plugin" = callPackage
({ mkDerivation, base, containers, effectful-core, ghc
, ghc-tcplugins-extra
@@ -98018,6 +97961,27 @@ self: {
broken = true;
}) {};
+ "festival" = callPackage
+ ({ mkDerivation, alsa-lib, base, bytestring, c2hs, estbase, estools
+ , eststring, Festival, gomp, ncurses
+ }:
+ mkDerivation {
+ pname = "festival";
+ version = "0.1.0.0";
+ sha256 = "0w48b4dh41qjcgh0hdb7jd12gpl16zq3gbv907dcmlqmrskd712w";
+ libraryHaskellDepends = [ base bytestring ];
+ librarySystemDepends = [
+ alsa-lib estbase estools eststring Festival gomp ncurses
+ ];
+ libraryToolDepends = [ c2hs ];
+ description = "C bindings plus conveniences for the festival tts system";
+ license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
+ }) {Festival = null; inherit (pkgs) alsa-lib; estbase = null;
+ estools = null; eststring = null; inherit (pkgs) gomp;
+ inherit (pkgs) ncurses;};
+
"festung" = callPackage
({ mkDerivation, aeson, argparser, async, base, base64-bytestring
, bytestring, case-insensitive, containers, directory, either
@@ -101505,6 +101469,8 @@ self: {
pname = "foldl";
version = "1.4.13";
sha256 = "14vlhgf40qmwkznwza37z4www3q1v5acsx4nw5vmg25wdnc8ibfw";
+ revision = "1";
+ editedCabalFile = "0wkjdxjyjyq9kv9hwa5k8k8fp6i0b77xf9b2prrzyq0cwlps016i";
libraryHaskellDepends = [
base bytestring comonad containers contravariant hashable primitive
profunctors random semigroupoids text transformers
@@ -101521,8 +101487,8 @@ self: {
({ mkDerivation, base, foldl, hedgehog, safe-exceptions }:
mkDerivation {
pname = "foldl-exceptions";
- version = "1.0.0.1";
- sha256 = "05b7d7y7lg8b2d4kyzwnad4vkr6qyx1gpjw4wd20kk5smql4bxsq";
+ version = "1.0.0.2";
+ sha256 = "1303ybbfh60hqbwvydfvc4byva2agjm20vq4cfs4lkassrb36lrp";
libraryHaskellDepends = [ base foldl safe-exceptions ];
testHaskellDepends = [ base foldl hedgehog safe-exceptions ];
description = "Exception handling with FoldM";
@@ -107155,8 +107121,8 @@ self: {
}:
mkDerivation {
pname = "general-allocate";
- version = "0.2.0.0";
- sha256 = "1i388gvnk4brc49pp44xaayddcpg78ii1yv0n4r09nl4iicggsyc";
+ version = "0.2.0.1";
+ sha256 = "0n6szggdafnn8s3s4n737q8s8d1jfnz9cb4v25rsz508q56mghzl";
libraryHaskellDepends = [
base containers mtl primitive resourcet safe-exceptions
transformers
@@ -120555,8 +120521,8 @@ self: {
}:
mkDerivation {
pname = "greskell";
- version = "2.0.1.0";
- sha256 = "0p9sv21dj7sa9w5abz78q5mq72908iih8x61w19xf5z9rz5n5war";
+ version = "2.0.2.0";
+ sha256 = "1hlqy041d7qxvvhbv7lki852m9bvviml5b48vs0x299i4z9mhprx";
libraryHaskellDepends = [
aeson base exceptions greskell-core hashable semigroups text
transformers unordered-containers vector
@@ -127402,26 +127368,6 @@ self: {
}) {};
"hashable" = callPackage
- ({ mkDerivation, base, bytestring, containers, deepseq, ghc-bignum
- , ghc-prim, HUnit, QuickCheck, random, test-framework
- , test-framework-hunit, test-framework-quickcheck2, text, unix
- }:
- mkDerivation {
- pname = "hashable";
- version = "1.4.1.0";
- sha256 = "11sycr73821amdz8g0k8c97igi4z7f9xdvgaxlkxhsp6h310bcz1";
- libraryHaskellDepends = [
- base bytestring containers deepseq ghc-bignum ghc-prim text
- ];
- testHaskellDepends = [
- base bytestring ghc-prim HUnit QuickCheck random test-framework
- test-framework-hunit test-framework-quickcheck2 text unix
- ];
- description = "A class for types that can be converted to a hash value";
- license = lib.licenses.bsd3;
- }) {};
-
- "hashable_1_4_2_0" = callPackage
({ mkDerivation, base, bytestring, containers, data-array-byte
, deepseq, filepath, ghc-bignum, ghc-prim, HUnit, QuickCheck
, random, test-framework, test-framework-hunit
@@ -127441,7 +127387,6 @@ self: {
];
description = "A class for types that can be converted to a hash value";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
}) {};
"hashable-accelerate" = callPackage
@@ -132297,8 +132242,8 @@ self: {
}:
mkDerivation {
pname = "hasql-interpolate";
- version = "0.1.0.3";
- sha256 = "1532bs4d04fh0mhdn2dwgyl94x9pgbnh4xmq403pmx3785m60rva";
+ version = "0.1.0.4";
+ sha256 = "1b3q21m25wxjxrprfr24b2ay94yjjaqs0p2x6s1d9cqagmznh9v0";
libraryHaskellDepends = [
aeson array base bytestring containers haskell-src-meta hasql
megaparsec mtl scientific template-haskell text time transformers
@@ -135105,8 +135050,8 @@ self: {
}:
mkDerivation {
pname = "hedgehog-extras";
- version = "0.3.0.2";
- sha256 = "1bf6fyvp2vzvm7z9ny1pcnaqqxqh9j42x6jyd2r8mv3dxdfdjkhr";
+ version = "0.3.0.3";
+ sha256 = "1jrzijk8b4hnglsghja1aad482sc7zq0g9g0zyjxgwr4pjj7sc6f";
libraryHaskellDepends = [
aeson aeson-pretty async base bytestring deepseq directory
exceptions filepath hedgehog hw-aeson mmorph mtl network process
@@ -135235,10 +135180,8 @@ self: {
({ mkDerivation, base, hedgehog, optics-core }:
mkDerivation {
pname = "hedgehog-optics";
- version = "1.0.0.1";
- sha256 = "0ybpq4c74w8y3wnfmy7macana4zlr4w1m2s0kk88yq67cvzfgb5w";
- revision = "2";
- editedCabalFile = "1w7drklx7z8qkkf9d9pysic5iqa3ija57yqx6pq8qkhzlal09kbx";
+ version = "1.0.0.2";
+ sha256 = "0i39s3ajrfdf87qy8i2k5v4dh42snc3jw4ar49c9hc76gzhxw2qj";
libraryHaskellDepends = [ base hedgehog optics-core ];
description = "Hedgehog properties for optics laws";
license = lib.licenses.mit;
@@ -136916,18 +136859,6 @@ self: {
}) {};
"hex-text" = callPackage
- ({ mkDerivation, base, base16-bytestring, bytestring, text }:
- mkDerivation {
- pname = "hex-text";
- version = "0.1.0.7";
- sha256 = "1xyyr6570dbp6mgarz8v56s9kg4pfzk1dc10nw0gg51j6xl1c2zn";
- libraryHaskellDepends = [ base base16-bytestring bytestring text ];
- testHaskellDepends = [ base base16-bytestring bytestring text ];
- description = "ByteString-Text hexidecimal conversions";
- license = lib.licenses.mit;
- }) {};
-
- "hex-text_0_1_0_8" = callPackage
({ mkDerivation, base, base16-bytestring, bytestring, hspec, text
}:
mkDerivation {
@@ -136940,7 +136871,6 @@ self: {
];
description = "ByteString-Text hexidecimal conversions";
license = lib.licenses.mit;
- hydraPlatforms = lib.platforms.none;
}) {};
"hexchat" = callPackage
@@ -139932,6 +139862,31 @@ self: {
mainProgram = "hjsmin";
}) {};
+ "hjsmin_0_2_1" = callPackage
+ ({ mkDerivation, base, bytestring, directory, extra, filepath
+ , language-javascript, optparse-applicative, process, text, unix
+ }:
+ mkDerivation {
+ pname = "hjsmin";
+ version = "0.2.1";
+ sha256 = "146d4b9k11msqf1q12rzh5bfdrqddkcgsf42w6wpkzfdlhskid2d";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base bytestring language-javascript text
+ ];
+ executableHaskellDepends = [
+ base bytestring language-javascript optparse-applicative text
+ ];
+ testHaskellDepends = [
+ base directory extra filepath process unix
+ ];
+ description = "Haskell implementation of a javascript minifier";
+ license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ mainProgram = "hjsmin";
+ }) {};
+
"hjson" = callPackage
({ mkDerivation, base, containers, parsec }:
mkDerivation {
@@ -141891,6 +141846,8 @@ self: {
pname = "hmatrix";
version = "0.20.2";
sha256 = "05462prqkbqpxfbzsgsp8waf0sirg2qz6lzsk7r1ll752n7gqkbg";
+ revision = "1";
+ editedCabalFile = "154n2hddfk90rqd9fwwhfjnq6ab701nglsrdjss71brza93wjy8d";
configureFlags = [ "-fdisable-default-paths" "-fopenblas" ];
libraryHaskellDepends = [
array base binary bytestring deepseq primitive random semigroups
@@ -149420,24 +149377,6 @@ self: {
}) {};
"hslua-module-text" = callPackage
- ({ mkDerivation, base, hslua-core, hslua-marshalling
- , hslua-packaging, tasty, tasty-hunit, tasty-lua, text
- }:
- mkDerivation {
- pname = "hslua-module-text";
- version = "1.0.2";
- sha256 = "0xq5ndgjhs37d73s8lvm0pndwjpj2pqb67pr0ckjap8yzhjna7fq";
- libraryHaskellDepends = [
- base hslua-core hslua-marshalling hslua-packaging text
- ];
- testHaskellDepends = [
- base hslua-core hslua-packaging tasty tasty-hunit tasty-lua text
- ];
- description = "Lua module for text";
- license = lib.licenses.mit;
- }) {};
-
- "hslua-module-text_1_0_3_1" = callPackage
({ mkDerivation, base, hslua-core, hslua-marshalling
, hslua-packaging, tasty, tasty-hunit, tasty-lua, text
}:
@@ -149453,7 +149392,6 @@ self: {
];
description = "Lua module for text";
license = lib.licenses.mit;
- hydraPlatforms = lib.platforms.none;
}) {};
"hslua-module-version" = callPackage
@@ -162361,6 +162299,31 @@ self: {
license = lib.licenses.asl20;
}) {};
+ "invert_1_0_0_3" = callPackage
+ ({ mkDerivation, base, containers, criterion, generic-deriving
+ , hashable, unordered-containers, vector
+ }:
+ mkDerivation {
+ pname = "invert";
+ version = "1.0.0.3";
+ sha256 = "08bkn9pv02bklmrn5cf17qkw949ryvs51dc8pzxkixgbjk9fpny4";
+ libraryHaskellDepends = [
+ base containers generic-deriving hashable unordered-containers
+ vector
+ ];
+ testHaskellDepends = [
+ base containers generic-deriving hashable unordered-containers
+ vector
+ ];
+ benchmarkHaskellDepends = [
+ base containers criterion generic-deriving hashable
+ unordered-containers vector
+ ];
+ description = "Automatically generate a function’s inverse";
+ license = lib.licenses.asl20;
+ hydraPlatforms = lib.platforms.none;
+ }) {};
+
"invertible" = callPackage
({ mkDerivation, base, haskell-src-meta, invariant, lens
, partial-isomorphisms, QuickCheck, semigroupoids, template-haskell
@@ -165473,6 +165436,23 @@ self: {
mainProgram = "jira-wiki-markup";
}) {};
+ "jira-wiki-markup_1_5_0" = callPackage
+ ({ mkDerivation, base, mtl, parsec, tasty, tasty-hunit, text }:
+ mkDerivation {
+ pname = "jira-wiki-markup";
+ version = "1.5.0";
+ sha256 = "1ajzsn4129xjcf9kzzs2hwc2w1nv6a5y7kn7nx4im19gs6hjwzs4";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [ base mtl parsec text ];
+ executableHaskellDepends = [ base text ];
+ testHaskellDepends = [ base parsec tasty tasty-hunit text ];
+ description = "Handle Jira wiki markup";
+ license = lib.licenses.mit;
+ hydraPlatforms = lib.platforms.none;
+ mainProgram = "jira-wiki-markup";
+ }) {};
+
"jl" = callPackage
({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring
, conduit, conduit-extra, containers, exceptions, mtl
@@ -167384,8 +167364,8 @@ self: {
({ mkDerivation, aeson, base, bytestring, conduit, hspec, jsonl }:
mkDerivation {
pname = "jsonl-conduit";
- version = "0.1.1";
- sha256 = "0678hasvy8f3dvrqsg5m21yd6wdxpj1dffg9asi2b0byr4rxdaax";
+ version = "0.1.2";
+ sha256 = "03ab1ysyqg0vnlx1pxw5gj1d2gq16zsz9pdrscdjp9491fiwxg2b";
libraryHaskellDepends = [ aeson base bytestring conduit jsonl ];
testHaskellDepends = [ aeson base bytestring conduit hspec ];
description = "Conduit interface to JSONL-encoded data";
@@ -171194,10 +171174,8 @@ self: {
}:
mkDerivation {
pname = "kvitable";
- version = "1.0.1.0";
- sha256 = "0j0sl1bdx174w79xz80j89r3nmllics1h72mslsivnqv04l519l9";
- revision = "1";
- editedCabalFile = "0f801w2jgadc53nxxkgzdmfy90im0vvqh5i36r68cfx0ycywkcgn";
+ version = "1.0.2.0";
+ sha256 = "0d01sn1wj1d8cndahrvplg8qhkfyhjy5yw22c2h04jjy6n89vwwq";
libraryHaskellDepends = [
base containers lucid microlens prettyprinter text
];
@@ -172614,6 +172592,26 @@ self: {
maintainers = [ lib.maintainers.expipiplus1 ];
}) {};
+ "language-c_0_9_2" = callPackage
+ ({ mkDerivation, alex, array, base, bytestring, containers, deepseq
+ , directory, filepath, happy, mtl, pretty, process
+ }:
+ mkDerivation {
+ pname = "language-c";
+ version = "0.9.2";
+ sha256 = "1cvcxwnbg71xijadr4aqzwxaw29fxj5z2gpnz3lp5pqnv8phscdj";
+ libraryHaskellDepends = [
+ array base bytestring containers deepseq directory filepath mtl
+ pretty process
+ ];
+ libraryToolDepends = [ alex happy ];
+ testHaskellDepends = [ base directory filepath process ];
+ description = "Analysis and generation of C code";
+ license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ maintainers = [ lib.maintainers.expipiplus1 ];
+ }) {};
+
"language-c-comments" = callPackage
({ mkDerivation, alex, array, base, language-c }:
mkDerivation {
@@ -174397,8 +174395,8 @@ self: {
}:
mkDerivation {
pname = "launchdarkly-server-sdk";
- version = "3.0.3";
- sha256 = "0j5j4x94r7ha7amv0cggs7n7n9vyx1ga5kwdr8mcddc7karz18cg";
+ version = "3.0.4";
+ sha256 = "0ah3sxghmbv3gzzqs9xak5xi5fpzkvhgf0v637sq2w1k06776k56";
libraryHaskellDepends = [
aeson attoparsec base base16-bytestring bytestring clock containers
cryptohash exceptions extra generic-lens hashtables hedis
@@ -174642,10 +174640,8 @@ self: {
}:
mkDerivation {
pname = "lazy-async";
- version = "1.0.0.1";
- sha256 = "1nw24hfpw0wd099lxjsi1iqssbb7yw6isilkv4a68agv2q1ranvk";
- revision = "1";
- editedCabalFile = "1rp4ym19rz1z60awfdxyl80abmpmyjhw6s0rb40j1cmrahpvf6hz";
+ version = "1.0.0.2";
+ sha256 = "0727384j636pbnfmw2v98j6yn9qw0inv5zrsvmyf1p6znk718jf8";
libraryHaskellDepends = [
base exceptions lifted-async monad-control rank2classes stm
transformers transformers-base
@@ -175043,8 +175039,8 @@ self: {
({ mkDerivation, aeson, base, text }:
mkDerivation {
pname = "ldtk-types";
- version = "0.1.0.0";
- sha256 = "0gf99imncx6b50jjv6nn6zf37xxq8kimhp14lxymbi86k6xl204z";
+ version = "0.2.0.0";
+ sha256 = "0dyjzcrd5p3hg54j0qnszxdpfb7wn6gykaq8nc6il284nf9rqbai";
libraryHaskellDepends = [ aeson base text ];
testHaskellDepends = [ aeson base text ];
description = "Datatypes and Aeson instances for parsing LDtk";
@@ -179870,6 +179866,24 @@ self: {
license = lib.licenses.mit;
}) {};
+ "list-t_1_0_5_6" = callPackage
+ ({ mkDerivation, base, base-prelude, foldl, HTF, logict, mmorph
+ , monad-control, mtl, mtl-prelude, transformers, transformers-base
+ }:
+ mkDerivation {
+ pname = "list-t";
+ version = "1.0.5.6";
+ sha256 = "1ilbc3kjvqanwn4zysy9sdp45cizdqkfyibiymzb1ibg2s56a4sg";
+ libraryHaskellDepends = [
+ base foldl logict mmorph monad-control mtl transformers
+ transformers-base
+ ];
+ testHaskellDepends = [ base-prelude HTF mmorph mtl-prelude ];
+ description = "ListT done right";
+ license = lib.licenses.mit;
+ hydraPlatforms = lib.platforms.none;
+ }) {};
+
"list-t-attoparsec" = callPackage
({ mkDerivation, attoparsec, base-prelude, either, hspec, list-t
, list-t-text, text, transformers
@@ -181127,14 +181141,30 @@ self: {
license = lib.licenses.asl20;
}) {};
+ "loc_0_1_4_1" = callPackage
+ ({ mkDerivation, base, containers, hedgehog, hspec, hspec-hedgehog
+ }:
+ mkDerivation {
+ pname = "loc";
+ version = "0.1.4.1";
+ sha256 = "12bsbjl0808dfcshz38iih3cl3768zix23adznnq821ffxsxfiiw";
+ libraryHaskellDepends = [ base containers ];
+ testHaskellDepends = [
+ base containers hedgehog hspec hspec-hedgehog
+ ];
+ description = "Line and column positions and ranges in text files";
+ license = lib.licenses.asl20;
+ hydraPlatforms = lib.platforms.none;
+ }) {};
+
"loc-test" = callPackage
({ mkDerivation, base, containers, hedgehog, loc }:
mkDerivation {
pname = "loc-test";
- version = "0.1.3.12";
- sha256 = "0xzlv3mgp90l054gsfg8v5li2f5igb1z84r9vz6sdzmsdv6nyzbg";
+ version = "0.1.3.13";
+ sha256 = "114qi58ppyc5zwyx21d977dh7zhkaxrr0dv7qf1bk98ql5grqcjl";
libraryHaskellDepends = [ base containers hedgehog loc ];
- description = "Test-related utilities related to the /loc/ package";
+ description = "Hedgehog generators for loc";
license = lib.licenses.asl20;
}) {};
@@ -181908,6 +181938,17 @@ self: {
hydraPlatforms = lib.platforms.none;
}) {};
+ "logical-constraints" = callPackage
+ ({ mkDerivation, base }:
+ mkDerivation {
+ pname = "logical-constraints";
+ version = "0.1.2.0";
+ sha256 = "1sj47ampdyh117wl2czbkqks6vbii2n24p374r49zqnpcw9y4862";
+ libraryHaskellDepends = [ base ];
+ description = "Simple logical constraints 'syntax-sugar' writing library";
+ license = lib.licenses.mit;
+ }) {};
+
"logicst" = callPackage
({ mkDerivation, base, logict, transformers }:
mkDerivation {
@@ -186333,20 +186374,6 @@ self: {
}) {};
"mason" = callPackage
- ({ mkDerivation, array, base, bytestring, ghc-prim, network, text
- }:
- mkDerivation {
- pname = "mason";
- version = "0.2.5";
- sha256 = "0ch8qajaj83pifxy24z4srb3j51z5zn94lrx0ziqcfrpshck569j";
- libraryHaskellDepends = [
- array base bytestring ghc-prim network text
- ];
- description = "Fast and extensible bytestring builder";
- license = lib.licenses.bsd3;
- }) {};
-
- "mason_0_2_6" = callPackage
({ mkDerivation, array, base, bytestring, ghc-prim, network, text
}:
mkDerivation {
@@ -186358,7 +186385,6 @@ self: {
];
description = "Fast and extensible bytestring builder";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
}) {};
"massiv" = callPackage
@@ -187158,7 +187184,6 @@ self: {
];
description = "Terminal client for the Mattermost chat system";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
mainProgram = "matterhorn";
maintainers = [ lib.maintainers.kiwi ];
}) {};
@@ -188502,17 +188527,6 @@ self: {
}) {};
"memfd" = callPackage
- ({ mkDerivation, base, transformers }:
- mkDerivation {
- pname = "memfd";
- version = "1.0.1.0";
- sha256 = "154861xg18h02s26gf3fk8zqhr2d8x21p0s4ar56rfrbi7b2nqrk";
- libraryHaskellDepends = [ base transformers ];
- description = "Open temporary anonymous Linux file handles";
- license = lib.licenses.asl20;
- }) {};
-
- "memfd_1_0_1_1" = callPackage
({ mkDerivation, base, transformers }:
mkDerivation {
pname = "memfd";
@@ -188521,7 +188535,6 @@ self: {
libraryHaskellDepends = [ base transformers ];
description = "Open temporary anonymous Linux file handles";
license = lib.licenses.asl20;
- hydraPlatforms = lib.platforms.none;
}) {};
"meminfo" = callPackage
@@ -189958,6 +189971,8 @@ self: {
pname = "microstache";
version = "1.0.2.2";
sha256 = "1b1nvlb9jragibbbf7bg3k61g0kqhnalpsi91spy2dx18ppxp8gh";
+ revision = "1";
+ editedCabalFile = "0j9nvvyfk4grxhfg7c0nv6fp635kxnrg95zqmi2dgcw0fkw0apgr";
libraryHaskellDepends = [
aeson base containers deepseq directory filepath parsec text
transformers unordered-containers vector
@@ -189970,6 +189985,28 @@ self: {
license = lib.licenses.bsd3;
}) {};
+ "microstache_1_0_2_3" = callPackage
+ ({ mkDerivation, aeson, base, base-orphans, bytestring, containers
+ , deepseq, directory, filepath, parsec, tasty, tasty-hunit, text
+ , transformers, unordered-containers, vector
+ }:
+ mkDerivation {
+ pname = "microstache";
+ version = "1.0.2.3";
+ sha256 = "16nj6ss8nmxd0z8lc2a9zpawgvi4kbd5wyjy17xknq43awbi6ynz";
+ libraryHaskellDepends = [
+ aeson base containers deepseq directory filepath parsec text
+ transformers unordered-containers vector
+ ];
+ testHaskellDepends = [
+ aeson base base-orphans bytestring containers parsec tasty
+ tasty-hunit text
+ ];
+ description = "Mustache templates for Haskell";
+ license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ }) {};
+
"microtimer" = callPackage
({ mkDerivation, base, time }:
mkDerivation {
@@ -194009,6 +194046,26 @@ self: {
license = lib.licenses.bsd3;
}) {};
+ "monadic-bang" = callPackage
+ ({ mkDerivation, base, containers, exceptions, fused-effects, ghc
+ , ghc-boot, ghc-paths, transformers
+ }:
+ mkDerivation {
+ pname = "monadic-bang";
+ version = "0.1.0.0";
+ sha256 = "0wflx8vlwa5rxa94g40rsn8bwncnwvkbf5iagbhf74mjjdnrc17c";
+ libraryHaskellDepends = [
+ base containers fused-effects ghc transformers
+ ];
+ testHaskellDepends = [
+ base exceptions ghc ghc-boot ghc-paths transformers
+ ];
+ description = "GHC plugin to desugar ! into do-notation";
+ license = lib.licenses.mit;
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
+ }) {};
+
"monadic-recursion-schemes" = callPackage
({ mkDerivation, base, comonad, containers, free, mtl
, recursion-schemes, transformers
@@ -200960,39 +201017,6 @@ self: {
}) {ghc-binary = null;};
"net-mqtt" = callPackage
- ({ mkDerivation, async, attoparsec, attoparsec-binary, base, binary
- , bytestring, checkers, conduit, conduit-extra, connection
- , containers, deepseq, HUnit, network-conduit-tls, network-uri
- , optparse-applicative, QuickCheck, stm, tasty, tasty-hunit
- , tasty-quickcheck, text, websockets
- }:
- mkDerivation {
- pname = "net-mqtt";
- version = "0.8.2.4";
- sha256 = "03w0086kn9zgsry8gm1ij7n5m3fqq7xfas4ma1fviqsx7w8wdc3r";
- isLibrary = true;
- isExecutable = true;
- libraryHaskellDepends = [
- async attoparsec attoparsec-binary base binary bytestring conduit
- conduit-extra connection containers deepseq network-conduit-tls
- network-uri QuickCheck stm text websockets
- ];
- executableHaskellDepends = [
- async attoparsec attoparsec-binary base binary bytestring conduit
- conduit-extra connection containers deepseq network-conduit-tls
- network-uri optparse-applicative QuickCheck stm text websockets
- ];
- testHaskellDepends = [
- async attoparsec attoparsec-binary base binary bytestring checkers
- conduit conduit-extra connection containers deepseq HUnit
- network-conduit-tls network-uri QuickCheck stm tasty tasty-hunit
- tasty-quickcheck text websockets
- ];
- description = "An MQTT Protocol Implementation";
- license = lib.licenses.bsd3;
- }) {};
-
- "net-mqtt_0_8_2_5" = callPackage
({ mkDerivation, async, attoparsec, attoparsec-binary, base, binary
, bytestring, checkers, conduit, conduit-extra, connection
, containers, deepseq, HUnit, network-conduit-tls, network-uri
@@ -201023,7 +201047,6 @@ self: {
];
description = "An MQTT Protocol Implementation";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
}) {};
"net-mqtt-lens" = callPackage
@@ -208108,8 +208131,8 @@ self: {
({ mkDerivation, aeson, base, text }:
mkDerivation {
pname = "one-line-aeson-text";
- version = "0.1.0.4";
- sha256 = "0hhdnpc4fs6xz709vlww990i5f98p73n8niq09y6hv1vzgsh5gr1";
+ version = "0.1.0.5";
+ sha256 = "10ngmv4xbz5w4fpgprrii6n74syia824sysja7ajyv27v6zfbihf";
libraryHaskellDepends = [ aeson base text ];
testHaskellDepends = [ aeson base text ];
description = "Pretty-printing short Aeson values as text";
@@ -208285,8 +208308,8 @@ self: {
}:
mkDerivation {
pname = "oops";
- version = "0.1.2.0";
- sha256 = "025vgnlnilja8sn66w34iy7vc83cpidg3vcvjl1vf1inmncsydrh";
+ version = "0.1.5.0";
+ sha256 = "0yb10jv01mx2czz8sb9qxr0b34wfhvvrai52c26s6q4gwybi77jb";
libraryHaskellDepends = [ base mtl QuickCheck transformers ];
testHaskellDepends = [
base base-compat doctest doctest-discover Glob hedgehog
@@ -210324,6 +210347,28 @@ self: {
maintainers = [ lib.maintainers.Gabriel439 ];
}) {};
+ "optparse-generic_1_4_9" = callPackage
+ ({ mkDerivation, base, bytestring, Only, optparse-applicative
+ , system-filepath, text, time, transformers, transformers-compat
+ , void
+ }:
+ mkDerivation {
+ pname = "optparse-generic";
+ version = "1.4.9";
+ sha256 = "1kxrhh4h2jd2i9fi1lr3sx6wij71n1y50crl0r0j6b3c8hj3c05j";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base bytestring Only optparse-applicative system-filepath text time
+ transformers transformers-compat void
+ ];
+ executableHaskellDepends = [ base ];
+ description = "Auto-generate a command-line parser for your datatype";
+ license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ maintainers = [ lib.maintainers.Gabriel439 ];
+ }) {};
+
"optparse-helper" = callPackage
({ mkDerivation, base, optparse-applicative }:
mkDerivation {
@@ -214219,12 +214264,12 @@ self: {
mainProgram = "parseargs-example";
}) {};
- "parsec_3_1_15_1" = callPackage
+ "parsec_3_1_16_1" = callPackage
({ mkDerivation, base, bytestring, mtl, tasty, tasty-hunit, text }:
mkDerivation {
pname = "parsec";
- version = "3.1.15.1";
- sha256 = "1pcqgxzhzlyaxrkgdixsl0jh7jfcg66kwqqf6va0am8q64ar1r5b";
+ version = "3.1.16.1";
+ sha256 = "0ihjbmsn9hrryjid0ydh6vryzq2mnzavhdb7hxc8d9kfszjn46d4";
libraryHaskellDepends = [ base bytestring mtl text ];
testHaskellDepends = [ base mtl tasty tasty-hunit ];
description = "Monadic parser combinators";
@@ -214884,12 +214929,25 @@ self: {
license = lib.licenses.asl20;
}) {};
+ "partial-semigroup_0_6_0_1" = callPackage
+ ({ mkDerivation, base, hedgehog }:
+ mkDerivation {
+ pname = "partial-semigroup";
+ version = "0.6.0.1";
+ sha256 = "1zzpv5b860k22wng7qa0pcj129vgzm2vxda5x1f26f9vc0bm8q18";
+ libraryHaskellDepends = [ base ];
+ testHaskellDepends = [ base hedgehog ];
+ description = "A partial binary associative operator";
+ license = lib.licenses.asl20;
+ hydraPlatforms = lib.platforms.none;
+ }) {};
+
"partial-semigroup-hedgehog" = callPackage
({ mkDerivation, base, hedgehog, partial-semigroup }:
mkDerivation {
pname = "partial-semigroup-hedgehog";
- version = "0.6.0.13";
- sha256 = "117k12wgaypj7lkj9lqi7xhli9f33hsd455p87g9xxcwx32m0r53";
+ version = "0.6.0.14";
+ sha256 = "1f5c2z8ivmdbdy5s2f4q3pbrb4k53503zwsdc8c5drm34wrvim3b";
libraryHaskellDepends = [ base hedgehog partial-semigroup ];
description = "Property testing for partial semigroups using Hedgehog";
license = lib.licenses.asl20;
@@ -215507,6 +215565,20 @@ self: {
license = lib.licenses.asl20;
}) {};
+ "path-text-utf8_0_0_1_11" = callPackage
+ ({ mkDerivation, base, bytestring, path, safe-exceptions, text }:
+ mkDerivation {
+ pname = "path-text-utf8";
+ version = "0.0.1.11";
+ sha256 = "1dxqbcwsr3ayijssm7wr6z96p3vrwrfqhr15zhg7m3i2ad44wz8c";
+ libraryHaskellDepends = [
+ base bytestring path safe-exceptions text
+ ];
+ description = "Read and write UTF-8 text files";
+ license = lib.licenses.asl20;
+ hydraPlatforms = lib.platforms.none;
+ }) {};
+
"path-tree" = callPackage
({ mkDerivation, base, containers, relude }:
mkDerivation {
@@ -223255,30 +223327,6 @@ self: {
}) {};
"poly" = callPackage
- ({ mkDerivation, base, deepseq, doctest, finite-typelits, gauge
- , mod, primitive, QuickCheck, quickcheck-classes, semirings, tasty
- , tasty-quickcheck, vector, vector-algorithms, vector-sized
- }:
- mkDerivation {
- pname = "poly";
- version = "0.5.0.0";
- sha256 = "1h7nbyiwnbxyj2jss04raws7zapfq7mvzj7fmi8rqyr0aw91k4zl";
- libraryHaskellDepends = [
- base deepseq finite-typelits primitive semirings vector
- vector-algorithms vector-sized
- ];
- testHaskellDepends = [
- base doctest finite-typelits mod QuickCheck quickcheck-classes
- semirings tasty tasty-quickcheck vector vector-sized
- ];
- benchmarkHaskellDepends = [
- base deepseq gauge mod semirings vector
- ];
- description = "Polynomials";
- license = lib.licenses.bsd3;
- }) {};
-
- "poly_0_5_1_0" = callPackage
({ mkDerivation, base, deepseq, finite-typelits, mod, primitive
, QuickCheck, quickcheck-classes, quickcheck-classes-base
, semirings, tasty, tasty-bench, tasty-quickcheck, vector
@@ -223302,7 +223350,6 @@ self: {
];
description = "Polynomials";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
}) {};
"poly-arity" = callPackage
@@ -225577,22 +225624,6 @@ self: {
}) {};
"postgresql-libpq" = callPackage
- ({ mkDerivation, base, bytestring, Cabal, postgresql, unix }:
- mkDerivation {
- pname = "postgresql-libpq";
- version = "0.9.4.3";
- sha256 = "1gfnhc5pibn7zmifdf2g0c112xrpzsk756ln2kjzqljkspf4dqp3";
- revision = "3";
- editedCabalFile = "02cj493a2qxl5hddiq0579079s398hdqqy164pig6d61nl7q66cs";
- setupHaskellDepends = [ base Cabal ];
- libraryHaskellDepends = [ base bytestring unix ];
- librarySystemDepends = [ postgresql ];
- testHaskellDepends = [ base bytestring ];
- description = "low-level binding to libpq";
- license = lib.licenses.bsd3;
- }) {inherit (pkgs) postgresql;};
-
- "postgresql-libpq_0_9_5_0" = callPackage
({ mkDerivation, base, bytestring, Cabal, postgresql, unix }:
mkDerivation {
pname = "postgresql-libpq";
@@ -225604,7 +225635,6 @@ self: {
testHaskellDepends = [ base bytestring ];
description = "low-level binding to libpq";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
}) {inherit (pkgs) postgresql;};
"postgresql-libpq-notify" = callPackage
@@ -227712,8 +227742,8 @@ self: {
({ mkDerivation, base, bytestring, filepath, text }:
mkDerivation {
pname = "pretty-html";
- version = "0.1.0.0";
- sha256 = "099gj9h1smgjnp8xyrp5c0hj99f35lf7jc6rgmbnh8s7ra3a1gz5";
+ version = "0.1.0.1";
+ sha256 = "14f2jydcjxnm9whxi2irvsx769xc4041dpvn3r7iahcn5gqf3krr";
enableSeparateDataOutput = true;
libraryHaskellDepends = [ base text ];
testHaskellDepends = [ base bytestring filepath text ];
@@ -228521,6 +228551,17 @@ self: {
broken = true;
}) {};
+ "primitive-slice" = callPackage
+ ({ mkDerivation, base, primitive, primitive-unlifted }:
+ mkDerivation {
+ pname = "primitive-slice";
+ version = "0.1.0.0";
+ sha256 = "07bwpvqvv42x9dz4wb1k6nia9pj0d406k0apgkxyxhvd6wwk0hxz";
+ libraryHaskellDepends = [ base primitive primitive-unlifted ];
+ description = "Slices of primitive arrays";
+ license = lib.licenses.bsd3;
+ }) {};
+
"primitive-sort" = callPackage
({ mkDerivation, base, containers, contiguous, doctest, gauge
, ghc-prim, HUnit, primitive, QuickCheck, random, smallcheck, tasty
@@ -228581,26 +228622,6 @@ self: {
license = lib.licenses.bsd3;
}) {};
- "primitive-unlifted_1_0_0_0" = callPackage
- ({ mkDerivation, array, base, bytestring, primitive, QuickCheck
- , quickcheck-classes-base, stm, tasty, tasty-quickcheck, text-short
- }:
- mkDerivation {
- pname = "primitive-unlifted";
- version = "1.0.0.0";
- sha256 = "07b53730nxzqyhac71xxijg598304ppb7wa8lfhw1glicj9h0wad";
- libraryHaskellDepends = [
- array base bytestring primitive text-short
- ];
- testHaskellDepends = [
- base primitive QuickCheck quickcheck-classes-base stm tasty
- tasty-quickcheck
- ];
- description = "Primitive GHC types with unlifted types inside";
- license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
- }) {};
-
"primula-board" = callPackage
({ mkDerivation, base, ConfigFile, containers, directory, happstack
, happstack-helpers, happstack-server, happstack-state, hsp
@@ -230446,8 +230467,8 @@ self: {
}:
mkDerivation {
pname = "proteaaudio";
- version = "0.9.2";
- sha256 = "0wrahbiq7pa7bg0x7z9ynmy9ap30rj0lldgc2m7b49zhj43kax83";
+ version = "0.9.3";
+ sha256 = "12572f2pwn3akzwqi83p734jabrfinr7bb89yhinl8pari7lya7k";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ base bytestring ];
@@ -230465,8 +230486,8 @@ self: {
({ mkDerivation, base, bytestring, c2hs, SDL2 }:
mkDerivation {
pname = "proteaaudio-sdl";
- version = "0.9.2";
- sha256 = "0qn6rnv4wc0g8s2mnsx71281nmgi29gnnnbskzy1kbzrwxlshrcc";
+ version = "0.9.3";
+ sha256 = "117fn2a5821ifl4yv94bwiylbnbhriqgjdl9c4685z98m0n9ryap";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ base bytestring ];
@@ -232048,6 +232069,7 @@ self: {
];
description = "types and parser for email messages (including MIME)";
license = lib.licenses.agpl3Plus;
+ maintainers = [ lib.maintainers.maralorn ];
}) {};
"purenix" = callPackage
@@ -243522,8 +243544,8 @@ self: {
}:
mkDerivation {
pname = "rest-rewrite";
- version = "0.4.0";
- sha256 = "0vvb4jk0s699h4dcdls1yxzyaja1gwpqdchfy5wbg0fybfw94pr5";
+ version = "0.4.1";
+ sha256 = "0h9s6s9wv8fgs6xi2fqdycybjl8si0w50mlk1zc62dmjdzwxy8dx";
libraryHaskellDepends = [
base containers hashable monad-loops mtl parsec process QuickCheck
text time unordered-containers
@@ -248737,19 +248759,6 @@ self: {
}) {};
"sample-frame" = callPackage
- ({ mkDerivation, base, QuickCheck, storable-record }:
- mkDerivation {
- pname = "sample-frame";
- version = "0.0.3";
- sha256 = "0ivj0bcnqqc805np62bdpvh8v4ykmw86ph5rp7k54bbv9wd31bsv";
- isLibrary = true;
- isExecutable = true;
- libraryHaskellDepends = [ base QuickCheck storable-record ];
- description = "Handling of samples in an (audio) signal";
- license = lib.licenses.bsd3;
- }) {};
-
- "sample-frame_0_0_4" = callPackage
({ mkDerivation, base, QuickCheck, storable-record }:
mkDerivation {
pname = "sample-frame";
@@ -248760,21 +248769,9 @@ self: {
libraryHaskellDepends = [ base QuickCheck storable-record ];
description = "Handling of samples in an (audio) signal";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
}) {};
"sample-frame-np" = callPackage
- ({ mkDerivation, base, numeric-prelude, sample-frame }:
- mkDerivation {
- pname = "sample-frame-np";
- version = "0.0.4.1";
- sha256 = "091nz5w5511xl8hp2q8dfvs4jz15nkhz22rr97zga0vmn0hpdnxi";
- libraryHaskellDepends = [ base numeric-prelude sample-frame ];
- description = "Orphan instances for types from sample-frame and numericprelude";
- license = lib.licenses.bsd3;
- }) {};
-
- "sample-frame-np_0_0_5" = callPackage
({ mkDerivation, base, numeric-prelude, sample-frame }:
mkDerivation {
pname = "sample-frame-np";
@@ -248783,7 +248780,6 @@ self: {
libraryHaskellDepends = [ base numeric-prelude sample-frame ];
description = "Orphan instances for types from sample-frame and numericprelude";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
}) {};
"sampling" = callPackage
@@ -249560,6 +249556,37 @@ self: {
broken = true;
}) {inherit (pkgs) z3;};
+ "sbv_9_1" = callPackage
+ ({ mkDerivation, array, async, base, bytestring, containers
+ , deepseq, directory, filepath, hlint, libBF, mtl, pretty, process
+ , QuickCheck, random, syb, tasty, tasty-bench, tasty-golden
+ , tasty-hunit, tasty-quickcheck, template-haskell, text, time
+ , transformers, uniplate, z3
+ }:
+ mkDerivation {
+ pname = "sbv";
+ version = "9.1";
+ sha256 = "0wkpx73blwg629l4y9vjjlhbk4qa1zzddc4z8qvida62qwcdxw6w";
+ enableSeparateDataOutput = true;
+ libraryHaskellDepends = [
+ array async base containers deepseq directory filepath libBF mtl
+ pretty process QuickCheck random syb template-haskell text time
+ transformers uniplate
+ ];
+ testHaskellDepends = [
+ base bytestring containers directory filepath hlint mtl process
+ QuickCheck random tasty tasty-golden tasty-hunit tasty-quickcheck
+ ];
+ testSystemDepends = [ z3 ];
+ benchmarkHaskellDepends = [
+ base deepseq filepath process random tasty tasty-bench time
+ ];
+ description = "SMT Based Verification: Symbolic Haskell theorem prover using SMT solving";
+ license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
+ }) {inherit (pkgs) z3;};
+
"sbvPlugin" = callPackage
({ mkDerivation, base, containers, directory, filepath, ghc
, ghc-prim, mtl, process, sbv, tasty, tasty-golden
@@ -252815,6 +252842,8 @@ self: {
pname = "sensei";
version = "0.6.2";
sha256 = "168znkrlciywsqpgbssnz2n2w1w6240j1cxk83bpzlflg7q934ps";
+ revision = "1";
+ editedCabalFile = "0i4k8zdyvv3ypwqg2x5s4p0dgszpgb6g8wc0s9zi05fyzhizpi4s";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -257311,9 +257340,7 @@ self: {
testHaskellDepends = [ base ];
description = "A command line tool to convert TrueType/OpenType fonts to WOFF format";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
mainProgram = "sfnt2woff";
- broken = true;
}) {inherit (pkgs) zlib;};
"sgd" = callPackage
@@ -257673,6 +257700,23 @@ self: {
license = lib.licenses.bsd3;
}) {};
+ "shake-cabal_0_2_2_3" = callPackage
+ ({ mkDerivation, base, binary, Cabal, composition-prelude, deepseq
+ , directory, filepath, hashable, shake
+ }:
+ mkDerivation {
+ pname = "shake-cabal";
+ version = "0.2.2.3";
+ sha256 = "0gl0yiimbwcrhbh24bgm6dm3nqz4ldzgm73k1fg9sms4r2pr15hy";
+ libraryHaskellDepends = [
+ base binary Cabal composition-prelude deepseq directory filepath
+ hashable shake
+ ];
+ description = "Shake library for use with cabal";
+ license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ }) {};
+
"shake-cabal-build" = callPackage
({ mkDerivation, base, Cabal, directory, filepath, process }:
mkDerivation {
@@ -261815,8 +261859,8 @@ self: {
}:
mkDerivation {
pname = "sketch-frp-copilot";
- version = "1.0.5";
- sha256 = "0vz7p5vsjkvck3znn9ywbyi1vw0cmfb5n48m2sbcm4ky7j5x7yps";
+ version = "1.0.6";
+ sha256 = "1hxz51vx1a1p0v8sajv2ch6y261lm4s9z5fvp5w86qygsd1zy2px";
libraryHaskellDepends = [
base containers copilot copilot-c99 copilot-language mtl
optparse-applicative
@@ -269684,24 +269728,25 @@ self: {
({ mkDerivation, aeson, aeson-casing, aeson-pretty, amazonka
, amazonka-cloudformation, amazonka-core, amazonka-ec2
, amazonka-lambda, amazonka-sts, base, Blammo, bytestring, cfn-flip
- , conduit, containers, errors, exceptions, extra, filepath, Glob
- , hspec, lens, lens-aeson, monad-logger, mtl, optparse-applicative
- , QuickCheck, resourcet, rio, text, time, unliftio, unliftio-core
- , unordered-containers, uuid, yaml
+ , conduit, containers, envparse, errors, exceptions, extra
+ , filepath, Glob, hspec, lens, lens-aeson, monad-logger, mtl
+ , optparse-applicative, QuickCheck, resourcet, rio, semigroups
+ , text, time, unliftio, unliftio-core, unordered-containers, uuid
+ , yaml
}:
mkDerivation {
pname = "stackctl";
- version = "1.1.3.1";
- sha256 = "0mzn546zjgqjiky4mv19ap1qa6xxdf280qkmq041d9sj5s4xp2vh";
+ version = "1.3.0.0";
+ sha256 = "1a97xkbvcvr7r85b4xrzdijap3zw02j0rqxix3ld9ns907mkdq2n";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
aeson aeson-casing aeson-pretty amazonka amazonka-cloudformation
amazonka-core amazonka-ec2 amazonka-lambda amazonka-sts base Blammo
- bytestring cfn-flip conduit containers errors exceptions extra
- filepath Glob lens lens-aeson monad-logger mtl optparse-applicative
- resourcet rio text time unliftio unliftio-core unordered-containers
- uuid yaml
+ bytestring cfn-flip conduit containers envparse errors exceptions
+ extra filepath Glob lens lens-aeson monad-logger mtl
+ optparse-applicative resourcet rio semigroups text time unliftio
+ unliftio-core unordered-containers uuid yaml
];
executableHaskellDepends = [ base ];
testHaskellDepends = [
@@ -273176,6 +273221,8 @@ self: {
pname = "string-conversions";
version = "0.4.0.1";
sha256 = "150rdank90h7v08x0wq4dffjbxv2daf5v9sqfs5mab76kinwxg26";
+ revision = "1";
+ editedCabalFile = "1g3wxx579mhs2icxngi78pvjfybbk606a6vgns88pg6ws5hrvx4s";
libraryHaskellDepends = [ base bytestring text utf8-string ];
testHaskellDepends = [
base bytestring deepseq hspec QuickCheck quickcheck-instances text
@@ -273876,6 +273923,7 @@ self: {
testToolDepends = [ hspec-discover ];
description = "Convert between strong and weak representations of types";
license = lib.licenses.mit;
+ maintainers = [ lib.maintainers.raehik ];
}) {};
"strptime" = callPackage
@@ -274269,6 +274317,40 @@ self: {
mainProgram = "stylish-haskell";
}) {};
+ "stylish-haskell_0_14_4_0" = callPackage
+ ({ mkDerivation, aeson, base, bytestring, Cabal, containers
+ , directory, file-embed, filepath, ghc-lib-parser
+ , ghc-lib-parser-ex, HsYAML, HsYAML-aeson, HUnit, mtl
+ , optparse-applicative, random, regex-tdfa, strict, syb
+ , test-framework, test-framework-hunit, text
+ }:
+ mkDerivation {
+ pname = "stylish-haskell";
+ version = "0.14.4.0";
+ sha256 = "0y0vfz5vkvw0wzcsw2ym3nix0v3pwjw2vas0qv3lrhdvn3ba9gb7";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ aeson base bytestring Cabal containers directory file-embed
+ filepath ghc-lib-parser ghc-lib-parser-ex HsYAML HsYAML-aeson mtl
+ regex-tdfa syb text
+ ];
+ executableHaskellDepends = [
+ aeson base bytestring Cabal containers directory file-embed
+ filepath ghc-lib-parser ghc-lib-parser-ex HsYAML HsYAML-aeson mtl
+ optparse-applicative regex-tdfa strict syb text
+ ];
+ testHaskellDepends = [
+ aeson base bytestring Cabal containers directory file-embed
+ filepath ghc-lib-parser ghc-lib-parser-ex HsYAML HsYAML-aeson HUnit
+ mtl random regex-tdfa syb test-framework test-framework-hunit text
+ ];
+ description = "Haskell code prettifier";
+ license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ mainProgram = "stylish-haskell";
+ }) {};
+
"stylist" = callPackage
({ mkDerivation, async, base, css-syntax, hashable, hspec
, network-uri, QuickCheck, regex-tdfa, scientific, stylist-traits
@@ -275292,21 +275374,21 @@ self: {
({ mkDerivation, base, supply-chain-core }:
mkDerivation {
pname = "supply-chain";
- version = "0.0.0.0";
- sha256 = "12rdx593ivps3khxpvq0r1kc99jhzvc0qfkdxa7jdy0qn22fi3dx";
+ version = "0.0.0.1";
+ sha256 = "0g7hfbzqwrl30bkrk1pxiriyg2xdzv5ia77mba58sv7g0bacjz2a";
libraryHaskellDepends = [ base supply-chain-core ];
description = "Composable request-response pipelines";
license = lib.licenses.asl20;
}) {};
"supply-chain-core" = callPackage
- ({ mkDerivation, base, tasty, tasty-hedgehog, tasty-hunit }:
+ ({ mkDerivation, base, hspec }:
mkDerivation {
pname = "supply-chain-core";
- version = "0.0.0.0";
- sha256 = "17ih0pvfk0xzr30q9094gf8ry8pvnannr92hvk86z7j514nv6q9h";
+ version = "0.0.0.1";
+ sha256 = "18x9g2qacvyar4ckv4giaxxdkwn8prrl2xyzgd7p6h8pzb5xbjzz";
libraryHaskellDepends = [ base ];
- testHaskellDepends = [ base tasty tasty-hedgehog tasty-hunit ];
+ testHaskellDepends = [ base hspec ];
description = "Composable request-response pipelines";
license = lib.licenses.asl20;
}) {};
@@ -275972,32 +276054,6 @@ self: {
}) {};
"swish" = callPackage
- ({ mkDerivation, base, containers, directory, filepath, hashable
- , HUnit, intern, mtl, network-uri, polyparse, semigroups
- , test-framework, test-framework-hunit, text, time
- }:
- mkDerivation {
- pname = "swish";
- version = "0.10.2.0";
- sha256 = "162sq6k9ylzlnqj4l9plykvhhrkc7sc08bza6az5cadfvnqlham8";
- isLibrary = true;
- isExecutable = true;
- enableSeparateDataOutput = true;
- libraryHaskellDepends = [
- base containers directory filepath hashable intern mtl network-uri
- polyparse text time
- ];
- executableHaskellDepends = [ base ];
- testHaskellDepends = [
- base containers hashable HUnit network-uri semigroups
- test-framework test-framework-hunit text time
- ];
- description = "A semantic web toolkit";
- license = lib.licenses.lgpl21Only;
- mainProgram = "Swish";
- }) {};
-
- "swish_0_10_3_0" = callPackage
({ mkDerivation, base, containers, directory, filepath, hashable
, HUnit, intern, mtl, network-uri, polyparse, semigroups
, test-framework, test-framework-hunit, text, time
@@ -276020,7 +276076,6 @@ self: {
];
description = "A semantic web toolkit";
license = lib.licenses.lgpl21Plus;
- hydraPlatforms = lib.platforms.none;
mainProgram = "Swish";
}) {};
@@ -277530,41 +277585,6 @@ self: {
}) {};
"synthesizer-core" = callPackage
- ({ mkDerivation, array, base, binary, bytestring, containers
- , deepseq, directory, event-list, explicit-exception, filepath
- , non-empty, non-negative, numeric-prelude, numeric-quest, old-time
- , process, QuickCheck, random, sample-frame-np, semigroups, sox
- , storable-record, storable-tuple, storablevector, timeit
- , transformers, utility-ht
- }:
- mkDerivation {
- pname = "synthesizer-core";
- version = "0.8.2.1";
- sha256 = "1sdvqabxlgiqqb3kppxwyvmkmvcqrmrzicbmcmy6mr5c4npjxffj";
- revision = "1";
- editedCabalFile = "1c3l83qrdn3nxpp0gsr06iz9praw37c2j9zjj15pxd8in73mb74a";
- libraryHaskellDepends = [
- array base binary bytestring containers deepseq event-list
- explicit-exception filepath non-empty non-negative numeric-prelude
- numeric-quest process QuickCheck random sample-frame-np semigroups
- sox storable-record storable-tuple storablevector transformers
- utility-ht
- ];
- testHaskellDepends = [
- base containers event-list non-empty non-negative numeric-prelude
- QuickCheck random storable-tuple storablevector transformers
- utility-ht
- ];
- benchmarkHaskellDepends = [
- array base binary bytestring directory numeric-prelude old-time
- storable-tuple storablevector timeit utility-ht
- ];
- description = "Audio signal processing coded in Haskell: Low level part";
- license = "GPL";
- hydraPlatforms = lib.platforms.none;
- }) {};
-
- "synthesizer-core_0_8_3" = callPackage
({ mkDerivation, array, base, binary, bytestring, containers
, deepseq, directory, event-list, explicit-exception, filepath
, non-empty, non-negative, numeric-prelude, numeric-quest, old-time
@@ -280057,8 +280077,8 @@ self: {
pname = "tasty-hspec";
version = "1.2.0.1";
sha256 = "0ibl2xi6mmqad2mriz67nb7pjwwvjik385amp24j9kc7a7zkx091";
- revision = "1";
- editedCabalFile = "0a6r4gzxzp6n90z0nif7ha7p7am57hs48i54i2y4z9kgjv6lnvll";
+ revision = "2";
+ editedCabalFile = "0qyp20khzr6ingdjmmwlhlklc26257wds56cn2pwss3yf1j5blv1";
libraryHaskellDepends = [
base hspec hspec-core QuickCheck tasty tasty-quickcheck
tasty-smallcheck
@@ -280067,6 +280087,23 @@ self: {
license = lib.licenses.bsd3;
}) {};
+ "tasty-hspec_1_2_0_3" = callPackage
+ ({ mkDerivation, base, hspec, hspec-core, QuickCheck, tasty
+ , tasty-quickcheck, tasty-smallcheck
+ }:
+ mkDerivation {
+ pname = "tasty-hspec";
+ version = "1.2.0.3";
+ sha256 = "150dvscaa0sv5pjsd74mmnp9f0jmz09qs24swz73wwjzrzmnypcx";
+ libraryHaskellDepends = [
+ base hspec hspec-core QuickCheck tasty tasty-quickcheck
+ tasty-smallcheck
+ ];
+ description = "Hspec support for the Tasty test framework";
+ license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ }) {};
+
"tasty-html" = callPackage
({ mkDerivation, base, blaze-html, bytestring, containers, filepath
, generic-deriving, mtl, semigroups, stm, tagged, tasty, text
@@ -280474,8 +280511,8 @@ self: {
}:
mkDerivation {
pname = "tasty-sugar";
- version = "2.0.0.1";
- sha256 = "0rgq5k9vv72c5826acpfscjfszvyi5bms5wjbw7bs0izimqw7b1j";
+ version = "2.0.1.0";
+ sha256 = "1mngpdfafdxsnczi9hzvg4awg1y845srrk3f19lmnig6f70kg23h";
libraryHaskellDepends = [
base containers directory filemanip filepath kvitable logict
microlens mtl optparse-applicative parallel prettyprinter tasty
@@ -284137,39 +284174,6 @@ self: {
}) {};
"text-show-instances" = callPackage
- ({ mkDerivation, aeson, base, base-compat, bifunctors, binary
- , containers, directory, generic-deriving, ghc-boot-th, ghc-prim
- , haskeline, hpc, hspec, hspec-discover, old-locale, old-time
- , pretty, QuickCheck, quickcheck-instances, random, scientific
- , semigroups, tagged, template-haskell, terminfo, text, text-short
- , text-show, th-orphans, time, transformers, transformers-compat
- , unix, unordered-containers, uuid-types, vector, xhtml
- }:
- mkDerivation {
- pname = "text-show-instances";
- version = "3.9.3";
- sha256 = "153hfl8k0489ll71apq48s59ngv8ag1vyhhs6pp3fgxmdwwg2xpl";
- libraryHaskellDepends = [
- aeson base base-compat bifunctors binary containers directory
- ghc-boot-th haskeline hpc old-locale old-time pretty random
- scientific semigroups tagged template-haskell terminfo text
- text-short text-show time transformers unix unordered-containers
- uuid-types vector xhtml
- ];
- testHaskellDepends = [
- aeson base base-compat bifunctors binary containers directory
- generic-deriving ghc-boot-th ghc-prim haskeline hpc hspec
- old-locale old-time pretty QuickCheck quickcheck-instances random
- scientific tagged template-haskell terminfo text-short text-show
- th-orphans time transformers transformers-compat unix
- unordered-containers uuid-types vector xhtml
- ];
- testToolDepends = [ hspec-discover ];
- description = "Additional instances for text-show";
- license = lib.licenses.bsd3;
- }) {};
-
- "text-show-instances_3_9_4" = callPackage
({ mkDerivation, aeson, base, base-compat, bifunctors, binary
, containers, directory, generic-deriving, ghc-boot-th, ghc-prim
, haskeline, hpc, hspec, hspec-discover, old-locale, old-time
@@ -284200,7 +284204,6 @@ self: {
testToolDepends = [ hspec-discover ];
description = "Additional instances for text-show";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
}) {};
"text-stream-decode" = callPackage
@@ -290004,12 +290007,12 @@ self: {
mainProgram = "Benchmark";
}) {};
- "transformers_0_6_0_5" = callPackage
+ "transformers_0_6_0_6" = callPackage
({ mkDerivation, base }:
mkDerivation {
pname = "transformers";
- version = "0.6.0.5";
- sha256 = "09s4svr1z1y93qwzq22py0s2s35b6lyszyfippiimccqrbk1jlsm";
+ version = "0.6.0.6";
+ sha256 = "1savf7rjhji0lcx7fv0gz7ci6dn1sycdgh5flqr63y31spbj4q3w";
libraryHaskellDepends = [ base ];
description = "Concrete functor and monad transformers";
license = lib.licenses.bsd3;
@@ -295715,19 +295718,6 @@ self: {
}) {};
"unfork" = callPackage
- ({ mkDerivation, async, base, safe-exceptions, stm }:
- mkDerivation {
- pname = "unfork";
- version = "1.0.0.0";
- sha256 = "0k770q549f1rcdhx21nb6n1van00za2wv50angdw5gkxihzczcjq";
- revision = "1";
- editedCabalFile = "1vwlyyrczrkma8ggzn29b6vwfbq51h3m1si1jfh6v5c99vajr33y";
- libraryHaskellDepends = [ async base safe-exceptions stm ];
- description = "Make any action thread safe";
- license = lib.licenses.asl20;
- }) {};
-
- "unfork_1_0_0_1" = callPackage
({ mkDerivation, async, base, safe-exceptions, stm }:
mkDerivation {
pname = "unfork";
@@ -295736,7 +295726,6 @@ self: {
libraryHaskellDepends = [ async base safe-exceptions stm ];
description = "Make any action thread safe";
license = lib.licenses.asl20;
- hydraPlatforms = lib.platforms.none;
}) {};
"unfree" = callPackage
@@ -308072,25 +308061,6 @@ self: {
}) {};
"witch" = callPackage
- ({ mkDerivation, base, bytestring, containers, HUnit, tagged
- , template-haskell, text, time, transformers
- }:
- mkDerivation {
- pname = "witch";
- version = "1.1.5.0";
- sha256 = "1lg3kdy18d1cabb39hrj7k9s4ryc1bfrx6ln5k3j640ankdv1asj";
- libraryHaskellDepends = [
- base bytestring containers tagged template-haskell text time
- ];
- testHaskellDepends = [
- base bytestring containers HUnit tagged text time transformers
- ];
- description = "Convert values from one type into another";
- license = lib.licenses.mit;
- maintainers = [ lib.maintainers.maralorn ];
- }) {};
-
- "witch_1_1_6_0" = callPackage
({ mkDerivation, base, bytestring, containers, HUnit, tagged
, template-haskell, text, time, transformers
}:
@@ -308106,7 +308076,6 @@ self: {
];
description = "Convert values from one type into another";
license = lib.licenses.mit;
- hydraPlatforms = lib.platforms.none;
maintainers = [ lib.maintainers.maralorn ];
}) {};
@@ -310354,8 +310323,8 @@ self: {
}:
mkDerivation {
pname = "xcffib";
- version = "1.1.2";
- sha256 = "068g730p0rbsf1l7k9jgc9d7ng0zx3552wqk357wl3q56jac0chs";
+ version = "1.2.0";
+ sha256 = "0xsjr73ayld2ra40715hk319cc353vpiv2xpv58cvwfdh76n5nsy";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -310372,9 +310341,7 @@ self: {
];
description = "A cffi-based python binding for X";
license = "unknown";
- hydraPlatforms = lib.platforms.none;
mainProgram = "xcffibgen";
- broken = true;
}) {};
"xchat-plugin" = callPackage
@@ -317645,8 +317612,8 @@ self: {
}:
mkDerivation {
pname = "zephyr-copilot";
- version = "1.0.5";
- sha256 = "1fc58cq0dgzqfy84z8mbana8lisnc2df7k7jhramafpl7qgkp9q4";
+ version = "1.0.6";
+ sha256 = "0lakan23rddv8rlrd5h7jzc3g59h22hpdbjgabn4v76aaxpk3rga";
libraryHaskellDepends = [
base containers copilot copilot-c99 copilot-language directory
filepath mtl optparse-applicative sketch-frp-copilot temporary
diff --git a/pkgs/development/haskell-modules/with-packages-wrapper.nix b/pkgs/development/haskell-modules/with-packages-wrapper.nix
index c478c875540d..77ccd301b43f 100644
--- a/pkgs/development/haskell-modules/with-packages-wrapper.nix
+++ b/pkgs/development/haskell-modules/with-packages-wrapper.nix
@@ -4,6 +4,8 @@
# platform that has NCG support
, useLLVM ? false
, withHoogle ? false
+# Whether to install `doc` outputs for GHC and all included libraries.
+, installDocumentation ? true
, hoogleWithPackages
, postBuild ? ""
, ghcLibdir ? null # only used by ghcjs, when resolving plugins
@@ -54,7 +56,11 @@ let
else "$out/lib/${ghc.targetPrefix}${ghc.haskellCompilerName}";
docDir = "$out/share/doc/ghc/html";
packageCfgDir = "${libDir}/package.conf.d";
- paths = lib.filter (x: x ? isHaskellLibrary) (lib.closePropagation packages);
+ paths = lib.concatLists (
+ builtins.map
+ (pkg: [ pkg ] ++ lib.optionals installDocumentation [ (lib.getOutput "doc" pkg) ])
+ (lib.filter (x: x ? isHaskellLibrary) (lib.closePropagation packages))
+ );
hasLibraries = lib.any (x: x.isHaskellLibrary) paths;
# CLang is needed on Darwin for -fllvm to work:
# https://downloads.haskell.org/~ghc/latest/docs/html/users_guide/codegens.html#llvm-code-generator-fllvm
@@ -71,7 +77,9 @@ symlinkJoin {
# if such a feature is needed, the real compiler name should be saved
# as a dedicated drv attribute, like `compiler-name`
name = ghc.name + "-with-packages";
- paths = paths ++ [ghc];
+ paths = paths
+ ++ [ ghc ]
+ ++ lib.optionals installDocumentation [ (lib.getOutput "doc" ghc) ];
nativeBuildInputs = [ makeWrapper ];
postBuild = ''
# wrap compiler executables with correct env variables
@@ -161,8 +169,8 @@ symlinkJoin {
''}
$out/bin/${ghcCommand}-pkg check
'' + postBuild;
+ preferLocalBuild = true;
passthru = {
- preferLocalBuild = true;
inherit (ghc) version meta;
# Inform users about backwards incompatibilities with <= 21.05
diff --git a/pkgs/development/interpreters/spidermonkey/common.nix b/pkgs/development/interpreters/spidermonkey/common.nix
index a6695082684d..32a0ae2e7467 100644
--- a/pkgs/development/interpreters/spidermonkey/common.nix
+++ b/pkgs/development/interpreters/spidermonkey/common.nix
@@ -149,6 +149,7 @@ stdenv.mkDerivation (finalAttrs: rec {
# while we have a double-float toolchain
NIX_CFLAGS_COMPILE = lib.optionalString (with stdenv.hostPlatform; isRiscV && is64bit && lib.versionOlder version "91") "-mabi=lp64d";
+ # https://github.com/NixOS/nixpkgs/issues/201254
NIX_LDFLAGS = if (with stdenv; isAarch64 && isLinux) then [ "-lgcc" ] else null;
postPatch = lib.optionalString (lib.versionOlder version "102") ''
diff --git a/pkgs/development/libraries/bobcat/default.nix b/pkgs/development/libraries/bobcat/default.nix
index f1e537943f58..47fc87af143b 100644
--- a/pkgs/development/libraries/bobcat/default.nix
+++ b/pkgs/development/libraries/bobcat/default.nix
@@ -27,6 +27,7 @@ stdenv.mkDerivation rec {
'';
# have to link to static gcc lib on aarch64-linux explicitly
+ # https://github.com/NixOS/nixpkgs/issues/201254
NIX_LDFLAGS = lib.optionalString (with stdenv.targetPlatform; isAarch64 && isLinux) "-lgcc";
buildPhase = ''
diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix
index 17de587ee11c..ac7977d0f62f 100644
--- a/pkgs/development/libraries/glib/default.nix
+++ b/pkgs/development/libraries/glib/default.nix
@@ -188,6 +188,9 @@ stdenv.mkDerivation (finalAttrs: {
"-Ddevbindir=${placeholder "dev"}/bin"
] ++ lib.optionals (!stdenv.isDarwin) [
"-Dman=true" # broken on Darwin
+ ] ++ lib.optionals stdenv.isFreeBSD [
+ "-Db_lundef=false"
+ "-Dxattr=false"
];
NIX_CFLAGS_COMPILE = toString [
@@ -300,7 +303,7 @@ stdenv.mkDerivation (finalAttrs: {
meta = with lib; {
description = "C library of programming buildings blocks";
- homepage = "https://www.gtk.org/";
+ homepage = "https://wiki.gnome.org/Projects/GLib";
license = licenses.lgpl21Plus;
maintainers = teams.gnome.members ++ (with maintainers; [ lovek323 raskin ]);
platforms = platforms.unix;
diff --git a/pkgs/development/libraries/libarchive/default.nix b/pkgs/development/libraries/libarchive/default.nix
index 381689f9cb65..c8f050c300ce 100644
--- a/pkgs/development/libraries/libarchive/default.nix
+++ b/pkgs/development/libraries/libarchive/default.nix
@@ -1,6 +1,7 @@
{ lib
, stdenv
, fetchFromGitHub
+, fetchpatch
, acl
, attr
, autoreconfHook
@@ -29,7 +30,7 @@ let
autoreconfHook = buildPackages.autoreconfHook269;
in
assert xarSupport -> libxml2 != null;
-stdenv.mkDerivation (finalAttrs: {
+(stdenv.mkDerivation (finalAttrs: {
pname = "libarchive";
version = "3.6.2";
@@ -118,4 +119,16 @@ stdenv.mkDerivation (finalAttrs: {
passthru.tests = {
inherit cmake nix samba;
};
-})
+})).overrideAttrs(previousAttrs:
+ assert previousAttrs.version == "3.6.2";
+ lib.optionalAttrs stdenv.hostPlatform.isStatic {
+ patches = [
+ # fixes static linking; upstream in releases after 3.6.2
+ # https://github.com/libarchive/libarchive/pull/1825 merged upstream
+ (fetchpatch {
+ name = "001-only-add-iconv-to-pc-file-if-needed.patch";
+ url = "https://github.com/libarchive/libarchive/commit/1f35c466aaa9444335a1b854b0b7223b0d2346c2.patch";
+ hash = "sha256-lb+zwWSH6/MLUIROvu9I/hUjSbb2jOWO755WC/r+lbY=";
+ })
+ ];
+ })
diff --git a/pkgs/development/libraries/libelf-freebsd/default.nix b/pkgs/development/libraries/libelf-freebsd/default.nix
deleted file mode 100644
index d4a8b8f6f219..000000000000
--- a/pkgs/development/libraries/libelf-freebsd/default.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{ lib, fetchsvn, stdenv, gnum4, tet }:
-
-stdenv.mkDerivation (rec {
- version = "3258";
- pname = "libelf-freebsd";
-
- src = fetchsvn {
- url = "svn://svn.code.sf.net/p/elftoolchain/code/trunk";
- rev = (lib.strings.toInt version);
- name = "elftoolchain-${version}";
- sha256 = "1rcmddjanlsik0b055x8k914r9rxs8yjsvslia2nh1bhzf1lxmqz";
- };
-
- buildInputs = [ gnum4 tet ];
-
- buildPhase = ''
- PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/bin:$PATH # use BSD install(1) instead of coreutils and make(1) instead of GNU Make
- cp -vr ${tet} test/tet/tet3.8
- chmod -R a+w test/tet/tet3.8
- make libelf
- '';
-
- installPhase = ''
- cp -vr libelf $out
- cp -vr common/. $out/
- '';
-
- meta = {
- description = "Essential compilation tools and libraries for building and analyzing ELF based program images";
-
- homepage = "https://sourceforge.net/p/elftoolchain/wiki/Home/";
-
- license = lib.licenses.bsd2;
-
- platforms = lib.platforms.freebsd;
- maintainers = [ ];
- };
-})
diff --git a/pkgs/development/libraries/libelf/default.nix b/pkgs/development/libraries/libelf/default.nix
index 07873f4197e3..4002146d4d5c 100644
--- a/pkgs/development/libraries/libelf/default.nix
+++ b/pkgs/development/libraries/libelf/default.nix
@@ -1,5 +1,5 @@
{ lib, stdenv
-, fetchurl, autoreconfHook, gettext, netbsd
+, fetchurl, autoreconfHook, gettext, freebsd, netbsd
}:
# Note: this package is used for bootstrapping fetchurl, and thus
@@ -42,11 +42,14 @@ stdenv.mkDerivation rec {
strictDeps = true;
nativeBuildInputs =
- if stdenv.hostPlatform.isNetBSD then [ netbsd.gencat ] else [ gettext ]
+ (if stdenv.hostPlatform.isFreeBSD then [ freebsd.gencat ]
+ else if stdenv.hostPlatform.isNetBSD then [ netbsd.gencat ]
+ else [ gettext ])
# Need to regenerate configure script with newer version in order to pass
- # "mr_cv_target_elf=yes", but `autoreconfHook` brings in `makeWrapper`
- # which doesn't work with the bootstrapTools bash, so can only do this
- # for cross builds when `stdenv.shell` is a newer bash.
+ # "mr_cv_target_elf=yes" and determine integer sizes correctly when
+ # cross-compiling, but `autoreconfHook` brings in `makeWrapper` which
+ # doesn't work with the bootstrapTools bash, so can only do this for
+ # cross builds when `stdenv.shell` is a newer bash.
++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) autoreconfHook;
meta = {
diff --git a/pkgs/development/libraries/wlroots/default.nix b/pkgs/development/libraries/wlroots/default.nix
index 9d03d193d81c..3cda67bce4f3 100644
--- a/pkgs/development/libraries/wlroots/default.nix
+++ b/pkgs/development/libraries/wlroots/default.nix
@@ -1,6 +1,7 @@
{ lib
, stdenv
, fetchFromGitLab
+, fetchpatch2
, meson
, ninja
, pkg-config
@@ -27,7 +28,7 @@
}:
let
- generic = { version, hash, extraBuildInputs ? [ ], extraNativeBuildInputs ? [ ], extraPatch ? "" }:
+ generic = { version, hash, extraBuildInputs ? [ ], extraNativeBuildInputs ? [ ], extraPatch ? "", patches ? [ ] }:
stdenv.mkDerivation rec {
pname = "wlroots";
inherit version;
@@ -40,6 +41,7 @@ let
inherit hash;
};
+ inherit patches;
postPatch = extraPatch;
# $out for the library and $examples for the example programs (in examples):
@@ -129,6 +131,13 @@ rec {
substituteInPlace backend/drm/meson.build \
--replace /usr/share/hwdata/ ${hwdata}/share/hwdata/
'';
+ patches = [
+ (fetchpatch2 {
+ # render/egl: fix uninitialized pointers in init_dmabuf_formats
+ url = "https://gitlab.freedesktop.org/wlroots/wlroots/-/commit/ed71915742160f2b9157adbad79364e22ab7ebda.patch";
+ hash = "sha256-nNE+mBfLG3Q8PC3ly8GZXQZcoIoBLbcet7nxip6Ut0w=";
+ })
+ ];
};
wlroots = wlroots_0_15;
diff --git a/pkgs/development/ocaml-modules/lustre-v6/default.nix b/pkgs/development/ocaml-modules/lustre-v6/default.nix
index 4eb1e55a5a8a..17d21879342d 100644
--- a/pkgs/development/ocaml-modules/lustre-v6/default.nix
+++ b/pkgs/development/ocaml-modules/lustre-v6/default.nix
@@ -8,7 +8,7 @@ buildDunePackage rec {
src = fetchurl {
url = "http://www-verimag.imag.fr/DIST-TOOLS/SYNCHRONE/pool/lustre-v6.v${version}.tgz";
- hash = "sha256-+OqDwUIiPrtJy1C3DmDNTrtsT8clKKcNWCev4TEMRBc=";
+ hash = "sha256-EQ+KjDn+UsyHFRh0RWe9toqdjiNcacQUMNRQCLuaw5I=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/aiolivisi/default.nix b/pkgs/development/python-modules/aiolivisi/default.nix
index dff6c28e530a..05404b9ac777 100644
--- a/pkgs/development/python-modules/aiolivisi/default.nix
+++ b/pkgs/development/python-modules/aiolivisi/default.nix
@@ -10,14 +10,14 @@
buildPythonPackage rec {
pname = "aiolivisi";
- version = "0.0.14";
+ version = "0.0.15";
format = "setuptools";
disabled = pythonOlder "3.8";
src = fetchPypi {
inherit pname version;
- hash = "sha256-n7EQCOItr6MZRnTCfkJrq39bDbw09XyIRzSuZR2TsNg=";
+ hash = "sha256-qRIdIptvlSyxFYfi7ZFeoZKjnVPzdDW9rBr+DjUsDXc=";
};
postPatch = ''
diff --git a/pkgs/development/python-modules/autopep8/default.nix b/pkgs/development/python-modules/autopep8/default.nix
index 9eff8e2d29d4..f22d92d7bfb1 100644
--- a/pkgs/development/python-modules/autopep8/default.nix
+++ b/pkgs/development/python-modules/autopep8/default.nix
@@ -1,17 +1,20 @@
{ lib
+, buildPythonPackage
, fetchFromGitHub
, fetchpatch
-, buildPythonPackage
-, pythonOlder
-, pycodestyle
, glibcLocales
-, tomli
+, pycodestyle
, pytestCheckHook
+, pythonOlder
+, tomli
}:
buildPythonPackage rec {
pname = "autopep8";
version = "2.0.1";
+ format = "setuptools";
+
+ disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "hhatto";
@@ -20,6 +23,15 @@ buildPythonPackage rec {
hash = "sha256-YEPSsUzJG4MPiiloVAf9m/UiChkhkN0+lK6spycpSvo=";
};
+ patches = [
+ # Ignore DeprecationWarnings to fix tests on Python 3.11, https://github.com/hhatto/autopep8/pull/665
+ (fetchpatch {
+ name = "ignore-deprecation-warnings.patch";
+ url = "https://github.com/hhatto/autopep8/commit/75b444d7cf510307ef67dc2b757d384b8a241348.patch";
+ hash = "sha256-5hcJ2yAuscvGyI7zyo4Cl3NEFG/fZItQ8URstxhzwzE=";
+ })
+ ];
+
propagatedBuildInputs = [
pycodestyle
] ++ lib.optionals (pythonOlder "3.11") [
diff --git a/pkgs/development/python-modules/awscrt/default.nix b/pkgs/development/python-modules/awscrt/default.nix
index 7d6c0457c0ba..968726297711 100644
--- a/pkgs/development/python-modules/awscrt/default.nix
+++ b/pkgs/development/python-modules/awscrt/default.nix
@@ -12,14 +12,14 @@
buildPythonPackage rec {
pname = "awscrt";
- version = "0.16.3";
+ version = "0.16.6";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
- hash = "sha256-w39Qt046dWDzbt41t9LVMCJNM2uGOv9VTZf3yfWUlNM=";
+ hash = "sha256-2q8VSYPeRVRWsfG9f95lxTE1qohZen6FxghiH9Mxnjg=";
};
buildInputs = lib.optionals stdenv.isDarwin [
diff --git a/pkgs/development/python-modules/env-canada/default.nix b/pkgs/development/python-modules/env-canada/default.nix
index b5497f5ecedf..cf99d4051af0 100644
--- a/pkgs/development/python-modules/env-canada/default.nix
+++ b/pkgs/development/python-modules/env-canada/default.nix
@@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "env-canada";
- version = "0.5.25";
+ version = "0.5.26";
format = "setuptools";
disabled = pythonOlder "3.8";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
owner = "michaeldavie";
repo = "env_canada";
rev = "refs/tags/v${version}";
- sha256 = "sha256-UF04TAhgeb76bYisNYOAraw59K54WkX9a8QOtHywMTQ=";
+ sha256 = "sha256-k8GaW88PhHgHuG4UU4ha6N8iRkZRlIKxAHrWt1Yq3G0=";
};
propagatedBuildInputs = [
@@ -62,6 +62,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Python library to get Environment Canada weather data";
homepage = "https://github.com/michaeldavie/env_canada";
+ changelog = "https://github.com/michaeldavie/env_canada/blob/v${version}/CHANGELOG.md";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};
diff --git a/pkgs/development/python-modules/lxmf/default.nix b/pkgs/development/python-modules/lxmf/default.nix
index 229d3dfdaa9e..e3a061b63783 100644
--- a/pkgs/development/python-modules/lxmf/default.nix
+++ b/pkgs/development/python-modules/lxmf/default.nix
@@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "lxmf";
- version = "0.2.8";
+ version = "0.2.9";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -16,7 +16,7 @@ buildPythonPackage rec {
owner = "markqvist";
repo = "lxmf";
rev = "refs/tags/${version}";
- hash = "sha256-JSr9qLyRg0pMZHuvfo/ZO9/Hwl7ZHTrMGkrcejVRweY=";
+ hash = "sha256-etmQNUjxrJeRRWy2znkJ0slbODiRrTB/bABGFB1e9xc=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/nomadnet/default.nix b/pkgs/development/python-modules/nomadnet/default.nix
index 120aa896aaab..4f1389a04ab9 100644
--- a/pkgs/development/python-modules/nomadnet/default.nix
+++ b/pkgs/development/python-modules/nomadnet/default.nix
@@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "nomadnet";
- version = "0.3.1";
+ version = "0.3.2";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "markqvist";
repo = "NomadNet";
rev = "refs/tags/${version}";
- hash = "sha256-bpMv7dFX6hQoR8uG8IRy8JaDGLlU50hOPAI6jWmlMWI=";
+ hash = "sha256-QIme76Y7rhPCooazX+pr5ETbAmShVHZ9polJ964NLFg=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/peaqevcore/default.nix b/pkgs/development/python-modules/peaqevcore/default.nix
index 5dd2bf7f7439..0e6a82bab6a7 100644
--- a/pkgs/development/python-modules/peaqevcore/default.nix
+++ b/pkgs/development/python-modules/peaqevcore/default.nix
@@ -6,14 +6,14 @@
buildPythonPackage rec {
pname = "peaqevcore";
- version = "10.2.8";
+ version = "11.0.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
- hash = "sha256-wMC5SnC0KJ6pauvAKq+jTJiFoD0dlYBtxU8cag/JmnM=";
+ hash = "sha256-XWJlhbpOyEuAmnjOCYDe0LEtWckwi38rZv6KBydFgfM=";
};
postPatch = ''
diff --git a/pkgs/development/python-modules/pyqtwebengine/default.nix b/pkgs/development/python-modules/pyqtwebengine/default.nix
index c86fe165d4fc..c11dcad4d7d3 100644
--- a/pkgs/development/python-modules/pyqtwebengine/default.nix
+++ b/pkgs/development/python-modules/pyqtwebengine/default.nix
@@ -1,10 +1,12 @@
-{ lib, pythonPackages, pkg-config
+{ lib, stdenv, pythonPackages, pkg-config
, qmake, qtbase, qtsvg, qtwebengine
, wrapQtAppsHook
+, darwin
}:
let
inherit (pythonPackages) buildPythonPackage python isPy27 pyqt5 enum34 sip pyqt-builder;
+ inherit (darwin) autoSignDarwinBinariesHook;
in buildPythonPackage rec {
pname = "PyQtWebEngine";
version = "5.15.4";
@@ -33,6 +35,8 @@ in buildPythonPackage rec {
qtwebengine
pyqt-builder
pythonPackages.setuptools
+ ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [
+ autoSignDarwinBinariesHook
];
buildInputs = [
diff --git a/pkgs/development/python-modules/pysolcast/default.nix b/pkgs/development/python-modules/pysolcast/default.nix
index 51a61d048330..6309cfc03429 100644
--- a/pkgs/development/python-modules/pysolcast/default.nix
+++ b/pkgs/development/python-modules/pysolcast/default.nix
@@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "pysolcast";
- version = "1.0.13";
+ version = "1.0.14";
format = "setuptools";
disabled = pythonOlder "3.9";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "mcaulifn";
repo = "solcast";
rev = "refs/tags/v${version}";
- hash = "sha256-peoC6NrenfQYqr1hgPth8pqyTRZb+phD6UQhjnZF92U=";
+ hash = "sha256-SI8lRihzJClciPLX9DXOO0K7YWgix74aM784j7fVu/g=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;
diff --git a/pkgs/development/python-modules/python-lsp-server/default.nix b/pkgs/development/python-modules/python-lsp-server/default.nix
index 5f2574eb9c06..a026eb15fa27 100644
--- a/pkgs/development/python-modules/python-lsp-server/default.nix
+++ b/pkgs/development/python-modules/python-lsp-server/default.nix
@@ -18,6 +18,7 @@
, pylint
, pyqt5
, pytestCheckHook
+, pythonRelaxDepsHook
, python-lsp-jsonrpc
, pythonOlder
, rope
@@ -32,7 +33,7 @@
buildPythonPackage rec {
pname = "python-lsp-server";
- version = "1.7.0";
+ version = "1.7.1";
format = "pyproject";
disabled = pythonOlder "3.7";
@@ -41,7 +42,7 @@ buildPythonPackage rec {
owner = "python-lsp";
repo = pname;
rev = "refs/tags/v${version}";
- hash = "sha256-9cyzJxyCris7FsVni5IZCCL6IAcsN8tMakNoKPeWv7s=";
+ hash = "sha256-Rx8mHBmJw4gh0FtQBVMmOlQklODplrhnWwzsEhQm4NE=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;
@@ -49,15 +50,20 @@ buildPythonPackage rec {
postPatch = ''
substituteInPlace pyproject.toml \
--replace "--cov-report html --cov-report term --junitxml=pytest.xml" "" \
- --replace "--cov pylsp --cov test" "" \
- --replace "autopep8>=1.6.0,<1.7.0" "autopep8" \
- --replace "flake8>=5.0.0,<7" "flake8" \
- --replace "mccabe>=0.7.0,<0.8.0" "mccabe" \
- --replace "pycodestyle>=2.9.0,<2.11.0" "pycodestyle" \
- --replace "pyflakes>=2.5.0,<3.1.0" "pyflakes"
+ --replace "--cov pylsp --cov test" ""
'';
+ pythonRelaxDeps = [
+ "autopep8"
+ "flake8"
+ "mccabe"
+ "pycodestyle"
+ "pydocstyle"
+ "pyflakes"
+ ];
+
nativeBuildInputs = [
+ pythonRelaxDepsHook
setuptools-scm
];
@@ -130,6 +136,8 @@ buildPythonPackage rec {
];
disabledTests = [
+ # Don't run lint tests
+ "test_pydocstyle"
# https://github.com/python-lsp/python-lsp-server/issues/243
"test_numpy_completions"
"test_workspace_loads_pycodestyle_config"
diff --git a/pkgs/development/python-modules/screenlogicpy/default.nix b/pkgs/development/python-modules/screenlogicpy/default.nix
index 329d74af5157..4e0513985a85 100644
--- a/pkgs/development/python-modules/screenlogicpy/default.nix
+++ b/pkgs/development/python-modules/screenlogicpy/default.nix
@@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "screenlogicpy";
- version = "0.6.3";
+ version = "0.6.4";
format = "setuptools";
disabled = pythonOlder "3.6";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "dieselrabbit";
repo = pname;
rev = "refs/tags/v${version}";
- hash = "sha256-AWQiOTgYYqhsaJqYMwhCBoSWJ1ol6dJc6TArqptNu6Y=";
+ hash = "sha256-3V63DnMzICLZUyzcyWNa7XI0fd1kOat15cL6GPos04E=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/setupmeta/default.nix b/pkgs/development/python-modules/setupmeta/default.nix
index 18758eb2c998..d92d81f632a7 100644
--- a/pkgs/development/python-modules/setupmeta/default.nix
+++ b/pkgs/development/python-modules/setupmeta/default.nix
@@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "setupmeta";
- version = "3.3.2";
+ version = "3.4.0";
format = "setuptools";
disabled = pythonOlder "3.6";
@@ -20,8 +20,8 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "codrsquad";
repo = pname;
- rev = "v${version}";
- sha256 = "sha256-kX7S5NSqO1LDRkfBHaNfTjzW+l0Pd+5KvQHiNF3eH/M=";
+ rev = "refs/tags/v${version}";
+ hash = "sha256-HNGoLCTidgnaU5QA+0d/PQuCswigjdvQC3/w19i+Xuc=";
};
preBuild = ''
diff --git a/pkgs/development/python-modules/twilio/default.nix b/pkgs/development/python-modules/twilio/default.nix
index 4acdcd104d24..1f8f402583af 100644
--- a/pkgs/development/python-modules/twilio/default.nix
+++ b/pkgs/development/python-modules/twilio/default.nix
@@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "twilio";
- version = "7.16.1";
+ version = "7.16.2";
format = "setuptools";
disabled = pythonOlder "3.6";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "twilio";
repo = "twilio-python";
rev = "refs/tags/${version}";
- hash = "sha256-n4n6lG3lzfGh5HPjt1oNWGjSTobHP7IJach2xLdBNdY=";
+ hash = "sha256-Z783lHGZc5/Fl4pnM5mf863UVuFroRNwV5cljPSpCmw=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/types-decorator/default.nix b/pkgs/development/python-modules/types-decorator/default.nix
index 0af21f38a4a3..44389574ce5a 100644
--- a/pkgs/development/python-modules/types-decorator/default.nix
+++ b/pkgs/development/python-modules/types-decorator/default.nix
@@ -5,12 +5,12 @@
buildPythonPackage rec {
pname = "types-decorator";
- version = "5.1.8.1";
+ version = "5.1.8.2";
format = "setuptools";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-+SkMviPSZ0uxii2V9ZPCdUdGPtRZ4OYEgAxCCZw8akQ=";
+ sha256 = "sha256-Sddr47Ry/U+k3DO6VapLke5h6/c3nRrSVfxWMvy9wAc=";
};
# Modules doesn't have tests
diff --git a/pkgs/development/python-modules/zha-quirks/default.nix b/pkgs/development/python-modules/zha-quirks/default.nix
index 376ad472a01e..ce35780dfcb9 100644
--- a/pkgs/development/python-modules/zha-quirks/default.nix
+++ b/pkgs/development/python-modules/zha-quirks/default.nix
@@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "zha-quirks";
- version = "0.0.90";
+ version = "0.0.92";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "zigpy";
repo = "zha-device-handlers";
rev = "refs/tags/${version}";
- hash = "sha256-SfzwS7M821uGfbOLR37iiw+gEebKDgu1H7f0fs3J9kw=";
+ hash = "sha256-WKuME0OVNdNGv0nG40ctG2UAOmDXTkIr6mIh3+JE/uo=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/tools/buildah/wrapper.nix b/pkgs/development/tools/buildah/wrapper.nix
index aa14a01b8644..575ee45d7d81 100644
--- a/pkgs/development/tools/buildah/wrapper.nix
+++ b/pkgs/development/tools/buildah/wrapper.nix
@@ -1,6 +1,7 @@
{ buildah-unwrapped
, runCommand
, makeWrapper
+, symlinkJoin
, lib
, stdenv
, extraPackages ? []
@@ -11,6 +12,8 @@
, fuse-overlayfs # CoW for images, much faster than default vfs
, util-linux # nsenter
, iptables
+, aardvark-dns
+, netavark
}:
let
@@ -25,6 +28,17 @@ let
iptables
] ++ extraPackages);
+ helpersBin = symlinkJoin {
+ name = "${buildah-unwrapped.pname}-helper-binary-wrapper-${buildah-unwrapped.version}";
+
+ # this only works for some binaries, others may need to be be added to `binPath` or in the modules
+ paths = [
+ ] ++ lib.optionals stdenv.isLinux [
+ aardvark-dns
+ netavark
+ ];
+ };
+
in runCommand buildah-unwrapped.name {
name = "${buildah-unwrapped.pname}-wrapper-${buildah-unwrapped.version}";
inherit (buildah-unwrapped) pname version;
@@ -48,5 +62,6 @@ in runCommand buildah-unwrapped.name {
mkdir -p $out/bin
ln -s ${buildah-unwrapped}/share $out/share
makeWrapper ${buildah-unwrapped}/bin/buildah $out/bin/buildah \
+ --set CONTAINERS_HELPER_BINARY_DIR ${helpersBin}/bin \
--prefix PATH : ${binPath}
''
diff --git a/pkgs/os-specific/linux/ax99100/default.nix b/pkgs/os-specific/linux/ax99100/default.nix
index 9167b4e5f89d..600e02de7074 100644
--- a/pkgs/os-specific/linux/ax99100/default.nix
+++ b/pkgs/os-specific/linux/ax99100/default.nix
@@ -1,15 +1,35 @@
-{ kernel, stdenv, kmod, lib, fetchzip }:
+{ kernel, stdenv, kmod, lib, fetchzip, fetchpatch, dos2unix }:
stdenv.mkDerivation
{
pname = "ax99100";
version = "1.8.0";
- nativeBuildInputs = [ kmod ] ++ kernel.moduleBuildDependencies;
+
+ nativeBuildInputs = [ dos2unix kmod ] ++ kernel.moduleBuildDependencies;
+
src = fetchzip {
url = "https://www.asix.com.tw/en/support/download/file/1229";
sha256 = "1rbp1m01qr6b3nbr72vpbw89pjh8mddc60im78z2yjd951xkbcjh";
extension = "tar.bz2";
};
+ prePatch = ''
+ # The sources come with Windows file endings and that makes
+ # applying patches hard without first fixing the line endings.
+ dos2unix *.c *.h
+ '';
+
+ # The patches are adapted from: https://aur.archlinux.org/packages/asix-ax99100
+ #
+ # We included them here instead of fetching them, because of line
+ # ending issues that are easier to fix manually. Also the
+ # set_termios patch needs to be applied for 6.1 not for 6.0.
+ patches = [
+ ./kernel-5.18-pci_free_consistent-pci_alloc_consistent.patch
+ ./kernel-6.1-set_termios-const-ktermios.patch
+ ];
+
+ patchFlags = [ "-p0" ];
+
makeFlags = [ "KDIR='${kernel.dev}/lib/modules/${kernel.modDirVersion}/build'" ];
installPhase = ''
@@ -18,12 +38,13 @@ stdenv.mkDerivation
'';
meta = {
- description = "ASIX AX99100 Serial and Parralel Port driver";
+ description = "ASIX AX99100 Serial and Parallel Port driver";
homepage = "https://www.asix.com.tw/en/product/Interface/PCIe_Bridge/AX99100";
# According to the source code in the tarball, the license is gpl2.
license = lib.licenses.gpl2;
platforms = lib.platforms.linux;
- # currently, the build fails with kernels newer than 5.17
- broken = lib.versionAtLeast kernel.version "5.18.0";
+
+ # Older Linux versions need more patches to work.
+ broken = lib.versionOlder kernel.version "5.4.0";
};
}
diff --git a/pkgs/os-specific/linux/ax99100/kernel-5.18-pci_free_consistent-pci_alloc_consistent.patch b/pkgs/os-specific/linux/ax99100/kernel-5.18-pci_free_consistent-pci_alloc_consistent.patch
new file mode 100644
index 000000000000..05ec0cfad222
--- /dev/null
+++ b/pkgs/os-specific/linux/ax99100/kernel-5.18-pci_free_consistent-pci_alloc_consistent.patch
@@ -0,0 +1,14 @@
+diff -pNaru5 a/ax99100_sp.h b/ax99100_sp.h
+--- ax99100_sp.h 2022-06-07 16:55:26.621034945 -0400
++++ ax99100_sp.h 2022-06-07 16:58:32.488989767 -0400
+@@ -255,5 +255,10 @@ struct custom_eeprom {
+ #define _INLINE_
+ #endif
+
+ #define DEFAULT99100_BAUD 115200
+ #endif
++
++/* #if LINUX_VERSION_CODE >= KERNEL_VERSION(5,18,0) */
++#define pci_alloc_consistent(hwdev,size,dma_handle) dma_alloc_coherent(&hwdev->dev, size, dma_handle, GFP_ATOMIC)
++#define pci_free_consistent(hwdev,size,vaddr,dma_handle) dma_free_coherent(&hwdev->dev, size, vaddr, dma_handle)
++/* #endif */
diff --git a/pkgs/os-specific/linux/ax99100/kernel-6.1-set_termios-const-ktermios.patch b/pkgs/os-specific/linux/ax99100/kernel-6.1-set_termios-const-ktermios.patch
new file mode 100644
index 000000000000..8d75ad454cfe
--- /dev/null
+++ b/pkgs/os-specific/linux/ax99100/kernel-6.1-set_termios-const-ktermios.patch
@@ -0,0 +1,18 @@
+diff -pNaru5 a/ax99100_sp.c b/ax99100_sp.c
+--- ax99100_sp.c 2023-01-02 23:44:46.707423858 -0500
++++ ax99100_sp.c 2023-01-02 23:44:27.171293092 -0500
+@@ -1915,11 +1915,13 @@ static unsigned int serial99100_get_divi
+ DEBUG("In %s quot=%u----baud=%u-----------------------------END\n",__FUNCTION__,quot,baud);
+ return quot;
+ }
+
+ //This is a port ops function to set the terminal settings.
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6,1,0)
++static void serial99100_set_termios(struct uart_port *port, struct ktermios *termios, const struct ktermios *old)
++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20)
+ static void serial99100_set_termios(struct uart_port *port, struct ktermios *termios, struct ktermios *old)
+ #else
+ static void serial99100_set_termios(struct uart_port *port, struct termios *termios, struct termios *old)
+ #endif
+ {
diff --git a/pkgs/os-specific/linux/kernel/zen-kernels.nix b/pkgs/os-specific/linux/kernel/zen-kernels.nix
index a5376d56418d..0a77671f5536 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 = "6.1.6"; #zen
+ version = "6.1.8"; #zen
suffix = "zen1"; #zen
- sha256 = "14f24w8cww1096lawrk0absx6sqy4mm0f2wpsijgjx4br2ln7p4r"; #zen
+ sha256 = "1n7b21mw326j35fw1wb53ws5wghy005mgllvspav8vc3mxm729ps"; #zen
isLqx = false;
};
# ./update-zen.py lqx
lqxVariant = {
- version = "6.1.6"; #lqx
+ version = "6.1.8"; #lqx
suffix = "lqx1"; #lqx
- sha256 = "0w1ckias1j1baidyw1a6kq1za7i3ig0w1phkb4s7sw9p7bnhbrx1"; #lqx
+ sha256 = "06q5a2p6m5r891pkgisbj8irgv09qb77lnjc26gh4nyc9qzg2d3f"; #lqx
isLqx = true;
};
zenKernelsFor = { version, suffix, sha256, isLqx }: buildLinux (args // {
diff --git a/pkgs/servers/nosql/cassandra/4.json b/pkgs/servers/nosql/cassandra/4.json
index fd0a4be8f49b..cf13954ad863 100644
--- a/pkgs/servers/nosql/cassandra/4.json
+++ b/pkgs/servers/nosql/cassandra/4.json
@@ -1,4 +1,4 @@
{
- "version": "4.0.7",
- "sha256": "03k7mvm5im4lahl8wfafk5ljxd95b6zsmskip4kcpzqi6naf6s4s"
+ "version": "4.1.0",
+ "sha256": "1bh7srvdah5jvs9wrs0z9s341ix8895z0jvci2bv4bp3m7s6xzg4"
}
diff --git a/pkgs/servers/nosql/cassandra/generic.nix b/pkgs/servers/nosql/cassandra/generic.nix
index 6a6aa65395c9..45bea6fed4c5 100644
--- a/pkgs/servers/nosql/cassandra/generic.nix
+++ b/pkgs/servers/nosql/cassandra/generic.nix
@@ -1,7 +1,7 @@
{ lib
, stdenv
, fetchurl
-, python2
+, python
, makeWrapper
, gawk
, bash
@@ -98,7 +98,7 @@ stdenv.mkDerivation rec {
fi
done
- wrapProgram $out/bin/cqlsh --prefix PATH : ${python2}/bin
+ wrapProgram $out/bin/cqlsh --prefix PATH : ${python}/bin
runHook postInstall
'';
diff --git a/pkgs/tools/admin/awscli2/default.nix b/pkgs/tools/admin/awscli2/default.nix
index b1add5d14252..2c39f4fce994 100644
--- a/pkgs/tools/admin/awscli2/default.nix
+++ b/pkgs/tools/admin/awscli2/default.nix
@@ -25,14 +25,14 @@ let
in
with py.pkgs; buildPythonApplication rec {
pname = "awscli2";
- version = "2.9.17"; # N.B: if you change this, check if overrides are still up-to-date
+ version = "2.9.18"; # N.B: if you change this, check if overrides are still up-to-date
format = "pyproject";
src = fetchFromGitHub {
owner = "aws";
repo = "aws-cli";
rev = version;
- hash = "sha256-5d/XEkM01SJj9M3e+5qbJrwWX+CU8fb097D45+Hp/Qc=";
+ hash = "sha256-WE0fBw6rBMDK+BHmZT1OXr4nu3G8y0AmdimSRi2RaPs=";
};
nativeBuildInputs = [
diff --git a/pkgs/tools/admin/pgadmin/default.nix b/pkgs/tools/admin/pgadmin/default.nix
index d5c6932c44f8..0d0b63711d2c 100644
--- a/pkgs/tools/admin/pgadmin/default.nix
+++ b/pkgs/tools/admin/pgadmin/default.nix
@@ -97,7 +97,7 @@ let
version = "4.1.5";
src = oldAttrs.src.override {
inherit version;
- sha256 = "sha256-98jKcHDv/+mls7QVWeGvGcmoYOGCspxM7w5/2RjJxoM=";
+ hash = "sha256-98jKcHDv/+mls7QVWeGvGcmoYOGCspxM7w5/2RjJxoM=";
};
propagatedBuildInputs = oldAttrs.propagatedBuildInputs ++ [
final.pythonPackages.flask_mail
diff --git a/pkgs/tools/admin/qovery-cli/default.nix b/pkgs/tools/admin/qovery-cli/default.nix
index 5354feea8c6e..cb3614eaf234 100644
--- a/pkgs/tools/admin/qovery-cli/default.nix
+++ b/pkgs/tools/admin/qovery-cli/default.nix
@@ -8,13 +8,13 @@
buildGoModule rec {
pname = "qovery-cli";
- version = "0.48.4";
+ version = "0.48.5";
src = fetchFromGitHub {
owner = "Qovery";
repo = pname;
rev = "v${version}";
- hash = "sha256-NAdY4JdUWDnawKl9D6Z4DXQP6ibn+4jHap08p0vu3Mc=";
+ hash = "sha256-umgOIjOzx8qUCcZfM3nGYeYDmqmA2ayy2lGAS+nSU2s=";
};
vendorHash = "sha256-6/TT3/98wBH9oMbPOzgvwN2nxj4RSbL2vxSMFlM5sgo=";
diff --git a/pkgs/tools/graphics/vulkan-caps-viewer/default.nix b/pkgs/tools/graphics/vulkan-caps-viewer/default.nix
index ba96d721632c..39492eefb830 100644
--- a/pkgs/tools/graphics/vulkan-caps-viewer/default.nix
+++ b/pkgs/tools/graphics/vulkan-caps-viewer/default.nix
@@ -10,13 +10,13 @@
stdenv.mkDerivation rec {
pname = "vulkan-caps-viewer";
- version = "3.27";
+ version = "3.28";
src = fetchFromGitHub {
owner = "SaschaWillems";
repo = "VulkanCapsViewer";
rev = version;
- hash = "sha256-B/FBX63JnBdshNLVMPA0qGnm0c/RGilIahX3VjJnpkI=";
+ hash = "sha256-gy0gFbPZAwQJHqJvk7WrbZ5y2I+9BGv9VaCoOW1QPek=";
# Note: this derivation strictly requires vulkan-header to be the same it was developed against.
# To help us, they've put it in a git-submodule.
# The result will work with any vulkan-loader version.
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
qmakeFlags = [
"DEFINES+=wayland"
"CONFIG+=release"
- ] ++ lib.lists.optionals withX11 [ "DEFINES+=X11" ];
+ ] ++ lib.lists.optionals withX11 [ "DEFINES+=X11" ];
installFlags = [ "INSTALL_ROOT=$(out)" ];
@@ -51,10 +51,11 @@ stdenv.mkDerivation rec {
Client application to display hardware implementation details for GPUs supporting the Vulkan API by Khronos.
The hardware reports can be submitted to a public online database that allows comparing different devices, browsing available features, extensions, formats, etc.
'';
- homepage = "https://vulkan.gpuinfo.org/";
- platforms = platforms.unix;
- license = licenses.gpl2Only;
+ homepage = "https://vulkan.gpuinfo.org/";
+ platforms = platforms.unix;
+ license = licenses.gpl2Only;
maintainers = with maintainers; [ pedrohlc ];
+ changelog = "https://github.com/SaschaWillems/VulkanCapsViewer/releases/tag/${version}";
# never built on aarch64-darwin, x86_64-darwin since first introduction in nixpkgs
broken = stdenv.isDarwin;
};
diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix
index d8181142c09f..e90b694997a9 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix
@@ -13,13 +13,13 @@ in
stdenv.mkDerivation rec {
pname = "ibus-typing-booster";
- version = "2.19.10";
+ version = "2.20.0";
src = fetchFromGitHub {
owner = "mike-fabian";
repo = "ibus-typing-booster";
rev = version;
- sha256 = "Ie3cQ1YC+LB5I5LtKyJ0RO+dyjFbVsemW110t3gPmCM=";
+ hash = "sha256-evKCKPddQ4yRgI0NDOk6iEkS4910cYhLTvicLxJEbxE=";
};
nativeBuildInputs = [ autoreconfHook pkg-config wrapGAppsHook gobject-introspection ];
diff --git a/pkgs/tools/misc/massren/default.nix b/pkgs/tools/misc/massren/default.nix
index 1273e8c63e38..885ab1b0176a 100644
--- a/pkgs/tools/misc/massren/default.nix
+++ b/pkgs/tools/misc/massren/default.nix
@@ -1,6 +1,6 @@
-{ lib, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub, fetchpatch }:
-buildGoPackage rec {
+buildGoModule rec {
pname = "massren";
version = "1.5.6";
@@ -8,10 +8,32 @@ buildGoPackage rec {
owner = "laurent22";
repo = "massren";
rev = "v${version}";
- sha256 = "sha256-17y+vmspvZKKRRaEwzP3Zya4r/z+2aSGG6oNZiA8D64=";
+ hash = "sha256-17y+vmspvZKKRRaEwzP3Zya4r/z+2aSGG6oNZiA8D64=";
};
- goPackagePath = "github.com/laurent22/massren";
+ vendorHash = null;
+
+ patches = [
+ # Add Go Modules support
+ (fetchpatch {
+ url = "https://github.com/laurent22/massren/commit/83df215b6e112d1ec375b08d8c44dadc5107155d.patch";
+ hash = "sha256-FMTmUrv6zGq11vexUirAuK3H6r78RtoipqyWoh+pzrs=";
+ })
+ ];
+
+ ldflags = [ "-s" "-w" ];
+
+ preCheck =
+ let
+ skippedTests = [
+ # Possible error about github.com/mattn/go-sqlite3
+ "Test_guessEditorCommand"
+ "Test_processFileActions"
+ ];
+ in
+ ''
+ buildFlagsArray+=("-run" "[^(${builtins.concatStringsSep "|" skippedTests})]")
+ '';
meta = with lib; {
description = "Easily rename multiple files using your text editor";
diff --git a/pkgs/tools/misc/parquet-tools/default.nix b/pkgs/tools/misc/parquet-tools/default.nix
index 5cb5d4f96803..38a71dd02a13 100644
--- a/pkgs/tools/misc/parquet-tools/default.nix
+++ b/pkgs/tools/misc/parquet-tools/default.nix
@@ -1,6 +1,5 @@
{ lib
, fetchFromGitHub
-, fetchpatch
, python3Packages
}:
@@ -8,36 +7,34 @@ with python3Packages;
buildPythonApplication rec {
pname = "parquet-tools";
- version = "0.2.9";
- disabled = pythonOlder "3.8";
+ version = "0.2.12";
format = "pyproject";
src = fetchFromGitHub {
owner = "ktrueda";
repo = "parquet-tools";
- rev = version;
- sha256 = "0aw0x7lhagp4dwis09fsizr7zbhdpliav0ns5ll5qny7x4m6rkfy";
+ rev = "refs/tags/${version}";
+ hash = "sha256-5bK+kW550DgBhcH5INozwGKKjM+xXblmFg2Tu2rnos4=";
};
- patches = [
- (fetchpatch {
- url = "https://github.com/ktrueda/parquet-tools/commit/1c70a07e1c9f17c8890d23aad3ded5dd6c706cb3.patch";
- sha256 = "08j1prdqj8ksw8gwiyj7ivshk82ahmywbzmywclw52nlnniig0sa";
- })
- ];
-
postPatch = ''
- substituteInPlace pyproject.toml \
- --replace 'thrift = "^0.13.0"' 'thrift = "*"' \
- --replace 'halo = "^0.0.29"' 'halo = "*"'
substituteInPlace tests/test_inspect.py \
--replace "parquet-cpp-arrow version 5.0.0" "parquet-cpp-arrow version ${pyarrow.version}" \
--replace "serialized_size: 2222" "serialized_size: 2221" \
--replace "format_version: 1.0" "format_version: 2.6"
'';
- nativeBuildInputs = [ poetry-core ];
+ pythonRelaxDeps = [
+ "halo"
+ "tabulate"
+ "thrift"
+ ];
+
+ nativeBuildInputs = [
+ poetry-core
+ pythonRelaxDepsHook
+ ];
propagatedBuildInputs = [
boto3
@@ -50,20 +47,25 @@ buildPythonApplication rec {
];
nativeCheckInputs = [
- pytestCheckHook
moto
pytest-mock
+ pytestCheckHook
];
disabledTests = [
- # these tests try to read python code as parquet and fail
+ # These tests try to read Python code as parquet and fail
"test_local_wildcard"
"test_local_and_s3_wildcard_files"
];
+ pythonImportsCheck = [
+ "parquet_tools"
+ ];
+
meta = with lib; {
description = "A CLI tool for parquet files";
homepage = "https://github.com/ktrueda/parquet-tools";
+ changelog = "https://github.com/ktrueda/parquet-tools/releases/tag/${version}";
license = licenses.mit;
maintainers = with maintainers; [ cpcloud ];
};
diff --git a/pkgs/tools/networking/httplab/default.nix b/pkgs/tools/networking/httplab/default.nix
index 40851d370c79..4d4a798833ea 100644
--- a/pkgs/tools/networking/httplab/default.nix
+++ b/pkgs/tools/networking/httplab/default.nix
@@ -1,19 +1,28 @@
-{ lib, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub, fetchpatch }:
-buildGoPackage rec {
+buildGoModule rec {
pname = "httplab";
version = "0.4.0";
- rev = "v${version}";
-
- goPackagePath = "github.com/gchaincl/httplab";
src = fetchFromGitHub {
owner = "gchaincl";
repo = "httplab";
- inherit rev;
- sha256 = "0442nnpxyfl2gi9pilv7q6cxs2cd98wblg8d4nw6dx98yh4h99zs";
+ rev = "v${version}";
+ hash = "sha256-+qcECfQo9Wa4JQ09ujhKjQndmcFn03hTfII636+1ghA=";
};
+ vendorHash = null;
+
+ patches = [
+ # Add Go Modules support
+ (fetchpatch {
+ url = "https://github.com/qustavo/httplab/commit/80680bebc83f1ed19216f60339c62cd9213d736b.patch";
+ hash = "sha256-y4KO3FGwKNAfM+4uR3KDbV90d/4JeBGvWtfirDJrWZk=";
+ })
+ ];
+
+ ldflags = [ "-s" "-w" ];
+
meta = with lib; {
homepage = "https://github.com/gchaincl/httplab";
description = "Interactive WebServer";
diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index 73e715bddb38..1534de533cbe 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -107,11 +107,11 @@ in lib.makeExtensible (self: {
};
nix_2_13 = common {
- version = "2.13.1";
- sha256 = "sha256-uXh4+xjJUHQSCg+LHh6+SSYtMdjKQiTXMZ4uZFwzdq4=";
+ version = "2.13.2";
+ sha256 = "sha256-MtVatZVsV+dtjdD4AC4bztrnDFas+WZYHzQMt41FwzU=";
};
- stable = self.nix_2_12;
+ stable = self.nix_2_13;
- unstable = self.nix_2_13;
+ unstable = self.stable;
})
diff --git a/pkgs/tools/security/echidna/default.nix b/pkgs/tools/security/echidna/default.nix
index 8a902068d27b..fcd94f66fbc5 100644
--- a/pkgs/tools/security/echidna/default.nix
+++ b/pkgs/tools/security/echidna/default.nix
@@ -10,13 +10,13 @@
}:
mkDerivation rec {
pname = "echidna";
- version = "2.0.4";
+ version = "2.0.5";
src = fetchFromGitHub {
owner = "crytic";
repo = "echidna";
rev = "v${version}";
- sha256 = "sha256-DiEZGbd08QLP8zgrIssGYL6h18AprcWZSYp1mMu9TRw=";
+ sha256 = "sha256-8bChe+qA4DowfuwsR5wLckb56fXi102g8vL2gAH/kYE=";
};
isLibrary = true;
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 565ce41c5c68..7ac2ca83654b 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -343,7 +343,6 @@ mapAliases ({
debian_devscripts = throw "'debian_devscripts' has been renamed to/replaced by 'debian-devscripts'"; # Converted to throw 2022-02-22
debugedit-unstable = debugedit; # Added 2021-11-22
- deepin = throw "deepin was a work in progress and it has been canceled and removed https://github.com/NixOS/nixpkgs/issues/94870"; # added 2020-08-31
deepspeech = throw "deepspeech was removed in favor of stt. https://github.com/NixOS/nixpkgs/issues/119496"; # added 2021-05-05
deisctl = throw "deisctl was removed ; the service does not exist anymore"; # added 2022-02-06
deis = throw "deis was removed ; the service does not exist anymore"; # added 2022-02-06
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 169dbf628e32..a0a56b8e46ca 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8650,6 +8650,7 @@ with pkgs;
kakoune-unwrapped = callPackage ../applications/editors/kakoune {
# See comments on https://github.com/NixOS/nixpkgs/pull/198836
# Remove below when stdenv for linux-aarch64 become recent enough.
+ # https://github.com/NixOS/nixpkgs/issues/201254
stdenv = if stdenv.isLinux && stdenv.isAarch64 && stdenv.cc.isGNU then gcc11Stdenv else stdenv;
};
kakoune = wrapKakoune kakoune-unwrapped {
@@ -20840,9 +20841,7 @@ with pkgs;
libedit = callPackage ../development/libraries/libedit { };
- libelf = if stdenv.isFreeBSD
- then callPackage ../development/libraries/libelf-freebsd { }
- else callPackage ../development/libraries/libelf { };
+ libelf = callPackage ../development/libraries/libelf { };
libelfin = callPackage ../development/libraries/libelfin { };
@@ -24100,6 +24099,7 @@ with pkgs;
# Effective Cassandra 4.0.2 there is full Java 11 support
# -- https://cassandra.apache.org/doc/latest/cassandra/new/java11.html
jre = pkgs.jdk11_headless;
+ python = python3;
};
cassandra = cassandra_3_11;
@@ -30660,6 +30660,7 @@ with pkgs;
ladspa-sdk = callPackage ../applications/audio/ladspa-sdk { };
ladybird = qt6Packages.callPackage ../applications/networking/browsers/ladybird {
+ # https://github.com/NixOS/nixpkgs/issues/201254
stdenv = if stdenv.isDarwin then llvmPackages_14.stdenv else gcc11Stdenv;
};
@@ -34156,6 +34157,8 @@ with pkgs;
inherit (nodePackages) zx;
+ zxfer = callPackage ../applications/system/zxfer {};
+
zynaddsubfx = callPackage ../applications/audio/zynaddsubfx {
guiModule = "zest";
fftw = fftwSinglePrec;
@@ -35732,6 +35735,8 @@ with pkgs;
cinnamon = recurseIntoAttrs (callPackage ../desktops/cinnamon { });
inherit (cinnamon) mint-x-icons mint-y-icons;
+ deepin = recurseIntoAttrs (callPackage ../desktops/deepin { });
+
enlightenment = recurseIntoAttrs (callPackage ../desktops/enlightenment { });
gnome2 = recurseIntoAttrs (callPackage ../desktops/gnome-2 { });
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index b4beafcfd3c4..6a1c4bcf5db9 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -406,7 +406,7 @@ in {
ghcHEAD = callPackage ../development/haskell-modules {
buildHaskellPackages = bh.packages.ghcHEAD;
ghc = bh.compiler.ghcHEAD;
- compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-head.nix { };
+ compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.8.x.nix { };
};
ghcjs = packages.ghcjs810;