From 9d67ff2a4830343197378dc84e8dec93d941c4b9 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Sat, 28 Jan 2012 13:06:07 +0000 Subject: [PATCH 01/77] Remove glib-1.x and its reverse dependencies Nobody told me that he uses generator or xmms, so I'm removing this old stuff. svn path=/nixpkgs/trunk/; revision=31907 --- pkgs/applications/audio/xmms/alsa.patch | 1475 ----------------- pkgs/applications/audio/xmms/default.nix | 21 - pkgs/development/libraries/glib/1.2.x.nix | 12 - pkgs/development/libraries/glib/gcc34.patch | 20 - pkgs/development/libraries/gtk+/1.2.x.nix | 12 - pkgs/misc/emulators/generator/default.nix | 13 - pkgs/misc/emulators/generator/soundcard.patch | 20 - pkgs/top-level/all-packages.nix | 18 - 8 files changed, 1591 deletions(-) delete mode 100644 pkgs/applications/audio/xmms/alsa.patch delete mode 100644 pkgs/applications/audio/xmms/default.nix delete mode 100644 pkgs/development/libraries/glib/1.2.x.nix delete mode 100644 pkgs/development/libraries/glib/gcc34.patch delete mode 100644 pkgs/development/libraries/gtk+/1.2.x.nix delete mode 100644 pkgs/misc/emulators/generator/default.nix delete mode 100644 pkgs/misc/emulators/generator/soundcard.patch diff --git a/pkgs/applications/audio/xmms/alsa.patch b/pkgs/applications/audio/xmms/alsa.patch deleted file mode 100644 index 62cf7354fd2..00000000000 --- a/pkgs/applications/audio/xmms/alsa.patch +++ /dev/null @@ -1,1475 +0,0 @@ -diff -rc xmms-1.2.10-orig/Output/alsa/alsa.h xmms-1.2.10/Output/alsa/alsa.h -*** xmms-1.2.10-orig/Output/alsa/alsa.h 2004-01-11 17:27:26.000000000 +0100 ---- xmms-1.2.10/Output/alsa/alsa.h 2006-01-27 00:28:49.000000000 +0100 -*************** -*** 50,57 **** - char *mixer_device; - int buffer_time; - int period_time; - gboolean debug; -- gboolean mmap; - struct - { - int left, right; ---- 50,57 ---- - char *mixer_device; - int buffer_time; - int period_time; -+ int thread_buffer_time; - gboolean debug; - struct - { - int left, right; -*************** -*** 65,72 **** - void alsa_about(void); - void alsa_configure(void); - int alsa_get_mixer(snd_mixer_t **mixer, int card); -- snd_mixer_elem_t* alsa_get_mixer_elem(snd_mixer_t *mixer, char *name, int index); -- int alsa_setup_mixer(void); - void alsa_save_config(void); - - void alsa_get_volume(int *l, int *r); ---- 65,70 ---- -diff -rc xmms-1.2.10-orig/Output/alsa/audio.c xmms-1.2.10/Output/alsa/audio.c -*** xmms-1.2.10-orig/Output/alsa/audio.c 2004-01-28 00:09:39.000000000 +0100 ---- xmms-1.2.10/Output/alsa/audio.c 2006-01-27 00:28:49.000000000 +0100 -*************** -*** 17,52 **** - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ - - #include "alsa.h" - #include - #include - - static snd_pcm_t *alsa_pcm = NULL; -- static snd_pcm_status_t *alsa_status = NULL; -- static snd_pcm_channel_area_t *areas = NULL; - - static snd_output_t *logs = NULL; - -! static int alsa_bps = 0; -! static guint64 alsa_total_written = 0; - - /* Set/Get volume */ - static snd_mixer_elem_t *pcm_element = NULL; - static snd_mixer_t *mixer = NULL; - -! static gboolean mmap, force_start, going, paused; - -! static gpointer buffer; - -- static int alsa_can_pause; - - struct snd_format { - unsigned int rate; - unsigned int channels; - snd_pcm_format_t format; - AFormat xmms_format; - }; - - static struct snd_format *inputf = NULL; ---- 17,72 ---- - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -+ * -+ * -+ * CHANGES -+ * -+ * 2005.01.05 Takashi Iwai -+ * Impelemented the multi-threaded mode with an audio-thread. -+ * Many fixes and cleanups. - */ - - #include "alsa.h" - #include -+ #include - #include - - static snd_pcm_t *alsa_pcm = NULL; - - static snd_output_t *logs = NULL; - -! static guint64 alsa_total_written = 0; /* input bytes */ -! static guint64 alsa_hw_written = 0; /* output bytes */ -! static gint output_time_offset = 0; -! -! /* device buffer/period sizes in bytes */ -! static int hw_buffer_size, hw_period_size; /* in output bytes */ -! static int hw_buffer_size_in, hw_period_size_in; /* in input bytes */ - - /* Set/Get volume */ - static snd_mixer_elem_t *pcm_element = NULL; - static snd_mixer_t *mixer = NULL; - -! static gboolean going, paused; - -! static gboolean alsa_can_pause; -! -! /* for audio thread */ -! static pthread_t audio_thread; /* audio loop thread */ -! static int thread_buffer_size; /* size of intermediate buffer in bytes */ -! static char *thread_buffer; /* audio intermediate buffer */ -! static int rd_index, wr_index; /* current read/write position in int-buffer */ -! static gboolean pause_request; /* pause status currently requested */ -! static gint flush_request; /* flush status (time) currently requested */ - - - struct snd_format { - unsigned int rate; - unsigned int channels; - snd_pcm_format_t format; - AFormat xmms_format; -+ int sample_bits; -+ int bps; - }; - - static struct snd_format *inputf = NULL; -*************** -*** 54,61 **** - static struct snd_format *outputf = NULL; - - static int alsa_setup(struct snd_format *f); -! static void alsa_mmap_audio(char *data, int length); -! static void alsa_write_audio(gpointer data, int length); - - static struct snd_format * snd_format_from_xmms(AFormat fmt, int rate, int channels); - ---- 74,80 ---- - static struct snd_format *outputf = NULL; - - static int alsa_setup(struct snd_format *f); -! static void alsa_write_audio(char *data, int length); - - static struct snd_format * snd_format_from_xmms(AFormat fmt, int rate, int channels); - -*************** -*** 71,92 **** - } format_table[] = - {{FMT_S16_LE, SND_PCM_FORMAT_S16_LE}, - {FMT_S16_BE, SND_PCM_FORMAT_S16_BE}, -! {FMT_S16_NE, -! #ifdef WORDS_BIGENDIAN -! SND_PCM_FORMAT_S16_BE -! #else -! SND_PCM_FORMAT_S16_LE -! #endif -! }, - {FMT_U16_LE, SND_PCM_FORMAT_U16_LE}, - {FMT_U16_BE, SND_PCM_FORMAT_U16_BE}, -! {FMT_U16_NE, -! #ifdef WORDS_BIGENDIAN -! SND_PCM_FORMAT_U16_BE -! #else -! SND_PCM_FORMAT_U16_LE -! #endif -! }, - {FMT_U8, SND_PCM_FORMAT_U8}, - {FMT_S8, SND_PCM_FORMAT_S8}, - }; ---- 90,99 ---- - } format_table[] = - {{FMT_S16_LE, SND_PCM_FORMAT_S16_LE}, - {FMT_S16_BE, SND_PCM_FORMAT_S16_BE}, -! {FMT_S16_NE, SND_PCM_FORMAT_S16}, - {FMT_U16_LE, SND_PCM_FORMAT_U16_LE}, - {FMT_U16_BE, SND_PCM_FORMAT_U16_BE}, -! {FMT_U16_NE, SND_PCM_FORMAT_U16}, - {FMT_U8, SND_PCM_FORMAT_U8}, - {FMT_S8, SND_PCM_FORMAT_S8}, - }; -*************** -*** 106,281 **** - } - } - -! int alsa_playing(void) -! { -! if (!going || paused) -! return FALSE; -! -! return(snd_pcm_state(alsa_pcm) == SND_PCM_STATE_RUNNING); -! } -! -! static void xrun_recover(void) -! { -! int err; -! -! if (alsa_cfg.debug) -! { -! snd_pcm_status_alloca(&alsa_status); -! if ((err = snd_pcm_status(alsa_pcm, alsa_status)) < 0) -! g_warning("xrun_recover(): snd_pcm_status() failed"); -! else -! { -! printf("Status:\n"); -! snd_pcm_status_dump(alsa_status, logs); -! } -! } -! -! if (snd_pcm_state(alsa_pcm) == SND_PCM_STATE_XRUN) -! { -! if ((err = snd_pcm_prepare(alsa_pcm)) < 0) -! g_warning("xrun_recover(): snd_pcm_prepare() failed."); -! } -! } -! -! static snd_pcm_sframes_t alsa_get_avail(void) -! { -! snd_pcm_sframes_t ret; -! if ((ret = snd_pcm_avail_update(alsa_pcm)) == -EPIPE) -! xrun_recover(); -! else if (ret < 0) -! { -! g_warning("alsa_get_avail(): snd_pcm_avail_update() failed: %s", -! snd_strerror(-ret)); -! return 0; -! } -! else -! return ret; -! if ((ret = snd_pcm_avail_update(alsa_pcm)) < 0) -! { -! g_warning("alsa_get_avail(): snd_pcm_avail_update() failed: %s", -! snd_strerror(-ret)); -! return 0; -! } -! return ret; -! } -! -! int alsa_free(void) -! { -! if (paused) -! return 0; -! else -! { -! int err; -! if (force_start && -! snd_pcm_state(alsa_pcm) == SND_PCM_STATE_PREPARED) -! { -! if ((err = snd_pcm_start(alsa_pcm)) < 0) -! g_warning("alsa_free(): snd_pcm_start() " -! "failed: %s", snd_strerror(-err)); -! else -! debug("Stream started"); -! } -! force_start = TRUE; -! -! return snd_pcm_frames_to_bytes(alsa_pcm, alsa_get_avail()); -! } -! } -! -! void alsa_pause(short p) -! { -! debug("alsa_pause"); -! if (p) -! paused = TRUE; -! -! if (alsa_can_pause) -! snd_pcm_pause(alsa_pcm, p); -! else if (p) -! snd_pcm_drop(alsa_pcm); -! -! if (!p) -! paused = FALSE; -! } -! -! void alsa_close(void) -! { -! int err, started; -! -! debug("Closing device"); -! -! started = going; -! going = 0; -! -! pcm_element = NULL; -! -! if (mixer) -! { -! snd_mixer_close(mixer); -! mixer = NULL; -! } -! -! if (alsa_pcm != NULL) -! { -! if (started) -! if ((err = snd_pcm_drop(alsa_pcm)) < 0) -! g_warning("alsa_pcm_drop() failed: %s", -! snd_strerror(-err)); -! -! if ((err = snd_pcm_close(alsa_pcm)) < 0) -! g_warning("alsa_pcm_close() failed: %s", -! snd_strerror(-err)); -! alsa_pcm = NULL; -! } -! -! if (mmap) { -! g_free(buffer); -! buffer = NULL; -! -! g_free(areas); -! areas = NULL; -! } -! -! xmms_convert_buffers_destroy(convertb); -! convertb = NULL; -! g_free(inputf); -! inputf = NULL; -! g_free(effectf); -! effectf = NULL; -! -! alsa_save_config(); -! -! debug("Device closed"); -! } -! -! static void alsa_reopen(struct snd_format *f) -! { -! unsigned int tmp = alsa_get_written_time(); -! -! if (alsa_pcm != NULL) -! { -! snd_pcm_close(alsa_pcm); -! alsa_pcm = NULL; -! } -! -! if (mmap) { -! g_free(buffer); -! buffer = NULL; -! -! g_free(areas); -! areas = NULL; -! } -! -! if (alsa_setup(f) < 0) -! g_warning("Failed to reopen the audio device"); -! -! alsa_total_written = tmp; -! snd_pcm_prepare(alsa_pcm); -! } -! -! void alsa_flush(int time) -! { -! alsa_total_written = (guint64) time * alsa_bps / 1000; -! } -! - static void parse_mixer_name(char *str, char **name, int *index) - { - char *end; ---- 113,121 ---- - } - } - -! /* -! * mixer stuff -! */ - static void parse_mixer_name(char *str, char **name, int *index) - { - char *end; -*************** -*** 337,343 **** - } - - -! snd_mixer_elem_t* alsa_get_mixer_elem(snd_mixer_t *mixer, char *name, int index) - { - snd_mixer_selem_id_t *selem_id; - snd_mixer_elem_t* elem; ---- 177,183 ---- - } - - -! static snd_mixer_elem_t* alsa_get_mixer_elem(snd_mixer_t *mixer, char *name, int index) - { - snd_mixer_selem_id_t *selem_id; - snd_mixer_elem_t* elem; -*************** -*** 353,359 **** - return elem; - } - -! int alsa_setup_mixer(void) - { - char *name; - long int a, b; ---- 193,199 ---- - return elem; - } - -! static int alsa_setup_mixer(void) - { - char *name; - long int a, b; -*************** -*** 406,411 **** ---- 246,260 ---- - return 0; - } - -+ static void alsa_cleanup_mixer(void) -+ { -+ pcm_element = NULL; -+ if (mixer) { -+ snd_mixer_close(mixer); -+ mixer = NULL; -+ } -+ } -+ - void alsa_get_volume(int *l, int *r) - { - static gboolean first = TRUE; -*************** -*** 461,485 **** - } - - - int alsa_get_output_time(void) - { - snd_pcm_sframes_t delay; -! ssize_t db = 0; - -! if (!going) - return 0; - -! if (!snd_pcm_delay(alsa_pcm, &delay)) -! db = snd_pcm_frames_to_bytes(alsa_pcm, delay); -! -! if (db < alsa_total_written) -! return ((alsa_total_written - db) * 1000 / alsa_bps); -! return 0; - } - - int alsa_get_written_time(void) - { -! return (alsa_total_written * 1000 / alsa_bps); - } - - #define STEREO_ADJUST(type, type2, endian) \ ---- 310,512 ---- - } - - -+ /* -+ * audio stuff -+ */ -+ -+ int alsa_playing(void) -+ { -+ if (!going || paused || alsa_pcm == NULL) -+ return FALSE; -+ -+ return(snd_pcm_state(alsa_pcm) == SND_PCM_STATE_RUNNING); -+ } -+ -+ -+ /* handle generic errors */ -+ static int alsa_handle_error(int err) -+ { -+ switch (err) { -+ case -EPIPE: /* XRUN */ -+ if (alsa_cfg.debug) { -+ snd_pcm_status_t *alsa_status; -+ snd_pcm_status_alloca(&alsa_status); -+ if (snd_pcm_status(alsa_pcm, alsa_status) < 0) -+ g_warning("xrun_recover(): snd_pcm_status() failed"); -+ else { -+ printf("Status:\n"); -+ snd_pcm_status_dump(alsa_status, logs); -+ } -+ } -+ return snd_pcm_prepare(alsa_pcm); -+ -+ case -ESTRPIPE: /* suspend */ -+ while ((err = snd_pcm_resume(alsa_pcm)) == -EAGAIN) -+ sleep(1); /* wait until suspend flag is released */ -+ if (err < 0) { -+ g_warning("suspend_recover(): snd_pcm_resume() failed."); -+ return snd_pcm_prepare(alsa_pcm); -+ } -+ break; -+ } -+ -+ return err; -+ } -+ -+ /* update and get the available space on h/w buffer (in frames) */ -+ static snd_pcm_sframes_t alsa_get_avail(void) -+ { -+ snd_pcm_sframes_t ret; -+ -+ if (alsa_pcm == NULL) -+ return 0; -+ -+ while ((ret = snd_pcm_avail_update(alsa_pcm)) < 0) { -+ ret = alsa_handle_error(ret); -+ if (ret < 0) { -+ g_warning("alsa_get_avail(): snd_pcm_avail_update() failed: %s", -+ snd_strerror(-ret)); -+ return 0; -+ } -+ } -+ return ret; -+ } -+ -+ /* do pause operation */ -+ static void alsa_do_pause(gboolean p) -+ { -+ if (paused == p) -+ return; -+ -+ if (alsa_pcm) { -+ if (alsa_can_pause) { -+ snd_pcm_pause(alsa_pcm, p); -+ } else if (p) { -+ snd_pcm_drop(alsa_pcm); -+ snd_pcm_prepare(alsa_pcm); -+ } -+ } -+ paused = p; -+ } -+ -+ void alsa_pause(short p) -+ { -+ debug("alsa_pause"); -+ pause_request = p; -+ } -+ -+ /* close PCM and release associated resources */ -+ static void alsa_close_pcm(void) -+ { -+ if (alsa_pcm) { -+ int err; -+ snd_pcm_drop(alsa_pcm); -+ if ((err = snd_pcm_close(alsa_pcm)) < 0) -+ g_warning("alsa_pcm_close() failed: %s", -+ snd_strerror(-err)); -+ alsa_pcm = NULL; -+ } -+ } -+ -+ /* reopen ALSA PCM */ -+ static int alsa_reopen(struct snd_format *f) -+ { -+ /* remember the current position */ -+ output_time_offset += (alsa_hw_written * 1000) / outputf->bps; -+ alsa_hw_written = 0; -+ -+ alsa_close_pcm(); -+ -+ return alsa_setup(f); -+ } -+ -+ /* do flush (drop) operation */ -+ static void alsa_do_flush(int time) -+ { -+ if (alsa_pcm) { -+ snd_pcm_drop(alsa_pcm); -+ snd_pcm_prepare(alsa_pcm); -+ } -+ /* correct the offset */ -+ output_time_offset = time; -+ alsa_total_written = (guint64) time * inputf->bps / 1000; -+ rd_index = wr_index = alsa_hw_written = 0; -+ } -+ -+ void alsa_flush(int time) -+ { -+ flush_request = time; -+ while (flush_request != -1) -+ xmms_usleep(10000); -+ } -+ -+ void alsa_close(void) -+ { -+ if (! going) -+ return; -+ -+ debug("Closing device"); -+ -+ going = 0; -+ -+ pthread_join(audio_thread, NULL); -+ -+ alsa_cleanup_mixer(); -+ -+ xmms_convert_buffers_destroy(convertb); -+ convertb = NULL; -+ g_free(inputf); -+ inputf = NULL; -+ g_free(effectf); -+ effectf = NULL; -+ g_free(outputf); -+ outputf = NULL; -+ -+ alsa_save_config(); -+ -+ if (alsa_cfg.debug) -+ snd_output_close(logs); -+ debug("Device closed"); -+ } -+ -+ /* return the size of audio data filled in the audio thread buffer */ -+ static int get_thread_buffer_filled(void) -+ { -+ int filled = wr_index - rd_index; -+ if (filled >= 0) -+ return filled; -+ return thread_buffer_size + filled; -+ } -+ -+ /* get the free space on buffer */ -+ int alsa_free(void) -+ { -+ return thread_buffer_size - get_thread_buffer_filled() - 1; -+ } -+ - int alsa_get_output_time(void) - { - snd_pcm_sframes_t delay; -! guint64 bytes = 0; - -! if (!going || alsa_pcm == NULL) - return 0; - -! if (!snd_pcm_delay(alsa_pcm, &delay)) { -! bytes = snd_pcm_frames_to_bytes(alsa_pcm, delay); -! if (alsa_hw_written < bytes) -! bytes = 0; -! else -! bytes = alsa_hw_written - bytes; -! } -! return output_time_offset + (bytes * 1000) / outputf->bps; - } - - int alsa_get_written_time(void) - { -! if (!going) -! return 0; -! return (alsa_total_written * 1000) / inputf->bps; - } - - #define STEREO_ADJUST(type, type2, endian) \ -*************** -*** 584,636 **** - } - - -! void alsa_write(gpointer data, int length) - { -! EffectPlugin *ep; - - if (paused) - return; - -! force_start = FALSE; -! -! if (effects_enabled() && (ep = get_current_effect_plugin())) -! { -! int new_freq = inputf->rate; -! int new_chn = inputf->channels; -! AFormat f = inputf->xmms_format; - -! if (ep->query_format) -! { -! ep->query_format(&f, &new_freq, &new_chn); -! -! if (f != effectf->xmms_format || -! new_freq != effectf->rate || -! new_chn != effectf->channels) -! { -! debug("Changing audio format for effect plugin"); -! -! g_free(effectf); -! effectf = snd_format_from_xmms(f, new_freq, -! new_chn); -! alsa_reopen(effectf); -! } -! -! } - - length = ep->mod_samples(&data, length, - inputf->xmms_format, - inputf->rate, - inputf->channels); - } -- else if (effectf) -- { -- g_free(effectf); -- effectf = NULL; -- effectf = snd_format_from_xmms(inputf->xmms_format, -- inputf->rate, -- inputf->channels); -- alsa_reopen(inputf); -- } - - if (alsa_convert_func != NULL) - length = alsa_convert_func(convertb, &data, length); ---- 611,657 ---- - } - - -! /* transfer data to audio h/w; length is given in bytes -! * -! * data can be modified via effect plugin, rate conversion or -! * software volume before passed to audio h/w -! */ -! static void alsa_do_write(gpointer data, int length) - { -! EffectPlugin *ep = NULL; -! int new_freq; -! int new_chn; -! AFormat f; - - if (paused) - return; - -! new_freq = inputf->rate; -! new_chn = inputf->channels; -! f = inputf->xmms_format; - -! if (effects_enabled() && (ep = get_current_effect_plugin()) && -! ep->query_format) -! ep->query_format(&f, &new_freq, &new_chn); - -+ if (f != effectf->xmms_format || new_freq != effectf->rate || -+ new_chn != effectf->channels) { -+ debug("Changing audio format for effect plugin"); -+ g_free(effectf); -+ effectf = snd_format_from_xmms(f, new_freq, new_chn); -+ if (alsa_reopen(effectf) < 0) { -+ /* fatal error... */ -+ alsa_close(); -+ return; -+ } -+ } -+ -+ if (ep) { - length = ep->mod_samples(&data, length, - inputf->xmms_format, - inputf->rate, - inputf->channels); - } - - if (alsa_convert_func != NULL) - length = alsa_convert_func(convertb, &data, length); -*************** -*** 644,656 **** - if (alsa_cfg.soft_volume) - volume_adjust(data, length, outputf->xmms_format, outputf->channels); - -! if (mmap) -! alsa_mmap_audio(data, length); -! else -! alsa_write_audio(data, length); - } - -! static void alsa_write_audio(gpointer data, int length) - { - snd_pcm_sframes_t written_frames; - ---- 665,693 ---- - if (alsa_cfg.soft_volume) - volume_adjust(data, length, outputf->xmms_format, outputf->channels); - -! alsa_write_audio(data, length); - } - -! /* write callback */ -! void alsa_write(gpointer data, int length) -! { -! int cnt; -! char *src = (char *)data; -! -! alsa_total_written += length; -! while (length > 0) { -! int wr; -! cnt = MIN(length, thread_buffer_size - wr_index); -! memcpy(thread_buffer + wr_index, src, cnt); -! wr = (wr_index + cnt) % thread_buffer_size; -! wr_index = wr; -! length -= cnt; -! src += cnt; -! } -! } -! -! /* transfer data to audio h/w via normal write */ -! static void alsa_write_audio(char *data, int length) - { - snd_pcm_sframes_t written_frames; - -*************** -*** 663,735 **** - { - int written = snd_pcm_frames_to_bytes(alsa_pcm, - written_frames); -- alsa_total_written += written; - length -= written; -! data = (char*) data + written; - } -! else if (written_frames == -EPIPE) -! xrun_recover(); -! else -! { -! g_warning("alsa_write_audio(): write error: %s", -! snd_strerror(-written_frames)); -! break; - } - } - } - -! static void alsa_mmap_audio(char *data, int length) - { -! int cnt = 0, err; -! snd_pcm_uframes_t offset, frames, frame; -! const snd_pcm_channel_area_t *chan_areas = areas; -! int channel_offset = 0, channel; -! ssize_t sample_size, offset_bytes, step; -! -! alsa_get_avail(); - -! while (length > 0) -! { -! frames = snd_pcm_bytes_to_frames(alsa_pcm, length); -! if ((err = snd_pcm_mmap_begin(alsa_pcm, &chan_areas, &offset, &frames) < 0)) -! g_warning("alsa_mmap_audio(): snd_pcm_mmap_begin() " -! "failed: %s", snd_strerror(-err)); -! -! cnt = snd_pcm_frames_to_bytes(alsa_pcm, frames); -! -! sample_size = snd_pcm_samples_to_bytes(alsa_pcm, 1); -! step = chan_areas[0].step / 8; -! offset_bytes = offset * step; - -! for (frame = 0; frame < frames; frame++) -! { -! for (channel = 0; channel < outputf->channels; channel++) -! { -! char *ptr = chan_areas[channel].addr; -! memcpy(ptr + chan_areas[channel].first / 8 + -! offset_bytes, -! data + channel_offset, sample_size); -! channel_offset += sample_size; - } -! offset_bytes += step; - } -- -- err = snd_pcm_mmap_commit(alsa_pcm, offset, frames); -- if (err == -EPIPE) -- xrun_recover(); -- else if (err < 0) -- g_warning("alsa_mmap_audio(): snd_pcm_mmap_commit() " -- "failed: %s", snd_strerror(-err)); -- else if (err != frames) -- g_warning("alsa_mmap_audio(): snd_pcm_mmap_commit " -- "returned %d, expected %d", err, (int)frames); -- -- alsa_total_written += cnt; -- -- length -= cnt; - } - } - - int alsa_open(AFormat fmt, int rate, int nch) - { - debug("Opening device"); ---- 700,785 ---- - { - int written = snd_pcm_frames_to_bytes(alsa_pcm, - written_frames); - length -= written; -! data += written; -! alsa_hw_written += written; - } -! else { -! int err = alsa_handle_error((int)written_frames); -! if (err < 0) { -! g_warning("alsa_write_audio(): write error: %s", -! snd_strerror(-err)); -! break; -! } - } - } - } - -! /* transfer audio data from thread buffer to h/w */ -! static void alsa_write_out_thread_data(void) - { -! gint length, cnt, avail; - -! length = MIN(hw_period_size_in, get_thread_buffer_filled()); -! avail = snd_pcm_frames_to_bytes(alsa_pcm, alsa_get_avail()); -! length = MIN(length, avail); -! while (length > 0) { -! int rd; -! cnt = MIN(length, thread_buffer_size - rd_index); -! alsa_do_write(thread_buffer + rd_index, cnt); -! rd = (rd_index + cnt) % thread_buffer_size; -! rd_index = rd; -! length -= cnt; -! } -! } - -! /* audio thread loop */ -! /* FIXME: proper lock? */ -! static void *alsa_loop(void *arg) -! { -! int npfds = snd_pcm_poll_descriptors_count(alsa_pcm); -! struct pollfd *pfds; -! unsigned short *revents; -! -! if (npfds <= 0) -! goto _error; -! pfds = alloca(sizeof(*pfds) * npfds); -! revents = alloca(sizeof(*revents) * npfds); -! while (going && alsa_pcm) { -! if (! paused && get_thread_buffer_filled() > hw_period_size_in) { -! snd_pcm_poll_descriptors(alsa_pcm, pfds, npfds); -! if (poll(pfds, npfds, 10) > 0) { -! /* need to check revents. poll() with dmix returns -! * a postive value even if no data is available -! */ -! int i; -! snd_pcm_poll_descriptors_revents(alsa_pcm, pfds, npfds, revents); -! for (i = 0; i < npfds; i++) -! if (revents[i] & POLLOUT) { -! alsa_write_out_thread_data(); -! break; -! } - } -! } else -! xmms_usleep(10000); -! -! if (pause_request != paused) -! alsa_do_pause(pause_request); -! -! if (flush_request != -1) { -! alsa_do_flush(flush_request); -! flush_request = -1; - } - } -+ -+ _error: -+ alsa_close_pcm(); -+ g_free(thread_buffer); -+ thread_buffer = NULL; -+ pthread_exit(NULL); - } - -+ /* open callback */ - int alsa_open(AFormat fmt, int rate, int nch) - { - debug("Opening device"); -*************** -*** 739,746 **** - if (alsa_cfg.debug) - snd_output_stdio_attach(&logs, stdout, 0); - -- mmap = alsa_cfg.mmap; -- - if (alsa_setup(inputf) < 0) - { - alsa_close(); ---- 789,794 ---- -*************** -*** 751,763 **** - - convertb = xmms_convert_buffers_new(); - -! alsa_total_written = 0; - going = TRUE; - paused = FALSE; -- force_start = FALSE; -- -- snd_pcm_prepare(alsa_pcm); - - return 1; - } - ---- 799,823 ---- - - convertb = xmms_convert_buffers_new(); - -! output_time_offset = 0; -! alsa_total_written = alsa_hw_written = 0; - going = TRUE; - paused = FALSE; - -+ thread_buffer_size = (guint64)alsa_cfg.thread_buffer_time * inputf->bps / 1000; -+ if (thread_buffer_size < hw_buffer_size) -+ thread_buffer_size = hw_buffer_size * 2; -+ if (thread_buffer_size < 8192) -+ thread_buffer_size = 8192; -+ thread_buffer_size += hw_buffer_size; -+ thread_buffer_size -= thread_buffer_size % hw_period_size; -+ thread_buffer = g_malloc0(thread_buffer_size); -+ wr_index = rd_index = 0; -+ pause_request = FALSE; -+ flush_request = -1; -+ -+ pthread_create(&audio_thread, NULL, alsa_loop, NULL); -+ - return 1; - } - -*************** -*** 787,792 **** ---- 847,854 ---- - - f->rate = rate; - f->channels = channels; -+ f->sample_bits = snd_pcm_format_physical_width(f->format); -+ f->bps = (rate * f->sample_bits * channels) >> 3; - - return f; - } -*************** -*** 806,812 **** - int err; - snd_pcm_hw_params_t *hwparams; - snd_pcm_sw_params_t *swparams; -! int alsa_buffer_time, bits_per_sample; - unsigned int alsa_period_time; - snd_pcm_uframes_t alsa_buffer_size, alsa_period_size; - ---- 868,874 ---- - int err; - snd_pcm_hw_params_t *hwparams; - snd_pcm_sw_params_t *swparams; -! int alsa_buffer_time; - unsigned int alsa_period_time; - snd_pcm_uframes_t alsa_buffer_size, alsa_period_size; - -*************** -*** 816,824 **** - alsa_stereo_convert_func = NULL; - alsa_frequency_convert_func = NULL; - -! outputf = snd_format_from_xmms(effectf->xmms_format, -! effectf->rate, -! effectf->channels); - - debug("Opening device: %s", alsa_cfg.pcm_device); - /* FIXME: Can snd_pcm_open() return EAGAIN? */ ---- 878,885 ---- - alsa_stereo_convert_func = NULL; - alsa_frequency_convert_func = NULL; - -! g_free(outputf); -! outputf = snd_format_from_xmms(f->xmms_format, f->rate, f->channels); - - debug("Opening device: %s", alsa_cfg.pcm_device); - /* FIXME: Can snd_pcm_open() return EAGAIN? */ -*************** -*** 829,838 **** - g_warning("alsa_setup(): Failed to open pcm device (%s): %s", - alsa_cfg.pcm_device, snd_strerror(-err)); - alsa_pcm = NULL; - return -1; - } -- snd_pcm_nonblock(alsa_pcm, FALSE); - - if (alsa_cfg.debug) - { - snd_pcm_info_t *info; ---- 890,903 ---- - g_warning("alsa_setup(): Failed to open pcm device (%s): %s", - alsa_cfg.pcm_device, snd_strerror(-err)); - alsa_pcm = NULL; -+ g_free(outputf); -+ outputf = NULL; - return -1; - } - -+ /* doesn't care about non-blocking */ -+ /* snd_pcm_nonblock(alsa_pcm, 0); */ -+ - if (alsa_cfg.debug) - { - snd_pcm_info_t *info; -*************** -*** 856,872 **** - return -1; - } - -! if (mmap && -! (err = snd_pcm_hw_params_set_access(alsa_pcm, hwparams, -! SND_PCM_ACCESS_MMAP_INTERLEAVED)) < 0) -! { -! g_message("alsa_setup(): Cannot set mmap'ed mode: %s. " -! "falling back to direct write", snd_strerror(-err)); -! mmap = 0; -! } -! -! if (!mmap && -! (err = snd_pcm_hw_params_set_access(alsa_pcm, hwparams, - SND_PCM_ACCESS_RW_INTERLEAVED)) < 0) - { - g_warning("alsa_setup(): Cannot set direct write mode: %s", ---- 921,927 ---- - return -1; - } - -! if ((err = snd_pcm_hw_params_set_access(alsa_pcm, hwparams, - SND_PCM_ACCESS_RW_INTERLEAVED)) < 0) - { - g_warning("alsa_setup(): Cannot set direct write mode: %s", -*************** -*** 894,910 **** - break; - } - } -! if (outputf->format != effectf->format) - { - outputf->xmms_format = - format_from_alsa(outputf->format); - debug("Converting format from %d to %d", -! effectf->xmms_format, outputf->xmms_format); - if (outputf->xmms_format < 0) - return -1; - alsa_convert_func = - xmms_convert_get_func(outputf->xmms_format, -! effectf->xmms_format); - if (alsa_convert_func == NULL) - return -1; - } ---- 949,965 ---- - break; - } - } -! if (outputf->format != f->format) - { - outputf->xmms_format = - format_from_alsa(outputf->format); - debug("Converting format from %d to %d", -! f->xmms_format, outputf->xmms_format); - if (outputf->xmms_format < 0) - return -1; - alsa_convert_func = - xmms_convert_get_func(outputf->xmms_format, -! f->xmms_format); - if (alsa_convert_func == NULL) - return -1; - } -*************** -*** 918,931 **** - } - - snd_pcm_hw_params_set_channels_near(alsa_pcm, hwparams, &outputf->channels); -! if (outputf->channels != effectf->channels) - { - debug("Converting channels from %d to %d", -! effectf->channels, outputf->channels); - alsa_stereo_convert_func = - xmms_convert_get_channel_func(outputf->xmms_format, - outputf->channels, -! effectf->channels); - if (alsa_stereo_convert_func == NULL) - return -1; - } ---- 973,986 ---- - } - - snd_pcm_hw_params_set_channels_near(alsa_pcm, hwparams, &outputf->channels); -! if (outputf->channels != f->channels) - { - debug("Converting channels from %d to %d", -! f->channels, outputf->channels); - alsa_stereo_convert_func = - xmms_convert_get_channel_func(outputf->xmms_format, - outputf->channels, -! f->channels); - if (alsa_stereo_convert_func == NULL) - return -1; - } -*************** -*** 936,945 **** - g_warning("alsa_setup(): No usable samplerate available."); - return -1; - } -! if (outputf->rate != effectf->rate) - { - debug("Converting samplerate from %d to %d", -! effectf->rate, outputf->rate); - alsa_frequency_convert_func = - xmms_convert_get_frequency_func(outputf->xmms_format, - outputf->channels); ---- 991,1000 ---- - g_warning("alsa_setup(): No usable samplerate available."); - return -1; - } -! if (outputf->rate != f->rate) - { - debug("Converting samplerate from %d to %d", -! f->rate, outputf->rate); - alsa_frequency_convert_func = - xmms_convert_get_frequency_func(outputf->xmms_format, - outputf->channels); -*************** -*** 947,960 **** - return -1; - } - -! alsa_buffer_time = alsa_cfg.buffer_time * 1000; -! if ((err = snd_pcm_hw_params_set_buffer_time_near(alsa_pcm, hwparams, -! &alsa_buffer_time, 0)) < 0) -! { -! g_warning("alsa_setup(): Set buffer time failed: %s.", -! snd_strerror(-err)); -! return -1; -! } - - alsa_period_time = alsa_cfg.period_time * 1000; - if ((err = snd_pcm_hw_params_set_period_time_near(alsa_pcm, hwparams, ---- 1002,1009 ---- - return -1; - } - -! outputf->sample_bits = snd_pcm_format_physical_width(outputf->format); -! outputf->bps = (outputf->rate * outputf->sample_bits * outputf->channels) >> 3; - - alsa_period_time = alsa_cfg.period_time * 1000; - if ((err = snd_pcm_hw_params_set_period_time_near(alsa_pcm, hwparams, -*************** -*** 965,970 **** ---- 1014,1028 ---- - return -1; - } - -+ alsa_buffer_time = alsa_cfg.buffer_time * 1000; -+ if ((err = snd_pcm_hw_params_set_buffer_time_near(alsa_pcm, hwparams, -+ &alsa_buffer_time, 0)) < 0) -+ { -+ g_warning("alsa_setup(): Set buffer time failed: %s.", -+ snd_strerror(-err)); -+ return -1; -+ } -+ - if (snd_pcm_hw_params(alsa_pcm, hwparams) < 0) - { - if (alsa_cfg.debug) -*************** -*** 1011,1037 **** - snd_pcm_dump(alsa_pcm, logs); - } - -! bits_per_sample = snd_pcm_format_physical_width(outputf->format); -! alsa_bps = (outputf->rate * bits_per_sample * outputf->channels) >> 3; -! -! if (mmap) -! { -! int chn; -! buffer = g_malloc(alsa_period_size * bits_per_sample / 8 * outputf->channels); -! areas = g_malloc0(outputf->channels * sizeof(snd_pcm_channel_area_t)); -! -! for (chn = 0; chn < outputf->channels; chn++) -! { -! areas[chn].addr = buffer; -! areas[chn].first = chn * bits_per_sample; -! areas[chn].step = outputf->channels * bits_per_sample; -! } - } - - debug("Device setup: buffer time: %i, size: %i.", alsa_buffer_time, -! snd_pcm_frames_to_bytes(alsa_pcm, alsa_buffer_size)); - debug("bits per sample: %i; frame size: %i; Bps: %i", -! bits_per_sample, snd_pcm_frames_to_bytes(alsa_pcm, 1), alsa_bps); - - return 0; - } ---- 1069,1096 ---- - snd_pcm_dump(alsa_pcm, logs); - } - -! hw_buffer_size = snd_pcm_frames_to_bytes(alsa_pcm, alsa_buffer_size); -! hw_period_size = snd_pcm_frames_to_bytes(alsa_pcm, alsa_period_size); -! if (inputf->bps != outputf->bps) { -! int align = (inputf->sample_bits * inputf->channels) / 8; -! hw_buffer_size_in = ((guint64)hw_buffer_size * inputf->bps + -! outputf->bps/2) / outputf->bps; -! hw_period_size_in = ((guint64)hw_period_size * inputf->bps + -! outputf->bps/2) / outputf->bps; -! hw_buffer_size_in -= hw_buffer_size_in % align; -! hw_period_size_in -= hw_period_size_in % align; -! } else { -! hw_buffer_size_in = hw_buffer_size; -! hw_period_size_in = hw_period_size; - } - - debug("Device setup: buffer time: %i, size: %i.", alsa_buffer_time, -! hw_buffer_size); -! debug("Device setup: period time: %i, size: %i.", alsa_period_time, -! hw_period_size); - debug("bits per sample: %i; frame size: %i; Bps: %i", -! snd_pcm_format_physical_width(outputf->format), -! snd_pcm_frames_to_bytes(alsa_pcm, 1), outputf->bps); - - return 0; - } -diff -rc xmms-1.2.10-orig/Output/alsa/configure.c xmms-1.2.10/Output/alsa/configure.c -*** xmms-1.2.10-orig/Output/alsa/configure.c 2004-01-28 00:09:39.000000000 +0100 ---- xmms-1.2.10/Output/alsa/configure.c 2006-01-27 00:28:49.000000000 +0100 -*************** -*** 20,27 **** - #include - - static GtkWidget *configure_win = NULL; -! static GtkWidget *buffer_time_spin, *period_time_spin; -! static GtkWidget *mmap_button, *mixer_card_spin, *softvolume_toggle_button; - - static GtkWidget *devices_combo, *mixer_devices_combo; - ---- 20,27 ---- - #include - - static GtkWidget *configure_win = NULL; -! static GtkWidget *buffer_time_spin, *period_time_spin, *thread_buffer_time_spin; -! static GtkWidget *mixer_card_spin, *softvolume_toggle_button; - - static GtkWidget *devices_combo, *mixer_devices_combo; - -*************** -*** 36,42 **** - alsa_cfg.pcm_device = GET_CHARS(GTK_COMBO(devices_combo)->entry); - alsa_cfg.buffer_time = GET_SPIN_INT(buffer_time_spin); - alsa_cfg.period_time = GET_SPIN_INT(period_time_spin); -! alsa_cfg.mmap = GET_TOGGLE(mmap_button); - alsa_cfg.soft_volume = GET_TOGGLE(softvolume_toggle_button); - alsa_cfg.mixer_card = GET_SPIN_INT(mixer_card_spin); - alsa_cfg.mixer_device = GET_CHARS(GTK_COMBO(mixer_devices_combo)->entry); ---- 36,42 ---- - alsa_cfg.pcm_device = GET_CHARS(GTK_COMBO(devices_combo)->entry); - alsa_cfg.buffer_time = GET_SPIN_INT(buffer_time_spin); - alsa_cfg.period_time = GET_SPIN_INT(period_time_spin); -! alsa_cfg.thread_buffer_time = GET_SPIN_INT(thread_buffer_time_spin); - alsa_cfg.soft_volume = GET_TOGGLE(softvolume_toggle_button); - alsa_cfg.mixer_card = GET_SPIN_INT(mixer_card_spin); - alsa_cfg.mixer_device = GET_CHARS(GTK_COMBO(mixer_devices_combo)->entry); -*************** -*** 51,57 **** - - xmms_cfg_write_int(cfgfile, "ALSA", "buffer_time", alsa_cfg.buffer_time); - xmms_cfg_write_int(cfgfile, "ALSA", "period_time", alsa_cfg.period_time); -! xmms_cfg_write_boolean(cfgfile,"ALSA","mmap",alsa_cfg.mmap); - xmms_cfg_write_string(cfgfile,"ALSA","pcm_device", alsa_cfg.pcm_device); - xmms_cfg_write_int(cfgfile, "ALSA", "mixer_card", alsa_cfg.mixer_card); - xmms_cfg_write_string(cfgfile,"ALSA","mixer_device", alsa_cfg.mixer_device); ---- 51,57 ---- - - xmms_cfg_write_int(cfgfile, "ALSA", "buffer_time", alsa_cfg.buffer_time); - xmms_cfg_write_int(cfgfile, "ALSA", "period_time", alsa_cfg.period_time); -! xmms_cfg_write_int(cfgfile, "ALSA", "thread_buffer_time", alsa_cfg.thread_buffer_time); - xmms_cfg_write_string(cfgfile,"ALSA","pcm_device", alsa_cfg.pcm_device); - xmms_cfg_write_int(cfgfile, "ALSA", "mixer_card", alsa_cfg.mixer_card); - xmms_cfg_write_string(cfgfile,"ALSA","mixer_device", alsa_cfg.mixer_device); -*************** -*** 212,219 **** - GtkWidget *dev_vbox, *adevice_frame, *adevice_box; - GtkWidget *mixer_frame, *mixer_box, *mixer_card_box; - GtkWidget *buffer_frame, *buffer_vbox, *buffer_table; -! GtkWidget *buffer_time_label, *period_time_label; -! GtkObject *buffer_time_adj, *period_time_adj, *mixer_card_adj; - GtkWidget *bbox, *ok, *cancel; - - if (configure_win) ---- 212,219 ---- - GtkWidget *dev_vbox, *adevice_frame, *adevice_box; - GtkWidget *mixer_frame, *mixer_box, *mixer_card_box; - GtkWidget *buffer_frame, *buffer_vbox, *buffer_table; -! GtkWidget *buffer_time_label, *period_time_label, *thread_buffer_time_label; -! GtkObject *buffer_time_adj, *period_time_adj, *thread_buffer_time_adj, *mixer_card_adj; - GtkWidget *bbox, *ok, *cancel; - - if (configure_win) -*************** -*** 312,318 **** - - gtk_container_set_border_width(GTK_CONTAINER(buffer_vbox), 5); - -! buffer_table = gtk_table_new(2, 2, FALSE); - gtk_table_set_row_spacings(GTK_TABLE(buffer_table), 5); - gtk_table_set_col_spacings(GTK_TABLE(buffer_table), 5); - gtk_box_pack_start(GTK_BOX(buffer_vbox), buffer_table, FALSE, FALSE, 0); ---- 312,318 ---- - - gtk_container_set_border_width(GTK_CONTAINER(buffer_vbox), 5); - -! buffer_table = gtk_table_new(2, 3, FALSE); - gtk_table_set_row_spacings(GTK_TABLE(buffer_table), 5); - gtk_table_set_col_spacings(GTK_TABLE(buffer_table), 5); - gtk_box_pack_start(GTK_BOX(buffer_vbox), buffer_table, FALSE, FALSE, 0); -*************** -*** 345,354 **** - gtk_table_attach(GTK_TABLE(buffer_table), period_time_spin, - 1, 2, 1, 2, 0, 0, 0, 0); - -! mmap_button = gtk_check_button_new_with_label(_("Mmap mode")); -! gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(mmap_button), -! alsa_cfg.mmap); -! gtk_box_pack_start(GTK_BOX(buffer_vbox), mmap_button, FALSE, FALSE, 0); - - gtk_notebook_append_page(GTK_NOTEBOOK(notebook), buffer_frame, - gtk_label_new(_("Advanced settings"))); ---- 345,363 ---- - gtk_table_attach(GTK_TABLE(buffer_table), period_time_spin, - 1, 2, 1, 2, 0, 0, 0, 0); - -! thread_buffer_time_label = gtk_label_new(_("Thread buffer time (ms):")); -! gtk_label_set_justify(GTK_LABEL(thread_buffer_time_label), GTK_JUSTIFY_LEFT); -! gtk_misc_set_alignment(GTK_MISC(thread_buffer_time_label), 0, 0.5); -! gtk_table_attach(GTK_TABLE(buffer_table), thread_buffer_time_label, -! 0, 1, 2, 3, GTK_FILL, 0, 0, 0); -! thread_buffer_time_adj = gtk_adjustment_new(alsa_cfg.thread_buffer_time, -! 1000, 1000000, 100, 100, 100); -! thread_buffer_time_spin = gtk_spin_button_new(GTK_ADJUSTMENT(thread_buffer_time_adj), -! 8, 0); -! -! gtk_widget_set_usize(thread_buffer_time_spin, 60, -1); -! gtk_table_attach(GTK_TABLE(buffer_table), thread_buffer_time_spin, -! 1, 2, 2, 3, 0, 0, 0, 0); - - gtk_notebook_append_page(GTK_NOTEBOOK(notebook), buffer_frame, - gtk_label_new(_("Advanced settings"))); -diff -rc xmms-1.2.10-orig/Output/alsa/init.c xmms-1.2.10/Output/alsa/init.c -*** xmms-1.2.10-orig/Output/alsa/init.c 2004-01-11 17:27:26.000000000 +0100 ---- xmms-1.2.10/Output/alsa/init.c 2006-01-27 00:28:49.000000000 +0100 -*************** -*** 29,36 **** - memset(&alsa_cfg, 0, sizeof (alsa_cfg)); - alsa_cfg.buffer_time = 500; - alsa_cfg.period_time = 50; - alsa_cfg.debug = 0; -- alsa_cfg.mmap = 1; - alsa_cfg.vol.left = 100; - alsa_cfg.vol.right = 100; - ---- 29,36 ---- - memset(&alsa_cfg, 0, sizeof (alsa_cfg)); - alsa_cfg.buffer_time = 500; - alsa_cfg.period_time = 50; -+ alsa_cfg.thread_buffer_time = 3000; - alsa_cfg.debug = 0; - alsa_cfg.vol.left = 100; - alsa_cfg.vol.right = 100; - -*************** -*** 44,51 **** - xmms_cfg_read_int(cfgfile, "ALSA", "mixer_card", &alsa_cfg.mixer_card); - xmms_cfg_read_int(cfgfile, "ALSA", "buffer_time", &alsa_cfg.buffer_time); - xmms_cfg_read_int(cfgfile, "ALSA", "period_time", &alsa_cfg.period_time); -! xmms_cfg_read_boolean(cfgfile, "ALSA", "mmap", &alsa_cfg.mmap); -! xmms_cfg_read_int(cfgfile, "ALSA", "period_time", &alsa_cfg.period_time); - xmms_cfg_read_boolean(cfgfile, "ALSA", "soft_volume", - &alsa_cfg.soft_volume); - xmms_cfg_read_int(cfgfile, "ALSA", "volume_left", &alsa_cfg.vol.left); ---- 44,50 ---- - xmms_cfg_read_int(cfgfile, "ALSA", "mixer_card", &alsa_cfg.mixer_card); - xmms_cfg_read_int(cfgfile, "ALSA", "buffer_time", &alsa_cfg.buffer_time); - xmms_cfg_read_int(cfgfile, "ALSA", "period_time", &alsa_cfg.period_time); -! xmms_cfg_read_int(cfgfile, "ALSA", "thread_buffer_time", &alsa_cfg.thread_buffer_time); - xmms_cfg_read_boolean(cfgfile, "ALSA", "soft_volume", - &alsa_cfg.soft_volume); - xmms_cfg_read_int(cfgfile, "ALSA", "volume_left", &alsa_cfg.vol.left); diff --git a/pkgs/applications/audio/xmms/default.nix b/pkgs/applications/audio/xmms/default.nix deleted file mode 100644 index 6152e325bb6..00000000000 --- a/pkgs/applications/audio/xmms/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{stdenv, fetchurl, alsaLib, esound, libogg, libvorbis, glib, gtk}: - -stdenv.mkDerivation { - name = "xmms-1.2.10"; - - src = fetchurl { - url = http://nixos.org/tarballs/xmms-1.2.10.tar.bz2; - md5 = "03a85cfc5e1877a2e1f7be4fa1d3f63c"; - }; - - # Patch borrowed from SuSE 10.0 to fix pause/continue on ALSA. - patches = [./alsa.patch]; - - buildInputs = [alsaLib esound libogg libvorbis glib gtk]; - - meta = { - description = "A music player very similar to Winamp"; - homepage = http://www.xmms.org; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/development/libraries/glib/1.2.x.nix b/pkgs/development/libraries/glib/1.2.x.nix deleted file mode 100644 index 8aa5005b617..00000000000 --- a/pkgs/development/libraries/glib/1.2.x.nix +++ /dev/null @@ -1,12 +0,0 @@ -{stdenv, fetchurl}: - -stdenv.mkDerivation { - name = "glib-1.2.10"; - src = fetchurl { - url = ftp://ftp.gtk.org/pub/gtk/v1.2/glib-1.2.10.tar.gz; - md5 = "6fe30dad87c77b91b632def29dd69ef9"; - }; - # Patch for gcc 3.4 compatibility. Based on - # http://cvs.openpkg.org/chngview?cn=16208. - patches = [./gcc34.patch]; -} diff --git a/pkgs/development/libraries/glib/gcc34.patch b/pkgs/development/libraries/glib/gcc34.patch deleted file mode 100644 index 13d35c82209..00000000000 --- a/pkgs/development/libraries/glib/gcc34.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -rc glib-orig/glib.h glib-1.2.10/glib.h -*** glib-orig/glib.h 2001-02-27 04:44:38.000000000 +0100 ---- glib-1.2.10/glib.h 2004-09-22 10:22:01.000000000 +0200 -*************** -*** 272,278 **** - /* Wrap the gcc __PRETTY_FUNCTION__ and __FUNCTION__ variables with - * macros, so we can refer to them as strings unconditionally. - */ -! #ifdef __GNUC__ - #define G_GNUC_FUNCTION __FUNCTION__ - #define G_GNUC_PRETTY_FUNCTION __PRETTY_FUNCTION__ - #else /* !__GNUC__ */ ---- 272,278 ---- - /* Wrap the gcc __PRETTY_FUNCTION__ and __FUNCTION__ variables with - * macros, so we can refer to them as strings unconditionally. - */ -! #if defined(__GNUC__) && (__GNUC__ == 3 && __GNUC_MINOR__ < 4) - #define G_GNUC_FUNCTION __FUNCTION__ - #define G_GNUC_PRETTY_FUNCTION __PRETTY_FUNCTION__ - #else /* !__GNUC__ */ diff --git a/pkgs/development/libraries/gtk+/1.2.x.nix b/pkgs/development/libraries/gtk+/1.2.x.nix deleted file mode 100644 index 9f6d8b7881e..00000000000 --- a/pkgs/development/libraries/gtk+/1.2.x.nix +++ /dev/null @@ -1,12 +0,0 @@ -{stdenv, fetchurl, x11, glib}: - -stdenv.mkDerivation { - name = "gtk+-1.2.10"; - - src = fetchurl { - url = ftp://ftp.gtk.org/pub/gtk/v1.2/gtk+-1.2.10.tar.gz; - md5 = "4d5cb2fc7fb7830e4af9747a36bfce20"; - }; - - propagatedBuildInputs = [x11 glib]; -} diff --git a/pkgs/misc/emulators/generator/default.nix b/pkgs/misc/emulators/generator/default.nix deleted file mode 100644 index b4bf72d79d6..00000000000 --- a/pkgs/misc/emulators/generator/default.nix +++ /dev/null @@ -1,13 +0,0 @@ -{stdenv, fetchurl, gtk, SDL, nasm, zlib, bzip2, libjpeg}: - -stdenv.mkDerivation { - name = "generator-0.35-cbiere-r3"; - src = fetchurl { - url = http://www.ghostwhitecrab.com/generator/generator-0.35-cbiere-r3.tar.bz2; - sha256 = "0jw2ibbjyms9sklapnb6pzkmk680zsqq9pd51r2n4957zv1f36jd"; - }; - configureFlags = "--with-gtk --with-raze --with-sdl-audio"; - buildInputs = [gtk SDL nasm zlib bzip2 libjpeg]; - # Only required when not using SDL audio. -# patches = [./soundcard.patch]; -} diff --git a/pkgs/misc/emulators/generator/soundcard.patch b/pkgs/misc/emulators/generator/soundcard.patch deleted file mode 100644 index 73cf8fad695..00000000000 --- a/pkgs/misc/emulators/generator/soundcard.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -rc generator-orig/main/gensoundp-unix.c generator-0.35-cbiere/main/gensoundp-unix.c -*** generator-orig/main/gensoundp-unix.c 2004-09-26 19:07:44.000000000 +0200 ---- generator-0.35-cbiere/main/gensoundp-unix.c 2004-09-26 19:07:56.000000000 +0200 -*************** -*** 196,202 **** - #include - #else - -! #ifdef HAVE_SOUNDCARD_H - #include - #endif - ---- 196,202 ---- - #include - #else - -! #ifdef HAVE_SYS_SOUNDCARD_H - #include - #endif - diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8c1733925c2..bee9769e92e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3690,14 +3690,6 @@ let inherit (pkgs.gtkLibs) glib gtk pango cairo gdk_pixbuf; - gtkLibs1x = recurseIntoAttrs (let callPackage = newScope pkgs.gtkLibs1x; in { - - glib = callPackage ../development/libraries/glib/1.2.x.nix { }; - - gtk = callPackage ../development/libraries/gtk+/1.2.x.nix { }; - - }); - gtkLibs224 = recurseIntoAttrs (let callPackage = pkgs.newScope pkgs.gtkLibs224; in { glib = callPackage ../development/libraries/glib/2.28.x.nix { }; @@ -7765,12 +7757,6 @@ let xineUI = callPackage ../applications/video/xine-ui { }; - xmms = callPackage ../applications/audio/xmms { - inherit (gnome) esound; - inherit (gtkLibs1x) glib gtk; - stdenv = overrideGCC stdenv gcc34; # due to problems with gcc 4.x - }; - xneur = callPackage ../applications/misc/xneur { GStreamer=gst_all.gstreamer; inherit (gtkLibs) glib gtk pango atk gdk_pixbuf; @@ -8533,10 +8519,6 @@ let python = pythonFull; }; - generator = callPackage ../misc/emulators/generator { - inherit (gtkLibs1x) gtk; - }; - gensgs = callPackage_i686 ../misc/emulators/gens-gs { }; ghostscript = callPackage ../misc/ghostscript { From 12e953b944811d0bac899ed25cd2f4c44d5e64c0 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 28 Jan 2012 14:37:53 +0000 Subject: [PATCH 02/77] gmp: updated (unused) version 5.0.1 to 5.0.3 svn path=/nixpkgs/trunk/; revision=31908 --- pkgs/development/libraries/gmp/{5.0.1.nix => 5.0.3.nix} | 6 +++--- pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) rename pkgs/development/libraries/gmp/{5.0.1.nix => 5.0.3.nix} (91%) diff --git a/pkgs/development/libraries/gmp/5.0.1.nix b/pkgs/development/libraries/gmp/5.0.3.nix similarity index 91% rename from pkgs/development/libraries/gmp/5.0.1.nix rename to pkgs/development/libraries/gmp/5.0.3.nix index 338debaa81e..be2753c8352 100644 --- a/pkgs/development/libraries/gmp/5.0.1.nix +++ b/pkgs/development/libraries/gmp/5.0.3.nix @@ -5,11 +5,11 @@ let in stdenv.mkDerivation rec { - name = "gmp-5.0.1"; + name = "gmp-5.0.3"; src = fetchurl { url = "mirror://gnu/gmp/${name}.tar.bz2"; - sha256 = "1yrr14l6vvhm1g27y8nb3c75j0i4ii4k1gw7ik08safk3zq119m2"; + sha256 = "dcafe9989c7f332b373e1f766af8e9cd790fc802fdec422a1910a6ef783480e3"; }; buildNativeInputs = [m4]; @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { homepage = http://gmplib.org/; license = "LGPLv3+"; - maintainers = [ stdenv.lib.maintainers.ludo ]; + maintainers = [ stdenv.lib.maintainers.ludo stdenv.lib.maintainers.simons ]; platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bee9769e92e..8249ab6d732 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3632,6 +3632,8 @@ let cxx = false; }; + gmp5 = callPackage ../development/libraries/gmp/5.0.3.nix { }; + gmpxx = appendToName "with-cxx" (gmp.override { cxx = true; }); gobjectIntrospection = callPackage ../development/libraries/gobject-introspection { }; From 71c28d0e336ea3d5582d1e889b1adca4db00ab54 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Sat, 28 Jan 2012 14:39:56 +0000 Subject: [PATCH 03/77] Use meta.platforms svn path=/nixpkgs/trunk/; revision=31909 --- pkgs/applications/video/MPlayer/default.nix | 1 + .../libraries/aspell/dictionaries.nix | 1 + .../tools/build-managers/cmake/default.nix | 2 +- .../tools/misc/pkgconfig/default.nix | 1 + .../linux/wpa_supplicant/default.nix | 5 ++++ pkgs/top-level/all-packages.nix | 9 ++++---- pkgs/top-level/release.nix | 23 ------------------- 7 files changed, 13 insertions(+), 29 deletions(-) diff --git a/pkgs/applications/video/MPlayer/default.nix b/pkgs/applications/video/MPlayer/default.nix index 0566b4bbe29..a594bd4e2c6 100644 --- a/pkgs/applications/video/MPlayer/default.nix +++ b/pkgs/applications/video/MPlayer/default.nix @@ -166,5 +166,6 @@ stdenv.mkDerivation rec { homepage = "http://mplayerhq.hu"; license = "GPL"; maintainers = [ stdenv.lib.maintainers.eelco stdenv.lib.maintainers.urkud ]; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/aspell/dictionaries.nix b/pkgs/development/libraries/aspell/dictionaries.nix index 3bd1d82e0b5..90a9469ee54 100644 --- a/pkgs/development/libraries/aspell/dictionaries.nix +++ b/pkgs/development/libraries/aspell/dictionaries.nix @@ -22,6 +22,7 @@ let meta = { description = "Aspell dictionary for ${fullName}"; + platforms = stdenv.lib.platforms.all; }; }; diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix index 80958e2885f..a3a10525c08 100644 --- a/pkgs/development/tools/build-managers/cmake/default.nix +++ b/pkgs/development/tools/build-managers/cmake/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.cmake.org/; description = "Cross-Platform Makefile Generator"; - platforms = if useQt4 then qt4.meta.platforms else stdenv.lib.platforms.unix; + platforms = if useQt4 then qt4.meta.platforms else stdenv.lib.platforms.all; maintainers = [ stdenv.lib.maintainers.urkud ]; }; } diff --git a/pkgs/development/tools/misc/pkgconfig/default.nix b/pkgs/development/tools/misc/pkgconfig/default.nix index ae5048f6306..f323a7d7dbc 100644 --- a/pkgs/development/tools/misc/pkgconfig/default.nix +++ b/pkgs/development/tools/misc/pkgconfig/default.nix @@ -19,6 +19,7 @@ stdenv.mkDerivation (rec { meta = { description = "A tool that allows packages to find out information about other packages"; homepage = http://pkg-config.freedesktop.org/wiki/; + platforms = stdenv.lib.platforms.all; }; } // (if stdenv.system == "mips64el-linux" then diff --git a/pkgs/os-specific/linux/wpa_supplicant/default.nix b/pkgs/os-specific/linux/wpa_supplicant/default.nix index 8d216f7899d..6ffc2c5a059 100644 --- a/pkgs/os-specific/linux/wpa_supplicant/default.nix +++ b/pkgs/os-specific/linux/wpa_supplicant/default.nix @@ -89,5 +89,10 @@ gui = stdenv.mkDerivation { mkdir -pv $out/share/icons cp -av icons/hicolor $out/share/icons ''; + + meta = { + description = "Qt4 wpa_supplicant client"; + inherit (qt4.meta) platforms; + }; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8249ab6d732..671a9fb3336 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3688,11 +3688,11 @@ let gtkmathview = callPackage ../development/libraries/gtkmathview { }; - gtkLibs = pkgs.gtkLibs224; + gtkLibs = recurseIntoAttrs pkgs.gtkLibs224; inherit (pkgs.gtkLibs) glib gtk pango cairo gdk_pixbuf; - gtkLibs224 = recurseIntoAttrs (let callPackage = pkgs.newScope pkgs.gtkLibs224; in { + gtkLibs224 = let callPackage = pkgs.newScope pkgs.gtkLibs224; in { glib = callPackage ../development/libraries/glib/2.28.x.nix { }; @@ -3716,7 +3716,7 @@ let gob2 = callPackage ../development/tools/misc/gob2 { }; - }); + }; gtkLibs3x = let callPackage = newScope pkgs.gtkLibs3x; in { glib = callPackage ../development/libraries/glib/2.30.x.nix { }; @@ -6264,8 +6264,7 @@ let wirelesstools = callPackage ../os-specific/linux/wireless-tools { }; - wpa_supplicant = callPackage ../os-specific/linux/wpa_supplicant { - }; + wpa_supplicant = callPackage ../os-specific/linux/wpa_supplicant { }; wpa_supplicant_gui = pkgs.wpa_supplicant.gui; diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index e1976b5d732..08f6e993b11 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -15,7 +15,6 @@ with (import ./release-lib.nix); } // (mapTestOn ((packagesWithMetaPlatform pkgs) // rec { - MPlayer = linux; abcde = linux; alsaUtils = linux; apacheHttpd = linux; @@ -52,12 +51,10 @@ with (import ./release-lib.nix); chatzilla = linux; cksfv = all; classpath = linux; - cmake = all; consolekit = linux; coreutils = all; cpio = all; cron = linux; - cups = linux; cvs = linux; db4 = all; ddrescue = linux; @@ -237,7 +234,6 @@ with (import ./release-lib.nix); php = linux; pidgin = linux; pinentry = linux; - pkgconfig = all; pltScheme = linux; pmccabe = linux; portmap = linux; @@ -333,7 +329,6 @@ with (import ./release-lib.nix); wine = ["i686-linux"]; wireshark = linux; wirelesstools = linux; - wpa_supplicant = linux; wxGTK = linux; x11_ssh_askpass = linux; xchm = linux; @@ -354,20 +349,6 @@ with (import ./release-lib.nix); zsh = linux; zsnes = ["i686-linux"]; - aspellDicts = { - de = all; - en = all; - es = all; - fr = all; - nl = all; - ru = all; - }; - - dbus_all = { - libs = linux; - tools = linux; - }; - emacs22Packages = { bbdb = linux; cedet = linux; @@ -391,10 +372,6 @@ with (import ./release-lib.nix); gnome_vfs = linux; }; - gtkLibs = { - gtk = linux; - }; - /* haskellPackages_ghc6104 = { ghc = ghcSupported; From a819ccf0305c267ab86e99c146451bf4db289da5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andres=20L=C3=B6h?= Date: Sat, 28 Jan 2012 15:34:53 +0000 Subject: [PATCH 04/77] Updated GHC snapshot to ghc-7.4.1-rc2. svn path=/nixpkgs/trunk/; revision=31910 --- pkgs/development/compilers/ghc/head.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index 0d3301df60a..0a08cc3a4e7 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -1,13 +1,13 @@ {stdenv, fetchurl, ghc, perl, gmp, ncurses, darwinInstallNameToolUtility}: stdenv.mkDerivation rec { - version = "7.4.0.20111219"; + version = "7.4.0.20120126"; name = "ghc-${version}"; src = fetchurl { - url = "http://haskell.org/ghc/dist/7.4.1-rc1/${name}-src.tar.bz2"; - sha256 = "11imfag07wr9s5vf12yh6bz4hjfbw20i1c7n8py9fa4vx7va676n"; + url = "http://haskell.org/ghc/dist/7.4.1-rc2/${name}-src.tar.bz2"; + sha256 = "0arnvzhwjzk2z3m2891b4z13p4v1c84f31jgyj13a1fbfpylgs64"; }; buildInputs = [ghc perl gmp ncurses] ++ From 467722ad1a49256842d2b42e38bee451309d8479 Mon Sep 17 00:00:00 2001 From: Cillian de Roiste Date: Sun, 29 Jan 2012 13:39:30 +0000 Subject: [PATCH 05/77] Patching the prefix, since it is hardcoded. The application seems to work correctly now, although it does crash with my current gtk theme (oxygen) when adding a stream. Using the gnome gtk-icon-theme does work, but this is probably just a bug in the oxygen gtk theme and should be fixed there. svn path=/nixpkgs/trunk/; revision=31913 --- pkgs/applications/video/dvswitch/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/video/dvswitch/default.nix b/pkgs/applications/video/dvswitch/default.nix index 9ef9b678560..8803fe0a786 100644 --- a/pkgs/applications/video/dvswitch/default.nix +++ b/pkgs/applications/video/dvswitch/default.nix @@ -1,5 +1,6 @@ -{ stdenv, fetchurl, alsaLib, boost, cmake, gtkmm, libXau, libXdmcp, - libXv, libav, pixman, libpthreadstubs, pkgconfig }: +{ stdenv, fetchurl, alsaLib, boost, cmake, gtkmm, libXau, libXdmcp +, libXv, libav, pixman, libpthreadstubs, pkgconfig +}: stdenv.mkDerivation rec { name = "dvswitch-${version}"; @@ -15,13 +16,12 @@ stdenv.mkDerivation rec { libpthreadstubs pixman pkgconfig ]; - installPhase = " - ensureDir $out - cp src/dv* $out/ - "; + patchPhase = '' + sed -e "s@prefix /usr/local@prefix $out@" -i CMakeLists.txt + ''; meta = with stdenv.lib; { - description = "digital video mixer intended for interactive live mixing of several incoming DV video streams"; + description = "interactive live video mixer for DV streams"; homepage = "http://dvswitch.alioth.debian.org"; license = licenses.gpl2Plus; maintainers = [ maintainers.goibhniu ]; From 1bc0a60bf8f4b0c854925091814e6ca373555580 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 29 Jan 2012 16:23:53 +0000 Subject: [PATCH 06/77] haskell-explicit-exception: added version 0.1.6 svn path=/nixpkgs/trunk/; revision=31914 --- .../haskell/explicit-exception/default.nix | 16 ++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 18 insertions(+) create mode 100644 pkgs/development/libraries/haskell/explicit-exception/default.nix diff --git a/pkgs/development/libraries/haskell/explicit-exception/default.nix b/pkgs/development/libraries/haskell/explicit-exception/default.nix new file mode 100644 index 00000000000..efa2f2fb7dd --- /dev/null +++ b/pkgs/development/libraries/haskell/explicit-exception/default.nix @@ -0,0 +1,16 @@ +{ cabal, transformers }: + +cabal.mkDerivation (self: { + pname = "explicit-exception"; + version = "0.1.6"; + sha256 = "0pgdbaav952bwcmbfwg0fgvc15k57rlnw131bs3pnp8rqdbxfv39"; + isLibrary = true; + isExecutable = true; + buildDepends = [ transformers ]; + meta = { + homepage = "http://www.haskell.org/haskellwiki/Exception"; + description = "Exceptions which are explicit in the type signature"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 9a7c7cab1f7..70338b6bbea 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -647,6 +647,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); erf = callPackage ../development/libraries/haskell/erf {}; + explicitException = callPackage ../development/libraries/haskell/explicit-exception {}; + filepath = callPackage ../development/libraries/haskell/filepath {}; extensibleExceptions_0_1_1_0 = callPackage ../development/libraries/haskell/extensible-exceptions/0.1.1.0.nix {}; From 5792ce967fb884d818cae7123f52204e317cf6b2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 29 Jan 2012 16:23:57 +0000 Subject: [PATCH 07/77] haskell-multiarg: added version 0.1.0.0 svn path=/nixpkgs/trunk/; revision=31915 --- .../libraries/haskell/multiarg/default.nix | 22 +++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 4 +++- 2 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/haskell/multiarg/default.nix diff --git a/pkgs/development/libraries/haskell/multiarg/default.nix b/pkgs/development/libraries/haskell/multiarg/default.nix new file mode 100644 index 00000000000..5f12e4cee92 --- /dev/null +++ b/pkgs/development/libraries/haskell/multiarg/default.nix @@ -0,0 +1,22 @@ +{ cabal, explicitException, QuickCheck, text, transformers +, utf8String +}: + +cabal.mkDerivation (self: { + pname = "multiarg"; + version = "0.1.0.0"; + sha256 = "010mph49fq0rdr5dmm4pdlbmfmaaas8wffa9p1cgprs2ic1hnx3g"; + buildDepends = [ + explicitException QuickCheck text transformers utf8String + ]; + meta = { + homepage = "https://github.com/massysett/multiarg"; + description = "Combinators to build command line parsers"; + license = self.stdenv.lib.licenses.mit; + platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 70338b6bbea..8c9fdf59f91 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -993,7 +993,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); mtl2 = self.mtl_2_0_1_0; mtl = self.mtl1; - mtlparse = callPackage ../development/libraries/haskell/mtlparse {}; + mtlparse = callPackage ../development/libraries/haskell/mtlparse {}; + + multiarg = callPackage ../development/libraries/haskell/multiarg {}; multiplate = callPackage ../development/libraries/haskell/multiplate {}; From bab857eb385befeec17e102472ad022e2d639a16 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 29 Jan 2012 16:24:00 +0000 Subject: [PATCH 08/77] haskell-blaze-builder: updated to version 0.3.1.0 svn path=/nixpkgs/trunk/; revision=31916 --- pkgs/development/libraries/haskell/blaze-builder/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/blaze-builder/default.nix b/pkgs/development/libraries/haskell/blaze-builder/default.nix index a21d9b7c96f..f5835393895 100644 --- a/pkgs/development/libraries/haskell/blaze-builder/default.nix +++ b/pkgs/development/libraries/haskell/blaze-builder/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "blaze-builder"; - version = "0.3.0.2"; - sha256 = "009njfm9g0fs7kg6q9c7qqfl69msw9q3d07xh3xg7layh09khsdb"; + version = "0.3.1.0"; + sha256 = "192pqmr6mcjnflqpvp93nycfbdi0ifab8ifvrxvmwbrdkiidvai6"; buildDepends = [ text ]; meta = { homepage = "http://github.com/meiersi/blaze-builder"; From e83a85ed6d2c7e98f906064154cce39e90db5fe1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 29 Jan 2012 16:24:02 +0000 Subject: [PATCH 09/77] haskell-bytestring-lexing: updated to version 0.3.0 svn path=/nixpkgs/trunk/; revision=31917 --- .../libraries/haskell/bytestring-lexing/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/bytestring-lexing/default.nix b/pkgs/development/libraries/haskell/bytestring-lexing/default.nix index 446a628dd05..d67c9907f99 100644 --- a/pkgs/development/libraries/haskell/bytestring-lexing/default.nix +++ b/pkgs/development/libraries/haskell/bytestring-lexing/default.nix @@ -2,12 +2,12 @@ cabal.mkDerivation (self: { pname = "bytestring-lexing"; - version = "0.2.1"; - sha256 = "0pibn4phfp346i6i8zwic5zlbq9lqa6ifyx6bdl3p5c8jy3v23r9"; + version = "0.3.0"; + sha256 = "1jrhmljy7m84imcmvsarv74i3hcm60ja9pl1ww3lm0zgi0rrddqd"; buildTools = [ alex ]; meta = { - homepage = "http://code.haskell.org/~dons/code/bytestring-lexing"; - description = "Parse literals efficiently from bytestrings"; + homepage = "http://code.haskell.org/~wren/"; + description = "Parse literals efficiently from strict or lazy bytestrings"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; maintainers = [ From a11aaa99b271b76fd86fe54f26a69d59f6b272bf Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 29 Jan 2012 16:24:05 +0000 Subject: [PATCH 10/77] haskell-explicit-exception: updated to version 0.1.6 svn path=/nixpkgs/trunk/; revision=31918 --- .../libraries/haskell/explicit-exception/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/libraries/haskell/explicit-exception/default.nix b/pkgs/development/libraries/haskell/explicit-exception/default.nix index efa2f2fb7dd..2a95faafaf6 100644 --- a/pkgs/development/libraries/haskell/explicit-exception/default.nix +++ b/pkgs/development/libraries/haskell/explicit-exception/default.nix @@ -12,5 +12,9 @@ cabal.mkDerivation (self: { description = "Exceptions which are explicit in the type signature"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; }; }) From cab0e0119db28fc398eb764a8fa2b71f94f01dae Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 29 Jan 2012 16:24:08 +0000 Subject: [PATCH 11/77] haskell-mime-mail: updated to version 0.4.1.1 svn path=/nixpkgs/trunk/; revision=31919 --- pkgs/development/libraries/haskell/mime-mail/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/mime-mail/default.nix b/pkgs/development/libraries/haskell/mime-mail/default.nix index db2734c8739..a8b7e733025 100644 --- a/pkgs/development/libraries/haskell/mime-mail/default.nix +++ b/pkgs/development/libraries/haskell/mime-mail/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "mime-mail"; - version = "0.4.1.0"; - sha256 = "1czjxxpv2w8zvwm6nkv0rr47rdl84s5f5xvf3r4kjaw44a6jfgg0"; + version = "0.4.1.1"; + sha256 = "01dshc6ysjkab9hl851948l6k0lwgm1fqmyk97zy7wckb252w6y4"; buildDepends = [ base64Bytestring blazeBuilder random text ]; meta = { homepage = "http://github.com/snoyberg/mime-mail"; From 293b72cf194d1dd67964bcf46db10c1c154d62cb Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 29 Jan 2012 16:24:11 +0000 Subject: [PATCH 12/77] haskell-neither: updated to version 0.3.1 svn path=/nixpkgs/trunk/; revision=31920 --- pkgs/development/libraries/haskell/neither/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/neither/default.nix b/pkgs/development/libraries/haskell/neither/default.nix index d8a737019fc..e5b3e6a8c48 100644 --- a/pkgs/development/libraries/haskell/neither/default.nix +++ b/pkgs/development/libraries/haskell/neither/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "neither"; - version = "0.3.0.1"; - sha256 = "1vr8zap3vp28dr48s510lfrbfhw5yz25vng6wyk20582lv4j2mz8"; + version = "0.3.1"; + sha256 = "1n00v2xs2ghm273barc3bbi67wgpvyihhgl1ij7qczyp9fhqlyfk"; buildDepends = [ failure transformers ]; meta = { homepage = "http://github.com/snoyberg/neither"; From 086e9a090b7891d9f8761cf219845e65c74c7ace Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 29 Jan 2012 16:24:14 +0000 Subject: [PATCH 13/77] haskell-cabal2nix: updated to version 1.24 svn path=/nixpkgs/trunk/; revision=31921 --- pkgs/development/tools/haskell/cabal2nix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/haskell/cabal2nix/default.nix b/pkgs/development/tools/haskell/cabal2nix/default.nix index 1b98d7821e5..ce342d42d57 100644 --- a/pkgs/development/tools/haskell/cabal2nix/default.nix +++ b/pkgs/development/tools/haskell/cabal2nix/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "cabal2nix"; - version = "1.23"; - sha256 = "1rnvnzwb4n89hq4wpyq1h6x773r7y23clqj5slsfnas7j3alzz8c"; + version = "1.24"; + sha256 = "1k0dqj64z08n1kgdjgdk3ra3l8xw1bg7yh0s8s4pv5g2ajwj2f83"; isLibrary = false; isExecutable = true; buildDepends = [ hackageDb HTTP mtl nixosTypes regexPosix ]; From c277a6bc53b23617b01de9360f2fbc8f46acd106 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sun, 29 Jan 2012 18:00:22 +0000 Subject: [PATCH 14/77] Update ruby 1.8 This contains a fix for http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2011-4815. All users of ruby 1.8 for web-facing apps should upgrade svn path=/nixpkgs/trunk/; revision=31922 --- pkgs/development/interpreters/ruby/ruby-18.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/ruby/ruby-18.nix b/pkgs/development/interpreters/ruby/ruby-18.nix index fcd57205dcf..ad89fae057b 100644 --- a/pkgs/development/interpreters/ruby/ruby-18.nix +++ b/pkgs/development/interpreters/ruby/ruby-18.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "ftp://ftp.ruby-lang.org/pub/ruby/1.8/${name}.tar.gz"; - sha256 = "0qf50wa1ziziagnxarj8z6yrsivrhchq1j9017ff3z2z7d31l9kc"; + sha256 = "0b4n9d1idmsl47cq3mw6zhi94yp048ljlfgg9qdblbkvnd7arp1g"; }; # Have `configure' avoid `/usr/bin/nroff' in non-chroot builds. @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { passthru = rec { majorVersion = "1.8"; minorVersion = "7"; - patchLevel = "330"; + patchLevel = "357"; libPath = "lib/ruby/${majorVersion}"; gemPath = "lib/ruby/gems/${majorVersion}"; }; From 32fcb78c1f7b95d4c9bb0f37f5fac175e235f05b Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sun, 29 Jan 2012 18:22:35 +0000 Subject: [PATCH 15/77] Update rubygems svn path=/nixpkgs/trunk/; revision=31923 --- .../interpreters/ruby/generated.nix | 94 +++++++++---------- 1 file changed, 47 insertions(+), 47 deletions(-) diff --git a/pkgs/development/interpreters/ruby/generated.nix b/pkgs/development/interpreters/ruby/generated.nix index 1fea718aeb5..e5e951ef7de 100644 --- a/pkgs/development/interpreters/ruby/generated.nix +++ b/pkgs/development/interpreters/ruby/generated.nix @@ -3,12 +3,12 @@ g: # Get dependencies from patched gems { aliases = { - actionmailer = g.actionmailer_3_2_0; - actionpack = g.actionpack_3_2_0; - activemodel = g.activemodel_3_2_0; - activerecord = g.activerecord_3_2_0; - activeresource = g.activeresource_3_2_0; - activesupport = g.activesupport_3_2_0; + actionmailer = g.actionmailer_3_2_1; + actionpack = g.actionpack_3_2_1; + activemodel = g.activemodel_3_2_1; + activerecord = g.activerecord_3_2_1; + activeresource = g.activeresource_3_2_1; + activesupport = g.activesupport_3_2_1; arel = g.arel_3_0_0; atoulme_Antwrap = g.atoulme_Antwrap_0_7_1; builder = g.builder_3_0_0; @@ -20,7 +20,7 @@ g: # Get dependencies from patched gems hike = g.hike_1_2_1; hoe = g.hoe_2_3_3; i18n = g.i18n_0_6_0; - journey = g.journey_1_0_0; + journey = g.journey_1_0_1; json = g.json_1_6_5; json_pure = g.json_pure_1_6_5; mail = g.mail_2_4_1; @@ -35,12 +35,12 @@ g: # Get dependencies from patched gems rack_cache = g.rack_cache_1_1; rack_ssl = g.rack_ssl_1_3_2; rack_test = g.rack_test_0_6_1; - rails = g.rails_3_2_0; - railties = g.railties_3_2_0; + rails = g.rails_3_2_1; + railties = g.railties_3_2_1; rake = g.rake_0_9_2_2; - rb_fsevent = g.rb_fsevent_0_4_3_1; + rb_fsevent = g.rb_fsevent_0_9_0; rdoc = g.rdoc_3_12; - rjb = g.rjb_1_3_8; + rjb = g.rjb_1_3_9; rspec = g.rspec_2_1_0; rspec_core = g.rspec_core_2_1_0; rspec_expectations = g.rspec_expectations_2_1_0; @@ -57,71 +57,71 @@ g: # Get dependencies from patched gems }; gem_nix_args = [ ''buildr'' ''nix'' ''rails'' ''rake'' ''rb-fsevent'' ''sass'' ]; gems = { - actionmailer_3_2_0 = { + actionmailer_3_2_1 = { basename = ''actionmailer''; meta = { description = ''Email composition, delivery, and receiving framework (part of Rails).''; homepage = ''http://www.rubyonrails.org''; longDescription = ''Email on Rails. Compose, deliver, receive, and test emails using the familiar controller/view pattern. First-class support for multipart email and attachments.''; }; - name = ''actionmailer-3.2.0''; + name = ''actionmailer-3.2.1''; requiredGems = [ g.mail_2_4_1 ]; - sha256 = ''0fhvdbxw93y00awz4xfkyzn78zfca210zwqx7xvaizipaq5rs8d6''; + sha256 = ''02xxyz3r3cfhiynx73y2ybabdhf9x9vxfqj215p8477w6cm2sh47''; }; - actionpack_3_2_0 = { + actionpack_3_2_1 = { basename = ''actionpack''; meta = { description = ''Web-flow and rendering framework putting the VC in MVC (part of Rails).''; homepage = ''http://www.rubyonrails.org''; longDescription = ''Web apps on Rails. Simple, battle-tested conventions for building and testing MVC web applications. Works with any Rack-compatible server.''; }; - name = ''actionpack-3.2.0''; - requiredGems = [ g.activemodel_3_2_0 g.rack_cache_1_1 g.rack_test_0_6_1 g.journey_1_0_0 g.sprockets_2_1_2 g.erubis_2_7_0 ]; - sha256 = ''08fghqa01x6bkcnyik36jaxdd6jp05sh1mnxgqaw4snjwrl5b4ki''; + name = ''actionpack-3.2.1''; + requiredGems = [ g.activemodel_3_2_1 g.rack_cache_1_1 g.rack_test_0_6_1 g.journey_1_0_1 g.sprockets_2_1_2 g.erubis_2_7_0 ]; + sha256 = ''0yz5h8c4m1a8590kdsx2akg3jmbrsjf9wbd950lv19c3sm3sahzx''; }; - activemodel_3_2_0 = { + activemodel_3_2_1 = { basename = ''activemodel''; meta = { description = ''A toolkit for building modeling frameworks (part of Rails).''; homepage = ''http://www.rubyonrails.org''; longDescription = ''A toolkit for building modeling frameworks like Active Record and Active Resource. Rich support for attributes, callbacks, validations, observers, serialization, internationalization, and testing.''; }; - name = ''activemodel-3.2.0''; + name = ''activemodel-3.2.1''; requiredGems = [ g.builder_3_0_0 ]; - sha256 = ''1785g6b1daqncgsyc1kjwhxypx6xk9m3pw5vhipfv2bvygan3y9z''; + sha256 = ''1m639mdhkjwxw7szl3r7ay4s8yjwbh2sfjyv2d4wrkiq4wpz694m''; }; - activerecord_3_2_0 = { + activerecord_3_2_1 = { basename = ''activerecord''; meta = { description = ''Object-relational mapper framework (part of Rails).''; homepage = ''http://www.rubyonrails.org''; longDescription = ''Databases on Rails. Build a persistent domain model by mapping database tables to Ruby classes. Strong conventions for associations, validations, aggregations, migrations, and testing come baked-in.''; }; - name = ''activerecord-3.2.0''; + name = ''activerecord-3.2.1''; requiredGems = [ g.arel_3_0_0 g.tzinfo_0_3_31 ]; - sha256 = ''065yyv3y1wkzm3ykdxd43hmz3q4gadc9qb3psjydqalgii0dr1ww''; + sha256 = ''0xch76nqfgyx750z89lsxkvgshci1y49f4h7xmgiq9nmr4gfxxmv''; }; - activeresource_3_2_0 = { + activeresource_3_2_1 = { basename = ''activeresource''; meta = { description = ''REST modeling framework (part of Rails).''; homepage = ''http://www.rubyonrails.org''; longDescription = ''REST on Rails. Wrap your RESTful web app with Ruby classes and work with them like Active Record models.''; }; - name = ''activeresource-3.2.0''; + name = ''activeresource-3.2.1''; requiredGems = [ ]; - sha256 = ''0lklbgmf1in8cm3w1xl9nxc5yjr9a884fjslyjca42kc7j90mbr7''; + sha256 = ''0fvsi8kikmp287dym3s4y1np9s0sxm0q65kx0idgsp9bi89wpl0d''; }; - activesupport_3_2_0 = { + activesupport_3_2_1 = { basename = ''activesupport''; meta = { description = ''A toolkit of support libraries and Ruby core extensions extracted from the Rails framework.''; homepage = ''http://www.rubyonrails.org''; longDescription = ''A toolkit of support libraries and Ruby core extensions extracted from the Rails framework. Rich support for multibyte strings, internationalization, time zones, and testing.''; }; - name = ''activesupport-3.2.0''; + name = ''activesupport-3.2.1''; requiredGems = [ g.i18n_0_6_0 g.multi_json_1_0_4 ]; - sha256 = ''07x0jl4fnjgiblffbwmjnqzly765l55y9zmyad8divcaa1qjqwmb''; + sha256 = ''0ajkzsa7467jp7lxgjcsl94nqkvw9d0h492rypljs0f8f1fn744v''; }; arel_3_0_0 = { basename = ''arel''; @@ -160,7 +160,7 @@ database compatibility and query generation.''; check out Buildr!''; }; name = ''atoulme-Antwrap-0.7.1''; - requiredGems = [ g.rjb_1_3_8 ]; + requiredGems = [ g.rjb_1_3_9 ]; sha256 = ''0r9jy2asyma8h0878nhjfbi00qvb4yapc8glngvmkkj21zbx2mfy''; }; builder_2_1_2 = { @@ -339,16 +339,16 @@ See class rdoc for help. Hint: ri Hoe''; requiredGems = [ ]; sha256 = ''1pgmfhmh2wv409g7kla30mkp8jpslvp25vcmmim1figl87wpn3j0''; }; - journey_1_0_0 = { + journey_1_0_1 = { basename = ''journey''; meta = { description = ''Journey is a router''; homepage = ''http://github.com/tenderlove/journey''; longDescription = ''Journey is a router. It routes requests.''; }; - name = ''journey-1.0.0''; + name = ''journey-1.0.1''; requiredGems = [ ]; - sha256 = ''0xphcsxksy0m78j1mphzp0lyj7bgrabdnlgs18lrkwivs0gryhdd''; + sha256 = ''1fccxnc9ji6j2p1avfph701b0lf2rzsksyipfavhv8kjwlzvsglx''; }; json_1_6_5 = { basename = ''json''; @@ -554,27 +554,27 @@ request helpers feature.''; requiredGems = [ ]; sha256 = ''0hq5q8fjhbb7szzrj7k0l21z025c4qsxqzd5qmgivikhymw10ws0''; }; - rails_3_2_0 = { + rails_3_2_1 = { basename = ''rails''; meta = { description = ''Full-stack web application framework.''; homepage = ''http://www.rubyonrails.org''; longDescription = ''Ruby on Rails is a full-stack web framework optimized for programmer happiness and sustainable productivity. It encourages beautiful code by favoring convention over configuration.''; }; - name = ''rails-3.2.0''; - requiredGems = [ g.activesupport_3_2_0 g.actionpack_3_2_0 g.activerecord_3_2_0 g.activeresource_3_2_0 g.actionmailer_3_2_0 g.railties_3_2_0 g.bundler_1_0_21 ]; - sha256 = ''10jc4ri60ivd5z54k0i4l1pdqbmswwhh05ydca7axpd9d1ss1jzh''; + name = ''rails-3.2.1''; + requiredGems = [ g.activesupport_3_2_1 g.actionpack_3_2_1 g.activerecord_3_2_1 g.activeresource_3_2_1 g.actionmailer_3_2_1 g.railties_3_2_1 g.bundler_1_0_21 ]; + sha256 = ''0fx5pmywvh0s263dd6qv34rbc4qxnla5qzh8r30zrip24j6w0nr5''; }; - railties_3_2_0 = { + railties_3_2_1 = { basename = ''railties''; meta = { description = ''Tools for creating, working with, and running Rails applications.''; homepage = ''http://www.rubyonrails.org''; longDescription = ''Rails internals: application bootup, plugins, generators, and rake tasks.''; }; - name = ''railties-3.2.0''; + name = ''railties-3.2.1''; requiredGems = [ g.thor_0_14_6 g.rack_ssl_1_3_2 g.rdoc_3_12 ]; - sha256 = ''0zwdjj6kfgpslqywyhc171pfp9zc26hs4z0fx0hysyvvc961qhb3''; + sha256 = ''13ya1jryzz8s1j1vh1qw44y282vjjk72nf3a6dzsna9z8yx4278h''; }; rake_0_8_7 = { basename = ''rake''; @@ -598,16 +598,16 @@ request helpers feature.''; requiredGems = [ ]; sha256 = ''19n4qp5gzbcqy9ajh56kgwqv9p9w2hnczhyvaqz0nlvk9diyng6q''; }; - rb_fsevent_0_4_3_1 = { + rb_fsevent_0_9_0 = { basename = ''rb_fsevent''; meta = { description = ''Very simple & usable FSEvents API''; homepage = ''http://rubygems.org/gems/rb-fsevent''; longDescription = ''FSEvents API with Signals catching (without RubyCocoa)''; }; - name = ''rb-fsevent-0.4.3.1''; + name = ''rb-fsevent-0.9.0''; requiredGems = [ ]; - sha256 = ''043w4695j7f9n0hawy9y0yci36linivsbp23v52v2qg64ji7hsiw''; + sha256 = ''1sk7y6bxq8p4vh2cv4zk320xlxrbs15n2knyyvdd1bj89wmmiryy''; }; rdoc_3_12 = { basename = ''rdoc''; @@ -636,7 +636,7 @@ See RDoc for a description of RDoc's markup and basic use.''; requiredGems = [ ]; sha256 = ''0jhj1y84yzdr11li784m255jvc191vs8d3zck21rfqv4z4zpifz6''; }; - rjb_1_3_8 = { + rjb_1_3_9 = { basename = ''rjb''; meta = { description = ''Ruby Java bridge''; @@ -644,9 +644,9 @@ See RDoc for a description of RDoc's markup and basic use.''; longDescription = ''RJB is a bridge program that connect between Ruby and Java with Java Native Interface. ''; }; - name = ''rjb-1.3.8''; + name = ''rjb-1.3.9''; requiredGems = [ ]; - sha256 = ''0cwc3zh9ydwzvc176vjin7jpf8riisyjdwbywrmvc426kjyrrwwr''; + sha256 = ''0iimwg22jacbidc43lngqndbnvgv4f9zppxzy008gi88pqgargsd''; }; rspec_2_1_0 = { basename = ''rspec''; From 7fb6f58f99981ffc2522405b78eb68b552df5a52 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sun, 29 Jan 2012 20:40:32 +0000 Subject: [PATCH 16/77] Add the selenium-webdriver rubygem svn path=/nixpkgs/trunk/; revision=31924 --- .../interpreters/ruby/generated.nix | 54 ++++++++++++++++++- 1 file changed, 52 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/ruby/generated.nix b/pkgs/development/interpreters/ruby/generated.nix index e5e951ef7de..712b2fe0483 100644 --- a/pkgs/development/interpreters/ruby/generated.nix +++ b/pkgs/development/interpreters/ruby/generated.nix @@ -14,8 +14,10 @@ g: # Get dependencies from patched gems builder = g.builder_3_0_0; buildr = g.buildr_1_4_6; bundler = g.bundler_1_0_21; + childprocess = g.childprocess_0_3_0; diff_lcs = g.diff_lcs_1_1_3; erubis = g.erubis_2_7_0; + ffi = g.ffi_1_0_11; highline = g.highline_1_5_1; hike = g.hike_1_2_1; hoe = g.hoe_2_3_3; @@ -46,8 +48,9 @@ g: # Get dependencies from patched gems rspec_expectations = g.rspec_expectations_2_1_0; rspec_mocks = g.rspec_mocks_2_1_0; rubyforge = g.rubyforge_2_0_4; - rubyzip = g.rubyzip_0_9_4; + rubyzip = g.rubyzip_0_9_5; sass = g.sass_3_1_12; + selenium_webdriver = g.selenium_webdriver_2_18_0; sprockets = g.sprockets_2_1_2; thor = g.thor_0_14_6; tilt = g.tilt_1_3_3; @@ -55,7 +58,7 @@ g: # Get dependencies from patched gems tzinfo = g.tzinfo_0_3_31; xml_simple = g.xml_simple_1_0_12; }; - gem_nix_args = [ ''buildr'' ''nix'' ''rails'' ''rake'' ''rb-fsevent'' ''sass'' ]; + gem_nix_args = [ ''buildr'' ''nix'' ''rails'' ''rake'' ''rb-fsevent'' ''sass'' ''selenium-webdriver'' ]; gems = { actionmailer_3_2_1 = { basename = ''actionmailer''; @@ -217,6 +220,17 @@ for those one-off tasks, with a language that's a joy to use. requiredGems = [ ]; sha256 = ''0lcxz75vvgqib43wxzv6021qs5d7bxhnds4j4q27hzqs982cn0s6''; }; + childprocess_0_3_0 = { + basename = ''childprocess''; + meta = { + description = ''This gem aims at being a simple and reliable solution for controlling external programs running in the background on any Ruby / OS combination.''; + homepage = ''http://github.com/jarib/childprocess''; + longDescription = ''This gem aims at being a simple and reliable solution for controlling external programs running in the background on any Ruby / OS combination.''; + }; + name = ''childprocess-0.3.0''; + requiredGems = [ g.ffi_1_0_11 ]; + sha256 = ''1bvx6nkc1m24wjjybk943x1vjr51c98l0pwj73hj1r237307jyb4''; + }; diff_lcs_1_1_2 = { basename = ''diff_lcs''; meta = { @@ -276,6 +290,21 @@ is the MIT license.''; requiredGems = [ ]; sha256 = ''1fj827xqjs91yqsydf0zmfyw9p4l2jz5yikg3mppz6d7fi8kyrb3''; }; + ffi_1_0_11 = { + basename = ''ffi''; + meta = { + description = ''Ruby-FFI is a ruby extension for programmatically loading dynamic libraries, binding functions within them, and calling those functions from Ruby code''; + homepage = ''http://wiki.github.com/ffi/ffi''; + longDescription = ''Ruby-FFI is a ruby extension for programmatically loading dynamic +libraries, binding functions within them, and calling those functions +from Ruby code. Moreover, a Ruby-FFI extension works without changes +on Ruby and JRuby. Discover why should you write your next extension +using Ruby-FFI here[http://wiki.github.com/ffi/ffi/why-use-ffi].''; + }; + name = ''ffi-1.0.11''; + requiredGems = [ ]; + sha256 = ''177v6bwslyb7n961nw11i8x9j43k796s11bs98kynl58n0a3n99b''; + }; highline_1_5_1 = { basename = ''highline''; meta = { @@ -738,6 +767,16 @@ See RDoc for a description of RDoc's markup and basic use.''; requiredGems = [ ]; sha256 = ''1lc67ssqyz49rm1jms5sdvy6x41h070razxlmvj4j5q6w3qixx41''; }; + rubyzip_0_9_5 = { + basename = ''rubyzip''; + meta = { + description = ''rubyzip is a ruby module for reading and writing zip files''; + homepage = ''http://github.com/aussiegeek/rubyzip''; + }; + name = ''rubyzip-0.9.5''; + requiredGems = [ ]; + sha256 = ''1744bds6lc46d1kjfgapf34p2574s70hcyz63877qkry4db2jb54''; + }; sass_3_1_12 = { basename = ''sass''; meta = { @@ -753,6 +792,17 @@ See RDoc for a description of RDoc's markup and basic use.''; requiredGems = [ ]; sha256 = ''10n2aic53290xsa3y3d63523s8xc78w5q5gqpns6cbljkdwb0ndy''; }; + selenium_webdriver_2_18_0 = { + basename = ''selenium_webdriver''; + meta = { + description = ''The next generation developer focused tool for automated testing of webapps''; + homepage = ''http://selenium.googlecode.com''; + longDescription = ''WebDriver is a tool for writing automated tests of websites. It aims to mimic the behaviour of a real user, and as such interacts with the HTML of the application.''; + }; + name = ''selenium-webdriver-2.18.0''; + requiredGems = [ g.rubyzip_0_9_5 g.childprocess_0_3_0 ]; + sha256 = ''17am2b6bjv62s02n1bfmhg9wz5n7sppzh7dx1llp28ivj2hdfbg9''; + }; sprockets_2_1_2 = { basename = ''sprockets''; meta = { From 55e74d5e9a03902604fd108d6e51c04dd4126392 Mon Sep 17 00:00:00 2001 From: Alexander Tsamutali Date: Sun, 29 Jan 2012 22:44:49 +0000 Subject: [PATCH 17/77] games/oilrush: New nixpkg. svn path=/nixpkgs/trunk/; revision=31925 --- pkgs/games/oilrush/default.nix | 74 +++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 76 insertions(+) create mode 100644 pkgs/games/oilrush/default.nix diff --git a/pkgs/games/oilrush/default.nix b/pkgs/games/oilrush/default.nix new file mode 100644 index 00000000000..4605f04e3ae --- /dev/null +++ b/pkgs/games/oilrush/default.nix @@ -0,0 +1,74 @@ +{ stdenv, getConfig, fetchurl, libX11, libXext, libXinerama, libXrandr +, libXrender, fontconfig, freetype, openal }: +stdenv.mkDerivation { + name = "oilrush"; + src = + let + url = getConfig [ "oilrush" "url" ] null; + sha256 = getConfig [ "oilrush" "sha256" ] null; + in + assert url != null && sha256 != null; + fetchurl { inherit url sha256; }; + shell = stdenv.shell; + arch = if stdenv.system == "x86_64-linux" then "x64" + else if stdenv.system == "i686-linux" then "x86" + else ""; + unpackPhase = '' + mkdir oilrush + cd oilrush + "$shell" "$src" --tar xf + ''; + patchPhase = '' + cd bin + for f in launcher_$arch libQtCoreUnigine_$arch.so.4 OilRush_$arch + do + patchelf --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" $f + done + patchelf --set-rpath ${stdenv.gcc.gcc}/lib64:${stdenv.gcc.gcc}/lib:${libX11}/lib:${libXext}/lib:${libXrender}/lib:${fontconfig}/lib:${freetype}/lib\ + launcher_$arch + patchelf --set-rpath ${stdenv.gcc.gcc}/lib64:${stdenv.gcc.gcc}/lib\ + libNetwork_$arch.so + patchelf --set-rpath ${stdenv.gcc.gcc}/lib64:${stdenv.gcc.gcc}/lib\ + libQtCoreUnigine_$arch.so.4 + patchelf --set-rpath ${stdenv.gcc.gcc}/lib64:${stdenv.gcc.gcc}/lib:${libX11}/lib:${libXext}/lib:${libXrender}/lib:${fontconfig}/lib:${freetype}/lib\ + libQtGuiUnigine_$arch.so.4 + patchelf --set-rpath ${stdenv.gcc.gcc}/lib64:${stdenv.gcc.gcc}/lib\ + libQtNetworkUnigine_$arch.so.4 + patchelf --set-rpath ${stdenv.gcc.gcc}/lib64:${stdenv.gcc.gcc}/lib:${libX11}/lib:${libXext}/lib:${libXrender}/lib:${fontconfig}/lib:${freetype}/lib\ + libQtWebKitUnigine_$arch.so.4 + patchelf --set-rpath ${stdenv.gcc.gcc}/lib64:${stdenv.gcc.gcc}/lib\ + libQtXmlUnigine_$arch.so.4 + patchelf --set-rpath ${stdenv.gcc.gcc}/lib64:${stdenv.gcc.gcc}/lib\ + libRakNet_$arch.so + patchelf --set-rpath ${stdenv.gcc.gcc}/lib64:${stdenv.gcc.gcc}/lib:${libX11}/lib:${libXext}/lib:${libXinerama}/lib:${libXrandr}/lib\ + libUnigine_$arch.so + patchelf --set-rpath ${stdenv.gcc.gcc}/lib64:${stdenv.gcc.gcc}/lib:${libX11}/lib:${libXext}/lib:${libXinerama}/lib:${libXrandr}/lib\ + OilRush_$arch + ''; + installPhase = '' + cd .. + mkdir -p "$out/opt/oilrush" + cp -r * "$out/opt/oilrush" + mkdir -p "$out/bin" + cat << EOF > "$out/bin/oilrush" + #! /bin/sh + LD_LIBRARY_PATH=.:${openal}/lib:\$LD_LIBRARY_PATH + cd "$out/opt/oilrush" + exec ./launcher_$arch.sh "\$@" + EOF + chmod +x "$out/bin/oilrush" + ''; + meta = { + description = "A naval strategy game"; + longDescription = '' + Oil Rush is a real-time naval strategy game based on group control. It + combines the strategic challenge of a classical RTS with the sheer fun + of Tower Defense. + ''; + homepage = http://oilrush-game.com/; + license = [ "proprietary" ]; + #maintainers = with stdenv.lib.maintainers; [ astsmtl ]; + #platforms = with stdenv.lib.platforms; linux; + }; + +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 671a9fb3336..34cb5acf25a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7945,6 +7945,8 @@ let njam = callPackage ../games/njam { }; + oilrush = callPackage ../games/oilrush { }; + openttd = callPackage ../games/openttd { zlib = zlibStatic; }; From 67a45c1d25a01c0972f0934bef2f84481e97777e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Mon, 30 Jan 2012 09:53:39 +0000 Subject: [PATCH 18/77] MinGW 3.20, and w32api 3.17-2. svn path=/nixpkgs/trunk/; revision=31926 --- pkgs/os-specific/windows/mingwrt/default.nix | 6 +++--- pkgs/os-specific/windows/w32api/default.nix | 13 ++++++++----- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/pkgs/os-specific/windows/mingwrt/default.nix b/pkgs/os-specific/windows/mingwrt/default.nix index aecf43c9123..e5b42c29467 100644 --- a/pkgs/os-specific/windows/mingwrt/default.nix +++ b/pkgs/os-specific/windows/mingwrt/default.nix @@ -1,14 +1,14 @@ {stdenv, fetchurl, binutilsCross ? null, gccCross ? null, onlyHeaders ? false}: let - name = "mingwrt-3.18"; + name = "mingwrt-3.20"; in stdenv.mkDerivation (rec { inherit name; src = fetchurl { - url = "mirror://sourceforge/mingw/${name}-mingw32-src.tar.gz"; - sha256 = "0hmxgkxnf6an70g07gmyik46sw1qm204izh6sp923szddvypjjfy"; + url = "mirror://sourceforge/mingw/MinGW/Base/mingw-rt/${name}-mingw32-src.tar.gz"; + sha256 = "02pydg1m8y35nxb4k34nlb5c341y2waq76z42mgdzlcf661r91pi"; }; } // diff --git a/pkgs/os-specific/windows/w32api/default.nix b/pkgs/os-specific/windows/w32api/default.nix index 570b83f671e..09484911bc1 100644 --- a/pkgs/os-specific/windows/w32api/default.nix +++ b/pkgs/os-specific/windows/w32api/default.nix @@ -1,16 +1,19 @@ -{stdenv, fetchurl, binutilsCross ? null, gccCross ? null, onlyHeaders ? false}: +{ stdenv, fetchurl, xz, binutilsCross ? null +, gccCross ? null, onlyHeaders ? false }: let - name = "w32api-3.14"; + name = "w32api-3.17-2"; in stdenv.mkDerivation ({ inherit name; - + src = fetchurl { - url = "mirror://sourceforge/mingw/${name}-mingw32-src.tar.gz"; - sha256 = "128ax8a4dlspxsi5fi7bi1aslppqx3kczr1ibzj1z1az48bvwp21"; + url = "mirror://sourceforge/mingw/MinGW/Base/w32api/w32api-3.17/${name}-mingw32-src.tar.lzma"; + sha256 = "09rhnl6zikmdyb960im55jck0rdy5z9nlg3akx68ixn7khf3j8wb"; }; + buildNativeInputs = [ xz ]; + } // (if onlyHeaders then { name = name + "-headers"; From 010edf825c32d90e3ee14eb15d35ef4e40e0184a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Mon, 30 Jan 2012 09:53:45 +0000 Subject: [PATCH 19/77] Add pthreads-w32. svn path=/nixpkgs/trunk/; revision=31927 --- .../windows/pthread-w32/default.nix | 53 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++ 2 files changed, 57 insertions(+) create mode 100644 pkgs/os-specific/windows/pthread-w32/default.nix diff --git a/pkgs/os-specific/windows/pthread-w32/default.nix b/pkgs/os-specific/windows/pthread-w32/default.nix new file mode 100644 index 00000000000..39afd119643 --- /dev/null +++ b/pkgs/os-specific/windows/pthread-w32/default.nix @@ -0,0 +1,53 @@ +{ fetchurl, stdenv, mingw_headers }: + +# This file is tweaked for cross-compilation only. +assert stdenv ? cross; + +stdenv.mkDerivation { + name = "pthread-w32-1.10.0"; + + src = fetchurl { + url = "ftp://sourceware.org/pub/pthreads-win32/pthreads-w32-1-10-0-release.tar.gz"; + sha256 = "1vllxxfa9a7mssb1x98a2r736vsv5ll3sjizbr7a8hw8j9p18j7n"; + }; + + configurePhase = + '' sed -i GNUmakefile \ + -e 's/CC=gcc/CC=i686-pc-mingw32-gcc/g ; + s/windres/i686-pc-mingw32-windres/g ; + s/dlltool/i686-pc-mingw32-dlltool/g' + ''; + + buildInputs = [ mingw_headers ]; + + buildPhase = "make GC"; # to build the GNU C dll with C cleanup code + + installPhase = + '' mkdir -p "$out" "$out/include" "$out/lib" + cp -v *pthread*{dll,a} "$out/lib" + cp -v pthread.h semaphore.h sched.h "$out/include" + ''; + + meta = { + description = "POSIX threads for Woe32"; + + longDescription = + '' The POSIX 1003.1-2001 standard defines an application programming + interface (API) for writing multithreaded applications. This + interface is known more commonly as pthreads. A good number of + modern operating systems include a threading library of some kind: + Solaris (UI) threads, Win32 threads, DCE threads, DECthreads, or any + of the draft revisions of the pthreads standard. The trend is that + most of these systems are slowly adopting the pthreads standard API, + with application developers following suit to reduce porting woes. + + Woe32 does not, and is unlikely to ever, support pthreads natively. + This project seeks to provide a freely available and high-quality + solution to this problem. + ''; + + homepage = http://sourceware.org/pthreads-win32/; + + license = "LGPLv2.1+"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 34cb5acf25a..4bf3f43d455 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6253,6 +6253,10 @@ let paths = [ w32api mingw_runtime ]; }; + pthreads = callPackage ../os-specific/windows/pthread-w32 { + mingw_headers = mingw_headers2; + }; + wxMSW = callPackage ../os-specific/windows/wxMSW-2.8 { }; }; From 588da3fbf3d7d2d0d6107089c32c90c8cd73495c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 30 Jan 2012 10:52:01 +0000 Subject: [PATCH 20/77] haskell-packages.nix: cosmetic svn path=/nixpkgs/trunk/; revision=31928 --- pkgs/top-level/haskell-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 8c9fdf59f91..3885912106e 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1048,7 +1048,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); pathPieces_0_1_0 = callPackage ../development/libraries/haskell/path-pieces/0.1.0.nix {}; pathPieces = self.pathPieces_0_1_0; - pandoc = callPackage ../development/libraries/haskell/pandoc/default.nix {}; + pandoc = callPackage ../development/libraries/haskell/pandoc {}; pandocTypes = callPackage ../development/libraries/haskell/pandoc-types {}; From 9d693c2e4ef725109c637c26b70d49e47f0a8612 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 30 Jan 2012 10:52:04 +0000 Subject: [PATCH 21/77] haskell-cmdargs: added version 0.9.2 svn path=/nixpkgs/trunk/; revision=31929 --- .../haskell/cmdargs/{default.nix => 0.8.nix} | 0 .../libraries/haskell/cmdargs/0.9.2.nix | 20 +++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 8 ++++++-- 3 files changed, 26 insertions(+), 2 deletions(-) rename pkgs/development/libraries/haskell/cmdargs/{default.nix => 0.8.nix} (100%) create mode 100644 pkgs/development/libraries/haskell/cmdargs/0.9.2.nix diff --git a/pkgs/development/libraries/haskell/cmdargs/default.nix b/pkgs/development/libraries/haskell/cmdargs/0.8.nix similarity index 100% rename from pkgs/development/libraries/haskell/cmdargs/default.nix rename to pkgs/development/libraries/haskell/cmdargs/0.8.nix diff --git a/pkgs/development/libraries/haskell/cmdargs/0.9.2.nix b/pkgs/development/libraries/haskell/cmdargs/0.9.2.nix new file mode 100644 index 00000000000..7024b08a672 --- /dev/null +++ b/pkgs/development/libraries/haskell/cmdargs/0.9.2.nix @@ -0,0 +1,20 @@ +{ cabal, transformers }: + +cabal.mkDerivation (self: { + pname = "cmdargs"; + version = "0.9.2"; + sha256 = "1c0xy4g9b5jqy51qhgq7djafqz27z6q7ya31pgy186pfgl7604kr"; + isLibrary = true; + isExecutable = true; + buildDepends = [ transformers ]; + meta = { + homepage = "http://community.haskell.org/~ndm/cmdargs/"; + description = "Command line argument processing"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 3885912106e..1898229ec8a 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -531,7 +531,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); clientsession = callPackage ../development/libraries/haskell/clientsession {}; - cmdargs = callPackage ../development/libraries/haskell/cmdargs {}; + cmdargs_0_8 = callPackage ../development/libraries/haskell/cmdargs/0.8.nix {}; + cmdargs_0_9_2 = callPackage ../development/libraries/haskell/cmdargs/0.9.2.nix {}; + cmdargs = self.cmdargs_0_9_2; cmdlib = callPackage ../development/libraries/haskell/cmdlib {}; @@ -830,7 +832,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); hjsmin = callPackage ../development/libraries/haskell/hjsmin {}; hledger = callPackage ../development/libraries/haskell/hledger {}; - hledgerLib = callPackage ../development/libraries/haskell/hledger-lib {}; + hledgerLib = callPackage ../development/libraries/haskell/hledger-lib { + cmdargs = self.cmdargs_0_8; + }; hledgerVty = callPackage ../development/libraries/haskell/hledger-vty {}; hledgerChart = callPackage ../development/libraries/haskell/hledger-chart {}; hledgerInterest = callPackage ../applications/office/hledger-interest {}; From 8b972e410c740228817bac9627409be1e019330b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 30 Jan 2012 10:52:07 +0000 Subject: [PATCH 22/77] haskell-Chart: updated to version 0.15 svn path=/nixpkgs/trunk/; revision=31930 --- pkgs/development/libraries/haskell/Chart/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/haskell/Chart/default.nix b/pkgs/development/libraries/haskell/Chart/default.nix index daf15c0cb2e..1976472da23 100644 --- a/pkgs/development/libraries/haskell/Chart/default.nix +++ b/pkgs/development/libraries/haskell/Chart/default.nix @@ -1,13 +1,13 @@ -{ cabal, cairo, colour, dataAccessor, dataAccessorTemplate, gtk -, mtl, time +{ cabal, cairo, colour, dataAccessor, dataAccessorTemplate, mtl +, time }: cabal.mkDerivation (self: { pname = "Chart"; - version = "0.14"; - sha256 = "0ji81j4c2by5zyrdhx1s17j6kqsi3ngr9y1zh7hr9wv7jsrj3rf2"; + version = "0.15"; + sha256 = "1357gqn2ifalknl85n2z9ysf195dnaxm175rp0kmmzbf4vik9gc4"; buildDepends = [ - cairo colour dataAccessor dataAccessorTemplate gtk mtl time + cairo colour dataAccessor dataAccessorTemplate mtl time ]; meta = { homepage = "http://www.dockerz.net/software/chart.html"; From b24279ff398b00f64ffb223e688d5844e43a3664 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 30 Jan 2012 10:52:10 +0000 Subject: [PATCH 23/77] haskell-hledger-chart: updated to version 0.16.1 svn path=/nixpkgs/trunk/; revision=31931 --- pkgs/development/libraries/haskell/hledger-chart/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/libraries/haskell/hledger-chart/default.nix b/pkgs/development/libraries/haskell/hledger-chart/default.nix index 84b8c33fc21..020a8dfa2af 100644 --- a/pkgs/development/libraries/haskell/hledger-chart/default.nix +++ b/pkgs/development/libraries/haskell/hledger-chart/default.nix @@ -11,6 +11,9 @@ cabal.mkDerivation (self: { buildDepends = [ Chart cmdargs colour hledger hledgerLib HUnit safe time ]; + patchPhase = '' + sed -i hledger-chart.cabal -e 's|Chart >= 0.11 && < 0.15|Chart|g' + ''; meta = { homepage = "http://hledger.org"; description = "A pie chart image generator for the hledger accounting tool"; From b2bbcc7d5facb7342d9fb36a0397a7519790c0e4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 30 Jan 2012 10:52:13 +0000 Subject: [PATCH 24/77] haskell-cabal-ghci: updated to version 0.2.1 svn path=/nixpkgs/trunk/; revision=31932 --- pkgs/development/tools/haskell/cabal-ghci/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/haskell/cabal-ghci/default.nix b/pkgs/development/tools/haskell/cabal-ghci/default.nix index b55127e43bc..3dd9cb9926f 100644 --- a/pkgs/development/tools/haskell/cabal-ghci/default.nix +++ b/pkgs/development/tools/haskell/cabal-ghci/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "cabal-ghci"; - version = "0.2.0"; - sha256 = "0920q103g626f8syvn73bwqnix8x6q58xyazys6yinhr7dgi2x6m"; + version = "0.2.1"; + sha256 = "0za0bf59f4a3v5zvyy7h1xvxskrazdga4j1cs6psfv9fv80qig9r"; isLibrary = true; isExecutable = true; meta = { From f1e16ea3c9e7f93f6e9f29586cff016c92fd44d3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 30 Jan 2012 11:40:16 +0000 Subject: [PATCH 25/77] ikiwiki: updated to version 3.20120115 svn path=/nixpkgs/trunk/; revision=31933 --- pkgs/applications/misc/ikiwiki/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/ikiwiki/default.nix b/pkgs/applications/misc/ikiwiki/default.nix index fc800dc2222..feb507c8732 100644 --- a/pkgs/applications/misc/ikiwiki/default.nix +++ b/pkgs/applications/misc/ikiwiki/default.nix @@ -13,14 +13,14 @@ assert monotoneSupport -> (monotone != null); let name = "ikiwiki"; - version = "3.20120109"; + version = "3.20120115"; in stdenv.mkDerivation { name = "${name}-${version}"; src = fetchurl { url = "http://ftp.de.debian.org/debian/pool/main/i/ikiwiki/${name}_${version}.tar.gz"; - sha256 = "0a47135c039f3dfd62162dd3b250397fcdab2dbb4bf4cf0433099f6e48d6f3e8"; + sha256 = "3145372b3d86068f90348a96f9daf3a3b438d747be0e977358d82ee752499c1f"; }; buildInputs = [ perl TextMarkdown URI HTMLParser HTMLScrubber HTMLTemplate From c5ecd1752cb2cdbea34c586acddbcd908683f139 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 30 Jan 2012 11:40:20 +0000 Subject: [PATCH 26/77] hardlink: initial version Hardlink consolidates duplicate files in a directory hierarchy with hardlinks, similar to "nix-store --optimise". IHMO, this program should be run by the default builder after $out has been set up, to remove redundancy in the generated closures. svn path=/nixpkgs/trunk/; revision=31934 --- pkgs/tools/system/hardlink/default.nix | 37 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 39 insertions(+) create mode 100644 pkgs/tools/system/hardlink/default.nix diff --git a/pkgs/tools/system/hardlink/default.nix b/pkgs/tools/system/hardlink/default.nix new file mode 100644 index 00000000000..1655fdba6f4 --- /dev/null +++ b/pkgs/tools/system/hardlink/default.nix @@ -0,0 +1,37 @@ +{ fetchurl, stdenv }: + +let + rev = "269cc6"; + + src = fetchurl { + url = "http://pkgs.fedoraproject.org/gitweb/?p=hardlink.git;a=blob_plain;f=hardlink.c;hb=${rev}"; + sha256 = "721c54e653772e11bf0d30fb02aa21b96b147a1b68c0acb4f05cb87e7718bc12"; + name = "hardlink.c"; + }; + + man = fetchurl { + url = "pkgs.fedoraproject.org/gitweb/?p=hardlink.git;a=blob_plain;f=hardlink.1;hb=${rev}"; + sha256 = "2f7e18a0259a2ceae316592e8b18bee525eb7e83fe3bb6b881e5dafa24747f2d"; + name = "hardlink.1"; + }; +in +stdenv.mkDerivation { + name = "hardlink-2010.1.${rev}"; + + phases = ["buildPhase"]; + + buildPhase = '' + mkdir -p $out/bin $out/share/man/man1 + gcc -O2 ${src} -o $out/bin/hardlink + install -m 444 ${man} $out/share/man/man1/hardlink.1 + ''; + + meta = { + homepage = "http://pkgs.fedoraproject.org/gitweb/?p=hardlink.git;a=summary"; + description = "consolidate duplicate files via hardlinks"; + license = stdenv.lib.licenses.gpl2Plus; + + platforms = stdenv.lib.platforms.unix; + maintainers = [ stdenv.lib.maintainers.simons ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4bf3f43d455..7b43cae587e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -830,6 +830,8 @@ let pigz = callPackage ../tools/compression/pigz { }; + hardlink = callPackage ../tools/system/hardlink { }; + halibut = callPackage ../tools/typesetting/halibut { }; hddtemp = callPackage ../tools/misc/hddtemp { }; From 399c575139eec01a31f6b9cffed9d59b536786bc Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 30 Jan 2012 16:44:56 +0000 Subject: [PATCH 27/77] * Updated Spotify to 0.6.6.10. svn path=/nixpkgs/trunk/; revision=31935 --- pkgs/applications/audio/spotify/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix index 38eb51b93db..4711d0f29ea 100644 --- a/pkgs/applications/audio/spotify/default.nix +++ b/pkgs/applications/audio/spotify/default.nix @@ -2,7 +2,7 @@ assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"; -let version = "0.6.2.291"; in +let version = "0.6.6.10"; in stdenv.mkDerivation { name = "spotify-${version}"; @@ -10,13 +10,13 @@ stdenv.mkDerivation { src = if stdenv.system == "i686-linux" then fetchurl { - url = "http://repository.spotify.com/pool/non-free/s/spotify/spotify-client-qt_${version}.gcccc1f5.116-1_i386.deb"; - sha256 = "164ka9xry9nbnv77w71kzi7bjidlmccw8wnn4fyzavi8pbrpmj08"; + url = "http://repository.spotify.com/pool/non-free/s/spotify/spotify-client-qt_${version}.gbd39032.58-1_i386.deb"; + sha256 = "184wvw2jqihw7bbmd7pgz51nkzvk777imz9pvknv52mggai61523"; } else if stdenv.system == "x86_64-linux" then fetchurl { - url = "http://repository.spotify.com/pool/non-free/s/spotify/spotify-client-qt_${version}.gcccc1f5.116-1_amd64.deb"; - sha256 = "08snnpqd5ldiqv98pwx3fjrhdlwp4arbgda9xnsy92wfk0s85lv8"; + url = "http://repository.spotify.com/pool/non-free/s/spotify/spotify-client-qt_${version}.gbd39032.58-1_amd64.deb"; + sha256 = "0qy4dgcl4y8ymqk8i9vgabik7mq0niqpbkwl3sk8z66znax4am4c"; } else throw "Spotify not supported on this platform."; From 37b404816a45bd66e37617e198d20c2dd0653465 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Mon, 30 Jan 2012 19:05:24 +0000 Subject: [PATCH 28/77] add cowsay svn path=/nixpkgs/trunk/; revision=31936 --- pkgs/tools/misc/cowsay/default.nix | 13 +++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 15 insertions(+) create mode 100644 pkgs/tools/misc/cowsay/default.nix diff --git a/pkgs/tools/misc/cowsay/default.nix b/pkgs/tools/misc/cowsay/default.nix new file mode 100644 index 00000000000..19747e92f0f --- /dev/null +++ b/pkgs/tools/misc/cowsay/default.nix @@ -0,0 +1,13 @@ +{ stdenv, fetchurl, perl }: + +stdenv.mkDerivation { + name = "cowsay-3.03"; + src = fetchurl { + url = http://www.nog.net/~tony/warez/cowsay-3.03.tar.gz; + sha256 = "1bxj802na2si2bk5zh7n0b7c33mg8a5n2wnvh0vihl9bmjkp51hb"; + }; + buildInputs = [perl]; + installPhase = '' + bash ./install.sh $out + ''; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7b43cae587e..7281b659ce2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -505,6 +505,8 @@ let convertlit = callPackage ../tools/text/convertlit { }; + cowsay = callPackage ../tools/misc/cowsay { }; + unifdef = callPackage ../development/tools/misc/unifdef { }; usb_modeswitch = callPackage ../development/tools/misc/usb-modeswitch { }; From d341b2537c4a11a6b05e4ee27a55d611aa11c44c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Mon, 30 Jan 2012 21:02:08 +0000 Subject: [PATCH 29/77] Updating ffmpeg/x264/vpx svn path=/nixpkgs/trunk/; revision=31937 --- pkgs/development/libraries/ffmpeg/default.nix | 4 ++-- pkgs/development/libraries/libvpx/default.nix | 12 ++++++------ pkgs/development/libraries/x264/default.nix | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/development/libraries/ffmpeg/default.nix b/pkgs/development/libraries/ffmpeg/default.nix index b77b52a5e65..38f12f779b6 100644 --- a/pkgs/development/libraries/ffmpeg/default.nix +++ b/pkgs/development/libraries/ffmpeg/default.nix @@ -18,11 +18,11 @@ assert xvidSupport -> xvidcore != null; assert faacSupport -> faac != null; stdenv.mkDerivation rec { - name = "ffmpeg-0.8.1"; + name = "ffmpeg-0.10"; src = fetchurl { url = "http://www.ffmpeg.org/releases/${name}.tar.bz2"; - sha256 = "0vdq6bmrsi55p1l3dddiwyqsspb3l5dgqb87lysf5cz3sjxcfw2v"; + sha256 = "1ybzw6d5axr807141izvm2yf4pa0hc1zcywj89nsn3qsdnknlna3"; }; # `--enable-gpl' (as well as the `postproc' and `swscale') mean that diff --git a/pkgs/development/libraries/libvpx/default.nix b/pkgs/development/libraries/libvpx/default.nix index 2bbd4d89c3b..0d1a2cacc46 100644 --- a/pkgs/development/libraries/libvpx/default.nix +++ b/pkgs/development/libraries/libvpx/default.nix @@ -1,16 +1,16 @@ -{stdenv, fetchurl, bash, yasm, which}: +{stdenv, fetchurl, bash, yasm, which, perl}: stdenv.mkDerivation rec { - name = "libvpx-0.9.6"; + name = "libvpx-1.0.0"; src = fetchurl { - url = http://webm.googlecode.com/files/libvpx-v0.9.6.tar.bz2; - sha256 = "0wxay9wss4lawrcmnwqkpy0rdnaih1k7ilzh284mgyqnya78mg98"; + url = http://webm.googlecode.com/files/libvpx-v1.0.0.tar.bz2; + sha256 = "08gyx90ndv0v8dhbhp3jdh6g37pmcjlfwljzsy0nskm4345dpkh7"; }; patchPhase = '' sed -e 's,/bin/bash,${bash}/bin/bash,' -i configure build/make/version.sh \ - examples/gen_example_code.sh + examples/gen_example_code.sh build/make/gen_asm_deps.sh sed -e '/enable linux/d' -i configure ''; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { make quiet=false DIST_DIR=$out install ''; - buildInputs = [ yasm which ]; + buildInputs = [ yasm which perl ]; meta = { description = "VP8 video encoder"; diff --git a/pkgs/development/libraries/x264/default.nix b/pkgs/development/libraries/x264/default.nix index 0bba7af5c3d..a5e045d27d6 100644 --- a/pkgs/development/libraries/x264/default.nix +++ b/pkgs/development/libraries/x264/default.nix @@ -1,12 +1,12 @@ {stdenv, fetchurl, yasm}: stdenv.mkDerivation rec { - version = "snapshot-20110724-2245-stable"; + version = "snapshot-20120129-2245-stable"; name = "x264-${version}"; src = fetchurl { url = "ftp://ftp.videolan.org/pub/videolan/x264/snapshots/x264-${version}.tar.bz2"; - sha256 = "07bylkh8cwcmj01sr41hhrvfbciyixhw1irdpj01kz9d0h8dhhpz"; + sha256 = "1i63xsa46a5l0ys3mqbcqr4gr5kpaf9fs05cbf0782iir5k07pcr"; }; patchPhase = '' From 6cff3215f4a32f0aabd9f9ef6dc92bf193227aa0 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Tue, 31 Jan 2012 06:59:02 +0000 Subject: [PATCH 30/77] add meta attribute for cowsay svn path=/nixpkgs/trunk/; revision=31938 --- pkgs/tools/misc/cowsay/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/tools/misc/cowsay/default.nix b/pkgs/tools/misc/cowsay/default.nix index 19747e92f0f..59978e2865c 100644 --- a/pkgs/tools/misc/cowsay/default.nix +++ b/pkgs/tools/misc/cowsay/default.nix @@ -10,4 +10,9 @@ stdenv.mkDerivation { installPhase = '' bash ./install.sh $out ''; + + meta = { + description = "cowsay is a program which generates ASCII pictures of a cow with a message."; + homepage = http://www.nog.net/~tony/warez/cowsay.shtml; + }; } From 4fe11e84382db1acc2f83e34fca938203127616a Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 31 Jan 2012 11:01:12 +0000 Subject: [PATCH 31/77] * OpenSSH updated to 5.9p1. svn path=/nixpkgs/trunk/; revision=31939 --- pkgs/tools/networking/openssh/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix index 69243b4f68e..7ea15198f16 100644 --- a/pkgs/tools/networking/openssh/default.nix +++ b/pkgs/tools/networking/openssh/default.nix @@ -6,18 +6,18 @@ let hpnSrc = fetchurl { - url = http://www.psc.edu/networking/projects/hpn-ssh/openssh-5.8p1-hpn13v11.diff.gz; - sha256 = "1xwx2m2sihpy57mwdnc9km3c72hxfdjyp5mmr1vcx2c8kp901db2"; + url = http://www.psc.edu/networking/projects/hpn-ssh/openssh-5.9p1-hpn13v12.diff.gz; + sha256 = "0h1h45vic4zks5bc5mvkc50rlgy2c219vn3rmpmalgm5hws9qjbl"; }; in stdenv.mkDerivation rec { - name = "openssh-5.8p2"; + name = "openssh-5.9p1"; src = fetchurl { url = "ftp://ftp.nl.uu.net/pub/OpenBSD/OpenSSH/portable/${name}.tar.gz"; - sha1 = "64798328d310e4f06c9f01228107520adbc8b3e5"; + sha256 = "1mbpfyq3kjc4p8pc631iqgvcqhwhm6vdwvzsdmd54jzhdxmqngld"; }; prePatch = stdenv.lib.optionalString hpnSupport From 325f8d0b280d34ea7a0cc6025548c79d04a2c555 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 31 Jan 2012 12:13:22 +0000 Subject: [PATCH 32/77] haskell-email-validate: updated to version 0.2.8 svn path=/nixpkgs/trunk/; revision=31940 --- pkgs/development/libraries/haskell/email-validate/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/email-validate/default.nix b/pkgs/development/libraries/haskell/email-validate/default.nix index 10c518611d1..2906b0a9e64 100644 --- a/pkgs/development/libraries/haskell/email-validate/default.nix +++ b/pkgs/development/libraries/haskell/email-validate/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "email-validate"; - version = "0.2.7"; - sha256 = "13zam197ph431f351g8srsxwqchjdwx1c1bizmildsc1zxm2nm3q"; + version = "0.2.8"; + sha256 = "04cz1nm1zkb46kdxs43pmkxli2xm5nqlh951nn0mdgy6hqhkpkqd"; buildDepends = [ parsec ranges ]; meta = { homepage = "http://porg.es/blog/email-address-validation-simpler-faster-more-correct"; From 3dfbf75fffd00f434dc3961a7f244b74e9d9a3a5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 31 Jan 2012 12:13:26 +0000 Subject: [PATCH 33/77] haskell-hmatrix: updated to version 0.13.1.0 svn path=/nixpkgs/trunk/; revision=31941 --- pkgs/development/libraries/haskell/hmatrix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hmatrix/default.nix b/pkgs/development/libraries/haskell/hmatrix/default.nix index c60c7dc1591..c87e507c485 100644 --- a/pkgs/development/libraries/haskell/hmatrix/default.nix +++ b/pkgs/development/libraries/haskell/hmatrix/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "hmatrix"; - version = "0.13.0.0"; - sha256 = "1jlibgg2nrgajw2ny0dq88f5mhrffi7kda9bb8sp9szf4a0kd4wd"; + version = "0.13.1.0"; + sha256 = "0pl5z6zsxyvbdfdng77r2c4isq6d4wbyzx2qs9r8rbn6glaxwrmp"; buildDepends = [ binary storableComplex vector ]; extraLibraries = [ blas gsl liblapack ]; configureFlags = "-fvector"; From 3f5dc7954678d4ecb02d92539677fff60e94c047 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 31 Jan 2012 12:13:28 +0000 Subject: [PATCH 34/77] haskell-string-combinators: updated to version 0.6.0.3 svn path=/nixpkgs/trunk/; revision=31942 --- .../libraries/haskell/string-combinators/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/string-combinators/default.nix b/pkgs/development/libraries/haskell/string-combinators/default.nix index 3371c56ceb2..6d04dcf10db 100644 --- a/pkgs/development/libraries/haskell/string-combinators/default.nix +++ b/pkgs/development/libraries/haskell/string-combinators/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "string-combinators"; - version = "0.6.0.2"; - sha256 = "1bsnli6376nq5dmcx8da2fakj7h73plqz6v1myzhkz1f6r3qcjfi"; + version = "0.6.0.3"; + sha256 = "18jawxqvcj7zpvb0wf1zln12s03mp6nglhv5ccywrkb5x0r0557j"; buildDepends = [ baseUnicodeSymbols ]; meta = { homepage = "https://github.com/basvandijk/string-combinators"; From 8565aba2cd85114edf3bb6b04469dc4b6528b809 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Tue, 31 Jan 2012 13:49:53 +0000 Subject: [PATCH 35/77] sudo upgrade to 1.8.3p2 (security fix included) svn path=/nixpkgs/trunk/; revision=31943 --- pkgs/tools/security/sudo/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/security/sudo/default.nix b/pkgs/tools/security/sudo/default.nix index e84fb50b359..f9a544d714d 100644 --- a/pkgs/tools/security/sudo/default.nix +++ b/pkgs/tools/security/sudo/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, coreutils, pam, groff}: stdenv.mkDerivation rec { - name = "sudo-1.7.2"; + name = "sudo-1.8.3p2"; src = fetchurl { urls = From bf95f7fa3cc4ae0c17c36a787976e11ceb753028 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Tue, 31 Jan 2012 14:09:54 +0000 Subject: [PATCH 36/77] Revert "sudo upgrade to 1.8.3p2 (security fix included)" before was 1.7.2, which is not affected svn path=/nixpkgs/trunk/; revision=31944 --- pkgs/tools/security/sudo/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/security/sudo/default.nix b/pkgs/tools/security/sudo/default.nix index f9a544d714d..e84fb50b359 100644 --- a/pkgs/tools/security/sudo/default.nix +++ b/pkgs/tools/security/sudo/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, coreutils, pam, groff}: stdenv.mkDerivation rec { - name = "sudo-1.8.3p2"; + name = "sudo-1.7.2"; src = fetchurl { urls = From f7626c1ddd7e3fd15b680d7010693ebc82bedb3e Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 31 Jan 2012 14:55:43 +0000 Subject: [PATCH 37/77] * Unbreak icewm. Without -lfontconfig, it barfs with icewm: error while loading shared libraries: libfontconfig.so.1: cannot open shared object file: No such file or directory This causes various NixOS tests to fail (e.g. http://hydra.nixos.org/build/1952097). svn path=/nixpkgs/trunk/; revision=31945 --- pkgs/applications/window-managers/icewm/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/window-managers/icewm/default.nix b/pkgs/applications/window-managers/icewm/default.nix index 000f0e55bb4..0b541d8104d 100644 --- a/pkgs/applications/window-managers/icewm/default.nix +++ b/pkgs/applications/window-managers/icewm/default.nix @@ -16,6 +16,8 @@ stdenv.mkDerivation rec { sha256 = "0yw813d8amrl0n1fvdiyznxah92wcylj9kj1qhjc6h73d827h6na"; }; + NIX_LDFLAGS = "-lfontconfig"; + # The fuloong2f is not supported by 1.3.6 still # # Don't know whether 1.3.7 supports fuloong2f and don't know how to test it From 38391383f0376f7fe21db44e56af0b888b9408a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Tue, 31 Jan 2012 15:02:38 +0000 Subject: [PATCH 38/77] GNU Guile 2.0.5. svn path=/nixpkgs/trunk/; revision=31946 --- pkgs/development/interpreters/guile/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/guile/default.nix b/pkgs/development/interpreters/guile/default.nix index bb64d35f8a4..1b9284dd046 100644 --- a/pkgs/development/interpreters/guile/default.nix +++ b/pkgs/development/interpreters/guile/default.nix @@ -7,11 +7,11 @@ else stdenv.mkDerivation) rec { - name = "guile-2.0.3"; + name = "guile-2.0.5"; src = fetchurl { url = "mirror://gnu/guile/${name}.tar.xz"; - sha256 = "14rhlpxxa4v5y3gl992l7lnd5qnqawx0a84idnwq0w2qviwcvsyj"; + sha256 = "1lycm10x316jzlv1nyag7x9gisn4d3dz8jcmbi6lbdn0z6a9skc2"; }; buildNativeInputs = [ xz makeWrapper gawk pkgconfig ]; From 27100c36c4250052af6bc96d3e5b630e0fb2b1ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Tue, 31 Jan 2012 15:31:23 +0000 Subject: [PATCH 39/77] GNU help2man 1.40.5. svn path=/nixpkgs/trunk/; revision=31947 --- .../tools/misc/help2man/default.nix | 26 ++++++++++++++----- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/misc/help2man/default.nix b/pkgs/development/tools/misc/help2man/default.nix index 6f131e7abe7..746a489c174 100644 --- a/pkgs/development/tools/misc/help2man/default.nix +++ b/pkgs/development/tools/misc/help2man/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, perl, gettext, LocaleGettext}: -stdenv.mkDerivation { - name = "help2man-1.36.1"; +stdenv.mkDerivation rec { + name = "help2man-1.40.5"; src = fetchurl { - url = http://ftp.gnu.org/gnu/help2man/help2man-1.36.1.tar.gz; - sha256 = "13w20lfvggzhvzs9dinxbhwdd61svsacfv9d78zfl9lf1syb5i1f"; + url = "mirror://gnu/help2man/${name}.tar.gz"; + sha256 = "1d1wn9krvf9mp97c224710n1pcfh73p7w7na65zn2a06124rln8k"; }; buildInputs = [ @@ -14,8 +14,20 @@ stdenv.mkDerivation { LocaleGettext ]; - # So that configure can find `preloadable_libintl.so'. - LD_LIBRARY_PATH = "${gettext}/lib"; + doCheck = false; # target `check' is missing - inherit gettext; + meta = { + description = "GNU help2man generates man pages from `--help' output"; + + longDescription = + '' help2man produces simple manual pages from the ‘--help’ and + ‘--version’ output of other commands. + ''; + + homepage = http://www.gnu.org/software/help2man/; + + license = "GPLv3+"; + platforms = stdenv.lib.platforms.gnu; # arbitrary choice + maintainers = [ stdenv.lib.maintainers.ludo ]; + }; } From 7dc9366796baeb6d6877dff173fb1bbf2af6260e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Tue, 31 Jan 2012 15:50:51 +0000 Subject: [PATCH 40/77] GNU help2man: Wrap the program to have a correct $PERL5LIB. svn path=/nixpkgs/trunk/; revision=31948 --- pkgs/development/tools/misc/help2man/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/development/tools/misc/help2man/default.nix b/pkgs/development/tools/misc/help2man/default.nix index 746a489c174..36a674d0880 100644 --- a/pkgs/development/tools/misc/help2man/default.nix +++ b/pkgs/development/tools/misc/help2man/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, perl, gettext, LocaleGettext}: +{ stdenv, fetchurl, perl, gettext, LocaleGettext, makeWrapper }: stdenv.mkDerivation rec { name = "help2man-1.40.5"; @@ -8,14 +8,16 @@ stdenv.mkDerivation rec { sha256 = "1d1wn9krvf9mp97c224710n1pcfh73p7w7na65zn2a06124rln8k"; }; - buildInputs = [ - perl - gettext - LocaleGettext - ]; + buildInputs = [ makeWrapper perl gettext LocaleGettext ]; doCheck = false; # target `check' is missing + postInstall = + '' wrapProgram "$out/bin/help2man" \ + --prefix PERL5LIB : "$(echo ${LocaleGettext}/lib/perl*/site_perl)" + ''; + + meta = { description = "GNU help2man generates man pages from `--help' output"; From 690be29797d45fc47fb99f10eefc30269f37ed0b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 1 Feb 2012 10:39:50 +0000 Subject: [PATCH 41/77] haskell-data-object-yaml: updated to version 0.3.4.2 svn path=/nixpkgs/trunk/; revision=31949 --- .../libraries/haskell/data-object-yaml/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/data-object-yaml/default.nix b/pkgs/development/libraries/haskell/data-object-yaml/default.nix index ec24fc554df..54c2a05f8f1 100644 --- a/pkgs/development/libraries/haskell/data-object-yaml/default.nix +++ b/pkgs/development/libraries/haskell/data-object-yaml/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "data-object-yaml"; - version = "0.3.4.1"; - sha256 = "04mpa59gyfkqi5s94ps3qhphw4csiasb3lj6kf6rhhmd5yx52dnp"; + version = "0.3.4.2"; + sha256 = "18a9r4wfpb7icjb6nji9iy3abq6sxafmsnfwqpnm1nn2nn3fm1ap"; isLibrary = true; isExecutable = true; buildDepends = [ From 8347954f58b72fc754a1c5df9d1625a41cbbecfc Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 1 Feb 2012 10:39:54 +0000 Subject: [PATCH 42/77] haskell-fast-logger: updated to version 0.0.2 svn path=/nixpkgs/trunk/; revision=31950 --- pkgs/development/libraries/haskell/fast-logger/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/fast-logger/default.nix b/pkgs/development/libraries/haskell/fast-logger/default.nix index 68bc8ca6005..462bf7b5230 100644 --- a/pkgs/development/libraries/haskell/fast-logger/default.nix +++ b/pkgs/development/libraries/haskell/fast-logger/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "fast-logger"; - version = "0.0.1"; - sha256 = "19ff2dhkh62i1ljsl90wnsblzk30dz0yx4kw5gk1hb22md7hakim"; + version = "0.0.2"; + sha256 = "1pwxhgcy4lmc63dnr9fihkmiclf60hrnsv8wzbsdg0jcj4qi0zr7"; buildDepends = [ blazeBuilder ]; meta = { description = "A fast logging system"; From 17fefff71de7e45361649a56db18c619c65220f5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 1 Feb 2012 10:39:57 +0000 Subject: [PATCH 43/77] haskell-happstack-util: updated to version 6.0.3 svn path=/nixpkgs/trunk/; revision=31951 --- .../libraries/haskell/happstack/happstack-util.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/happstack/happstack-util.nix b/pkgs/development/libraries/haskell/happstack/happstack-util.nix index faeb174f251..c2af99bafd5 100644 --- a/pkgs/development/libraries/haskell/happstack/happstack-util.nix +++ b/pkgs/development/libraries/haskell/happstack/happstack-util.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "happstack-util"; - version = "6.0.2"; - sha256 = "03qlnclpg72iflry1xlkd0sxqm6nybvx113la9r0cmsnz17y546a"; + version = "6.0.3"; + sha256 = "0hqssd5wzir6rxn46q8r3hdp3nl7v5m7w322j39120xpg2bhiphh"; isLibrary = true; isExecutable = true; buildDepends = [ From 349b073889e254cf0da81c329df00bffa85d64e6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 1 Feb 2012 10:39:59 +0000 Subject: [PATCH 44/77] haskell-pool-conduit: updated to version 0.0.0.1 svn path=/nixpkgs/trunk/; revision=31952 --- pkgs/development/libraries/haskell/pool-conduit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/pool-conduit/default.nix b/pkgs/development/libraries/haskell/pool-conduit/default.nix index f7d1be2f7d0..339ec70593c 100644 --- a/pkgs/development/libraries/haskell/pool-conduit/default.nix +++ b/pkgs/development/libraries/haskell/pool-conduit/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "pool-conduit"; - version = "0.0.0"; - sha256 = "0cbs7swb1ay3l1hlbirys171ybqg887csnp6yiy9biq11q5mhsml"; + version = "0.0.0.1"; + sha256 = "1im5fpwadg9hmajay6dkwmlzbp5rzn8hh9wh01iy23jgivkqk2q0"; buildDepends = [ conduit resourcePool transformers ]; meta = { homepage = "http://www.yesodweb.com/book/persistent"; From 128f2e48d1ebbeabe6daf00fb943266542fee8ea Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 1 Feb 2012 10:40:02 +0000 Subject: [PATCH 45/77] haskell-skein: updated to version 0.1.0.5 svn path=/nixpkgs/trunk/; revision=31953 --- pkgs/development/libraries/haskell/skein/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/skein/default.nix b/pkgs/development/libraries/haskell/skein/default.nix index b1911310e24..844e13c11dc 100644 --- a/pkgs/development/libraries/haskell/skein/default.nix +++ b/pkgs/development/libraries/haskell/skein/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "skein"; - version = "0.1.0.4"; - sha256 = "1m910kvm1ba9cl3ghr6j393xf1lvxb4ms55nipnzc5zg7r2xzh96"; + version = "0.1.0.5"; + sha256 = "12hyyydznss802v4pwfcpjr0y7241114a9z82xxq60q8dval8fyb"; buildDepends = [ cereal cryptoApi tagged ]; meta = { description = "Skein, a family of cryptographic hash functions. Includes Skein-MAC as well."; From ea46f84a54a7339f3e3293f95f053a688c635896 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 1 Feb 2012 10:40:04 +0000 Subject: [PATCH 46/77] haskell-web-routes: updated to version 0.26.3 svn path=/nixpkgs/trunk/; revision=31954 --- pkgs/development/libraries/haskell/web-routes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/web-routes/default.nix b/pkgs/development/libraries/haskell/web-routes/default.nix index a6ac919ba71..0a6d10539e1 100644 --- a/pkgs/development/libraries/haskell/web-routes/default.nix +++ b/pkgs/development/libraries/haskell/web-routes/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "web-routes"; - version = "0.26.2"; - sha256 = "0v7vkd53jf9zf2m0lbiq10qp39ghlnxwafs1hixbz2qfcgsns10j"; + version = "0.26.3"; + sha256 = "1ldi4gjraga57qj9drknwp19vmy30fhcp6vw3y7xqcrarvp5n2mx"; buildDepends = [ blazeBuilder httpTypes mtl network parsec text utf8String ]; From eeeab8186340d08bded9a5596bd638e23656ec27 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 1 Feb 2012 10:40:07 +0000 Subject: [PATCH 47/77] haskell-xml-conduit: updated to version 0.5.2 svn path=/nixpkgs/trunk/; revision=31955 --- pkgs/development/libraries/haskell/xml-conduit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/xml-conduit/default.nix b/pkgs/development/libraries/haskell/xml-conduit/default.nix index bf20012aef2..132d3de4a8f 100644 --- a/pkgs/development/libraries/haskell/xml-conduit/default.nix +++ b/pkgs/development/libraries/haskell/xml-conduit/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "xml-conduit"; - version = "0.5.1.2"; - sha256 = "0ww018aj4fy0hngjsj1lc5m7sw36kdc1z2p8nxp4pgsmhj0ccm36"; + version = "0.5.2"; + sha256 = "0wr9xbx2dwv0kmnx9jwlm1734a22mc79ydg4sh61335fdjvchfnd"; buildDepends = [ attoparsec attoparsecConduit blazeBuilder blazeBuilderConduit conduit dataDefault failure systemFilepath text transformers From 7c90b6a9bc5311a4184e2b0e19f9fea997a75aed Mon Sep 17 00:00:00 2001 From: Marco Maggesi Date: Wed, 1 Feb 2012 14:37:50 +0000 Subject: [PATCH 48/77] Update HOL Light to rev 122. svn path=/nixpkgs/trunk/; revision=31956 --- pkgs/applications/science/logic/hol_light/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/logic/hol_light/default.nix b/pkgs/applications/science/logic/hol_light/default.nix index 4961bbeabfd..06d349ad3c8 100644 --- a/pkgs/applications/science/logic/hol_light/default.nix +++ b/pkgs/applications/science/logic/hol_light/default.nix @@ -9,11 +9,11 @@ let in stdenv.mkDerivation { - name = "hol_light-20120109"; + name = "hol_light-20120129"; src = fetchsvn { url = http://hol-light.googlecode.com/svn/trunk; - rev = "118"; - sha256 = "97e72dad731338328c031421512c26d440a989ea083f3ae34820eb8413aff495"; + rev = "122"; + sha256 = "d837ba5fe941af9595540691ba4be34e58174ba9a9c7e1ce57620e5cd4385769"; }; buildInputs = [ ocaml findlib camlp5 ]; From 4b45a0bfc395451bcaafebeae2eeba1d5a2235a3 Mon Sep 17 00:00:00 2001 From: Arie Middelkoop Date: Wed, 1 Feb 2012 22:05:21 +0000 Subject: [PATCH 49/77] Microcode for intel processors (put in firmware, and 'modprobe microcode') svn path=/nixpkgs/trunk/; revision=31957 --- pkgs/os-specific/linux/microcode/intel.nix | 28 ++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 pkgs/os-specific/linux/microcode/intel.nix diff --git a/pkgs/os-specific/linux/microcode/intel.nix b/pkgs/os-specific/linux/microcode/intel.nix new file mode 100644 index 00000000000..3294c90cb3a --- /dev/null +++ b/pkgs/os-specific/linux/microcode/intel.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchurl }: + +let version = "20111110"; + num = "20728"; +in stdenv.mkDerivation { + name = "microcode-intel-${version}"; + src = fetchurl { + url = "http://downloadmirror.intel.com/${num}/eng/microcode-${version}.tgz"; + sha256 = "16f532cdf9cce03e01e714619ad9406a465aa965bbd1288035398db79921cbc1"; + }; + +# setSourceRoot = '' +# sourceRoot=. +# ''; + + sourceRoot = "."; + + dontBuild = true; + installPhase = '' + ensureDir $out + cp microcode.dat "$out/" + ''; + + meta = { + homepage = http://www.intel.com; + description = "Microcode for Intel processors"; + }; +} \ No newline at end of file From acda2c1967274b710d922d783ed7ab0d14acaffd Mon Sep 17 00:00:00 2001 From: Arie Middelkoop Date: Wed, 1 Feb 2012 22:06:49 +0000 Subject: [PATCH 50/77] Makes a .desktop startup item from a .desktop menu entry. svn path=/nixpkgs/trunk/; revision=31958 --- .../make-startupitem/default.nix | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 pkgs/build-support/make-startupitem/default.nix diff --git a/pkgs/build-support/make-startupitem/default.nix b/pkgs/build-support/make-startupitem/default.nix new file mode 100644 index 00000000000..07cdee600d4 --- /dev/null +++ b/pkgs/build-support/make-startupitem/default.nix @@ -0,0 +1,34 @@ +# given a pakcage with a $name.desktop file, makes a copy +# as autostart item. + +{stdenv, lib}: +{ name # name of the desktop file (without .desktop) +, package # package where the desktop file resides in +, after ? null +, condition ? null +, phase ? "2" +}: + +# the builder requires that +# $package/share/applications/$name.desktop +# exists as file. + +stdenv.mkDerivation { + name = "autostart-${name}"; + priority = 5; + + buildCommand = '' + ensureDir $out/share/autostart + target=${name}.desktop + cp ${package}/share/applications/${name}.desktop $target + chmod +rw $target + echo "X-KDE-autostart-phase=${phase}" >> $target + ${lib.optionalString (after != null) ''echo "${after}" >> $target''} + ${lib.optionalString (condition != null) ''echo "${condition}" >> $target''} + cp $target $out/share/autostart + ''; + + # this will automatically put 'package' in the environment when you + # put its startup item in there. + propagatedBuildInputs = [ package ]; +} \ No newline at end of file From cc145f2ae91d8c3fa304853cdcfbbe2347085cf9 Mon Sep 17 00:00:00 2001 From: Arie Middelkoop Date: Wed, 1 Feb 2012 22:09:35 +0000 Subject: [PATCH 51/77] Update of skype expression: make the use of pulse audio optional based on the configuration setting for pulse audio (off by default). Removing pulse audio from the build inputs when it is not used prevents the bug of Skype taking 100% cpu from showing up. This demonstrates nicely nix' features: in other distributions the recomended solution was to remove read permission from the pulse audio libs. svn path=/nixpkgs/trunk/; revision=31959 --- pkgs/applications/networking/skype/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 11 ++++++++++- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/skype/default.nix b/pkgs/applications/networking/skype/default.nix index 8d3645e3819..45e225496eb 100644 --- a/pkgs/applications/networking/skype/default.nix +++ b/pkgs/applications/networking/skype/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, alsaLib, libXv, libXi, libXrender, libXrandr, zlib, glib , libXext, libX11, libXScrnSaver, libSM, qt4, libICE, freetype, fontconfig -, pulseaudio }: +, pulseaudio, usePulseAudio, lib }: assert stdenv.system == "i686-linux"; @@ -12,9 +12,9 @@ stdenv.mkDerivation rec { sha256 = "157ba3ci12bq0nv2m8wlsab45ib5sccqagyna8nixnhqw9q72sxm"; }; - buildInputs = [ + buildInputs = + lib.optional usePulseAudio pulseaudio ++ [ alsaLib - pulseaudio stdenv.glibc stdenv.gcc.gcc libXv diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7281b659ce2..c949a1de3fc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -313,6 +313,11 @@ let inherit stdenv; }; + makeAutostartItem = import ../build-support/make-startupitem { + inherit stdenv; + inherit lib; + }; + makeInitrd = {contents}: import ../build-support/kernel/make-initrd.nix { inherit stdenv perl cpio contents ubootChooser; }; @@ -5256,6 +5261,8 @@ let alsaUtils = callPackage ../os-specific/linux/alsa-utils { }; + microcodeIntel = callPackage ../os-specific/linux/microcode/intel.nix { }; + bcm43xx = callPackage ../os-specific/linux/firmware/bcm43xx { }; bluez = callPackage ../os-specific/linux/bluez { }; @@ -7477,7 +7484,9 @@ let siproxd = callPackage ../applications/networking/siproxd { }; - skype_linux = callPackage_i686 ../applications/networking/skype { }; + skype_linux = callPackage_i686 ../applications/networking/skype { + usePulseAudio = getConfig [ "pulseaudio" ] false; # disabled by default (the 100% cpu bug) + }; slim = callPackage ../applications/display-managers/slim { }; From 89de1150d55a69093d71b717b73422b3d3e36bd7 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Wed, 1 Feb 2012 22:32:12 +0000 Subject: [PATCH 52/77] Add libnatspec svn path=/nixpkgs/trunk/; revision=31960 --- .../libraries/libnatspec/default.nix | 19 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 21 insertions(+) create mode 100644 pkgs/development/libraries/libnatspec/default.nix diff --git a/pkgs/development/libraries/libnatspec/default.nix b/pkgs/development/libraries/libnatspec/default.nix new file mode 100644 index 00000000000..fbab569e38c --- /dev/null +++ b/pkgs/development/libraries/libnatspec/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl, popt }: + +stdenv.mkDerivation rec { + name = "libnatspec-0.2.6"; + + src = fetchurl { + url = "mirror://sourceforge/natspec/${name}.tar.bz2"; + sha256 = "0zvm9afh1skxgdv62ylrpwyykpjhhskxj0zv7yrdf7jhfdriz0y3"; + }; + + buildInputs = [ popt ]; + + meta = { + homepage = http://natspec.sourceforge.net/ ; + description = "A library intended to smooth national specificities in using of programs"; + platforms = stdenv.lib.platforms.unix; + maintainers = [ stdenv.lib.maintainers.urkud ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c949a1de3fc..13995e05e12 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4039,6 +4039,8 @@ let libmtp = callPackage ../development/libraries/libmtp { }; + libnatspec = callPackage ../development/libraries/libnatspec { }; + libnice = callPackage ../development/libraries/libnice { inherit (gnome) glib; }; From 75262bcbed4fb93daeaefc2610e0ab3493b587fc Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Wed, 1 Feb 2012 22:32:16 +0000 Subject: [PATCH 53/77] zip, unzip: add NLS support svn path=/nixpkgs/trunk/; revision=31961 --- pkgs/tools/archivers/unzip/6.0.nix | 20 +++++++++++++----- pkgs/tools/archivers/zip/default.nix | 8 ++++++- .../archivers/zip/natspec-gentoo.patch.bz2 | Bin 0 -> 1914 bytes pkgs/top-level/all-packages.nix | 2 ++ 4 files changed, 24 insertions(+), 6 deletions(-) create mode 100644 pkgs/tools/archivers/zip/natspec-gentoo.patch.bz2 diff --git a/pkgs/tools/archivers/unzip/6.0.nix b/pkgs/tools/archivers/unzip/6.0.nix index 803832f52d8..8abd813fb8f 100644 --- a/pkgs/tools/archivers/unzip/6.0.nix +++ b/pkgs/tools/archivers/unzip/6.0.nix @@ -1,6 +1,7 @@ -{ stdenv, fetchurl, bzip2 }: +{ stdenv, fetchurl, bzip2 +, enableNLS ? false, libnatspec }: -stdenv.mkDerivation { +stdenv.mkDerivation ({ name = "unzip-6.0"; src = fetchurl { @@ -8,11 +9,11 @@ stdenv.mkDerivation { sha256 = "0dxx11knh3nk95p2gg2ak777dd11pr7jx5das2g49l262scrcv83"; }; - buildInputs = [ bzip2 ]; + buildInputs = [ bzip2 ] ++ stdenv.lib.optional enableNLS libnatspec; makefile = "unix/Makefile"; - NIX_LDFLAGS = "-lbz2"; + NIX_LDFLAGS = [ "-lbz2" ] ++ stdenv.lib.optional enableNLS "-lnatspec"; buildFlags = "generic D_USE_BZ2=-DUSE_BZIP2 L_BZ2=-lbz2"; @@ -24,4 +25,13 @@ stdenv.mkDerivation { license = "free"; # http://www.info-zip.org/license.html meta.platforms = stdenv.lib.platforms.all; }; -} +} // (if enableNLS then { + patches = + [ ( fetchurl { + url = + "http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/app-arch/unzip/files/unzip-6.0-natspec.patch?revision=1.1"; + name = "unzip-6.0-natspec.patch"; + sha256 = "67ab260ae6adf8e7c5eda2d1d7846929b43562943ec4aff629bd7018954058b1"; + }) + ]; +} else {})) diff --git a/pkgs/tools/archivers/zip/default.nix b/pkgs/tools/archivers/zip/default.nix index 884af0f0b03..e3b48f48325 100644 --- a/pkgs/tools/archivers/zip/default.nix +++ b/pkgs/tools/archivers/zip/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{ stdenv, fetchurl, libnatspec }: stdenv.mkDerivation { name = "zip-3.0"; @@ -12,8 +12,14 @@ stdenv.mkDerivation { installFlags="-f unix/Makefile prefix=$(out) INSTALL=cp"; + patches = [ ./natspec-gentoo.patch.bz2 ]; + + buildInputs = [ libnatspec ]; + meta = { homepage = http://www.info-zip.org; + platforms = stdenv.lib.platforms.all; + maintainer = [ stdenv.lib.maintainers.urkud ]; }; } diff --git a/pkgs/tools/archivers/zip/natspec-gentoo.patch.bz2 b/pkgs/tools/archivers/zip/natspec-gentoo.patch.bz2 new file mode 100644 index 0000000000000000000000000000000000000000..816f32aba3c3d835f8a67440a7088c781fedffbd GIT binary patch literal 1914 zcmV-=2Zi`TT4*^jL0KkKS=3ssIsgQ%e}H%}KmdRL|NsC0-t@o!-~M0+t@o+h%coxM z=bY?y-Q6Jyb2nnp$bu%BO^SGeN0fS=nns#>n4YFh8V^&^sPsKh8W}c0B!MwZ(WIF) z6nY@?Wi$bx8fm6Mpa27E5j15dkpZcJG{Bk+1Y~43rbZBGX_16z!6HZ|RDP-IdY__c zgqj*XH36e)Hj(NY4F-T{G5~R*plH)0O&VkdCI|oqfY2Ib1_a0wBus$-5NS`-P|9d| zLnG1v&9Lg{{B6eNcI_N7X9>u)iSG&{YIhr4#4M zaf-GE9cu$Nz>X=nDw>iS#LkyoXn@2-7_(y{Bgo9e7Lo^`ks(3$((v4j*(-qfchOi! z6~f9HeoAu_S{BVoB1lX?tQKhj3b;>(5UiN*bRO(UoR?#j+pn}sb|$1MCeV$(`_kUFW ztHBeGJ5%v=HV|~H6BD)ZEhJI%jBNa)93@c`d3S_NG1})x3Y|^19}67Jh;B4@;d;Me zrgSLEvA3@kI$rgfVjg&uF2_#G2)>q-bGm)EOVe8F*7CmzpHp+V+bD;jke%qhp)XSA zLLq8LHAu?F3>XbIwjmI_=wJq&hQcFMu3Kn!4C|G0!7%+8YF=1HACOvPLKiG201YwB z>+GSjx-n9MwiAiYeh)7<4>FGMERe^1+_A1RF;y$^hx2k7m?_ZIP~)iQQ)B zxbQ9ZVd|Xv5t1bl^(1oubpV?7kqHAs6d?>5z=44c3vI-Gl@n7yK%Yl=uskG1c`G-I zzy!rBh!%kYG&EchYOF&8feZ}2d{?k+ariLI;v7e7v!KS?=Zq+Y?sb;2*q9#etVD@{ z@ugMQ&SIS7$D99Y#(j3+Q8ik&-0LZC1*PW~4)BQxvoQiS2;d?~Kf2z>)o{@k7nca} zohcYa5{W{Q{nSOG%XQ*BVkcUpcecoU8^q^du+bR$tc%inBt0nN&L>GSS}}vA-_ia1 zV=apzGgAo?b1^83bK@9Ngj32v$l9I#cBv^Ap_tf0*%Yx3H>W;-FVlBW3$!%$b0^cA|!-+wU9#dkR z#(IsbDHa_zJoRHBflns1!8{aI3-c{VP?K?R^JRNB>RcT&Rc+Lx?`Qe?lM`H_CQA}J9E}G^6#E{1kqHv3ldwaMTlY zb(D6gm(kk|m8|C~hN&L3;L22)C7tp;V-_??oLG(pAX8$5PpW`XMHmux5~NKy7Uw%T ztj39;$eSGqk+nVHy4p8b84QAIena`8=qg1QU5ZXLrl_-Zi86V&t#vz*2Tl#qt2$W+ z1f}O zCTpOSf~`>G;&$=wr8)OrWOCID6fiCgzZ7#KJJ?{Dyoa0Mn_{QYMK&=*E8!a#%${!r zA~LpHn+$sU!^$%)r!xi4SW@`xa)8oe9sQI;89O#h3alwtu%PW4Wmqd{O{Yz-wcV|b zGh0Y-s z)!_7m19A*qbiwlF&&$QgrDoHJj7-h3<{(+xOxFs1WCuTNLp|c|NT&)C8jDq@Kmp{9 A3jhEB literal 0 HcmV?d00001 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 13995e05e12..ea3be612910 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1535,6 +1535,8 @@ let unzip = unzip60; + unzipNLS = unzip.override { enableNLS = true; }; + unzip552 = callPackage ../tools/archivers/unzip/5.52.nix { }; unzip60 = callPackage ../tools/archivers/unzip/6.0.nix { }; From 2b3fb5a8243357b048c869b149bb8d157ae4fc30 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Wed, 1 Feb 2012 22:33:35 +0000 Subject: [PATCH 54/77] Merge two nix exprs for links2, upgrade to 2.5 svn path=/nixpkgs/trunk/; revision=31962 --- .../networking/browsers/links2/default.nix | 65 +++++++++++-------- .../browsers/links2/src-for-default.nix | 9 --- .../browsers/links2/src-info-for-default.nix | 4 -- .../networking/browsers/links2/stdenv.nix | 41 ------------ pkgs/top-level/all-packages.nix | 8 +-- 5 files changed, 39 insertions(+), 88 deletions(-) delete mode 100644 pkgs/applications/networking/browsers/links2/src-for-default.nix delete mode 100644 pkgs/applications/networking/browsers/links2/src-info-for-default.nix delete mode 100644 pkgs/applications/networking/browsers/links2/stdenv.nix diff --git a/pkgs/applications/networking/browsers/links2/default.nix b/pkgs/applications/networking/browsers/links2/default.nix index 587a51509d6..4e5a3658730 100644 --- a/pkgs/applications/networking/browsers/links2/default.nix +++ b/pkgs/applications/networking/browsers/links2/default.nix @@ -1,33 +1,44 @@ -a : -let - s = import ./src-for-default.nix; - buildInputs = with a; [ - libpng libjpeg bzip2 zlib libtiff - libX11 libXau xproto gpm - openssl libXt pkgconfig - ]; -in -rec { - src = a.fetchUrlFromSrcInfo s; +{ stdenv, fetchurl +, gpm, openssl, pkgconfig # Misc. +, libpng, libjpeg, libtiff # graphic formats +, bzip2, zlib, xz # Transfer encodings +, enableFB ? true +, enableDirectFB ? false, directfb +, enableX11 ? true, libX11, libXt, libXau # GUI support +}: - inherit (s) name; - inherit buildInputs; - configureFlags = [ - "--enable-graphics" - "--with-ssl" - "--with-x" - "--with-fb" - ]; +stdenv.mkDerivation rec { + version = "2.5"; + name = "links2-${version}"; + + src = fetchurl { + url = "${meta.homepage}/download/links-${version}.tar.bz2"; + sha256 = "1wlmj8s6bxgznh0pnawihyvhffzryciz3lkagcxhf7fp64zz5izm"; + }; + + buildInputs = + [ libpng libjpeg libtiff gpm openssl xz bzip2 zlib ] + ++ stdenv.lib.optionals enableX11 [ libX11 libXau libXt ] + ++ stdenv.lib.optional enableDirectFB [ directfb ]; + + buildNativeInputs = [ pkgconfig ]; + + configureFlags = [ "--with-ssl" ] + ++ stdenv.lib.optional (enableX11 || enableFB || enableDirectFB) "--enable-graphics" + ++ stdenv.lib.optional enableX11 "--with-x" + ++ stdenv.lib.optional enableFB "--with-fb" + ++ stdenv.lib.optional enableDirectFB "--with-directfb"; + + crossAttrs = { + preConfigure = '' + export CC=$crossConfig-gcc + ''; + }; - /* doConfigure should be removed if not needed */ - phaseNames = ["doConfigure" "doMakeInstall"]; - meta = { + homepage = http://links.twibright.com/; description = "A small browser with some graphics support"; - maintainers = [ - a.lib.maintainers.raskin - ]; - platforms = with a.lib.platforms; - linux; + maintainers = with stdenv.lib.maintainers; [ raskin urkud viric ]; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/networking/browsers/links2/src-for-default.nix b/pkgs/applications/networking/browsers/links2/src-for-default.nix deleted file mode 100644 index 7e7da1a4641..00000000000 --- a/pkgs/applications/networking/browsers/links2/src-for-default.nix +++ /dev/null @@ -1,9 +0,0 @@ -rec { - version="2.2"; - name="links2-2.2"; - hash="188y37rw4s9brl55ncc12q1b45w0caxcnsq1gqyby9byw1sawnq9"; - url="http://links.twibright.com/download/links-${version}.tar.gz"; - advertisedUrl="http://links.twibright.com/download/links-2.2.tar.gz"; - - -} diff --git a/pkgs/applications/networking/browsers/links2/src-info-for-default.nix b/pkgs/applications/networking/browsers/links2/src-info-for-default.nix deleted file mode 100644 index b678b251298..00000000000 --- a/pkgs/applications/networking/browsers/links2/src-info-for-default.nix +++ /dev/null @@ -1,4 +0,0 @@ -{ - downloadPage = "http://links.twibright.com/download.php"; - baseName = "links2"; -} diff --git a/pkgs/applications/networking/browsers/links2/stdenv.nix b/pkgs/applications/networking/browsers/links2/stdenv.nix deleted file mode 100644 index 923d0aff0f5..00000000000 --- a/pkgs/applications/networking/browsers/links2/stdenv.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ stdenv, fetchurl, libpng, libjpeg, bzip2, zlib, libtiff, gpm, openssl, pkgconfig, directfb -, enableX11 ? true, libX11, libXau, xproto, libXt }: - -let - version="2.2"; - name="links2-2.2"; - hash="188y37rw4s9brl55ncc12q1b45w0caxcnsq1gqyby9byw1sawnq9"; - url="http://links.twibright.com/download/links-${version}.tar.gz"; - advertisedUrl="http://links.twibright.com/download/links-2.2.tar.gz"; -in - -stdenv.mkDerivation { - inherit name; - - src = fetchurl { - inherit url; - sha256 = hash; - }; - - buildInputs = [ libpng libjpeg bzip2 zlib libtiff gpm openssl pkgconfig directfb ] - ++ stdenv.lib.optionals enableX11 [ libX11 libXau xproto libXt ]; - - configureFlags = [ - "--enable-graphics" - "--with-ssl" - "--with-fb" - ] ++ stdenv.lib.optional enableX11 "--with-x"; - - crossAttrs = { - preConfigure = '' - export CC=$crossConfig-gcc - ''; - }; - - meta = { - description = "A small browser with some graphics support"; - maintainers = [ - stdenv.lib.maintainers.viric - ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ea3be612910..1b44d045938 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7158,13 +7158,7 @@ let ledger = callPackage ../applications/office/ledger/2.6.3.nix { }; ledger3 = callPackage ../applications/office/ledger/3.0.nix { }; - links2 = (builderDefsPackage ../applications/networking/browsers/links2) { - inherit fetchurl stdenv bzip2 zlib libjpeg libpng libtiff - gpm openssl SDL SDL_image SDL_net pkgconfig; - inherit (xlibs) libX11 libXau xproto libXt; - }; - - links2Stdenv = callPackage ../applications/networking/browsers/links2/stdenv.nix { }; + links2 = callPackage ../applications/networking/browsers/links2 { }; linphone = callPackage ../applications/networking/linphone { inherit (gnome) libglade gtk; From f53c231cc438964ec7226e98fd982150330be2dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Thu, 2 Feb 2012 08:54:54 +0000 Subject: [PATCH 55/77] Updating truecrypt to 7.1. I pick the tarball not from the mainsite, but we checked that the hash corresponds with that of the main site. svn path=/nixpkgs/trunk/; revision=31963 --- pkgs/applications/misc/truecrypt/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/misc/truecrypt/default.nix b/pkgs/applications/misc/truecrypt/default.nix index 906817fe5a2..bd719753451 100644 --- a/pkgs/applications/misc/truecrypt/default.nix +++ b/pkgs/applications/misc/truecrypt/default.nix @@ -40,17 +40,17 @@ library, use the 'NOGUI' parameter: $ make NOGUI=1 */ -{ fetchurl, stdenv, pkgconfig, fuse, wxGTK, devicemapper, +{ fetchurl, stdenv, pkgconfig, nasm, fuse, wxGTK, devicemapper, wxGUI ? true }: stdenv.mkDerivation { - name = "truecrypt-6.3a"; + name = "truecrypt-7.1"; builder = ./builder.sh; src = fetchurl { - url = http://www.sfr-fresh.com/unix/misc/TrueCrypt_6.3a_Source.tar.gz; - sha256 = "1vwnzay9gjlldqbdb20rhq2arhyzhdy347qc00hkpqmv2b8z070y"; + url = http://fossies.org/unix/misc/TrueCrypt-7.1-Source.tar.gz; + sha256 = "1x6rdxcvklb3zpmgfc3mg5h71gzki1q55ljkzjab2vzkf9n5v0cl"; }; pkcs11h = fetchurl { @@ -68,7 +68,7 @@ stdenv.mkDerivation { sha256 = "5ae6a4f32ca737e02def3bf314c9842fb89be82bf00b6f4022a97d8d565522b8"; }; - buildInputs = [ pkgconfig fuse devicemapper wxGTK ]; + buildInputs = [ pkgconfig fuse devicemapper wxGTK nasm ]; makeFlags = if (wxGUI) then "" else "NOGUI=1"; meta = { From 6a3feaa3dc3d0c2b091974dc89cfcbb3a06f99cc Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Thu, 2 Feb 2012 09:53:45 +0000 Subject: [PATCH 56/77] rpmclosure, also take into account rel attribute when versions are the same svn path=/nixpkgs/trunk/; revision=31964 --- pkgs/build-support/vm/rpm/rpm-closure.pl | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/build-support/vm/rpm/rpm-closure.pl b/pkgs/build-support/vm/rpm/rpm-closure.pl index 2ef59dcbdef..3771ef6eea5 100644 --- a/pkgs/build-support/vm/rpm/rpm-closure.pl +++ b/pkgs/build-support/vm/rpm/rpm-closure.pl @@ -76,8 +76,9 @@ for (my $i = 0; $i < scalar(@packagesFiles); $i++) { my $earlierPkg = $pkgs{$pkg->{name}}; print STDERR "WARNING: duplicate occurrence of package $pkg->{name}\n"; # - if (rpmvercmp($pkg->{'version'}->{ver}, $earlierPkg->{'version'}->{ver}) >= 0) { - print STDERR "WARNING: replaced package $pkg->{name} with newer one\n"; + my $cmp = rpmvercmp($pkg->{'version'}->{ver}, $earlierPkg->{'version'}->{ver}); + if ($cmp > 0 || ($cmp == 0 && rpmvercmp($pkg->{'version'}->{rel}, $earlierPkg->{'version'}->{rel})>0)) { + print STDERR "WARNING: replaced package $pkg->{name} (".$earlierPkg->{'version'}->{ver}." ".$earlierPkg->{'version'}->{rel}.") with newer one (".$pkg->{'version'}->{ver}." ".$pkg->{'version'}->{rel}.")\n"; $pkg->{urlPrefix} = $urlPrefixes[$i]; $pkgs{$pkg->{name}} = $pkg; } @@ -175,3 +176,4 @@ foreach my $pkgName (@needed) { } print "]\n"; +exit 1 From d52b0c377f11dcee7b447065e495aa85c82660e5 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Thu, 2 Feb 2012 09:54:16 +0000 Subject: [PATCH 57/77] rpmclosure, remove exit svn path=/nixpkgs/trunk/; revision=31965 --- pkgs/build-support/vm/rpm/rpm-closure.pl | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/build-support/vm/rpm/rpm-closure.pl b/pkgs/build-support/vm/rpm/rpm-closure.pl index 3771ef6eea5..94da0a20adc 100644 --- a/pkgs/build-support/vm/rpm/rpm-closure.pl +++ b/pkgs/build-support/vm/rpm/rpm-closure.pl @@ -176,4 +176,3 @@ foreach my $pkgName (@needed) { } print "]\n"; -exit 1 From d7b739d9a5197b006a281c429f710da790d2c6c7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 2 Feb 2012 10:37:45 +0000 Subject: [PATCH 58/77] haskell-cmdargs: deleted obsolete 0.8 version svn path=/nixpkgs/trunk/; revision=31966 --- .../libraries/haskell/cmdargs/0.8.nix | 20 ------------------- .../cmdargs/{0.9.2.nix => default.nix} | 0 pkgs/top-level/haskell-packages.nix | 8 ++------ 3 files changed, 2 insertions(+), 26 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/cmdargs/0.8.nix rename pkgs/development/libraries/haskell/cmdargs/{0.9.2.nix => default.nix} (100%) diff --git a/pkgs/development/libraries/haskell/cmdargs/0.8.nix b/pkgs/development/libraries/haskell/cmdargs/0.8.nix deleted file mode 100644 index 4e8b236464a..00000000000 --- a/pkgs/development/libraries/haskell/cmdargs/0.8.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ cabal, transformers }: - -cabal.mkDerivation (self: { - pname = "cmdargs"; - version = "0.8"; - sha256 = "0yhjg6rck1aj8gq07i9dcfxyjffxlr4lxnir2brkyahpfx5iyw9k"; - isLibrary = true; - isExecutable = true; - buildDepends = [ transformers ]; - meta = { - homepage = "http://community.haskell.org/~ndm/cmdargs/"; - description = "Command line argument processing"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; - }; -}) diff --git a/pkgs/development/libraries/haskell/cmdargs/0.9.2.nix b/pkgs/development/libraries/haskell/cmdargs/default.nix similarity index 100% rename from pkgs/development/libraries/haskell/cmdargs/0.9.2.nix rename to pkgs/development/libraries/haskell/cmdargs/default.nix diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 1898229ec8a..3885912106e 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -531,9 +531,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); clientsession = callPackage ../development/libraries/haskell/clientsession {}; - cmdargs_0_8 = callPackage ../development/libraries/haskell/cmdargs/0.8.nix {}; - cmdargs_0_9_2 = callPackage ../development/libraries/haskell/cmdargs/0.9.2.nix {}; - cmdargs = self.cmdargs_0_9_2; + cmdargs = callPackage ../development/libraries/haskell/cmdargs {}; cmdlib = callPackage ../development/libraries/haskell/cmdlib {}; @@ -832,9 +830,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); hjsmin = callPackage ../development/libraries/haskell/hjsmin {}; hledger = callPackage ../development/libraries/haskell/hledger {}; - hledgerLib = callPackage ../development/libraries/haskell/hledger-lib { - cmdargs = self.cmdargs_0_8; - }; + hledgerLib = callPackage ../development/libraries/haskell/hledger-lib {}; hledgerVty = callPackage ../development/libraries/haskell/hledger-vty {}; hledgerChart = callPackage ../development/libraries/haskell/hledger-chart {}; hledgerInterest = callPackage ../applications/office/hledger-interest {}; From 8c1822d2d8e6265f140ff5779b02c28e0066988a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 2 Feb 2012 10:37:48 +0000 Subject: [PATCH 59/77] haskell-socks: added version 0.4.0 svn path=/nixpkgs/trunk/; revision=31967 --- .../libraries/haskell/socks/default.nix | 14 ++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 16 insertions(+) create mode 100644 pkgs/development/libraries/haskell/socks/default.nix diff --git a/pkgs/development/libraries/haskell/socks/default.nix b/pkgs/development/libraries/haskell/socks/default.nix new file mode 100644 index 00000000000..ac5b87e65a1 --- /dev/null +++ b/pkgs/development/libraries/haskell/socks/default.nix @@ -0,0 +1,14 @@ +{ cabal, cereal, network }: + +cabal.mkDerivation (self: { + pname = "socks"; + version = "0.4.0"; + sha256 = "0181qyxn7n47i7dqzw9yymbf73yr5v91iqjq01iyy43b4vab2ha8"; + buildDepends = [ cereal network ]; + meta = { + homepage = "http://github.com/vincenthz/hs-socks"; + description = "Socks proxy (version 5) implementation"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 3885912106e..34e169ee6cf 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1214,6 +1214,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); snapServer = callPackage ../development/libraries/haskell/snap/server.nix {}; + socks = callPackage ../development/libraries/haskell/socks {}; + stateref = callPackage ../development/libraries/haskell/stateref {}; StateVar = callPackage ../development/libraries/haskell/StateVar {}; From 02ef8dd73f3787ddb7ead972317ff1d414d9f6ec Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 2 Feb 2012 10:37:51 +0000 Subject: [PATCH 60/77] haskell-citeproc-hs: updated to version 0.3.4 svn path=/nixpkgs/trunk/; revision=31968 --- pkgs/development/libraries/haskell/citeproc-hs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/citeproc-hs/default.nix b/pkgs/development/libraries/haskell/citeproc-hs/default.nix index b09409d28df..d4f1d943088 100644 --- a/pkgs/development/libraries/haskell/citeproc-hs/default.nix +++ b/pkgs/development/libraries/haskell/citeproc-hs/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "citeproc-hs"; - version = "0.3.3"; - sha256 = "0yhzqxrr7jn1h0r2vy1jmlrf0z64qcr2fl37i04rpiwzb3nc16r4"; + version = "0.3.4"; + sha256 = "17w6fpmlhbfd8jxxz4s6ybz3dswf0i96fjjbs05ykh4i97rs62nv"; buildDepends = [ hsBibutils HTTP json mtl network pandocTypes parsec syb time utf8String xml From a4eebff1d2f4e2e44695f292208211ba7e09b9e6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 2 Feb 2012 10:37:53 +0000 Subject: [PATCH 61/77] haskell-hledger-lib: updated to version 0.17 svn path=/nixpkgs/trunk/; revision=31969 --- pkgs/development/libraries/haskell/hledger-lib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hledger-lib/default.nix b/pkgs/development/libraries/haskell/hledger-lib/default.nix index d8fdbf3f71d..aa17a1a7d92 100644 --- a/pkgs/development/libraries/haskell/hledger-lib/default.nix +++ b/pkgs/development/libraries/haskell/hledger-lib/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "hledger-lib"; - version = "0.16.1"; - sha256 = "15imhdkzfnxr72lsghrbsfisc7c2al4jkzcp72yf4hhra4zym1sd"; + version = "0.17"; + sha256 = "0dlm3hjbcf48nzz597ag1q9y0phsc09062wvzpmfkhk4hsijpds4"; buildDepends = [ cmdargs HUnit mtl parsec regexpr safe split time utf8String ]; From c7f15bf35e93f1266b021bdbb694cd9528662e2b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 2 Feb 2012 10:37:56 +0000 Subject: [PATCH 62/77] haskell-hledger-web: updated to version 0.17 svn path=/nixpkgs/trunk/; revision=31970 --- .../libraries/haskell/hledger-web/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/haskell/hledger-web/default.nix b/pkgs/development/libraries/haskell/hledger-web/default.nix index 5b697906f3b..692e57cad94 100644 --- a/pkgs/development/libraries/haskell/hledger-web/default.nix +++ b/pkgs/development/libraries/haskell/hledger-web/default.nix @@ -1,6 +1,6 @@ -{ cabal, aesonNative, blazeHtml, cabalFileTh, clientsession -, cmdargs, dataObject, dataObjectYaml, failure, fileEmbed, hamlet -, hledger, hledgerLib, HUnit, ioStorage, parsec, regexpr, safe +{ cabal, aeson, blazeHtml, cabalFileTh, clientsession, cmdargs +, dataObject, dataObjectYaml, failure, fileEmbed, hamlet, hledger +, hledgerLib, HUnit, ioStorage, parsec, regexpr, safe , shakespeareCss, shakespeareJs, shakespeareText, text, time , transformers, wai, waiExtra, warp, yesod, yesodCore, yesodForm , yesodJson, yesodStatic @@ -8,12 +8,12 @@ cabal.mkDerivation (self: { pname = "hledger-web"; - version = "0.16.5"; - sha256 = "0gqhmyl62jkz156gypzxwj46xrh5as3wrvkwrg04wfmpqrac5n06"; + version = "0.17"; + sha256 = "1b5k76p27pvxc91gns3aimy3zcy6m366nnpwzbm214v6ka82imfi"; isLibrary = true; isExecutable = true; buildDepends = [ - aesonNative blazeHtml cabalFileTh clientsession cmdargs dataObject + aeson blazeHtml cabalFileTh clientsession cmdargs dataObject dataObjectYaml failure fileEmbed hamlet hledger hledgerLib HUnit ioStorage parsec regexpr safe shakespeareCss shakespeareJs shakespeareText text time transformers wai waiExtra warp yesod From 3170847b139093ef92202340c53823c588192048 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 2 Feb 2012 10:37:58 +0000 Subject: [PATCH 63/77] haskell-hledger: updated to version 0.17 svn path=/nixpkgs/trunk/; revision=31971 --- .../libraries/haskell/hledger/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/haskell/hledger/default.nix b/pkgs/development/libraries/haskell/hledger/default.nix index e0560855286..6184f551e0c 100644 --- a/pkgs/development/libraries/haskell/hledger/default.nix +++ b/pkgs/development/libraries/haskell/hledger/default.nix @@ -1,16 +1,16 @@ -{ cabal, cmdargs, csv, haskeline, hledgerLib, HUnit, mtl, parsec -, regexpr, safe, split, time, utf8String +{ cabal, cabalFileTh, cmdargs, csv, haskeline, hledgerLib, HUnit +, mtl, parsec, regexpr, safe, split, time, utf8String }: cabal.mkDerivation (self: { pname = "hledger"; - version = "0.16.1"; - sha256 = "182a5qlcxbh9q8hzrmgm99hcgvxjq8j5xq202iff14p1yqv0irs2"; + version = "0.17"; + sha256 = "0ah01d10hvz12zwkprk6sb3by8azz9fhm772440arhd7r9fn6232"; isLibrary = true; isExecutable = true; buildDepends = [ - cmdargs csv haskeline hledgerLib HUnit mtl parsec regexpr safe - split time utf8String + cabalFileTh cmdargs csv haskeline hledgerLib HUnit mtl parsec + regexpr safe split time utf8String ]; meta = { homepage = "http://hledger.org"; From 36f7262ef33a8fcc72b7d3dc4b3ea2f08e20d125 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 2 Feb 2012 10:38:01 +0000 Subject: [PATCH 64/77] haskell-socks: updated to version 0.4.0 svn path=/nixpkgs/trunk/; revision=31972 --- pkgs/development/libraries/haskell/socks/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/libraries/haskell/socks/default.nix b/pkgs/development/libraries/haskell/socks/default.nix index ac5b87e65a1..d6e9f648f77 100644 --- a/pkgs/development/libraries/haskell/socks/default.nix +++ b/pkgs/development/libraries/haskell/socks/default.nix @@ -10,5 +10,9 @@ cabal.mkDerivation (self: { description = "Socks proxy (version 5) implementation"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; }; }) From de4350af7dc23264e087558dd08c1952ed90ce8d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 2 Feb 2012 10:38:03 +0000 Subject: [PATCH 65/77] haskell-test-framework: updated to version 0.5 svn path=/nixpkgs/trunk/; revision=31973 --- pkgs/development/libraries/haskell/test-framework/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/test-framework/default.nix b/pkgs/development/libraries/haskell/test-framework/default.nix index 7fa6dcae0ce..6ac60c1df2d 100644 --- a/pkgs/development/libraries/haskell/test-framework/default.nix +++ b/pkgs/development/libraries/haskell/test-framework/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "test-framework"; - version = "0.4.2.1"; - sha256 = "1021drmg1k4b844rwsjfbvajai4irrxc9aa7g6rk5n246a2nh9if"; + version = "0.5"; + sha256 = "19zm9xdhyjhqi2ryd2gkwi7m92s88mmiw1b6b91hjfhfw3c1qlzz"; isLibrary = true; isExecutable = true; buildDepends = [ From 9aae354adfcd1112097ecb29d69b26611efe55d8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 2 Feb 2012 10:38:06 +0000 Subject: [PATCH 66/77] haskell-zlib-bindings: updated to version 0.0.3.1 svn path=/nixpkgs/trunk/; revision=31974 --- pkgs/development/libraries/haskell/zlib-bindings/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/zlib-bindings/default.nix b/pkgs/development/libraries/haskell/zlib-bindings/default.nix index 86ab3ad1aab..1d4f6659475 100644 --- a/pkgs/development/libraries/haskell/zlib-bindings/default.nix +++ b/pkgs/development/libraries/haskell/zlib-bindings/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "zlib-bindings"; - version = "0.0.3"; - sha256 = "0hi74pc9lc11j7bvaka2fpy3cdql2z7232nxpjffjk7prqrc0q8d"; + version = "0.0.3.1"; + sha256 = "1j1z797zi5svxyv5ssfx8lyhmzlc2j7iad4b01aw0jvyp3ad4qan"; buildDepends = [ zlib ]; meta = { homepage = "http://github.com/snoyberg/zlib-bindings"; From e3e09ea617451cb18a98b273df275e5250336c9e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 2 Feb 2012 10:38:08 +0000 Subject: [PATCH 67/77] haskell-packages.nix: disabled hledger-vty and hledger-chart These packages don't build with current versions of hledger-lib. I'll ask upstream about an update. svn path=/nixpkgs/trunk/; revision=31975 --- pkgs/top-level/haskell-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 34e169ee6cf..cabebd727ba 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -831,8 +831,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); hledger = callPackage ../development/libraries/haskell/hledger {}; hledgerLib = callPackage ../development/libraries/haskell/hledger-lib {}; - hledgerVty = callPackage ../development/libraries/haskell/hledger-vty {}; - hledgerChart = callPackage ../development/libraries/haskell/hledger-chart {}; + #hledgerVty = callPackage ../development/libraries/haskell/hledger-vty {}; + #hledgerChart = callPackage ../development/libraries/haskell/hledger-chart {}; hledgerInterest = callPackage ../applications/office/hledger-interest {}; hledgerWeb = callPackage ../development/libraries/haskell/hledger-web {}; From c9a9d814716aac33e386c73a58a86e35f5b0e310 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 2 Feb 2012 10:52:12 +0000 Subject: [PATCH 68/77] haskell-conduit: updated to version 0.1.1.1 svn path=/nixpkgs/trunk/; revision=31976 --- pkgs/development/libraries/haskell/conduit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/conduit/default.nix b/pkgs/development/libraries/haskell/conduit/default.nix index 38285492dd4..bd8d1632af2 100644 --- a/pkgs/development/libraries/haskell/conduit/default.nix +++ b/pkgs/development/libraries/haskell/conduit/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "conduit"; - version = "0.0.4"; - sha256 = "1sc14nh21ba85azm4my5qnllnlbmsq5j6h1yd1mdsk2z3fb0x5zz"; + version = "0.1.1.1"; + sha256 = "0gqkk5q329xbw565xd9xc0pz2ha66jkdbbjgwadvrjw1n52vaqg5"; buildDepends = [ liftedBase monadControl text transformers transformersBase ]; From 0f5ff15cb962d69719d84319a8583417caaddc8a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 2 Feb 2012 10:52:15 +0000 Subject: [PATCH 69/77] haskell-http-conduit: updated to version 1.2.0 svn path=/nixpkgs/trunk/; revision=31977 --- pkgs/development/libraries/haskell/http-conduit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/http-conduit/default.nix b/pkgs/development/libraries/haskell/http-conduit/default.nix index bf411f89221..0a4dd110fee 100644 --- a/pkgs/development/libraries/haskell/http-conduit/default.nix +++ b/pkgs/development/libraries/haskell/http-conduit/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "http-conduit"; - version = "1.1.2.2"; - sha256 = "049gidxmrw4zri2zkibl2298glhapzzh1kg001dn563594bbiccz"; + version = "1.2.0"; + sha256 = "1s3qrvglhymwvr0cp32mi95dijic40lphhsfr4hm63qjphfc8dpi"; buildDepends = [ asn1Data attoparsec attoparsecConduit base64Bytestring blazeBuilder blazeBuilderConduit caseInsensitive certificate conduit cprngAes From 7b5db94b5f16e56212c905fc7f28897570f759ed Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 2 Feb 2012 12:19:17 +0000 Subject: [PATCH 70/77] * Updated Adobe Reader to 9.4.7. svn path=/nixpkgs/trunk/; revision=31978 --- pkgs/applications/misc/adobe-reader/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/misc/adobe-reader/default.nix b/pkgs/applications/misc/adobe-reader/default.nix index e56982a6680..25bce4203ee 100644 --- a/pkgs/applications/misc/adobe-reader/default.nix +++ b/pkgs/applications/misc/adobe-reader/default.nix @@ -3,13 +3,13 @@ assert stdenv.system == "i686-linux"; stdenv.mkDerivation { - name = "adobe-reader-9.4.2-1"; + name = "adobe-reader-9.4.7-1"; builder = ./builder.sh; src = fetchurl { - url = http://ardownload.adobe.com/pub/adobe/reader/unix/9.x/9.4.2/enu/AdbeRdr9.4.2-1_i486linux_enu.tar.bz2; - sha256 = "0xm8ngr7lslhxli9ly1g2w7ichip88vpf7lfx1ma0liaw4m2gv0h"; + url = http://ardownload.adobe.com/pub/adobe/reader/unix/9.x/9.4.7/enu/AdbeRdr9.4.7-1_i486linux_enu.tar.bz2; + sha256 = "0bzx1rcwc9bi5jkh8f8hjb354zxlvvx37lhm0l2r0mjxj8fimfb5"; }; # !!! Adobe Reader contains copies of OpenSSL, libcurl, and libicu. diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1b44d045938..99aab924b0c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3084,7 +3084,6 @@ let omake = callPackage ../development/tools/ocaml/omake { }; - openocd = callPackage ../development/tools/misc/openocd { }; oprofile = import ../development/tools/profiling/oprofile { @@ -8693,7 +8692,6 @@ let texLiveFull = lib.setName "texlive-full" (texLiveAggregationFun { paths = [ texLive texLiveExtra lmodern texLiveCMSuper texLiveLatexXColor texLivePGF texLiveBeamer texLiveModerncv ]; - }); /* Look in configurations/misc/raskin.nix for usage example (around revisions From 57c1279ce8a6f0dbdad7d0cae9d3173d7bdd071b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 2 Feb 2012 13:33:54 +0000 Subject: [PATCH 71/77] haskell-clientsession: updated to version 0.7.4 svn path=/nixpkgs/trunk/; revision=31980 --- .../development/libraries/haskell/clientsession/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/clientsession/default.nix b/pkgs/development/libraries/haskell/clientsession/default.nix index 32e88cbf2cf..a59b3b9ef0e 100644 --- a/pkgs/development/libraries/haskell/clientsession/default.nix +++ b/pkgs/development/libraries/haskell/clientsession/default.nix @@ -4,14 +4,14 @@ cabal.mkDerivation (self: { pname = "clientsession"; - version = "0.7.3.6"; - sha256 = "04cvws7h2pm3rk8p2yj1pqkf9vjqq65hxg9sjldg7zhxdjgq1hgc"; + version = "0.7.4"; + sha256 = "050mg3rzyld4v2b9v1pc1q563sp7sffiapvr8ks8f46ibl17lvss"; buildDepends = [ base64Bytestring cereal cprngAes cryptoApi cryptocipher entropy skein tagged ]; meta = { - homepage = "http://github.com/snoyberg/clientsession/tree/master"; + homepage = "http://github.com/yesodweb/clientsession/tree/master"; description = "Securely store session data in a client-side cookie"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; From 0ff686650199823c878381a7c5734924964016d0 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 2 Feb 2012 13:33:58 +0000 Subject: [PATCH 72/77] haskell-crypto-api: updated to version 0.9 svn path=/nixpkgs/trunk/; revision=31981 --- pkgs/development/libraries/haskell/crypto-api/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/crypto-api/default.nix b/pkgs/development/libraries/haskell/crypto-api/default.nix index 66204112c16..546392d7087 100644 --- a/pkgs/development/libraries/haskell/crypto-api/default.nix +++ b/pkgs/development/libraries/haskell/crypto-api/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "crypto-api"; - version = "0.8"; - sha256 = "1fwkafb9v2348vr1a4xnlmkgs4kh85az4f3wnrl9cbqwxf3cc328"; + version = "0.9"; + sha256 = "11372brnpiqdm6fdfp95wyyl8nvhbagnq0q2bdhn4xsskpnp4hnp"; buildDepends = [ cereal entropy largeword tagged ]; meta = { homepage = "http://trac.haskell.org/crypto-api/wiki"; From e11c942238ee3d17bd23ea926f96fd516d92fd6b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 2 Feb 2012 14:54:53 +0000 Subject: [PATCH 73/77] haskell-yesod-default: added version 0.5.0 svn path=/nixpkgs/trunk/; revision=31982 --- .../haskell/yesod-default/default.nix | 23 +++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/development/libraries/haskell/yesod-default/default.nix diff --git a/pkgs/development/libraries/haskell/yesod-default/default.nix b/pkgs/development/libraries/haskell/yesod-default/default.nix new file mode 100644 index 00000000000..bfed775756f --- /dev/null +++ b/pkgs/development/libraries/haskell/yesod-default/default.nix @@ -0,0 +1,23 @@ +{ cabal, cmdargs, dataObject, dataObjectYaml, shakespeareCss +, shakespeareJs, text, transformers, wai, waiExtra, warp, yesodCore +}: + +cabal.mkDerivation (self: { + pname = "yesod-default"; + version = "0.5.0"; + sha256 = "02j9567nmyxr68q8p8ihbig9b6f9p9ciif8nlp03mfkbq10hwrm3"; + buildDepends = [ + cmdargs dataObject dataObjectYaml shakespeareCss shakespeareJs text + transformers wai waiExtra warp yesodCore + ]; + meta = { + homepage = "http://www.yesodweb.com/"; + description = "Default config and main functions for your yesod application"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index cabebd727ba..4f3e4357e02 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1473,6 +1473,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); pathPieces = self.pathPieces_0_0_0; }; + yesodDefault = callPackage ../development/libraries/haskell/yesod-default {}; + yesodForm = callPackage ../development/libraries/haskell/yesod-form {}; yesodJson = callPackage ../development/libraries/haskell/yesod-json {}; From bd2c29d5533f84654e2a9c5ef410a3a1f769129d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 2 Feb 2012 14:54:56 +0000 Subject: [PATCH 74/77] haskell-persistent-sqlite: added version 0.6.2.1 svn path=/nixpkgs/trunk/; revision=31983 --- .../haskell/persistent-sqlite/default.nix | 22 +++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/development/libraries/haskell/persistent-sqlite/default.nix diff --git a/pkgs/development/libraries/haskell/persistent-sqlite/default.nix b/pkgs/development/libraries/haskell/persistent-sqlite/default.nix new file mode 100644 index 00000000000..0037573cea7 --- /dev/null +++ b/pkgs/development/libraries/haskell/persistent-sqlite/default.nix @@ -0,0 +1,22 @@ +{ cabal, dataObject, monadControl, neither, persistent, text +, transformers +}: + +cabal.mkDerivation (self: { + pname = "persistent-sqlite"; + version = "0.6.2.1"; + sha256 = "10sqmkd7vnrrpr8phcswbxcvn8vjipgy96nk2jj3g96j3cfwfpk0"; + buildDepends = [ + dataObject monadControl neither persistent text transformers + ]; + meta = { + homepage = "http://www.yesodweb.com/book/persistent"; + description = "Backend for the persistent library using sqlite3"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 4f3e4357e02..ce0781c12e9 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1084,6 +1084,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); pathPieces = self.pathPieces_0_0_0; }; + persistentSqlite = callPackage ../development/libraries/haskell/persistent-sqlite {}; + persistentTemplate = callPackage ../development/libraries/haskell/persistent-template {}; polyparse = callPackage ../development/libraries/haskell/polyparse/default.nix {}; From 9d9e33b98d8319cf10e77694e6dbd7ed28339a2f Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 2 Feb 2012 15:44:22 +0000 Subject: [PATCH 75/77] * Added Firefox 10.0. P.S. it seems that Firefox 10 no longer needs --enable-official-branding to get a browser that calls itself "Firefox". But I'll leave the flag in for the moment. * Removed Firefox 8.0. svn path=/nixpkgs/trunk/; revision=31984 --- .../browsers/firefox/{8.0.nix => 10.0.nix} | 8 ++++---- pkgs/top-level/all-packages.nix | 14 +++++++------- pkgs/top-level/release.nix | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) rename pkgs/applications/networking/browsers/firefox/{8.0.nix => 10.0.nix} (96%) diff --git a/pkgs/applications/networking/browsers/firefox/8.0.nix b/pkgs/applications/networking/browsers/firefox/10.0.nix similarity index 96% rename from pkgs/applications/networking/browsers/firefox/8.0.nix rename to pkgs/applications/networking/browsers/firefox/10.0.nix index 823d6e0cbd2..79869b324b9 100644 --- a/pkgs/applications/networking/browsers/firefox/8.0.nix +++ b/pkgs/applications/networking/browsers/firefox/10.0.nix @@ -15,14 +15,14 @@ assert stdenv.gcc ? libc && stdenv.gcc.libc != null; rec { - firefoxVersion = "8.0.1"; + firefoxVersion = "10.0"; - xulVersion = "8.0.1"; # this attribute is used by other packages + xulVersion = "10.0"; # this attribute is used by other packages src = fetchurl { url = "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2"; - sha1 = "0dd207c5cee9d53114c55aa23eeca36b754bc128"; + sha1 = "cbf1fb0efe0a3a2b2dafaa324b136736e93de70c"; }; commonConfigureFlags = @@ -139,7 +139,7 @@ rec { [ "--enable-application=browser" "--with-libxul-sdk=${xulrunner}/lib/xulrunner-devel-${xulrunner.version}" "--enable-chrome-format=jar" - "--disable-elf-hack" + "--disable-elf-hack" ] ++ commonConfigureFlags ++ stdenv.lib.optional enableOfficialBranding "--enable-official-branding"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 99aab924b0c..ed955eceb3c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6838,13 +6838,6 @@ let firefox36Wrapper = wrapFirefox { browser = firefox36Pkgs.firefox; }; - firefox80Pkgs = callPackage ../applications/networking/browsers/firefox/8.0.nix { - inherit (gtkLibs) gtk pango; - inherit (gnome) libIDL; - }; - - firefox80Wrapper = wrapFirefox { browser = firefox80Pkgs.firefox; }; - firefox90Pkgs = callPackage ../applications/networking/browsers/firefox/9.0.nix { inherit (gtkLibs) gtk pango; inherit (gnome) libIDL; @@ -6852,6 +6845,13 @@ let firefox90Wrapper = wrapFirefox { browser = firefox90Pkgs.firefox; }; + firefox100Pkgs = callPackage ../applications/networking/browsers/firefox/10.0.nix { + inherit (gtkLibs) gtk pango; + inherit (gnome) libIDL; + }; + + firefox100Wrapper = wrapFirefox { browser = firefox100Pkgs.firefox; }; + flac = callPackage ../applications/audio/flac { }; flashplayer = flashplayer11; diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 08f6e993b11..44419a040fd 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -363,8 +363,8 @@ with (import ./release-lib.nix); }; firefox36Pkgs.firefox = linux; - firefox80Pkgs.firefox = linux; firefox90Pkgs.firefox = linux; + firefox100Pkgs.firefox = linux; gnome = { gnome_panel = linux; From 798890b819e188a8a70fd2ade1e9872addb19d19 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 2 Feb 2012 17:03:01 +0000 Subject: [PATCH 76/77] haskell-zlib: drop version 0.5.3.2 again; it's causing lots of trouble This change affects only GHC 7.2 or later. svn path=/nixpkgs/trunk/; revision=31985 --- .../libraries/haskell/zlib/0.5.3.2.nix | 17 ----------------- pkgs/top-level/haskell-packages.nix | 13 ++----------- 2 files changed, 2 insertions(+), 28 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/zlib/0.5.3.2.nix diff --git a/pkgs/development/libraries/haskell/zlib/0.5.3.2.nix b/pkgs/development/libraries/haskell/zlib/0.5.3.2.nix deleted file mode 100644 index 6370c5560b8..00000000000 --- a/pkgs/development/libraries/haskell/zlib/0.5.3.2.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ cabal, zlib }: - -cabal.mkDerivation (self: { - pname = "zlib"; - version = "0.5.3.2"; - sha256 = "1a5xr59bw7hpgd7fwkpgkrpib7i46dsip7285pccvi2934k0628q"; - extraLibraries = [ zlib ]; - meta = { - description = "Compression and decompression in the gzip and zlib formats"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; - }; -}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index ce0781c12e9..5f445ef9f4f 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -151,7 +151,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); stm = self.stm_2_2_0_1; # 7.2 ok, 7.3 ok syb = self.syb_0_3_6; # 7.2 ok, 7.3 ok xhtml = self.xhtml_3000_2_0_1; # 7.2 ok, 7.3 ok - zlib = self.zlib_0_5_3_2; # 7.2 ok, 7.3 ok + zlib = self.zlib_0_5_3_1; # 7.2 ok, 7.3 ok HTTP = self.HTTP_4000_2_2; # 7.2 ok, 7.3 ok deepseq = self.deepseq_1_1_0_2; # 7.2 ok, 7.3 ok text = self.text_0_11_1_13; # 7.2 ok, 7.3 ok @@ -210,7 +210,6 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); haskellPlatform = self.haskellPlatform_2011_4_0_0; mtl1 = self.mtl_1_1_1_1; repaExamples = null; # don't pick this version of 'repa-examples' during nix-env -u - zlib_0_5_3_2 = null; # don't pick this version of 'zlib' during nix-env -u }; haskellPlatform_2011_4_0_0 = @@ -253,7 +252,6 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); haskellPlatform = self.haskellPlatform_2011_2_0_1; mtl1 = self.mtl_1_1_1_1; repaExamples = null; # don't pick this version of 'repa-examples' during nix-env -u - zlib_0_5_3_2 = null; # don't pick this version of 'zlib' during nix-env -u }; haskellPlatform_2011_2_0_1 = @@ -296,7 +294,6 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); haskellPlatform = self.haskellPlatform_2011_2_0_0; mtl1 = self.mtl_1_1_1_1; repaExamples = null; # don't pick this version of 'repa-examples' during nix-env -u - zlib_0_5_3_2 = null; # don't pick this version of 'zlib' during nix-env -u }; haskellPlatform_2011_2_0_0 = @@ -335,7 +332,6 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); self : self.haskellPlatformArgs_2010_2_0_0 self // { haskellPlatform = self.haskellPlatform_2010_2_0_0; repaExamples = null; # don't pick this version of 'repa-examples' during nix-env -u - zlib_0_5_3_2 = null; # don't pick this version of 'zlib' during nix-env -u deepseq = self.deepseq_1_1_0_2; # deviating from Haskell platform here, to make some packages (notably statistics) compile }; @@ -375,7 +371,6 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); haskellPlatform = self.haskellPlatform_2010_1_0_0; extensibleExceptions = self.extensibleExceptions_0_1_1_0; repaExamples = null; # don't pick this version of 'repa-examples' during nix-env -u - zlib_0_5_3_2 = null; # don't pick this version of 'zlib' during nix-env -u }; haskellPlatform_2010_1_0_0 = @@ -415,7 +410,6 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); extensibleExceptions = self.extensibleExceptions_0_1_1_0; text = self.text_0_11_0_6; repaExamples = null; # don't pick this version of 'repa-examples' during nix-env -u - zlib_0_5_3_2 = null; # don't pick this version of 'zlib' during nix-env -u }; haskellPlatform_2009_2_0_2 = @@ -1502,10 +1496,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); zlib_0_5_3_1 = callPackage ../development/libraries/haskell/zlib/0.5.3.1.nix { inherit (pkgs) zlib; }; - zlib_0_5_3_2 = callPackage ../development/libraries/haskell/zlib/0.5.3.2.nix { - inherit (pkgs) zlib; - }; - zlib = self.zlib_0_5_3_2; + zlib = self.zlib_0_5_3_1; zlibBindings = callPackage ../development/libraries/haskell/zlib-bindings {}; From 9758857fbe69d84e98e9ffd9a0f73e1ac94e4bac Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Thu, 2 Feb 2012 20:30:55 +0000 Subject: [PATCH 77/77] libdevil: pick a couple of debian patches svn path=/nixpkgs/trunk/; revision=31986 --- .../libraries/libdevil/default.nix | 25 ++++++++++----- .../libraries/libdevil/ftbfs-libpng15.patch | 31 +++++++++++++++++++ 2 files changed, 49 insertions(+), 7 deletions(-) create mode 100644 pkgs/development/libraries/libdevil/ftbfs-libpng15.patch diff --git a/pkgs/development/libraries/libdevil/default.nix b/pkgs/development/libraries/libdevil/default.nix index a67dc71f699..12008bcbccb 100644 --- a/pkgs/development/libraries/libdevil/default.nix +++ b/pkgs/development/libraries/libdevil/default.nix @@ -1,5 +1,6 @@ -{ stdenv, fetchurl -, libjpeg ? null, libpng ? null, libmng ? null, lcms1 ? null, libtiff ? null, openexr ? null, mesa ? null, xlibs ? null }: +{ stdenv, fetchurl, libjpeg, libpng, libmng, lcms1, libtiff, openexr, mesa +, libX11, pkgconfig }: + stdenv.mkDerivation rec { name ="libdevil-${version}"; @@ -10,14 +11,24 @@ stdenv.mkDerivation rec { sha256 = "1zd850nn7nvkkhasrv7kn17kzgslr5ry933v6db62s4lr0zzlbv8"; }; - buildInputs = [ libjpeg libpng libmng lcms1 libtiff openexr mesa xlibs.libX11 ]; + buildInputs = [ libjpeg libpng libmng lcms1 libtiff openexr mesa libX11 ]; + buildNativeInputs = [ pkgconfig ]; + configureFlags = [ "--enable-ILU" "--enable-ILUT" ]; + patches = + [ ( fetchurl { + url = http://patch-tracker.debian.org/patch/series/dl/devil/1.7.8-6.1/03_CVE-2009-3994.diff; + sha256 = "0qkx2qfv02igbrmsn6z5a3lbrbwjfh3rb0c2sj54wy0j1f775hbc"; + } ) + ./ftbfs-libpng15.patch + ]; + meta = with stdenv.lib; { homepage = http://openil.sourceforge.net/; - description = "An image library which can can load, save, convert, manipulate, - filter and display a wide variety of image formats."; + description = "An image library which can can load, save, convert, manipulate, filter and display a wide variety of image formats"; license = licenses.lgpl2; - maintainers = [ maintainers.phreedom ]; + platforms = platforms.all; + maintainers = [ maintainers.phreedom maintainers.urkud ]; }; -} \ No newline at end of file +} diff --git a/pkgs/development/libraries/libdevil/ftbfs-libpng15.patch b/pkgs/development/libraries/libdevil/ftbfs-libpng15.patch new file mode 100644 index 00000000000..5fc53c2dc6a --- /dev/null +++ b/pkgs/development/libraries/libdevil/ftbfs-libpng15.patch @@ -0,0 +1,31 @@ +Source: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=649554 +--- devil-1.7.8.orig/src-IL/src/il_icon.c ++++ devil-1.7.8/src-IL/src/il_icon.c +@@ -525,7 +525,11 @@ + + // Expand low-bit-depth grayscale images to 8 bits + if (ico_color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) { ++#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4 ++ png_set_expand_gray_1_2_4_to_8(ico_png_ptr); ++#else + png_set_gray_1_2_4_to_8(ico_png_ptr); ++#endif + } + + // Expand RGB images with transparency to full alpha channels +only in patch2: +unchanged: +--- devil-1.7.8.orig/src-IL/src/il_png.c ++++ devil-1.7.8/src-IL/src/il_png.c +@@ -278,7 +278,11 @@ + + // Expand low-bit-depth grayscale images to 8 bits + if (png_color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) { ++#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4 ++ png_set_expand_gray_1_2_4_to_8(png_ptr); ++#else + png_set_gray_1_2_4_to_8(png_ptr); ++#endif + } + + // Expand RGB images with transparency to full alpha channels