Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 91b02cd86b09
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 4414a3bc7cbe
Choose a head ref
  • 3 commits
  • 3 files changed
  • 2 contributors

Commits on Nov 20, 2019

  1. nixosTests.xfce: port to python

    @worldofpeace
    worldofpeace committed Nov 20, 2019
    Copy the full SHA
    a72f8a3 View commit details

  2. zsh-fast-syntax-highlighting: init at 1.54 (#65429)

    @pasqui23 @veprbl
    pasqui23 authored and veprbl committed Nov 20, 2019

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Learn about vigilant mode
    Copy the full SHA
    c20f765 View commit details

  3. Merge pull request #73138 from worldofpeace/port-xfce-tests 

    Port xfce test to python
    @worldofpeace
    worldofpeace authored Nov 20, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    4414a3b View commit details
Showing with 46 additions and 13 deletions.
  1. +14 −13 nixos/tests/xfce.nix
  2. +30 −0 pkgs/shells/zsh/zsh-fast-syntax-highlighting/default.nix
  3. +2 −0 pkgs/top-level/all-packages.nix
27 changes: 14 additions & 13 deletions nixos/tests/xfce.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import ./make-test.nix ({ pkgs, ...} : {
import ./make-test-python.nix ({ pkgs, ...} : {
name = "xfce";

machine =
@@ -18,20 +18,21 @@ import ./make-test.nix ({ pkgs, ...} : {
virtualisation.memorySize = 1024;
};

testScript =
''
$machine->waitForX;
$machine->waitForFile("/home/alice/.Xauthority");
$machine->succeed("xauth merge ~alice/.Xauthority");
$machine->waitForWindow(qr/xfce4-panel/);
$machine->sleep(10);
testScript = { nodes, ... }: let
user = nodes.machine.config.users.users.alice;
in ''
machine.wait_for_x()
machine.wait_for_file("${user.home}/.Xauthority")
machine.succeed("xauth merge ${user.home}/.Xauthority")
machine.wait_for_window("xfce4-panel")
machine.sleep(10)
# Check that logging in has given the user ownership of devices.
$machine->succeed("getfacl -p /dev/snd/timer | grep -q alice");
machine.succeed("getfacl -p /dev/snd/timer | grep -q ${user.name}")
$machine->succeed("su - alice -c 'DISPLAY=:0.0 xfce4-terminal &'");
$machine->waitForWindow(qr/Terminal/);
$machine->sleep(10);
$machine->screenshot("screen");
machine.succeed("su - ${user.name} -c 'DISPLAY=:0.0 xfce4-terminal &'")
machine.wait_for_window("Terminal")
machine.sleep(10)
machine.screenshot("screen")
'';
})
30 changes: 30 additions & 0 deletions pkgs/shells/zsh/zsh-fast-syntax-highlighting/default.nix
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
{ stdenvNoCC, lib, fetchFromGitHub }:

stdenvNoCC.mkDerivation rec {
pname = "zsh-fast-syntax-highlighting";
version = "1.54";

src = fetchFromGitHub {
owner = "zdharma";
repo = "fast-syntax-highlighting";
rev = "v${version}";
sha256 = "019hda2pj8lf7px4h1z07b9l6icxx4b2a072jw36lz9bh6jahp32";
};

dontConfigure = true;
dontBuild = true;

installPhase = ''
plugindir="$out/share/zsh/site-functions"
mkdir -p "$plugindir"
cp -r -- {,_,-}fast-* chroma themes "$plugindir"/
'';

meta = with lib; {
description = "Syntax-highlighting for Zshell";
homepage = "https://github.com/zdharma/fast-syntax-highlighting";
license = licenses.bsd3;
platforms = platforms.unix;
};
}
2 changes: 2 additions & 0 deletions pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -7465,6 +7465,8 @@ in
zsh-navigation-tools = callPackage ../tools/misc/zsh-navigation-tools { };

zsh-syntax-highlighting = callPackage ../shells/zsh/zsh-syntax-highlighting { };

zsh-fast-syntax-highlighting = callPackage ../shells/zsh/zsh-fast-syntax-highlighting { };

zsh-autosuggestions = callPackage ../shells/zsh/zsh-autosuggestions { };