summary refs log tree commit diff
path: root/pkgs/desktops/mate/mate-user-share
diff options
context:
space:
mode:
authorJosé Romildo Malaquias <malaquias@gmail.com>2018-02-13 20:44:07 -0200
committerJosé Romildo Malaquias <malaquias@gmail.com>2018-02-13 20:44:07 -0200
commitaa001cc937f0ca7cb2ef25eefa0d76fb98c69e5f (patch)
treebd7ba411cb6c39db0c2757d003c30f438f7c5032 /pkgs/desktops/mate/mate-user-share
parent9ef5d9c143e6f8a0716bfdb1031835bade82c989 (diff)
downloadnixpkgs-aa001cc937f0ca7cb2ef25eefa0d76fb98c69e5f.tar
nixpkgs-aa001cc937f0ca7cb2ef25eefa0d76fb98c69e5f.tar.gz
nixpkgs-aa001cc937f0ca7cb2ef25eefa0d76fb98c69e5f.tar.bz2
nixpkgs-aa001cc937f0ca7cb2ef25eefa0d76fb98c69e5f.tar.lz
nixpkgs-aa001cc937f0ca7cb2ef25eefa0d76fb98c69e5f.tar.xz
nixpkgs-aa001cc937f0ca7cb2ef25eefa0d76fb98c69e5f.tar.zst
nixpkgs-aa001cc937f0ca7cb2ef25eefa0d76fb98c69e5f.zip
mate: remove major-ver and minor-ver
Keep only the version atribute in derivations, with the full version
string of the package. This will make it easier to write a script for
automatic updating of the packages using the update-source-version
command from common-updater-scripts.
Diffstat (limited to 'pkgs/desktops/mate/mate-user-share')
-rw-r--r--pkgs/desktops/mate/mate-user-share/default.nix10
1 files changed, 4 insertions, 6 deletions
diff --git a/pkgs/desktops/mate/mate-user-share/default.nix b/pkgs/desktops/mate/mate-user-share/default.nix
index afacad52778..ecc7624e87b 100644
--- a/pkgs/desktops/mate/mate-user-share/default.nix
+++ b/pkgs/desktops/mate/mate-user-share/default.nix
@@ -1,13 +1,11 @@
-{ stdenv, fetchurl, pkgconfig, intltool, itstool, gtk3, dbus_glib, libnotify, libxml2, libcanberra_gtk3, caja, mod_dnssd, apacheHttpd, hicolor_icon_theme, wrapGAppsHook }:
+{ stdenv, fetchurl, pkgconfig, intltool, itstool, gtk3, dbus_glib, libnotify, libxml2, libcanberra_gtk3, mod_dnssd, apacheHttpd, hicolor_icon_theme, mate, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
   name = "mate-user-share-${version}";
-  version = "${major-ver}.${minor-ver}";
-  major-ver = "1.18";
-  minor-ver = "0";
+  version = "1.18.0";
 
   src = fetchurl {
-    url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz";
+    url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz";
     sha256 = "0w7r7jmm12n41hcxj1pfk3f0xy69cddx7ga490x191rdpcb3ry1n";
   };
 
@@ -24,7 +22,7 @@ stdenv.mkDerivation rec {
     libnotify
     libcanberra_gtk3
     libxml2
-    caja
+    mate.caja
     hicolor_icon_theme
     # Should mod_dnssd and apacheHttpd be runtime dependencies?
     # In gnome-user-share they are not.