JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
38f2c19324
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 aescrypt: limit meta.hydraPlatforms to Linux 2013-12-06 19:29:22 +01:00
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 Some description fixes 2013-10-05 19:36:23 +02:00
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 Apply patch taken from http://www.linuxfromscratch.org/blfs/view/svn/general/bc.html 2011-01-06 03:11:25 +00:00
bfr Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
bmon bmon: new package 2013-07-25 12:43:40 +02:00
bogofilter Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
byobu byobu: update from 5.37 to 5.68 2013-12-18 18:18:20 +02:00
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 Add cowsay to the channel 2013-01-30 12:52:07 +01:00
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 Added i3wm. Added newer version of file. (this time tested, I screwed up a patch by garbas) 2012-04-30 14:34:57 +00:00
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 desktop_file_utils: update 2013-11-17 15:14:20 +01:00
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 disper: update from 0.3.0 to 0.3.1 2013-12-18 18:18:24 +02:00
dmg2img dmg2img: update from 1.6.4 to 1.6.5 2013-12-15 11:40:25 +02:00
dtach * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless 2012-01-18 20:16:00 +00:00
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 expect: fix build on freebsd? (close #981) 2013-09-18 20:50:13 +02:00
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 figlet: update from 2.2.4 to 2.2.5 2013-12-18 18:18:27 +02:00
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 A kludge to avoid removal of zlib from RPATH -- needed for LilyPond build 2012-02-06 05:49:27 +00:00
fortune * Fortune: use a "-" instead of a "_" to separate the package name 2012-06-12 23:41:05 +00:00
g500-control g500-control: Add myself as maintainer 2013-11-29 11:47:00 +01:00
gbdfed gbdfed: add package 1.6 2014-07-13 19:22:10 +08:00
getopt nixos.org/tarballs -> tarballs.nixos.org 2013-06-25 14:12:16 +02:00
gnokii Update gnokii 2012-12-04 10:20:42 +04:00
gnuvd gnuvd: update from 1.0.10 to 1.0.12 2013-12-12 03:11:35 +02:00
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 Remove "v" prefix from package versions to make them machine-readable 2014-01-10 10:16:41 +02:00
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 ised: update from 2.2.2 to 2.5.0 2013-12-15 13:11:20 +02:00
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: Prefer /etc/man.conf over $out/lib/man.conf. Man only reads 2012-03-06 10:14:00 +00:00
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 * added mCRL 2009-06-05 13:32:39 +00:00
mcrl2 * libX11 dep MCRL2 2009-06-07 16:17:49 +00:00
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+ memtest86+: Remove bogus executable bit 2013-10-02 12:32:12 +02:00
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 mmv: New package, version 1.01b from Debian. 2012-09-10 19:54:53 +02:00
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 * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless 2012-01-18 20:16:00 +00:00
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 renameutils: fix version to match tarball 2013-07-14 02:08:53 +03:00
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 Patch rlwrap to support high-bit characters 2010-12-17 10:56:35 +00:00
rmlint Revert "fix rmlint" 2013-06-29 19:12:11 +02:00
rockbox-utility rockbox-utility: upgrade 1.3.1 -> 1.4.0 2014-01-22 06:40:32 +01:00
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 * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless 2012-01-18 20:16:00 +00:00
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 Replace lib/java -> share/java 2014-01-09 13:01:38 +01:00
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 Even more mirror:// fixes 2013-07-14 04:17:07 +03:00
ttmkfdir ttmkfdir: update URL (close #1244) 2013-11-20 22:48:12 +01:00
txt2man txt2man: new package 2013-06-06 19:15:18 +02:00
unclutter More description fixes 2013-10-06 12:01:38 +02:00
units units: update from 2.02 to 2.10 2014-04-03 07:46:21 +03:00
usbmuxd Rename buildNativeInputs -> nativeBuildInputs 2012-12-28 19:20:09 +01:00
uucp Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
venus More description fixes 2013-10-06 12:01:38 +02:00
vfdecrypt vfdecrypt: fix source location 2013-07-19 07:30:17 +03:00
vorbisgain Add vorbisgain - replaygain for ogg/vorbis 2011-03-06 16:07:37 +00:00
w3c-css-validator Mark more packages as broken 2013-11-04 21:11:00 +01:00
wv * Get rid of many instances of "args: with args;", and other coding 2010-07-28 11:55:54 +00:00
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 Mark more packages as broken 2013-11-04 21:11:00 +01:00
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 xvfb-run: add some runtime dependencies to wrapper, set FONTCONFIG_FILE 2012-08-07 03:27:00 +02:00
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