diff options
| author | makefu <github@syntax-fehler.de> | 2018-01-09 23:59:43 +0100 | 
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2018-01-09 23:59:43 +0100 | 
| commit | 44d12e0037275dde5263d21017b83e1f146c86b4 (patch) | |
| tree | 9c9d1d9749f8c8fb817f4c4bb52816f9b1ff53f9 | |
| parent | 05c6e0b86c3cc59662d8daf26e81127a18a96a50 (diff) | |
| parent | 5ef3a2c6caa2f018c2adf795de992e0487dd2413 (diff) | |
Merge branch 'master' of prism:stockholm
| -rw-r--r-- | jeschli/2configs/urxvt.nix | 2 | ||||
| -rw-r--r-- | lass/source.nix | 2 | 
2 files changed, 2 insertions, 2 deletions
| diff --git a/jeschli/2configs/urxvt.nix b/jeschli/2configs/urxvt.nix index a2e02de35..69811eb0a 100644 --- a/jeschli/2configs/urxvt.nix +++ b/jeschli/2configs/urxvt.nix @@ -28,7 +28,7 @@ with import <stockholm/lib>;    URxvt*scrollBar:                      false    URxvt*urgentOnBell:                   true -  URxvt*font: xft:DejaVu Sans Mono:pixelsize=20 +  URxvt*font: xft:DejaVu Sans Mono:pixelsize=12    URXvt*faceSize: 12    '';  } diff --git a/lass/source.nix b/lass/source.nix index a6314694c..46c6d31dc 100644 --- a/lass/source.nix +++ b/lass/source.nix @@ -10,7 +10,7 @@ in        nixos-config.symlink = "stockholm/lass/1systems/${name}/config.nix";        nixpkgs.git = {          url = https://github.com/nixos/nixpkgs; -        ref = "0b30c1d"; +        ref = "d202e30";        };        secrets = getAttr builder {          buildbot.file = toString <stockholm/lass/2configs/tests/dummy-secrets>; | 
