Since v1.4.9, another stat command has been added to playTests.sh.
Similar to other uses in this file, it attempts to use BSD syntax on
Darwin/BSD, and must be patched to unconditionally use GNU syntax.
We can use use `stdenv.hostPlatform.isStatic` instead, and move the
logic per package. The least opionated benefit of this is that it makes
it much easier to replace packages with modified ones, as there is no
longer any issue of overlay order.
CC @FRidh @matthewbauer
Years ago I thought I might use it for something, but anything like that
seems very unlikely to ever materialize, so let me focus on packages
that I consider more important.
I made a mistake merge. Reverting it in c778945806 undid the state
on master, but now I realize it crippled the git merge mechanism.
As the merge contained a mix of commits from `master..staging-next`
and other commits from `staging-next..staging`, it got the
`staging-next` branch into a state that was difficult to recover.
I reconstructed the "desired" state of staging-next tree by:
- checking out the last commit of the problematic range: 4effe769e2
- `git rebase -i --preserve-merges a8a018ddc0` - dropping the mistaken
merge commit and its revert from that range (while keeping
reapplication from 4effe769e2)
- merging the last unaffected staging-next commit (803ca85c20)
- fortunately no other commits have been pushed to staging-next yet
- applying a diff on staging-next to get it into that state
bzip2 has been unmaintained for a long time. For a while now, there has
been maintainership, resulting in the release of 1.0.8. At the same
time, there is now a master branch (version 1.1.x) which supports meson
and cmake as build systems.
This commit adds the current HEAD of the master branch (1.1.x). In the
future we may want to use this one instead of the older and patched
1.0.6 we currently have.
Related:
- https://github.com/NixOS/nixpkgs/pull/65029
- https://github.com/NixOS/nixpkgs/pull/94969
This adds a warning to the top of each “boot” package that reads:
Note: this package is used for bootstrapping fetchurl, and thus cannot
use fetchpatch! All mutable patches (generated by GitHub or cgit) that
are needed here should be included directly in Nixpkgs as files.
This makes it clear to maintainer that they may need to treat this
package a little differently than others. Importantly, we can’t use
fetchpatch here due to using <nix/fetchurl.nix>. To avoid having stale
hashes, we need to include patches that are subject to changing
overtime (for instance, gitweb’s patches contain a version number at
the bottom).
The previous CMake version did not run any tests, the current version
tries to run all tests (I could not await their completion), and the
last GNU Make version ran `make -C tests shortest` which ran only
playTests.sh, so I've enabled only the playTests test.
without this fix, binaries report their version number as "vnone"
which for example stops `image_optim` from using `advpng` (refuses
to use it not being able to tell what version number it has)
The release tarball is no longer available at the specified URL, so
building from git. Also, the gnulib in the release tarball was too old
for our recent glibc version.
There ver very many conflicts, basically all due to
name -> pname+version. Fortunately, almost everything was auto-resolved
by kdiff3, and for now I just fixed up a couple evaluation problems,
as verified by the tarball job. There might be some fallback to these
conflicts, but I believe it should be minimal.
Hydra nixpkgs: ?compare=1538299
In 724e833ea2, I was a little too aggressive in enabling these flags.
Many don’t work in gcc, and we should probably avoid settings them
widely. This makes those flags optional on isclang
Whenever we create scripts that are installed to $out, we must use runtimeShell
in order to get the shell that can be executed on the machine we create the
package for. This is relevant for cross-compiling. The only use case for
stdenv.shell are scripts that are executed as part of the build system.
Usages in checkPhase are borderline however to decrease the likelyhood
of people copying the wrong examples, I decided to use runtimeShell as well.
CMAKE passes the flag -rdynamic otherwise (which is not recognized by mingw).
Setting the appropriate flag avoids this problem and allows the build
to succeed.
The user who wrote this code on GitHub has since deleted their account,
making any updates impossible. Furthermore, this package is redundant
anyway: Zstandard has been shipping a compatible 'zstdmt' binary, API,
and stable multi-threading support for over a year now.
Signed-off-by: Austin Seipp <aseipp@pobox.com>
I *want* cross-specific overrides to be verbose, so I rather not have
this shorthand. This makes the syntactic overhead more proportional to
the maintainence cost. Hopefully this pushes people towards fewer
conditionals and more abstractions.
This makes the command ‘nix-env -qa -f. --arg config '{skipAliases =
true;}'’ work in Nixpkgs.
Misc...
- qtikz: use libsForQt5.callPackage
This ensures we get the right poppler.
- rewrites:
docbook5_xsl -> docbook_xsl_ns
docbook_xml_xslt -> docbook_xsl
diffpdf: fixup
* treewide: http -> https sources
This updates the source urls of all top-level packages from http to
https where possible.
* buildtorrent: fix url and tab -> spaces
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.
This update was made based on information from https://repology.org/metapackage/xz/versions.
These checks were done:
- built on NixOS
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/unxz -h’ got 0 exit code
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/unxz --help’ got 0 exit code
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/xzcat -h’ got 0 exit code
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/xzcat --help’ got 0 exit code
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/lzma -h’ got 0 exit code
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/lzma --help’ got 0 exit code
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/unlzma -h’ got 0 exit code
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/unlzma --help’ got 0 exit code
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/lzcat -h’ got 0 exit code
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/lzcat --help’ got 0 exit code
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/xzdiff --help’ got 0 exit code
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/xzdiff --version’ and found version 5.2.4
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/xzgrep --help’ got 0 exit code
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/xzgrep -V’ and found version 5.2.4
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/xzgrep --version’ and found version 5.2.4
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/xzmore -h’ got 0 exit code
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/xzmore --help’ got 0 exit code
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/xzmore help’ got 0 exit code
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/xzmore --version’ and found version 5.2.4
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/xzless -h’ got 0 exit code
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/xzless --help’ got 0 exit code
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/xzless help’ got 0 exit code
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/xzless --version’ and found version 5.2.4
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/xzcmp --help’ got 0 exit code
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/xzcmp --version’ and found version 5.2.4
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/xzegrep --help’ got 0 exit code
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/xzegrep -V’ and found version 5.2.4
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/xzegrep --version’ and found version 5.2.4
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/xzfgrep --help’ got 0 exit code
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/xzfgrep -V’ and found version 5.2.4
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/xzfgrep --version’ and found version 5.2.4
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/lzdiff --help’ got 0 exit code
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/lzdiff --version’ and found version 5.2.4
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/lzcmp --help’ got 0 exit code
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/lzcmp --version’ and found version 5.2.4
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/lzgrep --help’ got 0 exit code
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/lzgrep -V’ and found version 5.2.4
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/lzgrep --version’ and found version 5.2.4
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/lzegrep --help’ got 0 exit code
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/lzegrep -V’ and found version 5.2.4
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/lzegrep --version’ and found version 5.2.4
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/lzfgrep --help’ got 0 exit code
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/lzfgrep -V’ and found version 5.2.4
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/lzfgrep --version’ and found version 5.2.4
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/lzmore -h’ got 0 exit code
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/lzmore --help’ got 0 exit code
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/lzmore help’ got 0 exit code
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/lzmore --version’ and found version 5.2.4
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/lzless -h’ got 0 exit code
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/lzless --help’ got 0 exit code
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/lzless help’ got 0 exit code
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/lzless --version’ and found version 5.2.4
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/xzdec -h’ got 0 exit code
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/xzdec --help’ got 0 exit code
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/lzmadec -h’ got 0 exit code
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/lzmadec --help’ got 0 exit code
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/xz -h’ got 0 exit code
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/xz --help’ got 0 exit code
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/lzmainfo --help’ got 0 exit code
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/lzmainfo --version’ and found version 5.2.4
- found 5.2.4 with grep in /nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin
- directory tree listing: https://gist.github.com/5bf57c36243ce0756cb390f685d22fdf
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.
This update was made based on information from https://repology.org/metapackage/brotli/versions.
These checks were done:
- built on NixOS
- ran ‘/nix/store/7izjihjc6qc7z96hqvbh6y56rs7q63nd-brotli-1.0.4/bin/brotli -h’ got 0 exit code
- ran ‘/nix/store/7izjihjc6qc7z96hqvbh6y56rs7q63nd-brotli-1.0.4/bin/brotli --help’ got 0 exit code
- ran ‘/nix/store/7izjihjc6qc7z96hqvbh6y56rs7q63nd-brotli-1.0.4/bin/brotli -V’ and found version 1.0.4
- ran ‘/nix/store/7izjihjc6qc7z96hqvbh6y56rs7q63nd-brotli-1.0.4/bin/brotli --version’ and found version 1.0.4
- directory tree listing: https://gist.github.com/8f1f6ce7cb6e005fe8d7cb00a4f50222
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/j8izqqx03n8aqqab57sybxkv483xfz05-pigz-2.4/bin/pigz -h` got 0 exit code
- ran `/nix/store/j8izqqx03n8aqqab57sybxkv483xfz05-pigz-2.4/bin/pigz --help` got 0 exit code
- ran `/nix/store/j8izqqx03n8aqqab57sybxkv483xfz05-pigz-2.4/bin/pigz -V` and found version 2.4
- ran `/nix/store/j8izqqx03n8aqqab57sybxkv483xfz05-pigz-2.4/bin/pigz --version` and found version 2.4
- found 2.4 with grep in /nix/store/j8izqqx03n8aqqab57sybxkv483xfz05-pigz-2.4
- found 2.4 in filename of file in /nix/store/j8izqqx03n8aqqab57sybxkv483xfz05-pigz-2.4
Semi-automatic update. These checks were performed:
- built on NixOS
- ran `/nix/store/y8gzi68gamcb4wjrhm075vg5xv3gjfam-lzip-1.20/bin/lzip -h` got 0 exit code
- ran `/nix/store/y8gzi68gamcb4wjrhm075vg5xv3gjfam-lzip-1.20/bin/lzip --help` got 0 exit code
- ran `/nix/store/y8gzi68gamcb4wjrhm075vg5xv3gjfam-lzip-1.20/bin/lzip -V` and found version 1.20
- ran `/nix/store/y8gzi68gamcb4wjrhm075vg5xv3gjfam-lzip-1.20/bin/lzip --version` and found version 1.20
- ran `/nix/store/y8gzi68gamcb4wjrhm075vg5xv3gjfam-lzip-1.20/bin/lzip -h` and found version 1.20
- ran `/nix/store/y8gzi68gamcb4wjrhm075vg5xv3gjfam-lzip-1.20/bin/lzip --help` and found version 1.20
- found 1.20 with grep in /nix/store/y8gzi68gamcb4wjrhm075vg5xv3gjfam-lzip-1.20
- found 1.20 in filename of file in /nix/store/y8gzi68gamcb4wjrhm075vg5xv3gjfam-lzip-1.20