1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-24 10:56:56 +00:00
Commit graph

183869 commits

Author SHA1 Message Date
Nikolay Amiantov a92611508f cplex: add library info 2019-06-24 15:57:22 +03:00
Nikolay Amiantov 10e1475a79 gurobi: add library suffix 2019-06-24 15:57:22 +03:00
Alyssa Ross 57b1f53862
Merge pull request #63484 from alyssais/linux-5.0
linux_5_0: remove
2019-06-24 11:45:58 +00:00
Bas van Dijk 474da44339
Merge pull request #63706 from basvandijk/cargo-license-0.2.0
cargo-license: init at 0.2.0
2019-06-24 11:32:41 +02:00
markuskowa 902dbe7a3e
Merge pull request #63630 from ck3d/vdr-2.4.1
vdr: 2.4.0 -> 2.4.1
2019-06-24 10:32:31 +02:00
Vincent Laporte 2307ac9fe2 xastir: 2.1.0 -> 2.1.2
Version 2.1.2 is compatible with recent versions of proj
2019-06-24 06:12:10 +00:00
Danylo Hlynskyi c393c5217b
Merge pull request #63618 from johanot/tomcat-9.0.21-master
tomcat: CVE-2019-10072
2019-06-24 08:49:36 +03:00
Matthieu Coudron 0d1707c834
Merge pull request #63711 from teto/coc_update
Coc update
2019-06-24 04:56:27 +02:00
Alexei Robyn 3ca771cdc3 luaPackages.luaexpat: Downgrade to fix issue and match typical distros
Matches version used on most distros. Fixes an issue with prosody.
Detailed reasoning behind this can be found
[here](https://github.com/NixOS/nixpkgs/pull/63108#issuecomment-504015507).
2019-06-24 04:08:29 +02:00
Alexei Robyn f2aa671ad7 luajitPackages: Improve derivation names
`"lua" + lua.luaversion + "-"` resolves to "lua51-" for both Lua
5.1 and LuaJIT packages. With this, LuaJIT packages instead get
`lua.name + "-"`, which currently resolves to "luajit-2.1.0-beta3-".
This makes it easy to distinguish the two in store paths etc.
2019-06-24 04:04:37 +02:00
Ivan Malison fa30c32db0 rofi: 1.5.2 -> 1.5.3 2019-06-24 04:03:13 +02:00
Matthieu Coudron 5adfef1810 vimPlugins: update 2019-06-24 10:55:49 +09:00
Matthieu Coudron bb8538a209 vimPlugins.coc-nvim: 0.69 -> 0.71 2019-06-24 10:55:33 +09:00
Matthew Bauer b24d5e48b9
Merge pull request #63695 from arcnmx/python-hidapi-darwin
pythonPackages.hidapi: enable on darwin
2019-06-23 21:48:00 -04:00
Matthew Bauer 500c13ed46
Merge pull request #63609 from tokudan/udev-executable-check
udev: change error message if RUN entry is not executable
2019-06-23 21:43:31 -04:00
Matthew Bauer dc5e4cfa3c
Merge pull request #63595 from romildo/upd.wxgtk
wxGTK31: 3.1.0 -> 3.1.2; use a real derivation
2019-06-23 21:43:05 -04:00
Matthew Bauer 778bd7a1a1
Merge pull request #63638 from oxij/pkgs/revert-amdsdk-removal
Revert "Remove amdadlsdk and amdappsdk."
2019-06-23 21:42:30 -04:00
Matthew Bauer 3726505510
Merge pull request #63670 from arcnmx/acpilight-build-fix
acpilight: fix build error
2019-06-23 21:41:51 -04:00
Matthew Bauer e49729f9b1
Merge pull request #63707 from matthewbauer/fix-63043
Qt5 + Darwin fixes
2019-06-23 20:37:54 -04:00
Matthew Bauer 8768d1c83a nixos: add hardware/network/intel-2200bg.nix to module-list
this is referenced by nixos-generate-config.pl. See
https://github.com/NixOS/nixpkgs/pull/63091 for more discussion.
2019-06-23 20:30:27 -04:00
Maximilian Bosch b1fc54d059
Merge pull request #63685 from Ma27/bump-documize
documize-community: 2.5.1 -> 3.0.0
2019-06-24 01:43:03 +02:00
zimbatm 20b993ef2c
ksonnet: remove package (#63702)
The team behind ksonnet was aquired by VMware, and they decided to end
work on ksonnet:

From https://blogs.vmware.com/cloudnative/2019/02/05/welcoming-heptio-open-source-projects-to-vmware:

> Prior to the acquisition, Heptio had been shifting focus and resources
> away from ksonnet; with the acquisition, we felt it was the right time
> to rethink our investment in ksonnet. As a result, work on ksonnet will
> end and the GitHub repositories will be archived. It’s extremely
> difficult to step back from a project we have worked so hard on, but
> we’re excited about our new ideas and vision for changing how developers
> experience the Kubernetes and cloud native ecosystems.
2019-06-23 22:43:23 +00:00
zimbatm 7f7687e79f
Merge pull request #63701 from basvandijk/composable-mkshell-shellHook
Improve composability of mkShell
2019-06-23 22:39:54 +00:00
Matthew Bauer 758712c6f4 qt5: make qt512 the default on darwin 2019-06-23 18:31:20 -04:00
Matthew Bauer 4c3e09b022 qt5.12: patch to work on x86_64-darwin
unfortunately, some private headers making the logging hard to handle.
Specifically, os/activity.h that is included does not match what Qt5
is expected. This removes the activity logging (while keeping the
other logging methods) on macOS.

Fixes #63528
2019-06-23 18:29:04 -04:00
Matthew Bauer 4e22fe4f63 apple-sdk: add MetalKit 2019-06-23 18:28:36 -04:00
Bas van Dijk 7720379005 cargo-license: init at 0.2.0 2019-06-24 00:20:57 +02:00
John Ericson 852d81d607
Merge pull request #63698 from tobim/overrideCC-buildPackages
Fix misuses of overrideCC
2019-06-23 18:19:18 -04:00
arcnmx 2933681be0 pythonPackages.hidapi: enable on darwin 2019-06-23 14:55:26 -07:00
Ryan Mulligan 73d5c7e547
Merge pull request #63350 from r-ryantm/auto-update/python3.7-cassandra-driver
python37Packages.cassandra-driver: 3.17.1 -> 3.18.0
2019-06-23 14:07:40 -07:00
Florian Klink 9635646148 ksonnet: remove package
The team behind ksonnet was aquired by VMware, and they decided to end
work on ksonnet:

From https://blogs.vmware.com/cloudnative/2019/02/05/welcoming-heptio-open-source-projects-to-vmware:

> Prior to the acquisition, Heptio had been shifting focus and resources
> away from ksonnet; with the acquisition, we felt it was the right time
> to rethink our investment in ksonnet. As a result, work on ksonnet will
> end and the GitHub repositories will be archived. It’s extremely
> difficult to step back from a project we have worked so hard on, but
> we’re excited about our new ideas and vision for changing how developers
> experience the Kubernetes and cloud native ecosystems.
2019-06-23 22:42:08 +02:00
Bas van Dijk cee35739ff mkshell: improve mergeInputs
mergeInputs is now simply defined in terms of `concatLists` and
`catAttrs` instead of a more complicated `foldr`.

Note that the order of PATH has also changed. For example running the
following with nix-shell:

  let
    pkgs = import <nixpkgs> {};

    shell1 = pkgs.mkShell {
      buildInputs = [ pkgs.htop ];
    };

    shell2 = pkgs.mkShell {
      buildInputs = [ pkgs.hello ];
    };

    shell3 = pkgs.mkShell {
      inputsFrom = [ shell1 shell2 ];
      buildInputs = [ pkgs.tree ];
    };

  in shell3

Results in the following PATH:

$ echo $PATH
...
/nix/store/yifq4bikf7m07160bpia7z48ciqddbfi-tree-1.8.0/bin:
/nix/store/vhxqk81234ivqw1a7j200a1c69k8mywi-htop-2.2.0/bin:
/nix/store/n9vm3m58y1n3rg3mlll17wanc9hln58k-hello-2.10/bin
...

Previously the order was:

/nix/store/n9vm3m58y1n3rg3mlll17wanc9hln58k-hello-2.10/bin
/nix/store/vhxqk81234ivqw1a7j200a1c69k8mywi-htop-2.2.0/bin:
/nix/store/yifq4bikf7m07160bpia7z48ciqddbfi-tree-1.8.0/bin:

I think the new order makes more sense because it allows to override
the PATH in the outermost mkShell.
2019-06-23 22:20:10 +02:00
Bas van Dijk 76ef802d3d mkShell: compose shellHooks
Running the following expression with nix-shell:

  let
    pkgs = import <nixpkgs> {};

    shell1 = pkgs.mkShell {
      shellHook = ''
        echo shell1
      '';
    };

    shell2 = pkgs.mkShell {
      shellHook = ''
        echo shell2
      '';
    };

    shell3 = pkgs.mkShell {
      inputsFrom = [ shell1 shell2 ];
      shellHook = ''
        echo shell3
      '';
    };
  in shell3

Will now results in:
shell2
shell1
shell3

Note that packages in the front of inputsFrom have precedence over
packages in the back. The outermost mkShell has precedence over all.
2019-06-23 22:13:57 +02:00
Tadeo Kondrak 1655945eb7 discord-canary: 0.0.83 -> 0.0.84 2019-06-23 11:50:09 -07:00
Tadeo Kondrak e6f23b8b1e discord-{ptb,canary}: init; add update-discord 2019-06-23 11:50:09 -07:00
Tadeo Kondrak 0687a9d8db discord: change from 4 to 2 space indentation 2019-06-23 11:50:09 -07:00
Tobias Mayer 6389a0a132 Use of gccXStdenv instead of inplace overrideCC 2019-06-23 20:49:22 +02:00
Mario Rodas 6b311bef63
Merge pull request #63642 from marsam/update-imgcat
imgcat: 2.3.0 -> 2.3.1
2019-06-23 12:13:00 -05:00
makefu aa54135d2c home-assistant: update component-packages
adds gtts-token to google_translate component
2019-06-23 18:19:11 +02:00
makefu 536abf3c64 python.pkgs.gtts-token: init at 1.1.3 2019-06-23 18:19:11 +02:00
Jonathan Ringer d27c1f64f4 pythonPackages.imgaug: mark as broken 2019-06-23 18:14:19 +02:00
Jonathan Ringer 9559da73a2 pythonPackages.ndg-httpsclient: 0.4.2 -> 0.5.1 2019-06-23 18:13:46 +02:00
R. RyanTM 9bf6694abf python37Packages.progressbar2: 3.39.3 -> 3.42.0
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.7-progressbar2/versions
2019-06-23 18:12:59 +02:00
R. RyanTM 70cf345947 python37Packages.aniso8601: 6.0.0 -> 7.0.0
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.7-aniso8601/versions
2019-06-23 18:12:39 +02:00
R. RyanTM 53a374d98d python37Packages.sasmodels: 0.99 -> 1.0.0
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.7-sasmodels/versions
2019-06-23 18:12:12 +02:00
Tobias Mayer 3a7bb25285 Fix overrideCC invokations for cross builds
`overrideCC` should always take a compiler for the build
system, otherwise cross compilation is not possible.
2019-06-23 17:07:51 +02:00
Tobias Mayer 79d72ccd3c dpkg: fix cross compilation 2019-06-23 17:07:38 +02:00
Jörg Thalheim 80172aa0a6
Merge pull request #63687 from flokli/neomutt-remove-wrapper
neomutt: remove mutt wrapper
2019-06-23 14:58:17 +01:00
Jörg Thalheim 831e4a261b
Merge pull request #63657 from saschagrunert/conmon
conmon: 0.2.0 -> 0.3.0
2019-06-23 14:57:30 +01:00
Frederik Rietdijk ba7e7aed08 python.pkgs.soundfile: 0.9.0.post1 -> 0.10.2
Package was renamed as well.
2019-06-23 15:32:19 +02:00