Commit Graph
156163 Commits
Author SHA1 Message Date
Vladimír Čunát 5b0398dc36 Merge branch 'master' into staging-next
Conflicts: gobby and libinfinity - I took the hand-edited versions
instead of those resuting from the mass-replacement.

Hydra: ?compare=1473190
2018-08-13 20:43:59 +02:00
Franz Pletz 04b4e500e5 Merge pull request #44991 from Mic92/zfs
zfsLegacyCrypto: remove
2018-08-13 18:21:01 +00:00
Timo Kaufmann 8ddb8a18e1 Merge pull request #44984 from smaret/gildas
gildas: 20180701_a -> 20180801_a
2018-08-13 20:19:36 +02:00
Bas van Dijk a70fbb8d9e haskell: upgrade the tensorflow packages
Also enable building on GHC-8.4.
2018-08-13 20:07:43 +02:00
Bas van Dijk dd70c12732 libtensorflow: 1.8.0 -> 1.9.0 2018-08-13 20:07:43 +02:00
Jörg Thalheim 43595c7884 zfsLegacyCrypto: remove
This package was only mandatory for migration for people on zfsUnstable
in nixos unstable.
2018-08-13 19:53:50 +02:00
Silvan Mosberger a57c8579a8 Merge pull request #44568 from uskudnik/add-shellhook-support-to-buildstackproject
Add support for user-extensible shellHook to haskell.lib.buildStackProject
2018-08-13 19:39:43 +02:00
Silvan Mosberger 46516d8722 Merge pull request #44934 from srhb/warn-on-firefox-vlc
firefoxWrapper: Fail if deprecated enableVLC option exists
2018-08-13 19:35:07 +02:00
volth 4cc594d483 hadoop_3_1: 3.1.0 -> 3.1.1 2018-08-13 16:48:50 +00:00
volth 6abda8be18 hadoop_2_7: 2.7.6 -> 2.7.7 2018-08-13 16:48:27 +00:00
volth 7749445337 hadoop: fix build in sandbox 2018-08-13 16:47:58 +00:00
Vladyslav Mykhailichenko 249ba3d3ed reason: 3.3.2 -> 3.3.3 2018-08-13 15:51:23 +00:00
Léo Gaspard 9b46b273f9 ocamlModules.wasm: add wasm binary 2018-08-13 15:36:44 +00:00
Tor Hedin Brønner 34baf00b72 {qt4,qt3}: Fix breakage after eeb9837beb
- qt-4: Pass the correct configureFlags, in particular `mk` should prepend `no-`
  when `cond` is false.

- qt-3: simply revert the changes
2018-08-13 16:25:37 +02:00
Wout Mertens 55fa15642f Merge pull request #44985 from NixOS/siege-unix
siege: build on all Unix
2018-08-13 16:17:22 +02:00
Jörg Thalheim eaab530f6e Merge pull request #44983 from alyssais/patch-1
environment.extraInit: fix description typo
2018-08-13 16:09:33 +02:00
Wout Mertens a69f61df21 siege: build on all Unix
Confirmed to work on Darwin
2018-08-13 16:05:53 +02:00
Oleg Pykhalov a5b455aeb6 ansible: install man pages (#44980) 2018-08-13 15:30:41 +02:00
Alyssa Ross 98b8d4cfbc environment.extraInit: fix description typo 2018-08-13 14:28:52 +01:00
Sebastien Maret b4599987e3 gildas: 20180701_a -> 20180801_a 2018-08-13 15:17:15 +02:00
Léo Gaspard 48e5fbe8ee buildRustPackage: allow patches to fix Cargo.lock 2018-08-13 22:07:58 +09:00
Boris a5efa6650f pythonPackages.browser-cookie3: init at 0.6.4 (#44562) 2018-08-13 14:47:06 +02:00
R. RyanTM e0eb7d9ed7 cstore_fdw: 1.6.0 -> 1.6.1 (#44792)
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/cstore_fdw/versions.
2018-08-13 14:35:53 +02:00
R. RyanTM 499845e240 x42-plugins: 20180320 -> 20180803 (#44659)
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/x42-plugins/versions.
2018-08-13 14:30:30 +02:00
R. RyanTM 3d30b32ab2 shaarli: 0.9.7 -> 0.10.0 (#44693)
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/shaarli/versions.
2018-08-13 14:29:32 +02:00
R. RyanTM 1725a321ca skim: 0.5.0 -> 0.5.1 (#44700)
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/skim/versions.
2018-08-13 14:28:37 +02:00
R. RyanTM 3ab3e14e46 ibus-engines.hangul: 1.5.0 -> 1.5.1 (#44771)
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/ibus-hangul/versions.
2018-08-13 14:28:06 +02:00
R. RyanTM 9cc733cfaf groonga: 8.0.2 -> 8.0.5 (#44783)
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/groonga/versions.
2018-08-13 14:26:30 +02:00
R. RyanTM 33e70ffad4 jimtcl: 0.77 -> 0.78 (#44762)
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/jimtcl/versions.
2018-08-13 14:24:25 +02:00
R. RyanTM 1fd0792777 mate.mate-media: 1.20.1 -> 1.21.0 (#44745)
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/mate-media/versions.
2018-08-13 14:23:47 +02:00
R. RyanTM b3ebab2c53 pony-stable: 0.1.4 -> 0.1.6 (#44715)
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/pony-stable/versions.
2018-08-13 14:22:31 +02:00
Arnaud e3de066033 protonmail-bridge: 1.0.5-1 -> 1.0.6-1 (#44950) 2018-08-13 14:13:13 +02:00
Florian Klink cf5826f1a3 jameica: add darwin support (#44953) 2018-08-13 14:12:29 +02:00
Alyssa Ross 0d3b2b6990 cargo-download: init at 0.1.1
Cargo.nix was generated from cargo-download 0.1.1 with this patch
applied, which was necessary to not confuse carnix about the version
being different between Cargo.toml and Cargo.lock.

See https://github.com/Xion/cargo-download/pull/3.

From 5efd4cf11ff9d5042712303404169016b1e05c33 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Thu, 26 Jul 2018 21:19:06 +0200
Subject: [PATCH] Fix Cargo.lock

Running `cargo build` on a clean checkout produces a diff in Cargo.lock,
because it wasn't updated after the version number was bumped.

After this commit, `cargo build` should no longer produce a modified
working tree.
---
 Cargo.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Cargo.lock b/Cargo.lock
index cc7357c..c384dc1 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -76,7 +76,7 @@ dependencies = [

 [[package]]
 name = "cargo-download"
-version = "0.1.0"
+version = "0.1.1"
 dependencies = [
  "ansi_term 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "clap 2.27.1 (registry+https://github.com/rust-lang/crates.io-index)",
--
2.17.1
2018-08-13 12:18:57 +01:00
Vladimír Čunát ed45e731c2 util-linux: fixup bad shell expansion
Introduced in that f83b5e4 refactoring as well.
Thanks Dezgeg for noticing!
2018-08-13 13:09:35 +02:00
Bas van Dijk 9968d0f053 Merge pull request #44948 from Izorkin/servant
servant-sphinx-documentation: fix sha256sum
2018-08-13 12:39:16 +02:00
Alyssa Ross 43b6d46f4f puppet-lint: init at 2.3.6 2018-08-13 11:37:59 +01:00
Jörg Thalheim cfff3eb6c4 Revert "buildRustPackage: allow patches to fix Cargo.lock"
This reverts commit b6e881ab72.

We need to fix checksums for this pull request first.

Also see https://github.com/NixOS/nixpkgs/pull/44967
2018-08-13 12:26:33 +02:00
Jörg Thalheim 3dc78e6ae9 Merge pull request #44967 from Ekleog/rust-patch
buildRustPackage: allow patches to fix Cargo.lock
2018-08-13 12:22:59 +02:00
Peter Hoeg 6afd19e699 masterpdfeditor: 5.1.00 -> 5.1.12 2018-08-13 17:16:26 +08:00
Gabriel Ebner 7478da5e84 Merge pull request #42885 from smaret/gildas
gildas: 20180601_a -> 20180701_a
2018-08-13 10:55:18 +02:00
Sarah Brofeldt 92bb84220f Merge pull request #44958 from samueldr/auto/dbeaver/nixpkgs-unstable/5.1.5
dbeaver: 5.1.4 -> 5.1.5
2018-08-13 09:15:22 +02:00
Sarah Brofeldt 2cc17ceb3c Merge pull request #44964 from yrashk/powershell-6.0.4
powershell: 6.0.3 -> 6.0.4
2018-08-13 09:14:21 +02:00
Peter Simons 7a4b1fa093 Merge pull request #44969 from carlosdagos/docs-hackage2nix
docs: add some docs mentioning hackage2nix
2018-08-13 08:58:43 +02:00
Michael Raskin 3762495967 Merge pull request #44942 from aanderse/master
openscenegraph: 3.4.0 -> 3.6.2
2018-08-13 06:44:47 +00:00
Uri Baghin 8c802d42ad bazel: fix darwin build on hydra 2018-08-13 08:32:27 +02:00
Léo Gaspard b6e881ab72 buildRustPackage: allow patches to fix Cargo.lock 2018-08-13 14:44:30 +09:00
worldofpeace 319b5cec4e libgpod: drop libimobiledevice.swig
was removed a while ago
2018-08-13 00:56:32 -04:00
worldofpeace 098da6633e ifuse: rework expression 2018-08-13 00:49:17 -04:00
worldofpeace ddc73a67b5 usbmuxd: 1.1.0 -> 2018-07-22 2018-08-13 00:48:58 -04:00