summary refs log tree commit diff
path: root/pkgs/desktops/lxqt
diff options
context:
space:
mode:
authorFrederik Rietdijk <fridh@fridh.nl>2019-10-08 11:56:52 +0200
committerFrederik Rietdijk <fridh@fridh.nl>2019-10-08 11:56:52 +0200
commita0c34f54cc61dc20ae1ec91766b9efad102f5b36 (patch)
tree96aeb2b4fb3aeff9ecc8c52d173c3b8d57a0ce59 /pkgs/desktops/lxqt
parent0913e30c859f0071d0f0529c309d4256713acc41 (diff)
parent60b2fe660e2bcb605650173b7b0a59a47bc6a7e5 (diff)
downloadnixpkgs-a0c34f54cc61dc20ae1ec91766b9efad102f5b36.tar
nixpkgs-a0c34f54cc61dc20ae1ec91766b9efad102f5b36.tar.gz
nixpkgs-a0c34f54cc61dc20ae1ec91766b9efad102f5b36.tar.bz2
nixpkgs-a0c34f54cc61dc20ae1ec91766b9efad102f5b36.tar.lz
nixpkgs-a0c34f54cc61dc20ae1ec91766b9efad102f5b36.tar.xz
nixpkgs-a0c34f54cc61dc20ae1ec91766b9efad102f5b36.tar.zst
nixpkgs-a0c34f54cc61dc20ae1ec91766b9efad102f5b36.zip
Merge master into staging-next
Diffstat (limited to 'pkgs/desktops/lxqt')
-rw-r--r--pkgs/desktops/lxqt/libfm-qt/default.nix10
-rw-r--r--pkgs/desktops/lxqt/lxqt-archiver/default.nix8
2 files changed, 9 insertions, 9 deletions
diff --git a/pkgs/desktops/lxqt/libfm-qt/default.nix b/pkgs/desktops/lxqt/libfm-qt/default.nix
index c214f0b3dcd..39cece7724e 100644
--- a/pkgs/desktops/lxqt/libfm-qt/default.nix
+++ b/pkgs/desktops/lxqt/libfm-qt/default.nix
@@ -5,14 +5,14 @@
 }:
 
 mkDerivation rec {
-  pname = "libfm-qt";
-  version = "0.14.1";
+  pname = "libfm-qt-unstable";
+  version = "2019-09-22";
 
   src = fetchFromGitHub {
     owner = "lxqt";
-    repo = pname;
-    rev = version;
-    sha256 = "00rn5i16h659zyp1dx213nc3jz7rx9phiw71zf6nspxzxsb8w2sc";
+    repo = "libfm-qt";
+    rev = "7c94e9efb996df0602f1f2b34b0216ba9b6df498";
+    sha256 = "1fnli2kh7n4hxmqwcb1n06lyk67d9a2fx6z70gas5jzym7r2h5vw";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/desktops/lxqt/lxqt-archiver/default.nix b/pkgs/desktops/lxqt/lxqt-archiver/default.nix
index 07a603364d7..205ea2fd201 100644
--- a/pkgs/desktops/lxqt/lxqt-archiver/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-archiver/default.nix
@@ -3,13 +3,13 @@
 mkDerivation rec {
   # pname = "lxqt-archiver";
   pname = "lxqt-archiver-unstable";
-  version = "2019-09-15";
+  version = "2019-09-25";
 
   src = fetchFromGitHub {
     owner = "lxqt";
-    repo = pname;
-    rev = "1e657b6a3e68c32f042d583872eca39a5d4b820f";
-    sha256 = "1vc9pzxrhznp65gdkzj3fzzivfqy712mwcxp3r25ar59d54alfpj";
+    repo = "lxqt-archiver";
+    rev = "62501255434b2ba6a8fd043a5af13dc0df038a5b";
+    sha256 = "1af58k68karmnay7xgngzlmcgkmvx6hay5m1xbl5id9hh16n20in";
   };
 
   nativeBuildInputs = [