diff options
43 files changed, 534 insertions, 181 deletions
diff --git a/nixos/modules/services/networking/i2p.nix b/nixos/modules/services/networking/i2p.nix index bad22c79138..e6ee5fd1f95 100644 --- a/nixos/modules/services/networking/i2p.nix +++ b/nixos/modules/services/networking/i2p.nix @@ -7,15 +7,7 @@ let homeDir = "/var/lib/i2p"; in { ###### interface - options.services.i2p = { - enable = mkOption { - type = types.bool; - default = false; - description = '' - Enables i2p as a running service upon activation. - ''; - }; - }; + options.services.i2p.enable = mkEnableOption "I2P router"; ###### implementation config = mkIf cfg.enable { diff --git a/nixos/modules/virtualisation/brightbox-config.nix b/nixos/modules/virtualisation/brightbox-config.nix new file mode 100644 index 00000000000..528ffecc0bf --- /dev/null +++ b/nixos/modules/virtualisation/brightbox-config.nix @@ -0,0 +1,5 @@ +{ config, pkgs, modulesPath, ... }: + +{ + imports = [ "${modulesPath}/virtualisation/brightbox-image.nix" ]; +} diff --git a/nixos/modules/virtualisation/brightbox-image.nix b/nixos/modules/virtualisation/brightbox-image.nix new file mode 100644 index 00000000000..3a956caca0c --- /dev/null +++ b/nixos/modules/virtualisation/brightbox-image.nix @@ -0,0 +1,166 @@ +{ config, lib, pkgs, ... }: + +with lib; +let + diskSize = "20G"; +in +{ + imports = [ ../profiles/headless.nix ../profiles/qemu-guest.nix ]; + + system.build.brightboxImage = + pkgs.vmTools.runInLinuxVM ( + pkgs.runCommand "brightbox-image" + { preVM = + '' + mkdir $out + diskImage=$out/$diskImageBase + truncate $diskImage --size ${diskSize} + mv closure xchg/ + ''; + + postVM = + '' + PATH=$PATH:${pkgs.gnutar}/bin:${pkgs.gzip}/bin + pushd $out + ${pkgs.qemu_kvm}/bin/qemu-img convert -c -O qcow2 $diskImageBase nixos.qcow2 + rm $diskImageBase + popd + ''; + diskImageBase = "nixos-${config.system.nixosVersion}-${pkgs.stdenv.system}.raw"; + buildInputs = [ pkgs.utillinux pkgs.perl ]; + exportReferencesGraph = + [ "closure" config.system.build.toplevel ]; + } + '' + # Create partition table + ${pkgs.parted}/sbin/parted /dev/vda mklabel msdos + ${pkgs.parted}/sbin/parted /dev/vda mkpart primary ext4 1 ${diskSize} + ${pkgs.parted}/sbin/parted /dev/vda print + . /sys/class/block/vda1/uevent + mknod /dev/vda1 b $MAJOR $MINOR + + # Create an empty filesystem and mount it. + ${pkgs.e2fsprogs}/sbin/mkfs.ext4 -L nixos /dev/vda1 + ${pkgs.e2fsprogs}/sbin/tune2fs -c 0 -i 0 /dev/vda1 + + mkdir /mnt + mount /dev/vda1 /mnt + + # The initrd expects these directories to exist. + mkdir /mnt/dev /mnt/proc /mnt/sys + + mount --bind /proc /mnt/proc + mount --bind /dev /mnt/dev + mount --bind /sys /mnt/sys + + # Copy all paths in the closure to the filesystem. + storePaths=$(perl ${pkgs.pathsFromGraph} /tmp/xchg/closure) + + mkdir -p /mnt/nix/store + echo "copying everything (will take a while)..." + cp -prd $storePaths /mnt/nix/store/ + + # Register the paths in the Nix database. + printRegistration=1 perl ${pkgs.pathsFromGraph} /tmp/xchg/closure | \ + chroot /mnt ${config.nix.package}/bin/nix-store --load-db --option build-users-group "" + + # Create the system profile to allow nixos-rebuild to work. + chroot /mnt ${config.nix.package}/bin/nix-env \ + -p /nix/var/nix/profiles/system --set ${config.system.build.toplevel} \ + --option build-users-group "" + + # `nixos-rebuild' requires an /etc/NIXOS. + mkdir -p /mnt/etc + touch /mnt/etc/NIXOS + + # `switch-to-configuration' requires a /bin/sh + mkdir -p /mnt/bin + ln -s ${config.system.build.binsh}/bin/sh /mnt/bin/sh + + # Install a configuration.nix. + mkdir -p /mnt/etc/nixos /mnt/boot/grub + cp ${./brightbox-config.nix} /mnt/etc/nixos/configuration.nix + + # Generate the GRUB menu. + ln -s vda /dev/sda + chroot /mnt ${config.system.build.toplevel}/bin/switch-to-configuration boot + + umount /mnt/proc /mnt/dev /mnt/sys + umount /mnt + '' + ); + + fileSystems."/".label = "nixos"; + + # Generate a GRUB menu. Amazon's pv-grub uses this to boot our kernel/initrd. + boot.loader.grub.device = "/dev/vda"; + boot.loader.grub.timeout = 0; + + # Don't put old configurations in the GRUB menu. The user has no + # way to select them anyway. + boot.loader.grub.configurationLimit = 0; + + # Allow root logins only using the SSH key that the user specified + # at instance creation time. + services.openssh.enable = true; + services.openssh.permitRootLogin = "without-password"; + + # Force getting the hostname from Google Compute. + networking.hostName = mkDefault ""; + + # Always include cryptsetup so that NixOps can use it. + environment.systemPackages = [ pkgs.cryptsetup ]; + + systemd.services."fetch-ec2-data" = + { description = "Fetch EC2 Data"; + + wantedBy = [ "multi-user.target" "sshd.service" ]; + before = [ "sshd.service" ]; + wants = [ "ip-up.target" ]; + after = [ "ip-up.target" ]; + + path = [ pkgs.wget pkgs.iproute ]; + + script = + '' + wget="wget -q --retry-connrefused -O -" + + ${optionalString (config.networking.hostName == "") '' + echo "setting host name..." + ${pkgs.nettools}/bin/hostname $($wget http://169.254.169.254/latest/meta-data/hostname) + ''} + + # Don't download the SSH key if it has already been injected + # into the image (a Nova feature). + if ! [ -e /root/.ssh/authorized_keys ]; then + echo "obtaining SSH key..." + mkdir -m 0700 -p /root/.ssh + $wget http://169.254.169.254/latest/meta-data/public-keys/0/openssh-key > /root/key.pub + if [ $? -eq 0 -a -e /root/key.pub ]; then + if ! grep -q -f /root/key.pub /root/.ssh/authorized_keys; then + cat /root/key.pub >> /root/.ssh/authorized_keys + echo "new key added to authorized_keys" + fi + chmod 600 /root/.ssh/authorized_keys + rm -f /root/key.pub + fi + fi + + # Extract the intended SSH host key for this machine from + # the supplied user data, if available. Otherwise sshd will + # generate one normally. + $wget http://169.254.169.254/2011-01-01/user-data > /root/user-data || true + key="$(sed 's/|/\n/g; s/SSH_HOST_DSA_KEY://; t; d' /root/user-data)" + key_pub="$(sed 's/SSH_HOST_DSA_KEY_PUB://; t; d' /root/user-data)" + if [ -n "$key" -a -n "$key_pub" -a ! -e /etc/ssh/ssh_host_dsa_key ]; then + mkdir -m 0755 -p /etc/ssh + (umask 077; echo "$key" > /etc/ssh/ssh_host_dsa_key) + echo "$key_pub" > /etc/ssh/ssh_host_dsa_key.pub + fi + ''; + + serviceConfig.Type = "oneshot"; + serviceConfig.RemainAfterExit = true; + }; + +} diff --git a/pkgs/applications/audio/ardour/default.nix b/pkgs/applications/audio/ardour/default.nix index 5327b6b77d7..2338af6ec99 100644 --- a/pkgs/applications/audio/ardour/default.nix +++ b/pkgs/applications/audio/ardour/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, alsaLib, aubio, boost, cairomm, curl, doxygen, dbus, fftw +{ stdenv, fetchFromGitHub, alsaLib, aubio, boost, cairomm, curl, doxygen, dbus, fftw , fftwSinglePrec, flac, glibc, glibmm, graphviz, gtk, gtkmm, libjack2 , libgnomecanvas, libgnomecanvasmm, liblo, libmad, libogg, librdf , librdf_raptor, librdf_rasqal, libsamplerate, libsigcxx, libsndfile @@ -15,24 +15,25 @@ let # "git describe" when _not_ on an annotated tag(!): MAJOR.MINOR-REV-HASH. # Version to build. - tag = "4.0"; + tag = "4.1"; # Version info that is built into the binary. Keep in sync with 'tag'. The # last 8 digits is a (fake) commit id. - revision = "4.0-e1aa66cb3f"; + revision = "4.1-fe672c8"; in stdenv.mkDerivation rec { name = "ardour-${tag}"; - src = fetchgit { - url = git://git.ardour.org/ardour/ardour.git; - rev = "e1aa66cb3f"; - sha256 = "396668fb9116a68f5079f0d880930e890fd0cdf7ee5f3b97fcf44b88cf840b4c"; + src = fetchFromGitHub { + owner = "Ardour"; + repo = "ardour"; + rev = "fe672c827cb2c08c94b1fa7e527d884c522a1af7"; + sha256 = "12yfy9l5mnl96ix4s2qicp3m2zscli1a4bd50nk9v035pgf77s3f"; }; - buildInputs = + buildInputs = [ alsaLib aubio boost cairomm curl doxygen dbus fftw fftwSinglePrec flac glibc glibmm graphviz gtk gtkmm libjack2 libgnomecanvas libgnomecanvasmm liblo libmad libogg librdf librdf_raptor librdf_rasqal libsamplerate diff --git a/pkgs/applications/audio/gpodder/default.nix b/pkgs/applications/audio/gpodder/default.nix index 853cdff4a51..58b9be41545 100644 --- a/pkgs/applications/audio/gpodder/default.nix +++ b/pkgs/applications/audio/gpodder/default.nix @@ -7,11 +7,11 @@ let inherit (pythonPackages) coverage feedparser minimock sqlite3 dbus pygtk eyeD3; in buildPythonPackage rec { - name = "gpodder-3.8.3"; + name = "gpodder-3.8.4"; src = fetchurl { url = "http://gpodder.org/src/${name}.tar.gz"; - sha256 = "8ac120a6084bded6bc88ecadbbc9df54a85f44ef4507f73a76de1d7a5574303c"; + sha256 = "0cjpk92qjsws7ddbnq0r2h7vm5019zlpafgbxwsgllmjzkknj6pn"; }; buildInputs = [ diff --git a/pkgs/applications/audio/ir.lv2/default.nix b/pkgs/applications/audio/ir.lv2/default.nix index 804d6e7d4e4..d6dbc4c55a9 100644 --- a/pkgs/applications/audio/ir.lv2/default.nix +++ b/pkgs/applications/audio/ir.lv2/default.nix @@ -17,10 +17,9 @@ stdenv.mkDerivation rec { ''; installPhase = '' - mkdir "$out/bin" + mkdir -p "$out/bin" mkdir "$out/include" - mkdir "$out/share" - mkdir "$out/share/doc" + mkdir -p "$out/share/doc" make PREFIX="$out" install install -Dm755 convert4chan "$out/bin/convert4chan" diff --git a/pkgs/applications/audio/x42-plugins/default.nix b/pkgs/applications/audio/x42-plugins/default.nix index 5603bc2fefc..1090ee4a61e 100644 --- a/pkgs/applications/audio/x42-plugins/default.nix +++ b/pkgs/applications/audio/x42-plugins/default.nix @@ -3,22 +3,17 @@ , lv2, mesa, gtk2, cairo, pango, fftwFloat, zita-convolver }: stdenv.mkDerivation rec { - version = "2014-11-01"; + version = "2015-07-02"; name = "x42-plugins-${version}"; src = fetchurl { - url = "http://gareus.org/misc/x42-plugins/x42-plugins-20141101.tar.xz"; - sha256 = "0pjdhj58hb4n2053v92l7v7097fjm4xzrl8ks4g1hc7miy98ymdk"; + url = "http://gareus.org/misc/x42-plugins/x42-plugins-20150702.tar.xz"; + sha256 = "1mq0grabzbl9xsd53v2qajhr8nngk0d4lx9n0n3nwy95y2gmy6sm"; }; buildInputs = [ mesa_glu ftgl freefont_ttf libjack2 libltc libsndfile libsamplerate lv2 mesa gtk2 cairo pango fftwFloat pkgconfig zita-convolver]; - makeFlags = [ "PREFIX=$(out)" "FONTFILE=${freefont_ttf}/share/fonts/truetype/FreeSansBold.ttf" ]; - - # remove check for zita-convolver in /usr/ - patchPhase = '' - sed -i "38,42d" convoLV2/Makefile - ''; + makeFlags = [ "PREFIX=$(out)" "FONTFILE=${freefont_ttf}/share/fonts/truetype/FreeSansBold.ttf" "LIBZITACONVOLVER=${zita-convolver}/include/zita-convolver.h" ]; meta = with stdenv.lib; { description = "Collection of LV2 plugins by Robin Gareus"; diff --git a/pkgs/applications/graphics/pencil/default.nix b/pkgs/applications/graphics/pencil/default.nix index 19c6334d1d6..94ab1b76cda 100644 --- a/pkgs/applications/graphics/pencil/default.nix +++ b/pkgs/applications/graphics/pencil/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, makeWrapper, xulrunner }: stdenv.mkDerivation rec { - version = "2.0.11"; + version = "2.0.13"; name = "pencil-${version}"; src = fetchurl { url = "https://github.com/prikhi/pencil/releases/download/v${version}/Pencil-${version}-linux-pkg.tar.gz"; - sha256 = "a35d1353de6665cbd4a5bd821dcdf7439f2a3c1fcbccee0f01ec8dd1bb67c4f3"; + sha256 = "150jsaq27n01l0vf10jiyrlfm0canqhphdxi42di96b9zsfkphpk"; }; diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 4c15ccc0428..8cad0a95ec9 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -5,12 +5,12 @@ }: stdenv.mkDerivation rec { - name = "calibre-2.33.0"; - version = "2.33.0"; + name = "calibre-${version}"; + version = "2.34.0"; src = fetchurl { url = "https://github.com/kovidgoyal/calibre/releases/download/v${version}/${name}.tar.xz"; - sha256 = "0j1micmjffi6rsn3ayblnz0wq648v05ckbn1qsiz086iaj2285q9"; + sha256 = "04khi2jz7jrp6ppax57648sjkczvcxfqyzlyvhw155ggmpg8fiki"; }; inherit python; diff --git a/pkgs/applications/networking/instant-messengers/baresip/default.nix b/pkgs/applications/networking/instant-messengers/baresip/default.nix index 5dde5b62dda..d41ba5fcdb3 100644 --- a/pkgs/applications/networking/instant-messengers/baresip/default.nix +++ b/pkgs/applications/networking/instant-messengers/baresip/default.nix @@ -4,11 +4,11 @@ , gsm, speex, portaudio, spandsp, libuuid }: stdenv.mkDerivation rec { - version = "0.4.13"; + version = "0.4.14"; name = "baresip-${version}"; src=fetchurl { url = "http://www.creytiv.com/pub/baresip-${version}.tar.gz"; - sha256 = "1mndpcclp5cqlm5jfbh37ig8dmga75qxqfinp4dyd1c0wnd0f0jg"; + sha256 = "19vn63j6dpybjy14mgnwf0yk2jbcbfdjs50whzwyrrkcv6ipj6hc"; }; buildInputs = [zlib openssl libre librem pkgconfig cairo mpg123 gstreamer gst_ffmpeg gst_plugins_base gst_plugins_bad gst_plugins_good diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix index fbd9954d3aa..69497f87c6b 100644 --- a/pkgs/applications/networking/instant-messengers/gajim/default.nix +++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix @@ -22,11 +22,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "gajim-${version}"; - version = "0.16.1"; + version = "0.16.3"; src = fetchurl { url = "http://www.gajim.org/downloads/0.16/gajim-${version}.tar.bz2"; - sha256 = "1gp8mdn6sz2pks5irsf563zbz98ldqksfky84ga9fzqndmq35bi6"; + sha256 = "05a59hf9wna6n9fi0a4bhz1hifqj21bwb4ff9rd0my23rdwmij51"; }; patches = [ diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks/default.nix new file mode 100644 index 00000000000..30d90ba302d --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchFromGitHub, pidgin, unzip, glib, json_glib, nss, nspr, libgnome_keyring } : + +stdenv.mkDerivation rec { + name = "pidgin-opensteamworks-1.5.1"; + + # Temporarily sourcing this from a mirror in my github account, until such time as the project is officially migrated away from the deprecated google code service + src = fetchFromGitHub { + owner = "Shados"; + repo = "pidgin-opensteamworks"; + rev = "4f0ea110a5bdba9d2b18ec8785b2edb276f0cccd"; + sha256 = "0gcrc1yaf29yjfhpflpn451i7isw8zc7maw77g604815myc5k025"; + }; + + preConfigure = "cd steam-mobile"; + postInstall = '' + mkdir -p $out/lib/pidgin/ + mkdir -p $out/share/pixmaps/pidgin/protocols/ + cp libsteam.so $out/lib/pidgin/ + unzip releases/icons.zip -d $out/share/pixmaps/pidgin/protocols/ + ''; + + buildInputs = [ pidgin unzip glib json_glib nss nspr libgnome_keyring ]; + + meta = with stdenv.lib; { + homepage = https://code.google.com/p/pidgin-opensteamworks; + description = "Plugin for Pidgin 2.x which implements Steam Friends/Steam IM compatibility"; + license = licenses.gpl3; + platforms = platforms.linux; + maintainters = with maintainers; [ arobyn ]; + }; +} diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index f2a088164d2..5d6e0faad4a 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -13,15 +13,17 @@ enableOfficialBranding ? false }: -let version = "31.7.0"; in +let version = "38.1.0"; in let verName = "${version}"; in stdenv.mkDerivation rec { name = "thunderbird-${verName}"; src = fetchurl { - url = "ftp://ftp.mozilla.org/pub/thunderbird/releases/${verName}/source/thunderbird-${verName}.source.tar.bz2"; - sha1 = "90e18f8ecccdaf1ee39493223a7e3ad8b3b7bede"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/${verName}/source/thunderbird-${verName}.source.tar.bz2"; + + # https://archive.mozilla.org/pub/thunderbird/releases/${verName}/SHA1SUMS + sha1 = "7bb0c85e889e397e53dcbcbd36957dbd7c8c10bd"; }; buildInputs = # from firefox30Pkgs.xulrunner, but without gstreamer and libvpx @@ -75,6 +77,10 @@ stdenv.mkDerivation rec { cd objdir echo '${stdenv.lib.concatMapStrings (s : "ac_add_options ${s}\n") configureFlags}' > .mozconfig echo 'ac_add_options --prefix="'"$out"'"' >> .mozconfig + # From version 38, we need to specify the source directory to build + # Thunderbird. Refer to mozilla/configure and search a line with + # "checking for application to build" and "# Support comm-central". + echo 'ac_add_options --with-external-source-dir="'`realpath ..`'"' >> .mozconfig echo 'mk_add_options MOZ_MAKE_FLAGS="-j'"$NIX_BUILD_CORES"'"' >> .mozconfig echo 'mk_add_options MOZ_OBJDIR="'`pwd`'"' >> .mozconfig diff --git a/pkgs/applications/science/electronics/ngspice/default.nix b/pkgs/applications/science/electronics/ngspice/default.nix index e64ea909cbb..4f887f511ae 100644 --- a/pkgs/applications/science/electronics/ngspice/default.nix +++ b/pkgs/applications/science/electronics/ngspice/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, readline, bison, libX11, libICE, libXaw, libXext}: stdenv.mkDerivation { - name = "ng-spice-rework-25"; + name = "ngspice-25"; src = fetchurl { url = "mirror://sourceforge/ngspice/ngspice-25.tar.gz"; diff --git a/pkgs/applications/science/logic/eprover/default.nix b/pkgs/applications/science/logic/eprover/default.nix index c04cfffbb14..97fe7065b85 100644 --- a/pkgs/applications/science/logic/eprover/default.nix +++ b/pkgs/applications/science/logic/eprover/default.nix @@ -3,11 +3,11 @@ let s = # Generated upstream information rec { baseName="eprover"; - version="1.8"; + version="1.9"; name="${baseName}-${version}"; - hash="0bl4dr7k6simwdvdyxhnjkiz4nm5y0nr8bfhc34zk0360i9m6sk3"; - url="http://wwwlehre.dhbw-stuttgart.de/~sschulz/WORK/E_DOWNLOAD/V_1.8/E.tgz"; - sha256="0bl4dr7k6simwdvdyxhnjkiz4nm5y0nr8bfhc34zk0360i9m6sk3"; + hash="0vipapqjg0339lpc98vpvz58m6xkqrhgxylmp0hrnld4lrhmcdn4"; + url="http://wwwlehre.dhbw-stuttgart.de/~sschulz/WORK/E_DOWNLOAD/V_1.9/E.tgz"; + sha256="0vipapqjg0339lpc98vpvz58m6xkqrhgxylmp0hrnld4lrhmcdn4"; }; in stdenv.mkDerivation { diff --git a/pkgs/applications/window-managers/bar/default.nix b/pkgs/applications/window-managers/bar/default.nix index 46a19b90b8b..964390d3b59 100644 --- a/pkgs/applications/window-managers/bar/default.nix +++ b/pkgs/applications/window-managers/bar/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, perl, libxcb }: let - version = "1.0"; + version = "1.1"; in stdenv.mkDerivation rec { name = "bar-${version}"; src = fetchurl { url = "https://github.com/LemonBoy/bar/archive/v${version}.tar.gz"; - sha256 = "1n2vak2acs37sslxl250cnz9c3irif5z4s54wi9qjyxbfzr2h2nc"; + sha256 = "171ciw676cvj80zzbqfbg9nwix36zph0683zmqf279q9b9bmayan"; }; buildInputs = [ libxcb perl ]; diff --git a/pkgs/data/fonts/font-awesome-ttf/default.nix b/pkgs/data/fonts/font-awesome-ttf/default.nix index ed91713d03a..992b87b8ec7 100644 --- a/pkgs/data/fonts/font-awesome-ttf/default.nix +++ b/pkgs/data/fonts/font-awesome-ttf/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, unzip}: stdenv.mkDerivation rec { - name = "font-awesome-4.3.0"; + name = "font-awesome-4.4.0"; src = fetchurl { url = "http://fortawesome.github.io/Font-Awesome/assets/${name}.zip"; - sha256 = "0wg9q6mq026jjw1bsyj9b5dgba7bb4h7i9xiwgsfckd412xpsbzd"; + sha256 = "1bmjh3j533awihdxihvlk2d1ypzs9q7azj0viqbm0df8jj2v4rwq"; }; buildCommand = '' diff --git a/pkgs/data/fonts/pecita/default.nix b/pkgs/data/fonts/pecita/default.nix index e28ac6c2618..3e5ad1655be 100644 --- a/pkgs/data/fonts/pecita/default.nix +++ b/pkgs/data/fonts/pecita/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://pecita.eu/b/Pecita.otf"; - sha256 = "11v5yzxa38fxpz8j3fc0v3l7py4i12avjnwrgkmd9clq9jhzk78s"; + sha256 = "0agml1886jvb0j6jar8hjx4hfbz3n0msszyp625b96ilv09qrcyz"; }; phases = ["installPhase"]; diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index c92f002a026..65d52c1a3e5 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -17,18 +17,20 @@ let in stdenv.mkDerivation rec { - version = "7.11.20150705"; + version = "7.11.20150809"; name = "ghc-${version}"; - rev = "3fabb71a559b493efdfb5bb91907f6a0f696a114"; + rev = "a40ec755d8e020cd4b87975f5a751f1e35c36977"; src = fetchgit { url = "git://git.haskell.org/ghc.git"; inherit rev; - sha256 = "1c0fsk2yk08x02n6s722d36igc9prrql4wcnr8m8c62wp4yrf25z"; + sha256 = "1hh1p9vrd1nrfi56jan4bnlczld2qzx85v7lfb6nara2bhcgqa1l"; }; postUnpack = '' pushd ghc-${builtins.substring 0 7 rev} + echo ${version} >VERSION + echo ${rev} >GIT_COMMIT_ID patchShebangs . ./boot popd diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix index 96843abbd45..2d6a3a45147 100644 --- a/pkgs/development/compilers/sbcl/default.nix +++ b/pkgs/development/compilers/sbcl/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "sbcl-${version}"; - version = "1.2.13"; + version = "1.2.14"; src = fetchurl { url = "mirror://sourceforge/project/sbcl/sbcl/${version}/${name}-source.tar.bz2"; - sha256 = "018jxd7f39a5aimjzfjdj739m3jq82k0qi59032v48gqrfa3mng6"; + sha256 = "01jw1w5siv6q16y1vmgd7s1i22aq0cqaipgn12jvq18c8vb6s55r"; }; buildInputs = [ which ] diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index f21e78a642e..27345770034 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -15448,8 +15448,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "TypeNat"; - version = "0.2.1.0"; - sha256 = "01dsw64zzwbkvm7q4jwyidjvxbkx6fvx8hhn70d2bpdxxammnxry"; + version = "0.4.0.0"; + sha256 = "0v6xd98nwl7zg5q5xmlrgzsb3219vcwj8rfacdyzdb9xpq5l9dnv"; libraryHaskellDepends = [ base ]; jailbreak = true; homepage = "https://github.com/avieth/TypeNat"; @@ -29334,8 +29334,8 @@ self: { }: mkDerivation { pname = "cabal-bounds"; - version = "0.9.4"; - sha256 = "1l1nqf8878kmmdc5ssrpn52cszn9w0ym70pjjbaprpa1c7mdbziy"; + version = "0.9.5"; + sha256 = "0l4s0j75ianggpl3hbqrr3zp7v9jjgd5646ydqbcg040win20lzh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -29420,8 +29420,8 @@ self: { }: mkDerivation { pname = "cabal-debian"; - version = "4.30"; - sha256 = "07wv05fi9sgh8v9239c4rvwrxrmwk7awmk5hpcnpyx8yj8z9z7q5"; + version = "4.30.2"; + sha256 = "1vafxq1h2nispc7jdckxy2c746ikh60cscg9rrrbvs01wvjam9xw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -42863,8 +42863,8 @@ self: { }: mkDerivation { pname = "diagrams-hsqml"; - version = "0.1.0.0"; - sha256 = "1j1n9bamb1fyfgbmiyqssyzh93fahmg48yb7z3z18rrxmn04rnax"; + version = "0.2.0.0"; + sha256 = "0f84919h7k93nnzgr2k9jp08qsgs2dgzihavmz2g9q1c6d53q6v0"; libraryHaskellDepends = [ base colour containers diagrams-core diagrams-lib hsqml lens text transformers @@ -55649,18 +55649,17 @@ self: { }) {}; "ghcjs-dom" = callPackage - ({ mkDerivation, base, glib, gtk, mtl, text, transformers, webkit - }: + ({ mkDerivation, base, ghcjs-base, mtl, text }: mkDerivation { pname = "ghcjs-dom"; version = "0.1.1.3"; sha256 = "0pdxb2s7fflrh8sbqakv0qi13jkn3d0yc32xhg2944yfjg5fvlly"; - libraryHaskellDepends = [ - base glib gtk mtl text transformers webkit - ]; + libraryHaskellDepends = [ base ghcjs-base mtl text ]; + jailbreak = true; description = "DOM library that supports both GHCJS and WebKitGTK"; license = stdenv.lib.licenses.mit; - }) {}; + broken = true; + }) { ghcjs-base = null;}; "ghcjs-dom-hello" = callPackage ({ mkDerivation, base, ghcjs-dom, mtl }: @@ -81008,21 +81007,20 @@ self: { }) {}; "jsaddle" = callPackage - ({ mkDerivation, base, glib, gtk3, hslogger, lens, template-haskell - , text, transformers, webkitgtk3, webkitgtk3-javascriptcore + ({ mkDerivation, base, hslogger, lens, template-haskell, text + , transformers }: mkDerivation { pname = "jsaddle"; version = "0.2.0.6"; sha256 = "1ggnhv9lgsd330p1k6zvg20dbqb1ysh282nalxramqvn2yhmqsx4"; libraryHaskellDepends = [ - base lens template-haskell text transformers webkitgtk3 - webkitgtk3-javascriptcore + base lens template-haskell text transformers ]; testHaskellDepends = [ - base glib gtk3 hslogger lens template-haskell text transformers - webkitgtk3 webkitgtk3-javascriptcore + base hslogger lens template-haskell text transformers ]; + jailbreak = true; description = "High level interface for webkit-javascriptcore"; license = stdenv.lib.licenses.mit; }) {}; @@ -81286,8 +81284,8 @@ self: { }: mkDerivation { pname = "json-rpc"; - version = "0.6.1.0"; - sha256 = "1vm6x08xqsw7sd3s0cq8i4hxagyxxc5jwypc80nv2rcdnyyhdmf7"; + version = "0.6.2.0"; + sha256 = "1d9w18x9l0iyq5br1xgjaxkclcmrw56nlkifqkcv9fgsividhyw3"; libraryHaskellDepends = [ aeson attoparsec base bytestring conduit conduit-extra deepseq hashable lifted-async monad-control monad-logger mtl QuickCheck stm @@ -92402,19 +92400,19 @@ self: { "moesocks" = callPackage ({ mkDerivation, aeson, async, attoparsec, base, binary, bytestring , containers, cryptohash, hslogger, HsOpenSSL, lens, mtl, network - , optparse-applicative, random, safe, stm, text, transformers, unix - , unordered-containers + , optparse-applicative, random, safe, stm, text, time, transformers + , unix, unordered-containers }: mkDerivation { pname = "moesocks"; - version = "0.1.0.11"; - sha256 = "1qmgsps9c6hcpb1y1z6jb0bjl51apll8s1vg6arz8kma98dkd79d"; + version = "0.1.0.12"; + sha256 = "1f31qd4lgc2li9q7cf7zx700v23sln9wxfd7yaw0d2q0qmqj2zvi"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ aeson async attoparsec base binary bytestring containers cryptohash hslogger HsOpenSSL lens mtl network optparse-applicative random - safe stm text transformers unix unordered-containers + safe stm text time transformers unix unordered-containers ]; homepage = "https://github.com/nfjinjing/moesocks"; description = "A functional firewall killer"; @@ -94328,14 +94326,14 @@ self: { "mtl-unleashed" = callPackage ({ mkDerivation, base, contravariant, hspec, hspec-core, lens, mtl - , profunctors + , profunctors, tagged }: mkDerivation { pname = "mtl-unleashed"; - version = "0.3"; - sha256 = "1rirgbs4b7q7yjnvdw1j2y6nmym47adm8lcl0xysxi2hhhvs8r9c"; + version = "0.3.1"; + sha256 = "04kbm0lxfwv34991384blz8a4qjwl32jv0d3x6rvgpjlidphfi2l"; libraryHaskellDepends = [ - base contravariant lens mtl profunctors + base contravariant lens mtl profunctors tagged ]; testHaskellDepends = [ base contravariant hspec hspec-core lens mtl profunctors @@ -107864,8 +107862,8 @@ self: { ({ mkDerivation, base, filepath, hspec, template-haskell }: mkDerivation { pname = "publicsuffix"; - version = "0.20150804"; - sha256 = "06b311vdwihqhdwf2zr0akndgyaxycli7lymzzyfbn0rhhx1g2kn"; + version = "0.20150808"; + sha256 = "1dcmi45vz9m4asf7i8bw6qigdcd2f7f48dmm2bq4w4dsjrp247dk"; libraryHaskellDepends = [ base filepath template-haskell ]; testHaskellDepends = [ base hspec ]; homepage = "https://github.com/wereHamster/publicsuffix-haskell/"; @@ -112359,8 +112357,8 @@ self: { ({ mkDerivation, base, hmatrix, repa, vector }: mkDerivation { pname = "repa-linear-algebra"; - version = "0.0.0.0"; - sha256 = "1y16rmdygxay46xbm617g944aazml48izzmkx46avvqvjyql96w1"; + version = "0.1.0.0"; + sha256 = "06lvp3sj6w4kvw6qhn5wcy2c2v7w15jaicw1pm14ssxhs4xl866g"; libraryHaskellDepends = [ base hmatrix repa vector ]; homepage = "https://github.com/marcinmrotek/repa-linear-algebra"; description = "HMatrix operations for Repa"; @@ -133960,8 +133958,8 @@ self: { ({ mkDerivation, base, singletons }: mkDerivation { pname = "type-list"; - version = "0.1.0.0"; - sha256 = "0y5qa882rcrlq13mfsp8yzbn6fqsc2clii2qjhk1nmg8ivqf026v"; + version = "0.2.0.0"; + sha256 = "19akcmjn1jgcxfsyw49pfydil47vh5zp99rb8qsyhmlv7x9czc03"; libraryHaskellDepends = [ base singletons ]; description = "Operations on type-level lists and tuples"; license = stdenv.lib.licenses.bsd3; @@ -140102,14 +140100,14 @@ self: { "webkit" = callPackage ({ mkDerivation, base, bytestring, cairo, glib, gtk - , gtk2hs-buildtools, mtl, pango, text, webkit + , gtk2hs-buildtools, mtl, pango, text, transformers, webkit }: mkDerivation { pname = "webkit"; - version = "0.13.1.3"; - sha256 = "00h9465xl6rfnd72cmn68z3mpany63dxl6fm2gqjbdzbrssj7306"; + version = "0.14.1.0"; + sha256 = "1mmlsdnq9pws3jhk0gzqdhy8b7zwm80g2cmygahqagvyh7jvb7r4"; libraryHaskellDepends = [ - base bytestring cairo glib gtk mtl pango text + base bytestring cairo glib gtk mtl pango text transformers ]; libraryPkgconfigDepends = [ webkit ]; libraryToolDepends = [ gtk2hs-buildtools ]; @@ -140126,6 +140124,7 @@ self: { sha256 = "1gj40kdll7pd84graxcrc327za6kgp453zh48srmzvrk9yvnj67x"; libraryHaskellDepends = [ base glib gtk webkit ]; libraryToolDepends = [ gtk2hs-buildtools ]; + jailbreak = true; description = "JavaScriptCore FFI from webkitgtk"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -140133,18 +140132,17 @@ self: { "webkitgtk3" = callPackage ({ mkDerivation, base, bytestring, cairo, glib, gtk2hs-buildtools - , gtk3, mtl, pango, text, webkit + , gtk3, mtl, pango, text, transformers, webkit }: mkDerivation { pname = "webkitgtk3"; - version = "0.13.1.3"; - sha256 = "0gfznb6n46576im72m6k9wrwc2n9f48nk4dsaz2llvzlzlzx4zfk"; + version = "0.14.1.0"; + sha256 = "16dypc71xh223746cgwa143vqyxymx6dqxk01j3ixpx7ybzr7lnm"; libraryHaskellDepends = [ - base bytestring cairo glib gtk3 mtl pango text + base bytestring cairo glib gtk3 mtl pango text transformers ]; libraryPkgconfigDepends = [ webkit ]; libraryToolDepends = [ gtk2hs-buildtools ]; - jailbreak = true; homepage = "http://projects.haskell.org/gtk2hs/"; description = "Binding to the Webkit library"; license = stdenv.lib.licenses.lgpl21; @@ -141674,8 +141672,8 @@ self: { }: mkDerivation { pname = "xcffib"; - version = "0.3.4"; - sha256 = "03z31c5gnybpfvh3idqimnz90pzbijhrqa8hlikryab148gp1gzn"; + version = "0.3.5"; + sha256 = "0ri50cbsh8a67q3frsz6214b73ahmga348my5x5bp6w7likiqnly"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ diff --git a/pkgs/development/libraries/botan/default.nix b/pkgs/development/libraries/botan/default.nix index 3006a5a456d..6eba16847f8 100644 --- a/pkgs/development/libraries/botan/default.nix +++ b/pkgs/development/libraries/botan/default.nix @@ -2,7 +2,7 @@ callPackage ./generic.nix (args // { baseVersion = "1.10"; - revision = "9"; - sha256 = "1wldp9py3qcdgswgxya83c03y6345a6cf3vwz0y41bl1l39jfza8"; + revision = "10"; + sha256 = "0qs1ps25k79jnzm31zjl6hj8kxzfwwjsdrlc9bz621218r3v2rvb"; extraConfigureFlags = "--with-gnump"; }) diff --git a/pkgs/development/libraries/botan/unstable.nix b/pkgs/development/libraries/botan/unstable.nix index cc2a5ebaa31..5685d261829 100644 --- a/pkgs/development/libraries/botan/unstable.nix +++ b/pkgs/development/libraries/botan/unstable.nix @@ -2,7 +2,7 @@ callPackage ./generic.nix (args // { baseVersion = "1.11"; - revision = "16"; - sha256 = "0z3a7jp10w9ipmbzhc2xazd2savxmns57ca2a8d6vvjahxg4w6m3"; + revision = "19"; + sha256 = "0a1hgd3w2pyn6yx89bal61bkxxazv0p8x8x4kri73p1b4vj3n3sb"; openssl = null; }) diff --git a/pkgs/development/libraries/libgphoto2/default.nix b/pkgs/development/libraries/libgphoto2/default.nix index 9583696df43..2fdf3d5e69b 100644 --- a/pkgs/development/libraries/libgphoto2/default.nix +++ b/pkgs/development/libraries/libgphoto2/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://sourceforge/gphoto/${name}.tar.bz2"; - sha256 = "154qs3j1k72xn8p5vgjcwvywkskxz0j145cgvlcw7d5xfwr1jq3j"; + sha256 = "1di7iv2r5ghzrylfbpvp694gpqbwjj3ngrmg4kvl7big6hp2c6h3"; }; nativeBuildInputs = [ pkgconfig gettext ]; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { MTP, and other vendor specific protocols for controlling and transferring data from digital cameras. ''; - version = "2.5.7"; + version = "2.5.8"; # XXX: the homepage claims LGPL, but several src files are lgpl21Plus license = stdenv.lib.licenses.lgpl21Plus; platforms = with stdenv.lib.platforms; unix; diff --git a/pkgs/development/libraries/qt-5/5.3/default.nix b/pkgs/development/libraries/qt-5/5.3/default.nix index 14675af48fb..595bb5bb10b 100644 --- a/pkgs/development/libraries/qt-5/5.3/default.nix +++ b/pkgs/development/libraries/qt-5/5.3/default.nix @@ -176,7 +176,9 @@ stdenv.mkDerivation rec { ++ optional (postgresql != null) postgresql ++ optionals gtkStyle [gnome_vfs libgnomeui gtk GConf]; - buildInputs = [ gdb bison flex gperf ruby ]; + buildInputs = + [ bison flex gperf ruby ] + ++ optional developerBuild gdb; nativeBuildInputs = [ python perl pkgconfig ]; diff --git a/pkgs/development/libraries/qt-5/5.4/qtbase.nix b/pkgs/development/libraries/qt-5/5.4/qtbase.nix index ecefa891332..780f1b60f7c 100644 --- a/pkgs/development/libraries/qt-5/5.4/qtbase.nix +++ b/pkgs/development/libraries/qt-5/5.4/qtbase.nix @@ -174,7 +174,9 @@ stdenv.mkDerivation { ++ optional (postgresql != null) postgresql ++ optionals gtkStyle [gnome_vfs libgnomeui gtk GConf]; - buildInputs = [ gdb bison flex gperf ruby ]; + buildInputs = + [ bison flex gperf ruby ] + ++ optional developerBuild gdb; nativeBuildInputs = [ python perl pkgconfig ]; diff --git a/pkgs/development/lisp-modules/asdf/default.nix b/pkgs/development/lisp-modules/asdf/default.nix index 33cd07b4807..6b7b88469b1 100644 --- a/pkgs/development/lisp-modules/asdf/default.nix +++ b/pkgs/development/lisp-modules/asdf/default.nix @@ -1,16 +1,16 @@ -{stdenv, fetchurl, texinfo, texLive}: +{stdenv, fetchurl, texinfo, texLive, perl}: let s = # Generated upstream information rec { baseName="asdf"; - version="3.1.4"; + version="3.1.5"; name="${baseName}-${version}"; - hash="0hyc2g22khcmvxmlcaq0xbxqhq59spgc2nc1s0gz1r9mcgrzm2xw"; - url="http://common-lisp.net/project/asdf/archives/asdf-3.1.4.tar.gz"; - sha256="0hyc2g22khcmvxmlcaq0xbxqhq59spgc2nc1s0gz1r9mcgrzm2xw"; + hash="1barrkj549d24pyh86gdc8v3vvsv4w7k0kkfg0zzrvhg8x8al19h"; + url="http://common-lisp.net/project/asdf/archives/asdf-3.1.5.tar.gz"; + sha256="1barrkj549d24pyh86gdc8v3vvsv4w7k0kkfg0zzrvhg8x8al19h"; }; buildInputs = [ - texinfo texLive + texinfo texLive perl ]; in stdenv.mkDerivation { @@ -19,7 +19,6 @@ stdenv.mkDerivation { src = fetchurl { inherit (s) url sha256; }; - sourceRoot="."; buildPhase = '' make build/asdf.lisp make -C doc asdf.info asdf.html diff --git a/pkgs/development/tools/build-managers/sbt/default.nix b/pkgs/development/tools/build-managers/sbt/default.nix index 01a3b740e6e..a273ea75087 100644 --- a/pkgs/development/tools/build-managers/sbt/default.nix +++ b/pkgs/development/tools/build-managers/sbt/default.nix @@ -15,6 +15,9 @@ stdenv.mkDerivation rec { mkdir -p $out/bin cat > $out/bin/sbt << EOF #! ${stdenv.shell} + if [ ! -v JAVA_HOME ]; then + export JAVA_HOME="${jre.home}" + fi ${jre}/bin/java \$SBT_OPTS -jar ${src} "\$@" EOF chmod +x $out/bin/sbt diff --git a/pkgs/development/tools/misc/cl-launch/default.nix b/pkgs/development/tools/misc/cl-launch/default.nix index 40c4085adab..17b1f3382cc 100644 --- a/pkgs/development/tools/misc/cl-launch/default.nix +++ b/pkgs/development/tools/misc/cl-launch/default.nix @@ -3,11 +3,11 @@ let s = # Generated upstream information rec { baseName="cl-launch"; - version="4.1.3.3"; + version="4.1.4"; name="${baseName}-${version}"; - hash="1al7jrj4fy9w4lpgizgb1ppk4rhhlcrfkz1yxpjv3w0wij1h67zl"; - url="http://common-lisp.net/project/xcvb/cl-launch/cl-launch-4.1.3.3.tar.gz"; - sha256="1al7jrj4fy9w4lpgizgb1ppk4rhhlcrfkz1yxpjv3w0wij1h67zl"; + hash="0j3lapjsqzdkc7ackqdk13li299lp706gdc9bh28kvs0diyamjiv"; + url="http://common-lisp.net/project/xcvb/cl-launch/cl-launch-4.1.4.tar.gz"; + sha256="0j3lapjsqzdkc7ackqdk13li299lp706gdc9bh28kvs0diyamjiv"; }; buildInputs = [ ]; diff --git a/pkgs/games/cataclysm-dda/default.nix b/pkgs/games/cataclysm-dda/default.nix new file mode 100644 index 00000000000..c8d69d3078d --- /dev/null +++ b/pkgs/games/cataclysm-dda/default.nix @@ -0,0 +1,71 @@ +{ fetchFromGitHub, stdenv, makeWrapper, pkgconfig, ncurses, lua, SDL2, SDL2_image, SDL2_ttf, +SDL2_mixer, freetype, gettext }: + +let architecture = + if stdenv.system == "i686-linux" then + "linux32" + else if stdenv.system == "x86_64-linux" then + "linux64" + else + abort "currently only linux 32-bit and 64-bit are supported"; + +in stdenv.mkDerivation rec { + version = "0.C"; + name = "cataclysm-dda-${version}"; + + src = fetchFromGitHub { + owner = "CleverRaven"; + repo = "Cataclysm-DDA"; + rev = "${version}"; + sha256 = "03sdzsk4qdq99qckq0axbsvg1apn6xizscd8pwp5w6kq2fyj5xkv"; + }; + + buildInputs = [ makeWrapper pkgconfig ncurses lua SDL2 SDL2_image SDL2_ttf SDL2_mixer freetype gettext ]; + + patchPhase = '' + patchShebangs . + substituteAllInPlace lang/compile_mo.sh \ + --replace msgfmt ${gettext}/msgfmt + sed -i -e 's|DATA_PREFIX=$(PREFIX)/share/cataclysm-dda/|DATA_PREFIX=$(PREFIX)/share/|g' Makefile + ''; + + makeFlags = "PREFIX=$(out) LUA=1 TILES=1 SOUND=1 RELEASE=1 USE_HOME_DIR=1"; + + postInstall = '' + wrapProgram $out/bin/cataclysm-tiles \ + --add-flags "--datadir $out/share/" + ''; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "A free, post apocalyptic, zombie infested rogue-like"; + longDescription = '' + Cataclysm: Dark Days Ahead is a roguelike set in a post-apocalyptic world. + Surviving is difficult: you have been thrown, ill-equipped, into a + landscape now riddled with monstrosities of which flesh eating zombies are + neither the strangest nor the deadliest. + + Yet with care and a little luck, many things are possible. You may try to + eke out an existence in the forests silently executing threats and + providing sustenance with your longbow. You can ride into town in a + jerry-rigged vehicle, all guns blazing, to settle matters in a fug of + smoke from your molotovs. You could take a more measured approach and + construct an impregnable fortress, surrounded by traps to protect you from + the horrors without. The longer you survive, the more skilled and adapted + you will get and the better equipped and armed to deal with the threats + you are presented with. + + In the course of your ordeal there will be opportunities and temptations + to improve or change your very nature. There are tales of survivors fitted + with extraordinary cybernetics giving great power and stories too of + gravely mutated survivors who, warped by their ingestion of exotic + substances or radiation, now more closely resemble insects, birds or fish + than their original form. + ''; + homepage = http://en.cataclysmdda.com/; + license = licenses.cc-by-sa-30; + maintainers = [ maintainers.skeidel ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/os-specific/linux/ati-drivers/builder.sh b/pkgs/os-specific/linux/ati-drivers/builder.sh index 8df03910146..520f20e2ed6 100644 --- a/pkgs/os-specific/linux/ati-drivers/builder.sh +++ b/pkgs/os-specific/linux/ati-drivers/builder.sh @@ -7,8 +7,11 @@ set -x die(){ echo $@; exit 1; } # custom unpack: +mkdir fglrx +cd fglrx unzip $src -run_file=$(echo fglrx-*/amd-driver-installer-*) +cd .. +run_file=$(echo fglrx/amd-driver-installer-*) sh $run_file --extract . eval "$patchPhase" diff --git a/pkgs/os-specific/linux/ati-drivers/default.nix b/pkgs/os-specific/linux/ati-drivers/default.nix index 179166bbc79..834e798e8d1 100644 --- a/pkgs/os-specific/linux/ati-drivers/default.nix +++ b/pkgs/os-specific/linux/ati-drivers/default.nix @@ -31,7 +31,7 @@ assert (!libsOnly) -> kernel != null; with stdenv.lib; stdenv.mkDerivation { - name = "ati-drivers-14.12" + (optionalString (!libsOnly) "-${kernel.version}"); + name = "ati-drivers-15.7" + (optionalString (!libsOnly) "-${kernel.version}"); builder = ./builder.sh; @@ -39,12 +39,12 @@ stdenv.mkDerivation { gcc = stdenv.cc.cc; src = fetchurl { - url = http://www2.ati.com/drivers/linux/amd-catalyst-omega-14.12-linux-run-installers.zip; - sha256 = "0jd2scrdlyapynxfjdrarnwcdzxjqrk5fg5i10g3bm0ay8v9hrk8"; + url = "http://www2.ati.com/drivers/linux/amd-driver-installer-15.20.1046-x86.x86_64.zip"; + sha256 = "ffde64203f49d9288eaa25f4d744187b6f4f14a87a444bab6a001d822b327a9d"; curlOpts = "--referer http://support.amd.com/en-us/download/desktop?os=Linux%20x86_64"; }; - patchPhase = "patch -p1 < ${./fglrx_3.17rc6-no_hotplug.patch}"; + patchPhase = "patch -p1 < ${./kernel-api-fixes.patch}"; patchPhaseSamples = "patch -p2 < ${./patch-samples.patch}"; buildInputs = diff --git a/pkgs/os-specific/linux/ati-drivers/fglrx_3.17rc6-no_hotplug.patch b/pkgs/os-specific/linux/ati-drivers/fglrx_3.17rc6-no_hotplug.patch deleted file mode 100644 index 7afd54a59c5..00000000000 --- a/pkgs/os-specific/linux/ati-drivers/fglrx_3.17rc6-no_hotplug.patch +++ /dev/null @@ -1,31 +0,0 @@ -source: https://aur.archlinux.org/packages/catalyst/ - -diff -uNr 14.9/common/lib/modules/fglrx/build_mod/firegl_public.c 14.9/common/lib/modules/fglrx/build_mod/firegl_public.c ---- 14.9/common/lib/modules/fglrx/build_mod/firegl_public.c 2014-09-09 16:10:17.000000000 +0200 -+++ 14.9/common/lib/modules/fglrx/build_mod/firegl_public.c 2014-09-26 19:01:44.000000000 +0200 -@@ -1093,6 +1093,9 @@ - // directly here to allow suspend/resume without X server start. - firegl_pci_save_state((KCL_PCI_DevHandle)pdev, privdev); - pci_disable_device(pdev); -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,17,0) -+ pci_ignore_hotplug(pdev); -+#endif - PMSG_EVENT(pdev->dev.power.power_state) = state; - } - else -diff -uNr 14.9/common/lib/modules/fglrx/build_mod/kcl_acpi.c 14.9/common/lib/modules/fglrx/build_mod/kcl_acpi.c ---- 14.9/common/lib/modules/fglrx/build_mod/kcl_acpi.c 2014-09-09 16:10:17.000000000 +0200 -+++ 14.9/common/lib/modules/fglrx/build_mod/kcl_acpi.c 2014-09-26 18:57:27.000000000 +0200 -@@ -840,10 +840,12 @@ - if(tdev != NULL) - { - device = (acpi_device_adr(tdev) >> 16) & 0xffff; -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,17,0) - if(PCI_SLOT(pdev->devfn) == device) - { - tdev->flags.no_hotplug = true; - } -+#endif - } - #endif - return 0; diff --git a/pkgs/os-specific/linux/ati-drivers/kernel-api-fixes.patch b/pkgs/os-specific/linux/ati-drivers/kernel-api-fixes.patch new file mode 100644 index 00000000000..f763518b249 --- /dev/null +++ b/pkgs/os-specific/linux/ati-drivers/kernel-api-fixes.patch @@ -0,0 +1,99 @@ +diff -Nru 15.7/common/lib/modules/fglrx/build_mod/firegl_public.c 15.7.new/common/lib/modules/fglrx/build_mod/firegl_public.c +--- 15.7/common/lib/modules/fglrx/build_mod/firegl_public.c 2015-07-04 10:31:23.000000000 -0400 ++++ 15.7.new/common/lib/modules/fglrx/build_mod/firegl_public.c 2015-08-03 21:21:13.893211082 -0400 +@@ -242,6 +242,14 @@ + #endif + + // ============================================================ ++ ++#if LINUX_VERSION_CODE < KERNEL_VERSION(3,18,0) ++#define __read_cr4 read_cr4 ++#define __write_cr4 write_cr4 ++#endif ++ ++// ============================================================ ++ + /* globals */ + + char* firegl = NULL; +@@ -3495,10 +3503,12 @@ + KCL_PUB_InterruptHandlerWrap, + #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22) + ((useMSI) ? (SA_INTERRUPT) : (SA_SHIRQ)), +-#else ++#elif LINUX_VERSION_CODE < KERNEL_VERSION(4,1,0) + //when MSI enabled. keep irq disabled when calling the action handler, + //exclude this IRQ from irq balancing (only on one CPU) + ((useMSI) ? (IRQF_DISABLED) : (IRQF_SHARED)), ++#else ++ ((useMSI) ? 0 : IRQF_SHARED), + #endif + dev_name, + context); +@@ -4498,8 +4508,8 @@ + + if (cpu_has_pge) + { +- cr4 = read_cr4(); +- write_cr4(cr4 & ~X86_CR4_PGE); ++ cr4 = __read_cr4(); ++ __write_cr4(cr4 & ~X86_CR4_PGE); + } + __flush_tlb(); + +@@ -4512,7 +4522,7 @@ + write_cr0(cr0 & 0xbfffffff); + if (cpu_has_pge) + { +- write_cr4(cr4); ++ __write_cr4(cr4); + } + local_irq_restore(flags); + +@@ -4539,8 +4549,8 @@ + + if (cpu_has_pge) + { +- cr4 = read_cr4(); +- write_cr4(cr4 & ~X86_CR4_PGE); ++ cr4 = __read_cr4(); ++ __write_cr4(cr4 & ~X86_CR4_PGE); + } + __flush_tlb(); + +@@ -4552,7 +4562,7 @@ + write_cr0(cr0 & 0xbfffffff); + if (cpu_has_pge) + { +- write_cr4(cr4); ++ __write_cr4(cr4); + } + local_irq_restore(flags); + +diff -Nru 15.7/common/lib/modules/fglrx/build_mod/kcl_acpi.c 15.7.new/common/lib/modules/fglrx/build_mod/kcl_acpi.c +--- 15.7/common/lib/modules/fglrx/build_mod/kcl_acpi.c 2015-07-04 10:31:23.000000000 -0400 ++++ 15.7.new/common/lib/modules/fglrx/build_mod/kcl_acpi.c 2015-08-02 19:59:54.797911610 -0400 +@@ -861,7 +861,10 @@ + #elif LINUX_VERSION_CODE >= KERNEL_VERSION(3,17,0) + if(pdev) + { +- pci_ignore_hotplug(pdev); ++ struct pci_dev *bridge = pdev->bus->self; ++ ++ pdev->ignore_hotplug = 1; ++ if(bridge) bridge->ignore_hotplug = 1; + } + #endif + } +diff -Nru 15.7/common/lib/modules/fglrx/build_mod/kcl_str.c 15.7.new/common/lib/modules/fglrx/build_mod/kcl_str.c +--- 15.7/common/lib/modules/fglrx/build_mod/kcl_str.c 2015-07-04 10:31:23.000000000 -0400 ++++ 15.7.new/common/lib/modules/fglrx/build_mod/kcl_str.c 2015-08-03 00:35:25.938410435 -0400 +@@ -169,7 +169,7 @@ + const char* s2, + KCL_TYPE_SizeSigned count) + { +- return strnicmp(s1, s2, count); ++ return strncasecmp(s1, s2, count); + } + + /** \brief Locate character in string diff --git a/pkgs/os-specific/linux/sysdig/default.nix b/pkgs/os-specific/linux/sysdig/default.nix index 9478e07468e..e2758e7c2b6 100644 --- a/pkgs/os-specific/linux/sysdig/default.nix +++ b/pkgs/os-specific/linux/sysdig/default.nix @@ -3,10 +3,10 @@ let inherit (stdenv.lib) optional optionalString; s = rec { baseName="sysdig"; - version = "0.1.101"; + version = "0.1.102"; name="${baseName}-${version}"; url="https://github.com/draios/sysdig/archive/${version}.tar.gz"; - sha256 = "1dlx1v7wr0i36sbybr4kj8sziyrfxs4pcn6bnl0ljlb5wndy75b9"; + sha256 = "0mrz14wvcb8m8idr4iqbr3jmxfs7dlmh06n0q9fcfph75wkc5fp0"; }; buildInputs = [ cmake zlib luajit ncurses diff --git a/pkgs/servers/nosql/apache-jena/binary.nix b/pkgs/servers/nosql/apache-jena/binary.nix index 8c4db178e78..9b4e19b3270 100644 --- a/pkgs/servers/nosql/apache-jena/binary.nix +++ b/pkgs/servers/nosql/apache-jena/binary.nix @@ -3,10 +3,10 @@ let s = # Generated upstream information rec { baseName="apache-jena"; - version = "2.13.0"; + version = "3.0.0"; name="${baseName}-${version}"; url="http://archive.apache.org/dist/jena/binaries/apache-jena-${version}.tar.gz"; - sha256 = "0fb5f2rv7rgi60r4b80r1wzap1rngmajv378mdkcyhm7bj4ba31d"; + sha256 = "1pqg27m295v7v456pidb0fq5120blkc466pdzksqxqcjrwivq4kb"; }; buildInputs = [ makeWrapper diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix index 480801d0d01..836dedf1cb1 100644 --- a/pkgs/stdenv/adapters.nix +++ b/pkgs/stdenv/adapters.nix @@ -224,7 +224,7 @@ rec { keepDebugInfo = stdenv: stdenv // { mkDerivation = args: stdenv.mkDerivation (args // { dontStrip = true; - NIX_CFLAGS_COMPILE = toString (args.NIX_CFLAGS_COMPILE or "") + " -g -O0"; + NIX_CFLAGS_COMPILE = toString (args.NIX_CFLAGS_COMPILE or "") + " -ggdb -Og"; }); }; diff --git a/pkgs/tools/filesystems/glusterfs/default.nix b/pkgs/tools/filesystems/glusterfs/default.nix index 55e4e17fa1f..062f27e286f 100644 --- a/pkgs/tools/filesystems/glusterfs/default.nix +++ b/pkgs/tools/filesystems/glusterfs/default.nix @@ -6,11 +6,11 @@ let s = # Generated upstream information rec { baseName="glusterfs"; - version="3.7.2"; + version="3.7.3"; name="${baseName}-${version}"; - hash="0cw6p21nnxcvzd8rymd5q0ydlaz4hx4rmv22hwbb39h7a2rvfv79"; - url="http://download.gluster.org/pub/gluster/glusterfs/3.7/3.7.2/glusterfs-3.7.2.tar.gz"; - sha256="0cw6p21nnxcvzd8rymd5q0ydlaz4hx4rmv22hwbb39h7a2rvfv79"; + hash="0xdzxprsi0gybv6jdp0ycfpsxzijwfrm3217fk3fnixcs92frshv"; + url="http://download.gluster.org/pub/gluster/glusterfs/3.7/3.7.3/glusterfs-3.7.3.tar.gz"; + sha256="0xdzxprsi0gybv6jdp0ycfpsxzijwfrm3217fk3fnixcs92frshv"; }; buildInputs = [ fuse bison flex_2_5_35 openssl python ncurses readline diff --git a/pkgs/tools/networking/chrony/default.nix b/pkgs/tools/networking/chrony/default.nix index e11fb377c21..3acf921cd79 100644 --- a/pkgs/tools/networking/chrony/default.nix +++ b/pkgs/tools/networking/chrony/default.nix @@ -5,11 +5,11 @@ assert stdenv.isLinux -> libcap != null; stdenv.mkDerivation rec { name = "chrony-${version}"; - version = "1.31"; + version = "2.1.1"; src = fetchurl { url = "http://download.tuxfamily.org/chrony/${name}.tar.gz"; - sha256 = "0vcr4hr1a01l5c3z0rgzna8rbmq35aklgfr342pi9gpc8sp1qpm3"; + sha256 = "b0565148eaa38e971291281d76556c32f0138ec22e9784f8bceab9c65f7ad7d4"; }; buildInputs = [ readline texinfo ] ++ stdenv.lib.optional stdenv.isLinux libcap; diff --git a/pkgs/tools/networking/i2p/default.nix b/pkgs/tools/networking/i2p/default.nix index 1ef159131af..cbfedab0faf 100644 --- a/pkgs/tools/networking/i2p/default.nix +++ b/pkgs/tools/networking/i2p/default.nix @@ -1,10 +1,10 @@ { stdenv, procps, coreutils, fetchurl, jdk, jre, ant, gettext, which }: stdenv.mkDerivation rec { - name = "i2p-0.9.20"; + name = "i2p-0.9.21"; src = fetchurl { url = "https://github.com/i2p/i2p.i2p/archive/${name}.tar.gz"; - sha256 = "10rynkl9dbnfl67ck3d7wdwz52h7354r7nbwcypsjnng4f1dmj5s"; + sha256 = "1cgki9sg0pc4d66rr556lw0682c4mmdvmr6awvsn7ch0rp4zav9f"; }; buildInputs = [ jdk ant gettext which ]; patches = [ ./i2p.patch ]; @@ -34,9 +34,9 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = "https://geti2p.net"; + homepage = https://geti2p.net; description = "Applications and router for I2P, anonymity over the Internet"; - maintainers = [ stdenv.lib.maintainers.joelmo ]; + maintainers = [ maintainers.joelmo ]; license = licenses.gpl2; # TODO: support other systems, just copy appropriate lib/wrapper.. to $out platforms = [ "x86_64-linux" ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3f7e25d6314..a4c13aa8cfe 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12396,6 +12396,8 @@ let toxprpl = callPackage ../applications/networking/instant-messengers/pidgin-plugins/tox-prpl { }; + pidgin-opensteamworks = callPackage ../applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks { }; + pithos = callPackage ../applications/audio/pithos { pythonPackages = python34Packages; }; @@ -13572,6 +13574,8 @@ let castle_combat = callPackage ../games/castle-combat { }; + cataclysm-dda = callPackage ../games/cataclysm-dda { }; + chessdb = callPackage ../games/chessdb { }; construoBase = lowPrio (callPackage ../games/construo { diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index bfd741ccb4b..9fc605be1e3 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -6,6 +6,12 @@ let self = with self; { inherit (pkgs) stdenv autoreconfHook fetchurl; }; + apcu = buildPecl { + name = "apcu-4.0.7"; + + sha256 = "1mhbz56mbnq7dryf2d64l84lj3fpr5ilmg2424glans3wcg772hp"; + }; + memcache = buildPecl { name = "memcache-3.0.8"; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index cf0140a25d3..818bdba09e5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8163,12 +8163,12 @@ let }; nbxmpp = buildPythonPackage rec { - name = "nbxmpp-0.5.2"; + name = "nbxmpp-0.5.3"; src = pkgs.fetchurl { name = "${name}.tar.gz"; - url = "https://python-nbxmpp.gajim.org/downloads/7"; - sha256 = "0q2iph07aahwn6hlr38v0cvzlfc9hrf5mz6qs1kp4b4x9l8x5mqn"; + url = "https://python-nbxmpp.gajim.org/downloads/8"; + sha256 = "0dcr786dyips1fdvgsn8yvpgcz5j7217fi05c29cfypdl8jnp6mp"; }; meta = { @@ -15636,7 +15636,7 @@ let pyusb = buildPythonPackage rec { - name = "pyusb-1.0.0b1"; + name = "pyusb-1.0.0b2"; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/p/pyusb/${name}.tar.gz"; @@ -15653,7 +15653,7 @@ let meta = { description = "Python USB access module (wraps libusb 1.0)"; # can use other backends homepage = http://pyusb.sourceforge.net/; - license = "BSD"; + license = licenses.bsd3; maintainers = with maintainers; [ bjornfor ]; }; }; |