gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
183,807 Commits 9 Branches 0 Tags
cee35739ff0800f5738ecbedb43c356a2f06c96f
Commit Graph
183807 Commits
This Branch
This Branch
All Branches
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
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. RyanTMandFrederik Rietdijk 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. RyanTMandFrederik Rietdijk 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. RyanTMandFrederik Rietdijk 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. RyanTMandFrederik Rietdijk 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. RyanTMandFrederik Rietdijk 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. RyanTMandFrederik Rietdijk 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. RyanTMandFrederik Rietdijk 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. RyanTMandFrederik Rietdijk 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. RyanTMandFrederik Rietdijk 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. RyanTMandFrederik Rietdijk 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. RyanTMandFrederik Rietdijk 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. RyanTMandFrederik Rietdijk 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. RyanTMandFrederik Rietdijk 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. RyanTMandFrederik Rietdijk 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. RyanTMandFrederik Rietdijk 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. RyanTMandFrederik Rietdijk 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. RyanTMandFrederik Rietdijk 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. RyanTMandFrederik Rietdijk 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. RyanTMandFrederik Rietdijk 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. RyanTMandFrederik Rietdijk 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
R. RyanTMandFrederik Rietdijk 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. RyanTMandFrederik Rietdijk 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. RyanTMandFrederik Rietdijk 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. RyanTMandFrederik Rietdijk 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. RyanTMandFrederik Rietdijk 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. RyanTMandFrederik Rietdijk 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. RyanTMandFrederik Rietdijk 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
R. RyanTMandFrederik Rietdijk 29c1c9d939 synthv1: 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/synthv1/versions
 2019-06-23 14:11:58 +02:00
R. RyanTMandFrederik Rietdijk c0148f53fc units: 2.18 -> 2.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/units/versions
 2019-06-23 14:11:41 +02:00
Jörg ThalheimandGitHub 9336f941ea vimPlugins.camelcasemotion: init at 2019-06-06 (#63683) 
vimPlugins.camelcasemotion: init at 2019-06-06
 2019-06-23 13:02:48 +01:00
Jörg ThalheimandGitHub 508d802c64 Merge pull request #62947 from Synthetica9/waybar068 
waybar: 0.6.7 -> 0.7.0
 2019-06-23 13:01:42 +01:00
Jörg ThalheimandGitHub 9e09baac83 vimPlugins.tmux-complete-vim: init at 2019-05-13 (#63684) 
vimPlugins.tmux-complete-vim: init at 2019-05-13
 2019-06-23 12:59:13 +01:00
Jörg ThalheimandGitHub 024db43e87 Merge pull request #63648 from doronbehar/package-sccache 
sccache: init at 0.2.8
 2019-06-23 12:58:51 +01:00
Tim Steinbach ad1ead12c5 linux: 5.2-rc5 -> 5.2-rc6 2019-06-23 07:38:23 -04:00
Patrick Hilhorst 0e8b303b81 waybar: 0.6.9 -> 0.7.0 2019-06-23 12:38:35 +02:00
Minijackson 3b7972aa51 vimPlugins.tmux-complete-vim: init at 2019-05-13 2019-06-23 11:11:05 +02:00
Minijackson c1b11c696e vimPlugins.camelcasemotion: init at 2019-06-06 2019-06-23 10:56:03 +02:00
Vladimír Čunát 0e405474d1 Merge #62280: xournalpp: 1.0.8 -> 1.0.12 2019-06-23 10:37:54 +02:00
Vladimír Čunát bc4e718db6 xournalpp nitpick: plugins do work now (reportedly) 2019-06-23 10:37:15 +02:00
Linus HeckemannandGitHub bd286ce6e5 Merge pull request #61826 from gnidorah/video2midi 
video2midi: init at 0.3.7
 2019-06-23 10:00:50 +02:00
Vladimír Čunát 772d2d03f9 Merge #63555: gnumeric: fix darwin build by upstream patch 2019-06-23 09:16:14 +02:00
Vladimír Čunát 12bdb0dc3f gnumeric: fix darwin build by upstream patch 2019-06-23 09:13:46 +02:00
arcnmxandFrederik Rietdijk 7d07263f75 Revert "python37Packages.aiorpcx: 0.17.0 -> 0.18.3" 
This reverts commit 299996bc38.
electrum, the only dependent package, failed to build with this.
 2019-06-23 08:54:39 +02:00
Doron Behar 50602eb299 Add darwin specific dependencies 2019-06-23 09:34:53 +03:00
Matthew BauerandWael Nasreddine 1f46aaab1b buildGoPackage: keep string context (#63680) 
In Nix, each string has a context that it carries of where it
originated. Some functions like filterAttrs modify the context of its
args when doing comparisons. That is important because we use the
string context of “name” to get where a derivation was defined. This
causes some builtins like unsafeGetAttrPos to report incorrectly that
the string was set in lib/attrsets.nix and reporting that as the
source file. Using removeAttrs avoids this problem.

Fixes #63679
 2019-06-22 19:07:26 -07:00
Eric BaileyandWael Nasreddine 2b5ba7f723 conftest: init at 0.7.0 (#63610) 2019-06-22 19:03:47 -07:00
Matthew BauerandGitHub 9d9b98cdfb Merge pull request #62891 from jtojnar/nixos-documentation-nixos-help-use-w3m-1-by-default 
nixos/documentation: nixos-help: use w3m(1) by default
 2019-06-22 21:37:22 -04:00