Merge staging-next into staging

authored by

github-actions[bot] and committed by
GitHub
3bc17773 7bf8b97d

+1060 -227
+7
lib/types.nix
··· 287 287 merge = mergeEqualOption; 288 288 }; 289 289 290 + nonEmptyStr = mkOptionType { 291 + name = "nonEmptyStr"; 292 + description = "non-empty string"; 293 + check = x: str.check x && builtins.match "[ \t\n]*" x == null; 294 + inherit (str) merge; 295 + }; 296 + 290 297 strMatching = pattern: mkOptionType { 291 298 name = "strMatching ${escapeNixString pattern}"; 292 299 description = "string matching the pattern ${pattern}";
+10 -1
nixos/modules/config/swap.nix
··· 127 127 ''; 128 128 }; 129 129 130 + options = mkOption { 131 + default = [ "defaults" ]; 132 + example = [ "nofail" ]; 133 + type = types.listOf types.nonEmptyStr; 134 + description = '' 135 + Options used to mount the swap. 136 + ''; 137 + }; 138 + 130 139 deviceName = mkOption { 131 140 type = types.str; 132 141 internal = true; ··· 215 224 fi 216 225 ''} 217 226 ${optionalString sw.randomEncryption.enable '' 218 - cryptsetup plainOpen -c ${sw.randomEncryption.cipher} -d ${sw.randomEncryption.source} ${sw.device} ${sw.deviceName} 227 + cryptsetup plainOpen -c ${sw.randomEncryption.cipher} -d ${sw.randomEncryption.source} ${optionalString (sw.discardPolicy != null) "--allow-discards"} ${sw.device} ${sw.deviceName} 219 228 mkswap ${sw.realDevice} 220 229 ''} 221 230 '';
-1
nixos/modules/services/web-apps/nextcloud.nix
··· 699 699 }; 700 700 extraConfig = '' 701 701 index index.php index.html /index.php$request_uri; 702 - expires 1m; 703 702 add_header X-Content-Type-Options nosniff; 704 703 add_header X-XSS-Protection "1; mode=block"; 705 704 add_header X-Robots-Tag none;
+1 -1
nixos/modules/tasks/filesystems.nix
··· 255 255 # https://wiki.archlinux.org/index.php/fstab#Filepath_spaces 256 256 escape = string: builtins.replaceStrings [ " " "\t" ] [ "\\040" "\\011" ] string; 257 257 swapOptions = sw: concatStringsSep "," ( 258 - [ "defaults" ] 258 + sw.options 259 259 ++ optional (sw.priority != null) "pri=${toString sw.priority}" 260 260 ++ optional (sw.discardPolicy != null) "discard${optionalString (sw.discardPolicy != "both") "=${toString sw.discardPolicy}"}" 261 261 );
+2 -1
nixos/tests/chromium.nix
··· 239 239 240 240 241 241 with test_new_win("gpu_info", "chrome://gpu", "chrome://gpu"): 242 - pass 242 + # To check the text rendering (catches regressions like #131074): 243 + machine.wait_for_text("Graphics Feature Status") 243 244 244 245 245 246 machine.shutdown()
+2 -2
pkgs/applications/misc/bemenu/default.nix
··· 11 11 12 12 stdenv.mkDerivation rec { 13 13 pname = "bemenu"; 14 - version = "0.6.2"; 14 + version = "0.6.3"; 15 15 16 16 src = fetchFromGitHub { 17 17 owner = "Cloudef"; 18 18 repo = pname; 19 19 rev = version; 20 - sha256 = "sha256-2xmi/Mh5iU50yc2R1x1yzP8Xaz+mUgLnH73tAeLwxI8="; 20 + sha256 = "sha256-U4IMfDvQ0rfEJhE3Uext2c/Cs0mjy1tw+k8uk441Ag8="; 21 21 }; 22 22 23 23 nativeBuildInputs = [ pkg-config pcre ];
+22 -13
pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
··· 1 1 { mkDerivation, lib, fetchFromGitHub, callPackage, fetchpatch 2 - , pkg-config, cmake, ninja, python3, wrapGAppsHook, wrapQtAppsHook, removeReferencesTo 2 + , pkg-config, cmake, ninja, python3, wrapGAppsHook, wrapQtAppsHook 3 3 , qtbase, qtimageformats, gtk3, libsForQt5, lz4, xxHash 4 4 , ffmpeg, openalSoft, minizip, libopus, alsa-lib, libpulseaudio, range-v3 5 5 , tl-expected, hunspell, glibmm, webkitgtk, jemalloc 6 - , libtgvoip, rnnoise, abseil-cpp, extra-cmake-modules 6 + , rnnoise, extra-cmake-modules 7 7 # Transitive dependencies: 8 - , pcre, xorg, util-linux, libselinux, libsepol, epoxy 8 + , pcre, xorg, util-linuxMinimal, libselinux, libsepol, epoxy 9 9 , at-spi2-core, libXtst, libthai, libdatrie 10 10 , xdg-utils, libsysprof-capture, libpsl, brotli 11 11 }: ··· 46 46 postPatch = '' 47 47 substituteInPlace Telegram/CMakeLists.txt \ 48 48 --replace '"''${TDESKTOP_LAUNCHER_BASENAME}.appdata.xml"' '"''${TDESKTOP_LAUNCHER_BASENAME}.metainfo.xml"' 49 + 50 + substituteInPlace Telegram/ThirdParty/libtgvoip/os/linux/AudioInputALSA.cpp \ 51 + --replace '"libasound.so.2"' '"${alsa-lib}/lib/libasound.so.2"' 52 + substituteInPlace Telegram/ThirdParty/libtgvoip/os/linux/AudioOutputALSA.cpp \ 53 + --replace '"libasound.so.2"' '"${alsa-lib}/lib/libasound.so.2"' 54 + substituteInPlace Telegram/ThirdParty/libtgvoip/os/linux/AudioPulse.cpp \ 55 + --replace '"libpulse.so.0"' '"${libpulseaudio}/lib/libpulse.so.0"' 49 56 ''; 50 57 51 58 # We want to run wrapProgram manually (with additional parameters) 52 59 dontWrapGApps = true; 53 60 dontWrapQtApps = true; 54 61 55 - nativeBuildInputs = [ pkg-config cmake ninja python3 wrapGAppsHook wrapQtAppsHook removeReferencesTo ]; 62 + nativeBuildInputs = [ 63 + pkg-config cmake ninja python3 wrapGAppsHook wrapQtAppsHook 64 + extra-cmake-modules 65 + ]; 56 66 57 67 buildInputs = [ 58 68 qtbase qtimageformats gtk3 libsForQt5.kwayland libsForQt5.libdbusmenu lz4 xxHash 59 69 ffmpeg openalSoft minizip libopus alsa-lib libpulseaudio range-v3 60 70 tl-expected hunspell glibmm webkitgtk jemalloc 61 - libtgvoip rnnoise abseil-cpp extra-cmake-modules 71 + rnnoise 62 72 tg_owt 63 73 # Transitive dependencies: 64 - pcre xorg.libpthreadstubs xorg.libXdmcp util-linux libselinux libsepol epoxy 74 + util-linuxMinimal # Required for libmount thus not nativeBuildInputs. 75 + pcre xorg.libpthreadstubs xorg.libXdmcp libselinux libsepol epoxy 65 76 at-spi2-core libXtst libthai libdatrie libsysprof-capture libpsl brotli 66 77 ]; 67 78 ··· 70 81 # We're allowed to used the API ID of the Snap package: 71 82 "-DTDESKTOP_API_ID=611335" 72 83 "-DTDESKTOP_API_HASH=d524b414d21f4d37f08684c1df41ac9c" 73 - #"-DDESKTOP_APP_SPECIAL_TARGET=\"\"" # TODO: Error when set to "": Bad special target '""' 74 - "-DTDESKTOP_LAUNCHER_BASENAME=telegramdesktop" # Note: This is the default 84 + # See: https://github.com/NixOS/nixpkgs/pull/130827#issuecomment-885212649 85 + "-DDESKTOP_APP_USE_PACKAGED_FONTS=OFF" 75 86 ]; 76 87 77 88 # Note: The following packages could be packaged system-wide, but it's 78 89 # probably best to use the bundled ones from tdesktop (Arch does this too): 79 90 # rlottie: 80 - # - CMake flag: "-DTDESKTOP_USE_PACKAGED_TGVOIP=ON" 81 91 # - Sources (problem: there are no stable releases!): 82 92 # - desktop-app (tdesktop): https://github.com/desktop-app/rlottie 83 93 # - upstream: https://github.com/Samsung/rlottie 84 94 # libtgvoip: 85 - # - CMake flag: "-DDESKTOP_APP_USE_PACKAGED_RLOTTIE=ON" 86 95 # - Sources (problem: the stable releases might be too old!): 87 96 # - tdesktop: https://github.com/telegramdesktop/libtgvoip 88 97 # - upstream: https://github.com/grishka/libtgvoip ··· 113 122 Desktop client for the Telegram messenger, based on the Telegram API and 114 123 the MTProto secure protocol. 115 124 ''; 116 - license = licenses.gpl3; 125 + license = licenses.gpl3Only; 117 126 platforms = platforms.linux; 118 127 homepage = "https://desktop.telegram.org/"; 119 - changelog = "https://github.com/telegramdesktop/tdesktop/releases/tag/v{version}"; 120 - maintainers = with maintainers; [ primeos abbradar ]; 128 + changelog = "https://github.com/telegramdesktop/tdesktop/releases/tag/v${version}"; 129 + maintainers = with maintainers; [ primeos abbradar oxalica ]; 121 130 }; 122 131 }
+14 -6
pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix
··· 1 1 { lib, stdenv, fetchFromGitHub, fetchpatch 2 2 , pkg-config, cmake, ninja, yasm 3 3 , libjpeg, openssl, libopus, ffmpeg, alsa-lib, libpulseaudio, protobuf 4 - , xorg, libXtst, libXcomposite, libXdamage, libXext, libXrender, libXrandr 4 + , openh264, usrsctp, libevent, libvpx 5 5 , glib, abseil-cpp, pcre, util-linuxMinimal, libselinux, libsepol, pipewire 6 - , libXi 6 + , xorg, libX11, libXtst, libXcomposite, libXdamage, libXext, libXrender, libXrandr, libXi 7 7 }: 8 8 9 9 stdenv.mkDerivation { ··· 24 24 25 25 buildInputs = [ 26 26 libjpeg openssl libopus ffmpeg alsa-lib libpulseaudio protobuf 27 - xorg.libX11 libXtst libXcomposite libXdamage libXext libXrender libXrandr 27 + openh264 usrsctp libevent libvpx 28 + libX11 libXtst libXcomposite libXdamage libXext libXrender libXrandr libXi 28 29 glib abseil-cpp pcre util-linuxMinimal libselinux libsepol pipewire 29 - libXi 30 30 ]; 31 31 32 32 cmakeFlags = [ 33 - # Building as a shared library isn't officially supported and currently broken: 33 + # Building as a shared library isn't officially supported and may break at any time. 34 34 "-DBUILD_SHARED_LIBS=OFF" 35 35 ]; 36 36 37 - meta.license = lib.licenses.bsd3; 37 + propagatedBuildInputs = [ 38 + # Required for linking downstream binaries. 39 + abseil-cpp openh264 usrsctp libevent libvpx 40 + ]; 41 + 42 + meta = with lib; { 43 + license = licenses.bsd3; 44 + maintainers = with maintainers; [ oxalica ]; 45 + }; 38 46 }
-4
pkgs/applications/networking/instant-messengers/telegram/tdesktop/update.py
··· 71 71 tg_owt_hash = nix_prefetch_git('https://github.com/desktop-app/tg_owt.git', tg_owt_ref) 72 72 update_file('tg_owt.nix', tg_owt_version, tg_owt_hash, tg_owt_ref) 73 73 tg_owt_ref = github_api_request('repos/desktop-app/tg_owt/commits/master')['sha'] 74 - libtgvoip_ref = github_api_request(f'repos/telegramdesktop/tdesktop/contents/Telegram/ThirdParty/libtgvoip?ref={tdesktop_tag}')['sha'] 75 - libtgvoip_version = get_commit_date('telegramdesktop/libtgvoip', libtgvoip_ref) 76 - libtgvoip_hash = nix_prefetch_url(f'https://github.com/telegramdesktop/libtgvoip/archive/{libtgvoip_ref}.tar.gz', unpack=True) 77 - update_file('../../../../../development/libraries/libtgvoip/default.nix', libtgvoip_version, libtgvoip_hash, libtgvoip_ref)
+5 -2
pkgs/applications/networking/ipfs/default.nix
··· 2 2 3 3 buildGoModule rec { 4 4 pname = "ipfs"; 5 - version = "0.9.0"; 5 + version = "0.9.1"; 6 6 rev = "v${version}"; 7 7 8 8 # go-ipfs makes changes to it's source tarball that don't match the git source. 9 9 src = fetchurl { 10 10 url = "https://github.com/ipfs/go-ipfs/releases/download/${rev}/go-ipfs-source.tar.gz"; 11 - sha256 = "sha256:1fyffnw1d860w7gwm6ijbgrh68297z5bmvww8yqfshm3xgvcs6bf"; 11 + sha256 = "sha256-RliyIEtNgwzbLVwl6T38VIbhc12CZMBc3LZ6T/llaHc="; 12 12 }; 13 13 14 14 # tarball contains multiple files/directories ··· 29 29 30 30 postInstall = '' 31 31 install --mode=444 -D misc/systemd/ipfs.service $out/etc/systemd/system/ipfs.service 32 + install --mode=444 -D misc/systemd/ipfs-hardened.service $out/etc/systemd/system/ipfs-hardened.service 32 33 install --mode=444 -D misc/systemd/ipfs-api.socket $out/etc/systemd/system/ipfs-api.socket 33 34 install --mode=444 -D misc/systemd/ipfs-gateway.socket $out/etc/systemd/system/ipfs-gateway.socket 34 35 substituteInPlace $out/etc/systemd/system/ipfs.service \ 36 + --replace /usr/bin/ipfs $out/bin/ipfs 37 + substituteInPlace $out/etc/systemd/system/ipfs-hardened.service \ 35 38 --replace /usr/bin/ipfs $out/bin/ipfs 36 39 ''; 37 40
+10
pkgs/applications/terminal-emulators/foot/default.nix
··· 2 2 , lib 3 3 , fetchzip 4 4 , fetchurl 5 + , fetchpatch 5 6 , runCommandNoCC 6 7 , fcft 7 8 , freetype ··· 97 98 url = "https://codeberg.org/dnkl/${pname}/archive/${version}.tar.gz"; 98 99 sha256 = "1k0alz991cslls4926c5gq02pdq0vfw9jfpprh2a1vb59xgikv7h"; 99 100 }; 101 + 102 + patches = [ 103 + # Fixes PGO builds with clang 104 + (fetchpatch { 105 + url = "https://codeberg.org/dnkl/foot/commit/2acd4b34c57659d86dca76c58e4363de9b0a1f17.patch"; 106 + sha256 = "13xi9ppaqx2p88cxbh6801ry9ral70ylh40agn6ij7pklybs4d7s"; 107 + includes = [ "pgo/pgo.c" ]; 108 + }) 109 + ]; 100 110 101 111 depsBuildBuild = [ 102 112 pkg-config
+6 -3
pkgs/applications/version-management/git-and-tools/git-sync/default.nix
··· 28 28 gnused 29 29 ]; 30 30 31 - fixupPhase = '' 32 - patchShebangs $out/bin 31 + postFixup = '' 32 + wrap_path="${wrapperPath}":$out/bin 33 33 34 34 wrapProgram $out/bin/git-sync \ 35 - --prefix PATH : "${wrapperPath}" 35 + --prefix PATH : $wrap_path 36 + 37 + wrapProgram $out/bin/git-sync-on-inotify \ 38 + --prefix PATH : $wrap_path 36 39 ''; 37 40 38 41 meta = {
-1
pkgs/data/fonts/tempora-lgc/default.nix
··· 25 25 name = "tempora-lgc"; 26 26 inherit nativeBuildInputs; 27 27 inherit srcs; 28 - phases = "installPhase"; 29 28 installPhase = '' 30 29 mkdir -p "$out/share/fonts/opentype/public" 31 30 cp ${toString srcs} "$out/share/fonts/opentype/public"
+4 -14
pkgs/desktops/pantheon/apps/appcenter/default.nix
··· 7 7 , elementary-gtk-theme 8 8 , elementary-icon-theme 9 9 , fetchFromGitHub 10 - , fetchpatch 11 10 , flatpak 12 11 , gettext 13 12 , glib ··· 15 14 , gtk3 16 15 , json-glib 17 16 , libgee 17 + , libhandy 18 18 , libsoup 19 19 , libxml2 20 20 , meson ··· 25 25 , python3 26 26 , vala 27 27 , polkit 28 - , libhandy_0 29 28 , wrapGAppsHook 30 29 }: 31 30 32 31 stdenv.mkDerivation rec { 33 32 pname = "appcenter"; 34 - version = "3.5.1"; 33 + version = "3.6.0"; 35 34 36 35 src = fetchFromGitHub { 37 36 owner = "elementary"; 38 37 repo = pname; 39 38 rev = version; 40 - sha256 = "MsaXdmL+M+NYAJrrwluleeNxqQg0soFbO/G/FqibBFI="; 39 + sha256 = "0kwqgilhyrj2nbvw5y34nzch5h9jnrg1a1n333qdsx4ax6yrxh4j"; 41 40 }; 42 41 43 - patches = [ 44 - # Allow build with appstream 0.14.x 45 - # https://github.com/elementary/appcenter/pull/1493 46 - (fetchpatch { 47 - url = "https://github.com/elementary/appcenter/commit/5807dd13fe3c715f26225aed8d7a0abdea0c2a64.patch"; 48 - sha256 = "BvEahG9lU9ZdgooFDFhm5evRvnKVcmcHLdmZPb85gbo="; 49 - }) 50 - ]; 51 - 52 42 passthru = { 53 43 updateScript = nix-update-script { 54 44 attrPath = "pantheon.${pname}"; ··· 78 68 gtk3 79 69 json-glib 80 70 libgee 81 - libhandy_0 # doesn't support libhandy-1 yet 71 + libhandy 82 72 libsoup 83 73 libxml2 84 74 packagekit
-48
pkgs/development/libraries/libtgvoip/default.nix
··· 1 - { stdenv, lib, fetchFromGitHub, fetchpatch 2 - , pkg-config, autoreconfHook 3 - , openssl, libopus, alsa-lib, libpulseaudio 4 - }: 5 - 6 - with lib; 7 - 8 - stdenv.mkDerivation rec { 9 - pname = "libtgvoip"; 10 - version = "unstable-2021-07-13"; 11 - 12 - src = fetchFromGitHub { 13 - owner = "telegramdesktop"; 14 - repo = "libtgvoip"; 15 - rev = "f321e7c8cc086bac6ae06fa0934aac7d9833a310"; 16 - sha256 = "1gk5nsqhbnn1cdh83b70qr3d3v2c1bncylvgn77vvj8vnyjlmnfq"; 17 - }; 18 - 19 - # To fix the build without external webrtc: 20 - patches = [ 21 - (fetchpatch { 22 - # Use methods from updated webrtc. 23 - url = "https://github.com/telegramdesktop/libtgvoip/commit/13a5fcb16b04472d808ce122abd695dbf5d206cd.patch"; 24 - sha256 = "0wapqvml3yyv5dlp2q8iih5rfvfnkngll69krhnw5xsdjy22sp7r"; 25 - revert = true; 26 - }) 27 - (fetchpatch { 28 - # Allow working with external webrtc. 29 - url = "https://github.com/telegramdesktop/libtgvoip/commit/6e82b6e45664c1f80b9039256c99bebc76d34672.patch"; 30 - sha256 = "0m87ixja70vnm80a9z4gxk0yl7n64y59smczxb88lxnj6kdgih7x"; 31 - revert = true; 32 - }) 33 - ]; 34 - 35 - outputs = [ "out" "dev" ]; 36 - 37 - nativeBuildInputs = [ pkg-config autoreconfHook ]; 38 - buildInputs = [ openssl libopus alsa-lib libpulseaudio ]; 39 - enableParallelBuilding = true; 40 - 41 - meta = { 42 - description = "VoIP library for Telegram clients"; 43 - license = licenses.unlicense; 44 - platforms = platforms.linux; 45 - homepage = "https://github.com/telegramdesktop/libtgvoip"; 46 - maintainers = with maintainers; [ ilya-fedin ]; 47 - }; 48 - }
+4 -3
pkgs/development/libraries/tezos-rust-libs/default.nix
··· 19 19 ''; 20 20 21 21 postInstall = '' 22 + cp -r rustc-bls12-381/include $out/include 23 + cp -r librustzcash/include $out 24 + cp -r $out/lib $out/tmp 22 25 mkdir $out/lib/tezos-rust-libs 23 - cp -r rustc-bls12-381/include $out/include 24 - cp $out/lib/librustc_bls12_381.a $out/lib/tezos-rust-libs 25 - cp $out/lib/librustzcash.a $out/lib/tezos-rust-libs 26 + mv $out/tmp/ $out/lib/tezos-rust-libs/ 26 27 ''; 27 28 28 29 doCheck = true;
+7 -10
pkgs/development/mobile/gomobile/default.nix
··· 3 3 , xcodeWrapper ? xcodeenv.composeXcodeWrapper xcodeWrapperArgs 4 4 , androidPkgs ? androidenv.composeAndroidPackages { 5 5 includeNDK = true; 6 - ndkVersion = "21.3.6528147"; # WARNING: 22.0.7026061 is broken. 6 + ndkVersion = "22.1.7171670"; 7 7 } }: 8 8 9 9 buildGoModule { 10 10 pname = "gomobile"; 11 - version = "unstable-2020-06-22"; 11 + version = "unstable-2021-06-14"; 12 12 13 - vendorSha256 = "1n1338vqkc1n8cy94501n7jn3qbr28q9d9zxnq2b4rxsqjfc9l94"; 13 + vendorSha256 = "1irgkgv72rakg7snk1bnp10ibr64ykz9l40s59l4fnl63zsh12a0"; 14 14 15 15 src = fetchgit { 16 - # WARNING: Next commit removes support for ARM 32 bit builds for iOS 17 - rev = "33b80540585f2b31e503da24d6b2a02de3c53ff5"; 16 + rev = "7c8f154d100840bc5828285bb390bbae1cb5a98c"; 18 17 name = "gomobile"; 19 18 url = "https://go.googlesource.com/mobile"; 20 - sha256 = "0c9map2vrv34wmaycsv71k4day3b0z5p16yzxmlp8amvqb38zwlm"; 19 + sha256 = "1w9mra1mqf60iafp0ywvja5196fjsjyfhvz4yizqq4qkyll5qmj1"; 21 20 }; 22 21 23 22 subPackages = [ "bind" "cmd/gobind" "cmd/gomobile" ]; 24 23 25 24 # Fails with: go: cannot find GOROOT directory 26 25 doCheck = false; 27 - 28 - patches = [ ./resolve-nix-android-sdk.patch ]; 29 26 30 27 nativeBuildInputs = [ makeWrapper ] 31 28 ++ lib.optionals stdenv.isDarwin [ xcodeWrapper ]; ··· 48 45 wrapProgram $out/bin/gomobile \ 49 46 --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ zlib ]}" \ 50 47 --prefix PATH : "${androidPkgs.androidsdk}/bin" \ 51 - --set ANDROID_HOME "${androidPkgs.androidsdk}/libexec/android-sdk" \ 52 - --set GOPATH $out 48 + --set ANDROID_NDK_HOME "${androidPkgs.androidsdk}/libexec/android-sdk/ndk-bundle" \ 49 + --set ANDROID_HOME "${androidPkgs.androidsdk}/libexec/android-sdk" 53 50 ''; 54 51 55 52 meta = with lib; {
-15
pkgs/development/mobile/gomobile/resolve-nix-android-sdk.patch
··· 1 - diff --git a/cmd/gomobile/bind_androidapp.go b/cmd/gomobile/bind_androidapp.go 2 - index 3b01adc..76216fa 100644 3 - --- a/cmd/gomobile/bind_androidapp.go 4 - +++ b/cmd/gomobile/bind_androidapp.go 5 - @@ -372,6 +372,10 @@ func androidAPIPath() (string, error) { 6 - var apiVer int 7 - for _, fi := range fis { 8 - name := fi.Name() 9 - + // Resolve symlinked directories (this is how the Nix Android SDK package is built) 10 - + if fi2, err := os.Stat(filepath.Join(sdkDir.Name(), name)); err == nil { 11 - + fi = fi2 12 - + } 13 - if !fi.IsDir() || !strings.HasPrefix(name, "android-") { 14 - continue 15 - }
+26
pkgs/development/ocaml-modules/hack_parallel/default.nix
··· 1 + { lib, fetchFromGitHub, buildDunePackage, core, core_kernel, pkg-config, sqlite 2 + }: 3 + buildDunePackage rec { 4 + pname = "hack_parallel"; 5 + version = "1.0.1"; 6 + useDune2 = true; 7 + minimumOcamlVersion = "4.04.1"; 8 + 9 + src = fetchFromGitHub { 10 + owner = "rvantonder"; 11 + repo = "hack_parallel"; 12 + rev = version; 13 + sha256 = "0qjlkw35r4q2cm0n2x0i73zvx1xgrp6axaia2nm8zxpm49mid629"; 14 + }; 15 + 16 + nativeBuildInputs = [ pkg-config ]; 17 + 18 + buildInputs = [ core core_kernel sqlite ]; 19 + 20 + meta = { 21 + description = 22 + "Core parallel and shared memory library used by Hack, Flow, and Pyre"; 23 + license = lib.licenses.mit; 24 + homepage = "https://github.com/rvantonder/hack_parallel"; 25 + }; 26 + }
+12 -16
pkgs/development/ocaml-modules/mparser/default.nix
··· 1 - { stdenv, lib, fetchzip, ocaml, findlib, ocamlbuild }: 2 - 3 - stdenv.mkDerivation { 4 - name = "ocaml${ocaml.version}-mparser-1.2.3"; 5 - src = fetchzip { 6 - url = "https://github.com/cakeplus/mparser/archive/1.2.3.tar.gz"; 7 - sha256 = "1f8vpagmv0jdm50pxs2xwh2xcmvgaprx4kw871hlml9ahsflxgnw"; 8 - }; 9 - 10 - buildInputs = [ ocaml findlib ocamlbuild ]; 1 + { lib, fetchFromGitHub, buildDunePackage }: 11 2 12 - configurePhase = "ocaml setup.ml -configure"; 13 - buildPhase = "ocaml setup.ml -build"; 14 - installPhase = "ocaml setup.ml -install"; 3 + buildDunePackage rec { 4 + pname = "mparser"; 5 + version = "1.3"; 6 + useDune2 = true; 15 7 16 - createFindlibDestdir = true; 8 + src = fetchFromGitHub { 9 + owner = "murmour"; 10 + repo = "mparser"; 11 + rev = version; 12 + sha256 = "16j19v16r42gcsii6a337zrs5cxnf12ig0vaysxyr7sq5lplqhkx"; 13 + }; 17 14 18 15 meta = { 19 16 description = "A simple monadic parser combinator OCaml library"; 20 17 license = lib.licenses.lgpl21Plus; 21 - homepage = "https://github.com/cakeplus/mparser"; 18 + homepage = "https://github.com/murmour/mparser"; 22 19 maintainers = [ lib.maintainers.vbgl ]; 23 - inherit (ocaml.meta) platforms; 24 20 }; 25 21 }
+12
pkgs/development/ocaml-modules/mparser/pcre.nix
··· 1 + { fetchFromGitHub, buildDunePackage, ocaml_pcre, mparser }: 2 + 3 + buildDunePackage rec { 4 + pname = "mparser-pcre"; 5 + useDune2 = true; 6 + 7 + inherit (mparser) src version; 8 + 9 + propagatedBuildInputs = [ ocaml_pcre mparser ]; 10 + 11 + meta = mparser.meta // { description = "PCRE-based regular expressions"; }; 12 + }
+5 -4
pkgs/development/ocaml-modules/parany/default.nix
··· 2 2 3 3 buildDunePackage rec { 4 4 pname = "parany"; 5 - version = "8.0.0"; 5 + version = "12.0.3"; 6 6 7 7 useDune2 = true; 8 + minimumOCamlVersion = "4.03.0"; 8 9 9 10 src = fetchFromGitHub { 10 11 owner = "UnixJunkie"; 11 - repo = pname; 12 - rev = "v${version}"; 13 - sha256 = "19yz1yqyqx6gawy93jlh3x6vji2p9qsy6nsbj65q5pii8p1fjlsm"; 12 + repo = pname; 13 + rev = "v${version}"; 14 + sha256 = "1j962ak68kvv62bczjqxwlwvdgcvjfcs36qwq12nnm0pwlzkhg33"; 14 15 }; 15 16 16 17 propagatedBuildInputs = [ ocamlnet cpu ];
+33
pkgs/development/ocaml-modules/tezos/base.nix
··· 1 + { lib 2 + , buildDunePackage 3 + , tezos-stdlib 4 + , tezos-crypto 5 + , tezos-micheline 6 + , ptime 7 + , ezjsonm 8 + , ipaddr 9 + , qcheck-alcotest 10 + , crowbar 11 + }: 12 + 13 + buildDunePackage { 14 + pname = "tezos-base"; 15 + inherit (tezos-stdlib) version src useDune2 preBuild doCheck; 16 + 17 + propagatedBuildInputs = [ 18 + tezos-crypto 19 + tezos-micheline 20 + ptime 21 + ezjsonm 22 + ipaddr 23 + ]; 24 + 25 + checkInputs = [ 26 + qcheck-alcotest 27 + crowbar 28 + ]; 29 + 30 + meta = tezos-stdlib.meta // { 31 + description = "Tezos: meta-package and pervasive type definitions for Tezos"; 32 + }; 33 + }
+25
pkgs/development/ocaml-modules/tezos/clic.nix
··· 1 + { lib 2 + , buildDunePackage 3 + , tezos-stdlib 4 + , tezos-stdlib-unix 5 + , alcotest 6 + , alcotest-lwt 7 + }: 8 + 9 + buildDunePackage { 10 + pname = "tezos-clic"; 11 + inherit (tezos-stdlib) version src useDune2 preBuild doCheck; 12 + 13 + propagatedBuildInputs = [ 14 + tezos-stdlib-unix 15 + ]; 16 + 17 + checkInputs = [ 18 + alcotest 19 + alcotest-lwt 20 + ]; 21 + 22 + meta = tezos-stdlib.meta // { 23 + description = "Tezos: library of auto-documented command-line-parsing combinators"; 24 + }; 25 + }
+38
pkgs/development/ocaml-modules/tezos/crypto.nix
··· 1 + { lib 2 + , buildDunePackage 3 + , tezos-stdlib 4 + , tezos-clic 5 + , tezos-rpc 6 + , bls12-381 7 + , hacl-star 8 + , secp256k1-internal 9 + , uecc 10 + , ringo 11 + , ff 12 + , alcotest 13 + , alcotest-lwt 14 + }: 15 + 16 + buildDunePackage { 17 + pname = "tezos-crypto"; 18 + inherit (tezos-stdlib) version src useDune2 preBuild doCheck; 19 + 20 + propagatedBuildInputs = [ 21 + tezos-clic 22 + tezos-rpc 23 + bls12-381 24 + hacl-star 25 + secp256k1-internal 26 + uecc 27 + ringo 28 + ]; 29 + 30 + checkInputs = [ 31 + alcotest 32 + alcotest-lwt 33 + ]; 34 + 35 + meta = tezos-stdlib.meta // { 36 + description = "Tezos: library with all the cryptographic primitives used by Tezos"; 37 + }; 38 + }
+30
pkgs/development/ocaml-modules/tezos/error-monad.nix
··· 1 + { lib 2 + , buildDunePackage 3 + , tezos-stdlib 4 + , data-encoding 5 + , lwt 6 + , lwt-canceler 7 + , alcotest 8 + , alcotest-lwt 9 + }: 10 + 11 + buildDunePackage { 12 + pname = "tezos-error-monad"; 13 + inherit (tezos-stdlib) version src useDune2 preBuild doCheck; 14 + 15 + propagatedBuildInputs = [ 16 + tezos-stdlib 17 + data-encoding 18 + lwt 19 + lwt-canceler 20 + ]; 21 + 22 + checkInputs = [ 23 + alcotest 24 + alcotest-lwt 25 + ]; 26 + 27 + meta = tezos-stdlib.meta // { 28 + description = "Tezos: error monad"; 29 + }; 30 + }
+22
pkgs/development/ocaml-modules/tezos/event-logging.nix
··· 1 + { lib 2 + , buildDunePackage 3 + , tezos-stdlib 4 + , tezos-lwt-result-stdlib 5 + , lwt_log 6 + , alcotest 7 + , alcotest-lwt 8 + }: 9 + 10 + buildDunePackage { 11 + pname = "tezos-event-logging"; 12 + inherit (tezos-stdlib) version src useDune2 preBuild doCheck; 13 + 14 + propagatedBuildInputs = [ 15 + tezos-lwt-result-stdlib 16 + lwt_log 17 + ]; 18 + 19 + meta = tezos-stdlib.meta // { 20 + description = "Tezos: event logging library"; 21 + }; 22 + }
+51
pkgs/development/ocaml-modules/tezos/lmdb.nix
··· 1 + { lib 2 + , fetchFromGitLab 3 + , pkg-config 4 + , buildDunePackage 5 + , lmdb 6 + , rresult 7 + , cstruct 8 + , alcotest 9 + }: 10 + 11 + buildDunePackage rec { 12 + pname = "tezos-lmdb"; 13 + version = "7.4"; 14 + src = fetchFromGitLab { 15 + owner = "tezos"; 16 + repo = "tezos"; 17 + rev = "v${version}"; 18 + sha256 = "18q02j74aa8mxv233kvyb62xbhjngzpgppp6kgr4m53d7a78wgsm"; 19 + }; 20 + 21 + useDune2 = true; 22 + 23 + preBuild = '' 24 + rm dune 25 + rm -rf src 26 + rm -rf docs 27 + ls vendors | grep -v ocaml-lmdb |xargs rm -rf 28 + ''; 29 + 30 + buildInputs = [ 31 + pkg-config 32 + ]; 33 + 34 + propagatedBuildInputs = [ 35 + rresult 36 + lmdb 37 + ]; 38 + 39 + checkInputs = [ 40 + cstruct 41 + alcotest 42 + ]; 43 + 44 + doCheck = false; 45 + 46 + meta = { 47 + description = "Legacy Tezos OCaml binding to LMDB (Consider ocaml-lmdb instead)"; 48 + license = lib.licenses.isc; 49 + maintainers = [ lib.maintainers.ulrikstrid ]; 50 + }; 51 + }
+32
pkgs/development/ocaml-modules/tezos/lwt-result-stdlib.nix
··· 1 + { lib 2 + , buildDunePackage 3 + , ocaml 4 + , tezos-stdlib 5 + , tezos-error-monad 6 + , alcotest 7 + , alcotest-lwt 8 + , crowbar 9 + }: 10 + 11 + if lib.versionAtLeast ocaml.version "4.12" then 12 + throw "tezos-lwt-result-stdlib-${tezos-stdlib.version} is not available for OCaml > 4.10" 13 + else 14 + 15 + buildDunePackage { 16 + pname = "tezos-lwt-result-stdlib"; 17 + inherit (tezos-stdlib) version src useDune2 preBuild doCheck; 18 + 19 + propagatedBuildInputs = [ 20 + tezos-error-monad 21 + ]; 22 + 23 + checkInputs = [ 24 + alcotest 25 + alcotest-lwt 26 + crowbar 27 + ]; 28 + 29 + meta = tezos-stdlib.meta // { 30 + description = "Tezos: error-aware stdlib replacement"; 31 + }; 32 + }
+28
pkgs/development/ocaml-modules/tezos/micheline.nix
··· 1 + { lib 2 + , buildDunePackage 3 + , tezos-stdlib 4 + , tezos-error-monad 5 + , uutf 6 + , alcotest 7 + , alcotest-lwt 8 + , ppx_inline_test 9 + }: 10 + 11 + buildDunePackage { 12 + pname = "tezos-micheline"; 13 + inherit (tezos-stdlib) version src useDune2 preBuild doCheck; 14 + 15 + propagatedBuildInputs = [ 16 + tezos-error-monad 17 + uutf 18 + ]; 19 + 20 + checkInputs = [ 21 + alcotest 22 + alcotest-lwt 23 + ]; 24 + 25 + meta = tezos-stdlib.meta // { 26 + description = "Tezos: internal AST and parser for the Michelson language"; 27 + }; 28 + }
+18
pkgs/development/ocaml-modules/tezos/p2p-services.nix
··· 1 + { lib 2 + , buildDunePackage 3 + , tezos-stdlib 4 + , tezos-base 5 + }: 6 + 7 + buildDunePackage { 8 + pname = "tezos-p2p-services"; 9 + inherit (tezos-stdlib) version src useDune2 preBuild doCheck; 10 + 11 + propagatedBuildInputs = [ 12 + tezos-base 13 + ]; 14 + 15 + meta = tezos-stdlib.meta // { 16 + description = "Tezos: descriptions of RPCs exported by `tezos-p2p`"; 17 + }; 18 + }
+25
pkgs/development/ocaml-modules/tezos/p2p.nix
··· 1 + { lib 2 + , buildDunePackage 3 + , tezos-stdlib 4 + , tezos-p2p-services 5 + , alcotest-lwt 6 + , lwt-watcher 7 + }: 8 + 9 + buildDunePackage { 10 + pname = "tezos-p2p"; 11 + inherit (tezos-stdlib) version src useDune2 preBuild doCheck; 12 + 13 + propagatedBuildInputs = [ 14 + tezos-p2p-services 15 + lwt-watcher 16 + ]; 17 + 18 + checkInputs = [ 19 + alcotest-lwt 20 + ]; 21 + 22 + meta = tezos-stdlib.meta // { 23 + description = "Tezos: library for a pool of P2P connections"; 24 + }; 25 + }
+19
pkgs/development/ocaml-modules/tezos/protocol-008-PtEdo2Zk-parameters.nix
··· 1 + { lib 2 + , buildDunePackage 3 + , tezos-stdlib 4 + , tezos-protocol-008-PtEdo2Zk 5 + , qcheck-alcotest 6 + }: 7 + 8 + buildDunePackage { 9 + pname = "tezos-protocol-008-PtEdo2Zk-parameters"; 10 + inherit (tezos-stdlib) version src useDune2 preBuild doCheck; 11 + 12 + propagatedBuildInputs = [ 13 + tezos-protocol-008-PtEdo2Zk 14 + ]; 15 + 16 + meta = tezos-stdlib.meta // { 17 + description = "Tezos/Protocol: parameters"; 18 + }; 19 + }
+23
pkgs/development/ocaml-modules/tezos/protocol-008-PtEdo2Zk.nix
··· 1 + { lib 2 + , buildDunePackage 3 + , tezos-stdlib 4 + , tezos-protocol-compiler 5 + }: 6 + 7 + buildDunePackage { 8 + pname = "tezos-protocol-008-PtEdo2Zk"; 9 + inherit (tezos-stdlib) version src useDune2 doCheck; 10 + 11 + preBuild = '' 12 + rm -rf vendors 13 + substituteInPlace src/proto_008_PtEdo2Zk/lib_protocol/dune.inc --replace "-nostdlib" "" 14 + ''; 15 + 16 + propagatedBuildInputs = [ 17 + tezos-protocol-compiler 18 + ]; 19 + 20 + meta = tezos-stdlib.meta // { 21 + description = "Tezos/Protocol: economic-protocol definition"; 22 + }; 23 + }
+29
pkgs/development/ocaml-modules/tezos/protocol-compiler.nix
··· 1 + { lib 2 + , buildDunePackage 3 + , ocaml 4 + , tezos-stdlib 5 + , tezos-protocol-environment 6 + , ocp-ocamlres 7 + , pprint 8 + }: 9 + 10 + if lib.versionAtLeast ocaml.version "4.12" then 11 + throw "tezos-protocol-compiler-${tezos-stdlib.version} is not available for OCaml > 4.10" 12 + else 13 + 14 + buildDunePackage { 15 + pname = "tezos-protocol-compiler"; 16 + inherit (tezos-stdlib) version src useDune2 preBuild doCheck; 17 + 18 + minimalOCamlVersion = "4.09"; 19 + 20 + propagatedBuildInputs = [ 21 + tezos-protocol-environment 22 + ocp-ocamlres 23 + pprint 24 + ]; 25 + 26 + meta = tezos-stdlib.meta // { 27 + description = "Tezos: economic-protocol compiler"; 28 + }; 29 + }
+18
pkgs/development/ocaml-modules/tezos/protocol-demo-noops.nix
··· 1 + { lib 2 + , buildDunePackage 3 + , tezos-stdlib 4 + , tezos-protocol-compiler 5 + }: 6 + 7 + buildDunePackage { 8 + pname = "tezos-protocol-demo-noops"; 9 + inherit (tezos-stdlib) version src useDune2 preBuild doCheck; 10 + 11 + propagatedBuildInputs = [ 12 + tezos-protocol-compiler 13 + ]; 14 + 15 + meta = tezos-stdlib.meta // { 16 + description = "Tezos/Protocol: demo_noops economic-protocol definition"; 17 + }; 18 + }
+15
pkgs/development/ocaml-modules/tezos/protocol-environment-packer.nix
··· 1 + { lib 2 + , buildDunePackage 3 + , tezos-stdlib 4 + }: 5 + 6 + buildDunePackage { 7 + pname = "tezos-protocol-environment-packer"; 8 + inherit (tezos-stdlib) version src useDune2 preBuild doCheck; 9 + 10 + minimalOCamlVersion = "4.03"; 11 + 12 + meta = tezos-stdlib.meta // { 13 + description = "Tezos: sigs/structs packer for economic protocol environment"; 14 + }; 15 + }
+30
pkgs/development/ocaml-modules/tezos/protocol-environment-sigs.nix
··· 1 + { lib 2 + , buildDunePackage 3 + , ocaml 4 + , tezos-stdlib 5 + , tezos-protocol-environment-packer 6 + , zarith 7 + }: 8 + 9 + buildDunePackage { 10 + pname = "tezos-protocol-environment-sigs"; 11 + inherit (tezos-stdlib) version src useDune2 preBuild doCheck; 12 + 13 + propagatedBuildInputs = [ 14 + tezos-protocol-environment-packer 15 + ]; 16 + 17 + checkInputs = [ 18 + tezos-stdlib 19 + ]; 20 + 21 + postPatch = '' 22 + cp -f ${zarith}/lib/ocaml/${ocaml.version}/site-lib/zarith/z.mli ./src/lib_protocol_environment/sigs/v1/z.mli 23 + sed -i 's/out_channel/Stdlib.out_channel/g' ./src/lib_protocol_environment/sigs/v1/z.mli 24 + sed -i 's/Buffer/Stdlib.Buffer/g' ./src/lib_protocol_environment/sigs/v1/z.mli 25 + ''; 26 + 27 + meta = tezos-stdlib.meta // { 28 + description = "Tezos: restricted typing environment for the economic protocols"; 29 + }; 30 + }
+20
pkgs/development/ocaml-modules/tezos/protocol-environment-structs.nix
··· 1 + { lib 2 + , buildDunePackage 3 + , tezos-stdlib 4 + , tezos-crypto 5 + , tezos-protocol-environment-packer 6 + }: 7 + 8 + buildDunePackage { 9 + pname = "tezos-protocol-environment-structs"; 10 + inherit (tezos-stdlib) version src useDune2 preBuild doCheck; 11 + 12 + propagatedBuildInputs = [ 13 + tezos-crypto 14 + tezos-protocol-environment-packer 15 + ]; 16 + 17 + meta = tezos-stdlib.meta // { 18 + description = "Tezos: restricted typing environment for the economic protocols"; 19 + }; 20 + }
+33
pkgs/development/ocaml-modules/tezos/protocol-environment.nix
··· 1 + { lib 2 + , buildDunePackage 3 + , tezos-stdlib 4 + , tezos-base 5 + , tezos-sapling 6 + , tezos-protocol-environment-sigs 7 + , tezos-protocol-environment-structs 8 + , zarith 9 + , alcotest-lwt 10 + , crowbar 11 + }: 12 + 13 + buildDunePackage { 14 + pname = "tezos-protocol-environment"; 15 + inherit (tezos-stdlib) version src useDune2 doCheck preBuild; 16 + 17 + propagatedBuildInputs = [ 18 + tezos-sapling 19 + tezos-base 20 + tezos-protocol-environment-sigs 21 + tezos-protocol-environment-structs 22 + zarith # this might break, since they actually want 1.11 23 + ]; 24 + 25 + checkInputs = [ 26 + alcotest-lwt 27 + crowbar 28 + ]; 29 + 30 + meta = tezos-stdlib.meta // { 31 + description = "Tezos: custom economic-protocols environment implementation for `tezos-client` and testing"; 32 + }; 33 + }
+27
pkgs/development/ocaml-modules/tezos/requester.nix
··· 1 + { lib 2 + , buildDunePackage 3 + , tezos-stdlib 4 + , tezos-base 5 + , tezos-test-services 6 + , lwt-watcher 7 + , alcotest-lwt 8 + }: 9 + 10 + buildDunePackage { 11 + pname = "tezos-requester"; 12 + inherit (tezos-stdlib) version src useDune2 preBuild doCheck; 13 + 14 + propagatedBuildInputs = [ 15 + tezos-base 16 + lwt-watcher 17 + ]; 18 + 19 + checkInputs = [ 20 + alcotest-lwt 21 + tezos-test-services 22 + ]; 23 + 24 + meta = tezos-stdlib.meta // { 25 + description = "Tezos: generic resource fetching service"; 26 + }; 27 + }
+22
pkgs/development/ocaml-modules/tezos/rpc.nix
··· 1 + { lib 2 + , buildDunePackage 3 + , tezos-stdlib 4 + , tezos-error-monad 5 + , resto 6 + , resto-directory 7 + }: 8 + 9 + buildDunePackage { 10 + pname = "tezos-rpc"; 11 + inherit (tezos-stdlib) version src useDune2 preBuild doCheck; 12 + 13 + propagatedBuildInputs = [ 14 + tezos-error-monad 15 + resto 16 + resto-directory 17 + ]; 18 + 19 + meta = tezos-stdlib.meta // { 20 + description = "Tezos: library of auto-documented RPCs (service and hierarchy descriptions)"; 21 + }; 22 + }
+31
pkgs/development/ocaml-modules/tezos/sapling.nix
··· 1 + { lib 2 + , buildDunePackage 3 + , ocaml 4 + , tezos-stdlib 5 + , tezos-crypto 6 + , tezos-rust-libs 7 + , alcotest-lwt 8 + }: 9 + 10 + buildDunePackage { 11 + pname = "tezos-sapling"; 12 + inherit (tezos-stdlib) version src useDune2 preBuild; 13 + 14 + propagatedBuildInputs = [ 15 + tezos-crypto 16 + tezos-rust-libs 17 + ]; 18 + 19 + checkInputs = [ 20 + alcotest-lwt 21 + ]; 22 + 23 + doCheck = false; 24 + 25 + # This is a hack to work around the hack used in the dune files 26 + OPAM_SWITCH_PREFIX = "${tezos-rust-libs}"; 27 + 28 + meta = tezos-stdlib.meta // { 29 + description = "Tezos/Protocol: economic-protocol definition"; 30 + }; 31 + }
+22
pkgs/development/ocaml-modules/tezos/shell-services.nix
··· 1 + { lib 2 + , buildDunePackage 3 + , tezos-stdlib 4 + , tezos-workers 5 + , tezos-p2p-services 6 + , tezos-version 7 + }: 8 + 9 + buildDunePackage { 10 + pname = "tezos-shell-services"; 11 + inherit (tezos-stdlib) version src useDune2 preBuild doCheck; 12 + 13 + propagatedBuildInputs = [ 14 + tezos-workers 15 + tezos-p2p-services 16 + tezos-version 17 + ]; 18 + 19 + meta = tezos-stdlib.meta // { 20 + description = "Tezos: descriptions of RPCs exported by `tezos-shell`"; 21 + }; 22 + }
+30
pkgs/development/ocaml-modules/tezos/stdlib-unix.nix
··· 1 + { lib 2 + , buildDunePackage 3 + , tezos-stdlib 4 + , tezos-event-logging 5 + , lwt 6 + , ptime 7 + , mtime 8 + , ipaddr 9 + , re 10 + , alcotest 11 + , alcotest-lwt 12 + }: 13 + 14 + buildDunePackage { 15 + pname = "tezos-stdlib-unix"; 16 + inherit (tezos-stdlib) version src useDune2 preBuild doCheck; 17 + 18 + propagatedBuildInputs = [ 19 + tezos-event-logging 20 + lwt 21 + ptime 22 + mtime 23 + ipaddr 24 + re 25 + ]; 26 + 27 + meta = tezos-stdlib.meta // { 28 + description = "Tezos: yet-another local-extension of the OCaml standard library (unix-specific fragment)"; 29 + }; 30 + }
+53
pkgs/development/ocaml-modules/tezos/stdlib.nix
··· 1 + { lib 2 + , fetchFromGitLab 3 + , buildDunePackage 4 + , hex 5 + , lwt 6 + , zarith 7 + , alcotest 8 + , alcotest-lwt 9 + , crowbar 10 + , bigstring 11 + , lwt_log 12 + }: 13 + 14 + buildDunePackage rec { 15 + pname = "tezos-stdlib"; 16 + version = "8.3"; 17 + src = fetchFromGitLab { 18 + owner = "tezos"; 19 + repo = "tezos"; 20 + rev = "v${version}"; 21 + sha256 = "12cv2cssnw60jbpnh6xjysxgsgcj7d72454k4zs2b8fjx7mkgksk"; 22 + }; 23 + 24 + minimalOCamlVersion = "4.0.8"; 25 + 26 + useDune2 = true; 27 + 28 + preBuild = '' 29 + rm -rf vendors 30 + ''; 31 + 32 + propagatedBuildInputs = [ 33 + hex 34 + lwt 35 + zarith 36 + ]; 37 + 38 + checkInputs = [ 39 + alcotest 40 + alcotest-lwt 41 + crowbar 42 + bigstring 43 + lwt_log 44 + ]; 45 + 46 + doCheck = true; 47 + 48 + meta = { 49 + description = "Tezos: yet-another local-extension of the OCaml standard library"; 50 + license = lib.licenses.mit; 51 + maintainers = [ lib.maintainers.ulrikstrid ]; 52 + }; 53 + }
+20
pkgs/development/ocaml-modules/tezos/test-services.nix
··· 1 + { lib 2 + , buildDunePackage 3 + , tezos-stdlib 4 + , tezos-base 5 + , alcotest-lwt 6 + }: 7 + 8 + buildDunePackage { 9 + pname = "tezos-test-services"; 10 + inherit (tezos-stdlib) version src useDune2 preBuild doCheck; 11 + 12 + propagatedBuildInputs = [ 13 + tezos-base 14 + alcotest-lwt 15 + ]; 16 + 17 + meta = tezos-stdlib.meta // { 18 + description = "Tezos: Alcotest-based test services"; 19 + }; 20 + }
+18
pkgs/development/ocaml-modules/tezos/version.nix
··· 1 + { lib 2 + , buildDunePackage 3 + , tezos-stdlib 4 + , tezos-base 5 + }: 6 + 7 + buildDunePackage { 8 + pname = "tezos-version"; 9 + inherit (tezos-stdlib) version src useDune2 preBuild doCheck; 10 + 11 + propagatedBuildInputs = [ 12 + tezos-base 13 + ]; 14 + 15 + meta = tezos-stdlib.meta // { 16 + description = "Tezos: version information generated from Git"; 17 + }; 18 + }
+18
pkgs/development/ocaml-modules/tezos/workers.nix
··· 1 + { lib 2 + , buildDunePackage 3 + , tezos-stdlib 4 + , tezos-base 5 + }: 6 + 7 + buildDunePackage { 8 + pname = "tezos-workers"; 9 + inherit (tezos-stdlib) version src useDune2 preBuild doCheck; 10 + 11 + propagatedBuildInputs = [ 12 + tezos-base 13 + ]; 14 + 15 + meta = tezos-stdlib.meta // { 16 + description = "Tezos: worker library"; 17 + }; 18 + }
+2 -2
pkgs/development/python-modules/fritzprofiles/default.nix
··· 7 7 8 8 buildPythonPackage rec { 9 9 pname = "fritzprofiles"; 10 - version = "0.6.1"; 10 + version = "0.7.3"; 11 11 format = "setuptools"; 12 12 13 13 src = fetchPypi { 14 14 inherit pname version; 15 - sha256 = "1bd4sa3i1ldkg6lnsvg004csgqklvi5xk71y971qyjvsbdbwgbn3"; 15 + sha256 = "sha256-VoKgLJWF9x8dW8A6CNwLtK+AmehtgZP41nUGQO819es="; 16 16 }; 17 17 18 18 propagatedBuildInputs = [
+5
pkgs/development/python-modules/gym/default.nix
··· 29 29 scipy 30 30 ]; 31 31 32 + postPatch = '' 33 + substituteInPlace setup.py \ 34 + --replace "Pillow<=8.2.0" "Pillow" 35 + ''; 36 + 32 37 # The test needs MuJoCo that is not free library. 33 38 doCheck = false; 34 39
+77
pkgs/development/tools/comby/default.nix
··· 1 + { ocamlPackages, fetchFromGitHub, lib, zlib, pkg-config, cacert, gmp, libev 2 + , autoconf, sqlite, stdenv }: 3 + let 4 + mkCombyPackage = { pname, extraBuildInputs ? [ ], extraNativeInputs ? [ ] }: 5 + ocamlPackages.buildDunePackage rec { 6 + inherit pname; 7 + version = "1.5.1"; 8 + useDune2 = true; 9 + minimumOcamlVersion = "4.08.1"; 10 + doCheck = true; 11 + 12 + src = fetchFromGitHub { 13 + owner = "comby-tools"; 14 + repo = "comby"; 15 + rev = version; 16 + sha256 = "1ipfrr6n1jyyryhm9zpn8wwgzfac1zgbjdjzrm00qcwc17r8x2hf"; 17 + }; 18 + 19 + nativeBuildInputs = [ 20 + ocamlPackages.ppx_deriving 21 + ocamlPackages.ppx_deriving_yojson 22 + ocamlPackages.ppx_sexp_conv 23 + ocamlPackages.ppx_sexp_message 24 + ] ++ extraNativeInputs; 25 + 26 + buildInputs = [ 27 + ocamlPackages.core 28 + ocamlPackages.ocaml_pcre 29 + ocamlPackages.mparser 30 + ocamlPackages.mparser-pcre 31 + ocamlPackages.angstrom 32 + ] ++ extraBuildInputs; 33 + 34 + checkInputs = [ cacert ]; 35 + 36 + meta = { 37 + description = "Tool for searching and changing code structure"; 38 + license = lib.licenses.asl20; 39 + homepage = "https://comby.dev"; 40 + }; 41 + }; 42 + 43 + combyKernel = mkCombyPackage { pname = "comby-kernel"; }; 44 + in mkCombyPackage { 45 + pname = "comby"; 46 + 47 + extraBuildInputs = [ 48 + zlib 49 + gmp 50 + libev 51 + sqlite 52 + ocamlPackages.shell # This input must appear before `parany` or any other input that propagates `ocamlnet` 53 + ocamlPackages.lwt 54 + ocamlPackages.patience_diff 55 + ocamlPackages.toml 56 + ocamlPackages.cohttp-lwt-unix 57 + ocamlPackages.opium 58 + ocamlPackages.textutils 59 + ocamlPackages.jst-config 60 + ocamlPackages.parany 61 + ocamlPackages.conduit-lwt-unix 62 + ocamlPackages.lwt_react 63 + ocamlPackages.tls 64 + combyKernel 65 + ] ++ (if !stdenv.isAarch32 && !stdenv.isAarch64 then 66 + [ ocamlPackages.hack_parallel ] 67 + else 68 + [ ]); 69 + 70 + extraNativeInputs = [ 71 + autoconf 72 + pkg-config 73 + ocamlPackages.ppx_jane 74 + ocamlPackages.ppx_expect 75 + ocamlPackages.dune-configurator 76 + ]; 77 + }
+5 -10
pkgs/development/tools/rgp/default.nix
··· 12 12 , libX11 13 13 , libxcb 14 14 , libXi 15 - , ncurses5 15 + , ncurses 16 16 , qtbase 17 17 , qtdeclarative 18 18 , zlib 19 19 }: 20 20 21 21 let 22 - buildNum = "2021-03-31-696"; 22 + buildNum = "2021-06-30-819"; 23 23 in 24 24 stdenv.mkDerivation rec { 25 25 pname = "rgp"; 26 - version = "1.10"; 26 + version = "1.11"; 27 27 28 28 src = fetchurl { 29 29 url = "https://gpuopen.com/download/radeon-developer-tool-suite/RadeonDeveloperToolSuite-${buildNum}.tgz"; 30 - sha256 = "1GUV75KpYbeq7KkE86QqTfGnf/t3VEgviaAsbg/LWJI="; 30 + sha256 = "ru+e/oY844x4nvSVRBrTGDdnzUOBhwkaIrnftBITyE8="; 31 31 }; 32 32 33 33 nativeBuildInputs = [ makeWrapper autoPatchelfHook ]; ··· 42 42 libX11 43 43 libxcb 44 44 libXi 45 - ncurses5 45 + ncurses 46 46 qtbase 47 47 qtdeclarative 48 48 zlib 49 - ]; 50 - 51 - runtimeDependencies = [ 52 - "${placeholder "out"}/opt/rgp" 53 - "${placeholder "out"}/opt/rgp/qt" 54 49 ]; 55 50 56 51 dontWrapQtApps = true;
+38
pkgs/games/cgoban/default.nix
··· 1 + { lib 2 + , stdenv 3 + , writers 4 + , adoptopenjdk-jre-bin 5 + , fetchurl 6 + , makeWrapper 7 + }: 8 + stdenv.mkDerivation rec { 9 + pname = "cgoban"; 10 + version = "3.5.23"; 11 + 12 + nativeBuildInputs = [ adoptopenjdk-jre-bin makeWrapper ]; 13 + 14 + src = fetchurl { 15 + url = "https://web.archive.org/web/20210116034119/https://files.gokgs.com/javaBin/cgoban.jar"; 16 + sha256 = "0srw1hqr9prgr9dagfbh2j6p9ivaj40kdpyhs6zjkg7lhnnrrrcv"; 17 + }; 18 + 19 + dontConfigure = true; 20 + dontUnpack = true; 21 + dontBuild = true; 22 + dontPatchELF = true; 23 + 24 + installPhase = '' 25 + runHook preInstall 26 + install -D $src $out/lib/cgoban.jar 27 + makeWrapper ${adoptopenjdk-jre-bin}/bin/java $out/bin/cgoban --add-flags "-jar $out/lib/cgoban.jar" 28 + runHook postInstall 29 + ''; 30 + 31 + meta = with lib; { 32 + description = "Client for the KGS Go Server"; 33 + homepage = "https://www.gokgs.com/"; 34 + license = licenses.free; 35 + maintainers = with maintainers; [ savannidgerinel ]; 36 + platforms = adoptopenjdk-jre-bin.meta.platforms; 37 + }; 38 + }
+8 -2
pkgs/os-specific/linux/dpdk/default.nix
··· 4 4 , pkg-config, meson, ninja 5 5 , libbsd, numactl, libbpf, zlib, libelf, jansson, openssl, libpcap 6 6 , doxygen, python3 7 + , withExamples ? [] 7 8 , shared ? false }: 8 9 9 10 let ··· 51 52 ++ lib.optional (mod && kernel.kernelOlder "5.11") "-Ddisable_drivers=kni" 52 53 ++ lib.optional (!shared) "-Ddefault_library=static" 53 54 ++ lib.optional stdenv.isx86_64 "-Dmachine=nehalem" 54 - ++ lib.optional mod "-Dkernel_dir=${placeholder "kmod"}/lib/modules/${kernel.modDirVersion}"; 55 + ++ lib.optional mod "-Dkernel_dir=${placeholder "kmod"}/lib/modules/${kernel.modDirVersion}" 56 + ++ lib.optional (withExamples != []) "-Dexamples=${builtins.concatStringsSep "," withExamples}"; 55 57 56 58 # dpdk meson script does not support separate kernel source and installion 57 59 # dirs (except via destdir), so we temporarily link the former into the latter. ··· 65 67 rm -f $kmod/lib/modules/${kernel.modDirVersion}/build 66 68 ''; 67 69 70 + postInstall = lib.optionalString (withExamples != []) '' 71 + find examples -type f -executable -exec install {} $out/bin \; 72 + ''; 73 + 68 74 outputs = [ "out" ] ++ lib.optional mod "kmod"; 69 75 70 76 meta = with lib; { ··· 72 78 homepage = "http://dpdk.org/"; 73 79 license = with licenses; [ lgpl21 gpl2 bsd2 ]; 74 80 platforms = platforms.linux; 75 - maintainers = with maintainers; [ magenbluten orivej mic92 ]; 81 + maintainers = with maintainers; [ magenbluten orivej mic92 zhaofengli ]; 76 82 }; 77 83 }
+5 -2
pkgs/os-specific/linux/odp-dpdk/default.nix
··· 7 7 url = "https://fast.dpdk.org/rel/dpdk-${version}.tar.xz"; 8 8 sha256 = "sha256-RnEzlohDZ3uxwna7dKNFiqfAAswh4pXFHjvWVJexEqs="; 9 9 }; 10 + mesonFlags = old.mesonFlags ++ [ 11 + "-Denable_docs=false" 12 + ]; 10 13 }); 11 14 12 15 in stdenv.mkDerivation rec { 13 16 pname = "odp-dpdk"; 14 - version = "1.27.0.0_DPDK_19.11"; 17 + version = "1.30.1.0_DPDK_19.11"; 15 18 16 19 src = fetchurl { 17 20 url = "https://git.linaro.org/lng/odp-dpdk.git/snapshot/${pname}-${version}.tar.gz"; 18 - sha256 = "sha256-/4m2NqnEXyenNUrCq3c2ozJzPWFFs/Qp7MAVm9B2biA="; 21 + sha256 = "sha256-R3PsqQiHlHPzIYYWTVEC7Ikg3KR5I0jWGgftDA9Jj1o="; 19 22 }; 20 23 21 24 nativeBuildInputs = [
-2
pkgs/servers/serviio/default.nix
··· 9 9 sha256 = "0mxpdyhjf4w83q8ssmvpxm95hw4x7lfkh48vvdablccfndh82x2i"; 10 10 }; 11 11 12 - phases = ["unpackPhase" "installPhase"]; 13 - 14 12 installPhase = '' 15 13 mkdir -p $out 16 14 cp -R config legal lib library plugins LICENCE.txt NOTICE.txt README.txt RELEASE_NOTES.txt $out
-2
pkgs/servers/sql/sqlite/jdbc/default.nix
··· 11 11 sha256 = "1xk5fi2wzq3jspvbdm5hvs78501i14jy3v7x6fjnh5fnpqdacpd4"; 12 12 }; 13 13 14 - phases = [ "installPhase" ]; 15 - 16 14 installPhase = '' 17 15 install -m444 -D ${src}/share/java/*${pname}-${version}.jar "$out/share/java/${pname}-${version}.jar" 18 16 '';
-2
pkgs/servers/zookeeper/default.nix
··· 12 12 nativeBuildInputs = [ makeWrapper ]; 13 13 buildInputs = [ jre ]; 14 14 15 - phases = ["unpackPhase" "installPhase"]; 16 - 17 15 installPhase = '' 18 16 runHook preInstall 19 17 mkdir -p $out
-51
pkgs/tools/graphics/pdfread/default.nix
··· 1 - {lib, stdenv, fetchurl, unzip, python, makeWrapper, ghostscript, pngnq, pillow, djvulibre 2 - , optipng, unrar}: 3 - 4 - stdenv.mkDerivation { 5 - name = "pdfread-1.8.2"; 6 - 7 - src = fetchurl { 8 - # I got it from http://www.mobileread.com/forums/showthread.php?t=21906 9 - # But that needs user registration to allow downloading. 10 - # This is an evolution from pdfread 1.7 in http://pdfread.sourceforge.net/ 11 - # Temporary place: 12 - url = "http://vicerveza.homeunix.net/~viric/soft/PDFRead-1.8.2-Source-noGUI-noInstaller.zip"; 13 - sha256 = "0mzxpnk97f0ww5ds7h4wsval3g4lnrhv6rhspjs7cy4i41gmk8an"; 14 - }; 15 - 16 - nativeBuildInputs = [ makeWrapper unzip ]; 17 - buildInputs = [ python ]; 18 - 19 - broken = true; # Not found. 20 - 21 - phases = "unpackPhase patchPhase installPhase"; 22 - 23 - unpackPhase = '' 24 - unzip $src 25 - sourceRoot=`pwd`/PDFRead/src 26 - ''; 27 - 28 - patchPhase = '' 29 - sed -i 's,#!/usr.*,#!${python}/bin/python,' pdfread.py 30 - ''; 31 - 32 - installPhase = '' 33 - mkdir -p $out/bin 34 - cp pdfread.py $out/bin 35 - chmod +x $out/bin/pdfread.py 36 - 37 - LIBSUFFIX=lib/${python.libPrefix}/site-packages/ 38 - PYDIR=$out/$LIBSUFFIX 39 - mkdir -p $PYDIR 40 - cp -R *.py pylrs $PYDIR 41 - 42 - wrapProgram $out/bin/pdfread.py --prefix PYTHONPATH : $PYTHONPATH:${pillow}/$LIBSUFFIX/PIL:$PYDIR \ 43 - --prefix PATH : ${lib.makeBinPath [ ghostscript pngnq djvulibre unrar optipng ]} 44 - ''; 45 - 46 - meta = with lib; { 47 - description = "PDF/DJVU to ebook format converter"; 48 - homepage = "https://www.mobileread.com/forums/showthread.php?t=21906"; 49 - license = licenses.mit; 50 - }; 51 - }
+3 -3
pkgs/tools/security/gpg-tui/default.nix
··· 15 15 16 16 rustPlatform.buildRustPackage rec { 17 17 pname = "gpg-tui"; 18 - version = "0.7.1"; 18 + version = "0.7.2"; 19 19 20 20 src = fetchFromGitHub { 21 21 owner = "orhun"; 22 22 repo = "gpg-tui"; 23 23 rev = "v${version}"; 24 - sha256 = "sha256-J1mdgcNWloQOnGdBjcCoAsv+ClQ77DXYQajM9B3sYHY="; 24 + sha256 = "sha256-2FnSCTq+Im7sbiEkbKZ9f09i/lWme/aCrcCOgcIlXp4="; 25 25 }; 26 26 27 - cargoSha256 = "sha256-I63Pevw0BjkjasszZn2wmT4TNeVk27pJy4mJR6nl9MI="; 27 + cargoSha256 = "sha256-v2aZPVBT5XEaffTZHnAgRWGs6HDvL9b8ihR50I4VnJ4="; 28 28 29 29 nativeBuildInputs = [ 30 30 gpgme # for gpgme-config
+6 -6
pkgs/top-level/all-packages.nix
··· 1747 1747 xcodeenv = callPackage ../development/mobile/xcodeenv { }; 1748 1748 1749 1749 gomobile = callPackage ../development/mobile/gomobile { 1750 - buildGoModule = buildGo115Module; 1750 + buildGoModule = buildGo116Module; 1751 1751 }; 1752 1752 1753 1753 ssh-agents = callPackage ../tools/networking/ssh-agents { }; ··· 7943 7943 7944 7944 pdfarranger = callPackage ../applications/misc/pdfarranger { }; 7945 7945 7946 - pdfread = callPackage ../tools/graphics/pdfread { 7947 - inherit (pythonPackages) pillow; 7948 - }; 7946 + pdfread = throw "pdfread has been remove from nixpkgs, because it is unmaintained for years and the sources are no longer available"; 7949 7947 7950 7948 briss = callPackage ../tools/graphics/briss { }; 7951 7949 ··· 10756 10754 10757 10755 cmucl_binary = pkgsi686Linux.callPackage ../development/compilers/cmucl/binary.nix { }; 10758 10756 10757 + comby = callPackage ../development/tools/comby { }; 10758 + 10759 10759 compcert = coqPackages.compcert.override { version = "3.9"; }; 10760 10760 10761 10761 computecpp-unwrapped = callPackage ../development/compilers/computecpp {}; ··· 17155 17155 libtpms = callPackage ../tools/security/libtpms { }; 17156 17156 17157 17157 libtap = callPackage ../development/libraries/libtap { }; 17158 - 17159 - libtgvoip = callPackage ../development/libraries/libtgvoip { }; 17160 17158 17161 17159 libtsm = callPackage ../development/libraries/libtsm { }; 17162 17160 ··· 28788 28786 cbonsai = callPackage ../games/cbonsai { }; 28789 28787 28790 28788 cdogs-sdl = callPackage ../games/cdogs-sdl { }; 28789 + 28790 + cgoban = callPackage ../games/cgoban { }; 28791 28791 28792 28792 chessdb = callPackage ../games/chessdb { }; 28793 28793
+32
pkgs/top-level/ocaml-packages.nix
··· 415 415 416 416 h2 = callPackage ../development/ocaml-modules/h2 { }; 417 417 418 + hack_parallel = callPackage ../development/ocaml-modules/hack_parallel { }; 419 + 418 420 hacl_x25519 = callPackage ../development/ocaml-modules/hacl_x25519 { }; 419 421 420 422 hacl-star = callPackage ../development/ocaml-modules/hacl-star { }; ··· 793 795 mmap = callPackage ../development/ocaml-modules/mmap { }; 794 796 795 797 mparser = callPackage ../development/ocaml-modules/mparser { }; 798 + 799 + mparser-pcre = callPackage ../development/ocaml-modules/mparser/pcre.nix { }; 796 800 797 801 mtime = callPackage ../development/ocaml-modules/mtime { }; 798 802 ··· 1228 1232 tcslib = callPackage ../development/ocaml-modules/tcslib { }; 1229 1233 1230 1234 terminal_size = callPackage ../development/ocaml-modules/terminal_size { }; 1235 + 1236 + tezos-base = callPackage ../development/ocaml-modules/tezos/base.nix { }; 1237 + tezos-clic = callPackage ../development/ocaml-modules/tezos/clic.nix { }; 1238 + tezos-crypto = callPackage ../development/ocaml-modules/tezos/crypto.nix { }; 1239 + tezos-error-monad = callPackage ../development/ocaml-modules/tezos/error-monad.nix { }; 1240 + tezos-event-logging = callPackage ../development/ocaml-modules/tezos/event-logging.nix { }; 1241 + tezos-lmdb = callPackage ../development/ocaml-modules/tezos/lmdb.nix { }; 1242 + tezos-lwt-result-stdlib = callPackage ../development/ocaml-modules/tezos/lwt-result-stdlib.nix { }; 1243 + tezos-micheline = callPackage ../development/ocaml-modules/tezos/micheline.nix { }; 1244 + tezos-p2p-services = callPackage ../development/ocaml-modules/tezos/p2p-services.nix { }; 1245 + tezos-p2p = callPackage ../development/ocaml-modules/tezos/p2p.nix { }; 1246 + tezos-protocol-008-PtEdo2Zk-parameters = callPackage ../development/ocaml-modules/tezos/protocol-008-PtEdo2Zk-parameters.nix { }; 1247 + tezos-protocol-008-PtEdo2Zk = callPackage ../development/ocaml-modules/tezos/protocol-008-PtEdo2Zk.nix { }; 1248 + tezos-protocol-compiler = callPackage ../development/ocaml-modules/tezos/protocol-compiler.nix { }; 1249 + tezos-protocol-demo-noops = callPackage ../development/ocaml-modules/tezos/protocol-demo-noops.nix { }; 1250 + tezos-protocol-environment-packer = callPackage ../development/ocaml-modules/tezos/protocol-environment-packer.nix { }; 1251 + tezos-protocol-environment-sigs = callPackage ../development/ocaml-modules/tezos/protocol-environment-sigs.nix { }; 1252 + tezos-protocol-environment-structs = callPackage ../development/ocaml-modules/tezos/protocol-environment-structs.nix { }; 1253 + tezos-protocol-environment = callPackage ../development/ocaml-modules/tezos/protocol-environment.nix { }; 1254 + tezos-requester = callPackage ../development/ocaml-modules/tezos/requester.nix { }; 1255 + tezos-rpc = callPackage ../development/ocaml-modules/tezos/rpc.nix { }; 1256 + tezos-sapling = callPackage ../development/ocaml-modules/tezos/sapling.nix { }; 1257 + tezos-shell-services = callPackage ../development/ocaml-modules/tezos/shell-services.nix { }; 1258 + tezos-stdlib-unix = callPackage ../development/ocaml-modules/tezos/stdlib-unix.nix { }; 1259 + tezos-stdlib = callPackage ../development/ocaml-modules/tezos/stdlib.nix { }; 1260 + tezos-test-services = callPackage ../development/ocaml-modules/tezos/test-services.nix { }; 1261 + tezos-version = callPackage ../development/ocaml-modules/tezos/version.nix { }; 1262 + tezos-workers = callPackage ../development/ocaml-modules/tezos/workers.nix { }; 1231 1263 1232 1264 toml = callPackage ../development/ocaml-modules/toml { }; 1233 1265