diff options
218 files changed, 2639 insertions, 1475 deletions
diff --git a/doc/multiple-output.xml b/doc/multiple-output.xml index a2acc91e55a..2f23da8df01 100644 --- a/doc/multiple-output.xml +++ b/doc/multiple-output.xml @@ -68,7 +68,7 @@ <varlistentry><term><varname> $outputDevdoc</varname></term><listitem><para> - is for <emphasis>developer</emphasis> documentation. Currently we count gtk-doc in there. It goes to <varname>devdoc</varname> or is removed (!) by default. This is because e.g. gtk-doc tends to be rather large and completely unused by nixpkgs users. + is for <emphasis>developer</emphasis> documentation. Currently we count gtk-doc and devhelp books in there. It goes to <varname>devdoc</varname> or is removed (!) by default. This is because e.g. gtk-doc tends to be rather large and completely unused by nixpkgs users. </para></listitem></varlistentry> <varlistentry><term><varname> diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 3b4f41171ad..5e2161aacb6 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -210,6 +210,7 @@ ./services/desktops/gnome3/seahorse.nix ./services/desktops/gnome3/sushi.nix ./services/desktops/gnome3/tracker.nix + ./services/desktops/gnome3/tracker-miners.nix ./services/desktops/profile-sync-daemon.nix ./services/desktops/telepathy.nix ./services/development/hoogle.nix diff --git a/nixos/modules/services/desktops/gnome3/tracker-miners.nix b/nixos/modules/services/desktops/gnome3/tracker-miners.nix new file mode 100644 index 00000000000..20154fc2fed --- /dev/null +++ b/nixos/modules/services/desktops/gnome3/tracker-miners.nix @@ -0,0 +1,41 @@ +# Tracker Miners daemons. + +{ config, pkgs, lib, ... }: + +with lib; + +{ + + ###### interface + + options = { + + services.gnome3.tracker-miners = { + + enable = mkOption { + type = types.bool; + default = false; + description = '' + Whether to enable Tracker miners, indexing services for Tracker + search engine and metadata storage system. + ''; + }; + + }; + + }; + + + ###### implementation + + config = mkIf config.services.gnome3.tracker-miners.enable { + + environment.systemPackages = [ pkgs.gnome3.tracker-miners ]; + + services.dbus.packages = [ pkgs.gnome3.tracker-miners ]; + + systemd.packages = [ pkgs.gnome3.tracker-miners ]; + + }; + +} diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix index e5a79496c7a..d2c856fc933 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome3.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix @@ -108,6 +108,7 @@ in { services.gnome3.seahorse.enable = mkDefault true; services.gnome3.sushi.enable = mkDefault true; services.gnome3.tracker.enable = mkDefault true; + services.gnome3.tracker-miners.enable = mkDefault true; hardware.pulseaudio.enable = mkDefault true; services.telepathy.enable = mkDefault true; networking.networkmanager.enable = mkDefault true; @@ -152,7 +153,7 @@ in { export XDG_DATA_DIRS=$XDG_DATA_DIRS''${XDG_DATA_DIRS:+:}${mimeAppsList}/share # Override gsettings-desktop-schema - export XDG_DATA_DIRS=${nixos-gsettings-desktop-schemas}/share/gsettings-schemas/nixos-gsettings-overrides''${XDG_DATA_DIRS:+:}$XDG_DATA_DIRS + export NIX_GSETTINGS_OVERRIDES_DIR=${nixos-gsettings-desktop-schemas}/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas # Let nautilus find extensions export NAUTILUS_EXTENSION_DIR=${config.system.path}/lib/nautilus/extensions-3.0/ diff --git a/pkgs/applications/editors/ed/default.nix b/pkgs/applications/editors/ed/default.nix index 9d5848f0263..ee5afe500ef 100644 --- a/pkgs/applications/editors/ed/default.nix +++ b/pkgs/applications/editors/ed/default.nix @@ -29,8 +29,8 @@ stdenv.mkDerivation rec { installFlags = [ "DESTDIR=$(out)" ]; configureFlags = [ - "--exec-prefix=${stdenv.cc.prefix}" - "CC=${stdenv.cc.prefix}cc" + "--exec-prefix=${stdenv.cc.targetPrefix}" + "CC=${stdenv.cc.targetPrefix}cc" ]; meta = { diff --git a/pkgs/applications/misc/deepin-terminal/default.nix b/pkgs/applications/misc/deepin-terminal/default.nix index 0ee52b740f2..7f38e801c4c 100644 --- a/pkgs/applications/misc/deepin-terminal/default.nix +++ b/pkgs/applications/misc/deepin-terminal/default.nix @@ -1,21 +1,22 @@ -{ stdenv, unzip, fetchFromGitHub, pkgconfig, gtk3, vala, cmake, vte, gee, wnck, gettext, libsecret, json_glib }: +{ stdenv, unzip, fetchFromGitHub, pkgconfig, gtk3, vala, cmake, vte, libgee, wnck, gettext, libsecret, json_glib }: stdenv.mkDerivation rec { name = "deepin-terminal-${version}"; - version = "2.3.3"; + version = "2.6.1"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = "deepin-terminal"; rev = version; - sha256 = "0qam34g1rannv8kvw1zbps763a9ii9vbrkxyxxdk737hlpxdzg8h"; + sha256 = "11lylkrv69k2jvwparnxymr7z3x9cs82q9p0lr2wrfr48hnfwp8b"; }; patchPhase = '' substituteInPlace project_path.c --replace __FILE__ \"$out/share/deepin-terminal/\" ''; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ unzip gtk3 vala cmake vte gee wnck gettext libsecret json_glib ]; + + nativeBuildInputs = [ pkgconfig vala cmake gettext unzip ]; + buildInputs = [ gtk3 vte libgee wnck libsecret json_glib ]; meta = { description = "The default terminal emulation for Deepin"; diff --git a/pkgs/applications/video/omxplayer/default.nix b/pkgs/applications/video/omxplayer/default.nix index 29345f7548d..825bfe7955a 100644 --- a/pkgs/applications/video/omxplayer/default.nix +++ b/pkgs/applications/video/omxplayer/default.nix @@ -49,7 +49,7 @@ let crossAttrs = { configurePlatforms = []; configureFlags = configureFlags ++ [ - "--cross-prefix=${stdenv.cc.prefix}" + "--cross-prefix=${stdenv.cc.targetPrefix}" "--enable-cross-compile" "--target_os=linux" "--arch=${hostPlatform.arch}" diff --git a/pkgs/build-support/binutils-wrapper/macos-sierra-reexport-hack.bash b/pkgs/build-support/binutils-wrapper/macos-sierra-reexport-hack.bash deleted file mode 100644 index c3077e869e7..00000000000 --- a/pkgs/build-support/binutils-wrapper/macos-sierra-reexport-hack.bash +++ /dev/null @@ -1,108 +0,0 @@ -#! @shell@ - -set -eu -o pipefail - -path_backup="$PATH" -if [ -n "@coreutils_bin@" ]; then - PATH="@coreutils_bin@/bin" -fi - -declare -r recurThreshold=300 - -declare overflowCount=0 -for ((n=0; n < $#; ++n)); do - case "${!n}" in - -l*) let overflowCount+=1 ;; - -reexport-l*) let overflowCount+=1 ;; - *) ;; - esac -done - -declare -a allArgs=() - -if (( "$overflowCount" <= "$recurThreshold" )); then - allArgs=("$@") -else - declare -a childrenLookup=() childrenLink=() - - while (( $# )); do - case "$1" in - -L/*) - childrenLookup+=("$1") - allArgs+=("$1") - ;; - -L) - echo "cctools LD does not support '-L foo' or '-l foo'" >&2 - exit 1 - ;; - -l) - echo "cctools LD does not support '-L foo' or '-l foo'" >&2 - exit 1 - ;; - -lazy_library | -lazy_framework | -lto_library) - # We aren't linking any "azy_library", "to_library", etc. - allArgs+=("$1") - ;; - -lazy-l | -weak-l) allArgs+=("$1") ;; - # We can't so easily prevent header issues from these. - -lSystem) allArgs+=("$1") ;; - # Special case as indirection seems like a bad idea for something - # so fundamental. Can be removed for simplicity. - -l?* | -reexport-l?*) childrenLink+=("$1") ;; - *) allArgs+=("$1") ;; - esac - - shift - done - - declare n=0 - while (( $n < "${#childrenLink[@]}" )); do - if [[ "${childrenLink[n]}" = -l* ]]; then - childrenLink[n]="-reexport${childrenLink[n]}" - fi - let ++n - done - unset n - - declare -r outputNameLibless=$(basename $( \ - if [[ -z "${outputName:+isUndefined}" ]]; then - echo unnamed - elif [[ "${outputName:0:3}" = lib ]]; then - echo "${outputName:3}" - else - echo "${outputName}" - fi)) - declare -ra children=("$outputNameLibless-reexport-delegate-0" \ - "$outputNameLibless-reexport-delegate-1") - - mkdir -p "$out/lib" - - PATH="$PATH:@out@/bin" - - symbolBloatObject=$outputNameLibless-symbol-hack.o - if [[ ! -e $symbolBloatObject ]]; then - # `-Q` means use GNU Assembler rather than Clang, avoiding an awkward - # dependency cycle. - printf '.private_extern _______child_hack_foo\nchild_hack_foo:\n' \ - | @binPrefix@as -Q -- -o $symbolBloatObject - fi - - # first half of libs - @binPrefix@ld -macosx_version_min $MACOSX_DEPLOYMENT_TARGET -arch x86_64 -dylib \ - -o "$out/lib/lib${children[0]}.dylib" \ - -install_name "$out/lib/lib${children[0]}.dylib" \ - "${childrenLookup[@]}" "$symbolBloatObject" \ - "${childrenLink[@]:0:$((${#childrenLink[@]} / 2 ))}" - - # second half of libs - @binPrefix@ld -macosx_version_min $MACOSX_DEPLOYMENT_TARGET -arch x86_64 -dylib \ - -o "$out/lib/lib${children[1]}.dylib" \ - -install_name "$out/lib/lib${children[1]}.dylib" \ - "${childrenLookup[@]}" "$symbolBloatObject" \ - "${childrenLink[@]:$((${#childrenLink[@]} / 2 ))}" - - allArgs+=("-L$out/lib" "-l${children[0]}" "-l${children[1]}") -fi - -PATH="$path_backup" -exec @prog@ "${allArgs[@]}" diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index 8d8b8a42fe9..b79697b33f0 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -32,8 +32,8 @@ let # # TODO(@Ericson2314) Make unconditional, or optional but always true by # default. - prefix = stdenv.lib.optionalString (targetPlatform != hostPlatform) - (targetPlatform.config + "-"); + targetPrefix = stdenv.lib.optionalString (targetPlatform != hostPlatform) + (targetPlatform.config + "-"); ccVersion = (builtins.parseDrvName cc.name).version; ccName = (builtins.parseDrvName cc.name).name; @@ -81,7 +81,7 @@ let in stdenv.mkDerivation { - name = prefix + name = targetPrefix + (if name != "" then name else "${ccName}-wrapper") + (stdenv.lib.optionalString (cc != null && ccVersion != "") "-${ccVersion}"); @@ -91,8 +91,7 @@ stdenv.mkDerivation { shell = getBin shell + shell.shellPath or ""; gnugrep_bin = if nativeTools then "" else gnugrep; - binPrefix = prefix; - inherit infixSalt; + inherit targetPrefix infixSalt; outputs = [ "out" "man" ]; @@ -102,8 +101,7 @@ stdenv.mkDerivation { # Binutils, and Apple's "cctools"; "binutils" as an attempt to find an # unused middle-ground name that evokes both. bintools = binutils_bin; - inherit libc nativeTools nativeLibc nativePrefix isGNU isClang default_cxx_stdlib_compile - prefix; + inherit libc nativeTools nativeLibc nativePrefix isGNU isClang default_cxx_stdlib_compile; emacsBufferSetup = pkgs: '' ; We should handle propagation here too @@ -154,7 +152,7 @@ stdenv.mkDerivation { + optionalString (targetPlatform.isSunOS && nativePrefix != "") '' # Solaris needs an additional ld wrapper. ldPath="${nativePrefix}/bin" - exec="$ldPath/${prefix}ld" + exec="$ldPath/${targetPrefix}ld" wrap ld-solaris ${./ld-solaris-wrapper.sh} '') @@ -162,83 +160,83 @@ stdenv.mkDerivation { # Create a symlink to as (the assembler). This is useful when a # cc-wrapper is installed in a user environment, as it ensures that # the right assembler is called. - if [ -e $ldPath/${prefix}as ]; then - ln -s $ldPath/${prefix}as $out/bin/${prefix}as + if [ -e $ldPath/${targetPrefix}as ]; then + ln -s $ldPath/${targetPrefix}as $out/bin/${targetPrefix}as fi '' + (if !useMacosReexportHack then '' - wrap ${prefix}ld ${./ld-wrapper.sh} ''${ld:-$ldPath/${prefix}ld} + wrap ${targetPrefix}ld ${./ld-wrapper.sh} ''${ld:-$ldPath/${targetPrefix}ld} '' else '' - ldInner="${prefix}ld-reexport-delegate" - wrap "$ldInner" ${./macos-sierra-reexport-hack.bash} ''${ld:-$ldPath/${prefix}ld} - wrap "${prefix}ld" ${./ld-wrapper.sh} "$out/bin/$ldInner" + ldInner="${targetPrefix}ld-reexport-delegate" + wrap "$ldInner" ${./macos-sierra-reexport-hack.bash} ''${ld:-$ldPath/${targetPrefix}ld} + wrap "${targetPrefix}ld" ${./ld-wrapper.sh} "$out/bin/$ldInner" unset ldInner '') + '' - if [ -e ${binutils_bin}/bin/${prefix}ld.gold ]; then - wrap ${prefix}ld.gold ${./ld-wrapper.sh} ${binutils_bin}/bin/${prefix}ld.gold + if [ -e ${binutils_bin}/bin/${targetPrefix}ld.gold ]; then + wrap ${targetPrefix}ld.gold ${./ld-wrapper.sh} ${binutils_bin}/bin/${targetPrefix}ld.gold fi if [ -e ${binutils_bin}/bin/ld.bfd ]; then - wrap ${prefix}ld.bfd ${./ld-wrapper.sh} ${binutils_bin}/bin/${prefix}ld.bfd + wrap ${targetPrefix}ld.bfd ${./ld-wrapper.sh} ${binutils_bin}/bin/${targetPrefix}ld.bfd fi # We export environment variables pointing to the wrapped nonstandard # cmds, lest some lousy configure script use those to guess compiler # version. - export named_cc=${prefix}cc - export named_cxx=${prefix}c++ + export named_cc=${targetPrefix}cc + export named_cxx=${targetPrefix}c++ export default_cxx_stdlib_compile="${default_cxx_stdlib_compile}" - if [ -e $ccPath/${prefix}gcc ]; then - wrap ${prefix}gcc ${./cc-wrapper.sh} $ccPath/${prefix}gcc - ln -s ${prefix}gcc $out/bin/${prefix}cc - export named_cc=${prefix}gcc - export named_cxx=${prefix}g++ + if [ -e $ccPath/${targetPrefix}gcc ]; then + wrap ${targetPrefix}gcc ${./cc-wrapper.sh} $ccPath/${targetPrefix}gcc + ln -s ${targetPrefix}gcc $out/bin/${targetPrefix}cc + export named_cc=${targetPrefix}gcc + export named_cxx=${targetPrefix}g++ elif [ -e $ccPath/clang ]; then - wrap ${prefix}clang ${./cc-wrapper.sh} $ccPath/clang - ln -s ${prefix}clang $out/bin/${prefix}cc - export named_cc=${prefix}clang - export named_cxx=${prefix}clang++ + wrap ${targetPrefix}clang ${./cc-wrapper.sh} $ccPath/clang + ln -s ${targetPrefix}clang $out/bin/${targetPrefix}cc + export named_cc=${targetPrefix}clang + export named_cxx=${targetPrefix}clang++ fi - if [ -e $ccPath/${prefix}g++ ]; then - wrap ${prefix}g++ ${./cc-wrapper.sh} $ccPath/${prefix}g++ - ln -s ${prefix}g++ $out/bin/${prefix}c++ + if [ -e $ccPath/${targetPrefix}g++ ]; then + wrap ${targetPrefix}g++ ${./cc-wrapper.sh} $ccPath/${targetPrefix}g++ + ln -s ${targetPrefix}g++ $out/bin/${targetPrefix}c++ elif [ -e $ccPath/clang++ ]; then - wrap ${prefix}clang++ ${./cc-wrapper.sh} $ccPath/clang++ - ln -s ${prefix}clang++ $out/bin/${prefix}c++ + wrap ${targetPrefix}clang++ ${./cc-wrapper.sh} $ccPath/clang++ + ln -s ${targetPrefix}clang++ $out/bin/${targetPrefix}c++ fi if [ -e $ccPath/cpp ]; then - wrap ${prefix}cpp ${./cc-wrapper.sh} $ccPath/cpp + wrap ${targetPrefix}cpp ${./cc-wrapper.sh} $ccPath/cpp fi '' + optionalString cc.langFortran or false '' - wrap ${prefix}gfortran ${./cc-wrapper.sh} $ccPath/${prefix}gfortran - ln -sv ${prefix}gfortran $out/bin/${prefix}g77 - ln -sv ${prefix}gfortran $out/bin/${prefix}f77 + wrap ${targetPrefix}gfortran ${./cc-wrapper.sh} $ccPath/${targetPrefix}gfortran + ln -sv ${targetPrefix}gfortran $out/bin/${targetPrefix}g77 + ln -sv ${targetPrefix}gfortran $out/bin/${targetPrefix}f77 '' + optionalString cc.langJava or false '' - wrap ${prefix}gcj ${./cc-wrapper.sh} $ccPath/${prefix}gcj + wrap ${targetPrefix}gcj ${./cc-wrapper.sh} $ccPath/${targetPrefix}gcj '' + optionalString cc.langGo or false '' - wrap ${prefix}gccgo ${./cc-wrapper.sh} $ccPath/${prefix}gccgo + wrap ${targetPrefix}gccgo ${./cc-wrapper.sh} $ccPath/${targetPrefix}gccgo '' + optionalString cc.langAda or false '' - wrap ${prefix}gnatgcc ${./cc-wrapper.sh} $ccPath/${prefix}gnatgcc - wrap ${prefix}gnatmake ${./gnat-wrapper.sh} $ccPath/${prefix}gnatmake - wrap ${prefix}gnatbind ${./gnat-wrapper.sh} $ccPath/${prefix}gnatbind - wrap ${prefix}gnatlink ${./gnatlink-wrapper.sh} $ccPath/${prefix}gnatlink + wrap ${targetPrefix}gnatgcc ${./cc-wrapper.sh} $ccPath/${targetPrefix}gnatgcc + wrap ${targetPrefix}gnatmake ${./gnat-wrapper.sh} $ccPath/${targetPrefix}gnatmake + wrap ${targetPrefix}gnatbind ${./gnat-wrapper.sh} $ccPath/${targetPrefix}gnatbind + wrap ${targetPrefix}gnatlink ${./gnatlink-wrapper.sh} $ccPath/${targetPrefix}gnatlink '' + optionalString cc.langVhdl or false '' - ln -s $ccPath/${prefix}ghdl $out/bin/${prefix}ghdl + ln -s $ccPath/${targetPrefix}ghdl $out/bin/${targetPrefix}ghdl ''; propagatedBuildInputs = extraPackages; @@ -362,10 +360,10 @@ stdenv.mkDerivation { # some linkers on some platforms don't support specific -z flags export hardening_unsupported_flags="" - if [[ "$($ldPath/${prefix}ld -z now 2>&1 || true)" =~ un(recognized|known)\ option ]]; then + if [[ "$($ldPath/${targetPrefix}ld -z now 2>&1 || true)" =~ un(recognized|known)\ option ]]; then hardening_unsupported_flags+=" bindnow" fi - if [[ "$($ldPath/${prefix}ld -z relro 2>&1 || true)" =~ un(recognized|known)\ option ]]; then + if [[ "$($ldPath/${targetPrefix}ld -z relro 2>&1 || true)" =~ un(recognized|known)\ option ]]; then hardening_unsupported_flags+=" relro" fi '' diff --git a/pkgs/build-support/cc-wrapper/macos-sierra-reexport-hack.bash b/pkgs/build-support/cc-wrapper/macos-sierra-reexport-hack.bash index b7aa7ea5c09..20503545333 100644 --- a/pkgs/build-support/cc-wrapper/macos-sierra-reexport-hack.bash +++ b/pkgs/build-support/cc-wrapper/macos-sierra-reexport-hack.bash @@ -82,18 +82,18 @@ else symbolBloatObject=$outputNameLibless-symbol-hack.o if [[ ! -e $symbolBloatObject ]]; then printf '.private_extern _______child_hack_foo\nchild_hack_foo:\n' \ - | @binPrefix@as -- -o $symbolBloatObject + | @targetPrefix@as -- -o $symbolBloatObject fi # first half of libs - @binPrefix@ld -macosx_version_min $MACOSX_DEPLOYMENT_TARGET -arch x86_64 -dylib \ + @targetPrefix@ld -macosx_version_min $MACOSX_DEPLOYMENT_TARGET -arch x86_64 -dylib \ -o "$out/lib/lib${children[0]}.dylib" \ -install_name "$out/lib/lib${children[0]}.dylib" \ "${childrenLookup[@]}" "$symbolBloatObject" \ "${childrenLink[@]:0:$((${#childrenLink[@]} / 2 ))}" # second half of libs - @binPrefix@ld -macosx_version_min $MACOSX_DEPLOYMENT_TARGET -arch x86_64 -dylib \ + @targetPrefix@ld -macosx_version_min $MACOSX_DEPLOYMENT_TARGET -arch x86_64 -dylib \ -o "$out/lib/lib${children[1]}.dylib" \ -install_name "$out/lib/lib${children[1]}.dylib" \ "${childrenLookup[@]}" "$symbolBloatObject" \ diff --git a/pkgs/build-support/cc-wrapper/setup-hook.sh b/pkgs/build-support/cc-wrapper/setup-hook.sh index e43c1609edb..a8f29bd5877 100644 --- a/pkgs/build-support/cc-wrapper/setup-hook.sh +++ b/pkgs/build-support/cc-wrapper/setup-hook.sh @@ -142,9 +142,9 @@ for CMD in \ ar as nm objcopy ranlib strip strings size ld windres do if - PATH=$_PATH type -p "@binPrefix@$CMD" > /dev/null + PATH=$_PATH type -p "@targetPrefix@$CMD" > /dev/null then - export "${role}$(echo "$CMD" | tr "[:lower:]" "[:upper:]")=@binPrefix@${CMD}"; + export "${role}$(echo "$CMD" | tr "[:lower:]" "[:upper:]")=@targetPrefix@${CMD}"; fi done diff --git a/pkgs/build-support/setup-hooks/multiple-outputs.sh b/pkgs/build-support/setup-hooks/multiple-outputs.sh index ac2368a5b21..d43b1877674 100644 --- a/pkgs/build-support/setup-hooks/multiple-outputs.sh +++ b/pkgs/build-support/setup-hooks/multiple-outputs.sh @@ -140,6 +140,7 @@ _multioutDocs() { moveToOutput share/info "${!outputInfo}" moveToOutput share/doc "${!outputDoc}" moveToOutput share/gtk-doc "${!outputDevdoc}" + moveToOutput share/devhelp/books "${!outputDevdoc}" # the default outputMan is in $bin moveToOutput share/man "${!outputMan}" diff --git a/pkgs/desktops/gnome-2/bindings/libglademm/default.nix b/pkgs/desktops/gnome-2/bindings/libglademm/default.nix index 8cf18b7018d..d4813eb2a93 100644 --- a/pkgs/desktops/gnome-2/bindings/libglademm/default.nix +++ b/pkgs/desktops/gnome-2/bindings/libglademm/default.nix @@ -7,7 +7,9 @@ stdenv.mkDerivation rec { url = "mirror://gnome/sources/libglademm/2.6/${name}.tar.bz2"; sha256 = "1hrbg9l5qb7w0xvr7013qamkckyj0fqc426c851l69zpmhakqm1q"; }; - + + outputs = [ "out" "devdoc" ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ intltool ]; diff --git a/pkgs/desktops/gnome-3/apps/bijiben/default.nix b/pkgs/desktops/gnome-3/apps/bijiben/default.nix index 9aae9215650..ddff55c96a0 100644 --- a/pkgs/desktops/gnome-3/apps/bijiben/default.nix +++ b/pkgs/desktops/gnome-3/apps/bijiben/default.nix @@ -1,6 +1,6 @@ -{ stdenv, intltool, fetchurl, pkgconfig, glib +{ stdenv, meson, ninja, gettext, fetchurl, pkgconfig, glib , evolution_data_server, evolution, sqlite -, makeWrapper, itstool, desktop_file_utils +, wrapGAppsHook, itstool, desktop_file_utils , clutter_gtk, libuuid, webkitgtk, zeitgeist , gnome3, librsvg, gdk_pixbuf, libxml2 }: @@ -8,28 +8,34 @@ stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; doCheck = true; + checkPhase = "meson test"; + + patches = [ + ./no-update-icon-cache.patch + ]; + + postPatch = '' + chmod +x meson_post_install.py + patchShebangs meson_post_install.py + ''; propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ glib intltool itstool libxml2 - clutter_gtk libuuid webkitgtk gnome3.tracker - gnome3.gnome_online_accounts zeitgeist desktop_file_utils - gnome3.gsettings_desktop_schemas makeWrapper + nativeBuildInputs = [ + meson ninja pkgconfig gettext itstool libxml2 desktop_file_utils wrapGAppsHook + ]; + buildInputs = [ glib clutter_gtk libuuid webkitgtk gnome3.tracker + gnome3.gnome_online_accounts zeitgeist + gnome3.gsettings_desktop_schemas gdk_pixbuf gnome3.defaultIconTheme librsvg evolution_data_server evolution sqlite ]; enableParallelBuilding = true; - preFixup = '' - wrapProgram "$out/bin/bijiben" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - ''; - meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Bijiben; description = "Note editor designed to remain simple to use"; + broken = true; maintainers = gnome3.maintainers; license = licenses.gpl3; platforms = platforms.linux; diff --git a/pkgs/desktops/gnome-3/apps/bijiben/no-update-icon-cache.patch b/pkgs/desktops/gnome-3/apps/bijiben/no-update-icon-cache.patch new file mode 100644 index 00000000000..c8b0043fb45 --- /dev/null +++ b/pkgs/desktops/gnome-3/apps/bijiben/no-update-icon-cache.patch @@ -0,0 +1,22 @@ +--- a/meson_post_install.py ++++ b/meson_post_install.py +@@ -7,10 +7,6 @@ + if not os.environ.get('DESTDIR'): + datadir = sys.argv[1] + +- icondir = os.path.join(datadir, 'icons', 'hicolor') +- print('Update icon cache...') +- subprocess.call(['gtk-update-icon-cache', '-f', '-t', icondir]) +- + schemadir = os.path.join(datadir, 'glib-2.0', 'schemas') + print('Compile gsettings schemas...') + subprocess.call(['glib-compile-schemas', schemadir]) +@@ -18,8 +14,3 @@ + desktop_file = os.path.join(datadir, 'applications', 'org.gnome.bijiben.desktop') + print('Validate desktop file...') + subprocess.call(['desktop-file-validate', desktop_file]) +- +- if sys.argv[2] == 'update-mimedb': +- mimedir = os.path.join(datadir, 'mime') +- print('Update mime database...') +- subprocess.call(['update-mime-database', mimedir]) diff --git a/pkgs/desktops/gnome-3/apps/bijiben/src.nix b/pkgs/desktops/gnome-3/apps/bijiben/src.nix index ea2c063647f..ee573eaef8e 100644 --- a/pkgs/desktops/gnome-3/apps/bijiben/src.nix +++ b/pkgs/desktops/gnome-3/apps/bijiben/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "bijiben-3.24.1"; + name = "bijiben-3.27.1"; src = fetchurl { - url = mirror://gnome/sources/bijiben/3.24/bijiben-3.24.1.tar.xz; - sha256 = "2602fc3f8ce5c39813b4273ceed7bdb014b1cf1fa82a6757fc25e5078be4f741"; + url = mirror://gnome/sources/bijiben/3.27/bijiben-3.27.1.tar.xz; + sha256 = "7b4623467f3cb745c4b268d6fb2d9da32cbc96ffb5b1bbf2a153b692e295ac64"; }; } diff --git a/pkgs/desktops/gnome-3/apps/cheese/default.nix b/pkgs/desktops/gnome-3/apps/cheese/default.nix index a10864c347e..7a4cd0e9495 100644 --- a/pkgs/desktops/gnome-3/apps/cheese/default.nix +++ b/pkgs/desktops/gnome-3/apps/cheese/default.nix @@ -15,8 +15,6 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; - meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Cheese; description = "Take photos and videos with your webcam, with fun graphical effects"; diff --git a/pkgs/desktops/gnome-3/apps/cheese/src.nix b/pkgs/desktops/gnome-3/apps/cheese/src.nix index e10f79e8312..0237606ae35 100644 --- a/pkgs/desktops/gnome-3/apps/cheese/src.nix +++ b/pkgs/desktops/gnome-3/apps/cheese/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "cheese-3.24.0"; + name = "cheese-3.26.0"; src = fetchurl { - url = mirror://gnome/sources/cheese/3.24/cheese-3.24.0.tar.xz; - sha256 = "26d0324c11d858a53a8a78f60babda63310a2b6f46c8fa3a4f6aa36ca9d0f372"; + url = mirror://gnome/sources/cheese/3.26/cheese-3.26.0.tar.xz; + sha256 = "8ef52fc41de1817c4e4274e23eb7c29d28b64ae0f0d1fec52e184e99aea6c605"; }; } diff --git a/pkgs/desktops/gnome-3/apps/evolution/default.nix b/pkgs/desktops/gnome-3/apps/evolution/default.nix index 3d152221a39..4996120d493 100644 --- a/pkgs/desktops/gnome-3/apps/evolution/default.nix +++ b/pkgs/desktops/gnome-3/apps/evolution/default.nix @@ -1,9 +1,8 @@ -{ stdenv, intltool, fetchurl, libxml2, webkitgtk, highlight +{ stdenv, cmake, intltool, fetchurl, libxml2, webkitgtk, highlight , pkgconfig, gtk3, glib, libnotify, gtkspell3 , wrapGAppsHook, itstool, shared_mime_info, libical, db, gcr, sqlite -, gnome3, librsvg, gdk_pixbuf, libsecret, nss, nspr, icu, libtool -, libcanberra_gtk3, bogofilter, gst_all_1, procps, p11_kit, openldap -, cmake}: +, gnome3, librsvg, gdk_pixbuf, libsecret, nss, nspr, icu +, libcanberra_gtk3, bogofilter, gst_all_1, procps, p11_kit, openldap }: let majVer = gnome3.version; @@ -15,10 +14,7 @@ in stdenv.mkDerivation rec { propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard gnome3.evolution_data_server ]; - propagatedBuildInputs = [ gnome3.gtkhtml ]; - - buildInputs = [ gtk3 glib intltool itstool libxml2 libtool - gdk_pixbuf gnome3.defaultIconTheme librsvg db icu + buildInputs = [ gtk3 glib gdk_pixbuf gnome3.defaultIconTheme librsvg db icu gnome3.evolution_data_server libsecret libical gcr webkitgtk shared_mime_info gnome3.gnome_desktop gtkspell3 libcanberra_gtk3 bogofilter gnome3.libgdata sqlite @@ -26,10 +22,9 @@ in stdenv.mkDerivation rec { nss nspr libnotify procps highlight gnome3.libgweather gnome3.gsettings_desktop_schemas gnome3.libgnome_keyring gnome3.glib_networking openldap - cmake ]; - nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; + nativeBuildInputs = [ cmake intltool itstool libxml2 pkgconfig wrapGAppsHook ]; configureFlags = [ "--disable-pst-import" "--disable-autoar" diff --git a/pkgs/desktops/gnome-3/apps/evolution/src.nix b/pkgs/desktops/gnome-3/apps/evolution/src.nix index 2aab7967d8a..5e44e384ae7 100644 --- a/pkgs/desktops/gnome-3/apps/evolution/src.nix +++ b/pkgs/desktops/gnome-3/apps/evolution/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "evolution-3.24.5"; + name = "evolution-3.26.2"; src = fetchurl { - url = mirror://gnome/sources/evolution/3.24/evolution-3.24.5.tar.xz; - sha256 = "5544c5ea1a1c352e0300bff447ddf67146486fc3a6bbecd1b785d378d34b2189"; + url = mirror://gnome/sources/evolution/3.26/evolution-3.26.2.tar.xz; + sha256 = "2d9299b8414903021faa03cbb885814de454f5260398eb2c2a03600224479137"; }; } diff --git a/pkgs/desktops/gnome-3/apps/file-roller/src.nix b/pkgs/desktops/gnome-3/apps/file-roller/src.nix index 10a82877bcd..090c88e1d3e 100644 --- a/pkgs/desktops/gnome-3/apps/file-roller/src.nix +++ b/pkgs/desktops/gnome-3/apps/file-roller/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "file-roller-3.24.1"; + name = "file-roller-3.26.2"; src = fetchurl { - url = mirror://gnome/sources/file-roller/3.24/file-roller-3.24.1.tar.xz; - sha256 = "011545e8bd81a415fb068718347bf63ced4ab176210ce36a668904a3124c7f3a"; + url = mirror://gnome/sources/file-roller/3.26/file-roller-3.26.2.tar.xz; + sha256 = "3e677b8e1c2f19aead69cf4fc419a19fc3373aaf5d7bf558b4f077f10bbba8a5"; }; } diff --git a/pkgs/desktops/gnome-3/apps/glade/default.nix b/pkgs/desktops/gnome-3/apps/glade/default.nix index ce29ebf0a7e..e48d15e6abf 100644 --- a/pkgs/desktops/gnome-3/apps/glade/default.nix +++ b/pkgs/desktops/gnome-3/apps/glade/default.nix @@ -1,7 +1,7 @@ { stdenv, intltool, fetchurl, python, autoreconfHook -, pkgconfig, gtk3, glib -, makeWrapper, itstool, libxml2, docbook_xsl -, gnome3, librsvg, gdk_pixbuf, libxslt }: +, pkgconfig, gtk3, glib, gobjectIntrospection +, wrapGAppsHook, itstool, libxml2, docbook_xsl +, gnome3, gdk_pixbuf, libxslt }: stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; nativeBuildInputs = [ - pkgconfig intltool itstool makeWrapper docbook_xsl libxslt + pkgconfig intltool itstool wrapGAppsHook docbook_xsl libxslt gobjectIntrospection # reconfiguration autoreconfHook gnome3.gnome_common gnome3.yelp_tools ]; buildInputs = [ gtk3 glib libxml2 python gnome3.gsettings_desktop_schemas - gdk_pixbuf gnome3.defaultIconTheme librsvg ]; + gdk_pixbuf gnome3.defaultIconTheme ]; enableParallelBuilding = true; diff --git a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix index cb8bf49254b..6126fed8e06 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, makeWrapper, pkgconfig, intltool, itstool, libvirt-glib +{ stdenv, fetchurl, makeWrapper, pkgconfig, gettext, itstool, libvirt-glib , glib, gobjectIntrospection, libxml2, gtk3, gtkvnc, libvirt, spice_gtk -, spice_protocol, libuuid, libsoup, libosinfo, systemd, tracker, vala_0_32 +, spice_protocol, libsoup, libosinfo, systemd, tracker, tracker-miners, vala , libcap, yajl, gmp, gdbm, cyrus_sasl, gnome3, librsvg, desktop_file_utils , mtools, cdrkit, libcdio, libusb, libarchive, acl, libgudev, qemu, libsecret , libcap_ng, numactl, xen, libapparmor @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { doCheck = true; nativeBuildInputs = [ - makeWrapper pkgconfig intltool + makeWrapper pkgconfig gettext ]; buildInputs = [ itstool libvirt-glib glib gobjectIntrospection libxml2 gtk3 gtkvnc - libvirt spice_gtk spice_protocol libuuid libsoup libosinfo systemd - tracker vala_0_32 libcap yajl gmp gdbm cyrus_sasl libusb libarchive + libvirt spice_gtk spice_protocol libsoup libosinfo systemd + tracker tracker-miners vala libcap yajl gmp gdbm cyrus_sasl libusb libarchive gnome3.defaultIconTheme librsvg desktop_file_utils acl libgudev libsecret libcap_ng numactl xen libapparmor ]; diff --git a/pkgs/desktops/gnome-3/apps/gnome-boxes/src.nix b/pkgs/desktops/gnome-3/apps/gnome-boxes/src.nix index dbed4617850..b2c2f378bff 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-boxes/src.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-boxes/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "gnome-boxes-3.24.0"; + name = "gnome-boxes-3.26.2"; src = fetchurl { - url = mirror://gnome/sources/gnome-boxes/3.24/gnome-boxes-3.24.0.tar.xz; - sha256 = "7495ea7184b6ef650033daf6941328b785b22e522e8142b9d190575d215dec49"; + url = mirror://gnome/sources/gnome-boxes/3.26/gnome-boxes-3.26.2.tar.xz; + sha256 = "d00fc083182963dc1bbdee5e743ceb28ba03fbf5a9ea87c78d29dca5fb5b9210"; }; } diff --git a/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix b/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix index 618d6152d81..c13d7e976e5 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook -, intltool, evolution_data_server, sqlite, libxml2, libsoup +{ stdenv, fetchurl, meson, ninja, pkgconfig, wrapGAppsHook +, gettext, libxml2, gnome3, gtk, evolution_data_server, libsoup , glib, gnome_online_accounts, gsettings_desktop_schemas }: stdenv.mkDerivation rec { @@ -7,13 +7,17 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ meson ninja pkgconfig gettext libxml2 wrapGAppsHook ]; buildInputs = [ - gtk3 wrapGAppsHook intltool evolution_data_server - sqlite libxml2 libsoup glib gnome3.defaultIconTheme gnome_online_accounts - gsettings_desktop_schemas + gtk evolution_data_server libsoup glib gnome_online_accounts + gsettings_desktop_schemas gnome3.defaultIconTheme ]; + postPatch = '' + chmod +x meson_post_install.py # patchShebangs requires executable file + patchShebangs meson_post_install.py + ''; + meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Calendar; description = "Simple and beautiful calendar application for GNOME"; diff --git a/pkgs/desktops/gnome-3/apps/gnome-calendar/src.nix b/pkgs/desktops/gnome-3/apps/gnome-calendar/src.nix index 5d0eeadcc0a..39f7f333495 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-calendar/src.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-calendar/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "gnome-calendar-3.24.3"; + name = "gnome-calendar-3.26.2"; src = fetchurl { - url = mirror://gnome/sources/gnome-calendar/3.24/gnome-calendar-3.24.3.tar.xz; - sha256 = "3ecb4074f44cb6c883f81f93ebde2fa3890107f8e06740495be9f942190ff3ec"; + url = mirror://gnome/sources/gnome-calendar/3.26/gnome-calendar-3.26.2.tar.xz; + sha256 = "19a2c737b9662be926fb68e7dc731d94c523d23fa7a49e435e6a0346770dc50e"; }; } diff --git a/pkgs/desktops/gnome-3/apps/gnome-characters/src.nix b/pkgs/desktops/gnome-3/apps/gnome-characters/src.nix index db14a10d65a..d7ac2cd8829 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-characters/src.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-characters/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "gnome-characters-3.24.0"; + name = "gnome-characters-3.26.2"; src = fetchurl { - url = mirror://gnome/sources/gnome-characters/3.24/gnome-characters-3.24.0.tar.xz; - sha256 = "9ef4ff28437a63a221c47189231909fb9e4cac838c5f3cf402906fb128b52596"; + url = mirror://gnome/sources/gnome-characters/3.26/gnome-characters-3.26.2.tar.xz; + sha256 = "69d0218b4ce16451bef0e6ee9f9f18f5b7851aa3a758b13315d592b077374f7b"; }; } diff --git a/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix b/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix index 68cd2a42fa6..1d0a9b271c2 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix @@ -1,23 +1,26 @@ -{ stdenv, intltool, fetchurl, libgweather, libnotify -, pkgconfig, gtk3, glib, gsound -, makeWrapper, itstool, libcanberra_gtk3, libtool -, gnome3, librsvg, gdk_pixbuf, geoclue2, wrapGAppsHook }: +{ stdenv, fetchurl +, meson, ninja, gettext, pkgconfig, wrapGAppsHook, itstool, desktop_file_utils +, vala, gtk3, glib, gsound, libcanberra_gtk3 +, gnome3, gdk_pixbuf, geoclue2, libgweather }: stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; doCheck = true; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gtk3 glib intltool itstool libcanberra_gtk3 - gnome3.gsettings_desktop_schemas makeWrapper - gdk_pixbuf gnome3.defaultIconTheme librsvg + nativeBuildInputs = [ vala meson ninja pkgconfig gettext itstool wrapGAppsHook desktop_file_utils ]; + buildInputs = [ gtk3 glib libcanberra_gtk3 + gnome3.gsettings_desktop_schemas + gdk_pixbuf gnome3.defaultIconTheme gnome3.gnome_desktop gnome3.geocode_glib geoclue2 - libgweather libnotify libtool gsound - wrapGAppsHook ]; + libgweather gsound ]; enableParallelBuilding = true; + prePatch = "patchShebangs build-aux/"; + + checkPhase = "meson test"; + meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Clocks; description = "Clock application designed for GNOME 3"; diff --git a/pkgs/desktops/gnome-3/apps/gnome-clocks/src.nix b/pkgs/desktops/gnome-3/apps/gnome-clocks/src.nix index 2497fe83c1e..ea7878f4869 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-clocks/src.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-clocks/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "gnome-clocks-3.24.0"; + name = "gnome-clocks-3.26.1"; src = fetchurl { - url = mirror://gnome/sources/gnome-clocks/3.24/gnome-clocks-3.24.0.tar.xz; - sha256 = "9d5ae0e972ad92d0a0873af9e0f9b00b8378b3cd50b7830e6fb9a227c6107f36"; + url = mirror://gnome/sources/gnome-clocks/3.26/gnome-clocks-3.26.1.tar.xz; + sha256 = "2bd8d8df1d6aa0feddd4afc15d84b1308202fda59a3c3be42e3bce7e9ccd11f7"; }; } diff --git a/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix b/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix index d34334c4f64..a3f6084c9f3 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix @@ -1,6 +1,6 @@ -{ stdenv, intltool, fetchurl, evince, gjs -, pkgconfig, gtk3, glib -, makeWrapper, itstool, libxslt, webkitgtk +{ stdenv, gettext, fetchurl, evince, gjs +, pkgconfig, gtk3, glib, tracker, tracker-miners +, itstool, libxslt, webkitgtk , gnome3, librsvg, gdk_pixbuf, libsoup, docbook_xsl , gobjectIntrospection, json_glib, inkscape, poppler_utils , gmp, desktop_file_utils, wrapGAppsHook }: @@ -12,16 +12,13 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-getting-started" ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gtk3 glib intltool itstool libxslt - docbook_xsl desktop_file_utils inkscape poppler_utils - gnome3.gsettings_desktop_schemas makeWrapper gmp + nativeBuildInputs = [ pkgconfig gettext itstool libxslt desktop_file_utils docbook_xsl wrapGAppsHook ]; + buildInputs = [ gtk3 glib inkscape poppler_utils + gnome3.gsettings_desktop_schemas gmp gdk_pixbuf gnome3.defaultIconTheme librsvg evince libsoup webkitgtk gjs gobjectIntrospection gnome3.rest - gnome3.tracker gnome3.libgdata gnome3.gnome_online_accounts - gnome3.gnome_desktop gnome3.libzapojit json_glib - wrapGAppsHook ] - ++ (with gnome3; [ libgepub ]); + tracker tracker-miners gnome3.libgdata gnome3.gnome_online_accounts + gnome3.gnome_desktop gnome3.libzapojit json_glib gnome3.libgepub ]; enableParallelBuilding = true; diff --git a/pkgs/desktops/gnome-3/apps/gnome-documents/src.nix b/pkgs/desktops/gnome-3/apps/gnome-documents/src.nix index c1ca08a064b..de0332ea403 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-documents/src.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-documents/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "gnome-documents-3.24.3"; + name = "gnome-documents-3.26.1"; src = fetchurl { - url = mirror://gnome/sources/gnome-documents/3.24/gnome-documents-3.24.3.tar.xz; - sha256 = "c2f920fe1696499ba2594c9ab3328e7f18fa8f60df0273aaad503bbe27eeb9a0"; + url = mirror://gnome/sources/gnome-documents/3.26/gnome-documents-3.26.1.tar.xz; + sha256 = "ba0d3084359d666b90733bb43206d24190fa85304bfe45f674ab6e6a27cb7fc9"; }; } diff --git a/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/src.nix b/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/src.nix index 027cbb59d88..3f1341b7cab 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/src.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "gnome-getting-started-docs-3.24.1"; + name = "gnome-getting-started-docs-3.26.2"; src = fetchurl { - url = mirror://gnome/sources/gnome-getting-started-docs/3.24/gnome-getting-started-docs-3.24.1.tar.xz; - sha256 = "9e62895362597cf563696852294a4838cea7243f0116767c254c870b7ba94a97"; + url = mirror://gnome/sources/gnome-getting-started-docs/3.26/gnome-getting-started-docs-3.26.2.tar.xz; + sha256 = "34f45f6b5759a46547e834f1b706ae7485fd94e1af5354154420d8910ec67775"; }; } diff --git a/pkgs/desktops/gnome-3/apps/gnome-logs/src.nix b/pkgs/desktops/gnome-3/apps/gnome-logs/src.nix index 53e303f3856..95162098668 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-logs/src.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-logs/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "gnome-logs-3.24.2"; + name = "gnome-logs-3.26.2"; src = fetchurl { - url = mirror://gnome/sources/gnome-logs/3.24/gnome-logs-3.24.2.tar.xz; - sha256 = "9aaf0d6ba6af195dc9805b5f6d290b454a0b710daf0c595fe6286f59a43083c4"; + url = mirror://gnome/sources/gnome-logs/3.26/gnome-logs-3.26.2.tar.xz; + sha256 = "e17ca011e7bea756bd841e027e56cfe8c214bed4817cb35732ace4aa73ff8f5c"; }; } diff --git a/pkgs/desktops/gnome-3/apps/gnome-maps/src.nix b/pkgs/desktops/gnome-3/apps/gnome-maps/src.nix index e45d7be3fb7..0fac7f865ca 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-maps/src.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-maps/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "gnome-maps-3.24.3"; + name = "gnome-maps-3.26.2"; src = fetchurl { - url = mirror://gnome/sources/gnome-maps/3.24/gnome-maps-3.24.3.tar.xz; - sha256 = "5ef3ec36aa76eb9a49a15ee61539bea7b59e8aa0a802483df6cedcc65566d0d6"; + url = mirror://gnome/sources/gnome-maps/3.26/gnome-maps-3.26.2.tar.xz; + sha256 = "031d5c4a1aa79f1fbaf87f01fb790f7aab1d8dcd5d061cb5daf0fa96eaa18050"; }; } diff --git a/pkgs/desktops/gnome-3/apps/gnome-music/default.nix b/pkgs/desktops/gnome-3/apps/gnome-music/default.nix index 54e79872c67..f5454c1c386 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-music/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-music/default.nix @@ -1,4 +1,4 @@ -{ stdenv, intltool, fetchurl, gdk_pixbuf, tracker +{ stdenv, intltool, fetchurl, gdk_pixbuf, tracker, tracker-miners , libxml2, python3Packages, libnotify, wrapGAppsHook , pkgconfig, gtk3, glib, cairo , makeWrapper, itstool, gnome3, librsvg, gst_all_1 }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { python3Packages.pycairo python3Packages.dbus-python python3Packages.requests python3Packages.pygobject3 gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad wrapGAppsHook - gnome3.gsettings_desktop_schemas makeWrapper tracker ]; + gnome3.gsettings_desktop_schemas makeWrapper tracker tracker-miners ]; wrapPrefixVariables = [ "PYTHONPATH" ]; diff --git a/pkgs/desktops/gnome-3/apps/gnome-music/src.nix b/pkgs/desktops/gnome-3/apps/gnome-music/src.nix index 615c54583f2..3ac99e146d4 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-music/src.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-music/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "gnome-music-3.24.2"; + name = "gnome-music-3.26.1"; src = fetchurl { - url = mirror://gnome/sources/gnome-music/3.24/gnome-music-3.24.2.tar.xz; - sha256 = "1a72b7972cac66c7aba7a4fbcbf8df99b3df7c46f26957b3e16089550d3ef62c"; + url = mirror://gnome/sources/gnome-music/3.26/gnome-music-3.26.1.tar.xz; + sha256 = "7197dff12f441a52b4011512bfe8ec926f2ce4ca511f79b078e0e612d612f8c3"; }; } diff --git a/pkgs/desktops/gnome-3/apps/gnome-photos/default.nix b/pkgs/desktops/gnome-3/apps/gnome-photos/default.nix index 3c793d70368..0b19ba9f0f6 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-photos/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-photos/default.nix @@ -1,5 +1,5 @@ { stdenv, intltool, fetchurl, exempi, libxml2 -, pkgconfig, gtk3, glib +, pkgconfig, gtk3, glib, tracker, tracker-miners , makeWrapper, itstool, gegl, babl, lcms2 , desktop_file_utils, gmp, libmediaart, wrapGAppsHook , gnome3, librsvg, gdk_pixbuf, libexif, gexiv2, geocode_glib @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { gdk_pixbuf gnome3.defaultIconTheme librsvg exempi gnome3.gfbgraph gnome3.grilo-plugins gnome3.grilo gnome3.gnome_online_accounts gnome3.gnome_desktop - lcms2 libexif gnome3.tracker libxml2 desktop_file_utils + lcms2 libexif tracker tracker-miners libxml2 desktop_file_utils wrapGAppsHook gexiv2 geocode_glib dleyna-renderer ]; enableParallelBuilding = true; diff --git a/pkgs/desktops/gnome-3/apps/gnome-photos/src.nix b/pkgs/desktops/gnome-3/apps/gnome-photos/src.nix index 204897f6d36..f30b88642fd 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-photos/src.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-photos/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "gnome-photos-3.24.3"; + name = "gnome-photos-3.26.2"; src = fetchurl { - url = mirror://gnome/sources/gnome-photos/3.24/gnome-photos-3.24.3.tar.xz; - sha256 = "cd365629ce584d223c023676a88b6194012bbc561c4a4b1c8eca462425e76288"; + url = mirror://gnome/sources/gnome-photos/3.26/gnome-photos-3.26.2.tar.xz; + sha256 = "9001ed2794da44522a1d700c7b5aff40ede92f80ba17031f0dfa7f54d6d05657"; }; } diff --git a/pkgs/desktops/gnome-3/apps/gnome-weather/src.nix b/pkgs/desktops/gnome-3/apps/gnome-weather/src.nix index eef77b23504..d12db513253 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-weather/src.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-weather/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "gnome-weather-3.24.0"; + name = "gnome-weather-3.26.0"; src = fetchurl { - url = mirror://gnome/sources/gnome-weather/3.24/gnome-weather-3.24.0.tar.xz; - sha256 = "e36847884670e59a71ac70ed982fc8f2fb70f1766c3a24f10a0cd38c9b66d574"; + url = mirror://gnome/sources/gnome-weather/3.26/gnome-weather-3.26.0.tar.xz; + sha256 = "965cc0d1b4d4e53c06d494db96f0b124d232af5c0e731ca900edd10f77a74c78"; }; } diff --git a/pkgs/desktops/gnome-3/apps/polari/default.nix b/pkgs/desktops/gnome-3/apps/polari/default.nix index 7c3da70edeb..dc75193e771 100644 --- a/pkgs/desktops/gnome-3/apps/polari/default.nix +++ b/pkgs/desktops/gnome-3/apps/polari/default.nix @@ -1,6 +1,6 @@ -{ stdenv, intltool, fetchurl, gdk_pixbuf, adwaita-icon-theme -, telepathy_glib, gjs, itstool, telepathy_idle, libxml2 -, pkgconfig, gtk3, glib, librsvg, libsecret, libsoup +{ stdenv, itstool, fetchurl, fetchpatch, gdk_pixbuf, adwaita-icon-theme +, telepathy_glib, gjs, meson, ninja, gettext, telepathy_idle, libxml2, desktop_file_utils +, pkgconfig, gtk3, glib, libsecret, libsoup, gobjectIntrospection, appstream-glib , gnome3, wrapGAppsHook, telepathy_logger, gspell }: stdenv.mkDerivation rec { @@ -8,9 +8,17 @@ stdenv.mkDerivation rec { propagatedUserEnvPkgs = [ telepathy_idle telepathy_logger ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gtk3 glib intltool itstool adwaita-icon-theme wrapGAppsHook gnome3.gsettings_desktop_schemas - telepathy_glib telepathy_logger gjs gspell gdk_pixbuf librsvg libxml2 libsecret libsoup ]; + nativeBuildInputs = [ meson ninja pkgconfig itstool gettext wrapGAppsHook libxml2 + desktop_file_utils gobjectIntrospection appstream-glib ]; + buildInputs = [ gtk3 glib adwaita-icon-theme gnome3.gsettings_desktop_schemas + telepathy_glib telepathy_logger gjs gspell gdk_pixbuf libsecret libsoup ]; + + patches = [ + (fetchpatch { + url = https://gitlab.gnome.org/jtojnar/polari/commit/a6733a6ad95eac1813e7b18e3d0018a22ee7a377.diff; + sha256 = "0f5ll49h5w0477lkh67kaa2j83z376z1jk7z3i2v7cq4d3hi5lf9"; + }) + ]; enableParallelBuilding = true; diff --git a/pkgs/desktops/gnome-3/apps/polari/src.nix b/pkgs/desktops/gnome-3/apps/polari/src.nix index da7a37031f5..8af7c33846d 100644 --- a/pkgs/desktops/gnome-3/apps/polari/src.nix +++ b/pkgs/desktops/gnome-3/apps/polari/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "polari-3.24.2"; + name = "polari-3.26.2"; src = fetchurl { - url = mirror://gnome/sources/polari/3.24/polari-3.24.2.tar.xz; - sha256 = "3e1884000fda5cf6293e21ca1c028ec0b13d5baab5a79b8c11e4728c3238bb42"; + url = mirror://gnome/sources/polari/3.26/polari-3.26.2.tar.xz; + sha256 = "2f36361dacf5d924d134f231fdb36ec4539f7495fce325d9b2f2728bd17cc190"; }; } diff --git a/pkgs/desktops/gnome-3/apps/seahorse/default.nix b/pkgs/desktops/gnome-3/apps/seahorse/default.nix index 03dbdb1842a..3bc69f67a4f 100644 --- a/pkgs/desktops/gnome-3/apps/seahorse/default.nix +++ b/pkgs/desktops/gnome-3/apps/seahorse/default.nix @@ -1,4 +1,4 @@ -{ stdenv, intltool, fetchurl, vala_0_32 +{ stdenv, intltool, fetchurl, vala , pkgconfig, gtk3, glib , wrapGAppsHook, itstool, gnupg, libsoup , gnome3, librsvg, gdk_pixbuf, gpgme @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 glib intltool itstool gnome3.gcr gnome3.gsettings_desktop_schemas wrapGAppsHook gnupg gdk_pixbuf gnome3.defaultIconTheme librsvg gpgme - libsecret avahi libsoup p11_kit vala_0_32 + libsecret avahi libsoup p11_kit vala openssh ]; preFixup = '' diff --git a/pkgs/desktops/gnome-3/core/adwaita-icon-theme/src.nix b/pkgs/desktops/gnome-3/core/adwaita-icon-theme/src.nix index 5700cb56913..1a388505674 100644 --- a/pkgs/desktops/gnome-3/core/adwaita-icon-theme/src.nix +++ b/pkgs/desktops/gnome-3/core/adwaita-icon-theme/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "adwaita-icon-theme-3.24.0"; + name = "adwaita-icon-theme-3.26.0"; src = fetchurl { - url = mirror://gnome/sources/adwaita-icon-theme/3.24/adwaita-icon-theme-3.24.0.tar.xz; - sha256 = "ccf79ff3bd340254737ce4d28b87f0ccee4b3358cd3cd5cd11dc7b42f41b272a"; + url = mirror://gnome/sources/adwaita-icon-theme/3.26/adwaita-icon-theme-3.26.0.tar.xz; + sha256 = "9cad85de19313f5885497aceab0acbb3f08c60fcd5fa5610aeafff37a1d12212"; }; } diff --git a/pkgs/desktops/gnome-3/core/baobab/src.nix b/pkgs/desktops/gnome-3/core/baobab/src.nix index 8a2e35d454e..d3e2f03feb8 100644 --- a/pkgs/desktops/gnome-3/core/baobab/src.nix +++ b/pkgs/desktops/gnome-3/core/baobab/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "baobab-3.24.0"; + name = "baobab-3.26.1"; src = fetchurl { - url = mirror://gnome/sources/baobab/3.24/baobab-3.24.0.tar.xz; - sha256 = "5980e96df9f3d1751a969869ec07bc184ae3ad667d5a3eb06cf1297091fdfc3f"; + url = mirror://gnome/sources/baobab/3.26/baobab-3.26.1.tar.xz; + sha256 = "7a59ab5945f5d90725231b10d85a1893403f56660b1627c111d2b4eeb1ef787e"; }; } diff --git a/pkgs/desktops/gnome-3/core/caribou/default.nix b/pkgs/desktops/gnome-3/core/caribou/default.nix index e405d8edfba..e463fe0e03f 100644 --- a/pkgs/desktops/gnome-3/core/caribou/default.nix +++ b/pkgs/desktops/gnome-3/core/caribou/default.nix @@ -1,8 +1,10 @@ -{ fetchurl, stdenv, pkgconfig, gnome3, clutter, dbus, pythonPackages, libxml2 -, libxklavier, libXtst, gtk2, intltool, libxslt, at_spi2_core, autoreconfHook }: +{ fetchurl, stdenv, pkgconfig, gnome3, clutter, dbus, python3Packages, libxml2 +, libxklavier, libXtst, gtk2, intltool, libxslt, at_spi2_core, autoreconfHook +, wrapGAppsHook }: let majorVersion = "0.4"; + pythonEnv = python3Packages.python.withPackages ( ps: with ps; [ pygobject3 ] ); in stdenv.mkDerivation rec { name = "caribou-${majorVersion}.21"; @@ -12,11 +14,11 @@ stdenv.mkDerivation rec { sha256 = "0mfychh1q3dx0b96pjz9a9y112bm9yqyim40yykzxx1hppsdjhww"; }; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; + nativeBuildInputs = [ pkgconfig intltool libxslt libxml2 autoreconfHook wrapGAppsHook ]; buildInputs = with gnome3; - [ glib gtk clutter at_spi2_core dbus pythonPackages.python - pythonPackages.pygobject3 libxml2 libXtst gtk2 intltool libxslt ]; + [ glib gtk clutter at_spi2_core dbus pythonEnv python3Packages.pygobject3 + libXtst gtk2 ]; propagatedBuildInputs = [ gnome3.libgee libxklavier ]; diff --git a/pkgs/desktops/gnome-3/core/dconf-editor/default.nix b/pkgs/desktops/gnome-3/core/dconf-editor/default.nix index cd401962c99..62ccb636034 100644 --- a/pkgs/desktops/gnome-3/core/dconf-editor/default.nix +++ b/pkgs/desktops/gnome-3/core/dconf-editor/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, vala_0_32, libxslt, pkgconfig, glib, dbus_glib, gnome3 +{ stdenv, fetchurl, vala, libxslt, pkgconfig, glib, dbus_glib, gnome3 , libxml2, intltool, docbook_xsl_ns, docbook_xsl, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; - buildInputs = [ vala_0_32 libxslt glib dbus_glib gnome3.gtk libxml2 gnome3.defaultIconTheme + buildInputs = [ vala libxslt glib dbus_glib gnome3.gtk libxml2 gnome3.defaultIconTheme gnome3.gsettings_desktop_schemas intltool docbook_xsl docbook_xsl_ns gnome3.dconf ]; diff --git a/pkgs/desktops/gnome-3/core/dconf-editor/src.nix b/pkgs/desktops/gnome-3/core/dconf-editor/src.nix index 64e19864536..b21630641d9 100644 --- a/pkgs/desktops/gnome-3/core/dconf-editor/src.nix +++ b/pkgs/desktops/gnome-3/core/dconf-editor/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "dconf-editor-3.22.0"; + name = "dconf-editor-3.26.2"; src = fetchurl { - url = mirror://gnome/sources/dconf-editor/3.22/dconf-editor-3.22.0.tar.xz; - sha256 = "4ca3c2c3836f4c944f161540d1521507dab8e7bee0cac7d543560808efb9246f"; + url = mirror://gnome/sources/dconf-editor/3.26/dconf-editor-3.26.2.tar.xz; + sha256 = "28b453fe49c49d7dfaf07c85c01d7495913f93ab64a0b223c117eb17d1cb8ad1"; }; } diff --git a/pkgs/desktops/gnome-3/core/eog/default.nix b/pkgs/desktops/gnome-3/core/eog/default.nix index 23759e3bf90..49ad25a8c5e 100644 --- a/pkgs/desktops/gnome-3/core/eog/default.nix +++ b/pkgs/desktops/gnome-3/core/eog/default.nix @@ -1,13 +1,13 @@ -{ fetchurl, stdenv, intltool, pkgconfig, itstool, libxml2, libjpeg, gnome3 +{ fetchurl, stdenv, gettext, pkgconfig, itstool, libxml2, libjpeg, gnome3 , shared_mime_info, wrapGAppsHook, librsvg, libexif }: stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; - nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; + nativeBuildInputs = [ pkgconfig gettext itstool wrapGAppsHook ]; buildInputs = with gnome3; - [ intltool itstool libxml2 libjpeg gtk glib libpeas librsvg + [ libxml2 libjpeg gtk glib libpeas librsvg gsettings_desktop_schemas shared_mime_info adwaita-icon-theme gnome_desktop libexif dconf ]; diff --git a/pkgs/desktops/gnome-3/core/eog/src.nix b/pkgs/desktops/gnome-3/core/eog/src.nix index 72b02d0bba5..d0046d899be 100644 --- a/pkgs/desktops/gnome-3/core/eog/src.nix +++ b/pkgs/desktops/gnome-3/core/eog/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "eog-3.24.1"; + name = "eog-3.26.2"; src = fetchurl { - url = mirror://gnome/sources/eog/3.24/eog-3.24.1.tar.xz; - sha256 = "f51ee116e2c159fac1719e003a32e1cb6cbff51914fd1f6409f461a790ff27e7"; + url = mirror://gnome/sources/eog/3.26/eog-3.26.2.tar.xz; + sha256 = "b53e3d4dfa7d0085b829a5fb95f148a099803c00ef276be7685efd5ec38807ad"; }; } diff --git a/pkgs/desktops/gnome-3/core/epiphany/default.nix b/pkgs/desktops/gnome-3/core/epiphany/default.nix index 35aae8cc9eb..8c87609f85c 100644 --- a/pkgs/desktops/gnome-3/core/epiphany/default.nix +++ b/pkgs/desktops/gnome-3/core/epiphany/default.nix @@ -1,32 +1,40 @@ -{ stdenv, intltool, fetchurl, pkgconfig, gtk3, glib, nspr, icu -, bash, wrapGAppsHook, gnome3, libwnck3, libxml2, libxslt, libtool +{ stdenv, meson, ninja, gettext, fetchurl, pkgconfig, gtk, glib, icu +, wrapGAppsHook, gnome3, libxml2, libxslt, itstool , webkitgtk, libsoup, glib_networking, libsecret, gnome_desktop, libnotify, p11_kit -, sqlite, gcr, avahi, nss, isocodes, itstool, file, which -, gdk_pixbuf, librsvg, gnome_common, gst_all_1, json_glib }: +, sqlite, gcr, isocodes, desktop_file_utils, file +, gdk_pixbuf, gnome_common, gst_all_1, json_glib }: stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; # Tests need an X display - configureFlags = [ "--disable-static --disable-tests" ]; + mesonFlags = [ "-Dunit_tests=false" ]; propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - nativeBuildInputs = [ pkgconfig file wrapGAppsHook ]; + nativeBuildInputs = [ meson ninja libxslt pkgconfig itstool gettext file wrapGAppsHook desktop_file_utils ]; - buildInputs = [ gtk3 glib intltool libwnck3 libxml2 libxslt file - webkitgtk libsoup libsecret gnome_desktop libnotify libtool - sqlite isocodes nss itstool p11_kit nspr icu gnome3.yelp_tools - gdk_pixbuf gnome3.defaultIconTheme librsvg which gnome_common - gcr avahi gnome3.gsettings_desktop_schemas gnome3.dconf - gnome3.glib_networking gst_all_1.gstreamer gst_all_1.gst-plugins-base + buildInputs = [ gtk glib webkitgtk libsoup libxml2 libsecret gnome_desktop libnotify + sqlite isocodes p11_kit icu gnome3.yelp_tools + gdk_pixbuf gnome3.defaultIconTheme gnome_common gcr + glib_networking gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad gst_all_1.gst-plugins-ugly gst_all_1.gst-libav json_glib ]; - NIX_CFLAGS_COMPILE = "-I${nss.dev}/include/nss -I${glib.dev}/include/gio-unix-2.0"; - enableParallelBuilding = true; + postPatch = '' + chmod +x post_install.py # patchShebangs requires executable file + patchShebangs post_install.py + ''; + + postFixup = '' + # Patched meson does not add internal libraries to rpath + for f in bin/.epiphany-wrapped libexec/.epiphany-search-provider-wrapped libexec/epiphany/.ephy-profile-migrator-wrapped lib/epiphany/web-extensions/libephywebextension.so; do + patchelf --set-rpath "$out/lib/epiphany:$(patchelf --print-rpath $out/$f)" "$out/$f" + done + ''; + meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Epiphany; description = "WebKit based web browser for GNOME"; diff --git a/pkgs/desktops/gnome-3/core/epiphany/src.nix b/pkgs/desktops/gnome-3/core/epiphany/src.nix index 85596c07fad..15048ce269c 100644 --- a/pkgs/desktops/gnome-3/core/epiphany/src.nix +++ b/pkgs/desktops/gnome-3/core/epiphany/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "epiphany-3.24.3"; + name = "epiphany-3.26.3"; src = fetchurl { - url = mirror://gnome/sources/epiphany/3.24/epiphany-3.24.3.tar.xz; - sha256 = "fef51676310d9f37e18c9b2d778254232eb17cccd988c2d1ecf42c7b2963a154"; + url = mirror://gnome/sources/epiphany/3.26/epiphany-3.26.3.tar.xz; + sha256 = "cb50042496e704621db3d0213581b0f914c639e160522751f64c5e5f6e6040b5"; }; } diff --git a/pkgs/desktops/gnome-3/core/evince/src.nix b/pkgs/desktops/gnome-3/core/evince/src.nix index aa45a79536a..6627be55088 100644 --- a/pkgs/desktops/gnome-3/core/evince/src.nix +++ b/pkgs/desktops/gnome-3/core/evince/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "evince-3.24.1"; + name = "evince-3.26.0"; src = fetchurl { - url = mirror://gnome/sources/evince/3.24/evince-3.24.1.tar.xz; - sha256 = "9ca0c5213407b37be55fddb04a85d9301b692c4412c5920319d975403bff0f37"; + url = mirror://gnome/sources/evince/3.26/evince-3.26.0.tar.xz; + sha256 = "79567bdb743cf0c3ed7b638da32afc9b850298f9b4edd532455df4a7e2a4c9d8"; }; } diff --git a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix index e2472a40369..ebe740a2167 100644 --- a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix +++ b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix @@ -1,17 +1,18 @@ { fetchurl, stdenv, pkgconfig, gnome3, python, dconf , intltool, libsoup, libxml2, libsecret, icu, sqlite -, p11_kit, db, nspr, nss, libical, gperf, makeWrapper, valaSupport ? true, -vala_0_32, cmake, kerberos, openldap, webkitgtk, libaccounts-glib }: +, p11_kit, db, nspr, nss, libical, gperf, makeWrapper, valaSupport ? true +, vala, cmake, kerberos, openldap, webkitgtk, libaccounts-glib, json_glib }: stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; + nativeBuildInputs = [ cmake pkgconfig intltool python gperf makeWrapper ]; buildInputs = with gnome3; - [ pkgconfig glib python intltool libsoup libxml2 gtk gnome_online_accounts - (stdenv.lib.getLib dconf) gcr p11_kit libgweather libgdata gperf makeWrapper - icu sqlite gsettings_desktop_schemas cmake kerberos openldap webkitgtk - libaccounts-glib ] - ++ stdenv.lib.optional valaSupport vala_0_32; + [ glib libsoup libxml2 gtk gnome_online_accounts + (stdenv.lib.getLib dconf) gcr p11_kit libgweather libgdata + icu sqlite gsettings_desktop_schemas kerberos openldap webkitgtk + libaccounts-glib json_glib ] + ++ stdenv.lib.optional valaSupport vala; propagatedBuildInputs = [ libsecret nss nspr libical db ]; diff --git a/pkgs/desktops/gnome-3/core/evolution-data-server/src.nix b/pkgs/desktops/gnome-3/core/evolution-data-server/src.nix index 655fffe0eb9..1828357159d 100644 --- a/pkgs/desktops/gnome-3/core/evolution-data-server/src.nix +++ b/pkgs/desktops/gnome-3/core/evolution-data-server/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "evolution-data-server-3.24.5"; + name = "evolution-data-server-3.26.2.1"; src = fetchurl { - url = mirror://gnome/sources/evolution-data-server/3.24/evolution-data-server-3.24.5.tar.xz; - sha256 = "6d8ec04b79c02bb517cc3e23ac3b23c7503465dfa27b7415955201a2f62844e1"; + url = mirror://gnome/sources/evolution-data-server/3.26/evolution-data-server-3.26.2.1.tar.xz; + sha256 = "09fb1c4ce20c62309e8ea2d80649f590492e88c1deb89118e715e155296baefd"; }; } diff --git a/pkgs/desktops/gnome-3/core/folks/default.nix b/pkgs/desktops/gnome-3/core/folks/default.nix index 6fcaa67b771..6be27021023 100644 --- a/pkgs/desktops/gnome-3/core/folks/default.nix +++ b/pkgs/desktops/gnome-3/core/folks/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, pkgconfig, glib, gnome3, nspr, intltool -, vala_0_32, sqlite, libxml2, dbus_glib, libsoup, nss, dbus_libs +, vala, sqlite, libxml2, dbus_glib, libsoup, nss, dbus_libs , telepathy_glib, evolution_data_server, libsecret, db }: # TODO: enable more folks backends @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ glib gnome3.libgee sqlite ]; # dbus_daemon needed for tests buildInputs = [ dbus_glib telepathy_glib evolution_data_server dbus_libs - vala_0_32 libsecret libxml2 libsoup nspr nss intltool db ]; + vala libsecret libxml2 libsoup nspr nss intltool db ]; nativeBuildInputs = [ pkgconfig ]; configureFlags = "--disable-fatal-warnings"; diff --git a/pkgs/desktops/gnome-3/core/gcr/default.nix b/pkgs/desktops/gnome-3/core/gcr/default.nix index e970dba5615..2569b4e2c7a 100644 --- a/pkgs/desktops/gnome-3/core/gcr/default.nix +++ b/pkgs/desktops/gnome-3/core/gcr/default.nix @@ -1,19 +1,18 @@ { stdenv, fetchurl, pkgconfig, intltool, gnupg, p11_kit, glib , libgcrypt, libtasn1, dbus_glib, gtk, pango, gdk_pixbuf, atk -, gobjectIntrospection, makeWrapper, libxslt, vala_0_32, gnome3 }: +, gobjectIntrospection, makeWrapper, libxslt, vala, gnome3 }: stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; outputs = [ "out" "dev" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig intltool gobjectIntrospection libxslt makeWrapper vala ]; buildInputs = let gpg = gnupg.override { guiSupport = false; }; # prevent build cycle with pinentry_gnome in [ - intltool gpg gobjectIntrospection libxslt - libgcrypt libtasn1 dbus_glib pango gdk_pixbuf atk makeWrapper vala_0_32 + gpg libgcrypt libtasn1 dbus_glib pango gdk_pixbuf atk ]; propagatedBuildInputs = [ glib gtk p11_kit ]; diff --git a/pkgs/desktops/gnome-3/core/gdm/default.nix b/pkgs/desktops/gnome-3/core/gdm/default.nix index ee7d9975b76..796e103fdb3 100644 --- a/pkgs/desktops/gnome-3/core/gdm/default.nix +++ b/pkgs/desktops/gnome-3/core/gdm/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, glib, itstool, libxml2, xorg, dbus , intltool, accountsservice, libX11, gnome3, systemd, autoreconfHook , gtk, libcanberra_gtk3, pam, libtool, gobjectIntrospection, plymouth -, librsvg }: +, librsvg, coreutils }: stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; @@ -11,17 +11,21 @@ stdenv.mkDerivation rec { substituteInPlace ./configure --replace "/usr/bin/X" "${xorg.xorgserver.out}/bin/X" ''; + postPatch = '' + substituteInPlace daemon/gdm-manager.c --replace "/bin/plymouth" "${plymouth}/bin/plymouth" + substituteInPlace data/gdm.service.in --replace "/bin/kill" "${coreutils}/bin/kill" + ''; + configureFlags = [ "--sysconfdir=/etc" "--localstatedir=/var" "--with-plymouth=yes" "--with-initial-vt=7" "--with-systemdsystemunitdir=$(out)/etc/systemd/system" ]; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; - buildInputs = [ glib itstool libxml2 intltool - accountsservice gnome3.dconf systemd + nativeBuildInputs = [ pkgconfig libxml2 itstool intltool autoreconfHook libtool gnome3.dconf ]; + buildInputs = [ glib accountsservice systemd gobjectIntrospection libX11 gtk - libcanberra_gtk3 pam libtool plymouth librsvg ]; + libcanberra_gtk3 pam plymouth librsvg ]; enableParallelBuilding = true; @@ -31,6 +35,11 @@ stdenv.mkDerivation rec { ./gdm-session-worker_xserver-path.patch ]; + postInstall = '' + # Prevent “Could not parse desktop file orca-autostart.desktop or it references a not found TryExec binary” + rm $out/share/gdm/greeter/autostart/orca-autostart.desktop + ''; + installFlags = [ "sysconfdir=$(out)/etc" "dbusconfdir=$(out)/etc/dbus-1/system.d" ]; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/core/gdm/gdm-x-session_path.patch b/pkgs/desktops/gnome-3/core/gdm/gdm-x-session_path.patch deleted file mode 100644 index 84081f4786c..00000000000 --- a/pkgs/desktops/gnome-3/core/gdm/gdm-x-session_path.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/daemon/gdm-x-session.c.orig b/daemon/gdm-x-session.c -index d835b34..86f0d47 100644 ---- a/daemon/gdm-x-session.c.orig -+++ b/daemon/gdm-x-session.c -@@ -240,7 +240,13 @@ spawn_x_server (State *state, - - display_fd_string = g_strdup_printf ("%d", DISPLAY_FILENO); - -- g_ptr_array_add (arguments, X_SERVER); -+ if (g_getenv ("GDM_X_SERVER") != NULL) { -+ g_debug ("using GDM_X_SERVER: %s", g_getenv("GDM_X_SERVER")); -+ g_ptr_array_add (arguments, g_getenv("GDM_X_SERVER")); -+ } else { -+ g_debug ("GDM_X_SERVER not set, using default: %s", X_SERVER); -+ g_ptr_array_add (arguments, X_SERVER); -+ } - - if (vt_string != NULL) { - g_ptr_array_add (arguments, vt_string); diff --git a/pkgs/desktops/gnome-3/core/gdm/src.nix b/pkgs/desktops/gnome-3/core/gdm/src.nix index 0dd7680467f..8d92167a039 100644 --- a/pkgs/desktops/gnome-3/core/gdm/src.nix +++ b/pkgs/desktops/gnome-3/core/gdm/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "gdm-3.24.2"; + name = "gdm-3.26.2.1"; src = fetchurl { - url = mirror://gnome/sources/gdm/3.24/gdm-3.24.2.tar.xz; - sha256 = "4378b9fad5536e03c56ad138d0e249fbcaa09977b867895426cb41c978fe5de8"; + url = mirror://gnome/sources/gdm/3.26/gdm-3.26.2.1.tar.xz; + sha256 = "17ddcb00602c2b426de58bb4b0d99af9de27450a8557dcc5ec850c080d55ad57"; }; } diff --git a/pkgs/desktops/gnome-3/core/gjs/default.nix b/pkgs/desktops/gnome-3/core/gjs/default.nix index 482d6ae64a4..dd607e01cae 100644 --- a/pkgs/desktops/gnome-3/core/gjs/default.nix +++ b/pkgs/desktops/gnome-3/core/gjs/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, pkgconfig, gnome3, gtk3, gobjectIntrospection -, spidermonkey_38, pango, readline, glib, libxml2, dbus }: +, spidermonkey_52, pango, readline, glib, libxml2, dbus }: stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; @@ -7,12 +7,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libxml2 gobjectIntrospection gtk3 glib pango readline dbus ]; - propagatedBuildInputs = [ spidermonkey_38 ]; - - # GJS expects mozjs-38.pc but spidermonkey_38 only provides js.pc - preConfigure = '' - sed -i s/mozjs-38/js/ configure - ''; + propagatedBuildInputs = [ spidermonkey_52 ]; postInstall = '' sed 's|-lreadline|-L${readline.out}/lib -lreadline|g' -i $out/lib/libgjs.la diff --git a/pkgs/desktops/gnome-3/core/gjs/src.nix b/pkgs/desktops/gnome-3/core/gjs/src.nix index 27162fcbfd4..d3112f02f8a 100644 --- a/pkgs/desktops/gnome-3/core/gjs/src.nix +++ b/pkgs/desktops/gnome-3/core/gjs/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "gjs-1.48.6"; + name = "gjs-1.50.2"; src = fetchurl { - url = mirror://gnome/sources/gjs/1.48/gjs-1.48.6.tar.xz; - sha256 = "e85f65ba4b38bf80b6174949dfe6fce89e88b8213bbdde4ac1fde473c08bd312"; + url = mirror://gnome/sources/gjs/1.50/gjs-1.50.2.tar.xz; + sha256 = "2fad902cf7a7806454121c03918755c646fcfd6b08b52d488987db4e2d691ff3"; }; } diff --git a/pkgs/desktops/gnome-3/core/gnome-backgrounds/src.nix b/pkgs/desktops/gnome-3/core/gnome-backgrounds/src.nix index dce56f2341e..9d86b7168ad 100644 --- a/pkgs/desktops/gnome-3/core/gnome-backgrounds/src.nix +++ b/pkgs/desktops/gnome-3/core/gnome-backgrounds/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "gnome-backgrounds-3.24.0"; + name = "gnome-backgrounds-3.26.2"; src = fetchurl { - url = mirror://gnome/sources/gnome-backgrounds/3.24/gnome-backgrounds-3.24.0.tar.xz; - sha256 = "cbda4c2159292940fa4b972df77379be716590c7b62bb4b2b9fa8e99749c71ca"; + url = mirror://gnome/sources/gnome-backgrounds/3.26/gnome-backgrounds-3.26.2.tar.xz; + sha256 = "3a8ba8d3463d70bce2377b168218e32367c0020f2d0caf611e7e39066081f94f"; }; } diff --git a/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix b/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix index f237d745c1c..9eaad021d32 100644 --- a/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix @@ -1,17 +1,16 @@ -{ stdenv, fetchurl, gnome3, pkgconfig, gtk3, intltool, glib -, udev, itstool, libxml2, makeWrapper, libnotify, libcanberra_gtk3 }: +{ stdenv, fetchurl, gnome3, meson, ninja, pkgconfig, gtk3, intltool, glib +, udev, itstool, libxml2, wrapGAppsHook, libnotify, libcanberra_gtk3 }: stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ intltool glib gtk3 udev libxml2 gnome3.defaultIconTheme - makeWrapper gnome3.gsettings_desktop_schemas itstool - libnotify libcanberra_gtk3 ]; + nativeBuildInputs = [ meson ninja intltool itstool pkgconfig libxml2 wrapGAppsHook ]; + buildInputs = [ glib gtk3 udev libnotify libcanberra_gtk3 + gnome3.defaultIconTheme gnome3.gsettings_desktop_schemas ]; - preFixup = '' - wrapProgram "$out/bin/bluetooth-sendto" \ - --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" + postPatch = '' + chmod +x meson_post_install.py # patchShebangs requires executable file + patchShebangs meson_post_install.py ''; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/core/gnome-bluetooth/src.nix b/pkgs/desktops/gnome-3/core/gnome-bluetooth/src.nix index 5129b87e542..31aab6649d7 100644 --- a/pkgs/desktops/gnome-3/core/gnome-bluetooth/src.nix +++ b/pkgs/desktops/gnome-3/core/gnome-bluetooth/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "gnome-bluetooth-3.20.1"; + name = "gnome-bluetooth-3.26.1"; src = fetchurl { - url = mirror://gnome/sources/gnome-bluetooth/3.20/gnome-bluetooth-3.20.1.tar.xz; - sha256 = "1zlqcz6jz4vzzr8gd1678i9s4015kiwcpr5szrwz4kmryfsm147a"; + url = mirror://gnome/sources/gnome-bluetooth/3.26/gnome-bluetooth-3.26.1.tar.xz; + sha256 = "1d2c7b94fc76a833dad0d4d91344e9a5a7b4aad740c5a90944bd25c5be7e784f"; }; } diff --git a/pkgs/desktops/gnome-3/core/gnome-calculator/src.nix b/pkgs/desktops/gnome-3/core/gnome-calculator/src.nix index 9279cdb13af..517220c9457 100644 --- a/pkgs/desktops/gnome-3/core/gnome-calculator/src.nix +++ b/pkgs/desktops/gnome-3/core/gnome-calculator/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "gnome-calculator-3.24.0"; + name = "gnome-calculator-3.26.0"; src = fetchurl { - url = mirror://gnome/sources/gnome-calculator/3.24/gnome-calculator-3.24.0.tar.xz; - sha256 = "44758ac719edd20067381073de3c643f842308f26da039412b1978a415202d10"; + url = mirror://gnome/sources/gnome-calculator/3.26/gnome-calculator-3.26.0.tar.xz; + sha256 = "62215b37fcd73a6bbb106ebd0f25051c81ff0cf6ad84fd4a3ea176bceb5863c7"; }; } diff --git a/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix b/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix index e69092a5712..9078b9e051c 100644 --- a/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix @@ -3,7 +3,7 @@ , libchamplain, clutter_gtk, geocode_glib , bash, wrapGAppsHook, itstool, folks, libnotify, libxml2 , gnome3, librsvg, gdk_pixbuf, file, telepathy_glib, nspr, nss -, libsoup, vala_0_32, dbus_glib, automake, autoconf }: +, libsoup, vala, dbus_glib, automake, autoconf }: stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; @@ -17,14 +17,11 @@ stdenv.mkDerivation rec { touch src/*.vala ''; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gtk3 glib intltool itstool evolution_data_server - gnome3.gsettings_desktop_schemas wrapGAppsHook file libnotify + nativeBuildInputs = [ vala automake autoconf pkgconfig intltool itstool wrapGAppsHook file ]; + buildInputs = [ gtk3 glib evolution_data_server gnome3.gsettings_desktop_schemas libnotify folks gnome3.gnome_desktop telepathy_glib libsecret dbus_glib libxml2 libsoup gnome3.gnome_online_accounts nspr nss - gdk_pixbuf gnome3.defaultIconTheme librsvg - libchamplain clutter_gtk geocode_glib - vala_0_32 automake autoconf db ]; + gdk_pixbuf gnome3.defaultIconTheme libchamplain clutter_gtk geocode_glib db ]; preFixup = '' gappsWrapperArgs+=( diff --git a/pkgs/desktops/gnome-3/core/gnome-contacts/src.nix b/pkgs/desktops/gnome-3/core/gnome-contacts/src.nix index 4409747169b..bf3df1bc84f 100644 --- a/pkgs/desktops/gnome-3/core/gnome-contacts/src.nix +++ b/pkgs/desktops/gnome-3/core/gnome-contacts/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "gnome-contacts-3.22.1"; + name = "gnome-contacts-3.26"; src = fetchurl { - url = mirror://gnome/sources/gnome-contacts/3.22/gnome-contacts-3.22.1.tar.xz; - sha256 = "e45297fb6f379a978605f7e183201be70dff2912f55072a363bdb1f67d9fe87b"; + url = mirror://gnome/sources/gnome-contacts/3.26/gnome-contacts-3.26.tar.xz; + sha256 = "f819ac74b2ad581f9741614627f49ef519713324afd9e4fc0ea5ac261a5f68c1"; }; } diff --git a/pkgs/desktops/gnome-3/core/gnome-control-center/src.nix b/pkgs/desktops/gnome-3/core/gnome-control-center/src.nix index 85dfcd2ef31..948768904ae 100644 --- a/pkgs/desktops/gnome-3/core/gnome-control-center/src.nix +++ b/pkgs/desktops/gnome-3/core/gnome-control-center/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "gnome-control-center-3.24.3"; + name = "gnome-control-center-3.26.2"; src = fetchurl { - url = mirror://gnome/sources/gnome-control-center/3.24/gnome-control-center-3.24.3.tar.xz; - sha256 = "43a4d2a4c222ee4a53428a4a720f823e157e4d4c597ea1a84e438d242596cca2"; + url = mirror://gnome/sources/gnome-control-center/3.26/gnome-control-center-3.26.2.tar.xz; + sha256 = "07aed27d6317f2cad137daa6d94a37ad02c32b958dcd30c8f07d0319abfb04c5"; }; } diff --git a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix b/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix index d56018bf1e8..e8a7cb8ceb9 100644 --- a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, python, libxml2Python, libxslt, which, libX11, gnome3, gtk3, glib , intltool, gnome_doc_utils, libxkbfile, xkeyboard_config, isocodes, itstool, wayland -, gobjectIntrospection }: +, libseccomp, gobjectIntrospection }: stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ python libxml2Python libxslt which libX11 xkeyboard_config isocodes itstool wayland gtk3 glib intltool gnome_doc_utils libxkbfile - gobjectIntrospection ]; + libseccomp gobjectIntrospection ]; propagatedBuildInputs = [ gnome3.gsettings_desktop_schemas ]; diff --git a/pkgs/desktops/gnome-3/core/gnome-desktop/src.nix b/pkgs/desktops/gnome-3/core/gnome-desktop/src.nix index 83c2979656c..f3c0d446d3f 100644 --- a/pkgs/desktops/gnome-3/core/gnome-desktop/src.nix +++ b/pkgs/desktops/gnome-3/core/gnome-desktop/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "gnome-desktop-3.24.2"; + name = "gnome-desktop-3.26.2"; src = fetchurl { - url = mirror://gnome/sources/gnome-desktop/3.24/gnome-desktop-3.24.2.tar.xz; - sha256 = "8fa1de66a6a75963bffc79b01a60434c71237d44c51beca09c0f714a032d785e"; + url = mirror://gnome/sources/gnome-desktop/3.26/gnome-desktop-3.26.2.tar.xz; + sha256 = "f7561a7a313fc474b2c390cd9696df1f5c1e1556080e43f4afe042b1060e5f2a"; }; } diff --git a/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix b/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix index 77c4805a197..72d1602eee4 100644 --- a/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix @@ -1,27 +1,20 @@ -{ stdenv, intltool, fetchurl -, pkgconfig, gtk3, glib -, bash, makeWrapper, itstool, libxml2 -, gnome3, librsvg, gdk_pixbuf, file }: +{ stdenv, fetchurl, meson, ninja, pkgconfig, desktop_file_utils, appstream-glib, libxslt +, libxml2, gettext, itstool, wrapGAppsHook, docbook_xsl, docbook_xml_dtd_43 +, gnome3, gtk, glib }: stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; doCheck = true; - NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - propagatedBuildInputs = [ gdk_pixbuf gnome3.defaultIconTheme librsvg ]; + propagatedBuildInputs = [ gnome3.defaultIconTheme ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gtk3 glib intltool itstool libxml2 file - gnome3.gsettings_desktop_schemas makeWrapper ]; + nativeBuildInputs = [ meson ninja pkgconfig wrapGAppsHook libxml2 gettext itstool + desktop_file_utils appstream-glib libxslt docbook_xsl docbook_xml_dtd_43]; + buildInputs = [ gtk glib gnome3.gsettings_desktop_schemas ]; - preFixup = '' - wrapProgram "$out/bin/gnome-dictionary" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gtk3.out}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - ''; + checkPhase = "meson test"; meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Dictionary; diff --git a/pkgs/desktops/gnome-3/core/gnome-dictionary/src.nix b/pkgs/desktops/gnome-3/core/gnome-dictionary/src.nix index 3c0a188c7b2..92a50430bd1 100644 --- a/pkgs/desktops/gnome-3/core/gnome-dictionary/src.nix +++ b/pkgs/desktops/gnome-3/core/gnome-dictionary/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "gnome-dictionary-3.24.0"; + name = "gnome-dictionary-3.26.1"; src = fetchurl { - url = mirror://gnome/sources/gnome-dictionary/3.24/gnome-dictionary-3.24.0.tar.xz; - sha256 = "41e7064a0cfab18e881a95ce9f1712ee5c9f426904b16f3bc04c35ebd1bbd9f2"; + url = mirror://gnome/sources/gnome-dictionary/3.26/gnome-dictionary-3.26.1.tar.xz; + sha256 = "16b8bc248dcf68987826d5e39234b1bb7fd24a2607fcdbf4258fde88f012f300"; }; } diff --git a/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix b/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix index f9380272f06..188ad99b73c 100644 --- a/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix @@ -1,24 +1,23 @@ -{ stdenv, intltool, fetchurl, pkgconfig, udisks2, libsecret, libdvdread -, bash, gtk3, glib, wrapGAppsHook, cracklib, libnotify -, itstool, gnome3, gdk_pixbuf, libxml2, python -, libcanberra_gtk3, libxslt, libtool, docbook_xsl, libpwquality }: +{ stdenv, gettext, fetchurl, pkgconfig, udisks2, libsecret, libdvdread +, meson, ninja, gtk, glib, wrapGAppsHook, libnotify +, itstool, gnome3, gdk_pixbuf, libxml2 +, libcanberra_gtk3, libxslt, docbook_xsl, libpwquality }: stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; - doCheck = true; - - NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bash gtk3 glib intltool itstool - libxslt libtool libsecret libpwquality cracklib - libnotify libdvdread libcanberra_gtk3 docbook_xsl - gdk_pixbuf gnome3.defaultIconTheme - udisks2 gnome3.gnome_settings_daemon - gnome3.gsettings_desktop_schemas wrapGAppsHook libxml2 ]; + nativeBuildInputs = [ meson ninja pkgconfig gettext itstool libxslt docbook_xsl + wrapGAppsHook libxml2 ]; + buildInputs = [ gtk glib libsecret libpwquality libnotify libdvdread libcanberra_gtk3 + gdk_pixbuf udisks2 gnome3.defaultIconTheme + gnome3.gnome_settings_daemon gnome3.gsettings_desktop_schemas ]; + + postPatch = '' + chmod +x meson_post_install.py # patchShebangs requires executable file + patchShebangs meson_post_install.py + ''; meta = with stdenv.lib; { homepage = https://en.wikipedia.org/wiki/GNOME_Disks; diff --git a/pkgs/desktops/gnome-3/core/gnome-disk-utility/src.nix b/pkgs/desktops/gnome-3/core/gnome-disk-utility/src.nix index 602b9eb340e..e3241153a93 100644 --- a/pkgs/desktops/gnome-3/core/gnome-disk-utility/src.nix +++ b/pkgs/desktops/gnome-3/core/gnome-disk-utility/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "gnome-disk-utility-3.24.1"; + name = "gnome-disk-utility-3.26.2"; src = fetchurl { - url = mirror://gnome/sources/gnome-disk-utility/3.24/gnome-disk-utility-3.24.1.tar.xz; - sha256 = "878f0489947c813b44eb89f5fdc2790d757cd8565f26f22b950d55b8585653a1"; + url = mirror://gnome/sources/gnome-disk-utility/3.26/gnome-disk-utility-3.26.2.tar.xz; + sha256 = "aa2b96c2c64d8bde6cf802ff8da5796720d0becb21111342ced0637961e256f2"; }; } diff --git a/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix b/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix index 14aeb69e14c..cdf119d83a3 100644 --- a/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix @@ -1,27 +1,19 @@ -{ stdenv, intltool, fetchurl -, pkgconfig, gtk3, glib -, bash, wrapGAppsHook, itstool -, gnome3, librsvg, gdk_pixbuf }: +{ stdenv, meson, ninja, gettext, fetchurl +, pkgconfig, gtk3, glib, libxml2 +, wrapGAppsHook, gnome3 }: stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; doCheck = true; - NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; + checkPhase = "meson test"; - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; + nativeBuildInputs = [ meson ninja pkgconfig gettext wrapGAppsHook libxml2 ]; + buildInputs = [ gtk3 glib gnome3.gnome_desktop gnome3.defaultIconTheme ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gtk3 glib intltool itstool gnome3.gnome_desktop - gdk_pixbuf gnome3.defaultIconTheme librsvg - gnome3.gsettings_desktop_schemas wrapGAppsHook ]; - - preFixup = '' - gappsWrapperArgs+=( - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share" - ) - ''; + # Do not run meson-postinstall.sh + preConfigure = "sed -i '2,$ d' meson-postinstall.sh"; meta = with stdenv.lib; { description = "Program that can preview fonts and create thumbnails for fonts"; diff --git a/pkgs/desktops/gnome-3/core/gnome-font-viewer/src.nix b/pkgs/desktops/gnome-3/core/gnome-font-viewer/src.nix index f4e37d476dd..c31f09938c9 100644 --- a/pkgs/desktops/gnome-3/core/gnome-font-viewer/src.nix +++ b/pkgs/desktops/gnome-3/core/gnome-font-viewer/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "gnome-font-viewer-3.24.0"; + name = "gnome-font-viewer-3.26.0"; src = fetchurl { - url = mirror://gnome/sources/gnome-font-viewer/3.24/gnome-font-viewer-3.24.0.tar.xz; - sha256 = "f3658216a744603fd2100d60de7b31062e014f02333e8433dcaf6a3bb4b7dc76"; + url = mirror://gnome/sources/gnome-font-viewer/3.26/gnome-font-viewer-3.26.0.tar.xz; + sha256 = "02768a62b4033de5ef9d00602e8c29e5de05255f879b0d9b4d731be9648fe9a0"; }; } diff --git a/pkgs/desktops/gnome-3/core/gnome-keyring/src.nix b/pkgs/desktops/gnome-3/core/gnome-keyring/src.nix index 88179fff3c7..ffee6211232 100644 --- a/pkgs/desktops/gnome-3/core/gnome-keyring/src.nix +++ b/pkgs/desktops/gnome-3/core/gnome-keyring/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "gnome-keyring-3.20.0"; + name = "gnome-keyring-3.20.1"; src = fetchurl { - url = mirror://gnome/sources/gnome-keyring/3.20/gnome-keyring-3.20.0.tar.xz; - sha256 = "bc17cecd748a0e46e302171d11c3ae3d76bba5258c441fabec3786f418e7ec99"; + url = mirror://gnome/sources/gnome-keyring/3.20/gnome-keyring-3.20.1.tar.xz; + sha256 = "134ci3mn6jjap59z3lrvyiip7zf2nlw5xvanr44yajs57xr4x5lp"; }; } diff --git a/pkgs/desktops/gnome-3/core/gnome-online-accounts/src.nix b/pkgs/desktops/gnome-3/core/gnome-online-accounts/src.nix index 2c51429cd0c..311ad864339 100644 --- a/pkgs/desktops/gnome-3/core/gnome-online-accounts/src.nix +++ b/pkgs/desktops/gnome-3/core/gnome-online-accounts/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "gnome-online-accounts-3.24.2"; + name = "gnome-online-accounts-3.26.1"; src = fetchurl { - url = mirror://gnome/sources/gnome-online-accounts/3.24/gnome-online-accounts-3.24.2.tar.xz; - sha256 = "b70ad52d1541e1e5192dd060bb11552a3af5007ab477aa81d265d1cd1cf7afba"; + url = mirror://gnome/sources/gnome-online-accounts/3.26/gnome-online-accounts-3.26.1.tar.xz; + sha256 = "603c110405cb89a01497a69967f10e3f3f36add3dc175b062ec4c5ed4485621b"; }; } diff --git a/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix b/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix index fbcd51b6cc2..d8e87871560 100644 --- a/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix @@ -1,25 +1,18 @@ { stdenv, fetchurl, pkgconfig, glib, gnome3, libxml2 -, libsoup, json_glib, gmp, openssl, dleyna-server, makeWrapper }: +, libsoup, json_glib, gmp, openssl, dleyna-server, wrapGAppsHook }: stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; buildInputs = [ glib gnome3.libgdata libxml2 libsoup gmp openssl gnome3.grilo gnome3.libzapojit gnome3.grilo-plugins - gnome3.gnome_online_accounts makeWrapper gnome3.libmediaart + gnome3.gnome_online_accounts gnome3.libmediaart gnome3.tracker gnome3.gfbgraph json_glib gnome3.rest dleyna-server ]; enableParallelBuilding = true; - preFixup = '' - for f in $out/libexec/*; do - wrapProgram "$f" \ - --prefix GRL_PLUGIN_PATH : "${gnome3.grilo-plugins}/lib/grilo-${gnome3.grilo-plugins.major}" - done - ''; - meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Projects/GnomeOnlineMiners; description = "A set of crawlers that go through your online content and index them locally in Tracker"; diff --git a/pkgs/desktops/gnome-3/core/gnome-online-miners/src.nix b/pkgs/desktops/gnome-3/core/gnome-online-miners/src.nix index 00558f25295..3b8306c6a1a 100644 --- a/pkgs/desktops/gnome-3/core/gnome-online-miners/src.nix +++ b/pkgs/desktops/gnome-3/core/gnome-online-miners/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "gnome-online-miners-3.24.0"; + name = "gnome-online-miners-3.26.0"; src = fetchurl { - url = mirror://gnome/sources/gnome-online-miners/3.24/gnome-online-miners-3.24.0.tar.xz; - sha256 = "8c0508f459b0364bed5f2f6a997aa81c1cbe75a94b23cc8fcfd83b0d3485d3ab"; + url = mirror://gnome/sources/gnome-online-miners/3.26/gnome-online-miners-3.26.0.tar.xz; + sha256 = "7f404db5eccb87524a5dfcef5b6f38b11047b371081559afbe48c34dbca2a98e"; }; } diff --git a/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix b/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix index 1f933e1b3c5..69a967d6d24 100644 --- a/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix @@ -1,26 +1,30 @@ -{ stdenv, intltool, fetchurl, pkgconfig, libcanberra_gtk3 -, bash, gtk3, glib, wrapGAppsHook -, itstool, gnome3, librsvg, gdk_pixbuf }: +{ stdenv, gettext, libxml2, fetchurl, pkgconfig, libcanberra_gtk3 +, bash, gtk3, glib, meson, ninja, wrapGAppsHook, appstream-glib +, gnome3, librsvg, gdk_pixbuf }: stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; doCheck = true; - NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; + checkPhase = "meson test"; + + + postPatch = '' + chmod +x build-aux/postinstall.py # patchShebangs requires executable file + patchShebangs build-aux/postinstall.py + ''; propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; propagatedBuildInputs = [ gdk_pixbuf gnome3.defaultIconTheme librsvg ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bash gtk3 glib intltool itstool libcanberra_gtk3 - gnome3.gsettings_desktop_schemas wrapGAppsHook ]; + nativeBuildInputs = [ meson ninja pkgconfig gettext appstream-glib libxml2 wrapGAppsHook ]; + buildInputs = [ bash gtk3 glib libcanberra_gtk3 + gnome3.gsettings_desktop_schemas ]; - preFixup = '' - gappsWrapperArgs+=( - --prefix XDG_DATA_DIRS : "${gtk3.out}/share:${gnome3.gnome_themes_standard}/share" - ) - ''; + patches = [ + ./prevent-cache-updates.patch + ]; meta = with stdenv.lib; { homepage = https://en.wikipedia.org/wiki/GNOME_Screenshot; diff --git a/pkgs/desktops/gnome-3/core/gnome-screenshot/prevent-cache-updates.patch b/pkgs/desktops/gnome-3/core/gnome-screenshot/prevent-cache-updates.patch new file mode 100644 index 00000000000..370d09cd2f0 --- /dev/null +++ b/pkgs/desktops/gnome-3/core/gnome-screenshot/prevent-cache-updates.patch @@ -0,0 +1,21 @@ +--- a/build-aux/postinstall.py ++++ b/build-aux/postinstall.py +@@ -8,18 +8,6 @@ + + # Packaging tools define DESTDIR and this isn't needed for them + if 'DESTDIR' not in os.environ: +- print('Updating icon cache...') +- icon_cache_dir = os.path.join(datadir, 'icons', 'hicolor') +- if not os.path.exists(icon_cache_dir): +- os.makedirs(icon_cache_dir) +- subprocess.call(['gtk-update-icon-cache', '-qtf', icon_cache_dir]) +- +- print('Updating desktop database...') +- desktop_database_dir = os.path.join(datadir, 'applications') +- if not os.path.exists(desktop_database_dir): +- os.makedirs(desktop_database_dir) +- subprocess.call(['update-desktop-database', '-q', desktop_database_dir]) +- + print('Compiling GSettings schemas...') + schemas_dir = os.path.join(datadir, 'glib-2.0', 'schemas') + if not os.path.exists(schemas_dir): diff --git a/pkgs/desktops/gnome-3/core/gnome-screenshot/src.nix b/pkgs/desktops/gnome-3/core/gnome-screenshot/src.nix index 3668417d280..72b1e662545 100644 --- a/pkgs/desktops/gnome-3/core/gnome-screenshot/src.nix +++ b/pkgs/desktops/gnome-3/core/gnome-screenshot/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "gnome-screenshot-3.22.0"; + name = "gnome-screenshot-3.26.0"; src = fetchurl { - url = mirror://gnome/sources/gnome-screenshot/3.22/gnome-screenshot-3.22.0.tar.xz; - sha256 = "8a05f14b3c7c6cb42f9848ad0332034c7fe5c34a69742910203588fd60b00230"; + url = mirror://gnome/sources/gnome-screenshot/3.26/gnome-screenshot-3.26.0.tar.xz; + sha256 = "1bbc11595d3822f4b92319cdf9ba49dd00f5471b6046c590847dc424a874c8bb"; }; } diff --git a/pkgs/desktops/gnome-3/core/gnome-session/src.nix b/pkgs/desktops/gnome-3/core/gnome-session/src.nix index d323fea7631..bb9dec1efc2 100644 --- a/pkgs/desktops/gnome-3/core/gnome-session/src.nix +++ b/pkgs/desktops/gnome-3/core/gnome-session/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "gnome-session-3.24.1"; + name = "gnome-session-3.26.1"; src = fetchurl { - url = mirror://gnome/sources/gnome-session/3.24/gnome-session-3.24.1.tar.xz; - sha256 = "3b4449238e396b95f9616dfd6f99d8345afaf30c7e3cb6a3549f253d9f966eee"; + url = mirror://gnome/sources/gnome-session/3.26/gnome-session-3.26.1.tar.xz; + sha256 = "d9414b368db982d3837ca106e64019f18e6cdd5b13965bea6c7d02ddf5103708"; }; } diff --git a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/src.nix b/pkgs/desktops/gnome-3/core/gnome-settings-daemon/src.nix index 03c213f2162..1c3fbbfc2ef 100644 --- a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/src.nix +++ b/pkgs/desktops/gnome-3/core/gnome-settings-daemon/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "gnome-settings-daemon-3.24.3"; + name = "gnome-settings-daemon-3.26.2"; src = fetchurl { - url = mirror://gnome/sources/gnome-settings-daemon/3.24/gnome-settings-daemon-3.24.3.tar.xz; - sha256 = "68c46038bc32b7cbe933cc24fa9f1eb96127d9900c07627767ab0a802f948593"; + url = mirror://gnome/sources/gnome-settings-daemon/3.26/gnome-settings-daemon-3.26.2.tar.xz; + sha256 = "5a3d156b35e03fa3c28fddd0321f6726082a711973dee2af686370faae2e75e4"; }; } diff --git a/pkgs/desktops/gnome-3/core/gnome-shell-extensions/src.nix b/pkgs/desktops/gnome-3/core/gnome-shell-extensions/src.nix index cb9bf57ce4a..150a15d0a5f 100644 --- a/pkgs/desktops/gnome-3/core/gnome-shell-extensions/src.nix +++ b/pkgs/desktops/gnome-3/core/gnome-shell-extensions/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "gnome-shell-extensions-3.24.3"; + name = "gnome-shell-extensions-3.26.2"; src = fetchurl { - url = mirror://gnome/sources/gnome-shell-extensions/3.24/gnome-shell-extensions-3.24.3.tar.xz; - sha256 = "3c7defc6512d7ed9f09eb82342d7b6c8f5fe8dcac3f0126ca7e0569feeb50a79"; + url = mirror://gnome/sources/gnome-shell-extensions/3.26/gnome-shell-extensions-3.26.2.tar.xz; + sha256 = "aefda4d810ef5ceb9402e2d620f4bdc1dc40c9cc4f6a51749840f7dd08628ab6"; }; } diff --git a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix index a694da0844d..693560454b1 100644 --- a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix @@ -1,9 +1,10 @@ -{ fetchurl, stdenv, pkgconfig, gnome3, json_glib, libcroco, intltool, libsecret +{ fetchurl, fetchpatch, stdenv, meson, ninja, pkgconfig, gnome3, json_glib, libcroco, gettext, libsecret , python3Packages, libsoup, polkit, clutter, networkmanager, docbook_xsl , docbook_xsl_ns, at_spi2_core -, libstartup_notification, telepathy_glib, telepathy_logger, libXtst, p11_kit, unzip -, sqlite, libgweather, libcanberra_gtk3, librsvg, geoclue2 -, libpulseaudio, libical, libtool, nss, gobjectIntrospection, gstreamer, makeWrapper -, accountsservice, gdk_pixbuf, gdm, upower, ibus, networkmanagerapplet }: +, libstartup_notification, telepathy_glib, telepathy_logger, libXtst, p11_kit, unzip, glibcLocales +, sqlite, libgweather, libcanberra_gtk3, librsvg, geoclue2, perl, docbook_xml_dtd_42 +, libpulseaudio, libical, nss, gobjectIntrospection, gstreamer, wrapGAppsHook +, accountsservice, gdk_pixbuf, gdm, upower, ibus, networkmanagerapplet +, gst_all_1 }: # http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/gnome-base/gnome-shell/gnome-shell-3.10.2.1.ebuild?revision=1.3&view=markup @@ -14,50 +15,55 @@ in stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; # Needed to find /etc/NetworkManager/VPN - configureFlags = [ "--sysconfdir=/etc" ]; + mesonFlags = [ "--sysconfdir=/etc" ]; + LANG = "en_US.UTF-8"; + + nativeBuildInputs = [ meson ninja gettext docbook_xsl docbook_xsl_ns docbook_xml_dtd_42 perl wrapGAppsHook glibcLocales ]; buildInputs = with gnome3; [ gsettings_desktop_schemas gnome_keyring gnome-menus glib gcr json_glib accountsservice - libcroco intltool libsecret pkgconfig libsoup polkit libcanberra_gtk2 gdk_pixbuf + libcroco libsecret pkgconfig libsoup polkit gdk_pixbuf (librsvg.override { enableIntrospection = true; }) - clutter networkmanager libstartup_notification telepathy_glib docbook_xsl docbook_xsl_ns + clutter networkmanager libstartup_notification telepathy_glib libXtst p11_kit networkmanagerapplet gjs mutter libpulseaudio caribou evolution_data_server - libical libtool nss gtk gstreamer makeWrapper gdm + libical nss gtk gstreamer gdm libcanberra_gtk3 gnome_control_center geoclue2 defaultIconTheme sqlite gnome3.gnome-bluetooth libgweather # not declared at build time, but typelib is needed at runtime gnome3.gnome-clocks # schemas needed at_spi2_core upower ibus gnome_desktop telepathy_logger gnome3.gnome_settings_daemon + gst_all_1.gst-plugins-good # recording gobjectIntrospection (stdenv.lib.getLib dconf) ]; - - installFlags = [ "keysdir=$(out)/share/gnome-control-center/keybindings" ]; - - preBuild = '' + propagatedUserEnvPkgs = [ + # Needed to support on-screen keyboard used with touch screen devices + # see https://github.com/NixOS/nixpkgs/issues/25968 + gnome3.caribou + ]; + + patches = [ + (fetchpatch { + name = "0001-build-Add-missing-dependency-to-run-js-test.patch"; + url = https://bug787864.bugzilla-attachments.gnome.org/attachment.cgi?id=360016; + sha256 = "1dmahd8ysbzh33rxglba0fbq127aw9h14cl2a2bw9913vjxhxijm"; + }) + ./fix-paths.patch + ]; + + postPatch = '' patchShebangs src/data-to-c.pl - substituteInPlace data/Makefile --replace " install-keysDATA" "" substituteInPlace src/gnome-shell-extension-tool.in --replace "@PYTHON@" "${pythonEnv}/bin/python" substituteInPlace src/gnome-shell-perf-tool.in --replace "@PYTHON@" "${pythonEnv}/bin/python" + substituteInPlace js/ui/extensionDownloader.js --replace "unzip" "${unzip}/bin/unzip" ''; + postInstall = '' + glib-compile-schemas $out/share/glib-2.0/schemas + ''; - preFixup = with gnome3; '' - wrapProgram "$out/bin/gnome-shell" \ - --prefix PATH : "${unzip}/bin" \ - --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ - --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib dconf}/lib/gio/modules" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS" \ - --suffix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" - - wrapProgram "$out/bin/gnome-shell-extension-prefs" \ - --prefix XDG_DATA_DIRS : "$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - - wrapProgram "$out/libexec/gnome-shell-calendar-server" \ - --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib dconf}/lib/gio/modules" \ - --prefix XDG_DATA_DIRS : "${evolution_data_server}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - - echo "${unzip}/bin" > $out/${passthru.mozillaPlugin}/extra-bin-path + postFixup = '' + # Patched meson does not add internal libraries to rpath + patchelf --set-rpath "$out/lib/gnome-shell:$(patchelf --print-rpath $out/bin/.gnome-shell-wrapped)" $out/bin/.gnome-shell-wrapped ''; enableParallelBuilding = true; diff --git a/pkgs/desktops/gnome-3/core/gnome-shell/fix-paths.patch b/pkgs/desktops/gnome-3/core/gnome-shell/fix-paths.patch new file mode 100644 index 00000000000..b24049f9b9f --- /dev/null +++ b/pkgs/desktops/gnome-3/core/gnome-shell/fix-paths.patch @@ -0,0 +1,18 @@ +diff --git a/meson.build b/meson.build +index 4c1f5c63b..a9edb8795 100644 +--- a/meson.build ++++ b/meson.build +@@ -59,12 +59,7 @@ servicedir = join_paths(datadir, 'dbus-1', 'services') + + plugindir = get_variable('BROWSER_PLUGIN_DIR', mozplugindir) + +-keybindings_dep = dependency('gnome-keybindings', required: false) +-if keybindings_dep.found() +- keysdir = keybindings_dep.get_pkgconfig_variable('keysdir') +-else +- keysdir = join_paths(datadir, 'gnome-control-center', 'keybindings') +-endif ++keysdir = join_paths(datadir, 'gnome-control-center', 'keybindings') + + atk_bridge_dep = dependency('atk-bridge-2.0') + canberra_dep = dependency('libcanberra') diff --git a/pkgs/desktops/gnome-3/core/gnome-shell/src.nix b/pkgs/desktops/gnome-3/core/gnome-shell/src.nix index 7cb2bd89221..83cdd0682fd 100644 --- a/pkgs/desktops/gnome-3/core/gnome-shell/src.nix +++ b/pkgs/desktops/gnome-3/core/gnome-shell/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "gnome-shell-3.24.3"; + name = "gnome-shell-3.26.2"; src = fetchurl { - url = mirror://gnome/sources/gnome-shell/3.24/gnome-shell-3.24.3.tar.xz; - sha256 = "58b13308aa1b8dcbf1f08d5a052a61f8094ffd3afa2c788c91e1ceeacde840b8"; + url = mirror://gnome/sources/gnome-shell/3.26/gnome-shell-3.26.2.tar.xz; + sha256 = "e5a87f2f838d981db9823352b90b2ce2f40d24d31ed9f062dccfa41b820e0b1c"; }; } diff --git a/pkgs/desktops/gnome-3/core/gnome-software/default.nix b/pkgs/desktops/gnome-3/core/gnome-software/default.nix index 4ca3bd66063..37650ae5a14 100644 --- a/pkgs/desktops/gnome-3/core/gnome-software/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-software/default.nix @@ -1,17 +1,33 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gnome3, wrapGAppsHook, packagekit -, appstream-glib, libsoup, polkit, attr, acl, libyaml, isocodes, gtkspell3 -, json_glib, libsecret, valgrind-light }: +{ stdenv, fetchurl, pkgconfig, meson, ninja, gettext, gnome3, wrapGAppsHook, packagekit, ostree +, glib, appstream-glib, libsoup, polkit, attr, acl, libyaml, isocodes, gtkspell3, libxslt +, json_glib, libsecret, valgrind-light, docbook_xsl, docbook_xml_dtd_42, gtk_doc, desktop_file_utils }: stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; - nativeBuildInputs = [ pkgconfig intltool wrapGAppsHook ]; - buildInputs = [ gnome3.gtk packagekit appstream-glib libsoup + nativeBuildInputs = [ pkgconfig meson ninja gettext wrapGAppsHook libxslt docbook_xml_dtd_42 + valgrind-light docbook_xsl gtk_doc desktop_file_utils ]; + buildInputs = [ gnome3.gtk glib packagekit appstream-glib libsoup gnome3.gsettings_desktop_schemas gnome3.gnome_desktop - gtkspell3 json_glib libsecret - polkit attr acl libyaml valgrind-light ]; + gtkspell3 json_glib libsecret ostree + polkit attr acl libyaml ]; propagatedBuildInputs = [ isocodes ]; + NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; + + postPatch = '' + patchShebangs meson_post_install.sh + ''; + + mesonFlags = [ + "-Denable-flatpak=false" + "-Denable-rpm=false" + "-Denable-fwupd=false" + "-Denable-oauth=false" + "-Denable-ubuntu-reviews=false" + "-Denable-gudev=false" + ]; + postInstall = '' mkdir -p $out/share/xml/ ln -s ${isocodes}/share/xml/iso-codes $out/share/xml/iso-codes diff --git a/pkgs/desktops/gnome-3/core/gnome-software/src.nix b/pkgs/desktops/gnome-3/core/gnome-software/src.nix index 9d847b3af7d..99c6415e83d 100644 --- a/pkgs/desktops/gnome-3/core/gnome-software/src.nix +++ b/pkgs/desktops/gnome-3/core/gnome-software/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "gnome-software-3.24.3"; + name = "gnome-software-3.26.3"; src = fetchurl { - url = mirror://gnome/sources/gnome-software/3.24/gnome-software-3.24.3.tar.xz; - sha256 = "0dbc8cbf0e46c5ef8c6a34391622d1532cf05c49976b39a8b8ee1fff8d8f75e3"; + url = mirror://gnome/sources/gnome-software/3.26/gnome-software-3.26.3.tar.xz; + sha256 = "2f74fd5fb222c99d4fcb91500cea0c62a0eb8022700bdea51acecb41c63f8e48"; }; } diff --git a/pkgs/desktops/gnome-3/core/gnome-system-monitor/src.nix b/pkgs/desktops/gnome-3/core/gnome-system-monitor/src.nix index aab373b9715..b5d527632ef 100644 --- a/pkgs/desktops/gnome-3/core/gnome-system-monitor/src.nix +++ b/pkgs/desktops/gnome-3/core/gnome-system-monitor/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "gnome-system-monitor-3.24.0"; + name = "gnome-system-monitor-3.26.0"; src = fetchurl { - url = mirror://gnome/sources/gnome-system-monitor/3.24/gnome-system-monitor-3.24.0.tar.xz; - sha256 = "c32b45062411aaef06681e5e28fd2c24ea8b362168bae83992944ec8e02063f4"; + url = mirror://gnome/sources/gnome-system-monitor/3.26/gnome-system-monitor-3.26.0.tar.xz; + sha256 = "f848a8c2ca5e164cf09d3a205dd49e4e4bf4b60d43b0969c10443eb519d0e6b3"; }; } diff --git a/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix b/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix index 073a791ac3c..b28c3a4c45d 100644 --- a/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchurl, pkgconfig, cairo, libxml2, gnome3, pango -, gnome_doc_utils, intltool, libX11, which, libuuid, vala_0_32 +{ stdenv, fetchurl, pkgconfig, libxml2, gnome3 +, gnome_doc_utils, intltool, which, libuuid, vala , desktop_file_utils, itstool, wrapGAppsHook, appdata-tools }: stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; buildInputs = [ gnome3.gtk gnome3.gsettings_desktop_schemas gnome3.vte appdata-tools - gnome3.dconf itstool gnome3.nautilus vala_0_32 ]; + gnome3.dconf itstool gnome3.nautilus ]; nativeBuildInputs = [ pkgconfig intltool gnome_doc_utils which libuuid libxml2 - desktop_file_utils wrapGAppsHook ]; + vala desktop_file_utils wrapGAppsHook ]; # Silly ./configure, it looks for dbus file from gnome-shell in the # installation tree of the package it is configuring. diff --git a/pkgs/desktops/gnome-3/core/gnome-terminal/src.nix b/pkgs/desktops/gnome-3/core/gnome-terminal/src.nix index 2aa084cc493..a6072ba7ca5 100644 --- a/pkgs/desktops/gnome-3/core/gnome-terminal/src.nix +++ b/pkgs/desktops/gnome-3/core/gnome-terminal/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "gnome-terminal-3.24.2"; + name = "gnome-terminal-3.26.2"; src = fetchurl { - url = mirror://gnome/sources/gnome-terminal/3.24/gnome-terminal-3.24.2.tar.xz; - sha256 = "281edac30a07ca45beaaaf0a13fe2219cf8b87ece5e55dccbfc49ef769dfec0f"; + url = mirror://gnome/sources/gnome-terminal/3.26/gnome-terminal-3.26.2.tar.xz; + sha256 = "3a9ba414a814569476515275ad303d8056f296b2669234447712559aa97005b0"; }; } diff --git a/pkgs/desktops/gnome-3/core/gnome-user-docs/src.nix b/pkgs/desktops/gnome-3/core/gnome-user-docs/src.nix index f617d41ff30..e4c5f8fd095 100644 --- a/pkgs/desktops/gnome-3/core/gnome-user-docs/src.nix +++ b/pkgs/desktops/gnome-3/core/gnome-user-docs/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "gnome-user-docs-3.24.2"; + name = "gnome-user-docs-3.26.2"; src = fetchurl { - url = mirror://gnome/sources/gnome-user-docs/3.24/gnome-user-docs-3.24.2.tar.xz; - sha256 = "c1c53059c892bf9f78c7a934ab3a05ece35e2dacd828272e74a77a4f5975e65f"; + url = mirror://gnome/sources/gnome-user-docs/3.26/gnome-user-docs-3.26.2.tar.xz; + sha256 = "e7d7f0434624ef6f21803c798d8672331f065485bdf59d44ac5b6b5f14fa1b78"; }; } diff --git a/pkgs/desktops/gnome-3/core/gsettings-desktop-schemas/default.nix b/pkgs/desktops/gnome-3/core/gsettings-desktop-schemas/default.nix index 5123cadbdaf..977dd7ffd6f 100644 --- a/pkgs/desktops/gnome-3/core/gsettings-desktop-schemas/default.nix +++ b/pkgs/desktops/gnome-3/core/gsettings-desktop-schemas/default.nix @@ -5,11 +5,15 @@ stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; - postPatch = '' - for file in "background" "screensaver"; do - substituteInPlace "schemas/org.gnome.desktop.$file.gschema.xml.in" \ - --replace "@datadir@" "${gnome3.gnome-backgrounds}/share/" - done + preInstall = '' + mkdir -p $out/share/gsettings-schemas/${name}/glib-2.0/schemas + cat - > $out/share/gsettings-schemas/${name}/glib-2.0/schemas/remove-backgrounds.gschema.override <<- EOF + [org.gnome.desktop.background] + picture-uri=''' + + [org.gnome.desktop.screensaver] + picture-uri=''' + EOF ''; buildInputs = [ glib gobjectIntrospection ]; diff --git a/pkgs/desktops/gnome-3/core/gsound/default.nix b/pkgs/desktops/gnome-3/core/gsound/default.nix index 8e72b7fb233..7b934db85fd 100644 --- a/pkgs/desktops/gnome-3/core/gsound/default.nix +++ b/pkgs/desktops/gnome-3/core/gsound/default.nix @@ -3,15 +3,15 @@ let majVer = "1.0"; in stdenv.mkDerivation rec { - name = "gsound-${majVer}.1"; + name = "gsound-${majVer}.2"; src = fetchurl { url = "mirror://gnome/sources/gsound/${majVer}/${name}.tar.xz"; - sha256 = "ea0dd94429c0645f2f98824274ef04543fe459dd83a5449a68910acc3ba67f29"; + sha256 = "bba8ff30eea815037e53bee727bbd5f0b6a2e74d452a7711b819a7c444e78e53"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ glib libcanberra_gtk2 gobjectIntrospection libtool ]; + nativeBuildInputs = [ pkgconfig gobjectIntrospection libtool gnome3.vala ]; + buildInputs = [ glib libcanberra_gtk2 ]; meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Projects/GSound; diff --git a/pkgs/desktops/gnome-3/core/libgee/default.nix b/pkgs/desktops/gnome-3/core/libgee/default.nix index 04d9098764f..aaf104532eb 100644 --- a/pkgs/desktops/gnome-3/core/libgee/default.nix +++ b/pkgs/desktops/gnome-3/core/libgee/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { patches = [ ./fix_introspection_paths.patch ]; - nativeBuildInputs = [ pkgconfig autoconf vala pkgconfig gobjectIntrospection ]; + nativeBuildInputs = [ pkgconfig autoconf vala gobjectIntrospection ]; buildInputs = [ glib ]; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/core/libgepub/default.nix b/pkgs/desktops/gnome-3/core/libgepub/default.nix index 56159500228..f1e13e10fd9 100644 --- a/pkgs/desktops/gnome-3/core/libgepub/default.nix +++ b/pkgs/desktops/gnome-3/core/libgepub/default.nix @@ -1,19 +1,20 @@ -{ stdenv, fetchurl, autoconf, pkgconfig, glib, gobjectIntrospection, gnome3 +{ stdenv, fetchurl, meson, ninja, pkgconfig, glib, gobjectIntrospection, gnome3 , webkitgtk, libsoup, libxml2, libarchive }: stdenv.mkDerivation rec { - name = "libgepub-${version}"; - version = "0.4"; + name = "libgepub-${version}.2"; + version = "0.5"; src = fetchurl { url = "mirror://gnome/sources/libgepub/${version}/${name}.tar.xz"; - sha256 = "5666a1c4d186d205bd2d91b71d4c1cd5426025569114a765dd913a564f149ff4"; + sha256 = "0f1bczy3b00kj7mhm80xgpcgibh8h0pgcr46l4wifi45jacji0w4"; }; doCheck = true; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ autoconf glib gobjectIntrospection webkitgtk libsoup - libxml2 libarchive ]; + checkPhase = "meson test"; + + nativeBuildInputs = [ meson ninja pkgconfig gobjectIntrospection ]; + buildInputs = [ glib webkitgtk libsoup libxml2 libarchive ]; meta = with stdenv.lib; { description = "GObject based library for handling and rendering epub documents"; diff --git a/pkgs/desktops/gnome-3/core/libgnomekbd/src.nix b/pkgs/desktops/gnome-3/core/libgnomekbd/src.nix index 02fa2716987..431006daf4f 100644 --- a/pkgs/desktops/gnome-3/core/libgnomekbd/src.nix +++ b/pkgs/desktops/gnome-3/core/libgnomekbd/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "libgnomekbd-3.22.0.1"; + name = "libgnomekbd-3.26.0"; src = fetchurl { - url = mirror://gnome/sources/libgnomekbd/3.22/libgnomekbd-3.22.0.1.tar.xz; - sha256 = "4efdb6b8ec92f04caced710b5edb285fb27715059ed6ca5e100b6933999a93de"; + url = mirror://gnome/sources/libgnomekbd/3.26/libgnomekbd-3.26.0.tar.xz; + sha256 = "ea3b418c57c30615f7ee5b6f718def7c9d09ce34637324361150744258968875"; }; } diff --git a/pkgs/desktops/gnome-3/core/libgweather/default.nix b/pkgs/desktops/gnome-3/core/libgweather/default.nix index 9dbed05523c..01b3c9bc093 100644 --- a/pkgs/desktops/gnome-3/core/libgweather/default.nix +++ b/pkgs/desktops/gnome-3/core/libgweather/default.nix @@ -4,9 +4,14 @@ stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; - configureFlags = [ "--with-zoneinfo-dir=${tzdata}/share/zoneinfo" ]; + configureFlags = [ "--with-zoneinfo-dir=${tzdata}/share/zoneinfo" "--enable-vala" ]; propagatedBuildInputs = [ libxml2 gtk libsoup gconf pango gdk_pixbuf atk gnome3.geocode_glib ]; - nativeBuildInputs = [ pkgconfig intltool ]; + nativeBuildInputs = [ pkgconfig intltool gnome3.vala ]; + + # Prevent building vapi into ${vala} derivation directory + prePatch = '' + substituteInPlace libgweather/Makefile.in --replace "\$(DESTDIR)\$(vapidir)" "\$(DESTDIR)\$(girdir)/../vala/vapi" + ''; meta = with stdenv.lib; { platforms = platforms.linux; diff --git a/pkgs/desktops/gnome-3/core/libgweather/src.nix b/pkgs/desktops/gnome-3/core/libgweather/src.nix index 6324a27b612..f2cb4c310af 100644 --- a/pkgs/desktops/gnome-3/core/libgweather/src.nix +++ b/pkgs/desktops/gnome-3/core/libgweather/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "libgweather-3.24.1"; + name = "libgweather-3.26.0"; src = fetchurl { - url = mirror://gnome/sources/libgweather/3.24/libgweather-3.24.1.tar.xz; - sha256 = "1227316037b63dac4153031a22abccb3d2ac679a7409e29cd303eec499eb653c"; + url = mirror://gnome/sources/libgweather/3.26/libgweather-3.26.0.tar.xz; + sha256 = "5b84badc0b3ecffff5db1bb9a7cc4dd4e400a8eb3f1282348f8ee6ba33626b6e"; }; } diff --git a/pkgs/desktops/gnome-3/core/mutter/default.nix b/pkgs/desktops/gnome-3/core/mutter/default.nix index 208b8b75648..be4a5e1087a 100644 --- a/pkgs/desktops/gnome-3/core/mutter/default.nix +++ b/pkgs/desktops/gnome-3/core/mutter/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, fetchpatch, stdenv, pkgconfig, gnome3, intltool, gobjectIntrospection, upower, cairo +{ fetchurl, stdenv, pkgconfig, gnome3, intltool, gobjectIntrospection, upower, cairo , pango, cogl, clutter, libstartup_notification, libcanberra_gtk2, zenity, libcanberra_gtk3 , libtool, makeWrapper, xkeyboard_config, libxkbfile, libxkbcommon, libXtst, libudev, libinput , libgudev, libwacom, xwayland, autoreconfHook }: @@ -35,15 +35,6 @@ stdenv.mkDerivation rec { libcanberra_gtk3 zenity xkeyboard_config libxkbfile libxkbcommon ]; - patches = [ - # https://bugzilla.gnome.org/show_bug.cgi?id=760670 - (fetchpatch { - name = "libgudev-232.patch"; - url = https://bugzilla.gnome.org/attachment.cgi?id=358904; - sha256 = "0chvd7g9f2zp3a0gdhvinsfvp2h10rwb6a8ja386vsrl93ac8pix"; - }) - ]; - preFixup = '' wrapProgram "$out/bin/mutter" \ --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" diff --git a/pkgs/desktops/gnome-3/core/mutter/src.nix b/pkgs/desktops/gnome-3/core/mutter/src.nix index 579ee0689e8..b3d0841a2e5 100644 --- a/pkgs/desktops/gnome-3/core/mutter/src.nix +++ b/pkgs/desktops/gnome-3/core/mutter/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "mutter-3.24.4"; + name = "mutter-3.26.2"; src = fetchurl { - url = mirror://gnome/sources/mutter/3.24/mutter-3.24.4.tar.xz; - sha256 = "7300b3fbf1bd0f7fe25e4869dd37134f2127bb6d9b8aa3aadd0eaf3c8bbf9aea"; + url = mirror://gnome/sources/mutter/3.26/mutter-3.26.2.tar.xz; + sha256 = "83309feb05a4635c47713665c0592af8ab6d7f17a36e4bd626d67609b6422fab"; }; } diff --git a/pkgs/desktops/gnome-3/core/nautilus/default.nix b/pkgs/desktops/gnome-3/core/nautilus/default.nix index f987df46034..0a7cd139d2c 100644 --- a/pkgs/desktops/gnome-3/core/nautilus/default.nix +++ b/pkgs/desktops/gnome-3/core/nautilus/default.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchurl, pkgconfig, libxml2, dbus_glib, shared_mime_info, libexif -, gtk, gnome3, libunique, intltool, gobjectIntrospection, gnome-autoar, glib -, libnotify, wrapGAppsHook, exempi, librsvg, tracker, libselinux, gdk_pixbuf }: +{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, libxml2, desktop_file_utils, wrapGAppsHook +, gtk, gnome3, gnome-autoar, glib, dbus_glib, shared_mime_info, libnotify, libexif +, exempi, librsvg, tracker, tracker-miners, libselinux, gdk_pixbuf }: stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; - nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; + nativeBuildInputs = [ meson ninja pkgconfig libxml2 gettext wrapGAppsHook desktop_file_utils ]; - buildInputs = [ libxml2 dbus_glib shared_mime_info libexif gtk libunique intltool exempi librsvg - gnome3.gnome_desktop gnome3.adwaita-icon-theme - gnome3.gsettings_desktop_schemas gnome3.dconf libnotify tracker libselinux ]; + buildInputs = [ dbus_glib shared_mime_info libexif gtk exempi libnotify libselinux + tracker tracker-miners gnome3.gnome_desktop gnome3.adwaita-icon-theme + gnome3.gsettings_desktop_schemas ]; propagatedBuildInputs = [ gnome-autoar ]; @@ -27,6 +27,10 @@ stdenv.mkDerivation rec { # hardeningDisable = [ "format" ]; enableParallelBuilding = true; + postPatch = '' + patchShebangs build-aux/meson/postinstall.py + ''; + patches = [ ./extension_dir.patch ]; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/core/nautilus/src.nix b/pkgs/desktops/gnome-3/core/nautilus/src.nix index 37c81a54a31..1cc14391e39 100644 --- a/pkgs/desktops/gnome-3/core/nautilus/src.nix +++ b/pkgs/desktops/gnome-3/core/nautilus/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "nautilus-3.24.2.1"; + name = "nautilus-3.26.2"; src = fetchurl { - url = mirror://gnome/sources/nautilus/3.24/nautilus-3.24.2.1.tar.xz; - sha256 = "357d9d051fcc2c385ce9b3beb2db2ea1874b7cdf507ca10274a063023e1a61b3"; + url = mirror://gnome/sources/nautilus/3.26/nautilus-3.26.2.tar.xz; + sha256 = "79c99404c665ea76b3db86f261fbd28a62b54c51429b05c3314462c9de2614b4"; }; } diff --git a/pkgs/desktops/gnome-3/core/simple-scan/default.nix b/pkgs/desktops/gnome-3/core/simple-scan/default.nix index 0b453d5c533..27a1e4b0be5 100644 --- a/pkgs/desktops/gnome-3/core/simple-scan/default.nix +++ b/pkgs/desktops/gnome-3/core/simple-scan/default.nix @@ -1,24 +1,20 @@ -{ stdenv, fetchurl, cairo, colord, glib, gtk3, gusb, intltool, itstool -, libusb1, libxml2, pkgconfig, sane-backends, vala_0_32, wrapGAppsHook -, gnome3 }: +{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, itstool, wrapGAppsHook +, cairo, gdk_pixbuf, colord, glib, gtk, gusb, packagekit, libwebp +, libxml2, sane-backends, vala, gnome3 }: stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; - buildInputs = [ cairo colord glib gnome3.defaultIconTheme gusb gtk3 libusb1 libxml2 sane-backends vala_0_32 ]; - nativeBuildInputs = [ intltool itstool pkgconfig wrapGAppsHook ]; + buildInputs = [ cairo gdk_pixbuf colord glib gnome3.defaultIconTheme gusb + gtk libwebp packagekit sane-backends vala ]; + nativeBuildInputs = [ meson ninja gettext itstool pkgconfig wrapGAppsHook libxml2 ]; - configureFlags = [ "--disable-packagekit" ]; + postPatch = '' + patchShebangs data/meson_compile_gschema.py - patchPhase = '' sed -i -e 's#Icon=scanner#Icon=simple-scan#g' ./data/simple-scan.desktop.in ''; - preBuild = '' - # Clean up stale .c files referencing packagekit headers as of 3.20.0: - make clean - ''; - postInstall = '' mkdir -p $out/share/icons mv $out/share/simple-scan/icons/* $out/share/icons/ @@ -39,6 +35,8 @@ stdenv.mkDerivation rec { doCheck = true; + checkPhase = "meson test"; + meta = with stdenv.lib; { description = "Simple scanning utility"; longDescription = '' diff --git a/pkgs/desktops/gnome-3/core/simple-scan/src.nix b/pkgs/desktops/gnome-3/core/simple-scan/src.nix index cea148891a7..fb430db7d84 100644 --- a/pkgs/desktops/gnome-3/core/simple-scan/src.nix +++ b/pkgs/desktops/gnome-3/core/simple-scan/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "simple-scan-3.22.0.1"; + name = "simple-scan-3.26.2"; src = fetchurl { - url = mirror://gnome/sources/simple-scan/3.22/simple-scan-3.22.0.1.tar.xz; - sha256 = "c505b6e63379c9256fbeaa4def3e595fd063d46a8a852ed90218d336291d2b50"; + url = mirror://gnome/sources/simple-scan/3.26/simple-scan-3.26.2.tar.xz; + sha256 = "d172825b1b77e2e32c21fc847fd670c4711a504b09688f8567a98ac9516fe212"; }; } diff --git a/pkgs/desktops/gnome-3/core/totem-pl-parser/default.nix b/pkgs/desktops/gnome-3/core/totem-pl-parser/default.nix index 56fef312927..c763621564c 100644 --- a/pkgs/desktops/gnome-3/core/totem-pl-parser/default.nix +++ b/pkgs/desktops/gnome-3/core/totem-pl-parser/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchurl, pkgconfig, file, intltool, gmime, libxml2, libsoup, gnome3 }: +{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, gmime, libxml2, libsoup, gnome3 }: stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; - nativeBuildInputs = [ pkgconfig file intltool ]; + nativeBuildInputs = [ meson ninja pkgconfig gettext ]; buildInputs = [ gmime libxml2 libsoup ]; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/core/totem-pl-parser/src.nix b/pkgs/desktops/gnome-3/core/totem-pl-parser/src.nix index 8e352ccfb4c..58e2ad07532 100644 --- a/pkgs/desktops/gnome-3/core/totem-pl-parser/src.nix +++ b/pkgs/desktops/gnome-3/core/totem-pl-parser/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "totem-pl-parser-3.10.2"; + name = "totem-pl-parser-3.26.0"; src = fetchurl { - url = mirror://gnome/sources/totem-pl-parser/3.10/totem-pl-parser-3.10.2.tar.xz; - sha256 = "38be09bddc46ddecd2b5ed7c82144ef52aafe879a5ec3d8b192b4b64ba995469"; + url = mirror://gnome/sources/totem-pl-parser/3.26/totem-pl-parser-3.26.0.tar.xz; + sha256 = "1jzvq7s6qdsdpbc58jpcwvyj7qsq58r65kmnbknjzd79j4rsalzi"; }; } diff --git a/pkgs/desktops/gnome-3/core/totem/default.nix b/pkgs/desktops/gnome-3/core/totem/default.nix index 34ec9b58116..b66405cf051 100644 --- a/pkgs/desktops/gnome-3/core/totem/default.nix +++ b/pkgs/desktops/gnome-3/core/totem/default.nix @@ -1,8 +1,8 @@ -{ stdenv, intltool, fetchurl, gst_all_1 +{ stdenv, fetchurl, meson, ninja, intltool, gst_all_1, clutter , clutter_gtk, clutter-gst, python3Packages, shared_mime_info , pkgconfig, gtk3, glib, gobjectIntrospection -, bash, wrapGAppsHook, itstool, libxml2, dbus_glib -, gnome3, librsvg, gdk_pixbuf, file, tracker, nautilus }: +, bash, wrapGAppsHook, itstool, libxml2, dbus_glib, vala, gnome3, librsvg +, gdk_pixbuf, file, tracker, nautilus }: stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; @@ -15,18 +15,31 @@ stdenv.mkDerivation rec { propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gtk3 glib intltool itstool libxml2 gnome3.grilo - clutter_gtk clutter-gst gnome3.totem-pl-parser gnome3.grilo-plugins - gst_all_1.gstreamer gst_all_1.gst-plugins-base - gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad gst_all_1.gst-plugins-ugly gst_all_1.gst-libav - gnome3.libpeas shared_mime_info dbus_glib - gdk_pixbuf gnome3.defaultIconTheme librsvg gnome3.gnome_desktop - gnome3.gsettings_desktop_schemas wrapGAppsHook file tracker nautilus ]; + nativeBuildInputs = [ meson ninja vala pkgconfig intltool python3Packages.python itstool file wrapGAppsHook ]; + buildInputs = [ gtk3 glib gnome3.grilo clutter_gtk clutter-gst gnome3.totem-pl-parser gnome3.grilo-plugins + gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad + gst_all_1.gst-plugins-ugly gst_all_1.gst-libav gnome3.libpeas shared_mime_info dbus_glib + gdk_pixbuf libxml2 gnome3.defaultIconTheme gnome3.gnome_desktop + gnome3.gsettings_desktop_schemas tracker nautilus ]; propagatedBuildInputs = [ gobjectIntrospection python3Packages.pylint python3Packages.pygobject2 ]; - configureFlags = [ "--with-nautilusdir=$(out)/lib/nautilus/extensions-3.0" ]; + checkPhase = "meson test"; + + patches = [ + (fetchurl { + name = "remove-pycompile.patch"; + url = "https://bug787965.bugzilla-attachments.gnome.org/attachment.cgi?id=360204"; + sha256 = "1iphlazllv42k553jqh3nqrrh5jb63gy3nhj4ipwc9xh4sg2irhi"; + }) + ]; + + postPatch = '' + chmod +x meson_compile_python.py meson_post_install.py # patchShebangs requires executable file + patchShebangs . + ''; + + mesonFlags = [ "-Dwith-nautilusdir=lib/nautilus/extensions-3.0" ]; GI_TYPELIB_PATH = "$out/lib/girepository-1.0"; wrapPrefixVariables = [ "PYTHONPATH" ]; diff --git a/pkgs/desktops/gnome-3/core/totem/src.nix b/pkgs/desktops/gnome-3/core/totem/src.nix index 2067945f99e..e051b13dee8 100644 --- a/pkgs/desktops/gnome-3/core/totem/src.nix +++ b/pkgs/desktops/gnome-3/core/totem/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "totem-3.24.0"; + name = "totem-3.26.0"; src = fetchurl { - url = mirror://gnome/sources/totem/3.24/totem-3.24.0.tar.xz; - sha256 = "9bd78f7b940e886b5c809acdfe00a610a834de5080dd40272b92835528a58d01"; + url = mirror://gnome/sources/totem/3.26/totem-3.26.0.tar.xz; + sha256 = "e32fb9a68097045e75c87ad1b8177f5c01aea2a13dcb3b2e71a0f9570fe9ee13"; }; } diff --git a/pkgs/desktops/gnome-3/core/tracker-miners/default.nix b/pkgs/desktops/gnome-3/core/tracker-miners/default.nix new file mode 100644 index 00000000000..baff249a03a --- /dev/null +++ b/pkgs/desktops/gnome-3/core/tracker-miners/default.nix @@ -0,0 +1,45 @@ +{ stdenv, intltool, fetchurl, libxml2, upower +, pkgconfig, gtk3, glib +, bash, wrapGAppsHook, itstool, vala, sqlite, libxslt +, gnome3, librsvg, gdk_pixbuf, libnotify +, evolution_data_server, gst_all_1, poppler +, icu, taglib, libjpeg, libtiff, giflib, libcue +, libvorbis, flac, exempi, networkmanager +, libpng, libexif, libgsf, libuuid, bzip2 +, libsoup, json_glib, libseccomp +, libiptcdata }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + NIX_CFLAGS_COMPILE = "-I${poppler.dev}/include/poppler"; + + enableParallelBuilding = true; + + nativeBuildInputs = [ vala pkgconfig intltool itstool libxslt wrapGAppsHook ]; + # TODO: add libgrss, libenca + buildInputs = [ + bzip2 evolution_data_server exempi flac giflib glib gnome3.totem-pl-parser + gnome3.tracker gst_all_1.gst-plugins-base gst_all_1.gstreamer icu + json_glib libcue libexif libgsf libiptcdata libjpeg libpng libseccomp libsoup + libtiff libuuid libvorbis libxml2 poppler taglib upower + ]; + + LANG = "en_US.UTF-8"; # for running tests + + doCheck = true; + + postPatch = '' + substituteInPlace src/libtracker-common/tracker-domain-ontology.c --replace \ + 'SHAREDIR, "tracker", "domain-ontologies"' \ + '"${gnome3.tracker}/share", "tracker", "domain-ontologies"' + ''; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Projects/Tracker; + description = "Desktop-neutral user information store, search tool and indexer"; + maintainers = gnome3.maintainers; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/core/tracker-miners/src.nix b/pkgs/desktops/gnome-3/core/tracker-miners/src.nix new file mode 100644 index 00000000000..2b309161fd1 --- /dev/null +++ b/pkgs/desktops/gnome-3/core/tracker-miners/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "tracker-miners-2.0.2"; + + src = fetchurl { + url = mirror://gnome/sources/tracker-miners/2.0/tracker-miners-2.0.2.tar.xz; + sha256 = "cf417ece944c997f630dda41a7f5c449d609fa53dbb34fae7caa4c7af1e0e8ef"; + }; +} diff --git a/pkgs/desktops/gnome-3/core/tracker/default.nix b/pkgs/desktops/gnome-3/core/tracker/default.nix index 0d3e8bd358d..bf3438db338 100644 --- a/pkgs/desktops/gnome-3/core/tracker/default.nix +++ b/pkgs/desktops/gnome-3/core/tracker/default.nix @@ -1,43 +1,23 @@ -{ stdenv, intltool, fetchurl, libxml2, upower -, pkgconfig, gtk3, glib -, bash, wrapGAppsHook, itstool, vala_0_32, sqlite, libxslt -, gnome3, librsvg, gdk_pixbuf, file, libnotify -, evolution_data_server, gst_all_1, poppler -, icu, taglib, libjpeg, libtiff, giflib, libcue -, libvorbis, flac, exempi, networkmanager -, libpng, libexif, libgsf, libuuid, bzip2 -, libsoup, json_glib, libseccomp }: +{ stdenv, fetchurl, fetchpatch, intltool, pkgconfig +, libxml2, upower, glib, wrapGAppsHook, vala, sqlite, libxslt +, gnome3, icu, libuuid, networkmanager, libsoup, json_glib }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - - NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0 -I${poppler.dev}/include/poppler"; - enableParallelBuilding = true; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ vala_0_32 gtk3 glib intltool itstool libxml2 - bzip2 gnome3.totem-pl-parser libxslt - gnome3.gsettings_desktop_schemas wrapGAppsHook - file gdk_pixbuf gnome3.defaultIconTheme librsvg sqlite - upower libnotify evolution_data_server gnome3.libgee - gst_all_1.gstreamer gst_all_1.gst-plugins-base flac - poppler icu taglib libjpeg libtiff giflib libvorbis - exempi networkmanager libpng libexif libgsf libuuid - libsoup json_glib libseccomp - ]; + nativeBuildInputs = [ vala pkgconfig intltool libxslt wrapGAppsHook ]; + # TODO: add libstemmer + buildInputs = [ + glib libxml2 sqlite upower icu networkmanager libsoup libuuid json_glib + ]; - preConfigure = '' - substituteInPlace src/libtracker-sparql/Makefile.in --replace "--shared-library=libtracker-sparql" "--shared-library=$out/lib/libtracker-sparql" - ''; + # TODO: figure out wrapping unit tests, some of them fail on missing gsettings_desktop_schemas + configureFlags = [ "--disable-unit-tests" ]; - preFixup = '' - gappsWrapperArgs+=( - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share" - ) + postPatch = '' + patchShebangs utils/g-ir-merge/g-ir-merge ''; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/core/tracker/src.nix b/pkgs/desktops/gnome-3/core/tracker/src.nix index 7a9b9ce3e38..afec65a4f63 100644 --- a/pkgs/desktops/gnome-3/core/tracker/src.nix +++ b/pkgs/desktops/gnome-3/core/tracker/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "tracker-1.12.3"; + name = "tracker-2.0.1"; src = fetchurl { - url = mirror://gnome/sources/tracker/1.12/tracker-1.12.3.tar.xz; - sha256 = "1mpq418lzba7fad0w0m3bnxvz3khf461b5zya8zmq5n1g0w99ki3"; + url = mirror://gnome/sources/tracker/2.0/tracker-2.0.1.tar.xz; + sha256 = "ac5c9f4dbb0741af5877ae2818d8c053aa9a431477a924a17976bb7e44411e47"; }; } diff --git a/pkgs/desktops/gnome-3/core/vte/default.nix b/pkgs/desktops/gnome-3/core/vte/default.nix index b3962015d3c..251e27334b1 100644 --- a/pkgs/desktops/gnome-3/core/vte/default.nix +++ b/pkgs/desktops/gnome-3/core/vte/default.nix @@ -1,14 +1,13 @@ { stdenv, fetchurl, intltool, pkgconfig -, gnome3, ncurses, gobjectIntrospection, vala_0_32, libxml2, gnutls +, gnome3, ncurses, gobjectIntrospection, vala, libxml2, gnutls , fetchFromGitHub, autoconf, automake, libtool, gtk_doc, gperf, pcre2 }: stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gobjectIntrospection intltool gnome3.glib - gnome3.gtk3 ncurses vala_0_32 libxml2 gperf ]; + nativeBuildInputs = [ gobjectIntrospection intltool pkgconfig vala gperf libxml2 ]; + buildInputs = [ gnome3.glib gnome3.gtk3 ncurses ]; propagatedBuildInputs = [ gnutls pcre2 ]; diff --git a/pkgs/desktops/gnome-3/core/vte/src.nix b/pkgs/desktops/gnome-3/core/vte/src.nix index 45029e8bb8d..c63873767dc 100644 --- a/pkgs/desktops/gnome-3/core/vte/src.nix +++ b/pkgs/desktops/gnome-3/core/vte/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "vte-0.50.1"; + name = "vte-0.50.2"; src = fetchurl { - url = mirror://gnome/sources/vte/0.50/vte-0.50.1.tar.xz; - sha256 = "cf1708e3e573160e1db107014b3ef70888fefe6b668373fed70e8d1cac45a8c2"; + url = mirror://gnome/sources/vte/0.50/vte-0.50.2.tar.xz; + sha256 = "79dd316bfaff48f2fb74d066baae0d830e1f44436796fe410a57297e5c5f09cf"; }; } diff --git a/pkgs/desktops/gnome-3/core/yelp/src.nix b/pkgs/desktops/gnome-3/core/yelp/src.nix index 7f38bab736f..dd06a6bf1eb 100644 --- a/pkgs/desktops/gnome-3/core/yelp/src.nix +++ b/pkgs/desktops/gnome-3/core/yelp/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "yelp-3.22.0"; + name = "yelp-3.26.0"; src = fetchurl { - url = mirror://gnome/sources/yelp/3.22/yelp-3.22.0.tar.xz; - sha256 = "8616b77c239aaa731312609f192c9b2c71d54b2cae42ff23efa23b5b3188778e"; + url = mirror://gnome/sources/yelp/3.26/yelp-3.26.0.tar.xz; + sha256 = "e4cb02ed2f44cfec3c352c957f8a461d9689cbc06eb3b503a58ffe92e1753f1b"; }; } diff --git a/pkgs/desktops/gnome-3/core/zenity/src.nix b/pkgs/desktops/gnome-3/core/zenity/src.nix index cb12262725a..ad0ce2f4d73 100644 --- a/pkgs/desktops/gnome-3/core/zenity/src.nix +++ b/pkgs/desktops/gnome-3/core/zenity/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "zenity-3.24.0"; + name = "zenity-3.26.0"; src = fetchurl { - url = mirror://gnome/sources/zenity/3.24/zenity-3.24.0.tar.xz; - sha256 = "6ff0a026ec94e5bc1b30f78df91e54f4f82fd982f4c29b52fe5dacc886a9f7f7"; + url = mirror://gnome/sources/zenity/3.26/zenity-3.26.0.tar.xz; + sha256 = "6a7f34626dd62b751fe22bcdb32f3558f8a8fdddcc9406893dd264f0ac18e830"; }; } diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix index 585f79ddea6..e0a4c2ed4e4 100644 --- a/pkgs/desktops/gnome-3/default.nix +++ b/pkgs/desktops/gnome-3/default.nix @@ -13,8 +13,8 @@ let callPackage = pkgs.newScope self; - version = "3.24"; - maintainers = with pkgs.lib.maintainers; [ lethalman ]; + version = "3.26"; + maintainers = with pkgs.lib.maintainers; [ lethalman jtojnar ]; corePackages = with gnome3; [ pkgs.desktop_file_utils pkgs.ibus @@ -54,7 +54,7 @@ let gnome3 = self // { recurseForDerivations = false; }; gtk = gtk3; gtkmm = gtkmm3; - vala = pkgs.vala_0_32; + vala = pkgs.vala_0_38; gegl_0_3 = pkgs.gegl_0_3.override { inherit gtk; }; # Simplify the nixos module and gnome packages @@ -237,7 +237,9 @@ let totem-pl-parser = callPackage ./core/totem-pl-parser { }; - tracker = callPackage ./core/tracker { giflib = pkgs.giflib_5_0; }; + tracker = callPackage ./core/tracker { }; + + tracker-miners = callPackage ./core/tracker-miners { }; vte = callPackage ./core/vte { }; diff --git a/pkgs/desktops/gnome-3/devtools/anjuta/src.nix b/pkgs/desktops/gnome-3/devtools/anjuta/src.nix index bbb7696d91c..32843b14d8e 100644 --- a/pkgs/desktops/gnome-3/devtools/anjuta/src.nix +++ b/pkgs/desktops/gnome-3/devtools/anjuta/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "anjuta-3.22.0"; + name = "anjuta-3.26.0"; src = fetchurl { - url = mirror://gnome/sources/anjuta/3.22/anjuta-3.22.0.tar.xz; - sha256 = "4face1c063a5a6687a6cfc6f1f700ba15f13664633c05caa2fbf50317608dd03"; + url = mirror://gnome/sources/anjuta/3.26/anjuta-3.26.0.tar.xz; + sha256 = "fb895464c1a3c915bb2bb3ea5d236fd17202caa7205f6792f70a75affc343d70"; }; } diff --git a/pkgs/desktops/gnome-3/devtools/devhelp/src.nix b/pkgs/desktops/gnome-3/devtools/devhelp/src.nix index b13de444c7e..b90fc03e18d 100644 --- a/pkgs/desktops/gnome-3/devtools/devhelp/src.nix +++ b/pkgs/desktops/gnome-3/devtools/devhelp/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "devhelp-3.24.0"; + name = "devhelp-3.26.0"; src = fetchurl { - url = mirror://gnome/sources/devhelp/3.24/devhelp-3.24.0.tar.xz; - sha256 = "4858de1c815532ad160d1bf9facd28859972e3a052908a8edf73f866c8cce430"; + url = mirror://gnome/sources/devhelp/3.26/devhelp-3.26.0.tar.xz; + sha256 = "6bf2714f7f953b5858c643585383c4e4c8e9c65055527505abbf24fbf1ac8e38"; }; } diff --git a/pkgs/desktops/gnome-3/devtools/gdl/src.nix b/pkgs/desktops/gnome-3/devtools/gdl/src.nix index c8b65884e08..6475b36508c 100644 --- a/pkgs/desktops/gnome-3/devtools/gdl/src.nix +++ b/pkgs/desktops/gnome-3/devtools/gdl/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "gdl-3.22.0"; + name = "gdl-3.26.0"; src = fetchurl { - url = mirror://gnome/sources/gdl/3.22/gdl-3.22.0.tar.xz; - sha256 = "cc5b360e1392292186924f0f9a8efc0f4db7e6e56dc7042037466b5cc839660c"; + url = mirror://gnome/sources/gdl/3.26/gdl-3.26.0.tar.xz; + sha256 = "f3ad03f9a34f751f52464e22d962c0dec8ff867b7b7b37fe24907f3dcd54c079"; }; } diff --git a/pkgs/desktops/gnome-3/devtools/gnome-devel-docs/src.nix b/pkgs/desktops/gnome-3/devtools/gnome-devel-docs/src.nix index 7f39aabda02..4838b8f9d09 100644 --- a/pkgs/desktops/gnome-3/devtools/gnome-devel-docs/src.nix +++ b/pkgs/desktops/gnome-3/devtools/gnome-devel-docs/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "gnome-devel-docs-3.22.0"; + name = "gnome-devel-docs-3.26.0"; src = fetchurl { - url = mirror://gnome/sources/gnome-devel-docs/3.22/gnome-devel-docs-3.22.0.tar.xz; - sha256 = "e0778c62670b1c19d45191ac5503568cbd09500e9e30015b48c19e95959e6d85"; + url = mirror://gnome/sources/gnome-devel-docs/3.26/gnome-devel-docs-3.26.0.tar.xz; + sha256 = "12eea77b550acfa617e14a89e4d24f93881294340abcc2c3abc7092c851703c3"; }; } diff --git a/pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix b/pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix index 4d788e909e2..5265eab1cbc 100644 --- a/pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix +++ b/pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "gnome-shell-dash-to-dock-${version}"; - version = "v60"; + version = "v61"; src = fetchFromGitHub { owner = "micheleg"; repo = "dash-to-dock"; rev = "extensions.gnome.org-" + version; - sha256 = "0w9km1zcxcskrsfr392zx945k227qajnw09pxc20d1vwv78wlgy3"; + sha256 = "152xzhal3wr40j0pv03v0gg20054n5hqqy3s10bkj2a0x830pgjk"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome-3/extensions/topicons-plus/default.nix b/pkgs/desktops/gnome-3/extensions/topicons-plus/default.nix index 4aedc10e056..84a9d26c2d7 100644 --- a/pkgs/desktops/gnome-3/extensions/topicons-plus/default.nix +++ b/pkgs/desktops/gnome-3/extensions/topicons-plus/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "gnome-shell-extension-topicons-plus-${version}"; - version = "20"; + version = "21"; src = fetchFromGitHub { owner = "phocean"; repo = "TopIcons-plus"; - rev = "01535328bd43ecb3f2c71376de6fc8d1d8a88577"; - sha256 = "0pwpg72ihgj2jl9pg63y0hibdsl27srr3mab881w0gh17vwyixzi"; + rev = "v${version}"; + sha256 = "15p61krd7lcmgr1d4s2ydfjy3pyq79pq5100xzy6dln1538901m3"; }; buildInputs = [ glib ]; diff --git a/pkgs/desktops/gnome-3/games/five-or-more/src.nix b/pkgs/desktops/gnome-3/games/five-or-more/src.nix index 597db69a5dc..676e1a7d75a 100644 --- a/pkgs/desktops/gnome-3/games/five-or-more/src.nix +++ b/pkgs/desktops/gnome-3/games/five-or-more/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "five-or-more-3.22.0"; + name = "five-or-more-3.26.0"; src = fetchurl { - url = mirror://gnome/sources/five-or-more/3.22/five-or-more-3.22.0.tar.xz; - sha256 = "33c0ba7723144aea496112fa85a1d7e5a2a8ecaa32f4373471470d7c3078da94"; + url = mirror://gnome/sources/five-or-more/3.26/five-or-more-3.26.0.tar.xz; + sha256 = "7c24f7f2603df99299d38b40b14c005aaad88820113ed71e4b3765ac3b027772"; }; } diff --git a/pkgs/desktops/gnome-3/games/gnome-chess/src.nix b/pkgs/desktops/gnome-3/games/gnome-chess/src.nix index 3fb218ab602..ee682d3801b 100644 --- a/pkgs/desktops/gnome-3/games/gnome-chess/src.nix +++ b/pkgs/desktops/gnome-3/games/gnome-chess/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "gnome-chess-3.24.1"; + name = "gnome-chess-3.26.0"; src = fetchurl { - url = mirror://gnome/sources/gnome-chess/3.24/gnome-chess-3.24.1.tar.xz; - sha256 = "6c9647beb7579b0a8de4e73698d931b1d9ac2efab4e7d3649f482d2c68ebf8a3"; + url = mirror://gnome/sources/gnome-chess/3.26/gnome-chess-3.26.0.tar.xz; + sha256 = "a0f6f862ab7067626a3a86cdc9c14dde595e38e6719e0198cb967e11facf1f12"; }; } diff --git a/pkgs/desktops/gnome-3/games/gnome-klotski/src.nix b/pkgs/desktops/gnome-3/games/gnome-klotski/src.nix index 447bc1eff13..e37f3642c82 100644 --- a/pkgs/desktops/gnome-3/games/gnome-klotski/src.nix +++ b/pkgs/desktops/gnome-3/games/gnome-klotski/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "gnome-klotski-3.22.0"; + name = "gnome-klotski-3.22.2"; src = fetchurl { - url = mirror://gnome/sources/gnome-klotski/3.22/gnome-klotski-3.22.0.tar.xz; - sha256 = "25e35369d1b5d2f9e6b92d44568d21df631b5b23dd7b12ca226a04f58cb54700"; + url = mirror://gnome/sources/gnome-klotski/3.22/gnome-klotski-3.22.2.tar.xz; + sha256 = "16hd6yk01rhb4pj8m01fyn72wykf41d72gsms81q0n4zm5bm1a4h"; }; } diff --git a/pkgs/desktops/gnome-3/games/gnome-mines/src.nix b/pkgs/desktops/gnome-3/games/gnome-mines/src.nix index 4b0e85fdef1..39096f00e42 100644 --- a/pkgs/desktops/gnome-3/games/gnome-mines/src.nix +++ b/pkgs/desktops/gnome-3/games/gnome-mines/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "gnome-mines-3.24.0"; + name = "gnome-mines-3.26.0"; src = fetchurl { - url = mirror://gnome/sources/gnome-mines/3.24/gnome-mines-3.24.0.tar.xz; - sha256 = "e663af29235a5c3f03d90f135487f57e5fd9137480dafb0ae9efc0da855602f6"; + url = mirror://gnome/sources/gnome-mines/3.26/gnome-mines-3.26.0.tar.xz; + sha256 = "2b041eaf0d57307498c56d8e285b2e539f634fdba95d689f6af75aa4ed6edde9"; }; } diff --git a/pkgs/desktops/gnome-3/games/gnome-sudoku/src.nix b/pkgs/desktops/gnome-3/games/gnome-sudoku/src.nix index 597196a5ec8..f19142cf251 100644 --- a/pkgs/desktops/gnome-3/games/gnome-sudoku/src.nix +++ b/pkgs/desktops/gnome-3/games/gnome-sudoku/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "gnome-sudoku-3.24.0"; + name = "gnome-sudoku-3.26.0"; src = fetchurl { - url = mirror://gnome/sources/gnome-sudoku/3.24/gnome-sudoku-3.24.0.tar.xz; - sha256 = "04a29447889448ee5d5840cb5b2fd05ce6031c38a24809ce4919647ee6f485d7"; + url = mirror://gnome/sources/gnome-sudoku/3.26/gnome-sudoku-3.26.0.tar.xz; + sha256 = "8774c7093a97131b94d39142f1e044c8619cfdb6ad2546176271589fbb12d3a0"; }; } diff --git a/pkgs/desktops/gnome-3/games/gnome-taquin/src.nix b/pkgs/desktops/gnome-3/games/gnome-taquin/src.nix index 6828e56a911..30a33e28e2d 100644 --- a/pkgs/desktops/gnome-3/games/gnome-taquin/src.nix +++ b/pkgs/desktops/gnome-3/games/gnome-taquin/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "gnome-taquin-3.22.0"; + name = "gnome-taquin-3.26.1"; src = fetchurl { - url = mirror://gnome/sources/gnome-taquin/3.22/gnome-taquin-3.22.0.tar.xz; - sha256 = "780af247856b91095a9a2e1a6b425e4e3a78520659e2157eddb421377e8ce982"; + url = mirror://gnome/sources/gnome-taquin/3.26/gnome-taquin-3.26.1.tar.xz; + sha256 = "de352bb2dfcd759de37f6bccf1e4790760e020b4bb06a1bc8d5f03d89613b6fd"; }; } diff --git a/pkgs/desktops/gnome-3/games/hitori/default.nix b/pkgs/desktops/gnome-3/games/hitori/default.nix index 21d4ed6f520..857aec9700f 100644 --- a/pkgs/desktops/gnome-3/games/hitori/default.nix +++ b/pkgs/desktops/gnome-3/games/hitori/default.nix @@ -2,12 +2,7 @@ , libxml2, intltool, itstool }: stdenv.mkDerivation rec { - name = "hitori-${gnome3.version}.1"; - - src = fetchurl { - url = "mirror://gnome/sources/hitori/${gnome3.version}/${name}.tar.xz"; - sha256 = "07pm3xl05jgb8x151k1j2ap57dmfvk2nkz9dmqnn5iywfigsysd1"; - }; + inherit (import ./src.nix fetchurl) name src; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ diff --git a/pkgs/desktops/gnome-3/games/iagno/src.nix b/pkgs/desktops/gnome-3/games/iagno/src.nix index 6c20a8f7844..86c1f30e5d6 100644 --- a/pkgs/desktops/gnome-3/games/iagno/src.nix +++ b/pkgs/desktops/gnome-3/games/iagno/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "iagno-3.22.0"; + name = "iagno-3.26.1"; src = fetchurl { - url = mirror://gnome/sources/iagno/3.22/iagno-3.22.0.tar.xz; - sha256 = "e7070c55f1f74cd9345388ee120f0e6cc47392868c2601664c26a0fa2672fe13"; + url = mirror://gnome/sources/iagno/3.26/iagno-3.26.1.tar.xz; + sha256 = "3476810d0c42aa1600484de2c111c94e0cf5247a98f071b23a0b5e3036362121"; }; } diff --git a/pkgs/desktops/gnome-3/games/lightsoff/src.nix b/pkgs/desktops/gnome-3/games/lightsoff/src.nix index 2a26df6615b..18528df24a3 100644 --- a/pkgs/desktops/gnome-3/games/lightsoff/src.nix +++ b/pkgs/desktops/gnome-3/games/lightsoff/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "lightsoff-3.24.0"; + name = "lightsoff-3.26.0"; src = fetchurl { - url = mirror://gnome/sources/lightsoff/3.24/lightsoff-3.24.0.tar.xz; - sha256 = "5d1bb7de4b3f5c7814e5599a5171cfdeef74e774a8a6dbd992c893a5af6bd8ce"; + url = mirror://gnome/sources/lightsoff/3.26/lightsoff-3.26.0.tar.xz; + sha256 = "d12572bc7b70481320ec90c6130ad794b559a9990d08bef158a1d826aaa35976"; }; } diff --git a/pkgs/desktops/gnome-3/games/swell-foop/src.nix b/pkgs/desktops/gnome-3/games/swell-foop/src.nix index 7fa5f724de2..082081ca36c 100644 --- a/pkgs/desktops/gnome-3/games/swell-foop/src.nix +++ b/pkgs/desktops/gnome-3/games/swell-foop/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "swell-foop-3.24.0"; + name = "swell-foop-3.26.0"; src = fetchurl { - url = mirror://gnome/sources/swell-foop/3.24/swell-foop-3.24.0.tar.xz; - sha256 = "1b2d444e4d399e300afe07a243423c8b3ab1ca32828c749e0be9af48a5904a11"; + url = mirror://gnome/sources/swell-foop/3.26/swell-foop-3.26.0.tar.xz; + sha256 = "122e2b5a51ad0144ea6b5fd2736ac43b101c7892198948e697bfc4c014bbba22"; }; } diff --git a/pkgs/desktops/gnome-3/misc/gitg/default.nix b/pkgs/desktops/gnome-3/misc/gitg/default.nix index b3646abd6dd..4180cd3b8ea 100644 --- a/pkgs/desktops/gnome-3/misc/gitg/default.nix +++ b/pkgs/desktops/gnome-3/misc/gitg/default.nix @@ -1,11 +1,7 @@ -{ stdenv, fetchurl, fetchgit, vala_0_32, intltool, libgit2, pkgconfig, gtk3, glib -, json_glib, webkitgtk, wrapGAppsHook, libpeas, bash, gobjectIntrospection +{ stdenv, fetchurl, vala, intltool, pkgconfig, gtk3, glib +, json_glib, wrapGAppsHook, libpeas, bash, gobjectIntrospection , gnome3, gtkspell3, shared_mime_info, libgee, libgit2-glib, librsvg, libsecret -, dconf}: - - -# TODO: icons and theme still does not work -# use packaged gnome3.adwaita-icon-theme +, libsoup }: stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; @@ -20,14 +16,11 @@ stdenv.mkDerivation rec { propagatedUserEnvPkgs = [ shared_mime_info gnome3.gnome_themes_standard ]; - buildInputs = [ vala_0_32 libgit2 gtk3 glib json_glib webkitgtk libgee libpeas + buildInputs = [ gtk3 glib json_glib libgee libpeas gnome3.libsoup libgit2-glib gtkspell3 gnome3.gtksourceview gnome3.gsettings_desktop_schemas librsvg libsecret gobjectIntrospection gnome3.adwaita-icon-theme ]; - nativeBuildInputs = [ wrapGAppsHook intltool pkgconfig ]; - - # https://bugzilla.gnome.org/show_bug.cgi?id=758240 - preBuild = ''make -j$NIX_BUILD_CORES Gitg-1.0.gir''; + nativeBuildInputs = [ vala wrapGAppsHook intltool pkgconfig ]; meta = with stdenv.lib; { homepage = https://wiki.gnome.org/action/show/Apps/Gitg; diff --git a/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix b/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix index ee3dd60e59a..cce734b474e 100644 --- a/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix +++ b/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix @@ -1,15 +1,17 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gnome3, libxslt, packagekit -, fontconfig, libcanberra_gtk3, libnotify, wrapGAppsHook, dbus_glib, dbus_libs }: +{ stdenv, fetchurl, pkgconfig, meson, ninja, gettext, gnome3, libxslt, packagekit, polkit +, fontconfig, libcanberra_gtk3, systemd, libnotify, wrapGAppsHook, dbus_glib, dbus_libs, desktop_file_utils }: stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; NIX_CFLAGS_COMPILE = "-I${dbus_glib.dev}/include/dbus-1.0 -I${dbus_libs.dev}/include/dbus-1.0"; - nativeBuildInputs = [ pkgconfig intltool wrapGAppsHook ]; - buildInputs = [ libxslt gnome3.gtk packagekit fontconfig + nativeBuildInputs = [ pkgconfig meson ninja gettext wrapGAppsHook desktop_file_utils ]; + buildInputs = [ libxslt gnome3.gtk packagekit fontconfig systemd polkit libcanberra_gtk3 libnotify dbus_glib dbus_libs ]; + prePatch = "patchShebangs meson_post_install.sh"; + meta = with stdenv.lib; { homepage = https://www.freedesktop.org/software/PackageKit/; platforms = platforms.linux; diff --git a/pkgs/desktops/gnome-3/misc/gnome-packagekit/src.nix b/pkgs/desktops/gnome-3/misc/gnome-packagekit/src.nix index 992badf1f4f..5448eb8a83a 100644 --- a/pkgs/desktops/gnome-3/misc/gnome-packagekit/src.nix +++ b/pkgs/desktops/gnome-3/misc/gnome-packagekit/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "gnome-packagekit-3.24.0"; + name = "gnome-packagekit-3.26.0"; src = fetchurl { - url = mirror://gnome/sources/gnome-packagekit/3.24/gnome-packagekit-3.24.0.tar.xz; - sha256 = "8d038681f6879c93f3f58faaa37c41c7ac8cf53eba6b8cb871f5f683ac0bd13f"; + url = mirror://gnome/sources/gnome-packagekit/3.26/gnome-packagekit-3.26.0.tar.xz; + sha256 = "6a219e16923d3976f424416c944bef06913922da24bc9e6644ec114c2d563417"; }; } diff --git a/pkgs/desktops/gnome-3/misc/gnome-tweak-tool/0001-Search-for-themes-and-icons-in-system-data-dirs.patch b/pkgs/desktops/gnome-3/misc/gnome-tweak-tool/0001-Search-for-themes-and-icons-in-system-data-dirs.patch index d236730282a..23be404ea40 100644 --- a/pkgs/desktops/gnome-3/misc/gnome-tweak-tool/0001-Search-for-themes-and-icons-in-system-data-dirs.patch +++ b/pkgs/desktops/gnome-3/misc/gnome-tweak-tool/0001-Search-for-themes-and-icons-in-system-data-dirs.patch @@ -1,25 +1,24 @@ -From ac9e8e835888da1faa57f07c54fa4e73783621e2 Mon Sep 17 00:00:00 2001 +From f7f7fe6bf36ca08c66192077bf964036eb02ffb5 Mon Sep 17 00:00:00 2001 From: Jascha Geerds <jascha@jgeerds.name> -Date: Sun, 25 Jun 2017 11:32:30 +0100 +Date: Tue, 19 Sep 2017 03:08:07 +0200 Subject: [PATCH 1/3] Search for themes and icons in system data dirs --- - gtweak/tweaks/tweak_group_interface.py | 17 ++++------------- - gtweak/tweaks/tweak_group_keymouse.py | 7 ++----- - gtweak/utils.py | 17 +++++++++++++++++ - 3 files changed, 23 insertions(+), 18 deletions(-) + gtweak/tweaks/tweak_group_appearance.py | 17 ++++------------- + gtweak/utils.py | 17 +++++++++++++++++ + 2 files changed, 21 insertions(+), 13 deletions(-) -diff --git a/gtweak/tweaks/tweak_group_interface.py b/gtweak/tweaks/tweak_group_interface.py -index 97751ed..db89b85 100644 ---- a/gtweak/tweaks/tweak_group_interface.py -+++ b/gtweak/tweaks/tweak_group_interface.py +diff --git a/gtweak/tweaks/tweak_group_appearance.py b/gtweak/tweaks/tweak_group_appearance.py +index ccadefc..0d12194 100644 +--- a/gtweak/tweaks/tweak_group_appearance.py ++++ b/gtweak/tweaks/tweak_group_appearance.py @@ -26,7 +26,7 @@ from gi.repository import Gtk from gi.repository import GLib import gtweak -from gtweak.utils import walk_directories, make_combo_list_with_default, extract_zip_file +from gtweak.utils import walk_directories, make_combo_list_with_default, extract_zip_file, get_resource_dirs - from gtweak.tweakmodel import Tweak, TWEAK_GROUP_APPEARANCE + from gtweak.tweakmodel import Tweak from gtweak.gshellwrapper import GnomeShellFactory from gtweak.gsettings import GSettingsSetting @@ -50,10 +50,7 @@ class GtkThemeSwitcher(GSettingsComboTweak): @@ -58,33 +57,8 @@ index 97751ed..db89b85 100644 os.path.isdir(d) and \ os.path.exists(os.path.join(d, "cursors"))) return valid -diff --git a/gtweak/tweaks/tweak_group_keymouse.py b/gtweak/tweaks/tweak_group_keymouse.py -index 69c4b7e..b06900c 100644 ---- a/gtweak/tweaks/tweak_group_keymouse.py -+++ b/gtweak/tweaks/tweak_group_keymouse.py -@@ -21,7 +21,7 @@ from gi.repository import GLib - - import gtweak - from gtweak.gshellwrapper import GnomeShellFactory --from gtweak.utils import XSettingsOverrides, walk_directories, make_combo_list_with_default -+from gtweak.utils import XSettingsOverrides, walk_directories, make_combo_list_with_default, get_resource_dirs - from gtweak.widgets import ListBoxTweakGroup, GSettingsComboTweak, GSettingsSwitchTweak, GetterSetterSwitchTweak, Title, GSettingsComboEnumTweak - - _shell = GnomeShellFactory().get_shell() -@@ -41,10 +41,7 @@ class KeyThemeSwitcher(GSettingsComboTweak): - **options) - - def _get_valid_key_themes(self): -- dirs = ( os.path.join(gtweak.DATA_DIR, "themes"), -- os.path.join(GLib.get_user_data_dir(), "themes"), -- os.path.join(os.path.expanduser("~"), ".themes")) -- valid = walk_directories(dirs, lambda d: -+ valid = walk_directories(get_resource_dirs("themes"), lambda d: - os.path.isfile(os.path.join(d, "gtk-3.0", "gtk-keys.css")) and \ - os.path.isfile(os.path.join(d, "gtk-2.0-key", "gtkrc"))) - return valid diff --git a/gtweak/utils.py b/gtweak/utils.py -index 39f8833..b0993b6 100644 +index de6c345..6c60b88 100644 --- a/gtweak/utils.py +++ b/gtweak/utils.py @@ -21,6 +21,7 @@ import tempfile @@ -95,7 +69,7 @@ index 39f8833..b0993b6 100644 import gtweak from gtweak.gsettings import GSettingsSetting -@@ -116,6 +117,22 @@ def execute_subprocess(cmd_then_args, block=True): +@@ -117,6 +118,22 @@ def execute_subprocess(cmd_then_args, block=True): stdout, stderr = p.communicate() return stdout, stderr, p.returncode @@ -119,5 +93,5 @@ index 39f8833..b0993b6 100644 class AutostartManager: -- -2.12.2 +2.14.1 diff --git a/pkgs/desktops/gnome-3/misc/gnome-tweak-tool/0002-Don-t-show-multiple-entries-for-a-single-theme.patch b/pkgs/desktops/gnome-3/misc/gnome-tweak-tool/0002-Don-t-show-multiple-entries-for-a-single-theme.patch index 40c0969d588..77b952b4b1e 100644 --- a/pkgs/desktops/gnome-3/misc/gnome-tweak-tool/0002-Don-t-show-multiple-entries-for-a-single-theme.patch +++ b/pkgs/desktops/gnome-3/misc/gnome-tweak-tool/0002-Don-t-show-multiple-entries-for-a-single-theme.patch @@ -1,25 +1,24 @@ -From 25c047ac6a2ac892e2be3d7e002fbf7a16725a4c Mon Sep 17 00:00:00 2001 +From 8e75fe5f1ebd8a140a7306294d2219aea4ac47d2 Mon Sep 17 00:00:00 2001 From: Jascha Geerds <jascha@jgeerds.name> -Date: Sun, 25 Jun 2017 11:35:10 +0100 +Date: Tue, 19 Sep 2017 03:16:07 +0200 Subject: [PATCH 2/3] Don't show multiple entries for a single theme --- - gtweak/tweaks/tweak_group_interface.py | 8 ++++---- - gtweak/tweaks/tweak_group_keymouse.py | 4 ++-- - gtweak/utils.py | 16 ++++++++++++++++ - 3 files changed, 22 insertions(+), 6 deletions(-) + gtweak/tweaks/tweak_group_appearance.py | 8 ++++---- + gtweak/utils.py | 16 ++++++++++++++++ + 2 files changed, 20 insertions(+), 4 deletions(-) -diff --git a/gtweak/tweaks/tweak_group_interface.py b/gtweak/tweaks/tweak_group_interface.py -index db89b85..4697fe3 100644 ---- a/gtweak/tweaks/tweak_group_interface.py -+++ b/gtweak/tweaks/tweak_group_interface.py +diff --git a/gtweak/tweaks/tweak_group_appearance.py b/gtweak/tweaks/tweak_group_appearance.py +index 0d12194..8e05077 100644 +--- a/gtweak/tweaks/tweak_group_appearance.py ++++ b/gtweak/tweaks/tweak_group_appearance.py @@ -26,7 +26,7 @@ from gi.repository import Gtk from gi.repository import GLib import gtweak -from gtweak.utils import walk_directories, make_combo_list_with_default, extract_zip_file, get_resource_dirs +from gtweak.utils import walk_directories, make_combo_list_with_default, extract_zip_file, get_resource_dirs, get_unique_resources - from gtweak.tweakmodel import Tweak, TWEAK_GROUP_APPEARANCE + from gtweak.tweakmodel import Tweak from gtweak.gshellwrapper import GnomeShellFactory from gtweak.gsettings import GSettingsSetting @@ -54,7 +54,7 @@ class GtkThemeSwitcher(GSettingsComboTweak): @@ -49,33 +48,11 @@ index db89b85..4697fe3 100644 class ShellThemeTweak(Gtk.Box, Tweak): -diff --git a/gtweak/tweaks/tweak_group_keymouse.py b/gtweak/tweaks/tweak_group_keymouse.py -index b06900c..d34793e 100644 ---- a/gtweak/tweaks/tweak_group_keymouse.py -+++ b/gtweak/tweaks/tweak_group_keymouse.py -@@ -21,7 +21,7 @@ from gi.repository import GLib - - import gtweak - from gtweak.gshellwrapper import GnomeShellFactory --from gtweak.utils import XSettingsOverrides, walk_directories, make_combo_list_with_default, get_resource_dirs -+from gtweak.utils import XSettingsOverrides, walk_directories, make_combo_list_with_default, get_resource_dirs, get_unique_resources - from gtweak.widgets import ListBoxTweakGroup, GSettingsComboTweak, GSettingsSwitchTweak, GetterSetterSwitchTweak, Title, GSettingsComboEnumTweak - - _shell = GnomeShellFactory().get_shell() -@@ -44,7 +44,7 @@ class KeyThemeSwitcher(GSettingsComboTweak): - valid = walk_directories(get_resource_dirs("themes"), lambda d: - os.path.isfile(os.path.join(d, "gtk-3.0", "gtk-keys.css")) and \ - os.path.isfile(os.path.join(d, "gtk-2.0-key", "gtkrc"))) -- return valid -+ return get_unique_resources(valid) - - TWEAK_GROUPS = [ - ListBoxTweakGroup(_("Keyboard and Mouse"), diff --git a/gtweak/utils.py b/gtweak/utils.py -index b0993b6..0d995bc 100644 +index 6c60b88..6fd7c6a 100644 --- a/gtweak/utils.py +++ b/gtweak/utils.py -@@ -133,6 +133,22 @@ def get_resource_dirs(resource): +@@ -134,6 +134,22 @@ def get_resource_dirs(resource): return [dir for dir in dirs if os.path.isdir(dir)] @@ -99,5 +76,5 @@ index b0993b6..0d995bc 100644 class AutostartManager: -- -2.12.2 +2.14.1 diff --git a/pkgs/desktops/gnome-3/misc/gnome-tweak-tool/0003-Create-config-dir-if-it-doesn-t-exist.patch b/pkgs/desktops/gnome-3/misc/gnome-tweak-tool/0003-Create-config-dir-if-it-doesn-t-exist.patch index 5082a55387a..fcb35a02679 100644 --- a/pkgs/desktops/gnome-3/misc/gnome-tweak-tool/0003-Create-config-dir-if-it-doesn-t-exist.patch +++ b/pkgs/desktops/gnome-3/misc/gnome-tweak-tool/0003-Create-config-dir-if-it-doesn-t-exist.patch @@ -1,6 +1,6 @@ -From ba2eb4be6c69ee8206e0139268c896e6a2b278d8 Mon Sep 17 00:00:00 2001 +From 6a6a7d1c708a2f568277699c5b605fa03ccb5faa Mon Sep 17 00:00:00 2001 From: Jascha Geerds <jascha@jgeerds.name> -Date: Sun, 25 Jun 2017 11:50:33 +0100 +Date: Tue, 19 Sep 2017 03:17:20 +0200 Subject: [PATCH 3/3] Create config dir if it doesn't exist --- @@ -8,7 +8,7 @@ Subject: [PATCH 3/3] Create config dir if it doesn't exist 1 file changed, 4 insertions(+) diff --git a/gtweak/gtksettings.py b/gtweak/gtksettings.py -index a0c163b..f5883ec 100644 +index a11363b..2871c49 100644 --- a/gtweak/gtksettings.py +++ b/gtweak/gtksettings.py @@ -36,6 +36,10 @@ class GtkSettingsManager: @@ -23,5 +23,5 @@ index a0c163b..f5883ec 100644 keyfile.load_from_file(self._path, 0) except MemoryError: -- -2.12.2 +2.14.1 diff --git a/pkgs/desktops/gnome-3/misc/gnome-tweak-tool/default.nix b/pkgs/desktops/gnome-3/misc/gnome-tweak-tool/default.nix index ad415368368..0ab752cf1ba 100644 --- a/pkgs/desktops/gnome-3/misc/gnome-tweak-tool/default.nix +++ b/pkgs/desktops/gnome-3/misc/gnome-tweak-tool/default.nix @@ -1,6 +1,6 @@ -{ stdenv, intltool, fetchurl, atk +{ stdenv, meson, ninja, gettext, fetchurl, atk , pkgconfig, gtk3, glib, libsoup -, bash, itstool, libxml2, python2Packages +, bash, itstool, libxml2, python3Packages , gnome3, librsvg, gdk_pixbuf, file, libnotify, gobjectIntrospection, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -8,22 +8,25 @@ stdenv.mkDerivation rec { doCheck = true; - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; + checkPhase = "meson test"; - makeFlags = [ "DESTDIR=/" ]; + propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gtk3 glib intltool itstool libxml2 - gnome3.gsettings_desktop_schemas file + nativeBuildInputs = [ meson ninja pkgconfig gettext itstool libxml2 file wrapGAppsHook ]; + buildInputs = [ gtk3 glib gnome3.gsettings_desktop_schemas gdk_pixbuf gnome3.defaultIconTheme librsvg - libnotify gnome3.gnome_shell python2Packages.pygobject3 + libnotify gnome3.gnome_shell python3Packages.pygobject3 libsoup gnome3.gnome_settings_daemon gnome3.nautilus - gnome3.gnome_desktop wrapGAppsHook gobjectIntrospection + gnome3.gnome_desktop gobjectIntrospection ]; + postPatch = '' + patchShebangs meson-postinstall.py + ''; + preFixup = '' gappsWrapperArgs+=( - --prefix PYTHONPATH : "$out/${python2Packages.python.sitePackages}:$PYTHONPATH") + --prefix PYTHONPATH : "$out/${python3Packages.python.sitePackages}:$PYTHONPATH") ''; patches = [ diff --git a/pkgs/desktops/gnome-3/misc/gnome-tweak-tool/src.nix b/pkgs/desktops/gnome-3/misc/gnome-tweak-tool/src.nix index 0af83053fa8..da1c0115211 100644 --- a/pkgs/desktops/gnome-3/misc/gnome-tweak-tool/src.nix +++ b/pkgs/desktops/gnome-3/misc/gnome-tweak-tool/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "gnome-tweak-tool-3.24.1"; + name = "gnome-tweak-tool-3.26.3"; src = fetchurl { - url = mirror://gnome/sources/gnome-tweak-tool/3.24/gnome-tweak-tool-3.24.1.tar.xz; - sha256 = "19226b374148d660330af9a8341087c2f869bb24355f4dcc87857169eca9f565"; + url = mirror://gnome/sources/gnome-tweak-tool/3.26/gnome-tweak-tool-3.26.3.tar.xz; + sha256 = "9406447850b14de204f9c5a6eaa6b63ba805ddb1a10fd863239841090af76430"; }; } diff --git a/pkgs/desktops/gnome-3/misc/gpaste/default.nix b/pkgs/desktops/gnome-3/misc/gpaste/default.nix index a43f9206cdd..b92aac4f943 100644 --- a/pkgs/desktops/gnome-3/misc/gpaste/default.nix +++ b/pkgs/desktops/gnome-3/misc/gpaste/default.nix @@ -2,12 +2,12 @@ , pango, gtk3, gnome3, dbus, clutter, appstream-glib, wrapGAppsHook, systemd, gobjectIntrospection }: stdenv.mkDerivation rec { - version = "3.24.2"; + version = "3.26.0"; name = "gpaste-${version}"; src = fetchurl { url = "https://github.com/Keruspe/GPaste/archive/v${version}.tar.gz"; - sha256 = "16142jfpkz8qfs7zp9k3c5l9pnvxbr5yygj8jdpx6by1142s6340"; + sha256 = "0xlcbm9qnw61h6xwa1c0lz5mp1ca3vjjn5wpk0ahhhl6k94mzjs7"; }; nativeBuildInputs = [ autoreconfHook pkgconfig vala wrapGAppsHook ]; diff --git a/pkgs/desktops/gnome-3/misc/libgames-support/default.nix b/pkgs/desktops/gnome-3/misc/libgames-support/default.nix index 90ee658fd09..107200d0895 100644 --- a/pkgs/desktops/gnome-3/misc/libgames-support/default.nix +++ b/pkgs/desktops/gnome-3/misc/libgames-support/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, pkgconfig, glib, gtk3, libgee, intltool }: stdenv.mkDerivation rec { - version = "1.2.1"; + version = "1.2.3"; name = "libgnome-games-support-${version}"; src = fetchurl { url = "mirror://gnome/sources/libgnome-games-support/1.2/${name}.tar.xz"; - sha256 = "1rsyf5hbjim7zpk1yar3gv65g1nmw6zbbc0smrmxsfk0f9n3j9m6"; + sha256 = "1vwad7kqy7yd6wqyr71nq0blh7m53r3lz6ya16dmh942kd0w48v1"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/desktops/gnome-3/misc/libgda/default.nix b/pkgs/desktops/gnome-3/misc/libgda/default.nix index f477c13c7ba..edb34996867 100644 --- a/pkgs/desktops/gnome-3/misc/libgda/default.nix +++ b/pkgs/desktops/gnome-3/misc/libgda/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, gtk3, openssl }: +{ stdenv, fetchurl, fetchpatch, pkgconfig, intltool, itstool, libxml2, gtk3, openssl }: stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; diff --git a/pkgs/desktops/gnome-3/misc/libgit2-glib/default.nix b/pkgs/desktops/gnome-3/misc/libgit2-glib/default.nix index 36feb09d7ee..3c9652de499 100644 --- a/pkgs/desktops/gnome-3/misc/libgit2-glib/default.nix +++ b/pkgs/desktops/gnome-3/misc/libgit2-glib/default.nix @@ -8,7 +8,12 @@ stdenv.mkDerivation rec { gnome3.gnome_common libtool pkgconfig vala gtk_doc gobjectIntrospection ]; - buildInputs = [ libssh2 libgit2 glib ]; + propagatedBuildInputs = [ + # Required by libgit2-glib-1.0.pc + libgit2 glib + ]; + + buildInputs = [ libssh2 ]; meta = with stdenv.lib; { platforms = platforms.linux; diff --git a/pkgs/desktops/gnome-3/misc/pomodoro/default.nix b/pkgs/desktops/gnome-3/misc/pomodoro/default.nix index 63f59357db5..b6338d1f615 100644 --- a/pkgs/desktops/gnome-3/misc/pomodoro/default.nix +++ b/pkgs/desktops/gnome-3/misc/pomodoro/default.nix @@ -1,29 +1,29 @@ { stdenv, fetchFromGitHub, autoconf-archive, appstream-glib, intltool, pkgconfig, libtool, wrapGAppsHook, - dbus_glib, libcanberra_gtk2, gst_all_1, vala_0_34, gnome3, gtk3, + dbus_glib, libcanberra_gtk2, gst_all_1, vala, gnome3, gtk3, libxml2, glib, gobjectIntrospection, libpeas }: stdenv.mkDerivation rec { - version = "0.13.3"; + version = "0.13.4"; name = "gnome-shell-pomodoro-${version}"; src = fetchFromGitHub { owner = "codito"; repo = "gnome-pomodoro"; rev = "${version}"; - sha256 = "1hi4mdzyz2f8k19bkfzrrnavsbkr621w0bfpza8ij2yccpxz81h2"; + sha256 = "0fiql99nhj168wbfhvzrhfcm4c4569gikd2zaf10vzszdqjahrl1"; }; configureScript = "./autogen.sh"; nativeBuildInputs = [ autoconf-archive libtool intltool appstream-glib - wrapGAppsHook pkgconfig + wrapGAppsHook pkgconfig libxml2 ]; buildInputs = [ glib gobjectIntrospection libpeas - dbus_glib libcanberra_gtk2 vala_0_34 gst_all_1.gstreamer + dbus_glib libcanberra_gtk2 vala gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gnome3.gsettings_desktop_schemas gnome3.gnome_common gnome3.gnome_shell gtk3 diff --git a/pkgs/desktops/pantheon/apps/pantheon-terminal/default.nix b/pkgs/desktops/pantheon/apps/pantheon-terminal/default.nix index d91f06e0c3a..b7c27ec3d0a 100644 --- a/pkgs/desktops/pantheon/apps/pantheon-terminal/default.nix +++ b/pkgs/desktops/pantheon/apps/pantheon-terminal/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchurl, perl, cmake, vala_0_23, pkgconfig, glib, gtk3, granite, gnome3, libnotify, gettext, makeWrapper }: +{ stdenv, fetchurl, perl, cmake, vala_0_38, pkgconfig, glib, gtk3, granite, gnome3, libnotify, gettext, makeWrapper }: stdenv.mkDerivation rec { - majorVersion = "0.3"; - minorVersion = "1.3"; + majorVersion = "0.4"; + minorVersion = "3"; name = "pantheon-terminal-${majorVersion}.${minorVersion}"; src = fetchurl { url = "https://launchpad.net/pantheon-terminal/${majorVersion}.x/${majorVersion}.${minorVersion}/+download/${name}.tgz"; @@ -20,9 +20,10 @@ stdenv.mkDerivation rec { done ''; + nativeBuildInputs = [ perl cmake vala_0_38 pkgconfig makeWrapper ]; buildInputs = with gnome3; [ - perl cmake vala_0_23 pkgconfig glib gtk3 granite libnotify gettext makeWrapper - vte_290 libgee gsettings_desktop_schemas defaultIconTheme + glib gtk3 granite libnotify gettext vte_290 libgee + gsettings_desktop_schemas defaultIconTheme ]; meta = { description = "Elementary OS's terminal"; diff --git a/pkgs/development/compilers/ghc/8.2.2.nix b/pkgs/development/compilers/ghc/8.2.2.nix index 317c83c1f9c..736a6edc365 100644 --- a/pkgs/development/compilers/ghc/8.2.2.nix +++ b/pkgs/development/compilers/ghc/8.2.2.nix @@ -32,8 +32,6 @@ in stdenv.mkDerivation (rec { postPatch = "patchShebangs ."; - patches = [ ./ghc-gold-linker.patch ]; - preConfigure = commonPreConfigure; buildInputs = commonBuildInputs; diff --git a/pkgs/development/compilers/orc/default.nix b/pkgs/development/compilers/orc/default.nix index 543fc6dfa48..525d2bb33a5 100644 --- a/pkgs/development/compilers/orc/default.nix +++ b/pkgs/development/compilers/orc/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "orc-0.4.27"; + name = "orc-0.4.28"; src = fetchurl { url = "https://gstreamer.freedesktop.org/src/orc/${name}.tar.xz"; - sha256 = "14vbwdydwarcvswzf744jdjb3ibhv6k4j6hzdacfan41zic3xrai"; + sha256 = "bfcd7c6563b05672386c4eedfc4c0d4a0a12b4b4775b74ec6deb88fc2bcd83ce"; }; outputs = [ "out" "dev" ]; @@ -15,10 +15,7 @@ stdenv.mkDerivation rec { sed "/^toolsdir=/ctoolsdir=$dev/bin" -i "$dev"/lib/pkgconfig/orc*.pc ''; - # building memcpy_speed.log - # ../test-driver: line 107: 4495 Segmentation fault "$@" > $log_file 2>&1 - # FAIL: memcpy_speed - doCheck = false; # see https://bugzilla.gnome.org/show_bug.cgi?id=728129#c7 + doCheck = true; meta = with stdenv.lib; { description = "The Oil Runtime Compiler"; diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix index baf48d7a532..57c22f08550 100644 --- a/pkgs/development/compilers/vala/default.nix +++ b/pkgs/development/compilers/vala/default.nix @@ -12,6 +12,8 @@ let inherit sha256; }; + outputs = [ "out" "devdoc" ]; + nativeBuildInputs = [ pkgconfig flex bison libxslt ] ++ extraNativeBuildInputs; buildInputs = [ glib libiconv ] ++ libintlOrEmpty ++ extraBuildInputs; @@ -65,5 +67,5 @@ in rec { extraBuildInputs = [ graphviz ]; }; - vala = vala_0_34; + vala = vala_0_38; } diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 0b98c7948df..ada9a9e5390 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -95,7 +95,7 @@ self: super: { name = "git-annex-${drv.version}-src"; url = "git://git-annex.branchable.com/"; rev = "refs/tags/" + drv.version; - sha256 = "14449sllp81d23mnjwn1m658kzry5qvww2ykxkbkdcrlz6kl6dy0"; + sha256 = "1bnnrwamw3d37fz7cwykxhi1ryy22dq8r6ld59gsbgcv23drqzax"; }; })).override { dbus = if pkgs.stdenv.isLinux then self.dbus else null; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 860c2e6c205..b02b0b60267 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -2541,6 +2541,7 @@ extra-packages: - happy <1.19.6 # newer versions break Agda - haskell-gi-overloading == 0.0 # gi-* packages use this dependency to disable overloading support - haskell-src-exts == 1.18.* # required by hoogle-5.0.4 + - language-c == 0.7.0 # required by c2hs hack to work around https://github.com/haskell/c2hs/issues/192. - mtl < 2.2 # newer versions require transformers > 0.4.x, which we cannot provide in GHC 7.8.x - mtl-prelude < 2 # required for to build postgrest on mtl 2.1.x platforms - network == 2.6.3.1 # newer versions don't compile with GHC 7.4.x and below @@ -2788,6 +2789,7 @@ dont-distribute-packages: adobe-swatch-exchange: [ i686-linux, x86_64-linux, x86_64-darwin ] adp-multi-monadiccp: [ i686-linux, x86_64-linux, x86_64-darwin ] adp-multi: [ i686-linux, x86_64-linux, x86_64-darwin ] + ADPfusionForest: [ i686-linux, x86_64-linux, x86_64-darwin ] Advgame: [ i686-linux, x86_64-linux, x86_64-darwin ] AERN-Basics: [ i686-linux, x86_64-linux, x86_64-darwin ] AERN-Net: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3227,6 +3229,7 @@ dont-distribute-packages: boomslang: [ i686-linux, x86_64-linux, x86_64-darwin ] borel: [ i686-linux, x86_64-linux, x86_64-darwin ] bot: [ i686-linux, x86_64-linux, x86_64-darwin ] + bowntz: [ i686-linux, x86_64-linux, x86_64-darwin ] braid: [ i686-linux, x86_64-linux, x86_64-darwin ] brainheck: [ i686-linux, x86_64-linux, x86_64-darwin ] Bravo: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4031,6 +4034,7 @@ dont-distribute-packages: dtd-types: [ i686-linux, x86_64-linux, x86_64-darwin ] dtd: [ i686-linux, x86_64-linux, x86_64-darwin ] dtw: [ i686-linux, x86_64-linux, x86_64-darwin ] + dual: [ i686-linux, x86_64-linux, x86_64-darwin ] dublincore-xml-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] duckling: [ i686-linux, x86_64-linux, x86_64-darwin ] dumb-cas: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4347,6 +4351,7 @@ dont-distribute-packages: forecast-io: [ i686-linux, x86_64-linux, x86_64-darwin ] foreign-var: [ i686-linux, x86_64-linux, x86_64-darwin ] forest-fire: [ i686-linux, x86_64-linux, x86_64-darwin ] + Forestry: [ i686-linux, x86_64-linux, x86_64-darwin ] forger: [ i686-linux, x86_64-linux, x86_64-darwin ] forkable-monad: [ i686-linux, x86_64-linux, x86_64-darwin ] ForkableT: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4916,7 +4921,9 @@ dont-distribute-packages: haskell-tools-ast-fromghc: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-tools-ast-gen: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-tools-ast-trf: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskell-tools-builtin-refactorings: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-tools-cli: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskell-tools-experimental-refactorings: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-tor: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-type-exts: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-typescript: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5016,6 +5023,8 @@ dont-distribute-packages: hblock: [ i686-linux, x86_64-linux, x86_64-darwin ] HCard: [ i686-linux, x86_64-linux, x86_64-darwin ] hcc: [ i686-linux, x86_64-linux, x86_64-darwin ] + hcg-minus-cairo: [ i686-linux, x86_64-linux, x86_64-darwin ] + hcg-minus: [ i686-linux, x86_64-linux, x86_64-darwin ] hcheat: [ i686-linux, x86_64-linux, x86_64-darwin ] hchesslib: [ i686-linux, x86_64-linux, x86_64-darwin ] HCL: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5036,6 +5045,7 @@ dont-distribute-packages: hdbi-sqlite: [ i686-linux, x86_64-linux, x86_64-darwin ] hdbi-tests: [ i686-linux, x86_64-linux, x86_64-darwin ] hdbi: [ i686-linux, x86_64-linux, x86_64-darwin ] + hdf: [ i686-linux, x86_64-linux, x86_64-darwin ] hDFA: [ i686-linux, x86_64-linux, x86_64-darwin ] hdigest: [ i686-linux, x86_64-linux, x86_64-darwin ] hdirect: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5215,6 +5225,7 @@ dont-distribute-packages: HListPP: [ i686-linux, x86_64-linux, x86_64-darwin ] hlogger: [ i686-linux, x86_64-linux, x86_64-darwin ] HLogger: [ i686-linux, x86_64-linux, x86_64-darwin ] + hls: [ i686-linux, x86_64-linux, x86_64-darwin ] hlwm: [ i686-linux, x86_64-linux, x86_64-darwin ] hly: [ i686-linux, x86_64-linux, x86_64-darwin ] HMap: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5240,6 +5251,8 @@ dont-distribute-packages: hMollom: [ i686-linux, x86_64-linux, x86_64-darwin ] hmp3: [ i686-linux, x86_64-linux, x86_64-darwin ] Hmpf: [ i686-linux, x86_64-linux, x86_64-darwin ] + hmt-diagrams: [ i686-linux, x86_64-linux, x86_64-darwin ] + hmt: [ i686-linux, x86_64-linux, x86_64-darwin ] hmumps: [ i686-linux, x86_64-linux, x86_64-darwin ] hnetcdf: [ i686-linux, x86_64-linux, x86_64-darwin ] hnix: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5292,6 +5305,7 @@ dont-distribute-packages: hoq: [ i686-linux, x86_64-linux, x86_64-darwin ] horizon: [ i686-linux, x86_64-linux, x86_64-darwin ] horname: [ i686-linux, x86_64-linux, x86_64-darwin ] + hosc-json: [ i686-linux, x86_64-linux, x86_64-darwin ] hosts-server: [ i686-linux, x86_64-linux, x86_64-darwin ] hothasktags: [ i686-linux, x86_64-linux, x86_64-darwin ] hotswap: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5322,6 +5336,7 @@ dont-distribute-packages: hprotoc: [ i686-linux, x86_64-linux, x86_64-darwin ] hps-cairo: [ i686-linux, x86_64-linux, x86_64-darwin ] hps-kmeans: [ i686-linux, x86_64-linux, x86_64-darwin ] + hps: [ i686-linux, x86_64-linux, x86_64-darwin ] hPushover: [ i686-linux, x86_64-linux, x86_64-darwin ] hpygments: [ i686-linux, x86_64-linux, x86_64-darwin ] hpylos: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5376,16 +5391,20 @@ dont-distribute-packages: hsbencher: [ i686-linux, x86_64-linux, x86_64-darwin ] hsc3-cairo: [ i686-linux, x86_64-linux, x86_64-darwin ] hsc3-data: [ i686-linux, x86_64-linux, x86_64-darwin ] + hsc3-db: [ i686-linux, x86_64-linux, x86_64-darwin ] + hsc3-dot: [ i686-linux, x86_64-linux, x86_64-darwin ] hsc3-forth: [ i686-linux, x86_64-linux, x86_64-darwin ] hsc3-graphs: [ i686-linux, x86_64-linux, x86_64-darwin ] hsc3-lang: [ i686-linux, x86_64-linux, x86_64-darwin ] hsc3-lisp: [ i686-linux, x86_64-linux, x86_64-darwin ] hsc3-plot: [ i686-linux, x86_64-linux, x86_64-darwin ] + hsc3-process: [ i686-linux, x86_64-linux, x86_64-darwin ] hsc3-rec: [ i686-linux, x86_64-linux, x86_64-darwin ] hsc3-rw: [ i686-linux, x86_64-linux, x86_64-darwin ] hsc3-server: [ i686-linux, x86_64-linux, x86_64-darwin ] hsc3-unsafe: [ i686-linux, x86_64-linux, x86_64-darwin ] hsc3-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] + hsc3: [ i686-linux, x86_64-linux, x86_64-darwin ] hscaffold: [ i686-linux, x86_64-linux, x86_64-darwin ] hscamwire: [ i686-linux, x86_64-linux, x86_64-darwin ] hscassandra: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5796,6 +5815,7 @@ dont-distribute-packages: JunkDB-driver-gdbm: [ i686-linux, x86_64-linux, x86_64-darwin ] JunkDB-driver-hashtables: [ i686-linux, x86_64-linux, x86_64-darwin ] JunkDB: [ i686-linux, x86_64-linux, x86_64-darwin ] + JuPyTer-notebook: [ i686-linux, x86_64-linux, x86_64-darwin ] jupyter: [ i686-linux, x86_64-linux, x86_64-darwin ] JYU-Utils: [ i686-linux, x86_64-linux, x86_64-darwin ] kafka-client: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7438,6 +7458,7 @@ dont-distribute-packages: satchmo-toysat: [ i686-linux, x86_64-linux, x86_64-darwin ] SBench: [ i686-linux, x86_64-linux, x86_64-darwin ] sbvPlugin: [ i686-linux, x86_64-linux, x86_64-darwin ] + sc3-rdu: [ i686-linux, x86_64-linux, x86_64-darwin ] scalable-server: [ i686-linux, x86_64-linux, x86_64-darwin ] scaleimage: [ i686-linux, x86_64-linux, x86_64-darwin ] SCalendar: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7914,6 +7935,7 @@ dont-distribute-packages: supercollider-midi: [ i686-linux, x86_64-linux, x86_64-darwin ] superconstraints: [ i686-linux, x86_64-linux, x86_64-darwin ] superdoc: [ i686-linux, x86_64-linux, x86_64-darwin ] + supermonad: [ i686-linux, x86_64-linux, x86_64-darwin ] supero: [ i686-linux, x86_64-linux, x86_64-darwin ] supervisor: [ i686-linux, x86_64-linux, x86_64-darwin ] supplemented: [ i686-linux, x86_64-linux, x86_64-darwin ] diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 2f09aaf39f7..3107d29b090 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -296,6 +296,7 @@ self: { homepage = "https://github.com/choener/ADPfusionForest"; description = "Dynamic programming on tree and forest structures"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ADPfusionSet" = callPackage @@ -1213,8 +1214,8 @@ self: { }: mkDerivation { pname = "BNFC-meta"; - version = "0.5"; - sha256 = "1hwm7mnmmrnw42n19xhs1qkl35lvl69sa8imjmibhsv9zq0fddd1"; + version = "0.6"; + sha256 = "1vw3h7b4n6im9kr2abr3m1d1y7xr5m19f53b0pqh1w1izmi5m6mz"; libraryHaskellDepends = [ alex-meta array base happy-meta haskell-src-meta syb template-haskell @@ -5685,6 +5686,7 @@ self: { homepage = "https://github.com/choener/Forestry"; description = "Comparison of trees and forests"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ForkableT" = callPackage @@ -10721,6 +10723,7 @@ self: { homepage = "http://github.com/mgajda/ipynb"; description = "JuPyTer notebook parser"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "JuicyPixels" = callPackage @@ -13476,6 +13479,8 @@ self: { pname = "Octree"; version = "0.5.4.3"; sha256 = "0rdlf8cqpfz43j9xddc5pqp829nyirndkc2rc7h8f8ycpdzsmn2g"; + revision = "1"; + editedCabalFile = "1ysmpp7knrkxh68q6nq012877mn51sgzjrpls7d80pkg4pgkf42a"; libraryHaskellDepends = [ AC-Vector base QuickCheck ]; testHaskellDepends = [ AC-Vector base markdown-unlit QuickCheck ]; homepage = "https://github.com/mgajda/octree"; @@ -13719,6 +13724,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) mesa;}; + "OpenGLRaw_3_2_6_0" = callPackage + ({ mkDerivation, base, bytestring, containers, fixed, half, mesa + , text, transformers + }: + mkDerivation { + pname = "OpenGLRaw"; + version = "3.2.6.0"; + sha256 = "1fsrlc0wy27dvb1551zwgwyf1sdxd37kn1ddv33rxbli988wha60"; + libraryHaskellDepends = [ + base bytestring containers fixed half text transformers + ]; + librarySystemDepends = [ mesa ]; + homepage = "http://www.haskell.org/haskellwiki/Opengl"; + description = "A raw binding for the OpenGL graphics system"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) mesa;}; + "OpenGLRaw21" = callPackage ({ mkDerivation, OpenGLRaw }: mkDerivation { @@ -18465,19 +18488,19 @@ self: { "Villefort" = callPackage ({ mkDerivation, base, bytestring, directory, filepath, HDBC - , HDBC-sqlite3, mtl, process, random, scotty, split, strict, text - , time, transformers, unix + , HDBC-sqlite3, MissingH, mtl, process, random, scotty, split + , strict, text, time, transformers, unix }: mkDerivation { pname = "Villefort"; - version = "0.1.2.4"; - sha256 = "1dyq8n7filv8v4qf42v53ji2fnyam4jkjvd5aflh2qnib2wqsl04"; + version = "0.1.2.5"; + sha256 = "1d4yq1bzjqk3w0rsjmb7y50jg0gyjbjckgbfhw9np0qbzbv2vpy3"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ - base bytestring directory filepath HDBC HDBC-sqlite3 mtl process - random scotty split strict text time transformers unix + base bytestring directory filepath HDBC HDBC-sqlite3 MissingH mtl + process random scotty split strict text time transformers unix ]; executableHaskellDepends = [ base HDBC HDBC-sqlite3 random scotty split text time @@ -19941,8 +19964,8 @@ self: { }: mkDerivation { pname = "accelerate-arithmetic"; - version = "0.1"; - sha256 = "02m2zz80v9d64qspsp7hrdqz2gazgq7x5x0brlsd39cbc5142z8g"; + version = "1.0"; + sha256 = "0gqclqxsa3vbv34h3sgbmhfnx646ipanhnf8xhq160w5ha0ng932"; libraryHaskellDepends = [ accelerate accelerate-utility base QuickCheck utility-ht ]; @@ -20159,12 +20182,12 @@ self: { }: mkDerivation { pname = "accelerate-fftw"; - version = "0.0"; - sha256 = "03ffsa6xshhrx8a4grld128g46x2nkkydwql8h7jw7b2igr7i1ks"; + version = "1.0"; + sha256 = "0b4jr7v3jllvlis0f554l9289zm07ddjgp5q2rp5l47rmsmaak7z"; libraryHaskellDepends = [ accelerate accelerate-io base carray fft storable-complex ]; - homepage = "http://code.haskell.org/~thielema/accelerate-fftw/"; + homepage = "http://hub.darcs.net/thielema/accelerate-fftw/"; description = "Accelerate frontend to the FFTW library (Fourier transform)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -20177,8 +20200,8 @@ self: { }: mkDerivation { pname = "accelerate-fourier"; - version = "0.0.1"; - sha256 = "10kzv1y520c6z6izfg41g6xqfr36yhjdakx5rkzq1cpplvmgpqrw"; + version = "1.0"; + sha256 = "0am0sfjaz8zgmpfwyv34fcrpfwdgj8xygnhk8nl5i9xbbvlkhjjk"; libraryHaskellDepends = [ accelerate accelerate-arithmetic accelerate-utility base containers QuickCheck transformers utility-ht @@ -20342,8 +20365,8 @@ self: { ({ mkDerivation, accelerate, base, utility-ht }: mkDerivation { pname = "accelerate-utility"; - version = "0.1.1"; - sha256 = "0da1wffmghw79i7vqvv845zw1is8h79wlhr8pzdnsppkksd7f3sp"; + version = "1.0"; + sha256 = "16ir7ra99dhk04sg7ap7wwsbazdnadsnkd0ggq60j5cr2jp7x6lk"; libraryHaskellDepends = [ accelerate base utility-ht ]; homepage = "http://hub.darcs.net/thielema/accelerate-utility/"; description = "Utility functions for the Accelerate framework"; @@ -22690,8 +22713,8 @@ self: { }: mkDerivation { pname = "aivika-experiment"; - version = "5.2"; - sha256 = "0x3x59xjlifdmrlg0a96dxvjlywv4l8kl5rhn30dqnaqsm1l2zwn"; + version = "5.3"; + sha256 = "0ch2h7scg43x5mdmvqyjabh96vhshz94r8b58pi9ikp7w4rm7wk9"; libraryHaskellDepends = [ aivika aivika-transformers base containers directory filepath mtl network-uri parallel-io split @@ -22725,8 +22748,8 @@ self: { }: mkDerivation { pname = "aivika-experiment-chart"; - version = "5.1"; - sha256 = "1g6ax9a8mywqwhazlx888zrapnl4m2pcar1kjbjxga0j9p8qxrpl"; + version = "5.3"; + sha256 = "10m85nx1jdvv3vyg6rmpjiajpch4pnyamh3vxw6b4dwn140zlqq8"; libraryHaskellDepends = [ aivika aivika-experiment array base Chart colour containers data-default-class filepath lens mtl split @@ -27875,19 +27898,42 @@ self: { }) {}; "animate" = callPackage - ({ mkDerivation, base, hspec, vector }: + ({ mkDerivation, aeson, base, bytestring, containers, hspec, text + , vector + }: mkDerivation { pname = "animate"; - version = "0.1.0"; - sha256 = "1wlijj56ibd2yhbb6cng8hi7idxd9fk8kznny37cq5aazx938hc3"; - libraryHaskellDepends = [ base vector ]; - testHaskellDepends = [ base hspec vector ]; + version = "0.3.0"; + sha256 = "040csdyzncfbdf46jy8mkgn2n4hd80na0jm4p3q954zhaqk2bvck"; + libraryHaskellDepends = [ + aeson base bytestring containers text vector + ]; + testHaskellDepends = [ aeson base containers hspec vector ]; homepage = "https://github.com/jxv/animate#readme"; description = "Animation for sprites"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "animate-example" = callPackage + ({ mkDerivation, aeson, animate, base, bytestring, containers, sdl2 + , sdl2-image, StateVar, text + }: + mkDerivation { + pname = "animate-example"; + version = "0.0.0"; + sha256 = "14i5jav4p7hwj8d7z611mzhdwqmxsikrs56kn10lxww6m9i4fvf5"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + aeson animate base bytestring containers sdl2 sdl2-image StateVar + text + ]; + homepage = "https://github.com/jxv/animate#readme"; + description = "Animation for sprites"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "anki-tools" = callPackage ({ mkDerivation, aeson, base, bytestring, data-default, directory , exceptions, filepath, mtl, scientific, sqlite-simple, text, time @@ -28335,8 +28381,8 @@ self: { }: mkDerivation { pname = "apecs"; - version = "0.2.4.5"; - sha256 = "0rh6j4nbw120p3qbqgy8fcl92qvp70m0hr34qhfsnwx3p95rfdg4"; + version = "0.2.4.6"; + sha256 = "0alf0sxsnsr1a2g7wv08jm1vh3s2kbvkn0s4a0h9ya2rjyz7dp7f"; libraryHaskellDepends = [ async base containers mtl template-haskell vector ]; @@ -31189,6 +31235,18 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; + "attoparsec-base64" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, text, word8 }: + mkDerivation { + pname = "attoparsec-base64"; + version = "0.0.0"; + sha256 = "1rvkc7kaya42a8djkyj642r5dq952gwkhinif9r22ijaic656cq8"; + libraryHaskellDepends = [ attoparsec base bytestring text word8 ]; + homepage = "https://github.com/athanclark/attoparsec-base64#readme"; + description = "Fetch only base64 characters, erroring in the attoparsec monad on failure"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "attoparsec-binary" = callPackage ({ mkDerivation, attoparsec, base, bytestring }: mkDerivation { @@ -32379,6 +32437,29 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "aws-ec2-knownhosts" = callPackage + ({ mkDerivation, aeson, async, attoparsec, base, bytestring + , directory, filepath, io-streams, process, system-filepath, text + , text-format, turtle + }: + mkDerivation { + pname = "aws-ec2-knownhosts"; + version = "0.1.0.0"; + sha256 = "000bwhsxvsfdz6vm5rkil34hx7d4yv8f0zwfjnxfn0xcaxxa9r50"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson async attoparsec base bytestring directory filepath + io-streams process text text-format + ]; + executableHaskellDepends = [ + aeson base io-streams system-filepath turtle + ]; + homepage = "http://github.com/bitnomial/aws-ec2-knownhosts"; + description = "Capture and manage AWS EC2 known_host pubkeys"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "aws-elastic-transcoder" = callPackage ({ mkDerivation, aeson, aws, aws-sign4, base, bytestring, Cabal , conduit, containers, http-conduit, http-types, QuickCheck @@ -33542,12 +33623,12 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "base-noprelude_4_10_0_0" = callPackage + "base-noprelude_4_10_1_0" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "base-noprelude"; - version = "4.10.0.0"; - sha256 = "1jc1szrja1651vf73kprsa0yq73w331i1g08p54w1znkilf7jalf"; + version = "4.10.1.0"; + sha256 = "0nsgqfkxzp762i2c06lgpkza9a6a31aq5qx2cd820rpqg5yllbx2"; libraryHaskellDepends = [ base ]; doHaddock = false; homepage = "https://github.com/hvr/base-noprelude"; @@ -34526,8 +34607,8 @@ self: { ({ mkDerivation, attoparsec, base, bytestring, time }: mkDerivation { pname = "bgmax"; - version = "0.2.0.1"; - sha256 = "0h1vvk0xd5swlv98ckf2pr0lgrq2dmbgfp8zhxnjaz2mijrvr2if"; + version = "0.2.0.2"; + sha256 = "05mw9zv1r1zarnqbbz5qhgd173y52nkkv099x5zi2w1j96ca2pmd"; libraryHaskellDepends = [ attoparsec base bytestring time ]; homepage = "http://github.com/jonpetterbergman/bgmax"; description = "Parse BgMax-files"; @@ -38568,10 +38649,8 @@ self: { }: mkDerivation { pname = "boolean-normal-forms"; - version = "0.0.0.1"; - sha256 = "11y26whzibxkcfck83lcrmxl34j7qp374wj6nzx2k3l65sdqm2ic"; - revision = "1"; - editedCabalFile = "0xa0lwqmwc93ngd9pmjnzad8bslxw5nw5hq030h0w5xyj46qrjn4"; + version = "0.0.0.2"; + sha256 = "0ml81qmi3m9nkvw8m1pslw270y1li52cwhw0ahz414zcjysgzcih"; libraryHaskellDepends = [ base cond containers ]; testHaskellDepends = [ base cond containers QuickCheck tasty tasty-quickcheck @@ -38929,6 +39008,7 @@ self: { homepage = "https://code.mathr.co.uk/bowntz"; description = "audio-visual pseudo-physical simulation of colliding circles"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "box-tuples" = callPackage @@ -40719,6 +40799,32 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; + "c2hs_0_28_3" = callPackage + ({ mkDerivation, array, base, bytestring, containers, directory + , dlist, filepath, HUnit, language-c, pretty, process, shelly + , test-framework, test-framework-hunit, text, transformers + }: + mkDerivation { + pname = "c2hs"; + version = "0.28.3"; + sha256 = "1k7i2b1s596yz5i86p5kdy0b071a7chnjkiv0hl06z7f8nwnvk40"; + isLibrary = false; + isExecutable = true; + enableSeparateDataOutput = true; + executableHaskellDepends = [ + array base bytestring containers directory dlist filepath + language-c pretty process + ]; + testHaskellDepends = [ + base filepath HUnit shelly test-framework test-framework-hunit text + transformers + ]; + homepage = "https://github.com/haskell/c2hs"; + description = "C->Haskell FFI tool that gives some cross-language type safety"; + license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "c2hs-extra" = callPackage ({ mkDerivation, base, c2hs }: mkDerivation { @@ -42022,6 +42128,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) cairo;}; + "cairo_0_13_4_2" = callPackage + ({ mkDerivation, array, base, bytestring, Cabal, cairo + , gtk2hs-buildtools, mtl, text, utf8-string + }: + mkDerivation { + pname = "cairo"; + version = "0.13.4.2"; + sha256 = "0sm3367ikrjfzwhz1f9bkamk6i33p5cginzc9kpgw3x0lk6pbrhg"; + enableSeparateDataOutput = true; + setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; + libraryHaskellDepends = [ + array base bytestring mtl text utf8-string + ]; + libraryPkgconfigDepends = [ cairo ]; + homepage = "http://projects.haskell.org/gtk2hs/"; + description = "Binding to the Cairo library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) cairo;}; + "cairo-appbase" = callPackage ({ mkDerivation, base, cairo, glib, gtk }: mkDerivation { @@ -43904,8 +44030,8 @@ self: { }: mkDerivation { pname = "celtchar"; - version = "0.1.0.1"; - sha256 = "19br3ygxn6r4qvix3d9dy71w5nwfxhy5h7qavpkk6k3nl6jmawaj"; + version = "0.1.2.0"; + sha256 = "1p53fyv15vvch6zjv2mgycj9wpcxkxpfbwkmbi7dpjgi65wyaz97"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -43915,7 +44041,7 @@ self: { base directory file-embed filepath optparse-generic text ]; testHaskellDepends = [ base hspec raw-strings-qq ]; - homepage = "https://github.com/ogma-project/celtchar#readme"; + homepage = "https://nest.pijul.com/lthms/celtchar"; description = "A tool to build a novel"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -46341,12 +46467,15 @@ self: { }) {}; "classyplate" = callPackage - ({ mkDerivation, base, template-haskell, type-list }: + ({ mkDerivation, base, criterion, parallel, template-haskell + , uniplate + }: mkDerivation { pname = "classyplate"; - version = "0.3.0.0"; - sha256 = "1ijbgkzvgis7wlnngvhvm1vsfmfm4d8g8qa2simda7rfm9swj8m4"; - libraryHaskellDepends = [ base template-haskell type-list ]; + version = "0.3.0.1"; + sha256 = "11a3fwa83v81bqi91yiqyghr8b682gqrsi8w219cy7lhikc9wzwz"; + libraryHaskellDepends = [ base template-haskell ]; + benchmarkHaskellDepends = [ base criterion parallel uniplate ]; description = "Fuseable type-class based generics"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -48572,14 +48701,15 @@ self: { }: mkDerivation { pname = "columbia"; - version = "0.1.3"; - sha256 = "1p211lc448vc5dv9x199pi9w5371sqkdm17gjixvrgcr0dgksqc2"; + version = "0.2"; + sha256 = "065mrgyrb82vsfwwidz3zsj7pnbry9ifz7fspi2jfmyjp69y7cmz"; libraryHaskellDepends = [ array base bytestring containers contravariant data-endian directory filelock invariant mmap mmorph monad-loops mtl parallel pointless-haskell syb-with-class transformers ]; - description = "Enhanced serialization for media that support seeking"; + doHaddock = false; + description = "Enhanced serialization using seeking"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -50085,14 +50215,14 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; - "concurrent-output_1_10_0" = callPackage + "concurrent-output_1_10_1" = callPackage ({ mkDerivation, ansi-terminal, async, base, directory, exceptions , process, stm, terminal-size, text, transformers, unix }: mkDerivation { pname = "concurrent-output"; - version = "1.10.0"; - sha256 = "1cjqmz8iwy2inpf3lfd6y687j7ckwjsrqb7g9adsbwl8w1cnfw99"; + version = "1.10.1"; + sha256 = "17h081vj2sksv9ldpp9jlir2avnzbx92ay321lha8cjm9cpv4996"; libraryHaskellDepends = [ ansi-terminal async base directory exceptions process stm terminal-size text transformers unix @@ -51340,6 +51470,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "constraint" = callPackage + ({ mkDerivation, base, category }: + mkDerivation { + pname = "constraint"; + version = "0.1.0.0"; + sha256 = "0m3hkvilgwmdj3w7x42ypyakbf4p2bnd0rfcwi7kpwqw79rrbvsc"; + revision = "1"; + editedCabalFile = "0zy2nyp81dhcqp4n3mqws47ydijhgnxx36av31g6qsdgim9symf9"; + libraryHaskellDepends = [ base category ]; + description = "Reified constraints"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "constraint-classes" = callPackage ({ mkDerivation, base, constraints, transformers }: mkDerivation { @@ -51584,20 +51727,23 @@ self: { "content-store" = callPackage ({ mkDerivation, aeson, base, bytestring, cond, conduit , conduit-combinators, conduit-extra, cryptonite, directory - , filepath, hspec, htoml, memory, monad-control, mtl, resourcet - , temporary, text, transformers, transformers-base, unix + , filepath, hspec, htoml, lzma-conduit, memory, monad-control, mtl + , resourcet, temporary, text, transformers, transformers-base, unix }: mkDerivation { pname = "content-store"; - version = "0.1.1"; - sha256 = "1rzapw039a2k4g5s0vlw4mm6hrq35xzj6iksp0qpq87150bzy6pp"; + version = "0.2.0"; + sha256 = "1xdv572mq2nc7nckq79c5bw64ldqrqahd0y8wiffwywbcwi8gyi9"; libraryHaskellDepends = [ aeson base bytestring cond conduit conduit-combinators - conduit-extra cryptonite directory filepath htoml memory - monad-control mtl resourcet temporary text transformers + conduit-extra cryptonite directory filepath htoml lzma-conduit + memory monad-control mtl resourcet temporary text transformers transformers-base unix ]; - testHaskellDepends = [ base bytestring hspec memory ]; + testHaskellDepends = [ + base bytestring conduit conduit-combinators directory filepath + hspec memory mtl resourcet temporary + ]; homepage = "https://github.com/weldr/content-store"; description = "Store and retrieve data from an on-disk store"; license = "LGPL"; @@ -53412,13 +53558,18 @@ self: { }) {}; "crdt" = callPackage - ({ mkDerivation, base, containers, mtl, tasty, tasty-quickcheck }: + ({ mkDerivation, base, containers, mtl, QuickCheck, tasty + , tasty-discover, tasty-quickcheck + }: mkDerivation { pname = "crdt"; - version = "2.1"; - sha256 = "05dc1whgn7wr0p32i3j8346s09rs80kagfdc7gmc30jb29nsdn9s"; + version = "3.0"; + sha256 = "0irwrabvfm90jd24kjv1yzrnkdf57sk4m5y5cn907ns4ylwyalhg"; libraryHaskellDepends = [ base containers mtl ]; - testHaskellDepends = [ base containers tasty tasty-quickcheck ]; + testHaskellDepends = [ + base containers mtl QuickCheck tasty tasty-discover + tasty-quickcheck + ]; homepage = "https://github.com/cblp/crdt#readme"; description = "Conflict-free replicated data types"; license = stdenv.lib.licenses.bsd3; @@ -53654,7 +53805,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "criterion_1_2_3_0" = callPackage + "criterion_1_2_4_0" = callPackage ({ mkDerivation, aeson, ansi-wl-pprint, base, base-compat, binary , bytestring, cassava, code-page, containers, deepseq, directory , exceptions, filepath, Glob, HUnit, js-flot, js-jquery @@ -53665,8 +53816,8 @@ self: { }: mkDerivation { pname = "criterion"; - version = "1.2.3.0"; - sha256 = "0539rjhsvwnp8gnyv411vdgbrkddc4kqv3nwgsan9z2bkw0dk47h"; + version = "1.2.4.0"; + sha256 = "01zf2sa3pva8d7176a2q94ail6ha47b58sg2hijls35qnmi3dcw6"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -59576,14 +59727,14 @@ self: { hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; - "dejafu_0_9_0_3" = callPackage + "dejafu_0_9_1_0" = callPackage ({ mkDerivation, base, concurrency, containers, deepseq, exceptions , leancheck, random, ref-fd, transformers, transformers-base }: mkDerivation { pname = "dejafu"; - version = "0.9.0.3"; - sha256 = "11nhxn5cmqw0xybbpvq54y9nbrjv915hzysai4hqfr4b1jk3fwbh"; + version = "0.9.1.0"; + sha256 = "0s3acf1dggp6bc5140k0hbbfcwrbhl35g80qfs33nbjdbjjsfakj"; libraryHaskellDepends = [ base concurrency containers deepseq exceptions leancheck random ref-fd transformers transformers-base @@ -60090,19 +60241,21 @@ self: { }) {}; "derive-topdown" = callPackage - ({ mkDerivation, base, binary, derive, haskell-src, mtl, primitive - , QuickCheck, syb, template-haskell, th-expand-syns, transformers + ({ mkDerivation, base, binary, derive, GenericPretty, haskell-src + , mtl, primitive, QuickCheck, simple-sql-parser, syb + , template-haskell, th-expand-syns, transformers }: mkDerivation { pname = "derive-topdown"; - version = "0.0.0.9"; - sha256 = "0jvmdwd1dif8hxb45s2fw96pca1hm41p5cac68in1pkpsvq7z6cf"; + version = "0.0.1.0"; + sha256 = "0311cnnsq34mc4c24skyhx7458xzd1y9pb9a77mmkc4ils604rql"; libraryHaskellDepends = [ base mtl primitive syb template-haskell th-expand-syns transformers ]; testHaskellDepends = [ - base binary derive haskell-src mtl primitive QuickCheck syb - template-haskell th-expand-syns transformers + base binary derive GenericPretty haskell-src mtl primitive + QuickCheck simple-sql-parser syb template-haskell th-expand-syns + transformers ]; homepage = "https://github.com/HaskellZhangSong/derive-topdown"; description = "Help Haskellers derive class instances for composited data types"; @@ -62279,15 +62432,17 @@ self: { }) {}; "disjoint-containers" = callPackage - ({ mkDerivation, base, containers, doctest, QuickCheck - , transformers + ({ mkDerivation, aeson, base, containers, doctest, QuickCheck + , quickcheck-classes, transformers }: mkDerivation { pname = "disjoint-containers"; - version = "0.2.1"; - sha256 = "1082mx4af7h70hvnj0fxgimhnqbgn3ywkh53lm1hyhcfalnmyrs7"; - libraryHaskellDepends = [ base containers transformers ]; - testHaskellDepends = [ base containers doctest QuickCheck ]; + version = "0.2.2"; + sha256 = "1g1rgmgjan7zwzm38iga5hn4yri54jvmlpzkjn4c57vgjm6wbl6p"; + libraryHaskellDepends = [ aeson base containers transformers ]; + testHaskellDepends = [ + aeson base containers doctest QuickCheck quickcheck-classes + ]; homepage = "https://github.com/andrewthad/disjoint-containers#readme"; description = "Disjoint containers"; license = stdenv.lib.licenses.bsd3; @@ -62357,8 +62512,8 @@ self: { }: mkDerivation { pname = "diskhash"; - version = "0.0.3.2"; - sha256 = "0sfm7x9pqfbd6p894ivq212ckd7sj2sgdgsdjv5dip2pb95x3i78"; + version = "0.0.4.0"; + sha256 = "03kc5jc63726vk3airvwag69855rilanvjvqcqxi3ylvjg2p9dil"; libraryHaskellDepends = [ base bytestring ]; testHaskellDepends = [ base bytestring directory HUnit QuickCheck test-framework @@ -62490,27 +62645,24 @@ self: { "distributed-process-async" = callPackage ({ mkDerivation, ansi-terminal, base, binary, containers - , data-accessor, deepseq, distributed-process - , distributed-process-extras, distributed-process-systest - , exceptions, fingertree, hashable, HUnit, mtl, network - , network-transport, network-transport-tcp, rematch, stm - , test-framework, test-framework-hunit, time, transformers - , unordered-containers + , data-accessor, deepseq, distributed-process, exceptions + , fingertree, hashable, HUnit, mtl, network, network-transport + , network-transport-tcp, rematch, stm, test-framework + , test-framework-hunit, time, transformers, unordered-containers }: mkDerivation { pname = "distributed-process-async"; - version = "0.2.4"; - sha256 = "1v47cjc4w5li2gaz1k1q16r5vkwadw4rqbzz7s2zymzqw83skwgb"; + version = "0.2.4.1"; + sha256 = "1a8a6rpjwm4gp4735z3715y4g99sqdqlbhm0hhzss4d7fprbxqkq"; libraryHaskellDepends = [ base binary containers data-accessor deepseq distributed-process - distributed-process-extras exceptions fingertree hashable mtl stm - time transformers unordered-containers + exceptions fingertree hashable mtl stm time transformers + unordered-containers ]; testHaskellDepends = [ - ansi-terminal base binary deepseq distributed-process - distributed-process-extras distributed-process-systest exceptions - HUnit network network-transport network-transport-tcp rematch stm - test-framework test-framework-hunit transformers + ansi-terminal base binary deepseq exceptions HUnit network + network-transport network-transport-tcp rematch stm test-framework + test-framework-hunit transformers ]; homepage = "http://github.com/haskell-distributed/distributed-process-async"; description = "Cloud Haskell Async API"; @@ -64987,6 +65139,7 @@ self: { libraryHaskellDepends = [ base ]; description = "Dual category"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dual-tree" = callPackage @@ -66415,8 +66568,8 @@ self: { }: mkDerivation { pname = "egison"; - version = "3.7.4"; - sha256 = "055m2099slgz01pzz23v6l2v6f9b149qkfxyf8pcviv59mjq2xsc"; + version = "3.7.9"; + sha256 = "1jx6nrp2v581nbwgblrpqv052lbnbba5nppd3m8npbx5pvpda994"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -66464,8 +66617,8 @@ self: { }: mkDerivation { pname = "egison-tutorial"; - version = "3.7.4"; - sha256 = "0932x2hmh982vfq0zgn6dj58bicq1p0lh93h4aq1hc75lzjk9ydl"; + version = "3.7.9"; + sha256 = "04xy76737zp1vpnn1b76xd5z4d6hfxd4l707v8s1cd8vb18y3dc0"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -67406,20 +67559,20 @@ self: { }) {}; "elocrypt" = callPackage - ({ mkDerivation, base, MonadRandom, proctest, QuickCheck, random - , tasty, tasty-quickcheck, tasty-th + ({ mkDerivation, base, hlint, MonadRandom, proctest, QuickCheck + , random, tasty, tasty-quickcheck, tasty-th }: mkDerivation { pname = "elocrypt"; - version = "1.0.0"; - sha256 = "0kpwzrj9rlq27rifdmx7pd1ax6d13dm1qw2hckzxf2xqv0w3pv6c"; + version = "2.0.0"; + sha256 = "0dz5vdcg68fbwhvwz68zlsz5h2aaj1q6gacp1005hkxfb8156lp3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base MonadRandom random ]; executableHaskellDepends = [ base random ]; testHaskellDepends = [ - base MonadRandom proctest QuickCheck random tasty tasty-quickcheck - tasty-th + base hlint MonadRandom proctest QuickCheck random tasty + tasty-quickcheck tasty-th ]; homepage = "https://www.github.com/sgillespie/elocrypt"; description = "Generate easy-to-remember, hard-to-guess passwords"; @@ -68692,13 +68845,13 @@ self: { }) {}; "errors-ext" = callPackage - ({ mkDerivation, base, errors, HUnit, transformers }: + ({ mkDerivation, base, errors, exceptions, HUnit, transformers }: mkDerivation { pname = "errors-ext"; - version = "0.1.3"; - sha256 = "0x4xzbxwhb4i46jv557rl5fiy25jlxc12cndbhkxnn5k14v1xap6"; - libraryHaskellDepends = [ base errors transformers ]; - testHaskellDepends = [ base errors HUnit transformers ]; + version = "0.2"; + sha256 = "1hsr3aa3p76hj2nvfdhlchqgk3xn17nrs2972wj112xnyh877q8x"; + libraryHaskellDepends = [ base errors exceptions transformers ]; + testHaskellDepends = [ base errors exceptions HUnit transformers ]; homepage = "https://github.com/A1-Triard/errors-ext#readme"; description = "Bracket-like functions for ExceptT over IO monad"; license = stdenv.lib.licenses.asl20; @@ -69022,8 +69175,8 @@ self: { }: mkDerivation { pname = "ethereum-analyzer"; - version = "3.1.0"; - sha256 = "0f92wvj70afzp7azrx67rvckylv9d0wdlz42f12ydbfjyfz8dlsc"; + version = "3.2.0"; + sha256 = "1rqzx2b6fn8vzls05g7hs163h5fjw2cdhkyqbfr8a7p9cyv32nk8"; libraryHaskellDepends = [ aeson base bimap bytestring containers ethereum-analyzer-deps extra fgl GenericPretty graphviz hexstring hoopl pretty protolude split @@ -69042,25 +69195,25 @@ self: { "ethereum-analyzer-cli" = callPackage ({ mkDerivation, aeson, base, bytestring, conduit-combinators , directory, ethereum-analyzer, ethereum-analyzer-deps, exceptions - , hexstring, hflags, http-conduit, json-rpc, monad-logger, mtl - , optparse-applicative, optparse-text, protolude, text, tostring - , unordered-containers, vector + , filepath, hexstring, hflags, hoopl, http-conduit, json-rpc + , monad-logger, mtl, optparse-applicative, optparse-text, protolude + , text, time, tostring, unordered-containers, vector }: mkDerivation { pname = "ethereum-analyzer-cli"; - version = "3.1.0"; - sha256 = "125vh338p4a2vvllcip8y94qfq75x4lfqqh6q2h6cygf1x0kpn6h"; + version = "3.2.0"; + sha256 = "1svyxmk4441x95xxfqn3z18dqvkqykyksqiyb4298pb8g0cq54sx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base bytestring conduit-combinators directory - ethereum-analyzer ethereum-analyzer-deps exceptions hexstring - http-conduit json-rpc monad-logger mtl protolude text tostring + ethereum-analyzer ethereum-analyzer-deps exceptions filepath + hexstring hoopl http-conduit json-rpc monad-logger mtl + optparse-applicative optparse-text protolude text time tostring unordered-containers vector ]; executableHaskellDepends = [ - base ethereum-analyzer ethereum-analyzer-deps hflags monad-logger - optparse-applicative optparse-text protolude text + base ethereum-analyzer-deps hflags monad-logger protolude ]; homepage = "https://github.com/zchn/ethereum-analyzer"; description = "A CLI frontend for ethereum-analyzer"; @@ -69075,8 +69228,8 @@ self: { }: mkDerivation { pname = "ethereum-analyzer-deps"; - version = "3.1.0"; - sha256 = "1acydya38c26fkzai9i3j347f3cmbscdzd5kvja6wincl8ym7i88"; + version = "3.2.0"; + sha256 = "1ahpk43ihr3ddzzpxi6vx27f77i84grny5avsakjn0hlzz3ady19"; libraryHaskellDepends = [ aeson ansi-wl-pprint base base16-bytestring binary bytestring containers deepseq fast-logger global-lock monad-logger split text @@ -69096,8 +69249,8 @@ self: { }: mkDerivation { pname = "ethereum-analyzer-webui"; - version = "3.1.0"; - sha256 = "0kshih6fmg3y5m0dzv3129l2lxbh97vzkxqi12rn1l5krpcs1wlz"; + version = "3.2.0"; + sha256 = "17hmsmr13qvmfl9w9yfmxbbi6lv3b3r3kqsgnbji5i01jvgnggvs"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -73377,6 +73530,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "fingertree_0_1_3_0" = callPackage + ({ mkDerivation, base, HUnit, QuickCheck, test-framework + , test-framework-hunit, test-framework-quickcheck2 + }: + mkDerivation { + pname = "fingertree"; + version = "0.1.3.0"; + sha256 = "1ryjj7qrx70ckcjlr02x9zh86kfp76azbxq05r7hawqkaqg44sfs"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ + base HUnit QuickCheck test-framework test-framework-hunit + test-framework-quickcheck2 + ]; + description = "Generic finger-tree structure, with example instances"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "fingertree-psqueue" = callPackage ({ mkDerivation, base, fingertree }: mkDerivation { @@ -73451,8 +73622,8 @@ self: { }: mkDerivation { pname = "firefly"; - version = "0.1.0.0"; - sha256 = "0m7a7n9iw5ylw4w0awwsbafck5gn7jap3jd34064in6qp009s05v"; + version = "0.1.0.1"; + sha256 = "1ismyiwcjh6yvrka3769921ii99m2yb52pb3b8nyx6jprrbfbgya"; libraryHaskellDepends = [ aeson base blaze-html bytestring case-insensitive containers cookie http-types mtl regex-pcre text transformers wai warp @@ -74747,6 +74918,41 @@ self: { license = "unknown"; }) {}; + "fluffy" = callPackage + ({ mkDerivation, aeson, base, bytestring, cmdargs, MonadRandom + , postgresql-simple, resource-pool, text, time, uuid-types + , yesod-core, yesod-static + }: + mkDerivation { + pname = "fluffy"; + version = "0.1.0.71"; + sha256 = "12l05bmy0qvz9ch37m035qhn8f4rz83m5s5m9x47ivnf59ir74fr"; + isLibrary = false; + isExecutable = true; + enableSeparateDataOutput = true; + executableHaskellDepends = [ + aeson base bytestring cmdargs MonadRandom postgresql-simple + resource-pool text time uuid-types yesod-core yesod-static + ]; + description = "A simple web application as a online practice website for XDU SE 2017 fall SPM"; + license = stdenv.lib.licenses.gpl3; + }) {}; + + "fluffy-parser" = callPackage + ({ mkDerivation, base, binary, bytestring, pandoc, parsec + , postgresql-simple + }: + mkDerivation { + pname = "fluffy-parser"; + version = "0.1.0.50"; + sha256 = "0arxcw5x594dc5c82wyasl3v2jmbw1d5bbs0gafdg3n1n95bv278"; + libraryHaskellDepends = [ + base binary bytestring pandoc parsec postgresql-simple + ]; + description = "The parser for fluffy to parsec the question bank in .docx type"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "fluid-idl" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, errors , exceptions, hspec, lifted-async, monad-control, monad-logger, mtl @@ -79250,8 +79456,8 @@ self: { ({ mkDerivation, base, hspec, QuickCheck, validity }: mkDerivation { pname = "genvalidity"; - version = "0.4.0.0"; - sha256 = "006kd5172vra1nyjh7lzkn2rj6jlkk1rarmzipq16fkwx5s8p5br"; + version = "0.4.0.2"; + sha256 = "1kmbjx57212v7v1b7b7585m0i9sd5qh32ln83pc63m6jdpw161a1"; libraryHaskellDepends = [ base QuickCheck validity ]; testHaskellDepends = [ base hspec QuickCheck ]; homepage = "https://github.com/NorfairKing/validity#readme"; @@ -79347,8 +79553,8 @@ self: { }: mkDerivation { pname = "genvalidity-hspec-aeson"; - version = "0.1.0.0"; - sha256 = "0kyajiqhfnq5cm0qly18sjzz7c6gdf3kp9dzxq67virgkih3hzfw"; + version = "0.1.0.1"; + sha256 = "0ww43pcmya7gqjfxsp7a9f4pf3dpc0g57988l92rl5arix17fkr2"; libraryHaskellDepends = [ aeson base bytestring deepseq genvalidity genvalidity-hspec hspec QuickCheck @@ -79425,8 +79631,8 @@ self: { }: mkDerivation { pname = "genvalidity-path"; - version = "0.2.0.0"; - sha256 = "1a4h6kgaqb4y52gdqp7baqgs18zllmrnkpk1412m4hmakqykljxm"; + version = "0.2.0.2"; + sha256 = "140myxs62amq43mrxdkyxg33ilj8ll4jwd602c5cwz05x0wn634h"; libraryHaskellDepends = [ base genvalidity path validity-path ]; testHaskellDepends = [ base genvalidity-hspec hspec path ]; homepage = "https://github.com/NorfairKing/validity#readme"; @@ -82132,6 +82338,26 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {system-glib = pkgs.glib;}; + "gio_0_13_4_0" = callPackage + ({ mkDerivation, array, base, bytestring, Cabal, containers, glib + , gtk2hs-buildtools, mtl, system-glib + }: + mkDerivation { + pname = "gio"; + version = "0.13.4.0"; + sha256 = "1jjkz7d81dljhgdcpc5zr5bn1jxnlb23f8hpzx4xz5v9jfy0bflr"; + enableSeparateDataOutput = true; + setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; + libraryHaskellDepends = [ + array base bytestring containers glib mtl + ]; + libraryPkgconfigDepends = [ system-glib ]; + homepage = "http://projects.haskell.org/gtk2hs/"; + description = "Binding to GIO"; + license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + }) {system-glib = pkgs.glib;}; + "gipeda" = callPackage ({ mkDerivation, aeson, base, bytestring, cassava , concurrent-output, containers, directory, extra, file-embed @@ -82268,8 +82494,8 @@ self: { }: mkDerivation { pname = "git-annex"; - version = "6.20171109"; - sha256 = "15fl5vazl38yfqi3iz9dqfqkav031wyd306rz1hlgxdqplayz3y5"; + version = "6.20171124"; + sha256 = "066m5s0wp1sw5ngjwgvd4cq1nxnm6jybb4qsyjwm828k4mcwywp7"; configureFlags = [ "-fassistant" "-fcryptonite" "-fdbus" "-fdesktopnotify" "-fdns" "-ffeed" "-finotify" "-fpairing" "-fproduction" "-fquvi" "-fs3" @@ -82723,26 +82949,25 @@ self: { "github-backup" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, directory - , exceptions, filepath, git, github, hslogger, IfElse, MissingH - , mtl, network, network-uri, optparse-applicative, pretty-show - , process, text, transformers, unix, unix-compat, utf8-string - , vector + , exceptions, filepath, git, github, hslogger, IfElse, mtl, network + , network-uri, optparse-applicative, pretty-show, process, split + , text, transformers, unix, unix-compat, utf8-string, vector }: mkDerivation { pname = "github-backup"; - version = "1.20170301"; - sha256 = "1c3qjf2c7q3gj2w4zn7k30pxyjb0rzg59ra23s3wi7dczvriaqjy"; + version = "1.20171126"; + sha256 = "0fk3dp11acgw88rhb7pi8kb98m9x96jwdavcb7gz1jdcx391xy4s"; isLibrary = false; isExecutable = true; setupHaskellDepends = [ base bytestring Cabal directory exceptions filepath hslogger IfElse - MissingH mtl process unix unix-compat + mtl process split unix unix-compat ]; executableHaskellDepends = [ base bytestring containers directory exceptions filepath github - hslogger IfElse MissingH mtl network network-uri - optparse-applicative pretty-show process text transformers unix - unix-compat utf8-string vector + hslogger IfElse mtl network network-uri optparse-applicative + pretty-show process split text transformers unix unix-compat + utf8-string vector ]; executableToolDepends = [ git ]; homepage = "https://github-backup.branchable.com/"; @@ -83270,6 +83495,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "glabrous_0_3_4" = callPackage + ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring + , cereal, cereal-text, directory, either, hspec, text + , unordered-containers + }: + mkDerivation { + pname = "glabrous"; + version = "0.3.4"; + sha256 = "00dwlxl05g2s6br0nya2ayp24yjmf8rg6y3yi6bnqs0a2fyyzq42"; + libraryHaskellDepends = [ + aeson aeson-pretty attoparsec base bytestring cereal cereal-text + either text unordered-containers + ]; + testHaskellDepends = [ + base directory either hspec text unordered-containers + ]; + homepage = "https://github.com/MichelBoucey/glabrous"; + description = "A template DSL library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "glade" = callPackage ({ mkDerivation, base, Cabal, glib, gtk, gtk2hs-buildtools , libglade @@ -83302,23 +83549,23 @@ self: { "glambda" = callPackage ({ mkDerivation, ansi-wl-pprint, base, containers, directory - , either, haskeline, mtl, parsec, tasty, tasty-hunit - , template-haskell, transformers + , haskeline, mtl, parsec, tasty, tasty-hunit, template-haskell + , transformers }: mkDerivation { pname = "glambda"; - version = "1.0.1"; - sha256 = "0vyiwaydli0mv6xwv2phksi08k133a07sia9s88cv1fr99nnjhns"; + version = "1.0.2"; + sha256 = "03fk3q017h4vbwlzf8pmlzlhgc3rzrc1f4fm0b19g4vw22qigflg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - ansi-wl-pprint base containers directory either haskeline mtl - parsec transformers + ansi-wl-pprint base containers directory haskeline mtl parsec + transformers ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ - ansi-wl-pprint base either mtl parsec tasty tasty-hunit - template-haskell + ansi-wl-pprint base mtl parsec tasty tasty-hunit template-haskell + transformers ]; homepage = "https://github.com/goldfirere/glambda"; description = "A simply typed lambda calculus interpreter, written with GADTs"; @@ -84147,16 +84394,15 @@ self: { }) {inherit (pkgs.gnome2) gnome_vfs; gnome_vfs_module = null;}; "gnss-converters" = callPackage - ({ mkDerivation, aeson, aeson-pretty, base, basic-prelude, binary + ({ mkDerivation, aeson, aeson-pretty, base, basic-prelude , binary-conduit, bytestring, conduit, conduit-extra, exceptions , extra, lens, monad-control, mtl, resourcet, rtcm, sbp, tasty - , tasty-golden, tasty-hunit, text, time, transformers-base - , unordered-containers, vector + , tasty-golden, tasty-hunit, time, transformers-base, vector }: mkDerivation { pname = "gnss-converters"; - version = "0.3.21"; - sha256 = "13r593v6yb78352xf2365n0c49jcb6ijjvkrpsis9rbcglj6cnbx"; + version = "0.3.23"; + sha256 = "1czvb4jvlrb93z7wzlr68gp2x6gzdrkbwcc2ri561v2hc7w06xi2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -84167,9 +84413,8 @@ self: { base basic-prelude binary-conduit conduit conduit-extra ]; testHaskellDepends = [ - aeson aeson-pretty base basic-prelude binary binary-conduit - bytestring conduit conduit-extra lens rtcm sbp tasty tasty-golden - tasty-hunit text time unordered-containers + aeson aeson-pretty base basic-prelude binary-conduit bytestring + conduit conduit-extra lens sbp tasty tasty-golden tasty-hunit time ]; homepage = "http://github.com/swift-nav/gnss-converters"; description = "GNSS Converters"; @@ -88191,6 +88436,29 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; + "gtk2hs-buildtools_0_13_3_1" = callPackage + ({ mkDerivation, alex, array, base, Cabal, containers, directory + , filepath, happy, hashtables, pretty, process, random + }: + mkDerivation { + pname = "gtk2hs-buildtools"; + version = "0.13.3.1"; + sha256 = "0m3irv9cs8f602wc5lq84c7k1pd9yg4vydfzzn2qa6z0l552y3r2"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + array base Cabal containers directory filepath hashtables pretty + process random + ]; + libraryToolDepends = [ alex happy ]; + executableHaskellDepends = [ base ]; + homepage = "http://projects.haskell.org/gtk2hs/"; + description = "Tools to build the Gtk2Hs suite of User Interface libraries"; + license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gtk2hs-cast-glade" = callPackage ({ mkDerivation, base, glade, gtk, gtk2hs-cast-glib, hint , template-haskell @@ -88348,6 +88616,32 @@ self: { hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) gtk3;}; + "gtk3_0_14_8" = callPackage + ({ mkDerivation, array, base, bytestring, Cabal, cairo, containers + , gio, glib, gtk2hs-buildtools, gtk3, mtl, pango, text, time + , transformers + }: + mkDerivation { + pname = "gtk3"; + version = "0.14.8"; + sha256 = "0sxk3dhzhqkmlwqkpvmi1b0ycyqdz19z7zfr5nxhskzn5b522ikw"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; + libraryHaskellDepends = [ + array base bytestring cairo containers gio glib mtl pango text + ]; + libraryPkgconfigDepends = [ gtk3 ]; + executableHaskellDepends = [ + array base cairo text time transformers + ]; + homepage = "http://projects.haskell.org/gtk2hs/"; + description = "Binding to the Gtk+ 3 graphical user interface library"; + license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) gtk3;}; + "gtk3-mac-integration" = callPackage ({ mkDerivation, array, base, Cabal, containers, glib , gtk-mac-integration-gtk3, gtk2hs-buildtools, gtk3, mtl @@ -93288,6 +93582,8 @@ self: { pname = "hashtables"; version = "1.2.2.1"; sha256 = "1g7nvj4cmscv1jjhms1pxb2gj4rflg2pcj3pb2z7x9fck8557bbs"; + revision = "1"; + editedCabalFile = "0wcjkd8imgx3j4ygj3r2cdfzknk1bbq0745axy7kbm2sckz1xqcz"; libraryHaskellDepends = [ base ghc-prim hashable primitive vector ]; @@ -94919,6 +95215,7 @@ self: { homepage = "https://github.com/haskell-tools/haskell-tools"; description = "Refactoring Tool for Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskell-tools-cli" = callPackage @@ -95188,6 +95485,7 @@ self: { homepage = "https://github.com/haskell-tools/haskell-tools"; description = "Refactoring Tool for Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskell-tools-prettyprint" = callPackage @@ -95403,14 +95701,14 @@ self: { }: mkDerivation { pname = "haskell-updater"; - version = "1.2.10"; - sha256 = "0zcf8ajqkpfcdy25rlyp8c4jsnrfqxrfwbi7891cmclblg52qwg9"; + version = "1.3"; + sha256 = "1q9rjy36wqagy665k0ifnfwr9r1fy2if5gnva9q069hdir15lkzm"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base bytestring Cabal containers directory filepath process ]; - homepage = "http://haskell.org/haskellwiki/Gentoo#haskell-updater"; + homepage = "https://haskell.org/haskellwiki/Gentoo#haskell-updater"; description = "Rebuild Haskell dependencies in Gentoo"; license = "GPL"; }) {}; @@ -96751,28 +97049,28 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "hasql_1_1" = callPackage + "hasql_1_1_1" = callPackage ({ mkDerivation, attoparsec, base, base-prelude, bug, bytestring , bytestring-strict-builder, contravariant, contravariant-extras - , criterion, data-default-class, dlist, either, hashable - , hashtables, loch-th, mtl, placeholders, postgresql-binary - , postgresql-libpq, profunctors, QuickCheck, quickcheck-instances - , rebase, rerebase, semigroups, tasty, tasty-hunit - , tasty-quickcheck, tasty-smallcheck, text, transformers, vector + , criterion, data-default-class, dlist, hashable, hashtables + , loch-th, mtl, placeholders, postgresql-binary, postgresql-libpq + , profunctors, QuickCheck, quickcheck-instances, rebase, rerebase + , semigroups, tasty, tasty-hunit, tasty-quickcheck, text + , transformers, vector }: mkDerivation { pname = "hasql"; - version = "1.1"; - sha256 = "1c2gfdgxki17ng6b5qr3pvmra7v7x3hf9vh75hq4n6jr8rp03iki"; + version = "1.1.1"; + sha256 = "12q83n9ylykk9zkjlk4qfvk7qls9syrfn9g78ljarbq8b8vi8996"; libraryHaskellDepends = [ attoparsec base base-prelude bytestring bytestring-strict-builder - contravariant contravariant-extras data-default-class dlist either + contravariant contravariant-extras data-default-class dlist hashable hashtables loch-th mtl placeholders postgresql-binary postgresql-libpq profunctors semigroups text transformers vector ]; testHaskellDepends = [ bug data-default-class QuickCheck quickcheck-instances rebase - rerebase tasty tasty-hunit tasty-quickcheck tasty-smallcheck + rerebase tasty tasty-hunit tasty-quickcheck ]; benchmarkHaskellDepends = [ bug criterion rerebase ]; homepage = "https://github.com/nikita-volkov/hasql"; @@ -97938,6 +98236,7 @@ self: { homepage = "http://rd.slavepianos.org/t/hcg-minus"; description = "haskell cg (minus)"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hcg-minus-cairo" = callPackage @@ -97954,6 +98253,7 @@ self: { homepage = "http://rd.slavepianos.org/t/hcg-minus-cairo"; description = "haskell cg (minus) (cairo rendering)"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hcheat" = callPackage @@ -98351,6 +98651,7 @@ self: { homepage = "http://rd.slavepianos.org/t/hdf"; description = "HDF: Uniform Rate Audio Signal Processing in Haskell"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hdigest" = callPackage @@ -98612,6 +98913,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "heartbeat-streams" = callPackage + ({ mkDerivation, async, base, io-streams, time }: + mkDerivation { + pname = "heartbeat-streams"; + version = "0.1.0.0"; + sha256 = "0019qgdc4ylyv7bb8w094qp38qiv81jb6x00s6z64j0zgy3lg4ss"; + libraryHaskellDepends = [ async base io-streams time ]; + homepage = "https://github.com/bitnomial/heartbeat-streams"; + description = "Heartbeats for io-streams"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "heatshrink" = callPackage ({ mkDerivation, base, bytestring, c2hs, cereal, pcre-heavy, tasty , tasty-golden, tasty-hunit, text @@ -98943,10 +99256,8 @@ self: { }: mkDerivation { pname = "heist"; - version = "1.0.1.0"; - sha256 = "1jwbqr2n7jv8cykjgg1a0bdwjszmrbg5qflikvmkyiy1pz0z6kzx"; - revision = "6"; - editedCabalFile = "1r0gqv2y2sar3j4vwnvc6gsdbs9813gviiaa348j9jyc0j6dy4qw"; + version = "1.0.1.1"; + sha256 = "1incy8w291k3vivnrxxqw12i77qzq8b840z8l99i0mkwbl3w3gf7"; libraryHaskellDepends = [ aeson attoparsec base blaze-builder blaze-html bytestring containers directory directory-tree dlist filepath hashable @@ -99852,6 +100163,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hexchat" = callPackage + ({ mkDerivation, base, containers }: + mkDerivation { + pname = "hexchat"; + version = "0.0.1.0"; + sha256 = "15wzndvxc0v187gl0bwhlfqfwxs0l3p6wqwf9zx0acfw4471yn4v"; + revision = "1"; + editedCabalFile = "0jfnmiyp2lzs3msh479h0bdsqzhjra998bwmgwybk60p83nlvw1p"; + libraryHaskellDepends = [ base containers ]; + homepage = "https://github.com/mniip/hexchat-haskell"; + description = "Haskell scripting interface for HexChat"; + license = stdenv.lib.licenses.mit; + }) {}; + "hexdump" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -102700,6 +103025,7 @@ self: { homepage = "http://rd.slavepianos.org/t/hls"; description = "Haskell Lindenmayer Systems"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hlwm" = callPackage @@ -103265,6 +103591,7 @@ self: { homepage = "http://rd.slavepianos.org/t/hmt"; description = "Haskell Music Theory"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hmt-diagrams" = callPackage @@ -103283,6 +103610,7 @@ self: { homepage = "http://rd.slavepianos.org/t/hmt-diagrams"; description = "Haskell Music Theory Diagrams"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hmumps" = callPackage @@ -103610,6 +103938,47 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {ocilib = null;}; + "hocker" = callPackage + ({ mkDerivation, aeson, aeson-pretty, ansi-wl-pprint, async, base + , bytestring, concurrentoutput, containers, cryptonite, data-fix + , deepseq, directory, exceptions, filepath, foldl, hnix + , http-client, http-types, lens, lens-aeson, lifted-base, memory + , mtl, neat-interpolation, network, network-uri, optional-args + , optparse-applicative, optparse-generic, pooled-io, pureMD5 + , scientific, tar, tasty, tasty-golden, tasty-hunit + , tasty-quickcheck, tasty-smallcheck, temporary, text, time + , transformers, turtle, unordered-containers, uri-bytestring + , vector, wreq, zlib + }: + mkDerivation { + pname = "hocker"; + version = "1.0.0"; + sha256 = "16indvxpf2zzdkb7hp09zfnn1zkjwc1pcg2560x2vj7x4akh25mv"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson aeson-pretty ansi-wl-pprint async base bytestring + concurrentoutput containers cryptonite data-fix deepseq directory + exceptions filepath foldl hnix http-client http-types lens + lens-aeson lifted-base memory mtl neat-interpolation network + network-uri optparse-applicative optparse-generic pooled-io pureMD5 + scientific tar temporary text time transformers turtle + unordered-containers uri-bytestring vector wreq zlib + ]; + executableHaskellDepends = [ + base bytestring cryptonite data-fix filepath hnix lens mtl network + optional-args optparse-applicative optparse-generic temporary text + ]; + testHaskellDepends = [ + aeson ansi-wl-pprint base bytestring containers cryptonite mtl + network network-uri tasty tasty-golden tasty-hunit tasty-quickcheck + tasty-smallcheck text unordered-containers + ]; + homepage = "https://github.com/awakesecurity/hocker#readme"; + description = "Interact with the docker registry and generate nix build instructions"; + license = stdenv.lib.licenses.asl20; + }) {}; + "hodatime" = callPackage ({ mkDerivation, base, binary, bytestring, containers, criterion , directory, filepath, mtl, random, tasty, tasty-hunit @@ -104261,14 +104630,14 @@ self: { , conduit-extra, connection, containers, deepseq, directory, extra , filepath, haskell-src-exts, http-conduit, http-types, js-flot , js-jquery, mmap, network, network-uri, old-locale, process - , process-extras, QuickCheck, resourcet, tar, template-haskell - , text, time, transformers, uniplate, utf8-string, vector, wai - , wai-logger, warp, warp-tls, zlib + , process-extras, QuickCheck, resourcet, storable-tuple, tar + , template-haskell, text, time, transformers, uniplate, utf8-string + , vector, wai, wai-logger, warp, warp-tls, zlib }: mkDerivation { pname = "hoogle"; - version = "5.0.13"; - sha256 = "1wxdzkifgm3bnpzr45sf49dyqwnb8bnc5wmqbv5yhxv19gmjk8kn"; + version = "5.0.14"; + sha256 = "1y5vjwp60s35h13bnhjh4ga731m3vz004dbg8w5s7mwnfk5akkz7"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -104277,8 +104646,9 @@ self: { connection containers deepseq directory extra filepath haskell-src-exts http-conduit http-types js-flot js-jquery mmap network network-uri old-locale process process-extras QuickCheck - resourcet tar template-haskell text time transformers uniplate - utf8-string vector wai wai-logger warp warp-tls zlib + resourcet storable-tuple tar template-haskell text time + transformers uniplate utf8-string vector wai wai-logger warp + warp-tls zlib ]; executableHaskellDepends = [ base ]; testTarget = "--test-option=--no-net"; @@ -104774,6 +105144,7 @@ self: { homepage = "http://rd.slavepianos.org/t/hosc-json"; description = "Haskell Open Sound Control JSON Serialisation"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hosc-utils" = callPackage @@ -105572,8 +105943,8 @@ self: { }: mkDerivation { pname = "hpqtypes-extras"; - version = "1.3.1.1"; - sha256 = "01ckscym6lgb6k63n6g0q9972imabv4kncsxr2h37xkahfyh68hk"; + version = "1.4.0.0"; + sha256 = "0hfs4i1h2pfy8hd2c24ig4zd1fw6v9wmm39616a0ipb7vgalra6b"; libraryHaskellDepends = [ base base16-bytestring bytestring containers cryptohash exceptions fields-json hpqtypes lifted-base log-base monad-control mtl safe @@ -105659,6 +106030,7 @@ self: { homepage = "http://rd.slavepianos.org/t/hps"; description = "Haskell Postscript"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hps-cairo" = callPackage @@ -106167,8 +106539,8 @@ self: { ({ mkDerivation, base, transformers }: mkDerivation { pname = "hs-functors"; - version = "0.1.0.0"; - sha256 = "0hm7cmmamn9sgdcy38i1lvxkjmlzab7k2x97mpzf881rs7wdp9s3"; + version = "0.1.1.0"; + sha256 = "0fd9sn0l5q6qxk8br0pa6k3sbv3r0ccij6lb9jm1a174kxjfxzma"; libraryHaskellDepends = [ base transformers ]; description = "Functors from products of Haskell and its dual to Haskell"; license = stdenv.lib.licenses.bsd3; @@ -106904,6 +107276,7 @@ self: { homepage = "http://rd.slavepianos.org/t/hsc3"; description = "Haskell SuperCollider"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hsc3-auditor" = callPackage @@ -106966,6 +107339,7 @@ self: { homepage = "http://rd.slavepianos.org/t/hsc3-db"; description = "Haskell SuperCollider Unit Generator Database"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hsc3-dot" = callPackage @@ -106979,6 +107353,7 @@ self: { homepage = "http://rd.slavepianos.org/t/hsc3-dot"; description = "haskell supercollider graph drawing"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hsc3-forth" = callPackage @@ -107115,6 +107490,7 @@ self: { homepage = "https://github.com/kaoskorobase/hsc3-process"; description = "Create and control scsynth processes"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hsc3-rec" = callPackage @@ -107356,12 +107732,12 @@ self: { license = "LGPL"; }) {}; - "hscolour_1_24_2" = callPackage + "hscolour_1_24_3" = callPackage ({ mkDerivation, base, containers }: mkDerivation { pname = "hscolour"; - version = "1.24.2"; - sha256 = "08ng635m1qylng1khm9nqvfw2wdhljy1q2wi4ly63nfaznx8dysm"; + version = "1.24.3"; + sha256 = "06divyzjv8q7gfcak96lf5faysqzaxy1xds102amgphq0f038baa"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -108161,8 +108537,8 @@ self: { ({ mkDerivation, base, hslua, tasty, tasty-hunit, text }: mkDerivation { pname = "hslua-module-text"; - version = "0.1.2"; - sha256 = "1jsqvawgpm3lk4p825mb2jhs6snxyxwsyssdd40d0y7hp1wka6fc"; + version = "0.1.2.1"; + sha256 = "0bcfpb1dhnxp0gr376ai4w7vczr9zrjl1r3r6w7kcxivfkwq9cxf"; libraryHaskellDepends = [ base hslua text ]; testHaskellDepends = [ base hslua tasty tasty-hunit text ]; homepage = "https://github.com/hslua/hslua-module-test"; @@ -110369,8 +110745,8 @@ self: { }: mkDerivation { pname = "html-tokenizer"; - version = "0.5"; - sha256 = "1i8pgl8vz36l6xm6cfx5slnav1115mhdj4qy2arkxysa7xh8lw7y"; + version = "0.6.3"; + sha256 = "0vwjqv2fqz63ip6q2j62f54phcyrdwghsbs4c4ziz7dh35nh4ahx"; libraryHaskellDepends = [ attoparsec base base-prelude html-entities semigroups text text-builder vector vector-builder @@ -112039,6 +112415,8 @@ self: { pname = "hunt-searchengine"; version = "0.3.0.1"; sha256 = "1y8pq158jwdl3zq5f0xdgszihp8z181lhwd92d66ckw9nh0sllw6"; + revision = "1"; + editedCabalFile = "1srw68r0ccar89vx72ndqxd3009pflx7iyy3cnlp4v50v0imsn4x"; libraryHaskellDepends = [ aeson aeson-pretty base binary bytestring containers data-default data-r-tree data-stringmap deepseq dlist filepath hslogger @@ -121768,8 +122146,8 @@ self: { ({ mkDerivation, base, bytestring, containers, microlens, text }: mkDerivation { pname = "kanji"; - version = "2.0.0"; - sha256 = "0g0549c96vc4ndvs1c5dazwha6d3s28h4xwkskmvgli1kxdm2iqm"; + version = "3.0.2"; + sha256 = "1kgq8ns8mig93rf86wskay4kjp1lgdwp3xywld20mxdp4zwr5a6b"; libraryHaskellDepends = [ base bytestring containers microlens text ]; @@ -121978,6 +122356,43 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "katip_0_5_2_0" = callPackage + ({ mkDerivation, aeson, async, auto-update, base, blaze-builder + , bytestring, containers, criterion, deepseq, directory, either + , filepath, hostname, microlens, microlens-th, monad-control, mtl + , old-locale, quickcheck-instances, regex-tdfa, resourcet + , safe-exceptions, scientific, semigroups, stm, string-conv, tasty + , tasty-golden, tasty-hunit, tasty-quickcheck, template-haskell + , text, time, time-locale-compat, transformers, transformers-base + , transformers-compat, unix, unordered-containers + }: + mkDerivation { + pname = "katip"; + version = "0.5.2.0"; + sha256 = "1mvqrs5skv0yfza0vkapy0qi8x0xmp3aj82a86845s1zf0whly7x"; + libraryHaskellDepends = [ + aeson async auto-update base bytestring containers either hostname + microlens microlens-th monad-control mtl old-locale resourcet + safe-exceptions scientific semigroups stm string-conv + template-haskell text time transformers transformers-base + transformers-compat unix unordered-containers + ]; + testHaskellDepends = [ + aeson base bytestring containers directory microlens + quickcheck-instances regex-tdfa safe-exceptions stm tasty + tasty-golden tasty-hunit tasty-quickcheck template-haskell text + time time-locale-compat unordered-containers + ]; + benchmarkHaskellDepends = [ + aeson async base blaze-builder criterion deepseq directory filepath + safe-exceptions text time transformers unix + ]; + homepage = "https://github.com/Soostone/katip"; + description = "A structured logging framework"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "katip-elasticsearch" = callPackage ({ mkDerivation, aeson, async, base, bloodhound, bytestring , containers, criterion, deepseq, enclosed-exceptions, exceptions @@ -124464,6 +124879,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "language-c_0_7_1" = callPackage + ({ mkDerivation, alex, array, base, bytestring, containers + , directory, filepath, happy, pretty, process, syb + }: + mkDerivation { + pname = "language-c"; + version = "0.7.1"; + sha256 = "1jm9yzj727wsbfpnqkvbavbaq0vzv4i2p8p2kqqwkgmkz4ip2i57"; + libraryHaskellDepends = [ + array base bytestring containers directory filepath pretty process + syb + ]; + libraryToolDepends = [ alex happy ]; + testHaskellDepends = [ base directory filepath process ]; + homepage = "http://visq.github.io/language-c/"; + description = "Analysis and generation of C code"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "language-c-comments" = callPackage ({ mkDerivation, alex, array, base, language-c }: mkDerivation { @@ -126860,6 +127295,8 @@ self: { pname = "lenz"; version = "0.2.2.1"; sha256 = "0w8imq8x5g71byjv8q00fp688mc02kf19n2i23b8474z6sk1mhg8"; + revision = "1"; + editedCabalFile = "0ib3xxrdi3d06psr6mvf241gx1n03qmi7m03cixj4zv8hgmhls3n"; libraryHaskellDepends = [ base base-unicode-symbols hs-functors transformers ]; @@ -132193,8 +132630,8 @@ self: { }: mkDerivation { pname = "lxd-client"; - version = "0.1.0.3"; - sha256 = "0kywqhd4nd7j2nm7fwx9f3h94m6r5dv85xs1ix796iq0vdxxpmys"; + version = "0.1.0.4"; + sha256 = "188n9qc7c4755wmp6w50x7rzkdrf8f31d7alxcp0qg28qvhq94hx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -138508,16 +138945,16 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "monad-journal_0_8_0" = callPackage - ({ mkDerivation, base, either, monad-control, mtl, transformers + "monad-journal_0_8_1" = callPackage + ({ mkDerivation, base, monad-control, mtl, transformers , transformers-base }: mkDerivation { pname = "monad-journal"; - version = "0.8.0"; - sha256 = "0l78flvvvhpk2zcb39ax0qjqpidi8ydnc3ipnh4vy63c8w02w39n"; + version = "0.8.1"; + sha256 = "1b05l40832ck44m52izj2lxw0ghi0ip4isb4377vb0b010hc42p2"; libraryHaskellDepends = [ - base either monad-control mtl transformers transformers-base + base monad-control mtl transformers transformers-base ]; homepage = "http://github.com/phaazon/monad-journal"; description = "Pure logger typeclass and monad transformer"; @@ -141379,8 +141816,8 @@ self: { ({ mkDerivation, base, template-haskell }: mkDerivation { pname = "multirec"; - version = "0.7.7"; - sha256 = "1rv2jfj9kz2lzspn5klrx7aibj0wqai3cqkd7rkmzdadhwz6ahpk"; + version = "0.7.8"; + sha256 = "0n5rsjrg8b98aim1wsv1s2i17299h8g4k2gb7mgn1swzldrigjhz"; libraryHaskellDepends = [ base template-haskell ]; testHaskellDepends = [ base ]; homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/Multirec"; @@ -141971,6 +142408,37 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "mustache_2_3_0" = callPackage + ({ mkDerivation, aeson, base, base-unicode-symbols, bytestring + , cmdargs, containers, directory, either, filepath, hspec, lens + , mtl, parsec, process, scientific, tar, template-haskell + , temporary, text, th-lift, unordered-containers, vector, wreq + , yaml, zlib + }: + mkDerivation { + pname = "mustache"; + version = "2.3.0"; + sha256 = "1q3vadcvv2pxg6rpp92jq5zy784jxphdfpf6xn9y6wg9g3jn7201"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring containers directory either filepath mtl + parsec scientific template-haskell text th-lift + unordered-containers vector + ]; + executableHaskellDepends = [ + aeson base bytestring cmdargs filepath text yaml + ]; + testHaskellDepends = [ + aeson base base-unicode-symbols bytestring directory filepath hspec + lens process tar temporary text unordered-containers wreq yaml zlib + ]; + homepage = "https://github.com/JustusAdam/mustache"; + description = "A mustache template parser library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "mustache-haskell" = callPackage ({ mkDerivation, aeson, base, bytestring, directory , optparse-applicative, parsec, pretty-show, scientific, text @@ -145579,6 +146047,44 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "nix-delegate" = callPackage + ({ mkDerivation, base, foldl, managed, neat-interpolation + , optparse-applicative, text, turtle + }: + mkDerivation { + pname = "nix-delegate"; + version = "1.0.0"; + sha256 = "1fzk6a2izs8sf2gq93m91m6l7h8i3374as8979h106588ww2ghhb"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base foldl managed neat-interpolation optparse-applicative text + turtle + ]; + executableHaskellDepends = [ base ]; + description = "Convenient utility for distributed Nix builds"; + license = stdenv.lib.licenses.asl20; + }) {}; + + "nix-deploy" = callPackage + ({ mkDerivation, base, neat-interpolation, optparse-applicative + , optparse-generic, text, turtle + }: + mkDerivation { + pname = "nix-deploy"; + version = "1.0.0"; + sha256 = "0qvf83kai3fa2s5xf6az2j1gxhiannvw569fnd2lylhcmjffl3j5"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base neat-interpolation optparse-applicative optparse-generic text + turtle + ]; + homepage = "https://github.com/awakesecurity/nix-deploy#readme"; + description = "Deploy Nix-built software to a NixOS machine"; + license = stdenv.lib.licenses.asl20; + }) {}; + "nix-derivation" = callPackage ({ mkDerivation, attoparsec, base, containers, criterion, deepseq , pretty-show, QuickCheck, system-filepath, text, vector @@ -145601,6 +146107,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "nix-diff" = callPackage + ({ mkDerivation, attoparsec, base, containers, Diff, mtl + , nix-derivation, optparse-generic, system-filepath, text, unix + , vector + }: + mkDerivation { + pname = "nix-diff"; + version = "1.0.0"; + sha256 = "1dds8r7ld64zl6hba8z3dij1kiacg6xqxlv85nhm2lf6lm9257i8"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + attoparsec base containers Diff mtl nix-derivation optparse-generic + system-filepath text unix vector + ]; + homepage = "https://github.com/Gabriel439/nix-diff"; + description = "Explain why two Nix derivations differ"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "nix-eval" = callPackage ({ mkDerivation, base, hindent, process, QuickCheck, strict, tasty , tasty-quickcheck @@ -146444,6 +146970,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "nsis_0_3_2" = callPackage + ({ mkDerivation, base, directory, process, transformers, uniplate + }: + mkDerivation { + pname = "nsis"; + version = "0.3.2"; + sha256 = "1jhmiydkiii350h6gdj8f6k8d0drsbp6a2dji4nik72nca6mp65r"; + libraryHaskellDepends = [ base transformers uniplate ]; + testHaskellDepends = [ + base directory process transformers uniplate + ]; + homepage = "https://github.com/ndmitchell/nsis#readme"; + description = "DSL for producing Windows Installer using NSIS"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "nth-prime" = callPackage ({ mkDerivation, base, opentheory-prime, opentheory-primitive }: mkDerivation { @@ -149414,6 +149957,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "optparse-simple_0_1_0" = callPackage + ({ mkDerivation, base, bytestring, directory, gitrev + , optparse-applicative, template-haskell, transformers + }: + mkDerivation { + pname = "optparse-simple"; + version = "0.1.0"; + sha256 = "1g2cf4pcf1fa001z77g8gwnx0cxdpqs1iw9xp0kb9qrxm9gpk3c3"; + libraryHaskellDepends = [ + base gitrev optparse-applicative template-haskell transformers + ]; + testHaskellDepends = [ base bytestring directory ]; + homepage = "https://github.com/fpco/optparse-simple#readme"; + description = "Simple interface to optparse-applicative"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "optparse-text" = callPackage ({ mkDerivation, base, hspec, optparse-applicative, text }: mkDerivation { @@ -149714,8 +150275,8 @@ self: { }: mkDerivation { pname = "orgstat"; - version = "0.1.2"; - sha256 = "11q8n9sy841klms368bs0wl14wg0q5dq5gfcipzm25pw6jswfgyy"; + version = "0.1.3"; + sha256 = "16vla9aq12hvv1b18j7zl8n1dhr31p4hb361gjfd0b1wf95j81r5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -152304,10 +152865,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "partial"; - version = "0.1.0.0"; - sha256 = "0ybh0yz68gawbfswk1s498asc1z7qw6b8qys7rasw5i5iw6vjvr8"; - revision = "1"; - editedCabalFile = "0wp1cqv9n9ff4wlxk7q17m0vd1dfh8wxljmmdc01l41gzc6bp77l"; + version = "1.0.0.0"; + sha256 = "1pgmiddwhk40bzhwznv6lwmxglsnp41z45qhpd5cm0nh2wmzgx5p"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/paf31/partial"; description = "A nullary type class for partial functions"; @@ -154472,6 +155031,35 @@ self: { maintainers = with stdenv.lib.maintainers; [ psibi ]; }) {}; + "persistent-sqlite_2_6_3_1" = callPackage + ({ mkDerivation, aeson, base, bytestring, conduit, containers + , hspec, microlens-th, monad-control, monad-logger, old-locale + , persistent, persistent-template, resource-pool, resourcet + , temporary, text, time, transformers, unordered-containers + }: + mkDerivation { + pname = "persistent-sqlite"; + version = "2.6.3.1"; + sha256 = "0rxzib6ck69kx0m2kd4h6rpqh45alq6rv9ivzla39162jrdj4557"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring conduit containers microlens-th monad-control + monad-logger old-locale persistent resource-pool resourcet text + time transformers unordered-containers + ]; + executableHaskellDepends = [ base monad-logger ]; + testHaskellDepends = [ + base hspec persistent persistent-template temporary text time + transformers + ]; + homepage = "http://www.yesodweb.com/book/persistent"; + description = "Backend for the persistent library using sqlite3"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + maintainers = with stdenv.lib.maintainers; [ psibi ]; + }) {}; + "persistent-template" = callPackage ({ mkDerivation, aeson, aeson-compat, base, bytestring, containers , ghc-prim, hspec, http-api-data, monad-control, monad-logger @@ -156505,6 +157093,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "pipes-random_1_0_0_4" = callPackage + ({ mkDerivation, base, mwc-random, pipes, vector }: + mkDerivation { + pname = "pipes-random"; + version = "1.0.0.4"; + sha256 = "17k510v2f5ziysqh7sknyw3rgxf8iblw800z3hh8gymaszkhfajl"; + libraryHaskellDepends = [ base mwc-random pipes vector ]; + homepage = "https://github.com/fosskers/pipes-random"; + description = "Producers for handling randomness"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "pipes-rt" = callPackage ({ mkDerivation, base, mwc-random, pipes, time }: mkDerivation { @@ -156561,6 +157162,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "pipes-safe_2_2_6" = callPackage + ({ mkDerivation, base, containers, exceptions, monad-control, mtl + , pipes, primitive, transformers, transformers-base + }: + mkDerivation { + pname = "pipes-safe"; + version = "2.2.6"; + sha256 = "1y891xqp5qdv0lkgv66v7b2wnmvximmh6fjb2i5apm8p4rwih6wz"; + libraryHaskellDepends = [ + base containers exceptions monad-control mtl pipes primitive + transformers transformers-base + ]; + description = "Safety for the pipes ecosystem"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "pipes-shell" = callPackage ({ mkDerivation, async, base, bytestring, directory, hspec, pipes , pipes-bytestring, pipes-safe, process, stm, stm-chans, text @@ -158594,6 +159212,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "posix-paths_0_2_1_3" = callPackage + ({ mkDerivation, base, bytestring, criterion, directory, doctest + , filepath, HUnit, process, QuickCheck, unix + }: + mkDerivation { + pname = "posix-paths"; + version = "0.2.1.3"; + sha256 = "1z5brmqraz2smpgbp3ldd9da0cz78glc8bfc5l6842qgc588iljp"; + libraryHaskellDepends = [ base bytestring unix ]; + testHaskellDepends = [ + base bytestring doctest HUnit QuickCheck unix + ]; + benchmarkHaskellDepends = [ + base bytestring criterion directory filepath process unix + ]; + description = "POSIX filepath/directory functionality"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "posix-pty" = callPackage ({ mkDerivation, base, bytestring, process, unix, util }: mkDerivation { @@ -158688,17 +159326,17 @@ self: { "postgres-embedded" = callPackage ({ mkDerivation, base, bytestring, directory, filepath, network - , postgresql-simple, shell-conduit + , postgresql-simple, process }: mkDerivation { pname = "postgres-embedded"; - version = "0.1.7"; - sha256 = "19jwgrqx8sycfy9lrz9qgz0hqksfh4z0a44ij7xsm8jvbmaqfqhy"; + version = "0.1.8"; + sha256 = "06jxpf42rkw3yasknabp6zkns9y06pakkfrazqiwq2xk6kaj8h0n"; libraryHaskellDepends = [ - base directory filepath network shell-conduit + base directory filepath network process ]; testHaskellDepends = [ - base bytestring filepath postgresql-simple shell-conduit + base bytestring filepath postgresql-simple process ]; homepage = "https://github.com/ilya-murzinov/postgres-embedded"; description = "Library for easily running embedded PostgreSQL server for tests"; @@ -158718,6 +159356,42 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "postgres-websockets" = callPackage + ({ mkDerivation, aeson, ansi-wl-pprint, base, base64-bytestring + , bytestring, configurator, containers, contravariant, either + , hasql, hasql-pool, heredoc, hspec, hspec-wai, hspec-wai-json + , http-types, jose, jwt, lens, lens-aeson, optparse-applicative + , postgresql-libpq, protolude, retry, stm, stm-containers + , stringsearch, text, time, transformers, unordered-containers, wai + , wai-app-static, wai-extra, wai-websockets, warp, websockets + }: + mkDerivation { + pname = "postgres-websockets"; + version = "0.4.2.1"; + sha256 = "0jh4ms9lz456as24v9d4vqj2b52i9gw7svk5lzvb65nhfdpb4kfp"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring contravariant either hasql hasql-pool + http-types jose jwt lens lens-aeson postgresql-libpq protolude + retry stm stm-containers stringsearch text time + unordered-containers wai wai-websockets websockets + ]; + executableHaskellDepends = [ + ansi-wl-pprint base base64-bytestring bytestring configurator hasql + hasql-pool heredoc optparse-applicative protolude text time + transformers wai wai-app-static wai-extra warp + ]; + testHaskellDepends = [ + aeson base containers hasql hasql-pool hspec hspec-wai + hspec-wai-json http-types protolude stm unordered-containers + wai-extra + ]; + homepage = "https://github.com/diogob/postgres-websockets#readme"; + description = "Middleware to map LISTEN/NOTIFY messages to Websockets"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "postgresql-binary" = callPackage ({ mkDerivation, aeson, base, base-prelude, binary-parser , bytestring, bytestring-strict-builder, containers, conversion @@ -159327,8 +160001,8 @@ self: { }: mkDerivation { pname = "postmark-streams"; - version = "0.1.0.0"; - sha256 = "0kpwnkiykdaxlykmpnnr8pf4k176y1yv24hwr69mmf480r60mhsv"; + version = "0.1.0.1"; + sha256 = "16ag5jghbvz6gialpcpy491x63cq2z7kwrh9ahy8z2ryilcp64vi"; libraryHaskellDepends = [ aeson attoparsec base base64-bytestring binary bytestring http-streams io-streams text time @@ -161161,6 +161835,17 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "product" = callPackage + ({ mkDerivation, base, category }: + mkDerivation { + pname = "product"; + version = "0.1.0.0"; + sha256 = "1dh1bf5mc2q6jb4srajn448fww5s8ixcwiswqp7pk9638sdh6dgk"; + libraryHaskellDepends = [ base category ]; + description = "Product category"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "product-isomorphic" = callPackage ({ mkDerivation, base, template-haskell, th-data-compat }: mkDerivation { @@ -161609,15 +162294,16 @@ self: { "prometheus" = callPackage ({ mkDerivation, atomic-primops, base, bytestring, containers - , http-types, text, transformers, wai, warp + , http-client, http-types, lens, proto-lens, proto-lens-protoc + , text, transformers, wai, warp, wreq }: mkDerivation { pname = "prometheus"; - version = "0.4.2"; - sha256 = "0k5avxjv1z4cfrx5x368ygzv30ghwykv4ngifigy1ydnmp7c7n1h"; + version = "0.5.0"; + sha256 = "0bfm9frngj0lfpbmrxb0qg5x7bx447wyc8x8x79ah0r9l1l1bfsb"; libraryHaskellDepends = [ - atomic-primops base bytestring containers http-types text - transformers wai warp + atomic-primops base bytestring containers http-client http-types + lens proto-lens proto-lens-protoc text transformers wai warp wreq ]; homepage = "http://github.com/bitnomial/prometheus"; description = "Prometheus Haskell Client"; @@ -167298,6 +167984,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "real-day-end" = callPackage + ({ mkDerivation, base, quickcheck-instances, tasty + , tasty-quickcheck, time + }: + mkDerivation { + pname = "real-day-end"; + version = "0.0.1"; + sha256 = "0k96r3z3cbr67z1q55g63zy92i46qmigw52ar53c0hx0d1jfiazs"; + libraryHaskellDepends = [ base time ]; + testHaskellDepends = [ + base quickcheck-instances tasty tasty-quickcheck time + ]; + homepage = "https://github.com/s9gf4ult/real-day-end"; + description = "Tiny library to calculate date considering when your day realy ends"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "really-simple-xml-parser" = callPackage ({ mkDerivation, base, parsec }: mkDerivation { @@ -167360,7 +168063,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "rebase_1_1_1" = callPackage + "rebase_1_2_1" = callPackage ({ mkDerivation, base, base-prelude, bifunctors, bytestring , containers, contravariant, contravariant-extras, deepseq, dlist , either, fail, hashable, mtl, profunctors, scientific @@ -167369,8 +168072,8 @@ self: { }: mkDerivation { pname = "rebase"; - version = "1.1.1"; - sha256 = "0rhfpdh8hmna02pbiljkiy623sdy1nqk60azr43cdx5q9aw1b3jy"; + version = "1.2.1"; + sha256 = "12qnx9psnq9ici4k58mwlf3g976gyhy53csllihxji71hsfjsaj3"; libraryHaskellDepends = [ base base-prelude bifunctors bytestring containers contravariant contravariant-extras deepseq dlist either fail hashable mtl @@ -168020,6 +168723,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "references_0_3_3_1" = callPackage + ({ mkDerivation, array, base, containers, directory, either + , filepath, HUnit, instance-control, lens, mtl, template-haskell + , text, transformers, uniplate + }: + mkDerivation { + pname = "references"; + version = "0.3.3.1"; + sha256 = "03n18skl989ksssi2lv50bns1iw9qixacabs9qvli4b36rnn01xw"; + libraryHaskellDepends = [ + array base containers directory either filepath instance-control + mtl template-haskell text transformers uniplate + ]; + testHaskellDepends = [ + array base containers directory either filepath HUnit + instance-control lens mtl template-haskell text transformers + uniplate + ]; + homepage = "https://github.com/lazac/references"; + description = "Selectors for reading and updating data"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "refh" = callPackage ({ mkDerivation, base, clippard, cmdargs, directory, filepath , haskheap, network @@ -169405,7 +170132,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "relational-query_0_10_0_0" = callPackage + "relational-query_0_11_0_0" = callPackage ({ mkDerivation, array, base, bytestring, containers, dlist , names-th, persistable-record, product-isomorphic , quickcheck-simple, sql-words, template-haskell, text @@ -169413,8 +170140,8 @@ self: { }: mkDerivation { pname = "relational-query"; - version = "0.10.0.0"; - sha256 = "0a5gqfi0ns1gh1p2csv63m2b0psyq8dl3wzxrvj07p4gqq0m36gb"; + version = "0.11.0.0"; + sha256 = "0v0syrcagwmwqs9gikhdj0ji3cypfvfy9if8zyajkvxdkxpwvmaz"; libraryHaskellDepends = [ array base bytestring containers dlist names-th persistable-record product-isomorphic sql-words template-haskell text th-reify-compat @@ -169449,20 +170176,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "relational-query-HDBC_0_6_5_0" = callPackage + "relational-query-HDBC_0_6_6_1" = callPackage ({ mkDerivation, base, containers, convertible, dlist, HDBC , HDBC-session, names-th, persistable-record, product-isomorphic - , relational-query, relational-schemas, template-haskell + , relational-query, relational-schemas, sql-words, template-haskell , th-data-compat, transformers }: mkDerivation { pname = "relational-query-HDBC"; - version = "0.6.5.0"; - sha256 = "0d609xbxxanvggv5lqf7lwfrzzmw6k46b212g5kv19p9v5bx6k7c"; + version = "0.6.6.1"; + sha256 = "1aa4bjkv9i2an2igfdc0rvq2hmd6wv5zfgcbgw32y3qmy0zb3v2g"; libraryHaskellDepends = [ base containers convertible dlist HDBC HDBC-session names-th persistable-record product-isomorphic relational-query - relational-schemas template-haskell th-data-compat transformers + relational-schemas sql-words template-haskell th-data-compat + transformers ]; homepage = "http://khibino.github.io/haskell-relational-record/"; description = "HDBC instance of relational-query and typed query interface for HDBC"; @@ -169488,15 +170216,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "relational-record_0_2_0_0" = callPackage + "relational-record_0_2_1_2" = callPackage ({ mkDerivation, base, persistable-record , persistable-types-HDBC-pg, product-isomorphic, relational-query , relational-query-HDBC }: mkDerivation { pname = "relational-record"; - version = "0.2.0.0"; - sha256 = "0qbkpli2bdzwpp13sqxsk8li6hczvs6k0yybrbgwyjdrqnha09d3"; + version = "0.2.1.2"; + sha256 = "068d6a9xp9byhc3k1rb9a1zwifyg7mhxv3r6xisgdjv4w6fizbay"; libraryHaskellDepends = [ base persistable-record persistable-types-HDBC-pg product-isomorphic relational-query relational-query-HDBC @@ -169514,8 +170242,8 @@ self: { }: mkDerivation { pname = "relational-record-examples"; - version = "0.4.0.0"; - sha256 = "0ch075l87sxxgmvis6hnrpc72lr0v21nx0xhw0ahpirqbw01ndqh"; + version = "0.4.1.0"; + sha256 = "121qd6l167mm90wfzf9x4hvxflkzjq3m7k11ijaii89rb61496wj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -169547,14 +170275,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "relational-schemas_0_1_5_0" = callPackage + "relational-schemas_0_1_6_1" = callPackage ({ mkDerivation, base, bytestring, containers, relational-query , template-haskell, time }: mkDerivation { pname = "relational-schemas"; - version = "0.1.5.0"; - sha256 = "0q76z6bcr27x2anqfgh7gkms7m2dk6xz0i7p0czcq64x2hy7cjnz"; + version = "0.1.6.1"; + sha256 = "1lkqaahfrdm2dlyqz3wn9dm0sw8cypmndasrigc67q94ha4lrv81"; libraryHaskellDepends = [ base bytestring containers relational-query template-haskell time ]; @@ -170573,12 +171301,12 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "rerebase_1_1_2" = callPackage + "rerebase_1_2" = callPackage ({ mkDerivation, rebase }: mkDerivation { pname = "rerebase"; - version = "1.1.2"; - sha256 = "1nlms737hwk8b9jb354w1czgsg0hgjm8xdj7rjhxv99zkhmp8bmi"; + version = "1.2"; + sha256 = "1plmy1fcvkx621cnn6dg6k61nkzsg9wrb9vf0jhc2s1vd4yfn3kw"; libraryHaskellDepends = [ rebase ]; homepage = "https://github.com/nikita-volkov/rerebase"; description = "Reexports from \"base\" with a bunch of other standard libraries"; @@ -172141,6 +172869,28 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "rob" = callPackage + ({ mkDerivation, ansi-terminal, base, bytestring, cmdargs + , directory, ede, filepath, fortytwo, Glob, pathwalk, text, time + , unordered-containers, vector, yaml + }: + mkDerivation { + pname = "rob"; + version = "0.0.2"; + sha256 = "1bbhv502c9r8d0kmrvl3q7yl12ykjwfvknlm0kmgnsv5lpz2zx59"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ansi-terminal base bytestring cmdargs directory ede filepath + fortytwo Glob pathwalk text time unordered-containers vector yaml + ]; + executableHaskellDepends = [ base cmdargs ]; + testHaskellDepends = [ base directory ]; + homepage = "https://github.com/gianlucaguarini/rob#readme"; + description = "Simple projects generator"; + license = stdenv.lib.licenses.mit; + }) {}; + "robin" = callPackage ({ mkDerivation, base, Cabal, directory, filepath, fsnotify , hdaemonize, lens, lifted-base, monad-control, mtl, process @@ -173098,14 +173848,13 @@ self: { "rtcm" = callPackage ({ mkDerivation, aeson, array, base, base64-bytestring , basic-prelude, binary, binary-bits, binary-conduit, bytestring - , conduit, conduit-combinators, conduit-extra, lens, lens-aeson - , random, tasty, tasty-hunit, tasty-quickcheck, template-haskell - , text, word24 + , conduit, conduit-extra, lens, lens-aeson, random, tasty + , tasty-hunit, tasty-quickcheck, template-haskell, text, word24 }: mkDerivation { pname = "rtcm"; - version = "0.2.8"; - sha256 = "014cs6lsg6hdm7s2747j681xj87lh60l77mqbjijcl4lxh9brglw"; + version = "0.2.10"; + sha256 = "0c4pnmayv4m4cpzp0dpvgcwikpqi6q5n8w5pcgcq7qmx799rlb1f"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -173114,7 +173863,7 @@ self: { ]; executableHaskellDepends = [ aeson base basic-prelude binary-conduit bytestring conduit - conduit-combinators conduit-extra + conduit-extra ]; testHaskellDepends = [ base basic-prelude binary binary-bits bytestring lens random tasty @@ -174544,28 +175293,24 @@ self: { ({ mkDerivation, aeson, array, base, base64-bytestring , basic-prelude, binary, binary-conduit, bytestring, conduit , conduit-extra, data-binary-ieee754, lens, lens-aeson, monad-loops - , QuickCheck, resourcet, tasty, tasty-hunit, tasty-quickcheck - , template-haskell, text, unordered-containers, yaml + , resourcet, tasty, tasty-hunit, template-haskell, text, yaml }: mkDerivation { pname = "sbp"; - version = "2.3.0"; - sha256 = "14y8d8zlvf6bzc393mzdqjyw4if7wm3nwy6v89cdylyknf2klqls"; + version = "2.3.1"; + sha256 = "1iz6ayvb5vrbl6d436x7zfmj15vqq9yyqm1w4322k9j4khnn62hc"; 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 unordered-containers + text ]; executableHaskellDepends = [ aeson base basic-prelude binary-conduit bytestring conduit conduit-extra resourcet yaml ]; - testHaskellDepends = [ - aeson base base64-bytestring basic-prelude bytestring QuickCheck - tasty tasty-hunit tasty-quickcheck - ]; + testHaskellDepends = [ base basic-prelude tasty tasty-hunit ]; homepage = "https://github.com/swift-nav/libsbp"; description = "SwiftNav's SBP Library"; license = stdenv.lib.licenses.lgpl3; @@ -174651,6 +175396,7 @@ self: { homepage = "http://rd.slavepianos.org/t/sc3-rdu"; description = "Haskell bindings to sc3-rdu (sc3 rd ugens)"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "scalable-server" = callPackage @@ -177346,8 +178092,8 @@ self: { }: mkDerivation { pname = "serokell-util"; - version = "0.5.1"; - sha256 = "1si8hhnxz2yi3524qvgylgwgwapcdcn80v1q6njx37s88b0cv2b3"; + version = "0.5.3"; + sha256 = "02rr1wc1ss2rjx31w485k2hdnzhbs59pqzr9yvmk39082q9ppmk3"; libraryHaskellDepends = [ acid-state aeson ansi-terminal base base16-bytestring base64-bytestring bytestring clock containers deepseq directory @@ -177911,6 +178657,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "servant-cassava_0_10" = callPackage + ({ mkDerivation, base, base-compat, bytestring, cassava, http-media + , servant, servant-server, vector, wai, warp + }: + mkDerivation { + pname = "servant-cassava"; + version = "0.10"; + sha256 = "03jnyghwa5kjbl5j55njmp7as92flw91zs9cgdvb4jrsdy85sb4v"; + libraryHaskellDepends = [ + base base-compat bytestring cassava http-media servant vector + ]; + testHaskellDepends = [ + base base-compat bytestring cassava http-media servant + servant-server wai warp + ]; + homepage = "http://haskell-servant.readthedocs.org/"; + description = "Servant CSV content-type for cassava"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "servant-checked-exceptions" = callPackage ({ mkDerivation, aeson, base, bytestring, deepseq, doctest, Glob , hspec-wai, http-api-data, http-client, http-media @@ -178834,14 +179601,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "servant-ruby_0_3_0_0" = callPackage + "servant-ruby_0_5_0_0" = callPackage ({ mkDerivation, base, casing, doctest, lens, QuickCheck , servant-foreign, text }: mkDerivation { pname = "servant-ruby"; - version = "0.3.0.0"; - sha256 = "14azm41iwj09ra8yyr0xvpirw8yxl3bs1fhgnpkk3538dz6n005s"; + version = "0.5.0.0"; + sha256 = "07rjrx5g41yz4wiax4z535zrdcyfvwpbjm81sdyskmkv44mv5g8z"; libraryHaskellDepends = [ base casing lens servant-foreign text ]; testHaskellDepends = [ base doctest QuickCheck ]; homepage = "https://github.com/joneshf/servant-ruby#readme"; @@ -180390,6 +181157,33 @@ self: { maintainers = with stdenv.lib.maintainers; [ psibi ]; }) {}; + "shakespeare_2_0_14_1" = callPackage + ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring + , containers, directory, exceptions, ghc-prim, hspec, HUnit, parsec + , process, scientific, template-haskell, text, time, transformers + , unordered-containers, vector + }: + mkDerivation { + pname = "shakespeare"; + version = "2.0.14.1"; + sha256 = "02pahbvibll4jmbq6p5vxr2r4mmrfx3h0c8v6qbj4rlq96lc6a23"; + libraryHaskellDepends = [ + aeson base blaze-html blaze-markup bytestring containers directory + exceptions ghc-prim parsec process scientific template-haskell text + time transformers unordered-containers vector + ]; + testHaskellDepends = [ + aeson base blaze-html blaze-markup bytestring containers directory + exceptions ghc-prim hspec HUnit parsec process template-haskell + text time transformers + ]; + homepage = "http://www.yesodweb.com/book/shakespearean-templates"; + description = "A toolkit for making compile-time interpolated templates"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + maintainers = with stdenv.lib.maintainers; [ psibi ]; + }) {}; + "shakespeare-babel" = callPackage ({ mkDerivation, base, classy-prelude, data-default, directory , process, shakespeare, template-haskell @@ -180821,7 +181615,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "shelly_1_6_8_6" = callPackage + "shelly_1_6_8_7" = callPackage ({ mkDerivation, async, base, bytestring, containers, directory , enclosed-exceptions, exceptions, hspec, HUnit, lifted-async , lifted-base, monad-control, mtl, process, system-fileio @@ -180830,8 +181624,8 @@ self: { }: mkDerivation { pname = "shelly"; - version = "1.6.8.6"; - sha256 = "06mqw6p21z3bhxhpks8w6cmh1lai6891a9avnap0mhsq17f8lhyr"; + version = "1.6.8.7"; + sha256 = "10i9n4mmrfn6v02i320f4g3wak7yyjgijaj5kf9m2qpvw6wf95mj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -182993,7 +183787,7 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; - "skylighting_0_4_4" = callPackage + "skylighting_0_4_4_1" = callPackage ({ mkDerivation, aeson, attoparsec, base, base64-bytestring, binary , blaze-html, bytestring, case-insensitive, containers, criterion , Diff, directory, filepath, HUnit, hxt, mtl, pretty-show, random @@ -183002,8 +183796,8 @@ self: { }: mkDerivation { pname = "skylighting"; - version = "0.4.4"; - sha256 = "0i5wp229gbix0dhdwqm59af0v6g51wsdk8q5b7d49kp3rl4iv2bi"; + version = "0.4.4.1"; + sha256 = "1zvq31nbswidkr52fx91z5g326h4wnfk5sij3przgha117pl3v2j"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -184075,8 +184869,8 @@ self: { }: mkDerivation { pname = "snap-language"; - version = "0.1.0.2"; - sha256 = "0dm99hdl2npl9g213d6smiwk4ir0fd7xc4f2c2hz4dkgfxbz44lq"; + version = "0.1.0.3"; + sha256 = "18nw841pl2ba1ms3gksd9m928ihkhrh9553jq616sf22gwg7ykjh"; libraryHaskellDepends = [ attoparsec base bytestring containers snap-core ]; @@ -184111,6 +184905,8 @@ self: { pname = "snap-loader-static"; version = "1.0.0.0"; sha256 = "04i9fn84101w8ybns8m2830zlw2vvg81pzrs0vmj6s691y3ivxas"; + revision = "1"; + editedCabalFile = "0ghxjdh5hv2nb3m1rax3rlgszxrfv4x1dxb5n4f1h6xaya9ya0hh"; libraryHaskellDepends = [ base template-haskell ]; homepage = "http://snapframework.com/"; description = "Snap static loader"; @@ -186136,15 +186932,17 @@ self: { }) {}; "spake2" = callPackage - ({ mkDerivation, base, bytestring, cryptonite, memory - , optparse-applicative, protolude, QuickCheck, tasty, tasty-hspec + ({ mkDerivation, aeson, base, bytestring, cryptonite, memory + , optparse-applicative, process, protolude, QuickCheck, tasty + , tasty-hspec }: mkDerivation { pname = "spake2"; - version = "0.3.0"; - sha256 = "1n7j69jpvpdi3cdym98iikhjd3k58qjm3dwysszvg0ng13kkjfi1"; + version = "0.4.0"; + sha256 = "109hvcphd2rvqls84ahs6yy9k58yhh4f0zgqc4c78a6nz4709hdp"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring cryptonite memory protolude ]; @@ -186152,7 +186950,8 @@ self: { base cryptonite memory optparse-applicative protolude ]; testHaskellDepends = [ - base cryptonite protolude QuickCheck tasty tasty-hspec + aeson base bytestring cryptonite memory process protolude + QuickCheck tasty tasty-hspec ]; homepage = "https://github.com/jml/haskell-spake2#readme"; description = "Implementation of the SPAKE2 Password-Authenticated Key Exchange algorithm"; @@ -189320,8 +190119,8 @@ self: { ({ mkDerivation, base, Cabal, cabal-test-quickcheck, QuickCheck }: mkDerivation { pname = "step-function"; - version = "0.1.1.1"; - sha256 = "01by500w17156mvjy7mgic68cch25pn56fxj40jn0pqih331mxly"; + version = "0.1.1.2"; + sha256 = "1lsa84mc752lghpjszhwhky9hnpihy7wivdm0r6yl70k721s3ifk"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base Cabal cabal-test-quickcheck QuickCheck @@ -189463,6 +190262,8 @@ self: { pname = "stm-conduit"; version = "3.0.0"; sha256 = "02d83mji1rlijdn315q7fik6jy5q49fjwygd64c9kf4z0qy6cvyg"; + revision = "1"; + editedCabalFile = "0wmjqypqjw9irmpsmra6zbj1sa4l14xnx5xpaz2zvfsk4x90qyyg"; libraryHaskellDepends = [ async base cereal cereal-conduit conduit conduit-combinators conduit-extra directory ghc-prim lifted-async lifted-base @@ -190046,15 +190847,15 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "stratosphere_0_12_0" = callPackage + "stratosphere_0_13_0" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, hashable , hspec, hspec-discover, lens, template-haskell, text , unordered-containers }: mkDerivation { pname = "stratosphere"; - version = "0.12.0"; - sha256 = "1hwfdhwx7xbmziyf7076knb8z0m1vdcfjn9h1fwpwbifc6h3vpyq"; + version = "0.13.0"; + sha256 = "15b7s0jgsqrpsjh4l4i39k45qx9m0k4xsbhhm6ffzxlqi2ivkayz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -191731,8 +192532,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "subzero"; - version = "0.1.0.1"; - sha256 = "09fbj5gkppy2i7bnkhm8qai0zqazw0943d8fk1jfzhdz59pby4vm"; + version = "0.1.0.3"; + sha256 = "0va9j5vh3a4rsj7hcgq38ij7dsi08rhm43s3jsymx38q8kxhv6f8"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; homepage = "https://github.com/code5hot/subzero#readme"; @@ -192129,6 +192930,7 @@ self: { testHaskellDepends = [ base containers ghc QuickCheck ]; description = "Plugin and base library to support supermonads in Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "supero" = callPackage @@ -193312,6 +194114,40 @@ self: { license = "GPL"; }) {}; + "synthesizer-core_0_8_1_2" = callPackage + ({ mkDerivation, array, base, binary, bytestring, containers + , deepseq, directory, event-list, explicit-exception, filepath + , non-empty, non-negative, numeric-prelude, numeric-quest, old-time + , process, QuickCheck, random, sample-frame-np, sox + , storable-record, storable-tuple, storablevector, timeit + , transformers, utility-ht + }: + mkDerivation { + pname = "synthesizer-core"; + version = "0.8.1.2"; + sha256 = "0ii0nd76l9la9j148wvaxxzh12269ajmy314v1bk737mz5n126dk"; + libraryHaskellDepends = [ + array base binary bytestring containers deepseq event-list + explicit-exception filepath non-empty non-negative numeric-prelude + numeric-quest process QuickCheck random sample-frame-np sox + storable-record storable-tuple storablevector transformers + utility-ht + ]; + testHaskellDepends = [ + base containers event-list non-empty non-negative numeric-prelude + QuickCheck random storable-tuple storablevector transformers + utility-ht + ]; + benchmarkHaskellDepends = [ + array base binary bytestring directory numeric-prelude old-time + storable-tuple storablevector timeit utility-ht + ]; + homepage = "http://www.haskell.org/haskellwiki/Synthesizer"; + description = "Audio signal processing coded in Haskell: Low level part"; + license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "synthesizer-dimensional" = callPackage ({ mkDerivation, base, bytestring, event-list, non-negative , numeric-prelude, random, sox, storable-record, storablevector @@ -200230,8 +201066,8 @@ self: { }: mkDerivation { pname = "time-exts"; - version = "3.0.3"; - sha256 = "0v3q4n3zj613sywnh7p9fx5shq23ybagnz2bkk9drj1gypbpzjhs"; + version = "3.0.4"; + sha256 = "08nffyg181m1bgna4b6bv74w04byizzd5j80ad5xjb0mifbynzdd"; libraryHaskellDepends = [ attoparsec base bindings-DSL deepseq lens-simple mtl old-locale random text time tz @@ -200322,13 +201158,27 @@ self: { ({ mkDerivation, base, time }: mkDerivation { pname = "time-locale-vietnamese"; - version = "0.1.0.0"; - sha256 = "0swgciwnmwsw0rwpbii41xhpba4a9zg6sbyk0yhbh660r4ncyixg"; + version = "1.0.0.0"; + sha256 = "0xhbfdzrlhj3096w2dgk2ijpzs4kzym11sz3r0h8r19a3jrjs1ln"; libraryHaskellDepends = [ base time ]; homepage = "https://github.com/tungd/time-locale-vietnamese#readme"; + description = "Vietnamese locale for date and time format"; license = stdenv.lib.licenses.asl20; }) {}; + "time-machine" = callPackage + ({ mkDerivation, base, hspec, HUnit, mtl, time, tz }: + mkDerivation { + pname = "time-machine"; + version = "0.1.0"; + sha256 = "1nz14g7n4igy46gkw3xvksmi062vxkbbmp8q5hbjky2x7jnc8h8j"; + libraryHaskellDepends = [ base mtl time tz ]; + testHaskellDepends = [ base hspec HUnit mtl time tz ]; + homepage = "https://github.com/y-taka-23/time-machine#readme"; + description = "A library to mock the current time"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "time-out" = callPackage ({ mkDerivation, base, data-default-class, exceptions , time-interval, time-units, transformers @@ -200667,6 +201517,39 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "timemap_0_0_6" = callPackage + ({ mkDerivation, base, containers, criterion, focus, hashable + , list-t, QuickCheck, quickcheck-instances, stm, stm-containers + , tasty, tasty-hunit, tasty-quickcheck, time, unordered-containers + }: + mkDerivation { + pname = "timemap"; + version = "0.0.6"; + sha256 = "00bg1b0fplnahwsv7bx63v90hq9w0idpf7s9wqhvl3fdjs9nl5zp"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers focus hashable list-t stm stm-containers time + unordered-containers + ]; + executableHaskellDepends = [ + base containers focus hashable list-t stm stm-containers time + unordered-containers + ]; + testHaskellDepends = [ + base containers focus hashable list-t QuickCheck + quickcheck-instances stm stm-containers tasty tasty-hunit + tasty-quickcheck time unordered-containers + ]; + benchmarkHaskellDepends = [ + base containers criterion focus hashable list-t stm stm-containers + time unordered-containers + ]; + description = "A mutable hashmap, implicitly indexed by UTCTime"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "timeout" = callPackage ({ mkDerivation, base, exceptions, mtl, QuickCheck, tasty , tasty-quickcheck, time @@ -200895,8 +201778,8 @@ self: { }: mkDerivation { pname = "timezone-olson-th"; - version = "0.1.0.3"; - sha256 = "0jagq78mp09x8zhy3ygdd0pw2ms12c72qi9r7gqaird09rggs44w"; + version = "0.1.0.4"; + sha256 = "0xrf3hn8246s6n31bhq5arvn3xkwhfibmlfs5ahn5li2iblkn585"; libraryHaskellDepends = [ base template-haskell time timezone-olson timezone-series ]; @@ -201231,6 +202114,30 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "tldr_0_2_3" = callPackage + ({ mkDerivation, ansi-terminal, base, bytestring, cmark, directory + , filepath, optparse-applicative, semigroups, shell-conduit, text + }: + mkDerivation { + pname = "tldr"; + version = "0.2.3"; + sha256 = "11xg9b2abfvwh484wkrj8j1c65qdy95c3xdc6gsmzqcyzi8d6k7j"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ansi-terminal base bytestring cmark text + ]; + executableHaskellDepends = [ + base directory filepath optparse-applicative semigroups + shell-conduit + ]; + testHaskellDepends = [ base ]; + homepage = "https://github.com/psibi/tldr-hs#readme"; + description = "Haskell tldr client"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "tls" = callPackage ({ mkDerivation, asn1-encoding, asn1-types, async, base, bytestring , cereal, criterion, cryptonite, data-default-class, hourglass @@ -202476,6 +203383,17 @@ self: { broken = true; }) {effect-interpreters = null;}; + "transformers-either" = callPackage + ({ mkDerivation, base, transformers }: + mkDerivation { + pname = "transformers-either"; + version = "0.0.1"; + sha256 = "1hr10mfmx2ac7si8a43cyhgxzg75amqin3wyvw06bgymnvd00dqj"; + libraryHaskellDepends = [ base transformers ]; + description = "An Either monad transformer"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "transformers-free" = callPackage ({ mkDerivation, base, transformers }: mkDerivation { @@ -203950,8 +204868,8 @@ self: { }: mkDerivation { pname = "tweet-hs"; - version = "1.0.1.27"; - sha256 = "1jd902al2xajf2404bqg8y7k06mrncyyipp0gdfqd864bfqxivz6"; + version = "1.0.1.33"; + sha256 = "0r1aq1w3nis3rqd94yrg2idkqbcrzs0dsnvbrmrny65b7l50zzbk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -204994,8 +205912,8 @@ self: { }: mkDerivation { pname = "type-of-html"; - version = "1.1.0.0"; - sha256 = "18a7pfqab0pk2mn11f3y5slx18m6vpdmzbq91p3wp86v59wsid2d"; + version = "1.2.0.0"; + sha256 = "0mnpa297x8ikgarr7wf8lllkyif240fsjzjigs9rx86r65vfszgy"; libraryHaskellDepends = [ base bytestring double-conversion ghc-prim text ]; @@ -209115,8 +210033,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "validity"; - version = "0.4.0.0"; - sha256 = "0ngivfphp468bp6djj8r76rwv2pcwgmawx04pnaw89m0wa5n27vw"; + version = "0.4.0.2"; + sha256 = "1ppisj45dccymlid7xwp1r2rgzql435smhl6s0n2b6alsx2h9qnz"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/NorfairKing/validity#readme"; description = "Validity typeclass"; @@ -209168,8 +210086,8 @@ self: { ({ mkDerivation, base, filepath, path, validity }: mkDerivation { pname = "validity-path"; - version = "0.2.0.0"; - sha256 = "1n84mnvyi1zf3888xvy2vvmca5fq594g0gqql5nisd3w1mrczw1f"; + version = "0.2.0.2"; + sha256 = "0c01nzd998fgxpkiddz6p91s84i10202md9pa1zmza0gik4rcv6y"; libraryHaskellDepends = [ base filepath path validity ]; homepage = "https://github.com/NorfairKing/validity#readme"; description = "Validity instances for Path"; @@ -210196,6 +211114,33 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; + "vectortiles_1_2_0_6" = callPackage + ({ mkDerivation, base, bytestring, cereal, containers, criterion + , deepseq, hex, microlens, microlens-platform, protobuf, tasty + , tasty-hunit, text, transformers, vector + }: + mkDerivation { + pname = "vectortiles"; + version = "1.2.0.6"; + sha256 = "1l3sdd1cpcx9lxqcfzy9nndflzf8x2z7xayrj6k18zdf862dbxn7"; + libraryHaskellDepends = [ + base bytestring cereal containers deepseq protobuf text + transformers vector + ]; + testHaskellDepends = [ + base bytestring cereal containers hex protobuf tasty tasty-hunit + text vector + ]; + benchmarkHaskellDepends = [ + base bytestring cereal containers criterion microlens + microlens-platform protobuf text vector + ]; + homepage = "https://github.com/fosskers/vectortiles"; + description = "GIS Vector Tiles, as defined by Mapbox"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "verbalexpressions" = callPackage ({ mkDerivation, base, regex-pcre }: mkDerivation { @@ -210311,14 +211256,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "versions_3_3_0" = callPackage + "versions_3_3_1" = callPackage ({ mkDerivation, base, checkers, deepseq, hashable, megaparsec , microlens, QuickCheck, tasty, tasty-hunit, tasty-quickcheck, text }: mkDerivation { pname = "versions"; - version = "3.3.0"; - sha256 = "11qgmkdinf0nhgylzfkwlcz22q7g8l4zki05hdwlb77dm2a5fam5"; + version = "3.3.1"; + sha256 = "0d94gkhx8b1w34mw05sidwvmysyb1z3p985nrrfaqzsp4xjqg0h4"; libraryHaskellDepends = [ base deepseq hashable megaparsec text ]; testHaskellDepends = [ base checkers microlens QuickCheck tasty tasty-hunit @@ -212289,6 +213234,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "wai-middleware-rollbar_0_6_0" = 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, wai + }: + mkDerivation { + pname = "wai-middleware-rollbar"; + version = "0.6.0"; + sha256 = "1vfykph1vszap8gbv3jr5a2mr8n0hhf2v2r39f27dg9yh8f6hq4q"; + libraryHaskellDepends = [ + aeson base bytestring case-insensitive hostname http-client + http-conduit http-types network text time unordered-containers uuid + wai + ]; + testHaskellDepends = [ + aeson base bytestring case-insensitive containers hspec + hspec-golden-aeson lens lens-aeson QuickCheck text + ]; + homepage = "https://github.com/joneshf/wai-middleware-rollbar#readme"; + description = "Middleware that communicates to Rollbar"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "wai-middleware-route" = callPackage ({ mkDerivation, base, bytestring, http-types, HUnit , test-framework, test-framework-hunit, text, wai, wai-test @@ -214324,6 +215294,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "websockets-snap_0_10_2_4" = callPackage + ({ mkDerivation, base, bytestring, bytestring-builder, io-streams + , mtl, snap-core, snap-server, websockets + }: + mkDerivation { + pname = "websockets-snap"; + version = "0.10.2.4"; + sha256 = "003np9jn7ja1p9vays6sk7kmia1bhqjhsz53jy0k2na6fx7rnk99"; + libraryHaskellDepends = [ + base bytestring bytestring-builder io-streams mtl snap-core + snap-server websockets + ]; + description = "Snap integration for the websockets library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "webwire" = callPackage ({ mkDerivation, base, base64-bytestring, blaze-builder, blaze-html , bytestring, case-insensitive, containers, cookie, cprng-aes @@ -214418,15 +215405,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "weigh_0_0_6" = callPackage + "weigh_0_0_7" = callPackage ({ mkDerivation, base, bytestring-trie, containers, deepseq, mtl , process, random, split, template-haskell, temporary , unordered-containers }: mkDerivation { pname = "weigh"; - version = "0.0.6"; - sha256 = "0izi5qsxjq2cjhk0xzdkmf8q36zg469csricyzy8vhd70mlp9g4r"; + version = "0.0.7"; + sha256 = "1k5mxk0cn82x1lc1j0ik4sfkr0q4ipa2ls9sm5g39hl6bjwp1lp3"; libraryHaskellDepends = [ base deepseq mtl process split template-haskell temporary ]; @@ -215358,8 +216345,8 @@ self: { }: mkDerivation { pname = "wolf"; - version = "0.3.34"; - sha256 = "1g4sh2k0wkz847pxkjcpm21mf22z5lp4j428sqkvklgry1wk512q"; + version = "0.3.37"; + sha256 = "09ry5bq0hmrdv09hd9v16r4dyyyfzpf785sfrz3by6hal8bkwj6w"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -218034,8 +219021,8 @@ self: { }: mkDerivation { pname = "xmlhtml"; - version = "0.2.5.1"; - sha256 = "1m8jiadx7s990xxdw03ac43c4vxa391kgci77axqx6bkai2yak8k"; + version = "0.2.5.2"; + sha256 = "1p2v1cj9jjwbqyb0fyv2201zd7ljz5d46qg5kwy7rz2bchbqd0b4"; libraryHaskellDepends = [ base blaze-builder blaze-html blaze-markup bytestring bytestring-builder containers parsec text unordered-containers @@ -218043,6 +219030,7 @@ self: { testHaskellDepends = [ base blaze-builder blaze-html blaze-markup bytestring bytestring-builder containers directory hspec HUnit text + unordered-containers ]; homepage = "https://github.com/snapframework/xmlhtml"; description = "XML parser and renderer with HTML 5 quirks mode"; @@ -218784,6 +219772,29 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "yahoo-finance-api_0_2_0_3" = callPackage + ({ mkDerivation, aeson, base, doctest, either, Glob, hspec + , http-api-data, http-client, http-client-tls, mtl, safe, servant + , servant-client, text, time, transformers, vector + }: + mkDerivation { + pname = "yahoo-finance-api"; + version = "0.2.0.3"; + sha256 = "19mwjbz43rp7qdysw3iaa6mhkzk6xkrjd42111ccai75x0372rbx"; + libraryHaskellDepends = [ + aeson base either http-api-data http-client mtl servant + servant-client text time transformers vector + ]; + testHaskellDepends = [ + base doctest either Glob hspec http-client http-client-tls mtl safe + servant servant-client + ]; + homepage = "https://github.com/cdepillabout/yahoo-finance-api"; + description = "Read quotes from Yahoo Finance API"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yahoo-finance-conduit" = callPackage ({ mkDerivation, attoparsec, base, cassava, conduit, lens, mtl , text, vector, wreq @@ -219535,6 +220546,36 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "yesod-auth_1_4_20" = callPackage + ({ mkDerivation, aeson, authenticate, base, base16-bytestring + , base64-bytestring, binary, blaze-builder, blaze-html + , blaze-markup, byteable, bytestring, conduit, conduit-extra + , containers, cryptonite, data-default, email-validate, file-embed + , http-client, http-conduit, http-types, lifted-base, memory + , mime-mail, network-uri, nonce, persistent, persistent-template + , random, resourcet, safe, shakespeare, template-haskell, text + , time, transformers, unordered-containers, wai, yesod-core + , yesod-form, yesod-persistent + }: + mkDerivation { + pname = "yesod-auth"; + version = "1.4.20"; + sha256 = "1p6kcx9g04x8vng12dc7kywxwnm74kpp5q4adcjcbzhgrvhrnvbj"; + libraryHaskellDepends = [ + aeson authenticate base base16-bytestring base64-bytestring binary + blaze-builder blaze-html blaze-markup byteable bytestring conduit + conduit-extra containers cryptonite data-default email-validate + file-embed http-client http-conduit http-types lifted-base memory + mime-mail network-uri nonce persistent persistent-template random + resourcet safe shakespeare template-haskell text time transformers + unordered-containers wai yesod-core yesod-form yesod-persistent + ]; + homepage = "http://www.yesodweb.com/"; + description = "Authentication for Yesod"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yesod-auth-account" = callPackage ({ mkDerivation, base, blaze-html, bytestring, hspec, monad-logger , mtl, nonce, persistent, persistent-sqlite, pwstore-fast @@ -219619,6 +220660,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "yesod-auth-bcryptdb" = callPackage + ({ mkDerivation, aeson, base, bcrypt, bytestring, persistent, text + , yesod-auth, yesod-core, yesod-form, yesod-persistent + }: + mkDerivation { + pname = "yesod-auth-bcryptdb"; + version = "0.3.0.1"; + sha256 = "0n8h8j5xxnsj2mmj0dwcfrf3wmn9p670092va83w40dbapj98jw0"; + libraryHaskellDepends = [ + aeson base bcrypt bytestring persistent text yesod-auth yesod-core + yesod-form yesod-persistent + ]; + homepage = "https://github.com/yusent/yesod-auth-bcryptdb"; + description = "Authentication plugin for Yesod"; + license = stdenv.lib.licenses.mit; + }) {}; + "yesod-auth-deskcom" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, byteable , bytestring, cipher-aes, cprng-aes, crypto-api, crypto-random @@ -219816,24 +220874,25 @@ self: { "yesod-auth-oauth2" = callPackage ({ mkDerivation, aeson, authenticate, base, bytestring, containers , hoauth2, hspec, http-client, http-conduit, http-types - , lifted-base, load-env, network-uri, random, text, transformers - , vector, warp, yesod, yesod-auth, yesod-core, yesod-form + , lifted-base, load-env, microlens, network-uri, random, text + , transformers, uri-bytestring, vector, warp, yesod, yesod-auth + , yesod-core, yesod-form }: mkDerivation { pname = "yesod-auth-oauth2"; - version = "0.2.4"; - sha256 = "1gpyra5j6hi25r0hrjifjmkar8yb0f74cln4rygdjsvczllkri9a"; + version = "0.3.0"; + sha256 = "1mdazbvmwm8b7b4sp5wvdjl4lms0jj3q0lrikzx0rvnd9qj6814v"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson authenticate base bytestring hoauth2 http-client http-conduit - http-types lifted-base network-uri random text transformers vector - yesod-auth yesod-core yesod-form + http-types lifted-base microlens network-uri random text + transformers uri-bytestring vector yesod-auth yesod-core yesod-form ]; executableHaskellDepends = [ base containers http-conduit load-env text warp yesod yesod-auth ]; - testHaskellDepends = [ base hspec ]; + testHaskellDepends = [ base hspec uri-bytestring ]; homepage = "http://github.com/thoughtbot/yesod-auth-oauth2"; description = "OAuth 2.0 authentication plugins"; license = stdenv.lib.licenses.bsd3; @@ -220068,6 +221127,50 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "yesod-core_1_4_37_2" = callPackage + ({ mkDerivation, aeson, async, auto-update, base, blaze-builder + , blaze-html, blaze-markup, byteable, bytestring, case-insensitive + , cereal, clientsession, conduit, conduit-extra, containers, cookie + , criterion, data-default, deepseq, deepseq-generics, directory + , exceptions, fast-logger, hspec, hspec-expectations, http-types + , HUnit, lifted-base, monad-control, monad-logger, mtl, mwc-random + , network, old-locale, parsec, path-pieces, primitive, QuickCheck + , random, resourcet, safe, semigroups, shakespeare + , streaming-commons, template-haskell, text, time, transformers + , transformers-base, unix-compat, unordered-containers, vector, wai + , wai-extra, wai-logger, warp, word8 + }: + mkDerivation { + pname = "yesod-core"; + version = "1.4.37.2"; + sha256 = "0pip1y97zwfy073rc5yrhfcfj1m0nwrzih8f27m77y9dbdcwgmhs"; + libraryHaskellDepends = [ + aeson auto-update base blaze-builder blaze-html blaze-markup + byteable bytestring case-insensitive cereal clientsession conduit + conduit-extra containers cookie data-default deepseq + deepseq-generics directory exceptions fast-logger http-types + lifted-base monad-control monad-logger mtl mwc-random old-locale + parsec path-pieces primitive random resourcet safe semigroups + shakespeare template-haskell text time transformers + transformers-base unix-compat unordered-containers vector wai + wai-extra wai-logger warp word8 + ]; + testHaskellDepends = [ + async base blaze-builder bytestring clientsession conduit + conduit-extra containers cookie hspec hspec-expectations http-types + HUnit lifted-base mwc-random network path-pieces QuickCheck random + resourcet shakespeare streaming-commons template-haskell text + transformers wai wai-extra + ]; + benchmarkHaskellDepends = [ + base blaze-html bytestring criterion shakespeare text transformers + ]; + homepage = "http://www.yesodweb.com/"; + description = "Creation of type-safe, RESTful web applications"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yesod-crud" = callPackage ({ mkDerivation, base, classy-prelude, containers, MissingH , monad-control, persistent, random, safe, stm, uuid, yesod-core @@ -220114,8 +221217,8 @@ self: { }: mkDerivation { pname = "yesod-csp"; - version = "0.2.3.0"; - sha256 = "167yl3c68bfr91mqxl650lfa64d6ljaqach7cyl91gvdxwb1q262"; + version = "0.2.4.0"; + sha256 = "19cjmjg2byyswdcxa9llqarclzi6jslbd0yxxkn8l3kdgn2k2pg0"; libraryHaskellDepends = [ attoparsec base case-insensitive mono-traversable network-uri semigroups syb template-haskell text wai yesod yesod-core @@ -223614,8 +224717,8 @@ self: { pname = "ztail"; version = "1.2"; sha256 = "0krs58c22bg4b2r5zlvvyw87j8v1y1p8c2zy3gg1hwarjb4i9cqk"; - revision = "2"; - editedCabalFile = "0da9vwpn7nv37zznav18vp9h4knr0d433964dp3mvnh42ajb0490"; + revision = "3"; + editedCabalFile = "0j22pyi86qw5y4fgxygg9fndlwk8j9c2671bbbk3nws5xzkda1sm"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix index 076f43b71f3..3c954bdd147 100644 --- a/pkgs/development/libraries/boost/generic.nix +++ b/pkgs/development/libraries/boost/generic.nix @@ -117,7 +117,7 @@ let -exec sed '1i#line 1 "{}"' -i '{}' \; ) '' + optionalString (hostPlatform.libc == "msvcrt") '' - ${stdenv.cc.prefix}ranlib "$out/lib/"*.a + ${stdenv.cc.targetPrefix}ranlib "$out/lib/"*.a ''; in diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix index 41e863d4512..d131fc13ced 100644 --- a/pkgs/development/libraries/ffmpeg-full/default.nix +++ b/pkgs/development/libraries/ffmpeg-full/default.nix @@ -447,7 +447,7 @@ stdenv.mkDerivation rec { crossAttrs = { configurePlatforms = []; configureFlags = configureFlags ++ [ - "--cross-prefix=${stdenv.cc.prefix}" + "--cross-prefix=${stdenv.cc.targetPrefix}" "--enable-cross-compile" "--target_os=${hostPlatform.parsed.kernel.name}" "--arch=${hostPlatform.arch}" diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index 1bd8b739260..e8eab4827e6 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -173,7 +173,7 @@ stdenv.mkDerivation rec { crossAttrs = { configurePlatforms = []; configureFlags = configureFlags ++ [ - "--cross-prefix=${stdenv.cc.prefix}" + "--cross-prefix=${stdenv.cc.targetPrefix}" "--enable-cross-compile" "--target_os=${hostPlatform.parsed.kernel}" "--arch=${hostPlatform.arch}" diff --git a/pkgs/development/libraries/giflib/5.0.nix b/pkgs/development/libraries/giflib/5.0.nix deleted file mode 100644 index 95038284cd6..00000000000 --- a/pkgs/development/libraries/giflib/5.0.nix +++ /dev/null @@ -1,18 +0,0 @@ -{stdenv, fetchurl, xmlto, docbook_xml_dtd_412, docbook_xsl, libxml2 }: - -stdenv.mkDerivation { - name = "giflib-5.0.6"; - src = fetchurl { - url = mirror://sourceforge/giflib/giflib-5.0.6.tar.bz2; - sha256 = "1sk9ysh27nabwb6z7a38n8gy2y2rnl3vjkbapv7pbjnzrff862c9"; - }; - - buildInputs = [ xmlto docbook_xml_dtd_412 docbook_xsl libxml2 ]; - meta = { - description = "A library for reading and writing gif images"; - platforms = stdenv.lib.platforms.unix; - license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ fuuzetsu ]; - branch = "5.0"; - }; -} diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index b82fd5f1e29..325a6e5bfa9 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -43,7 +43,7 @@ let ''; ver_maj = "2.54"; - ver_min = "1"; + ver_min = "2"; in stdenv.mkDerivation rec { @@ -51,11 +51,12 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/glib/${ver_maj}/${name}.tar.xz"; - sha256 = "50c01b1419324f10fbf9b9709ec2164b18586968bdce7540583bf32302cf47a3"; + sha256 = "bb89e5c5aad33169a8c7f28b45671c7899c12f74caf707737f784d7102758e6c"; }; patches = optional stdenv.isDarwin ./darwin-compilation.patch - ++ optional doCheck ./skip-timer-test.patch; + ++ optional doCheck ./skip-timer-test.patch + ++ [ ./schema-override-variable.patch ]; outputs = [ "out" "dev" "devdoc" ]; outputBin = "dev"; diff --git a/pkgs/development/libraries/glib/schema-override-variable.patch b/pkgs/development/libraries/glib/schema-override-variable.patch new file mode 100644 index 00000000000..1cb5a730351 --- /dev/null +++ b/pkgs/development/libraries/glib/schema-override-variable.patch @@ -0,0 +1,12 @@ +--- a/gio/gsettingsschema.c ++++ b/gio/gsettingsschema.c +@@ -352,6 +352,9 @@ + + try_prepend_data_dir (g_get_user_data_dir ()); + ++ if ((path = g_getenv ("NIX_GSETTINGS_OVERRIDES_DIR")) != NULL) ++ try_prepend_dir (path); ++ + if ((path = g_getenv ("GSETTINGS_SCHEMA_DIR")) != NULL) + try_prepend_dir (path); + diff --git a/pkgs/development/libraries/gnutls/3.5.nix b/pkgs/development/libraries/gnutls/3.6.nix index 0422592e70d..9dc6d5389d9 100644 --- a/pkgs/development/libraries/gnutls/3.5.nix +++ b/pkgs/development/libraries/gnutls/3.6.nix @@ -1,11 +1,11 @@ { callPackage, fetchurl, ... } @ args: callPackage ./generic.nix (args // rec { - version = "3.5.15"; + version = "3.6.1"; src = fetchurl { - url = "mirror://gnupg/gnutls/v3.5/gnutls-${version}.tar.xz"; - sha256 = "1mgsxkbs44csw07ngwbqns2y2s03m975lk1sl5ay87wbic882q04"; + url = "mirror://gnupg/gnutls/v3.6/gnutls-${version}.tar.xz"; + sha256 = "1vdsir53ddxyapnxh5fpnfyij3scx3818iri4hl07g4lk4n0vc90"; }; # Skip two tests introduced in 3.5.11. Probable reasons of failure: @@ -14,5 +14,6 @@ callPackage ./generic.nix (args // rec { postPatch = '' sed '2iexit 77' -i tests/pkgconfig.sh sed '/^void doit(void)/,$s/{/{ exit(77);/; t' -i tests/trust-store.c + # TODO: remove just this line on some rebuild ''; }) diff --git a/pkgs/development/libraries/granite/default.nix b/pkgs/development/libraries/granite/default.nix index be869063111..4e41545687a 100644 --- a/pkgs/development/libraries/granite/default.nix +++ b/pkgs/development/libraries/granite/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { majorVersion = "0.4"; - minorVersion = "0.1"; + minorVersion = "1"; name = "granite-${majorVersion}.${minorVersion}"; src = fetchurl { url = "https://launchpad.net/granite/${majorVersion}/${majorVersion}.${minorVersion}/+download/${name}.tar.xz"; - sha256 = "1pf4jkz3xyn1sqv70063im80ayb5kdsqwqwx11dc7vgypsl458cm"; + sha256 = "177h5h1q4qd7g99mzbczvz78j8c9jf4f1gwdj9f6imbc7r913d4b"; }; cmakeFlags = "-DINTROSPECTION_GIRDIR=share/gir-1.0/ -DINTROSPECTION_TYPELIBDIR=lib/girepository-1.0"; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix index c52f30a21f7..4c377c73571 100644 --- a/pkgs/development/libraries/gtk+/3.x.nix +++ b/pkgs/development/libraries/gtk+/3.x.nix @@ -4,7 +4,7 @@ , waylandSupport ? stdenv.isLinux, wayland, wayland-protocols , xineramaSupport ? stdenv.isLinux , cupsSupport ? stdenv.isLinux, cups ? null -, darwin +, darwin, gnome3 }: assert cupsSupport -> cups != null; @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { buildInputs = [ libxkbcommon epoxy json_glib ]; propagatedBuildInputs = with xorg; with stdenv.lib; - [ expat glib cairo pango gdk_pixbuf atk at_spi2_atk + [ expat glib cairo pango gdk_pixbuf atk at_spi2_atk gnome3.gsettings_desktop_schemas libXrandr libXrender libXcomposite libXi libXcursor libSM libICE ] ++ optionals waylandSupport [ wayland wayland-protocols ] ++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ AppKit Cocoa ]) diff --git a/pkgs/development/libraries/gvfs/default.nix b/pkgs/development/libraries/gvfs/default.nix index 78f507ca146..15e7e736e0c 100644 --- a/pkgs/development/libraries/gvfs/default.nix +++ b/pkgs/development/libraries/gvfs/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, intltool, libtool , glib, dbus, udev, libgudev, udisks2, libgcrypt, libcap, polkit , libgphoto2, avahi, libarchive, fuse, libcdio, file, bzip2, lzma -, libxml2, libxslt, docbook_xsl, samba, libmtp +, libxml2, libxslt, docbook_xsl, docbook_xml_dtd_42, samba, libmtp , gnomeSupport ? false, gnome, makeWrapper }: let @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig intltool libtool file makeWrapper - libxml2 libxslt docbook_xsl + libxml2 libxslt docbook_xsl docbook_xml_dtd_42 ]; buildInputs = diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix index f5756d1f570..2c38387eb83 100644 --- a/pkgs/development/libraries/harfbuzz/default.nix +++ b/pkgs/development/libraries/harfbuzz/default.nix @@ -5,7 +5,7 @@ }: let - version = "1.5.1"; + version = "1.7.1"; inherit (stdenv.lib) optional optionals optionalString; in @@ -14,7 +14,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://www.freedesktop.org/software/harfbuzz/release/harfbuzz-${version}.tar.bz2"; - sha256 = "56838dfdad2729b8866763c82d623354d138a4d99d9ffb710c7d377b5cfc7c51"; + sha256 = "9645a6e83313b690602017f18d4eb2adf81f2e54c6fc4471e19331304965154e"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/libav/default.nix b/pkgs/development/libraries/libav/default.nix index e348fe0fae2..6a80a856df3 100644 --- a/pkgs/development/libraries/libav/default.nix +++ b/pkgs/development/libraries/libav/default.nix @@ -110,7 +110,7 @@ let crossAttrs = { configurePlatforms = []; configureFlags = configureFlags ++ [ - "--cross-prefix=${stdenv.cc.prefix}" + "--cross-prefix=${stdenv.cc.targetPrefix}" "--enable-cross-compile" "--target_os=linux" "--arch=${hostPlatform.arch}" diff --git a/pkgs/development/libraries/libbrotli/default.nix b/pkgs/development/libraries/libbrotli/default.nix deleted file mode 100644 index 03604e3a93e..00000000000 --- a/pkgs/development/libraries/libbrotli/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ stdenv, fetchFromGitHub, autoconf, automake, libtool, brotliUnstable }: - -stdenv.mkDerivation rec { - name = "libbrotli-${version}"; - version = "1.0"; - - src = fetchFromGitHub { - owner = "bagder"; - repo = "libbrotli"; - rev = name; - sha256 = "0apd3hpy3vaa7brkv8v0xwz05zbd5xv86rcbkwns4x39klba3m3y"; - }; - - nativeBuildInputs = [ autoconf automake libtool ]; - - preConfigure = '' - cp -r ${brotliUnstable.src}/* brotli/ - chmod -R +700 brotli - mkdir m4 - autoreconf --install --force --symlink - ''; - - meta = with stdenv.lib; { - description = "Meta project to build libraries from the brotli source code"; - longDescription = '' - Wrapper scripts and code around the brotli code base. - Builds libraries out of the brotli decode and encode sources. Uses autotools. - 'brotlidec' is the library for decoding, decompression - 'brotlienc' is the library for encoding, compression - ''; - - homepage = https://github.com/bagder/libbrotli; - license = licenses.mit; - platforms = platforms.all; - maintainers = []; - }; -} diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix index 992b1ea70dc..533d5d4cac8 100644 --- a/pkgs/development/libraries/libdrm/default.nix +++ b/pkgs/development/libraries/libdrm/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libpthreadstubs, libpciaccess, valgrind-light }: stdenv.mkDerivation rec { - name = "libdrm-2.4.84"; + name = "libdrm-2.4.88"; src = fetchurl { url = "http://dri.freedesktop.org/libdrm/${name}.tar.bz2"; - sha256 = "7ae9c24d91139ac9a2cdee06fe46dbe1c401a1eda1c0bd2a6d1ecf72f479e0aa"; + sha256 = "b5e55dbac2124e742e639f5b8553e8b7395863bf73dab4f77e99fe2fc25572b5"; }; outputs = [ "out" "dev" "bin" ]; @@ -20,7 +20,8 @@ stdenv.mkDerivation rec { "echo : \\\${ac_cv_func_clock_gettime=\'yes\'} > config.cache"; configureFlags = [ "--enable-install-test-programs" ] - ++ stdenv.lib.optionals (stdenv.isArm || stdenv.isAarch64) [ "--enable-tegra-experimental-api" "--enable-etnaviv-experimental-api" ] + ++ stdenv.lib.optionals (stdenv.isArm || stdenv.isAarch64) + [ "--enable-tegra-experimental-api" "--enable-etnaviv-experimental-api" ] ++ stdenv.lib.optional stdenv.isDarwin "-C"; crossAttrs.configureFlags = configureFlags ++ [ "--disable-intel" ]; diff --git a/pkgs/development/libraries/libsecret/default.nix b/pkgs/development/libraries/libsecret/default.nix index 0f8207e83c8..75438e00570 100644 --- a/pkgs/development/libraries/libsecret/default.nix +++ b/pkgs/development/libraries/libsecret/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, glib, pkgconfig, intltool, libxslt, docbook_xsl, gtk_doc -, libgcrypt, gobjectIntrospection, vala_0_32 }: +, libgcrypt, gobjectIntrospection, vala_0_38 }: let version = "0.18.5"; in @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ glib ]; nativeBuildInputs = [ pkgconfig intltool libxslt docbook_xsl ]; - buildInputs = [ libgcrypt gobjectIntrospection vala_0_32 ]; + buildInputs = [ libgcrypt gobjectIntrospection vala_0_38 ]; # optional: build docs with gtk-doc? (probably needs a flag as well) meta = { diff --git a/pkgs/development/libraries/libskk/default.nix b/pkgs/development/libraries/libskk/default.nix index 5fc72ab904c..fc5b41ac607 100644 --- a/pkgs/development/libraries/libskk/default.nix +++ b/pkgs/development/libraries/libskk/default.nix @@ -29,6 +29,8 @@ stdenv.mkDerivation rec { ln -s ${skk-dicts}/share/SKK-JISYO.L $dictDir/ ''; + enableParallelBuilding = true; + meta = { description = "A library to deal with Japanese kana-to-kanji conversion method"; longDescription = '' diff --git a/pkgs/development/libraries/libsoup/default.nix b/pkgs/development/libraries/libsoup/default.nix index 229a92d84bf..cdf24c79e5e 100644 --- a/pkgs/development/libraries/libsoup/default.nix +++ b/pkgs/development/libraries/libsoup/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, glib, libxml2, pkgconfig , gnomeSupport ? true, libgnome_keyring3, sqlite, glib_networking, gobjectIntrospection -, valaSupport ? true, vala_0_32 +, valaSupport ? true, vala_0_38 , libintlOrEmpty , intltool, python }: let @@ -25,7 +25,7 @@ stdenv.mkDerivation { outputs = [ "out" "dev" ]; buildInputs = libintlOrEmpty ++ [ intltool python sqlite ] - ++ stdenv.lib.optionals valaSupport [ vala_0_32 ]; + ++ stdenv.lib.optionals valaSupport [ vala_0_38 ]; nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ glib libxml2 gobjectIntrospection ] ++ stdenv.lib.optionals gnomeSupport [ libgnome_keyring3 ]; diff --git a/pkgs/development/libraries/libxmlxx/default.nix b/pkgs/development/libraries/libxmlxx/default.nix index 23b36db8fe1..226fe5be536 100644 --- a/pkgs/development/libraries/libxmlxx/default.nix +++ b/pkgs/development/libraries/libxmlxx/default.nix @@ -10,6 +10,8 @@ stdenv.mkDerivation rec { sha256 = "1sb3akryklvh2v6m6dihdnbpf1lkx441v972q9hlz1sq6bfspm2a"; }; + outputs = [ "out" "devdoc" ]; + nativeBuildInputs = [ pkgconfig perl ]; propagatedBuildInputs = [ libxml2 glibmm ]; diff --git a/pkgs/development/libraries/libxmlxx/v3.nix b/pkgs/development/libraries/libxmlxx/v3.nix index 646fdfbac4f..5e1e947b8f7 100644 --- a/pkgs/development/libraries/libxmlxx/v3.nix +++ b/pkgs/development/libraries/libxmlxx/v3.nix @@ -10,6 +10,8 @@ stdenv.mkDerivation rec { sha256 = "19kik79fmg61nv0by0a5f9wchrcfjwzvih4v2waw01hqflhqvp0r"; }; + outputs = [ "out" "devdoc" ]; + nativeBuildInputs = [ pkgconfig perl ]; buildInputs = [ glibmm ]; diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 728ef96666f..2fe872701b7 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -66,7 +66,7 @@ let in let - version = "17.2.4"; + version = "17.2.6"; branch = head (splitString "." version); driverLink = "/run/opengl-driver" + optionalString stdenv.isi686 "-32"; in @@ -81,7 +81,7 @@ stdenv.mkDerivation { "ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz" "https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz" ]; - sha256 = "0l75q9l4g15y66rqk2swqvj18qj60hpimv0f97jk44bfrpz0i92v"; + sha256 = "1pihiymglf3bf6w2vphac65v64hv71wgrj38mckbwc03c8j55n3a"; }; prePatch = "patchShebangs ."; diff --git a/pkgs/development/libraries/nettle/default.nix b/pkgs/development/libraries/nettle/default.nix index 3923daad6f4..5b998926f0a 100644 --- a/pkgs/development/libraries/nettle/default.nix +++ b/pkgs/development/libraries/nettle/default.nix @@ -1,10 +1,10 @@ { callPackage, fetchurl, ... } @ args: callPackage ./generic.nix (args // rec { - version = "3.3"; + version = "3.4"; src = fetchurl { url = "mirror://gnu/nettle/nettle-${version}.tar.gz"; - sha256 = "07mif3af077763vc35s1x8vzhzlgqcgxh67c1xr13jnhslkjd526"; + sha256 = "150y8655h629wn946dvzasq16qxsc1m9nf58mifvhl350bgl4ymf"; }; }) diff --git a/pkgs/development/libraries/newt/default.nix b/pkgs/development/libraries/newt/default.nix index e00decca2ff..c4e019bf3ac 100644 --- a/pkgs/development/libraries/newt/default.nix +++ b/pkgs/development/libraries/newt/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; crossAttrs = { - makeFlags = "CROSS_COMPILE=${stdenv.cc.prefix}"; + makeFlags = "CROSS_COMPILE=${stdenv.cc.targetPrefix}"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/pango/default.nix b/pkgs/development/libraries/pango/default.nix index 85032677aae..3806926fa24 100644 --- a/pkgs/development/libraries/pango/default.nix +++ b/pkgs/development/libraries/pango/default.nix @@ -6,14 +6,14 @@ with stdenv.lib; let ver_maj = "1.40"; - ver_min = "12"; + ver_min = "14"; in stdenv.mkDerivation rec { name = "pango-${ver_maj}.${ver_min}"; src = fetchurl { url = "mirror://gnome/sources/pango/${ver_maj}/${name}.tar.xz"; - sha256 = "75f1a9a8e4e2b28cbc078b50c1fa927ee4ded994d1ade97c5603e2d1f3161cfc"; + sha256 = "90af1beaa7bf9e4c52db29ec251ec4fd0a8f2cc185d521ad1f88d01b3a6a17e3"; }; outputs = [ "bin" "dev" "out" "devdoc" ]; diff --git a/pkgs/development/libraries/pcre2/default.nix b/pkgs/development/libraries/pcre2/default.nix index 3b698ff74cf..dd562d2e0f1 100644 --- a/pkgs/development/libraries/pcre2/default.nix +++ b/pkgs/development/libraries/pcre2/default.nix @@ -29,6 +29,13 @@ stdenv.mkDerivation rec { stripLen = 2; addPrefixes = true; }) + (fetchpatch { + name = "CVE-2017-8786.patch"; + url = "https://vcs.pcre.org/pcre2/code/trunk/src/pcre2test.c?r1=692&r2=697&view=patch"; + sha256 = "1c629nzrk4il2rfclwyc1a373q58m4q9ys9wr91zhl4skfk7x19b"; + stripLen = 2; + addPrefixes = true; + }) ]; outputs = [ "bin" "dev" "out" "doc" "man" "devdoc" ]; diff --git a/pkgs/development/libraries/qt-4.x/4.8/default.nix b/pkgs/development/libraries/qt-4.x/4.8/default.nix index f5bce5fb299..a54860ff0ac 100644 --- a/pkgs/development/libraries/qt-4.x/4.8/default.nix +++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix @@ -67,6 +67,7 @@ stdenv.mkDerivation rec { patches = [ ./glib-2.32.patch ./libressl.patch + ./parallel-configure.patch (substituteAll { src = ./dlopen-absolute-paths.diff; cups = if cups != null then stdenv.lib.getLib cups else null; @@ -117,6 +118,7 @@ stdenv.mkDerivation rec { -demosdir $TMPDIR/share/doc/${name}/demos -datadir $out/share/${name} -translationdir $out/share/${name}/translations + --jobs=$NIX_BUILD_CORES " unset LD # Makefile uses gcc for linking; setting LD interferes '' + optionalString stdenv.cc.isClang '' @@ -124,6 +126,11 @@ stdenv.mkDerivation rec { sed -i 's/QMAKE_CXX = g++/QMAKE_CXX = clang++/' mkspecs/common/g++-base.conf ''; + postConfigure = '' + echo "applying patch ${./parallel-build.patch}" + patch -p1 < ${./parallel-build.patch} + ''; + prefixKey = "-prefix "; configureFlags = @@ -229,11 +236,11 @@ stdenv.mkDerivation rec { '' + optionalString hostPlatform.isMinGW " -xplatform win32-g++-4.6"; patches = []; preConfigure = '' - sed -i -e 's/ g++/ ${stdenv.cc.prefix}g++/' \ - -e 's/ gcc/ ${stdenv.cc.prefix}gcc/' \ - -e 's/ ar/ ${stdenv.cc.prefix}ar/' \ - -e 's/ strip/ ${stdenv.cc.prefix}strip/' \ - -e 's/ windres/ ${stdenv.cc.prefix}windres/' \ + sed -i -e 's/ g++/ ${stdenv.cc.targetPrefix}g++/' \ + -e 's/ gcc/ ${stdenv.cc.targetPrefix}gcc/' \ + -e 's/ ar/ ${stdenv.cc.targetPrefix}ar/' \ + -e 's/ strip/ ${stdenv.cc.targetPrefix}strip/' \ + -e 's/ windres/ ${stdenv.cc.targetPrefix}windres/' \ mkspecs/win32-g++/qmake.conf ''; @@ -251,7 +258,7 @@ stdenv.mkDerivation rec { homepage = http://qt-project.org/; description = "A cross-platform application framework for C++"; license = licenses.lgpl21Plus; # or gpl3 - maintainers = with maintainers; [ lovek323 phreedom sander ]; + maintainers = with maintainers; [ orivej lovek323 phreedom sander ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/qt-4.x/4.8/parallel-build.patch b/pkgs/development/libraries/qt-4.x/4.8/parallel-build.patch new file mode 100644 index 00000000000..5783543e844 --- /dev/null +++ b/pkgs/development/libraries/qt-4.x/4.8/parallel-build.patch @@ -0,0 +1,6 @@ +--- a/tools/designer/src/lib/Makefile ++++ b/tools/designer/src/lib/Makefile +@@ -7167,2 +7167,3 @@ compiler_moc_header_clean: + .uic/release-shared/ui_qtgradientviewdialog.h \ ++ .uic/release-shared/ui_qtgradientview.h \ + ../../../shared/qtgradienteditor/qtgradientviewdialog.h diff --git a/pkgs/development/libraries/qt-4.x/4.8/parallel-configure.patch b/pkgs/development/libraries/qt-4.x/4.8/parallel-configure.patch new file mode 100644 index 00000000000..b9b9d6d0a68 --- /dev/null +++ b/pkgs/development/libraries/qt-4.x/4.8/parallel-configure.patch @@ -0,0 +1,22 @@ +--- a/configure ++++ b/configure +@@ -1087,2 +1087,3 @@ fi + #------------------------------------------------------------------------------- ++JOBS= + +@@ -2528,2 +2529,5 @@ while [ "$#" -gt 0 ]; do + ;; ++ jobs) ++ JOBS=-j$VAL ++ ;; + *) +@@ -5072,3 +5076,3 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; + if "$WHICH" makedepend >/dev/null 2>&1 && grep 'depend:' "$mkfile" >/dev/null 2>&1; then +- (cd "$outpath/qmake" && "$MAKE" -f "$mkfile" depend) >/dev/null 2>&1 ++ (cd "$outpath/qmake" && "$MAKE" $JOBS -f "$mkfile" depend) >/dev/null 2>&1 + sed "s,^.*/\([^/]*.o\):,\1:,g" "$mkfile" >"$mkfile.tmp" +@@ -5080,3 +5084,3 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; + QMAKE_BUILD_ERROR=no +- (cd "$outpath/qmake"; "$MAKE") || QMAKE_BUILD_ERROR=yes ++ (cd "$outpath/qmake"; "$MAKE" $JOBS) || QMAKE_BUILD_ERROR=yes + [ '!' -z "$QCONFIG_H" ] && mv -f "$QCONFIG_H" "$QMAKE_QCONFIG_H" #move qmake's qconfig.h to qconfig.h.qmake diff --git a/pkgs/development/libraries/zeitgeist/default.nix b/pkgs/development/libraries/zeitgeist/default.nix index ed84dec365e..3c50de6cc6b 100644 --- a/pkgs/development/libraries/zeitgeist/default.nix +++ b/pkgs/development/libraries/zeitgeist/default.nix @@ -14,8 +14,6 @@ stdenv.mkDerivation rec { sha256 = "0vw6m0azycqabbz8f0fd8xsh5kf6j3ig4wpqlhw6sklvf44ii5b8"; }; - NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; - configureScript = "./autogen.sh"; configureFlags = [ "--with-session-bus-services-dir=$(out)/share/dbus-1/services" ]; diff --git a/pkgs/development/libraries/zlib/default.nix b/pkgs/development/libraries/zlib/default.nix index ceb4bb9f370..de2e0b62f9e 100644 --- a/pkgs/development/libraries/zlib/default.nix +++ b/pkgs/development/libraries/zlib/default.nix @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { ]; makeFlags = [ - "PREFIX=${stdenv.cc.prefix}" + "PREFIX=${stdenv.cc.targetPrefix}" ] ++ stdenv.lib.optionals (hostPlatform.libc == "msvcrt") [ "-f" "win32/Makefile.gcc" ] ++ stdenv.lib.optionals (!static) [ diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix index 94428ecc174..b04b38e3048 100644 --- a/pkgs/development/tools/build-managers/cmake/default.nix +++ b/pkgs/development/tools/build-managers/cmake/default.nix @@ -17,7 +17,7 @@ with stdenv.lib; let os = stdenv.lib.optionalString; majorVersion = "3.9"; - minorVersion = "4"; + minorVersion = "6"; version = "${majorVersion}.${minorVersion}"; in @@ -28,8 +28,8 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}files/v${majorVersion}/cmake-${version}.tar.gz"; - # from https://cmake.org/files/v3.9/cmake-3.9.4-SHA-256.txt - sha256 = "b5d86f12ae0072db520fdbdad67405f799eb728b610ed66043c20a92b4906ca1"; + # from https://cmake.org/files/v3.9/cmake-3.9.6-SHA-256.txt + sha256 = "7410851a783a41b521214ad987bb534a7e4a65e059651a2514e6ebfc8f46b218"; }; prePatch = optionalString (!useSharedLibraries) '' diff --git a/pkgs/development/tools/build-managers/meson/default.nix b/pkgs/development/tools/build-managers/meson/default.nix index 8e4c5d4801a..8092e9b16f1 100644 --- a/pkgs/development/tools/build-managers/meson/default.nix +++ b/pkgs/development/tools/build-managers/meson/default.nix @@ -18,6 +18,15 @@ python3Packages.buildPythonApplication rec { popd ''; + patches = [ + # Unlike libtool, vanilla Meson does not pass any information + # about the path library will be installed to to g-ir-scanner, + # breaking the GIR when path other than ${!outputLib}/lib is used. + # We patch Meson to add a --fallback-library-path argument with + # library install_dir to g-ir-scanner. + ./gir-fallback-path.patch + ]; + postPatch = '' sed -i -e 's|e.fix_rpath(install_rpath)||' mesonbuild/scripts/meson_install.py ''; diff --git a/pkgs/development/tools/build-managers/meson/gir-fallback-path.patch b/pkgs/development/tools/build-managers/meson/gir-fallback-path.patch new file mode 100644 index 00000000000..d8d14f188a2 --- /dev/null +++ b/pkgs/development/tools/build-managers/meson/gir-fallback-path.patch @@ -0,0 +1,13 @@ +--- a/mesonbuild/modules/gnome.py ++++ b/mesonbuild/modules/gnome.py +@@ -427,6 +427,10 @@ + scan_command += ['--no-libtool', '--namespace=' + ns, '--nsversion=' + nsversion, '--warn-all', + '--output', '@OUTPUT@'] + ++ fallback_libpath = girtarget.get_custom_install_dir()[0] ++ if fallback_libpath is not None and isinstance(fallback_libpath, str) and len(fallback_libpath) > 0 and fallback_libpath[0] == "/": ++ scan_command += ['--fallback-library-path=' + fallback_libpath] ++ + header = kwargs.pop('header', None) + if header: + if not isinstance(header, str): diff --git a/pkgs/development/tools/documentation/gnome-doc-utils/default.nix b/pkgs/development/tools/documentation/gnome-doc-utils/default.nix index 5f0b6b628cb..f6920a83e09 100644 --- a/pkgs/development/tools/documentation/gnome-doc-utils/default.nix +++ b/pkgs/development/tools/documentation/gnome-doc-utils/default.nix @@ -10,8 +10,14 @@ python2Packages.buildPythonApplication { sha256 = "19n4x25ndzngaciiyd8dd6s2mf9gv6nv3wv27ggns2smm7zkj1nb"; }; + nativeBuildInputs = [ intltool pkgconfig ]; + buildInputs = [ libxslt ]; + configureFlags = "--disable-scrollkeeper"; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libxslt intltool ]; + + preBuild = '' + substituteInPlace xml2po/xml2po/Makefile --replace '-e "s+^#!.*python.*+#!$(PYTHON)+"' '-e "s\"^#!.*python.*\"#!$(PYTHON)\""' + ''; + propagatedBuildInputs = [ libxml2Python ]; } diff --git a/pkgs/development/tools/documentation/gtk-doc/respect-xml-catalog-files-var.patch b/pkgs/development/tools/documentation/gtk-doc/respect-xml-catalog-files-var.patch index 78c57306b79..95f6879a006 100644 --- a/pkgs/development/tools/documentation/gtk-doc/respect-xml-catalog-files-var.patch +++ b/pkgs/development/tools/documentation/gtk-doc/respect-xml-catalog-files-var.patch @@ -1,28 +1,13 @@ -diff --git a/m4/gtkdoc_jh_check_xml_catalog.m4 b/m4/gtkdoc_jh_check_xml_catalog.m4 -index 618c1c9..1842a0d 100644 --- a/m4/gtkdoc_jh_check_xml_catalog.m4 +++ b/m4/gtkdoc_jh_check_xml_catalog.m4 -@@ -10,7 +10,21 @@ AC_DEFUN([JH_CHECK_XML_CATALOG], +@@ -5,8 +5,8 @@ + [ + AC_REQUIRE([JH_PATH_XML_CATALOG],[JH_PATH_XML_CATALOG(,[:])])dnl + AC_MSG_CHECKING([for ifelse([$2],,[$1],[$2]) in XML catalog]) +- if $jh_found_xmlcatalog && \ +- AC_RUN_LOG([$XMLCATALOG --noout "$XML_CATALOG_FILE" "$1" >&2]); then ++ # empty argument forces libxml to use XML_CATALOG_FILES variable ++ if AC_RUN_LOG([$XMLCATALOG --noout "" "$1" >&2]); then AC_MSG_RESULT([found]) ifelse([$3],,,[$3]) else -- AC_MSG_RESULT([not found]) -- ifelse([$4],,[AC_MSG_ERROR([could not find ifelse([$2],,[$1],[$2]) in XML catalog])],[$4]) -+ jh_check_xml_catalog_saved_ifs="$IFS" -+ IFS=' ' -+ for f in $XML_CATALOG_FILES; do -+ if [[ -f "$f" ]] && \ -+ AC_RUN_LOG([$XMLCATALOG --noout "$f" "$1" >&2]); then -+ jh_found_xmlcatalog=true -+ AC_MSG_RESULT([found]) -+ ifelse([$3],,,[$3]) -+ break -+ fi -+ done -+ IFS="$jh_check_xml_catalog_saved_ifs" -+ if ! $jh_found_xmlcatalog; then -+ AC_MSG_RESULT([not found]) -+ ifelse([$4],,[AC_MSG_ERROR([could not find ifelse([$2],,[$1],[$2]) in XML catalog])],[$4]) -+ fi - fi - ]) diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix index 8e44a982067..519d5c722af 100644 --- a/pkgs/development/tools/misc/binutils/default.nix +++ b/pkgs/development/tools/misc/binutils/default.nix @@ -11,13 +11,13 @@ let version = "2.28.1"; basename = "binutils-${version}"; inherit (stdenv.lib) optional optionals optionalString; - # The prefix prepended to binary names to allow multiple binuntils on the + # The targetPrefix prepended to binary names to allow multiple binuntils on the # PATH to both be usable. - prefix = optionalString (targetPlatform != hostPlatform) "${targetPlatform.config}-"; + targetPrefix = optionalString (targetPlatform != hostPlatform) "${targetPlatform.config}-"; in stdenv.mkDerivation rec { - name = prefix + basename; + name = targetPrefix + basename; src = fetchurl { url = "mirror://gnu/binutils/${basename}.tar.bz2"; @@ -81,7 +81,7 @@ stdenv.mkDerivation rec { then "-Wno-string-plus-int -Wno-deprecated-declarations" else "-static-libgcc"; - # TODO(@Ericson2314): Always pass "--target" and always prefix. + # TODO(@Ericson2314): Always pass "--target" and always targetPrefix. configurePlatforms = # TODO(@Ericson2314): Figure out what's going wrong with Arm if hostPlatform == targetPlatform && targetPlatform.isArm @@ -102,7 +102,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; passthru = { - inherit prefix version; + inherit targetPrefix version; }; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/yq/default.nix b/pkgs/development/tools/yq/default.nix new file mode 100644 index 00000000000..6ddea86f1a7 --- /dev/null +++ b/pkgs/development/tools/yq/default.nix @@ -0,0 +1,26 @@ +{ stdenv, lib, buildPythonApplication, fetchPypi, pyyaml, jq }: + +buildPythonApplication rec { + + name = "${pname}-${version}"; + pname = "yq"; + version = "2.3.3"; + + propagatedBuildInputs = [ pyyaml jq ]; + + # ValueError: underlying buffer has been detached + doCheck = false; + + src = fetchPypi { + inherit pname version; + sha256 = "14ywdi464z68qclsqzb8r50rzmypknaz74zmpppkahjigfcfppm3"; + }; + + meta = with lib; { + description = "Command-line YAML processor - jq wrapper for YAML documents."; + homepage = https://pypi.python.org/pypi/yq; + license = [ licenses.asl20 ]; + maintainers = [ maintainers.womfoo ]; + }; + +} diff --git a/pkgs/misc/drivers/gutenprint/default.nix b/pkgs/misc/drivers/gutenprint/default.nix index 7917d1e3616..3a46414512c 100644 --- a/pkgs/misc/drivers/gutenprint/default.nix +++ b/pkgs/misc/drivers/gutenprint/default.nix @@ -1,6 +1,6 @@ # this package was called gimp-print in the past -{ stdenv, lib, fetchurl, pkgconfig -, ijs, makeWrapper +{ stdenv, lib, fetchurl, makeWrapper, pkgconfig +, ijs, zlib , gimp2Support ? false, gimp , cupsSupport ? true, cups, libusb, perl }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper pkgconfig ]; buildInputs = - [ ijs ] + [ ijs zlib ] ++ lib.optionals gimp2Support [ gimp.gtk gimp ] ++ lib.optionals cupsSupport [ cups libusb perl ]; diff --git a/pkgs/misc/emulators/retroarch/cores.nix b/pkgs/misc/emulators/retroarch/cores.nix index c186b1a2cf1..605cb7261a2 100644 --- a/pkgs/misc/emulators/retroarch/cores.nix +++ b/pkgs/misc/emulators/retroarch/cores.nix @@ -204,7 +204,7 @@ in description = "Enhanced Genesis Plus libretro port"; }; - mame = mkLibRetroCore { + mame = (mkLibRetroCore { core = "mame"; src = fetchRetro { repo = "mame"; @@ -214,6 +214,12 @@ in description = "Port of MAME to libretro"; extraBuildInputs = [ alsaLib mesa portaudio python27 xorg.libX11 ]; + }).override { + postPatch = '' + # Prevent the failure during the parallel building of: + # make -C 3rdparty/genie/build/gmake.linux -f genie.make obj/Release/src/host/lua-5.3.0/src/lgc.o + mkdir -p 3rdparty/genie/build/gmake.linux/obj/Release/src/host/lua-5.3.0/src + ''; }; mgba = mkLibRetroCore rec { diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix index 1947fd30a40..199e4bd896d 100644 --- a/pkgs/misc/uboot/default.nix +++ b/pkgs/misc/uboot/default.nix @@ -63,7 +63,7 @@ let crossAttrs = { makeFlags = [ "ARCH=${hostPlatform.platform.kernelArch}" - "CROSS_COMPILE=${stdenv.cc.prefix}" + "CROSS_COMPILE=${stdenv.cc.targetPrefix}" ]; }; diff --git a/pkgs/os-specific/darwin/binutils/default.nix b/pkgs/os-specific/darwin/binutils/default.nix index 8ac93689373..613606b5035 100644 --- a/pkgs/os-specific/darwin/binutils/default.nix +++ b/pkgs/os-specific/darwin/binutils/default.nix @@ -3,24 +3,24 @@ }: # Make sure both underlying packages claim to have prepended their binaries -# with the same prefix. -assert binutils-raw.prefix == cctools.prefix; +# with the same targetPrefix. +assert binutils-raw.targetPrefix == cctools.targetPrefix; let - inherit (binutils-raw) prefix; + inherit (binutils-raw) targetPrefix; cmds = [ "ar" "ranlib" "as" "dsymutil" "install_name_tool" "ld" "strip" "otool" "lipo" "nm" "strings" "size" ]; in -# TODO loop over prefixed binaries too +# TODO loop over targetPrefixed binaries too stdenv.mkDerivation { - name = "${prefix}cctools-binutils-darwin"; + name = "${targetPrefix}cctools-binutils-darwin"; buildCommand = '' mkdir -p $out/bin $out/include - ln -s ${binutils-raw.out}/bin/${prefix}c++filt $out/bin/${prefix}c++filt + ln -s ${binutils-raw.out}/bin/${targetPrefix}c++filt $out/bin/${targetPrefix}c++filt # We specifically need: # - ld: binutils doesn't provide it on darwin @@ -33,7 +33,7 @@ stdenv.mkDerivation { # - strip: the binutils one seems to break mach-o files # - lipo: gcc build assumes it exists # - nm: the gnu one doesn't understand many new load commands - for i in ${stdenv.lib.concatStringsSep " " (builtins.map (e: prefix + e) cmds)}; do + for i in ${stdenv.lib.concatStringsSep " " (builtins.map (e: targetPrefix + e) cmds)}; do ln -sf "${cctools}/bin/$i" "$out/bin/$i" done @@ -44,6 +44,6 @@ stdenv.mkDerivation { ''; passthru = { - inherit prefix; + inherit targetPrefix; }; } diff --git a/pkgs/os-specific/darwin/cctools/port.nix b/pkgs/os-specific/darwin/cctools/port.nix index e08e7833983..bcca11d66b1 100644 --- a/pkgs/os-specific/darwin/cctools/port.nix +++ b/pkgs/os-specific/darwin/cctools/port.nix @@ -5,9 +5,9 @@ }: let - # The prefix prepended to binary names to allow multiple binuntils on the + # The targetPrefix prepended to binary names to allow multiple binuntils on the # PATH to both be usable. - prefix = stdenv.lib.optionalString + targetPrefix = stdenv.lib.optionalString (targetPlatform != hostPlatform) "${targetPlatform.config}-"; in @@ -19,7 +19,7 @@ assert (!hostPlatform.isDarwin) -> (maloader != null && xctoolchain != null); let baseParams = rec { - name = "${prefix}cctools-port-${version}"; + name = "${targetPrefix}cctools-port-${version}"; version = "895"; src = fetchFromGitHub { @@ -49,7 +49,7 @@ let enableParallelBuilding = true; - # TODO(@Ericson2314): Always pass "--target" and always prefix. + # TODO(@Ericson2314): Always pass "--target" and always targetPrefix. configurePlatforms = [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target"; configureFlags = stdenv.lib.optionals (!stdenv.isDarwin) [ "CXXFLAGS=-I${libcxx}/include/c++/v1" @@ -113,7 +113,7 @@ let ''; passthru = { - inherit prefix; + inherit targetPrefix; }; meta = { diff --git a/pkgs/os-specific/linux/busybox/default.nix b/pkgs/os-specific/linux/busybox/default.nix index 0030f60000d..03b30af6c3e 100644 --- a/pkgs/os-specific/linux/busybox/default.nix +++ b/pkgs/os-specific/linux/busybox/default.nix @@ -78,7 +78,7 @@ stdenv.mkDerivation rec { CONFIG_DEFAULT_SETFONT_DIR "/etc/kbd" ${extraConfig} - CONFIG_CROSS_COMPILER_PREFIX "${stdenv.cc.prefix}" + CONFIG_CROSS_COMPILER_PREFIX "${stdenv.cc.targetPrefix}" EOF make oldconfig @@ -87,7 +87,7 @@ stdenv.mkDerivation rec { ''; postConfigure = lib.optionalString useMusl '' - makeFlagsArray+=("CC=${stdenv.cc.prefix}gcc -isystem ${musl}/include -B${musl}/lib -L${musl}/lib") + makeFlagsArray+=("CC=${stdenv.cc.targetPrefix}gcc -isystem ${musl}/include -B${musl}/lib -L${musl}/lib") ''; nativeBuildInputs = lib.optional (hostPlatform != buildPlatform) buildPackages.stdenv.cc; diff --git a/pkgs/os-specific/linux/kernel/perf.nix b/pkgs/os-specific/linux/kernel/perf.nix index b64242e911d..4bcf6e037e0 100644 --- a/pkgs/os-specific/linux/kernel/perf.nix +++ b/pkgs/os-specific/linux/kernel/perf.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation { /* I don't want cross-python or cross-perl - I don't know if cross-python even works */ propagatedBuildInputs = [ elfutils.crossDrv newt.crossDrv ]; - makeFlags = "CROSS_COMPILE=${stdenv.cc.prefix}"; + makeFlags = "CROSS_COMPILE=${stdenv.cc.targetPrefix}"; elfutils = elfutils.crossDrv; inherit (kernel.crossDrv) src patches; }; diff --git a/pkgs/os-specific/linux/klibc/default.nix b/pkgs/os-specific/linux/klibc/default.nix index 92ac1a77898..c503b982aa2 100644 --- a/pkgs/os-specific/linux/klibc/default.nix +++ b/pkgs/os-specific/linux/klibc/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ] # TODO(@Ericson2314): We now can get the ABI from # `hostPlatform.parsed.abi`, is this still a good idea? ++ stdenv.lib.optional (hostPlatform.platform.kernelArch == "arm") "CONFIG_AEABI=y" - ++ stdenv.lib.optional (hostPlatform != buildPlatform) "CROSS_COMPILE=${stdenv.cc.prefix}"; + ++ stdenv.lib.optional (hostPlatform != buildPlatform) "CROSS_COMPILE=${stdenv.cc.targetPrefix}"; # Install static binaries as well. postInstall = '' diff --git a/pkgs/os-specific/linux/mdadm/4.nix b/pkgs/os-specific/linux/mdadm/4.nix index 5511d72884a..f9c2a5e09af 100644 --- a/pkgs/os-specific/linux/mdadm/4.nix +++ b/pkgs/os-specific/linux/mdadm/4.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { "MANDIR=$(out)/share/man" "RUN_DIR=/dev/.mdadm" "STRIP=" ] ++ stdenv.lib.optionals (hostPlatform != buildPlatform) [ - "CROSS_COMPILE=${stdenv.cc.prefix}" + "CROSS_COMPILE=${stdenv.cc.targetPrefix}" ]; nativeBuildInputs = [ groff ]; diff --git a/pkgs/os-specific/linux/mdadm/default.nix b/pkgs/os-specific/linux/mdadm/default.nix index 0929bae991d..1e2c1dafb2d 100644 --- a/pkgs/os-specific/linux/mdadm/default.nix +++ b/pkgs/os-specific/linux/mdadm/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { "MANDIR=$(out)/share/man" "RUN_DIR=/dev/.mdadm" "STRIP=" ] ++ stdenv.lib.optionals (hostPlatform != buildPlatform) [ - "CROSS_COMPILE=${stdenv.cc.prefix}" + "CROSS_COMPILE=${stdenv.cc.targetPrefix}" ]; nativeBuildInputs = [ groff ]; diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 7c8ffef86ee..aeda85584e7 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -15,8 +15,8 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "nixos"; repo = "systemd"; - rev = "ba777535a890c2a2b7677dfacc63e12c578b9b3f"; - sha256 = "1vb45fbqkrgczfwkb0y07ldnwhjqk2sh446hzfkdn8hrwl1lifg5"; + rev = "eef5613fda5"; + sha256 = "0wgh5y319v56hcs82mhs58ipb100cz4x41vz3kh4bq1n7sx88cdz"; }; outputs = [ "out" "lib" "man" "dev" ]; diff --git a/pkgs/os-specific/windows/jom/default.nix b/pkgs/os-specific/windows/jom/default.nix index b2b23f20045..8befa51566d 100644 --- a/pkgs/os-specific/windows/jom/default.nix +++ b/pkgs/os-specific/windows/jom/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { QTDIR = qt48; crossAttrs = { - # cmakeFlags = "-DWIN32=1 -DCMAKE_SYSTEM_NAME=Windows -DCMAKE_RC_COMPILER=${stdenv.cc.prefix}windres"; + # cmakeFlags = "-DWIN32=1 -DCMAKE_SYSTEM_NAME=Windows -DCMAKE_RC_COMPILER=${stdenv.cc.targetPrefix}windres"; QTDIR = qt48.crossDrv; preBuild = '' export NIX_CROSS_CFLAGS_COMPILE=-fpermissive diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix index f59d7717756..de6fd61ee81 100644 --- a/pkgs/servers/http/nginx/modules.nix +++ b/pkgs/servers/http/nginx/modules.nix @@ -5,10 +5,10 @@ src = fetchFromGitHub { owner = "google"; repo = "ngx_brotli"; - rev = "788615eab7c5e0a984278113c55248305620df14"; - sha256 = "02514bbjdhm9m38vljdh626d3c1783jxsxawv5c6bzblwmb8xgvf"; + rev = "bfd2885b2da4d763fed18f49216bb935223cd34b"; + sha256 = "04yx1n0wi3l2x37jd1ynl9951qxkn8xp42yv0mfp1qz9svips81n"; + fetchSubmodules = true; }; - inputs = [ pkgs.libbrotli ]; }; rtmp = { diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index a0a337dd428..d1c7c81c101 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -44,16 +44,16 @@ let }) // {inherit libX11 xproto libXt ;}; bdftopcf = (mkDerivation "bdftopcf" { - name = "bdftopcf-1.0.5"; + name = "bdftopcf-1.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/bdftopcf-1.0.5.tar.bz2; - sha256 = "09i03sk878cmx2i40lkpsysn7zqcvlczb30j7x3lryb11jz4gx1q"; + url = mirror://xorg/individual/app/bdftopcf-1.1.tar.bz2; + sha256 = "18hiscgljrz10zjcws25bis32nyrg3hzgmiq6scrh7izqmgz0kab"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libXfont ]; + buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit libXfont ;}; + }) // {inherit ;}; bigreqsproto = (mkDerivation "bigreqsproto" { name = "bigreqsproto-1.1.2"; @@ -800,11 +800,11 @@ let }) // {inherit compositeproto libX11 libXfixes xproto ;}; libXcursor = (mkDerivation "libXcursor" { - name = "libXcursor-1.1.14"; + name = "libXcursor-1.1.15"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libXcursor-1.1.14.tar.bz2; - sha256 = "1prkdicl5y5yx32h1azh6gjfbijvjp415javv8dsakd13jrarilv"; + url = mirror://xorg/individual/lib/libXcursor-1.1.15.tar.bz2; + sha256 = "0syzlfvh29037p0vnlc8f3jxz8nl55k65blswsakklkwsc6nfki9"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ fixesproto libX11 libXfixes xproto libXrender ]; @@ -860,11 +860,11 @@ let }) // {inherit fixesproto libX11 xextproto xproto ;}; libXfont = (mkDerivation "libXfont" { - name = "libXfont-1.5.3"; + name = "libXfont-1.5.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libXfont-1.5.3.tar.bz2; - sha256 = "1l4k3i3xzqdmaszykh6bb2ah78p6c3z7fak7xzgq2d38s87w31db"; + url = mirror://xorg/individual/lib/libXfont-1.5.4.tar.bz2; + sha256 = "0hiji1bvpl78aj3a3141hkk353aich71wv8l5l2z51scfy878zqs"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libfontenc fontsproto freetype xproto xtrans zlib ]; @@ -872,11 +872,11 @@ let }) // {inherit libfontenc fontsproto freetype xproto xtrans zlib ;}; libXfont2 = (mkDerivation "libXfont2" { - name = "libXfont2-2.0.2"; + name = "libXfont2-2.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libXfont2-2.0.2.tar.bz2; - sha256 = "04f1lswh1ridkycgaivf1hrr77l5ap8smbfr2rqjrm7phwxqs24l"; + url = mirror://xorg/individual/lib/libXfont2-2.0.3.tar.bz2; + sha256 = "0klwmimmhm3axpj8pwn5l41lbggh47r5aazhw63zxkbwfgyvg2hf"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libfontenc fontsproto freetype xproto xtrans zlib ]; @@ -1112,11 +1112,11 @@ let }) // {inherit xproto zlib ;}; libpciaccess = (mkDerivation "libpciaccess" { - name = "libpciaccess-0.13.5"; + name = "libpciaccess-0.14"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libpciaccess-0.13.5.tar.bz2; - sha256 = "16dr80rdw5bzdyhahvilfjrflj7scs2yl2mmghsb84f3nglm8b3m"; + url = mirror://xorg/individual/lib/libpciaccess-0.14.tar.bz2; + sha256 = "197jbcpvp4z4x6j705mq2y4fsnnypy6f85y8xalgwhgx5bhl7x9x"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ zlib ]; @@ -1760,11 +1760,11 @@ let }) // {inherit inputproto xorgserver xproto ;}; xf86inputlibinput = (mkDerivation "xf86inputlibinput" { - name = "xf86-input-libinput-0.25.0"; + name = "xf86-input-libinput-0.26.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-input-libinput-0.25.0.tar.bz2; - sha256 = "0vsmijamfzf6vcljrr0am2qcz33zl2l0lj2mzmbwgrm7ixjx2zxv"; + url = mirror://xorg/individual/driver/xf86-input-libinput-0.26.0.tar.bz2; + sha256 = "0yrqs88b7yn9nljwlxzn76jfmvf0sh939kzij5b2jvr2qa7mbjmb"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ inputproto xorgserver xproto ]; diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 5286b805be2..20d57b32dd7 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -24,6 +24,10 @@ let compose = f: g: x: f (g x); in { + bdftopcf = attrs: attrs // { + buildInputs = attrs.buildInputs ++ [ xorg.xproto xorg.fontsproto ]; + }; + bitmap = attrs: attrs // { nativeBuildInputs = attrs.nativeBuildInputs ++ [ makeWrapper ]; postInstall = '' diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list index 7ad172b2c5e..4ea77fee443 100644 --- a/pkgs/servers/x11/xorg/tarballs-7.7.list +++ b/pkgs/servers/x11/xorg/tarballs-7.7.list @@ -1,5 +1,5 @@ mirror://xorg/X11R7.7/src/everything/applewmproto-1.4.2.tar.bz2 -mirror://xorg/individual/app/bdftopcf-1.0.5.tar.bz2 +mirror://xorg/individual/app/bdftopcf-1.1.tar.bz2 mirror://xorg/X11R7.7/src/everything/bigreqsproto-1.1.2.tar.bz2 mirror://xorg/individual/app/bitmap-1.0.8.tar.gz mirror://xorg/X11R7.7/src/everything/compositeproto-0.4.2.tar.bz2 @@ -57,20 +57,20 @@ mirror://xorg/individual/lib/libxshmfence-1.2.tar.bz2 mirror://xorg/individual/lib/libfontenc-1.1.3.tar.bz2 mirror://xorg/individual/lib/libFS-1.0.7.tar.bz2 mirror://xorg/individual/lib/libICE-1.0.9.tar.bz2 -mirror://xorg/individual/lib/libpciaccess-0.13.5.tar.bz2 +mirror://xorg/individual/lib/libpciaccess-0.14.tar.bz2 mirror://xorg/individual/lib/libSM-1.2.2.tar.bz2 mirror://xorg/X11R7.7/src/everything/libWindowsWM-1.0.1.tar.bz2 mirror://xorg/individual/lib/libX11-1.6.5.tar.bz2 mirror://xorg/individual/lib/libXau-1.0.8.tar.bz2 mirror://xorg/individual/lib/libXaw-1.0.13.tar.bz2 mirror://xorg/individual/lib/libXcomposite-0.4.4.tar.bz2 -mirror://xorg/individual/lib/libXcursor-1.1.14.tar.bz2 +mirror://xorg/individual/lib/libXcursor-1.1.15.tar.bz2 mirror://xorg/individual/lib/libXdamage-1.1.4.tar.bz2 mirror://xorg/individual/lib/libXdmcp-1.1.2.tar.bz2 mirror://xorg/individual/lib/libXext-1.3.3.tar.bz2 mirror://xorg/individual/lib/libXfixes-5.0.2.tar.bz2 -mirror://xorg/individual/lib/libXfont-1.5.3.tar.bz2 -mirror://xorg/individual/lib/libXfont2-2.0.2.tar.bz2 +mirror://xorg/individual/lib/libXfont-1.5.4.tar.bz2 +mirror://xorg/individual/lib/libXfont2-2.0.3.tar.bz2 mirror://xorg/individual/lib/libXft-2.3.2.tar.bz2 mirror://xorg/individual/lib/libXi-1.7.9.tar.bz2 mirror://xorg/individual/lib/libXinerama-1.1.3.tar.bz2 @@ -123,7 +123,7 @@ mirror://xorg/X11R7.7/src/everything/xf86driproto-2.1.1.tar.bz2 mirror://xorg/individual/driver/xf86-input-evdev-2.10.5.tar.bz2 mirror://xorg/individual/driver/xf86-input-joystick-1.6.3.tar.bz2 mirror://xorg/individual/driver/xf86-input-keyboard-1.9.0.tar.bz2 -mirror://xorg/individual/driver/xf86-input-libinput-0.25.0.tar.bz2 +mirror://xorg/individual/driver/xf86-input-libinput-0.26.0.tar.bz2 mirror://xorg/individual/driver/xf86-input-mouse-1.9.2.tar.bz2 mirror://xorg/individual/driver/xf86-input-synaptics-1.9.0.tar.bz2 mirror://xorg/individual/driver/xf86-input-vmmouse-13.1.0.tar.bz2 diff --git a/pkgs/tools/compression/brotli/default.nix b/pkgs/tools/compression/brotli/default.nix index c900cfa79f7..bd33eb4d437 100644 --- a/pkgs/tools/compression/brotli/default.nix +++ b/pkgs/tools/compression/brotli/default.nix @@ -4,19 +4,19 @@ stdenv.mkDerivation rec { name = "brotli-${version}"; - version = "0.6.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "google"; repo = "brotli"; rev = "v" + version; - sha256 = "1wapq5hzflbmrcqgz92iv79rm893bskh03kvqgnn33dzbz3slavs"; + sha256 = "1rqgp8xi1k4sjy9sngg1vw0v8q2mm46dhyya4d35n3k6yk7pk0qv"; }; buildInputs = [ cmake ]; # This breaks on Darwin because our cmake hook tries to make a build folder - # and the wonderful bazel BUILD file is already there (yay case-insensitivty?) + # and the wonderful bazel BUILD file is already there (yay case-insensitivity?) prePatch = "rm BUILD"; meta = with stdenv.lib; { diff --git a/pkgs/tools/compression/brotli/unstable.nix b/pkgs/tools/compression/brotli/unstable.nix deleted file mode 100644 index 59eb1e1d469..00000000000 --- a/pkgs/tools/compression/brotli/unstable.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ stdenv, fetchFromGitHub }: - -# ?TODO: there's also python lib in there - -stdenv.mkDerivation rec { - name = "brotli-20160112"; - version = "bed93862"; - - src = fetchFromGitHub { - owner = "google"; - repo = "brotli"; - rev = "bed93862608d4d232ebe6d229f04e48399775e8b"; - sha256 = "0g94kqh984qkbqbj4fpkkyji9wnbrb9cs32r9d6niw1sqfnfkd6f"; - }; - - preConfigure = "cd tools"; - - # Debian installs "brotli" instead of "bro" but let's keep upstream choice for now. - installPhase = '' - mkdir -p "$out/bin" - mv ./bro "$out/bin/" - ''; - - meta = with stdenv.lib; { - inherit (src.meta) homepage; - - description = "A generic-purpose lossless compression algorithm and tool"; - - longDescription = - '' Brotli is a generic-purpose lossless compression algorithm that - compresses data using a combination of a modern variant of the LZ77 - algorithm, Huffman coding and 2nd order context modeling, with a - compression ratio comparable to the best currently available - general-purpose compression methods. It is similar in speed with - deflate but offers more dense compression. - - The specification of the Brotli Compressed Data Format is defined - in the following internet draft: - http://www.ietf.org/id/draft-alakuijala-brotli - ''; - - license = licenses.mit; - maintainers = []; - platforms = platforms.all; - }; -} diff --git a/pkgs/tools/graphics/wkhtmltopdf/default.nix b/pkgs/tools/graphics/wkhtmltopdf/default.nix index b513115c68f..a4b380d7b7b 100644 --- a/pkgs/tools/graphics/wkhtmltopdf/default.nix +++ b/pkgs/tools/graphics/wkhtmltopdf/default.nix @@ -21,6 +21,7 @@ stdenv.mkDerivation rec { rev = "fe194f9dac0b515757392a18f7fc9527c91d45ab"; # From git submodule spec in wkhtml repo. sha256 = "1j2ld2bfacnn3vm2l1870v55sj82bq4y8zkawmlx2y5j63d8vr23"; }; + postConfigure = ""; # The patch "parallel-build.patch" does not apply. configureFlags = '' -dbus-linked diff --git a/pkgs/tools/misc/colord/default.nix b/pkgs/tools/misc/colord/default.nix index 020599e17a8..9af7de8b35e 100644 --- a/pkgs/tools/misc/colord/default.nix +++ b/pkgs/tools/misc/colord/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, bash-completion , glib, polkit, pkgconfig, gettext, gusb, lcms2, sqlite, systemd, dbus , gobjectIntrospection, argyllcms, meson, ninja, libxml2, vala_0_38 -, libgudev, sane-backends }: +, libgudev, sane-backends, udev, gnome3, makeWrapper }: stdenv.mkDerivation rec { name = "colord-1.4.1"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ./fix-build-paths.patch ]; - nativeBuildInputs = [ meson pkgconfig vala_0_38 ninja gettext libxml2 gobjectIntrospection ]; + nativeBuildInputs = [ meson pkgconfig vala_0_38 ninja gettext libxml2 gobjectIntrospection makeWrapper ]; buildInputs = [ glib polkit gusb lcms2 sqlite systemd dbus bash-completion argyllcms libgudev sane-backends ]; @@ -36,6 +36,12 @@ stdenv.mkDerivation rec { glib-compile-schemas $out/share/glib-2.0/schemas ''; + postFixup = '' + wrapProgram "$out/libexec/colord-session" \ + --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:$out/share" \ + --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib gnome3.dconf}/lib/gio/modules" + ''; + meta = { description = "System service to manage, install and generate color profiles to accurately color manage input and output devices"; homepage = https://www.freedesktop.org/software/colord/; diff --git a/pkgs/tools/misc/colord/fix-build-paths.patch b/pkgs/tools/misc/colord/fix-build-paths.patch index 7eb66a0b34b..d4bf0f36ad7 100644 --- a/pkgs/tools/misc/colord/fix-build-paths.patch +++ b/pkgs/tools/misc/colord/fix-build-paths.patch @@ -36,6 +36,13 @@ ) endif +@@ -50,5 +50,5 @@ + output : 'org.freedesktop.ColorManager.conf', + configuration : con2, + install: true, +- install_dir: join_paths(get_option('datadir'), 'dbus-1', 'system.d') , ++ install_dir: join_paths(get_option('prefix'), 'etc', 'dbus-1', 'system.d') , + ) --- a/meson.build +++ b/meson.build @@ -258,6 +258,3 @@ @@ -54,3 +61,14 @@ - install_dir : join_paths(udev.get_pkgconfig_variable('udevdir'), 'rules.d') + install_dir : join_paths(get_option('prefix'), 'lib', 'udev', 'rules.d') ) +--- a/src/plugins/meson.build ++++ b/src/plugins/meson.build +@@ -66,7 +66,7 @@ + install_dir: join_paths(get_option('libdir'), 'colord-plugins'), + c_args : [ + cargs, +- '-DCOLORD_SANE_BINARY="' + join_paths(get_option('libexecdir'), 'colord-sane' + '"'), ++ '-DCOLORD_SANE_BINARY="' + join_paths(get_option('prefix'), get_option('libexecdir'), 'colord-sane' + '"'), + ], + dependencies : [ + gio, diff --git a/pkgs/tools/networking/htpdate/default.nix b/pkgs/tools/networking/htpdate/default.nix index 47163b94dc5..f0bb4ab46fa 100644 --- a/pkgs/tools/networking/htpdate/default.nix +++ b/pkgs/tools/networking/htpdate/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { makeFlags = [ "INSTALL=install" - "STRIP=${stdenv.cc.bintools.prefix}strip" + "STRIP=${stdenv.cc.bintools.targetPrefix}strip" "prefix=$(out)" ]; diff --git a/pkgs/tools/security/gencfsm/default.nix b/pkgs/tools/security/gencfsm/default.nix index c180ca6c720..aade96ed389 100644 --- a/pkgs/tools/security/gencfsm/default.nix +++ b/pkgs/tools/security/gencfsm/default.nix @@ -26,6 +26,8 @@ stdenv.mkDerivation rec { preFixup = ''gappsWrapperArgs+=(--prefix PATH : ${encfs}/bin)''; + enableParallelBuilding = true; + meta = with stdenv.lib; { homepage = http://www.libertyzero.com/GEncfsM/; downloadPage = https://launchpad.net/gencfsm/; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0dbb11a04f8..626786f2cb4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1100,7 +1100,9 @@ with pkgs; geekbench = callPackage ../tools/misc/geekbench { }; - gencfsm = callPackage ../tools/security/gencfsm { }; + gencfsm = callPackage ../tools/security/gencfsm { + vala = vala_0_34; + }; genromfs = callPackage ../tools/filesystems/genromfs { }; @@ -1494,7 +1496,10 @@ with pkgs; libpinyin = callPackage ../development/libraries/libpinyin { }; - libskk = callPackage ../development/libraries/libskk { gnome_common = gnome3.gnome_common; }; + libskk = callPackage ../development/libraries/libskk { + gnome_common = gnome3.gnome_common; + vala = vala_0_34; + }; m17n_db = callPackage ../tools/inputmethods/m17n-db { }; @@ -1548,10 +1553,6 @@ with pkgs; brotli = callPackage ../tools/compression/brotli { }; - brotliUnstable = callPackage ../tools/compression/brotli/unstable.nix { }; - - libbrotli = callPackage ../development/libraries/libbrotli { }; - biosdevname = callPackage ../tools/networking/biosdevname { }; c14 = callPackage ../applications/networking/c14 { }; @@ -7781,6 +7782,10 @@ with pkgs; yodl = callPackage ../development/tools/misc/yodl { }; + yq = callPackage ../development/tools/yq { + inherit (python3Packages) buildPythonApplication fetchPypi pyyaml; + }; + winpdb = callPackage ../development/tools/winpdb { }; grabserial = callPackage ../development/tools/grabserial { }; @@ -8545,14 +8550,12 @@ with pkgs; gnu-efi = callPackage ../development/libraries/gnu-efi { }; - gnutls = gnutls35; - - gnutls35 = callPackage + gnutls = callPackage (if stdenv.isDarwin # Avoid > 3.5.10 due to frameworks for now; see discussion on: # https://github.com/NixOS/nixpkgs/commit/d6454e6a1 then ../development/libraries/gnutls/3.5.10.nix - else ../development/libraries/gnutls/3.5.nix) + else ../development/libraries/gnutls/3.6.nix) { guileBindings = config.gnutls.guile or false; }; @@ -9695,7 +9698,6 @@ with pkgs; giflib = giflib_5_1; giflib_4_1 = callPackage ../development/libraries/giflib/4.1.nix { }; - giflib_5_0 = callPackage ../development/libraries/giflib/5.0.nix { }; giflib_5_1 = callPackage ../development/libraries/giflib/5.1.nix { }; libungif = callPackage ../development/libraries/giflib/libungif.nix { }; @@ -16928,9 +16930,9 @@ with pkgs; }; deepin-terminal = callPackage ../applications/misc/deepin-terminal { - vte = gnome3.vte; + inherit (gnome3) libgee vte; wnck = libwnck3; - gee = libgee_0_8; + vala = vala_0_34; }; termite = callPackage ../applications/misc/termite { diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 3d70bb0cc25..d72364363cd 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8046,10 +8046,10 @@ let self = _self // overrides; _self = with self; { }; LogContextual = buildPerlPackage rec { - name = "Log-Contextual-0.007001"; + name = "Log-Contextual-0.008000"; src = fetchurl { url = "mirror://cpan/authors/id/F/FR/FREW/${name}.tar.gz"; - sha256 = "163c46f9cf4ed921356d300925a1c3ec4d7e0d20d1c678ade9ccc24efd990cd6"; + sha256 = "acd804508740e35c208e0cff575f3dbca2e01b8e64ec00eec3f88c7c4e3d656c"; }; buildInputs = [ TestFatal ]; propagatedBuildInputs = [ DataDumperConcise ExporterDeclare Moo ]; @@ -8057,7 +8057,6 @@ let self = _self // overrides; _self = with self; { homepage = https://github.com/frioux/Log-Contextual; description = "Simple logging interface with a contextual log"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - platforms = stdenv.lib.platforms.unix; }; }; |