diff options
| author | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2019-02-18 14:18:04 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2019-02-18 14:18:04 +0100 |
| commit | 815b77cbe6c5de49bd59eda6310875d0c19ca704 (patch) | |
| tree | 369b5beabdbf288df518b6568c94b713a97817e7 /pkgs/applications/misc | |
| parent | 97c05bda526695a11624914f2d74e69887851984 (diff) | |
| parent | 107215c1d0cf485de1e15b58404e732e9e58148a (diff) | |
| download | nixlib-815b77cbe6c5de49bd59eda6310875d0c19ca704.tar nixlib-815b77cbe6c5de49bd59eda6310875d0c19ca704.tar.gz nixlib-815b77cbe6c5de49bd59eda6310875d0c19ca704.tar.bz2 nixlib-815b77cbe6c5de49bd59eda6310875d0c19ca704.tar.lz nixlib-815b77cbe6c5de49bd59eda6310875d0c19ca704.tar.xz nixlib-815b77cbe6c5de49bd59eda6310875d0c19ca704.tar.zst nixlib-815b77cbe6c5de49bd59eda6310875d0c19ca704.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/applications/misc')
| -rw-r--r-- | pkgs/applications/misc/twmn/default.nix | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/pkgs/applications/misc/twmn/default.nix b/pkgs/applications/misc/twmn/default.nix index 0667ec49b328..04c6cc3606e3 100644 --- a/pkgs/applications/misc/twmn/default.nix +++ b/pkgs/applications/misc/twmn/default.nix @@ -1,12 +1,13 @@ -{ stdenv, fetchgit, qtbase, qtx11extras, qmake, pkgconfig, boost }: +{ stdenv, fetchFromGitHub, qtbase, qtx11extras, qmake, pkgconfig, boost }: stdenv.mkDerivation rec { - name = "twmn-git-2014-09-23"; + name = "twmn-git-2018-10-01"; - src = fetchgit { - url = "https://github.com/sboli/twmn.git"; - rev = "9492a47e25547e602dd57efd807033677c90b150"; - sha256 = "1a68gka9gyxyzhc9rn8df59rzcdwkjw90cxp1kk0rdfp6svhxhsa"; + src = fetchFromGitHub { + owner = "sboli"; + repo = "twmn"; + rev = "80f48834ef1a07087505b82358308ee2374b6dfb"; + sha256 = "0mpjvp800x07lp9i3hfcc5f4bqj1fj4w3dyr0zwaxc6wqmm0fdqz"; }; nativeBuildInputs = [ pkgconfig qmake ]; |