Commit graph

184176 commits

Author SHA1 Message Date
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
Mario Rodas
0be4e0cca7
lazygit: 0.7.2 -> 0.8 2019-06-23 12:09:11 -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
Michal Minář
5864dfb513 megasync: init at 4.1.1.0
Signed-off-by: Michal Minář <mic.liamg@gmail.com>
2019-06-23 16:27:39 +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
dafee3d91a Merge master into staging-next 2019-06-23 15:38:41 +02: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
R. RyanTM
34240dbb28 flexget: 2.21.2 -> 2.21.8
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/flexget/versions
2019-06-23 15:02:41 +02:00
R. RyanTM
5c43e4170e opera: 60.0.3255.109 -> 60.0.3255.170
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/opera/versions
2019-06-23 15:02:22 +02:00
R. RyanTM
74fd5305f1 openapi-generator-cli: 4.0.0 -> 4.0.1
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/openapi-generator-cli/versions
2019-06-23 15:01:58 +02:00
R. RyanTM
fcd6a40700 jalv: 1.6.0 -> 1.6.2
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/jalv/versions
2019-06-23 15:01:45 +02:00
R. RyanTM
20b66bcd17 xmrig-proxy: 2.14.1 -> 2.14.4
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/xmrig-proxy/versions
2019-06-23 15:01:02 +02:00
R. RyanTM
32b39a4696 visualvm: 1.4.2 -> 1.4.3
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/visualvm/versions
2019-06-23 15:00:26 +02:00
R. RyanTM
f1dbd6f416 hpx: 1.2.1 -> 1.3.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/hpx/versions
2019-06-23 14:59:25 +02:00
R. RyanTM
b51c87b9df duo-unix: 1.11.1 -> 1.11.2
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/duo-unix/versions
2019-06-23 14:58:06 +02:00
R. RyanTM
66715188e5 aws-c-common: 0.3.9 -> 0.3.11
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/aws-c-common/versions
2019-06-23 14:57:49 +02:00
R. RyanTM
7d8c6c978b enyo-doom: 1.06 -> 1.06.9
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/enyo-doom/versions
2019-06-23 14:57:16 +02:00
R. RyanTM
3e6ef3e9ef eagle: 9.3.2 -> 9.4.1
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/eagle/versions
2019-06-23 14:57:04 +02:00
R. RyanTM
eaea49b8ed calamares: 3.2.7 -> 3.2.8
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/calamares/versions
2019-06-23 14:56:13 +02:00
R. RyanTM
1bb5f197a5 lasem: 0.4.3 -> 0.4.4
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/lasem/versions
2019-06-23 14:55:55 +02:00
R. RyanTM
cc3290d903 rdkafka: 1.0.0 -> 1.0.1
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/rdkafka/versions
2019-06-23 14:55:41 +02:00
R. RyanTM
9db47b0e11 neo4j: 3.5.5 -> 3.5.6
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/neo4j/versions
2019-06-23 14:55:22 +02:00
R. RyanTM
8ebcc0f543 nss_wrapper: 1.1.5 -> 1.1.6
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/nss_wrapper/versions
2019-06-23 14:55:07 +02:00
R. RyanTM
27b133e8b6 omnisharp-roslyn: 1.32.8 -> 1.32.19
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/omnisharp-roslyn/versions
2019-06-23 14:54:55 +02:00
R. RyanTM
1b0a635b4c padthv1: 0.9.6 -> 0.9.7
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/padthv1/versions
2019-06-23 14:54:42 +02:00
R. RyanTM
451fb48a1d snd: 19.3 -> 19.4
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/snd/versions
2019-06-23 14:54:26 +02:00
R. RyanTM
7278a22f20 fasm-bin: 1.73.11 -> 1.73.12
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/fasm-bin/versions
2019-06-23 14:54:03 +02:00
Florian Klink
5ada40d687 neomutt: remove mutt wrapper
Since Oct 14, 2017 we warned users still executing `neomutt`
through the `mutt` binary, so we can assume everybody read the notice,
updated his config, and can drop the wrapper.
2019-06-23 14:21:38 +02:00
R. RyanTM
b62fda7acf unifont_upper: 12.1.01 -> 12.1.02
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/unifont_upper/versions
2019-06-23 14:14:21 +02:00
R. RyanTM
95315e69b0 intel-gmmlib: 19.1.2 -> 19.2.1
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/intel-gmmlib/versions
2019-06-23 14:13:23 +02:00
R. RyanTM
a144498de6 gphoto2: 2.5.20 -> 2.5.23
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/gphoto2/versions
2019-06-23 14:13:11 +02:00
R. RyanTM
14644877d8 pstoedit: 3.73 -> 3.74
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/pstoedit/versions
2019-06-23 14:12:54 +02:00
R. RyanTM
3ab7e9ad25 qtractor: 0.9.7 -> 0.9.8
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/qtractor/versions
2019-06-23 14:12:40 +02:00
R. RyanTM
93240a6c09 samplv1: 0.9.7 -> 0.9.8
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/samplv1/versions
2019-06-23 14:12:26 +02:00
R. RyanTM
427627ea0e sigil: 0.9.13 -> 0.9.14
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/sigil/versions
2019-06-23 14:12:13 +02:00