Merge master into staging-next
This commit is contained in:
commit
64d45bb08b
|
@ -3908,6 +3908,12 @@
|
||||||
githubId = 183879;
|
githubId = 183879;
|
||||||
name = "Florian Klink";
|
name = "Florian Klink";
|
||||||
};
|
};
|
||||||
|
florentc = {
|
||||||
|
email = "florentc@users.noreply.github.com";
|
||||||
|
github = "florentc";
|
||||||
|
githubId = 1149048;
|
||||||
|
name = "Florent Ch.";
|
||||||
|
};
|
||||||
FlorianFranzen = {
|
FlorianFranzen = {
|
||||||
email = "Florian.Franzen@gmail.com";
|
email = "Florian.Franzen@gmail.com";
|
||||||
github = "FlorianFranzen";
|
github = "FlorianFranzen";
|
||||||
|
@ -11307,6 +11313,16 @@
|
||||||
githubId = 321799;
|
githubId = 321799;
|
||||||
name = "Paul Colomiets";
|
name = "Paul Colomiets";
|
||||||
};
|
};
|
||||||
|
taikx4 = {
|
||||||
|
email = "taikx4@taikx4szlaj2rsdupcwabg35inbny4jk322ngeb7qwbbhd5i55nf5yyd.onion";
|
||||||
|
github = "taikx4";
|
||||||
|
githubId = 94917129;
|
||||||
|
name = "taikx4";
|
||||||
|
keys = [{
|
||||||
|
longkeyid = "ed25519/0xCCD52C7B37BB837E";
|
||||||
|
fingerprint = "6B02 8103 C4E5 F68C D77C 9E54 CCD5 2C7B 37BB 837E";
|
||||||
|
}];
|
||||||
|
};
|
||||||
takagiy = {
|
takagiy = {
|
||||||
email = "takagiy.4dev@gmail.com";
|
email = "takagiy.4dev@gmail.com";
|
||||||
github = "takagiy";
|
github = "takagiy";
|
||||||
|
|
|
@ -11,15 +11,15 @@
|
||||||
|
|
||||||
mkDerivation rec {
|
mkDerivation rec {
|
||||||
pname = "audacious";
|
pname = "audacious";
|
||||||
version = "4.0.5";
|
version = "4.1";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "http://distfiles.audacious-media-player.org/audacious-${version}.tar.bz2";
|
url = "http://distfiles.audacious-media-player.org/audacious-${version}.tar.bz2";
|
||||||
sha256 = "028zjgz0p7ys15lk2a30m5zcv9xrx3ga50wjsh4m4zxilgkakbji";
|
sha256 = "0p734psjjvjcmla2hg5h6a9v1prvy63jj9xm2g2ngs49jy7qan0z";
|
||||||
};
|
};
|
||||||
pluginsSrc = fetchurl {
|
pluginsSrc = fetchurl {
|
||||||
url = "http://distfiles.audacious-media-player.org/audacious-plugins-${version}.tar.bz2";
|
url = "http://distfiles.audacious-media-player.org/audacious-plugins-${version}.tar.bz2";
|
||||||
sha256 = "0ny5w1agr9jaz5w3wyyxf1ygmzmd1sivaf97lcm4z4w6529520lz";
|
sha256 = "0k0xnqmxi5lna034i2cnzvfzrykxmv4fbs1nkrc9sd2ma1igrmns";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ gettext pkg-config ];
|
nativeBuildInputs = [ gettext pkg-config ];
|
||||||
|
@ -36,8 +36,10 @@ mkDerivation rec {
|
||||||
libopenmpt
|
libopenmpt
|
||||||
];
|
];
|
||||||
|
|
||||||
|
configureFlags = [ "--disable-gtk" ];
|
||||||
|
|
||||||
# Here we build both audacious and audacious-plugins in one
|
# Here we build both audacious and audacious-plugins in one
|
||||||
# derivations, since they really expect to be in the same prefix.
|
# derivation, since they really expect to be in the same prefix.
|
||||||
# This is slighly tricky.
|
# This is slighly tricky.
|
||||||
builder = builtins.toFile "builder.sh" ''
|
builder = builtins.toFile "builder.sh" ''
|
||||||
# First build audacious.
|
# First build audacious.
|
||||||
|
|
|
@ -6,16 +6,16 @@
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "lnd";
|
pname = "lnd";
|
||||||
version = "0.14.0-beta";
|
version = "0.14.1-beta";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "lightningnetwork";
|
owner = "lightningnetwork";
|
||||||
repo = "lnd";
|
repo = "lnd";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "0pf84l46cfhbmbzjdkpmqp494wqix8715zawm537mm94k3q25bis";
|
sha256 = "0arm36682y4csdv9abqs0l8rgxkiqkamrps7q8wpyyg4n78yiij3";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorSha256 = "1481zscd9lrnzxsaxkpaaa8fjazmfynhim13f8lj2yd9d21j5d31";
|
vendorSha256 = "13zhs0gb7chi0zz5rabmw3sd5fcpxc4s553crfcg7lrnbn5hcwzv";
|
||||||
|
|
||||||
subPackages = [ "cmd/lncli" "cmd/lnd" ];
|
subPackages = [ "cmd/lncli" "cmd/lnd" ];
|
||||||
|
|
||||||
|
|
|
@ -255,12 +255,12 @@ in
|
||||||
|
|
||||||
datagrip = buildDataGrip rec {
|
datagrip = buildDataGrip rec {
|
||||||
name = "datagrip-${version}";
|
name = "datagrip-${version}";
|
||||||
version = "2021.2.4"; /* updated by script */
|
version = "2021.3.1"; /* updated by script */
|
||||||
description = "Your Swiss Army Knife for Databases and SQL";
|
description = "Your Swiss Army Knife for Databases and SQL";
|
||||||
license = lib.licenses.unfree;
|
license = lib.licenses.unfree;
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://download.jetbrains.com/datagrip/${name}.tar.gz";
|
url = "https://download.jetbrains.com/datagrip/${name}.tar.gz";
|
||||||
sha256 = "1vj9ihzw07bh30ngy8mj027ljq9zzd904k61f8jbfpw75vknh8f6"; /* updated by script */
|
sha256 = "18drbddcjbbv6q6j95wy7ila8d7imi0gh5nnf0lhj4gkkxhszmii"; /* updated by script */
|
||||||
};
|
};
|
||||||
wmClass = "jetbrains-datagrip";
|
wmClass = "jetbrains-datagrip";
|
||||||
update-channel = "DataGrip RELEASE";
|
update-channel = "DataGrip RELEASE";
|
||||||
|
|
|
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "Fast and minimalist 3D viewer using VTK";
|
description = "Fast and minimalist 3D viewer using VTK";
|
||||||
homepage = "https://kitware.github.io/F3D";
|
homepage = "https://f3d-app.github.io/f3d";
|
||||||
license = licenses.bsd3;
|
license = licenses.bsd3;
|
||||||
maintainers = with maintainers; [ bcdarwin ];
|
maintainers = with maintainers; [ bcdarwin ];
|
||||||
platforms = with platforms; unix;
|
platforms = with platforms; unix;
|
||||||
|
|
14
pkgs/applications/misc/ArchiSteamFarm/deps.nix
generated
14
pkgs/applications/misc/ArchiSteamFarm/deps.nix
generated
|
@ -55,10 +55,15 @@
|
||||||
(fetchNuGet { name = "JetBrains.Annotations"; version = "2021.3.0"; sha256 = "01ssylllbwpana2w3iybi533zlvcsbhzjc8kr0g4kg307kjbfn8v"; })
|
(fetchNuGet { name = "JetBrains.Annotations"; version = "2021.3.0"; sha256 = "01ssylllbwpana2w3iybi533zlvcsbhzjc8kr0g4kg307kjbfn8v"; })
|
||||||
(fetchNuGet { name = "Markdig.Signed"; version = "0.26.0"; sha256 = "1giwdvmy6n4vfb0g7sxmdf9bklb4r2vdfhm1xfxvqys8rfm15d4z"; })
|
(fetchNuGet { name = "Markdig.Signed"; version = "0.26.0"; sha256 = "1giwdvmy6n4vfb0g7sxmdf9bklb4r2vdfhm1xfxvqys8rfm15d4z"; })
|
||||||
(fetchNuGet { name = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "5.0.10"; sha256 = "1dmcccml0lwxkiplfisxc70877h3s6p589nml19pi07iypvyxxjh"; })
|
(fetchNuGet { name = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "5.0.10"; sha256 = "1dmcccml0lwxkiplfisxc70877h3s6p589nml19pi07iypvyxxjh"; })
|
||||||
|
(fetchNuGet { name = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "5.0.12"; sha256 = "1cv7s0gh54jfrdgwa2cyarh1f6m59fpbfmqsszi27cdik0llh24s"; })
|
||||||
(fetchNuGet { name = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "5.0.10"; sha256 = "1r9rf1j5v3hfn299zk71bjbbzslnypyqy1pz2xc4mirghwg18pqw"; })
|
(fetchNuGet { name = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "5.0.10"; sha256 = "1r9rf1j5v3hfn299zk71bjbbzslnypyqy1pz2xc4mirghwg18pqw"; })
|
||||||
|
(fetchNuGet { name = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "5.0.12"; sha256 = "1hmr4l20fs8qqjvcfnlyb6ik6dh37mg0xa2wrvkn229pmiwp1rm9"; })
|
||||||
(fetchNuGet { name = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "5.0.10"; sha256 = "1zlcdqscbgqz5yqfgn21l711ybplid97c6wg0gqbbd6920qmpidd"; })
|
(fetchNuGet { name = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "5.0.10"; sha256 = "1zlcdqscbgqz5yqfgn21l711ybplid97c6wg0gqbbd6920qmpidd"; })
|
||||||
|
(fetchNuGet { name = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "5.0.12"; sha256 = "1asph5v7kgmscfgsyv9gg7cwvg52gnm6m0ldm2m4pfkpsxqyp2mi"; })
|
||||||
(fetchNuGet { name = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "5.0.10"; sha256 = "0ir75jh4qas1v70y63hvd0rbyprcf97l47b2pgljhxk138z96s4y"; })
|
(fetchNuGet { name = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "5.0.10"; sha256 = "0ir75jh4qas1v70y63hvd0rbyprcf97l47b2pgljhxk138z96s4y"; })
|
||||||
|
(fetchNuGet { name = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "5.0.12"; sha256 = "02kv8xh6xvpav7vqj281321ly1imghxcc18cdgadiq8dwgm87xwp"; })
|
||||||
(fetchNuGet { name = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "5.0.10"; sha256 = "0qhyrprvbhcn980ycqvkchd4qy5shydi7pl0lbcl9cljivn60if3"; })
|
(fetchNuGet { name = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "5.0.10"; sha256 = "0qhyrprvbhcn980ycqvkchd4qy5shydi7pl0lbcl9cljivn60if3"; })
|
||||||
|
(fetchNuGet { name = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "5.0.12"; sha256 = "062zb8gqbzxq2xrmr8lbl215pnhw1fdidq43m975vsfgzmqrga8f"; })
|
||||||
(fetchNuGet { name = "Microsoft.AspNetCore.JsonPatch"; version = "5.0.0"; sha256 = "192mn6r73xjw8fvlss6vrv34iiavq7k8pg0w7advgj6khklw4dzx"; })
|
(fetchNuGet { name = "Microsoft.AspNetCore.JsonPatch"; version = "5.0.0"; sha256 = "192mn6r73xjw8fvlss6vrv34iiavq7k8pg0w7advgj6khklw4dzx"; })
|
||||||
(fetchNuGet { name = "Microsoft.AspNetCore.Mvc.NewtonsoftJson"; version = "5.0.0"; sha256 = "1q3z35pxgvpf6l6ywh5wb6gfly055rk99a80rjqisyrbmza1msd1"; })
|
(fetchNuGet { name = "Microsoft.AspNetCore.Mvc.NewtonsoftJson"; version = "5.0.0"; sha256 = "1q3z35pxgvpf6l6ywh5wb6gfly055rk99a80rjqisyrbmza1msd1"; })
|
||||||
(fetchNuGet { name = "Microsoft.CodeCoverage"; version = "17.0.0"; sha256 = "18gdbsqf6i79ld4ikqr4jhx9ndsggm865b5xj1xmnmgg12ydp19a"; })
|
(fetchNuGet { name = "Microsoft.CodeCoverage"; version = "17.0.0"; sha256 = "18gdbsqf6i79ld4ikqr4jhx9ndsggm865b5xj1xmnmgg12ydp19a"; })
|
||||||
|
@ -73,14 +78,23 @@
|
||||||
(fetchNuGet { name = "Microsoft.Extensions.Options"; version = "5.0.0"; sha256 = "1rdmgpg770x8qwaaa6ryc27zh93p697fcyvn5vkxp0wimlhqkbay"; })
|
(fetchNuGet { name = "Microsoft.Extensions.Options"; version = "5.0.0"; sha256 = "1rdmgpg770x8qwaaa6ryc27zh93p697fcyvn5vkxp0wimlhqkbay"; })
|
||||||
(fetchNuGet { name = "Microsoft.Extensions.Primitives"; version = "5.0.0"; sha256 = "0swqcknyh87ns82w539z1mvy804pfwhgzs97cr3nwqk6g5s42gd6"; })
|
(fetchNuGet { name = "Microsoft.Extensions.Primitives"; version = "5.0.0"; sha256 = "0swqcknyh87ns82w539z1mvy804pfwhgzs97cr3nwqk6g5s42gd6"; })
|
||||||
(fetchNuGet { name = "Microsoft.NETCore.App.Host.linux-arm"; version = "5.0.10"; sha256 = "12zz674g6289z44rynnbsarqdh6md0qdl4srkzkqz9dvm1f2k4yn"; })
|
(fetchNuGet { name = "Microsoft.NETCore.App.Host.linux-arm"; version = "5.0.10"; sha256 = "12zz674g6289z44rynnbsarqdh6md0qdl4srkzkqz9dvm1f2k4yn"; })
|
||||||
|
(fetchNuGet { name = "Microsoft.NETCore.App.Host.linux-arm"; version = "5.0.12"; sha256 = "0v3df0hdv02xr7gmc9fmnwfrxf8xbqp9bci31a55xwj16jia692x"; })
|
||||||
(fetchNuGet { name = "Microsoft.NETCore.App.Host.linux-arm64"; version = "5.0.10"; sha256 = "0v90w0cr8zjayj0w0rb5ds1kjg77n7za1nr9rr1pnszw2xs00fmq"; })
|
(fetchNuGet { name = "Microsoft.NETCore.App.Host.linux-arm64"; version = "5.0.10"; sha256 = "0v90w0cr8zjayj0w0rb5ds1kjg77n7za1nr9rr1pnszw2xs00fmq"; })
|
||||||
|
(fetchNuGet { name = "Microsoft.NETCore.App.Host.linux-arm64"; version = "5.0.12"; sha256 = "0jvfxnc743qcg1qwlvclh6ww612mnsk5pk459awz5rivp3mdkfsb"; })
|
||||||
(fetchNuGet { name = "Microsoft.NETCore.App.Host.osx-x64"; version = "5.0.10"; sha256 = "1z8l02ypzbhbh0jp89ibc4dx61dvaa4l7cdn4s2zs0l492nz2ni8"; })
|
(fetchNuGet { name = "Microsoft.NETCore.App.Host.osx-x64"; version = "5.0.10"; sha256 = "1z8l02ypzbhbh0jp89ibc4dx61dvaa4l7cdn4s2zs0l492nz2ni8"; })
|
||||||
|
(fetchNuGet { name = "Microsoft.NETCore.App.Host.osx-x64"; version = "5.0.12"; sha256 = "0950m6x86jp5dybzakfsp74qzrk4pk8wkazc178v36j14sqmj2zq"; })
|
||||||
(fetchNuGet { name = "Microsoft.NETCore.App.Host.win-x64"; version = "5.0.10"; sha256 = "07yr09al8cci38zmwqghpsf8jsg51a8qv6p156ph8b5714iq5jjq"; })
|
(fetchNuGet { name = "Microsoft.NETCore.App.Host.win-x64"; version = "5.0.10"; sha256 = "07yr09al8cci38zmwqghpsf8jsg51a8qv6p156ph8b5714iq5jjq"; })
|
||||||
|
(fetchNuGet { name = "Microsoft.NETCore.App.Host.win-x64"; version = "5.0.12"; sha256 = "173zymcac00rjb0l4yvksglj32b6fnwxzi60kpi0ki3z3a2k8kd3"; })
|
||||||
(fetchNuGet { name = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "5.0.10"; sha256 = "12xw4czsnsy4nara23jbvbsi8id9lms17xfyv0w4wsqhrp5kqbxi"; })
|
(fetchNuGet { name = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "5.0.10"; sha256 = "12xw4czsnsy4nara23jbvbsi8id9lms17xfyv0w4wsqhrp5kqbxi"; })
|
||||||
|
(fetchNuGet { name = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "5.0.12"; sha256 = "197xfhk7rwpn5kgc59slclkd0rp53034mfrrpajn2xbgjnmb07sj"; })
|
||||||
(fetchNuGet { name = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "5.0.10"; sha256 = "0ccsk1baj0bx1k7jqm7pnw77ns3m6h50cl8kxikjcm74jsz0vyx1"; })
|
(fetchNuGet { name = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "5.0.10"; sha256 = "0ccsk1baj0bx1k7jqm7pnw77ns3m6h50cl8kxikjcm74jsz0vyx1"; })
|
||||||
|
(fetchNuGet { name = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "5.0.12"; sha256 = "1bpzbivp0n9cl05vlnirigzbvjs25mq7w56bg9zrnzlzjnhcwry2"; })
|
||||||
(fetchNuGet { name = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "5.0.10"; sha256 = "1b3lm6dc31yl9r0rian7zcmhpn949dyp4yhw4fsl4bkdpp4id085"; })
|
(fetchNuGet { name = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "5.0.10"; sha256 = "1b3lm6dc31yl9r0rian7zcmhpn949dyp4yhw4fsl4bkdpp4id085"; })
|
||||||
|
(fetchNuGet { name = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "5.0.12"; sha256 = "1fdbrjrmjd31y1amp0inlmki9w3fwzv8nz41pqmc943g3cpmyg9f"; })
|
||||||
(fetchNuGet { name = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "5.0.10"; sha256 = "1pphlbhs1swr14g07hnvvwj9p983qqf6vqaq455bhpn6lin3z81f"; })
|
(fetchNuGet { name = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "5.0.10"; sha256 = "1pphlbhs1swr14g07hnvvwj9p983qqf6vqaq455bhpn6lin3z81f"; })
|
||||||
|
(fetchNuGet { name = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "5.0.12"; sha256 = "0z8l0gzy9dih0mn5a2rknyph1w73y4m03s250wghym1zp6rz910p"; })
|
||||||
(fetchNuGet { name = "Microsoft.NETCore.App.Runtime.win-x64"; version = "5.0.10"; sha256 = "0cn3nq7vmjwk8b5bh7hb5wzidz1msjmwyng6k1ngqdm49w9f0m2g"; })
|
(fetchNuGet { name = "Microsoft.NETCore.App.Runtime.win-x64"; version = "5.0.10"; sha256 = "0cn3nq7vmjwk8b5bh7hb5wzidz1msjmwyng6k1ngqdm49w9f0m2g"; })
|
||||||
|
(fetchNuGet { name = "Microsoft.NETCore.App.Runtime.win-x64"; version = "5.0.12"; sha256 = "1s4klc4p5wiqiiqcfqyi56cci9f29b588h52vj7na7gfqry4b51l"; })
|
||||||
(fetchNuGet { name = "Microsoft.NETCore.Platforms"; version = "1.0.1"; sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; })
|
(fetchNuGet { name = "Microsoft.NETCore.Platforms"; version = "1.0.1"; sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; })
|
||||||
(fetchNuGet { name = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; })
|
(fetchNuGet { name = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; })
|
||||||
(fetchNuGet { name = "Microsoft.NETCore.Platforms"; version = "2.0.0"; sha256 = "1fk2fk2639i7nzy58m9dvpdnzql4vb8yl8vr19r2fp8lmj9w2jr0"; })
|
(fetchNuGet { name = "Microsoft.NETCore.Platforms"; version = "2.0.0"; sha256 = "1fk2fk2639i7nzy58m9dvpdnzql4vb8yl8vr19r2fp8lmj9w2jr0"; })
|
||||||
|
|
|
@ -7,7 +7,8 @@
|
||||||
, curl
|
, curl
|
||||||
, doxygen
|
, doxygen
|
||||||
, fetchFromGitHub
|
, fetchFromGitHub
|
||||||
#, ffmpeg
|
, ffmpeg
|
||||||
|
, freeimage
|
||||||
, libmediainfo
|
, libmediainfo
|
||||||
, libraw
|
, libraw
|
||||||
, libsodium
|
, libsodium
|
||||||
|
@ -27,13 +28,13 @@
|
||||||
}:
|
}:
|
||||||
mkDerivation rec {
|
mkDerivation rec {
|
||||||
pname = "megasync";
|
pname = "megasync";
|
||||||
version = "4.5.3.0";
|
version = "4.6.1.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "meganz";
|
owner = "meganz";
|
||||||
repo = "MEGAsync";
|
repo = "MEGAsync";
|
||||||
rev = "v${version}_Linux";
|
rev = "v${version}_Linux";
|
||||||
sha256 = "1lwjmdbqyxx5wd8nx4mc830fna37jad4h93viwfh5x7sxn104js7";
|
sha256 = "0v2fvji9hs7valya0wx5qjx01c7yjld6nnp6m9gpxfkr30h5s5wb";
|
||||||
fetchSubmodules = true;
|
fetchSubmodules = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -52,8 +53,8 @@ mkDerivation rec {
|
||||||
c-ares
|
c-ares
|
||||||
cryptopp
|
cryptopp
|
||||||
curl
|
curl
|
||||||
# temporarily disable until patched for ffmpeg 4.4
|
ffmpeg
|
||||||
#ffmpeg
|
freeimage
|
||||||
libmediainfo
|
libmediainfo
|
||||||
libraw
|
libraw
|
||||||
libsodium
|
libsodium
|
||||||
|
@ -71,6 +72,7 @@ mkDerivation rec {
|
||||||
./noinstall-distro-version.patch
|
./noinstall-distro-version.patch
|
||||||
# megasync target is not part of the install rule thanks to a commented block
|
# megasync target is not part of the install rule thanks to a commented block
|
||||||
./install-megasync.patch
|
./install-megasync.patch
|
||||||
|
./ffmpeg_44.patch
|
||||||
];
|
];
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
|
@ -95,9 +97,8 @@ mkDerivation rec {
|
||||||
"--with-cares"
|
"--with-cares"
|
||||||
"--with-cryptopp"
|
"--with-cryptopp"
|
||||||
"--with-curl"
|
"--with-curl"
|
||||||
# temporarily disable until patched for ffmpeg 4.4
|
"--with-ffmpeg"
|
||||||
#"--with-ffmpeg"
|
"--with-freeimage"
|
||||||
"--without-freeimage" # unreferenced even when found
|
|
||||||
"--without-readline"
|
"--without-readline"
|
||||||
"--without-termcap"
|
"--without-termcap"
|
||||||
"--with-sodium"
|
"--with-sodium"
|
||||||
|
|
14
pkgs/applications/misc/megasync/ffmpeg_44.patch
Normal file
14
pkgs/applications/misc/megasync/ffmpeg_44.patch
Normal file
|
@ -0,0 +1,14 @@
|
||||||
|
Index: megasync-4.6.1.0/src/MEGASync/mega/src/gfx/freeimage.cpp
|
||||||
|
===================================================================
|
||||||
|
--- megasync-4.6.1.0.orig/src/MEGASync/mega/src/gfx/freeimage.cpp
|
||||||
|
+++ megasync-4.6.1.0/src/MEGASync/mega/src/gfx/freeimage.cpp
|
||||||
|
@@ -253,7 +253,8 @@ bool GfxProcFreeImage::readbitmapFfmpeg(
|
||||||
|
|
||||||
|
// Force seeking to key frames
|
||||||
|
formatContext->seek2any = false;
|
||||||
|
- videoStream->skip_to_keyframe = true;
|
||||||
|
+ // no longer exposed in ffmpeg 4.4; the line above should be sufficient
|
||||||
|
+ //videoStream->skip_to_keyframe = true;
|
||||||
|
if (decoder->capabilities & CAP_TRUNCATED)
|
||||||
|
{
|
||||||
|
codecContext->flags |= CAP_TRUNCATED;
|
|
@ -13,13 +13,13 @@
|
||||||
# logitech-udev-rules instead of adding this to services.udev.packages on NixOS
|
# logitech-udev-rules instead of adding this to services.udev.packages on NixOS
|
||||||
python3Packages.buildPythonApplication rec {
|
python3Packages.buildPythonApplication rec {
|
||||||
pname = "solaar";
|
pname = "solaar";
|
||||||
version = "1.0.6";
|
version = "1.0.7";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "pwr-Solaar";
|
owner = "pwr-Solaar";
|
||||||
repo = "Solaar";
|
repo = "Solaar";
|
||||||
rev = version;
|
rev = version;
|
||||||
sha256 = "sha256-Ys0005hIQ+fT4oMeU5iFtbLNqn1WM6iLdIKGwdyn7BM=";
|
sha256 = "sha256-RQ7iSiw/0xbPOYhuHg4cQpuJyRcaigWKVw4Jt12T9Uw=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ wrapGAppsHook gdk-pixbuf ];
|
nativeBuildInputs = [ wrapGAppsHook gdk-pixbuf ];
|
||||||
|
|
|
@ -4,16 +4,16 @@ let
|
||||||
common = { stname, target, postInstall ? "" }:
|
common = { stname, target, postInstall ? "" }:
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = stname;
|
pname = stname;
|
||||||
version = "1.18.3";
|
version = "1.18.4";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "syncthing";
|
owner = "syncthing";
|
||||||
repo = "syncthing";
|
repo = "syncthing";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-wc4+j2kTSwZsxIdJHmznkNIq436p0yNrskchuEJtL5E=";
|
sha256 = "14vq14gfqlqi1gg1psq9gs2i0ki6xlcfrjfcxi148hpaf38ly7pw";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorSha256 = "sha256-klbAVOHLefxG33zpEYFlPezrKrXfuWOaE+UnIsu462M=";
|
vendorSha256 = "0qzbp35j49z52fd67ffznlmfpv1xcn0i3sbwvx3gqyfbw5ac0mlj";
|
||||||
|
|
||||||
doCheck = false;
|
doCheck = false;
|
||||||
|
|
||||||
|
|
|
@ -2,13 +2,13 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "delly";
|
pname = "delly";
|
||||||
version = "0.8.7";
|
version = "0.9.1";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "dellytools";
|
owner = "dellytools";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-DWwC35r8cQbePUzppkFQlev0YZdxk2+BSrNTW/DOY3M=";
|
sha256 = "sha256-p1pryP+ktGt8OHFiASJQ3T+K94cNBG9fLxsJ2n/T+DA=";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ zlib htslib bzip2 xz ncurses boost ];
|
buildInputs = [ zlib htslib bzip2 xz ncurses boost ];
|
||||||
|
|
|
@ -1,34 +1,30 @@
|
||||||
{ lib, stdenv, fetchFromGitHub, makeWrapper
|
{ lib, stdenv, fetchurl, makeWrapper, adoptopenjdk-bin, jre }:
|
||||||
, adoptopenjdk-bin, jre, ant
|
|
||||||
}:
|
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "tlaplus";
|
pname = "tlaplus";
|
||||||
version = "1.7.0";
|
version = "1.7.1";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchurl {
|
||||||
owner = "tlaplus";
|
url = "https://github.com/tlaplus/tlaplus/releases/download/v${version}/tla2tools.jar";
|
||||||
repo = "tlaplus";
|
sha256 = "d532ba31aafe17afba1130f92410d9257454ff7393d1eb2fe032f0c07f352da5";
|
||||||
rev = "refs/tags/v${version}";
|
|
||||||
sha256 = "1mm6r9bq79zks50yk0agcpdkw9yy994m38ibmgpb3bi3wkpq9891";
|
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ makeWrapper ];
|
nativeBuildInputs = [ makeWrapper ];
|
||||||
buildInputs = [ adoptopenjdk-bin ant ];
|
buildInputs = [ adoptopenjdk-bin ];
|
||||||
|
|
||||||
buildPhase = "ant -f tlatools/org.lamport.tlatools/customBuild.xml compile dist";
|
dontUnpack = true;
|
||||||
installPhase = ''
|
installPhase = ''
|
||||||
mkdir -p $out/share/java $out/bin
|
mkdir -p $out/share/java $out/bin
|
||||||
cp tlatools/org.lamport.tlatools/dist/*.jar $out/share/java
|
cp $src $out/share/java/tla2tools.jar
|
||||||
|
|
||||||
makeWrapper ${jre}/bin/java $out/bin/tlc2 \
|
makeWrapper ${jre}/bin/java $out/bin/tlc \
|
||||||
--add-flags "-cp $out/share/java/tla2tools.jar tlc2.TLC"
|
--add-flags "-XX:+UseParallelGC -cp $out/share/java/tla2tools.jar tlc2.TLC"
|
||||||
makeWrapper ${jre}/bin/java $out/bin/tla2sany \
|
makeWrapper ${jre}/bin/java $out/bin/tlasany \
|
||||||
--add-flags "-cp $out/share/java/tla2tools.jar tla2sany.SANY"
|
--add-flags "-XX:+UseParallelGC -cp $out/share/java/tla2tools.jar tla2sany.SANY"
|
||||||
makeWrapper ${jre}/bin/java $out/bin/pcal \
|
makeWrapper ${jre}/bin/java $out/bin/pcal \
|
||||||
--add-flags "-cp $out/share/java/tla2tools.jar pcal.trans"
|
--add-flags "-XX:+UseParallelGC -cp $out/share/java/tla2tools.jar pcal.trans"
|
||||||
makeWrapper ${jre}/bin/java $out/bin/tla2tex \
|
makeWrapper ${jre}/bin/java $out/bin/tlatex \
|
||||||
--add-flags "-cp $out/share/java/tla2tools.jar tla2tex.TLA"
|
--add-flags "-XX:+UseParallelGC -cp $out/share/java/tla2tools.jar tla2tex.TLA"
|
||||||
'';
|
'';
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
|
@ -36,6 +32,6 @@ stdenv.mkDerivation rec {
|
||||||
homepage = "http://lamport.azurewebsites.net/tla/tla.html";
|
homepage = "http://lamport.azurewebsites.net/tla/tla.html";
|
||||||
license = lib.licenses.mit;
|
license = lib.licenses.mit;
|
||||||
platforms = lib.platforms.unix;
|
platforms = lib.platforms.unix;
|
||||||
maintainers = [ lib.maintainers.thoughtpolice ];
|
maintainers = with lib.maintainers; [ florentc thoughtpolice ];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -49,6 +49,16 @@ let
|
||||||
sha256 = "074smp3448wcazlhc7sb8r54l4kfavr6yks3w5x60zl1qpijf52r";
|
sha256 = "074smp3448wcazlhc7sb8r54l4kfavr6yks3w5x60zl1qpijf52r";
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
|
|
||||||
|
zeroconf = super.zeroconf.overridePythonAttrs (oldAttrs: rec {
|
||||||
|
version = "0.36.13";
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "jstasiak";
|
||||||
|
repo = "python-zeroconf";
|
||||||
|
rev = version;
|
||||||
|
sha256 = "aYNb67ESyz2Q2CKLhG+/Z8Xtt0Js8uf+xrVSEpY0X8c=";
|
||||||
|
};
|
||||||
|
});
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
in
|
in
|
||||||
|
|
37
pkgs/development/php-packages/gnupg/default.nix
Normal file
37
pkgs/development/php-packages/gnupg/default.nix
Normal file
|
@ -0,0 +1,37 @@
|
||||||
|
{ buildPecl, lib, gpgme, file, gnupg }:
|
||||||
|
|
||||||
|
buildPecl {
|
||||||
|
pname = "gnupg";
|
||||||
|
|
||||||
|
version = "1.5.0";
|
||||||
|
sha256 = "0r0akrjjf9i460z11llybdr6sg2rlcz38nwfy0yqz443ljdggxfl";
|
||||||
|
|
||||||
|
buildInputs = [ gpgme ];
|
||||||
|
checkInputs = [ gnupg ];
|
||||||
|
|
||||||
|
postPhpize = ''
|
||||||
|
substituteInPlace configure \
|
||||||
|
--replace '/usr/bin/file' '${file}/bin/file' \
|
||||||
|
--replace 'SEARCH_PATH="/usr/local /usr /opt"' 'SEARCH_PATH="${gpgme.dev}"'
|
||||||
|
'';
|
||||||
|
|
||||||
|
postConfigure = with lib; ''
|
||||||
|
substituteInPlace Makefile \
|
||||||
|
--replace 'run-tests.php' 'run-tests.php -q --offline'
|
||||||
|
substituteInPlace tests/gnupg_res_init_file_name.phpt \
|
||||||
|
--replace '/usr/bin/gpg' '${gnupg}/bin/gpg' \
|
||||||
|
--replace 'string(12)' 'string(${toString (stringLength "${gnupg}/bin/gpg")})'
|
||||||
|
substituteInPlace tests/gnupg_oo_init_file_name.phpt \
|
||||||
|
--replace '/usr/bin/gpg' '${gnupg}/bin/gpg' \
|
||||||
|
--replace 'string(12)' 'string(${toString (stringLength "${gnupg}/bin/gpg")})'
|
||||||
|
'';
|
||||||
|
|
||||||
|
doCheck = true;
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
description = "PHP wrapper for GpgME library that provides access to GnuPG";
|
||||||
|
license = licenses.bsd3;
|
||||||
|
homepage = "https://pecl.php.net/package/gnupg";
|
||||||
|
maintainers = with maintainers; [ taikx4 ] ++ teams.php.members;
|
||||||
|
};
|
||||||
|
}
|
|
@ -3,32 +3,35 @@
|
||||||
, fetchFromGitHub
|
, fetchFromGitHub
|
||||||
, pytestCheckHook
|
, pytestCheckHook
|
||||||
, pythonOlder
|
, pythonOlder
|
||||||
, requests
|
|
||||||
}:
|
}:
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "awesomeversion";
|
pname = "awesomeversion";
|
||||||
version = "21.10.1";
|
version = "21.11.0";
|
||||||
|
format = "setuptools";
|
||||||
|
|
||||||
disabled = pythonOlder "3.8";
|
disabled = pythonOlder "3.8";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "ludeeus";
|
owner = "ludeeus";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = version;
|
rev = version;
|
||||||
sha256 = "sha256-y+QU8T1Cb6FpRcRqhao4KPdE9XlU5C+GURaEuahC25E=";
|
sha256 = "sha256-qxN5AdLlzadG0/raeAyJ/37PLgYLndl1JQSVkgdLv/4=";
|
||||||
};
|
};
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
substituteInPlace setup.py --replace "main" ${version}
|
# Upstream doesn't set a version
|
||||||
|
substituteInPlace setup.py \
|
||||||
|
--replace "main" ${version}
|
||||||
'';
|
'';
|
||||||
|
|
||||||
propagatedBuildInputs = [ requests ];
|
|
||||||
|
|
||||||
checkInputs = [
|
checkInputs = [
|
||||||
pytestCheckHook
|
pytestCheckHook
|
||||||
];
|
];
|
||||||
|
|
||||||
pythonImportsCheck = [ "awesomeversion" ];
|
pythonImportsCheck = [
|
||||||
|
"awesomeversion"
|
||||||
|
];
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "Python module to deal with versions";
|
description = "Python module to deal with versions";
|
||||||
|
|
|
@ -14,7 +14,7 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "devolo-plc-api";
|
pname = "devolo-plc-api";
|
||||||
version = "0.6.3";
|
version = "0.6.4";
|
||||||
format = "setuptools";
|
format = "setuptools";
|
||||||
|
|
||||||
disabled = pythonOlder "3.8";
|
disabled = pythonOlder "3.8";
|
||||||
|
@ -23,7 +23,7 @@ buildPythonPackage rec {
|
||||||
owner = "2Fake";
|
owner = "2Fake";
|
||||||
repo = "devolo_plc_api";
|
repo = "devolo_plc_api";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "6EIT6ifC4M4qj/2dZYVZ3fb3bPs25R7IEh/MduYTTkU=";
|
sha256 = "sha256-hlIHNVJG/2hU5psGXhi05SCupORfgIjB+YT/ZlJEqFM=";
|
||||||
};
|
};
|
||||||
|
|
||||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||||
|
|
|
@ -10,6 +10,7 @@
|
||||||
, mock
|
, mock
|
||||||
, importlib-resources
|
, importlib-resources
|
||||||
, isPy27
|
, isPy27
|
||||||
|
, lxml
|
||||||
}:
|
}:
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
|
@ -31,6 +32,7 @@ buildPythonPackage rec {
|
||||||
scikitimage
|
scikitimage
|
||||||
procps
|
procps
|
||||||
pytestCheckHook
|
pytestCheckHook
|
||||||
|
lxml
|
||||||
];
|
];
|
||||||
|
|
||||||
postConfigure = ''
|
postConfigure = ''
|
||||||
|
|
|
@ -13,12 +13,12 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "keyring";
|
pname = "keyring";
|
||||||
version = "23.2.1";
|
version = "23.3.0";
|
||||||
disabled = pythonOlder "3.6";
|
disabled = pythonOlder "3.6";
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
sha256 = "6334aee6073db2fb1f30892697b1730105b5e9a77ce7e61fca6b435225493efe";
|
sha256 = "sha256-Ct7Khr6zoveTYtksf7cZSb51HnJGPywTUOKrXA+9NwE=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
@ -43,12 +43,7 @@ buildPythonPackage rec {
|
||||||
pytestCheckHook
|
pytestCheckHook
|
||||||
];
|
];
|
||||||
|
|
||||||
# Keychain communications isn't possible in our build environment
|
disabledTests = [
|
||||||
# keyring.errors.KeyringError: Can't get password from keychain: (-25307, 'Unknown Error')
|
|
||||||
disabledTests = lib.optionals (stdenv.isDarwin) [
|
|
||||||
"test_multiprocess_get"
|
|
||||||
"test_multiprocess_get_after_native_get"
|
|
||||||
] ++ [
|
|
||||||
# E ValueError: too many values to unpack (expected 1)
|
# E ValueError: too many values to unpack (expected 1)
|
||||||
"test_entry_point"
|
"test_entry_point"
|
||||||
];
|
];
|
||||||
|
|
|
@ -21,8 +21,8 @@
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "pyatv";
|
pname = "pyatv";
|
||||||
version = "0.9.6";
|
version = "0.9.6";
|
||||||
|
|
||||||
format = "setuptools";
|
format = "setuptools";
|
||||||
|
|
||||||
disabled = pythonOlder "3.6";
|
disabled = pythonOlder "3.6";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
|
@ -32,11 +32,6 @@ buildPythonPackage rec {
|
||||||
sha256 = "0navm7a0k1679kj7nbkbyl7s2q0wq0xmcnizmnvp0arkd5xqmqv1";
|
sha256 = "0navm7a0k1679kj7nbkbyl7s2q0wq0xmcnizmnvp0arkd5xqmqv1";
|
||||||
};
|
};
|
||||||
|
|
||||||
postPatch = ''
|
|
||||||
substituteInPlace setup.py \
|
|
||||||
--replace "pytest-runner" ""
|
|
||||||
'';
|
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
aiohttp
|
aiohttp
|
||||||
bitarray
|
bitarray
|
||||||
|
@ -57,6 +52,18 @@ buildPythonPackage rec {
|
||||||
pytestCheckHook
|
pytestCheckHook
|
||||||
];
|
];
|
||||||
|
|
||||||
|
postPatch = ''
|
||||||
|
substituteInPlace setup.py \
|
||||||
|
--replace "pytest-runner" ""
|
||||||
|
# Remove all version pinning
|
||||||
|
sed -i -e "s/==[0-9.]*//" requirements/requirements.txt
|
||||||
|
'';
|
||||||
|
|
||||||
|
disabledTestPaths = [
|
||||||
|
# Test doesn't work in the sandbox
|
||||||
|
"tests/protocols/companion/test_companion_auth.py"
|
||||||
|
];
|
||||||
|
|
||||||
__darwinAllowLocalNetworking = true;
|
__darwinAllowLocalNetworking = true;
|
||||||
|
|
||||||
pythonImportsCheck = [
|
pythonImportsCheck = [
|
||||||
|
|
|
@ -14,6 +14,8 @@
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "python-smarttub";
|
pname = "python-smarttub";
|
||||||
version = "0.0.27";
|
version = "0.0.27";
|
||||||
|
format = "setuptools";
|
||||||
|
|
||||||
disabled = pythonOlder "3.8";
|
disabled = pythonOlder "3.8";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
|
@ -36,7 +38,14 @@ buildPythonPackage rec {
|
||||||
pytestCheckHook
|
pytestCheckHook
|
||||||
];
|
];
|
||||||
|
|
||||||
pythonImportsCheck = [ "smarttub" ];
|
postPatch = ''
|
||||||
|
substituteInPlace setup.py \
|
||||||
|
--replace "aiohttp~=3.7.3" "aiohttp>=3.7.4,<4"
|
||||||
|
'';
|
||||||
|
|
||||||
|
pythonImportsCheck = [
|
||||||
|
"smarttub"
|
||||||
|
];
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "Python API for SmartTub enabled hot tubs";
|
description = "Python API for SmartTub enabled hot tubs";
|
||||||
|
|
|
@ -20,14 +20,16 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "slack-sdk";
|
pname = "slack-sdk";
|
||||||
version = "3.11.2";
|
version = "3.12.0";
|
||||||
|
format = "setuptools";
|
||||||
|
|
||||||
disabled = pythonOlder "3.6";
|
disabled = pythonOlder "3.6";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "slackapi";
|
owner = "slackapi";
|
||||||
repo = "python-slack-sdk";
|
repo = "python-slack-sdk";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-jfFNka+PZXXYz6r7gwoxoqK7SX2RRcDNlCSqVG3JPY0=";
|
sha256 = "sha256-1IR0pQOxLjxqmjbq6zmp2rU1rBDabADva1R4YBNw+PA=";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
|
@ -66,7 +68,9 @@ buildPythonPackage rec {
|
||||||
"test_interactions"
|
"test_interactions"
|
||||||
];
|
];
|
||||||
|
|
||||||
pythonImportsCheck = [ "slack_sdk" ];
|
pythonImportsCheck = [
|
||||||
|
"slack_sdk"
|
||||||
|
];
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "Slack Developer Kit for Python";
|
description = "Slack Developer Kit for Python";
|
||||||
|
|
|
@ -6,14 +6,14 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "starkbank-ecdsa";
|
pname = "starkbank-ecdsa";
|
||||||
version = "2.0.2";
|
version = "2.0.3";
|
||||||
format = "setuptools";
|
format = "setuptools";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "starkbank";
|
owner = "starkbank";
|
||||||
repo = "ecdsa-python";
|
repo = "ecdsa-python";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-4QFAtGqHJZSVyrGPuMdJwvF761/P6YAHjjKmCpPyGdU=";
|
sha256 = "sha256-UA+UuSxKZZN7Zb23HWsCD6UZK6lROpy3OfLN7MAlMM0=";
|
||||||
};
|
};
|
||||||
|
|
||||||
checkInputs = [
|
checkInputs = [
|
||||||
|
|
|
@ -5,11 +5,11 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "types-pytz";
|
pname = "types-pytz";
|
||||||
version = "2021.3.0";
|
version = "2021.3.1";
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
sha256 = "sha256-hqYZZ4NNzuqvmLaQLtg1fv3SYruK/K9LyMzs90hZJ3g=";
|
sha256 = "sha256-3/138+/s07FVXxh6m/OmONVfrClnALgpxBvVHscqbrc=";
|
||||||
};
|
};
|
||||||
|
|
||||||
# Modules doesn't have tests
|
# Modules doesn't have tests
|
||||||
|
|
|
@ -5,12 +5,12 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "types-setuptools";
|
pname = "types-setuptools";
|
||||||
version = "57.4.2";
|
version = "57.4.3";
|
||||||
format = "setuptools";
|
format = "setuptools";
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
sha256 = "1y0vx949wx5w4ra854ykwvgmdcwsb6v7jk29m4x1l79857sa16al";
|
sha256 = "sha256-G8mgC66QHvk5wXIK4EDJ8RJ+eeYOBFiO0VBsYmhThe0=";
|
||||||
};
|
};
|
||||||
|
|
||||||
# Module doesn't have tests
|
# Module doesn't have tests
|
||||||
|
|
|
@ -5,6 +5,7 @@
|
||||||
, numpy
|
, numpy
|
||||||
, pandas
|
, pandas
|
||||||
, requests
|
, requests
|
||||||
|
, lxml
|
||||||
}:
|
}:
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
|
@ -23,6 +24,7 @@ buildPythonPackage rec {
|
||||||
numpy
|
numpy
|
||||||
pandas
|
pandas
|
||||||
requests
|
requests
|
||||||
|
lxml
|
||||||
];
|
];
|
||||||
|
|
||||||
doCheck = false; # Tests require internet access
|
doCheck = false; # Tests require internet access
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "zeroconf";
|
pname = "zeroconf";
|
||||||
version = "0.36.13";
|
version = "0.37.0";
|
||||||
format = "setuptools";
|
format = "setuptools";
|
||||||
|
|
||||||
disabled = pythonOlder "3.6";
|
disabled = pythonOlder "3.6";
|
||||||
|
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
||||||
owner = "jstasiak";
|
owner = "jstasiak";
|
||||||
repo = "python-zeroconf";
|
repo = "python-zeroconf";
|
||||||
rev = version;
|
rev = version;
|
||||||
sha256 = "sha256-aYNb67ESyz2Q2CKLhG+/Z8Xtt0Js8uf+xrVSEpY0X8c=";
|
sha256 = "sha256-KdcRG1YKtvhcqq/FNiOVQeXlyYepvPjRL5EZJA8Axyk=";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
|
|
|
@ -56,13 +56,13 @@ with py.pkgs;
|
||||||
|
|
||||||
buildPythonApplication rec {
|
buildPythonApplication rec {
|
||||||
pname = "checkov";
|
pname = "checkov";
|
||||||
version = "2.0.598";
|
version = "2.0.603";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "bridgecrewio";
|
owner = "bridgecrewio";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = version;
|
rev = version;
|
||||||
sha256 = "sha256-h+pKg6rBF+f/EZaCcMQDISrE3jO55biHdn5tLPEUu1g=";
|
sha256 = "sha256-EJ0i3HOCurjCQEdZBzELBCcIS7sT71vEBjjdNpCmt00=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = with py.pkgs; [
|
nativeBuildInputs = with py.pkgs; [
|
||||||
|
|
|
@ -4,11 +4,11 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "jenkins";
|
pname = "jenkins";
|
||||||
version = "2.303.1";
|
version = "2.303.3";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "http://mirrors.jenkins.io/war-stable/${version}/jenkins.war";
|
url = "http://mirrors.jenkins.io/war-stable/${version}/jenkins.war";
|
||||||
sha256 = "0rf06axz1hxssg942w2g66avak30jy6rfdwxynhriqv3vrf17bja";
|
sha256 = "8a6ae7367755b3f31a050faa945f7a3991abdb43d941c7294cac890c1e2779d8";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ makeWrapper ];
|
nativeBuildInputs = [ makeWrapper ];
|
||||||
|
|
|
@ -17,15 +17,15 @@
|
||||||
|
|
||||||
rustPlatform.buildRustPackage rec {
|
rustPlatform.buildRustPackage rec {
|
||||||
pname = "deno";
|
pname = "deno";
|
||||||
version = "1.16.2";
|
version = "1.16.3";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "denoland";
|
owner = "denoland";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-Qf1eDQ6ZbBGOQIDh2q8hKjsKB0Ri9Hjqq1AMOTanML0=";
|
sha256 = "sha256-9qfBreviTcWgkvZCD7bSvCaC40G+u1v4geGissJ4jE4=";
|
||||||
};
|
};
|
||||||
cargoSha256 = "sha256-ZA9pR8yQV5v/Xa/B7M01PIqrkBe1DVIXC5VURoE1EtI=";
|
cargoSha256 = "sha256-20o3JgpL4tHVDoH/l3yM7kCZyXu/vciA8ACubzRvPKA=";
|
||||||
|
|
||||||
# Install completions post-install
|
# Install completions post-install
|
||||||
nativeBuildInputs = [ installShellFiles ];
|
nativeBuildInputs = [ installShellFiles ];
|
||||||
|
|
|
@ -11,11 +11,11 @@ let
|
||||||
};
|
};
|
||||||
in
|
in
|
||||||
fetch_librusty_v8 {
|
fetch_librusty_v8 {
|
||||||
version = "0.34.0";
|
version = "0.35.0";
|
||||||
shas = {
|
shas = {
|
||||||
x86_64-linux = "sha256-Ly5bEfC993JH3/1VNpFu72Dv8kJYOFu+HIlEUJJcHps=";
|
x86_64-linux = "sha256-vMqLxARbR39G7YSACvqxp+3WLDcfivDgMkvkAEtJ758=";
|
||||||
aarch64-linux = "sha256-zazlvm4uyHD6Z+2JmeHS7gQ84C83KTWOGqNjSNPgoT0=";
|
aarch64-linux = "sha256-8rU4Z+eOt4RduiYM97uPiVLAspPkvmf7oeTVuVfBjII=";
|
||||||
x86_64-darwin = "sha256-RTgbtkCAuIj/ceJNbdA0yfKtFG8hSZgurEHEuUfJ7fk=";
|
x86_64-darwin = "sha256-SIXXfK72FfwGv44Z+Qu+a5YAtUaqo/qEpMJZdpOdr3A=";
|
||||||
aarch64-darwin = "sha256-xrOUPEZ4tj2BK6pDeoTpTKDx4E1KUEQ+lGMyduKDvBE=";
|
aarch64-darwin = "sha256-FAzwPlST02O5b/T9cz+uKNp6GFhFrgQnmabrAjMfmWc=";
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,16 +1,24 @@
|
||||||
{ lib, fetchFromGitHub, python3Packages }:
|
{ lib, fetchFromGitHub, fetchpatch, python3Packages }:
|
||||||
|
|
||||||
python3Packages.buildPythonApplication rec {
|
python3Packages.buildPythonApplication rec {
|
||||||
pname = "heisenbridge";
|
pname = "heisenbridge";
|
||||||
version = "1.7.0";
|
version = "1.7.1";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "hifi";
|
owner = "hifi";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-rN+qoBS9zIy5EHlFQxgAlcz9haoYJNMKJ2wlS46UOi0=";
|
sha256 = "sha256-q1Rj8BehvYnV/Kah5YKAxBUz4j9WziSqn1fVeaKpy7g=";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
patches = [
|
||||||
|
# Compatibility with aiohttp 3.8.0
|
||||||
|
(fetchpatch {
|
||||||
|
url = "https://github.com/hifi/heisenbridge/commit/cff5d33e0b617e6cf3a44dc00c72b98743175c9e.patch";
|
||||||
|
sha256 = "sha256-y5X4mWvX1bq0XNZNTYUc0iK3SzvaHpS7px53I7xC9c8=";
|
||||||
|
})
|
||||||
|
];
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
echo "${version}" > heisenbridge/version.txt
|
echo "${version}" > heisenbridge/version.txt
|
||||||
'';
|
'';
|
||||||
|
|
|
@ -1 +0,0 @@
|
||||||
0.30.0
|
|
|
@ -5,7 +5,7 @@ let
|
||||||
inherit pkgs nodejs;
|
inherit pkgs nodejs;
|
||||||
inherit (stdenv.hostPlatform) system;
|
inherit (stdenv.hostPlatform) system;
|
||||||
};
|
};
|
||||||
version = builtins.replaceStrings [ "\n" ] [ "" ] (builtins.readFile ./REVISION);
|
version = (lib.importJSON ./package.json).version;
|
||||||
in
|
in
|
||||||
ourNodePackages.package.override {
|
ourNodePackages.package.override {
|
||||||
pname = "matrix-appservice-irc";
|
pname = "matrix-appservice-irc";
|
||||||
|
@ -30,7 +30,7 @@ ourNodePackages.package.override {
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "Node.js IRC bridge for Matrix";
|
description = "Node.js IRC bridge for Matrix";
|
||||||
maintainers = with maintainers; [ piegames ];
|
maintainers = with maintainers; [ ];
|
||||||
homepage = "https://github.com/matrix-org/matrix-appservice-irc";
|
homepage = "https://github.com/matrix-org/matrix-appservice-irc";
|
||||||
license = licenses.asl20;
|
license = licenses.asl20;
|
||||||
};
|
};
|
||||||
|
|
|
@ -6,7 +6,7 @@ set -euo pipefail
|
||||||
cd "$(dirname "$0")"
|
cd "$(dirname "$0")"
|
||||||
|
|
||||||
CURRENT_VERSION=$(nix eval --raw '(with import ../../../../. {}; matrix-appservice-irc.version)')
|
CURRENT_VERSION=$(nix eval --raw '(with import ../../../../. {}; matrix-appservice-irc.version)')
|
||||||
TARGET_VERSION="$(curl https://api.github.com/repos/matrix-org/matrix-appservice-irc/releases/latest | jq -r ".tag_name")"
|
TARGET_VERSION="$(curl https://api.github.com/repos/matrix-org/matrix-appservice-irc/releases/latest | jq --exit-status -r ".tag_name")"
|
||||||
|
|
||||||
if [[ "$CURRENT_VERSION" == "$TARGET_VERSION" ]]; then
|
if [[ "$CURRENT_VERSION" == "$TARGET_VERSION" ]]; then
|
||||||
echo "matrix-appservice-irc is up-to-date: ${CURRENT_VERSION}"
|
echo "matrix-appservice-irc is up-to-date: ${CURRENT_VERSION}"
|
||||||
|
@ -18,7 +18,6 @@ echo "matrix-appservice-irc: $CURRENT_VERSION -> $TARGET_VERSION"
|
||||||
rm -f package.json package-lock.json
|
rm -f package.json package-lock.json
|
||||||
wget https://github.com/matrix-org/matrix-appservice-irc/raw/$TARGET_VERSION/package.json
|
wget https://github.com/matrix-org/matrix-appservice-irc/raw/$TARGET_VERSION/package.json
|
||||||
wget -O package-lock-temp.json https://github.com/matrix-org/matrix-appservice-irc/raw/$TARGET_VERSION/package-lock.json
|
wget -O package-lock-temp.json https://github.com/matrix-org/matrix-appservice-irc/raw/$TARGET_VERSION/package-lock.json
|
||||||
echo "$TARGET_VERSION" > ./REVISION
|
|
||||||
|
|
||||||
./generate-dependencies.sh
|
./generate-dependencies.sh
|
||||||
|
|
||||||
|
|
|
@ -3288,7 +3288,9 @@ with pkgs;
|
||||||
|
|
||||||
medusa = callPackage ../tools/security/medusa { };
|
medusa = callPackage ../tools/security/medusa { };
|
||||||
|
|
||||||
megasync = libsForQt515.callPackage ../applications/misc/megasync { };
|
megasync = libsForQt5.callPackage ../applications/misc/megasync {
|
||||||
|
ffmpeg = ffmpeg-full;
|
||||||
|
};
|
||||||
|
|
||||||
megacmd = callPackage ../applications/misc/megacmd { };
|
megacmd = callPackage ../applications/misc/megacmd { };
|
||||||
|
|
||||||
|
|
|
@ -173,6 +173,8 @@ lib.makeScope pkgs.newScope (self: with self; {
|
||||||
|
|
||||||
event = callPackage ../development/php-packages/event { };
|
event = callPackage ../development/php-packages/event { };
|
||||||
|
|
||||||
|
gnupg = callPackage ../development/php-packages/gnupg { };
|
||||||
|
|
||||||
igbinary = callPackage ../development/php-packages/igbinary { };
|
igbinary = callPackage ../development/php-packages/igbinary { };
|
||||||
|
|
||||||
imagick = callPackage ../development/php-packages/imagick { };
|
imagick = callPackage ../development/php-packages/imagick { };
|
||||||
|
|
Loading…
Reference in a new issue