1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-25 23:20:55 +00:00
Commit graph

149200 commits

Author SHA1 Message Date
Tim Steinbach 067d5e6289
linux: 4.4.147 -> 4.4.148 2018-08-15 12:53:36 -04:00
Profpatsch d817452e29 lib/recursiveUpdateUntil: add a test & release note for fix 2018-08-15 17:16:56 +02:00
Mathijs Kwik b63ec64521 lib/recursiveUpdateUntil: fix code to match documentation
$ nix repl lib
Welcome to Nix version 2.0.2. Type :? for help.

Loading 'lib'...
Added 350 variables.

-- this is the exact example from the function's documentation:
nix-repl> recursiveUpdateUntil (path: l: r: path == ["foo"]) {
                   # first attribute set
                   foo.bar = 1;
                   foo.baz = 2;
                   bar = 3;
                 } {
                   #second attribute set
                   foo.bar = 1;
                   foo.quz = 2;
                   baz = 4;
                 }
{ bar = 3; baz = 4; foo = { bar = 1; baz = 2; quz = 2; }; }

-- although the documentation says:
{
    foo.bar = 1; # 'foo.*' from the second set
    foo.quz = 2; #
    bar = 3;     # 'bar' from the first set
    baz = 4;     # 'baz' from the second set
}
2018-08-15 17:16:56 +02:00
Silvan Mosberger b1cf86b8bb
Merge pull request #44966 from worldofpeace/imobile-updates
libimobiledevice updates
2018-08-15 17:05:10 +02:00
Eric Wolf fe6ebf85b7 ghc-8.0.2: Fix #44987 (#45014)
nix-env -f '<nixpkgs>' -qaP -A haskell.packages.ghc802

will run again, but the packages depending on ghc-compact will still not
build, as they have a constrain on base >= 4.10 and ghc 8.0.2 has base
4.9.1.0
2018-08-15 14:53:20 +01:00
Alyssa Ross 3116e6e6b9 gem-config: add curses (#45068) 2018-08-15 14:32:50 +01:00
Timo Kaufmann 86dc867803
Merge pull request #45062 from Ma27/fix-python-thumbor
pythonPackages.thumbor: 6.5.1 -> 6.5.2
2018-08-15 14:16:05 +02:00
Maximilian Bosch cd21faff2b
pythonPackages.thumbor: 6.5.1 -> 6.5.2
6.5.2 allows Pillow==5.2.0 (see https://github.com/thumbor/thumbor/releases/tag/6.5.2).

See https://hydra.nixos.org/build/79403232 for further reference.
2018-08-15 13:59:35 +02:00
Sarah Brofeldt cc288eef07
Merge pull request #45050 from sjmackenzie/rink-rs
carnix overrides: add gmp to rink-rs buildInputs & correct crateBin
2018-08-15 12:43:37 +02:00
xeji 8238101f67
Merge pull request #45051 from typetetris/45049
ptask: remove usage of nonexistent function is_error
2018-08-15 12:41:31 +02:00
Eric Wolf ff9a38ee89 ptask: prevent building on darwin as this fails as of now 2018-08-15 12:00:43 +02:00
Timo Kaufmann ad71d9b0d5
Merge pull request #45001 from jbaum98/givaro-darwin
givaro: Add darwin support
2018-08-15 11:58:00 +02:00
Benjamin Hipple 16d4753344 pythonPackages.fastcache: init at 1.0.2 (#45048) 2018-08-15 11:02:55 +02:00
Benjamin Hipple cc8e4a5884 pythonPackages.multiprocess: 0.70.4 -> 0.70.6.1 (#45047) 2018-08-15 11:01:32 +02:00
Ivan Jager ef98b96356 atd: 1.12.0 -> 2.0.0 (#45046)
atdgen is now part of atd
2018-08-15 10:45:42 +02:00
Izorkin e2c98528e9 qemu: add path to bin utilites 2018-08-15 11:17:44 +03:00
Uli Baum 6e3d0efdc4 python.pkgs.orderedset: fix ofborg checkMeta
broken by 44a4370b1f
2018-08-15 09:54:58 +02:00
adisbladis 2937e7367f
Merge pull request #45009 from jbaum98/ratpoints-darwin
ratpoints: 2.1.3 -> 2.1.3.p4; add darwin support
2018-08-15 15:28:39 +08:00
Eric Wolf b2cf9529d6 ptask: remove usage of nonexistent function is_error
see https://github.com/json-c/json-c/issues/304
2018-08-15 08:00:55 +02:00
Jörg Thalheim 0ee6d7e3ab
Merge pull request #45011 from jbaum98/symmetrica-darwin
symmetrica: Add darwin support
2018-08-15 07:54:56 +02:00
Stewart Mackenzie efac36aa88 carnix overrides: add gmp to rink-rs buildInputs & correct crateBin 2018-08-15 13:20:04 +08:00
Jake Waksbaum 2ab014eb17 givaro: Add darwin support 2018-08-14 19:47:47 -04:00
Jan Tojnar 44a4370b1f
python.pkgs.orderedset init at 2.0.1 2018-08-14 23:35:17 +02:00
Shea Levy 7372d3bf31
haskell.lib.getHaskellBuildInputs: Actually get the haskell build inputs.
5523ec8f3c accidentally dropped the attribute lookup.
2018-08-14 17:05:36 -04:00
Pascal Wittmann 8251a3777f
Merge pull request #45040 from NixOS/update-intel-gpu-tools
intel-gpu-tools: 1.22 -> 1.23
2018-08-14 22:56:26 +02:00
Pascal Wittmann 6af971573a
intel-gpu-tools: 1.22 -> 1.23 2018-08-14 22:14:55 +02:00
Robert Helgesson 3727609834 msmtp: 1.6.6 -> 1.6.8
Also update homepage to match new project location.
2018-08-14 22:10:26 +02:00
Jan Tojnar 2f801195fc
gnome3.libgnome-games-support: propagate required dependencies 2018-08-14 22:02:20 +02:00
Jan Tojnar 5d62b6698a
gnome3.atomix: init at 3.29.3 2018-08-14 22:02:20 +02:00
Silvan Mosberger 6e7b11dbb6
Merge pull request #45031 from stephengroat/patch-1
terragrunt: 0.14.6 -> 0.16.5
2018-08-14 20:10:54 +02:00
Silvan Mosberger 07c441d4dc
Merge pull request #45034 from Infinisil/update/translate-shell
translate-shell: 0.9.6.7 -> 0.9.6.8
2018-08-14 20:10:32 +02:00
Christoph Hrdinka 72a35533e0 postgresql: fix tzdata path
Signed-off-by: Christoph Hrdinka <c.github@hrdinka.at>
2018-08-14 19:07:32 +01:00
Silvan Mosberger 7b30b3fb14
Merge pull request #45028 from Infinisil/update/pdd
pdd: 1.3 -> 1.3.1
2018-08-14 19:58:24 +02:00
Silvan Mosberger 8b9054e6e4
translate-shell: 0.9.6.7 -> 0.9.6.8 2018-08-14 19:56:20 +02:00
Gabriel Ebner 9c4018302a
Merge pull request #45029 from rawkode/feature/upgrade-vscode
Update vscode from 1.15.1 -> 1.26.0
2018-08-14 19:43:15 +02:00
Stephen e36ea4b1bf
terragrunt: 0.14.6 -> 0.16.5 2018-08-14 10:35:32 -07:00
David McKay 82f651b977
vscode: 1.25.1 -> 1.26.0 2018-08-14 17:02:35 +01:00
Jake Waksbaum 47aa6abe96 ratpoints: 2.1.3 -> 2.1.3.p4; add darwin support 2018-08-14 11:27:59 -04:00
Jake Waksbaum 8ae47fa81a symmetrica: Add darwin support 2018-08-14 11:23:21 -04:00
Silvan Mosberger 3f2921b610
pdd: 1.3 -> 1.3.1 2018-08-14 17:21:02 +02:00
Silvan Mosberger 2d1316ec41
Merge pull request #44802 from r-ryantm/auto-update/blockhash
blockhash: 0.3 -> 0.3.1
2018-08-14 17:15:36 +02:00
Jan Tojnar fe51bf322c
Merge pull request #44820 from michaelpj/fix/redshift-geoclue-agents
redshift/geoclue/localtime: progress in fixing agent confusion
2018-08-14 17:13:09 +02:00
Michael Peyton Jones 80d4fa725b
localtime: simplify module a little 2018-08-14 15:55:05 +01:00
Michael Peyton Jones 316669327c
geoclue2 service: add option to run demo agent 2018-08-14 15:55:04 +01:00
Michael Peyton Jones 284fc9b449
geoclue: 2.4.10 -> 2.4.12 2018-08-14 15:55:01 +01:00
Michael Peyton Jones a1762065c3
redshift: install desktop files, and use absolute paths in them to avoid confusing geoclue agent 2018-08-14 15:53:39 +01:00
Jörg Thalheim e27d1b802c
Merge pull request #45017 from chpatrick/meshlab-update
meshlab: 2016.02 -> 20180627-beta
2018-08-14 15:38:24 +02:00
xeji f1c3327d7d
Merge pull request #45023 from markuskowa/alsalics
add licenses: alsa[Utils,Tools,Oss], altermime
2018-08-14 15:02:52 +02:00
Jörg Thalheim 1333ebce98 zfsUnstable: compatible with 4.18 again 2018-08-14 14:57:15 +02:00
Vincent Laporte be989c7af4 ocamlPackages.javalib: 2.3.4 -> 2.3.5 (#45016) 2018-08-14 14:53:30 +02:00