diff options
21 files changed, 117 insertions, 67 deletions
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 60255914d5d9..ebfe5afe52f3 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -279,6 +279,7 @@ ./services/networking/dnsmasq.nix ./services/networking/docker-registry-server.nix ./services/networking/ejabberd.nix + ./services/networking/fan.nix ./services/networking/firefox/sync-server.nix ./services/networking/firewall.nix ./services/networking/flashpolicyd.nix @@ -344,7 +345,6 @@ ./services/networking/tlsdated.nix ./services/networking/tox-bootstrapd.nix ./services/networking/tvheadend.nix - ./services/networking/ubuntu-fan.nix ./services/networking/unbound.nix ./services/networking/unifi.nix ./services/networking/vsftpd.nix diff --git a/nixos/modules/services/networking/ubuntu-fan.nix b/nixos/modules/services/networking/fan.nix index 2759a671b81f..3170567e5b4a 100644 --- a/nixos/modules/services/networking/ubuntu-fan.nix +++ b/nixos/modules/services/networking/fan.nix @@ -4,7 +4,7 @@ with lib; let - cfg = config.networking.ubuntu-fan; + cfg = config.networking.fan; modprobe = "${config.system.sbin.modprobe}/sbin/modprobe"; in @@ -15,9 +15,9 @@ in options = { - networking.ubuntu-fan = { + networking.fan = { - enable = mkEnableOption "Ubuntu FAN Networking"; + enable = mkEnableOption "FAN Networking"; }; @@ -30,8 +30,8 @@ in environment.systemPackages = [ pkgs.fanctl ]; - systemd.services.ubuntu-fan = { - description = "Ubuntu FAN Networking"; + systemd.services.fan = { + description = "FAN Networking"; wantedBy = [ "multi-user.target" ]; after = [ "network-online.target" ]; before = [ "docker.service" ]; @@ -40,12 +40,12 @@ in if [ ! -f /proc/sys/net/fan/version ]; then ${modprobe} ipip if [ ! -f /proc/sys/net/fan/version ]; then - echo "The Ubuntu Fan Networking patches have not been applied to this kernel!" 1>&2 + echo "The Fan Networking patches have not been applied to this kernel!" 1>&2 exit 1 fi fi - mkdir -p /var/lib/ubuntu-fan + mkdir -p /var/lib/fan-networking ''; serviceConfig = { Type = "oneshot"; diff --git a/pkgs/applications/editors/vim/configurable.nix b/pkgs/applications/editors/vim/configurable.nix index ee3edaaf61b2..cd7db6bb82e3 100644 --- a/pkgs/applications/editors/vim/configurable.nix +++ b/pkgs/applications/editors/vim/configurable.nix @@ -31,9 +31,10 @@ let inherit (args.composableDerivation) composableDerivation edf; ''; in composableDerivation { -} (fix: { +} (fix: rec { - name = "vim_configurable-7.4.516"; + name = "vim_configurable-${version}"; + version = "7.4.826"; enableParallelBuilding = true; # test this @@ -43,8 +44,8 @@ composableDerivation { # latest release args.fetchhg { url = "http://vim.googlecode.com/hg/"; - rev = "v7-4-516"; - sha256 = "0a3b5qaywfn7jjr7fjpl8y8jx4wjj2630wxfjnmn3hi1l7iiz4z8"; + rev = "v${version}"; + sha256 = "01m67lvnkz0ad28ifj964zcg63y5hixplbnzas5xarj8vl3pc5a0"; }; "vim-nox" = diff --git a/pkgs/applications/graphics/yed/default.nix b/pkgs/applications/graphics/yed/default.nix index e22c7804914b..0cd853a2cbea 100644 --- a/pkgs/applications/graphics/yed/default.nix +++ b/pkgs/applications/graphics/yed/default.nix @@ -1,11 +1,16 @@ -{ stdenv, fetchurl, makeWrapper, unzip, jre }: +{ stdenv, fetchurl, requireFile, makeWrapper, unzip, jre }: stdenv.mkDerivation rec { - name = "yEd-3.14.2"; + name = "yEd-3.14.3"; - src = fetchurl { - url = "http://www.yworks.com/products/yed/demo/${name}.zip"; - sha256 = "1i2fncp7q0xin42sf55zc79jzrkzbp25yw8rcjkgsy6hgnhl73nh"; + #src = fetchurl { + # url = "http://www.yworks.com/products/yed/demo/${name}.zip"; + # sha256 = "0xgazknbz82sgk65hxmvbycl1vd25z80a7jgwjgw7syicrgmplcl"; + #}; + src = requireFile { + name = "${name}.zip"; + url = "https://www.yworks.com/en/products_download.php?file=${name}.zip"; + sha256 = "0xgazknbz82sgk65hxmvbycl1vd25z80a7jgwjgw7syicrgmplcl"; }; nativeBuildInputs = [ unzip makeWrapper ]; @@ -20,7 +25,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - license = licenses.unfreeRedistributable; + license = licenses.unfree; homepage = http://www.yworks.com/en/products/yfiles/yed/; description = "A powerful desktop application that can be used to quickly and effectively generate high-quality diagrams"; platforms = jre.meta.platforms; diff --git a/pkgs/applications/networking/instant-messengers/qtox/default.nix b/pkgs/applications/networking/instant-messengers/qtox/default.nix index cba5bdeec7e9..5c8a03eb8efc 100644 --- a/pkgs/applications/networking/instant-messengers/qtox/default.nix +++ b/pkgs/applications/networking/instant-messengers/qtox/default.nix @@ -1,21 +1,21 @@ { stdenv, fetchgit, pkgconfig, libtoxcore-dev, qt5, openal, opencv, libsodium, libXScrnSaver, glib, gdk_pixbuf, gtk2, cairo, - pango, atk, qrencode, ffmpeg, filter-audio }: + pango, atk, qrencode, ffmpeg, filter-audio, makeWrapper }: stdenv.mkDerivation rec { - name = "qtox-dev-20150624"; + name = "qtox-dev-20150821"; src = fetchgit { url = "https://github.com/tux3/qTox.git"; - rev = "9f386135a2cf428d2802b158c70be4beee5abf86"; - sha256 = "1m2y50q5yim1q75k48cy5daq5qm77cvb3kcla7lpqv54xnfdwxk8"; + rev = "2f6b5e052f2a625d506e83f880c5d68b49118f95"; + md5 = "b2f9cf283136b6e558876ca2e6d128a3"; }; buildInputs = [ libtoxcore-dev openal opencv libsodium filter-audio qt5.base qt5.tools libXScrnSaver glib gtk2 cairo - pango atk qrencode ffmpeg qt5.translations + pango atk qrencode ffmpeg qt5.translations makeWrapper ]; nativeBuildInputs = [ pkgconfig ]; @@ -37,8 +37,12 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin cp qtox $out/bin + wrapProgram $out/bin/qtox \ + --prefix QT_PLUGIN_PATH : ${qt5.svg}/lib/qt5/plugins ''; + enableParallelBuilding = true; + meta = with stdenv.lib; { description = "QT Tox client"; license = licenses.gpl3; @@ -46,4 +50,3 @@ stdenv.mkDerivation rec { platforms = platforms.all; }; } - diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index fde9bb782d8e..cc7ef9cfdf79 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -680,6 +680,10 @@ self: super: { ''; }); + # Tests attempt to use NPM to install from the network into + # /homeless-shelter. Disabled. + purescript = dontCheck super.purescript; + # Broken by GLUT update. Monadius = markBroken super.Monadius; diff --git a/pkgs/development/libraries/qt-5/5.3/default.nix b/pkgs/development/libraries/qt-5/5.3/default.nix index 595bb5bb10bf..7f4e0b60c2d0 100644 --- a/pkgs/development/libraries/qt-5/5.3/default.nix +++ b/pkgs/development/libraries/qt-5/5.3/default.nix @@ -86,6 +86,8 @@ stdenv.mkDerivation rec { preConfigure = '' export LD_LIBRARY_PATH="$PWD/qtbase/lib:$PWD/qtbase/plugins/platforms:$PWD/qttools/lib:$LD_LIBRARY_PATH" export MAKEFLAGS=-j$NIX_BUILD_CORES + export configureFlags+="-plugindir $out/lib/qt5/plugins -importdir $out/lib/qt5/imports -qmldir $out/lib/qt5/qml" + export configureFlags+=" -docdir $out/share/doc/qt5" ''; prefixKey = "-prefix "; diff --git a/pkgs/development/libraries/qt-5/5.4/qt-submodule.nix b/pkgs/development/libraries/qt-5/5.4/qt-submodule.nix index b242661270d2..4012b637e286 100644 --- a/pkgs/development/libraries/qt-5/5.4/qt-submodule.nix +++ b/pkgs/development/libraries/qt-5/5.4/qt-submodule.nix @@ -20,12 +20,6 @@ mkDerivation (args // { dontFixLibtool = args.dontFixLibtool or true; configureScript = args.configureScript or "qmake"; - /* - preConfigure = '' - export PATH="$out/bin:$PATH" - ''; - */ - postInstall = '' rm "$out/bin/qmake" "$out/bin/qt.conf" diff --git a/pkgs/development/libraries/qt-5/5.4/qtbase.nix b/pkgs/development/libraries/qt-5/5.4/qtbase.nix index 780f1b60f7ce..6ec57787e224 100644 --- a/pkgs/development/libraries/qt-5/5.4/qtbase.nix +++ b/pkgs/development/libraries/qt-5/5.4/qtbase.nix @@ -84,6 +84,7 @@ stdenv.mkDerivation { sed -i 's/PATHS.*NO_DEFAULT_PATH//' "qtbase/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in" export configureFlags+="-plugindir $out/lib/qt5/plugins -importdir $out/lib/qt5/imports -qmldir $out/lib/qt5/qml" + export configureFlags+=" -docdir $out/share/doc/qt5" ''; prefixKey = "-prefix "; diff --git a/pkgs/development/libraries/qt-5/5.4/setup-hook.sh b/pkgs/development/libraries/qt-5/5.4/setup-hook.sh index 940b9d4e7a1f..6866e4c57bdd 100644 --- a/pkgs/development/libraries/qt-5/5.4/setup-hook.sh +++ b/pkgs/development/libraries/qt-5/5.4/setup-hook.sh @@ -25,6 +25,18 @@ addQtModule() { if [[ -n $qtSubmodule ]]; then find "$1/lib" -printf 'lib/%P\n' >> "$qtOut/nix-support/qt-inputs" fi + + if [[ -d "$1/lib/qt5/plugins" ]]; then + QT_PLUGIN_PATH="$QT_PLUGIN_PATH${QT_PLUGIN_PATH:+:}$1/lib/qt5/plugins"; + fi + + if [[ -d "$1/lib/qt5/imports" ]]; then + QML_IMPORT_PATH="$QML_IMPORT_PATH${QML_IMPORT_PATH:+:}$1/lib/qt5/imports"; + fi + + if [[ -d "$1/lib/qt5/qml" ]]; then + QML2_IMPORT_PATH="$QML2_IMPORT_PATH${QML2_IMPORT_PATH:+:}$1/lib/qt5/qml"; + fi fi fi } diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix index fd99437630c7..185f4a29e00d 100644 --- a/pkgs/development/tools/build-managers/gradle/default.nix +++ b/pkgs/development/tools/build-managers/gradle/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, unzip, jdk, makeWrapper }: stdenv.mkDerivation rec { - name = "gradle-2.2.1"; + name = "gradle-2.6"; src = fetchurl { url = "http://services.gradle.org/distributions/${name}-bin.zip"; - sha256 = "420aa50738299327b611c10b8304b749e8d3a579407ee9e755b15921d95ff418"; + sha256 = "10ww9vqyi5jkdw5bna14y63fjfhh40n81q7qsfhdycgj19b8ra8q"; }; installPhase = '' diff --git a/pkgs/os-specific/linux/android-udev-rules/default.nix b/pkgs/os-specific/linux/android-udev-rules/default.nix index 61e4291ecc50..3f763e917e34 100644 --- a/pkgs/os-specific/linux/android-udev-rules/default.nix +++ b/pkgs/os-specific/linux/android-udev-rules/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchgit }: stdenv.mkDerivation { - name = "android-udev-rules-20150301"; + name = "android-udev-rules-20150821"; src = fetchgit { url = "https://github.com/M0Rf30/android-udev-rules"; - rev = "2cc51a456ccfbca338c4e6b76211645aaac631e9"; - sha256 = "dbf1614cebb466d1adbcc5f17cefc0c37f148f9e3b46443b3e82f6cd19a1514f"; + rev = "07ccded2a89c2bb6da984e596c015c5e9546e497"; + sha256 = "953fc10bd0de46afef999dc1c1b20801b3d6e289af48d18fa96b1cac3ac54518"; }; installPhase = '' diff --git a/pkgs/os-specific/linux/fanctl/default.nix b/pkgs/os-specific/linux/fanctl/default.nix index f0b863e01488..61e100f4c9b7 100644 --- a/pkgs/os-specific/linux/fanctl/default.nix +++ b/pkgs/os-specific/linux/fanctl/default.nix @@ -1,6 +1,7 @@ { stdenv, lib, fetchbzr, makeWrapper, bridge-utils, iproute, dnsmasq, iptables, kmod, utillinux }: -stdenv.mkDerivation rec { +let stateDir = "/var/lib/fan-networking"; +in stdenv.mkDerivation rec { name = "fanctl-${version}"; version = "0.3.0"; @@ -17,16 +18,16 @@ stdenv.mkDerivation rec { # if that files does not exist, dnsmasq subsequently fails, # so we'll use /dev/null. # - # Also, make sure /var/lib/ubuntu-fan exists before starting dnsmasq. + # Also, make sure the state directory before starting dnsmasq. buildPhase = '' substituteInPlace fanctl \ --replace '--conf-file= ' \ '--conf-file=/dev/null ' \ --replace '/var/lib/misc' \ - '/var/lib/ubuntu-fan' + '${stateDir}' sed -i '/dnsmasq -u/i \ - mkdir -p /var/lib/ubuntu-fan' fanctl + mkdir -p ${stateDir}' fanctl ''; installPhase = '' diff --git a/pkgs/tools/backup/obnam/default.nix b/pkgs/tools/backup/obnam/default.nix index 123933881fdc..b430c4732ff1 100644 --- a/pkgs/tools/backup/obnam/default.nix +++ b/pkgs/tools/backup/obnam/default.nix @@ -2,13 +2,13 @@ pythonPackages.buildPythonPackage rec { name = "obnam-${version}"; - version = "1.14"; + version = "1.15"; namePrefix = ""; src = fetchurl rec { url = "http://code.liw.fi/debian/pool/main/o/obnam/obnam_${version}.orig.tar.xz"; - sha256 = "16875g14b7mxfd46159b92qa3gxq59w5gzf8x2n7icqa05s3483q"; + sha256 = "1wpvy6qrrp2k0b38a864n0ayh5mr8353rndiqb8ax7z0y3jz484x"; }; buildInputs = [ pythonPackages.sphinx attr ]; diff --git a/pkgs/tools/backup/tarsnap/default.nix b/pkgs/tools/backup/tarsnap/default.nix index e2857eed7d86..7537451595f8 100644 --- a/pkgs/tools/backup/tarsnap/default.nix +++ b/pkgs/tools/backup/tarsnap/default.nix @@ -1,11 +1,6 @@ { stdenv, fetchurl, openssl, zlib, e2fsprogs }: let - bashCompletion = fetchurl { - url = "https://gist.githubusercontent.com/thoughtpolice/daa9431044883d3896f6/raw/282360677007db9739e5bf229873d3b231eb303a/tarsnap.bash"; - sha256 = "1cj7m0n3sw9vlaz2dfvf0bgaxkv1pcc0l31zb4h5rmm8z6d33405"; - }; - zshCompletion = fetchurl { url = "https://gist.githubusercontent.com/thoughtpolice/daa9431044883d3896f6/raw/282360677007db9739e5bf229873d3b231eb303a/tarsnap.zsh"; sha256 = "0pawqwichzpz29rva7mh8lpx4zznnrh2rqyzzj6h7z98l0dxpair"; @@ -13,18 +8,20 @@ let in stdenv.mkDerivation rec { name = "tarsnap-${version}"; - version = "1.0.35"; + version = "1.0.36.1"; src = fetchurl { - url = "https://www.tarsnap.com/download/tarsnap-autoconf-1.0.35.tgz"; - sha256 = "16lc14rwrq84fz95j1g10vv0qki0qw73lzighidj5g23pib6g7vc"; + url = "https://www.tarsnap.com/download/tarsnap-autoconf-${version}.tgz"; + sha256 = "1446l8g39bi5xxk4x1ijc1qjrj824729887gcffig0zrw80rx452"; }; + preConfigure = '' + configureFlags="--with-bash-completion-dir=$out/etc/bash_completion.d" + ''; + postInstall = '' # Install some handy-dandy shell completions - mkdir -p $out/etc/bash_completion.d $out/share/zsh/site-functions - cp ${bashCompletion} $out/etc/bash_completion.d/tarsnap.bash - cp ${zshCompletion} $out/share/zsh/site-functions/_tarsnap + install -m 444 -D ${zshCompletion} $out/share/zsh/site-functions/_tarsnap ''; buildInputs = [ openssl zlib e2fsprogs ]; diff --git a/pkgs/tools/misc/scanmem/default.nix b/pkgs/tools/misc/scanmem/default.nix new file mode 100644 index 000000000000..e21da0deca2d --- /dev/null +++ b/pkgs/tools/misc/scanmem/default.nix @@ -0,0 +1,23 @@ +{ stdenv, autoconf, automake, intltool, libtool, fetchFromGitHub, readline }: + +stdenv.mkDerivation rec { + version = "0.15.2"; + name = "scanmem-${version}"; + src = fetchFromGitHub { + owner = "scanmem"; + repo = "scanmem"; + rev = "v${version}"; + sha256 = "0f93ac5rycf46q60flab5nl7ksadjls13axijg5j5wy1yif0k094"; + }; + buildInputs = [ autoconf automake intltool libtool readline ]; + preConfigure = '' + ./autogen.sh + ''; + meta = { + homepage = "https://github.com/scanmem/scanmem"; + description = "Memory scanner for finding and poking addresses in executing processes"; + maintainers = [ stdenv.lib.maintainers.chattered ]; + platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.gpl3; + }; +} diff --git a/pkgs/tools/misc/tlp/default.nix b/pkgs/tools/misc/tlp/default.nix index 4d3de16434b4..1e90ecfee328 100644 --- a/pkgs/tools/misc/tlp/default.nix +++ b/pkgs/tools/misc/tlp/default.nix @@ -51,6 +51,10 @@ in stdenv.mkDerivation { for i in $out/lib/udev/rules.d/*; do sed -i "s,RUN+=\",\\0$out,g; s,/usr/sbin,/bin,g" "$i" done + + for i in man/*; do + install -D $i $out/share/man/man''${i##*.}/$(basename $i) + done ''; passthru = { inherit enableRDW; }; diff --git a/pkgs/tools/package-management/packagekit/default.nix b/pkgs/tools/package-management/packagekit/default.nix index 15b6fd5fe9cb..7075b03bdfa4 100644 --- a/pkgs/tools/package-management/packagekit/default.nix +++ b/pkgs/tools/package-management/packagekit/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { src = fetchurl { sha256 = "0klwr0y3a72xpz6bwv4afbk3vvx5r1av5idhz3mx4p9ssnscb1mi"; - url = "https://www.freedesktop.org/software/PackageKit/releases/PackageKit-${version}.tar.xz"; + url = "http://www.freedesktop.org/software/PackageKit/releases/PackageKit-${version}.tar.xz"; }; buildInputs = [ glib polkit python ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d10430ebafe4..9187e016fe65 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7973,12 +7973,12 @@ let qt5SDK = qtcreator.override { sdkBuild = true; qtLib = qt5Full; - withDocumentation = false; # fails to setup some paths + withDocumentation = true; }; qtcreator = callPackage ../development/qtcreator { qtLib = qt5Full; # 3.4 only supports qt5; TODO: use modularized qt>=5.4 - withDocumentation = false; # FIXME: fails to setup some paths + withDocumentation = true; }; qtkeychain = callPackage ../development/libraries/qtkeychain { }; @@ -10139,6 +10139,8 @@ let sassc = callPackage ../development/tools/sassc { }; + scanmem = callPackage ../tools/misc/scanmem { }; + schedtool = callPackage ../os-specific/linux/schedtool { }; sdparm = callPackage ../os-specific/linux/sdparm { }; @@ -11292,7 +11294,7 @@ let emacsPackagesNgGen = emacs: import ./emacs-packages.nix { overrides = (config.emacsPackageOverrides or (p: {})) pkgs; - inherit lib stdenv fetchurl fetchgit fetchFromGitHub emacs; + inherit lib stdenv fetchurl fetchgit fetchFromGitHub fetchhg emacs; trivialBuild = import ../build-support/emacs/trivial.nix { inherit lib stdenv emacs texinfo; diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix index c5bb3a5f047f..4e03c300448f 100644 --- a/pkgs/top-level/emacs-packages.nix +++ b/pkgs/top-level/emacs-packages.nix @@ -33,7 +33,7 @@ { overrides -, lib, stdenv, fetchurl, fetchgit, fetchFromGitHub +, lib, stdenv, fetchurl, fetchgit, fetchFromGitHub, fetchhg , emacs , trivialBuild @@ -498,11 +498,11 @@ let self = _self // overrides; evil = melpaBuild { pname = "evil"; - version = "20141020"; - src = fetchgit { - url = "https://github.com/emacsmirror/evil.git"; - rev = "999ec15587f85100311c031aa8efb5d50c35afe4"; - sha256 = "5f67643d19a31172e68f2f195959d33bcd26c2786eb71e67eb27eb52f5bf387a"; + version = "1.2.3"; + src = fetchhg { + url = "https://bitbucket.org/lyro/evil"; + rev = "e5588e50c0e40a66c099868ea825755e348311fb"; + sha256 = "0185vrzfdz6iwhmc22rjy0n7ppfppp2ddc8xl0vvbda79q6w3bp8"; }; packageRequires = [ goto-chg undo-tree ]; meta = { @@ -740,10 +740,10 @@ let self = _self // overrides; goto-chg = melpaBuild rec { pname = "goto-chg"; version = "1.6"; - src = fetchgit { - url = "https://gitorious.org/evil/evil.git"; - rev = "999ec15587f85100311c031aa8efb5d50c35afe4"; - sha256 = "5f67643d19a31172e68f2f195959d33bcd26c2786eb71e67eb27eb52f5bf387a"; + src = fetchhg { + url = "https://bitbucket.org/lyro/evil"; + rev = "e5588e50c0e40a66c099868ea825755e348311fb"; + sha256 = "0185vrzfdz6iwhmc22rjy0n7ppfppp2ddc8xl0vvbda79q6w3bp8"; }; files = [ "lib/goto-chg.el" ]; meta = { license = gpl3Plus; }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 45dc9ede8833..7c355900025f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5075,8 +5075,9 @@ let pyGtkGlade pkgs.libtorrentRasterbar twisted Mako chardet pyxdg self.pyopenssl modules.curses ]; + nativeBuildInputs = [ pkgs.intltool ]; + postInstall = '' - cp -R deluge/data/share $out/share cp -R deluge/data/pixmaps $out/share/ cp -R deluge/data/icons $out/share/ ''; |