Commit graph

103981 commits

Author SHA1 Message Date
Tuomas Tynkkynen
72dc9c7f80 Merge remote-tracking branch 'upstream/master' into staging 2017-03-20 07:07:03 +02:00
Daniel Peebles
67b32d2c89 Merge pull request #24107 from calvertvl/update-src
Update src
2017-03-20 01:01:41 -04:00
Victor Calvert
6e587c29dc src: wrap to properly resolve rcs at runtime 2017-03-20 00:55:41 -04:00
Victor Calvert
bae9315a33 src: 1.11 -> 1.12 2017-03-20 00:55:41 -04:00
Victor Calvert
fee7e73538 Adding self as maintainer 2017-03-20 00:55:32 -04:00
Tuomas Tynkkynen
93446a2060 release.nix: Don't block release on aarch64 failures 2017-03-20 06:37:01 +02:00
ndowens
8cbbba6b33 Merge pull request #24103 from ebzzry/emem-0.2.45
emem: 0.2.44 -> 0.2.45
2017-03-19 21:35:30 -05:00
Rommel M. Martinez
8cf11d9c1c emem: 0.2.44 -> 0.2.45 2017-03-20 09:24:10 +08:00
ndowens
0f1297ed8c Merge pull request #24102 from ndowens/copyq
copyq: 2.5.0 -> 2.9.0
2017-03-19 20:13:21 -05:00
ndowens
4c25a47cbd copyq: 2.5.0 -> 2.9.0 2017-03-19 20:12:46 -05:00
ndowens
cc161e6667 Merge pull request #24100 from ndowens/devilspie2
devilspie2: 0.39 -> 0.42
2017-03-19 20:03:25 -05:00
ndowens
baf07b580c devilspie2: 0.39 -> 0.42 2017-03-19 20:02:30 -05:00
Daniel Peebles
5148be4866 Merge pull request #24018 from copumpkin/llvm-39-improvements
LLVM 3.9 improvements
2017-03-19 20:53:46 -04:00
ndowens
e4a205a0d1 Merge pull request #24092 from ebzzry/emem-0.2.44
emem: 0.2.43 -> 0.2.44
2017-03-19 19:52:28 -05:00
Dan Peebles
972f51a2da llvmPackages_37.libcxxabi: fix with more recent versions of libc++
The build breaks on libc++ 3.8 and above, which hinders our upgrade to
LLVM 4 for the Darwin stdenv.
2017-03-19 20:51:58 -04:00
ndowens
5f2ada853e Merge pull request #24098 from ndowens/sigil
sigil: 0.9.6 -> 0.9.7
2017-03-19 19:39:05 -05:00
ndowens
00cc586f6f sigil: 0.9.6 -> 0.9.7 2017-03-19 19:37:21 -05:00
ndowens
7d3d0ff0a0 Merge pull request #24097 from ndowens/chirp
chirp: 20161018 -> 20170311
2017-03-19 19:24:48 -05:00
ndowens
c2630d203e chirp: 20161018 -> 20170311 2017-03-19 19:23:57 -05:00
ndowens
18cf03314a Merge pull request #24095 from NixOS/revert-24094-chirp
Revert "chirp: 20161018 -> 20170311"
2017-03-19 19:14:44 -05:00
ndowens
103c918d71 Revert "chirp: 20161018 -> 20170311" 2017-03-19 19:14:20 -05:00
ndowens
431d252423 Merge pull request #24094 from ndowens/chirp
chirp: 20161018 -> 20170311
2017-03-19 19:12:04 -05:00
ndowens
ed64de6295 chirp: 20161018 -> 20170311 2017-03-19 19:11:24 -05:00
Joachim F
12e0e67ed0 Merge pull request #23903 from mbrgm/upgrade-inspectrum
inspectrum: 20160403 -> 20170218
2017-03-20 01:06:31 +01:00
Rommel M. Martinez
86c173cd02 emem: 0.2.43 -> 0.2.44 2017-03-20 07:53:28 +08:00
Daiderd Jordan
264c600064 Merge pull request #24089 from shanemikel/script_nix-diff.sh
nix-diff.sh maintainer script: update usage message for new flags
2017-03-20 00:41:24 +01:00
ndowens
e42702120a Merge pull request #23817 from orivej/objconv
objconv: 2.16 -> 2.44
2017-03-19 18:39:44 -05:00
ndowens
a289b03412 Merge pull request #24088 from ndowens/tiled
tiled: 0.17.0 -> 0.18.2
2017-03-19 18:37:26 -05:00
ndowens
d2e799ba1e Merge pull request #24087 from ndowens/calcurse
calcurse: 4.0.0 -> 4.2.2
2017-03-19 18:36:11 -05:00
ndowens
c5ce21ec80 tiled: 0.17.0 -> 0.18.2 2017-03-19 18:34:46 -05:00
Shane Pearlman
a31041a1b9 nix-diff.sh maintainer script: update usage message for new flags 2017-03-19 16:34:06 -07:00
ndowens
86571294f5 calcurse: 4.0.0 -> 4.2.2 2017-03-19 18:32:47 -05:00
Orivej Desh
cf3e138024 objconv: 2.16 -> 2.44 2017-03-19 23:25:12 +00:00
Joachim F
1dad430b91 Merge pull request #24082 from dtzWill/fix/neo4j-and-update
neo4j: 3.1.1 -> 3.1.2, minor fixes
2017-03-20 00:16:56 +01:00
Jörg Thalheim
af6677e8b5 Merge pull request #24086 from dtzWill/fix/lldb-toplevel
Add top-level attr for lldb_4
2017-03-20 00:15:54 +01:00
Daiderd Jordan
55599d91d0 Merge pull request #23414 from shanemikel/nix-helper-scripts
add a script that "diffs" nix environment generations
2017-03-20 00:14:52 +01:00
Will Dietz
a7c4c89138 Add top-level attr for lldb_4 2017-03-19 18:10:40 -05:00
Jörg Thalheim
48a7bfa345 Merge pull request #23944 from c0bw3b/pkg/nghttp2
nghttp2: 1.19.0 -> 1.20.0
2017-03-20 00:05:31 +01:00
Jörg Thalheim
c23164eac6 Merge pull request #23943 from c0bw3b/pkg/jemalloc
jemalloc: 4.3.1 -> 4.5.0
2017-03-19 23:58:57 +01:00
Shane Pearlman
d9f46aa58a nix-diff.sh maintainer script: "diffs" Nix environment generations
This script was inspired by Guix.  Read the source for documentation, or
invoke it with `nix-diff.sh -h` for a usage summary.
2017-03-19 15:51:06 -07:00
Tim Steinbach
4385a67ef2 Merge pull request #24079 from ndowens/nano
nano: 2.7.3 -> 2.7.5
2017-03-19 18:31:06 -04:00
ndowens
ed2c0a8328 Merge pull request #24084 from ndowens/scite
scite: 3.3.7 -> 3.7.3; Cosmetic changes
2017-03-19 17:29:01 -05:00
ndowens
e27a85709d scite: 3.3.7 -> 3.7.3; Cosmetic changes 2017-03-19 17:28:35 -05:00
ndowens
981313fd30 Merge pull request #24083 from ndowens/nedit
nedit: 5.6a -> 5.7
2017-03-19 17:19:42 -05:00
ndowens
8ab037e0b5 nedit: 5.6a -> 5.7 2017-03-19 17:18:26 -05:00
ndowens
6359bf1895 Merge pull request #24077 from MasseGuillaume/cre2
cre2: init at 0.3.0
2017-03-19 16:59:06 -05:00
Will Dietz
cb73cb9e62 neo4j service: neo4j-wrapper is deprecated, merge into neo4j.conf 2017-03-19 16:56:53 -05:00
Will Dietz
515fc22263 neo4j service: fix package installed into env to match running service 2017-03-19 16:56:52 -05:00
Will Dietz
5d849c72f1 neo4j: 3.1.1 -> 3.1.2 2017-03-19 16:56:44 -05:00
ndowens
3ac089757a Cosmetic change; Replaced automake autoconf 2017-03-19 16:50:06 -05:00