diff --git a/lib/options.nix b/lib/options.nix index b069cfc7d4f0..c80256c0e653 100644 --- a/lib/options.nix +++ b/lib/options.nix @@ -123,7 +123,7 @@ rec { Example: mkPackageOption pkgs "GHC" { default = [ "ghc" ]; - example = "pkgs.haskell.packages.ghc924.ghc.withPackages (hkgs: [ hkgs.primes ])"; + example = "pkgs.haskell.packages.ghc92.ghc.withPackages (hkgs: [ hkgs.primes ])"; } => { _type = "option"; default = «derivation /nix/store/jxx55cxsjrf8kyh3fp2ya17q99w7541r-ghc-8.10.7.drv»; defaultText = { ... }; description = "The GHC package to use."; example = { ... }; type = { ... }; } */ diff --git a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml index 484311980566..b7790c99a91e 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml @@ -2106,7 +2106,7 @@ Superuser created successfully. ghc810. Those attributes point to the same compilers and packagesets but have the advantage that e.g. ghc92 stays stable when we update from - ghc924 to ghc925. + ghc925 to ghc926. diff --git a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml index a7df864992f0..1efce2db6704 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml @@ -950,6 +950,14 @@ mariadb if possible. + + + obs-studio hase been updated to version 28. + If you have packaged custom plugins, check if they are + compatible. obs-websocket has been + integrated into obs-studio. + + signald has been bumped to diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md index bc3bd639b1ba..5cb3731071f3 100644 --- a/nixos/doc/manual/release-notes/rl-2111.section.md +++ b/nixos/doc/manual/release-notes/rl-2111.section.md @@ -576,4 +576,4 @@ In addition to numerous new and upgraded packages, this release has the followin - More jdk and jre versions are now exposed via `java-packages.compiler`. -- The sets `haskell.packages` and `haskell.compiler` now contain for every ghc version an attribute with the minor version dropped. E.g. for `ghc8107` there also now exists `ghc810`. Those attributes point to the same compilers and packagesets but have the advantage that e.g. `ghc92` stays stable when we update from `ghc924` to `ghc925`. +- The sets `haskell.packages` and `haskell.compiler` now contain for every ghc version an attribute with the minor version dropped. E.g. for `ghc8107` there also now exists `ghc810`. Those attributes point to the same compilers and packagesets but have the advantage that e.g. `ghc92` stays stable when we update from `ghc925` to `ghc926`. diff --git a/nixos/doc/manual/release-notes/rl-2211.section.md b/nixos/doc/manual/release-notes/rl-2211.section.md index 7491e0d10185..10a1240ede03 100644 --- a/nixos/doc/manual/release-notes/rl-2211.section.md +++ b/nixos/doc/manual/release-notes/rl-2211.section.md @@ -288,6 +288,8 @@ Available as [services.patroni](options.html#opt-services.patroni.enable). - `percona-server56` has been removed. Please migrate to `mysql` or `mariadb` if possible. +- `obs-studio` hase been updated to version 28. If you have packaged custom plugins, check if they are compatible. `obs-websocket` has been integrated into `obs-studio`. + - `signald` has been bumped to `0.23.0`. For the upgrade, a migration process is necessary. It can be done by running a command like this before starting `signald.service`: diff --git a/nixos/lib/testing-python.nix b/nixos/lib/testing-python.nix index d7204a2bc143..134d38f1b676 100644 --- a/nixos/lib/testing-python.nix +++ b/nixos/lib/testing-python.nix @@ -9,9 +9,6 @@ # Modules to add to each VM , extraConfigurations ? [ ] }: - -with pkgs; - let nixos-lib = import ./default.nix { inherit (pkgs) lib; }; in diff --git a/pkgs/applications/blockchains/trezor-suite/default.nix b/pkgs/applications/blockchains/trezor-suite/default.nix index 941b1e1f6d0f..311f14bb1fa2 100644 --- a/pkgs/applications/blockchains/trezor-suite/default.nix +++ b/pkgs/applications/blockchains/trezor-suite/default.nix @@ -42,8 +42,7 @@ appimageTools.wrapType2 rec { cp -a ${appimageContents}/resources/images/ $out/share/${pname}/resources install -m 444 -D ${appimageContents}/${pname}.desktop $out/share/applications/${pname}.desktop - install -m 444 -D ${appimageContents}/${pname}.png $out/share/icons/hicolor/512x512/apps/${pname}.png - install -m 444 -D ${appimageContents}/resources/images/icons/512x512.png $out/share/icons/hicolor/512x512/apps/${pname}.png + install -m 444 -D ${appimageContents}/resources/images/desktop/512x512.png $out/share/icons/hicolor/512x512/apps/${pname}.png substituteInPlace $out/share/applications/${pname}.desktop \ --replace 'Exec=AppRun --no-sandbox %U' 'Exec=${pname}' diff --git a/pkgs/applications/file-managers/felix-fm/default.nix b/pkgs/applications/file-managers/felix-fm/default.nix index 7fbf4fc6b63e..4b45997c6914 100644 --- a/pkgs/applications/file-managers/felix-fm/default.nix +++ b/pkgs/applications/file-managers/felix-fm/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "felix"; - version = "1.3.2"; + version = "2.0.0"; src = fetchFromGitHub { owner = "kyoheiu"; repo = pname; rev = "v${version}"; - sha256 = "sha256-DXsuTmkfzWbjpTb3ZJRVSDGgivDlEQraqAeyRzAB4UU="; + sha256 = "sha256-ennEFhnAxsEtZ1LEyr9xeeR4v5IG1Vm2gs4A09IyciE="; }; - cargoSha256 = "sha256-gv7ujyAbFEpz95cHRDKPxUW2TiYiJz35jfiKlzi6gJY="; + cargoSha256 = "sha256-unSeb8LHgJ0TspbBLhGGU6Pqy1kLMEzgIIblLUyRQWw="; checkInputs = [ zoxide ]; diff --git a/pkgs/applications/networking/cluster/kompose/default.nix b/pkgs/applications/networking/cluster/kompose/default.nix index a4081408871a..13684d441492 100644 --- a/pkgs/applications/networking/cluster/kompose/default.nix +++ b/pkgs/applications/networking/cluster/kompose/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub, installShellFiles, testers, kompose, git }: +{ lib, buildGoModule, fetchFromGitHub, fetchpatch, installShellFiles, testers, kompose, git }: buildGoModule rec { pname = "kompose"; @@ -11,7 +11,14 @@ buildGoModule rec { sha256 = "sha256-NfzqGG5ZwPpmjhvcvXN1AA+kfZG/oujbAEtXkm1mzeU="; }; - vendorSha256 = "sha256-OR5U2PnebO0a+lwU09Dveh0Yxk91cmSRorTxQIO5lHc="; + vendorHash = "sha256-/i4R50heqf0v2F2GTZCKGq10+xKKr+zPkqWKa+afue8="; + + patches = [ + (fetchpatch { + url = "https://github.com/kubernetes/kompose/commit/0964a7ccd16504b6e5ef49a07978c87cca803d46.patch"; + hash = "sha256-NMHLxx7Ae6Z+pacj538ivxIby7rNz3IbfDPbeLA0sMc="; + }) + ]; nativeBuildInputs = [ installShellFiles git ]; diff --git a/pkgs/applications/networking/cluster/kpt/default.nix b/pkgs/applications/networking/cluster/kpt/default.nix index 31d869524dac..ff5c8588ccee 100644 --- a/pkgs/applications/networking/cluster/kpt/default.nix +++ b/pkgs/applications/networking/cluster/kpt/default.nix @@ -1,17 +1,17 @@ -{ buildGoModule, fetchFromGitHub, lib }: +{ buildGoModule, fetchFromGitHub, lib, stdenv }: buildGoModule rec { pname = "kpt"; - version = "0.39.2"; + version = "0.39.3"; src = fetchFromGitHub { owner = "GoogleContainerTools"; repo = pname; rev = "v${version}"; - sha256 = "sha256-PG4SzycXRguKyaQ7LDnTtxF3EgqcjfjeEWD5rROXBPI="; + hash = "sha256-vidrKfmP0Lw6EYYufLDxh3ROOJ3hPIusDTI/Hr73NYM="; }; - vendorSha256 = "sha256-CoXlUX9hkP8gijA/vg19AS9030w95A2oKGD1wjzO8ak="; + vendorHash = "sha256-CoXlUX9hkP8gijA/vg19AS9030w95A2oKGD1wjzO8ak="; subPackages = [ "." ]; @@ -22,6 +22,6 @@ buildGoModule rec { homepage = "https://googlecontainertools.github.io/kpt/"; license = licenses.asl20; maintainers = with maintainers; [ mikefaille ]; - platforms = platforms.linux ++ platforms.darwin; + broken = stdenv.isDarwin; }; } diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix b/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix index af1781f3af74..51e1c2e52c87 100644 --- a/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix +++ b/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix @@ -14,6 +14,9 @@ , json-glib , libmspack , webkitgtk_4_1 +, substituteAll +, _experimental-update-script-combinators +, glib }: stdenv.mkDerivation rec { @@ -25,6 +28,17 @@ stdenv.mkDerivation rec { sha256 = "p5Jp7wnoqAuo8My8ZDMl0rsFc0158G8x8lAehWfLjb0="; }; + patches = [ + # evolution-ews contains .so files loaded by evolution-data-server refering + # schemas from evolution. evolution-data-server is not wrapped with + # evolution's schemas because it would be a circular dependency with + # evolution. + (substituteAll { + src = ./hardcode-gsettings.patch; + evo = glib.makeSchemaPath evolution evolution.name; + }) + ]; + nativeBuildInputs = [ cmake gettext @@ -50,10 +64,26 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = gnome.updateScript { - packageName = "evolution-ews"; - versionPolicy = "odd-unstable"; + hardcodeGsettingsPatch = glib.mkHardcodeGsettingsPatch { + inherit src; + glib-schema-to-var = { + "org.gnome.evolution.mail" = "evo"; + "org.gnome.evolution.calendar" = "evo"; + }; }; + + updateScript = + let + updateSource = gnome.updateScript { + packageName = "evolution-ews"; + versionPolicy = "odd-unstable"; + }; + updatePatch = _experimental-update-script-combinators.copyAttrOutputToFile "evolution-ews.hardcodeGsettingsPatch" ./hardcode-gsettings.patch; + in + _experimental-update-script-combinators.sequence [ + updateSource + updatePatch + ]; }; meta = with lib; { diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution-ews/hardcode-gsettings.patch b/pkgs/applications/networking/mailreaders/evolution/evolution-ews/hardcode-gsettings.patch new file mode 100644 index 000000000000..c5fb77fc2a51 --- /dev/null +++ b/pkgs/applications/networking/mailreaders/evolution/evolution-ews/hardcode-gsettings.patch @@ -0,0 +1,72 @@ +diff --git a/src/EWS/camel/camel-ews-utils.c b/src/EWS/camel/camel-ews-utils.c +index 0707f72..1e71954 100644 +--- a/src/EWS/camel/camel-ews-utils.c ++++ b/src/EWS/camel/camel-ews-utils.c +@@ -1552,7 +1552,18 @@ ews_utils_save_category_changes (GHashTable *old_categories, /* gchar *guid ~> C + + evo_labels = g_ptr_array_new_full (5, g_free); + +- settings = g_settings_new ("org.gnome.evolution.mail"); ++ { ++ g_autoptr(GSettingsSchemaSource) schema_source; ++ g_autoptr(GSettingsSchema) schema; ++ schema_source = g_settings_schema_source_new_from_directory("@evo@", ++ g_settings_schema_source_get_default(), ++ TRUE, ++ NULL); ++ schema = g_settings_schema_source_lookup(schema_source, ++ "org.gnome.evolution.mail", ++ FALSE); ++ settings = g_settings_new_full(schema, NULL, NULL); ++ } + strv = g_settings_get_strv (settings, "labels"); + + for (ii = 0; strv && strv[ii]; ii++) { +diff --git a/src/EWS/common/e-ews-calendar-utils.c b/src/EWS/common/e-ews-calendar-utils.c +index 6deda60..9b44cc7 100644 +--- a/src/EWS/common/e-ews-calendar-utils.c ++++ b/src/EWS/common/e-ews-calendar-utils.c +@@ -413,7 +413,18 @@ ews_get_configured_icaltimezone (void) + gchar *location; + ICalTimezone *zone = NULL; + +- settings = g_settings_new ("org.gnome.evolution.calendar"); ++ { ++ g_autoptr(GSettingsSchemaSource) schema_source; ++ g_autoptr(GSettingsSchema) schema; ++ schema_source = g_settings_schema_source_new_from_directory("@evo@", ++ g_settings_schema_source_get_default(), ++ TRUE, ++ NULL); ++ schema = g_settings_schema_source_lookup(schema_source, ++ "org.gnome.evolution.calendar", ++ FALSE); ++ settings = g_settings_new_full(schema, NULL, NULL); ++ } + location = g_settings_get_string (settings, "timezone"); + if (location) { + zone = i_cal_timezone_get_builtin_timezone (location); +diff --git a/src/Microsoft365/camel/camel-m365-store.c b/src/Microsoft365/camel/camel-m365-store.c +index ff1b8e3..4f876c0 100644 +--- a/src/Microsoft365/camel/camel-m365-store.c ++++ b/src/Microsoft365/camel/camel-m365-store.c +@@ -309,7 +309,18 @@ m365_store_save_category_changes (GHashTable *old_categories, /* gchar *id ~> Ca + + evo_labels = g_ptr_array_new_full (5, g_free); + +- settings = g_settings_new ("org.gnome.evolution.mail"); ++ { ++ g_autoptr(GSettingsSchemaSource) schema_source; ++ g_autoptr(GSettingsSchema) schema; ++ schema_source = g_settings_schema_source_new_from_directory("@evo@", ++ g_settings_schema_source_get_default(), ++ TRUE, ++ NULL); ++ schema = g_settings_schema_source_lookup(schema_source, ++ "org.gnome.evolution.mail", ++ FALSE); ++ settings = g_settings_new_full(schema, NULL, NULL); ++ } + strv = g_settings_get_strv (settings, "labels"); + + for (ii = 0; strv && strv[ii]; ii++) { diff --git a/pkgs/applications/video/obs-studio/27.nix b/pkgs/applications/video/obs-studio/27.nix deleted file mode 100644 index 7be6f46b9d9d..000000000000 --- a/pkgs/applications/video/obs-studio/27.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ callPackage, qtx11extras, ... } @ args: - -callPackage ./generic.nix (args // { - version = "27.2.4"; - sha256 = "sha256-OiSejQovSmhItrnrQlcVp9PCDRgAhuxTinSpXbH8bo0="; - extraBuildInputs = [ qtx11extras ]; -}) diff --git a/pkgs/applications/video/obs-studio/28.nix b/pkgs/applications/video/obs-studio/28.nix deleted file mode 100644 index edf40b14879c..000000000000 --- a/pkgs/applications/video/obs-studio/28.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ callPackage -, libajantv2 -, librist -, srt -, qtwayland -, ... -} @ args: - -callPackage ./generic.nix (args // { - version = "28.0.3"; - sha256 = "sha256-+4H1BjEgxqkAEvRyr2Tg3wXutnMvlYQEdT5jz644fMA="; - extraPatches = [ ./Provide-runtime-plugin-destination-as-relative-path.patch ]; - extraBuildInputs = [ - libajantv2 - librist - srt - qtwayland - ]; - extraCMakeFlags = [ - "-DENABLE_JACK=ON" - ]; -}) diff --git a/pkgs/applications/video/obs-studio/generic.nix b/pkgs/applications/video/obs-studio/default.nix similarity index 91% rename from pkgs/applications/video/obs-studio/generic.nix rename to pkgs/applications/video/obs-studio/default.nix index e638cacd06d9..fb4ffe93a9e8 100644 --- a/pkgs/applications/video/obs-studio/generic.nix +++ b/pkgs/applications/video/obs-studio/default.nix @@ -1,9 +1,4 @@ -{ version -, sha256 -, extraPatches ? [ ] -, extraBuildInputs ? [ ] -, extraCMakeFlags ? [ ] -, config +{ config , lib , stdenv , fetchFromGitHub @@ -41,6 +36,10 @@ , pipewireSupport ? stdenv.isLinux , pipewire , libdrm +, libajantv2 +, librist +, srt +, qtwayland , wrapQtAppsHook , ... }: @@ -51,20 +50,21 @@ let in stdenv.mkDerivation rec { pname = "obs-studio"; - inherit version; + version = "28.1.2"; src = fetchFromGitHub { owner = "obsproject"; repo = "obs-studio"; rev = version; - inherit sha256; + sha256 = "sha256-M5UEOtdzXBVY0UGfwWx3MsM28bJ1EcVPl8acWXWV0lg="; fetchSubmodules = true; }; patches = [ # Lets obs-browser build against CEF 90.1.0+ ./Enable-file-access-and-universal-access-for-file-URL.patch - ] ++ extraPatches; + ./Provide-runtime-plugin-destination-as-relative-path.patch + ]; nativeBuildInputs = [ addOpenGLRunpath @@ -94,8 +94,11 @@ stdenv.mkDerivation rec { libvlc mbedtls pciutils + libajantv2 + librist + srt + qtwayland ] - ++ extraBuildInputs ++ optionals scriptingSupport [ luajit python3 ] ++ optional alsaSupport alsa-lib ++ optional pulseaudioSupport libpulseaudio @@ -123,7 +126,8 @@ stdenv.mkDerivation rec { # Add support for browser source "-DBUILD_BROWSER=ON" "-DCEF_ROOT_DIR=../../cef" - ] ++ extraCMakeFlags; + "-DENABLE_JACK=ON" + ]; dontWrapGApps = true; preFixup = '' diff --git a/pkgs/applications/video/obs-studio/plugins/default.nix b/pkgs/applications/video/obs-studio/plugins/default.nix index 846a03897ba9..fd2cee40f6ec 100644 --- a/pkgs/applications/video/obs-studio/plugins/default.nix +++ b/pkgs/applications/video/obs-studio/plugins/default.nix @@ -1,4 +1,4 @@ -{ callPackage, libsForQt5, pkgsi686Linux }: +{ callPackage, qt6Packages, pkgsi686Linux }: # When adding new plugins: # - Respect alphabetical order. On diversion, file a PR. @@ -8,17 +8,17 @@ { looking-glass-obs = callPackage ./looking-glass-obs.nix { }; - obs-backgroundremoval = callPackage ./obs-backgroundremoval.nix { }; + obs-backgroundremoval = callPackage ./obs-backgroundremoval { }; obs-gstreamer = callPackage ./obs-gstreamer.nix { }; - obs-hyperion = libsForQt5.callPackage ./obs-hyperion/default.nix { }; + obs-hyperion = qt6Packages.callPackage ./obs-hyperion/default.nix { }; obs-move-transition = callPackage ./obs-move-transition.nix { }; - obs-multi-rtmp = libsForQt5.callPackage ./obs-multi-rtmp.nix { }; + obs-multi-rtmp = qt6Packages.callPackage ./obs-multi-rtmp { }; - obs-ndi = libsForQt5.callPackage ./obs-ndi.nix { }; + obs-ndi = qt6Packages.callPackage ./obs-ndi.nix { }; obs-nvfbc = callPackage ./obs-nvfbc.nix { }; diff --git a/pkgs/applications/video/obs-studio/plugins/fix-search-path.patch b/pkgs/applications/video/obs-studio/plugins/fix-search-path.patch deleted file mode 100644 index 4503447ff5dc..000000000000 --- a/pkgs/applications/video/obs-studio/plugins/fix-search-path.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/external/FindLibObs.cmake b/external/FindLibObs.cmake -index ab0a3de..19c63ee 100644 ---- a/external/FindLibObs.cmake -+++ b/external/FindLibObs.cmake -@@ -95,7 +95,7 @@ if(LIBOBS_FOUND) - - set(LIBOBS_INCLUDE_DIRS ${LIBOBS_INCLUDE_DIR} ${W32_PTHREADS_INCLUDE_DIR}) - set(LIBOBS_LIBRARIES ${LIBOBS_LIB} ${W32_PTHREADS_LIB}) -- include(${LIBOBS_INCLUDE_DIR}/../cmake/external/ObsPluginHelpers.cmake) -+ include(external/ObsPluginHelpers.cmake) - - # allows external plugins to easily use/share common dependencies that are often included with libobs (such as FFmpeg) - if(NOT DEFINED INCLUDED_LIBOBS_CMAKE_MODULES) diff --git a/pkgs/applications/video/obs-studio/plugins/hardcode-ndi-path.patch b/pkgs/applications/video/obs-studio/plugins/hardcode-ndi-path.patch index caef96c381f2..03b54473bb8b 100644 --- a/pkgs/applications/video/obs-studio/plugins/hardcode-ndi-path.patch +++ b/pkgs/applications/video/obs-studio/plugins/hardcode-ndi-path.patch @@ -1,17 +1,19 @@ diff --git a/src/obs-ndi.cpp b/src/obs-ndi.cpp -index 493831c..7b0f8db 100644 +index 1a8aeb3..9a36ea9 100644 --- a/src/obs-ndi.cpp +++ b/src/obs-ndi.cpp -@@ -197,11 +197,7 @@ const char* obs_module_description() - const NDIlib_v4* load_ndilib() - { - QStringList locations; -- locations << QString(qgetenv(NDILIB_REDIST_FOLDER)); +@@ -132,13 +132,7 @@ const NDIlib_v5 *load_ndilib() + const char *redistFolder = std::getenv(NDILIB_REDIST_FOLDER); + if (redistFolder) + libraryLocations.push_back(redistFolder); -#if defined(__linux__) || defined(__APPLE__) -- locations << "/usr/lib"; -- locations << "/usr/local/lib"; +- libraryLocations.push_back("/usr/lib"); +- libraryLocations.push_back("/usr/lib64"); +- libraryLocations.push_back("/usr/lib/x86_64-linux-gnu"); +- libraryLocations.push_back("/usr/local/lib"); +- libraryLocations.push_back("/usr/local/lib64"); -#endif -+ locations << "@NDI@/lib"; ++ libraryLocations.push_back("@NDI@/lib"); - for (QString path : locations) { - blog(LOG_INFO, "Trying '%s'", path.toUtf8().constData()); + for (std::string path : libraryLocations) { + blog(LOG_DEBUG, "[load_ndilib] Trying library path: '%s'", path.c_str()); diff --git a/pkgs/applications/video/obs-studio/plugins/obs-backgroundremoval.nix b/pkgs/applications/video/obs-studio/plugins/obs-backgroundremoval/default.nix similarity index 69% rename from pkgs/applications/video/obs-studio/plugins/obs-backgroundremoval.nix rename to pkgs/applications/video/obs-studio/plugins/obs-backgroundremoval/default.nix index 6175a48a1b96..79a3f82fec87 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-backgroundremoval.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-backgroundremoval/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , cmake , obs-studio , onnxruntime @@ -10,15 +9,23 @@ stdenv.mkDerivation rec { pname = "obs-backgroundremoval"; - version = "0.4.0"; + version = "unstable-2022-05-02"; src = fetchFromGitHub { owner = "royshil"; repo = "obs-backgroundremoval"; - rev = "v${version}"; - sha256 = "sha256-TI1FlhE0+JL50gAZCSsI+g8savX8GRQkH3jYli/66hQ="; + rev = "cc9d4a5711f9388ed110230f9f793bb071577a23"; + hash = "sha256-xkVZ4cB642p4DvZAPwI2EVhkfVl5lJhgOQobjNMqpec="; }; + patches = [ + # Fix c++ include directives + ./includes.patch + + # Use CPU backend instead of CUDA/DirectML + ./use-cpu-backend.patch + ]; + nativeBuildInputs = [ cmake ]; buildInputs = [ obs-studio onnxruntime opencv ]; @@ -29,10 +36,9 @@ stdenv.mkDerivation rec { "-DOnnxruntime_INCLUDE_DIRS=${onnxruntime.dev}/include/onnxruntime/core/session" ]; - patches = [ ./obs-backgroundremoval-includes.patch ]; prePatch = '' - sed -i 's/version_from_git()/set(VERSION "${version}")/' CMakeLists.txt + sed -i 's/version_from_git()/set(VERSION "0.4.0")/' CMakeLists.txt ''; meta = with lib; { diff --git a/pkgs/applications/video/obs-studio/plugins/obs-backgroundremoval-includes.patch b/pkgs/applications/video/obs-studio/plugins/obs-backgroundremoval/includes.patch similarity index 91% rename from pkgs/applications/video/obs-studio/plugins/obs-backgroundremoval-includes.patch rename to pkgs/applications/video/obs-studio/plugins/obs-backgroundremoval/includes.patch index 2a1b59a6b128..b99fc1181881 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-backgroundremoval-includes.patch +++ b/pkgs/applications/video/obs-studio/plugins/obs-backgroundremoval/includes.patch @@ -1,5 +1,5 @@ diff --git a/src/Model.h b/src/Model.h -index 5c21eae..74b8078 100644 +index 6a73745..6bb8a7d 100644 --- a/src/Model.h +++ b/src/Model.h @@ -1,13 +1,8 @@ @@ -13,11 +13,11 @@ index 5c21eae..74b8078 100644 -#include -#include -#endif - #ifdef _WIN32 + #ifdef WITH_CUDA #include diff --git a/src/background-filter.cpp b/src/background-filter.cpp -index 9fa5794..5d66aee 100644 +index 0853818..32c6483 100644 --- a/src/background-filter.cpp +++ b/src/background-filter.cpp @@ -1,13 +1,8 @@ @@ -31,6 +31,6 @@ index 9fa5794..5d66aee 100644 -#include -#include -#endif - #ifdef _WIN32 #ifdef WITH_CUDA #include + #endif diff --git a/pkgs/applications/video/obs-studio/plugins/obs-backgroundremoval/use-cpu-backend.patch b/pkgs/applications/video/obs-studio/plugins/obs-backgroundremoval/use-cpu-backend.patch new file mode 100644 index 000000000000..0db5592e5cdb --- /dev/null +++ b/pkgs/applications/video/obs-studio/plugins/obs-backgroundremoval/use-cpu-backend.patch @@ -0,0 +1,32 @@ +From d04e167f9081a3ec8c49f0967b5b0cec79e40e4d Mon Sep 17 00:00:00 2001 +From: Raphael Robatsch +Date: Fri, 14 Oct 2022 16:55:36 +0200 +Subject: [PATCH] unix: use CPU backend instead of DirectML + +--- + src/background-filter.cpp | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/src/background-filter.cpp b/src/background-filter.cpp +index 32c6483..55e838f 100644 +--- a/src/background-filter.cpp ++++ b/src/background-filter.cpp +@@ -205,10 +205,14 @@ static void createOrtSession(struct background_removal_filter *tf) { + if (tf->useGPU == USEGPU_CUDA) { + Ort::ThrowOnError(OrtSessionOptionsAppendExecutionProvider_CUDA(sessionOptions, 0)); + } +-#else ++#elseif _WIN32 + if (tf->useGPU == USEGPU_DML) { + Ort::ThrowOnError(OrtSessionOptionsAppendExecutionProvider_DML(sessionOptions, 0)); + } ++#else ++ if (tf->useGPU == USEGPU_CPU) { ++ Ort::ThrowOnError(OrtSessionOptionsAppendExecutionProvider_CPU(sessionOptions, 0)); ++ } + #endif + tf->session.reset(new Ort::Session(*tf->env, tf->modelFilepath, sessionOptions)); + } catch (const std::exception& e) { +-- +2.37.3 + diff --git a/pkgs/applications/video/obs-studio/plugins/obs-hyperion/default.nix b/pkgs/applications/video/obs-studio/plugins/obs-hyperion/default.nix index 90fffa50ed59..8a3af27c9075 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-hyperion/default.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-hyperion/default.nix @@ -29,11 +29,17 @@ stdenv.mkDerivation rec { chmod -R a+w external ''; + postInstall = '' + # Remove flatbuffers install + rm -rf $out/bin $out/lib/{libflatbuffers.a,cmake,pkgconfig} $out/include + ''; + meta = with lib; { description = "OBS Studio plugin to connect to a Hyperion.ng server"; homepage = "https://github.com/hyperion-project/hyperion-obs-plugin"; license = licenses.mit; maintainers = with maintainers; [ algram ]; platforms = [ "x86_64-linux" ]; + broken = true; # Not compatible with qt6 yet but required by OBS28 }; } diff --git a/pkgs/applications/video/obs-studio/plugins/obs-move-transition.nix b/pkgs/applications/video/obs-studio/plugins/obs-move-transition.nix index c7d7c8596ef8..7af053e5c18f 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-move-transition.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-move-transition.nix @@ -7,27 +7,22 @@ stdenv.mkDerivation rec { pname = "obs-move-transition"; - version = "2.6.4"; + version = "2.7.1"; src = fetchFromGitHub { owner = "exeldro"; repo = "obs-move-transition"; rev = version; - sha256 = "sha256-+kAdCM5PEFNxKNmJmf2ASTyUKA7xnbMAA7kP/emoaeI="; + sha256 = "sha256-zWHQ01iNTlqSAKcmsDCUZPXmmBIpqY/ZDftD5J6kp80="; }; nativeBuildInputs = [ cmake ]; buildInputs = [ obs-studio ]; - preConfigure = '' - cp ${obs-studio.src}/cmake/external/ObsPluginHelpers.cmake cmake/ + postInstall = '' + rm -rf $out/obs-plugins $out/data ''; - cmakeFlags = [ - "-DBUILD_OUT_OF_TREE=On" - "-Wno-dev" - ]; - meta = with lib; { description = "Plugin for OBS Studio to move source to a new position during scene transition"; homepage = "https://github.com/exeldro/obs-move-transition"; diff --git a/pkgs/applications/video/obs-studio/plugins/obs-multi-rtmp.nix b/pkgs/applications/video/obs-studio/plugins/obs-multi-rtmp/default.nix similarity index 76% rename from pkgs/applications/video/obs-studio/plugins/obs-multi-rtmp.nix rename to pkgs/applications/video/obs-studio/plugins/obs-multi-rtmp/default.nix index a6c84cbbbef0..e7c0d144b41d 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-multi-rtmp.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-multi-rtmp/default.nix @@ -2,20 +2,21 @@ stdenv.mkDerivation rec { pname = "obs-multi-rtmp"; - version = "0.2.8.1"; + version = "0.2.8.1-OBS28"; src = fetchFromGitHub { owner = "sorayuki"; repo = "obs-multi-rtmp"; rev = version; - sha256 = "sha256-OhatuSlDJ2VDNorM4QfoKPYKyv5YpN8EnIelLdBTlZ0="; + sha256 = "sha256-1W+c8Y0AmtKQmCIg8IDAaYYStQzDpZRuqw3vZEY5ncU="; }; nativeBuildInputs = [ cmake ]; buildInputs = [ obs-studio qtbase ]; - cmakeFlags = [ - "-DLIBOBS_INCLUDE_DIR=${obs-studio}/include/obs" + patches = [ + # Patch cmake file to link against the obs build output, instead of its sources + ./fix-build.patch ]; dontWrapQtApps = true; diff --git a/pkgs/applications/video/obs-studio/plugins/obs-multi-rtmp/fix-build.patch b/pkgs/applications/video/obs-studio/plugins/obs-multi-rtmp/fix-build.patch new file mode 100644 index 000000000000..dd40fc7e9595 --- /dev/null +++ b/pkgs/applications/video/obs-studio/plugins/obs-multi-rtmp/fix-build.patch @@ -0,0 +1,54 @@ +From 72aeddb52c2b656bfec918097ad07a0ff092008b Mon Sep 17 00:00:00 2001 +From: Raphael Robatsch +Date: Thu, 13 Oct 2022 21:34:21 +0200 +Subject: [PATCH] Link against OBS public interface instead of sources + +--- + CMakeLists.txt | 22 ++++------------------ + 1 file changed, 4 insertions(+), 18 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 27e20f8..8725c5b 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -65,15 +65,9 @@ if (WIN32) + "/def:${CMAKE_CURRENT_BINARY_DIR}/obs-frontend-api.def" + "/out:${CMAKE_CURRENT_BINARY_DIR}/obs-frontend-api.lib" + ) +-elseif (APPLE) +- # macOS +- find_library(_LIB_OBS "${LIB_OBS}.0.dylib" PATHS ${OBS_BIN_DIR} REQUIRED) +- set(LIB_OBS "${_LIB_OBS}") +-elseif (UNIX) +- # Linux +- find_package(LibObs REQUIRED) + else () +- message(FATAL_ERROR "Unsupported OS!") ++ find_package(libobs REQUIRED) ++ find_package(obs-frontend-api REQUIRED) + endif () + + +@@ -96,18 +90,10 @@ if (WIN32) + "${CMAKE_CURRENT_BINARY_DIR}/version.rc" + ) + endif () +-target_include_directories(obs-multi-rtmp PRIVATE +- "${OBS_SRC_DIR}/libobs" +- "${OBS_SRC_DIR}/UI/obs-frontend-api" +-) +-target_link_directories(obs-multi-rtmp PRIVATE +- "${CMAKE_CURRENT_BINARY_DIR}" +- ${OBS_BIN_DIR} +-) + target_link_libraries(obs-multi-rtmp PRIVATE + Qt6::Widgets +- ${LIB_OBS} +- obs-frontend-api ++ OBS::libobs ++ OBS::obs-frontend-api + ) + + if (WIN32) +-- +2.37.3 diff --git a/pkgs/applications/video/obs-studio/plugins/obs-ndi.nix b/pkgs/applications/video/obs-studio/plugins/obs-ndi.nix index b581ea91da22..a16c8924adce 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-ndi.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-ndi.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "obs-ndi"; - version = "4.9.1"; + version = "4.10.0"; nativeBuildInputs = [ cmake ]; buildInputs = [ obs-studio qtbase ndi ]; @@ -10,11 +10,13 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "Palakis"; repo = "obs-ndi"; - rev = version; - sha256 = "1y3xdqp55jayhg4sinwiwpk194zc4f4jf0abz647x2fprsk9jz7s"; + rev = "dummy-tag-${version}"; + sha256 = "sha256-eQ/hQ2AnwyBNOotqlUZq07m4FXoeir2f7cTVq594obc="; }; - patches = [ ./fix-search-path.patch ./hardcode-ndi-path.patch ]; + patches = [ + ./hardcode-ndi-path.patch + ]; postPatch = '' # Add path (variable added in hardcode-ndi-path.patch) @@ -26,11 +28,12 @@ stdenv.mkDerivation rec { ln -s ${ndi}/include lib/ndi ''; - cmakeFlags = [ - "-DLIBOBS_INCLUDE_DIR=${obs-studio}/include/obs" - "-DLIBOBS_LIB=${obs-studio}/lib" - "-DCMAKE_CXX_FLAGS=-I${obs-studio.src}/UI/obs-frontend-api" - ]; + postInstall = '' + mkdir $out/lib $out/share + mv $out/obs-plugins/64bit $out/lib/obs-plugins + rm -rf $out/obs-plugins + mv $out/data $out/share/obs + ''; dontWrapQtApps = true; diff --git a/pkgs/data/misc/hackage/pin.json b/pkgs/data/misc/hackage/pin.json index 07cd47d646a1..29dfcfc10cfb 100644 --- a/pkgs/data/misc/hackage/pin.json +++ b/pkgs/data/misc/hackage/pin.json @@ -1,6 +1,6 @@ { - "commit": "8983027e744098e8a2fbeac09bcc6eb8a9471fff", - "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/8983027e744098e8a2fbeac09bcc6eb8a9471fff.tar.gz", - "sha256": "1iqgakw71x8cymdifpqnv546wmmrda6w862axli4k03vj7rv91iw", - "msg": "Update from Hackage at 2022-10-27T19:26:33Z" + "commit": "7e2dca1338ee7f19dbb8cdbc81e9eb1716bbf64e", + "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/7e2dca1338ee7f19dbb8cdbc81e9eb1716bbf64e.tar.gz", + "sha256": "1vrhv9w042sn2sm3niiy5640qvhiqn79zllp4vsbdpds758rj9vm", + "msg": "Update from Hackage at 2022-11-03T21:09:38Z" } diff --git a/pkgs/desktops/gnome/core/evolution-data-server/default.nix b/pkgs/desktops/gnome/core/evolution-data-server/default.nix index 0f643e174326..726333d1f747 100644 --- a/pkgs/desktops/gnome/core/evolution-data-server/default.nix +++ b/pkgs/desktops/gnome/core/evolution-data-server/default.nix @@ -2,9 +2,6 @@ , lib , fetchurl , substituteAll -, runCommand -, git -, coccinelle , pkg-config , gnome , _experimental-update-script-combinators @@ -70,7 +67,7 @@ stdenv.mkDerivation rec { prePatch = '' substitute ${./hardcode-gsettings.patch} hardcode-gsettings.patch \ - --subst-var-by EDS_GSETTINGS_PATH ${glib.makeSchemaPath "$out" "${pname}-${version}"} + --subst-var-by EDS ${glib.makeSchemaPath "$out" "${pname}-${version}"} patches="$patches $PWD/hardcode-gsettings.patch" ''; @@ -153,40 +150,28 @@ stdenv.mkDerivation rec { ''; passthru = { - # In order for GNOME not to depend on OCaml through Coccinelle, - # we materialize the SmPL patch into a unified diff-style patch. - hardcodeGsettingsPatch = - runCommand - "hardcode-gsettings.patch" - { - inherit src; - nativeBuildInputs = [ - git - coccinelle - python3 # For patch script - ]; - } - '' - unpackPhase - cd "''${sourceRoot:-.}" - git init - git add -A - spatch --sp-file "${./hardcode-gsettings.cocci}" --dir . --in-place - git diff > "$out" - ''; + hardcodeGsettingsPatch = glib.mkHardcodeGsettingsPatch { + glib-schema-to-var = { + "org.gnome.Evolution.DefaultSources" = "EDS"; + "org.gnome.evolution.shell.network-config" = "EDS"; + "org.gnome.evolution-data-server.addressbook" = "EDS"; + "org.gnome.evolution-data-server.calendar" = "EDS"; + "org.gnome.evolution-data-server" = "EDS"; + }; + inherit src; + }; updateScript = let updateSource = gnome.updateScript { packageName = "evolution-data-server"; versionPolicy = "odd-unstable"; }; - - updateGsettingsPatch = _experimental-update-script-combinators.copyAttrOutputToFile "evolution-data-server.hardcodeGsettingsPatch" ./hardcode-gsettings.patch; + updatePatch = _experimental-update-script-combinators.copyAttrOutputToFile "evolution-data-server.hardcodeGsettingsPatch" ./hardcode-gsettings.patch; in _experimental-update-script-combinators.sequence [ updateSource - updateGsettingsPatch + updatePatch ]; }; diff --git a/pkgs/desktops/gnome/core/evolution-data-server/hardcode-gsettings.patch b/pkgs/desktops/gnome/core/evolution-data-server/hardcode-gsettings.patch index 0ad35d4742d2..20a94cc70791 100644 --- a/pkgs/desktops/gnome/core/evolution-data-server/hardcode-gsettings.patch +++ b/pkgs/desktops/gnome/core/evolution-data-server/hardcode-gsettings.patch @@ -1,5 +1,5 @@ diff --git a/src/addressbook/libebook/e-book-client.c b/src/addressbook/libebook/e-book-client.c -index 7888e69..c3b695c 100644 +index 7888e69..27215e4 100644 --- a/src/addressbook/libebook/e-book-client.c +++ b/src/addressbook/libebook/e-book-client.c @@ -1983,7 +1983,18 @@ e_book_client_get_self (ESourceRegistry *registry, @@ -10,7 +10,7 @@ index 7888e69..c3b695c 100644 + { + g_autoptr(GSettingsSchemaSource) schema_source; + g_autoptr(GSettingsSchema) schema; -+ schema_source = g_settings_schema_source_new_from_directory("@EDS_GSETTINGS_PATH@", ++ schema_source = g_settings_schema_source_new_from_directory("@EDS@", + g_settings_schema_source_get_default(), + TRUE, + NULL); @@ -30,7 +30,7 @@ index 7888e69..c3b695c 100644 + { + g_autoptr(GSettingsSchemaSource) schema_source; + g_autoptr(GSettingsSchema) schema; -+ schema_source = g_settings_schema_source_new_from_directory("@EDS_GSETTINGS_PATH@", ++ schema_source = g_settings_schema_source_new_from_directory("@EDS@", + g_settings_schema_source_get_default(), + TRUE, + NULL); @@ -51,7 +51,7 @@ index 7888e69..c3b695c 100644 + if (!settings) { + g_autoptr(GSettingsSchemaSource) schema_source; + g_autoptr(GSettingsSchema) schema; -+ schema_source = g_settings_schema_source_new_from_directory("@EDS_GSETTINGS_PATH@", ++ schema_source = g_settings_schema_source_new_from_directory("@EDS@", + g_settings_schema_source_get_default(), + TRUE, + NULL); @@ -64,7 +64,7 @@ index 7888e69..c3b695c 100644 g_mutex_unlock (&mutex); diff --git a/src/addressbook/libebook/e-book.c b/src/addressbook/libebook/e-book.c -index 8dfff6d..cd88392 100644 +index 8dfff6d..fb4434b 100644 --- a/src/addressbook/libebook/e-book.c +++ b/src/addressbook/libebook/e-book.c @@ -2587,7 +2587,18 @@ e_book_get_self (ESourceRegistry *registry, @@ -75,7 +75,7 @@ index 8dfff6d..cd88392 100644 + { + g_autoptr(GSettingsSchemaSource) schema_source; + g_autoptr(GSettingsSchema) schema; -+ schema_source = g_settings_schema_source_new_from_directory("@EDS_GSETTINGS_PATH@", ++ schema_source = g_settings_schema_source_new_from_directory("@EDS@", + g_settings_schema_source_get_default(), + TRUE, + NULL); @@ -95,7 +95,7 @@ index 8dfff6d..cd88392 100644 + { + g_autoptr(GSettingsSchemaSource) schema_source; + g_autoptr(GSettingsSchema) schema; -+ schema_source = g_settings_schema_source_new_from_directory("@EDS_GSETTINGS_PATH@", ++ schema_source = g_settings_schema_source_new_from_directory("@EDS@", + g_settings_schema_source_get_default(), + TRUE, + NULL); @@ -115,7 +115,7 @@ index 8dfff6d..cd88392 100644 + { + g_autoptr(GSettingsSchemaSource) schema_source; + g_autoptr(GSettingsSchema) schema; -+ schema_source = g_settings_schema_source_new_from_directory("@EDS_GSETTINGS_PATH@", ++ schema_source = g_settings_schema_source_new_from_directory("@EDS@", + g_settings_schema_source_get_default(), + TRUE, + NULL); @@ -128,7 +128,7 @@ index 8dfff6d..cd88392 100644 g_object_unref (settings); diff --git a/src/addressbook/libedata-book/e-book-meta-backend.c b/src/addressbook/libedata-book/e-book-meta-backend.c -index d3f130e..9e8edd4 100644 +index d3f130e..bc820e9 100644 --- a/src/addressbook/libedata-book/e-book-meta-backend.c +++ b/src/addressbook/libedata-book/e-book-meta-backend.c @@ -135,7 +135,18 @@ ebmb_is_power_saver_enabled (void) @@ -139,7 +139,7 @@ index d3f130e..9e8edd4 100644 + { + g_autoptr(GSettingsSchemaSource) schema_source; + g_autoptr(GSettingsSchema) schema; -+ schema_source = g_settings_schema_source_new_from_directory("@EDS_GSETTINGS_PATH@", ++ schema_source = g_settings_schema_source_new_from_directory("@EDS@", + g_settings_schema_source_get_default(), + TRUE, + NULL); @@ -152,7 +152,7 @@ index d3f130e..9e8edd4 100644 if (g_settings_get_boolean (settings, "limit-operations-in-power-saver-mode")) { GPowerProfileMonitor *power_monitor; diff --git a/src/calendar/backends/contacts/e-cal-backend-contacts.c b/src/calendar/backends/contacts/e-cal-backend-contacts.c -index 42f3457..faac410 100644 +index 42f3457..b4926af 100644 --- a/src/calendar/backends/contacts/e-cal-backend-contacts.c +++ b/src/calendar/backends/contacts/e-cal-backend-contacts.c @@ -1387,7 +1387,18 @@ e_cal_backend_contacts_init (ECalBackendContacts *cbc) @@ -163,7 +163,7 @@ index 42f3457..faac410 100644 + { + g_autoptr(GSettingsSchemaSource) schema_source; + g_autoptr(GSettingsSchema) schema; -+ schema_source = g_settings_schema_source_new_from_directory("@EDS_GSETTINGS_PATH@", ++ schema_source = g_settings_schema_source_new_from_directory("@EDS@", + g_settings_schema_source_get_default(), + TRUE, + NULL); @@ -176,7 +176,7 @@ index 42f3457..faac410 100644 cbc->priv->update_alarms_id = 0; cbc->priv->alarm_enabled = FALSE; diff --git a/src/calendar/libecal/e-reminder-watcher.c b/src/calendar/libecal/e-reminder-watcher.c -index 52095a4..e839991 100644 +index 52095a4..184b657 100644 --- a/src/calendar/libecal/e-reminder-watcher.c +++ b/src/calendar/libecal/e-reminder-watcher.c @@ -2555,7 +2555,19 @@ e_reminder_watcher_init (EReminderWatcher *watcher) @@ -187,7 +187,7 @@ index 52095a4..e839991 100644 + { + g_autoptr(GSettingsSchemaSource) schema_source; + g_autoptr(GSettingsSchema) schema; -+ schema_source = g_settings_schema_source_new_from_directory("@EDS_GSETTINGS_PATH@", ++ schema_source = g_settings_schema_source_new_from_directory("@EDS@", + g_settings_schema_source_get_default(), + TRUE, + NULL); @@ -201,7 +201,7 @@ index 52095a4..e839991 100644 watcher->priv->default_zone = e_cal_util_copy_timezone (zone); watcher->priv->timers_enabled = TRUE; diff --git a/src/calendar/libedata-cal/e-cal-meta-backend.c b/src/calendar/libedata-cal/e-cal-meta-backend.c -index 94a875f..1f914a9 100644 +index 94a875f..1d2ed92 100644 --- a/src/calendar/libedata-cal/e-cal-meta-backend.c +++ b/src/calendar/libedata-cal/e-cal-meta-backend.c @@ -149,7 +149,18 @@ ecmb_is_power_saver_enabled (void) @@ -212,7 +212,7 @@ index 94a875f..1f914a9 100644 + { + g_autoptr(GSettingsSchemaSource) schema_source; + g_autoptr(GSettingsSchema) schema; -+ schema_source = g_settings_schema_source_new_from_directory("@EDS_GSETTINGS_PATH@", ++ schema_source = g_settings_schema_source_new_from_directory("@EDS@", + g_settings_schema_source_get_default(), + TRUE, + NULL); @@ -225,7 +225,7 @@ index 94a875f..1f914a9 100644 if (g_settings_get_boolean (settings, "limit-operations-in-power-saver-mode")) { GPowerProfileMonitor *power_monitor; diff --git a/src/camel/camel-cipher-context.c b/src/camel/camel-cipher-context.c -index 8013ba7..ba74769 100644 +index 8013ba7..1bba6d1 100644 --- a/src/camel/camel-cipher-context.c +++ b/src/camel/camel-cipher-context.c @@ -1625,7 +1625,18 @@ camel_cipher_can_load_photos (void) @@ -236,7 +236,7 @@ index 8013ba7..ba74769 100644 + { + g_autoptr(GSettingsSchemaSource) schema_source; + g_autoptr(GSettingsSchema) schema; -+ schema_source = g_settings_schema_source_new_from_directory("@EDS_GSETTINGS_PATH@", ++ schema_source = g_settings_schema_source_new_from_directory("@EDS@", + g_settings_schema_source_get_default(), + TRUE, + NULL); @@ -249,7 +249,7 @@ index 8013ba7..ba74769 100644 g_clear_object (&settings); diff --git a/src/camel/camel-gpg-context.c b/src/camel/camel-gpg-context.c -index 205372e..2023704 100644 +index 205372e..f75a88e 100644 --- a/src/camel/camel-gpg-context.c +++ b/src/camel/camel-gpg-context.c @@ -582,7 +582,18 @@ gpg_ctx_get_executable_name (void) @@ -260,7 +260,7 @@ index 205372e..2023704 100644 + { + g_autoptr(GSettingsSchemaSource) schema_source; + g_autoptr(GSettingsSchema) schema; -+ schema_source = g_settings_schema_source_new_from_directory("@EDS_GSETTINGS_PATH@", ++ schema_source = g_settings_schema_source_new_from_directory("@EDS@", + g_settings_schema_source_get_default(), + TRUE, + NULL); @@ -273,7 +273,7 @@ index 205372e..2023704 100644 g_clear_object (&settings); diff --git a/src/camel/camel-utils.c b/src/camel/camel-utils.c -index e61160c..d17871a 100644 +index e61160c..b6553a4 100644 --- a/src/camel/camel-utils.c +++ b/src/camel/camel-utils.c @@ -362,7 +362,19 @@ void @@ -284,7 +284,7 @@ index e61160c..d17871a 100644 + { + g_autoptr(GSettingsSchemaSource) schema_source; + g_autoptr(GSettingsSchema) schema; -+ schema_source = g_settings_schema_source_new_from_directory("@EDS_GSETTINGS_PATH@", ++ schema_source = g_settings_schema_source_new_from_directory("@EDS@", + g_settings_schema_source_get_default(), + TRUE, + NULL); @@ -298,7 +298,7 @@ index e61160c..d17871a 100644 G_CALLBACK (mi_user_headers_settings_changed_cb), NULL); G_UNLOCK (mi_user_headers); diff --git a/src/camel/providers/imapx/camel-imapx-server.c b/src/camel/providers/imapx/camel-imapx-server.c -index e5645e2..170a0be 100644 +index e5645e2..96a1ce3 100644 --- a/src/camel/providers/imapx/camel-imapx-server.c +++ b/src/camel/providers/imapx/camel-imapx-server.c @@ -5573,7 +5573,18 @@ camel_imapx_server_skip_old_flags_update (CamelStore *store) @@ -309,7 +309,7 @@ index e5645e2..170a0be 100644 + { + g_autoptr(GSettingsSchemaSource) schema_source; + g_autoptr(GSettingsSchema) schema; -+ schema_source = g_settings_schema_source_new_from_directory("@EDS_GSETTINGS_PATH@", ++ schema_source = g_settings_schema_source_new_from_directory("@EDS@", + g_settings_schema_source_get_default(), + TRUE, + NULL); @@ -322,7 +322,7 @@ index e5645e2..170a0be 100644 if (g_settings_get_boolean (eds_settings, "limit-operations-in-power-saver-mode")) { GPowerProfileMonitor *power_monitor; diff --git a/src/camel/providers/smtp/camel-smtp-transport.c b/src/camel/providers/smtp/camel-smtp-transport.c -index f535ad6..30130b9 100644 +index f535ad6..918975d 100644 --- a/src/camel/providers/smtp/camel-smtp-transport.c +++ b/src/camel/providers/smtp/camel-smtp-transport.c @@ -1458,7 +1458,18 @@ smtp_helo (CamelSmtpTransport *transport, @@ -333,7 +333,7 @@ index f535ad6..30130b9 100644 + { + g_autoptr(GSettingsSchemaSource) schema_source; + g_autoptr(GSettingsSchema) schema; -+ schema_source = g_settings_schema_source_new_from_directory("@EDS_GSETTINGS_PATH@", ++ schema_source = g_settings_schema_source_new_from_directory("@EDS@", + g_settings_schema_source_get_default(), + TRUE, + NULL); @@ -346,7 +346,7 @@ index f535ad6..30130b9 100644 g_clear_object (&settings); diff --git a/src/libedataserver/e-network-monitor.c b/src/libedataserver/e-network-monitor.c -index 188f276..7c4db94 100644 +index 188f276..939f89b 100644 --- a/src/libedataserver/e-network-monitor.c +++ b/src/libedataserver/e-network-monitor.c @@ -256,7 +256,18 @@ e_network_monitor_constructed (GObject *object) @@ -357,7 +357,7 @@ index 188f276..7c4db94 100644 + { + g_autoptr(GSettingsSchemaSource) schema_source; + g_autoptr(GSettingsSchema) schema; -+ schema_source = g_settings_schema_source_new_from_directory("@EDS_GSETTINGS_PATH@", ++ schema_source = g_settings_schema_source_new_from_directory("@EDS@", + g_settings_schema_source_get_default(), + TRUE, + NULL); @@ -370,7 +370,7 @@ index 188f276..7c4db94 100644 settings, "network-monitor-gio-name", object, "gio-name", diff --git a/src/libedataserver/e-oauth2-service-google.c b/src/libedataserver/e-oauth2-service-google.c -index f215388..3b67126 100644 +index f215388..501222e 100644 --- a/src/libedataserver/e-oauth2-service-google.c +++ b/src/libedataserver/e-oauth2-service-google.c @@ -71,7 +71,18 @@ eos_google_read_settings (EOAuth2Service *service, @@ -381,7 +381,7 @@ index f215388..3b67126 100644 + { + g_autoptr(GSettingsSchemaSource) schema_source; + g_autoptr(GSettingsSchema) schema; -+ schema_source = g_settings_schema_source_new_from_directory("@EDS_GSETTINGS_PATH@", ++ schema_source = g_settings_schema_source_new_from_directory("@EDS@", + g_settings_schema_source_get_default(), + TRUE, + NULL); @@ -394,7 +394,7 @@ index f215388..3b67126 100644 g_object_unref (settings); diff --git a/src/libedataserver/e-oauth2-service-outlook.c b/src/libedataserver/e-oauth2-service-outlook.c -index 9cff0d0..fd95f0b 100644 +index 9cff0d0..4c9a203 100644 --- a/src/libedataserver/e-oauth2-service-outlook.c +++ b/src/libedataserver/e-oauth2-service-outlook.c @@ -71,7 +71,18 @@ eos_outlook_read_settings (EOAuth2Service *service, @@ -405,7 +405,7 @@ index 9cff0d0..fd95f0b 100644 + { + g_autoptr(GSettingsSchemaSource) schema_source; + g_autoptr(GSettingsSchema) schema; -+ schema_source = g_settings_schema_source_new_from_directory("@EDS_GSETTINGS_PATH@", ++ schema_source = g_settings_schema_source_new_from_directory("@EDS@", + g_settings_schema_source_get_default(), + TRUE, + NULL); @@ -418,7 +418,7 @@ index 9cff0d0..fd95f0b 100644 g_object_unref (settings); diff --git a/src/libedataserver/e-oauth2-service-yahoo.c b/src/libedataserver/e-oauth2-service-yahoo.c -index 8e4ee81..bb8f8f7 100644 +index 8e4ee81..cc94026 100644 --- a/src/libedataserver/e-oauth2-service-yahoo.c +++ b/src/libedataserver/e-oauth2-service-yahoo.c @@ -67,7 +67,18 @@ eos_yahoo_read_settings (EOAuth2Service *service, @@ -429,7 +429,7 @@ index 8e4ee81..bb8f8f7 100644 + { + g_autoptr(GSettingsSchemaSource) schema_source; + g_autoptr(GSettingsSchema) schema; -+ schema_source = g_settings_schema_source_new_from_directory("@EDS_GSETTINGS_PATH@", ++ schema_source = g_settings_schema_source_new_from_directory("@EDS@", + g_settings_schema_source_get_default(), + TRUE, + NULL); @@ -442,7 +442,7 @@ index 8e4ee81..bb8f8f7 100644 g_object_unref (settings); diff --git a/src/libedataserver/e-oauth2-service.c b/src/libedataserver/e-oauth2-service.c -index 7783781..6fb22cb 100644 +index 7783781..6a2db01 100644 --- a/src/libedataserver/e-oauth2-service.c +++ b/src/libedataserver/e-oauth2-service.c @@ -90,7 +90,18 @@ eos_default_guess_can_process (EOAuth2Service *service, @@ -453,7 +453,7 @@ index 7783781..6fb22cb 100644 + { + g_autoptr(GSettingsSchemaSource) schema_source; + g_autoptr(GSettingsSchema) schema; -+ schema_source = g_settings_schema_source_new_from_directory("@EDS_GSETTINGS_PATH@", ++ schema_source = g_settings_schema_source_new_from_directory("@EDS@", + g_settings_schema_source_get_default(), + TRUE, + NULL); @@ -466,7 +466,7 @@ index 7783781..6fb22cb 100644 g_object_unref (settings); diff --git a/src/libedataserver/e-source-registry.c b/src/libedataserver/e-source-registry.c -index 6701a3a..6b8ee33 100644 +index 6701a3a..f497263 100644 --- a/src/libedataserver/e-source-registry.c +++ b/src/libedataserver/e-source-registry.c @@ -1764,7 +1764,19 @@ e_source_registry_init (ESourceRegistry *registry) @@ -477,7 +477,7 @@ index 6701a3a..6b8ee33 100644 + { + g_autoptr(GSettingsSchemaSource) schema_source; + g_autoptr(GSettingsSchema) schema; -+ schema_source = g_settings_schema_source_new_from_directory("@EDS_GSETTINGS_PATH@", ++ schema_source = g_settings_schema_source_new_from_directory("@EDS@", + g_settings_schema_source_get_default(), + TRUE, + NULL); @@ -491,7 +491,7 @@ index 6701a3a..6b8ee33 100644 g_signal_connect ( registry->priv->settings, "changed", diff --git a/src/libedataserverui/e-reminders-widget.c b/src/libedataserverui/e-reminders-widget.c -index 14b6481..6dc55bb 100644 +index 14b6481..7149b74 100644 --- a/src/libedataserverui/e-reminders-widget.c +++ b/src/libedataserverui/e-reminders-widget.c @@ -1986,7 +1986,19 @@ static void @@ -502,7 +502,7 @@ index 14b6481..6dc55bb 100644 + { + g_autoptr(GSettingsSchemaSource) schema_source; + g_autoptr(GSettingsSchema) schema; -+ schema_source = g_settings_schema_source_new_from_directory("@EDS_GSETTINGS_PATH@", ++ schema_source = g_settings_schema_source_new_from_directory("@EDS@", + g_settings_schema_source_get_default(), + TRUE, + NULL); @@ -516,7 +516,7 @@ index 14b6481..6dc55bb 100644 reminders->priv->is_empty = TRUE; reminders->priv->is_mapped = FALSE; diff --git a/src/services/evolution-source-registry/evolution-source-registry-autoconfig.c b/src/services/evolution-source-registry/evolution-source-registry-autoconfig.c -index 6f03053..127c92e 100644 +index 6f03053..b5db6b2 100644 --- a/src/services/evolution-source-registry/evolution-source-registry-autoconfig.c +++ b/src/services/evolution-source-registry/evolution-source-registry-autoconfig.c @@ -706,7 +706,18 @@ evolution_source_registry_merge_autoconfig_sources (ESourceRegistryServer *serve @@ -527,7 +527,7 @@ index 6f03053..127c92e 100644 + { + g_autoptr(GSettingsSchemaSource) schema_source; + g_autoptr(GSettingsSchema) schema; -+ schema_source = g_settings_schema_source_new_from_directory("@EDS_GSETTINGS_PATH@", ++ schema_source = g_settings_schema_source_new_from_directory("@EDS@", + g_settings_schema_source_get_default(), + TRUE, + NULL); @@ -540,7 +540,7 @@ index 6f03053..127c92e 100644 autoconfig_sources = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, e_autoconfig_free_merge_source_data); diff --git a/src/services/evolution-source-registry/evolution-source-registry-migrate-proxies.c b/src/services/evolution-source-registry/evolution-source-registry-migrate-proxies.c -index d531cb9..3d8807c 100644 +index d531cb9..c96f1d5 100644 --- a/src/services/evolution-source-registry/evolution-source-registry-migrate-proxies.c +++ b/src/services/evolution-source-registry/evolution-source-registry-migrate-proxies.c @@ -61,7 +61,18 @@ evolution_source_registry_migrate_proxies (ESourceRegistryServer *server) @@ -551,7 +551,7 @@ index d531cb9..3d8807c 100644 + { + g_autoptr(GSettingsSchemaSource) schema_source; + g_autoptr(GSettingsSchema) schema; -+ schema_source = g_settings_schema_source_new_from_directory("@EDS_GSETTINGS_PATH@", ++ schema_source = g_settings_schema_source_new_from_directory("@EDS@", + g_settings_schema_source_get_default(), + TRUE, + NULL); @@ -564,7 +564,7 @@ index d531cb9..3d8807c 100644 switch (g_settings_get_int (settings, "proxy-type")) { case 1: diff --git a/src/services/evolution-source-registry/evolution-source-registry.c b/src/services/evolution-source-registry/evolution-source-registry.c -index 1c0a113..d26b059 100644 +index 1c0a113..6b41423 100644 --- a/src/services/evolution-source-registry/evolution-source-registry.c +++ b/src/services/evolution-source-registry/evolution-source-registry.c @@ -181,7 +181,18 @@ main (gint argc, @@ -575,7 +575,7 @@ index 1c0a113..d26b059 100644 + { + g_autoptr(GSettingsSchemaSource) schema_source; + g_autoptr(GSettingsSchema) schema; -+ schema_source = g_settings_schema_source_new_from_directory("@EDS_GSETTINGS_PATH@", ++ schema_source = g_settings_schema_source_new_from_directory("@EDS@", + g_settings_schema_source_get_default(), + TRUE, + NULL); diff --git a/pkgs/development/compilers/ghc/9.2.5.nix b/pkgs/development/compilers/ghc/9.2.5.nix new file mode 100644 index 000000000000..b7798ad044aa --- /dev/null +++ b/pkgs/development/compilers/ghc/9.2.5.nix @@ -0,0 +1,367 @@ +{ lib, stdenv, pkgsBuildTarget, pkgsHostTarget, targetPackages + +# build-tools +, bootPkgs +, autoconf, automake, coreutils, fetchpatch, fetchurl, perl, python3, m4, sphinx +, xattr, autoSignDarwinBinariesHook +, bash + +, libiconv ? null, ncurses +, glibcLocales ? null + +, # GHC can be built with system libffi or a bundled one. + libffi ? null + +, useLLVM ? !(stdenv.targetPlatform.isx86 + || stdenv.targetPlatform.isPower + || stdenv.targetPlatform.isSparc + || (stdenv.targetPlatform.isAarch64 && stdenv.targetPlatform.isDarwin)) +, # LLVM is conceptually a run-time-only depedendency, but for + # non-x86, we need LLVM to bootstrap later stages, so it becomes a + # build-time dependency too. + buildTargetLlvmPackages, llvmPackages + +, # If enabled, GHC will be built with the GPL-free but slightly slower native + # bignum backend instead of the faster but GPLed gmp backend. + enableNativeBignum ? !(lib.meta.availableOn stdenv.hostPlatform gmp) +, gmp + +, # If enabled, use -fPIC when compiling static libs. + enableRelocatedStaticLibs ? stdenv.targetPlatform != stdenv.hostPlatform + + # aarch64 outputs otherwise exceed 2GB limit +, enableProfiledLibs ? !stdenv.targetPlatform.isAarch64 + +, # Whether to build dynamic libs for the standard library (on the target + # platform). Static libs are always built. + enableShared ? with stdenv.targetPlatform; !isWindows && !useiOSPrebuilt && !isStatic + +, # Whether to build terminfo. + enableTerminfo ? !stdenv.targetPlatform.isWindows + +, # What flavour to build. An empty string indicates no + # specific flavour and falls back to ghc default values. + ghcFlavour ? lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) + (if useLLVM then "perf-cross" else "perf-cross-ncg") + +, # Whether to build sphinx documentation. + enableDocs ? ( + # Docs disabled for musl and cross because it's a large task to keep + # all `sphinx` dependencies building in those environments. + # `sphinx` pulls in among others: + # Ruby, Python, Perl, Rust, OpenGL, Xorg, gtk, LLVM. + (stdenv.targetPlatform == stdenv.hostPlatform) + && !stdenv.hostPlatform.isMusl + ) + +, enableHaddockProgram ? + # Disabled for cross; see note [HADDOCK_DOCS]. + (stdenv.targetPlatform == stdenv.hostPlatform) + +, # Whether to disable the large address space allocator + # necessary fix for iOS: https://www.reddit.com/r/haskell/comments/4ttdz1/building_an_osxi386_to_iosarm64_cross_compiler/d5qvd67/ + disableLargeAddressSpace ? stdenv.targetPlatform.isiOS +}: + +assert !enableNativeBignum -> gmp != null; + +# Cross cannot currently build the `haddock` program for silly reasons, +# see note [HADDOCK_DOCS]. +assert (stdenv.targetPlatform != stdenv.hostPlatform) -> !enableHaddockProgram; + +let + inherit (stdenv) buildPlatform hostPlatform targetPlatform; + + inherit (bootPkgs) ghc; + + # TODO(@Ericson2314) Make unconditional + targetPrefix = lib.optionalString + (targetPlatform != hostPlatform) + "${targetPlatform.config}-"; + + buildMK = '' + BuildFlavour = ${ghcFlavour} + ifneq \"\$(BuildFlavour)\" \"\" + include mk/flavours/\$(BuildFlavour).mk + endif + BUILD_SPHINX_HTML = ${if enableDocs then "YES" else "NO"} + BUILD_SPHINX_PDF = NO + '' + + # Note [HADDOCK_DOCS]: + # Unfortunately currently `HADDOCK_DOCS` controls both whether the `haddock` + # program is built (which we generally always want to have a complete GHC install) + # and whether it is run on the GHC sources to generate hyperlinked source code + # (which is impossible for cross-compilation); see: + # https://gitlab.haskell.org/ghc/ghc/-/issues/20077 + # This implies that currently a cross-compiled GHC will never have a `haddock` + # program, so it can never generate haddocks for any packages. + # If this is solved in the future, we'd like to unconditionally + # build the haddock program (removing the `enableHaddockProgram` option). + '' + HADDOCK_DOCS = ${if enableHaddockProgram then "YES" else "NO"} + # Build haddocks for boot packages with hyperlinking + EXTRA_HADDOCK_OPTS += --hyperlinked-source --quickjump + + DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"} + BIGNUM_BACKEND = ${if enableNativeBignum then "native" else "gmp"} + '' + lib.optionalString (targetPlatform != hostPlatform) '' + Stage1Only = ${if targetPlatform.system == hostPlatform.system then "NO" else "YES"} + CrossCompilePrefix = ${targetPrefix} + '' + lib.optionalString (!enableProfiledLibs) '' + GhcLibWays = "v dyn" + '' + + # -fexternal-dynamic-refs apparently (because it's not clear from the documentation) + # makes the GHC RTS able to load static libraries, which may be needed for TemplateHaskell. + # This solution was described in https://www.tweag.io/blog/2020-09-30-bazel-static-haskell + lib.optionalString enableRelocatedStaticLibs '' + GhcLibHcOpts += -fPIC -fexternal-dynamic-refs + GhcRtsHcOpts += -fPIC -fexternal-dynamic-refs + '' + lib.optionalString targetPlatform.useAndroidPrebuilt '' + EXTRA_CC_OPTS += -std=gnu99 + ''; + + # Splicer will pull out correct variations + libDeps = platform: lib.optional enableTerminfo ncurses + ++ [libffi] + ++ lib.optional (!enableNativeBignum) gmp + ++ lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv; + + # TODO(@sternenseemann): is buildTarget LLVM unnecessary? + # GHC doesn't seem to have {LLC,OPT}_HOST + toolsForTarget = [ + pkgsBuildTarget.targetPackages.stdenv.cc + ] ++ lib.optional useLLVM buildTargetLlvmPackages.llvm; + + targetCC = builtins.head toolsForTarget; + + # Sometimes we have to dispatch between the bintools wrapper and the unwrapped + # derivation for certain tools depending on the platform. + bintoolsFor = { + # GHC needs install_name_tool on all darwin platforms. On aarch64-darwin it is + # part of the bintools wrapper (due to codesigning requirements), but not on + # x86_64-darwin. + install_name_tool = + if stdenv.targetPlatform.isAarch64 + then targetCC.bintools + else targetCC.bintools.bintools; + # Same goes for strip. + strip = + # TODO(@sternenseemann): also use wrapper if linker == "bfd" or "gold" + if stdenv.targetPlatform.isAarch64 && stdenv.targetPlatform.isDarwin + then targetCC.bintools + else targetCC.bintools.bintools; + }; + + # Use gold either following the default, or to avoid the BFD linker due to some bugs / perf issues. + # But we cannot avoid BFD when using musl libc due to https://sourceware.org/bugzilla/show_bug.cgi?id=23856 + # see #84670 and #49071 for more background. + useLdGold = targetPlatform.linker == "gold" || + (targetPlatform.linker == "bfd" && (targetCC.bintools.bintools.hasGold or false) && !targetPlatform.isMusl); + + # Makes debugging easier to see which variant is at play in `nix-store -q --tree`. + variantSuffix = lib.concatStrings [ + (lib.optionalString stdenv.hostPlatform.isMusl "-musl") + (lib.optionalString enableNativeBignum "-native-bignum") + ]; + +in + +# C compiler, bintools and LLVM are used at build time, but will also leak into +# the resulting GHC's settings file and used at runtime. This means that we are +# currently only able to build GHC if hostPlatform == buildPlatform. +assert targetCC == pkgsHostTarget.targetPackages.stdenv.cc; +assert buildTargetLlvmPackages.llvm == llvmPackages.llvm; +assert stdenv.targetPlatform.isDarwin -> buildTargetLlvmPackages.clang == llvmPackages.clang; + +stdenv.mkDerivation (rec { + version = "9.2.5"; + pname = "${targetPrefix}ghc${variantSuffix}"; + + src = fetchurl { + url = "https://downloads.haskell.org/ghc/${version}/ghc-${version}-src.tar.xz"; + sha256 = "0606797d1b38e2d88ee2243f38ec6b9a1aa93e9b578e95f0de9a9c0a4144021c"; + }; + + enableParallelBuilding = true; + + outputs = [ "out" "doc" ]; + + patches = [ + # fix hyperlinked haddock sources: https://github.com/haskell/haddock/pull/1482 + (fetchpatch { + url = "https://patch-diff.githubusercontent.com/raw/haskell/haddock/pull/1482.patch"; + sha256 = "sha256-8w8QUCsODaTvknCDGgTfFNZa8ZmvIKaKS+2ZJZ9foYk="; + extraPrefix = "utils/haddock/"; + stripLen = 1; + }) + ]; + + postPatch = "patchShebangs ."; + + # GHC needs the locale configured during the Haddock phase. + LANG = "en_US.UTF-8"; + + # GHC is a bit confused on its cross terminology. + # TODO(@sternenseemann): investigate coreutils dependencies and pass absolute paths + preConfigure = '' + for env in $(env | grep '^TARGET_' | sed -E 's|\+?=.*||'); do + export "''${env#TARGET_}=''${!env}" + done + # GHC is a bit confused on its cross terminology, as these would normally be + # the *host* tools. + export CC="${targetCC}/bin/${targetCC.targetPrefix}cc" + export CXX="${targetCC}/bin/${targetCC.targetPrefix}c++" + # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177 + export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${lib.optionalString useLdGold ".gold"}" + export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as" + export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar" + export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm" + export RANLIB="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ranlib" + export READELF="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}readelf" + export STRIP="${bintoolsFor.strip}/bin/${bintoolsFor.strip.targetPrefix}strip" + '' + lib.optionalString (stdenv.targetPlatform.linker == "cctools") '' + export OTOOL="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}otool" + export INSTALL_NAME_TOOL="${bintoolsFor.install_name_tool}/bin/${bintoolsFor.install_name_tool.targetPrefix}install_name_tool" + '' + lib.optionalString useLLVM '' + export LLC="${lib.getBin buildTargetLlvmPackages.llvm}/bin/llc" + export OPT="${lib.getBin buildTargetLlvmPackages.llvm}/bin/opt" + '' + lib.optionalString (useLLVM && stdenv.targetPlatform.isDarwin) '' + # LLVM backend on Darwin needs clang: https://downloads.haskell.org/~ghc/latest/docs/html/users_guide/codegens.html#llvm-code-generator-fllvm + export CLANG="${buildTargetLlvmPackages.clang}/bin/${buildTargetLlvmPackages.clang.targetPrefix}clang" + '' + '' + echo -n "${buildMK}" > mk/build.mk + '' + lib.optionalString (stdenv.isLinux && hostPlatform.libc == "glibc") '' + export LOCALE_ARCHIVE="${glibcLocales}/lib/locale/locale-archive" + '' + lib.optionalString (!stdenv.isDarwin) '' + export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}" + '' + lib.optionalString stdenv.isDarwin '' + export NIX_LDFLAGS+=" -no_dtrace_dof" + + # GHC tries the host xattr /usr/bin/xattr by default which fails since it expects python to be 2.7 + export XATTR=${lib.getBin xattr}/bin/xattr + '' + lib.optionalString targetPlatform.useAndroidPrebuilt '' + sed -i -e '5i ,("armv7a-unknown-linux-androideabi", ("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "cortex-a8", ""))' llvm-targets + '' + lib.optionalString targetPlatform.isMusl '' + echo "patching llvm-targets for musl targets..." + echo "Cloning these existing '*-linux-gnu*' targets:" + grep linux-gnu llvm-targets | sed 's/^/ /' + echo "(go go gadget sed)" + sed -i 's,\(^.*linux-\)gnu\(.*\)$,\0\n\1musl\2,' llvm-targets + echo "llvm-targets now contains these '*-linux-musl*' targets:" + grep linux-musl llvm-targets | sed 's/^/ /' + + echo "And now patching to preserve '-musleabi' as done with '-gnueabi'" + # (aclocal.m4 is actual source, but patch configure as well since we don't re-gen) + for x in configure aclocal.m4; do + substituteInPlace $x \ + --replace '*-android*|*-gnueabi*)' \ + '*-android*|*-gnueabi*|*-musleabi*)' + done + ''; + + # TODO(@Ericson2314): Always pass "--target" and always prefix. + configurePlatforms = [ "build" "host" ] + ++ lib.optional (targetPlatform != hostPlatform) "target"; + + # `--with` flags for libraries needed for RTS linker + configureFlags = [ + "--datadir=$doc/share/doc/ghc" + "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib" + ] ++ lib.optionals (libffi != null) [ + "--with-system-libffi" + "--with-ffi-includes=${targetPackages.libffi.dev}/include" + "--with-ffi-libraries=${targetPackages.libffi.out}/lib" + ] ++ lib.optionals (targetPlatform == hostPlatform && !enableNativeBignum) [ + "--with-gmp-includes=${targetPackages.gmp.dev}/include" + "--with-gmp-libraries=${targetPackages.gmp.out}/lib" + ] ++ lib.optionals (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [ + "--with-iconv-includes=${libiconv}/include" + "--with-iconv-libraries=${libiconv}/lib" + ] ++ lib.optionals (targetPlatform != hostPlatform) [ + "--enable-bootstrap-with-devel-snapshot" + ] ++ lib.optionals useLdGold [ + "CFLAGS=-fuse-ld=gold" + "CONF_GCC_LINKER_OPTS_STAGE1=-fuse-ld=gold" + "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold" + ] ++ lib.optionals (disableLargeAddressSpace) [ + "--disable-large-address-space" + ]; + + # Make sure we never relax`$PATH` and hooks support for compatibility. + strictDeps = true; + + # Don’t add -liconv to LDFLAGS automatically so that GHC will add it itself. + dontAddExtraLibs = true; + + nativeBuildInputs = [ + perl autoconf automake m4 python3 + ghc bootPkgs.alex bootPkgs.happy bootPkgs.hscolour + ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + autoSignDarwinBinariesHook + ] ++ lib.optionals enableDocs [ + sphinx + ]; + + # For building runtime libs + depsBuildTarget = toolsForTarget; + + buildInputs = [ perl bash ] ++ (libDeps hostPlatform); + + depsTargetTarget = map lib.getDev (libDeps targetPlatform); + depsTargetTargetPropagated = map (lib.getOutput "out") (libDeps targetPlatform); + + # required, because otherwise all symbols from HSffi.o are stripped, and + # that in turn causes GHCi to abort + stripDebugFlags = [ "-S" ] ++ lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols"; + + checkTarget = "test"; + + hardeningDisable = + [ "format" ] + # In nixpkgs, musl based builds currently enable `pie` hardening by default + # (see `defaultHardeningFlags` in `make-derivation.nix`). + # But GHC cannot currently produce outputs that are ready for `-pie` linking. + # Thus, disable `pie` hardening, otherwise `recompile with -fPIE` errors appear. + # See: + # * https://github.com/NixOS/nixpkgs/issues/129247 + # * https://gitlab.haskell.org/ghc/ghc/-/issues/19580 + ++ lib.optional stdenv.targetPlatform.isMusl "pie"; + + # big-parallel allows us to build with more than 2 cores on + # Hydra which already warrants a significant speedup + requiredSystemFeatures = [ "big-parallel" ]; + + postInstall = '' + # Install the bash completion file. + install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/${targetPrefix}ghc + ''; + + passthru = { + inherit bootPkgs targetPrefix; + + inherit llvmPackages; + inherit enableShared; + + # This is used by the haskell builder to query + # the presence of the haddock program. + hasHaddock = enableHaddockProgram; + + # Our Cabal compiler name + haskellCompilerName = "ghc-${version}"; + }; + + meta = { + homepage = "http://haskell.org/ghc"; + description = "The Glasgow Haskell Compiler"; + maintainers = with lib.maintainers; [ + guibou + ] ++ lib.teams.haskell.members; + timeout = 24 * 3600; + inherit (ghc.meta) license platforms; + }; + +} // lib.optionalAttrs targetPlatform.useAndroidPrebuilt { + dontStrip = true; + dontPatchELF = true; + noAuditTmpdir = true; +}) diff --git a/pkgs/development/compilers/ghc/9.4.3.nix b/pkgs/development/compilers/ghc/9.4.3.nix new file mode 100644 index 000000000000..2b0f206a6fb0 --- /dev/null +++ b/pkgs/development/compilers/ghc/9.4.3.nix @@ -0,0 +1,370 @@ +# DO NOT port this expression to hadrian. It is not possible to build a GHC +# cross compiler with 9.4.* and hadrian. +{ lib, stdenv, pkgsBuildTarget, pkgsHostTarget, targetPackages + +# build-tools +, bootPkgs +, autoconf, automake, coreutils, fetchpatch, fetchurl, perl, python3, m4, sphinx +, xattr, autoSignDarwinBinariesHook +, bash + +, libiconv ? null, ncurses +, glibcLocales ? null + +, # GHC can be built with system libffi or a bundled one. + libffi ? null + +, useLLVM ? !(stdenv.targetPlatform.isx86 + || stdenv.targetPlatform.isPower + || stdenv.targetPlatform.isSparc + || (stdenv.targetPlatform.isAarch64 && stdenv.targetPlatform.isDarwin)) +, # LLVM is conceptually a run-time-only depedendency, but for + # non-x86, we need LLVM to bootstrap later stages, so it becomes a + # build-time dependency too. + buildTargetLlvmPackages, llvmPackages + +, # If enabled, GHC will be built with the GPL-free but slightly slower native + # bignum backend instead of the faster but GPLed gmp backend. + enableNativeBignum ? !(lib.meta.availableOn stdenv.hostPlatform gmp) +, gmp + +, # If enabled, use -fPIC when compiling static libs. + enableRelocatedStaticLibs ? stdenv.targetPlatform != stdenv.hostPlatform + + # aarch64 outputs otherwise exceed 2GB limit +, enableProfiledLibs ? !stdenv.targetPlatform.isAarch64 + +, # Whether to build dynamic libs for the standard library (on the target + # platform). Static libs are always built. + enableShared ? with stdenv.targetPlatform; !isWindows && !useiOSPrebuilt && !isStatic + +, # Whether to build terminfo. + enableTerminfo ? !stdenv.targetPlatform.isWindows + +, # What flavour to build. An empty string indicates no + # specific flavour and falls back to ghc default values. + ghcFlavour ? lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) + (if useLLVM then "perf-cross" else "perf-cross-ncg") + +, # Whether to build sphinx documentation. + enableDocs ? ( + # Docs disabled for musl and cross because it's a large task to keep + # all `sphinx` dependencies building in those environments. + # `sphinx` pulls in among others: + # Ruby, Python, Perl, Rust, OpenGL, Xorg, gtk, LLVM. + (stdenv.targetPlatform == stdenv.hostPlatform) + && !stdenv.hostPlatform.isMusl + ) + +, enableHaddockProgram ? + # Disabled for cross; see note [HADDOCK_DOCS]. + (stdenv.targetPlatform == stdenv.hostPlatform) + +, # Whether to disable the large address space allocator + # necessary fix for iOS: https://www.reddit.com/r/haskell/comments/4ttdz1/building_an_osxi386_to_iosarm64_cross_compiler/d5qvd67/ + disableLargeAddressSpace ? stdenv.targetPlatform.isiOS +}: + +assert !enableNativeBignum -> gmp != null; + +# Cross cannot currently build the `haddock` program for silly reasons, +# see note [HADDOCK_DOCS]. +assert (stdenv.targetPlatform != stdenv.hostPlatform) -> !enableHaddockProgram; + +let + inherit (stdenv) buildPlatform hostPlatform targetPlatform; + + inherit (bootPkgs) ghc; + + # TODO(@Ericson2314) Make unconditional + targetPrefix = lib.optionalString + (targetPlatform != hostPlatform) + "${targetPlatform.config}-"; + + buildMK = '' + BuildFlavour = ${ghcFlavour} + ifneq \"\$(BuildFlavour)\" \"\" + include mk/flavours/\$(BuildFlavour).mk + endif + BUILD_SPHINX_HTML = ${if enableDocs then "YES" else "NO"} + BUILD_SPHINX_PDF = NO + '' + + # Note [HADDOCK_DOCS]: + # Unfortunately currently `HADDOCK_DOCS` controls both whether the `haddock` + # program is built (which we generally always want to have a complete GHC install) + # and whether it is run on the GHC sources to generate hyperlinked source code + # (which is impossible for cross-compilation); see: + # https://gitlab.haskell.org/ghc/ghc/-/issues/20077 + # This implies that currently a cross-compiled GHC will never have a `haddock` + # program, so it can never generate haddocks for any packages. + # If this is solved in the future, we'd like to unconditionally + # build the haddock program (removing the `enableHaddockProgram` option). + '' + HADDOCK_DOCS = ${if enableHaddockProgram then "YES" else "NO"} + # Build haddocks for boot packages with hyperlinking + EXTRA_HADDOCK_OPTS += --hyperlinked-source --quickjump + + DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"} + BIGNUM_BACKEND = ${if enableNativeBignum then "native" else "gmp"} + '' + lib.optionalString (targetPlatform != hostPlatform) '' + Stage1Only = ${if targetPlatform.system == hostPlatform.system then "NO" else "YES"} + CrossCompilePrefix = ${targetPrefix} + '' + lib.optionalString (!enableProfiledLibs) '' + GhcLibWays = "v dyn" + '' + + # -fexternal-dynamic-refs apparently (because it's not clear from the documentation) + # makes the GHC RTS able to load static libraries, which may be needed for TemplateHaskell. + # This solution was described in https://www.tweag.io/blog/2020-09-30-bazel-static-haskell + lib.optionalString enableRelocatedStaticLibs '' + GhcLibHcOpts += -fPIC -fexternal-dynamic-refs + GhcRtsHcOpts += -fPIC -fexternal-dynamic-refs + '' + lib.optionalString targetPlatform.useAndroidPrebuilt '' + EXTRA_CC_OPTS += -std=gnu99 + ''; + + # Splicer will pull out correct variations + libDeps = platform: lib.optional enableTerminfo ncurses + ++ [libffi] + ++ lib.optional (!enableNativeBignum) gmp + ++ lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv; + + # TODO(@sternenseemann): is buildTarget LLVM unnecessary? + # GHC doesn't seem to have {LLC,OPT}_HOST + toolsForTarget = [ + pkgsBuildTarget.targetPackages.stdenv.cc + ] ++ lib.optional useLLVM buildTargetLlvmPackages.llvm; + + targetCC = builtins.head toolsForTarget; + + # Sometimes we have to dispatch between the bintools wrapper and the unwrapped + # derivation for certain tools depending on the platform. + bintoolsFor = { + # GHC needs install_name_tool on all darwin platforms. On aarch64-darwin it is + # part of the bintools wrapper (due to codesigning requirements), but not on + # x86_64-darwin. + install_name_tool = + if stdenv.targetPlatform.isAarch64 + then targetCC.bintools + else targetCC.bintools.bintools; + # Same goes for strip. + strip = + # TODO(@sternenseemann): also use wrapper if linker == "bfd" or "gold" + if stdenv.targetPlatform.isAarch64 && stdenv.targetPlatform.isDarwin + then targetCC.bintools + else targetCC.bintools.bintools; + }; + + # Use gold either following the default, or to avoid the BFD linker due to some bugs / perf issues. + # But we cannot avoid BFD when using musl libc due to https://sourceware.org/bugzilla/show_bug.cgi?id=23856 + # see #84670 and #49071 for more background. + useLdGold = targetPlatform.linker == "gold" || + (targetPlatform.linker == "bfd" && (targetCC.bintools.bintools.hasGold or false) && !targetPlatform.isMusl); + + # Makes debugging easier to see which variant is at play in `nix-store -q --tree`. + variantSuffix = lib.concatStrings [ + (lib.optionalString stdenv.hostPlatform.isMusl "-musl") + (lib.optionalString enableNativeBignum "-native-bignum") + ]; + +in + +# C compiler, bintools and LLVM are used at build time, but will also leak into +# the resulting GHC's settings file and used at runtime. This means that we are +# currently only able to build GHC if hostPlatform == buildPlatform. +assert targetCC == pkgsHostTarget.targetPackages.stdenv.cc; +assert buildTargetLlvmPackages.llvm == llvmPackages.llvm; +assert stdenv.targetPlatform.isDarwin -> buildTargetLlvmPackages.clang == llvmPackages.clang; + +stdenv.mkDerivation (rec { + version = "9.4.3"; + pname = "${targetPrefix}ghc${variantSuffix}"; + + src = fetchurl { + url = "https://downloads.haskell.org/ghc/${version}/ghc-${version}-src.tar.xz"; + sha256 = "eaf63949536ede50ee39179f2299d5094eb9152d87cc6fb2175006bc98e8905a"; + }; + + enableParallelBuilding = true; + + outputs = [ "out" "doc" ]; + + + postPatch = "patchShebangs ."; + + # GHC needs the locale configured during the Haddock phase. + LANG = "en_US.UTF-8"; + + # GHC is a bit confused on its cross terminology. + # TODO(@sternenseemann): investigate coreutils dependencies and pass absolute paths + preConfigure = '' + for env in $(env | grep '^TARGET_' | sed -E 's|\+?=.*||'); do + export "''${env#TARGET_}=''${!env}" + done + # GHC is a bit confused on its cross terminology, as these would normally be + # the *host* tools. + export CC="${targetCC}/bin/${targetCC.targetPrefix}cc" + export CXX="${targetCC}/bin/${targetCC.targetPrefix}c++" + # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177 + export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${lib.optionalString useLdGold ".gold"}" + export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as" + export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar" + export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm" + export RANLIB="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ranlib" + export READELF="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}readelf" + export STRIP="${bintoolsFor.strip}/bin/${bintoolsFor.strip.targetPrefix}strip" + '' + lib.optionalString (stdenv.targetPlatform.linker == "cctools") '' + export OTOOL="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}otool" + export INSTALL_NAME_TOOL="${bintoolsFor.install_name_tool}/bin/${bintoolsFor.install_name_tool.targetPrefix}install_name_tool" + '' + lib.optionalString useLLVM '' + export LLC="${lib.getBin buildTargetLlvmPackages.llvm}/bin/llc" + export OPT="${lib.getBin buildTargetLlvmPackages.llvm}/bin/opt" + '' + lib.optionalString (useLLVM && stdenv.targetPlatform.isDarwin) '' + # LLVM backend on Darwin needs clang: https://downloads.haskell.org/~ghc/latest/docs/html/users_guide/codegens.html#llvm-code-generator-fllvm + export CLANG="${buildTargetLlvmPackages.clang}/bin/${buildTargetLlvmPackages.clang.targetPrefix}clang" + '' + '' + + echo -n "${buildMK}" > mk/build.mk + + sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure + '' + lib.optionalString (stdenv.isLinux && hostPlatform.libc == "glibc") '' + export LOCALE_ARCHIVE="${glibcLocales}/lib/locale/locale-archive" + '' + lib.optionalString (!stdenv.isDarwin) '' + export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}" + '' + lib.optionalString stdenv.isDarwin '' + export NIX_LDFLAGS+=" -no_dtrace_dof" + + # GHC tries the host xattr /usr/bin/xattr by default which fails since it expects python to be 2.7 + export XATTR=${lib.getBin xattr}/bin/xattr + '' + lib.optionalString targetPlatform.useAndroidPrebuilt '' + sed -i -e '5i ,("armv7a-unknown-linux-androideabi", ("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "cortex-a8", ""))' llvm-targets + '' + lib.optionalString targetPlatform.isMusl '' + echo "patching llvm-targets for musl targets..." + echo "Cloning these existing '*-linux-gnu*' targets:" + grep linux-gnu llvm-targets | sed 's/^/ /' + echo "(go go gadget sed)" + sed -i 's,\(^.*linux-\)gnu\(.*\)$,\0\n\1musl\2,' llvm-targets + echo "llvm-targets now contains these '*-linux-musl*' targets:" + grep linux-musl llvm-targets | sed 's/^/ /' + + echo "And now patching to preserve '-musleabi' as done with '-gnueabi'" + # (aclocal.m4 is actual source, but patch configure as well since we don't re-gen) + for x in configure aclocal.m4; do + substituteInPlace $x \ + --replace '*-android*|*-gnueabi*)' \ + '*-android*|*-gnueabi*|*-musleabi*)' + done + '' + # HACK: allow bootstrapping with GHC 8.10 which works fine, as we don't have + # binary 9.0 packaged. Bootstrapping with 9.2 is broken without hadrian. + + '' + substituteInPlace configure --replace \ + 'MinBootGhcVersion="9.0"' \ + 'MinBootGhcVersion="8.10"' + ''; + + # TODO(@Ericson2314): Always pass "--target" and always prefix. + configurePlatforms = [ "build" "host" ] + ++ lib.optional (targetPlatform != hostPlatform) "target"; + + # `--with` flags for libraries needed for RTS linker + configureFlags = [ + "--datadir=$doc/share/doc/ghc" + "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib" + ] ++ lib.optionals (libffi != null) [ + "--with-system-libffi" + "--with-ffi-includes=${targetPackages.libffi.dev}/include" + "--with-ffi-libraries=${targetPackages.libffi.out}/lib" + ] ++ lib.optionals (targetPlatform == hostPlatform && !enableNativeBignum) [ + "--with-gmp-includes=${targetPackages.gmp.dev}/include" + "--with-gmp-libraries=${targetPackages.gmp.out}/lib" + ] ++ lib.optionals (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [ + "--with-iconv-includes=${libiconv}/include" + "--with-iconv-libraries=${libiconv}/lib" + ] ++ lib.optionals (targetPlatform != hostPlatform) [ + "--enable-bootstrap-with-devel-snapshot" + ] ++ lib.optionals useLdGold [ + "CFLAGS=-fuse-ld=gold" + "CONF_GCC_LINKER_OPTS_STAGE1=-fuse-ld=gold" + "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold" + ] ++ lib.optionals (disableLargeAddressSpace) [ + "--disable-large-address-space" + ]; + + # Make sure we never relax`$PATH` and hooks support for compatibility. + strictDeps = true; + + # Don’t add -liconv to LDFLAGS automatically so that GHC will add it itself. + dontAddExtraLibs = true; + + nativeBuildInputs = [ + perl autoconf automake m4 python3 + ghc bootPkgs.alex bootPkgs.happy bootPkgs.hscolour + ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + autoSignDarwinBinariesHook + ] ++ lib.optionals enableDocs [ + sphinx + ]; + + # For building runtime libs + depsBuildTarget = toolsForTarget; + + buildInputs = [ perl bash ] ++ (libDeps hostPlatform); + + depsTargetTarget = map lib.getDev (libDeps targetPlatform); + depsTargetTargetPropagated = map (lib.getOutput "out") (libDeps targetPlatform); + + # required, because otherwise all symbols from HSffi.o are stripped, and + # that in turn causes GHCi to abort + stripDebugFlags = [ "-S" ] ++ lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols"; + + checkTarget = "test"; + + hardeningDisable = + [ "format" ] + # In nixpkgs, musl based builds currently enable `pie` hardening by default + # (see `defaultHardeningFlags` in `make-derivation.nix`). + # But GHC cannot currently produce outputs that are ready for `-pie` linking. + # Thus, disable `pie` hardening, otherwise `recompile with -fPIE` errors appear. + # See: + # * https://github.com/NixOS/nixpkgs/issues/129247 + # * https://gitlab.haskell.org/ghc/ghc/-/issues/19580 + ++ lib.optional stdenv.targetPlatform.isMusl "pie"; + + # big-parallel allows us to build with more than 2 cores on + # Hydra which already warrants a significant speedup + requiredSystemFeatures = [ "big-parallel" ]; + + postInstall = '' + # Install the bash completion file. + install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/${targetPrefix}ghc + ''; + + passthru = { + inherit bootPkgs targetPrefix; + + inherit llvmPackages; + inherit enableShared; + + # This is used by the haskell builder to query + # the presence of the haddock program. + hasHaddock = enableHaddockProgram; + + # Our Cabal compiler name + haskellCompilerName = "ghc-${version}"; + }; + + meta = { + homepage = "http://haskell.org/ghc"; + description = "The Glasgow Haskell Compiler"; + maintainers = with lib.maintainers; [ + guibou + ] ++ lib.teams.haskell.members; + timeout = 24 * 3600; + inherit (ghc.meta) license platforms; + }; + +} // lib.optionalAttrs targetPlatform.useAndroidPrebuilt { + dontStrip = true; + dontPatchELF = true; + noAuditTmpdir = true; +}) diff --git a/pkgs/development/compilers/ghc/common-hadrian.nix b/pkgs/development/compilers/ghc/common-hadrian.nix index 5e1600a73f9b..1ca3c9efde94 100644 --- a/pkgs/development/compilers/ghc/common-hadrian.nix +++ b/pkgs/development/compilers/ghc/common-hadrian.nix @@ -158,7 +158,7 @@ assert !enableNativeBignum -> gmp != null; assert stdenv.hostPlatform == stdenv.targetPlatform || throw '' hadrian doesn't support building an installable GHC cross-compiler at the moment. - Consider using GHC 9.4.2 or lower which support this via the make build system. + Consider using GHC 9.4 or lower which support this via the make build system. See also: https://gitlab.haskell.org/ghc/ghc/-/issues/22090 ''; diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index ad5ce6b7aea9..0c35d60f430a 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -106,7 +106,7 @@ self: super: { name = "git-annex-${super.git-annex.version}-src"; url = "git://git-annex.branchable.com/"; rev = "refs/tags/" + super.git-annex.version; - sha256 = "09ksaaf5kxpskq2hmi1ad35k15cnhn86j795iw6nk86gbvx5hrap"; + sha256 = "14391vj0awvkpsd32kanmc85yic5mg4pxmjhiv7wjxy7ga13wfqw"; # delete android and Android directories which cause issues on # darwin (case insensitive directory). Since we don't need them # during the build process, we can delete it to prevent a hash @@ -123,6 +123,10 @@ self: super: { passthru.shellPath = "/bin/git-annex-shell"; }) super.git-annex; + # Too strict bounds on servant + # Pending a hackage revision: https://github.com/berberman/arch-web/commit/5d08afee5b25e644f9e2e2b95380a5d4f4aa81ea#commitcomment-89230555 + arch-web = doJailbreak super.arch-web; + # Fix test trying to access /home directory shell-conduit = overrideCabal (drv: { postPatch = "sed -i s/home/tmp/ test/Spec.hs"; @@ -1577,6 +1581,10 @@ self: super: { ghc-paths = lsuper.ghc-paths.override { Cabal = null; }; }); + hledger_1_27_1 = doDistribute (super.hledger_1_27_1.override { + hledger-lib = self.hledger-lib_1_27_1; + }); + hls-hlint-plugin = super.hls-hlint-plugin.overrideScope (lself: lsuper: { # For "ghc-lib" flag see https://github.com/haskell/haskell-language-server/issues/3185#issuecomment-1250264515 hlint = enableCabalFlag "ghc-lib" lself.hlint_3_4_1; @@ -1715,7 +1723,17 @@ self: super: { # waiting for aeson bump servant-swagger-ui-core = doJailbreak super.servant-swagger-ui-core; - hercules-ci-agent = self.generateOptparseApplicativeCompletions [ "hercules-ci-agent" ] super.hercules-ci-agent; + hercules-ci-agent = lib.pipe super.hercules-ci-agent [ + (appendPatches [ + # https://github.com/hercules-ci/hercules-ci-agent/pull/446 + (fetchpatch { + url = "https://github.com/hercules-ci/hercules-ci-agent/commit/99afac77ddb84122a5321494a08e6fe2e95548a1.patch"; + sha256 = "sha256-0dtmNL1rqzeXvXWinfANc57a5LIM3uNnhR3A+p8mH0A="; + stripLen = 1; + }) + ]) + (self.generateOptparseApplicativeCompletions [ "hercules-ci-agent" ]) + ]; # Test suite doesn't compile with aeson 2.0 # https://github.com/hercules-ci/hercules-ci-agent/pull/387 @@ -2377,17 +2395,6 @@ self: super: { # https://github.com/kuribas/mfsolve/issues/8 mfsolve = dontCheck super.mfsolve; - # GHC 9 support https://github.com/lambdabot/dice/pull/2 - dice = appendPatch (fetchpatch { - name = "dice-ghc9.patch"; - url = "https://github.com/lambdabot/dice/commit/80d6fd443cb17b21d91b725f994ece6e8274e0a0.patch"; - excludes = [ ".gitignore" ]; - sha256 = "sha256-MtS1n7v5D6MRWWzzTyKl3Lqd/NhD1bV+g80wnhZ3P/Y="; - }) (overrideCabal (drv: { - revision = null; - editedCabalFile = null; - }) super.dice); - # GHC 9 support https://github.com/lambdabot/lambdabot/pull/204 lambdabot-core = appendPatch ./patches/lambdabot-core-ghc9.patch (overrideCabal (drv: { revision = null; @@ -2559,9 +2566,6 @@ self: super: { testTarget = "regex-tdfa-unittest"; } super.regex-tdfa; - # Missing test files https://github.com/qrilka/xlsx/issues/165 - xlsx = dontCheck super.xlsx; - # Missing test files https://github.com/kephas/xdg-basedir-compliant/issues/1 xdg-basedir-compliant = dontCheck super.xdg-basedir-compliant; @@ -2635,4 +2639,13 @@ in { # 2022-10-04: Needs newer tasty-dejafu than (currently) in stackage rec-def = super.rec-def.override { tasty-dejafu = self.tasty-dejafu_2_1_0_0; }; + + # 2022-11-05: https://github.com/ysangkok/haskell-tzdata/issues/3 + tzdata = dontCheck super.tzdata; + + # 2022-11-04: The situation around heist-emanote is quite terrible. + # It‘s simply a heist fork because heist is unmaintained. + # Upstream jailbreak is unreleased: https://github.com/srid/heist/commit/988692ea850b3cbe966c7dc4dd26ba1d49647706 + heist-emanote = doJailbreak (dontCheck super.heist-emanote); + }) 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 2b0bb3876b2a..420c80404ed2 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix @@ -61,13 +61,6 @@ in { # 0.30 introduced support for GHC 9.2. cryptonite = doDistribute self.cryptonite_0_30; - cabal2nix = - # cabal2nix depends on foundation, which is broken on aarch64-linux. - # https://github.com/haskell-foundation/foundation/issues/571 - overrideCabal - (drv: { badPlatforms = [ "aarch64-linux" ]; }) - super.cabal2nix; - doctest = self.doctest_0_20_1; # consequences of doctest breakage follow: @@ -78,8 +71,6 @@ in { lucid = jailbreakForCurrentVersion super.lucid "2.11.1"; invariant = jailbreakForCurrentVersion super.invariant "0.5.6"; implicit-hie-cradle = jailbreakForCurrentVersion super.implicit-hie-cradle "0.5.0.0"; - # https://github.com/co-log/co-log-core/pull/22#issuecomment-1294040208 - co-log-core = jailbreakForCurrentVersion super.co-log-core "0.3.1.0"; haskell-src-meta = doJailbreak super.haskell-src-meta; @@ -206,6 +197,11 @@ in { # 2022-10-06: https://gitlab.haskell.org/ghc/ghc/-/issues/22260 ghc-check = dontHaddock super.ghc-check; + # 2022-11-06: Override override from common, because Cabal-syntax is included since ghc 9.4. + implicit-hie = super.implicit-hie.override { + Cabal-syntax = null; + }; + # 2022-10-06: plugins disabled for hls 1.8.0.0 based on # https://haskell-language-server.readthedocs.io/en/latest/support/plugin-support.html#current-plugin-support-tiers haskell-language-server = super.haskell-language-server.override { diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 7610a82814dc..d061f89c2770 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -2137,7 +2137,6 @@ broken-packages: - heidi - hein - heist-async - - heist-emanote - helisp - helix - hell @@ -2627,6 +2626,7 @@ broken-packages: - imapget - imgur - imj-prelude + - imm - immortal-worker - imperative-edsl - imperative-edsl-vhdl @@ -3777,7 +3777,6 @@ broken-packages: - pasta - pastis - pasty - - patat - patches-vector - Pathfinder - pathfindingcore @@ -3955,6 +3954,7 @@ broken-packages: - polysemy-check - polysemy-keyed-state - polysemy-kvstore-jsonfile + - polysemy-log-co - polysemy-managed - polysemy-mocks - polysemy-readline @@ -5027,7 +5027,6 @@ broken-packages: - tagsoup-selection - tai - tai64 - - tailwind - tak - takahashi - Takusen @@ -5080,7 +5079,9 @@ broken-packages: - tensorflow - tensorflow-opgen - tensor-safe + - termbox-banana - termbox-bindings + - termbox-tea - termination-combinators - termplot - term-rewriting @@ -5335,6 +5336,7 @@ broken-packages: - type-int - type-interpreter - type-level-bst + - type-level-kv-list-esqueleto - type-level-natural-number-induction - type-level-natural-number-operations - typelevel-tensor diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 51e58be7f3d7..df8fbf82107c 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -290,6 +290,7 @@ package-maintainers: maralorn: - cabal-fmt - ema + - emanote - generic-optics - ghcid - ghcide @@ -454,6 +455,7 @@ unsupported-platforms: FTGL: [ platforms.darwin ] fuzzytime: [ platforms.darwin ] # https://github.com/kamwitsta/fuzzytime/issues/2 ghcjs-dom-hello: [ platforms.darwin ] + ghc-gc-hook: [ platforms.darwin ] # requires C11 threads which Apple doesn't support gi-adwaita: [ platforms.darwin ] gi-dbusmenugtk3: [ platforms.darwin ] gi-dbusmenu: [ platforms.darwin ] @@ -520,6 +522,7 @@ unsupported-platforms: sensei: [ platforms.darwin ] synthesizer-alsa: [ platforms.darwin ] taffybar: [ platforms.darwin ] + emanote: [ x86_64-darwin ] # Depends on stork which is broken on macOS sdk < 10.14 termonad: [ platforms.darwin ] tokyotyrant-haskell: [ platforms.darwin ] Unixutils-shadow: [ platforms.darwin ] diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml index b210c51483bf..b1c215ade1c6 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml @@ -1,4 +1,4 @@ -# Stackage LTS 19.30 +# Stackage LTS 19.31 # This file is auto-generated by # maintainers/scripts/haskell/update-stackage.sh default-package-overrides: @@ -359,7 +359,7 @@ default-package-overrides: - code-conjure ==0.5.2 - code-page ==0.2.1 - coercible-utils ==0.1.0 - - cointracking-imports ==0.1.0.1 + - cointracking-imports ==0.1.0.2 - collect-errors ==0.1.5.0 - colonnade ==1.2.0.2 - Color ==0.3.3 @@ -729,7 +729,7 @@ default-package-overrides: - fast-builder ==0.1.3.0 - fast-logger ==3.1.1 - fast-math ==1.0.2 - - fastmemo ==0.1.0.1 + - fastmemo ==0.1.1 - fclabels ==2.0.5.1 - feature-flags ==0.1.0.1 - fedora-dists ==2.0.0 @@ -914,7 +914,7 @@ default-package-overrides: - gi-javascriptcore ==4.0.25 - ginger ==0.10.4.0 - gi-pango ==1.0.27 - - githash ==0.1.6.2 + - githash ==0.1.6.3 - github ==0.27 - github-release ==2.0.0.2 - github-rest ==1.1.2 @@ -946,7 +946,7 @@ default-package-overrides: - graph-core ==0.3.0.0 - graphite ==0.10.0.1 - graphs ==0.7.2 - - graphula ==2.0.2.1 + - graphula ==2.0.2.2 - graphviz ==2999.20.1.0 - graph-wrapper ==0.2.6.0 - gravatar ==0.8.1 @@ -992,8 +992,8 @@ default-package-overrides: - hashtables ==1.2.4.2 - haskeline ==0.8.2 - haskell-awk ==1.2.0.1 - - haskell-gi ==0.26.1 - - haskell-gi-base ==0.26.2 + - haskell-gi ==0.26.2 + - haskell-gi-base ==0.26.3 - haskell-gi-overloading ==1.0 - haskell-lexer ==1.1 - haskell-lsp-types ==0.24.0.0 @@ -1221,7 +1221,7 @@ default-package-overrides: - hworker ==0.1.0.1 - hw-packed-vector ==0.2.1.1 - hw-parser ==0.1.1.0 - - hw-prim ==0.6.3.1 + - hw-prim ==0.6.3.2 - hw-rankselect ==0.13.4.1 - hw-rankselect-base ==0.3.4.1 - hw-simd ==0.1.2.1 @@ -1548,7 +1548,7 @@ default-package-overrides: - mock-time ==0.1.0 - mod ==0.1.2.2 - model ==0.5 - - modern-uri ==0.3.5.0 + - modern-uri ==0.3.6.0 - modular ==0.1.0.8 - monad-chronicle ==1.0.1 - monad-control ==1.0.3.1 @@ -1578,7 +1578,7 @@ default-package-overrides: - monad-st ==0.2.4.1 - monads-tf ==0.1.0.3 - monad-time ==0.3.1.0 - - mongoDB ==2.7.1.1 + - mongoDB ==2.7.1.2 - monoidal-containers ==0.6.3.0 - monoid-extras ==0.6.1 - monoid-subclasses ==1.1.3 @@ -1878,13 +1878,13 @@ default-package-overrides: - postgresql-orm ==0.5.1 - postgresql-query ==3.9.0 - postgresql-schema ==0.1.14 - - postgresql-simple ==0.6.4 + - postgresql-simple ==0.6.5 - postgresql-simple-url ==0.2.1.0 - postgresql-syntax ==0.4.1 - postgresql-typed ==0.6.2.1 - post-mess-age ==0.2.1.0 - pptable ==0.3.0.0 - - pqueue ==1.4.2.0 + - pqueue ==1.4.3.0 - prefix-units ==0.2.0 - prelude-compat ==0.0.0.2 - prelude-safeenum ==0.1.1.3 @@ -2088,7 +2088,7 @@ default-package-overrides: - rope-utf16-splay ==0.3.2.0 - rosezipper ==0.2 - rot13 ==0.2.0.1 - - rpmbuild-order ==0.4.9 + - rpmbuild-order ==0.4.10 - rpm-nvr ==0.1.2 - rp-tree ==0.7.1 - RSA ==2.4.1 @@ -2121,8 +2121,8 @@ default-package-overrides: - say ==0.1.0.1 - sbp ==4.1.6 - sbv ==8.17 - - scalpel ==0.6.2 - - scalpel-core ==0.6.2 + - scalpel ==0.6.2.1 + - scalpel-core ==0.6.2.1 - scanf ==0.1.0.0 - scanner ==0.3.1 - scheduler ==2.0.0.1 @@ -2156,7 +2156,7 @@ default-package-overrides: - sequenceTools ==1.5.2 - serf ==0.1.1.0 - serialise ==0.2.6.0 - - servant ==0.19 + - servant ==0.19.1 - servant-auth ==0.4.1.0 - servant-auth-client ==0.4.1.0 - servant-auth-docs ==0.2.10.0 @@ -2184,7 +2184,7 @@ default-package-overrides: - servant-pipes ==0.15.3 - servant-rawm ==1.0.0.0 - servant-ruby ==0.9.0.0 - - servant-server ==0.19.1 + - servant-server ==0.19.2 - servant-static-th ==1.0.0.0 - servant-subscriber ==0.7.0.0 - servant-swagger ==1.1.11 @@ -2342,7 +2342,7 @@ default-package-overrides: - streaming-attoparsec ==1.0.0.1 - streaming-bytestring ==0.2.4 - streaming-cassava ==0.2.0.0 - - streaming-commons ==0.2.2.4 + - streaming-commons ==0.2.2.5 - streamly ==0.8.1.1 - streamly-bytestring ==0.1.4 - streams ==3.3 @@ -2379,7 +2379,7 @@ default-package-overrides: - svg-builder ==0.1.1 - SVGFonts ==1.8.0.1 - svg-tree ==0.6.2.4 - - swagger2 ==2.8.5 + - swagger2 ==2.8.6 - swish ==0.10.2.0 - syb ==0.7.2.2 - sydtest-discover ==0.0.0.2 @@ -2595,7 +2595,7 @@ default-package-overrides: - type-spec ==0.4.0.0 - typography-geometry ==1.0.1.0 - tz ==0.1.3.6 - - tzdata ==0.2.20221011.0 + - tzdata ==0.2.20221028.0 - ua-parser ==0.7.7.0 - uglymemo ==0.1.0.1 - unagi-chan ==0.4.1.4 @@ -2634,7 +2634,7 @@ default-package-overrides: - unix-bytestring ==0.3.7.8 - unix-compat ==0.5.4 - unix-time ==0.4.8 - - unliftio ==0.2.22.0 + - unliftio ==0.2.23.0 - unliftio-core ==0.2.0.1 - unliftio-path ==0.0.2.0 - unliftio-pool ==0.2.2.0 diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index b9f41f19a5f0..2d37ceb24adc 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -2041,7 +2041,6 @@ dont-distribute-packages: - hedgehog-gen-json - hedis-pile - heist-aeson - - heist-extra - helic - helics - helics-wai @@ -2958,6 +2957,7 @@ dont-distribute-packages: - persistent-audit - persistent-hssqlppp - persistent-map + - persistent-mtl_0_5_0_0 - persistent-mysql-haskell - persistent-relational-record - persona-idp @@ -3484,7 +3484,7 @@ dont-distribute-packages: - skeletons - sketch-frp-copilot - skylark-client - - skylighting_0_13_1 + - skylighting_0_13_1_1 - slate - slidemews - slip32 @@ -3584,6 +3584,7 @@ dont-distribute-packages: - stackage-setup - stackage-upload - stackage2nix + - stackctl - stan - starrover2 - stateful-mtl diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index e30a5aa17c4e..8f9e6d0ce185 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -1102,6 +1102,20 @@ self: super: builtins.intersectAttrs super { broken = false; }) super.cabal-install; + tailwind = addBuildDepend + # Overrides for tailwindcss copied from: + # https://github.com/EmaApps/emanote/blob/master/nix/tailwind.nix + (pkgs.nodePackages.tailwindcss.overrideAttrs (oa: { + plugins = [ + pkgs.nodePackages."@tailwindcss/aspect-ratio" + pkgs.nodePackages."@tailwindcss/forms" + pkgs.nodePackages."@tailwindcss/line-clamp" + pkgs.nodePackages."@tailwindcss/typography" + ]; + })) super.tailwind; + + emanote = addBuildDepend pkgs.stork super.emanote; + keid-render-basic = addBuildTool pkgs.glslang super.keid-render-basic; # ghcide-bench tests need network diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 8e0ca37c4a2a..84a307b58245 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -14281,8 +14281,8 @@ self: { ({ mkDerivation, base, doctest, hspec, process, time }: mkDerivation { pname = "Monadoro"; - version = "0.3.3.0"; - sha256 = "1zya572cc0gml4k9mm2g9z5bakjzz6ivigdc9fpv2bsrnc58a4y4"; + version = "0.3.5.0"; + sha256 = "1gj6s043241wcdx5wbc6jdihnlrcrdzxjr60g7i13k6himhbx739"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -19832,6 +19832,8 @@ self: { pname = "Spock-core"; version = "0.14.0.1"; sha256 = "0a93v9pxbvd9qqpx9rnv6gqpc5y8xh5dkfi0lkc566pj9cv8bpad"; + revision = "1"; + editedCabalFile = "1kxi4bigll1gn9rcp8x3h4waycihycvh6bhvfjzxdyzhm3ifq48a"; libraryHaskellDepends = [ aeson base base64-bytestring bytestring case-insensitive containers cookie hashable http-api-data http-types hvect mmorph monad-control @@ -48323,15 +48325,17 @@ self: { }) {}; "breakpoint" = callPackage - ({ mkDerivation, base, containers, ghc, haskeline, mtl, tasty - , tasty-hunit, transformers + ({ mkDerivation, ansi-terminal, base, containers, ghc, haskeline + , mtl, pretty-simple, tasty, tasty-hunit, template-haskell, text + , transformers }: mkDerivation { pname = "breakpoint"; - version = "0.1.0.0"; - sha256 = "11b2wbm8fm1zwz81hx1l3c559ad7y50d0838n94lkm1vsa39hpk7"; + version = "0.1.1.1"; + sha256 = "1hyfsn4wgiz2zzlihncq9lj18k7nzd4wq2z53xbnp1palspjqjp2"; libraryHaskellDepends = [ - base containers ghc haskeline mtl transformers + ansi-terminal base containers ghc haskeline mtl pretty-simple + template-haskell text transformers ]; testHaskellDepends = [ base containers tasty tasty-hunit ]; description = "Set breakpoints using a GHC plugin"; @@ -49615,8 +49619,8 @@ self: { pname = "bugzilla-redhat"; version = "1.0.0"; sha256 = "1g95j03y2sg1fwdf48a05nijqllkd0m7scn1wbfyzvb57q716hlx"; - revision = "3"; - editedCabalFile = "1f5mbfskr7h14ywg3v23x3r7d0k80z4ksflvqsbzkb2z3nqikj4a"; + revision = "5"; + editedCabalFile = "13fmsnvjgg2hh5hqr5mvyykafpf770lrwiq7g67i75w6594nippn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -50219,8 +50223,8 @@ self: { }: mkDerivation { pname = "by-other-names"; - version = "1.2.0.1"; - sha256 = "0lmk2nbj92kyi1h74v3f4k5zhf41zbnz8pari1rqxlf7a859c7k9"; + version = "1.2.1.0"; + sha256 = "1l6b47qxr8hidknl2r7gwp9civlz450z4nxyv98nfkh86bhsdnfm"; libraryHaskellDepends = [ aeson base indexed-traversable template-haskell text ]; @@ -51793,8 +51797,8 @@ self: { ({ mkDerivation, base, Cabal, QuickCheck }: mkDerivation { pname = "cabal-detailed-quickcheck"; - version = "0.1.3.2"; - sha256 = "0pxl8jf8ak9irln9vkkhb5mrbvq62c9p71gxhwzml1042gbl93x9"; + version = "0.2.0.1"; + sha256 = "0z82ira6g3mkqj9cw050s4m4nk2n5d4zx6gqlrcgszypd80h03f2"; libraryHaskellDepends = [ base Cabal QuickCheck ]; description = "QuickCheck for Cabal tests"; license = lib.licenses.mit; @@ -53811,22 +53815,23 @@ self: { broken = true; }) {}; - "call-alloy_0_4" = callPackage + "call-alloy_0_4_0_1" = callPackage ({ mkDerivation, async, base, bytestring, containers, directory - , extra, filepath, hspec, mtl, process, split, trifecta, unix + , extra, filepath, hspec, mtl, process, split, transformers + , trifecta, unix }: mkDerivation { pname = "call-alloy"; - version = "0.4"; - sha256 = "1af4a6inik3dcawn4lwlk01pyx6j5a1ly07qqf0ywkz2pv4ifgdc"; + version = "0.4.0.1"; + sha256 = "0xxrin8n2kk37jip5hacyn87sxhwz4bjk6crd90yw8f1sg8n354m"; enableSeparateDataOutput = true; libraryHaskellDepends = [ async base bytestring containers directory extra filepath mtl - process split trifecta unix + process split transformers trifecta unix ]; testHaskellDepends = [ async base bytestring containers directory extra filepath hspec mtl - process split trifecta unix + process split transformers trifecta unix ]; description = "A simple library to call Alloy given a specification"; license = lib.licenses.mit; @@ -56544,8 +56549,8 @@ self: { }: mkDerivation { pname = "cfn-flip"; - version = "0.1.0.2"; - sha256 = "16n45ik3g33fqfqry7l8pa0gcljymvw9wkg9n3qal8570q5k82ds"; + version = "0.1.0.3"; + sha256 = "18nfqbc0iw5zvg9krrm8wyi6x34qxf7arp4jzf1l8qabds5s5371"; libraryHaskellDepends = [ aeson base bytestring conduit libyaml text unliftio unliftio-core yaml @@ -58130,10 +58135,8 @@ self: { }: mkDerivation { pname = "chronos"; - version = "1.1.4"; - sha256 = "1v7h0qlckliid2zd3ff2l9l4xrdxacaw8my8bjj8grysj4vvyn5q"; - revision = "2"; - editedCabalFile = "0ixc0ng425lgsrj95zfnm2jazk19b8py845s3b02dfz7zid9q7n5"; + version = "1.1.5"; + sha256 = "0q81i9zwhsmik3j0zlgf61y48s4zhqs4d77ad4yxwvqqm8312gqi"; libraryHaskellDepends = [ aeson attoparsec base bytebuild byteslice bytesmith bytestring deepseq hashable natural-arithmetic primitive semigroups text @@ -61581,26 +61584,26 @@ self: { "co-log" = callPackage ({ mkDerivation, ansi-terminal, base, bytestring, chronos - , co-log-core, containers, contravariant, directory, filepath - , hedgehog, markdown-unlit, mtl, stm, text, transformers - , typerep-map, vector + , co-log-core, containers, contravariant, directory, doctest + , exceptions, filepath, Glob, hedgehog, markdown-unlit, mtl, text + , transformers, typerep-map, vector }: mkDerivation { pname = "co-log"; - version = "0.4.0.1"; - sha256 = "08sqrsy55wrfc5bg5sz22hah0ix14wrxn20lka17ri17a818w9p7"; + version = "0.5.0.0"; + sha256 = "1afzqh3kncmlxjdsw6v0pwb24mlfa492jdryn8pr00pskrmcr8mg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ ansi-terminal base bytestring chronos co-log-core containers - contravariant directory filepath mtl stm text transformers + contravariant directory exceptions filepath mtl text transformers typerep-map vector ]; executableHaskellDepends = [ base bytestring co-log-core mtl text typerep-map ]; executableToolDepends = [ markdown-unlit ]; - testHaskellDepends = [ base co-log-core hedgehog ]; + testHaskellDepends = [ base co-log-core doctest Glob hedgehog ]; description = "Composable Contravariant Comonadic Logging Library"; license = lib.licenses.mpl20; }) {}; @@ -61622,8 +61625,8 @@ self: { ({ mkDerivation, base, doctest, Glob }: mkDerivation { pname = "co-log-core"; - version = "0.3.1.0"; - sha256 = "1v0pccm2wmvlb21g8l47qmnl7839lj2rkf17bvrqj36xa7p0nwi9"; + version = "0.3.2.0"; + sha256 = "1r8yq4wan48mm37p32vsym44icdx4c5dyc5wkm5vz8f4l39yv59l"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base doctest Glob ]; description = "Composable Contravariant Comonadic Logging Library"; @@ -62391,10 +62394,8 @@ self: { }: mkDerivation { pname = "cointracking-imports"; - version = "0.1.0.1"; - sha256 = "19in8n8sigcbph29cgrbg1ccbxzadav1siryfjfc1g112p6mrf91"; - revision = "1"; - editedCabalFile = "1pcqkp1fvnwv5f4r88nva0dafgzfk2vixa5wh2q42991aj38a539"; + version = "0.1.0.2"; + sha256 = "1jf95fgzgqgr2xjbm5i0cwj1zx7zd44qpv3xqy91pk5kp33gwdjr"; libraryHaskellDepends = [ base base-compat-batteries bytestring cassava filepath lens scientific text time xlsx @@ -78471,8 +78472,8 @@ self: { }: mkDerivation { pname = "derive-storable-plugin"; - version = "0.2.3.5"; - sha256 = "16v61sm8vqx7wi02z68qjsvfv76g8kbag9cc8j8i0k8ixya1hddb"; + version = "0.2.3.6"; + sha256 = "1xx36h6xjpalf7xzina6yy155rhjq9iziv3gy7i3l163hcpf4l1q"; libraryHaskellDepends = [ base derive-storable ghc ghci ]; testHaskellDepends = [ base derive-storable ghc ghci hspec QuickCheck @@ -80778,18 +80779,17 @@ self: { }) {}; "dice" = callPackage - ({ mkDerivation, base, parsec, random-fu, transformers }: + ({ mkDerivation, base, mtl, parsec, random, random-fu }: mkDerivation { pname = "dice"; - version = "0.1.0.1"; - sha256 = "1jybckq3wf3vs0d92ji6a6mlgw64afhwdr6b0w2p1d97zp2fsdn3"; - revision = "1"; - editedCabalFile = "160n5nn39in0hz60hddwds1a2z8gwk3r1llzjaj2278phig3ap7k"; + version = "0.1.1"; + sha256 = "1y4184xicjwp29cyriq3qcr066167nwfy0720dmxjbgw795jxpsb"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ base parsec random-fu transformers ]; + libraryHaskellDepends = [ base mtl parsec random random-fu ]; + executableHaskellDepends = [ base mtl parsec random random-fu ]; description = "Simplistic D&D style dice-rolling system"; - license = lib.licenses.publicDomain; + license = lib.licenses.unlicense; mainProgram = "dice"; }) {}; @@ -83733,17 +83733,20 @@ self: { }) {}; "dns-patterns" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, HUnit + ({ mkDerivation, attoparsec, base, bytestring, criterion, HUnit , parser-combinators, text }: mkDerivation { pname = "dns-patterns"; - version = "0.2.2"; - sha256 = "02baslcbwf28lybqa5m5n05fsi182hpqzsrb4wfgj8gll0hm80n6"; + version = "0.2.3"; + sha256 = "0vs3qn4pdpk13imxp8pz106ra504jwx629h62vv9z5nnjwq81d6y"; libraryHaskellDepends = [ attoparsec base bytestring parser-combinators text ]; testHaskellDepends = [ attoparsec base bytestring HUnit text ]; + benchmarkHaskellDepends = [ + attoparsec base bytestring criterion text + ]; description = "DNS name parsing and pattern matching utilities"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -90446,6 +90449,60 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "emanote" = callPackage + ({ mkDerivation, aeson, aeson-extra, aeson-optics, async, base + , blaze-html, bytestring, commonmark, commonmark-extensions + , commonmark-pandoc, commonmark-simple, containers, data-default + , dependent-sum, directory, ema, filepath, filepattern, fsnotify + , hedgehog, heist-emanote, heist-extra, hspec, hspec-hedgehog + , ixset-typed, lvar, map-syntax, megaparsec, monad-logger + , monad-logger-extras, mtl, neat-interpolation, optics-core + , optics-th, optparse-applicative, pandoc, pandoc-link-context + , pandoc-types, parsec, path-tree, process-extras, profunctors + , relude, shower, some, stm, tagged, tagtree, tailwind, text, time + , tomland, unionmount, unliftio, unordered-containers, uri-encode + , url-slug, uuid, which, with-utf8, xmlhtml, yaml + }: + mkDerivation { + pname = "emanote"; + version = "0.8.0.0"; + sha256 = "0w26417vx76lzi6b84c48s462bmsy28ayn8gxi9cpgqifrmydz78"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson aeson-extra aeson-optics async base blaze-html bytestring + commonmark commonmark-extensions commonmark-pandoc + commonmark-simple containers data-default dependent-sum directory + ema filepath filepattern fsnotify hedgehog heist-emanote + heist-extra hspec hspec-hedgehog ixset-typed lvar map-syntax + megaparsec monad-logger monad-logger-extras mtl neat-interpolation + optics-core optics-th optparse-applicative pandoc + pandoc-link-context pandoc-types parsec path-tree process-extras + profunctors relude shower some stm tagged tagtree tailwind text + time tomland unionmount unliftio unordered-containers uri-encode + url-slug uuid which with-utf8 xmlhtml yaml + ]; + executableHaskellDepends = [ + aeson aeson-extra aeson-optics async base blaze-html bytestring + commonmark commonmark-extensions commonmark-pandoc + commonmark-simple containers data-default dependent-sum directory + ema filepath filepattern fsnotify hedgehog heist-emanote + heist-extra hspec hspec-hedgehog ixset-typed lvar map-syntax + megaparsec monad-logger monad-logger-extras mtl neat-interpolation + optics-core optics-th optparse-applicative pandoc + pandoc-link-context pandoc-types parsec path-tree process-extras + profunctors relude shower some stm tagged tagtree tailwind text + time tomland unionmount unliftio unordered-containers uri-encode + url-slug uuid which with-utf8 xmlhtml yaml + ]; + description = "Emanate a structured view of your plain-text notes"; + license = lib.licenses.agpl3Only; + badPlatforms = [ "x86_64-darwin" ]; + mainProgram = "emanote"; + maintainers = [ lib.maintainers.maralorn ]; + }) {}; + "embed-config" = callPackage ({ mkDerivation, aeson, base, bytestring, file-embed, hspec , template-haskell, yaml @@ -92195,6 +92252,33 @@ self: { broken = true; }) {}; + "ersatz_0_4_13" = callPackage + ({ mkDerivation, array, attoparsec, base, bytestring, containers + , data-default, fail, lens, mtl, parsec, process, semigroups + , streams, temporary, transformers, unordered-containers + }: + mkDerivation { + pname = "ersatz"; + version = "0.4.13"; + sha256 = "0ph2ayw4vb4rrgfmm8dhwr18172igx2sczjhv2vf3b6vd5r0z1hy"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + array attoparsec base bytestring containers data-default lens mtl + process semigroups streams temporary transformers + unordered-containers + ]; + executableHaskellDepends = [ + array base containers fail lens mtl parsec semigroups + ]; + testHaskellDepends = [ array base ]; + description = "A monad for expressing SAT or QSAT problems using observable sharing"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "ersatz-toysat" = callPackage ({ mkDerivation, array, base, containers, ersatz, toysolver , transformers @@ -96454,21 +96538,6 @@ self: { }) {}; "fastmemo" = callPackage - ({ mkDerivation, base, bytestring, QuickCheck, utf8-string, vector - }: - mkDerivation { - pname = "fastmemo"; - version = "0.1.0.1"; - sha256 = "1zb8nav58svds0c88rkrwdw5cjj2a8qlgx5rypqjrdv6w85s13vi"; - libraryHaskellDepends = [ base bytestring utf8-string vector ]; - testHaskellDepends = [ - base bytestring QuickCheck utf8-string vector - ]; - description = "Memoize functions on Generic types"; - license = lib.licenses.bsd3; - }) {}; - - "fastmemo_0_1_1" = callPackage ({ mkDerivation, base, bytestring, containers, QuickCheck , utf8-string, vector }: @@ -96484,7 +96553,6 @@ self: { ]; description = "Memoize functions on Generic types"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "fastparser" = callPackage @@ -105354,8 +105422,8 @@ self: { }: mkDerivation { pname = "futhark"; - version = "0.22.2"; - sha256 = "027w745vs121jsah29kqgw288s40ag25jszbf0sb2dh1xb30lvpw"; + version = "0.22.3"; + sha256 = "1si1hlax2vzaqcdprvgg8bcmk1xkwny5rb30fc3n8h0i0fpdmbic"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -107418,8 +107486,8 @@ self: { pname = "generic-monoid"; version = "0.1.0.1"; sha256 = "1pradfv1i2z73f3vxx78ahmfsdszcgi44kn29aww2hdgf2np5l6g"; - revision = "1"; - editedCabalFile = "17dfarnbv6si8rgajb3jqsbc4k1nxmvga2h1lhmpnq43n2fdkqkq"; + revision = "2"; + editedCabalFile = "0p3hk9c6qn5kbgi3a4my3rq5cc43wcl93hx6axgzi5wkvimpv653"; libraryHaskellDepends = [ base ]; description = "Derive monoid instances for product types"; license = lib.licenses.bsd3; @@ -109073,8 +109141,8 @@ self: { }: mkDerivation { pname = "gerrit"; - version = "0.1.5.1"; - sha256 = "1bj34cp9myz4rrbbwbh73b8wbmrgck81nsx88mi984pww1nd5fnb"; + version = "0.1.6.0"; + sha256 = "1fxbvi8a6vnry170ahphkpij5slfdwpd6hkypp069y5h1sh3k2kp"; libraryHaskellDepends = [ aeson aeson-casing base bytestring containers http-client http-client-openssl text time @@ -109729,6 +109797,27 @@ self: { mainProgram = "ghc-events"; }) {}; + "ghc-events_0_18_0" = callPackage + ({ mkDerivation, array, base, binary, bytestring, containers, text + , vector + }: + mkDerivation { + pname = "ghc-events"; + version = "0.18.0"; + sha256 = "0kwml9dgbj0px4bc3d9kqmw2ijc3y7irs4n02nzm7ilgcvy7hv6h"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + array base binary bytestring containers text vector + ]; + executableHaskellDepends = [ base bytestring containers ]; + testHaskellDepends = [ base ]; + description = "Library and tool for parsing .eventlog files from GHC"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "ghc-events"; + }) {}; + "ghc-events-analyze" = callPackage ({ mkDerivation, base, blaze-svg, bytestring, containers , diagrams-lib, diagrams-svg, filepath, ghc-events, hashable, lens @@ -109844,6 +109933,7 @@ self: { testHaskellDepends = [ base clock ]; description = "GHC garbage collection hook"; license = lib.licenses.bsd3; + badPlatforms = lib.platforms.darwin; }) {}; "ghc-gc-tune" = callPackage @@ -113435,8 +113525,8 @@ self: { }: mkDerivation { pname = "git-annex"; - version = "10.20221003"; - sha256 = "0nyhmwkzd8gyd9mvlnjyalfix32x5y4g89d5g36jp3jp1bkwg9i4"; + version = "10.20221103"; + sha256 = "0fwg74ldw2paq9dr052hqjz2x219zkkramvm8jskpnnnch9c6jgm"; configureFlags = [ "-fassistant" "-f-benchmark" "-fdbus" "-f-debuglocks" "-fmagicmime" "-fnetworkbsd" "-fpairing" "-fproduction" "-fs3" "-ftorrentparser" @@ -113949,26 +114039,6 @@ self: { }) {}; "githash" = callPackage - ({ mkDerivation, base, bytestring, directory, filepath, hspec - , process, template-haskell, temporary, th-compat, unliftio - }: - mkDerivation { - pname = "githash"; - version = "0.1.6.2"; - sha256 = "1vkwc7j71vdrxy01vlm6xfp16kam7m9bnj9y3h217fzhq5mjywhz"; - libraryHaskellDepends = [ - base bytestring directory filepath process template-haskell - th-compat - ]; - testHaskellDepends = [ - base bytestring directory filepath hspec process template-haskell - temporary th-compat unliftio - ]; - description = "Compile git revision info into Haskell projects"; - license = lib.licenses.bsd3; - }) {}; - - "githash_0_1_6_3" = callPackage ({ mkDerivation, base, bytestring, directory, filepath, hspec , process, template-haskell, temporary, th-compat, unliftio }: @@ -113986,7 +114056,6 @@ self: { ]; description = "Compile git revision info into Haskell projects"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "github" = callPackage @@ -118855,8 +118924,8 @@ self: { }: mkDerivation { pname = "gopro-plus"; - version = "0.6.5.2"; - sha256 = "0wxgwgsybc9vp4v4vx6064zh27kc3gn6rfclgpfavgvk3l9y5mrq"; + version = "0.6.6.0"; + sha256 = "1pc89l3kirw7d8bzzbsivnf2mcfd15bk3kl1x2f7i0fdgk06apzy"; libraryHaskellDepends = [ aeson base bytestring containers exceptions filepath generic-deriving generic-random lens lens-aeson monad-logger mtl @@ -120288,30 +120357,6 @@ self: { }) {}; "graphula" = callPackage - ({ mkDerivation, base, containers, directory, generic-arbitrary - , generics-eot, hspec, HUnit, markdown-unlit, monad-logger, mtl - , persistent, persistent-sqlite, QuickCheck, random, resourcet - , semigroups, temporary, text, transformers, unliftio - , unliftio-core - }: - mkDerivation { - pname = "graphula"; - version = "2.0.2.1"; - sha256 = "0kkjhfb9x3s0j6m0a68cblfkh70wg2vxrd1f998g20dlpx5rl27m"; - libraryHaskellDepends = [ - base containers directory generics-eot HUnit mtl persistent - QuickCheck random semigroups temporary text unliftio unliftio-core - ]; - testHaskellDepends = [ - base generic-arbitrary hspec markdown-unlit monad-logger persistent - persistent-sqlite QuickCheck resourcet transformers unliftio-core - ]; - testToolDepends = [ markdown-unlit ]; - description = "A simple interface for generating persistent data and linking its dependencies"; - license = lib.licenses.mit; - }) {}; - - "graphula_2_0_2_2" = callPackage ({ mkDerivation, base, containers, directory, generic-arbitrary , generics-eot, hspec, HUnit, markdown-unlit, monad-logger, mtl , persistent, persistent-sqlite, QuickCheck, random, resourcet @@ -120333,7 +120378,6 @@ self: { testToolDepends = [ markdown-unlit ]; description = "A simple interface for generating persistent data and linking its dependencies"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "graphula-core" = callPackage @@ -122298,18 +122342,24 @@ self: { }) {}; "h-raylib" = callPackage - ({ mkDerivation, base, c, libGL, libX11 }: + ({ mkDerivation, base, c, libGL, libX11, libXcursor, libXi + , libXinerama, libXrandr + }: mkDerivation { pname = "h-raylib"; - version = "4.5.0.1"; - sha256 = "1bb0g8gn08pp2s763d0ic7hj46whpb6xdq0hvpar26srxlkxnzjl"; + version = "4.5.0.2"; + sha256 = "0yxjr2y12fj2mhis8gy3wz0115nbiznx6llxapbylcw4zx9vnb8i"; libraryHaskellDepends = [ base ]; - librarySystemDepends = [ c libGL libX11 ]; + librarySystemDepends = [ + c libGL libX11 libXcursor libXi libXinerama libXrandr + ]; description = "Raylib bindings for Haskell"; license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; broken = true; - }) {c = null; inherit (pkgs) libGL; inherit (pkgs.xorg) libX11;}; + }) {c = null; inherit (pkgs) libGL; inherit (pkgs.xorg) libX11; + inherit (pkgs.xorg) libXcursor; inherit (pkgs.xorg) libXi; + inherit (pkgs.xorg) libXinerama; inherit (pkgs.xorg) libXrandr;}; "h-reversi" = callPackage ({ mkDerivation, base, blank-canvas, containers, hspec, QuickCheck @@ -124672,8 +124722,8 @@ self: { pname = "hakyll"; version = "4.15.1.1"; sha256 = "0b3bw275q1xbx8qs9a6gzzs3c9z3qdj7skqhpp09jkchi5kdvhvi"; - revision = "7"; - editedCabalFile = "0xgcrv98yxf7hjwq2ivg1lcipr3q5f5civp5r6kaq7ygnhggy2w9"; + revision = "8"; + editedCabalFile = "0mrgi1xjmvbjqasrchmjylp4gc63gw879flwl6r1v3nf9nv7ziwf"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -128747,28 +128797,6 @@ self: { }) {}; "haskell-gi" = callPackage - ({ mkDerivation, ansi-terminal, attoparsec, base, bytestring, Cabal - , cabal-doctest, containers, directory, doctest, filepath, glib - , gobject-introspection, haskell-gi-base, mtl, pretty-show, process - , regex-tdfa, safe, text, transformers, xdg-basedir, xml-conduit - }: - mkDerivation { - pname = "haskell-gi"; - version = "0.26.1"; - sha256 = "0272rsfhl9inrhkl0r2n5af327rk7dcy2fw77b196q8lvh2ym4c9"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ - ansi-terminal attoparsec base bytestring Cabal containers directory - filepath haskell-gi-base mtl pretty-show process regex-tdfa safe - text transformers xdg-basedir xml-conduit - ]; - libraryPkgconfigDepends = [ glib gobject-introspection ]; - testHaskellDepends = [ base doctest process ]; - description = "Generate Haskell bindings for GObject Introspection capable libraries"; - license = lib.licenses.lgpl21Only; - }) {inherit (pkgs) glib; inherit (pkgs) gobject-introspection;}; - - "haskell-gi_0_26_2" = callPackage ({ mkDerivation, ansi-terminal, attoparsec, base, bytestring, Cabal , cabal-doctest, containers, directory, doctest, filepath, glib , gobject-introspection, haskell-gi-base, mtl, pretty-show, process @@ -128788,22 +128816,9 @@ self: { testHaskellDepends = [ base doctest process ]; description = "Generate Haskell bindings for GObject Introspection capable libraries"; license = lib.licenses.lgpl21Only; - hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) glib; inherit (pkgs) gobject-introspection;}; "haskell-gi-base" = callPackage - ({ mkDerivation, base, bytestring, containers, glib, text }: - mkDerivation { - pname = "haskell-gi-base"; - version = "0.26.2"; - sha256 = "1jlc8hwpg2mbhmv6ra8b2dsf1wqsfn0hrphikrbgvbcls2wd6xw0"; - libraryHaskellDepends = [ base bytestring containers text ]; - libraryPkgconfigDepends = [ glib ]; - description = "Foundation for libraries generated by haskell-gi"; - license = lib.licenses.lgpl21Only; - }) {inherit (pkgs) glib;}; - - "haskell-gi-base_0_26_3" = callPackage ({ mkDerivation, base, bytestring, containers, glib, text }: mkDerivation { pname = "haskell-gi-base"; @@ -128813,7 +128828,6 @@ self: { libraryPkgconfigDepends = [ glib ]; description = "Foundation for libraries generated by haskell-gi"; license = lib.licenses.lgpl21Only; - hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) glib;}; "haskell-gi-overloading" = callPackage @@ -135811,8 +135825,6 @@ self: { ]; description = "An Haskell template system supporting both HTML5 and XML"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "heist-extra" = callPackage @@ -135829,7 +135841,6 @@ self: { ]; description = "Extra heist functionality"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "helf" = callPackage @@ -143780,8 +143791,8 @@ self: { }: mkDerivation { pname = "honeycomb"; - version = "0.0.0.3"; - sha256 = "0y1z9lcf7b1dzvp20flcq75jmh2jxx2dmynfw00dwsy6s2jabhx0"; + version = "0.1.0.0"; + sha256 = "04fv5zy7vyridxa8qkrawjp8sjhdzd57cyxm2gi4r7gv1q4pwlmc"; libraryHaskellDepends = [ aeson async auto-update base bytestring chronos http-client http-client-tls http-conduit http-types microlens mmorph @@ -146810,8 +146821,8 @@ self: { }: mkDerivation { pname = "hs-opentelemetry-exporter-otlp"; - version = "0.0.1.3"; - sha256 = "0ci1c6820cq2xml5fdj04a49r78ymw0s7pdlyhkg7a0ccrxi3722"; + version = "0.0.1.4"; + sha256 = "08xjpv451mfx4gfahp6w8m49da9mzvcj59g9fq6p0k85fl9ybva2"; libraryHaskellDepends = [ base bytestring case-insensitive clock hs-opentelemetry-api hs-opentelemetry-otlp http-client http-conduit http-types microlens @@ -147019,8 +147030,8 @@ self: { }: mkDerivation { pname = "hs-opentelemetry-sdk"; - version = "0.0.3.3"; - sha256 = "1721786554sb0jwa8mmkcrlwci1i49mgwpaxa8xaiilw6nddmc8a"; + version = "0.0.3.4"; + sha256 = "1niyachyzj1742y8p89p2n088vs6pwplh1swjwcnri7545ldch70"; libraryHaskellDepends = [ async base bytestring hs-opentelemetry-api hs-opentelemetry-exporter-otlp hs-opentelemetry-propagator-w3c @@ -154914,8 +154925,8 @@ self: { }: mkDerivation { pname = "hurl"; - version = "2.2.0.0"; - sha256 = "1dpmy6j8alg55x5s6rapc3cbmf2v23dwbx1hv3k6jsxz2zp3w7gp"; + version = "2.3.0.0"; + sha256 = "1kmgakji3mp3d1i1jm6w5yh412ajd42klikcz0q8f4q75zprmb6i"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -156042,10 +156053,8 @@ self: { }: mkDerivation { pname = "hw-prim"; - version = "0.6.3.1"; - sha256 = "1b3qk0w8jivbhpkxkp4b1spj1nvfjjf2k6a0ba9agjp9kjmwddni"; - revision = "3"; - editedCabalFile = "0ik3y030s6izrgvsvk7llgy8z5wkvgapii1zcrdsw25m1cqjpaz1"; + version = "0.6.3.2"; + sha256 = "07a442g1fjzrfnz3y9mx3d2hv0ffjnbfdkmbiard8bn78vf5z80z"; libraryHaskellDepends = [ base bytestring deepseq ghc-prim mmap transformers unliftio-core vector @@ -159455,6 +159464,8 @@ self: { ]; description = "Execute arbitrary actions for each item from RSS/Atom feeds"; license = lib.licenses.cc0; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "immortal_0_2_2_1" = callPackage @@ -167956,8 +167967,8 @@ self: { }: mkDerivation { pname = "juicy-gcode"; - version = "0.2.0.1"; - sha256 = "1jpdxxfg3wdj9kz41a1pklyshrxxakf2bahcc7y1l7p7jklb3lbi"; + version = "0.2.0.2"; + sha256 = "1kr59d21825mrfr9370f4z717gf45rcdp8jw7xw3d4mp7ba6r66b"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -170997,6 +171008,39 @@ self: { broken = true; }) {}; + "krank_0_3_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, hspec + , hspec-expectations, http-client, http-types, lifted-async, mtl + , optparse-applicative, pcre-heavy, pretty-terminal, process, PyF + , req, safe-exceptions, text, unordered-containers + }: + mkDerivation { + pname = "krank"; + version = "0.3.0"; + sha256 = "01ncfknvm4mndzam3q9m15p51cz8cwjds12zc74rl1p49rdp5pis"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring containers http-client http-types + lifted-async mtl pcre-heavy pretty-terminal PyF req safe-exceptions + text unordered-containers + ]; + executableHaskellDepends = [ + base containers mtl optparse-applicative pcre-heavy pretty-terminal + process PyF text + ]; + testHaskellDepends = [ + aeson base bytestring containers hspec hspec-expectations + http-client http-types lifted-async mtl pcre-heavy pretty-terminal + PyF req safe-exceptions text unordered-containers + ]; + description = "Krank checks issue tracker link status in your source code"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "krank"; + broken = true; + }) {}; + "krapsh" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, base16-bytestring , binary, bytestring, containers, cryptohash-sha256, deepseq @@ -173819,16 +173863,15 @@ self: { }) {}; "language-sygus" = callPackage - ({ mkDerivation, array, base, deepseq, hashable, tasty, tasty-hunit - , text + ({ mkDerivation, alex, array, base, deepseq, happy, hashable, tasty + , tasty-hunit, text }: mkDerivation { pname = "language-sygus"; - version = "0.1.1.2"; - sha256 = "1vgd45bd866mm2w80hg8q11iz8g9ifz5ccm0sh13xrnpvfvdv862"; - revision = "3"; - editedCabalFile = "0rnvxvyiw765vmnbmix4g5v3wqp9ba3xd8llm1ajdm01rvhk4324"; + version = "0.1.1.3"; + sha256 = "15xxagcsqjchng2nr1qg6ncqch5l74m62iv58pgkcqhzqqhf3fwg"; libraryHaskellDepends = [ array base hashable text ]; + libraryToolDepends = [ alex happy ]; testHaskellDepends = [ base deepseq tasty tasty-hunit text ]; description = "A parser and printer for the SyGuS 2.0 language."; license = lib.licenses.bsd3; @@ -185954,8 +185997,8 @@ self: { ({ mkDerivation, base, tidal }: mkDerivation { pname = "maquinitas-tidal"; - version = "0.2.5"; - sha256 = "1jqa471r7r3my32lrjcrfc35259kj7afp1jgj8jr3r62dd8ckq63"; + version = "0.2.10"; + sha256 = "1p1n21hzmkk7czwnmyl4hm36jvn0m05wid3zdwiqhbxq3mw46sxa"; libraryHaskellDepends = [ base tidal ]; description = "library for MIDI control of hardware"; license = lib.licenses.mit; @@ -192285,8 +192328,8 @@ self: { }: mkDerivation { pname = "modern-uri"; - version = "0.3.5.0"; - sha256 = "09pxr1im78fg8024my34qhcj25w3hjq585l3k5qxl81dcypkjhdb"; + version = "0.3.6.0"; + sha256 = "1lj3il9wg7v88l1hj08k07g3f76xas0gz20l2wy8z6xbpcn5ng6g"; libraryHaskellDepends = [ base bytestring containers contravariant deepseq exceptions hashable megaparsec mtl profunctors QuickCheck reflection tagged @@ -194378,38 +194421,6 @@ self: { }) {}; "mongoDB" = callPackage - ({ mkDerivation, array, base, base16-bytestring, base64-bytestring - , binary, bson, bytestring, conduit, conduit-extra, containers - , criterion, cryptohash, data-default-class, dns, fail, hashtables - , hspec, http-types, lifted-base, monad-control, mtl, network - , nonce, old-locale, parsec, pureMD5, random, random-shuffle - , resourcet, stm, tagged, text, time, tls, transformers - , transformers-base - }: - mkDerivation { - pname = "mongoDB"; - version = "2.7.1.1"; - sha256 = "186ck64vk4s9jligj6mq3qbpm1mb87m7zs8p3jbizpv0fcgnwq70"; - libraryHaskellDepends = [ - array base base16-bytestring base64-bytestring binary bson - bytestring conduit conduit-extra containers cryptohash - data-default-class dns fail hashtables http-types lifted-base - monad-control mtl network nonce parsec pureMD5 random - random-shuffle resourcet stm tagged text time tls transformers - transformers-base - ]; - testHaskellDepends = [ base hspec mtl old-locale text time ]; - benchmarkHaskellDepends = [ - array base base16-bytestring base64-bytestring binary bson - bytestring containers criterion cryptohash data-default-class dns - fail hashtables http-types lifted-base monad-control mtl network - nonce parsec random random-shuffle stm text tls transformers-base - ]; - description = "Driver (client) for MongoDB, a free, scalable, fast, document DBMS"; - license = lib.licenses.asl20; - }) {}; - - "mongoDB_2_7_1_2" = callPackage ({ mkDerivation, array, base, base16-bytestring, base64-bytestring , binary, bson, bytestring, conduit, conduit-extra, containers , criterion, cryptohash, data-default-class, dns, fail, hashtables @@ -194439,7 +194450,6 @@ self: { ]; description = "Driver (client) for MongoDB, a free, scalable, fast, document DBMS"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; }) {}; "mongodb-queue" = callPackage @@ -195438,8 +195448,8 @@ self: { }: mkDerivation { pname = "morpheus-graphql"; - version = "0.24.3"; - sha256 = "0z1kxwkflwzn6xqv8a046biv16a4fq8sxma7n4hbby7zqmzbwpj5"; + version = "0.25.0"; + sha256 = "08vi8g73c55ky6qrgkq57h1zbpkavv0ajfd16i86s6zdaxpk3fhm"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring containers morpheus-graphql-app @@ -195468,8 +195478,8 @@ self: { }: mkDerivation { pname = "morpheus-graphql-app"; - version = "0.24.3"; - sha256 = "1hm4v3x6p718zjgk4svfslvqm6nca5kg30rhh2ax63gkfvp1i2xr"; + version = "0.25.0"; + sha256 = "09skrg2pasx3hdm13sq9ajka5yh5wsc1wc8rphc9g6pa7hpnnsxh"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring containers hashable megaparsec @@ -195519,8 +195529,8 @@ self: { }: mkDerivation { pname = "morpheus-graphql-client"; - version = "0.24.3"; - sha256 = "1xfwah79w0akg0fhz7xkhwmik5bfz4c9kwbscxf08w99669k1lwd"; + version = "0.25.0"; + sha256 = "01brdkc2vqipif5942hrzli45agb7rk8wlhx2m1j9zhcxhsbhlwf"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring containers file-embed modern-uri @@ -195550,8 +195560,8 @@ self: { }: mkDerivation { pname = "morpheus-graphql-code-gen"; - version = "0.24.3"; - sha256 = "040grsj1q9b2jy5y7pxy2islfaa6jd0winkg2dvzg1dwwh74rayc"; + version = "0.25.0"; + sha256 = "0hisqds2fn7m53hddvxw4glgwghqnx3qg0hhdc6c4zjafyfkbckf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -195580,8 +195590,8 @@ self: { }: mkDerivation { pname = "morpheus-graphql-code-gen-utils"; - version = "0.24.3"; - sha256 = "1ss36qkf47zgwwivi70bjq5l5mkqin5181yc7dxg865sgdm9jc5z"; + version = "0.25.0"; + sha256 = "1xnszpmzw0jl9dshzqs5vr9kjnm9sbi0jbgpjb44s9bd4hdgyxq5"; libraryHaskellDepends = [ base bytestring containers morpheus-graphql-core prettyprinter relude template-haskell text unordered-containers @@ -195599,8 +195609,8 @@ self: { }: mkDerivation { pname = "morpheus-graphql-core"; - version = "0.24.3"; - sha256 = "0nh7nvdgqj95g1fafisjg9dxfk2hd9x0mb7da6lwcrsyb005iald"; + version = "0.25.0"; + sha256 = "07ay9vzhlxgsv9lw3b22c59r00b6f0w2c90qn14a349lkjhl1wfa"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring containers hashable megaparsec mtl relude @@ -195628,8 +195638,8 @@ self: { }: mkDerivation { pname = "morpheus-graphql-server"; - version = "0.24.3"; - sha256 = "1xiy43pxmgh5kh2c1vk6g7ay0kinh7rx5xb1lrjw5wkl9sw2l7dg"; + version = "0.25.0"; + sha256 = "02lhrvz00l2486n7nihs8ka92hxa3idzlzx10fn142kqli65bwwi"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring containers morpheus-graphql-app @@ -195654,8 +195664,8 @@ self: { }: mkDerivation { pname = "morpheus-graphql-subscriptions"; - version = "0.24.3"; - sha256 = "1cky0br7nkpnjgk0j0qxfz4gd7z14badhpll51yakysxz8y5clsf"; + version = "0.25.0"; + sha256 = "063gszwrjlszqg973axyig9alrix0fj7j4n2c01wdaxyjmxmzdjx"; libraryHaskellDepends = [ aeson base bytestring morpheus-graphql-app morpheus-graphql-core mtl relude text transformers unliftio-core unordered-containers @@ -195682,14 +195692,14 @@ self: { license = lib.licenses.mit; }) {}; - "morpheus-graphql-tests_0_24_3" = callPackage + "morpheus-graphql-tests_0_25_0" = callPackage ({ mkDerivation, aeson, base, bytestring, directory, relude, tasty , tasty-hunit, text, unordered-containers }: mkDerivation { pname = "morpheus-graphql-tests"; - version = "0.24.3"; - sha256 = "0kgzwjg0jr44rfa2pz9k80pvj22spj2qmp6l31fyy54bi89z98vh"; + version = "0.25.0"; + sha256 = "1gnysygk4rvcyv85f86yhcxl0rlq5hk5avanyv428fdirsjkkn5q"; libraryHaskellDepends = [ aeson base bytestring directory relude tasty tasty-hunit text unordered-containers @@ -196929,14 +196939,14 @@ self: { broken = true; }) {}; - "mtl_2_2_2" = callPackage + "mtl_2_3_1" = callPackage ({ mkDerivation, base, transformers }: mkDerivation { pname = "mtl"; - version = "2.2.2"; - sha256 = "1xmy5741h8cyy0d91ahvqdz2hykkk20l8br7lg1rccnkis5g80w8"; + version = "2.3.1"; + sha256 = "19ywdksxkv4gfbf05xgpjbnnxd81mgxjnyl2h2vlqapyc35z2y11"; libraryHaskellDepends = [ base transformers ]; - description = "Monad classes, using functional dependencies"; + description = "Monad classes for transformers, using functional dependencies"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; }) {}; @@ -199457,6 +199467,27 @@ self: { license = lib.licenses.bsd3; }) {}; + "mysql-simple_0_4_9" = callPackage + ({ mkDerivation, attoparsec, base, base16-bytestring, blaze-builder + , bytestring, containers, hspec, mysql, old-locale, pcre-light + , text, time, vector + }: + mkDerivation { + pname = "mysql-simple"; + version = "0.4.9"; + sha256 = "0hwv1hlr65m5l2zrrj5zmvrjz9y2814jy05l17l5jb4j4j5xw3z2"; + libraryHaskellDepends = [ + attoparsec base base16-bytestring blaze-builder bytestring + containers mysql old-locale pcre-light text time vector + ]; + testHaskellDepends = [ + base blaze-builder bytestring hspec mysql text time + ]; + description = "A mid-level MySQL client library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "mysql-simple-quasi" = callPackage ({ mkDerivation, base, haskell-src-meta, mysql-simple , template-haskell @@ -210724,6 +210755,18 @@ self: { license = lib.licenses.bsd3; }) {}; + "ordered-containers_0_2_3" = callPackage + ({ mkDerivation, base, containers }: + mkDerivation { + pname = "ordered-containers"; + version = "0.2.3"; + sha256 = "18w1dasny6xffbjlvmz9861l2xbkqlg2w5qxz9kw6frgfl2rg11n"; + libraryHaskellDepends = [ base containers ]; + description = "Set- and Map-like types that remember the order elements were inserted"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "ordering-util" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -212897,7 +212940,7 @@ self: { mainProgram = "pandoc-plot"; }) {}; - "pandoc-plot_1_5_4" = callPackage + "pandoc-plot_1_5_5" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, criterion , data-default, directory, filepath, gitrev, hashable , hspec-expectations, lifted-async, lifted-base, mtl @@ -212907,8 +212950,8 @@ self: { }: mkDerivation { pname = "pandoc-plot"; - version = "1.5.4"; - sha256 = "1bmnzl5aqqhfrl7gk0083xkrckl11yhmvf2lf1w1jg4hcfknj6a8"; + version = "1.5.5"; + sha256 = "1gcs6sh8fhlmaiha5wn60z2s5an7gnawgkyzlalf8grwnjqkm77h"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -215447,9 +215490,7 @@ self: { ]; description = "Terminal-based presentations using Pandoc"; license = lib.licenses.gpl2Only; - hydraPlatforms = lib.platforms.none; mainProgram = "patat"; - broken = true; }) {}; "patch" = callPackage @@ -218086,6 +218127,35 @@ self: { license = lib.licenses.bsd3; }) {}; + "persistent-mtl_0_5_0_0" = callPackage + ({ mkDerivation, base, bytestring, conduit, containers, esqueleto + , exceptions, explainable-predicates, monad-logger, mtl, persistent + , persistent-postgresql, persistent-sqlite, persistent-template + , resource-pool, resourcet, tasty, tasty-autocollect, tasty-golden + , tasty-hunit, text, transformers, unliftio, unliftio-core + , unliftio-pool + }: + mkDerivation { + pname = "persistent-mtl"; + version = "0.5.0.0"; + sha256 = "1xmn2zch7zxmjixlyjavl6wwdf0cjqzp01fp7xiy339wfd5higp2"; + libraryHaskellDepends = [ + base conduit containers exceptions monad-logger mtl persistent + resource-pool resourcet text transformers unliftio unliftio-core + unliftio-pool + ]; + testHaskellDepends = [ + base bytestring conduit containers esqueleto explainable-predicates + monad-logger persistent persistent-postgresql persistent-sqlite + persistent-template resource-pool resourcet tasty tasty-autocollect + tasty-golden tasty-hunit text unliftio + ]; + testToolDepends = [ tasty-autocollect ]; + description = "Monad transformer for the persistent API"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "persistent-mysql" = callPackage ({ mkDerivation, aeson, base, blaze-builder, bytestring, conduit , containers, fast-logger, hspec, http-api-data, HUnit @@ -218742,10 +218812,8 @@ self: { }: mkDerivation { pname = "pg-entity"; - version = "0.0.2.0"; - sha256 = "0g8ici9l5lm4a900nyi90xvbjgy4z3zds46nn8sdw8ipnj0hkk1v"; - revision = "1"; - editedCabalFile = "03f0isq7vdjc1xbdchb5l0ggbf61jkxn2q1bii6sx8nphfgk4c9j"; + version = "0.0.3.0"; + sha256 = "047pccw7rkjscn2l209z15ddkbkwk88j948zgijzrm63ykrl114j"; libraryHaskellDepends = [ base bytestring colourista exceptions monad-control parsec pg-transact postgresql-simple resource-pool safe-exceptions @@ -224022,6 +224090,8 @@ self: { ]; description = "Colog adapters for Polysemy.Log"; license = "BSD-2-Clause-Patent"; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "polysemy-log-di" = callPackage @@ -226162,10 +226232,8 @@ self: { }: mkDerivation { pname = "postgresql-simple"; - version = "0.6.4"; - sha256 = "0rz2bklxp4pvbxb2w49h5p6pbwabn6d5d4j4mrya4fpa0d13k43d"; - revision = "8"; - editedCabalFile = "1qavb3qs1g307pc19k9y3yvqp0c1srwsplijvayn9ldp0bxdy6q8"; + version = "0.6.5"; + sha256 = "15jy8lp9200whyxk421yw3m671cjz41cnv2j8wll1giblyr3m9gx"; libraryHaskellDepends = [ aeson attoparsec base bytestring bytestring-builder case-insensitive containers hashable Only postgresql-libpq @@ -226275,8 +226343,8 @@ self: { }: mkDerivation { pname = "postgresql-simple-named"; - version = "0.0.3.0"; - sha256 = "19jyr3ai75hcks342yxrqsb1mklr6rjrzczs3al9666rll8silw9"; + version = "0.0.4.0"; + sha256 = "05xzvfy4j1r0zd2g3hgfk4a772vr02g8c3zd1vh6yqh71pvg5zwr"; libraryHaskellDepends = [ base bytestring mtl postgresql-simple text ]; @@ -227079,14 +227147,14 @@ self: { }) {}; "pqueue" = callPackage - ({ mkDerivation, base, deepseq, random, tasty, tasty-bench - , tasty-quickcheck + ({ mkDerivation, base, deepseq, indexed-traversable, random, tasty + , tasty-bench, tasty-quickcheck }: mkDerivation { pname = "pqueue"; - version = "1.4.2.0"; - sha256 = "1b7a0gf00aaw02vz21s7g7mni3dlx34cvl88dgm96a9jrm1djqrw"; - libraryHaskellDepends = [ base deepseq ]; + version = "1.4.3.0"; + sha256 = "0kl608jw0xz0n4ysw7p3cvlm1s71xrysw8862cddrzbr38bv8jvq"; + libraryHaskellDepends = [ base deepseq indexed-traversable ]; testHaskellDepends = [ base deepseq tasty tasty-quickcheck ]; benchmarkHaskellDepends = [ base deepseq random tasty-bench ]; description = "Reliable, persistent, fast priority queues"; @@ -232254,17 +232322,17 @@ self: { "purenix" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, directory , filepath, microlens-platform, mtl, pretty-simple, purescript - , purescript-cst, text + , text }: mkDerivation { pname = "purenix"; - version = "1.0"; - sha256 = "0h6g8x9c0k2hy8jyfafdhg7lq4s5r7zfhi542mkzjqpzf7cqrxwn"; + version = "1.1"; + sha256 = "1z6kanz6i3a9nqpmymh6192g9qbpc759ixipnpqa9w1ph7aa8rv0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base bytestring containers directory filepath - microlens-platform mtl pretty-simple purescript purescript-cst text + microlens-platform mtl pretty-simple purescript text ]; executableHaskellDepends = [ base ]; description = "Nix backend for PureScript. Transpile PureScript code to Nix."; @@ -237918,6 +237986,8 @@ self: { pname = "readable"; version = "0.3.1"; sha256 = "1ja39cg26wy2fs00gi12x7iq5k8i366pbqi3p916skfa5jnkfc3h"; + revision = "1"; + editedCabalFile = "0dywlvxjszqa1dj5r1cva0viv2l1hm8mw75zddnf96pfpd00fmga"; libraryHaskellDepends = [ base bytestring text ]; description = "Reading from Text and ByteString"; license = lib.licenses.bsd3; @@ -247016,8 +247086,8 @@ self: { }: mkDerivation { pname = "rpmbuild-order"; - version = "0.4.9"; - sha256 = "1fclj2g340030y26mvlzkg9x1br1dmz1y8g5gjh3ngwjwlpy8k1q"; + version = "0.4.10"; + sha256 = "1dgl7zh8r5i8k21bgykgi30d9jbgcf9k4nnx3nyc1a594xpijab0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -247025,9 +247095,11 @@ self: { simple-cmd ]; executableHaskellDepends = [ - base directory extra fgl optparse-applicative simple-cmd-args + base extra fgl optparse-applicative simple-cmd-args + ]; + testHaskellDepends = [ + base directory extra hspec simple-cmd unix ]; - testHaskellDepends = [ base extra hspec simple-cmd unix ]; description = "Sort RPM packages in dependency order"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -249578,7 +249650,7 @@ self: { license = lib.licenses.mit; }) {}; - "sbp_4_8_0" = callPackage + "sbp_4_9_0" = callPackage ({ mkDerivation, aeson, aeson-pretty, array, base , base64-bytestring, basic-prelude, binary, binary-conduit , bytestring, cmdargs, conduit, conduit-extra, data-binary-ieee754 @@ -249587,8 +249659,8 @@ self: { }: mkDerivation { pname = "sbp"; - version = "4.8.0"; - sha256 = "11089yi2bj495h515la8bf9pwrsgbaffnx60kw2d6zk2xc312pic"; + version = "4.9.0"; + sha256 = "14p0a23kmn9z9l8rm9q94zgyx5p0wnjrgf51shk2magjg055llkb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -249945,22 +250017,6 @@ self: { }) {}; "scalpel" = callPackage - ({ mkDerivation, base, bytestring, case-insensitive, data-default - , http-client, http-client-tls, scalpel-core, tagsoup, text - }: - mkDerivation { - pname = "scalpel"; - version = "0.6.2"; - sha256 = "04hhvk0yjxha3yg6n9fxivrz97hpjjiiblnj0bvs5myax1ggkjch"; - libraryHaskellDepends = [ - base bytestring case-insensitive data-default http-client - http-client-tls scalpel-core tagsoup text - ]; - description = "A high level web scraping library for Haskell"; - license = lib.licenses.asl20; - }) {}; - - "scalpel_0_6_2_1" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, data-default , http-client, http-client-tls, scalpel-core, tagsoup, text }: @@ -249974,31 +250030,9 @@ self: { ]; description = "A high level web scraping library for Haskell"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; }) {}; "scalpel-core" = callPackage - ({ mkDerivation, base, bytestring, containers, criterion - , data-default, fail, HUnit, mtl, pointedlist, regex-base - , regex-tdfa, tagsoup, text, transformers, vector - }: - mkDerivation { - pname = "scalpel-core"; - version = "0.6.2"; - sha256 = "07mjff8aqwabx8yhq8bd7jpnarkkrjqss8h8s2wkfmfj808fllmf"; - revision = "1"; - editedCabalFile = "1dn9ffblmfrr5ly3v1kbcmzc3z6m4x4p5mym8pfwc9p1vfxqbvz7"; - libraryHaskellDepends = [ - base bytestring containers data-default fail mtl pointedlist - regex-base regex-tdfa tagsoup text transformers vector - ]; - testHaskellDepends = [ base HUnit regex-base regex-tdfa tagsoup ]; - benchmarkHaskellDepends = [ base criterion tagsoup text ]; - description = "A high level web scraping library for Haskell"; - license = lib.licenses.asl20; - }) {}; - - "scalpel-core_0_6_2_1" = callPackage ({ mkDerivation, base, bytestring, containers, criterion , data-default, fail, HUnit, mtl, pointedlist, regex-base , regex-tdfa, tagsoup, text, transformers, vector @@ -250015,7 +250049,6 @@ self: { benchmarkHaskellDepends = [ base criterion tagsoup text ]; description = "A high level web scraping library for Haskell"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; }) {}; "scalpel-search" = callPackage @@ -253713,10 +253746,8 @@ self: { }: mkDerivation { pname = "servant"; - version = "0.19"; - sha256 = "1rahn436vc3xajn563ni25jqkg87fvhqkpswan1xy6qsfr0ikdjb"; - revision = "5"; - editedCabalFile = "0hn8qkvzazjncnawzzx7l0kdhzj35fy1387b00znirz6kx9w5vqp"; + version = "0.19.1"; + sha256 = "1gk6j39rcjpjacs351lknhrwj86yr4ifyp3qwlmiig27dxqlig3q"; libraryHaskellDepends = [ aeson attoparsec base base-compat bifunctors bytestring case-insensitive constraints deepseq http-api-data http-media @@ -253788,8 +253819,8 @@ self: { pname = "servant-auth"; version = "0.4.1.0"; sha256 = "08ggnlknhzdpf49zjm1qpzm12gckss7yr8chmzm6h6ycigz77ndd"; - revision = "3"; - editedCabalFile = "1gqg8hkq9gym3sd8xy2zij8lwrbiaqccdjkr6dyxqnnb71qm54bw"; + revision = "4"; + editedCabalFile = "0qgaq8if56fh1ydx8crb24p5cb5axx3n1lnx8klvvkamwrbr870a"; libraryHaskellDepends = [ aeson base containers jose lens servant text unordered-containers ]; @@ -253929,8 +253960,8 @@ self: { pname = "servant-auth-server"; version = "0.4.7.0"; sha256 = "1m145xxqg1xy7i1br9yfh3avwkb30zh808nr658ljl7j2imlknj2"; - revision = "3"; - editedCabalFile = "0niwlkkcv9q4zqh14lv5iq04qhw45xz2p2hhb56gva7cm6yhjgas"; + revision = "4"; + editedCabalFile = "1qcgm2pqi5qjqk27632h69j8ishls6cby8gghvww73wi63fqii9n"; libraryHaskellDepends = [ aeson base base64-bytestring blaze-builder bytestring case-insensitive cookie data-default-class entropy http-types jose @@ -253955,8 +253986,8 @@ self: { pname = "servant-auth-swagger"; version = "0.2.10.1"; sha256 = "029nvb4wxwl98ah26bgcq1b7izrnvssxwn1682liimvsh4a8bady"; - revision = "7"; - editedCabalFile = "0qkcjp621a8vysswm5hn5zgmqgmmm9pcs7aiyax7wij25yjmv3p6"; + revision = "8"; + editedCabalFile = "19hp58cf3avq3jnzhspsxkb7vml8ch3cw7dq8qy59xp1wgci6v5m"; libraryHaskellDepends = [ base lens servant servant-auth servant-swagger swagger2 text ]; @@ -254476,8 +254507,8 @@ self: { pname = "servant-docs"; version = "0.12"; sha256 = "0531jldq35sl1qlna0s1n8bakbsplg15611305dk48z80vcpa933"; - revision = "2"; - editedCabalFile = "0spgsfl1bx11yq7wivjrj3p5axszqya0pnmpcg2x5r6vm40qkzbk"; + revision = "3"; + editedCabalFile = "1brli8m3gvfji9b88xww5aifl1gq9lxacn3nhxbwndlnwznx7anz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -254724,8 +254755,8 @@ self: { pname = "servant-foreign"; version = "0.15.4"; sha256 = "0bznb73rbgfgkg7n4pxghkqsfca0yw9vak73c6w8sqvc2mjnc7mz"; - revision = "4"; - editedCabalFile = "1c37ks36xba26br81bbdvb9qphzsrnngrd7nb6dv194z1p51n2xs"; + revision = "5"; + editedCabalFile = "1qjj2v95k800j9w8drc4fjcbazzdh2f7dl7s99g9r48dg9dk5cfz"; libraryHaskellDepends = [ base base-compat http-types lens servant text ]; @@ -254918,8 +254949,8 @@ self: { pname = "servant-http-streams"; version = "0.18.4"; sha256 = "15f24rcgz839cb38q4gs1liqrdyqjbazcqzjdxmv4307x072pv3a"; - revision = "4"; - editedCabalFile = "1f4iki0sxxszdf7sm02gk823w08z5laimym6rrsrsff56aviz1ll"; + revision = "5"; + editedCabalFile = "1v3lgfsn8611hnvf34l79mrp77ag40xyw2r26bbq6d7hbg2l2jn5"; libraryHaskellDepends = [ base base-compat bytestring case-insensitive containers deepseq exceptions http-common http-media http-streams http-types @@ -255900,10 +255931,8 @@ self: { }: mkDerivation { pname = "servant-server"; - version = "0.19.1"; - sha256 = "1g88vdwacwli79y5idqlrbhl2k9r463h560f2lk5abhqsmsm9bhd"; - revision = "3"; - editedCabalFile = "16jqzkrf9r7lz7y48dnl4v8s4hfn7hmfsmfbj7d96h53r2v4pz5g"; + version = "0.19.2"; + sha256 = "1a7msh8p59v5mgsnj5li9s3jg0jwq2zjsznr0cg7g0fncn7r1axy"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -256399,24 +256428,25 @@ self: { }) {}; "servant-util" = callPackage - ({ mkDerivation, aeson, base, constraints, containers, data-default - , fmt, hspec, hspec-discover, hspec-expectations, http-client - , http-types, insert-ordered-containers, lens, megaparsec, mtl - , openapi3, pretty-terminal, QuickCheck, reflection, regex-posix - , safe-exceptions, servant, servant-client, servant-client-core - , servant-openapi3, servant-server, servant-swagger - , servant-swagger-ui, servant-swagger-ui-core, swagger2, text - , text-format, time, universum, wai, wai-extra, warp + ({ mkDerivation, aeson, base, bytestring, constraints, containers + , data-default, fmt, hspec, hspec-discover, hspec-expectations + , http-client, http-types, insert-ordered-containers, lens + , megaparsec, mtl, openapi3, pretty-terminal, QuickCheck + , reflection, regex-posix, safe-exceptions, servant, servant-client + , servant-client-core, servant-openapi3, servant-server + , servant-swagger, servant-swagger-ui, servant-swagger-ui-core + , swagger2, text, text-format, time, universum, wai, wai-extra + , warp }: mkDerivation { pname = "servant-util"; - version = "0.3"; - sha256 = "1zhx8j7w5c41z6kgs2pdpv3ig8mvra5zq14kycpbznqpjcy21fma"; + version = "0.4"; + sha256 = "18v6x32kg3s6biyi6ixyg8xaks3hwvfz712gakrbyblgzk9w9zd7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base constraints containers data-default fmt http-types - insert-ordered-containers lens megaparsec mtl openapi3 + aeson base bytestring constraints containers data-default fmt + http-types insert-ordered-containers lens megaparsec mtl openapi3 pretty-terminal QuickCheck reflection regex-posix safe-exceptions servant servant-client servant-client-core servant-openapi3 servant-server servant-swagger servant-swagger-ui @@ -256424,8 +256454,8 @@ self: { wai ]; executableHaskellDepends = [ - aeson base constraints containers data-default fmt http-types - insert-ordered-containers lens megaparsec mtl openapi3 + aeson base bytestring constraints containers data-default fmt + http-types insert-ordered-containers lens megaparsec mtl openapi3 pretty-terminal QuickCheck reflection regex-posix safe-exceptions servant servant-client servant-client-core servant-openapi3 servant-server servant-swagger servant-swagger-ui @@ -256433,7 +256463,7 @@ self: { wai wai-extra warp ]; testHaskellDepends = [ - aeson base constraints containers data-default fmt hspec + aeson base bytestring constraints containers data-default fmt hspec hspec-expectations http-client http-types insert-ordered-containers lens megaparsec mtl openapi3 pretty-terminal QuickCheck reflection regex-posix safe-exceptions servant servant-client @@ -256457,8 +256487,8 @@ self: { }: mkDerivation { pname = "servant-util-beam-pg"; - version = "0.3"; - sha256 = "1f3s1af4nh6dzppxgri23jihd79zyn22c0vw4xi7frjnikmfiwvl"; + version = "0.4.1"; + sha256 = "1j1hq26bbm6iz374y2hacxnnx2xx3lm5sv7a0g0n7xydfmy9zs3x"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -262079,15 +262109,15 @@ self: { mainProgram = "skylighting"; }) {}; - "skylighting_0_13_1" = callPackage + "skylighting_0_13_1_1" = callPackage ({ mkDerivation, base, binary, blaze-html, bytestring, containers , pretty-show, skylighting-core, skylighting-format-ansi , skylighting-format-blaze-html, skylighting-format-latex, text }: mkDerivation { pname = "skylighting"; - version = "0.13.1"; - sha256 = "0azlnrms9cp6vfp33mrzlhv2vv8v3257hri8j3r37x8h2ml3i6h9"; + version = "0.13.1.1"; + sha256 = "01awb174z27iygjssrsgvrq8lapq7282vs4bf5cxdbkjcpncil4b"; configureFlags = [ "-fexecutable" ]; isLibrary = true; isExecutable = true; @@ -262135,7 +262165,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "skylighting-core_0_13_1" = callPackage + "skylighting-core_0_13_1_1" = callPackage ({ mkDerivation, aeson, attoparsec, base, base64-bytestring, binary , bytestring, case-insensitive, colour, containers, criterion, Diff , directory, filepath, mtl, pretty-show, QuickCheck, safe, tasty @@ -262144,8 +262174,8 @@ self: { }: mkDerivation { pname = "skylighting-core"; - version = "0.13.1"; - sha256 = "1cfc03684pwxydms5ld7y75msaw5w4y5hhdpyi36xj17y4wf1drw"; + version = "0.13.1.1"; + sha256 = "0cr9crylkawr1dg1aj55mbngn71nih16kfiblxi1gvizgxcrvdys"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -262636,6 +262666,23 @@ self: { license = lib.licenses.mpl20; }) {}; + "slist_0_2_1_0" = callPackage + ({ mkDerivation, base, containers, doctest, Glob, hedgehog, hspec + , hspec-hedgehog + }: + mkDerivation { + pname = "slist"; + version = "0.2.1.0"; + sha256 = "1j52gvq42x03y7jq0pxzab98qnrsjg6qnw4ysq6cd89cx6gg04ab"; + libraryHaskellDepends = [ base containers ]; + testHaskellDepends = [ + base doctest Glob hedgehog hspec hspec-hedgehog + ]; + description = "Sized list"; + license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "sloane" = callPackage ({ mkDerivation, aeson, ansi-terminal, attoparsec, base , bloomfilter, bytestring, conduit, conduit-extra, containers @@ -265360,8 +265407,8 @@ self: { pname = "soap"; version = "0.2.3.6"; sha256 = "0xmiabnx814rwdwrcipv0kja6ljgwqr4x58sa8s07nrs3ph8xz6d"; - revision = "2"; - editedCabalFile = "04n55zcwkdc0xf9gkj4lywfx8j1xjmb9hbfl4z8fjlpwxklkwfhn"; + revision = "3"; + editedCabalFile = "1p34yyxln56n75m7hha75p1qm73vjyxbm54lwq566ayqf7dikp2y"; libraryHaskellDepends = [ base bytestring conduit configurator data-default exceptions http-client http-types iconv mtl resourcet text @@ -269665,6 +269712,36 @@ self: { mainProgram = "stackcollapse-ghc"; }) {}; + "stackctl" = callPackage + ({ mkDerivation, aeson, aeson-casing, aeson-pretty, amazonka + , amazonka-cloudformation, amazonka-core, amazonka-ec2 + , amazonka-lambda, amazonka-sts, base, Blammo, bytestring, cfn-flip + , conduit, containers, errors, exceptions, extra, fast-logger + , filepath, Glob, hspec, lens, lens-aeson, monad-logger + , optparse-applicative, resourcet, rio, text, time, unliftio + , unliftio-core, unordered-containers, uuid, yaml + }: + mkDerivation { + pname = "stackctl"; + version = "1.1.0.1"; + sha256 = "1rhwgc6qgip3p8qvyjahpk7xbv583p35rxba2x02ig7hbx3724y7"; + 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 + fast-logger filepath Glob lens lens-aeson monad-logger + optparse-applicative resourcet rio text time unliftio unliftio-core + unordered-containers uuid yaml + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ base hspec yaml ]; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + mainProgram = "stackctl"; + }) {}; + "stacked-dag" = callPackage ({ mkDerivation, base, containers, doctest, graphviz , optparse-applicative, text @@ -271977,28 +272054,6 @@ self: { }) {}; "streaming-commons" = callPackage - ({ mkDerivation, array, async, base, bytestring, deepseq, directory - , gauge, hspec, network, process, QuickCheck, random, stm, text - , transformers, unix, zlib - }: - mkDerivation { - pname = "streaming-commons"; - version = "0.2.2.4"; - sha256 = "1wnc2hi90djilj1m0la3h3xri723pbpmfdyp0kxxs33irs6418an"; - libraryHaskellDepends = [ - array async base bytestring directory network process random stm - text transformers unix zlib - ]; - testHaskellDepends = [ - array async base bytestring deepseq hspec network QuickCheck text - unix zlib - ]; - benchmarkHaskellDepends = [ base bytestring deepseq gauge text ]; - description = "Common lower-level functions needed by various streaming data libraries"; - license = lib.licenses.mit; - }) {}; - - "streaming-commons_0_2_2_5" = callPackage ({ mkDerivation, array, async, base, bytestring, deepseq, directory , gauge, hspec, hspec-discover, network, process, QuickCheck , random, stm, text, transformers, unix, zlib @@ -272019,7 +272074,6 @@ self: { benchmarkHaskellDepends = [ base bytestring deepseq gauge text ]; description = "Common lower-level functions needed by various streaming data libraries"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "streaming-concurrency" = callPackage @@ -273323,8 +273377,8 @@ self: { }: mkDerivation { pname = "string-variants"; - version = "0.1.0.1"; - sha256 = "12frxk86kk3rmg927i381qajwsanz2iwhf5ryvdd1af2km4dl76a"; + version = "0.1.0.2"; + sha256 = "0lrcjx3ci2kd2347klkwz01cf8mhzfk91sl7301q44cf8fg42az4"; libraryHaskellDepends = [ aeson base bytestring mono-traversable QuickCheck refined refinery string-conversions template-haskell text @@ -274217,8 +274271,8 @@ self: { ({ mkDerivation, base, css-syntax, network-uri, text }: mkDerivation { pname = "stylist-traits"; - version = "0.1.0.0"; - sha256 = "17wzhd7xfbj16sa3v5zhg4h1g0czccnv3ksbx7mi56dbf6lqq5bi"; + version = "0.1.1.0"; + sha256 = "0ynnz1zy5why4h2dw50rm5cnviwqqa7s2kjmaqdhr34msdvdigzv"; libraryHaskellDepends = [ base css-syntax network-uri text ]; description = "Traits, datatypes, & parsers for Haskell Stylist"; license = lib.licenses.gpl3Only; @@ -275410,8 +275464,8 @@ self: { ({ mkDerivation, base, blaze-markup, blaze-svg, directory, text }: mkDerivation { pname = "svg-icons"; - version = "2.2.0.2"; - sha256 = "076znrkjpyl23qnrh1ffnxjgcinccyh6rcasn9b578di7v31amx5"; + version = "2.3.0.0"; + sha256 = "0ybnda16klwcajhhmzpiajdl39rkk52zb41k6b0qvd21dxmv2qji"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -275688,38 +275742,6 @@ self: { }) {}; "swagger2" = callPackage - ({ mkDerivation, aeson, aeson-pretty, base, base-compat-batteries - , bytestring, Cabal, cabal-doctest, containers, cookie, doctest - , generics-sop, Glob, hashable, hspec, hspec-discover, http-media - , HUnit, insert-ordered-containers, lens, mtl, network, optics-core - , optics-th, QuickCheck, quickcheck-instances, scientific - , template-haskell, text, time, transformers, unordered-containers - , utf8-string, uuid-types, vector - }: - mkDerivation { - pname = "swagger2"; - version = "2.8.5"; - sha256 = "16r9657sp6zvj4jcs0yp7nvgnhjfsla29knaimkddsqa3k8qf1v6"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ - aeson aeson-pretty base base-compat-batteries bytestring containers - cookie generics-sop hashable http-media insert-ordered-containers - lens mtl network optics-core optics-th QuickCheck scientific - template-haskell text time transformers unordered-containers - uuid-types vector - ]; - testHaskellDepends = [ - aeson base base-compat-batteries bytestring containers doctest Glob - hashable hspec HUnit insert-ordered-containers lens mtl QuickCheck - quickcheck-instances template-haskell text time - unordered-containers utf8-string vector - ]; - testToolDepends = [ hspec-discover ]; - description = "Swagger 2.0 data model"; - license = lib.licenses.bsd3; - }) {}; - - "swagger2_2_8_6" = 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 @@ -275749,7 +275771,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Swagger 2.0 data model"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "swapper" = callPackage @@ -275772,32 +275793,34 @@ self: { "swarm" = callPackage ({ mkDerivation, aeson, array, base, brick, bytestring, clock - , containers, criterion, directory, dotgen, either, entropy, extra - , filepath, fused-effects, fused-effects-lens, githash, hashable - , hsnoise, http-client, http-client-tls, http-types, lens, linear - , lsp, megaparsec, minimorph, mtl, murmur3, optparse-applicative - , parser-combinators, prettyprinter, QuickCheck, random, servant - , servant-server, simple-enumeration, split, stm, syb, tasty - , tasty-expected-failure, tasty-hunit, tasty-quickcheck - , template-haskell, text, time, transformers, unification-fd + , containers, criterion, directory, dotgen, either, extra, filepath + , fused-effects, fused-effects-lens, githash, hashable, hsnoise + , http-client, http-client-tls, http-types, lens, linear, lsp + , megaparsec, minimorph, mtl, murmur3, natural-sort + , optparse-applicative, parser-combinators, prettyprinter + , QuickCheck, random, servant, servant-server, simple-enumeration + , split, stm, syb, tagged, tasty, tasty-expected-failure + , tasty-hunit, tasty-quickcheck, template-haskell, text + , text-zipper, time, transformers, unification-fd , unordered-containers, vector, vty, wai, warp, witch, word-wrap , yaml }: mkDerivation { pname = "swarm"; - version = "0.1.1.0"; - sha256 = "18w84a0hb975qcwsd9kcji88h6xyrf7dbqcvfjdhhgbbd4y8pv9h"; + version = "0.2.0.0"; + sha256 = "1f1fp4yia54j5x6kxkrsdlj9y2859gz22k4r3pphfiadfiw1gww3"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson array base brick bytestring clock containers directory dotgen - either entropy extra filepath fused-effects fused-effects-lens - githash hashable hsnoise http-client http-client-tls http-types - lens linear lsp megaparsec minimorph mtl murmur3 parser-combinators - prettyprinter random servant servant-server simple-enumeration - split stm syb template-haskell text time unification-fd - unordered-containers vector vty wai warp witch word-wrap yaml + either extra filepath fused-effects fused-effects-lens githash + hashable hsnoise http-client http-client-tls http-types lens linear + lsp megaparsec minimorph mtl murmur3 natural-sort + parser-combinators prettyprinter random servant servant-server + simple-enumeration split stm syb tagged template-haskell text + text-zipper time unification-fd unordered-containers vector vty wai + warp witch word-wrap yaml ]; executableHaskellDepends = [ base githash optparse-applicative text @@ -278875,9 +278898,7 @@ self: { ]; description = "Tailwind wrapped in Haskell"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; mainProgram = "tailwind-run"; - broken = true; }) {}; "tak" = callPackage @@ -282047,15 +282068,13 @@ self: { license = lib.licenses.bsd3; }) {}; - "termbox_1_0_0" = callPackage - ({ mkDerivation, base, ki, termbox-bindings-hs }: + "termbox_1_1_0" = callPackage + ({ mkDerivation, base, termbox-bindings-hs }: mkDerivation { pname = "termbox"; - version = "1.0.0"; - sha256 = "0diqjxam4vvw8prycjrq7qvn44lihda5rwibhwwp87vn840z0j3s"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base ki termbox-bindings-hs ]; + version = "1.1.0"; + sha256 = "0m2g3w0a0kc0a692r2mdflp1q96nycpwg80zf6lsb0z1xqvycypy"; + libraryHaskellDepends = [ base termbox-bindings-hs ]; description = "termbox"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -282065,11 +282084,13 @@ self: { ({ mkDerivation, base, reactive-banana, termbox }: mkDerivation { pname = "termbox-banana"; - version = "0.4.0"; - sha256 = "13n2r3a6gw0lmgk36dsdwhz6hd8h9rn93pk62zlxcycddrwhan5p"; + version = "1.0.0"; + sha256 = "0fj9h3nbgsr9321kb4a2m0m1afmjass5x22pc2dbn602k9d9fmyy"; libraryHaskellDepends = [ base reactive-banana termbox ]; - description = "reactive-banana + termbox"; + description = "termbox + reactive-banana"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "termbox-bindings" = callPackage @@ -282112,6 +282133,21 @@ self: { license = lib.licenses.bsd3; }) {}; + "termbox-tea" = callPackage + ({ mkDerivation, base, ki, termbox }: + mkDerivation { + pname = "termbox-tea"; + version = "0.1.0"; + sha256 = "0qck27chphmxm5zdrbz3njix5vkry5c5liybgvrx0745ymcd231w"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base ki termbox ]; + description = "termbox + The Elm Architecture"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "termcolor" = callPackage ({ mkDerivation, base, cli }: mkDerivation { @@ -283346,6 +283382,18 @@ self: { license = lib.licenses.bsd3; }) {}; + "text-ansi_0_2_0" = callPackage + ({ mkDerivation, base, text, text-builder }: + mkDerivation { + pname = "text-ansi"; + version = "0.2.0"; + sha256 = "15sraxbiwwx49nz4kxhh2b45q222pcxzgm85rmaskpi7pswwj0b2"; + libraryHaskellDepends = [ base text text-builder ]; + description = "Text styling for ANSI terminals"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "text-ascii" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, deepseq , hashable, megaparsec, optics-core, optics-extra, template-haskell @@ -283480,6 +283528,17 @@ self: { broken = true; }) {}; + "text-compression" = callPackage + ({ mkDerivation, base, containers, massiv, mtl }: + mkDerivation { + pname = "text-compression"; + version = "0.1.0.4"; + sha256 = "15bkgmlav4aybsgh7wg261fkhqg7phsc91sp1w26f9m2wb278xby"; + libraryHaskellDepends = [ base containers massiv mtl ]; + description = "A text compression library"; + license = lib.licenses.bsd3; + }) {}; + "text-containers" = callPackage ({ mkDerivation, base, bytestring, containers, deepseq, ghc-prim , hashable, QuickCheck, quickcheck-instances, tasty @@ -286730,6 +286789,8 @@ self: { pname = "time-manager"; version = "0.0.0"; sha256 = "1nzwj0fxz370ks6vr1sylcidx33rnqq45y3q9yv9n4dj43nid9lh"; + revision = "1"; + editedCabalFile = "1hwcns6rnh27nngq616cl9x2pl6lm4zzrsbbv5vq6hl0a60qhqjv"; libraryHaskellDepends = [ auto-update base ]; description = "Scalable timer"; license = lib.licenses.mit; @@ -293601,6 +293662,32 @@ self: { license = lib.licenses.mit; }) {}; + "type-level-kv-list_2_0_0" = callPackage + ({ mkDerivation, base, doctest, Glob }: + mkDerivation { + pname = "type-level-kv-list"; + version = "2.0.0"; + sha256 = "0m1hyddkc7652crki2r2rd0c7mr9sqcj57vhhkn280plqpmbl1kx"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base doctest Glob ]; + description = "Type level Key-Value list"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + + "type-level-kv-list-esqueleto" = callPackage + ({ mkDerivation, base, esqueleto, text, type-level-kv-list }: + mkDerivation { + pname = "type-level-kv-list-esqueleto"; + version = "0.1.0.1"; + sha256 = "0vkzrz7mgai8xprcly1vd938cdsxhpgpcmdgh823aawpdbahc7v9"; + libraryHaskellDepends = [ base esqueleto text type-level-kv-list ]; + description = "Make Esqueleto handy with type-level-kv-list"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "type-level-natural-number" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -294489,8 +294576,8 @@ self: { }: mkDerivation { pname = "typerep-map"; - version = "0.5.0.0"; - sha256 = "0ash190liysilgdwd5aiv55k3jrapksdhrcf0sf5lqv5dmpq07ja"; + version = "0.6.0.0"; + sha256 = "011whbmc9157jw68mgkqxbgngl9zcc478b9fw10w5pkjb01anvz3"; libraryHaskellDepends = [ base containers deepseq ghc-prim primitive vector ]; @@ -294774,8 +294861,8 @@ self: { }: mkDerivation { pname = "tzdata"; - version = "0.2.20221011.0"; - sha256 = "118k2zbn71cri9f7b7293hsj5vyrmz7v60a7rl0r2abgkxkf39d2"; + version = "0.2.20221028.0"; + sha256 = "1cm18g2fv8r11picmq2rf4hz77j2dgx6r6cdamdsq1ap0hv2jdqv"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring containers deepseq vector @@ -297474,31 +297561,6 @@ self: { }) {}; "unliftio" = callPackage - ({ mkDerivation, async, base, bytestring, containers, deepseq - , directory, filepath, gauge, hspec, process, QuickCheck, stm, time - , transformers, unix, unliftio-core - }: - mkDerivation { - pname = "unliftio"; - version = "0.2.22.0"; - sha256 = "125vzwkzp53i5n0yxy7bbivpzgf3c7ynsfhn04xk1ymy9fqsvi0z"; - libraryHaskellDepends = [ - async base bytestring deepseq directory filepath process stm time - transformers unix unliftio-core - ]; - testHaskellDepends = [ - async base bytestring containers deepseq directory filepath hspec - process QuickCheck stm time transformers unix unliftio-core - ]; - benchmarkHaskellDepends = [ - async base bytestring deepseq directory filepath gauge process stm - time transformers unix unliftio-core - ]; - description = "The MonadUnliftIO typeclass for unlifting monads to IO (batteries included)"; - license = lib.licenses.mit; - }) {}; - - "unliftio_0_2_23_0" = callPackage ({ mkDerivation, async, base, bytestring, containers, deepseq , directory, filepath, gauge, hspec, process, QuickCheck , safe-exceptions, stm, time, transformers, unix, unliftio-core @@ -297522,7 +297584,6 @@ self: { ]; description = "The MonadUnliftIO typeclass for unlifting monads to IO (batteries included)"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "unliftio-core" = callPackage @@ -303525,8 +303586,8 @@ self: { pname = "wai-extra"; version = "3.1.12.1"; sha256 = "1ya4m0c2p3wxzjlmk3yasc3pm61z309hzry9d39lj5wqv93a4wn6"; - revision = "1"; - editedCabalFile = "15v9m9af34s2iz9836bd1xi0s27sffviai4ywb2g3cv33fnpnljh"; + revision = "2"; + editedCabalFile = "139iqd6fqqj9xlpnbgva8y3wvakp2lyndk4bkvq46pq2xir4gqkf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -303545,6 +303606,40 @@ self: { license = lib.licenses.mit; }) {}; + "wai-extra_3_1_13_0" = callPackage + ({ mkDerivation, aeson, ansi-terminal, base, base64-bytestring + , bytestring, call-stack, case-insensitive, containers, cookie + , data-default-class, directory, fast-logger, hspec, hspec-discover + , http-types, HUnit, iproute, network, resourcet, streaming-commons + , temporary, text, time, transformers, unix, vault, wai, wai-logger + , warp, word8, zlib + }: + mkDerivation { + pname = "wai-extra"; + version = "3.1.13.0"; + sha256 = "1h4cqd5akrq0vhv3l0fzryy7qw0c2jb58lngx7x8ij63bckjs3fz"; + revision = "1"; + editedCabalFile = "0dyvg2bb37im790757khncxpnf45451dd8575p736ry4g8rpqgpw"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson ansi-terminal base base64-bytestring bytestring call-stack + case-insensitive containers cookie data-default-class directory + fast-logger http-types HUnit iproute network resourcet + streaming-commons text time transformers unix vault wai wai-logger + warp word8 + ]; + testHaskellDepends = [ + aeson base bytestring case-insensitive cookie directory fast-logger + hspec http-types HUnit iproute resourcet temporary text time wai + warp zlib + ]; + testToolDepends = [ hspec-discover ]; + description = "Provides some basic WAI handlers and middleware"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "wai-feature-flags" = callPackage ({ mkDerivation, aeson, base, bytestring, splitmix, text , unordered-containers, wai, warp @@ -310686,20 +310781,21 @@ self: { }) {}; "xdg-basedir-compliant" = callPackage - ({ mkDerivation, aeson, base, bytestring, filepath, hspec, polysemy - , polysemy-plugin, polysemy-zoo, QuickCheck, split + ({ mkDerivation, aeson, base, bytestring, directory, filepath + , hspec, path, polysemy, polysemy-plugin, polysemy-zoo, QuickCheck + , split }: mkDerivation { pname = "xdg-basedir-compliant"; - version = "1.0.2"; - sha256 = "0451z9w6607ci2s3bx8q73j3fw3ff3lnjf3i4h4nkscf76m84zzl"; + version = "1.1.0"; + sha256 = "15m38hhfa5bx5nsp7xmwjv4xk3rzw0ci1mnx8hivi7j7yk8xwc5s"; libraryHaskellDepends = [ - base bytestring filepath polysemy polysemy-plugin polysemy-zoo - split + base bytestring directory filepath path polysemy polysemy-plugin + polysemy-zoo split ]; testHaskellDepends = [ - aeson base bytestring filepath hspec polysemy polysemy-plugin - polysemy-zoo QuickCheck split + aeson base bytestring directory filepath hspec path polysemy + polysemy-plugin polysemy-zoo QuickCheck split ]; description = "XDG Basedir"; license = lib.licenses.bsd3; @@ -311142,8 +311238,8 @@ self: { }: mkDerivation { pname = "xlsx"; - version = "1.1.0"; - sha256 = "09h2z1qys01lmddkacs4z3gm36dd1ndn0hw8cn3mmciyczawn2w1"; + version = "1.1.0.1"; + sha256 = "0av80xy6qqmsmc40h13zsdyyh9gmjj5rk07vjq5s7h1zbqxaqfwp"; libraryHaskellDepends = [ attoparsec base base64-bytestring binary-search bytestring conduit containers data-default deepseq dlist errors exceptions extra @@ -311258,8 +311354,8 @@ self: { pname = "xml-conduit"; version = "1.9.1.1"; sha256 = "1zzh7xnmbm68dab1vqsjkr6ghxqgnla5nik4amrwlmhbdih1gcdx"; - revision = "1"; - editedCabalFile = "0x4is0956lfpxnxf2hqv5yvl1v8r1d41h3a22qqkvbqi13xz2hzv"; + revision = "2"; + editedCabalFile = "0m6sknp9xxz8a3dhvyfpyjvxp8ph511w19j4vj1qsd6hl2pazjy6"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ attoparsec base blaze-html blaze-markup bytestring conduit diff --git a/pkgs/development/interpreters/wasmtime/default.nix b/pkgs/development/interpreters/wasmtime/default.nix index f1952da3ab02..824a74739f2d 100644 --- a/pkgs/development/interpreters/wasmtime/default.nix +++ b/pkgs/development/interpreters/wasmtime/default.nix @@ -2,17 +2,17 @@ rustPlatform.buildRustPackage rec { pname = "wasmtime"; - version = "2.0.1"; + version = "2.0.2"; src = fetchFromGitHub { owner = "bytecodealliance"; repo = pname; rev = "v${version}"; - sha256 = "sha256-C0HH8JLF6fKXFC3AEcM/lizGFZYJkdtBCbu2YxRwMdI="; + sha256 = "sha256-2s9HjWIvQw5PE7LsEgFJ2F/XOI5kPdKZfNPkr9a73cY="; fetchSubmodules = true; }; - cargoSha256 = "sha256-4kLladdrDaCcEk9xpqWuzf5H1NNuOvq92qhjoRKXZ4E="; + cargoSha256 = "sha256-vKcmH8+FDAJXxOLT+nOqjDB3UhWmEAB4/ynOhT2FWAg="; cargoBuildFlags = [ "--package wasmtime-cli" diff --git a/pkgs/development/libraries/aws-c-io/default.nix b/pkgs/development/libraries/aws-c-io/default.nix index 232efd2eec5c..4bb38144763e 100644 --- a/pkgs/development/libraries/aws-c-io/default.nix +++ b/pkgs/development/libraries/aws-c-io/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "aws-c-io"; - version = "0.13.6"; + version = "0.13.9"; src = fetchFromGitHub { owner = "awslabs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-axFhFGeJhfqb4zu5u9an0pgpVDe+OyT+7A5SlAs502I="; + sha256 = "sha256-G7FYWrpg4TLsfK6C3JCTWkZ65iu3+gF3To5qYgUAqb0="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index 8e3d1a45dbe1..b38ba682a76b 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -8,6 +8,8 @@ , coreutils, dbus, libxml2, tzdata , desktop-file-utils, shared-mime-info , darwin +# update script +, runCommand, git, coccinelle }: assert stdenv.isLinux -> util-linuxMinimal != null; @@ -246,6 +248,55 @@ stdenv.mkDerivation (finalAttrs: { packageName = "glib"; versionPolicy = "odd-unstable"; }; + /* + can be used as part of an update script to automatically create a patch + hardcoding the path of all gsettings schemas in C code. + For example: + passthru = { + hardcodeGsettingsPatch = glib.mkHardcodeGsettingsPatch { + inherit src; + glib-schema-to-var = { + ... + }; + }; + + updateScript = + let + updateSource = ...; + patch = _experimental-update-script-combinators.copyAttrOutputToFile "evolution-ews.hardcodeGsettingsPatch" ./hardcode-gsettings.patch; + in + _experimental-update-script-combinators.sequence [ + updateSource + patch + ]; + }; + } + takes as input a mapping from schema path to variable name. + For example `{ "org.gnome.evolution" = "EVOLUTION_SCHEMA_PATH"; }` + hardcodes looking for `org.gnome.evolution` into `@EVOLUTION_SCHEMA_PATH@`. + All schemas must be listed. + */ + mkHardcodeGsettingsPatch = { src, glib-schema-to-var }: + runCommand + "hardcode-gsettings.patch" + { + inherit src; + nativeBuildInputs = [ + git + coccinelle + python3 # For patch script + ]; + } + '' + unpackPhase + cd "''${sourceRoot:-.}" + set -x + cp ${builtins.toFile "glib-schema-to-var.json" (builtins.toJSON glib-schema-to-var)} ./glib-schema-to-var.json + git init + git add -A + spatch --sp-file "${./hardcode-gsettings.cocci}" --dir . --in-place + git diff > "$out" + ''; }; meta = with lib; { diff --git a/pkgs/desktops/gnome/core/evolution-data-server/hardcode-gsettings.cocci b/pkgs/development/libraries/glib/hardcode-gsettings.cocci similarity index 76% rename from pkgs/desktops/gnome/core/evolution-data-server/hardcode-gsettings.cocci rename to pkgs/development/libraries/glib/hardcode-gsettings.cocci index 8f72e4f5d94b..bedacf846bc4 100644 --- a/pkgs/desktops/gnome/core/evolution-data-server/hardcode-gsettings.cocci +++ b/pkgs/development/libraries/glib/hardcode-gsettings.cocci @@ -3,10 +3,14 @@ * where GSettings system could look for schemas, we need to point the software to a correct location somehow. * For executables, we handle this using wrappers but this is not an option for libraries like e-d-s. * Instead, we hardcode the schema path when creating the settings. + * A schema path (ie org.gnome.evolution) can be replaced by @EVOLUTION_SCHEMA_PATH@ + * which is then replaced at build time by substituteAll. + * The mapping is provided in a json file ./glib-schema-to-var.json */ @initialize:python@ @@ +import json cpp_constants = {} @@ -16,25 +20,16 @@ def register_cpp_constant(const_name, val): def resolve_cpp_constant(const_name): return cpp_constants.get(const_name, const_name) -e_s_d_schema_constants = [ - # The following are actually part of e-d-s, despite the name. - # We rename the old ambiguos constant name in ./prepare-for-gsettings-patching.patch - "\"org.gnome.Evolution.DefaultSources\"", - "\"org.gnome.evolution.shell.network-config\"", -] - -g_d_s_schema_constants = [ -] +with open("./glib-schema-to-var.json") as mapping_file: + schema_to_var = json.load(mapping_file); def get_schema_directory(schema_path): # Sometimes the schema id is referenced using C preprocessor #define constant in the same file # let’s try to resolve it first. - schema_path = resolve_cpp_constant(schema_path.strip()) - if schema_path.startswith("\"org.gnome.evolution-data-server") or schema_path in e_s_d_schema_constants: - return "\"@EDS_GSETTINGS_PATH@\"" - elif schema_path in g_d_s_schema_constants: - return "\"@GDS_GSETTINGS_PATH@\"" - raise Exception(f"Unknown schema path {schema_path}") + schema_path = resolve_cpp_constant(schema_path.strip()).strip('"') + if schema_path in schema_to_var: + return f'"@{schema_to_var[schema_path]}@"' + raise Exception(f"Unknown schema path {schema_path!r}, please add it to ./glib-schema-to-var.json") @find_cpp_constants@ diff --git a/pkgs/development/libraries/libnats-c/default.nix b/pkgs/development/libraries/libnats-c/default.nix index 781e62982b38..86e8932c04d7 100644 --- a/pkgs/development/libraries/libnats-c/default.nix +++ b/pkgs/development/libraries/libnats-c/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "libnats"; - version = "3.4.1"; + version = "3.5.0"; src = fetchFromGitHub { owner = "nats-io"; repo = "nats.c"; rev = "v${version}"; - sha256 = "sha256-Mbmd1bhFnc4feC0bnOa5mD15DxvY4Sgftx3Ep/7Cdp4="; + sha256 = "sha256-mdOvJkCdJ2QEsVUdxVCpIDLn4+6JM6OeJfasJxqqID8="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/librealsense/default.nix b/pkgs/development/libraries/librealsense/default.nix index 135969210d36..59bc2a056616 100644 --- a/pkgs/development/libraries/librealsense/default.nix +++ b/pkgs/development/libraries/librealsense/default.nix @@ -52,6 +52,12 @@ stdenv.mkDerivation rec { ./py_pybind11_no_external_download.patch ]; + postPatch = '' + # https://github.com/IntelRealSense/librealsense/issues/11092 + # insert a "#include ' -i wrappers/python/pyrs_device.cpp + ''; + nativeBuildInputs = [ cmake ninja diff --git a/pkgs/development/libraries/ndi/version.json b/pkgs/development/libraries/ndi/version.json index 743ee7aa7451..d751aa79e431 100644 --- a/pkgs/development/libraries/ndi/version.json +++ b/pkgs/development/libraries/ndi/version.json @@ -1 +1 @@ -{"hash": "sha256:24ed671e140ee62ebe96a494b3f0e3a3e5ba005364a0a6ad8ebf89b3494b7644", "version": "5.5.1"} +{"hash": "sha256:70e04c2e7a629a9854de2727e0f978175b7a4ec6cf4cd9799a22390862f6fa27", "version": "5.5.2"} diff --git a/pkgs/development/libraries/pugixml/default.nix b/pkgs/development/libraries/pugixml/default.nix index 0db6d5f98af8..a09abc539c92 100644 --- a/pkgs/development/libraries/pugixml/default.nix +++ b/pkgs/development/libraries/pugixml/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "pugixml"; - version = "1.12.1"; + version = "1.13"; src = fetchFromGitHub { owner = "zeux"; repo = "pugixml"; rev = "v${version}"; - sha256 = "sha256-Udjx84mhLPJ1bU5WYDo73PAeeufS+vBLXZP0YbBvqLE="; + sha256 = "sha256-MAXm/9ANj6TjO1Skpg20RYt88bf6w1uPwRwOHXiXsWw="; }; outputs = [ "out" ] ++ lib.optionals shared [ "dev" ]; diff --git a/pkgs/development/libraries/rocfft/default.nix b/pkgs/development/libraries/rocfft/default.nix index 9dbc5a66fb18..d2596c064010 100644 --- a/pkgs/development/libraries/rocfft/default.nix +++ b/pkgs/development/libraries/rocfft/default.nix @@ -110,5 +110,6 @@ stdenv.mkDerivation rec { license = with licenses; [ mit ]; maintainers = with maintainers; [ Madouura ]; broken = rocmVersion != hip.version; + hydraPlatforms = [ ]; # rocFFT produces an extremely large output }; } diff --git a/pkgs/development/ocaml-modules/dune-action-plugin/default.nix b/pkgs/development/ocaml-modules/dune-action-plugin/default.nix index 1892c0dbada8..1f101a35a585 100644 --- a/pkgs/development/ocaml-modules/dune-action-plugin/default.nix +++ b/pkgs/development/ocaml-modules/dune-action-plugin/default.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage, dune_3, dune-glob, dune-private-libs }: +{ lib, buildDunePackage, dune_3, dune-glob, dune-private-libs, dune-rpc }: buildDunePackage rec { pname = "dune-action-plugin"; @@ -8,7 +8,7 @@ buildDunePackage rec { dontAddPrefix = true; - propagatedBuildInputs = [ dune-glob dune-private-libs ]; + propagatedBuildInputs = [ dune-glob dune-private-libs dune-rpc ]; preBuild = '' rm -r vendor/csexp diff --git a/pkgs/development/ocaml-modules/dune-rpc/default.nix b/pkgs/development/ocaml-modules/dune-rpc/default.nix index c0b2d9581698..569be123794c 100644 --- a/pkgs/development/ocaml-modules/dune-rpc/default.nix +++ b/pkgs/development/ocaml-modules/dune-rpc/default.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage, dune_3, stdune, ordering, pp, xdg, dyn }: +{ lib, buildDunePackage, dune_3, csexp, stdune, ordering, pp, xdg, dyn }: buildDunePackage rec { pname = "dune-rpc"; @@ -8,7 +8,7 @@ buildDunePackage rec { dontAddPrefix = true; - buildInputs = [ stdune ordering pp xdg dyn ]; + propagatedBuildInputs = [ csexp stdune ordering pp xdg dyn ]; preBuild = '' rm -r vendor/csexp diff --git a/pkgs/development/ocaml-modules/ocaml-lsp/default.nix b/pkgs/development/ocaml-modules/ocaml-lsp/default.nix index f5b69a3b1e3a..b5cf8d3fe1cb 100644 --- a/pkgs/development/ocaml-modules/ocaml-lsp/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-lsp/default.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage, lsp, xdg, re, fiber, makeWrapper, dot-merlin-reader, spawn }: +{ lib, buildDunePackage, lsp, xdg, re, fiber, makeWrapper, dot-merlin-reader, spawn, ocamlc-loc }: buildDunePackage rec { pname = "ocaml-lsp-server"; @@ -7,7 +7,8 @@ buildDunePackage rec { buildInputs = lsp.buildInputs ++ [ lsp re ] ++ lib.optional (lib.versionAtLeast version "1.9") spawn - ++ lib.optionals (lib.versionAtLeast version "1.10") [ fiber xdg ]; + ++ lib.optionals (lib.versionAtLeast version "1.10") [ fiber xdg ] + ++ lib.optional (lib.versionAtLeast version "1.14.2") ocamlc-loc; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/ocaml-modules/ocaml-lsp/jsonrpc.nix b/pkgs/development/ocaml-modules/ocaml-lsp/jsonrpc.nix index 41cf9fd32290..b2c43babcf60 100644 --- a/pkgs/development/ocaml-modules/ocaml-lsp/jsonrpc.nix +++ b/pkgs/development/ocaml-modules/ocaml-lsp/jsonrpc.nix @@ -13,8 +13,8 @@ let params = if lib.versionAtLeast ocaml.version "4.14" then { name = "lsp"; - version = "1.14.1"; - sha256 = "sha256-5kxMM90Dd5H8yb7f1NYV3abRaePqztFQ82VTnayradk="; + version = "1.14.2"; + sha256 = "sha256-1R+HYaGbPLGDs5DMN3jmnrZFMhMmPUHgF+s+yNzIVJQ="; } else if lib.versionAtLeast ocaml.version "4.13" then { name = "jsonrpc"; diff --git a/pkgs/development/ocaml-modules/ocamlc-loc/default.nix b/pkgs/development/ocaml-modules/ocamlc-loc/default.nix new file mode 100644 index 000000000000..3f2d9c013c45 --- /dev/null +++ b/pkgs/development/ocaml-modules/ocamlc-loc/default.nix @@ -0,0 +1,24 @@ +{ lib, buildDunePackage, dune_3, dyn }: + +buildDunePackage { + pname = "ocamlc-loc"; + inherit (dune_3) src version; + duneVersion = "3"; + + dontAddPrefix = true; + + preBuild = '' + rm -rf vendor/csexp + rm -rf vendor/pp + ''; + + minimalOCamlVersion = "4.08"; + + propagatedBuildInputs = [ dyn ]; + + meta = with lib; { + description = "Parse ocaml compiler output into structured form"; + maintainers = [ maintainers.ulrikstrid ]; + license = licenses.mit; + }; +} diff --git a/pkgs/development/tools/buildkit/default.nix b/pkgs/development/tools/buildkit/default.nix index d074176f56d6..0353fb10ae1e 100644 --- a/pkgs/development/tools/buildkit/default.nix +++ b/pkgs/development/tools/buildkit/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "buildkit"; - version = "0.10.5"; + version = "0.10.6"; src = fetchFromGitHub { owner = "moby"; repo = "buildkit"; rev = "v${version}"; - sha256 = "sha256-6p7LQvlVG0epkk4qFDKrmBBFIIbmB6AMROB7dfE+3ho="; + sha256 = "sha256-bTzpiTqdAfo31sFRBCp0EzYMVjc6jt4aPK0VLsB9j0g="; }; vendorSha256 = null; diff --git a/pkgs/development/tools/compile-daemon/default.nix b/pkgs/development/tools/compile-daemon/default.nix index 959beea1fbc0..f18865a7cee5 100644 --- a/pkgs/development/tools/compile-daemon/default.nix +++ b/pkgs/development/tools/compile-daemon/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, fetchpatch }: buildGoModule rec { pname = "compile-daemon"; @@ -11,7 +11,14 @@ buildGoModule rec { sha256 = "sha256-gpyXy7FO7ZVXJrkzcKHFez4S/dGiijXfZ9eSJtNlm58="; }; - vendorSha256 = "sha256-UDPOeg8jQbDB+Fr4x6ehK7UyQa8ySZy6yNxS1xotkgA="; + vendorHash = "sha256-UpktrXY6OntOA1sxKq3qI59zrOwwCuM+gfGGxPmUJRo="; + + patches = [ + (fetchpatch { + url = "https://github.com/githubnemo/CompileDaemon/commit/39bc1352dc62fea06dff40c5eaef81ab1bdb1f14.patch"; + hash = "sha256-Zftbw2nu8zzaoj0uwEwdq7xlyycdC0xxBu/qE9VHASI="; + }) + ]; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix b/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix index 211191c8f379..a18bfbd22b63 100644 --- a/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix +++ b/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix @@ -3,16 +3,16 @@ nixosTests }: buildGoModule rec { pname = "buildkite-agent"; - version = "3.39.1"; + version = "3.40.0"; src = fetchFromGitHub { owner = "buildkite"; repo = "agent"; rev = "v${version}"; - sha256 = "sha256-sUBH0Oz1yeOgY5pmzM8XLoQ9vPiPODC6zeOO2n3meXs="; + sha256 = "sha256-pd5B7RW13SWtOAwJGxhJBAhihCFkL3TokhWqcy7hVFk="; }; - vendorSha256 = "sha256-RD8BXwzrqHwgxdjpL++a9pIvzD9rfSTqguRVh+CbbnE="; + vendorSha256 = "sha256-+LTjtJFHdYv0zeX8RpK0tuLWRpz5jXBwA7ZOvmA6YV0="; postPatch = '' substituteInPlace bootstrap/shell/shell.go --replace /bin/bash ${bash}/bin/bash diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix index 9e3e66311827..2ab40ae599fa 100644 --- a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix @@ -1,7 +1,7 @@ { lib, buildGoModule, fetchFromGitLab, fetchurl, bash }: let - version = "15.5.0"; + version = "15.5.1"; in buildGoModule rec { inherit version; @@ -23,7 +23,7 @@ buildGoModule rec { owner = "gitlab-org"; repo = "gitlab-runner"; rev = "v${version}"; - sha256 = "sha256-WdrvVmuYyFAMwUDEANOjXiPoQ8rvXbcQz5mBlWUL54k="; + sha256 = "sha256-ZvQaA4DSuEIdHEoRKJg5tOnBQgf26paTAiWy6RLRG3o="; }; patches = [ diff --git a/pkgs/development/tools/misc/circleci-cli/default.nix b/pkgs/development/tools/misc/circleci-cli/default.nix index 0ef474bea3e5..b4bb1bc2d705 100644 --- a/pkgs/development/tools/misc/circleci-cli/default.nix +++ b/pkgs/development/tools/misc/circleci-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "circleci-cli"; - version = "0.1.22322"; + version = "0.1.22426"; src = fetchFromGitHub { owner = "CircleCI-Public"; repo = pname; rev = "v${version}"; - sha256 = "sha256-HhQ2KZDu4X/extycQ9CZQYs8GjR5e93M0qw2cJsqj9E="; + sha256 = "sha256-zGMaFRa0gR7Meyhm1lEn6klCB6T3iNFqAinLiIKstt4="; }; - vendorSha256 = "sha256-vydx3ZaVSpIn5nncuQhRVQqZ7920n1NAoZIHFvzrQgo="; + vendorSha256 = "sha256-+gDRe62EJdTeZJAbEPmjo+7A3TTiwggW/w4WRj5ZxwM="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/tools/nc4nix/default.nix b/pkgs/development/tools/nc4nix/default.nix new file mode 100644 index 000000000000..11a9494c2a94 --- /dev/null +++ b/pkgs/development/tools/nc4nix/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildGoModule +, fetchFromGitLab +}: + +buildGoModule rec { + pname = "nc4nix"; + version = "unstable-2022-08-06"; + + src = fetchFromGitLab { + domain = "git.helsinki.tools"; + owner = "helsinki-systems"; + repo = "nc4nix"; + rev = "91d92e8c339862fe81fb066fd370da7757042367"; + sha256 = "sha256-8ggYOc+w3oiY2B0Ned5B26/ZNco2vCdvScC+Ms+gOWo="; + }; + + vendorSha256 = "sha256-uhINWxFny/OY7M2vV3ehFzP90J6Z8cn5IZHWOuEg91M="; + + meta = with lib; { + description = "Packaging helper for Nextcloud apps"; + homepage = "https://git.helsinki.tools/helsinki-systems/nc4nix"; + license = licenses.unfree; + maintainers = with maintainers; [ onny ]; + platforms = platforms.linux; + }; +} + diff --git a/pkgs/development/tools/ocaml/dune/3.nix b/pkgs/development/tools/ocaml/dune/3.nix index 01145e0237cb..28cef688d0df 100644 --- a/pkgs/development/tools/ocaml/dune/3.nix +++ b/pkgs/development/tools/ocaml/dune/3.nix @@ -6,11 +6,11 @@ else stdenv.mkDerivation rec { pname = "dune"; - version = "3.4.1"; + version = "3.5.0"; src = fetchurl { url = "https://github.com/ocaml/dune/releases/download/${version}/dune-${version}.tbz"; - sha256 = "sha256-KZ+jPP/BCMwm/1nV/J0J9ssKs6woC/I6ARTP3AtAxsU="; + sha256 = "sha256-d71MZwQ1n64ZaWNs/DzXpRe6NgSBnvickZwHYrUJNhA="; }; nativeBuildInputs = [ ocaml findlib ]; diff --git a/pkgs/development/tools/ruff/default.nix b/pkgs/development/tools/ruff/default.nix index c389bb1f1ac3..36a1d90cf761 100644 --- a/pkgs/development/tools/ruff/default.nix +++ b/pkgs/development/tools/ruff/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "ruff"; - version = "0.0.109"; + version = "0.0.110"; src = fetchFromGitHub { owner = "charliermarsh"; repo = pname; rev = "v${version}"; - sha256 = "sha256-11vaL8ztWLqhImQ4uzHPAwciHtegz320hDJq6kH8ujI="; + sha256 = "sha256-L7LqIov0Ifz4wRV6FD4PIcUFauQCBaL8HXea400j0tE="; }; - cargoSha256 = "sha256-ixjH6gbgrcMtGeLFFyAPTmgF43UAzkhpxNp2S59iwIY="; + cargoSha256 = "sha256-CcLNgZqcfJK/1DwLNP+GTej+OwmJ4w6SXob0Y3ccwS8="; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices diff --git a/pkgs/development/tools/rust/cargo-generate/default.nix b/pkgs/development/tools/rust/cargo-generate/default.nix index bc15e0f0f083..8690b1b41ef2 100644 --- a/pkgs/development/tools/rust/cargo-generate/default.nix +++ b/pkgs/development/tools/rust/cargo-generate/default.nix @@ -10,19 +10,19 @@ rustPlatform.buildRustPackage rec { pname = "cargo-generate"; - version = "0.17.2"; + version = "0.17.3"; src = fetchFromGitHub { owner = "cargo-generate"; repo = "cargo-generate"; rev = "v${version}"; - sha256 = "sha256-so69T2mDq/nFGiug2zYIX6Z+Dhxk3riV+TkEYTpFrTg="; + sha256 = "sha256-7F6Pqq/iFmI3JzDKoMmSyVm6BUr+Ev9GPidOofcLNV4="; }; # patch Cargo.toml to not vendor libgit2 and openssl cargoPatches = [ ./no-vendor.patch ]; - cargoSha256 = "sha256-JRoD6SuGQPJ8HOePXrH3avIY+sW61ErZFOHLafqmxMY="; + cargoSha256 = "sha256-kC8BGobS1iMq+vIwE24Lip+HGdVnA/NjHFAb6cqOz44="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index a808338c9876..458caf06433c 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -2,61 +2,61 @@ "4.14": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-4.14.298-hardened1.patch", - "sha256": "1gzp5fxyv5s029s6c9zrnvj3wb02blabmdmcziaqvf6k7k178prs", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.298-hardened1/linux-hardened-4.14.298-hardened1.patch" + "name": "linux-hardened-4.14.299-hardened1.patch", + "sha256": "1qgsi8kfbfqqkb2n0irqfrbq865dz4f5hmhxq7fbmnpacjgwdy6a", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.299-hardened1/linux-hardened-4.14.299-hardened1.patch" }, - "sha256": "0w8f7m3mdj6gcxdvsvxw5hqqfhwffpfl794rgianl4r6iad8w7s6", - "version": "4.14.298" + "sha256": "0p5ic2mrb9vl3qkzvqxhia3kygjv8xa6s1kqkwgd6b4rmq1kc8r6", + "version": "4.14.299" }, "4.19": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-4.19.264-hardened1.patch", - "sha256": "08swipghq66lx3nrww1319qwwgw3yipy5m4kvzpsz6mfhkm54aw9", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.264-hardened1/linux-hardened-4.19.264-hardened1.patch" + "name": "linux-hardened-4.19.265-hardened1.patch", + "sha256": "0psqvwqvq981hvix58z5bhc4xvgm2ic5y4q7bwsnh1cfvbfg6x2k", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.265-hardened1/linux-hardened-4.19.265-hardened1.patch" }, - "sha256": "07ihf55y4xcbzpfgj9mxzchy1jmdpy46j32w15hac46a4504xcps", - "version": "4.19.264" + "sha256": "1l5cdpgng1gci1p1gdr2jzqw486h3w56gpyc7fbq74hlc6nnwh1p", + "version": "4.19.265" }, "5.10": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.10.153-hardened1.patch", - "sha256": "02kw33m0j10dnl30n17ppffqh8l8v91jpz1d1pkqipfw3j40j8az", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.153-hardened1/linux-hardened-5.10.153-hardened1.patch" + "name": "linux-hardened-5.10.154-hardened1.patch", + "sha256": "0srwi4033h8ypxbwwp1hb3y989jvlwzckvsfjkxzgpnj91i68hn9", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.154-hardened1/linux-hardened-5.10.154-hardened1.patch" }, - "sha256": "0qhn5xv0m6baip1my1gp4mrjc4j6d6nbxa701vpwllg4kx8y9wiw", - "version": "5.10.153" + "sha256": "12763vlnrgmgj03khj9ls2g7zlhclj9g1l3008b36j9jli6kvbn6", + "version": "5.10.154" }, "5.15": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.15.77-hardened1.patch", - "sha256": "0pfa2xi64an716by3rqgn521a4igzb1y2bmbdn87icg8p79qavgx", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.77-hardened1/linux-hardened-5.15.77-hardened1.patch" + "name": "linux-hardened-5.15.78-hardened1.patch", + "sha256": "1aavp00rswqbbpbyx0c7k2ga6lcd221gcgr4893q7w5z26mv7wkd", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.78-hardened1/linux-hardened-5.15.78-hardened1.patch" }, - "sha256": "1yg9myqcv4kn2p7c9ap0z6xxh2qjsab2nbxf5z388skr6cgq8bql", - "version": "5.15.77" + "sha256": "16d4d4g5n2g6jpp8bvad1bm1l0b0nb4ckwsmq6w2g3538xrrzf8d", + "version": "5.15.78" }, "5.4": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.4.223-hardened1.patch", - "sha256": "1jsnrxv9a16l5gdhbn7w4rc9ql7arggvcizmkdvnk7ymd6ni6518", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.223-hardened1/linux-hardened-5.4.223-hardened1.patch" + "name": "linux-hardened-5.4.224-hardened1.patch", + "sha256": "1cx0h6sn8wdggg9nwqlrij7cfpa9q6nah73nrv92b4c9n8sjqiwq", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.224-hardened1/linux-hardened-5.4.224-hardened1.patch" }, - "sha256": "1svyf4m5d3vrskylpal6npk5jj454rzij772wabg31v8vw97zw4y", - "version": "5.4.223" + "sha256": "0dixs4w7nmkjgxv9dxgjdy8v6r4parkpqyvdfyr0wqk0amdz4zcb", + "version": "5.4.224" }, "6.0": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-6.0.7-hardened1.patch", - "sha256": "0y1g4zahlq28s8grzzpxcccr7sjh6cgbviz880g1wqg7vmqpi1fz", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/6.0.7-hardened1/linux-hardened-6.0.7-hardened1.patch" + "name": "linux-hardened-6.0.8-hardened1.patch", + "sha256": "08xvsqb3d0j98n2i4468ja9miydgy3kcrz66fbi1kymn79yam62n", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/6.0.8-hardened1/linux-hardened-6.0.8-hardened1.patch" }, - "sha256": "03srfv33r2vc48h051zicvn9hz78kc08vh7ljzlmcnk0g0mwrnk7", - "version": "6.0.7" + "sha256": "0mx2bxgnxm3vz688268939xw90jqci7xn992kfpny74mjqwzir0d", + "version": "6.0.8" } } diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index 97fd9d525f37..7c2fc0ee9fdf 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "4.14.298"; + version = "4.14.299"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0w8f7m3mdj6gcxdvsvxw5hqqfhwffpfl794rgianl4r6iad8w7s6"; + sha256 = "0p5ic2mrb9vl3qkzvqxhia3kygjv8xa6s1kqkwgd6b4rmq1kc8r6"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix index 902be54d30e3..aae0bf463c8e 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "4.19.264"; + version = "4.19.265"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "07ihf55y4xcbzpfgj9mxzchy1jmdpy46j32w15hac46a4504xcps"; + sha256 = "1l5cdpgng1gci1p1gdr2jzqw486h3w56gpyc7fbq74hlc6nnwh1p"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-5.10.nix b/pkgs/os-specific/linux/kernel/linux-5.10.nix index b918ef7c35f6..a5b3ac3cfb9b 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.10.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.10.153"; + version = "5.10.154"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0qhn5xv0m6baip1my1gp4mrjc4j6d6nbxa701vpwllg4kx8y9wiw"; + sha256 = "12763vlnrgmgj03khj9ls2g7zlhclj9g1l3008b36j9jli6kvbn6"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-5.15.nix b/pkgs/os-specific/linux/kernel/linux-5.15.nix index 8dd899d0bac3..d2f2a87e61a8 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.15.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.15.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.15.77"; + version = "5.15.78"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1yg9myqcv4kn2p7c9ap0z6xxh2qjsab2nbxf5z388skr6cgq8bql"; + sha256 = "16d4d4g5n2g6jpp8bvad1bm1l0b0nb4ckwsmq6w2g3538xrrzf8d"; }; } // (args.argsOverride or { })) diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix index f617ba6f0e3e..ed46ce896dba 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.4.223"; + version = "5.4.224"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1svyf4m5d3vrskylpal6npk5jj454rzij772wabg31v8vw97zw4y"; + sha256 = "0dixs4w7nmkjgxv9dxgjdy8v6r4parkpqyvdfyr0wqk0amdz4zcb"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-6.0.nix b/pkgs/os-specific/linux/kernel/linux-6.0.nix index 0661da8d338e..f2b7806ca300 100644 --- a/pkgs/os-specific/linux/kernel/linux-6.0.nix +++ b/pkgs/os-specific/linux/kernel/linux-6.0.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "6.0.7"; + version = "6.0.8"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v6.x/linux-${version}.tar.xz"; - sha256 = "03srfv33r2vc48h051zicvn9hz78kc08vh7ljzlmcnk0g0mwrnk7"; + sha256 = "0mx2bxgnxm3vz688268939xw90jqci7xn992kfpny74mjqwzir0d"; }; } // (args.argsOverride or { })) diff --git a/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix b/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix index 8ed22d7a8cc7..2909ca33853e 100644 --- a/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix @@ -6,7 +6,7 @@ , ... } @ args: let - version = "5.10.152-rt75"; # updated by ./update-rt.sh + version = "5.10.153-rt76"; # updated by ./update-rt.sh branch = lib.versions.majorMinor version; kversion = builtins.elemAt (lib.splitString "-" version) 0; in buildLinux (args // { @@ -18,14 +18,14 @@ in buildLinux (args // { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz"; - sha256 = "19nq2pgy4vmn30nywdvcvsx4vhmndrj97iiclpqakzgblj1mq2zs"; + sha256 = "0qhn5xv0m6baip1my1gp4mrjc4j6d6nbxa701vpwllg4kx8y9wiw"; }; kernelPatches = let rt-patch = { name = "rt"; patch = fetchurl { url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; - sha256 = "0sg78zrkk7scg6b2xcvdymmhfdrlzcajhzzway5gjdi04x4vy4k0"; + sha256 = "12gf2nnnfcbmyp34xnns35qpnzsnwjilq2qs1xvq6m51gcnnzq7g"; }; }; in [ rt-patch ] ++ kernelPatches; diff --git a/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix b/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix index 898bd1d18ad1..1a74c2503c04 100644 --- a/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix @@ -6,7 +6,7 @@ , ... } @ args: let - version = "5.4.209-rt77"; # updated by ./update-rt.sh + version = "5.4.221-rt79"; # updated by ./update-rt.sh branch = lib.versions.majorMinor version; kversion = builtins.elemAt (lib.splitString "-" version) 0; in buildLinux (args // { @@ -14,14 +14,14 @@ in buildLinux (args // { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz"; - sha256 = "1kdnz99k7zspzaxqaxahbf6hncigy4cvjlb79jsy7a95qxxr31qf"; + sha256 = "02nz9534998s922fdb0kpb09flgjmc7p78x0ypfxrd6pzv0pzcr7"; }; kernelPatches = let rt-patch = { name = "rt"; patch = fetchurl { url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; - sha256 = "1wh5m7ychgnn33yg7gg9nlwcmmm72dixvdf77m764hs90xl8c9ig"; + sha256 = "0zcakr41m1n683pwcm6d698nwgg7jyr7n8c63jmqh0959xxb2axy"; }; }; in [ rt-patch ] ++ kernelPatches; diff --git a/pkgs/servers/computing/slurm/default.nix b/pkgs/servers/computing/slurm/default.nix index 263d03616cda..dce740a98542 100644 --- a/pkgs/servers/computing/slurm/default.nix +++ b/pkgs/servers/computing/slurm/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { pname = "slurm"; - version = "22.05.5.1"; + version = "22.05.6.1"; # N.B. We use github release tags instead of https://www.schedmd.com/downloads.php # because the latter does not keep older releases. @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { repo = "slurm"; # The release tags use - instead of . rev = "${pname}-${builtins.replaceStrings ["."] ["-"] version}"; - sha256 = "1mw0dkll1iwwdpdbxcy26zpnjgj07prlgdz2da64krn4yyfhca30"; + sha256 = "1aa1ddlacr9dpk1g1syj9ml5dninv3dzvw8vlm1s3j3ybp6lz8bd"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/servers/monitoring/cadvisor/default.nix b/pkgs/servers/monitoring/cadvisor/default.nix index 186b893ac0b4..acd6d918016e 100644 --- a/pkgs/servers/monitoring/cadvisor/default.nix +++ b/pkgs/servers/monitoring/cadvisor/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "cadvisor"; - version = "0.45.0"; + version = "0.46.0"; src = fetchFromGitHub { owner = "google"; repo = "cadvisor"; rev = "v${version}"; - sha256 = "sha256-hH3unhGRrB8IegVaX+j2idY0woMqzchEEXZB/ppzIf0="; + sha256 = "sha256-ciGj8SK7OgK3x8Njih4aIQ0vvNV9s5/w2i+DF/vw1O8="; }; modRoot = "./cmd"; - vendorSha256 = "sha256-Mcelh/nYFcNTrI1Kq9KqkJeSnbgJhd7HfbexhNYbPFg="; + vendorSha256 = "sha256-dg+osxsxdJ8Tg++wdd4L6FMjiPLLFQj0NXb2aSC7vQg="; ldflags = [ "-s" "-w" "-X github.com/google/cadvisor/version.Version=${version}" ]; diff --git a/pkgs/tools/graphics/jhead/default.nix b/pkgs/tools/graphics/jhead/default.nix index 16e572522757..4fe1d30ed776 100644 --- a/pkgs/tools/graphics/jhead/default.nix +++ b/pkgs/tools/graphics/jhead/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, libjpeg }: +{ lib, stdenv, fetchFromGitHub, libjpeg, fetchpatch }: stdenv.mkDerivation rec { pname = "jhead"; @@ -11,6 +11,38 @@ stdenv.mkDerivation rec { sha256 = "0zgh36486cpcnf7xg6dwf7rhz2h4gpayqvdk8hmrx6y418b2pfyf"; }; + patches = [ + # Just a spelling/whitespace change, but makes it easier to apply the rest. + (fetchpatch { + url = "https://github.com/Matthias-Wandel/jhead/commit/8384c6fd2ebfb8eb8bd96616343e73af0e575131.patch"; + sha256 = "sha256-f3FOIqgFr5QPAsBjvUVAOf1CAqw8pNAVx+pZZuMjq3c="; + includes = [ "jhead.c" ]; + }) + (fetchpatch { + url = "https://github.com/Matthias-Wandel/jhead/commit/63aff8e9bd8c970fedf87f0ec3a1f3368bf2421e.patch"; + sha256 = "sha256-jyhGdWuwd/eP5uuS8uLYiTJZJdxxLYdsvl0jnQC+Y5c="; + includes = [ "jhead.c" ]; + }) + + # Fixes around CVE-2022-41751 + (fetchpatch { + url = "https://github.com/Matthias-Wandel/jhead/commit/6985da52c9ad4f5f6c247269cb5508fae34a971c.patch"; + sha256 = "sha256-8Uw0Udr9aZEMrD/0zS498MVw+rJqpFukvjb7FgzjgT4="; + }) + (fetchpatch { + url = "https://github.com/Matthias-Wandel/jhead/commit/3fe905cf674f8dbac8a89e58cee1b4850abf9530.patch"; + sha256 = "sha256-5995EV/pOktZc45c7fLl+oQqyutRDQJl3eNutR1JGJo="; + }) + (fetchpatch { + url = "https://github.com/joachim-reichel/jhead/commit/ec67262b8e5a4b05d8ad6898a09f1dc3fc032062.patch"; + sha256 = "sha256-a3KogIV45cRNthJSPygIRw1m2KBJZJSIGSWfsr7FWs4="; + }) + (fetchpatch { + url = "https://github.com/joachim-reichel/jhead/commit/65de38cb68747c6f8397608b56b58ce15271a1fe.patch"; + sha256 = "sha256-xf0d2hxW4rVZwffrYJVVFQ3cDMOcPoGbCdrrQKxf16M="; + }) + ]; + buildInputs = [ libjpeg ]; makeFlags = [ "CPPFLAGS=" "CFLAGS=-O3" "LDFLAGS=" ]; diff --git a/pkgs/tools/misc/chezmoi/default.nix b/pkgs/tools/misc/chezmoi/default.nix index 86609f17178a..82f656d22ee8 100644 --- a/pkgs/tools/misc/chezmoi/default.nix +++ b/pkgs/tools/misc/chezmoi/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "chezmoi"; - version = "2.26.0"; + version = "2.27.0"; src = fetchFromGitHub { owner = "twpayne"; repo = "chezmoi"; rev = "v${version}"; - sha256 = "sha256-2NtYaKZiUPp33wZuH4pA0uSPdu8xxQASPlsSqjRDTRc="; + sha256 = "sha256-NOU4rSV4DRk+auvhKjI9tWWL5E3N3w4x9z0wRKjNznw="; }; - vendorSha256 = "sha256-iDzVe8wnvJlrY8F+LyzLkX+BlvkgUPOEDQqkUPNDuUg="; + vendorSha256 = "sha256-XY5D74fIgOCLtnUpQf+kGYARuAulhlQIG7G+GriDOSw="; doCheck = false; diff --git a/pkgs/tools/misc/yajsv/default.nix b/pkgs/tools/misc/yajsv/default.nix index cae0b9042c84..aaeba02ae35e 100644 --- a/pkgs/tools/misc/yajsv/default.nix +++ b/pkgs/tools/misc/yajsv/default.nix @@ -1,7 +1,9 @@ { buildGoModule, fetchFromGitHub, lib }: -let version = "1.4.0"; -in buildGoModule { +let + version = "1.4.1"; +in +buildGoModule { pname = "yajsv"; version = version; @@ -9,16 +11,15 @@ in buildGoModule { owner = "neilpa"; repo = "yajsv"; rev = "v${version}"; - sha256 = "0smaij3905fqgcjmnfs58r6silhp3hyv7ccshk7n13fmllmsm7v7"; + hash = "sha256-dp7PBN8yR+gPPUWA+ug11dUN7slU6CJAojuxt5eNTxA="; }; - patches = [ - ./go.mod.patch - ]; + vendorHash = "sha256-f45climGKl7HxD+1vz2TGqW/d0dqJ0RfvgJoRRM6lUk="; - vendorSha256 = "0jcm789las02prgl89va8xvvz98sjcyvzd9zqk3mwal656b5r3kz"; + ldflags = [ "-s" "-w" ]; doInstallCheck = true; + installCheckPhase = '' $out/bin/yajsv -v > /dev/null ''; diff --git a/pkgs/tools/misc/yajsv/go.mod.patch b/pkgs/tools/misc/yajsv/go.mod.patch deleted file mode 100644 index 3b1c09f81883..000000000000 --- a/pkgs/tools/misc/yajsv/go.mod.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff --git a/go.mod b/go.mod -index 9f96eaf..360ab47 100644 ---- a/go.mod -+++ b/go.mod -@@ -7,5 +7,6 @@ require ( - github.com/ghodss/yaml v1.0.0 - github.com/mitchellh/go-homedir v1.1.0 - github.com/xeipuuv/gojsonschema v1.2.0 -+ golang.org/x/text v0.3.7 - gopkg.in/yaml.v2 v2.2.8 // indirect - ) -diff --git a/go.sum b/go.sum -index 5b7e5c4..4b002ef 100644 ---- a/go.sum -+++ b/go.sum -@@ -1,4 +1,3 @@ --github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= - github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= - github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= - github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -@@ -17,6 +16,9 @@ github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 h1:EzJWgHo - github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ= - github.com/xeipuuv/gojsonschema v1.2.0 h1:LhYJRs+L4fBtjZUfuSZIKGeVu0QRy8e5Xi7D17UxZ74= - github.com/xeipuuv/gojsonschema v1.2.0/go.mod h1:anYRn/JVcOK2ZgGU+IjEV4nwlhoK5sQluxsYJ78Id3Y= -+golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk= -+golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= -+golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= - gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= - gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= - gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10= diff --git a/pkgs/tools/misc/yt-dlp/default.nix b/pkgs/tools/misc/yt-dlp/default.nix index 28902ecd2700..1b01cca1a3f9 100644 --- a/pkgs/tools/misc/yt-dlp/default.nix +++ b/pkgs/tools/misc/yt-dlp/default.nix @@ -20,11 +20,11 @@ buildPythonPackage rec { # The websites yt-dlp deals with are a very moving target. That means that # downloads break constantly. Because of that, updates should always be backported # to the latest stable release. - version = "2022.10.4"; + version = "2022.11.11"; src = fetchPypi { inherit pname version; - sha256 = "sha256-F3Ki5vMrlxtNAm3q4wRPV2uAUgNSVco0DzRc/pDTjTg="; + sha256 = "sha256-9rliAjwXp3FRR28Pbtcb6H0Bdim6XZmUUovFSFIRkbY="; }; propagatedBuildInputs = [ brotli certifi mutagen pycryptodomex websockets ]; diff --git a/pkgs/tools/networking/minio-client/default.nix b/pkgs/tools/networking/minio-client/default.nix index fcf71db2eebb..73eee807f818 100644 --- a/pkgs/tools/networking/minio-client/default.nix +++ b/pkgs/tools/networking/minio-client/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "minio-client"; - version = "2022-10-29T10-09-23Z"; + version = "2022-11-07T23-47-39Z"; src = fetchFromGitHub { owner = "minio"; repo = "mc"; rev = "RELEASE.${version}"; - sha256 = "sha256-9fXxHfSA/h6JjhKEY7PmPBJX1P127V+AekrBPFQEtSI="; + sha256 = "sha256-g7q2VONGySMlw+aWZfWnZ2TVvV4lOGMNXl/4IRQrEOs="; }; - vendorSha256 = "sha256-vW/hGvzAtd/q9Fbjr19TvpSZzFVX9HSGGSPWErw+v0A="; + vendorSha256 = "sha256-KD3mhl5d3LhqH37AeNmfuk5+KktWdUTNGi5YNuhyMDk="; subPackages = [ "." ]; diff --git a/pkgs/tools/networking/networkmanager/applet/default.nix b/pkgs/tools/networking/networkmanager/applet/default.nix index 0cdd01247653..c2dcf73ab173 100644 --- a/pkgs/tools/networking/networkmanager/applet/default.nix +++ b/pkgs/tools/networking/networkmanager/applet/default.nix @@ -25,11 +25,11 @@ stdenv.mkDerivation rec { pname = "network-manager-applet"; - version = "1.28.0"; + version = "1.30.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-XANIWB3p5hkYWqdLdH8H9AMSQX45Wv4LKTzJVd8U5Jw="; + sha256 = "sha256-lRa4Tp2fEA24mgxny/5XztsFYjENRcqvtjMuJ7vrXNM="; }; mesonFlags = [ @@ -43,7 +43,6 @@ stdenv.mkDerivation rec { libnma gtk3 networkmanager - libnotify libsecret gsettings-desktop-schemas polkit diff --git a/pkgs/tools/security/gopass/default.nix b/pkgs/tools/security/gopass/default.nix index 5d2f83b03767..abd19c92c387 100644 --- a/pkgs/tools/security/gopass/default.nix +++ b/pkgs/tools/security/gopass/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { pname = "gopass"; - version = "1.14.9"; + version = "1.14.10"; nativeBuildInputs = [ installShellFiles makeWrapper ]; @@ -21,10 +21,10 @@ buildGoModule rec { owner = "gopasspw"; repo = pname; rev = "v${version}"; - hash = "sha256-yVmEqT+pVU3ww1PUs30pr7fE3pprhVnDhlErdMD/KL8="; + hash = "sha256-a+JE/s94ynazX50LxVyywzVI5JINK22H76HHwEtw7K0="; }; - vendorHash = "sha256-efmBuaH4ZMYZixcafe7mB1jj5h0o8RE+kMB3K35aG4k="; + vendorHash = "sha256-2TlV2cRV/1kugDWo9mhQfDy5jRm6LzTIW54BhZlVt+0="; subPackages = [ "." ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index eacfcf404853..0406af635d00 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18691,6 +18691,8 @@ with pkgs; elfio = callPackage ../development/libraries/elfio { }; + emanote = haskell.lib.compose.justStaticExecutables haskellPackages.emanote; + enchant1 = callPackage ../development/libraries/enchant/1.x.nix { }; enchant2 = callPackage ../development/libraries/enchant/2.x.nix { }; @@ -30943,6 +30945,8 @@ with pkgs; navipowm = callPackage ../applications/misc/navipowm { }; + nc4nix = callPackage ../development/tools/nc4nix { }; + netbeans = callPackage ../applications/editors/netbeans { jdk = jdk17; }; @@ -31010,16 +31014,10 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Foundation; }; - obs-studio27 = libsForQt5.callPackage ../applications/video/obs-studio/27.nix { + obs-studio = qt6Packages.callPackage ../applications/video/obs-studio { ffmpeg_4 = ffmpeg-full; }; - obs-studio28 = qt6Packages.callPackage ../applications/video/obs-studio/28.nix { - ffmpeg_4 = ffmpeg-full; - }; - - obs-studio = obs-studio28; - obs-studio-plugins = recurseIntoAttrs (callPackage ../applications/video/obs-studio/plugins {}); wrapOBS = callPackage ../applications/video/obs-studio/wrapper.nix {}; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 44ffc7335c34..bf43f22c9b49 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -17,8 +17,10 @@ let "ghc902" "ghc90" "ghc924" + "ghc925" "ghc92" "ghc942" + "ghc943" "ghc94" "ghcHEAD" ]; @@ -28,8 +30,10 @@ let "ghc902" "ghc92" "ghc924" + "ghc925" "ghc94" "ghc942" + "ghc943" "ghcHEAD" ]; @@ -164,6 +168,23 @@ in { buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_12; llvmPackages = pkgs.llvmPackages_12; }; + ghc925 = callPackage ../development/compilers/ghc/9.2.5.nix { + bootPkgs = + # aarch64 ghc8107Binary exceeds max output size on hydra + if stdenv.hostPlatform.isAarch then + packages.ghc8107BinaryMinimal + else if stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isLittleEndian then + packages.ghc810 + else + packages.ghc8107Binary; + inherit (buildPackages.python3Packages) sphinx; + # Need to use apple's patched xattr until + # https://github.com/xattr/xattr/issues/44 and + # https://github.com/xattr/xattr/issues/55 are solved. + inherit (buildPackages.darwin) xattr autoSignDarwinBinariesHook; + buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_12; + llvmPackages = pkgs.llvmPackages_12; + }; ghc92 = ghc924; ghc942 = callPackage ../development/compilers/ghc/9.4.2.nix { bootPkgs = @@ -189,10 +210,34 @@ in { buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_12; llvmPackages = pkgs.llvmPackages_12; }; + ghc943 = callPackage ../development/compilers/ghc/9.4.3.nix { + bootPkgs = + # Building with 9.2 is broken due to + # https://gitlab.haskell.org/ghc/ghc/-/issues/21914 + # Use 8.10 as a workaround where possible to keep bootstrap path short. + + # On ARM text won't build with GHC 8.10.* + if stdenv.hostPlatform.isAarch then + # TODO(@sternenseemann): package bindist + packages.ghc902 + # No suitable bindists for powerpc64le + else if stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isLittleEndian then + packages.ghc902 + else + packages.ghc8107Binary; + inherit (buildPackages.python3Packages) sphinx; + # Need to use apple's patched xattr until + # https://github.com/xattr/xattr/issues/44 and + # https://github.com/xattr/xattr/issues/55 are solved. + inherit (buildPackages.darwin) xattr autoSignDarwinBinariesHook; + # Support range >= 10 && < 14 + buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_12; + llvmPackages = pkgs.llvmPackages_12; + }; ghc94 = ghc942; ghcHEAD = callPackage ../development/compilers/ghc/head.nix { bootPkgs = - # For GHC 9.2.3 and 9.2.4 no armv7l bindists are available. + # For GHC 9.2 no armv7l bindists are available. if stdenv.hostPlatform.isAarch32 then packages.ghc924 else if stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isLittleEndian then @@ -310,13 +355,23 @@ in { ghc = bh.compiler.ghc924; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.2.x.nix { }; }; + ghc925 = callPackage ../development/haskell-modules { + buildHaskellPackages = bh.packages.ghc925; + ghc = bh.compiler.ghc925; + compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.2.x.nix { }; + }; ghc92 = ghc924; ghc942 = callPackage ../development/haskell-modules { buildHaskellPackages = bh.packages.ghc942; ghc = bh.compiler.ghc942; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.4.x.nix { }; }; - ghc94= ghc942; + ghc943 = callPackage ../development/haskell-modules { + buildHaskellPackages = bh.packages.ghc943; + ghc = bh.compiler.ghc943; + compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.4.x.nix { }; + }; + ghc94 = ghc942; ghcHEAD = callPackage ../development/haskell-modules { buildHaskellPackages = bh.packages.ghcHEAD; ghc = bh.compiler.ghcHEAD; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 7276fab86d8a..0a218ef11d9d 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -956,6 +956,8 @@ let else null; + ocamlc-loc = callPackage ../development/ocaml-modules/ocamlc-loc { }; + ocaml_cryptgps = callPackage ../development/ocaml-modules/cryptgps { }; ocaml_expat = diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index baa93c2bff76..efef4c769435 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -53,7 +53,9 @@ let ghc8107 ghc902 ghc924 + ghc925 ghc942 + ghc943 ]; # packagePlatforms applied to `haskell.packages.*` @@ -178,6 +180,7 @@ let dhall-nix diagrams-builder elm2nix + emanote fffuu futhark ghcid @@ -334,7 +337,7 @@ let }; haskell.packages.native-bignum.ghc924 = { - inherit (packagePlatforms pkgs.pkgsStatic.haskell.packages.native-bignum.ghc92) + inherit (packagePlatforms pkgs.pkgsStatic.haskell.packages.native-bignum.ghc924) hello lens random @@ -366,6 +369,7 @@ let compilerNames.ghc8107 compilerNames.ghc902 compilerNames.ghc924 + compilerNames.ghc925 # https://github.com/ndmitchell/hlint/issues/1413 ]; hpack = released; @@ -393,9 +397,11 @@ let compilerNames.ghc8107 compilerNames.ghc902 compilerNames.ghc924 + compilerNames.ghc925 ]; purescript = [ compilerNames.ghc924 + compilerNames.ghc925 ]; purescript-cst = [ compilerNames.ghc8107 @@ -470,10 +476,12 @@ let jobs.pkgsMusl.haskell.compiler.ghc8107 jobs.pkgsMusl.haskell.compiler.ghc902 jobs.pkgsMusl.haskell.compiler.ghc924 + jobs.pkgsMusl.haskell.compiler.ghc925 jobs.pkgsMusl.haskell.compiler.ghcHEAD jobs.pkgsMusl.haskell.compiler.integer-simple.ghc8107 jobs.pkgsMusl.haskell.compiler.native-bignum.ghc902 jobs.pkgsMusl.haskell.compiler.native-bignum.ghc924 + jobs.pkgsMusl.haskell.compiler.native-bignum.ghc925 jobs.pkgsMusl.haskell.compiler.native-bignum.ghcHEAD ]; };