1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-03 19:15:39 +00:00
Commit graph

1912 commits

Author SHA1 Message Date
Jonathan Ringer 50f15c610a
nixpkgs-review: 2.6.0 -> 2.6.1 (#126845) 2021-06-14 18:58:11 +02:00
Alyssa Ross 2d641a29ab nixUnstable: fix cross by disabling documentation
The documentation for Nix HEAD now requires running the generated Nix
binary, so we can't cross-build it. :(

https://github.com/NixOS/nix/issues/4622
2021-06-12 10:02:26 +00:00
Alyssa Ross 42b211f175
nix: clarify config.nix hack
The comment said that this was needed for Nix <2.3.8, which is wrong
-- it's needed for all 2.3.x.  I think this must have been caused by a
nmisreading of the conditional, which applied to all versions _later_
than 2.3.8, not earlier.

But we don't package anything that old any more, so we can remove that
check entirely, in addition to clarifying the comment.
2021-06-04 13:32:02 +00:00
Alyssa Ross 45eeabf3a1
nix: always depend on libsodium
Restricting this to Linux and Darwin broke other operating systems,
like NetBSD.
2021-06-04 10:37:34 +00:00
Sandro Jäckel 89d5f4b3d0
treewide: setuptools_scm -> setuptools-scm 2021-06-03 12:44:33 +02:00
Jonathan Ringer edb5ff75f2 nix: 2.3.11 -> 2.3.12 2021-06-02 19:15:39 -07:00
Jonathan Ringer 65c897c7c4 nixUnstable: 2.4pre20210503_6d2553a -> 2.4pre20210601_5985b8b5 2021-06-02 19:15:39 -07:00
Sandro 65f32d2984
Merge pull request #124730 from LeSuisse/morph-1.6.0
morph: 1.5.0 -> 1.6.0
2021-05-31 12:03:45 +02:00
R. RyanTM c00957f455 cargo-deb: 1.29.2 -> 1.30.0 2021-05-28 10:34:12 +00:00
Thomas Gerbet 03465e588b morph: 1.5.0 -> 1.6.0
https://github.com/DBCDK/morph/releases/tag/v1.6.0
2021-05-28 08:00:08 +02:00
Jörg Thalheim 5c2a47d5c7
nix: enable pie 2021-05-23 20:59:21 +02:00
Jonathan Ringer 11a9ac00fc
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
 pkgs/tools/networking/xh/default.nix
2021-05-22 18:19:10 -07:00
Kira Bruneau cd4780fab4
maintainers: rename metadark -> kira-bruneau (#124035) 2021-05-22 16:47:40 +02:00
Jonathan Ringer 5cd5b9b97f
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
 pkgs/development/tools/kubie/default.nix
2021-05-21 10:39:34 -07:00
Eelco Dolstra 62ee635d53
Replace nixFlakes -> nixUnstable 2021-05-21 15:23:52 +02:00
Eelco Dolstra 49c22083b9
nixFlakes: Turn into an alias 2021-05-21 15:21:31 +02:00
Eelco Dolstra 21bfd3bbce
Revert nixFlake / nixExperimental (#120141)
Usage of the nixFlakes attribute obscures the fact that it's an
experimental feature. Providing a nixExperimental attribute (which
people will inevitably start using on their production machines) makes
it too easy to enable all experimental features, when you should
explicitly opt in to the features that you want to try out.

Also, upstream Nix doesn't provide an "enable all experimental
features" patch so neither should Nixpkgs.
2021-05-21 15:16:35 +02:00
Jonathan Ringer ca46ad3762
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
  pkgs/tools/package-management/cargo-release/default.nix
2021-05-18 11:03:38 -07:00
Maximilian Bosch 58959f9d2d
Merge pull request #123485 from r-ryantm/auto-update/cargo-release
cargo-release: 0.13.10 -> 0.13.11
2021-05-18 19:14:27 +02:00
Jonathan Ringer f7a112f6c4
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
  pkgs/applications/graphics/emulsion/default.nix
  pkgs/development/tools/misc/texlab/default.nix
  pkgs/development/tools/rust/bindgen/default.nix
  pkgs/development/tools/rust/cargo-udeps/default.nix
  pkgs/misc/emulators/ruffle/default.nix
  pkgs/tools/misc/code-minimap/default.nix
2021-05-18 08:57:16 -07:00
R. RyanTM 402e8da68f cargo-release: 0.13.10 -> 0.13.11 2021-05-18 10:07:14 +00:00
Damien Cassou 762cb764a2
Merge pull request #123310 from khumba/nvd
nvd: init at 0.1.1
2021-05-18 10:56:38 +02:00
Bryan Gardiner 7ceeca96d3
nvd: init at 0.1.1 2021-05-17 21:32:39 -07:00
R. RyanTM cf09d3039b createrepo_c: 0.17.1 -> 0.17.2 2021-05-17 13:26:16 -07:00
github-actions[bot] c10600230e
Merge staging-next into staging 2021-05-15 18:30:31 +00:00
github-actions[bot] f1b78f8618
Merge master into staging-next 2021-05-15 18:30:28 +00:00
Domen Kožar f5f8f2415e
Merge pull request #122794 from Mic92/nix-hotfix
nixUnstable: pre20210503_6d2553a -> pre20210513_340f831
2021-05-15 15:47:41 +02:00
github-actions[bot] 78ae7ac75e
Merge staging-next into staging 2021-05-15 06:22:25 +00:00
Jörg Thalheim 5e7e70b200
nixUnstable: fix output name tokenizatoin 2021-05-15 07:14:35 +02:00
Vladimír Čunát c48eaa70e3
Merge branch 'master' into staging-next 2021-05-14 22:27:34 +02:00
Eelco Dolstra b08e223a04 nix: 2.3.10 -> 2.3.11
The patch is included in the new release, so can be dropped.

Co-authored-by: Alyssa Ross <hi@alyssa.is>
2021-05-14 12:24:54 +00:00
Alyssa Ross b4ff1c052c
Revert "nix: Fix version"
This reverts commit eac181da5d.

There is still a patch that doesn't apply.
2021-05-14 11:35:24 +00:00
Alyssa Ross 195d532a63
Revert "Revert "Revert "nix: 2.3.10 -> 2.3.11"""
This reverts commit 66fc303070.

There is still a patch that doesn't apply.
2021-05-14 11:35:18 +00:00
Eelco Dolstra 66fc303070
Revert "Revert "nix: 2.3.10 -> 2.3.11""
This reverts commit 1872bbdae5.
2021-05-14 13:33:05 +02:00
Eelco Dolstra eac181da5d
nix: Fix version 2021-05-14 13:32:34 +02:00
Alyssa Ross 1872bbdae5
Revert "nix: 2.3.10 -> 2.3.11"
This reverts commit 6f6b2cdc98.

Version wasn't updated, and apparently a patch didn't apply.  Let's do
this upgrade properly, in a PR, but for now I'm reverting so we don't
have a broken nix package in master.
2021-05-14 11:30:55 +00:00
Eelco Dolstra 6f6b2cdc98
nix: 2.3.10 -> 2.3.11 2021-05-14 13:11:26 +02:00
github-actions[bot] 60f5ecc76d
Merge staging-next into staging 2021-05-13 12:26:52 +00:00
github-actions[bot] 7465594428
Merge master into staging-next 2021-05-13 12:26:48 +00:00
DavHau 0b14ea44a6
auditwheel: init at 4.0.0 (#122607) 2021-05-13 13:44:08 +02:00
github-actions[bot] 5c4cda9988
Merge staging-next into staging 2021-05-12 00:50:13 +00:00
github-actions[bot] 5a513ae14b
Merge master into staging-next 2021-05-12 00:50:10 +00:00
Maciej Krüger 9c19ef7cf2
Merge pull request #120141 from DavHau/davhau-nixFlakes-enable-flakes 2021-05-12 02:07:17 +02:00
github-actions[bot] 309163aed7
Merge staging-next into staging 2021-05-11 12:24:31 +00:00
github-actions[bot] 1e7a48b474
Merge master into staging-next 2021-05-11 12:24:28 +00:00
Stéphan Kochen e3fe2937a5 cargo-about: fix darwin build 2021-05-11 10:05:40 +02:00
Jan Tojnar 7982550ac4
Merge branch 'staging-next' into staging 2021-05-11 09:09:10 +02:00
github-actions[bot] 49b8e6f7d4
Merge master into staging-next 2021-05-11 00:48:15 +00:00
Sandro f436cc346e
Merge pull request #122484 from MetaDark/protontricks
protontricks: 1.5.0 → 1.5.1
2021-05-11 00:10:46 +02:00
Kira Bruneau df85615cde protontricks: 1.5.0 → 1.5.1 2021-05-10 16:46:40 -04:00
github-actions[bot] 7ce907b413
Merge staging-next into staging 2021-05-10 12:24:36 +00:00
github-actions[bot] 115881e756
Merge master into staging-next 2021-05-10 12:24:32 +00:00
Jan Tojnar 594a885912
Merge branch 'staging-next' into staging 2021-05-10 09:45:47 +02:00
github-actions[bot] 1e3d91bd19
Merge master into staging-next 2021-05-10 00:48:32 +00:00
Stéphan Kochen 0677bf3709 cargo-deb: fix build on darwin 2021-05-09 21:31:25 +02:00
Maisem Ali 852b4e9018 createrepo_c: 0.11.1 -> 0.17.1 2021-05-09 11:25:49 -07:00
Daniël de Kok 85f96822a0 treewide: fix cargoSha256/cargoHash
Rust 1.50.0 incorporated a Cargo change (rust-lang/cargo#8937) in
which cargo vendor erroneously changed permissions of vendored
crates. This was fixed in Rust
1.51.0 (rust-lang/cargo#9131). Unfortunately, this means that all
cargoSha256/cargoHashes produced during the Rust 1.50.0 cycle are
potentially broken.

This change updates cargoSha256/cargoHash tree-wide.

Fixes #121994.
2021-05-08 00:36:37 -07:00
github-actions[bot] e21fb16f9a
Merge master into staging-next 2021-05-08 06:20:05 +00:00
Silvan Mosberger 08d94fd2b0
Merge pull request #114374 from oxalica/lib/platform-support-check
lib.meta: introduce `availableOn` to check package availability on given platform
2021-05-08 03:54:36 +02:00
github-actions[bot] b8cdb044e9
Merge staging-next into staging 2021-05-07 06:20:24 +00:00
Ryan Mulligan b729fa4170
Merge pull request #121747 from r-ryantm/auto-update/libdnf
libdnf: 0.61.1 -> 0.62.0
2021-05-06 17:59:07 -07:00
github-actions[bot] e5f4def056
Merge staging-next into staging 2021-05-07 00:46:58 +00:00
Sander van der Burg a4c768fccd dydisnix: tidy up expression 2021-05-06 19:28:50 +02:00
Sander van der Burg 52c427b8be dysnomia: make function header more readable 2021-05-06 19:15:46 +02:00
Jan Tojnar d9f177eb4d
Merge branch 'staging-next' into staging
The transmission conflict was non-trivial:
- libbrotli added to apparmor rules <1bdda029cd>
- apparmor rules rewritten <b280e64078>

Chosen the rewrite and verified that brotli is part of the rule set generated by `apparmorRulesFromClosure`.
2021-05-06 08:42:50 +02:00
Sander van der Burg 9f120c34e6 dydisnix: 2020-07-04 -> 2020-11-02 2021-05-05 20:53:48 +02:00
Sander van der Burg 14971b1a5f DisnixWebService: 0.10 -> 0.10.1 2021-05-05 20:23:13 +02:00
Sander van der Burg da6a769a92 disnixos: 0.9 -> 0.9.1 2021-05-05 20:07:04 +02:00
Sander van der Burg 811e18ab73 disnix: 0.10 -> 0.10.1 and remove obsolete parameters 2021-05-05 20:06:17 +02:00
Sander van der Burg 1021cd5d6c dysnomia: 0.10 -> 0.10.1 and add support for new plugins 2021-05-05 20:04:48 +02:00
R. RyanTM f4491b28ae libdnf: 0.61.1 -> 0.62.0 2021-05-04 22:09:11 +00:00
DavHau 8865881319 nixExperimental: init 2021-05-04 18:15:27 +07:00
DavHau f94876e77b nixFlakes: enable flakes,nix-command via patch 2021-05-04 17:43:46 +07:00
DavHau 118ef67e07 nixFlakes: enable flakes 2021-05-04 17:43:45 +07:00
github-actions[bot] 5e177b16b1
Merge staging-next into staging 2021-05-03 18:25:49 +00:00
Eelco Dolstra 946cc38f70
Merge pull request #121263 from regnat/update-nix-unstable
nixUnstable: pre20210326_dd77f71 -> pre20210429_d15a196
2021-05-03 17:04:02 +02:00
regnat 2994db87fb nixUnstable: pre20210326_dd77f71 -> pre20210503_6d2553a
(amongst other things) several fixes to make the `ca-derivations`
experimental feature usable on a daily basis
2021-05-03 16:51:11 +02:00
github-actions[bot] ef6416a6ba
Merge staging-next into staging 2021-05-01 00:54:32 +00:00
Maximilian Bosch 3a7d278b54
Merge pull request #120895 from r-ryantm/auto-update/cargo-deb
cargo-deb: 1.29.1 -> 1.29.2
2021-04-30 22:36:44 +02:00
github-actions[bot] d7882499f8
Merge staging-next into staging 2021-04-30 12:26:14 +00:00
Sandro 2dc423f52b
Merge pull request #120612 from MetaDark/protontricks
protontricks: 1.4.4 -> 1.5.0
2021-04-30 14:00:52 +02:00
R. RyanTM ef10ae1f4a cargo-audit: 0.14.0 -> 0.14.1 2021-04-30 06:21:40 +00:00
Sandro 5a2519d5e6
Merge pull request #120988 from r-ryantm/auto-update/dpkg
dpkg: 1.20.7.1 -> 1.20.9
2021-04-30 04:11:23 +02:00
Sandro e2d36db666
Merge pull request #120899 from rb2k/libdnf_update_061
libdnf: 0.60.0 -> 0.61.1
2021-04-30 01:07:54 +02:00
R. RyanTM 8fb7796a46 dpkg: 1.20.7.1 -> 1.20.9 2021-04-28 06:55:59 +00:00
Marc Seeger 91ba4016a0 libdnf: 0.60.0 -> 0.61.1 2021-04-27 10:47:35 -07:00
R. RyanTM 45995d8d9e cargo-outdated: 0.9.14 -> 0.9.15 2021-04-27 17:45:54 +00:00
R. RyanTM d8bc7c0dbe cargo-deb: 1.29.1 -> 1.29.2 2021-04-27 17:04:15 +00:00
Kira Bruneau 27f60ec4b8 protontricks: 1.4.4 -> 1.5.0
- Update steam-run.patch to support Pressure Vessel runtime
- Fix adding $PROTON_DIST_PATH/lib to LD_LIBRARY_PATH when using legacy runtime
- Use bash instead of /bin/sh now that wrappers are non-POSIX compliant
- Remove `test_run_steam_runtime_not_found` in steam-run.patch instead of using disabledTests
- Add import check
2021-04-25 13:08:06 -04:00
Sandro ca79e14afe
Merge pull request #120108 from zowoq/nixpkgs-review
nixpkgs-review: 2.5.0 -> 2.6.0
2021-04-22 02:15:47 +02:00
zowoq b07b0deed5 nixpkgs-review: 2.5.0 -> 2.6.0
https://github.com/Mic92/nixpkgs-review/releases/tag/2.6.0
2021-04-22 08:16:36 +10:00
zowoq 765296d96f nix-update: 0.3.2 -> 0.4.0
https://github.com/Mic92/nix-update/releases/tag/0.4.0
2021-04-21 08:36:49 +10:00
Sandro e13e4e6ce2
Merge pull request #119330 from alyssais/apk-tools
apk-tools: 2.12.2 -> 2.12.5
2021-04-13 18:55:36 +02:00
Domen Kožar e002b635cd
Merge pull request #119317 from sternenseemann/static-naming
stdenv.mkDerivation: add -static to name if building statically
2021-04-13 15:04:02 +02:00
Alyssa Ross 10c66e50eb
apk-tools: 2.12.2 -> 2.12.5
Fixes: https://github.com/NixOS/nixpkgs/pull/112594
2021-04-13 12:43:43 +00:00
Guillaume Girol 46163f6fef
nix-du: 0.3.3 -> 0.3.4 (#119243)
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2021-04-13 13:47:23 +02:00
sternenseemann f4e8746cb2 nix{,Unstable}: pass pname, version to mkDerivation
This allows stdenv.mkDerivation to append -static to the name for
pkgsStatic.nix / nixStatic which should make nix-env stop thinking
that nixStatic is a newer version of nix.

This change replaces #119310.
2021-04-13 13:10:56 +02:00
Jan Tojnar c04a14edd6 Merge branch 'master' into staging-next 2021-04-06 16:01:14 +02:00
Taeer Bar-Yam d9424d2191
appimagekit: 2018-07-27 -> 2020-12-31 (#116501)
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2021-04-06 12:46:54 +02:00
Sandro Jäckel 3453b89f4b
lzma: deprecate alias 2021-04-04 19:49:52 +02:00