diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-12-22 11:28:56 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-12-22 11:28:56 +0100 |
| commit | 2e03ae274d36e695e4db63fb0a6b71346621b6af (patch) | |
| tree | 84af1a7ec323e1ce2865661756da1cca2b6ef07b | |
| parent | 41f55691a96ca4f37a87c8659884edf19b2c8446 (diff) | |
| parent | 0c1382085b2969ce38359bcb28fc5dfe67cca7eb (diff) | |
| download | nixlib-2e03ae274d36e695e4db63fb0a6b71346621b6af.tar nixlib-2e03ae274d36e695e4db63fb0a6b71346621b6af.tar.gz nixlib-2e03ae274d36e695e4db63fb0a6b71346621b6af.tar.bz2 nixlib-2e03ae274d36e695e4db63fb0a6b71346621b6af.tar.lz nixlib-2e03ae274d36e695e4db63fb0a6b71346621b6af.tar.xz nixlib-2e03ae274d36e695e4db63fb0a6b71346621b6af.tar.zst nixlib-2e03ae274d36e695e4db63fb0a6b71346621b6af.zip | |
Merge branch 'master' into staging
73 files changed, 1674 insertions, 988 deletions
diff --git a/doc/languages-frameworks/python.md b/doc/languages-frameworks/python.md index e7a8b034a112..82aeb112c93e 100644 --- a/doc/languages-frameworks/python.md +++ b/doc/languages-frameworks/python.md @@ -97,7 +97,7 @@ We will first have a look at how Python packages are packaged on Nix. Then, we w #### Python packaging on Nix -On Nix all packages are built by functions. The main function in Nix for building Python packages is [`buildPythonPackage`](https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/python-modules/generic/default.nix). +On Nix all packages are built by functions. The main function in Nix for building Python packages is [`buildPythonPackage`](https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/interpreters/python/build-python-package.nix). Let's see how we would build the `toolz` package. According to [`python-packages.nix`](https://raw.githubusercontent.com/NixOS/nixpkgs/master/pkgs/top-level/python-packages.nix) `toolz` is build using ```nix @@ -141,13 +141,15 @@ with import <nixpkgs> {}; pkgs.python35Packages.buildPythonPackage rec { name = "toolz-${version}"; - version = "0.7.4"; + version = "0.8.0"; src = pkgs.fetchurl{ url = "mirror://pypi/t/toolz/toolz-${version}.tar.gz"; - sha256 = "43c2c9e5e7a16b6c88ba3088a9bfc82f7db8e13378be7c78d6c14a5f8ed05afd"; + sha256 = "e8451af61face57b7c5d09e71c0d27b8005f001ead56e9fdf470417e5cc6d479"; }; + doCheck = false; + meta = { homepage = "http://github.com/pytoolz/toolz/"; description = "List processing tools and functional utilities"; @@ -170,18 +172,18 @@ with import <nixpkgs> {}; ( let toolz = pkgs.python35Packages.buildPythonPackage rec { name = "toolz-${version}"; - version = "0.7.4"; + version = "0.8.0"; src = pkgs.fetchurl{ url = "mirror://pypi/t/toolz/toolz-${version}.tar.gz"; - sha256 = "43c2c9e5e7a16b6c88ba3088a9bfc82f7db8e13378be7c78d6c14a5f8ed05afd"; + sha256 = "e8451af61face57b7c5d09e71c0d27b8005f001ead56e9fdf470417e5cc6d479"; }; + doCheck = false; + meta = { homepage = "http://github.com/pytoolz/toolz/"; description = "List processing tools and functional utilities"; - license = licenses.bsd3; - maintainers = with maintainers; [ fridh ]; }; }; @@ -308,11 +310,10 @@ Note also the line `doCheck = false;`, we explicitly disabled running the test-s #### Develop local package -As a Python developer you're likely aware of [development mode](http://pythonhosted.org/setuptools/setuptools.html#development-mode) (`python setup.py develop`); +As a Python developer you're likely aware of [development mode](http://setuptools.readthedocs.io/en/latest/setuptools.html#development-mode) (`python setup.py develop`); instead of installing the package this command creates a special link to the project code. That way, you can run updated code without having to reinstall after each and every change you make. -Development mode is also available on Nix as [explained](http://nixos.org/nixpkgs/manual/#ssec-python-development) in the Nixpkgs manual. -Let's see how you can use it. +Development mode is also available. Let's see how you can use it. In the previous Nix expression the source was fetched from an url. We can also refer to a local source instead using diff --git a/nixos/lib/make-system-tarball.sh b/nixos/lib/make-system-tarball.sh index e04455e889b0..efb83d914287 100644 --- a/nixos/lib/make-system-tarball.sh +++ b/nixos/lib/make-system-tarball.sh @@ -52,9 +52,10 @@ $extraCommands mkdir -p $out/tarball -tar cvJf $out/tarball/$fileName.tar.xz * $extraArgs +rm env-vars + +tar --sort=name --mtime='1970-01-01' -cvJf $out/tarball/$fileName.tar.xz * $extraArgs mkdir -p $out/nix-support echo $system > $out/nix-support/system echo "file system-tarball $out/tarball/$fileName.tar.xz" > $out/nix-support/hydra-build-products - diff --git a/nixos/modules/services/monitoring/prometheus/default.nix b/nixos/modules/services/monitoring/prometheus/default.nix index 82b97bd92f87..d692dd5fc793 100644 --- a/nixos/modules/services/monitoring/prometheus/default.nix +++ b/nixos/modules/services/monitoring/prometheus/default.nix @@ -25,9 +25,16 @@ let scrape_configs = cfg.scrapeConfigs; }; + generatedPrometheusYml = writePrettyJSON "prometheus.yml" promConfig; + + prometheusYml = + if cfg.configText != null then + pkgs.writeText "prometheus.yml" cfg.configText + else generatedPrometheusYml; + cmdlineArgs = cfg.extraFlags ++ [ "-storage.local.path=${cfg.dataDir}/metrics" - "-config.file=${writePrettyJSON "prometheus.yml" promConfig}" + "-config.file=${prometheusYml}" "-web.listen-address=${cfg.listenAddress}" "-alertmanager.notification-queue-capacity=${toString cfg.alertmanagerNotificationQueueCapacity}" "-alertmanager.timeout=${toString cfg.alertmanagerTimeout}s" @@ -359,6 +366,16 @@ in { ''; }; + configText = mkOption { + type = types.nullOr types.lines; + default = null; + description = '' + If non-null, this option defines the text that is written to + prometheus.yml. If null, the contents of prometheus.yml is generated + from the structured config options. + ''; + }; + globalConfig = mkOption { type = promTypes.globalConfig; default = {}; diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix index 6423432c78b6..041c7dbec702 100644 --- a/nixos/modules/virtualisation/qemu-vm.nix +++ b/nixos/modules/virtualisation/qemu-vm.nix @@ -278,7 +278,7 @@ in description = '' If enabled, the Nix store in the VM is made writable by - layering a unionfs-fuse/tmpfs filesystem on top of the host's Nix + layering an overlay filesystem on top of the host's Nix store. ''; }; @@ -395,6 +395,13 @@ in chmod 1777 $targetRoot/tmp mkdir -p $targetRoot/boot + + ${optionalString cfg.writableStore '' + echo "mounting overlay filesystem on /nix/store..." + mkdir -p 0755 $targetRoot/nix/.rw-store/store $targetRoot/nix/.rw-store/work $targetRoot/nix/store + mount -t overlay overlay $targetRoot/nix/store \ + -o lowerdir=$targetRoot/nix/.ro-store,upperdir=$targetRoot/nix/.rw-store/store,workdir=$targetRoot/nix/.rw-store/work || fail + ''} ''; # After booting, register the closure of the paths in @@ -412,7 +419,8 @@ in ''; boot.initrd.availableKernelModules = - optional (cfg.qemu.diskInterface == "scsi") "sym53c8xx"; + optional cfg.writableStore "overlay" + ++ optional (cfg.qemu.diskInterface == "scsi") "sym53c8xx"; virtualisation.bootDevice = mkDefault (if cfg.qemu.diskInterface == "scsi" then "/dev/sda" else "/dev/vda"); @@ -447,12 +455,6 @@ in options = [ "trans=virtio" "version=9p2000.L" ]; neededForBoot = true; }; - } // optionalAttrs cfg.writableStore - { "/nix/store" = - { fsType = "unionfs-fuse"; - device = "unionfs"; - options = [ "allow_other" "cow" "nonempty" "chroot=/mnt-root" "max_files=32768" "hide_meta_files" "dirs=/nix/.rw-store=rw:/nix/.ro-store=ro" ]; - }; } // optionalAttrs (cfg.writableStore && cfg.writableStoreUseTmpfs) { "/nix/.rw-store" = { fsType = "tmpfs"; diff --git a/nixos/tests/kde5.nix b/nixos/tests/kde5.nix index 30db316dba5e..2b61d6f3f0a1 100644 --- a/nixos/tests/kde5.nix +++ b/nixos/tests/kde5.nix @@ -18,6 +18,7 @@ import ./make-test.nix ({ pkgs, ...} : }; }; services.xserver.desktopManager.kde5.enable = true; + virtualisation.writableStore = false; # FIXME }; testScript = { nodes, ... }: diff --git a/nixos/tests/prometheus.nix b/nixos/tests/prometheus.nix index 7605227100d2..ade097597bb8 100644 --- a/nixos/tests/prometheus.nix +++ b/nixos/tests/prometheus.nix @@ -10,7 +10,7 @@ import ./make-test.nix { }; scrapeConfigs = [{ job_name = "prometheus"; - target_groups = [{ + static_configs = [{ targets = [ "127.0.0.1:9090" ]; labels = { instance = "localhost"; }; }]; diff --git a/pkgs/applications/audio/game-music-emu/default.nix b/pkgs/applications/audio/game-music-emu/default.nix index 60d9c0e7b124..4f22ca62c1a8 100644 --- a/pkgs/applications/audio/game-music-emu/default.nix +++ b/pkgs/applications/audio/game-music-emu/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, cmake }: stdenv.mkDerivation rec { - version = "0.6.0"; + version = "0.6.1"; name = "game-music-emu-${version}"; src = fetchurl { - url = "https://game-music-emu.googlecode.com/files/${name}.tar.bz2"; - sha256 = "11s9l938nxbrk7qb2k1ppfgizcz00cakbxgv0gajc6hyqv882vjh"; + url = "https://bitbucket.org/mpyne/game-music-emu/downloads/${name}.tar.bz2"; + sha256 = "08fk7zddpn7v93d0fa7fcypx7hvgwx9b5psj9l6m8b87k2hbw4fw"; }; buildInputs = [ cmake ]; diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix index a1a4d26e2a03..1f8924cd03ee 100644 --- a/pkgs/applications/audio/spotify/default.nix +++ b/pkgs/applications/audio/spotify/default.nix @@ -6,7 +6,7 @@ assert stdenv.system == "x86_64-linux"; let # Please update the stable branch! - version = "1.0.45.182.gbbd5909f-72"; + version = "1.0.45.186.g3b5036d6-95"; deps = [ alsaLib @@ -51,7 +51,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://repository-origin.spotify.com/pool/non-free/s/spotify-client/spotify-client_${version}_amd64.deb"; - sha256 = "0vpwwla5vrx5ryx434a486l8vcgr1vxh28ri6ab4f28xrz16ipys"; + sha256 = "0fpvz1mzyva1sypg4gjmrv0clckb0c3xwjfcxnb8gvkxx9vm56p1"; }; buildInputs = [ dpkg makeWrapper ]; diff --git a/pkgs/applications/audio/ssrc/default.nix b/pkgs/applications/audio/ssrc/default.nix new file mode 100644 index 000000000000..fa2b54d0e8a1 --- /dev/null +++ b/pkgs/applications/audio/ssrc/default.nix @@ -0,0 +1,42 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "ssrc"; + name = "${pname}-${version}"; + version = "1.33"; + + src = fetchFromGitHub { + owner = "shibatch"; + repo = "SSRC"; + rev = "4adf75116dfc0ef709fef74a0e2f3360bd15007f"; + sha256 = "0hgma66v7sszkpz5jkyscj0q6lmjfqdwf1hw57535c012pa2vdrh"; + }; + + installPhase = '' + mkdir -p $out/bin + cp ssrc ssrc_hp $out/bin + ''; + + meta = with stdenv.lib; { + description = "A high quality audio sampling rate converter"; + longDescription = '' + This program converts sampling rates of PCM wav files. This + program also has a function to apply dither to its output and + extend perceived dynamic range. + + Sampling rates of 44.1kHz and 48kHz are popularly used, but the + ratio between these two frequencies is 147:160, which are not + small numbers. As a result, sampling rate conversion without + degradation of sound quality requires filter with very large + order, and it is difficult to have both quality and speed. This + program quickly converts between these sampling frequencies + without audible degradation. + ''; + + version = "${version}"; + homepage = "http://shibatch.sourceforge.net/"; + license = licenses.gpl2; + maintainers = with maintainers; [ leenaars]; + platforms = with platforms; [ linux ] ; + }; +} diff --git a/pkgs/applications/misc/gnome15/default.nix b/pkgs/applications/misc/gnome15/default.nix new file mode 100644 index 000000000000..c4f8be88bb51 --- /dev/null +++ b/pkgs/applications/misc/gnome15/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, python2, gnome_python, gnome_python_desktop }: + +stdenv.mkDerivation rec { + name = "gnome15-2016-06-10"; + + src = fetchFromGitHub { + owner = "achilleas-k"; + repo = "gnome15"; + rev = "1077c890d9ba8ef7a5e448e70a792de5c7443c84"; + sha256 = "0z5k2rgvv5zyi3lbbk6svncypidj44qzfchivb4vlr7clmh16m95"; + }; + + nativeBuildInputs = [ autoreconfHook pkgconfig python2.pkgs.wrapPython ]; + buildInputs = [ python2 ]; + propagatedBuildInputs = with python2.pkgs; [ + pygtk keyring virtkey pillow dbus-python pyinotify lxml pyxdg pyusb gnome_python gnome_python_desktop + python-uinput xlib pyudev pyinputevent + ]; + + postPatch = '' + touch README + export UDEV_RULES_PATH="$out/lib/udev/rules.d" + ''; + + postFixup = '' + wrapPythonPrograms + ''; + + meta = with stdenv.lib; { + description = "A set of tools for configuring the Logitech G15 keyboard"; + license = licenses.gpl3; + homepage = "https://gnome15.org/"; + platforms = platforms.linux; + maintainers = with maintainers; [ abbradar ]; + }; +} diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix index edfa9a6d7550..20d50bd0f7a7 100644 --- a/pkgs/applications/networking/dropbox/default.nix +++ b/pkgs/applications/networking/dropbox/default.nix @@ -23,11 +23,11 @@ let # NOTE: When updating, please also update in current stable, # as older versions stop working - version = "15.4.22"; + version = "16.4.29"; sha256 = { - "x86_64-linux" = "105a64w6rxhrg2dcpb4h4a2956x2r7flf41rszhw5nnczal0s8gx"; - "i686-linux" = "001c6dfdxip67w19h3zlx8w72kvnkl1hbkj7gqvw9lixmnq82fhr"; + "x86_64-linux" = "0zng19qisbr3c9d312ar43p1b44xidabj4x2l3g3q85i300vj661"; + "i686-linux" = "0hc5fs0akc437valbxwlymk7ncjkdnhc51pja5bbiy48gqmd42bb"; }."${stdenv.system}" or (throw "system ${stdenv.system} not supported"); arch = diff --git a/pkgs/applications/networking/instant-messengers/scudcloud/default.nix b/pkgs/applications/networking/instant-messengers/scudcloud/default.nix index 229e3497ea4b..5e5c2fe8eed6 100644 --- a/pkgs/applications/networking/instant-messengers/scudcloud/default.nix +++ b/pkgs/applications/networking/instant-messengers/scudcloud/default.nix @@ -1,15 +1,14 @@ { stdenv, fetchgit, python3Packages }: python3Packages.buildPythonPackage { - name = "scudcloud-1.35"; - namePrefix = ""; + name = "scudcloud-1.38"; - # Version 1.35, branch 254-port-to-qt5 - # https://github.com/raelgc/scudcloud/commit/6d924b5c23597c94d1a8e829a8a5d917806a5bc9 + # Branch 254-port-to-qt5 + # https://github.com/raelgc/scudcloud/commit/6bcd877daea3d679cd5fd2c946c2d933940c48d9 src = fetchgit { url = https://github.com/raelgc/scudcloud/; - rev = "6d924b5c23597c94d1a8e829a8a5d917806a5bc9"; - sha256 = "01k5am3067l3p1c91mdrh2fk3cgr20dhppa6flqi5b2ygzrc1i8q"; + rev = "6bcd877daea3d679cd5fd2c946c2d933940c48d9"; + sha256 = "1884svz6m5vl06d0yac5zjb2phxwg6bjva72y15fw4larkjnh72s"; }; propagatedBuildInputs = with python3Packages; [ pyqt5 dbus-python ]; diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index ee4bb586d552..4263b7e6f77b 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -1,14 +1,14 @@ { stdenv, lib, fetchFromGitHub, go, pkgs }: stdenv.mkDerivation rec { - version = "0.14.13"; + version = "0.14.15"; name = "syncthing-${version}"; src = fetchFromGitHub { owner = "syncthing"; repo = "syncthing"; rev = "v${version}"; - sha256 = "0gq218f1rhzjrqh2gjyvqksa7a1agwhm8rfqf5jw58pncblrn6v4"; + sha256 = "0iq7pzb9f0vgikxxxwvrhi5rlgw9frcwy0lgvc61l6lbw3vl0rd7"; }; buildInputs = [ go ]; diff --git a/pkgs/applications/science/astronomy/stellarium/default.nix b/pkgs/applications/science/astronomy/stellarium/default.nix index 6f7d1b7b764f..49c774f7039a 100644 --- a/pkgs/applications/science/astronomy/stellarium/default.nix +++ b/pkgs/applications/science/astronomy/stellarium/default.nix @@ -1,20 +1,22 @@ { stdenv, fetchurl, cmake, freetype, libpng, mesa, gettext, openssl, perl, libiconv , qtscript, qtserialport, qttools, makeQtWrapper +, qtmultimedia }: stdenv.mkDerivation rec { - name = "stellarium-0.14.3"; + name = "stellarium-${version}"; + version = "0.15.0"; src = fetchurl { url = "mirror://sourceforge/stellarium/${name}.tar.gz"; - sha256 = "1919wzlvhfxdxficbwhp31xlhm0571grgcmsfdp5y36z9yqwahfy"; + sha256 = "0il751lgnfkx35h1m8fzwwnrygpxjx2a80gng1i1rbybkykf7l3l"; }; nativeBuildInputs = [ makeQtWrapper ]; buildInputs = [ cmake freetype libpng mesa gettext openssl perl libiconv qtscript - qtserialport qttools + qtserialport qttools qtmultimedia ]; enableParallelBuilding = true; diff --git a/pkgs/applications/version-management/meld/default.nix b/pkgs/applications/version-management/meld/default.nix index d13457ef927a..05db6d964c3a 100644 --- a/pkgs/applications/version-management/meld/default.nix +++ b/pkgs/applications/version-management/meld/default.nix @@ -5,14 +5,14 @@ let minor = "3.16"; - version = "${minor}.2"; + version = "${minor}.4"; inherit (python2Packages) python buildPythonApplication pycairo pygobject3; in buildPythonApplication rec { name = "meld-${version}"; src = fetchurl { url = "mirror://gnome/sources/meld/${minor}/meld-${version}.tar.xz"; - sha256 = "2dd3f58b95444bf721e0c912668c29cf8f47a402440b772ea12c4b9a0c94966f"; + sha256 = "0rwflfkfnb9ydnk4k591x0il29d4dvz95cjs2f279blx64lgki4k"; }; buildInputs = [ diff --git a/pkgs/applications/virtualization/xen/4.5.nix b/pkgs/applications/virtualization/xen/4.5.nix index 7b89fabaa1c9..dc9d92534f00 100644 --- a/pkgs/applications/virtualization/xen/4.5.nix +++ b/pkgs/applications/virtualization/xen/4.5.nix @@ -2,8 +2,19 @@ let # Xen 4.5.5 + # + # Patching XEN? Check the XSAs and try applying all the ones we + # don't have yet. + # + # XSAs at: https://xenbits.xen.org/xsa/ xenConfig = rec { version = "4.5.5"; + + xsaPatch = { name , sha256 }: (fetchpatch { + url = "https://xenbits.xen.org/xsa/xsa${name}.patch"; + inherit sha256; + }); + name = "xen-${version}"; src = fetchurl { @@ -52,25 +63,60 @@ let } ]; - xenPatches = [ ./0001-libxl-Spice-image-compression-setting-support-for-up.patch - ./0002-libxl-Spice-streaming-video-setting-support-for-upst.patch - ./0003-Add-qxl-vga-interface-support-for-upstream-qem.patch - (fetchpatch { - url = "https://bugzilla.redhat.com/attachment.cgi?id=1218547"; - name = "CVE-2016-9385.patch"; - sha256 = "0k9mykhrpm4rbjkhv067f6s05lqmgnldcyb3vi8cl0ndlyh66lvr"; - }) - (fetchpatch { - url = "https://bugzilla.redhat.com/attachment.cgi?id=1218536"; - name = "CVE-2016-9377-CVE-2016-9378-part1.patch"; - sha256 = "0z53nzrjvc745y26z1qc8jlg3blxp7brawvji1hx3s74n346ssl6"; - }) - (fetchpatch { - url = "https://bugzilla.redhat.com/attachment.cgi?id=1218537"; - name = "CVE-2016-9377-CVE-2016-9378-part2.patch"; - sha256 = "11cqvr5jn2s92wsshpilx9qnfczrd9hnyb5aim6qwmz3fq3hrrkz"; - }) - ]; + # Note this lacks patches for: + # XSA-201 + # XSA-199 + # XSA-197 + # they didn't apply, and there are plenty of other patches here + # to get this deployed as-is. + xenPatches = [ ./0001-libxl-Spice-image-compression-setting-support-for-up.patch + ./0002-libxl-Spice-streaming-video-setting-support-for-upst.patch + ./0003-Add-qxl-vga-interface-support-for-upstream-qem.patch + (xsaPatch { + name = "190-4.5"; + sha256 = "0f8pw38kkxky89ny3ic5h26v9zsjj9id89lygx896zc3w1klafqm"; + }) + (xsaPatch { + name = "191-4.6"; + sha256 = "1wl1ndli8rflmc44pkp8cw4642gi8z7j7gipac8mmlavmn3wdqhg"; + }) + (xsaPatch { + name = "192-4.5"; + sha256 = "0m8cv0xqvx5pdk7fcmaw2vv43xhl62plyx33xqj48y66x5z9lxpm"; + }) + (xsaPatch { + name = "193-4.5"; + sha256 = "0k9mykhrpm4rbjkhv067f6s05lqmgnldcyb3vi8cl0ndlyh66lvr"; + }) + (xsaPatch { + name = "195"; + sha256 = "0m0g953qnjy2knd9qnkdagpvkkgjbk3ydgajia6kzs499dyqpdl7"; + }) + (xsaPatch { + name = "196-0001-x86-emul-Correct-the-IDT-entry-calculation-in-inject"; + sha256 = "0z53nzrjvc745y26z1qc8jlg3blxp7brawvji1hx3s74n346ssl6"; + }) + (xsaPatch { + name = "196-0002-x86-svm-Fix-injection-of-software-interrupts"; + sha256 = "11cqvr5jn2s92wsshpilx9qnfczrd9hnyb5aim6qwmz3fq3hrrkz"; + }) + (xsaPatch { + name = "198"; + sha256 = "0d1nndn4p520c9xa87ixnyks3mrvzcri7c702d6mm22m8ansx6d9"; + }) + (xsaPatch { + name = "200-4.6"; + sha256 = "0k918ja83470iz5k4vqi15293zjvz2dipdhgc9sy9rrhg4mqncl7"; + }) + (xsaPatch { + name = "202-4.6"; + sha256 = "0nnznkrvfbbc8z64dr9wvbdijd4qbpc0wz2j5vpmx6b32sm7932f"; + }) + (xsaPatch { + name = "204-4.5"; + sha256 = "083z9pbdz3f532fnzg7n2d5wzv6rmqc0f4mvc3mnmkd0rzqw8vcp"; + }) + ]; }; in callPackage ./generic.nix (args // { xenConfig=xenConfig; }) diff --git a/pkgs/applications/virtualization/xhyve/default.nix b/pkgs/applications/virtualization/xhyve/default.nix index c519784a6233..b7205ac000e2 100644 --- a/pkgs/applications/virtualization/xhyve/default.nix +++ b/pkgs/applications/virtualization/xhyve/default.nix @@ -1,25 +1,19 @@ -{ stdenv, lib, fetchurl, Hypervisor, vmnet, xpc, libobjc }: +{ stdenv, lib, fetchurl }: stdenv.mkDerivation rec { - name = "xhyve-${version}"; - version = "1f1dbe305"; + name = "xhyve-${version}"; + version = "0.2.0"; src = fetchurl { - url = "https://github.com/mist64/xhyve/archive/1f1dbe3059904f885e4ab2b3328f4bb350ea5c37.tar.gz"; - sha256 = "0hfix8yr90szlv2yyqb2rlq5qsrxyam8kg52sly0adja0cpwfjvx"; + url = "https://github.com/mist64/xhyve/archive/v${version}.tar.gz"; + sha256 = "0g1vknnh88kxc8aaqv3j9wqhq45mm9xxxbn1vcrypj3kk9991hrj"; }; - buildInputs = [ Hypervisor vmnet xpc libobjc ]; - # Don't use git to determine version - prePatch = '' - substituteInPlace Makefile \ - --replace 'shell git describe --abbrev=6 --dirty --always --tags' "$version" + buildFlags = '' + CFLAGS=-DVERSION=\"${version}\" ''; - - makeFlags = [ "CFLAGS+=-Wno-shift-sign-overflow" ''CFLAGS+=-DVERSION=\"${version}\"'' ]; - installPhase = '' mkdir -p $out/bin cp build/xhyve $out/bin diff --git a/pkgs/build-support/kernel/cpio-clean.pl b/pkgs/build-support/kernel/cpio-clean.pl deleted file mode 100644 index ddc6435a5a81..000000000000 --- a/pkgs/build-support/kernel/cpio-clean.pl +++ /dev/null @@ -1,17 +0,0 @@ -use strict; - -# Make inode number, link info and mtime consistent in order to get a consistent hash. -# -# Author: Alexander Kjeldaas <ak@formalprivacy.com> - -use Archive::Cpio; - -my $cpio = Archive::Cpio->new; -my $IN = \*STDIN; -my $ino = 1; -$cpio->read_with_handler($IN, sub { - my ($e) = @_; - $e->{mtime} = 1; - $cpio->write_one(\*STDOUT, $e); - }); -$cpio->write_trailer(\*STDOUT); diff --git a/pkgs/build-support/kernel/make-initrd.nix b/pkgs/build-support/kernel/make-initrd.nix index 895160616b79..092ab4586b38 100644 --- a/pkgs/build-support/kernel/make-initrd.nix +++ b/pkgs/build-support/kernel/make-initrd.nix @@ -12,10 +12,10 @@ # `contents = {object = ...; symlink = /init;}' is a typical # argument. -{ stdenv, perl, perlArchiveCpio, cpio, contents, ubootChooser, compressor, prepend }: +{ stdenv, perl, cpio, contents, ubootChooser, compressor, prepend }: let - inputsFun = ubootName : [perl cpio perlArchiveCpio ] + inputsFun = ubootName : [ perl cpio ] ++ stdenv.lib.optional (ubootName != null) [ (ubootChooser ubootName) ]; makeUInitrdFun = ubootName : (ubootName != null); in @@ -30,12 +30,11 @@ stdenv.mkDerivation { objects = map (x: x.object) contents; symlinks = map (x: x.symlink) contents; suffices = map (x: if x ? suffix then x.suffix else "none") contents; - + # For obtaining the closure of `contents'. exportReferencesGraph = map (x: [("closure-" + baseNameOf x.symlink) x.object]) contents; pathsFromGraph = ./paths-from-graph.pl; - cpioClean = ./cpio-clean.pl; crossAttrs = { nativeBuildInputs = inputsFun stdenv.cross.platform.uboot; diff --git a/pkgs/build-support/kernel/make-initrd.sh b/pkgs/build-support/kernel/make-initrd.sh index 89021caa5834..0aeaedeb3724 100644 --- a/pkgs/build-support/kernel/make-initrd.sh +++ b/pkgs/build-support/kernel/make-initrd.sh @@ -39,7 +39,8 @@ mkdir -p $out for PREP in $prepend; do cat $PREP >> $out/initrd done -(cd root && find * -print0 | cpio -o -H newc -R 0:0 --null | perl $cpioClean | $compressor >> $out/initrd) +(cd root && find * -print0 | xargs -0r touch -h -d '@1') +(cd root && find * -print0 | sort -z | cpio -o -H newc -R +0:+0 --reproducible --null | $compressor >> $out/initrd) if [ -n "$makeUInitrd" ]; then mv $out/initrd $out/initrd.gz diff --git a/pkgs/desktops/gnome-2/bindings/gnome-python-desktop/default.nix b/pkgs/desktops/gnome-2/bindings/gnome-python-desktop/default.nix new file mode 100644 index 000000000000..b33afb50e99a --- /dev/null +++ b/pkgs/desktops/gnome-2/bindings/gnome-python-desktop/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchurl, gnome_python, librsvg, libwnck, libgtop, pkgconfig, python2, gtk }: + +let + inherit (python2.pkgs) python pygtk; +in stdenv.mkDerivation rec { + ver_maj = "2.32"; + ver_min = "0"; + version = "${ver_maj}.${ver_min}"; + name = "gnome-python-desktop-${version}"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-python-desktop/${ver_maj}/gnome-python-desktop-${version}.tar.bz2"; + sha256 = "1s8f9rns9v7qlwjv9qh9lr8crp88dpzfm45hj47zc3ivpy0dbnq9"; + }; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk librsvg libwnck libgtop python ]; + propagatedBuildInputs = [ gnome_python pygtk ]; + + # gnome-python-desktop expects that .pth file is already installed by PyGTK + # in the same directory. This is not the case for Nix. + postInstall = '' + echo "gtk-2.0" > $out/${python2.sitePackages}/${name}.pth + ''; + + meta = with stdenv.lib; { + homepage = "http://www.pygtk.org"; + description = "Python bindings for GNOME desktop packages"; + license = licenses.lgpl21; + maintainers = [ maintainers.goibhniu ]; + }; +} diff --git a/pkgs/desktops/gnome-2/bindings/gnome-python/default.nix b/pkgs/desktops/gnome-2/bindings/gnome-python/default.nix index 94ce68f9cb20..d7861285cb1e 100644 --- a/pkgs/desktops/gnome-2/bindings/gnome-python/default.nix +++ b/pkgs/desktops/gnome-2/bindings/gnome-python/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchurl, pythonPackages, pkgconfig, libgnome, GConf, glib, gtk, gnome_vfs}: +{ stdenv, fetchurl, python2, pkgconfig, libgnome, GConf, glib, gtk, gnome_vfs }: with stdenv.lib; let - inherit (pythonPackages) python pygobject2 pygtk dbus-python; + inherit (python2.pkgs) python pygobject2 pygtk dbus-python; in stdenv.mkDerivation rec { version = "2.28"; name = "gnome-python-${version}.1"; @@ -13,30 +13,21 @@ in stdenv.mkDerivation rec { sha256 = "759ce9344cbf89cf7f8449d945822a0c9f317a494f56787782a901e4119b96d8"; }; - phases = "unpackPhase configurePhase buildPhase installPhase"; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ python glib gtk GConf libgnome gnome_vfs ]; + propagatedBuildInputs = [ pygobject2 pygtk dbus-python ]; - # WAF is probably the biggest crap on this planet, btw i removed the /gtk-2.0 path thingy - configurePhase = '' - sed -e "s@{PYTHONDIR}/gtk-2.0@{PYTHONDIR}/@" -i gconf/wscript - python waf configure --prefix=$out + # gnome-python expects that .pth file is already installed by PyGTK in the + # same directory. This is not the case for Nix. + postInstall = '' + echo "gtk-2.0" > $out/${python2.sitePackages}/${name}.pth ''; - buildPhase = '' - python waf build - ''; - - installPhase = '' - python waf install - cp bonobo/*.{py,defs} $out/share/pygtk/2.0/defs/ - ''; - - buildInputs = [ python pkgconfig pygobject2 pygtk glib gtk GConf libgnome dbus-python gnome_vfs ]; - - doCheck = false; - - meta = { - homepage = "http://projects.gnome.org/gconf/"; - description = "Python wrapper for gconf"; - maintainers = [ stdenv.lib.maintainers.qknight ]; + meta = with stdenv.lib; { + homepage = "http://pygtk.org/"; + description = "Python wrapper for GNOME libraries"; + platforms = platforms.linux; + licenses = licenses.lgpl2; + maintainers = with maintainers; [ qknight ]; }; } diff --git a/pkgs/desktops/gnome-2/bindings/python-rsvg/default.nix b/pkgs/desktops/gnome-2/bindings/python-rsvg/default.nix deleted file mode 100644 index c862bee0c906..000000000000 --- a/pkgs/desktops/gnome-2/bindings/python-rsvg/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ stdenv, fetchurl, gnome2, librsvg, pkgconfig, python27Packages, gtk }: - -let - inherit (python27Packages) python pygtk; -in stdenv.mkDerivation rec { - ver_maj = "2.32"; - ver_min = "0"; - version = "${ver_maj}.${ver_min}"; - name = "python-rsvg-${version}"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-python-desktop/${ver_maj}/gnome-python-desktop-${version}.tar.bz2"; - sha256 = "1s8f9rns9v7qlwjv9qh9lr8crp88dpzfm45hj47zc3ivpy0dbnq9"; - }; - - configurePhase = '' - sed -e "s@{PYTHONDIR}/gtk-2.0@{PYTHONDIR}/@" -i rsvg/wscript - python waf configure --enable-modules=rsvg --prefix=$out - ''; - - buildPhase = "python waf build"; - - installPhase = "python waf install"; - - buildInputs = [ gtk gnome2.gnome_python librsvg pkgconfig pygtk python ]; - - meta = with stdenv.lib; { - homepage = "http://www.pygtk.org"; - description = "The rsvg python module"; - license = licenses.lgpl21; - maintainers = [ maintainers.goibhniu ]; - }; -} diff --git a/pkgs/desktops/gnome-2/default.nix b/pkgs/desktops/gnome-2/default.nix index 54e397fd4746..c6df2a9ebc22 100644 --- a/pkgs/desktops/gnome-2/default.nix +++ b/pkgs/desktops/gnome-2/default.nix @@ -47,6 +47,9 @@ let overridden = set // overrides; set = with overridden; { gnome_python = callPackage ./bindings/gnome-python { }; + gnome_python_desktop = callPackage ./bindings/gnome-python-desktop { }; + python_rsvg = overridden.gnome_python_desktop; + gnome_vfs = callPackage ./platform/gnome-vfs { }; gnome_vfs_monikers = callPackage ./platform/gnome-vfs-monikers { }; @@ -59,8 +62,6 @@ let overridden = set // overrides; set = with overridden; { libbonoboui = callPackage ./platform/libbonoboui { }; - python_rsvg = callPackage ./bindings/python-rsvg { }; - at_spi = callPackage ./platform/at-spi { }; gtkhtml = callPackage ./platform/gtkhtml { }; diff --git a/pkgs/desktops/kde-5/applications/okular.nix b/pkgs/desktops/kde-5/applications/okular.nix index b8780a7ccc1f..faebf3e679b2 100644 --- a/pkgs/desktops/kde-5/applications/okular.nix +++ b/pkgs/desktops/kde-5/applications/okular.nix @@ -11,7 +11,7 @@ let unwrapped = kdeApp { name = "okular"; nativeBuildInputs = [ ecm kdoctools ]; - buildInputs = [ + propagatedBuildInputs = [ djvulibre ebook_tools kactivities karchive kbookmarks kcompletion kconfig kconfigwidgets kcoreaddons kdbusaddons kdegraphics-mobipocket kiconthemes kjs khtml kio kparts kpty kwallet kwindowsystem libkexiv2 libspectre poppler diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix index acddc9081be0..3edfb177b118 100644 --- a/pkgs/development/compilers/gcc/6/default.nix +++ b/pkgs/development/compilers/gcc/6/default.nix @@ -59,7 +59,7 @@ assert langGo -> langCC; with stdenv.lib; with builtins; -let version = "6.2.0"; +let version = "6.3.0"; # Whether building a cross-compiler for GNU/Hurd. crossGNU = cross != null && cross.config == "i586-pc-gnu"; @@ -216,7 +216,7 @@ stdenv.mkDerivation ({ src = fetchurl { url = "mirror://gnu/gcc/gcc-${version}/gcc-${version}.tar.bz2"; - sha256 = "1idpf43988v1a6i8lw9ak1r7igcfg1bm5kn011iydlr2qygmhi4r"; + sha256 = "17xjz30jb65hcf714vn9gcxvrrji8j20xm7n33qg1ywhyzryfsph"; }; inherit patches; diff --git a/pkgs/development/compilers/go/1.4.nix b/pkgs/development/compilers/go/1.4.nix index 273d768ce21f..3f0726e2aefa 100644 --- a/pkgs/development/compilers/go/1.4.nix +++ b/pkgs/development/compilers/go/1.4.nix @@ -90,6 +90,7 @@ stdenv.mkDerivation rec { patches = [ ./remove-tools-1.4.patch ./new-binutils.patch + ./creds-test-1.4.patch ]; GOOS = if stdenv.isDarwin then "darwin" else "linux"; diff --git a/pkgs/development/compilers/go/1.6.nix b/pkgs/development/compilers/go/1.6.nix index db6573417bf4..ce68b007eaab 100644 --- a/pkgs/development/compilers/go/1.6.nix +++ b/pkgs/development/compilers/go/1.6.nix @@ -110,6 +110,7 @@ stdenv.mkDerivation rec { patches = [ ./remove-tools-1.5.patch + ./creds-test.patch ]; GOOS = if stdenv.isDarwin then "darwin" else "linux"; diff --git a/pkgs/development/compilers/go/1.7.nix b/pkgs/development/compilers/go/1.7.nix index 16de9b0edbf5..c33e45c2983e 100644 --- a/pkgs/development/compilers/go/1.7.nix +++ b/pkgs/development/compilers/go/1.7.nix @@ -101,7 +101,11 @@ stdenv.mkDerivation rec { sed -i '1 a\exit 0' misc/cgo/errors/test.bash ''; - patches = [ ./remove-tools-1.7.patch ./cacert-1.7.patch ]; + patches = + [ ./remove-tools-1.7.patch + ./cacert-1.7.patch + ./creds-test.patch + ]; SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt"; diff --git a/pkgs/development/compilers/go/creds-test-1.4.patch b/pkgs/development/compilers/go/creds-test-1.4.patch new file mode 100644 index 000000000000..98cec532dcca --- /dev/null +++ b/pkgs/development/compilers/go/creds-test-1.4.patch @@ -0,0 +1,17 @@ +diff --git a/go-go1.4.3/src/syscall/creds_test.go b/go-go1.4.3/src/syscall/creds_test.go +index b1894c6..b2d6b4e 100644 +--- a/src/syscall/creds_test.go ++++ b/src/syscall/creds_test.go +@@ -56,9 +56,10 @@ func TestSCMCredentials(t *testing.T) { + ucred.Gid = 0 + oob := syscall.UnixCredentials(&ucred) + _, _, err := cli.(*net.UnixConn).WriteMsgUnix(nil, oob, nil) +- if err.(*net.OpError).Err != syscall.EPERM { +- t.Fatalf("WriteMsgUnix failed with %v, want EPERM", err) ++ if err.(*net.OpError).Err != syscall.EPERM && err.(*net.OpError).Err != syscall.EINVAL { ++ t.Fatalf("WriteMsgUnix failed with %v, want EPERM or EINVAL", err) + } ++ + } + + ucred.Pid = int32(os.Getpid()) diff --git a/pkgs/development/compilers/go/creds-test.patch b/pkgs/development/compilers/go/creds-test.patch new file mode 100644 index 000000000000..09f78959ff9c --- /dev/null +++ b/pkgs/development/compilers/go/creds-test.patch @@ -0,0 +1,14 @@ +diff -ru -x '*~' ./result/src/syscall/creds_test.go go-go1.7.4-src/src/syscall/creds_test.go +--- ./result/src/syscall/creds_test.go 1970-01-01 01:00:01.000000000 +0100 ++++ go-go1.7.4-src/src/syscall/creds_test.go 2016-12-21 14:06:39.559932164 +0100 +@@ -62,8 +62,8 @@ + if sys, ok := err.(*os.SyscallError); ok { + err = sys.Err + } +- if err != syscall.EPERM { +- t.Fatalf("WriteMsgUnix failed with %v, want EPERM", err) ++ if err != syscall.EPERM && err != syscall.EINVAL { ++ t.Fatalf("WriteMsgUnix failed with %v, want EPERM or EINVAL", err) + } + } + diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index eee8f9df457d..a9ad1a695acb 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -57,6 +57,8 @@ self: super: { rev = drv.version; }; })).overrideScope (self: super: { + # https://github.com/yesodweb/yesod/issues/1324 + yesod-persistent = self.yesod-persistent_1_4_1_1; # https://github.com/prowdsponsor/esqueleto/issues/137 persistent = self.persistent_2_2_4_1; persistent-template = self.persistent-template_2_1_8_1; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index ed9a4d7bddab..f766b2be8f56 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -37,7 +37,7 @@ core-packages: - ghcjs-base-0 default-package-overrides: - # LTS Haskell 7.13 + # LTS Haskell 7.14 - abstract-deque ==0.3 - abstract-par ==0.3.3 - AC-Vector ==2.3.2 @@ -51,7 +51,7 @@ default-package-overrides: - adjunctions ==4.3 - adler32 ==0.1.1.0 - aeson ==0.11.2.1 - - aeson-better-errors ==0.9.0.1 + - aeson-better-errors ==0.9.1.0 - aeson-casing ==0.1.0.5 - aeson-compat ==0.3.6 - aeson-generic-compat ==0.0.1.0 @@ -324,7 +324,7 @@ default-package-overrides: - clckwrks-theme-bootstrap ==0.4.2 - cli ==0.1.2 - clientsession ==0.9.1.2 - - Clipboard ==2.3.0.1 + - Clipboard ==2.3.0.2 - clock ==0.7.2 - clumpiness ==0.17.0.0 - ClustalParser ==1.1.4 @@ -393,6 +393,8 @@ default-package-overrides: - cryptohash ==0.11.9 - cryptohash-conduit ==0.1.1 - cryptohash-cryptoapi ==0.1.4 + - cryptohash-md5 ==0.11.100.1 + - cryptohash-sha1 ==0.11.100.1 - cryptohash-sha256 ==0.11.100.1 - cryptol ==2.4.0 - cryptonite ==0.19 @@ -433,7 +435,7 @@ default-package-overrides: - dependent-sum ==0.3.2.2 - dependent-sum-template ==0.0.0.5 - derive ==2.5.26 - - deriving-compat ==0.3.4 + - deriving-compat ==0.3.5 - descriptive ==0.9.4 - diagrams ==1.3.0.1 - diagrams-cairo ==1.3.1.1 @@ -476,7 +478,7 @@ default-package-overrides: - docvim ==0.3.2.1 - dotenv ==0.3.1.0 - dotnet-timespan ==0.0.1.0 - - double-conversion ==2.0.1.0 + - double-conversion ==2.0.2.0 - download ==0.3.2.5 - dpor ==0.2.0.0 - drawille ==0.1.2.0 @@ -586,7 +588,7 @@ default-package-overrides: - foreign-store ==0.2 - formatting ==6.2.4 - fortran-src ==0.1.0.4 - - Frames ==0.1.8 + - Frames ==0.1.9 - free ==4.12.4 - free-vl ==0.1.4 - freenect ==1.2.1 @@ -847,6 +849,7 @@ default-package-overrides: - highlighting-kate ==0.6.3 - hinotify ==0.3.9 - hint ==0.6.0 + - hip ==1.2.0.0 - histogram-fill ==0.8.4.1 - hit ==0.6.3 - hjsmin ==0.2.0.2 @@ -1320,7 +1323,7 @@ default-package-overrides: - persistent-refs ==0.4 - persistent-sqlite ==2.6 - persistent-template ==2.5.1.6 - - pgp-wordlist ==0.1.0.1 + - pgp-wordlist ==0.1.0.2 - phantom-state ==0.2.1.2 - picoparsec ==0.1.2.3 - pinboard ==0.9.6 @@ -1591,7 +1594,7 @@ default-package-overrides: - snap-core ==1.0.1.0 - snap-server ==1.0.1.1 - snowflake ==0.1.1.1 - - soap ==0.2.3.2 + - soap ==0.2.3.3 - soap-openssl ==0.1.0.2 - soap-tls ==0.1.1.2 - socket ==0.6.1.0 @@ -1638,7 +1641,7 @@ default-package-overrides: - STMonadTrans ==0.3.4 - stopwatch ==0.1.0.3 - storable-complex ==0.2.2 - - storable-endian ==0.2.5 + - storable-endian ==0.2.6 - storable-record ==0.0.3.1 - store ==0.2.1.2 - store-core ==0.2.0.2 @@ -1689,7 +1692,7 @@ default-package-overrides: - tar ==0.5.0.3 - tardis ==0.4.1.0 - tasty ==0.11.0.4 - - tasty-ant-xml ==1.0.2 + - tasty-ant-xml ==1.0.3 - tasty-dejafu ==0.3.0.2 - tasty-expected-failure ==0.11.0.4 - tasty-golden ==2.3.1.1 @@ -1746,7 +1749,7 @@ default-package-overrides: - th-reify-many ==0.1.6 - th-to-exp ==0.0.1.0 - th-utilities ==0.2.0.1 - - these ==0.7.2 + - these ==0.7.3 - threads ==0.5.1.4 - through-text ==0.1.0.0 - thumbnail-plus ==1.0.5 @@ -1755,7 +1758,7 @@ default-package-overrides: - time-compat ==0.1.0.3 - time-lens ==0.4.0.1 - time-locale-compat ==0.1.1.3 - - time-parsers ==0.1.1.0 + - time-parsers ==0.1.2.0 - timeit ==1.0.0.0 - timelens ==0.2.0.2 - timemap ==0.0.4 @@ -1842,7 +1845,7 @@ default-package-overrides: - utility-ht ==0.0.12 - uu-interleaved ==0.2.0.0 - uu-parsinglib ==2.9.1.1 - - uuid ==1.3.12 + - uuid ==1.3.13 - uuid-orphans ==1.4.1 - uuid-types ==1.0.3 - vado ==0.0.7 @@ -1864,7 +1867,7 @@ default-package-overrides: - versions ==3.0.0 - vhd ==0.2.2 - ViennaRNAParser ==1.2.9 - - vinyl ==0.5.2 + - vinyl ==0.5.3 - vinyl-utils ==0.3.0.0 - void ==0.7.1 - vty ==5.11.3 @@ -1930,7 +1933,7 @@ default-package-overrides: - Workflow ==0.8.3 - wrap ==0.0.0 - wreq ==0.4.1.0 - - writer-cps-mtl ==0.1.1.0 + - writer-cps-mtl ==0.1.1.1 - writer-cps-transformers ==0.1.1.0 - wuss ==1.1.3 - X11 ==1.6.1.2 @@ -1982,7 +1985,7 @@ default-package-overrides: - yesod-gitrev ==0.1.0.0 - yesod-job-queue ==0.3.0.1 - yesod-newsfeed ==1.6 - - yesod-persistent ==1.4.0.6 + - yesod-persistent ==1.4.1.0 - yesod-sitemap ==1.4.0.1 - yesod-static ==1.5.1.1 - yesod-static-angular ==0.1.8 @@ -1996,7 +1999,7 @@ default-package-overrides: - yjtools ==0.9.18 - zero ==0.1.4 - zeromq4-haskell ==0.6.5 - - zip ==0.1.3 + - zip ==0.1.4 - zip-archive ==0.3.0.5 - zippers ==0.2.2 - zlib ==0.6.1.2 @@ -2676,6 +2679,7 @@ dont-distribute-packages: cabalvchk: [ i686-linux, x86_64-linux, x86_64-darwin ] cabocha: [ i686-linux, x86_64-linux, x86_64-darwin ] cached-io: [ i686-linux, x86_64-linux, x86_64-darwin ] + cacophony: [ i686-linux, x86_64-linux, x86_64-darwin ] caffegraph: [ i686-linux, x86_64-linux, x86_64-darwin ] cake3: [ i686-linux, x86_64-linux, x86_64-darwin ] cakyrespa: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3066,6 +3070,7 @@ dont-distribute-packages: cubicbezier: [ i686-linux, x86_64-linux, x86_64-darwin ] cuboid: [ i686-linux, x86_64-linux, x86_64-darwin ] cudd: [ i686-linux, x86_64-linux, x86_64-darwin ] + cue-sheet: [ i686-linux, x86_64-linux, x86_64-darwin ] currency-convert: [ i686-linux, x86_64-linux, x86_64-darwin ] curry-base: [ i686-linux, x86_64-linux, x86_64-darwin ] curry-frontend: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3268,6 +3273,7 @@ dont-distribute-packages: direct-http: [ i686-linux, x86_64-linux, x86_64-darwin ] direct-plugins: [ i686-linux, x86_64-linux, x86_64-darwin ] directed-cubical: [ i686-linux, x86_64-linux, x86_64-darwin ] + directory-tree: [ i686-linux, x86_64-linux, x86_64-darwin ] dirfiles: [ i686-linux, x86_64-linux, x86_64-darwin ] discogs-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] discordian-calendar: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4270,6 +4276,7 @@ dont-distribute-packages: haste-gapi: [ i686-linux, x86_64-linux, x86_64-darwin ] haste-perch: [ i686-linux, x86_64-linux, x86_64-darwin ] haste: [ i686-linux, x86_64-linux, x86_64-darwin ] + hastily: [ i686-linux, x86_64-linux, x86_64-darwin ] hat: [ i686-linux, x86_64-linux, x86_64-darwin ] Hate: [ i686-linux, x86_64-linux, x86_64-darwin ] hatex-guide: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4575,6 +4582,7 @@ dont-distribute-packages: hpasteit: [ i686-linux, x86_64-linux, x86_64-darwin ] HPath: [ i686-linux, x86_64-linux, x86_64-darwin ] hpath: [ i686-linux, x86_64-linux, x86_64-darwin ] + hpc-coveralls: [ i686-linux, x86_64-linux, x86_64-darwin ] hpc-tracer: [ i686-linux, x86_64-linux, x86_64-darwin ] hpdft: [ i686-linux, x86_64-linux, x86_64-darwin ] HPi: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4710,6 +4718,7 @@ dont-distribute-packages: hspec-shouldbe: [ i686-linux, x86_64-linux, x86_64-darwin ] hspec-snap: [ i686-linux, x86_64-linux, x86_64-darwin ] hspec-test-sandbox: [ i686-linux, x86_64-linux, x86_64-darwin ] + hspec-webdriver: [ i686-linux, x86_64-linux, x86_64-darwin ] HsPerl5: [ i686-linux, x86_64-linux, x86_64-darwin ] hspread: [ i686-linux, x86_64-linux, x86_64-darwin ] hspresent: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5721,6 +5730,7 @@ dont-distribute-packages: mysnapsession-example: [ i686-linux, x86_64-linux, x86_64-darwin ] mysnapsession: [ i686-linux, x86_64-linux, x86_64-darwin ] mysql-effect: [ i686-linux, x86_64-linux, x86_64-darwin ] + mysql-haskell-nem: [ i686-linux, x86_64-linux, x86_64-darwin ] mysql-haskell-openssl: [ i686-linux, x86_64-linux, x86_64-darwin ] mysql-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] mysql-simple-quasi: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6085,6 +6095,7 @@ dont-distribute-packages: pipes-async: [ i686-linux, x86_64-linux, x86_64-darwin ] pipes-attoparsec-streaming: [ i686-linux, x86_64-linux, x86_64-darwin ] pipes-binary: [ i686-linux, x86_64-linux, x86_64-darwin ] + pipes-cacophony: [ i686-linux, x86_64-linux, x86_64-darwin ] pipes-cereal-plus: [ i686-linux, x86_64-linux, x86_64-darwin ] pipes-cereal: [ i686-linux, x86_64-linux, x86_64-darwin ] pipes-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6844,9 +6855,11 @@ dont-distribute-packages: snap-cors: [ i686-linux, x86_64-linux, x86_64-darwin ] snap-error-collector: [ i686-linux, x86_64-linux, x86_64-darwin ] snap-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] + snap-loader-dynamic: [ i686-linux, x86_64-linux, x86_64-darwin ] snap-predicates: [ i686-linux, x86_64-linux, x86_64-darwin ] snap-routes: [ i686-linux, x86_64-linux, x86_64-darwin ] snap-server: [ i686-linux, x86_64-linux, x86_64-darwin ] + snap-templates: [ i686-linux, x86_64-linux, x86_64-darwin ] snap-testing: [ i686-linux, x86_64-linux, x86_64-darwin ] snap-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] snap-web-routes: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6884,6 +6897,7 @@ dont-distribute-packages: snaplet-scoped-session: [ i686-linux, x86_64-linux, x86_64-darwin ] snaplet-sedna: [ i686-linux, x86_64-linux, x86_64-darwin ] snaplet-ses-html: [ i686-linux, x86_64-linux, x86_64-darwin ] + snaplet-sqlite-simple-jwt-auth: [ i686-linux, x86_64-linux, x86_64-darwin ] snaplet-sqlite-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] snaplet-stripe: [ i686-linux, x86_64-linux, x86_64-darwin ] snaplet-tasks: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6956,6 +6970,7 @@ dont-distribute-packages: spoty: [ i686-linux, x86_64-linux, x86_64-darwin ] Sprig: [ i686-linux, x86_64-linux, x86_64-darwin ] spritz: [ i686-linux, x86_64-linux, x86_64-darwin ] + sproxy-web: [ i686-linux, x86_64-linux, x86_64-darwin ] sproxy2: [ i686-linux, x86_64-linux, x86_64-darwin ] spsa: [ i686-linux, x86_64-linux, x86_64-darwin ] sql-simple-mysql: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7580,6 +7595,7 @@ dont-distribute-packages: wai-middleware-preprocessor: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-middleware-route: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-middleware-static-caching: [ i686-linux, x86_64-linux, x86_64-darwin ] + wai-middleware-static: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-responsible: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-router: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-routes: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7597,6 +7613,7 @@ dont-distribute-packages: watchdog: [ i686-linux, x86_64-linux, x86_64-darwin ] watcher: [ i686-linux, x86_64-linux, x86_64-darwin ] watchit: [ i686-linux, x86_64-linux, x86_64-darwin ] + wave: [ i686-linux, x86_64-linux, x86_64-darwin ] WaveFront: [ i686-linux, x86_64-linux, x86_64-darwin ] wavesurfer: [ i686-linux, x86_64-linux, x86_64-darwin ] wavy: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7620,7 +7637,9 @@ dont-distribute-packages: webcrank-dispatch: [ i686-linux, x86_64-linux, x86_64-darwin ] webcrank-wai: [ i686-linux, x86_64-linux, x86_64-darwin ] webcrank: [ i686-linux, x86_64-linux, x86_64-darwin ] + webdriver-angular: [ i686-linux, x86_64-linux, x86_64-darwin ] webdriver-snoy: [ i686-linux, x86_64-linux, x86_64-darwin ] + webdriver: [ i686-linux, x86_64-linux, x86_64-darwin ] WeberLogic: [ i686-linux, x86_64-linux, x86_64-darwin ] webify: [ i686-linux, x86_64-linux, x86_64-darwin ] webkit-javascriptcore: [ i686-linux, x86_64-linux, x86_64-darwin ] diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 65a6a47d9bf7..1bdf1256369a 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -2746,25 +2746,12 @@ self: { ({ mkDerivation, base, directory, unix, utf8-string, X11 }: mkDerivation { pname = "Clipboard"; - version = "2.3.0.1"; - sha256 = "f559fa28d98f98355b6478b583f8f111e00573fd5b70111ad6ca11c12388ee1c"; - libraryHaskellDepends = [ base directory unix utf8-string X11 ]; - homepage = "http://haskell.org/haskellwiki/Clipboard"; - description = "System clipboard interface"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "Clipboard_2_3_0_2" = callPackage - ({ mkDerivation, base, directory, unix, utf8-string, X11 }: - mkDerivation { - pname = "Clipboard"; version = "2.3.0.2"; sha256 = "c746972095b1c4473208992bb6f267a9b3ba2620b722922f0f4c35d71c71e939"; libraryHaskellDepends = [ base directory unix utf8-string X11 ]; homepage = "http://haskell.org/haskellwiki/Clipboard"; description = "System clipboard interface"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ClustalParser" = callPackage @@ -5447,22 +5434,6 @@ self: { }) {}; "Frames" = callPackage - ({ mkDerivation, base, ghc-prim, pipes, primitive, readable - , template-haskell, text, transformers, vector, vinyl - }: - mkDerivation { - pname = "Frames"; - version = "0.1.8"; - sha256 = "5b695c025c1e153d40b5ac8a526ca4986b1b4ae9350354e6373593b15d9c3e57"; - libraryHaskellDepends = [ - base ghc-prim pipes primitive readable template-haskell text - transformers vector vinyl - ]; - description = "Data frames For working with tabular data files"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "Frames_0_1_9" = callPackage ({ mkDerivation, base, directory, ghc-prim, hspec, htoml, pipes , pretty, primitive, readable, regex-applicative, template-haskell , temporary, text, transformers, unordered-containers, vector @@ -5482,7 +5453,6 @@ self: { ]; description = "Data frames For working with tabular data files"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Frank" = callPackage @@ -5730,6 +5700,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) freeglut; inherit (pkgs) mesa;}; + "GLURaw_2_0_0_3" = callPackage + ({ mkDerivation, base, freeglut, mesa, OpenGLRaw, transformers }: + mkDerivation { + pname = "GLURaw"; + version = "2.0.0.3"; + sha256 = "582cf8c0c1b8c0123ee9a8a06eba65fffded6decfe4e2e08bfea308f55f7ccee"; + libraryHaskellDepends = [ base OpenGLRaw transformers ]; + librarySystemDepends = [ freeglut mesa ]; + homepage = "http://www.haskell.org/haskellwiki/Opengl"; + description = "A raw binding for the OpenGL graphics system"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) freeglut; inherit (pkgs) mesa;}; + "GLUT" = callPackage ({ mkDerivation, array, base, containers, OpenGL, StateVar , transformers @@ -8417,6 +8401,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "HaTeX_3_17_1_0" = callPackage + ({ mkDerivation, base, bytestring, containers, matrix, parsec + , QuickCheck, tasty, tasty-quickcheck, text, transformers + , wl-pprint-extras + }: + mkDerivation { + pname = "HaTeX"; + version = "3.17.1.0"; + sha256 = "c497c6b2853018b09016c4422f22d18956881fc774066626d7c43c8b8f0917c3"; + libraryHaskellDepends = [ + base bytestring containers matrix parsec QuickCheck text + transformers wl-pprint-extras + ]; + testHaskellDepends = [ + base QuickCheck tasty tasty-quickcheck text + ]; + homepage = "https://github.com/Daniel-Diaz/HaTeX/blob/master/README.md"; + description = "The Haskell LaTeX library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "HaTeX-meta" = callPackage ({ mkDerivation, base, Cabal, containers, directory, filepath, ghc , haddock, haskell-src-exts, mtl, parsec @@ -11444,8 +11450,8 @@ self: { }: mkDerivation { pname = "MiniAgda"; - version = "0.2014.9.12"; - sha256 = "16e457ddf76d11c05905e057381fccb0373c021dbccfbcabeb31f2929a9e0792"; + version = "0.2016.12.19"; + sha256 = "c182c028ecf764a4f363426fbd101eb1e3c9283d5558cae898cdbd45847d4fca"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -20070,26 +20076,6 @@ self: { }: mkDerivation { pname = "aeson-better-errors"; - version = "0.9.0.1"; - sha256 = "125f4453f945b5b051fa596cd148b7db0414942cdfbe1d6fd0359989ab45d8e6"; - revision = "1"; - editedCabalFile = "8aa3d1ad76116aad051bc6adce10e2798191bdd6ecf84145687e5c77d3a7a2c2"; - libraryHaskellDepends = [ - aeson base bytestring dlist mtl scientific text transformers - transformers-compat unordered-containers vector void - ]; - homepage = "https://github.com/hdgarrood/aeson-better-errors"; - description = "Better error messages when decoding JSON values"; - license = stdenv.lib.licenses.mit; - }) {}; - - "aeson-better-errors_0_9_1_0" = callPackage - ({ mkDerivation, aeson, base, bytestring, dlist, mtl, scientific - , text, transformers, transformers-compat, unordered-containers - , vector, void - }: - mkDerivation { - pname = "aeson-better-errors"; version = "0.9.1.0"; sha256 = "68f001bf055ec7b755d91019f2a0ef136307d157a231acddad6b4cc561f67327"; libraryHaskellDepends = [ @@ -20099,7 +20085,6 @@ self: { homepage = "https://github.com/hdgarrood/aeson-better-errors"; description = "Better error messages when decoding JSON values"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "aeson-bson" = callPackage @@ -25994,6 +25979,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "apioiaf-client" = callPackage + ({ mkDerivation, aeson, base, bytestring, lens, wreq }: + mkDerivation { + pname = "apioiaf-client"; + version = "0.1.0.0"; + sha256 = "8493248ae0d1303afba5f600e7c38fb29b6811d2348f994af056413a3ebbd0ff"; + libraryHaskellDepends = [ aeson base bytestring lens wreq ]; + testHaskellDepends = [ base ]; + homepage = "https://github.com/kberger/anapioficeandfire-haskell#readme"; + description = "Consumer library for anapioficeandfire.com"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "apis" = callPackage ({ mkDerivation, aeson, base, containers, deepseq, directory , ecma262, exceptions, filemanip, filepath, hslogger, hxt, mtl @@ -35172,6 +35170,37 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "buchhaltung" = callPackage + ({ mkDerivation, aeson, ansi-wl-pprint, array, async, base, boxes + , bytestring, Cabal, cassava, containers, data-default, Decimal + , deepseq, directory, edit-distance, file-embed, filepath + , formatting, hashable, haskeline, hint, hledger, hledger-lib, lens + , lifted-base, ListLike, megaparsec, MissingH, monad-control, mtl + , optparse-applicative, parsec, process, regex-compat, regex-tdfa + , regex-tdfa-text, safe, semigroups, split, strict, temporary, text + , time, transformers, unordered-containers, vector, yaml + }: + mkDerivation { + pname = "buchhaltung"; + version = "0.0.1"; + sha256 = "fd2dd47210a9d7200c0d4259646963b6bc848ff656255b66b14648b949dec70f"; + isLibrary = false; + isExecutable = true; + setupHaskellDepends = [ base Cabal ]; + executableHaskellDepends = [ + aeson ansi-wl-pprint array async base boxes bytestring cassava + containers data-default Decimal deepseq directory edit-distance + file-embed filepath formatting hashable haskeline hint hledger + hledger-lib lens lifted-base ListLike megaparsec MissingH + monad-control mtl optparse-applicative parsec process regex-compat + regex-tdfa regex-tdfa-text safe semigroups split strict temporary + text time transformers unordered-containers vector yaml + ]; + homepage = "http://johannesgerer.com/buchhaltung"; + description = "Automates most of your plain text accounting data entry in ledger format"; + license = stdenv.lib.licenses.mit; + }) {}; + "buffer-builder" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, criterion , deepseq, HTF, mtl, quickcheck-instances, text @@ -37239,6 +37268,30 @@ self: { homepage = "https://github.com/centromere/cacophony"; description = "A library implementing the Noise protocol"; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "cacophony_0_9_0" = callPackage + ({ mkDerivation, aeson, async, base, base16-bytestring, bytestring + , cryptonite, deepseq, directory, exceptions, free, hlint, lens + , memory, monad-coroutine, mtl, safe-exceptions, text, transformers + }: + mkDerivation { + pname = "cacophony"; + version = "0.9.0"; + sha256 = "7394383af54b84ff5efdb491cafa6ffc569266c522c7395ee099a45bbd0588cb"; + libraryHaskellDepends = [ + base bytestring cryptonite deepseq exceptions free lens memory + monad-coroutine mtl safe-exceptions transformers + ]; + testHaskellDepends = [ + aeson async base base16-bytestring bytestring directory free hlint + lens memory mtl text + ]; + homepage = "https://github.com/centromere/cacophony"; + description = "A library implementing the Noise protocol"; + license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "caf" = callPackage @@ -41097,6 +41150,25 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "clckwrks-cli_0_2_17_1" = callPackage + ({ mkDerivation, acid-state, base, clckwrks, haskeline, mtl + , network, parsec + }: + mkDerivation { + pname = "clckwrks-cli"; + version = "0.2.17.1"; + sha256 = "d3f5546425c363b8d25d9d5060839431176829c017994709fc0060868ced25ea"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + acid-state base clckwrks haskeline mtl network parsec + ]; + homepage = "http://www.clckwrks.com/"; + description = "a command-line interface for adminstrating some aspects of clckwrks"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "clckwrks-dot-com" = callPackage ({ mkDerivation, base, clckwrks, clckwrks-plugin-media , clckwrks-plugin-page, clckwrks-theme-clckwrks, containers @@ -41194,6 +41266,30 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "clckwrks-plugin-media_0_6_16_1" = callPackage + ({ mkDerivation, acid-state, attoparsec, base, blaze-html, cereal + , clckwrks, containers, directory, filepath, gd, happstack-server + , hsp, hsx2hs, ixset, magic, mtl, reform, reform-happstack + , reform-hsp, safecopy, text, web-plugins, web-routes + , web-routes-th + }: + mkDerivation { + pname = "clckwrks-plugin-media"; + version = "0.6.16.1"; + sha256 = "acd1df19bf6b98d18202c925f7cf6800d378c190d36e5a88422dda3e19eaf079"; + libraryHaskellDepends = [ + acid-state attoparsec base blaze-html cereal clckwrks containers + directory filepath gd happstack-server hsp ixset magic mtl reform + reform-happstack reform-hsp safecopy text web-plugins web-routes + web-routes-th + ]; + libraryToolDepends = [ hsx2hs ]; + homepage = "http://clckwrks.com/"; + description = "media plugin for clckwrks"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "clckwrks-plugin-page" = callPackage ({ mkDerivation, acid-state, aeson, attoparsec, base, clckwrks , containers, directory, filepath, happstack-hsp, happstack-server @@ -41220,6 +41316,32 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "clckwrks-plugin-page_0_4_3_7" = callPackage + ({ mkDerivation, acid-state, aeson, attoparsec, base, clckwrks + , containers, directory, filepath, happstack-hsp, happstack-server + , hsp, hsx2hs, ixset, mtl, old-locale, random, reform + , reform-happstack, reform-hsp, safecopy, tagsoup, template-haskell + , text, time, time-locale-compat, uuid, uuid-orphans, web-plugins + , web-routes, web-routes-happstack, web-routes-th + }: + mkDerivation { + pname = "clckwrks-plugin-page"; + version = "0.4.3.7"; + sha256 = "4f621eea6793307fb025ac9738f273c61c0e643f604bd2489b2bdf6fc06639d7"; + libraryHaskellDepends = [ + acid-state aeson attoparsec base clckwrks containers directory + filepath happstack-hsp happstack-server hsp hsx2hs ixset mtl + old-locale random reform reform-happstack reform-hsp safecopy + tagsoup template-haskell text time time-locale-compat uuid + uuid-orphans web-plugins web-routes web-routes-happstack + web-routes-th + ]; + homepage = "http://www.clckwrks.com/"; + description = "support for CMS/Blogging in clckwrks"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "clckwrks-theme-bootstrap" = callPackage ({ mkDerivation, base, clckwrks, happstack-authenticate, hsp , hsx-jmacro, hsx2hs, jmacro, mtl, text, web-plugins @@ -41238,6 +41360,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "clckwrks-theme-bootstrap_0_4_2_1" = callPackage + ({ mkDerivation, base, clckwrks, happstack-authenticate, hsp + , hsx-jmacro, hsx2hs, jmacro, mtl, text, web-plugins + }: + mkDerivation { + pname = "clckwrks-theme-bootstrap"; + version = "0.4.2.1"; + sha256 = "44c1fda59c72b807c4abe63d19c98de1b0523d78dd3392bb68064dd3f18878d6"; + libraryHaskellDepends = [ + base clckwrks happstack-authenticate hsp hsx-jmacro hsx2hs jmacro + mtl text web-plugins + ]; + homepage = "http://www.clckwrks.com/"; + description = "simple bootstrap based template for clckwrks"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "clckwrks-theme-clckwrks" = callPackage ({ mkDerivation, base, clckwrks, containers, happstack-authenticate , hsp, hsx2hs, mtl, text, web-plugins @@ -41531,8 +41671,8 @@ self: { }: mkDerivation { pname = "clit"; - version = "0.1.1.0"; - sha256 = "fc9feafd9f09fe9899af922c6a230d658b675621e5a5fe4da77af916a2ccca6f"; + version = "0.1.1.1"; + sha256 = "bb2be5226f6659b709b87ebe593c7c1a2b9447d2b681dc9c97130254ba4e4a61"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -43789,6 +43929,23 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; + "concurrent-output_1_7_8" = callPackage + ({ mkDerivation, ansi-terminal, async, base, directory, exceptions + , process, stm, terminal-size, text, transformers, unix + }: + mkDerivation { + pname = "concurrent-output"; + version = "1.7.8"; + sha256 = "8c9b0ab30ff9ea930039efcd9cc3d8541f0647c617afc17370de9de793ca9a6f"; + libraryHaskellDepends = [ + ansi-terminal async base directory exceptions process stm + terminal-size text transformers unix + ]; + description = "Ungarble output from several threads or commands"; + license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "concurrent-rpc" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -44961,15 +45118,15 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "containers_0_5_8_1" = callPackage + "containers_0_5_9_1" = callPackage ({ mkDerivation, array, base, ChasingBottoms, deepseq, ghc-prim , HUnit, QuickCheck, test-framework, test-framework-hunit , test-framework-quickcheck2, transformers }: mkDerivation { pname = "containers"; - version = "0.5.8.1"; - sha256 = "f7e65874f5592c7fd7c24aaca67d8ccf87887e5a69ea8e97890c40c3bb07f142"; + version = "0.5.9.1"; + sha256 = "132d2ab0d56a631fc883bc843c5661380135e19992f724897d24cf6ead450a23"; libraryHaskellDepends = [ array base deepseq ghc-prim ]; testHaskellDepends = [ array base ChasingBottoms deepseq ghc-prim HUnit QuickCheck @@ -48268,6 +48425,7 @@ self: { homepage = "https://github.com/mrkkrp/cue-sheet"; description = "Support for construction, rendering, and parsing of CUE sheets"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cufft" = callPackage @@ -50788,8 +50946,8 @@ self: { }: mkDerivation { pname = "datasets"; - version = "0.2.2"; - sha256 = "d79ae10e42a208a4413f8b4851c18cff671ec0f578108f2f71bbf7cba215f127"; + version = "0.2.3"; + sha256 = "f155d4aea31d03fd14c7050793d9e90685ba8858460ce7c3716919bd00c12ea4"; libraryHaskellDepends = [ aeson base bytestring cassava directory file-embed filepath hashable microlens stringsearch text time vector wreq @@ -51711,15 +51869,15 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "declarative_0_3_4" = callPackage + "declarative_0_4_0" = callPackage ({ mkDerivation, base, hasty-hamiltonian, lens, mcmc-types , mighty-metropolis, mwc-probability, pipes, primitive , speedy-slice, transformers }: mkDerivation { pname = "declarative"; - version = "0.3.4"; - sha256 = "4d731ea4199f322fa8028a44ed3e5155e2ae58f27542f1e8a8f0ee4116ec226b"; + version = "0.4.0"; + sha256 = "e771c452cbc7f91b67d078a87349de36182fc5e25a9185f18cff7346941c713c"; libraryHaskellDepends = [ base hasty-hamiltonian lens mcmc-types mighty-metropolis mwc-probability pipes primitive speedy-slice transformers @@ -52638,28 +52796,6 @@ self: { "deriving-compat" = callPackage ({ mkDerivation, base, base-compat, base-orphans, containers - , ghc-boot-th, ghc-prim, hspec, QuickCheck, template-haskell - , transformers, transformers-compat - }: - mkDerivation { - pname = "deriving-compat"; - version = "0.3.4"; - sha256 = "77c68a5c69be9c4385a163501da2d8dacf590a3d948bb1d01f570ef4abb0bf3d"; - libraryHaskellDepends = [ - base containers ghc-boot-th ghc-prim template-haskell transformers - transformers-compat - ]; - testHaskellDepends = [ - base base-compat base-orphans hspec QuickCheck template-haskell - transformers transformers-compat - ]; - homepage = "https://github.com/haskell-compat/deriving-compat"; - description = "Backports of GHC deriving extensions"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "deriving-compat_0_3_5" = callPackage - ({ mkDerivation, base, base-compat, base-orphans, containers , ghc-boot-th, ghc-prim, hspec, QuickCheck, tagged , template-haskell, transformers, transformers-compat }: @@ -52678,7 +52814,6 @@ self: { homepage = "https://github.com/haskell-compat/deriving-compat"; description = "Backports of GHC deriving extensions"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "derp" = callPackage @@ -53881,6 +54016,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "diff3_0_3_0" = callPackage + ({ mkDerivation, base, Diff, QuickCheck, test-framework + , test-framework-quickcheck2 + }: + mkDerivation { + pname = "diff3"; + version = "0.3.0"; + sha256 = "8dc57a5f7070efe7227d3afaf5cf4d084c134e2cc0426e98421cdb720cacea25"; + libraryHaskellDepends = [ base Diff ]; + testHaskellDepends = [ + base QuickCheck test-framework test-framework-quickcheck2 + ]; + homepage = "http://github.com/ocharles/diff3.git"; + description = "Perform a 3-way difference of documents"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "diffarray" = callPackage ({ mkDerivation, array, base }: mkDerivation { @@ -54583,6 +54736,7 @@ self: { homepage = "http://brandon.si/code/directory-tree-module-released/"; description = "A simple directory-like tree datatype, with useful IO functions"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dirfiles" = callPackage @@ -56228,25 +56382,6 @@ self: { }) {}; "double-conversion" = callPackage - ({ mkDerivation, base, bytestring, ghc-prim, integer-gmp - , test-framework, test-framework-quickcheck2, text - }: - mkDerivation { - pname = "double-conversion"; - version = "2.0.1.0"; - sha256 = "0072b5b05631081c2eb73cda9dd660e384a7e988d3867b8b05540ef7648a920c"; - libraryHaskellDepends = [ - base bytestring ghc-prim integer-gmp text - ]; - testHaskellDepends = [ - base bytestring test-framework test-framework-quickcheck2 text - ]; - homepage = "https://github.com/bos/double-conversion"; - description = "Fast conversion between double precision floating point and text"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "double-conversion_2_0_2_0" = callPackage ({ mkDerivation, base, bytestring, ghc-prim, HUnit, test-framework , test-framework-hunit, test-framework-quickcheck2, text }: @@ -56262,7 +56397,6 @@ self: { homepage = "https://github.com/bos/double-conversion"; description = "Fast conversion between double precision floating point and text"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "double-metaphone" = callPackage @@ -56687,6 +56821,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "drifter-postgresql_0_1_0" = callPackage + ({ mkDerivation, base, containers, drifter, either, mtl + , postgresql-simple, tasty, tasty-hunit, text, time + }: + mkDerivation { + pname = "drifter-postgresql"; + version = "0.1.0"; + sha256 = "10df8309986c23f947949a28f9fb16ec6632f1d509ab0fe010a74f9068b90325"; + libraryHaskellDepends = [ + base containers drifter either mtl postgresql-simple time + ]; + testHaskellDepends = [ + base drifter either postgresql-simple tasty tasty-hunit text + ]; + homepage = "http://github.com/michaelxavier/drifter-postgresql"; + description = "PostgreSQL support for the drifter schema migration tool"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "drmaa" = callPackage ({ mkDerivation, base, drmaa, inline-c, shelly, text }: mkDerivation { @@ -64342,15 +64496,15 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "flat-mcmc_1_4_2" = callPackage + "flat-mcmc_1_5_0" = callPackage ({ mkDerivation, base, formatting, mcmc-types, monad-par , monad-par-extras, mwc-probability, pipes, primitive, text , transformers, vector }: mkDerivation { pname = "flat-mcmc"; - version = "1.4.2"; - sha256 = "0da3a4fc0d29b994c7aa8a9e5d3f902f15e5a61bde143300438ecaa2318631fa"; + version = "1.5.0"; + sha256 = "87cea9deac6e2d32d9984741ba222ccb2fb0d5f8c58e843684476bfe7632f1fd"; libraryHaskellDepends = [ base formatting mcmc-types monad-par monad-par-extras mwc-probability pipes primitive text transformers vector @@ -69736,8 +69890,8 @@ self: { ({ mkDerivation, base, ghcjs-dom-jsaddle, text, transformers }: mkDerivation { pname = "ghcjs-dom"; - version = "0.7.0.3"; - sha256 = "e2c65cfafc438029ef8e9ad504ca01e9c92168d9e6f863411a3e8c6ea62cde33"; + version = "0.7.0.4"; + sha256 = "1c9e57e7de17179c2aca7c6a0417304fa2229b498431f1137dc0a606d8315bac"; libraryHaskellDepends = [ base ghcjs-dom-jsaddle text transformers ]; @@ -69779,8 +69933,8 @@ self: { ({ mkDerivation }: mkDerivation { pname = "ghcjs-dom-jsffi"; - version = "0.7.0.3"; - sha256 = "77ecc2d8ee887d4a35cf6161106e278613fe7552569af3a49f136c64dddde0be"; + version = "0.7.0.4"; + sha256 = "2a44162bf30cb0ebee18b76db5831804add52d3a4bba4c183d0229b975c15619"; isLibrary = false; isExecutable = false; description = "DOM library using JSFFI and GHCJS"; @@ -70838,10 +70992,8 @@ self: { }: mkDerivation { pname = "ginger"; - version = "0.3.8.0"; - sha256 = "938391f36b50a5fafe7f2668f25d08a4db77cdcc43cb6b15644dedfb81ed7625"; - revision = "1"; - editedCabalFile = "39afd3a71efabe33c2a2f5d3fd11906a0f8e1e8c4931acc230c8a9794ef6d676"; + version = "0.3.9.1"; + sha256 = "28f26b37cd2daedd841516f0e538877f84932a9813096a34e8c820de44c0323c"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -71252,6 +71404,25 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "git-mediate" = callPackage + ({ mkDerivation, ansi-terminal, base, base-compat, Diff, directory + , filepath, mtl, optparse-applicative, process, unix + }: + mkDerivation { + pname = "git-mediate"; + version = "1.0"; + sha256 = "0ec4f74b30997f05059ac4dc1433a3618cd40240bbb93b6ec434d90f40390790"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + ansi-terminal base base-compat Diff directory filepath mtl + optparse-applicative process unix + ]; + homepage = "https://github.com/ElastiLotem/git-mediate"; + description = "Remove trivial conflict markers in a git repository"; + license = stdenv.lib.licenses.gpl2; + }) {}; + "git-monitor" = callPackage ({ mkDerivation, base, bytestring, containers, directory, filepath , gitlib, gitlib-libgit2, lifted-async, logging, old-locale @@ -72148,26 +72319,24 @@ self: { }) {}; "glirc" = callPackage - ({ mkDerivation, async, attoparsec, base, bytestring, Cabal - , config-value, containers, data-default-class, directory, filepath - , gitrev, hashable, hookup, HsOpenSSL, HUnit, irc-core - , kan-extensions, lens, memory, network, process, regex-tdfa, socks - , split, stm, text, time, transformers, unix, unordered-containers - , vector, vty + ({ mkDerivation, async, attoparsec, base, base64-bytestring + , bytestring, Cabal, config-value, containers, data-default-class + , directory, filepath, gitrev, hashable, hookup, HsOpenSSL, HUnit + , irc-core, kan-extensions, lens, network, process, regex-tdfa + , socks, split, stm, text, time, transformers, unix + , unordered-containers, vector, vty }: mkDerivation { pname = "glirc"; - version = "2.20.1.1"; - sha256 = "63f0f8d82ea8d2f90103faf9ccd9fa301275b9400bbf1c3db62f8c51cbfa40fe"; - revision = "3"; - editedCabalFile = "d9ff6df2f3d84db85981806342ea6a4022a155283f9d4569753ac7ecf5535005"; + version = "2.20.2"; + sha256 = "acefc316a6075dbeb2fa95bf1ee99a8e4c3097eaf5be9273d676719d07a94b00"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal filepath ]; libraryHaskellDepends = [ - async attoparsec base bytestring config-value containers - data-default-class directory filepath gitrev hashable hookup - HsOpenSSL irc-core kan-extensions lens memory network process + async attoparsec base base64-bytestring bytestring config-value + containers data-default-class directory filepath gitrev hashable + hookup HsOpenSSL irc-core kan-extensions lens network process regex-tdfa socks split stm text time transformers unix unordered-containers vector vty ]; @@ -85297,6 +85466,7 @@ self: { homepage = "http://bitbucket.org/sras/hastily"; description = "A program to download subtitle files"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hasty-hamiltonian" = callPackage @@ -85316,6 +85486,24 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hasty-hamiltonian_1_2_0" = callPackage + ({ mkDerivation, ad, base, lens, mcmc-types, mwc-probability, pipes + , primitive, transformers + }: + mkDerivation { + pname = "hasty-hamiltonian"; + version = "1.2.0"; + sha256 = "602e6bff253cae2151b6c4eb8c81a19dc0a2525bf63bdbd5b12396358548cdda"; + libraryHaskellDepends = [ + base lens mcmc-types mwc-probability pipes primitive transformers + ]; + testHaskellDepends = [ ad base mwc-probability ]; + homepage = "http://github.com/jtobin/hasty-hamiltonian"; + description = "Speedy traversal through parameter space"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hat" = callPackage ({ mkDerivation, base, bytestring, containers, directory, filepath , haskeline, haskell-src-exts, old-locale, old-time, polyparse @@ -89091,6 +89279,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hip_1_3_0_0" = callPackage + ({ mkDerivation, base, bytestring, Chart, Chart-diagrams, colour + , deepseq, directory, filepath, hspec, JuicyPixels, netpbm + , primitive, process, QuickCheck, repa, temporary, vector + }: + mkDerivation { + pname = "hip"; + version = "1.3.0.0"; + sha256 = "ee4e288bcb2ab1937d3eaa5bcf8017bff07debc8aeda3e768fe542923696b9bf"; + libraryHaskellDepends = [ + base bytestring Chart Chart-diagrams colour deepseq directory + filepath JuicyPixels netpbm primitive process repa temporary vector + ]; + testHaskellDepends = [ base hspec QuickCheck ]; + homepage = "https://github.com/lehins/hip"; + description = "Haskell Image Processing (HIP) Library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hipbot" = callPackage ({ mkDerivation, aeson, base, bifunctors, blaze-builder, bytestring , either, exceptions, http-client, http-client-tls, http-types, jwt @@ -91991,8 +92199,8 @@ self: { }: mkDerivation { pname = "horname"; - version = "0.1.0.0"; - sha256 = "f895b2d91dd1b33bf51a04f92a4d0c295286eccfdab1df3e178b6ea8774fb290"; + version = "0.1.3.0"; + sha256 = "e9a6cfb0ba87f063f04a7273d476b200905625ce60b00d87c8995332b1b7f218"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -92536,6 +92744,7 @@ self: { homepage = "https://github.com/guillaume-nargeot/hpc-coveralls"; description = "Coveralls.io support for Haskell."; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hpc-strobe" = callPackage @@ -96104,6 +96313,7 @@ self: { homepage = "https://bitbucket.org/wuzzeb/webdriver-utils"; description = "Write end2end web application tests using webdriver and hspec"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hspec2" = callPackage @@ -103147,14 +103357,14 @@ self: { }: mkDerivation { pname = "interlude-l"; - version = "0.1.0.7"; - sha256 = "0cef80ef63038b398438f8e3ab60760ef17fab380f5d8534d595237a07cb0bb7"; + version = "0.1.0.8"; + sha256 = "5eb16c248a0528543702ae17452c8cdb31d525f1bc95b4e9ea146682fab93100"; libraryHaskellDepends = [ aeson base exceptions lens monad-control MonadRandom mtl protolude string-conv text transformers witherable ]; description = "Prelude replacement based on protolude"; - license = stdenv.lib.licenses.bsd3; + license = stdenv.lib.licenses.mit; }) {}; "intern" = callPackage @@ -104077,16 +104287,16 @@ self: { }) {}; "irc-core" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, hashable, HUnit - , memory, primitive, text, time, vector + ({ mkDerivation, attoparsec, base, base64-bytestring, bytestring + , hashable, HUnit, primitive, text, time, vector }: mkDerivation { pname = "irc-core"; - version = "2.2.0.0"; - sha256 = "2e491a8a9d3c0dbb3413c8bebc1e37d0636d2cb8367f4b257141f891107b4834"; + version = "2.2.0.1"; + sha256 = "6c160d1073ee40b12d294f1e4dbb4691aedb73150eebf027475db05ce1efa20a"; libraryHaskellDepends = [ - attoparsec base bytestring hashable memory primitive text time - vector + attoparsec base base64-bytestring bytestring hashable primitive + text time vector ]; testHaskellDepends = [ base hashable HUnit text ]; homepage = "https://github.com/glguy/irc-core"; @@ -104264,8 +104474,8 @@ self: { }: mkDerivation { pname = "iridium"; - version = "0.1.5.5"; - sha256 = "161d533ebde52dd4854a8d8e46f1d4c506178a94672a61948f1f70ed6db1b726"; + version = "0.1.5.6"; + sha256 = "18a0ee5f08996a263dcf484bb48749d6a3df502729a7c386b5b7133b80f23577"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -104278,7 +104488,7 @@ self: { base extra multistate text transformers unordered-containers yaml ]; homepage = "https://github.com/lspitzner/iridium"; - description = "Automated Local Testing and Package Uploading"; + description = "Automated Local Cabal Package Testing and Uploading"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -104771,6 +104981,8 @@ self: { pname = "ivory"; version = "0.1.0.5"; sha256 = "437d5bc2fa69037e6fa5beb7d0a7b27f4d7e92404531b698be5a84946294a158"; + revision = "1"; + editedCabalFile = "0fa37aeb8c009a31030e0fe7fbb278907c41909c0f06d74b9942adbf58fc446f"; libraryHaskellDepends = [ array base base-compat containers dlist filepath monadLib pretty template-haskell text th-lift @@ -104808,6 +105020,8 @@ self: { pname = "ivory-backend-c"; version = "0.1.0.5"; sha256 = "e07d69634f6b50145f51886b87b7556bd6eb01e21bcd6476f849071a1120e535"; + revision = "1"; + editedCabalFile = "d628f3ab8d4d61816af6f9ff9fb34bf8cbcf28d2ff75246aa86303a59c457d1a"; libraryHaskellDepends = [ base base-compat bytestring containers directory filepath ivory ivory-artifact ivory-opts language-c-quote mainland-pretty monadLib @@ -104868,6 +105082,8 @@ self: { pname = "ivory-examples"; version = "0.1.0.5"; sha256 = "539b65b7068f7dbcb128401ac4ec8c08ee2a0db074087cd923bbf38daf530356"; + revision = "1"; + editedCabalFile = "a83f6151b08ade845ef527ad07fcee41ac20bc02ba02fc8ee3786c278685da39"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -112348,26 +112564,26 @@ self: { "liblawless" = callPackage ({ mkDerivation, aeson, base, base-unicode-symbols, binary , boomerang, bytestring, containers, containers-unicode-symbols - , contravariant, data-default, data-textual, directory, dns - , exceptions, filepath, hjsonschema, lens, machines, mtl, network - , network-ip, parsers, protolude, QuickCheck, random, semigroups - , stm, stm-containers, temporary, test-framework + , contravariant, data-default, data-textual, dns, exceptions + , filepath, hjsonschema, lens, machines, mtl, network, network-ip + , parsers, pathtype, protolude, QuickCheck, random, semigroups, stm + , stm-containers, temporary, test-framework , test-framework-quickcheck2, test-framework-th, text, text-icu , text-icu-normalized, text-printer, time, transformers, zippers }: mkDerivation { pname = "liblawless"; - version = "0.16.0"; - sha256 = "4cca43195f8b30c0aa06840d402a61e2af1592b61c89aadf369f6390e841a856"; + version = "0.16.1"; + sha256 = "9598c6e717b1118057190f6a6f15977903956df374812e94049e78866b40578a"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base base-unicode-symbols binary boomerang bytestring containers containers-unicode-symbols contravariant data-default - data-textual directory dns exceptions filepath hjsonschema lens - machines mtl network network-ip parsers protolude QuickCheck random - semigroups stm stm-containers temporary text text-icu - text-icu-normalized text-printer time transformers zippers + data-textual dns exceptions hjsonschema lens machines mtl network + network-ip parsers pathtype protolude QuickCheck random semigroups + stm stm-containers temporary text text-icu text-icu-normalized + text-printer time transformers zippers ]; testHaskellDepends = [ aeson base binary bytestring exceptions filepath network QuickCheck @@ -113840,18 +114056,18 @@ self: { }) {}; "liquid" = callPackage - ({ mkDerivation, aeson, attoparsec, base, lens, lens-aeson, mtl - , QuickCheck, scientific, semigroups, tasty, tasty-hunit - , tasty-quickcheck, tasty-th, text, unordered-containers - , validation, vector + ({ mkDerivation, aeson, attoparsec, base, hashable, lens + , lens-aeson, mtl, QuickCheck, scientific, semigroups, tasty + , tasty-hunit, tasty-quickcheck, tasty-th, text + , unordered-containers, validation, vector }: mkDerivation { pname = "liquid"; - version = "0.1.0.2"; - sha256 = "7679068f8753564b193df76ad32680e59214a4e04c2f45869e57d7dcabc741b9"; + version = "0.1.0.3"; + sha256 = "c14d1b3dfbabbc4892369a24f67d29f3a172e9de87ac0132bf3121f86bcee90b"; libraryHaskellDepends = [ - aeson attoparsec base lens lens-aeson mtl scientific semigroups - text unordered-containers validation vector + aeson attoparsec base hashable lens lens-aeson mtl scientific + semigroups text unordered-containers validation vector ]; testHaskellDepends = [ aeson attoparsec base lens lens-aeson mtl QuickCheck scientific @@ -114498,8 +114714,8 @@ self: { }: mkDerivation { pname = "llvm-extra"; - version = "0.7"; - sha256 = "5f2e1fb4a4b8960ff7e10db014de90706e5d10504f88f89dbd8869f9d5921f20"; + version = "0.7.0.1"; + sha256 = "4928e405deff09451edce864558ce7b3276549ca7f1d71dac118dcbcafe15573"; libraryHaskellDepends = [ base containers cpuid llvm-tf non-empty tfp transformers unsafe utility-ht @@ -116612,8 +116828,8 @@ self: { }: mkDerivation { pname = "machinecell"; - version = "3.3.0"; - sha256 = "22c6cb0f81a4290e72d0fa266b71f094a6377cdc6518833a11dcc8cf8d131932"; + version = "3.3.1"; + sha256 = "5911832fa471797e5cbc5b4c98c1078f0bad799ba8cb33dbf0e19c6fae35619c"; libraryHaskellDepends = [ arrows base free mtl profunctors semigroups transformers ]; @@ -117505,6 +117721,31 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "mandrill_0_5_3_0" = callPackage + ({ mkDerivation, aeson, base, base64-bytestring, blaze-html + , bytestring, containers, email-validate, http-client + , http-client-tls, http-types, lens, mtl, old-locale, QuickCheck + , raw-strings-qq, tasty, tasty-hunit, tasty-quickcheck, text, time + , unordered-containers + }: + mkDerivation { + pname = "mandrill"; + version = "0.5.3.0"; + sha256 = "b022383dfbae3b6281a216924f508d9651849250a6dcadcedc9c30465fc5160d"; + libraryHaskellDepends = [ + aeson base base64-bytestring blaze-html bytestring containers + email-validate http-client http-client-tls http-types lens mtl + old-locale QuickCheck text time unordered-containers + ]; + testHaskellDepends = [ + aeson base bytestring QuickCheck raw-strings-qq tasty tasty-hunit + tasty-quickcheck text + ]; + description = "Library for interfacing with the Mandrill JSON API"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "mandulia" = callPackage ({ mkDerivation, array, base, bytestring, containers, directory , filepath, GLUT, hslua, time @@ -119969,6 +120210,24 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "mighty-metropolis_1_1_0" = callPackage + ({ mkDerivation, base, containers, mcmc-types, mwc-probability + , pipes, primitive, transformers + }: + mkDerivation { + pname = "mighty-metropolis"; + version = "1.1.0"; + sha256 = "2a8ac91fe51fa440347ce41edafca463fbf0d822fffca89796250e5e79143f6b"; + libraryHaskellDepends = [ + base mcmc-types mwc-probability pipes primitive transformers + ]; + testHaskellDepends = [ base containers mwc-probability ]; + homepage = "http://github.com/jtobin/mighty-metropolis"; + description = "The Metropolis algorithm"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "mikmod" = callPackage ({ mkDerivation, base, bytestring }: mkDerivation { @@ -124723,6 +124982,7 @@ self: { homepage = "https://github.com/lorenzo/mysql-haskell-nem#readme"; description = "Adds a interface like mysql-simple to mysql-haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mysql-haskell-openssl" = callPackage @@ -126330,8 +126590,8 @@ self: { ({ mkDerivation, base, bytestring, network, text, time, vector }: mkDerivation { pname = "network-carbon"; - version = "1.0.6"; - sha256 = "28e0a72d86be8a21637a62a83273311aab446b1d6e4a13f2638101aa6cd19ef6"; + version = "1.0.7"; + sha256 = "9cb794e29273aedf7f3fba7eed81a6a9f83791809095c22c11bf094a687dc9c0"; libraryHaskellDepends = [ base bytestring network text time vector ]; @@ -126895,6 +127155,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "network-transport-inmemory_0_5_2" = callPackage + ({ mkDerivation, base, bytestring, containers, data-accessor + , network-transport, network-transport-tests, stm + }: + mkDerivation { + pname = "network-transport-inmemory"; + version = "0.5.2"; + sha256 = "8245d795330157d90ad9de599854d119c6d8938a45ab8c4ec89f3160b2e9ef4e"; + libraryHaskellDepends = [ + base bytestring containers data-accessor network-transport stm + ]; + testHaskellDepends = [ + base network-transport network-transport-tests + ]; + homepage = "http://haskell-distributed.github.com"; + description = "In-memory instantiation of Network.Transport"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "network-transport-tcp" = callPackage ({ mkDerivation, base, bytestring, containers, data-accessor , network, network-transport, network-transport-tests @@ -127238,6 +127518,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "nfc" = callPackage + ({ mkDerivation, base, bytestring, c2hs, nfc }: + mkDerivation { + pname = "nfc"; + version = "0.0.1"; + sha256 = "524f46e2ccaacf26cd6058fbd7b1e9a27aa62a3338154d9209aa3b49d011d731"; + libraryHaskellDepends = [ base bytestring ]; + librarySystemDepends = [ nfc ]; + libraryToolDepends = [ c2hs ]; + homepage = "https://github.com/centromere/nfc#readme"; + description = "libnfc bindings"; + license = stdenv.lib.licenses.publicDomain; + }) {nfc = null;}; + "ngrams-loader" = callPackage ({ mkDerivation, attoparsec, base, machines, mtl, parseargs , resourcet, sqlite-simple, text @@ -128823,15 +129117,15 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "octane_0_18_0" = callPackage + "octane_0_18_1" = callPackage ({ mkDerivation, aeson, base, bimap, binary, bytestring, containers , data-default-class, file-embed, http-client, http-client-tls , overloaded-records, rattletrap, text }: mkDerivation { pname = "octane"; - version = "0.18.0"; - sha256 = "cf92a63584772d60388b550d93d73f08bac3a26b21c4ad2dc6003837e1e9674f"; + version = "0.18.1"; + sha256 = "0531b90b093b4e89f183801cdf7c4220adf7c118d90aba00db2968d3e0b7604b"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -130532,17 +130826,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "optparse-generic_1_1_3" = callPackage - ({ mkDerivation, base, bytestring, optparse-applicative + "optparse-generic_1_1_4" = callPackage + ({ mkDerivation, base, bytestring, optparse-applicative, semigroups , system-filepath, text, time, transformers, void }: mkDerivation { pname = "optparse-generic"; - version = "1.1.3"; - sha256 = "aa999234f55296f2c82a05f2ba9e7e418065ae60c826569e6590f021be7321a0"; + version = "1.1.4"; + sha256 = "dc69bc73d6e3de52bcc5c4ccd8ce741eebb8d10747bc7f819b38b0cdaf1e520c"; libraryHaskellDepends = [ - base bytestring optparse-applicative system-filepath text time - transformers void + base bytestring optparse-applicative semigroups system-filepath + text time transformers void ]; description = "Auto-generate a command-line parser for your datatype"; license = stdenv.lib.licenses.bsd3; @@ -133606,6 +133900,8 @@ self: { pname = "peano"; version = "0.1.0.1"; sha256 = "31fdd23993a76155738224a7b230a1a6fcfde091b2fbc945df4cb54068eeec7b"; + revision = "1"; + editedCabalFile = "544dd9ba3e8a67303b376ebcd5c000bdcd977c67475c058a2579be75ce8ec469"; libraryHaskellDepends = [ base ]; description = "Peano numbers"; license = "unknown"; @@ -134793,23 +135089,6 @@ self: { }) {}; "pgp-wordlist" = callPackage - ({ mkDerivation, base, bytestring, containers, HUnit, tasty - , tasty-hunit, tasty-quickcheck, text, vector - }: - mkDerivation { - pname = "pgp-wordlist"; - version = "0.1.0.1"; - sha256 = "a3dde976bc94fc83e8dce20cdafe673f5afdc741ac0360098ee8b415a0436d88"; - libraryHaskellDepends = [ base bytestring containers text vector ]; - testHaskellDepends = [ - base bytestring HUnit tasty tasty-hunit tasty-quickcheck text - ]; - homepage = "https://github.com/quchen/pgp-wordlist"; - description = "Translate between binary data and a human-readable collection of words"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "pgp-wordlist_0_1_0_2" = callPackage ({ mkDerivation, base, bytestring, containers, deepseq, doctest , HUnit, tasty, tasty-hunit, tasty-quickcheck, text, vector }: @@ -134825,7 +135104,6 @@ self: { homepage = "https://github.com/quchen/pgp-wordlist"; description = "Translate between binary data and a human-readable collection of words"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pgsql-simple" = callPackage @@ -135485,14 +135763,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "pipes_4_3_1" = callPackage + "pipes_4_3_2" = callPackage ({ mkDerivation, base, exceptions, mmorph, mtl, QuickCheck , test-framework, test-framework-quickcheck2, transformers }: mkDerivation { pname = "pipes"; - version = "4.3.1"; - sha256 = "35a6e296e04f992bcda28ffedf1774e23c866b6ac79025f50ee5226bda3fd001"; + version = "4.3.2"; + sha256 = "7957bb290db7f1dfad0581f363ab97fcd58f7c0b916e1114464cb9a398b8334a"; libraryHaskellDepends = [ base exceptions mmorph mtl transformers ]; @@ -135671,6 +135949,7 @@ self: { homepage = "https://github.com/centromere/pipes-cacophony"; description = "Pipes for Noise-secured network connections"; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pipes-cellular" = callPackage @@ -135953,6 +136232,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "pipes-http_1_0_5" = callPackage + ({ mkDerivation, base, bytestring, http-client, http-client-tls + , pipes + }: + mkDerivation { + pname = "pipes-http"; + version = "1.0.5"; + sha256 = "49a196466de1638f3806a49bf10fef9eb3c06456ababf09ffd025b6b64f23055"; + libraryHaskellDepends = [ + base bytestring http-client http-client-tls pipes + ]; + description = "HTTP client with pipes interface"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "pipes-illumina" = callPackage ({ mkDerivation, base, bytestring, directory, filepath, pipes , pipes-bgzf @@ -138848,6 +139143,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "preamble" = callPackage + ({ mkDerivation, aeson, base, basic-prelude, exceptions + , fast-logger, lens, monad-control, monad-logger, mtl, resourcet + , safe, shake, template-haskell, text, text-manipulate, time + , transformers-base, unordered-containers + }: + mkDerivation { + pname = "preamble"; + version = "0.0.3"; + sha256 = "5a4a1a4fa8dcad02d6afbdc99b44d4f9e94571b48b88115b7d1ebb266f776a73"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base basic-prelude exceptions fast-logger lens monad-control + monad-logger mtl resourcet safe template-haskell text + text-manipulate time transformers-base unordered-containers + ]; + executableHaskellDepends = [ base basic-prelude shake ]; + homepage = "https://github.com/swift-nav/preamble"; + description = "Yet another prelude"; + license = stdenv.lib.licenses.mit; + }) {}; + "precis" = callPackage ({ mkDerivation, base, Cabal, containers, cpphs, directory , filepath, haskell-src-exts, xhtml @@ -139403,15 +139721,16 @@ self: { }) {}; "pretty-simple" = callPackage - ({ mkDerivation, base, doctest, Glob, lens, mono-traversable, mtl - , parsec, semigroups, transformers + ({ mkDerivation, ansi-terminal, base, doctest, Glob, lens + , mono-traversable, mtl, parsec, semigroups, transformers }: mkDerivation { pname = "pretty-simple"; - version = "0.1.0.0"; - sha256 = "baaf4d5d8aba866e2419b66a67ed3b55a35f9e8e1f40c6c77e2dab21dda1caae"; + version = "0.2.0.0"; + sha256 = "f4f9141b0b816ad56918bb92daba2b62295207eb3119afcc3c2baf2ae46bb4d3"; libraryHaskellDepends = [ - base lens mono-traversable mtl parsec semigroups transformers + ansi-terminal base lens mono-traversable mtl parsec semigroups + transformers ]; testHaskellDepends = [ base doctest Glob ]; homepage = "https://github.com/cdepillabout/pretty-simple"; @@ -142239,8 +142558,8 @@ self: { }: mkDerivation { pname = "qr-imager"; - version = "0.1.0.0"; - sha256 = "400145049487f03edc3d249bf44afa596db328e98f1e616c378a83f32fbd129a"; + version = "0.1.0.1"; + sha256 = "2936851586f3e63e7e4aa589d06d88cb6968f5e2c5861f71df62a89fc43d7ef9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -144212,8 +144531,8 @@ self: { }: mkDerivation { pname = "rattletrap"; - version = "2.0.0"; - sha256 = "a58e5c7b1c5e8318ab552ac204248075cf1d8adb6024555f0b06d99de6c750ba"; + version = "2.1.0"; + sha256 = "d969cf852a2210f11a51f21b75f3c16a47a0dc92b695a6ae11c9287ddfe30588"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -147844,6 +148163,26 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; + "resolve-trivial-conflicts_0_3_2_4" = callPackage + ({ mkDerivation, ansi-terminal, base, base-compat, Diff, directory + , filepath, mtl, optparse-applicative, process, unix + }: + mkDerivation { + pname = "resolve-trivial-conflicts"; + version = "0.3.2.4"; + sha256 = "62c38ac7859b1f2201e0e79dbfc5d3446b4fb2fd4164cef8c016093f79ae2221"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + ansi-terminal base base-compat Diff directory filepath mtl + optparse-applicative process unix + ]; + homepage = "https://github.com/ElastiLotem/resolve-trivial-conflicts"; + description = "Remove trivial conflict markers in a git repository"; + license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "resource-effect" = callPackage ({ mkDerivation, base, containers, extensible-effects, HUnit, mtl , QuickCheck, test-framework, test-framework-hunit @@ -147966,6 +148305,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "resourcet_1_1_9" = callPackage + ({ mkDerivation, base, containers, exceptions, hspec, lifted-base + , mmorph, monad-control, mtl, transformers, transformers-base + , transformers-compat + }: + mkDerivation { + pname = "resourcet"; + version = "1.1.9"; + sha256 = "5a1999d26b896603cab8121b77f36723dc50960291872b691ff4a9533e162ef5"; + libraryHaskellDepends = [ + base containers exceptions lifted-base mmorph monad-control mtl + transformers transformers-base transformers-compat + ]; + testHaskellDepends = [ base hspec lifted-base transformers ]; + homepage = "http://github.com/snoyberg/conduit"; + description = "Deterministic allocation and freeing of scarce resources"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "respond" = callPackage ({ mkDerivation, aeson, base, bifunctors, bytestring, containers , data-default-class, exceptions, fast-logger, formatting, HList @@ -149145,7 +149504,7 @@ self: { homepage = "http://github.com/agrafix/rocksdb-haskell"; description = "Haskell bindings to RocksDB"; license = stdenv.lib.licenses.bsd3; - platforms = [ "x86_64-darwin" "x86_64-linux" ]; + platforms = [ "x86_64-linux" ]; }) {inherit (pkgs) rocksdb;}; "roguestar" = callPackage @@ -151581,6 +151940,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "schema" = callPackage + ({ mkDerivation, base, hspec, QuickCheck }: + mkDerivation { + pname = "schema"; + version = "0.0.1"; + sha256 = "27466a6eaa757f9f3d2556cff139f64c27e5eb9ff81627fa118467607b92a70c"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base hspec QuickCheck ]; + homepage = "https://toktok.github.io/"; + description = "Encoding-independent schemas for Haskell data types"; + license = stdenv.lib.licenses.agpl3; + }) {}; + "scholdoc" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, binary, blaze-html , blaze-markup, bytestring, containers, data-default, Diff @@ -154201,19 +154573,19 @@ self: { }) {}; "servant-elm" = callPackage - ({ mkDerivation, aeson, base, data-default, directory, elm-export - , formatting, hspec, interpolate, lens, mockery, process, servant - , servant-foreign, text + ({ mkDerivation, aeson, base, data-default, Diff, directory + , elm-export, hspec, HUnit, interpolate, lens, mockery, process + , servant, servant-foreign, text, wl-pprint-text }: mkDerivation { pname = "servant-elm"; - version = "0.2.0.0"; - sha256 = "0a120bc909b14390ef43db690f050b6afd1b9ac72a25586c5734e007c2ea4fda"; + version = "0.3.0.0"; + sha256 = "fc502005a21cb91845c069366f60ddfa77deeb95cb6571bcd2df172e5285439b"; libraryHaskellDepends = [ - base elm-export formatting lens servant servant-foreign text + base elm-export lens servant servant-foreign text wl-pprint-text ]; testHaskellDepends = [ - aeson base data-default directory elm-export formatting hspec + aeson base data-default Diff directory elm-export hspec HUnit interpolate mockery process servant text ]; homepage = "http://github.com/mattjbray/servant-elm#readme"; @@ -154871,6 +155243,35 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "servant-swagger-ui_0_2_1_2_2_8" = callPackage + ({ mkDerivation, aeson, base, base-compat, blaze-markup, bytestring + , directory, file-embed, filepath, http-media, lens, servant + , servant-blaze, servant-server, servant-swagger, swagger2 + , template-haskell, text, transformers, transformers-compat, wai + , wai-app-static, warp + }: + mkDerivation { + pname = "servant-swagger-ui"; + version = "0.2.1.2.2.8"; + sha256 = "21a25df5c3527a859a14ae2edf12116d8634e7be1587357f4545f31fc5acb3a4"; + libraryHaskellDepends = [ + base blaze-markup bytestring directory file-embed filepath + http-media servant servant-blaze servant-server servant-swagger + swagger2 template-haskell text transformers transformers-compat + wai-app-static + ]; + testHaskellDepends = [ + aeson base base-compat blaze-markup bytestring directory file-embed + filepath http-media lens servant servant-blaze servant-server + servant-swagger swagger2 template-haskell text transformers + transformers-compat wai wai-app-static warp + ]; + homepage = "https://github.com/phadej/servant-swagger-ui#readme"; + description = "Servant swagger ui"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "servant-yaml" = callPackage ({ mkDerivation, aeson, base, base-compat, bytestring, http-media , servant, servant-server, wai, warp, yaml @@ -155392,8 +155793,8 @@ self: { ({ mkDerivation, base, bytestring, template-haskell, text }: mkDerivation { pname = "sext"; - version = "0.1.0.2"; - sha256 = "b5101154373eac70dee9d56854333ea33735a88b7697f2877846c746dd048c3a"; + version = "0.1.1"; + sha256 = "d954401c7c416ff8d6c8783c074c061f8268fb0042d553253afd82881284151d"; libraryHaskellDepends = [ base bytestring template-haskell text ]; homepage = "http://github.com/dzhus/sext/"; description = "Lists, Texts and ByteStrings with type-encoded length"; @@ -158996,6 +159397,7 @@ self: { homepage = "http://snapframework.com/"; description = "Snap dynamic loader"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "snap-loader-static" = callPackage @@ -159108,6 +159510,7 @@ self: { homepage = "http://snapframework.com/"; description = "Scaffolding CLI for the Snap Framework"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "snap-testing" = callPackage @@ -159868,6 +160271,7 @@ self: { homepage = "https://github.com/nurpax/snaplet-sqlite-simple-jwt-auth#readme"; description = "Snaplet for JWT authentication with snaplet-sqlite-simple"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "snaplet-stripe" = callPackage @@ -160241,30 +160645,6 @@ self: { }: mkDerivation { pname = "soap"; - version = "0.2.3.2"; - sha256 = "e7e5d21f70d67f14806a44f7328350d0f06b39ad4cbbc5a514437c5ddfb95395"; - libraryHaskellDepends = [ - base bytestring conduit configurator data-default exceptions - http-client http-types iconv mtl resourcet text - unordered-containers xml-conduit xml-conduit-writer xml-types - ]; - testHaskellDepends = [ - base bytestring hspec HUnit text unordered-containers xml-conduit - xml-conduit-writer - ]; - homepage = "https://bitbucket.org/dpwiz/haskell-soap"; - description = "SOAP client tools"; - license = stdenv.lib.licenses.mit; - }) {}; - - "soap_0_2_3_3" = callPackage - ({ mkDerivation, base, bytestring, conduit, configurator - , data-default, exceptions, hspec, http-client, http-types, HUnit - , iconv, mtl, resourcet, text, unordered-containers, xml-conduit - , xml-conduit-writer, xml-types - }: - mkDerivation { - pname = "soap"; version = "0.2.3.3"; sha256 = "2d1759c83bc75cacc470ffc64af218f971d55875a61c2de10be1276bd9845979"; libraryHaskellDepends = [ @@ -160279,7 +160659,6 @@ self: { homepage = "https://bitbucket.org/dpwiz/haskell-soap"; description = "SOAP client tools"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "soap-openssl" = callPackage @@ -161256,6 +161635,24 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "speedy-slice_0_2_0" = callPackage + ({ mkDerivation, base, containers, lens, mcmc-types + , mwc-probability, pipes, primitive, transformers + }: + mkDerivation { + pname = "speedy-slice"; + version = "0.2.0"; + sha256 = "9ae1b3241624bfb5e656347cca1f598ae9b67b1abe23b00ddf8d3d5925234963"; + libraryHaskellDepends = [ + base lens mcmc-types mwc-probability pipes primitive transformers + ]; + testHaskellDepends = [ base containers mwc-probability ]; + homepage = "http://github.com/jtobin/speedy-slice"; + description = "Speedy slice sampling"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "spelling-suggest" = callPackage ({ mkDerivation, base, edit-distance, parseargs, phonetic-code , sqlite @@ -161759,6 +162156,7 @@ self: { ]; description = "Web interface to sproxy database"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sproxy2" = callPackage @@ -161968,6 +162366,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "sqlite-simple_0_4_12_1" = callPackage + ({ mkDerivation, attoparsec, base, base16-bytestring, blaze-builder + , blaze-textual, bytestring, containers, direct-sqlite, HUnit, text + , time, transformers + }: + mkDerivation { + pname = "sqlite-simple"; + version = "0.4.12.1"; + sha256 = "2f24f4dfea3b3bc1657b26c786666abd041bb89e09c22d084eaea43d67112227"; + libraryHaskellDepends = [ + attoparsec base blaze-builder blaze-textual bytestring containers + direct-sqlite text time transformers + ]; + testHaskellDepends = [ + base base16-bytestring bytestring direct-sqlite HUnit text time + ]; + homepage = "http://github.com/nurpax/sqlite-simple"; + description = "Mid-Level SQLite client library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "sqlite-simple-errors" = callPackage ({ mkDerivation, base, mtl, parsec, sqlite-simple, text }: mkDerivation { @@ -163991,23 +164411,11 @@ self: { ({ mkDerivation, base, byteorder }: mkDerivation { pname = "storable-endian"; - version = "0.2.5"; - sha256 = "e206eecf9480e937347ad0663f6c588da490606a1e55b871c68da8c7c1b44112"; - libraryHaskellDepends = [ base byteorder ]; - description = "Storable instances with endianness"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "storable-endian_0_2_6" = callPackage - ({ mkDerivation, base, byteorder }: - mkDerivation { - pname = "storable-endian"; version = "0.2.6"; sha256 = "3743ac8f084ed3187b83f17b4fac280e77c5df01f7910f42b6a1bf09d5a65489"; libraryHaskellDepends = [ base byteorder ]; description = "Storable instances with endianness"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "storable-record" = callPackage @@ -168288,23 +168696,6 @@ self: { }) {}; "tasty-ant-xml" = callPackage - ({ mkDerivation, base, containers, generic-deriving, ghc-prim, mtl - , stm, tagged, tasty, transformers, xml - }: - mkDerivation { - pname = "tasty-ant-xml"; - version = "1.0.2"; - sha256 = "bbc3cc6741597af6b158bb54345d7356c98b50eb8b493abd38178a471915ff5d"; - libraryHaskellDepends = [ - base containers generic-deriving ghc-prim mtl stm tagged tasty - transformers xml - ]; - homepage = "http://github.com/ocharles/tasty-ant-xml"; - description = "Render tasty output to XML for Jenkins"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "tasty-ant-xml_1_0_3" = callPackage ({ mkDerivation, base, containers, directory, filepath , generic-deriving, ghc-prim, mtl, stm, tagged, tasty, transformers , xml @@ -168320,7 +168711,6 @@ self: { homepage = "http://github.com/ocharles/tasty-ant-xml"; description = "Render tasty output to XML for Jenkins"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tasty-dejafu" = callPackage @@ -171613,34 +172003,6 @@ self: { }: mkDerivation { pname = "these"; - version = "0.7.2"; - sha256 = "a1d22644ca30b0bf549ed9881fcadc9f93fac0ec4815008496ca16e83a966dc8"; - revision = "1"; - editedCabalFile = "f1720c052d70f405e05c3c7a022d25c20afc5391dfbe179e80d3e671311594d8"; - libraryHaskellDepends = [ - aeson base bifunctors binary containers data-default-class deepseq - hashable keys mtl profunctors QuickCheck semigroupoids transformers - transformers-compat unordered-containers vector vector-instances - ]; - testHaskellDepends = [ - aeson base bifunctors binary containers hashable QuickCheck - quickcheck-instances tasty tasty-quickcheck transformers - unordered-containers vector - ]; - homepage = "https://github.com/isomorphism/these"; - description = "An either-or-both data type & a generalized 'zip with padding' typeclass"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "these_0_7_3" = callPackage - ({ mkDerivation, aeson, base, bifunctors, binary, containers - , data-default-class, deepseq, hashable, keys, mtl, profunctors - , QuickCheck, quickcheck-instances, semigroupoids, tasty - , tasty-quickcheck, transformers, transformers-compat - , unordered-containers, vector, vector-instances - }: - mkDerivation { - pname = "these"; version = "0.7.3"; sha256 = "14339c111ec2caffcb2a9f64164a5dc307a0afb716925ddcb1774d9d442a3d9b"; libraryHaskellDepends = [ @@ -171656,7 +172018,6 @@ self: { homepage = "https://github.com/isomorphism/these"; description = "An either-or-both data type & a generalized 'zip with padding' typeclass"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "thespian" = callPackage @@ -172144,8 +172505,8 @@ self: { }: mkDerivation { pname = "tidal-midi"; - version = "0.8"; - sha256 = "dd8d39af0871a730017c712624fc86ba5c25add7737511610ac849d9d54bcd79"; + version = "0.8.2"; + sha256 = "3638e4d7f853d1a73929624ec34b2364469339b0c821567cf8b46c78971c8339"; libraryHaskellDepends = [ base containers PortMidi tidal time transformers ]; @@ -172487,24 +172848,6 @@ self: { }: mkDerivation { pname = "time-parsers"; - version = "0.1.1.0"; - sha256 = "872d2ad4727ed7ac00a06b2acb7d7965da04d432c2d45017805fd4e6975d6ab2"; - libraryHaskellDepends = [ base parsers template-haskell time ]; - testHaskellDepends = [ - attoparsec base bifunctors parsec parsers tasty tasty-hunit - template-haskell text time - ]; - homepage = "https://github.com/phadej/time-parsers#readme"; - description = "Parsers for types in `time`"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "time-parsers_0_1_2_0" = callPackage - ({ mkDerivation, attoparsec, base, bifunctors, parsec, parsers - , tasty, tasty-hunit, template-haskell, text, time - }: - mkDerivation { - pname = "time-parsers"; version = "0.1.2.0"; sha256 = "4e50d40f13f8e6c5175be22b91586f909607ecb631f8209ff45bce2031bb3c24"; libraryHaskellDepends = [ base parsers template-haskell time ]; @@ -172515,7 +172858,6 @@ self: { homepage = "https://github.com/phadej/time-parsers#readme"; description = "Parsers for types in `time`"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "time-patterns" = callPackage @@ -179371,30 +179713,6 @@ self: { }) {}; "uuid" = callPackage - ({ mkDerivation, base, binary, bytestring, cryptonite, HUnit - , memory, network-info, QuickCheck, random, tasty, tasty-hunit - , tasty-quickcheck, text, time, uuid-types - }: - mkDerivation { - pname = "uuid"; - version = "1.3.12"; - sha256 = "ed62f1b3f0b19f0d548655ffef5aff066ad5c430fe11e909a1a7e8fc115a89ee"; - revision = "3"; - editedCabalFile = "5444a4c5a15bdfd193d50fa7cc6c248fe18cc18810fb3f878a0e3d4dc81a8f21"; - libraryHaskellDepends = [ - base binary bytestring cryptonite memory network-info random text - time uuid-types - ]; - testHaskellDepends = [ - base bytestring HUnit QuickCheck random tasty tasty-hunit - tasty-quickcheck - ]; - homepage = "https://github.com/aslatter/uuid"; - description = "For creating, comparing, parsing and printing Universally Unique Identifiers"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "uuid_1_3_13" = callPackage ({ mkDerivation, base, binary, bytestring, cryptohash-md5 , cryptohash-sha1, entropy, HUnit, network-info, QuickCheck, random , tasty, tasty-hunit, tasty-quickcheck, text, time, uuid-types @@ -179414,7 +179732,6 @@ self: { homepage = "https://github.com/hvr/uuid"; description = "For creating, comparing, parsing and printing Universally Unique Identifiers"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "uuid-aeson" = callPackage @@ -180940,25 +181257,12 @@ self: { ({ mkDerivation, base, doctest, ghc-prim, lens, singletons }: mkDerivation { pname = "vinyl"; - version = "0.5.2"; - sha256 = "93ac95aada665057df04bd1316c6eb5bef72479420199ebf34715684afe6a70b"; - libraryHaskellDepends = [ base ghc-prim ]; - testHaskellDepends = [ base doctest lens singletons ]; - description = "Extensible Records"; - license = stdenv.lib.licenses.mit; - }) {}; - - "vinyl_0_5_3" = callPackage - ({ mkDerivation, base, doctest, ghc-prim, lens, singletons }: - mkDerivation { - pname = "vinyl"; version = "0.5.3"; sha256 = "00f86a43def432c564226daae42b130a67c5fb413f3b097f43a14fbfb57608a6"; libraryHaskellDepends = [ base ghc-prim ]; testHaskellDepends = [ base doctest lens singletons ]; description = "Extensible Records"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "vinyl-gl" = callPackage @@ -182504,6 +182808,7 @@ self: { homepage = "https://github.com/scotty-web/wai-middleware-static"; description = "WAI middleware that serves requests to static files"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wai-middleware-static-caching" = callPackage @@ -182657,8 +182962,8 @@ self: { }: mkDerivation { pname = "wai-routes"; - version = "0.9.8"; - sha256 = "4152d74a8b0b762b448b112d391e8b760efb7b71444c5b9f58ed714d87331071"; + version = "0.9.9"; + sha256 = "dea8b6b8163fe04bf0ffb9f5a81058eef2017591275735aba7ae448edf689cc9"; libraryHaskellDepends = [ aeson base blaze-builder bytestring case-insensitive containers cookie data-default-class filepath http-types mime-types @@ -183222,6 +183527,7 @@ self: { homepage = "https://github.com/mrkkrp/wave"; description = "Work with WAVE and RF64 files"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wavefront" = callPackage @@ -183392,10 +183698,8 @@ self: { }: mkDerivation { pname = "web-inv-route"; - version = "0.1"; - sha256 = "8973080f0a59429cf97ed1ac0d1060b864f6a25f577c3e150ff0f0a3635ac8fa"; - revision = "1"; - editedCabalFile = "7e68be5f41dbc5f47d7f38f017f0f676eaf962a8fa56142ce491c8882165d28d"; + version = "0.1.1"; + sha256 = "ee4f71874d82c1868fff17a2276363454594f898f5db8c8c210479e5a5383b9a"; libraryHaskellDepends = [ base bytestring case-insensitive containers happstack-server hashable http-types invertible network-uri snap-core text @@ -183616,19 +183920,18 @@ self: { }) {}; "web3" = callPackage - ({ mkDerivation, aeson, attoparsec, base, base16-bytestring, binary - , bytestring, cryptonite, data-default-class, http-client - , http-client-tls, memory, mtl, template-haskell, text - , transformers, vector + ({ mkDerivation, aeson, attoparsec, base, base16-bytestring + , bytestring, cryptonite, data-default-class, http-client, memory + , mtl, template-haskell, text, transformers, vector }: mkDerivation { pname = "web3"; - version = "0.3.2.1"; - sha256 = "1764b645a09a6a5fdcec05f100cd7c36a542c612da624345100662535783d2b3"; + version = "0.3.4.0"; + sha256 = "64218b2f2f2319fe137834bbb012e948444f80f88e3da03ee6ecff06b5ecfe27"; libraryHaskellDepends = [ - aeson attoparsec base base16-bytestring binary bytestring - cryptonite data-default-class http-client http-client-tls memory - mtl template-haskell text transformers vector + aeson attoparsec base base16-bytestring bytestring cryptonite + data-default-class http-client memory mtl template-haskell text + transformers vector ]; testHaskellDepends = [ base memory text ]; homepage = "https://github.com/airalab/hs-web3#readme"; @@ -183790,6 +184093,7 @@ self: { homepage = "https://github.com/kallisti-dev/hs-webdriver"; description = "a Haskell client for the Selenium WebDriver protocol"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "webdriver-angular" = callPackage @@ -183812,6 +184116,7 @@ self: { homepage = "https://bitbucket.org/wuzzeb/webdriver-utils"; description = "Webdriver actions to assist with testing a webpage which uses Angular.Js"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "webdriver-snoy" = callPackage @@ -184967,16 +185272,16 @@ self: { , conduit-combinators, conduit-extra, directory, exceptions , fast-logger, filemanip, formatting, http-conduit, http-types , lens, lifted-async, lifted-base, monad-control, monad-logger, mtl - , mtl-compat, optparse-applicative, optparse-generic, process - , regex-applicative, regex-compat, resourcet, safe, shake, shelly - , system-filepath, tasty, tasty-hunit, template-haskell, text - , text-manipulate, time, transformers, transformers-base + , mtl-compat, optparse-applicative, optparse-generic, preamble + , process, regex-applicative, regex-compat, resourcet, safe, shake + , shelly, system-filepath, tasty, tasty-hunit, template-haskell + , text, text-manipulate, time, transformers, transformers-base , unordered-containers, uuid, yaml, zlib }: mkDerivation { pname = "wolf"; - version = "0.3.0"; - sha256 = "ec7b4b7f3a8eca648d1b31c637dfac10c40a80afc0d72649cdf0308e1170fcc8"; + version = "0.3.1"; + sha256 = "441d7c82cca74e12fd097ebb3b4d5e3c7b2e3dff4145e65e00a9fd9f57ee224b"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -184984,9 +185289,10 @@ self: { basic-prelude bytestring conduit conduit-combinators conduit-extra directory exceptions fast-logger filemanip formatting http-conduit http-types lens lifted-async lifted-base monad-control monad-logger - mtl mtl-compat optparse-applicative process regex-applicative - regex-compat resourcet safe template-haskell text text-manipulate - time transformers transformers-base unordered-containers uuid yaml + mtl mtl-compat optparse-applicative preamble process + regex-applicative regex-compat resourcet safe template-haskell text + text-manipulate time transformers transformers-base + unordered-containers uuid yaml ]; executableHaskellDepends = [ aeson amazonka-core async base basic-prelude bytestring directory @@ -185447,21 +185753,6 @@ self: { }: mkDerivation { pname = "writer-cps-mtl"; - version = "0.1.1.0"; - sha256 = "c8c17d4112fc851d3b48fd52ee1c5dc44c29b0e85dec73ddc8fa9a2415e99dd3"; - libraryHaskellDepends = [ - base mtl transformers writer-cps-transformers - ]; - homepage = "https://github.com/minad/writer-cps-mtl#readme"; - description = "MonadWriter orphan instances for writer-cps-transformers"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "writer-cps-mtl_0_1_1_1" = callPackage - ({ mkDerivation, base, mtl, transformers, writer-cps-transformers - }: - mkDerivation { - pname = "writer-cps-mtl"; version = "0.1.1.1"; sha256 = "db7f45ebceb3ecb166422c53d0a80a1c9bece8a958a3a9e4d15d75ada02bbf97"; libraryHaskellDepends = [ @@ -185470,7 +185761,6 @@ self: { homepage = "https://github.com/minad/writer-cps-mtl#readme"; description = "MonadWriter orphan instances for writer-cps-transformers"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "writer-cps-transformers" = callPackage @@ -185693,6 +185983,17 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "wxSimpleCanvas" = callPackage + ({ mkDerivation, base, cubicbezier, wx, wxcore }: + mkDerivation { + pname = "wxSimpleCanvas"; + version = "0.0.0.0"; + sha256 = "a2200569c49f7b6dcefe39ddc374d5325cb1fd9c001772edb340a8ba9b6c2061"; + libraryHaskellDepends = [ base cubicbezier wx wxcore ]; + description = "Simple zoomable canvas for wxHaskell"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "wxc" = callPackage ({ mkDerivation, base, libX11, mesa, split, wxdirect, wxGTK }: mkDerivation { @@ -186491,7 +186792,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "xlsx_0_3_0" = callPackage + "xlsx_0_4_0" = callPackage ({ mkDerivation, base, base64-bytestring, binary-search, bytestring , conduit, containers, data-default, Diff, errors, extra, filepath , groom, lens, mtl, mtl-compat, network-uri, old-locale @@ -186501,8 +186802,8 @@ self: { }: mkDerivation { pname = "xlsx"; - version = "0.3.0"; - sha256 = "6d941e2fdc757384d417c50db35f84aa0413b940baf6ec49fdba597cd68c11b3"; + version = "0.4.0"; + sha256 = "1cb379b7cbc0783831f352d034c307a414bb2f1de158b5aec2a4c7cbebaee16a"; libraryHaskellDepends = [ base base64-bytestring binary-search bytestring conduit containers data-default errors extra filepath lens mtl mtl-compat network-uri @@ -186511,7 +186812,7 @@ self: { ]; testHaskellDepends = [ base bytestring containers Diff groom lens mtl raw-strings-qq - smallcheck tasty tasty-hunit tasty-smallcheck time vector + smallcheck tasty tasty-hunit tasty-smallcheck text time vector xml-conduit ]; homepage = "https://github.com/qrilka/xlsx"; @@ -189616,8 +189917,8 @@ self: { }: mkDerivation { pname = "yesod-persistent"; - version = "1.4.0.6"; - sha256 = "69c1261b49a6448795d569431691115fc6b86f7b296905573f5b2271465dee71"; + version = "1.4.1.0"; + sha256 = "98f422757210b30b2bd0d75828408a9fb1d67fa81e02ec304848c1922da4e91c"; libraryHaskellDepends = [ base blaze-builder conduit persistent persistent-template resource-pool resourcet transformers yesod-core @@ -189631,15 +189932,15 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "yesod-persistent_1_4_1_0" = callPackage + "yesod-persistent_1_4_1_1" = callPackage ({ mkDerivation, base, blaze-builder, conduit, hspec, persistent , persistent-sqlite, persistent-template, resource-pool, resourcet , text, transformers, wai-extra, yesod-core }: mkDerivation { pname = "yesod-persistent"; - version = "1.4.1.0"; - sha256 = "98f422757210b30b2bd0d75828408a9fb1d67fa81e02ec304848c1922da4e91c"; + version = "1.4.1.1"; + sha256 = "dffd2604fc37a6b518c06391c44059df96895e3b484d4de8fbff9ff0869e7551"; libraryHaskellDepends = [ base blaze-builder conduit persistent persistent-template resource-pool resourcet transformers yesod-core @@ -191520,30 +191821,6 @@ self: { }: mkDerivation { pname = "zip"; - version = "0.1.3"; - sha256 = "9e7a79126ab12c198efcae67dd07f860213ce5a6afb2217053f0342ffdb9e6d1"; - libraryHaskellDepends = [ - base bytestring bzlib-conduit case-insensitive cereal conduit - conduit-extra containers digest exceptions filepath mtl path - path-io plan-b resourcet text time transformers - ]; - testHaskellDepends = [ - base bytestring conduit containers exceptions filepath hspec path - path-io QuickCheck text time transformers - ]; - homepage = "https://github.com/mrkkrp/zip"; - description = "Operations on zip archives"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "zip_0_1_4" = callPackage - ({ mkDerivation, base, bytestring, bzlib-conduit, case-insensitive - , cereal, conduit, conduit-extra, containers, digest, exceptions - , filepath, hspec, mtl, path, path-io, plan-b, QuickCheck - , resourcet, text, time, transformers - }: - mkDerivation { - pname = "zip"; version = "0.1.4"; sha256 = "073c9f8320ed16048d099fbec10c42a76ae0bcbd13e344fd0ca99f3a6716db78"; libraryHaskellDepends = [ @@ -191558,7 +191835,6 @@ self: { homepage = "https://github.com/mrkkrp/zip"; description = "Operations on zip archives"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "zip-archive" = callPackage diff --git a/pkgs/development/libraries/boehm-gc/cygwin.patch b/pkgs/development/libraries/boehm-gc/cygwin.patch deleted file mode 100644 index 25c6b9f06f31..000000000000 --- a/pkgs/development/libraries/boehm-gc/cygwin.patch +++ /dev/null @@ -1,108 +0,0 @@ ---- gc-7.2/include/gc.h 2014-06-01 19:00:48.000000000 +0200 -+++ gc-7.2/include/gc.h 2015-05-27 12:55:42.248984200 +0200 -@@ -1386,7 +1386,14 @@ - /* THREAD_LOCAL_ALLOC defined and the initial allocation call is not */ - /* to GC_malloc() or GC_malloc_atomic(). */ - --#ifdef __CYGWIN32__ -+#ifdef __CYGWIN__ -+#ifdef __x86_64__ -+ extern int __data_start__[], __data_end__[], __bss_start__[], __bss_end__[]; -+#define GC_DATASTART (__data_start__ < __bss_start__ ?\ -+ (void *)__data_start__ : (void *)__bss_start__) -+#define GC_DATAEND (__data_end__ < __bss_end__ ?\ -+ (void *)__data_end__ : (void *)__bss_end__) -+#else - /* Similarly gnu-win32 DLLs need explicit initialization from the */ - /* main program, as does AIX. */ - extern int _data_start__[], _data_end__[], _bss_start__[], _bss_end__[]; -@@ -1394,6 +1401,7 @@ - (void *)_data_start__ : (void *)_bss_start__) - # define GC_DATAEND (_data_end__ > _bss_end__ ? \ - (void *)_data_end__ : (void *)_bss_end__) -+#endif - # define GC_INIT_CONF_ROOTS GC_add_roots(GC_DATASTART, GC_DATAEND); \ - GC_gcollect() /* For blacklisting. */ - /* Required at least if GC is in a DLL. And doesn't hurt. */ ---- gc-7.2/include/private/gcconfig.h 2014-06-01 19:00:48.000000000 +0200 -+++ gc-7.2/include/private/gcconfig.h 2015-05-27 12:46:01.864338700 +0200 -@@ -441,10 +441,20 @@ - # endif - # define mach_type_known - # endif --# if defined(__CYGWIN32__) || defined(__CYGWIN__) -+# if defined(__CYGWIN32__) - # define I386 - # define CYGWIN32 - # define mach_type_known -+#if defined(__CYGWIN__) -+# if defined(__LP64__) -+# define X86_64 -+# define mach_type_known -+# else -+# define I386 -+# endif -+# define CYGWIN32 -+# define mach_type_known -+#endif - # endif - # if defined(__MINGW32__) && !defined(mach_type_known) - # define I386 -@@ -511,6 +521,16 @@ - # define mach_type_known - # endif - -+#if defined(__CYGWIN__) -+# if defined(__LP64__) -+# define X86_64 -+# define mach_type_known -+# else -+# define I386 -+# endif -+# define CYGWIN32 -+# define mach_type_known -+#endif - /* Feel free to add more clauses here */ - - /* Or manually define the machine type here. A machine type is */ -@@ -2279,6 +2299,20 @@ - # define GWW_VDB - # define DATAEND /* not needed */ - # endif -+ -+# ifdef CYGWIN32 -+# define OS_TYPE "CYGWIN32" -+# define DATASTART ((ptr_t)GC_DATASTART) /* From gc.h */ -+# define DATAEND ((ptr_t)GC_DATAEND) -+# define ALIGNMENT 8 -+# undef STACK_GRAN -+# define STACK_GRAN 0x10000 -+# ifdef USE_MMAP -+# define NEED_FIND_LIMIT -+# define USE_MMAP_ANON -+# endif -+# endif -+ - # endif /* X86_64 */ - - # ifdef HEXAGON ---- gc-7.2/os_dep.c 2015-05-27 12:25:29.097698800 +0200 -+++ gc-7.2/os_dep.c 2015-05-27 12:48:23.714600800 +0200 -@@ -764,10 +764,16 @@ - /* gcc version of boehm-gc). */ - GC_API int GC_CALL GC_get_stack_base(struct GC_stack_base *sb) - { -+# ifdef __x86_64__ -+ PNT_TIB pTib = NtCurrentTeb(); -+ void * _tlsbase = pTib->StackBase; -+ /*void * _tlsbase = NtCurrentTeb()->pTib.StackBase;*/ -+ /*extern void * _tlsbase __asm__ ("%gs:8");*/ -+# else - void * _tlsbase; -- - __asm__ ("movl %%fs:4, %0" - : "=r" (_tlsbase)); -+# endif - sb -> mem_base = _tlsbase; - return GC_SUCCESS; - } diff --git a/pkgs/development/libraries/boehm-gc/default.nix b/pkgs/development/libraries/boehm-gc/default.nix index fb1f177d9695..96e41790aac8 100644 --- a/pkgs/development/libraries/boehm-gc/default.nix +++ b/pkgs/development/libraries/boehm-gc/default.nix @@ -1,13 +1,15 @@ -{ lib, stdenv, fetchurl, enableLargeConfig ? false }: +{ lib, stdenv, fetchurl, pkgconfig, libatomic_ops, enableLargeConfig ? false }: stdenv.mkDerivation rec { - name = "boehm-gc-7.2g"; + name = "boehm-gc-7.6.0"; src = fetchurl { - url = http://www.hboehm.info/gc/gc_source/gc-7.2g.tar.gz; - sha256 = "0bvw6cc555qg5b7dgcqy3ryiw0wir79dqy0glff3hjmyy7i2jkjq"; + url = http://www.hboehm.info/gc/gc_source/gc-7.6.0.tar.gz; + sha256 = "143x7g0d0k6250ai6m2x3l4y352mzizi4wbgrmahxscv2aqjhjm1"; }; - patches = if stdenv.isCygwin then [ ./cygwin.patch ] else null; + + buildInputs = [ libatomic_ops ]; + nativeBuildInputs = [ pkgconfig ]; outputs = [ "out" "dev" "doc" ]; diff --git a/pkgs/development/libraries/libfaketime/default.nix b/pkgs/development/libraries/libfaketime/default.nix index 7d430614257e..16ee2151faa5 100644 --- a/pkgs/development/libraries/libfaketime/default.nix +++ b/pkgs/development/libraries/libfaketime/default.nix @@ -8,6 +8,10 @@ stdenv.mkDerivation rec { sha256 = "1dw2lqsv2iqwxg51mdn25b4fjj3v357s0mc6ahxawqp210krg29s"; }; + patches = [ + ./no-date-in-gzip-man-page.patch + ]; + preBuild = '' makeFlagsArray+=(PREFIX="$out" LIBDIRNAME=/lib) ''; diff --git a/pkgs/development/libraries/libfaketime/no-date-in-gzip-man-page.patch b/pkgs/development/libraries/libfaketime/no-date-in-gzip-man-page.patch new file mode 100644 index 000000000000..7b7e362fbf0f --- /dev/null +++ b/pkgs/development/libraries/libfaketime/no-date-in-gzip-man-page.patch @@ -0,0 +1,12 @@ +diff -ur libfaketime-0.9.5.orig/man/Makefile libfaketime-0.9.5/man/Makefile +--- libfaketime-0.9.5.orig/man/Makefile 2013-10-13 11:19:30.000000000 +0200 ++++ libfaketime-0.9.5/man/Makefile 2014-04-13 01:22:14.362296519 +0200 +@@ -6,7 +6,7 @@ + + install: + $(INSTALL) -Dm0644 faketime.1 "${DESTDIR}${PREFIX}/share/man/man1/faketime.1" +- gzip -f "${DESTDIR}${PREFIX}/share/man/man1/faketime.1" ++ gzip -9nf "${DESTDIR}${PREFIX}/share/man/man1/faketime.1" + + uninstall: + rm -f "${DESTDIR}${PREFIX}/share/man/man1/faketime.1.gz" diff --git a/pkgs/development/libraries/openjpeg/2.1.nix b/pkgs/development/libraries/openjpeg/2.1.nix index 00cd4103c8f7..9e3c4473b311 100644 --- a/pkgs/development/libraries/openjpeg/2.1.nix +++ b/pkgs/development/libraries/openjpeg/2.1.nix @@ -5,4 +5,12 @@ callPackage ./generic.nix (args // rec { branch = "2.1"; revision = "v2.1.2"; sha256 = "0kdcl9sqjz0vagli4ad6bxq1r8ma086m0prpkm5x3dxp37hpjp8h"; + + patches = [ + # Fetched from https://github.com/szukw000/openjpeg/commit/cadff5fb6e73398de26a92e96d3d7cac893af255 + # Referenced from https://bugzilla.redhat.com/show_bug.cgi?id=1405135 + # Put in our source code to make sure we don't lose it, since that + # referenced commit is someone else's fork, and not actually up-stream. + ./CVE-2016-9580-and-CVE-2016-9581.patch + ]; }) diff --git a/pkgs/development/libraries/openjpeg/CVE-2016-9580-and-CVE-2016-9581.patch b/pkgs/development/libraries/openjpeg/CVE-2016-9580-and-CVE-2016-9581.patch new file mode 100644 index 000000000000..064e7419c341 --- /dev/null +++ b/pkgs/development/libraries/openjpeg/CVE-2016-9580-and-CVE-2016-9581.patch @@ -0,0 +1,242 @@ +From cadff5fb6e73398de26a92e96d3d7cac893af255 Mon Sep 17 00:00:00 2001 +From: szukw000 <szukw000@arcor.de> +Date: Fri, 9 Dec 2016 08:29:55 +0100 +Subject: [PATCH] These changes repair bugs of #871 and #872 + +--- + src/bin/jp2/converttif.c | 107 +++++++++++++++++++++++++++++++---------------- + 1 file changed, 70 insertions(+), 37 deletions(-) + +diff --git a/src/bin/jp2/converttif.c b/src/bin/jp2/converttif.c +index 143d3be..c690f8b 100644 +--- a/src/bin/jp2/converttif.c ++++ b/src/bin/jp2/converttif.c +@@ -553,20 +553,18 @@ static void tif_32sto16u(const OPJ_INT32* pSrc, OPJ_UINT16* pDst, OPJ_SIZE_T len + + int imagetotif(opj_image_t * image, const char *outfile) + { +- int width, height; +- int bps,adjust, sgnd; +- int tiPhoto; ++ uint32 width, height, bps, tiPhoto; ++ int adjust, sgnd; + TIFF *tif; + tdata_t buf; +- tsize_t strip_size; ++ tmsize_t strip_size, rowStride; + OPJ_UINT32 i, numcomps; +- OPJ_SIZE_T rowStride; + OPJ_INT32* buffer32s = NULL; + OPJ_INT32 const* planes[4]; + convert_32s_PXCX cvtPxToCx = NULL; + convert_32sXXx_C1R cvt32sToTif = NULL; + +- bps = (int)image->comps[0].prec; ++ bps = (uint32)image->comps[0].prec; + planes[0] = image->comps[0].data; + + numcomps = image->numcomps; +@@ -674,13 +672,13 @@ int imagetotif(opj_image_t * image, const char *outfile) + break; + } + sgnd = (int)image->comps[0].sgnd; +- adjust = sgnd ? 1 << (image->comps[0].prec - 1) : 0; +- width = (int)image->comps[0].w; +- height = (int)image->comps[0].h; ++ adjust = sgnd ? (int)(1 << (image->comps[0].prec - 1)) : 0; ++ width = (uint32)image->comps[0].w; ++ height = (uint32)image->comps[0].h; + + TIFFSetField(tif, TIFFTAG_IMAGEWIDTH, width); + TIFFSetField(tif, TIFFTAG_IMAGELENGTH, height); +- TIFFSetField(tif, TIFFTAG_SAMPLESPERPIXEL, numcomps); ++ TIFFSetField(tif, TIFFTAG_SAMPLESPERPIXEL, (uint32)numcomps); + TIFFSetField(tif, TIFFTAG_BITSPERSAMPLE, bps); + TIFFSetField(tif, TIFFTAG_ORIENTATION, ORIENTATION_TOPLEFT); + TIFFSetField(tif, TIFFTAG_PLANARCONFIG, PLANARCONFIG_CONTIG); +@@ -688,8 +686,8 @@ int imagetotif(opj_image_t * image, const char *outfile) + TIFFSetField(tif, TIFFTAG_ROWSPERSTRIP, 1); + + strip_size = TIFFStripSize(tif); +- rowStride = ((OPJ_SIZE_T)width * numcomps * (OPJ_SIZE_T)bps + 7U) / 8U; +- if (rowStride != (OPJ_SIZE_T)strip_size) { ++ rowStride = (width * numcomps * bps + 7U) / 8U; ++ if (rowStride != strip_size) { + fprintf(stderr, "Invalid TIFF strip size\n"); + TIFFClose(tif); + return 1; +@@ -699,7 +697,7 @@ int imagetotif(opj_image_t * image, const char *outfile) + TIFFClose(tif); + return 1; + } +- buffer32s = (OPJ_INT32 *)malloc((OPJ_SIZE_T)width * numcomps * sizeof(OPJ_INT32)); ++ buffer32s = (OPJ_INT32 *)malloc((OPJ_SIZE_T)(width * numcomps * sizeof(OPJ_INT32))); + if (buffer32s == NULL) { + _TIFFfree(buf); + TIFFClose(tif); +@@ -1211,20 +1209,19 @@ opj_image_t* tiftoimage(const char *filename, opj_cparameters_t *parameters) + TIFF *tif; + tdata_t buf; + tstrip_t strip; +- tsize_t strip_size; ++ tmsize_t strip_size; + int j, currentPlane, numcomps = 0, w, h; + OPJ_COLOR_SPACE color_space = OPJ_CLRSPC_UNKNOWN; + opj_image_cmptparm_t cmptparm[4]; /* RGBA */ + opj_image_t *image = NULL; + int has_alpha = 0; +- unsigned short tiBps, tiPhoto, tiSf, tiSpp, tiPC; +- unsigned int tiWidth, tiHeight; ++ uint32 tiBps, tiPhoto, tiSf, tiSpp, tiPC, tiWidth, tiHeight; + OPJ_BOOL is_cinema = OPJ_IS_CINEMA(parameters->rsiz); + convert_XXx32s_C1R cvtTifTo32s = NULL; + convert_32s_CXPX cvtCxToPx = NULL; + OPJ_INT32* buffer32s = NULL; + OPJ_INT32* planes[4]; +- OPJ_SIZE_T rowStride; ++ tmsize_t rowStride; + + tif = TIFFOpen(filename, "r"); + +@@ -1243,22 +1240,35 @@ opj_image_t* tiftoimage(const char *filename, opj_cparameters_t *parameters) + TIFFGetField(tif, TIFFTAG_SAMPLESPERPIXEL, &tiSpp); + TIFFGetField(tif, TIFFTAG_PHOTOMETRIC, &tiPhoto); + TIFFGetField(tif, TIFFTAG_PLANARCONFIG, &tiPC); +- w= (int)tiWidth; +- h= (int)tiHeight; +- +- if(tiBps > 16U) { +- fprintf(stderr,"tiftoimage: Bits=%d, Only 1 to 16 bits implemented\n",tiBps); +- fprintf(stderr,"\tAborting\n"); ++ ++ if(tiSpp == 0 || tiSpp > 4) { /* should be 1 ... 4 */ ++ fprintf(stderr,"tiftoimage: Bad value for samples per pixel == %hu.\n" ++ "\tAborting.\n", tiSpp); ++ TIFFClose(tif); ++ return NULL; ++ } ++ if(tiBps > 16U || tiBps == 0) { ++ fprintf(stderr,"tiftoimage: Bad values for Bits == %d.\n" ++ "\tMax. 16 Bits are allowed here.\n\tAborting.\n",tiBps); + TIFFClose(tif); + return NULL; + } + if(tiPhoto != PHOTOMETRIC_MINISBLACK && tiPhoto != PHOTOMETRIC_RGB) { +- fprintf(stderr,"tiftoimage: Bad color format %d.\n\tOnly RGB(A) and GRAY(A) has been implemented\n",(int) tiPhoto); ++ fprintf(stderr,"tiftoimage: Bad color format %d.\n" ++ "\tOnly RGB(A) and GRAY(A) has been implemented\n",(int) tiPhoto); + fprintf(stderr,"\tAborting\n"); + TIFFClose(tif); + return NULL; + } +- ++ if(tiWidth == 0 || tiHeight == 0) { ++ fprintf(stderr,"tiftoimage: Bad values for width(%u) " ++ "and/or height(%u)\n\tAborting.\n",tiWidth,tiHeight); ++ TIFFClose(tif); ++ return NULL; ++ } ++ w= (int)tiWidth; ++ h= (int)tiHeight; ++ + switch (tiBps) { + case 1: + case 2: +@@ -1312,7 +1322,7 @@ opj_image_t* tiftoimage(const char *filename, opj_cparameters_t *parameters) + + TIFFGetFieldDefaulted(tif, TIFFTAG_EXTRASAMPLES, + &extrasamples, &sampleinfo); +- ++ + if(extrasamples >= 1) + { + switch(sampleinfo[0]) +@@ -1333,7 +1343,7 @@ opj_image_t* tiftoimage(const char *filename, opj_cparameters_t *parameters) + else /* extrasamples == 0 */ + if(tiSpp == 4 || tiSpp == 2) has_alpha = 1; + } +- ++ + /* initialize image components */ + memset(&cmptparm[0], 0, 4 * sizeof(opj_image_cmptparm_t)); + +@@ -1346,7 +1356,7 @@ opj_image_t* tiftoimage(const char *filename, opj_cparameters_t *parameters) + } else { + is_cinema = 0U; + } +- ++ + if(tiPhoto == PHOTOMETRIC_RGB) /* RGB(A) */ + { + numcomps = 3 + has_alpha; +@@ -1384,10 +1394,24 @@ opj_image_t* tiftoimage(const char *filename, opj_cparameters_t *parameters) + image->x0 = (OPJ_UINT32)parameters->image_offset_x0; + image->y0 = (OPJ_UINT32)parameters->image_offset_y0; + image->x1 = !image->x0 ? (OPJ_UINT32)(w - 1) * (OPJ_UINT32)subsampling_dx + 1 : +- image->x0 + (OPJ_UINT32)(w - 1) * (OPJ_UINT32)subsampling_dx + 1; ++ image->x0 + (OPJ_UINT32)(w - 1) * (OPJ_UINT32)subsampling_dx + 1; ++ if(image->x1 <= image->x0) { ++ fprintf(stderr,"tiftoimage: Bad value for image->x1(%d) vs. " ++ "image->x0(%d)\n\tAborting.\n",image->x1,image->x0); ++ TIFFClose(tif); ++ opj_image_destroy(image); ++ return NULL; ++ } + image->y1 = !image->y0 ? (OPJ_UINT32)(h - 1) * (OPJ_UINT32)subsampling_dy + 1 : +- image->y0 + (OPJ_UINT32)(h - 1) * (OPJ_UINT32)subsampling_dy + 1; +- ++ image->y0 + (OPJ_UINT32)(h - 1) * (OPJ_UINT32)subsampling_dy + 1; ++ if(image->y1 <= image->y0) { ++ fprintf(stderr,"tiftoimage: Bad value for image->y1(%d) vs. " ++ "image->y0(%d)\n\tAborting.\n",image->y1,image->y0); ++ TIFFClose(tif); ++ opj_image_destroy(image); ++ return NULL; ++ } ++ + for(j = 0; j < numcomps; j++) + { + planes[j] = image->comps[j].data; +@@ -1395,15 +1419,15 @@ opj_image_t* tiftoimage(const char *filename, opj_cparameters_t *parameters) + image->comps[numcomps - 1].alpha = (OPJ_UINT16)(1 - (numcomps & 1)); + + strip_size = TIFFStripSize(tif); +- ++ + buf = _TIFFmalloc(strip_size); + if (buf == NULL) { + TIFFClose(tif); + opj_image_destroy(image); + return NULL; + } +- rowStride = ((OPJ_SIZE_T)w * tiSpp * tiBps + 7U) / 8U; +- buffer32s = (OPJ_INT32 *)malloc((OPJ_SIZE_T)w * tiSpp * sizeof(OPJ_INT32)); ++ rowStride = (w * tiSpp * tiBps + 7U) / 8U; ++ buffer32s = (OPJ_INT32 *)malloc((OPJ_SIZE_T)(w * tiSpp * sizeof(OPJ_INT32))); + if (buffer32s == NULL) { + _TIFFfree(buf); + TIFFClose(tif); +@@ -1421,11 +1445,20 @@ opj_image_t* tiftoimage(const char *filename, opj_cparameters_t *parameters) + for(; (h > 0) && (strip < TIFFNumberOfStrips(tif)); strip++) + { + const OPJ_UINT8 *dat8; +- OPJ_SIZE_T ssize; ++ tmsize_t ssize; + +- ssize = (OPJ_SIZE_T)TIFFReadEncodedStrip(tif, strip, buf, strip_size); ++ ssize = TIFFReadEncodedStrip(tif, strip, buf, strip_size); ++ if(ssize < 1 || ssize > strip_size) { ++ fprintf(stderr,"tiftoimage: Bad value for ssize(%ld) " ++ "vs. strip_size(%ld).\n\tAborting.\n",ssize,strip_size); ++ _TIFFfree(buf); ++ _TIFFfree(buffer32s); ++ TIFFClose(tif); ++ opj_image_destroy(image); ++ return NULL; ++ } + dat8 = (const OPJ_UINT8*)buf; +- ++ + while (ssize >= rowStride) { + cvtTifTo32s(dat8, buffer32s, (OPJ_SIZE_T)w * tiSpp); + cvtCxToPx(buffer32s, planes, (OPJ_SIZE_T)w); diff --git a/pkgs/development/libraries/openjpeg/generic.nix b/pkgs/development/libraries/openjpeg/generic.nix index c70bab523cb6..96cf0451ebf4 100644 --- a/pkgs/development/libraries/openjpeg/generic.nix +++ b/pkgs/development/libraries/openjpeg/generic.nix @@ -11,7 +11,7 @@ , testsSupport ? false , jdk ? null # Inherit generics -, branch, version, revision, sha256, ... +, branch, version, revision, sha256, patches ? [], ... }: assert jpipServerSupport -> jpipLibSupport && curl != null && fcgi != null; @@ -33,6 +33,8 @@ stdenv.mkDerivation rec { inherit sha256; }; + inherit patches; + outputs = [ "out" "dev" ]; cmakeFlags = [ diff --git a/pkgs/development/libraries/pupnp/default.nix b/pkgs/development/libraries/pupnp/default.nix index b1d2b1fd92ec..389e575dbb14 100644 --- a/pkgs/development/libraries/pupnp/default.nix +++ b/pkgs/development/libraries/pupnp/default.nix @@ -1,15 +1,28 @@ -{ fetchurl, stdenv }: +{ fetchFromGitHub, stdenv, autoconf, automake, libtool }: stdenv.mkDerivation rec { - name = "libupnp-1.6.20"; + name = "libupnp-${version}"; + version = "1.6.20"; - src = fetchurl { - url = "mirror://sourceforge/pupnp/${name}.tar.bz2"; - sha256 = "0qrsdsb1qm85hc4jy04qph895613d148f0x1mmk6z99y3q43fdgf"; + src = fetchFromGitHub { + owner = "mrjimenez"; + repo = "pupnp"; + rev = "release-${version}"; + sha256 = "10583dkz1l5sjp2833smql8w428x2nbh1fni8j6h9rji6ma2yhs0"; }; + buildInputs = [ + autoconf + automake + libtool + ]; + hardeningDisable = [ "fortify" ]; + preConfigure = '' + ./bootstrap + ''; + meta = { description = "libupnp, an open source UPnP development kit for Linux"; diff --git a/pkgs/development/libraries/qt-5/5.7/fetch.sh b/pkgs/development/libraries/qt-5/5.7/fetch.sh index 282fe742fd05..0f7d123aeb23 100644 --- a/pkgs/development/libraries/qt-5/5.7/fetch.sh +++ b/pkgs/development/libraries/qt-5/5.7/fetch.sh @@ -1,2 +1,2 @@ -WGET_ARGS=( http://download.qt.io/official_releases/qt/5.7/5.7.0/submodules/ \ +WGET_ARGS=( http://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/ \ -A '*.tar.xz' ) diff --git a/pkgs/development/libraries/qt-5/5.7/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.7/qtbase/default.nix index 06bec5a0faf1..934203950b09 100644 --- a/pkgs/development/libraries/qt-5/5.7/qtbase/default.nix +++ b/pkgs/development/libraries/qt-5/5.7/qtbase/default.nix @@ -114,7 +114,6 @@ stdenv.mkDerivation { -widgets -opengl desktop -qml-debug - -nis -iconv -icu -pch diff --git a/pkgs/development/libraries/qt-5/5.7/srcs.nix b/pkgs/development/libraries/qt-5/5.7/srcs.nix index e7710ce82d6a..fe497555874d 100644 --- a/pkgs/development/libraries/qt-5/5.7/srcs.nix +++ b/pkgs/development/libraries/qt-5/5.7/srcs.nix @@ -1,4 +1,4 @@ -# DO NOT EDIT! This file is generated automatically by fetchsrcs.sh +# DO NOT EDIT! This file is generated automatically by fetch-kde-qt.sh { fetchurl, mirror }: { @@ -11,299 +11,299 @@ }; }; qt3d = { - version = "5.7.0"; + version = "5.7.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.7/5.7.0/submodules/qt3d-opensource-src-5.7.0.tar.xz"; - sha256 = "0a9y4fxm4xmdl5hsv4hfvxcw7jmshy0mwd4j1r2ylqdmg4bql958"; - name = "qt3d-opensource-src-5.7.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qt3d-opensource-src-5.7.1.tar.xz"; + sha256 = "1sh7yz8nb9iqz3bp6bfc2kmji70zq39d9c0sfxnhif3p2x1wyx0x"; + name = "qt3d-opensource-src-5.7.1.tar.xz"; }; }; qtactiveqt = { - version = "5.7.0"; + version = "5.7.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.7/5.7.0/submodules/qtactiveqt-opensource-src-5.7.0.tar.xz"; - sha256 = "149wj6a5i35k750129kz77y4r8q3hpxqzn1c676fcn9wpmfhay4v"; - name = "qtactiveqt-opensource-src-5.7.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtactiveqt-opensource-src-5.7.1.tar.xz"; + sha256 = "1md14jdgwsdczpfvc0qkk5agxqk7a9qs91k41zj15ykkw86r428c"; + name = "qtactiveqt-opensource-src-5.7.1.tar.xz"; }; }; qtandroidextras = { - version = "5.7.0"; + version = "5.7.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.7/5.7.0/submodules/qtandroidextras-opensource-src-5.7.0.tar.xz"; - sha256 = "1caimhfyag96v98j1b07pfzjl5inhsyfi9kxzy9nj0pkvpjdgi4g"; - name = "qtandroidextras-opensource-src-5.7.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtandroidextras-opensource-src-5.7.1.tar.xz"; + sha256 = "1wq9m7a3dh9k8z006cw6m96awc53yf5vnq3wdqf5yfclfz696lhg"; + name = "qtandroidextras-opensource-src-5.7.1.tar.xz"; }; }; qtbase = { - version = "5.7.0"; + version = "5.7.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.7/5.7.0/submodules/qtbase-opensource-src-5.7.0.tar.xz"; - sha256 = "0ip6xnizsn269r4s1nq9lkx8cdxkjqr1fidwrj3sa8xb7h96syry"; - name = "qtbase-opensource-src-5.7.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtbase-opensource-src-5.7.1.tar.xz"; + sha256 = "0zjmcrmnnmaz1lr9wc5i6y565hsvl8ycn790ivqaz62dv54zbkgd"; + name = "qtbase-opensource-src-5.7.1.tar.xz"; }; }; qtcanvas3d = { - version = "5.7.0"; + version = "5.7.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.7/5.7.0/submodules/qtcanvas3d-opensource-src-5.7.0.tar.xz"; - sha256 = "15xxwciyiy8rwrwgb7bgcbxdiiaba3l4cxxm7rdiqmhs9kyv6wbq"; - name = "qtcanvas3d-opensource-src-5.7.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtcanvas3d-opensource-src-5.7.1.tar.xz"; + sha256 = "1d5xpq3mhjg4ipxzap7s2vnlfcd02d3yq720npv10xxp2ww0i1x8"; + name = "qtcanvas3d-opensource-src-5.7.1.tar.xz"; }; }; qtcharts = { - version = "5.7.0"; + version = "5.7.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.7/5.7.0/submodules/qtcharts-opensource-src-5.7.0.tar.xz"; - sha256 = "0hsj5m9in4w9wzyvbs76v7zc67n9ja641ljc5vgfpbn7fmrsij1b"; - name = "qtcharts-opensource-src-5.7.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtcharts-opensource-src-5.7.1.tar.xz"; + sha256 = "1qrzcddwff2hxsbxrraff16j4abah2zkra2756s1mvydj9lyxzl5"; + name = "qtcharts-opensource-src-5.7.1.tar.xz"; }; }; qtconnectivity = { - version = "5.7.0"; + version = "5.7.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.7/5.7.0/submodules/qtconnectivity-opensource-src-5.7.0.tar.xz"; - sha256 = "00r7lc1w3snfp2qfqmviqzv0cw16zd8m1sfpvxvpl65yqmzcli4q"; - name = "qtconnectivity-opensource-src-5.7.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtconnectivity-opensource-src-5.7.1.tar.xz"; + sha256 = "0rmr7bd4skby7bax9hpj2sid2bq3098nkw7xm02mdp04hc3bks5k"; + name = "qtconnectivity-opensource-src-5.7.1.tar.xz"; }; }; qtdatavis3d = { - version = "5.7.0"; + version = "5.7.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.7/5.7.0/submodules/qtdatavis3d-opensource-src-5.7.0.tar.xz"; - sha256 = "18p82vh5s9bdshmxxkh7r9482i5vaih8nfya9f81l8ff7lw7lpcs"; - name = "qtdatavis3d-opensource-src-5.7.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtdatavis3d-opensource-src-5.7.1.tar.xz"; + sha256 = "1y00p0wyj5cw9c2925y537vpmmg9q3kpf7qr1s7sv67dvvf8bzqv"; + name = "qtdatavis3d-opensource-src-5.7.1.tar.xz"; }; }; qtdeclarative = { - version = "5.7.0"; + version = "5.7.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.7/5.7.0/submodules/qtdeclarative-opensource-src-5.7.0.tar.xz"; - sha256 = "1x7rij423g5chlfd2kix54f393vxwjvdfsn1c7sybqmfycwn5pl6"; - name = "qtdeclarative-opensource-src-5.7.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtdeclarative-opensource-src-5.7.1.tar.xz"; + sha256 = "0mjxfwnplpx60jc6y94krg00isddl9bfwc7dayl981njb4qds4zx"; + name = "qtdeclarative-opensource-src-5.7.1.tar.xz"; }; }; qtdeclarative-render2d = { - version = "5.7.0"; + version = "5.7.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.7/5.7.0/submodules/qtdeclarative-render2d-opensource-src-5.7.0.tar.xz"; - sha256 = "1qf893i7z2iyjpqpaxfhji4cgzlmpgh0w3vdqarpn51vcn7jj4q6"; - name = "qtdeclarative-render2d-opensource-src-5.7.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtdeclarative-render2d-opensource-src-5.7.1.tar.xz"; + sha256 = "0zwch9vn17f3bpy300jcfxx6cx9qymk5j7khx0x9k1xqid4166c3"; + name = "qtdeclarative-render2d-opensource-src-5.7.1.tar.xz"; }; }; qtdoc = { - version = "5.7.0"; + version = "5.7.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.7/5.7.0/submodules/qtdoc-opensource-src-5.7.0.tar.xz"; - sha256 = "0d7c7137jvxlwl91c2hh33l4falmjvkmsy1f7lyi73x6nnqzdz8i"; - name = "qtdoc-opensource-src-5.7.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtdoc-opensource-src-5.7.1.tar.xz"; + sha256 = "1nyrgfw3d8ja2cqb12vyq5mwryw89976f3xkpdhy49mvsws03ysm"; + name = "qtdoc-opensource-src-5.7.1.tar.xz"; }; }; qtgamepad = { - version = "5.7.0"; + version = "5.7.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.7/5.7.0/submodules/qtgamepad-opensource-src-5.7.0.tar.xz"; - sha256 = "0g36nlnnq19p9svl6pvklxybpwig7r7z4hw0d5dwc2id02ygg62q"; - name = "qtgamepad-opensource-src-5.7.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtgamepad-opensource-src-5.7.1.tar.xz"; + sha256 = "10lijbsg9xx5ddbbjymdgl41nxz99yn1qgiww2kkggxwwdjj2axv"; + name = "qtgamepad-opensource-src-5.7.1.tar.xz"; }; }; qtgraphicaleffects = { - version = "5.7.0"; + version = "5.7.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.7/5.7.0/submodules/qtgraphicaleffects-opensource-src-5.7.0.tar.xz"; - sha256 = "1rwdjg5mk6xpadmxfq64xfp573zp5lrj9illb9105ra5wff565n8"; - name = "qtgraphicaleffects-opensource-src-5.7.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtgraphicaleffects-opensource-src-5.7.1.tar.xz"; + sha256 = "1j2drnx7zp3w6cgvy7bn00fyk5v7vw1j1hidaqcg78lzb6zgls1c"; + name = "qtgraphicaleffects-opensource-src-5.7.1.tar.xz"; }; }; qtimageformats = { - version = "5.7.0"; + version = "5.7.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.7/5.7.0/submodules/qtimageformats-opensource-src-5.7.0.tar.xz"; - sha256 = "1rb27x7i2pmvsck6wax2cg31gqpzaakciy45wm5l3lcl86j48czg"; - name = "qtimageformats-opensource-src-5.7.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtimageformats-opensource-src-5.7.1.tar.xz"; + sha256 = "1x3p1xmw7spxa4bwriyrwsfrq31jabsdjsi5fras9y39naia55sg"; + name = "qtimageformats-opensource-src-5.7.1.tar.xz"; }; }; qtlocation = { - version = "5.7.0"; + version = "5.7.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.7/5.7.0/submodules/qtlocation-opensource-src-5.7.0.tar.xz"; - sha256 = "0rd898gndn41jrp78203lxd94ybfv693l0qg0myag4r46ikk69vh"; - name = "qtlocation-opensource-src-5.7.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtlocation-opensource-src-5.7.1.tar.xz"; + sha256 = "17zkzffzwbg6aqhsggs23cmwzq4y45m938842lsc423hfm7fdsgr"; + name = "qtlocation-opensource-src-5.7.1.tar.xz"; }; }; qtmacextras = { - version = "5.7.0"; + version = "5.7.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.7/5.7.0/submodules/qtmacextras-opensource-src-5.7.0.tar.xz"; - sha256 = "1p439sqnchrypggaqkfq3rvfk7xmvqgck4nhwv762jk3kgp48ccq"; - name = "qtmacextras-opensource-src-5.7.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtmacextras-opensource-src-5.7.1.tar.xz"; + sha256 = "0rr6nl1j6bq47lcq87zsqyma3cdqysamnngwbaccxvpznpcx7jhx"; + name = "qtmacextras-opensource-src-5.7.1.tar.xz"; }; }; qtmultimedia = { - version = "5.7.0"; + version = "5.7.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.7/5.7.0/submodules/qtmultimedia-opensource-src-5.7.0.tar.xz"; - sha256 = "0ndmhiflmyr144nq8drd5njsdi282ixsm4730q5n0ji2v9dp1bh5"; - name = "qtmultimedia-opensource-src-5.7.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtmultimedia-opensource-src-5.7.1.tar.xz"; + sha256 = "1vvxmgmvjnz9w1h2ph1j2fy77ij141ycx5fric60lq02pxzifax5"; + name = "qtmultimedia-opensource-src-5.7.1.tar.xz"; }; }; qtpurchasing = { - version = "5.7.0"; + version = "5.7.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.7/5.7.0/submodules/qtpurchasing-opensource-src-5.7.0.tar.xz"; - sha256 = "1db44q3d02nhmrh0fd239n2nsm74myac8saa6jqx1pcap4y4llby"; - name = "qtpurchasing-opensource-src-5.7.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtpurchasing-opensource-src-5.7.1.tar.xz"; + sha256 = "0hkvrgafz1hx9q4yc3nskv3pd3fszghvvd5a7mj33ynf55wpb57n"; + name = "qtpurchasing-opensource-src-5.7.1.tar.xz"; }; }; - qtquickcontrols2 = { - version = "5.7.0"; + qtquickcontrols = { + version = "5.7.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.7/5.7.0/submodules/qtquickcontrols2-opensource-src-5.7.0.tar.xz"; - sha256 = "0i8h933vhvx1bmniqdx0idg6vk82w9byd3dq0bb2phwjg5vv1xb3"; - name = "qtquickcontrols2-opensource-src-5.7.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtquickcontrols-opensource-src-5.7.1.tar.xz"; + sha256 = "17cyfyqzjbm9dhq9pjscz36y84y16rmxwk6h826gjfprddrimsvg"; + name = "qtquickcontrols-opensource-src-5.7.1.tar.xz"; }; }; - qtquickcontrols = { - version = "5.7.0"; + qtquickcontrols2 = { + version = "5.7.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.7/5.7.0/submodules/qtquickcontrols-opensource-src-5.7.0.tar.xz"; - sha256 = "0cpcrmz9n5b4bgmshmk093lirl9xwqb23inchnai1zqg21vrmqfq"; - name = "qtquickcontrols-opensource-src-5.7.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtquickcontrols2-opensource-src-5.7.1.tar.xz"; + sha256 = "1v77ydy4k15lksp3bi2kgha2h7m79g4n7c2qhbr09xnvpb8ars7j"; + name = "qtquickcontrols2-opensource-src-5.7.1.tar.xz"; }; }; qtscript = { - version = "5.7.0"; + version = "5.7.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.7/5.7.0/submodules/qtscript-opensource-src-5.7.0.tar.xz"; - sha256 = "0040890p5ilyrmcpndz1hhp08x2ms5gw4lp4n5iax2a957yy2i4w"; - name = "qtscript-opensource-src-5.7.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtscript-opensource-src-5.7.1.tar.xz"; + sha256 = "09m41n95448pszr7inlg03ycb66s1a9hzfylaka92382acf1myav"; + name = "qtscript-opensource-src-5.7.1.tar.xz"; }; }; qtscxml = { - version = "5.7.0"; + version = "5.7.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.7/5.7.0/submodules/qtscxml-opensource-src-5.7.0.tar.xz"; - sha256 = "1waidk96vp9510g94fry0sv1vm2lgzgpwybf6c2xybcsdkbi62rp"; - name = "qtscxml-opensource-src-5.7.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtscxml-opensource-src-5.7.1.tar.xz"; + sha256 = "135kknqdmib2cjryfmvfgv7a2qx9pyba3m7i7nkbc5d742r4mbcx"; + name = "qtscxml-opensource-src-5.7.1.tar.xz"; }; }; qtsensors = { - version = "5.7.0"; + version = "5.7.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.7/5.7.0/submodules/qtsensors-opensource-src-5.7.0.tar.xz"; - sha256 = "1gii6wg2xd3bkb86y5hgpmwcpl04xav030zscpl6fhscl9kcqg98"; - name = "qtsensors-opensource-src-5.7.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtsensors-opensource-src-5.7.1.tar.xz"; + sha256 = "041v1x8pwfzpyk6y0sy5zgm915pi15xdhiy18fd5wqayvcp99cyc"; + name = "qtsensors-opensource-src-5.7.1.tar.xz"; }; }; qtserialbus = { - version = "5.7.0"; + version = "5.7.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.7/5.7.0/submodules/qtserialbus-opensource-src-5.7.0.tar.xz"; - sha256 = "0f2xq6fm8lmvd88lc3l37kybqp4wqp71kdch14bwz79y7777lhrc"; - name = "qtserialbus-opensource-src-5.7.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtserialbus-opensource-src-5.7.1.tar.xz"; + sha256 = "0mxi43l2inpbar8rmg21qjg33bv3f1ycxjgvzjf12ncnybhdnzkj"; + name = "qtserialbus-opensource-src-5.7.1.tar.xz"; }; }; qtserialport = { - version = "5.7.0"; + version = "5.7.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.7/5.7.0/submodules/qtserialport-opensource-src-5.7.0.tar.xz"; - sha256 = "0rc2l14s59qskp16wqlkizfai32s41qlm7a86r3qahx28gc51qaw"; - name = "qtserialport-opensource-src-5.7.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtserialport-opensource-src-5.7.1.tar.xz"; + sha256 = "09jsryc0z49cz9783kq48rkn42f10c6krzivp812ddwjsfdy3mbn"; + name = "qtserialport-opensource-src-5.7.1.tar.xz"; }; }; qtsvg = { - version = "5.7.0"; + version = "5.7.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.7/5.7.0/submodules/qtsvg-opensource-src-5.7.0.tar.xz"; - sha256 = "10fqrlqkiq83xhx79g8d2sjy7hjdnp28067z8f4byj7db81rzy51"; - name = "qtsvg-opensource-src-5.7.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtsvg-opensource-src-5.7.1.tar.xz"; + sha256 = "0irr9h566hl9nx8p919rz276zbfvvd6vqdb6i9g6b3piikdigw5h"; + name = "qtsvg-opensource-src-5.7.1.tar.xz"; }; }; qttools = { - version = "5.7.0"; + version = "5.7.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.7/5.7.0/submodules/qttools-opensource-src-5.7.0.tar.xz"; - sha256 = "004m9l7bgh7qnncbyl3d5fkggdrqx58ib21xv4hflvvarxrssibg"; - name = "qttools-opensource-src-5.7.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qttools-opensource-src-5.7.1.tar.xz"; + sha256 = "1b6zqa5690b8lqms7rrhb8rcq0xg5hp117v3m08qngbcd0i706b4"; + name = "qttools-opensource-src-5.7.1.tar.xz"; }; }; qttranslations = { - version = "5.7.0"; + version = "5.7.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.7/5.7.0/submodules/qttranslations-opensource-src-5.7.0.tar.xz"; - sha256 = "0vasg5ycg5rhj8ljk3aqg1sxfrlz3602n38fr14ip853yqld83ha"; - name = "qttranslations-opensource-src-5.7.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qttranslations-opensource-src-5.7.1.tar.xz"; + sha256 = "1rsq0bp6p8yf41h1nxrbclxr4xq8v025cbi0lq7yh917ac4xpv0n"; + name = "qttranslations-opensource-src-5.7.1.tar.xz"; }; }; qtvirtualkeyboard = { - version = "5.7.0"; + version = "5.7.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.7/5.7.0/submodules/qtvirtualkeyboard-opensource-src-5.7.0.tar.xz"; - sha256 = "0bzzci32f8ji94p2n6n16n838lrykyy3h822gfw77c93ivk3shyz"; - name = "qtvirtualkeyboard-opensource-src-5.7.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtvirtualkeyboard-opensource-src-5.7.1.tar.xz"; + sha256 = "1p9acm75am5lybmn8j2339vck808dmayk4xwbr67jpfigs9qp2xj"; + name = "qtvirtualkeyboard-opensource-src-5.7.1.tar.xz"; }; }; qtwayland = { - version = "5.7.0"; + version = "5.7.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.7/5.7.0/submodules/qtwayland-opensource-src-5.7.0.tar.xz"; - sha256 = "04dynjcr6gxi3hcqdf688a4hkabi2l17slpcx9k0f3dxygwcgf96"; - name = "qtwayland-opensource-src-5.7.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtwayland-opensource-src-5.7.1.tar.xz"; + sha256 = "1iq1c89y4ggq0dxjlf62jyhh8a9l3x7y914x84w5pby8h3hwagzj"; + name = "qtwayland-opensource-src-5.7.1.tar.xz"; }; }; qtwebchannel = { - version = "5.7.0"; + version = "5.7.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.7/5.7.0/submodules/qtwebchannel-opensource-src-5.7.0.tar.xz"; - sha256 = "05lqfidlh1ahdd1j9y20p2037qbcq51zkdzj2m8fwhn7ghbwvd1s"; - name = "qtwebchannel-opensource-src-5.7.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtwebchannel-opensource-src-5.7.1.tar.xz"; + sha256 = "16rij92dxy4k5231l3dpmhy7cnz0cjkn50cpzaf014zrdz3kmav3"; + name = "qtwebchannel-opensource-src-5.7.1.tar.xz"; }; }; qtwebengine = { - version = "5.7.0"; + version = "5.7.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.7/5.7.0/submodules/qtwebengine-opensource-src-5.7.0.tar.xz"; - sha256 = "0pfwsqjh107jqdw1mzzrhn38jxl64d8lljk4586im2ndypzn4mwq"; - name = "qtwebengine-opensource-src-5.7.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtwebengine-opensource-src-5.7.1.tar.xz"; + sha256 = "0ayc3j17nampy7pg464nbi09wr2d3pfbpqql789m0av37lz8h091"; + name = "qtwebengine-opensource-src-5.7.1.tar.xz"; }; }; qtwebsockets = { - version = "5.7.0"; + version = "5.7.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.7/5.7.0/submodules/qtwebsockets-opensource-src-5.7.0.tar.xz"; - sha256 = "0hwb2l7iwf4wf7l95dli8j3b7h0nffp56skfg1x810kzj0df26vl"; - name = "qtwebsockets-opensource-src-5.7.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtwebsockets-opensource-src-5.7.1.tar.xz"; + sha256 = "1laj0slwibs0bg69kgrdhc9k1s6yisq3pcsr0r9rhbkzisv7aajw"; + name = "qtwebsockets-opensource-src-5.7.1.tar.xz"; }; }; qtwebview = { - version = "5.7.0"; + version = "5.7.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.7/5.7.0/submodules/qtwebview-opensource-src-5.7.0.tar.xz"; - sha256 = "1i2ikv1ah4g3rc1pivxiw77p0yj79lialqww91fj781g66pky6l0"; - name = "qtwebview-opensource-src-5.7.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtwebview-opensource-src-5.7.1.tar.xz"; + sha256 = "17qmyayy67ji4d3i3cq0wb8s7hqjrw224zr2blzjc1827rlzkg5k"; + name = "qtwebview-opensource-src-5.7.1.tar.xz"; }; }; qtwinextras = { - version = "5.7.0"; + version = "5.7.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.7/5.7.0/submodules/qtwinextras-opensource-src-5.7.0.tar.xz"; - sha256 = "1fh7kqfwgwi9pcfg9b6hp2fpgvs938wl96ppqan79apxlhqy5awd"; - name = "qtwinextras-opensource-src-5.7.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtwinextras-opensource-src-5.7.1.tar.xz"; + sha256 = "1k7kiq0k7qwsn06p6sg13lr8hnnz7lvvsx18gas46dggkyj66514"; + name = "qtwinextras-opensource-src-5.7.1.tar.xz"; }; }; qtx11extras = { - version = "5.7.0"; + version = "5.7.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.7/5.7.0/submodules/qtx11extras-opensource-src-5.7.0.tar.xz"; - sha256 = "1yrkn8pqdbvbqykas3wx1vdfimhjkgx3s5jgdxib9dgmgyx6vjzw"; - name = "qtx11extras-opensource-src-5.7.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtx11extras-opensource-src-5.7.1.tar.xz"; + sha256 = "09z49jm70f5i0gcdz9a16z00pg96x8pz7vri5wpirh3fqqn0qnjz"; + name = "qtx11extras-opensource-src-5.7.1.tar.xz"; }; }; qtxmlpatterns = { - version = "5.7.0"; + version = "5.7.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.7/5.7.0/submodules/qtxmlpatterns-opensource-src-5.7.0.tar.xz"; - sha256 = "02z2qxamslg6sphnaykjcjfpypq4b69pb586s43vw4fplm72m21q"; - name = "qtxmlpatterns-opensource-src-5.7.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtxmlpatterns-opensource-src-5.7.1.tar.xz"; + sha256 = "1rgqnpg64gn5agmvjwy0am8hp5fpxl3cdkixr1yrsdxi5a6961d8"; + name = "qtxmlpatterns-opensource-src-5.7.1.tar.xz"; }; }; } diff --git a/pkgs/development/ocaml-modules/containers/default.nix b/pkgs/development/ocaml-modules/containers/default.nix index 19d91e44dcde..2e56635f3600 100644 --- a/pkgs/development/ocaml-modules/containers/default.nix +++ b/pkgs/development/ocaml-modules/containers/default.nix @@ -6,7 +6,7 @@ let mkpath = p: "${p}/lib/ocaml/${ocaml.version}/site-lib"; - version = "0.20"; + version = "0.22"; in @@ -17,7 +17,7 @@ stdenv.mkDerivation { owner = "c-cube"; repo = "ocaml-containers"; rev = "${version}"; - sha256 = "1gwflgdbvj293cwi434aafrsgpdgj2sv7r1ghm4l4k5xn17l0qzg"; + sha256 = "1kbf865z484z9nxskmg150xhfspikkvsxk0wbry5vvczqr63cwhq"; }; buildInputs = [ ocaml findlib ocamlbuild cppo gen sequence qtest ounit ocaml_oasis qcheck ]; diff --git a/pkgs/development/ocaml-modules/lablgtk/default.nix b/pkgs/development/ocaml-modules/lablgtk/default.nix index 93ebf4b9c92d..7408ee4b478c 100644 --- a/pkgs/development/ocaml-modules/lablgtk/default.nix +++ b/pkgs/development/ocaml-modules/lablgtk/default.nix @@ -8,11 +8,11 @@ assert stdenv.lib.versionAtLeast ocaml.version "3.12"; stdenv.mkDerivation rec { name = "${pname}-${version}"; - version = "2.18.3"; + version = "2.18.5"; src = fetchurl { - url = https://forge.ocamlcore.org/frs/download.php/1479/lablgtk-2.18.3.tar.gz; - sha256 = "1bybn3jafxf4cx25zvn8h2xj9agn1xjbn7j3ywxxqx6az7rfnnwp"; + url = https://forge.ocamlcore.org/frs/download.php/1627/lablgtk-2.18.5.tar.gz; + sha256 = "0cyj6sfdvzx8hw7553lhgwc0krlgvlza0ph3dk9gsxy047dm3wib"; }; buildInputs = [ocaml findlib pkgconfig gtk2 libgnomecanvas libglade gtksourceview camlp4]; diff --git a/pkgs/development/ocaml-modules/pcre/default.nix b/pkgs/development/ocaml-modules/pcre/default.nix index dd152262ca79..d2e0e0aa7278 100644 --- a/pkgs/development/ocaml-modules/pcre/default.nix +++ b/pkgs/development/ocaml-modules/pcre/default.nix @@ -1,7 +1,7 @@ {stdenv, buildOcaml, fetchurl, pcre, ocaml, findlib}: buildOcaml { - name = "ocaml-pcre"; + name = "pcre"; version = "7.1.1"; src = fetchurl { diff --git a/pkgs/development/tools/misc/rolespec/default.nix b/pkgs/development/tools/misc/rolespec/default.nix index f9254abe102f..6eb13bb242da 100644 --- a/pkgs/development/tools/misc/rolespec/default.nix +++ b/pkgs/development/tools/misc/rolespec/default.nix @@ -7,8 +7,8 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "nickjj"; repo = "rolespec"; - rev = "64a2092773b77f7a888522ceddd815e97b129321"; - sha256 = "1867acxy18a3cgi84iwsp37sxglaljn1dq50amahp5zkmd8x8vnz"; + rev = "d9ee530cd709168882059776c482fc37f46cb743"; + sha256 = "1jkidw6aqr0zfqwmcvlpi9qa140z2pxcfsd43xm5ikx6jcwjdrzl"; inherit name; }; @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { ''; downloadPage = "https://github.com/nickjj/rolespec"; license = licenses.gpl3; - version = "20160105"; + version = "20161104"; maintainers = [ maintainers.dochang ]; platforms = platforms.unix; }; diff --git a/pkgs/development/tools/sauce-connect/default.nix b/pkgs/development/tools/sauce-connect/default.nix index d573a6c5b60c..f8569249c06a 100644 --- a/pkgs/development/tools/sauce-connect/default.nix +++ b/pkgs/development/tools/sauce-connect/default.nix @@ -4,18 +4,18 @@ with lib; stdenv.mkDerivation rec { name = "sauce-connect-${version}"; - version = "4.4.0"; + version = "4.4.2"; src = fetchurl ( if stdenv.system == "x86_64-linux" then { url = "https://saucelabs.com/downloads/sc-${version}-linux.tar.gz"; - sha256 = "19zgnw0qn5f775p581mq5ry086rhcnnhqc6x82hzmwfysbsyl7xs"; + sha256 = "0n3c9ihrxqy4y4mzgchggqa2v7c0y9jw2yqnjdd7cf4nd24fixbq"; } else if stdenv.system == "i686-linux" then { url = "https://saucelabs.com/downloads/sc-${version}-linux32.tar.gz"; - sha256 = "1m4nf1yidwkmlwald0ycwzvnsp5p93nc4bs1xh67phw0b2db99x9"; + sha256 = "1pdvx4apd4x1bsyl8lhzlpv3jp3xzyv7yrsl3wjrql17p2asaba6"; } else { url = "https://saucelabs.com/downloads/sc-${version}-osx.zip"; - sha256 = "1bpdpwqa9sw2n7vw2g8q4c1mzgh8wgwn4p7sbryc2ki90yz8ibga"; + sha256 = "03kn7i0a6mpxfc6mz9h560wadhmw5qxn15is7cl9kgkz5j874xlz"; } ); diff --git a/pkgs/games/minecraft-server/default.nix b/pkgs/games/minecraft-server/default.nix index 8590f9a7420b..781dc5e31d83 100644 --- a/pkgs/games/minecraft-server/default.nix +++ b/pkgs/games/minecraft-server/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "minecraft-server-${version}"; - version = "1.11"; + version = "1.11.1"; src = fetchurl { url = "http://s3.amazonaws.com/Minecraft.Download/versions/${version}/minecraft_server.${version}.jar"; - sha256 = "10vgvkklv3l66cvin2ikva2nj86gjl6p9ffizd6r89ixv1grcxrj"; + sha256 = "161cwwcv73zisac1biz9arrby8y8n0j4bn9hz9rvy8dszlrbq0l0"; }; preferLocalBuild = true; diff --git a/pkgs/os-specific/darwin/apple-sdk/default.nix b/pkgs/os-specific/darwin/apple-sdk/default.nix index 7a85790c57e6..1148fe5c4a16 100644 --- a/pkgs/os-specific/darwin/apple-sdk/default.nix +++ b/pkgs/os-specific/darwin/apple-sdk/default.nix @@ -1,42 +1,29 @@ -{ stdenv, fetchurl, xar, xz, cpio, pkgs, python }: +{ stdenv, fetchurl, xar, gzip, cpio, pkgs }: let - # TODO: make this available to other packages and generalize the unpacking a bit - # from https://gist.github.com/pudquick/ff412bcb29c9c1fa4b8d - unpbzx = fetchurl { - url = "https://gist.githubusercontent.com/pudquick/ff412bcb29c9c1fa4b8d/raw/24b25538ea8df8d0634a2a6189aa581ccc6a5b4b/parse_pbzx2.py"; - sha256 = "0jgp6qbfl36i0jlz7as5zk2w20z4ca8wlrhdw49lwsld6wi3rfhc"; - }; - # sadly needs to be exported because security_tool needs it sdk = stdenv.mkDerivation rec { - version = "10.11"; + version = "10.9"; name = "MacOS_SDK-${version}"; - # This URL comes from https://swscan.apple.com/content/catalogs/others/index-10.11-1.sucatalog, which we found by: - # 1. Google: site:swscan.apple.com and look for a name that seems appropriate for your version - # 2. In the resulting file, search for a file called DevSDK ending in .pkg - # 3. ??? - # 4. Profit src = fetchurl { - url = "http://swcdn.apple.com/content/downloads/61/58/031-85396/fsu2775ydsciy13wycm3zngxrjcp0eqsl2/DevSDK_OSX1011.pkg"; - sha256 = "182yh8li653pjrzgk7s2dvsqm7vwkk6ry8n31qqs8c0xr67yrqgl"; + url = "http://swcdn.apple.com/content/downloads/27/02/031-06182/xxog8vxu8i6af781ivf4uhy6yt1lslex34/DevSDK_OSX109.pkg"; + sha256 = "16b7aplha5573yl1d44nl2yxzp0w2hafihbyh7930wrcvba69iy4"; }; - buildInputs = [ xar xz cpio python ]; + buildInputs = [ xar gzip cpio ]; phases = [ "unpackPhase" "installPhase" "fixupPhase" ]; unpackPhase = '' xar -x -f $src - python ${unpbzx} Payload ''; installPhase = '' start="$(pwd)" mkdir -p $out cd $out - cat $start/Payload.*.xz | xz -d | cpio -idm + cat $start/Payload | gzip -d | cpio -idm mv usr/* . rmdir usr @@ -127,7 +114,6 @@ let popd >/dev/null } - linkFramework "${name}.framework" ''; diff --git a/pkgs/os-specific/darwin/apple-sdk/frameworks.nix b/pkgs/os-specific/darwin/apple-sdk/frameworks.nix index cc99de258b23..3ecb35114220 100644 --- a/pkgs/os-specific/darwin/apple-sdk/frameworks.nix +++ b/pkgs/os-specific/darwin/apple-sdk/frameworks.nix @@ -52,7 +52,6 @@ with frameworks; with libs; { GSS = []; GameController = []; GameKit = [ Foundation ]; - Hypervisor = []; ICADevices = [ Carbon CF IOBluetooth ]; IMServicePlugIn = []; IOBluetoothUI = [ IOBluetooth ]; @@ -117,6 +116,4 @@ with frameworks; with libs; { OpenDirectory = []; Quartz = [ QuickLook QTKit ]; QuartzCore = [ ApplicationServices CF CoreVideo OpenCL ]; - - vmnet = []; } diff --git a/pkgs/os-specific/linux/kernel/linux-3.12.nix b/pkgs/os-specific/linux/kernel/linux-3.12.nix index 72fbe15b02dd..95ca51a972e9 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.12.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.12.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "3.12.68"; + version = "3.12.69"; extraMeta.branch = "3.12"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "0k4kwxmm6vj840k4v6iyswsajaxsb5g9vrc7mzr4grflfbjrgh14"; + sha256 = "1pzghmj0j2shms4n3knryigy73qssskd6awbgk6mmyg42wypbcmm"; }; kernelPatches = args.kernelPatches; diff --git a/pkgs/os-specific/linux/kernel/linux-3.18.nix b/pkgs/os-specific/linux/kernel/linux-3.18.nix index 4a18f2e498b9..727126de388d 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.18.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.18.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "3.18.44"; + version = "3.18.45"; extraMeta.branch = "3.18"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "1cjdh9w2q164r53k06vv6nhxwjzm69nha5wndp8r1hjywjwcqqan"; + sha256 = "1qwvqrlzpf57zvh57dsdk4c4swgbasf2ab75vcn2py8l7jl6rxf0"; }; kernelPatches = args.kernelPatches; diff --git a/pkgs/os-specific/linux/multipath-tools/default.nix b/pkgs/os-specific/linux/multipath-tools/default.nix index f60ece0fceca..0e0178e8845b 100644 --- a/pkgs/os-specific/linux/multipath-tools/default.nix +++ b/pkgs/os-specific/linux/multipath-tools/default.nix @@ -15,6 +15,8 @@ stdenv.mkDerivation rec { ' libmultipath/defaults.h sed -i -e 's,\$(DESTDIR)/\(usr/\)\?,$(prefix)/,g' \ kpartx/Makefile libmpathpersist/Makefile + sed -i -e "s,GZIP = .*, GZIP = gzip -9n -c," \ + Makefile.inc ''; nativeBuildInputs = [ gzip ]; diff --git a/pkgs/os-specific/linux/wireguard/default.nix b/pkgs/os-specific/linux/wireguard/default.nix index e1b17f8f9fcd..b164530938e6 100644 --- a/pkgs/os-specific/linux/wireguard/default.nix +++ b/pkgs/os-specific/linux/wireguard/default.nix @@ -6,11 +6,11 @@ assert kernel != null -> stdenv.lib.versionAtLeast kernel.version "4.1"; let name = "wireguard-${version}"; - version = "0.0.20161209"; + version = "0.0.20161218"; src = fetchurl { url = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz"; - sha256 = "11n8dq8a8w0qj8xg5np9w02kmk14hn5hphv2h4bjw9hs8yxvkaya"; + sha256 = "d805035d3e99768e69d8cdeb8fb5250a59b994ce127fceb71a078582c30f5597"; }; meta = with stdenv.lib; { diff --git a/pkgs/servers/http/tomcat/default.nix b/pkgs/servers/http/tomcat/default.nix index edf1e59931ed..909b26f162b0 100644 --- a/pkgs/servers/http/tomcat/default.nix +++ b/pkgs/servers/http/tomcat/default.nix @@ -51,14 +51,13 @@ in { tomcat85 = common { versionMajor = "8"; - versionMinor = "5.8"; - sha256 = "1rfws897m09pbnb1jc4684didpklfhqp86szv2jcqzdx0hlfxxs0"; + versionMinor = "5.9"; + sha256 = "1dy8bf18jwyi6p7ayb96gbhd4iyfq4d37s3qxnlll8vklfx388np"; }; tomcatUnstable = common { versionMajor = "9"; - versionMinor = "0.0.M13"; - sha256 = "0im3w4iqpar7x50vg7c9zkxyqf9x53xs5jvcq79xqgrmcqb9lk91"; + versionMinor = "0.0.M15"; + sha256 = "1spbq5vh2dplp83ki3fbbwl0klxq36s4rwkpcjdnwjxjymg9k432"; }; - } diff --git a/pkgs/servers/monitoring/nagios/default.nix b/pkgs/servers/monitoring/nagios/default.nix index c4d60cabaa39..5d7becb16525 100644 --- a/pkgs/servers/monitoring/nagios/default.nix +++ b/pkgs/servers/monitoring/nagios/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "nagios-${version}"; - version = "4.2.3"; + version = "4.2.4"; src = fetchurl { url = "mirror://sourceforge/nagios/nagios-4.x/${name}/${name}.tar.gz"; - sha256 = "0p16sm5pkbzf4py30hwzm38194cl23wfzsvkhk4jkf3p1fq7xvl3"; + sha256 = "0w0blbwiw0ps04b7gkyyk89qkgwsxh6gydhmggbm1kl3ar3mq1dh"; }; patches = [ ./nagios.patch ]; diff --git a/pkgs/shells/nix-zsh-completions/default.nix b/pkgs/shells/nix-zsh-completions/default.nix index af7b4a746f4d..5faca2fa8e84 100644 --- a/pkgs/shells/nix-zsh-completions/default.nix +++ b/pkgs/shells/nix-zsh-completions/default.nix @@ -6,8 +6,8 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "spwhitt"; repo = "nix-zsh-completions"; - rev = "0.2"; - sha256 = "0wimjdxnkw1lzhjn28zm4pgbij86ym0z17ayivpzz27g0sacimga"; + rev = "0.3"; + sha256 = "1vwkd4nppjrvy6xb0vx4z73awrhaah1433dp6h4ghi3cdrrjn7ri"; }; installPhase = '' @@ -20,6 +20,6 @@ stdenv.mkDerivation rec { description = "ZSH completions for Nix, NixOS, and NixOps"; license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.all; - maintainers = [ stdenv.lib.maintainers.spwhitt ]; + maintainers = [ stdenv.lib.maintainers.spwhitt stdenv.lib.maintainers.olejorgenb ]; }; } diff --git a/pkgs/shells/zsh/default.nix b/pkgs/shells/zsh/default.nix index 537df67d4478..c48140462002 100644 --- a/pkgs/shells/zsh/default.nix +++ b/pkgs/shells/zsh/default.nix @@ -2,11 +2,11 @@ let - version = "5.3"; + version = "5.3.1"; documentation = fetchurl { url = "mirror://sourceforge/zsh/zsh-${version}-doc.tar.gz"; - sha256 = "0cvkdw7x6i4m2brc9aakw8d3bmp6baziv72amlq9jd65r421bq88"; + sha256 = "0hbqn1zg3x5i9klqfzhizk88jzy8pkg65r9k41b3cn42lg3ncsy1"; }; in @@ -16,7 +16,7 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://sourceforge/zsh/zsh-${version}.tar.gz"; - sha256 = "0vcsgc1ymqhq0acklhlq5skgj27z597x2a7nx5g3j6q4jvx778hx"; + sha256 = "03h42gjqx7yb7qggi7ha0ndsggnnav1qm9vx737jwmiwzy8ab51x"; }; buildInputs = [ ncurses pcre ]; diff --git a/pkgs/tools/admin/certbot/default.nix b/pkgs/tools/admin/certbot/default.nix index 998b8d2e13de..8ff147faacc4 100644 --- a/pkgs/tools/admin/certbot/default.nix +++ b/pkgs/tools/admin/certbot/default.nix @@ -4,13 +4,13 @@ python2Packages.buildPythonApplication rec { name = "certbot-${version}"; - version = "0.6.0"; + version = "0.9.3"; src = fetchFromGitHub { owner = "certbot"; repo = "certbot"; rev = "v${version}"; - sha256 = "1x0prlldkgg0hxmya4m5h3k3c872wr0jylmzpr3m04mk339yiw0c"; + sha256 = "03yfr8vlq62l0h14qk03flrkbvbv9mc5cf6rmh37naj8jwpl8cic"; }; propagatedBuildInputs = with python2Packages; [ @@ -32,7 +32,7 @@ python2Packages.buildPythonApplication rec { patchPhase = '' substituteInPlace certbot/notify.py --replace "/usr/sbin/sendmail" "/var/setuid-wrappers/sendmail" - substituteInPlace certbot/le_util.py --replace "sw_vers" "/usr/bin/sw_vers" + substituteInPlace certbot/util.py --replace "sw_vers" "/usr/bin/sw_vers" ''; postInstall = '' diff --git a/pkgs/tools/admin/simp_le/default.nix b/pkgs/tools/admin/simp_le/default.nix index b4ed398541f0..aef077e21a06 100644 --- a/pkgs/tools/admin/simp_le/default.nix +++ b/pkgs/tools/admin/simp_le/default.nix @@ -1,26 +1,16 @@ { stdenv, fetchFromGitHub, fetchpatch, pythonPackages }: pythonPackages.buildPythonApplication rec { - name = "simp_le-2016-04-17"; + name = "simp_le-2016-12-16"; + # kuba/simp_le seems unmaintained src = fetchFromGitHub { - owner = "kuba"; + owner = "zenhack"; repo = "simp_le"; - rev = "3a103b76f933f9aef782a47401dd2eff5057a6f7"; - sha256 = "0x8gqazn09m30bn1l7xnf8snhbb7yz7sb09imciqmm4jqdvn797z"; + rev = "63a43b8547cd9fbc87db6bcd9497c6e37f73abef"; + sha256 = "04dr8lvcpi797722lsy06nxhlihrxdqgdy187pg3hl1ki2iq3ixx"; }; - patches = [ - (fetchpatch { - url = "https://github.com/kuba/simp_le/commit/4bc788fdd611c4118c3f86b5f546779723aca5a7.patch"; - sha256 = "0036p11qn3plydv5s5z6i28r6ihy1ipjl0y8la0izpkiq273byfc"; - }) - (fetchpatch { - url = "https://github.com/kuba/simp_le/commit/9ec7efe593cadb46348dc6924c1e6a31f0f9e636.patch"; - sha256 = "0n3m94n14y9c42185ly47d061g6awc8vb8xs9abffaigxv59k06j"; - }) - ]; - propagatedBuildInputs = with pythonPackages; [ acme ]; meta = with stdenv.lib; { diff --git a/pkgs/tools/cd-dvd/nrg2iso/default.nix b/pkgs/tools/cd-dvd/nrg2iso/default.nix new file mode 100644 index 000000000000..35414f6e776a --- /dev/null +++ b/pkgs/tools/cd-dvd/nrg2iso/default.nix @@ -0,0 +1,23 @@ +{stdenv, fetchurl}: + +stdenv.mkDerivation rec { + name = "nrg2iso-${version}"; + version = "0.4"; + + src = fetchurl { + url = "gregory.kokanosky.free.fr/v4/linux/${name}.tar.gz"; + sha256 = "18sam7yy50rbfhjixwd7wx7kmfn1x1y5j80vwfxi5v408s39s115"; + }; + + installPhase = '' + mkdir -pv $out/bin/ + cp -v nrg2iso $out/bin/nrg2iso + ''; + + meta = with stdenv.lib; { + description = "A linux utils for converting CD (or DVD) image generated by Nero Burning Rom to ISO format"; + homepage = http://gregory.kokanosky.free.fr/v4/linux/nrg2iso.en.html; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/misc/lnav/default.nix b/pkgs/tools/misc/lnav/default.nix index a3b40edb46ca..23e823eb9632 100644 --- a/pkgs/tools/misc/lnav/default.nix +++ b/pkgs/tools/misc/lnav/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { owner = "tstack"; repo = "lnav"; rev = "v${meta.version}"; - sha256 = "06h0hy8k0w692df2490dshxf2x8qcnw5myyp0k5jkc63ai2ra6aq"; + sha256 = "0pag2rl7b6s2xfl80c629vhwsdvvlhcdy6732yvpgfv94w0zyjp9"; inherit name; }; @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { ''; downloadPage = "https://github.com/tstack/lnav/releases"; license = licenses.bsd2; - version = "0.8.0"; + version = "0.8.1"; maintainers = [ maintainers.dochang ]; }; diff --git a/pkgs/tools/misc/parted/default.nix b/pkgs/tools/misc/parted/default.nix index 58e7a17a57f3..68240210e746 100644 --- a/pkgs/tools/misc/parted/default.nix +++ b/pkgs/tools/misc/parted/default.nix @@ -29,10 +29,9 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional (devicemapper == null) "--disable-device-mapper" ++ stdenv.lib.optional enableStatic "--enable-static"; - # Tests are currently failing because Hydra runs builds as uid 0. - # It'd be better to try to fix these tests, but this is blocking - # all NixOS Hydra builds right now. - doCheck = false; + # Tests were previously failing due to Hydra running builds as uid 0. + # That should hopefully be fixed now. + doCheck = true; preCheck = stdenv.lib.optionalString doCheck diff --git a/pkgs/tools/misc/yank/default.nix b/pkgs/tools/misc/yank/default.nix index 5186ec2121bf..6cae19473402 100644 --- a/pkgs/tools/misc/yank/default.nix +++ b/pkgs/tools/misc/yank/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { owner = "mptre"; repo = "yank"; rev = "v${meta.version}"; - sha256 = "0iv3ilyjcq6cd429qkg8mfpwagkb30617z0kdjlhk2s74chyaghm"; + sha256 = "1m8pnarm8n5x6ylbzxv8j9amylrllw166arrj4cx9f2jp2zbzcic"; inherit name; }; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { ''; downloadPage = "https://github.com/mptre/yank/releases"; license = licenses.mit; - version = "0.7.0"; + version = "0.7.1"; maintainers = [ maintainers.dochang ]; platforms = platforms.unix; }; diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index 808ba21ab660..a1ed2d9657fb 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -15,11 +15,11 @@ with stdenv.lib; buildPythonApplication rec { name = "youtube-dl-${version}"; - version = "2016.12.15"; + version = "2016.12.20"; src = fetchurl { url = "https://yt-dl.org/downloads/${version}/${name}.tar.gz"; - sha256 = "85d937a6edb8c14f8eac1b17d2e5d45574c7ec3f2cb792781ac1d8fb6a6ca39e"; + sha256 = "f80d47d5e2a236ea6c9d8b4636199aea01a041607ce7b544babedb0fe1ce59a5"; }; buildInputs = [ makeWrapper zip ] ++ optional generateManPage pandoc; diff --git a/pkgs/tools/networking/stun/default.nix b/pkgs/tools/networking/stun/default.nix index 3eade48a614c..8f9636041fff 100644 --- a/pkgs/tools/networking/stun/default.nix +++ b/pkgs/tools/networking/stun/default.nix @@ -20,8 +20,8 @@ stdenv.mkDerivation rec { preBuild = '' tar Jxvf ${srcManpages} debian/manpages - gzip -9 debian/manpages/stun.1 - gzip -9 debian/manpages/stund.8 + gzip -9n debian/manpages/stun.1 + gzip -9n debian/manpages/stund.8 ''; installPhase = '' diff --git a/pkgs/tools/networking/zerotierone/default.nix b/pkgs/tools/networking/zerotierone/default.nix index ba41fcdd687a..d97a60497452 100644 --- a/pkgs/tools/networking/zerotierone/default.nix +++ b/pkgs/tools/networking/zerotierone/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { mkdir -p $man/share/man/man8 for cmd in zerotier-one.8 zerotier-cli.1 zerotier-idtool.1; do - cat doc/$cmd | gzip -9 > $man/share/man/man8/$cmd.gz + cat doc/$cmd | gzip -9n > $man/share/man/man8/$cmd.gz done ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 72355e8a7e42..d5f1791f355e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1099,6 +1099,8 @@ in mdf2iso = callPackage ../tools/cd-dvd/mdf2iso { }; + nrg2iso = callPackage ../tools/cd-dvd/nrg2iso { }; + libceph = ceph.lib; ceph = callPackage ../tools/filesystems/ceph { boost = boost159; }; ceph-dev = ceph; @@ -1880,6 +1882,10 @@ in stdenv = overrideCC stdenv gcc49; }; + gnome15 = callPackage ../applications/misc/gnome15 { + inherit (gnome2) gnome_python gnome_python_desktop; + }; + gnokii = callPackage ../tools/misc/gnokii { }; gnuapl = callPackage ../development/interpreters/gnu-apl { }; @@ -14809,6 +14815,8 @@ in ssr = callPackage ../applications/audio/soundscape-renderer {}; + ssrc = callPackage ../applications/audio/ssrc { }; + stalonetray = callPackage ../applications/window-managers/stalonetray {}; stp = callPackage ../applications/science/logic/stp {}; @@ -17656,11 +17664,7 @@ in xcftools = callPackage ../tools/graphics/xcftools { }; - xhyve = callPackage ../applications/virtualization/xhyve { - inherit (darwin.apple_sdk.frameworks) Hypervisor vmnet; - inherit (darwin.apple_sdk.libs) xpc; - inherit (darwin) libobjc; - }; + xhyve = callPackage ../applications/virtualization/xhyve { }; xinput_calibrator = callPackage ../tools/X11/xinput_calibrator { }; diff --git a/pkgs/top-level/default.nix b/pkgs/top-level/default.nix index 658f149908c7..db3abb531f19 100644 --- a/pkgs/top-level/default.nix +++ b/pkgs/top-level/default.nix @@ -49,8 +49,8 @@ in let # reasonable default. platform = args.platform - or (config.platform - or (import ./platforms.nix).selectPlatformBySystem system); + or ( config.platform + or ((import ./platforms.nix).selectPlatformBySystem system) ); # A few packages make a new package set to draw their dependencies from. # (Currently to get a cross tool chain, or forced-i686 package.) Rather than diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a03b5a8168ae..53d27af0dd26 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -729,6 +729,27 @@ in { }; }; + python-uinput = buildPythonPackage rec { + name = "python-uinput-${version}"; + version = "0.11.2"; + + src = pkgs.fetchurl { + url = "mirror://pypi/p/python-uinput/${name}.tar.gz"; + sha256 = "033zqiypjz0nigav6vz0s57pbzikvds55mxphrdpkdbpdikjnfcr"; + }; + + buildInputs = [ pkgs.udev ]; + + NIX_CFLAGS_LINK = [ "-ludev" ]; + + meta = with stdenv.lib; { + description = "Pythonic API to Linux uinput kernel module"; + homepage = "http://tjjr.fi/sw/python-uinput/"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ abbradar ]; + }; + }; + almir = buildPythonPackage rec { name = "almir-0.1.8"; @@ -3059,12 +3080,12 @@ in { }; bottle = buildPythonPackage rec { - version = "0.12.9"; + version = "0.12.11"; name = "bottle-${version}"; src = pkgs.fetchurl { url = "mirror://pypi/b/bottle/${name}.tar.gz"; - sha256 = "0l80a1qkg7zbi8s077brfgm5w4ypwxgq9rvsvw16snc5jfsj82py"; + sha256 = "0cd787lzggs933qfav6xicx5c78dz6npwgg3xc4rhah44nbqz5d1"; }; propagatedBuildInputs = with self; [ setuptools ]; @@ -8870,12 +8891,9 @@ in { sha256 = "1rwmajsy9qhl3qhhy5mw0xmr3n8abxcq8baidpn0sxv6yjg2369z"; }; - # Disable certain tests. Reported upstream at: - # https://github.com/jflesch/libpillowfight/issues/2 - postPatch = '' - sed -i -e '/test_\(all_2\|ace\)/i \ @unittest.expectedFailure' \ - tests/tests_ace.py tests/tests_all.py - ''; + # Disable tests because they're designed to only work on Debian: + # https://github.com/jflesch/libpillowfight/issues/2#issuecomment-268259174 + doCheck = false; # Python 2.x is not supported, see: # https://github.com/jflesch/libpillowfight/issues/1 @@ -20132,6 +20150,7 @@ in { buildInputs = with self; [ unittest2 ]; doCheck = !isPyPy; + force-rebuild = 1; # fix transient test suite error at http://hydra.nixos.org/build/45083762 meta = { homepage = https://launchpad.net/pyflakes; @@ -20471,12 +20490,30 @@ in { }; }; + pyinputevent = buildPythonPackage rec { + name = "pyinputevent-2016-10-18"; + + src = pkgs.fetchFromGitHub { + owner = "ntzrmtthihu777"; + repo = "pyinputevent"; + rev = "d2075fa5db5d8a402735fe788bb33cf9fe272a5b"; + sha256 = "0rkis0xp8f9jc00x7jb9kbvhdla24z1vl30djqa6wy6fx0cr6sib"; + }; + + meta = { + homepage = "https://github.com/ntzrmtthihu777/pyinputevent"; + description = "Python interface to the Input Subsystem's input_event and uinput"; + license = licenses.bsd3; + platforms = platforms.linux; + }; + }; + pyinotify = buildPythonPackage rec { - name = "pyinotify"; + name = "pyinotify-${version}"; version = "0.9.6"; src = pkgs.fetchurl { - url = "mirror://pypi/p/${name}/${name}-${version}.tar.gz"; + url = "mirror://pypi/p/${name}/${name}.tar.gz"; sha256 = "1x3i9wmzw33fpkis203alygfnrkcmq9w1aydcm887jh6frfqm6cw"; }; @@ -26182,6 +26219,32 @@ in { }; }; + virtkey = buildPythonPackage rec { + name = "virtkey-${version}"; + majorVersion = "0.63"; + version = "${majorVersion}.0"; + + src = pkgs.fetchurl { + url = "https://launchpad.net/virtkey/${majorVersion}/${version}/+download/virtkey-${version}.tar.gz"; + sha256 = "0hd99hrxn6bh3rxcrdnad5cqjsphrn1s6fzx91q07d44k6cg6qcr"; + }; + + nativeBuildInputs = [ pkgs.pkgconfig ]; + + buildInputs = + [ pkgs.gtk2 ] + ++ (with pkgs.xorg; [ libX11 libXtst libXi libxkbfile xextproto xproto ]); + + meta = { + description = "Extension to emulate keypresses and to get the layout information from the X server"; + homepage = "https://launchpad.net/virtkey"; + license = licenses.gpl3; + maintainers = with maintainers; [ abbradar ]; + }; + }; + + + virtual-display = buildPythonPackage rec { name = "PyVirtualDisplay-0.1.5"; |