Resolved the following conflicts (by carefully applying patches from the both
branches since the fork point):
pkgs/development/libraries/epoxy/default.nix
pkgs/development/libraries/gtk+/3.x.nix
pkgs/development/python-modules/asgiref/default.nix
pkgs/development/python-modules/daphne/default.nix
pkgs/os-specific/linux/systemd/default.nix
Semi-automatic update. These checks were done:
- built on NixOS
- ran `/nix/store/cs5ycqjsa2lklgx5slaja3gshxf2g7r5-softhsm-2.4.0/bin/softhsm2-keyconv -h` got 0 exit code
- ran `/nix/store/cs5ycqjsa2lklgx5slaja3gshxf2g7r5-softhsm-2.4.0/bin/softhsm2-keyconv --help` got 0 exit code
- ran `/nix/store/cs5ycqjsa2lklgx5slaja3gshxf2g7r5-softhsm-2.4.0/bin/softhsm2-keyconv -V` and found version 2.4.0
- ran `/nix/store/cs5ycqjsa2lklgx5slaja3gshxf2g7r5-softhsm-2.4.0/bin/softhsm2-keyconv -v` and found version 2.4.0
- ran `/nix/store/cs5ycqjsa2lklgx5slaja3gshxf2g7r5-softhsm-2.4.0/bin/softhsm2-keyconv --version` and found version 2.4.0
- ran `/nix/store/cs5ycqjsa2lklgx5slaja3gshxf2g7r5-softhsm-2.4.0/bin/softhsm2-util -h` got 0 exit code
- ran `/nix/store/cs5ycqjsa2lklgx5slaja3gshxf2g7r5-softhsm-2.4.0/bin/softhsm2-util --help` got 0 exit code
- ran `/nix/store/cs5ycqjsa2lklgx5slaja3gshxf2g7r5-softhsm-2.4.0/bin/softhsm2-util -V` and found version 2.4.0
- ran `/nix/store/cs5ycqjsa2lklgx5slaja3gshxf2g7r5-softhsm-2.4.0/bin/softhsm2-util -v` and found version 2.4.0
- ran `/nix/store/cs5ycqjsa2lklgx5slaja3gshxf2g7r5-softhsm-2.4.0/bin/softhsm2-util --version` and found version 2.4.0
- found 2.4.0 with grep in /nix/store/cs5ycqjsa2lklgx5slaja3gshxf2g7r5-softhsm-2.4.0
- found 2.4.0 in filename of file in /nix/store/cs5ycqjsa2lklgx5slaja3gshxf2g7r5-softhsm-2.4.0
Semi-automatic update. These checks were performed:
- built on NixOS
- ran `/nix/store/lgayw7d562299m06kmdp15zb35j9r0gg-munge-0.5.13/bin/munge -h` got 0 exit code
- ran `/nix/store/lgayw7d562299m06kmdp15zb35j9r0gg-munge-0.5.13/bin/munge --help` got 0 exit code
- ran `/nix/store/lgayw7d562299m06kmdp15zb35j9r0gg-munge-0.5.13/bin/munge -V` and found version 0.5.13
- ran `/nix/store/lgayw7d562299m06kmdp15zb35j9r0gg-munge-0.5.13/bin/munge --version` and found version 0.5.13
- ran `/nix/store/lgayw7d562299m06kmdp15zb35j9r0gg-munge-0.5.13/bin/unmunge -h` got 0 exit code
- ran `/nix/store/lgayw7d562299m06kmdp15zb35j9r0gg-munge-0.5.13/bin/unmunge --help` got 0 exit code
- ran `/nix/store/lgayw7d562299m06kmdp15zb35j9r0gg-munge-0.5.13/bin/unmunge -V` and found version 0.5.13
- ran `/nix/store/lgayw7d562299m06kmdp15zb35j9r0gg-munge-0.5.13/bin/unmunge --version` and found version 0.5.13
- ran `/nix/store/lgayw7d562299m06kmdp15zb35j9r0gg-munge-0.5.13/bin/remunge -h` got 0 exit code
- ran `/nix/store/lgayw7d562299m06kmdp15zb35j9r0gg-munge-0.5.13/bin/remunge --help` got 0 exit code
- ran `/nix/store/lgayw7d562299m06kmdp15zb35j9r0gg-munge-0.5.13/bin/remunge -V` and found version 0.5.13
- ran `/nix/store/lgayw7d562299m06kmdp15zb35j9r0gg-munge-0.5.13/bin/remunge --version` and found version 0.5.13
- ran `/nix/store/lgayw7d562299m06kmdp15zb35j9r0gg-munge-0.5.13/bin/munged -h` got 0 exit code
- ran `/nix/store/lgayw7d562299m06kmdp15zb35j9r0gg-munge-0.5.13/bin/munged --help` got 0 exit code
- ran `/nix/store/lgayw7d562299m06kmdp15zb35j9r0gg-munge-0.5.13/bin/munged -V` and found version 0.5.13
- ran `/nix/store/lgayw7d562299m06kmdp15zb35j9r0gg-munge-0.5.13/bin/munged --version` and found version 0.5.13
- ran `/nix/store/lgayw7d562299m06kmdp15zb35j9r0gg-munge-0.5.13/bin/munged -h` and found version 0.5.13
- ran `/nix/store/lgayw7d562299m06kmdp15zb35j9r0gg-munge-0.5.13/bin/munged --help` and found version 0.5.13
- found 0.5.13 with grep in /nix/store/lgayw7d562299m06kmdp15zb35j9r0gg-munge-0.5.13
- found 0.5.13 in filename of file in /nix/store/lgayw7d562299m06kmdp15zb35j9r0gg-munge-0.5.13
cc "@rickynils"
Semi-automatic update. These checks were performed:
- built on NixOS
- found 3.8.2 with grep in /nix/store/4b45r8vab7cxg4b5swyi7x7nvi6cpgci-opencryptoki-3.8.2
- found 3.8.2 in filename of file in /nix/store/4b45r8vab7cxg4b5swyi7x7nvi6cpgci-opencryptoki-3.8.2
cc "@tstrobel"
Semi-automatic update. These checks were performed:
- built on NixOS
- ran `/nix/store/4xhrypy9qbx3ijfis7c84sdd08nrmlc8-tpm-quote-tools-1.0.4/bin/tpm_mkuuid -h` got 0 exit code
- ran `/nix/store/4xhrypy9qbx3ijfis7c84sdd08nrmlc8-tpm-quote-tools-1.0.4/bin/tpm_mkuuid -v` and found version 1.0.4
- ran `/nix/store/4xhrypy9qbx3ijfis7c84sdd08nrmlc8-tpm-quote-tools-1.0.4/bin/tpm_mkuuid -h` and found version 1.0.4
- ran `/nix/store/4xhrypy9qbx3ijfis7c84sdd08nrmlc8-tpm-quote-tools-1.0.4/bin/tpm_mkaik -h` got 0 exit code
- ran `/nix/store/4xhrypy9qbx3ijfis7c84sdd08nrmlc8-tpm-quote-tools-1.0.4/bin/tpm_mkaik -v` and found version 1.0.4
- ran `/nix/store/4xhrypy9qbx3ijfis7c84sdd08nrmlc8-tpm-quote-tools-1.0.4/bin/tpm_mkaik -h` and found version 1.0.4
- ran `/nix/store/4xhrypy9qbx3ijfis7c84sdd08nrmlc8-tpm-quote-tools-1.0.4/bin/tpm_getpcrhash -h` got 0 exit code
- ran `/nix/store/4xhrypy9qbx3ijfis7c84sdd08nrmlc8-tpm-quote-tools-1.0.4/bin/tpm_getpcrhash -v` and found version 1.0.4
- ran `/nix/store/4xhrypy9qbx3ijfis7c84sdd08nrmlc8-tpm-quote-tools-1.0.4/bin/tpm_getpcrhash -h` and found version 1.0.4
- ran `/nix/store/4xhrypy9qbx3ijfis7c84sdd08nrmlc8-tpm-quote-tools-1.0.4/bin/tpm_loadkey -h` got 0 exit code
- ran `/nix/store/4xhrypy9qbx3ijfis7c84sdd08nrmlc8-tpm-quote-tools-1.0.4/bin/tpm_loadkey -v` and found version 1.0.4
- ran `/nix/store/4xhrypy9qbx3ijfis7c84sdd08nrmlc8-tpm-quote-tools-1.0.4/bin/tpm_loadkey -h` and found version 1.0.4
- ran `/nix/store/4xhrypy9qbx3ijfis7c84sdd08nrmlc8-tpm-quote-tools-1.0.4/bin/tpm_unloadkey -h` got 0 exit code
- ran `/nix/store/4xhrypy9qbx3ijfis7c84sdd08nrmlc8-tpm-quote-tools-1.0.4/bin/tpm_unloadkey -v` and found version 1.0.4
- ran `/nix/store/4xhrypy9qbx3ijfis7c84sdd08nrmlc8-tpm-quote-tools-1.0.4/bin/tpm_unloadkey -h` and found version 1.0.4
- ran `/nix/store/4xhrypy9qbx3ijfis7c84sdd08nrmlc8-tpm-quote-tools-1.0.4/bin/tpm_getquote -h` got 0 exit code
- ran `/nix/store/4xhrypy9qbx3ijfis7c84sdd08nrmlc8-tpm-quote-tools-1.0.4/bin/tpm_getquote -v` and found version 1.0.4
- ran `/nix/store/4xhrypy9qbx3ijfis7c84sdd08nrmlc8-tpm-quote-tools-1.0.4/bin/tpm_getquote -h` and found version 1.0.4
- ran `/nix/store/4xhrypy9qbx3ijfis7c84sdd08nrmlc8-tpm-quote-tools-1.0.4/bin/tpm_verifyquote -h` got 0 exit code
- ran `/nix/store/4xhrypy9qbx3ijfis7c84sdd08nrmlc8-tpm-quote-tools-1.0.4/bin/tpm_verifyquote -v` and found version 1.0.4
- ran `/nix/store/4xhrypy9qbx3ijfis7c84sdd08nrmlc8-tpm-quote-tools-1.0.4/bin/tpm_verifyquote -h` and found version 1.0.4
- ran `/nix/store/4xhrypy9qbx3ijfis7c84sdd08nrmlc8-tpm-quote-tools-1.0.4/bin/tpm_updatepcrhash -h` got 0 exit code
- ran `/nix/store/4xhrypy9qbx3ijfis7c84sdd08nrmlc8-tpm-quote-tools-1.0.4/bin/tpm_updatepcrhash -v` and found version 1.0.4
- ran `/nix/store/4xhrypy9qbx3ijfis7c84sdd08nrmlc8-tpm-quote-tools-1.0.4/bin/tpm_updatepcrhash -h` and found version 1.0.4
- found 1.0.4 with grep in /nix/store/4xhrypy9qbx3ijfis7c84sdd08nrmlc8-tpm-quote-tools-1.0.4
- found 1.0.4 in filename of file in /nix/store/4xhrypy9qbx3ijfis7c84sdd08nrmlc8-tpm-quote-tools-1.0.4
cc "@ak @ndowens"
Semi-automatic update. These checks were performed:
- built on NixOS
- ran `/nix/store/kp72kh1a4dy4pdj5i4qnngmwz9083yjf-vault-0.9.4/bin/vault -h` got 0 exit code
- ran `/nix/store/kp72kh1a4dy4pdj5i4qnngmwz9083yjf-vault-0.9.4/bin/vault --help` got 0 exit code
- ran `/nix/store/kp72kh1a4dy4pdj5i4qnngmwz9083yjf-vault-0.9.4/bin/vault -v` and found version 0.9.4
- ran `/nix/store/kp72kh1a4dy4pdj5i4qnngmwz9083yjf-vault-0.9.4/bin/vault --version` and found version 0.9.4
- ran `/nix/store/kp72kh1a4dy4pdj5i4qnngmwz9083yjf-vault-0.9.4/bin/vault version` and found version 0.9.4
- found 0.9.4 with grep in /nix/store/kp72kh1a4dy4pdj5i4qnngmwz9083yjf-vault-0.9.4
- found 0.9.4 in filename of file in /nix/store/kp72kh1a4dy4pdj5i4qnngmwz9083yjf-vault-0.9.4
cc "@rushmorem @offline @pradeepchhetri"
Semi-automatic update. These checks were performed:
- built on NixOS
- ran `/nix/store/9gwfzrfmah4n4lf69anhqgxrj0p9f77l-shc-3.9.6/bin/shc -h` got 0 exit code
- ran `/nix/store/9gwfzrfmah4n4lf69anhqgxrj0p9f77l-shc-3.9.6/bin/shc --help` got 0 exit code
- ran `/nix/store/9gwfzrfmah4n4lf69anhqgxrj0p9f77l-shc-3.9.6/bin/shc -h` and found version 3.9.6
- ran `/nix/store/9gwfzrfmah4n4lf69anhqgxrj0p9f77l-shc-3.9.6/bin/shc --help` and found version 3.9.6
- found 3.9.6 with grep in /nix/store/9gwfzrfmah4n4lf69anhqgxrj0p9f77l-shc-3.9.6
- found 3.9.6 in filename of file in /nix/store/9gwfzrfmah4n4lf69anhqgxrj0p9f77l-shc-3.9.6
Semi-automatic update. These checks were performed:
- built on NixOS
- ran `/nix/store/3022qnvnd3j3zrz8qbyvv0izffbc17kj-minisign-0.8/bin/minisign -v` and found version 0.8
- ran `/nix/store/3022qnvnd3j3zrz8qbyvv0izffbc17kj-minisign-0.8/bin/minisign --version` and found version 0.8
- found 0.8 with grep in /nix/store/3022qnvnd3j3zrz8qbyvv0izffbc17kj-minisign-0.8
- found 0.8 in filename of file in /nix/store/3022qnvnd3j3zrz8qbyvv0izffbc17kj-minisign-0.8
cc "@joachifm"
Semi-automatic update. These checks were performed:
- built on NixOS
- ran `/nix/store/xspm1nc8dznagjc1rnpg2rjxlf88ivkc-lynis-2.6.2/bin/lynis -V` and found version 2.6.2
- ran `/nix/store/xspm1nc8dznagjc1rnpg2rjxlf88ivkc-lynis-2.6.2/bin/lynis --version` and found version 2.6.2
- ran `/nix/store/xspm1nc8dznagjc1rnpg2rjxlf88ivkc-lynis-2.6.2/bin/.lynis-wrapped -V` and found version 2.6.2
- ran `/nix/store/xspm1nc8dznagjc1rnpg2rjxlf88ivkc-lynis-2.6.2/bin/.lynis-wrapped --version` and found version 2.6.2
- found 2.6.2 with grep in /nix/store/xspm1nc8dznagjc1rnpg2rjxlf88ivkc-lynis-2.6.2
- found 2.6.2 in filename of file in /nix/store/xspm1nc8dznagjc1rnpg2rjxlf88ivkc-lynis-2.6.2
cc "@ryneeverett"
Semi-automatic update. These checks were performed:
- built on NixOS
- found 3.01 in filename of file in /nix/store/088ja4dgf1lkpm5sddpvi5c7fc2k67sx-kwalletcli-3.01
cc "@peterhoeg"
Semi-automatic update. These checks were performed:
- built on NixOS
- ran `/nix/store/4x18w356x6ah895mfb17ascylzpp64py-kpcli-3.2/bin/kpcli -h` got 0 exit code
- ran `/nix/store/4x18w356x6ah895mfb17ascylzpp64py-kpcli-3.2/bin/kpcli --help` got 0 exit code
- found 3.2 with grep in /nix/store/4x18w356x6ah895mfb17ascylzpp64py-kpcli-3.2
- found 3.2 in filename of file in /nix/store/4x18w356x6ah895mfb17ascylzpp64py-kpcli-3.2
cc "@j-keck"
Semi-automatic update. These checks were performed:
- built on NixOS
- ran `/nix/store/7rn5cnfv36fyzqfvw2b8gn17amav65im-fprintd-0.8.0/bin/fprintd-verify -h` got 0 exit code
- ran `/nix/store/7rn5cnfv36fyzqfvw2b8gn17amav65im-fprintd-0.8.0/bin/fprintd-verify --help` got 0 exit code
- ran `/nix/store/7rn5cnfv36fyzqfvw2b8gn17amav65im-fprintd-0.8.0/bin/fprintd-enroll -h` got 0 exit code
- ran `/nix/store/7rn5cnfv36fyzqfvw2b8gn17amav65im-fprintd-0.8.0/bin/fprintd-enroll --help` got 0 exit code
- found 0.8.0 with grep in /nix/store/7rn5cnfv36fyzqfvw2b8gn17amav65im-fprintd-0.8.0
- found 0.8.0 in filename of file in /nix/store/7rn5cnfv36fyzqfvw2b8gn17amav65im-fprintd-0.8.0
cc "@abbradar"
Semi-automatic update. These checks were performed:
- built on NixOS
- ran `/nix/store/ysm8fw6liwvqvnwk4yds5xz5md7vi42y-certstrap-1.1.1-bin/bin/certstrap -h` got 0 exit code
- ran `/nix/store/ysm8fw6liwvqvnwk4yds5xz5md7vi42y-certstrap-1.1.1-bin/bin/certstrap --help` got 0 exit code
- ran `/nix/store/ysm8fw6liwvqvnwk4yds5xz5md7vi42y-certstrap-1.1.1-bin/bin/certstrap help` got 0 exit code
- ran `/nix/store/ysm8fw6liwvqvnwk4yds5xz5md7vi42y-certstrap-1.1.1-bin/bin/certstrap -v` and found version 1.1.1
- ran `/nix/store/ysm8fw6liwvqvnwk4yds5xz5md7vi42y-certstrap-1.1.1-bin/bin/certstrap --version` and found version 1.1.1
- ran `/nix/store/ysm8fw6liwvqvnwk4yds5xz5md7vi42y-certstrap-1.1.1-bin/bin/certstrap -h` and found version 1.1.1
- ran `/nix/store/ysm8fw6liwvqvnwk4yds5xz5md7vi42y-certstrap-1.1.1-bin/bin/certstrap --help` and found version 1.1.1
- ran `/nix/store/ysm8fw6liwvqvnwk4yds5xz5md7vi42y-certstrap-1.1.1-bin/bin/certstrap help` and found version 1.1.1
- found 1.1.1 with grep in /nix/store/ysm8fw6liwvqvnwk4yds5xz5md7vi42y-certstrap-1.1.1-bin
- found 1.1.1 in filename of file in /nix/store/ysm8fw6liwvqvnwk4yds5xz5md7vi42y-certstrap-1.1.1-bin
Semi-automatic update. These checks were performed:
- built on NixOS
- found 2.0.11 with grep in /nix/store/9kvlg1r91rvdqmvjlva1jwk2znsbj5l3-browserpass-2.0.11-bin
- found 2.0.11 in filename of file in /nix/store/9kvlg1r91rvdqmvjlva1jwk2znsbj5l3-browserpass-2.0.11-bin
Apparently they set CFLAGS incompatible with clang.
Also only provide a default value for AFL_CC/AFL_CXX for afl-clang-fast:
User might want to overriding, but this is not a PATH variable that can
be prepended with :.
