diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2021-01-07 13:04:31 +0100 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2021-01-07 13:04:31 +0100 |
| commit | f19eb635b4585f6ba4f9f4c3e9e07f56623446f5 (patch) | |
| tree | 4d64a15e34e8a2b54466ba165297a6bb08bfb280 /pkgs/applications/misc/dfilemanager | |
| parent | 0e4e47512d709e93c35fa575dd82e3e6ce4f884d (diff) | |
| parent | 2be707eca80b573c931007de78c936d49ab45395 (diff) | |
Merge branch 'master' into staging-next
https://github.com/NixOS/nixpkgs/commit/b04fc593e7b55fe1f74421b11589f12a339c92e2 seems to have accidentally changed mkDerivation function for dfilemanager and solarus-quest-editor so I have reverted that here.
Diffstat (limited to 'pkgs/applications/misc/dfilemanager')
| -rw-r--r-- | pkgs/applications/misc/dfilemanager/default.nix | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/pkgs/applications/misc/dfilemanager/default.nix b/pkgs/applications/misc/dfilemanager/default.nix index e7750cf7978e..e9a50e88b23c 100644 --- a/pkgs/applications/misc/dfilemanager/default.nix +++ b/pkgs/applications/misc/dfilemanager/default.nix @@ -1,13 +1,14 @@ -{ stdenv, fetchgit, cmake, file, qtbase, qttools, solid }: +{ stdenv, mkDerivation, fetchFromGitHub, cmake, file, qtbase, qttools, solid }: -stdenv.mkDerivation { +mkDerivation { pname = "dfilemanager"; - version = "git-2016-01-10"; + version = "git-2020-09-04"; - src = fetchgit { - url = "git://git.code.sf.net/p/dfilemanager/code"; - rev = "2c5078b05e0ad74c037366be1ab3e6a03492bde4"; - sha256 = "1qwhnlcc2j8sr1f3v63sxs3m7q7w1xy6c2jqsnznjgm23b5h3hxd"; + src = fetchFromGitHub { + owner = "probonopd"; + repo = "dfilemanager"; + rev = "c592d643d76942dc2c2ccb6e4bfdf53f5e805e48"; + sha256 = "7hIgaWjjOck5i4QbeVeQK7yrjK4yDoAZ5qY9RhM5ABY="; }; nativeBuildInputs = [ cmake ]; |