lol

Merge staging-next into staging

authored by

github-actions[bot] and committed by
GitHub
d3c8e396 1129b8d0

+2118 -917
+1 -1
lib/options.nix
··· 123 123 Example: 124 124 mkPackageOption pkgs "GHC" { 125 125 default = [ "ghc" ]; 126 - example = "pkgs.haskell.packages.ghc924.ghc.withPackages (hkgs: [ hkgs.primes ])"; 126 + example = "pkgs.haskell.packages.ghc92.ghc.withPackages (hkgs: [ hkgs.primes ])"; 127 127 } 128 128 => { _type = "option"; default = «derivation /nix/store/jxx55cxsjrf8kyh3fp2ya17q99w7541r-ghc-8.10.7.drv»; defaultText = { ... }; description = "The GHC package to use."; example = { ... }; type = { ... }; } 129 129 */
+1 -1
nixos/doc/manual/from_md/release-notes/rl-2111.section.xml
··· 2106 2106 <literal>ghc810</literal>. Those attributes point to the same 2107 2107 compilers and packagesets but have the advantage that e.g. 2108 2108 <literal>ghc92</literal> stays stable when we update from 2109 - <literal>ghc924</literal> to <literal>ghc925</literal>. 2109 + <literal>ghc925</literal> to <literal>ghc926</literal>. 2110 2110 </para> 2111 2111 </listitem> 2112 2112 </itemizedlist>
+8
nixos/doc/manual/from_md/release-notes/rl-2211.section.xml
··· 952 952 </listitem> 953 953 <listitem> 954 954 <para> 955 + <literal>obs-studio</literal> hase been updated to version 28. 956 + If you have packaged custom plugins, check if they are 957 + compatible. <literal>obs-websocket</literal> has been 958 + integrated into <literal>obs-studio</literal>. 959 + </para> 960 + </listitem> 961 + <listitem> 962 + <para> 955 963 <literal>signald</literal> has been bumped to 956 964 <literal>0.23.0</literal>. For the upgrade, a migration 957 965 process is necessary. It can be done by running a command like
+1 -1
nixos/doc/manual/release-notes/rl-2111.section.md
··· 576 576 577 577 - More jdk and jre versions are now exposed via `java-packages.compiler`. 578 578 579 - - 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`. 579 + - 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`.
+2
nixos/doc/manual/release-notes/rl-2211.section.md
··· 288 288 289 289 - `percona-server56` has been removed. Please migrate to `mysql` or `mariadb` if possible. 290 290 291 + - `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`. 292 + 291 293 - `signald` has been bumped to `0.23.0`. For the upgrade, a migration process is necessary. It can be 292 294 done by running a command like this before starting `signald.service`: 293 295
-3
nixos/lib/testing-python.nix
··· 9 9 # Modules to add to each VM 10 10 , extraConfigurations ? [ ] 11 11 }: 12 - 13 - with pkgs; 14 - 15 12 let 16 13 nixos-lib = import ./default.nix { inherit (pkgs) lib; }; 17 14 in
+1 -2
pkgs/applications/blockchains/trezor-suite/default.nix
··· 42 42 cp -a ${appimageContents}/resources/images/ $out/share/${pname}/resources 43 43 44 44 install -m 444 -D ${appimageContents}/${pname}.desktop $out/share/applications/${pname}.desktop 45 - install -m 444 -D ${appimageContents}/${pname}.png $out/share/icons/hicolor/512x512/apps/${pname}.png 46 - install -m 444 -D ${appimageContents}/resources/images/icons/512x512.png $out/share/icons/hicolor/512x512/apps/${pname}.png 45 + install -m 444 -D ${appimageContents}/resources/images/desktop/512x512.png $out/share/icons/hicolor/512x512/apps/${pname}.png 47 46 substituteInPlace $out/share/applications/${pname}.desktop \ 48 47 --replace 'Exec=AppRun --no-sandbox %U' 'Exec=${pname}' 49 48
+3 -3
pkgs/applications/file-managers/felix-fm/default.nix
··· 2 2 3 3 rustPlatform.buildRustPackage rec { 4 4 pname = "felix"; 5 - version = "1.3.2"; 5 + version = "2.0.0"; 6 6 7 7 src = fetchFromGitHub { 8 8 owner = "kyoheiu"; 9 9 repo = pname; 10 10 rev = "v${version}"; 11 - sha256 = "sha256-DXsuTmkfzWbjpTb3ZJRVSDGgivDlEQraqAeyRzAB4UU="; 11 + sha256 = "sha256-ennEFhnAxsEtZ1LEyr9xeeR4v5IG1Vm2gs4A09IyciE="; 12 12 }; 13 13 14 - cargoSha256 = "sha256-gv7ujyAbFEpz95cHRDKPxUW2TiYiJz35jfiKlzi6gJY="; 14 + cargoSha256 = "sha256-unSeb8LHgJ0TspbBLhGGU6Pqy1kLMEzgIIblLUyRQWw="; 15 15 16 16 checkInputs = [ zoxide ]; 17 17
+9 -2
pkgs/applications/networking/cluster/kompose/default.nix
··· 1 - { lib, buildGoModule, fetchFromGitHub, installShellFiles, testers, kompose, git }: 1 + { lib, buildGoModule, fetchFromGitHub, fetchpatch, installShellFiles, testers, kompose, git }: 2 2 3 3 buildGoModule rec { 4 4 pname = "kompose"; ··· 11 11 sha256 = "sha256-NfzqGG5ZwPpmjhvcvXN1AA+kfZG/oujbAEtXkm1mzeU="; 12 12 }; 13 13 14 - vendorSha256 = "sha256-OR5U2PnebO0a+lwU09Dveh0Yxk91cmSRorTxQIO5lHc="; 14 + vendorHash = "sha256-/i4R50heqf0v2F2GTZCKGq10+xKKr+zPkqWKa+afue8="; 15 + 16 + patches = [ 17 + (fetchpatch { 18 + url = "https://github.com/kubernetes/kompose/commit/0964a7ccd16504b6e5ef49a07978c87cca803d46.patch"; 19 + hash = "sha256-NMHLxx7Ae6Z+pacj538ivxIby7rNz3IbfDPbeLA0sMc="; 20 + }) 21 + ]; 15 22 16 23 nativeBuildInputs = [ installShellFiles git ]; 17 24
+5 -5
pkgs/applications/networking/cluster/kpt/default.nix
··· 1 - { buildGoModule, fetchFromGitHub, lib }: 1 + { buildGoModule, fetchFromGitHub, lib, stdenv }: 2 2 3 3 buildGoModule rec { 4 4 pname = "kpt"; 5 - version = "0.39.2"; 5 + version = "0.39.3"; 6 6 7 7 src = fetchFromGitHub { 8 8 owner = "GoogleContainerTools"; 9 9 repo = pname; 10 10 rev = "v${version}"; 11 - sha256 = "sha256-PG4SzycXRguKyaQ7LDnTtxF3EgqcjfjeEWD5rROXBPI="; 11 + hash = "sha256-vidrKfmP0Lw6EYYufLDxh3ROOJ3hPIusDTI/Hr73NYM="; 12 12 }; 13 13 14 - vendorSha256 = "sha256-CoXlUX9hkP8gijA/vg19AS9030w95A2oKGD1wjzO8ak="; 14 + vendorHash = "sha256-CoXlUX9hkP8gijA/vg19AS9030w95A2oKGD1wjzO8ak="; 15 15 16 16 subPackages = [ "." ]; 17 17 ··· 22 22 homepage = "https://googlecontainertools.github.io/kpt/"; 23 23 license = licenses.asl20; 24 24 maintainers = with maintainers; [ mikefaille ]; 25 - platforms = platforms.linux ++ platforms.darwin; 25 + broken = stdenv.isDarwin; 26 26 }; 27 27 }
+33 -3
pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix
··· 14 14 , json-glib 15 15 , libmspack 16 16 , webkitgtk_4_1 17 + , substituteAll 18 + , _experimental-update-script-combinators 19 + , glib 17 20 }: 18 21 19 22 stdenv.mkDerivation rec { ··· 24 27 url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; 25 28 sha256 = "p5Jp7wnoqAuo8My8ZDMl0rsFc0158G8x8lAehWfLjb0="; 26 29 }; 30 + 31 + patches = [ 32 + # evolution-ews contains .so files loaded by evolution-data-server refering 33 + # schemas from evolution. evolution-data-server is not wrapped with 34 + # evolution's schemas because it would be a circular dependency with 35 + # evolution. 36 + (substituteAll { 37 + src = ./hardcode-gsettings.patch; 38 + evo = glib.makeSchemaPath evolution evolution.name; 39 + }) 40 + ]; 27 41 28 42 nativeBuildInputs = [ 29 43 cmake ··· 50 64 ]; 51 65 52 66 passthru = { 53 - updateScript = gnome.updateScript { 54 - packageName = "evolution-ews"; 55 - versionPolicy = "odd-unstable"; 67 + hardcodeGsettingsPatch = glib.mkHardcodeGsettingsPatch { 68 + inherit src; 69 + glib-schema-to-var = { 70 + "org.gnome.evolution.mail" = "evo"; 71 + "org.gnome.evolution.calendar" = "evo"; 72 + }; 56 73 }; 74 + 75 + updateScript = 76 + let 77 + updateSource = gnome.updateScript { 78 + packageName = "evolution-ews"; 79 + versionPolicy = "odd-unstable"; 80 + }; 81 + updatePatch = _experimental-update-script-combinators.copyAttrOutputToFile "evolution-ews.hardcodeGsettingsPatch" ./hardcode-gsettings.patch; 82 + in 83 + _experimental-update-script-combinators.sequence [ 84 + updateSource 85 + updatePatch 86 + ]; 57 87 }; 58 88 59 89 meta = with lib; {
+72
pkgs/applications/networking/mailreaders/evolution/evolution-ews/hardcode-gsettings.patch
··· 1 + diff --git a/src/EWS/camel/camel-ews-utils.c b/src/EWS/camel/camel-ews-utils.c 2 + index 0707f72..1e71954 100644 3 + --- a/src/EWS/camel/camel-ews-utils.c 4 + +++ b/src/EWS/camel/camel-ews-utils.c 5 + @@ -1552,7 +1552,18 @@ ews_utils_save_category_changes (GHashTable *old_categories, /* gchar *guid ~> C 6 + 7 + evo_labels = g_ptr_array_new_full (5, g_free); 8 + 9 + - settings = g_settings_new ("org.gnome.evolution.mail"); 10 + + { 11 + + g_autoptr(GSettingsSchemaSource) schema_source; 12 + + g_autoptr(GSettingsSchema) schema; 13 + + schema_source = g_settings_schema_source_new_from_directory("@evo@", 14 + + g_settings_schema_source_get_default(), 15 + + TRUE, 16 + + NULL); 17 + + schema = g_settings_schema_source_lookup(schema_source, 18 + + "org.gnome.evolution.mail", 19 + + FALSE); 20 + + settings = g_settings_new_full(schema, NULL, NULL); 21 + + } 22 + strv = g_settings_get_strv (settings, "labels"); 23 + 24 + for (ii = 0; strv && strv[ii]; ii++) { 25 + diff --git a/src/EWS/common/e-ews-calendar-utils.c b/src/EWS/common/e-ews-calendar-utils.c 26 + index 6deda60..9b44cc7 100644 27 + --- a/src/EWS/common/e-ews-calendar-utils.c 28 + +++ b/src/EWS/common/e-ews-calendar-utils.c 29 + @@ -413,7 +413,18 @@ ews_get_configured_icaltimezone (void) 30 + gchar *location; 31 + ICalTimezone *zone = NULL; 32 + 33 + - settings = g_settings_new ("org.gnome.evolution.calendar"); 34 + + { 35 + + g_autoptr(GSettingsSchemaSource) schema_source; 36 + + g_autoptr(GSettingsSchema) schema; 37 + + schema_source = g_settings_schema_source_new_from_directory("@evo@", 38 + + g_settings_schema_source_get_default(), 39 + + TRUE, 40 + + NULL); 41 + + schema = g_settings_schema_source_lookup(schema_source, 42 + + "org.gnome.evolution.calendar", 43 + + FALSE); 44 + + settings = g_settings_new_full(schema, NULL, NULL); 45 + + } 46 + location = g_settings_get_string (settings, "timezone"); 47 + if (location) { 48 + zone = i_cal_timezone_get_builtin_timezone (location); 49 + diff --git a/src/Microsoft365/camel/camel-m365-store.c b/src/Microsoft365/camel/camel-m365-store.c 50 + index ff1b8e3..4f876c0 100644 51 + --- a/src/Microsoft365/camel/camel-m365-store.c 52 + +++ b/src/Microsoft365/camel/camel-m365-store.c 53 + @@ -309,7 +309,18 @@ m365_store_save_category_changes (GHashTable *old_categories, /* gchar *id ~> Ca 54 + 55 + evo_labels = g_ptr_array_new_full (5, g_free); 56 + 57 + - settings = g_settings_new ("org.gnome.evolution.mail"); 58 + + { 59 + + g_autoptr(GSettingsSchemaSource) schema_source; 60 + + g_autoptr(GSettingsSchema) schema; 61 + + schema_source = g_settings_schema_source_new_from_directory("@evo@", 62 + + g_settings_schema_source_get_default(), 63 + + TRUE, 64 + + NULL); 65 + + schema = g_settings_schema_source_lookup(schema_source, 66 + + "org.gnome.evolution.mail", 67 + + FALSE); 68 + + settings = g_settings_new_full(schema, NULL, NULL); 69 + + } 70 + strv = g_settings_get_strv (settings, "labels"); 71 + 72 + for (ii = 0; strv && strv[ii]; ii++) {
-7
pkgs/applications/video/obs-studio/27.nix
··· 1 - { callPackage, qtx11extras, ... } @ args: 2 - 3 - callPackage ./generic.nix (args // { 4 - version = "27.2.4"; 5 - sha256 = "sha256-OiSejQovSmhItrnrQlcVp9PCDRgAhuxTinSpXbH8bo0="; 6 - extraBuildInputs = [ qtx11extras ]; 7 - })
-22
pkgs/applications/video/obs-studio/28.nix
··· 1 - { callPackage 2 - , libajantv2 3 - , librist 4 - , srt 5 - , qtwayland 6 - , ... 7 - } @ args: 8 - 9 - callPackage ./generic.nix (args // { 10 - version = "28.0.3"; 11 - sha256 = "sha256-+4H1BjEgxqkAEvRyr2Tg3wXutnMvlYQEdT5jz644fMA="; 12 - extraPatches = [ ./Provide-runtime-plugin-destination-as-relative-path.patch ]; 13 - extraBuildInputs = [ 14 - libajantv2 15 - librist 16 - srt 17 - qtwayland 18 - ]; 19 - extraCMakeFlags = [ 20 - "-DENABLE_JACK=ON" 21 - ]; 22 - })
+15 -11
pkgs/applications/video/obs-studio/generic.nix pkgs/applications/video/obs-studio/default.nix
··· 1 - { version 2 - , sha256 3 - , extraPatches ? [ ] 4 - , extraBuildInputs ? [ ] 5 - , extraCMakeFlags ? [ ] 6 - , config 1 + { config 7 2 , lib 8 3 , stdenv 9 4 , fetchFromGitHub ··· 41 36 , pipewireSupport ? stdenv.isLinux 42 37 , pipewire 43 38 , libdrm 39 + , libajantv2 40 + , librist 41 + , srt 42 + , qtwayland 44 43 , wrapQtAppsHook 45 44 , ... 46 45 }: ··· 51 50 in 52 51 stdenv.mkDerivation rec { 53 52 pname = "obs-studio"; 54 - inherit version; 53 + version = "28.1.2"; 55 54 56 55 src = fetchFromGitHub { 57 56 owner = "obsproject"; 58 57 repo = "obs-studio"; 59 58 rev = version; 60 - inherit sha256; 59 + sha256 = "sha256-M5UEOtdzXBVY0UGfwWx3MsM28bJ1EcVPl8acWXWV0lg="; 61 60 fetchSubmodules = true; 62 61 }; 63 62 64 63 patches = [ 65 64 # Lets obs-browser build against CEF 90.1.0+ 66 65 ./Enable-file-access-and-universal-access-for-file-URL.patch 67 - ] ++ extraPatches; 66 + ./Provide-runtime-plugin-destination-as-relative-path.patch 67 + ]; 68 68 69 69 nativeBuildInputs = [ 70 70 addOpenGLRunpath ··· 94 94 libvlc 95 95 mbedtls 96 96 pciutils 97 + libajantv2 98 + librist 99 + srt 100 + qtwayland 97 101 ] 98 - ++ extraBuildInputs 99 102 ++ optionals scriptingSupport [ luajit python3 ] 100 103 ++ optional alsaSupport alsa-lib 101 104 ++ optional pulseaudioSupport libpulseaudio ··· 123 126 # Add support for browser source 124 127 "-DBUILD_BROWSER=ON" 125 128 "-DCEF_ROOT_DIR=../../cef" 126 - ] ++ extraCMakeFlags; 129 + "-DENABLE_JACK=ON" 130 + ]; 127 131 128 132 dontWrapGApps = true; 129 133 preFixup = ''
+5 -5
pkgs/applications/video/obs-studio/plugins/default.nix
··· 1 - { callPackage, libsForQt5, pkgsi686Linux }: 1 + { callPackage, qt6Packages, pkgsi686Linux }: 2 2 3 3 # When adding new plugins: 4 4 # - Respect alphabetical order. On diversion, file a PR. ··· 8 8 { 9 9 looking-glass-obs = callPackage ./looking-glass-obs.nix { }; 10 10 11 - obs-backgroundremoval = callPackage ./obs-backgroundremoval.nix { }; 11 + obs-backgroundremoval = callPackage ./obs-backgroundremoval { }; 12 12 13 13 obs-gstreamer = callPackage ./obs-gstreamer.nix { }; 14 14 15 - obs-hyperion = libsForQt5.callPackage ./obs-hyperion/default.nix { }; 15 + obs-hyperion = qt6Packages.callPackage ./obs-hyperion/default.nix { }; 16 16 17 17 obs-move-transition = callPackage ./obs-move-transition.nix { }; 18 18 19 - obs-multi-rtmp = libsForQt5.callPackage ./obs-multi-rtmp.nix { }; 19 + obs-multi-rtmp = qt6Packages.callPackage ./obs-multi-rtmp { }; 20 20 21 - obs-ndi = libsForQt5.callPackage ./obs-ndi.nix { }; 21 + obs-ndi = qt6Packages.callPackage ./obs-ndi.nix { }; 22 22 23 23 obs-nvfbc = callPackage ./obs-nvfbc.nix { }; 24 24
-13
pkgs/applications/video/obs-studio/plugins/fix-search-path.patch
··· 1 - diff --git a/external/FindLibObs.cmake b/external/FindLibObs.cmake 2 - index ab0a3de..19c63ee 100644 3 - --- a/external/FindLibObs.cmake 4 - +++ b/external/FindLibObs.cmake 5 - @@ -95,7 +95,7 @@ if(LIBOBS_FOUND) 6 - 7 - set(LIBOBS_INCLUDE_DIRS ${LIBOBS_INCLUDE_DIR} ${W32_PTHREADS_INCLUDE_DIR}) 8 - set(LIBOBS_LIBRARIES ${LIBOBS_LIB} ${W32_PTHREADS_LIB}) 9 - - include(${LIBOBS_INCLUDE_DIR}/../cmake/external/ObsPluginHelpers.cmake) 10 - + include(external/ObsPluginHelpers.cmake) 11 - 12 - # allows external plugins to easily use/share common dependencies that are often included with libobs (such as FFmpeg) 13 - if(NOT DEFINED INCLUDED_LIBOBS_CMAKE_MODULES)
+13 -11
pkgs/applications/video/obs-studio/plugins/hardcode-ndi-path.patch
··· 1 1 diff --git a/src/obs-ndi.cpp b/src/obs-ndi.cpp 2 - index 493831c..7b0f8db 100644 2 + index 1a8aeb3..9a36ea9 100644 3 3 --- a/src/obs-ndi.cpp 4 4 +++ b/src/obs-ndi.cpp 5 - @@ -197,11 +197,7 @@ const char* obs_module_description() 6 - const NDIlib_v4* load_ndilib() 7 - { 8 - QStringList locations; 9 - - locations << QString(qgetenv(NDILIB_REDIST_FOLDER)); 5 + @@ -132,13 +132,7 @@ const NDIlib_v5 *load_ndilib() 6 + const char *redistFolder = std::getenv(NDILIB_REDIST_FOLDER); 7 + if (redistFolder) 8 + libraryLocations.push_back(redistFolder); 10 9 -#if defined(__linux__) || defined(__APPLE__) 11 - - locations << "/usr/lib"; 12 - - locations << "/usr/local/lib"; 10 + - libraryLocations.push_back("/usr/lib"); 11 + - libraryLocations.push_back("/usr/lib64"); 12 + - libraryLocations.push_back("/usr/lib/x86_64-linux-gnu"); 13 + - libraryLocations.push_back("/usr/local/lib"); 14 + - libraryLocations.push_back("/usr/local/lib64"); 13 15 -#endif 14 - + locations << "@NDI@/lib"; 16 + + libraryLocations.push_back("@NDI@/lib"); 15 17 16 - for (QString path : locations) { 17 - blog(LOG_INFO, "Trying '%s'", path.toUtf8().constData()); 18 + for (std::string path : libraryLocations) { 19 + blog(LOG_DEBUG, "[load_ndilib] Trying library path: '%s'", path.c_str());
+4 -4
pkgs/applications/video/obs-studio/plugins/obs-backgroundremoval-includes.patch pkgs/applications/video/obs-studio/plugins/obs-backgroundremoval/includes.patch
··· 1 1 diff --git a/src/Model.h b/src/Model.h 2 - index 5c21eae..74b8078 100644 2 + index 6a73745..6bb8a7d 100644 3 3 --- a/src/Model.h 4 4 +++ b/src/Model.h 5 5 @@ -1,13 +1,8 @@ ··· 13 13 -#include <onnxruntime_cxx_api.h> 14 14 -#include <cpu_provider_factory.h> 15 15 -#endif 16 - #ifdef _WIN32 16 + 17 17 #ifdef WITH_CUDA 18 18 #include <cuda_provider_factory.h> 19 19 diff --git a/src/background-filter.cpp b/src/background-filter.cpp 20 - index 9fa5794..5d66aee 100644 20 + index 0853818..32c6483 100644 21 21 --- a/src/background-filter.cpp 22 22 +++ b/src/background-filter.cpp 23 23 @@ -1,13 +1,8 @@ ··· 31 31 -#include <onnxruntime_cxx_api.h> 32 32 -#include <cpu_provider_factory.h> 33 33 -#endif 34 - #ifdef _WIN32 35 34 #ifdef WITH_CUDA 36 35 #include <cuda_provider_factory.h> 36 + #endif
+12 -6
pkgs/applications/video/obs-studio/plugins/obs-backgroundremoval.nix pkgs/applications/video/obs-studio/plugins/obs-backgroundremoval/default.nix
··· 1 1 { lib 2 2 , stdenv 3 3 , fetchFromGitHub 4 - , fetchpatch 5 4 , cmake 6 5 , obs-studio 7 6 , onnxruntime ··· 10 9 11 10 stdenv.mkDerivation rec { 12 11 pname = "obs-backgroundremoval"; 13 - version = "0.4.0"; 12 + version = "unstable-2022-05-02"; 14 13 15 14 src = fetchFromGitHub { 16 15 owner = "royshil"; 17 16 repo = "obs-backgroundremoval"; 18 - rev = "v${version}"; 19 - sha256 = "sha256-TI1FlhE0+JL50gAZCSsI+g8savX8GRQkH3jYli/66hQ="; 17 + rev = "cc9d4a5711f9388ed110230f9f793bb071577a23"; 18 + hash = "sha256-xkVZ4cB642p4DvZAPwI2EVhkfVl5lJhgOQobjNMqpec="; 20 19 }; 21 20 21 + patches = [ 22 + # Fix c++ include directives 23 + ./includes.patch 24 + 25 + # Use CPU backend instead of CUDA/DirectML 26 + ./use-cpu-backend.patch 27 + ]; 28 + 22 29 nativeBuildInputs = [ cmake ]; 23 30 buildInputs = [ obs-studio onnxruntime opencv ]; 24 31 ··· 29 36 "-DOnnxruntime_INCLUDE_DIRS=${onnxruntime.dev}/include/onnxruntime/core/session" 30 37 ]; 31 38 32 - patches = [ ./obs-backgroundremoval-includes.patch ]; 33 39 34 40 prePatch = '' 35 - sed -i 's/version_from_git()/set(VERSION "${version}")/' CMakeLists.txt 41 + sed -i 's/version_from_git()/set(VERSION "0.4.0")/' CMakeLists.txt 36 42 ''; 37 43 38 44 meta = with lib; {
+32
pkgs/applications/video/obs-studio/plugins/obs-backgroundremoval/use-cpu-backend.patch
··· 1 + From d04e167f9081a3ec8c49f0967b5b0cec79e40e4d Mon Sep 17 00:00:00 2001 2 + From: Raphael Robatsch <raphael-git@tapesoftware.net> 3 + Date: Fri, 14 Oct 2022 16:55:36 +0200 4 + Subject: [PATCH] unix: use CPU backend instead of DirectML 5 + 6 + --- 7 + src/background-filter.cpp | 6 +++++- 8 + 1 file changed, 5 insertions(+), 1 deletion(-) 9 + 10 + diff --git a/src/background-filter.cpp b/src/background-filter.cpp 11 + index 32c6483..55e838f 100644 12 + --- a/src/background-filter.cpp 13 + +++ b/src/background-filter.cpp 14 + @@ -205,10 +205,14 @@ static void createOrtSession(struct background_removal_filter *tf) { 15 + if (tf->useGPU == USEGPU_CUDA) { 16 + Ort::ThrowOnError(OrtSessionOptionsAppendExecutionProvider_CUDA(sessionOptions, 0)); 17 + } 18 + -#else 19 + +#elseif _WIN32 20 + if (tf->useGPU == USEGPU_DML) { 21 + Ort::ThrowOnError(OrtSessionOptionsAppendExecutionProvider_DML(sessionOptions, 0)); 22 + } 23 + +#else 24 + + if (tf->useGPU == USEGPU_CPU) { 25 + + Ort::ThrowOnError(OrtSessionOptionsAppendExecutionProvider_CPU(sessionOptions, 0)); 26 + + } 27 + #endif 28 + tf->session.reset(new Ort::Session(*tf->env, tf->modelFilepath, sessionOptions)); 29 + } catch (const std::exception& e) { 30 + -- 31 + 2.37.3 32 +
+6
pkgs/applications/video/obs-studio/plugins/obs-hyperion/default.nix
··· 29 29 chmod -R a+w external 30 30 ''; 31 31 32 + postInstall = '' 33 + # Remove flatbuffers install 34 + rm -rf $out/bin $out/lib/{libflatbuffers.a,cmake,pkgconfig} $out/include 35 + ''; 36 + 32 37 meta = with lib; { 33 38 description = "OBS Studio plugin to connect to a Hyperion.ng server"; 34 39 homepage = "https://github.com/hyperion-project/hyperion-obs-plugin"; 35 40 license = licenses.mit; 36 41 maintainers = with maintainers; [ algram ]; 37 42 platforms = [ "x86_64-linux" ]; 43 + broken = true; # Not compatible with qt6 yet but required by OBS28 38 44 }; 39 45 }
+4 -9
pkgs/applications/video/obs-studio/plugins/obs-move-transition.nix
··· 7 7 8 8 stdenv.mkDerivation rec { 9 9 pname = "obs-move-transition"; 10 - version = "2.6.4"; 10 + version = "2.7.1"; 11 11 12 12 src = fetchFromGitHub { 13 13 owner = "exeldro"; 14 14 repo = "obs-move-transition"; 15 15 rev = version; 16 - sha256 = "sha256-+kAdCM5PEFNxKNmJmf2ASTyUKA7xnbMAA7kP/emoaeI="; 16 + sha256 = "sha256-zWHQ01iNTlqSAKcmsDCUZPXmmBIpqY/ZDftD5J6kp80="; 17 17 }; 18 18 19 19 nativeBuildInputs = [ cmake ]; 20 20 buildInputs = [ obs-studio ]; 21 21 22 - preConfigure = '' 23 - cp ${obs-studio.src}/cmake/external/ObsPluginHelpers.cmake cmake/ 22 + postInstall = '' 23 + rm -rf $out/obs-plugins $out/data 24 24 ''; 25 - 26 - cmakeFlags = [ 27 - "-DBUILD_OUT_OF_TREE=On" 28 - "-Wno-dev" 29 - ]; 30 25 31 26 meta = with lib; { 32 27 description = "Plugin for OBS Studio to move source to a new position during scene transition";
+5 -4
pkgs/applications/video/obs-studio/plugins/obs-multi-rtmp.nix pkgs/applications/video/obs-studio/plugins/obs-multi-rtmp/default.nix
··· 2 2 3 3 stdenv.mkDerivation rec { 4 4 pname = "obs-multi-rtmp"; 5 - version = "0.2.8.1"; 5 + version = "0.2.8.1-OBS28"; 6 6 7 7 src = fetchFromGitHub { 8 8 owner = "sorayuki"; 9 9 repo = "obs-multi-rtmp"; 10 10 rev = version; 11 - sha256 = "sha256-OhatuSlDJ2VDNorM4QfoKPYKyv5YpN8EnIelLdBTlZ0="; 11 + sha256 = "sha256-1W+c8Y0AmtKQmCIg8IDAaYYStQzDpZRuqw3vZEY5ncU="; 12 12 }; 13 13 14 14 nativeBuildInputs = [ cmake ]; 15 15 buildInputs = [ obs-studio qtbase ]; 16 16 17 - cmakeFlags = [ 18 - "-DLIBOBS_INCLUDE_DIR=${obs-studio}/include/obs" 17 + patches = [ 18 + # Patch cmake file to link against the obs build output, instead of its sources 19 + ./fix-build.patch 19 20 ]; 20 21 21 22 dontWrapQtApps = true;
+54
pkgs/applications/video/obs-studio/plugins/obs-multi-rtmp/fix-build.patch
··· 1 + From 72aeddb52c2b656bfec918097ad07a0ff092008b Mon Sep 17 00:00:00 2001 2 + From: Raphael Robatsch <raphael-git@tapesoftware.net> 3 + Date: Thu, 13 Oct 2022 21:34:21 +0200 4 + Subject: [PATCH] Link against OBS public interface instead of sources 5 + 6 + --- 7 + CMakeLists.txt | 22 ++++------------------ 8 + 1 file changed, 4 insertions(+), 18 deletions(-) 9 + 10 + diff --git a/CMakeLists.txt b/CMakeLists.txt 11 + index 27e20f8..8725c5b 100644 12 + --- a/CMakeLists.txt 13 + +++ b/CMakeLists.txt 14 + @@ -65,15 +65,9 @@ if (WIN32) 15 + "/def:${CMAKE_CURRENT_BINARY_DIR}/obs-frontend-api.def" 16 + "/out:${CMAKE_CURRENT_BINARY_DIR}/obs-frontend-api.lib" 17 + ) 18 + -elseif (APPLE) 19 + - # macOS 20 + - find_library(_LIB_OBS "${LIB_OBS}.0.dylib" PATHS ${OBS_BIN_DIR} REQUIRED) 21 + - set(LIB_OBS "${_LIB_OBS}") 22 + -elseif (UNIX) 23 + - # Linux 24 + - find_package(LibObs REQUIRED) 25 + else () 26 + - message(FATAL_ERROR "Unsupported OS!") 27 + + find_package(libobs REQUIRED) 28 + + find_package(obs-frontend-api REQUIRED) 29 + endif () 30 + 31 + 32 + @@ -96,18 +90,10 @@ if (WIN32) 33 + "${CMAKE_CURRENT_BINARY_DIR}/version.rc" 34 + ) 35 + endif () 36 + -target_include_directories(obs-multi-rtmp PRIVATE 37 + - "${OBS_SRC_DIR}/libobs" 38 + - "${OBS_SRC_DIR}/UI/obs-frontend-api" 39 + -) 40 + -target_link_directories(obs-multi-rtmp PRIVATE 41 + - "${CMAKE_CURRENT_BINARY_DIR}" 42 + - ${OBS_BIN_DIR} 43 + -) 44 + target_link_libraries(obs-multi-rtmp PRIVATE 45 + Qt6::Widgets 46 + - ${LIB_OBS} 47 + - obs-frontend-api 48 + + OBS::libobs 49 + + OBS::obs-frontend-api 50 + ) 51 + 52 + if (WIN32) 53 + -- 54 + 2.37.3
+12 -9
pkgs/applications/video/obs-studio/plugins/obs-ndi.nix
··· 2 2 3 3 stdenv.mkDerivation rec { 4 4 pname = "obs-ndi"; 5 - version = "4.9.1"; 5 + version = "4.10.0"; 6 6 7 7 nativeBuildInputs = [ cmake ]; 8 8 buildInputs = [ obs-studio qtbase ndi ]; ··· 10 10 src = fetchFromGitHub { 11 11 owner = "Palakis"; 12 12 repo = "obs-ndi"; 13 - rev = version; 14 - sha256 = "1y3xdqp55jayhg4sinwiwpk194zc4f4jf0abz647x2fprsk9jz7s"; 13 + rev = "dummy-tag-${version}"; 14 + sha256 = "sha256-eQ/hQ2AnwyBNOotqlUZq07m4FXoeir2f7cTVq594obc="; 15 15 }; 16 16 17 - patches = [ ./fix-search-path.patch ./hardcode-ndi-path.patch ]; 17 + patches = [ 18 + ./hardcode-ndi-path.patch 19 + ]; 18 20 19 21 postPatch = '' 20 22 # Add path (variable added in hardcode-ndi-path.patch) ··· 26 28 ln -s ${ndi}/include lib/ndi 27 29 ''; 28 30 29 - cmakeFlags = [ 30 - "-DLIBOBS_INCLUDE_DIR=${obs-studio}/include/obs" 31 - "-DLIBOBS_LIB=${obs-studio}/lib" 32 - "-DCMAKE_CXX_FLAGS=-I${obs-studio.src}/UI/obs-frontend-api" 33 - ]; 31 + postInstall = '' 32 + mkdir $out/lib $out/share 33 + mv $out/obs-plugins/64bit $out/lib/obs-plugins 34 + rm -rf $out/obs-plugins 35 + mv $out/data $out/share/obs 36 + ''; 34 37 35 38 dontWrapQtApps = true; 36 39
+4 -4
pkgs/data/misc/hackage/pin.json
··· 1 1 { 2 - "commit": "8983027e744098e8a2fbeac09bcc6eb8a9471fff", 3 - "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/8983027e744098e8a2fbeac09bcc6eb8a9471fff.tar.gz", 4 - "sha256": "1iqgakw71x8cymdifpqnv546wmmrda6w862axli4k03vj7rv91iw", 5 - "msg": "Update from Hackage at 2022-10-27T19:26:33Z" 2 + "commit": "7e2dca1338ee7f19dbb8cdbc81e9eb1716bbf64e", 3 + "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/7e2dca1338ee7f19dbb8cdbc81e9eb1716bbf64e.tar.gz", 4 + "sha256": "1vrhv9w042sn2sm3niiy5640qvhiqn79zllp4vsbdpds758rj9vm", 5 + "msg": "Update from Hackage at 2022-11-03T21:09:38Z" 6 6 }
+13 -28
pkgs/desktops/gnome/core/evolution-data-server/default.nix
··· 2 2 , lib 3 3 , fetchurl 4 4 , substituteAll 5 - , runCommand 6 - , git 7 - , coccinelle 8 5 , pkg-config 9 6 , gnome 10 7 , _experimental-update-script-combinators ··· 70 67 71 68 prePatch = '' 72 69 substitute ${./hardcode-gsettings.patch} hardcode-gsettings.patch \ 73 - --subst-var-by EDS_GSETTINGS_PATH ${glib.makeSchemaPath "$out" "${pname}-${version}"} 70 + --subst-var-by EDS ${glib.makeSchemaPath "$out" "${pname}-${version}"} 74 71 patches="$patches $PWD/hardcode-gsettings.patch" 75 72 ''; 76 73 ··· 153 150 ''; 154 151 155 152 passthru = { 156 - # In order for GNOME not to depend on OCaml through Coccinelle, 157 - # we materialize the SmPL patch into a unified diff-style patch. 158 - hardcodeGsettingsPatch = 159 - runCommand 160 - "hardcode-gsettings.patch" 161 - { 162 - inherit src; 163 - nativeBuildInputs = [ 164 - git 165 - coccinelle 166 - python3 # For patch script 167 - ]; 168 - } 169 - '' 170 - unpackPhase 171 - cd "''${sourceRoot:-.}" 172 - git init 173 - git add -A 174 - spatch --sp-file "${./hardcode-gsettings.cocci}" --dir . --in-place 175 - git diff > "$out" 176 - ''; 153 + hardcodeGsettingsPatch = glib.mkHardcodeGsettingsPatch { 154 + glib-schema-to-var = { 155 + "org.gnome.Evolution.DefaultSources" = "EDS"; 156 + "org.gnome.evolution.shell.network-config" = "EDS"; 157 + "org.gnome.evolution-data-server.addressbook" = "EDS"; 158 + "org.gnome.evolution-data-server.calendar" = "EDS"; 159 + "org.gnome.evolution-data-server" = "EDS"; 177 160 161 + }; 162 + inherit src; 163 + }; 178 164 updateScript = 179 165 let 180 166 updateSource = gnome.updateScript { 181 167 packageName = "evolution-data-server"; 182 168 versionPolicy = "odd-unstable"; 183 169 }; 184 - 185 - updateGsettingsPatch = _experimental-update-script-combinators.copyAttrOutputToFile "evolution-data-server.hardcodeGsettingsPatch" ./hardcode-gsettings.patch; 170 + updatePatch = _experimental-update-script-combinators.copyAttrOutputToFile "evolution-data-server.hardcodeGsettingsPatch" ./hardcode-gsettings.patch; 186 171 in 187 172 _experimental-update-script-combinators.sequence [ 188 173 updateSource 189 - updateGsettingsPatch 174 + updatePatch 190 175 ]; 191 176 }; 192 177
+10 -15
pkgs/desktops/gnome/core/evolution-data-server/hardcode-gsettings.cocci pkgs/development/libraries/glib/hardcode-gsettings.cocci
··· 3 3 * where GSettings system could look for schemas, we need to point the software to a correct location somehow. 4 4 * For executables, we handle this using wrappers but this is not an option for libraries like e-d-s. 5 5 * Instead, we hardcode the schema path when creating the settings. 6 + * A schema path (ie org.gnome.evolution) can be replaced by @EVOLUTION_SCHEMA_PATH@ 7 + * which is then replaced at build time by substituteAll. 8 + * The mapping is provided in a json file ./glib-schema-to-var.json 6 9 */ 7 10 8 11 @initialize:python@ 9 12 @@ 13 + import json 10 14 11 15 cpp_constants = {} 12 16 ··· 16 20 def resolve_cpp_constant(const_name): 17 21 return cpp_constants.get(const_name, const_name) 18 22 19 - e_s_d_schema_constants = [ 20 - # The following are actually part of e-d-s, despite the name. 21 - # We rename the old ambiguos constant name in ./prepare-for-gsettings-patching.patch 22 - "\"org.gnome.Evolution.DefaultSources\"", 23 - "\"org.gnome.evolution.shell.network-config\"", 24 - ] 25 - 26 - g_d_s_schema_constants = [ 27 - ] 23 + with open("./glib-schema-to-var.json") as mapping_file: 24 + schema_to_var = json.load(mapping_file); 28 25 29 26 def get_schema_directory(schema_path): 30 27 # Sometimes the schema id is referenced using C preprocessor #define constant in the same file 31 28 # let’s try to resolve it first. 32 - schema_path = resolve_cpp_constant(schema_path.strip()) 33 - if schema_path.startswith("\"org.gnome.evolution-data-server") or schema_path in e_s_d_schema_constants: 34 - return "\"@EDS_GSETTINGS_PATH@\"" 35 - elif schema_path in g_d_s_schema_constants: 36 - return "\"@GDS_GSETTINGS_PATH@\"" 37 - raise Exception(f"Unknown schema path {schema_path}") 29 + schema_path = resolve_cpp_constant(schema_path.strip()).strip('"') 30 + if schema_path in schema_to_var: 31 + return f'"@{schema_to_var[schema_path]}@"' 32 + raise Exception(f"Unknown schema path {schema_path!r}, please add it to ./glib-schema-to-var.json") 38 33 39 34 40 35 @find_cpp_constants@
+46 -46
pkgs/desktops/gnome/core/evolution-data-server/hardcode-gsettings.patch
··· 1 1 diff --git a/src/addressbook/libebook/e-book-client.c b/src/addressbook/libebook/e-book-client.c 2 - index 7888e69..c3b695c 100644 2 + index 7888e69..27215e4 100644 3 3 --- a/src/addressbook/libebook/e-book-client.c 4 4 +++ b/src/addressbook/libebook/e-book-client.c 5 5 @@ -1983,7 +1983,18 @@ e_book_client_get_self (ESourceRegistry *registry, ··· 10 10 + { 11 11 + g_autoptr(GSettingsSchemaSource) schema_source; 12 12 + g_autoptr(GSettingsSchema) schema; 13 - + schema_source = g_settings_schema_source_new_from_directory("@EDS_GSETTINGS_PATH@", 13 + + schema_source = g_settings_schema_source_new_from_directory("@EDS@", 14 14 + g_settings_schema_source_get_default(), 15 15 + TRUE, 16 16 + NULL); ··· 30 30 + { 31 31 + g_autoptr(GSettingsSchemaSource) schema_source; 32 32 + g_autoptr(GSettingsSchema) schema; 33 - + schema_source = g_settings_schema_source_new_from_directory("@EDS_GSETTINGS_PATH@", 33 + + schema_source = g_settings_schema_source_new_from_directory("@EDS@", 34 34 + g_settings_schema_source_get_default(), 35 35 + TRUE, 36 36 + NULL); ··· 51 51 + if (!settings) { 52 52 + g_autoptr(GSettingsSchemaSource) schema_source; 53 53 + g_autoptr(GSettingsSchema) schema; 54 - + schema_source = g_settings_schema_source_new_from_directory("@EDS_GSETTINGS_PATH@", 54 + + schema_source = g_settings_schema_source_new_from_directory("@EDS@", 55 55 + g_settings_schema_source_get_default(), 56 56 + TRUE, 57 57 + NULL); ··· 64 64 g_mutex_unlock (&mutex); 65 65 66 66 diff --git a/src/addressbook/libebook/e-book.c b/src/addressbook/libebook/e-book.c 67 - index 8dfff6d..cd88392 100644 67 + index 8dfff6d..fb4434b 100644 68 68 --- a/src/addressbook/libebook/e-book.c 69 69 +++ b/src/addressbook/libebook/e-book.c 70 70 @@ -2587,7 +2587,18 @@ e_book_get_self (ESourceRegistry *registry, ··· 75 75 + { 76 76 + g_autoptr(GSettingsSchemaSource) schema_source; 77 77 + g_autoptr(GSettingsSchema) schema; 78 - + schema_source = g_settings_schema_source_new_from_directory("@EDS_GSETTINGS_PATH@", 78 + + schema_source = g_settings_schema_source_new_from_directory("@EDS@", 79 79 + g_settings_schema_source_get_default(), 80 80 + TRUE, 81 81 + NULL); ··· 95 95 + { 96 96 + g_autoptr(GSettingsSchemaSource) schema_source; 97 97 + g_autoptr(GSettingsSchema) schema; 98 - + schema_source = g_settings_schema_source_new_from_directory("@EDS_GSETTINGS_PATH@", 98 + + schema_source = g_settings_schema_source_new_from_directory("@EDS@", 99 99 + g_settings_schema_source_get_default(), 100 100 + TRUE, 101 101 + NULL); ··· 115 115 + { 116 116 + g_autoptr(GSettingsSchemaSource) schema_source; 117 117 + g_autoptr(GSettingsSchema) schema; 118 - + schema_source = g_settings_schema_source_new_from_directory("@EDS_GSETTINGS_PATH@", 118 + + schema_source = g_settings_schema_source_new_from_directory("@EDS@", 119 119 + g_settings_schema_source_get_default(), 120 120 + TRUE, 121 121 + NULL); ··· 128 128 g_object_unref (settings); 129 129 130 130 diff --git a/src/addressbook/libedata-book/e-book-meta-backend.c b/src/addressbook/libedata-book/e-book-meta-backend.c 131 - index d3f130e..9e8edd4 100644 131 + index d3f130e..bc820e9 100644 132 132 --- a/src/addressbook/libedata-book/e-book-meta-backend.c 133 133 +++ b/src/addressbook/libedata-book/e-book-meta-backend.c 134 134 @@ -135,7 +135,18 @@ ebmb_is_power_saver_enabled (void) ··· 139 139 + { 140 140 + g_autoptr(GSettingsSchemaSource) schema_source; 141 141 + g_autoptr(GSettingsSchema) schema; 142 - + schema_source = g_settings_schema_source_new_from_directory("@EDS_GSETTINGS_PATH@", 142 + + schema_source = g_settings_schema_source_new_from_directory("@EDS@", 143 143 + g_settings_schema_source_get_default(), 144 144 + TRUE, 145 145 + NULL); ··· 152 152 if (g_settings_get_boolean (settings, "limit-operations-in-power-saver-mode")) { 153 153 GPowerProfileMonitor *power_monitor; 154 154 diff --git a/src/calendar/backends/contacts/e-cal-backend-contacts.c b/src/calendar/backends/contacts/e-cal-backend-contacts.c 155 - index 42f3457..faac410 100644 155 + index 42f3457..b4926af 100644 156 156 --- a/src/calendar/backends/contacts/e-cal-backend-contacts.c 157 157 +++ b/src/calendar/backends/contacts/e-cal-backend-contacts.c 158 158 @@ -1387,7 +1387,18 @@ e_cal_backend_contacts_init (ECalBackendContacts *cbc) ··· 163 163 + { 164 164 + g_autoptr(GSettingsSchemaSource) schema_source; 165 165 + g_autoptr(GSettingsSchema) schema; 166 - + schema_source = g_settings_schema_source_new_from_directory("@EDS_GSETTINGS_PATH@", 166 + + schema_source = g_settings_schema_source_new_from_directory("@EDS@", 167 167 + g_settings_schema_source_get_default(), 168 168 + TRUE, 169 169 + NULL); ··· 176 176 cbc->priv->update_alarms_id = 0; 177 177 cbc->priv->alarm_enabled = FALSE; 178 178 diff --git a/src/calendar/libecal/e-reminder-watcher.c b/src/calendar/libecal/e-reminder-watcher.c 179 - index 52095a4..e839991 100644 179 + index 52095a4..184b657 100644 180 180 --- a/src/calendar/libecal/e-reminder-watcher.c 181 181 +++ b/src/calendar/libecal/e-reminder-watcher.c 182 182 @@ -2555,7 +2555,19 @@ e_reminder_watcher_init (EReminderWatcher *watcher) ··· 187 187 + { 188 188 + g_autoptr(GSettingsSchemaSource) schema_source; 189 189 + g_autoptr(GSettingsSchema) schema; 190 - + schema_source = g_settings_schema_source_new_from_directory("@EDS_GSETTINGS_PATH@", 190 + + schema_source = g_settings_schema_source_new_from_directory("@EDS@", 191 191 + g_settings_schema_source_get_default(), 192 192 + TRUE, 193 193 + NULL); ··· 201 201 watcher->priv->default_zone = e_cal_util_copy_timezone (zone); 202 202 watcher->priv->timers_enabled = TRUE; 203 203 diff --git a/src/calendar/libedata-cal/e-cal-meta-backend.c b/src/calendar/libedata-cal/e-cal-meta-backend.c 204 - index 94a875f..1f914a9 100644 204 + index 94a875f..1d2ed92 100644 205 205 --- a/src/calendar/libedata-cal/e-cal-meta-backend.c 206 206 +++ b/src/calendar/libedata-cal/e-cal-meta-backend.c 207 207 @@ -149,7 +149,18 @@ ecmb_is_power_saver_enabled (void) ··· 212 212 + { 213 213 + g_autoptr(GSettingsSchemaSource) schema_source; 214 214 + g_autoptr(GSettingsSchema) schema; 215 - + schema_source = g_settings_schema_source_new_from_directory("@EDS_GSETTINGS_PATH@", 215 + + schema_source = g_settings_schema_source_new_from_directory("@EDS@", 216 216 + g_settings_schema_source_get_default(), 217 217 + TRUE, 218 218 + NULL); ··· 225 225 if (g_settings_get_boolean (settings, "limit-operations-in-power-saver-mode")) { 226 226 GPowerProfileMonitor *power_monitor; 227 227 diff --git a/src/camel/camel-cipher-context.c b/src/camel/camel-cipher-context.c 228 - index 8013ba7..ba74769 100644 228 + index 8013ba7..1bba6d1 100644 229 229 --- a/src/camel/camel-cipher-context.c 230 230 +++ b/src/camel/camel-cipher-context.c 231 231 @@ -1625,7 +1625,18 @@ camel_cipher_can_load_photos (void) ··· 236 236 + { 237 237 + g_autoptr(GSettingsSchemaSource) schema_source; 238 238 + g_autoptr(GSettingsSchema) schema; 239 - + schema_source = g_settings_schema_source_new_from_directory("@EDS_GSETTINGS_PATH@", 239 + + schema_source = g_settings_schema_source_new_from_directory("@EDS@", 240 240 + g_settings_schema_source_get_default(), 241 241 + TRUE, 242 242 + NULL); ··· 249 249 g_clear_object (&settings); 250 250 251 251 diff --git a/src/camel/camel-gpg-context.c b/src/camel/camel-gpg-context.c 252 - index 205372e..2023704 100644 252 + index 205372e..f75a88e 100644 253 253 --- a/src/camel/camel-gpg-context.c 254 254 +++ b/src/camel/camel-gpg-context.c 255 255 @@ -582,7 +582,18 @@ gpg_ctx_get_executable_name (void) ··· 260 260 + { 261 261 + g_autoptr(GSettingsSchemaSource) schema_source; 262 262 + g_autoptr(GSettingsSchema) schema; 263 - + schema_source = g_settings_schema_source_new_from_directory("@EDS_GSETTINGS_PATH@", 263 + + schema_source = g_settings_schema_source_new_from_directory("@EDS@", 264 264 + g_settings_schema_source_get_default(), 265 265 + TRUE, 266 266 + NULL); ··· 273 273 g_clear_object (&settings); 274 274 275 275 diff --git a/src/camel/camel-utils.c b/src/camel/camel-utils.c 276 - index e61160c..d17871a 100644 276 + index e61160c..b6553a4 100644 277 277 --- a/src/camel/camel-utils.c 278 278 +++ b/src/camel/camel-utils.c 279 279 @@ -362,7 +362,19 @@ void ··· 284 284 + { 285 285 + g_autoptr(GSettingsSchemaSource) schema_source; 286 286 + g_autoptr(GSettingsSchema) schema; 287 - + schema_source = g_settings_schema_source_new_from_directory("@EDS_GSETTINGS_PATH@", 287 + + schema_source = g_settings_schema_source_new_from_directory("@EDS@", 288 288 + g_settings_schema_source_get_default(), 289 289 + TRUE, 290 290 + NULL); ··· 298 298 G_CALLBACK (mi_user_headers_settings_changed_cb), NULL); 299 299 G_UNLOCK (mi_user_headers); 300 300 diff --git a/src/camel/providers/imapx/camel-imapx-server.c b/src/camel/providers/imapx/camel-imapx-server.c 301 - index e5645e2..170a0be 100644 301 + index e5645e2..96a1ce3 100644 302 302 --- a/src/camel/providers/imapx/camel-imapx-server.c 303 303 +++ b/src/camel/providers/imapx/camel-imapx-server.c 304 304 @@ -5573,7 +5573,18 @@ camel_imapx_server_skip_old_flags_update (CamelStore *store) ··· 309 309 + { 310 310 + g_autoptr(GSettingsSchemaSource) schema_source; 311 311 + g_autoptr(GSettingsSchema) schema; 312 - + schema_source = g_settings_schema_source_new_from_directory("@EDS_GSETTINGS_PATH@", 312 + + schema_source = g_settings_schema_source_new_from_directory("@EDS@", 313 313 + g_settings_schema_source_get_default(), 314 314 + TRUE, 315 315 + NULL); ··· 322 322 if (g_settings_get_boolean (eds_settings, "limit-operations-in-power-saver-mode")) { 323 323 GPowerProfileMonitor *power_monitor; 324 324 diff --git a/src/camel/providers/smtp/camel-smtp-transport.c b/src/camel/providers/smtp/camel-smtp-transport.c 325 - index f535ad6..30130b9 100644 325 + index f535ad6..918975d 100644 326 326 --- a/src/camel/providers/smtp/camel-smtp-transport.c 327 327 +++ b/src/camel/providers/smtp/camel-smtp-transport.c 328 328 @@ -1458,7 +1458,18 @@ smtp_helo (CamelSmtpTransport *transport, ··· 333 333 + { 334 334 + g_autoptr(GSettingsSchemaSource) schema_source; 335 335 + g_autoptr(GSettingsSchema) schema; 336 - + schema_source = g_settings_schema_source_new_from_directory("@EDS_GSETTINGS_PATH@", 336 + + schema_source = g_settings_schema_source_new_from_directory("@EDS@", 337 337 + g_settings_schema_source_get_default(), 338 338 + TRUE, 339 339 + NULL); ··· 346 346 g_clear_object (&settings); 347 347 348 348 diff --git a/src/libedataserver/e-network-monitor.c b/src/libedataserver/e-network-monitor.c 349 - index 188f276..7c4db94 100644 349 + index 188f276..939f89b 100644 350 350 --- a/src/libedataserver/e-network-monitor.c 351 351 +++ b/src/libedataserver/e-network-monitor.c 352 352 @@ -256,7 +256,18 @@ e_network_monitor_constructed (GObject *object) ··· 357 357 + { 358 358 + g_autoptr(GSettingsSchemaSource) schema_source; 359 359 + g_autoptr(GSettingsSchema) schema; 360 - + schema_source = g_settings_schema_source_new_from_directory("@EDS_GSETTINGS_PATH@", 360 + + schema_source = g_settings_schema_source_new_from_directory("@EDS@", 361 361 + g_settings_schema_source_get_default(), 362 362 + TRUE, 363 363 + NULL); ··· 370 370 settings, "network-monitor-gio-name", 371 371 object, "gio-name", 372 372 diff --git a/src/libedataserver/e-oauth2-service-google.c b/src/libedataserver/e-oauth2-service-google.c 373 - index f215388..3b67126 100644 373 + index f215388..501222e 100644 374 374 --- a/src/libedataserver/e-oauth2-service-google.c 375 375 +++ b/src/libedataserver/e-oauth2-service-google.c 376 376 @@ -71,7 +71,18 @@ eos_google_read_settings (EOAuth2Service *service, ··· 381 381 + { 382 382 + g_autoptr(GSettingsSchemaSource) schema_source; 383 383 + g_autoptr(GSettingsSchema) schema; 384 - + schema_source = g_settings_schema_source_new_from_directory("@EDS_GSETTINGS_PATH@", 384 + + schema_source = g_settings_schema_source_new_from_directory("@EDS@", 385 385 + g_settings_schema_source_get_default(), 386 386 + TRUE, 387 387 + NULL); ··· 394 394 g_object_unref (settings); 395 395 396 396 diff --git a/src/libedataserver/e-oauth2-service-outlook.c b/src/libedataserver/e-oauth2-service-outlook.c 397 - index 9cff0d0..fd95f0b 100644 397 + index 9cff0d0..4c9a203 100644 398 398 --- a/src/libedataserver/e-oauth2-service-outlook.c 399 399 +++ b/src/libedataserver/e-oauth2-service-outlook.c 400 400 @@ -71,7 +71,18 @@ eos_outlook_read_settings (EOAuth2Service *service, ··· 405 405 + { 406 406 + g_autoptr(GSettingsSchemaSource) schema_source; 407 407 + g_autoptr(GSettingsSchema) schema; 408 - + schema_source = g_settings_schema_source_new_from_directory("@EDS_GSETTINGS_PATH@", 408 + + schema_source = g_settings_schema_source_new_from_directory("@EDS@", 409 409 + g_settings_schema_source_get_default(), 410 410 + TRUE, 411 411 + NULL); ··· 418 418 g_object_unref (settings); 419 419 420 420 diff --git a/src/libedataserver/e-oauth2-service-yahoo.c b/src/libedataserver/e-oauth2-service-yahoo.c 421 - index 8e4ee81..bb8f8f7 100644 421 + index 8e4ee81..cc94026 100644 422 422 --- a/src/libedataserver/e-oauth2-service-yahoo.c 423 423 +++ b/src/libedataserver/e-oauth2-service-yahoo.c 424 424 @@ -67,7 +67,18 @@ eos_yahoo_read_settings (EOAuth2Service *service, ··· 429 429 + { 430 430 + g_autoptr(GSettingsSchemaSource) schema_source; 431 431 + g_autoptr(GSettingsSchema) schema; 432 - + schema_source = g_settings_schema_source_new_from_directory("@EDS_GSETTINGS_PATH@", 432 + + schema_source = g_settings_schema_source_new_from_directory("@EDS@", 433 433 + g_settings_schema_source_get_default(), 434 434 + TRUE, 435 435 + NULL); ··· 442 442 g_object_unref (settings); 443 443 444 444 diff --git a/src/libedataserver/e-oauth2-service.c b/src/libedataserver/e-oauth2-service.c 445 - index 7783781..6fb22cb 100644 445 + index 7783781..6a2db01 100644 446 446 --- a/src/libedataserver/e-oauth2-service.c 447 447 +++ b/src/libedataserver/e-oauth2-service.c 448 448 @@ -90,7 +90,18 @@ eos_default_guess_can_process (EOAuth2Service *service, ··· 453 453 + { 454 454 + g_autoptr(GSettingsSchemaSource) schema_source; 455 455 + g_autoptr(GSettingsSchema) schema; 456 - + schema_source = g_settings_schema_source_new_from_directory("@EDS_GSETTINGS_PATH@", 456 + + schema_source = g_settings_schema_source_new_from_directory("@EDS@", 457 457 + g_settings_schema_source_get_default(), 458 458 + TRUE, 459 459 + NULL); ··· 466 466 g_object_unref (settings); 467 467 468 468 diff --git a/src/libedataserver/e-source-registry.c b/src/libedataserver/e-source-registry.c 469 - index 6701a3a..6b8ee33 100644 469 + index 6701a3a..f497263 100644 470 470 --- a/src/libedataserver/e-source-registry.c 471 471 +++ b/src/libedataserver/e-source-registry.c 472 472 @@ -1764,7 +1764,19 @@ e_source_registry_init (ESourceRegistry *registry) ··· 477 477 + { 478 478 + g_autoptr(GSettingsSchemaSource) schema_source; 479 479 + g_autoptr(GSettingsSchema) schema; 480 - + schema_source = g_settings_schema_source_new_from_directory("@EDS_GSETTINGS_PATH@", 480 + + schema_source = g_settings_schema_source_new_from_directory("@EDS@", 481 481 + g_settings_schema_source_get_default(), 482 482 + TRUE, 483 483 + NULL); ··· 491 491 g_signal_connect ( 492 492 registry->priv->settings, "changed", 493 493 diff --git a/src/libedataserverui/e-reminders-widget.c b/src/libedataserverui/e-reminders-widget.c 494 - index 14b6481..6dc55bb 100644 494 + index 14b6481..7149b74 100644 495 495 --- a/src/libedataserverui/e-reminders-widget.c 496 496 +++ b/src/libedataserverui/e-reminders-widget.c 497 497 @@ -1986,7 +1986,19 @@ static void ··· 502 502 + { 503 503 + g_autoptr(GSettingsSchemaSource) schema_source; 504 504 + g_autoptr(GSettingsSchema) schema; 505 - + schema_source = g_settings_schema_source_new_from_directory("@EDS_GSETTINGS_PATH@", 505 + + schema_source = g_settings_schema_source_new_from_directory("@EDS@", 506 506 + g_settings_schema_source_get_default(), 507 507 + TRUE, 508 508 + NULL); ··· 516 516 reminders->priv->is_empty = TRUE; 517 517 reminders->priv->is_mapped = FALSE; 518 518 diff --git a/src/services/evolution-source-registry/evolution-source-registry-autoconfig.c b/src/services/evolution-source-registry/evolution-source-registry-autoconfig.c 519 - index 6f03053..127c92e 100644 519 + index 6f03053..b5db6b2 100644 520 520 --- a/src/services/evolution-source-registry/evolution-source-registry-autoconfig.c 521 521 +++ b/src/services/evolution-source-registry/evolution-source-registry-autoconfig.c 522 522 @@ -706,7 +706,18 @@ evolution_source_registry_merge_autoconfig_sources (ESourceRegistryServer *serve ··· 527 527 + { 528 528 + g_autoptr(GSettingsSchemaSource) schema_source; 529 529 + g_autoptr(GSettingsSchema) schema; 530 - + schema_source = g_settings_schema_source_new_from_directory("@EDS_GSETTINGS_PATH@", 530 + + schema_source = g_settings_schema_source_new_from_directory("@EDS@", 531 531 + g_settings_schema_source_get_default(), 532 532 + TRUE, 533 533 + NULL); ··· 540 540 autoconfig_sources = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, e_autoconfig_free_merge_source_data); 541 541 542 542 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 543 - index d531cb9..3d8807c 100644 543 + index d531cb9..c96f1d5 100644 544 544 --- a/src/services/evolution-source-registry/evolution-source-registry-migrate-proxies.c 545 545 +++ b/src/services/evolution-source-registry/evolution-source-registry-migrate-proxies.c 546 546 @@ -61,7 +61,18 @@ evolution_source_registry_migrate_proxies (ESourceRegistryServer *server) ··· 551 551 + { 552 552 + g_autoptr(GSettingsSchemaSource) schema_source; 553 553 + g_autoptr(GSettingsSchema) schema; 554 - + schema_source = g_settings_schema_source_new_from_directory("@EDS_GSETTINGS_PATH@", 554 + + schema_source = g_settings_schema_source_new_from_directory("@EDS@", 555 555 + g_settings_schema_source_get_default(), 556 556 + TRUE, 557 557 + NULL); ··· 564 564 switch (g_settings_get_int (settings, "proxy-type")) { 565 565 case 1: 566 566 diff --git a/src/services/evolution-source-registry/evolution-source-registry.c b/src/services/evolution-source-registry/evolution-source-registry.c 567 - index 1c0a113..d26b059 100644 567 + index 1c0a113..6b41423 100644 568 568 --- a/src/services/evolution-source-registry/evolution-source-registry.c 569 569 +++ b/src/services/evolution-source-registry/evolution-source-registry.c 570 570 @@ -181,7 +181,18 @@ main (gint argc, ··· 575 575 + { 576 576 + g_autoptr(GSettingsSchemaSource) schema_source; 577 577 + g_autoptr(GSettingsSchema) schema; 578 - + schema_source = g_settings_schema_source_new_from_directory("@EDS_GSETTINGS_PATH@", 578 + + schema_source = g_settings_schema_source_new_from_directory("@EDS@", 579 579 + g_settings_schema_source_get_default(), 580 580 + TRUE, 581 581 + NULL);
+367
pkgs/development/compilers/ghc/9.2.5.nix
··· 1 + { lib, stdenv, pkgsBuildTarget, pkgsHostTarget, targetPackages 2 + 3 + # build-tools 4 + , bootPkgs 5 + , autoconf, automake, coreutils, fetchpatch, fetchurl, perl, python3, m4, sphinx 6 + , xattr, autoSignDarwinBinariesHook 7 + , bash 8 + 9 + , libiconv ? null, ncurses 10 + , glibcLocales ? null 11 + 12 + , # GHC can be built with system libffi or a bundled one. 13 + libffi ? null 14 + 15 + , useLLVM ? !(stdenv.targetPlatform.isx86 16 + || stdenv.targetPlatform.isPower 17 + || stdenv.targetPlatform.isSparc 18 + || (stdenv.targetPlatform.isAarch64 && stdenv.targetPlatform.isDarwin)) 19 + , # LLVM is conceptually a run-time-only depedendency, but for 20 + # non-x86, we need LLVM to bootstrap later stages, so it becomes a 21 + # build-time dependency too. 22 + buildTargetLlvmPackages, llvmPackages 23 + 24 + , # If enabled, GHC will be built with the GPL-free but slightly slower native 25 + # bignum backend instead of the faster but GPLed gmp backend. 26 + enableNativeBignum ? !(lib.meta.availableOn stdenv.hostPlatform gmp) 27 + , gmp 28 + 29 + , # If enabled, use -fPIC when compiling static libs. 30 + enableRelocatedStaticLibs ? stdenv.targetPlatform != stdenv.hostPlatform 31 + 32 + # aarch64 outputs otherwise exceed 2GB limit 33 + , enableProfiledLibs ? !stdenv.targetPlatform.isAarch64 34 + 35 + , # Whether to build dynamic libs for the standard library (on the target 36 + # platform). Static libs are always built. 37 + enableShared ? with stdenv.targetPlatform; !isWindows && !useiOSPrebuilt && !isStatic 38 + 39 + , # Whether to build terminfo. 40 + enableTerminfo ? !stdenv.targetPlatform.isWindows 41 + 42 + , # What flavour to build. An empty string indicates no 43 + # specific flavour and falls back to ghc default values. 44 + ghcFlavour ? lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) 45 + (if useLLVM then "perf-cross" else "perf-cross-ncg") 46 + 47 + , # Whether to build sphinx documentation. 48 + enableDocs ? ( 49 + # Docs disabled for musl and cross because it's a large task to keep 50 + # all `sphinx` dependencies building in those environments. 51 + # `sphinx` pulls in among others: 52 + # Ruby, Python, Perl, Rust, OpenGL, Xorg, gtk, LLVM. 53 + (stdenv.targetPlatform == stdenv.hostPlatform) 54 + && !stdenv.hostPlatform.isMusl 55 + ) 56 + 57 + , enableHaddockProgram ? 58 + # Disabled for cross; see note [HADDOCK_DOCS]. 59 + (stdenv.targetPlatform == stdenv.hostPlatform) 60 + 61 + , # Whether to disable the large address space allocator 62 + # necessary fix for iOS: https://www.reddit.com/r/haskell/comments/4ttdz1/building_an_osxi386_to_iosarm64_cross_compiler/d5qvd67/ 63 + disableLargeAddressSpace ? stdenv.targetPlatform.isiOS 64 + }: 65 + 66 + assert !enableNativeBignum -> gmp != null; 67 + 68 + # Cross cannot currently build the `haddock` program for silly reasons, 69 + # see note [HADDOCK_DOCS]. 70 + assert (stdenv.targetPlatform != stdenv.hostPlatform) -> !enableHaddockProgram; 71 + 72 + let 73 + inherit (stdenv) buildPlatform hostPlatform targetPlatform; 74 + 75 + inherit (bootPkgs) ghc; 76 + 77 + # TODO(@Ericson2314) Make unconditional 78 + targetPrefix = lib.optionalString 79 + (targetPlatform != hostPlatform) 80 + "${targetPlatform.config}-"; 81 + 82 + buildMK = '' 83 + BuildFlavour = ${ghcFlavour} 84 + ifneq \"\$(BuildFlavour)\" \"\" 85 + include mk/flavours/\$(BuildFlavour).mk 86 + endif 87 + BUILD_SPHINX_HTML = ${if enableDocs then "YES" else "NO"} 88 + BUILD_SPHINX_PDF = NO 89 + '' + 90 + # Note [HADDOCK_DOCS]: 91 + # Unfortunately currently `HADDOCK_DOCS` controls both whether the `haddock` 92 + # program is built (which we generally always want to have a complete GHC install) 93 + # and whether it is run on the GHC sources to generate hyperlinked source code 94 + # (which is impossible for cross-compilation); see: 95 + # https://gitlab.haskell.org/ghc/ghc/-/issues/20077 96 + # This implies that currently a cross-compiled GHC will never have a `haddock` 97 + # program, so it can never generate haddocks for any packages. 98 + # If this is solved in the future, we'd like to unconditionally 99 + # build the haddock program (removing the `enableHaddockProgram` option). 100 + '' 101 + HADDOCK_DOCS = ${if enableHaddockProgram then "YES" else "NO"} 102 + # Build haddocks for boot packages with hyperlinking 103 + EXTRA_HADDOCK_OPTS += --hyperlinked-source --quickjump 104 + 105 + DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"} 106 + BIGNUM_BACKEND = ${if enableNativeBignum then "native" else "gmp"} 107 + '' + lib.optionalString (targetPlatform != hostPlatform) '' 108 + Stage1Only = ${if targetPlatform.system == hostPlatform.system then "NO" else "YES"} 109 + CrossCompilePrefix = ${targetPrefix} 110 + '' + lib.optionalString (!enableProfiledLibs) '' 111 + GhcLibWays = "v dyn" 112 + '' + 113 + # -fexternal-dynamic-refs apparently (because it's not clear from the documentation) 114 + # makes the GHC RTS able to load static libraries, which may be needed for TemplateHaskell. 115 + # This solution was described in https://www.tweag.io/blog/2020-09-30-bazel-static-haskell 116 + lib.optionalString enableRelocatedStaticLibs '' 117 + GhcLibHcOpts += -fPIC -fexternal-dynamic-refs 118 + GhcRtsHcOpts += -fPIC -fexternal-dynamic-refs 119 + '' + lib.optionalString targetPlatform.useAndroidPrebuilt '' 120 + EXTRA_CC_OPTS += -std=gnu99 121 + ''; 122 + 123 + # Splicer will pull out correct variations 124 + libDeps = platform: lib.optional enableTerminfo ncurses 125 + ++ [libffi] 126 + ++ lib.optional (!enableNativeBignum) gmp 127 + ++ lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv; 128 + 129 + # TODO(@sternenseemann): is buildTarget LLVM unnecessary? 130 + # GHC doesn't seem to have {LLC,OPT}_HOST 131 + toolsForTarget = [ 132 + pkgsBuildTarget.targetPackages.stdenv.cc 133 + ] ++ lib.optional useLLVM buildTargetLlvmPackages.llvm; 134 + 135 + targetCC = builtins.head toolsForTarget; 136 + 137 + # Sometimes we have to dispatch between the bintools wrapper and the unwrapped 138 + # derivation for certain tools depending on the platform. 139 + bintoolsFor = { 140 + # GHC needs install_name_tool on all darwin platforms. On aarch64-darwin it is 141 + # part of the bintools wrapper (due to codesigning requirements), but not on 142 + # x86_64-darwin. 143 + install_name_tool = 144 + if stdenv.targetPlatform.isAarch64 145 + then targetCC.bintools 146 + else targetCC.bintools.bintools; 147 + # Same goes for strip. 148 + strip = 149 + # TODO(@sternenseemann): also use wrapper if linker == "bfd" or "gold" 150 + if stdenv.targetPlatform.isAarch64 && stdenv.targetPlatform.isDarwin 151 + then targetCC.bintools 152 + else targetCC.bintools.bintools; 153 + }; 154 + 155 + # Use gold either following the default, or to avoid the BFD linker due to some bugs / perf issues. 156 + # But we cannot avoid BFD when using musl libc due to https://sourceware.org/bugzilla/show_bug.cgi?id=23856 157 + # see #84670 and #49071 for more background. 158 + useLdGold = targetPlatform.linker == "gold" || 159 + (targetPlatform.linker == "bfd" && (targetCC.bintools.bintools.hasGold or false) && !targetPlatform.isMusl); 160 + 161 + # Makes debugging easier to see which variant is at play in `nix-store -q --tree`. 162 + variantSuffix = lib.concatStrings [ 163 + (lib.optionalString stdenv.hostPlatform.isMusl "-musl") 164 + (lib.optionalString enableNativeBignum "-native-bignum") 165 + ]; 166 + 167 + in 168 + 169 + # C compiler, bintools and LLVM are used at build time, but will also leak into 170 + # the resulting GHC's settings file and used at runtime. This means that we are 171 + # currently only able to build GHC if hostPlatform == buildPlatform. 172 + assert targetCC == pkgsHostTarget.targetPackages.stdenv.cc; 173 + assert buildTargetLlvmPackages.llvm == llvmPackages.llvm; 174 + assert stdenv.targetPlatform.isDarwin -> buildTargetLlvmPackages.clang == llvmPackages.clang; 175 + 176 + stdenv.mkDerivation (rec { 177 + version = "9.2.5"; 178 + pname = "${targetPrefix}ghc${variantSuffix}"; 179 + 180 + src = fetchurl { 181 + url = "https://downloads.haskell.org/ghc/${version}/ghc-${version}-src.tar.xz"; 182 + sha256 = "0606797d1b38e2d88ee2243f38ec6b9a1aa93e9b578e95f0de9a9c0a4144021c"; 183 + }; 184 + 185 + enableParallelBuilding = true; 186 + 187 + outputs = [ "out" "doc" ]; 188 + 189 + patches = [ 190 + # fix hyperlinked haddock sources: https://github.com/haskell/haddock/pull/1482 191 + (fetchpatch { 192 + url = "https://patch-diff.githubusercontent.com/raw/haskell/haddock/pull/1482.patch"; 193 + sha256 = "sha256-8w8QUCsODaTvknCDGgTfFNZa8ZmvIKaKS+2ZJZ9foYk="; 194 + extraPrefix = "utils/haddock/"; 195 + stripLen = 1; 196 + }) 197 + ]; 198 + 199 + postPatch = "patchShebangs ."; 200 + 201 + # GHC needs the locale configured during the Haddock phase. 202 + LANG = "en_US.UTF-8"; 203 + 204 + # GHC is a bit confused on its cross terminology. 205 + # TODO(@sternenseemann): investigate coreutils dependencies and pass absolute paths 206 + preConfigure = '' 207 + for env in $(env | grep '^TARGET_' | sed -E 's|\+?=.*||'); do 208 + export "''${env#TARGET_}=''${!env}" 209 + done 210 + # GHC is a bit confused on its cross terminology, as these would normally be 211 + # the *host* tools. 212 + export CC="${targetCC}/bin/${targetCC.targetPrefix}cc" 213 + export CXX="${targetCC}/bin/${targetCC.targetPrefix}c++" 214 + # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177 215 + export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${lib.optionalString useLdGold ".gold"}" 216 + export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as" 217 + export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar" 218 + export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm" 219 + export RANLIB="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ranlib" 220 + export READELF="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}readelf" 221 + export STRIP="${bintoolsFor.strip}/bin/${bintoolsFor.strip.targetPrefix}strip" 222 + '' + lib.optionalString (stdenv.targetPlatform.linker == "cctools") '' 223 + export OTOOL="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}otool" 224 + export INSTALL_NAME_TOOL="${bintoolsFor.install_name_tool}/bin/${bintoolsFor.install_name_tool.targetPrefix}install_name_tool" 225 + '' + lib.optionalString useLLVM '' 226 + export LLC="${lib.getBin buildTargetLlvmPackages.llvm}/bin/llc" 227 + export OPT="${lib.getBin buildTargetLlvmPackages.llvm}/bin/opt" 228 + '' + lib.optionalString (useLLVM && stdenv.targetPlatform.isDarwin) '' 229 + # LLVM backend on Darwin needs clang: https://downloads.haskell.org/~ghc/latest/docs/html/users_guide/codegens.html#llvm-code-generator-fllvm 230 + export CLANG="${buildTargetLlvmPackages.clang}/bin/${buildTargetLlvmPackages.clang.targetPrefix}clang" 231 + '' + '' 232 + echo -n "${buildMK}" > mk/build.mk 233 + '' + lib.optionalString (stdenv.isLinux && hostPlatform.libc == "glibc") '' 234 + export LOCALE_ARCHIVE="${glibcLocales}/lib/locale/locale-archive" 235 + '' + lib.optionalString (!stdenv.isDarwin) '' 236 + export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}" 237 + '' + lib.optionalString stdenv.isDarwin '' 238 + export NIX_LDFLAGS+=" -no_dtrace_dof" 239 + 240 + # GHC tries the host xattr /usr/bin/xattr by default which fails since it expects python to be 2.7 241 + export XATTR=${lib.getBin xattr}/bin/xattr 242 + '' + lib.optionalString targetPlatform.useAndroidPrebuilt '' 243 + 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 244 + '' + lib.optionalString targetPlatform.isMusl '' 245 + echo "patching llvm-targets for musl targets..." 246 + echo "Cloning these existing '*-linux-gnu*' targets:" 247 + grep linux-gnu llvm-targets | sed 's/^/ /' 248 + echo "(go go gadget sed)" 249 + sed -i 's,\(^.*linux-\)gnu\(.*\)$,\0\n\1musl\2,' llvm-targets 250 + echo "llvm-targets now contains these '*-linux-musl*' targets:" 251 + grep linux-musl llvm-targets | sed 's/^/ /' 252 + 253 + echo "And now patching to preserve '-musleabi' as done with '-gnueabi'" 254 + # (aclocal.m4 is actual source, but patch configure as well since we don't re-gen) 255 + for x in configure aclocal.m4; do 256 + substituteInPlace $x \ 257 + --replace '*-android*|*-gnueabi*)' \ 258 + '*-android*|*-gnueabi*|*-musleabi*)' 259 + done 260 + ''; 261 + 262 + # TODO(@Ericson2314): Always pass "--target" and always prefix. 263 + configurePlatforms = [ "build" "host" ] 264 + ++ lib.optional (targetPlatform != hostPlatform) "target"; 265 + 266 + # `--with` flags for libraries needed for RTS linker 267 + configureFlags = [ 268 + "--datadir=$doc/share/doc/ghc" 269 + "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib" 270 + ] ++ lib.optionals (libffi != null) [ 271 + "--with-system-libffi" 272 + "--with-ffi-includes=${targetPackages.libffi.dev}/include" 273 + "--with-ffi-libraries=${targetPackages.libffi.out}/lib" 274 + ] ++ lib.optionals (targetPlatform == hostPlatform && !enableNativeBignum) [ 275 + "--with-gmp-includes=${targetPackages.gmp.dev}/include" 276 + "--with-gmp-libraries=${targetPackages.gmp.out}/lib" 277 + ] ++ lib.optionals (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [ 278 + "--with-iconv-includes=${libiconv}/include" 279 + "--with-iconv-libraries=${libiconv}/lib" 280 + ] ++ lib.optionals (targetPlatform != hostPlatform) [ 281 + "--enable-bootstrap-with-devel-snapshot" 282 + ] ++ lib.optionals useLdGold [ 283 + "CFLAGS=-fuse-ld=gold" 284 + "CONF_GCC_LINKER_OPTS_STAGE1=-fuse-ld=gold" 285 + "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold" 286 + ] ++ lib.optionals (disableLargeAddressSpace) [ 287 + "--disable-large-address-space" 288 + ]; 289 + 290 + # Make sure we never relax`$PATH` and hooks support for compatibility. 291 + strictDeps = true; 292 + 293 + # Don’t add -liconv to LDFLAGS automatically so that GHC will add it itself. 294 + dontAddExtraLibs = true; 295 + 296 + nativeBuildInputs = [ 297 + perl autoconf automake m4 python3 298 + ghc bootPkgs.alex bootPkgs.happy bootPkgs.hscolour 299 + ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ 300 + autoSignDarwinBinariesHook 301 + ] ++ lib.optionals enableDocs [ 302 + sphinx 303 + ]; 304 + 305 + # For building runtime libs 306 + depsBuildTarget = toolsForTarget; 307 + 308 + buildInputs = [ perl bash ] ++ (libDeps hostPlatform); 309 + 310 + depsTargetTarget = map lib.getDev (libDeps targetPlatform); 311 + depsTargetTargetPropagated = map (lib.getOutput "out") (libDeps targetPlatform); 312 + 313 + # required, because otherwise all symbols from HSffi.o are stripped, and 314 + # that in turn causes GHCi to abort 315 + stripDebugFlags = [ "-S" ] ++ lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols"; 316 + 317 + checkTarget = "test"; 318 + 319 + hardeningDisable = 320 + [ "format" ] 321 + # In nixpkgs, musl based builds currently enable `pie` hardening by default 322 + # (see `defaultHardeningFlags` in `make-derivation.nix`). 323 + # But GHC cannot currently produce outputs that are ready for `-pie` linking. 324 + # Thus, disable `pie` hardening, otherwise `recompile with -fPIE` errors appear. 325 + # See: 326 + # * https://github.com/NixOS/nixpkgs/issues/129247 327 + # * https://gitlab.haskell.org/ghc/ghc/-/issues/19580 328 + ++ lib.optional stdenv.targetPlatform.isMusl "pie"; 329 + 330 + # big-parallel allows us to build with more than 2 cores on 331 + # Hydra which already warrants a significant speedup 332 + requiredSystemFeatures = [ "big-parallel" ]; 333 + 334 + postInstall = '' 335 + # Install the bash completion file. 336 + install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/${targetPrefix}ghc 337 + ''; 338 + 339 + passthru = { 340 + inherit bootPkgs targetPrefix; 341 + 342 + inherit llvmPackages; 343 + inherit enableShared; 344 + 345 + # This is used by the haskell builder to query 346 + # the presence of the haddock program. 347 + hasHaddock = enableHaddockProgram; 348 + 349 + # Our Cabal compiler name 350 + haskellCompilerName = "ghc-${version}"; 351 + }; 352 + 353 + meta = { 354 + homepage = "http://haskell.org/ghc"; 355 + description = "The Glasgow Haskell Compiler"; 356 + maintainers = with lib.maintainers; [ 357 + guibou 358 + ] ++ lib.teams.haskell.members; 359 + timeout = 24 * 3600; 360 + inherit (ghc.meta) license platforms; 361 + }; 362 + 363 + } // lib.optionalAttrs targetPlatform.useAndroidPrebuilt { 364 + dontStrip = true; 365 + dontPatchELF = true; 366 + noAuditTmpdir = true; 367 + })
+370
pkgs/development/compilers/ghc/9.4.3.nix
··· 1 + # DO NOT port this expression to hadrian. It is not possible to build a GHC 2 + # cross compiler with 9.4.* and hadrian. 3 + { lib, stdenv, pkgsBuildTarget, pkgsHostTarget, targetPackages 4 + 5 + # build-tools 6 + , bootPkgs 7 + , autoconf, automake, coreutils, fetchpatch, fetchurl, perl, python3, m4, sphinx 8 + , xattr, autoSignDarwinBinariesHook 9 + , bash 10 + 11 + , libiconv ? null, ncurses 12 + , glibcLocales ? null 13 + 14 + , # GHC can be built with system libffi or a bundled one. 15 + libffi ? null 16 + 17 + , useLLVM ? !(stdenv.targetPlatform.isx86 18 + || stdenv.targetPlatform.isPower 19 + || stdenv.targetPlatform.isSparc 20 + || (stdenv.targetPlatform.isAarch64 && stdenv.targetPlatform.isDarwin)) 21 + , # LLVM is conceptually a run-time-only depedendency, but for 22 + # non-x86, we need LLVM to bootstrap later stages, so it becomes a 23 + # build-time dependency too. 24 + buildTargetLlvmPackages, llvmPackages 25 + 26 + , # If enabled, GHC will be built with the GPL-free but slightly slower native 27 + # bignum backend instead of the faster but GPLed gmp backend. 28 + enableNativeBignum ? !(lib.meta.availableOn stdenv.hostPlatform gmp) 29 + , gmp 30 + 31 + , # If enabled, use -fPIC when compiling static libs. 32 + enableRelocatedStaticLibs ? stdenv.targetPlatform != stdenv.hostPlatform 33 + 34 + # aarch64 outputs otherwise exceed 2GB limit 35 + , enableProfiledLibs ? !stdenv.targetPlatform.isAarch64 36 + 37 + , # Whether to build dynamic libs for the standard library (on the target 38 + # platform). Static libs are always built. 39 + enableShared ? with stdenv.targetPlatform; !isWindows && !useiOSPrebuilt && !isStatic 40 + 41 + , # Whether to build terminfo. 42 + enableTerminfo ? !stdenv.targetPlatform.isWindows 43 + 44 + , # What flavour to build. An empty string indicates no 45 + # specific flavour and falls back to ghc default values. 46 + ghcFlavour ? lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) 47 + (if useLLVM then "perf-cross" else "perf-cross-ncg") 48 + 49 + , # Whether to build sphinx documentation. 50 + enableDocs ? ( 51 + # Docs disabled for musl and cross because it's a large task to keep 52 + # all `sphinx` dependencies building in those environments. 53 + # `sphinx` pulls in among others: 54 + # Ruby, Python, Perl, Rust, OpenGL, Xorg, gtk, LLVM. 55 + (stdenv.targetPlatform == stdenv.hostPlatform) 56 + && !stdenv.hostPlatform.isMusl 57 + ) 58 + 59 + , enableHaddockProgram ? 60 + # Disabled for cross; see note [HADDOCK_DOCS]. 61 + (stdenv.targetPlatform == stdenv.hostPlatform) 62 + 63 + , # Whether to disable the large address space allocator 64 + # necessary fix for iOS: https://www.reddit.com/r/haskell/comments/4ttdz1/building_an_osxi386_to_iosarm64_cross_compiler/d5qvd67/ 65 + disableLargeAddressSpace ? stdenv.targetPlatform.isiOS 66 + }: 67 + 68 + assert !enableNativeBignum -> gmp != null; 69 + 70 + # Cross cannot currently build the `haddock` program for silly reasons, 71 + # see note [HADDOCK_DOCS]. 72 + assert (stdenv.targetPlatform != stdenv.hostPlatform) -> !enableHaddockProgram; 73 + 74 + let 75 + inherit (stdenv) buildPlatform hostPlatform targetPlatform; 76 + 77 + inherit (bootPkgs) ghc; 78 + 79 + # TODO(@Ericson2314) Make unconditional 80 + targetPrefix = lib.optionalString 81 + (targetPlatform != hostPlatform) 82 + "${targetPlatform.config}-"; 83 + 84 + buildMK = '' 85 + BuildFlavour = ${ghcFlavour} 86 + ifneq \"\$(BuildFlavour)\" \"\" 87 + include mk/flavours/\$(BuildFlavour).mk 88 + endif 89 + BUILD_SPHINX_HTML = ${if enableDocs then "YES" else "NO"} 90 + BUILD_SPHINX_PDF = NO 91 + '' + 92 + # Note [HADDOCK_DOCS]: 93 + # Unfortunately currently `HADDOCK_DOCS` controls both whether the `haddock` 94 + # program is built (which we generally always want to have a complete GHC install) 95 + # and whether it is run on the GHC sources to generate hyperlinked source code 96 + # (which is impossible for cross-compilation); see: 97 + # https://gitlab.haskell.org/ghc/ghc/-/issues/20077 98 + # This implies that currently a cross-compiled GHC will never have a `haddock` 99 + # program, so it can never generate haddocks for any packages. 100 + # If this is solved in the future, we'd like to unconditionally 101 + # build the haddock program (removing the `enableHaddockProgram` option). 102 + '' 103 + HADDOCK_DOCS = ${if enableHaddockProgram then "YES" else "NO"} 104 + # Build haddocks for boot packages with hyperlinking 105 + EXTRA_HADDOCK_OPTS += --hyperlinked-source --quickjump 106 + 107 + DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"} 108 + BIGNUM_BACKEND = ${if enableNativeBignum then "native" else "gmp"} 109 + '' + lib.optionalString (targetPlatform != hostPlatform) '' 110 + Stage1Only = ${if targetPlatform.system == hostPlatform.system then "NO" else "YES"} 111 + CrossCompilePrefix = ${targetPrefix} 112 + '' + lib.optionalString (!enableProfiledLibs) '' 113 + GhcLibWays = "v dyn" 114 + '' + 115 + # -fexternal-dynamic-refs apparently (because it's not clear from the documentation) 116 + # makes the GHC RTS able to load static libraries, which may be needed for TemplateHaskell. 117 + # This solution was described in https://www.tweag.io/blog/2020-09-30-bazel-static-haskell 118 + lib.optionalString enableRelocatedStaticLibs '' 119 + GhcLibHcOpts += -fPIC -fexternal-dynamic-refs 120 + GhcRtsHcOpts += -fPIC -fexternal-dynamic-refs 121 + '' + lib.optionalString targetPlatform.useAndroidPrebuilt '' 122 + EXTRA_CC_OPTS += -std=gnu99 123 + ''; 124 + 125 + # Splicer will pull out correct variations 126 + libDeps = platform: lib.optional enableTerminfo ncurses 127 + ++ [libffi] 128 + ++ lib.optional (!enableNativeBignum) gmp 129 + ++ lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv; 130 + 131 + # TODO(@sternenseemann): is buildTarget LLVM unnecessary? 132 + # GHC doesn't seem to have {LLC,OPT}_HOST 133 + toolsForTarget = [ 134 + pkgsBuildTarget.targetPackages.stdenv.cc 135 + ] ++ lib.optional useLLVM buildTargetLlvmPackages.llvm; 136 + 137 + targetCC = builtins.head toolsForTarget; 138 + 139 + # Sometimes we have to dispatch between the bintools wrapper and the unwrapped 140 + # derivation for certain tools depending on the platform. 141 + bintoolsFor = { 142 + # GHC needs install_name_tool on all darwin platforms. On aarch64-darwin it is 143 + # part of the bintools wrapper (due to codesigning requirements), but not on 144 + # x86_64-darwin. 145 + install_name_tool = 146 + if stdenv.targetPlatform.isAarch64 147 + then targetCC.bintools 148 + else targetCC.bintools.bintools; 149 + # Same goes for strip. 150 + strip = 151 + # TODO(@sternenseemann): also use wrapper if linker == "bfd" or "gold" 152 + if stdenv.targetPlatform.isAarch64 && stdenv.targetPlatform.isDarwin 153 + then targetCC.bintools 154 + else targetCC.bintools.bintools; 155 + }; 156 + 157 + # Use gold either following the default, or to avoid the BFD linker due to some bugs / perf issues. 158 + # But we cannot avoid BFD when using musl libc due to https://sourceware.org/bugzilla/show_bug.cgi?id=23856 159 + # see #84670 and #49071 for more background. 160 + useLdGold = targetPlatform.linker == "gold" || 161 + (targetPlatform.linker == "bfd" && (targetCC.bintools.bintools.hasGold or false) && !targetPlatform.isMusl); 162 + 163 + # Makes debugging easier to see which variant is at play in `nix-store -q --tree`. 164 + variantSuffix = lib.concatStrings [ 165 + (lib.optionalString stdenv.hostPlatform.isMusl "-musl") 166 + (lib.optionalString enableNativeBignum "-native-bignum") 167 + ]; 168 + 169 + in 170 + 171 + # C compiler, bintools and LLVM are used at build time, but will also leak into 172 + # the resulting GHC's settings file and used at runtime. This means that we are 173 + # currently only able to build GHC if hostPlatform == buildPlatform. 174 + assert targetCC == pkgsHostTarget.targetPackages.stdenv.cc; 175 + assert buildTargetLlvmPackages.llvm == llvmPackages.llvm; 176 + assert stdenv.targetPlatform.isDarwin -> buildTargetLlvmPackages.clang == llvmPackages.clang; 177 + 178 + stdenv.mkDerivation (rec { 179 + version = "9.4.3"; 180 + pname = "${targetPrefix}ghc${variantSuffix}"; 181 + 182 + src = fetchurl { 183 + url = "https://downloads.haskell.org/ghc/${version}/ghc-${version}-src.tar.xz"; 184 + sha256 = "eaf63949536ede50ee39179f2299d5094eb9152d87cc6fb2175006bc98e8905a"; 185 + }; 186 + 187 + enableParallelBuilding = true; 188 + 189 + outputs = [ "out" "doc" ]; 190 + 191 + 192 + postPatch = "patchShebangs ."; 193 + 194 + # GHC needs the locale configured during the Haddock phase. 195 + LANG = "en_US.UTF-8"; 196 + 197 + # GHC is a bit confused on its cross terminology. 198 + # TODO(@sternenseemann): investigate coreutils dependencies and pass absolute paths 199 + preConfigure = '' 200 + for env in $(env | grep '^TARGET_' | sed -E 's|\+?=.*||'); do 201 + export "''${env#TARGET_}=''${!env}" 202 + done 203 + # GHC is a bit confused on its cross terminology, as these would normally be 204 + # the *host* tools. 205 + export CC="${targetCC}/bin/${targetCC.targetPrefix}cc" 206 + export CXX="${targetCC}/bin/${targetCC.targetPrefix}c++" 207 + # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177 208 + export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${lib.optionalString useLdGold ".gold"}" 209 + export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as" 210 + export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar" 211 + export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm" 212 + export RANLIB="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ranlib" 213 + export READELF="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}readelf" 214 + export STRIP="${bintoolsFor.strip}/bin/${bintoolsFor.strip.targetPrefix}strip" 215 + '' + lib.optionalString (stdenv.targetPlatform.linker == "cctools") '' 216 + export OTOOL="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}otool" 217 + export INSTALL_NAME_TOOL="${bintoolsFor.install_name_tool}/bin/${bintoolsFor.install_name_tool.targetPrefix}install_name_tool" 218 + '' + lib.optionalString useLLVM '' 219 + export LLC="${lib.getBin buildTargetLlvmPackages.llvm}/bin/llc" 220 + export OPT="${lib.getBin buildTargetLlvmPackages.llvm}/bin/opt" 221 + '' + lib.optionalString (useLLVM && stdenv.targetPlatform.isDarwin) '' 222 + # LLVM backend on Darwin needs clang: https://downloads.haskell.org/~ghc/latest/docs/html/users_guide/codegens.html#llvm-code-generator-fllvm 223 + export CLANG="${buildTargetLlvmPackages.clang}/bin/${buildTargetLlvmPackages.clang.targetPrefix}clang" 224 + '' + '' 225 + 226 + echo -n "${buildMK}" > mk/build.mk 227 + 228 + sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure 229 + '' + lib.optionalString (stdenv.isLinux && hostPlatform.libc == "glibc") '' 230 + export LOCALE_ARCHIVE="${glibcLocales}/lib/locale/locale-archive" 231 + '' + lib.optionalString (!stdenv.isDarwin) '' 232 + export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}" 233 + '' + lib.optionalString stdenv.isDarwin '' 234 + export NIX_LDFLAGS+=" -no_dtrace_dof" 235 + 236 + # GHC tries the host xattr /usr/bin/xattr by default which fails since it expects python to be 2.7 237 + export XATTR=${lib.getBin xattr}/bin/xattr 238 + '' + lib.optionalString targetPlatform.useAndroidPrebuilt '' 239 + 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 240 + '' + lib.optionalString targetPlatform.isMusl '' 241 + echo "patching llvm-targets for musl targets..." 242 + echo "Cloning these existing '*-linux-gnu*' targets:" 243 + grep linux-gnu llvm-targets | sed 's/^/ /' 244 + echo "(go go gadget sed)" 245 + sed -i 's,\(^.*linux-\)gnu\(.*\)$,\0\n\1musl\2,' llvm-targets 246 + echo "llvm-targets now contains these '*-linux-musl*' targets:" 247 + grep linux-musl llvm-targets | sed 's/^/ /' 248 + 249 + echo "And now patching to preserve '-musleabi' as done with '-gnueabi'" 250 + # (aclocal.m4 is actual source, but patch configure as well since we don't re-gen) 251 + for x in configure aclocal.m4; do 252 + substituteInPlace $x \ 253 + --replace '*-android*|*-gnueabi*)' \ 254 + '*-android*|*-gnueabi*|*-musleabi*)' 255 + done 256 + '' 257 + # HACK: allow bootstrapping with GHC 8.10 which works fine, as we don't have 258 + # binary 9.0 packaged. Bootstrapping with 9.2 is broken without hadrian. 259 + + '' 260 + substituteInPlace configure --replace \ 261 + 'MinBootGhcVersion="9.0"' \ 262 + 'MinBootGhcVersion="8.10"' 263 + ''; 264 + 265 + # TODO(@Ericson2314): Always pass "--target" and always prefix. 266 + configurePlatforms = [ "build" "host" ] 267 + ++ lib.optional (targetPlatform != hostPlatform) "target"; 268 + 269 + # `--with` flags for libraries needed for RTS linker 270 + configureFlags = [ 271 + "--datadir=$doc/share/doc/ghc" 272 + "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib" 273 + ] ++ lib.optionals (libffi != null) [ 274 + "--with-system-libffi" 275 + "--with-ffi-includes=${targetPackages.libffi.dev}/include" 276 + "--with-ffi-libraries=${targetPackages.libffi.out}/lib" 277 + ] ++ lib.optionals (targetPlatform == hostPlatform && !enableNativeBignum) [ 278 + "--with-gmp-includes=${targetPackages.gmp.dev}/include" 279 + "--with-gmp-libraries=${targetPackages.gmp.out}/lib" 280 + ] ++ lib.optionals (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [ 281 + "--with-iconv-includes=${libiconv}/include" 282 + "--with-iconv-libraries=${libiconv}/lib" 283 + ] ++ lib.optionals (targetPlatform != hostPlatform) [ 284 + "--enable-bootstrap-with-devel-snapshot" 285 + ] ++ lib.optionals useLdGold [ 286 + "CFLAGS=-fuse-ld=gold" 287 + "CONF_GCC_LINKER_OPTS_STAGE1=-fuse-ld=gold" 288 + "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold" 289 + ] ++ lib.optionals (disableLargeAddressSpace) [ 290 + "--disable-large-address-space" 291 + ]; 292 + 293 + # Make sure we never relax`$PATH` and hooks support for compatibility. 294 + strictDeps = true; 295 + 296 + # Don’t add -liconv to LDFLAGS automatically so that GHC will add it itself. 297 + dontAddExtraLibs = true; 298 + 299 + nativeBuildInputs = [ 300 + perl autoconf automake m4 python3 301 + ghc bootPkgs.alex bootPkgs.happy bootPkgs.hscolour 302 + ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ 303 + autoSignDarwinBinariesHook 304 + ] ++ lib.optionals enableDocs [ 305 + sphinx 306 + ]; 307 + 308 + # For building runtime libs 309 + depsBuildTarget = toolsForTarget; 310 + 311 + buildInputs = [ perl bash ] ++ (libDeps hostPlatform); 312 + 313 + depsTargetTarget = map lib.getDev (libDeps targetPlatform); 314 + depsTargetTargetPropagated = map (lib.getOutput "out") (libDeps targetPlatform); 315 + 316 + # required, because otherwise all symbols from HSffi.o are stripped, and 317 + # that in turn causes GHCi to abort 318 + stripDebugFlags = [ "-S" ] ++ lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols"; 319 + 320 + checkTarget = "test"; 321 + 322 + hardeningDisable = 323 + [ "format" ] 324 + # In nixpkgs, musl based builds currently enable `pie` hardening by default 325 + # (see `defaultHardeningFlags` in `make-derivation.nix`). 326 + # But GHC cannot currently produce outputs that are ready for `-pie` linking. 327 + # Thus, disable `pie` hardening, otherwise `recompile with -fPIE` errors appear. 328 + # See: 329 + # * https://github.com/NixOS/nixpkgs/issues/129247 330 + # * https://gitlab.haskell.org/ghc/ghc/-/issues/19580 331 + ++ lib.optional stdenv.targetPlatform.isMusl "pie"; 332 + 333 + # big-parallel allows us to build with more than 2 cores on 334 + # Hydra which already warrants a significant speedup 335 + requiredSystemFeatures = [ "big-parallel" ]; 336 + 337 + postInstall = '' 338 + # Install the bash completion file. 339 + install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/${targetPrefix}ghc 340 + ''; 341 + 342 + passthru = { 343 + inherit bootPkgs targetPrefix; 344 + 345 + inherit llvmPackages; 346 + inherit enableShared; 347 + 348 + # This is used by the haskell builder to query 349 + # the presence of the haddock program. 350 + hasHaddock = enableHaddockProgram; 351 + 352 + # Our Cabal compiler name 353 + haskellCompilerName = "ghc-${version}"; 354 + }; 355 + 356 + meta = { 357 + homepage = "http://haskell.org/ghc"; 358 + description = "The Glasgow Haskell Compiler"; 359 + maintainers = with lib.maintainers; [ 360 + guibou 361 + ] ++ lib.teams.haskell.members; 362 + timeout = 24 * 3600; 363 + inherit (ghc.meta) license platforms; 364 + }; 365 + 366 + } // lib.optionalAttrs targetPlatform.useAndroidPrebuilt { 367 + dontStrip = true; 368 + dontPatchELF = true; 369 + noAuditTmpdir = true; 370 + })
+1 -1
pkgs/development/compilers/ghc/common-hadrian.nix
··· 158 158 159 159 assert stdenv.hostPlatform == stdenv.targetPlatform || throw '' 160 160 hadrian doesn't support building an installable GHC cross-compiler at the moment. 161 - Consider using GHC 9.4.2 or lower which support this via the make build system. 161 + Consider using GHC 9.4 or lower which support this via the make build system. 162 162 See also: https://gitlab.haskell.org/ghc/ghc/-/issues/22090 163 163 ''; 164 164
+29 -16
pkgs/development/haskell-modules/configuration-common.nix
··· 106 106 name = "git-annex-${super.git-annex.version}-src"; 107 107 url = "git://git-annex.branchable.com/"; 108 108 rev = "refs/tags/" + super.git-annex.version; 109 - sha256 = "09ksaaf5kxpskq2hmi1ad35k15cnhn86j795iw6nk86gbvx5hrap"; 109 + sha256 = "14391vj0awvkpsd32kanmc85yic5mg4pxmjhiv7wjxy7ga13wfqw"; 110 110 # delete android and Android directories which cause issues on 111 111 # darwin (case insensitive directory). Since we don't need them 112 112 # during the build process, we can delete it to prevent a hash ··· 122 122 # https://git-annex.branchable.com/git-annex-shell/ 123 123 passthru.shellPath = "/bin/git-annex-shell"; 124 124 }) super.git-annex; 125 + 126 + # Too strict bounds on servant 127 + # Pending a hackage revision: https://github.com/berberman/arch-web/commit/5d08afee5b25e644f9e2e2b95380a5d4f4aa81ea#commitcomment-89230555 128 + arch-web = doJailbreak super.arch-web; 125 129 126 130 # Fix test trying to access /home directory 127 131 shell-conduit = overrideCabal (drv: { ··· 1577 1581 ghc-paths = lsuper.ghc-paths.override { Cabal = null; }; 1578 1582 }); 1579 1583 1584 + hledger_1_27_1 = doDistribute (super.hledger_1_27_1.override { 1585 + hledger-lib = self.hledger-lib_1_27_1; 1586 + }); 1587 + 1580 1588 hls-hlint-plugin = super.hls-hlint-plugin.overrideScope (lself: lsuper: { 1581 1589 # For "ghc-lib" flag see https://github.com/haskell/haskell-language-server/issues/3185#issuecomment-1250264515 1582 1590 hlint = enableCabalFlag "ghc-lib" lself.hlint_3_4_1; ··· 1715 1723 # waiting for aeson bump 1716 1724 servant-swagger-ui-core = doJailbreak super.servant-swagger-ui-core; 1717 1725 1718 - hercules-ci-agent = self.generateOptparseApplicativeCompletions [ "hercules-ci-agent" ] super.hercules-ci-agent; 1726 + hercules-ci-agent = lib.pipe super.hercules-ci-agent [ 1727 + (appendPatches [ 1728 + # https://github.com/hercules-ci/hercules-ci-agent/pull/446 1729 + (fetchpatch { 1730 + url = "https://github.com/hercules-ci/hercules-ci-agent/commit/99afac77ddb84122a5321494a08e6fe2e95548a1.patch"; 1731 + sha256 = "sha256-0dtmNL1rqzeXvXWinfANc57a5LIM3uNnhR3A+p8mH0A="; 1732 + stripLen = 1; 1733 + }) 1734 + ]) 1735 + (self.generateOptparseApplicativeCompletions [ "hercules-ci-agent" ]) 1736 + ]; 1719 1737 1720 1738 # Test suite doesn't compile with aeson 2.0 1721 1739 # https://github.com/hercules-ci/hercules-ci-agent/pull/387 ··· 2377 2395 # https://github.com/kuribas/mfsolve/issues/8 2378 2396 mfsolve = dontCheck super.mfsolve; 2379 2397 2380 - # GHC 9 support https://github.com/lambdabot/dice/pull/2 2381 - dice = appendPatch (fetchpatch { 2382 - name = "dice-ghc9.patch"; 2383 - url = "https://github.com/lambdabot/dice/commit/80d6fd443cb17b21d91b725f994ece6e8274e0a0.patch"; 2384 - excludes = [ ".gitignore" ]; 2385 - sha256 = "sha256-MtS1n7v5D6MRWWzzTyKl3Lqd/NhD1bV+g80wnhZ3P/Y="; 2386 - }) (overrideCabal (drv: { 2387 - revision = null; 2388 - editedCabalFile = null; 2389 - }) super.dice); 2390 - 2391 2398 # GHC 9 support https://github.com/lambdabot/lambdabot/pull/204 2392 2399 lambdabot-core = appendPatch ./patches/lambdabot-core-ghc9.patch (overrideCabal (drv: { 2393 2400 revision = null; ··· 2559 2566 testTarget = "regex-tdfa-unittest"; 2560 2567 } super.regex-tdfa; 2561 2568 2562 - # Missing test files https://github.com/qrilka/xlsx/issues/165 2563 - xlsx = dontCheck super.xlsx; 2564 - 2565 2569 # Missing test files https://github.com/kephas/xdg-basedir-compliant/issues/1 2566 2570 xdg-basedir-compliant = dontCheck super.xdg-basedir-compliant; 2567 2571 ··· 2635 2639 2636 2640 # 2022-10-04: Needs newer tasty-dejafu than (currently) in stackage 2637 2641 rec-def = super.rec-def.override { tasty-dejafu = self.tasty-dejafu_2_1_0_0; }; 2642 + 2643 + # 2022-11-05: https://github.com/ysangkok/haskell-tzdata/issues/3 2644 + tzdata = dontCheck super.tzdata; 2645 + 2646 + # 2022-11-04: The situation around heist-emanote is quite terrible. 2647 + # It‘s simply a heist fork because heist is unmaintained. 2648 + # Upstream jailbreak is unreleased: https://github.com/srid/heist/commit/988692ea850b3cbe966c7dc4dd26ba1d49647706 2649 + heist-emanote = doJailbreak (dontCheck super.heist-emanote); 2650 + 2638 2651 })
+5 -9
pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix
··· 61 61 # 0.30 introduced support for GHC 9.2. 62 62 cryptonite = doDistribute self.cryptonite_0_30; 63 63 64 - cabal2nix = 65 - # cabal2nix depends on foundation, which is broken on aarch64-linux. 66 - # https://github.com/haskell-foundation/foundation/issues/571 67 - overrideCabal 68 - (drv: { badPlatforms = [ "aarch64-linux" ]; }) 69 - super.cabal2nix; 70 - 71 64 doctest = self.doctest_0_20_1; 72 65 # consequences of doctest breakage follow: 73 66 ··· 78 71 lucid = jailbreakForCurrentVersion super.lucid "2.11.1"; 79 72 invariant = jailbreakForCurrentVersion super.invariant "0.5.6"; 80 73 implicit-hie-cradle = jailbreakForCurrentVersion super.implicit-hie-cradle "0.5.0.0"; 81 - # https://github.com/co-log/co-log-core/pull/22#issuecomment-1294040208 82 - co-log-core = jailbreakForCurrentVersion super.co-log-core "0.3.1.0"; 83 74 84 75 haskell-src-meta = doJailbreak super.haskell-src-meta; 85 76 ··· 205 196 206 197 # 2022-10-06: https://gitlab.haskell.org/ghc/ghc/-/issues/22260 207 198 ghc-check = dontHaddock super.ghc-check; 199 + 200 + # 2022-11-06: Override override from common, because Cabal-syntax is included since ghc 9.4. 201 + implicit-hie = super.implicit-hie.override { 202 + Cabal-syntax = null; 203 + }; 208 204 209 205 # 2022-10-06: plugins disabled for hls 1.8.0.0 based on 210 206 # https://haskell-language-server.readthedocs.io/en/latest/support/plugin-support.html#current-plugin-support-tiers
+5 -3
pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
··· 2137 2137 - heidi 2138 2138 - hein 2139 2139 - heist-async 2140 - - heist-emanote 2141 2140 - helisp 2142 2141 - helix 2143 2142 - hell ··· 2627 2626 - imapget 2628 2627 - imgur 2629 2628 - imj-prelude 2629 + - imm 2630 2630 - immortal-worker 2631 2631 - imperative-edsl 2632 2632 - imperative-edsl-vhdl ··· 3777 3777 - pasta 3778 3778 - pastis 3779 3779 - pasty 3780 - - patat 3781 3780 - patches-vector 3782 3781 - Pathfinder 3783 3782 - pathfindingcore ··· 3955 3954 - polysemy-check 3956 3955 - polysemy-keyed-state 3957 3956 - polysemy-kvstore-jsonfile 3957 + - polysemy-log-co 3958 3958 - polysemy-managed 3959 3959 - polysemy-mocks 3960 3960 - polysemy-readline ··· 5027 5027 - tagsoup-selection 5028 5028 - tai 5029 5029 - tai64 5030 - - tailwind 5031 5030 - tak 5032 5031 - takahashi 5033 5032 - Takusen ··· 5080 5079 - tensorflow 5081 5080 - tensorflow-opgen 5082 5081 - tensor-safe 5082 + - termbox-banana 5083 5083 - termbox-bindings 5084 + - termbox-tea 5084 5085 - termination-combinators 5085 5086 - termplot 5086 5087 - term-rewriting ··· 5335 5336 - type-int 5336 5337 - type-interpreter 5337 5338 - type-level-bst 5339 + - type-level-kv-list-esqueleto 5338 5340 - type-level-natural-number-induction 5339 5341 - type-level-natural-number-operations 5340 5342 - typelevel-tensor
+3
pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
··· 290 290 maralorn: 291 291 - cabal-fmt 292 292 - ema 293 + - emanote 293 294 - generic-optics 294 295 - ghcid 295 296 - ghcide ··· 454 455 FTGL: [ platforms.darwin ] 455 456 fuzzytime: [ platforms.darwin ] # https://github.com/kamwitsta/fuzzytime/issues/2 456 457 ghcjs-dom-hello: [ platforms.darwin ] 458 + ghc-gc-hook: [ platforms.darwin ] # requires C11 threads which Apple doesn't support 457 459 gi-adwaita: [ platforms.darwin ] 458 460 gi-dbusmenugtk3: [ platforms.darwin ] 459 461 gi-dbusmenu: [ platforms.darwin ] ··· 520 522 sensei: [ platforms.darwin ] 521 523 synthesizer-alsa: [ platforms.darwin ] 522 524 taffybar: [ platforms.darwin ] 525 + emanote: [ x86_64-darwin ] # Depends on stork which is broken on macOS sdk < 10.14 523 526 termonad: [ platforms.darwin ] 524 527 tokyotyrant-haskell: [ platforms.darwin ] 525 528 Unixutils-shadow: [ platforms.darwin ]
+21 -21
pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml
··· 1 - # Stackage LTS 19.30 1 + # Stackage LTS 19.31 2 2 # This file is auto-generated by 3 3 # maintainers/scripts/haskell/update-stackage.sh 4 4 default-package-overrides: ··· 359 359 - code-conjure ==0.5.2 360 360 - code-page ==0.2.1 361 361 - coercible-utils ==0.1.0 362 - - cointracking-imports ==0.1.0.1 362 + - cointracking-imports ==0.1.0.2 363 363 - collect-errors ==0.1.5.0 364 364 - colonnade ==1.2.0.2 365 365 - Color ==0.3.3 ··· 729 729 - fast-builder ==0.1.3.0 730 730 - fast-logger ==3.1.1 731 731 - fast-math ==1.0.2 732 - - fastmemo ==0.1.0.1 732 + - fastmemo ==0.1.1 733 733 - fclabels ==2.0.5.1 734 734 - feature-flags ==0.1.0.1 735 735 - fedora-dists ==2.0.0 ··· 914 914 - gi-javascriptcore ==4.0.25 915 915 - ginger ==0.10.4.0 916 916 - gi-pango ==1.0.27 917 - - githash ==0.1.6.2 917 + - githash ==0.1.6.3 918 918 - github ==0.27 919 919 - github-release ==2.0.0.2 920 920 - github-rest ==1.1.2 ··· 946 946 - graph-core ==0.3.0.0 947 947 - graphite ==0.10.0.1 948 948 - graphs ==0.7.2 949 - - graphula ==2.0.2.1 949 + - graphula ==2.0.2.2 950 950 - graphviz ==2999.20.1.0 951 951 - graph-wrapper ==0.2.6.0 952 952 - gravatar ==0.8.1 ··· 992 992 - hashtables ==1.2.4.2 993 993 - haskeline ==0.8.2 994 994 - haskell-awk ==1.2.0.1 995 - - haskell-gi ==0.26.1 996 - - haskell-gi-base ==0.26.2 995 + - haskell-gi ==0.26.2 996 + - haskell-gi-base ==0.26.3 997 997 - haskell-gi-overloading ==1.0 998 998 - haskell-lexer ==1.1 999 999 - haskell-lsp-types ==0.24.0.0 ··· 1221 1221 - hworker ==0.1.0.1 1222 1222 - hw-packed-vector ==0.2.1.1 1223 1223 - hw-parser ==0.1.1.0 1224 - - hw-prim ==0.6.3.1 1224 + - hw-prim ==0.6.3.2 1225 1225 - hw-rankselect ==0.13.4.1 1226 1226 - hw-rankselect-base ==0.3.4.1 1227 1227 - hw-simd ==0.1.2.1 ··· 1548 1548 - mock-time ==0.1.0 1549 1549 - mod ==0.1.2.2 1550 1550 - model ==0.5 1551 - - modern-uri ==0.3.5.0 1551 + - modern-uri ==0.3.6.0 1552 1552 - modular ==0.1.0.8 1553 1553 - monad-chronicle ==1.0.1 1554 1554 - monad-control ==1.0.3.1 ··· 1578 1578 - monad-st ==0.2.4.1 1579 1579 - monads-tf ==0.1.0.3 1580 1580 - monad-time ==0.3.1.0 1581 - - mongoDB ==2.7.1.1 1581 + - mongoDB ==2.7.1.2 1582 1582 - monoidal-containers ==0.6.3.0 1583 1583 - monoid-extras ==0.6.1 1584 1584 - monoid-subclasses ==1.1.3 ··· 1878 1878 - postgresql-orm ==0.5.1 1879 1879 - postgresql-query ==3.9.0 1880 1880 - postgresql-schema ==0.1.14 1881 - - postgresql-simple ==0.6.4 1881 + - postgresql-simple ==0.6.5 1882 1882 - postgresql-simple-url ==0.2.1.0 1883 1883 - postgresql-syntax ==0.4.1 1884 1884 - postgresql-typed ==0.6.2.1 1885 1885 - post-mess-age ==0.2.1.0 1886 1886 - pptable ==0.3.0.0 1887 - - pqueue ==1.4.2.0 1887 + - pqueue ==1.4.3.0 1888 1888 - prefix-units ==0.2.0 1889 1889 - prelude-compat ==0.0.0.2 1890 1890 - prelude-safeenum ==0.1.1.3 ··· 2088 2088 - rope-utf16-splay ==0.3.2.0 2089 2089 - rosezipper ==0.2 2090 2090 - rot13 ==0.2.0.1 2091 - - rpmbuild-order ==0.4.9 2091 + - rpmbuild-order ==0.4.10 2092 2092 - rpm-nvr ==0.1.2 2093 2093 - rp-tree ==0.7.1 2094 2094 - RSA ==2.4.1 ··· 2121 2121 - say ==0.1.0.1 2122 2122 - sbp ==4.1.6 2123 2123 - sbv ==8.17 2124 - - scalpel ==0.6.2 2125 - - scalpel-core ==0.6.2 2124 + - scalpel ==0.6.2.1 2125 + - scalpel-core ==0.6.2.1 2126 2126 - scanf ==0.1.0.0 2127 2127 - scanner ==0.3.1 2128 2128 - scheduler ==2.0.0.1 ··· 2156 2156 - sequenceTools ==1.5.2 2157 2157 - serf ==0.1.1.0 2158 2158 - serialise ==0.2.6.0 2159 - - servant ==0.19 2159 + - servant ==0.19.1 2160 2160 - servant-auth ==0.4.1.0 2161 2161 - servant-auth-client ==0.4.1.0 2162 2162 - servant-auth-docs ==0.2.10.0 ··· 2184 2184 - servant-pipes ==0.15.3 2185 2185 - servant-rawm ==1.0.0.0 2186 2186 - servant-ruby ==0.9.0.0 2187 - - servant-server ==0.19.1 2187 + - servant-server ==0.19.2 2188 2188 - servant-static-th ==1.0.0.0 2189 2189 - servant-subscriber ==0.7.0.0 2190 2190 - servant-swagger ==1.1.11 ··· 2342 2342 - streaming-attoparsec ==1.0.0.1 2343 2343 - streaming-bytestring ==0.2.4 2344 2344 - streaming-cassava ==0.2.0.0 2345 - - streaming-commons ==0.2.2.4 2345 + - streaming-commons ==0.2.2.5 2346 2346 - streamly ==0.8.1.1 2347 2347 - streamly-bytestring ==0.1.4 2348 2348 - streams ==3.3 ··· 2379 2379 - svg-builder ==0.1.1 2380 2380 - SVGFonts ==1.8.0.1 2381 2381 - svg-tree ==0.6.2.4 2382 - - swagger2 ==2.8.5 2382 + - swagger2 ==2.8.6 2383 2383 - swish ==0.10.2.0 2384 2384 - syb ==0.7.2.2 2385 2385 - sydtest-discover ==0.0.0.2 ··· 2595 2595 - type-spec ==0.4.0.0 2596 2596 - typography-geometry ==1.0.1.0 2597 2597 - tz ==0.1.3.6 2598 - - tzdata ==0.2.20221011.0 2598 + - tzdata ==0.2.20221028.0 2599 2599 - ua-parser ==0.7.7.0 2600 2600 - uglymemo ==0.1.0.1 2601 2601 - unagi-chan ==0.4.1.4 ··· 2634 2634 - unix-bytestring ==0.3.7.8 2635 2635 - unix-compat ==0.5.4 2636 2636 - unix-time ==0.4.8 2637 - - unliftio ==0.2.22.0 2637 + - unliftio ==0.2.23.0 2638 2638 - unliftio-core ==0.2.0.1 2639 2639 - unliftio-path ==0.0.2.0 2640 2640 - unliftio-pool ==0.2.2.0
+3 -2
pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml
··· 2041 2041 - hedgehog-gen-json 2042 2042 - hedis-pile 2043 2043 - heist-aeson 2044 - - heist-extra 2045 2044 - helic 2046 2045 - helics 2047 2046 - helics-wai ··· 2958 2957 - persistent-audit 2959 2958 - persistent-hssqlppp 2960 2959 - persistent-map 2960 + - persistent-mtl_0_5_0_0 2961 2961 - persistent-mysql-haskell 2962 2962 - persistent-relational-record 2963 2963 - persona-idp ··· 3484 3484 - skeletons 3485 3485 - sketch-frp-copilot 3486 3486 - skylark-client 3487 - - skylighting_0_13_1 3487 + - skylighting_0_13_1_1 3488 3488 - slate 3489 3489 - slidemews 3490 3490 - slip32 ··· 3584 3584 - stackage-setup 3585 3585 - stackage-upload 3586 3586 - stackage2nix 3587 + - stackctl 3587 3588 - stan 3588 3589 - starrover2 3589 3590 - stateful-mtl
+14
pkgs/development/haskell-modules/configuration-nix.nix
··· 1102 1102 broken = false; 1103 1103 }) super.cabal-install; 1104 1104 1105 + tailwind = addBuildDepend 1106 + # Overrides for tailwindcss copied from: 1107 + # https://github.com/EmaApps/emanote/blob/master/nix/tailwind.nix 1108 + (pkgs.nodePackages.tailwindcss.overrideAttrs (oa: { 1109 + plugins = [ 1110 + pkgs.nodePackages."@tailwindcss/aspect-ratio" 1111 + pkgs.nodePackages."@tailwindcss/forms" 1112 + pkgs.nodePackages."@tailwindcss/line-clamp" 1113 + pkgs.nodePackages."@tailwindcss/typography" 1114 + ]; 1115 + })) super.tailwind; 1116 + 1117 + emanote = addBuildDepend pkgs.stork super.emanote; 1118 + 1105 1119 keid-render-basic = addBuildTool pkgs.glslang super.keid-render-basic; 1106 1120 1107 1121 # ghcide-bench tests need network
+593 -497
pkgs/development/haskell-modules/hackage-packages.nix
··· 14281 14281 ({ mkDerivation, base, doctest, hspec, process, time }: 14282 14282 mkDerivation { 14283 14283 pname = "Monadoro"; 14284 - version = "0.3.3.0"; 14285 - sha256 = "1zya572cc0gml4k9mm2g9z5bakjzz6ivigdc9fpv2bsrnc58a4y4"; 14284 + version = "0.3.5.0"; 14285 + sha256 = "1gj6s043241wcdx5wbc6jdihnlrcrdzxjr60g7i13k6himhbx739"; 14286 14286 isLibrary = true; 14287 14287 isExecutable = true; 14288 14288 enableSeparateDataOutput = true; ··· 19832 19832 pname = "Spock-core"; 19833 19833 version = "0.14.0.1"; 19834 19834 sha256 = "0a93v9pxbvd9qqpx9rnv6gqpc5y8xh5dkfi0lkc566pj9cv8bpad"; 19835 + revision = "1"; 19836 + editedCabalFile = "1kxi4bigll1gn9rcp8x3h4waycihycvh6bhvfjzxdyzhm3ifq48a"; 19835 19837 libraryHaskellDepends = [ 19836 19838 aeson base base64-bytestring bytestring case-insensitive containers 19837 19839 cookie hashable http-api-data http-types hvect mmorph monad-control ··· 48323 48325 }) {}; 48324 48326 48325 48327 "breakpoint" = callPackage 48326 - ({ mkDerivation, base, containers, ghc, haskeline, mtl, tasty 48327 - , tasty-hunit, transformers 48328 + ({ mkDerivation, ansi-terminal, base, containers, ghc, haskeline 48329 + , mtl, pretty-simple, tasty, tasty-hunit, template-haskell, text 48330 + , transformers 48328 48331 }: 48329 48332 mkDerivation { 48330 48333 pname = "breakpoint"; 48331 - version = "0.1.0.0"; 48332 - sha256 = "11b2wbm8fm1zwz81hx1l3c559ad7y50d0838n94lkm1vsa39hpk7"; 48334 + version = "0.1.1.1"; 48335 + sha256 = "1hyfsn4wgiz2zzlihncq9lj18k7nzd4wq2z53xbnp1palspjqjp2"; 48333 48336 libraryHaskellDepends = [ 48334 - base containers ghc haskeline mtl transformers 48337 + ansi-terminal base containers ghc haskeline mtl pretty-simple 48338 + template-haskell text transformers 48335 48339 ]; 48336 48340 testHaskellDepends = [ base containers tasty tasty-hunit ]; 48337 48341 description = "Set breakpoints using a GHC plugin"; ··· 49615 49619 pname = "bugzilla-redhat"; 49616 49620 version = "1.0.0"; 49617 49621 sha256 = "1g95j03y2sg1fwdf48a05nijqllkd0m7scn1wbfyzvb57q716hlx"; 49618 - revision = "3"; 49619 - editedCabalFile = "1f5mbfskr7h14ywg3v23x3r7d0k80z4ksflvqsbzkb2z3nqikj4a"; 49622 + revision = "5"; 49623 + editedCabalFile = "13fmsnvjgg2hh5hqr5mvyykafpf770lrwiq7g67i75w6594nippn"; 49620 49624 isLibrary = true; 49621 49625 isExecutable = true; 49622 49626 libraryHaskellDepends = [ ··· 50219 50223 }: 50220 50224 mkDerivation { 50221 50225 pname = "by-other-names"; 50222 - version = "1.2.0.1"; 50223 - sha256 = "0lmk2nbj92kyi1h74v3f4k5zhf41zbnz8pari1rqxlf7a859c7k9"; 50226 + version = "1.2.1.0"; 50227 + sha256 = "1l6b47qxr8hidknl2r7gwp9civlz450z4nxyv98nfkh86bhsdnfm"; 50224 50228 libraryHaskellDepends = [ 50225 50229 aeson base indexed-traversable template-haskell text 50226 50230 ]; ··· 51793 51797 ({ mkDerivation, base, Cabal, QuickCheck }: 51794 51798 mkDerivation { 51795 51799 pname = "cabal-detailed-quickcheck"; 51796 - version = "0.1.3.2"; 51797 - sha256 = "0pxl8jf8ak9irln9vkkhb5mrbvq62c9p71gxhwzml1042gbl93x9"; 51800 + version = "0.2.0.1"; 51801 + sha256 = "0z82ira6g3mkqj9cw050s4m4nk2n5d4zx6gqlrcgszypd80h03f2"; 51798 51802 libraryHaskellDepends = [ base Cabal QuickCheck ]; 51799 51803 description = "QuickCheck for Cabal tests"; 51800 51804 license = lib.licenses.mit; ··· 53811 53815 broken = true; 53812 53816 }) {}; 53813 53817 53814 - "call-alloy_0_4" = callPackage 53818 + "call-alloy_0_4_0_1" = callPackage 53815 53819 ({ mkDerivation, async, base, bytestring, containers, directory 53816 - , extra, filepath, hspec, mtl, process, split, trifecta, unix 53820 + , extra, filepath, hspec, mtl, process, split, transformers 53821 + , trifecta, unix 53817 53822 }: 53818 53823 mkDerivation { 53819 53824 pname = "call-alloy"; 53820 - version = "0.4"; 53821 - sha256 = "1af4a6inik3dcawn4lwlk01pyx6j5a1ly07qqf0ywkz2pv4ifgdc"; 53825 + version = "0.4.0.1"; 53826 + sha256 = "0xxrin8n2kk37jip5hacyn87sxhwz4bjk6crd90yw8f1sg8n354m"; 53822 53827 enableSeparateDataOutput = true; 53823 53828 libraryHaskellDepends = [ 53824 53829 async base bytestring containers directory extra filepath mtl 53825 - process split trifecta unix 53830 + process split transformers trifecta unix 53826 53831 ]; 53827 53832 testHaskellDepends = [ 53828 53833 async base bytestring containers directory extra filepath hspec mtl 53829 - process split trifecta unix 53834 + process split transformers trifecta unix 53830 53835 ]; 53831 53836 description = "A simple library to call Alloy given a specification"; 53832 53837 license = lib.licenses.mit; ··· 56544 56549 }: 56545 56550 mkDerivation { 56546 56551 pname = "cfn-flip"; 56547 - version = "0.1.0.2"; 56548 - sha256 = "16n45ik3g33fqfqry7l8pa0gcljymvw9wkg9n3qal8570q5k82ds"; 56552 + version = "0.1.0.3"; 56553 + sha256 = "18nfqbc0iw5zvg9krrm8wyi6x34qxf7arp4jzf1l8qabds5s5371"; 56549 56554 libraryHaskellDepends = [ 56550 56555 aeson base bytestring conduit libyaml text unliftio unliftio-core 56551 56556 yaml ··· 58130 58135 }: 58131 58136 mkDerivation { 58132 58137 pname = "chronos"; 58133 - version = "1.1.4"; 58134 - sha256 = "1v7h0qlckliid2zd3ff2l9l4xrdxacaw8my8bjj8grysj4vvyn5q"; 58135 - revision = "2"; 58136 - editedCabalFile = "0ixc0ng425lgsrj95zfnm2jazk19b8py845s3b02dfz7zid9q7n5"; 58138 + version = "1.1.5"; 58139 + sha256 = "0q81i9zwhsmik3j0zlgf61y48s4zhqs4d77ad4yxwvqqm8312gqi"; 58137 58140 libraryHaskellDepends = [ 58138 58141 aeson attoparsec base bytebuild byteslice bytesmith bytestring 58139 58142 deepseq hashable natural-arithmetic primitive semigroups text ··· 61581 61584 61582 61585 "co-log" = callPackage 61583 61586 ({ mkDerivation, ansi-terminal, base, bytestring, chronos 61584 - , co-log-core, containers, contravariant, directory, filepath 61585 - , hedgehog, markdown-unlit, mtl, stm, text, transformers 61586 - , typerep-map, vector 61587 + , co-log-core, containers, contravariant, directory, doctest 61588 + , exceptions, filepath, Glob, hedgehog, markdown-unlit, mtl, text 61589 + , transformers, typerep-map, vector 61587 61590 }: 61588 61591 mkDerivation { 61589 61592 pname = "co-log"; 61590 - version = "0.4.0.1"; 61591 - sha256 = "08sqrsy55wrfc5bg5sz22hah0ix14wrxn20lka17ri17a818w9p7"; 61593 + version = "0.5.0.0"; 61594 + sha256 = "1afzqh3kncmlxjdsw6v0pwb24mlfa492jdryn8pr00pskrmcr8mg"; 61592 61595 isLibrary = true; 61593 61596 isExecutable = true; 61594 61597 libraryHaskellDepends = [ 61595 61598 ansi-terminal base bytestring chronos co-log-core containers 61596 - contravariant directory filepath mtl stm text transformers 61599 + contravariant directory exceptions filepath mtl text transformers 61597 61600 typerep-map vector 61598 61601 ]; 61599 61602 executableHaskellDepends = [ 61600 61603 base bytestring co-log-core mtl text typerep-map 61601 61604 ]; 61602 61605 executableToolDepends = [ markdown-unlit ]; 61603 - testHaskellDepends = [ base co-log-core hedgehog ]; 61606 + testHaskellDepends = [ base co-log-core doctest Glob hedgehog ]; 61604 61607 description = "Composable Contravariant Comonadic Logging Library"; 61605 61608 license = lib.licenses.mpl20; 61606 61609 }) {}; ··· 61622 61625 ({ mkDerivation, base, doctest, Glob }: 61623 61626 mkDerivation { 61624 61627 pname = "co-log-core"; 61625 - version = "0.3.1.0"; 61626 - sha256 = "1v0pccm2wmvlb21g8l47qmnl7839lj2rkf17bvrqj36xa7p0nwi9"; 61628 + version = "0.3.2.0"; 61629 + sha256 = "1r8yq4wan48mm37p32vsym44icdx4c5dyc5wkm5vz8f4l39yv59l"; 61627 61630 libraryHaskellDepends = [ base ]; 61628 61631 testHaskellDepends = [ base doctest Glob ]; 61629 61632 description = "Composable Contravariant Comonadic Logging Library"; ··· 62391 62394 }: 62392 62395 mkDerivation { 62393 62396 pname = "cointracking-imports"; 62394 - version = "0.1.0.1"; 62395 - sha256 = "19in8n8sigcbph29cgrbg1ccbxzadav1siryfjfc1g112p6mrf91"; 62396 - revision = "1"; 62397 - editedCabalFile = "1pcqkp1fvnwv5f4r88nva0dafgzfk2vixa5wh2q42991aj38a539"; 62397 + version = "0.1.0.2"; 62398 + sha256 = "1jf95fgzgqgr2xjbm5i0cwj1zx7zd44qpv3xqy91pk5kp33gwdjr"; 62398 62399 libraryHaskellDepends = [ 62399 62400 base base-compat-batteries bytestring cassava filepath lens 62400 62401 scientific text time xlsx ··· 78471 78472 }: 78472 78473 mkDerivation { 78473 78474 pname = "derive-storable-plugin"; 78474 - version = "0.2.3.5"; 78475 - sha256 = "16v61sm8vqx7wi02z68qjsvfv76g8kbag9cc8j8i0k8ixya1hddb"; 78475 + version = "0.2.3.6"; 78476 + sha256 = "1xx36h6xjpalf7xzina6yy155rhjq9iziv3gy7i3l163hcpf4l1q"; 78476 78477 libraryHaskellDepends = [ base derive-storable ghc ghci ]; 78477 78478 testHaskellDepends = [ 78478 78479 base derive-storable ghc ghci hspec QuickCheck ··· 80778 80779 }) {}; 80779 80780 80780 80781 "dice" = callPackage 80781 - ({ mkDerivation, base, parsec, random-fu, transformers }: 80782 + ({ mkDerivation, base, mtl, parsec, random, random-fu }: 80782 80783 mkDerivation { 80783 80784 pname = "dice"; 80784 - version = "0.1.0.1"; 80785 - sha256 = "1jybckq3wf3vs0d92ji6a6mlgw64afhwdr6b0w2p1d97zp2fsdn3"; 80786 - revision = "1"; 80787 - editedCabalFile = "160n5nn39in0hz60hddwds1a2z8gwk3r1llzjaj2278phig3ap7k"; 80785 + version = "0.1.1"; 80786 + sha256 = "1y4184xicjwp29cyriq3qcr066167nwfy0720dmxjbgw795jxpsb"; 80788 80787 isLibrary = true; 80789 80788 isExecutable = true; 80790 - libraryHaskellDepends = [ base parsec random-fu transformers ]; 80789 + libraryHaskellDepends = [ base mtl parsec random random-fu ]; 80790 + executableHaskellDepends = [ base mtl parsec random random-fu ]; 80791 80791 description = "Simplistic D&D style dice-rolling system"; 80792 - license = lib.licenses.publicDomain; 80792 + license = lib.licenses.unlicense; 80793 80793 mainProgram = "dice"; 80794 80794 }) {}; 80795 80795 ··· 83733 83733 }) {}; 83734 83734 83735 83735 "dns-patterns" = callPackage 83736 - ({ mkDerivation, attoparsec, base, bytestring, HUnit 83736 + ({ mkDerivation, attoparsec, base, bytestring, criterion, HUnit 83737 83737 , parser-combinators, text 83738 83738 }: 83739 83739 mkDerivation { 83740 83740 pname = "dns-patterns"; 83741 - version = "0.2.2"; 83742 - sha256 = "02baslcbwf28lybqa5m5n05fsi182hpqzsrb4wfgj8gll0hm80n6"; 83741 + version = "0.2.3"; 83742 + sha256 = "0vs3qn4pdpk13imxp8pz106ra504jwx629h62vv9z5nnjwq81d6y"; 83743 83743 libraryHaskellDepends = [ 83744 83744 attoparsec base bytestring parser-combinators text 83745 83745 ]; 83746 83746 testHaskellDepends = [ attoparsec base bytestring HUnit text ]; 83747 + benchmarkHaskellDepends = [ 83748 + attoparsec base bytestring criterion text 83749 + ]; 83747 83750 description = "DNS name parsing and pattern matching utilities"; 83748 83751 license = lib.licenses.bsd3; 83749 83752 hydraPlatforms = lib.platforms.none; ··· 90446 90449 hydraPlatforms = lib.platforms.none; 90447 90450 }) {}; 90448 90451 90452 + "emanote" = callPackage 90453 + ({ mkDerivation, aeson, aeson-extra, aeson-optics, async, base 90454 + , blaze-html, bytestring, commonmark, commonmark-extensions 90455 + , commonmark-pandoc, commonmark-simple, containers, data-default 90456 + , dependent-sum, directory, ema, filepath, filepattern, fsnotify 90457 + , hedgehog, heist-emanote, heist-extra, hspec, hspec-hedgehog 90458 + , ixset-typed, lvar, map-syntax, megaparsec, monad-logger 90459 + , monad-logger-extras, mtl, neat-interpolation, optics-core 90460 + , optics-th, optparse-applicative, pandoc, pandoc-link-context 90461 + , pandoc-types, parsec, path-tree, process-extras, profunctors 90462 + , relude, shower, some, stm, tagged, tagtree, tailwind, text, time 90463 + , tomland, unionmount, unliftio, unordered-containers, uri-encode 90464 + , url-slug, uuid, which, with-utf8, xmlhtml, yaml 90465 + }: 90466 + mkDerivation { 90467 + pname = "emanote"; 90468 + version = "0.8.0.0"; 90469 + sha256 = "0w26417vx76lzi6b84c48s462bmsy28ayn8gxi9cpgqifrmydz78"; 90470 + isLibrary = true; 90471 + isExecutable = true; 90472 + enableSeparateDataOutput = true; 90473 + libraryHaskellDepends = [ 90474 + aeson aeson-extra aeson-optics async base blaze-html bytestring 90475 + commonmark commonmark-extensions commonmark-pandoc 90476 + commonmark-simple containers data-default dependent-sum directory 90477 + ema filepath filepattern fsnotify hedgehog heist-emanote 90478 + heist-extra hspec hspec-hedgehog ixset-typed lvar map-syntax 90479 + megaparsec monad-logger monad-logger-extras mtl neat-interpolation 90480 + optics-core optics-th optparse-applicative pandoc 90481 + pandoc-link-context pandoc-types parsec path-tree process-extras 90482 + profunctors relude shower some stm tagged tagtree tailwind text 90483 + time tomland unionmount unliftio unordered-containers uri-encode 90484 + url-slug uuid which with-utf8 xmlhtml yaml 90485 + ]; 90486 + executableHaskellDepends = [ 90487 + aeson aeson-extra aeson-optics async base blaze-html bytestring 90488 + commonmark commonmark-extensions commonmark-pandoc 90489 + commonmark-simple containers data-default dependent-sum directory 90490 + ema filepath filepattern fsnotify hedgehog heist-emanote 90491 + heist-extra hspec hspec-hedgehog ixset-typed lvar map-syntax 90492 + megaparsec monad-logger monad-logger-extras mtl neat-interpolation 90493 + optics-core optics-th optparse-applicative pandoc 90494 + pandoc-link-context pandoc-types parsec path-tree process-extras 90495 + profunctors relude shower some stm tagged tagtree tailwind text 90496 + time tomland unionmount unliftio unordered-containers uri-encode 90497 + url-slug uuid which with-utf8 xmlhtml yaml 90498 + ]; 90499 + description = "Emanate a structured view of your plain-text notes"; 90500 + license = lib.licenses.agpl3Only; 90501 + badPlatforms = [ "x86_64-darwin" ]; 90502 + mainProgram = "emanote"; 90503 + maintainers = [ lib.maintainers.maralorn ]; 90504 + }) {}; 90505 + 90449 90506 "embed-config" = callPackage 90450 90507 ({ mkDerivation, aeson, base, bytestring, file-embed, hspec 90451 90508 , template-haskell, yaml ··· 92177 92234 pname = "ersatz"; 92178 92235 version = "0.4.12"; 92179 92236 sha256 = "0xdmp8yc22flb2p7bczb56k2z79kp4zs0y9x5430029whhz90bar"; 92237 + isLibrary = true; 92238 + isExecutable = true; 92239 + enableSeparateDataOutput = true; 92240 + libraryHaskellDepends = [ 92241 + array attoparsec base bytestring containers data-default lens mtl 92242 + process semigroups streams temporary transformers 92243 + unordered-containers 92244 + ]; 92245 + executableHaskellDepends = [ 92246 + array base containers fail lens mtl parsec semigroups 92247 + ]; 92248 + testHaskellDepends = [ array base ]; 92249 + description = "A monad for expressing SAT or QSAT problems using observable sharing"; 92250 + license = lib.licenses.bsd3; 92251 + hydraPlatforms = lib.platforms.none; 92252 + broken = true; 92253 + }) {}; 92254 + 92255 + "ersatz_0_4_13" = callPackage 92256 + ({ mkDerivation, array, attoparsec, base, bytestring, containers 92257 + , data-default, fail, lens, mtl, parsec, process, semigroups 92258 + , streams, temporary, transformers, unordered-containers 92259 + }: 92260 + mkDerivation { 92261 + pname = "ersatz"; 92262 + version = "0.4.13"; 92263 + sha256 = "0ph2ayw4vb4rrgfmm8dhwr18172igx2sczjhv2vf3b6vd5r0z1hy"; 92180 92264 isLibrary = true; 92181 92265 isExecutable = true; 92182 92266 enableSeparateDataOutput = true; ··· 96454 96538 }) {}; 96455 96539 96456 96540 "fastmemo" = callPackage 96457 - ({ mkDerivation, base, bytestring, QuickCheck, utf8-string, vector 96458 - }: 96459 - mkDerivation { 96460 - pname = "fastmemo"; 96461 - version = "0.1.0.1"; 96462 - sha256 = "1zb8nav58svds0c88rkrwdw5cjj2a8qlgx5rypqjrdv6w85s13vi"; 96463 - libraryHaskellDepends = [ base bytestring utf8-string vector ]; 96464 - testHaskellDepends = [ 96465 - base bytestring QuickCheck utf8-string vector 96466 - ]; 96467 - description = "Memoize functions on Generic types"; 96468 - license = lib.licenses.bsd3; 96469 - }) {}; 96470 - 96471 - "fastmemo_0_1_1" = callPackage 96472 96541 ({ mkDerivation, base, bytestring, containers, QuickCheck 96473 96542 , utf8-string, vector 96474 96543 }: ··· 96484 96553 ]; 96485 96554 description = "Memoize functions on Generic types"; 96486 96555 license = lib.licenses.bsd3; 96487 - hydraPlatforms = lib.platforms.none; 96488 96556 }) {}; 96489 96557 96490 96558 "fastparser" = callPackage ··· 105354 105422 }: 105355 105423 mkDerivation { 105356 105424 pname = "futhark"; 105357 - version = "0.22.2"; 105358 - sha256 = "027w745vs121jsah29kqgw288s40ag25jszbf0sb2dh1xb30lvpw"; 105425 + version = "0.22.3"; 105426 + sha256 = "1si1hlax2vzaqcdprvgg8bcmk1xkwny5rb30fc3n8h0i0fpdmbic"; 105359 105427 isLibrary = true; 105360 105428 isExecutable = true; 105361 105429 libraryHaskellDepends = [ ··· 107418 107486 pname = "generic-monoid"; 107419 107487 version = "0.1.0.1"; 107420 107488 sha256 = "1pradfv1i2z73f3vxx78ahmfsdszcgi44kn29aww2hdgf2np5l6g"; 107421 - revision = "1"; 107422 - editedCabalFile = "17dfarnbv6si8rgajb3jqsbc4k1nxmvga2h1lhmpnq43n2fdkqkq"; 107489 + revision = "2"; 107490 + editedCabalFile = "0p3hk9c6qn5kbgi3a4my3rq5cc43wcl93hx6axgzi5wkvimpv653"; 107423 107491 libraryHaskellDepends = [ base ]; 107424 107492 description = "Derive monoid instances for product types"; 107425 107493 license = lib.licenses.bsd3; ··· 109073 109141 }: 109074 109142 mkDerivation { 109075 109143 pname = "gerrit"; 109076 - version = "0.1.5.1"; 109077 - sha256 = "1bj34cp9myz4rrbbwbh73b8wbmrgck81nsx88mi984pww1nd5fnb"; 109144 + version = "0.1.6.0"; 109145 + sha256 = "1fxbvi8a6vnry170ahphkpij5slfdwpd6hkypp069y5h1sh3k2kp"; 109078 109146 libraryHaskellDepends = [ 109079 109147 aeson aeson-casing base bytestring containers http-client 109080 109148 http-client-openssl text time ··· 109729 109797 mainProgram = "ghc-events"; 109730 109798 }) {}; 109731 109799 109800 + "ghc-events_0_18_0" = callPackage 109801 + ({ mkDerivation, array, base, binary, bytestring, containers, text 109802 + , vector 109803 + }: 109804 + mkDerivation { 109805 + pname = "ghc-events"; 109806 + version = "0.18.0"; 109807 + sha256 = "0kwml9dgbj0px4bc3d9kqmw2ijc3y7irs4n02nzm7ilgcvy7hv6h"; 109808 + isLibrary = true; 109809 + isExecutable = true; 109810 + libraryHaskellDepends = [ 109811 + array base binary bytestring containers text vector 109812 + ]; 109813 + executableHaskellDepends = [ base bytestring containers ]; 109814 + testHaskellDepends = [ base ]; 109815 + description = "Library and tool for parsing .eventlog files from GHC"; 109816 + license = lib.licenses.bsd3; 109817 + hydraPlatforms = lib.platforms.none; 109818 + mainProgram = "ghc-events"; 109819 + }) {}; 109820 + 109732 109821 "ghc-events-analyze" = callPackage 109733 109822 ({ mkDerivation, base, blaze-svg, bytestring, containers 109734 109823 , diagrams-lib, diagrams-svg, filepath, ghc-events, hashable, lens ··· 109844 109933 testHaskellDepends = [ base clock ]; 109845 109934 description = "GHC garbage collection hook"; 109846 109935 license = lib.licenses.bsd3; 109936 + badPlatforms = lib.platforms.darwin; 109847 109937 }) {}; 109848 109938 109849 109939 "ghc-gc-tune" = callPackage ··· 113435 113525 }: 113436 113526 mkDerivation { 113437 113527 pname = "git-annex"; 113438 - version = "10.20221003"; 113439 - sha256 = "0nyhmwkzd8gyd9mvlnjyalfix32x5y4g89d5g36jp3jp1bkwg9i4"; 113528 + version = "10.20221103"; 113529 + sha256 = "0fwg74ldw2paq9dr052hqjz2x219zkkramvm8jskpnnnch9c6jgm"; 113440 113530 configureFlags = [ 113441 113531 "-fassistant" "-f-benchmark" "-fdbus" "-f-debuglocks" "-fmagicmime" 113442 113532 "-fnetworkbsd" "-fpairing" "-fproduction" "-fs3" "-ftorrentparser" ··· 113954 114044 }: 113955 114045 mkDerivation { 113956 114046 pname = "githash"; 113957 - version = "0.1.6.2"; 113958 - sha256 = "1vkwc7j71vdrxy01vlm6xfp16kam7m9bnj9y3h217fzhq5mjywhz"; 113959 - libraryHaskellDepends = [ 113960 - base bytestring directory filepath process template-haskell 113961 - th-compat 113962 - ]; 113963 - testHaskellDepends = [ 113964 - base bytestring directory filepath hspec process template-haskell 113965 - temporary th-compat unliftio 113966 - ]; 113967 - description = "Compile git revision info into Haskell projects"; 113968 - license = lib.licenses.bsd3; 113969 - }) {}; 113970 - 113971 - "githash_0_1_6_3" = callPackage 113972 - ({ mkDerivation, base, bytestring, directory, filepath, hspec 113973 - , process, template-haskell, temporary, th-compat, unliftio 113974 - }: 113975 - mkDerivation { 113976 - pname = "githash"; 113977 114047 version = "0.1.6.3"; 113978 114048 sha256 = "06zg1rif1rcxni1vacmr2bh1nbm6i62rjbikfr4xsyzq1sv7kfpw"; 113979 114049 libraryHaskellDepends = [ ··· 113986 114056 ]; 113987 114057 description = "Compile git revision info into Haskell projects"; 113988 114058 license = lib.licenses.bsd3; 113989 - hydraPlatforms = lib.platforms.none; 113990 114059 }) {}; 113991 114060 113992 114061 "github" = callPackage ··· 118855 118924 }: 118856 118925 mkDerivation { 118857 118926 pname = "gopro-plus"; 118858 - version = "0.6.5.2"; 118859 - sha256 = "0wxgwgsybc9vp4v4vx6064zh27kc3gn6rfclgpfavgvk3l9y5mrq"; 118927 + version = "0.6.6.0"; 118928 + sha256 = "1pc89l3kirw7d8bzzbsivnf2mcfd15bk3kl1x2f7i0fdgk06apzy"; 118860 118929 libraryHaskellDepends = [ 118861 118930 aeson base bytestring containers exceptions filepath 118862 118931 generic-deriving generic-random lens lens-aeson monad-logger mtl ··· 120296 120365 }: 120297 120366 mkDerivation { 120298 120367 pname = "graphula"; 120299 - version = "2.0.2.1"; 120300 - sha256 = "0kkjhfb9x3s0j6m0a68cblfkh70wg2vxrd1f998g20dlpx5rl27m"; 120301 - libraryHaskellDepends = [ 120302 - base containers directory generics-eot HUnit mtl persistent 120303 - QuickCheck random semigroups temporary text unliftio unliftio-core 120304 - ]; 120305 - testHaskellDepends = [ 120306 - base generic-arbitrary hspec markdown-unlit monad-logger persistent 120307 - persistent-sqlite QuickCheck resourcet transformers unliftio-core 120308 - ]; 120309 - testToolDepends = [ markdown-unlit ]; 120310 - description = "A simple interface for generating persistent data and linking its dependencies"; 120311 - license = lib.licenses.mit; 120312 - }) {}; 120313 - 120314 - "graphula_2_0_2_2" = callPackage 120315 - ({ mkDerivation, base, containers, directory, generic-arbitrary 120316 - , generics-eot, hspec, HUnit, markdown-unlit, monad-logger, mtl 120317 - , persistent, persistent-sqlite, QuickCheck, random, resourcet 120318 - , semigroups, temporary, text, transformers, unliftio 120319 - , unliftio-core 120320 - }: 120321 - mkDerivation { 120322 - pname = "graphula"; 120323 120368 version = "2.0.2.2"; 120324 120369 sha256 = "066lcn262x4l826sglybrz4mp58ishcj0h1r5h41aiy09mcf4g3v"; 120325 120370 libraryHaskellDepends = [ ··· 120333 120378 testToolDepends = [ markdown-unlit ]; 120334 120379 description = "A simple interface for generating persistent data and linking its dependencies"; 120335 120380 license = lib.licenses.mit; 120336 - hydraPlatforms = lib.platforms.none; 120337 120381 }) {}; 120338 120382 120339 120383 "graphula-core" = callPackage ··· 122298 122342 }) {}; 122299 122343 122300 122344 "h-raylib" = callPackage 122301 - ({ mkDerivation, base, c, libGL, libX11 }: 122345 + ({ mkDerivation, base, c, libGL, libX11, libXcursor, libXi 122346 + , libXinerama, libXrandr 122347 + }: 122302 122348 mkDerivation { 122303 122349 pname = "h-raylib"; 122304 - version = "4.5.0.1"; 122305 - sha256 = "1bb0g8gn08pp2s763d0ic7hj46whpb6xdq0hvpar26srxlkxnzjl"; 122350 + version = "4.5.0.2"; 122351 + sha256 = "0yxjr2y12fj2mhis8gy3wz0115nbiznx6llxapbylcw4zx9vnb8i"; 122306 122352 libraryHaskellDepends = [ base ]; 122307 - librarySystemDepends = [ c libGL libX11 ]; 122353 + librarySystemDepends = [ 122354 + c libGL libX11 libXcursor libXi libXinerama libXrandr 122355 + ]; 122308 122356 description = "Raylib bindings for Haskell"; 122309 122357 license = lib.licenses.asl20; 122310 122358 hydraPlatforms = lib.platforms.none; 122311 122359 broken = true; 122312 - }) {c = null; inherit (pkgs) libGL; inherit (pkgs.xorg) libX11;}; 122360 + }) {c = null; inherit (pkgs) libGL; inherit (pkgs.xorg) libX11; 122361 + inherit (pkgs.xorg) libXcursor; inherit (pkgs.xorg) libXi; 122362 + inherit (pkgs.xorg) libXinerama; inherit (pkgs.xorg) libXrandr;}; 122313 122363 122314 122364 "h-reversi" = callPackage 122315 122365 ({ mkDerivation, base, blank-canvas, containers, hspec, QuickCheck ··· 124672 124722 pname = "hakyll"; 124673 124723 version = "4.15.1.1"; 124674 124724 sha256 = "0b3bw275q1xbx8qs9a6gzzs3c9z3qdj7skqhpp09jkchi5kdvhvi"; 124675 - revision = "7"; 124676 - editedCabalFile = "0xgcrv98yxf7hjwq2ivg1lcipr3q5f5civp5r6kaq7ygnhggy2w9"; 124725 + revision = "8"; 124726 + editedCabalFile = "0mrgi1xjmvbjqasrchmjylp4gc63gw879flwl6r1v3nf9nv7ziwf"; 124677 124727 isLibrary = true; 124678 124728 isExecutable = true; 124679 124729 enableSeparateDataOutput = true; ··· 128766 128816 "hspec-leancheck" = callPackage 128767 128817 "hspec-leancheck" = callPackage 128768 128818 license = lib.licenses.lgpl21Only; 128769 - "hspec-leancheck" = callPackage 128770 - 128771 - "hspec-leancheck" = callPackage 128772 - "hspec-leancheck" = callPackage 128773 - "hspec-leancheck" = callPackage 128774 - "hspec-leancheck" = callPackage 128775 - "hspec-leancheck" = callPackage 128776 - }: 128777 - mkDerivation { 128778 - "hspec-leancheck" = callPackage 128779 - "hspec-leancheck" = callPackage 128780 - "hspec-leancheck" = callPackage 128781 - setupHaskellDepends = [ base Cabal cabal-doctest ]; 128782 - libraryHaskellDepends = [ 128783 - "hspec-leancheck" = callPackage 128784 - "hspec-leancheck" = callPackage 128785 - "hspec-leancheck" = callPackage 128786 - ]; 128787 - "hspec-leancheck" = callPackage 128788 - "hspec-leancheck" = callPackage 128789 - "hspec-leancheck" = callPackage 128790 - license = lib.licenses.lgpl21Only; 128791 - hydraPlatforms = lib.platforms.none; 128792 128819 "hspec-leancheck" = callPackage 128793 128820 128794 128821 "hspec-leancheck" = callPackage ··· 128801 128828 libraryPkgconfigDepends = [ glib ]; 128802 128829 "hspec-leancheck" = callPackage 128803 128830 license = lib.licenses.lgpl21Only; 128804 - }) {inherit (pkgs) glib;}; 128805 - 128806 - "hspec-leancheck" = callPackage 128807 - "hspec-leancheck" = callPackage 128808 - mkDerivation { 128809 - "hspec-leancheck" = callPackage 128810 - "hspec-leancheck" = callPackage 128811 - "hspec-leancheck" = callPackage 128812 - libraryHaskellDepends = [ base bytestring containers text ]; 128813 - libraryPkgconfigDepends = [ glib ]; 128814 - "hspec-leancheck" = callPackage 128815 - license = lib.licenses.lgpl21Only; 128816 - hydraPlatforms = lib.platforms.none; 128817 128831 }) {inherit (pkgs) glib;}; 128818 128832 128819 128833 "hspec-leancheck" = callPackage ··· 135811 135825 ]; 135812 135826 description = "An Haskell template system supporting both HTML5 and XML"; 135813 135827 license = lib.licenses.bsd3; 135814 - hydraPlatforms = lib.platforms.none; 135815 - broken = true; 135816 135828 }) {}; 135817 135829 135818 135830 "heist-extra" = callPackage ··· 135829 135841 ]; 135830 135842 description = "Extra heist functionality"; 135831 135843 license = lib.licenses.mit; 135832 - hydraPlatforms = lib.platforms.none; 135833 135844 }) {}; 135834 135845 135835 135846 "helf" = callPackage ··· 143780 143791 }: 143781 143792 mkDerivation { 143782 143793 pname = "honeycomb"; 143783 - version = "0.0.0.3"; 143784 - sha256 = "0y1z9lcf7b1dzvp20flcq75jmh2jxx2dmynfw00dwsy6s2jabhx0"; 143794 + version = "0.1.0.0"; 143795 + sha256 = "04fv5zy7vyridxa8qkrawjp8sjhdzd57cyxm2gi4r7gv1q4pwlmc"; 143785 143796 libraryHaskellDepends = [ 143786 143797 aeson async auto-update base bytestring chronos http-client 143787 143798 http-client-tls http-conduit http-types microlens mmorph ··· 146810 146821 }: 146811 146822 mkDerivation { 146812 146823 pname = "hs-opentelemetry-exporter-otlp"; 146813 - version = "0.0.1.3"; 146814 - sha256 = "0ci1c6820cq2xml5fdj04a49r78ymw0s7pdlyhkg7a0ccrxi3722"; 146824 + version = "0.0.1.4"; 146825 + sha256 = "08xjpv451mfx4gfahp6w8m49da9mzvcj59g9fq6p0k85fl9ybva2"; 146815 146826 libraryHaskellDepends = [ 146816 146827 base bytestring case-insensitive clock hs-opentelemetry-api 146817 146828 hs-opentelemetry-otlp http-client http-conduit http-types microlens ··· 147019 147030 }: 147020 147031 mkDerivation { 147021 147032 pname = "hs-opentelemetry-sdk"; 147022 - "hspec-leancheck" = callPackage 147023 - sha256 = "1721786554sb0jwa8mmkcrlwci1i49mgwpaxa8xaiilw6nddmc8a"; 147033 + version = "0.0.3.4"; 147034 + sha256 = "1niyachyzj1742y8p89p2n088vs6pwplh1swjwcnri7545ldch70"; 147024 147035 libraryHaskellDepends = [ 147025 147036 async base bytestring hs-opentelemetry-api 147026 147037 hs-opentelemetry-exporter-otlp hs-opentelemetry-propagator-w3c ··· 154914 154925 }: 154915 154926 mkDerivation { 154916 154927 pname = "hurl"; 154917 - version = "2.2.0.0"; 154918 - sha256 = "1dpmy6j8alg55x5s6rapc3cbmf2v23dwbx1hv3k6jsxz2zp3w7gp"; 154928 + version = "2.3.0.0"; 154929 + sha256 = "1kmgakji3mp3d1i1jm6w5yh412ajd42klikcz0q8f4q75zprmb6i"; 154919 154930 isLibrary = true; 154920 154931 isExecutable = true; 154921 154932 libraryHaskellDepends = [ ··· 156042 156053 }: 156043 156054 mkDerivation { 156044 156055 pname = "hw-prim"; 156045 - version = "0.6.3.1"; 156046 - sha256 = "1b3qk0w8jivbhpkxkp4b1spj1nvfjjf2k6a0ba9agjp9kjmwddni"; 156047 - revision = "3"; 156048 - editedCabalFile = "0ik3y030s6izrgvsvk7llgy8z5wkvgapii1zcrdsw25m1cqjpaz1"; 156056 + version = "0.6.3.2"; 156057 + sha256 = "07a442g1fjzrfnz3y9mx3d2hv0ffjnbfdkmbiard8bn78vf5z80z"; 156049 156058 libraryHaskellDepends = [ 156050 156059 base bytestring deepseq ghc-prim mmap transformers unliftio-core 156051 156060 vector ··· 159455 159464 ]; 159456 159465 description = "Execute arbitrary actions for each item from RSS/Atom feeds"; 159457 159466 license = lib.licenses.cc0; 159467 + hydraPlatforms = lib.platforms.none; 159468 + broken = true; 159458 159469 }) {}; 159459 159470 159460 159471 "immortal_0_2_2_1" = callPackage ··· 167956 167967 }: 167957 167968 mkDerivation { 167958 167969 pname = "juicy-gcode"; 167959 - version = "0.2.0.1"; 167960 - sha256 = "1jpdxxfg3wdj9kz41a1pklyshrxxakf2bahcc7y1l7p7jklb3lbi"; 167970 + version = "0.2.0.2"; 167971 + sha256 = "1kr59d21825mrfr9370f4z717gf45rcdp8jw7xw3d4mp7ba6r66b"; 167961 167972 isLibrary = false; 167962 167973 isExecutable = true; 167963 167974 executableHaskellDepends = [ ··· 170997 171008 broken = true; 170998 171009 }) {}; 170999 171010 171011 + "krank_0_3_0" = callPackage 171012 + ({ mkDerivation, aeson, base, bytestring, containers, hspec 171013 + , hspec-expectations, http-client, http-types, lifted-async, mtl 171014 + , optparse-applicative, pcre-heavy, pretty-terminal, process, PyF 171015 + , req, safe-exceptions, text, unordered-containers 171016 + }: 171017 + mkDerivation { 171018 + pname = "krank"; 171019 + version = "0.3.0"; 171020 + sha256 = "01ncfknvm4mndzam3q9m15p51cz8cwjds12zc74rl1p49rdp5pis"; 171021 + isLibrary = true; 171022 + isExecutable = true; 171023 + libraryHaskellDepends = [ 171024 + aeson base bytestring containers http-client http-types 171025 + lifted-async mtl pcre-heavy pretty-terminal PyF req safe-exceptions 171026 + text unordered-containers 171027 + ]; 171028 + executableHaskellDepends = [ 171029 + base containers mtl optparse-applicative pcre-heavy pretty-terminal 171030 + process PyF text 171031 + ]; 171032 + testHaskellDepends = [ 171033 + aeson base bytestring containers hspec hspec-expectations 171034 + http-client http-types lifted-async mtl pcre-heavy pretty-terminal 171035 + PyF req safe-exceptions text unordered-containers 171036 + ]; 171037 + description = "Krank checks issue tracker link status in your source code"; 171038 + license = lib.licenses.bsd3; 171039 + hydraPlatforms = lib.platforms.none; 171040 + mainProgram = "krank"; 171041 + broken = true; 171042 + }) {}; 171043 + 171000 171044 "krapsh" = callPackage 171001 171045 ({ mkDerivation, aeson, aeson-pretty, base, base16-bytestring 171002 171046 , binary, bytestring, containers, cryptohash-sha256, deepseq ··· 173819 173863 }) {}; 173820 173864 173821 173865 "language-sygus" = callPackage 173822 - ({ mkDerivation, array, base, deepseq, hashable, tasty, tasty-hunit 173823 - , text 173866 + ({ mkDerivation, alex, array, base, deepseq, happy, hashable, tasty 173867 + , tasty-hunit, text 173824 173868 }: 173825 173869 mkDerivation { 173826 173870 pname = "language-sygus"; 173827 - version = "0.1.1.2"; 173828 - sha256 = "1vgd45bd866mm2w80hg8q11iz8g9ifz5ccm0sh13xrnpvfvdv862"; 173829 - revision = "3"; 173830 - editedCabalFile = "0rnvxvyiw765vmnbmix4g5v3wqp9ba3xd8llm1ajdm01rvhk4324"; 173871 + version = "0.1.1.3"; 173872 + sha256 = "15xxagcsqjchng2nr1qg6ncqch5l74m62iv58pgkcqhzqqhf3fwg"; 173831 173873 libraryHaskellDepends = [ array base hashable text ]; 173874 + libraryToolDepends = [ alex happy ]; 173832 173875 testHaskellDepends = [ base deepseq tasty tasty-hunit text ]; 173833 173876 description = "A parser and printer for the SyGuS 2.0 language."; 173834 173877 license = lib.licenses.bsd3; ··· 185954 185997 ({ mkDerivation, base, tidal }: 185955 185998 mkDerivation { 185956 185999 pname = "maquinitas-tidal"; 185957 - version = "0.2.5"; 185958 - sha256 = "1jqa471r7r3my32lrjcrfc35259kj7afp1jgj8jr3r62dd8ckq63"; 186000 + version = "0.2.10"; 186001 + sha256 = "1p1n21hzmkk7czwnmyl4hm36jvn0m05wid3zdwiqhbxq3mw46sxa"; 185959 186002 libraryHaskellDepends = [ base tidal ]; 185960 186003 description = "library for MIDI control of hardware"; 185961 186004 license = lib.licenses.mit; ··· 192285 192328 }: 192286 192329 mkDerivation { 192287 192330 pname = "modern-uri"; 192288 - version = "0.3.5.0"; 192289 - sha256 = "09pxr1im78fg8024my34qhcj25w3hjq585l3k5qxl81dcypkjhdb"; 192331 + version = "0.3.6.0"; 192332 + sha256 = "1lj3il9wg7v88l1hj08k07g3f76xas0gz20l2wy8z6xbpcn5ng6g"; 192290 192333 libraryHaskellDepends = [ 192291 192334 base bytestring containers contravariant deepseq exceptions 192292 192335 hashable megaparsec mtl profunctors QuickCheck reflection tagged ··· 194388 194431 }: 194389 194432 mkDerivation { 194390 194433 pname = "mongoDB"; 194391 - version = "2.7.1.1"; 194392 - sha256 = "186ck64vk4s9jligj6mq3qbpm1mb87m7zs8p3jbizpv0fcgnwq70"; 194393 - libraryHaskellDepends = [ 194394 - array base base16-bytestring base64-bytestring binary bson 194395 - bytestring conduit conduit-extra containers cryptohash 194396 - data-default-class dns fail hashtables http-types lifted-base 194397 - monad-control mtl network nonce parsec pureMD5 random 194398 - random-shuffle resourcet stm tagged text time tls transformers 194399 - transformers-base 194400 - ]; 194401 - testHaskellDepends = [ base hspec mtl old-locale text time ]; 194402 - benchmarkHaskellDepends = [ 194403 - array base base16-bytestring base64-bytestring binary bson 194404 - bytestring containers criterion cryptohash data-default-class dns 194405 - fail hashtables http-types lifted-base monad-control mtl network 194406 - nonce parsec random random-shuffle stm text tls transformers-base 194407 - ]; 194408 - description = "Driver (client) for MongoDB, a free, scalable, fast, document DBMS"; 194409 - license = lib.licenses.asl20; 194410 - }) {}; 194411 - 194412 - "mongoDB_2_7_1_2" = callPackage 194413 - ({ mkDerivation, array, base, base16-bytestring, base64-bytestring 194414 - , binary, bson, bytestring, conduit, conduit-extra, containers 194415 - , criterion, cryptohash, data-default-class, dns, fail, hashtables 194416 - , hspec, http-types, lifted-base, monad-control, mtl, network 194417 - , nonce, old-locale, parsec, pureMD5, random, random-shuffle 194418 - , resourcet, stm, tagged, text, time, tls, transformers 194419 - , transformers-base 194420 - }: 194421 - mkDerivation { 194422 - pname = "mongoDB"; 194423 194434 version = "2.7.1.2"; 194424 194435 sha256 = "0csjhvsvy534lq7lvqx96dw6ia3737rg7q96174067k7mhkxwf9m"; 194425 194436 libraryHaskellDepends = [ ··· 194439 194450 ]; 194440 194451 description = "Driver (client) for MongoDB, a free, scalable, fast, document DBMS"; 194441 194452 license = lib.licenses.asl20; 194442 - hydraPlatforms = lib.platforms.none; 194443 194453 }) {}; 194444 194454 194445 194455 "mongodb-queue" = callPackage ··· 195438 195448 }: 195439 195449 mkDerivation { 195440 195450 pname = "morpheus-graphql"; 195441 - version = "0.24.3"; 195442 - sha256 = "0z1kxwkflwzn6xqv8a046biv16a4fq8sxma7n4hbby7zqmzbwpj5"; 195451 + version = "0.25.0"; 195452 + sha256 = "08vi8g73c55ky6qrgkq57h1zbpkavv0ajfd16i86s6zdaxpk3fhm"; 195443 195453 enableSeparateDataOutput = true; 195444 195454 libraryHaskellDepends = [ 195445 195455 aeson base bytestring containers morpheus-graphql-app ··· 195468 195478 }: 195469 195479 mkDerivation { 195470 195480 pname = "morpheus-graphql-app"; 195471 - version = "0.24.3"; 195472 - sha256 = "1hm4v3x6p718zjgk4svfslvqm6nca5kg30rhh2ax63gkfvp1i2xr"; 195481 + version = "0.25.0"; 195482 + sha256 = "09skrg2pasx3hdm13sq9ajka5yh5wsc1wc8rphc9g6pa7hpnnsxh"; 195473 195483 enableSeparateDataOutput = true; 195474 195484 libraryHaskellDepends = [ 195475 195485 aeson base bytestring containers hashable megaparsec ··· 195519 195529 }: 195520 195530 mkDerivation { 195521 195531 pname = "morpheus-graphql-client"; 195522 - version = "0.24.3"; 195523 - sha256 = "1xfwah79w0akg0fhz7xkhwmik5bfz4c9kwbscxf08w99669k1lwd"; 195532 + version = "0.25.0"; 195533 + sha256 = "01brdkc2vqipif5942hrzli45agb7rk8wlhx2m1j9zhcxhsbhlwf"; 195524 195534 enableSeparateDataOutput = true; 195525 195535 libraryHaskellDepends = [ 195526 195536 aeson base bytestring containers file-embed modern-uri ··· 195550 195560 }: 195551 195561 mkDerivation { 195552 195562 pname = "morpheus-graphql-code-gen"; 195553 - version = "0.24.3"; 195554 - sha256 = "040grsj1q9b2jy5y7pxy2islfaa6jd0winkg2dvzg1dwwh74rayc"; 195563 + version = "0.25.0"; 195564 + sha256 = "0hisqds2fn7m53hddvxw4glgwghqnx3qg0hhdc6c4zjafyfkbckf"; 195555 195565 isLibrary = true; 195556 195566 isExecutable = true; 195557 195567 libraryHaskellDepends = [ ··· 195580 195590 }: 195581 195591 mkDerivation { 195582 195592 pname = "morpheus-graphql-code-gen-utils"; 195583 - version = "0.24.3"; 195584 - sha256 = "1ss36qkf47zgwwivi70bjq5l5mkqin5181yc7dxg865sgdm9jc5z"; 195593 + version = "0.25.0"; 195594 + sha256 = "1xnszpmzw0jl9dshzqs5vr9kjnm9sbi0jbgpjb44s9bd4hdgyxq5"; 195585 195595 libraryHaskellDepends = [ 195586 195596 base bytestring containers morpheus-graphql-core prettyprinter 195587 195597 relude template-haskell text unordered-containers ··· 195599 195609 }: 195600 195610 mkDerivation { 195601 195611 pname = "morpheus-graphql-core"; 195602 - version = "0.24.3"; 195603 - sha256 = "0nh7nvdgqj95g1fafisjg9dxfk2hd9x0mb7da6lwcrsyb005iald"; 195612 + version = "0.25.0"; 195613 + sha256 = "07ay9vzhlxgsv9lw3b22c59r00b6f0w2c90qn14a349lkjhl1wfa"; 195604 195614 enableSeparateDataOutput = true; 195605 195615 libraryHaskellDepends = [ 195606 195616 aeson base bytestring containers hashable megaparsec mtl relude ··· 195628 195638 }: 195629 195639 mkDerivation { 195630 195640 pname = "morpheus-graphql-server"; 195631 - version = "0.24.3"; 195632 - sha256 = "1xiy43pxmgh5kh2c1vk6g7ay0kinh7rx5xb1lrjw5wkl9sw2l7dg"; 195641 + version = "0.25.0"; 195642 + sha256 = "02lhrvz00l2486n7nihs8ka92hxa3idzlzx10fn142kqli65bwwi"; 195633 195643 enableSeparateDataOutput = true; 195634 195644 libraryHaskellDepends = [ 195635 195645 aeson base bytestring containers morpheus-graphql-app ··· 195654 195664 }: 195655 195665 mkDerivation { 195656 195666 pname = "morpheus-graphql-subscriptions"; 195657 - version = "0.24.3"; 195658 - sha256 = "1cky0br7nkpnjgk0j0qxfz4gd7z14badhpll51yakysxz8y5clsf"; 195667 + version = "0.25.0"; 195668 + sha256 = "063gszwrjlszqg973axyig9alrix0fj7j4n2c01wdaxyjmxmzdjx"; 195659 195669 libraryHaskellDepends = [ 195660 195670 aeson base bytestring morpheus-graphql-app morpheus-graphql-core 195661 195671 mtl relude text transformers unliftio-core unordered-containers ··· 195682 195692 license = lib.licenses.mit; 195683 195693 }) {}; 195684 195694 195685 - "morpheus-graphql-tests_0_24_3" = callPackage 195695 + "morpheus-graphql-tests_0_25_0" = callPackage 195686 195696 ({ mkDerivation, aeson, base, bytestring, directory, relude, tasty 195687 195697 , tasty-hunit, text, unordered-containers 195688 195698 }: 195689 195699 mkDerivation { 195690 195700 pname = "morpheus-graphql-tests"; 195691 - version = "0.24.3"; 195692 - sha256 = "0kgzwjg0jr44rfa2pz9k80pvj22spj2qmp6l31fyy54bi89z98vh"; 195701 + version = "0.25.0"; 195702 + sha256 = "1gnysygk4rvcyv85f86yhcxl0rlq5hk5avanyv428fdirsjkkn5q"; 195693 195703 libraryHaskellDepends = [ 195694 195704 aeson base bytestring directory relude tasty tasty-hunit text 195695 195705 unordered-containers ··· 196929 196939 broken = true; 196930 196940 }) {}; 196931 196941 196932 - "mtl_2_2_2" = callPackage 196942 + "mtl_2_3_1" = callPackage 196933 196943 ({ mkDerivation, base, transformers }: 196934 196944 mkDerivation { 196935 196945 pname = "mtl"; 196936 - "hspec-leancheck" = callPackage 196937 - sha256 = "1xmy5741h8cyy0d91ahvqdz2hykkk20l8br7lg1rccnkis5g80w8"; 196946 + version = "2.3.1"; 196947 + sha256 = "19ywdksxkv4gfbf05xgpjbnnxd81mgxjnyl2h2vlqapyc35z2y11"; 196938 196948 libraryHaskellDepends = [ base transformers ]; 196939 - description = "Monad classes, using functional dependencies"; 196949 + description = "Monad classes for transformers, using functional dependencies"; 196940 196950 license = lib.licenses.bsd3; 196941 196951 hydraPlatforms = lib.platforms.none; 196942 196952 }) {}; ··· 199455 199465 ]; 199456 199466 description = "A mid-level MySQL client library"; 199457 199467 license = lib.licenses.bsd3; 199468 + }) {}; 199469 + 199470 + "mysql-simple_0_4_9" = callPackage 199471 + ({ mkDerivation, attoparsec, base, base16-bytestring, blaze-builder 199472 + , bytestring, containers, hspec, mysql, old-locale, pcre-light 199473 + , text, time, vector 199474 + }: 199475 + mkDerivation { 199476 + pname = "mysql-simple"; 199477 + version = "0.4.9"; 199478 + sha256 = "0hwv1hlr65m5l2zrrj5zmvrjz9y2814jy05l17l5jb4j4j5xw3z2"; 199479 + libraryHaskellDepends = [ 199480 + attoparsec base base16-bytestring blaze-builder bytestring 199481 + containers mysql old-locale pcre-light text time vector 199482 + ]; 199483 + testHaskellDepends = [ 199484 + base blaze-builder bytestring hspec mysql text time 199485 + ]; 199486 + description = "A mid-level MySQL client library"; 199487 + license = lib.licenses.bsd3; 199488 + hydraPlatforms = lib.platforms.none; 199458 199489 }) {}; 199459 199490 199460 199491 "mysql-simple-quasi" = callPackage ··· 210724 210755 license = lib.licenses.bsd3; 210725 210756 }) {}; 210726 210757 210758 + "ordered-containers_0_2_3" = callPackage 210759 + ({ mkDerivation, base, containers }: 210760 + mkDerivation { 210761 + pname = "ordered-containers"; 210762 + version = "0.2.3"; 210763 + sha256 = "18w1dasny6xffbjlvmz9861l2xbkqlg2w5qxz9kw6frgfl2rg11n"; 210764 + libraryHaskellDepends = [ base containers ]; 210765 + description = "Set- and Map-like types that remember the order elements were inserted"; 210766 + license = lib.licenses.bsd3; 210767 + hydraPlatforms = lib.platforms.none; 210768 + }) {}; 210769 + 210727 210770 "ordering-util" = callPackage 210728 210771 ({ mkDerivation, base }: 210729 210772 mkDerivation { ··· 212897 212940 mainProgram = "pandoc-plot"; 212898 212941 }) {}; 212899 212942 212900 - "pandoc-plot_1_5_4" = callPackage 212943 + "pandoc-plot_1_5_5" = callPackage 212901 212944 ({ mkDerivation, aeson, base, bytestring, containers, criterion 212902 212945 , data-default, directory, filepath, gitrev, hashable 212903 212946 , hspec-expectations, lifted-async, lifted-base, mtl ··· 212907 212950 }: 212908 212951 mkDerivation { 212909 212952 pname = "pandoc-plot"; 212910 - version = "1.5.4"; 212911 - sha256 = "1bmnzl5aqqhfrl7gk0083xkrckl11yhmvf2lf1w1jg4hcfknj6a8"; 212953 + version = "1.5.5"; 212954 + sha256 = "1gcs6sh8fhlmaiha5wn60z2s5an7gnawgkyzlalf8grwnjqkm77h"; 212912 212955 isLibrary = true; 212913 212956 isExecutable = true; 212914 212957 libraryHaskellDepends = [ ··· 215447 215490 ]; 215448 215491 description = "Terminal-based presentations using Pandoc"; 215449 215492 license = lib.licenses.gpl2Only; 215450 - hydraPlatforms = lib.platforms.none; 215451 215493 mainProgram = "patat"; 215452 - broken = true; 215453 215494 }) {}; 215454 215495 215455 215496 "patch" = callPackage ··· 218086 218127 license = lib.licenses.bsd3; 218087 218128 }) {}; 218088 218129 218130 + "persistent-mtl_0_5_0_0" = callPackage 218131 + ({ mkDerivation, base, bytestring, conduit, containers, esqueleto 218132 + , exceptions, explainable-predicates, monad-logger, mtl, persistent 218133 + , persistent-postgresql, persistent-sqlite, persistent-template 218134 + , resource-pool, resourcet, tasty, tasty-autocollect, tasty-golden 218135 + , tasty-hunit, text, transformers, unliftio, unliftio-core 218136 + , unliftio-pool 218137 + }: 218138 + mkDerivation { 218139 + pname = "persistent-mtl"; 218140 + version = "0.5.0.0"; 218141 + sha256 = "1xmn2zch7zxmjixlyjavl6wwdf0cjqzp01fp7xiy339wfd5higp2"; 218142 + libraryHaskellDepends = [ 218143 + base conduit containers exceptions monad-logger mtl persistent 218144 + resource-pool resourcet text transformers unliftio unliftio-core 218145 + unliftio-pool 218146 + ]; 218147 + testHaskellDepends = [ 218148 + base bytestring conduit containers esqueleto explainable-predicates 218149 + monad-logger persistent persistent-postgresql persistent-sqlite 218150 + persistent-template resource-pool resourcet tasty tasty-autocollect 218151 + tasty-golden tasty-hunit text unliftio 218152 + ]; 218153 + testToolDepends = [ tasty-autocollect ]; 218154 + description = "Monad transformer for the persistent API"; 218155 + license = lib.licenses.bsd3; 218156 + hydraPlatforms = lib.platforms.none; 218157 + }) {}; 218158 + 218089 218159 "persistent-mysql" = callPackage 218090 218160 ({ mkDerivation, aeson, base, blaze-builder, bytestring, conduit 218091 218161 , containers, fast-logger, hspec, http-api-data, HUnit ··· 218742 218812 }: 218743 218813 mkDerivation { 218744 218814 pname = "pg-entity"; 218745 - version = "0.0.2.0"; 218746 - sha256 = "0g8ici9l5lm4a900nyi90xvbjgy4z3zds46nn8sdw8ipnj0hkk1v"; 218747 - revision = "1"; 218748 - editedCabalFile = "03f0isq7vdjc1xbdchb5l0ggbf61jkxn2q1bii6sx8nphfgk4c9j"; 218815 + version = "0.0.3.0"; 218816 + sha256 = "047pccw7rkjscn2l209z15ddkbkwk88j948zgijzrm63ykrl114j"; 218749 218817 libraryHaskellDepends = [ 218750 218818 base bytestring colourista exceptions monad-control parsec 218751 218819 pg-transact postgresql-simple resource-pool safe-exceptions ··· 224022 224090 ]; 224023 224091 description = "Colog adapters for Polysemy.Log"; 224024 224092 license = "BSD-2-Clause-Patent"; 224093 + hydraPlatforms = lib.platforms.none; 224094 + broken = true; 224025 224095 }) {}; 224026 224096 224027 224097 "polysemy-log-di" = callPackage ··· 226162 226232 }: 226163 226233 mkDerivation { 226164 226234 pname = "postgresql-simple"; 226165 - version = "0.6.4"; 226166 - sha256 = "0rz2bklxp4pvbxb2w49h5p6pbwabn6d5d4j4mrya4fpa0d13k43d"; 226167 - revision = "8"; 226168 - editedCabalFile = "1qavb3qs1g307pc19k9y3yvqp0c1srwsplijvayn9ldp0bxdy6q8"; 226235 + version = "0.6.5"; 226236 + sha256 = "15jy8lp9200whyxk421yw3m671cjz41cnv2j8wll1giblyr3m9gx"; 226169 226237 libraryHaskellDepends = [ 226170 226238 aeson attoparsec base bytestring bytestring-builder 226171 226239 case-insensitive containers hashable Only postgresql-libpq ··· 226275 226343 }: 226276 226344 mkDerivation { 226277 226345 pname = "postgresql-simple-named"; 226278 - version = "0.0.3.0"; 226279 - sha256 = "19jyr3ai75hcks342yxrqsb1mklr6rjrzczs3al9666rll8silw9"; 226346 + version = "0.0.4.0"; 226347 + sha256 = "05xzvfy4j1r0zd2g3hgfk4a772vr02g8c3zd1vh6yqh71pvg5zwr"; 226280 226348 libraryHaskellDepends = [ 226281 226349 base bytestring mtl postgresql-simple text 226282 226350 ]; ··· 227079 227147 }) {}; 227080 227148 227081 227149 "pqueue" = callPackage 227082 - ({ mkDerivation, base, deepseq, random, tasty, tasty-bench 227083 - , tasty-quickcheck 227150 + ({ mkDerivation, base, deepseq, indexed-traversable, random, tasty 227151 + , tasty-bench, tasty-quickcheck 227084 227152 }: 227085 227153 mkDerivation { 227086 227154 pname = "pqueue"; 227087 - version = "1.4.2.0"; 227088 - sha256 = "1b7a0gf00aaw02vz21s7g7mni3dlx34cvl88dgm96a9jrm1djqrw"; 227089 - libraryHaskellDepends = [ base deepseq ]; 227155 + version = "1.4.3.0"; 227156 + sha256 = "0kl608jw0xz0n4ysw7p3cvlm1s71xrysw8862cddrzbr38bv8jvq"; 227157 + libraryHaskellDepends = [ base deepseq indexed-traversable ]; 227090 227158 testHaskellDepends = [ base deepseq tasty tasty-quickcheck ]; 227091 227159 benchmarkHaskellDepends = [ base deepseq random tasty-bench ]; 227092 227160 description = "Reliable, persistent, fast priority queues"; ··· 232254 232322 "purenix" = callPackage 232255 232323 ({ mkDerivation, aeson, base, bytestring, containers, directory 232256 232324 , filepath, microlens-platform, mtl, pretty-simple, purescript 232257 - , purescript-cst, text 232325 + , text 232258 232326 }: 232259 232327 mkDerivation { 232260 232328 pname = "purenix"; 232261 - version = "1.0"; 232262 - sha256 = "0h6g8x9c0k2hy8jyfafdhg7lq4s5r7zfhi542mkzjqpzf7cqrxwn"; 232329 + version = "1.1"; 232330 + sha256 = "1z6kanz6i3a9nqpmymh6192g9qbpc759ixipnpqa9w1ph7aa8rv0"; 232263 232331 isLibrary = true; 232264 232332 isExecutable = true; 232265 232333 libraryHaskellDepends = [ 232266 232334 aeson base bytestring containers directory filepath 232267 - microlens-platform mtl pretty-simple purescript purescript-cst text 232335 + microlens-platform mtl pretty-simple purescript text 232268 232336 ]; 232269 232337 executableHaskellDepends = [ base ]; 232270 232338 description = "Nix backend for PureScript. Transpile PureScript code to Nix."; ··· 237918 237986 pname = "readable"; 237919 237987 version = "0.3.1"; 237920 237988 sha256 = "1ja39cg26wy2fs00gi12x7iq5k8i366pbqi3p916skfa5jnkfc3h"; 237989 + revision = "1"; 237990 + editedCabalFile = "0dywlvxjszqa1dj5r1cva0viv2l1hm8mw75zddnf96pfpd00fmga"; 237921 237991 libraryHaskellDepends = [ base bytestring text ]; 237922 237992 description = "Reading from Text and ByteString"; 237923 237993 license = lib.licenses.bsd3; ··· 247016 247086 }: 247017 247087 mkDerivation { 247018 247088 pname = "rpmbuild-order"; 247019 - version = "0.4.9"; 247020 - sha256 = "1fclj2g340030y26mvlzkg9x1br1dmz1y8g5gjh3ngwjwlpy8k1q"; 247089 + version = "0.4.10"; 247090 + sha256 = "1dgl7zh8r5i8k21bgykgi30d9jbgcf9k4nnx3nyc1a594xpijab0"; 247021 247091 isLibrary = true; 247022 247092 isExecutable = true; 247023 247093 libraryHaskellDepends = [ ··· 247025 247095 simple-cmd 247026 247096 ]; 247027 247097 executableHaskellDepends = [ 247028 - base directory extra fgl optparse-applicative simple-cmd-args 247098 + base extra fgl optparse-applicative simple-cmd-args 247029 247099 ]; 247030 - testHaskellDepends = [ base extra hspec simple-cmd unix ]; 247100 + testHaskellDepends = [ 247101 + base directory extra hspec simple-cmd unix 247102 + ]; 247031 247103 description = "Sort RPM packages in dependency order"; 247032 247104 license = lib.licenses.bsd3; 247033 247105 hydraPlatforms = lib.platforms.none; ··· 249578 249650 license = lib.licenses.mit; 249579 249651 }) {}; 249580 249652 249581 - "sbp_4_8_0" = callPackage 249653 + "sbp_4_9_0" = callPackage 249582 249654 ({ mkDerivation, aeson, aeson-pretty, array, base 249583 249655 , base64-bytestring, basic-prelude, binary, binary-conduit 249584 249656 , bytestring, cmdargs, conduit, conduit-extra, data-binary-ieee754 ··· 249587 249659 }: 249588 249660 mkDerivation { 249589 249661 pname = "sbp"; 249590 - version = "4.8.0"; 249591 - sha256 = "11089yi2bj495h515la8bf9pwrsgbaffnx60kw2d6zk2xc312pic"; 249662 + version = "4.9.0"; 249663 + sha256 = "14p0a23kmn9z9l8rm9q94zgyx5p0wnjrgf51shk2magjg055llkb"; 249592 249664 isLibrary = true; 249593 249665 isExecutable = true; 249594 249666 libraryHaskellDepends = [ ··· 249950 250022 }: 249951 250023 mkDerivation { 249952 250024 pname = "scalpel"; 249953 - version = "0.6.2"; 249954 - sha256 = "04hhvk0yjxha3yg6n9fxivrz97hpjjiiblnj0bvs5myax1ggkjch"; 249955 - libraryHaskellDepends = [ 249956 - base bytestring case-insensitive data-default http-client 249957 - http-client-tls scalpel-core tagsoup text 249958 - ]; 249959 - description = "A high level web scraping library for Haskell"; 249960 - license = lib.licenses.asl20; 249961 - }) {}; 249962 - 249963 - "scalpel_0_6_2_1" = callPackage 249964 - ({ mkDerivation, base, bytestring, case-insensitive, data-default 249965 - , http-client, http-client-tls, scalpel-core, tagsoup, text 249966 - }: 249967 - mkDerivation { 249968 - pname = "scalpel"; 249969 250025 version = "0.6.2.1"; 249970 250026 sha256 = "0w3l38czfsgbyd3x6yir7qw9bl8nmhclrbpbwfyhs39728jlscnc"; 249971 250027 libraryHaskellDepends = [ ··· 249974 250030 ]; 249975 250031 description = "A high level web scraping library for Haskell"; 249976 250032 license = lib.licenses.asl20; 249977 - hydraPlatforms = lib.platforms.none; 249978 250033 }) {}; 249979 250034 249980 250035 "scalpel-core" = callPackage ··· 249984 250039 }: 249985 250040 mkDerivation { 249986 250041 pname = "scalpel-core"; 249987 - version = "0.6.2"; 249988 - sha256 = "07mjff8aqwabx8yhq8bd7jpnarkkrjqss8h8s2wkfmfj808fllmf"; 249989 - revision = "1"; 249990 - editedCabalFile = "1dn9ffblmfrr5ly3v1kbcmzc3z6m4x4p5mym8pfwc9p1vfxqbvz7"; 249991 - libraryHaskellDepends = [ 249992 - base bytestring containers data-default fail mtl pointedlist 249993 - regex-base regex-tdfa tagsoup text transformers vector 249994 - ]; 249995 - testHaskellDepends = [ base HUnit regex-base regex-tdfa tagsoup ]; 249996 - benchmarkHaskellDepends = [ base criterion tagsoup text ]; 249997 - description = "A high level web scraping library for Haskell"; 249998 - license = lib.licenses.asl20; 249999 - }) {}; 250000 - 250001 - "scalpel-core_0_6_2_1" = callPackage 250002 - ({ mkDerivation, base, bytestring, containers, criterion 250003 - , data-default, fail, HUnit, mtl, pointedlist, regex-base 250004 - , regex-tdfa, tagsoup, text, transformers, vector 250005 - }: 250006 - mkDerivation { 250007 - pname = "scalpel-core"; 250008 250042 version = "0.6.2.1"; 250009 250043 sha256 = "1yl1lsi5xm3qdlww2sb6vyppjiisj54f4yzvffv3qg8dgkfjfdra"; 250010 250044 libraryHaskellDepends = [ ··· 250015 250049 benchmarkHaskellDepends = [ base criterion tagsoup text ]; 250016 250050 description = "A high level web scraping library for Haskell"; 250017 250051 license = lib.licenses.asl20; 250018 - hydraPlatforms = lib.platforms.none; 250019 250052 }) {}; 250020 250053 250021 250054 "scalpel-search" = callPackage ··· 253713 253746 }: 253714 253747 mkDerivation { 253715 253748 pname = "servant"; 253716 - version = "0.19"; 253717 - sha256 = "1rahn436vc3xajn563ni25jqkg87fvhqkpswan1xy6qsfr0ikdjb"; 253718 - revision = "5"; 253719 - editedCabalFile = "0hn8qkvzazjncnawzzx7l0kdhzj35fy1387b00znirz6kx9w5vqp"; 253749 + version = "0.19.1"; 253750 + sha256 = "1gk6j39rcjpjacs351lknhrwj86yr4ifyp3qwlmiig27dxqlig3q"; 253720 253751 libraryHaskellDepends = [ 253721 253752 aeson attoparsec base base-compat bifunctors bytestring 253722 253753 case-insensitive constraints deepseq http-api-data http-media ··· 253788 253819 pname = "servant-auth"; 253789 253820 version = "0.4.1.0"; 253790 253821 sha256 = "08ggnlknhzdpf49zjm1qpzm12gckss7yr8chmzm6h6ycigz77ndd"; 253791 - revision = "3"; 253792 - editedCabalFile = "1gqg8hkq9gym3sd8xy2zij8lwrbiaqccdjkr6dyxqnnb71qm54bw"; 253822 + revision = "4"; 253823 + editedCabalFile = "0qgaq8if56fh1ydx8crb24p5cb5axx3n1lnx8klvvkamwrbr870a"; 253793 253824 libraryHaskellDepends = [ 253794 253825 aeson base containers jose lens servant text unordered-containers 253795 253826 ]; ··· 253929 253960 pname = "servant-auth-server"; 253930 253961 version = "0.4.7.0"; 253931 253962 sha256 = "1m145xxqg1xy7i1br9yfh3avwkb30zh808nr658ljl7j2imlknj2"; 253932 - revision = "3"; 253933 - editedCabalFile = "0niwlkkcv9q4zqh14lv5iq04qhw45xz2p2hhb56gva7cm6yhjgas"; 253963 + revision = "4"; 253964 + editedCabalFile = "1qcgm2pqi5qjqk27632h69j8ishls6cby8gghvww73wi63fqii9n"; 253934 253965 libraryHaskellDepends = [ 253935 253966 aeson base base64-bytestring blaze-builder bytestring 253936 253967 case-insensitive cookie data-default-class entropy http-types jose ··· 253955 253986 pname = "servant-auth-swagger"; 253956 253987 version = "0.2.10.1"; 253957 253988 sha256 = "029nvb4wxwl98ah26bgcq1b7izrnvssxwn1682liimvsh4a8bady"; 253958 - revision = "7"; 253959 - editedCabalFile = "0qkcjp621a8vysswm5hn5zgmqgmmm9pcs7aiyax7wij25yjmv3p6"; 253989 + revision = "8"; 253990 + editedCabalFile = "19hp58cf3avq3jnzhspsxkb7vml8ch3cw7dq8qy59xp1wgci6v5m"; 253960 253991 libraryHaskellDepends = [ 253961 253992 base lens servant servant-auth servant-swagger swagger2 text 253962 253993 ]; ··· 254476 254507 pname = "servant-docs"; 254477 254508 version = "0.12"; 254478 254509 sha256 = "0531jldq35sl1qlna0s1n8bakbsplg15611305dk48z80vcpa933"; 254479 - revision = "2"; 254480 - editedCabalFile = "0spgsfl1bx11yq7wivjrj3p5axszqya0pnmpcg2x5r6vm40qkzbk"; 254510 + revision = "3"; 254511 + editedCabalFile = "1brli8m3gvfji9b88xww5aifl1gq9lxacn3nhxbwndlnwznx7anz"; 254481 254512 isLibrary = true; 254482 254513 isExecutable = true; 254483 254514 libraryHaskellDepends = [ ··· 254724 254755 pname = "servant-foreign"; 254725 254756 version = "0.15.4"; 254726 254757 sha256 = "0bznb73rbgfgkg7n4pxghkqsfca0yw9vak73c6w8sqvc2mjnc7mz"; 254727 - revision = "4"; 254728 - editedCabalFile = "1c37ks36xba26br81bbdvb9qphzsrnngrd7nb6dv194z1p51n2xs"; 254758 + revision = "5"; 254759 + editedCabalFile = "1qjj2v95k800j9w8drc4fjcbazzdh2f7dl7s99g9r48dg9dk5cfz"; 254729 254760 libraryHaskellDepends = [ 254730 254761 base base-compat http-types lens servant text 254731 254762 ]; ··· 254918 254949 pname = "servant-http-streams"; 254919 254950 version = "0.18.4"; 254920 254951 sha256 = "15f24rcgz839cb38q4gs1liqrdyqjbazcqzjdxmv4307x072pv3a"; 254921 - revision = "4"; 254922 - editedCabalFile = "1f4iki0sxxszdf7sm02gk823w08z5laimym6rrsrsff56aviz1ll"; 254952 + revision = "5"; 254953 + editedCabalFile = "1v3lgfsn8611hnvf34l79mrp77ag40xyw2r26bbq6d7hbg2l2jn5"; 254923 254954 libraryHaskellDepends = [ 254924 254955 base base-compat bytestring case-insensitive containers deepseq 254925 254956 exceptions http-common http-media http-streams http-types ··· 255900 255931 }: 255901 255932 mkDerivation { 255902 255933 pname = "servant-server"; 255903 - version = "0.19.1"; 255904 - sha256 = "1g88vdwacwli79y5idqlrbhl2k9r463h560f2lk5abhqsmsm9bhd"; 255905 - revision = "3"; 255906 - editedCabalFile = "16jqzkrf9r7lz7y48dnl4v8s4hfn7hmfsmfbj7d96h53r2v4pz5g"; 255934 + version = "0.19.2"; 255935 + sha256 = "1a7msh8p59v5mgsnj5li9s3jg0jwq2zjsznr0cg7g0fncn7r1axy"; 255907 255936 isLibrary = true; 255908 255937 isExecutable = true; 255909 255938 libraryHaskellDepends = [ ··· 256399 256428 }) {}; 256400 256429 256401 256430 "servant-util" = callPackage 256402 - ({ mkDerivation, aeson, base, constraints, containers, data-default 256403 - , fmt, hspec, hspec-discover, hspec-expectations, http-client 256404 - , http-types, insert-ordered-containers, lens, megaparsec, mtl 256405 - , openapi3, pretty-terminal, QuickCheck, reflection, regex-posix 256406 - , safe-exceptions, servant, servant-client, servant-client-core 256407 - , servant-openapi3, servant-server, servant-swagger 256408 - , servant-swagger-ui, servant-swagger-ui-core, swagger2, text 256409 - , text-format, time, universum, wai, wai-extra, warp 256431 + ({ mkDerivation, aeson, base, bytestring, constraints, containers 256432 + , data-default, fmt, hspec, hspec-discover, hspec-expectations 256433 + , http-client, http-types, insert-ordered-containers, lens 256434 + , megaparsec, mtl, openapi3, pretty-terminal, QuickCheck 256435 + , reflection, regex-posix, safe-exceptions, servant, servant-client 256436 + , servant-client-core, servant-openapi3, servant-server 256437 + , servant-swagger, servant-swagger-ui, servant-swagger-ui-core 256438 + , swagger2, text, text-format, time, universum, wai, wai-extra 256439 + , warp 256410 256440 }: 256411 256441 mkDerivation { 256412 256442 pname = "servant-util"; 256413 - version = "0.3"; 256414 - sha256 = "1zhx8j7w5c41z6kgs2pdpv3ig8mvra5zq14kycpbznqpjcy21fma"; 256443 + version = "0.4"; 256444 + sha256 = "18v6x32kg3s6biyi6ixyg8xaks3hwvfz712gakrbyblgzk9w9zd7"; 256415 256445 isLibrary = true; 256416 256446 isExecutable = true; 256417 256447 libraryHaskellDepends = [ 256418 - aeson base constraints containers data-default fmt http-types 256419 - insert-ordered-containers lens megaparsec mtl openapi3 256448 + aeson base bytestring constraints containers data-default fmt 256449 + http-types insert-ordered-containers lens megaparsec mtl openapi3 256420 256450 pretty-terminal QuickCheck reflection regex-posix safe-exceptions 256421 256451 servant servant-client servant-client-core servant-openapi3 256422 256452 servant-server servant-swagger servant-swagger-ui ··· 256424 256454 wai 256425 256455 ]; 256426 256456 executableHaskellDepends = [ 256427 - aeson base constraints containers data-default fmt http-types 256428 - insert-ordered-containers lens megaparsec mtl openapi3 256457 + aeson base bytestring constraints containers data-default fmt 256458 + http-types insert-ordered-containers lens megaparsec mtl openapi3 256429 256459 pretty-terminal QuickCheck reflection regex-posix safe-exceptions 256430 256460 servant servant-client servant-client-core servant-openapi3 256431 256461 servant-server servant-swagger servant-swagger-ui ··· 256433 256463 wai wai-extra warp 256434 256464 ]; 256435 256465 testHaskellDepends = [ 256436 - aeson base constraints containers data-default fmt hspec 256466 + aeson base bytestring constraints containers data-default fmt hspec 256437 256467 hspec-expectations http-client http-types insert-ordered-containers 256438 256468 lens megaparsec mtl openapi3 pretty-terminal QuickCheck reflection 256439 256469 regex-posix safe-exceptions servant servant-client ··· 256457 256487 }: 256458 256488 mkDerivation { 256459 256489 pname = "servant-util-beam-pg"; 256460 - version = "0.3"; 256461 - sha256 = "1f3s1af4nh6dzppxgri23jihd79zyn22c0vw4xi7frjnikmfiwvl"; 256490 + version = "0.4.1"; 256491 + sha256 = "1j1hq26bbm6iz374y2hacxnnx2xx3lm5sv7a0g0n7xydfmy9zs3x"; 256462 256492 isLibrary = true; 256463 256493 isExecutable = true; 256464 256494 libraryHaskellDepends = [ ··· 262079 262109 mainProgram = "skylighting"; 262080 262110 }) {}; 262081 262111 262082 - "skylighting_0_13_1" = callPackage 262112 + "skylighting_0_13_1_1" = callPackage 262083 262113 ({ mkDerivation, base, binary, blaze-html, bytestring, containers 262084 262114 , pretty-show, skylighting-core, skylighting-format-ansi 262085 262115 , skylighting-format-blaze-html, skylighting-format-latex, text 262086 262116 }: 262087 262117 mkDerivation { 262088 262118 pname = "skylighting"; 262089 - version = "0.13.1"; 262090 - sha256 = "0azlnrms9cp6vfp33mrzlhv2vv8v3257hri8j3r37x8h2ml3i6h9"; 262119 + version = "0.13.1.1"; 262120 + sha256 = "01awb174z27iygjssrsgvrq8lapq7282vs4bf5cxdbkjcpncil4b"; 262091 262121 configureFlags = [ "-fexecutable" ]; 262092 262122 isLibrary = true; 262093 262123 isExecutable = true; ··· 262135 262165 license = lib.licenses.bsd3; 262136 262166 }) {}; 262137 262167 262138 - "skylighting-core_0_13_1" = callPackage 262168 + "skylighting-core_0_13_1_1" = callPackage 262139 262169 ({ mkDerivation, aeson, attoparsec, base, base64-bytestring, binary 262140 262170 , bytestring, case-insensitive, colour, containers, criterion, Diff 262141 262171 , directory, filepath, mtl, pretty-show, QuickCheck, safe, tasty ··· 262144 262174 }: 262145 262175 mkDerivation { 262146 262176 pname = "skylighting-core"; 262147 - version = "0.13.1"; 262148 - sha256 = "1cfc03684pwxydms5ld7y75msaw5w4y5hhdpyi36xj17y4wf1drw"; 262177 + version = "0.13.1.1"; 262178 + sha256 = "0cr9crylkawr1dg1aj55mbngn71nih16kfiblxi1gvizgxcrvdys"; 262149 262179 isLibrary = true; 262150 262180 isExecutable = true; 262151 262181 libraryHaskellDepends = [ ··· 262634 262664 ]; 262635 262665 description = "Sized list"; 262636 262666 license = lib.licenses.mpl20; 262667 + }) {}; 262668 + 262669 + "slist_0_2_1_0" = callPackage 262670 + ({ mkDerivation, base, containers, doctest, Glob, hedgehog, hspec 262671 + , hspec-hedgehog 262672 + }: 262673 + mkDerivation { 262674 + pname = "slist"; 262675 + version = "0.2.1.0"; 262676 + sha256 = "1j52gvq42x03y7jq0pxzab98qnrsjg6qnw4ysq6cd89cx6gg04ab"; 262677 + libraryHaskellDepends = [ base containers ]; 262678 + testHaskellDepends = [ 262679 + base doctest Glob hedgehog hspec hspec-hedgehog 262680 + ]; 262681 + description = "Sized list"; 262682 + license = lib.licenses.mpl20; 262683 + hydraPlatforms = lib.platforms.none; 262637 262684 }) {}; 262638 262685 262639 262686 "sloane" = callPackage ··· 265360 265407 pname = "soap"; 265361 265408 version = "0.2.3.6"; 265362 265409 sha256 = "0xmiabnx814rwdwrcipv0kja6ljgwqr4x58sa8s07nrs3ph8xz6d"; 265363 - revision = "2"; 265364 - editedCabalFile = "04n55zcwkdc0xf9gkj4lywfx8j1xjmb9hbfl4z8fjlpwxklkwfhn"; 265410 + revision = "3"; 265411 + editedCabalFile = "1p34yyxln56n75m7hha75p1qm73vjyxbm54lwq566ayqf7dikp2y"; 265365 265412 libraryHaskellDepends = [ 265366 265413 base bytestring conduit configurator data-default exceptions 265367 265414 http-client http-types iconv mtl resourcet text ··· 269665 269712 mainProgram = "stackcollapse-ghc"; 269666 269713 }) {}; 269667 269714 269715 + "stackctl" = callPackage 269716 + ({ mkDerivation, aeson, aeson-casing, aeson-pretty, amazonka 269717 + , amazonka-cloudformation, amazonka-core, amazonka-ec2 269718 + , amazonka-lambda, amazonka-sts, base, Blammo, bytestring, cfn-flip 269719 + , conduit, containers, errors, exceptions, extra, fast-logger 269720 + , filepath, Glob, hspec, lens, lens-aeson, monad-logger 269721 + , optparse-applicative, resourcet, rio, text, time, unliftio 269722 + , unliftio-core, unordered-containers, uuid, yaml 269723 + }: 269724 + mkDerivation { 269725 + pname = "stackctl"; 269726 + version = "1.1.0.1"; 269727 + sha256 = "1rhwgc6qgip3p8qvyjahpk7xbv583p35rxba2x02ig7hbx3724y7"; 269728 + isLibrary = true; 269729 + isExecutable = true; 269730 + libraryHaskellDepends = [ 269731 + aeson aeson-casing aeson-pretty amazonka amazonka-cloudformation 269732 + amazonka-core amazonka-ec2 amazonka-lambda amazonka-sts base Blammo 269733 + bytestring cfn-flip conduit containers errors exceptions extra 269734 + fast-logger filepath Glob lens lens-aeson monad-logger 269735 + optparse-applicative resourcet rio text time unliftio unliftio-core 269736 + unordered-containers uuid yaml 269737 + ]; 269738 + executableHaskellDepends = [ base ]; 269739 + testHaskellDepends = [ base hspec yaml ]; 269740 + license = lib.licenses.mit; 269741 + hydraPlatforms = lib.platforms.none; 269742 + mainProgram = "stackctl"; 269743 + }) {}; 269744 + 269668 269745 "stacked-dag" = callPackage 269669 269746 ({ mkDerivation, base, containers, doctest, graphviz 269670 269747 , optparse-applicative, text ··· 271978 272055 271979 272056 "streaming-commons" = callPackage 271980 272057 ({ mkDerivation, array, async, base, bytestring, deepseq, directory 271981 - , gauge, hspec, network, process, QuickCheck, random, stm, text 271982 - , transformers, unix, zlib 271983 - }: 271984 - mkDerivation { 271985 - pname = "streaming-commons"; 271986 - version = "0.2.2.4"; 271987 - sha256 = "1wnc2hi90djilj1m0la3h3xri723pbpmfdyp0kxxs33irs6418an"; 271988 - libraryHaskellDepends = [ 271989 - array async base bytestring directory network process random stm 271990 - text transformers unix zlib 271991 - ]; 271992 - testHaskellDepends = [ 271993 - array async base bytestring deepseq hspec network QuickCheck text 271994 - unix zlib 271995 - ]; 271996 - benchmarkHaskellDepends = [ base bytestring deepseq gauge text ]; 271997 - description = "Common lower-level functions needed by various streaming data libraries"; 271998 - license = lib.licenses.mit; 271999 - }) {}; 272000 - 272001 - "streaming-commons_0_2_2_5" = callPackage 272002 - ({ mkDerivation, array, async, base, bytestring, deepseq, directory 272003 272058 , gauge, hspec, hspec-discover, network, process, QuickCheck 272004 272059 , random, stm, text, transformers, unix, zlib 272005 272060 }: ··· 272019 272074 benchmarkHaskellDepends = [ base bytestring deepseq gauge text ]; 272020 272075 description = "Common lower-level functions needed by various streaming data libraries"; 272021 272076 license = lib.licenses.mit; 272022 - hydraPlatforms = lib.platforms.none; 272023 272077 }) {}; 272024 272078 272025 272079 "streaming-concurrency" = callPackage ··· 273323 273377 }: 273324 273378 mkDerivation { 273325 273379 pname = "string-variants"; 273326 - version = "0.1.0.1"; 273327 - sha256 = "12frxk86kk3rmg927i381qajwsanz2iwhf5ryvdd1af2km4dl76a"; 273380 + version = "0.1.0.2"; 273381 + sha256 = "0lrcjx3ci2kd2347klkwz01cf8mhzfk91sl7301q44cf8fg42az4"; 273328 273382 libraryHaskellDepends = [ 273329 273383 aeson base bytestring mono-traversable QuickCheck refined refinery 273330 273384 string-conversions template-haskell text ··· 274217 274271 ({ mkDerivation, base, css-syntax, network-uri, text }: 274218 274272 mkDerivation { 274219 274273 pname = "stylist-traits"; 274220 - version = "0.1.0.0"; 274221 - sha256 = "17wzhd7xfbj16sa3v5zhg4h1g0czccnv3ksbx7mi56dbf6lqq5bi"; 274274 + version = "0.1.1.0"; 274275 + sha256 = "0ynnz1zy5why4h2dw50rm5cnviwqqa7s2kjmaqdhr34msdvdigzv"; 274222 274276 libraryHaskellDepends = [ base css-syntax network-uri text ]; 274223 274277 description = "Traits, datatypes, & parsers for Haskell Stylist"; 274224 274278 license = lib.licenses.gpl3Only; ··· 275410 275464 ({ mkDerivation, base, blaze-markup, blaze-svg, directory, text }: 275411 275465 mkDerivation { 275412 275466 pname = "svg-icons"; 275413 - version = "2.2.0.2"; 275414 - sha256 = "076znrkjpyl23qnrh1ffnxjgcinccyh6rcasn9b578di7v31amx5"; 275467 + version = "2.3.0.0"; 275468 + sha256 = "0ybnda16klwcajhhmzpiajdl39rkk52zb41k6b0qvd21dxmv2qji"; 275415 275469 isLibrary = true; 275416 275470 isExecutable = true; 275417 275471 libraryHaskellDepends = [ ··· 275698 275752 }: 275699 275753 mkDerivation { 275700 275754 pname = "swagger2"; 275701 - version = "2.8.5"; 275702 - sha256 = "16r9657sp6zvj4jcs0yp7nvgnhjfsla29knaimkddsqa3k8qf1v6"; 275703 - setupHaskellDepends = [ base Cabal cabal-doctest ]; 275704 - libraryHaskellDepends = [ 275705 - aeson aeson-pretty base base-compat-batteries bytestring containers 275706 - cookie generics-sop hashable http-media insert-ordered-containers 275707 - lens mtl network optics-core optics-th QuickCheck scientific 275708 - template-haskell text time transformers unordered-containers 275709 - uuid-types vector 275710 - ]; 275711 - testHaskellDepends = [ 275712 - aeson base base-compat-batteries bytestring containers doctest Glob 275713 - hashable hspec HUnit insert-ordered-containers lens mtl QuickCheck 275714 - quickcheck-instances template-haskell text time 275715 - unordered-containers utf8-string vector 275716 - ]; 275717 - testToolDepends = [ hspec-discover ]; 275718 - description = "Swagger 2.0 data model"; 275719 - license = lib.licenses.bsd3; 275720 - }) {}; 275721 - 275722 - "swagger2_2_8_6" = callPackage 275723 - ({ mkDerivation, aeson, aeson-pretty, base, base-compat-batteries 275724 - , bytestring, Cabal, cabal-doctest, containers, cookie, doctest 275725 - , generics-sop, Glob, hashable, hspec, hspec-discover, http-media 275726 - , HUnit, insert-ordered-containers, lens, mtl, network, optics-core 275727 - , optics-th, QuickCheck, quickcheck-instances, scientific 275728 - , template-haskell, text, time, transformers, unordered-containers 275729 - , utf8-string, uuid-types, vector 275730 - }: 275731 - mkDerivation { 275732 - pname = "swagger2"; 275733 275755 version = "2.8.6"; 275734 275756 sha256 = "1cvz98cn4xzr7fx8q7rwr22l7l95z1cvq7qpm1shwca5j4gq5084"; 275735 275757 setupHaskellDepends = [ base Cabal cabal-doctest ]; ··· 275749 275771 testToolDepends = [ hspec-discover ]; 275750 275772 description = "Swagger 2.0 data model"; 275751 275773 license = lib.licenses.bsd3; 275752 - hydraPlatforms = lib.platforms.none; 275753 275774 }) {}; 275754 275775 275755 275776 "swapper" = callPackage ··· 275772 275793 275773 275794 "swarm" = callPackage 275774 275795 ({ mkDerivation, aeson, array, base, brick, bytestring, clock 275775 - , containers, criterion, directory, dotgen, either, entropy, extra 275776 - , filepath, fused-effects, fused-effects-lens, githash, hashable 275777 - , hsnoise, http-client, http-client-tls, http-types, lens, linear 275778 - , lsp, megaparsec, minimorph, mtl, murmur3, optparse-applicative 275779 - , parser-combinators, prettyprinter, QuickCheck, random, servant 275780 - , servant-server, simple-enumeration, split, stm, syb, tasty 275781 - , tasty-expected-failure, tasty-hunit, tasty-quickcheck 275782 - , template-haskell, text, time, transformers, unification-fd 275796 + , containers, criterion, directory, dotgen, either, extra, filepath 275797 + , fused-effects, fused-effects-lens, githash, hashable, hsnoise 275798 + , http-client, http-client-tls, http-types, lens, linear, lsp 275799 + , megaparsec, minimorph, mtl, murmur3, natural-sort 275800 + , optparse-applicative, parser-combinators, prettyprinter 275801 + , QuickCheck, random, servant, servant-server, simple-enumeration 275802 + , split, stm, syb, tagged, tasty, tasty-expected-failure 275803 + , tasty-hunit, tasty-quickcheck, template-haskell, text 275804 + , text-zipper, time, transformers, unification-fd 275783 275805 , unordered-containers, vector, vty, wai, warp, witch, word-wrap 275784 275806 , yaml 275785 275807 }: 275786 275808 mkDerivation { 275787 275809 pname = "swarm"; 275788 - version = "0.1.1.0"; 275789 - sha256 = "18w84a0hb975qcwsd9kcji88h6xyrf7dbqcvfjdhhgbbd4y8pv9h"; 275810 + version = "0.2.0.0"; 275811 + sha256 = "1f1fp4yia54j5x6kxkrsdlj9y2859gz22k4r3pphfiadfiw1gww3"; 275790 275812 isLibrary = true; 275791 275813 isExecutable = true; 275792 275814 enableSeparateDataOutput = true; 275793 275815 libraryHaskellDepends = [ 275794 275816 aeson array base brick bytestring clock containers directory dotgen 275795 - either entropy extra filepath fused-effects fused-effects-lens 275796 - githash hashable hsnoise http-client http-client-tls http-types 275797 - lens linear lsp megaparsec minimorph mtl murmur3 parser-combinators 275798 - prettyprinter random servant servant-server simple-enumeration 275799 - split stm syb template-haskell text time unification-fd 275800 - unordered-containers vector vty wai warp witch word-wrap yaml 275817 + either extra filepath fused-effects fused-effects-lens githash 275818 + hashable hsnoise http-client http-client-tls http-types lens linear 275819 + lsp megaparsec minimorph mtl murmur3 natural-sort 275820 + parser-combinators prettyprinter random servant servant-server 275821 + simple-enumeration split stm syb tagged template-haskell text 275822 + text-zipper time unification-fd unordered-containers vector vty wai 275823 + warp witch word-wrap yaml 275801 275824 ]; 275802 275825 executableHaskellDepends = [ 275803 275826 base githash optparse-applicative text ··· 278875 278898 ]; 278876 278899 description = "Tailwind wrapped in Haskell"; 278877 278900 license = lib.licenses.mit; 278878 - hydraPlatforms = lib.platforms.none; 278879 278901 mainProgram = "tailwind-run"; 278880 - broken = true; 278881 278902 }) {}; 278882 278903 278883 278904 "tak" = callPackage ··· 282047 282068 license = lib.licenses.bsd3; 282048 282069 }) {}; 282049 282070 282050 - "termbox_1_0_0" = callPackage 282051 - ({ mkDerivation, base, ki, termbox-bindings-hs }: 282071 + "termbox_1_1_0" = callPackage 282072 + ({ mkDerivation, base, termbox-bindings-hs }: 282052 282073 mkDerivation { 282053 282074 pname = "termbox"; 282054 - version = "1.0.0"; 282055 - sha256 = "0diqjxam4vvw8prycjrq7qvn44lihda5rwibhwwp87vn840z0j3s"; 282056 - isLibrary = true; 282057 - isExecutable = true; 282058 - libraryHaskellDepends = [ base ki termbox-bindings-hs ]; 282075 + version = "1.1.0"; 282076 + sha256 = "0m2g3w0a0kc0a692r2mdflp1q96nycpwg80zf6lsb0z1xqvycypy"; 282077 + libraryHaskellDepends = [ base termbox-bindings-hs ]; 282059 282078 description = "termbox"; 282060 282079 license = lib.licenses.bsd3; 282061 282080 hydraPlatforms = lib.platforms.none; ··· 282065 282084 ({ mkDerivation, base, reactive-banana, termbox }: 282066 282085 mkDerivation { 282067 282086 pname = "termbox-banana"; 282068 - version = "0.4.0"; 282069 - sha256 = "13n2r3a6gw0lmgk36dsdwhz6hd8h9rn93pk62zlxcycddrwhan5p"; 282087 + version = "1.0.0"; 282088 + sha256 = "0fj9h3nbgsr9321kb4a2m0m1afmjass5x22pc2dbn602k9d9fmyy"; 282070 282089 libraryHaskellDepends = [ base reactive-banana termbox ]; 282071 - description = "reactive-banana + termbox"; 282090 + description = "termbox + reactive-banana"; 282072 282091 license = lib.licenses.bsd3; 282092 + hydraPlatforms = lib.platforms.none; 282093 + broken = true; 282073 282094 }) {}; 282074 282095 282075 282096 "termbox-bindings" = callPackage ··· 282110 282131 libraryHaskellDepends = [ base termbox-bindings-c ]; 282111 282132 description = "termbox bindings"; 282112 282133 license = lib.licenses.bsd3; 282134 + }) {}; 282135 + 282136 + "termbox-tea" = callPackage 282137 + ({ mkDerivation, base, ki, termbox }: 282138 + mkDerivation { 282139 + pname = "termbox-tea"; 282140 + version = "0.1.0"; 282141 + sha256 = "0qck27chphmxm5zdrbz3njix5vkry5c5liybgvrx0745ymcd231w"; 282142 + isLibrary = true; 282143 + isExecutable = true; 282144 + libraryHaskellDepends = [ base ki termbox ]; 282145 + description = "termbox + The Elm Architecture"; 282146 + license = lib.licenses.bsd3; 282147 + hydraPlatforms = lib.platforms.none; 282148 + broken = true; 282113 282149 }) {}; 282114 282150 282115 282151 "termcolor" = callPackage ··· 283344 283380 libraryHaskellDepends = [ base text ]; 283345 283381 description = "Text styling for ANSI terminals"; 283346 283382 license = lib.licenses.bsd3; 283383 + }) {}; 283384 + 283385 + "text-ansi_0_2_0" = callPackage 283386 + ({ mkDerivation, base, text, text-builder }: 283387 + mkDerivation { 283388 + pname = "text-ansi"; 283389 + version = "0.2.0"; 283390 + sha256 = "15sraxbiwwx49nz4kxhh2b45q222pcxzgm85rmaskpi7pswwj0b2"; 283391 + libraryHaskellDepends = [ base text text-builder ]; 283392 + description = "Text styling for ANSI terminals"; 283393 + license = lib.licenses.bsd3; 283394 + hydraPlatforms = lib.platforms.none; 283347 283395 }) {}; 283348 283396 283349 283397 "text-ascii" = callPackage ··· 283480 283528 broken = true; 283481 283529 }) {}; 283482 283530 283531 + "text-compression" = callPackage 283532 + ({ mkDerivation, base, containers, massiv, mtl }: 283533 + mkDerivation { 283534 + pname = "text-compression"; 283535 + version = "0.1.0.4"; 283536 + sha256 = "15bkgmlav4aybsgh7wg261fkhqg7phsc91sp1w26f9m2wb278xby"; 283537 + libraryHaskellDepends = [ base containers massiv mtl ]; 283538 + description = "A text compression library"; 283539 + license = lib.licenses.bsd3; 283540 + }) {}; 283541 + 283483 283542 "text-containers" = callPackage 283484 283543 ({ mkDerivation, base, bytestring, containers, deepseq, ghc-prim 283485 283544 , hashable, QuickCheck, quickcheck-instances, tasty ··· 286730 286789 pname = "time-manager"; 286731 286790 version = "0.0.0"; 286732 286791 sha256 = "1nzwj0fxz370ks6vr1sylcidx33rnqq45y3q9yv9n4dj43nid9lh"; 286792 + revision = "1"; 286793 + editedCabalFile = "1hwcns6rnh27nngq616cl9x2pl6lm4zzrsbbv5vq6hl0a60qhqjv"; 286733 286794 libraryHaskellDepends = [ auto-update base ]; 286734 286795 description = "Scalable timer"; 286735 286796 license = lib.licenses.mit; ··· 293601 293662 license = lib.licenses.mit; 293602 293663 }) {}; 293603 293664 293665 + "type-level-kv-list_2_0_0" = callPackage 293666 + ({ mkDerivation, base, doctest, Glob }: 293667 + mkDerivation { 293668 + pname = "type-level-kv-list"; 293669 + version = "2.0.0"; 293670 + sha256 = "0m1hyddkc7652crki2r2rd0c7mr9sqcj57vhhkn280plqpmbl1kx"; 293671 + libraryHaskellDepends = [ base ]; 293672 + testHaskellDepends = [ base doctest Glob ]; 293673 + description = "Type level Key-Value list"; 293674 + license = lib.licenses.mit; 293675 + hydraPlatforms = lib.platforms.none; 293676 + }) {}; 293677 + 293678 + "type-level-kv-list-esqueleto" = callPackage 293679 + ({ mkDerivation, base, esqueleto, text, type-level-kv-list }: 293680 + mkDerivation { 293681 + pname = "type-level-kv-list-esqueleto"; 293682 + version = "0.1.0.1"; 293683 + sha256 = "0vkzrz7mgai8xprcly1vd938cdsxhpgpcmdgh823aawpdbahc7v9"; 293684 + libraryHaskellDepends = [ base esqueleto text type-level-kv-list ]; 293685 + description = "Make Esqueleto handy with type-level-kv-list"; 293686 + license = lib.licenses.mit; 293687 + hydraPlatforms = lib.platforms.none; 293688 + broken = true; 293689 + }) {}; 293690 + 293604 293691 "type-level-natural-number" = callPackage 293605 293692 ({ mkDerivation, base }: 293606 293693 mkDerivation { ··· 294489 294576 }: 294490 294577 mkDerivation { 294491 294578 pname = "typerep-map"; 294492 - version = "0.5.0.0"; 294493 - sha256 = "0ash190liysilgdwd5aiv55k3jrapksdhrcf0sf5lqv5dmpq07ja"; 294579 + version = "0.6.0.0"; 294580 + sha256 = "011whbmc9157jw68mgkqxbgngl9zcc478b9fw10w5pkjb01anvz3"; 294494 294581 libraryHaskellDepends = [ 294495 294582 base containers deepseq ghc-prim primitive vector 294496 294583 ]; ··· 294774 294861 }: 294775 294862 mkDerivation { 294776 294863 pname = "tzdata"; 294777 - version = "0.2.20221011.0"; 294778 - sha256 = "118k2zbn71cri9f7b7293hsj5vyrmz7v60a7rl0r2abgkxkf39d2"; 294864 + version = "0.2.20221028.0"; 294865 + sha256 = "1cm18g2fv8r11picmq2rf4hz77j2dgx6r6cdamdsq1ap0hv2jdqv"; 294779 294866 enableSeparateDataOutput = true; 294780 294867 libraryHaskellDepends = [ 294781 294868 base bytestring containers deepseq vector ··· 297475 297562 297476 297563 "unliftio" = callPackage 297477 297564 ({ mkDerivation, async, base, bytestring, containers, deepseq 297478 - , directory, filepath, gauge, hspec, process, QuickCheck, stm, time 297479 - , transformers, unix, unliftio-core 297480 - }: 297481 - mkDerivation { 297482 - pname = "unliftio"; 297483 - version = "0.2.22.0"; 297484 - sha256 = "125vzwkzp53i5n0yxy7bbivpzgf3c7ynsfhn04xk1ymy9fqsvi0z"; 297485 - libraryHaskellDepends = [ 297486 - async base bytestring deepseq directory filepath process stm time 297487 - transformers unix unliftio-core 297488 - ]; 297489 - testHaskellDepends = [ 297490 - async base bytestring containers deepseq directory filepath hspec 297491 - process QuickCheck stm time transformers unix unliftio-core 297492 - ]; 297493 - benchmarkHaskellDepends = [ 297494 - async base bytestring deepseq directory filepath gauge process stm 297495 - time transformers unix unliftio-core 297496 - ]; 297497 - description = "The MonadUnliftIO typeclass for unlifting monads to IO (batteries included)"; 297498 - license = lib.licenses.mit; 297499 - }) {}; 297500 - 297501 - "unliftio_0_2_23_0" = callPackage 297502 - ({ mkDerivation, async, base, bytestring, containers, deepseq 297503 297565 , directory, filepath, gauge, hspec, process, QuickCheck 297504 297566 , safe-exceptions, stm, time, transformers, unix, unliftio-core 297505 297567 }: ··· 297522 297584 ]; 297523 297585 description = "The MonadUnliftIO typeclass for unlifting monads to IO (batteries included)"; 297524 297586 license = lib.licenses.mit; 297525 - hydraPlatforms = lib.platforms.none; 297526 297587 }) {}; 297527 297588 297528 297589 "unliftio-core" = callPackage ··· 303525 303586 pname = "wai-extra"; 303526 303587 version = "3.1.12.1"; 303527 303588 sha256 = "1ya4m0c2p3wxzjlmk3yasc3pm61z309hzry9d39lj5wqv93a4wn6"; 303528 - revision = "1"; 303529 - editedCabalFile = "15v9m9af34s2iz9836bd1xi0s27sffviai4ywb2g3cv33fnpnljh"; 303589 + revision = "2"; 303590 + editedCabalFile = "139iqd6fqqj9xlpnbgva8y3wvakp2lyndk4bkvq46pq2xir4gqkf"; 303530 303591 isLibrary = true; 303531 303592 isExecutable = true; 303532 303593 libraryHaskellDepends = [ ··· 303543 303604 ]; 303544 303605 description = "Provides some basic WAI handlers and middleware"; 303545 303606 license = lib.licenses.mit; 303607 + }) {}; 303608 + 303609 + "wai-extra_3_1_13_0" = callPackage 303610 + ({ mkDerivation, aeson, ansi-terminal, base, base64-bytestring 303611 + , bytestring, call-stack, case-insensitive, containers, cookie 303612 + , data-default-class, directory, fast-logger, hspec, hspec-discover 303613 + , http-types, HUnit, iproute, network, resourcet, streaming-commons 303614 + , temporary, text, time, transformers, unix, vault, wai, wai-logger 303615 + , warp, word8, zlib 303616 + }: 303617 + mkDerivation { 303618 + pname = "wai-extra"; 303619 + version = "3.1.13.0"; 303620 + sha256 = "1h4cqd5akrq0vhv3l0fzryy7qw0c2jb58lngx7x8ij63bckjs3fz"; 303621 + revision = "1"; 303622 + editedCabalFile = "0dyvg2bb37im790757khncxpnf45451dd8575p736ry4g8rpqgpw"; 303623 + isLibrary = true; 303624 + isExecutable = true; 303625 + libraryHaskellDepends = [ 303626 + aeson ansi-terminal base base64-bytestring bytestring call-stack 303627 + case-insensitive containers cookie data-default-class directory 303628 + fast-logger http-types HUnit iproute network resourcet 303629 + streaming-commons text time transformers unix vault wai wai-logger 303630 + warp word8 303631 + ]; 303632 + testHaskellDepends = [ 303633 + aeson base bytestring case-insensitive cookie directory fast-logger 303634 + hspec http-types HUnit iproute resourcet temporary text time wai 303635 + warp zlib 303636 + ]; 303637 + testToolDepends = [ hspec-discover ]; 303638 + description = "Provides some basic WAI handlers and middleware"; 303639 + license = lib.licenses.mit; 303640 + hydraPlatforms = lib.platforms.none; 303546 303641 }) {}; 303547 303642 303548 303643 "wai-feature-flags" = callPackage ··· 310686 310781 }) {}; 310687 310782 310688 310783 "xdg-basedir-compliant" = callPackage 310689 - ({ mkDerivation, aeson, base, bytestring, filepath, hspec, polysemy 310690 - , polysemy-plugin, polysemy-zoo, QuickCheck, split 310784 + ({ mkDerivation, aeson, base, bytestring, directory, filepath 310785 + , hspec, path, polysemy, polysemy-plugin, polysemy-zoo, QuickCheck 310786 + , split 310691 310787 }: 310692 310788 mkDerivation { 310693 310789 pname = "xdg-basedir-compliant"; 310694 - version = "1.0.2"; 310695 - sha256 = "0451z9w6607ci2s3bx8q73j3fw3ff3lnjf3i4h4nkscf76m84zzl"; 310790 + version = "1.1.0"; 310791 + sha256 = "15m38hhfa5bx5nsp7xmwjv4xk3rzw0ci1mnx8hivi7j7yk8xwc5s"; 310696 310792 libraryHaskellDepends = [ 310697 - base bytestring filepath polysemy polysemy-plugin polysemy-zoo 310698 - split 310793 + base bytestring directory filepath path polysemy polysemy-plugin 310794 + polysemy-zoo split 310699 310795 ]; 310700 310796 testHaskellDepends = [ 310701 - aeson base bytestring filepath hspec polysemy polysemy-plugin 310702 - polysemy-zoo QuickCheck split 310797 + aeson base bytestring directory filepath hspec path polysemy 310798 + polysemy-plugin polysemy-zoo QuickCheck split 310703 310799 ]; 310704 310800 description = "XDG Basedir"; 310705 310801 license = lib.licenses.bsd3; ··· 311142 311238 }: 311143 311239 mkDerivation { 311144 311240 pname = "xlsx"; 311145 - version = "1.1.0"; 311146 - sha256 = "09h2z1qys01lmddkacs4z3gm36dd1ndn0hw8cn3mmciyczawn2w1"; 311241 + version = "1.1.0.1"; 311242 + sha256 = "0av80xy6qqmsmc40h13zsdyyh9gmjj5rk07vjq5s7h1zbqxaqfwp"; 311147 311243 libraryHaskellDepends = [ 311148 311244 attoparsec base base64-bytestring binary-search bytestring conduit 311149 311245 containers data-default deepseq dlist errors exceptions extra ··· 311258 311354 pname = "xml-conduit"; 311259 311355 version = "1.9.1.1"; 311260 311356 sha256 = "1zzh7xnmbm68dab1vqsjkr6ghxqgnla5nik4amrwlmhbdih1gcdx"; 311261 - revision = "1"; 311262 - editedCabalFile = "0x4is0956lfpxnxf2hqv5yvl1v8r1d41h3a22qqkvbqi13xz2hzv"; 311357 + revision = "2"; 311358 + editedCabalFile = "0m6sknp9xxz8a3dhvyfpyjvxp8ph511w19j4vj1qsd6hl2pazjy6"; 311263 311359 setupHaskellDepends = [ base Cabal cabal-doctest ]; 311264 311360 libraryHaskellDepends = [ 311265 311361 attoparsec base blaze-html blaze-markup bytestring conduit
+3 -3
pkgs/development/interpreters/wasmtime/default.nix
··· 2 2 3 3 rustPlatform.buildRustPackage rec { 4 4 pname = "wasmtime"; 5 - version = "2.0.1"; 5 + version = "2.0.2"; 6 6 7 7 src = fetchFromGitHub { 8 8 owner = "bytecodealliance"; 9 9 repo = pname; 10 10 rev = "v${version}"; 11 - sha256 = "sha256-C0HH8JLF6fKXFC3AEcM/lizGFZYJkdtBCbu2YxRwMdI="; 11 + sha256 = "sha256-2s9HjWIvQw5PE7LsEgFJ2F/XOI5kPdKZfNPkr9a73cY="; 12 12 fetchSubmodules = true; 13 13 }; 14 14 15 - cargoSha256 = "sha256-4kLladdrDaCcEk9xpqWuzf5H1NNuOvq92qhjoRKXZ4E="; 15 + cargoSha256 = "sha256-vKcmH8+FDAJXxOLT+nOqjDB3UhWmEAB4/ynOhT2FWAg="; 16 16 17 17 cargoBuildFlags = [ 18 18 "--package wasmtime-cli"
+2 -2
pkgs/development/libraries/aws-c-io/default.nix
··· 2 2 3 3 stdenv.mkDerivation rec { 4 4 pname = "aws-c-io"; 5 - version = "0.13.6"; 5 + version = "0.13.9"; 6 6 7 7 src = fetchFromGitHub { 8 8 owner = "awslabs"; 9 9 repo = pname; 10 10 rev = "v${version}"; 11 - sha256 = "sha256-axFhFGeJhfqb4zu5u9an0pgpVDe+OyT+7A5SlAs502I="; 11 + sha256 = "sha256-G7FYWrpg4TLsfK6C3JCTWkZ65iu3+gF3To5qYgUAqb0="; 12 12 }; 13 13 14 14 nativeBuildInputs = [ cmake ];
+51
pkgs/development/libraries/glib/default.nix
··· 8 8 , coreutils, dbus, libxml2, tzdata 9 9 , desktop-file-utils, shared-mime-info 10 10 , darwin 11 + # update script 12 + , runCommand, git, coccinelle 11 13 }: 12 14 13 15 assert stdenv.isLinux -> util-linuxMinimal != null; ··· 246 248 packageName = "glib"; 247 249 versionPolicy = "odd-unstable"; 248 250 }; 251 + /* 252 + can be used as part of an update script to automatically create a patch 253 + hardcoding the path of all gsettings schemas in C code. 254 + For example: 255 + passthru = { 256 + hardcodeGsettingsPatch = glib.mkHardcodeGsettingsPatch { 257 + inherit src; 258 + glib-schema-to-var = { 259 + ... 260 + }; 261 + }; 262 + 263 + updateScript = 264 + let 265 + updateSource = ...; 266 + patch = _experimental-update-script-combinators.copyAttrOutputToFile "evolution-ews.hardcodeGsettingsPatch" ./hardcode-gsettings.patch; 267 + in 268 + _experimental-update-script-combinators.sequence [ 269 + updateSource 270 + patch 271 + ]; 272 + }; 273 + } 274 + takes as input a mapping from schema path to variable name. 275 + For example `{ "org.gnome.evolution" = "EVOLUTION_SCHEMA_PATH"; }` 276 + hardcodes looking for `org.gnome.evolution` into `@EVOLUTION_SCHEMA_PATH@`. 277 + All schemas must be listed. 278 + */ 279 + mkHardcodeGsettingsPatch = { src, glib-schema-to-var }: 280 + runCommand 281 + "hardcode-gsettings.patch" 282 + { 283 + inherit src; 284 + nativeBuildInputs = [ 285 + git 286 + coccinelle 287 + python3 # For patch script 288 + ]; 289 + } 290 + '' 291 + unpackPhase 292 + cd "''${sourceRoot:-.}" 293 + set -x 294 + cp ${builtins.toFile "glib-schema-to-var.json" (builtins.toJSON glib-schema-to-var)} ./glib-schema-to-var.json 295 + git init 296 + git add -A 297 + spatch --sp-file "${./hardcode-gsettings.cocci}" --dir . --in-place 298 + git diff > "$out" 299 + ''; 249 300 }; 250 301 251 302 meta = with lib; {
+2 -2
pkgs/development/libraries/libnats-c/default.nix
··· 5 5 6 6 stdenv.mkDerivation rec { 7 7 pname = "libnats"; 8 - version = "3.4.1"; 8 + version = "3.5.0"; 9 9 10 10 src = fetchFromGitHub { 11 11 owner = "nats-io"; 12 12 repo = "nats.c"; 13 13 rev = "v${version}"; 14 - sha256 = "sha256-Mbmd1bhFnc4feC0bnOa5mD15DxvY4Sgftx3Ep/7Cdp4="; 14 + sha256 = "sha256-mdOvJkCdJ2QEsVUdxVCpIDLn4+6JM6OeJfasJxqqID8="; 15 15 }; 16 16 17 17 nativeBuildInputs = [ cmake ];
+6
pkgs/development/libraries/librealsense/default.nix
··· 52 52 ./py_pybind11_no_external_download.patch 53 53 ]; 54 54 55 + postPatch = '' 56 + # https://github.com/IntelRealSense/librealsense/issues/11092 57 + # insert a "#include <iostream" at beginning of file 58 + sed '1i\#include <iostream>' -i wrappers/python/pyrs_device.cpp 59 + ''; 60 + 55 61 nativeBuildInputs = [ 56 62 cmake 57 63 ninja
+1 -1
pkgs/development/libraries/ndi/version.json
··· 1 - {"hash": "sha256:24ed671e140ee62ebe96a494b3f0e3a3e5ba005364a0a6ad8ebf89b3494b7644", "version": "5.5.1"} 1 + {"hash": "sha256:70e04c2e7a629a9854de2727e0f978175b7a4ec6cf4cd9799a22390862f6fa27", "version": "5.5.2"}
+2 -2
pkgs/development/libraries/pugixml/default.nix
··· 2 2 3 3 stdenv.mkDerivation rec { 4 4 pname = "pugixml"; 5 - version = "1.12.1"; 5 + version = "1.13"; 6 6 7 7 src = fetchFromGitHub { 8 8 owner = "zeux"; 9 9 repo = "pugixml"; 10 10 rev = "v${version}"; 11 - sha256 = "sha256-Udjx84mhLPJ1bU5WYDo73PAeeufS+vBLXZP0YbBvqLE="; 11 + sha256 = "sha256-MAXm/9ANj6TjO1Skpg20RYt88bf6w1uPwRwOHXiXsWw="; 12 12 }; 13 13 14 14 outputs = [ "out" ] ++ lib.optionals shared [ "dev" ];
+1
pkgs/development/libraries/rocfft/default.nix
··· 110 110 license = with licenses; [ mit ]; 111 111 maintainers = with maintainers; [ Madouura ]; 112 112 broken = rocmVersion != hip.version; 113 + hydraPlatforms = [ ]; # rocFFT produces an extremely large output 113 114 }; 114 115 }
+2 -2
pkgs/development/ocaml-modules/dune-action-plugin/default.nix
··· 1 - { lib, buildDunePackage, dune_3, dune-glob, dune-private-libs }: 1 + { lib, buildDunePackage, dune_3, dune-glob, dune-private-libs, dune-rpc }: 2 2 3 3 buildDunePackage rec { 4 4 pname = "dune-action-plugin"; ··· 8 8 9 9 dontAddPrefix = true; 10 10 11 - propagatedBuildInputs = [ dune-glob dune-private-libs ]; 11 + propagatedBuildInputs = [ dune-glob dune-private-libs dune-rpc ]; 12 12 13 13 preBuild = '' 14 14 rm -r vendor/csexp
+2 -2
pkgs/development/ocaml-modules/dune-rpc/default.nix
··· 1 - { lib, buildDunePackage, dune_3, stdune, ordering, pp, xdg, dyn }: 1 + { lib, buildDunePackage, dune_3, csexp, stdune, ordering, pp, xdg, dyn }: 2 2 3 3 buildDunePackage rec { 4 4 pname = "dune-rpc"; ··· 8 8 9 9 dontAddPrefix = true; 10 10 11 - buildInputs = [ stdune ordering pp xdg dyn ]; 11 + propagatedBuildInputs = [ csexp stdune ordering pp xdg dyn ]; 12 12 13 13 preBuild = '' 14 14 rm -r vendor/csexp
+3 -2
pkgs/development/ocaml-modules/ocaml-lsp/default.nix
··· 1 - { lib, buildDunePackage, lsp, xdg, re, fiber, makeWrapper, dot-merlin-reader, spawn }: 1 + { lib, buildDunePackage, lsp, xdg, re, fiber, makeWrapper, dot-merlin-reader, spawn, ocamlc-loc }: 2 2 3 3 buildDunePackage rec { 4 4 pname = "ocaml-lsp-server"; ··· 7 7 8 8 buildInputs = lsp.buildInputs ++ [ lsp re ] 9 9 ++ lib.optional (lib.versionAtLeast version "1.9") spawn 10 - ++ lib.optionals (lib.versionAtLeast version "1.10") [ fiber xdg ]; 10 + ++ lib.optionals (lib.versionAtLeast version "1.10") [ fiber xdg ] 11 + ++ lib.optional (lib.versionAtLeast version "1.14.2") ocamlc-loc; 11 12 12 13 nativeBuildInputs = [ makeWrapper ]; 13 14
+2 -2
pkgs/development/ocaml-modules/ocaml-lsp/jsonrpc.nix
··· 13 13 if lib.versionAtLeast ocaml.version "4.14" 14 14 then { 15 15 name = "lsp"; 16 - version = "1.14.1"; 17 - sha256 = "sha256-5kxMM90Dd5H8yb7f1NYV3abRaePqztFQ82VTnayradk="; 16 + version = "1.14.2"; 17 + sha256 = "sha256-1R+HYaGbPLGDs5DMN3jmnrZFMhMmPUHgF+s+yNzIVJQ="; 18 18 } else if lib.versionAtLeast ocaml.version "4.13" 19 19 then { 20 20 name = "jsonrpc";
+24
pkgs/development/ocaml-modules/ocamlc-loc/default.nix
··· 1 + { lib, buildDunePackage, dune_3, dyn }: 2 + 3 + buildDunePackage { 4 + pname = "ocamlc-loc"; 5 + inherit (dune_3) src version; 6 + duneVersion = "3"; 7 + 8 + dontAddPrefix = true; 9 + 10 + preBuild = '' 11 + rm -rf vendor/csexp 12 + rm -rf vendor/pp 13 + ''; 14 + 15 + minimalOCamlVersion = "4.08"; 16 + 17 + propagatedBuildInputs = [ dyn ]; 18 + 19 + meta = with lib; { 20 + description = "Parse ocaml compiler output into structured form"; 21 + maintainers = [ maintainers.ulrikstrid ]; 22 + license = licenses.mit; 23 + }; 24 + }
+2 -2
pkgs/development/tools/buildkit/default.nix
··· 2 2 3 3 buildGoModule rec { 4 4 pname = "buildkit"; 5 - version = "0.10.5"; 5 + version = "0.10.6"; 6 6 7 7 src = fetchFromGitHub { 8 8 owner = "moby"; 9 9 repo = "buildkit"; 10 10 rev = "v${version}"; 11 - sha256 = "sha256-6p7LQvlVG0epkk4qFDKrmBBFIIbmB6AMROB7dfE+3ho="; 11 + sha256 = "sha256-bTzpiTqdAfo31sFRBCp0EzYMVjc6jt4aPK0VLsB9j0g="; 12 12 }; 13 13 14 14 vendorSha256 = null;
+9 -2
pkgs/development/tools/compile-daemon/default.nix
··· 1 - { lib, buildGoModule, fetchFromGitHub }: 1 + { lib, buildGoModule, fetchFromGitHub, fetchpatch }: 2 2 3 3 buildGoModule rec { 4 4 pname = "compile-daemon"; ··· 11 11 sha256 = "sha256-gpyXy7FO7ZVXJrkzcKHFez4S/dGiijXfZ9eSJtNlm58="; 12 12 }; 13 13 14 - vendorSha256 = "sha256-UDPOeg8jQbDB+Fr4x6ehK7UyQa8ySZy6yNxS1xotkgA="; 14 + vendorHash = "sha256-UpktrXY6OntOA1sxKq3qI59zrOwwCuM+gfGGxPmUJRo="; 15 + 16 + patches = [ 17 + (fetchpatch { 18 + url = "https://github.com/githubnemo/CompileDaemon/commit/39bc1352dc62fea06dff40c5eaef81ab1bdb1f14.patch"; 19 + hash = "sha256-Zftbw2nu8zzaoj0uwEwdq7xlyycdC0xxBu/qE9VHASI="; 20 + }) 21 + ]; 15 22 16 23 ldflags = [ "-s" "-w" ]; 17 24
+3 -3
pkgs/development/tools/continuous-integration/buildkite-agent/default.nix
··· 3 3 nixosTests }: 4 4 buildGoModule rec { 5 5 pname = "buildkite-agent"; 6 - version = "3.39.1"; 6 + version = "3.40.0"; 7 7 8 8 src = fetchFromGitHub { 9 9 owner = "buildkite"; 10 10 repo = "agent"; 11 11 rev = "v${version}"; 12 - sha256 = "sha256-sUBH0Oz1yeOgY5pmzM8XLoQ9vPiPODC6zeOO2n3meXs="; 12 + sha256 = "sha256-pd5B7RW13SWtOAwJGxhJBAhihCFkL3TokhWqcy7hVFk="; 13 13 }; 14 14 15 - vendorSha256 = "sha256-RD8BXwzrqHwgxdjpL++a9pIvzD9rfSTqguRVh+CbbnE="; 15 + vendorSha256 = "sha256-+LTjtJFHdYv0zeX8RpK0tuLWRpz5jXBwA7ZOvmA6YV0="; 16 16 17 17 postPatch = '' 18 18 substituteInPlace bootstrap/shell/shell.go --replace /bin/bash ${bash}/bin/bash
+2 -2
pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
··· 1 1 { lib, buildGoModule, fetchFromGitLab, fetchurl, bash }: 2 2 3 3 let 4 - version = "15.5.0"; 4 + version = "15.5.1"; 5 5 in 6 6 buildGoModule rec { 7 7 inherit version; ··· 23 23 owner = "gitlab-org"; 24 24 repo = "gitlab-runner"; 25 25 rev = "v${version}"; 26 - sha256 = "sha256-WdrvVmuYyFAMwUDEANOjXiPoQ8rvXbcQz5mBlWUL54k="; 26 + sha256 = "sha256-ZvQaA4DSuEIdHEoRKJg5tOnBQgf26paTAiWy6RLRG3o="; 27 27 }; 28 28 29 29 patches = [
+3 -3
pkgs/development/tools/misc/circleci-cli/default.nix
··· 2 2 3 3 buildGoModule rec { 4 4 pname = "circleci-cli"; 5 - version = "0.1.22322"; 5 + version = "0.1.22426"; 6 6 7 7 src = fetchFromGitHub { 8 8 owner = "CircleCI-Public"; 9 9 repo = pname; 10 10 rev = "v${version}"; 11 - sha256 = "sha256-HhQ2KZDu4X/extycQ9CZQYs8GjR5e93M0qw2cJsqj9E="; 11 + sha256 = "sha256-zGMaFRa0gR7Meyhm1lEn6klCB6T3iNFqAinLiIKstt4="; 12 12 }; 13 13 14 - vendorSha256 = "sha256-vydx3ZaVSpIn5nncuQhRVQqZ7920n1NAoZIHFvzrQgo="; 14 + vendorSha256 = "sha256-+gDRe62EJdTeZJAbEPmjo+7A3TTiwggW/w4WRj5ZxwM="; 15 15 16 16 nativeBuildInputs = [ installShellFiles ]; 17 17
+28
pkgs/development/tools/nc4nix/default.nix
··· 1 + { lib 2 + , buildGoModule 3 + , fetchFromGitLab 4 + }: 5 + 6 + buildGoModule rec { 7 + pname = "nc4nix"; 8 + version = "unstable-2022-08-06"; 9 + 10 + src = fetchFromGitLab { 11 + domain = "git.helsinki.tools"; 12 + owner = "helsinki-systems"; 13 + repo = "nc4nix"; 14 + rev = "91d92e8c339862fe81fb066fd370da7757042367"; 15 + sha256 = "sha256-8ggYOc+w3oiY2B0Ned5B26/ZNco2vCdvScC+Ms+gOWo="; 16 + }; 17 + 18 + vendorSha256 = "sha256-uhINWxFny/OY7M2vV3ehFzP90J6Z8cn5IZHWOuEg91M="; 19 + 20 + meta = with lib; { 21 + description = "Packaging helper for Nextcloud apps"; 22 + homepage = "https://git.helsinki.tools/helsinki-systems/nc4nix"; 23 + license = licenses.unfree; 24 + maintainers = with maintainers; [ onny ]; 25 + platforms = platforms.linux; 26 + }; 27 + } 28 +
+2 -2
pkgs/development/tools/ocaml/dune/3.nix
··· 6 6 7 7 stdenv.mkDerivation rec { 8 8 pname = "dune"; 9 - version = "3.4.1"; 9 + version = "3.5.0"; 10 10 11 11 src = fetchurl { 12 12 url = "https://github.com/ocaml/dune/releases/download/${version}/dune-${version}.tbz"; 13 - sha256 = "sha256-KZ+jPP/BCMwm/1nV/J0J9ssKs6woC/I6ARTP3AtAxsU="; 13 + sha256 = "sha256-d71MZwQ1n64ZaWNs/DzXpRe6NgSBnvickZwHYrUJNhA="; 14 14 }; 15 15 16 16 nativeBuildInputs = [ ocaml findlib ];
+3 -3
pkgs/development/tools/ruff/default.nix
··· 8 8 9 9 rustPlatform.buildRustPackage rec { 10 10 pname = "ruff"; 11 - version = "0.0.109"; 11 + version = "0.0.110"; 12 12 13 13 src = fetchFromGitHub { 14 14 owner = "charliermarsh"; 15 15 repo = pname; 16 16 rev = "v${version}"; 17 - sha256 = "sha256-11vaL8ztWLqhImQ4uzHPAwciHtegz320hDJq6kH8ujI="; 17 + sha256 = "sha256-L7LqIov0Ifz4wRV6FD4PIcUFauQCBaL8HXea400j0tE="; 18 18 }; 19 19 20 - cargoSha256 = "sha256-ixjH6gbgrcMtGeLFFyAPTmgF43UAzkhpxNp2S59iwIY="; 20 + cargoSha256 = "sha256-CcLNgZqcfJK/1DwLNP+GTej+OwmJ4w6SXob0Y3ccwS8="; 21 21 22 22 buildInputs = lib.optionals stdenv.isDarwin [ 23 23 CoreServices
+3 -3
pkgs/development/tools/rust/cargo-generate/default.nix
··· 10 10 11 11 rustPlatform.buildRustPackage rec { 12 12 pname = "cargo-generate"; 13 - version = "0.17.2"; 13 + version = "0.17.3"; 14 14 15 15 src = fetchFromGitHub { 16 16 owner = "cargo-generate"; 17 17 repo = "cargo-generate"; 18 18 rev = "v${version}"; 19 - sha256 = "sha256-so69T2mDq/nFGiug2zYIX6Z+Dhxk3riV+TkEYTpFrTg="; 19 + sha256 = "sha256-7F6Pqq/iFmI3JzDKoMmSyVm6BUr+Ev9GPidOofcLNV4="; 20 20 }; 21 21 22 22 # patch Cargo.toml to not vendor libgit2 and openssl 23 23 cargoPatches = [ ./no-vendor.patch ]; 24 24 25 - cargoSha256 = "sha256-JRoD6SuGQPJ8HOePXrH3avIY+sW61ErZFOHLafqmxMY="; 25 + cargoSha256 = "sha256-kC8BGobS1iMq+vIwE24Lip+HGdVnA/NjHFAb6cqOz44="; 26 26 27 27 nativeBuildInputs = [ pkg-config ]; 28 28
+30 -30
pkgs/os-specific/linux/kernel/hardened/patches.json
··· 2 2 "4.14": { 3 3 "patch": { 4 4 "extra": "-hardened1", 5 - "name": "linux-hardened-4.14.298-hardened1.patch", 6 - "sha256": "1gzp5fxyv5s029s6c9zrnvj3wb02blabmdmcziaqvf6k7k178prs", 7 - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.298-hardened1/linux-hardened-4.14.298-hardened1.patch" 5 + "name": "linux-hardened-4.14.299-hardened1.patch", 6 + "sha256": "1qgsi8kfbfqqkb2n0irqfrbq865dz4f5hmhxq7fbmnpacjgwdy6a", 7 + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.299-hardened1/linux-hardened-4.14.299-hardened1.patch" 8 8 }, 9 - "sha256": "0w8f7m3mdj6gcxdvsvxw5hqqfhwffpfl794rgianl4r6iad8w7s6", 10 - "version": "4.14.298" 9 + "sha256": "0p5ic2mrb9vl3qkzvqxhia3kygjv8xa6s1kqkwgd6b4rmq1kc8r6", 10 + "version": "4.14.299" 11 11 }, 12 12 "4.19": { 13 13 "patch": { 14 14 "extra": "-hardened1", 15 - "name": "linux-hardened-4.19.264-hardened1.patch", 16 - "sha256": "08swipghq66lx3nrww1319qwwgw3yipy5m4kvzpsz6mfhkm54aw9", 17 - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.264-hardened1/linux-hardened-4.19.264-hardened1.patch" 15 + "name": "linux-hardened-4.19.265-hardened1.patch", 16 + "sha256": "0psqvwqvq981hvix58z5bhc4xvgm2ic5y4q7bwsnh1cfvbfg6x2k", 17 + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.265-hardened1/linux-hardened-4.19.265-hardened1.patch" 18 18 }, 19 - "sha256": "07ihf55y4xcbzpfgj9mxzchy1jmdpy46j32w15hac46a4504xcps", 20 - "version": "4.19.264" 19 + "sha256": "1l5cdpgng1gci1p1gdr2jzqw486h3w56gpyc7fbq74hlc6nnwh1p", 20 + "version": "4.19.265" 21 21 }, 22 22 "5.10": { 23 23 "patch": { 24 24 "extra": "-hardened1", 25 - "name": "linux-hardened-5.10.153-hardened1.patch", 26 - "sha256": "02kw33m0j10dnl30n17ppffqh8l8v91jpz1d1pkqipfw3j40j8az", 27 - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.153-hardened1/linux-hardened-5.10.153-hardened1.patch" 25 + "name": "linux-hardened-5.10.154-hardened1.patch", 26 + "sha256": "0srwi4033h8ypxbwwp1hb3y989jvlwzckvsfjkxzgpnj91i68hn9", 27 + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.154-hardened1/linux-hardened-5.10.154-hardened1.patch" 28 28 }, 29 - "sha256": "0qhn5xv0m6baip1my1gp4mrjc4j6d6nbxa701vpwllg4kx8y9wiw", 30 - "version": "5.10.153" 29 + "sha256": "12763vlnrgmgj03khj9ls2g7zlhclj9g1l3008b36j9jli6kvbn6", 30 + "version": "5.10.154" 31 31 }, 32 32 "5.15": { 33 33 "patch": { 34 34 "extra": "-hardened1", 35 - "name": "linux-hardened-5.15.77-hardened1.patch", 36 - "sha256": "0pfa2xi64an716by3rqgn521a4igzb1y2bmbdn87icg8p79qavgx", 37 - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.77-hardened1/linux-hardened-5.15.77-hardened1.patch" 35 + "name": "linux-hardened-5.15.78-hardened1.patch", 36 + "sha256": "1aavp00rswqbbpbyx0c7k2ga6lcd221gcgr4893q7w5z26mv7wkd", 37 + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.78-hardened1/linux-hardened-5.15.78-hardened1.patch" 38 38 }, 39 - "sha256": "1yg9myqcv4kn2p7c9ap0z6xxh2qjsab2nbxf5z388skr6cgq8bql", 40 - "version": "5.15.77" 39 + "sha256": "16d4d4g5n2g6jpp8bvad1bm1l0b0nb4ckwsmq6w2g3538xrrzf8d", 40 + "version": "5.15.78" 41 41 }, 42 42 "5.4": { 43 43 "patch": { 44 44 "extra": "-hardened1", 45 - "name": "linux-hardened-5.4.223-hardened1.patch", 46 - "sha256": "1jsnrxv9a16l5gdhbn7w4rc9ql7arggvcizmkdvnk7ymd6ni6518", 47 - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.223-hardened1/linux-hardened-5.4.223-hardened1.patch" 45 + "name": "linux-hardened-5.4.224-hardened1.patch", 46 + "sha256": "1cx0h6sn8wdggg9nwqlrij7cfpa9q6nah73nrv92b4c9n8sjqiwq", 47 + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.224-hardened1/linux-hardened-5.4.224-hardened1.patch" 48 48 }, 49 - "sha256": "1svyf4m5d3vrskylpal6npk5jj454rzij772wabg31v8vw97zw4y", 50 - "version": "5.4.223" 49 + "sha256": "0dixs4w7nmkjgxv9dxgjdy8v6r4parkpqyvdfyr0wqk0amdz4zcb", 50 + "version": "5.4.224" 51 51 }, 52 52 "6.0": { 53 53 "patch": { 54 54 "extra": "-hardened1", 55 - "name": "linux-hardened-6.0.7-hardened1.patch", 56 - "sha256": "0y1g4zahlq28s8grzzpxcccr7sjh6cgbviz880g1wqg7vmqpi1fz", 57 - "url": "https://github.com/anthraxx/linux-hardened/releases/download/6.0.7-hardened1/linux-hardened-6.0.7-hardened1.patch" 55 + "name": "linux-hardened-6.0.8-hardened1.patch", 56 + "sha256": "08xvsqb3d0j98n2i4468ja9miydgy3kcrz66fbi1kymn79yam62n", 57 + "url": "https://github.com/anthraxx/linux-hardened/releases/download/6.0.8-hardened1/linux-hardened-6.0.8-hardened1.patch" 58 58 }, 59 - "sha256": "03srfv33r2vc48h051zicvn9hz78kc08vh7ljzlmcnk0g0mwrnk7", 60 - "version": "6.0.7" 59 + "sha256": "0mx2bxgnxm3vz688268939xw90jqci7xn992kfpny74mjqwzir0d", 60 + "version": "6.0.8" 61 61 } 62 62 }
+2 -2
pkgs/os-specific/linux/kernel/linux-4.14.nix
··· 3 3 with lib; 4 4 5 5 buildLinux (args // rec { 6 - version = "4.14.298"; 6 + version = "4.14.299"; 7 7 8 8 # modDirVersion needs to be x.y.z, will automatically add .0 if needed 9 9 modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; ··· 13 13 14 14 src = fetchurl { 15 15 url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; 16 - sha256 = "0w8f7m3mdj6gcxdvsvxw5hqqfhwffpfl794rgianl4r6iad8w7s6"; 16 + sha256 = "0p5ic2mrb9vl3qkzvqxhia3kygjv8xa6s1kqkwgd6b4rmq1kc8r6"; 17 17 }; 18 18 } // (args.argsOverride or {}))
+2 -2
pkgs/os-specific/linux/kernel/linux-4.19.nix
··· 3 3 with lib; 4 4 5 5 buildLinux (args // rec { 6 - version = "4.19.264"; 6 + version = "4.19.265"; 7 7 8 8 # modDirVersion needs to be x.y.z, will automatically add .0 if needed 9 9 modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; ··· 13 13 14 14 src = fetchurl { 15 15 url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; 16 - sha256 = "07ihf55y4xcbzpfgj9mxzchy1jmdpy46j32w15hac46a4504xcps"; 16 + sha256 = "1l5cdpgng1gci1p1gdr2jzqw486h3w56gpyc7fbq74hlc6nnwh1p"; 17 17 }; 18 18 } // (args.argsOverride or {}))
+2 -2
pkgs/os-specific/linux/kernel/linux-5.10.nix
··· 3 3 with lib; 4 4 5 5 buildLinux (args // rec { 6 - version = "5.10.153"; 6 + version = "5.10.154"; 7 7 8 8 # modDirVersion needs to be x.y.z, will automatically add .0 if needed 9 9 modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; ··· 13 13 14 14 src = fetchurl { 15 15 url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; 16 - sha256 = "0qhn5xv0m6baip1my1gp4mrjc4j6d6nbxa701vpwllg4kx8y9wiw"; 16 + sha256 = "12763vlnrgmgj03khj9ls2g7zlhclj9g1l3008b36j9jli6kvbn6"; 17 17 }; 18 18 } // (args.argsOverride or {}))
+2 -2
pkgs/os-specific/linux/kernel/linux-5.15.nix
··· 3 3 with lib; 4 4 5 5 buildLinux (args // rec { 6 - version = "5.15.77"; 6 + version = "5.15.78"; 7 7 8 8 # modDirVersion needs to be x.y.z, will automatically add .0 if needed 9 9 modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; ··· 13 13 14 14 src = fetchurl { 15 15 url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; 16 - sha256 = "1yg9myqcv4kn2p7c9ap0z6xxh2qjsab2nbxf5z388skr6cgq8bql"; 16 + sha256 = "16d4d4g5n2g6jpp8bvad1bm1l0b0nb4ckwsmq6w2g3538xrrzf8d"; 17 17 }; 18 18 } // (args.argsOverride or { }))
+2 -2
pkgs/os-specific/linux/kernel/linux-5.4.nix
··· 3 3 with lib; 4 4 5 5 buildLinux (args // rec { 6 - version = "5.4.223"; 6 + version = "5.4.224"; 7 7 8 8 # modDirVersion needs to be x.y.z, will automatically add .0 if needed 9 9 modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; ··· 13 13 14 14 src = fetchurl { 15 15 url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; 16 - sha256 = "1svyf4m5d3vrskylpal6npk5jj454rzij772wabg31v8vw97zw4y"; 16 + sha256 = "0dixs4w7nmkjgxv9dxgjdy8v6r4parkpqyvdfyr0wqk0amdz4zcb"; 17 17 }; 18 18 } // (args.argsOverride or {}))
+2 -2
pkgs/os-specific/linux/kernel/linux-6.0.nix
··· 3 3 with lib; 4 4 5 5 buildLinux (args // rec { 6 - version = "6.0.7"; 6 + version = "6.0.8"; 7 7 8 8 # modDirVersion needs to be x.y.z, will automatically add .0 if needed 9 9 modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; ··· 13 13 14 14 src = fetchurl { 15 15 url = "mirror://kernel/linux/kernel/v6.x/linux-${version}.tar.xz"; 16 - sha256 = "03srfv33r2vc48h051zicvn9hz78kc08vh7ljzlmcnk0g0mwrnk7"; 16 + sha256 = "0mx2bxgnxm3vz688268939xw90jqci7xn992kfpny74mjqwzir0d"; 17 17 }; 18 18 } // (args.argsOverride or { }))
+3 -3
pkgs/os-specific/linux/kernel/linux-rt-5.10.nix
··· 6 6 , ... } @ args: 7 7 8 8 let 9 - version = "5.10.152-rt75"; # updated by ./update-rt.sh 9 + version = "5.10.153-rt76"; # updated by ./update-rt.sh 10 10 branch = lib.versions.majorMinor version; 11 11 kversion = builtins.elemAt (lib.splitString "-" version) 0; 12 12 in buildLinux (args // { ··· 18 18 19 19 src = fetchurl { 20 20 url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz"; 21 - sha256 = "19nq2pgy4vmn30nywdvcvsx4vhmndrj97iiclpqakzgblj1mq2zs"; 21 + sha256 = "0qhn5xv0m6baip1my1gp4mrjc4j6d6nbxa701vpwllg4kx8y9wiw"; 22 22 }; 23 23 24 24 kernelPatches = let rt-patch = { 25 25 name = "rt"; 26 26 patch = fetchurl { 27 27 url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; 28 - sha256 = "0sg78zrkk7scg6b2xcvdymmhfdrlzcajhzzway5gjdi04x4vy4k0"; 28 + sha256 = "12gf2nnnfcbmyp34xnns35qpnzsnwjilq2qs1xvq6m51gcnnzq7g"; 29 29 }; 30 30 }; in [ rt-patch ] ++ kernelPatches; 31 31
+3 -3
pkgs/os-specific/linux/kernel/linux-rt-5.4.nix
··· 6 6 , ... } @ args: 7 7 8 8 let 9 - version = "5.4.209-rt77"; # updated by ./update-rt.sh 9 + version = "5.4.221-rt79"; # updated by ./update-rt.sh 10 10 branch = lib.versions.majorMinor version; 11 11 kversion = builtins.elemAt (lib.splitString "-" version) 0; 12 12 in buildLinux (args // { ··· 14 14 15 15 src = fetchurl { 16 16 url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz"; 17 - sha256 = "1kdnz99k7zspzaxqaxahbf6hncigy4cvjlb79jsy7a95qxxr31qf"; 17 + sha256 = "02nz9534998s922fdb0kpb09flgjmc7p78x0ypfxrd6pzv0pzcr7"; 18 18 }; 19 19 20 20 kernelPatches = let rt-patch = { 21 21 name = "rt"; 22 22 patch = fetchurl { 23 23 url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; 24 - sha256 = "1wh5m7ychgnn33yg7gg9nlwcmmm72dixvdf77m764hs90xl8c9ig"; 24 + sha256 = "0zcakr41m1n683pwcm6d698nwgg7jyr7n8c63jmqh0959xxb2axy"; 25 25 }; 26 26 }; in [ rt-patch ] ++ kernelPatches; 27 27
+2 -2
pkgs/servers/computing/slurm/default.nix
··· 14 14 15 15 stdenv.mkDerivation rec { 16 16 pname = "slurm"; 17 - version = "22.05.5.1"; 17 + version = "22.05.6.1"; 18 18 19 19 # N.B. We use github release tags instead of https://www.schedmd.com/downloads.php 20 20 # because the latter does not keep older releases. ··· 23 23 repo = "slurm"; 24 24 # The release tags use - instead of . 25 25 rev = "${pname}-${builtins.replaceStrings ["."] ["-"] version}"; 26 - sha256 = "1mw0dkll1iwwdpdbxcy26zpnjgj07prlgdz2da64krn4yyfhca30"; 26 + sha256 = "1aa1ddlacr9dpk1g1syj9ml5dninv3dzvw8vlm1s3j3ybp6lz8bd"; 27 27 }; 28 28 29 29 outputs = [ "out" "dev" ];
+3 -3
pkgs/servers/monitoring/cadvisor/default.nix
··· 2 2 3 3 buildGoModule rec { 4 4 pname = "cadvisor"; 5 - version = "0.45.0"; 5 + version = "0.46.0"; 6 6 7 7 src = fetchFromGitHub { 8 8 owner = "google"; 9 9 repo = "cadvisor"; 10 10 rev = "v${version}"; 11 - sha256 = "sha256-hH3unhGRrB8IegVaX+j2idY0woMqzchEEXZB/ppzIf0="; 11 + sha256 = "sha256-ciGj8SK7OgK3x8Njih4aIQ0vvNV9s5/w2i+DF/vw1O8="; 12 12 }; 13 13 14 14 modRoot = "./cmd"; 15 15 16 - vendorSha256 = "sha256-Mcelh/nYFcNTrI1Kq9KqkJeSnbgJhd7HfbexhNYbPFg="; 16 + vendorSha256 = "sha256-dg+osxsxdJ8Tg++wdd4L6FMjiPLLFQj0NXb2aSC7vQg="; 17 17 18 18 ldflags = [ "-s" "-w" "-X github.com/google/cadvisor/version.Version=${version}" ]; 19 19
+33 -1
pkgs/tools/graphics/jhead/default.nix
··· 1 - { lib, stdenv, fetchFromGitHub, libjpeg }: 1 + { lib, stdenv, fetchFromGitHub, libjpeg, fetchpatch }: 2 2 3 3 stdenv.mkDerivation rec { 4 4 pname = "jhead"; ··· 10 10 rev = version; 11 11 sha256 = "0zgh36486cpcnf7xg6dwf7rhz2h4gpayqvdk8hmrx6y418b2pfyf"; 12 12 }; 13 + 14 + patches = [ 15 + # Just a spelling/whitespace change, but makes it easier to apply the rest. 16 + (fetchpatch { 17 + url = "https://github.com/Matthias-Wandel/jhead/commit/8384c6fd2ebfb8eb8bd96616343e73af0e575131.patch"; 18 + sha256 = "sha256-f3FOIqgFr5QPAsBjvUVAOf1CAqw8pNAVx+pZZuMjq3c="; 19 + includes = [ "jhead.c" ]; 20 + }) 21 + (fetchpatch { 22 + url = "https://github.com/Matthias-Wandel/jhead/commit/63aff8e9bd8c970fedf87f0ec3a1f3368bf2421e.patch"; 23 + sha256 = "sha256-jyhGdWuwd/eP5uuS8uLYiTJZJdxxLYdsvl0jnQC+Y5c="; 24 + includes = [ "jhead.c" ]; 25 + }) 26 + 27 + # Fixes around CVE-2022-41751 28 + (fetchpatch { 29 + url = "https://github.com/Matthias-Wandel/jhead/commit/6985da52c9ad4f5f6c247269cb5508fae34a971c.patch"; 30 + sha256 = "sha256-8Uw0Udr9aZEMrD/0zS498MVw+rJqpFukvjb7FgzjgT4="; 31 + }) 32 + (fetchpatch { 33 + url = "https://github.com/Matthias-Wandel/jhead/commit/3fe905cf674f8dbac8a89e58cee1b4850abf9530.patch"; 34 + sha256 = "sha256-5995EV/pOktZc45c7fLl+oQqyutRDQJl3eNutR1JGJo="; 35 + }) 36 + (fetchpatch { 37 + url = "https://github.com/joachim-reichel/jhead/commit/ec67262b8e5a4b05d8ad6898a09f1dc3fc032062.patch"; 38 + sha256 = "sha256-a3KogIV45cRNthJSPygIRw1m2KBJZJSIGSWfsr7FWs4="; 39 + }) 40 + (fetchpatch { 41 + url = "https://github.com/joachim-reichel/jhead/commit/65de38cb68747c6f8397608b56b58ce15271a1fe.patch"; 42 + sha256 = "sha256-xf0d2hxW4rVZwffrYJVVFQ3cDMOcPoGbCdrrQKxf16M="; 43 + }) 44 + ]; 13 45 14 46 buildInputs = [ libjpeg ]; 15 47
+3 -3
pkgs/tools/misc/chezmoi/default.nix
··· 2 2 3 3 buildGoModule rec { 4 4 pname = "chezmoi"; 5 - version = "2.26.0"; 5 + version = "2.27.0"; 6 6 7 7 src = fetchFromGitHub { 8 8 owner = "twpayne"; 9 9 repo = "chezmoi"; 10 10 rev = "v${version}"; 11 - sha256 = "sha256-2NtYaKZiUPp33wZuH4pA0uSPdu8xxQASPlsSqjRDTRc="; 11 + sha256 = "sha256-NOU4rSV4DRk+auvhKjI9tWWL5E3N3w4x9z0wRKjNznw="; 12 12 }; 13 13 14 - vendorSha256 = "sha256-iDzVe8wnvJlrY8F+LyzLkX+BlvkgUPOEDQqkUPNDuUg="; 14 + vendorSha256 = "sha256-XY5D74fIgOCLtnUpQf+kGYARuAulhlQIG7G+GriDOSw="; 15 15 16 16 doCheck = false; 17 17
+8 -7
pkgs/tools/misc/yajsv/default.nix
··· 1 1 { buildGoModule, fetchFromGitHub, lib }: 2 2 3 - let version = "1.4.0"; 4 - in buildGoModule { 3 + let 4 + version = "1.4.1"; 5 + in 6 + buildGoModule { 5 7 pname = "yajsv"; 6 8 version = version; 7 9 ··· 9 11 owner = "neilpa"; 10 12 repo = "yajsv"; 11 13 rev = "v${version}"; 12 - sha256 = "0smaij3905fqgcjmnfs58r6silhp3hyv7ccshk7n13fmllmsm7v7"; 14 + hash = "sha256-dp7PBN8yR+gPPUWA+ug11dUN7slU6CJAojuxt5eNTxA="; 13 15 }; 14 16 15 - patches = [ 16 - ./go.mod.patch 17 - ]; 17 + vendorHash = "sha256-f45climGKl7HxD+1vz2TGqW/d0dqJ0RfvgJoRRM6lUk="; 18 18 19 - vendorSha256 = "0jcm789las02prgl89va8xvvz98sjcyvzd9zqk3mwal656b5r3kz"; 19 + ldflags = [ "-s" "-w" ]; 20 20 21 21 doInstallCheck = true; 22 + 22 23 installCheckPhase = '' 23 24 $out/bin/yajsv -v > /dev/null 24 25 '';
-30
pkgs/tools/misc/yajsv/go.mod.patch
··· 1 - diff --git a/go.mod b/go.mod 2 - index 9f96eaf..360ab47 100644 3 - --- a/go.mod 4 - +++ b/go.mod 5 - @@ -7,5 +7,6 @@ require ( 6 - github.com/ghodss/yaml v1.0.0 7 - github.com/mitchellh/go-homedir v1.1.0 8 - github.com/xeipuuv/gojsonschema v1.2.0 9 - + golang.org/x/text v0.3.7 10 - gopkg.in/yaml.v2 v2.2.8 // indirect 11 - ) 12 - diff --git a/go.sum b/go.sum 13 - index 5b7e5c4..4b002ef 100644 14 - --- a/go.sum 15 - +++ b/go.sum 16 - @@ -1,4 +1,3 @@ 17 - -github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= 18 - github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= 19 - github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= 20 - github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= 21 - @@ -17,6 +16,9 @@ github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 h1:EzJWgHo 22 - github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ= 23 - github.com/xeipuuv/gojsonschema v1.2.0 h1:LhYJRs+L4fBtjZUfuSZIKGeVu0QRy8e5Xi7D17UxZ74= 24 - github.com/xeipuuv/gojsonschema v1.2.0/go.mod h1:anYRn/JVcOK2ZgGU+IjEV4nwlhoK5sQluxsYJ78Id3Y= 25 - +golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk= 26 - +golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= 27 - +golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= 28 - gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= 29 - gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= 30 - gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
+2 -2
pkgs/tools/misc/yt-dlp/default.nix
··· 20 20 # The websites yt-dlp deals with are a very moving target. That means that 21 21 # downloads break constantly. Because of that, updates should always be backported 22 22 # to the latest stable release. 23 - version = "2022.10.4"; 23 + version = "2022.11.11"; 24 24 25 25 src = fetchPypi { 26 26 inherit pname version; 27 - sha256 = "sha256-F3Ki5vMrlxtNAm3q4wRPV2uAUgNSVco0DzRc/pDTjTg="; 27 + sha256 = "sha256-9rliAjwXp3FRR28Pbtcb6H0Bdim6XZmUUovFSFIRkbY="; 28 28 }; 29 29 30 30 propagatedBuildInputs = [ brotli certifi mutagen pycryptodomex websockets ];
+3 -3
pkgs/tools/networking/minio-client/default.nix
··· 2 2 3 3 buildGoModule rec { 4 4 pname = "minio-client"; 5 - version = "2022-10-29T10-09-23Z"; 5 + version = "2022-11-07T23-47-39Z"; 6 6 7 7 src = fetchFromGitHub { 8 8 owner = "minio"; 9 9 repo = "mc"; 10 10 rev = "RELEASE.${version}"; 11 - sha256 = "sha256-9fXxHfSA/h6JjhKEY7PmPBJX1P127V+AekrBPFQEtSI="; 11 + sha256 = "sha256-g7q2VONGySMlw+aWZfWnZ2TVvV4lOGMNXl/4IRQrEOs="; 12 12 }; 13 13 14 - vendorSha256 = "sha256-vW/hGvzAtd/q9Fbjr19TvpSZzFVX9HSGGSPWErw+v0A="; 14 + vendorSha256 = "sha256-KD3mhl5d3LhqH37AeNmfuk5+KktWdUTNGi5YNuhyMDk="; 15 15 16 16 subPackages = [ "." ]; 17 17
+2 -3
pkgs/tools/networking/networkmanager/applet/default.nix
··· 25 25 26 26 stdenv.mkDerivation rec { 27 27 pname = "network-manager-applet"; 28 - version = "1.28.0"; 28 + version = "1.30.0"; 29 29 30 30 src = fetchurl { 31 31 url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; 32 - sha256 = "sha256-XANIWB3p5hkYWqdLdH8H9AMSQX45Wv4LKTzJVd8U5Jw="; 32 + sha256 = "sha256-lRa4Tp2fEA24mgxny/5XztsFYjENRcqvtjMuJ7vrXNM="; 33 33 }; 34 34 35 35 mesonFlags = [ ··· 43 43 libnma 44 44 gtk3 45 45 networkmanager 46 - libnotify 47 46 libsecret 48 47 gsettings-desktop-schemas 49 48 polkit
+3 -3
pkgs/tools/security/gopass/default.nix
··· 13 13 14 14 buildGoModule rec { 15 15 pname = "gopass"; 16 - version = "1.14.9"; 16 + version = "1.14.10"; 17 17 18 18 nativeBuildInputs = [ installShellFiles makeWrapper ]; 19 19 ··· 21 21 owner = "gopasspw"; 22 22 repo = pname; 23 23 rev = "v${version}"; 24 - hash = "sha256-yVmEqT+pVU3ww1PUs30pr7fE3pprhVnDhlErdMD/KL8="; 24 + hash = "sha256-a+JE/s94ynazX50LxVyywzVI5JINK22H76HHwEtw7K0="; 25 25 }; 26 26 27 - vendorHash = "sha256-efmBuaH4ZMYZixcafe7mB1jj5h0o8RE+kMB3K35aG4k="; 27 + vendorHash = "sha256-2TlV2cRV/1kugDWo9mhQfDy5jRm6LzTIW54BhZlVt+0="; 28 28 29 29 subPackages = [ "." ]; 30 30
+5 -7
pkgs/top-level/all-packages.nix
··· 18691 18691 18692 18692 elfio = callPackage ../development/libraries/elfio { }; 18693 18693 18694 + emanote = haskell.lib.compose.justStaticExecutables haskellPackages.emanote; 18695 + 18694 18696 enchant1 = callPackage ../development/libraries/enchant/1.x.nix { }; 18695 18697 18696 18698 enchant2 = callPackage ../development/libraries/enchant/2.x.nix { }; ··· 30943 30945 30944 30946 navipowm = callPackage ../applications/misc/navipowm { }; 30945 30947 30948 + nc4nix = callPackage ../development/tools/nc4nix { }; 30949 + 30946 30950 netbeans = callPackage ../applications/editors/netbeans { 30947 30951 jdk = jdk17; 30948 30952 }; ··· 31010 31014 inherit (darwin.apple_sdk.frameworks) Foundation; 31011 31015 }; 31012 31016 31013 - obs-studio27 = libsForQt5.callPackage ../applications/video/obs-studio/27.nix { 31014 - ffmpeg_4 = ffmpeg-full; 31015 - }; 31016 - 31017 - obs-studio28 = qt6Packages.callPackage ../applications/video/obs-studio/28.nix { 31017 + obs-studio = qt6Packages.callPackage ../applications/video/obs-studio { 31018 31018 ffmpeg_4 = ffmpeg-full; 31019 31019 }; 31020 - 31021 - obs-studio = obs-studio28; 31022 31020 31023 31021 obs-studio-plugins = recurseIntoAttrs (callPackage ../applications/video/obs-studio/plugins {}); 31024 31022 wrapOBS = callPackage ../applications/video/obs-studio/wrapper.nix {};
+57 -2
pkgs/top-level/haskell-packages.nix
··· 17 17 "ghc902" 18 18 "ghc90" 19 19 "ghc924" 20 + "ghc925" 20 21 "ghc92" 21 22 "ghc942" 23 + "ghc943" 22 24 "ghc94" 23 25 "ghcHEAD" 24 26 ]; ··· 28 30 "ghc902" 29 31 "ghc92" 30 32 "ghc924" 33 + "ghc925" 31 34 "ghc94" 32 35 "ghc942" 36 + "ghc943" 33 37 "ghcHEAD" 34 38 ]; 35 39 ··· 164 168 buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_12; 165 169 llvmPackages = pkgs.llvmPackages_12; 166 170 }; 171 + ghc925 = callPackage ../development/compilers/ghc/9.2.5.nix { 172 + bootPkgs = 173 + # aarch64 ghc8107Binary exceeds max output size on hydra 174 + if stdenv.hostPlatform.isAarch then 175 + packages.ghc8107BinaryMinimal 176 + else if stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isLittleEndian then 177 + packages.ghc810 178 + else 179 + packages.ghc8107Binary; 180 + inherit (buildPackages.python3Packages) sphinx; 181 + # Need to use apple's patched xattr until 182 + # https://github.com/xattr/xattr/issues/44 and 183 + # https://github.com/xattr/xattr/issues/55 are solved. 184 + inherit (buildPackages.darwin) xattr autoSignDarwinBinariesHook; 185 + buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_12; 186 + llvmPackages = pkgs.llvmPackages_12; 187 + }; 167 188 ghc92 = ghc924; 168 189 ghc942 = callPackage ../development/compilers/ghc/9.4.2.nix { 169 190 bootPkgs = ··· 189 210 buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_12; 190 211 llvmPackages = pkgs.llvmPackages_12; 191 212 }; 213 + ghc943 = callPackage ../development/compilers/ghc/9.4.3.nix { 214 + bootPkgs = 215 + # Building with 9.2 is broken due to 216 + # https://gitlab.haskell.org/ghc/ghc/-/issues/21914 217 + # Use 8.10 as a workaround where possible to keep bootstrap path short. 218 + 219 + # On ARM text won't build with GHC 8.10.* 220 + if stdenv.hostPlatform.isAarch then 221 + # TODO(@sternenseemann): package bindist 222 + packages.ghc902 223 + # No suitable bindists for powerpc64le 224 + else if stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isLittleEndian then 225 + packages.ghc902 226 + else 227 + packages.ghc8107Binary; 228 + inherit (buildPackages.python3Packages) sphinx; 229 + # Need to use apple's patched xattr until 230 + # https://github.com/xattr/xattr/issues/44 and 231 + # https://github.com/xattr/xattr/issues/55 are solved. 232 + inherit (buildPackages.darwin) xattr autoSignDarwinBinariesHook; 233 + # Support range >= 10 && < 14 234 + buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_12; 235 + llvmPackages = pkgs.llvmPackages_12; 236 + }; 192 237 ghc94 = ghc942; 193 238 ghcHEAD = callPackage ../development/compilers/ghc/head.nix { 194 239 bootPkgs = 195 - # For GHC 9.2.3 and 9.2.4 no armv7l bindists are available. 240 + # For GHC 9.2 no armv7l bindists are available. 196 241 if stdenv.hostPlatform.isAarch32 then 197 242 packages.ghc924 198 243 else if stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isLittleEndian then ··· 310 355 ghc = bh.compiler.ghc924; 311 356 compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.2.x.nix { }; 312 357 }; 358 + ghc925 = callPackage ../development/haskell-modules { 359 + buildHaskellPackages = bh.packages.ghc925; 360 + ghc = bh.compiler.ghc925; 361 + compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.2.x.nix { }; 362 + }; 313 363 ghc92 = ghc924; 314 364 ghc942 = callPackage ../development/haskell-modules { 315 365 buildHaskellPackages = bh.packages.ghc942; 316 366 ghc = bh.compiler.ghc942; 317 367 compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.4.x.nix { }; 318 368 }; 319 - ghc94= ghc942; 369 + ghc943 = callPackage ../development/haskell-modules { 370 + buildHaskellPackages = bh.packages.ghc943; 371 + ghc = bh.compiler.ghc943; 372 + compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.4.x.nix { }; 373 + }; 374 + ghc94 = ghc942; 320 375 ghcHEAD = callPackage ../development/haskell-modules { 321 376 buildHaskellPackages = bh.packages.ghcHEAD; 322 377 ghc = bh.compiler.ghcHEAD;
+2
pkgs/top-level/ocaml-packages.nix
··· 956 956 else 957 957 null; 958 958 959 + ocamlc-loc = callPackage ../development/ocaml-modules/ocamlc-loc { }; 960 + 959 961 ocaml_cryptgps = callPackage ../development/ocaml-modules/cryptgps { }; 960 962 961 963 ocaml_expat =
+9 -1
pkgs/top-level/release-haskell.nix
··· 53 53 ghc8107 54 54 ghc902 55 55 ghc924 56 + ghc925 56 57 ghc942 58 + ghc943 57 59 ]; 58 60 59 61 # packagePlatforms applied to `haskell.packages.*` ··· 178 180 dhall-nix 179 181 diagrams-builder 180 182 elm2nix 183 + emanote 181 184 fffuu 182 185 futhark 183 186 ghcid ··· 334 337 }; 335 338 336 339 haskell.packages.native-bignum.ghc924 = { 337 - inherit (packagePlatforms pkgs.pkgsStatic.haskell.packages.native-bignum.ghc92) 340 + inherit (packagePlatforms pkgs.pkgsStatic.haskell.packages.native-bignum.ghc924) 338 341 hello 339 342 lens 340 343 random ··· 366 369 compilerNames.ghc8107 367 370 compilerNames.ghc902 368 371 compilerNames.ghc924 372 + compilerNames.ghc925 369 373 # https://github.com/ndmitchell/hlint/issues/1413 370 374 ]; 371 375 hpack = released; ··· 393 397 compilerNames.ghc8107 394 398 compilerNames.ghc902 395 399 compilerNames.ghc924 400 + compilerNames.ghc925 396 401 ]; 397 402 purescript = [ 398 403 compilerNames.ghc924 404 + compilerNames.ghc925 399 405 ]; 400 406 purescript-cst = [ 401 407 compilerNames.ghc8107 ··· 470 476 jobs.pkgsMusl.haskell.compiler.ghc8107 471 477 jobs.pkgsMusl.haskell.compiler.ghc902 472 478 jobs.pkgsMusl.haskell.compiler.ghc924 479 + jobs.pkgsMusl.haskell.compiler.ghc925 473 480 jobs.pkgsMusl.haskell.compiler.ghcHEAD 474 481 jobs.pkgsMusl.haskell.compiler.integer-simple.ghc8107 475 482 jobs.pkgsMusl.haskell.compiler.native-bignum.ghc902 476 483 jobs.pkgsMusl.haskell.compiler.native-bignum.ghc924 484 + jobs.pkgsMusl.haskell.compiler.native-bignum.ghc925 477 485 jobs.pkgsMusl.haskell.compiler.native-bignum.ghcHEAD 478 486 ]; 479 487 };