Commit Graph
151635 Commits
Author SHA1 Message Date
Joachim FandGitHub 69d3bdfa16 Merge pull request #44631 from dasJ/terraria
nixos/terraria: Wait for daemon to stop
2018-08-20 20:23:34 +00:00
John EricsonandGitHub 70a0c15054 Merge pull request #45403 from obsidiansystems/purge-bare-platform
treewide: Purge `stdenv.platform` and top-level `platform`
2018-08-20 15:50:53 -04:00
Janne Heß 943786eccf nixos/terraria: Wait for daemon to stop 2018-08-20 21:41:29 +02:00
John Ericson 7d85ade0cc treewide: Purge stdenv.platform and top-level platform
Progress towards #27069
2018-08-20 15:22:46 -04:00
Markus Kowalewski 27c74747f7 gnuvd: add license 2018-08-20 21:15:17 +02:00
Markus Kowalewski dc379a4b8e gnupth: add license 2018-08-20 21:15:17 +02:00
Markus Kowalewski 2d31bede61 gnuplot: add license 2018-08-20 21:15:16 +02:00
Markus Kowalewski c003762447 gnet: add license 2018-08-20 21:15:16 +02:00
Markus Kowalewski 06aabd8ef2 glusterfs: add license + homepage 2018-08-20 21:15:16 +02:00
Markus Kowalewski a1129ef9cb glsurf: add license 2018-08-20 21:15:16 +02:00
Markus Kowalewski 859ea1da4e glock: add license 2018-08-20 21:15:15 +02:00
Markus Kowalewski 39d7a557d4 gl117: add license + homepage 2018-08-20 21:15:15 +02:00
Markus Kowalewski 8acffe39b7 gitlab: add meta data 2018-08-20 21:15:11 +02:00
Markus Kowalewski 002ae44fa1 gio-sharp: add license + homepage 2018-08-20 21:02:46 +02:00
Markus Kowalewski 3c1819fcce ginac: add license 2018-08-20 21:02:45 +02:00
Markus Kowalewski 1bf19218d7 giflib-4.1: add license + description 2018-08-20 21:02:40 +02:00
Milan Svoboda dd3090f3b0 kitty: 0.11.2 -> 0.11.3 2018-08-20 20:49:10 +02:00
John EricsonandGitHub f0d6e22b7f Merge pull request #45397 from volth/patch-233
$toplevel/system: buildPlatform.system -> hostPlatform.system
2018-08-20 14:36:13 -04:00
John EricsonandGitHub 8f6a72d25b Merge pull request #45398 from volth/patch-234
top-level.nix: stdenv.platform -> stdenv.hostPlatform.platform
2018-08-20 14:23:13 -04:00
volthandGitHub 72f5078beb top-level.nix: stdenv.platform -> stdenv.hostPlatform.platform
because stdenv.platform is stdenv.buildPlatform.platform
2018-08-20 18:20:57 +00:00
Matthew Bauer b300dddae1 xcbuild: only override version with 1 arg
sometimes we want the "SDK" version from xcbuild so we do something
like:

$ xcbuild -version -sdk MacOSX10.10
SDKSettings.plist - MacOSX10.10 (MacOSX10.10)
SDKVersion: 10.10
Path: /nix/store/6k7crm1n4drf09ga0dwvbmb59x4zl2i2-SDKs/MacOSX10.10.sdk
PlatformPath: /nix/store/vhfwb1znfy65s2xs27j8xribk6mp6lbw-Platforms/MacOSX.platform
ProductName: Mac OS X
ProductVersion: 10.10

This was previously overriden by the current xcode version so you
would get:

Xcode 9.4.1
Build version 17E189

This should fix the other usage of -version in nodejs 6.x.
2018-08-20 13:16:37 -05:00
volthandGitHub 6efaa88fcc $toplevel/system: buildPlatform.system -> hostPlatform.system 2018-08-20 18:12:13 +00:00
Will Dietz 79a86ca11c audit-tmpdir: fix processing of files with spaces, quote variables 2018-08-20 13:08:32 -05:00
Markus Kowalewski dbc97ef68c gettext: add license 2018-08-20 19:50:39 +02:00
John EricsonandGitHub f305b9b086 Merge pull request #45394 from NixOS/makeScope-dry
lib: Use lib.fixed-points.extends to avoid repetition
2018-08-20 13:41:10 -04:00
Markus Kowalewski a0f6e0552d gens-gs: add license 2018-08-20 19:39:08 +02:00
Markus Kowalewski 24513e08d7 geany: fix license
geany-with-vte:  inherit meta data from geany
2018-08-20 19:35:29 +02:00
Markus Kowalewski 98c7cf76a6 gdk_pixbuf: add license 2018-08-20 19:32:10 +02:00
Markus Kowalewski f3f05c9b6a gdcm: add license 2018-08-20 19:27:49 +02:00
Markus Kowalewski 95b7e987fb gdata-sharp: add license 2018-08-20 19:22:10 +02:00
Joachim FandGitHub 203cd959ce Merge pull request #41989 from CharlesHD/submit/dozenal
dozenal: init at version v12010904
2018-08-20 17:20:00 +00:00
John EricsonandGitHub 3cf43547f4 lib: Use lib.fixed-points.extends to avoid repetition
Another attempt after my sloppy https://github.com/NixOS/nixpkgs/commit/48ccdf322d9e7a68d0caf5833511ee3e53ec7d3a.

@Infinisil, thanks again, reverted in https://github.com/NixOS/nixpkgs/commit/4794aa5de233b5bf2d1c3245946379699d023467 and explained my mistakes in https://github.com/NixOS/nixpkgs/commit/48ccdf322d9e7a68d0caf5833511ee3e53ec7d3a#commitcomment-29678643. I start with their work and provide this proof of this commit's correctness:
```nix
(lib.fixedPoints.extends (lib.flip g) f) # now
((f: rattrs: self: let super = rattrs self; in super // f self super) (lib.flip g) f) # inline extends
(self: let super = f self; in super // (lib.flip g) self super) # beta reduce
(self: let super = f self; in super // g super self)  # beta reduce
(self_: let super = f self_; in super // g super self_)  # alpha rename
(self_: let super = f self_; in super // g super self_) # original, same
```

Eventually we might harmonize `overrideScope`'s `g` parameter with the general pattern, but I leave that breaking change as a separate step. Best not to refactor and break at once, and at least the abstractions make the oddity clearer.
2018-08-20 13:09:15 -04:00
Jörg ThalheimandGitHub 8158297aba Merge pull request #45379 from ThomasMader/dlang-update
tilix: 1.8.1 -> 1.8.3
2018-08-20 18:07:37 +01:00
Thomas Mader 3771ffd82e tilix: 1.8.1 -> 1.8.3 2018-08-20 18:46:31 +02:00
Michiel Leenaars f3139dd378 tenderness-font: init at 0.601 2018-08-20 17:55:50 +02:00
Michiel Leenaars 7474f6747c medio-font: init at 0.200 2018-08-20 17:50:08 +02:00
Timo KaufmannandGitHub f8f6ab3e82 Merge pull request #44288 from Ekleog/gppro-init
global-platform-pro: init at 0.3.10-rc11
2018-08-20 17:46:00 +02:00
Robert SchützandGitHub 63b06d0251 Merge pull request #45148 from r-ryantm/auto-update/seafile-client
seafile-client: 6.2.3 -> 6.2.4
2018-08-20 17:30:39 +02:00
José Romildo Malaquias 5dbfd2f187 numix-icon-theme-square: 18-02-16 -> 18.08.17 2018-08-20 12:04:55 -03:00
Jörg ThalheimandGitHub 3280fa006d Merge pull request #45375 from markuskowa/slurm-up
slurm: 17.11.7 -> 17.11.9-2
2018-08-20 15:59:21 +01:00
José Romildo Malaquias e77133c9f0 numix-icon-theme-circle: 18-02-16 -> 18.08.17 2018-08-20 11:58:37 -03:00
Robert Schütz 5e37eef2a7 seafile-shared: 6.2.3 -> 6.2.4 2018-08-20 16:49:55 +02:00
José Romildo Malaquias ef6c7ae2a1 numix-icon-theme: 2017-12-25 -> 18.07.17 2018-08-20 11:49:11 -03:00
Michiel Leenaars 675bf00fd2 seshat-font: init at 0.100 2018-08-20 16:43:57 +02:00
Markov Dmitry bf453ad4e5 Split outputs to out, dev and man 2018-08-20 17:43:48 +03:00
Markov Dmitry 0b701f479f cryptsetup: 2.0.3 -> 2.0.4 2018-08-20 17:42:51 +03:00
Jörg ThalheimandGitHub 690ffb0a52 Merge pull request #45338 from mnacamura/feedgnuplot
feedgnuplot: fix build
2018-08-20 15:42:15 +01:00
Jörg ThalheimandGitHub 996d76abf1 Merge pull request #45384 from vdemeester/add-vdemeester-as-containerd-and-runc-maintainers
Adding vdemeester (myself) as runc and containerd package maintainer
2018-08-20 15:41:07 +01:00
Michiel Leenaars 44d07eda71 penna-font: init at 0.10 2018-08-20 16:38:03 +02:00
Vincent Demeester 2b36ced49e Adding vdemeester (myself) as runc and containerd package maintainer
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2018-08-20 16:36:48 +02:00