Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
5ac3d4e7b0
88
pkgs/applications/audio/hqplayer-desktop/default.nix
Normal file
88
pkgs/applications/audio/hqplayer-desktop/default.nix
Normal file
@ -0,0 +1,88 @@
|
||||
{ mkDerivation
|
||||
, alsa-lib
|
||||
, autoPatchelfHook
|
||||
, fetchurl
|
||||
, flac
|
||||
, lib
|
||||
, libmicrohttpd
|
||||
, llvmPackages_10
|
||||
, qtcharts
|
||||
, qtdeclarative
|
||||
, qtquickcontrols2
|
||||
, qtwebengine
|
||||
, qtwebview
|
||||
, rpmextract
|
||||
, wavpack
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "hqplayer-desktop";
|
||||
version = "4.12.0-34";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.signalyst.eu/bins/hqplayer/fc33/hqplayer4desktop-${version}.fc33.x86_64.rpm";
|
||||
sha256 = "sha256-9kLKmi5lNtnRm9b4HnO01cO/C+Sg0DcKD64N5WBbYOE=";
|
||||
};
|
||||
|
||||
unpackPhase = ''
|
||||
${rpmextract}/bin/rpmextract $src
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ autoPatchelfHook rpmextract ];
|
||||
|
||||
buildInputs = [
|
||||
alsa-lib
|
||||
flac
|
||||
libmicrohttpd
|
||||
llvmPackages_10.openmp
|
||||
qtquickcontrols2
|
||||
qtcharts
|
||||
qtdeclarative
|
||||
qtwebengine
|
||||
qtwebview
|
||||
wavpack
|
||||
];
|
||||
|
||||
dontConfigure = true;
|
||||
dontBuild = true;
|
||||
|
||||
installPhase = ''
|
||||
# main executable
|
||||
mkdir -p $out/bin
|
||||
cp ./usr/bin/* $out/bin
|
||||
|
||||
# desktop files
|
||||
mkdir -p $out/share/applications
|
||||
cp ./usr/share/applications/* $out/share/applications
|
||||
|
||||
# documentation
|
||||
mkdir -p $out/share/doc/${pname}
|
||||
cp ./usr/share/doc/hqplayer4desktop/* $out/share/doc/${pname}
|
||||
|
||||
# pixmaps
|
||||
mkdir -p $out/share/pixmaps
|
||||
cp ./usr/share/pixmaps/* $out/share/pixmaps
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
for desktopFile in $out/share/applications/*; do
|
||||
substituteInPlace "$desktopFile" \
|
||||
--replace '/usr/bin/' '$out/bin/' \
|
||||
--replace '/usr/share/doc/' '$out/share/doc/'
|
||||
done
|
||||
|
||||
gunzip $out/share/doc/${pname}/*.gz
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
patchelf --replace-needed libomp.so.5 libomp.so $out/bin/.hqplayer4desktop-wrapped
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://www.signalyst.com/custom.html";
|
||||
description = "High-end upsampling multichannel software HD-audio player";
|
||||
changelog = "https://www.signalyst.eu/bins/${pname}/fc33/hqplayer4desktop-${version}fc33.x86_64.changes";
|
||||
license = licenses.unfree;
|
||||
maintainers = with maintainers; [ lovesegfault ];
|
||||
};
|
||||
}
|
||||
@ -44,9 +44,9 @@
|
||||
}
|
||||
},
|
||||
"ungoogled-chromium": {
|
||||
"version": "91.0.4472.77",
|
||||
"sha256": "0c8vj3gq3nmb7ssiwj6875g0a8hcprss1a4gqw9h7llqywza9ma5",
|
||||
"sha256bin64": "0caf47xam5igdnbhipal1iyicnxxvadhi61k199rwysrvyv5sdad",
|
||||
"version": "91.0.4472.101",
|
||||
"sha256": "1d3y621iclkq6nvxrapk5aihv50x13hjha0c2gcp2xxfma96253q",
|
||||
"sha256bin64": "12j5q5b9v0jpiznjnh89831w8lv399vd1z4ljhbsnsidbsygrbr1",
|
||||
"deps": {
|
||||
"gn": {
|
||||
"version": "2021-04-06",
|
||||
@ -55,8 +55,8 @@
|
||||
"sha256": "199xkks67qrn0xa5fhp24waq2vk8qb78a96cb3kdd8v1hgacgb8x"
|
||||
},
|
||||
"ungoogled-patches": {
|
||||
"rev": "91.0.4472.77-1",
|
||||
"sha256": "1jfmmkw1y4rcjfgsm7b4v2lrgd3sks5qpajvq0djflbhkpsqxfk0"
|
||||
"rev": "91.0.4472.101-1",
|
||||
"sha256": "1ca8gjxz3w730446qns253ibs9lx22iysxq5sphb3pw2w0069q8r"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
25
pkgs/applications/networking/hyprspace/default.nix
Normal file
25
pkgs/applications/networking/hyprspace/default.nix
Normal file
@ -0,0 +1,25 @@
|
||||
{ lib, stdenv, buildGoModule, fetchFromGitHub, iproute2mac }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "hyprspace";
|
||||
version = "0.1.2";
|
||||
|
||||
propagatedBuildInputs = lib.optional stdenv.isDarwin iproute2mac;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-YQJaK6i4GWEGSlf/1+hzjVhdN6ZjZC55v8w9KEedNg4=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-ErqK2jDTpqUyvll+epdGKRYCJvyvCa90W1GVbbhF0a4=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "A Lightweight VPN Built on top of Libp2p for Truly Distributed Networks.";
|
||||
homepage = "https://github.com/hyprspace/hyprspace";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ yusdacra ];
|
||||
platforms = platforms.linux ++ platforms.darwin;
|
||||
};
|
||||
}
|
||||
@ -10,7 +10,7 @@ let
|
||||
(builtins.attrNames (builtins.removeAttrs variantHashes [ "iosevka" ]));
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "${name}-bin";
|
||||
version = "5.0.5";
|
||||
version = "7.0.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/ttc-${name}-${version}.zip";
|
||||
|
||||
@ -1,26 +1,27 @@
|
||||
# This file was autogenerated. DO NOT EDIT!
|
||||
{
|
||||
iosevka = "1fva80sxdcmsl8y3m23ndif3ff54if37g1xqpda1f13yrbd9ii8q";
|
||||
iosevka-aile = "0fy58yd17k8k41j5f48572d4vad3zz7c2mbc6vsiii9abfkwwalr";
|
||||
iosevka-curly = "1lxw8na3qvc5g04prczl7qprdkvd0zf91ybmv276dnkq27abnjn4";
|
||||
iosevka-curly-slab = "19b6xr5vjnb20j34x2ynfji63qibczn0mm2j76d01py304839bws";
|
||||
iosevka-etoile = "0fhcn69idb6w8abpmmvpdp9c08zdhy0zwn8nbyy9jcznwj8vwb7m";
|
||||
iosevka-slab = "0jlm3l13p9c965zx6z4df65lzxzj9yjjvpwlnx94ipayinxa1iff";
|
||||
iosevka-ss01 = "1i6bvslpxj87p3xi198l486ba40ixicdkmj29vcb1d7w1hhr6wnm";
|
||||
iosevka-ss02 = "1raczi1ja4barvjg5cp3j96kyph4aj8qlp9i10q7835sy29q3285";
|
||||
iosevka-ss03 = "0cn9hi5w9rx8xhbh9a75c7s9pxa3dkqfhd24lbp72hwfgv5nk1v0";
|
||||
iosevka-ss04 = "0v8fvif71604vyqanphq9mmlmx4xy0y2bykvplhrj1zmrj6v2ing";
|
||||
iosevka-ss05 = "1fh99av3ml2zhjvdif02r2f82n4hsswpgd2i42d964swjdplxdga";
|
||||
iosevka-ss06 = "0b0kl49djpc77qpmr1g2nzrg0q477xkjiqxb2i33pkrjsxn4vhn7";
|
||||
iosevka-ss07 = "1d2by3najsambqxyzapnmd200hah39jq0mqdalidb2kjh5lx9n6k";
|
||||
iosevka-ss08 = "05m03zn9pfl1khvl9xvgmlaygh1ni67lj2pc8zjgqydyls1vmxl4";
|
||||
iosevka-ss09 = "1hzglj7sclg6h4jc9ibb1777apl11885w1gpscv81b8n1h0qhnb7";
|
||||
iosevka-ss10 = "1fr52sclgp10k0lh86scjn3aylvsfnr7msg7jfsr3bkg61f5x1da";
|
||||
iosevka-ss11 = "1cmdjmlqvhn3qvqdfflwa4wgza364jn9gbj5vq8rsd6qili175ix";
|
||||
iosevka-ss12 = "0bk56hh9894z59rpkk5s9hhmkz1b2gmvfys46frijg3am54xh03q";
|
||||
iosevka-ss13 = "1kgxlxz1cdkzrfbnkavscf48im9lwiya9rcqlaa10k0ssas28br5";
|
||||
iosevka-ss14 = "06djgn86r2yy3ll2ask5mr9qhqibqzr7v95db5dzxcbz7hrmaaxf";
|
||||
iosevka-ss15 = "0qcld7h38c7cif518sa84x50igxjkh38ckav9qhhv7ls1n5h0jpm";
|
||||
iosevka-ss16 = "0qa6h8qx60rajbpp0v4wxia5n3yinp2nvwy2dsi1270prra7r49x";
|
||||
iosevka-ss17 = "1s04vlkll42am6w3lcka518zv2dlrwwnykdid0sp81najwmq0fk3";
|
||||
iosevka = "10aa8bsykkfi3aplw4j7smj0brcbni3jxqzjbpsbv5b15wzvkm7y";
|
||||
iosevka-aile = "0pa79n41xha9rdj4vzz8cpmdhf0h4fjyphjl12i9qxh5znjr4yyz";
|
||||
iosevka-curly = "0shk75qdm5acfbxdvv985gnhaz3dys8wpshiis6y2raz8sam48qg";
|
||||
iosevka-curly-slab = "0z297s1bl2rrrmr3a4cds4cx4cw69p2y05jv999bkw9vrd6a5ij9";
|
||||
iosevka-etoile = "05h62ybd6b54b51h6m6dq3phvrw4jfcc6cyp1x44shj4az2ia17w";
|
||||
iosevka-slab = "07rp7rp3rjzzn6vnx3zbfizd924xhl702kcyq9qlif9g285l85nl";
|
||||
iosevka-ss01 = "1rvshgyhcq2cay9dssap9mhinhljn92adrbf8lbkaabf3fcyd19h";
|
||||
iosevka-ss02 = "0bscxfjhm1is7b7amr5jjj5wpxm1yps4cns47r4w26a0ad4lzf6b";
|
||||
iosevka-ss03 = "1l4mzv1w7wkjs4629hrj7svd3wwhjfvby0qsbq2fr71ngz4gdvva";
|
||||
iosevka-ss04 = "0mj5l316bji6mazgkzi5vigbfbgfnif0llmgacg0l5qayzaafqb1";
|
||||
iosevka-ss05 = "1gfc7b05fvf1m5vhlvbzxzim8qfcqf16dg8qmzdv625dk1mg2llf";
|
||||
iosevka-ss06 = "1n3mfn8h9gmf7ymc6f5ky5n70nn0nb2l8grj26hm9047cvbxcjqm";
|
||||
iosevka-ss07 = "0bffazcb6k7qd3c3fxg426mcgjzc5xncv8nsiz71frhi9crplprv";
|
||||
iosevka-ss08 = "1kv6v7n2qbgl185kfh401mjvs2iim6l3cw9zzghhfx6qv7xy0dcd";
|
||||
iosevka-ss09 = "0da9kcsxk4vllnxjlslm394lr3bhdsw4a2mi95szplipbf748jcp";
|
||||
iosevka-ss10 = "0935y7m603n3rfv38gmja7jhjmc6xrcx61psb3sznp7mlmi0dn7x";
|
||||
iosevka-ss11 = "1hh0b8qaas4bxz0sa8zi5sr4rmqrpgxfzaq53fsmxy7pzjkhjz09";
|
||||
iosevka-ss12 = "118ibl1i7981kjvf8g0rqrckh2chnxvyivk5wwmxhkw43x06ffjf";
|
||||
iosevka-ss13 = "1licqy5dy5z4s91yh086i0m362lavaqq6zr13715zaqh7ard7hva";
|
||||
iosevka-ss14 = "0y1f5hva9kpj9l3a56n6vbr8zbydd9c0knvsbpg68lcgmybfc97m";
|
||||
iosevka-ss15 = "11pm6frf74y27ym4kmh98pn2cqlab6msj0cxpah36ckpzkm5zdqq";
|
||||
iosevka-ss16 = "0z77549ydrbdhw96gc1zl3sg4s16cq7l56pwkfk9ificm1rwf1nm";
|
||||
iosevka-ss17 = "0zm34lfgrlcb97a8dx1g056qy6rr7722b1k6hm9dp676mi5va2cw";
|
||||
iosevka-ss18 = "0jmz975gny6fc7vf5cn8a4bl0y8pzdwlvfh0km9x7ijp711pw42p";
|
||||
}
|
||||
|
||||
@ -1,36 +0,0 @@
|
||||
From 58237e64fa77ec5cdec658b3295f71ec899175fa Mon Sep 17 00:00:00 2001
|
||||
From: Maximilian Bosch <maximilian@mbosch.me>
|
||||
Date: Sat, 5 Oct 2019 13:47:59 +0200
|
||||
Subject: [PATCH] Fix timeouts in libcouchbase testsuite
|
||||
|
||||
Nix-specific patch. Basically
|
||||
https://github.com/couchbase/libcouchbase/commit/b272f6ab88be523bbcf9d5c4252d07fccb023fe5, but
|
||||
rebased onto 2.10.4.
|
||||
---
|
||||
src/ssl/ssl_e.c | 6 ++++++
|
||||
1 file changed, 6 insertions(+)
|
||||
|
||||
diff --git a/src/ssl/ssl_e.c b/src/ssl/ssl_e.c
|
||||
index f4506cf..734a3e6 100644
|
||||
--- a/src/ssl/ssl_e.c
|
||||
+++ b/src/ssl/ssl_e.c
|
||||
@@ -210,10 +210,16 @@ flush_ssl_data(lcbio_ESSL *es)
|
||||
* calls. While we could have done this inline with the send() call this
|
||||
* would make future optimization more difficult. */
|
||||
GT_WRITE_DONE:
|
||||
+#if !LCB_CAN_OPTIMIZE_SSL_BIO
|
||||
+ BIO_get_mem_ptr(es->wbio, &wmb);
|
||||
+#endif
|
||||
while (wmb->length > (size_t)tmp_len) {
|
||||
char dummy[4096];
|
||||
unsigned to_read = MINIMUM(wmb->length-tmp_len, sizeof dummy);
|
||||
BIO_read(es->wbio, dummy, to_read);
|
||||
+#if !LCB_CAN_OPTIMIZE_SSL_BIO
|
||||
+ BIO_get_mem_ptr(es->wbio, &wmb);
|
||||
+#endif
|
||||
}
|
||||
BIO_clear_retry_flags(es->wbio);
|
||||
return 0;
|
||||
--
|
||||
2.23.0
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libcouchbase";
|
||||
version = "2.10.4";
|
||||
version = "3.1.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "couchbase";
|
||||
repo = "libcouchbase";
|
||||
rev = version;
|
||||
sha256 = "1yfmcx65aqd5l87scha6kmm2s38n85ci3gg0h6qfs16s3jfi6bw7";
|
||||
sha256 = "16mafxkdbns33yjyc2p3j2iajjpyq0zp66wpjir2qj1w3kgggcw8";
|
||||
};
|
||||
|
||||
cmakeFlags = [ "-DLCB_NO_MOCK=ON" ];
|
||||
@ -19,8 +19,6 @@ stdenv.mkDerivation rec {
|
||||
# Running tests in parallel does not work
|
||||
enableParallelChecking = false;
|
||||
|
||||
patches = [ ./0001-Fix-timeouts-in-libcouchbase-testsuite.patch ];
|
||||
|
||||
doCheck = !stdenv.isDarwin;
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
34
pkgs/development/libraries/libgmpris/default.nix
Normal file
34
pkgs/development/libraries/libgmpris/default.nix
Normal file
@ -0,0 +1,34 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchurl
|
||||
, pkg-config
|
||||
, glib
|
||||
, gobject-introspection
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libgmpris";
|
||||
version = "2.2.1-8";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.sonarnerd.net/src/focal/src/${pname}_${version}.tar.gz";
|
||||
sha256 = "sha256-iyKNmg6sf+mxlY/4vt5lKdrKfJzkoCYU2j1O8uwk8K4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config gobject-introspection ];
|
||||
|
||||
buildInputs = [ glib ];
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $out/share/doc/${pname}
|
||||
cp ./AUTHORS $out/share/doc/${pname}
|
||||
cp ./README $out/share/doc/${pname}
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://www.sonarnerd.net/src/";
|
||||
description = "GMPRIS GDBus bindings GDBus bindings generated from the GMPRIS XML spec files";
|
||||
license = licenses.lgpl21;
|
||||
maintainers = with maintainers; [ lovesegfault ];
|
||||
};
|
||||
}
|
||||
@ -126,7 +126,7 @@
|
||||
, "indium"
|
||||
, "insect"
|
||||
, "ionic"
|
||||
, {"iosevka": "https://github.com/be5invis/Iosevka/archive/v5.0.2.tar.gz"}
|
||||
, {"iosevka": "https://github.com/be5invis/Iosevka/archive/v7.0.4.tar.gz"}
|
||||
, "jake"
|
||||
, "javascript-typescript-langserver"
|
||||
, "joplin"
|
||||
|
||||
98
pkgs/development/node-packages/node-packages.nix
generated
98
pkgs/development/node-packages/node-packages.nix
generated
@ -3838,6 +3838,15 @@ let
|
||||
sha512 = "Vwhc3ObxmDZmA5hY8mfsau2rJ4vGPvzbj20QSZ2/E1GDPF61QVyjLfNHak9xmel6pW4heRt3v1fHa6np9Ehfeg==";
|
||||
};
|
||||
};
|
||||
"@msgpack/msgpack-2.7.0" = {
|
||||
name = "_at_msgpack_slash_msgpack";
|
||||
packageName = "@msgpack/msgpack";
|
||||
version = "2.7.0";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/@msgpack/msgpack/-/msgpack-2.7.0.tgz";
|
||||
sha512 = "mlRYq9FSsOd4m+3wZWatemn3hGFZPWNJ4JQOdrir4rrMK2PyIk26idKBoUWrqF3HJJHl+5GpRU+M0wEruJwecg==";
|
||||
};
|
||||
};
|
||||
"@nestjs/schematics-7.3.1" = {
|
||||
name = "_at_nestjs_slash_schematics";
|
||||
packageName = "@nestjs/schematics";
|
||||
@ -15124,13 +15133,13 @@ let
|
||||
sha512 = "OlQdbZ7gLfGarSqxesMesDa5uz7KFbID8Kpq/SxIoNGDqY8lSYs0D+hhtBXhcdB3rcbXArFr7vlHheLk1voeNA==";
|
||||
};
|
||||
};
|
||||
"cldr-5.8.0" = {
|
||||
"cldr-6.1.1" = {
|
||||
name = "cldr";
|
||||
packageName = "cldr";
|
||||
version = "5.8.0";
|
||||
version = "6.1.1";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/cldr/-/cldr-5.8.0.tgz";
|
||||
sha512 = "w0L5FX4X3txDX5G/YSbDAQuneVSFPSKjOXB2ehWh/J6BN7RJ+IUEVNG9hIGjuJoyYJcVGE2AoL0W0VSjirQPIg==";
|
||||
url = "https://registry.npmjs.org/cldr/-/cldr-6.1.1.tgz";
|
||||
sha512 = "Efm9g4BcBHWdy7jMcuXtWk7PI1gIx4nO1BhJyaFTeRktytW0tR4rDmm+PG7mSMLrnNUFcr3ww8JwJAgkNRMv5Q==";
|
||||
};
|
||||
};
|
||||
"clean-css-3.4.28" = {
|
||||
@ -23146,15 +23155,6 @@ let
|
||||
sha1 = "6197a095d5fb6b57e8942f6fd7eaad63a09c9452";
|
||||
};
|
||||
};
|
||||
"eventemitter2-6.4.3" = {
|
||||
name = "eventemitter2";
|
||||
packageName = "eventemitter2";
|
||||
version = "6.4.3";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/eventemitter2/-/eventemitter2-6.4.3.tgz";
|
||||
sha512 = "t0A2msp6BzOf+QAcI6z9XMktLj52OjGQg+8SJH6v5+3uxNpWYRR3wQmfA+6xtMU9kOC59qk9licus5dYcrYkMQ==";
|
||||
};
|
||||
};
|
||||
"eventemitter2-6.4.4" = {
|
||||
name = "eventemitter2";
|
||||
packageName = "eventemitter2";
|
||||
@ -53600,13 +53600,13 @@ let
|
||||
sha512 = "0rfBDPVLzvDbMUKrFWvF6kvtXxllXGZRkFL0aCWJ5y8uXlEfZDo6IEPACZwJbKt/fGqFjJLJRHnG62vJmLLpRA==";
|
||||
};
|
||||
};
|
||||
"spiro-2.0.0" = {
|
||||
"spiro-3.0.0" = {
|
||||
name = "spiro";
|
||||
packageName = "spiro";
|
||||
version = "2.0.0";
|
||||
version = "3.0.0";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/spiro/-/spiro-2.0.0.tgz";
|
||||
sha512 = "KPWXN+OmQdjZPCMGRkE2hsbcY4Y4UJxjn+qTw4rsJ49n8VN6EqPk0UOOkNihXEl3JEqPQxcrDQebu9YPn9Ad4w==";
|
||||
url = "https://registry.npmjs.org/spiro/-/spiro-3.0.0.tgz";
|
||||
sha512 = "UEhtLWA8fDQuExOKpT3FLa7Rk238G5Bm3wGAxbvnah3H2X6yEL4blIkAsc38wNwMXBwQFRYE6l0Q9X0t1izOxA==";
|
||||
};
|
||||
};
|
||||
"split-0.2.10" = {
|
||||
@ -58677,13 +58677,13 @@ let
|
||||
sha1 = "5c080e5d661cbbe38259d2e70a3c7253e873881d";
|
||||
};
|
||||
};
|
||||
"typo-geom-0.11.2" = {
|
||||
"typo-geom-0.12.1" = {
|
||||
name = "typo-geom";
|
||||
packageName = "typo-geom";
|
||||
version = "0.11.2";
|
||||
version = "0.12.1";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/typo-geom/-/typo-geom-0.11.2.tgz";
|
||||
sha512 = "ouK6sY+LNGDDQra+MEZb2ZYDaEkCUeutr6x8BZAGGGB0fCsR0wt6YIuz9DJoc8idQS8mnqY8npGmXcMsTZAXPA==";
|
||||
url = "https://registry.npmjs.org/typo-geom/-/typo-geom-0.12.1.tgz";
|
||||
sha512 = "W20RYp2OCEGMhEYayR0cAP67AUWiGRUufMs6Clul7MAmu5SpLuOG/RWk7+LkL65wsugcfhPQlFEJ231C2xHNQg==";
|
||||
};
|
||||
};
|
||||
"ua-parser-js-0.7.21" = {
|
||||
@ -61972,13 +61972,13 @@ let
|
||||
sha512 = "ae13n2/yEpmJt9VabwawsK7eHva7Mk+ghI+TQXCUbC1YEW8ChdrYgI/4TJyaYblzDlADZ0iCSaifZKNbjpR4Tw==";
|
||||
};
|
||||
};
|
||||
"wawoff2-1.0.2" = {
|
||||
"wawoff2-2.0.0" = {
|
||||
name = "wawoff2";
|
||||
packageName = "wawoff2";
|
||||
version = "1.0.2";
|
||||
version = "2.0.0";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/wawoff2/-/wawoff2-1.0.2.tgz";
|
||||
sha512 = "qxuTwf5tAP/XojrRc6cmR0hGvqgD3XUxv2fzfzURKPDfE7AeHmtRuankVxdJ4DRdSKXaE5QlyJT49yBis2vb6Q==";
|
||||
url = "https://registry.npmjs.org/wawoff2/-/wawoff2-2.0.0.tgz";
|
||||
sha512 = "5gjFj+fyQO9cMrg5vYaVM7+T37xSHpqUWM/S6UCEiBx8wRmfpvuhYjPM3toB2UujpmWQt1hSPKRo/jIRE/j9Eg==";
|
||||
};
|
||||
};
|
||||
"wbuf-1.7.3" = {
|
||||
@ -63637,15 +63637,6 @@ let
|
||||
sha512 = "z9s6k3wxE+aZHgXYxSTpGDo7BYOUfJsIRyoZiX6HTjwpwfS2wpQBQKa2fD+ShLyPkqDYo5ud7KitmLZ2Cd6r0g==";
|
||||
};
|
||||
};
|
||||
"xmldom-0.4.0" = {
|
||||
name = "xmldom";
|
||||
packageName = "xmldom";
|
||||
version = "0.4.0";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/xmldom/-/xmldom-0.4.0.tgz";
|
||||
sha512 = "2E93k08T30Ugs+34HBSTQLVtpi6mCddaY8uO+pMNk1pqSjV5vElzn4mmh6KLxN3hki8rNcHSYzILoh3TEWORvA==";
|
||||
};
|
||||
};
|
||||
"xmldom-0.5.0" = {
|
||||
name = "xmldom";
|
||||
packageName = "xmldom";
|
||||
@ -82758,10 +82749,10 @@ in
|
||||
forever = nodeEnv.buildNodePackage {
|
||||
name = "forever";
|
||||
packageName = "forever";
|
||||
version = "4.0.0";
|
||||
version = "4.0.1";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/forever/-/forever-4.0.0.tgz";
|
||||
sha512 = "8cFfO0lvIs4c0P5LvKbdvZvtOK/z79AF/vC9DQLH+niyOCPxqq1+12CyYrzHC+5hBILjPU9ClWLVrXvrK+2ZVw==";
|
||||
url = "https://registry.npmjs.org/forever/-/forever-4.0.1.tgz";
|
||||
sha512 = "NRY5hvmjqfsWXpdGZONsfQg0GpzTHOP3xWTnOc1U3bY92m6TJr2mWDsXzv+3bMk2LftSne72keaMcX891JL2pQ==";
|
||||
};
|
||||
dependencies = [
|
||||
(sources."anymatch-2.0.0" // {
|
||||
@ -82850,7 +82841,7 @@ in
|
||||
sources."es-get-iterator-1.1.2"
|
||||
sources."es-to-primitive-1.2.1"
|
||||
sources."event-stream-3.3.4"
|
||||
sources."eventemitter2-6.4.3"
|
||||
sources."eventemitter2-6.4.4"
|
||||
(sources."expand-brackets-2.1.4" // {
|
||||
dependencies = [
|
||||
sources."define-property-0.2.5"
|
||||
@ -87391,17 +87382,18 @@ in
|
||||
bypassCache = true;
|
||||
reconstructLock = true;
|
||||
};
|
||||
"iosevka-https://github.com/be5invis/Iosevka/archive/v5.0.2.tar.gz" = nodeEnv.buildNodePackage {
|
||||
"iosevka-https://github.com/be5invis/Iosevka/archive/v7.0.4.tar.gz" = nodeEnv.buildNodePackage {
|
||||
name = "iosevka";
|
||||
packageName = "iosevka";
|
||||
version = "5.0.2";
|
||||
version = "7.0.4";
|
||||
src = fetchurl {
|
||||
name = "iosevka-5.0.2.tar.gz";
|
||||
url = "https://codeload.github.com/be5invis/Iosevka/tar.gz/v5.0.2";
|
||||
sha256 = "93aada519e3014b472b3ae1e33a139bcc588618239393735ff88d9d0822d7ced";
|
||||
name = "iosevka-7.0.4.tar.gz";
|
||||
url = "https://codeload.github.com/be5invis/Iosevka/tar.gz/v7.0.4";
|
||||
sha256 = "e0de45dde08463fbd02bced41893746235068167fd91051727dc048d66b91aeb";
|
||||
};
|
||||
dependencies = [
|
||||
sources."@iarna/toml-2.2.5"
|
||||
sources."@msgpack/msgpack-2.7.0"
|
||||
sources."@ot-builder/bin-composite-types-1.0.9"
|
||||
sources."@ot-builder/bin-util-1.0.9"
|
||||
(sources."@ot-builder/cli-help-shower-1.0.9" // {
|
||||
@ -87468,7 +87460,7 @@ in
|
||||
sources."amdefine-1.0.1"
|
||||
sources."ansi-regex-5.0.0"
|
||||
sources."ansi-styles-3.2.1"
|
||||
sources."argparse-1.0.10"
|
||||
sources."argparse-2.0.1"
|
||||
sources."async-0.9.2"
|
||||
sources."at-least-node-1.0.0"
|
||||
sources."atob-2.1.2"
|
||||
@ -87477,7 +87469,7 @@ in
|
||||
sources."camelcase-5.3.1"
|
||||
sources."chainsaw-0.0.9"
|
||||
sources."chalk-2.4.2"
|
||||
sources."cldr-5.8.0"
|
||||
sources."cldr-6.1.1"
|
||||
sources."cli-cursor-3.1.0"
|
||||
sources."clipper-lib-6.4.2"
|
||||
sources."cliui-7.0.4"
|
||||
@ -87524,7 +87516,7 @@ in
|
||||
sources."fast-levenshtein-2.0.6"
|
||||
sources."filelist-1.0.2"
|
||||
sources."find-up-4.1.0"
|
||||
sources."fs-extra-9.1.0"
|
||||
sources."fs-extra-10.0.0"
|
||||
sources."fs.realpath-1.0.0"
|
||||
sources."get-caller-file-2.0.5"
|
||||
sources."glob-7.1.7"
|
||||
@ -87590,12 +87582,7 @@ in
|
||||
sources."source-map-0.6.1"
|
||||
sources."source-map-resolve-0.5.3"
|
||||
sources."source-map-url-0.4.1"
|
||||
(sources."spiro-2.0.0" // {
|
||||
dependencies = [
|
||||
sources."tslib-1.14.1"
|
||||
];
|
||||
})
|
||||
sources."sprintf-js-1.0.3"
|
||||
sources."spiro-3.0.0"
|
||||
sources."string-width-4.2.2"
|
||||
sources."strip-ansi-6.0.0"
|
||||
(sources."stylus-0.54.8" // {
|
||||
@ -87610,7 +87597,7 @@ in
|
||||
sources."traverse-0.3.9"
|
||||
sources."tslib-2.3.0"
|
||||
sources."type-check-0.3.2"
|
||||
sources."typo-geom-0.11.2"
|
||||
sources."typo-geom-0.12.1"
|
||||
sources."unicoderegexp-0.4.1"
|
||||
sources."universalify-2.0.0"
|
||||
sources."urix-0.1.0"
|
||||
@ -87621,6 +87608,7 @@ in
|
||||
sources."cliui-6.0.0"
|
||||
sources."color-convert-2.0.1"
|
||||
sources."color-name-1.1.4"
|
||||
sources."fs-extra-9.1.0"
|
||||
sources."has-flag-4.0.0"
|
||||
sources."supports-color-7.2.0"
|
||||
sources."wrap-ansi-6.2.0"
|
||||
@ -87629,7 +87617,7 @@ in
|
||||
sources."yargs-parser-18.1.3"
|
||||
];
|
||||
})
|
||||
sources."wawoff2-1.0.2"
|
||||
sources."wawoff2-2.0.0"
|
||||
sources."which-2.0.2"
|
||||
sources."which-module-2.0.0"
|
||||
sources."word-wrap-1.2.3"
|
||||
@ -87642,7 +87630,7 @@ in
|
||||
];
|
||||
})
|
||||
sources."wrappy-1.0.2"
|
||||
sources."xmldom-0.4.0"
|
||||
sources."xmldom-0.6.0"
|
||||
sources."xpath-0.0.32"
|
||||
sources."y18n-5.0.8"
|
||||
sources."yallist-4.0.0"
|
||||
|
||||
@ -1,27 +1,21 @@
|
||||
{ stdenv, lib, fetchzip, ocaml, findlib, ocamlbuild }:
|
||||
{ lib, fetchurl, buildDunePackage }:
|
||||
|
||||
let version = "1.0.0"; in
|
||||
buildDunePackage rec {
|
||||
pname = "magic-mime";
|
||||
version = "1.1.3";
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "ocaml-magic-mime";
|
||||
inherit version;
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/mirage/ocaml-magic-mime/archive/v${version}.tar.gz";
|
||||
sha256 = "058d83hmxd5mjccxdm3ydchmhk2lca5jdg82jg0klsigmf4ida6v";
|
||||
src = fetchurl {
|
||||
url = "https://github.com/mirage/ocaml-magic-mime/releases/download/v${version}/magic-mime-v${version}.tbz";
|
||||
sha256 = "1xqjs8bba567yzrzgnr88j5ck97d36zw68zr9v29liya37k6rcvz";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ ocaml findlib ocamlbuild ];
|
||||
buildInputs = [ findlib ];
|
||||
configurePlatforms = [];
|
||||
minimalOCamlVersion = "4.03";
|
||||
useDune2 = true;
|
||||
|
||||
createFindlibDestdir = true;
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/mirage/ocaml-magic-mime";
|
||||
meta = with lib; {
|
||||
description = "Convert file extensions to MIME types";
|
||||
platforms = ocaml.meta.platforms or [];
|
||||
license = lib.licenses.isc;
|
||||
maintainers = with lib.maintainers; [ vbgl ];
|
||||
homepage = "https://github.com/mirage/ocaml-magic-mime";
|
||||
license = licenses.isc;
|
||||
maintainers = with maintainers; [ vbgl ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,24 +1,28 @@
|
||||
{ lib, buildDunePackage, fetchurl, dune-configurator }:
|
||||
{ lib, fetchurl, buildDunePackage, dune-configurator }:
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "parmap";
|
||||
version = "1.2";
|
||||
|
||||
useDune2 = true;
|
||||
version = "1.2.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/rdicosmo/${pname}/releases/download/${version}/${pname}-${version}.tbz";
|
||||
sha256 = "sha256-XUXptzD0eytaypaBQ+EBp4iVFRE6/Y0inS93t/YZrM8=";
|
||||
sha256 = "1wg81slp453jci0gi0rzvdjx74110mlf1n5qpsmxic6fqsyz9d2v";
|
||||
};
|
||||
|
||||
buildInputs = [ dune-configurator ];
|
||||
minimalOCamlVersion = "4.03";
|
||||
useDune2 = true;
|
||||
|
||||
buildInputs = [
|
||||
dune-configurator
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Library for multicore parallel programming";
|
||||
downloadPage = "https://github.com/rdicosmo/parmap";
|
||||
homepage = "https://rdicosmo.github.io/parmap";
|
||||
maintainers = [ maintainers.bcdarwin ];
|
||||
license = licenses.lgpl2;
|
||||
maintainers = with maintainers; [ bcdarwin ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -3,8 +3,8 @@
|
||||
buildPecl {
|
||||
pname = "ast";
|
||||
|
||||
version = "1.0.10";
|
||||
sha256 = "13s5r1szd80g1mqickghdd38mvjkwss221322mmbrykcfgp4fs30";
|
||||
version = "1.0.12";
|
||||
sha256 = "1mcfx989yrakixlsx2d8v6kyxawfwhig4mra9ccpjasfhad0d31x";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Exposes the abstract syntax tree generated by PHP";
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ lib, buildPecl, fetchFromGitHub, writeText, libcouchbase, zlib, php }:
|
||||
{ lib, buildPecl, fetchFromGitHub, writeText, libcouchbase, zlib, php, substituteAll }:
|
||||
let
|
||||
pname = "couchbase";
|
||||
version = "2.6.2";
|
||||
version = "3.1.2";
|
||||
in
|
||||
buildPecl {
|
||||
inherit pname version;
|
||||
@ -10,38 +10,19 @@ buildPecl {
|
||||
owner = "couchbase";
|
||||
repo = "php-couchbase";
|
||||
rev = "v${version}";
|
||||
sha256 = "0ymrymnz91qg9b2ns044qg46wc65dffhxx402wpx1b5cj2vr4ma3";
|
||||
sha256 = "0zm2jm5lzjjqlhkiivm4v5gr4286pwqaf5nar1ga816hhwnyhj42";
|
||||
};
|
||||
|
||||
configureFlags = [ "--with-couchbase" ];
|
||||
|
||||
buildInputs = [ libcouchbase zlib ];
|
||||
internalDeps = lib.optionals (lib.versionOlder php.version "8.0") [ php.extensions.json ];
|
||||
peclDeps = [ php.extensions.igbinary ];
|
||||
|
||||
patches = [
|
||||
(writeText "php-couchbase.patch" ''
|
||||
--- a/config.m4
|
||||
+++ b/config.m4
|
||||
@@ -9,7 +9,7 @@ if test "$PHP_COUCHBASE" != "no"; then
|
||||
LIBCOUCHBASE_DIR=$PHP_COUCHBASE
|
||||
else
|
||||
AC_MSG_CHECKING(for libcouchbase in default path)
|
||||
- for i in /usr/local /usr; do
|
||||
+ for i in ${libcouchbase}; do
|
||||
if test -r $i/include/libcouchbase/couchbase.h; then
|
||||
LIBCOUCHBASE_DIR=$i
|
||||
AC_MSG_RESULT(found in $i)
|
||||
@@ -154,6 +154,8 @@ COUCHBASE_FILES=" \
|
||||
igbinary_inc_path="$phpincludedir"
|
||||
elif test -f "$phpincludedir/ext/igbinary/igbinary.h"; then
|
||||
igbinary_inc_path="$phpincludedir"
|
||||
+ elif test -f "${php.extensions.igbinary.dev}/include/ext/igbinary/igbinary.h"; then
|
||||
+ igbinary_inc_path="${php.extensions.igbinary.dev}/include"
|
||||
fi
|
||||
if test "$igbinary_inc_path" = ""; then
|
||||
AC_MSG_WARN([Cannot find igbinary.h])
|
||||
'')
|
||||
(substituteAll {
|
||||
src = ./libcouchbase.patch;
|
||||
inherit libcouchbase;
|
||||
})
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
@ -49,6 +30,5 @@ buildPecl {
|
||||
license = licenses.asl20;
|
||||
homepage = "https://docs.couchbase.com/php-sdk/current/project-docs/sdk-release-notes.html";
|
||||
maintainers = teams.php.members;
|
||||
broken = versionAtLeast php.version "8.0";
|
||||
};
|
||||
}
|
||||
|
||||
11
pkgs/development/php-packages/couchbase/libcouchbase.patch
Normal file
11
pkgs/development/php-packages/couchbase/libcouchbase.patch
Normal file
@ -0,0 +1,11 @@
|
||||
--- a/config.m4
|
||||
+++ b/config.m4
|
||||
@@ -28,7 +28,7 @@ if test "$PHP_COUCHBASE" != "no"; then
|
||||
|
||||
dnl fallback on standard directory
|
||||
else
|
||||
- for i in /usr/local /usr; do
|
||||
+ for i in @libcouchbase@; do
|
||||
if test -r $i/include/libcouchbase/couchbase.h; then
|
||||
LIBCOUCHBASE_DIR=$i
|
||||
AC_MSG_RESULT(found in $i)
|
||||
@ -2,8 +2,8 @@
|
||||
buildPecl {
|
||||
pname = "event";
|
||||
|
||||
version = "3.0.2";
|
||||
sha256 = "1ws4l014z52vb23xbsfj6viwkf7fmh462af639xgbp0n6syf77dq";
|
||||
version = "3.0.4";
|
||||
sha256 = "13yb3zvlx43cncawymiwbqyz8gzpq1g03vd0xjlw9vz75b4mwn1x";
|
||||
|
||||
configureFlags = [
|
||||
"--with-event-libevent-dir=${libevent.dev}"
|
||||
|
||||
@ -3,8 +3,8 @@
|
||||
buildPecl {
|
||||
pname = "igbinary";
|
||||
|
||||
version = "3.2.1";
|
||||
sha256 = "sha256-YBYgz/07PlWWIAmcBWm4xCR/Ap7BitwCBr8m+ONXU9s=";
|
||||
version = "3.2.2";
|
||||
sha256 = "0321pb0298fa67qwj5nhhabkjiaxna5mag15ljyrqzpivimvny92";
|
||||
|
||||
configureFlags = [ "--enable-igbinary" ];
|
||||
makeFlags = [ "phpincludedir=$(dev)/include" ];
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ buildPecl, lib, fetchFromGitHub, libmaxminddb }:
|
||||
let
|
||||
pname = "maxminddb";
|
||||
version = "1.10.0";
|
||||
version = "1.10.1";
|
||||
in
|
||||
buildPecl {
|
||||
inherit pname version;
|
||||
@ -10,7 +10,7 @@ buildPecl {
|
||||
owner = "maxmind";
|
||||
repo = "MaxMind-DB-Reader-php";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-2SnajDdO5uAYcuVpEbOuFlZzMxwo/EqFtUSr9XxT0KQ=";
|
||||
sha256 = "1m5y733x4ykldi1pym54mdahfwfnwy2r1n6fnndwi8jz9px9pa5k";
|
||||
};
|
||||
|
||||
buildInputs = [ libmaxminddb ];
|
||||
|
||||
@ -4,8 +4,8 @@
|
||||
buildPecl {
|
||||
pname = "mongodb";
|
||||
|
||||
version = "1.9.0";
|
||||
sha256 = "16mbw3p80qxsj86nmjbfch8wv6jaq8wbz4rlpmixvhj9nwbp37hs";
|
||||
version = "1.9.1";
|
||||
sha256 = "1mzyssy2a89grw7rwmh0x22lql377nmnqlcv9piam1c32qiwxlg9";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [
|
||||
|
||||
@ -3,8 +3,8 @@
|
||||
buildPecl {
|
||||
pname = "pcov";
|
||||
|
||||
version = "1.0.8";
|
||||
sha256 = "sha256-6rbniyxLIHPW/e+eWZN1qS8F1rOB7ld1N8JKUS1geRQ=";
|
||||
version = "1.0.9";
|
||||
sha256 = "0q2ig5lxzpwz3qgr05wcyh5jzhfxlygkv6nj6jagkhiialng2710";
|
||||
|
||||
buildInputs = [ pcre2 ];
|
||||
|
||||
|
||||
@ -1,14 +1,14 @@
|
||||
{ buildPecl, lib, fetchFromGitHub, php }:
|
||||
{ buildPecl, lib, fetchFromGitHub }:
|
||||
|
||||
buildPecl {
|
||||
pname = "pinba";
|
||||
version = "1.1.2-dev";
|
||||
version = "1.1.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tony2001";
|
||||
repo = "pinba_extension";
|
||||
rev = "edbc313f1b4fb8407bf7d5acf63fbb0359c7fb2e";
|
||||
sha256 = "02sljqm6griw8ccqavl23f7w1hp2zflcv24lpf00k6pyrn9cwx80";
|
||||
rev = "RELEASE_1_1_2";
|
||||
sha256 = "0wqcqq6sb51wiawa37hbd1h9dbvmyyndzdvz87xqji7lpr9vn8jy";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -1,30 +1,13 @@
|
||||
{ buildPecl, lib, pcre2, fetchpatch }:
|
||||
{ buildPecl, lib, pcre2 }:
|
||||
|
||||
buildPecl {
|
||||
pname = "protobuf";
|
||||
|
||||
version = "3.14.0";
|
||||
sha256 = "1ldc4s28hq61cfg8l4c06pgicj0ng7k37f28a0dnnbs7xkr7cibd";
|
||||
version = "3.17.2";
|
||||
sha256 = "0i4npj4sl8ihkzxc6m3vv3nlqk952z9bfwnrk90a9yakw5gfhlz5";
|
||||
|
||||
buildInputs = [ pcre2 ];
|
||||
|
||||
patches = [
|
||||
# TODO: remove with next update
|
||||
(fetchpatch {
|
||||
url = "https://github.com/protocolbuffers/protobuf/commit/823f351448f7c432bed40b89ee3309e0a94c1855.patch";
|
||||
sha256 = "sha256-ozHtO8s9zvmh/+wBEge3Yn3n0pbpR3dAojJcuAg/G3s=";
|
||||
stripLen = 4;
|
||||
includes = [
|
||||
"array.c"
|
||||
"def.c"
|
||||
"map.c"
|
||||
"message.c"
|
||||
"protobuf.h"
|
||||
"wkt.inc"
|
||||
];
|
||||
})
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = ''
|
||||
Google's language-neutral, platform-neutral, extensible mechanism for serializing structured data.
|
||||
|
||||
@ -3,8 +3,8 @@
|
||||
buildPecl {
|
||||
pname = "redis";
|
||||
|
||||
version = "5.3.3";
|
||||
sha256 = "sha256-N3iRYeFkzVIjmjDJojjaYf7FyDlc2sOFtu2PDFD9kvA=";
|
||||
version = "5.3.4";
|
||||
sha256 = "1k5l7xxb06rlwq9jbmbbr03pc74d75vgv7h5bqjkbwan6dphafab";
|
||||
|
||||
internalDeps = with php.extensions; [
|
||||
session
|
||||
|
||||
@ -3,8 +3,8 @@
|
||||
buildPecl {
|
||||
pname = "swoole";
|
||||
|
||||
version = "4.6.4";
|
||||
sha256 = "0hgndnn27q7fbsb0nw6bfdg0kyy5di9vrmf7g53jc6lsnf73ha31";
|
||||
version = "4.6.7";
|
||||
sha256 = "107wp403z8skkqrcm240vyyy6wqx5a4v2bqhlshlknyi14r2v165";
|
||||
|
||||
buildInputs = [ valgrind pcre2 ];
|
||||
internalDeps = lib.optionals (lib.versionOlder php.version "7.4") [ php.extensions.hash ];
|
||||
|
||||
@ -3,8 +3,8 @@
|
||||
buildPecl {
|
||||
pname = "xdebug";
|
||||
|
||||
version = "3.0.3";
|
||||
sha256 = "sha256-5yZagVGOOX+XLcki50bRpIRTcXf/SJVDUWfRCeKTJDI=";
|
||||
version = "3.0.4";
|
||||
sha256 = "1bvjmnx9bcfq4ikp02kiqg0f7ccgx4mkmz5d7g6v0d263x4r0wmj";
|
||||
|
||||
doCheck = true;
|
||||
checkTarget = "test";
|
||||
|
||||
@ -5,11 +5,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "minidump";
|
||||
version = "0.0.17";
|
||||
version = "0.0.18";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-nlPW83Tr3aec1tSYHgcZTwd+ydN12S6WNwK7gdwdatY=";
|
||||
sha256 = "sha256-uf4KZc9C1gWRgHu4ttk1fpL2pG8oUb79uvCIlHItB/8=";
|
||||
};
|
||||
|
||||
# Upstream doesn't have tests
|
||||
|
||||
37
pkgs/development/python-modules/nsapi/default.nix
Normal file
37
pkgs/development/python-modules/nsapi/default.nix
Normal file
@ -0,0 +1,37 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, future
|
||||
, pythonOlder
|
||||
, pytz
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "nsapi";
|
||||
version = "3.0.5";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aquatix";
|
||||
repo = "ns-api";
|
||||
rev = "v${version}";
|
||||
sha256 = "0i1zkvi4mrhkh1gxzpa54mq8mb76s9nf3jxxhpqia56nkq8f8krb";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
future
|
||||
pytz
|
||||
];
|
||||
|
||||
# Project has no tests
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "ns_api" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python module to query routes of the Dutch railways";
|
||||
homepage = "https://github.com/aquatix/ns-api/";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
@ -17,13 +17,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pytenable";
|
||||
version = "1.2.8";
|
||||
version = "1.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tenable";
|
||||
repo = "pyTenable";
|
||||
rev = version;
|
||||
sha256 = "12x0w1c4blm73ixv07w90jkydl7d8dx5l27ih9vc1yv9v2zzb53k";
|
||||
sha256 = "sha256-APwBC1fL5JtYL5E/pabQpwGD1OtFMNPeWi/b9+hbhBE=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
34
pkgs/os-specific/linux/dpdk-kmods/default.nix
Normal file
34
pkgs/os-specific/linux/dpdk-kmods/default.nix
Normal file
@ -0,0 +1,34 @@
|
||||
{ lib, stdenv, fetchzip, kernel }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dpdk-kmods";
|
||||
version = "2021-04-21";
|
||||
|
||||
src = fetchzip {
|
||||
url = "http://git.dpdk.org/dpdk-kmods/snapshot/dpdk-kmods-e13d7af77a1bf98757f85c3c4083f6ee6d0d2372.tar.xz";
|
||||
sha256 = "sha256-8ysWT3X3rIyUAo4/QbkX7cQq5iFeU18/BPsmmWugcIc=";
|
||||
};
|
||||
|
||||
hardeningDisable = [ "pic" ];
|
||||
|
||||
KSRC = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build";
|
||||
|
||||
nativeBuildInputs = kernel.moduleBuildDependencies;
|
||||
|
||||
preBuild = "cd linux/igb_uio";
|
||||
|
||||
installPhase = ''
|
||||
make -C ${KSRC} M=$(pwd) modules_install
|
||||
'';
|
||||
|
||||
INSTALL_MOD_PATH = placeholder "out";
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Kernel modules for DPDK";
|
||||
homepage = "https://git.dpdk.org/dpdk-kmods/";
|
||||
license = licenses.gpl2Only;
|
||||
maintainers = [ maintainers.mic92 ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
@ -2,7 +2,7 @@
|
||||
# Do not edit!
|
||||
|
||||
{
|
||||
version = "2021.6.3";
|
||||
version = "2021.6.4";
|
||||
components = {
|
||||
"abode" = ps: with ps; [ abodepy ];
|
||||
"accuweather" = ps: with ps; [ accuweather ];
|
||||
@ -548,7 +548,7 @@
|
||||
"namecheapdns" = ps: with ps; [ defusedxml ];
|
||||
"nanoleaf" = ps: with ps; [ pynanoleaf ];
|
||||
"neato" = ps: with ps; [ aiohttp-cors pybotvac ];
|
||||
"nederlandse_spoorwegen" = ps: with ps; [ ]; # missing inputs: nsapi
|
||||
"nederlandse_spoorwegen" = ps: with ps; [ nsapi ];
|
||||
"nello" = ps: with ps; [ ]; # missing inputs: pynello
|
||||
"ness_alarm" = ps: with ps; [ ]; # missing inputs: nessclient
|
||||
"nest" = ps: with ps; [ aiohttp-cors ha-ffmpeg python-nest ]; # missing inputs: google-nest-sdm
|
||||
|
||||
@ -181,7 +181,7 @@ let
|
||||
extraBuildInputs = extraPackages py.pkgs;
|
||||
|
||||
# Don't forget to run parse-requirements.py after updating
|
||||
hassVersion = "2021.6.3";
|
||||
hassVersion = "2021.6.4";
|
||||
|
||||
in with py.pkgs; buildPythonApplication rec {
|
||||
pname = "homeassistant";
|
||||
@ -200,7 +200,7 @@ in with py.pkgs; buildPythonApplication rec {
|
||||
owner = "home-assistant";
|
||||
repo = "core";
|
||||
rev = version;
|
||||
sha256 = "0n0g5kgyc9vhncdfi66lr9i42631rsigv2hzmnfal5jxgblh5736";
|
||||
sha256 = "058dx5hg0a3zvd85sxglbadigfzajmzx8i5jxvw0ww9yp8002qj1";
|
||||
};
|
||||
|
||||
# leave this in, so users don't have to constantly update their downstream patch handling
|
||||
|
||||
89
pkgs/servers/hqplayerd/default.nix
Normal file
89
pkgs/servers/hqplayerd/default.nix
Normal file
@ -0,0 +1,89 @@
|
||||
{ stdenv
|
||||
, alsa-lib
|
||||
, autoPatchelfHook
|
||||
, cairo
|
||||
, fetchurl
|
||||
, flac
|
||||
, gnome
|
||||
, gssdp
|
||||
, gupnp
|
||||
, lib
|
||||
, libgmpris
|
||||
, llvmPackages_10
|
||||
, rpmextract
|
||||
, wavpack
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "hqplayerd";
|
||||
version = "4.24.0-61";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.signalyst.eu/bins/${pname}/fc33/${pname}-${version}.fc33.x86_64.rpm";
|
||||
sha256 = "sha256-VouqkWRu9lcbCQNmXJayrsZZnhvM5xEZlUyBEkURBOQ=";
|
||||
};
|
||||
|
||||
unpackPhase = ''
|
||||
${rpmextract}/bin/rpmextract $src
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ autoPatchelfHook rpmextract ];
|
||||
|
||||
buildInputs = [
|
||||
alsa-lib
|
||||
cairo
|
||||
flac
|
||||
gnome.rygel
|
||||
gssdp
|
||||
gupnp
|
||||
libgmpris
|
||||
llvmPackages_10.openmp
|
||||
wavpack
|
||||
];
|
||||
|
||||
dontConfigure = true;
|
||||
dontBuild = true;
|
||||
|
||||
installPhase = ''
|
||||
# main executable
|
||||
mkdir -p $out/bin
|
||||
cp ./usr/bin/hqplayerd $out/bin
|
||||
|
||||
# udev rules
|
||||
mkdir -p $out/etc/udev/rules.d
|
||||
cp ./etc/udev/rules.d/50-taudio2.rules $out/etc/udev/rules.d
|
||||
|
||||
# kernel module cfgs
|
||||
mkdir -p $out/etc/modules-load.d
|
||||
cp ./etc/modules-load.d/taudio2.conf $out/etc/modules-load.d
|
||||
|
||||
# systemd service file
|
||||
mkdir -p $out/lib/systemd/system
|
||||
cp ./usr/lib/systemd/system/hqplayerd.service $out/lib/systemd/system
|
||||
|
||||
# documentation
|
||||
mkdir -p $out/share/doc/${pname}
|
||||
cp ./usr/share/doc/${pname}/* $out/share/doc/${pname}
|
||||
|
||||
# misc service support files
|
||||
mkdir -p $out/var/lib/${pname}
|
||||
cp -r ./var/hqplayer/web $out/var/lib/${pname}
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
substituteInPlace $out/lib/systemd/system/hqplayerd.service \
|
||||
--replace /usr/bin/hqplayerd $out/bin/hqplayerd
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
patchelf --replace-needed libomp.so.5 libomp.so $out/bin/hqplayerd
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://www.signalyst.com/custom.html";
|
||||
description = "High-end upsampling multichannel software embedded HD-audio player";
|
||||
changelog = "https://www.signalyst.eu/bins/${pname}/fc33/${pname}-${version}.fc33.x86_64.changes";
|
||||
license = licenses.unfree;
|
||||
maintainers = with maintainers; [ lovesegfault ];
|
||||
};
|
||||
}
|
||||
@ -5707,6 +5707,8 @@ in
|
||||
|
||||
hping = callPackage ../tools/networking/hping { };
|
||||
|
||||
hqplayer-desktop = libsForQt5.callPackage ../applications/audio/hqplayer-desktop { };
|
||||
|
||||
html-proofer = callPackage ../tools/misc/html-proofer { };
|
||||
|
||||
htpdate = callPackage ../tools/networking/htpdate { };
|
||||
@ -6560,6 +6562,8 @@ in
|
||||
# Needed for apps that still depend on the unstable verison of the library (not libhandy-1)
|
||||
libhandy_0 = callPackage ../development/libraries/libhandy/0.x.nix { };
|
||||
|
||||
libgmpris = callPackage ../development/libraries/libgmpris { };
|
||||
|
||||
libgumath = callPackage ../development/libraries/libgumath { };
|
||||
|
||||
libinsane = callPackage ../development/libraries/libinsane { };
|
||||
@ -19249,10 +19253,14 @@ in
|
||||
|
||||
home-assistant-cli = callPackage ../servers/home-assistant/cli.nix { };
|
||||
|
||||
hqplayerd = callPackage ../servers/hqplayerd { };
|
||||
|
||||
https-dns-proxy = callPackage ../servers/dns/https-dns-proxy { };
|
||||
|
||||
hydron = callPackage ../servers/hydron { };
|
||||
|
||||
hyprspace = callPackage ../applications/networking/hyprspace { inherit (darwin) iproute2mac; };
|
||||
|
||||
icecream = callPackage ../servers/icecream { };
|
||||
|
||||
icingaweb2 = callPackage ../servers/icingaweb2 { };
|
||||
@ -20705,7 +20713,9 @@ in
|
||||
|
||||
digimend = callPackage ../os-specific/linux/digimend { };
|
||||
|
||||
dpdk = callPackage ../os-specific/linux/dpdk { };
|
||||
dpdk-kmods = callPackage ../os-specific/linux/dpdk-kmods { };
|
||||
|
||||
dpdk = throw "The dpdk driver has been renamed to dpdk-mods.";
|
||||
|
||||
exfat-nofuse = callPackage ../os-specific/linux/exfat { };
|
||||
|
||||
|
||||
@ -4710,6 +4710,8 @@ in {
|
||||
|
||||
npyscreen = callPackage ../development/python-modules/npyscreen { };
|
||||
|
||||
nsapi = callPackage ../development/python-modules/nsapi { };
|
||||
|
||||
ntc-templates = callPackage ../development/python-modules/ntc-templates { };
|
||||
|
||||
ntlm-auth = callPackage ../development/python-modules/ntlm-auth { };
|
||||
|
||||
Loading…
Reference in New Issue
Block a user