diff options
| author | Jonathan Ringer <jonringer117@gmail.com> | 2021-11-19 08:44:33 -0800 |
|---|---|---|
| committer | Jonathan Ringer <jonringer117@gmail.com> | 2021-11-19 08:44:33 -0800 |
| commit | 6ede9cd761fce7572706d2a05da73ec3c4edc5d7 (patch) | |
| tree | d78fb59b6ab49f9f09da48aee2c249dcd7005d37 /pkgs/applications/virtualization | |
| parent | 9d44a614de8958de1f02519fe031b81eb23bb16d (diff) | |
| parent | c0068424f7818d8f284cbf0ea7302417cc76e261 (diff) | |
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts: pkgs/applications/audio/hybridreverb2/default.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 c7ae9482840b6..7e79d963fc298 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.9.0"; + version = "6.10.0"; src = fetchFromGitHub { owner = "mviereck"; repo = "x11docker"; rev = "v${version}"; - sha256 = "sha256-O+lab3K7J2Zz9t+yB/kYWtBOvQGOQMDFNDUVXzTj/h4="; + sha256 = "sha256-cPCtxfLzg1RDh3vKFfxAkcCMytu0mDsGp9CLJQmXATA="; }; nativeBuildInputs = [ makeWrapper ]; |