git.iko.soy/typeable/nixpkgs
on master help sign in
Merge master into staging-next
commitbbbd0a92afb49fb7cbfe382e7db43417595b2fe3 authorgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> dateTue 25 Jan 2022, 00:02 (5 years ago) parenta4581891e643a3
107 files changed+863−431
maintainers/maintainer-list.nix+21−17 nixos/doc/manual/from_md/release-notes/rl-2205.section.xml+8 nixos/doc/manual/release-notes/rl-2205.section.md+2 nixos/modules/system/boot/modprobe.nix+20 nixos/modules/system/boot/stage-1.nix+3 nixos/tests/all-tests.nix+21 nixos/tests/wine.nix+1−1 pkgs/applications/audio/ncspot/default.nix+11−7 pkgs/applications/audio/ncspot/rust_1_57_support.patch+21 pkgs/applications/blockchains/go-ethereum/default.nix+3−1 pkgs/applications/editors/emacs/generic.nix+2−1 pkgs/applications/editors/neovim/default.nix+3 pkgs/applications/editors/rstudio/default.nix+5−1 pkgs/applications/graphics/sane/backends/brscan5/default.nix+3−1 pkgs/applications/misc/pdfstudio/common.nix+98 pkgs/applications/misc/pdfstudio/default.nix+34−79 pkgs/applications/misc/pdfstudioviewer/default.nix−81 pkgs/applications/networking/browsers/chromium/common.nix+1−1 pkgs/applications/networking/browsers/chromium/get-commit-message.py+1−1 pkgs/applications/networking/cluster/k3s/default.nix+3 pkgs/applications/networking/soapui/default.nix+3−1 pkgs/applications/science/biology/star/default.nix+2−2 pkgs/development/libraries/cpp-utilities/default.nix+2−2 pkgs/development/libraries/ffmpeg/0001-fate-ffmpeg-add-missing-samples-dependency-to-fate-s.patch+27 pkgs/development/libraries/ffmpeg/5.nix+14 pkgs/development/libraries/ffmpeg/generic.nix+3−1 pkgs/development/libraries/java/lombok/default.nix+2−2 pkgs/development/libraries/qcoro/default.nix+3−2 pkgs/development/libraries/science/math/fenics/default.nix+2 pkgs/development/python-modules/aenum/default.nix+2−2 pkgs/development/python-modules/bond-api/default.nix+2−2 pkgs/development/python-modules/cyclonedx-python-lib/default.nix+2−2 pkgs/development/python-modules/denonavr/default.nix+2−7 pkgs/development/python-modules/flux-led/default.nix+2−2 pkgs/development/python-modules/git-revise/default.nix+5−4 pkgs/development/python-modules/identify/default.nix+2−2 pkgs/development/python-modules/meshtastic/default.nix+2−2 pkgs/development/python-modules/online-judge-api-client/default.nix+60 pkgs/development/python-modules/online-judge-api-client/fix-paths.patch+39 pkgs/development/python-modules/online-judge-tools/default.nix+31 pkgs/development/python-modules/python-keycloak/default.nix+41 pkgs/development/python-modules/total-connect-client/default.nix+2−2 pkgs/development/python-modules/txtorcon/default.nix+2−1 pkgs/development/tools/continuous-integration/jenkins/default.nix+1−1 pkgs/development/tools/parsing/tree-sitter/default.nix+3−3 pkgs/development/tools/parsing/tree-sitter/grammars/default.nix+1−2 pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c-sharp.json+4−4 pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-comment.json+4−4 pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json+4−4 pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cuda.json+4−4 pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-elixir.json+4−4 pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-elm.json+4−4 pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-embedded-template.json+4−4 pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-glsl.json+4−4 pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-go.json+4−4 pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-haskell.json+4−4 pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-heex.json+4−4 pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-java.json+4−4 pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-latex.json+4−4 pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-llvm.json+4−4 pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-norg.json+4−4 pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-org.json+4−4 pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-perl.json+4−4 pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-query.json+4−4 pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-r.json+4−4 pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-regex.json+4−4 pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rst.json+4−4 pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ruby.json+4−4 pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json+4−4 pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-supercollider.json+4−4 pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-swift.json+4−4 pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-tlaplus.json+4−4 pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typescript.json+4−4 pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-vim.json+4−4 pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-zig.json+4−4 pkgs/development/tools/parsing/tree-sitter/update.nix+9−4 pkgs/misc/emulators/wine/base.nix+31−12 pkgs/misc/emulators/wine/builder-wow.sh+3−2 pkgs/misc/emulators/wine/default.nix+3−2 pkgs/misc/emulators/wine/packages.nix+7−1 pkgs/misc/emulators/wine/sources.nix+15 pkgs/os-specific/linux/multipath-tools/default.nix+3−1 pkgs/os-specific/linux/open-iscsi/default.nix+3−1 pkgs/servers/dns/doh-proxy-rust/default.nix+3−1 pkgs/servers/gerbera/default.nix+3 pkgs/servers/isso/default.nix+3−1 pkgs/servers/mediatomb/default.nix+3−1 pkgs/servers/nosql/riak/2.2.0.nix+3−1 pkgs/servers/web-apps/pict-rs/default.nix+3 pkgs/tools/X11/wpgtk/default.nix+3−3 pkgs/tools/admin/lego/default.nix+3−3 pkgs/tools/audio/spotdl/default.nix+3−4 pkgs/tools/audio/video2midi/default.nix+3−3 pkgs/tools/inputmethods/fcitx5/fcitx5-unikey.nix+27 pkgs/tools/misc/gay/default.nix+3−4 pkgs/tools/misc/goreleaser/default.nix+3−3 pkgs/tools/misc/steampipe/default.nix+2−2 pkgs/tools/misc/tlp/default.nix+4−5 pkgs/tools/misc/tlp/patches/0002-tlp-sleep.service-reintroduce.patch → pkgs/tools/misc/tlp/patches/0002-reintroduce-tlp-sleep-service.patch−17 pkgs/tools/networking/dcap/default.nix+44 pkgs/tools/networking/stunnel/default.nix+2−2 pkgs/tools/security/haka/default.nix+3−1 pkgs/tools/security/log4j-sniffer/default.nix+2−2 pkgs/top-level/aliases.nix+1 pkgs/top-level/all-packages.nix+25−6 pkgs/top-level/python-packages.nix+6 pkgs/top-level/wine-packages.nix+3
maintainers/maintainer-list.nix+21−17
@@ -1920,12 +1920,10 @@
19201920 github = "cburstedde";
19211921 githubId = 109908;
19221922 name = "Carsten Burstedde";
1923− keys = [
1924− {
1925− longkeyid = "rsa2048/0x0704CD9E550A6BCD";
1926− fingerprint = "1127 A432 6524 BF02 737B 544E 0704 CD9E 550A 6BCD";
1927− }
1928− ];
1923+ keys = [{
1924+ longkeyid = "rsa2048/0x0704CD9E550A6BCD";
1925+ fingerprint = "1127 A432 6524 BF02 737B 544E 0704 CD9E 550A 6BCD";
1926+ }];
19291927 };
19301928 cdepillabout = {
19311929 email = "cdep.illabout@gmail.com";
@@ -6373,7 +6371,7 @@
63736371 keys = [{
63746372 longkeyid = "rsa4096/0x7248991EFA8EFBEE";
63756373 fingerprint = "01F5 0A29 D4AA 9117 5A11 BDB1 7248 991E FA8E FBEE";
6376− }];
6374+ }];
63776375 };
63786376 kiwi = {
63796377 email = "envy1988@gmail.com";
@@ -7028,7 +7026,7 @@
70287026 email = "nullarequest@vivlaid.net";
70297027 github = "Lunarequest";
70307028 githubId = 30698906;
7031− name = "Advaith Madhukar"; #this is my legal name, I prefer Luna; please keep that in mind!
7029+ name = "Advaith Madhukar"; # this is my legal name, I prefer Luna; please keep that in mind!
70327030 };
70337031 lionello = {
70347032 email = "lio@lunesu.com";
@@ -10626,14 +10624,20 @@
1062610624 name = "Samuel Dionne-Riel";
1062710625 };
1062810626 samuelgrf = {
10629− email = "git@samuelgrf.com";
10627+ email = "s@muel.gr";
1063010628 github = "samuelgrf";
1063110629 githubId = 67663538;
1063210630 name = "Samuel Gräfenstein";
10633− keys = [{
10634− longkeyid = "rsa4096/0xEF76A063F15C63C8";
10635− fingerprint = "FF24 5832 8FAF 4660 18C6 186E EF76 A063 F15C 63C8";
10636− }];
10631+ keys = [
10632+ {
10633+ longkeyid = "rsa4096/0xDE75F92E318123F0";
10634+ fingerprint = "6F2E 2A90 423C 8111 BFF2 895E DE75 F92E 3181 23F0";
10635+ }
10636+ {
10637+ longkeyid = "rsa4096/0xEF76A063F15C63C8";
10638+ fingerprint = "FF24 5832 8FAF 4660 18C6 186E EF76 A063 F15C 63C8";
10639+ }
10640+ ];
1063710641 };
1063810642 samuelrivas = {
1063910643 email = "samuelrivas@gmail.com";
@@ -11514,10 +11518,10 @@
1151411518 name = "Justus K";
1151511519 };
1151611520 SubhrajyotiSen = {
11517− email = "subhrajyoti12@gmail.com";
11518− github = "SubhrajyotiSen";
11519− githubId = 12984845;
11520− name = "Subhrajyoti Sen";
11521+ email = "subhrajyoti12@gmail.com";
11522+ github = "SubhrajyotiSen";
11523+ githubId = 12984845;
11524+ name = "Subhrajyoti Sen";
1152111525 };
1152211526 suhr = {
1152311527 email = "suhr@i2pmail.org";
nixos/doc/manual/from_md/release-notes/rl-2205.section.xml+8
@@ -620,6 +620,14 @@
620620 files.
621621 </para>
622622 </listitem>
623+ <listitem>
624+ <para>
625+ A new option
626+ <literal>boot.initrd.extraModprobeConfig</literal> has been
627+ added which can be used to configure kernel modules that are
628+ loaded in the initrd.
629+ </para>
630+ </listitem>
623631 <listitem>
624632 <para>
625633 <literal>fetchFromSourcehut</literal> now allows fetching
nixos/doc/manual/release-notes/rl-2205.section.md+2
@@ -217,6 +217,8 @@ In addition to numerous new and upgraded packages, this release has the followin
217217
218218- The option `services.duplicati.dataDir` has been added to allow changing the location of duplicati's files.
219219
220+- A new option `boot.initrd.extraModprobeConfig` has been added which can be used to configure kernel modules that are loaded in the initrd.
221+
220222- `fetchFromSourcehut` now allows fetching repositories recursively
221223 using `fetchgit` or `fetchhg` if the argument `fetchSubmodules`
222224 is set to `true`.
nixos/modules/system/boot/modprobe.nix+20
@@ -34,6 +34,23 @@ with lib;
3434 type = types.lines;
3535 };
3636
37+ boot.initrd.extraModprobeConfig = mkOption {
38+ default = "";
39+ example =
40+ ''
41+ options zfs zfs_arc_max=1073741824
42+ '';
43+ description = ''
44+ Does exactly the same thing as
45+ <option>boot.extraModprobeConfig</option>, except
46+ that the generated <filename>modprobe.conf</filename>
47+ file is also included in the initrd.
48+ This is useful for setting module options for kernel
49+ modules that are loaded during early boot in the initrd.
50+ '';
51+ type = types.lines;
52+ };
53+
3754 };
3855
3956
@@ -50,6 +67,9 @@ with lib;
5067 '')}
5168 ${config.boot.extraModprobeConfig}
5269 '';
70+ environment.etc."modprobe.d/nixos-initrd.conf".text = ''
71+ ${config.boot.initrd.extraModprobeConfig}
72+ '';
5373 environment.etc."modprobe.d/debian.conf".source = pkgs.kmod-debian-aliases;
5474
5575 environment.systemPackages = [ pkgs.kmod ];
nixos/modules/system/boot/stage-1.nix+3
@@ -338,6 +338,9 @@ let
338338 { object = pkgs.writeText "mdadm.conf" config.boot.initrd.mdadmConf;
339339 symlink = "/etc/mdadm.conf";
340340 }
341+ { object = config.environment.etc."modprobe.d/nixos-initrd.conf".source;
342+ symlink = "/etc/modprobe.d/nixos-initrd.conf";
343+ }
341344 { object = pkgs.runCommand "initrd-kmod-blacklist-ubuntu" {
342345 src = "${pkgs.kmod-blacklist-ubuntu}/modprobe.conf";
343346 preferLocalBuild = true;
nixos/tests/all-tests.nix+21
@@ -54,6 +54,7 @@ in
5454 borgbackup = handleTest ./borgbackup.nix {};
5555 botamusique = handleTest ./botamusique.nix {};
5656 bpf = handleTestOn ["x86_64-linux" "aarch64-linux"] ./bpf.nix {};
57+ brscan5 = handleTest ./brscan5.nix {};
5758 btrbk = handleTest ./btrbk.nix {};
5859 buildbot = handleTest ./buildbot.nix {};
5960 buildkite-agents = handleTest ./buildkite-agents.nix {};
@@ -121,6 +122,7 @@ in
121122 docker-tools-cross = handleTestOn ["x86_64-linux" "aarch64-linux"] ./docker-tools-cross.nix {};
122123 docker-tools-overlay = handleTestOn ["x86_64-linux"] ./docker-tools-overlay.nix {};
123124 documize = handleTest ./documize.nix {};
125+ doh-proxy-rust = handleTest ./doh-proxy-rust.nix {};
124126 dokuwiki = handleTest ./dokuwiki.nix {};
125127 domination = handleTest ./domination.nix {};
126128 dovecot = handleTest ./dovecot.nix {};
@@ -130,6 +132,7 @@ in
130132 ecryptfs = handleTest ./ecryptfs.nix {};
131133 ejabberd = handleTest ./xmpp/ejabberd.nix {};
132134 elk = handleTestOn ["x86_64-linux"] ./elk.nix {};
135+ emacs-daemon = handleTest ./emacs-daemon.nix {};
133136 engelsystem = handleTest ./engelsystem.nix {};
134137 enlightenment = handleTest ./enlightenment.nix {};
135138 env = handleTest ./env.nix {};
@@ -141,6 +144,7 @@ in
141144 etesync-dav = handleTest ./etesync-dav.nix {};
142145 fancontrol = handleTest ./fancontrol.nix {};
143146 fcitx = handleTest ./fcitx {};
147+ fenics = handleTest ./fenics.nix {};
144148 ferm = handleTest ./ferm.nix {};
145149 firefox = handleTest ./firefox.nix { firefoxPackage = pkgs.firefox; };
146150 firefox-esr = handleTest ./firefox.nix { firefoxPackage = pkgs.firefox-esr; }; # used in `tested` job
@@ -157,6 +161,7 @@ in
157161 fsck = handleTest ./fsck.nix {};
158162 ft2-clone = handleTest ./ft2-clone.nix {};
159163 gerrit = handleTest ./gerrit.nix {};
164+ geth = handleTest ./geth.nix {};
160165 ghostunnel = handleTest ./ghostunnel.nix {};
161166 gitdaemon = handleTest ./gitdaemon.nix {};
162167 gitea = handleTest ./gitea.nix {};
@@ -181,6 +186,7 @@ in
181186 hadoop.all = handleTestOn [ "x86_64-linux" ] ./hadoop/hadoop.nix {};
182187 hadoop.hdfs = handleTestOn [ "x86_64-linux" ] ./hadoop/hdfs.nix {};
183188 hadoop.yarn = handleTestOn [ "x86_64-linux" ] ./hadoop/yarn.nix {};
189+ haka = handleTest ./haka.nix {};
184190 haproxy = handleTest ./haproxy.nix {};
185191 hardened = handleTest ./hardened.nix {};
186192 hedgedoc = handleTest ./hedgedoc.nix {};
@@ -218,14 +224,19 @@ in
218224 iodine = handleTest ./iodine.nix {};
219225 ipfs = handleTest ./ipfs.nix {};
220226 ipv6 = handleTest ./ipv6.nix {};
227+ iscsi-multipath-root = handleTest ./iscsi-multipath-root.nix {};
221228 iscsi-root = handleTest ./iscsi-root.nix {};
229+ isso = handleTest ./isso.nix {};
222230 jackett = handleTest ./jackett.nix {};
223231 jellyfin = handleTest ./jellyfin.nix {};
224232 jenkins = handleTest ./jenkins.nix {};
233+ jenkins-cli = handleTest ./jenkins-cli.nix {};
225234 jibri = handleTest ./jibri.nix {};
226235 jirafeau = handleTest ./jirafeau.nix {};
227236 jitsi-meet = handleTest ./jitsi-meet.nix {};
228237 k3s = handleTest ./k3s.nix {};
238+ k3s-single-node = handleTest ./k3s-single-node.nix {};
239+ k3s-single-node-docker = handleTest ./k3s-single-node-docker.nix {};
229240 kafka = handleTest ./kafka.nix {};
230241 kbd-setfont-decompress = handleTest ./kbd-setfont-decompress.nix {};
231242 kbd-update-search-paths-patch = handleTest ./kbd-update-search-paths-patch.nix {};
@@ -273,6 +284,7 @@ in
273284 matrix-conduit = handleTest ./matrix-conduit.nix {};
274285 matrix-synapse = handleTest ./matrix-synapse.nix {};
275286 mattermost = handleTest ./mattermost.nix {};
287+ mediatomb = handleTest ./mediatomb.nix {};
276288 mediawiki = handleTest ./mediawiki.nix {};
277289 meilisearch = handleTest ./meilisearch.nix {};
278290 memcached = handleTest ./memcached.nix {};
@@ -285,6 +297,7 @@ in
285297 misc = handleTest ./misc.nix {};
286298 mjolnir = handleTest ./matrix/mjolnir.nix {};
287299 mod_perl = handleTest ./mod_perl.nix {};
300+ molly-brown = handleTest ./molly-brown.nix {};
288301 mongodb = handleTest ./mongodb.nix {};
289302 moodle = handleTest ./moodle.nix {};
290303 morty = handleTest ./morty.nix {};
@@ -378,6 +391,7 @@ in
378391 php74 = handleTest ./php { php = pkgs.php74; };
379392 php80 = handleTest ./php { php = pkgs.php80; };
380393 php81 = handleTest ./php { php = pkgs.php81; };
394+ pict-rs = handleTest ./pict-rs.nix {};
381395 pinnwand = handleTest ./pinnwand.nix {};
382396 plasma5 = handleTest ./plasma5.nix {};
383397 plasma5-systemd-start = handleTest ./plasma5-systemd-start.nix {};
@@ -419,12 +433,16 @@ in
419433 rasdaemon = handleTest ./rasdaemon.nix {};
420434 redis = handleTest ./redis.nix {};
421435 redmine = handleTest ./redmine.nix {};
436+ resolv = handleTest ./resolv.nix {};
422437 restartByActivationScript = handleTest ./restart-by-activation-script.nix {};
423438 restic = handleTest ./restic.nix {};
439+ riak = handleTest ./riak.nix {};
424440 robustirc-bridge = handleTest ./robustirc-bridge.nix {};
425441 roundcube = handleTest ./roundcube.nix {};
426442 rspamd = handleTest ./rspamd.nix {};
427443 rss2email = handleTest ./rss2email.nix {};
444+ rstudio-server = handleTest ./rstudio-server.nix {};
445+ rsyncd = handleTest ./rsyncd.nix {};
428446 rsyslogd = handleTest ./rsyslogd.nix {};
429447 rxe = handleTest ./rxe.nix {};
430448 sabnzbd = handleTest ./sabnzbd.nix {};
@@ -445,6 +463,7 @@ in
445463 smokeping = handleTest ./smokeping.nix {};
446464 snapcast = handleTest ./snapcast.nix {};
447465 snapper = handleTest ./snapper.nix {};
466+ soapui = handleTest ./soapui.nix {};
448467 sogo = handleTest ./sogo.nix {};
449468 solanum = handleTest ./solanum.nix {};
450469 solr = handleTest ./solr.nix {};
@@ -481,6 +500,7 @@ in
481500 systemd-timesyncd = handleTest ./systemd-timesyncd.nix {};
482501 systemd-unit-path = handleTest ./systemd-unit-path.nix {};
483502 taskserver = handleTest ./taskserver.nix {};
503+ teeworlds = handleTest ./teeworlds.nix {};
484504 telegraf = handleTest ./telegraf.nix {};
485505 teleport = handleTest ./teleport.nix {};
486506 thelounge = handleTest ./thelounge.nix {};
@@ -524,6 +544,7 @@ in
524544 vscodium = discoverTests (import ./vscodium.nix);
525545 wasabibackend = handleTest ./wasabibackend.nix {};
526546 wiki-js = handleTest ./wiki-js.nix {};
547+ wine = handleTest ./wine.nix {};
527548 wireguard = handleTest ./wireguard {};
528549 without-nix = handleTest ./without-nix.nix {};
529550 wmderland = handleTest ./wmderland.nix {};
nixos/tests/wine.nix+1−1
@@ -35,7 +35,7 @@ let
3535 };
3636 };
3737
38− variants = [ "base" "full" "minimal" "staging" "unstable" ];
38+ variants = [ "base" "full" "minimal" "staging" "unstable" "wayland" ];
3939
4040in listToAttrs (map (makeWineTest "winePackages" [ hello32 ]) variants
4141 ++ map (makeWineTest "wineWowPackages" [ hello32 hello64 ]) variants)
pkgs/applications/audio/ncspot/default.nix+11−7
@@ -1,22 +1,26 @@
11{ stdenv, lib, fetchFromGitHub, rustPlatform, pkg-config, ncurses, openssl, libiconv
2−, withALSA ? true, alsa-lib ? null
3−, withPulseAudio ? false, libpulseaudio ? null
4−, withPortAudio ? false, portaudio ? null
5−, withMPRIS ? false, dbus ? null
2+, withALSA ? true, alsa-lib
3+, withPulseAudio ? false, libpulseaudio
4+, withPortAudio ? false, portaudio
5+, withMPRIS ? false, dbus
66}:
77
88rustPlatform.buildRustPackage rec {
99 pname = "ncspot";
10− version = "0.9.3";
10+ version = "0.9.5";
1111
1212 src = fetchFromGitHub {
1313 owner = "hrkfdn";
1414 repo = "ncspot";
1515 rev = "v${version}";
16− sha256 = "sha256-k4EGyQjjJCvUhp56OjYl63n+giI05GiIS2++I1SVhCg=";
16+ sha256 = "sha256-HnP0dXKkMssDAhrsA99bTCVGdov9t5+1y8fJ+BWTM80=";
1717 };
1818
19− cargoSha256 = "sha256-YsjInqmkPnAwqgRBDiwcLH0DDqCF0NElrn+WO2v+ATM=";
19+ # Upstream now only supports rust 1.58+, but this version is not yet available in nixpkgs.
20+ # See https://github.com/hrkfdn/ncspot/issues/714
21+ patches = [ ./rust_1_57_support.patch ];
22+
23+ cargoSha256 = "sha256-g6UMwirsSV+/NtFIfEZrz5h/OitPQcDeSawh7wq4TLI=";
2024
2125 nativeBuildInputs = [ pkg-config ];
2226
pkgs/applications/audio/ncspot/rust_1_57_support.patchnew file+21
@@ -0,0 +1,21 @@
1+diff --git a/src/ui/listview.rs b/src/ui/listview.rs
2+index 17fead7..e6c72b6 100644
3+--- a/src/ui/listview.rs
4++++ b/src/ui/listview.rs
5+@@ -85,7 +85,7 @@ impl<I: ListItem> ListView<I> {
6+
7+ pub fn content_height_with_paginator(&self) -> usize {
8+ let content_len = self.content.read().unwrap().len();
9+- log::info!("content len: {content_len}");
10++ log::info!("content len: {}", content_len);
11+
12+ // add 1 more row for paginator if we can paginate
13+ if self.can_paginate() {
14+@@ -97,7 +97,7 @@ impl<I: ListItem> ListView<I> {
15+
16+ fn can_paginate(&self) -> bool {
17+ let loaded = self.get_pagination().loaded_content();
18+- log::info!("can paginate: {loaded}");
19++ log::info!("can paginate: {}", loaded);
20+ self.get_pagination().max_content().unwrap_or(0) > self.get_pagination().loaded_content()
21+ }
pkgs/applications/blockchains/go-ethereum/default.nix+3−1
@@ -1,4 +1,4 @@
1−{ lib, stdenv, buildGoModule, fetchFromGitHub, libobjc, IOKit }:
1+{ lib, stdenv, buildGoModule, fetchFromGitHub, libobjc, IOKit, nixosTests }:
22
33let
44 # A list of binaries to put into separate outputs
@@ -50,6 +50,8 @@ in buildGoModule rec {
5050 propagatedBuildInputs =
5151 lib.optionals stdenv.isDarwin [ libobjc IOKit ];
5252
53+ passthru.tests = { inherit (nixosTests) geth; };
54+
5355 meta = with lib; {
5456 homepage = "https://geth.ethereum.org/";
5557 description = "Official golang implementation of the Ethereum protocol";
pkgs/applications/editors/emacs/generic.nix+2−1
@@ -10,7 +10,7 @@
1010, Xaw3d, libXcursor, pkg-config, gettext, libXft, dbus, libpng, libjpeg, giflib
1111, libtiff, librsvg, gconf, libxml2, imagemagick, gnutls, libselinux
1212, alsa-lib, cairo, acl, gpm, AppKit, GSS, ImageIO, m17n_lib, libotf
13−, sigtool, jansson, harfbuzz, sqlite
13+, sigtool, jansson, harfbuzz, sqlite, nixosTests
1414, dontRecurseIntoAttrs ,emacsPackagesFor
1515, libgccjit, targetPlatform, makeWrapper # native-comp params
1616, systemd ? null
@@ -208,6 +208,7 @@ let emacs = stdenv.mkDerivation (lib.optionalAttrs nativeComp {
208208 passthru = {
209209 inherit nativeComp;
210210 pkgs = dontRecurseIntoAttrs (emacsPackagesFor emacs);
211+ tests = { inherit (nixosTests) emacs-daemon; };
211212 };
212213
213214 meta = with lib; {
pkgs/applications/editors/neovim/default.nix+3
@@ -113,6 +113,9 @@ in
113113 substituteInPlace src/nvim/CMakeLists.txt --replace " util" ""
114114 '';
115115
116+ # For treesitter plugins, libstdc++.so.6 will be needed
117+ NIX_LDFLAGS = [ "-lstdc++"];
118+
116119 # export PATH=$PWD/build/bin:${PATH}
117120 shellHook=''
118121 export VIMRUNTIME=$PWD/runtime
pkgs/applications/editors/rstudio/default.nix+5−1
@@ -34,6 +34,7 @@
3434, server ? false # build server version
3535, sqlite
3636, pam
37+, nixosTests
3738}:
3839
3940let
@@ -209,7 +210,10 @@ in
209210 platforms = platforms.linux;
210211 };
211212
212− passthru = { inherit server; };
213+ passthru = {
214+ inherit server;
215+ tests = { inherit (nixosTests) rstudio-server; };
216+ };
213217 } // lib.optionalAttrs (!server) {
214218 qtWrapperArgs = [
215219 "--suffix PATH : ${lib.makeBinPath [ gnumake ]}"
pkgs/applications/graphics/sane/backends/brscan5/default.nix+3−1
@@ -1,4 +1,4 @@
1−{ stdenv, lib, fetchurl, callPackage, patchelf, makeWrapper, coreutils, libusb1, avahi-compat, glib, libredirect }:
1+{ stdenv, lib, fetchurl, callPackage, patchelf, makeWrapper, coreutils, libusb1, avahi-compat, glib, libredirect, nixosTests }:
22let
33 myPatchElf = file: with lib; ''
44 patchelf --set-interpreter \
@@ -88,6 +88,8 @@ stdenv.mkDerivation rec {
8888
8989 dontPatchELF = true;
9090
91+ passthru.tests = { inherit (nixosTests) brscan5; };
92+
9193 meta = {
9294 description = "Brother brscan5 sane backend driver";
9395 homepage = "https://www.brother.com";
pkgs/applications/misc/pdfstudio/common.nixnew file+98
@@ -0,0 +1,98 @@
1+{ pname
2+, src
3+, year
4+, version
5+, desktopName
6+, longDescription
7+, buildFHSUserEnv
8+, extraBuildInputs ? []
9+, stdenv
10+, lib
11+, dpkg
12+, makeDesktopItem
13+, copyDesktopItems
14+, autoPatchelfHook
15+, sane-backends
16+, cups
17+, jdk11
18+}:
19+let
20+ thisPackage = stdenv.mkDerivation rec {
21+ inherit pname src version;
22+ strictDeps = true;
23+
24+ buildInputs = [
25+ sane-backends #for libsane.so.1
26+ jdk11
27+ ] ++ extraBuildInputs;
28+
29+ nativeBuildInputs = [
30+ autoPatchelfHook
31+ dpkg
32+ copyDesktopItems
33+ ];
34+
35+ desktopItems = [
36+ (makeDesktopItem {
37+ name = "${pname}${year}";
38+ desktopName = desktopName;
39+ genericName = "View and edit PDF files";
40+ exec = "${pname} %f";
41+ icon = "${pname}${year}";
42+ comment = "Views and edits PDF files";
43+ mimeType = "application/pdf";
44+ categories = "Office";
45+ type = "Application";
46+ terminal = false;
47+ })
48+ ];
49+
50+ unpackCmd = "dpkg-deb -x $src ./${pname}-${version}";
51+ dontBuild = true;
52+
53+ postPatch = ''
54+ substituteInPlace opt/${pname}${year}/${pname}${year} --replace "# INSTALL4J_JAVA_HOME_OVERRIDE=" "INSTALL4J_JAVA_HOME_OVERRIDE=${jdk11.out}"
55+ substituteInPlace opt/${pname}${year}/updater --replace "# INSTALL4J_JAVA_HOME_OVERRIDE=" "INSTALL4J_JAVA_HOME_OVERRIDE=${jdk11.out}"
56+ '';
57+
58+ installPhase = ''
59+ runHook preInstall
60+
61+ mkdir -p $out/{bin,share/pixmaps}
62+ rm -rf opt/${pname}${year}/jre
63+ cp -r opt/${pname}${year} $out/share/
64+ ln -s $out/share/${pname}${year}/.install4j/${pname}${year}.png $out/share/pixmaps/
65+ ln -s $out/share/${pname}${year}/${pname}${year} $out/bin/${pname}
66+
67+ runHook postInstall
68+ '';
69+ };
70+
71+in
72+# Package with cups in FHS sandbox, because JAVA bin expects "/usr/bin/lpr" for printing.
73+buildFHSUserEnv {
74+ name = pname;
75+ targetPkgs = pkgs: [
76+ cups
77+ thisPackage
78+ ];
79+ runScript = pname;
80+
81+ # link desktop item and icon into FHS user environment
82+ extraInstallCommands = ''
83+ mkdir -p "$out/share/applications"
84+ mkdir -p "$out/share/pixmaps"
85+ ln -s ${thisPackage}/share/applications/*.desktop "$out/share/applications/"
86+ ln -s ${thisPackage}/share/pixmaps/*.png "$out/share/pixmaps/"
87+ '';
88+
89+ meta = with lib; {
90+ homepage = "https://www.qoppa.com/${pname}/";
91+ description = "An easy to use, full-featured PDF editing software";
92+ longDescription = longDescription;
93+ license = licenses.unfree;
94+ platforms = platforms.linux;
95+ mainProgram = pname;
96+ maintainers = [ maintainers.pwoelfel ];
97+ };
98+}
pkgs/applications/misc/pdfstudio/default.nix+34−79
@@ -1,87 +1,42 @@
1−{ stdenv
2−, lib
1+{ program ? "pdfstudioviewer"
32, fetchurl
43, libgccjit
5−, dpkg
6−, makeDesktopItem
7−, copyDesktopItems
8−, autoPatchelfHook
9−, sane-backends
10−, jdk11
4+, callPackage
115}:
126
13−# See also package 'pdfstudioviewer'
14−# Differences are ${pname}, Download directory name (PDFStudio / PDFStudioViewer),
15−# sha256, and libgccjit (not needed for PDFStudioViewer)
16−let year = "2021";
17−in
18−stdenv.mkDerivation rec {
19− pname = "pdfstudio";
20− version = "${year}.1.2";
21− strictDeps = true;
22−
23− src = fetchurl {
24− url = "https://download.qoppa.com/${pname}/v${year}/PDFStudio_v${
7+{
8+ pdfstudio = callPackage ./common.nix rec {
9+ pname = program;
10+ year = "2021";
11+ version = "${year}.1.2";
12+ desktopName = "PDF Studio";
13+ longDescription = ''
14+ PDF Studio is an easy to use, full-featured PDF editing software. This is the standard/pro edition, which requires a license. For the free PDF Studio Viewer see the package pdfstudioviewer.
15+ '';
16+ extraBuildInputs = [
17+ libgccjit #for libstdc++.so.6 and libgomp.so.1
18+ ];
19+ src = fetchurl {
20+ url = "https://download.qoppa.com/${pname}/v${year}/PDFStudio_v${
2521 builtins.replaceStrings [ "." ] [ "_" ] version
26− }_linux64.deb";
27− sha256 = "1188ll2qz58rr2slavqxisbz4q3fdzidpasb1p33926z0ym3rk45";
22+ }_linux64.deb";
23+ sha256 = "1188ll2qz58rr2slavqxisbz4q3fdzidpasb1p33926z0ym3rk45";
24+ };
2825 };
2926
30− buildInputs = [
31− libgccjit #for libstdc++.so.6 and libgomp.so.1
32− sane-backends #for libsane.so.1
33− jdk11
34− ];
35−
36− nativeBuildInputs = [
37− autoPatchelfHook
38− dpkg
39− copyDesktopItems
40− ];
41−
42− desktopItems = [
43− (makeDesktopItem {
44− name = "${pname}${year}";
45− desktopName = "PDF Studio";
46− genericName = "View and edit PDF files";
47− exec = "${pname} %f";
48− icon = "${pname}${year}";
49− comment = "Views and edits PDF files";
50− mimeType = "application/pdf";
51− categories = "Office";
52− type = "Application";
53− terminal = false;
54− })
55− ];
56−
57− unpackPhase = "dpkg-deb -x $src .";
58− dontBuild = true;
59−
60− postPatch = ''
61− substituteInPlace opt/${pname}${year}/${pname}${year} --replace "# INSTALL4J_JAVA_HOME_OVERRIDE=" "INSTALL4J_JAVA_HOME_OVERRIDE=${jdk11.out}"
62− substituteInPlace opt/${pname}${year}/updater --replace "# INSTALL4J_JAVA_HOME_OVERRIDE=" "INSTALL4J_JAVA_HOME_OVERRIDE=${jdk11.out}"
63− '';
64−
65− installPhase = ''
66− runHook preInstall
67−
68− mkdir -p $out/bin
69− mkdir -p $out/share
70− mkdir -p $out/share/pixmaps
71− cp -r opt/${pname}${year} $out/share/
72− rm -rf $out/share/${pname}${year}/jre
73− ln -s $out/share/${pname}${year}/.install4j/${pname}${year}.png $out/share/pixmaps/
74− ln -s $out/share/${pname}${year}/${pname}${year} $out/bin/${pname}
75−
76− runHook postInstall
77− '';
78−
79− meta = with lib; {
80− homepage = "https://www.qoppa.com/pdfstudio/";
81− description = "An easy to use, full-featured PDF editing software";
82− license = licenses.unfree;
83− platforms = platforms.linux;
84− mainProgram = pname;
85− maintainers = [ maintainers.pwoelfel ];
27+ pdfstudioviewer = callPackage ./common.nix rec {
28+ pname = program;
29+ year = "2021";
30+ version = "${year}.1.2";
31+ desktopName = "PDF Studio Viewer";
32+ longDescription = ''
33+ PDF Studio Viewer is an easy to use, full-featured PDF editing software. This is the free edition. For the standard/pro edition, see the package pdfstudio.
34+ '';
35+ src = fetchurl {
36+ url = "https://download.qoppa.com/${pname}/v${year}/PDFStudioViewer_v${
37+ builtins.replaceStrings [ "." ] [ "_" ] version
38+ }_linux64.deb";
39+ sha256 = "128k3fm8m8zdykx4s30g5m2zl7cgmvs4qinf1w525zh84v56agz6";
40+ };
8641 };
87−}
42+}.${program}
pkgs/applications/misc/pdfstudioviewer/default.nixdeleted−81
@@ -1,81 +0,0 @@
1−{ stdenv
2−, lib
3−, fetchurl
4−, dpkg
5−, makeDesktopItem
6−, copyDesktopItems
7−, autoPatchelfHook
8−, sane-backends
9−, jdk11
10−}:
11−
12−let year = "2021";
13−in stdenv.mkDerivation rec {
14− pname = "pdfstudioviewer";
15− version = "${year}.1.2";
16− autoPatchelfIgnoreMissingDeps = false;
17− strictDeps = true;
18−
19− src = fetchurl {
20− url = "https://download.qoppa.com/${pname}/v${year}/PDFStudioViewer_v${
21− builtins.replaceStrings [ "." ] [ "_" ] version
22− }_linux64.deb";
23− sha256 = "128k3fm8m8zdykx4s30g5m2zl7cgmvs4qinf1w525zh84v56agz6";
24− };
25−
26− buildInputs = [
27− sane-backends
28− jdk11
29− ];
30−
31− nativeBuildInputs = [
32− autoPatchelfHook
33− dpkg
34− copyDesktopItems
35− ];
36−
37− desktopItems = [
38− (makeDesktopItem {
39− name = "${pname}${year}";
40− desktopName = "PDF Studio";
41− genericName = "View and edit PDF files";
42− exec = "${pname} %f";
43− icon = "${pname}${year}";
44− comment = "Views and edits PDF files";
45− mimeType = "application/pdf";
46− categories = "Office";
47− type = "Application";
48− terminal = false;
49− })
50− ];
51−
52− unpackPhase = "dpkg-deb -x $src .";
53− dontBuild = true;
54−
55− postPatch = ''
56− substituteInPlace opt/${pname}${year}/${pname}${year} --replace "# INSTALL4J_JAVA_HOME_OVERRIDE=" "INSTALL4J_JAVA_HOME_OVERRIDE=${jdk11.out}"
57− '';
58−
59− installPhase = ''
60− runHook preInstall
61−
62− mkdir -p $out/bin
63− mkdir -p $out/share
64− mkdir -p $out/share/pixmaps
65− cp -r opt/${pname}${year} $out/share/
66− rm -rf $out/share/${pname}${year}/jre
67− ln -s $out/share/${pname}${year}/.install4j/${pname}${year}.png $out/share/pixmaps/
68− ln -s $out/share/${pname}${year}/${pname}${year} $out/bin/${pname}
69−
70− runHook postInstall
71− '';
72−
73− meta = with lib; {
74− homepage = "https://www.qoppa.com/pdfstudio/";
75− description = "An easy to use, full-featured PDF editing software";
76− license = licenses.unfree;
77− platforms = platforms.linux;
78− mainProgram = pname;
79− maintainers = [ maintainers.pwoelfel ];
80− };
81−}
pkgs/applications/networking/browsers/chromium/common.nix+1−1
@@ -288,7 +288,7 @@ let
288288 google_api_key = "AIzaSyDGi15Zwl11UNe6Y-5XW_upsfyw31qwZPI";
289289
290290 # Optional features:
291− use_gio = gnomeSupport;
291+ use_gio = gnomeSupport || chromiumVersionAtLeast "99";
292292 use_gnome_keyring = gnomeKeyringSupport;
293293 use_cups = cupsSupport;
294294
pkgs/applications/networking/browsers/chromium/get-commit-message.py+1−1
@@ -39,7 +39,7 @@ for entry in feed.entries:
3939 print('chromium: TODO -> ' + version + '\n')
4040 print(url)
4141 if fixes := re.search(r'This update includes .+ security fixes\.', content).group(0):
42− zero_days = re.search(r'Google is aware( of reports)? that .+ in the wild\.', content)
42+ zero_days = re.search(r'Google is aware( of reports)? th(e|at) .+ in the wild\.', content)
4343 if zero_days:
4444 fixes += " " + zero_days.group(0)
4545 print('\n' + '\n'.join(textwrap.wrap(fixes, width=72)))
pkgs/applications/networking/cluster/k3s/default.nix+3
@@ -18,6 +18,7 @@
1818, fetchzip
1919, fetchgit
2020, zstd
21+, nixosTests
2122}:
2223
2324with lib;
@@ -289,5 +290,7 @@ stdenv.mkDerivation rec {
289290
290291 passthru.updateScript = ./update.sh;
291292
293+ passthru.tests = { inherit (nixosTests) k3s-single-node k3s-single-node-docker; };
294+
292295 meta = baseMeta;
293296}
pkgs/applications/networking/soapui/default.nix+3−1
@@ -1,4 +1,4 @@
1−{ fetchurl, lib, stdenv, writeText, jdk, makeWrapper }:
1+{ fetchurl, lib, stdenv, writeText, jdk, makeWrapper, nixosTests }:
22
33stdenv.mkDerivation rec {
44 pname = "soapui";
@@ -46,6 +46,8 @@ stdenv.mkDerivation rec {
4646 '')
4747 ];
4848
49+ passthru.tests = { inherit (nixosTests) soapui; };
50+
4951 meta = with lib; {
5052 description = "The Most Advanced REST & SOAP Testing Tool in the World";
5153 homepage = "https://www.soapui.org/";
pkgs/applications/science/biology/star/default.nix+2−2
@@ -2,13 +2,13 @@
22
33stdenv.mkDerivation rec {
44 pname = "star";
5− version = "2.7.9a";
5+ version = "2.7.10a";
66
77 src = fetchFromGitHub {
88 repo = "STAR";
99 owner = "alexdobin";
1010 rev = version;
11− sha256 = "sha256-p1yaIbSGu8K5AkqJj0BAzuoWsXr25eCNoQmLXYQeg4E=";
11+ sha256 = "sha256-qwddCGMOKWgx76qGwRQXwvv9fCSeVsZbWHmlBwEqGKE=";
1212 };
1313
1414 sourceRoot = "source/source";
pkgs/development/libraries/cpp-utilities/default.nix+2−2
@@ -7,13 +7,13 @@
77
88stdenv.mkDerivation rec {
99 pname = "cpp-utilities";
10− version = "5.11.3";
10+ version = "5.12.0";
1111
1212 src = fetchFromGitHub {
1313 owner = "Martchus";
1414 repo = pname;
1515 rev = "v${version}";
16− sha256 = "sha256-a/fuzZ8crmyO87QzIKuYPk0LC3EvvHZrWO17LtWu77I=";
16+ sha256 = "sha256-rpbD3x7zIJCDZuu4K0wDkaBKSBh36amtza/wE3rb0HM=";
1717 };
1818
1919 nativeBuildInputs = [ cmake ];
pkgs/development/libraries/ffmpeg/0001-fate-ffmpeg-add-missing-samples-dependency-to-fate-s.patchnew file+27
@@ -0,0 +1,27 @@
1+From a66b58d61caaae452785a2d69f5de9259ab27138 Mon Sep 17 00:00:00 2001
2+From: James Almer <jamrial@gmail.com>
3+Date: Sun, 16 Jan 2022 00:32:52 -0300
4+Subject: [PATCH] fate/ffmpeg: add missing samples dependency to fate-shortest
5+
6+Signed-off-by: James Almer <jamrial@gmail.com>
7+(cherry picked from commit b1ef5882e35d1a95e9c4838d0933084773055345)
8+---
9+ tests/fate/ffmpeg.mak | 2 +-
10+ 1 file changed, 1 insertion(+), 1 deletion(-)
11+
12+diff --git a/tests/fate/ffmpeg.mak b/tests/fate/ffmpeg.mak
13+index 0b00bb5b23..b80467d02e 100644
14+--- a/tests/fate/ffmpeg.mak
15++++ b/tests/fate/ffmpeg.mak
16+@@ -86,7 +86,7 @@ fate-unknown_layout-ac3: CMD = md5 -auto_conversion_filters \
17+ -guess_layout_max 0 -f s32le -ac 1 -ar 44100 -i $(TARGET_PATH)/$(AREF) \
18+ -f ac3 -flags +bitexact -c ac3_fixed
19+
20+-FATE_FFMPEG-$(call ALLYES, FILE_PROTOCOL LAVFI_INDEV RAWVIDEO_DEMUXER \
21++FATE_SAMPLES_FFMPEG-$(call ALLYES, FILE_PROTOCOL LAVFI_INDEV RAWVIDEO_DEMUXER \
22+ SINE_FILTER PCM_S16LE_DECODER RAWVIDEO_DECODER \
23+ ARESAMPLE_FILTER AMIX_FILTER MPEG4_ENCODER \
24+ AC3_FIXED_ENCODER FRAMECRC_MUXER PIPE_PROTOCOL) \
25+--
26+2.33.1
27+
pkgs/development/libraries/ffmpeg/5.nixnew file+14
@@ -0,0 +1,14 @@
1+{ callPackage
2+# Darwin frameworks
3+, Cocoa, CoreMedia, VideoToolbox
4+, ...
5+}@args:
6+
7+callPackage ./generic.nix (rec {
8+ version = "5.0";
9+ branch = version;
10+ sha256 = "1ndy6a2bhl6nvz9grmcaakh4xi0vss455466s47l6qy7na6hn4y0";
11+ darwinFrameworks = [ Cocoa CoreMedia VideoToolbox ];
12+
13+ patches = [ ./0001-fate-ffmpeg-add-missing-samples-dependency-to-fate-s.patch ];
14+} // args)
pkgs/development/libraries/ffmpeg/generic.nix+3−1
@@ -54,6 +54,8 @@ let
5454
5555 ifMinVer = minVer: flag: if reqMin minVer then flag else null;
5656
57+ ifVerOlder = maxVer: flag: if (lib.versionOlder branch maxVer) then flag else null;
58+
5759 # Version specific fix
5860 verFix = withoutFix: fixVer: withFix: if reqMatch fixVer then withFix else withoutFix;
5961
@@ -121,7 +123,7 @@ stdenv.mkDerivation rec {
121123 (ifMinVer "0.6" "--enable-avdevice")
122124 "--enable-avfilter"
123125 (ifMinVer "0.6" "--enable-avformat")
124− (ifMinVer "1.0" "--enable-avresample")
126+ (ifMinVer "1.0" (ifVerOlder "5.0" "--enable-avresample"))
125127 (ifMinVer "1.1" "--enable-avutil")
126128 "--enable-postproc"
127129 (ifMinVer "0.9" "--enable-swresample")
pkgs/development/libraries/java/lombok/default.nix+2−2
@@ -2,11 +2,11 @@
22
33stdenv.mkDerivation rec {
44 pname = "lombok";
5− version = "1.18.20";
5+ version = "1.18.22";
66
77 src = fetchurl {
88 url = "https://projectlombok.org/downloads/lombok-${version}.jar";
9− sha256 = "sha256-zpR75sL751n7vo7ztCtoJfgUyYyIU/EBPy2WMM7fdLA=";
9+ sha256 = "sha256-7O8VgUEdeoLMBCgWZ+4LrF18ClqudM/DhDA5bJHDGDE=";
1010 };
1111
1212 nativeBuildInputs = [ makeWrapper ];
pkgs/development/libraries/qcoro/default.nix+3−2
@@ -8,13 +8,13 @@
88
99mkDerivation rec {
1010 pname = "qcoro";
11− version = "0.3.0";
11+ version = "0.4.0";
1212
1313 src = fetchFromGitHub {
1414 owner = "danvratil";
1515 repo = "qcoro";
1616 rev = "v${version}";
17− sha256 = "09543hpy590dndmlxmcm8c58m97blhaii4wbjr655qxdanhhxgzi";
17+ sha256 = "sha256-RVpyL+BklX8Wyk9Xj9UyuvNK5Vev8ZsrOSMxX1HtcHU=";
1818 };
1919
2020 outputs = [ "out" "dev" ];
@@ -34,5 +34,6 @@ mkDerivation rec {
3434 license = licenses.mit;
3535 maintainers = with maintainers; [ smitop ];
3636 platforms = platforms.linux;
37+ badPlatforms = platforms.aarch64;
3738 };
3839}
pkgs/development/libraries/science/math/fenics/default.nix+2
@@ -26,6 +26,7 @@
2626, zlib
2727, blas
2828, lapack
29+, nixosTests
2930}:
3031let
3132 version = "2019.1.0";
@@ -260,6 +261,7 @@ let
260261 pythonPackages.pybind11
261262 ];
262263 doCheck = false; # Tries to orte_ess_init and call ssh to localhost
264+ passthru.tests = { inherit (nixosTests) fenics; };
263265 meta = {
264266 description = "Python bindings for the DOLFIN FEM compiler";
265267 homepage = "https://fenicsproject.org/";
pkgs/development/python-modules/aenum/default.nix+2−2
@@ -8,12 +8,12 @@
88
99buildPythonPackage rec {
1010 pname = "aenum";
11− version = "3.1.6";
11+ version = "3.1.8";
1212 format = "setuptools";
1313
1414 src = fetchPypi {
1515 inherit pname version;
16− sha256 = "3ba2c25dd03fbf3992353595be18152e2fb6042f47b526ea66cd5838bb9f1fb6";
16+ sha256 = "8dbe15f446eb8264b788dfeca163fb0a043d408d212152397dc11377b851e4ae";
1717 };
1818
1919 checkInputs = [
pkgs/development/python-modules/bond-api/default.nix+2−2
@@ -10,7 +10,7 @@
1010
1111buildPythonPackage rec {
1212 pname = "bond-api";
13− version = "0.1.15";
13+ version = "0.1.16";
1414 format = "setuptools";
1515
1616 disabled = pythonOlder "3.7";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
1919 owner = "prystupa";
2020 repo = "bond-api";
2121 rev = "v${version}";
22− sha256 = "sha256-Uoz5knqRAtQkD7u/4oylXC60dR2ZU3AuMJNhmvB8fP4=";
22+ sha256 = "1nqf090b14nd7an2n776mb37yskddfnihmas2fy56pxclwvwqr9n";
2323 };
2424
2525 propagatedBuildInputs = [
pkgs/development/python-modules/cyclonedx-python-lib/default.nix+2−2
@@ -17,7 +17,7 @@
1717
1818buildPythonPackage rec {
1919 pname = "cyclonedx-python-lib";
20− version = "1.1.1";
20+ version = "1.3.0";
2121 format = "pyproject";
2222
2323 disabled = pythonOlder "3.6";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
2626 owner = "CycloneDX";
2727 repo = pname;
2828 rev = "v${version}";
29− hash = "sha256-gyqpd3kAW74ax3+ECVEmu4un2N0Xyl/aid4VrBihHxI=";
29+ hash = "sha256-/1kWvhTUS0JT0RwodiivJSUiWIDwQyXxdjF/KUlCNds=";
3030 };
3131
3232 nativeBuildInputs = [
pkgs/development/python-modules/denonavr/default.nix+2−7
@@ -15,7 +15,7 @@
1515
1616buildPythonPackage rec {
1717 pname = "denonavr";
18− version = "0.10.9";
18+ version = "0.10.10";
1919 format = "setuptools";
2020
2121 disabled = pythonOlder "3.6";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
2424 owner = "scarface-4711";
2525 repo = pname;
2626 rev = version;
27− sha256 = "sha256-Y0sFRKnKZAdP95EyE3h1g92AJeT0Xkshjjwfv/vnfW8=";
27+ sha256 = "sha256-ZL04JJZStOr6egoki85qCQrXoSTTO43RlLVbNBVz3QA=";
2828 };
2929
3030 propagatedBuildInputs = [
@@ -42,11 +42,6 @@ buildPythonPackage rec {
4242 pytest-timeout
4343 ];
4444
45− disabledTestPaths = [
46− # https://github.com/ol-iver/denonavr/issues/228
47− "tests/test_denonavr.py"
48− ];
49−
5045 pythonImportsCheck = [
5146 "denonavr"
5247 ];
pkgs/development/python-modules/flux-led/default.nix+2−2
@@ -8,7 +8,7 @@
88
99buildPythonPackage rec {
1010 pname = "flux-led";
11− version = "0.28.8";
11+ version = "0.28.10";
1212 format = "setuptools";
1313
1414 disabled = pythonOlder "3.7";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
1717 owner = "Danielhiversen";
1818 repo = "flux_led";
1919 rev = version;
20− sha256 = "sha256-/dEIrTkioqHBJouqk9pTsR0Xhkd6FoIjjOc5HwMBGrI=";
20+ sha256 = "sha256-kH+0W+MgdA7+owqC5KsOnqCidErCaQ3mEueZdP8eAS0=";
2121 };
2222
2323 propagatedBuildInputs = [
pkgs/development/python-modules/git-revise/default.nix+5−4
@@ -2,25 +2,26 @@
22, buildPythonPackage
33, pythonOlder
44, git
5+, gnupg
56, fetchFromGitHub
67, pytestCheckHook
78}:
89
910buildPythonPackage rec {
1011 pname = "git-revise";
11− version = "0.6.0";
12+ version = "0.7.0";
1213
1314 # Missing tests on PyPI
1415 src = fetchFromGitHub {
1516 owner = "mystor";
1617 repo = pname;
1718 rev = "v${version}";
18− sha256 = "03v791yhips9cxz9hr07rhsgxfhwyqq17rzi7ayjhwvy65s4hzs9";
19+ sha256 = "sha256-xV1Z9O5FO4Q/XEpNwnX31tbv8CrXY+wF1Ltpfq+ITRg=";
1920 };
2021
21− disabled = pythonOlder "3.6";
22+ disabled = pythonOlder "3.8";
2223
23− checkInputs = [ git pytestCheckHook ];
24+ checkInputs = [ git gnupg pytestCheckHook ];
2425
2526 meta = with lib; {
2627 description = "Efficiently update, split, and rearrange git commits";
pkgs/development/python-modules/identify/default.nix+2−2
@@ -9,7 +9,7 @@
99
1010buildPythonPackage rec {
1111 pname = "identify";
12− version = "2.4.4";
12+ version = "2.4.5";
1313 format = "setuptools";
1414
1515 disabled = pythonOlder "3.7";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
1818 owner = "pre-commit";
1919 repo = pname;
2020 rev = "v${version}";
21− sha256 = "sha256-G819m1mMtk5v1paMf9vdK/m/gbq08NNHM1bfW7jb+JA=";
21+ sha256 = "sha256-VXQ9lyouwAuw2iGr1m/2KFklUFgmQOP2/gwInATKB4k=";
2222 };
2323
2424 checkInputs = [
pkgs/development/python-modules/meshtastic/default.nix+2−2
@@ -18,7 +18,7 @@
1818
1919buildPythonPackage rec {
2020 pname = "meshtastic";
21− version = "1.2.58";
21+ version = "1.2.75";
2222 format = "setuptools";
2323
2424 disabled = pythonOlder "3.6";
@@ -27,7 +27,7 @@ buildPythonPackage rec {
2727 owner = "meshtastic";
2828 repo = "Meshtastic-python";
2929 rev = version;
30− sha256 = "sha256-USUqVzVfkp9X4zRl4D6gGDkJ/tRG3sN36MqcmJebwL4=";
30+ sha256 = "sha256-VIeW7RloEIBU7YNG7f2e8PdFR+FauIwKLkd7v4qRCOA=";
3131 };
3232
3333 propagatedBuildInputs = [
pkgs/development/python-modules/online-judge-api-client/default.nixnew file+60
@@ -0,0 +1,60 @@
1+{ lib
2+, appdirs
3+, beautifulsoup4
4+, buildPythonPackage
5+, colorlog
6+, fetchFromGitHub
7+, git
8+, jsonschema
9+, lxml
10+, markdown
11+, python
12+, requests
13+, substituteAll
14+, toml
15+}:
16+
17+let
18+ # NOTE This is needed to download & run another Python program internally in
19+ # order to generate test cases for library-checker problems.
20+ pythonEnv = python.withPackages (ps: with ps; [ colorlog jinja2 markdown toml ]);
21+in buildPythonPackage rec {
22+ pname = "online-judge-api-client";
23+ version = "10.10.0";
24+
25+ src = fetchFromGitHub {
26+ owner = "online-judge-tools";
27+ repo = "api-client";
28+ rev = "v${version}";
29+ sha256 = "0lmryqi0bv82v9k9kf1rzzq9zr83smpmy8ivzw4fk31hvpczp4fn";
30+ };
31+
32+ patches = [ ./fix-paths.patch ];
33+ postPatch = ''
34+ substituteInPlace onlinejudge/service/library_checker.py \
35+ --subst-var-by git ${git} \
36+ --subst-var-by pythonInterpreter ${pythonEnv.interpreter}
37+ '';
38+
39+ propagatedBuildInputs = [
40+ appdirs
41+ beautifulsoup4
42+ colorlog
43+ jsonschema
44+ lxml
45+ requests
46+ toml
47+ ];
48+
49+ # Requires internet access
50+ doCheck = false;
51+
52+ pythonImportsCheck = [ "onlinejudge" "onlinejudge_api" ];
53+
54+ meta = with lib; {
55+ description = "API client to develop tools for competitive programming";
56+ homepage = "https://github.com/online-judge-tools/api-client";
57+ license = licenses.mit;
58+ maintainers = with maintainers; [ sei40kr ];
59+ };
60+}
pkgs/development/python-modules/online-judge-api-client/fix-paths.patchnew file+39
@@ -0,0 +1,39 @@
1+diff --git a/onlinejudge/service/library_checker.py b/onlinejudge/service/library_checker.py
2+index b63c7b7..e062490 100644
3+--- a/onlinejudge/service/library_checker.py
4++++ b/onlinejudge/service/library_checker.py
5+@@ -51,7 +51,7 @@ class LibraryCheckerService(onlinejudge.type.Service):
6+ return
7+
8+ try:
9+- subprocess.check_call(['git', '--version'], stdout=sys.stderr, stderr=sys.stderr)
10++ subprocess.check_call(['@git@/bin/git', '--version'], stdout=sys.stderr, stderr=sys.stderr)
11+ except FileNotFoundError:
12+ logger.error('git command not found')
13+ raise
14+@@ -60,12 +60,12 @@ class LibraryCheckerService(onlinejudge.type.Service):
15+ if not path.exists():
16+ # init the problem repository
17+ url = 'https://github.com/yosupo06/library-checker-problems'
18+- logger.info('$ git clone %s %s', url, path)
19+- subprocess.check_call(['git', 'clone', url, str(path)], stdout=sys.stderr, stderr=sys.stderr)
20++ logger.info('$ @git@/bin/git clone %s %s', url, path)
21++ subprocess.check_call(['@git@/bin/git', 'clone', url, str(path)], stdout=sys.stderr, stderr=sys.stderr)
22+ else:
23+ # sync the problem repository
24+- logger.info('$ git -C %s pull', str(path))
25+- subprocess.check_call(['git', '-C', str(path), 'pull'], stdout=sys.stderr, stderr=sys.stderr)
26++ logger.info('$ @git@/bin/git -C %s pull', str(path))
27++ subprocess.check_call(['@git@/bin/git', '-C', str(path), 'pull'], stdout=sys.stderr, stderr=sys.stderr)
28+
29+ cls.is_repository_updated = True
30+
31+@@ -100,7 +100,7 @@ class LibraryCheckerProblem(onlinejudge.type.Problem):
32+ logger.warning("generate.py may not work on Windows")
33+
34+ problem_spec = str(self._get_problem_directory_path() / 'info.toml')
35+- command = [sys.executable, str(path / 'generate.py'), problem_spec]
36++ command = ['@pythonInterpreter@', str(path / 'generate.py'), problem_spec]
37+ if compile_checker:
38+ command.append('--compile-checker')
39+ logger.info('$ %s', ' '.join(command))
pkgs/development/python-modules/online-judge-tools/default.nixnew file+31
@@ -0,0 +1,31 @@
1+{ lib
2+, buildPythonPackage
3+, colorama
4+, fetchFromGitHub
5+, online-judge-api-client
6+, requests
7+}:
8+
9+buildPythonPackage rec {
10+ pname = "online-judge-tools";
11+ version = "11.5.1";
12+
13+ src = fetchFromGitHub {
14+ owner = "online-judge-tools";
15+ repo = "oj";
16+ rev = "v${version}";
17+ sha256 = "0zkzmmjgjb6lyrzq1ip54cpnp7al9a7mcyjyi5vx58bvnx3q0c6m";
18+ };
19+
20+ propagatedBuildInputs = [ colorama online-judge-api-client requests ];
21+
22+ # Requires internet access
23+ doCheck = false;
24+
25+ meta = with lib; {
26+ description = "Tools for various online judges. Download sample cases, generate additional test cases, test your code, and submit it.";
27+ homepage = "https://github.com/online-judge-tools/oj";
28+ license = licenses.mit;
29+ maintainers = with maintainers; [ sei40kr ];
30+ };
31+}
pkgs/development/python-modules/python-keycloak/default.nixnew file+41
@@ -0,0 +1,41 @@
1+{ lib
2+, buildPythonPackage
3+, fetchFromGitHub
4+, requests
5+, python-jose
6+, httmock
7+}:
8+
9+buildPythonPackage rec {
10+ pname = "python-keycloak";
11+ version = "0.26.1";
12+
13+ src = fetchFromGitHub {
14+ owner = "marcospereirampj";
15+ repo = "python-keycloak";
16+ rev = version;
17+ sha256 = "sha256-YWDj/dLN72XMxDXpSPQvkxHF5xJ15xWJjw3vtfmxlwo=";
18+ };
19+
20+ propagatedBuildInputs = [
21+ requests
22+ python-jose
23+ ];
24+
25+ checkInputs = [
26+ httmock
27+ ];
28+
29+ checkPhase = ''
30+ python -m unittest discover
31+ '';
32+
33+ pythonImportsCheck = [ "keycloak" ];
34+
35+ meta = with lib; {
36+ description = "Provides access to the Keycloak API";
37+ homepage = "https://github.com/marcospereirampj/python-keycloak";
38+ license = licenses.mit;
39+ maintainers = with maintainers; [ costrouc ];
40+ };
41+}
pkgs/development/python-modules/total-connect-client/default.nix+2−2
@@ -8,7 +8,7 @@
88
99buildPythonPackage rec {
1010 pname = "total-connect-client";
11− version = "2021.12";
11+ version = "2022.1";
1212 format = "setuptools";
1313
1414 disabled = pythonOlder "3.7";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
1717 owner = "craigjmidwinter";
1818 repo = "total-connect-client";
1919 rev = version;
20− hash = "sha256-cgs6wIMSO8t8CPn6aR35sNcgfDaXDyFBldNEBOr850s=";
20+ hash = "sha256-sFVjAIFhTZf1z9XUTukHvNl8/ITL6FMOnZMMDKP7X30=";
2121 };
2222
2323 propagatedBuildInputs = [
pkgs/development/python-modules/txtorcon/default.nix+2−1
@@ -1,4 +1,4 @@
1−{ lib, python, buildPythonPackage, pythonOlder, fetchPypi, isPy3k, incremental, ipaddress, twisted
1+{ lib, stdenv, python, buildPythonPackage, pythonOlder, fetchPypi, isPy3k, incremental, ipaddress, twisted
22, automat, zope_interface, idna, pyopenssl, service-identity, pytest, mock, lsof
33, GeoIP}:
44
@@ -22,6 +22,7 @@ buildPythonPackage rec {
2222 # as Python 3.5.
2323 disabled = pythonOlder "3.5";
2424
25+ doCheck = !(stdenv.isDarwin && stdenv.isAarch64);
2526 checkPhase = ''
2627 ${python.interpreter} -m twisted.trial -j $NIX_BUILD_CORES ./test
2728 '';
pkgs/development/tools/continuous-integration/jenkins/default.nix+1−1
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
2727 '';
2828
2929 passthru = {
30− tests = { inherit (nixosTests) jenkins; };
30+ tests = { inherit (nixosTests) jenkins jenkins-cli; };
3131
3232 updateScript = writeScript "update.sh" ''
3333 #!${stdenv.shell}
pkgs/development/tools/parsing/tree-sitter/default.nix+3−3
@@ -29,9 +29,9 @@ let
2929 # 2) nix-build -A tree-sitter.updater.update-all-grammars
3030 # 3) OPTIONAL: Set GITHUB_TOKEN env variable to avoid api rate limit
3131 # 4) run the ./result script that is output by that (it updates ./grammars)
32− version = "0.20.2";
33− sha256 = "sha256-XCTS58q1XCl7XH6SLTZDZv22nUPBK8d4oqk063ZObkg=";
34− cargoSha256 = "sha256-fKS9Q3BFGzyMnbNH6ItYnPj4dybeX7ucQfzYiOxVvhA=";
32+ version = "0.20.4";
33+ sha256 = "sha256-H/7j4HnaccmaH5m/FMTbi01uA3JtKVHiJLTQ4VZ7jfo=";
34+ cargoSha256 = "sha256-Pf/gVBQFssOomzq0IZp5H7MYwvFBRjMYfifLKCB7DCs=";
3535
3636 src = fetchFromGitHub {
3737 owner = "tree-sitter";
pkgs/development/tools/parsing/tree-sitter/grammars/default.nix+1−2
@@ -1,5 +1,4 @@
11{ lib }:
2−
32{
43 tree-sitter-agda = lib.importJSON ./tree-sitter-agda.json;
54 tree-sitter-bash = lib.importJSON ./tree-sitter-bash.json;
@@ -55,8 +54,8 @@
5554 tree-sitter-nix = lib.importJSON ./tree-sitter-nix.json;
5655 tree-sitter-norg = lib.importJSON ./tree-sitter-norg.json;
5756 tree-sitter-ocaml = lib.importJSON ./tree-sitter-ocaml.json;
58− tree-sitter-perl = lib.importJSON ./tree-sitter-perl.json;
5957 tree-sitter-org = lib.importJSON ./tree-sitter-org.json;
58+ tree-sitter-perl = lib.importJSON ./tree-sitter-perl.json;
6059 tree-sitter-php = lib.importJSON ./tree-sitter-php.json;
6160 tree-sitter-pioasm = lib.importJSON ./tree-sitter-pioasm.json;
6261 tree-sitter-prisma = lib.importJSON ./tree-sitter-prisma.json;
pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c-sharp.json+4−4
@@ -1,9 +1,9 @@
11{
22 "url": "https://github.com/tree-sitter/tree-sitter-c-sharp",
3− "rev": "3104df21065af0f3d51e05a96cd0e2ff16a6f982",
4− "date": "2021-12-09T21:13:54+00:00",
5− "path": "/nix/store/1xgrz7rm6mc6j2svaidj4x0zyda0ahz4-tree-sitter-c-sharp",
6− "sha256": "14g8x5q4xc87s2wpycws6r6ci083j7pk1jdw6sr8qp96zyzs17pp",
3+ "rev": "352a4630c81a7a5cbd3bc67327743bd8d38f2dd2",
4+ "date": "2022-01-03T12:31:17+00:00",
5+ "path": "/nix/store/c7k10h98vzqag0rsywm0p71jaz57880x-tree-sitter-c-sharp",
6+ "sha256": "198n5i9bvks0mmbqgzjgrhv6hy1afnx806jnap10241iyd817jbf",
77 "fetchLFS": false,
88 "fetchSubmodules": false,
99 "deepClone": false,
pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-comment.json+4−4
@@ -1,9 +1,9 @@
11{
22 "url": "https://github.com/stsewd/tree-sitter-comment",
3− "rev": "5dd3c62f1bbe378b220fe16b317b85247898639e",
4− "date": "2021-10-01T17:13:56-05:00",
5− "path": "/nix/store/isrc5wlyxvcawfj35yi4nmblshy69b1j-tree-sitter-comment",
6− "sha256": "1wk6lxzndaikbrn72pa54y59qs0xnfaffc8mxmm6c5v5x16l8vb3",
3+ "rev": "6975eb268f42df2afc313f96c0693e284685dba7",
4+ "date": "2022-01-22T20:58:19-05:00",
5+ "path": "/nix/store/nl4whdipy7a4g3ds2yv3c0qr7z4pifwn-tree-sitter-comment",
6+ "sha256": "009krarzs9qykd8fas67gychjzcbgj8j0jm9h0963dlxs4hyay73",
77 "fetchLFS": false,
88 "fetchSubmodules": false,
99 "deepClone": false,
pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json+4−4
@@ -1,9 +1,9 @@
11{
22 "url": "https://github.com/tree-sitter/tree-sitter-cpp",
3− "rev": "e8dcc9d2b404c542fd236ea5f7208f90be8a6e89",
4− "date": "2021-10-28T08:16:36-05:00",
5− "path": "/nix/store/d08ymiv4qjs9hnc8b0yw700da47879wb-tree-sitter-cpp",
6− "sha256": "1h0q4prr8yf714abz16i2ym41sskmilmga521sxv9d75kqhyb3wl",
3+ "rev": "656d7ea44b2b0daece78791e30281e283f30001e",
4+ "date": "2022-01-17T09:06:11-06:00",
5+ "path": "/nix/store/w4qqya24zf0cd7rqw1440szrrad8nf23-tree-sitter-cpp",
6+ "sha256": "0vfgv9rw8pw4d41p5rndy7cjw8w0k0vnn54cwpxkm3r2vblnjn58",
77 "fetchLFS": false,
88 "fetchSubmodules": false,
99 "deepClone": false,
pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cuda.json+4−4
@@ -1,9 +1,9 @@
11{
22 "url": "https://github.com/thehamsta/tree-sitter-cuda",
3− "rev": "bc20ed7a36031437a69a88ef368af4b9f1ecec70",
4− "date": "2021-12-10T00:43:38+01:00",
5− "path": "/nix/store/zagrgq7zfh6n90z4qpp8cy002g588dhj-tree-sitter-cuda",
6− "sha256": "04gnfjq5rd1vcby8737wxhzmg4vmn2ggjz6n94bbna8b96qc1xxj",
3+ "rev": "14cd86e18ba45e327017de5b3e0f8d8f7f8e98ec",
4+ "date": "2022-01-24T00:39:28+01:00",
5+ "path": "/nix/store/3lskjrhqd16ymvsbrwzcsdd80cyr7ljj-tree-sitter-cuda",
6+ "sha256": "09qpl5mfv39788smz87zbzp04i3rdhsckjjqngvr0w24dsw30nyx",
77 "fetchLFS": false,
88 "fetchSubmodules": false,
99 "deepClone": false,
pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-elixir.json+4−4
@@ -1,9 +1,9 @@
11{
22 "url": "https://github.com/elixir-lang/tree-sitter-elixir",
3− "rev": "1b3ecf7765979a5602bbb8988b8fc0d9f4c887d6",
4− "date": "2021-12-15T23:29:48+01:00",
5− "path": "/nix/store/ahdmwdlw7g63wf681cvclxh92mp8waba-tree-sitter-elixir",
6− "sha256": "09kmi989hp2fp7w1xsambnlnp49fnnivdh45pwz9y3dab8iyngsn",
3+ "rev": "de20391afe5cb03ef1e8a8e43167e7b58cc52869",
4+ "date": "2022-01-10T10:35:12-06:00",
5+ "path": "/nix/store/099pwd7iv86g1j4fplgq33a4jpwbvv60-tree-sitter-elixir",
6+ "sha256": "0zrkrwhw3g1vazsxcwrfd1fk4wvs9hdwmwp6073mfh370bz4140h",
77 "fetchLFS": false,
88 "fetchSubmodules": false,
99 "deepClone": false,
pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-elm.json+4−4
@@ -1,9 +1,9 @@
11{
22 "url": "https://github.com/elm-tooling/tree-sitter-elm",
3− "rev": "8dd06afd9ca60a420374c6b65831e58a1d1237ad",
4− "date": "2021-07-26T03:59:46+02:00",
5− "path": "/nix/store/pz5nbdx19mdq6dp238l1qc3n81l2i88f-tree-sitter-elm",
6− "sha256": "1mncr0nvb616zn2172pqcjd2jrqzyfad0y1pz2mwh8pqwfr0c3nf",
3+ "rev": "bd50ccf66b42c55252ac8efc1086af4ac6bab8cd",
4+ "date": "2021-12-27T23:25:02+01:00",
5+ "path": "/nix/store/l5b9nhvrnq4a105rpmfi59dpg2xqs5nr-tree-sitter-elm",
6+ "sha256": "1ls9l81nkcyym92n6h983m3jjjxdlr27nxa21p9l6czwf34564ky",
77 "fetchLFS": false,
88 "fetchSubmodules": false,
99 "deepClone": false,
pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-embedded-template.json+4−4
@@ -1,9 +1,9 @@
11{
22 "url": "https://github.com/tree-sitter/tree-sitter-embedded-template",
3− "rev": "1c03594a44df1fc2020b989d503cb084abd5fd01",
4− "date": "2021-03-04T10:06:18-08:00",
5− "path": "/nix/store/09b9drfnywcy1i8wlw6slnn76ch40kqk-tree-sitter-embedded-template",
6− "sha256": "0c9l4i6kwb29zp05h616y3vk2hhcfc8bhdf9m436bk47pfy2zabg",
3+ "rev": "d21df11b0ecc6fd211dbe11278e92ef67bd17e97",
4+ "date": "2021-12-23T08:53:16-08:00",
5+ "path": "/nix/store/zy74brmd1x2q68bpvi5v4z52bhmkcmy8-tree-sitter-embedded-template",
6+ "sha256": "0h3nj6fz512riyx2b65pg9pjprkpkasnglwljlzi6s1in9fdig3x",
77 "fetchLFS": false,
88 "fetchSubmodules": false,
99 "deepClone": false,
pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-glsl.json+4−4
@@ -1,9 +1,9 @@
11{
22 "url": "https://github.com/thehamsta/tree-sitter-glsl",
3− "rev": "26ba31a3f5a85ebed5d71e49eef11a003bed782b",
4− "date": "2021-11-22T08:02:47+01:00",
5− "path": "/nix/store/khlrphky7p7qdivnn34r8hxlpzgav3xm-tree-sitter-glsl",
6− "sha256": "0qvn45whhd6q4wwqaihfd90197xr8lcynwjj418hxl83m9zy8xcz",
3+ "rev": "ffb93961426926554a0ba4a389ea6e9d6fafdea9",
4+ "date": "2022-01-24T11:15:06+01:00",
5+ "path": "/nix/store/x508b69xq0y2ly4hspkgyq5g0v29xvjz-tree-sitter-glsl",
6+ "sha256": "1b91wamhdzqq76l9k3vkmrdb1j98w5slzw8d4piqlgp70j396813",
77 "fetchLFS": false,
88 "fetchSubmodules": false,
99 "deepClone": false,
pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-go.json+4−4
@@ -1,9 +1,9 @@
11{
22 "url": "https://github.com/tree-sitter/tree-sitter-go",
3− "rev": "1203c11e422c73350e672445c5c32b8c0f79266d",
4− "date": "2021-12-03T14:22:11-08:00",
5− "path": "/nix/store/5h584m7qgvlh0s5k10503zj3idggandz-tree-sitter-go",
6− "sha256": "03i63mh5g21y424pf9whl42p7shqp9xlrx90xpyrd12dlc9zhh2j",
3+ "rev": "0fa917a7022d1cd2e9b779a6a8fc5dc7fad69c75",
4+ "date": "2022-01-06T10:54:10+01:00",
5+ "path": "/nix/store/bw2hilbj37ys9lig2fzz58cvjy7nhn3l-tree-sitter-go",
6+ "sha256": "0kgy4yyd0z8pydldnfwsfw2iwbhn4f43qxfhy94wvpwiwi74kfmg",
77 "fetchLFS": false,
88 "fetchSubmodules": false,
99 "deepClone": false,
pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-haskell.json+4−4
@@ -1,9 +1,9 @@
11{
22 "url": "https://github.com/tree-sitter/tree-sitter-haskell",
3− "rev": "d72f2e42c0d5ccf8e8b1c39e3642428317e8fe02",
4− "date": "2021-11-14T23:21:37+01:00",
5− "path": "/nix/store/n36iwva3hk2045wx87mahbsfrqhx6mbw-tree-sitter-haskell",
6− "sha256": "0clqyd1mnfz8xcpsr90nzh6j37pdgbgrr4jqf9ifn6m851k4f09g",
3+ "rev": "d6ccd2d9c40bdec29fee0027ef04fe5ff1ae4ceb",
4+ "date": "2022-01-07T03:13:04+01:00",
5+ "path": "/nix/store/biyjfajma7nr175xviaw65jksqfak893-tree-sitter-haskell",
6+ "sha256": "0zfxi3adqhy7d1w2dvnywkms8a4vfxkjswdhar7p5sxyps8a5wry",
77 "fetchLFS": false,
88 "fetchSubmodules": false,
99 "deepClone": false,
pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-heex.json+4−4
@@ -1,9 +1,9 @@
11{
22 "url": "https://github.com/connorlay/tree-sitter-heex",
3− "rev": "625a721ac38d9dd23d4f2b08eceb6700a2e670d5",
4− "date": "2021-10-19T12:18:28-07:00",
5− "path": "/nix/store/pr36q25xgnpmywm53w6rg58ygs9l93wj-tree-sitter-heex",
6− "sha256": "1r7wrb1h2l35wp0hlswb3xpwcf55dr56r865sriq3ngv89y64yha",
3+ "rev": "d8b5b9f016cd3c7b0ee916cf031d9a2188c0fc44",
4+ "date": "2022-01-23T20:01:08-08:00",
5+ "path": "/nix/store/iv3vxp8cdnfhpr75gvqvm8hmvfw8hw51-tree-sitter-heex",
6+ "sha256": "0dx6l9k6l5ibvrdb7x13lqnpj5nmjz8f5lc8j8wh4cq2jdabfw0k",
77 "fetchLFS": false,
88 "fetchSubmodules": false,
99 "deepClone": false,
pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-java.json+4−4
@@ -1,9 +1,9 @@
11{
22 "url": "https://github.com/tree-sitter/tree-sitter-java",
3− "rev": "ed3a87f750b1d1d533f15ab93fef3e1f5a46e234",
4− "date": "2021-10-17T09:05:07+02:00",
5− "path": "/nix/store/crd0zzw31hx5jw7m95dvpssr3pi60k5l-tree-sitter-java",
6− "sha256": "14qwmpm7dzqwby59vy1nhyddfz2lpf69ajr65s7qaqh0jcs6rs19",
3+ "rev": "a24ae7d16de3517bff243a87d087d0b4877a65c5",
4+ "date": "2022-01-12T08:57:59-08:00",
5+ "path": "/nix/store/dipis7syj55xrmc72gvx2f9q672mn6dg-tree-sitter-java",
6+ "sha256": "0p01xkxzdjwx32hd6k4kqidlhkgj8q9b9lp4g4fra5gx9w159iqm",
77 "fetchLFS": false,
88 "fetchSubmodules": false,
99 "deepClone": false,
pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-latex.json+4−4
@@ -1,9 +1,9 @@
11{
22 "url": "https://github.com/latex-lsp/tree-sitter-latex",
3− "rev": "2c0d03a36ee979bc697f6a9dd119174cf0ef15e0",
4− "date": "2021-07-19T17:50:34+02:00",
5− "path": "/nix/store/vrpfbjfps3bd9vrx8760l0vx7m7ijhja-tree-sitter-latex",
6− "sha256": "0dfpdv5sibvajf2grlc0mqhyggjf6ip9j01jikk58n1yc9va88ib",
3+ "rev": "6f796b700c69a8af28132e84ed6d0c8f0c17a5e2",
4+ "date": "2022-01-11T19:20:05+01:00",
5+ "path": "/nix/store/48rdm71qngr9szsfhr85708srwn6b4ra-tree-sitter-latex",
6+ "sha256": "0rbaql6jh3kwa4fap3b438l1733h2pbiazdbjzv38bbigkirad0n",
77 "fetchLFS": false,
88 "fetchSubmodules": false,
99 "deepClone": false,
pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-llvm.json+4−4
@@ -1,9 +1,9 @@
11{
22 "url": "https://github.com/benwilliamgraham/tree-sitter-llvm",
3− "rev": "d4f61bed8ecb632addcd5e088c4f4cb9c1bf1c5b",
4− "date": "2021-10-03T12:19:51-04:00",
5− "path": "/nix/store/k9vpa9lvrvf1im6wx0c0xyjf2yzgbn0x-tree-sitter-llvm",
6− "sha256": "0iiigra7knvwsb6v76qs7vxpkmfnggakd27gl6sz9dm6gimp1adp",
3+ "rev": "3b213925b9c4f42c1acfe2e10bfbb438d9c6834d",
4+ "date": "2021-12-27T14:02:51-05:00",
5+ "path": "/nix/store/hjg9z82l3iqyjw0s9lf1kkm31p5wlv3d-tree-sitter-llvm",
6+ "sha256": "0ymrdcajji11852c158w67mgcsycphwj9mh777q3n4jn8pp37y8j",
77 "fetchLFS": false,
88 "fetchSubmodules": false,
99 "deepClone": false,
pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-norg.json+4−4
@@ -1,9 +1,9 @@
11{
22 "url": "https://github.com/nvim-neorg/tree-sitter-norg",
3− "rev": "665736e400cfd52ae92ead244ca9f5d44db98151",
4− "date": "2021-12-14T15:04:57+01:00",
5− "path": "/nix/store/crbl24rj54f8c9pjq8igadz3wqcw6qrw-tree-sitter-norg",
6− "sha256": "0hxar07a7n3ghqagr0qjxbz4sgzcpyxwgd4dbj1vvy4xnk07i0br",
3+ "rev": "c4be6addec0a8ada234684ced6c928189fd399af",
4+ "date": "2022-01-22T17:12:52+01:00",
5+ "path": "/nix/store/x73fgsrav1fg0vzydcy4ayrawn0cw7w2-tree-sitter-norg",
6+ "sha256": "14wf53p6lkf4xknzb4bngh9fsas6hnr8iv73xnalyf8mqq1977pc",
77 "fetchLFS": false,
88 "fetchSubmodules": false,
99 "deepClone": false,
pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-org.json+4−4
@@ -1,9 +1,9 @@
11{
22 "url": "https://github.com/milisims/tree-sitter-org",
3− "rev": "39a377f5072ee9f79884e227dc49d42c2eba67d8",
4− "date": "2021-11-01T23:43:23-04:00",
5− "path": "/nix/store/cgsn53p4gp1ahq2zl38jz51xal60dckf-tree-sitter-org",
6− "sha256": "0vfnph4xxvkalzk3rgvzi6ckqkjg31ddzgh4mwbk7qwsacbq9rss",
3+ "rev": "f110024d539e676f25b72b7c80b0fd43c34264ef",
4+ "date": "2021-11-28T23:04:31-05:00",
5+ "path": "/nix/store/8vc7ddhd2wzrin3cj14zrw5mmi58f8sl-tree-sitter-org",
6+ "sha256": "1gvqvdapqfac1ny1a0l590h1w617wczwv234fsnal6amfdyganxc",
77 "fetchLFS": false,
88 "fetchSubmodules": false,
99 "deepClone": false,
pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-perl.json+4−4
@@ -1,9 +1,9 @@
11{
22 "url": "https://github.com/ganezdragon/tree-sitter-perl",
3− "rev": "0ac2c6da562c7a2c26ed7e8691d4a590f7e8b90a",
4− "date": "2021-11-01T14:40:51-04:00",
5− "path": "/nix/store/1yzkap7jvps3xdj19pygyv1bn6c33qak-tree-sitter-perl",
6− "sha256": "184zaicrl9i4cywhyc2cxpghw7daz9pi0fhwkkgpv7j6kvp1ig2w",
3+ "rev": "ab2b39439f2fc82fd5ea0b7e08509760d4cbacd5",
4+ "date": "2022-01-23T13:55:11-05:00",
5+ "path": "/nix/store/s55aybm3r5n7l7nx916mhjyry96xcvin-tree-sitter-perl",
6+ "sha256": "16ap0yq9gmh0kbyka7zcpjw3dl368n23sxp3v82z4ccwzmgfmaw4",
77 "fetchLFS": false,
88 "fetchSubmodules": false,
99 "deepClone": false,
pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-query.json+4−4
@@ -1,9 +1,9 @@
11{
22 "url": "https://github.com/nvim-treesitter/tree-sitter-query",
3− "rev": "9a2ccff9f672f1f3d320cf925b8e5acc89b27055",
4− "date": "2021-07-13T08:51:40-05:00",
5− "path": "/nix/store/k843gr9rlkd5jaf9arvlwcs31wsznn81-tree-sitter-query",
6− "sha256": "0x5ssq8pb767s1l68123jaa5p4570xmz74ii94kckd46wmqbk4v9",
3+ "rev": "5217c6805c09f8fc00ed13d17d5fcb791437aee6",
4+ "date": "2021-12-23T16:48:02-05:00",
5+ "path": "/nix/store/b8n553bwlyzi05p8vn08qv6vbzg9875q-tree-sitter-query",
6+ "sha256": "00q6cpw5rkb20cypx820glqhfs4vsgqdymj5y0sknd874lq6crfg",
77 "fetchLFS": false,
88 "fetchSubmodules": false,
99 "deepClone": false,
pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-r.json+4−4
@@ -1,9 +1,9 @@
11{
22 "url": "https://github.com/r-lib/tree-sitter-r",
3− "rev": "91f587e5685f46e26f9f6e55f2e06d503f8f0fc0",
4− "date": "2021-12-03T10:44:27-05:00",
5− "path": "/nix/store/z89yfih6g05fkrzz6s7snkyqp8wj8pi5-tree-sitter-r",
6− "sha256": "0dds34vgrvgxi1918a2w6xcw5l8n9ch3qi43vql769p8zxf8qijp",
3+ "rev": "d9868735e401e4870a3d4422790b585fea3faec8",
4+ "date": "2022-01-10T10:12:40-05:00",
5+ "path": "/nix/store/b2dp06sk8s3ksm382gndshhd1mxmd6n6-tree-sitter-r",
6+ "sha256": "1pl38gksb4cwdgrb92rbmkanxn65m99i6c8w8xldhs0q97d1v5k0",
77 "fetchLFS": false,
88 "fetchSubmodules": false,
99 "deepClone": false,
pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-regex.json+4−4
@@ -1,9 +1,9 @@
11{
22 "url": "https://github.com/tree-sitter/tree-sitter-regex",
3− "rev": "7b97502cfc3ffa7110f6b68bb39fb259c9a0500c",
4− "date": "2021-08-17T11:21:39-07:00",
5− "path": "/nix/store/3lpj820c141i26p20kin465xlr5jpyjs-tree-sitter-regex",
6− "sha256": "0n9lmwwgij00078v3fr19vfn1g3wh3agm8jqp80v1cnrcsmpn97p",
3+ "rev": "e1cfca3c79896ff79842f057ea13e529b66af636",
4+ "date": "2022-01-03T09:37:11-08:00",
5+ "path": "/nix/store/24lr7jzznsd3z7cld007aww25kbwcf51-tree-sitter-regex",
6+ "sha256": "0j6j0h8ciyhgmcq9iy3843anyfvd7s0biqzgbsqgwbgbqbg2nfwl",
77 "fetchLFS": false,
88 "fetchSubmodules": false,
99 "deepClone": false,
pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rst.json+4−4
@@ -1,9 +1,9 @@
11{
22 "url": "https://github.com/stsewd/tree-sitter-rst",
3− "rev": "a5514617ae3644effa80d4696be428e4a371c01a",
4− "date": "2021-11-05T20:58:51-05:00",
5− "path": "/nix/store/is0j0cpd3i7q7liqlcrfdflabmm9rnlg-tree-sitter-rst",
6− "sha256": "1bw0yry968qz4arzckxpyz5zkw6ajyirrxyf78m9lr1zmz1vnivy",
3+ "rev": "b74770c0166f28c1a0ab293513a78712ca1c338b",
4+ "date": "2022-01-22T20:59:44-05:00",
5+ "path": "/nix/store/ymhzq6hwq43gf918zyxk7can4qfkz7n1-tree-sitter-rst",
6+ "sha256": "0q50vwk72lrgnrdjjn5aj1fjksrwkd0gfmdnrjy59a6cw8m1gmf0",
77 "fetchLFS": false,
88 "fetchSubmodules": false,
99 "deepClone": false,
pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ruby.json+4−4
@@ -1,9 +1,9 @@
11{
22 "url": "https://github.com/tree-sitter/tree-sitter-ruby",
3− "rev": "888e2e563ed3b43c417f17e57f7e29c39ce9aeea",
4− "date": "2021-12-03T16:33:06+01:00",
5− "path": "/nix/store/6g101r5pwy6iqicch9srlhwfz9xdrvzd-tree-sitter-ruby",
6− "sha256": "0xfcqafslxlpkw7agw4a179w3c6k6ivi3fzlf32pqfd5bjrlx9d7",
3+ "rev": "fe6a2d634da0e16b11b5aa255cc3df568a4572fd",
4+ "date": "2021-03-03T16:54:30-08:00",
5+ "path": "/nix/store/ragrvqj7hm98r74v5b3fljvc47gd3nhj-tree-sitter-ruby",
6+ "sha256": "0m3h4928rbs300wcb6776h9r88hi32rybbhcaf6rdympl5nzi83v",
77 "fetchLFS": false,
88 "fetchSubmodules": false,
99 "deepClone": false,
pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json+4−4
@@ -1,9 +1,9 @@
11{
22 "url": "https://github.com/tree-sitter/tree-sitter-rust",
3− "rev": "d045b04b66d51c0ba8671e7ce1ee23a9f286b7d7",
4− "date": "2021-12-12T10:08:54-08:00",
5− "path": "/nix/store/2h6vkl05jxqgp4738a0dxccmg40yhqvj-tree-sitter-rust",
6− "sha256": "0ckyaw1ll3yazyg18wd40kc09h6f0zmwqmahsm07bwgfyc2nvf3h",
3+ "rev": "eeb0702ebdac504b97196577b1dac43c80913d7b",
4+ "date": "2022-01-10T13:05:56-08:00",
5+ "path": "/nix/store/sh170d6b589l16rhlygz6hvn1dmfhlb1-tree-sitter-rust",
6+ "sha256": "1npx8kc4qdjj1fszqx6ks1d0x0pklmzm3gkxracs7y28lh2whrvq",
77 "fetchLFS": false,
88 "fetchSubmodules": false,
99 "deepClone": false,
pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-supercollider.json+4−4
@@ -1,9 +1,9 @@
11{
22 "url": "https://github.com/madskjeldgaard/tree-sitter-supercollider",
3− "rev": "ac83e9d5ef3a62d2160d0f1e0a64a949ecda1d8b",
4− "date": "2021-12-21T18:04:07+01:00",
5− "path": "/nix/store/zk5zwg98pljk2dwqax81pib3l68wgl8x-tree-sitter-supercollider",
6− "sha256": "0qpjy40wigcf6r23j2i3yqr061n6zdz60mlm9i5mkii2y65ff8cf",
3+ "rev": "a7201b61779be59ac0fc0d118746c886dbc3edbd",
4+ "date": "2022-01-14T01:11:12+01:00",
5+ "path": "/nix/store/rgy05854am625shbs13gjx0yggbb6awh-tree-sitter-supercollider",
6+ "sha256": "118mbv8d5n2lb4w5cbjy657g9z9z910gvjjj41a2rkx971vgb6w3",
77 "fetchLFS": false,
88 "fetchSubmodules": false,
99 "deepClone": false,
pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-swift.json+4−4
@@ -1,9 +1,9 @@
11{
22 "url": "https://github.com/tree-sitter/tree-sitter-swift",
3− "rev": "a22fa5e19bae50098e2252ea96cba3aba43f4c58",
4− "date": "2019-10-24T19:04:02-06:00",
5− "path": "/nix/store/pk5xk8yp6vanbar75bhfrs104w0k1ph0-tree-sitter-swift",
6− "sha256": "14b40lmwrnyvdz2wiv684kfh4fvqfhbj1dgrx81ppmy7hsz7jcq7",
3+ "rev": "db675450dcc1478ee128c96ecc61c13272431aab",
4+ "date": "2022-01-13T10:47:55-08:00",
5+ "path": "/nix/store/l3535ndrmi24v5nidxppi1rqccj4s17v-tree-sitter-swift",
6+ "sha256": "06mq1an55p75ajwn6pvcy9vlcmzrj8qmbri3mn4bxq53icnj4fya",
77 "fetchLFS": false,
88 "fetchSubmodules": false,
99 "deepClone": false,
pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-tlaplus.json+4−4
@@ -1,9 +1,9 @@
11{
22 "url": "https://github.com/tlaplus-community/tree-sitter-tlaplus",
3− "rev": "26bbaf5d07356cacbf21defa9316988bc732c8b3",
4− "date": "2021-10-12T19:50:03-04:00",
5− "path": "/nix/store/52rs1n8y6krfkb9z2h7jsl4s3j15dp08-tree-sitter-tlaplus",
6− "sha256": "1yj2hjc48sjjpysjgyji7nx2l0rpc5dnsm68i8amff5wcag5lyhw",
3+ "rev": "ffa98bbbd80e425f07e92bf511e64c8b0dffc1c7",
4+ "date": "2022-01-23T09:32:54-05:00",
5+ "path": "/nix/store/rbxa4biim19pwiz6gmh0ag5cz68rws3k-tree-sitter-tlaplus",
6+ "sha256": "0j8bwxdvdhfhvpiahbf0hr9hfkbg75p7qpxx2i1rgvidavflbpiv",
77 "fetchLFS": false,
88 "fetchSubmodules": false,
99 "deepClone": false,
pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typescript.json+4−4
@@ -1,9 +1,9 @@
11{
22 "url": "https://github.com/tree-sitter/tree-sitter-typescript",
3− "rev": "111b07762e86efab9a918b7c721f720c37e76b0a",
4− "date": "2021-11-09T11:34:06-08:00",
5− "path": "/nix/store/kndz7jkpl2adcaac64j7y9sb6zd7mp5h-tree-sitter-typescript",
6− "sha256": "1364bm3wbqqzvp03cvpx1w89bbqynb1v62i46gy7f6rhib9bf63a",
3+ "rev": "e8e8e8dc2745840b036421b4e43286750443cb13",
4+ "date": "2022-01-10T13:42:45-08:00",
5+ "path": "/nix/store/zl36qsk7pd9pcawfsy368axax97d83wz-tree-sitter-typescript",
6+ "sha256": "1z1v7fjgp418qsp0xkycfpvc8vm4a2ai5kx10xif1dvjpfgcj1qq",
77 "fetchLFS": false,
88 "fetchSubmodules": false,
99 "deepClone": false,
pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-vim.json+4−4
@@ -1,9 +1,9 @@
11{
22 "url": "https://github.com/vigoux/tree-sitter-viml",
3− "rev": "1d23679256edb241ebed8da1247e340bf9e0c0ad",
4− "date": "2021-10-18T11:21:06+02:00",
5− "path": "/nix/store/5a4kihij5jcdpn73i3m7av82k4pvvzpy-tree-sitter-viml",
6− "sha256": "1660y9n1s76xcv0z27kzbbsr9bdv4c4xakzglzhl7z7qcylxg2rr",
3+ "rev": "274b004d226a6686546ef83231f0f836b91700ae",
4+ "date": "2022-01-21T14:12:20+01:00",
5+ "path": "/nix/store/lpl3kbb5kwawr71m6qhqrwj1adkll540-tree-sitter-viml",
6+ "sha256": "01bmn3l3fsi1r36ak72ly0v8fr62wchida965c60244bfg2s4r2c",
77 "fetchLFS": false,
88 "fetchSubmodules": false,
99 "deepClone": false,
pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-zig.json+4−4
@@ -1,9 +1,9 @@
11{
22 "url": "https://github.com/maxxnino/tree-sitter-zig",
3− "rev": "cf93353d5682c3e9d8112d448ff24d4de7b2304e",
4− "date": "2021-11-25T20:46:40+09:00",
5− "path": "/nix/store/jwrs3fdgdqymjkrni6mlz1j0f0ai6h9y-tree-sitter-zig",
6− "sha256": "04ja9w28zprw575s4734d02ibi498whh3z7cxm3m1fdydhjsdlrj",
3+ "rev": "93331b8bd8b4ebee2b575490b2758f16ad4e9f30",
4+ "date": "2022-01-10T15:22:15+09:00",
5+ "path": "/nix/store/g54w7vid7nf9shzfipch646dk4d88ah7-tree-sitter-zig",
6+ "sha256": "0irckd6bh3i1vr5bi2lwsbvibbpih3jv3xqdq0dbsiy447dfiv50",
77 "fetchLFS": false,
88 "fetchSubmodules": false,
99 "deepClone": false,
pkgs/development/tools/parsing/tree-sitter/update.nix+9−4
@@ -366,7 +366,7 @@ let
366366 set -euo pipefail
367367
368368 args=( '--silent' )
369− if [ -n "$GITHUB_TOKEN" ]; then
369+ if [ -n "''${GITHUB_TOKEN:-}" ]; then
370370 args+=( "-H" "Authorization: token ''${GITHUB_TOKEN}" )
371371 fi
372372 args+=( "https://api.github.com/repos/${urlEscape orga}/${urlEscape repo}/releases/latest" )
@@ -390,7 +390,7 @@ let
390390 set -euo pipefail
391391
392392 args=( '--silent' )
393− if [ -n "$GITHUB_TOKEN" ]; then
393+ if [ -n "''${GITHUB_TOKEN:-}" ]; then
394394 args+=( "-H" "Authorization: token ''${GITHUB_TOKEN}" )
395395 fi
396396 args+=( 'https://api.github.com/orgs/${urlEscape orga}/repos?per_page=100' )
@@ -398,7 +398,11 @@ let
398398 res=$(${curl}/bin/curl "''${args[@]}")
399399
400400 if [[ "$(printf "%s" "$res" | ${jq}/bin/jq '.message?')" =~ "rate limit" ]]; then
401− echo "rate limited" >&2 #
401+ echo "rate limited" >&2
402+ exit 1
403+ elif [[ "$(printf "%s" "$res" | ${jq}/bin/jq '.message?')" =~ "Bad credentials" ]]; then
404+ echo "bad credentials" >&2
405+ exit 1
402406 fi
403407
404408 printf "%s" "$res" | ${jq}/bin/jq 'map(.name)' \
@@ -432,7 +436,8 @@ let
432436 mkdir -p "$outputDir"
433437 ${foreachSh allGrammars
434438 ({name, orga, repo}: ''${updateGrammar { inherit orga repo; }} > $outputDir/${name}.json'')}
435− ( echo "{"
439+ ( echo "{ lib }:"
440+ echo "{"
436441 ${foreachSh allGrammars
437442 ({name, ...}: ''
438443 # indentation hack
pkgs/misc/emulators/wine/base.nix+31−12
@@ -1,22 +1,27 @@
11{ stdenv, lib, pkgArches, callPackage,
22 name, version, src, mingwGccs, monos, geckos, platforms,
33 bison, flex, fontforge, makeWrapper, pkg-config,
4− autoconf, hexdump, perl,
4+ autoconf, hexdump, perl, nixosTests,
55 supportFlags,
66 patches,
7+ vkd3dArches,
78 buildScript ? null, configureFlags ? []
89}:
910
1011with import ./util.nix { inherit lib; };
1112
1213let
13− vkd3d = callPackage ./vkd3d.nix {};
1414 patches' = patches;
15+ prevName = name;
16+ prevPlatforms = platforms;
17+ prevConfigFlags = configureFlags;
1518in
1619stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) {
1720 builder = buildScript;
1821}) // rec {
19− inherit name src configureFlags;
22+ inherit src;
23+
24+ name = if supportFlags.waylandSupport then "${prevName}-wayland" else prevName;
2025
2126 # Fixes "Compiler cannot create executables" building wineWow with mingwSupport
2227 strictDeps = true;
@@ -36,7 +41,7 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) {
3641 ++ lib.optionals supportFlags.mingwSupport mingwGccs;
3742
3843 buildInputs = toBuildInputs pkgArches (with supportFlags; (pkgs:
39− [ pkgs.freetype pkgs.perl pkgs.xorg.libX11 ]
44+ [ pkgs.freetype pkgs.perl ]
4045 ++ lib.optional stdenv.isLinux pkgs.libcap
4146 ++ lib.optional pngSupport pkgs.libpng
4247 ++ lib.optional jpegSupport pkgs.libjpeg
@@ -61,12 +66,12 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) {
6166 ++ lib.optional fontconfigSupport pkgs.fontconfig
6267 ++ lib.optional alsaSupport pkgs.alsa-lib
6368 ++ lib.optional pulseaudioSupport pkgs.libpulseaudio
64− ++ lib.optional xineramaSupport pkgs.xorg.libXinerama
69+ ++ lib.optional (xineramaSupport && !waylandSupport) pkgs.xorg.libXinerama
6570 ++ lib.optional udevSupport pkgs.udev
6671 ++ lib.optional vulkanSupport pkgs.vulkan-loader
6772 ++ lib.optional sdlSupport pkgs.SDL2
6873 ++ lib.optional faudioSupport pkgs.faudio
69− ++ lib.optional vkd3dSupport vkd3d
74+ ++ vkd3dArches
7075 ++ lib.optionals gstreamerSupport (with pkgs.gst_all_1;
7176 [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-ugly gst-libav
7277 (gst-plugins-bad.override { enableZbar = false; }) ])
@@ -79,12 +84,20 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) {
7984 CoreServices Foundation ForceFeedback AppKit OpenGL IOKit DiskArbitration Security
8085 ApplicationServices AudioToolbox CoreAudio AudioUnit CoreMIDI OpenAL OpenCL Cocoa Carbon
8186 ])
82− ++ lib.optionals stdenv.isLinux (with pkgs.xorg; [
83− libXi libXcursor libXrandr libXrender libXxf86vm libXcomposite libXext
87+ ++ lib.optionals (stdenv.isLinux && !waylandSupport) (with pkgs.xorg; [
88+ libX11 libXi libXcursor libXrandr libXrender libXxf86vm libXcomposite libXext
89+ ])
90+ ++ lib.optionals waylandSupport (with pkgs; [
91+ wayland libxkbcommon wayland-protocols wayland.dev libxkbcommon.dev
8492 ])));
8593
8694 patches = [ ] ++ patches';
8795
96+ configureFlags = prevConfigFlags
97+ ++ lib.optionals supportFlags.waylandSupport [ "--with-wayland" ]
98+ ++ lib.optionals supportFlags.vulkanSupport [ "--with-vulkan" ]
99+ ++ lib.optionals supportFlags.vkd3dSupport [ "--with-vkd3d" ];
100+
88101 # Wine locates a lot of libraries dynamically through dlopen(). Add
89102 # them to the RPATH so that the user doesn't have to set them in
90103 # LD_LIBRARY_PATH.
@@ -93,6 +106,8 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) {
93106 # libpulsecommon.so is linked but not found otherwise
94107 ++ lib.optionals supportFlags.pulseaudioSupport (map (x: "${lib.getLib x}/lib/pulseaudio")
95108 (toBuildInputs pkgArches (pkgs: [ pkgs.libpulseaudio ])))
109+ ++ lib.optionals supportFlags.waylandSupport (map (x: "${lib.getLib x}/share/wayland-protocols")
110+ (toBuildInputs pkgArches (pkgs: [ pkgs.wayland-protocols ])))
96111 ));
97112
98113 # Don't shrink the ELF RPATHs in order to keep the extra RPATH
@@ -144,13 +159,17 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) {
144159 ++ lib.optional (stdenv.hostPlatform.isDarwin) "fortify"
145160 ++ lib.optional (supportFlags.mingwSupport) "format";
146161
147− passthru = { inherit pkgArches; };
162+ passthru = {
163+ inherit pkgArches;
164+ tests = { inherit (nixosTests) wine; };
165+ };
148166 meta = {
149− inherit version platforms;
167+ inherit version;
150168 homepage = "https://www.winehq.org/";
151169 license = with lib.licenses; [ lgpl21Plus ];
152− description = "An Open Source implementation of the Windows API on top of X, OpenGL, and Unix";
153− maintainers = with lib.maintainers; [ avnik raskin bendlas ];
170+ description = if supportFlags.waylandSupport then "An Open Source implementation of the Windows API on top of OpenGL and Unix (with experimental Wayland support)" else "An Open Source implementation of the Windows API on top of X, OpenGL, and Unix";
171+ platforms = if supportFlags.waylandSupport then (lib.remove "x86_64-darwin" prevPlatforms) else prevPlatforms;
172+ maintainers = with lib.maintainers; [ avnik raskin bendlas jmc-figueira ];
154173 mainProgram = "wine";
155174 };
156175})
pkgs/misc/emulators/wine/builder-wow.sh+3−2
@@ -1,6 +1,7 @@
11## build described at http://wiki.winehq.org/Wine64
22
33source $stdenv/setup
4+preFlags="${configureFlags}"
45
56unpackPhase
67cd $TMP/$sourceRoot
@@ -11,14 +12,14 @@ mkdir -p $TMP/wine-wow $TMP/wine64
1112
1213cd $TMP/wine64
1314sourceRoot=`pwd`
14−configureFlags="--enable-win64"
15+configureFlags="${preFlags} --enable-win64"
1516configurePhase
1617buildPhase
1718# checkPhase
1819
1920cd $TMP/wine-wow
2021sourceRoot=`pwd`
21−configureFlags="--with-wine64=../wine64"
22+configureFlags="${preFlags} --with-wine64=../wine64"
2223configurePhase
2324buildPhase
2425# checkPhase
pkgs/misc/emulators/wine/default.nix+3−2
@@ -1,7 +1,7 @@
11## Configuration:
22# Control you default wine config in nixpkgs-config:
33# wine = {
4−# release = "stable"; # "stable", "unstable", "staging"
4+# release = "stable"; # "stable", "unstable", "staging", "wayland"
55# build = "wineWow"; # "wine32", "wine64", "wineWow"
66# };
77# Make additional configurations on demand:
@@ -45,6 +45,7 @@
4545 faudioSupport ? false,
4646 vkd3dSupport ? false,
4747 mingwSupport ? wineRelease != "stable",
48+ waylandSupport ? wineRelease == "wayland",
4849 embedInstallers ? false # The Mono and Gecko MSI installers
4950}:
5051
@@ -58,7 +59,7 @@ let wine-build = build: release:
5859 gsmSupport gphoto2Support ldapSupport fontconfigSupport alsaSupport
5960 pulseaudioSupport xineramaSupport gtkSupport openclSupport xmlSupport tlsSupport
6061 openglSupport gstreamerSupport udevSupport vulkanSupport sdlSupport faudioSupport
61− vkd3dSupport mingwSupport embedInstallers;
62+ vkd3dSupport mingwSupport waylandSupport embedInstallers;
6263 };
6364 });
6465
pkgs/misc/emulators/wine/packages.nix+7−1
@@ -3,12 +3,16 @@
33 supportFlags
44}:
55
6−let src = lib.getAttr wineRelease (callPackage ./sources.nix {});
6+let
7+ src = lib.getAttr wineRelease (callPackage ./sources.nix {});
8+ vkd3d = pkgs.callPackage ./vkd3d.nix {};
9+ vkd3d_i686 = pkgsi686Linux.callPackage ./vkd3d.nix {};
710in with src; {
811 wine32 = pkgsi686Linux.callPackage ./base.nix {
912 name = "wine-${version}";
1013 inherit src version supportFlags patches;
1114 pkgArches = [ pkgsi686Linux ];
15+ vkd3dArches = lib.optionals supportFlags.vkd3dSupport [ vkd3d_i686 ];
1216 geckos = [ gecko32 ];
1317 mingwGccs = with pkgsCross; [ mingw32.buildPackages.gcc ];
1418 monos = [ mono ];
@@ -18,6 +22,7 @@ in with src; {
1822 name = "wine64-${version}";
1923 inherit src version supportFlags patches;
2024 pkgArches = [ pkgs ];
25+ vkd3dArches = lib.optionals supportFlags.vkd3dSupport [ vkd3d ];
2126 mingwGccs = with pkgsCross; [ mingwW64.buildPackages.gcc ];
2227 geckos = [ gecko64 ];
2328 monos = [ mono ];
@@ -29,6 +34,7 @@ in with src; {
2934 inherit src version supportFlags patches;
3035 stdenv = stdenv_32bit;
3136 pkgArches = [ pkgs pkgsi686Linux ];
37+ vkd3dArches = lib.optionals supportFlags.vkd3dSupport [ vkd3d vkd3d_i686 ];
3238 geckos = [ gecko32 gecko64 ];
3339 mingwGccs = with pkgsCross; [ mingw32.buildPackages.gcc mingwW64.buildPackages.gcc ];
3440 monos = [ mono ];
pkgs/misc/emulators/wine/sources.nix+15
@@ -10,6 +10,8 @@ let fetchurl = args@{url, sha256, ...}:
1010 pkgs.fetchurl { inherit url sha256; } // args;
1111 fetchFromGitHub = args@{owner, repo, rev, sha256, ...}:
1212 pkgs.fetchFromGitHub { inherit owner repo rev sha256; } // args;
13+ fetchFromGitLab = args@{domain, owner, repo, rev, sha256, ...}:
14+ pkgs.fetchFromGitLab { inherit domain owner repo rev sha256; } // args;
1315in rec {
1416
1517 stable = fetchurl rec {
@@ -55,6 +57,19 @@ in rec {
5557 disabledPatchsets = [ ];
5658 };
5759
60+ wayland = fetchFromGitLab rec {
61+ version = "7.0-rc2";
62+ sha256 = "sha256-FU9L8cyIIfFQ+8f/AUg7IT+RxTpyNTuSfL0zBnur0SA=";
63+ domain = "gitlab.collabora.com";
64+ owner = "alf";
65+ repo = "wine";
66+ rev = "95f0154c96a4b7d81e783ee5ba2f5d9cc7cda351";
67+
68+ inherit (unstable) gecko32 gecko64;
69+
70+ inherit (unstable) mono;
71+ };
72+
5873 winetricks = fetchFromGitHub rec {
5974 # https://github.com/Winetricks/winetricks/releases
6075 version = "20210825";
pkgs/os-specific/linux/multipath-tools/default.nix+3−1
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, fetchpatch, pkg-config, perl, lvm2, libaio, gzip, readline, systemd, liburcu, json_c, kmod }:
1+{ lib, stdenv, fetchurl, fetchpatch, pkg-config, perl, lvm2, libaio, gzip, readline, systemd, liburcu, json_c, kmod, nixosTests }:
22
33stdenv.mkDerivation rec {
44 pname = "multipath-tools";
@@ -53,6 +53,8 @@ stdenv.mkDerivation rec {
5353 "SYSTEMDPATH=lib"
5454 ];
5555
56+ passthru.tests = { inherit (nixosTests) iscsi-multipath-root; };
57+
5658 meta = with lib; {
5759 description = "Tools for the Linux multipathing driver";
5860 homepage = "http://christophe.varoqui.free.fr/";
pkgs/os-specific/linux/open-iscsi/default.nix+3−1
@@ -1,5 +1,5 @@
11{ lib, stdenv, fetchFromGitHub, automake, autoconf, libtool, gettext
2−, util-linux, open-isns, openssl, kmod, perl, systemd, pkgconf
2+, util-linux, open-isns, openssl, kmod, perl, systemd, pkgconf, nixosTests
33}:
44
55stdenv.mkDerivation rec {
@@ -42,6 +42,8 @@ stdenv.mkDerivation rec {
4242 sed -i "s|/sbin/iscsiadm|$out/bin/iscsiadm|" $out/bin/iscsi_fw_login
4343 '';
4444
45+ passthru.tests = { inherit (nixosTests) iscsi-root iscsi-multipath-root; };
46+
4547 meta = with lib; {
4648 description = "A high performance, transport independent, multi-platform implementation of RFC3720";
4749 license = licenses.gpl2Plus;
pkgs/servers/dns/doh-proxy-rust/default.nix+3−1
@@ -1,4 +1,4 @@
1−{ lib, rustPlatform, fetchCrate, stdenv, Security, libiconv }:
1+{ lib, rustPlatform, fetchCrate, stdenv, Security, libiconv, nixosTests }:
22
33rustPlatform.buildRustPackage rec {
44 pname = "doh-proxy-rust";
@@ -14,6 +14,8 @@ rustPlatform.buildRustPackage rec {
1414
1515 buildInputs = lib.optionals stdenv.isDarwin [ Security libiconv ];
1616
17+ passthru.tests = { inherit (nixosTests) doh-proxy-rust; };
18+
1719 meta = with lib; {
1820 homepage = "https://github.com/jedisct1/doh-server";
1921 description = "Fast, mature, secure DoH server proxy written in Rust";
pkgs/servers/gerbera/default.nix+3
@@ -3,6 +3,7 @@
33, fetchFromGitHub
44, cmake
55, pkg-config
6+, nixosTests
67 # required
78, libiconv
89, libupnp
@@ -96,6 +97,8 @@ stdenv.mkDerivation rec {
9697 zlib
9798 ] ++ flatten (builtins.catAttrs "packages" (builtins.filter (e: e.enable) options));
9899
100+ passthru.tests = { inherit (nixosTests) mediatomb; };
101+
99102 meta = with lib; {
100103 homepage = "https://docs.gerbera.io/";
101104 description = "UPnP Media Server for 2020";
pkgs/servers/isso/default.nix+3−1
@@ -1,4 +1,4 @@
1−{ pkgs, nodejs, lib, python3Packages, fetchFromGitHub }:
1+{ pkgs, nodejs, lib, python3Packages, fetchFromGitHub, nixosTests }:
22let
33 nodeEnv = import ./node-env.nix {
44 inherit (pkgs) stdenv lib python2 runCommand writeTextFile;
@@ -53,6 +53,8 @@ with python3Packages; buildPythonApplication rec {
5353 ${python.interpreter} setup.py nosetests
5454 '';
5555
56+ passthru.tests = { inherit (nixosTests) isso; };
57+
5658 meta = with lib; {
5759 description = "A commenting server similar to Disqus";
5860 homepage = "https://posativ.org/isso/";
pkgs/servers/mediatomb/default.nix+3−1
@@ -1,6 +1,6 @@
11{ lib, stdenv, fetchgit
22, sqlite, expat, mp4v2, flac, spidermonkey_68, taglib, libexif, curl, ffmpeg, file
3−, pkg-config, autoreconfHook }:
3+, pkg-config, autoreconfHook, nixosTests }:
44
55stdenv.mkDerivation rec {
66 pname = "mediatomb";
@@ -15,6 +15,8 @@ stdenv.mkDerivation rec {
1515 buildInputs = [ sqlite expat spidermonkey_68 taglib libexif curl ffmpeg file mp4v2 flac
1616 pkg-config autoreconfHook ];
1717
18+ passthru.tests = { inherit (nixosTests) mediatomb; };
19+
1820 meta = with lib; {
1921 homepage = "http://mediatomb.cc";
2022 repositories.git = "git://mediatomb.git.sourceforge.net/gitroot/mediatomb/mediatomb";
pkgs/servers/nosql/riak/2.2.0.nix+3−1
@@ -1,4 +1,4 @@
1−{ stdenv, lib, fetchurl, unzip, erlang, which, pam }:
1+{ stdenv, lib, fetchurl, unzip, erlang, which, pam, nixosTests }:
22
33let
44 solrName = "solr-4.10.4-yz-2.tgz";
@@ -90,6 +90,8 @@ stdenv.mkDerivation {
9090 runHook postInstall
9191 '';
9292
93+ passthru.tests = { inherit (nixosTests) riak; };
94+
9395 meta = with lib; {
9496 maintainers = with maintainers; [ cstrahan mdaiter ];
9597 description = "Dynamo inspired NoSQL DB by Basho";
pkgs/servers/web-apps/pict-rs/default.nix+3
@@ -8,6 +8,7 @@
88, imagemagick
99, ffmpeg
1010, exiftool
11+, nixosTests
1112}:
1213
1314rustPlatform.buildRustPackage rec {
@@ -36,6 +37,8 @@ rustPlatform.buildRustPackage rec {
3637 --prefix PATH : "${lib.makeBinPath [ imagemagick ffmpeg exiftool ]}"
3738 '';
3839
40+ passthru.tests = { inherit (nixosTests) pict-rs; };
41+
3942 meta = with lib; {
4043 description = "A simple image hosting service";
4144 homepage = "https://git.asonix.dog/asonix/pict-rs";
pkgs/tools/X11/wpgtk/default.nix+3−3
@@ -3,13 +3,13 @@
33
44python3Packages.buildPythonApplication rec {
55 pname = "wpgtk";
6− version = "6.1.3";
6+ version = "6.5.0";
77
88 src = fetchFromGitHub {
99 owner = "deviantfero";
1010 repo = "wpgtk";
1111 rev = version;
12− sha256 = "1jv28ygsd6ifjb096w3pm50za6wi62y45ycbizwhv7x56lr6zx1v";
12+ sha256 = "0gv607jrdfbmadjyy3pbrj5ksh1dmaw5hz7l8my2z7sh0ifds0n2";
1313 };
1414
1515 buildInputs = [
@@ -44,7 +44,7 @@ python3Packages.buildPythonApplication rec {
4444 INFO: To work properly, this tool needs "programs.dconf.enable = true" on nixos or dconf installed. A reboot may be required after installing dconf.
4545 '';
4646 homepage = "https://github.com/deviantfero/wpgtk";
47− license = licenses.gpl2;
47+ license = licenses.gpl2Only;
4848 platforms = platforms.linux;
4949 maintainers = [ maintainers.melkor333 ];
5050 };
pkgs/tools/admin/lego/default.nix+3−3
@@ -2,16 +2,16 @@
22
33buildGoModule rec {
44 pname = "lego";
5− version = "4.5.3";
5+ version = "4.6.0";
66
77 src = fetchFromGitHub {
88 owner = "go-acme";
99 repo = pname;
1010 rev = "v${version}";
11− sha256 = "sha256-xvTV6jZmQWs6g8Oq+IrwPZVS3fzY1/adg7IWh189ftU=";
11+ sha256 = "sha256-FisQS/qbl7f4aszc2Ft6nmuHNrDreOQdN0jrWMOvaAk=";
1212 };
1313
14− vendorSha256 = "sha256-EK2E2YWdk2X1awdUhMOJh+qr+jnnftnKuPPpiHzXZHk=";
14+ vendorSha256 = "sha256-cLM4YGguQf7lO5PUPmd/at1Aqrp9m8zFG6GWqcduJmw=";
1515
1616 doCheck = false;
1717
pkgs/tools/audio/spotdl/default.nix+3−4
@@ -6,13 +6,13 @@
66
77python3.pkgs.buildPythonApplication rec {
88 pname = "spotdl";
9− version = "3.7.2";
9+ version = "3.9.2";
1010
1111 src = fetchFromGitHub {
1212 owner = "spotDL";
1313 repo = "spotify-downloader";
1414 rev = "v${version}";
15− sha256 = "sha256-ftSnlruSv+RtvjTpZPYg9Z2EK4th8NbDhVlG2eIc87s=";
15+ sha256 = "sha256-Y4l86OjAEwNt2i9+OFgol3b6nhbpe27NFTKJrLKQgHg=";
1616 };
1717
1818 propagatedBuildInputs = with python3.pkgs; [
@@ -22,11 +22,10 @@ python3.pkgs.buildPythonApplication rec {
2222 rapidfuzz
2323 mutagen
2424 ytmusicapi
25− tqdm
2625 beautifulsoup4
2726 requests
2827 unidecode
29− youtube-dl
28+ yt-dlp
3029 ];
3130
3231 checkInputs = with python3.pkgs; [
pkgs/tools/audio/video2midi/default.nix+3−3
@@ -8,7 +8,7 @@ let
88 });
99in pythonPackages.buildPythonApplication rec {
1010 pname = "video2midi";
11− version = "0.4.0.2";
11+ version = "0.4.6.5";
1212
1313 format = "other";
1414
@@ -16,7 +16,7 @@ in pythonPackages.buildPythonApplication rec {
1616 owner = "svsdval";
1717 repo = pname;
1818 rev = version;
19− sha256 = "174ijn8bc306529scd23szvgx1apanm2qmwk4lwmi64rhkm6dapx";
19+ sha256 = "0qzrxqhsxn0h71nfrsi9g78hx3pqm3b8sr6fjq01k4k6dd2nwfam";
2020 };
2121
2222 propagatedBuildInputs = with pythonPackages; [ opencv3_ midiutil pygame pyopengl ];
@@ -28,7 +28,7 @@ in pythonPackages.buildPythonApplication rec {
2828 meta = with lib; {
2929 description = "Youtube synthesia video to midi conversion tool";
3030 homepage = src.meta.homepage;
31− license = licenses.gpl3;
31+ license = licenses.gpl3Only;
3232 maintainers = [ ];
3333 platforms = platforms.linux;
3434 };
pkgs/tools/inputmethods/fcitx5/fcitx5-unikey.nixnew file+27
@@ -0,0 +1,27 @@
1+{ lib, stdenv, fetchFromGitHub, cmake, extra-cmake-modules, fcitx5, fcitx5-qt
2+, ninja, gettext, wrapQtAppsHook
3+}:
4+
5+stdenv.mkDerivation rec {
6+ pname = "fcitx5-unikey";
7+ version = "5.0.7";
8+
9+ src = fetchFromGitHub {
10+ owner = "fcitx";
11+ repo = "fcitx5-unikey";
12+ rev = version;
13+ sha256 = "BFIqMmjIC29Z4rATZEf+qQWrULU9Wkuk6WOUXDEPO10=";
14+ };
15+
16+ nativeBuildInputs = [ cmake extra-cmake-modules wrapQtAppsHook ];
17+
18+ buildInputs = [ fcitx5 fcitx5-qt ninja gettext ];
19+
20+ meta = with lib; {
21+ description = "Unikey engine support for Fcitx5";
22+ homepage = "https://github.com/fcitx/fcitx5-unikey";
23+ license = licenses.gpl2Plus;
24+ maintainers = with maintainers; [ berberman ];
25+ platforms = platforms.linux;
26+ };
27+}
pkgs/tools/misc/gay/default.nix+3−4
@@ -1,7 +1,7 @@
1−{ lib, python39Packages, fetchFromGitHub }:
1+{ lib, python3Packages, fetchFromGitHub }:
22
3−python39Packages.buildPythonApplication rec {
4− name = "gay";
3+python3Packages.buildPythonApplication rec {
4+ pname = "gay";
55 version = "1.2.8";
66
77 src = fetchFromGitHub {
@@ -21,6 +21,5 @@ python39Packages.buildPythonApplication rec {
2121 homepage = "https://github.com/ms-jpq/gay";
2222 maintainers = with maintainers; [ CodeLongAndProsper90 ];
2323 license = licenses.mit;
24− platforms = platforms.all;
2524 };
2625}
pkgs/tools/misc/goreleaser/default.nix+3−3
@@ -2,16 +2,16 @@
22
33buildGoModule rec {
44 pname = "goreleaser";
5− version = "1.2.5";
5+ version = "1.3.1";
66
77 src = fetchFromGitHub {
88 owner = "goreleaser";
99 repo = pname;
1010 rev = "v${version}";
11− sha256 = "sha256-FIUp3l3CwtQeFvdXqY3HoaARBmlXqNfl7zUz3ND8ixI=";
11+ sha256 = "sha256-QFb702/v+fSzPWJ+hIGAXqVYfLpecA4sOFM+r8QvdYE=";
1212 };
1313
14− vendorSha256 = "sha256-f7EKdffnDUzzyueMM8pHfU3XdQNcIrFf9miVsVTIdM8=";
14+ vendorSha256 = "sha256-LZ2fVFvctLw/X2IX8p5/2D3qvoOYmGWhvef6HoeAGeE=";
1515
1616 ldflags = [
1717 "-s"
pkgs/tools/misc/steampipe/default.nix+2−2
@@ -2,13 +2,13 @@
22
33buildGoModule rec {
44 pname = "steampipe";
5− version = "0.12.0";
5+ version = "0.12.1";
66
77 src = fetchFromGitHub {
88 owner = "turbot";
99 repo = "steampipe";
1010 rev = "v${version}";
11− sha256 = "sha256-ApY3h6CqOJMWmIindp5TqWczSU50TBiS89lYzSzj8EM=";
11+ sha256 = "sha256-vDyox8UArgK27FkNFK3SNksvOmpaRgZ/ueZgqO7MOl0=";
1212 };
1313
1414 vendorSha256 = "sha256-ikmcayOy87u6XMYjxxzFv35Rlp9oTteEKFOPr/+xc2Y=";
pkgs/tools/misc/tlp/default.nix+4−5
@@ -24,19 +24,19 @@
2424, networkmanager
2525}: stdenv.mkDerivation rec {
2626 pname = "tlp";
27− version = "1.4.0";
27+ version = "1.5.0";
2828
2929 src = fetchFromGitHub {
3030 owner = "linrunner";
3131 repo = "TLP";
3232 rev = version;
33− sha256 = "sha256-Blwj4cqrrYXohnGyJYe+1NYifxqfS4DoVUHmxFf62i4=";
33+ sha256 = "sha256-hHel3BVMzTYfE59kxxADnm8tqtUFntqS3RzmJSZlWjM=";
3434 };
3535
3636 # XXX: See patch files for relevant explanations.
3737 patches = [
3838 ./patches/0001-makefile-correctly-sed-paths.patch
39− ./patches/0002-tlp-sleep.service-reintroduce.patch
39+ ./patches/0002-reintroduce-tlp-sleep-service.patch
4040 ];
4141
4242 buildInputs = [ perl ];
@@ -50,12 +50,11 @@
5050 # [1]: https://github.com/NixOS/nixpkgs/issues/65718
5151 # [2]: https://github.com/linrunner/TLP/blob/ab788abf4936dfb44fbb408afc34af834230a64d/Makefile#L4-L46
5252 makeFlags = [
53− "DESTDIR=${placeholder "out"}"
54−
5553 "TLP_NO_INIT=1"
5654 "TLP_WITH_ELOGIND=0"
5755 "TLP_WITH_SYSTEMD=1"
5856
57+ "DESTDIR=${placeholder "out"}"
5958 "TLP_BATD=/share/tlp/bat.d"
6059 "TLP_BIN=/bin"
6160 "TLP_CONFDEF=/share/tlp/defaults.conf"
pkgs/tools/misc/tlp/patches/0002-tlp-sleep.service-reintroduce.patch → pkgs/tools/misc/tlp/patches/0002-reintroduce-tlp-sleep-service.patchrenamed−17
@@ -57,23 +57,6 @@ index ab05720..075b42f 100644
5757 rm -f $(_ELOD)/49-tlp-sleep
5858 rm -f $(_SHCPL)/tlp-stat
5959 rm -f $(_SHCPL)/bluetooth
60−diff --git a/tlp-sleep b/tlp-sleep
61−deleted file mode 100644
62−index e548d55..0000000
63−--- a/tlp-sleep
64−+++ /dev/null
65−@@ -1,11 +0,0 @@
66−-#!/bin/sh
67−-
68−-# tlp - systemd suspend/resume hook
69−-#
70−-# Copyright (c) 2021 Thomas Koch <linrunner at gmx.net> and others.
71−-# This software is licensed under the GPL v2 or later.
72−-
73−-case $1 in
74−- pre) tlp suspend ;;
75−- post) tlp resume ;;
76−-esac
7760diff --git a/tlp-sleep.service.in b/tlp-sleep.service.in
7861new file mode 100644
7962index 0000000..79c202c
pkgs/tools/networking/dcap/default.nixnew file+44
@@ -0,0 +1,44 @@
1+{ stdenv
2+, lib
3+, fetchFromGitHub
4+, autoconf
5+, automake
6+, libtool
7+, zlib
8+, cunit
9+}:
10+stdenv.mkDerivation rec {
11+ pname = "dcap";
12+ version = "2.47.12";
13+
14+ src = fetchFromGitHub {
15+ owner = "dCache";
16+ repo = "dcap";
17+ rev = version;
18+ sha256 = "sha256-pNLEN1YLQGMJNuv8n6bec3qONbwNOYbYDDvkwuP5AR4=";
19+ };
20+
21+ nativeBuildInputs = [ autoconf automake libtool ];
22+ buildInputs = [ zlib ];
23+
24+ preConfigure = ''
25+ patchShebangs bootstrap.sh
26+ ./bootstrap.sh
27+ '';
28+
29+ doCheck = true;
30+
31+ checkInputs = [ cunit ];
32+
33+ outputs = [ "bin" "dev" "out" "man" "doc" ];
34+
35+ meta = with lib; {
36+ description = "dCache access protocol client library";
37+ homepage = "https://github.com/dCache/dcap";
38+ changelog = "https://github.com/dCache/dcap/blob/master/ChangeLog";
39+ license = licenses.lgpl2Only;
40+ platforms = platforms.all;
41+ mainProgram = "dccp";
42+ maintainers = with maintainers; [ ShamrockLee ];
43+ };
44+}
pkgs/tools/networking/stunnel/default.nix+2−2
@@ -2,11 +2,11 @@
22
33stdenv.mkDerivation rec {
44 pname = "stunnel";
5− version = "5.61";
5+ version = "5.62";
66
77 src = fetchurl {
88 url = "https://www.stunnel.org/downloads/${pname}-${version}.tar.gz";
9− sha256 = "sha256-keoMpkgtj359lx7mSrT4aigX0DijcvCJPigxXvIBXXo=";
9+ sha256 = "sha256-nPW7lJAiqmbHNsEyZVTMon0GQWBaY3AnTtxJUetb0zk=";
1010 # please use the contents of "https://www.stunnel.org/downloads/${name}.tar.gz.sha256",
1111 # not the output of `nix-prefetch-url`
1212 };
pkgs/tools/security/haka/default.nix+3−1
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, cmake, swig, wireshark, check, rsync, libpcap, gawk, libedit, pcre }:
1+{ lib, stdenv, fetchurl, cmake, swig, wireshark, check, rsync, libpcap, gawk, libedit, pcre, nixosTests }:
22
33let version = "0.3.0"; in
44
@@ -24,6 +24,8 @@ stdenv.mkDerivation {
2424 nativeBuildInputs = [ cmake ];
2525 buildInputs = [ swig wireshark check rsync libpcap gawk libedit pcre ];
2626
27+ passthru.tests = { inherit (nixosTests) haka; };
28+
2729 meta = {
2830 description = "A collection of tools that allows capturing TCP/IP packets and filtering them based on Lua policy files";
2931 homepage = "http://www.haka-security.org/";
pkgs/tools/security/log4j-sniffer/default.nix+2−2
@@ -6,13 +6,13 @@
66
77buildGoModule rec {
88 pname = "log4j-sniffer";
9− version = "1.2.0";
9+ version = "1.6.0";
1010
1111 src = fetchFromGitHub {
1212 owner = "palantir";
1313 repo = pname;
1414 rev = "v${version}";
15− sha256 = "sha256-q9PwUzHmcTYKMl0dVR5owB/UXYv5ZgmvRK0S6vOBFT8=";
15+ sha256 = "sha256-ffutvIxXhA0fCN6mSUwv6F+SO/ab6hLiaVJeatZo57w=";
1616 };
1717
1818 vendorSha256 = null;
pkgs/top-level/aliases.nix+1
@@ -1085,6 +1085,7 @@ mapAliases ({
10851085 weechat-matrix-bridge = weechatScripts.weechat-matrix-bridge; # added 2018-09-06
10861086 wicd = throw "wicd has been removed as it is abandoned."; # added 2021-09-11
10871087 wineStaging = wine-staging; # added 2018-01-08
1088+ wineWayland = wine-wayland;
10881089 winusb = woeusb; # added 2017-12-22
10891090 winswitch = throw "winswitch has been removed from nixpkgs."; # added 2019-12-10
10901091 wireshark-gtk = throw "wireshark-gtk is not supported anymore. Use wireshark-qt or wireshark-cli instead."; # added 2019-11-18
pkgs/top-level/all-packages.nix+25−6
@@ -1663,6 +1663,8 @@ with pkgs;
16631663
16641664 cyclonedx-python = callPackage ../tools/misc/cyclonedx-python { };
16651665
1666+ dcap = callPackage ../tools/networking/dcap { };
1667+
16661668 deltachat-cursed = callPackage ../applications/networking/instant-messengers/deltachat-cursed { };
16671669
16681670 deltachat-desktop = callPackage ../applications/networking/instant-messengers/deltachat-desktop {
@@ -3510,6 +3512,8 @@ with pkgs;
35103512
35113513 oneshot = callPackage ../tools/networking/oneshot { };
35123514
3515+ online-judge-tools = with python3.pkgs; toPythonApplication online-judge-tools;
3516+
35133517 xkbd = callPackage ../applications/misc/xkbd { };
35143518
35153519 libpsm2 = callPackage ../os-specific/linux/libpsm2 { };
@@ -5237,6 +5241,8 @@ with pkgs;
52375241 };
52385242 };
52395243
5244+ fcitx5-unikey = libsForQt5.callPackage ../tools/inputmethods/fcitx5/fcitx5-unikey.nix { };
5245+
52405246 fcitx5-configtool = libsForQt5.callPackage ../tools/inputmethods/fcitx5/fcitx5-configtool.nix { };
52415247
52425248 fcitx5-lua = callPackage ../tools/inputmethods/fcitx5/fcitx5-lua.nix { };
@@ -10201,9 +10207,9 @@ with pkgs;
1020110207 getPackagesWithPrefix = prefix: mapAttrs' (name: pkg: nameValuePair (removePrefix ("thelounge-" + prefix + "-") name) pkg)
1020210208 (filterAttrs (name: _: hasPrefix ("thelounge-" + prefix + "-") name) pkgs);
1020310209 in
10204− {
10205− plugins = getPackagesWithPrefix "plugin";
10206− themes = getPackagesWithPrefix "theme";
10210+ recurseIntoAttrs {
10211+ plugins = recurseIntoAttrs (getPackagesWithPrefix "plugin");
10212+ themes = recurseIntoAttrs (getPackagesWithPrefix "theme");
1020710213 };
1020810214
1020910215 thefuck = python3Packages.callPackage ../tools/misc/thefuck { };
@@ -16405,6 +16411,9 @@ with pkgs;
1640516411 ffmpeg_4 = callPackage ../development/libraries/ffmpeg/4.nix {
1640616412 inherit (darwin.apple_sdk.frameworks) Cocoa CoreMedia VideoToolbox;
1640716413 };
16414+ ffmpeg_5 = callPackage ../development/libraries/ffmpeg/5.nix {
16415+ inherit (darwin.apple_sdk.frameworks) Cocoa CoreMedia VideoToolbox;
16416+ };
1640816417
1640916418 # Aliases
1641016419 ffmpeg_3 = ffmpeg_3_4;
@@ -24279,9 +24288,15 @@ with pkgs;
2427924288
2428024289 foxitreader = libsForQt512.callPackage ../applications/misc/foxitreader { };
2428124290
24282− pdfstudio = callPackage ../applications/misc/pdfstudio { };
24291+ pdfstudio = import ../applications/misc/pdfstudio {
24292+ program = "pdfstudio";
24293+ inherit callPackage fetchurl libgccjit;
24294+ };
2428324295
24284− pdfstudioviewer = callPackage ../applications/misc/pdfstudioviewer { };
24296+ pdfstudioviewer = import ../applications/misc/pdfstudio {
24297+ program = "pdfstudioviewer";
24298+ inherit callPackage fetchurl libgccjit;
24299+ };
2428524300
2428624301 aeolus = callPackage ../applications/audio/aeolus { };
2428724302
@@ -33905,7 +33920,7 @@ with pkgs;
3390533920 inherit wineBuild;
3390633921
3390733922 inherit (callPackage ./wine-packages.nix {})
33908− minimal base full stable stableFull unstable unstableFull staging stagingFull fonts;
33923+ minimal base full stable stableFull unstable unstableFull staging stagingFull wayland waylandFull fonts;
3390933924 });
3391033925
3391133926 winePackages = recurseIntoAttrs (winePackagesFor (config.wine.build or "wine32"));
@@ -33919,6 +33934,10 @@ with pkgs;
3391933934 wineRelease = "staging";
3392033935 });
3392133936
33937+ wine-wayland = lowPrio (winePackages.full.override {
33938+ wineRelease = "wayland";
33939+ });
33940+
3392233941 winetricks = callPackage ../misc/emulators/wine/winetricks.nix {
3392333942 inherit (gnome) zenity;
3392433943 };
pkgs/top-level/python-packages.nix+6
@@ -5572,6 +5572,10 @@ in {
55725572
55735573 onkyo-eiscp = callPackage ../development/python-modules/onkyo-eiscp { };
55745574
5575+ online-judge-api-client = callPackage ../development/python-modules/online-judge-api-client { };
5576+
5577+ online-judge-tools = callPackage ../development/python-modules/online-judge-tools { };
5578+
55755579 onlykey-solo-python = callPackage ../development/python-modules/onlykey-solo-python { };
55765580
55775581 onnx = callPackage ../development/python-modules/onnx { };
@@ -6118,6 +6122,8 @@ in {
61186122
61196123 python-kasa = callPackage ../development/python-modules/python-kasa { };
61206124
6125+ python-keycloak = callPackage ../development/python-modules/python-keycloak { };
6126+
61216127 python-keystoneclient = callPackage ../development/python-modules/python-keystoneclient { };
61226128
61236129 python-lsp-black = callPackage ../development/python-modules/python-lsp-black { };
pkgs/top-level/wine-packages.nix+3
@@ -58,4 +58,7 @@ rec {
5858
5959 staging = base.override { wineRelease = "staging"; };
6060 stagingFull = full.override { wineRelease = "staging"; };
61+
62+ wayland = base.override { wineRelease = "wayland"; };
63+ waylandFull = full.override { wineRelease = "wayland"; };
6164}