Commit Graph

13290 Commits

Author SHA1 Message Date
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
835ba5b069 liquibase: 4.0.0 -> 4.1.1 2020-10-25 19:38:14 +00: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
JesusMtnez
3c3e490488
coursier: 2.0.3 -> 2.0.4 2020-10-22 06:11:12 +02:00
Mario Rodas
4accc093fb
Merge pull request #101264 from r-ryantm/auto-update/bazelisk
bazelisk: 1.7.2 -> 1.7.3
2020-10-21 20:33:53 -05:00
Daiderd Jordan
bb0b872b61
Merge pull request #100388 from thefloweringash/darwin-dylib-names-hook
treewide: move fixDarwinDylibNames to nativeBuildInputs
2020-10-21 19:25:48 +02:00
R. RyanTM
5445fe778c bazelisk: 1.7.2 -> 1.7.3 2020-10-21 16:49:55 +00:00
Maximilian Bosch
1308817e05
nixos/hydra: remove hydra-migration upgrade path
This should NOT be backported to 20.09!

When 21.03 is released, the DB changes are about a year old and
operators had two release cycles for the upgrade. At this point it
should be fair to remove the compat layer to reduce the complexity of
the module itself.
2020-10-21 18:03:04 +02:00
Maximilian Bosch
1bb8808e1a
hydra-unstable: 2020-09-02 -> 2020-10-20 2020-10-21 18:03:04 +02:00
Vladimír Čunát
90094b0468
Merge branch 'master' into staging-next
minor conflict: rust update vs. darwin fixes for it
  (not tested but seems quite OK)
2020-10-21 13:34:06 +02:00
Max Wittig
79b036b7db
gitlab-runner: 13.4.1 -> 13.5.0 (#101175) 2020-10-21 13:16:30 +02:00
Andrew Childs
722d02a720 treewide: move fixDarwinDylibNames to nativeBuildInputs
This hook runs at build time and depends on executing
install_name_tool from binutils.
2020-10-21 13:26:53 +09:00
zowoq
f73f6abab4 editorconfig-checker: 2.1.0 -> 2.2.0
https://github.com/editorconfig-checker/editorconfig-checker/releases/tag/2.2.0
2020-10-21 10:50:22 +10:00
Niklas Hambüchen
70a924fa80 meson: Patch out default boost search paths. See #86131.
Avoids impure builds on unsandboxed non-NixOS builds, see:
https://github.com/NixOS/nixpkgs/issues/86131#issuecomment-711051774
2020-10-20 21:02:43 +02:00
Frederik Rietdijk
23890fc236 Merge staging-next into staging 2020-10-20 20:55:46 +02:00
Yuki Okushi
afc8027dde rust-bindgen: 0.54.1 -> 0.55.1 2020-10-20 09:09:13 -07:00
Jack Kelly
bdbcfb4360 python3Packages.aws-sam-cli: 1.0.0rc1 -> 1.6.2 2020-10-19 23:05:35 -07:00
Mario Rodas
b565432a70
Merge pull request #100950 from r-ryantm/auto-update/go-protobuf
go-protobuf: 1.4.2 -> 1.4.3
2020-10-19 22:59:28 -05:00
oxalica
dc12101886 rust-analyzer: 2020-10-12 -> 2020-10-19 2020-10-19 13:26:54 -07:00
Maximilian Bosch
903a9131d9
Merge pull request #100874 from r-ryantm/auto-update/cargo-crev
cargo-crev: 0.17.0 -> 0.18.0
2020-10-19 21:38:28 +02:00
Marco Farrugia
ffac55a0da format 2020-10-19 18:32:48 +02:00
Marco Farrugia
a360b05cb7 bazel: Fix bazel query and provide a default java toolchain
These are fixes for problems I ran into with:
- `bazel test //example:cpp-test`
This needed `build --host_javabase='@local_jdk//:jdk'`

- `bazel query 'deps(//example:cpp-test)'`
This needed the same flags as `build`.

Is it contentious to (partially?) configure the default java toolchain? I don't see it as much different than providing the bazel server's java.
It would continue to be configurable/overridable by overriding the flags. 

---
And a random notes from this escapade, but https://github.com/bazelbuild/bazel/blob/master/WORKSPACE#L144-L308 looks a little different from https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/tools/build-managers/bazel/bazel_3/src-deps.json so one of them is probably wrong :)
2020-10-19 18:32:48 +02:00
Mario Rodas
a150be7500
Merge pull request #101005 from r-ryantm/auto-update/lazygit
lazygit: 0.23.2 -> 0.23.6
2020-10-18 20:03:23 -05:00
Mario Rodas
1e72266113
Merge pull request #101002 from marsam/update-tflint
tflint: 0.20.2 -> 0.20.3
2020-10-18 20:00:59 -05:00
Ryan Mulligan
b2fc4d9f4a
Merge pull request #100844 from r-ryantm/auto-update/asls
asls: 0.5.0 -> 0.5.1
2020-10-18 12:30:14 -07:00
Jan Tojnar
5c766c5c24
Merge branch 'staging-next' into staging 2020-10-18 21:21:03 +02:00
R. RyanTM
c3fe499500 lazygit: 0.23.2 -> 0.23.6 2020-10-18 16:51:58 +00:00
Mario Rodas
687d0f5254 tflint: 0.20.2 -> 0.20.3
https://github.com/terraform-linters/tflint/releases/tag/v0.20.3
2020-10-18 09:55:00 -05:00
Mario Rodas
8d392072be
Merge pull request #100893 from r-ryantm/auto-update/checkstyle
checkstyle: 8.36 -> 8.36.2
2020-10-18 09:09:29 -05:00
Mario Rodas
76f0500e53
Merge pull request #100878 from r-ryantm/auto-update/cargo-udeps
cargo-udeps: 0.1.14 -> 0.1.15
2020-10-18 09:08:49 -05:00
Mario Rodas
401f773437
Merge pull request #100876 from r-ryantm/auto-update/cargo-make
cargo-make: 0.32.4 -> 0.32.7
2020-10-18 09:08:33 -05:00
Mario Rodas
aa6e909aa7
Merge pull request #100901 from r-ryantm/auto-update/codeql
codeql: 2.2.5 -> 2.3.1
2020-10-18 09:06:16 -05:00
Mario Rodas
9b3e35d991
Merge pull request #100890 from r-ryantm/auto-update/ccache
ccache: 3.7.11 -> 3.7.12
2020-10-18 09:00:15 -05:00
Mario Rodas
93c5c61908
Merge pull request #100897 from r-ryantm/auto-update/circleci-cli
circleci-cli: 0.1.9454 -> 0.1.10993
2020-10-18 08:39:50 -05:00
Mario Rodas
f0537ed55f
Merge pull request #100913 from r-ryantm/auto-update/doctl
doctl: 1.46.0 -> 1.48.1
2020-10-18 08:25:53 -05:00
Mario Rodas
16895196ed
Merge pull request #100934 from r-ryantm/auto-update/fly
fly: 6.5.1 -> 6.6.0
2020-10-18 08:15:24 -05:00
Mario Rodas
f39986aa5d
Merge pull request #100942 from r-ryantm/auto-update/gauge
gauge: 1.1.3 -> 1.1.4
2020-10-18 08:00:07 -05:00
Mario Rodas
b6932522d0
Merge pull request #100952 from r-ryantm/auto-update/gotestsum
gotestsum: 0.5.3 -> 0.5.4
2020-10-18 07:56:07 -05:00
Mario Rodas
9cfa14ff48
Merge pull request #100951 from r-ryantm/auto-update/go-tools
go-tools: 2020.1.5 -> 2020.1.6
2020-10-18 07:53:47 -05:00
Mario Rodas
bfcc23f2c9
Merge pull request #100932 from r-ryantm/auto-update/flow
flow: 0.133.0 -> 0.136.0
2020-10-18 07:27:58 -05:00
R. RyanTM
b4dcee7c3f gotestsum: 0.5.3 -> 0.5.4 2020-10-18 10:28:18 +00:00
R. RyanTM
a50653ce31 go-tools: 2020.1.5 -> 2020.1.6 2020-10-18 10:04:46 +00:00
R. RyanTM
81d2832512 go-protobuf: 1.4.2 -> 1.4.3 2020-10-18 09:57:30 +00:00
R. RyanTM
c17f56677e gauge: 1.1.3 -> 1.1.4 2020-10-18 08:50:48 +00:00
Vincent Laporte
d149b27d41 ocamlformat: refactor 2020-10-18 09:51:18 +02:00
R. RyanTM
9871506209 fly: 6.5.1 -> 6.6.0 2020-10-18 07:27:27 +00:00
R. RyanTM
8728ae26ea flow: 0.133.0 -> 0.136.0 2020-10-18 07:05:17 +00:00
R. RyanTM
b80cfd7661 doctl: 1.46.0 -> 1.48.1 2020-10-18 02:09:19 +00:00
Ryan Mulligan
a5f89fc71d
Merge pull request #100899 from r-ryantm/auto-update/clojure-lsp
clojure-lsp: 20200828T065654 -> 20201009T224414
2020-10-17 16:18:03 -07:00
R. RyanTM
08d6831661 codeql: 2.2.5 -> 2.3.1 2020-10-17 23:09:18 +00:00
R. RyanTM
e32e589d7d clojure-lsp: 20200828T065654 -> 20201009T224414 2020-10-17 22:50:38 +00:00
R. RyanTM
72e8737f64 circleci-cli: 0.1.9454 -> 0.1.10993 2020-10-17 22:28:35 +00:00
R. RyanTM
6e0b110d09 checkstyle: 8.36 -> 8.36.2 2020-10-17 22:09:19 +00:00
R. RyanTM
83bf88fc66 ccache: 3.7.11 -> 3.7.12 2020-10-17 21:33:44 +00:00
R. RyanTM
0aaec7505b cargo-udeps: 0.1.14 -> 0.1.15 2020-10-17 21:09:29 +00:00
R. RyanTM
fe8107ceae cargo-make: 0.32.4 -> 0.32.7 2020-10-17 21:00:40 +00:00
R. RyanTM
f5a0522148 cargo-crev: 0.17.0 -> 0.18.0 2020-10-17 20:40:16 +00:00
Mario Rodas
cd76c92d80
Merge pull request #100852 from r-ryantm/auto-update/bazelisk
bazelisk: 1.7.1 -> 1.7.2
2020-10-17 13:46:15 -05:00
R. RyanTM
8496b8426e
bazel-kazel: 0.1.0 -> 0.1.1 (#100851) 2020-10-17 10:52:37 -07:00
R. RyanTM
50f77f31f4 bazelisk: 1.7.1 -> 1.7.2 2020-10-17 17:41:33 +00:00
R. RyanTM
3442125e41 asls: 0.5.0 -> 0.5.1 2020-10-17 16:14:12 +00:00
Benjamin Hipple
ff894538ea
Merge pull request #100830 from r-ryantm/auto-update/act
act: 0.2.15 -> 0.2.16
2020-10-17 11:52:42 -04:00