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/rq0ny7n6qfg7sgjqa5ki2ds6v3gzjwil-discount-2.2.3/bin/markdown help` got 0 exit code
- ran `/nix/store/rq0ny7n6qfg7sgjqa5ki2ds6v3gzjwil-discount-2.2.3/bin/markdown -V` and found version 2.2.3
- ran `/nix/store/rq0ny7n6qfg7sgjqa5ki2ds6v3gzjwil-discount-2.2.3/bin/markdown --version` and found version 2.2.3
- found 2.2.3 with grep in /nix/store/rq0ny7n6qfg7sgjqa5ki2ds6v3gzjwil-discount-2.2.3
- found 2.2.3 in filename of file in /nix/store/rq0ny7n6qfg7sgjqa5ki2ds6v3gzjwil-discount-2.2.3
Semi-automatic update. These checks were done:
- built on NixOS
- ran `/nix/store/kws0dw1qp926cdc6msrndgq3iwp2l84a-ansifilter-2.9/bin/ansifilter -h` got 0 exit code
- ran `/nix/store/kws0dw1qp926cdc6msrndgq3iwp2l84a-ansifilter-2.9/bin/ansifilter --help` got 0 exit code
- ran `/nix/store/kws0dw1qp926cdc6msrndgq3iwp2l84a-ansifilter-2.9/bin/ansifilter help` got 0 exit code
- ran `/nix/store/kws0dw1qp926cdc6msrndgq3iwp2l84a-ansifilter-2.9/bin/ansifilter -V` and found version 2.9
- ran `/nix/store/kws0dw1qp926cdc6msrndgq3iwp2l84a-ansifilter-2.9/bin/ansifilter -v` and found version 2.9
- ran `/nix/store/kws0dw1qp926cdc6msrndgq3iwp2l84a-ansifilter-2.9/bin/ansifilter --version` and found version 2.9
- found 2.9 with grep in /nix/store/kws0dw1qp926cdc6msrndgq3iwp2l84a-ansifilter-2.9
- found 2.9 in filename of file in /nix/store/kws0dw1qp926cdc6msrndgq3iwp2l84a-ansifilter-2.9
Semi-automatic update. These checks were performed:
- built on NixOS
- ran `/nix/store/9idavy2wphjqap2sw87ivczwq8wy7vjf-html-tidy-5.6.0/bin/tidy -h` got 0 exit code
- ran `/nix/store/9idavy2wphjqap2sw87ivczwq8wy7vjf-html-tidy-5.6.0/bin/tidy --help` got 0 exit code
- ran `/nix/store/9idavy2wphjqap2sw87ivczwq8wy7vjf-html-tidy-5.6.0/bin/tidy help` got 0 exit code
- ran `/nix/store/9idavy2wphjqap2sw87ivczwq8wy7vjf-html-tidy-5.6.0/bin/tidy -V` and found version 5.6.0
- ran `/nix/store/9idavy2wphjqap2sw87ivczwq8wy7vjf-html-tidy-5.6.0/bin/tidy -v` and found version 5.6.0
- ran `/nix/store/9idavy2wphjqap2sw87ivczwq8wy7vjf-html-tidy-5.6.0/bin/tidy --version` and found version 5.6.0
- ran `/nix/store/9idavy2wphjqap2sw87ivczwq8wy7vjf-html-tidy-5.6.0/bin/tidy -h` and found version 5.6.0
- ran `/nix/store/9idavy2wphjqap2sw87ivczwq8wy7vjf-html-tidy-5.6.0/bin/tidy --help` and found version 5.6.0
- found 5.6.0 with grep in /nix/store/9idavy2wphjqap2sw87ivczwq8wy7vjf-html-tidy-5.6.0
- found 5.6.0 in filename of file in /nix/store/9idavy2wphjqap2sw87ivczwq8wy7vjf-html-tidy-5.6.0
cc "@edwtjo"
Semi-automatic update. These checks were performed:
- built on NixOS
- ran `/nix/store/57j66n7s9hxkrgbzvgxvrbvab1ipgakz-peco-0.5.2-bin/bin/peco -h` got 0 exit code
- ran `/nix/store/57j66n7s9hxkrgbzvgxvrbvab1ipgakz-peco-0.5.2-bin/bin/peco --help` got 0 exit code
- ran `/nix/store/57j66n7s9hxkrgbzvgxvrbvab1ipgakz-peco-0.5.2-bin/bin/peco --version` and found version 0.5.2
- found 0.5.2 with grep in /nix/store/57j66n7s9hxkrgbzvgxvrbvab1ipgakz-peco-0.5.2-bin
- found 0.5.2 in filename of file in /nix/store/57j66n7s9hxkrgbzvgxvrbvab1ipgakz-peco-0.5.2-bin
cc "@ehmry @lethalman"
Semi-automatic update. These checks were performed:
- built on NixOS
- ran `/nix/store/1fxha1zsb54kakf7y59a8sqdav71lvgr-xidel-0.9.6/bin/xidel -h` got 0 exit code
- ran `/nix/store/1fxha1zsb54kakf7y59a8sqdav71lvgr-xidel-0.9.6/bin/xidel --help` got 0 exit code
- ran `/nix/store/1fxha1zsb54kakf7y59a8sqdav71lvgr-xidel-0.9.6/bin/xidel -V` and found version 0.9.6
- ran `/nix/store/1fxha1zsb54kakf7y59a8sqdav71lvgr-xidel-0.9.6/bin/xidel -v` and found version 0.9.6
- ran `/nix/store/1fxha1zsb54kakf7y59a8sqdav71lvgr-xidel-0.9.6/bin/xidel --version` and found version 0.9.6
- ran `/nix/store/1fxha1zsb54kakf7y59a8sqdav71lvgr-xidel-0.9.6/bin/xidel -h` and found version 0.9.6
- ran `/nix/store/1fxha1zsb54kakf7y59a8sqdav71lvgr-xidel-0.9.6/bin/xidel --help` and found version 0.9.6
- found 0.9.6 in filename of file in /nix/store/1fxha1zsb54kakf7y59a8sqdav71lvgr-xidel-0.9.6
cc "@bjornfor"
Semi-automatic update. These checks were performed:
- built on NixOS
- ran `/nix/store/vibybpmnsw93gg4rlf04bms7qf5nc9c7-mairix-0.24/bin/mairix -h` got 0 exit code
- ran `/nix/store/vibybpmnsw93gg4rlf04bms7qf5nc9c7-mairix-0.24/bin/mairix --help` got 0 exit code
- ran `/nix/store/vibybpmnsw93gg4rlf04bms7qf5nc9c7-mairix-0.24/bin/mairix -V` and found version 0.24
- ran `/nix/store/vibybpmnsw93gg4rlf04bms7qf5nc9c7-mairix-0.24/bin/mairix --version` and found version 0.24
- ran `/nix/store/vibybpmnsw93gg4rlf04bms7qf5nc9c7-mairix-0.24/bin/mairix -h` and found version 0.24
- ran `/nix/store/vibybpmnsw93gg4rlf04bms7qf5nc9c7-mairix-0.24/bin/mairix --help` and found version 0.24
- found 0.24 with grep in /nix/store/vibybpmnsw93gg4rlf04bms7qf5nc9c7-mairix-0.24
- found 0.24 in filename of file in /nix/store/vibybpmnsw93gg4rlf04bms7qf5nc9c7-mairix-0.24
cc "@viric"
Semi-automatic update. These checks were performed:
- built on NixOS
- ran `/nix/store/zmpviib2f0h0qh15j4qnzqxxkx2734n8-html-xml-utils-7.6/bin/hxaddid -v` and found version 7.6
- ran `/nix/store/zmpviib2f0h0qh15j4qnzqxxkx2734n8-html-xml-utils-7.6/bin/hxcite -v` and found version 7.6
- ran `/nix/store/zmpviib2f0h0qh15j4qnzqxxkx2734n8-html-xml-utils-7.6/bin/hxextract --help` got 0 exit code
- ran `/nix/store/zmpviib2f0h0qh15j4qnzqxxkx2734n8-html-xml-utils-7.6/bin/hxextract help` got 0 exit code
- ran `/nix/store/zmpviib2f0h0qh15j4qnzqxxkx2734n8-html-xml-utils-7.6/bin/hxextract -v` and found version 7.6
- ran `/nix/store/zmpviib2f0h0qh15j4qnzqxxkx2734n8-html-xml-utils-7.6/bin/hxcopy -v` and found version 7.6
- ran `/nix/store/zmpviib2f0h0qh15j4qnzqxxkx2734n8-html-xml-utils-7.6/bin/hxincl -v` and found version 7.6
- ran `/nix/store/zmpviib2f0h0qh15j4qnzqxxkx2734n8-html-xml-utils-7.6/bin/hxnum -V` and found version 7.6
- ran `/nix/store/zmpviib2f0h0qh15j4qnzqxxkx2734n8-html-xml-utils-7.6/bin/hxnum -v` and found version 7.6
- ran `/nix/store/zmpviib2f0h0qh15j4qnzqxxkx2734n8-html-xml-utils-7.6/bin/hxnum --version` and found version 7.6
- ran `/nix/store/zmpviib2f0h0qh15j4qnzqxxkx2734n8-html-xml-utils-7.6/bin/hxpipe -v` and found version 7.6
- ran `/nix/store/zmpviib2f0h0qh15j4qnzqxxkx2734n8-html-xml-utils-7.6/bin/hxremove -v` and found version 7.6
- ran `/nix/store/zmpviib2f0h0qh15j4qnzqxxkx2734n8-html-xml-utils-7.6/bin/hxselect -v` and found version 7.6
- ran `/nix/store/zmpviib2f0h0qh15j4qnzqxxkx2734n8-html-xml-utils-7.6/bin/hxtabletrans -v` and found version 7.6
- ran `/nix/store/zmpviib2f0h0qh15j4qnzqxxkx2734n8-html-xml-utils-7.6/bin/hxuncdata --help` got 0 exit code
- ran `/nix/store/zmpviib2f0h0qh15j4qnzqxxkx2734n8-html-xml-utils-7.6/bin/hxuncdata --help` and found version 7.6
- ran `/nix/store/zmpviib2f0h0qh15j4qnzqxxkx2734n8-html-xml-utils-7.6/bin/hxref -v` and found version 7.6
- found 7.6 with grep in /nix/store/zmpviib2f0h0qh15j4qnzqxxkx2734n8-html-xml-utils-7.6
- found 7.6 in filename of file in /nix/store/zmpviib2f0h0qh15j4qnzqxxkx2734n8-html-xml-utils-7.6
In anticipation of what I outline in #33599, I only simplify exactly those
`doCheck`s which are equal to `hostPlatform != buildPlatform`. I also stick a
comment next to them so I can grep for them later.
Keep the `source` attrset distinct to prevent its entries from merging
with the top level attrs.
Since each type of source has a different set of entries for `source`,
this is the easiest way to keep them together.
This will pave the way for a new `url` type of source.
This is a mass-rebuild of many ruby packages,
notably those using `git` type sources.
