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
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
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
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
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
