Commit Graph

9485 Commits

Author SHA1 Message Date
worldofpeace 3f36ec5d33
Merge pull request #67136 from jollheef/out-of-tree-v1.0.1
out-of-tree: init at 1.0.1
2019-08-25 14:54:51 -04:00
Vladimír Čunát 985d1ac425
Merge branch 'master' into staging-next
There were several more conflicts from name -> pname+version;
all auto-solved by kdiff3, hopefully OK.

Hydra nixpkgs: ?compare=1538611
2019-08-25 14:57:11 +02:00
Mikhail Klementev abf17cb6ac
out-of-tree: init at 1.0.1 2019-08-25 12:32:59 +00:00
Vladimír Čunát e19b17cc14
rust-bindgen: fixup build with rustc 1.37
Thanks to Symphorien: #67426
2019-08-25 14:23:01 +02:00
worldofpeace 0e1992e17b dfeet: 0.3.14 -> 0.3.15
Port to meson.

https://gitlab.gnome.org/GNOME/d-feet/blob/0.3.15/NEWS
2019-08-24 16:15:23 -04:00
Vladyslav M 814936b96f
cargo-expand: 0.4.14 -> 0.4.15 (#67405)
cargo-expand: 0.4.14 -> 0.4.15
2019-08-24 22:47:52 +03:00
Jan Tojnar edcecfee00
Merge pull request #67358 from jtojnar/ofono-progress
nixos/ofono: various improvements
2019-08-24 21:37:42 +02:00
xrelkd 8da18fc8e3 cargo-expand: 0.4.14 -> 0.4.15 2019-08-25 02:58:38 +08:00
Robert Scott 6e921f77ff cloudfoundry-cli: 6.45.0 -> 6.46.1 2019-08-24 16:21:37 +01:00
Profpatsch ffbad0f656 tree-sitter: init at 0.15.7 2019-08-24 15:13:47 +02:00
Vladimír Čunát 2e6bf42a22
Merge branch 'master' into staging-next
There ver very many conflicts, basically all due to
name -> pname+version.  Fortunately, almost everything was auto-resolved
by kdiff3, and for now I just fixed up a couple evaluation problems,
as verified by the tarball job.  There might be some fallback to these
conflicts, but I believe it should be minimal.

Hydra nixpkgs: ?compare=1538299
2019-08-24 08:55:37 +02:00
Jan Tojnar 877dc46d24
ofono-phonesim: init at unstable-2014-04-22 2019-08-23 20:47:33 +02:00
Linus Heckemann 25559a5597
Merge pull request #22357 from NixOS/openssl-1.1
Use openssl 1.1 by default
2019-08-23 17:51:52 +02:00
Linus Heckemann d1d602f559 Merge remote-tracking branch 'origin/master' into openssl-1.1 2019-08-23 17:27:39 +02:00
worldofpeace a4083fb455
Merge pull request #67236 from Chiiruno/dev/general
Update: easyjson, quicktemplate, statik, qtchan, vlang
2019-08-23 11:14:00 -04:00
Robin Gloster 8279e5faab
Merge pull request #67294 from bachp/gitlab-runner-12.2.0
gitlab-runner: 12.1.0 -> 12.2.0
2019-08-23 14:49:19 +02:00
Mario Rodas f7c9670cd8 dune: add marsam as maintainer 2019-08-23 12:33:38 +00:00
Mario Rodas 2898679f15 dune: 1.11.1 -> 1.11.3 2019-08-23 12:33:38 +00:00
Markus Hauck 8f8d9abca4 coursier: 1.1.0-M14-6 -> 2.0.0-RC3-3 2019-08-23 07:28:08 -04:00
markuskowa 8120fb6ec4
Merge pull request #67291 from dtzWill/gengetopt-2.23
gengetopt: 2.22.6 -> 2.23
2019-08-23 12:43:43 +02:00
Maximilian Bosch 19094ee62a
Merge pull request #67330 from markus1189/scalafmt
scalafmt: 2.0.0 -> 2.0.1
2019-08-23 11:19:03 +02:00
Marek Mahut ca117762f3
Merge pull request #66866 from r-ryantm/auto-update/fdroidserver
fdroidserver: 1.1.1 -> 1.1.4
2019-08-23 09:52:58 +02:00
Markus Hauck 3257ffc48d scalafmt: 2.0.0 -> 2.0.1 2019-08-23 09:29:09 +02:00
Emily 0c1c67f257 trellis: extend platforms 2019-08-23 02:14:40 -05:00
Emily 39bf5d5ec7 icestorm: 2019.08.08 -> 2019.08.15 2019-08-23 02:14:40 -05:00
Okinan 82af5e4d51 statik: 2018-11-28 -> 2019-07-31 2019-08-23 01:57:23 -05:00
Okinan 44a00b3be9 quicktemplate: 2019-01-31 -> 2019-07-08 2019-08-23 01:57:18 -05:00
Okinan 5b946d8e83 easyjson: 2019-02-21 -> 2019-06-26 2019-08-23 01:56:59 -05:00
Mario Rodas 4dc585c44e flow: 0.105.2 -> 0.106.0 2019-08-23 06:10:00 +00:00
Marek Mahut c805c7657d
Merge pull request #67271 from dtzWill/update/solarus-1.6.2
solarus{,-quest-editor}: 1.6.0 -> 1.6.2
2019-08-23 08:06:24 +02:00
Mario Rodas dfc6d580bc tflint: 0.9.3 -> 0.10.1 (#67317) 2019-08-22 20:44:40 -06:00
Mario Rodas eb02fa5d43 mkcert: 1.3.0 -> 1.4.0 (#67314)
Changelog: https://github.com/FiloSottile/mkcert/releases/tag/v1.4.0
2019-08-22 20:44:13 -06:00
Robin Gloster 2cc05be907
treewide: openssl_1_1 pinning is unnecessary 2019-08-23 02:02:50 +02:00
Robin Gloster c7e75df21f
Merge remote-tracking branch 'upstream/master' into openssl-1.1 2019-08-23 02:00:31 +02:00
Marek Mahut ea2ca805ec
Merge pull request #67252 from MarcFontaine/cddl-tool
cddl: 0.8.5 -> 0.8.9
2019-08-22 23:05:37 +02:00
Marek Mahut 7b3fbc2988
Merge pull request #67254 from MarcFontaine/cbor-diag-tool
cbor-diag: 0.5.2 -> 0.5.6
2019-08-22 23:02:18 +02:00
Pascal Bach c6378b36df gitlab-runner: 12.1.0 -> 12.2.0 2019-08-22 21:56:49 +02:00
Will Dietz a3baa41e0b
gengetopt: 2.22.6 -> 2.23
https://www.gnu.org/software/gengetopt/NEWS

* deps, parallel build
2019-08-22 14:12:23 -05:00
Marek Mahut 085fe1ae7a
Merge pull request #67237 from mmahut/osslsigncode
osslsigncode: init at unstable-2019-07-25
2019-08-22 20:46:48 +02:00
Marek Mahut c6edb741c1 osslsigncode: init at unstable-2019-07-25 2019-08-22 20:22:54 +02:00
Will Dietz a986f7d46c
solarus{,-quest-editor}: use qt's mkDerivation, fix 2019-08-22 13:10:53 -05:00
Will Dietz 4b9f0774bf
solarus{,-quest-editor}: 1.6.0 -> 1.6.2
https://www.solarus-games.org/en/news/2019-08-15-solarus-1-6-2-bugfix-release
2019-08-22 13:10:50 -05:00
Sean Coates 680ebf6842 aws-sam-cli: update requests dependency to 2.22.0 2019-08-22 13:09:10 -04:00
Sarah Brofeldt 2bebade1fb
Merge pull request #67220 from edef1c/wishbone-tool
wishbone-tool: init at 0.2.8
2019-08-22 14:15:25 +02:00
MarcFontaine 6941695470 cbor-diag: 0.5.2 -> 0.5.6 2019-08-22 13:23:15 +02:00
edef e9ccd6fa3d wishbone-tool: init at 0.2.8 2019-08-22 11:09:45 +00:00
MarcFontaine 85bbd3c17f cddl: 0.8.5 -> 0.8.9 2019-08-22 12:52:43 +02:00
Maximilian Bosch 938a7e5fe1
Merge pull request #67151 from xrelkd/update/cargo-make
cargo-make: 0.22.0 -> 0.22.1
2019-08-22 11:06:52 +02:00
Sarah Brofeldt 5ca95f08dc
Merge pull request #67152 from xrelkd/update/cargo-expand
cargo-expand: 0.4.13 -> 0.4.14
2019-08-22 09:00:41 +02:00
Robin Gloster f4fc845e5b
Merge remote-tracking branch 'upstream/master' into openssl-1.1 2019-08-21 14:25:13 +02:00
Symphorien Gibol d9d0647046 rls: tie version to rustc's 2019-08-21 11:21:01 +02:00
xrelkd e93f1175db cargo-make: 0.22.0 -> 0.22.1 2019-08-21 09:59:10 +08:00
xrelkd d2e381608e cargo-expand: 0.4.13 -> 0.4.14 2019-08-21 09:50:28 +08:00
Marek Mahut a79b9166ca
Merge pull request #67068 from saschagrunert/buildah
buildah: 1.9.0 -> 1.10.1
2019-08-21 00:04:49 +02:00
Robin Gloster 4e60b0efae
treewide: update globin's maintained drvs 2019-08-20 19:36:05 +02:00
Rickard Nilsson 225e412edb Remove myself as maintainer of some packages. 2019-08-20 15:24:01 +02:00
Sascha Grunert 8d3dd54f53
buildah: 1.9.0 -> 1.10.1
Signed-off-by: Sascha Grunert <sgrunert@suse.com>
2019-08-20 13:48:09 +02:00
worldofpeace 83cc092fb5
Merge pull request #66344 from jlesquembre/clj-kondo
clj-kondo: init at 2019.07.31-alpha
2019-08-20 00:39:42 -04:00
Marek Mahut 5e93e7159a
Merge pull request #66932 from r-ryantm/auto-update/ktlint
ktlint: 0.34.0 -> 0.34.2
2019-08-19 20:38:58 +02:00
R. RyanTM ac8f6a4b76 ktlint: 0.34.0 -> 0.34.2
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/ktlint/versions
2019-08-19 07:40:17 -07:00
Bas van Dijk b9c4bef090
Merge pull request #66713 from basvandijk/rustfmt-from-rust-src
rustfmt: use the src as defined by the git submodule in rust
2019-08-19 15:14:23 +02:00
Marek Mahut 971307e98e
Merge pull request #66879 from r-ryantm/auto-update/flow
flow: 0.105.0 -> 0.105.2
2019-08-19 11:51:54 +02:00
Nikolay Amiantov 3b3618ea3c buildBazelPackage: remove top-level symlinks
They always can be regenerated during the actual build, and they are sometimes
random, e.g in Tensorflow;

platforms -> NIX_BUILD_TOP/tmp/install/35282f5123611afa742331368e9ae529/_embedded_binaries/platforms
2019-08-19 11:23:17 +03:00
R. RyanTM 6ac08e3952 flow: 0.105.0 -> 0.105.2
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/flow/versions
2019-08-19 00:34:16 -07:00
R. RyanTM d574b89aca fdroidserver: 1.1.1 -> 1.1.4
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/fdroidserver/versions
2019-08-18 22:30:41 -07:00
Sarah Brofeldt ce24ce04ac
Merge pull request #66848 from mmahut/avro-tools
avro-tools: properly installing the jar file
2019-08-18 23:17:25 +02:00
Lancelot SIX 7b578d49cd
Merge pull request #66373 from nthorne/cppclean_0_13
cppclean: 2018-05-12 -> 0.13
2019-08-18 22:57:08 +02:00
Marek Mahut 1ebcffe199 avro-tools: properly installing the jar file 2019-08-18 22:15:53 +02:00
Frederik Rietdijk c7bf103599 icestorm: fix eval 2019-08-18 13:01:45 +02:00
Frederik Rietdijk f65aa21bb2 Merge master into staging-next 2019-08-18 12:53:44 +02:00
Frederik Rietdijk 295888c622
Merge pull request #66381 from NixOS/staging-next
Staging next
2019-08-18 08:54:45 +02:00
Aaron Andersen 49ade7371c
Merge pull request #66807 from r-ryantm/auto-update/cgdb
cgdb: 0.7.0 -> 0.7.1
2019-08-17 22:01:46 -04:00
R. RyanTM 706f27880a cgdb: 0.7.0 -> 0.7.1
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/cgdb/versions
2019-08-17 16:10:40 -07:00
Frederik Rietdijk 113dbfeb27
Merge pull request #66596 from emilazy/update-pypy-and-eda-tools
Update PyPy and FOSS EDA tools
2019-08-17 17:48:21 +02:00
Jörg Thalheim 40e86556d0
Merge pull request #66712 from SFrijters/pyprof2calltree-as-package
pyprof2calltree: move to python-packages
2019-08-17 13:55:17 +01:00
Stefan Frijters 7d38a6281e pyprof2calltree: move to python-packages
pyprof2calltree is hard-coded to pythonPackages and fails for Python 3 profile results. See #66511.
Since it can also be used as a library it makes sense to move it into pythonPackages.
2019-08-17 13:05:09 +02:00
volth c814d72b51 treewide: name -> pname 2019-08-17 10:54:38 +00:00
Frederik Rietdijk fe9a3e3e63 Merge staging-next into staging 2019-08-17 09:39:23 +02:00
Frederik Rietdijk c68f58d95c Merge master into staging-next 2019-08-17 09:30:16 +02:00
Andreas Herrmann f426173e30 bazel: Fix python stub template
The shebang in the python stub template was incorrectly patched to
```
<store-path>/bin/env python
```
instead of
```
<store-path>/bin/python
```

The reason was that `patchShebangs` was called with `--replace` which is
an unknown argument.
```
patching script interpreter paths in src/main/java/com/google/devtools/build/lib/bazel/rules/python/python_stub_template.txt --replace /usr/bin/env python /nix/store/w7gsq8v86hni4ynaqgwwlnlny115ylng-python3-3.7.4/bin/python
find: unknown predicate `--replace'
```

Using `substituteInPlace` instead resolves that issue.

The wrong shebang caused failures of `py_binary` targets due to `python`
not being in `PATH` in certain circumstances.
2019-08-16 18:55:45 +02:00
Marek Mahut 97648655bf
Merge pull request #66691 from aespinosa/skaffold
skaffold: 0.30.0 -> 0.35.0
2019-08-16 15:32:13 +02:00
Bas van Dijk 16cb2611d9 rustfmt: use the src as defined by the git submodule in rust
This commit makes sure rustc and rustfmt are compatible by setting
rustfmt's src to the rustfmt git submodule as defined in:

https://github.com/rust-lang/rust/tree/1.36.0/src/tools
2019-08-16 12:54:05 +02:00
Mario Rodas 6d983a350c
Merge pull request #66659 from xrelkd/update/cargo-make
cargo-make: 0.21.0 -> 0.22.0
2019-08-15 20:57:57 -05:00
Mario Rodas 46c64da14e
Merge pull request #66485 from xrelkd/update/cargo-expand
cargo-expand: 0.4.12 -> 0.4.13
2019-08-15 20:57:35 -05:00
Allan Espinosa bb1c15f7f0 skaffold: 0.30.0 -> 0.35.0 2019-08-15 15:43:16 -04:00
Lily Ballard 45e6253678 luarocks: Update detected platform version
Now that our MACOSX_DEPLOYMENT_TARGET is set to 10.12, we shouldn't be
hardcoding the platform at build time as 10.10. This change makes it
inherit the MACOSX_DEPLOYMENT_TARGET value.
2019-08-15 23:10:10 +09:00
Tim Steinbach aa9d7eedf2
sbt-extras: 2019-04-05 -> 2019-08-14 2019-08-15 09:08:05 -04:00
volth 46420bbaa3 treewide: name -> pname (easy cases) (#66585)
treewide replacement of

stdenv.mkDerivation rec {
  name = "*-${version}";
  version = "*";

to pname
2019-08-15 13:41:18 +01:00
Alexander Krotov 6a5213c740 castxml: set correct -DCLANG_RESOURCE_DIR
Fixes #66456
2019-08-15 20:35:07 +09:00
xrelkd db3f4a3149 cargo-make: 0.21.0 -> 0.22.0 2019-08-15 11:26:39 +08:00
Emily 6aa1b0acaf tinyprog: init at 1.0.24.dev99+ga77f828 2019-08-14 21:10:05 -05:00
Frederik Rietdijk cff9e6429a Merge staging-next into staging 2019-08-14 13:46:33 +02:00
Frederik Rietdijk 8d56f2472e Merge master into staging-next 2019-08-14 13:45:54 +02:00
Niklas Thorne 33bd7a1ff5 cppclean: 2018-05-12 -> 0.13 2019-08-14 13:22:57 +02:00
Emily 86ed03ae4c trellis: 2019.04.22 -> 2019.08.09 2019-08-14 00:14:22 -07:00
Emily 6f4f493891 icestorm: 2019.04.16 -> 2019.08.08 2019-08-14 00:14:22 -07:00
worldofpeace 24870b40d6
Merge pull request #66469 from emilazy/update-blackmagic
blackmagic: 1.6.1 -> unstable-2019-08-13
2019-08-13 20:17:36 -04:00
Emily d792c84f35 blackmagic: 1.6.1 -> unstable-2019-08-13 2019-08-13 17:10:02 -07:00
worldofpeace fe8364a821
Merge pull request #66397 from svalaskevicius/add-electron-6
electron: add 6.x version
2019-08-13 12:39:06 -04:00
Jörg Thalheim 108c57b141
Merge pull request #53734 from yurrriq/update/noweb
Update noweb (and icon-lang)
2019-08-13 13:37:08 +01:00