public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
293,299 Commits 1 Branch 0 Tags 1.5 GiB
Commit Graph

1859 Commits

Author SHA1 Message Date
Alyssa Ross 93ab0e3fcd apk-tools: 2.12.5 -> 2.12.6 
Fixes: CVE-2021-36159
(cherry picked from commit 29475a58af1d46e48017416aba9ffbead9bf1a91)
 2021-07-26 20:42:10 +00:00
Robert Hensing 648f26faa4 boehmgc_{nix,nixUnstable}: Move into {nix,nixUnstable}.passthru 
Do not pollute top-level, but do provide allow the derivations to
be accessed for debugging and reuse if necessary.

(cherry picked from commit 2c2e1db91db465d7a83593d9322aa204c0fa4b43)
 2021-07-21 16:07:46 +00:00
Robert Hensing 60370d7133 nixUnstable: patch boehmgc (nix#4944) 
As has been done in https://github.com/NixOS/nix/pull/4944

This introduces the boehmgc_nix and boehmgc_nixUnstable attributes
which are useful for external packages that link with Nix and its
boehmgc.

(cherry picked from commit 596ac242af767b38e48af9076887b206dc72e472)
 2021-07-21 16:07:45 +00:00
Jonathan Ringer 12e0c5c76c nixUnstable: 2.4pre20210601_5985b8b -> 2.4pre20210707_02dd6bb 
(cherry picked from commit 2d1568561b80205b89a5b47e892e636441c26720)
 2021-07-21 16:07:45 +00:00
Maximilian Bosch 792c0160c6 nixStable: 2.3.12 -> 2.3.14 
Changes: https://github.com/NixOS/nix/compare/2.3.12...2.3.14

Since this is a bugfix release that wasn't pushed to `nixpkgs`, I
decided to take care of it.

As it's usually done in `upload-release.pl`[1], I updated the
fallback-paths accordingly and used eval `1687468`[2] for this with Nix
2.3.14.

Also added a fallback-path for `aarch64-darwin` as Nix 2.3.14 seems to
support this now[3].

[1] https://github.com/NixOS/nix/blob/2.3-maintenance/maintainers/upload-release.pl
[2] https://hydra.nixos.org/eval/1687468
[3] 14262b86cc

(cherry picked from commit e66237af154f63998eaf45233763b2e535b78b95)
 2021-07-20 15:13:18 +00:00
Jonathan Ringer 592df52aa1 nix: 2.3.11 -> 2.3.12 
(cherry picked from commit ff50095bd4121f35e1ca73b4df68912db1bff2a4)
 2021-06-03 08:11:52 -07:00
Jonathan Ringer b78bd862e3 nixUnstable: 2.4pre20210503_6d2553a -> 2.4pre20210601_5985b8b5 
(cherry picked from commit f7fe3008d106b8b8834a4f64868ae386a9b26e08)
 2021-06-03 08:11:52 -07:00
Thomas Gerbet b9fd21fe40 morph: 1.5.0 -> 1.6.0 
https://github.com/DBCDK/morph/releases/tag/v1.6.0
(cherry picked from commit 03465e588bf3ac86b30af3473b4f254305d9f61b)
 2021-05-31 10:07:32 +00: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