kookie
/
nomicon
1
0
Fork 0
Code Issues Projects Releases 1 Activity

Merge master into staging-next

Browse Source
main
github-actions[bot] 2 years ago committed by GitHub
parent f09c526834 ab456c4d45
commit 7b8c1640d9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
35 changed files with 3247 additions and 2572 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 63
      pkgs/applications/audio/deadbeef/default.nix
  2. 270
      pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix
  3. 81
      pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix
  4. 4807
      pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json
  5. 16
      pkgs/applications/graphics/apngasm/default.nix
  6. 34
      pkgs/applications/graphics/image_optim/default.nix
  7. 8
      pkgs/applications/networking/browsers/firefox/common.nix
  8. 6
      pkgs/applications/networking/browsers/firefox/wrapper.nix
  9. 191
      pkgs/applications/networking/cluster/terraform-providers/providers.json
  10. 4
      pkgs/applications/networking/instant-messengers/alfaview/default.nix
  11. 17
      pkgs/applications/networking/instant-messengers/profanity/default.nix
  12. 40
      pkgs/applications/science/chemistry/gwyddion/default.nix
  13. 79
      pkgs/applications/video/mplayer/default.nix
  14. 8
      pkgs/development/interpreters/supercollider/default.nix
  15. 19
      pkgs/development/libraries/aravis/default.nix
  16. 10
      pkgs/development/libraries/gloox/default.nix
  17. 13
      pkgs/development/libraries/lame/default.nix
  18. 16
      pkgs/development/libraries/libbluray/default.nix
  19. 16
      pkgs/development/libraries/libwebp/default.nix
  20. 38
      pkgs/development/libraries/nghttp2/default.nix
  21. 1
      pkgs/development/libraries/science/math/itpp/default.nix
  22. 10
      pkgs/development/libraries/tachyon/default.nix
  23. 1
      pkgs/development/tools/aws-sam-cli/default.nix
  24. 8
      pkgs/development/tools/profiling/pprof/default.nix
  25. 8
      pkgs/development/tools/rust/cargo-feature/default.nix
  26. 2
      pkgs/games/asc/default.nix
  27. 13
      pkgs/games/openmw/default.nix
  28. 3
      pkgs/games/openmw/tes3mp.nix
  29. 11
      pkgs/servers/freeradius/default.nix
  30. 6
      pkgs/tools/audio/mpdris2/default.nix
  31. 2
      pkgs/tools/misc/recutils/default.nix
  32. 12
      pkgs/tools/security/medusa/default.nix
  33. 2
      pkgs/tools/security/secp256k1/default.nix
  34. 2
      pkgs/top-level/all-packages.nix
  35. 2
      pkgs/top-level/python-packages.nix

63
pkgs/applications/audio/deadbeef/default.nix
Unescape View File

@ -6,56 +6,35 @@
, pkg-config
, jansson
# deadbeef can use either gtk2 or gtk3
, gtk2Support ? false, gtk2 ? null
, gtk3Support ? true, gtk3 ? null, gsettings-desktop-schemas ? null, wrapGAppsHook ? null
, gtk2Support ? false, gtk2
, gtk3Support ? true, gtk3, gsettings-desktop-schemas, wrapGAppsHook
# input plugins
, vorbisSupport ? true, libvorbis ? null
, mp123Support ? true, libmad ? null
, flacSupport ? true, flac ? null
, wavSupport ? true, libsndfile ? null
, cdaSupport ? true, libcdio ? null, libcddb ? null
, aacSupport ? true, faad2 ? null
, opusSupport ? true, opusfile ? null
, wavpackSupport ? false, wavpack ? null
, ffmpegSupport ? false, ffmpeg ? null
, apeSupport ? true, yasm ? null
, vorbisSupport ? true, libvorbis
, mp123Support ? true, libmad
, flacSupport ? true, flac
, wavSupport ? true, libsndfile
, cdaSupport ? true, libcdio, libcddb
, aacSupport ? true, faad2
, opusSupport ? true, opusfile
, wavpackSupport ? false, wavpack
, ffmpegSupport ? false, ffmpeg
, apeSupport ? true, yasm
# misc plugins
, zipSupport ? true, libzip ? null
, artworkSupport ? true, imlib2 ? null
, hotkeysSupport ? true, libX11 ? null
, osdSupport ? true, dbus ? null
, zipSupport ? true, libzip
, artworkSupport ? true, imlib2
, hotkeysSupport ? true, libX11
, osdSupport ? true, dbus
# output plugins
, alsaSupport ? true, alsa-lib ? null
, pulseSupport ? config.pulseaudio or stdenv.isLinux, libpulseaudio ? null
, alsaSupport ? true, alsa-lib
, pulseSupport ? config.pulseaudio or stdenv.isLinux, libpulseaudio
# effect plugins
, resamplerSupport ? true, libsamplerate ? null
, overloadSupport ? true, zlib ? null
, resamplerSupport ? true, libsamplerate
, overloadSupport ? true, zlib
# transports
, remoteSupport ? true, curl ? null
, remoteSupport ? true, curl
}:
assert gtk2Support || gtk3Support;
assert gtk2Support -> gtk2 != null;
assert gtk3Support -> gtk3 != null && gsettings-desktop-schemas != null && wrapGAppsHook != null;
assert vorbisSupport -> libvorbis != null;
assert mp123Support -> libmad != null;
assert flacSupport -> flac != null;
assert wavSupport -> libsndfile != null;
assert cdaSupport -> (libcdio != null && libcddb != null);
assert aacSupport -> faad2 != null;
assert opusSupport -> opusfile != null;
assert zipSupport -> libzip != null;
assert ffmpegSupport -> ffmpeg != null;
assert apeSupport -> yasm != null;
assert artworkSupport -> imlib2 != null;
assert hotkeysSupport -> libX11 != null;
assert osdSupport -> dbus != null;
assert alsaSupport -> alsa-lib != null;
assert pulseSupport -> libpulseaudio != null;
assert resamplerSupport -> libsamplerate != null;
assert overloadSupport -> zlib != null;
assert wavpackSupport -> wavpack != null;
assert remoteSupport -> curl != null;
stdenv.mkDerivation rec {
pname = "deadbeef";

270
pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix
Unescape View File

@ -114,10 +114,10 @@
elpaBuild {
pname = "aggressive-completion";
ename = "aggressive-completion";
version = "1.6";
version = "1.7";
src = fetchurl {
url = "https://elpa.gnu.org/packages/aggressive-completion-1.6.tar";
sha256 = "0i7kcxd7pbdw57gczbxddr2n4j778x2ccfpkgjhdlpdsyidfh2bq";
url = "https://elpa.gnu.org/packages/aggressive-completion-1.7.tar";
sha256 = "1rpy53kh19ljjr2xgna716jynajjpgkkjgcl3gzryxsmky8mwbfl";
};
packageRequires = [ emacs ];
meta = {
@ -234,10 +234,10 @@
elpaBuild {
pname = "auctex";
ename = "auctex";
version = "13.1.2";
version = "13.1.3";
src = fetchurl {
url = "https://elpa.gnu.org/packages/auctex-13.1.2.tar";
sha256 = "0j79y7iz0g3i36w5l91l2dljs8b4sx42f7q25z2963mvhfvrbp10";
url = "https://elpa.gnu.org/packages/auctex-13.1.3.tar";
sha256 = "0v9rxwz6ngnwrgvzgdki861s136gq30lqhy2gcd9q0a36gb6zhwk";
};
packageRequires = [ emacs ];
meta = {
@ -309,10 +309,10 @@
elpaBuild {
pname = "bbdb";
ename = "bbdb";
version = "3.2.2.1";
version = "3.2.2.2";
src = fetchurl {
url = "https://elpa.gnu.org/packages/bbdb-3.2.2.1.tar";
sha256 = "060nd6vhwwh56jc1mvmyj6mn6kx7zgmbhrkfv9sqdx7h96bcrsbh";
url = "https://elpa.gnu.org/packages/bbdb-3.2.2.2.tar";
sha256 = "0bf20r5xhxln6z4qp8zrlln0303dkci2ydsr74pxcj08aqgk5xxf";
};
packageRequires = [ cl-lib emacs ];
meta = {
@ -354,10 +354,10 @@
elpaBuild {
pname = "bluetooth";
ename = "bluetooth";
version = "0.3";
version = "0.3.1";
src = fetchurl {
url = "https://elpa.gnu.org/packages/bluetooth-0.3.tar";
sha256 = "1q27hk4j7k0q9vqgn9nq7q0vhn9jdqbygs7d9lv5gwfhdzdnl4az";
url = "https://elpa.gnu.org/packages/bluetooth-0.3.1.tar";
sha256 = "1p10kcim5wqnbj2kiqv6hgjkzznaa48qysnnf8ym90mylsczr70z";
};
packageRequires = [ dash emacs ];
meta = {
@ -756,10 +756,10 @@
elpaBuild {
pname = "compat";
ename = "compat";
version = "28.1.0.3";
version = "28.1.1.1";
src = fetchurl {
url = "https://elpa.gnu.org/packages/compat-28.1.0.3.tar";
sha256 = "12h06ab57hhjq434cf39g69ain6dpqq8a0h9xc91kvjsiz9chqhd";
url = "https://elpa.gnu.org/packages/compat-28.1.1.1.tar";
sha256 = "13ksa6q3m525gd6sdixmak6brfch2rhz8dzzmhvvdh1y04hcnam8";
};
packageRequires = [ emacs nadvice ];
meta = {
@ -771,10 +771,10 @@
elpaBuild {
pname = "consult";
ename = "consult";
version = "0.16";
version = "0.17";
src = fetchurl {
url = "https://elpa.gnu.org/packages/consult-0.16.tar";
sha256 = "172w4d9hbzj98j1gyfhzw2zz4fpw90ak8ccg35fngwjlk9mjdrzk";
url = "https://elpa.gnu.org/packages/consult-0.17.tar";
sha256 = "16yrp6scxg93anxrp5nww08ixxqk8ra9dn9zm8w5dry997kmkasa";
};
packageRequires = [ emacs ];
meta = {
@ -801,10 +801,10 @@
elpaBuild {
pname = "corfu";
ename = "corfu";
version = "0.21";
version = "0.23";
src = fetchurl {
url = "https://elpa.gnu.org/packages/corfu-0.21.tar";
sha256 = "1jabx61ajiysd3yqkraanlx9gnkz1qs6d94wjc5a2ran58iyknyr";
url = "https://elpa.gnu.org/packages/corfu-0.23.tar";
sha256 = "1l988jmvn3x1x77sc89pg5ivwl9i4r2v4k74ymkplgcc9wpffm1v";
};
packageRequires = [ emacs ];
meta = {
@ -857,6 +857,21 @@
license = lib.licenses.free;
};
}) {};
cpupower = callPackage ({ elpaBuild, fetchurl, lib }:
elpaBuild {
pname = "cpupower";
ename = "cpupower";
version = "1.0.4";
src = fetchurl {
url = "https://elpa.gnu.org/packages/cpupower-1.0.4.tar";
sha256 = "12910d3qbkapr4bvqv88lr85fz6rkim0zrc24nxnvkhkh3yi8qvd";
};
packageRequires = [];
meta = {
homepage = "https://elpa.gnu.org/packages/cpupower.html";
license = lib.licenses.free;
};
}) {};
crdt = callPackage ({ elpaBuild, fetchurl, lib }:
elpaBuild {
pname = "crdt";
@ -917,6 +932,21 @@
license = lib.licenses.free;
};
}) {};
cursory = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "cursory";
ename = "cursory";
version = "0.1.4";
src = fetchurl {
url = "https://elpa.gnu.org/packages/cursory-0.1.4.tar";
sha256 = "0yjwn6kpxl7b3m8si4sqmdkhr8imcgbvwhwki2sxgybs75lxdg97";
};
packageRequires = [ emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/cursory.html";
license = lib.licenses.free;
};
}) {};
cycle-quotes = callPackage ({ elpaBuild, fetchurl, lib }:
elpaBuild {
pname = "cycle-quotes";
@ -1146,10 +1176,10 @@
elpaBuild {
pname = "djvu";
ename = "djvu";
version = "1.1.1";
version = "1.1.2";
src = fetchurl {
url = "https://elpa.gnu.org/packages/djvu-1.1.1.el";
sha256 = "0z2qk1v4qkvcwl27ycqfb8vyszq5v6b8ci29b4la00yaki16p04i";
url = "https://elpa.gnu.org/packages/djvu-1.1.2.tar";
sha256 = "0i7xwgg2fxndy81lnng6fh9iknals8xvx4f1nmxq7c099bzwb57c";
};
packageRequires = [];
meta = {
@ -1176,10 +1206,10 @@
elpaBuild {
pname = "dtache";
ename = "dtache";
version = "0.5";
version = "0.6";
src = fetchurl {
url = "https://elpa.gnu.org/packages/dtache-0.5.tar";
sha256 = "10gcnkajpw7szd41l6ykkysv00yp93y1z9ajhcmk4wzni93w21z2";
url = "https://elpa.gnu.org/packages/dtache-0.6.tar";
sha256 = "1nv5hzn4rnm8pzfr5i209djaafj4ymg5j886yq2j19zkjadc8yx3";
};
packageRequires = [ emacs ];
meta = {
@ -1221,10 +1251,10 @@
elpaBuild {
pname = "easy-kill";
ename = "easy-kill";
version = "0.9.4";
version = "0.9.5";
src = fetchurl {
url = "https://elpa.gnu.org/packages/easy-kill-0.9.4.tar";
sha256 = "1pqqv4dhfm00wqch4wy3n2illsvxlz9r6r64925cvq3i7wq4la1x";
url = "https://elpa.gnu.org/packages/easy-kill-0.9.5.tar";
sha256 = "0h8rzd23sgkj3vxnyhis9iyq8n3xqp9x1mvxlm61s6wwj9j398j6";
};
packageRequires = [ cl-lib emacs ];
meta = {
@ -1296,10 +1326,10 @@
elpaBuild {
pname = "eev";
ename = "eev";
version = "20220324";
version = "20220416";
src = fetchurl {
url = "https://elpa.gnu.org/packages/eev-20220324.tar";
sha256 = "0x1fhjj7g96xmp8pnj3k23xi61nfzaj04bzx050qjc1dvdg8gpfa";
url = "https://elpa.gnu.org/packages/eev-20220416.tar";
sha256 = "174hwb3cyiqimzcsl62yhq51hb4gxmj5wni6w5ng4m24bfkx87nc";
};
packageRequires = [ emacs ];
meta = {
@ -1469,10 +1499,10 @@
elpaBuild {
pname = "engrave-faces";
ename = "engrave-faces";
version = "0.2.0";
version = "0.3.0";
src = fetchurl {
url = "https://elpa.gnu.org/packages/engrave-faces-0.2.0.tar";
sha256 = "1d0hsfg3wvwbs82gjyvfjvy1sszcm7qa50bch1b6jy05kbc543ip";
url = "https://elpa.gnu.org/packages/engrave-faces-0.3.0.tar";
sha256 = "0l59fci16m6li52bqwbqglsi9gavgsfkxlxm9y1ny3ma0w1rnp9d";
};
packageRequires = [ emacs ];
meta = {
@ -1680,6 +1710,21 @@
license = lib.licenses.free;
};
}) {};
fontaine = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "fontaine";
ename = "fontaine";
version = "0.1.1";
src = fetchurl {
url = "https://elpa.gnu.org/packages/fontaine-0.1.1.tar";
sha256 = "1jyb6s2sqr9fmy6f4i9vijaswb8f9vn2br98d4w2afzhmf4d0bdc";
};
packageRequires = [ emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/fontaine.html";
license = lib.licenses.free;
};
}) {};
frame-tabs = callPackage ({ elpaBuild, fetchurl, lib }:
elpaBuild {
pname = "frame-tabs";
@ -1942,6 +1987,21 @@
license = lib.licenses.free;
};
}) {};
gtags-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "gtags-mode";
ename = "gtags-mode";
version = "1.0";
src = fetchurl {
url = "https://elpa.gnu.org/packages/gtags-mode-1.0.tar";
sha256 = "0nyzsr3fnds931ihw2dp5xlgv151kzph7qv1n751r1cajimzlp7n";
};
packageRequires = [ emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/gtags-mode.html";
license = lib.licenses.free;
};
}) {};
guess-language = callPackage ({ cl-lib ? null
, elpaBuild
, emacs
@ -2058,10 +2118,10 @@
elpaBuild {
pname = "hyperbole";
ename = "hyperbole";
version = "7.1.3";
version = "8.0.0";
src = fetchurl {
url = "https://elpa.gnu.org/packages/hyperbole-7.1.3.tar";
sha256 = "0bizibn4qgxqp89fyik6p47s9hss1g932mg8k7pznn3kkhj5c8rh";
url = "https://elpa.gnu.org/packages/hyperbole-8.0.0.tar";
sha256 = "171x7jad62xd0n3xgs32dksyhn5abxj1kna0qgm65mm0v73hrv8d";
};
packageRequires = [ emacs ];
meta = {
@ -2408,10 +2468,10 @@
elpaBuild {
pname = "lin";
ename = "lin";
version = "0.3.0";
version = "0.3.1";
src = fetchurl {
url = "https://elpa.gnu.org/packages/lin-0.3.0.tar";
sha256 = "08h7rh8gidn9mn031mg8lvhxswv1hxn4i0ffk2vxygfbp9jxfi61";
url = "https://elpa.gnu.org/packages/lin-0.3.1.tar";
sha256 = "1blk9vc9fyw6djqh0465bayv2s5s0ap7fps383ihmazmmii6mp2a";
};
packageRequires = [ emacs ];
meta = {
@ -2498,10 +2558,10 @@
elpaBuild {
pname = "logos";
ename = "logos";
version = "0.3.1";
version = "0.3.2";
src = fetchurl {
url = "https://elpa.gnu.org/packages/logos-0.3.1.tar";
sha256 = "0wwvp47bmc7w3jvh480vc31agf0s39mvgk0h550z6a1wzlrfzyh9";
url = "https://elpa.gnu.org/packages/logos-0.3.2.tar";
sha256 = "1qpbp9f9lz7yrky42cq8b4k295593s7l892zsrdyifnqcgs50bfd";
};
packageRequires = [ emacs ];
meta = {
@ -2886,10 +2946,10 @@
elpaBuild {
pname = "nano-theme";
ename = "nano-theme";
version = "0.3.0";
version = "0.3.1";
src = fetchurl {
url = "https://elpa.gnu.org/packages/nano-theme-0.3.0.tar";
sha256 = "1nq5x46467vnsfg3fzb0qyg97xpnwsvbqg8frdjil5zq5fhsgmrz";
url = "https://elpa.gnu.org/packages/nano-theme-0.3.1.tar";
sha256 = "003jhzh52iqrqlxh1gpv3y2wjlxx4ng3al5zcpm5q42kix8cjpd1";
};
packageRequires = [ emacs ];
meta = {
@ -3070,10 +3130,10 @@
elpaBuild {
pname = "org";
ename = "org";
version = "9.5.2";
version = "9.5.3";
src = fetchurl {
url = "https://elpa.gnu.org/packages/org-9.5.2.tar";
sha256 = "12pvr47b11pq5rncpb3x8y11fhnakk5bi73j9l9w4d4ss3swcrnh";
url = "https://elpa.gnu.org/packages/org-9.5.3.tar";
sha256 = "0i8lx7gsdz79qv0h3qdbwqd0m91z6ky33wjmkcbify75giixiv25";
};
packageRequires = [ emacs ];
meta = {
@ -3205,10 +3265,10 @@
elpaBuild {
pname = "osm";
ename = "osm";
version = "0.6";
version = "0.7";
src = fetchurl {
url = "https://elpa.gnu.org/packages/osm-0.6.tar";
sha256 = "0p19qyx4gw1rn2f5hlxa7gx1sph2z5vjw7cnxwpjhbbr0430zzwb";
url = "https://elpa.gnu.org/packages/osm-0.7.tar";
sha256 = "0k2phmh2sl50vx88cgndghcjfz0i20mjs2hg4mlh4hb5q9yjpcj4";
};
packageRequires = [ emacs ];
meta = {
@ -3445,10 +3505,10 @@
elpaBuild {
pname = "pulsar";
ename = "pulsar";
version = "0.3.0";
version = "0.3.1";
src = fetchurl {
url = "https://elpa.gnu.org/packages/pulsar-0.3.0.tar";
sha256 = "0dbfj7789qp4l25y8qazmx5kqgjgqjsnk24rwcf6qann4cq6wgnq";
url = "https://elpa.gnu.org/packages/pulsar-0.3.1.tar";
sha256 = "0v3bdw0sgic98b7xj19g37hw1vinanagsbhyf5qpajx3gm2im9wx";
};
packageRequires = [ emacs ];
meta = {
@ -3460,10 +3520,10 @@
elpaBuild {
pname = "pyim";
ename = "pyim";
version = "4.1.0";
version = "4.2.0";
src = fetchurl {
url = "https://elpa.gnu.org/packages/pyim-4.1.0.tar";
sha256 = "1q4b3y72gbkl5z31brlnjqjl30lgqm2d1zlqrbkqnnfy5hjgazk9";
url = "https://elpa.gnu.org/packages/pyim-4.2.0.tar";
sha256 = "1yb6yv92987kq0ls38d0fqwbj5jrf4cg3jvdbwjzr61gg3izf414";
};
packageRequires = [ async emacs xr ];
meta = {
@ -3535,10 +3595,10 @@
elpaBuild {
pname = "rainbow-mode";
ename = "rainbow-mode";
version = "1.0.5";
version = "1.0.6";
src = fetchurl {
url = "https://elpa.gnu.org/packages/rainbow-mode-1.0.5.el";
sha256 = "159fps843k5pap9k04a7ll1k3gw6d9c6w08lq4bbc3lqg78aa2l9";
url = "https://elpa.gnu.org/packages/rainbow-mode-1.0.6.tar";
sha256 = "04v73cm1cap19vwc8lqsw0rmfr9v7r3swc4wgxnk9dnzxi9j2527";
};
packageRequires = [];
meta = {
@ -3830,10 +3890,10 @@
elpaBuild {
pname = "rt-liberation";
ename = "rt-liberation";
version = "4";
version = "5";
src = fetchurl {
url = "https://elpa.gnu.org/packages/rt-liberation-4.tar";
sha256 = "15vs982cxpc3g8cq2gj3a6dfn9i2r9b44x38ydvcmiy2brkd3psj";
url = "https://elpa.gnu.org/packages/rt-liberation-5.tar";
sha256 = "1gjj38rag3hh42xkf7qlvwn0qj45i8v30h5wgs3w2a2ccs46bpy4";
};
packageRequires = [];
meta = {
@ -4196,6 +4256,21 @@
license = lib.licenses.free;
};
}) {};
sql-cassandra = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "sql-cassandra";
ename = "sql-cassandra";
version = "0.2.1";
src = fetchurl {
url = "https://elpa.gnu.org/packages/sql-cassandra-0.2.1.tar";
sha256 = "1w9jhh4gf5nnjq8p2zfdli81yqvnfjri4qlwxiwb913ah48vyi2l";
};
packageRequires = [ emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/sql-cassandra.html";
license = lib.licenses.free;
};
}) {};
sql-indent = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
elpaBuild {
pname = "sql-indent";
@ -4459,14 +4534,44 @@
license = lib.licenses.free;
};
}) {};
tmr = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "tmr";
ename = "tmr";
version = "0.2.3";
src = fetchurl {
url = "https://elpa.gnu.org/packages/tmr-0.2.3.tar";
sha256 = "0lys6g96cvfyhwr7z0yv9cx2ykzyixjppv5fh29qzq3h3dywx5wb";
};
packageRequires = [ emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/tmr.html";
license = lib.licenses.free;
};
}) {};
tomelr = callPackage ({ elpaBuild, emacs, fetchurl, lib, map, seq }:
elpaBuild {
pname = "tomelr";
ename = "tomelr";
version = "0.3.0";
src = fetchurl {
url = "https://elpa.gnu.org/packages/tomelr-0.3.0.tar";
sha256 = "0jnnyvbmhqn8wkg3y13iy19nck6dphay8jdy2nimp28a1jvs7z6g";
};
packageRequires = [ emacs map seq ];
meta = {
homepage = "https://elpa.gnu.org/packages/tomelr.html";
license = lib.licenses.free;
};
}) {};
tramp = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "tramp";
ename = "tramp";
version = "2.5.2.3";
version = "2.5.2.4";
src = fetchurl {
url = "https://elpa.gnu.org/packages/tramp-2.5.2.3.tar";
sha256 = "1nv603jrvql03z2pfg74yq0hp7963gagg27fksc456mpmz4p7ajq";
url = "https://elpa.gnu.org/packages/tramp-2.5.2.4.tar";
sha256 = "0ap1d34p1akrrm8z1r7ln6mj13xg2nrvjln2v3g8plhhp354jldz";
};
packageRequires = [ emacs ];
meta = {
@ -4774,10 +4879,10 @@
elpaBuild {
pname = "vertico";
ename = "vertico";
version = "0.22";
version = "0.23";
src = fetchurl {
url = "https://elpa.gnu.org/packages/vertico-0.22.tar";
sha256 = "1m8r2iqyyvym7a47awh00aq7hld54dklrx4ibwvnmhpxl0fzh7g8";
url = "https://elpa.gnu.org/packages/vertico-0.23.tar";
sha256 = "1d2r2y1bhvipn4xqzla5rv09cdpg7f19m9hrnv1pqypjvbgqv1m2";
};
packageRequires = [ emacs ];
meta = {
@ -4794,10 +4899,10 @@
elpaBuild {
pname = "vertico-posframe";
ename = "vertico-posframe";
version = "0.5.3";
version = "0.5.4";
src = fetchurl {
url = "https://elpa.gnu.org/packages/vertico-posframe-0.5.3.tar";
sha256 = "12jcb4im1ys2s0wbv9nfmgpcrz037zagd677qjm8hz8fn29xdh6n";
url = "https://elpa.gnu.org/packages/vertico-posframe-0.5.4.tar";
sha256 = "19lx6p06wkwfivxgswdljdsh9bgcd1b9zkzx426w3pwicdk0cvgg";
};
packageRequires = [ emacs posframe vertico ];
meta = {
@ -4868,6 +4973,21 @@
license = lib.licenses.free;
};
}) {};
vundo = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "vundo";
ename = "vundo";
version = "2.0.0";
src = fetchurl {
url = "https://elpa.gnu.org/packages/vundo-2.0.0.tar";
sha256 = "032aqcqq2xhh12qcpp8p3qldv0r9cnqr2y11jk1m5cvgal1cbb68";
};
packageRequires = [ emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/vundo.html";
license = lib.licenses.free;
};
}) {};
wcheck-mode = callPackage ({ elpaBuild, fetchurl, lib }:
elpaBuild {
pname = "wcheck-mode";

81
pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix
Unescape View File

@ -49,10 +49,10 @@
elpaBuild {
pname = "annotate";
ename = "annotate";
version = "1.5.3";
version = "1.5.4";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/annotate-1.5.3.tar";
sha256 = "0d5lqaj1bqckvjpwxqglzrhk8fm03n19lxwm74jxfl1lkxq4dw3x";
url = "https://elpa.nongnu.org/nongnu/annotate-1.5.4.tar";
sha256 = "1d11q4ddc2rw7n8jrxdddc5h42hf16sbc1l4v6zmmsriahxhgfdd";
};
packageRequires = [];
meta = {
@ -258,10 +258,10 @@
elpaBuild {
pname = "cider";
ename = "cider";
version = "1.3.0";
version = "1.4.0";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/cider-1.3.0.tar";
sha256 = "10kg30s0gb09l0z17v2hqxy9v5pscnpqp5dng62cjh0x3hdi4i7x";
url = "https://elpa.nongnu.org/nongnu/cider-1.4.0.tar";
sha256 = "11a3ysvrywp79pp1yivpsgi8azgzbg7ayiai94p1dyd3viy29qn0";
};
packageRequires = [
clojure-mode
@ -469,10 +469,10 @@
elpaBuild {
pname = "elpher";
ename = "elpher";
version = "3.3.3";
version = "3.4.1";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/elpher-3.3.3.tar";
sha256 = "0yaf6g424g6dngg0acbhlhd24k77bl5h82wiw98f3731xdad174r";
url = "https://elpa.nongnu.org/nongnu/elpher-3.4.1.tar";
sha256 = "1vayhcamdp8nn6hrgffd0yx9k9q3mckbcsfwclhyyfc0x1hcwf92";
};
packageRequires = [ emacs ];
meta = {
@ -484,10 +484,10 @@
elpaBuild {
pname = "evil";
ename = "evil";
version = "1.14.0";
version = "1.15.0";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/evil-1.14.0.tar";
sha256 = "11hzx3ya1119kr8dwlg264biixiqgvi7zwxxksql0a9hqp57rdpx";
url = "https://elpa.nongnu.org/nongnu/evil-1.15.0.tar";
sha256 = "0xp31w5mr6sprimd2rwy7mpa3kca5ivwf57jmaqyzpd96gh66pg1";
};
packageRequires = [];
meta = {
@ -602,10 +602,10 @@
elpaBuild {
pname = "evil-matchit";
ename = "evil-matchit";
version = "2.4.3";
version = "2.4.4";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/evil-matchit-2.4.3.tar";
sha256 = "079qbx6f4clh5ngnrga016h0q2vf7afx9irsa06pishfs94pl4qn";
url = "https://elpa.nongnu.org/nongnu/evil-matchit-2.4.4.tar";
sha256 = "1p8xsi0068wabsfn3jwhyinkk2684xp9hlapcbj6y58wkpzqj0f6";
};
packageRequires = [ emacs evil ];
meta = {
@ -712,10 +712,10 @@
elpaBuild {
pname = "geiser";
ename = "geiser";
version = "0.23.2";
version = "0.24";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/geiser-0.23.2.tar";
sha256 = "1rdz13rjfp8j2ik3vbw1jvacjri3abghlq6aqfvkd7vwm21h30ih";
url = "https://elpa.nongnu.org/nongnu/geiser-0.24.tar";
sha256 = "14qnni8ridrg3afh1wy9nvchbk0drn0h7ww5xgc6s03ivvmy7a71";
};
packageRequires = [ emacs project transient ];
meta = {
@ -909,6 +909,21 @@
license = lib.licenses.free;
};
}) {};
gnu-apl-mode = callPackage ({ elpaBuild, fetchurl, lib }:
elpaBuild {
pname = "gnu-apl-mode";
ename = "gnu-apl-mode";
version = "1.5.1";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/gnu-apl-mode-1.5.1.tar";
sha256 = "0almjbh35d0myyjaavmqi7yzk3jpqdcqrhsb2x6vcp6pb199g7z8";
};
packageRequires = [];
meta = {
homepage = "https://elpa.gnu.org/packages/gnu-apl-mode.html";
license = lib.licenses.free;
};
}) {};
gnuplot = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "gnuplot";
@ -1903,10 +1918,10 @@
elpaBuild {
pname = "shellcop";
ename = "shellcop";
version = "0.0.8";
version = "0.0.9";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/shellcop-0.0.8.tar";
sha256 = "00kj1zadrqnikvwrxd6ma0c8r1jf70c1zaqr03s0g49h4lz6m2da";
url = "https://elpa.nongnu.org/nongnu/shellcop-0.0.9.tar";
sha256 = "0rv98s3w3pd2l477100d8kn2kqx21xn3axzcfbxbkgl8bc78mvci";
};
packageRequires = [ emacs ];
meta = {
@ -2023,10 +2038,10 @@
elpaBuild {
pname = "subed";
ename = "subed";
version = "1.0.3";
version = "1.0.5";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/subed-1.0.3.tar";
sha256 = "0wibakmp1lhfyr6sifb7f3jcqp2s5sy0z37ad9n1n9rhj5q8yhzg";
url = "https://elpa.nongnu.org/nongnu/subed-1.0.5.tar";
sha256 = "1wpkwab6scmc9d3bzp5161d8agmcjacpijs8xqb1mpbyvl1jvavc";
};
packageRequires = [ emacs ];
meta = {
@ -2315,6 +2330,24 @@
license = lib.licenses.free;
};
}) {};
xah-fly-keys = callPackage ({ elpaBuild
, emacs
, fetchurl
, lib }:
elpaBuild {
pname = "xah-fly-keys";
ename = "xah-fly-keys";
version = "17.7.20220429090059";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/xah-fly-keys-17.7.20220429090059.tar";
sha256 = "006lqjx88b0g0szxai82qdn3bv8qajp2x281arpmp3rpb7faggvq";
};
packageRequires = [ emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/xah-fly-keys.html";
license = lib.licenses.free;
};
}) {};
xml-rpc = callPackage ({ elpaBuild, fetchurl, lib }:
elpaBuild {
pname = "xml-rpc";

4807
pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json
View File

File diff suppressed because it is too large Load Diff

16
pkgs/applications/graphics/apngasm/default.nix
Unescape View File

@ -1,16 +1,24 @@
{ lib, stdenv, fetchFromGitHub, cmake, boost, libpng, zlib }:
{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, boost, libpng, zlib }:
stdenv.mkDerivation rec {
pname = "apngasm";
version = "3.1.9";
version = "3.1.10";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "d50bfb0cf14c376f4cfb94eb91c61d795a76b715"; # not tagged, but in debian/changelog
sha256 = "0pk0r8x1950pm6j3d5wgryvy3ldm7a9gl59jmnwnjmg1sf9mzf97";
rev = "f105b2d6024ef3113bb407d68e27e476a17fa998";
sha256 = "sha256-lTk2sTllKHRUaWPPEkC4qU5K10oRaLrdWBgN4MUGKeo=";
};
patches = [
# Fix parallel build and avoid static linking of binary.
(fetchpatch {
url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-gfx/apngasm/files/apngasm-3.1.10-static.patch?id=45fd0cde71ca2ae0e7e38ab67400d84b86b593d7";
sha256 = "sha256-eKthgInWxXEqN5PupvVf9wVQDElxsPYRFXT7pMc6vIU=";
})
];
nativeBuildInputs = [ cmake ];
buildInputs = [ boost libpng zlib ];

34
pkgs/applications/graphics/image_optim/default.nix
Unescape View File

@ -1,29 +1,17 @@
{ lib, bundlerApp, bundlerUpdateScript, makeWrapper,
withPngcrush ? true, pngcrush ? null,
withPngout ? true, pngout ? null,
withAdvpng ? true, advancecomp ? null,
withOptipng ? true, optipng ? null,
withPngquant ? true, pngquant ? null,
withJhead ? true, jhead ? null,
withJpegoptim ? true, jpegoptim ? null,
withJpegrecompress ? true, jpeg-archive ? null,
withJpegtran ? true, libjpeg ? null,
withGifsicle ? true, gifsicle ? null,
withSvgo ? true, svgo ? null
withPngcrush ? true, pngcrush,
withPngout ? true, pngout,
withAdvpng ? true, advancecomp,
withOptipng ? true, optipng,
withPngquant ? true, pngquant,
withJhead ? true, jhead,
withJpegoptim ? true, jpegoptim,
withJpegrecompress ? true, jpeg-archive,
withJpegtran ? true, libjpeg,
withGifsicle ? true, gifsicle,
withSvgo ? true, svgo
}:
assert withPngcrush -> pngcrush != null;
assert withPngout -> pngout != null;
assert withAdvpng -> advancecomp != null;
assert withOptipng -> optipng != null;
assert withPngquant -> pngquant != null;
assert withJhead -> jhead != null;
assert withJpegoptim -> jpegoptim != null;
assert withJpegrecompress -> jpeg-archive != null;
assert withJpegtran -> libjpeg != null;
assert withGifsicle -> gifsicle != null;
assert withSvgo -> svgo != null;
with lib;
let

8
pkgs/applications/networking/browsers/firefox/common.nix
Unescape View File

@ -80,11 +80,13 @@
, alsaSupport ? stdenv.isLinux, alsa-lib
, ffmpegSupport ? true
, gssSupport ? true, libkrb5
, jackSupport ? stdenv.isLinux, libjack2
, jemallocSupport ? true, jemalloc
, ltoSupport ? (stdenv.isLinux && stdenv.is64bit), overrideCC, buildPackages
, pgoSupport ? (stdenv.isLinux && stdenv.isx86_64 && stdenv.hostPlatform == stdenv.buildPlatform), xvfb-run
, pipewireSupport ? waylandSupport && webrtcSupport
, pulseaudioSupport ? stdenv.isLinux, libpulseaudio
, sndioSupport ? stdenv.isLinux, sndio
, waylandSupport ? true, libxkbcommon, libdrm
## privacy-related options
@ -303,7 +305,9 @@ buildStdenv.mkDerivation ({
++ lib.optional (lib.versionAtLeast version "95") "--with-wasi-sysroot=${wasiSysRoot}"
++ flag alsaSupport "alsa"
++ flag jackSupport "jack"
++ flag pulseaudioSupport "pulseaudio"
++ lib.optional (lib.versionAtLeast version "100") (flag sndioSupport "sndio")
++ flag ffmpegSupport "ffmpeg"
++ flag jemallocSupport "jemalloc"
++ flag geolocationSupport "necko-wifi"
@ -363,7 +367,9 @@ buildStdenv.mkDerivation ({
]
++ [ (if (lib.versionAtLeast version "92") then nss_latest else nss_esr) ]
++ lib.optional alsaSupport alsa-lib
++ lib.optional jackSupport libjack2
++ lib.optional pulseaudioSupport libpulseaudio # only headers are needed
++ lib.optional (sndioSupport && lib.versionAtLeast version "100") sndio
++ lib.optional gssSupport libkrb5
++ lib.optionals waylandSupport [ libxkbcommon libdrm ]
++ lib.optional jemallocSupport jemalloc
@ -464,7 +470,9 @@ buildStdenv.mkDerivation ({
inherit version;
inherit alsaSupport;
inherit binaryName;
inherit jackSupport;
inherit pipewireSupport;
inherit sndioSupport;
inherit nspr;
inherit ffmpegSupport;
inherit gssSupport;

6
pkgs/applications/networking/browsers/firefox/wrapper.nix
Unescape View File

@ -13,6 +13,8 @@
, mesa # firefox wants gbm for drm+dmabuf
, cups
, pciutils
, sndio
, libjack2
}:
## configurability of the wrapper itself
@ -53,6 +55,8 @@ let
gssSupport = browser.gssSupport or false;
alsaSupport = browser.alsaSupport or false;
pipewireSupport = browser.pipewireSupport or false;
sndioSupport = browser.sndioSupport or false;
jackSupport = browser.jackSupport or false;
# PCSC-Lite daemon (services.pcscd) also must be enabled for firefox to access smartcards
smartcardSupport = cfg.smartcardSupport or false;
@ -76,6 +80,8 @@ let
(with xorg; [ stdenv.cc libX11 libXxf86dga libXxf86vm libXext libXt alsa-lib zlib ])
++ lib.optional (config.pulseaudio or true) libpulseaudio
++ lib.optional alsaSupport alsa-lib
++ lib.optional sndioSupport sndio
++ lib.optional jackSupport libjack2
++ lib.optional smartcardSupport opensc
++ pkcs11Modules;
gtk_modules = [ libcanberra-gtk3 ];

191
pkgs/applications/networking/cluster/terraform-providers/providers.json
Unescape View File

@ -30,10 +30,10 @@
"owner": "aiven",
"provider-source-address": "registry.terraform.io/aiven/aiven",
"repo": "terraform-provider-aiven",
"rev": "v2.7.2",
"sha256": "sha256-1Y3m431KlWU+0cgZsU644WEO1i/9Gp1HomXvuCesVNU=",
"rev": "v2.7.3",
"sha256": "sha256-ZAYnP2XEa2eJ0YZkqXQedRysmQI31RQ1osg/TqCqthE=",
"vendorSha256": "sha256-nBVLgOrtINrDziQLdqo5rFWfeY/cOdBW/XVDjtNaNhE=",
"version": "2.7.2"
"version": "2.7.3"
},
"akamai": {
"owner": "akamai",
@ -49,10 +49,10 @@
"owner": "aliyun",
"provider-source-address": "registry.terraform.io/aliyun/alicloud",
"repo": "terraform-provider-alicloud",
"rev": "v1.165.0",
"sha256": "sha256-Mq0Ob6U2v3onn5wIvAzXhbSBzjUCP4kF6irbwREdGFI=",
"vendorSha256": "sha256-xxq+VOG6FkX1perAcXOiFtL/bjsHl9IWIJb5dfaIkpY=",
"version": "1.165.0"
"rev": "v1.166.0",
"sha256": "sha256-+aRRsN3ALTmQOnDciHjoVFKV/W+/gjtdZeg3eyJ+0fY=",
"vendorSha256": "sha256-2w8o0Fc61ayyUyE4RVcmV4A0heuaIXnOZX040l2ws/Y=",
"version": "1.166.0"
},
"ansible": {
"owner": "nbering",
@ -103,10 +103,10 @@
"owner": "hashicorp",
"provider-source-address": "registry.terraform.io/hashicorp/aws",
"repo": "terraform-provider-aws",
"rev": "v4.12.1",
"sha256": "sha256-z19DTiio6dXIgTmOxehOjIno6XhSUIS/YFtXKocq2Kk=",
"vendorSha256": "sha256-zxOiLStuGuylsKTJteR/9Xs/XcVgDlihCBmnMNLTTd4=",
"version": "4.12.1"
"rev": "v4.13.0",
"sha256": "sha256-KEu+7hKMWsrpS1WYxj3El7M43Chy9HTBjePhWO6bXMo=",
"vendorSha256": "sha256-Ez6uCriNm1OJ2EyMAyjXihzJ/Pzf2p/oAvJ3HN6fDnA=",
"version": "4.13.0"
},
"azuread": {
"owner": "hashicorp",
@ -121,10 +121,10 @@
"owner": "hashicorp",
"provider-source-address": "registry.terraform.io/hashicorp/azurerm",
"repo": "terraform-provider-azurerm",
"rev": "v3.4.0",
"sha256": "sha256-hfjwlW7tbs/b7mvtbmFnNXr82b2exCRC4WxfCdZ6bbw=",
"rev": "v3.5.0",
"sha256": "sha256-LF2Mqj/w1AtoYVGkZJsFpz81cfoUR80PURIsYoIYfsI=",
"vendorSha256": null,
"version": "3.4.0"
"version": "3.5.0"
},
"azurestack": {
"owner": "hashicorp",
@ -175,10 +175,10 @@
"owner": "buildkite",
"provider-source-address": "registry.terraform.io/buildkite/buildkite",
"repo": "terraform-provider-buildkite",
"rev": "v0.8.0",
"sha256": "1v4kzsvzkzf0bb6vpyjh0n2kbcfrqa193idvm4jgbcrdb0y3xzn5",
"vendorSha256": "12kqjpyy80pfrasicmdi1f43mr846rad3c6xaa4dvzn7hq640q5j",
"version": "0.8.0"
"rev": "v0.9.0",
"sha256": "sha256-k7caRT/9YA198I6K3Qv3UcyQiULpOvJ3Smc816sKHkQ=",
"vendorSha256": "sha256-smBADIbH/t2IUt2w0VQ2BOU6iAuxVRa1yu4C5P2VeIo=",
"version": "0.9.0"
},
"checkly": {
"owner": "checkly",
@ -208,14 +208,23 @@
"vendorSha256": null,
"version": "1.3.0"
},
"cloudamqp": {
"owner": "cloudamqp",
"provider-source-address": "registry.terraform.io/cloudamqp/cloudamqp",
"repo": "terraform-provider-cloudamqp",
"rev": "v1.15.3",
"sha256": "sha256-aQVv/4shdh3AQFTbw1iayNBSGuwDAQ7WUixMeUvAJ0U=",
"vendorSha256": "sha256-Anrcj23MvAk5m3LrGTANBhY6zB46U0st6vMZy2g7Gag=",
"version": "1.15.3"
},
"cloudflare": {
"owner": "cloudflare",
"provider-source-address": "registry.terraform.io/cloudflare/cloudflare",
"repo": "terraform-provider-cloudflare",
"rev": "v3.13.0",
"sha256": "sha256-ZG8F6cbJOmQdtudkVUGjKsq2Hs4uYlb/pxrF6Fkk4w0=",
"vendorSha256": "sha256-4usFr3aseHGGUa/bseSRAjE1NTZxh8UXPd66HG3hwOM=",
"version": "3.13.0"
"rev": "v3.14.0",
"sha256": "sha256-WjtAqL4gzr7NdRLf7mr6OULee35kyyZpr5crR514Mak=",
"vendorSha256": "sha256-xqjhSu1bUSpQ1A2Ga2IS2fdyIXcnt/nbQNXhcxVi22Q=",
"version": "3.14.0"
},
"cloudfoundry": {
"owner": "cloudfoundry-community",
@ -339,10 +348,10 @@
"owner": "dome9",
"provider-source-address": "registry.terraform.io/dome9/dome9",
"repo": "terraform-provider-dome9",
"rev": "v1.25.3",
"sha256": "sha256-0Pde+xVToBP5gavr0ckEIUmgCmRBbqSP5C0YkMthQGQ=",
"rev": "v1.25.4",
"sha256": "sha256-s/wglGsk/Lm45PWmqNHiVjj6sfQzXue+GnjEALp5yDc=",
"vendorSha256": null,
"version": "1.25.3"
"version": "1.25.4"
},
"elasticsearch": {
"owner": "phillbaker",
@ -411,39 +420,39 @@
"owner": "integrations",
"provider-source-address": "registry.terraform.io/integrations/github",
"repo": "terraform-provider-github",
"rev": "v4.24.1",
"sha256": "sha256-1fwHMN2HIVl+8ZL7OtP1U5ORc41e7Tm3qEpMqIgWL20=",
"rev": "v4.25.0-alpha",
"sha256": "sha256-9BE19VywtNIeDfjBKzle5nGFPmpS8lHV60w0h2xTztU=",
"vendorSha256": null,
"version": "4.24.1"
"version": "4.25.0-alpha"
},
"gitlab": {
"owner": "gitlabhq",
"provider-source-address": "registry.terraform.io/gitlabhq/gitlab",
"repo": "terraform-provider-gitlab",
"rev": "v3.13.0",
"sha256": "sha256-Rm7j290Pr65F6JqSNpjK8bR1EhXev/74MpUa7SRNf3o=",
"vendorSha256": "sha256-hlcJn54paYJ1nlmqirOvC3Z4y8cMqv6etlDdihV9+R4=",
"version": "3.13.0"
"rev": "v3.14.0",
"sha256": "sha256-KUlFEVeST/ujerpkjHYzdROwkFD4ASx0juHOKWKM14o=",
"vendorSha256": "sha256-M03+MK7YB3IPHA/w+yrO6YohPzknCmhguO5b25qzDzw=",
"version": "3.14.0"
},
"google": {
"owner": "hashicorp",
"provider-source-address": "registry.terraform.io/hashicorp/google",
"proxyVendor": true,
"repo": "terraform-provider-google",
"rev": "v4.19.0",
"sha256": "sha256-b6oEKiz8REeJIDFLDI80+kA4f32KRjZy/GhKg0qeN24=",
"rev": "v4.20.0",
"sha256": "sha256-eZNa6V3aVtEgTZgTNgB4EUK3S6iKfk9qI7OnAQ5Mbp4=",
"vendorSha256": "sha256-l2OviwplP/Sg2ShaEA88pMwVTkREnLkFAzterjr2kvU=",
"version": "4.19.0"
"version": "4.20.0"
},
"google-beta": {
"owner": "hashicorp",
"provider-source-address": "registry.terraform.io/hashicorp/google-beta",
"proxyVendor": true,
"repo": "terraform-provider-google-beta",
"rev": "v4.19.0",
"sha256": "sha256-MPB/ca0GIIs7yEfIyqeOkzK2mkEdkE/DkEbaSqpaF0U=",
"rev": "v4.20.0",
"sha256": "sha256-Dr3G7KskfL+4WNOPL3SZCKf+Lo6wP3XS1JrlC6Mv3O8=",
"vendorSha256": "sha256-l2OviwplP/Sg2ShaEA88pMwVTkREnLkFAzterjr2kvU=",
"version": "4.19.0"
"version": "4.20.0"
},
"grafana": {
"owner": "grafana",
@ -494,10 +503,10 @@
"owner": "loafoe",
"provider-source-address": "registry.terraform.io/loafoe/htpasswd",
"repo": "terraform-provider-htpasswd",
"rev": "v1.0.1",
"sha256": "sha256-RUkPIsKVMooGy2hYsNFkctMFdJ8MEbtbMB9Qak6HJgQ=",
"vendorSha256": "sha256-4P3IX7KGDqcWVYRiD6tXoEjF/phI89rz5QdR09xtnAo=",
"version": "1.0.1"
"rev": "v1.0.2",
"sha256": "sha256-U8rArNTOmiB06Vrvet6PnkIuylRzswJvVptijvcuVFQ=",
"vendorSha256": "sha256-rotGWkaNbsU+9tGENvkNkR7C3d6334hfPNcvJaZDSKw=",
"version": "1.0.2"
},
"http": {
"owner": "hashicorp",
@ -539,10 +548,10 @@
"owner": "IBM-Cloud",
"provider-source-address": "registry.terraform.io/IBM-Cloud/ibm",
"repo": "terraform-provider-ibm",
"rev": "v1.41.0-beta0",
"sha256": "sha256-0SANOw6mSXnH/bLRZRjG2R9aPTsp8jZvqYNNtNsiYPw=",
"rev": "v1.41.0",
"sha256": "sha256-5kHoTmQlEzTSjDnAJPdEN2y+DF9gB2BHJFHEYLh6h48=",
"vendorSha256": "sha256-8s32A0qgODZZy3rSrHnnBkQyKLBj0fcCBJ9ja9gXc5Q=",
"version": "1.41.0-beta0"
"version": "1.41.0"
},
"icinga2": {
"owner": "Icinga",
@ -584,10 +593,10 @@
"owner": "mrparkers",
"provider-source-address": "registry.terraform.io/mrparkers/keycloak",
"repo": "terraform-provider-keycloak",
"rev": "v3.7.0",
"sha256": "1qzdm0jgk6f0zyjbv5qaq24h9a37bgb4ghym61vg763lqra69als",
"vendorSha256": "1q5z54rz5lqgdv9gfl20gfnzi4in0d65jkfxnmmsx6fjcb9ih4p6",
"version": "3.7.0"
"rev": "v3.8.0",
"sha256": "sha256-TVSP0oORtiVkPGjgiHHJAsaWDhlN5lnpC3eJ4Ogf2Ss=",
"vendorSha256": "sha256-8x0MlwAzeA2O6wXXHSk++K0ePmzE9/2lfo2ID83LzRM=",
"version": "3.8.0"
},
"ksyun": {
"owner": "kingsoftcloud",
@ -620,10 +629,10 @@
"owner": "launchdarkly",
"provider-source-address": "registry.terraform.io/launchdarkly/launchdarkly",
"repo": "terraform-provider-launchdarkly",
"rev": "v2.6.1",
"sha256": "sha256-pdANr7W4d6+8WdAxcqSTpyEIshd6FVYy0+25wfDt4d8=",
"rev": "v2.7.0",
"sha256": "sha256-V7osiBlNDzJbmVUUhpRUi9tnoY1HccdZ5ub83ciSvbY=",
"vendorSha256": "sha256-HKea86ck97uc/Gv6geJm9TTRfG6bnpB+q8cuU/jubI8=",
"version": "2.6.1"
"version": "2.7.0"
},
"libvirt": {
"owner": "dmacvicar",
@ -638,10 +647,10 @@
"owner": "linode",
"provider-source-address": "registry.terraform.io/linode/linode",
"repo": "terraform-provider-linode",
"rev": "v1.27.0",
"sha256": "sha256-m2dD/BP5oNRUge3SXhSIptrQhj3Sez4O3hIdrJn45Y4=",
"rev": "v1.27.1",
"sha256": "sha256-rEXGKytKdlHO3RcZT+3e85cGfQ6b7mhdcFK+unw44ug=",
"vendorSha256": "sha256-ZJQAZk4TaKT+hLM46gtV1XmBCtwuKwtoom9tPGaOWhc=",
"version": "1.27.0"
"version": "1.27.1"
},
"linuxbox": {
"owner": "numtide",
@ -674,10 +683,10 @@
"owner": "terraform-lxd",
"provider-source-address": "registry.terraform.io/terraform-lxd/lxd",
"repo": "terraform-provider-lxd",
"rev": "v1.7.1",
"sha256": "0r1d0d6fp3rihxhfsxlay0dqp5rmnja9s369msra8jylqyharnrh",
"vendorSha256": "11x12jxh4q99hinpljqfchysgkhch93sgv0mz065ws20y0dxzfvs",
"version": "1.7.1"
"rev": "v1.7.2",
"sha256": "sha256-rNqlPyKpBNaIRtiNHB8U8jowWhqdQtDIMxreZ5Dfm3E=",
"vendorSha256": "sha256-ervfG/BAaF4M+BXsp0eCDM6nPWQOS3pthClhArsUoYc=",
"version": "1.7.2"
},
"mailgun": {
"owner": "wgebis",
@ -737,10 +746,10 @@
"owner": "NaverCloudPlatform",
"provider-source-address": "registry.terraform.io/NaverCloudPlatform/ncloud",
"repo": "terraform-provider-ncloud",
"rev": "v2.2.6",
"sha256": "sha256-Sw3Z6hi+nm/e+lMQQkk8KIa2AK2+q+0gBUe091GnQq0=",
"rev": "v2.2.7",
"sha256": "sha256-5WZOZBFZkJtPdWmxznv/ML6d+UTr+qw+SbBuaG+bGS8=",
"vendorSha256": "sha256-ovHg4GcbMzjEi+qJBpdqhR0YUakZCdnpc10SCu8FP8I=",
"version": "2.2.6"
"version": "2.2.7"
},
"netlify": {
"owner": "AegirHealth",
@ -755,10 +764,10 @@
"owner": "newrelic",
"provider-source-address": "registry.terraform.io/newrelic/newrelic",
"repo": "terraform-provider-newrelic",
"rev": "v2.43.4",
"sha256": "sha256-7ckPPU5ieVEZogW7lWd5vMHyXSlTuSqXj1suxKfEyis=",
"vendorSha256": "sha256-HhjTcdw8LbwMJ7P5LcZtgtEojLsqnsiBDrRIp62EZhQ=",
"version": "2.43.4"
"rev": "v2.44.0",
"sha256": "sha256-CR1GPm8K/9ZOFYvgKqMW63sbnRx0HyAYYESC/ZnBNYI=",
"vendorSha256": "sha256-2m5T6+GJTUDS345GDOW7Yf8X+JpxvtdYvInBjNvNXlg=",
"version": "2.44.0"
},
"nomad": {
"owner": "hashicorp",
@ -801,28 +810,28 @@
"owner": "nutanix",
"provider-source-address": "registry.terraform.io/nutanix/nutanix",
"repo": "terraform-provider-nutanix",
"rev": "v1.5.0-beta.2",
"sha256": "sha256-eC42HXh8Tk3TXWtdeVbv4UGMss3lh4vYyGPypB353X0=",
"rev": "v1.5.0",
"sha256": "sha256-H8wLMLBB4pSbiilmP9C0WPn62fCYHgPhy8OlvtrUYro=",
"vendorSha256": "sha256-LRIfxQGwG988HE5fftGl6JmBG7tTknvmgpm4Fu1NbWI=",
"version": "1.5.0-beta.2"
"version": "1.5.0"
},
"oci": {
"owner": "oracle",
"provider-source-address": "registry.terraform.io/oracle/oci",
"repo": "terraform-provider-oci",
"rev": "v4.73.0",
"sha256": "sha256-duONflOa+ZmWNAOZTcjLJUaeIUSiDR3VC4+SC4UXBBg=",
"rev": "v4.74.0",
"sha256": "sha256-hZpEhhI2pqOPLQm6XnVGIccyC1kVmLusUzF3KRbAHys=",
"vendorSha256": null,
"version": "4.73.0"
"version": "4.74.0"
},
"okta": {
"owner": "okta",
"provider-source-address": "registry.terraform.io/okta/okta",
"repo": "terraform-provider-okta",
"rev": "v3.25.1",
"sha256": "sha256-+XCpk/vfAD8TWxMdi/WqXxDEh6cEZ684Zr+vkHnNMsI=",
"rev": "v3.26.0",
"sha256": "sha256-Mnc3JZtKNOB9VpsjXq8WiZz0+zmTmFRfOY23F186tw4=",
"vendorSha256": "sha256-LHiOQNFkMajqytrv387yIhAyCQCaG2Kw5OCI8Xe7u2k=",
"version": "3.25.1"
"version": "3.26.0"
},
"oktaasa": {
"owner": "oktadeveloper",
@ -927,10 +936,10 @@
"owner": "cyrilgdn",
"provider-source-address": "registry.terraform.io/cyrilgdn/postgresql",
"repo": "terraform-provider-postgresql",
"rev": "v1.15.0",
"sha256": "04gm7y5qyvipg0a0glgyx257vjrkk4k5pjrvzik6adyrjyidixw1",
"vendorSha256": "0pp9c76zdpfyq57jcwv258gipvmy6hjqi933xdi155hkx45cnixr",
"version": "1.15.0"
"rev": "v1.16.0",
"sha256": "sha256-nueqs2SJZxGNzm/gv/mBo8geXI8nZqmDFQ0e539oV2M=",
"vendorSha256": "sha256-o2+Uuz0dStf33WZuTFLkJX5rg4G7sJ23/+q+xtQ4mhE=",
"version": "1.16.0"
},
"powerdns": {
"owner": "pan-net",
@ -999,10 +1008,10 @@
"owner": "selectel",
"provider-source-address": "registry.terraform.io/selectel/selectel",
"repo": "terraform-provider-selectel",
"rev": "v3.8.1",
"sha256": "sha256-542fWLMJ9nO3Pu/QpUFZtu2eQoQOaAjaaK3aqtyoJPQ=",
"rev": "v3.8.2",
"sha256": "sha256-Lp2ptLuN/+/fcqeSbIMmL4dmOCoplyZeA10wAsCnYlg=",
"vendorSha256": "sha256-kmsO9jFoR/93PkOeIo0pkS/OjE+m3QbIspobAv/9+KI=",
"version": "3.8.1"
"version": "3.8.2"
},
"sentry": {
"owner": "jianyuan",
@ -1026,10 +1035,10 @@
"owner": "splunk-terraform",
"provider-source-address": "registry.terraform.io/splunk-terraform/signalfx",
"repo": "terraform-provider-signalfx",
"rev": "v6.13.0",
"sha256": "sha256-te5+WjbvU7RV22o22iWu8rGEnBfPkZNzkigziOlxMQg=",
"rev": "v6.13.1",
"sha256": "sha256-OtWJgLObTaWCGOjxN8nlkmfW+D6EMS0esht/OkJaioM=",
"vendorSha256": "sha256-yWqUsObvABwmA6V9ecz8SFtk1Bhdq2/dUpnNLKQtuNM=",
"version": "6.13.0"
"version": "6.13.1"
},
"skytap": {
"owner": "skytap",
@ -1044,10 +1053,10 @@
"owner": "chanzuckerberg",
"provider-source-address": "registry.terraform.io/chanzuckerberg/snowflake",
"repo": "terraform-provider-snowflake",
"rev": "v0.32.0",
"sha256": "sha256-Y4apbAQ4Up1VoQxB9w/4EYwhFX9sqYNLLBVxyOqmffE=",
"rev": "v0.33.1",
"sha256": "sha256-xFtk1WbMe2/UFGB/ej6QEL07+dZTsWFmqvyVCa2YBw8=",
"vendorSha256": "sha256-l++IzY3/W4qsdFJY7ik0xF6tZWluLb4EcW5KQtBVY5s=",
"version": "0.32.0"
"version": "0.33.1"
},
"sops": {
"owner": "carlpett",
@ -1107,10 +1116,10 @@
"owner": "tencentcloudstack",
"provider-source-address": "registry.terraform.io/tencentcloudstack/tencentcloud",
"repo": "terraform-provider-tencentcloud",
"rev": "v1.71.0",
"sha256": "sha256-syj6fOBmErKsPQXYQ0U9bFC3butI06FJVLkD6RvWbFE=",
"rev": "v1.72.1",
"sha256": "sha256-vCCIHp8tpAn7PIIBMVXRSI9G420E1ijfYow9bfC3RKs=",
"vendorSha256": null,
"version": "1.71.0"
"version": "1.72.1"
},
"tfe": {
"owner": "hashicorp",

4
pkgs/applications/networking/instant-messengers/alfaview/default.nix
Unescape View File

@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
pname = "alfaview";
version = "8.43.0";
version = "8.44.0";
src = fetchurl {
url = "https://production-alfaview-assets.alfaview.com/stable/linux/${pname}_${version}.deb";
sha256 = "sha256-Rm1U3gxrToNCigL5AomftSUED7X3i7a6enmFnEzWV4c=";
sha256 = "sha256-6BhhUfULtCUO5jZFF+HxGuFCg0XojQ0NJUXHxMtnwN4=";
};
nativeBuildInputs = [

17
pkgs/applications/networking/instant-messengers/profanity/default.nix
Unescape View File

@ -18,21 +18,14 @@
, pkg-config
, readline
, sqlite
, autoAwaySupport ? true, libXScrnSaver ? null, libX11
, autoAwaySupport ? true, libXScrnSaver, libX11
, notifySupport ? true, libnotify, gdk-pixbuf
, omemoSupport ? true, libsignal-protocol-c, libgcrypt
, pgpSupport ? true, gpgme
, pythonPluginSupport ? true, python
, traySupport ? true, gtk
, pythonPluginSupport ? true, python3
, traySupport ? true, gtk3
}:
assert autoAwaySupport -> libXScrnSaver != null && libX11 != null;
assert notifySupport -> libnotify != null && gdk-pixbuf != null;
assert traySupport -> gtk != null;
assert pgpSupport -> gpgme != null;
assert pythonPluginSupport -> python != null;
assert omemoSupport -> libsignal-protocol-c != null && libgcrypt != null;
stdenv.mkDerivation rec {
pname = "profanity";
version = "0.12.0";
@ -75,8 +68,8 @@ stdenv.mkDerivation rec {
++ lib.optionals notifySupport [ libnotify gdk-pixbuf ]
++ lib.optionals omemoSupport [ libsignal-protocol-c libgcrypt ]
++ lib.optionals pgpSupport [ gpgme ]
++ lib.optionals pythonPluginSupport [ python ]
++ lib.optionals traySupport [ gtk ];
++ lib.optionals pythonPluginSupport [ python3 ]
++ lib.optionals traySupport [ gtk3 ];
# Enable feature flags, so that build fail if libs are missing
configureFlags = [

40
pkgs/applications/science/chemistry/gwyddion/default.nix
Unescape View File

@ -1,36 +1,22 @@
{ lib, stdenv, fetchurl, gtk2, pkg-config, fftw, file,
pythonSupport ? false, pythonPackages ? null,
gnome2 ? null,
openexrSupport ? true, openexr ? null,
libzipSupport ? true, libzip ? null,
libxml2Support ? true, libxml2 ? null,
libwebpSupport ? true, libwebp ? null,
pythonSupport ? false, python2Packages,
gnome2,
openexrSupport ? true, openexr,
libzipSupport ? true, libzip,
libxml2Support ? true, libxml2,
libwebpSupport ? true, libwebp,
# libXmu is not used if libunique is.
libXmuSupport ? false, xorg ? null,
libxsltSupport ? true, libxslt ? null,
fitsSupport ? true, cfitsio ? null,
zlibSupport ? true, zlib ? null,
libuniqueSupport ? true, libunique ? null,
libpngSupport ? true, libpng ? null,
libXmuSupport ? false, xorg,
libxsltSupport ? true, libxslt,
fitsSupport ? true, cfitsio,
zlibSupport ? true, zlib,
libuniqueSupport ? true, libunique,
libpngSupport ? true, libpng,
openglSupport ? !stdenv.isDarwin
}:
assert openexrSupport -> openexr != null;
assert libzipSupport -> libzip != null;
assert libxml2Support -> libxml2 != null;
assert libwebpSupport -> libwebp != null;
assert libXmuSupport -> xorg != null;
assert libxsltSupport -> libxslt != null;
assert fitsSupport -> cfitsio != null;
assert zlibSupport -> zlib != null;
assert libuniqueSupport -> libunique != null;
assert libpngSupport -> libpng != null;
assert openglSupport -> gnome2 != null;
assert pythonSupport -> (pythonPackages != null && gnome2 != null);
let
inherit (pythonPackages) pygtk pygobject2 python;
inherit (python2Packages) pygtk pygobject2 python;
in
stdenv.mkDerivation rec {

79
pkgs/applications/video/mplayer/default.nix
Unescape View File

@ -1,60 +1,37 @@
{ config, lib, stdenv, fetchurl, fetchsvn, pkg-config, freetype, yasm, ffmpeg
, aalibSupport ? true, aalib ? null
, fontconfigSupport ? true, fontconfig ? null, freefont_ttf ? null
, fribidiSupport ? true, fribidi ? null
, x11Support ? true, libX11 ? null, libXext ? null, libGLU, libGL ? null
, xineramaSupport ? true, libXinerama ? null
, xvSupport ? true, libXv ? null
, alsaSupport ? stdenv.isLinux, alsa-lib ? null
, screenSaverSupport ? true, libXScrnSaver ? null
, vdpauSupport ? false, libvdpau ? null
, cddaSupport ? !stdenv.isDarwin, cdparanoia ? null
, dvdnavSupport ? !stdenv.isDarwin, libdvdnav ? null
, dvdreadSupport ? true, libdvdread ? null
, bluraySupport ? true, libbluray ? null
, amrSupport ? false, amrnb ? null, amrwb ? null
, cacaSupport ? true, libcaca ? null
, lameSupport ? true, lame ? null
, speexSupport ? true, speex ? null
, theoraSupport ? true, libtheora ? null
, x264Support ? false, x264 ? null
, jackaudioSupport ? false, libjack2 ? null
, pulseSupport ? config.pulseaudio or false, libpulseaudio ? null
, bs2bSupport ? false, libbs2b ? null
, v4lSupport ? false, libv4l ? null
, aalibSupport ? true, aalib
, fontconfigSupport ? true, fontconfig, freefont_ttf
, fribidiSupport ? true, fribidi
, x11Support ? true, libX11, libXext, libGLU, libGL
, xineramaSupport ? true, libXinerama
, xvSupport ? true, libXv
, alsaSupport ? stdenv.isLinux, alsa-lib
, screenSaverSupport ? true, libXScrnSaver
, vdpauSupport ? false, libvdpau
, cddaSupport ? !stdenv.isDarwin, cdparanoia
, dvdnavSupport ? !stdenv.isDarwin, libdvdnav
, dvdreadSupport ? true, libdvdread
, bluraySupport ? true, libbluray
, amrSupport ? false, amrnb, amrwb
, cacaSupport ? true, libcaca
, lameSupport ? true, lame
, speexSupport ? true, speex
, theoraSupport ? true, libtheora
, x264Support ? false, x264
, jackaudioSupport ? false, libjack2
, pulseSupport ? config.pulseaudio or false, libpulseaudio
, bs2bSupport ? false, libbs2b
, v4lSupport ? false, libv4l
# For screenshots
, libpngSupport ? true, libpng ? null
, libjpegSupport ? true, libjpeg ? null
, libpngSupport ? true, libpng
, libjpegSupport ? true, libjpeg
, useUnfreeCodecs ? false
, darwin ? null
, darwin
, buildPackages
}:
assert fontconfigSupport -> (fontconfig != null);
assert (!fontconfigSupport) -> (freefont_ttf != null);
assert fribidiSupport -> (fribidi != null);
assert x11Support -> (libX11 != null && libXext != null && libGLU != null && libGL != null);
assert xineramaSupport -> (libXinerama != null && x11Support);
assert xvSupport -> (libXv != null && x11Support);
assert alsaSupport -> alsa-lib != null;
assert screenSaverSupport -> libXScrnSaver != null;
assert vdpauSupport -> libvdpau != null;
assert cddaSupport -> cdparanoia != null;
assert dvdnavSupport -> libdvdnav != null;
assert dvdreadSupport -> libdvdread != null;
assert bluraySupport -> libbluray != null;
assert amrSupport -> (amrnb != null && amrwb != null);
assert cacaSupport -> libcaca != null;
assert lameSupport -> lame != null;
assert speexSupport -> speex != null;
assert theoraSupport -> libtheora != null;
assert x264Support -> x264 != null;
assert jackaudioSupport -> libjack2 != null;
assert pulseSupport -> libpulseaudio != null;
assert bs2bSupport -> libbs2b != null;
assert libpngSupport -> libpng != null;
assert libjpegSupport -> libjpeg != null;
assert v4lSupport -> libv4l != null;
assert xineramaSupport -> x11Support;
assert xvSupport -> x11Support;
let

8
pkgs/development/interpreters/supercollider/default.nix
Unescape View File

@ -1,4 +1,4 @@
{ lib, stdenv, mkDerivation, fetchurl, cmake
{ lib, stdenv, mkDerivation, fetchurl, fetchpatch, cmake
, pkg-config, alsa-lib, libjack2, libsndfile, fftw
, curl, gcc, libXt, qtbase, qttools, qtwebengine
, readline, qtwebsockets, useSCEL ? false, emacs
@ -18,6 +18,12 @@ mkDerivation rec {
patches = [
# add support for SC_DATA_DIR and SC_PLUGIN_DIR env vars to override compile-time values
./supercollider-3.12.0-env-dirs.patch
# fix issue with libsndfile >=1.1.0
(fetchpatch {
url = "https://github.com/supercollider/supercollider/commit/b9dd70c4c8d61c93d7a70645e0bd18fa76e6834e.patch";
hash = "sha256-6FhEHyY0rnE6d7wC+v0U9K+L0aun5LkTqaEFhr3eQNw=";
})
];
nativeBuildInputs = [ cmake pkg-config qttools ];

19
pkgs/development/libraries/aravis/default.nix
Unescape View File

@ -1,13 +1,13 @@
{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, gtk-doc, intltool
, audit, glib, libusb1, libxml2
, wrapGAppsHook
, gstreamer ? null
, gst-plugins-base ? null
, gst-plugins-good ? null
, gst-plugins-bad ? null
, libnotify ? null
, gnome ? null
, gtk3 ? null
, gstreamer
, gst-plugins-base
, gst-plugins-good
, gst-plugins-bad
, libnotify
, gnome
, gtk3
, enableUsb ? true
, enablePacketSocket ? true
, enableViewer ? true
@ -23,11 +23,7 @@ let
(pkg: pkg != null && lib.versionAtLeast (lib.getVersion pkg) "1.0")
[ gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad ];
in
assert enableGstPlugin -> lib.all (pkg: pkg != null) [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad ];
assert enableViewer -> enableGstPlugin;
assert enableViewer -> libnotify != null;
assert enableViewer -> gnome != null;
assert enableViewer -> gtk3 != null;
assert enableViewer -> gstreamerAtLeastVersion1;
stdenv.mkDerivation rec {
@ -87,4 +83,3 @@ in
platforms = lib.platforms.unix;
};
}

10
pkgs/development/libraries/gloox/default.nix
Unescape View File

@ -1,13 +1,9 @@
{ lib, stdenv, fetchurl
, zlibSupport ? true, zlib ? null
, sslSupport ? true, openssl ? null
, idnSupport ? true, libidn ? null
, zlibSupport ? true, zlib
, sslSupport ? true, openssl
, idnSupport ? true, libidn
}:
assert zlibSupport -> zlib != null;
assert sslSupport -> openssl != null;
assert idnSupport -> libidn != null;
with lib;
stdenv.mkDerivation rec{

13
pkgs/development/libraries/lame/default.nix
Unescape View File

@ -1,21 +1,16 @@
{ lib, stdenv, fetchurl
, nasmSupport ? true, nasm ? null # Assembly optimizations
, nasmSupport ? true, nasm # Assembly optimizations
, cpmlSupport ? true # Compaq's fast math library
#, efenceSupport ? false, libefence ? null # Use ElectricFence for malloc debugging
, sndfileFileIOSupport ? false, libsndfile ? null # Use libsndfile, instead of lame's internal routines
#, efenceSupport ? false, libefence # Use ElectricFence for malloc debugging
, sndfileFileIOSupport ? false, libsndfile # Use libsndfile, instead of lame's internal routines
, analyzerHooksSupport ? true # Use analyzer hooks
, decoderSupport ? true # mpg123 decoder
, frontendSupport ? true # Build the lame executable
#, mp3xSupport ? false, gtk1 ? null # Build GTK frame analyzer
#, mp3xSupport ? false, gtk1 # Build GTK frame analyzer
, mp3rtpSupport ? false # Build mp3rtp
, debugSupport ? false # Debugging (disables optimizations)
}:
assert nasmSupport -> (nasm != null);
#assert efenceSupport -> (libefence != null);
assert sndfileFileIOSupport -> (libsndfile != null);
#assert mp3xSupport -> (analyzerHooksSupport && (gtk1 != null));
let
mkFlag = optSet: flag: if optSet then "--enable-${flag}" else "--disable-${flag}";
in

16
pkgs/development/libraries/libbluray/default.nix
Unescape View File

@ -1,19 +1,13 @@
{ lib, stdenv, fetchurl, pkg-config, fontconfig, autoreconfHook, DiskArbitration
, withJava ? false, jdk ? null, ant ? null
, withAACS ? false, libaacs ? null
, withBDplus ? false, libbdplus ? null
, withMetadata ? true, libxml2 ? null
, withFonts ? true, freetype ? null
, withJava ? false, jdk, ant
, withAACS ? false, libaacs
, withBDplus ? false, libbdplus
, withMetadata ? true, libxml2
, withFonts ? true, freetype
}:
with lib;
assert withJava -> jdk != null && ant != null;
assert withAACS -> libaacs != null;
assert withBDplus -> libbdplus != null;
assert withMetadata -> libxml2 != null;
assert withFonts -> freetype != null;
# Info on how to use:
# https://wiki.archlinux.org/index.php/BluRay

16
pkgs/development/libraries/libwebp/default.nix
Unescape View File

@ -1,10 +1,10 @@
{ lib, stdenv, fetchFromGitHub, autoreconfHook, libtool
, threadingSupport ? true # multi-threading
, openglSupport ? false, freeglut ? null, libGL ? null, libGLU ? null # OpenGL (required for vwebp)
, pngSupport ? true, libpng ? null # PNG image format
, jpegSupport ? true, libjpeg ? null # JPEG image format
, tiffSupport ? true, libtiff ? null # TIFF image format
, gifSupport ? true, giflib ? null # GIF image format
, openglSupport ? false, freeglut, libGL, libGLU # OpenGL (required for vwebp)
, pngSupport ? true, libpng # PNG image format
, jpegSupport ? true, libjpeg # JPEG image format
, tiffSupport ? true, libtiff # TIFF image format
, gifSupport ? true, giflib # GIF image format
#, wicSupport ? true # Windows Imaging Component
, alignedSupport ? false # Force aligned memory operations
, swap16bitcspSupport ? false # Byte swap for 16bit color spaces
@ -14,12 +14,6 @@
, libwebpdecoderSupport ? true # Build libwebpdecoder
}:
assert openglSupport -> freeglut != null && libGL != null && libGLU != null;
assert pngSupport -> (libpng != null);
assert jpegSupport -> (libjpeg != null);
assert tiffSupport -> (libtiff != null);
assert gifSupport -> (giflib != null);
let
mkFlag = optSet: flag: if optSet then "--enable-${flag}" else "--disable-${flag}";
in

38
pkgs/development/libraries/nghttp2/default.nix
Unescape View File

@ -6,15 +6,15 @@
# Optional dependencies
, enableApp ? with stdenv.hostPlatform; !isWindows && !isStatic
, c-ares ? null, libev ? null, openssl ? null, zlib ? null
, enableAsioLib ? false, boost ? null
, enableGetAssets ? false, libxml2 ? null
, enableHpack ? false, jansson ? null
, enableJemalloc ? false, jemalloc ? null
, enablePython ? false, python ? null, cython ? null, ncurses ? null, setuptools ? null
, c-ares, libev, openssl, zlib
, enableAsioLib ? false, boost
, enableGetAssets ? false, libxml2
, enableHpack ? false, jansson
, enableJemalloc ? false, jemalloc
, enablePython ? false, python3Packages, ncurses
# Unit tests ; we have to set TZDIR, which is a GNUism.
, enableTests ? stdenv.hostPlatform.isGnu, cunit ? null, tzdata ? null
, enableTests ? stdenv.hostPlatform.isGnu, cunit, tzdata
# downstream dependencies, for testing
, curl
@ -25,13 +25,9 @@
# All mutable patches (generated by GitHub or cgit) that are needed here
# should be included directly in Nixpkgs as files.
assert enableApp -> c-ares != null && libev != null && openssl != null && zlib != null;
assert enableAsioLib -> boost != null;
assert enableGetAssets -> enableApp == true && libxml2 != null;
assert enableHpack -> enableApp == true && jansson != null;
assert enableJemalloc -> enableApp == true && jemalloc != null;
assert enablePython -> python != null && cython != null && ncurses != null && setuptools != null;
assert enableTests -> cunit != null && tzdata != null;
assert enableGetAssets -> enableApp;
assert enableHpack -> enableApp;
assert enableJemalloc -> enableApp;
stdenv.mkDerivation rec {
pname = "nghttp2";
@ -47,14 +43,14 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkg-config ]
++ lib.optionals (enableApp) [ installShellFiles ]
++ lib.optionals (enablePython) [ cython ];
++ lib.optionals (enablePython) [ python3Packages.cython ];
buildInputs = lib.optionals enableApp [ c-ares libev openssl zlib ]
++ lib.optionals (enableAsioLib) [ boost ]
++ lib.optionals (enableGetAssets) [ libxml2 ]
++ lib.optionals (enableHpack) [ jansson ]
++ lib.optionals (enableJemalloc) [ jemalloc ]
++ lib.optionals (enablePython) [ python ncurses setuptools ];
++ lib.optionals (enablePython) [ python3Packages.python ncurses python3Packages.setuptools ];
enableParallelBuilding = true;
@ -62,7 +58,7 @@ stdenv.mkDerivation rec {
"--disable-examples"
(lib.enableFeature enableApp "app")
] ++ lib.optionals (enableAsioLib) [ "--enable-asio-lib" "--with-boost-libdir=${boost}/lib" ]
++ lib.optionals (enablePython) [ "--with-cython=${cython}/bin/cython" ];
++ lib.optionals (enablePython) [ "--with-cython=${python3Packages.cython}/bin/cython" ];
# Unit tests require CUnit and setting TZDIR environment variable
doCheck = enableTests;
@ -72,13 +68,13 @@ stdenv.mkDerivation rec {
'';
preInstall = lib.optionalString (enablePython) ''
mkdir -p $out/${python.sitePackages}
mkdir -p $out/${python3Packages.python.sitePackages}
# convince installer it's ok to install here
export PYTHONPATH="$PYTHONPATH:$out/${python.sitePackages}"
export PYTHONPATH="$PYTHONPATH:$out/${python3Packages.python.sitePackages}"
'';
postInstall = lib.optionalString (enablePython) ''
mkdir -p $python/${python.sitePackages}
mv $out/${python.sitePackages}/* $python/${python.sitePackages}
mkdir -p $python/${python3Packages.python.sitePackages}
mv $out/${python3Packages.python.sitePackages}/* $python/${python3Packages.python.sitePackages}
rm -r $out/lib
'' + lib.optionalString (enableApp) ''
installShellCompletion --bash doc/bash_completion/{h2load,nghttp,nghttpd,nghttpx}

1
pkgs/development/libraries/science/math/itpp/default.nix
Unescape View File

@ -28,6 +28,7 @@ stdenv.mkDerivation rec {
];
cmakeFlags = [
"-DCMAKE_CXX_FLAGS=-std=c++11"
"-DBLAS_FOUND:BOOL=TRUE"
"-DBLAS_LIBRARIES:STRING=${blas}/lib/libblas.so"
"-DLAPACK_FOUND:BOOL=TRUE"

10
pkgs/development/libraries/tachyon/default.nix
Unescape View File

@ -1,16 +1,12 @@
{ lib, stdenv
, fetchurl
, Carbon ? null
, libjpeg ? null
, libpng ? null
, Carbon
, libjpeg
, libpng
, withJpegSupport ? true # support jpeg output
, withPngSupport ? true # support png output
}:
assert withJpegSupport -> libjpeg != null;
assert withPngSupport -> libpng != null;
assert stdenv.isDarwin -> Carbon != null;
stdenv.mkDerivation rec {
pname = "tachyon";
version = "0.99.4";

1
pkgs/development/tools/aws-sam-cli/default.nix
Unescape View File

@ -44,6 +44,7 @@ python3.pkgs.buildPythonApplication rec {
--replace "dateparser~=1.0" "dateparser>=0.7" \
--replace "docker~=4.2.0" "docker>=4.2.0" \
--replace "Flask~=1.1.2" "Flask~=2.0" \
--replace "jmespath~=0.10.0" "jmespath" \
--replace "PyYAML~=5.3" "PyYAML #" \
--replace "regex==" "regex #" \
--replace "requests==" "requests #" \

8
pkgs/development/tools/profiling/pprof/default.nix
Unescape View File

@ -5,16 +5,16 @@
buildGoModule rec {
pname = "pprof";
version = "unstable-2021-09-30";
version = "unstable-2022-05-09";
src = fetchFromGitHub {
owner = "google";
repo = "pprof";
rev = "7fe48b4c820be13151ae35ce5a5e3f54f1b53eef";
sha256 = "05nr3igdigs1586qplwfm17hfw0v81jy745g6vayq7cbplljfjb1";
rev = "59ca7ad80af3faf4f87f4d82ff02f5d390c08ed6";
sha256 = "0jni73ila3glg7rl11v0al947d94dd0syhkjqnliaryh8dkxbx80";
};
vendorSha256 = "0yl8y3m2ia3cwxhmg1km8358a0225khimv6hcvras8r2glm69h3f";
vendorSha256 = "0vr8jp3kxgadb73g67plfrl5dkxfwrxaxjs664918jssy25vyk2y";
meta = with lib; {
description = "A tool for visualization and analysis of profiling data";

8
pkgs/development/tools/rust/cargo-feature/default.nix
Unescape View File

@ -2,21 +2,21 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-feature";
version = "0.6.0";
version = "0.7.0";
src = fetchFromGitHub {
owner = "Riey";
repo = pname;
rev = "v${version}";
sha256 = "sha256-9TP67YtvRtgLtsKACL5xjXq5kZtYpTWsTqQsbOKPwtY=";
sha256 = "sha256-UPpqkz/PwoMaJan9itfldjyTmZmiMb6PzCyu9Vtjj1s=";
};
cargoSha256 = "sha256-MkLsQebQdqfUuARIdQZg47kMPudstJUgRQgUuovoLes=";
cargoSha256 = "sha256-8qrpW/gU7BvxN3nSbFWhbgu5bwsdzYZTS3w3kcwsGbU=";
buildInputs = lib.optional stdenv.isDarwin libiconv;
meta = with lib; {
description = "Allows conveniently modify features of crate";
description = "Cargo plugin to manage dependency features";
homepage = "https://github.com/Riey/cargo-feature";
license = licenses.mit;
platforms = platforms.unix;

2
pkgs/games/asc/default.nix
Unescape View File

@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
configureFlags = [ "--disable-paragui" "--disable-paraguitest" ];
NIX_CFLAGS_COMPILE = "-fpermissive -Wno-error=narrowing"; # I'm too lazy to catch all gcc47-related problems
NIX_CFLAGS_COMPILE = "-fpermissive -Wno-error=narrowing -std=c++11"; # I'm too lazy to catch all gcc47-related problems
hardeningDisable = [ "format" ];
buildInputs = [

13
pkgs/games/openmw/default.nix
Unescape View File

@ -1,6 +1,7 @@
{ lib
, mkDerivation
, fetchFromGitHub
, fetchpatch
, cmake
, pkg-config
, wrapQtAppsHook
@ -55,6 +56,13 @@ mkDerivation rec {
sha256 = "sha256-Xq9hDUTCQr79Zzjk0CsiXclVTHK6nrSowukIQqVdrKY=";
};
patches = [
(fetchpatch {
url = "https://gitlab.com/OpenMW/openmw/-/merge_requests/1239.diff";
sha256 = "sha256-RhbIGeE6GyqnipisiMTwWjcFnIiR055hUPL8IkjPgZw=";
})
];
nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ];
buildInputs = [
@ -83,10 +91,5 @@ mkDerivation rec {
license = licenses.gpl3Plus;
maintainers = with maintainers; [ abbradar marius851000 ];
platforms = platforms.linux;
# 2021-10-13, doesn't compile with glibc-2.34, maintainers prefer a fix on glibc's end.
# Can be marked as un-broken as soon as https://gitlab.com/OpenMW/openmw/-/merge_requests/1239
# is resolved and a patch is appliable here.
broken = true;
};
}

3
pkgs/games/openmw/tes3mp.nix
Unescape View File

@ -87,7 +87,7 @@ let
'';
# https://github.com/TES3MP/openmw-tes3mp/issues/552
patches = [ ./tes3mp.patch ];
patches = oldAttrs.patches ++ [ ./tes3mp.patch ];
NIX_CFLAGS_COMPILE = "-fpermissive";
@ -108,6 +108,7 @@ let
license = licenses.gpl3Only;
maintainers = with maintainers; [ peterhoeg ];
platforms = [ "x86_64-linux" "i686-linux" ];
broken = true;
};
});

11
pkgs/servers/freeradius/default.nix
Unescape View File

@ -20,16 +20,7 @@
, withYubikey ? false, libyubikey
}:
assert withSqlite -> sqlite != null;
assert withLdap -> openldap != null;
assert withPcap -> libpcap != null;
assert withCap -> libcap != null;
assert withMemcached -> libmemcached != null;
assert withRedis -> hiredis != null;
assert withMysql -> libmysqlclient != null;
assert withYubikey -> libyubikey != null;
assert withCollectd -> collectd != null;
assert withRest -> curl != null && withJson;
assert withRest -> withJson;
stdenv.mkDerivation rec {
pname = "freeradius";

6
pkgs/tools/audio/mpdris2/default.nix
Unescape View File

@ -11,7 +11,7 @@
python3.pkgs.buildPythonApplication rec {
pname = "mpDris2";
version = "0.8";
version = "0.9.1";
format = "other";
strictDeps = false; # https://github.com/NixOS/nixpkgs/issues/56943
@ -19,7 +19,7 @@ python3.pkgs.buildPythonApplication rec {
owner = "eonpatapon";
repo = pname;
rev = version;
sha256 = "048b8acsd1b8kcxzd9fsh5p9g2an9c4rznicfcpyrsjz5syv894h";
sha256 = "sha256-1Y6K3z8afUXeKhZzeiaEF3yqU0Ef7qdAj9vAkRlD2p8=";
};
preConfigure = ''
@ -49,7 +49,7 @@ python3.pkgs.buildPythonApplication rec {
description = "MPRIS 2 support for mpd";
homepage = "https://github.com/eonpatapon/mpDris2/";
license = licenses.gpl3;
maintainers = with maintainers; [];
maintainers = with maintainers; [ ];
platforms = platforms.unix;
};
}

2
pkgs/tools/misc/recutils/default.nix
Unescape View File

@ -15,6 +15,8 @@ stdenv.mkDerivation rec {
hash = "sha256-YwFZKwAgwUtFZ1fvXUNNSfYCe45fOkmdEzYvIFxIbg4=";
};
hardeningDisable = lib.optional stdenv.cc.isClang "format";
buildInputs = [
curl
];

12
pkgs/tools/security/medusa/default.nix
Unescape View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, pkg-config, freerdp, openssl, libssh2 }:
{ lib, stdenv, fetchFromGitHub, fetchpatch, pkg-config, freerdp, openssl, libssh2 }:
stdenv.mkDerivation rec {
pname = "medusa-unstable";
@ -11,6 +11,16 @@ stdenv.mkDerivation rec {
sha256 = "0njlz4fqa0165wdmd5y8lfnafayf3c4la0r8pf3hixkdwsss1509";
};
patches = [
# Pull upstream fix for -fno-common tollchains like gcc-10:
# https://github.com/jmk-foofus/medusa/pull/36
(fetchpatch {
name = "fno-common.patch";
url = "https://github.com/jmk-foofus/medusa/commit/a667656ad085b3eb95309932666c250d97a92767.patch";
sha256 = "01marqqhjd3qwar3ymp50y1h2im5ilgpaxk7wrc2kcxgmzvbdfxc";
})
];
outputs = [ "out" "man" ];
configureFlags = [ "--enable-module-ssh=yes" ];

2
pkgs/tools/security/secp256k1/default.nix
Unescape View File

@ -42,6 +42,6 @@ stdenv.mkDerivation {
homepage = "https://github.com/bitcoin-core/secp256k1";
license = with licenses; [ mit ];
maintainers = with maintainers; [ ];
platforms = with platforms; unix;
platforms = with platforms; all;
};
}

2
pkgs/top-level/all-packages.nix
Unescape View File

@ -29006,8 +29006,6 @@ with pkgs;
procmail = callPackage ../applications/misc/procmail { };
profanity = callPackage ../applications/networking/instant-messengers/profanity ({
gtk = gtk3;
python = python3;
} // (config.profanity or {}));
properties-cpp = callPackage ../development/libraries/properties-cpp { };

2
pkgs/top-level/python-packages.nix
Unescape View File

@ -5645,7 +5645,7 @@ in {
});
nghttp2 = (toPythonModule (pkgs.nghttp2.override {
inherit (self) python cython setuptools;
python3Packages = self;
inherit (pkgs) ncurses;
enableApp = false; # build only libnghttp2 ...
enablePython = true; # ... and its Python bindings

Write Preview
Loading…
Cancel
Save