1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-09-11 15:08:33 +01:00
nixpkgs/pkgs/shells
Vladimír Čunát 985d1ac425
Merge branch 'master' into staging-next
There were several more conflicts from name -> pname+version;
all auto-solved by kdiff3, hopefully OK.

Hydra nixpkgs: ?compare=1538611
2019-08-25 14:57:11 +02:00
..
any-nix-shell treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
bash Merge branch 'master' into staging-next 2019-08-25 14:57:11 +02:00
dash
dgsh treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
elvish elvish: a small fixup (#54531) 2019-01-26 14:25:20 +00:00
es treewide: name -> pname 2019-08-17 10:54:38 +00:00
fish treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
ion treewide: update cargoSha256 hashes for cargo-vendor upgrade 2019-06-01 15:17:52 +00:00
jush jush: init at 0.1 2019-04-30 23:41:58 -05:00
ksh treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
mksh treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
oh treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
oil treewide: name -> pname 2019-08-17 10:54:38 +00:00
pash
powershell Merge branch 'master' into staging-next 2019-08-24 08:55:37 +02:00
rc treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
rssh treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
rush rush: 1.9 -> 2.1 2019-07-16 13:58:03 -07:00
tcsh treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
xonsh xonsh: 0.9.9 -> 0.9.10 2019-08-20 22:46:33 -07:00
zsh treewide: name -> pname 2019-08-17 10:54:38 +00:00