diff options
| author | Vladimír Čunát <v@cunat.cz> | 2022-02-06 10:29:49 +0100 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2022-02-06 10:29:49 +0100 |
| commit | 3dfddd89c6befd1eddc83948fa68d75c2d23936b (patch) | |
| tree | 0a9256f4cb942b54131a9bfe779627a46a0812d2 /pkgs/applications/virtualization | |
| parent | 570965d2cbdb5f1b858bf7a58cd4041e2e588b62 (diff) | |
| parent | bb96e481b317c770281c1bfd9e6face9bfe0888f (diff) | |
| download | nixlib-3dfddd89c6befd1eddc83948fa68d75c2d23936b.tar nixlib-3dfddd89c6befd1eddc83948fa68d75c2d23936b.tar.gz nixlib-3dfddd89c6befd1eddc83948fa68d75c2d23936b.tar.bz2 nixlib-3dfddd89c6befd1eddc83948fa68d75c2d23936b.tar.lz nixlib-3dfddd89c6befd1eddc83948fa68d75c2d23936b.tar.xz nixlib-3dfddd89c6befd1eddc83948fa68d75c2d23936b.tar.zst nixlib-3dfddd89c6befd1eddc83948fa68d75c2d23936b.zip | |
Merge branch 'master' into staging-next
Trivial conflict in pkgs/top-level/aliases.nix
Diffstat (limited to 'pkgs/applications/virtualization')
| -rw-r--r-- | pkgs/applications/virtualization/x11docker/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/applications/virtualization/x11docker/default.nix b/pkgs/applications/virtualization/x11docker/default.nix index 7e79d963fc29..07b7a557836c 100644 --- a/pkgs/applications/virtualization/x11docker/default.nix +++ b/pkgs/applications/virtualization/x11docker/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchFromGitHub, makeWrapper, nx-libs, xorg, getopt, gnugrep, gawk, ps, mount, iproute2 }: stdenv.mkDerivation rec { pname = "x11docker"; - version = "6.10.0"; + version = "7.0.1"; src = fetchFromGitHub { owner = "mviereck"; repo = "x11docker"; rev = "v${version}"; - sha256 = "sha256-cPCtxfLzg1RDh3vKFfxAkcCMytu0mDsGp9CLJQmXATA="; + sha256 = "sha256-ojKloMFbpBsr8fykMbLIBAzrlVaJDv+4BL0lozXsgC4="; }; nativeBuildInputs = [ makeWrapper ]; |