diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-12-28 18:01:50 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-12-28 18:01:50 +0000 |
commit | aaaeebad7a823083078771b624fd64e747fa81a1 (patch) | |
tree | 46a4ce0ff9225a10b1d84b5fbdf1cbd9ea48d261 | |
parent | d41eafcfb0a6b88b649be858577d54764efd3dd7 (diff) | |
parent | 218d1f69266450b0ef46c9e3ad088e8126991682 (diff) | |
download | nixpkgs-aaaeebad7a823083078771b624fd64e747fa81a1.tar nixpkgs-aaaeebad7a823083078771b624fd64e747fa81a1.tar.gz nixpkgs-aaaeebad7a823083078771b624fd64e747fa81a1.tar.bz2 nixpkgs-aaaeebad7a823083078771b624fd64e747fa81a1.tar.lz nixpkgs-aaaeebad7a823083078771b624fd64e747fa81a1.tar.xz nixpkgs-aaaeebad7a823083078771b624fd64e747fa81a1.tar.zst nixpkgs-aaaeebad7a823083078771b624fd64e747fa81a1.zip |
Merge staging-next into staging
71 files changed, 1594 insertions, 1097 deletions
diff --git a/nixos/modules/misc/version.nix b/nixos/modules/misc/version.nix index b3cdaf5568d..1067b21a22b 100644 --- a/nixos/modules/misc/version.nix +++ b/nixos/modules/misc/version.nix @@ -89,6 +89,12 @@ in stateVersion = mkOption { type = types.str; + # TODO Remove this and drop the default of the option so people are forced to set it. + # Doing this also means fixing the comment in nixos/modules/testing/test-instrumentation.nix + apply = v: + lib.warnIf (options.system.stateVersion.highestPrio == (lib.mkOptionDefault { }).priority) + "system.stateVersion is not set, defaulting to ${v}. Read why this matters on https://nixos.org/manual/nixos/stable/options.html#opt-system.stateVersion." + v; default = cfg.release; defaultText = literalExpression "config.${opt.release}"; description = lib.mdDoc '' @@ -149,14 +155,6 @@ in "os-release".text = attrsToText osReleaseContents; }; - # We have to use `warnings` because when warning in the default of the option - # the warning would also be shown when building the manual since the manual - # has to evaluate the default. - # - # TODO Remove this and drop the default of the option so people are forced to set it. - # Doing this also means fixing the comment in nixos/modules/testing/test-instrumentation.nix - warnings = lib.optional (options.system.stateVersion.highestPrio == (lib.mkOptionDefault { }).priority) - "system.stateVersion is not set, defaulting to ${config.system.stateVersion}. Read why this matters on https://nixos.org/manual/nixos/stable/options.html#opt-system.stateVersion."; }; # uses version info nixpkgs, which requires a full nixpkgs path diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 82b06865adc..0b7a3a5c269 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -1313,6 +1313,7 @@ ./tasks/filesystems/btrfs.nix ./tasks/filesystems/cifs.nix ./tasks/filesystems/ecryptfs.nix + ./tasks/filesystems/envfs.nix ./tasks/filesystems/exfat.nix ./tasks/filesystems/ext.nix ./tasks/filesystems/f2fs.nix diff --git a/nixos/modules/profiles/macos-builder.nix b/nixos/modules/profiles/macos-builder.nix index 15fad007bd3..a981814730a 100644 --- a/nixos/modules/profiles/macos-builder.nix +++ b/nixos/modules/profiles/macos-builder.nix @@ -11,6 +11,17 @@ in { imports = [ ../virtualisation/qemu-vm.nix + + # Avoid a dependency on stateVersion + { + disabledModules = [ + ../virtualisation/nixos-containers.nix + ../services/x11/desktop-managers/xterm.nix + ]; + config = { + }; + options.boot.isContainer = lib.mkOption { default = false; internal = true; }; + } ]; # The builder is not intended to be used interactively @@ -97,7 +108,14 @@ in # To prevent gratuitous rebuilds on each change to Nixpkgs nixos.revision = null; - stateVersion = "22.05"; + stateVersion = lib.mkDefault (throw '' + The macOS linux builder should not need a stateVersion to be set, but a module + has accessed stateVersion nonetheless. + Please inspect the trace of the following command to figure out which module + has a dependency on stateVersion. + + nix-instantiate --attr darwin.builder --show-trace + ''); }; users.users."${user}"= { diff --git a/nixos/modules/services/backup/borgbackup.nix b/nixos/modules/services/backup/borgbackup.nix index ae8e1dd8463..c5fc09dcea0 100644 --- a/nixos/modules/services/backup/borgbackup.nix +++ b/nixos/modules/services/backup/borgbackup.nix @@ -150,8 +150,9 @@ let # Ensure that the home directory already exists # We can't assert createHome == true because that's not the case for root cd "${config.users.users.${cfg.user}.home}" - ${install} -d .config/borg - ${install} -d .cache/borg + # Create each directory separately to prevent root owned parent dirs + ${install} -d .config .config/borg + ${install} -d .cache .cache/borg '' + optionalString (isLocalPath cfg.repo && !cfg.removableDevice) '' ${install} -d ${escapeShellArg cfg.repo} '')); diff --git a/nixos/modules/services/matrix/synapse.nix b/nixos/modules/services/matrix/synapse.nix index b9b581acb34..3087d879b9d 100644 --- a/nixos/modules/services/matrix/synapse.nix +++ b/nixos/modules/services/matrix/synapse.nix @@ -507,6 +507,12 @@ in { sqlite3 = null; psycopg2 = "matrix-synapse"; }.${cfg.settings.database.name}; + defaultText = lib.literalExpression '' + { + sqlite3 = null; + psycopg2 = "matrix-synapse"; + }.''${cfg.settings.database.name}; + ''; description = lib.mdDoc '' Username to connect with psycopg2, set to null when using sqlite3. diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix index b13706f641c..10db7cdfb33 100644 --- a/nixos/modules/services/misc/nix-daemon.nix +++ b/nixos/modules/services/misc/nix-daemon.nix @@ -819,7 +819,7 @@ in optionals (pkgs.hostPlatform ? gcc.arch) ( # a builder can run code for `gcc.arch` and inferior architectures [ "gccarch-${pkgs.hostPlatform.gcc.arch}" ] ++ - map (x: "gccarch-${x}") systems.architectures.inferiors.${pkgs.hostPlatform.gcc.arch} + map (x: "gccarch-${x}") (systems.architectures.inferiors.${pkgs.hostPlatform.gcc.arch} or []) ) ); } diff --git a/nixos/modules/system/boot/initrd-openvpn.nix b/nixos/modules/system/boot/initrd-openvpn.nix index b41e7524320..cbc61d55d6b 100644 --- a/nixos/modules/system/boot/initrd-openvpn.nix +++ b/nixos/modules/system/boot/initrd-openvpn.nix @@ -68,11 +68,8 @@ in $out/bin/openvpn --show-gateway ''; - # Add `iproute /bin/ip` to the config, to ensure that openvpn - # is able to set the routes boot.initrd.network.postCommands = '' - (cat /etc/initrd.ovpn; echo -e '\niproute /bin/ip') | \ - openvpn /dev/stdin & + openvpn /etc/initrd.ovpn & ''; }; diff --git a/nixos/modules/tasks/filesystems/envfs.nix b/nixos/modules/tasks/filesystems/envfs.nix new file mode 100644 index 00000000000..ef8f655c532 --- /dev/null +++ b/nixos/modules/tasks/filesystems/envfs.nix @@ -0,0 +1,51 @@ +{ pkgs, config, lib, ... }: + +let + cfg = config.services.envfs; + mounts = { + "/usr/bin" = { + device = "none"; + fsType = "envfs"; + options = [ + "fallback-path=${pkgs.runCommand "fallback-path" {} '' + mkdir -p $out + ln -s ${pkgs.coreutils}/bin/env $out/env + ln -s ${config.system.build.binsh}/bin/sh $out/sh + ''}" + ]; + }; + "/bin" = { + device = "/usr/bin"; + fsType = "none"; + options = [ "bind" ]; + }; + }; +in { + options = { + services.envfs = { + enable = lib.mkEnableOption (lib.mdDoc "Envfs filesystem") // { + description = lib.mdDoc '' + Fuse filesystem that returns symlinks to executables based on the PATH + of the requesting process. This is useful to execute shebangs on NixOS + that assume hard coded locations in locations like /bin or /usr/bin + etc. + ''; + }; + package = lib.mkOption { + type = lib.types.package; + description = lib.mdDoc "Which package to use for the envfs."; + default = pkgs.envfs; + defaultText = lib.mdDoc "pkgs.envfs"; + }; + }; + }; + config = lib.mkIf (cfg.enable) { + environment.systemPackages = [ cfg.package ]; + # we also want these mounts in virtual machines. + fileSystems = if config.virtualisation ? qemu then lib.mkVMOverride mounts else mounts; + + # We no longer need those when using envfs + system.activationScripts.usrbinenv = lib.mkForce ""; + system.activationScripts.binsh = lib.mkForce ""; + }; +} diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 69697071629..e0817d1eae3 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -195,6 +195,7 @@ in { engelsystem = handleTest ./engelsystem.nix {}; enlightenment = handleTest ./enlightenment.nix {}; env = handleTest ./env.nix {}; + envfs = handleTest ./envfs.nix {}; envoy = handleTest ./envoy.nix {}; ergo = handleTest ./ergo.nix {}; ergochat = handleTest ./ergochat.nix {}; diff --git a/nixos/tests/envfs.nix b/nixos/tests/envfs.nix new file mode 100644 index 00000000000..3f9cd1edb59 --- /dev/null +++ b/nixos/tests/envfs.nix @@ -0,0 +1,42 @@ +import ./make-test-python.nix ({ lib, pkgs, ... }: +let + pythonShebang = pkgs.writeScript "python-shebang" '' + #!/usr/bin/python + print("OK") + ''; + + bashShebang = pkgs.writeScript "bash-shebang" '' + #!/usr/bin/bash + echo "OK" + ''; +in +{ + name = "envfs"; + nodes.machine.services.envfs.enable = true; + + testScript = '' + start_all() + machine.wait_until_succeeds("mountpoint -q /usr/bin/") + machine.succeed( + "PATH=${pkgs.coreutils}/bin /usr/bin/cp --version", + # check fallback paths + "PATH= /usr/bin/sh --version", + "PATH= /usr/bin/env --version", + "PATH= test -e /usr/bin/sh", + "PATH= test -e /usr/bin/env", + # no stat + "! test -e /usr/bin/cp", + # also picks up PATH that was set after execve + "! /usr/bin/hello", + "PATH=${pkgs.hello}/bin /usr/bin/hello", + ) + + out = machine.succeed("PATH=${pkgs.python3}/bin ${pythonShebang}") + print(out) + assert out == "OK\n" + + out = machine.succeed("PATH=${pkgs.bash}/bin ${bashShebang}") + print(out) + assert out == "OK\n" + ''; +}) diff --git a/nixos/tests/initrd-network-openvpn/default.nix b/nixos/tests/initrd-network-openvpn/default.nix index bb4c41e6d70..dbb34c28eea 100644 --- a/nixos/tests/initrd-network-openvpn/default.nix +++ b/nixos/tests/initrd-network-openvpn/default.nix @@ -91,6 +91,7 @@ import ../make-test-python.nix ({ lib, ...}: config = '' dev tun0 ifconfig 10.8.0.1 10.8.0.2 + cipher AES-256-CBC ${secretblock} ''; }; diff --git a/nixos/tests/initrd-network-openvpn/initrd.ovpn b/nixos/tests/initrd-network-openvpn/initrd.ovpn index 5926a48af00..3ada4130e86 100644 --- a/nixos/tests/initrd-network-openvpn/initrd.ovpn +++ b/nixos/tests/initrd-network-openvpn/initrd.ovpn @@ -3,6 +3,7 @@ dev tun ifconfig 10.8.0.2 10.8.0.1 # Only force VLAN 2 through the VPN route 192.168.2.0 255.255.255.0 10.8.0.1 +cipher AES-256-CBC secret [inline] <secret> # @@ -26,4 +27,4 @@ be5a69522a8e60ccb217f8521681b45d e7811584363597599cce2040a68ac00e f2125540e0f7f4adc37cb3f0d922eeb7 -----END OpenVPN Static key V1----- -</secret> \ No newline at end of file +</secret> diff --git a/nixos/tests/trafficserver.nix b/nixos/tests/trafficserver.nix index 983ded4f172..e4557c6c50e 100644 --- a/nixos/tests/trafficserver.nix +++ b/nixos/tests/trafficserver.nix @@ -172,6 +172,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { assert re.fullmatch(expected, out) is not None, "no matching logs" out = json.loads(ats.succeed(f"traffic_logstats -jf {access_log_path}")) + assert isinstance(out, dict) assert out["total"]["error.total"]["req"] == "0", "unexpected log stat" ''; }) diff --git a/pkgs/applications/editors/cpeditor/default.nix b/pkgs/applications/editors/cpeditor/default.nix index 74394418fd5..eaa2b0d9959 100644 --- a/pkgs/applications/editors/cpeditor/default.nix +++ b/pkgs/applications/editors/cpeditor/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "cpeditor"; - version = "6.10.1"; + version = "6.11.1"; src = fetchFromGitHub { owner = "cpeditor"; repo = "cpeditor"; rev = version; - sha256 = "sha256-SIREoOapaZTLtqi0Z07lKmNqF9a9qIpgGxuhqaY3yfU="; + sha256 = "sha256-Uwo7ZE+9yrHV/+D6rvfew2d3ZJbpFOjgek38iYkPppw="; fetchSubmodules = true; }; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 08b8ae20412..140a3b317ce 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -693,6 +693,10 @@ self: super: { configurePhase = "cd vim"; }); + orgmode = super.orgmode.overrideAttrs (old: { + dependencies = with self; [ (nvim-treesitter.withPlugins (p: [ p.org ])) ]; + }); + inherit parinfer-rust; plenary-nvim = super.plenary-nvim.overrideAttrs (old: { @@ -715,7 +719,10 @@ self: super: { # needs "http" and "json" treesitter grammars too rest-nvim = super.rest-nvim.overrideAttrs (old: { - dependencies = with self; [ plenary-nvim ]; + dependencies = with self; [ + plenary-nvim + (nvim-treesitter.withPlugins (p: [ p.http p.json ])) + ]; }); skim = buildVimPluginFrom2Nix { diff --git a/pkgs/applications/emulators/bsnes/ares/002-sips-to-png2icns.patch b/pkgs/applications/emulators/bsnes/ares/002-sips-to-png2icns.patch new file mode 100644 index 00000000000..4c2259d63a3 --- /dev/null +++ b/pkgs/applications/emulators/bsnes/ares/002-sips-to-png2icns.patch @@ -0,0 +1,39 @@ +diff --git a/desktop-ui/GNUmakefile b/desktop-ui/GNUmakefile +index 4515610d3..916c8fcd8 100644 +--- a/desktop-ui/GNUmakefile ++++ b/desktop-ui/GNUmakefile +@@ -91,7 +91,7 @@ endif + cp resource/$(name).plist $(output.path)/$(name).app/Contents/Info.plist + cp -R $(ares.path)/Shaders $(output.path)/$(name).app/Contents/Resources/ + cp -R $(mia.path)/Database $(output.path)/$(name).app/Contents/Resources/ +- sips -s format icns resource/$(name).png --out $(output.path)/$(name).app/Contents/Resources/$(name).icns ++ png2icns $(output.path)/$(name).app/Contents/Resources/$(name).icns resource/$(name).png + codesign --force --deep --options runtime --entitlements resource/$(name).selfsigned.entitlements --sign - $(output.path)/$(name).app + else ifeq ($(platform),windows) + $(call mkdir,$(output.path)/Shaders/) +diff --git a/genius/GNUmakefile b/genius/GNUmakefile +index 5287309a8..8d80f9306 100644 +--- a/genius/GNUmakefile ++++ b/genius/GNUmakefile +@@ -24,7 +24,7 @@ ifeq ($(platform),macos) + mkdir -p $(output.path)/$(name).app/Contents/Resources/ + mv $(output.path)/$(name) $(output.path)/$(name).app/Contents/MacOS/$(name) + cp data/$(name).plist $(output.path)/$(name).app/Contents/Info.plist +- sips -s format icns data/$(name).png --$(output.path) $(output.path)/$(name).app/Contents/Resources/$(name).icns ++ png2icns $(output.path)/$(name).app/Contents/Resources/$(name).icns data/$(name).png + endif + + verbose: hiro.verbose nall.verbose all; +diff --git a/mia/GNUmakefile b/mia/GNUmakefile +index b6930b6df..7a51b5028 100644 +--- a/mia/GNUmakefile ++++ b/mia/GNUmakefile +@@ -32,7 +32,7 @@ ifeq ($(platform),macos) + mkdir -p $(output.path)/$(name).app/Contents/Resources/ + mv $(output.path)/$(name) $(output.path)/$(name).app/Contents/MacOS/$(name) + cp resource/$(name).plist $(output.path)/$(name).app/Contents/Info.plist +- sips -s format icns resource/$(name).png --out $(output.path)/$(name).app/Contents/Resources/$(name).icns ++ png2icns $(output.path)/$(name).app/Contents/Resources/$(name).icns resource/$(name).png + endif + + verbose: hiro.verbose nall.verbose all; diff --git a/pkgs/applications/emulators/bsnes/ares/003-fix-darwin-install.patch b/pkgs/applications/emulators/bsnes/ares/003-fix-darwin-install.patch new file mode 100644 index 00000000000..5b216ac267e --- /dev/null +++ b/pkgs/applications/emulators/bsnes/ares/003-fix-darwin-install.patch @@ -0,0 +1,23 @@ +diff --git a/desktop-ui/GNUmakefile b/desktop-ui/GNUmakefile +index 916c8fcd8..b767c1335 100644 +--- a/desktop-ui/GNUmakefile ++++ b/desktop-ui/GNUmakefile +@@ -92,7 +92,6 @@ endif + cp -R $(ares.path)/Shaders $(output.path)/$(name).app/Contents/Resources/ + cp -R $(mia.path)/Database $(output.path)/$(name).app/Contents/Resources/ + png2icns $(output.path)/$(name).app/Contents/Resources/$(name).icns resource/$(name).png +- codesign --force --deep --options runtime --entitlements resource/$(name).selfsigned.entitlements --sign - $(output.path)/$(name).app + else ifeq ($(platform),windows) + $(call mkdir,$(output.path)/Shaders/) + $(call mkdir,$(output.path)/Database/) +@@ -115,8 +114,8 @@ ifeq ($(platform),windows) + else ifeq ($(shell id -un),root) + $(error "make install should not be run as root") + else ifeq ($(platform),macos) +- mkdir -p ~/Library/Application\ Support/$(name)/ +- cp -R $(output.path)/$(name).app /Applications/$(name).app ++ mkdir -p $(prefix)/Applications/ ++ cp -R $(output.path)/$(name).app $(prefix)/Applications/$(name).app + else ifneq ($(filter $(platform),linux bsd),) + mkdir -p $(prefix)/bin/ + mkdir -p $(prefix)/share/applications/ diff --git a/pkgs/applications/emulators/bsnes/ares/default.nix b/pkgs/applications/emulators/bsnes/ares/default.nix index 7a6dae5784c..78afd4db383 100644 --- a/pkgs/applications/emulators/bsnes/ares/default.nix +++ b/pkgs/applications/emulators/bsnes/ares/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , pkg-config , wrapGAppsHook +, libicns , SDL2 , alsa-lib , gtk3 @@ -15,8 +16,12 @@ , libpulseaudio , openal , udev +, darwin }: +let + inherit (darwin.apple_sdk_11_0.frameworks) Cocoa OpenAL; +in stdenv.mkDerivation (finalAttrs: { pname = "ares"; version = "130.1"; @@ -31,15 +36,21 @@ stdenv.mkDerivation (finalAttrs: { patches = [ ./000-dont-rebuild-on-install.patch ./001-fix-ruby.patch + ./002-sips-to-png2icns.patch + ./003-fix-darwin-install.patch ]; nativeBuildInputs = [ pkg-config wrapGAppsHook + ] ++ lib.optionals stdenv.isDarwin [ + libicns ]; buildInputs = [ SDL2 + libao + ] ++ lib.optionals stdenv.isLinux [ alsa-lib gtk3 gtksourceview3 @@ -47,29 +58,36 @@ stdenv.mkDerivation (finalAttrs: { libGLU libX11 libXv - libao libpulseaudio openal udev + ] ++ lib.optionals stdenv.isDarwin [ + Cocoa + OpenAL ]; enableParallelBuilding = true; - makeFlags = [ + makeFlags = lib.optionals stdenv.isLinux [ "hiro=gtk3" + ] ++ lib.optionals stdenv.isDarwin [ + "hiro=cocoa" + "vulkan=false" + ] ++ [ "local=false" "openmp=true" "prefix=$(out)" "-C desktop-ui" ]; + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-mmacosx-version-min=10.14"; + meta = with lib; { homepage = "https://ares-emu.net"; description = "Open-source multi-system emulator with a focus on accuracy and preservation"; license = licenses.isc; maintainers = with maintainers; [ Madouura AndersonTorres ]; - platforms = platforms.linux; + platforms = platforms.unix; }; }) # TODO: select between Qt, GTK2 and GTK3 -# TODO: support Darwin diff --git a/pkgs/applications/networking/freefilesync/default.nix b/pkgs/applications/networking/freefilesync/default.nix index c0a69479d45..5ef5feb3a16 100644 --- a/pkgs/applications/networking/freefilesync/default.nix +++ b/pkgs/applications/networking/freefilesync/default.nix @@ -9,17 +9,18 @@ , libssh2 , openssl , wxGTK32 +, gitUpdater }: gcc12Stdenv.mkDerivation rec { pname = "freefilesync"; - version = "11.28"; + version = "11.29"; src = fetchFromGitHub { owner = "hkneptune"; repo = "FreeFileSync"; rev = "v${version}"; - sha256 = "sha256-3eYvXClMdOCdl35S1d7nP2kiYZZOjyydi2gKY62K/qM="; + sha256 = "sha256-UQ+CWqtcTwMGUTn6t3N+BkXs4qxddZtxDjcq7nz5F6U="; }; # Patches from ROSA Linux @@ -88,6 +89,10 @@ gcc12Stdenv.mkDerivation rec { runHook postInstall ''; + passthru.updateScript = gitUpdater { + rev-prefix = "v"; + }; + meta = with lib; { description = "Open Source File Synchronization & Backup Software"; homepage = "https://freefilesync.org"; diff --git a/pkgs/applications/virtualization/colima/default.nix b/pkgs/applications/virtualization/colima/default.nix index 7794cd81de2..d13cfbd7f17 100644 --- a/pkgs/applications/virtualization/colima/default.nix +++ b/pkgs/applications/virtualization/colima/default.nix @@ -11,13 +11,13 @@ buildGoModule rec { pname = "colima"; - version = "0.5.0"; + version = "0.5.2"; src = fetchFromGitHub { owner = "abiosoft"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Ey/h9W1WFMJdO5U9IeHhVTYDEJi8w18h2PY0lB0S/BU="; + sha256 = "sha256-xw+Yy9KejVkunOLJdmfXstP7aDrl3j0OZjCaf6pyL1U="; # We need the git revision leaveDotGit = true; postFetch = '' @@ -28,7 +28,7 @@ buildGoModule rec { nativeBuildInputs = [ installShellFiles makeWrapper ]; - vendorSha256 = "sha256-v0U7TorUwOtBzBQ/OQQSAX6faDI1IX/IDIJnY8UFsu8="; + vendorSha256 = "sha256-Iz1LYL25NpkztTM86zrLwehub8FzO1IlwZqCPW7wDN4="; CGO_ENABLED = 1; diff --git a/pkgs/data/misc/hackage/pin.json b/pkgs/data/misc/hackage/pin.json index 2ab1bc7b51b..4b049b7f66a 100644 --- a/pkgs/data/misc/hackage/pin.json +++ b/pkgs/data/misc/hackage/pin.json @@ -1,6 +1,6 @@ { - "commit": "d2f407d64c568ff572505378248cd834f808f6e0", - "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/d2f407d64c568ff572505378248cd834f808f6e0.tar.gz", - "sha256": "0agbmi2gjrg5gnp8dy76770lyh3ny42clm55wlr529320wnc14wm", - "msg": "Update from Hackage at 2022-12-18T22:10:13Z" + "commit": "b88b3496b1b3beb0c706db8a39c0da3396d96f0b", + "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/b88b3496b1b3beb0c706db8a39c0da3396d96f0b.tar.gz", + "sha256": "0gs807cbyi6zyk9bvg5d3wx16575pmgv4j3m8hbz57aa5i71r0nv", + "msg": "Update from Hackage at 2022-12-24T13:11:25Z" } diff --git a/pkgs/desktops/gnome/apps/gnome-music/default.nix b/pkgs/desktops/gnome/apps/gnome-music/default.nix index 19db2cdf9f0..445d667b838 100644 --- a/pkgs/desktops/gnome/apps/gnome-music/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-music/default.nix @@ -107,6 +107,6 @@ python3.pkgs.buildPythonApplication rec { description = "Music player and management application for the GNOME desktop environment"; maintainers = teams.gnome.members; license = licenses.gpl2Plus; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/desktops/gnome/core/baobab/default.nix b/pkgs/desktops/gnome/core/baobab/default.nix index 8419aa17ea7..c7ff70d2607 100644 --- a/pkgs/desktops/gnome/core/baobab/default.nix +++ b/pkgs/desktops/gnome/core/baobab/default.nix @@ -69,6 +69,6 @@ stdenv.mkDerivation rec { homepage = "https://wiki.gnome.org/Apps/DiskUsageAnalyzer"; license = licenses.gpl2Plus; maintainers = teams.gnome.members; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/desktops/gnome/core/dconf-editor/default.nix b/pkgs/desktops/gnome/core/dconf-editor/default.nix index 7cf366b7dc0..d6da42ab550 100644 --- a/pkgs/desktops/gnome/core/dconf-editor/default.nix +++ b/pkgs/desktops/gnome/core/dconf-editor/default.nix @@ -73,6 +73,6 @@ stdenv.mkDerivation rec { homepage = "https://wiki.gnome.org/Apps/DconfEditor"; license = licenses.gpl3Plus; maintainers = teams.gnome.members; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/desktops/gnome/core/gnome-calculator/default.nix b/pkgs/desktops/gnome/core/gnome-calculator/default.nix index 59aafb530d7..f84c9ab65a8 100644 --- a/pkgs/desktops/gnome/core/gnome-calculator/default.nix +++ b/pkgs/desktops/gnome/core/gnome-calculator/default.nix @@ -76,6 +76,6 @@ stdenv.mkDerivation rec { description = "Application that solves mathematical equations and is suitable as a default application in a Desktop environment"; maintainers = teams.gnome.members; license = licenses.gpl3Plus; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/desktops/gnome/core/gnome-dictionary/default.nix b/pkgs/desktops/gnome/core/gnome-dictionary/default.nix index 6cdb8831c48..ebd9b58fd96 100644 --- a/pkgs/desktops/gnome/core/gnome-dictionary/default.nix +++ b/pkgs/desktops/gnome/core/gnome-dictionary/default.nix @@ -80,6 +80,6 @@ stdenv.mkDerivation rec { description = "Dictionary is the GNOME application to look up definitions"; maintainers = teams.gnome.members; license = licenses.gpl2; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/desktops/gnome/core/gnome-font-viewer/default.nix b/pkgs/desktops/gnome/core/gnome-font-viewer/default.nix index 5ebf4903cbd..9a684cdaeaa 100644 --- a/pkgs/desktops/gnome/core/gnome-font-viewer/default.nix +++ b/pkgs/desktops/gnome/core/gnome-font-viewer/default.nix @@ -61,6 +61,6 @@ stdenv.mkDerivation rec { homepage = "https://gitlab.gnome.org/GNOME/gnome-font-viewer"; maintainers = teams.gnome.members; license = licenses.gpl2Plus; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/desktops/gnome/core/gnome-themes-extra/default.nix b/pkgs/desktops/gnome/core/gnome-themes-extra/default.nix index c7f70c76b2b..efc5318fb59 100644 --- a/pkgs/desktops/gnome/core/gnome-themes-extra/default.nix +++ b/pkgs/desktops/gnome/core/gnome-themes-extra/default.nix @@ -29,7 +29,7 @@ in stdenv.mkDerivation rec { ''; meta = with lib; { - platforms = platforms.linux; + platforms = platforms.unix; maintainers = teams.gnome.members; }; } diff --git a/pkgs/desktops/gnome/extensions/paperwm/default.nix b/pkgs/desktops/gnome/extensions/paperwm/default.nix index 4880a931295..7c63248dfee 100644 --- a/pkgs/desktops/gnome/extensions/paperwm/default.nix +++ b/pkgs/desktops/gnome/extensions/paperwm/default.nix @@ -3,15 +3,15 @@ , fetchFromGitHub }: -stdenv.mkDerivation (finalAttrs: { +stdenv.mkDerivation { pname = "gnome-shell-extension-paperwm"; - version = "38.2"; + version = "unstable-2022-12-14"; src = fetchFromGitHub { owner = "paperwm"; repo = "PaperWM"; - rev = finalAttrs.version; - hash = "sha256-Unhz2+MOygOog6B5sOLtYTpdeodQH+/CMI93gC5nDvI="; + rev = "7c0863c944a02d4e8095034403bff6ade3579091"; + hash = "sha256-EN0sWW/NymRNKrApeFnqg8ax7Et4hr0gKZuvMF4kJYU="; }; dontConfigure = true; @@ -33,4 +33,4 @@ stdenv.mkDerivation (finalAttrs: { }; passthru.extensionUuid = "paperwm@hedning:matrix.org"; -}) +} diff --git a/pkgs/development/compilers/ligo/default.nix b/pkgs/development/compilers/ligo/default.nix index f0edb4815d6..16e1cb00202 100644 --- a/pkgs/development/compilers/ligo/default.nix +++ b/pkgs/development/compilers/ligo/default.nix @@ -1,4 +1,5 @@ -{ lib +{ stdenv +, lib , fetchFromGitLab , git , coq @@ -9,12 +10,12 @@ ocamlPackages.buildDunePackage rec { pname = "ligo"; - version = "0.55.0"; + version = "0.58.0"; src = fetchFromGitLab { owner = "ligolang"; repo = "ligo"; rev = version; - sha256 = "sha256-GEw9OEHXdTxBvb5ATIcL71wdUCLD+X/A7CYQxwTUQWw="; + sha256 = "sha256-WhqCkPkXHjWS8BDh13ODrHg2AHJ8CBfksTH4Fxx4xek="; fetchSubmodules = true; }; @@ -108,6 +109,7 @@ ocamlPackages.buildDunePackage rec { description = "A friendly Smart Contract Language for Tezos"; license = licenses.mit; platforms = ocamlPackages.ocaml.meta.platforms; + broken = stdenv.isLinux && stdenv.isAarch64; maintainers = with maintainers; [ ulrikstrid ]; }; } diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index bbbe91baf78..5c94706239f 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -744,9 +744,9 @@ self: super: { testHaskellDepends = drv.testHaskellDepends or [] ++ [ self.hspec-meta_2_10_5 ]; testToolDepends = drv.testToolDepends or [] ++ [ pkgs.git ]; }) (super.sensei.override { - hspec = self.hspec_2_10_7; + hspec = self.hspec_2_10_8; hspec-wai = super.hspec-wai.override { - hspec = self.hspec_2_10_7; + hspec = self.hspec_2_10_8; }; }); @@ -1440,14 +1440,14 @@ self: super: { servant-openapi3 = dontCheck super.servant-openapi3; # Give hspec 2.10.* correct dependency versions without overrideScope - hspec_2_10_7 = doDistribute (super.hspec_2_10_7.override { - hspec-discover = self.hspec-discover_2_10_7; - hspec-core = self.hspec-core_2_10_7; + hspec_2_10_8 = doDistribute (super.hspec_2_10_8.override { + hspec-discover = self.hspec-discover_2_10_8; + hspec-core = self.hspec-core_2_10_8; }); - hspec-discover_2_10_7 = super.hspec-discover_2_10_7.override { + hspec-discover_2_10_8 = super.hspec-discover_2_10_8.override { hspec-meta = self.hspec-meta_2_10_5; }; - hspec-core_2_10_7 = super.hspec-core_2_10_7.override { + hspec-core_2_10_8 = super.hspec-core_2_10_8.override { hspec-meta = self.hspec-meta_2_10_5; }; @@ -2214,6 +2214,7 @@ self: super: { # Too strict upper bound on th-desugar, fixed in 3.1.1 singletons-th = assert super.singletons-th.version == "3.1"; doJailbreak super.singletons-th; + singletons-base = doJailbreak super.singletons-base; # Ships a broken Setup.hs # https://github.com/lehins/conduit-aeson/issues/1 diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix index c11070d21fa..b66a34db94e 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix @@ -176,4 +176,7 @@ self: super: { # Later versions only support GHC >= 9.2 ghc-exactprint = self.ghc-exactprint_0_6_4; apply-refact = self.apply-refact_0_9_3_0; + + # Needs OneTuple for ghc < 9.2 + binary-orphans = addBuildDepends [ self.OneTuple ] super.binary-orphans; } diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix index 0c75456735b..00ecac6db57 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix @@ -205,6 +205,9 @@ self: super: { # https://github.com/mrkkrp/megaparsec/pull/485#issuecomment-1250051823 megaparsec = doJailbreak super.megaparsec; + # Needs OneTuple for ghc < 9.2 + binary-orphans = addBuildDepends [ self.OneTuple ] super.binary-orphans; + # Later versions only support GHC >= 9.2 ghc-exactprint = self.ghc-exactprint_0_6_4; apply-refact = self.apply-refact_0_9_3_0; 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 350bc4ddfe6..d74d70a3bc6 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix @@ -178,4 +178,7 @@ self: super: { # Later versions only support GHC >= 9.2 ghc-exactprint = self.ghc-exactprint_0_6_4; apply-refact = self.apply-refact_0_9_3_0; + + # Needs OneTuple for ghc < 9.2 + binary-orphans = addBuildDepends [ self.OneTuple ] super.binary-orphans; } diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix index e57435695cd..80220b84cf4 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix @@ -112,10 +112,10 @@ in { # Note: Any compilation fixes need to be done on the versioned attributes, # since those are used for the internal dependencies between the versioned # hspec packages in configuration-common.nix. - hspec = self.hspec_2_10_7; - hspec-core = self.hspec-core_2_10_7; + hspec = self.hspec_2_10_8; + hspec-core = self.hspec-core_2_10_8; hspec-meta = self.hspec-meta_2_10_5; - hspec-discover = self.hspec-discover_2_10_7; + hspec-discover = self.hspec-discover_2_10_8; # the dontHaddock is due to a GHC panic. might be this bug, not sure. # https://gitlab.haskell.org/ghc/ghc/-/issues/21619 diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index f1f7ead5deb..73a4a3f3e6c 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -633,6 +633,7 @@ broken-packages: - CC-delcont-ref-tf - cci - ccnx + - cdp - c-dsl - cedict - cef @@ -1099,6 +1100,7 @@ broken-packages: - derive-lifted-instances - derive-monoid - derive-trie + - deriving-openapi3 - derp-lib - describe - descriptive @@ -1317,6 +1319,7 @@ broken-packages: - ekg-rrd - ekg-statsd - elevator + - eliminators - elision - elm-export-persistent - elm-street @@ -1575,6 +1578,7 @@ broken-packages: - forml - formura - Fortnite-Hack-Cheats-Free-V-Bucks-Generator + - fortran-src-extras - foscam-filename - fpe - FPretty @@ -2212,6 +2216,7 @@ broken-packages: - heterogeneous-list-literals - hetris - heukarya + - hevm - HExcel - hexchat - hexif @@ -3274,6 +3279,7 @@ broken-packages: - medium-sdk-haskell - meep - megalisp + - melf - mellon-core - melody - membrain @@ -4783,7 +4789,6 @@ broken-packages: - simplistic-generics - singlethongs - singleton-dict - - singletons-base - singleton-typelits - single-tuple - singnal @@ -5501,6 +5506,7 @@ broken-packages: - ui-command - unamb-custom - unbeliever + - unbounded-delays-units - unboxed - unboxed-containers - unboxed-references @@ -5521,6 +5527,7 @@ broken-packages: - uniqueness-periods-general - uniqueness-periods-vector - uniqueness-periods-vector-common + - units-attoparsec - unittyped - unitym-yesod - uni-util diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index bc676fba546..9cf285d876f 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -86,6 +86,8 @@ default-package-overrides: # hnix < 0.17 (unreleased) needs hnix-store-* 0.5.* - hnix-store-core == 0.5.0.0 # 2022-06-17: Until hnix 0.17 - hnix-store-remote == 0.5.0.0 # 2022-06-17: Until hnix 0.17 + # reflex-dom-core 0.7.0.2 has no reflex 0.9 compatible release and most likely most people will want to use them together + - reflex < 0.9.0.0 extra-packages: - Cabal == 2.2.* # required for jailbreak-cabal etc. diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index 32c5e2f3274..90f73018705 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -1331,8 +1331,6 @@ dont-distribute-packages: - elasticsearch-interchange - electrs-client - elerea-examples - - eliminators - - eliminators_0_9_1 - elliptic-curve - elsa - emacs-keys @@ -1363,11 +1361,15 @@ dont-distribute-packages: - essence-of-live-coding-PortMidi - essence-of-live-coding-gloss - essence-of-live-coding-gloss-example + - essence-of-live-coding-gloss_0_2_7 - essence-of-live-coding-pulse - essence-of-live-coding-pulse-example + - essence-of-live-coding-pulse_0_2_7 - essence-of-live-coding-quickcheck + - essence-of-live-coding-quickcheck_0_2_7 - essence-of-live-coding-vivid - essence-of-live-coding-warp + - essence-of-live-coding-warp_0_2_7 - estimators - estreps - eternity @@ -1392,6 +1394,9 @@ dont-distribute-packages: - eventsource-geteventstore-store - eventsource-store-specs - eventsource-stub-store + - eventuo11y + - eventuo11y-batteries + - eventuo11y-json - every-bit-counts - ewe - exference @@ -1490,6 +1495,7 @@ dont-distribute-packages: - fmt-for-rio - foldable1 - follower + - fontconfig-pure - foo - format - format-status @@ -1497,8 +1503,6 @@ dont-distribute-packages: - formlets-hsp - forsyde-deep - forth-hll - - fortran-src - - fortran-src-extras - fortran-vars - foscam-directory - foscam-sort @@ -2118,7 +2122,6 @@ dont-distribute-packages: - hesh - hesql - heterolist - - hevm - hevolisa - hevolisa-dph - hexpat-conduit @@ -2739,7 +2742,6 @@ dont-distribute-packages: - medea - mediabus-fdk-aac - mediabus-rtp - - melf - mellon-gpio - mellon-web - memcache-conduit @@ -2994,7 +2996,6 @@ dont-distribute-packages: - optimal-blocks - optimusprime - optparse-enum - - orbits - orchid - orchid-demo - order-maintenance @@ -3391,6 +3392,7 @@ dont-distribute-packages: - rfc-redis - rfc-servant - rhine-gloss + - rhine-terminal - rhythm-game-tutorial - rib - ribosome @@ -3597,9 +3599,6 @@ dont-distribute-packages: - simple-session - simpleirc-lens - simseq - - singleton-nats - - singletons-presburger - - singletons-presburger_0_7_1_0 - siphon - siren-json - sirkel @@ -4009,7 +4008,6 @@ dont-distribute-packages: - ukrainian-phonetics-basic - unagi-bloomfilter - unbound - - unbounded-delays-units - uni-events - uni-graphs - uni-htk @@ -4023,9 +4021,6 @@ dont-distribute-packages: - uniqueness-periods-vector-filters - uniqueness-periods-vector-general - uniqueness-periods-vector-properties - - units - - units-attoparsec - - units-defs - universal - universe - universe-dependent-sum diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index c3614d35ed8..a8a151385cf 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -11140,14 +11140,12 @@ self: { license = lib.licenses.publicDomain; }) {inherit (pkgs) openssl;}; - "HsOpenSSL_0_11_7_3" = callPackage + "HsOpenSSL_0_11_7_4" = callPackage ({ mkDerivation, base, bytestring, Cabal, network, openssl, time }: mkDerivation { pname = "HsOpenSSL"; - version = "0.11.7.3"; - sha256 = "0nb5rwz5rnyn4vzkl231r3maw4j4q9l92w07dxqyd1929p9yajgl"; - revision = "1"; - editedCabalFile = "03kaaxaxmggyn2zmsf4d8466j986sm5dw228ypf82nh6rmmzhfxj"; + version = "0.11.7.4"; + sha256 = "0zxcfa8b0ng97v53vb8fvg2gss89b28xiz83rx38a0h4lsxpn2xf"; setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ base bytestring network time ]; librarySystemDepends = [ openssl ]; @@ -21268,6 +21266,8 @@ self: { pname = "Unique"; version = "0.4.7.9"; sha256 = "14f1qnmhdmbam8qis725dhwq1mk9h86fsnzhkwhsx73ny9z29s1l"; + revision = "1"; + editedCabalFile = "10s0npnfkh7naj49afmyrvnilikp6426fbhi49f97pxrgcmy4dvw"; libraryHaskellDepends = [ base containers extra hashable unordered-containers ]; @@ -26323,8 +26323,8 @@ self: { }: mkDerivation { pname = "aeson-tiled"; - version = "0.0.2.1"; - sha256 = "0fm2dkp0gi5h8xv6b3ax5v5ni7gkdvj8m2v1nrmf7hcyan0lp2aa"; + version = "0.0.2.2"; + sha256 = "1p2w19gmlrcdsni7dj2bs3ajzn8a5460gwas97yl930gwiwivyif"; libraryHaskellDepends = [ aeson base bytestring containers text vector ]; @@ -31804,6 +31804,34 @@ self: { license = lib.licenses.gpl3Only; }) {}; + "ansi-terminal-game_1_8_1_0" = callPackage + ({ mkDerivation, ansi-terminal, array, base, bytestring, cereal + , clock, colour, containers, exceptions, hspec, hspec-discover + , linebreak, mintty, mtl, QuickCheck, random, split, terminal-size + , timers-tick, unidecode + }: + mkDerivation { + pname = "ansi-terminal-game"; + version = "1.8.1.0"; + sha256 = "0wyx6g9fydbnz9xwjniymwfgn3fgn6vql9spmzl3c1hlpbv5ikfq"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ansi-terminal array base bytestring cereal clock colour containers + exceptions linebreak mintty mtl QuickCheck random split + terminal-size timers-tick unidecode + ]; + testHaskellDepends = [ + ansi-terminal array base bytestring cereal clock colour containers + exceptions hspec linebreak mintty mtl QuickCheck random split + terminal-size timers-tick unidecode + ]; + testToolDepends = [ hspec-discover ]; + description = "sdl-like functions for terminal applications, based on ansi-terminal"; + license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; + }) {}; + "ansi-wl-pprint" = callPackage ({ mkDerivation, ansi-terminal, base }: mkDerivation { @@ -33470,6 +33498,41 @@ self: { mainProgram = "refactor"; }) {}; + "apply-refact_0_11_0_0" = callPackage + ({ mkDerivation, base, containers, directory, extra, filemanip + , filepath, ghc, ghc-boot-th, ghc-exactprint, ghc-paths + , optparse-applicative, process, refact, silently, syb, tasty + , tasty-expected-failure, tasty-golden, transformers, uniplate + , unix-compat + }: + mkDerivation { + pname = "apply-refact"; + version = "0.11.0.0"; + sha256 = "1bmm9s8h5grqp1c8m1x9icbhznfc565za8w3sqfpiylid7c7fz72"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers directory extra filemanip ghc ghc-boot-th + ghc-exactprint ghc-paths process refact syb transformers uniplate + unix-compat + ]; + executableHaskellDepends = [ + base containers directory extra filemanip filepath ghc ghc-boot-th + ghc-exactprint ghc-paths optparse-applicative process refact syb + transformers uniplate unix-compat + ]; + testHaskellDepends = [ + base containers directory extra filemanip filepath ghc ghc-boot-th + ghc-exactprint ghc-paths optparse-applicative process refact + silently syb tasty tasty-expected-failure tasty-golden transformers + uniplate unix-compat + ]; + description = "Perform refactorings specified by the refact library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "refactor"; + }) {}; + "apply-unordered" = callPackage ({ mkDerivation, base, fin, ghc, ghc-tcplugins-extra, hspec , should-not-typecheck, syb @@ -35074,6 +35137,25 @@ self: { license = lib.licenses.asl20; }) {}; + "ascii_1_2_4_0" = callPackage + ({ mkDerivation, ascii-case, ascii-char, ascii-group, ascii-numbers + , ascii-predicates, ascii-superset, ascii-th, base, bytestring + , hedgehog, text + }: + mkDerivation { + pname = "ascii"; + version = "1.2.4.0"; + sha256 = "1rsv9ah0jvf66w3k4smh67wpbm03xl4pdyj8svmdy49hbpihimwi"; + libraryHaskellDepends = [ + ascii-case ascii-char ascii-group ascii-numbers ascii-predicates + ascii-superset ascii-th base bytestring text + ]; + testHaskellDepends = [ base hedgehog text ]; + description = "The ASCII character set and encoding"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "ascii-art-to-unicode" = callPackage ({ mkDerivation, base, comonad, doctest, strict }: mkDerivation { @@ -35104,6 +35186,19 @@ self: { license = lib.licenses.asl20; }) {}; + "ascii-case_1_0_1_0" = callPackage + ({ mkDerivation, ascii-char, base, hashable }: + mkDerivation { + pname = "ascii-case"; + version = "1.0.1.0"; + sha256 = "0hqpvhg4zvwjzya01y7sqly6dgfrg1zdvvpy6f1r5slzbnnfqswh"; + libraryHaskellDepends = [ ascii-char base hashable ]; + testHaskellDepends = [ ascii-char base ]; + description = "ASCII letter case"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "ascii-char" = callPackage ({ mkDerivation, base, hashable }: mkDerivation { @@ -41624,8 +41719,8 @@ self: { }: mkDerivation { pname = "bearriver"; - version = "0.13.7"; - sha256 = "1synznzas89cyp05lhiwxfsbmz5zv2pyjn08548dr21ih1x4560j"; + version = "0.14"; + sha256 = "0iyymq8iagdaymivvfg1vvks76bzaiyysw5mj4ifqn2zc9pyb3wd"; libraryHaskellDepends = [ base deepseq dunai MonadRandom mtl simple-affine-space transformers ]; @@ -41972,6 +42067,18 @@ self: { license = lib.licenses.bsd3; }) {}; + "benri-hspec_0_1_0_1" = callPackage + ({ mkDerivation, base, hspec }: + mkDerivation { + pname = "benri-hspec"; + version = "0.1.0.1"; + sha256 = "11x7dsp6hmz1an1nm8076lgdvgd8r67hl54p81jprpi8m0lh6mqa"; + libraryHaskellDepends = [ base hspec ]; + description = "Simplify tests where Either or Maybe types are returned from monadic code"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "bento" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -49630,6 +49737,8 @@ self: { pname = "bugzilla-redhat"; version = "1.0.1"; sha256 = "19dir39yxqd5psf3gj4f3vhcbdad1np7374nkxfk0gg4xxvywcvi"; + revision = "1"; + editedCabalFile = "1yai855w6s9xjyswpx206hnryi1y6kda1310vcfff0ghl4gdxpxw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -51647,17 +51756,17 @@ self: { "cabal-cache" = callPackage ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-s3 , antiope-core, antiope-optparse-applicative, antiope-s3, base - , bytestring, containers, cryptonite, deepseq, directory - , exceptions, filepath, generic-lens, hedgehog, hspec - , hspec-discover, http-client, http-client-tls, http-types + , bytestring, cabal-install-parsers, containers, cryptonite + , deepseq, directory, exceptions, filepath, generic-lens, hedgehog + , hspec, hspec-discover, http-client, http-client-tls, http-types , hw-hspec-hedgehog, lens, mtl, network-uri, optparse-applicative , process, raw-strings-qq, relation, resourcet, stm, stringsearch , temporary, text, topograph, transformers, unliftio }: mkDerivation { pname = "cabal-cache"; - version = "1.0.5.1"; - sha256 = "02jin436jrbmfsr3n5qfkp95scybnfapls893kvx89ykya44cijg"; + version = "1.0.5.4"; + sha256 = "15jg140ly7rska7v8ihvd383q9lj4i5c18rzjad4yi8f78jjciqb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -51669,9 +51778,10 @@ self: { ]; executableHaskellDepends = [ aeson amazonka amazonka-core antiope-core - antiope-optparse-applicative base bytestring containers directory - generic-lens http-types lens mtl optparse-applicative resourcet stm - stringsearch temporary text unliftio + antiope-optparse-applicative base bytestring cabal-install-parsers + containers directory exceptions filepath generic-lens http-types + lens mtl optparse-applicative resourcet stm stringsearch temporary + text unliftio ]; testHaskellDepends = [ aeson antiope-core base bytestring filepath hedgehog hspec @@ -52521,6 +52631,8 @@ self: { pname = "cabal-rpm"; version = "2.0.11.1"; sha256 = "07a2jnzldyva1smbxxdknimzydj2rhr7whhgh5q4nwkifkiliadv"; + revision = "1"; + editedCabalFile = "1dq6c9f0nm7a8nknc2haq79zkpkh1dgrkn2bixzsd16kmjjsl83m"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -55989,6 +56101,41 @@ self: { mainProgram = "cdeps"; }) {}; + "cdp" = callPackage + ({ mkDerivation, aeson, base, base64-bytestring, blaze-html + , blaze-markup, bytestring, containers, data-default, directory + , extra, filepath, hspec, http-conduit, monad-loops, mtl + , network-uri, process, random, text, utf8-string, vector + , websockets + }: + mkDerivation { + pname = "cdp"; + version = "0.0.2.0"; + sha256 = "1pi163mysavwhk9s2a78ldbnw0480b9vmvgyr4m426asc17g1kc9"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring containers data-default directory extra + filepath http-conduit monad-loops mtl network-uri process random + text vector websockets + ]; + executableHaskellDepends = [ + aeson base base64-bytestring blaze-html blaze-markup bytestring + containers data-default directory extra filepath http-conduit + monad-loops mtl network-uri process random text utf8-string vector + websockets + ]; + testHaskellDepends = [ + aeson base bytestring containers data-default directory extra + filepath hspec http-conduit monad-loops mtl network-uri process + random text vector websockets + ]; + description = "A library for the Chrome Devtools Protocol"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "cedict" = callPackage ({ mkDerivation, base, bytestring, containers, mtl, parsec , utf8-string @@ -60011,34 +60158,33 @@ self: { }) {}; "cleveland" = callPackage - ({ mkDerivation, aeson, base-noprelude, bytestring, constraints - , containers, criterion, cryptonite, data-default, directory + ({ mkDerivation, aeson, base-noprelude, constraints, containers + , criterion, cryptonite, data-default, dependent-map, directory , either, exceptions, file-embed, filepath, fmt, hedgehog, hex-text , hspec-expectations, HUnit, lens, lorentz, MonadRandom, morley - , morley-client, morley-prelude, mtl, named, o-clock - , optparse-applicative, safe-exceptions, servant-client - , servant-client-core, singletons, singletons-base, statistics - , tagged, tasty, tasty-ant-xml, tasty-discover, tasty-hedgehog - , tasty-hunit-compat, template-haskell, temporary, text, time - , with-utf8 + , morley-client, morley-prelude, mtl, o-clock, optparse-applicative + , servant-client, servant-client-core, singletons, singletons-base + , some, statistics, tagged, tasty, tasty-ant-xml, tasty-discover + , tasty-hedgehog, tasty-hunit-compat, template-haskell, temporary + , text, time, with-utf8 }: mkDerivation { pname = "cleveland"; - version = "0.2.1"; - sha256 = "1qqk1mld2wfckpgvsj48w8rh9pdkbqq1p36wkvrphf35hl0hr882"; + version = "0.3.0"; + sha256 = "1ahdijygria9rlmfr61vl8s924b29yq31594z1y0dc79asw6vhi1"; libraryHaskellDepends = [ - aeson base-noprelude bytestring constraints containers criterion - cryptonite data-default directory either exceptions file-embed fmt - hedgehog hex-text HUnit lens lorentz MonadRandom morley - morley-client morley-prelude mtl named o-clock optparse-applicative - safe-exceptions servant-client-core singletons singletons-base - statistics tagged tasty tasty-ant-xml tasty-hedgehog - tasty-hunit-compat template-haskell temporary text time with-utf8 + aeson base-noprelude constraints containers criterion cryptonite + data-default dependent-map directory either exceptions file-embed + fmt hedgehog hex-text HUnit lens lorentz MonadRandom morley + morley-client morley-prelude mtl o-clock optparse-applicative + servant-client-core singletons singletons-base some statistics + tagged tasty tasty-ant-xml tasty-hedgehog tasty-hunit-compat + template-haskell temporary text time with-utf8 ]; testHaskellDepends = [ base-noprelude either filepath fmt hedgehog hspec-expectations lens - lorentz morley morley-client morley-prelude named o-clock - servant-client tasty tasty-hedgehog tasty-hunit-compat text time + lorentz morley morley-client morley-prelude o-clock servant-client + tasty tasty-hedgehog tasty-hunit-compat text time ]; testToolDepends = [ tasty-discover ]; description = "Testing framework for Morley"; @@ -62217,8 +62363,8 @@ self: { }: mkDerivation { pname = "coinbase-pro"; - version = "0.9.3.0"; - sha256 = "0974snfkil4xmrkw38d81d85n5w78ld3jd0kbsn3s22jd36dzjlm"; + version = "0.9.3.2"; + sha256 = "06gzynckmdsdzzvlmf3kmkbc883pqjbgd4hxkrm47xykv2m64x6s"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -66026,8 +66172,8 @@ self: { pname = "conferer"; version = "1.1.0.0"; sha256 = "1hkdrqxrac1mbzvd29f6ds4cbihdv0j0daai7yc282myv0varh09"; - revision = "2"; - editedCabalFile = "0j7q975kg4dchl7pn8cl26sf8945bmhw5mvy73s18ylxqx4qqkwb"; + revision = "3"; + editedCabalFile = "15gs9cv1i9j4qx6vnp32yhcjb5rjaf9g3jsfdzmi5v7i3b1gziwc"; libraryHaskellDepends = [ base bytestring containers directory filepath text ]; @@ -66047,8 +66193,8 @@ self: { pname = "conferer-aeson"; version = "1.1.0.2"; sha256 = "07rdal3smq1s14zmsn7g26vc6sqj21rsa2a1vcbrwrfgh9x36jkn"; - revision = "1"; - editedCabalFile = "19v6xla4vvhmhqh3z82inp1b6jzvprbvcmd9nbg1l65nsvqgq25a"; + revision = "2"; + editedCabalFile = "000fs57llk3f1x0rgdkxzbqzwzh5fx3mirpx0scmnj936byapp4c"; libraryHaskellDepends = [ aeson base bytestring conferer directory text unordered-containers vector @@ -66261,8 +66407,8 @@ self: { }: mkDerivation { pname = "conferer-warp"; - version = "1.1.0.0"; - sha256 = "0zbgxq229jr7xwzw6q20rwnslbci07b1vk324izm8hxcp3kb76mj"; + version = "1.1.0.1"; + sha256 = "1dbqm1vb00d1dnm3fixw4p7xv1bwpmv0xfkdig0xlgc5b70xbjsh"; libraryHaskellDepends = [ base conferer http-types text wai warp ]; testHaskellDepends = [ base conferer hspec http-types text wai warp @@ -69384,8 +69530,8 @@ self: { ({ mkDerivation, base, containers, directory, parallel }: mkDerivation { pname = "cpsa"; - version = "3.6.11"; - sha256 = "1kqsr0vb9sxg2c5y14k66d381gx6779bns6ybjymgabw98asmm3k"; + version = "4.4.1"; + sha256 = "14g31626g72qljbrds08cpx670v2zgis05z3nkd5b7lim99ibhfh"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -78107,12 +78253,12 @@ self: { license = lib.licenses.publicDomain; }) {}; - "dependent-sum_0_7_1_1" = callPackage + "dependent-sum_0_7_2_0" = callPackage ({ mkDerivation, base, constraints-extras, some }: mkDerivation { pname = "dependent-sum"; - version = "0.7.1.1"; - sha256 = "1vyi15rk1hf7bc4gxl2y42wxayb3zv2a8macfc1vis856rzxm43n"; + version = "0.7.2.0"; + sha256 = "1frw5965v8i6xqdgs95gg8asgdqcqnmfahz0pmbwiaw5ybn62rc2"; libraryHaskellDepends = [ base constraints-extras some ]; description = "Dependent sum type"; license = lib.licenses.publicDomain; @@ -78534,6 +78680,22 @@ self: { license = lib.licenses.bsd3; }) {}; + "deriving-openapi3" = callPackage + ({ mkDerivation, aeson, base, deriving-aeson, lens, openapi3, text + }: + mkDerivation { + pname = "deriving-openapi3"; + version = "0.1.0.0"; + sha256 = "16jl42hpk21pwzlnpwny57l1xv9ibransw65zk4z4scdi4ygg9xi"; + libraryHaskellDepends = [ + aeson base deriving-aeson lens openapi3 text + ]; + description = "DerivingVia for OpenAPI 3"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "deriving-show-simple" = callPackage ({ mkDerivation, base, HUnit }: mkDerivation { @@ -84392,6 +84554,35 @@ self: { license = lib.licenses.mit; }) {}; + "doctest-parallel_0_2_6" = callPackage + ({ mkDerivation, base, base-compat, Cabal, code-page, containers + , deepseq, directory, exceptions, extra, filepath, ghc, ghc-paths + , Glob, hspec, hspec-core, hspec-discover, HUnit, mockery, pretty + , process, QuickCheck, random, setenv, silently, stringbuilder, syb + , template-haskell, transformers, unordered-containers + }: + mkDerivation { + pname = "doctest-parallel"; + version = "0.2.6"; + sha256 = "13hjwhdjw8jrj07zxkrrfbzr0mrk8gwyis1rbdi4ld4jbq3rr1z7"; + libraryHaskellDepends = [ + base base-compat Cabal code-page containers deepseq directory + exceptions extra filepath ghc ghc-paths Glob pretty process random + syb template-haskell transformers unordered-containers + ]; + testHaskellDepends = [ + base base-compat code-page containers deepseq directory exceptions + filepath ghc ghc-paths hspec hspec-core hspec-discover HUnit + mockery process QuickCheck setenv silently stringbuilder syb + transformers + ]; + testToolDepends = [ hspec-discover ]; + doHaddock = false; + description = "Test interactive Haskell examples"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "doctest-prop" = callPackage ({ mkDerivation, base, doctest, HUnit, QuickCheck }: mkDerivation { @@ -86416,6 +86607,24 @@ self: { maintainers = [ lib.maintainers.turion ]; }) {}; + "dunai_0_9_2" = callPackage + ({ mkDerivation, base, MonadRandom, simple-affine-space, tasty + , tasty-hunit, transformers, transformers-base + }: + mkDerivation { + pname = "dunai"; + version = "0.9.2"; + sha256 = "08skmwkfwiyy83s764fcpa9i8zny10bdbpv9wha6fjqr1b80i80f"; + libraryHaskellDepends = [ + base MonadRandom simple-affine-space transformers transformers-base + ]; + testHaskellDepends = [ base tasty tasty-hunit transformers ]; + description = "Generalised reactive framework supporting classic, arrowized and monadic FRP"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.turion ]; + }) {}; + "dunai-core" = callPackage ({ mkDerivation, base, MonadRandom, transformers, transformers-base }: @@ -86436,8 +86645,8 @@ self: { ({ mkDerivation, base, dunai, normaldistribution, QuickCheck }: mkDerivation { pname = "dunai-test"; - version = "0.9.1"; - sha256 = "0p78yvn98vp3qjd6dx23nwwzq6v6sks2gp9cycmcnjk3yn8470j9"; + version = "0.9.2"; + sha256 = "0ghc1sg1s31qg1z1sg1mzm9qad39ggrkr064mwbwsl2b5xlsnlr4"; libraryHaskellDepends = [ base dunai normaldistribution QuickCheck ]; @@ -89231,6 +89440,7 @@ self: { description = "Dependently typed elimination functions using singletons"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "eliminators_0_9_1" = callPackage @@ -89251,6 +89461,7 @@ self: { description = "Dependently typed elimination functions using singletons"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "elision" = callPackage @@ -92272,14 +92483,41 @@ self: { broken = true; }) {}; + "essence-of-live-coding_0_2_7" = callPackage + ({ mkDerivation, base, containers, foreign-store, HUnit, mmorph + , mtl, QuickCheck, syb, test-framework, test-framework-hunit + , test-framework-quickcheck2, time, transformers, vector-sized + }: + mkDerivation { + pname = "essence-of-live-coding"; + version = "0.2.7"; + sha256 = "1vg10x8radvr8ysqfzf1cngp2hnqy8g139x07pwqwycj9zwwnbl4"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers foreign-store mmorph syb time transformers + vector-sized + ]; + executableHaskellDepends = [ base transformers ]; + testHaskellDepends = [ + base containers HUnit mtl QuickCheck syb test-framework + test-framework-hunit test-framework-quickcheck2 transformers + ]; + description = "General purpose live coding framework"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.turion ]; + broken = true; + }) {}; + "essence-of-live-coding-PortMidi" = callPackage ({ mkDerivation, base, essence-of-live-coding, PortMidi , transformers }: mkDerivation { pname = "essence-of-live-coding-PortMidi"; - version = "0.2.6"; - sha256 = "0n5bivhffrxp8kwhf42r3yf485y3mnxl4r3pzwp2l89h7l380q8z"; + version = "0.2.7"; + sha256 = "1qqswld88yvqa1z8h9rdxqqvjikhkdb67xp2sph6xb231k9710qy"; libraryHaskellDepends = [ base essence-of-live-coding PortMidi transformers ]; @@ -92306,6 +92544,23 @@ self: { maintainers = [ lib.maintainers.turion ]; }) {}; + "essence-of-live-coding-gloss_0_2_7" = callPackage + ({ mkDerivation, base, essence-of-live-coding, foreign-store, gloss + , syb, transformers + }: + mkDerivation { + pname = "essence-of-live-coding-gloss"; + version = "0.2.7"; + sha256 = "0iv5wgzfxy1k80dh6c6hrzh4jcjy3ak4l3l004jm3wpfm7fm0lmx"; + libraryHaskellDepends = [ + base essence-of-live-coding foreign-store gloss syb transformers + ]; + description = "General purpose live coding framework - Gloss backend"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.turion ]; + }) {}; + "essence-of-live-coding-gloss-example" = callPackage ({ mkDerivation, base, essence-of-live-coding , essence-of-live-coding-gloss, gloss, syb, transformers @@ -92343,6 +92598,23 @@ self: { maintainers = [ lib.maintainers.turion ]; }) {}; + "essence-of-live-coding-pulse_0_2_7" = callPackage + ({ mkDerivation, base, essence-of-live-coding, foreign-store + , pulse-simple, transformers + }: + mkDerivation { + pname = "essence-of-live-coding-pulse"; + version = "0.2.7"; + sha256 = "0bmnc7901zgak223kfm29md0w5fd9lfv4dxc8c27cdcrdqnqfc2p"; + libraryHaskellDepends = [ + base essence-of-live-coding foreign-store pulse-simple transformers + ]; + description = "General purpose live coding framework - pulse backend"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.turion ]; + }) {}; + "essence-of-live-coding-pulse-example" = callPackage ({ mkDerivation, base, essence-of-live-coding , essence-of-live-coding-pulse, pulse-simple, transformers, vector @@ -92381,12 +92653,30 @@ self: { maintainers = [ lib.maintainers.turion ]; }) {}; + "essence-of-live-coding-quickcheck_0_2_7" = callPackage + ({ mkDerivation, base, boltzmann-samplers, essence-of-live-coding + , QuickCheck, syb, transformers + }: + mkDerivation { + pname = "essence-of-live-coding-quickcheck"; + version = "0.2.7"; + sha256 = "0jn5bz7xq8jmlkhrrbn5mj3ywh8288gpx43n8fkjzmzdk233kbvp"; + libraryHaskellDepends = [ + base boltzmann-samplers essence-of-live-coding QuickCheck syb + transformers + ]; + description = "General purpose live coding framework - QuickCheck integration"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.turion ]; + }) {}; + "essence-of-live-coding-vivid" = callPackage ({ mkDerivation, base, essence-of-live-coding, vivid }: mkDerivation { pname = "essence-of-live-coding-vivid"; - version = "0.2.6"; - sha256 = "1vw4bjxnqd58h5lrw7wqd1w3026skcnz9vrnwmfxcsbyc09bnyvw"; + version = "0.2.7"; + sha256 = "03j5kmp824s8b2x1n8dp86lh7ac8ccxh54dg0sx7v98j9lflbcqq"; libraryHaskellDepends = [ base essence-of-live-coding vivid ]; description = "General purpose live coding framework - vivid backend"; license = lib.licenses.bsd3; @@ -92413,6 +92703,26 @@ self: { maintainers = [ lib.maintainers.turion ]; }) {}; + "essence-of-live-coding-warp_0_2_7" = callPackage + ({ mkDerivation, base, bytestring, essence-of-live-coding + , http-client, http-types, wai, warp + }: + mkDerivation { + pname = "essence-of-live-coding-warp"; + version = "0.2.7"; + sha256 = "1zykg5qik61xr4ri6d9r04w5rj7wm0wqmnzm6nipwpixal3gdxqa"; + libraryHaskellDepends = [ + base essence-of-live-coding http-types wai warp + ]; + testHaskellDepends = [ + base bytestring essence-of-live-coding http-client + ]; + description = "General purpose live coding framework"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.turion ]; + }) {}; + "estimator" = callPackage ({ mkDerivation, ad, base, distributive, lens, linear, reflection }: @@ -93453,67 +93763,72 @@ self: { }) {}; "eventuo11y" = callPackage - ({ mkDerivation, base, exceptions, primitive, resourcet - , safe-exceptions, transformers, unliftio-core + ({ mkDerivation, base, exceptions, general-allocate, monad-control + , mtl, primitive, transformers, transformers-base, unliftio-core }: mkDerivation { pname = "eventuo11y"; - version = "0.5.0.0"; - sha256 = "19rsw7xs8hy1yl145fgsfd3rddvpxjgxv05kd557hgv35ipkklmz"; + version = "0.6.0.0"; + sha256 = "1zk49cfg2cab5h5xy2bghk643aq6p0zi937linnxgl53c21br1li"; libraryHaskellDepends = [ - base exceptions primitive resourcet safe-exceptions transformers - unliftio-core + base exceptions general-allocate monad-control mtl primitive + transformers transformers-base unliftio-core ]; description = "An event-oriented observability library"; license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; }) {}; "eventuo11y-batteries" = callPackage ({ mkDerivation, aeson, base, binary, bytestring, case-insensitive - , containers, eventuo11y, eventuo11y-json, http-media, http-types - , monad-control, mtl, network, safe-exceptions, semigroupoids - , servant-client, servant-client-core, text, transformers-base, wai + , containers, eventuo11y, eventuo11y-json, general-allocate + , http-media, http-types, monad-control, mtl, network + , safe-exceptions, semigroupoids, servant-client + , servant-client-core, text, transformers-base, unliftio-core, wai , warp }: mkDerivation { pname = "eventuo11y-batteries"; - version = "0.2.1.1"; - sha256 = "1s3mwr9cnfsn1kh63dq6djwvvj4sx256w47r9s6wsii9ibgqig8v"; + version = "0.3.0.0"; + sha256 = "12agwfk89jxsa2hdy5ghvkjddp2xs58973r4zi5zsf3zzx7nlx56"; libraryHaskellDepends = [ aeson base binary bytestring case-insensitive containers eventuo11y - eventuo11y-json http-media http-types monad-control mtl network - safe-exceptions semigroupoids servant-client servant-client-core - text transformers-base wai warp + eventuo11y-json general-allocate http-media http-types + monad-control mtl network safe-exceptions semigroupoids + servant-client servant-client-core text transformers-base + unliftio-core wai warp ]; description = "Grab bag of eventuo11y-enriched functionality"; license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; }) {}; "eventuo11y-dsl" = callPackage - ({ mkDerivation, base, template-haskell, th-compat }: + ({ mkDerivation, base, template-haskell }: mkDerivation { pname = "eventuo11y-dsl"; - version = "0.1.0.0"; - sha256 = "0nm0q8p5qbnx56gvpsbzz5vwkx08sn8wcdyb6hli4ihq407ml8qz"; - libraryHaskellDepends = [ base template-haskell th-compat ]; + version = "0.2.0.0"; + sha256 = "0qa5csjkm25278h1vf59aws9am59gyha7zi1yjq7wag1ivhdfa9w"; + libraryHaskellDepends = [ base template-haskell ]; description = "DSL for defining eventuo11y fields and selectors"; license = lib.licenses.asl20; }) {}; "eventuo11y-json" = callPackage ({ mkDerivation, aeson, base, bytestring, eventuo11y - , eventuo11y-dsl, template-haskell, text, th-compat, time, uuid + , eventuo11y-dsl, template-haskell, text, time, uuid }: mkDerivation { pname = "eventuo11y-json"; - version = "0.1.0.0"; - sha256 = "1bl4lqxq38nvwnm6s9w27ja4x571y6lvjvx7amc2i498i3mr5jzq"; + version = "0.2.0.0"; + sha256 = "132dkvsp1p5lj103amsfkn9grc4rx7qgs2nh5506mybykhhhzzg5"; libraryHaskellDepends = [ aeson base bytestring eventuo11y eventuo11y-dsl template-haskell - text th-compat time uuid + text time uuid ]; description = "aeson-based rendering for eventuo11y"; license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; }) {}; "every" = callPackage @@ -93734,6 +94049,18 @@ self: { license = lib.licenses.bsd3; }) {}; + "exception-hierarchy_0_1_0_8" = callPackage + ({ mkDerivation, base, template-haskell }: + mkDerivation { + pname = "exception-hierarchy"; + version = "0.1.0.8"; + sha256 = "17wx40kic0gw5lbz1nr094ps612i0j0pbf0wfj4kgzsl6cj80hih"; + libraryHaskellDepends = [ base template-haskell ]; + description = "Exception type hierarchy with TemplateHaskell"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "exception-mailer" = callPackage ({ mkDerivation, base, hslogger, mime-mail, text }: mkDerivation { @@ -99304,6 +99631,25 @@ self: { mainProgram = "fix-whitespace"; }) {}; + "fix-whitespace_0_0_11" = callPackage + ({ mkDerivation, base, directory, extra, filepath, filepattern + , text, yaml + }: + mkDerivation { + pname = "fix-whitespace"; + version = "0.0.11"; + sha256 = "0q36vr3pfk1x14hl86g4g557299ih0510j7cf37h8n5nv8bs8gq2"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base directory extra filepath filepattern text yaml + ]; + description = "Fixes whitespace issues"; + license = "unknown"; + hydraPlatforms = lib.platforms.none; + mainProgram = "fix-whitespace"; + }) {}; + "fixed" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -101421,6 +101767,30 @@ self: { broken = true; }) {}; + "fontconfig-pure" = callPackage + ({ mkDerivation, base, containers, css-syntax, fontconfig + , freetype2, hashable, hspec, linear, QuickCheck, scientific + , stylist-traits, text + }: + mkDerivation { + pname = "fontconfig-pure"; + version = "0.1.0.0"; + sha256 = "0rnx9s5kj5lr70gp4454qy3h4lfndf9f976h331jp0f4y47c2d42"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers css-syntax freetype2 hashable linear scientific + stylist-traits text + ]; + libraryPkgconfigDepends = [ fontconfig ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ base hspec QuickCheck ]; + description = "Pure-functional language bindings to FontConfig"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + mainProgram = "fontconfig-pure"; + }) {inherit (pkgs) fontconfig;}; + "foo" = callPackage ({ mkDerivation, base, containers, GLUT, haskell98, OpenGL }: mkDerivation { @@ -102026,7 +102396,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Parsers and analyses for Fortran standards 66, 77, 90, 95 and 2003 (partial)"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; mainProgram = "fortran-src"; }) {}; @@ -102058,6 +102427,7 @@ self: { license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; mainProgram = "fortran-src-extras"; + broken = true; }) {}; "fortran-vars" = callPackage @@ -102978,15 +103348,13 @@ self: { }) {}; "free-theorems" = callPackage - ({ mkDerivation, base, containers, haskell-src, haskell-src-exts - , mtl, pretty, syb - }: + ({ mkDerivation, base, containers, haskell-src, mtl, pretty, syb }: mkDerivation { pname = "free-theorems"; - version = "0.3.2.0"; - sha256 = "1r0qz8h8fjb9akkhd3impr30gd0s5ky51dj667x0pf155b4lvx2w"; + version = "0.3.2.1"; + sha256 = "0skifd09ccbr950wjm9z9l0adzl9yqrqs73xlhcx24xsy16gn2h8"; libraryHaskellDepends = [ - base containers haskell-src haskell-src-exts mtl pretty syb + base containers haskell-src mtl pretty syb ]; description = "Automatic generation of free theorems"; license = lib.licenses.publicDomain; @@ -106729,8 +107097,8 @@ self: { }: mkDerivation { pname = "general-allocate"; - version = "0.1.0.0"; - sha256 = "1w9dv6fphf64sh1c8azk7r6yb19mw4g1rbw4zy0rz69fskgia5sv"; + version = "0.2.0.0"; + sha256 = "1i388gvnk4brc49pp44xaayddcpg78ii1yv0n4r09nl4iicggsyc"; libraryHaskellDepends = [ base containers mtl primitive resourcet safe-exceptions transformers @@ -119572,14 +119940,15 @@ self: { }: mkDerivation { pname = "graphmod"; - version = "1.4.4"; - sha256 = "12q9kkxyyma23dgzpdnlsrklk20isr4jf2yslkzyb6ny5xmfxsac"; - isLibrary = false; + version = "1.4.5.1"; + sha256 = "1k1nji14wfn36jym0fqc3yfiwd6gimyk109njrp7b1ds8zfp0ayp"; + isLibrary = true; isExecutable = true; - executableHaskellDepends = [ + libraryHaskellDepends = [ base Cabal containers directory dotgen filepath haskell-lexer pretty ]; + executableHaskellDepends = [ base ]; description = "Present the module dependencies of a program as a \"dot\" graph"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -121818,8 +122187,8 @@ self: { }: mkDerivation { pname = "h-raylib"; - version = "4.5.0.8"; - sha256 = "0v2aclbqjw98wa6vwv0165b28pc6n9mvbsppxnn3y1nxsjn6nwdf"; + version = "4.5.0.9"; + sha256 = "0mlpdfvg8vqylkl64czzc4w397zi3fmm81jvax0l3chjg3bx5i02"; libraryHaskellDepends = [ base ]; librarySystemDepends = [ c libGL libX11 libXcursor libXi libXinerama libXrandr @@ -123346,7 +123715,7 @@ self: { "hackport" = callPackage ({ mkDerivation, array, async, base, base16-bytestring - , base64-bytestring, binary, bytestring, containers + , base64-bytestring, binary, bytestring, cabal-install, containers , cryptohash-sha256, deepseq, directory, doctest, echo, ed25519 , edit-distance, extensible-exceptions, filepath, ghc-prim , hashable, hspec, hspec-discover, HTTP, lifted-base, monad-control @@ -123357,8 +123726,8 @@ self: { }: mkDerivation { pname = "hackport"; - version = "0.7.3.0"; - sha256 = "0166ybpnb0ajp2afgi70lwwmkwbbgavj8mfpcksyaysbpa6zpl4m"; + version = "0.7.3.1"; + sha256 = "1wfsl5ybbmxvj29hr39xp35fqyairm3mkb1q7xad8i2xmn76rvmp"; isLibrary = false; isExecutable = true; libraryHaskellDepends = [ @@ -123379,7 +123748,7 @@ self: { extensible-exceptions filepath hspec network-uri parallel parsec pretty process QuickCheck split text time xml ]; - testToolDepends = [ doctest hspec-discover ]; + testToolDepends = [ cabal-install doctest hspec-discover ]; doHaddock = false; description = "Hackage and Portage integration tool"; license = lib.licenses.gpl3Plus; @@ -127545,8 +127914,8 @@ self: { pname = "haskeline"; version = "0.8.2"; sha256 = "1pr7zik1138cj0463867i1qqb2bgsq716mryap18jx7zb9f1b7gc"; - revision = "2"; - editedCabalFile = "0ylww688l5nfgjw4z5clvr3pmm65axbsq06fg8rpbd2iqzsaz01s"; + revision = "3"; + editedCabalFile = "101qavk0fmc4c6qa307kswz3345psskxqyxhk6hmykynjm05jjrv"; configureFlags = [ "-fterminfo" ]; isLibrary = true; isExecutable = true; @@ -136361,53 +136730,61 @@ self: { }) {}; "hevm" = callPackage - ({ mkDerivation, abstract-par, aeson, ansi-wl-pprint, async, base - , base16-bytestring, binary, brick, bytestring, cereal, containers - , cryptonite, data-dword, Decimal, deepseq, directory, fgl - , filepath, free, haskeline, here, HUnit, lens, lens-aeson, libff - , megaparsec, memory, monad-par, mtl, multiset, operational - , optparse-generic, process, QuickCheck, quickcheck-text - , regex-tdfa, restless-git, rosezipper, s-cargot, sbv, scientific - , secp256k1, semver-range, tasty, tasty-hunit, tasty-quickcheck - , temporary, text, text-format, time, transformers, tree-view - , unordered-containers, vector, vty, witherable, wreq + ({ mkDerivation, abstract-par, aeson, ansi-wl-pprint, array, async + , base, base16-bytestring, binary, brick, bytestring, cereal + , containers, cryptonite, data-dword, Decimal, deepseq, directory + , fgl, filepath, free, haskeline, here, HUnit, lens, lens-aeson + , libff, megaparsec, memory, monad-par, mtl, multiset, operational + , optparse-generic, parsec, process, QuickCheck + , quickcheck-instances, quickcheck-text, regex, regex-tdfa + , restless-git, rosezipper, s-cargot, scientific, secp256k1 + , semver-range, smt2-parser, spool, tasty, tasty-expected-failure + , tasty-hunit, tasty-quickcheck, temporary, text, time + , transformers, tree-view, tuple, unordered-containers, vector, vty + , witherable, word-wrap, wreq }: mkDerivation { pname = "hevm"; - version = "0.49.0"; - sha256 = "1plkfzx0r5k77ymlkrg694vgx58jil5wx2m43ggs9ixnph0q3ysx"; + version = "0.50.0"; + sha256 = "0wdp7vl1aq79k8sw7n4mf6wv184as0pmprdffzklzkcskvs9yjmb"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ - abstract-par aeson ansi-wl-pprint base base16-bytestring binary - brick bytestring cereal containers cryptonite data-dword Decimal - deepseq directory fgl filepath free haskeline here lens lens-aeson - megaparsec memory monad-par mtl multiset operational - optparse-generic process QuickCheck quickcheck-text regex-tdfa - restless-git rosezipper s-cargot sbv scientific semver-range - temporary text text-format time transformers tree-view - unordered-containers vector vty witherable wreq + abstract-par aeson ansi-wl-pprint array async base + base16-bytestring binary brick bytestring cereal containers + cryptonite data-dword Decimal deepseq directory fgl filepath free + haskeline here HUnit lens lens-aeson megaparsec memory monad-par + mtl multiset operational optparse-generic parsec process QuickCheck + quickcheck-instances quickcheck-text regex regex-tdfa restless-git + rosezipper s-cargot scientific semver-range smt2-parser spool tasty + tasty-expected-failure tasty-hunit tasty-quickcheck temporary text + time transformers tree-view tuple unordered-containers vector vty + witherable word-wrap wreq ]; librarySystemDepends = [ libff secp256k1 ]; executableHaskellDepends = [ aeson ansi-wl-pprint async base base16-bytestring binary brick bytestring containers cryptonite data-dword deepseq directory filepath free lens lens-aeson memory mtl operational - optparse-generic process QuickCheck quickcheck-text regex-tdfa sbv - temporary text text-format unordered-containers vector vty + optparse-generic process QuickCheck quickcheck-text regex-tdfa + temporary text unordered-containers vector vty ]; testHaskellDepends = [ - base base16-bytestring binary bytestring containers free here HUnit - lens mtl QuickCheck sbv tasty tasty-hunit tasty-quickcheck text - vector + array base base16-bytestring binary bytestring containers + data-dword directory here HUnit lens mtl process QuickCheck + quickcheck-instances regex regex-tdfa smt2-parser tasty + tasty-expected-failure tasty-hunit tasty-quickcheck temporary text + time vector ]; testSystemDepends = [ secp256k1 ]; + doHaddock = false; description = "Ethereum virtual machine evaluator"; license = lib.licenses.agpl3Only; hydraPlatforms = lib.platforms.none; mainProgram = "hevm"; maintainers = [ lib.maintainers.arturcygan ]; + broken = true; }) {inherit (pkgs) libff; inherit (pkgs) secp256k1;}; "hevolisa" = callPackage @@ -149386,14 +149763,14 @@ self: { license = lib.licenses.mit; }) {}; - "hspec_2_10_7" = callPackage + "hspec_2_10_8" = callPackage ({ mkDerivation, base, hspec-core, hspec-discover , hspec-expectations, QuickCheck }: mkDerivation { pname = "hspec"; - version = "2.10.7"; - sha256 = "136icn9f0prl4p1yphaf2yzaq9zc8vaiq9xv5v76c5j95agvp9rr"; + version = "2.10.8"; + sha256 = "13g46fk7hcnk3058pb2wwq257pi8628qaa9md9sfw5rlw878z25r"; libraryHaskellDepends = [ base hspec-core hspec-discover hspec-expectations QuickCheck ]; @@ -149516,7 +149893,7 @@ self: { license = lib.licenses.mit; }) {}; - "hspec-core_2_10_7" = callPackage + "hspec-core_2_10_8" = callPackage ({ mkDerivation, ansi-terminal, array, base, base-orphans , call-stack, deepseq, directory, filepath, haskell-lexer , hspec-expectations, hspec-meta, HUnit, process, QuickCheck @@ -149525,8 +149902,8 @@ self: { }: mkDerivation { pname = "hspec-core"; - version = "2.10.7"; - sha256 = "01ikjgdc5fpblw7y1h50j0dbgw3drjz26slcalzhvqza7523jn2g"; + version = "2.10.8"; + sha256 = "0bka7r8b2qh82sxnz5mcfw2swl4k2v3q97yb0n1rhs1g444lfcqn"; libraryHaskellDepends = [ ansi-terminal array base call-stack deepseq directory filepath haskell-lexer hspec-expectations HUnit process QuickCheck @@ -149607,14 +149984,14 @@ self: { maintainers = [ lib.maintainers.maralorn ]; }) {}; - "hspec-discover_2_10_7" = callPackage + "hspec-discover_2_10_8" = callPackage ({ mkDerivation, base, directory, filepath, hspec-meta, mockery , QuickCheck }: mkDerivation { pname = "hspec-discover"; - version = "2.10.7"; - sha256 = "0xx38v8b8xplqi2jazng57z4xfm9lzb21ldpm428s28kl71br1vd"; + version = "2.10.8"; + sha256 = "032s5mfr9sw2bgdi2l6fy8jdwm79nr896dw1ha16m94m8596vmph"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base directory filepath ]; @@ -154876,6 +155253,32 @@ self: { mainProgram = "hw-json-simd"; }) {}; + "hw-json-simd_0_1_1_2" = callPackage + ({ mkDerivation, base, bytestring, c2hs, doctest, doctest-discover + , hw-prim, lens, optparse-applicative, transformers, vector + }: + mkDerivation { + pname = "hw-json-simd"; + version = "0.1.1.2"; + sha256 = "03g2gwmkp6v7b0vf4x8bh4qk91ghr0av5x3c9paj3rp3igycccd6"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base bytestring hw-prim lens vector ]; + libraryToolDepends = [ c2hs ]; + executableHaskellDepends = [ + base bytestring hw-prim lens optparse-applicative vector + ]; + testHaskellDepends = [ + base bytestring doctest doctest-discover hw-prim lens transformers + vector + ]; + testToolDepends = [ doctest-discover ]; + description = "SIMD-based JSON semi-indexer"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "hw-json-simd"; + }) {}; + "hw-json-simple-cursor" = callPackage ({ mkDerivation, base, bytestring, criterion, directory, doctest , doctest-discover, generic-lens, hedgehog, hspec, hspec-discover @@ -155323,6 +155726,39 @@ self: { license = lib.licenses.bsd3; }) {}; + "hw-simd_0_1_2_2" = callPackage + ({ mkDerivation, base, bits-extra, bytestring, c2hs, cassava + , containers, criterion, deepseq, directory, doctest + , doctest-discover, hedgehog, hspec, hspec-discover, hw-bits + , hw-hedgehog, hw-hspec-hedgehog, hw-prim, hw-rankselect + , hw-rankselect-base, lens, mmap, text, transformers, vector + }: + mkDerivation { + pname = "hw-simd"; + version = "0.1.2.2"; + sha256 = "0ipcrv19xwmq6znbmwmzrjahmymmcmpbs7hpx0183hrwbx2hyhqx"; + libraryHaskellDepends = [ + base bits-extra bytestring deepseq hw-bits hw-prim hw-rankselect + hw-rankselect-base transformers vector + ]; + libraryToolDepends = [ c2hs ]; + testHaskellDepends = [ + base bits-extra bytestring deepseq directory doctest + doctest-discover hedgehog hspec hw-bits hw-hedgehog + hw-hspec-hedgehog hw-prim hw-rankselect hw-rankselect-base lens + text vector + ]; + testToolDepends = [ doctest-discover hspec-discover ]; + benchmarkHaskellDepends = [ + base bits-extra bytestring cassava containers criterion deepseq + directory hw-bits hw-prim hw-rankselect hw-rankselect-base mmap + transformers vector + ]; + description = "SIMD library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "hw-simd-cli" = callPackage ({ mkDerivation, base, bits-extra, bytestring, containers, deepseq , directory, doctest, doctest-discover, generic-lens, hw-bits @@ -158810,8 +159246,8 @@ self: { }: mkDerivation { pname = "implicit-hie"; - version = "0.1.2.7"; - sha256 = "0yb457n26455kbq6kv8g48q66pmmaxcpikmpg9gm00sd6adgq6gl"; + version = "0.1.4.0"; + sha256 = "08ggdlh5j1ya5rjhvcp1k1iyd5bvrgm865qnaxnqz7xvq7b1864k"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -159900,6 +160336,25 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "infinite-list" = callPackage + ({ mkDerivation, base, QuickCheck, tasty, tasty-bench + , tasty-expected-failure, tasty-inspection-testing + , tasty-quickcheck + }: + mkDerivation { + pname = "infinite-list"; + version = "0.1"; + sha256 = "0imayklahbpsiciflwvwj3fxjhg461lw6x4515wxr39hgpb18di1"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ + base QuickCheck tasty tasty-expected-failure + tasty-inspection-testing tasty-quickcheck + ]; + benchmarkHaskellDepends = [ base tasty-bench ]; + description = "Infinite lists"; + license = lib.licenses.bsd3; + }) {}; + "infinite-search" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -181940,18 +182395,18 @@ self: { , constraints, containers, cryptonite, data-default , first-class-families, fmt, lens, morley, morley-prelude, mtl , named, optparse-applicative, singletons, singletons-base - , template-haskell, text, text-manipulate, unordered-containers - , vinyl, with-utf8 + , template-haskell, text, text-manipulate, type-errors + , unordered-containers, vinyl, with-utf8 }: mkDerivation { pname = "lorentz"; - version = "0.14.1"; - sha256 = "0qvg3b0hmnjwarmvsynz7f2y362r6wszzm46168154xwmgyrkb3h"; + version = "0.15.0"; + sha256 = "10nppxymkp7b5vqcrkrm7jd5xg84hvczvvrrh2digdawqmxrakgl"; libraryHaskellDepends = [ aeson-pretty base-noprelude bimap bytestring constraints containers cryptonite data-default first-class-families fmt lens morley morley-prelude mtl named optparse-applicative singletons - singletons-base template-haskell text text-manipulate + singletons-base template-haskell text text-manipulate type-errors unordered-containers vinyl with-utf8 ]; description = "EDSL for the Michelson Language"; @@ -187592,6 +188047,7 @@ self: { description = "An Elf parser"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "mellon-core" = callPackage @@ -192467,8 +192923,8 @@ self: { pname = "monad-logger"; version = "0.3.37"; sha256 = "1z275a428zcj73zz0cpfha2adwiwqqqp7klx3kbd3i9rl20xa106"; - revision = "2"; - editedCabalFile = "1kkw07kk8gv7d9iarradqcqzjpdfh5shjlhfbf2v25mmcpchp6hd"; + revision = "3"; + editedCabalFile = "1dzkw08b4ijacdw0vcfxlr13rd819x2yj7b6sr9jrrwicd45zm1z"; libraryHaskellDepends = [ base bytestring conduit conduit-extra exceptions fast-logger lifted-base monad-control monad-loops mtl resourcet stm stm-chans @@ -193914,6 +194370,20 @@ self: { license = lib.licenses.bsd3; }) {}; + "monoid-extras_0_6_2" = callPackage + ({ mkDerivation, base, criterion, groups, semigroupoids, semigroups + }: + mkDerivation { + pname = "monoid-extras"; + version = "0.6.2"; + sha256 = "1qaxp0cf2cvzvfpk7x9mjz1zmlpjfzxij8v2n45w89s7bq9ckvlw"; + libraryHaskellDepends = [ base groups semigroupoids ]; + benchmarkHaskellDepends = [ base criterion semigroups ]; + description = "Various extra monoid-related definitions and utilities"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "monoid-map" = callPackage ({ mkDerivation, base, commutative-semigroups, monoidal-containers , patch, reflex, witherable @@ -194460,38 +194930,40 @@ self: { "morley" = callPackage ({ mkDerivation, aeson, aeson-casing, aeson-pretty, base-noprelude , base58-bytestring, bimap, binary, bytestring, constraints - , containers, crypto-sodium, cryptonite, data-default, Diff - , elliptic-curve, first-class-families, fmt, galois-field - , generic-deriving, gitrev, haskeline, hex-text, lens, megaparsec - , memory, MonadRandom, morley-prelude, mtl, named - , optparse-applicative, pairing, parser-combinators, scientific - , semigroups, show-type, singletons, singletons-base, syb - , template-haskell, text, text-manipulate, th-lift-instances - , th-reify-many, time, timerep, uncaught-exception - , unordered-containers, vector, vinyl, with-utf8, wl-pprint-text + , constraints-extras, containers, crypto-sodium, cryptonite + , data-default, dependent-sum-template, Diff, elliptic-curve + , first-class-families, fmt, galois-field, generic-deriving, gitrev + , haskeline, hex-text, lens, megaparsec, memory, MonadRandom + , morley-prelude, mtl, named, optparse-applicative, pairing + , parser-combinators, scientific, semigroups, show-type, singletons + , singletons-base, some, syb, template-haskell, text + , text-manipulate, th-lift-instances, th-reify-many, time, timerep + , type-errors, uncaught-exception, unordered-containers, vector + , vinyl, with-utf8, wl-pprint-text }: mkDerivation { pname = "morley"; - version = "1.18.0"; - sha256 = "0kv4rcq8yqdnmf14dsf03196nc717cih2pd574cc7qvfv2frwgh7"; + version = "1.19.0"; + sha256 = "12rps1k1bky7bkx0zl17j9vs07w8fll0576ip02jd6sn1i6541fg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson aeson-casing aeson-pretty base-noprelude base58-bytestring - bimap binary bytestring constraints containers crypto-sodium - cryptonite data-default Diff elliptic-curve first-class-families - fmt galois-field generic-deriving gitrev hex-text lens megaparsec - memory MonadRandom morley-prelude mtl named optparse-applicative - pairing parser-combinators scientific semigroups show-type - singletons singletons-base syb template-haskell text - text-manipulate th-lift-instances th-reify-many time timerep + bimap binary bytestring constraints constraints-extras containers + crypto-sodium cryptonite data-default dependent-sum-template Diff + elliptic-curve first-class-families fmt galois-field + generic-deriving gitrev hex-text lens megaparsec memory MonadRandom + morley-prelude mtl named optparse-applicative pairing + parser-combinators scientific semigroups show-type singletons + singletons-base some syb template-haskell text text-manipulate + th-lift-instances th-reify-many time timerep type-errors uncaught-exception unordered-containers vector vinyl with-utf8 wl-pprint-text ]; executableHaskellDepends = [ aeson base-noprelude base58-bytestring bytestring fmt haskeline - hex-text megaparsec MonadRandom morley-prelude named - optparse-applicative singletons text vinyl with-utf8 + hex-text megaparsec MonadRandom morley-prelude optparse-applicative + singletons text vinyl with-utf8 ]; description = "Developer tools for the Michelson Language"; license = lib.licenses.mit; @@ -194505,26 +194977,24 @@ self: { , containers, data-default, exceptions, fmt, hex-text , hspec-expectations, http-client, http-client-tls, http-types , HUnit, lens, lorentz, megaparsec, memory, morley, morley-prelude - , mtl, named, optparse-applicative, process, random - , safe-exceptions, scientific, servant, servant-client - , servant-client-core, singletons, syb, tasty, tasty-ant-xml - , tasty-discover, tasty-hunit-compat, text, time, universum - , unliftio + , mtl, optparse-applicative, process, random, safe-exceptions + , scientific, servant, servant-client, servant-client-core + , singletons, syb, tasty, tasty-ant-xml, tasty-discover + , tasty-hunit-compat, text, time, unliftio }: mkDerivation { pname = "morley-client"; - version = "0.2.1"; - sha256 = "0a55lmbk1b2h7469hv084a0gyp48w57hjz05wlpc4npm0gp1ijxw"; + version = "0.3.0"; + sha256 = "0wb6pgds6bijs2bfwdwzkpmhlbwfpx5lwxj4xj2pvd47410lzjfz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson aeson-casing base-noprelude binary bytestring co-log co-log-core colourista constraints containers data-default fmt hex-text http-client http-client-tls http-types lens lorentz - megaparsec memory morley morley-prelude mtl named - optparse-applicative process random safe-exceptions scientific - servant servant-client servant-client-core singletons syb text time - universum unliftio + megaparsec memory morley morley-prelude mtl optparse-applicative + process random scientific servant servant-client + servant-client-core singletons syb text time unliftio ]; executableHaskellDepends = [ aeson base-noprelude data-default fmt morley morley-prelude @@ -199174,6 +199644,21 @@ self: { broken = true; }) {}; + "named-text" = callPackage + ({ mkDerivation, base, deepseq, hashable, prettyprinter, sayable + , text + }: + mkDerivation { + pname = "named-text"; + version = "1.0.1.0"; + sha256 = "05v79ry6rlrpfvf36nkzf6l4xm2kzgpdrvaivg878nxcrni1gr78"; + libraryHaskellDepends = [ + base deepseq hashable prettyprinter sayable text + ]; + description = "A parameterized named text type and associated functionality"; + license = lib.licenses.isc; + }) {}; + "namelist" = callPackage ({ mkDerivation, base, case-insensitive, data-default-class, parsec , QuickCheck, tasty, tasty-hunit, tasty-quickcheck @@ -208114,6 +208599,43 @@ self: { mainProgram = "example"; }) {}; + "openapi3_3_2_3" = 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, optics-core + , optics-th, QuickCheck, quickcheck-instances, scientific + , template-haskell, text, time, transformers, unordered-containers + , utf8-string, uuid-types, vector + }: + mkDerivation { + pname = "openapi3"; + version = "3.2.3"; + sha256 = "0svkzafxfmhjakv4h57p5sw59ksbxz1hn1y3fbg6zimwal4mgr6l"; + isLibrary = true; + isExecutable = true; + 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 optics-core optics-th QuickCheck scientific + template-haskell text time transformers unordered-containers + uuid-types vector + ]; + executableHaskellDepends = [ aeson base lens text ]; + 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 = "OpenAPI 3.0 data model"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "example"; + }) {}; + "openapi3-code-generator" = callPackage ({ mkDerivation, aeson, autodocodec, autodocodec-yaml, base , bytestring, containers, directory, filepath, genvalidity @@ -209793,7 +210315,6 @@ self: { ]; description = "Types and functions for Kepler orbits"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.expipiplus1 ]; }) {}; @@ -213229,8 +213750,8 @@ self: { }: mkDerivation { pname = "parameterized-utils"; - version = "2.1.5.0"; - sha256 = "1w0r09kqqdwlj13xq5swzci0crmarxz49bc01vyb92xzrsmjkhss"; + version = "2.1.6.0"; + sha256 = "118inzvvr72bfr1pzgxglrpd2fsz0kn9hk791imygl0fv1258rb6"; libraryHaskellDepends = [ base base-orphans constraints containers deepseq ghc-prim hashable hashtables indexed-traversable lens mtl profunctors @@ -214610,8 +215131,8 @@ self: { }: mkDerivation { pname = "patch"; - version = "0.0.8.0"; - sha256 = "1yxw960j78lx35i2ncipg33n6xdc1jmcmc64kyppygpzn20k3j68"; + version = "0.0.8.1"; + sha256 = "06hdh1x5lilz1w4gakixwf9r0x4x13a2cijgim8zjf7lq5irlmw5"; libraryHaskellDepends = [ base commutative-semigroups constraints-extras containers dependent-map dependent-sum indexed-traversable lens @@ -217124,8 +217645,8 @@ self: { pname = "persistent-mongoDB"; version = "2.13.0.1"; sha256 = "1ck74kpzkz623c43qb8r1cjq8chi2p721vx95zrpciz8jm496235"; - revision = "1"; - editedCabalFile = "1h007vh9cx0y963xacxhf3rn2wjnc22ygil9c0z13mljmqssf5h6"; + revision = "2"; + editedCabalFile = "169wvga2zkgq0znvpnmpcyz0wy92sspjsrg48vyj2fr58yvvhbz5"; libraryHaskellDepends = [ aeson base bson bytestring cereal conduit http-api-data mongoDB network path-pieces persistent resource-pool resourcet text time @@ -222823,6 +223344,32 @@ self: { license = lib.licenses.bsd3; }) {}; + "polysemy_1_8_0_0" = callPackage + ({ mkDerivation, async, base, Cabal, cabal-doctest, containers + , doctest, first-class-families, hspec, hspec-discover + , inspection-testing, mtl, stm, syb, template-haskell + , th-abstraction, transformers, type-errors, unagi-chan + }: + mkDerivation { + pname = "polysemy"; + version = "1.8.0.0"; + sha256 = "1fyysldfnirhk8nfgiji248rc35c97r0hm4hk6j1n12ynhxcaiwb"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + async base containers first-class-families mtl stm syb + template-haskell th-abstraction transformers type-errors unagi-chan + ]; + testHaskellDepends = [ + async base containers doctest first-class-families hspec + hspec-discover inspection-testing mtl stm syb template-haskell + th-abstraction transformers type-errors unagi-chan + ]; + testToolDepends = [ hspec-discover ]; + description = "Higher-order, low-boilerplate free monads"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "polysemy-RandomFu" = callPackage ({ mkDerivation, base, hspec, hspec-discover, mtl, polysemy , polysemy-plugin, polysemy-zoo, random, random-fu, random-source @@ -222853,8 +223400,8 @@ self: { }: mkDerivation { pname = "polysemy-check"; - version = "0.9.0.0"; - sha256 = "092p92aavd3jqq7kjp3n2kx3zyg6k49zd99rliaw4gvgn6zk8k0l"; + version = "0.9.0.1"; + sha256 = "0zv6sf379pcnrj39hzmgmw0r0d4nsfizcsgl00c6c5f7n17cc53b"; libraryHaskellDepends = [ base containers kind-generics kind-generics-th polysemy QuickCheck ]; @@ -228183,8 +228730,8 @@ self: { ({ mkDerivation, base, containers, hspec, random }: mkDerivation { pname = "prob"; - version = "0.1.0.0"; - sha256 = "1y0xfcjpkg72nj3rp6pfwjxdwqf74hdi30h1ih198kkpa0nsazyh"; + version = "0.1.1"; + sha256 = "0ra2g9l5lir5j0z9c2j8n4gqyxdfkj8v4qdbm7z6b6l9ii2lq8cn"; libraryHaskellDepends = [ base containers random ]; testHaskellDepends = [ base hspec ]; description = "Discrete probability monad"; @@ -230032,6 +230579,23 @@ self: { license = lib.licenses.bsd3; }) {}; + "protobuf-builder" = callPackage + ({ mkDerivation, array-builder, base, bytebuild, byteslice + , bytestring, natural-arithmetic, primitive, run-st, text-short + , zigzag + }: + mkDerivation { + pname = "protobuf-builder"; + version = "0.1.0.0"; + sha256 = "0qv7vhg250sfah13likpj4jqkldr8lqvcxvlajp2cx3k69sfv1f9"; + libraryHaskellDepends = [ + array-builder base bytebuild byteslice bytestring + natural-arithmetic primitive run-st text-short zigzag + ]; + description = "Slow protobuf implementation"; + license = lib.licenses.bsd3; + }) {}; + "protobuf-native" = callPackage ({ mkDerivation, base, bytestring, cereal, cplusplus-th, criterion , hprotoc-fork, protobuf, protocol-buffers-fork, QuickCheck @@ -236120,6 +236684,19 @@ self: { license = lib.licenses.bsd3; }) {}; + "raylib-imgui" = callPackage + ({ mkDerivation, base, h-raylib }: + mkDerivation { + pname = "raylib-imgui"; + version = "4.5.0.9"; + sha256 = "1b2363czcxzg22d5mjr6y480lzv82v0hkyabq7821zgb9y5v3879"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base h-raylib ]; + description = "Haskell bindings for rlImGui"; + license = lib.licenses.asl20; + }) {}; + "raz" = callPackage ({ mkDerivation, base, containers, criterion, deepseq, MonadRandom , random, transformers @@ -238418,6 +238995,48 @@ self: { license = lib.licenses.bsd3; }) {}; + "reflex_0_9_0_0" = callPackage + ({ mkDerivation, base, bifunctors, commutative-semigroups, comonad + , constraints, constraints-extras, containers, criterion + , data-default, deepseq, dependent-map, dependent-sum, directory + , exception-transformers, filemanip, filepath, haskell-src-exts + , haskell-src-meta, hlint, hspec, lens, loch-th, MemoTrie, mmorph + , monad-control, monoidal-containers, mtl, patch, prim-uniq + , primitive, process, proctest, profunctors, random, ref-tf + , reflection, semialign, semigroupoids, split, stm, syb + , template-haskell, text, these, these-lens, time, transformers + , unbounded-delays, witherable + }: + mkDerivation { + pname = "reflex"; + version = "0.9.0.0"; + sha256 = "0g22b2bkv6l2m7aiz7kqi3x572qhzy0hikvpysrq2jffl02by0lm"; + libraryHaskellDepends = [ + base bifunctors commutative-semigroups comonad constraints + constraints-extras containers data-default dependent-map + dependent-sum exception-transformers haskell-src-exts + haskell-src-meta lens MemoTrie mmorph monad-control + monoidal-containers mtl patch prim-uniq primitive profunctors + random ref-tf reflection semialign semigroupoids stm syb + template-haskell these time transformers unbounded-delays + witherable + ]; + testHaskellDepends = [ + base bifunctors commutative-semigroups constraints + constraints-extras containers deepseq dependent-map dependent-sum + directory filemanip filepath hlint hspec lens monoidal-containers + mtl patch proctest ref-tf semialign split text these these-lens + transformers witherable + ]; + benchmarkHaskellDepends = [ + base containers criterion deepseq dependent-map dependent-sum + loch-th mtl primitive process ref-tf split stm time transformers + ]; + description = "Higher-order Functional Reactive Programming"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "reflex-animation" = callPackage ({ mkDerivation, base, bifunctors, containers, profunctors, reflex , reflex-transformers, semigroups, vector-space @@ -239135,8 +239754,8 @@ self: { }: mkDerivation { pname = "reflex-vty"; - version = "0.3.1.0"; - sha256 = "1dkfrz580rqwir2y54im2ymjq7lgxjy888lq240jarhnr2yc32xi"; + version = "0.3.1.1"; + sha256 = "0yzp0lvhadh6164k8lmm5464r3x72951vvg4ii4kf848bjxh7iw6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -243575,8 +244194,8 @@ self: { }: mkDerivation { pname = "rhine"; - version = "0.8.0.1"; - sha256 = "07cw0xlj0nwbx0wjb3k4hpw5y6ksp25c1fa8xrrbaqv2jspv7z75"; + version = "0.8.1"; + sha256 = "15yklhx5gv8z60ky9ck2rkc9yb9m5jbziwp49a8gk0s03ii8scrz"; libraryHaskellDepends = [ base containers deepseq dunai free MonadRandom random simple-affine-space time time-domain transformers vector-sized @@ -243592,8 +244211,8 @@ self: { ({ mkDerivation, base, dunai, gloss, rhine, transformers }: mkDerivation { pname = "rhine-gloss"; - version = "0.8.0.1"; - sha256 = "0qpza2n84illhlmqsz2xqj5k6a3jxb1kb9qhw6gz5fh4p4k8jqyl"; + version = "0.8.1"; + sha256 = "1lai9ii3q069zf49ls6cfdgjgq6njybxax45dqzqnxd59p0p9rrm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base dunai gloss rhine transformers ]; @@ -243605,6 +244224,29 @@ self: { maintainers = [ lib.maintainers.turion ]; }) {}; + "rhine-terminal" = callPackage + ({ mkDerivation, base, dunai, exceptions, hspec, rhine, stm + , terminal, text, time, transformers + }: + mkDerivation { + pname = "rhine-terminal"; + version = "0.8.1"; + sha256 = "1fmmzy8qdyk9c1vv2l2n0xs0f1fw46mcgyzmid60wrgw90h02sp7"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base dunai exceptions rhine terminal time transformers + ]; + executableHaskellDepends = [ base rhine terminal text time ]; + testHaskellDepends = [ + base exceptions hspec rhine stm terminal text time transformers + ]; + description = "Terminal backend for Rhine"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "rhine-terminal-simple"; + }) {}; + "rhythm-game-tutorial" = callPackage ({ mkDerivation, base, call, containers, lens, mtl, objective , split @@ -248168,6 +248810,21 @@ self: { broken = true; }) {}; + "sarif" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, text + , uuid-types + }: + mkDerivation { + pname = "sarif"; + version = "0.1"; + sha256 = "17i9fkh2vm5ywi8h4b2h0f7hfqr484kg1dqrhj563a5idw4jqi0v"; + libraryHaskellDepends = [ + aeson base bytestring containers text uuid-types + ]; + description = "SARIF implementation for Haskell"; + license = lib.licenses.mit; + }) {}; + "sarsi" = callPackage ({ mkDerivation, ansi-terminal, async, attoparsec, base, binary , bytestring, Cabal, containers, cryptonite, directory, filepath @@ -248464,6 +249121,20 @@ self: { license = lib.licenses.bsd3; }) {}; + "sayable" = callPackage + ({ mkDerivation, base, bytestring, exceptions, prettyprinter, text + }: + mkDerivation { + pname = "sayable"; + version = "1.0.2.0"; + sha256 = "041qjk1giqrsfis410r491c3b2s36ngsk64ihzpjb788xbr86adx"; + libraryHaskellDepends = [ + base bytestring exceptions prettyprinter text + ]; + description = "Data structures, classes and operators for constructing context-adjusted pretty output"; + license = lib.licenses.isc; + }) {}; + "sbp" = callPackage ({ mkDerivation, aeson, aeson-pretty, array, base , base64-bytestring, basic-prelude, binary, binary-conduit @@ -248491,6 +249162,34 @@ self: { license = lib.licenses.mit; }) {}; + "sbp_4_10_0" = callPackage + ({ mkDerivation, aeson, aeson-pretty, array, base + , base64-bytestring, basic-prelude, binary, binary-conduit + , bytestring, cmdargs, conduit, conduit-extra, data-binary-ieee754 + , lens, lens-aeson, monad-loops, resourcet, tasty, tasty-hunit + , template-haskell, text, time, yaml + }: + mkDerivation { + pname = "sbp"; + version = "4.10.0"; + sha256 = "1mhnqiqi6yv3mn0rcwiq5k79a2zxcpqp4284ziqrcjwnhjxd2cnf"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson array base base64-bytestring basic-prelude binary bytestring + data-binary-ieee754 lens lens-aeson monad-loops template-haskell + text + ]; + executableHaskellDepends = [ + aeson aeson-pretty base basic-prelude binary-conduit bytestring + cmdargs conduit conduit-extra lens resourcet time yaml + ]; + testHaskellDepends = [ base basic-prelude tasty tasty-hunit ]; + description = "SwiftNav's SBP Library"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "sbp2udp" = callPackage ({ mkDerivation, base, basic-prelude, binary, binary-conduit , bytestring, conduit, conduit-extra, network, optparse-generic @@ -254176,8 +254875,36 @@ self: { pname = "servant-openapi3"; version = "2.0.1.5"; sha256 = "0zcyqga4hbdyk34368108vv9vavzdhv26xphas7yppada2sshfay"; - revision = "1"; - editedCabalFile = "0bscnxbw1zd0f7ycjr54kxfdcxzndgbxpamc75r1yzly262xrc1b"; + revision = "3"; + editedCabalFile = "0xvs5a9zsg32iziznvvjhfji577xmza419xk0cy1hwamw17f43mi"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + aeson aeson-pretty base base-compat bytestring hspec http-media + insert-ordered-containers lens openapi3 QuickCheck servant + singleton-bool text unordered-containers + ]; + testHaskellDepends = [ + aeson base base-compat directory doctest filepath hspec lens + lens-aeson openapi3 QuickCheck servant template-haskell text time + utf8-string vector + ]; + testToolDepends = [ hspec-discover ]; + description = "Generate a Swagger/OpenAPI/OAS 3.0 specification for your servant API."; + license = lib.licenses.bsd3; + }) {}; + + "servant-openapi3_2_0_1_6" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, base-compat, bytestring + , Cabal, cabal-doctest, directory, doctest, filepath, hspec + , hspec-discover, http-media, insert-ordered-containers, lens + , lens-aeson, openapi3, QuickCheck, servant, singleton-bool + , template-haskell, text, time, unordered-containers, utf8-string + , vector + }: + mkDerivation { + pname = "servant-openapi3"; + version = "2.0.1.6"; + sha256 = "1hxz3n6l5l8p9s58sjilrn4lv1z17kfik0xdh05v5v1bzf0j2aij"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ aeson aeson-pretty base base-compat bytestring hspec http-media @@ -254192,6 +254919,7 @@ self: { testToolDepends = [ hspec-discover ]; description = "Generate a Swagger/OpenAPI/OAS 3.0 specification for your servant API."; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "servant-options" = callPackage @@ -260086,7 +260814,6 @@ self: { libraryHaskellDepends = [ base singletons singletons-base ]; description = "Unary natural numbers relying on the singletons infrastructure"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "singleton-typelits" = callPackage @@ -260151,8 +260878,6 @@ self: { ]; description = "A promoted and singled version of the base library"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "singletons-base_3_1_1" = callPackage @@ -260176,7 +260901,6 @@ self: { description = "A promoted and singled version of the base library"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "singletons-presburger" = callPackage @@ -260195,7 +260919,6 @@ self: { ]; description = "Presburger Arithmetic Solver for GHC Type-level natural numbers with Singletons package"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "singletons-presburger_0_7_1_0" = callPackage @@ -261091,8 +261814,8 @@ self: { ({ mkDerivation, base, containers, skylighting-core, text }: mkDerivation { pname = "skylighting-format-context"; - version = "0.1"; - sha256 = "066vnhzxknlwzm8wmrzfjfv8ikrj646j21cv9gwm898clqap4yp0"; + version = "0.1.0.1"; + sha256 = "1d4nf16wl2l4r627qnph09x21xwcq03r7bznqm08d4di1z241xv0"; libraryHaskellDepends = [ base containers skylighting-core text ]; description = "ConTeXt formatter for skylighting syntax highlighting library"; license = lib.licenses.bsd3; @@ -268744,26 +269467,26 @@ self: { , amazonka-cloudformation, amazonka-core, amazonka-ec2 , amazonka-lambda, amazonka-sts, base, Blammo, bytestring, cfn-flip , conduit, containers, errors, exceptions, extra, filepath, Glob - , hspec, lens, lens-aeson, monad-logger, optparse-applicative - , resourcet, rio, text, time, unliftio, unliftio-core + , hspec, lens, lens-aeson, monad-logger, mtl, optparse-applicative + , QuickCheck, resourcet, rio, text, time, unliftio, unliftio-core , unordered-containers, uuid, yaml }: mkDerivation { pname = "stackctl"; - version = "1.1.2.2"; - sha256 = "1rwq3brdlspzf16kc0kybx9yl15505ixxf1y7fb8cwqjwkgbqssn"; + version = "1.1.3.0"; + sha256 = "16skijv82199x4q2w563bk9xcmwd4i6mdavdr89p16cf8mwqrr7m"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson aeson-casing aeson-pretty amazonka amazonka-cloudformation amazonka-core amazonka-ec2 amazonka-lambda amazonka-sts base Blammo bytestring cfn-flip conduit containers errors exceptions extra - filepath Glob lens lens-aeson monad-logger optparse-applicative + filepath Glob lens lens-aeson monad-logger mtl optparse-applicative resourcet rio text time unliftio unliftio-core unordered-containers uuid yaml ]; executableHaskellDepends = [ base ]; - testHaskellDepends = [ base hspec yaml ]; + testHaskellDepends = [ base bytestring hspec mtl QuickCheck yaml ]; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; mainProgram = "stackctl"; @@ -278727,6 +279450,36 @@ self: { broken = true; }) {}; + "tasty-autocollect_0_4_0" = callPackage + ({ mkDerivation, base, bytestring, containers, directory + , explainable-predicates, filepath, ghc, tasty + , tasty-expected-failure, tasty-golden, tasty-hunit + , tasty-quickcheck, template-haskell, temporary, text, transformers + , typed-process + }: + mkDerivation { + pname = "tasty-autocollect"; + version = "0.4.0"; + sha256 = "1nq5zaf3ly7n4mqprdgvgw2ixdxk7qdrl108ppncid43dfj560ik"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring containers directory filepath ghc tasty + tasty-expected-failure template-haskell text transformers + ]; + executableHaskellDepends = [ base text ]; + testHaskellDepends = [ + base bytestring containers directory explainable-predicates + filepath tasty tasty-golden tasty-hunit tasty-quickcheck temporary + text typed-process + ]; + description = "Autocollection of tasty tests"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "tasty-autocollect"; + broken = true; + }) {}; + "tasty-bdd" = callPackage ({ mkDerivation, aeson, aeson-qq, base, exceptions, free, HUnit , microlens, microlens-th, mtl, pretty, pretty-show @@ -278936,8 +279689,8 @@ self: { pname = "tasty-grading-system"; version = "0.1.0.0"; sha256 = "1r72gbylmv466naxkqsf56wlkp5kzhvyq0w3k7g47hs1rlslllmp"; - revision = "2"; - editedCabalFile = "1kr1113k6a0d8yd51lvl1689wdbq2lb2fp44rl6jzdaizxvj360f"; + revision = "4"; + editedCabalFile = "1h80pf2p13f33gl803xyg6znf1ychci9jqcl13xdxai1asb331hq"; libraryHaskellDepends = [ aeson base containers directory filepath generic-deriving mtl stm tagged tasty text @@ -285186,6 +285939,29 @@ self: { license = lib.licenses.gpl3Only; }) {}; + "tidal_1_9_3" = callPackage + ({ mkDerivation, base, bytestring, clock, colour, containers + , criterion, deepseq, exceptions, hosc, microspec, mtl, network + , parsec, primitive, random, text, tidal-link, transformers, weigh + }: + mkDerivation { + pname = "tidal"; + version = "1.9.3"; + sha256 = "1p3k65rgxjv701nk30jqf614bk1zmblyq0vlishzza2cdld5rhbc"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base bytestring clock colour containers deepseq exceptions hosc mtl + network parsec primitive random text tidal-link transformers + ]; + testHaskellDepends = [ + base containers deepseq hosc microspec parsec + ]; + benchmarkHaskellDepends = [ base criterion weigh ]; + description = "Pattern language for improvised music"; + license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; + }) {}; + "tidal-link" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -292914,6 +293690,22 @@ self: { license = lib.licenses.bsd3; }) {}; + "typecheck-plugin-nat-simple_0_1_0_9" = callPackage + ({ mkDerivation, base, containers, ghc, ghc-tcplugins-extra }: + mkDerivation { + pname = "typecheck-plugin-nat-simple"; + version = "0.1.0.9"; + sha256 = "0ada389g1zmprwj2injmx49dcj8z6n1vxbbii4c6327mvw39ay0w"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base containers ghc ghc-tcplugins-extra + ]; + testHaskellDepends = [ base containers ghc ghc-tcplugins-extra ]; + description = "Simple type check plugin which calculate addition, subtraction and less-or-equal-than"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "typed-admin" = callPackage ({ mkDerivation, base, blaze-markup, bytestring, data-default-class , exceptions, generic-lens, HDBC, HDBC-postgresql, HDBC-session @@ -294402,6 +295194,7 @@ self: { description = "Thread delays and timeouts using proper time units"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "unboxed" = callPackage @@ -295685,7 +296478,6 @@ self: { ]; description = "A domain-specific type system for dimensional analysis"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "units-attoparsec" = callPackage @@ -295702,6 +296494,7 @@ self: { description = "Attoparsec parsers for the units package"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "units-defs" = callPackage @@ -295713,7 +296506,6 @@ self: { libraryHaskellDepends = [ base template-haskell units ]; description = "Definitions for use with the units package"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "units-parser" = callPackage @@ -309257,8 +310049,8 @@ self: { }: mkDerivation { pname = "xcffib"; - version = "0.12.1"; - sha256 = "0qpbm9jncpj7jy9xsbl1xy84mw2kmnfbd0m7g0qng80cifzvkqhi"; + version = "1.1.2"; + sha256 = "068g730p0rbsf1l7k9jgc9d7ng0zx3552wqk357wl3q56jac0chs"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -317041,8 +317833,8 @@ self: { pname = "zip"; version = "1.7.2"; sha256 = "1c5pr3hv11dpn4ybd4742qkpqmvb9l3l7xmzlsf65wm2p8071dvj"; - revision = "2"; - editedCabalFile = "0gacj2fp0yg45l5vxby0n03lza91zfykk74p6a2r3abrfmvw7kq8"; + revision = "3"; + editedCabalFile = "0q72y8qsz1y01rlmi3chdb0p06qng7ffzv0ylmiqqn36f9qjl405"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -317085,6 +317877,27 @@ self: { license = lib.licenses.bsd3; }) {inherit (pkgs) which;}; + "zip-cmd" = callPackage + ({ mkDerivation, base, bytestring, filepath, optparse-applicative + , shellwords, text, time, zip + }: + mkDerivation { + pname = "zip-cmd"; + version = "1.0.1"; + sha256 = "18jhhzhbr4bh14b5kw7f2bxwrcnq0590v25f81wrqkvmbb2mzwmz"; + revision = "1"; + editedCabalFile = "0f2k4xxvpzf33bn6nab3fqimkc2gaywl8hbadnhavlbyrg5fdhpn"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base bytestring filepath optparse-applicative shellwords text time + zip + ]; + description = "Simple CLI tool for the haskell zip library"; + license = lib.licenses.bsd3; + mainProgram = "zip-cmd"; + }) {}; + "zip-conduit" = callPackage ({ mkDerivation, base, bytestring, cereal, conduit, conduit-extra , digest, directory, filepath, hpc, HUnit, mtl, old-time, resourcet diff --git a/pkgs/development/libraries/folks/default.nix b/pkgs/development/libraries/folks/default.nix index 0471283ef00..a03df4e5e29 100644 --- a/pkgs/development/libraries/folks/default.nix +++ b/pkgs/development/libraries/folks/default.nix @@ -119,6 +119,6 @@ stdenv.mkDerivation rec { homepage = "https://wiki.gnome.org/Projects/Folks"; license = licenses.lgpl2Plus; maintainers = teams.gnome.members; - platforms = platforms.gnu ++ platforms.linux; # arbitrary choice + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/gnome-video-effects/default.nix b/pkgs/development/libraries/gnome-video-effects/default.nix index e8fd3ca7e2c..cc6f3b2ecde 100644 --- a/pkgs/development/libraries/gnome-video-effects/default.nix +++ b/pkgs/development/libraries/gnome-video-effects/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A collection of GStreamer effects to be used in different GNOME Modules"; homepage = "https://wiki.gnome.org/Projects/GnomeVideoEffects"; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = teams.gnome.members; license = licenses.gpl2; }; diff --git a/pkgs/development/libraries/protobufc/default.nix b/pkgs/development/libraries/protobufc/default.nix index 28c15f0ef45..f7cf765e150 100644 --- a/pkgs/development/libraries/protobufc/default.nix +++ b/pkgs/development/libraries/protobufc/default.nix @@ -1,5 +1,11 @@ -{ lib, stdenv, fetchFromGitHub -, autoreconfHook, pkg-config, protobuf, zlib +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook +, pkg-config +, protobuf +, zlib +, buildPackages }: stdenv.mkDerivation rec { @@ -17,11 +23,13 @@ stdenv.mkDerivation rec { buildInputs = [ protobuf zlib ]; + PROTOC = lib.getExe buildPackages.protobuf; + meta = with lib; { homepage = "https://github.com/protobuf-c/protobuf-c/"; description = "C bindings for Google's Protocol Buffers"; license = licenses.bsd2; platforms = platforms.all; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ nickcao ]; }; } diff --git a/pkgs/development/libraries/simdjson/default.nix b/pkgs/development/libraries/simdjson/default.nix index 215b1ebc4f0..571e4e717d8 100644 --- a/pkgs/development/libraries/simdjson/default.nix +++ b/pkgs/development/libraries/simdjson/default.nix @@ -15,7 +15,13 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DSIMDJSON_DEVELOPER_MODE=OFF" - ] ++ lib.optional stdenv.hostPlatform.isStatic "-DBUILD_SHARED_LIBS=OFF"; + ] ++ lib.optionals stdenv.hostPlatform.isStatic [ + "-DBUILD_SHARED_LIBS=OFF" + ] ++ lib.optionals (with stdenv.hostPlatform; isPower && isBigEndian) [ + # Assume required CPU features are available, since otherwise we + # just get a failed build. + "-DCMAKE_CXX_FLAGS=-mpower8-vector" + ]; meta = with lib; { homepage = "https://simdjson.org/"; diff --git a/pkgs/development/libraries/sofia-sip/default.nix b/pkgs/development/libraries/sofia-sip/default.nix index 6a54c2a8075..b3e91bd3fd1 100644 --- a/pkgs/development/libraries/sofia-sip/default.nix +++ b/pkgs/development/libraries/sofia-sip/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "sofia-sip"; - version = "1.13.9"; + version = "1.13.10"; src = fetchFromGitHub { owner = "freeswitch"; repo = pname; rev = "v${version}"; - sha256 = "sha256-xF2LFbxGhA/gF7Z2LX3WYq3nXOLi0ARGGR4Dd3PCftk="; + sha256 = "sha256-UVyjeIIS0WwnY3GoZLIYTgf7R+C8SCuykDozaxCpog0="; }; buildInputs = [ glib openssl ] ++ lib.optional stdenv.isDarwin SystemConfiguration; diff --git a/pkgs/development/ocaml-modules/class_group_vdf/default.nix b/pkgs/development/ocaml-modules/class_group_vdf/default.nix index 181228e28a0..cbfaeaf3c42 100644 --- a/pkgs/development/ocaml-modules/class_group_vdf/default.nix +++ b/pkgs/development/ocaml-modules/class_group_vdf/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitLab, buildDunePackage +{ stdenv, lib, fetchFromGitLab, buildDunePackage , gmp, pkg-config, dune-configurator , zarith, integers , alcotest, bisect_ppx }: @@ -38,6 +38,7 @@ buildDunePackage rec { meta = { description = "Verifiable Delay Functions bindings to Chia's VDF"; homepage = "https://gitlab.com/nomadic-labs/tezos"; + broken = stdenv.isDarwin && stdenv.isx86_64; license = lib.licenses.mit; maintainers = [ lib.maintainers.ulrikstrid ]; }; diff --git a/pkgs/development/php-packages/composer/default.nix b/pkgs/development/php-packages/composer/default.nix index 943cd1287ef..d7c686a7db1 100644 --- a/pkgs/development/php-packages/composer/default.nix +++ b/pkgs/development/php-packages/composer/default.nix @@ -1,14 +1,14 @@ { mkDerivation, fetchurl, makeWrapper, unzip, lib, php }: let pname = "composer"; - version = "2.5.0"; + version = "2.5.1"; in mkDerivation { inherit pname version; src = fetchurl { url = "https://getcomposer.org/download/${version}/composer.phar"; - sha256 = "tXFhDlRReF92OJoI6VddkcPW44/uHfepcI/jBwE8hCQ="; + sha256 = "sha256-8blP7hGlvWoarl13yNomnfJ8cF/MgG6/TIwub6hkXCA="; }; dontUnpack = true; diff --git a/pkgs/development/python-modules/antlr4-python3-runtime/default.nix b/pkgs/development/python-modules/antlr4-python3-runtime/default.nix index 1ab91cacbcc..4f5f25d0159 100644 --- a/pkgs/development/python-modules/antlr4-python3-runtime/default.nix +++ b/pkgs/development/python-modules/antlr4-python3-runtime/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { # in 4.9, test was renamed to tests checkPhase = '' cd test* - ${python.interpreter} ctest.py + ${python.interpreter} run.py ''; meta = with lib; { diff --git a/pkgs/development/python-modules/certbot-dns-inwx/default.nix b/pkgs/development/python-modules/certbot-dns-inwx/default.nix index 7c24a042c95..06a6b3ae3db 100644 --- a/pkgs/development/python-modules/certbot-dns-inwx/default.nix +++ b/pkgs/development/python-modules/certbot-dns-inwx/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "certbot-dns-inwx"; - version = "2.1.3"; + version = "2.2.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-yAgualY4J92pJ8PIkICg8w0eYHmT5L3qAUOCW/cAitw="; + sha256 = "sha256-v03QBHsxhl6R8YcwWIKD+pf4APy9S2vFcQe3ZEc6AjI="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/explorerscript/default.nix b/pkgs/development/python-modules/explorerscript/default.nix index a77c31e26a6..4a79dc31c19 100644 --- a/pkgs/development/python-modules/explorerscript/default.nix +++ b/pkgs/development/python-modules/explorerscript/default.nix @@ -2,9 +2,11 @@ , buildPythonPackage , fetchFromGitHub , fetchpatch +, antlr4 , antlr4-python3-runtime , igraph , pygments +, pytestCheckHook }: buildPythonPackage rec { @@ -18,6 +20,10 @@ buildPythonPackage rec { sha256 = "1vzyliiyrxx8l9sfbqcyr4xn5swd7znkxy69kn0vb5rban8hm9c1"; }; + nativeBuildInputs = [ + antlr4 + ]; + patches = [ # https://github.com/SkyTemple/ExplorerScript/pull/17 (fetchpatch { @@ -26,8 +32,27 @@ buildPythonPackage rec { }) ]; - propagatedBuildInputs = [ antlr4-python3-runtime igraph ]; - checkInputs = [ pygments ]; + postPatch = '' + sed -i "s/antlr4-python3-runtime.*/antlr4-python3-runtime',/" setup.py + antlr -Dlanguage=Python3 -visitor explorerscript/antlr/{ExplorerScript,SsbScript}.g4 + ''; + + propagatedBuildInputs = [ + antlr4-python3-runtime + igraph + ]; + + passthru.optional-dependencies.pygments = [ + pygments + ]; + + checkInputs = [ + pytestCheckHook + ] ++ passthru.optional-dependencies.pygments; + + pythonImportsCheck = [ + "explorerscript" + ]; meta = with lib; { homepage = "https://github.com/SkyTemple/explorerscript"; diff --git a/pkgs/development/python-modules/hassil/default.nix b/pkgs/development/python-modules/hassil/default.nix new file mode 100644 index 00000000000..bbbe26faccb --- /dev/null +++ b/pkgs/development/python-modules/hassil/default.nix @@ -0,0 +1,48 @@ +{ lib +, buildPythonPackage +, fetchPypi + +# propagates +, antlr4-python3-runtime +, dataclasses-json +, pyyaml + +# tests +, pytestCheckHook +}: + +let + pname = "hassil"; + version = "0.1.3"; +in +buildPythonPackage { + inherit pname version; + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-KWkzHWMo50OIrZ2kwFhhqDSleFFkAD7/JugjvSyCkww="; + }; + + postPatch = '' + sed -i 's/antlr4-python3-runtime==.*/antlr4-python3-runtime/' requirements.txt + ''; + + propagatedBuildInputs = [ + antlr4-python3-runtime + dataclasses-json + pyyaml + ]; + + checkInputs = [ + pytestCheckHook + ]; + + meta = with lib; { + changelog = "https://github.com/home-assistant/hassil/releases/tag/v${version}"; + description = "Intent parsing for Home Assistant"; + homepage = "https://github.com/home-assistant/hassil"; + license = licenses.asl20; + maintainers = teams.home-assistant.members; + }; +} diff --git a/pkgs/development/python-modules/hydra-core/antlr4.patch b/pkgs/development/python-modules/hydra-core/antlr4.patch new file mode 100644 index 00000000000..958e128998d --- /dev/null +++ b/pkgs/development/python-modules/hydra-core/antlr4.patch @@ -0,0 +1,13 @@ +diff --git a/build_helpers/build_helpers.py b/build_helpers/build_helpers.py +index 7159d22615..73db312bbe 100644 +--- a/build_helpers/build_helpers.py ++++ b/build_helpers/build_helpers.py +@@ -185,7 +185,7 @@ class ANTLRCommand(Command): # type: ignore + command = [ + "java", + "-jar", +- join(root_dir, "bin/antlr-4.9.3-complete.jar"), ++ "@antlr_jar@", + "-Dlanguage=Python3", + "-o", + join(project_root, "hydra/grammar/gen/"), diff --git a/pkgs/development/python-modules/hydra/default.nix b/pkgs/development/python-modules/hydra-core/default.nix index cbd2502305b..17dda8404b4 100644 --- a/pkgs/development/python-modules/hydra/default.nix +++ b/pkgs/development/python-modules/hydra-core/default.nix @@ -1,6 +1,7 @@ { stdenv , lib -, antlr4_9-python3-runtime +, antlr4 +, antlr4-python3-runtime , buildPythonPackage , fetchFromGitHub , importlib-resources @@ -8,10 +9,11 @@ , omegaconf , pytestCheckHook , pythonOlder +, substituteAll }: buildPythonPackage rec { - pname = "hydra"; + pname = "hydra-core"; version = "1.3.1"; format = "setuptools"; @@ -19,17 +21,32 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "facebookresearch"; - repo = pname; + repo = "hydra"; rev = "refs/tags/v${version}"; hash = "sha256-4FOh1Jr+LM8ffh/xcAqMqKudKbXb2DZdxU+czq2xwxs="; }; + patches = [ + (substituteAll { + src = ./antlr4.patch; + antlr_jar = "${antlr4.out}/share/java/antlr-${antlr4.version}-complete.jar"; + }) + ]; + + postPatch = '' + # We substitute the path to the jar with the one from our antlr4 + # package, so this file becomes unused + rm -v build_helpers/bin/antlr*-complete.jar + + sed -i 's/antlr4-python3-runtime==.*/antlr4-python3-runtime/' requirements/requirements.txt + ''; + nativeBuildInputs = [ jre_headless ]; propagatedBuildInputs = [ - antlr4_9-python3-runtime + antlr4-python3-runtime omegaconf ] ++ lib.optionals (pythonOlder "3.9") [ importlib-resources @@ -55,7 +72,7 @@ buildPythonPackage rec { ]; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin; + broken = stdenv.isDarwin; description = "A framework for configuring complex applications"; homepage = "https://hydra.cc"; license = licenses.mit; diff --git a/pkgs/development/python-modules/meshtastic/default.nix b/pkgs/development/python-modules/meshtastic/default.nix index 9c88db4f88d..50eefb81093 100644 --- a/pkgs/development/python-modules/meshtastic/default.nix +++ b/pkgs/development/python-modules/meshtastic/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "meshtastic"; - version = "2.0.6"; + version = "2.0.7"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "meshtastic"; repo = "Meshtastic-python"; rev = "refs/tags/${version}"; - hash = "sha256-PN09TaJZR/REQPIgrm9XR+mXvR1evMAWGQziAzpg+fE="; + hash = "sha256-2CzWX+hMH1gN9WytRUf9BGiJ/bfEu2e0Kzg4ScDMrBo="; }; propagatedBuildInputs = [ @@ -94,6 +94,7 @@ buildPythonPackage rec { "test_main_setPref_invalid_field" "test_main_setPref_valid_field_int_as_string" "test_readGPIOs" + "test_onGPIOreceive" "test_setURL_empty_url" "test_watchGPIOs" "test_writeConfig_with_no_radioConfig" diff --git a/pkgs/development/python-modules/omegaconf/antlr4.patch b/pkgs/development/python-modules/omegaconf/antlr4.patch new file mode 100644 index 00000000000..8b9ed34d313 --- /dev/null +++ b/pkgs/development/python-modules/omegaconf/antlr4.patch @@ -0,0 +1,13 @@ +diff --git a/build_helpers/build_helpers.py b/build_helpers/build_helpers.py +index 6419e26..9e6c21c 100644 +--- a/build_helpers/build_helpers.py ++++ b/build_helpers/build_helpers.py +@@ -30,7 +30,7 @@ class ANTLRCommand(Command): # type: ignore # pragma: no cover + command = [ + "java", + "-jar", +- str(build_dir / "bin" / "antlr-4.9.3-complete.jar"), ++ "@antlr_jar@", + "-Dlanguage=Python3", + "-o", + str(project_root / "omegaconf" / "grammar" / "gen"), diff --git a/pkgs/development/python-modules/omegaconf/default.nix b/pkgs/development/python-modules/omegaconf/default.nix index 5aa772310bd..7046e6ab174 100644 --- a/pkgs/development/python-modules/omegaconf/default.nix +++ b/pkgs/development/python-modules/omegaconf/default.nix @@ -1,5 +1,6 @@ { lib -, antlr4_9-python3-runtime +, antlr4 +, antlr4-python3-runtime , buildPythonPackage , fetchFromGitHub , jre_minimal @@ -8,6 +9,7 @@ , pytestCheckHook , pythonOlder , pyyaml +, substituteAll }: buildPythonPackage rec { @@ -24,12 +26,27 @@ buildPythonPackage rec { hash = "sha256-Qxa4uIiX5TAyQ5rFkizdev60S4iVAJ08ES6FpNqf8zI="; }; + patches = [ + (substituteAll { + src = ./antlr4.patch; + antlr_jar = "${antlr4.out}/share/java/antlr-${antlr4.version}-complete.jar"; + }) + ]; + + postPatch = '' + # We substitute the path to the jar with the one from our antlr4 + # package, so this file becomes unused + rm -v build_helpers/bin/antlr*-complete.jar + + sed -i 's/antlr4-python3-runtime==.*/antlr4-python3-runtime/' requirements/base.txt + ''; + nativeBuildInputs = [ jre_minimal ]; propagatedBuildInputs = [ - antlr4_9-python3-runtime + antlr4-python3-runtime pyyaml ]; diff --git a/pkgs/development/python-modules/wled/default.nix b/pkgs/development/python-modules/wled/default.nix index 9d42c48a606..11e5beeb60c 100644 --- a/pkgs/development/python-modules/wled/default.nix +++ b/pkgs/development/python-modules/wled/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "wled"; - version = "0.14.1"; + version = "0.15.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "frenck"; repo = "python-wled"; rev = "refs/tags/v${version}"; - sha256 = "sha256-ytjCjxnJOMmFlGS+AuEAbIZcV2yoTgaXSLdqxPg6Hew="; + sha256 = "sha256-GmentEsCJQ9N9kXfy5pbkGXi5CvZfbepdCWab+/fLJc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/luaformatter/default.nix b/pkgs/development/tools/luaformatter/default.nix index 00d96a687a6..b2d719267a6 100644 --- a/pkgs/development/tools/luaformatter/default.nix +++ b/pkgs/development/tools/luaformatter/default.nix @@ -1,4 +1,8 @@ -{ lib, stdenv, fetchFromGitHub, substituteAll, antlr4, libargs, catch2, cmake, libyamlcpp }: +{ lib, stdenv, fetchFromGitHub, substituteAll, antlr4_9, libargs, catch2, cmake, libyamlcpp }: + +let + antlr4 = antlr4_9; +in stdenv.mkDerivation rec { pname = "luaformatter"; diff --git a/pkgs/development/tools/pulumictl/default.nix b/pkgs/development/tools/pulumictl/default.nix index e62442c05f0..a42da5f105c 100644 --- a/pkgs/development/tools/pulumictl/default.nix +++ b/pkgs/development/tools/pulumictl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "pulumictl"; - version = "0.0.32"; + version = "0.0.38"; src = fetchFromGitHub { owner = "pulumi"; repo = "pulumictl"; rev = "v${version}"; - sha256 = "sha256-CZ0DnQUnyj8aoesFymc+Uhv+3vdQhdxb2YHElAyqGWE="; + sha256 = "sha256-j7wuzyGko3agDO7L8MUaAegjE4yj4KzQEcxWLY39BhQ="; }; - vendorSha256 = "sha256-xalfnLc6bPBvm2B42+FzpgrOH541HMWmNHChveI792s="; + vendorSha256 = "sha256-WzfTS68YIpoZYbm6i0USxXyEyR4px+hrNRbsCTXdJsk="; ldflags = [ "-s" "-w" "-X=github.com/pulumi/pulumictl/pkg/version.Version=${src.rev}" diff --git a/pkgs/development/tools/ruff/default.nix b/pkgs/development/tools/ruff/default.nix index 8e1dc50218d..deb97ee1ba4 100644 --- a/pkgs/development/tools/ruff/default.nix +++ b/pkgs/development/tools/ruff/default.nix @@ -7,21 +7,24 @@ rustPlatform.buildRustPackage rec { pname = "ruff"; - version = "0.0.194"; + version = "0.0.198"; src = fetchFromGitHub { owner = "charliermarsh"; repo = pname; rev = "v${version}"; - sha256 = "sha256-28ckhFvUjA/Hb7bkd/iRaSm24EP0oUAxlVymHdPIJk0="; + sha256 = "sha256-hXG3Iu9p678UYh4NrpaVoPj8CDdU7D3GB7BQHsyQHWg="; }; - cargoSha256 = "sha256-PLYU+J7xneZZOkJ+MEVTpgICIN3/Kunr7B+ryb4eZFk="; + cargoSha256 = "sha256-uWdlbVV6IODK+iugut/S8/WJwa9rSIvenvaROeyLaR0="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.CoreServices ]; + # building tests fails with `undefined symbols` + doCheck = false; + meta = with lib; { description = "An extremely fast Python linter"; homepage = "https://github.com/charliermarsh/ruff"; diff --git a/pkgs/games/vcmi/default.nix b/pkgs/games/vcmi/default.nix index d16f3870d82..f38053a65a1 100644 --- a/pkgs/games/vcmi/default.nix +++ b/pkgs/games/vcmi/default.nix @@ -24,14 +24,14 @@ stdenv.mkDerivation rec { pname = "vcmi"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "vcmi"; repo = "vcmi"; rev = version; fetchSubmodules = true; - hash = "sha256-5PuFq6wDSj5Ye2fUjqcr/VRU0ocus6h2nn+myQTOrhU="; + hash = "sha256-Ah+aAuU2ioUfvtxfcSb4GNqriqY71ee5RhW2L9UMYFY="; }; postPatch = '' diff --git a/pkgs/servers/baserow/default.nix b/pkgs/servers/baserow/default.nix index 222d24252eb..a0470f0d275 100644 --- a/pkgs/servers/baserow/default.nix +++ b/pkgs/servers/baserow/default.nix @@ -2,30 +2,38 @@ , fetchFromGitLab , makeWrapper , python3 +, antlr4_9 }: let - baserow_premium = with python3.pkgs; ( buildPythonPackage rec { - pname = "baserow_premium"; - version = "1.12.1"; - foramt = "setuptools"; + python = python3.override { + packageOverrides = self: super: { + antlr4-python3-runtime = super.antlr4-python3-runtime.override { + antlr4 = antlr4_9; + }; - src = fetchFromGitLab { - owner = "bramw"; - repo = pname; - rev = "refs/tags/${version}"; - hash = "sha256-zT2afl3QNE2dO3JXjsZXqSmm1lv3EorG3mYZLQQMQ2Q="; - }; + baserow_premium = self.buildPythonPackage rec { + pname = "baserow_premium"; + version = "1.12.1"; + foramt = "setuptools"; - sourceRoot = "source/premium/backend"; + src = fetchFromGitLab { + owner = "bramw"; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-zT2afl3QNE2dO3JXjsZXqSmm1lv3EorG3mYZLQQMQ2Q="; + }; - doCheck = false; - }); + sourceRoot = "source/premium/backend"; + doCheck = false; + }; + }; + }; in -with python3.pkgs; buildPythonPackage rec { +with python.pkgs; buildPythonApplication rec { pname = "baserow"; version = "1.12.1"; format = "setuptools"; diff --git a/pkgs/servers/http/trafficserver/default.nix b/pkgs/servers/http/trafficserver/default.nix index 6beb81b9a22..48bb698fc3f 100644 --- a/pkgs/servers/http/trafficserver/default.nix +++ b/pkgs/servers/http/trafficserver/default.nix @@ -50,11 +50,11 @@ stdenv.mkDerivation rec { pname = "trafficserver"; - version = "9.1.3"; + version = "9.1.4"; src = fetchzip { url = "mirror://apache/trafficserver/trafficserver-${version}.tar.bz2"; - sha256 = "sha256-Ihhsbn4PvIjWskmbWKajThIwtuiEyldBpmtuQ8RdyHA="; + sha256 = "sha256-+iq+z+1JE6JE6OLcUwRRAe2/EISqb6Ax6pNm8GcB7bc="; }; patches = [ @@ -107,10 +107,6 @@ stdenv.mkDerivation rec { tools/check-unused-dependencies substituteInPlace configure --replace '/usr/bin/file' '${file}/bin/file' - - # TODO: remove after the following change has been released - # https://github.com/apache/trafficserver/pull/8683 - cp ${catch2}/include/catch2/catch.hpp tests/include/catch.hpp '' + lib.optionalString stdenv.isLinux '' substituteInPlace configure \ --replace '/usr/include/linux' '${linuxHeaders}/include/linux' @@ -125,9 +121,6 @@ stdenv.mkDerivation rec { "--enable-experimental-plugins" (lib.enableFeature enableWCCP "wccp") - # the configure script can't auto-locate the following from buildInputs - "--with-lzma=${xz.dev}" - "--with-zlib=${zlib.dev}" (lib.withFeatureAs withHiredis "hiredis" hiredis) ]; diff --git a/pkgs/tools/admin/qovery-cli/default.nix b/pkgs/tools/admin/qovery-cli/default.nix index a9a13e969f1..84ca6d2d976 100644 --- a/pkgs/tools/admin/qovery-cli/default.nix +++ b/pkgs/tools/admin/qovery-cli/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "qovery-cli"; - version = "0.46.7"; + version = "0.47.2"; src = fetchFromGitHub { owner = "Qovery"; repo = pname; rev = "v${version}"; - hash = "sha256-cMoT0vbWTcuMI7MMDGQ8+G7FqTuaJl4+rp22Uy4e83g="; + hash = "sha256-leQ/wMtFt4e+NaLYPA50BICLJV7tBJ7NcaaYagbG+Ww="; }; - vendorHash = "sha256-4TY7/prMbvw5zVPJRoMLg7Omrxvh1HPGsdz1wqPn4uU="; + vendorHash = "sha256-fkVtyydWPLh0D8jJZQ02hc8Hzntfmd7UMOuTv4Rckng="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/filesystems/envfs/default.nix b/pkgs/tools/filesystems/envfs/default.nix new file mode 100644 index 00000000000..de85a4ab0ca --- /dev/null +++ b/pkgs/tools/filesystems/envfs/default.nix @@ -0,0 +1,28 @@ +{ rustPlatform, lib, fetchFromGitHub, nixosTests }: +rustPlatform.buildRustPackage rec { + pname = "envfs"; + version = "1.0.0"; + src = fetchFromGitHub { + owner = "Mic92"; + repo = "envfs"; + rev = version; + hash = "sha256-aF8V1LwPGifFWoVxM0ydOnTX1pDVJ6HXevTxADJ/rsw="; + }; + cargoHash = "sha256-kw56tbe5zvWY5bI//dUqR1Rlumz8kOG4HeXiyEyL0I0="; + + passthru.tests = { + envfs = nixosTests.envfs; + }; + + postInstall = '' + ln -s envfs $out/bin/mount.envfs + ln -s envfs $out/bin/mount.fuse.envfs + ''; + meta = with lib; { + description = "Fuse filesystem that returns symlinks to executables based on the PATH of the requesting process."; + homepage = "https://github.com/Mic92/envfs"; + license = licenses.mit; + maintainers = with maintainers; [ mic92 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/filesystems/httm/cargo-lock.patch b/pkgs/tools/filesystems/httm/cargo-lock.patch deleted file mode 100644 index ce5a691c60f..00000000000 --- a/pkgs/tools/filesystems/httm/cargo-lock.patch +++ /dev/null @@ -1,725 +0,0 @@ -diff --git i/Cargo.lock w/Cargo.lock -index d59e8af..2409033 100644 ---- i/Cargo.lock -+++ w/Cargo.lock -@@ -8,16 +8,16 @@ version = "0.8.2" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "bf6ccdb167abbf410dcb915cabd428929d7f6a04980b54a11f26a39f1c7f7107" - dependencies = [ -- "cfg-if 1.0.0", -+ "cfg-if", - "once_cell", - "version_check", - ] - - [[package]] - name = "aho-corasick" --version = "0.7.18" -+version = "0.7.20" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f" -+checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" - dependencies = [ - "memchr", - ] -@@ -77,21 +77,15 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - - [[package]] - name = "bumpalo" --version = "3.10.0" -+version = "3.11.1" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "37ccbd214614c6783386c1af30caf03192f17891059cecc394b4fb119e363de3" -+checksum = "572f695136211188308f16ad2ca5c851a712c464060ae6974944458eb83880ba" - - [[package]] - name = "cc" --version = "1.0.73" -+version = "1.0.77" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11" -- --[[package]] --name = "cfg-if" --version = "0.1.10" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" -+checksum = "e9f73505338f7d905b19d18738976aae232eb46b8efc15554ffc56deb5d9ebe4" - - [[package]] - name = "cfg-if" -@@ -101,13 +95,16 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - - [[package]] - name = "chrono" --version = "0.4.22" -+version = "0.4.23" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "bfd4d1b31faaa3a89d7934dbded3111da0d2ef28e3ebccdb4f0179f5929d1ef1" -+checksum = "16b0a3d9ed01224b22057780a37bb8c5dbfe1be8ba48678e7bf57ec4b385411f" - dependencies = [ - "iana-time-zone", -+ "js-sys", - "num-integer", - "num-traits", -+ "time 0.1.45", -+ "wasm-bindgen", - "winapi", - ] - -@@ -129,9 +126,9 @@ dependencies = [ - - [[package]] - name = "clap_lex" --version = "0.2.2" -+version = "0.2.4" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "5538cd660450ebeb4234cfecf8f2284b844ffc4c50531e66d584ad5b91293613" -+checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5" - dependencies = [ - "os_str_bytes", - ] -@@ -148,14 +145,13 @@ dependencies = [ - - [[package]] - name = "console" --version = "0.15.0" -+version = "0.15.2" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "a28b32d32ca44b70c3e4acd7db1babf555fa026e385fb95f18028f88848b3c31" -+checksum = "c050367d967ced717c04b65d8c619d863ef9292ce0c5760028655a2fb298718c" - dependencies = [ - "encode_unicode", -+ "lazy_static", - "libc", -- "once_cell", -- "regex", - "terminal_size 0.1.17", - "winapi", - ] -@@ -172,95 +168,72 @@ version = "0.8.2" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "2801af0d36612ae591caa9568261fddce32ce6e08a7275ea334a06a4ad021a2c" - dependencies = [ -- "cfg-if 1.0.0", -- "crossbeam-channel 0.5.5", -+ "cfg-if", -+ "crossbeam-channel", - "crossbeam-deque", - "crossbeam-epoch", - "crossbeam-queue", -- "crossbeam-utils 0.8.9", -+ "crossbeam-utils", - ] - - [[package]] - name = "crossbeam-channel" --version = "0.4.4" -+version = "0.5.6" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "b153fe7cbef478c567df0f972e02e6d736db11affe43dfc9c56a9374d1adfb87" -+checksum = "c2dd04ddaf88237dc3b8d8f9a3c1004b506b54b3313403944054d23c0870c521" - dependencies = [ -- "crossbeam-utils 0.7.2", -- "maybe-uninit", --] -- --[[package]] --name = "crossbeam-channel" --version = "0.5.5" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "4c02a4d71819009c192cf4872265391563fd6a84c81ff2c0f2a7026ca4c1d85c" --dependencies = [ -- "cfg-if 1.0.0", -- "crossbeam-utils 0.8.9", -+ "cfg-if", -+ "crossbeam-utils", - ] - - [[package]] - name = "crossbeam-deque" --version = "0.8.1" -+version = "0.8.2" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "6455c0ca19f0d2fbf751b908d5c55c1f5cbc65e03c4225427254b46890bdde1e" -+checksum = "715e8152b692bba2d374b53d4875445368fdf21a94751410af607a5ac677d1fc" - dependencies = [ -- "cfg-if 1.0.0", -+ "cfg-if", - "crossbeam-epoch", -- "crossbeam-utils 0.8.9", -+ "crossbeam-utils", - ] - - [[package]] - name = "crossbeam-epoch" --version = "0.9.9" -+version = "0.9.13" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "07db9d94cbd326813772c968ccd25999e5f8ae22f4f8d1b11effa37ef6ce281d" -+checksum = "01a9af1f4c2ef74bb8aa1f7e19706bc72d03598c8a570bb5de72243c7a9d9d5a" - dependencies = [ - "autocfg", -- "cfg-if 1.0.0", -- "crossbeam-utils 0.8.9", -- "memoffset", -- "once_cell", -+ "cfg-if", -+ "crossbeam-utils", -+ "memoffset 0.7.1", - "scopeguard", - ] - - [[package]] - name = "crossbeam-queue" --version = "0.3.5" -+version = "0.3.8" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "1f25d8400f4a7a5778f0e4e52384a48cbd9b5c495d110786187fc750075277a2" -+checksum = "d1cfb3ea8a53f37c40dea2c7bedcbd88bdfae54f5e2175d6ecaff1c988353add" - dependencies = [ -- "cfg-if 1.0.0", -- "crossbeam-utils 0.8.9", -+ "cfg-if", -+ "crossbeam-utils", - ] - - [[package]] - name = "crossbeam-utils" --version = "0.7.2" -+version = "0.8.14" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8" -+checksum = "4fb766fa798726286dbbb842f174001dab8abc7b627a1dd86e0b7222a95d929f" - dependencies = [ -- "autocfg", -- "cfg-if 0.1.10", -- "lazy_static", --] -- --[[package]] --name = "crossbeam-utils" --version = "0.8.9" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "8ff1f980957787286a554052d03c7aee98d99cc32e09f6d45f0a814133c87978" --dependencies = [ -- "cfg-if 1.0.0", -- "once_cell", -+ "cfg-if", - ] - - [[package]] - name = "cxx" --version = "1.0.80" -+version = "1.0.83" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "6b7d4e43b25d3c994662706a1d4fcfc32aaa6afd287502c111b237093bb23f3a" -+checksum = "bdf07d07d6531bfcdbe9b8b739b104610c6508dcc4d63b410585faf338241daf" - dependencies = [ - "cc", - "cxxbridge-flags", -@@ -270,9 +243,9 @@ dependencies = [ - - [[package]] - name = "cxx-build" --version = "1.0.80" -+version = "1.0.83" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "84f8829ddc213e2c1368e51a2564c552b65a8cb6a28f31e576270ac81d5e5827" -+checksum = "d2eb5b96ecdc99f72657332953d4d9c50135af1bac34277801cc3937906ebd39" - dependencies = [ - "cc", - "codespan-reporting", -@@ -285,15 +258,15 @@ dependencies = [ - - [[package]] - name = "cxxbridge-flags" --version = "1.0.80" -+version = "1.0.83" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "e72537424b474af1460806647c41d4b6d35d09ef7fe031c5c2fa5766047cc56a" -+checksum = "ac040a39517fd1674e0f32177648334b0f4074625b5588a64519804ba0553b12" - - [[package]] - name = "cxxbridge-macro" --version = "1.0.80" -+version = "1.0.83" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "309e4fb93eed90e1e14bea0da16b209f81813ba9fc7830c20ed151dd7bc0a4d7" -+checksum = "1362b0ddcfc4eb0a1f57b68bd77dd99f0e826958a96abd0ae9bd092e114ffed6" - dependencies = [ - "proc-macro2", - "quote", -@@ -337,11 +310,11 @@ dependencies = [ - - [[package]] - name = "defer-drop" --version = "1.2.0" -+version = "1.3.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "828aca0e5e4341b0320a319209cbc6255b8b06254849ce8a5f33d33f7f2fa0f0" -+checksum = "f613ec9fa66a6b28cdb1842b27f9adf24f39f9afc4dcdd9fdecee4aca7945c57" - dependencies = [ -- "crossbeam-channel 0.4.4", -+ "crossbeam-channel", - "once_cell", - ] - -@@ -382,7 +355,7 @@ version = "2.0.0" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1" - dependencies = [ -- "cfg-if 1.0.0", -+ "cfg-if", - "dirs-sys-next", - ] - -@@ -399,9 +372,9 @@ dependencies = [ - - [[package]] - name = "either" --version = "1.6.1" -+version = "1.8.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" -+checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797" - - [[package]] - name = "encode_unicode" -@@ -447,20 +420,20 @@ dependencies = [ - - [[package]] - name = "getrandom" --version = "0.2.7" -+version = "0.2.8" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "4eb1a864a501629691edf6c15a593b7a51eebaa1e8468e9ddc623de7c9b58ec6" -+checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" - dependencies = [ -- "cfg-if 1.0.0", -+ "cfg-if", - "libc", -- "wasi", -+ "wasi 0.11.0+wasi-snapshot-preview1", - ] - - [[package]] - name = "hashbrown" --version = "0.11.2" -+version = "0.12.3" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e" -+checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" - - [[package]] - name = "hashbrown" -@@ -482,7 +455,7 @@ dependencies = [ - - [[package]] - name = "httm" --version = "0.17.9" -+version = "0.17.10" - dependencies = [ - "clap", - "crossbeam", -@@ -495,8 +468,8 @@ dependencies = [ - "proc-mounts", - "rayon", - "skim", -- "terminal_size 0.2.2", -- "time", -+ "terminal_size 0.2.3", -+ "time 0.3.17", - "which", - ] - -@@ -532,12 +505,12 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" - - [[package]] - name = "indexmap" --version = "1.8.2" -+version = "1.9.2" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "e6012d540c5baa3589337a98ce73408de9b5a25ec9fc2c6fd6be8f0d39e0ca5a" -+checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399" - dependencies = [ - "autocfg", -- "hashbrown 0.11.2", -+ "hashbrown 0.12.3", - ] - - [[package]] -@@ -553,15 +526,19 @@ dependencies = [ - - [[package]] - name = "io-lifetimes" --version = "0.7.5" -+version = "1.0.3" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "59ce5ef949d49ee85593fc4d3f3f95ad61657076395cbbce23e2121fc5542074" -+checksum = "46112a93252b123d31a119a8d1a1ac19deac4fac6e0e8b0df58f0d4e5870e63c" -+dependencies = [ -+ "libc", -+ "windows-sys", -+] - - [[package]] - name = "itoa" --version = "1.0.2" -+version = "1.0.4" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "112c678d4050afce233f4f2852bb2eb519230b3cf12f33585275537d7e41578d" -+checksum = "4217ad341ebadf8d8e724e264f13e593e0648f5b3e94b3896a5df283be015ecc" - - [[package]] - name = "js-sys" -@@ -580,9 +557,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" - - [[package]] - name = "libc" --version = "0.2.137" -+version = "0.2.138" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "fc7fcc620a3bff7cdd7a365be3376c97191aeaccc2a603e600951e452615bf89" -+checksum = "db6d7e329c562c5dfab7a46a2afabc8b987ab9a4834c9d1ca04dc54c1546cef8" - - [[package]] - name = "link-cplusplus" -@@ -595,9 +572,9 @@ dependencies = [ - - [[package]] - name = "linux-raw-sys" --version = "0.0.46" -+version = "0.1.3" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "d4d2456c373231a208ad294c33dc5bff30051eafd954cd4caae83a712b12854d" -+checksum = "8f9f08d8963a6c613f4b1a78f4f4a4dbfadf8e6545b2d72861731e4858b8b47f" - - [[package]] - name = "log" -@@ -605,7 +582,7 @@ version = "0.4.17" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" - dependencies = [ -- "cfg-if 1.0.0", -+ "cfg-if", - ] - - [[package]] -@@ -618,12 +595,6 @@ dependencies = [ - "nu-ansi-term", - ] - --[[package]] --name = "maybe-uninit" --version = "2.0.0" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00" -- - [[package]] - name = "memchr" - version = "2.5.0" -@@ -639,28 +610,37 @@ dependencies = [ - "autocfg", - ] - -+[[package]] -+name = "memoffset" -+version = "0.7.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" -+dependencies = [ -+ "autocfg", -+] -+ - [[package]] - name = "nix" --version = "0.24.1" -+version = "0.24.3" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "8f17df307904acd05aa8e32e97bb20f2a0df1728bbc2d771ae8f9a90463441e9" -+checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069" - dependencies = [ - "bitflags", -- "cfg-if 1.0.0", -+ "cfg-if", - "libc", - ] - - [[package]] - name = "nix" --version = "0.25.0" -+version = "0.25.1" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "e322c04a9e3440c327fca7b6c8a63e6890a32fa2ad689db972425f07e0d22abb" -+checksum = "f346ff70e7dbfd675fe90590b92d59ef2de15a8779ae305ebcbfd3f0caf59be4" - dependencies = [ - "autocfg", - "bitflags", -- "cfg-if 1.0.0", -+ "cfg-if", - "libc", -- "memoffset", -+ "memoffset 0.6.5", - "pin-utils", - ] - -@@ -726,9 +706,9 @@ checksum = "86f0b0d4bf799edbc74508c1e8bf170ff5f41238e5f8225603ca7caaae2b7860" - - [[package]] - name = "os_str_bytes" --version = "6.1.0" -+version = "6.4.1" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "21326818e99cfe6ce1e524c2a805c189a99b5ae555a35d19f9a284b427d86afa" -+checksum = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee" - - [[package]] - name = "overload" -@@ -759,9 +739,9 @@ checksum = "15eb2c6e362923af47e13c23ca5afb859e83d54452c55b0b9ac763b8f7c1ac16" - - [[package]] - name = "proc-macro2" --version = "1.0.39" -+version = "1.0.47" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "c54b25569025b7fc9651de43004ae593a75ad88543b17178aa5e1b9c4f15f56f" -+checksum = "5ea3d908b0e36316caf9e9e2c4625cdde190a7e6f440d794667ed17a1855e725" - dependencies = [ - "unicode-ident", - ] -@@ -777,9 +757,9 @@ dependencies = [ - - [[package]] - name = "quote" --version = "1.0.18" -+version = "1.0.21" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "a1feb54ed693b93a84e14094943b84b7c4eae204c512b7ccb95ab0c66d278ad1" -+checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179" - dependencies = [ - "proc-macro2", - ] -@@ -801,17 +781,17 @@ version = "1.10.1" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "cac410af5d00ab6884528b4ab69d1e8e146e8d471201800fa1b4524126de6ad3" - dependencies = [ -- "crossbeam-channel 0.5.5", -+ "crossbeam-channel", - "crossbeam-deque", -- "crossbeam-utils 0.8.9", -+ "crossbeam-utils", - "num_cpus", - ] - - [[package]] - name = "redox_syscall" --version = "0.2.13" -+version = "0.2.16" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "62f25bc4c7e55e0b0b7a1d43fb893f4fa1361d0abe38b9ce4f323c2adfe6ef42" -+checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" - dependencies = [ - "bitflags", - ] -@@ -829,9 +809,9 @@ dependencies = [ - - [[package]] - name = "regex" --version = "1.6.0" -+version = "1.7.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "4c4eb3267174b8c6c2f654116623910a0fef09c4753f8dd83db29c48a0df988b" -+checksum = "e076559ef8e241f2ae3479e36f97bd5741c0330689e217ad51ce2c76808b868a" - dependencies = [ - "aho-corasick", - "memchr", -@@ -840,15 +820,15 @@ dependencies = [ - - [[package]] - name = "regex-syntax" --version = "0.6.27" -+version = "0.6.28" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244" -+checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" - - [[package]] - name = "rustix" --version = "0.35.13" -+version = "0.36.4" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "727a1a6d65f786ec22df8a81ca3121107f235970dc1705ed681d3e6e8b9cd5f9" -+checksum = "cb93e85278e08bb5788653183213d3a60fc242b10cb9be96586f5a73dcb67c23" - dependencies = [ - "bitflags", - "errno", -@@ -860,9 +840,9 @@ dependencies = [ - - [[package]] - name = "rustversion" --version = "1.0.6" -+version = "1.0.9" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "f2cc38e8fa666e2de3c4aba7edeb5ffc5246c1c2ed0e3d17e560aeeba736b23f" -+checksum = "97477e48b4cf8603ad5f7aaf897467cf42ab4218a38ef76fb14c2d6773a6d6a8" - - [[package]] - name = "scopeguard" -@@ -878,14 +858,14 @@ checksum = "9c8132065adcfd6e02db789d9285a0deb2f3fcb04002865ab67d5fb103533898" - - [[package]] - name = "serde" --version = "1.0.137" -+version = "1.0.148" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "61ea8d54c77f8315140a05f4c7237403bf38b72704d031543aa1d16abbf517d1" -+checksum = "e53f64bb4ba0191d6d0676e1b141ca55047d83b74f5607e6d8eb88126c52c2dc" - - [[package]] - name = "skim" - version = "0.10.2" --source = "git+https://github.com/kimono-koans/skim?branch=httm-vendored#bf2b007ae7371a7cff4d93194033bd6c90cbf96c" -+source = "git+https://github.com/kimono-koans/skim?branch=httm-vendored#bca6554ebf09803fc429a59c89eb96428e920cc5" - dependencies = [ - "beef", - "bitflags", -@@ -896,10 +876,11 @@ dependencies = [ - "fuzzy-matcher", - "lazy_static", - "log", -- "nix 0.25.0", -+ "nix 0.25.1", -+ "once_cell", - "rayon", - "regex", -- "time", -+ "time 0.3.17", - "timer", - "tuikit", - "unicode-width", -@@ -914,9 +895,9 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" - - [[package]] - name = "syn" --version = "1.0.96" -+version = "1.0.105" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "0748dd251e24453cb8717f0354206b91557e4ec8703673a4b30208f2abaf1ebf" -+checksum = "60b9b43d45702de4c839cb9b51d9f529c5dd26a4aff255b42b1ebc03e88ee908" - dependencies = [ - "proc-macro2", - "quote", -@@ -955,9 +936,9 @@ dependencies = [ - - [[package]] - name = "terminal_size" --version = "0.2.2" -+version = "0.2.3" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "40ca90c434fd12083d1a6bdcbe9f92a14f96c8a1ba600ba451734ac334521f7a" -+checksum = "cb20089a8ba2b69debd491f8d2d023761cbf196e999218c591fa1e7e15a21907" - dependencies = [ - "rustix", - "windows-sys", -@@ -971,18 +952,18 @@ checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" - - [[package]] - name = "thiserror" --version = "1.0.31" -+version = "1.0.37" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "bd829fe32373d27f76265620b5309d0340cb8550f523c1dda251d6298069069a" -+checksum = "10deb33631e3c9018b9baf9dcbbc4f737320d2b576bac10f6aefa048fa407e3e" - dependencies = [ - "thiserror-impl", - ] - - [[package]] - name = "thiserror-impl" --version = "1.0.31" -+version = "1.0.37" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "0396bc89e626244658bef819e22d0cc459e795a5ebe878e6ec336d1674a8d79a" -+checksum = "982d17546b47146b28f7c22e3d08465f6b8903d0ea13c1660d9d84a6e7adcdbb" - dependencies = [ - "proc-macro2", - "quote", -@@ -998,6 +979,17 @@ dependencies = [ - "once_cell", - ] - -+[[package]] -+name = "time" -+version = "0.1.45" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a" -+dependencies = [ -+ "libc", -+ "wasi 0.10.0+wasi-snapshot-preview1", -+ "winapi", -+] -+ - [[package]] - name = "time" - version = "0.3.17" -@@ -1030,7 +1022,8 @@ dependencies = [ - [[package]] - name = "timer" - version = "0.2.0" --source = "git+https://github.com/kimono-koans/timer.rs#85c9e56ab20ea530c934433636406f8b585bef59" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "31d42176308937165701f50638db1c31586f183f1aab416268216577aec7306b" - dependencies = [ - "chrono", - ] -@@ -1044,22 +1037,22 @@ dependencies = [ - "bitflags", - "lazy_static", - "log", -- "nix 0.24.1", -+ "nix 0.24.3", - "term", - "unicode-width", - ] - - [[package]] - name = "unicode-ident" --version = "1.0.1" -+version = "1.0.5" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "5bd2fe26506023ed7b5e1e315add59d6f584c621d037f9368fea9cfb988f368c" -+checksum = "6ceab39d59e4c9499d4e5a8ee0e2735b891bb7308ac83dfb4e80cad195c9f6f3" - - [[package]] - name = "unicode-width" --version = "0.1.9" -+version = "0.1.10" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973" -+checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" - - [[package]] - name = "utf8parse" -@@ -1094,6 +1087,12 @@ dependencies = [ - "quote", - ] - -+[[package]] -+name = "wasi" -+version = "0.10.0+wasi-snapshot-preview1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" -+ - [[package]] - name = "wasi" - version = "0.11.0+wasi-snapshot-preview1" -@@ -1106,7 +1105,7 @@ version = "0.2.83" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "eaf9f5aceeec8be17c128b2e93e031fb8a4d469bb9c4ae2d7dc1888b26887268" - dependencies = [ -- "cfg-if 1.0.0", -+ "cfg-if", - "wasm-bindgen-macro", - ] - diff --git a/pkgs/tools/filesystems/httm/default.nix b/pkgs/tools/filesystems/httm/default.nix index 66418201a0b..1138ecb7f99 100644 --- a/pkgs/tools/filesystems/httm/default.nix +++ b/pkgs/tools/filesystems/httm/default.nix @@ -1,23 +1,21 @@ { lib -, fetchFromGitHub , rustPlatform +, fetchFromGitHub , installShellFiles }: rustPlatform.buildRustPackage rec { pname = "httm"; - version = "0.17.10"; + version = "0.18.3"; src = fetchFromGitHub { owner = "kimono-koans"; repo = pname; rev = version; - sha256 = "sha256-xhsZaOsEYmtx3EcKbc7cIPvrUdXl3gyl5InZ1Va0U6E="; + sha256 = "sha256-LJFBridWS7YYO9Bw3mzRdRnh2gGUxAtuoNq2T1wuAcY="; }; - cargoPatches = [ ./cargo-lock.patch ]; - - cargoSha256 = "sha256-H8LOpNKsc9CxURB+ZcQT6Uhv4aw2sx8sNdDGDCkz2SU="; + cargoSha256 = "sha256-/v0QQ3EnmL1EKEjJ4O0t52SOrCz+CVBpunogEfVMpBw="; nativeBuildInputs = [ installShellFiles ]; @@ -31,8 +29,8 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Interactive, file-level Time Machine-like tool for ZFS/btrfs"; homepage = "https://github.com/kimono-koans/httm"; + changelog = "https://github.com/kimono-koans/httm/releases/tag/${version}"; license = licenses.mpl20; - platforms = platforms.unix; maintainers = with maintainers; [ wyndon ]; }; } diff --git a/pkgs/tools/misc/didyoumean/default.nix b/pkgs/tools/misc/didyoumean/default.nix index ecc9404d71c..d7671cf08bb 100644 --- a/pkgs/tools/misc/didyoumean/default.nix +++ b/pkgs/tools/misc/didyoumean/default.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "didyoumean"; - version = "1.1.3"; + version = "1.1.4"; src = fetchFromGitHub { owner = "hisbaan"; repo = "didyoumean"; rev = "v${version}"; - sha256 = "sha256-hHl9PGNDFN7Dad2JOlAy99dz0pC9OmphwYMJHBBwx7Y="; + sha256 = "sha256-PSEoh1OMElFJ8m4er1vBMkQak3JvLjd+oWNWA46cows="; }; - cargoSha256 = "sha256-rjkj9MO6fXVOk3fA87olGt/iIaJ8Zv/cy/Cqy/pg6yI="; + cargoSha256 = "sha256-QERnohWpkJ0LWkdxHrY6gKxdGqxDkLla7jlG44laojk="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/tools/networking/q/default.nix b/pkgs/tools/networking/q/default.nix index e7f931d5924..9ad1d2bd77b 100644 --- a/pkgs/tools/networking/q/default.nix +++ b/pkgs/tools/networking/q/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "q"; - version = "0.8.2"; + version = "0.8.4"; src = fetchFromGitHub { owner = "natesales"; repo = "q"; rev = "v${version}"; - sha256 = "sha256-Esg2i8UNT+SuW9+jsnVEOt1ot822CamZ3JoR8ReY0+4="; + sha256 = "sha256-M2TgDha+F4hY7f9sabzZEdsxdp8rdXDZB4ktmpDF5D8="; }; - vendorHash = "sha256-oarXbxROTd7knHr9GKlrPnnS6ehkps2ZYYsUS9cn6ek="; + vendorHash = "sha256-216NwRlU7mmr+ebiBwq9DVtFb2SpPgkGUrVZMUAY9rI="; doCheck = false; # tries to resolve DNS diff --git a/pkgs/tools/text/diffsitter/default.nix b/pkgs/tools/text/diffsitter/default.nix index 5ed1d84daff..199d0664a70 100644 --- a/pkgs/tools/text/diffsitter/default.nix +++ b/pkgs/tools/text/diffsitter/default.nix @@ -32,17 +32,17 @@ let in rustPlatform.buildRustPackage rec { pname = "diffsitter"; - version = "0.7.2"; + version = "0.7.3"; src = fetchFromGitHub { owner = "afnanenayet"; repo = pname; rev = "v${version}"; - sha256 = "sha256-oHG2vw981r9FZSwbJ+xcLemfQSMDrk6PAr/qtyImM04="; + sha256 = "sha256-AJjgn+qFfy6/gjb8tQOJDmevZy1ZfpF0nTxAgunSabE="; fetchSubmodules = false; }; - cargoSha256 = "sha256-Cj9jdeeJNR/7mquEfaQCsFgiCjyJbZaaSkOzbU64T3U="; + cargoSha256 = "sha256-U/XvllkzEVt4TpDPA5gSRKpIIQagATGdHh7YPFOo4CY="; buildNoDefaultFeatures = true; buildFeatures = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1b2e4a5a245..e54165e6954 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2173,7 +2173,7 @@ with pkgs; ### APPLICATIONS/EMULATORS/BSNES - ares = callPackage ../applications/emulators/bsnes/ares { }; + ares = darwin.apple_sdk_11_0.callPackage ../applications/emulators/bsnes/ares { }; bsnes-hd = callPackage ../applications/emulators/bsnes/bsnes-hd { inherit (darwin.apple_sdk.frameworks) Cocoa OpenAL; @@ -4405,6 +4405,8 @@ with pkgs; envsubst = callPackage ../tools/misc/envsubst { }; + envfs = callPackage ../tools/filesystems/envfs { }; + er-patcher = callPackage ../tools/games/er-patcher { }; errcheck = callPackage ../development/tools/errcheck { }; @@ -16735,7 +16737,7 @@ with pkgs; antlr4_10 antlr4_11; - antlr4 = antlr4_8; + antlr4 = antlr4_11; antlr = antlr4; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d953119cee9..767b79df992 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -488,13 +488,9 @@ self: super: with self; { ansiwrap = callPackage ../development/python-modules/ansiwrap { }; - antlr4_8-python3-runtime = callPackage ../development/python-modules/antlr4-python3-runtime { - antlr4 = pkgs.antlr4_8; + antlr4-python3-runtime = callPackage ../development/python-modules/antlr4-python3-runtime { + inherit (pkgs) antlr4; }; - antlr4_9-python3-runtime = callPackage ../development/python-modules/antlr4-python3-runtime { - antlr4 = pkgs.antlr4_9; - }; - antlr4-python3-runtime = self.antlr4_8-python3-runtime; anyascii = callPackage ../development/python-modules/anyascii { }; @@ -4173,6 +4169,8 @@ self: super: with self; { hass-nabucasa = callPackage ../development/python-modules/hass-nabucasa { }; + hassil = callPackage ../development/python-modules/hassil { }; + hatasmota = callPackage ../development/python-modules/hatasmota { }; hatchling = callPackage ../development/python-modules/hatchling { }; @@ -4389,7 +4387,7 @@ self: super: with self; { hy = callPackage ../development/python-modules/hy { }; - hydra = callPackage ../development/python-modules/hydra { }; + hydra-core = callPackage ../development/python-modules/hydra-core { }; hydra-check = callPackage ../development/python-modules/hydra-check { }; |