diff options
| author | William A. Kennington III <william@wkennington.com> | 2015-06-17 11:57:40 -0700 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2015-06-17 11:57:40 -0700 |
| commit | 8e19ac8d7cc7018613ff51d9266dea81547df756 (patch) | |
| tree | 0e8301d831813da3dcc689b5dc68c85f0623e5fc /pkgs/tools/misc | |
| parent | e4316b8c17121042fd258df6df2fdbc5618c2b72 (diff) | |
| parent | d4fc2b4d99122ba6592835aa84f659b22aeea433 (diff) | |
| download | nixlib-8e19ac8d7cc7018613ff51d9266dea81547df756.tar nixlib-8e19ac8d7cc7018613ff51d9266dea81547df756.tar.gz nixlib-8e19ac8d7cc7018613ff51d9266dea81547df756.tar.bz2 nixlib-8e19ac8d7cc7018613ff51d9266dea81547df756.tar.lz nixlib-8e19ac8d7cc7018613ff51d9266dea81547df756.tar.xz nixlib-8e19ac8d7cc7018613ff51d9266dea81547df756.tar.zst nixlib-8e19ac8d7cc7018613ff51d9266dea81547df756.zip | |
Merge branch 'master.upstream' into staging.upstream
Diffstat (limited to 'pkgs/tools/misc')
| -rw-r--r-- | pkgs/tools/misc/rmlint/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/misc/screen/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/misc/vdirsyncer/default.nix | 14 |
3 files changed, 10 insertions, 12 deletions
diff --git a/pkgs/tools/misc/rmlint/default.nix b/pkgs/tools/misc/rmlint/default.nix index 9e61a5c195e4..392734e2256d 100644 --- a/pkgs/tools/misc/rmlint/default.nix +++ b/pkgs/tools/misc/rmlint/default.nix @@ -4,11 +4,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "rmlint-${version}"; - version = "2.1.0"; + version = "2.2.0"; src = fetchurl { url = "https://github.com/sahib/rmlint/archive/v${version}.tar.gz"; - sha256 = "17hqkx1ji6rbvliji18my16b23ig9d6v4azgypwl0fam2ar4rm4g"; + sha256 = "1wg6br30ccvxl2189a75lb3d03kg8spfkkp9qlf3whl0xirsm15n"; }; configurePhase = "scons config"; diff --git a/pkgs/tools/misc/screen/default.nix b/pkgs/tools/misc/screen/default.nix index d4377c14fad4..e8a39623d9a6 100644 --- a/pkgs/tools/misc/screen/default.nix +++ b/pkgs/tools/misc/screen/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ncurses, pam ? null }: stdenv.mkDerivation rec { - name = "screen-4.2.1"; + name = "screen-4.3.0"; src = fetchurl { url = "mirror://gnu/screen/${name}.tar.gz"; - sha256 = "105hp6qdd8rl71p81klmxiz4mlb60kh9r7czayrx40g38x858s2l"; + sha256 = "0ilccnwszaxr9wbrx0swh4fisha2rj2jiq76fwqikmv0rjdyhr2i"; }; preConfigure = '' diff --git a/pkgs/tools/misc/vdirsyncer/default.nix b/pkgs/tools/misc/vdirsyncer/default.nix index 5312445563a6..86e424ad08be 100644 --- a/pkgs/tools/misc/vdirsyncer/default.nix +++ b/pkgs/tools/misc/vdirsyncer/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, pythonPackages }: +{ stdenv, fetchurl, pythonPackages }: pythonPackages.buildPythonPackage rec { version = "0.4.3"; @@ -10,10 +10,9 @@ pythonPackages.buildPythonPackage rec { sha256 = "0jrxmq8lq0dvqflmh42hhyvc3jjrg1cg3gzfhdcsskj9zz0m6wai"; }; - pythonPath = with pythonPackages; [ + propagatedBuildInputs = with pythonPackages; [ icalendar click - requests lxml setuptools requests_toolbelt @@ -21,12 +20,11 @@ pythonPackages.buildPythonPackage rec { atomicwrites ]; - meta = { + meta = with stdenv.lib; { homepage = https://github.com/untitaker/vdirsyncer; description = "Synchronize calendars and contacts"; - maintainers = [ lib.maintainers.matthiasbeyer ]; - platforms = lib.platforms.all; - license = lib.licenses.mit; + maintainers = with maintainers; [ matthiasbeyer jgeerds ]; + platforms = platforms.all; + license = licenses.mit; }; } - |