1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-04-16 16:16:16 +00:00
Commit graph

13249 commits

Author SHA1 Message Date
Vladimír Čunát
0b32140b34
Merge branch 'staging-next' into staging 2020-10-28 18:48:56 +01:00
Vladimír Čunát
31839c352e
Merge branch 'master' into staging-next 2020-10-28 18:48:18 +01:00
Matthieu Coudron
1f9ab74d4c buildBazelPackage: build name from pname/version
and updated bazel-remote accordingly.
2020-10-28 17:55:10 +01:00
Mario Rodas
ec2f49dc8c
Merge pull request #101842 from helsinki-systems/litecli-1.4.1
litecli: 1.3.2 -> 1.4.1
2020-10-28 06:16:48 -05:00
Andreas Rammhold
db0fe5c3eb
Merge branch master into staging to fix eval error
This fixes the eval error of the small (and "big"?) NixOS test set that
was fixed in 1088f05 & eba8f542.
2020-10-28 03:03:27 +01:00
Bernardo Meurer
d29ad75a5c
ccls: 0.20190823 -> 0.20201025 2020-10-27 13:54:39 -07:00
Timo Kaufmann
55669a901b
Merge pull request #95530 from midchildan/package/sourcetrail
sourcetrail: 2019.3.46 -> 2020.2.43
2020-10-27 20:33:59 +01:00
Ben Siraphob
db74029e3e treewide: remove package names from prefix of descriptions 2020-10-27 09:15:07 -07:00
midchildan
f806d4c79a
sourcetrail: 2019.3.46 -> 2020.2.43 2020-10-27 22:55:18 +09:00
Mario Rodas
d2f8c8079c
Merge pull request #101654 from r-ryantm/auto-update/golangci-lint
golangci-lint: 1.31.0 -> 1.32.0
2020-10-27 06:45:00 -05:00
Scriptkiddi
8bcf0418b6
litecli: 1.3.2 -> 1.4.1 2020-10-27 12:41:08 +01: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
336bc8283b
Re-Revert "Merge #101508: libraw: 0.20.0 -> 0.20.2"
This reverts commit c778945806.

I believe this is exactly what brings the staging branch into
the right shape after the last merge from master (through staging-next);
otherwise part of staging changes would be lost
(due to being already reachable from master but reverted).
2020-10-26 08:19:17 +01:00
R. RyanTM
1920b371c8 golangci-lint: 1.31.0 -> 1.32.0 2020-10-25 14:56:58 +00:00
Vladimír Čunát
2f6b00b15e
Merge branch 'staging-next' into staging 2020-10-25 09:47: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
Vladimír Čunát
17f5305b6c
Merge #101508: libraw: 0.20.0 -> 0.20.2 2020-10-25 09:28:53 +01:00
Jan Tojnar
076a779d30
Merge pull request #101528 from NixOS/gnome-3.38 2020-10-25 08:06:00 +01:00
Mario Rodas
46ddb141aa reviewdog: 0.10.2 -> 0.11.0 2020-10-25 04:20:00 +00:00
Philippe Hürlimann
fe217b9fb9 gradle: 6.6 -> 6.7 2020-10-26 14:26:24 +01:00
Benjamin Hipple
40a50db054
Merge pull request #101585 from r-ryantm/auto-update/ephemeralpg
ephemeralpg: 3.0 -> 3.1
2020-10-25 10:22:12 -04:00
Ben Siraphob
c98962e1a3 treewide: remove periods from end of package descriptions 2020-10-25 20:13:18 +07:00
R. RyanTM
07025477a1 gllvm: 1.2.7 -> 1.2.8 2020-10-25 09:46:54 +01:00
Benjamin Hipple
b37c1985a6
Merge pull request #101577 from jonafato/kind-0.9.0
kind: 0.8.1 -> 0.9.0
2020-10-24 22:50:30 -04:00
R. RyanTM
62ca5390e8 ephemeralpg: 3.0 -> 3.1 2020-10-24 19:11:39 +00:00
Lancelot SIX
6d2cad8a4e
gdb: 9.2 -> 10.1
See https://lists.gnu.org/archive/html/info-gnu/2020-10/msg00009.html
for release announcement
2020-10-24 19:22:36 +01:00
Jon Banafato
d0bc05438b kind: 0.8.1 -> 0.9.0
kind has a new bugfix release. [Changelog](https://github.com/kubernetes-sigs/kind/releases/tag/v0.9.0)

This commit also enables fish completions, which were added to kind in
0.8.0.
2020-10-24 12:37:52 -04:00
Maximilian Bosch
c9377b9eef
Merge pull request #101566 from r-ryantm/auto-update/cppcheck
cppcheck: 2.1 -> 2.2
2020-10-24 18:14:59 +02:00
Maximilian Bosch
8733608fde
Merge pull request #101541 from JesusMtnez/coursier
coursier: 2.0.4 -> 2.0.5
2020-10-24 18:08:16 +02:00
R. RyanTM
57dc5ba564 cppcheck: 2.1 -> 2.2 2020-10-24 15:27:39 +00:00
JesusMtnez
cdb7764897
coursier: 2.0.4 -> 2.0.5 2020-10-24 13:14:43 +02:00
Jan Tojnar
c7c4c236e0
libsysprof-capture: init
This will allow us to use sysprof-capture as a dependency of other libraries like GLib.
2020-10-24 06:57:59 +02:00
Jan Tojnar
6472c6c76f
sysprof: 3.38.0 → 3.38.1 2020-10-24 06:00:38 +02:00
WORLDofPEACE
949f7f9227
Merge pull request #98316 from NixOS/gnome-3.38
GNOME 3.38
2020-10-23 20:02:38 -04:00
Jan Tojnar
0992424542
vala-lint: 2019-10-11 → 2020-08-18
Fix build.

a077bbec30...fc5dd9e95b
2020-10-24 01:18:46 +02:00
Doron Behar
ed71430c44
sysprof: 3.36.0 -> 3.38.0 2020-10-24 01:14:06 +02:00
Doron Behar
d595f39fa5
gtk-doc: 1.32 -> 1.33.0 2020-10-24 01:13:50 +02:00
Jan Tojnar
8317c630af
Merge branch 'staging-next' into staging 2020-10-24 01:10:37 +02:00
Jan Tojnar
c252654584
Merge branch 'master' into staging-next 2020-10-24 01:10:07 +02:00
makefu
647b71cfa9
iozone: 3.471 -> 3.490
generate url instead of hardcoding the version in the url
this should make auto-updating possible via nixpkgs-update
2020-10-23 22:14:56 +02:00
zowoq
76d8e2fb30 valgrind: disable on darwin 2020-10-24 00:10:08 +10:00
zowoq
b4349c13a6 buildah: 1.16.4 -> 1.16.5
https://github.com/containers/buildah/releases/tag/v1.16.5
2020-10-23 07:28:24 +10:00
Jan Tojnar
3e01d383ee
Merge branch 'staging-next' into staging 2020-10-22 21:20:32 +02:00
Jan Tojnar
d13fc932cd
Merge branch 'master' into staging-next 2020-10-22 21:20:14 +02:00
Tim Steinbach
5480af2e53
Merge pull request #101322 from JesusMtnez/coursier
coursier: 2.0.3 -> 2.0.4
2020-10-22 11:03:45 -04:00
Maximilian Bosch
ba0edab62c
Merge pull request #101347 from r-ryantm/auto-update/cargo-bloat
cargo-bloat: 0.9.3 -> 0.10.0
2020-10-22 15:53:26 +02:00
R. RyanTM
667d15376e cargo-bloat: 0.9.3 -> 0.10.0 2020-10-22 10:15:29 +00:00
Eelco Dolstra
05bdfd6f2f
Merge pull request #98973 from Ma27/bump-hydra
hydra-unstable: 2020-09-02 -> 2020-10-20
2020-10-22 12:01:13 +02:00
Andreas Rammhold
d82e6359bd
Merge pull request #101326 from r-ryantm/auto-update/rust-cbindgen
rust-cbindgen: 0.14.4 -> 0.15.0
2020-10-22 11:51:55 +02:00
R. RyanTM
37677080be rust-cbindgen: 0.14.4 -> 0.15.0 2020-10-22 04:38:10 +00:00