Merge branch 'staging-next' into staging

Conflicts:
	pkgs/applications/networking/browsers/firefox/common.nix between f6c5761935 and a373324120.
main
Jan Tojnar 2 years ago
commit d1b77f990f
  1. 6
      maintainers/maintainer-list.nix
  2. 1
      nixos/modules/hardware/all-firmware.nix
  3. 7
      nixos/modules/services/hardware/udev.nix
  4. 3
      nixos/modules/system/boot/kernel.nix
  5. 14
      nixos/tests/chromium.nix
  6. 6
      pkgs/applications/accessibility/squeekboard/default.nix
  7. 101
      pkgs/applications/audio/axoloti/default.nix
  8. 31
      pkgs/applications/audio/axoloti/dfu-util.nix
  9. 39
      pkgs/applications/audio/axoloti/libusb1.nix
  10. 14
      pkgs/applications/audio/sptlrx/default.nix
  11. 10
      pkgs/applications/blockchains/btcdeb/default.nix
  12. 30
      pkgs/applications/blockchains/zcash/default.nix
  13. 6
      pkgs/applications/editors/emacs/elisp-packages/ement/default.nix
  14. 14
      pkgs/applications/editors/emacs/elisp-packages/ement/handle-nil-images.patch
  15. 6
      pkgs/applications/editors/lapce/default.nix
  16. 13
      pkgs/applications/editors/vim/plugins/build-vim-plugin.nix
  17. 862
      pkgs/applications/editors/vim/plugins/generated.nix
  18. 21
      pkgs/applications/editors/vim/plugins/neovim-require-check-hook.sh
  19. 7
      pkgs/applications/editors/vim/plugins/overrides.nix
  20. 2
      pkgs/applications/editors/vim/plugins/vim-plugin-names
  21. 16
      pkgs/applications/editors/vim/plugins/vim-utils.nix
  22. 9
      pkgs/applications/emulators/ryujinx/default.nix
  23. 4
      pkgs/applications/emulators/wine/base.nix
  24. 14
      pkgs/applications/emulators/wine/sources.nix
  25. 6
      pkgs/applications/graphics/rnote/default.nix
  26. 46
      pkgs/applications/misc/authenticator/default.nix
  27. 46
      pkgs/applications/misc/bibletime/default.nix
  28. 6
      pkgs/applications/misc/cataract/build.nix
  29. 4
      pkgs/applications/networking/browsers/chromium/common.nix
  30. 43
      pkgs/applications/networking/browsers/chromium/patches/m102-fix-dawn_version_generator-failure.patch
  31. 18
      pkgs/applications/networking/browsers/chromium/upstream-info.json
  32. 23
      pkgs/applications/networking/browsers/firefox/common.nix
  33. 6
      pkgs/applications/networking/browsers/librewolf/src.json
  34. 2
      pkgs/applications/networking/browsers/netsurf/libnsutils.nix
  35. 10
      pkgs/applications/networking/browsers/netsurf/libutf8proc.nix
  36. 10
      pkgs/applications/networking/cluster/talosctl/default.nix
  37. 4
      pkgs/applications/networking/instant-messengers/cinny/default.nix
  38. 14
      pkgs/applications/networking/instant-messengers/schildichat/pin.json
  39. 5
      pkgs/applications/networking/instant-messengers/schildichat/schildichat-web.nix
  40. 4
      pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
  41. 8
      pkgs/applications/networking/netperf/default.nix
  42. 5
      pkgs/applications/networking/twtxt/default.nix
  43. 9
      pkgs/applications/printing/pappl/default.nix
  44. 10
      pkgs/applications/radio/rtl_433/default.nix
  45. 6
      pkgs/applications/science/chemistry/chemtool/default.nix
  46. 6
      pkgs/applications/science/electronics/alliance/default.nix
  47. 51
      pkgs/applications/science/math/primecount/default.nix
  48. 36
      pkgs/applications/science/math/primesieve/default.nix
  49. 2
      pkgs/applications/science/math/wolfram-engine/default.nix
  50. 9
      pkgs/applications/search/recoll/default.nix
  51. 6
      pkgs/applications/version-management/git-and-tools/delta/default.nix
  52. 37
      pkgs/applications/version-management/git-and-tools/gfold/default.nix
  53. 25
      pkgs/applications/video/epgstation/default.nix
  54. 55
      pkgs/applications/window-managers/oroborus/default.nix
  55. 4
      pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-build-hook.sh
  56. 4
      pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-configure-hook.sh
  57. 8
      pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-install-hook.sh
  58. 16
      pkgs/build-support/kernel/compress-firmware-xz.nix
  59. 8
      pkgs/build-support/kernel/modules-closure.sh
  60. 8
      pkgs/data/misc/hackage/pin.json
  61. 3
      pkgs/development/compilers/dotnet/build-dotnet.nix
  62. 13
      pkgs/development/compilers/dotnet/default.nix
  63. 8
      pkgs/development/compilers/dotnet/print-hashes.sh
  64. 14
      pkgs/development/compilers/mruby/default.nix
  65. 12
      pkgs/development/compilers/vyper/default.nix
  66. 42
      pkgs/development/embedded/blackmagic/default.nix
  67. 10
      pkgs/development/haskell-modules/configuration-common.nix
  68. 2
      pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
  69. 1
      pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
  70. 1
      pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
  71. 1088
      pkgs/development/haskell-modules/hackage-packages.nix
  72. 14
      pkgs/development/interpreters/dart/default.nix
  73. 5
      pkgs/development/interpreters/octave/default.nix
  74. 27
      pkgs/development/interpreters/octave/patches/bug62436.patch
  75. 6
      pkgs/development/libraries/boolstuff/default.nix
  76. 8
      pkgs/development/libraries/cln/default.nix
  77. 41
      pkgs/development/libraries/ctl/default.nix
  78. 3
      pkgs/development/libraries/glpng/default.nix
  79. 1
      pkgs/development/libraries/http-parser/default.nix
  80. 33
      pkgs/development/libraries/science/math/primecount/default.nix
  81. 23
      pkgs/development/libraries/science/math/primesieve/default.nix
  82. 16
      pkgs/development/libraries/spdk/default.nix
  83. 2
      pkgs/development/libraries/v8/default.nix
  84. 2
      pkgs/development/misc/rpiboot/default.nix
  85. 7
      pkgs/development/node-packages/default.nix
  86. 56
      pkgs/development/node-packages/package-tests/prisma.nix
  87. 3
      pkgs/development/ocaml-modules/atd/default.nix
  88. 3
      pkgs/development/ocaml-modules/awa/default.nix
  89. 3
      pkgs/development/ocaml-modules/bisect_ppx/default.nix
  90. 5
      pkgs/development/ocaml-modules/ca-certs-nss/default.nix
  91. 3
      pkgs/development/ocaml-modules/checkseum/default.nix
  92. 3
      pkgs/development/ocaml-modules/coin/default.nix
  93. 5
      pkgs/development/ocaml-modules/cpdf/default.nix
  94. 3
      pkgs/development/ocaml-modules/decompress/default.nix
  95. 1
      pkgs/development/ocaml-modules/dns/client.nix
  96. 3
      pkgs/development/ocaml-modules/hidapi/default.nix
  97. 1
      pkgs/development/ocaml-modules/irmin/pack.nix
  98. 1
      pkgs/development/ocaml-modules/irmin/unix.nix
  99. 10
      pkgs/development/ocaml-modules/janestreet/0.14.nix
  100. 3
      pkgs/development/ocaml-modules/lablgl/default.nix
  101. Some files were not shown because too many files have changed in this diff Show More

@ -1544,6 +1544,12 @@
githubId = 410028;
name = "Tobias Bergkvist";
};
berryp = {
email = "berryphillips@gmail.com";
github = "berryp";
githubId = 19911;
name = "Berry Phillips";
};
betaboon = {
email = "betaboon@0x80.ninja";
github = "betaboon";

@ -83,7 +83,6 @@ in {
broadcom-bt-firmware
b43Firmware_5_1_138
b43Firmware_6_30_163_46
b43FirmwareCutter
xow_dongle-firmware
] ++ optionals pkgs.stdenv.hostPlatform.isx86 [
facetimehd-calibration

@ -171,6 +171,11 @@ let
mv etc/udev/hwdb.bin $out
'';
compressFirmware = if config.boot.kernelPackages.kernelAtLeast "5.3" then
pkgs.compressFirmwareXz
else
id;
# Udev has a 512-character limit for ENV{PATH}, so create a symlink
# tree to work around this.
udevPath = pkgs.buildEnv {
@ -267,7 +272,7 @@ in
'';
apply = list: pkgs.buildEnv {
name = "firmware";
paths = list;
paths = map compressFirmware list;
pathsToLink = [ "/lib/firmware" ];
ignoreCollisions = true;
};

@ -273,9 +273,6 @@ in
boot.kernelModules = [ "loop" "atkbd" ];
# The Linux kernel >= 2.6.27 provides firmware.
hardware.firmware = [ kernel ];
# Create /etc/modules-load.d/nixos.conf, which is read by
# systemd-modules-load.service to load required kernel modules.
environment.etc =

@ -45,12 +45,14 @@ mapAttrs (channel: chromiumPkg: makeTest {
enableOCR = true;
machine.imports = [ ./common/user-account.nix ./common/x11.nix ];
machine.virtualisation.memorySize = 2047;
machine.test-support.displayManager.auto.user = user;
machine.environment = {
systemPackages = [ chromiumPkg ];
variables."XAUTHORITY" = "/home/alice/.Xauthority";
nodes.machine = { ... }: {
imports = [ ./common/user-account.nix ./common/x11.nix ];
virtualisation.memorySize = 2047;
test-support.displayManager.auto.user = user;
environment = {
systemPackages = [ chromiumPkg ];
variables."XAUTHORITY" = "/home/alice/.Xauthority";
};
};
testScript = let

@ -20,7 +20,7 @@
stdenv.mkDerivation rec {
pname = "squeekboard";
version = "1.16.0";
version = "1.17.0";
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
owner = "Phosh";
repo = pname;
rev = "v${version}";
sha256 = "sha256-51Grkn6NSR6azTRuq1vdbDg7d3HuQQ+ZJCsM2mSrSHk=";
sha256 = "sha256-U46OQ0bXkXv6za8vUZxtbxJKqiF/X/xxJsqQGpnRIpg=";
};
cargoDeps = rustPlatform.fetchCargoTarball {
@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
cat Cargo.toml.in Cargo.deps > Cargo.toml
'';
name = "${pname}-${version}";
sha256 = "sha256-vQaiEENxaQxBGYP1br03wSkU7OGOYkJvMBUAOeb3jGk=";
sha256 = "sha256-4q8MW1n/xu538+R5ZlA+p/hd6pOQPKj7jOFwnuMc7sk=";
};
nativeBuildInputs = [

@ -1,101 +0,0 @@
{ lib, stdenv, fetchFromGitHub, fetchurl, makeWrapper, unzip
, gnumake, gcc-arm-embedded, binutils-arm-embedded
, dfu-util-axoloti, jdk, ant, libfaketime }:
stdenv.mkDerivation rec {
version = "1.0.12-2";
pname = "axoloti";
src = fetchFromGitHub {
owner = "axoloti";
repo = "axoloti";
rev = version;
sha256 = "1qffis277wshldr3i939b0r2x3a2mlr53samxqmr2nk1sfm2b4w9";
};
chibi_version = "2.6.9";
chibi_name = "ChibiOS_${chibi_version}";
chibios = fetchurl {
url = "mirror://sourceforge/project/chibios/ChibiOS_RT%20stable/Version%20${chibi_version}/${chibi_name}.zip";
sha256 = "0lb5s8pkj80mqhsy47mmq0lqk34s2a2m3xagzihalvabwd0frhlj";
};
nativeBuildInputs = [
makeWrapper
unzip
gcc-arm-embedded
binutils-arm-embedded
dfu-util-axoloti
ant
];
buildInputs = [jdk libfaketime ];
patchPhase = ''
unzip ${chibios}
mv ${chibi_name} chibios
(cd chibios/ext; unzip -q -o fatfs-0.9-patched.zip)
# Remove source of non-determinism in ChibiOS
substituteInPlace "chibios/os/various/shell.c" \
--replace "#ifdef __DATE__" "#if 0"
# Hardcode path to "make"
for f in "firmware/compile_firmware_linux.sh" \
"firmware/compile_patch_linux.sh"; do
substituteInPlace "$f" \
--replace "make" "${gnumake}/bin/make"
done
# Hardcode dfu-util path
substituteInPlace "platform_linux/upload_fw_dfu.sh" \
--replace "/bin/dfu-util" ""
substituteInPlace "platform_linux/upload_fw_dfu.sh" \
--replace "./dfu-util" "${dfu-util-axoloti}/bin/dfu-util"
# Fix build version
substituteInPlace "build.xml" \
--replace "(git missing)" "${version}"
# Remove build time
substituteInPlace "build.xml" \
--replace "<tstamp>" ""
substituteInPlace "build.xml" \
--replace \
'<format property="build.time" pattern="dd/MM/yyyy HH:mm:ss z"/>' \
'<property name="build.time" value=""/>'
substituteInPlace "build.xml" \
--replace "</tstamp>" ""
substituteInPlace "build.xml" \
--replace \
'{line.separator}</echo>' \
'{line.separator}</echo> <touch file="src/main/java/axoloti/Version.java" millis="0" />'
'';
buildPhase = ''
find . -exec touch -d '1970-01-01 00:00' {} \;
(cd platform_linux; sh compile_firmware.sh)
faketime "1970-01-01 00:00:00" ant -Dbuild.runtime=true
'';
installPhase = ''
mkdir -p $out/bin $out/share/axoloti
cp -r doc firmware chibios platform_linux CMSIS *.txt $out/share/axoloti/
install -vD dist/Axoloti.jar $out/share/axoloti/
makeWrapper ${jdk}/bin/java $out/bin/axoloti --add-flags "-Daxoloti_release=$out/share/axoloti -Daxoloti_runtime=$out/share/axoloti -jar $out/share/axoloti/Axoloti.jar"
'';
meta = with lib; {
homepage = "http://www.axoloti.com";
description = ''
Sketching embedded digital audio algorithms.
To fix permissions of the Axoloti USB device node, add a similar udev rule to <literal>services.udev.extraRules</literal>:
<literal>SUBSYSTEM=="usb", ATTR{idVendor}=="16c0", ATTR{idProduct}=="0442", OWNER="someuser", GROUP="somegroup"</literal>
'';
license = licenses.gpl3;
maintainers = with maintainers; [ ];
};
}

@ -1,31 +0,0 @@
{ lib, stdenv, fetchurl, pkg-config, libusb1-axoloti }:
stdenv.mkDerivation rec {
pname = "dfu-util";
version = "0.8";
nativeBuildInputs = [ pkg-config ];
buildInputs = [ libusb1-axoloti ];
src = fetchurl {
url = "http://dfu-util.sourceforge.net/releases/${pname}-${version}.tar.gz";
sha256 = "0n7h08avlzin04j93m6hkq9id6hxjiiix7ff9gc2n89aw6dxxjsm";
};
meta = with lib; {
description = "Device firmware update (DFU) USB programmer";
longDescription = ''
dfu-util is a program that implements the host (PC) side of the USB
DFU 1.0 and 1.1 (Universal Serial Bus Device Firmware Upgrade) protocol.
DFU is intended to download and upload firmware to devices connected over
USB. It ranges from small devices like micro-controller boards up to mobile
phones. With dfu-util you are able to download firmware to your device or
upload firmware from it.
'';
homepage = "http://dfu-util.sourceforge.net";
license = licenses.gpl2Plus;
platforms = platforms.unix;
maintainers = [ ];
};
}

@ -1,39 +0,0 @@
{ stdenv, lib, fetchurl, pkg-config, systemd, libobjc, IOKit, fetchpatch }:
stdenv.mkDerivation rec {
pname = "libusb";
version = "1.0.19";
src = fetchurl {
url = "mirror://sourceforge/libusb/libusb-${version}.tar.bz2";
sha256 = "0h38p9rxfpg9vkrbyb120i1diq57qcln82h5fr7hvy82c20jql3c";
};
outputs = [ "out" "dev" ]; # get rid of propagating systemd closure
buildInputs = [ pkg-config ];
propagatedBuildInputs = lib.optional stdenv.isLinux systemd
++ lib.optionals stdenv.isDarwin [ libobjc IOKit ];
patches = [
(fetchpatch {
name = "libusb.stdfu.patch";
url = "https://raw.githubusercontent.com/axoloti/axoloti/1.0.12/platform_linux/src/libusb.stdfu.patch";
sha256 = "194j7j61i4q6x0ihm9ms8dxd4vliw20n2rj6cm9h17qzdl9xr33d";
})
];
NIX_LDFLAGS = lib.optionalString stdenv.isLinux "-lgcc_s";
preFixup = lib.optionalString stdenv.isLinux ''
sed 's,-ludev,-L${lib.getLib systemd}/lib -ludev,' -i $out/lib/libusb-1.0.la
'';
meta = with lib; {
homepage = "http://www.libusb.info";
description = "User-space USB library";
maintainers = with maintainers; [ ];
platforms = platforms.unix;
license = licenses.lgpl21;
};
}

@ -1,4 +1,4 @@
{ lib, buildGoModule, fetchFromGitHub, testers, sptlrx }:
{ lib, buildGoModule, fetchFromGitHub, nix-update-script, testers, sptlrx }:
buildGoModule rec {
pname = "sptlrx";
@ -15,15 +15,19 @@ buildGoModule rec {
ldflags = [ "-s" "-w" ];
passthru.tests.version = testers.testVersion {
package = sptlrx;
# TODO Wrong version in `0.2.0`. Has been fixed upstream.
version = "v0.1.0";
passthru = {
updateScript = nix-update-script { attrPath = pname; };
tests.version = testers.testVersion {
package = sptlrx;
# TODO Wrong version in `0.2.0`. Has been fixed upstream.
version = "v0.1.0";
};
};
meta = with lib; {
description = "Spotify lyrics in your terminal";
homepage = "https://github.com/raitonoberu/sptlrx";
changelog = "https://github.com/raitonoberu/sptlrx/releases/tag/v${version}";
license = licenses.mit;
maintainers = with maintainers; [ MoritzBoehme ];
};

@ -7,14 +7,14 @@
with lib;
stdenv.mkDerivation rec {
pname = "btcdeb-unstable";
version = "200806";
pname = "btcdeb";
version = "unstable-2022-04-03";
src = fetchFromGitHub {
owner = "bitcoin-core";
repo = "btcdeb";
rev = "f6708c397c64894c9f9e31bea2d22285d9462de7";
sha256 = "0qkmf89z2n7s95vhw3n9vh9dbi14zy4vqw3ffdh1w911jwm5ry3z";
rev = "3ba1ec7f4d37f7d2ff0544403465004c6e12036e";
hash = "sha256-l/PGXXX288mnoSFZ32t2Xd13dC6JCU5wDHoDxb+fcp0=";
};
nativeBuildInputs = [ pkg-config autoreconfHook ];
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
meta = {
description = "Bitcoin Script Debugger";
homepage = "https://github.com/kallewoof/btcdeb";
homepage = "https://github.com/bitcoin-core/btcdeb";
license = licenses.mit;
maintainers = with maintainers; [ akru ];
platforms = platforms.unix;

@ -1,18 +1,19 @@
{ rust, rustPlatform, stdenv, lib, fetchFromGitHub, fetchpatch, autoreconfHook
, makeWrapper, cargo, pkg-config, curl, coreutils, boost178, db62, hexdump
, libsodium, libevent, utf8cpp, util-linux, withDaemon ? true, withMining ? true
, withUtils ? true, withWallet ? true, withZmq ? true, zeromq
, makeWrapper, cargo, pkg-config, curl, coreutils, boost179, db62, hexdump
, libsodium, libevent, testers, utf8cpp, util-linux, withDaemon ? true
, withMining ? true, withUtils ? true, withWallet ? true, withZmq ? true, zcash
, zeromq
}:
rustPlatform.buildRustPackage.override { stdenv = stdenv; } rec {
pname = "zcash";
version = "4.7.0";
version = "5.0.0";
src = fetchFromGitHub {
owner = "zcash";
repo = "zcash";
rev = "v${version}";
sha256 = "sha256-yF+/QepSiZwsdZydWjvxDIFeFyJbJyqZmCdMyQHmrzI=";
sha256 = "sha256-5PlqFs2njqNeZgmNz0VKMWcRY5lPaF9oTsoh/uLEWi8=";
};
prePatch = lib.optionalString stdenv.isAarch64 ''
@ -21,17 +22,10 @@ rustPlatform.buildRustPackage.override { stdenv = stdenv; } rec {
--replace "linker = \"aarch64-linux-gnu-gcc\"" ""
'';
cargoPatches = [
(fetchpatch {
url = "https://github.com/zcash/zcash/commit/61cd19a52d41d60c1987ecf269f7aa8e4d527310.diff";
sha256 = "sha256-/7T2yCSVlRN7qfFjrZlfBNMlbVHb/KRjtUBY2xFr0mo=";
})
];
cargoSha256 = "sha256-+BLfO5OnCBqQTIqMXKJdoPCRgtENa+m0WOHKG9gkdMk=";
cargoSha256 = "sha256-eRRRjUbOieRC88wf+f1jAYvqGFmogBEla67NnImicEc=";
nativeBuildInputs = [ autoreconfHook cargo hexdump makeWrapper pkg-config ];
buildInputs = [ boost178 libevent libsodium utf8cpp ]
buildInputs = [ boost179 libevent libsodium utf8cpp ]
++ lib.optional withWallet db62
++ lib.optional withZmq zeromq;
@ -50,7 +44,7 @@ rustPlatform.buildRustPackage.override { stdenv = stdenv; } rec {
configureFlags = [
"--disable-tests"
"--with-boost-libdir=${lib.getLib boost178}/lib"
"--with-boost-libdir=${lib.getLib boost179}/lib"
"CXXFLAGS=-I${lib.getDev utf8cpp}/include/utf8cpp"
"RUST_TARGET=${rust.toRustTargetSpec stdenv.hostPlatform}"
] ++ lib.optional (!withWallet) "--disable-wallet"
@ -63,6 +57,12 @@ rustPlatform.buildRustPackage.override { stdenv = stdenv; } rec {
# Requires hundreds of megabytes of zkSNARK parameters.
doCheck = false;
passthru.tests.version = testers.testVersion {
package = zcash;
command = "zcashd --version";
version = "v${zcash.version}";
};
postInstall = ''
wrapProgram $out/bin/zcash-fetch-params \
--set PATH ${lib.makeBinPath [ coreutils curl util-linux ]}

@ -13,13 +13,13 @@
trivialBuild {
pname = "ement";
version = "unstable-2022-05-05";
version = "unstable-2022-05-14";
src = fetchFromGitHub {
owner = "alphapapa";
repo = "ement.el";
rev = "84739451afa8355360966dfa788d469d9dc4a8e3";
sha256 = "sha256-XdegBKZfoKbFaMM/l8249VD9KKC5/4gQIK6ggPcoOaE=";
rev = "961d650377f9e7440e47c36c0386e899f5b2d86b";
sha256 = "sha256-4KTSPgso7UvzCRKNFI3YaPR1t4DUwggO4KtBYLm0W4Y=";
};
packageRequires = [

@ -1,8 +1,8 @@
diff --git a/ement.el b/ement.el
index c9596a7..1b33045 100644
--- a/ement.el
+++ b/ement.el
@@ -682,14 +682,15 @@ can cause undesirable underlining."
diff --git a/ement-lib.el b/ement-lib.el
index f0b2738..025a191 100644
--- a/ement-lib.el
+++ b/ement-lib.el
@@ -644,14 +644,15 @@ can cause undesirable underlining."
"Return a copy of IMAGE set to MAX-WIDTH and MAX-HEIGHT.
IMAGE should be one as created by, e.g. `create-image'."
;; It would be nice if the image library had some simple functions to do this sort of thing.
@ -24,5 +24,5 @@ index c9596a7..1b33045 100644
+ (image-property new-image :max-height) max-height)
+ new-image)))
;;;;; Reading/writing sessions
(defun ement--room-alias (room)
"Return latest m.room.canonical_alias event in ROOM."

@ -28,16 +28,16 @@
rustPlatform.buildRustPackage rec {
pname = "lapce";
version = "0.0.12";
version = "0.1.0";
src = fetchFromGitHub {
owner = "lapce";
repo = pname;
rev = "v${version}";
sha256 = "sha256-ZFQjQ5+G0b0Fgg3+du/drt+62rC/TCNR5MIdJXAkTrE=";
sha256 = "sha256-KSumy7M7VNUib4CZ0ikBboEFMzDQt4xW+aUFHOi+0pA=";
};
cargoSha256 = "sha256-sMTootPsenaWzLLFImo6HWC1pcm2uFupPhVWsUJp1Ak=";
cargoSha256 = "sha256-7SVTcH9/Ilq8HcpJJI0KFiQA076lR2CAIBwmTVgmnjE=";
nativeBuildInputs = [
cmake

@ -3,14 +3,10 @@
, vim
, vimCommandCheckHook
, vimGenDocHook
, neovimRequireCheckHook
}:
rec {
addRtp = path: attrs: derivation:
derivation // { rtp = "${derivation}"; } // {
overrideAttrs = f: buildVimPlugin (attrs // f attrs);
};
buildVimPlugin = attrs@{
name ? "${attrs.pname}-${attrs.version}",
namePrefix ? "vimplugin-",
@ -24,7 +20,7 @@ rec {
addonInfo ? null,
...
}:
addRtp "${rtpPath}/${path}" attrs (stdenv.mkDerivation (attrs // {
let drv = stdenv.mkDerivation (attrs // {
name = namePrefix + name;
# dont move the doc folder since vim expects it
@ -44,7 +40,10 @@ rec {
runHook postInstall
'';
}));
});
in drv.overrideAttrs(oa: {
rtp = "${drv}";
});
buildVimPluginFrom2Nix = attrs: buildVimPlugin ({
# vim plugins may override this

File diff suppressed because it is too large Load Diff

@ -0,0 +1,21 @@
# Setup hook for checking whether Python imports succeed
echo "Sourcing neovim-require-check-hook.sh"
neovimRequireCheckHook () {
echo "Executing neovimRequireCheckHook"
if [ -n "$nvimRequireCheck" ]; then
echo "Check whether the following module can be imported: $nvimRequireCheck"
# editorconfig-checker-disable
export HOME="$TMPDIR"
@nvimBinary@ -es --headless -n -u NONE -i NONE --clean -V1 \
--cmd "set rtp+=$out" \
--cmd "lua require('$nvimRequireCheck')"
fi
}
echo "Using neovimRequireCheckHook"
preDistPhases+=" neovimRequireCheckHook"

@ -327,6 +327,9 @@ self: super: {
sed -Ei lua/plenary/curl.lua \
-e 's@(command\s*=\s*")curl(")@\1${curl}/bin/curl\2@'
'';
doInstallCheck = true;
nvimRequireCheck = "plenary";
});
gruvbox-nvim = super.gruvbox-nvim.overrideAttrs (old: {
@ -842,7 +845,7 @@ self: super: {
libiconv
];
cargoSha256 = "035v8mm8v7aj8qwhvxsp6k0afn05gi2xb1achzsvm0m4a8a9xs65";
cargoSha256 = "0l1x7kprnxa95pbf8ml9ixmj0cmbnnv6nd0v6qry8j67rx8plpmp";
};
in
''
@ -971,7 +974,7 @@ self: super: {
vim-markdown-composer-bin = rustPlatform.buildRustPackage rec {
pname = "vim-markdown-composer-bin";
inherit (super.vim-markdown-composer) src version;
cargoSha256 = "03d7kap6vha1jmyfrjqaja5439x6mhnvjjbz3rmxb3x4dpppbpj1";
cargoSha256 = "0q0i6kyihswrjrfdj4p3z54b779sdg2wz38z943ypj6dqphhcklx";
};
in
super.vim-markdown-composer.overrideAttrs (oldAttrs: rec {

@ -533,6 +533,7 @@ https://github.com/chr4/sslsecure.vim/,,
https://github.com/luukvbaal/stabilize.nvim/,,
https://github.com/eigenfoo/stan-vim/,,
https://github.com/darfink/starsearch.vim/,,
https://github.com/teto/stylish.nvim/,HEAD,
https://github.com/lambdalisue/suda.vim/,,
https://github.com/ervandew/supertab/,,
https://github.com/ur4ltz/surround.nvim/,,
@ -786,6 +787,7 @@ https://github.com/maksimr/vim-jsbeautify/,,
https://github.com/heavenshell/vim-jsdoc/,,
https://github.com/elzr/vim-json/,,
https://github.com/google/vim-jsonnet/,,
https://github.com/mogelbrod/vim-jsonpath/,HEAD,
https://github.com/MaxMEllon/vim-jsx-pretty/,,
https://github.com/peitalin/vim-jsx-typescript/,,
https://github.com/knubie/vim-kitty-navigator/,,

@ -531,14 +531,26 @@ rec {
};
} ./vim-command-check-hook.sh) {};
neovimRequireCheckHook = callPackage ({ neovim-unwrapped }:
makeSetupHook {
name = "neovim-require-check-hook";
deps = [ neovim-unwrapped ];
substitutions = {
nvimBinary = "${neovim-unwrapped}/bin/nvim";
inherit rtpPath;
};
} ./neovim-require-check-hook.sh) {};
inherit (import ./build-vim-plugin.nix {
inherit lib stdenv rtpPath vim vimGenDocHook vimCommandCheckHook;
inherit lib stdenv rtpPath vim vimGenDocHook vimCommandCheckHook neovimRequireCheckHook;
}) buildVimPlugin buildVimPluginFrom2Nix;
# TODO placeholder to ease working on automatic plugin detection
# this should be a luarocks "flat" install with appropriate vim hooks
buildNeovimPluginFrom2Nix = buildVimPluginFrom2Nix;
buildNeovimPluginFrom2Nix = attrs: let drv = (buildVimPluginFrom2Nix attrs); in drv.overrideAttrs(oa: {
nativeBuildInputs = oa.nativeBuildInputs ++ [ neovimRequireCheckHook ];
});
# used to figure out which python dependencies etc. neovim needs
requiredPlugins = {

@ -58,6 +58,10 @@ buildDotnetModule rec {
pulseaudio
];
makeWrapperArgs = [
"--suffix PATH : ${lib.getBin ffmpeg}"
];
patches = [
./appdir.patch # Ryujinx attempts to write to the nix store. This patch redirects it to "~/.config/Ryujinx" on Linux.
];
@ -66,11 +70,6 @@ buildDotnetModule rec {
# workaround for https://github.com/Ryujinx/Ryujinx/issues/2349
mkdir -p $out/lib/sndio-6
ln -s ${sndio}/lib/libsndio.so $out/lib/sndio-6/libsndio.so.6
# Ryujinx tries to use ffmpeg from PATH
makeWrapperArgs+=(
--suffix PATH : ${lib.makeBinPath [ ffmpeg ]}
)
'';
preFixup = ''

@ -175,7 +175,9 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) {
done
'';
enableParallelBuilding = true;
# Until https://github.com/NixOS/nixpkgs/pull/172617 is applied,
# parallel builds do not always work because of a bug in dlltool.
enableParallelBuilding = false;
# https://bugs.winehq.org/show_bug.cgi?id=43530
# https://github.com/NixOS/nixpkgs/issues/31989

@ -46,22 +46,22 @@ in rec {
unstable = fetchurl rec {
# NOTE: Don't forget to change the SHA256 for staging as well.
version = "7.4";
version = "7.8";
url = "https://dl.winehq.org/wine/source/7.x/wine-${version}.tar.xz";
sha256 = "sha256-co6GbW5JzpKioMUUMz6f8Ivb9shvXvTmGAFDuNK31BY=";
sha256 = "sha256-j3bpyWtQ8qyOJOXe7fo+DZWWpXBnCSJvZalMahYAGbg=";
inherit (stable) gecko32 gecko64 patches;
mono = fetchurl rec {
version = "7.1.1";
version = "7.2.0";
url = "https://dl.winehq.org/wine/wine-mono/${version}/wine-mono-${version}-x86.msi";
sha256 = "sha256-ncjlYDt7xkNU65SuTqD2ghQkdno/9E/w0Z40akkMEeo=";
sha256 = "sha256-Xwbq+646SezDHfzqd3B1vUTwzBJuT7Tijs76ButDYyM=";
};
};
staging = fetchFromGitHub rec {
# https://github.com/wine-staging/wine-staging/releases
inherit (unstable) version;
sha256 = "0vlj3b8bnidyhlgkjrnlbah3878zjy3s557vbp16qka42zjaa51q";
sha256 = "sha256-payP+lx/aGZErGbkpogNMgsE393e7F2VGrllDKu/Lws=";
owner = "wine-staging";
repo = "wine-staging";
rev = "v${version}";
@ -84,8 +84,8 @@ in rec {
winetricks = fetchFromGitHub rec {
# https://github.com/Winetricks/winetricks/releases
version = "20210825";
sha256 = "sha256-exMhj3dS8uXCEgOaWbftaq94mBOmtZIXsXb9xNX5ha8=";
version = "20220411";
sha256 = "sha256-FjH10nZDYbqXI6/vKpZJKfv2maXSVkahNDf5UTU3eyU=";
owner = "Winetricks";
repo = "winetricks";
rev = version;

@ -22,20 +22,20 @@
stdenv.mkDerivation rec {
pname = "rnote";
version = "0.5.1-hotfix-1";
version = "0.5.3";
src = fetchFromGitHub {
owner = "flxzt";
repo = "rnote";
rev = "v${version}";
fetchSubmodules = true;
hash = "sha256-Oq/RKeKICyImSPr4GSNjPXZWtuRQ7+9nRfl9MmC+UYI=";
hash = "sha256-v4cca4tSv//VFUvOfemkueELxlez2TdtynqbzjCTlB4=";
};
cargoDeps = rustPlatform.fetchCargoTarball {
inherit src;
name = "${pname}-${version}";
hash = "sha256-gdVy+7xSQVkI84Ta6KLOLR9UUsDoD2Cd0cuNU+OXf2M=";
hash = "sha256-sK8GOLxNG4mu45oQSaFi467DHYt00Pxu3vMM6Po/YqI=";
};
nativeBuildInputs = [

@ -3,11 +3,11 @@
, fetchFromGitLab
, fetchpatch
, appstream-glib
, clang
, desktop-file-utils
, meson
, ninja
, pkg-config
, python3
, rustPlatform
, wrapGAppsHook
, gdk-pixbuf
@ -15,7 +15,9 @@
, gst_all_1
, gtk4
, libadwaita
, libclang
, openssl
, pipewire
, sqlite
, wayland
, zbar
@ -23,33 +25,29 @@
stdenv.mkDerivation rec {
pname = "authenticator";
version = "4.0.3";
version = "4.1.1";
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
owner = "World";
repo = "Authenticator";
rev = version;
sha256 = "0fvs76f3fm5pxn7wg6sjbqpgip5w2j7xrh4siasdcl2bx6vsld8b";
hash = "sha256-wl7wyj0vVDkOB7XKQFOEFzCmffTsrUsaM83fWgZ6tG0=";
};
cargoDeps = rustPlatform.fetchCargoTarball {
inherit src;
name = "${pname}-${version}";
sha256 = "1s97jyszxf24rs3ni11phiyvmp1wm8sicb0rh1jgwz4bn1cnakx4";
hash = "sha256-3SzemDjLsZUXPPtSlDMBQXQf5P3Sz8caJL73mHRv1js=";
};
postPatch = ''
patchShebangs build-aux
'';
nativeBuildInputs = [
appstream-glib
clang
desktop-file-utils
meson
ninja
pkg-config
python3
wrapGAppsHook
] ++ (with rustPlatform; [
cargoSetupHook
@ -62,39 +60,23 @@ stdenv.mkDerivation rec {
glib
gst_all_1.gstreamer
gst_all_1.gst-plugins-base
# gst-plugins-good needs gtk4 support:
# https://gitlab.freedesktop.org/gstreamer/gst-plugins-good/-/merge_requests/767
# We copy the way it is built from the Flatpak:
# https://gitlab.gnome.org/World/Authenticator/-/blob/master/build-aux/com.belmoussaoui.Authenticator.Devel.json
(gst_all_1.gst-plugins-good.overrideAttrs (old: {
patches = old.patches or [ ] ++ [
"${src}/build-aux/767.patch"
];
mesonFlags = old.mesonFlags ++ [
"-Dgtk3=disabled"
"-Dgtk4=enabled"
"-Dgtk4-experiments=true"
];
buildInputs = old.buildInputs ++ [
gtk4
];
}))
(gst_all_1.gst-plugins-bad.override { enableZbar = true; })
gtk4
libadwaita
openssl
pipewire
sqlite
wayland
zbar
];
meta = with lib; {
broken = true; # https://gitlab.gnome.org/World/Authenticator/-/issues/271
LIBCLANG_PATH = "${lib.getLib libclang}/lib";
meta = {
description = "Two-factor authentication code generator for GNOME";
homepage = "https://gitlab.gnome.org/World/Authenticator";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ dotlambda ];
license = lib.licenses.gpl3Plus;
maintainers = with lib.maintainers; [ dotlambda ];
platforms = lib.platforms.linux;
};
}

@ -1,29 +1,49 @@
{ lib, mkDerivation, fetchurl, cmake, pkg-config, sword, boost, clucene_core
, qtbase, qttools, qtsvg, perlPackages, docbook_xml_dtd_45
, docbook_xsl_ns }:
{ lib, mkDerivation
, fetchFromGitHub
, cmake
, docbook_xml_dtd_45
, pkg-config
, wrapQtAppsHook
, boost
, clucene_core_2
, docbook_xsl_ns
, perlPackages
, qtbase
, qtsvg
, qttools
, sword
}:
mkDerivation rec {
pname = "bibletime";
version = "3.0.2";
src = fetchurl {
url = "https://github.com/bibletime/bibletime/releases/download/v${version}/${pname}-${version}.tar.xz";
sha256 = "sha256-/JNjnU/DGD4YRtrKzX7t6MgNCZYihdgTJc+Jbr9IYJ4=";
src = fetchFromGitHub {
owner = "bibletime";
repo = "bibletime";
rev = "v${version}";
hash = "sha256-8X5LkquALFnG0yRayZYjeymHDcOzINBv0MXeVBsOnfI=";
};
nativeBuildInputs = [ cmake pkg-config docbook_xml_dtd_45 ];
nativeBuildInputs = [
cmake
docbook_xml_dtd_45
pkg-config
wrapQtAppsHook
];
buildInputs = [
sword
boost
clucene_core
clucene_core_2
perlPackages.Po4a
qtbase
qttools
qtsvg
perlPackages.Po4a
qttools
sword
];
preConfigure = ''
export CLUCENE_HOME=${clucene_core};
export CLUCENE_HOME=${clucene_core_2};
export SWORD_HOME=${sword};
'';
@ -35,7 +55,7 @@ mkDerivation rec {
];
meta = with lib; {
description = "A Qt4 Bible study tool";
description = "A powerful cross platform Bible study tool";
homepage = "http://www.bibletime.info/";
platforms = platforms.linux;
license = licenses.gpl2Plus;

@ -26,6 +26,12 @@ stdenv.mkDerivation {
sed -i 's|#include <exiv2/exif.hpp>|#include <exiv2/exiv2.hpp>|' src/jpeg-utils.cpp
'';
# Add workaround for -fno-common toolchains like upstream gcc-10 to
# avoid build failures like:
# ld: stats.o:/build/cataract-675e647/src/stats.h:24: multiple definition of
# `stats_images'; cgg.o:/build/cataract-675e647/src/stats.h:24: first defined here
NIX_CFLAGS_COMPILE = "-fcommon";
installPhase = ''
mkdir $out/{bin,share} -p
cp src/cgg{,-dirgen} $out/bin/

@ -160,6 +160,10 @@ let
./patches/no-build-timestamps.patch
# For bundling Widevine (DRM), might be replaceable via bundle_widevine_cdm=true in gnFlags:
./patches/widevine-79.patch
] ++ optionals (versionRange "102" "103") [
# https://dawn-review.googlesource.com/c/dawn/+/88582
# Wrap get_gitHash in try-catch to prevent failures in tarball builds.
./patches/m102-fix-dawn_version_generator-failure.patch
];
postPatch = optionalString (chromiumVersionAtLeast "102") ''

@ -0,0 +1,43 @@
From e9ffd084ec1ff9f7bfc86879732953dc58256958 Mon Sep 17 00:00:00 2001
From: Loko Kung <lokokung@google.com>
Date: Tue, 3 May 2022 00:28:53 +0000
Subject: [PATCH] Wrap get_gitHash in try-catch to prevent failures in tarball
builds.
Bug: chromium:1321370
Change-Id: If39d2236d1b4d965f7bd189f6bd1cdc70436c41d
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/88582
Commit-Queue: Loko Kung <lokokung@google.com>
Reviewed-by: Austin Eng <enga@chromium.org>
Kokoro: Kokoro <noreply+kokoro@google.com>
(cherry picked from commit 03ddfbb81fb4127ca37ea53e70fcb34fe851e24e)
---
third_party/dawn/generator/dawn_version_generator.py | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/third_party/dawn/generator/dawn_version_generator.py b/third_party/dawn/generator/dawn_version_generator.py
index 1907e88da..3c1927bee 100644
--- a/third_party/dawn/generator/dawn_version_generator.py
+++ b/third_party/dawn/generator/dawn_version_generator.py
@@ -23,11 +23,14 @@ def get_git():
def get_gitHash(dawnDir):
- result = subprocess.run([get_git(), 'rev-parse', 'HEAD'],
- stdout=subprocess.PIPE,
- cwd=dawnDir)
- if result.returncode == 0:
- return result.stdout.decode('utf-8').strip()
+ try:
+ result = subprocess.run([get_git(), "rev-parse", "HEAD"],
+ stdout=subprocess.PIPE,
+ cwd=dawnDir)
+ if result.returncode == 0:
+ return result.stdout.decode("utf-8").strip()
+ except Exception:
+ return ""
# No hash was available (possibly) because the directory was not a git checkout. Dawn should
# explicitly handle its absenece and disable features relying on the hash, i.e. caching.
return ''
--
2.36.0

@ -19,9 +19,9 @@
}
},
"beta": {
"version": "102.0.5005.40",
"sha256": "1max5ndvl59j2hlv9k88dmadr4q05q1clzlc6zba0gcbvqx5q9jb",
"sha256bin64": "1byqx9w0hqwk3vizdas3dylbm69108bnq4xlm0mp1p1gh37h1642",
"version": "102.0.5005.49",
"sha256": "16r9mrsagy8lspr4pcrzfpw0vw0ym9m7n41a9yipjhm2arlhw5b2",
"sha256bin64": "0lyk6rd9c1gyvxsmq1bl7asr7carzyaan306ddvwxsy5rfh53jxa",
"deps": {
"gn": {
"version": "2022-04-14",
@ -32,15 +32,15 @@
}
},
"dev": {
"version": "103.0.5042.0",
"sha256": "0wm8m1mff8gb0x7whif16gvmhibgc8ndygnawkwq3g4fvninb65h",
"sha256bin64": "0vzmpi36a86kgxhdxvbqbn7i1wf2annar1mi15gra1cjpz3lf9kh",
"version": "103.0.5056.0",
"sha256": "1mvi7yc38cxn39wqm8ybrn862gaw293rb6lwcszc6rmzwd9jmd29",
"sha256bin64": "06371adaz8llzfjykc72vjvpy3xrgvqzz9kdrr82jdx1pjdbv29d",
"deps": {
"gn": {
"version": "2022-05-02",
"version": "2022-05-09",
"url": "https://gn.googlesource.com/gn",
"rev": "53ef169800760fdc09f0773bf380fe99eaeab339",
"sha256": "08i7qc4qvf8gb3vryajvww75wk653fybf1bb2k40r8i07znhy78r"
"rev": "bf4e17dc67b2a2007475415e3f9e1d1cf32f6e35",
"sha256": "0d2lb4alsx32zsdw3jxpxbzal350mim237p2y984h4r6fd1ddzyi"
}
}
},

@ -23,6 +23,7 @@
# build time
, autoconf
, cargo
, dump_syms
, makeWrapper
, nodejs
, perl
@ -174,6 +175,11 @@ buildStdenv.mkDerivation ({
inherit src unpackPhase meta;
outputs = [
"out"
"symbols"
];
# Add another configure-build-profiling run before the final configure phase if we build with pgo
preConfigurePhases = lib.optionals pgoSupport [
"configurePhase"
@ -206,6 +212,7 @@ buildStdenv.mkDerivation ({
nativeBuildInputs = [
autoconf
cargo
dump_syms
gnum4
llvmPackagesBuildBuild.bintools
makeWrapper
@ -242,13 +249,17 @@ buildStdenv.mkDerivation ({
# Set consistent remoting name to ensure wmclass matches with desktop file
export MOZ_APP_REMOTINGNAME="${binaryName}"
# Use our own python
export MACH_USE_SYSTEM_PYTHON=1
# AS=as in the environment causes build failure
# https://bugzilla.mozilla.org/show_bug.cgi?id=1497286
unset AS
'' + lib.optionalString (lib.versionAtLeast version "100.0") ''
# Use our own python
export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=system
'' + lib.optionalString (lib.versionOlder version "100.0") ''
# Use our own python
export MACH_USE_SYSTEM_PYTHON=1
'' + lib.optionalString (lib.versionAtLeast version "95.0") ''
# RBox WASM Sandboxing
export WASM_CC=${pkgsCross.wasi32.stdenv.cc}/bin/${pkgsCross.wasi32.stdenv.cc.targetPrefix}cc
@ -424,7 +435,13 @@ buildStdenv.mkDerivation ({
# tests were disabled in configureFlags
doCheck = false;
# Generate build symbols once after the final build
# https://firefox-source-docs.mozilla.org/crash-reporting/uploading_symbol.html
preInstall = ''
./mach buildsymbols
mkdir -p $symbols/
cp mozobj/dist/*.crashreporter-symbols.zip $symbols/
cd mozobj
'';

@ -1,8 +1,8 @@
{
"packageVersion": "100.0-2",
"packageVersion": "100.0-3",
"source": {
"rev": "100.0-2",
"sha256": "0pr7fb91zw5qlnfvaavzksd3c2xzgn1344mmfnz9yx2g42vcyi7d"
"rev": "100.0-3",
"sha256": "1n99amk6ngxa7wipc402gffqjv4qmgbaahpz3xydfarxw8gk37pl"
},
"firefox": {
"version": "100.0",

@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
];
meta = with lib; {
homepage = "https://www.netsurf-browser.org/projects/${libname}/";
homepage = "https://www.netsurf-browser.org/";
description = "Generalised utility library for netsurf browser";
license = licenses.mit;
maintainers = [ maintainers.vrthra maintainers.AndersonTorres ];

@ -1,4 +1,7 @@
{ lib, stdenv, fetchurl, pkg-config
{ lib
, stdenv
, fetchurl
, pkg-config
, buildsystem
}:
@ -9,10 +12,11 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "http://download.netsurf-browser.org/libs/releases/${libname}-${version}-src.tar.gz";
sha256 = "sha256-AasdaYnBx3VQkNskw/ZOSflcVgrknCa+xRQrrGgCxHI=";
hash = "sha256-AasdaYnBx3VQkNskw/ZOSflcVgrknCa+xRQrrGgCxHI=";
};
nativeBuildInputs = [ pkg-config ];
buildInputs = [ buildsystem ];
makeFlags = [
@ -21,7 +25,7 @@ stdenv.mkDerivation rec {
];
meta = with lib; {
homepage = "https://www.netsurf-browser.org/projects/${libname}/";
homepage = "https://www.netsurf-browser.org/";
description = "UTF8 Processing library for netsurf browser";
license = licenses.mit;
maintainers = [ maintainers.vrthra maintainers.AndersonTorres ];

@ -1,11 +1,11 @@
{ lib, buildGoModule, fetchFromGitHub, installShellFiles }:
let
# look for GO_LDFLAGS getting set in the Makefile
version = "1.0.4";
sha256 = "sha256-kO48MRQDQGDUvFfsxAt+CAHn2EGU44NMpSKDWnNwAdk=";
vendorSha256 = "sha256-QcD5MKQO51ZZ/NvVIiAmDsN6wLI2N8YkhA387KB77W8=";
pkgsVersion = "v1.0.0-10-gbf81bd2";
extrasVersion = "v1.0.0-2-gc5d3ab0";
version = "1.0.5";
sha256 = "sha256-xgzIbhgV1AAUa0tooYtzUMqK4Co3PvWQ0YbZuf0JgFE=";
vendorSha256 = "sha256-Gp30qCGV+EaJ1lvfleZHRWVL6rdSj0mvpumWsqr9IT0=";
pkgsVersion = "v1.0.0-17-g7567bf4";
extrasVersion = "v1.0.0-3-g6327c36";
in
buildGoModule rec {
pname = "talosctl";

@ -4,11 +4,11 @@ let
configOverrides = writeText "cinny-config-overrides.json" (builtins.toJSON conf);
in stdenv.mkDerivation rec {
pname = "cinny";
version = "2.0.0";
version = "2.0.2";
src = fetchurl {
url = "https://github.com/ajbura/cinny/releases/download/v${version}/cinny-v${version}.tar.gz";
sha256 = "sha256-tM3YA0GW8Z24gt8t9dOyr10GCINodAB0b4/gD7jfgOM=";
sha256 = "sha256-qVnNVJK/Y76cZTh8QNeSNHDxHA/Ekbt7X6mKYkYAPNU=";
};
installPhase = ''

@ -1,9 +1,9 @@
{
"version": "1.10.4-sc.1",
"rev": "v1.10.4-sc.1",
"srcHash": "0sxibzskbw9pa6wmbk1y3n7p74cfj9zvm2hsw76sp6wfac1wnbwl",
"webYarnHash": "1z8xr35gh74y2iv9kfk6d6b6f3iclcrpkdds5q7rh2irpf14fwpw",
"jsSdkYarnHash": "1cwvb0hwq19dh2937fmcbfvnkkfmalk9wrxf1yv81nsbyjnx86di",
"reactSdkYarnHash": "0j4rxg11q35idfzvjrpmyrwkz9yqgzpwps3xqx1k4qcs844jjs9f",
"desktopYarnHash": "0akmgib212gkygvs2snn9c43k3ika3ipg85d480j3hqyb6yxwqmn"
"version": "1.10.12-sc.1",
"rev": "v1.10.12-sc.1",
"srcHash": "1rpfax6xx731w59a2i7v6jr17l3rnrn79d666f0cjchg36nkqqg9",
"webYarnHash": "0m5dnz3m68iz94siwmavzj50wxd6w6wanjsm1zhq76lgymgcbqc2",
"jsSdkYarnHash": "1k1jvavbqr7vcbdaxc6yqiq5254kxhywn1s2zndrfny7ap8z5c1c",
"reactSdkYarnHash": "0cz7pgrbysljmhpf4m0wqwqjqijxahl3wz5qhczlkj46dvq6qyxb",
"desktopYarnHash": "09ri87ynfgxrv22sykggiy6nlcf20qwj7zj9qq0rz3c2acr6g9mn"
}

@ -78,13 +78,8 @@ in stdenv.mkDerivation rec {
buildPhase = ''
runHook preBuild
pushd matrix-react-sdk
../element-web/node_modules/.bin/reskindex -h ../element-web/src/header
popd
pushd element-web
node scripts/copy-res.js
node_modules/.bin/reskindex -h ../element-web/src/header
node_modules/.bin/webpack --progress --mode production
popd

@ -24,7 +24,7 @@ let
in stdenv.mkDerivation rec {
pname = "signal-desktop";
version = "5.42.0"; # Please backport all updates to the stable channel.
version = "5.43.0"; # Please backport all updates to the stable channel.
# All releases have a limited lifetime and "expire" 90 days after the release.
# When releases "expire" the application becomes unusable until an update is
# applied. The expiration date for the current release can be extracted with:
@ -34,7 +34,7 @@ in stdenv.mkDerivation rec {
src = fetchurl {
url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
sha256 = "sha256-xjSj7eKaDV8WB0SiPb4orxKK8mV2a2EWiMBK7BE8mgU=";
sha256 = "sha256-DYJ3WZbaalKhQXhVQO3qhJiGj92Cc+pwRDx/YBIi6gg=";
};
nativeBuildInputs = [

@ -2,13 +2,13 @@
stdenv.mkDerivation {
pname = "netperf";
version = "20180613";
version = "20210121";
src = fetchFromGitHub {
owner = "HewlettPackard";
repo = "netperf";
rev = "bcb868bde7f0203bbab69609f65d4088ba7398db";
sha256 = "1wbbgdvhadd3qs3afv6i777argdpcyxkwz4yv6aqp223n8ki6dm8";
rev = "3bc455b23f901dae377ca0a558e1e32aa56b31c4";
sha256 = "s4G1ZN+6LERdEMDkc+12ZQgTi6K+ppUYUCGn4faCS9c=";
};
buildInputs = lib.optional (with stdenv.hostPlatform; isx86 && isLinux) libsmbios;
@ -22,7 +22,7 @@ stdenv.mkDerivation {
meta = {
description = "Benchmark to measure the performance of many different types of networking";
homepage = "http://www.netperf.org/netperf/";
license = "Hewlett-Packard BSD-like license";
license = lib.licenses.mit;
platforms = lib.platforms.unix;
maintainers = [ lib.maintainers.mmlb ];

@ -23,6 +23,11 @@ buildPythonApplication rec {
checkInputs = [ pytestCheckHook tox ];
disabledTests = [
# Disable test using relative date and time
"test_tweet_relative_datetime"
];
meta = with lib; {
description = "Decentralised, minimalist microblogging service for hackers";
homepage = "https://github.com/buckket/twtxt";

@ -1,4 +1,5 @@
{ lib, stdenv, fetchFromGitHub
, fetchpatch
, avahi
, cups
, gnutls
@ -21,6 +22,14 @@ stdenv.mkDerivation rec {
sha256 = "sha256-FsmR0fFb9bU9G3oUyJU1eDLcoZ6OQ2//TINlPrW6lU0=";
};
patches = [
(fetchpatch {
name = "file-offset-bits-64-linux.patch";
url = "https://github.com/michaelrsweet/pappl/commit/7ec4ce4331b6637c54a37943269e05d15ff6dd47.patch";
sha256 = "sha256-x5lriopWw6Mn2qjv19flsleEzPMHU4jYWRy0y6hTL5k=";
})
];
outputs = [ "out" "dev" ];
nativeBuildInputs = [

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, fetchpatch
, libusb1, rtl-sdr, soapysdr-with-plugins
}:
@ -13,6 +13,12 @@ stdenv.mkDerivation rec {
sha256 = "sha256-KoDKyI7KDdGSe79ZTuL9ObKnOJsqTN4wrMq+/cvQ/Xk=";
};
patches = [( fetchpatch {
name = "CVE-2022-27419";
url = "https://github.com/merbanan/rtl_433/commit/37455483889bd1c641bdaafc493d1cc236b74904.patch";
sha256 = "172jndh8x5nlcbx2jp5y8fgfxsawwfz95037pcjp170gf93ijy88";
})];
nativeBuildInputs = [ pkg-config cmake ];
buildInputs = [ libusb1 rtl-sdr soapysdr-with-plugins ];
@ -23,7 +29,7 @@ stdenv.mkDerivation rec {
description = "Decode traffic from devices that broadcast on 433.9 MHz, 868 MHz, 315 MHz, 345 MHz and 915 MHz";
homepage = "https://github.com/merbanan/rtl_433";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ earldouglas ];
maintainers = with maintainers; [ earldouglas markuskowa ];
platforms = platforms.all;
};

@ -24,6 +24,12 @@ stdenv.mkDerivation rec {
fig2dev
];
# Workaround build on -fno-common toolchains like upstream gcc-10.
# Otherwise built fails as:
# ld: inout.o:/build/chemtool-1.6.14/ct1.h:279: multiple definition of
# `outtype'; draw.o:/build/chemtool-1.6.14/ct1.h:279: first defined here
NIX_CFLAGS_COMPILE = "-fcommon";
preFixup = ''
gappsWrapperArgs+=(--prefix PATH : "${lib.makeBinPath [ fig2dev ]}")
'';

@ -4,14 +4,14 @@
stdenv.mkDerivation rec {
pname = "alliance";
version = "unstable-2021-09-15";
version = "unstable-2022-01-13";
src = fetchFromGitLab {
domain = "gitlab.lip6.fr";
owner = "vlsi-eda";
repo = "alliance";
rev = "5e83c92d0307cce9d599f7099fb0023f81d26d65";
sha256 = "Vd3MTT4eKn4FMt0/F4fQUPcWq25kH0FpeGxQUOetKPY=";
rev = "ebece102e15c110fc79f1da50524c68fd9523f0c";
hash = "sha256-NGtE3ZmN9LrgXG4NIKrp7dFRVzrKMoudlPUtYYKrZjY=";
};
prePatch = "cd alliance/src";

@ -0,0 +1,51 @@
{ lib
, stdenv
, fetchFromGitHub
, cmake
, primesieve
}:
stdenv.mkDerivation rec {
pname = "primecount";
version = "7.3";
src = fetchFromGitHub {
owner = "kimwalisch";
repo = "primecount";
rev = "v${version}";
hash = "sha256-hxnn1uiGSB6XRC7yK+SXTwTsJfjhemWXsMNhhL7Ghek=";
};
nativeBuildInputs = [ cmake ];
buildInputs = [ primesieve ];
cmakeFlags = [
"-DBUILD_LIBPRIMESIEVE=ON"
"-DBUILD_PRIMECOUNT=ON"
"-DBUILD_SHARED_LIBS=ON"
"-DBUILD_STATIC_LIBS=OFF"
"-DBUILD_TESTS=ON"
];
meta = with lib; {
homepage = "https://github.com/kimwalisch/primecount";
description = "Fast prime counting function implementations";
longDescription = ''
primecount is a command-line program and C/C++ library that counts the
primes below an integer x 10^31 using highly optimized implementations
of the combinatorial prime counting algorithms.
primecount includes implementations of all important combinatorial prime
counting algorithms known up to this date all of which have been
parallelized using OpenMP. primecount contains the first ever open source
implementations of the Deleglise-Rivat algorithm and Xavier Gourdon's
algorithm (that works). primecount also features a novel load balancer
that is shared amongst all implementations and that scales up to hundreds
of CPU cores. primecount has already been used to compute several prime
counting function world records.
'';
license = licenses.bsd2;
inherit (primesieve.meta) maintainers platforms;
};
}

@ -0,0 +1,36 @@
{ lib
, stdenv
, fetchFromGitHub
, cmake
}:
stdenv.mkDerivation rec {
pname = "primesieve";
version = "7.9";
src = fetchFromGitHub {
owner = "kimwalisch";
repo = "primesieve";
rev = "v${version}";
hash = "sha256-lwT+adKFoNI125y5FuJMovtMh8sFi9oqMLYGLabzrCI=";
};
nativeBuildInputs = [ cmake ];
meta = with lib; {
homepage = "https://primesieve.org/";
description = "Fast C/C++ prime number generator";
longDescription = ''
primesieve is a command-line program and C/C++ library for quickly
generating prime numbers. It is very cache efficient, it detects your
CPU's L1 & L2 cache sizes and allocates its main data structures
accordingly. It is also multi-threaded by default, it uses all available
CPU cores whenever possible i.e. if sequential ordering is not
required. primesieve can generate primes and prime k-tuplets up to 264.
'';
license = licenses.bsd2;
maintainers = teams.sage.members ++
(with maintainers; [ abbradar AndersonTorres ]);
platforms = platforms.unix;
};
}

@ -101,7 +101,7 @@ stdenv.mkDerivation rec {
# Fix the installation script
patchShebangs MathInstaller
substituteInPlace MathInstaller \
--replace "`hostname`" "" \
--replace '`hostname`' "" \
--replace "chgrp" "# chgrp" \
--replace "chown" ": # chown"

@ -35,14 +35,14 @@
mkDerivation rec {
pname = "recoll";
version = "1.31.0";
version = "1.32.0";
src = fetchurl {
url = "https://www.lesbonscomptes.com/${pname}/${pname}-${version}.tar.gz";
sha256 = "sha256-TtkfohzeT0HO6ywCMNxrODW1DnJg5KMFkx9AbDfQt+c=";
sha256 = "sha256-4kt6g5MVZTyYLSH7q2z72nzAsU6fatC0vTebEKhSA6E=";
};
configureFlags = [ "--enable-recollq" "--disable-webkit" ]
configureFlags = [ "--enable-recollq" "--disable-webkit" "--without-systemd" ]
++ lib.optionals (!withGui) [ "--disable-qtgui" "--disable-x11mon" ]
++ (if stdenv.isLinux then [ "--with-inotify" ] else [ "--without-inotify" ]);
@ -87,6 +87,9 @@ mkDerivation rec {
done
'' + lib.optionalString stdenv.isLinux ''
substituteInPlace $f --replace '"lyx"' '"${lib.getBin lyx}/bin/lyx"'
'' + lib.optionalString (stdenv.isDarwin && withGui) ''
mkdir $out/Applications
mv $out/bin/recoll.app $out/Applications
'';
enableParallelBuilding = true;

@ -11,16 +11,16 @@
rustPlatform.buildRustPackage rec {
pname = "delta";
version = "0.12.1";
version = "0.13.0";
src = fetchFromGitHub {
owner = "dandavison";
repo = pname;
rev = version;
sha256 = "sha256-khW+Ri+MZytMZcd2tRXhc/D6kOOhk+LP6MsS+GijjQM=";
sha256 = "sha256-5h4epV3RORZiynW1fkFLImqPunC3PZ/YzLiSrzescww=";
};
cargoSha256 = "sha256-SD1y+l86wqlJUUaG4ae4PXXSMS+4CPth3F4pLYbXMVc=";
cargoSha256 = "sha256-4dPTcrT8Gx3WfT0sauqnCSmcGE9LrgIqgHrY5l503ZA=";
nativeBuildInputs = [ installShellFiles ];

@ -1,28 +1,43 @@
{ lib, fetchFromGitHub, gitMinimal, makeWrapper, rustPlatform }:
{ fetchFromGitHub
, gitMinimal
, gfold
, lib
, libiconv
, makeWrapper
, rustPlatform
, Security
, stdenv
, testVersion
}:
rustPlatform.buildRustPackage rec {
let
pname = "gfold";
version = "3.0.0";
version = "4.0.0";
in
rustPlatform.buildRustPackage {
inherit pname version;
src = fetchFromGitHub {
owner = "nickgerace";
repo = pname;
rev = version;
sha256 = "0ss6vfrc6h3jlh5qilh82psd3vdnfawf1wl4cf64mfm4hm9dda63";
sha256 = "1yh5173qhi9bd41zss9k21nm0xnr2sa918kvlyr5xvzhq47rrwz5";
};
cargoSha256 = "09ywwgxm8l1p0jypp65zpqryjnb2g4gririf1dmqb9148dsj29x2";
cargoSha256 = "sha256-o2fMIlj+veTmhfqi7BVpxr3520SOwWLmVS2UU83EVjo=";
nativeBuildInputs = [ makeWrapper ];
buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ];
postInstall = ''
wrapProgram "$out/bin/gfold" --prefix PATH : "${gitMinimal}/bin"
'';
passthru.tests.version = testVersion {
package = gfold;
command = "gfold --version";
inherit version;
};
meta = with lib; {
inherit (src.meta) homepage;
description =
"A tool to help keep track of your Git repositories, written in Rust";
"CLI tool to help keep track of your Git repositories, written in Rust";
homepage = "https://github.com/nickgerace/gfold";
license = licenses.asl20;
maintainers = [ maintainers.shanesveller ];
platforms = platforms.unix;

@ -23,18 +23,6 @@ let
sha256 = "K1cAvmqWEfS6EY4MKAtjXb388XLYHtouxNM70PWgFig=";
};
workaround-opencollective-buildfailures = stdenv.mkDerivation {
# FIXME: This should be removed when a complete fix is available
# https://github.com/svanderburg/node2nix/issues/145
name = "workaround-opencollective-buildfailures";
dontUnpack = true;
installPhase = ''
mkdir -p $out/bin
touch $out/bin/opencollective-postinstall
chmod +x $out/bin/opencollective-postinstall
'';
};
client = nodePackages.epgstation-client.override (drv: {
# FIXME: remove this option if possible
#
@ -49,21 +37,14 @@ let
server = nodePackages.epgstation.override (drv: {
inherit src;
bypassCache = false;
# This is set to false to keep devDependencies at build time. Build time
# dependencies are pruned afterwards.
production = false;
buildInputs = [ bash ];
nativeBuildInputs = [
nodejs
workaround-opencollective-buildfailures
buildInputs = (drv.buildInputs or [ ]) ++ [ bash ];
nativeBuildInputs = (drv.nativeBuildInputs or [ ]) ++ [
makeWrapper
] ++ (with nodePackages; [
node-pre-gyp
node-gyp-build
]);
];
preRebuild = ''
# Fix for not being able to connect to mysql using domain sockets.

@ -1,27 +1,54 @@
{ lib, stdenv, fetchurl, pkg-config
, freetype, fribidi
, libSM, libICE, libXt, libXaw, libXmu
, libXext, libXft, libXpm, libXrandr
, libXrender, xorgproto, libXinerama }:
{ lib
, stdenv
, fetchurl
, freetype
, fribidi
, libICE
, libSM
, libXaw
, libXext
, libXft
, libXinerama
, libXmu
, libXpm
, libXrandr
, libXrender
, libXt
, pkg-config
, xorgproto
}:
with lib;
stdenv.mkDerivation rec {
pname = "oroborus";
version = "2.0.20";
nativeBuildInputs = [ pkg-config ];
buildInputs = [ freetype fribidi libSM libICE libXt libXaw libXmu libXext
libXft libXpm libXrandr libXrender xorgproto libXinerama ];
src = fetchurl {
url = "mirror://debian/pool/main/o/oroborus/oroborus_${version}.tar.gz";
sha256 = "12bvk8x8rfnymbfbwmdcrd9g8m1zxbcq7rgvfdkjr0gnpi0aa82j";
hash = "sha256-UiClQLz2gSxnc/vlg9nqP1T0UsusVb7cqt66jDqae4k=a";
};
meta = {
nativeBuildInputs = [ pkg-config ];
buildInputs = [
freetype
fribidi
libICE
libSM
libXaw
libXext
libXft
libXinerama
libXmu
libXpm
libXrandr
libXrender
libXt
xorgproto
];
meta = with lib; {
homepage = "https://web.archive.org/web/20191129172107/https://www.oroborus.org/";
description = "A really minimalistic X window manager";
homepage = "https://www.oroborus.org/";
license = licenses.gpl2Plus;
maintainers = [ maintainers.AndersonTorres ];
platforms = platforms.linux;

@ -28,8 +28,8 @@ dotnetBuildHook() {
--configuration "@buildType@" \
--no-restore \
${versionFlag-} \
"${dotnetBuildFlags[@]}" \
"${dotnetFlags[@]}"
${dotnetBuildFlags[@]} \
${dotnetFlags[@]}
done
runHook postBuild

@ -20,8 +20,8 @@ dotnetConfigureHook() {
-p:Deterministic=true \
--source "@nugetSource@/lib" \
${parallelFlag-} \
"${dotnetRestoreFlags[@]}" \
"${dotnetFlags[@]}"
${dotnetRestoreFlags[@]} \
${dotnetFlags[@]}
done
runHook postConfigure

@ -15,8 +15,8 @@ dotnetInstallHook() {
--configuration "@buildType@" \
--no-build \
--no-self-contained \
"${dotnetInstallFlags[@]}" \
"${dotnetFlags[@]}"
${dotnetInstallFlags[@]} \
${dotnetFlags[@]}
done
if [[ "${packNupkg-}" ]]; then
@ -28,8 +28,8 @@ dotnetInstallHook() {
--output "$out/share" \
--configuration "@buildType@" \
--no-build \
"${dotnetPackFlags[@]}" \
"${dotnetFlags[@]}"
${dotnetPackFlags[@]} \
${dotnetFlags[@]}
done
fi

@ -0,0 +1,16 @@
{ runCommand }:
firmware:
runCommand "${firmware.name}-xz" {} ''
mkdir -p $out/lib
(cd ${firmware} && find lib/firmware -type d -print0) |
(cd $out && xargs -0 mkdir -v --)
(cd ${firmware} && find lib/firmware -type f -print0) |
(cd $out && xargs -0tP "$NIX_BUILD_CORES" -n1 \
sh -c 'xz -9c -T1 -C crc32 --lzma2=dict=2MiB "${firmware}/$1" > "$1.xz"' --)
(cd ${firmware} && find lib/firmware -type l) | while read link; do
target="$(readlink "${firmware}/$link")"
ln -vs -- "''${target/^${firmware}/$out}.xz" "$out/$link.xz"
done
''

@ -81,8 +81,12 @@ for module in $(cat closure); do
for i in $(modinfo -b $kernel --set-version "$version" -F firmware $module | grep -v '^name:'); do
mkdir -p "$out/lib/firmware/$(dirname "$i")"
echo "firmware for $module: $i"
cp "$firmware/lib/firmware/$i" "$out/lib/firmware/$i" 2>/dev/null \
|| echo "WARNING: missing firmware $i for module $module"
for name in "$i" "$i.xz" ""; do
[ -z "$name" ] && echo "WARNING: missing firmware $i for module $module"
if cp "$firmware/lib/firmware/$name" "$out/lib/firmware/$name" 2>/dev/null; then
break
fi
done
done
done

@ -1,6 +1,6 @@
{
"commit": "78324aa49909392e169c86bbfd204694523907e8",
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/78324aa49909392e169c86bbfd204694523907e8.tar.gz",
"sha256": "15k5ag36asswwv8yazq53lkj9blnz4hzlq23cznvvk5pkjpdm0ni",
"msg": "Update from Hackage at 2022-05-05T15:07:55Z"
"commit": "38aa99a1623af5371157721c2a4b033b828e9938",
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/38aa99a1623af5371157721c2a4b033b828e9938.tar.gz",
"sha256": "0phak7cjg3nrj5i3ih2k95hcwx25s6zijbp81ycqd0yb108gvw34",
"msg": "Update from Hackage at 2022-05-10T13:45:20Z"
}

@ -1,6 +1,7 @@
{ type
, version
, srcs
, icu #passing icu as an argument, because dotnet 3.1 has troubles with icu71
}:
assert builtins.elem type [ "aspnetcore" "runtime" "sdk"];
@ -11,7 +12,6 @@ assert builtins.elem type [ "aspnetcore" "runtime" "sdk"];
, writeText
, libunwind
, openssl
, icu
, libuuid
, zlib
, curl
@ -38,7 +38,6 @@ in stdenv.mkDerivation rec {
rpath = lib.makeLibraryPath ([
stdenv.cc.cc
zlib
curl
icu
libunwind

@ -5,7 +5,7 @@ dotnetCombined = with dotnetCorePackages; combinePackages [ sdk_3_1 sdk_5_0 aspn
Hashes and urls below are retrieved from:
https://dotnet.microsoft.com/download/dotnet
*/
{ callPackage }:
{ callPackage, icu70, icu }:
let
buildDotnet = attrs: callPackage (import ./build-dotnet.nix attrs) {};
buildAspNetCore = attrs: buildDotnet (attrs // { type = "aspnetcore"; });
@ -20,8 +20,11 @@ rec {
sdk_2_2 = throw "Dotnet SDK 2.2 is EOL, please use 3.1 (LTS), 5.0 (Current) or 6.0 (LTS)";
sdk_3_0 = throw "Dotnet SDK 3.0 is EOL, please use 3.1 (LTS), 5.0 (Current) or 6.0 (LTS)";
##### Following attributes with urls and hashes should be auto-generated by print-hashes.sh #####
# v3.1 (lts)
aspnetcore_3_1 = buildAspNetCore {
icu = icu70;
version = "3.1.21";
srcs = {
x86_64-linux = {
@ -40,6 +43,7 @@ rec {
};
runtime_3_1 = buildNetRuntime {
icu = icu70;
version = "3.1.21";
srcs = {
x86_64-linux = {
@ -58,6 +62,7 @@ rec {
};
sdk_3_1 = buildNetSdk {
icu = icu70;
version = "3.1.415";
srcs = {
x86_64-linux = {
@ -77,6 +82,7 @@ rec {
# v5.0 (current)
aspnetcore_5_0 = buildAspNetCore {
inherit icu;
version = "5.0.12";
srcs = {
x86_64-linux = {
@ -95,6 +101,7 @@ rec {
};
runtime_5_0 = buildNetRuntime {
inherit icu;
version = "5.0.12";
srcs = {
x86_64-linux = {
@ -113,6 +120,7 @@ rec {
};
sdk_5_0 = buildNetSdk {
inherit icu;
version = "5.0.403";
srcs = {
x86_64-linux = {
@ -132,6 +140,7 @@ rec {
# v6.0 (lts)
aspnetcore_6_0 = buildAspNetCore {
inherit icu;
version = "6.0.4";
srcs = {
x86_64-linux = {
@ -154,6 +163,7 @@ rec {
};
runtime_6_0 = buildNetRuntime {
inherit icu;
version = "6.0.4";
srcs = {
x86_64-linux = {
@ -176,6 +186,7 @@ rec {
};
sdk_6_0 = buildNetSdk {
inherit icu;
version = "6.0.202";
srcs = {
x86_64-linux = {

@ -84,6 +84,11 @@ Examples:
aspnetcore_files="$(release_files "$release_content" "aspnetcore-runtime")"
runtime_files="$(release_files "$release_content" "runtime")"
sdk_files="$(release_files "$release_content" "sdk")"
if [ $major_minor = "3.1" ]; then
icu_attr="icu = icu70;"
else
icu_attr="inherit icu;"
fi
major_minor_underscore=${major_minor/./_}
channel_version=$(jq -r '."channel-version"' <<< "$content")
@ -91,16 +96,19 @@ Examples:
echo "
# v$channel_version ($support_phase)
aspnetcore_$major_minor_underscore = buildAspNetCore {
$icu_attr
version = \"${aspnetcore_version}\";
$(platform_sources "$aspnetcore_files")
};
runtime_$major_minor_underscore = buildNetRuntime {
$icu_attr
version = \"${runtime_version}\";
$(platform_sources "$runtime_files")
};
sdk_$major_minor_underscore = buildNetSdk {
$icu_attr
version = \"${sdk_version}\";
$(platform_sources "$sdk_files")
}; "

@ -1,24 +1,16 @@
{ lib, stdenv, ruby, bison, rake, fetchFromGitHub, fetchpatch }:
{ lib, stdenv, ruby, bison, rake, fetchFromGitHub }:
stdenv.mkDerivation rec {
pname = "mruby";
version = "3.0.0";
version = "3.1.0";
src = fetchFromGitHub {
owner = "mruby";
repo = "mruby";
rev = version;
sha256 = "sha256-C3K7ZooaOMa+V2HjxwiKxrrMb7ffl4QAgPsftRtb60c=";
sha256 = "0gnzip7qfadnl0r1k8bpc9a6796sy503h77ggds02wrz7mpq32nf";
};
patches = [
(fetchpatch {
name = "CVE-2022-1212.patch";
url = "https://github.com/mruby/mruby/commit/3cf291f72224715942beaf8553e42ba8891ab3c6.patch";
sha256 = "1bl8wm6v7v18zgxqvm4kbn8g97a75phzrdah279xqw1qvplbd2w7";
})
];
nativeBuildInputs = [ ruby bison rake ];
# Necessary so it uses `gcc` instead of `ld` for linking.

@ -2,7 +2,6 @@
, buildPythonPackage
, fetchPypi
, pythonOlder
, pythonAtLeast
, pythonRelaxDepsHook
, writeText
, asttokens
@ -13,6 +12,7 @@
, sphinx_rtd_theme
, pytest-runner
, setuptools-scm
, git
}:
let
@ -27,17 +27,21 @@ let
in
buildPythonPackage rec {
pname = "vyper";
version = "0.3.1";
version = "0.3.3";
format = "setuptools";
disabled = pythonOlder "3.7" || pythonAtLeast "3.10";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-fXug5v3zstz19uexMWokHBVsfcl2ZCdIOIXKeLVyh/Q=";
sha256 = "sha256-BAnNj27B1HAb9VVDA69bFGbQjeOpl0g5EB2juajqBAw=";
};
nativeBuildInputs = [
# Git is used in setup.py to compute version information during building
# ever since https://github.com/vyperlang/vyper/pull/2816
git
pythonRelaxDepsHook
pytest-runner
setuptools-scm

@ -1,40 +1,37 @@
{ stdenv, lib, fetchFromGitHub, fetchpatch
, gcc-arm-embedded, libftdi1, libusb-compat-0_1, pkg-config
{ stdenv, lib
, fetchFromGitHub
, gcc-arm-embedded
, pkg-config
, python3
, hidapi
, libftdi1
, libusb1
}:
with lib;
stdenv.mkDerivation rec {
pname = "blackmagic";
version = "unstable-2020-08-05";
version = "unstable-2022-04-16";
# `git describe --always`
firmwareVersion = "v1.6.1-539-gdd74ec8";
firmwareVersion = "v1.7.1-415-gc4869a5";
src = fetchFromGitHub {
owner = "blacksphere";
repo = "blackmagic";
rev = "dd74ec8e6f734302daa1ee361af88dfb5043f166";
sha256 = "18w8y64fs7wfdypa4vm3migk5w095z8nbd8qp795f322mf2bz281";
rev = "c4869a54733ae92099a7316954e34d1ab7b6097c";
hash = "sha256-0MC1v/5u/txSshxkOI5TErMRRrYCcHly3qbVTAk9Vc0=";
fetchSubmodules = true;
};
patches = [
# Fix deprecation warning with libftdi 1.5
(fetchpatch {
url = "https://github.com/blacksphere/blackmagic/commit/dea4be2539c5ea63836ec78dca08b52fa8b26ab5.patch";
sha256 = "0f81simij1wdhifsxaavalc6yxzagfbgwry969dbjmxqzvrsrds5";
})
];
nativeBuildInputs = [
gcc-arm-embedded pkg-config
gcc-arm-embedded
pkg-config
python3
];
buildInputs = [
hidapi
libftdi1
libusb-compat-0_1
libusb1
];
strictDeps = true;
@ -50,12 +47,17 @@ stdenv.mkDerivation rec {
done
'';
buildPhase = "${stdenv.shell} ${./helper.sh}";
buildPhase = ''
runHook preBuild
${stdenv.shell} ${./helper.sh}
runHook postBuild
'';
dontInstall = true;
enableParallelBuilding = true;
meta = {
meta = with lib; {
description = "In-application debugger for ARM Cortex microcontrollers";
longDescription = ''
The Black Magic Probe is a modern, in-application debugging tool

@ -334,15 +334,7 @@ self: super: {
matplotlib = dontCheck super.matplotlib;
# https://github.com/matterhorn-chat/matterhorn/issues/679 they do not want to be on stackage
matterhorn = doJailbreak (super.matterhorn.overrideScope (self: super: {
brick = self.brick_0_64_2;
# Doesn't support aeson 2.0
# https://github.com/matterhorn-chat/matterhorn/issues/759
aeson = self.aeson_1_5_6_0;
}));
mattermost-api = super.mattermost-api.override {
aeson = self.aeson_1_5_6_0;
};
matterhorn = doJailbreak super.matterhorn;
memcache = dontCheck super.memcache;
metrics = dontCheck super.metrics;

@ -118,7 +118,7 @@ self: super: {
liquidhaskell = markBroken super.liquidhaskell;
# This became a core library in ghc 8.10., so we don‘t have an "exception" attribute anymore.
exceptions = super.exceptions_0_10_4;
exceptions = super.exceptions_0_10_5;
# ghc versions which don‘t match the ghc-lib-parser-ex version need the
# additional dependency to compile successfully.

@ -3082,6 +3082,7 @@ broken-packages:
- LTS
- lua-bc
- luautils
- lucid2
- lucid-htmx
- lucid-hyperscript
- luis-client

@ -118,7 +118,6 @@ extra-packages:
- ghc-lib-parser == 8.10.7.* # 2022-02-17: preserve for GHC 8.10.7
- ghc-lib-parser-ex == 8.10.* # 2022-02-17: preserve for GHC 8.10.7
- doctest == 0.18.* # 2021-11-19: closest to stackage version for GHC 9.*
- brick == 0.64.* # 2021-12-03: matterhorn depends on brick < 0.65
- path == 0.9.0 # 2021-12-03: path version building with stackage genvalidity and GHC 9.0.2
- ormolu == 0.2.* # 2022-02-21: For ghc 8.8 and 8.10
- ShellCheck == 0.7.2 # 2022-02-20: haskell-ci 0.14 needs this

File diff suppressed because it is too large Load Diff

@ -2,7 +2,7 @@
, lib
, fetchurl
, unzip
, version ? "2.15.1"
, version ? "2.17.0"
, sources ? let
base = "https://storage.googleapis.com/dart-archive/channels";
x86_64 = "x64";
@ -10,28 +10,28 @@
aarch64 = "arm64";
# Make sure that if the user overrides version parameter they're
# also need to override sources, to avoid mistakes
version = "2.15.1";
version = "2.17.0";
in
{
"${version}-aarch64-darwin" = fetchurl {
url = "${base}/stable/release/${version}/sdk/dartsdk-macos-${aarch64}-release.zip";
sha256 = "sha256-DDE4DpA2m8wKkUZuQDn4NpXVvtaJ6sIHeKNjk3RbpYE=";
sha256 = "sha256-WXf0SdSEHMaJRfVFgKzb9SY4LBjf1xO5Oki/dzKMEMY=";
};
"${version}-x86_64-darwin" = fetchurl {
url = "${base}/stable/release/${version}/sdk/dartsdk-macos-${x86_64}-release.zip";
sha256 = "sha256-s6bkwh2m5KdRr/WxWXwItO9YaDpp/HI3xjnS2UHmN+I=";
sha256 = "sha256-PwaxUQHIUhRWCOy3IVdGtRyP9LtscqoUJPOZfevN7xs=";
};
"${version}-x86_64-linux" = fetchurl {
url = "${base}/stable/release/${version}/sdk/dartsdk-linux-${x86_64}-release.zip";
sha256 = "sha256-D0XcqlO0CQtpsne4heqaTLOkFYnJEZET4bl4rVXOM18=";
sha256 = "sha256-V7j9lk5HyB1GeuuVsJmmcKt+j1ShzXTUW80f3HeRPYY=";
};
"${version}-i686-linux" = fetchurl {
url = "${base}/stable/release/${version}/sdk/dartsdk-linux-${i686}-release.zip";
sha256 = "sha256-SRq5TtxS+bwCqVxa0U2Zhn8J1Wtm4Onq+3uQS+951sw=";
sha256 = "sha256-YWxFwbcGvssOSL4S5O4jqLzxdUHvbVd9i4cLNyFn/cs=";
};
"${version}-aarch64-linux" = fetchurl {
url = "${base}/stable/release/${version}/sdk/dartsdk-linux-${aarch64}-release.zip";
sha256 = "sha256-iDbClCNDUsxT6K6koc4EQuu7dppTbOfzCVedpQIKI5U=";
sha256 = "sha256-BaHbD9hFhYd9YYCFg0bXxTx++JQzZn2zuF8/Ll+nA2s=";
};
}
}:

@ -119,6 +119,11 @@ let
sha256 = "sha256-1KnYHz9ntKbgfLeoDcsQrV6RdvzDB2LHCoFYCmS4sLY=";
};
patches = [
# https://savannah.gnu.org/bugs/?func=detailitem&item_id=62436
./patches/bug62436.patch
];
buildInputs = [
readline
ncurses

@ -0,0 +1,27 @@
# HG changeset patch
# User John Donoghue <john.donoghue@ieee.org>
# Date 1652358904 14400
# Thu May 12 08:35:04 2022 -0400
# Branch stable
# Node ID 8c940cfcce257369677c09154da2aab2c56eaa79
# Parent 63710f3bd9811c2d206ac9e7b4f47cf06c47e153
* scripts/pkg/private/build.m: check configure and Makefile exist before trying to unlink them (Bug #62436)
diff -r 63710f3bd981 -r 8c940cfcce25 scripts/pkg/private/build.m
--- a/scripts/pkg/private/build.m Wed May 11 09:44:55 2022 -0700
+++ b/scripts/pkg/private/build.m Thu May 12 08:35:04 2022 -0400
@@ -77,8 +77,12 @@
else
arch_abi = getarch ();
configure_make (desc, build_root, verbose);
- unlink (fullfile (build_root, "src", "configure"));
- unlink (fullfile (build_root, "src", "Makefile"));
+ if exist (fullfile (build_root, "src", "configure"), "file")
+ unlink (fullfile (build_root, "src", "configure"));
+ endif
+ if exist (fullfile (build_root, "src", "Makefile"), "file")
+ unlink (fullfile (build_root, "src", "Makefile"));
+ endif
endif
tar_name = [desc.name "-" desc.version "-" arch_abi ".tar"];
tar_path = fullfile (builddir, tar_name);

@ -1,11 +1,11 @@
{ lib, stdenv, fetchurl, pkg-config }:
stdenv.mkDerivation rec {
pname = "boolstuff";
version = "0.1.16";
version = "0.1.17";
src = fetchurl {
url = "https://perso.b2b2c.ca/~sarrazip/dev/${pname}-${version}.tar.gz";
sha256 = "10qynbyw723gz2vrvn4xk2var172kvhlz3l3l80qbdsfb3d12wn0";
url = "http://perso.b2b2c.ca/~sarrazip/dev/${pname}-${version}.tar.gz";
hash = "sha256-WPFUoTUofigPxTRo6vUbVTEVWMeEPDWszCA05toOX0I=";
};
nativeBuildInputs = [ pkg-config ];

@ -1,10 +1,14 @@
{ lib, stdenv, fetchurl, gmp }:
{ lib, stdenv, fetchurl, fetchgit, gmp }:
stdenv.mkDerivation rec {
pname = "cln";
version = "1.3.6";
src = fetchurl {
src = if stdenv.isDarwin then fetchgit {
url = "git://www.ginac.de/cln.git";
rev = "cln_${builtins.replaceStrings [ "." ] [ "-" ] version}";
sha256 = "sha256-P32F4TIDhE2Dwzydq8iFK6ch3kICJcXeeXHs5PBQG88=";
} else fetchurl {
url = "${meta.homepage}${pname}-${version}.tar.bz2";
sha256 = "0jlq9l4hphk7qqlgqj9ihjp4m3rwjbhk6q4v00lsbgbri07574pl";
};

@ -1,41 +0,0 @@
{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, pkg-config, ilmbase, libtiff, openexr }:
stdenv.mkDerivation rec {
pname = "ctl";
version = "1.5.2";
src = fetchFromGitHub {
owner = "ampas";
repo = pname;
rev = "${pname}-${version}";
sha256 = "0a698rd1cmixh3mk4r1xa6rjli8b8b7dbx89pb43xkgqxy67glwx";
};
patches = [
(fetchpatch {
name = "ctl-1.5.2-ilm_230.patch";
url = "https://src.fedoraproject.org/rpms/CTL/raw/9d7c15a91bccdc0a9485d463bf2789be72e6b17d/f/ctl-1.5.2-ilm_230.patch";
sha256 = "0mdx7llwrm0q8ai53zhyxi40i9h5s339dbkqpqv30yzi2xpnfj3d";
})
];
postPatch = ''
# Fix include guard name
substituteInPlace lib/dpx/dpx_raw.hh \
--replace CRL_DPX_RAW_INTERNAL_INCLUDE CTL_DPX_RAW_INTERNAL_INCLUDE
# Fix undefined symbols (link with Imath)
substituteInPlace lib/IlmCtlMath/CMakeLists.txt \
--replace "( IlmCtlMath IlmCtl )" "( IlmCtlMath IlmCtl Imath)"
'';
nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ libtiff ilmbase openexr ];
meta = with lib; {
description = "Color Transformation Language";
homepage = "https://github.com/ampas/CTL";
license = "A.M.P.A.S"; # BSD-derivative, free but GPL incompatible
platforms = platforms.all;
};
}

@ -22,6 +22,7 @@ stdenv.mkDerivation rec {
cmake
pkg-config
];
buildInputs = [
libGL
libpng
@ -30,7 +31,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
homepage = "https://repo.or.cz/glpng.git/blob_plain/HEAD:/glpng.htm";
description = "PNG loader for OpenGL";
description = "PNG loader library for OpenGL";
license = licenses.mit;
maintainers = with maintainers; [ AndersonTorres ];
platforms = platforms.unix;

@ -14,6 +14,7 @@ stdenv.mkDerivation rec {
NIX_CFLAGS_COMPILE = "-Wno-error";
patches = [
./build-shared.patch
] ++ lib.optionals stdenv.isAarch32 [
# https://github.com/nodejs/http-parser/pull/510
(fetchpatch {
url = "https://github.com/nodejs/http-parser/commit/4f15b7d510dc7c6361a26a7c6d2f7c3a17f8d878.patch";

@ -1,33 +0,0 @@
{ lib, stdenv, fetchFromGitHub, cmake, primesieve }:
stdenv.mkDerivation rec {
pname = "primecount";
version = "7.2";
nativeBuildInputs = [ cmake ];
buildInputs = [ primesieve ];
src = fetchFromGitHub {
owner = "kimwalisch";
repo = "primecount";
rev = "v${version}";
sha256 = "sha256-/Cb/HkD4UQ9gXsRpvRiEuQBoRd0THxNHsBaAAa+CqQo=";
};
cmakeFlags = [
"-DBUILD_STATIC_LIBS=OFF"
"-DBUILD_SHARED_LIBS=ON"
"-DBUILD_TESTS=ON"
"-DBUILD_PRIMECOUNT=ON"
"-DBUILD_LIBPRIMESIEVE=ON"
];
meta = with lib; {
description = "Fast prime counting function implementations";
homepage = "https://github.com/kimwalisch/primecount";
license = licenses.bsd2;
platforms = platforms.unix;
maintainers = teams.sage.members;
};
}

@ -1,23 +0,0 @@
{ lib, stdenv, fetchFromGitHub, cmake }:
stdenv.mkDerivation rec {
pname = "primesieve";
version = "7.8";
nativeBuildInputs = [ cmake ];
src = fetchFromGitHub {
owner = "kimwalisch";
repo = "primesieve";
rev = "v${version}";
sha256 = "sha256-M35CP/xEyC7mEh84kaGsgfsDI9fnanHraNPgTvpqimI=";
};
meta = with lib; {
description = "Fast C/C++ prime number generator";
homepage = "https://primesieve.org/";
license = licenses.bsd2;
platforms = platforms.unix;
maintainers = with maintainers; [ abbradar ];
};
}

@ -10,9 +10,19 @@
, libuuid
, numactl
, openssl
, fetchurl
}:
stdenv.mkDerivation rec {
let
# The old version has some CVEs howver they should not affect SPDK's usage of the framework: https://github.com/NixOS/nixpkgs/pull/171648#issuecomment-1121964568
dpdk' = dpdk.overrideAttrs (old: rec {
name = "dpdk-21.11";
src = fetchurl {
url = "https://fast.dpdk.org/rel/${name}.tar.xz";
sha256 = "sha256-Mkbj7WjuKzaaXYviwGzxCKZp4Vf01Bxby7sha/Wr06E=";
};
});
in stdenv.mkDerivation rec {
pname = "spdk";
version = "21.10";
@ -40,7 +50,7 @@ stdenv.mkDerivation rec {
];
buildInputs = [
cunit dpdk libaio libbsd libuuid numactl openssl ncurses
cunit dpdk' libaio libbsd libuuid numactl openssl ncurses
];
postPatch = ''
@ -49,7 +59,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
configureFlags = [ "--with-dpdk=${dpdk}" ];
configureFlags = [ "--with-dpdk=${dpdk'}" ];
NIX_CFLAGS_COMPILE = "-mssse3"; # Necessary to compile.
# otherwise does not find strncpy when compiling

@ -165,5 +165,7 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ cstrahan proglodyte matthewbauer ];
platforms = platforms.unix;
license = licenses.bsd3;
# Fails to build on Darwin, see https://github.com/NixOS/nixpkgs/issues/158076
broken = stdenv.isDarwin;
};
}

@ -29,6 +29,6 @@ stdenv.mkDerivation rec {
description = "Utility to boot a Raspberry Pi CM/CM3/CM4/Zero over USB";
license = licenses.asl20;
maintainers = with maintainers; [ cartr ];
platforms = [ "aarch64-linux" "armv7l-linux" "armv6l-linux" "x86_64-linux" ];
platforms = [ "aarch64-linux" "aarch64-darwin" "armv7l-linux" "armv6l-linux" "x86_64-linux" "x86_64-darwin" ];
};
}

@ -119,6 +119,7 @@ let
# NOTE: this is a stub package to fetch npm dependencies for
# ../../applications/video/epgstation
epgstation = super."epgstation-../../applications/video/epgstation".override (drv: {
buildInputs = [ self.node-pre-gyp self.node-gyp-build ];
meta = drv.meta // {
platforms = pkgs.lib.platforms.none;
};
@ -339,6 +340,12 @@ let
--set PRISMA_INTROSPECTION_ENGINE_BINARY ${prisma-engines}/bin/introspection-engine \
--set PRISMA_FMT_BINARY ${prisma-engines}/bin/prisma-fmt
'';
passthru.tests = {
simple-execution = pkgs.callPackage ./package-tests/prisma.nix {
inherit (self) prisma;
};
};
};
pulp = super.pulp.override {

@ -0,0 +1,56 @@
{ lib, pkgs, runCommand, prisma }:
let
inherit (prisma) packageName;
prismaMajorVersion = lib.versions.majorMinor prisma.version;
enginesMajorVersion = lib.versions.majorMinor pkgs.prisma-engines.version;
in
runCommand "${packageName}-tests" {
nativeBuildInputs = with pkgs; [ prisma sqlite-interactive ];
meta.timeout = 60;
}
''
mkdir $out
cd $out
if [ "${prismaMajorVersion}" != "${enginesMajorVersion}" ]; then
echo "nodePackages.prisma in version ${prismaMajorVersion} and prisma-engines in ${enginesMajorVersion}. Major versions must match."
exit 1
fi
# Ensure CLI runs
prisma --help > /dev/null
# Init a new project
prisma init > /dev/null
# Create a simple data model
cat << EOF > prisma/schema.prisma
datasource db {
provider = "sqlite"
url = "file:test.db"
}
generator js {
provider = "prisma-client-js"
}
model A {
id Int @id @default(autoincrement())
b String @default("foo")
}
EOF
# Format
prisma format > /dev/null
# Create the database
prisma db push --skip-generate > /dev/null
# The database file should exist and be a SQLite database
sqlite3 prisma/test.db "SELECT id, b FROM A" > /dev/null
# Introspect the database
prisma db pull > /dev/null
''

@ -17,9 +17,10 @@ buildDunePackage rec {
};
meta = with lib; {
homepage = "https://github.com/mjambon/atd";
description = "Syntax for cross-language type definitions";
homepage = "https://github.com/mjambon/atd";
license = licenses.mit;
maintainers = with maintainers; [ aij jwilberding ];
mainProgram = "atdcat";
};
}

@ -32,9 +32,10 @@ buildDunePackage rec {
meta = with lib; {
description = "SSH implementation in OCaml";
license = licenses.isc;
homepage = "https://github.com/mirage/awa-ssh";
changelog = "https://github.com/mirage/awa-ssh/raw/v${version}/CHANGES.md";
license = licenses.isc;
maintainers = [ maintainers.sternenseemann ];
mainProgram = "awa_lwt_server";
};
}

@ -21,8 +21,9 @@ buildDunePackage rec {
meta = with lib; {
description = "Bisect_ppx is a code coverage tool for OCaml and Reason. It helps you test thoroughly by showing what's not tested.";
license = licenses.mit;
homepage = "https://github.com/aantron/bisect_ppx";
license = licenses.mit;
maintainers = with maintainers; [ ];
mainProgram = "bisect-ppx-report";
};
}

@ -43,9 +43,10 @@ buildDunePackage rec {
checkInputs = [ alcotest ];
meta = with lib; {
license = licenses.isc;
description = "X.509 trust anchors extracted from Mozilla's NSS";
maintainers = [ maintainers.sternenseemann ];
homepage = "https://github.com/mirage/ca-certs-nss";
license = licenses.isc;
maintainers = [ maintainers.sternenseemann ];
mainProgram = "extract-from-certdata";
};
}

@ -39,9 +39,10 @@ buildDunePackage rec {
doCheck = true;
meta = {
homepage = "https://github.com/mirage/checkseum";
description = "ADLER-32 and CRC32C Cyclic Redundancy Check";
homepage = "https://github.com/mirage/checkseum";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.vbgl ];
mainProgram = "checkseum.checkseum";
};
}

@ -30,8 +30,9 @@ buildDunePackage rec {
meta = {
description = "A library to normalize an KOI8-{U,R} input to Unicode";
license = lib.licenses.mit;
homepage = "https://github.com/mirage/coin";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ ];
mainProgram = "coin.generate";
};
}

@ -31,10 +31,11 @@ stdenv.mkDerivation rec {
'';
meta = with lib; {
homepage = "https://www.coherentpdf.com/";
inherit (ocaml.meta) platforms;
description = "PDF Command Line Tools";
homepage = "https://www.coherentpdf.com/";
license = licenses.unfree;
maintainers = [ maintainers.vbgl ];
mainProgram = "cpdf";
inherit (ocaml.meta) platforms;
};
}

@ -23,8 +23,9 @@ buildDunePackage rec {
meta = {
description = "Pure OCaml implementation of Zlib";
homepage = "https://github.com/mirage/decompress";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.vbgl ];
homepage = "https://github.com/mirage/decompress";
mainProgram = "decompress.pipe";
};
}

@ -16,5 +16,6 @@ buildDunePackage {
meta = dns.meta // {
description = "Pure DNS resolver API";
mainProgram = "dns-client.unix";
};
}

@ -24,9 +24,10 @@ buildDunePackage rec {
doCheck = true;
meta = with lib; {
homepage = "https://github.com/vbmithr/ocaml-hidapi";
description = "Bindings to Signal11's hidapi library";
homepage = "https://github.com/vbmithr/ocaml-hidapi";
license = licenses.isc;
maintainers = [ maintainers.alexfmpe ];
mainProgram = "ocaml-hid-enumerate";
};
}

@ -20,6 +20,7 @@ buildDunePackage rec {
meta = irmin.meta // {
description = "Irmin backend which stores values in a pack file";
mainProgram = "irmin_fsck";
};
}

@ -26,6 +26,7 @@ buildDunePackage rec {
meta = irmin.meta // {
description = "Unix backends for Irmin";
mainProgram = "irmin";
};
}

@ -405,7 +405,10 @@ with self;
pname = "ppx_base";
hash = "1wv3q0qyghm0c5izq03y97lv3czqk116059mg62wx6valn22a000";
minimumOCamlVersion = "4.04.2";
meta.description = "Base set of ppx rewriters";
meta = {
description = "Base set of ppx rewriters";
mainProgram = "ppx-base";
};
propagatedBuildInputs = [ ppx_cold ppx_enumerate ppx_hash ppx_js_style ];
};
@ -519,7 +522,10 @@ with self;
pname = "ppx_jane";
hash = "1kk238fvrcylymwm7xwc7llbyspmx1y662ypq00vy70g112rir7j";
minimumOCamlVersion = "4.04.2";
meta.description = "Standard Jane Street ppx rewriters";
meta = {
description = "Standard Jane Street ppx rewriters";
mainProgram = "ppx-jane";
};
propagatedBuildInputs = [ base_quickcheck ppx_bin_prot ppx_expect ppx_fixed_literal ppx_module_timer ppx_optcomp ppx_optional ppx_pipebang ppx_stable ppx_string ppx_typerep_conv ppx_variants_conv ];
};

@ -39,10 +39,11 @@ stdenv.mkDerivation rec {
'';
meta = with lib; {
homepage = "http://wwwfun.kurims.kyoto-u.ac.jp/soft/lsl/lablgl.html";
description = "OpenGL bindings for ocaml";
homepage = "http://wwwfun.kurims.kyoto-u.ac.jp/soft/lsl/lablgl.html";
license = licenses.gpl2;
maintainers = with maintainers; [ pSub vbgl ];
mainProgram = "lablglut";
broken = stdenv.isDarwin;
};
}

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save