Vladimír Čunát
5a38ab8add
Merge branch 'master' into staging
2017-02-20 21:24:35 +01:00
Vladimír Čunát
2cb76ff1ff
Merge branch 'glibc-2.25' into staging
...
The largest problem-causers should be fixed now (within).
2017-02-20 21:18:48 +01:00
Frederik Rietdijk
dd054e890f
Merge pull request #22061 from Mic92/python3-protobuf
...
python-protobuf: enable python3 and enable py3 tests
2017-02-20 21:17:38 +01:00
Vincent Laporte
b634622be0
compcert: 2.7.1 -> 3.0.1
2017-02-20 20:09:53 +00:00
Vladimír Čunát
0ff2179e0f
gnutls: use 3.5 and remove 3.4
...
3.4 branch detects support for getrandom() call during configure-time,
which gets picked up since glibc-2.25, and consequently it will fail
with older kernels during rutime.
2017-02-20 21:07:35 +01:00
Nikolay Amiantov
ac8fabd0e0
phpPackages: also default to 7.1
2017-02-20 19:08:12 +03:00
Thomas Tuegel
7fa06b3cd2
Merge pull request #22991 from layus/deprecate-kde4-ktikz
...
qtikz: update to Qt5; remove ktikz
2017-02-20 08:37:47 -06:00
Peter Simons
d7f10f2828
python-osc: enable (install) bash completion
2017-02-20 15:02:30 +01:00
Tuomas Tynkkynen
fee43308ed
platforms.nix: Remove unnecessary kernelExtraConfig for ARMv7
...
AHCI_IMX is already enabled in multi_v7_defconfig since kernel 4.9.
2017-02-20 15:22:14 +02:00
Nikolay Amiantov
ec2c9d57b5
Merge pull request #22568 from abbradar/chromium-updates
...
Chromium updates
2017-02-20 15:49:04 +03:00
Shea Levy
f454297a7d
linux 4.10
2017-02-20 07:32:46 -05:00
Shea Levy
b191ac0d89
Revert "linux 4.10"
...
Somehow the tarball was actually linux 4.4.10
This reverts commit fea71f84d0
.
2017-02-20 07:29:47 -05:00
Robin Gloster
dcba6eae1b
Merge pull request #22116 from LnL7/darwin-cmus
...
cmus: fix darwin
2017-02-20 13:02:30 +01:00
Shea Levy
fea71f84d0
linux 4.10
2017-02-20 06:47:49 -05:00
Peter Simons
31759274f1
python-suseapi: 'requests' isn't needed at build-time, but it's needed at run-time
2017-02-20 12:21:59 +01:00
Peter Simons
f0de1dc89d
python-suseapi: add package at version 0.24-5-g9937e3b
2017-02-20 12:11:29 +01:00
Frederik Rietdijk
9d48d3774e
Merge pull request #22713 from richardlarocque/antfs-cli
...
antfs-cli and openant: init at unstable-2017-02-11
2017-02-20 09:06:02 +01:00
Richard Larocque
13884d6de1
antfs-cli: init at unstable-2017-02-11
2017-02-19 16:22:21 -08:00
Richard Larocque
59d2eeff84
openant: init at unstable-2017-02-11
2017-02-19 16:22:20 -08:00
aszlig
7c9f4ee032
lua-packages/luasocket: Fix wrong platforms value
...
This has surfaced due to 505d7bea3a
and
the fixup commit 77f5a50c40
.
The individial platform attributes are a list rather than single
elements, so in this case we got:
with platforms; [darwin linux freebsd illumos]
Which results in:
[ ["x86_64-darwin"]
["i686-linux" "x86_64-linux" "armv5tel-linux" "armv6l-linux"
"armv7l-linux" "aarch64-linux" "mips64el-linux"]
["i686-freebsd" "x86_64-freebsd"]
["x86_64-solaris"]
]
So if you don't have allowBroken set in nixpkgs config, you end up with
an evaluation error because meta.platforms is expected to be a list
instead of a list of lists which we got here.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Cc: @mornfall, @vcunat
2017-02-20 00:05:18 +01:00
Michael Raskin
9d81664480
psi: move out of kdePackages, it doesn't use kdelibs anyway
2017-02-19 18:38:10 +01:00
Michael Raskin
5759206608
qca2: add qca2-qt5 top-level attribute
2017-02-19 18:38:10 +01:00
Vladimír Čunát
77f5a50c40
lua-packages: fix my mass typo in meta
2017-02-19 17:56:49 +01:00
Vladimír Čunát
505d7bea3a
lua-packages: hydraPlatforms -> platforms
...
I see no original reason. It seems someone started using hydraPlatforms
in that file and everyone else was just conforming to the style.
2017-02-19 17:40:18 +01:00
Vladimír Čunát
ac7ed3b91f
Merge #22974 : luaPackages.luaposix: init at 33.4.0
2017-02-19 17:38:52 +01:00
Jörg Thalheim
19798cb205
Merge pull request #22819 from makefu/pkgs/dymo/init
...
cups-dymo: init at 1.4.0.5
2017-02-19 16:53:19 +01:00
vbgl
d31577cfd3
Merge pull request #22871 from FlorentBecker/default_ocaml_402
...
Default ocaml 402
2017-02-19 15:54:54 +01:00
Tuomas Tynkkynen
b53c53b1b4
maintainers: Add script to patch version/sha256 in .nix files
...
Adds a script to help automatically upgrading packages: this one can
patch name/version attributes like:
version = "50.1.0";
name = "bc-1.06";
... to the given version, and updates the sha256 hash to match.
Usage is:
update-source-version <attr> <new-version> [<new-source-hash>]
where:
- attr is the attribute path of the package
- new-version is the version string to be patched in
- new-source-hash is the optional sha256/etc. hash of the source.
If not given, the script will automatically calculate it.
This is added to a subdirectory where other useful scripts can be added
in the future, like figuring out the newest version from a git repo or
GitHub releases etc.
2017-02-19 16:51:17 +02:00
Lancelot SIX
f149a32315
Merge pull request #22957 from asymmetric/glances-2.8.2
...
glances: 2.7.1_1 -> 2.8.2
Built and tested locally.
2017-02-19 15:08:53 +01:00
Florent Becker
4c5f083d70
prooftree: move out of ocamlPackages
2017-02-19 13:06:25 +01:00
Florent Becker
6893d8a2fd
llpp: move out of ocamlPackages
2017-02-19 13:06:25 +01:00
Florent Becker
88dac94e3b
switch ocamlPackages to 4.02
2017-02-19 13:06:24 +01:00
Florent Becker
f18ac15dca
ocamlPackages.spacetime: only build with ocaml-4.04
2017-02-19 13:06:24 +01:00
Florent Becker
cc9a50ec03
virt-top: compile with ocaml 4.01
2017-02-19 13:06:24 +01:00
Florent Becker
bf13a2cfc6
ocamlPackages.camlimages_4_0: only build with ocaml 4.01
2017-02-19 13:05:47 +01:00
Florent Becker
2a17b75fb1
ocamlPackages.bitsring: associate ocaml versions with bitstring versions univocally
2017-02-19 13:05:47 +01:00
Florent Becker
ba993ad506
coccinelle: build with caml 4.01
2017-02-19 13:05:46 +01:00
Florent Becker
2f46fb2cba
sks: fix build with ocaml 4.02+
2017-02-19 13:05:46 +01:00
Florent Becker
b0d7d60fd4
prooftree: force ocaml 4.01
2017-02-19 13:05:46 +01:00
Florent Becker
ea68576b7a
satallax: force ocaml 4.01
2017-02-19 13:05:45 +01:00
Florent Becker
ad671eaba9
mldonkey: force ocaml 4.01
2017-02-19 13:05:45 +01:00
Florent Becker
11e4fcf941
ocamlPackages.llpp: only allow with ocaml-4.04
2017-02-19 13:05:44 +01:00
Florent Becker
eec3973004
leo2: force ocaml-4.01
2017-02-19 13:05:44 +01:00
Guillaume Maudoux
9016be4589
qtikz: update to Qt5; remove ktikz
2017-02-19 12:26:51 +01:00
sternenseemann
a452714799
ocaml-cow: init at 2.2.0
2017-02-19 11:16:25 +00:00
Vincent Laporte
d2a4a84f00
ocamlPackages.uri: 1.9.1 -> 1.9.2
...
The old version is also kept, under the attribute `uri_p4`.
It is built against `sexplib` version prior to 113.33 and needed by `trv`.
2017-02-19 11:57:24 +01:00
Joachim F
184f574283
Merge pull request #22915 from pradeepchhetri/envconsul
...
envconsul: init at 0.6.2
2017-02-19 10:23:58 +01:00
Nikolay Amiantov
b322271dd6
pythonPackages.webassets: 0.12 -> 0.12.1
...
Fixes #22965
2017-02-19 11:35:59 +03:00
sternenseemann
4f0feb4f5f
ocaml-logs: init at 0.6.2
2017-02-19 04:36:14 +00:00
Pradeep Chhetri
1973a29536
envconsul: init at 0.6.2
2017-02-19 09:36:39 +05:30