diff --git a/nixos/modules/misc/locate.nix b/nixos/modules/misc/locate.nix index 5561b5e126c0..3638bebed931 100644 --- a/nixos/modules/misc/locate.nix +++ b/nixos/modules/misc/locate.nix @@ -157,7 +157,7 @@ in { pruneNames = mkOption { type = listOf str; - default = []; + default = [ ".bzr" ".cache" ".git" ".hg" ".svn" ]; description = '' Directory components which should exclude paths containing them from indexing ''; diff --git a/nixos/modules/profiles/base.nix b/nixos/modules/profiles/base.nix index 3b67d628f9fd..33dd80d7c5ab 100644 --- a/nixos/modules/profiles/base.nix +++ b/nixos/modules/profiles/base.nix @@ -40,6 +40,7 @@ # Tools to create / manipulate filesystems. pkgs.ntfsprogs # for resizing NTFS partitions pkgs.dosfstools + pkgs.mtools pkgs.xfsprogs.bin pkgs.jfsutils pkgs.f2fs-tools diff --git a/nixos/modules/services/monitoring/cadvisor.nix b/nixos/modules/services/monitoring/cadvisor.nix index da051dbe4655..dfbf07efcaea 100644 --- a/nixos/modules/services/monitoring/cadvisor.nix +++ b/nixos/modules/services/monitoring/cadvisor.nix @@ -111,6 +111,8 @@ in { wantedBy = [ "multi-user.target" ]; after = [ "network.target" "docker.service" "influxdb.service" ]; + path = optionals config.boot.zfs.enabled [ pkgs.zfs ]; + postStart = mkBefore '' until ${pkgs.curl.bin}/bin/curl -s -o /dev/null 'http://${cfg.listenAddress}:${toString cfg.port}/containers/'; do sleep 1; diff --git a/nixos/modules/services/x11/hardware/libinput.nix b/nixos/modules/services/x11/hardware/libinput.nix index e2fb7d0918e3..efdb7c61dfae 100644 --- a/nixos/modules/services/x11/hardware/libinput.nix +++ b/nixos/modules/services/x11/hardware/libinput.nix @@ -13,7 +13,7 @@ let cfg = config.services.xserver.libinput; example = "/dev/input/event0"; description = '' - Path for ${deviceType} device. Set to null to apply to any + Path for ${deviceType} device. Set to null to apply to any auto-detected ${deviceType}. ''; }; @@ -24,8 +24,8 @@ let cfg = config.services.xserver.libinput; example = "flat"; description = '' - Sets the pointer acceleration profile to the given profile. - Permitted values are adaptive, flat. + Sets the pointer acceleration profile to the given profile. + Permitted values are adaptive, flat. Not all devices support this option or all profiles. If a profile is unsupported, the default profile for this is used. flat: Pointer motion is accelerated by a constant @@ -38,12 +38,14 @@ let cfg = config.services.xserver.libinput; accelSpeed = mkOption { type = types.nullOr types.str; default = null; + example = "-0.5"; description = "Cursor acceleration (how fast speed increases from minSpeed to maxSpeed)."; }; buttonMapping = mkOption { type = types.nullOr types.str; default = null; + example = "1 6 3 4 5 0 7"; description = '' Sets the logical button mapping for this device, see XSetPointerMapping(3). The string must @@ -58,9 +60,10 @@ let cfg = config.services.xserver.libinput; calibrationMatrix = mkOption { type = types.nullOr types.str; default = null; + example = "0.5 0 0 0 0.8 0.1 0 0 1"; description = '' - A string of 9 space-separated floating point numbers. Sets the calibration matrix to the + A string of 9 space-separated floating point numbers. Sets the calibration matrix to the 3x3 matrix where the first row is (abc), the second row is (def) and the third row is (ghi). ''; }; @@ -68,6 +71,7 @@ let cfg = config.services.xserver.libinput; clickMethod = mkOption { type = types.nullOr (types.enum [ "none" "buttonareas" "clickfinger" ]); default = null; + example = "buttonareas"; description = '' Enables a click method. Permitted values are none, @@ -166,8 +170,9 @@ let cfg = config.services.xserver.libinput; transformationMatrix = mkOption { type = types.nullOr types.str; default = null; + example = "0.5 0 0 0 0.8 0.1 0 0 1"; description = '' - A string of 9 space-separated floating point numbers. Sets the transformation matrix to + A string of 9 space-separated floating point numbers. Sets the transformation matrix to the 3x3 matrix where the first row is (abc), the second row is (def) and the third row is (ghi). ''; }; diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix index 6ce4461babc7..67fde55faabe 100644 --- a/nixos/modules/virtualisation/qemu-vm.nix +++ b/nixos/modules/virtualisation/qemu-vm.nix @@ -306,7 +306,7 @@ in virtualisation.msize = mkOption { type = types.ints.positive; - default = 16384; + default = pkgs.vmTools.default9PMsizeBytes; description = '' The msize (maximum packet size) option passed to 9p file systems, in diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 985dbd3b6767..a74792d3d2eb 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -228,9 +228,10 @@ in kubernetes = handleTestOn ["x86_64-linux"] ./kubernetes {}; latestKernel.login = handleTest ./login.nix { latestKernel = true; }; leaps = handleTest ./leaps.nix {}; + libinput = handleTest ./libinput.nix {}; libreddit = handleTest ./libreddit.nix {}; - lidarr = handleTest ./lidarr.nix {}; libreswan = handleTest ./libreswan.nix {}; + lidarr = handleTest ./lidarr.nix {}; lightdm = handleTest ./lightdm.nix {}; limesurvey = handleTest ./limesurvey.nix {}; litestream = handleTest ./litestream.nix {}; diff --git a/nixos/tests/libinput.nix b/nixos/tests/libinput.nix new file mode 100644 index 000000000000..2f84aaadcd0b --- /dev/null +++ b/nixos/tests/libinput.nix @@ -0,0 +1,38 @@ +import ./make-test-python.nix ({ ... }: + +{ + name = "libinput"; + + machine = { ... }: + { + imports = [ + ./common/x11.nix + ./common/user-account.nix + ]; + + test-support.displayManager.auto.user = "alice"; + + services.xserver.libinput = { + enable = true; + mouse = { + naturalScrolling = true; + leftHanded = true; + middleEmulation = false; + horizontalScrolling = false; + }; + }; + }; + + testScript = '' + def expect_xserver_option(option, value): + machine.succeed(f"""cat /var/log/X.0.log | grep -F 'Option "{option}" "{value}"'""") + + machine.start() + machine.wait_for_x() + machine.succeed("""cat /var/log/X.0.log | grep -F "Using input driver 'libinput'" """) + expect_xserver_option("NaturalScrolling", "on") + expect_xserver_option("LeftHanded", "on") + expect_xserver_option("MiddleEmulation", "off") + expect_xserver_option("HorizontalScrolling", "off") + ''; +}) diff --git a/pkgs/applications/blockchains/clightning/default.nix b/pkgs/applications/blockchains/clightning/default.nix index 04f3c1fcbc84..df7eace3284d 100644 --- a/pkgs/applications/blockchains/clightning/default.nix +++ b/pkgs/applications/blockchains/clightning/default.nix @@ -39,11 +39,9 @@ stdenv.mkDerivation rec { devtools/sql-rewrite.py ''; - configurePhase = '' - ./configure --prefix=$out --disable-developer --disable-valgrind - ''; + configureFlags = [ "--disable-developer" "--disable-valgrind" ]; - makeFlags = [ "prefix=$(out) VERSION=v${version}" ]; + makeFlags = [ "VERSION=v${version}" ]; enableParallelBuilding = true; diff --git a/pkgs/applications/blockchains/ledger-live-desktop/default.nix b/pkgs/applications/blockchains/ledger-live-desktop/default.nix index ac24baa934a4..eb44dc219b66 100644 --- a/pkgs/applications/blockchains/ledger-live-desktop/default.nix +++ b/pkgs/applications/blockchains/ledger-live-desktop/default.nix @@ -2,12 +2,12 @@ let pname = "ledger-live-desktop"; - version = "2.35.0"; + version = "2.35.1"; name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/LedgerHQ/${pname}/releases/download/v${version}/${pname}-${version}-linux-x86_64.AppImage"; - hash = "sha256-o2XGBTqyHqQ/yq54B0GBFEk35Zxt2ZWGZCTjbEbKqiw="; + hash = "sha256:0z60c4sjq63r5rs95rbv7afliia05l1p9bgfd5zv7i51qxgzfs4a"; }; appimageContents = appimageTools.extractType2 { diff --git a/pkgs/applications/misc/gpxsee/default.nix b/pkgs/applications/misc/gpxsee/default.nix index 85fef2cbb00d..84651b78121a 100644 --- a/pkgs/applications/misc/gpxsee/default.nix +++ b/pkgs/applications/misc/gpxsee/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "gpxsee"; - version = "9.11"; + version = "9.12"; src = fetchFromGitHub { owner = "tumic0"; repo = "GPXSee"; rev = version; - sha256 = "sha256-5FGdcmkVOxjDngVQIlXnH3OPRMjaixqJ2Xb239usUuo="; + sha256 = "sha256-hIDphwmS4UNSTvE+Icupipo6AmT2fiPdaufT/I3EeJ4="; }; patches = (substituteAll { @@ -23,7 +23,7 @@ mkDerivation rec { lrelease gpxsee.pro ''; - postInstall = with stdenv; lib.optionalString isDarwin '' + postInstall = lib.optionalString stdenv.isDarwin '' mkdir -p $out/Applications mv GPXSee.app $out/Applications ''; diff --git a/pkgs/applications/misc/ulauncher/default.nix b/pkgs/applications/misc/ulauncher/default.nix index d2df076dc23d..63a8b485df53 100644 --- a/pkgs/applications/misc/ulauncher/default.nix +++ b/pkgs/applications/misc/ulauncher/default.nix @@ -33,6 +33,7 @@ python3Packages.buildPythonApplication rec { distutils_extra intltool wrapGAppsHook + gdk-pixbuf ]; buildInputs = [ @@ -58,6 +59,7 @@ python3Packages.buildPythonApplication rec { pyinotify python-Levenshtein pyxdg + pycairo requests websocket-client ]; @@ -105,7 +107,10 @@ python3Packages.buildPythonApplication rec { # do not double wrap dontWrapGApps = true; preFixup = '' - makeWrapperArgs+=("''${gappsWrapperArgs[@]}" --prefix PATH : "${lib.makeBinPath [ wmctrl ]}") + makeWrapperArgs+=( + "''${gappsWrapperArgs[@]}" + --prefix PATH : "${lib.makeBinPath [ wmctrl ]}" + ) ''; passthru = { diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 3023bb6c7ac1..2f2e143af759 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -229,12 +229,13 @@ "version": "0.1.0" }, "consul": { - "owner": "terraform-providers", + "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/consul", "repo": "terraform-provider-consul", - "rev": "v2.8.0", - "sha256": "1brd0fp9ksc3x8cygxm0k2q1sh4v5x89298pnidg6xirn41lvcr4", - "version": "2.8.0" + "rev": "v2.14.0", + "sha256": "19kmjjg4f74askwwwslbh5wvi5ndcr4wzm0374qr8gc57qiwxkpy", + "vendorSha256": null, + "version": "2.14.0" }, "ct": { "owner": "poseidon", @@ -362,11 +363,13 @@ "version": "1.1.0" }, "github": { - "owner": "terraform-providers", + "owner": "integrations", + "provider-source-address": "registry.terraform.io/integrations/github", "repo": "terraform-provider-github", - "rev": "v3.1.0", - "sha256": "1xl4fd1lfbn1vnrdmg2xljnv8hy6rmf0iv7g8pzbnzbvj2pi7w3b", - "version": "3.1.0" + "rev": "v4.18.0", + "sha256": "0vr7vxlpq1lbp85qm2084w7mqkz5yp7gxj5ln29plhm7xjpd87bp", + "vendorSha256": null, + "version": "4.18.0" }, "gitlab": { "owner": "gitlabhq", @@ -687,11 +690,13 @@ "version": "0.0.1" }, "nomad": { - "owner": "terraform-providers", + "owner": "hashicorp", + "provider-source-address": "registry.terraform.io/hashicorp/nomad", "repo": "terraform-provider-nomad", - "rev": "v1.4.5", - "sha256": "1sccm4mspjn92ky6nscsrmbb573mx53wzsvvapsf2p4119h9s30i", - "version": "1.4.5" + "rev": "v1.4.15", + "sha256": "18rrvp7h27f51di8hajl2jb53v7wadqv4241rxdx1d180fas69k1", + "vendorSha256": "1y5wpilnqn17zbi88z23159gx2p57a9c10ajb7gn9isbxfdqj9mb", + "version": "1.4.15" }, "ns1": { "owner": "terraform-providers", @@ -1109,8 +1114,8 @@ "repo": "terraform-provider-vault", "rev": "v2.24.1", "sha256": "1xk14q06js774lqyylkbp53dnlsbgh3vi38mqqmndh80xigs6d99", - "version": "2.24.1", - "vendorSha256": "1ksla455qfgxpk2dmq3pg52nyyw3v0bg6fm5s60j6cb0lzvjbq48" + "vendorSha256": "1ksla455qfgxpk2dmq3pg52nyyw3v0bg6fm5s60j6cb0lzvjbq48", + "version": "2.24.1" }, "vcd": { "owner": "terraform-providers", diff --git a/pkgs/applications/networking/cluster/terraform-providers/update-provider b/pkgs/applications/networking/cluster/terraform-providers/update-provider index f97bbce83faa..03d92452ebc2 100755 --- a/pkgs/applications/networking/cluster/terraform-providers/update-provider +++ b/pkgs/applications/networking/cluster/terraform-providers/update-provider @@ -165,7 +165,7 @@ if [[ -z "$vendorSha256" ]]; then vendorSha256=$(echo "${BASH_REMATCH[1]#sha256:}" | head -n 1) # Deal with nix unstable if [[ $vendorSha256 = sha256-* ]]; then - vendorSha256=$(nix to-base32 "$vendorSha256") + vendorSha256=$(nix --extra-experimental-features nix-command hash to-base32 "$vendorSha256") fi fi fi diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-googlechat/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-googlechat/default.nix new file mode 100644 index 000000000000..b274b55ac228 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-googlechat/default.nix @@ -0,0 +1,27 @@ +{ lib, stdenv, fetchFromGitHub, pidgin, glib, json-glib, protobuf, protobufc }: + +stdenv.mkDerivation { + pname = "purple-googlechat"; + version = "unstable-2021-10-18"; + + src = fetchFromGitHub { + owner = "EionRobb"; + repo = "purple-googlechat"; + rev = "56ba7f79883eca67d37629d365776f6c0b40abdc"; + sha256 = "sha256-iTYVgYI9+6rqqBl5goeEAXpK8FgHDv0MmPsV/82reWA="; + }; + + nativeBuildInputs = [ protobufc ]; + buildInputs = [ pidgin glib json-glib protobuf ]; + + PKG_CONFIG_PURPLE_PLUGINDIR = "${placeholder "out"}/lib/purple-2"; + PKG_CONFIG_PURPLE_DATADIR = "${placeholder "out"}/share"; + + meta = with lib; { + homepage = "https://github.com/EionRobb/purple-googlechat"; + description = "Native Google Chat support for pidgin"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ dtzWill ]; + }; +} diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index a6633d11286f..a0f3b5efbaeb 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -110,7 +110,7 @@ rec { echo "mounting Nix store..." mkdir -p /fs${storeDir} - mount -t 9p store /fs${storeDir} -o trans=virtio,version=9p2000.L,cache=loose + mount -t 9p store /fs${storeDir} -o trans=virtio,version=9p2000.L,cache=loose,msize=${toString default9PMsizeBytes} mkdir -p /fs/tmp /fs/run /fs/var mount -t tmpfs -o "mode=1777" none /fs/tmp @@ -119,7 +119,7 @@ rec { echo "mounting host's temporary directory..." mkdir -p /fs/tmp/xchg - mount -t 9p xchg /fs/tmp/xchg -o trans=virtio,version=9p2000.L + mount -t 9p xchg /fs/tmp/xchg -o trans=virtio,version=9p2000.L,msize=${toString default9PMsizeBytes} mkdir -p /fs/proc mount -t proc none /fs/proc @@ -1174,4 +1174,9 @@ rec { `debDistros' sets. */ diskImages = lib.mapAttrs (name: f: f {}) diskImageFuns; + # The default 9P msize value is 8 KiB, which according to QEMU is + # insufficient and would degrade performance. + # See: https://wiki.qemu.org/Documentation/9psetup#msize + # Use 500 KiB as a conservative default, see also https://github.com/NixOS/nixpkgs/pull/142577#issuecomment-953848731 + default9PMsizeBytes = 512000; } diff --git a/pkgs/data/misc/hackage/pin.json b/pkgs/data/misc/hackage/pin.json index 996e993d8003..ba70f6f76ad0 100644 --- a/pkgs/data/misc/hackage/pin.json +++ b/pkgs/data/misc/hackage/pin.json @@ -1,6 +1,6 @@ { - "commit": "da98cdcb5ec11aea3b1979174b3b1cab24014908", - "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/da98cdcb5ec11aea3b1979174b3b1cab24014908.tar.gz", - "sha256": "14qdmvlqkaixv331g1lfr8hghrvzdx45xhn69fz1g7zhv4w88jix", - "msg": "Update from Hackage at 2021-11-05T06:34:09Z" + "commit": "f38385b8e3e064360be513204f114418ea0206de", + "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/f38385b8e3e064360be513204f114418ea0206de.tar.gz", + "sha256": "08yrxx2cslwbbrcrjn13va2vbynjrwfbkc3fs4mf9qc17bdvxmgj", + "msg": "Update from Hackage at 2021-11-12T03:22:57Z" } diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index 9c0dd63f1b9d..cb56087fe1b2 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -41,7 +41,7 @@ , # Whether to build terminfo. enableTerminfo ? !stdenv.targetPlatform.isWindows -, version ? "9.3.20210913" +, version ? "9.3.20211111" , # What flavour to build. An empty string indicates no # specific flavour and falls back to ghc default values. ghcFlavour ? lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) @@ -160,8 +160,8 @@ stdenv.mkDerivation (rec { src = fetchgit { url = "https://gitlab.haskell.org/ghc/ghc.git/"; - rev = "64923cf295ea914db458547432237a5ed1eff571"; - sha256 = "1s9sm4gf4r71lk0s7h9v217rxfwjf435q1jji90hlxz23wvmhr6d"; + rev = "cc635da167fdec2dead0603b0026cb841f0aa645"; + sha256 = "1lj76l546zriwkcn2r7i5a4j35bx9fh5iggwfz2xvhh8aq8j2i46"; }; enableParallelBuilding = true; diff --git a/pkgs/development/compilers/ghcjs/8.10/default.nix b/pkgs/development/compilers/ghcjs/8.10/default.nix index 6b8a251197d8..b6c2f7e72ee0 100644 --- a/pkgs/development/compilers/ghcjs/8.10/default.nix +++ b/pkgs/development/compilers/ghcjs/8.10/default.nix @@ -3,7 +3,7 @@ , callPackage , fetchgit , ghcjsSrcJson ? null -, ghcjsSrc ? fetchgit lib.importJSON ghcjsSrcJson +, ghcjsSrc ? fetchgit (lib.importJSON ghcjsSrcJson) , bootPkgs , stage0 , haskellLib diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 8622debdf585..83e9ea32509f 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -15,6 +15,9 @@ with haskellLib; self: super: { + # There are numerical tests on random data, that may fail occasionally + lapack = dontCheck super.lapack; + # Arion's test suite needs a Nixpkgs, which is cumbersome to do from Nixpkgs # itself. For instance, pkgs.path has dirty sources and puts a huge .git in the # store. Testing is done upstream. @@ -60,7 +63,7 @@ self: super: { # The Hackage tarball is purposefully broken, because it's not intended to be, like, useful. # https://git-annex.branchable.com/bugs/bash_completion_file_is_missing_in_the_6.20160527_tarball_on_hackage/ - git-annex = (overrideSrc { + git-annex = overrideCabal (drv: { src = pkgs.fetchgit { name = "git-annex-${super.git-annex.version}-src"; url = "git://git-annex.branchable.com/"; @@ -74,11 +77,15 @@ self: super: { rm -r $out/doc/?ndroid* ''; }; - } super.git-annex).override { - dbus = if pkgs.stdenv.isLinux then self.dbus else null; - fdo-notify = if pkgs.stdenv.isLinux then self.fdo-notify else null; - hinotify = if pkgs.stdenv.isLinux then self.hinotify else self.fsnotify; - }; + patches = [ + # Allows compilation with git-lfs 1.2.0 + (pkgs.fetchpatch { + url = "https://git.joeyh.name/index.cgi/git-annex.git/patch/?id=f3326b8b5ae4d1caa5c6e3e192c58c6e064c425a"; + sha256 = "1nzg4mna462ndylisyy3nfih49aznhzzf7b3krb4p9p0j1zrcy2s"; + excludes = [ "doc/**" "CHANGELOG" ]; + }) + ] ++ (drv.patches or []); + }) super.git-annex; # Fix test trying to access /home directory shell-conduit = overrideCabal (drv: { @@ -844,7 +851,7 @@ self: super: { # hledger-lib 1.23 depends on doctest >= 0.18 hledger-lib_1_23 = super.hledger-lib_1_23.override { - doctest = self.doctest_0_18_1; + doctest = self.doctest_0_18_2; }; # Copy hledger man pages from data directory into the proper place. This code @@ -1338,21 +1345,21 @@ self: super: { resource-pool = self.hasura-resource-pool; ekg-core = self.hasura-ekg-core; ekg-json = self.hasura-ekg-json; - hspec = dontCheck self.hspec_2_8_3; - hspec-core = dontCheck self.hspec-core_2_8_3; - hspec-discover = dontCheck super.hspec-discover_2_8_3; + hspec = dontCheck self.hspec_2_8_4; + hspec-core = dontCheck self.hspec-core_2_8_4; + hspec-discover = dontCheck super.hspec-discover_2_8_4; tasty-hspec = self.tasty-hspec_1_2; })); hasura-ekg-core = super.hasura-ekg-core.overrideScope (self: super: { - hspec = dontCheck self.hspec_2_8_3; - hspec-core = dontCheck self.hspec-core_2_8_3; - hspec-discover = dontCheck super.hspec-discover_2_8_3; + hspec = dontCheck self.hspec_2_8_4; + hspec-core = dontCheck self.hspec-core_2_8_4; + hspec-discover = dontCheck super.hspec-discover_2_8_4; }); hasura-ekg-json = super.hasura-ekg-json.overrideScope (self: super: { ekg-core = self.hasura-ekg-core; - hspec = dontCheck self.hspec_2_8_3; - hspec-core = dontCheck self.hspec-core_2_8_3; - hspec-discover = dontCheck super.hspec-discover_2_8_3; + hspec = dontCheck self.hspec_2_8_4; + hspec-core = dontCheck self.hspec-core_2_8_4; + hspec-discover = dontCheck super.hspec-discover_2_8_4; }); pg-client = overrideCabal (drv: { librarySystemDepends = with pkgs; [ postgresql krb5.dev openssl.dev ]; @@ -1427,9 +1434,10 @@ self: super: { # 2021-09-14: Tests are broken because of undeterministic variable names hls-tactics-plugin = dontCheck super.hls-tactics-plugin; - # 2021-03-21 Test hangs + # 2021-03-21: Test hangs # https://github.com/haskell/haskell-language-server/issues/1562 - ghcide = dontCheck super.ghcide; + # 2021-11-13: Too strict upper bound on implicit-hie-cradle + ghcide = doJailbreak (dontCheck super.ghcide); data-tree-print = doJailbreak super.data-tree-print; @@ -2070,15 +2078,13 @@ EOT # file revision on hackage was gifted CRLF line endings gogol-core = appendPatch ./patches/gogol-core-144.patch super.gogol-core; - # 2021-11-05: patch to permit our language-docker version - # This is based on c931c0a9689cd6dff4d2083fa002414c1f08a586 from - # language-docker upstream - hadolint = appendPatch (pkgs.fetchpatch { - url = "https://github.com/hadolint/hadolint/commit/c931c0a9689cd6dff4d2083fa002414c1f08a586.patch"; - sha256 = "1kv06hfn7lgrcrg56q8lq0pvdffqvmjbshazg3prlhl3kjs541f8"; - excludes = [ "stack.yaml" "package.yaml" "hadolint.cabal" ]; - }) (super.hadolint.override { + # Jailbreak isn't sufficient, but this is ok as it's a leaf package. + hadolint = super.hadolint.overrideScope (self: super: { language-docker = self.language-docker_10_3_0; + hspec = dontCheck self.hspec_2_8_4; + hspec-core = dontCheck self.hspec-core_2_8_4; + hspec-discover = dontCheck self.hspec-discover_2_8_4; + colourista = doJailbreak super.colourista; }); # These should be updated in lockstep @@ -2086,4 +2092,9 @@ EOT hledger-lib = self.hledger-lib_1_23; }; + # Needs brick > 0.64 + nix-tree = super.nix-tree.override { + brick = self.brick_0_64_2; + }; + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix index b461b45af02d..6aae6f1c6385 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix @@ -92,7 +92,7 @@ self: super: { url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/fe192e12b88b09499d4aff0e562713e820544bd6/patches/alex-3.2.6.patch"; sha256 = "1rzs764a0nhx002v4fadbys98s6qblw4kx4g46galzjf5f7n2dn4"; }) (dontCheck super.alex); - doctest = dontCheck (doJailbreak super.doctest_0_18_1); + doctest = dontCheck (doJailbreak super.doctest_0_18_2); language-haskell-extract = appendPatch (pkgs.fetchpatch { url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/master/patches/language-haskell-extract-0.2.4.patch"; sha256 = "0rgzrq0513nlc1vw7nw4km4bcwn4ivxcgi33jly4a7n3c1r32v1f"; 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 ffe7f0868cf0..e2fca5199a61 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix @@ -66,11 +66,6 @@ self: super: { sha256 = "0c8n2krz827cv87p3vb1vpl3v0k255aysjx9lq44gz3z1dhxd64z"; }) super.basement); - cereal = appendPatch (pkgs.fetchpatch { - url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/dfd024c9a336c752288ec35879017a43bd7e85a0/patches/cereal-0.5.8.1.patch"; - sha256 = "03v4nxwz9y6viaa8anxcmp4zdf2clczv4pf9fqq6lnpplpz5i128"; - }) (doJailbreak super.cereal); - # Tests fail because of typechecking changes conduit = dontCheck super.conduit; @@ -84,10 +79,7 @@ self: super: { Cabal = self.Cabal_3_6_2_0; }); - doctest = appendPatch (pkgs.fetchpatch { - url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/dfd024c9a336c752288ec35879017a43bd7e85a0/patches/doctest-0.18.1.patch"; - sha256 = "030kdsk0fg08cgdcjpyv6z8ym1vkkrbd34aacs91y5hqzc9g79y1"; - }) (dontCheck (doJailbreak super.doctest_0_18_1)); + doctest = dontCheck (doJailbreak super.doctest_0_18_2); # Tests fail in GHC 9.2 extra = dontCheck super.extra; @@ -115,7 +107,7 @@ self: super: { ghc-lib-parser-ex = self.ghc-lib-parser-ex_9_2_0_1; hackage-security = doJailbreak super.hackage-security; hashable = super.hashable_1_4_0_0; - hashable-time = doJailbreak super.hashable-time; + hashable-time = doJailbreak super.hashable-time_0_3; hedgehog = doJailbreak super.hedgehog; HTTP = overrideCabal (drv: { postPatch = "sed -i -e 's,! Socket,!Socket,' Network/TCP.hs"; }) (doJailbreak super.HTTP); integer-logarithms = overrideCabal (drv: { postPatch = "sed -i -e 's, <1.1, <1.3,' integer-logarithms.cabal"; }) (doJailbreak super.integer-logarithms); @@ -142,7 +134,7 @@ self: super: { tasty-hspec = doJailbreak super.tasty-hspec; th-desugar = self.th-desugar_1_13; these = doJailbreak super.these; - time-compat = doJailbreak super.time-compat; + time-compat = doJailbreak super.time-compat_1_9_6_1; type-equality = doJailbreak super.type-equality; unordered-containers = doJailbreak super.unordered-containers; vector = doJailbreak (dontCheck super.vector); diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 34592e29dd6b..951047fb54fd 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -834,6 +834,7 @@ broken-packages: - contstuff-monads-tf - contstuff-transformers - convert-annotation + - copilot-core - copilot-sbv - copr - COrdering @@ -1841,7 +1842,6 @@ broken-packages: - haddock-cheatsheet - haddock-leksah - haddock-test - - hadolint - hadoop-formats - hadoop-rpc - hafar @@ -2790,7 +2790,7 @@ broken-packages: - language-typescript - language-vhdl - language-webidl - - lapack + - lapack-hmatrix - LargeCardinalHierarchy - Lastik - latest-npm-version @@ -2918,10 +2918,8 @@ broken-packages: - llsd - llvm-base - llvm-ffi - - llvm-ffi-tools - llvm-general-pure - llvm-ht - - llvm-pkg-config - llvm-pretty - lmonad - load-balancing @@ -3205,6 +3203,7 @@ broken-packages: - morfette - morfeusz - morpheus-graphql-cli + - morpheus-graphql-code-gen - morphisms-functors - morphisms-objects - morte @@ -4034,6 +4033,7 @@ broken-packages: - read-bounded - read-ctags - read-io + - readline-in-other-words - readline-statevar - readme-lhs - readshp @@ -4792,7 +4792,6 @@ broken-packages: - syntax-trees - syntax-trees-fork-bairyn - synthesizer - - synthesizer-alsa - Sysmon - sys-process - system-canonicalpath @@ -5354,6 +5353,7 @@ broken-packages: - web-encodings - WeberLogic - webfinger-client + - webkitgtk3 - webkit-javascriptcore - webmention - web-output diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index c95eb289f6c5..7c106393dd9f 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -98,6 +98,9 @@ default-package-overrides: - futhark < 0.20.6 # 2021-11-09: ghc-bignum is bundled starting with 9.0.1; only 1.0 builds with GHCs prior to 9.2.1 - ghc-bignum == 1.0 + # 2021-11-18: lucid-{alpine, htmx} are not in stackage, so we need to downgrade them + - lucid-alpine == 0.1.0.2 + - lucid-htmx == 0.1.0.2 extra-packages: - base16-bytestring < 1 # required for cabal-install etc. diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml index 09e2a314977e..858eeac1e297 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 18.15 +# Stackage LTS 18.16 # This file is auto-generated by # maintainers/scripts/haskell/update-stackage.sh default-package-overrides: @@ -363,7 +363,7 @@ default-package-overrides: - cborg-json ==0.2.3.0 - cdar-mBound ==0.1.0.4 - c-enum ==0.1.0.1 - - cereal ==0.5.8.1 + - cereal ==0.5.8.2 - cereal-conduit ==0.8.0 - cereal-text ==0.1.0.2 - cereal-vector ==0.2.0.1 @@ -716,7 +716,7 @@ default-package-overrides: - event-list ==0.1.2 - eventstore ==1.4.1 - every ==0.0.1 - - exact-combinatorics ==0.2.0.10 + - exact-combinatorics ==0.2.0.11 - exact-pi ==0.5.0.1 - exception-hierarchy ==0.1.0.4 - exception-mtl ==0.4.0.1 @@ -835,7 +835,7 @@ default-package-overrides: - gd ==3000.7.3 - gdp ==0.0.3.0 - general-games ==1.1.1 - - generic-aeson ==0.2.0.12 + - generic-aeson ==0.2.0.13 - generic-arbitrary ==0.1.0 - generic-constraints ==1.1.1.1 - generic-data ==0.9.2.1 @@ -1090,7 +1090,7 @@ default-package-overrides: - hruby ==0.3.8.1 - hsass ==0.8.0 - hs-bibutils ==6.10.0.0 - - hsc2hs ==0.68.7 + - hsc2hs ==0.68.8 - hscolour ==1.24.4 - hsdns ==1.8 - hsebaysdk ==0.4.1.0 @@ -1269,7 +1269,7 @@ default-package-overrides: - io-streams-haproxy ==1.0.1.0 - ip6addr ==1.0.2 - ipa ==0.3.1.1 - - iproute ==1.7.11 + - iproute ==1.7.12 - IPv6Addr ==2.0.3 - ipynb ==0.1.0.2 - ipython-kernel ==0.10.2.1 @@ -1313,7 +1313,7 @@ default-package-overrides: - jwt ==0.10.0 - kan-extensions ==5.2.3 - kanji ==3.4.1 - - katip ==0.8.6.0 + - katip ==0.8.7.0 - katip-logstash ==0.1.0.0 - kawhi ==0.3.0 - kazura-queue ==0.1.0.4 @@ -1458,7 +1458,7 @@ default-package-overrides: - mathexpr ==0.3.0.0 - math-extras ==0.1.1.0 - math-functions ==0.3.4.2 - - matplotlib ==0.7.5 + - matplotlib ==0.7.6 - matrices ==0.5.0 - matrix ==0.3.6.1 - matrix-as-xyz ==0.1.2.2 @@ -1875,7 +1875,7 @@ default-package-overrides: - protocol-radius-test ==0.1.0.1 - protolude ==0.3.0 - proxied ==0.3.1 - - psqueues ==0.2.7.2 + - psqueues ==0.2.7.3 - ptr-poker ==0.1.1.4 - publicsuffix ==0.20200526 - pulse-simple ==0.1.14 @@ -1946,7 +1946,7 @@ default-package-overrides: - reanimate ==1.1.4.0 - reanimate-svg ==0.13.0.1 - rebase ==1.13.0.1 - - record-dot-preprocessor ==0.2.12 + - record-dot-preprocessor ==0.2.13 - record-hasfield ==1.0 - records-sop ==0.1.1.0 - record-wrangler ==0.1.1.0 @@ -2386,7 +2386,7 @@ default-package-overrides: - th-constraint-compat ==0.0.1.0 - th-data-compat ==0.1.0.0 - th-desugar ==1.11 - - th-env ==0.1.0.2 + - th-env ==0.1.0.3 - these ==1.1.1.1 - these-lens ==1.0.1.2 - these-optics ==1.0.1.2 @@ -2520,7 +2520,7 @@ default-package-overrides: - universe-reverse-instances ==1.1.1 - universe-some ==1.2.1 - universum ==1.7.2 - - unix-bytestring ==0.3.7.5 + - unix-bytestring ==0.3.7.6 - unix-compat ==0.5.3 - unix-time ==0.4.7 - unliftio ==0.2.20 diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index 3afd15cb4484..505358dd4c40 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -822,6 +822,7 @@ dont-distribute-packages: - convertible-text - coordinate - copilot + - copilot-c99 - copilot-cbmc - copilot-language - copilot-libraries @@ -948,6 +949,7 @@ dont-distribute-packages: - diagrams-pgf - diagrams-reflex - diagrams-wx + - dialog - difference-monoid - digestive-functors-hsp - dingo-core @@ -1222,6 +1224,7 @@ dont-distribute-packages: - ghc-mod - ghc-tags-plugin - ghci-pretty + - ghcjs-dom-webkit - ghcjs-hplay - ght - gi-cairo-again @@ -1485,6 +1488,8 @@ dont-distribute-packages: - hbb - hbcd - hbf + - hbro + - hbro-contrib - hcg-minus-cairo - hcheat - hcheckers @@ -1570,7 +1575,6 @@ dont-distribute-packages: - hmeap - hmeap-utils - hmep - - hmm-lapack - hmm-lapack_0_4_1 - hmt - hmt-diagrams @@ -1917,7 +1921,7 @@ dont-distribute-packages: - language-python-colour - language-qux - language-spelling - - lapack-hmatrix + - lapack_0_4 - lat - latex-formulae-hakyll - latex-formulae-pandoc @@ -1962,8 +1966,6 @@ dont-distribute-packages: - lightstep-haskell - lighttpd-conf - lighttpd-conf-qq - - linear-circuit - - linear-circuit_0_1_0_3 - linearmap-category - linearscan-hoopl - linkchk @@ -2043,8 +2045,6 @@ dont-distribute-packages: - macosx-make-standalone - magic-wormhole - magicbane - - magico - - magico_0_0_2_2 - mahoro - maid - mail-pool @@ -2122,6 +2122,7 @@ dont-distribute-packages: - mmark-cli - mmark-cli_0_0_5_1 - mmark-ext + - mmark-ext_0_2_1_4 - mmtl-base - moan - modify-fasta @@ -2143,6 +2144,8 @@ dont-distribute-packages: - moo-nad - morley - morloc + - morpheus-graphql-client_0_18_0 + - morpheus-graphql_0_18_0 - morphisms-functors-inventory - mosaico-lib - motor-diagrams @@ -2333,6 +2336,7 @@ dont-distribute-packages: - persona-idp - peyotls - peyotls-codec + - pg-entity - pgsql-simple - phonetic-languages-examples - phonetic-languages-general @@ -2577,8 +2581,6 @@ dont-distribute-packages: - replicant - repr - representable-tries - - resistor-cube - - resistor-cube_0_0_1_3 - resource-pool-catchio - resource-simple - respond diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index fb08481a39de..67224af62b39 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -155,6 +155,7 @@ self: super: builtins.intersectAttrs super { github-types = dontCheck super.github-types; # http://hydra.cryp.to/build/1114046/nixlog/1/raw hadoop-rpc = dontCheck super.hadoop-rpc; # http://hydra.cryp.to/build/527461/nixlog/2/raw hasql = dontCheck super.hasql; # http://hydra.cryp.to/build/502489/nixlog/4/raw + hasql-interpolate = dontCheck super.hasql-interpolate; # wants to connect to postgresql hasql-transaction = dontCheck super.hasql-transaction; # wants to connect to postgresql hjsonschema = overrideCabal (drv: { testTarget = "local"; }) super.hjsonschema; marmalade-upload = dontCheck super.marmalade-upload; # http://hydra.cryp.to/build/501904/nixlog/1/raw @@ -516,25 +517,30 @@ self: super: builtins.intersectAttrs super { }) (addBuildTools (with pkgs.buildPackages; [makeWrapper python3Packages.sphinx]) super.futhark); - git-annex = with pkgs; - if (!stdenv.isLinux) then - let path = lib.makeBinPath [ coreutils ]; - in overrideCabal (_drv: { - # This is an instance of https://github.com/NixOS/nix/pull/1085 - # Fails with: - # gpg: can't connect to the agent: File name too long - postPatch = lib.optionalString stdenv.isDarwin '' - substituteInPlace Test.hs \ - --replace ', testCase "crypto" test_crypto' "" - ''; - # On Darwin, git-annex mis-detects options to `cp`, so we wrap the - # binary to ensure it uses Nixpkgs' coreutils. - postFixup = '' - wrapProgram $out/bin/git-annex \ - --prefix PATH : "${path}" - ''; - }) (addBuildTool buildPackages.makeWrapper super.git-annex) - else super.git-annex; + git-annex = let + pathForDarwin = pkgs.lib.makeBinPath [ pkgs.coreutils ]; + in overrideCabal (drv: pkgs.lib.optionalAttrs (!pkgs.stdenv.isLinux) { + # This is an instance of https://github.com/NixOS/nix/pull/1085 + # Fails with: + # gpg: can't connect to the agent: File name too long + postPatch = pkgs.lib.optionalString pkgs.stdenv.isDarwin '' + substituteInPlace Test.hs \ + --replace ', testCase "crypto" test_crypto' "" + '' + (drv.postPatch or ""); + # On Darwin, git-annex mis-detects options to `cp`, so we wrap the + # binary to ensure it uses Nixpkgs' coreutils. + postFixup = '' + wrapProgram $out/bin/git-annex \ + --prefix PATH : "${pathForDarwin}" + '' + (drv.postFixup or ""); + buildTools = [ + pkgs.buildPackages.makeWrapper + ] ++ (drv.buildTools or []); + }) (super.git-annex.override { + dbus = if pkgs.stdenv.isLinux then self.dbus else null; + fdo-notify = if pkgs.stdenv.isLinux then self.fdo-notify else null; + hinotify = if pkgs.stdenv.isLinux then self.hinotify else self.fsnotify; + }); # The test suite has undeclared dependencies on git. githash = dontCheck super.githash; diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 93fb82954d57..d35033dff8fe 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -7320,6 +7320,29 @@ self: { license = lib.licenses.bsd3; }) {}; + "Glob_0_10_2" = callPackage + ({ mkDerivation, base, containers, directory, dlist, filepath + , HUnit, QuickCheck, test-framework, test-framework-hunit + , test-framework-quickcheck2, transformers, transformers-compat + }: + mkDerivation { + pname = "Glob"; + version = "0.10.2"; + sha256 = "1h3kh46qds4nqvixm4myy1kb5slg53f44hfn8aymrlr7hjn75xka"; + libraryHaskellDepends = [ + base containers directory dlist filepath transformers + transformers-compat + ]; + testHaskellDepends = [ + base containers directory dlist filepath HUnit QuickCheck + test-framework test-framework-hunit test-framework-quickcheck2 + transformers transformers-compat + ]; + description = "Globbing library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "GlomeTrace" = callPackage ({ mkDerivation, array, base, GlomeVec }: mkDerivation { @@ -10906,8 +10929,8 @@ self: { pname = "HsYAML"; version = "0.2.1.0"; sha256 = "10qzhsg789h37q22hm9p27dx4rhbykcbxp7p3pvkws8fr7ajgxv0"; - revision = "2"; - editedCabalFile = "0f7867jfzlmlqnkv3fjrzjvvfzjlvhbm10kmg7n0qk69ic8grkbc"; + revision = "3"; + editedCabalFile = "0qj6180459mx08v3m8x8nw2a8a7srw2q48dh4d9qgwd1rl499a5i"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -10939,6 +10962,25 @@ self: { license = lib.licenses.gpl2Plus; }) {}; + "HsYAML-aeson_0_2_0_1" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, HsYAML, mtl + , scientific, text, unordered-containers, vector + }: + mkDerivation { + pname = "HsYAML-aeson"; + version = "0.2.0.1"; + sha256 = "139hqd07hkr8ykvrgmcshh9f3vp9dnrj6ks5nl8hgrpi990jsy5r"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring containers HsYAML mtl scientific text + unordered-containers vector + ]; + description = "JSON to YAML Adapter"; + license = lib.licenses.gpl2Plus; + hydraPlatforms = lib.platforms.none; + }) {}; + "Hsed" = callPackage ({ mkDerivation, array, base, bytestring, cmdargs, data-accessor , data-accessor-template, data-accessor-transformers, directory @@ -17107,6 +17149,24 @@ self: { license = lib.licenses.bsd3; }) {}; + "Rattus_0_5_0_1" = callPackage + ({ mkDerivation, base, Cabal, containers, ghc, ghc-prim + , simple-affine-space, transformers + }: + mkDerivation { + pname = "Rattus"; + version = "0.5.0.1"; + sha256 = "1rj29wbhk9bn7mazhrqcgas8m7rnfcak10krimsn08v2nzw2af79"; + setupHaskellDepends = [ base Cabal ]; + libraryHaskellDepends = [ + base containers ghc ghc-prim simple-affine-space transformers + ]; + testHaskellDepends = [ base containers ]; + description = "A modal FRP language"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "ReadArgs" = callPackage ({ mkDerivation, base, hspec, system-filepath, text }: mkDerivation { @@ -17356,8 +17416,8 @@ self: { }: mkDerivation { pname = "RtMidi"; - version = "0.5.0.1"; - sha256 = "13fzqfq47zx3anpc1y9ypfa2h7bxzzj95zd7hpm3niykjrl9zadr"; + version = "0.5.0.2"; + sha256 = "1mlb611ilamjd884da57zy5c2jga4d5nbjy2yphnn0fcn7lzymyk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base deepseq unliftio-core vector ]; @@ -18326,6 +18386,34 @@ self: { license = lib.licenses.gpl3Only; }) {}; + "ShellCheck_0_8_0" = callPackage + ({ mkDerivation, aeson, array, base, bytestring, containers + , deepseq, Diff, directory, filepath, mtl, parsec, process + , QuickCheck, regex-tdfa + }: + mkDerivation { + pname = "ShellCheck"; + version = "0.8.0"; + sha256 = "05jlapp4m997w36h2wszdxz9gvczdczaylypsbn14jqpb650w232"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson array base bytestring containers deepseq Diff directory + filepath mtl parsec process QuickCheck regex-tdfa + ]; + executableHaskellDepends = [ + aeson array base bytestring containers deepseq Diff directory + filepath mtl parsec QuickCheck regex-tdfa + ]; + testHaskellDepends = [ + aeson array base bytestring containers deepseq Diff directory + filepath mtl parsec QuickCheck regex-tdfa + ]; + description = "Shell script analysis tool"; + license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; + }) {}; + "Shellac" = callPackage ({ mkDerivation, base, directory, mtl, unix }: mkDerivation { @@ -20915,8 +21003,8 @@ self: { ({ mkDerivation, base, bytestring, transformers, vector, vulkan }: mkDerivation { pname = "VulkanMemoryAllocator"; - version = "0.7.3"; - sha256 = "0ff8ik1y4cxf408kwpasqrkdimh3afvjhpbsjd40zf8h3aywv10b"; + version = "0.7.4"; + sha256 = "0rzvishkjp4vjwc64a12knj1kr7c793ncpgf9x54l2xj6q7a9mrj"; libraryHaskellDepends = [ base bytestring transformers vector vulkan ]; @@ -21275,12 +21363,12 @@ self: { platforms = lib.platforms.none; }) {}; - "Win32_2_13_0_0" = callPackage + "Win32_2_13_1_0" = callPackage ({ mkDerivation }: mkDerivation { pname = "Win32"; - version = "2.13.0.0"; - sha256 = "0i4ws3d7s94vv6gh3cjj9nr0l88rwx7bwjk9jk0grzvw734dd9a2"; + version = "2.13.1.0"; + sha256 = "1a86hmkba4gd1qqfanl06vi2r77ip53l3dcbgvjp7wlp6rjampvc"; description = "A binding to Windows Win32 API"; license = lib.licenses.bsd3; platforms = lib.platforms.none; @@ -24104,6 +24192,25 @@ self: { license = lib.licenses.bsd3; }) {}; + "ad_4_5" = callPackage + ({ mkDerivation, adjunctions, array, base, comonad, containers + , criterion, data-reify, erf, free, nats, reflection, semigroups + , transformers + }: + mkDerivation { + pname = "ad"; + version = "4.5"; + sha256 = "1v37ckxcav3aicv4vv7y77mmvinfwd8mxzcnm672mmxq1d29vpsc"; + libraryHaskellDepends = [ + adjunctions array base comonad containers data-reify erf free nats + reflection semigroups transformers + ]; + benchmarkHaskellDepends = [ base criterion erf ]; + description = "Automatic Differentiation"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "ad-delcont" = callPackage ({ mkDerivation, base, transformers }: mkDerivation { @@ -26703,8 +26810,8 @@ self: { }: mkDerivation { pname = "algorithmic-composition-basic"; - version = "0.4.0.0"; - sha256 = "17kajlfr02kq82g281i1bm6x171106wyqz797p6j3iq3jxwp3x91"; + version = "0.4.1.0"; + sha256 = "1k5rsz1c67zzdxh56w9rr1mgnv7jmwbfn4z2ysq1ny1vgyi4m7ry"; libraryHaskellDepends = [ base bytestring directory foldable-ix mmsyn2-array mmsyn3 mmsyn7l mmsyn7ukr-common process process-sequential @@ -30567,8 +30674,8 @@ self: { }: mkDerivation { pname = "ansi-terminal-game"; - version = "1.4.0.0"; - sha256 = "0pxkqjv6xqqyn98y2vpsyyx6n91cjsdwxpx9y636l5n3lk8iq14z"; + version = "1.5.0.0"; + sha256 = "161n02iywllrr49b1mzpa8lav9w41cmng7ca5vfhpxjjydd5rcbx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -32772,8 +32879,8 @@ self: { }: mkDerivation { pname = "arduino-copilot"; - version = "1.5.5"; - sha256 = "0g2zw7xngaz5xhp4zrnhrkscnyck0474mngvp2j14p87sc7qn20w"; + version = "1.5.6"; + sha256 = "06aqavds6lh4iazrlz62dhdxim0q8xqdgafj7y3f8nnmv8w37g41"; libraryHaskellDepends = [ base containers copilot copilot-c99 copilot-language directory filepath mtl optparse-applicative temporary @@ -32849,8 +32956,8 @@ self: { }: mkDerivation { pname = "argo"; - version = "0.2021.11.2"; - sha256 = "1jlh8m03ncwx5pckdbi6c620xc45pg1phspp0cmvqgrvy6wkiyjz"; + version = "0.2021.11.7"; + sha256 = "1lmx938ydl94rmzifk5jbgmfx0p64chkl7dfp1rfxwvbmlp1aydy"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -34541,6 +34648,8 @@ self: { pname = "async"; version = "2.2.4"; sha256 = "09d7w3krfhnmf9dp6yffa9wykinhw541wibnjgnlyv77w1dzhka8"; + revision = "1"; + editedCabalFile = "1w3hlcaq444qid3iqizb8sdl08jxwjmcfgfxqs2dw81mllsfqgdq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base hashable stm ]; @@ -38262,11 +38371,11 @@ self: { ({ mkDerivation, base, hspec, HUnit, QuickCheck, time }: mkDerivation { pname = "bank-holiday-usa"; - version = "0.1.1"; - sha256 = "12s473bjbv5wgsxwi5vf6ffh9z72dw7fbnih0i9ifry8kim4pgaz"; + version = "0.2.0"; + sha256 = "03zh4cg7sghryb1d06szvn69c5lsbmsg068j00xbpk3w4xrgphjk"; libraryHaskellDepends = [ base time ]; testHaskellDepends = [ base hspec HUnit QuickCheck time ]; - description = "A library for determining US bank holidays"; + description = "US bank holidays"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; broken = true; @@ -38342,6 +38451,8 @@ self: { pname = "barbies-th"; version = "0.1.9"; sha256 = "1brikm7qr2yi3426vgwjjxjrvw060sb0v7jbxrhazjps28f6aa3n"; + revision = "1"; + editedCabalFile = "0iij1y72q28wvj8hfx000cpckl1wlcgj050380lx526cmwavy151"; libraryHaskellDepends = [ barbies base split template-haskell ]; testHaskellDepends = [ barbies base ]; description = "Create strippable HKD via TH"; @@ -40044,6 +40155,35 @@ self: { broken = true; }) {}; + "bech32_1_1_2" = callPackage + ({ mkDerivation, array, base, base58-bytestring, bytestring + , containers, deepseq, extra, hspec, hspec-discover, memory + , optparse-applicative, process, QuickCheck, text, vector + }: + mkDerivation { + pname = "bech32"; + version = "1.1.2"; + sha256 = "1iyjnyy7l0jf2azbgg6lc5k7n25h1r41fyyqfagyaz79vhi1k7j8"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + array base bytestring containers extra text + ]; + executableHaskellDepends = [ + base base58-bytestring bytestring extra memory optparse-applicative + text + ]; + testHaskellDepends = [ + base base58-bytestring bytestring containers deepseq extra hspec + memory process QuickCheck text vector + ]; + testToolDepends = [ hspec-discover ]; + description = "Implementation of the Bech32 cryptocurrency address format (BIP 0173)"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "bech32-th" = callPackage ({ mkDerivation, base, bech32, hspec, hspec-discover , template-haskell, text @@ -42968,8 +43108,8 @@ self: { }: mkDerivation { pname = "bishbosh"; - version = "0.1.1.0"; - sha256 = "0raryshzgahldn03dzpin6hi9vyq4w81dxgmgcq34z7h2salia5m"; + version = "0.1.2.0"; + sha256 = "1ldzl2f93nqaxs9wbf3s9w8wjrx1fx69w95y5fz7rla7szhrckdq"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -43511,6 +43651,18 @@ self: { license = lib.licenses.bsd3; }) {}; + "bits_0_6" = callPackage + ({ mkDerivation, base, bytes, mtl, transformers }: + mkDerivation { + pname = "bits"; + version = "0.6"; + sha256 = "18s2aa99cwcshcws2zl2ll7xgqn9dpznpkv1nplamc9h4vmqqs93"; + libraryHaskellDepends = [ base bytes mtl transformers ]; + description = "Various bit twiddling and bitwise serialization primitives"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "bits-atomic" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -44846,6 +44998,8 @@ self: { pname = "bloomfilter"; version = "2.0.1.0"; sha256 = "03vrmncg1c10a2wcg5skq30m1yiknn7nwxz2gblyyfaxglshspkc"; + revision = "1"; + editedCabalFile = "1dqlwmmcy7s6gsjqcm4xhk3cgbam0hyzpry2ha4064xvdb4rlks3"; libraryHaskellDepends = [ array base bytestring deepseq ]; testHaskellDepends = [ base bytestring QuickCheck random test-framework @@ -46002,6 +46156,31 @@ self: { license = lib.licenses.bsd3; }) {}; + "bound_2_0_4" = callPackage + ({ mkDerivation, base, bifunctors, binary, bytes, cereal, comonad + , deepseq, deriving-compat, hashable, mmorph, profunctors + , template-haskell, th-abstraction, transformers + , transformers-compat, vector, void + }: + mkDerivation { + pname = "bound"; + version = "2.0.4"; + sha256 = "06wyjiswi5fnnw7ndjdln3fkfgab5c8qh9v1d1s0f0s6rzlb85xs"; + revision = "1"; + editedCabalFile = "008i9lm53p0vwahrl61lfpv33yjchi6jyby7j37rlw9shr4h06qg"; + libraryHaskellDepends = [ + base bifunctors binary bytes cereal comonad deepseq hashable mmorph + profunctors template-haskell th-abstraction transformers + transformers-compat + ]; + testHaskellDepends = [ + base deriving-compat transformers transformers-compat vector void + ]; + description = "Making de Bruijn Succ Less"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "bound-extras" = callPackage ({ mkDerivation, base, bound, containers, deepseq, filepath , hashable, pretty, tasty, tasty-golden, text-short, transformers @@ -48208,6 +48387,8 @@ self: { pname = "bytes"; version = "0.17.1"; sha256 = "1qmps8vvg98wfm9xm734hwzi56bsk8r1zc6vx20rlhc79krv5s9s"; + revision = "2"; + editedCabalFile = "1gayyk4sgd8r48x2cgil8392wlxir0qq059m5k966jrwrqdqg2m4"; libraryHaskellDepends = [ base binary binary-orphans bytestring cereal containers hashable mtl scientific text time transformers transformers-compat @@ -49468,6 +49649,18 @@ self: { license = lib.licenses.bsd3; }) {}; + "cabal-doctest_1_0_9" = callPackage + ({ mkDerivation, base, Cabal, directory, filepath }: + mkDerivation { + pname = "cabal-doctest"; + version = "1.0.9"; + sha256 = "0wxs0xkspc80h0g8ks792lrzldxvcnhc9rja1j0k678ijs20hmjm"; + libraryHaskellDepends = [ base Cabal directory filepath ]; + description = "A Setup.hs helper for running doctests"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "cabal-edit" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, directory , filepath, Glob, hackage-db, optparse-applicative, process, store @@ -52605,8 +52798,8 @@ self: { pname = "cassava"; version = "0.5.2.0"; sha256 = "01h1zrdqb313cjd4rqm1107azzx4czqi018c2djf66a5i7ajl3dk"; - revision = "4"; - editedCabalFile = "19rkq41r5vj8drnj850b1wqnc54mxpw0x5z54brq0nvyww5f8ai8"; + revision = "5"; + editedCabalFile = "0d2zfs9a5rzljaz2dr47rypsj7aamgsfqn0gs0pwjhkwi8p1504y"; configureFlags = [ "-f-bytestring--lt-0_10_4" ]; libraryHaskellDepends = [ array attoparsec base bytestring containers deepseq hashable Only @@ -53487,27 +53680,6 @@ self: { }) {}; "cereal" = callPackage - ({ mkDerivation, array, base, bytestring, containers, ghc-prim - , QuickCheck, test-framework, test-framework-quickcheck2 - }: - mkDerivation { - pname = "cereal"; - version = "0.5.8.1"; - sha256 = "1mqvd1iwzr50az4y24332x3g3wsrzw8j1iwph02vr7jbjfn8i7id"; - revision = "1"; - editedCabalFile = "02v1nivac478nzzykjbq3rawnqskxjc4sb54m6s5jcgbigfnb2x0"; - libraryHaskellDepends = [ - array base bytestring containers ghc-prim - ]; - testHaskellDepends = [ - base bytestring QuickCheck test-framework - test-framework-quickcheck2 - ]; - description = "A binary serialization library"; - license = lib.licenses.bsd3; - }) {}; - - "cereal_0_5_8_2" = callPackage ({ mkDerivation, array, base, bytestring, containers, ghc-prim , QuickCheck, test-framework, test-framework-quickcheck2 }: @@ -53524,7 +53696,6 @@ self: { ]; description = "A binary serialization library"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "cereal-conduit" = callPackage @@ -54011,47 +54182,40 @@ self: { }) {}; "chakra" = callPackage - ({ mkDerivation, aeson, ansi-terminal, base, bytestring, cryptonite - , data-default, data-has, dotenv, envy, fast-logger, hspec - , http-types, iproute, jose, lens, mtl, network, network-uri - , options, optparse-simple, prometheus-client + ({ mkDerivation, aeson, base, bytestring, cryptonite, data-default + , data-has, dotenv, envy, fast-logger, hspec, http-types, iproute + , jose, network, network-uri, optparse-simple, prometheus-client , prometheus-metrics-ghc, rio, servant-auth, servant-auth-server - , servant-server, streaming-commons, string-conversions, text, time - , transformers, unordered-containers, wai, wai-cli, wai-extra - , wai-middleware-prometheus, warp + , servant-server, transformers, unordered-containers, wai, wai-cli + , wai-extra, wai-middleware-prometheus, warp }: mkDerivation { pname = "chakra"; - version = "0.1.0"; - sha256 = "00ygnyvif8z8x9xasa3s9yahsawdmkjg43afczd5i0p3clfg6385"; + version = "0.1.2"; + sha256 = "0fnq9djvsphnrmlds97mjw9idp2s448vqbk1lhj3m6bfhsdx5mdr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson ansi-terminal base bytestring cryptonite data-default - data-has dotenv envy fast-logger http-types iproute jose lens mtl - network network-uri options prometheus-client - prometheus-metrics-ghc rio servant-auth servant-auth-server - servant-server streaming-commons string-conversions text time - transformers unordered-containers wai wai-cli wai-extra - wai-middleware-prometheus warp + aeson base bytestring cryptonite data-default data-has envy + fast-logger http-types iproute jose network network-uri + prometheus-client prometheus-metrics-ghc rio servant-auth + servant-auth-server servant-server transformers wai wai-cli + wai-extra wai-middleware-prometheus warp ]; executableHaskellDepends = [ - aeson ansi-terminal base bytestring cryptonite data-default - data-has dotenv envy fast-logger http-types iproute jose lens mtl - network network-uri options optparse-simple prometheus-client - prometheus-metrics-ghc rio servant-auth servant-auth-server - servant-server streaming-commons string-conversions text time - transformers unordered-containers wai wai-cli wai-extra + aeson base bytestring cryptonite data-default data-has dotenv envy + fast-logger http-types iproute jose network network-uri + optparse-simple prometheus-client prometheus-metrics-ghc rio + servant-auth servant-auth-server servant-server transformers + unordered-containers wai wai-cli wai-extra wai-middleware-prometheus warp ]; testHaskellDepends = [ - aeson ansi-terminal base bytestring cryptonite data-default - data-has dotenv envy fast-logger hspec http-types iproute jose lens - mtl network network-uri options prometheus-client - prometheus-metrics-ghc rio servant-auth servant-auth-server - servant-server streaming-commons string-conversions text time - transformers unordered-containers wai wai-cli wai-extra - wai-middleware-prometheus warp + aeson base bytestring cryptonite data-default data-has envy + fast-logger hspec http-types iproute jose network network-uri + prometheus-client prometheus-metrics-ghc rio servant-auth + servant-auth-server servant-server transformers wai wai-cli + wai-extra wai-middleware-prometheus warp ]; description = "A REST Web Api server template for building (micro)services"; license = lib.licenses.mit; @@ -56734,6 +56898,8 @@ self: { pname = "classy-prelude"; version = "1.5.0"; sha256 = "1nm4lygxqb1wq503maki6dsah2gpn5rd22jmbwjxfwyzgyqy9fnk"; + revision = "1"; + editedCabalFile = "1jivh1bmcvqn6bhh5z8x69v93zjcriklljm7gx342d8k5d5rsf4s"; libraryHaskellDepends = [ async base basic-prelude bifunctors bytestring chunked-data containers deepseq dlist ghc-prim hashable mono-traversable @@ -63848,6 +64014,8 @@ self: { pname = "constraints"; version = "0.13.1"; sha256 = "0j10sn0i1pk0dsxnf728v0mjg9bcxblkhd8f4fm8rgi32v2sby6k"; + revision = "1"; + editedCabalFile = "115n8pqc26gqxgvvf4h4y1wkf3gw6nb3jfjfmdb4svlnk4jlyjm9"; libraryHaskellDepends = [ base binary deepseq ghc-prim hashable mtl transformers transformers-compat type-equality @@ -63858,6 +64026,26 @@ self: { license = lib.licenses.bsd2; }) {}; + "constraints_0_13_2" = callPackage + ({ mkDerivation, base, binary, deepseq, ghc-prim, hashable, hspec + , hspec-discover, mtl, transformers, transformers-compat + , type-equality + }: + mkDerivation { + pname = "constraints"; + version = "0.13.2"; + sha256 = "1zfijh3jpdfrh8nwn5xv2z05jnxyf0ciqlfaja6g6ls654svrj70"; + libraryHaskellDepends = [ + base binary deepseq ghc-prim hashable mtl transformers + transformers-compat type-equality + ]; + testHaskellDepends = [ base hspec ]; + testToolDepends = [ hspec-discover ]; + description = "Constraint manipulation"; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; + }) {}; + "constraints-deriving" = callPackage ({ mkDerivation, base, bytestring, Cabal, filepath, ghc, ghc-paths , path, path-io @@ -63952,8 +64140,8 @@ self: { }: mkDerivation { pname = "constructible"; - version = "0.1.1"; - sha256 = "19g62i3cv39fww55xcayrzh1v7flghg43ygj41g9cq6qsbq345wr"; + version = "0.1.2"; + sha256 = "1fdxbw33rjyh0gmknzng8sl8gcbz99ib3ks5rq3kjvqn4ibmyqpf"; libraryHaskellDepends = [ base binary-search complex-generic integer-roots ]; @@ -65017,8 +65205,8 @@ self: { }: mkDerivation { pname = "copilot"; - version = "3.5"; - sha256 = "1cia936fm14bzkd8qh8g8zri2lfx7n0jfbjqiqwpwhpgmxvfhznj"; + version = "3.6"; + sha256 = "0h43slh084wj7kwn2rdn0s63pqzy930h6z2vk38kn6yqic8d9s9y"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -65037,14 +65225,15 @@ self: { }: mkDerivation { pname = "copilot-c99"; - version = "3.5"; - sha256 = "1svcshxqrqp9m7pj7k77vfxzmzkanj0zyjq4ry985zzhcqgzcank"; + version = "3.6"; + sha256 = "18p7pijx2f7bw61bzfs5994xpkygghf7hvwpklhp72jkshjdjj1m"; libraryHaskellDepends = [ base containers copilot-core directory filepath language-c99 language-c99-simple language-c99-util mtl pretty ]; description = "A compiler for Copilot targeting C99"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "copilot-cbmc" = callPackage @@ -65065,14 +65254,22 @@ self: { }) {}; "copilot-core" = callPackage - ({ mkDerivation, base, dlist, mtl, pretty }: + ({ mkDerivation, base, dlist, HUnit, mtl, pretty, QuickCheck + , test-framework, test-framework-hunit, test-framework-quickcheck2 + }: mkDerivation { pname = "copilot-core"; - version = "3.5"; - sha256 = "0i5jj4hzk0gqsjx24xswjna9cdwxbyv5hln5jsmhdhgw05c4z5g4"; + version = "3.6"; + sha256 = "00v8la4q15qj27wyqcbsv0h7m5k5ln98y4zkdzpng3z5gw4mpkm9"; libraryHaskellDepends = [ base dlist mtl pretty ]; + testHaskellDepends = [ + base HUnit pretty QuickCheck test-framework test-framework-hunit + test-framework-quickcheck2 + ]; description = "An intermediate representation for Copilot"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "copilot-language" = callPackage @@ -65081,8 +65278,8 @@ self: { }: mkDerivation { pname = "copilot-language"; - version = "3.5"; - sha256 = "0s1yn4la8pbdwlcfrlx79031anagp235dbapm3c715mv67dgcs2b"; + version = "3.6"; + sha256 = "0b1cl4v5w54nx007mmnsx49hh3zxjm55ninlzkd78balnyah8nlk"; libraryHaskellDepends = [ array base containers copilot-core copilot-theorem data-reify mtl ]; @@ -65097,8 +65294,8 @@ self: { }: mkDerivation { pname = "copilot-libraries"; - version = "3.5"; - sha256 = "1glz1x00abyavyca7kz19ji7jipl5fjxwqi47mql4b3wr9ksc0y4"; + version = "3.6"; + sha256 = "0s6y1is91nbvlrb9fdp9xhaq9wx3j5pm67gjrlajiik4029a2dxd"; libraryHaskellDepends = [ array base containers copilot-language data-reify mtl parsec ]; @@ -65132,8 +65329,8 @@ self: { }: mkDerivation { pname = "copilot-theorem"; - version = "3.5"; - sha256 = "0cb22695jp502iilyjkfhr8lzl97rdrpjvs9fbknrr0zbwn1m7p9"; + version = "3.6"; + sha256 = "17l8xq4zd9jfih5p21l6xkahdgrfbmpy8wxc38w88w98qmz5ix59"; libraryHaskellDepends = [ ansi-terminal base bimap bv-sized containers copilot-core data-default directory filepath libBF mtl panic parameterized-utils @@ -65296,7 +65493,7 @@ self: { license = lib.licenses.mit; }) {}; - "core-program_0_3_4_0" = callPackage + "core-program_0_3_4_1" = callPackage ({ mkDerivation, async, base, bytestring, chronologique, core-data , core-text, directory, exceptions, filepath, fsnotify, hashable , hourglass, mtl, prettyprinter, safe-exceptions, stm @@ -65305,8 +65502,8 @@ self: { }: mkDerivation { pname = "core-program"; - version = "0.3.4.0"; - sha256 = "079wiijdgr2vy7i8n4590p0rfakrmsxk4vx50dg992r2gfjlfzfa"; + version = "0.3.4.1"; + sha256 = "01yk1dyr6z1g541v0y7cpnilbnqwvcn5si38r8flzq35svrk1bjn"; libraryHaskellDepends = [ async base bytestring chronologique core-data core-text directory exceptions filepath fsnotify hashable hourglass mtl prettyprinter @@ -69285,6 +69482,19 @@ self: { license = lib.licenses.bsd3; }) {}; + "czipwith_1_0_1_4" = callPackage + ({ mkDerivation, base, template-haskell, transformers }: + mkDerivation { + pname = "czipwith"; + version = "1.0.1.4"; + sha256 = "0zvi7wmbh09ngbyvavvhn6s3vz1pnps59fl1sq3vih6s03s0zmai"; + libraryHaskellDepends = [ base template-haskell ]; + testHaskellDepends = [ base transformers ]; + description = "CZipWith class and deriving via TH"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "d-bus" = callPackage ({ mkDerivation, async, attoparsec, base, binary, blaze-builder , bytestring, conduit, conduit-extra, containers @@ -73488,14 +73698,14 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; - "deepseq_1_4_5_0" = callPackage + "deepseq_1_4_6_0" = callPackage ({ mkDerivation, array, base, ghc-prim, HUnit, test-framework , test-framework-hunit }: mkDerivation { pname = "deepseq"; - version = "1.4.5.0"; - sha256 = "0d3yw95xkyx7wwx3anfj1fqb10080xykqic483xpl7rvi1mik6js"; + version = "1.4.6.0"; + sha256 = "0j6pxm9q3xanhxrdmxgzkfdlnpilnlvnnvazq61szl1q9d3mn6ql"; libraryHaskellDepends = [ array base ]; testHaskellDepends = [ array base ghc-prim HUnit test-framework test-framework-hunit @@ -74132,16 +74342,14 @@ self: { "dependent-literals" = callPackage ({ mkDerivation, base, fin-int, numeric-kinds, sint, snumber - , tagged, wrapped + , tagged, type-compare, wrapped }: mkDerivation { pname = "dependent-literals"; - version = "0.1.1.0"; - sha256 = "0dw2xc5l8cmhsmr2akyyhyfj8m3qx02pz81fn52ii9mkhzs6rcjb"; - revision = "5"; - editedCabalFile = "1z2afnvgdkw6swvc1mavd8rzqcq1s124n0j13n7zd9pcjha9i4nb"; + version = "0.2.0"; + sha256 = "1i3mzijqk2pf7am9kh1ydhrw9qj1ijfq8kwvxhrqcx28kaz63rvd"; libraryHaskellDepends = [ - base fin-int numeric-kinds sint snumber tagged wrapped + base fin-int numeric-kinds sint snumber tagged type-compare wrapped ]; description = "Library for dependent-literals-plugin"; license = lib.licenses.asl20; @@ -74153,10 +74361,8 @@ self: { }: mkDerivation { pname = "dependent-literals-plugin"; - version = "0.1.0.1"; - sha256 = "1rpjlcv3g150rcmxidn48n25xxv2ghdz4x9jnap1swkz0fb10i3a"; - revision = "4"; - editedCabalFile = "1330hiqvcvl73y8pd3wpsqicvysl8l0mizkr8my7a628fwh6018p"; + version = "0.1.0.2"; + sha256 = "0bllcf19psak7sfhlqh78lbrdgx3ylqislrvdhjc9syvhaw5khq1"; libraryHaskellDepends = [ base ghc syb ]; testHaskellDepends = [ base dependent-literals fin-int numeric-kinds short-vec sint @@ -74637,6 +74843,19 @@ self: { license = lib.licenses.bsd3; }) {}; + "deriving-aeson_0_2_8" = callPackage + ({ mkDerivation, aeson, base, bytestring }: + mkDerivation { + pname = "deriving-aeson"; + version = "0.2.8"; + sha256 = "0f59ar4cax7g0h6wrk8ckni7i4gw5wls5ybzbrji2a0qpd7q5lrd"; + libraryHaskellDepends = [ aeson base ]; + testHaskellDepends = [ aeson base bytestring ]; + description = "Type driven generic aeson instance customisation"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "deriving-compat" = callPackage ({ mkDerivation, base, base-compat, base-orphans, containers , ghc-boot-th, ghc-prim, hspec, hspec-discover, QuickCheck, tagged @@ -75339,8 +75558,8 @@ self: { pname = "dhall"; version = "1.40.1"; sha256 = "0m2fw9ak9l6fz8ylpbi0cdihf2j66jlnd5j3vf56r7wlqgbkxhi1"; - revision = "2"; - editedCabalFile = "0vywq222wyy8rs4114d0pq70yji7xh440i0ilqbmfywjfj2gm1pj"; + revision = "5"; + editedCabalFile = "1dp9byzmjd2kvydc0q5s3mv59a131jqwhc9cl22jgbhp0whq9jgc"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -75710,8 +75929,8 @@ self: { pname = "dhall-nixpkgs"; version = "1.0.6"; sha256 = "12sfxz7n86m69m1xbnrrr1ybggh70rfwmr4maflq522bhkc2hgvk"; - revision = "1"; - editedCabalFile = "0xy1g9ab355mdkcq30z091rr33sfw98jqjldmawrcq0yxb2gb2s6"; + revision = "2"; + editedCabalFile = "13i04l52jb8xyhqa48r8rlr0d4p657aarfhsxm407ziph5pi60vk"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -75733,8 +75952,8 @@ self: { pname = "dhall-openapi"; version = "1.0.2"; sha256 = "1p678nn1gfj2xp0kmw8i5pzsv6s5bpnsmyng45adb9pnpiyxbcyj"; - revision = "1"; - editedCabalFile = "1mbl9ximmblz1cdm07sk8lwsxdxknhlipx91amd155xpqs72i8jg"; + revision = "2"; + editedCabalFile = "0gkxzfadkpz4dcmcfbyf66s2xa656lf2vw0n282qnc1rsy74ra85"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -75885,6 +76104,8 @@ self: { pname = "dhall-yaml"; version = "1.2.8"; sha256 = "1p766ybwib3f2i5h7m1hh71vc255ahvf7237bpprdapqw3ag8nak"; + revision = "1"; + editedCabalFile = "06jr2b5zj82zcsq7dp6d8v9rfarkpqkp6m1s61d76vlzv9kc2pp2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -76310,10 +76531,8 @@ self: { }: mkDerivation { pname = "diagrams-haddock"; - version = "0.4.1"; - sha256 = "0p978saxsfad6d8wkjnp6i300cf58ps02yw7a1zzhjfgk5ih2qlb"; - revision = "1"; - editedCabalFile = "063j6drlybzbm6bf9yfix86hs3hvgb98sgh4rzgrqkq9kvarj2ij"; + version = "0.4.1.1"; + sha256 = "1azc42pr0hb5qamgf8i0kpkvpzxqlgc9npmi21sxnsw66bnzxw7i"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -80053,7 +80272,7 @@ self: { license = lib.licenses.mit; }) {}; - "doctest_0_18_1" = callPackage + "doctest_0_18_2" = callPackage ({ mkDerivation, base, base-compat, code-page, deepseq, directory , exceptions, filepath, ghc, ghc-paths, hspec, hspec-core, HUnit , mockery, process, QuickCheck, setenv, silently, stringbuilder @@ -80061,8 +80280,8 @@ self: { }: mkDerivation { pname = "doctest"; - version = "0.18.1"; - sha256 = "07w77cik8p3kpcl5vx4l3cr93r1dhk3wc98k1g50l9pby5argrzb"; + version = "0.18.2"; + sha256 = "0c48dpxa8i3q5xh2shd2p2xxhrsy7wdil6dg4mayr3lkk1dlwbfp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -80137,6 +80356,8 @@ self: { pname = "doctest-driver-gen"; version = "0.3.0.4"; sha256 = "1fbqi4s4ajxhyv4a7nbh3v98limla0z8rfqlh02pwc1a90qpwy1a"; + revision = "1"; + editedCabalFile = "19xaynf2zzrvls6l57jzzxp3862d0d2q43amsgsch5ri8479m4dn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; @@ -88759,17 +88980,6 @@ self: { }) {}; "exact-combinatorics" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "exact-combinatorics"; - version = "0.2.0.10"; - sha256 = "08xdn2dl9r1zkphm9ja3lp4qin9cn889q184lsmk432icbvw5r2h"; - libraryHaskellDepends = [ base ]; - description = "Efficient exact computation of combinatoric functions"; - license = lib.licenses.bsd3; - }) {}; - - "exact-combinatorics_0_2_0_11" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "exact-combinatorics"; @@ -88778,7 +88988,6 @@ self: { libraryHaskellDepends = [ base ]; description = "Efficient exact computation of combinatoric functions"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "exact-cover" = callPackage @@ -90399,8 +90608,8 @@ self: { }: mkDerivation { pname = "extralife"; - version = "0.1.1.0"; - sha256 = "0kw5lqfldncl1ci6x6izgs16hl0brrlaxin2yis279a5q4kh8xpz"; + version = "0.2.0.0"; + sha256 = "0bpaz123qg91rw4b97p528w4l7wbb17x4h61dmy1v2sr01l82q58"; libraryHaskellDepends = [ aeson base bytestring http-client http-client-tls text time ]; @@ -97526,14 +97735,15 @@ self: { , http-link-header, http-types, immortal, iproute, lens, lens-aeson , load-env, monad-control, monad-logger, MonadRandom, mtl, network , network-uri, persistent, persistent-postgresql, postgresql-simple - , primitive, process, resource-pool, retry, rio, temporary, text - , time, transformers, transformers-base, unliftio, unliftio-core - , unordered-containers, wai, wai-extra, yaml, yesod, yesod-core + , primitive, process, resource-pool, retry, rio, template-haskell + , temporary, text, time, transformers, transformers-base, unliftio + , unliftio-core, unordered-containers, wai, wai-extra, yaml, yesod + , yesod-core }: mkDerivation { pname = "freckle-app"; - version = "1.0.1.0"; - sha256 = "1lak6iyid14wxydzs77jlwrayrwcg3n4favrf3qf3yd46306a2f3"; + version = "1.0.2.0"; + sha256 = "060yspa1qb0qp7yf7s71pfkq6jdd7bn9xy5kll45d8rvjazf10y6"; libraryHaskellDepends = [ aeson ansi-terminal base bytestring case-insensitive conduit data-default datadog doctest ekg-core errors exceptions fast-logger @@ -97542,9 +97752,9 @@ self: { http-types immortal iproute lens load-env monad-control monad-logger MonadRandom mtl network network-uri persistent persistent-postgresql postgresql-simple primitive process - resource-pool retry rio text time transformers transformers-base - unliftio unliftio-core unordered-containers wai wai-extra yaml - yesod yesod-core + resource-pool retry rio template-haskell text time transformers + transformers-base unliftio unliftio-core unordered-containers wai + wai-extra yaml yesod yesod-core ]; testHaskellDepends = [ aeson base bytestring directory hspec http-types lens lens-aeson @@ -101426,24 +101636,6 @@ self: { }) {}; "generic-aeson" = callPackage - ({ mkDerivation, aeson, attoparsec, base, generic-deriving, mtl - , tagged, text, unordered-containers, vector - }: - mkDerivation { - pname = "generic-aeson"; - version = "0.2.0.12"; - sha256 = "17br2dl9gd2hyflgp0fzqs5ghp4my4l234pjfvvnhk9n4szxzcr3"; - revision = "1"; - editedCabalFile = "0nd40p8iqr6bk7py9rblpis2s8i4p5wgg6kfp607mpp4y17xq1dr"; - libraryHaskellDepends = [ - aeson attoparsec base generic-deriving mtl tagged text - unordered-containers vector - ]; - description = "Derivation of Aeson instances using GHC generics"; - license = lib.licenses.bsd3; - }) {}; - - "generic-aeson_0_2_0_13" = callPackage ({ mkDerivation, aeson, attoparsec, base, generic-deriving, mtl , tagged, text, unordered-containers, vector }: @@ -101457,7 +101649,6 @@ self: { ]; description = "Derivation of Aeson instances using GHC generics"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "generic-arbitrary" = callPackage @@ -101915,6 +102106,8 @@ self: { pname = "generic-random"; version = "1.4.0.0"; sha256 = "12rvb1dzrfjc46n9vdcw3yv773iih8vwhrac3hpzq70yp2z77jdw"; + revision = "1"; + editedCabalFile = "0k8hk2fpm53x5788nvqy8pd1vgpdwidbz5syryf8imhqqq0837w1"; libraryHaskellDepends = [ base QuickCheck ]; testHaskellDepends = [ base deepseq QuickCheck ]; description = "Generic random generators for QuickCheck"; @@ -101927,6 +102120,8 @@ self: { pname = "generic-random"; version = "1.5.0.0"; sha256 = "033cs5vkx57ny035ngndhg3n32jbzyp98li9559gyiz8glp79pzg"; + revision = "1"; + editedCabalFile = "0p0im7py1hrarad8pg5vcggz52d702p749nvx3h5glcygzlag14v"; libraryHaskellDepends = [ base QuickCheck ]; testHaskellDepends = [ base deepseq QuickCheck ]; description = "Generic random generators for QuickCheck"; @@ -104932,6 +105127,32 @@ self: { license = lib.licenses.bsd3; }) {}; + "ghc-typelits-presburger_0_6_1_0" = callPackage + ({ mkDerivation, base, containers, equational-reasoning, ghc + , ghc-tcplugins-extra, mtl, pretty, reflection, syb, tasty + , tasty-discover, tasty-expected-failure, tasty-hunit, text + , transformers + }: + mkDerivation { + pname = "ghc-typelits-presburger"; + version = "0.6.1.0"; + sha256 = "1k9mh0w1xaz85jkdvwm5pxkqzwzrjmhzn1sj2nmilhbnhgfwm9vd"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers ghc ghc-tcplugins-extra mtl pretty reflection syb + transformers + ]; + testHaskellDepends = [ + base equational-reasoning tasty tasty-discover + tasty-expected-failure tasty-hunit text + ]; + testToolDepends = [ tasty-discover ]; + description = "Presburger Arithmetic Solver for GHC Type-level natural numbers"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "ghc-usage" = callPackage ({ mkDerivation, base, containers, ghc, ghc-paths, unix }: mkDerivation { @@ -107369,8 +107590,8 @@ self: { }: mkDerivation { pname = "git-lfs"; - version = "1.1.2"; - sha256 = "1kfrlpq54s5z84l5sk19vmvlqrybnyqg2nwgh452bdh13z67scmw"; + version = "1.2.0"; + sha256 = "1iv3s1c7gwmsima9z3rsphjligpnf7h3vc5c96zgq9b71cx81lba"; libraryHaskellDepends = [ aeson base bytestring case-insensitive containers http-client http-types network-uri text @@ -113897,6 +114118,29 @@ self: { license = lib.licenses.bsd3; }) {}; + "greskell_1_2_0_2" = callPackage + ({ mkDerivation, aeson, base, bytestring, doctest, doctest-discover + , exceptions, greskell-core, hashable, hint, hspec, hspec-discover + , semigroups, text, transformers, unordered-containers, vector + }: + mkDerivation { + pname = "greskell"; + version = "1.2.0.2"; + sha256 = "0zqxln8gcjb3i88b9x156rv3v4d0zlrkca11w1bmbjly8zpgrl4x"; + libraryHaskellDepends = [ + aeson base exceptions greskell-core hashable semigroups text + transformers unordered-containers vector + ]; + testHaskellDepends = [ + aeson base bytestring doctest doctest-discover greskell-core hint + hspec text unordered-containers + ]; + testToolDepends = [ doctest-discover hspec-discover ]; + description = "Haskell binding for Gremlin graph query language"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "greskell-core" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, doctest , doctest-discover, hashable, hspec, hspec-discover, QuickCheck @@ -113919,6 +114163,29 @@ self: { license = lib.licenses.bsd3; }) {}; + "greskell-core_0_1_3_7" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, doctest + , doctest-discover, hashable, hspec, hspec-discover, QuickCheck + , scientific, semigroups, text, unordered-containers, uuid, vector + }: + mkDerivation { + pname = "greskell-core"; + version = "0.1.3.7"; + sha256 = "1lffgrc4q9iwfdgn7qfxyhk459x47fl2fg6rvgqr4jqz1xp7x9cy"; + libraryHaskellDepends = [ + aeson base containers hashable scientific semigroups text + unordered-containers uuid vector + ]; + testHaskellDepends = [ + aeson base bytestring doctest doctest-discover hspec QuickCheck + text unordered-containers vector + ]; + testToolDepends = [ doctest-discover hspec-discover ]; + description = "Haskell binding for Gremlin graph query language - core data types and tools"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "greskell-websocket" = callPackage ({ mkDerivation, aeson, async, base, base64-bytestring, bytestring , greskell-core, hashtables, hspec, safe-exceptions, stm, text @@ -113941,6 +114208,30 @@ self: { license = lib.licenses.bsd3; }) {}; + "greskell-websocket_0_1_2_6" = callPackage + ({ mkDerivation, aeson, async, base, base64-bytestring, bytestring + , greskell-core, hashtables, hspec, hspec-discover, safe-exceptions + , stm, text, unordered-containers, uuid, vector, websockets + }: + mkDerivation { + pname = "greskell-websocket"; + version = "0.1.2.6"; + sha256 = "1wjfvx25k603ymsalvgzrpnyw20mliky5mclrx6caxqyh0plqdak"; + libraryHaskellDepends = [ + aeson async base base64-bytestring bytestring greskell-core + hashtables safe-exceptions stm text unordered-containers uuid + vector websockets + ]; + testHaskellDepends = [ + aeson base bytestring greskell-core hspec unordered-containers uuid + vector + ]; + testToolDepends = [ hspec-discover ]; + description = "Haskell client for Gremlin Server using WebSocket serializer"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "grid" = callPackage ({ mkDerivation, base, containers, QuickCheck, test-framework , test-framework-quickcheck2 @@ -117210,36 +117501,36 @@ self: { "hadolint" = callPackage ({ mkDerivation, aeson, base, bytestring, Cabal, colourista - , containers, cryptonite, deepseq, directory, email-validate - , filepath, foldl, gitrev, hspec, HsYAML, HUnit, ilist - , language-docker, megaparsec, mtl, network-uri - , optparse-applicative, parallel, parsec, semver, ShellCheck, spdx - , split, text, time, timerep, void + , containers, cryptonite, data-default, deepseq, directory + , email-validate, filepath, foldl, gitrev, hspec, HsYAML, HUnit + , ilist, language-docker, megaparsec, mtl, network-uri + , optparse-applicative, parallel, parsec, prettyprinter, semver + , ShellCheck, silently, spdx, split, text, time, timerep, void }: mkDerivation { pname = "hadolint"; - version = "2.7.0"; - sha256 = "11jpqx6i7qbg4yjh8rbdz7zqjmp9r9ch9z299h72af48wrwr16fl"; + version = "2.8.0"; + sha256 = "07dqm4jcglshwqyvp17773xd07bhk5mdybn4ax5ff4xrvg4pj9ah"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base bytestring Cabal colourista containers cryptonite - deepseq directory email-validate filepath foldl HsYAML ilist - language-docker megaparsec mtl network-uri parallel parsec semver + data-default deepseq directory email-validate filepath foldl gitrev + HsYAML ilist language-docker megaparsec mtl network-uri + optparse-applicative parallel parsec prettyprinter semver ShellCheck spdx split text time timerep void ]; executableHaskellDepends = [ - base containers gitrev language-docker megaparsec - optparse-applicative text + base containers data-default language-docker megaparsec + optparse-applicative prettyprinter text ]; testHaskellDepends = [ - aeson base bytestring containers foldl hspec HsYAML HUnit - language-docker megaparsec ShellCheck split text + aeson base bytestring containers data-default foldl hspec HsYAML + HUnit language-docker megaparsec optparse-applicative ShellCheck + silently split text ]; description = "Dockerfile Linter JavaScript API"; license = lib.licenses.gpl3Only; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hadoop-formats" = callPackage @@ -125052,6 +125343,28 @@ self: { license = lib.licenses.mit; }) {}; + "hasql-interpolate" = callPackage + ({ mkDerivation, aeson, array, base, bytestring, containers + , haskell-src-meta, hasql, megaparsec, mtl, scientific, tasty + , tasty-hunit, template-haskell, text, time, transformers, uuid + , vector + }: + mkDerivation { + pname = "hasql-interpolate"; + version = "0.1.0.0"; + sha256 = "0l9gpkkwkypvz3020p5khvxzrq6x62z3i1xjrbzal7yj0gic4klg"; + libraryHaskellDepends = [ + aeson array base bytestring containers haskell-src-meta hasql + megaparsec mtl scientific template-haskell text time transformers + uuid vector + ]; + testHaskellDepends = [ + base hasql tasty tasty-hunit template-haskell text + ]; + description = "QuasiQuoter that supports expression interpolation for hasql"; + license = lib.licenses.bsd3; + }) {}; + "hasql-migration" = callPackage ({ mkDerivation, base, bytestring, contravariant, cryptonite , directory, hasql, hasql-transaction, hspec, memory, text, time @@ -126227,6 +126540,7 @@ self: { platforms = [ "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" ]; + hydraPlatforms = lib.platforms.none; }) {}; "hbro-contrib" = callPackage @@ -126262,6 +126576,7 @@ self: { platforms = [ "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" ]; + hydraPlatforms = lib.platforms.none; }) {}; "hburg" = callPackage @@ -134309,7 +134624,6 @@ self: { testHaskellDepends = [ base QuickCheck ]; description = "Hidden Markov Models using LAPACK primitives"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "hmm-lapack_0_4_1" = callPackage @@ -137064,18 +137378,16 @@ self: { , cryptohash, deepseq, exceptions, extra, fields-json, hpqtypes , lifted-base, log-base, monad-control, mtl, QuickCheck, safe , semigroups, tasty, tasty-bench, tasty-hunit, text, text-show - , time, transformers, uuid-types + , time, transformers, transformers-base, uuid-types }: mkDerivation { pname = "hpqtypes-extras"; - version = "1.12.0.1"; - sha256 = "0qpydy2hg6fmwhwg0azgraxhjijfarns3syrv2an4ynfqcxrds9k"; - revision = "2"; - editedCabalFile = "0xbflhmnibji9sj1yhsm9xzy0rd9k9mhyw41ixlbdvz70jjmjykb"; + version = "1.13.0.0"; + sha256 = "07pma23i8cy8153g3grb1jr4sasaaczlqym1jv9q5vzb03mdqcaw"; libraryHaskellDepends = [ base base16-bytestring bytestring containers cryptohash exceptions extra fields-json hpqtypes lifted-base log-base monad-control mtl - safe semigroups text text-show + safe semigroups text text-show transformers-base ]; testHaskellDepends = [ base exceptions hpqtypes lifted-base log-base monad-control @@ -138931,27 +139243,6 @@ self: { }) {}; "hsc2hs" = callPackage - ({ mkDerivation, base, containers, directory, filepath, process - , tasty, tasty-hspec - }: - mkDerivation { - pname = "hsc2hs"; - version = "0.68.7"; - sha256 = "0jl94cr2jhjmvz7l9idpr352vwxlsanyiq7ya1vvrlry3vj1aygx"; - revision = "1"; - editedCabalFile = "0nzmlx0kdsq5231m6dbvdb5zssj1h4lkqplp8rb28z3yl5h6h3sa"; - isLibrary = false; - isExecutable = true; - enableSeparateDataOutput = true; - executableHaskellDepends = [ - base containers directory filepath process - ]; - testHaskellDepends = [ base tasty tasty-hspec ]; - description = "A preprocessor that helps with writing Haskell bindings to C code"; - license = lib.licenses.bsd3; - }) {}; - - "hsc2hs_0_68_8" = callPackage ({ mkDerivation, base, containers, directory, filepath, HUnit , process, test-framework, test-framework-hunit }: @@ -138970,7 +139261,6 @@ self: { ]; description = "A preprocessor that helps with writing Haskell bindings to C code"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "hsc3" = callPackage @@ -141107,14 +141397,14 @@ self: { license = lib.licenses.mit; }) {}; - "hspec_2_8_3" = callPackage + "hspec_2_8_4" = callPackage ({ mkDerivation, base, hspec-core, hspec-discover , hspec-expectations, QuickCheck }: mkDerivation { pname = "hspec"; - version = "2.8.3"; - sha256 = "1ryv1qad2rw40ak6n7agfd0sib1xk2iyqpz0qhgyxwp3kkjhrn49"; + version = "2.8.4"; + sha256 = "08br1ln5drvw1b9sf9cpxbz31v88p9b7b3hb00qn9vcim5yridz1"; libraryHaskellDepends = [ base hspec-core hspec-discover hspec-expectations QuickCheck ]; @@ -141205,7 +141495,7 @@ self: { license = lib.licenses.mit; }) {}; - "hspec-core_2_8_3" = callPackage + "hspec-core_2_8_4" = callPackage ({ mkDerivation, ansi-terminal, array, base, call-stack, clock , deepseq, directory, filepath, hspec-expectations, hspec-meta , HUnit, process, QuickCheck, quickcheck-io, random, setenv @@ -141213,8 +141503,8 @@ self: { }: mkDerivation { pname = "hspec-core"; - version = "2.8.3"; - sha256 = "0khq0xa6agqcvbngzlxnvd9xwh7dmp4rsb2nzvfwsaknw2674i0k"; + version = "2.8.4"; + sha256 = "11iii063vhsr3qpcadwllmgfhyvykkh1chzpm3bzqfjm1n00vy6d"; libraryHaskellDepends = [ ansi-terminal array base call-stack clock deepseq directory filepath hspec-expectations HUnit QuickCheck quickcheck-io random @@ -141271,14 +141561,16 @@ self: { maintainers = with lib.maintainers; [ maralorn ]; }) {}; - "hspec-discover_2_8_3" = callPackage + "hspec-discover_2_8_4" = callPackage ({ mkDerivation, base, directory, filepath, hspec-meta, mockery , QuickCheck }: mkDerivation { pname = "hspec-discover"; - version = "2.8.3"; - sha256 = "09rjrq289si08cza48gcp29780rv21rs0b12xglkmbd6vfqzp6cs"; + version = "2.8.4"; + sha256 = "0nwayx09i7dfqc56gxq6pq629gnwy10bbn3px7lrq4rkbz3l86y6"; + revision = "1"; + editedCabalFile = "1wi0lq9zhgd5v9zavlw65dhzyw7hyivp8rv3i2ik54pk4j5gp36q"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base directory filepath ]; @@ -150091,8 +150383,8 @@ self: { }: mkDerivation { pname = "implicit-hie-cradle"; - version = "0.3.0.5"; - sha256 = "0c8pyw5nx8b05wqdczy892n0knsniysrxllg2y8q5905mns8h7pc"; + version = "0.4.0.1"; + sha256 = "07k0d2lda4kj20121h8lzbjl074s90cnhbins1dvgngxbz0ddxa2"; libraryHaskellDepends = [ base base16-bytestring bytestring containers directory extra filepath hie-bios hslogger implicit-hie process temporary text time @@ -150290,8 +150582,8 @@ self: { }: mkDerivation { pname = "in-other-words"; - version = "0.2.0.0"; - sha256 = "0adl539jilc3rnwx9ir39y97f6h60xavzhhc8pa9vc6gqp1v4g20"; + version = "0.2.1.0"; + sha256 = "0cm0fxf3snk4ah3jvb9g6f711gs6zg1l7avdj51rgqnlxhsbycqb"; libraryHaskellDepends = [ async base exceptions monad-control mtl stm transformers transformers-base @@ -150389,6 +150681,8 @@ self: { pname = "inchworm"; version = "1.1.1.2"; sha256 = "1dsrx48srmrqcw4y60prgnzxzr7nc7vyzjv0nnr2vaay3j6pxkii"; + revision = "1"; + editedCabalFile = "0xdak2ngj44p0p40k7pavq52f9x6yfglpixz2dp4a7sjw9hk1cxy"; libraryHaskellDepends = [ base ]; description = "Simple parser combinators for lexical analysis"; license = lib.licenses.mit; @@ -151929,6 +152223,24 @@ self: { license = lib.licenses.mit; }) {}; + "integer-roots_1_0_1_0" = callPackage + ({ mkDerivation, base, doctest, integer-gmp, smallcheck, tasty + , tasty-hunit, tasty-quickcheck, tasty-smallcheck + }: + mkDerivation { + pname = "integer-roots"; + version = "1.0.1.0"; + sha256 = "13x74gdh5wh9cr1yfx5l57p06aslcb3pncf8rhn6ihsfk2ni1sm4"; + libraryHaskellDepends = [ base integer-gmp ]; + testHaskellDepends = [ + base doctest smallcheck tasty tasty-hunit tasty-quickcheck + tasty-smallcheck + ]; + description = "Integer roots and perfect powers"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "integer-simple" = callPackage ({ mkDerivation, ghc-prim }: mkDerivation { @@ -152145,6 +152457,8 @@ self: { pname = "intern"; version = "0.9.4"; sha256 = "00c74apc2ap1pjxmzk1c975zzqrc94p69l7v1fvfakv87mbrg8j0"; + revision = "1"; + editedCabalFile = "0xkv6g1aadm5biiqvbfp8f9jsr75prs5aqbhmcskq7s475p1fglp"; libraryHaskellDepends = [ array base bytestring hashable text unordered-containers ]; @@ -153359,25 +153673,6 @@ self: { }) {}; "iproute" = callPackage - ({ mkDerivation, appar, base, byteorder, bytestring, containers - , doctest, hspec, network, QuickCheck, safe - }: - mkDerivation { - pname = "iproute"; - version = "1.7.11"; - sha256 = "12wa59b1zgjqp8dmygq2x44ml0cb89fhn1k0zkj4aqz7rhkwsp90"; - libraryHaskellDepends = [ - appar base byteorder bytestring containers network - ]; - testHaskellDepends = [ - appar base byteorder bytestring containers doctest hspec network - QuickCheck safe - ]; - description = "IP Routing Table"; - license = lib.licenses.bsd3; - }) {}; - - "iproute_1_7_12" = callPackage ({ mkDerivation, appar, base, byteorder, bytestring, containers , doctest, hspec, network, QuickCheck, safe }: @@ -153394,7 +153689,6 @@ self: { ]; description = "IP Routing Table"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "iptables-helpers" = callPackage @@ -157459,6 +157753,22 @@ self: { license = lib.licenses.gpl3Only; }) {}; + "jsonrpc-tinyclient" = callPackage + ({ mkDerivation, aeson, base, bytestring, exceptions, http-client + , http-client-tls, mtl, random, text, websockets + }: + mkDerivation { + pname = "jsonrpc-tinyclient"; + version = "1.0.0.0"; + sha256 = "02xhijk3rk4c9yqh1ghs8gvi1r7fwbxba0h21nb23545wflg0bz9"; + libraryHaskellDepends = [ + aeson base bytestring exceptions http-client http-client-tls mtl + random text websockets + ]; + description = "Tiny JSON-RPC client for Haskell Web3 library"; + license = lib.licenses.asl20; + }) {}; + "jsons-to-schema" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, conduit , conduit-combinators, containers, Glob, hjsonschema, hspec @@ -158463,8 +158773,8 @@ self: { }: mkDerivation { pname = "katip"; - version = "0.8.6.0"; - sha256 = "02rq2rl9cgxfay6bnxzh7r354x20hj8zdc60pfhvh3l8naslyk5z"; + version = "0.8.7.0"; + sha256 = "1m74n6fyxczfgg3swkkgr6864mzji1l0dpwpxk5zd93488zrij9v"; libraryHaskellDepends = [ aeson async auto-update base bytestring containers either hostname microlens microlens-th monad-control mtl old-locale resourcet @@ -159564,27 +159874,27 @@ self: { , blaze-builder, bytestring, case-insensitive, conduit , conduit-extra, containers, data-default, directory, filepath , fsnotify, hspec, http-client, http-conduit, http-reverse-proxy - , http-types, HUnit, lifted-base, mtl, network, process, random - , regex-tdfa, stm, tar, template-haskell, text, time, tls - , tls-session-manager, transformers, unix, unix-compat - , unordered-containers, vector, wai, wai-app-static, wai-extra - , warp, warp-tls, yaml, zlib + , http-types, HUnit, indexed-traversable, lifted-base, mtl, network + , optparse-applicative, process, random, regex-tdfa, stm, tar + , template-haskell, text, time, tls, tls-session-manager + , transformers, unix, unix-compat, unordered-containers, vector + , wai, wai-app-static, wai-extra, warp, warp-tls, yaml, zlib }: mkDerivation { pname = "keter"; - version = "1.5"; - sha256 = "0ifz4la1hxv53cz21p3b6cn2mj4ivqj77y5ppyy47dfsbsr1ihal"; + version = "1.6"; + sha256 = "1adqib4zk0a32hi3i0cxf3z0ljx12hymzxh5mag6sr0mx64qcsr1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson array async attoparsec base blaze-builder bytestring case-insensitive conduit conduit-extra containers data-default directory filepath fsnotify http-client http-conduit - http-reverse-proxy http-types lifted-base mtl network process - random regex-tdfa stm tar template-haskell text time tls - tls-session-manager transformers unix unix-compat - unordered-containers vector wai wai-app-static wai-extra warp - warp-tls yaml zlib + http-reverse-proxy http-types indexed-traversable lifted-base mtl + network optparse-applicative process random regex-tdfa stm tar + template-haskell text time tls tls-session-manager transformers + unix unix-compat unordered-containers vector wai wai-app-static + wai-extra warp warp-tls yaml zlib ]; executableHaskellDepends = [ base data-default filepath ]; testHaskellDepends = [ @@ -159740,6 +160050,8 @@ self: { pname = "keys"; version = "3.12.3"; sha256 = "0ik6wsff306dnbz0v3gpiajlj5b558hrk9176fzcb2fclf4447nm"; + revision = "1"; + editedCabalFile = "18fapd53nby46p5103y1m2hwpixn5p12mbyvb8va71pk4b77qlcy"; libraryHaskellDepends = [ array base comonad containers free hashable semigroupoids semigroups tagged transformers transformers-compat @@ -160956,8 +161268,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "lacroix"; - version = "0.1.0.0"; - sha256 = "0d65dqvbfrrvgdnagjyiq8xf7635rd46wda722g85dxzxr1l7mbn"; + version = "0.2.0.0"; + sha256 = "131h3fnr8wxvbr8b7qqf82zjxnidpq4v6qx1bimcnby366nc7val"; libraryHaskellDepends = [ base ]; description = "fizzy n dizzy"; license = lib.licenses.mit; @@ -163291,8 +163603,6 @@ self: { ]; description = "Numerical Linear Algebra using LAPACK"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "lapack_0_4" = callPackage @@ -163324,7 +163634,6 @@ self: { description = "Numerical Linear Algebra using LAPACK"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "lapack-carray" = callPackage @@ -163410,6 +163719,7 @@ self: { description = "Conversion of objects between 'lapack' and 'hmatrix'"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "large-hashable" = callPackage @@ -165116,6 +165426,19 @@ self: { license = lib.licenses.bsd3; }) {}; + "lens-family-th_0_5_2_1" = callPackage + ({ mkDerivation, base, hspec, template-haskell, transformers }: + mkDerivation { + pname = "lens-family-th"; + version = "0.5.2.1"; + sha256 = "1w8k68a1lyfd79xkc4fbf6z7p5gpriq4pjgb4n9p58az6awnn7dh"; + libraryHaskellDepends = [ base template-haskell ]; + testHaskellDepends = [ base hspec template-haskell transformers ]; + description = "Generate lens-family style lenses"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "lens-filesystem" = callPackage ({ mkDerivation, base, directory, filepath, hspec, lens , lens-action @@ -166040,8 +166363,8 @@ self: { pname = "libfuse3"; version = "0.1.2.0"; sha256 = "0a59b4xag5vzisrnvf4v1zkdsdzky96h8w2mdj6cip3vgr196frb"; - revision = "3"; - editedCabalFile = "1w59kyc8hvlmbq8n6i7nz8cg8mkzzhfizfpgcm17adxlh6a68ana"; + revision = "4"; + editedCabalFile = "1ra0c9yaihppggv1qy66iy8lhswlyd58qql49v3gwmzb81cccmjp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -167080,6 +167403,8 @@ self: { pname = "lift-generics"; version = "0.2.1"; sha256 = "1qkzq8hcb6j15cslv577bmhjcxmljzsrryysdgd7r99kr3q445b4"; + revision = "1"; + editedCabalFile = "0i0qxm2fi34bnpnwk5k61yjx72pc9j8jhbx44xk176pw7y2pinxd"; libraryHaskellDepends = [ base generic-deriving ghc-prim template-haskell th-compat ]; @@ -167260,6 +167585,8 @@ self: { pname = "lifx-lan"; version = "0.5.0.1"; sha256 = "0rww31gcp5asbc0zb6fz7ddgw3dih6l2mc0rln7nf3qd04hplk6v"; + revision = "2"; + editedCabalFile = "0k4lm2qbqq4xb5rxb0nik5sc898g4w7k050j4gs1ri4xbz32z7cn"; libraryHaskellDepends = [ base binary bytestring composition containers extra monad-loops mtl network random safe text time transformers @@ -167766,7 +168093,6 @@ self: { ]; description = "Compute resistance of linear electrical circuits"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "linear-circuit_0_1_0_3" = callPackage @@ -167824,8 +168150,8 @@ self: { }: mkDerivation { pname = "linear-generics"; - version = "0.1.0.1"; - sha256 = "0ck7gx1chrxyyn7lwbv4gn15zxgfgg7ai0i6404jprvvh72j7b8r"; + version = "0.2"; + sha256 = "16l117m3zblla1cn5866mknvhc1s9737qhld6bym4xsyqsgvh2sz"; libraryHaskellDepends = [ base containers ghc-prim template-haskell th-abstraction ]; @@ -169835,6 +170161,8 @@ self: { pname = "llvm-ffi-tools"; version = "0.0.0.1"; sha256 = "0nicgcdlywb8w5fr7hi5hgayv9phwslp5s47p2c30kavj7c3f3zk"; + revision = "1"; + editedCabalFile = "1wmwrhjs732izgbihbbb7l856pgxa1q5f32z06935ykwfwy160x7"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -169842,8 +170170,6 @@ self: { ]; description = "Tools for maintaining the llvm-ffi package"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "llvm-general" = callPackage @@ -170019,8 +170345,6 @@ self: { ]; description = "Generate Pkg-Config configuration file for LLVM"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "llvm-pretty" = callPackage @@ -171915,8 +172239,8 @@ self: { ({ mkDerivation, base, lua, tasty, tasty-hunit }: mkDerivation { pname = "lpeg"; - version = "1.0.0"; - sha256 = "01502izg6fkkp93vc2sr4csx7crqlx7zxgk85rm5kfdx7vh7qjfs"; + version = "1.0.1"; + sha256 = "0zhg7d85s6rx1dh3mndpjjy3k8b5ixyz28wl6i8zvn2mxyx40y98"; libraryHaskellDepends = [ base lua ]; testHaskellDepends = [ base lua tasty tasty-hunit ]; description = "LPeg – Parsing Expression Grammars For Lua"; @@ -172468,15 +172792,17 @@ self: { license = lib.licenses.bsd3; }) {}; - "lucid_2_10_0" = callPackage + "lucid_2_11_0" = callPackage ({ mkDerivation, base, bifunctors, blaze-builder, bytestring , containers, criterion, deepseq, hashable, hspec, HUnit, mmorph , mtl, parsec, text, transformers, unordered-containers }: mkDerivation { pname = "lucid"; - version = "2.10.0"; - sha256 = "1xzrb31n1kx6ym8za32ggy0cxmm2pcv9vm5czzsip5va6p5411yg"; + version = "2.11.0"; + sha256 = "1m1f13vxn3pwc7wvhx0czzxlx2ws8lzdgxlxd1707cx79jyib5sl"; + revision = "1"; + editedCabalFile = "0ai0rxiyni9cxzad3ix50vkxqqmgxfd1vpqzfrmmll1swxpicd8q"; libraryHaskellDepends = [ base blaze-builder bytestring containers hashable mmorph mtl text transformers unordered-containers @@ -172507,6 +172833,22 @@ self: { license = lib.licenses.bsd3; }) {}; + "lucid-alpine_0_1_0_4" = callPackage + ({ mkDerivation, base, lucid, text }: + mkDerivation { + pname = "lucid-alpine"; + version = "0.1.0.4"; + sha256 = "1pr2fg5r43jvgh694lhqbmwl1dida9ymgw161j16dcj66jx8fjk6"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base lucid text ]; + executableHaskellDepends = [ base lucid text ]; + testHaskellDepends = [ base lucid text ]; + description = "Use Alpine.js in your lucid templates"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "lucid-cdn" = callPackage ({ mkDerivation, base, lucid }: mkDerivation { @@ -172574,6 +172916,19 @@ self: { license = lib.licenses.bsd3; }) {}; + "lucid-htmx_0_1_0_3" = callPackage + ({ mkDerivation, base, lucid, servant, text }: + mkDerivation { + pname = "lucid-htmx"; + version = "0.1.0.3"; + sha256 = "1fgb4gika5f3bbba2as4bkg6m8nn2w25k17m45b389rwmhyg6syj"; + libraryHaskellDepends = [ base lucid servant text ]; + testHaskellDepends = [ base lucid servant text ]; + description = "Use htmx in your lucid templates"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "lucid-svg" = callPackage ({ mkDerivation, base, blaze-builder, lucid, text, transformers }: mkDerivation { @@ -173803,7 +174158,6 @@ self: { ]; description = "Compute solutions for Magico puzzle"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "magico_0_0_2_2" = callPackage @@ -176016,8 +176370,8 @@ self: { }: mkDerivation { pname = "matplotlib"; - version = "0.7.5"; - sha256 = "0iyjr6j5jp7lqrk9rqqvxz3rx8221hwz56p82zqkj3aarrvy21cs"; + version = "0.7.6"; + sha256 = "0wykzz4d6a55x3bxn9r01bvgvz26yvldgyrnz87rqncxymdawmd4"; libraryHaskellDepends = [ aeson base bytestring containers deepseq filepath process split temporary @@ -176030,7 +176384,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "matplotlib_0_7_6" = callPackage + "matplotlib_0_7_7" = callPackage ({ mkDerivation, ad, aeson, base, bytestring, containers, deepseq , directory, filepath, process, random, raw-strings-qq, split , tasty, tasty-expected-failure, tasty-golden, tasty-hunit @@ -176038,8 +176392,8 @@ self: { }: mkDerivation { pname = "matplotlib"; - version = "0.7.6"; - sha256 = "0wykzz4d6a55x3bxn9r01bvgvz26yvldgyrnz87rqncxymdawmd4"; + version = "0.7.7"; + sha256 = "08qwqnsdch7hzyy0jiz6yvirf0gqm9xx24i3ikm5q993prsdpi2h"; libraryHaskellDepends = [ aeson base bytestring containers deepseq filepath process split temporary @@ -176283,8 +176637,8 @@ self: { }: mkDerivation { pname = "matterhorn"; - version = "50200.14.0"; - sha256 = "0x0f7s4pz0ds1vg8v8qycafmg2i21542p8bmhhrzzwj2m99bgx5d"; + version = "50200.14.1"; + sha256 = "0bxz54881pypwwr2acxarsk362708vwii2krq1ya0kg2ybhcxh72"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -177858,8 +178212,8 @@ self: { pname = "mercury-api"; version = "0.1.0.2"; sha256 = "0ybpc1kai85rflgdr80jd8cvwxaxmbphv82nz2p17502jrmdfkhg"; - revision = "6"; - editedCabalFile = "03d71mfq8nvqjr7hcpkh1q25fi1avqj35mfrrf7rkm13fr49bi7i"; + revision = "7"; + editedCabalFile = "1qgcph7cmdxijxfgpwwszbyh07kwalnqli4fp85s7z1fxqfwl5n8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -178620,8 +178974,8 @@ self: { pname = "microaeson"; version = "0.1.0.0"; sha256 = "1hbpyz6p9snnd85h2y0pdqp20svxrggavbv0q8z33sc5i4p8b7iz"; - revision = "3"; - editedCabalFile = "09fbsmxlhcjazd99r05n1cla9akficbnfylszg9jkpic7g0p5pa3"; + revision = "4"; + editedCabalFile = "0rrdyk6clik8g3biv40rpg50qzfacb9yrd45ah85xpmk8flbzcfx"; libraryHaskellDepends = [ array base bytestring containers deepseq text ]; @@ -178867,6 +179221,23 @@ self: { license = lib.licenses.bsd3; }) {}; + "microlens-platform_0_4_2_1" = callPackage + ({ mkDerivation, base, hashable, microlens, microlens-ghc + , microlens-mtl, microlens-th, text, unordered-containers, vector + }: + mkDerivation { + pname = "microlens-platform"; + version = "0.4.2.1"; + sha256 = "0z8snyzy18kqj32fb89mzgscjrg6w2z0jkkj4b9vl2jvbps0gkg6"; + libraryHaskellDepends = [ + base hashable microlens microlens-ghc microlens-mtl microlens-th + text unordered-containers vector + ]; + description = "microlens + all batteries included (best for apps)"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "microlens-process" = callPackage ({ mkDerivation, base, Cabal, cabal-doctest, doctest, filepath , microlens, process @@ -179208,8 +179579,8 @@ self: { }: mkDerivation { pname = "mighttpd2"; - version = "4.0.1"; - sha256 = "1vgdva68dmkmfchgf3lpa2lrs7di2v3s7snpaxbpyjbr9zrqw6gn"; + version = "4.0.2"; + sha256 = "0q09adyhaa9mxajj5fg3fsdpckdh3icp2bvm1f64l1m3jqxw8k8x"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -180008,6 +180379,18 @@ self: { license = lib.licenses.bsd3; }) {}; + "mintty_0_1_3" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "mintty"; + version = "0.1.3"; + sha256 = "07gy5w0zbx9q64kdr6rzkwdxrgxh2h188bkdvbbgxwk86m9q9i7x"; + libraryHaskellDepends = [ base ]; + description = "A reliable way to detect the presence of a MinTTY console on Windows"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "mios" = callPackage ({ mkDerivation, base, bytestring, ghc-prim, gitrev, hspec , primitive, vector @@ -180692,6 +181075,27 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "mmark-ext_0_2_1_4" = callPackage + ({ mkDerivation, base, foldl, ghc-syntax-highlighter, hspec + , hspec-discover, lucid, microlens, mmark, modern-uri, skylighting + , text + }: + mkDerivation { + pname = "mmark-ext"; + version = "0.2.1.4"; + sha256 = "02ygx0kkp69gd2n4bnqjzbwzhs9ksqm148jf6zfgn3z8w1p9glzh"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base foldl ghc-syntax-highlighter lucid microlens mmark modern-uri + skylighting text + ]; + testHaskellDepends = [ base hspec lucid mmark skylighting text ]; + testToolDepends = [ hspec-discover ]; + description = "Commonly useful extensions for the MMark markdown processor"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "mmorph_1_1_3" = callPackage ({ mkDerivation, base, mtl, transformers, transformers-compat }: mkDerivation { @@ -180838,8 +181242,8 @@ self: { }: mkDerivation { pname = "mmsyn6ukr-array"; - version = "0.3.0.0"; - sha256 = "16niig3irz25g8lpx4bg6mf3i74n5162pv7555rkraxd91wy7hhw"; + version = "0.3.1.0"; + sha256 = "1xmi3qbifk4hw9lgm33ldh6cfrwhppr7kg0cimlv2vmzpcz2ski2"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -182679,12 +183083,12 @@ self: { }) {}; "monad-tree" = callPackage - ({ mkDerivation, base }: + ({ mkDerivation, base, mtl, transformers }: mkDerivation { pname = "monad-tree"; - version = "0.1.0"; - sha256 = "1rjrcai2wqz3qkn3sk1fj6c0vvzk58gmghzwp9w9xvr09kd7zyd2"; - libraryHaskellDepends = [ base ]; + version = "0.2.0.0"; + sha256 = "1k3vbxc4z03inryalw725nwgb9xh92lwdw31746irzhwgbvrfqjk"; + libraryHaskellDepends = [ base mtl transformers ]; description = "Tree data structure for nondeterministic computations"; license = lib.licenses.mit; }) {}; @@ -183341,6 +183745,24 @@ self: { license = lib.licenses.bsd3; }) {}; + "mono-traversable-keys_0_2_0" = callPackage + ({ mkDerivation, base, bytestring, containers, hashable, keys + , mono-traversable, text, transformers, unordered-containers + , vector, vector-instances + }: + mkDerivation { + pname = "mono-traversable-keys"; + version = "0.2.0"; + sha256 = "0v0bh73l6fa3bvyfakm2sbp9qi7bd8aw468kr8d51zsl8r0b6nil"; + libraryHaskellDepends = [ + base bytestring containers hashable keys mono-traversable text + transformers unordered-containers vector vector-instances + ]; + description = "Type-classes for interacting with monomorphic containers with a key"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "mono-traversable-wrapper" = callPackage ({ mkDerivation, base, mono-traversable }: mkDerivation { @@ -184043,6 +184465,36 @@ self: { license = lib.licenses.mit; }) {}; + "morpheus-graphql_0_18_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers + , morpheus-graphql-app, morpheus-graphql-code-gen + , morpheus-graphql-core, morpheus-graphql-subscriptions + , morpheus-graphql-tests, mtl, relude, tasty, tasty-hunit + , template-haskell, text, transformers, unordered-containers + , vector + }: + mkDerivation { + pname = "morpheus-graphql"; + version = "0.18.0"; + sha256 = "1358hjnxla83v7rkn49r07cs8n49czm5shfdpc3avl564w1bzmzi"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson base bytestring containers morpheus-graphql-app + morpheus-graphql-code-gen morpheus-graphql-core mtl relude + template-haskell text transformers unordered-containers vector + ]; + testHaskellDepends = [ + aeson base bytestring containers morpheus-graphql-app + morpheus-graphql-code-gen morpheus-graphql-core + morpheus-graphql-subscriptions morpheus-graphql-tests mtl relude + tasty tasty-hunit template-haskell text transformers + unordered-containers vector + ]; + description = "Morpheus GraphQL"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "morpheus-graphql-app" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, directory , hashable, megaparsec, morpheus-graphql-core, mtl, relude @@ -184069,6 +184521,34 @@ self: { license = lib.licenses.mit; }) {}; + "morpheus-graphql-app_0_18_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, directory + , hashable, megaparsec, morpheus-graphql-core + , morpheus-graphql-tests, mtl, relude, scientific, tasty + , tasty-hunit, template-haskell, text, th-lift-instances + , transformers, unordered-containers, vector + }: + mkDerivation { + pname = "morpheus-graphql-app"; + version = "0.18.0"; + sha256 = "1s9v87pgn7fdnyx1776y4nvf0kx0ry08r5522dyqgwzfgd4s059z"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson base bytestring containers hashable megaparsec + morpheus-graphql-core mtl relude scientific template-haskell text + th-lift-instances transformers unordered-containers vector + ]; + testHaskellDepends = [ + aeson base bytestring containers directory hashable megaparsec + morpheus-graphql-core morpheus-graphql-tests mtl relude scientific + tasty tasty-hunit template-haskell text th-lift-instances + transformers unordered-containers vector + ]; + description = "Morpheus GraphQL App"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "morpheus-graphql-cli" = callPackage ({ mkDerivation, base, bytestring, filepath, morpheus-graphql , optparse-applicative @@ -184114,6 +184594,58 @@ self: { license = lib.licenses.mit; }) {}; + "morpheus-graphql-client_0_18_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, directory + , morpheus-graphql-code-gen, morpheus-graphql-core, mtl, relude + , tasty, tasty-hunit, template-haskell, text, transformers + , unordered-containers + }: + mkDerivation { + pname = "morpheus-graphql-client"; + version = "0.18.0"; + sha256 = "0i8f932gq3p1ybh764pkr189iisbjqcjcq92awqyzxgpj39j0gg0"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson base bytestring morpheus-graphql-code-gen + morpheus-graphql-core mtl relude template-haskell text transformers + unordered-containers + ]; + testHaskellDepends = [ + aeson base bytestring directory morpheus-graphql-code-gen + morpheus-graphql-core mtl relude tasty tasty-hunit template-haskell + text transformers unordered-containers + ]; + description = "Morpheus GraphQL Client"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + + "morpheus-graphql-code-gen" = callPackage + ({ mkDerivation, base, bytestring, containers, filepath + , morpheus-graphql-core, optparse-applicative, prettyprinter + , relude, template-haskell, text, unordered-containers + }: + mkDerivation { + pname = "morpheus-graphql-code-gen"; + version = "0.18.0"; + sha256 = "1965y2wd813y82mllzrnhiyjk2mp0vi7j6x7phwlmpabmsij5x0f"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring containers morpheus-graphql-core prettyprinter + relude template-haskell text unordered-containers + ]; + executableHaskellDepends = [ + base bytestring containers filepath morpheus-graphql-core + optparse-applicative prettyprinter relude template-haskell text + unordered-containers + ]; + description = "Morpheus GraphQL CLI"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "morpheus-graphql-core" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, directory , hashable, megaparsec, mtl, relude, scientific, tasty, tasty-hunit @@ -184139,6 +184671,33 @@ self: { license = lib.licenses.mit; }) {}; + "morpheus-graphql-core_0_18_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, directory + , hashable, megaparsec, morpheus-graphql-tests, mtl, relude + , scientific, tasty, tasty-hunit, template-haskell, text + , th-lift-instances, transformers, unordered-containers, vector + }: + mkDerivation { + pname = "morpheus-graphql-core"; + version = "0.18.0"; + sha256 = "07j3i5dfc245l9gil3dk6c5sd7853m5923dxa993fj4gd564mwfd"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson base bytestring containers hashable megaparsec mtl relude + scientific template-haskell text th-lift-instances transformers + unordered-containers vector + ]; + testHaskellDepends = [ + aeson base bytestring containers directory hashable megaparsec + morpheus-graphql-tests mtl relude scientific tasty tasty-hunit + template-haskell text th-lift-instances transformers + unordered-containers vector + ]; + description = "Morpheus GraphQL Core"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "morpheus-graphql-subscriptions" = callPackage ({ mkDerivation, aeson, base, bytestring, directory , morpheus-graphql-app, morpheus-graphql-core, mtl, relude, tasty @@ -184163,6 +184722,47 @@ self: { license = lib.licenses.mit; }) {}; + "morpheus-graphql-subscriptions_0_18_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, directory + , morpheus-graphql-app, morpheus-graphql-core, mtl, relude, tasty + , tasty-hunit, text, transformers, unliftio-core + , unordered-containers, uuid, websockets + }: + mkDerivation { + pname = "morpheus-graphql-subscriptions"; + version = "0.18.0"; + sha256 = "02xpnrvd8wydp1b7jvk2pqcrx6ldn8nvffz22g0l5xrrpcvhg9s4"; + libraryHaskellDepends = [ + aeson base bytestring morpheus-graphql-app morpheus-graphql-core + mtl relude text transformers unliftio-core unordered-containers + uuid websockets + ]; + testHaskellDepends = [ + aeson base bytestring directory morpheus-graphql-app + morpheus-graphql-core mtl relude tasty tasty-hunit text + transformers unliftio-core unordered-containers uuid websockets + ]; + description = "Morpheus GraphQL Subscriptions"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + + "morpheus-graphql-tests" = callPackage + ({ mkDerivation, aeson, base, bytestring, directory, relude, tasty + , tasty-hunit, text, unordered-containers + }: + mkDerivation { + pname = "morpheus-graphql-tests"; + version = "0.18.0"; + sha256 = "0l89mmsl09ph412l8f9xjlyx8yp5g69ffmajynxcqvj501n21s9z"; + libraryHaskellDepends = [ + aeson base bytestring directory relude tasty tasty-hunit text + unordered-containers + ]; + description = "Morpheus GraphQL Test"; + license = lib.licenses.mit; + }) {}; + "morphisms" = callPackage ({ mkDerivation }: mkDerivation { @@ -188597,8 +189197,8 @@ self: { pname = "nats"; version = "1.1.2"; sha256 = "1v40drmhixck3pz3mdfghamh73l4rp71mzcviipv1y8jhrfxilmr"; - revision = "3"; - editedCabalFile = "02ww45nskca28fsbh74iy0z4rm0yshws7lrxld45y053hrn1jdzc"; + revision = "4"; + editedCabalFile = "0qccypqkfs7hi0v2bsjfqfhpi2jgsnpfwi9vmcqh7jxk5g08njk0"; doHaddock = false; description = "Natural numbers"; license = lib.licenses.bsd3; @@ -190858,6 +191458,8 @@ self: { pname = "network-transport"; version = "0.5.4"; sha256 = "0izcqi3zl7ynav0qqrrfmiax8vziqwrhflprddhjj6x6nkzhp1sv"; + revision = "1"; + editedCabalFile = "03parnmzh2mffs6fadqbf4lw1d5bsmvr347rzamp230s303nr6yc"; libraryHaskellDepends = [ base binary bytestring deepseq hashable transformers ]; @@ -190952,6 +191554,8 @@ self: { pname = "network-transport-tests"; version = "0.3.0"; sha256 = "1552mgccfyyvvnplhflkfxgg3246jgx9iiv71a0gwblllbsh5y8p"; + revision = "1"; + editedCabalFile = "0kk8kib742s3iiah6d9g94ma776m4nyh14syvibsssfj1immf3jd"; libraryHaskellDepends = [ ansi-terminal base bytestring containers mtl network-transport random @@ -191984,19 +192588,19 @@ self: { }) {}; "nix-diff" = callPackage - ({ mkDerivation, attoparsec, base, containers, directory, mtl - , nix-derivation, optparse-applicative, patience, text, unix - , vector + ({ mkDerivation, attoparsec, base, containers, directory, filepath + , mtl, nix-derivation, optparse-applicative, patience, process + , text, unix, vector }: mkDerivation { pname = "nix-diff"; - version = "1.0.15"; - sha256 = "0sjnihdhiib45chc04hr38g12sgp9rmjx2fibha9qsqla3rjnx3y"; + version = "1.0.16"; + sha256 = "1l6d43d4pr9ql4lbcslk9cjw1lxj9y0bbgxdfqxrj46lg9w63h6g"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - attoparsec base containers directory mtl nix-derivation - optparse-applicative patience text unix vector + attoparsec base containers directory filepath mtl nix-derivation + optparse-applicative patience process text unix vector ]; description = "Explain why two Nix derivations differ"; license = lib.licenses.bsd3; @@ -192174,8 +192778,8 @@ self: { }: mkDerivation { pname = "nix-tree"; - version = "0.1.8"; - sha256 = "0bbisb0n7jg5ng17qyh92rbx1qphvd8w4gr6v773j8m72j24vj0c"; + version = "0.1.9"; + sha256 = "1xgb7f735afq0x7y3lsdciv9mk7cf9szbazn9fksb7fxf437w27m"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -193062,6 +193666,8 @@ self: { pname = "normalization-insensitive"; version = "2.0.2"; sha256 = "1rr12rrij64hi6jkd42h4x2m86k1ra10ykzpzc38n6rfdhyiswpn"; + revision = "1"; + editedCabalFile = "0q5h2017r0zwgi2xdrznhq2llljz9bslqnhq1l5zczrm9xs3304x"; libraryHaskellDepends = [ base bytestring deepseq hashable text unicode-transforms ]; @@ -193974,14 +194580,12 @@ self: { }) {}; "numeric-kinds" = callPackage - ({ mkDerivation, base }: + ({ mkDerivation, base, type-compare }: mkDerivation { pname = "numeric-kinds"; - version = "0.1.0.0"; - sha256 = "0rdx39wa7kklx9a7i5rdwf541fxpz9v3n32rvy2fa6i7n4hr64s4"; - revision = "2"; - editedCabalFile = "1zlgarjmhp9mhlp8l1cygk570l0bc3yabid4c2bi1xm4ckii8cyc"; - libraryHaskellDepends = [ base ]; + version = "0.2.0"; + sha256 = "0ba882bjp7gzqdfy15jgi8kbls2cjbp7860vzc7winzlsf0zqdy1"; + libraryHaskellDepends = [ base type-compare ]; description = "Type-level numeric types and classes"; license = lib.licenses.asl20; }) {}; @@ -196005,6 +196609,36 @@ self: { license = lib.licenses.bsd3; }) {}; + "opaleye_0_7_6_2" = callPackage + ({ mkDerivation, aeson, base, base16-bytestring, bytestring + , case-insensitive, containers, contravariant, dotenv, hspec + , hspec-discover, multiset, postgresql-simple, pretty + , product-profunctors, profunctors, QuickCheck, scientific + , semigroups, text, time, time-compat, time-locale-compat + , transformers, uuid, void + }: + mkDerivation { + pname = "opaleye"; + version = "0.7.6.2"; + sha256 = "0dln0r4qk5k4gmjg06275zgbzgivwxw471sd0y4l01j3x7ix3q46"; + libraryHaskellDepends = [ + aeson base base16-bytestring bytestring case-insensitive + contravariant postgresql-simple pretty product-profunctors + profunctors scientific semigroups text time-compat + time-locale-compat transformers uuid void + ]; + testHaskellDepends = [ + aeson base bytestring containers contravariant dotenv hspec + hspec-discover multiset postgresql-simple product-profunctors + profunctors QuickCheck semigroups text time time-compat + transformers uuid + ]; + testToolDepends = [ hspec-discover ]; + description = "An SQL-generating DSL targeting PostgreSQL"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "opaleye-classy" = callPackage ({ mkDerivation, base, bytestring, lens, mtl, opaleye , postgresql-simple, product-profunctors, transformers @@ -196372,8 +197006,8 @@ self: { pname = "openapi3"; version = "3.1.0"; sha256 = "011754qyxxw5mn06hdmxalvsiff7a4x4k2yb2r6ylzr6zhyz818z"; - revision = "1"; - editedCabalFile = "1rbsfjwraizp0b6j2zaimz63b46k7d8abfxw7jyb7j1cv6jkcll1"; + revision = "2"; + editedCabalFile = "0hjczkslbn7m9vpn6vqxsr0b8aqa6im8pms3jbfcd7pfkp810z2s"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal cabal-doctest ]; @@ -197262,8 +197896,8 @@ self: { }: mkDerivation { pname = "opentracing"; - version = "0.2.0"; - sha256 = "1yl3hhg32npj4ncqc9j5gl2jikzvczkpnrwp124nk45mzi13aszq"; + version = "0.2.1"; + sha256 = "0p2y996cl5hfw85kdr0majymxccv2d1ka15wbyc2qxgskz3dy9cq"; libraryHaskellDepends = [ aeson async base base64-bytestring bytestring case-insensitive clock containers http-types iproute lens mtl mwc-random network @@ -197441,6 +198075,21 @@ self: { license = lib.licenses.bsd3; }) {}; + "operational_0_2_4_1" = callPackage + ({ mkDerivation, base, mtl, random }: + mkDerivation { + pname = "operational"; + version = "0.2.4.1"; + sha256 = "0aa1pxymvkhbs0x03ikfiap2skzyf2z7307kz5adkmb3qmykcqa2"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base mtl ]; + executableHaskellDepends = [ base mtl random ]; + description = "Implementation of difficult monads made easy with operational semantics"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "operational-alacarte" = callPackage ({ mkDerivation, base, mtl }: mkDerivation { @@ -198008,6 +198657,25 @@ self: { maintainers = with lib.maintainers; [ Gabriel439 ]; }) {}; + "optparse-generic_1_4_7" = callPackage + ({ mkDerivation, base, bytestring, Only, optparse-applicative + , system-filepath, text, time, transformers, transformers-compat + , void + }: + mkDerivation { + pname = "optparse-generic"; + version = "1.4.7"; + sha256 = "03s6iwfr2iiypnx3wmnrb37zz7kflk40dj38v8j4ccqxkkf9h0kk"; + libraryHaskellDepends = [ + base bytestring Only optparse-applicative system-filepath text time + transformers transformers-compat void + ]; + description = "Auto-generate a command-line parser for your datatype"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + maintainers = with lib.maintainers; [ Gabriel439 ]; + }) {}; + "optparse-helper" = callPackage ({ mkDerivation, base, optparse-applicative }: mkDerivation { @@ -198617,8 +199285,8 @@ self: { }: mkDerivation { pname = "orthotope"; - version = "0.1.0.0"; - sha256 = "0nx97r1svhzayf0f4chj8mprqp524hliffnw5y612lwsx41c671k"; + version = "0.1.1.0"; + sha256 = "0hjhy9i73r223s3p9xnbw2ac34dvnanrsdnnl6c9707ymjhy57jq"; libraryHaskellDepends = [ base deepseq dlist pretty QuickCheck vector ]; @@ -198630,6 +199298,17 @@ self: { license = lib.licenses.asl20; }) {}; + "orthotope-hmatrix" = callPackage + ({ mkDerivation, base, hmatrix, orthotope }: + mkDerivation { + pname = "orthotope-hmatrix"; + version = "0.1.0.1"; + sha256 = "0xibg10wx0adchksxfr8087lrbp0h384lddq0dmvpk9hvc5j2qhl"; + libraryHaskellDepends = [ base hmatrix orthotope ]; + description = "Some algorithms from hmatrix"; + license = lib.licenses.asl20; + }) {}; + "ory-hydra-client" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, bytestring , case-insensitive, containers, deepseq, exceptions, hspec @@ -199885,10 +200564,8 @@ self: { }: mkDerivation { pname = "pandoc-crossref"; - version = "0.3.12.0"; - sha256 = "0y991lp6bgjiz67b1w6jywhwzwq5kf385pzl91s4g22lfnhwc7sz"; - revision = "2"; - editedCabalFile = "1gms6jaj21sycg3r1yc61xb2p1a5x2cd1z29y6jcjrh02n96g3g4"; + version = "0.3.12.1"; + sha256 = "036lw5qa23bg292hgfj3ybfykbqj80fb2f8a26rnivj5pfqblm3w"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -205714,6 +206391,31 @@ self: { broken = true; }) {}; + "pg-entity" = callPackage + ({ mkDerivation, base, bytestring, colourista, exceptions, hspec + , hspec-expectations-lifted, hspec-pg-transact, monad-control + , parsec, pg-transact, postgresql-simple + , postgresql-simple-migration, resource-pool, safe-exceptions + , template-haskell, text, text-manipulate, time, uuid, vector + }: + mkDerivation { + pname = "pg-entity"; + version = "0.0.1.0"; + sha256 = "0njmlxxisigza4k6v5ci36xm6mpf5jdls2mrlarlw91agxiz8zd9"; + libraryHaskellDepends = [ + base bytestring colourista exceptions monad-control parsec + pg-transact postgresql-simple resource-pool safe-exceptions + template-haskell text text-manipulate time uuid vector + ]; + testHaskellDepends = [ + base hspec hspec-expectations-lifted hspec-pg-transact pg-transact + postgresql-simple postgresql-simple-migration text time uuid vector + ]; + description = "A pleasant PostgreSQL layer"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "pg-extras" = callPackage ({ mkDerivation, base, bytestring, HUnit, postgresql-simple , raw-strings-qq, text, time @@ -206371,8 +207073,8 @@ self: { }: mkDerivation { pname = "phonetic-languages-simplified-base"; - version = "0.4.0.0"; - sha256 = "1hifw367zc5zkrka4lpjl412ka9zsbdlmn58v2hmbm3j4c09phmj"; + version = "0.4.1.0"; + sha256 = "0jwwa1xj1k2bj9iw89lpks04q62zg6sp5ixfhlbs83zwhfz2jplb"; libraryHaskellDepends = [ base phonetic-languages-permutations-array subG ]; @@ -206409,8 +207111,8 @@ self: { }: mkDerivation { pname = "phonetic-languages-simplified-examples-array"; - version = "0.14.1.0"; - sha256 = "170r88sys7xzdxmrq2l31a6g0pwzpwg601aj827f3gn5c0rm3l2p"; + version = "0.15.1.0"; + sha256 = "1y9i8278737dqil8gx8m27c8fwlzi949wb86z31r9v8k8irsx3p1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -206561,8 +207263,8 @@ self: { }: mkDerivation { pname = "phonetic-languages-simplified-properties-array"; - version = "0.11.0.0"; - sha256 = "1aazfaqvaf7sjidsnvs54nw4bbsnkygv1i3fw0xvcqqzygzns9gk"; + version = "0.12.0.0"; + sha256 = "1m4ficmkzp3k6xsg9dby8ch8k8zlc4jvgxxr76pnhy29dkgs8yxp"; libraryHaskellDepends = [ base phonetic-languages-rhythmicity phonetic-languages-simplified-base ukrainian-phonetics-basic-array @@ -209808,6 +210510,8 @@ self: { pname = "pointed"; version = "5.0.3"; sha256 = "0999bba0gbb2qhk1ydaslmdf7ca17ip751psi4phi1lhb250fl8b"; + revision = "1"; + editedCabalFile = "00x5chjb3l43n35g7amaj3x32ahlwffp7v5khc1qmzxfqz6z50mv"; libraryHaskellDepends = [ base comonad containers data-default-class hashable kan-extensions semigroupoids semigroups stm tagged transformers @@ -210505,8 +211209,8 @@ self: { }: mkDerivation { pname = "polysemy-RandomFu"; - version = "0.4.3.0"; - sha256 = "054v54kwkrg13nx9kznkclnmjnynh9j48bk2fjylwd9xqrj1r63a"; + version = "0.4.4.0"; + sha256 = "0mh6iiyz859446l8r54bqg8hmaig40kdapq9k4niry35nba6fdr1"; libraryHaskellDepends = [ base polysemy polysemy-plugin polysemy-zoo random-fu random-source ]; @@ -212513,10 +213217,8 @@ self: { }: mkDerivation { pname = "postgresql-migration"; - version = "0.2.1.2"; - sha256 = "168da2n2ky17mygrxnh9z95nwscw2b769xhykmg9d398mnz9a188"; - revision = "1"; - editedCabalFile = "09vzsig1jm9n6i6h7ybqlg3ffmgzyg7cpjlwaha9p7w70afjvmgh"; + version = "0.2.1.3"; + sha256 = "1qxkan5f328rv3nl31pvhz305k7b4ah98s0j1bc4hcaa5g5d3052"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -217720,6 +218422,8 @@ self: { pname = "pseudo-boolean"; version = "0.1.10.0"; sha256 = "1p9w1d80d2kp7wp7wp6xf9dz1iv9knhy8b75mklz7zq3cf5gvnrh"; + revision = "1"; + editedCabalFile = "05jvm2bhvzsxwiazsvgk6xwzjg1isabqnx8grx1v9hrxr6hjhlap"; libraryHaskellDepends = [ attoparsec base bytestring bytestring-builder containers deepseq dlist hashable megaparsec parsec void @@ -217805,10 +218509,8 @@ self: { }: mkDerivation { pname = "psqueues"; - version = "0.2.7.2"; - sha256 = "1yckx2csqswghiy9nfj03cybmza8104nmnpbpcc9ngwlbmakn9i6"; - revision = "1"; - editedCabalFile = "0d0mm3c8x31dasfzp1884r2irkm3c9irvvbahjzfr1bzzxfb7vyv"; + version = "0.2.7.3"; + sha256 = "1cmz7spfzx7niglmsphnndh0m4b8njkn0fhb9nshbnbq6nx515yh"; libraryHaskellDepends = [ base deepseq ghc-prim hashable ]; testHaskellDepends = [ array base deepseq ghc-prim hashable HUnit QuickCheck tagged tasty @@ -218868,6 +219570,28 @@ self: { license = lib.licenses.mit; }) {}; + "pusher-http-haskell_2_1_0_6" = callPackage + ({ mkDerivation, aeson, base, base16-bytestring, bytestring + , cryptonite, hashable, hspec, http-client, http-client-tls + , http-types, memory, QuickCheck, text, time, unordered-containers + }: + mkDerivation { + pname = "pusher-http-haskell"; + version = "2.1.0.6"; + sha256 = "029pxzidmflsa19417bcx82hbxj3yq1khzb6skf97xbzzf3hs6ki"; + libraryHaskellDepends = [ + aeson base base16-bytestring bytestring cryptonite hashable + http-client http-client-tls http-types memory text time + unordered-containers + ]; + testHaskellDepends = [ + aeson base bytestring hspec QuickCheck text unordered-containers + ]; + description = "Haskell client library for the Pusher Channels HTTP API"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "pusher-ws" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, deepseq , hashable, http-conduit, lens, lens-aeson, network, scientific @@ -221254,8 +221978,8 @@ self: { }: mkDerivation { pname = "r-glpk-phonetic-languages-ukrainian-durations"; - version = "0.4.0.0"; - sha256 = "0rw9scbxhk5v61b7d4hwvwv4jxkkglsnzphslwashalhcfxc39p7"; + version = "0.4.1.0"; + sha256 = "1zgxr7c2szzmwk9n9hdir2nfg4gzpzwk4jgzlb95m5wlpagsz3fl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -223875,8 +224599,8 @@ self: { }: mkDerivation { pname = "readline-in-other-words"; - version = "0.1.0.0"; - sha256 = "180arjxnwz6gp4ccjk7kjhyhmic4hgcbcc8klrl79c9vqjjp6hnq"; + version = "0.1.0.2"; + sha256 = "1wldgk1dfq4kalxi3mmsyja39mvk2hb40fl83cwqbvhn39brfmq9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -223889,6 +224613,8 @@ self: { ]; description = "Readline effect for in-other-words"; license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "readline-statevar" = callPackage @@ -224135,6 +224861,28 @@ self: { license = lib.licenses.mit; }) {}; + "rebase_1_13_1" = callPackage + ({ mkDerivation, base, bifunctors, bytestring, comonad, containers + , contravariant, deepseq, dlist, either, hashable, hashable-time + , mtl, profunctors, scientific, selective, semigroupoids, stm, text + , time, transformers, unordered-containers, uuid-types, vector + , vector-instances, void + }: + mkDerivation { + pname = "rebase"; + version = "1.13.1"; + sha256 = "1ffl4lxan27g6fkhyddbgf7n0b57l4zbzngrz0fajdfp96xklsn4"; + libraryHaskellDepends = [ + base bifunctors bytestring comonad containers contravariant deepseq + dlist either hashable hashable-time mtl profunctors scientific + selective semigroupoids stm text time transformers + unordered-containers uuid-types vector vector-instances void + ]; + description = "A more progressive alternative to the \"base\" package"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "rebindable" = callPackage ({ mkDerivation, base, data-default-class, indexed }: mkDerivation { @@ -224207,23 +224955,6 @@ self: { }) {}; "record-dot-preprocessor" = callPackage - ({ mkDerivation, base, extra, filepath, ghc, record-hasfield - , uniplate - }: - mkDerivation { - pname = "record-dot-preprocessor"; - version = "0.2.12"; - sha256 = "02vyfcfanf09nd33q37jmnq0wbncvkfjn4hx4yzr62dkmh47bkkf"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base extra ghc uniplate ]; - executableHaskellDepends = [ base extra ]; - testHaskellDepends = [ base extra filepath record-hasfield ]; - description = "Preprocessor to allow record.field syntax"; - license = lib.licenses.bsd3; - }) {}; - - "record-dot-preprocessor_0_2_13" = callPackage ({ mkDerivation, base, extra, filepath, ghc, record-hasfield , uniplate }: @@ -224238,7 +224969,6 @@ self: { testHaskellDepends = [ base extra filepath record-hasfield ]; description = "Preprocessor to allow record.field syntax"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "record-encode" = callPackage @@ -224807,6 +225537,8 @@ self: { pname = "reducers"; version = "3.12.4"; sha256 = "0hsycdir52jdijnnvc77jj971fjrrc722v952wr62ivrvx2zarn0"; + revision = "1"; + editedCabalFile = "0i5mvhfp5b6dmmk8l93492cyjxn6n9dncmijpbp4hbqi40pr9g47"; libraryHaskellDepends = [ array base bytestring containers fingertree hashable semigroupoids text transformers unordered-containers @@ -228564,6 +229296,18 @@ self: { license = lib.licenses.mit; }) {}; + "rerebase_1_13_1" = callPackage + ({ mkDerivation, rebase }: + mkDerivation { + pname = "rerebase"; + version = "1.13.1"; + sha256 = "1g3lwnkykl4np2fzylhi7469y10a3vpxxn1i5mqhm0mmx5lwrhw3"; + libraryHaskellDepends = [ rebase ]; + description = "Reexports from \"base\" with a bunch of other standard libraries"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "reroute" = callPackage ({ mkDerivation, base, criterion, deepseq, graph-core, hashable , hspec, http-api-data, hvect, mtl, random, regex-compat, text @@ -228682,7 +229426,6 @@ self: { executableHaskellDepends = [ base comfort-array lapack ]; description = "Compute total resistance of a cube of resistors"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "resistor-cube_0_0_1_3" = callPackage @@ -233712,8 +234455,8 @@ self: { pname = "salak"; version = "0.3.6"; sha256 = "00qyd09az0ldfidfgcki8z3r9gcpxmss3iyr99as5bky29rlz9n3"; - revision = "5"; - editedCabalFile = "1dqanr95rrmjxfw882fa6as7n999883gfsy2765f3rprl7wlmigl"; + revision = "6"; + editedCabalFile = "1wrq2rdrxk96an5k1igcn09cma3dz9y2yp58xjlg2lh22djm297m"; libraryHaskellDepends = [ base bytestring containers data-default directory dlist exceptions filepath hashable heaps megaparsec mtl scientific text time @@ -234466,8 +235209,8 @@ self: { }: mkDerivation { pname = "satyros"; - version = "0.2.0.0"; - sha256 = "12mk86a46i5k4ng8r3f7s3ccs2p9kz345v3b8p8hrmmcgksimkds"; + version = "0.3.1.3"; + sha256 = "1d0x3cm0wf4bpncb73b3mzmpcwdnwyf3pi7848hr3blnz5v3aj2b"; libraryHaskellDepends = [ base containers extra free lens mtl random vector ]; @@ -237765,8 +238508,8 @@ self: { pname = "semigroupoids"; version = "5.3.6"; sha256 = "0glhqc9x8i5z3bdg23xvl2lfns95msid3h3x0jksna7i6c8j869n"; - revision = "1"; - editedCabalFile = "0inbks8x588bpcw7kyap69iy0zrkygycp8hwgrd9yhbxlvj9hmh9"; + revision = "2"; + editedCabalFile = "0gnkd1kf1s412p7g4c1l1d1yykhl5hlvdnnn1c85c0h8pi19y4an"; libraryHaskellDepends = [ base base-orphans bifunctors comonad containers contravariant distributive hashable tagged template-haskell transformers @@ -238014,8 +238757,8 @@ self: { }: mkDerivation { pname = "sensei"; - version = "0.5.0"; - sha256 = "011lck879q12npszqf2cjsxyjrcyfhrs77dh8kbififm53dfglf4"; + version = "0.6.0"; + sha256 = "19hbm83v3bn2ximfd5bqjzq1xb079ajxbw1kc8gkm9ds4mg7aw0b"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -240010,8 +240753,8 @@ self: { }: mkDerivation { pname = "servant-lucid"; - version = "0.9.0.2"; - sha256 = "0l68dffx746j3p2l5x59cj5cdng2dw6vjq5x5h44m0ccbsmlckpz"; + version = "0.9.0.3"; + sha256 = "10g7radhkh50hpwf97syh3kpdacw096bnawni0hwwbi6rfgz38nm"; libraryHaskellDepends = [ base http-media lucid servant text ]; testHaskellDepends = [ base lucid servant-server wai warp ]; description = "Servant support for lucid"; @@ -244417,6 +245160,19 @@ self: { license = lib.licenses.bsd3; }) {}; + "silently_1_2_5_2" = callPackage + ({ mkDerivation, base, deepseq, directory, nanospec, temporary }: + mkDerivation { + pname = "silently"; + version = "1.2.5.2"; + sha256 = "15dnp83b0wj7m5v4r2yfrwxg9g6szv94ldcb74fpidninrqgqns6"; + libraryHaskellDepends = [ base deepseq directory ]; + testHaskellDepends = [ base deepseq directory nanospec temporary ]; + description = "Prevent or capture writing to stdout and other handles"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "silkscreen" = callPackage ({ mkDerivation, base, prettyprinter }: mkDerivation { @@ -245936,6 +246692,24 @@ self: { license = lib.licenses.bsd3; }) {}; + "singletons-presburger_0_6_1_0" = callPackage + ({ mkDerivation, base, ghc-typelits-presburger, mtl, reflection + , singletons + }: + mkDerivation { + pname = "singletons-presburger"; + version = "0.6.1.0"; + sha256 = "1s12g1qcdz035y2lzjivw2m2jm9hqvbwvgmxvahn4a2j89f4zgky"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base ghc-typelits-presburger mtl reflection singletons + ]; + description = "Presburger Arithmetic Solver for GHC Type-level natural numbers with Singletons package"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "singletons-th" = callPackage ({ mkDerivation, base, containers, ghc-boot-th, mtl, singletons , syb, template-haskell, th-desugar, th-orphans, transformers @@ -249704,14 +250478,12 @@ self: { }) {}; "snumber" = callPackage - ({ mkDerivation, base, numeric-kinds }: + ({ mkDerivation, base, numeric-kinds, type-compare }: mkDerivation { pname = "snumber"; - version = "0.2.0"; - sha256 = "0q1xswnh1rymnyi3jpn4fn6fwj36haamwri7ifd4f7jm2a9v1isx"; - revision = "1"; - editedCabalFile = "1ai6syqkwa0rl23f23hv6wkqg274lrdsh6jqyy9xiklcl8j3bz5w"; - libraryHaskellDepends = [ base numeric-kinds ]; + version = "0.3.0"; + sha256 = "16kgy0chysxws8n4651qq6bfwyk184v67iv2h2kbiyxl8wqsjq4l"; + libraryHaskellDepends = [ base numeric-kinds type-compare ]; description = "Integer singletons with flexible representation"; license = lib.licenses.asl20; }) {}; @@ -251185,6 +251957,8 @@ self: { pname = "special-values"; version = "0.1.0.0"; sha256 = "1kkdw2c4d2hha99v9f89ahmifjxp7fxmxyfwq9a8xk6s0h9xs51w"; + revision = "1"; + editedCabalFile = "10pbx4px4kmg6nwb78bayi26dlzbzvji5zv9fa6f45rk19p2sdlc"; libraryHaskellDepends = [ base bytestring ieee754 scientific text ]; @@ -256205,6 +256979,29 @@ self: { license = lib.licenses.mit; }) {}; + "streaming-commons_0_2_2_2" = callPackage + ({ mkDerivation, array, async, base, bytestring, deepseq, directory + , gauge, hspec, network, process, QuickCheck, random, stm, text + , transformers, unix, zlib + }: + mkDerivation { + pname = "streaming-commons"; + version = "0.2.2.2"; + sha256 = "0j1hwqadczg4rw9pmiv21qs9kvqxarxqg4dv4cpcrxx72b4xssvq"; + libraryHaskellDepends = [ + array async base bytestring directory network process random stm + text transformers unix zlib + ]; + testHaskellDepends = [ + array async base bytestring deepseq hspec network QuickCheck text + unix zlib + ]; + benchmarkHaskellDepends = [ base bytestring deepseq gauge text ]; + description = "Common lower-level functions needed by various streaming data libraries"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "streaming-concurrency" = callPackage ({ mkDerivation, base, exceptions, hspec, HUnit, lifted-async , monad-control, QuickCheck, quickcheck-instances, stm, streaming @@ -259669,6 +260466,39 @@ self: { license = lib.licenses.bsd3; }) {}; + "swagger2_2_7" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, base-compat-batteries + , bytestring, Cabal, cabal-doctest, containers, cookie, doctest + , generics-sop, Glob, hashable, hspec, hspec-discover, http-media + , HUnit, insert-ordered-containers, lens, mtl, network, optics-core + , optics-th, QuickCheck, quickcheck-instances, scientific + , template-haskell, text, time, transformers, unordered-containers + , utf8-string, uuid-types, vector + }: + mkDerivation { + pname = "swagger2"; + version = "2.7"; + sha256 = "1p3vi90siylgg94s7izmdvp2i36g017q2hnl90d1rpphi0nd1f6b"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + aeson aeson-pretty base base-compat-batteries bytestring containers + cookie generics-sop hashable http-media insert-ordered-containers + lens mtl network optics-core optics-th QuickCheck scientific + template-haskell text time transformers unordered-containers + uuid-types vector + ]; + testHaskellDepends = [ + aeson base base-compat-batteries bytestring containers doctest Glob + hashable hspec HUnit insert-ordered-containers lens mtl QuickCheck + quickcheck-instances template-haskell text time + unordered-containers utf8-string vector + ]; + testToolDepends = [ hspec-discover ]; + description = "Swagger 2.0 data model"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "swapper" = callPackage ({ mkDerivation, base, binary, bytestring, deepseq, happstack-data , happstack-state, parallel, tokyocabinet @@ -259786,15 +260616,44 @@ self: { license = lib.licenses.lgpl21Only; }) {}; + "swish_0_10_0_8" = callPackage + ({ mkDerivation, base, containers, directory, filepath, hashable + , HUnit, intern, mtl, network-uri, old-locale, polyparse + , semigroups, test-framework, test-framework-hunit, text, time + }: + mkDerivation { + pname = "swish"; + version = "0.10.0.8"; + sha256 = "1a7iz3d78r00mgkq370zy5fxjkb5x34c9iq3kc3gbl6hs6m6l579"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base containers directory filepath hashable intern mtl network-uri + old-locale polyparse text time + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + base containers hashable HUnit network-uri old-locale semigroups + test-framework test-framework-hunit text time + ]; + description = "A semantic web toolkit"; + license = lib.licenses.lgpl21Only; + hydraPlatforms = lib.platforms.none; + }) {}; + "swiss-ephemeris" = callPackage ({ mkDerivation, base, directory, hspec, hspec-discover, QuickCheck + , random, time, vector }: mkDerivation { pname = "swiss-ephemeris"; - version = "1.3.0.2"; - sha256 = "0p8fzkd4wqvmc5fjlsb0ri6645n1rg304m8nm9085ipy1svi7sn0"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base directory hspec QuickCheck ]; + version = "1.4.0.0"; + sha256 = "0ss502h2083qbiprspylwv02lbgidqgi106qs6k4s6jppgay34gx"; + libraryHaskellDepends = [ base time vector ]; + testHaskellDepends = [ + base directory hspec QuickCheck random time vector + ]; testToolDepends = [ hspec-discover ]; description = "Haskell bindings for the Swiss Ephemeris C library"; license = lib.licenses.agpl3Only; @@ -261283,8 +262142,6 @@ self: { platforms = [ "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" ]; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "synthesizer-core" = callPackage @@ -262890,13 +263747,18 @@ self: { }) {}; "tangle" = callPackage - ({ mkDerivation, base, transformers }: + ({ mkDerivation, barbies, base, containers, lens, transformers }: mkDerivation { pname = "tangle"; - version = "0"; - sha256 = "1ylv73v6ydf39zfks9762dsz27sxr7sbmmk7k628yqc9czj3nj60"; - libraryHaskellDepends = [ base transformers ]; - description = "HKD record builder"; + version = "0.1"; + sha256 = "0gx8zcshi465wxxrmjrl40l8bph0md764fkjzqrq7w517x8cxdhb"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ barbies base transformers ]; + executableHaskellDepends = [ + barbies base containers lens transformers + ]; + description = "Heterogenous memoisation monad"; license = lib.licenses.bsd3; }) {}; @@ -267436,6 +268298,25 @@ self: { license = lib.licenses.bsd3; }) {}; + "text-printer_0_5_0_2" = callPackage + ({ mkDerivation, base, bytestring, pretty, QuickCheck + , test-framework, test-framework-quickcheck2, text, text-latin1 + }: + mkDerivation { + pname = "text-printer"; + version = "0.5.0.2"; + sha256 = "1qzmgqcr1bmz34h24gvnfaxaqr3c7z727xv676sd1x51y2qjj2dl"; + libraryHaskellDepends = [ + base bytestring pretty text text-latin1 + ]; + testHaskellDepends = [ + base QuickCheck test-framework test-framework-quickcheck2 + ]; + description = "Abstract interface for text builders/printers"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "text-regex-replace" = callPackage ({ mkDerivation, attoparsec, base, hspec, QuickCheck, smallcheck , text, text-icu @@ -268230,19 +269111,6 @@ self: { }) {}; "th-env" = callPackage - ({ mkDerivation, base, markdown-unlit, template-haskell }: - mkDerivation { - pname = "th-env"; - version = "0.1.0.2"; - sha256 = "13rs6p5mq92am9i80c829dcmsrpbihdq8ds6ad7rdl2d23i9pln0"; - libraryHaskellDepends = [ base template-haskell ]; - testHaskellDepends = [ base markdown-unlit ]; - testToolDepends = [ markdown-unlit ]; - description = "Template Haskell splice that expands to an environment variable"; - license = lib.licenses.bsd3; - }) {}; - - "th-env_0_1_0_3" = callPackage ({ mkDerivation, base, markdown-unlit, template-haskell, th-compat }: mkDerivation { @@ -268254,7 +269122,6 @@ self: { testToolDepends = [ markdown-unlit ]; description = "Template Haskell splice that expands to an environment variable"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "th-expand-syns" = callPackage @@ -268641,6 +269508,26 @@ self: { license = lib.licenses.bsd3; }) {}; + "th-test-utils_1_1_1" = callPackage + ({ mkDerivation, base, bytestring, tasty, tasty-golden, tasty-hunit + , template-haskell, th-orphans, transformers + }: + mkDerivation { + pname = "th-test-utils"; + version = "1.1.1"; + sha256 = "03qpszfhb58nmm673zhbkvsmw1ynjr2h19qpggyay2fk5zgq7n3q"; + libraryHaskellDepends = [ + base template-haskell th-orphans transformers + ]; + testHaskellDepends = [ + base bytestring tasty tasty-golden tasty-hunit template-haskell + th-orphans transformers + ]; + description = "Utility functions for testing Template Haskell code"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "th-to-exp" = callPackage ({ mkDerivation, base, hspec, template-haskell }: mkDerivation { @@ -269269,8 +270156,8 @@ self: { pname = "threepenny-gui"; version = "0.9.1.0"; sha256 = "00sjkfa9qfnnwqfdw68yb8hq6nm1y5qv9896rzn5aachr7mlfpx2"; - revision = "2"; - editedCabalFile = "0pbdkl9gvs6jrwfhrkfyrzra5mw8zy8pycp49czbhghwck51bf8i"; + revision = "3"; + editedCabalFile = "0pk2vy2lqifjdm3cw9lhl5nx7aw4ff4g8p6l8p7yc9x7h9m6va16"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -270589,13 +271476,13 @@ self: { }) {}; "timers-tick" = callPackage - ({ mkDerivation, base, hspec }: + ({ mkDerivation, base, hspec, QuickCheck }: mkDerivation { pname = "timers-tick"; - version = "0.4.3.0"; - sha256 = "02qsla7az60ch515hns1nychpdb35xlz2g4iy7jp2d5ak6jzma5r"; + version = "0.5.0.0"; + sha256 = "0j4nf3l939dwn35q2qan58pxs4v82s1nh6zm5jgbpq38bhxvjvmc"; libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base hspec ]; + testHaskellDepends = [ base hspec QuickCheck ]; description = "tick based timers"; license = lib.licenses.bsd3; }) {}; @@ -272095,16 +272982,16 @@ self: { license = lib.licenses.mpl20; }) {}; - "tomland_1_3_3_0" = callPackage + "tomland_1_3_3_1" = callPackage ({ mkDerivation, base, bytestring, containers, deepseq, directory , hashable, hedgehog, hspec, hspec-hedgehog, hspec-megaparsec - , markdown-unlit, megaparsec, mtl, parser-combinators, text, time - , transformers, unordered-containers, validation-selective + , megaparsec, mtl, parser-combinators, text, time, transformers + , unordered-containers, validation-selective }: mkDerivation { pname = "tomland"; - version = "1.3.3.0"; - sha256 = "1masnbr5x75727k2rmgcmxqm91139v9wy434ml5a4c3dsry7xyhv"; + version = "1.3.3.1"; + sha256 = "1hg6hx9ak43gzzn3h643z54jkp5x0wjad313j8299fsi31768wgg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -272112,10 +272999,6 @@ self: { parser-combinators text time transformers unordered-containers validation-selective ]; - executableHaskellDepends = [ - base bytestring containers hashable text time unordered-containers - ]; - executableToolDepends = [ markdown-unlit ]; testHaskellDepends = [ base bytestring containers directory hashable hedgehog hspec hspec-hedgehog hspec-megaparsec megaparsec text time @@ -276318,6 +277201,17 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "type-compare" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "type-compare"; + version = "0.1.1"; + sha256 = "0k0mb43cx87i7gp6w391gvsnqzfcxdyzmn3fnwqp7nn5vy8x851c"; + libraryHaskellDepends = [ base ]; + description = "Type-level Ord compatibility layer"; + license = lib.licenses.asl20; + }) {}; + "type-digits" = callPackage ({ mkDerivation, base, template-haskell, type-spine }: mkDerivation { @@ -277448,8 +278342,8 @@ self: { }: mkDerivation { pname = "typesafe-precure"; - version = "0.8.0.1"; - sha256 = "05rsyiksmw3gilr944hr1q12alinsy842qwzvc444iwyvc4f0i17"; + version = "0.8.1.1"; + sha256 = "10siihvba8c4zbwvw247zrx9z5v5sgr8vswjbbiw9gn7qdiq8ppa"; libraryHaskellDepends = [ aeson aeson-pretty autoexporter base bytestring dlist monad-skeleton template-haskell text th-data-compat @@ -278147,8 +279041,8 @@ self: { ({ mkDerivation, base, bytestring, mmsyn2-array, mmsyn5 }: mkDerivation { pname = "ukrainian-phonetics-basic-array"; - version = "0.4.1.0"; - sha256 = "09gs3d37njv5acr6nqcw899y0pycy4qxnqc36d7f4r8ny4w8lvp5"; + version = "0.4.2.0"; + sha256 = "1qw75wp493bnzwcbmhaifm4m7dj71f5q16xcscmgsysf1lj2y3m3"; libraryHaskellDepends = [ base bytestring mmsyn2-array mmsyn5 ]; description = "A library to work with the basic Ukrainian phonetics and syllable segmentation"; license = lib.licenses.mit; @@ -278769,6 +279663,34 @@ self: { license = lib.licenses.bsd2; }) {}; + "unicode-collation_0_1_3_1" = callPackage + ({ mkDerivation, base, binary, bytestring, containers, parsec + , QuickCheck, quickcheck-instances, tasty, tasty-bench, tasty-hunit + , tasty-quickcheck, template-haskell, text, text-icu + , th-lift-instances, unicode-transforms + }: + mkDerivation { + pname = "unicode-collation"; + version = "0.1.3.1"; + sha256 = "1b04ml07ghfsh9cmp6b0l8c6ywxrn3c4xs7swvlmxx64asmicf3i"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base binary bytestring containers parsec template-haskell text + th-lift-instances + ]; + testHaskellDepends = [ + base bytestring tasty tasty-hunit tasty-quickcheck text + unicode-transforms + ]; + benchmarkHaskellDepends = [ + base QuickCheck quickcheck-instances tasty-bench text text-icu + ]; + description = "Haskell implementation of the Unicode Collation Algorithm"; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; + }) {}; + "unicode-data" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -278864,6 +279786,20 @@ self: { broken = true; }) {}; + "unicode-show_0_1_0_5" = callPackage + ({ mkDerivation, base, hspec, QuickCheck }: + mkDerivation { + pname = "unicode-show"; + version = "0.1.0.5"; + sha256 = "0iq2fivi6fclra32y5yqc6p18pd7qlyxb042hkc082pvgmj8b40v"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base hspec QuickCheck ]; + description = "print and show in unicode"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "unicode-symbols" = callPackage ({ mkDerivation, base, containers }: mkDerivation { @@ -279134,8 +280070,8 @@ self: { pname = "union"; version = "0.1.2"; sha256 = "1i4fvlwkw1wx64a6l8342aqfqsdq7fqa4p24g3i5gn5704lxrsb3"; - revision = "6"; - editedCabalFile = "1n1innjiqksancaazsczryyjfr7905q1iq9radwqq5ngl8xi83wz"; + revision = "7"; + editedCabalFile = "1xcm1v2dipdahd4c6hki0fx9a7vg52q3wz5aa8nw5lxjkc4s3xn8"; libraryHaskellDepends = [ base deepseq hashable profunctors tagged vinyl ]; @@ -279262,6 +280198,8 @@ self: { pname = "unique"; version = "0.0.1"; sha256 = "1dgln2dr64ma1isqskj1qnjslg9smmr7jssg8hmk68wp36i3rwkd"; + revision = "1"; + editedCabalFile = "0l95cgs8hbvakrcqzqk5l9rkz3cr3jnnszq7pgjnxrqfhgsp58r7"; libraryHaskellDepends = [ base hashable ]; description = "Fully concurrent unique identifiers"; license = lib.licenses.bsd3; @@ -279893,17 +280831,6 @@ self: { }) {}; "unix-bytestring" = callPackage - ({ mkDerivation, base, bytestring }: - mkDerivation { - pname = "unix-bytestring"; - version = "0.3.7.5"; - sha256 = "003003nh00aww2k8wdygjp0z7f61z8nz8840iinww83xph5wsih5"; - libraryHaskellDepends = [ base bytestring ]; - description = "Unix/Posix-specific functions for ByteStrings"; - license = lib.licenses.bsd3; - }) {}; - - "unix-bytestring_0_3_7_6" = callPackage ({ mkDerivation, base, bytestring }: mkDerivation { pname = "unix-bytestring"; @@ -279912,7 +280839,6 @@ self: { libraryHaskellDepends = [ base bytestring ]; description = "Unix/Posix-specific functions for ByteStrings"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "unix-compat" = callPackage @@ -280321,6 +281247,29 @@ self: { license = lib.licenses.bsd3; }) {}; + "unordered-containers_0_2_15_0" = callPackage + ({ mkDerivation, base, bytestring, ChasingBottoms, containers + , deepseq, gauge, hashable, hashmap, HUnit, mtl, QuickCheck, random + , test-framework, test-framework-hunit, test-framework-quickcheck2 + }: + mkDerivation { + pname = "unordered-containers"; + version = "0.2.15.0"; + sha256 = "0s6kmkz0p5iw5bkmbv4fhgd6cb7v8a75wkv7h5acxp52h3qfm4kc"; + libraryHaskellDepends = [ base deepseq hashable ]; + testHaskellDepends = [ + base ChasingBottoms containers hashable HUnit QuickCheck random + test-framework test-framework-hunit test-framework-quickcheck2 + ]; + benchmarkHaskellDepends = [ + base bytestring containers deepseq gauge hashable hashmap mtl + random + ]; + description = "Efficient hashing-based container types"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "unordered-containers-rematch" = callPackage ({ mkDerivation, base, hashable, hspec, HUnit, rematch , unordered-containers @@ -283963,6 +284912,21 @@ self: { license = lib.licenses.bsd3; }) {}; + "vector-th-unbox_0_2_2" = callPackage + ({ mkDerivation, base, data-default, template-haskell, vector }: + mkDerivation { + pname = "vector-th-unbox"; + version = "0.2.2"; + sha256 = "0j81m09xxv24zziv0nanfppckzmas5184jr3npjhc9w49r3cm94a"; + revision = "1"; + editedCabalFile = "1kwjmjmp5pk9n9hps2y8kzjz4p42mcmzki8mypfhc0360n97r0wn"; + libraryHaskellDepends = [ base template-haskell vector ]; + testHaskellDepends = [ base data-default vector ]; + description = "Deriver for Data.Vector.Unboxed using Template Haskell"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "vectortiles" = callPackage ({ mkDerivation, base, bytestring, containers, criterion, deepseq , hashable, microlens, microlens-platform, mtl, protocol-buffers @@ -284016,8 +284980,8 @@ self: { }: mkDerivation { pname = "venzone"; - version = "1.0.0.6"; - sha256 = "1x0034ww13apr1g6mscncacri3nvnmjll7spsip1dnc70ilffk77"; + version = "1.1.0.0"; + sha256 = "19ivc72skzl8h06h5bfl6lfnph3knd9zz7842rsarjknbmszrgqg"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -285421,8 +286385,8 @@ self: { }: mkDerivation { pname = "vulkan"; - version = "3.13.1"; - sha256 = "1z5a7flk0c68p70l4mqc8ws45l4yqj4rfrcqshbbfqq54dwc5nlx"; + version = "3.13.2"; + sha256 = "1bbqz5xpd3jw71m70pdg6nifi63m0s42jvnldf55nj2ms0mzjmhr"; libraryHaskellDepends = [ base bytestring transformers vector ]; libraryPkgconfigDepends = [ vulkan ]; testHaskellDepends = [ @@ -289014,6 +289978,7 @@ self: { description = "Binding to the Webkit library"; license = lib.licenses.lgpl21Only; hydraPlatforms = lib.platforms.none; + broken = true; }) {inherit (pkgs) webkitgtk;}; "webkitgtk3-javascriptcore" = callPackage @@ -290266,6 +291231,8 @@ self: { pname = "witherable"; version = "0.4.2"; sha256 = "0121ic4xkv3k568j23zp22a5lrv0k11h94fq7cbijd18fjr2n3br"; + revision = "1"; + editedCabalFile = "1mwmnc4pdsw0v8p9bh8n49xjjmbyf5bd0kvlg970iyq3cqik546f"; libraryHaskellDepends = [ base base-orphans containers hashable indexed-traversable indexed-traversable-instances transformers unordered-containers @@ -293832,8 +294799,8 @@ self: { }: mkDerivation { pname = "xmobar"; - version = "0.39"; - sha256 = "1k1n3ff0ikdmfq0mi8r2vpqg1iq6hsw1drvxps6k98rvvn87pws6"; + version = "0.40"; + sha256 = "1mrdiblm8vilkm1w23pz6xbi16zh1b1lvql26czjzw5k79vd67sf"; configureFlags = [ "-fwith_alsa" "-fwith_conduit" "-fwith_datezone" "-fwith_dbus" "-fwith_inotify" "-fwith_iwlib" "-fwith_mpd" "-fwith_mpris" diff --git a/pkgs/development/interpreters/erlang/R24.nix b/pkgs/development/interpreters/erlang/R24.nix index 199189740c53..544bfbec5305 100644 --- a/pkgs/development/interpreters/erlang/R24.nix +++ b/pkgs/development/interpreters/erlang/R24.nix @@ -3,6 +3,6 @@ # How to obtain `sha256`: # nix-prefetch-url --unpack https://github.com/erlang/otp/archive/OTP-${version}.tar.gz mkDerivation { - version = "24.1.5"; - sha256 = "sha256-MSPoJpbL9WeERqCSh9fiw9jhJGssqolxudyURpiypb0="; + version = "24.1.6"; + sha256 = "sha256-Jh9w3+ft1RZjmb4PriCmHPj0tgkx8LBFjsg1s4BGojs="; } diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix index baee67cb826d..54843486e137 100644 --- a/pkgs/development/libraries/libinput/default.nix +++ b/pkgs/development/libraries/libinput/default.nix @@ -3,6 +3,7 @@ , documentationSupport ? false, doxygen, graphviz # Documentation , eventGUISupport ? false, cairo, glib, gtk3 # GUI event viewer support , testsSupport ? false, check, valgrind, python3 +, nixosTests }: let @@ -76,6 +77,10 @@ stdenv.mkDerivation rec { doCheck = testsSupport && stdenv.hostPlatform == stdenv.buildPlatform; + passthru.tests = { + libinput-module = nixosTests.libinput; + }; + meta = with lib; { description = "Handles input devices in Wayland compositors and provides a generic X.Org input driver"; homepage = "https://www.freedesktop.org/wiki/Software/libinput/"; diff --git a/pkgs/development/libraries/liburing/default.nix b/pkgs/development/libraries/liburing/default.nix index 595f9a5a9cd4..97a0ebda18da 100644 --- a/pkgs/development/libraries/liburing/default.nix +++ b/pkgs/development/libraries/liburing/default.nix @@ -33,16 +33,15 @@ stdenv.mkDerivation rec { outputs = [ "out" "bin" "dev" "man" ]; - postInstall = - # Copy the examples into $bin. Most reverse dependency of this package should - # reference only the $out output - '' + postInstall = '' + # Copy the examples into $bin. Most reverse dependency of this package should + # reference only the $out output mkdir -p $bin/bin cp ./examples/io_uring-cp examples/io_uring-test $bin/bin cp ./examples/link-cp $bin/bin/io_uring-link-cp + '' + lib.optionalString stdenv.hostPlatform.isGnu '' cp ./examples/ucontext-cp $bin/bin/io_uring-ucontext-cp - '' - ; + ''; meta = with lib; { description = "Userspace library for the Linux io_uring API"; diff --git a/pkgs/development/libraries/mumlib/default.nix b/pkgs/development/libraries/mumlib/default.nix deleted file mode 100644 index 02f0cd671f28..000000000000 --- a/pkgs/development/libraries/mumlib/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ stdenv, lib, fetchFromGitHub, cmake, pkg-config -, boost, openssl, log4cpp, libopus, protobuf }: -with lib; stdenv.mkDerivation { - pname = "mumlib"; - version = "unstable-2018-12-12"; - - src = fetchFromGitHub { - owner = "slomkowski"; - repo = "mumlib"; - rev = "f91720de264c0ab5e02bb30deafc5c4b2c245eac"; - sha256 = "0p29z8379dp2ra0420x8xjp4d3r2mf680lj38xmlc8npdzqjqjdp"; - }; - - buildInputs = [ boost openssl libopus protobuf log4cpp ]; - nativeBuildInputs = [ cmake pkg-config ]; - installPhase = '' - install -Dm555 libmumlib.so $out/lib/libmumlib.so - cp -a ../include $out - ''; - - meta = { - description = "Fairy simple Mumble library written in C++, using boost::asio asynchronous networking framework"; - homepage = "https://github.com/slomkowski/mumlib"; - maintainers = with maintainers; [ das_j ]; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/libraries/science/math/scs/default.nix b/pkgs/development/libraries/science/math/scs/default.nix index 96f543e430f0..10ea82f93d26 100644 --- a/pkgs/development/libraries/science/math/scs/default.nix +++ b/pkgs/development/libraries/science/math/scs/default.nix @@ -4,13 +4,13 @@ assert (!blas.isILP64) && (!lapack.isILP64); stdenv.mkDerivation rec { pname = "scs"; - version = "2.1.1"; + version = "3.0.0"; src = fetchFromGitHub { owner = "cvxgrp"; repo = "scs"; rev = version; - sha256 = "14g5m3lcvrbwpq1bq0liq00jh0gm1947lg3z4jfsp43f6p5alb20"; + sha256 = "sha256-Lly28KDDZ5hJyiMOhiX/3VaKs0iPcSqizOurZevhfCo="; }; # Actually link and add libgfortran to the rpath diff --git a/pkgs/development/libraries/sope/default.nix b/pkgs/development/libraries/sope/default.nix index df0aeeac3236..3b41495be7d4 100644 --- a/pkgs/development/libraries/sope/default.nix +++ b/pkgs/development/libraries/sope/default.nix @@ -4,13 +4,13 @@ with lib; gnustep.stdenv.mkDerivation rec { pname = "sope"; - version = "5.2.0"; + version = "5.3.0"; src = fetchFromGitHub { owner = "inverse-inc"; repo = pname; rev = "SOPE-${version}"; - sha256 = "14s9rcnglkwl0nmbmpdxxbiqqnr3m8n7x69idm1crgbbjkj4gi68"; + sha256 = "0xqa7fsf60acbri5dd9x8nmf1zdkalxnmkm559w4xz7sdi569ssa"; }; hardeningDisable = [ "format" ]; diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix index 96028009e2cb..acfce3d2e77a 100644 --- a/pkgs/development/libraries/sqlite/default.nix +++ b/pkgs/development/libraries/sqlite/default.nix @@ -1,10 +1,8 @@ -{ lib, stdenv, fetchurl, zlib, interactive ? false, readline ? null, ncurses ? null +{ lib, stdenv, fetchurl, zlib, interactive ? false, readline, ncurses , python3Packages , enableDeserialize ? false }: -assert interactive -> readline != null && ncurses != null; - with lib; let @@ -93,6 +91,7 @@ stdenv.mkDerivation rec { downloadPage = "https://sqlite.org/download.html"; homepage = "https://www.sqlite.org/"; license = licenses.publicDomain; + mainProgram = "sqlite3"; maintainers = with maintainers; [ eelco np ]; platforms = platforms.unix ++ platforms.windows; }; diff --git a/pkgs/development/mobile/androidenv/emulator.nix b/pkgs/development/mobile/androidenv/emulator.nix index 2746a60247bf..eec99498a160 100644 --- a/pkgs/development/mobile/androidenv/emulator.nix +++ b/pkgs/development/mobile/androidenv/emulator.nix @@ -3,7 +3,7 @@ deployAndroidPackage { inherit package os; buildInputs = [ autoPatchelfHook makeWrapper ] - ++ lib.optional (os == "linux") [ + ++ lib.optionals (os == "linux") [ pkgs.glibc pkgs.xorg.libX11 pkgs.xorg.libXext @@ -18,6 +18,7 @@ deployAndroidPackage { pkgs.libcxx pkgs.libGL pkgs.libpulseaudio + pkgs.libuuid pkgs.zlib pkgs.ncurses5 pkgs.stdenv.cc.cc diff --git a/pkgs/development/python-modules/casbin/default.nix b/pkgs/development/python-modules/casbin/default.nix index d26cd7e99855..9150e1c5298b 100644 --- a/pkgs/development/python-modules/casbin/default.nix +++ b/pkgs/development/python-modules/casbin/default.nix @@ -2,22 +2,23 @@ , buildPythonPackage , fetchFromGitHub , simpleeval -, isPy27 +, pythonOlder , coveralls , wcmatch }: buildPythonPackage rec { pname = "casbin"; - version = "1.9.6"; + version = "1.9.7"; + format = "setuptools"; - disabled = isPy27; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = pname; repo = "pycasbin"; rev = "v${version}"; - sha256 = "0r3pmkcgmsk3z6iy714fpg05mrs4ckb7ldyjsws6hwidcijha8rk"; + sha256 = "sha256-wNygKs37PtMLij3f+pAh6PNLqQ45cvrpF43Aj+cO8p8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/cvxpy/default.nix b/pkgs/development/python-modules/cvxpy/default.nix index b7b5c7f55af0..6fc56c85e9ec 100644 --- a/pkgs/development/python-modules/cvxpy/default.nix +++ b/pkgs/development/python-modules/cvxpy/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "cvxpy"; - version = "1.1.13"; + version = "1.1.17"; format = "pyproject"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "012avhf0a8n9xyy4g3xcr5z8z2a3m6rnqic6gfs9fq6p9bkq3ix9"; + sha256 = "sha256-M5fTuJ13Dqnw/DWbHJs6/t5qDTvqHP8g4mU7E0Uc24o="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/identify/default.nix b/pkgs/development/python-modules/identify/default.nix index 0e7ec10981f4..37e5f5bcb8a5 100644 --- a/pkgs/development/python-modules/identify/default.nix +++ b/pkgs/development/python-modules/identify/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "identify"; - version = "2.3.6"; + version = "2.3.7"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "pre-commit"; repo = pname; rev = "v${version}"; - sha256 = "sha256-1+ILyqb0Ve+YmP9K+tin4iYIWUoRpi/+fbuyUFZOzBE="; + sha256 = "sha256-L71Zi0SWFh7K4BRwF57prdrIdxLp8Igs0k/gc6k1+Mo="; }; checkInputs = [ diff --git a/pkgs/development/python-modules/niko-home-control/default.nix b/pkgs/development/python-modules/niko-home-control/default.nix new file mode 100644 index 000000000000..a7a696384dfb --- /dev/null +++ b/pkgs/development/python-modules/niko-home-control/default.nix @@ -0,0 +1,43 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, nclib +, netaddr +, netifaces +, pythonOlder +}: + +buildPythonPackage rec { + pname = "niko-home-control"; + version = "0.2.2"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "NoUseFreak"; + repo = pname; + rev = version; + sha256 = "0ah02dfnnbk98grvd180fp9rak5gpi58xiql1yyzig5pcbjidvk3"; + }; + + propagatedBuildInputs = [ + nclib + netaddr + netifaces + ]; + + # Project has no tests + doCheck = false; + + pythonImportsCheck = [ + "nikohomecontrol" + ]; + + meta = with lib; { + description = "Python SDK for Niko Home Control"; + homepage = "https://github.com/NoUseFreak/niko-home-control"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pydyf/default.nix b/pkgs/development/python-modules/pydyf/default.nix index d83034d25330..346a6f6e39b5 100644 --- a/pkgs/development/python-modules/pydyf/default.nix +++ b/pkgs/development/python-modules/pydyf/default.nix @@ -1,15 +1,11 @@ -{ lib, - buildPythonPackage, - fetchPypi, - isPy3k, - pytestCheckHook, - coverage, - ghostscript, - pillow, - pytest, - pytest-cov, - pytest-flake8, - pytest-isort +{ lib +, buildPythonPackage +, fetchPypi +, isPy3k +, pytestCheckHook +, coverage +, ghostscript +, pillow }: buildPythonPackage rec { @@ -17,28 +13,24 @@ buildPythonPackage rec { version = "0.1.2"; disabled = !isPy3k; - pytestFlagsArray = [ - # setup.py is auto-generated and doesn't pass the flake8 check - "--ignore=setup.py" - ]; + src = fetchPypi { + inherit version; + pname = "pydyf"; + sha256 = "sha256-Hi9d5IF09QXeAlp9HnzwG73ZQiyoq5RReCvwDuF4YCw="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "--isort --flake8 --cov --no-cov-on-fail" "" + ''; checkInputs = [ pytestCheckHook coverage ghostscript pillow - pytest - pytest-cov - pytest-flake8 - pytest-isort ]; - src = fetchPypi { - inherit version; - pname = "pydyf"; - sha256 = "sha256-Hi9d5IF09QXeAlp9HnzwG73ZQiyoq5RReCvwDuF4YCw="; - }; - meta = with lib; { homepage = "https://doc.courtbouillon.org/pydyf/stable/"; description = "Low-level PDF generator written in Python and based on PDF specification 1.7"; diff --git a/pkgs/development/python-modules/pyevilgenius/default.nix b/pkgs/development/python-modules/pyevilgenius/default.nix new file mode 100644 index 000000000000..28bb1a2c4c0a --- /dev/null +++ b/pkgs/development/python-modules/pyevilgenius/default.nix @@ -0,0 +1,42 @@ +{ lib +, aiohttp +, buildPythonPackage +, fetchFromGitHub +, async-timeout +, pythonOlder +}: + +buildPythonPackage rec { + pname = "pyevilgenius"; + version = "1.0.0"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "home-assistant-libs"; + repo = pname; + rev = version; + sha256 = "06xnl93sqklg7gx0z50vm79xwww0yyw05c1yynajc9aijfi8cmi3"; + }; + + propagatedBuildInputs = [ + aiohttp + async-timeout + ]; + + # Project has no test + doCheck = false; + + pythonImportsCheck = [ + "pyevilgenius" + ]; + + meta = with lib; { + description = "Python SDK to interact with Evil Genius Labs devices"; + homepage = "https://github.com/home-assistant-libs/pyevilgenius"; + changelog = "https://github.com/home-assistant-libs/pyevilgenius/releases/tag/${version}"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pysmartapp/default.nix b/pkgs/development/python-modules/pysmartapp/default.nix index abf3796ae7f7..a4ab8e58382c 100644 --- a/pkgs/development/python-modules/pysmartapp/default.nix +++ b/pkgs/development/python-modules/pysmartapp/default.nix @@ -4,17 +4,21 @@ , httpsig , pytest-asyncio , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "pysmartapp"; - version = "0.3.3"; + version = "0.3.4"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "andrewsayre"; repo = pname; rev = version; - sha256 = "03wk44siqxl15pa46x5vkg4q0mnga34ir7qn897576z2ivbx7awh"; + sha256 = "sha256-zYjv7wRxQTS4PnNaY69bw9xE6I4DZMocwUzEICBfwqM="; }; propagatedBuildInputs = [ @@ -26,7 +30,9 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ "pysmartapp" ]; + pythonImportsCheck = [ + "pysmartapp" + ]; meta = with lib; { description = "Python implementation to work with SmartApp lifecycle events"; diff --git a/pkgs/development/python-modules/qcs-api-client/default.nix b/pkgs/development/python-modules/qcs-api-client/default.nix index 8477ce29b745..5a64bc5e9f97 100644 --- a/pkgs/development/python-modules/qcs-api-client/default.nix +++ b/pkgs/development/python-modules/qcs-api-client/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "qcs-api-client"; - version = "0.16.0"; + version = "0.18.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "4ac6cf55e414494095ac1e1258f5700fed8eefa37d3b8da80264bd674cbfac43"; + sha256 = "sha256-7qrE+XqXOCmfauD772epIbZ1Lzv+5pXrA7tgD8qCVSE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/qiskit-aer/default.nix b/pkgs/development/python-modules/qiskit-aer/default.nix index a550ea4b3cf4..b2e708d586f7 100644 --- a/pkgs/development/python-modules/qiskit-aer/default.nix +++ b/pkgs/development/python-modules/qiskit-aer/default.nix @@ -88,6 +88,7 @@ buildPythonPackage rec { ]; # Slow tests disabledTests = [ + "test_clifford" # fails on cvxpy >= 1.1.15. https://github.com/Qiskit/qiskit-aer/pull/1318. Remove in future. "test_snapshot" # TODO: these ~30 tests fail on setup due to pytest fixture issues? "test_initialize_2" # TODO: simulations appear incorrect, off by >10%. @@ -111,7 +112,6 @@ buildPythonPackage rec { "_144" "test_sparse_output_probabilities" "test_reset_2_qubit" - # "test_clifford" ]; checkInputs = [ pytestCheckHook diff --git a/pkgs/development/python-modules/rtoml/default.nix b/pkgs/development/python-modules/rtoml/default.nix index e5043ca941a0..9ff43bce0843 100644 --- a/pkgs/development/python-modules/rtoml/default.nix +++ b/pkgs/development/python-modules/rtoml/default.nix @@ -5,6 +5,7 @@ , setuptools-rust , rustPlatform , pytestCheckHook +, libiconv }: buildPythonPackage rec { @@ -32,6 +33,8 @@ buildPythonPackage rec { cargoSetupHook ]; + buildInputs = [ libiconv ]; + pythonImportsCheck = [ "rtoml" ]; checkInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/scs/default.nix b/pkgs/development/python-modules/scs/default.nix index 128e9276608d..24b7d36343a8 100644 --- a/pkgs/development/python-modules/scs/default.nix +++ b/pkgs/development/python-modules/scs/default.nix @@ -5,26 +5,22 @@ , lapack , numpy , scipy -, scs # check inputs -, nose +, pytestCheckHook }: buildPythonPackage rec { - inherit (scs) pname version; + pname = "scs"; + version = "3.0.0"; src = fetchFromGitHub { owner = "bodono"; repo = "scs-python"; - rev = "f02abdc0e2e0a5851464e30f6766ccdbb19d73f0"; # need to choose commit manually, untagged - sha256 = "174b5s7cwgrn1m55jlrszdl403zhpzc4yl9acs6kjv9slmg1mmjr"; + rev = version; + sha256 = "sha256-7OgqCo21S0FDev8xv6/8iGFXg8naVi93zd8v1f9iaWw="; + fetchSubmodules = true; }; - preConfigure = '' - rm -r scs - ln -s ${scs.src} scs - ''; - buildInputs = [ lapack blas @@ -35,10 +31,7 @@ buildPythonPackage rec { scipy ]; - checkInputs = [ nose ]; - checkPhase = '' - nosetests - ''; + checkInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "scs" ]; meta = with lib; { @@ -50,7 +43,7 @@ buildPythonPackage rec { ''; homepage = "https://github.com/cvxgrp/scs"; # upstream C package downloadPage = "https://github.com/bodono/scs-python"; - license = licenses.gpl3; + license = licenses.mit; maintainers = with maintainers; [ drewrisinger ]; }; } diff --git a/pkgs/development/python-modules/uptime-kuma-monitor/default.nix b/pkgs/development/python-modules/uptime-kuma-monitor/default.nix new file mode 100644 index 000000000000..f689942abf93 --- /dev/null +++ b/pkgs/development/python-modules/uptime-kuma-monitor/default.nix @@ -0,0 +1,40 @@ +{ lib +, requests +, buildPythonPackage +, fetchPypi +, prometheus-client +, pythonOlder +}: + +buildPythonPackage rec { + pname = "uptime-kuma-monitor"; + version = "1.0.0"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; + + src = fetchPypi { + pname = "uptime_kuma_monitor"; + inherit version; + sha256 = "0zi4856hj5ar4yidh7366kx3xnh8qzydw9z8vlalcn98jf3jlnk9"; + }; + + propagatedBuildInputs = [ + requests + prometheus-client + ]; + + # Project has no test + doCheck = false; + + pythonImportsCheck = [ + "uptime_kuma_monitor" + ]; + + meta = with lib; { + description = "Python wrapper around UptimeKuma /metrics endpoint"; + homepage = "https://github.com/meichthys/utptime_kuma_monitor"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/weasyprint/default.nix b/pkgs/development/python-modules/weasyprint/default.nix index a3c8181cf7de..f43fd2d5462b 100644 --- a/pkgs/development/python-modules/weasyprint/default.nix +++ b/pkgs/development/python-modules/weasyprint/default.nix @@ -1,31 +1,27 @@ -{ buildPythonPackage, - fetchPypi, - fetchpatch, - pytestCheckHook, - brotli, - cairosvg, - fonttools, - pydyf, - pyphen, - cffi, - cssselect, - lxml, - html5lib, - tinycss, - zopfli, - glib, - harfbuzz, - pango, - fontconfig, - lib, stdenv, - ghostscript, - pytest, - pytest-runner, - pytest-isort, - pytest-flake8, - pytest-cov, - isPy3k, - substituteAll +{ buildPythonPackage +, fetchPypi +, fetchpatch +, pytestCheckHook +, brotli +, cairosvg +, fonttools +, pydyf +, pyphen +, cffi +, cssselect +, lxml +, html5lib +, tinycss +, zopfli +, glib +, harfbuzz +, pango +, fontconfig +, lib +, stdenv +, ghostscript +, isPy3k +, substituteAll }: buildPythonPackage rec { @@ -33,26 +29,25 @@ buildPythonPackage rec { version = "53.4"; disabled = !isPy3k; - pytestFlagsArray = [ - # setup.py is auto-generated and doesn't pass the flake8 check - "--ignore=setup.py" - # ffi.py is patched by us and doesn't pass the flake8 check - "--ignore=weasyprint/text/ffi.py" - ]; + src = fetchPypi { + inherit version; + pname = "weasyprint"; + sha256 = "sha256-EMyxfVXHMJa98e3T7+WMuFWwfkwwfZutTryaPxP/RYA="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "--isort --flake8 --cov --no-cov-on-fail" "" + ''; disabledTests = [ - # test_font_stretch needs the Ahem font (fails on macOS) + # needs the Ahem font (fails on macOS) "test_font_stretch" ]; checkInputs = [ pytestCheckHook ghostscript - pytest - pytest-runner - pytest-isort - pytest-flake8 - pytest-cov ]; FONTCONFIG_FILE = "${fontconfig.out}/etc/fonts/fonts.conf"; @@ -83,12 +78,6 @@ buildPythonPackage rec { }) ]; - src = fetchPypi { - inherit version; - pname = "weasyprint"; - sha256 = "sha256-EMyxfVXHMJa98e3T7+WMuFWwfkwwfZutTryaPxP/RYA="; - }; - meta = with lib; { homepage = "https://weasyprint.org/"; description = "Converts web documents to PDF"; diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index 3b70bd0ce6e9..e4123a8f105e 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -56,13 +56,13 @@ with py.pkgs; buildPythonApplication rec { pname = "checkov"; - version = "2.0.582"; + version = "2.0.587"; src = fetchFromGitHub { owner = "bridgecrewio"; repo = pname; rev = version; - sha256 = "sha256-25RT70HyOyfdg2jWLKMnEVgvNdlZuJ0e6eajlU486IQ="; + sha256 = "sha256-uLH3g3UeWdIZsMsUwCYpTehgxDKGraPBlENdTz+QYLI="; }; nativeBuildInputs = with py.pkgs; [ diff --git a/pkgs/development/tools/haskell/hyper-haskell/default.nix b/pkgs/development/tools/haskell/hyper-haskell/default.nix index 331f78f7a1e2..2b3fb76903e5 100644 --- a/pkgs/development/tools/haskell/hyper-haskell/default.nix +++ b/pkgs/development/tools/haskell/hyper-haskell/default.nix @@ -49,8 +49,5 @@ in stdenvNoCC.mkDerivation rec { homepage = "https://github.com/HeinrichApfelmus/hyper-haskell"; license = licenses.bsd3; maintainers = [ maintainers.rvl ]; - # depends on electron-10.4.7 which is marked as insecure: - # https://github.com/NixOS/nixpkgs/pull/142641#issuecomment-957358476 - broken = true; }; } diff --git a/pkgs/development/tools/rust/devserver/default.nix b/pkgs/development/tools/rust/devserver/default.nix index 9e4545e5e87e..305a01b69991 100644 --- a/pkgs/development/tools/rust/devserver/default.nix +++ b/pkgs/development/tools/rust/devserver/default.nix @@ -1,8 +1,10 @@ { lib +, stdenv , fetchCrate , rustPlatform , openssl , pkg-config +, CoreServices }: rustPlatform.buildRustPackage rec { @@ -16,7 +18,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ]; + buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin CoreServices; cargoSha256 = "sha256-XlrQ6CvjeWnzvfaeNbe8FtMXMVSQNLxDVIEjyHm57Js="; diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 20bbdaadbf0e..a84ad21775fc 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -573,7 +573,7 @@ "nextcloud" = ps: with ps; [ nextcloudmonitor ]; "nfandroidtv" = ps: with ps; [ ]; # missing inputs: notifications-android-tv "nightscout" = ps: with ps; [ ]; # missing inputs: py-nightscout - "niko_home_control" = ps: with ps; [ ]; # missing inputs: niko-home-control + "niko_home_control" = ps: with ps; [ niko-home-control ]; "nilu" = ps: with ps; [ niluclient ]; "nissan_leaf" = ps: with ps; [ pycarwings2 ]; "nmap_tracker" = ps: with ps; [ aiohttp-cors getmac ifaddr netmap ]; # missing inputs: mac-vendor-lookup diff --git a/pkgs/servers/monitoring/icinga2/default.nix b/pkgs/servers/monitoring/icinga2/default.nix index 0b039bf21a79..b85cccf18386 100644 --- a/pkgs/servers/monitoring/icinga2/default.nix +++ b/pkgs/servers/monitoring/icinga2/default.nix @@ -1,5 +1,5 @@ -{ stdenv, lib, fetchFromGitHub, fetchpatch, cmake, flex, bison, systemd -, boost, openssl, patchelf, mariadb-connector-c, postgresql, zlib +{ stdenv, runCommand, lib, fetchFromGitHub, fetchpatch, cmake, flex, bison, systemd +, boost, openssl, patchelf, mariadb-connector-c, postgresql, zlib, tzdata # Databases , withMysql ? true, withPostgresql ? false # Features @@ -22,11 +22,6 @@ stdenv.mkDerivation rec { ./etc-icinga2.patch # Makes /etc/icinga2 relative to / instead of the store path ./no-systemd-service.patch # Prevent systemd service from being written to /usr ./no-var-directories.patch # Prevent /var directories from being created - # Fix the non-unity build - (fetchpatch { - url = "https://github.com/Icinga/icinga2/commit/2ad0a4b8c3852ad937fec9fc85780230257c821e.patch"; - sha256 = "sha256:06qn7x73zbccmd8ycj46a29x2rr6qjwg0rr831wc2gc6q2k9d2g0"; - }) ]; cmakeFlags = let @@ -40,7 +35,7 @@ stdenv.mkDerivation rec { "-DMYSQL_INCLUDE_DIR=${mariadb-connector-c.dev}/include/mariadb" "-DMYSQL_LIB=${mariadb-connector-c.out}/lib/mariadb/libmysqlclient.a" "-DICINGA2_PLUGINDIR=bin" - "-DICINGA2_UNITY_BUILD=no" + "-DICINGA2_LTO_BUILD=yes" # Features (mkFeatureFlag "MYSQL" withMysql) (mkFeatureFlag "PGSQL" withPostgresql) @@ -54,23 +49,28 @@ stdenv.mkDerivation rec { "-DICINGA2_USER=icinga2" "-DICINGA2_GROUP=icinga2" "-DICINGA2_GIT_VERSION_INFO=OFF" - "-DICINGA2_WITH_TESTS=OFF" "-DUSE_SYSTEMD=ON" ]; + outputs = [ "out" "doc" ]; + buildInputs = [ boost openssl systemd ] ++ lib.optional withPostgresql postgresql; nativeBuildInputs = [ cmake flex bison patchelf ]; + doCheck = true; + checkInputs = [ tzdata ]; # legacytimeperiod/dst needs this + postFixup = '' rm -r $out/etc/logrotate.d $out/etc/sysconfig $out/lib/icinga2/prepare-dirs # Fix hardcoded paths sed -i 's:/usr/bin/::g' $out/etc/icinga2/scripts/* - # Cleanup sbin + # Get rid of sbin sed -i 's/sbin/bin/g' $out/lib/icinga2/safe-reload + sed -i 's/sbin/bin/g' $out/bin/icinga2 rm $out/sbin ${lib.optionalString withMysql '' @@ -83,18 +83,10 @@ stdenv.mkDerivation rec { ''} ''; - vim = stdenv.mkDerivation { - pname = "vim-icinga2"; - inherit version src; - - dontConfigure = true; - dontBuild = true; - - installPhase = '' - mkdir -p $out/share/vim-plugins - cp -r tools/syntax/vim $out/share/vim-plugins/icinga2 - ''; - }; + vim = runCommand "vim-icinga2-${version}" {} '' + mkdir -p $out/share/vim-plugins + cp -r "${src}/tools/syntax/vim" $out/share/vim-plugins/icinga2 + ''; meta = { description = "Open source monitoring system"; diff --git a/pkgs/servers/mumsi/default.nix b/pkgs/servers/mumsi/default.nix deleted file mode 100644 index c6fd2332c90c..000000000000 --- a/pkgs/servers/mumsi/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ stdenv, lib, fetchFromGitHub, cmake, pkg-config, boost -, log4cpp, pjsip, openssl, alsa-lib, mumlib }: -with lib; stdenv.mkDerivation { - pname = "mumsi"; - version = "unstable-2018-12-12"; - - src = fetchFromGitHub { - owner = "slomkowski"; - repo = "mumsi"; - rev = "961b75792f8da22fb5502e39edb286e32172d0b0"; - sha256 = "0vrivl1fiiwjsz4v26nrn8ra3k9v0mcz7zjm2z319fw8hv6n1nrk"; - }; - - buildInputs = [ boost log4cpp pkg-config pjsip mumlib openssl alsa-lib ]; - nativeBuildInputs = [ cmake pkg-config ]; - installPhase = '' - install -Dm555 mumsi $out/bin/mumsi - ''; - - meta = { - description = "SIP to Mumble gateway/bridge using PJSUA stack"; - homepage = "https://github.com/slomkowski/mumsi"; - maintainers = with maintainers; [ das_j ]; - license = licenses.asl20; - platforms = platforms.linux; - }; -} diff --git a/pkgs/servers/web-apps/sogo/default.nix b/pkgs/servers/web-apps/sogo/default.nix index fc7af3bcf2dc..e4dd796317a8 100644 --- a/pkgs/servers/web-apps/sogo/default.nix +++ b/pkgs/servers/web-apps/sogo/default.nix @@ -2,13 +2,13 @@ , openssl, openldap, sope, libmemcached, curl, libsodium, libytnef, libzip, pkg-config, nixosTests }: gnustep.stdenv.mkDerivation rec { pname = "SOGo"; - version = "5.2.0"; + version = "5.3.0"; src = fetchFromGitHub { owner = "inverse-inc"; repo = pname; rev = "SOGo-${version}"; - sha256 = "0y9im5y6ffdc7sy2qphq0xai4ig1ks7vj10vy4mn1psdlc5kd516"; + sha256 = "0f09b2ga43xdd8w14llclrsdxc1y8xb3g1h15lahxq82xkvixjjl"; }; nativeBuildInputs = [ gnustep.make makeWrapper python3 ]; diff --git a/pkgs/tools/archivers/pax/default.nix b/pkgs/tools/archivers/pax/default.nix index d554ea4dade3..cfba3754c819 100644 --- a/pkgs/tools/archivers/pax/default.nix +++ b/pkgs/tools/archivers/pax/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl }: +{ lib, stdenv, fetchurl, utmp }: stdenv.mkDerivation rec { pname = "pax"; @@ -9,6 +9,8 @@ stdenv.mkDerivation rec { sha256 = "1p18nxijh323f4i1s2pg7pcr0557xljl5avv8ll5s9nfr34r5j0w"; }; + buildInputs = lib.optional stdenv.isDarwin utmp; + buildPhase = '' sh Build.sh -r -tpax ''; diff --git a/pkgs/tools/misc/convbin/default.nix b/pkgs/tools/misc/convbin/default.nix index e350092a0e36..90b403adeb60 100644 --- a/pkgs/tools/misc/convbin/default.nix +++ b/pkgs/tools/misc/convbin/default.nix @@ -13,6 +13,10 @@ stdenv.mkDerivation rec { sha256 = "sha256-zCRM62xwaPaN8+cg+CeaqK/9hKpZmSBBeUOQqAvQGYw="; }; + postPatch = lib.optionalString stdenv.isDarwin '' + substituteInPlace Makefile --replace "-flto" "" + ''; + makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; checkPhase = '' diff --git a/pkgs/tools/misc/gparted/default.nix b/pkgs/tools/misc/gparted/default.nix index 08e4641fb4c1..a002d190984f 100644 --- a/pkgs/tools/misc/gparted/default.nix +++ b/pkgs/tools/misc/gparted/default.nix @@ -1,6 +1,7 @@ { lib, stdenv, fetchurl, intltool, gettext, coreutils, gnused, gnome , gnugrep, parted, glib, libuuid, pkg-config, gtkmm3, libxml2 , gpart, hdparm, procps, util-linux, polkit, wrapGAppsHook, substituteAll +, mtools, dosfstools }: stdenv.mkDerivation rec { @@ -29,7 +30,7 @@ stdenv.mkDerivation rec { preFixup = '' gappsWrapperArgs+=( - --prefix PATH : "${lib.makeBinPath [ gpart hdparm util-linux procps coreutils gnused gnugrep ]}" + --prefix PATH : "${lib.makeBinPath [ gpart hdparm util-linux procps coreutils gnused gnugrep mtools dosfstools ]}" ) ''; diff --git a/pkgs/tools/misc/rates/default.nix b/pkgs/tools/misc/rates/default.nix index 989a9e6734ac..8ead57a07eb9 100644 --- a/pkgs/tools/misc/rates/default.nix +++ b/pkgs/tools/misc/rates/default.nix @@ -1,6 +1,8 @@ { lib +, stdenv , fetchFromGitHub , rustPlatform +, Security }: rustPlatform.buildRustPackage rec { @@ -16,6 +18,8 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "041sskiq152iywwqd8p7aqsqzbj359zl7ilnp8ahzdqprz3slk1w"; + buildInputs = lib.optional stdenv.isDarwin Security; + meta = with lib; { description = "CLI tool that brings currency exchange rates right into your terminal"; homepage = "https://github.com/lunush/rates"; diff --git a/pkgs/tools/networking/lychee/default.nix b/pkgs/tools/networking/lychee/default.nix index 72f5b6f57fd2..657fd108b9a0 100644 --- a/pkgs/tools/networking/lychee/default.nix +++ b/pkgs/tools/networking/lychee/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "lychee"; - version = "0.7.0"; + version = "0.8.1"; src = fetchFromGitHub { owner = "lycheeverse"; repo = pname; - rev = version; - sha256 = "0kpwpbv0dqb0p4bxjlcjas6x1n91rdsvy2psrc1nyr1sh6gb1q5j"; + rev = "v${version}"; + sha256 = "sha256-TjjSysG4UCXVi5ytWaJVL31TFLHC3Ro5OEB56pzbn7s="; }; - cargoSha256 = "1b915zkg41n3azk4hhg6fgc83n7iq8p7drvdyil2m2a4qdjvp9r3"; + cargoSha256 = "sha256-apRXxd7RBnNjhZb0xAUr5hSTafyMbg0k1wgHT93Z66g="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/tools/security/exploitdb/default.nix b/pkgs/tools/security/exploitdb/default.nix index f35eecca05a9..d5d37cd70a0f 100644 --- a/pkgs/tools/security/exploitdb/default.nix +++ b/pkgs/tools/security/exploitdb/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2021-11-16"; + version = "2021-11-18"; src = fetchFromGitHub { owner = "offensive-security"; repo = pname; rev = version; - sha256 = "sha256-xsTmZdEee/lrRYPemny7lUy13xXVVDrb7w1NBnkzmJM="; + sha256 = "sha256-GSqJIM/wAgSKn9BWOSEwmrVTwI6ZOTZGNHRcepDT7MI="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/security/metasploit/Gemfile b/pkgs/tools/security/metasploit/Gemfile index d1e114e32450..c4e5370fb5ec 100644 --- a/pkgs/tools/security/metasploit/Gemfile +++ b/pkgs/tools/security/metasploit/Gemfile @@ -1,4 +1,4 @@ # frozen_string_literal: true source "https://rubygems.org" -gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.1.14" +gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.1.15" diff --git a/pkgs/tools/security/metasploit/Gemfile.lock b/pkgs/tools/security/metasploit/Gemfile.lock index 27690111611c..3ec1ed8963b5 100644 --- a/pkgs/tools/security/metasploit/Gemfile.lock +++ b/pkgs/tools/security/metasploit/Gemfile.lock @@ -1,9 +1,9 @@ GIT remote: https://github.com/rapid7/metasploit-framework - revision: 2c47df62b425e4083f4816d71405fed1c0e8b35b - ref: refs/tags/6.1.14 + revision: 1dd828ca9f705d3f05d273b535ff666b5941ddd6 + ref: refs/tags/6.1.15 specs: - metasploit-framework (6.1.14) + metasploit-framework (6.1.15) actionpack (~> 6.0) activerecord (~> 6.0) activesupport (~> 6.0) @@ -128,13 +128,13 @@ GEM arel-helpers (2.12.1) activerecord (>= 3.1.0, < 7) aws-eventstream (1.2.0) - aws-partitions (1.528.0) + aws-partitions (1.533.0) aws-sdk-core (3.122.1) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.525.0) aws-sigv4 (~> 1.1) jmespath (~> 1.0) - aws-sdk-ec2 (1.279.0) + aws-sdk-ec2 (1.281.0) aws-sdk-core (~> 3, >= 3.122.0) aws-sigv4 (~> 1.1) aws-sdk-iam (1.63.0) @@ -143,7 +143,7 @@ GEM aws-sdk-kms (1.51.0) aws-sdk-core (~> 3, >= 3.122.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.105.1) + aws-sdk-s3 (1.106.0) aws-sdk-core (~> 3, >= 3.122.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.4) @@ -288,7 +288,7 @@ GEM pcaprub patch_finder (1.0.2) pcaprub (0.12.4) - pdf-reader (2.5.0) + pdf-reader (2.6.0) Ascii85 (~> 1.0) afm (~> 0.2.1) hashery (~> 2.0) @@ -330,7 +330,7 @@ GEM rex-core rex-struct2 rex-text - rex-core (0.1.18) + rex-core (0.1.20) rex-encoder (0.1.6) metasm rex-arch diff --git a/pkgs/tools/security/metasploit/default.nix b/pkgs/tools/security/metasploit/default.nix index 674418693c75..4a691122cf41 100644 --- a/pkgs/tools/security/metasploit/default.nix +++ b/pkgs/tools/security/metasploit/default.nix @@ -15,13 +15,13 @@ let }; in stdenv.mkDerivation rec { pname = "metasploit-framework"; - version = "6.1.14"; + version = "6.1.15"; src = fetchFromGitHub { owner = "rapid7"; repo = "metasploit-framework"; rev = version; - sha256 = "sha256-ySQOc/k+kvdSj5g88ujm4e2apvPVbiaspzSbCdEQ4ZA="; + sha256 = "sha256-Wz5FeM7AvRS4mV3BJcWOdp1GgAzTOqRnjBAQp4/Oj5E="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/security/metasploit/gemset.nix b/pkgs/tools/security/metasploit/gemset.nix index 7c1947ddb4d9..ff8d0da3f3a8 100644 --- a/pkgs/tools/security/metasploit/gemset.nix +++ b/pkgs/tools/security/metasploit/gemset.nix @@ -104,10 +104,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1awcpdvfk6dlb9n5wiksq8vhqwdpmkybv4ga8drmlx6x9li3my5k"; + sha256 = "052y91z5xqysfmnclcp0k9cy7dgjk28xv6dskwww42ljdgjxcmxi"; type = "gem"; }; - version = "1.528.0"; + version = "1.533.0"; }; aws-sdk-core = { groups = ["default"]; @@ -124,10 +124,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1cvf70lj99r59wn35pqxg5c6c2qkgnir0b8fqgi8h757xz6b9m72"; + sha256 = "01ywgc5mh1h19ac10l1ck911qgkxqavwbanp4i6h9ddlcd9jmhm1"; type = "gem"; }; - version = "1.279.0"; + version = "1.281.0"; }; aws-sdk-iam = { groups = ["default"]; @@ -154,10 +154,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "12j7i6l52b6hsnj59grn0m1s9pn6l38zmra6ad8i12vdsvd185w7"; + sha256 = "06ix8lw1r0mw77hnc7ns0fqrsl616g35xw8qcsihzwzgvwb2z0mb"; type = "gem"; }; - version = "1.105.1"; + version = "1.106.0"; }; aws-sigv4 = { groups = ["default"]; @@ -664,12 +664,12 @@ platforms = []; source = { fetchSubmodules = false; - rev = "2c47df62b425e4083f4816d71405fed1c0e8b35b"; - sha256 = "1471238hk6rllyn2cvnmyfk9mvg1wvlg4g4qix9gg4iyz5rhw969"; + rev = "1dd828ca9f705d3f05d273b535ff666b5941ddd6"; + sha256 = "14cgrs7sf40hiiks8fnk1j04d7bniv2jbhaxk6w19gf0rrw4agjv"; type = "git"; url = "https://github.com/rapid7/metasploit-framework"; }; - version = "6.1.14"; + version = "6.1.15"; }; metasploit-model = { groups = ["default"]; @@ -947,10 +947,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "14cxj3ra9nnn334qpm2vsx9s0zk3095s8ih6cwcp47h3hv03c73y"; + sha256 = "0zgv9pp9cqd1cf8bwk7pb5lkm81gn7znnan0a7s42wd0qavs4nnz"; type = "gem"; }; - version = "2.5.0"; + version = "2.6.0"; }; pg = { groups = ["default"]; @@ -1127,10 +1127,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1i3rn2ndf9ijgjfn3c8rpblw8lnqynm2flmfmm6dbfhjyhhawnaz"; + sha256 = "0hy7xrd3pwyfk2199zkgfa6kz1fsx7ngf6s512gpk8gadjc8hq6j"; type = "gem"; }; - version = "0.1.18"; + version = "0.1.20"; }; rex-encoder = { groups = ["default"]; diff --git a/pkgs/tools/security/trufflehog/default.nix b/pkgs/tools/security/trufflehog/default.nix index 353590ed87c8..57f49988e75b 100644 --- a/pkgs/tools/security/trufflehog/default.nix +++ b/pkgs/tools/security/trufflehog/default.nix @@ -12,11 +12,11 @@ let in python3Packages.buildPythonApplication rec { pname = "truffleHog"; - version = "2.1.11"; + version = "2.2.1"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "53619f0c5be082abd377f987291ace80bc3b88f864972b1a30494780980f769e"; + sha256 = "sha256-fw0JyM2iqQrkL4FAXllEozJdkKWELS3eAURx5NZcceQ="; }; # Relax overly restricted version constraint diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 48c2069bff17..f4034a98a959 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -576,6 +576,7 @@ mapAliases ({ mssys = ms-sys; # added 2015-12-13 mpv-with-scripts = self.wrapMpv self.mpv-unwrapped { }; # added 2020-05-22 multipath_tools = multipath-tools; # added 2016-01-21 + mumsi = throw "mumsi has been removed from nixpkgs, as it's unmaintained and does not build anymore"; # added 2021-11-18 mupen64plus1_5 = mupen64plus; # added 2016-02-12 mx = throw "graalvm8 and its tools were deprecated in favor of graalvm8-ce"; # added 2021-10-15 mxisd = throw "mxisd has been removed from nixpkgs as it has reached end of life, see https://github.com/kamax-matrix/mxisd/blob/535e0a5b96ab63cb0ddef90f6f42c5866407df95/EOL.md#end-of-life-notice . ma1sd may be a suitable alternative."; # added 2021-04-15 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1d045c2afc26..c6c371358111 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4759,7 +4759,9 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - pax = callPackage ../tools/archivers/pax { }; + pax = callPackage ../tools/archivers/pax { + inherit (pkgs.darwin.apple_sdk.libs) utmp; + }; rage = callPackage ../tools/security/rage { inherit (darwin.apple_sdk.frameworks) Foundation Security; @@ -12912,7 +12914,9 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - devserver = callPackage ../development/tools/rust/devserver { }; + devserver = callPackage ../development/tools/rust/devserver { + inherit (darwin.apple_sdk.frameworks) CoreServices; + }; maturin = callPackage ../development/tools/rust/maturin { inherit (darwin.apple_sdk.frameworks) Security; @@ -18674,8 +18678,6 @@ with pkgs; mueval = callPackage ../development/tools/haskell/mueval { }; - mumlib = callPackage ../development/libraries/mumlib { }; - muparser = callPackage ../development/libraries/muparser { inherit (darwin.stubs) setfile; }; @@ -20928,8 +20930,6 @@ with pkgs; mullvad-vpn = callPackage ../applications/networking/mullvad-vpn { }; - mumsi = callPackage ../servers/mumsi { }; - mycorrhiza = callPackage ../servers/mycorrhiza { }; myserver = callPackage ../servers/http/myserver { }; @@ -27534,6 +27534,8 @@ with pkgs; purple-discord = callPackage ../applications/networking/instant-messengers/pidgin-plugins/purple-discord { }; + purple-googlechat = callPackage ../applications/networking/instant-messengers/pidgin-plugins/purple-googlechat { }; + purple-hangouts = callPackage ../applications/networking/instant-messengers/pidgin-plugins/purple-hangouts { }; purple-lurch = callPackage ../applications/networking/instant-messengers/pidgin-plugins/purple-lurch { }; @@ -32816,7 +32818,9 @@ with pkgs; qdl = callPackage ../tools/misc/qdl { }; - rates = callPackage ../tools/misc/rates { }; + rates = callPackage ../tools/misc/rates { + inherit (darwin.apple_sdk.frameworks) Security; + }; rargs = callPackage ../tools/misc/rargs { }; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index b4cd4106113d..bf340c10cb3b 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -128,7 +128,7 @@ in { llvmPackages = pkgs.llvmPackages_10; }; ghcHEAD = callPackage ../development/compilers/ghc/head.nix { - bootPkgs = packages.ghc901; # no binary yet + bootPkgs = packages.ghc8107Binary; inherit (buildPackages.python3Packages) sphinx; # Need to use apple's patched xattr until # https://github.com/xattr/xattr/issues/44 and diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f57849930b56..2beed3e0cac7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5106,6 +5106,8 @@ in { Nikola = callPackage ../development/python-modules/Nikola { }; + niko-home-control = callPackage ../development/python-modules/niko-home-control { }; + nilearn = callPackage ../development/python-modules/nilearn { }; niluclient = callPackage ../development/python-modules/niluclient { }; @@ -6398,6 +6400,8 @@ in { pyevmasm = callPackage ../development/python-modules/pyevmasm { }; + pyevilgenius = callPackage ../development/python-modules/pyevilgenius { }; + pyexcel = callPackage ../development/python-modules/pyexcel { }; pyexcel-io = callPackage ../development/python-modules/pyexcel-io { }; @@ -8434,7 +8438,7 @@ in { scikit-survival = callPackage ../development/python-modules/scikit-survival { }; - scs = callPackage ../development/python-modules/scs { scs = pkgs.scs; }; + scs = callPackage ../development/python-modules/scs { }; sdnotify = callPackage ../development/python-modules/sdnotify { }; @@ -9656,6 +9660,8 @@ in { uptime = callPackage ../development/python-modules/uptime { }; + uptime-kuma-monitor = callPackage ../development/python-modules/uptime-kuma-monitor { }; + uranium = callPackage ../development/python-modules/uranium { }; uritemplate = callPackage ../development/python-modules/uritemplate { };