diff options
Diffstat (limited to 'pkgs/applications')
9 files changed, 56 insertions, 66 deletions
diff --git a/pkgs/applications/audio/google-musicmanager/default.nix b/pkgs/applications/audio/google-musicmanager/default.nix index 7c69a25eb0422..f86513659b647 100644 --- a/pkgs/applications/audio/google-musicmanager/default.nix +++ b/pkgs/applications/audio/google-musicmanager/default.nix @@ -6,23 +6,24 @@ let archUrl = name: arch: "http://dl.google.com/linux/musicmanager/deb/pool/main/g/google-musicmanager-beta/${name}_${arch}.deb"; in stdenv.mkDerivation rec { - version = "beta_1.0.221.5230-r0"; # friendly to nix-env version sorting algo + version = "beta_1.0.243.1116-r0"; # friendly to nix-env version sorting algo product = "google-musicmanager"; name = "${product}-${version}"; # When looking for newer versions, since google doesn't let you list their repo dirs, # curl http://dl.google.com/linux/musicmanager/deb/dists/stable/Release - # fetch an appropriate packages file eg main/binary-amd64/Packages + # fetch an appropriate packages file such as main/binary-amd64/Packages: + # curl http://dl.google.com/linux/musicmanager/deb/dists/stable/main/binary-amd64/Packages # which will contain the links to all available *.debs for the arch. src = if stdenv.system == "x86_64-linux" then fetchurl { url = archUrl name "amd64"; - sha256 = "1h0ssbz6y9xi2szalgb5wcxi8m1ylg4qf2za6zgvi908hpan7q37"; + sha256 = "54f97f449136e173492d36084f2c01244b84f02d6e223fb8a40661093e0bec7c"; } else fetchurl { url = archUrl name "i386"; - sha256 = "0q8cnzx7s25bpqlbp40d43mwd6m8kvhvdifkqlgc9phpydnqpd1i"; + sha256 = "121a7939015e2270afa3f1c73554102e2b4f2e6a31482ff7be5e7c28dd101d3c"; }; unpackPhase = '' diff --git a/pkgs/applications/graphics/simple-scan/default.nix b/pkgs/applications/graphics/simple-scan/default.nix index 4dd30697f0bcc..c205c2a3f1c71 100644 --- a/pkgs/applications/graphics/simple-scan/default.nix +++ b/pkgs/applications/graphics/simple-scan/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, cairo, colord, glib, gtk3, gusb, intltool, itstool , libusb, libxml2, pkgconfig, saneBackends, vala, wrapGAppsHook }: -let version = "3.19.2"; in +let version = "3.19.3"; in stdenv.mkDerivation rec { name = "simple-scan-${version}"; src = fetchurl { - sha256 = "08454ky855iaiq5wn9rdbfal3i4fjss5fn5mg6cmags50wy9spsg"; + sha256 = "0il7ikd5hj9mgzrivm01g572g9101w8la58h3hjyakwcfw3jp976"; url = "https://launchpad.net/simple-scan/3.19/${version}/+download/${name}.tar.xz"; }; diff --git a/pkgs/applications/misc/khal/default.nix b/pkgs/applications/misc/khal/default.nix index cbc728bc1f5f2..22610c853e3b8 100644 --- a/pkgs/applications/misc/khal/default.nix +++ b/pkgs/applications/misc/khal/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, pkgs, pythonPackages }: pythonPackages.buildPythonPackage rec { - version = "0.6.0"; + version = "0.7.0"; name = "khal-${version}"; src = fetchurl { url = "https://pypi.python.org/packages/source/k/khal/khal-${version}.tar.gz"; - sha256 = "16nsib70rczln0hrh93bas58lr8crvq8yipj7qnfs4hbs9b8sbhs"; + sha256 = "00llxj7cv31mjsx0j6zxmyi9s1q20yvfkn025xcy8cv1ylfwic66"; }; propagatedBuildInputs = with pythonPackages; [ diff --git a/pkgs/applications/misc/playonlinux/default.nix b/pkgs/applications/misc/playonlinux/default.nix index c79d9c037d1ee..731cf5a6ba91d 100644 --- a/pkgs/applications/misc/playonlinux/default.nix +++ b/pkgs/applications/misc/playonlinux/default.nix @@ -19,6 +19,8 @@ , pkgsi686Linux }: +assert stdenv.isLinux; + let version = "4.2.9"; diff --git a/pkgs/applications/misc/udevil/default.nix b/pkgs/applications/misc/udevil/default.nix index 5ba80348d1fcb..75c02d3ba6ddf 100644 --- a/pkgs/applications/misc/udevil/default.nix +++ b/pkgs/applications/misc/udevil/default.nix @@ -21,6 +21,7 @@ stdenv.mkDerivation { cat src/Makefile.am exit 2 ''; + patches = [ ./device-info-sys-stat.patch ]; meta = { description = "A command line Linux program which mounts and unmounts removable devices without a password, shows device info, and monitors device changes"; homepage = https://ignorantguru.github.io/udevil/; diff --git a/pkgs/applications/misc/udevil/device-info-sys-stat.patch b/pkgs/applications/misc/udevil/device-info-sys-stat.patch new file mode 100644 index 0000000000000..554682108e39a --- /dev/null +++ b/pkgs/applications/misc/udevil/device-info-sys-stat.patch @@ -0,0 +1,14 @@ +diff --git a/src/device-info.h b/src/device-info.h +index 6cb3683..ddac24c 100644 +--- a/src/device-info.h ++++ b/src/device-info.h +@@ -18,7 +18,8 @@ + // intltool + #include <glib/gi18n.h> + +- ++// stat ++#include <sys/stat.h> + + typedef struct device_t { + struct udev_device *udevice; diff --git a/pkgs/applications/networking/browsers/jumanji/default.nix b/pkgs/applications/networking/browsers/jumanji/default.nix index 1969a1f502f2a..0e962f5fc1f66 100644 --- a/pkgs/applications/networking/browsers/jumanji/default.nix +++ b/pkgs/applications/networking/browsers/jumanji/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { version = "20150107"; src = fetchgit { - url = git://pwmt.org/jumanji.git; + url = https://git.pwmt.org/pwmt/jumanji.git; rev = "f8e04e5b5a9fec47d49ca63a096e5d35be281151"; sha256 = "1xq06iabr4y76faf4w1cx6fhwdksfsxggz1ndny7icniwjzk98h9"; }; diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/builder.sh b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/builder.sh deleted file mode 100644 index b0f8a2638c188..0000000000000 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/builder.sh +++ /dev/null @@ -1,23 +0,0 @@ -source $stdenv/setup - -dontStrip=1 -dontPatchELF=1 -sourceRoot=$TMPDIR - -unpackPhase() { - tar xvzf $src; - for a in *; do - if [ -d $a ]; then - cd $a - break - fi - done -} - -installPhase() { - mkdir -p $out/lib/mozilla/plugins - cp -pv libflashplayer.so $out/lib/mozilla/plugins - patchelf --set-rpath "$rpath" $out/lib/mozilla/plugins/libflashplayer.so -} - -genericBuild diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix index 7148764b2233c..34a06967ed8fa 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix @@ -20,6 +20,7 @@ , atk , gdk_pixbuf , nss +, unzip , debug ? false /* you have to add ~/mm.cfg : @@ -35,45 +36,41 @@ }: let - # -> http://get.adobe.com/flashplayer/ + arch = + if stdenv.system == "x86_64-linux" then + if debug then throw "no x86_64 debugging version available" + else "64bit" + else if stdenv.system == "i686-linux" then + if debug then "32bit_debug" + else "32bit" + else throw "Flash Player is not supported on this platform"; +in +stdenv.mkDerivation rec { + name = "flashplayer-${version}"; version = "11.2.202.554"; - src = - if stdenv.system == "x86_64-linux" then - if debug then - # no plans to provide a x86_64 version: - # http://labs.adobe.com/technologies/flashplayer10/faq.html - throw "no x86_64 debugging version available" - else rec { - inherit version; - url = "http://fpdownload.adobe.com/get/flashplayer/pdc/${version}/install_flash_player_11_linux.x86_64.tar.gz"; - sha256 = "15zziclffvsa0wpygkwzbh3v367n73pmzwsnkanhg75rv28dgl3x"; - } - else if stdenv.system == "i686-linux" then - if debug then - throw "flash debugging version is outdated and probably broken" /* { - # The debug version also contains a player - version = "11.1"; - url = http://fpdownload.adobe.com/pub/flashplayer/updaters/11/flashplayer_11_plugin_debug.i386.tar.gz; - sha256 = "0jn7klq2cyqasj6nxfka2l8nsf7sn7hi6443nv6dd2sb3g7m6x92"; - }*/ - else rec { - inherit version; - url = "http://fpdownload.adobe.com/get/flashplayer/pdc/${version}/install_flash_player_11_linux.i386.tar.gz"; - sha256 = "1a26l6lz5l6qbx4lm7266pzk0zr77h6issbnayr6df9qj99bppyz"; - } - else throw "Flash Player is not supported on this platform"; + src = fetchurl { + url = "https://fpdownload.macromedia.com/pub/flashplayer/installers/archive/fp_${version}_archive.zip"; + sha256 = "0pjan07k419pk3lmfdl5vww0ipf5b76cxqhxwjrikb1fc4x993fi"; + }; -in + buildInputs = [ unzip ]; -stdenv.mkDerivation { - name = "flashplayer-${src.version}"; + postUnpack = '' + cd */*${arch} + tar -xvzf flash-plugin*.tar.gz + ''; - builder = ./builder.sh; + sourceRoot = "."; - src = fetchurl { inherit (src) url sha256; }; + dontStrip = true; + dontPatchELF = true; - inherit zlib alsaLib; + installPhase = '' + mkdir -p $out/lib/mozilla/plugins + cp -pv libflashplayer.so $out/lib/mozilla/plugins + patchelf --set-rpath "$rpath" $out/lib/mozilla/plugins/libflashplayer.so + ''; passthru = { mozillaPlugin = "/lib/mozilla/plugins"; @@ -85,8 +82,6 @@ stdenv.mkDerivation { libvdpau nss ]; - buildPhase = ":"; - meta = { description = "Adobe Flash Player browser plugin"; homepage = http://www.adobe.com/products/flashplayer/; |