cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2
nixpkgs/pkgs/tools/misc
History
Michael Raskin 94205f5f21 Revert "Merge pull request #2449 from wkennington/master.grub" 
This reverts commit 469f22d717, reversing
changes made to 0078bc5d8f.

Conflicts:
	nixos/modules/installer/tools/nixos-generate-config.pl
	nixos/modules/system/boot/loader/grub/install-grub.pl
	nixos/release.nix
	nixos/tests/installer.nix

I tried to keep apparently-safe code in conflicts.
2014-08-31 12:58:37 +04:00
..
abduco Changed to correct license from licenses.* 2014-07-26 08:39:14 +08:00
aescrypt
apparix apparix: new package 2014-04-15 10:41:55 +02:00
appdata-tools appdata-tools: add new package 2014-05-20 13:41:39 +02:00
apt-offline apt-offline: set platforms to linux 2014-03-10 13:38:24 -07:00
arp-scan arp-scan: new package 2014-02-03 12:37:51 +01:00
autojump
autorandr Fix meta.maintainer -> meta.maintainers 2014-04-23 14:26:32 +02:00
aws-mturk-clt Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
bc
bfr Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
bmon
bogofilter Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
byobu
cloc cloc: update to 1.62 2014-08-29 12:21:52 +01:00
colord colord: Update to 1.1.7 and copy bash completions. 2014-08-20 01:53:46 +02:00
colord-gtk gnome3.gnome_control_center: build and fix runtime deps 2014-02-08 12:30:23 +01:00
colord-kde Add colord-kde. 2014-08-20 01:54:45 +02:00
convmv convmv: add meta.description 2014-06-22 23:03:36 +02:00
coreutils Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
cowsay
cpuminer cpuminer: update from 2.3.3 to 2.4 and build with -O3 as described in the installation instructions 2014-07-17 00:15:44 +02:00
cpuminer-multi cpuminer-multi: initial expression 2014-08-27 12:47:36 +02:00
cunit Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
cv added cv: Tool that shows the progress of coreutils programs 2014-07-20 15:45:19 +02:00
dbacl
debian-devscripts Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
debootstrap Merge remote-tracking branch 'origin/master' into staging. 2014-08-04 16:51:47 +02:00
desktop-file-utils
detox Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
direnv Update direnv to v2.4.0 2014-07-08 00:20:21 +02:00
disper
dmg2img
dtach
dvtm dvtm: update from 0.11 to 0.12 2014-07-14 15:40:09 +02:00
emv emv: perl isn't needed after all 2014-07-25 10:26:44 +02:00
ethtool ethtool: update from 3.13 to 3.14 2014-05-27 21:28:40 +02:00
execline execline: new package 2014-08-22 23:40:52 -05:00
expect
fasd Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
fdupes Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
figlet
file file: fails to build on darwin 2014-08-09 14:37:03 +02:00
fileschanged Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
findutils Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
flashrom Adding flashrom BIOS update utility. Patch by Edward O'Callaghan 2014-08-29 01:27:28 +04:00
fontforge
fortune
g500-control
gbdfed gbdfed: add package 1.6 2014-07-13 19:22:10 +08:00
getopt
gnokii
gnuvd
goaccess Fix many package descriptions 2014-08-24 22:31:37 +02:00
gparted Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
grc
grub Revert "Merge pull request #2449 from wkennington/master.grub" 2014-08-31 12:58:37 +04:00
gsmartcontrol Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
gummiboot Update gummiboot to the latest 2014-06-30 11:05:40 +04:00
hddtemp Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
hdf5 hdf5: Optional enableShared flag 2014-07-18 22:41:56 +02:00
heimdall Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
i3minator i3minator: 0.0.3 -> 0.0.4 2014-02-23 16:57:44 +01:00
idutils Fix many package descriptions 2014-08-24 22:31:37 +02:00
ised
jdiskreport Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
kalibrate-rtl kalibrate-rtl: new package 2014-07-23 22:47:41 +02:00
kde-gtk-config Claim maintainership of recently added packages 2014-03-07 11:23:30 -06:00
kermit Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
keychain Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
lbdb Fix many package descriptions 2014-08-24 22:31:37 +02:00
ldapvi Fix many package descriptions 2014-08-24 22:31:37 +02:00
less less: Build on Darwin 2014-01-28 12:10:27 +01:00
lockfile-progs Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
logstash Don't use ensureDir 2014-07-22 11:01:32 +02:00
logstash-forwarder logstash_forwarder: specify platforms 2014-08-25 14:55:14 +02:00
lrzsz lrzsz: Add derivation 2014-07-23 20:27:12 +02:00
man
man-db man-db: Upgrade package from 2.5.1 -> 2.6.6 2014-02-15 12:17:06 +01:00
mc Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
mcrl
mcrl2
mcrypt Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
mdbtools Update MDBTools Git version 2014-04-12 19:29:40 +04:00
megacli Merge remote-tracking branch 'origin/master' into staging. 2014-08-04 16:51:47 +02:00
memtest86 memtest86: update from 4.1.0 to 4.3.3 2014-02-24 22:04:40 +01:00
memtest86+
minicom Fix many package descriptions 2014-08-24 22:31:37 +02:00
mktorrent Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
mmv
most Fix many package descriptions 2014-08-24 22:31:37 +02:00
mssys Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
multitail Merge 'staging' into master 2014-08-08 20:13:23 +02:00
mysql2pgsql Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
ncdu ncdu: update from 1.8 to 1.10 2014-02-27 18:49:28 +02:00
ngrok fetchbzr, fetchdarcs, fetchhg: use rev attr 2014-06-28 21:06:10 +02:00
openopc openopc: new package 2014-07-21 18:43:33 +02:00
pal Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
parallel parallel: Update to 20140822. 2014-08-28 13:02:37 +02:00
parcellite Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
parted Fix many package descriptions 2014-08-24 22:31:37 +02:00
partition-manager Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
pastebinit pastebinit: new package 2014-04-06 11:10:24 +02:00
pg_top Fix many package descriptions 2014-08-24 22:31:37 +02:00
picocom Merge remote-tracking branch 'origin/master' into staging. 2014-08-04 16:51:47 +02:00
pk2cmd Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
plantuml plantuml: update 7982 -> 7991 2014-02-16 10:31:24 +01:00
plowshare plowshare: version bump 2014-08-15 00:25:45 +02:00
ponysay Update to ponysay version 3.0.2. 2014-08-19 19:43:48 +01:00
proxytunnel Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
pv Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
qjoypad
recutils Fix many package descriptions 2014-08-24 22:31:37 +02:00
remind Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
renameutils
riemann-c-client riemann-c-client: Update from 1.2.0 to 1.2.1 2014-08-20 16:04:10 +02:00
rkflashtool Another attempt to eradicate ensureDir 2014-06-30 14:56:10 +02:00
rlwrap
rmlint
rockbox-utility
rrdtool Mark a bunch of packages as broken or not supported on Darwin 2014-08-08 17:59:02 +02:00
screen nixpkgs: Bump screen to 4.2.1 2014-05-08 16:25:27 +02:00
screenfetch add screenfetch 2014-05-27 07:13:44 -04:00
shebangfix
sl sl: fix license (close #3072) 2014-08-14 21:28:33 +02:00
slsnif Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
smc
stow Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
sutils Add the bspwm window manager to Nix. 2014-08-12 18:22:15 +02:00
system-config-printer put systemd unit dirs on the right place 2014-03-13 21:44:51 +01:00
t1utils Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
testdisk Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
time Fix many package descriptions 2014-08-24 22:31:37 +02:00
timidity Revert "Remove obsolete jackaudio version 1." 2014-07-31 12:52:29 +02:00
tmpwatch Fix many package descriptions 2014-08-24 22:31:37 +02:00
tmux Fix many package descriptions 2014-08-24 22:31:37 +02:00
ttf2pt1
ttmkfdir
txt2man
unclutter
units units: update from 2.02 to 2.10 2014-04-03 07:46:21 +03:00
usbmuxd
uucp Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
venus
vfdecrypt
vorbisgain
w3c-css-validator
wv
wv2 Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
xburst-tools Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
xclip xclip: fixed broken homepage link 2014-08-08 11:20:32 +02:00
xdaliclock Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
xdo Add the bspwm window manager to Nix. 2014-08-12 18:22:15 +02:00
xdummy Add new package xdummy, a dummy X server. 2014-08-01 05:49:14 +02:00
xmltv
xsel xsel: update from 0.9.6 to 1.2.0 2014-03-03 11:10:27 +01:00
xtitle Add the bspwm window manager to Nix. 2014-08-12 18:22:15 +02:00
xvfb-run
yad Fix many package descriptions 2014-08-24 22:31:37 +02:00
youtube-dl youtube-dl: update to 2014.08.10 2014-08-11 08:57:38 +02:00