diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2018-08-27 08:21:50 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-08-27 08:21:50 +0200 |
| commit | 79452954109ad29f0c9c24f794bfe88a12d538cb (patch) | |
| tree | 45443f511b8837a0457456fd3fcc3c97437d05e3 /pkgs/tools | |
| parent | 0e530b037d50985107899c94104175df629e8544 (diff) | |
| parent | 87e44b0357ce7a43517e5faf17f22551181802bd (diff) | |
| download | nixlib-79452954109ad29f0c9c24f794bfe88a12d538cb.tar nixlib-79452954109ad29f0c9c24f794bfe88a12d538cb.tar.gz nixlib-79452954109ad29f0c9c24f794bfe88a12d538cb.tar.bz2 nixlib-79452954109ad29f0c9c24f794bfe88a12d538cb.tar.lz nixlib-79452954109ad29f0c9c24f794bfe88a12d538cb.tar.xz nixlib-79452954109ad29f0c9c24f794bfe88a12d538cb.tar.zst nixlib-79452954109ad29f0c9c24f794bfe88a12d538cb.zip | |
Merge master into staging
Diffstat (limited to 'pkgs/tools')
| -rw-r--r-- | pkgs/tools/X11/dex/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/tools/filesystems/ceph/default.nix | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/pkgs/tools/X11/dex/default.nix b/pkgs/tools/X11/dex/default.nix index d147ef4a70c1..2a3a406135b3 100644 --- a/pkgs/tools/X11/dex/default.nix +++ b/pkgs/tools/X11/dex/default.nix @@ -3,16 +3,17 @@ stdenv.mkDerivation rec { program = "dex"; name = "${program}-${version}"; - version = "0.7"; + version = "0.8.0"; src = fetchFromGitHub { owner = "jceb"; repo = program; rev = "v${version}"; - sha256 = "041ms01snalapapaniabr92d8iim1qrxian626nharjmp2rd69v5"; + sha256 = "13dkjd1373mbvskrdrp0865llr3zvdr90sc6a6jqswh3crmgmz4k"; }; propagatedBuildInputs = [ python3 ]; + nativeBuildInputs = [ python3.pkgs.sphinx ]; makeFlags = [ "PREFIX=$(out)" "VERSION=$(version)" ]; meta = { diff --git a/pkgs/tools/filesystems/ceph/default.nix b/pkgs/tools/filesystems/ceph/default.nix index 0f712853f24a..ef3e36ff6275 100644 --- a/pkgs/tools/filesystems/ceph/default.nix +++ b/pkgs/tools/filesystems/ceph/default.nix @@ -1,12 +1,12 @@ { callPackage, fetchgit, fetchpatch, ... } @ args: callPackage ./generic.nix (args // rec { - version = "12.2.2"; + version = "12.2.7"; src = fetchgit { url = "https://github.com/ceph/ceph.git"; rev = "refs/tags/v${version}"; - sha256 = "01anqxyffa8l2lzgyb0dj6fjicfjdx2cq9y1klh24x69gxwkdh00"; + sha256 = "031nfw2g2fdpxxx39g862phgmdx68hj9r54axazandghfhc1bzrl"; }; }) |