dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot] 2021-07-23 12:02:01 +00:00 committed by GitHub
commit 3bc17773a5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
63 changed files with 1060 additions and 227 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/types.nix
View File

@ -287,6 +287,13 @@ rec {
merge = mergeEqualOption;
};
nonEmptyStr = mkOptionType {
name = "nonEmptyStr";
description = "non-empty string";
check = x: str.check x && builtins.match "[ \t\n]*" x == null;
inherit (str) merge;
};
strMatching = pattern: mkOptionType {
name = "strMatching ${escapeNixString pattern}";
description = "string matching the pattern ${pattern}";

11
nixos/modules/config/swap.nix
View File

@ -127,6 +127,15 @@ let
'';
};
options = mkOption {
default = [ "defaults" ];
example = [ "nofail" ];
type = types.listOf types.nonEmptyStr;
description = ''
Options used to mount the swap.
'';
};
deviceName = mkOption {
type = types.str;
internal = true;
@ -215,7 +224,7 @@ in
fi
''}
${optionalString sw.randomEncryption.enable ''
cryptsetup plainOpen -c ${sw.randomEncryption.cipher} -d ${sw.randomEncryption.source} ${sw.device} ${sw.deviceName}
cryptsetup plainOpen -c ${sw.randomEncryption.cipher} -d ${sw.randomEncryption.source} ${optionalString (sw.discardPolicy != null) "--allow-discards"} ${sw.device} ${sw.deviceName}
mkswap ${sw.realDevice}
''}
'';

1
nixos/modules/services/web-apps/nextcloud.nix
View File

@ -699,7 +699,6 @@ in {
};
extraConfig = ''
index index.php index.html /index.php$request_uri;
expires 1m;
add_header X-Content-Type-Options nosniff;
add_header X-XSS-Protection "1; mode=block";
add_header X-Robots-Tag none;

2
nixos/modules/tasks/filesystems.nix
View File

@ -255,7 +255,7 @@ in
# https://wiki.archlinux.org/index.php/fstab#Filepath_spaces
escape = string: builtins.replaceStrings [ " " "\t" ] [ "\\040" "\\011" ] string;
swapOptions = sw: concatStringsSep "," (
[ "defaults" ]
sw.options
++ optional (sw.priority != null) "pri=${toString sw.priority}"
++ optional (sw.discardPolicy != null) "discard${optionalString (sw.discardPolicy != "both") "=${toString sw.discardPolicy}"}"
);

3
nixos/tests/chromium.nix
View File

@ -239,7 +239,8 @@ mapAttrs (channel: chromiumPkg: makeTest rec {
with test_new_win("gpu_info", "chrome://gpu", "chrome://gpu"):
pass
# To check the text rendering (catches regressions like #131074):
machine.wait_for_text("Graphics Feature Status")
machine.shutdown()

4
pkgs/applications/misc/bemenu/default.nix
View File

@ -11,13 +11,13 @@ assert x11Support -> xorg != null;
stdenv.mkDerivation rec {
pname = "bemenu";
version = "0.6.2";
version = "0.6.3";
src = fetchFromGitHub {
owner = "Cloudef";
repo = pname;
rev = version;
sha256 = "sha256-2xmi/Mh5iU50yc2R1x1yzP8Xaz+mUgLnH73tAeLwxI8=";
sha256 = "sha256-U4IMfDvQ0rfEJhE3Uext2c/Cs0mjy1tw+k8uk441Ag8=";
};
nativeBuildInputs = [ pkg-config pcre ];

35
pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
View File

@ -1,11 +1,11 @@
{ mkDerivation, lib, fetchFromGitHub, callPackage, fetchpatch
, pkg-config, cmake, ninja, python3, wrapGAppsHook, wrapQtAppsHook, removeReferencesTo
, pkg-config, cmake, ninja, python3, wrapGAppsHook, wrapQtAppsHook
, qtbase, qtimageformats, gtk3, libsForQt5, lz4, xxHash
, ffmpeg, openalSoft, minizip, libopus, alsa-lib, libpulseaudio, range-v3
, tl-expected, hunspell, glibmm, webkitgtk, jemalloc
, libtgvoip, rnnoise, abseil-cpp, extra-cmake-modules
, rnnoise, extra-cmake-modules
# Transitive dependencies:
, pcre, xorg, util-linux, libselinux, libsepol, epoxy
, pcre, xorg, util-linuxMinimal, libselinux, libsepol, epoxy
, at-spi2-core, libXtst, libthai, libdatrie
, xdg-utils, libsysprof-capture, libpsl, brotli
}:
@ -46,22 +46,33 @@ in mkDerivation rec {
postPatch = ''
substituteInPlace Telegram/CMakeLists.txt \
--replace '"''${TDESKTOP_LAUNCHER_BASENAME}.appdata.xml"' '"''${TDESKTOP_LAUNCHER_BASENAME}.metainfo.xml"'
substituteInPlace Telegram/ThirdParty/libtgvoip/os/linux/AudioInputALSA.cpp \
--replace '"libasound.so.2"' '"${alsa-lib}/lib/libasound.so.2"'
substituteInPlace Telegram/ThirdParty/libtgvoip/os/linux/AudioOutputALSA.cpp \
--replace '"libasound.so.2"' '"${alsa-lib}/lib/libasound.so.2"'
substituteInPlace Telegram/ThirdParty/libtgvoip/os/linux/AudioPulse.cpp \
--replace '"libpulse.so.0"' '"${libpulseaudio}/lib/libpulse.so.0"'
'';
# We want to run wrapProgram manually (with additional parameters)
dontWrapGApps = true;
dontWrapQtApps = true;
nativeBuildInputs = [ pkg-config cmake ninja python3 wrapGAppsHook wrapQtAppsHook removeReferencesTo ];
nativeBuildInputs = [
pkg-config cmake ninja python3 wrapGAppsHook wrapQtAppsHook
extra-cmake-modules
];
buildInputs = [
qtbase qtimageformats gtk3 libsForQt5.kwayland libsForQt5.libdbusmenu lz4 xxHash
ffmpeg openalSoft minizip libopus alsa-lib libpulseaudio range-v3
tl-expected hunspell glibmm webkitgtk jemalloc
libtgvoip rnnoise abseil-cpp extra-cmake-modules
rnnoise
tg_owt
# Transitive dependencies:
pcre xorg.libpthreadstubs xorg.libXdmcp util-linux libselinux libsepol epoxy
util-linuxMinimal # Required for libmount thus not nativeBuildInputs.
pcre xorg.libpthreadstubs xorg.libXdmcp libselinux libsepol epoxy
at-spi2-core libXtst libthai libdatrie libsysprof-capture libpsl brotli
];
@ -70,19 +81,17 @@ in mkDerivation rec {
# We're allowed to used the API ID of the Snap package:
"-DTDESKTOP_API_ID=611335"
"-DTDESKTOP_API_HASH=d524b414d21f4d37f08684c1df41ac9c"
#"-DDESKTOP_APP_SPECIAL_TARGET=\"\"" # TODO: Error when set to "": Bad special target '""'
"-DTDESKTOP_LAUNCHER_BASENAME=telegramdesktop" # Note: This is the default
# See: https://github.com/NixOS/nixpkgs/pull/130827#issuecomment-885212649
"-DDESKTOP_APP_USE_PACKAGED_FONTS=OFF"
];
# Note: The following packages could be packaged system-wide, but it's
# probably best to use the bundled ones from tdesktop (Arch does this too):
# rlottie:
# - CMake flag: "-DTDESKTOP_USE_PACKAGED_TGVOIP=ON"
# - Sources (problem: there are no stable releases!):
# - desktop-app (tdesktop): https://github.com/desktop-app/rlottie
# - upstream: https://github.com/Samsung/rlottie
# libtgvoip:
# - CMake flag: "-DDESKTOP_APP_USE_PACKAGED_RLOTTIE=ON"
# - Sources (problem: the stable releases might be too old!):
# - tdesktop: https://github.com/telegramdesktop/libtgvoip
# - upstream: https://github.com/grishka/libtgvoip
@ -113,10 +122,10 @@ in mkDerivation rec {
Desktop client for the Telegram messenger, based on the Telegram API and
the MTProto secure protocol.
'';
license = licenses.gpl3;
license = licenses.gpl3Only;
platforms = platforms.linux;
homepage = "https://desktop.telegram.org/";
changelog = "https://github.com/telegramdesktop/tdesktop/releases/tag/v{version}";
maintainers = with maintainers; [ primeos abbradar ];
changelog = "https://github.com/telegramdesktop/tdesktop/releases/tag/v${version}";
maintainers = with maintainers; [ primeos abbradar oxalica ];
};
}

20
pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix
View File

@ -1,9 +1,9 @@
{ lib, stdenv, fetchFromGitHub, fetchpatch
, pkg-config, cmake, ninja, yasm
, libjpeg, openssl, libopus, ffmpeg, alsa-lib, libpulseaudio, protobuf
, xorg, libXtst, libXcomposite, libXdamage, libXext, libXrender, libXrandr
, openh264, usrsctp, libevent, libvpx
, glib, abseil-cpp, pcre, util-linuxMinimal, libselinux, libsepol, pipewire
, libXi
, xorg, libX11, libXtst, libXcomposite, libXdamage, libXext, libXrender, libXrandr, libXi
}:
stdenv.mkDerivation {
@ -24,15 +24,23 @@ stdenv.mkDerivation {
buildInputs = [
libjpeg openssl libopus ffmpeg alsa-lib libpulseaudio protobuf
xorg.libX11 libXtst libXcomposite libXdamage libXext libXrender libXrandr
openh264 usrsctp libevent libvpx
libX11 libXtst libXcomposite libXdamage libXext libXrender libXrandr libXi
glib abseil-cpp pcre util-linuxMinimal libselinux libsepol pipewire
libXi
];
cmakeFlags = [
# Building as a shared library isn't officially supported and currently broken:
# Building as a shared library isn't officially supported and may break at any time.
"-DBUILD_SHARED_LIBS=OFF"
];
meta.license = lib.licenses.bsd3;
propagatedBuildInputs = [
# Required for linking downstream binaries.
abseil-cpp openh264 usrsctp libevent libvpx
];
meta = with lib; {
license = licenses.bsd3;
maintainers = with maintainers; [ oxalica ];
};
}

4
pkgs/applications/networking/instant-messengers/telegram/tdesktop/update.py
View File

@ -71,7 +71,3 @@ if __name__ == "__main__":
tg_owt_hash = nix_prefetch_git('https://github.com/desktop-app/tg_owt.git', tg_owt_ref)
update_file('tg_owt.nix', tg_owt_version, tg_owt_hash, tg_owt_ref)
tg_owt_ref = github_api_request('repos/desktop-app/tg_owt/commits/master')['sha']
libtgvoip_ref = github_api_request(f'repos/telegramdesktop/tdesktop/contents/Telegram/ThirdParty/libtgvoip?ref={tdesktop_tag}')['sha']
libtgvoip_version = get_commit_date('telegramdesktop/libtgvoip', libtgvoip_ref)
libtgvoip_hash = nix_prefetch_url(f'https://github.com/telegramdesktop/libtgvoip/archive/{libtgvoip_ref}.tar.gz', unpack=True)
update_file('../../../../../development/libraries/libtgvoip/default.nix', libtgvoip_version, libtgvoip_hash, libtgvoip_ref)

7
pkgs/applications/networking/ipfs/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "ipfs";
version = "0.9.0";
version = "0.9.1";
rev = "v${version}";
# go-ipfs makes changes to it's source tarball that don't match the git source.
src = fetchurl {
url = "https://github.com/ipfs/go-ipfs/releases/download/${rev}/go-ipfs-source.tar.gz";
sha256 = "sha256:1fyffnw1d860w7gwm6ijbgrh68297z5bmvww8yqfshm3xgvcs6bf";
sha256 = "sha256-RliyIEtNgwzbLVwl6T38VIbhc12CZMBc3LZ6T/llaHc=";
};
# tarball contains multiple files/directories
@ -29,10 +29,13 @@ buildGoModule rec {
postInstall = ''
install --mode=444 -D misc/systemd/ipfs.service $out/etc/systemd/system/ipfs.service
install --mode=444 -D misc/systemd/ipfs-hardened.service $out/etc/systemd/system/ipfs-hardened.service
install --mode=444 -D misc/systemd/ipfs-api.socket $out/etc/systemd/system/ipfs-api.socket
install --mode=444 -D misc/systemd/ipfs-gateway.socket $out/etc/systemd/system/ipfs-gateway.socket
substituteInPlace $out/etc/systemd/system/ipfs.service \
--replace /usr/bin/ipfs $out/bin/ipfs
substituteInPlace $out/etc/systemd/system/ipfs-hardened.service \
--replace /usr/bin/ipfs $out/bin/ipfs
'';
meta = with lib; {

10
pkgs/applications/terminal-emulators/foot/default.nix
View File

@ -2,6 +2,7 @@
, lib
, fetchzip
, fetchurl
, fetchpatch
, runCommandNoCC
, fcft
, freetype
@ -98,6 +99,15 @@ stdenv.mkDerivation rec {
sha256 = "1k0alz991cslls4926c5gq02pdq0vfw9jfpprh2a1vb59xgikv7h";
};
patches = [
# Fixes PGO builds with clang
(fetchpatch {
url = "https://codeberg.org/dnkl/foot/commit/2acd4b34c57659d86dca76c58e4363de9b0a1f17.patch";
sha256 = "13xi9ppaqx2p88cxbh6801ry9ral70ylh40agn6ij7pklybs4d7s";
includes = [ "pgo/pgo.c" ];
})
];
depsBuildBuild = [
pkg-config
];

9
pkgs/applications/version-management/git-and-tools/git-sync/default.nix
View File

@ -28,11 +28,14 @@ stdenv.mkDerivation rec {
gnused
];
fixupPhase = ''
patchShebangs $out/bin
postFixup = ''
wrap_path="${wrapperPath}":$out/bin
wrapProgram $out/bin/git-sync \
--prefix PATH : "${wrapperPath}"
--prefix PATH : $wrap_path
wrapProgram $out/bin/git-sync-on-inotify \
--prefix PATH : $wrap_path
'';
meta = {

1
pkgs/data/fonts/tempora-lgc/default.nix
View File

@ -25,7 +25,6 @@ stdenv.mkDerivation {
name = "tempora-lgc";
inherit nativeBuildInputs;
inherit srcs;
phases = "installPhase";
installPhase = ''
mkdir -p "$out/share/fonts/opentype/public"
cp ${toString srcs} "$out/share/fonts/opentype/public"

18
pkgs/desktops/pantheon/apps/appcenter/default.nix
View File

@ -7,7 +7,6 @@
, elementary-gtk-theme
, elementary-icon-theme
, fetchFromGitHub
, fetchpatch
, flatpak
, gettext
, glib
@ -15,6 +14,7 @@
, gtk3
, json-glib
, libgee
, libhandy
, libsoup
, libxml2
, meson
@ -25,30 +25,20 @@
, python3
, vala
, polkit
, libhandy_0
, wrapGAppsHook
}:
stdenv.mkDerivation rec {
pname = "appcenter";
version = "3.5.1";
version = "3.6.0";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
sha256 = "MsaXdmL+M+NYAJrrwluleeNxqQg0soFbO/G/FqibBFI=";
sha256 = "0kwqgilhyrj2nbvw5y34nzch5h9jnrg1a1n333qdsx4ax6yrxh4j";
};
patches = [
# Allow build with appstream 0.14.x
# https://github.com/elementary/appcenter/pull/1493
(fetchpatch {
url = "https://github.com/elementary/appcenter/commit/5807dd13fe3c715f26225aed8d7a0abdea0c2a64.patch";
sha256 = "BvEahG9lU9ZdgooFDFhm5evRvnKVcmcHLdmZPb85gbo=";
})
];
passthru = {
updateScript = nix-update-script {
attrPath = "pantheon.${pname}";
@ -78,7 +68,7 @@ stdenv.mkDerivation rec {
gtk3
json-glib
libgee
libhandy_0 # doesn't support libhandy-1 yet
libhandy
libsoup
libxml2
packagekit

48
pkgs/development/libraries/libtgvoip/default.nix
View File

@ -1,48 +0,0 @@
{ stdenv, lib, fetchFromGitHub, fetchpatch
, pkg-config, autoreconfHook
, openssl, libopus, alsa-lib, libpulseaudio
}:
with lib;
stdenv.mkDerivation rec {
pname = "libtgvoip";
version = "unstable-2021-07-13";
src = fetchFromGitHub {
owner = "telegramdesktop";
repo = "libtgvoip";
rev = "f321e7c8cc086bac6ae06fa0934aac7d9833a310";
sha256 = "1gk5nsqhbnn1cdh83b70qr3d3v2c1bncylvgn77vvj8vnyjlmnfq";
};
# To fix the build without external webrtc:
patches = [
(fetchpatch {
# Use methods from updated webrtc.
url = "https://github.com/telegramdesktop/libtgvoip/commit/13a5fcb16b04472d808ce122abd695dbf5d206cd.patch";
sha256 = "0wapqvml3yyv5dlp2q8iih5rfvfnkngll69krhnw5xsdjy22sp7r";
revert = true;
})
(fetchpatch {
# Allow working with external webrtc.
url = "https://github.com/telegramdesktop/libtgvoip/commit/6e82b6e45664c1f80b9039256c99bebc76d34672.patch";
sha256 = "0m87ixja70vnm80a9z4gxk0yl7n64y59smczxb88lxnj6kdgih7x";
revert = true;
})
];
outputs = [ "out" "dev" ];
nativeBuildInputs = [ pkg-config autoreconfHook ];
buildInputs = [ openssl libopus alsa-lib libpulseaudio ];
enableParallelBuilding = true;
meta = {
description = "VoIP library for Telegram clients";
license = licenses.unlicense;
platforms = platforms.linux;
homepage = "https://github.com/telegramdesktop/libtgvoip";
maintainers = with maintainers; [ ilya-fedin ];
};
}

7
pkgs/development/libraries/tezos-rust-libs/default.nix
View File

@ -19,10 +19,11 @@ rustPlatform.buildRustPackage rec {
'';
postInstall = ''
mkdir $out/lib/tezos-rust-libs
cp -r rustc-bls12-381/include $out/include
cp $out/lib/librustc_bls12_381.a $out/lib/tezos-rust-libs
cp $out/lib/librustzcash.a $out/lib/tezos-rust-libs
cp -r librustzcash/include $out
cp -r $out/lib $out/tmp
mkdir $out/lib/tezos-rust-libs
mv $out/tmp/ $out/lib/tezos-rust-libs/
'';
doCheck = true;

17
pkgs/development/mobile/gomobile/default.nix
View File

@ -3,21 +3,20 @@
, xcodeWrapper ? xcodeenv.composeXcodeWrapper xcodeWrapperArgs
, androidPkgs ? androidenv.composeAndroidPackages {
includeNDK = true;
ndkVersion = "21.3.6528147"; # WARNING: 22.0.7026061 is broken.
ndkVersion = "22.1.7171670";
} }:
buildGoModule {
pname = "gomobile";
version = "unstable-2020-06-22";
version = "unstable-2021-06-14";
vendorSha256 = "1n1338vqkc1n8cy94501n7jn3qbr28q9d9zxnq2b4rxsqjfc9l94";
vendorSha256 = "1irgkgv72rakg7snk1bnp10ibr64ykz9l40s59l4fnl63zsh12a0";
src = fetchgit {
# WARNING: Next commit removes support for ARM 32 bit builds for iOS
rev = "33b80540585f2b31e503da24d6b2a02de3c53ff5";
rev = "7c8f154d100840bc5828285bb390bbae1cb5a98c";
name = "gomobile";
url = "https://go.googlesource.com/mobile";
sha256 = "0c9map2vrv34wmaycsv71k4day3b0z5p16yzxmlp8amvqb38zwlm";
sha256 = "1w9mra1mqf60iafp0ywvja5196fjsjyfhvz4yizqq4qkyll5qmj1";
};
subPackages = [ "bind" "cmd/gobind" "cmd/gomobile" ];
@ -25,8 +24,6 @@ buildGoModule {
# Fails with: go: cannot find GOROOT directory
doCheck = false;
patches = [ ./resolve-nix-android-sdk.patch ];
nativeBuildInputs = [ makeWrapper ]
++ lib.optionals stdenv.isDarwin [ xcodeWrapper ];
@ -48,8 +45,8 @@ buildGoModule {
wrapProgram $out/bin/gomobile \
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ zlib ]}" \
--prefix PATH : "${androidPkgs.androidsdk}/bin" \
--set ANDROID_HOME "${androidPkgs.androidsdk}/libexec/android-sdk" \
--set GOPATH $out
--set ANDROID_NDK_HOME "${androidPkgs.androidsdk}/libexec/android-sdk/ndk-bundle" \
--set ANDROID_HOME "${androidPkgs.androidsdk}/libexec/android-sdk"
'';
meta = with lib; {

15
pkgs/development/mobile/gomobile/resolve-nix-android-sdk.patch
View File

@ -1,15 +0,0 @@
diff --git a/cmd/gomobile/bind_androidapp.go b/cmd/gomobile/bind_androidapp.go
index 3b01adc..76216fa 100644
--- a/cmd/gomobile/bind_androidapp.go
+++ b/cmd/gomobile/bind_androidapp.go
@@ -372,6 +372,10 @@ func androidAPIPath() (string, error) {
var apiVer int
for _, fi := range fis {
name := fi.Name()
+ // Resolve symlinked directories (this is how the Nix Android SDK package is built)
+ if fi2, err := os.Stat(filepath.Join(sdkDir.Name(), name)); err == nil {
+ fi = fi2
+ }
if !fi.IsDir() || !strings.HasPrefix(name, "android-") {
continue
}

26
pkgs/development/ocaml-modules/hack_parallel/default.nix Normal file
View File

@ -0,0 +1,26 @@
{ lib, fetchFromGitHub, buildDunePackage, core, core_kernel, pkg-config, sqlite
}:
buildDunePackage rec {
pname = "hack_parallel";
version = "1.0.1";
useDune2 = true;
minimumOcamlVersion = "4.04.1";
src = fetchFromGitHub {
owner = "rvantonder";
repo = "hack_parallel";
rev = version;
sha256 = "0qjlkw35r4q2cm0n2x0i73zvx1xgrp6axaia2nm8zxpm49mid629";
};
nativeBuildInputs = [ pkg-config ];
buildInputs = [ core core_kernel sqlite ];
meta = {
description =
"Core parallel and shared memory library used by Hack, Flow, and Pyre";
license = lib.licenses.mit;
homepage = "https://github.com/rvantonder/hack_parallel";
};
}

28
pkgs/development/ocaml-modules/mparser/default.nix
View File

@ -1,25 +1,21 @@
{ stdenv, lib, fetchzip, ocaml, findlib, ocamlbuild }:
{ lib, fetchFromGitHub, buildDunePackage }:
stdenv.mkDerivation {
name = "ocaml${ocaml.version}-mparser-1.2.3";
src = fetchzip {
url = "https://github.com/cakeplus/mparser/archive/1.2.3.tar.gz";
sha256 = "1f8vpagmv0jdm50pxs2xwh2xcmvgaprx4kw871hlml9ahsflxgnw";
buildDunePackage rec {
pname = "mparser";
version = "1.3";
useDune2 = true;
src = fetchFromGitHub {
owner = "murmour";
repo = "mparser";
rev = version;
sha256 = "16j19v16r42gcsii6a337zrs5cxnf12ig0vaysxyr7sq5lplqhkx";
};
buildInputs = [ ocaml findlib ocamlbuild ];
configurePhase = "ocaml setup.ml -configure";
buildPhase = "ocaml setup.ml -build";
installPhase = "ocaml setup.ml -install";
createFindlibDestdir = true;
meta = {
description = "A simple monadic parser combinator OCaml library";
license = lib.licenses.lgpl21Plus;
homepage = "https://github.com/cakeplus/mparser";
homepage = "https://github.com/murmour/mparser";
maintainers = [ lib.maintainers.vbgl ];
inherit (ocaml.meta) platforms;
};
}

12
pkgs/development/ocaml-modules/mparser/pcre.nix Normal file
View File

@ -0,0 +1,12 @@
{ fetchFromGitHub, buildDunePackage, ocaml_pcre, mparser }:
buildDunePackage rec {
pname = "mparser-pcre";
useDune2 = true;
inherit (mparser) src version;
propagatedBuildInputs = [ ocaml_pcre mparser ];
meta = mparser.meta // { description = "PCRE-based regular expressions"; };
}

9
pkgs/development/ocaml-modules/parany/default.nix
View File

@ -2,15 +2,16 @@
buildDunePackage rec {
pname = "parany";
version = "8.0.0";
version = "12.0.3";
useDune2 = true;
minimumOCamlVersion = "4.03.0";
src = fetchFromGitHub {
owner = "UnixJunkie";
repo = pname;
rev = "v${version}";
sha256 = "19yz1yqyqx6gawy93jlh3x6vji2p9qsy6nsbj65q5pii8p1fjlsm";
repo = pname;
rev = "v${version}";
sha256 = "1j962ak68kvv62bczjqxwlwvdgcvjfcs36qwq12nnm0pwlzkhg33";
};
propagatedBuildInputs = [ ocamlnet cpu ];

33
pkgs/development/ocaml-modules/tezos/base.nix Normal file
View File

@ -0,0 +1,33 @@
{ lib
, buildDunePackage
, tezos-stdlib
, tezos-crypto
, tezos-micheline
, ptime
, ezjsonm
, ipaddr
, qcheck-alcotest
, crowbar
}:
buildDunePackage {
pname = "tezos-base";
inherit (tezos-stdlib) version src useDune2 preBuild doCheck;
propagatedBuildInputs = [
tezos-crypto
tezos-micheline
ptime
ezjsonm
ipaddr
];
checkInputs = [
qcheck-alcotest
crowbar
];
meta = tezos-stdlib.meta // {
description = "Tezos: meta-package and pervasive type definitions for Tezos";
};
}

25
pkgs/development/ocaml-modules/tezos/clic.nix Normal file
View File

@ -0,0 +1,25 @@
{ lib
, buildDunePackage
, tezos-stdlib
, tezos-stdlib-unix
, alcotest
, alcotest-lwt
}:
buildDunePackage {
pname = "tezos-clic";
inherit (tezos-stdlib) version src useDune2 preBuild doCheck;
propagatedBuildInputs = [
tezos-stdlib-unix
];
checkInputs = [
alcotest
alcotest-lwt
];
meta = tezos-stdlib.meta // {
description = "Tezos: library of auto-documented command-line-parsing combinators";
};
}

38
pkgs/development/ocaml-modules/tezos/crypto.nix Normal file
View File

@ -0,0 +1,38 @@
{ lib
, buildDunePackage
, tezos-stdlib
, tezos-clic
, tezos-rpc
, bls12-381
, hacl-star
, secp256k1-internal
, uecc
, ringo
, ff
, alcotest
, alcotest-lwt
}:
buildDunePackage {
pname = "tezos-crypto";
inherit (tezos-stdlib) version src useDune2 preBuild doCheck;
propagatedBuildInputs = [
tezos-clic
tezos-rpc
bls12-381
hacl-star
secp256k1-internal
uecc
ringo
];
checkInputs = [
alcotest
alcotest-lwt
];
meta = tezos-stdlib.meta // {
description = "Tezos: library with all the cryptographic primitives used by Tezos";
};
}

30
pkgs/development/ocaml-modules/tezos/error-monad.nix Normal file
View File

@ -0,0 +1,30 @@
{ lib
, buildDunePackage
, tezos-stdlib
, data-encoding
, lwt
, lwt-canceler
, alcotest
, alcotest-lwt
}:
buildDunePackage {
pname = "tezos-error-monad";
inherit (tezos-stdlib) version src useDune2 preBuild doCheck;
propagatedBuildInputs = [
tezos-stdlib
data-encoding
lwt
lwt-canceler
];
checkInputs = [
alcotest
alcotest-lwt
];
meta = tezos-stdlib.meta // {
description = "Tezos: error monad";
};
}

22
pkgs/development/ocaml-modules/tezos/event-logging.nix Normal file
View File

@ -0,0 +1,22 @@
{ lib
, buildDunePackage
, tezos-stdlib
, tezos-lwt-result-stdlib
, lwt_log
, alcotest
, alcotest-lwt
}:
buildDunePackage {
pname = "tezos-event-logging";
inherit (tezos-stdlib) version src useDune2 preBuild doCheck;
propagatedBuildInputs = [
tezos-lwt-result-stdlib
lwt_log
];
meta = tezos-stdlib.meta // {
description = "Tezos: event logging library";
};
}

51
pkgs/development/ocaml-modules/tezos/lmdb.nix Normal file
View File

@ -0,0 +1,51 @@
{ lib
, fetchFromGitLab
, pkg-config
, buildDunePackage
, lmdb
, rresult
, cstruct
, alcotest
}:
buildDunePackage rec {
pname = "tezos-lmdb";
version = "7.4";
src = fetchFromGitLab {
owner = "tezos";
repo = "tezos";
rev = "v${version}";
sha256 = "18q02j74aa8mxv233kvyb62xbhjngzpgppp6kgr4m53d7a78wgsm";
};
useDune2 = true;
preBuild = ''
rm dune
rm -rf src
rm -rf docs
ls vendors | grep -v ocaml-lmdb |xargs rm -rf
'';
buildInputs = [
pkg-config
];
propagatedBuildInputs = [
rresult
lmdb
];
checkInputs = [
cstruct
alcotest
];
doCheck = false;
meta = {
description = "Legacy Tezos OCaml binding to LMDB (Consider ocaml-lmdb instead)";
license = lib.licenses.isc;
maintainers = [ lib.maintainers.ulrikstrid ];
};
}

32
pkgs/development/ocaml-modules/tezos/lwt-result-stdlib.nix Normal file
View File

@ -0,0 +1,32 @@
{ lib
, buildDunePackage
, ocaml
, tezos-stdlib
, tezos-error-monad
, alcotest
, alcotest-lwt
, crowbar
}:
if lib.versionAtLeast ocaml.version "4.12" then
throw "tezos-lwt-result-stdlib-${tezos-stdlib.version} is not available for OCaml > 4.10"
else
buildDunePackage {
pname = "tezos-lwt-result-stdlib";
inherit (tezos-stdlib) version src useDune2 preBuild doCheck;
propagatedBuildInputs = [
tezos-error-monad
];
checkInputs = [
alcotest
alcotest-lwt
crowbar
];
meta = tezos-stdlib.meta // {
description = "Tezos: error-aware stdlib replacement";
};
}

28
pkgs/development/ocaml-modules/tezos/micheline.nix Normal file
View File

@ -0,0 +1,28 @@
{ lib
, buildDunePackage
, tezos-stdlib
, tezos-error-monad
, uutf
, alcotest
, alcotest-lwt
, ppx_inline_test
}:
buildDunePackage {
pname = "tezos-micheline";
inherit (tezos-stdlib) version src useDune2 preBuild doCheck;
propagatedBuildInputs = [
tezos-error-monad
uutf
];
checkInputs = [
alcotest
alcotest-lwt
];
meta = tezos-stdlib.meta // {
description = "Tezos: internal AST and parser for the Michelson language";
};
}

18
pkgs/development/ocaml-modules/tezos/p2p-services.nix Normal file
View File

@ -0,0 +1,18 @@
{ lib
, buildDunePackage
, tezos-stdlib
, tezos-base
}:
buildDunePackage {
pname = "tezos-p2p-services";
inherit (tezos-stdlib) version src useDune2 preBuild doCheck;
propagatedBuildInputs = [
tezos-base
];
meta = tezos-stdlib.meta // {
description = "Tezos: descriptions of RPCs exported by `tezos-p2p`";
};
}

25
pkgs/development/ocaml-modules/tezos/p2p.nix Normal file
View File

@ -0,0 +1,25 @@
{ lib
, buildDunePackage
, tezos-stdlib
, tezos-p2p-services
, alcotest-lwt
, lwt-watcher
}:
buildDunePackage {
pname = "tezos-p2p";
inherit (tezos-stdlib) version src useDune2 preBuild doCheck;
propagatedBuildInputs = [
tezos-p2p-services
lwt-watcher
];
checkInputs = [
alcotest-lwt
];
meta = tezos-stdlib.meta // {
description = "Tezos: library for a pool of P2P connections";
};
}

19
pkgs/development/ocaml-modules/tezos/protocol-008-PtEdo2Zk-parameters.nix Normal file
View File

@ -0,0 +1,19 @@
{ lib
, buildDunePackage
, tezos-stdlib
, tezos-protocol-008-PtEdo2Zk
, qcheck-alcotest
}:
buildDunePackage {
pname = "tezos-protocol-008-PtEdo2Zk-parameters";
inherit (tezos-stdlib) version src useDune2 preBuild doCheck;
propagatedBuildInputs = [
tezos-protocol-008-PtEdo2Zk
];
meta = tezos-stdlib.meta // {
description = "Tezos/Protocol: parameters";
};
}

23
pkgs/development/ocaml-modules/tezos/protocol-008-PtEdo2Zk.nix Normal file
View File

@ -0,0 +1,23 @@
{ lib
, buildDunePackage
, tezos-stdlib
, tezos-protocol-compiler
}:
buildDunePackage {
pname = "tezos-protocol-008-PtEdo2Zk";
inherit (tezos-stdlib) version src useDune2 doCheck;
preBuild = ''
rm -rf vendors
substituteInPlace src/proto_008_PtEdo2Zk/lib_protocol/dune.inc --replace "-nostdlib" ""
'';
propagatedBuildInputs = [
tezos-protocol-compiler
];
meta = tezos-stdlib.meta // {
description = "Tezos/Protocol: economic-protocol definition";
};
}

29
pkgs/development/ocaml-modules/tezos/protocol-compiler.nix Normal file
View File

@ -0,0 +1,29 @@
{ lib
, buildDunePackage
, ocaml
, tezos-stdlib
, tezos-protocol-environment
, ocp-ocamlres
, pprint
}:
if lib.versionAtLeast ocaml.version "4.12" then
throw "tezos-protocol-compiler-${tezos-stdlib.version} is not available for OCaml > 4.10"
else
buildDunePackage {
pname = "tezos-protocol-compiler";
inherit (tezos-stdlib) version src useDune2 preBuild doCheck;
minimalOCamlVersion = "4.09";
propagatedBuildInputs = [
tezos-protocol-environment
ocp-ocamlres
pprint
];
meta = tezos-stdlib.meta // {
description = "Tezos: economic-protocol compiler";
};
}

18
pkgs/development/ocaml-modules/tezos/protocol-demo-noops.nix Normal file
View File

@ -0,0 +1,18 @@
{ lib
, buildDunePackage
, tezos-stdlib
, tezos-protocol-compiler
}:
buildDunePackage {
pname = "tezos-protocol-demo-noops";
inherit (tezos-stdlib) version src useDune2 preBuild doCheck;
propagatedBuildInputs = [
tezos-protocol-compiler
];
meta = tezos-stdlib.meta // {
description = "Tezos/Protocol: demo_noops economic-protocol definition";
};
}

15
pkgs/development/ocaml-modules/tezos/protocol-environment-packer.nix Normal file
View File

@ -0,0 +1,15 @@
{ lib
, buildDunePackage
, tezos-stdlib
}:
buildDunePackage {
pname = "tezos-protocol-environment-packer";
inherit (tezos-stdlib) version src useDune2 preBuild doCheck;
minimalOCamlVersion = "4.03";
meta = tezos-stdlib.meta // {
description = "Tezos: sigs/structs packer for economic protocol environment";
};
}

30
pkgs/development/ocaml-modules/tezos/protocol-environment-sigs.nix Normal file
View File

@ -0,0 +1,30 @@
{ lib
, buildDunePackage
, ocaml
, tezos-stdlib
, tezos-protocol-environment-packer
, zarith
}:
buildDunePackage {
pname = "tezos-protocol-environment-sigs";
inherit (tezos-stdlib) version src useDune2 preBuild doCheck;
propagatedBuildInputs = [
tezos-protocol-environment-packer
];
checkInputs = [
tezos-stdlib
];
postPatch = ''
cp -f ${zarith}/lib/ocaml/${ocaml.version}/site-lib/zarith/z.mli ./src/lib_protocol_environment/sigs/v1/z.mli
sed -i 's/out_channel/Stdlib.out_channel/g' ./src/lib_protocol_environment/sigs/v1/z.mli
sed -i 's/Buffer/Stdlib.Buffer/g' ./src/lib_protocol_environment/sigs/v1/z.mli
'';
meta = tezos-stdlib.meta // {
description = "Tezos: restricted typing environment for the economic protocols";
};
}

20
pkgs/development/ocaml-modules/tezos/protocol-environment-structs.nix Normal file
View File

@ -0,0 +1,20 @@
{ lib
, buildDunePackage
, tezos-stdlib
, tezos-crypto
, tezos-protocol-environment-packer
}:
buildDunePackage {
pname = "tezos-protocol-environment-structs";
inherit (tezos-stdlib) version src useDune2 preBuild doCheck;
propagatedBuildInputs = [
tezos-crypto
tezos-protocol-environment-packer
];
meta = tezos-stdlib.meta // {
description = "Tezos: restricted typing environment for the economic protocols";
};
}

33
pkgs/development/ocaml-modules/tezos/protocol-environment.nix Normal file
View File

@ -0,0 +1,33 @@
{ lib
, buildDunePackage
, tezos-stdlib
, tezos-base
, tezos-sapling
, tezos-protocol-environment-sigs
, tezos-protocol-environment-structs
, zarith
, alcotest-lwt
, crowbar
}:
buildDunePackage {
pname = "tezos-protocol-environment";
inherit (tezos-stdlib) version src useDune2 doCheck preBuild;
propagatedBuildInputs = [
tezos-sapling
tezos-base
tezos-protocol-environment-sigs
tezos-protocol-environment-structs
zarith # this might break, since they actually want 1.11
];
checkInputs = [
alcotest-lwt
crowbar
];
meta = tezos-stdlib.meta // {
description = "Tezos: custom economic-protocols environment implementation for `tezos-client` and testing";
};
}

27
pkgs/development/ocaml-modules/tezos/requester.nix Normal file
View File

@ -0,0 +1,27 @@
{ lib
, buildDunePackage
, tezos-stdlib
, tezos-base
, tezos-test-services
, lwt-watcher
, alcotest-lwt
}:
buildDunePackage {
pname = "tezos-requester";
inherit (tezos-stdlib) version src useDune2 preBuild doCheck;
propagatedBuildInputs = [
tezos-base
lwt-watcher
];
checkInputs = [
alcotest-lwt
tezos-test-services
];
meta = tezos-stdlib.meta // {
description = "Tezos: generic resource fetching service";
};
}

22
pkgs/development/ocaml-modules/tezos/rpc.nix Normal file
View File

@ -0,0 +1,22 @@
{ lib
, buildDunePackage
, tezos-stdlib
, tezos-error-monad
, resto
, resto-directory
}:
buildDunePackage {
pname = "tezos-rpc";
inherit (tezos-stdlib) version src useDune2 preBuild doCheck;
propagatedBuildInputs = [
tezos-error-monad
resto
resto-directory
];
meta = tezos-stdlib.meta // {
description = "Tezos: library of auto-documented RPCs (service and hierarchy descriptions)";
};
}

31
pkgs/development/ocaml-modules/tezos/sapling.nix Normal file
View File

@ -0,0 +1,31 @@
{ lib
, buildDunePackage
, ocaml
, tezos-stdlib
, tezos-crypto
, tezos-rust-libs
, alcotest-lwt
}:
buildDunePackage {
pname = "tezos-sapling";
inherit (tezos-stdlib) version src useDune2 preBuild;
propagatedBuildInputs = [
tezos-crypto
tezos-rust-libs
];
checkInputs = [
alcotest-lwt
];
doCheck = false;
# This is a hack to work around the hack used in the dune files
OPAM_SWITCH_PREFIX = "${tezos-rust-libs}";
meta = tezos-stdlib.meta // {
description = "Tezos/Protocol: economic-protocol definition";
};
}

22
pkgs/development/ocaml-modules/tezos/shell-services.nix Normal file
View File

@ -0,0 +1,22 @@
{ lib
, buildDunePackage
, tezos-stdlib
, tezos-workers
, tezos-p2p-services
, tezos-version
}:
buildDunePackage {
pname = "tezos-shell-services";
inherit (tezos-stdlib) version src useDune2 preBuild doCheck;
propagatedBuildInputs = [
tezos-workers
tezos-p2p-services
tezos-version
];
meta = tezos-stdlib.meta // {
description = "Tezos: descriptions of RPCs exported by `tezos-shell`";
};
}

30
pkgs/development/ocaml-modules/tezos/stdlib-unix.nix Normal file
View File

@ -0,0 +1,30 @@
{ lib
, buildDunePackage
, tezos-stdlib
, tezos-event-logging
, lwt
, ptime
, mtime
, ipaddr
, re
, alcotest
, alcotest-lwt
}:
buildDunePackage {
pname = "tezos-stdlib-unix";
inherit (tezos-stdlib) version src useDune2 preBuild doCheck;
propagatedBuildInputs = [
tezos-event-logging
lwt
ptime
mtime
ipaddr
re
];
meta = tezos-stdlib.meta // {
description = "Tezos: yet-another local-extension of the OCaml standard library (unix-specific fragment)";
};
}

53
pkgs/development/ocaml-modules/tezos/stdlib.nix Normal file
View File

@ -0,0 +1,53 @@
{ lib
, fetchFromGitLab
, buildDunePackage
, hex
, lwt
, zarith
, alcotest
, alcotest-lwt
, crowbar
, bigstring
, lwt_log
}:
buildDunePackage rec {
pname = "tezos-stdlib";
version = "8.3";
src = fetchFromGitLab {
owner = "tezos";
repo = "tezos";
rev = "v${version}";
sha256 = "12cv2cssnw60jbpnh6xjysxgsgcj7d72454k4zs2b8fjx7mkgksk";
};
minimalOCamlVersion = "4.0.8";
useDune2 = true;
preBuild = ''
rm -rf vendors
'';
propagatedBuildInputs = [
hex
lwt
zarith
];
checkInputs = [
alcotest
alcotest-lwt
crowbar
bigstring
lwt_log
];
doCheck = true;
meta = {
description = "Tezos: yet-another local-extension of the OCaml standard library";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.ulrikstrid ];
};
}

20
pkgs/development/ocaml-modules/tezos/test-services.nix Normal file
View File

@ -0,0 +1,20 @@
{ lib
, buildDunePackage
, tezos-stdlib
, tezos-base
, alcotest-lwt
}:
buildDunePackage {
pname = "tezos-test-services";
inherit (tezos-stdlib) version src useDune2 preBuild doCheck;
propagatedBuildInputs = [
tezos-base
alcotest-lwt
];
meta = tezos-stdlib.meta // {
description = "Tezos: Alcotest-based test services";
};
}

18
pkgs/development/ocaml-modules/tezos/version.nix Normal file
View File

@ -0,0 +1,18 @@
{ lib
, buildDunePackage
, tezos-stdlib
, tezos-base
}:
buildDunePackage {
pname = "tezos-version";
inherit (tezos-stdlib) version src useDune2 preBuild doCheck;
propagatedBuildInputs = [
tezos-base
];
meta = tezos-stdlib.meta // {
description = "Tezos: version information generated from Git";
};
}

18
pkgs/development/ocaml-modules/tezos/workers.nix Normal file
View File

@ -0,0 +1,18 @@
{ lib
, buildDunePackage
, tezos-stdlib
, tezos-base
}:
buildDunePackage {
pname = "tezos-workers";
inherit (tezos-stdlib) version src useDune2 preBuild doCheck;
propagatedBuildInputs = [
tezos-base
];
meta = tezos-stdlib.meta // {
description = "Tezos: worker library";
};
}

4
pkgs/development/python-modules/fritzprofiles/default.nix
View File

@ -7,12 +7,12 @@
buildPythonPackage rec {
pname = "fritzprofiles";
version = "0.6.1";
version = "0.7.3";
format = "setuptools";
src = fetchPypi {
inherit pname version;
sha256 = "1bd4sa3i1ldkg6lnsvg004csgqklvi5xk71y971qyjvsbdbwgbn3";
sha256 = "sha256-VoKgLJWF9x8dW8A6CNwLtK+AmehtgZP41nUGQO819es=";
};
propagatedBuildInputs = [

5
pkgs/development/python-modules/gym/default.nix
View File

@ -29,6 +29,11 @@ buildPythonPackage rec {
scipy
];
postPatch = ''
substituteInPlace setup.py \
--replace "Pillow<=8.2.0" "Pillow"
'';
# The test needs MuJoCo that is not free library.
doCheck = false;

77
pkgs/development/tools/comby/default.nix Normal file
View File

@ -0,0 +1,77 @@
{ ocamlPackages, fetchFromGitHub, lib, zlib, pkg-config, cacert, gmp, libev
, autoconf, sqlite, stdenv }:
let
mkCombyPackage = { pname, extraBuildInputs ? [ ], extraNativeInputs ? [ ] }:
ocamlPackages.buildDunePackage rec {
inherit pname;
version = "1.5.1";
useDune2 = true;
minimumOcamlVersion = "4.08.1";
doCheck = true;
src = fetchFromGitHub {
owner = "comby-tools";
repo = "comby";
rev = version;
sha256 = "1ipfrr6n1jyyryhm9zpn8wwgzfac1zgbjdjzrm00qcwc17r8x2hf";
};
nativeBuildInputs = [
ocamlPackages.ppx_deriving
ocamlPackages.ppx_deriving_yojson
ocamlPackages.ppx_sexp_conv
ocamlPackages.ppx_sexp_message
] ++ extraNativeInputs;
buildInputs = [
ocamlPackages.core
ocamlPackages.ocaml_pcre
ocamlPackages.mparser
ocamlPackages.mparser-pcre
ocamlPackages.angstrom
] ++ extraBuildInputs;
checkInputs = [ cacert ];
meta = {
description = "Tool for searching and changing code structure";
license = lib.licenses.asl20;
homepage = "https://comby.dev";
};
};
combyKernel = mkCombyPackage { pname = "comby-kernel"; };
in mkCombyPackage {
pname = "comby";
extraBuildInputs = [
zlib
gmp
libev
sqlite
ocamlPackages.shell # This input must appear before `parany` or any other input that propagates `ocamlnet`
ocamlPackages.lwt
ocamlPackages.patience_diff
ocamlPackages.toml
ocamlPackages.cohttp-lwt-unix
ocamlPackages.opium
ocamlPackages.textutils
ocamlPackages.jst-config
ocamlPackages.parany
ocamlPackages.conduit-lwt-unix
ocamlPackages.lwt_react
ocamlPackages.tls
combyKernel
] ++ (if !stdenv.isAarch32 && !stdenv.isAarch64 then
[ ocamlPackages.hack_parallel ]
else
[ ]);
extraNativeInputs = [
autoconf
pkg-config
ocamlPackages.ppx_jane
ocamlPackages.ppx_expect
ocamlPackages.dune-configurator
];
}

15
pkgs/development/tools/rgp/default.nix
View File

@ -12,22 +12,22 @@
, libX11
, libxcb
, libXi
, ncurses5
, ncurses
, qtbase
, qtdeclarative
, zlib
}:
let
buildNum = "2021-03-31-696";
buildNum = "2021-06-30-819";
in
stdenv.mkDerivation rec {
pname = "rgp";
version = "1.10";
version = "1.11";
src = fetchurl {
url = "https://gpuopen.com/download/radeon-developer-tool-suite/RadeonDeveloperToolSuite-${buildNum}.tgz";
sha256 = "1GUV75KpYbeq7KkE86QqTfGnf/t3VEgviaAsbg/LWJI=";
sha256 = "ru+e/oY844x4nvSVRBrTGDdnzUOBhwkaIrnftBITyE8=";
};
nativeBuildInputs = [ makeWrapper autoPatchelfHook ];
@ -42,17 +42,12 @@ stdenv.mkDerivation rec {
libX11
libxcb
libXi
ncurses5
ncurses
qtbase
qtdeclarative
zlib
];
runtimeDependencies = [
"${placeholder "out"}/opt/rgp"
"${placeholder "out"}/opt/rgp/qt"
];
dontWrapQtApps = true;
installPhase = ''

38
pkgs/games/cgoban/default.nix Normal file
View File

@ -0,0 +1,38 @@
{ lib
, stdenv
, writers
, adoptopenjdk-jre-bin
, fetchurl
, makeWrapper
}:
stdenv.mkDerivation rec {
pname = "cgoban";
version = "3.5.23";
nativeBuildInputs = [ adoptopenjdk-jre-bin makeWrapper ];
src = fetchurl {
url = "https://web.archive.org/web/20210116034119/https://files.gokgs.com/javaBin/cgoban.jar";
sha256 = "0srw1hqr9prgr9dagfbh2j6p9ivaj40kdpyhs6zjkg7lhnnrrrcv";
};
dontConfigure = true;
dontUnpack = true;
dontBuild = true;
dontPatchELF = true;
installPhase = ''
runHook preInstall
install -D $src $out/lib/cgoban.jar
makeWrapper ${adoptopenjdk-jre-bin}/bin/java $out/bin/cgoban --add-flags "-jar $out/lib/cgoban.jar"
runHook postInstall
'';
meta = with lib; {
description = "Client for the KGS Go Server";
homepage = "https://www.gokgs.com/";
license = licenses.free;
maintainers = with maintainers; [ savannidgerinel ];
platforms = adoptopenjdk-jre-bin.meta.platforms;
};
}

10
pkgs/os-specific/linux/dpdk/default.nix
View File

@ -4,6 +4,7 @@
, pkg-config, meson, ninja
, libbsd, numactl, libbpf, zlib, libelf, jansson, openssl, libpcap
, doxygen, python3
, withExamples ? []
, shared ? false }:
let
@ -51,7 +52,8 @@ in stdenv.mkDerivation rec {
++ lib.optional (mod && kernel.kernelOlder "5.11") "-Ddisable_drivers=kni"
++ lib.optional (!shared) "-Ddefault_library=static"
++ lib.optional stdenv.isx86_64 "-Dmachine=nehalem"
++ lib.optional mod "-Dkernel_dir=${placeholder "kmod"}/lib/modules/${kernel.modDirVersion}";
++ lib.optional mod "-Dkernel_dir=${placeholder "kmod"}/lib/modules/${kernel.modDirVersion}"
++ lib.optional (withExamples != []) "-Dexamples=${builtins.concatStringsSep "," withExamples}";
# dpdk meson script does not support separate kernel source and installion
# dirs (except via destdir), so we temporarily link the former into the latter.
@ -65,6 +67,10 @@ in stdenv.mkDerivation rec {
rm -f $kmod/lib/modules/${kernel.modDirVersion}/build
'';
postInstall = lib.optionalString (withExamples != []) ''
find examples -type f -executable -exec install {} $out/bin \;
'';
outputs = [ "out" ] ++ lib.optional mod "kmod";
meta = with lib; {
@ -72,6 +78,6 @@ in stdenv.mkDerivation rec {
homepage = "http://dpdk.org/";
license = with licenses; [ lgpl21 gpl2 bsd2 ];
platforms = platforms.linux;
maintainers = with maintainers; [ magenbluten orivej mic92 ];
maintainers = with maintainers; [ magenbluten orivej mic92 zhaofengli ];
};
}

7
pkgs/os-specific/linux/odp-dpdk/default.nix
View File

@ -7,15 +7,18 @@
url = "https://fast.dpdk.org/rel/dpdk-${version}.tar.xz";
sha256 = "sha256-RnEzlohDZ3uxwna7dKNFiqfAAswh4pXFHjvWVJexEqs=";
};
mesonFlags = old.mesonFlags ++ [
"-Denable_docs=false"
];
});
in stdenv.mkDerivation rec {
pname = "odp-dpdk";
version = "1.27.0.0_DPDK_19.11";
version = "1.30.1.0_DPDK_19.11";
src = fetchurl {
url = "https://git.linaro.org/lng/odp-dpdk.git/snapshot/${pname}-${version}.tar.gz";
sha256 = "sha256-/4m2NqnEXyenNUrCq3c2ozJzPWFFs/Qp7MAVm9B2biA=";
sha256 = "sha256-R3PsqQiHlHPzIYYWTVEC7Ikg3KR5I0jWGgftDA9Jj1o=";
};
nativeBuildInputs = [

2
pkgs/servers/serviio/default.nix
View File

@ -9,8 +9,6 @@ stdenv.mkDerivation rec {
sha256 = "0mxpdyhjf4w83q8ssmvpxm95hw4x7lfkh48vvdablccfndh82x2i";
};
phases = ["unpackPhase" "installPhase"];
installPhase = ''
mkdir -p $out
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
View File

@ -11,8 +11,6 @@ stdenv.mkDerivation rec {
sha256 = "1xk5fi2wzq3jspvbdm5hvs78501i14jy3v7x6fjnh5fnpqdacpd4";
};
phases = [ "installPhase" ];
installPhase = ''
install -m444 -D ${src}/share/java/*${pname}-${version}.jar "$out/share/java/${pname}-${version}.jar"
'';

2
pkgs/servers/zookeeper/default.nix
View File

@ -12,8 +12,6 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ jre ];
phases = ["unpackPhase" "installPhase"];
installPhase = ''
runHook preInstall
mkdir -p $out

51
pkgs/tools/graphics/pdfread/default.nix
View File

@ -1,51 +0,0 @@
{lib, stdenv, fetchurl, unzip, python, makeWrapper, ghostscript, pngnq, pillow, djvulibre
, optipng, unrar}:
stdenv.mkDerivation {
name = "pdfread-1.8.2";
src = fetchurl {
# I got it from http://www.mobileread.com/forums/showthread.php?t=21906
# But that needs user registration to allow downloading.
# This is an evolution from pdfread 1.7 in http://pdfread.sourceforge.net/
# Temporary place:
url = "http://vicerveza.homeunix.net/~viric/soft/PDFRead-1.8.2-Source-noGUI-noInstaller.zip";
sha256 = "0mzxpnk97f0ww5ds7h4wsval3g4lnrhv6rhspjs7cy4i41gmk8an";
};
nativeBuildInputs = [ makeWrapper unzip ];
buildInputs = [ python ];
broken = true; # Not found.
phases = "unpackPhase patchPhase installPhase";
unpackPhase = ''
unzip $src
sourceRoot=`pwd`/PDFRead/src
'';
patchPhase = ''
sed -i 's,#!/usr.*,#!${python}/bin/python,' pdfread.py
'';
installPhase = ''
mkdir -p $out/bin
cp pdfread.py $out/bin
chmod +x $out/bin/pdfread.py
LIBSUFFIX=lib/${python.libPrefix}/site-packages/
PYDIR=$out/$LIBSUFFIX
mkdir -p $PYDIR
cp -R *.py pylrs $PYDIR
wrapProgram $out/bin/pdfread.py --prefix PYTHONPATH : $PYTHONPATH:${pillow}/$LIBSUFFIX/PIL:$PYDIR \
--prefix PATH : ${lib.makeBinPath [ ghostscript pngnq djvulibre unrar optipng ]}
'';
meta = with lib; {
description = "PDF/DJVU to ebook format converter";
homepage = "https://www.mobileread.com/forums/showthread.php?t=21906";
license = licenses.mit;
};
}

6
pkgs/tools/security/gpg-tui/default.nix
View File

@ -15,16 +15,16 @@
rustPlatform.buildRustPackage rec {
pname = "gpg-tui";
version = "0.7.1";
version = "0.7.2";
src = fetchFromGitHub {
owner = "orhun";
repo = "gpg-tui";
rev = "v${version}";
sha256 = "sha256-J1mdgcNWloQOnGdBjcCoAsv+ClQ77DXYQajM9B3sYHY=";
sha256 = "sha256-2FnSCTq+Im7sbiEkbKZ9f09i/lWme/aCrcCOgcIlXp4=";
};
cargoSha256 = "sha256-I63Pevw0BjkjasszZn2wmT4TNeVk27pJy4mJR6nl9MI=";
cargoSha256 = "sha256-v2aZPVBT5XEaffTZHnAgRWGs6HDvL9b8ihR50I4VnJ4=";
nativeBuildInputs = [
gpgme # for gpgme-config

12
pkgs/top-level/all-packages.nix
View File

@ -1747,7 +1747,7 @@ in
xcodeenv = callPackage ../development/mobile/xcodeenv { };
gomobile = callPackage ../development/mobile/gomobile {
buildGoModule = buildGo115Module;
buildGoModule = buildGo116Module;
};
ssh-agents = callPackage ../tools/networking/ssh-agents { };
@ -7943,9 +7943,7 @@ in
pdfarranger = callPackage ../applications/misc/pdfarranger { };
pdfread = callPackage ../tools/graphics/pdfread {
inherit (pythonPackages) pillow;
};
pdfread = throw "pdfread has been remove from nixpkgs, because it is unmaintained for years and the sources are no longer available";
briss = callPackage ../tools/graphics/briss { };
@ -10756,6 +10754,8 @@ in
cmucl_binary = pkgsi686Linux.callPackage ../development/compilers/cmucl/binary.nix { };
comby = callPackage ../development/tools/comby { };
compcert = coqPackages.compcert.override { version = "3.9"; };
computecpp-unwrapped = callPackage ../development/compilers/computecpp {};
@ -17156,8 +17156,6 @@ in
libtap = callPackage ../development/libraries/libtap { };
libtgvoip = callPackage ../development/libraries/libtgvoip { };
libtsm = callPackage ../development/libraries/libtsm { };
libgeotiff = callPackage ../development/libraries/libgeotiff { };
@ -28789,6 +28787,8 @@ in
cdogs-sdl = callPackage ../games/cdogs-sdl { };
cgoban = callPackage ../games/cgoban { };
chessdb = callPackage ../games/chessdb { };
chessx = libsForQt5.callPackage ../games/chessx { };

32
pkgs/top-level/ocaml-packages.nix
View File

@ -415,6 +415,8 @@ let
h2 = callPackage ../development/ocaml-modules/h2 { };
hack_parallel = callPackage ../development/ocaml-modules/hack_parallel { };
hacl_x25519 = callPackage ../development/ocaml-modules/hacl_x25519 { };
hacl-star = callPackage ../development/ocaml-modules/hacl-star { };
@ -794,6 +796,8 @@ let
mparser = callPackage ../development/ocaml-modules/mparser { };
mparser-pcre = callPackage ../development/ocaml-modules/mparser/pcre.nix { };
mtime = callPackage ../development/ocaml-modules/mtime { };
mustache = callPackage ../development/ocaml-modules/mustache { };
@ -1229,6 +1233,34 @@ let
terminal_size = callPackage ../development/ocaml-modules/terminal_size { };
tezos-base = callPackage ../development/ocaml-modules/tezos/base.nix { };
tezos-clic = callPackage ../development/ocaml-modules/tezos/clic.nix { };
tezos-crypto = callPackage ../development/ocaml-modules/tezos/crypto.nix { };
tezos-error-monad = callPackage ../development/ocaml-modules/tezos/error-monad.nix { };
tezos-event-logging = callPackage ../development/ocaml-modules/tezos/event-logging.nix { };
tezos-lmdb = callPackage ../development/ocaml-modules/tezos/lmdb.nix { };
tezos-lwt-result-stdlib = callPackage ../development/ocaml-modules/tezos/lwt-result-stdlib.nix { };
tezos-micheline = callPackage ../development/ocaml-modules/tezos/micheline.nix { };
tezos-p2p-services = callPackage ../development/ocaml-modules/tezos/p2p-services.nix { };
tezos-p2p = callPackage ../development/ocaml-modules/tezos/p2p.nix { };
tezos-protocol-008-PtEdo2Zk-parameters = callPackage ../development/ocaml-modules/tezos/protocol-008-PtEdo2Zk-parameters.nix { };
tezos-protocol-008-PtEdo2Zk = callPackage ../development/ocaml-modules/tezos/protocol-008-PtEdo2Zk.nix { };
tezos-protocol-compiler = callPackage ../development/ocaml-modules/tezos/protocol-compiler.nix { };
tezos-protocol-demo-noops = callPackage ../development/ocaml-modules/tezos/protocol-demo-noops.nix { };
tezos-protocol-environment-packer = callPackage ../development/ocaml-modules/tezos/protocol-environment-packer.nix { };
tezos-protocol-environment-sigs = callPackage ../development/ocaml-modules/tezos/protocol-environment-sigs.nix { };
tezos-protocol-environment-structs = callPackage ../development/ocaml-modules/tezos/protocol-environment-structs.nix { };
tezos-protocol-environment = callPackage ../development/ocaml-modules/tezos/protocol-environment.nix { };
tezos-requester = callPackage ../development/ocaml-modules/tezos/requester.nix { };
tezos-rpc = callPackage ../development/ocaml-modules/tezos/rpc.nix { };
tezos-sapling = callPackage ../development/ocaml-modules/tezos/sapling.nix { };
tezos-shell-services = callPackage ../development/ocaml-modules/tezos/shell-services.nix { };
tezos-stdlib-unix = callPackage ../development/ocaml-modules/tezos/stdlib-unix.nix { };
tezos-stdlib = callPackage ../development/ocaml-modules/tezos/stdlib.nix { };
tezos-test-services = callPackage ../development/ocaml-modules/tezos/test-services.nix { };
tezos-version = callPackage ../development/ocaml-modules/tezos/version.nix { };
tezos-workers = callPackage ../development/ocaml-modules/tezos/workers.nix { };
toml = callPackage ../development/ocaml-modules/toml { };
topkg = callPackage ../development/ocaml-modules/topkg { };