diff --git a/doc/languages-frameworks/haskell.section.md b/doc/languages-frameworks/haskell.section.md index c0dc741eabc..7677c366191 100644 --- a/doc/languages-frameworks/haskell.section.md +++ b/doc/languages-frameworks/haskell.section.md @@ -1047,6 +1047,19 @@ As you can see, `packunused` finds out that although the testsuite component has no redundant dependencies the library component of `scientific-0.3.5.1` depends on `ghc-prim` which is unused in the library. +### Using hackage2nix with nixpkgs + +Hackage package derivations are found in the +[`hackage-packages.nix`](https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/haskell-modules/hackage-packages.nix) +file within `nixpkgs` and are used as the initial package set for +`haskellPackages`. The `hackage-packages.nix` file is not meant to be edited +by hand, but rather autogenerated by [`hackage2nix`](https://github.com/NixOS/cabal2nix/tree/master/hackage2nix), +which by default uses the [`configuration-hackage2nix.yaml`](https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/haskell-modules/configuration-hackage2nix.yaml) +file to generate all the derivations. + +To modify the contents `configuration-hackage2nix.yaml`, follow the +instructions on [`hackage2nix`](https://github.com/NixOS/cabal2nix/tree/master/hackage2nix). + ## Other resources - The Youtube video [Nix Loves Haskell](https://www.youtube.com/watch?v=BsBhi_r-OeE) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 60484838756..2ca02c20c5c 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2867,11 +2867,6 @@ github = "nocoolnametom"; name = "Tom Doggett"; }; - nonfreeblob = { - email = "nonfreeblob@yandex.com"; - github = "nonfreeblob"; - name = "nonfreeblob"; - }; notthemessiah = { email = "brian.cohen.88@gmail.com"; github = "notthemessiah"; diff --git a/nixos/modules/config/shells-environment.nix b/nixos/modules/config/shells-environment.nix index 398660967c5..9dc4749b08d 100644 --- a/nixos/modules/config/shells-environment.nix +++ b/nixos/modules/config/shells-environment.nix @@ -70,7 +70,7 @@ in description = '' Shell script code called during global environment initialisation after all variables and profileVariables have been set. - This code is asumed to be shell-independent, which means you should + This code is assumed to be shell-independent, which means you should stick to pure sh without sh word split. ''; type = types.lines; diff --git a/nixos/modules/programs/zsh/oh-my-zsh.nix b/nixos/modules/programs/zsh/oh-my-zsh.nix index b995d390b27..f4df4e983e4 100644 --- a/nixos/modules/programs/zsh/oh-my-zsh.nix +++ b/nixos/modules/programs/zsh/oh-my-zsh.nix @@ -3,7 +3,30 @@ with lib; let + cfg = config.programs.zsh.ohMyZsh; + + mkLinkFarmEntry = name: dir: + let + env = pkgs.buildEnv { + name = "zsh-${name}-env"; + paths = cfg.customPkgs; + pathsToLink = "/share/zsh/${dir}"; + }; + in + { inherit name; path = "${env}/share/zsh/${dir}"; }; + + mkLinkFarmEntry' = name: mkLinkFarmEntry name name; + + custom = + if cfg.custom != null then cfg.custom + else if length cfg.customPkgs == 0 then null + else pkgs.linkFarm "oh-my-zsh-custom" [ + (mkLinkFarmEntry' "themes") + (mkLinkFarmEntry "completions" "site-functions") + (mkLinkFarmEntry' "plugins") + ]; + in { options = { @@ -34,10 +57,19 @@ in }; custom = mkOption { - default = ""; - type = types.str; + default = null; + type = with types; nullOr str; description = '' Path to a custom oh-my-zsh package to override config of oh-my-zsh. + (Can't be used along with `customPkgs`). + ''; + }; + + customPkgs = mkOption { + default = []; + type = types.listOf types.package; + description = '' + List of custom packages that should be loaded into `oh-my-zsh`. ''; }; @@ -67,7 +99,7 @@ in environment.systemPackages = [ cfg.package ]; - programs.zsh.interactiveShellInit = with builtins; '' + programs.zsh.interactiveShellInit = '' # oh-my-zsh configuration generated by NixOS export ZSH=${cfg.package}/share/oh-my-zsh @@ -75,8 +107,8 @@ in "plugins=(${concatStringsSep " " cfg.plugins})" } - ${optionalString (stringLength(cfg.custom) > 0) - "ZSH_CUSTOM=\"${cfg.custom}\"" + ${optionalString (custom != null) + "ZSH_CUSTOM=\"${custom}\"" } ${optionalString (stringLength(cfg.theme) > 0) @@ -92,5 +124,15 @@ in source $ZSH/oh-my-zsh.sh ''; + + assertions = [ + { + assertion = cfg.custom != null -> cfg.customPkgs == []; + message = "If `cfg.custom` is set for `ZSH_CUSTOM`, `customPkgs` can't be used!"; + } + ]; + }; + + meta.doc = ./oh-my-zsh.xml; } diff --git a/nixos/modules/programs/zsh/oh-my-zsh.xml b/nixos/modules/programs/zsh/oh-my-zsh.xml new file mode 100644 index 00000000000..b74da8630ee --- /dev/null +++ b/nixos/modules/programs/zsh/oh-my-zsh.xml @@ -0,0 +1,125 @@ + + +Oh my ZSH + +oh-my-zsh is a framework +to manage your ZSH configuration +including completion scripts for several CLI tools or custom prompt themes. + +
Basic usage +The module uses the oh-my-zsh package with all available features. The +initial setup using Nix expressions is fairly similar to the configuration format +of oh-my-zsh. + + +{ + programs.ohMyZsh = { + enable = true; + plugins = [ "git" "python" "man" ]; + theme = "agnoster"; + }; +} + + +For a detailed explanation of these arguments please refer to the +oh-my-zsh docs. + +The expression generates the needed +configuration and writes it into your /etc/zshrc. +
+ +
Custom additions + +Sometimes third-party or custom scripts such as a modified theme may be needed. +oh-my-zsh provides the +ZSH_CUSTOM +environment variable for this which points to a directory with additional scripts. + +The module can do this as well: + + +{ + programs.ohMyZsh.custom = "~/path/to/custom/scripts"; +} + +
+ +
Custom environments + +There are several extensions for oh-my-zsh packaged in nixpkgs. +One of them is nix-zsh-completions +which bundles completion scripts and a plugin for oh-my-zsh. + +Rather than using a single mutable path for ZSH_CUSTOM, it's also possible to +generate this path from a list of Nix packages: + + +{ pkgs, ... }: +{ + programs.ohMyZsh.customPkgs = with pkgs; [ + pkgs.nix-zsh-completions + # and even more... + ]; +} + + +Internally a single store path will be created using buildEnv. +Please refer to the docs of +buildEnv +for further reference. + +Please keep in mind that this is not compatible with programs.ohMyZsh.custom +as it requires an immutable store path while custom shall remain mutable! An evaluation failure +will be thrown if both custom and customPkgs are set. +
+ +
Package your own customizations + +If third-party customizations (e.g. new themes) are supposed to be added to oh-my-zsh +there are several pitfalls to keep in mind: + + + + To comply with the default structure of ZSH the entire output needs to be written to + $out/share/zsh. + + + Completion scripts are supposed to be stored at $out/share/zsh/site-functions. This directory + is part of the fpath + and the package should be compatible with pure ZSH setups. The module will automatically link + the contents of site-functions to completions directory in the proper store path. + + + The plugins directory needs the structure pluginname/pluginname.plugin.zsh + as structured in the upstream repo. + + + + + +A derivation for oh-my-zsh may look like this: + +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "exemplary-zsh-customization-${version}"; + version = "1.0.0"; + src = fetchFromGitHub { + # path to the upstream repository + }; + + dontBuild = true; + installPhase = '' + mkdir -p $out/share/zsh/site-functions + cp {themes,plugins} $out/share/zsh + cp completions $out/share/zsh/site-functions + ''; +} + + +
+ diff --git a/nixos/modules/services/editors/infinoted.nix b/nixos/modules/services/editors/infinoted.nix index bba21caca85..9cc8d421270 100644 --- a/nixos/modules/services/editors/infinoted.nix +++ b/nixos/modules/services/editors/infinoted.nix @@ -10,8 +10,8 @@ in { package = mkOption { type = types.package; - default = pkgs.libinfinity.override { daemon = true; }; - defaultText = "pkgs.libinfinity.override { daemon = true; }"; + default = pkgs.libinfinity; + defaultText = "pkgs.libinfinity"; description = '' Package providing infinoted ''; @@ -119,7 +119,7 @@ in { users.groups = optional (cfg.group == "infinoted") { name = "infinoted"; }; - + systemd.services.infinoted = { description = "Gobby Dedicated Server"; @@ -129,7 +129,7 @@ in { serviceConfig = { Type = "simple"; Restart = "always"; - ExecStart = "${cfg.package}/bin/infinoted-${versions.majorMinor cfg.package.version} --config-file=/var/lib/infinoted/infinoted.conf"; + ExecStart = "${cfg.package.infinoted} --config-file=/var/lib/infinoted/infinoted.conf"; User = cfg.user; Group = cfg.group; PermissionsStartOnly = true; diff --git a/nixos/modules/services/x11/display-managers/default.nix b/nixos/modules/services/x11/display-managers/default.nix index 78095e7ce0b..66886f23737 100644 --- a/nixos/modules/services/x11/display-managers/default.nix +++ b/nixos/modules/services/x11/display-managers/default.nix @@ -56,10 +56,6 @@ let # Start PulseAudio if enabled. ${optionalString (config.hardware.pulseaudio.enable) '' - ${optionalString (!config.hardware.pulseaudio.systemWide) - "${config.hardware.pulseaudio.package.out}/bin/pulseaudio --start" - } - # Publish access credentials in the root window. if ${config.hardware.pulseaudio.package.out}/bin/pulseaudio --dump-modules | grep module-x11-publish &> /dev/null; then ${config.hardware.pulseaudio.package.out}/bin/pactl load-module module-x11-publish "display=$DISPLAY" diff --git a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py index 1dc888c5822..6016a85ea06 100644 --- a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py +++ b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py @@ -42,7 +42,7 @@ def write_loader_conf(profile, generation): else: f.write("default nixos-generation-%d\n" % (generation)) if not @editor@: - f.write("editor 0"); + f.write("editor 0\n"); f.write("console-mode @consoleMode@\n"); os.rename("@efiSysMountPoint@/loader/loader.conf.tmp", "@efiSysMountPoint@/loader/loader.conf") diff --git a/pkgs/applications/audio/pulseeffects/default.nix b/pkgs/applications/audio/pulseeffects/default.nix index 0ee63c20485..f4b799f5520 100644 --- a/pkgs/applications/audio/pulseeffects/default.nix +++ b/pkgs/applications/audio/pulseeffects/default.nix @@ -42,13 +42,13 @@ let ]; in stdenv.mkDerivation rec { name = "pulseeffects-${version}"; - version = "4.2.3"; + version = "4.2.6"; src = fetchFromGitHub { owner = "wwmm"; repo = "pulseeffects"; rev = "v${version}"; - sha256 = "0s3lc0xkr48wzk0b6akq4yw19n0iwfi9jyji8bpdgj5y7kjg5mqm"; + sha256 = "1b5h760bb1wgn4avirjjri5fcfqvnsr076qnhrdiqcic3vgircsm"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/audio/setbfree/default.nix b/pkgs/applications/audio/setbfree/default.nix index 4d843545423..905de343117 100644 --- a/pkgs/applications/audio/setbfree/default.nix +++ b/pkgs/applications/audio/setbfree/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "setbfree-${version}"; - version = "0.8.5"; + version = "0.8.7"; src = fetchurl { url = "https://github.com/pantherb/setBfree/archive/v${version}.tar.gz"; - sha256 = "0qfccny0hh9lq54272mzmxvfz2jmzcgigjkjwn6v9h6n00gi5bw4"; + sha256 = "07s320r67cz0cdjdsbcwn0fw3xs0wz7lgrybqpws2skvkbls228q"; }; patchPhase = '' diff --git a/pkgs/applications/audio/x42-plugins/default.nix b/pkgs/applications/audio/x42-plugins/default.nix index 3540869f361..cb581bc8303 100644 --- a/pkgs/applications/audio/x42-plugins/default.nix +++ b/pkgs/applications/audio/x42-plugins/default.nix @@ -3,12 +3,12 @@ , libGLU, lv2, gtk2, cairo, pango, fftwFloat, zita-convolver }: stdenv.mkDerivation rec { - version = "20180320"; + version = "20180803"; name = "x42-plugins-${version}"; src = fetchurl { url = "https://gareus.org/misc/x42-plugins/${name}.tar.xz"; - sha256 = "167ly9nxqq3g0j35i9jv9rvd8qp4i9ncfcjxmg972cp6q8ak8mdl"; + sha256 = "1v7p6vnkcbzyvmcysabhmn603cndzx9mwzaw5dppy4wd687vhgis"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/editors/gobby/default.nix b/pkgs/applications/editors/gobby/default.nix index faad4bfe72b..e59def88de5 100644 --- a/pkgs/applications/editors/gobby/default.nix +++ b/pkgs/applications/editors/gobby/default.nix @@ -1,23 +1,22 @@ { avahiSupport ? false # build support for Avahi in libinfinity -, gnomeSupport ? false # build support for Gnome(gnome-vfs) -, stdenv, fetchurl, pkgconfig -, gtkmm2, gsasl, gtksourceview, libxmlxx, libinfinity, intltool -, gnome_vfs ? null}: +, stdenv, fetchurl, fetchFromGitHub, autoconf, automake, pkgconfig, wrapGAppsHook +, gtkmm3, gsasl, gtksourceview3, libxmlxx, libinfinity, intltool, itstool, gnome3 }: let libinf = libinfinity.override { gtkWidgets = true; inherit avahiSupport; }; - in stdenv.mkDerivation rec { - - name = "gobby-0.5.0"; - src = fetchurl { - url = "http://releases.0x539.de/gobby/${name}.tar.gz"; - sha256 = "165x0r668ma5blziisvbr8qig3jw9hf7i6w8r7wwvz3wsac3bswc"; + name = "gobby-unstable-2018-04-03"; + src = fetchFromGitHub { + owner = "gobby"; + repo = "gobby"; + rev = "ea4df27c9b6b885434797b0071ce198b23f9f63b"; + sha256 = "0q7lq64yn16lxvj4jphs8y9194h0xppj8k7y9x8b276krraak2az"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gtkmm2 gsasl gtksourceview libxmlxx libinf intltool ] - ++ stdenv.lib.optional gnomeSupport gnome_vfs; + nativeBuildInputs = [ autoconf automake pkgconfig intltool itstool gnome3.yelp-tools wrapGAppsHook ]; + buildInputs = [ gtkmm3 gsasl gtksourceview3 libxmlxx libinf ]; + + preConfigure = "./autogen.sh"; meta = with stdenv.lib; { homepage = http://gobby.0x539.de/; diff --git a/pkgs/applications/editors/sigil/default.nix b/pkgs/applications/editors/sigil/default.nix index a6f454deaf5..ef0d98455f2 100644 --- a/pkgs/applications/editors/sigil/default.nix +++ b/pkgs/applications/editors/sigil/default.nix @@ -6,10 +6,10 @@ stdenv.mkDerivation rec { name = "sigil-${version}"; - version = "0.9.9"; + version = "0.9.10"; src = fetchFromGitHub { - sha256 = "01pvc7k54mx5c7h1qiw92d4j459psv7n9xg94qbinf8vmpvkrcbw"; + sha256 = "11r7043kbqv67z1aqk929scsg6yllldpl8icl32dw3dai7f1c658"; rev = version; repo = "Sigil"; owner = "Sigil-Ebook"; diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix index fd14bba282c..b8eff972ebd 100644 --- a/pkgs/applications/misc/dbeaver/default.nix +++ b/pkgs/applications/misc/dbeaver/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { name = "dbeaver-ce-${version}"; - version = "5.1.4"; + version = "5.1.5"; desktopItem = makeDesktopItem { name = "dbeaver"; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://dbeaver.io/files/${version}/dbeaver-ce-${version}-linux.gtk.x86_64.tar.gz"; - sha256 = "14i7b3l89rkhqq4zgsdbvcs9pp60djv0rjbm86fpk2wi4zkrlzi5"; + sha256 = "17ai2gxnz1wj5m282sib9qhvy3665km2ig1ixxdklmk8apgdl1xr"; }; installPhase = '' diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix index 9872ff23f34..e753c5ded95 100644 --- a/pkgs/applications/misc/josm/default.nix +++ b/pkgs/applications/misc/josm/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "josm-${version}"; - version = "14026"; + version = "14066"; src = fetchurl { url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar"; - sha256 = "1ysi23j2yj5b6cn3xdsrl4xp56klpw4xa7c4gv90z2dllx06mqli"; + sha256 = "06mhaz5vr19ydqc5irhgcbl0s8fifwvaq60iz2nsnlxb1pw89xia"; }; buildInputs = [ jre10 makeWrapper ]; diff --git a/pkgs/applications/misc/masterpdfeditor/default.nix b/pkgs/applications/misc/masterpdfeditor/default.nix index ac6cf2b91c6..3155ab678d8 100644 --- a/pkgs/applications/misc/masterpdfeditor/default.nix +++ b/pkgs/applications/misc/masterpdfeditor/default.nix @@ -1,11 +1,14 @@ { stdenv, fetchurl, sane-backends, qtbase, qtsvg, nss, autoPatchelfHook }: + let - version = "5.1.00"; + version = "5.1.12"; + in stdenv.mkDerivation { name = "masterpdfeditor-${version}"; + src = fetchurl { url = "https://code-industry.net/public/master-pdf-editor-${version}_qt5.amd64.tar.gz"; - sha256 = "1s2zhx9xr1ny5s8hmlb99v3z1v26vmx87iixk8cdgndz046p9bg9"; + sha256 = "1i3pdrhnlj06phm36gs42s6b94pigcfb8wa5dhmplxn0dqp434hq"; }; nativeBuildInputs = [ autoPatchelfHook ]; @@ -15,21 +18,24 @@ in stdenv.mkDerivation { dontStrip = true; installPhase = '' - p=$out/opt/masterpdfeditor - mkdir -p $out/bin $p $out/share/applications $out/share/pixmaps + runHook preInstall - substituteInPlace masterpdfeditor5.desktop \ - --replace 'Exec=/opt/master-pdf-editor-5' "Exec=$out/bin" \ - --replace 'Path=/opt/master-pdf-editor-5' "Path=$out/bin" \ - --replace 'Icon=/opt/master-pdf-editor-5' "Icon=$out/share/pixmaps" - cp -v masterpdfeditor5.png $out/share/pixmaps/ - cp -v masterpdfeditor5.desktop $out/share/applications + p=$out/opt/masterpdfeditor + mkdir -p $out/bin - cp -v masterpdfeditor5 $p/ - ln -s $p/masterpdfeditor5 $out/bin/masterpdfeditor5 - cp -v -r stamps templates lang fonts $p + substituteInPlace masterpdfeditor5.desktop \ + --replace 'Exec=/opt/master-pdf-editor-5' "Exec=$out/bin" \ + --replace 'Path=/opt/master-pdf-editor-5' "Path=$out/bin" \ + --replace 'Icon=/opt/master-pdf-editor-5' "Icon=$out/share/pixmaps" - install -D license.txt $out/share/$name/LICENSE + install -Dm644 -t $out/share/pixmaps masterpdfeditor5.png + install -Dm644 -t $out/share/applications masterpdfeditor5.desktop + install -Dm755 -t $p masterpdfeditor5 + install -Dm644 license.txt $out/share/$name/LICENSE + ln -s $p/masterpdfeditor5 $out/bin/masterpdfeditor5 + cp -v -r stamps templates lang fonts $p + + runHook postInstall ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/networking/protonmail-bridge/default.nix b/pkgs/applications/networking/protonmail-bridge/default.nix index 7c501401824..2c13cc23b01 100644 --- a/pkgs/applications/networking/protonmail-bridge/default.nix +++ b/pkgs/applications/networking/protonmail-bridge/default.nix @@ -2,7 +2,7 @@ libsecret, libGL, libpulseaudio, glib, makeWrapper, makeDesktopItem }: let - version = "1.0.5-1"; + version = "1.0.6-1"; description = '' An application that runs on your computer in the background and seamlessly encrypts @@ -23,7 +23,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://protonmail.com/download/protonmail-bridge_${version}_amd64.deb"; - sha256 = "1fsf4l5c9ii370fgy721a71h34g7vjfddscal3jblb4mm3ywzxfl"; + sha256 = "1as4xdsik2w9clbrwp1k00491324cg6araz3jq2m013yg1cild28"; }; nativeBuildInputs = [ makeWrapper ]; @@ -35,11 +35,11 @@ in stdenv.mkDerivation rec { ''; installPhase = '' - mkdir -p $out/{bin,lib,share} - mkdir -p $out/share/{applications,icons/hicolor/scalable/apps} + mkdir -p $out/{bin,lib,share/applications} + # mkdir -p $out/share/{applications,icons/hicolor/scalable/apps} cp -r usr/lib/protonmail/bridge/Desktop-Bridge{,.sh} $out/lib - cp usr/share/icons/protonmail/Desktop-Bridge.svg $out/share/icons/hicolor/scalable/apps/desktop-bridge.svg + # cp usr/share/icons/protonmail/Desktop-Bridge.svg $out/share/icons/hicolor/scalable/apps/desktop-bridge.svg cp ${desktopItem}/share/applications/* $out/share/applications ln -s $out/lib/Desktop-Bridge $out/bin/Desktop-Bridge diff --git a/pkgs/applications/office/jameica/default.nix b/pkgs/applications/office/jameica/default.nix new file mode 100644 index 00000000000..7b804151d4a --- /dev/null +++ b/pkgs/applications/office/jameica/default.nix @@ -0,0 +1,90 @@ +{ stdenv, fetchFromGitHub, makeDesktopItem, makeWrapper, ant, jdk, jre, xmlstarlet, gtk2, glib, xorg, Cocoa }: + +let + _version = "2.8.1"; + _build = "449"; + version = "${_version}-${_build}"; + name = "jameica-${version}"; + + swtSystem = if stdenv.system == "i686-linux" then "linux" + else if stdenv.system == "x86_64-linux" then "linux64" + else if stdenv.system == "x86_64-darwin" then "macos64" + else throw "Unsupported system: ${stdenv.system}"; + + launcher = '' + #!${stdenv.shell} + exec ${jre}/bin/java -Xmx512m ${ stdenv.lib.optionalString stdenv.isDarwin ''-Xdock:name="Jameica" -XstartOnFirstThread''} de.willuhn.jameica.Main "$@" + ''; + + desktopItem = makeDesktopItem { + name = "jameica"; + exec = "jameica"; + comment = "Free Runtime Environment for Java Applications."; + desktopName = "Jameica"; + genericName = "Jameica"; + categories = "Application;Office;"; + }; +in +stdenv.mkDerivation rec { + inherit name version; + + nativeBuildInputs = [ ant jdk makeWrapper xmlstarlet ]; + buildInputs = stdenv.lib.optionals stdenv.isLinux [ gtk2 glib xorg.libXtst ] + ++ stdenv.lib.optional stdenv.isDarwin Cocoa; + + src = fetchFromGitHub { + owner = "willuhn"; + repo = "jameica"; + rev = "V_${builtins.replaceStrings ["."] ["_"] _version}_BUILD_${_build}"; + sha256 = "1w25lxjskn1yxllbv0vgvcc9f9xvgv9430dm4b59ia9baf98syd2"; + }; + + # there is also a build.gradle, but it only seems to be used to vendor 3rd party libraries + # and is not able to build the application itself + buildPhase = '' + (cd build; ant init compile jar) + ''; + + # jameica itself loads ./plugin.xml to determine it's version. + # Unfortunately, the version attribute there seems to be wrong, + # so it thinks it's older than it really is, + # and refuses to load plugins destined for its version. + # Set version manually to workaround that. + postPatch = '' + xml ed -u '/system/@version' -v '${version}' plugin.xml > plugin.xml.new + mv plugin.xml.new plugin.xml + ''; + + installPhase = '' + mkdir -p $out/libexec $out/lib $out/bin $out/share/applications + + # copy libraries except SWT + cp $(find lib -type f -iname '*.jar' | grep -ve 'swt/.*/swt.jar') $out/lib/ + # copy platform-specific SWT + cp lib/swt/${swtSystem}/swt.jar $out/lib + + install -Dm644 releases/${_version}-*/jameica/jameica.jar $out/libexec/ + install -Dm644 plugin.xml $out/libexec/ + install -Dm644 build/jameica-icon.png $out/share/pixmaps/jameica.png + cp ${desktopItem}/share/applications/* $out/share/applications/ + + echo "${launcher}" > $out/bin/jameica + chmod +x $out/bin/jameica + wrapProgram $out/bin/jameica --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath buildInputs} \ + --set CLASSPATH "$out/libexec/jameica.jar:$out/lib/*" \ + --run "cd $out/libexec" + # jameica expects its working dir set to the "program directory" + ''; + + meta = with stdenv.lib; { + homepage = https://www.willuhn.de/products/jameica/; + description = "Free Runtime Environment for Java Applications."; + longDescription = '' + Runtime Environment for plugins like Hibiscus (HBCI Online Banking), + SynTAX (accounting) and JVerein (club management). + ''; + license = licenses.gpl2Plus; + platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ]; + maintainers = with maintainers; [ flokli ]; + }; +} diff --git a/pkgs/applications/science/astronomy/gildas/aarch64.patch b/pkgs/applications/science/astronomy/gildas/aarch64.patch new file mode 100644 index 00000000000..40696a03dec --- /dev/null +++ b/pkgs/applications/science/astronomy/gildas/aarch64.patch @@ -0,0 +1,12 @@ +diff -ruN gildas-src-jul18a/admin/define-system.sh gildas-src-jul18a.aarch64/admin/define-system.sh +--- gildas-src-jul18a/admin/define-system.sh 2018-06-12 15:22:32.000000000 +0200 ++++ gildas-src-jul18a.aarch64/admin/define-system.sh 2018-07-21 13:05:52.000000000 +0200 +@@ -174,7 +174,7 @@ + DEFAULT_CONFIG= # Default config is empty + case `uname` in + Linux) +- if [ `uname -m | grep -c "x86_64"` -ne 0 ]; then ++ if [ `uname -m | grep -c "64"` -ne 0 ]; then + GAG_MACHINE=x86_64 + else + GAG_MACHINE=pc diff --git a/pkgs/applications/science/astronomy/gildas/default.nix b/pkgs/applications/science/astronomy/gildas/default.nix index bd4587bf227..7ede379fb49 100644 --- a/pkgs/applications/science/astronomy/gildas/default.nix +++ b/pkgs/applications/science/astronomy/gildas/default.nix @@ -7,13 +7,13 @@ let in stdenv.mkDerivation rec { - srcVersion = "jun18a"; - version = "20180601_a"; + srcVersion = "jul18a"; + version = "20180701_a"; name = "gildas-${version}"; src = fetchurl { - url = "http://www.iram.fr/~gildas/dist/gildas-src-${srcVersion}.tar.gz"; - sha256 = "0k4x0g69fphb1759cwcw6bbs8imwmq0qwj6zqixxk60skk4n4jvb"; + url = "http://www.iram.fr/~gildas/dist/archive/gildas/gildas-src-${srcVersion}.tar.gz"; + sha256 = "0kl3zf6b1kv8hgsfrarsnm2gnrdax3vi8f856249y4nxsa7lbv2i"; }; enableParallelBuilding = true; @@ -22,20 +22,16 @@ stdenv.mkDerivation rec { buildInputs = [ gtk2-x11 lesstif cfitsio python27Env ]; - patches = [ ./wrapper.patch ./return-error-code.patch ./clang.patch ]; + patches = [ ./wrapper.patch ./return-error-code.patch ./clang.patch ./mod.patch ./aarch64.patch ]; configurePhase='' substituteInPlace admin/wrapper.sh --replace '%%OUT%%' $out substituteInPlace admin/wrapper.sh --replace '%%PYTHONHOME%%' ${python27Env} + substituteInPlace utilities/main/gag-makedepend.pl --replace '/usr/bin/perl' ${perl}/bin/perl source admin/gildas-env.sh -c gfortran -o openmp echo "gag_doc: $out/share/doc/" >> kernel/etc/gag.dico.lcl ''; - buildPhase='' - make depend - make - ''; - postInstall='' mkdir -p $out/bin cp -a ../gildas-exe-${srcVersion}/* $out diff --git a/pkgs/applications/science/astronomy/gildas/mod.patch b/pkgs/applications/science/astronomy/gildas/mod.patch new file mode 100644 index 00000000000..c917b4674f1 --- /dev/null +++ b/pkgs/applications/science/astronomy/gildas/mod.patch @@ -0,0 +1,17 @@ +diff -ruN gildas-src-jul18a/admin/Makefile.build gildas-src-jul18a.mod/admin/Makefile.build +--- gildas-src-jul18a/admin/Makefile.build 2018-06-14 14:36:54.000000000 +0200 ++++ gildas-src-jul18a.mod/admin/Makefile.build 2018-07-06 13:31:46.000000000 +0200 +@@ -291,6 +291,13 @@ + win-$(LIB_IDENTITY)-und.def -o $@ $(FLDLIBS) $(LIB_DEPENDS) $(ADD_LIBS) $(SYS_LIBS)) + endif + ++# Dummy rules for modules just so that make consider the module a ++# valid dependency when first parsing the makefiles. This rule should ++# never be applied as the modules are a by-product of the compilation ++# of the object ++$(builddir)/%.mod: ++ echo "dummy" > /dev/null ++ + # Fortran executables + $(bindir)/% : $(builddir)/%.o | $(bindir) + $(FC) $(ALL_FLDFLAGS) $< $(OBJECTS) -o $@ \ diff --git a/pkgs/applications/science/biology/vcftools/default.nix b/pkgs/applications/science/biology/vcftools/default.nix index 394973692dc..a6f52ae97b5 100755 --- a/pkgs/applications/science/biology/vcftools/default.nix +++ b/pkgs/applications/science/biology/vcftools/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "vcftools"; - version = "0.1.15"; + version = "0.1.16"; src = fetchFromGitHub { repo = pname; owner = "vcftools"; rev = "v${version}"; - sha256 = "15yxr4kidqb42gkbd6rjra6b07wpl6rgivlh9q73yavh5myafqk4"; + sha256 = "0msb09d2cnm8rlpg8bsc1lhjddvp3kf3i9dsj1qs4qgsdlzhxkyx"; }; buildInputs = [ autoreconfHook pkgconfig zlib perl ]; diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix index 85514ed4786..592b348d03f 100644 --- a/pkgs/applications/version-management/gitea/default.nix +++ b/pkgs/applications/version-management/gitea/default.nix @@ -7,13 +7,13 @@ with stdenv.lib; buildGoPackage rec { name = "gitea-${version}"; - version = "1.4.3"; + version = "1.5.0"; src = fetchFromGitHub { owner = "go-gitea"; repo = "gitea"; rev = "v${version}"; - sha256 = "0rl20dhj3in8w3ngix42qly077zrwg578aa2nxxznmn9k8xdvfpd"; + sha256 = "0gp777x8yjbqvz9i79qv3bn3hrlp1bn7ib57r7w5a7jmr9rd0nca"; }; patches = [ ./static-root-path.patch ]; diff --git a/pkgs/applications/video/qstopmotion/default.nix b/pkgs/applications/video/qstopmotion/default.nix index 1fce30edbdf..2dd76b36d05 100644 --- a/pkgs/applications/video/qstopmotion/default.nix +++ b/pkgs/applications/video/qstopmotion/default.nix @@ -1,20 +1,29 @@ -{ stdenv, fetchurl, qt5, ffmpeg, guvcview -, cmake, ninja, libxml2, gettext, pkgconfig, libgphoto2, gphoto2, v4l_utils -, libv4l, pcre }: +{ stdenv, lib, fetchurl, qt5, ffmpeg, guvcview, cmake, ninja, libxml2 +, gettext, pkgconfig, libgphoto2, gphoto2, v4l_utils, libv4l, pcre +, qwt, extra-cmake-modules }: stdenv.mkDerivation rec { pname = "qstopmotion"; - version = "2.3.2"; + version = "2.4.0"; name = "${pname}-${version}"; src = fetchurl { - url = "mirror://sourceforge/project/${pname}/Version_2_3_2/${name}-Source.tar.gz"; - sha256 = "1vbiznwyc05jqg0dpmgxmvf7kdzmlck0i8v2c5d69kgrdnaypcrf"; + url = "mirror://sourceforge/project/${pname}/Version_2_4_0/${name}-Source.tar.gz"; + sha256 = "0pbyq6nrr9g3crlsng660768167s0fybvcpzbfc0w9kkhs2jwrr2"; }; - buildInputs = [ qt5.qtbase ffmpeg guvcview v4l_utils libv4l pcre ]; + buildInputs = with qt5; [ v4l_utils libv4l pcre qtbase qtmultimedia ffmpeg guvcview + qwt qtquickcontrols qtimageformats qtxmlpatterns ]; - nativeBuildInputs = [ pkgconfig cmake ninja gettext libgphoto2 gphoto2 libxml2 libv4l ]; + nativeBuildInputs = [ pkgconfig cmake extra-cmake-modules ninja + gettext libgphoto2 gphoto2 libxml2 libv4l ]; + + patchPhase = '' + substituteInPlace CMakeLists.txt \ + --replace "find_package(Qt5 REQUIRED COMPONENTS Core Widgets Xml" \ + "find_package(Qt5 REQUIRED COMPONENTS Core Widgets Xml Multimedia" + grep -rl 'qwt' . | xargs sed -i 's@@@g' + ''; meta = with stdenv.lib; { homepage = http://www.qstopmotion.org; diff --git a/pkgs/data/fonts/unifont/default.nix b/pkgs/data/fonts/unifont/default.nix index 5e658e458fd..3dc7bba981f 100644 --- a/pkgs/data/fonts/unifont/default.nix +++ b/pkgs/data/fonts/unifont/default.nix @@ -2,16 +2,16 @@ stdenv.mkDerivation rec { name = "unifont-${version}"; - version = "11.0.01"; + version = "11.0.02"; ttf = fetchurl { url = "mirror://gnu/unifont/${name}/${name}.ttf"; - sha256 = "03nnfnh4j60a4hy0d4hqpnvhlfx437hp4g1wjfjy91vzrcbmvkwi"; + sha256 = "0l8p07m566131xdinv1pcfc578jpvn72n6dhqmgivp8myai2xkzx"; }; pcf = fetchurl { url = "mirror://gnu/unifont/${name}/${name}.pcf.gz"; - sha256 = "03bqqz2ipy3afhwsfy30c2v97cc27grw11lc0vzcvrgvin9ys2v1"; + sha256 = "1hcl71fjchngcb2b4mwl4hhx886faaniv86x2xgk8850766qpnmy"; }; nativeBuildInputs = [ mkfontscale mkfontdir ]; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "1ncllq42x1mlblf6h44garc3b5hkxv9dkpgbaipzll22p1l29yrf"; + outputHash = "16ni07cfw38s7cj8bdsfi7fa1qahm3k90cmm4gn40qvz35i17x15"; meta = with stdenv.lib; { description = "Unicode font for Base Multilingual Plane"; diff --git a/pkgs/desktops/mate/mate-media/default.nix b/pkgs/desktops/mate/mate-media/default.nix index efc9a3d2c39..11f71d10937 100644 --- a/pkgs/desktops/mate/mate-media/default.nix +++ b/pkgs/desktops/mate/mate-media/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "mate-media-${version}"; - version = "1.20.1"; + version = "1.21.0"; src = fetchurl { url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; - sha256 = "1db47m80qfb1xyrg1qxwvmkc53qp97yhvh86fgwjv00x96c3j9s9"; + sha256 = "0mgx4xjarpyvyaw0p0jnh74447y6zd93fvpi12078vyqr25dsi43"; }; buildInputs = [ diff --git a/pkgs/development/compilers/gambit/default.nix b/pkgs/development/compilers/gambit/default.nix index 77e8fb51602..36aa73f7274 100644 --- a/pkgs/development/compilers/gambit/default.nix +++ b/pkgs/development/compilers/gambit/default.nix @@ -1,4 +1,4 @@ -{ callPackage, fetchurl }: +{ stdenv, callPackage, fetchurl }: callPackage ./build.nix { version = "4.8.9"; @@ -7,4 +7,5 @@ callPackage ./build.nix { url = "http://www.iro.umontreal.ca/~gambit/download/gambit/v4.8/source/gambit-v4_8_9-devel.tgz"; sha256 = "1gwzz1ag9hlv266nvfq1bhwzrps3f2yghhffasjjqy8i8xwnry5p"; }; + inherit stdenv; } diff --git a/pkgs/development/compilers/gambit/unstable.nix b/pkgs/development/compilers/gambit/unstable.nix index 169ddb5a6a3..41d0ee930bf 100644 --- a/pkgs/development/compilers/gambit/unstable.nix +++ b/pkgs/development/compilers/gambit/unstable.nix @@ -1,10 +1,12 @@ -{ callPackage, fetchgit }: +{ stdenv, callPackage, fetchgit }: callPackage ./build.nix { - version = "unstable-2018-05-30"; + version = "unstable-2018-08-06"; +# git-version = "4.8.9-77-g91a4ad2c"; SRC = fetchgit { url = "https://github.com/feeley/gambit.git"; - rev = "ffe8841b56330eb86fd794b16dc7f83914ecc7c5"; - sha256 = "1xzkwa2f6zazybbgd5zynhr36krayhr29vsbras5ld63hkrxrp7q"; + rev = "91a4ad2c28375f067adedcaa61f9d66a4b536f4f"; + sha256 = "0px1ipvhh0hz8n38h6jv4y1nn163j8llvcy4l7p3hkdns5czwy1p"; }; + inherit stdenv; } diff --git a/pkgs/development/compilers/gerbil/default.nix b/pkgs/development/compilers/gerbil/default.nix index eaab0e71d3b..6fa9fcc3de8 100644 --- a/pkgs/development/compilers/gerbil/default.nix +++ b/pkgs/development/compilers/gerbil/default.nix @@ -1,4 +1,4 @@ -{ callPackage, fetchurl, gambit }: +{ stdenv, callPackage, fetchurl, gambit }: callPackage ./build.nix { version = "0.12-RELEASE"; @@ -8,4 +8,5 @@ callPackage ./build.nix { url = "https://github.com/vyzo/gerbil/archive/v0.12.tar.gz"; sha256 = "0nigr3mgrzai57q2jqac8f39zj8rcmic3277ynyzlgm8hhps71pq"; }; + inherit stdenv; } diff --git a/pkgs/development/compilers/gerbil/unstable.nix b/pkgs/development/compilers/gerbil/unstable.nix index 25c6b75fa03..66ead04b542 100644 --- a/pkgs/development/compilers/gerbil/unstable.nix +++ b/pkgs/development/compilers/gerbil/unstable.nix @@ -1,12 +1,13 @@ -{ callPackage, fetchgit, gambit-unstable }: +{ stdenv, callPackage, fetchgit, gambit-unstable }: callPackage ./build.nix { - version = "unstable-2018-05-12"; - git-version = "0.13-DEV-437-gaefdb47f"; + version = "unstable-2018-08-11"; + git-version = "0.13-DEV-542-g274e1a22"; GAMBIT = gambit-unstable; SRC = fetchgit { url = "https://github.com/vyzo/gerbil.git"; - rev = "aefdb47f3d1ceaa735fd5c3dcaac2aeb0d4d2436"; - sha256 = "0xhsilm5kix5lsmykv273npp1gk6dgx9axh266mimwh7j0nxf7ms"; + rev = "274e1a22b2d2b708d5582594274ab52ee9ba1686"; + sha256 = "10j44ar4xfl8xmh276zg1ykd3r0vy7w2f2cg4p8slwnk9r251g2s"; }; + inherit stdenv; } diff --git a/pkgs/development/compilers/ponyc/pony-stable.nix b/pkgs/development/compilers/ponyc/pony-stable.nix index f27147d9743..6dfb099242d 100644 --- a/pkgs/development/compilers/ponyc/pony-stable.nix +++ b/pkgs/development/compilers/ponyc/pony-stable.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "pony-stable-${version}"; - version = "0.1.4"; + version = "0.1.6"; src = fetchFromGitHub { owner = "ponylang"; repo = "pony-stable"; rev = version; - sha256 = "18ncxdk37r9sp2wnrgqj29nvqljqq9m154pkdv8b6b5k9knpradx"; + sha256 = "02lqba75psnxcxj2y8lm1fy1hmwa088nvxjghhpnlkqbwz7wa2sw"; }; buildInputs = [ ponyc ]; diff --git a/pkgs/development/compilers/reason/default.nix b/pkgs/development/compilers/reason/default.nix index 763b4ab0dbe..42969a5253e 100644 --- a/pkgs/development/compilers/reason/default.nix +++ b/pkgs/development/compilers/reason/default.nix @@ -3,13 +3,13 @@ buildOcaml rec { name = "reason"; - version = "3.3.2"; + version = "3.3.3"; src = fetchFromGitHub { owner = "facebook"; repo = "reason"; - rev = "68a4124c772ee25c4729b005c8643851b1e17b92"; - sha256 = "01v17m94ds98qk727mwpyx0a362zdf9s8x1fh8gp9jd9v3n6bc2d"; + rev = "fefe5e4db3a54a7946c2220ee037dd2f407011c9"; + sha256 = "1x0dbacgq9pa36zgzwrc0gm14wbb6v27y9bf7wcwk55a1ck0am18"; }; propagatedBuildInputs = [ menhir merlin_extend ppx_tools_versioned ]; diff --git a/pkgs/development/coq-modules/coq-ext-lib/default.nix b/pkgs/development/coq-modules/coq-ext-lib/default.nix index 877331383a7..5e6ee7fac6f 100644 --- a/pkgs/development/coq-modules/coq-ext-lib/default.nix +++ b/pkgs/development/coq-modules/coq-ext-lib/default.nix @@ -4,7 +4,8 @@ let params = { "8.5" = { version = "0.9.4"; sha256 = "1y66pamgsdxlq2w1338lj626ln70cwj7k53hxcp933g8fdsa4hp0"; }; "8.6" = { version = "0.9.5"; sha256 = "1b4cvz3llxin130g13calw5n1zmvi6wdd5yb8a41q7yyn2hd3msg"; }; - "8.7" = { version = "0.9.5"; sha256 = "1b4cvz3llxin130g13calw5n1zmvi6wdd5yb8a41q7yyn2hd3msg"; }; + "8.7" = { version = "0.9.7"; sha256 = "00v4bm4glv1hy08c8xsm467az6d1ashrznn8p2bmbmmp52lfg7ag"; }; + "8.8" = { version = "0.9.8"; sha256 = "0z1ix855kdjl7zw5ca664h5njd1x8mmvf5wi37fck4dj9dgamwlz"; }; }; param = params."${coq.coq-version}"; in diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 9b9b3ec63c2..e32ccfa1793 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -86,7 +86,7 @@ self: super: { name = "git-annex-${super.git-annex.version}-src"; url = "git://git-annex.branchable.com/"; rev = "refs/tags/" + super.git-annex.version; - sha256 = "1l6xgvn3l0kkly5jvg57msx09bf1jwdff7m61w8yf2pxsrh5ybxl"; + sha256 = "0a7h21cwfvprj5xfyivjzg2hbs71xp85l9v6kyp58mlqvwy3zffl"; }; }).override { dbus = if pkgs.stdenv.isLinux then self.dbus else null; @@ -727,7 +727,7 @@ self: super: { owner = "haskell-servant"; repo = "servant"; rev = "v${ver}"; - sha256 = "0bwd5dy3crn08dijn06dr3mdsww98kqxfp8v5mvrdws5glvcxdsg"; + sha256 = "0kqglih3rv12nmkzxvalhfaaafk4b2irvv9x5xmc48i1ns71y23l"; }}/doc"; buildInputs = with pkgs.pythonPackages; [ sphinx recommonmark sphinx_rtd_theme ]; makeFlags = "html"; diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index d5b54e3f8f7..21660cfb7d2 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -11467,8 +11467,8 @@ self: { pname = "ListLike"; version = "4.6"; sha256 = "16jsj979mzjrgmpa20pls9ganym3wsps49paks1sb1gmlmwyrkf1"; - revision = "1"; - editedCabalFile = "1mbfywf17nnwy2mc15zrsv0j30y1dpblim49nmndpbygq8j26y8j"; + revision = "2"; + editedCabalFile = "1mca2r4gjznqdh4kck5cjkn53isgkhvkf3ri09qsn7nsssvgki0g"; libraryHaskellDepends = [ array base bytestring containers deepseq dlist fmlist text utf8-string vector @@ -18139,17 +18139,21 @@ self: { }) {}; "Unique" = callPackage - ({ mkDerivation, base, containers, extra, hashable, hspec - , QuickCheck, unordered-containers + ({ mkDerivation, base, bytestring, containers, criterion, extra + , hashable, hspec, QuickCheck, quickcheck-instances + , unordered-containers }: mkDerivation { pname = "Unique"; - version = "0.4.7.2"; - sha256 = "0ssvg5sjhvadsfym02y0l712viv9xk2sfvrfs1q7260p7025aqdm"; + version = "0.4.7.5"; + sha256 = "0wd4rwbn765n2jyzwwwcghqh1qx69wb9ci7wmvw1ahzg0wbadbqz"; libraryHaskellDepends = [ base containers extra hashable unordered-containers ]; testHaskellDepends = [ base containers hspec QuickCheck ]; + benchmarkHaskellDepends = [ + base bytestring criterion hashable QuickCheck quickcheck-instances + ]; description = "It provides the functionality like unix \"uniq\" utility"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -23168,16 +23172,18 @@ self: { }) {}; "alphachar" = callPackage - ({ mkDerivation, base, directory, doctest, filepath, lens, parsec - , parsers, QuickCheck, template-haskell + ({ mkDerivation, ansi-wl-pprint, base, hedgehog, lens, parsec + , parsers, pretty, semigroups, tasty, tasty-hedgehog, tasty-hspec + , tasty-hunit, text }: mkDerivation { pname = "alphachar"; - version = "0.0.1"; - sha256 = "0pdpwxjyrnh6ydiacg67lk9hbmxb3188spml08v60iz1dmshy3iv"; - libraryHaskellDepends = [ base lens parsers ]; + version = "0.0.3"; + sha256 = "1wrd881kwzzfnjkp9ajy1gaxizd17zb60f7sbalwg4n38lk7qvhx"; + libraryHaskellDepends = [ base lens parsers semigroups ]; testHaskellDepends = [ - base directory doctest filepath parsec QuickCheck template-haskell + ansi-wl-pprint base hedgehog lens parsec parsers pretty tasty + tasty-hedgehog tasty-hspec tasty-hunit text ]; description = "A character between a-z"; license = stdenv.lib.licenses.bsd3; @@ -26076,8 +26082,8 @@ self: { }: mkDerivation { pname = "amqp-utils"; - version = "0.3.3.1"; - sha256 = "1psv3n3hgysica7dk9hcvkvxwx6fq8srhrxvpf7mb7mrzjyljvrk"; + version = "0.3.4.0"; + sha256 = "1p02nf9i8v17f9nyx76306zdq4qlvqf6j86i88kfnjkpb8hfxl84"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -26773,8 +26779,8 @@ self: { }: mkDerivation { pname = "antiope-athena"; - version = "5.0.1"; - sha256 = "1b8dcjm4a07wpn1kigz87lkm7rljlya43c46vw7my3svqy35a6dv"; + version = "6.0.0"; + sha256 = "13l8biwl66pn3n8jbbc2fbj3vk1w6rjnzrdmiimxl0nd7zm6vk4r"; libraryHaskellDepends = [ amazonka amazonka-athena amazonka-core base lens resourcet text unliftio-core @@ -26793,8 +26799,8 @@ self: { }: mkDerivation { pname = "antiope-core"; - version = "5.0.1"; - sha256 = "1s6b0lm5mf6dg1zrkmzfrqacgr1wa6lgphx0zq3kqzp2b7gdzkbv"; + version = "6.0.0"; + sha256 = "1cmfda3dfg282a8rg6hkqv17fzfia5c7vm4gh0jdib4ggl5yxcrv"; libraryHaskellDepends = [ amazonka amazonka-core base bytestring generic-lens http-client lens monad-logger mtl resourcet transformers unliftio-core @@ -26814,8 +26820,8 @@ self: { }: mkDerivation { pname = "antiope-dynamodb"; - version = "5.0.1"; - sha256 = "0nz6bhv1i7kwd8a4m951p3jkzwkzayb19r0ds3adrq5bp79ajgpy"; + version = "6.0.0"; + sha256 = "1i45fvxn75yd7fpypzz183j7q3n0kvrrxw78kr310a08fdngapn8"; libraryHaskellDepends = [ amazonka amazonka-core amazonka-dynamodb antiope-core base generic-lens lens text unliftio-core unordered-containers @@ -26835,8 +26841,8 @@ self: { }: mkDerivation { pname = "antiope-messages"; - version = "5.0.1"; - sha256 = "1g7nrdas5fz5rvx4yhmbk41r0ir8i5gwjmpyprbjggkipnqna5x4"; + version = "6.0.0"; + sha256 = "1km57vpm8q77lpxyvmpvgj6csrixf8kdxqnwxkg065ylk0cp1hw7"; libraryHaskellDepends = [ aeson amazonka amazonka-core amazonka-s3 amazonka-sqs antiope-s3 base generic-lens lens lens-aeson monad-loops network-uri text @@ -26859,8 +26865,8 @@ self: { }: mkDerivation { pname = "antiope-s3"; - version = "5.0.1"; - sha256 = "1nwcyapaxknhlfbb0xrklrxc8xs5bzriz5qs651jn9xi1awm2qxl"; + version = "6.0.0"; + sha256 = "1s4cixqkflf3s8g6x75783wwrr5973wls2axjj8raspa4qfl2zsn"; libraryHaskellDepends = [ amazonka amazonka-core amazonka-s3 base bytestring conduit conduit-extra exceptions generic-lens http-types lens monad-logger @@ -26881,8 +26887,8 @@ self: { }: mkDerivation { pname = "antiope-sns"; - version = "5.0.1"; - sha256 = "113yj69cb7qaqcs5yijwhqhzvlhh88rnbfcnix3y61cg3250iwkk"; + version = "6.0.0"; + sha256 = "0fbkd7r8iq8sjfa0k6kv8clld323i1xhib5k7kpl2zlan4xfk2k9"; libraryHaskellDepends = [ aeson amazonka amazonka-core amazonka-sns base generic-lens lens text unliftio-core @@ -26902,8 +26908,8 @@ self: { }: mkDerivation { pname = "antiope-sqs"; - version = "5.0.1"; - sha256 = "0if8yq8j14syr9ks74inz76ks1aspvrhzmn6444xni3bzz7dr2mq"; + version = "6.0.0"; + sha256 = "0xfaayajlzb9wvqnmlfwh990kzsy738qnscsyqnn07zp61047wxf"; libraryHaskellDepends = [ aeson amazonka amazonka-core amazonka-s3 amazonka-sqs antiope-messages antiope-s3 base generic-lens lens lens-aeson @@ -28734,18 +28740,18 @@ self: { }) {}; "ascii-string" = callPackage - ({ mkDerivation, base, bytestring, cereal, deferred-folds, foldl - , hashable, primitive, primitive-extras, QuickCheck + ({ mkDerivation, base, bytestring, cereal, deepseq, deferred-folds + , foldl, hashable, primitive, primitive-extras, QuickCheck , quickcheck-instances, rerebase, tasty, tasty-hunit , tasty-quickcheck }: mkDerivation { pname = "ascii-string"; - version = "1"; - sha256 = "054vi22vhn9bbv76spxbsml7141yqwgcy1fasm9mv2anw8kdzbq8"; + version = "1.0.1"; + sha256 = "0br053njgnfqwgmk7zz0fayiyycqq3sw8kxjpb2s9wx17arnq5kz"; libraryHaskellDepends = [ - base bytestring cereal deferred-folds foldl hashable primitive - primitive-extras + base bytestring cereal deepseq deferred-folds foldl hashable + primitive primitive-extras ]; testHaskellDepends = [ cereal QuickCheck quickcheck-instances rerebase tasty tasty-hunit @@ -30894,7 +30900,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "avro_0_3_4_0" = callPackage + "avro_0_3_4_1" = callPackage ({ mkDerivation, aeson, array, base, base16-bytestring, binary , bytestring, containers, data-binary-ieee754, directory, entropy , extra, fail, hashable, hspec, lens, lens-aeson, mtl, pure-zlib @@ -30903,8 +30909,8 @@ self: { }: mkDerivation { pname = "avro"; - version = "0.3.4.0"; - sha256 = "1242wr53an9av6kynv9wlgf997zdmxcq9fbjq2rgb8wf1hckxxzd"; + version = "0.3.4.1"; + sha256 = "1v6ixrm870182krvdj62waa701pwwq93ca2yjrmz00jkmblj9kxm"; libraryHaskellDepends = [ aeson array base base16-bytestring binary bytestring containers data-binary-ieee754 entropy fail hashable mtl pure-zlib scientific @@ -31893,15 +31899,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "backprop_0_2_6_0" = callPackage + "backprop_0_2_6_1" = callPackage ({ mkDerivation, base, containers, criterion, deepseq, directory , hmatrix, microlens, microlens-th, mwc-random, primitive , reflection, time, transformers, vector, vinyl }: mkDerivation { pname = "backprop"; - version = "0.2.6.0"; - sha256 = "0j2nr4wj05mz49sm9d5ahyvf5j4nmgndy60w2zqf93g18j8wi3yi"; + version = "0.2.6.1"; + sha256 = "1rn72fawix00byz7kyvn65g0h16mh8msiw6lx9l3xi1927hn28nj"; libraryHaskellDepends = [ base containers deepseq microlens primitive reflection transformers vector vinyl @@ -34213,31 +34219,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "binary_0_10_0_0" = callPackage - ({ mkDerivation, array, attoparsec, base, bytestring, Cabal, cereal - , containers, criterion, deepseq, directory, filepath - , generic-deriving, HUnit, mtl, QuickCheck, random, test-framework - , test-framework-quickcheck2, unordered-containers, zlib - }: - mkDerivation { - pname = "binary"; - version = "0.10.0.0"; - sha256 = "1lkh6cpayj7vdkkmacgkpi5dgypsjkx3yzjw6d3c3zp8fwsgwgk1"; - libraryHaskellDepends = [ array base bytestring containers ]; - testHaskellDepends = [ - array base bytestring Cabal containers directory filepath HUnit - QuickCheck random test-framework test-framework-quickcheck2 - ]; - benchmarkHaskellDepends = [ - array attoparsec base bytestring cereal containers criterion - deepseq directory filepath generic-deriving mtl - unordered-containers zlib - ]; - description = "Binary serialisation for Haskell values using lazy ByteStrings"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "binary-bits" = callPackage ({ mkDerivation, base, binary, bytestring, QuickCheck, random , test-framework, test-framework-quickcheck2 @@ -35265,8 +35246,8 @@ self: { ({ mkDerivation, base, bindings-DSL, lxc }: mkDerivation { pname = "bindings-lxc"; - version = "0.2.1"; - sha256 = "11rhw6593bnl1hzdn13px5zawbdanwz2219hm1ssxckwbkjlbvjg"; + version = "0.2.2"; + sha256 = "03nmhmggvnd3xqkg12212ysz7rr7n09vn9165qj5vw0qxr96q5n7"; libraryHaskellDepends = [ base bindings-DSL ]; librarySystemDepends = [ lxc ]; description = "Direct Haskell bindings to LXC (Linux containers) C API"; @@ -37940,8 +37921,8 @@ self: { }: mkDerivation { pname = "boolector"; - version = "0.0.0.3"; - sha256 = "0wi22ccshk2p4hgd286h9xz1zgm5ng4vr9z9k0kv3kqwyz0qy1qk"; + version = "0.0.0.4"; + sha256 = "0f5yfkkgarwkbdkxkjj8fsd7fgq683qjxyv88wqk724dx6wv3yn7"; libraryHaskellDepends = [ base containers directory mtl temporary ]; @@ -43757,6 +43738,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "cereal_0_5_7_0" = callPackage + ({ mkDerivation, array, base, bytestring, containers, ghc-prim + , QuickCheck, test-framework, test-framework-quickcheck2 + }: + mkDerivation { + pname = "cereal"; + version = "0.5.7.0"; + sha256 = "1j7imh2mzqcljld7sx0av69699955rpy3hzivi5723i6a9nszgbs"; + libraryHaskellDepends = [ + array base bytestring containers ghc-prim + ]; + testHaskellDepends = [ + base bytestring QuickCheck test-framework + test-framework-quickcheck2 + ]; + description = "A binary serialization library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "cereal-conduit" = callPackage ({ mkDerivation, base, bytestring, cereal, conduit, HUnit, mtl , resourcet, transformers @@ -65472,8 +65473,8 @@ self: { }: mkDerivation { pname = "dump-core"; - version = "0.1.3.1"; - sha256 = "1n0x8p4zzc73ysf18zyrkhwiyz6j4kgwwiml64zm7pyyhskvrh3p"; + version = "0.1.3.2"; + sha256 = "04p3x8lvf4if82xjin9cxhc3r478lp3zmr3xn33xqp37lmcqvr5k"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring containers directory filepath ghc monadLib @@ -66512,20 +66513,21 @@ self: { }) {}; "edges" = callPackage - ({ mkDerivation, base, cereal, contravariant, deferred-folds, foldl - , monad-par, pointed, potoki, potoki-cereal, primitive - , primitive-extras, profunctors, QuickCheck, quickcheck-instances - , rerebase, semigroupoids, tasty, tasty-hunit, tasty-quickcheck - , text, vector + ({ mkDerivation, base, cereal, contravariant, deepseq + , deferred-folds, foldl, hashable, monad-par, pointed, potoki + , potoki-cereal, primitive, primitive-extras, profunctors + , QuickCheck, quickcheck-instances, rerebase, semigroupoids, tasty + , tasty-hunit, tasty-quickcheck, text, unordered-containers, vector }: mkDerivation { pname = "edges"; - version = "0.6"; - sha256 = "1wc65nl987xvl8ryrbk8am1hslagaglb9xm79mfsm3fzjp6ck7gd"; + version = "0.9.1.1"; + sha256 = "12alvmgxp488sg1km1j7kjlsbdk8xh6kxdpyxbvz4js6v1z54y0p"; libraryHaskellDepends = [ - base cereal contravariant deferred-folds foldl monad-par pointed - potoki potoki-cereal primitive primitive-extras profunctors - QuickCheck semigroupoids text vector + base cereal contravariant deepseq deferred-folds foldl hashable + monad-par pointed potoki potoki-cereal primitive primitive-extras + profunctors QuickCheck semigroupoids text unordered-containers + vector ]; testHaskellDepends = [ cereal foldl QuickCheck quickcheck-instances rerebase tasty @@ -71299,8 +71301,8 @@ self: { }: mkDerivation { pname = "extensible-effects"; - version = "3.0.0.0"; - sha256 = "1sqvdwqi3aqqhsjny7h1i7gany4b79nqc539b5arwksjvsgmv2yb"; + version = "3.1.0.0"; + sha256 = "0p4vk4k6922ar853zb85jm4si7y1qdr1wkx4pwfd613a5ar23440"; libraryHaskellDepends = [ base monad-control transformers-base ]; testHaskellDepends = [ base doctest HUnit monad-control QuickCheck silently test-framework @@ -72685,6 +72687,24 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "fedora-haskell-tools_0_6" = callPackage + ({ mkDerivation, base, csv, directory, filepath, HTTP, process + , time, unix + }: + mkDerivation { + pname = "fedora-haskell-tools"; + version = "0.6"; + sha256 = "06yr6hyksdqz0nksw0m23cqik51jjr74241xx96979pvw07zcym4"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base csv directory filepath HTTP process time unix + ]; + description = "Building and maintenance tools for Fedora Haskell"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "fedora-packages" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, hlint , HsOpenSSL, hspec, http-streams, io-streams, lens, text @@ -76773,10 +76793,8 @@ self: { }: mkDerivation { pname = "free-algebras"; - version = "0.0.2.0"; - sha256 = "06q7gmldzr3y7pmk76nhbbjgny518n1kw5k7011d6rhzj0kfwqgl"; - revision = "1"; - editedCabalFile = "0jcyr0f8mfsk3w24fnrnjr3arj48cl9h708mqbdglg4z7l1n22ba"; + version = "0.0.3.0"; + sha256 = "1qkgpmw2kv3x436f600cw73gdvfgjdl5i8nx80nh7q7dsg2ynl72"; libraryHaskellDepends = [ base constraints containers data-fix free groups kan-extensions mtl natural-numbers transformers @@ -77412,8 +77430,8 @@ self: { ({ mkDerivation, base, bytestring, process, text }: mkDerivation { pname = "fromhtml"; - version = "0.1.0.4"; - sha256 = "1p1qkidh5wgfgrqqa59zi77rvgphh2wh8ldql4plxq5flh2zszkx"; + version = "1.0.0"; + sha256 = "0idfjkwlg0g5vgv8x5m302ra4w23sgvq29gbbgyx99afrhxqh37l"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring process text ]; @@ -79578,6 +79596,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "generic-lens_1_0_0_2" = callPackage + ({ mkDerivation, base, criterion, deepseq, doctest, HUnit + , inspection-testing, lens, profunctors, QuickCheck, tagged + }: + mkDerivation { + pname = "generic-lens"; + version = "1.0.0.2"; + sha256 = "0s21jfw0ndkkmx7di3q0b7xj7hws6yxxcsflal617c44iqc8lvsy"; + libraryHaskellDepends = [ base profunctors tagged ]; + testHaskellDepends = [ + base doctest HUnit inspection-testing lens profunctors + ]; + benchmarkHaskellDepends = [ + base criterion deepseq lens QuickCheck + ]; + description = "Generically derive traversals, lenses and prisms"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "generic-lens-labels" = callPackage ({ mkDerivation, base, generic-lens }: mkDerivation { @@ -81549,13 +81587,12 @@ self: { }) {}; "ghc-syb-utils" = callPackage - ({ mkDerivation, base, directory, filepath, ghc, ghc-paths, syb }: + ({ mkDerivation, base, bytestring, ghc, syb }: mkDerivation { pname = "ghc-syb-utils"; - version = "0.2.3.3"; - sha256 = "0fj7cqkdkb2kbfsif62bgc17cymnxjr6nnbsd1z4hfw8hz4pchjz"; - libraryHaskellDepends = [ base ghc syb ]; - testHaskellDepends = [ base directory filepath ghc ghc-paths ]; + version = "0.3.0.0"; + sha256 = "0mfnlp0z64999cc3jgzi3x5s428gs5jsqmmbr2n5v7shh0csnff4"; + libraryHaskellDepends = [ base bytestring ghc syb ]; description = "Scrap Your Boilerplate utilities for the GHC API"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -81621,11 +81658,11 @@ self: { ({ mkDerivation, base, bytestring, criterion, text }: mkDerivation { pname = "ghc-trace-events"; - version = "0.0.0"; - sha256 = "00lq6bcl78drqlzj39avf9k2x2q4d2fdac3rrxrxicsdwry6brkk"; + version = "0.0.0.1"; + sha256 = "0b9s07wy26f9xswg6ysylpjaa9gv9iqw50n3zqpkj3jr8ah8y3kl"; libraryHaskellDepends = [ base bytestring text ]; benchmarkHaskellDepends = [ base bytestring criterion ]; - description = "Faster replacements for traceEvent and traceEventMarker"; + description = "Faster replacements for traceEvent and traceMarker"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -83168,8 +83205,8 @@ self: { }: mkDerivation { pname = "git-annex"; - version = "6.20180719"; - sha256 = "13fbkdf461z4wqvjlzfjp3h17xyy8jb1av4s6jmlg1jl7656q96k"; + version = "6.20180807"; + sha256 = "1wkqh1y58m0z1mf2j33qhndpxcjwv8mbv384kdk17vn0lp9zas1s"; configureFlags = [ "-fassistant" "-fcryptonite" "-fdbus" "-fdesktopnotify" "-fdns" "-ffeed" "-finotify" "-fpairing" "-fproduction" "-fquvi" "-f-s3" @@ -85064,12 +85101,12 @@ self: { }) {}; "gmpint" = callPackage - ({ mkDerivation, base, gmp, micro-recursion-schemes }: + ({ mkDerivation, base, gmp }: mkDerivation { pname = "gmpint"; - version = "0.1.1.1"; - sha256 = "02zr0acsf7zpyl369c9063qp6dgpblcb73q2m9fwz63ya58ixbk4"; - libraryHaskellDepends = [ base micro-recursion-schemes ]; + version = "0.1.1.2"; + sha256 = "0kb3gc9a9wd1ci5jpbpa253hqhx8w6if52yppk2k34yvm1385k35"; + libraryHaskellDepends = [ base ]; librarySystemDepends = [ gmp ]; description = "GMP integer conversions"; license = stdenv.lib.licenses.bsd3; @@ -89584,6 +89621,17 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {gtksourceview3 = pkgs.gnome3.gtksourceview;}; + "guarded-allocation" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "guarded-allocation"; + version = "0.0"; + sha256 = "1fj8zf9drvkd8bydiy7g0z9dqqjn7d8mf1jdhwcyx6c013ixnmsj"; + libraryHaskellDepends = [ base ]; + description = "Memory allocation with added stress tests and integrity checks"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "guarded-rewriting" = callPackage ({ mkDerivation, base, instant-generics }: mkDerivation { @@ -95489,8 +95537,8 @@ self: { }: mkDerivation { pname = "haskell-names"; - version = "0.9.1"; - sha256 = "1ybcdxz6y0l5qsq3vd0ii6m1ifysc2k8852lzw0nfs9i4q9pnwhh"; + version = "0.9.2"; + sha256 = "1gfqyh0lgi4n20dmh6pavxixy3flw385fp2iisks99l30nzn0kyv"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring containers data-lens-light filepath @@ -97781,19 +97829,19 @@ self: { ({ mkDerivation, base, base-prelude, bytestring, contravariant , foldl, hasql, hasql-cursor-transaction, hasql-transaction , profunctors, QuickCheck, quickcheck-instances, rebase, tasty - , tasty-hunit, tasty-quickcheck, tasty-smallcheck + , tasty-hunit, tasty-quickcheck }: mkDerivation { pname = "hasql-cursor-query"; - version = "0.4.4.1"; - sha256 = "1lc3x3pwfahm81pfncky6mqsz6fjyj0szwi4qhf1k1drx36wr3db"; + version = "0.4.4.2"; + sha256 = "1h57x0az7hlmkbwmhdm0y4c63ypx48gkkw07rb2lj5sizn9j2qq9"; libraryHaskellDepends = [ base base-prelude bytestring contravariant foldl hasql hasql-cursor-transaction hasql-transaction profunctors ]; testHaskellDepends = [ foldl hasql QuickCheck quickcheck-instances rebase tasty - tasty-hunit tasty-quickcheck tasty-smallcheck + tasty-hunit tasty-quickcheck ]; description = "A declarative abstraction over PostgreSQL Cursor"; license = stdenv.lib.licenses.mit; @@ -97807,8 +97855,8 @@ self: { }: mkDerivation { pname = "hasql-cursor-transaction"; - version = "0.6.3"; - sha256 = "12vzkay4r0pzz41p4n60zd077yigr3373i5nr8cpf8z39msj8vaj"; + version = "0.6.3.1"; + sha256 = "05d01gb7ag9rcpk8vwizsbyi0lxd1fh6r6y4a6pvinj5sa2qn1hn"; libraryHaskellDepends = [ base base-prelude bytestring bytestring-tree-builder contravariant contravariant-extras hasql hasql-transaction transformers @@ -99264,8 +99312,8 @@ self: { }: mkDerivation { pname = "hdevtools"; - version = "0.1.6.1"; - sha256 = "0h1l74ky9a5an7j60i9razifm49v232g8f8p8fg1arv59b7nmr77"; + version = "0.1.7.0"; + sha256 = "188ayzn8yvlr3jl478ff1fadj766mq06fgb4xr4szpilppg8l3kg"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -99846,6 +99894,32 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hedis_0_10_3" = callPackage + ({ mkDerivation, async, base, bytestring, bytestring-lexing + , deepseq, doctest, errors, HTTP, HUnit, mtl, network, network-uri + , resource-pool, scanner, slave-thread, stm, test-framework + , test-framework-hunit, text, time, tls, unordered-containers + , vector + }: + mkDerivation { + pname = "hedis"; + version = "0.10.3"; + sha256 = "0wapsg0amlmzayphchng67ih3ivp0mk3vgi8x1mzrkd1xrlgav3v"; + libraryHaskellDepends = [ + async base bytestring bytestring-lexing deepseq errors HTTP mtl + network network-uri resource-pool scanner stm text time tls + unordered-containers vector + ]; + testHaskellDepends = [ + async base bytestring doctest HUnit mtl slave-thread stm + test-framework test-framework-hunit text time + ]; + benchmarkHaskellDepends = [ base mtl time ]; + description = "Client library for the Redis datastore: supports full command set, pipelining"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hedis-config" = callPackage ({ mkDerivation, aeson, base, bytestring, hedis, scientific, text , time @@ -101892,6 +101966,23 @@ self: { license = stdenv.lib.licenses.mit; }) {inherit (pkgs) systemd;}; + "hidapi_0_1_5" = callPackage + ({ mkDerivation, base, bytestring, deepseq, deepseq-generics + , systemd + }: + mkDerivation { + pname = "hidapi"; + version = "0.1.5"; + sha256 = "0pjrrm8rpcwwsc5ck36p0zyk5rr5jri8c79436whk8xxpnyf09ip"; + libraryHaskellDepends = [ + base bytestring deepseq deepseq-generics + ]; + librarySystemDepends = [ systemd ]; + description = "Haskell bindings to HIDAPI"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) systemd;}; + "hidden-char" = callPackage ({ mkDerivation, base, hspec }: mkDerivation { @@ -102475,6 +102566,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hinotify_0_4" = callPackage + ({ mkDerivation, async, base, bytestring, containers, directory + , unix + }: + mkDerivation { + pname = "hinotify"; + version = "0.4"; + sha256 = "1x1lm685ws2q0z0ibwq6x3l72xh67mj06s36xiga3al48d92q63x"; + libraryHaskellDepends = [ async base bytestring containers unix ]; + testHaskellDepends = [ base bytestring directory unix ]; + description = "Haskell binding to inotify"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hinotify-bytestring" = callPackage ({ mkDerivation, base, bytestring, containers, directory , posix-paths, unix, utf8-string @@ -103624,8 +103730,8 @@ self: { }: mkDerivation { pname = "hlint"; - version = "2.1.8"; - sha256 = "1kkmgqbw2n4sl7wcqbdqv54n7p5zjfx8c970s1lw25mfs3ryn4wp"; + version = "2.1.9"; + sha256 = "0q7acb636gzkp7qq1cyx04xjjw1ndpcxc49brmg61rbl0z1cxqsx"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -103834,6 +103940,8 @@ self: { pname = "hmatrix-backprop"; version = "0.1.2.3"; sha256 = "1x833a48czc2hphswxgwf1ihkgxz13w3bz2d2zs9dqq8xkzdf4mx"; + revision = "1"; + editedCabalFile = "03zrx1kvyz8gn2w2ygd7ql98yimsm3kyrnrr1cc99mz1cm0phnrv"; libraryHaskellDepends = [ backprop base ghc-typelits-knownnat ghc-typelits-natnormalise hmatrix hmatrix-vector-sized microlens vector vector-sized @@ -103847,6 +103955,29 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hmatrix-backprop_0_1_2_4" = callPackage + ({ mkDerivation, backprop, base, finite-typelits + , ghc-typelits-knownnat, ghc-typelits-natnormalise, hedgehog + , hmatrix, hmatrix-vector-sized, microlens, microlens-platform + , vector, vector-sized, vinyl + }: + mkDerivation { + pname = "hmatrix-backprop"; + version = "0.1.2.4"; + sha256 = "0v3xx72928pwfr9ki01apgqyc3dh1qakr9y6swiiwmgm7ms7qn6a"; + libraryHaskellDepends = [ + backprop base ghc-typelits-knownnat ghc-typelits-natnormalise + hmatrix hmatrix-vector-sized microlens vector vector-sized vinyl + ]; + testHaskellDepends = [ + backprop base finite-typelits hedgehog hmatrix hmatrix-vector-sized + microlens microlens-platform vector-sized vinyl + ]; + description = "hmatrix operations lifted for backprop"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hmatrix-banded" = callPackage ({ mkDerivation, base, hmatrix, liblapack, transformers }: mkDerivation { @@ -113911,17 +114042,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "hw-rankselect_0_12_0_3" = callPackage + "hw-rankselect_0_12_0_4" = callPackage ({ mkDerivation, base, bytestring, conduit, criterion, deepseq - , directory, hedgehog, hspec, hspec-discover, hw-balancedparens - , hw-bits, hw-hedgehog, hw-hspec-hedgehog, hw-prim - , hw-rankselect-base, lens, mmap, mtl, optparse-applicative - , QuickCheck, resourcet, transformers, vector + , directory, hedgehog, hspec, hw-balancedparens, hw-bits + , hw-hedgehog, hw-hspec-hedgehog, hw-prim, hw-rankselect-base, lens + , mmap, mtl, optparse-applicative, QuickCheck, resourcet + , transformers, vector }: mkDerivation { pname = "hw-rankselect"; - version = "0.12.0.3"; - sha256 = "0qngw9dw15km09z69hrdlyav89s1kbmmml9791m2iwzk4ckd0yhi"; + version = "0.12.0.4"; + sha256 = "0l27pfsqvil9l4p7hk2bvgxsa35z88179w88wbwvmjf4vsmpiqkh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -113936,7 +114067,6 @@ self: { base directory hedgehog hspec hw-bits hw-hedgehog hw-hspec-hedgehog hw-prim hw-rankselect-base mmap QuickCheck transformers vector ]; - testToolDepends = [ hspec-discover ]; benchmarkHaskellDepends = [ base bytestring conduit criterion directory hw-bits hw-prim hw-rankselect-base mmap resourcet vector @@ -117258,8 +117388,8 @@ self: { }: mkDerivation { pname = "indexation"; - version = "0.3"; - sha256 = "1vrcssb97sds0lddma98p83x52hs9vz4dh5v911idf2f1a22whpp"; + version = "0.4.2"; + sha256 = "1ag30a4xlzii1pwl2dpgc7ydigfh3nw16xwjj2vp2qj54fh0rd1p"; libraryHaskellDepends = [ base bytestring cereal deferred-folds focus hashable potoki potoki-cereal profunctors stm-containers text transformers @@ -122622,8 +122752,8 @@ self: { }: mkDerivation { pname = "juicy-gcode"; - version = "0.1.0.5"; - sha256 = "0gjkch103fisvr35dc86hbfbir76cmwh9cs1ppqlxajspgan9bz1"; + version = "0.1.0.5.1"; + sha256 = "1xdmlgickzg94asqy48ms895prjzyzcn767276f99f7mx9pqb5jr"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -128907,8 +129037,8 @@ self: { }: mkDerivation { pname = "liblastfm"; - version = "0.6.0"; - sha256 = "0r6jq4dx2g5qh1gng73vh81kl6bch3ql2fhk3hkmw8ww7rqzf01g"; + version = "0.7.0"; + sha256 = "1ls7zvg14mllih9aj8by739mkvlv80i0aa3z224ij4d7hp3dyd0g"; libraryHaskellDepends = [ aeson base bytestring cereal containers cryptonite http-client http-client-tls network-uri profunctors semigroups text @@ -150090,8 +150220,8 @@ self: { }: mkDerivation { pname = "opaleye-trans"; - version = "0.4.3"; - sha256 = "1gvlsqhjnyyl34b65xbmir99cyrd697vlzki3225z4m0jd66n5bl"; + version = "0.5.0"; + sha256 = "18y9qcs771647g5xy7209rq32w7fqflcr313mdw1fv0m2ak65wb2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -152376,7 +152506,7 @@ self: { maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; - "pandoc_2_2_3" = callPackage + "pandoc_2_2_3_2" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, base64-bytestring , binary, blaze-html, blaze-markup, bytestring, Cabal , case-insensitive, cmark-gfm, containers, criterion, data-default @@ -152391,8 +152521,8 @@ self: { }: mkDerivation { pname = "pandoc"; - version = "2.2.3"; - sha256 = "13x5jrl26bj21zxg6j3igsd3z592ws9nfw46vx9aw220nz0j1rvq"; + version = "2.2.3.2"; + sha256 = "0dmk2vy0kfsi8xzpa8h0kypidf264d5rjvcqyd7jf34rjj47ikk2"; configureFlags = [ "-fhttps" "-f-trypandoc" ]; isLibrary = true; isExecutable = true; @@ -156137,8 +156267,8 @@ self: { }: mkDerivation { pname = "persistent-migration"; - version = "0.0.2"; - sha256 = "0vnc2jiagb2z11dy428fd47zhixw7ib96aras0lvhjbwyldzic5p"; + version = "0.1.0"; + sha256 = "025hrjm95klj4b7wqlzwkcwra5yj37ilirr06hxxw6d3g668rllm"; libraryHaskellDepends = [ base containers fgl mtl persistent text time unordered-containers ]; @@ -156146,7 +156276,7 @@ self: { base bytestring conduit containers exceptions monad-logger mtl persistent persistent-postgresql persistent-template process QuickCheck resource-pool tasty tasty-golden tasty-quickcheck - temporary text yaml + temporary text time yaml ]; description = "Manual migrations for the persistent library"; license = stdenv.lib.licenses.bsd3; @@ -158771,6 +158901,30 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "piyo" = callPackage + ({ mkDerivation, base, extra, sdl2, sdl2-gfx, sdl2-image + , sdl2-mixer, sdl2-ttf, text + }: + mkDerivation { + pname = "piyo"; + version = "0.1.0.0"; + sha256 = "168jiqp73kmg797a6njgi792qm2aczgkj77i28m04gah1qhyp603"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base extra sdl2 sdl2-gfx sdl2-image sdl2-mixer sdl2-ttf text + ]; + executableHaskellDepends = [ + base extra sdl2 sdl2-gfx sdl2-image sdl2-mixer sdl2-ttf text + ]; + testHaskellDepends = [ + base extra sdl2 sdl2-gfx sdl2-image sdl2-mixer sdl2-ttf text + ]; + description = "Haskell game engine like fantasy console"; + license = stdenv.lib.licenses.mit; + }) {}; + "pkcs1" = callPackage ({ mkDerivation, base, bytestring, random }: mkDerivation { @@ -161387,16 +161541,22 @@ self: { "potoki-cereal" = callPackage ({ mkDerivation, acquire, attoparsec, base, base-prelude - , bytestring, cereal, potoki-core, text + , bytestring, cereal, directory, potoki, potoki-core, QuickCheck + , quickcheck-instances, rerebase, tasty, tasty-hunit + , tasty-quickcheck, text }: mkDerivation { pname = "potoki-cereal"; - version = "0.3"; - sha256 = "0m7g9dkvzb94iwywf3bil8h57xbs2d3zvgn4d8la54qz5izimszp"; + version = "0.3.0.1"; + sha256 = "0dm5yvh8a8sgrqvgkl48zpn5c8ymz9h83nw44icnhqirg1hrkhvi"; libraryHaskellDepends = [ acquire attoparsec base base-prelude bytestring cereal potoki-core text ]; + testHaskellDepends = [ + directory potoki QuickCheck quickcheck-instances rerebase tasty + tasty-hunit tasty-quickcheck + ]; description = "Streaming serialization"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -162370,6 +162530,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "pretty-simple_2_2_0_0" = callPackage + ({ mkDerivation, ansi-terminal, base, criterion, doctest, Glob, mtl + , text, transformers + }: + mkDerivation { + pname = "pretty-simple"; + version = "2.2.0.0"; + sha256 = "0cf7pfx98dq8ykxja7gi2y7zpczj41sqfg4dindm8v5knlv1ppik"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ansi-terminal base mtl text transformers + ]; + testHaskellDepends = [ base doctest Glob ]; + benchmarkHaskellDepends = [ base criterion text ]; + description = "pretty printer for data types with a 'Show' instance"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "pretty-sop" = callPackage ({ mkDerivation, base, generics-sop, pretty-show }: mkDerivation { @@ -162739,15 +162919,15 @@ self: { }: mkDerivation { pname = "primitive-extras"; - version = "0.6.4"; - sha256 = "1j1zpyirlk162krhjxnryyjdx8gsa686gxrpq67ls9nf1rgkgf67"; + version = "0.6.4.1"; + sha256 = "1b0q2qsd3ma6hg1av63fg0dqya6s61vv7giish9vh14cbz00zr66"; libraryHaskellDepends = [ base bytestring cereal deferred-folds focus foldl primitive profunctors vector ]; testHaskellDepends = [ - deferred-folds focus QuickCheck quickcheck-instances rerebase tasty - tasty-hunit tasty-quickcheck + cereal deferred-folds focus primitive QuickCheck + quickcheck-instances rerebase tasty tasty-hunit tasty-quickcheck ]; description = "Extras for the \"primitive\" library"; license = stdenv.lib.licenses.mit; @@ -164036,8 +164216,8 @@ self: { }: mkDerivation { pname = "propellor"; - version = "5.4.0"; - sha256 = "1ykzagmw2an1aglkglkpkqv65mxaqqfj7zia27f6npnihb6hwi5v"; + version = "5.4.1"; + sha256 = "13adj770k3awgsdipjkwgfja6b1hkxdphf0aa4jayxm2jz9gkpbd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -164807,8 +164987,8 @@ self: { }: mkDerivation { pname = "ptr"; - version = "0.16.5"; - sha256 = "0hywqysklzy5xixd8wdhrlwzf2336z1kn593sg5q30kbg3b0bgj2"; + version = "0.16.6"; + sha256 = "1makksw42pb6088i3s755q0wyfismfq5avpwbcfvfbzcasn2kncs"; libraryHaskellDepends = [ base base-prelude bug bytestring contravariant mtl profunctors semigroups text time transformers vector @@ -170532,10 +170712,8 @@ self: { }: mkDerivation { pname = "reflex-dom-fragment-shader-canvas"; - version = "0.1"; - sha256 = "1zc8kgny3d467lxpwg5mm1amg6924m5ifkkafyh18nfzqffvc3bl"; - revision = "2"; - editedCabalFile = "1cjp8gzrvwz8qzvfh3s71ng5nklp4y1sarik9m1k47zyd2bm49yl"; + version = "0.1.0.1"; + sha256 = "17b023xjz29n673q4a5bd9r5bj8hb7b1q6ms6qppmwdimk3glz4z"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -171876,6 +172054,32 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "relude_0_1_1" = callPackage + ({ mkDerivation, base, bytestring, containers, deepseq, doctest + , gauge, ghc-prim, Glob, hashable, hedgehog, mtl, stm, tasty + , tasty-hedgehog, text, transformers, unordered-containers + , utf8-string + }: + mkDerivation { + pname = "relude"; + version = "0.1.1"; + sha256 = "034hldd9rsqqhhxmnpfabh6v2by47qc5kx1qv77bl8k73fybf9a0"; + libraryHaskellDepends = [ + base bytestring containers deepseq ghc-prim hashable mtl stm text + transformers unordered-containers utf8-string + ]; + testHaskellDepends = [ + base bytestring doctest Glob hedgehog tasty tasty-hedgehog text + utf8-string + ]; + benchmarkHaskellDepends = [ + base containers gauge unordered-containers + ]; + description = "Custom prelude from Kowainik"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "remark" = callPackage ({ mkDerivation, base, GenericPretty, tasty, tasty-golden , tasty-hunit @@ -174795,21 +174999,21 @@ self: { "rollbar-hs" = callPackage ({ mkDerivation, aeson, base, bytestring, case-insensitive - , containers, hostname, hspec, hspec-golden-aeson, http-client - , http-conduit, http-types, lens, lens-aeson, network, QuickCheck - , text, time, unordered-containers, uuid + , hostname, hspec, hspec-golden-aeson, http-client, http-conduit + , http-types, network, QuickCheck, text, time, unordered-containers + , uuid }: mkDerivation { pname = "rollbar-hs"; - version = "0.3.0.1"; - sha256 = "1qdhr2xaiwdz2xj0c62wf4zil7407iwd9zf5v6b1fxx38s2kc3wd"; + version = "0.3.1.0"; + sha256 = "1il3rfzf0rmddm3yqsgz6rhyai3m3z6mn3f00irc7955sl320qn8"; libraryHaskellDepends = [ aeson base bytestring case-insensitive hostname http-client http-conduit http-types network text time unordered-containers uuid ]; testHaskellDepends = [ - aeson base bytestring case-insensitive containers hspec - hspec-golden-aeson lens lens-aeson QuickCheck text + aeson base bytestring case-insensitive hspec hspec-golden-aeson + QuickCheck text unordered-containers ]; description = "Core Rollbar data types and APIs"; license = stdenv.lib.licenses.bsd3; @@ -175505,8 +175709,39 @@ self: { pname = "rss-conduit"; version = "0.4.2.2"; sha256 = "1qaz3a9fjq5dqky6jvnnk68xbarrqng7bas9r10qzdpy7g1v17ps"; + revision = "3"; + editedCabalFile = "1fay2p90wx49b2yky0r6x70az3f0c1b2hwy3rzayza8am2i5r0bn"; + libraryHaskellDepends = [ + atom-conduit base conduit conduit-combinators containers + dublincore-xml-conduit lens-simple safe safe-exceptions singletons + text time timerep uri-bytestring vinyl xml-conduit xml-types + ]; + testHaskellDepends = [ + atom-conduit base blaze-builder bytestring conduit + conduit-combinators data-default dublincore-xml-conduit lens-simple + mono-traversable QuickCheck quickcheck-instances resourcet + safe-exceptions singletons tasty tasty-hunit tasty-quickcheck text + time uri-bytestring vinyl xml-conduit xml-types + ]; + description = "Streaming parser/renderer for the RSS standard"; + license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "rss-conduit_0_4_3_0" = callPackage + ({ mkDerivation, atom-conduit, base, blaze-builder, bytestring + , conduit, conduit-combinators, containers, data-default + , dublincore-xml-conduit, lens-simple, mono-traversable, QuickCheck + , quickcheck-instances, resourcet, safe, safe-exceptions + , singletons, tasty, tasty-hunit, tasty-quickcheck, text, time + , timerep, uri-bytestring, vinyl, xml-conduit, xml-types + }: + mkDerivation { + pname = "rss-conduit"; + version = "0.4.3.0"; + sha256 = "003crn6pczr8x3r0j9nkx22gqwq0fvy4mkksmng8vp7qbvycvzvz"; revision = "1"; - editedCabalFile = "1y5f1fvjjljk0rl8payxm9dsazzh2057nq9m9bi4gxwa8lkfz21d"; + editedCabalFile = "0dnp7a1xi344qhdqmr3hsnai7id4d87rll0wsww3wcfh2bh0nm6q"; libraryHaskellDepends = [ atom-conduit base conduit conduit-combinators containers dublincore-xml-conduit lens-simple safe safe-exceptions singletons @@ -177052,6 +177287,33 @@ self: { license = stdenv.lib.licenses.lgpl3; }) {}; + "sbp_2_3_17" = callPackage + ({ mkDerivation, aeson, array, base, base64-bytestring + , basic-prelude, binary, binary-conduit, bytestring, conduit + , conduit-extra, data-binary-ieee754, lens, lens-aeson, monad-loops + , resourcet, tasty, tasty-hunit, template-haskell, text, time, yaml + }: + mkDerivation { + pname = "sbp"; + version = "2.3.17"; + sha256 = "1zwxq0x9g2l2nkyhbsdgz42wsnr1skm99x3vhd7f7azx17kv3lg6"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson array base base64-bytestring basic-prelude binary bytestring + data-binary-ieee754 lens lens-aeson monad-loops template-haskell + text + ]; + executableHaskellDepends = [ + aeson base basic-prelude binary-conduit bytestring conduit + conduit-extra resourcet time yaml + ]; + testHaskellDepends = [ base basic-prelude tasty tasty-hunit ]; + description = "SwiftNav's SBP Library"; + license = stdenv.lib.licenses.lgpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "sbp2udp" = callPackage ({ mkDerivation, base, basic-prelude, binary, binary-conduit , bytestring, conduit, conduit-extra, network, optparse-generic @@ -178900,14 +179162,14 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "selda_0_3_1_0" = callPackage + "selda_0_3_2_0" = callPackage ({ mkDerivation, base, bytestring, exceptions, hashable, mtl , psqueues, text, time, unordered-containers }: mkDerivation { pname = "selda"; - version = "0.3.1.0"; - sha256 = "13l98d3aihzw5ycfflsp84sk580mdni9mblsmyspqww81xadcdwr"; + version = "0.3.2.0"; + sha256 = "1ngvh7w4s0w57qaizzxin641x9v4v2rm03lnkfcxklq93l3khgp6"; libraryHaskellDepends = [ base bytestring exceptions hashable mtl psqueues text time unordered-containers @@ -178942,8 +179204,8 @@ self: { pname = "selda-postgresql"; version = "0.1.7.3"; sha256 = "0ardh6ds8fmqy09y74nflsb8r5y4cvl2ddxcla0vzaf5xppx4czc"; - revision = "1"; - editedCabalFile = "01kyplz962nmn7r52smy3w81a8zshl4pa9qkphbsda43rrcphn5s"; + revision = "2"; + editedCabalFile = "1zrj412hkjjka4cvl5zj6gdpvdafmcny6xighi1glg67n8cmpb67"; libraryHaskellDepends = [ base bytestring exceptions postgresql-libpq selda text ]; @@ -178977,8 +179239,8 @@ self: { pname = "selda-sqlite"; version = "0.1.6.1"; sha256 = "1qqrgqzcfwqzlcklm0qjvdy3ndn3zg8s5mp8744v76bd6z2xwq4d"; - revision = "1"; - editedCabalFile = "0gyl0apn2bzfw0qk8vx626mrhym8769jq6n0hki6xj60gvqpr6dr"; + revision = "2"; + editedCabalFile = "0gb8raqmy8r8xwjpx238mqar5gdfd4194si2ms1a9ndcrilkkqja"; libraryHaskellDepends = [ base direct-sqlite directory exceptions selda text ]; @@ -179887,30 +180149,28 @@ self: { "serokell-util" = callPackage ({ mkDerivation, aeson, ansi-terminal, base, base16-bytestring - , base64-bytestring, bytestring, clock, containers, deepseq - , directory, exceptions, extra, filepath, fmt, formatting, hashable - , hspec, hspec-discover, lens, log-warper, monad-control, mtl - , o-clock, optparse-applicative, parsec, QuickCheck - , quickcheck-instances, safecopy, scientific, semigroups, stm - , template-haskell, text, text-format, transformers, universum - , unordered-containers, vector, yaml + , base64-bytestring, bytestring, clock, deepseq, exceptions, extra + , fmt, formatting, hashable, hspec, hspec-discover, microlens + , microlens-mtl, mtl, o-clock, parsec, process, QuickCheck + , quickcheck-instances, scientific, template-haskell, text + , th-lift-instances, transformers, universum, unordered-containers + , vector }: mkDerivation { pname = "serokell-util"; - version = "0.8.0"; - sha256 = "0v8vy66pbb37w7vaal42w8z0dld93j3d0bfpp3gc8mkmv12gh49p"; + version = "0.10.0"; + sha256 = "1aa1cjqwkjhbfd9q1lnyp5xiji64swsy2lipj7c83q8xyfxcxq67"; libraryHaskellDepends = [ aeson ansi-terminal base base16-bytestring base64-bytestring - bytestring clock containers deepseq directory exceptions extra - filepath fmt formatting hashable lens log-warper monad-control mtl - o-clock optparse-applicative parsec QuickCheck quickcheck-instances - scientific semigroups stm template-haskell text text-format - transformers universum unordered-containers vector yaml + bytestring clock deepseq exceptions fmt formatting hashable + microlens microlens-mtl mtl o-clock parsec process QuickCheck + quickcheck-instances scientific template-haskell text + th-lift-instances transformers universum unordered-containers + vector ]; testHaskellDepends = [ - aeson base bytestring hspec QuickCheck quickcheck-instances - safecopy scientific text text-format universum unordered-containers - vector + aeson base extra formatting hspec QuickCheck quickcheck-instances + scientific universum unordered-containers vector ]; testToolDepends = [ hspec-discover ]; description = "General-purpose functions by Serokell"; @@ -180557,6 +180817,8 @@ self: { pname = "servant-dhall"; version = "0.1.0.1"; sha256 = "1yriifnflvh4f0vv2mrfv6qw0cv35isrq03q4h43g096ml2wl3ll"; + revision = "1"; + editedCabalFile = "0p8ygb5l79zzawnmy992wnicxv2cbbr0860063mbchmjwjf39x33"; libraryHaskellDepends = [ base base-compat bytestring dhall http-media megaparsec prettyprinter servant text @@ -184579,8 +184841,8 @@ self: { }: mkDerivation { pname = "simple-log"; - version = "0.9.5"; - sha256 = "042mnsc2mfxdsf49knszk732mj5ryd9309h9ysyzb6z0y9wnp736"; + version = "0.9.6"; + sha256 = "0cbzc5ib63x2m4xz88ks6xfg99c2plp2y6y7bzx3i3rrhd3y1pjn"; libraryHaskellDepends = [ async base base-unicode-symbols containers data-default deepseq directory exceptions filepath hformat microlens microlens-platform @@ -187122,6 +187384,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "snap-stream" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, io-streams + , snap-core + }: + mkDerivation { + pname = "snap-stream"; + version = "0.1"; + sha256 = "0f8ai7ys7wb4aa9l7hn7zmdj1byia5s7nnnr1gvq8xwlkapr15w3"; + libraryHaskellDepends = [ + attoparsec base bytestring io-streams snap-core + ]; + description = "Streaming Snap handlers"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "snap-templates" = callPackage ({ mkDerivation, base, bytestring, containers, directory , directory-tree, filepath, hashable, old-time, template-haskell @@ -200113,23 +200390,26 @@ self: { "termonad" = callPackage ({ mkDerivation, base, Cabal, cabal-doctest, classy-prelude, colour - , constraints, data-default, doctest, dyre, gi-gdk, gi-gio, gi-glib - , gi-gtk, gi-pango, gi-vte, haskell-gi-base, hedgehog, lens - , pretty-simple, QuickCheck, tasty, tasty-hedgehog - , template-haskell, xml-conduit, xml-html-qq + , constraints, data-default, directory, doctest, dyre, filepath + , gi-gdk, gi-gio, gi-glib, gi-gtk, gi-pango, gi-vte, gtk3 + , haskell-gi-base, hedgehog, lens, pretty-simple, QuickCheck, tasty + , tasty-hedgehog, template-haskell, xml-conduit, xml-html-qq }: mkDerivation { pname = "termonad"; - version = "0.1.0.0"; - sha256 = "0fbk1q75c60ifmb348iic9mhh30mx1544k9ghdi2wcqpgipvrfab"; + version = "0.2.0.0"; + sha256 = "0y5f4k6f2cs6x7p8qrfi7nwy46arap8v87algxg3iixw30c325lc"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ - base classy-prelude colour constraints data-default dyre gi-gdk - gi-gio gi-glib gi-gtk gi-pango gi-vte haskell-gi-base lens - pretty-simple QuickCheck xml-conduit xml-html-qq + base classy-prelude colour constraints data-default directory dyre + filepath gi-gdk gi-gio gi-glib gi-gtk gi-pango gi-vte + haskell-gi-base lens pretty-simple QuickCheck xml-conduit + xml-html-qq ]; + libraryPkgconfigDepends = [ gtk3 ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ base doctest hedgehog lens QuickCheck tasty tasty-hedgehog @@ -200138,7 +200418,7 @@ self: { description = "Terminal emulator configurable in Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {}; + }) {gtk3 = pkgs.gnome3.gtk;}; "termplot" = callPackage ({ mkDerivation, base, brick, data-default, optparse-applicative @@ -202178,8 +202458,8 @@ self: { ({ mkDerivation, base, lens, pretty, template-haskell }: mkDerivation { pname = "th-pprint"; - version = "0.1.0.0"; - sha256 = "0i9c20q6pfn0bl3l2hj8lgzfmj04i19xlbkfl1ac3vr9ikq91q01"; + version = "0.2.0.0"; + sha256 = "1c6h6jw82a8bdb8kqxcam63vbrz04dl8m2ypcmfw5qm88b61zl1f"; libraryHaskellDepends = [ base lens pretty template-haskell ]; description = "Simplify and render Template Haskell"; license = stdenv.lib.licenses.bsd3; @@ -205415,6 +205695,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "traction" = callPackage + ({ mkDerivation, base, bytestring, containers, exceptions, hedgehog + , mmorph, postgresql-simple, resource-pool, syb, template-haskell + , text, time, transformers, transformers-either + }: + mkDerivation { + pname = "traction"; + version = "0.0.1"; + sha256 = "15sl663zk2fys3f5r5vizazid64ij2kwya2p8yk3gyhmnklccqmn"; + libraryHaskellDepends = [ + base bytestring containers exceptions mmorph postgresql-simple + resource-pool syb template-haskell text time transformers + transformers-either + ]; + testHaskellDepends = [ + base hedgehog mmorph postgresql-simple resource-pool text + ]; + license = stdenv.lib.licenses.bsd3; + }) {}; + "tracy" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -213785,6 +214085,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "viewprof_0_0_0_22" = callPackage + ({ mkDerivation, base, brick, containers, directory, ghc-prof, lens + , scientific, text, vector, vector-algorithms, vty + }: + mkDerivation { + pname = "viewprof"; + version = "0.0.0.22"; + sha256 = "07sa15nrwdjyzqmzvrdvl0nggdx5ca6w7qijhv7na9ivr0p2h495"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base brick containers directory ghc-prof lens scientific text + vector vector-algorithms vty + ]; + description = "Text-based interactive GHC .prof viewer"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "views" = callPackage ({ mkDerivation, base, mtl }: mkDerivation { @@ -213936,15 +214255,15 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "vinyl_0_9_1" = callPackage + "vinyl_0_9_3" = callPackage ({ mkDerivation, array, base, criterion, doctest, ghc-prim, hspec , lens, linear, microlens, mwc-random, primitive , should-not-typecheck, singletons, tagged, vector }: mkDerivation { pname = "vinyl"; - version = "0.9.1"; - sha256 = "1za62xg5zf3m0nil73k7l6jmridf3sccv29psp3hdqi3y62fjggp"; + version = "0.9.3"; + sha256 = "1sxkkmnq7vl5bmpljs3riaqb2kqpx1kkkllqiz4zawmhw6wmw1nj"; libraryHaskellDepends = [ array base ghc-prim ]; testHaskellDepends = [ base doctest hspec lens microlens should-not-typecheck singletons @@ -225044,6 +225363,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "yesod-websockets_0_3_0_1" = callPackage + ({ mkDerivation, base, conduit, mtl, transformers, unliftio + , wai-websockets, websockets, yesod-core + }: + mkDerivation { + pname = "yesod-websockets"; + version = "0.3.0.1"; + sha256 = "1k41qglb5fdzykyfpml4w74cg2m95ggm2jrnqy7bkj2l0fm4gjc6"; + libraryHaskellDepends = [ + base conduit mtl transformers unliftio wai-websockets websockets + yesod-core + ]; + description = "WebSockets support for Yesod"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yesod-websockets-extra" = callPackage ({ mkDerivation, base, enclosed-exceptions, transformers , websockets, yesod-websockets @@ -227086,6 +227422,8 @@ self: { pname = "ztail"; version = "1.2.0.2"; sha256 = "05vpq3kiv1xrby2k1qn41s42cxxxblcgxpnw1sgyznx63pal2hx1"; + revision = "1"; + editedCabalFile = "0d0cpgb0v849zxl12c2gkm3x4nmyfycka1pcfix43lawx62rky8s"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ diff --git a/pkgs/development/interpreters/jimtcl/default.nix b/pkgs/development/interpreters/jimtcl/default.nix index 3bef4996a4c..704e3eb4031 100644 --- a/pkgs/development/interpreters/jimtcl/default.nix +++ b/pkgs/development/interpreters/jimtcl/default.nix @@ -5,13 +5,13 @@ let in stdenv.mkDerivation rec { name = "jimtcl-${version}"; - version = "0.77"; + version = "0.78"; src = fetchFromGitHub { owner = "msteveb"; repo = "jimtcl"; rev = version; - sha256 = "06d9gdgvi6cwd6pjg3xig0kkjqm6kgq3am8yq1xnksyz2n09f0kp"; + sha256 = "1nrjxjfh69i35ig8sxdlal4ydd3cl0x68c05s6svnf1y2i1bl23j"; }; buildInputs = [ diff --git a/pkgs/development/libraries/libinfinity/default.nix b/pkgs/development/libraries/libinfinity/default.nix index dffb9053605..78c0fd6fb26 100644 --- a/pkgs/development/libraries/libinfinity/default.nix +++ b/pkgs/development/libraries/libinfinity/default.nix @@ -1,51 +1,53 @@ { gtkWidgets ? false # build GTK widgets for libinfinity -, daemon ? false # build infinote daemon -, documentation ? false # build documentation , avahiSupport ? false # build support for Avahi in libinfinity , stdenv, fetchurl, pkgconfig, glib, libxml2, gnutls, gsasl -, gtk2 ? null, gtkdoc ? null, avahi ? null, libdaemon ? null, libidn, gss +, gobjectIntrospection +, gtk3 ? null, gtk-doc, docbook_xsl, docbook_xml_dtd_412, avahi ? null, libdaemon, libidn, gss , libintl }: +assert avahiSupport -> avahi != null; +assert gtkWidgets -> gtk3 != null; + let - optional = cond: elem: assert cond -> elem != null; if cond then [elem] else []; + mkFlag = flag: feature: (if flag then "--with-" else "--without-") + feature; -in stdenv.mkDerivation rec { + self = stdenv.mkDerivation rec { + name = "libinfinity-${version}"; + version = "0.7.1"; + src = fetchurl { + url = "http://releases.0x539.de/libinfinity/${name}.tar.gz"; + sha256 = "1jw2fhrcbpyz99bij07iyhy9ffyqdn87vl8cb1qz897y3f2f0vk2"; + }; - name = "libinfinity-${version}"; - version = "0.7.1"; - src = fetchurl { - url = "http://releases.0x539.de/libinfinity/${name}.tar.gz"; - sha256 = "1jw2fhrcbpyz99bij07iyhy9ffyqdn87vl8cb1qz897y3f2f0vk2"; + outputs = [ "bin" "out" "dev" "man" "devdoc" ]; + + nativeBuildInputs = [ pkgconfig gtk-doc docbook_xsl docbook_xml_dtd_412 gobjectIntrospection ]; + buildInputs = [ glib libxml2 gsasl libidn gss libintl libdaemon ] + ++ stdenv.lib.optional gtkWidgets gtk3 + ++ stdenv.lib.optional avahiSupport avahi; + + propagatedBuildInputs = [ gnutls ]; + + configureFlags = [ + "--enable-gtk-doc" + "--enable-introspection" + (mkFlag gtkWidgets "inftextgtk") + (mkFlag gtkWidgets "infgtk") + "--with-infinoted" + "--with-libdaemon" + (mkFlag avahiSupport "avahi") + ]; + + passthru = { + infinoted = "${self.bin}/bin/infinoted-${stdenv.lib.versions.majorMinor version}"; + }; + + meta = { + homepage = http://gobby.0x539.de/; + description = "An implementation of the Infinote protocol written in GObject-based C"; + license = stdenv.lib.licenses.lgpl2Plus; + maintainers = [ stdenv.lib.maintainers.phreedom ]; + platforms = with stdenv.lib.platforms; linux ++ darwin; + }; }; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ glib libxml2 gsasl libidn gss libintl ] - ++ optional gtkWidgets gtk2 - ++ optional documentation gtkdoc - ++ optional avahiSupport avahi - ++ optional daemon libdaemon; - - propagatedBuildInputs = [ gnutls ]; - - configureFlags = [ - (stdenv.lib.enableFeature documentation "gtk-doc") - (stdenv.lib.withFeature gtkWidgets "inftextgtk") - (stdenv.lib.withFeature gtkWidgets "infgtk") - (stdenv.lib.withFeature daemon "infinoted") - (stdenv.lib.withFeature daemon "libdaemon") - (stdenv.lib.withFeature avahiSupport "avahi") - ]; - - passthru = { - inherit version; - }; - - meta = { - homepage = http://gobby.0x539.de/; - description = "An implementation of the Infinote protocol written in GObject-based C"; - license = stdenv.lib.licenses.lgpl2Plus; - maintainers = [ stdenv.lib.maintainers.phreedom ]; - platforms = with stdenv.lib.platforms; linux ++ darwin; - }; - -} +in self diff --git a/pkgs/development/libraries/openscenegraph/default.nix b/pkgs/development/libraries/openscenegraph/default.nix index 8d083904189..cddc2038791 100644 --- a/pkgs/development/libraries/openscenegraph/default.nix +++ b/pkgs/development/libraries/openscenegraph/default.nix @@ -1,33 +1,72 @@ -{ stdenv, lib, fetchurl, cmake, pkgconfig, doxygen, unzip -, freetype, libjpeg, jasper, libxml2, zlib, gdal, curl, libX11 -, cairo, poppler, librsvg, libpng, libtiff, libXrandr -, xineLib, boost -, withApps ? false -, withSDL ? false, SDL -, withQt4 ? false, qt4 +{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig, doxygen, + libX11, libXinerama, libXrandr, libGLU_combined, + glib, ilmbase, libxml2, pcre, zlib, + jpegSupport ? true, libjpeg, + jasperSupport ? true, jasper, + exrSupport ? false, openexr, + gifSupport ? true, giflib, + pngSupport ? true, libpng, + tiffSupport ? true, libtiff, + gdalSupport ? false, gdal, + curlSupport ? true, curl, + colladaSupport ? false, opencollada, + opencascadeSupport ? false, opencascade, + ffmpegSupport ? false, ffmpeg, + nvttSupport ? false, nvidia-texture-tools, + freetypeSupport ? true, freetype, + svgSupport ? false, librsvg, + pdfSupport ? false, poppler, + vncSupport ? false, libvncserver, + lasSupport ? false, libLAS, + luaSupport ? false, lua, + sdlSupport ? false, SDL2, + restSupport ? false, asio, boost, + withApps ? false, + withExamples ? false, fltk, wxGTK, }: stdenv.mkDerivation rec { name = "openscenegraph-${version}"; - version = "3.4.0"; + version = "3.6.2"; - src = fetchurl { - url = "http://trac.openscenegraph.org/downloads/developer_releases/OpenSceneGraph-${version}.zip"; - sha256 = "03h4wfqqk7rf3mpz0sa99gy715cwpala7964z2npd8jxfn27swjw"; + src = fetchFromGitHub { + owner = "openscenegraph"; + repo = "OpenSceneGraph"; + rev = "fb40a0d1db018ff39a08699a7f17f7eb6d949c36"; + sha256 = "03jk6lclyd4biniaw04w7j0z1spkm69f1c19i37b8v9x3zv1p1id"; }; - nativeBuildInputs = [ pkgconfig cmake doxygen unzip ]; + nativeBuildInputs = [ pkgconfig cmake doxygen ]; buildInputs = [ - freetype libjpeg jasper libxml2 zlib gdal curl libX11 - cairo poppler librsvg libpng libtiff libXrandr boost - xineLib - ] ++ lib.optional withSDL SDL - ++ lib.optional withQt4 qt4; + libX11 libXinerama libXrandr libGLU_combined + glib ilmbase libxml2 pcre zlib + ] ++ lib.optional jpegSupport libjpeg + ++ lib.optional jasperSupport jasper + ++ lib.optional exrSupport openexr + ++ lib.optional gifSupport giflib + ++ lib.optional pngSupport libpng + ++ lib.optional tiffSupport libtiff + ++ lib.optional gdalSupport gdal + ++ lib.optional curlSupport curl + ++ lib.optional colladaSupport opencollada + ++ lib.optional opencascadeSupport opencascade + ++ lib.optional ffmpegSupport ffmpeg + ++ lib.optional nvttSupport nvidia-texture-tools + ++ lib.optional freetypeSupport freetype + ++ lib.optional svgSupport librsvg + ++ lib.optional pdfSupport poppler + ++ lib.optional vncSupport libvncserver + ++ lib.optional lasSupport libLAS + ++ lib.optional luaSupport lua + ++ lib.optional sdlSupport SDL2 + ++ lib.optionals restSupport [ asio boost ] + ++ lib.optionals withExamples [ fltk wxGTK ] + ; enableParallelBuilding = true; - cmakeFlags = lib.optional (!withApps) "-DBUILD_OSG_APPLICATIONS=OFF"; + cmakeFlags = lib.optional (!withApps) "-DBUILD_OSG_APPLICATIONS=OFF" ++ lib.optional withExamples "-DBUILD_OSG_EXAMPLES=ON"; meta = with stdenv.lib; { description = "A 3D graphics toolkit"; diff --git a/pkgs/development/node-packages/node-packages-v6.json b/pkgs/development/node-packages/node-packages-v6.json index dd8d0818703..7cb77cf476c 100644 --- a/pkgs/development/node-packages/node-packages-v6.json +++ b/pkgs/development/node-packages/node-packages-v6.json @@ -105,6 +105,7 @@ , "svgo" , "tern" , "titanium" +, "triton" , "typescript" , "typings" , "uglify-js" diff --git a/pkgs/development/node-packages/node-packages-v6.nix b/pkgs/development/node-packages/node-packages-v6.nix index 6dae8dd7013..a50be209bcd 100644 --- a/pkgs/development/node-packages/node-packages-v6.nix +++ b/pkgs/development/node-packages/node-packages-v6.nix @@ -3154,6 +3154,15 @@ let sha1 = "31ab1ac8b129363463e35b3ebb69f4dfcfba7947"; }; }; + "backoff-2.4.1" = { + name = "backoff"; + packageName = "backoff"; + version = "2.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/backoff/-/backoff-2.4.1.tgz"; + sha1 = "2f68c50e0dd789dbefe24200a62efb04d2456d68"; + }; + }; "backoff-2.5.0" = { name = "backoff"; packageName = "backoff"; @@ -3469,6 +3478,15 @@ let sha512 = "+hN/Zh2D08Mx65pZ/4g5bsmNiZUuChDiQfTUQ7qJr4/kuopCr88xZsAXv6mBoZEsUI4OuGHlX59qE94K2mMW8Q=="; }; }; + "bigspinner-3.1.0" = { + name = "bigspinner"; + packageName = "bigspinner"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bigspinner/-/bigspinner-3.1.0.tgz"; + sha1 = "dd3a862b2fedf66fee8471320069428d0d84427a"; + }; + }; "bin-version-2.0.0" = { name = "bin-version"; packageName = "bin-version"; @@ -5629,6 +5647,15 @@ let sha1 = "8d21967625b25ee35fca8e8453ccf10fccd04e45"; }; }; + "cmdln-4.1.2" = { + name = "cmdln"; + packageName = "cmdln"; + version = "4.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/cmdln/-/cmdln-4.1.2.tgz"; + sha1 = "4345bb5498f2b096ba85ec8c5579a8cb252f7c70"; + }; + }; "co-3.1.0" = { name = "co"; packageName = "co"; @@ -10356,6 +10383,15 @@ let sha1 = "4d58b815ace5bebfc4ebf03cf98b0a7604a99b86"; }; }; + "extsprintf-1.0.2" = { + name = "extsprintf"; + packageName = "extsprintf"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/extsprintf/-/extsprintf-1.0.2.tgz"; + sha1 = "e1080e0658e300b06294990cc70e1502235fd550"; + }; + }; "extsprintf-1.2.0" = { name = "extsprintf"; packageName = "extsprintf"; @@ -11616,6 +11652,15 @@ let sha1 = "1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"; }; }; + "fuzzyset.js-0.0.1" = { + name = "fuzzyset.js"; + packageName = "fuzzyset.js"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/fuzzyset.js/-/fuzzyset.js-0.0.1.tgz"; + sha1 = "979e22f9451b4b38f051f7937c919dbacc692958"; + }; + }; "fx-runner-1.0.9" = { name = "fx-runner"; packageName = "fx-runner"; @@ -11841,6 +11886,15 @@ let sha512 = "bOZafIX+19cCS5KUjHtlJPZW+4joMa5tISIk5CugjmlZE0zZtjwB59wm56JPXVy5ELivw7g4Z9TEI0EDa2CSwQ=="; }; }; + "getpass-0.1.6" = { + name = "getpass"; + packageName = "getpass"; + version = "0.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/getpass/-/getpass-0.1.6.tgz"; + sha1 = "283ffd9fc1256840875311c1b60e8c40187110e6"; + }; + }; "getpass-0.1.7" = { name = "getpass"; packageName = "getpass"; @@ -15676,6 +15730,15 @@ let sha1 = "cd13466ea2480dbd8396a570d47d31dda476f8b1"; }; }; + "jsprim-1.4.0" = { + name = "jsprim"; + packageName = "jsprim"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jsprim/-/jsprim-1.4.0.tgz"; + sha1 = "a3b87e40298d8c380552d8cc7628a0bb95a22918"; + }; + }; "jsprim-1.4.1" = { name = "jsprim"; packageName = "jsprim"; @@ -17216,6 +17279,15 @@ let sha1 = "6952722ffa3049a55a5e1c10ee4a0947a3e5e19b"; }; }; + "lomstream-1.1.0" = { + name = "lomstream"; + packageName = "lomstream"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lomstream/-/lomstream-1.1.0.tgz"; + sha1 = "2a7f8066ec3ab40bef28ca384842e75340183bf0"; + }; + }; "long-2.4.0" = { name = "long"; packageName = "long"; @@ -17432,6 +17504,15 @@ let sha1 = "2738bd9f0d3cf4f84490c5736c48699ac632cda3"; }; }; + "lstream-0.0.4" = { + name = "lstream"; + packageName = "lstream"; + version = "0.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/lstream/-/lstream-0.0.4.tgz"; + sha1 = "d637764ea33a929bd00f34d2a23c2256d0d5fb5b"; + }; + }; "ltgt-1.0.2" = { name = "ltgt"; packageName = "ltgt"; @@ -18575,6 +18656,15 @@ let sha1 = "3bac3f3924a845d147784fc6558dee900b0151e2"; }; }; + "mooremachine-2.2.1" = { + name = "mooremachine"; + packageName = "mooremachine"; + version = "2.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/mooremachine/-/mooremachine-2.2.1.tgz"; + sha1 = "0d9891aa7c2cf32ca73e72f52a3561ed787e2e8c"; + }; + }; "morgan-1.6.1" = { name = "morgan"; packageName = "morgan"; @@ -20552,6 +20642,15 @@ let sha1 = "151af86bfc1f08c4b9f07d06ab250ffcbeb56581"; }; }; + "once-1.3.2" = { + name = "once"; + packageName = "once"; + version = "1.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/once/-/once-1.3.2.tgz"; + sha1 = "d8feeca93b039ec1dcdee7741c92bdac5e28081b"; + }; + }; "once-1.3.3" = { name = "once"; packageName = "once"; @@ -24324,6 +24423,33 @@ let sha1 = "e1e5b7ad9d4f6aeacd20e28f44a045f26c146dbc"; }; }; + "restify-clients-1.5.2" = { + name = "restify-clients"; + packageName = "restify-clients"; + version = "1.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/restify-clients/-/restify-clients-1.5.2.tgz"; + sha1 = "d4b13d82f287e77e2eb5daae14e6ef8534aa7389"; + }; + }; + "restify-errors-3.0.0" = { + name = "restify-errors"; + packageName = "restify-errors"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/restify-errors/-/restify-errors-3.0.0.tgz"; + sha1 = "3b17177d43954acece4291465a97ce1b58cf3d57"; + }; + }; + "restify-errors-3.1.0" = { + name = "restify-errors"; + packageName = "restify-errors"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/restify-errors/-/restify-errors-3.1.0.tgz"; + sha1 = "06b5479477874c0856d782a12c8707dcdad53f16"; + }; + }; "restore-cursor-1.0.1" = { name = "restore-cursor"; packageName = "restore-cursor"; @@ -24432,6 +24558,15 @@ let sha1 = "e439be2aaee327321952730f99a8929e4fc50582"; }; }; + "rimraf-2.4.4" = { + name = "rimraf"; + packageName = "rimraf"; + version = "2.4.4"; + src = fetchurl { + url = "https://registry.npmjs.org/rimraf/-/rimraf-2.4.4.tgz"; + sha1 = "b528ce2ebe0e6d89fb03b265de11d61da0dbcf82"; + }; + }; "rimraf-2.4.5" = { name = "rimraf"; packageName = "rimraf"; @@ -24864,6 +24999,15 @@ let sha1 = "77466de589cd5d3c95f138aa78bc569a3cb5d27a"; }; }; + "semver-5.1.0" = { + name = "semver"; + packageName = "semver"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/semver/-/semver-5.1.0.tgz"; + sha1 = "85f2cf8550465c4df000cf7d86f6b054106ab9e5"; + }; + }; "semver-5.1.1" = { name = "semver"; packageName = "semver"; @@ -25692,6 +25836,15 @@ let sha1 = "96568a565e9d9feb03b93a50651eee14d23adf44"; }; }; + "smartdc-auth-2.5.7" = { + name = "smartdc-auth"; + packageName = "smartdc-auth"; + version = "2.5.7"; + src = fetchurl { + url = "https://registry.npmjs.org/smartdc-auth/-/smartdc-auth-2.5.7.tgz"; + sha1 = "42d45710e791deb92df91326c8eed1bd5a842cb6"; + }; + }; "smtp-connection-1.3.8" = { name = "smtp-connection"; packageName = "smtp-connection"; @@ -26601,6 +26754,15 @@ let sha1 = "512675a28f08f1e581779e1989ab1e13effb49e4"; }; }; + "sshpk-1.14.1" = { + name = "sshpk"; + packageName = "sshpk"; + version = "1.14.1"; + src = fetchurl { + url = "https://registry.npmjs.org/sshpk/-/sshpk-1.14.1.tgz"; + sha1 = "130f5975eddad963f1d56f92b9ac6c51fa9f83eb"; + }; + }; "sshpk-1.14.2" = { name = "sshpk"; packageName = "sshpk"; @@ -26628,6 +26790,15 @@ let sha1 = "62e143c18530fda103320b3403e8ad42786d9718"; }; }; + "sshpk-agent-1.7.0" = { + name = "sshpk-agent"; + packageName = "sshpk-agent"; + version = "1.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/sshpk-agent/-/sshpk-agent-1.7.0.tgz"; + sha512 = "zR4GV5XYSypCusFzfTeTSXVqrFJJsK79Ec2KXZdo/x7qxBGSJPPZFtqMcqpXPaJ9VCK7Zn/vI+/kMrqeQILv4w=="; + }; + }; "ssri-5.3.0" = { name = "ssri"; packageName = "ssri"; @@ -27330,6 +27501,15 @@ let sha1 = "f7fb93758a69a571140181277eea0c2eb1301fa3"; }; }; + "strsplit-1.0.0" = { + name = "strsplit"; + packageName = "strsplit"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/strsplit/-/strsplit-1.0.0.tgz"; + sha1 = "0fdedc68e91addcfcb2e6be9c262581a6e8c28aa"; + }; + }; "subarg-1.0.0" = { name = "subarg"; packageName = "subarg"; @@ -27538,6 +27718,15 @@ let sha256 = "c824206b33da96cf5c01c21f1b133a0e3568e07ee4dcc9beefa8226864cd0272"; }; }; + "tabula-1.10.0" = { + name = "tabula"; + packageName = "tabula"; + version = "1.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/tabula/-/tabula-1.10.0.tgz"; + sha1 = "2ed67caf8cad091de80e43622850d899713b2f47"; + }; + }; "taffydb-2.6.2" = { name = "taffydb"; packageName = "taffydb"; @@ -29851,6 +30040,15 @@ let sha1 = "8a6a4ac3a8c774b6f687fece49bdffd78552e2cd"; }; }; + "verror-1.3.6" = { + name = "verror"; + packageName = "verror"; + version = "1.3.6"; + src = fetchurl { + url = "https://registry.npmjs.org/verror/-/verror-1.3.6.tgz"; + sha1 = "cff5df12946d297d2baaefaa2689e25be01c005c"; + }; + }; "verror-1.6.0" = { name = "verror"; packageName = "verror"; @@ -30103,6 +30301,15 @@ let sha1 = "3b899a8ef71c37f3054d79bdbdda31c7bf36f20d"; }; }; + "vstream-0.1.0" = { + name = "vstream"; + packageName = "vstream"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/vstream/-/vstream-0.1.0.tgz"; + sha1 = "13587190f34e72ba7a07ebbaa7e70ac147b1fb7d"; + }; + }; "walk-2.3.14" = { name = "walk"; packageName = "walk"; @@ -46946,6 +47153,189 @@ in production = true; bypassCache = false; }; + triton = nodeEnv.buildNodePackage { + name = "triton"; + packageName = "triton"; + version = "6.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/triton/-/triton-6.1.2.tgz"; + sha1 = "1f4376383ea07de8bffbfd00b445719d57a5f474"; + }; + dependencies = [ + sources."asn1-0.2.4" + sources."assert-plus-0.2.0" + sources."backoff-2.4.1" + sources."balanced-match-1.0.0" + sources."bcrypt-pbkdf-1.0.2" + sources."bigspinner-3.1.0" + sources."brace-expansion-1.1.11" + sources."bunyan-1.8.12" + sources."clone-0.1.5" + (sources."cmdln-4.1.2" // { + dependencies = [ + sources."assert-plus-1.0.0" + sources."extsprintf-1.4.0" + ]; + }) + sources."concat-map-0.0.1" + sources."core-util-is-1.0.2" + (sources."dashdash-1.14.1" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + sources."dtrace-provider-0.8.7" + sources."ecc-jsbn-0.1.2" + sources."extsprintf-1.0.2" + sources."fast-safe-stringify-1.2.3" + sources."fuzzyset.js-0.0.1" + (sources."getpass-0.1.6" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + sources."glob-5.0.15" + (sources."http-signature-1.2.0" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + sources."inflight-1.0.6" + sources."inherits-2.0.3" + sources."is-absolute-0.1.7" + sources."is-relative-0.1.3" + sources."isarray-1.0.0" + sources."isexe-1.1.2" + sources."jsbn-0.1.1" + sources."json-schema-0.2.3" + (sources."jsprim-1.4.0" // { + dependencies = [ + sources."assert-plus-1.0.0" + sources."verror-1.3.6" + ]; + }) + sources."keep-alive-agent-0.0.1" + sources."lodash-4.17.10" + (sources."lomstream-1.1.0" // { + dependencies = [ + sources."assert-plus-0.1.5" + sources."extsprintf-1.3.0" + ]; + }) + sources."lru-cache-4.1.3" + sources."lstream-0.0.4" + sources."mime-1.6.0" + sources."minimatch-3.0.4" + sources."minimist-0.0.8" + sources."mkdirp-0.5.1" + sources."moment-2.22.2" + sources."mooremachine-2.2.1" + sources."mute-stream-0.0.7" + sources."mv-2.1.1" + sources."nan-2.10.0" + sources."ncp-2.0.0" + sources."once-1.3.2" + sources."path-is-absolute-1.0.1" + sources."precond-0.2.3" + sources."process-nextick-args-2.0.0" + sources."pseudomap-1.0.2" + sources."read-1.0.7" + sources."readable-stream-2.3.6" + (sources."restify-clients-1.5.2" // { + dependencies = [ + sources."assert-plus-1.0.0" + (sources."restify-errors-3.1.0" // { + dependencies = [ + sources."assert-plus-0.2.0" + sources."lodash-3.10.1" + ]; + }) + ]; + }) + (sources."restify-errors-3.0.0" // { + dependencies = [ + sources."assert-plus-0.1.5" + sources."lodash-3.10.1" + ]; + }) + sources."rimraf-2.4.4" + sources."safe-buffer-5.1.2" + sources."safe-json-stringify-1.2.0" + sources."safer-buffer-2.1.2" + sources."semver-5.1.0" + (sources."smartdc-auth-2.5.7" // { + dependencies = [ + sources."assert-plus-1.0.0" + (sources."dashdash-1.10.1" // { + dependencies = [ + sources."assert-plus-0.1.5" + ]; + }) + sources."extsprintf-1.0.0" + sources."json-schema-0.2.2" + (sources."jsprim-0.3.0" // { + dependencies = [ + sources."verror-1.3.3" + ]; + }) + sources."once-1.3.0" + sources."vasync-1.4.3" + sources."verror-1.1.0" + ]; + }) + (sources."sshpk-1.14.1" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + (sources."sshpk-agent-1.7.0" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + sources."string_decoder-1.1.1" + sources."strsplit-1.0.0" + (sources."tabula-1.10.0" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + sources."tunnel-agent-0.6.0" + sources."tweetnacl-0.14.5" + sources."util-deprecate-1.0.2" + sources."uuid-3.3.2" + (sources."vasync-1.6.3" // { + dependencies = [ + sources."extsprintf-1.2.0" + sources."verror-1.6.0" + ]; + }) + (sources."verror-1.10.0" // { + dependencies = [ + sources."assert-plus-1.0.0" + sources."extsprintf-1.4.0" + ]; + }) + (sources."vstream-0.1.0" // { + dependencies = [ + sources."assert-plus-0.1.5" + sources."extsprintf-1.2.0" + ]; + }) + sources."which-1.2.4" + sources."wordwrap-1.0.0" + sources."wrappy-1.0.2" + sources."yallist-2.1.2" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Joyent Triton CLI and client (https://www.joyent.com/triton)"; + homepage = https://github.com/joyent/node-triton; + license = "MPL-2.0"; + }; + production = true; + bypassCache = false; + }; typescript = nodeEnv.buildNodePackage { name = "typescript"; packageName = "typescript"; diff --git a/pkgs/development/ocaml-modules/wasm/default.nix b/pkgs/development/ocaml-modules/wasm/default.nix index 5fe0e2abc19..e10a67a50a0 100644 --- a/pkgs/development/ocaml-modules/wasm/default.nix +++ b/pkgs/development/ocaml-modules/wasm/default.nix @@ -21,11 +21,16 @@ stdenv.mkDerivation rec { createFindlibDestdir = true; + postInstall = '' + mkdir $out/bin + cp -L interpreter/wasm $out/bin + ''; + meta = { - description = "An OCaml library to read and write Web Assembly (wasm) files and manipulate their AST"; + description = "An executable and OCaml library to run, read and write Web Assembly (wasm) files and manipulate their AST"; license = stdenv.lib.licenses.asl20; maintainers = [ stdenv.lib.maintainers.vbgl ]; - inherit (src.meta) homepage; + homepage = https://github.com/WebAssembly/spec/tree/master/interpreter; inherit (ocaml.meta) platforms; }; } diff --git a/pkgs/development/python-modules/browser-cookie3/default.nix b/pkgs/development/python-modules/browser-cookie3/default.nix new file mode 100644 index 00000000000..64510ee5b64 --- /dev/null +++ b/pkgs/development/python-modules/browser-cookie3/default.nix @@ -0,0 +1,24 @@ +{ lib, fetchPypi, buildPythonPackage, isPy3k, keyring, pbkdf2, pyaes}: +buildPythonPackage rec { + pname = "browser-cookie3"; + version = "0.6.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "16nghwsrv08gz4iiyxsy5lgg5ljgrwkp471m7xnsvhhpb3axmnsc"; + }; + + disabled = !isPy3k; + + propagatedBuildInputs = [ keyring pbkdf2 pyaes ]; + + # No tests implemented + doCheck = false; + + meta = with lib; { + description = "Loads cookies from your browser into a cookiejar object"; + maintainers = with maintainers; [ borisbabic ]; + homepage = https://github.com/borisbabic/browser_cookie3; + license = licenses.gpl3; + }; +} diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix index 56b64cd061b..2c81e27d3a2 100644 --- a/pkgs/development/tools/build-managers/bazel/default.nix +++ b/pkgs/development/tools/build-managers/bazel/default.nix @@ -5,7 +5,7 @@ # Also, don't clean up environment variables. , enableNixHacks ? false # Apple dependencies -, libcxx, CoreFoundation, CoreServices, Foundation +, cctools, clang, libcxx, CoreFoundation, CoreServices, Foundation }: let @@ -75,7 +75,34 @@ stdenv.mkDerivation rec { ''; postPatch = stdenv.lib.optionalString stdenv.hostPlatform.isDarwin '' + # Disable Bazel's Xcode toolchain detection which would configure compilers + # and linkers from Xcode instead of from PATH + export BAZEL_USE_CPP_ONLY_TOOLCHAIN=1 + + # Framework search paths aren't added by bintools hook + # https://github.com/NixOS/nixpkgs/pull/41914 export NIX_LDFLAGS="$NIX_LDFLAGS -F${CoreFoundation}/Library/Frameworks -F${CoreServices}/Library/Frameworks -F${Foundation}/Library/Frameworks" + + # libcxx includes aren't added by libcxx hook + # https://github.com/NixOS/nixpkgs/pull/41589 + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -isystem ${libcxx}/include/c++/v1" + + # don't use system installed Xcode to run clang, use Nix clang instead + sed -i -e "s;/usr/bin/xcrun clang;${clang}/bin/clang $NIX_CFLAGS_COMPILE $NIX_LDFLAGS -framework CoreFoundation;g" \ + scripts/bootstrap/compile.sh \ + src/tools/xcode/realpath/BUILD \ + src/tools/xcode/stdredirect/BUILD \ + tools/osx/BUILD + + # clang installed from Xcode has a compatibility wrapper that forwards + # invocations of gcc to clang, but vanilla clang doesn't + sed -i -e 's;_find_generic(repository_ctx, "gcc", "CC", overriden_tools);_find_generic(repository_ctx, "clang", "CC", overriden_tools);g' tools/cpp/unix_cc_configure.bzl + + sed -i -e 's;/usr/bin/libtool;${cctools}/bin/libtool;g' tools/cpp/unix_cc_configure.bzl + wrappers=( tools/cpp/osx_cc_wrapper.sh tools/cpp/osx_cc_wrapper.sh.tpl ) + for wrapper in "''${wrappers[@]}"; do + sed -i -e "s,/usr/bin/install_name_tool,${cctools}/bin/install_name_tool,g" $wrapper + done '' + '' find src/main/java/com/google/devtools -type f -print0 | while IFS="" read -r -d "" path; do substituteInPlace "$path" \ @@ -119,7 +146,7 @@ stdenv.mkDerivation rec { makeWrapper which customBash - ] ++ lib.optionals (stdenv.isDarwin) [ libcxx CoreFoundation CoreServices Foundation ]; + ] ++ lib.optionals (stdenv.isDarwin) [ cctools clang libcxx CoreFoundation CoreServices Foundation ]; # If TMPDIR is in the unpack dir we run afoul of blaze's infinite symlink # detector (see com.google.devtools.build.lib.skyframe.FileFunction). diff --git a/pkgs/development/tools/flootty/default.nix b/pkgs/development/tools/flootty/default.nix index 796c3dc79a0..1baddb52259 100644 --- a/pkgs/development/tools/flootty/default.nix +++ b/pkgs/development/tools/flootty/default.nix @@ -1,22 +1,18 @@ -{ stdenv, python }: +{ stdenv, python3Packages }: -let - inherit (python.pkgs) buildPythonApplication fetchPypi; -in - -buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "Flootty"; - version = "3.2.1"; + version = "3.2.2"; - src = fetchPypi { + src = python3Packages.fetchPypi { inherit pname version; - sha256 = "0vjwl6g1bwm6jwp9wjla663cm831zf0rc9361mvpn4imdsfz7hxs"; + sha256 = "0gfl143ly81pmmrcml91yr0ypvwrs5q4s1sfdc0l2qkqpy233ih7"; }; meta = with stdenv.lib; { description = "A collaborative terminal. In practice, it's similar to a shared screen or tmux session"; homepage = "https://floobits.com/help/flootty"; license = licenses.asl20; - maintainers = with maintainers; [ sellout ]; + maintainers = with maintainers; [ sellout enzime ]; }; } diff --git a/pkgs/development/tools/kubectx/default.nix b/pkgs/development/tools/kubectx/default.nix new file mode 100644 index 00000000000..5cf0badf668 --- /dev/null +++ b/pkgs/development/tools/kubectx/default.nix @@ -0,0 +1,38 @@ +{ stdenv, lib, fetchFromGitHub, kubectl, makeWrapper }: + +with lib; + +stdenv.mkDerivation rec { + name = "kubectx"; + version = "0.5.1"; + + src = fetchFromGitHub { + owner = "ahmetb"; + repo = "${name}"; + rev = "v${version}"; + sha256 = "1bmmaj5fffx4hy55l6x4vl5gr9rp2yhg4vs5b9sya9rjvdkamdx5"; + }; + + buildInputs = [ makeWrapper ]; + + dontBuild = true; + doCheck = false; + + installPhase = '' + mkdir -p $out/bin + cp kubectx $out/bin + cp kubens $out/bin + + for f in $out/bin/*; do + wrapProgram $f --prefix PATH : ${makeBinPath [ kubectl ]} + done + ''; + + meta = { + description = "Fast way to switch between clusters and namespaces in kubectl!"; + license = licenses.asl20; + homepage = https://github.com/ahmetb/kubectx; + maintainers = with maintainers; [ periklis ]; + platforms = with platforms; unix; + }; +} diff --git a/pkgs/development/tools/parsing/antlr/2.7.7.nix b/pkgs/development/tools/parsing/antlr/2.7.7.nix index 519540ef52a..0c67baa9601 100644 --- a/pkgs/development/tools/parsing/antlr/2.7.7.nix +++ b/pkgs/development/tools/parsing/antlr/2.7.7.nix @@ -20,6 +20,7 @@ stdenv.mkDerivation { walk parse trees. ''; homepage = http://www.antlr.org/; + license = licenses.bsd3; platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/parsing/antlr/3.4.nix b/pkgs/development/tools/parsing/antlr/3.4.nix index c892b8fa8ea..8074b7c35ad 100644 --- a/pkgs/development/tools/parsing/antlr/3.4.nix +++ b/pkgs/development/tools/parsing/antlr/3.4.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; unpackPhase = "true"; - + installPhase = '' mkdir -p "$out"/{lib/antlr,bin} cp "$src" "$out/lib/antlr/antlr-${version}-complete.jar" @@ -33,6 +33,7 @@ stdenv.mkDerivation rec { walk parse trees. ''; homepage = http://www.antlr.org/; + license = licenses.bsd3; platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/development/tools/parsing/antlr/3.5.nix b/pkgs/development/tools/parsing/antlr/3.5.nix index 030a19e9940..35179b33602 100644 --- a/pkgs/development/tools/parsing/antlr/3.5.nix +++ b/pkgs/development/tools/parsing/antlr/3.5.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; unpackPhase = "true"; - + installPhase = '' mkdir -p "$out"/{lib/antlr,bin} cp "$src" "$out/lib/antlr/antlr-${version}-complete.jar" @@ -33,6 +33,7 @@ stdenv.mkDerivation rec { walk parse trees. ''; homepage = http://www.antlr.org/; + license = licenses.bsd3; platforms = platforms.linux; }; } diff --git a/pkgs/development/tools/parsing/antlr/4.7.nix b/pkgs/development/tools/parsing/antlr/4.7.nix index 463ea3199b2..1ebf7d7dfe2 100644 --- a/pkgs/development/tools/parsing/antlr/4.7.nix +++ b/pkgs/development/tools/parsing/antlr/4.7.nix @@ -28,6 +28,7 @@ let meta = with stdenv.lib; { description = "C++ target for ANTLR 4"; homepage = http://www.antlr.org/; + license = licenses.bsd3; platforms = platforms.unix; }; }; @@ -73,6 +74,7 @@ let walk parse trees. ''; homepage = http://www.antlr.org/; + license = licenses.bsd3; platforms = platforms.unix; }; }; diff --git a/pkgs/games/ivan/default.nix b/pkgs/games/ivan/default.nix index 3281c3d28d1..54aa2722092 100644 --- a/pkgs/games/ivan/default.nix +++ b/pkgs/games/ivan/default.nix @@ -39,6 +39,6 @@ stdenv.mkDerivation rec { homepage = https://attnam.com/; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = with maintainers; [nonfreeblob]; + maintainers = with maintainers; []; }; } diff --git a/pkgs/os-specific/linux/kernel/hardened-config.nix b/pkgs/os-specific/linux/kernel/hardened-config.nix index 7e277617b61..309b5f6c74e 100644 --- a/pkgs/os-specific/linux/kernel/hardened-config.nix +++ b/pkgs/os-specific/linux/kernel/hardened-config.nix @@ -103,16 +103,17 @@ PAGE_POISONING_ZERO y PANIC_ON_OOPS y PANIC_TIMEOUT -1 -GCC_PLUGINS y # Enable gcc plugin options +${optionalString (versionOlder version "4.18") '' + GCC_PLUGINS y # Enable gcc plugin options + # Gather additional entropy at boot time for systems that may not have appropriate entropy sources. + GCC_PLUGIN_LATENT_ENTROPY y -# Gather additional entropy at boot time for systems that may not have appropriate entropy sources. -GCC_PLUGIN_LATENT_ENTROPY y - -${optionalString (versionAtLeast version "4.11") '' - GCC_PLUGIN_STRUCTLEAK y # A port of the PaX structleak plugin -''} -${optionalString (versionAtLeast version "4.14") '' - GCC_PLUGIN_STRUCTLEAK_BYREF_ALL y # Also cover structs passed by address + ${optionalString (versionAtLeast version "4.11") '' + GCC_PLUGIN_STRUCTLEAK y # A port of the PaX structleak plugin + ''} + ${optionalString (versionAtLeast version "4.14") '' + GCC_PLUGIN_STRUCTLEAK_BYREF_ALL y # Also cover structs passed by address + ''} ''} # Disable various dangerous settings @@ -121,8 +122,10 @@ PROC_KCORE n # Exposes kernel text image layout INET_DIAG n # Has been used for heap based attacks in the past # Use -fstack-protector-strong (gcc 4.9+) for best stack canary coverage. -CC_STACKPROTECTOR_REGULAR n -CC_STACKPROTECTOR_STRONG y +${optionalString (versionOlder version "4.18") '' + CC_STACKPROTECTOR_REGULAR n + CC_STACKPROTECTOR_STRONG y +''} # Enable compile/run-time buffer overflow detection ala glibc's _FORTIFY_SOURCE ${optionalString (versionAtLeast version "4.13") '' diff --git a/pkgs/os-specific/linux/kernel/linux-4.18.nix b/pkgs/os-specific/linux/kernel/linux-4.18.nix new file mode 100644 index 00000000000..4f183b696cc --- /dev/null +++ b/pkgs/os-specific/linux/kernel/linux-4.18.nix @@ -0,0 +1,18 @@ +{ stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, modDirVersionArg ? null, ... } @ args: + +with stdenv.lib; + +buildLinux (args // rec { + version = "4.18"; + + # modDirVersion needs to be x.y.z, will automatically add .0 if needed + modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; + + # branchVersion needs to be x.y + extraMeta.branch = concatStrings (intersperse "." (take 2 (splitString "." version))); + + src = fetchurl { + url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; + sha256 = "1wgay4k8wj08fc711j290fvi81x75yib8iaa6r7csc7mkvsbrn0r"; + }; +} // (args.argsOverride or {})) diff --git a/pkgs/servers/nosql/redis/default.nix b/pkgs/servers/nosql/redis/default.nix index bf1ccbd06d5..36bf8a1e15a 100644 --- a/pkgs/servers/nosql/redis/default.nix +++ b/pkgs/servers/nosql/redis/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, lua }: stdenv.mkDerivation rec { - version = "4.0.10"; + version = "4.0.11"; name = "redis-${version}"; src = fetchurl { url = "http://download.redis.io/releases/${name}.tar.gz"; - sha256 = "194cydhv3hf4v95ifvjvsqrs4jn3ffrkg5lvxj5d3y04lwsp9dhx"; + sha256 = "1fqvxlpaxr80iykyvpf1fia8rxh4zz8paf5nnjncsssqwwxfflzw"; }; buildInputs = [ lua ]; diff --git a/pkgs/servers/search/groonga/default.nix b/pkgs/servers/search/groonga/default.nix index d8c8682d504..a609476c41a 100644 --- a/pkgs/servers/search/groonga/default.nix +++ b/pkgs/servers/search/groonga/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { name = "groonga-${version}"; - version = "8.0.2"; + version = "8.0.5"; src = fetchurl { url = "https://packages.groonga.org/source/groonga/${name}.tar.gz"; - sha256 = "0bsf4dbgbddij49xg6d6kl9kb1m5ywdyc1w1xz2giisqk1hdwsz4"; + sha256 = "1w7yygqp089kmiznxrwhvyny8cfdb4lr2pazh4873r8xxb9dyfvn"; }; buildInputs = with stdenv.lib; diff --git a/pkgs/servers/sql/postgresql/cstore_fdw/default.nix b/pkgs/servers/sql/postgresql/cstore_fdw/default.nix index 70b8abf2502..b6b9f3a5650 100644 --- a/pkgs/servers/sql/postgresql/cstore_fdw/default.nix +++ b/pkgs/servers/sql/postgresql/cstore_fdw/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "cstore_fdw-${version}"; - version = "1.6.0"; + version = "1.6.1"; nativeBuildInputs = [ protobufc ]; buildInputs = [ postgresql ]; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { owner = "citusdata"; repo = "cstore_fdw"; rev = "refs/tags/v${version}"; - sha256 = "08jbx4hs2r742flilydp0ajjwv8ffnvq82nidh48irrfa4i7n0l0"; + sha256 = "1cpkpbv4c82l961anzwp74r1jc8f0n5z5cvwy4lyrqg5jr501nd4"; }; installPhase = '' diff --git a/pkgs/servers/web-apps/shaarli/default.nix b/pkgs/servers/web-apps/shaarli/default.nix index cee098db6b2..247270f67c5 100644 --- a/pkgs/servers/web-apps/shaarli/default.nix +++ b/pkgs/servers/web-apps/shaarli/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "shaarli-${version}"; - version = "0.9.7"; + version = "0.10.0"; src = fetchurl { url = "https://github.com/shaarli/Shaarli/releases/download/v${version}/shaarli-v${version}-full.tar.gz"; - sha256 = "191nnk4p6cpbljij1a30mpidqdvcwn1x6ndb4lgkqwbpnh86q57l"; + sha256 = "0j7i8ifzjg1s9y8nw4j0as0wdns06zdsjgr99137y9rz5w223pp6"; }; outputs = [ "out" "doc" ]; diff --git a/pkgs/shells/powershell/default.nix b/pkgs/shells/powershell/default.nix index e0654e131dc..a9b34824e49 100644 --- a/pkgs/shells/powershell/default.nix +++ b/pkgs/shells/powershell/default.nix @@ -4,8 +4,8 @@ let platformString = if stdenv.isDarwin then "osx" else if stdenv.isLinux then "linux" else throw "unsupported platform"; - platformSha = if stdenv.isDarwin then "1ga4p8xmrxa54v2s6i0q1q7lx2idcmp1jwm0g4jxr54fyn5ay3lf" - else if stdenv.isLinux then "1bv1yjk3rm1czibqagmh719m4r1x8j8bmh3nw40x7izm2sx0qg7v" + platformSha = if stdenv.isDarwin then "01j92myljgphf68la9q753m5wgfmd0kwlsk441yic7qshcly5xkw" + else if stdenv.isLinux then "0al1mrlz3m5ksnq86mqm0axb8bjdxa05j2p5y9bmcykrgkdwi3vk" else throw "unsupported platform"; platformLdLibraryPath = if stdenv.isDarwin then "DYLD_FALLBACK_LIBRARY_PATH" else if stdenv.isLinux then "LD_LIBRARY_PATH" @@ -14,7 +14,7 @@ let platformString = if stdenv.isDarwin then "osx" in stdenv.mkDerivation rec { name = "powershell-${version}"; - version = "6.0.3"; + version = "6.0.4"; src = fetchzip { url = "https://github.com/PowerShell/PowerShell/releases/download/v${version}/powershell-${version}-${platformString}-x64.tar.gz"; diff --git a/pkgs/shells/zsh/lambda-mod-zsh-theme/default.nix b/pkgs/shells/zsh/lambda-mod-zsh-theme/default.nix index 6dea51a487e..c4d63bd2771 100644 --- a/pkgs/shells/zsh/lambda-mod-zsh-theme/default.nix +++ b/pkgs/shells/zsh/lambda-mod-zsh-theme/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchFromGitHub, zsh }: stdenv.mkDerivation { name = "lambda-mod-zsh-theme-unstable-2017-10-08"; @@ -10,9 +10,13 @@ stdenv.mkDerivation { rev = "61c373c8aa5556d51522290b82ad44e7166bced1"; }; + buildInputs = [ zsh ]; + installPhase = '' - mkdir -p $out/share/themes - cp lambda-mod.zsh-theme $out/share/themes + chmod +x lambda-mod.zsh-theme # only executable scripts are found by `patchShebangs` + patchShebangs . + + install -Dm0644 lambda-mod.zsh-theme $out/share/zsh/themes/lambda-mod.zsh-theme ''; meta = with stdenv.lib; { diff --git a/pkgs/shells/zsh/nix-zsh-completions/default.nix b/pkgs/shells/zsh/nix-zsh-completions/default.nix index 3c4c3fabfd1..4405902ec3e 100644 --- a/pkgs/shells/zsh/nix-zsh-completions/default.nix +++ b/pkgs/shells/zsh/nix-zsh-completions/default.nix @@ -15,15 +15,16 @@ stdenv.mkDerivation rec { }; installPhase = '' - mkdir -p $out/share/zsh/site-functions + mkdir -p $out/share/zsh/{site-functions,plugins/nix} cp _* $out/share/zsh/site-functions + cp *.zsh $out/share/zsh/plugins/nix ''; - meta = { + meta = with stdenv.lib; { homepage = https://github.com/spwhitt/nix-zsh-completions; description = "ZSH completions for Nix, NixOS, and NixOps"; - license = stdenv.lib.licenses.bsd3; - platforms = stdenv.lib.platforms.all; - maintainers = [ stdenv.lib.maintainers.spwhitt stdenv.lib.maintainers.olejorgenb stdenv.lib.maintainers.hedning ]; + license = licenses.bsd3; + platforms = platforms.all; + maintainers = with maintainers; [ spwhitt olejorgenb hedning ma27 ]; }; } diff --git a/pkgs/tools/admin/ansible/default.nix b/pkgs/tools/admin/ansible/default.nix index afc9b44d42f..1d0d499db03 100644 --- a/pkgs/tools/admin/ansible/default.nix +++ b/pkgs/tools/admin/ansible/default.nix @@ -7,6 +7,8 @@ let pname = "ansible"; inherit version; + outputs = [ "out" "man" ]; + src = fetchurl { url = "https://releases.ansible.com/ansible/${pname}-${version}.tar.gz"; inherit sha256; @@ -16,6 +18,12 @@ let sed -i "s,/usr/,$out," lib/ansible/constants.py ''; + postInstall = '' + for m in docs/man/man1/*; do + install -vD $m -t $man/share/man/man1 + done + ''; + doCheck = false; dontStrip = true; dontPatchELF = true; diff --git a/pkgs/tools/backup/borg/default.nix b/pkgs/tools/backup/borg/default.nix index 0d11ba394e6..fe2f771c722 100644 --- a/pkgs/tools/backup/borg/default.nix +++ b/pkgs/tools/backup/borg/default.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { pname = "borgbackup"; - version = "1.1.6"; + version = "1.1.7"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "a1d2e474c85d3ad3d59b3f8209b5549653c88912082ea0159d27a2e80c910930"; + sha256 = "f7b51a132e9edfbe1cacb4f478b28caf3622d79fffcb369bdae9f92d8c8a7fdc"; }; nativeBuildInputs = with python3Packages; [ @@ -50,11 +50,22 @@ python3Packages.buildPythonApplication rec { cp scripts/shell_completions/zsh/_borg $out/share/zsh/site-functions/ ''; + checkInputs = with python3Packages; [ + pytest + ]; + + checkPhase = '' + HOME=$(mktemp -d) py.test --pyargs borg.testsuite + ''; + + # 63 failures, needs pytest-benchmark + doCheck = false; + meta = with stdenv.lib; { description = "A deduplicating backup program (attic fork)"; homepage = https://www.borgbackup.org; license = licenses.bsd3; platforms = platforms.unix; # Darwin and FreeBSD mentioned on homepage - maintainers = with maintainers; [ flokli ]; + maintainers = with maintainers; [ flokli dotlambda ]; }; } diff --git a/pkgs/tools/graphics/pywal/default.nix b/pkgs/tools/graphics/pywal/default.nix index a83bc845eb9..a1d1f21a007 100644 --- a/pkgs/tools/graphics/pywal/default.nix +++ b/pkgs/tools/graphics/pywal/default.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { pname = "pywal"; - version = "2.0.5"; + version = "3.1.0"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "117f61db013409ee2657aab9230cc5c2cb2b428c17f7fbcf664909122962165e"; + sha256 = "1i4i9jjnm4f0zhz4nqbb4253517w33bsh5f246n5930hwrr9xn76"; }; # necessary for imagemagick to be found during tests diff --git a/pkgs/tools/graphics/vips/default.nix b/pkgs/tools/graphics/vips/default.nix index 18699f41284..4a5a19fefca 100644 --- a/pkgs/tools/graphics/vips/default.nix +++ b/pkgs/tools/graphics/vips/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "vips-${version}"; - version = "8.6.4"; + version = "8.6.5"; src = fetchurl { url = "https://github.com/jcupitt/libvips/releases/download/v${version}/${name}.tar.gz"; - sha256 = "1x4ai997yfl4155r4k3m5fa5hj3030c4abi5g49kfarbr60a0ca6"; + sha256 = "1nymm4vzscb68aifin9q742ff64b4k4ddppq1060w8hf6h7ay0l7"; }; buildInputs = diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix index cb2076cd21c..daebceaf887 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "ibus-hangul-${version}"; - version = "1.5.0"; + version = "1.5.1"; src = fetchurl { url = "https://github.com/choehwanjin/ibus-hangul/releases/download/${version}/${name}.tar.gz"; - sha256 = "120p9w7za6hi521hz8q235fkl4i3p1qqr8nqm4a3kxr0pcq40bd2"; + sha256 = "0gha8dfdf54rx8fv3yfikbgdg6lqq6l883lhg7q68ybvkjx9bwbs"; }; buildInputs = [ gtk3 ibus libhangul python3 ]; diff --git a/pkgs/tools/misc/skim/default.nix b/pkgs/tools/misc/skim/default.nix index 31303dcdd4d..54a6500f779 100644 --- a/pkgs/tools/misc/skim/default.nix +++ b/pkgs/tools/misc/skim/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { name = "skim-${version}"; - version = "0.5.0"; + version = "0.5.1"; src = fetchFromGitHub { owner = "lotabout"; repo = "skim"; rev = "v${version}"; - sha256 = "0hk19mqfmrsyx28lb8h1hixivl6zrc8dg3imygk1ppgn66c0zf00"; + sha256 = "1k7l93kvf5ad07yn69vjfv6znwb9v38d53xa1ij195x4img9f34j"; }; outputs = [ "out" "vim" ]; @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { patchPhase = '' sed -i -e "s|expand(':h:h')|'$out'|" plugin/skim.vim # fix Cargo.lock version - sed -i -e '168s|0.4.0|0.5.0|' Cargo.lock + sed -i -e '168s|0.4.0|0.5.1|' Cargo.lock ''; postInstall = '' diff --git a/pkgs/tools/networking/siege/default.nix b/pkgs/tools/networking/siege/default.nix index cac3e3e6361..a0a65997414 100644 --- a/pkgs/tools/networking/siege/default.nix +++ b/pkgs/tools/networking/siege/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "HTTP load tester"; maintainers = with maintainers; [ ocharles raskin ]; - platforms = platforms.linux; + platforms = platforms.unix; license = licenses.gpl2Plus; }; } diff --git a/pkgs/tools/package-management/disnix/disnixos/default.nix b/pkgs/tools/package-management/disnix/disnixos/default.nix index 3604d011dec..7a58ec04e64 100644 --- a/pkgs/tools/package-management/disnix/disnixos/default.nix +++ b/pkgs/tools/package-management/disnix/disnixos/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, dysnomia, disnix, socat, pkgconfig, getopt }: stdenv.mkDerivation { - name = "disnixos-0.7"; + name = "disnixos-0.7.1"; src = fetchurl { - url = https://github.com/svanderburg/disnixos/files/1756702/disnixos-0.7.tar.gz; - sha256 = "1qf9h3q1r27vg1ry55lj01knq6i0c213f6vlg7wj958mml7fk37b"; + url = https://github.com/svanderburg/disnixos/files/2281312/disnixos-0.7.1.tar.gz; + sha256 = "00d7mcj77lwbj67vnh81bw6k6pg2asimky4zkq32mh8dslnhpnz6"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix index 2c422d51604..a9e8d8fca35 100644 --- a/pkgs/tools/security/vault/default.nix +++ b/pkgs/tools/security/vault/default.nix @@ -9,28 +9,26 @@ let }; in stdenv.mkDerivation rec { name = "vault-${version}"; - version = "0.10.3"; + version = "0.10.4"; src = fetchFromGitHub { owner = "hashicorp"; repo = "vault"; rev = "v${version}"; - sha256 = "16sndzbfciw4bccxm7sc83y2pma2bgsmc1kqyb2hp0jsdy4rl3k4"; + sha256 = "1f11arvj7zp8wwkvv3nn7kyga0ci8psdif6djrnzwjksskdgdbx5"; }; nativeBuildInputs = [ go gox removeReferencesTo ]; - buildPhase = '' + preBuild = '' patchShebangs ./ substituteInPlace scripts/build.sh --replace 'git rev-parse HEAD' 'echo ${src.rev}' sed -i s/'^GIT_DIRTY=.*'/'GIT_DIRTY="+NixOS"'/ scripts/build.sh - mkdir -p src/github.com/hashicorp + mkdir -p .git/hooks src/github.com/hashicorp ln -s $(pwd) src/github.com/hashicorp/vault - mkdir -p .git/hooks - - GOPATH=$(pwd) make + export GOPATH=$(pwd) ''; installPhase = '' @@ -47,6 +45,6 @@ in stdenv.mkDerivation rec { description = "A tool for managing secrets"; platforms = platforms.linux ++ platforms.darwin; license = licenses.mpl20; - maintainers = with maintainers; [ rushmorem offline pradeepchhetri ]; + maintainers = with maintainers; [ rushmorem lnl7 offline pradeepchhetri ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 49170793b00..8dae7aa09ae 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5553,6 +5553,8 @@ with pkgs; trickle = callPackage ../tools/networking/trickle {}; + inherit (nodePackages) triton; + triggerhappy = callPackage ../tools/inputmethods/triggerhappy {}; trousers = callPackage ../tools/security/trousers { }; @@ -6344,10 +6346,10 @@ with pkgs; fpc = callPackage ../development/compilers/fpc { }; - gambit = callPackage ../development/compilers/gambit { }; - gambit-unstable = callPackage ../development/compilers/gambit/unstable.nix { }; - gerbil = callPackage ../development/compilers/gerbil { }; - gerbil-unstable = callPackage ../development/compilers/gerbil/unstable.nix { }; + gambit = callPackage ../development/compilers/gambit { stdenv = gccStdenv; }; + gambit-unstable = callPackage ../development/compilers/gambit/unstable.nix { stdenv = gccStdenv; }; + gerbil = callPackage ../development/compilers/gerbil { stdenv = gccStdenv; }; + gerbil-unstable = callPackage ../development/compilers/gerbil/unstable.nix { stdenv = gccStdenv; }; gccFun = callPackage ../development/compilers/gcc/7; gcc = gcc7; @@ -7851,6 +7853,7 @@ with pkgs; bazel_0_4 = callPackage ../development/tools/build-managers/bazel/0.4.nix { }; bazel = callPackage ../development/tools/build-managers/bazel { + inherit (darwin) cctools; inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Foundation; }; @@ -8314,6 +8317,8 @@ with pkgs; kube-aws = callPackage ../development/tools/kube-aws { }; + kubectx = callPackage ../development/tools/kubectx { }; + kustomize = callPackage ../development/tools/kustomize { }; Literate = callPackage ../development/tools/literate-programming/Literate {}; @@ -10509,9 +10514,7 @@ with pkgs; libiec61883 = callPackage ../development/libraries/libiec61883 { }; - libinfinity = callPackage ../development/libraries/libinfinity { - inherit (gnome2) gtkdoc; - }; + libinfinity = callPackage ../development/libraries/libinfinity { }; libinput = callPackage ../development/libraries/libinput { graphviz = graphviz-nox; @@ -13874,6 +13877,16 @@ with pkgs; ]; }; + linux_4_18 = callPackage ../os-specific/linux/kernel/linux-4.18.nix { + kernelPatches = + [ kernelPatches.bridge_stp_helper + # See pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/README.md + # when adding a new linux version + # kernelPatches.cpu-cgroup-v2."4.11" + kernelPatches.modinst_arg_list_too_long + ]; + }; + linux_testing = callPackage ../os-specific/linux/kernel/linux-testing.nix { kernelPatches = [ kernelPatches.bridge_stp_helper @@ -14067,7 +14080,7 @@ with pkgs; linux = linuxPackages.kernel; # Update this when adding the newest kernel major version! - linuxPackages_latest = linuxPackages_4_17; + linuxPackages_latest = linuxPackages_4_18; linux_latest = linuxPackages_latest.kernel; # Build the kernel modules for the some of the kernels. @@ -14078,6 +14091,7 @@ with pkgs; linuxPackages_4_9 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_9); linuxPackages_4_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_14); linuxPackages_4_17 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_17); + linuxPackages_4_18 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_18); # Don't forget to update linuxPackages_latest! # Intentionally lacks recurseIntoAttrs, as -rc kernels will quite likely break out-of-tree modules and cause failed Hydra builds. @@ -16521,9 +16535,7 @@ with pkgs; gocr = callPackage ../applications/graphics/gocr { }; - gobby5 = callPackage ../applications/editors/gobby { - inherit (gnome2) gtksourceview; - }; + gobby5 = callPackage ../applications/editors/gobby { }; gphoto2 = callPackage ../applications/misc/gphoto2 { }; @@ -16882,6 +16894,10 @@ with pkgs; jalv = callPackage ../applications/audio/jalv { }; + jameica = callPackage ../applications/office/jameica { + inherit (darwin.apple_sdk.frameworks) Cocoa; + }; + jamin = callPackage ../applications/audio/jamin { }; japa = callPackage ../applications/audio/japa { }; @@ -17993,7 +18009,7 @@ with pkgs; qsyncthingtray = libsForQt5.callPackage ../applications/misc/qsyncthingtray { }; - qstopmotion = callPackage ../applications/video/qstopmotion { }; + qstopmotion = libsForQt5.callPackage ../applications/video/qstopmotion { }; qsynth = libsForQt5.callPackage ../applications/audio/qsynth { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 26c1215ae01..ceb92f29218 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -230,6 +230,8 @@ in { breathe = callPackage ../development/python-modules/breathe { }; + browser-cookie3 = callPackage ../development/python-modules/browser-cookie3 { }; + browsermob-proxy = disabledIf isPy3k (callPackage ../development/python-modules/browsermob-proxy {}); bugseverywhere = callPackage ../applications/version-management/bugseverywhere {}; @@ -2450,22 +2452,6 @@ in { flit = callPackage ../development/python-modules/flit { }; - Flootty = buildPythonPackage rec { - name = "Flootty-3.2.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/F/Flootty/${name}.tar.gz"; - sha256 = "14n2q2k388xbmp5rda5ss879bg5cbibk4zzz7c8mrjsmxhgagmmg"; - }; - - meta = with pkgs.stdenv.lib; { - description = "Floobits collaborative terminal"; - homepage = "https://github.com/Floobits/flootty/"; - maintainers = with maintainers; [ garbas ]; - license = licenses.asl20; - }; - }; - flowlogs_reader = buildPythonPackage rec { name = "flowlogs_reader-1.0.0";