mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-20 12:59:25 +00:00
Code Issues Wiki Activity
253048 commits 180 branches 125 tags 9 GiB
Commit graph

1988 commits

Author SHA1 Message Date
Frederik Rietdijk da12fc6838 Merge staging-next into staging 2020-11-18 15:36:56 +01:00
Tim Steinbach f3dc13bd09
sbt-extras: 2020-11-08 → 2020-11-17 2020-11-17 14:40:29 +00:00
Fabián Heredia Montiel 085da94ace shards: refactor and 0.11.0 -> {0.11.1, 0.12.0} 2020-11-17 22:19:04 +08:00
Tim Steinbach 9f9134c754
sbt: 1.4.2 → 1.4.3 2020-11-16 09:25:44 -05:00
Frederik Rietdijk 986c2d36da Merge master into staging-next 2020-11-16 09:01:53 +01:00
John Ericson 5bafec36ef
Merge pull request #99176 from Ericson2314/meson-remove-extra-cc 
meson: Remove propagated native C compiler
 2020-11-15 14:18:15 -05:00
scalavision c1dfbaa8ad
mill: removing MILL_VERSION variable (#103736) 2020-11-13 18:15:01 -05:00
Frederik Rietdijk 463f738cc6 Merge master into staging-next 2020-11-13 20:58:35 +01:00
Kevin Rauscher 7fad668515 bloop: 1.4.4 -> 1.4.5 2020-11-11 15:17:43 -08:00
Frederik Rietdijk 4076ffe580 Merge staging-next into staging 2020-11-11 16:00:34 +01:00
R. RyanTM fad425cfbb cmake: 3.18.2 -> 3.18.4 2020-11-11 15:58:37 +01:00
Tim Steinbach b9c505b7bf
sbt-extras: Add test 2020-11-11 09:32:06 -05:00
Tim Steinbach 6134eafe08
sbt-extras: 2020-09-24 → 2020-11-08 2020-11-11 09:32:05 -05:00
Tim Steinbach e4d8eb1c30
sbt-extras: Add update script 2020-11-11 09:32:05 -05:00
R. RyanTM 376405314f bear: 3.0.1 -> 3.0.2 2020-11-10 22:20:26 +00:00
Frederik Rietdijk 0b2ca377b1 Merge staging-next into staging 2020-11-10 10:13:13 +01:00
R. RyanTM 400b29acf1 qbs: 1.16.0 -> 1.17.0 2020-11-10 02:38:09 +00:00
Frederik Rietdijk 8aaf2e60e5 Merge staging-next into staging 2020-11-09 14:49:10 +01:00
Doron Behar 4d79d20643
Merge pull request #103092 from Atemu/update/bear 
bear: 2.4.2 -> 3.0.1
 2020-11-09 01:11:13 +02:00
Atemu 51acdda618 bear: 2.4.2 -> 3.0.1 
Bear has been completely redone, this is basically a new package
 2020-11-07 17:27:17 +01:00
Michael Raskin 434d9676aa
Merge pull request #102579 from moinessim/msbuild/case-insensitive-file-system 
MSBuild: Move to backup file to change LICENSE to lowercase.
 2020-11-07 12:11:46 +00:00
Emery Hemingway be459ef9ff tup: 0.7.9 -> 0.7.10 2020-11-06 21:27:56 +01:00
Jan Tojnar d9b4611dd4
Merge branch 'staging-next' into staging 2020-11-05 09:43:10 +01:00
Jan Tojnar c0c4b481e6
Merge pull request #102144 from jtojnar/meson-0.56 
meson: 0.55.3 → 0.56.0
 2020-11-05 08:48:01 +01:00
Daniël de Kok 341aa3d3e0
Merge pull request #102602 from danieldk/rocm-3.9.0 
Update ROCm to 3.9.0
 2020-11-05 06:59:28 +01:00
Martin Weinelt 7f22603396
Merge pull request #102827 from redvers/update_ant_1.10.9 
ant: 1.10.8 -> 1.10.9
 2020-11-05 00:29:07 +01:00
Red Davies 89cd50903d ant: 1.10.8 -> 1.10.9 2020-11-04 21:07:36 +00:00
Tim Steinbach ac9ba67ec5
Merge pull request #102642 from NeQuissimus/sbt_1_4_2 
SBT: Add test, update script, 1.4.0 -> 1.4.2
 2020-11-04 12:49:34 -05:00
Tim Steinbach 23be792bad
sbt: Add test 2020-11-04 11:30:36 -05:00
Frederik Rietdijk 9e6d7d3c74 Merge master into staging-next 2020-11-04 09:27:42 +01:00
Michael Weiss 4b2c7fb106
gn: Add myself as maintainer 
Since I maintain Chromium (I'll have to make sure that gnChromium always
builds and it would be good to get notified on any PRs/issues).
 2020-11-03 20:01:28 +01:00
Tim Steinbach 8d279bbf67
sbt: 1.4.0 → 1.4.2 2020-11-03 11:39:07 -05:00
Tim Steinbach d92254fbeb
sbt: Add update script 2020-11-03 11:39:06 -05:00
Daniël de Kok 7b14f860ee rocm-cmake: 3.8.0 -> 3.9.0 2020-11-03 08:49:50 +01:00
Moises Nessim 258bae917a Move to backup file to change LICENSE to lowercase. 2020-11-02 23:10:37 -05:00
Vladimír Čunát dfd3ede68d
Merge branch 'master' into staging-next 2020-10-31 14:30:44 +01:00
Jan Tojnar f80fb9cb87
meson: 0.55.3 → 0.56.0 
https://mesonbuild.com/Release-notes-for-0-56-0.html
https://github.com/mesonbuild/meson/releases/tag/0.56.0
 2020-10-30 10:27:51 +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
Ben Siraphob db74029e3e treewide: remove package names from prefix of descriptions 2020-10-27 09:15:07 -07:00
Philippe Hürlimann fe217b9fb9 gradle: 6.6 -> 6.7 2020-10-26 14:26:24 +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 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
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
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
Jan Tojnar 5c766c5c24
Merge branch 'staging-next' into staging 2020-10-18 21:21:03 +02:00
Ben Siraphob 683a87dbeb treewide: remove periods from end of package descriptions 2020-10-17 08:22:31 -07:00
John Ericson e54f6b1fde
Merge pull request #99401 from Ericson2314/cmake-optional-openssl 
cmake: Tighten deps
 2020-10-13 22:13:13 -04:00