Commit Graph

585 Commits

Author SHA1 Message Date
Jan Tojnar
f19eb635b4
Merge branch 'master' into staging-next
b04fc593e7 seems to have accidentally changed mkDerivation function for dfilemanager and solarus-quest-editor so I have reverted that here.
2021-01-07 13:04:31 +01:00
github-actions[bot]
581059aed4
Merge staging-next into staging 2021-01-04 00:57:38 +00:00
John Ericson
5c2965145f treewide: Inline more of the static overlay
Picking up where #107238 left off. I think I'll have gotten all the easy
stuff with this.
2021-01-03 21:46:14 +00:00
John Ericson
f52263ced0 treewide: Start to break up static overlay
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
2021-01-03 19:18:16 +00:00
Ben Siraphob
3ae5e6ce03 treewide: remove enableParallelBuilding = true if using cmake 2021-01-03 18:37:40 +07:00
Ben Siraphob
b04fc593e7 treewide: cmake buildInputs to nativeBuildInputs, minor cleanups 2021-01-01 11:52:33 +07:00
Mario Rodas
99061cb6ac zstd: 1.4.5 -> 1.4.8
+ https://github.com/facebook/zstd/releases/tag/v1.4.7
+ https://github.com/facebook/zstd/releases/tag/v1.4.8
2020-12-17 04:20:00 +00:00
Graham Christensen
bc49a0815a
utillinux: rename to util-linux 2020-11-24 12:42:06 -05:00
Emery Hemingway
f909429a9a lz4: 1.9.2 -> 1.9.3 2020-11-16 19:58:00 +01:00
freezeboy
7d3fb8234d
brotli: add myself as maintainer (#103129) 2020-11-08 22:11:29 -05:00
Vladimír Čunát
f4c13d1d9d
brotli.meta.maintainers: unlist myself
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.
2020-11-08 09:43:36 +01:00
freezeboy
99c9647e69 pkgsStatic.brotli: fix patch 2020-11-07 11:09:15 -08:00
Vladimír Čunát
dfd3ede68d
Merge branch 'master' into staging-next 2020-10-31 14:30:44 +01:00
John Ericson
66c9347db6
Merge pull request #102069 from nix-windows/libarchive-windows
libarchive: Fix MinGW build
2020-10-29 19:31:28 -04:00
John Ericson
437dc4c047 zstd: Fix MinGW build 2020-10-28 23:34:51 +00:00
Ben Siraphob
db74029e3e treewide: remove package names from prefix of descriptions 2020-10-27 09:15:07 -07:00
Vladimír Čunát
89023c38fc
Recover the complicated situation after my bad merge
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
2020-10-26 09:01:04 +01:00
Vladimír Čunát
c778945806
Revert "Merge #101508: libraw: 0.20.0 -> 0.20.2"
I'm sorry; I didn't notice it contained staging commits.

This reverts commit 17f5305b6c, reversing
changes made to a8a018ddc0.
2020-10-25 09:41:51 +01:00
Jan Tojnar
5c766c5c24
Merge branch 'staging-next' into staging 2020-10-18 21:21:03 +02:00
Ben Siraphob
683a87dbeb treewide: remove periods from end of package descriptions 2020-10-17 08:22:31 -07:00
freezeboy
347696a30b
brotli: 1.0.7 -> 1.0.9 (PR #100436)
Fixes CVE-2020-8927.
2020-10-17 10:46:14 +02:00
Konrad Borowski
e22e2a5080 flips: init at unstable-2020-10-02 2020-10-06 15:25:54 +02:00
Frederik Rietdijk
be534380c4 bzip2_1_1: init at 2020-08-11
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
2020-08-30 17:28:41 +02:00
Jan Tojnar
91104b5417
Merge branch 'master' into staging-next 2020-08-23 02:00:50 +02:00
Matthew Bauer
d1c2a9ed97 lzfse: use cmake build system
this builds .so correctly
2020-08-19 19:31:30 -05:00
Ben Wolsieffer
6093f9eb6e zstd: fix shebangs when cross-compiling 2020-08-15 08:32:57 +02:00
Frederik Rietdijk
50c060d13d Merge master into staging-next 2020-08-01 19:37:20 +02:00
Matthew Bauer
d0677e6d45 treewide: add warning comment to “boot” packages
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).
2020-07-31 08:56:53 +02:00
Daniël de Kok
5d21f4c1d5 lzfse: enable Darwin build
- Enable Darwin build, since Darwin is supported.
- Replace the revision by the corresponding Git tag.
2020-07-31 08:21:05 +02:00
R. RyanTM
257665d72c pixz: 1.0.6 -> 1.0.7 2020-07-27 22:04:52 +00:00
Dmitry Kalinkin
f6ef3ac294
zstd: build programs and tests against the shared library 2020-07-02 12:10:15 -04:00
Mario Rodas
bb4164e8d0
Merge pull request #97198 from r-ryantm/auto-update/lzbench
lzbench: 1.8 -> 1.8.1
2020-10-04 08:56:46 -05:00
mlvzk
492b9af995 brotli: fix patch URL 2020-09-24 23:36:46 +02:00
R. RyanTM
be5a72b4af lzbench: 1.8 -> 1.8.1 2020-09-05 07:00:27 +00:00
Frederik Rietdijk
febc27b59a Merge master into staging-next 2020-06-12 08:57:26 +02:00
Bart Brouns
1683a5f146 Revert "dtrx: remove p7zip, since it's unsafe"
This reverts commit 9b3ca0c614.
p7zip is now switched to a maintained fork
2020-06-11 18:41:17 +02:00
Frederik Rietdijk
8576d24b2a Merge staging-next into staging 2020-06-08 12:08:51 +02:00
Frederik Rietdijk
dc33419285 Merge master into staging-next 2020-06-08 12:06:12 +02:00
IvarWithoutBones
ff0da2c3e7 hactool: minor fixup 2020-06-07 15:24:46 +02:00
Frederik Rietdijk
d0532e79ae Merge staging-next into staging 2020-06-07 09:25:46 +02:00
Frederik Rietdijk
6b8223e634 Merge master into staging-next 2020-06-07 09:25:12 +02:00
Mario Rodas
8718eca57d
hactool: fix build on darwin 2020-06-06 04:20:00 -05:00
R. RyanTM
04d33ebf5c hactool: 1.3.3 -> 1.4.0 2020-06-06 08:53:25 +00:00
Frederik Rietdijk
af2dd0c798 Revert "Revert "Merge pull request #78910 from serokell/libarchive-zstd""
The PR was accidentally merged into master instead of staging and thus reverted. Now, in staging, we can re-revert it.

This reverts commit 4df2f78ec7.
2020-06-04 15:30:36 +02:00
Frederik Rietdijk
08900c0554 Merge master into staging-next 2020-06-04 15:25:54 +02:00
Frederik Rietdijk
4df2f78ec7 Revert "Merge pull request #78910 from serokell/libarchive-zstd"
Should go to staging instead.

This reverts commit f8d9f59abe, reversing
changes made to b27a19d5bf.
2020-05-29 21:03:02 +02:00
Frederik Rietdijk
f8d9f59abe
Merge pull request #78910 from serokell/libarchive-zstd
libarchive: link to zstd (split zstd output)
2020-05-29 20:51:16 +02:00
Vladimír Čunát
afa9962538
Merge #78910: libarchive: link to zstd (into staging)
Also split outputs and don't provide static lib by default.
2020-05-29 15:37:55 +02:00
Vladimír Čunát
7f76daacdb
zstd: get rid of static libs if enableShared 2020-05-29 15:29:20 +02:00
Frederik Rietdijk
1b7204ab3c Merge master into staging-next 2020-05-27 15:26:50 +02:00