Vladimír Čunát
65a9fa8cdc
Merge branch 'master' into staging
2016-05-08 21:24:48 +02:00
Tuomas Tynkkynen
aadaa91379
Merge remote-tracking branch 'upstream/master' into staging
...
Conflicts:
pkgs/applications/networking/browsers/vivaldi/default.nix
pkgs/misc/emulators/wine/base.nix
2016-05-03 23:12:48 +03:00
Alexander Ried
a0a6a3df88
libcap: Move old libcap_* aliases to aliases.nix
2016-05-03 19:52:53 +02:00
Tobias Geerinckx-Rice
aa8bc97dd6
git-hub -> gitAndTools.git-hub (with alias)
2016-04-29 21:42:35 +02:00
Tobias Geerinckx-Rice
730d488a12
claws-mail: rename from (and alias to) clawsMail
2016-04-29 04:38:54 +02:00
Tuomas Tynkkynen
7f63790f25
fuse-zip: Add dashed variant (and one with underscore for compat)
2016-04-27 04:19:16 +03:00
Nikolay Amiantov
09f02b918e
Merge branch 'master' of git://github.com/NixOS/nixpkgs into staging
2016-04-25 18:02:10 +03:00
Thomas Tuegel
48195dd2be
aliases: remove phonon aliases
2016-04-22 08:21:15 -05:00
Tuomas Tynkkynen
0f8a49bb45
module_init_tools: Remove
...
It is deprecated doesn't handle compressed modules, unlike its modern
counterpart kmod.
Add a compatibility alias to kmod for now in case someone is depending
on this in their scripts.
2016-04-22 10:44:55 +03:00
Franz Pletz
e498a645c1
ncat: Remove old package, available in nmap
2016-03-30 08:53:22 +02:00
Nicolas B. Pierron
5d6a4a6fa9
Merge pull request #14000 from nbp/fix-extend
...
Use fix and extends functions for all-packages.nix
2016-03-24 20:54:20 +01:00
Nicolas B. Pierron
87ad35e336
Fix comments typos.
2016-03-24 19:40:12 +00:00
Tobias Geerinckx-Rice
99c4f143d9
debian-devscripts: rename from deprecated debian_devscripts
2016-03-24 20:24:00 +01:00
Nicolas B. Pierron
a09683ed29
Remove unused 'ncat' alias, as a package with the same name already exists.
2016-03-20 14:51:20 +00:00
Nicolas B. Pierron
0b67f7cb5d
Move tweakAlias function into the aliases.nix file, and rename it.
2016-03-20 14:50:27 +00:00
zimbatm
5a64bc44ea
move all ruby modules to development/ruby-modules
2016-03-19 22:06:26 +00:00
Nicolas B. Pierron
89f7dcaa21
Move all aliases into their own file.
2016-03-18 21:22:27 +00:00
