This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/assets/voxygen/shaders/postprocess-frag.glsl b/assets/voxygen/shaders/postprocess-frag.glsl | |
index f653f1d3..9392a3c0 100644 | |
--- a/assets/voxygen/shaders/postprocess-frag.glsl | |
+++ b/assets/voxygen/shaders/postprocess-frag.glsl | |
@@ -3,6 +3,7 @@ | |
#include <globals.glsl> | |
uniform sampler2D src_color; | |
+uniform sampler2D src_normal; | |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/common/src/state.rs b/common/src/state.rs | |
index e87e6c91..518c0565 100644 | |
--- a/common/src/state.rs | |
+++ b/common/src/state.rs | |
@@ -6,14 +6,12 @@ use crate::{ | |
event::{EventBus, LocalEvent, ServerEvent}, | |
msg::{EcsCompPacket, EcsResPacket}, | |
sys, | |
- terrain::{Block, TerrainChunk, TerrainGrid}, | |
- vol::WriteVol, |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
{ | |
"WellKnownResult": { | |
"m.server": "", | |
"result": "No .well-known found" | |
}, | |
"DNSResult": { | |
"SRVCName": "_matrix._tcp.stuvus.de.", | |
"SRVRecords": [ | |
{ | |
"Target": "matrix.stuvus.uni-stuttgart.de.", |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Thread 1 "mixxx" received signal SIGSEGV, Segmentation fault. | |
0x00007ffff5d239fc in sqlite3DbMallocRawNN () from /nix/store/rf1n8w09sq9mnikmygn07lfz802326gg-sqlite-3.28.0/lib/libsqlite3.so.0 | |
(gdb) bt | |
#0 0x00007ffff5d239fc in sqlite3DbMallocRawNN () from /nix/store/rf1n8w09sq9mnikmygn07lfz802326gg-sqlite-3.28.0/lib/libsqlite3.so.0 | |
#1 0x00007ffff5d2458a in tokenExpr () from /nix/store/rf1n8w09sq9mnikmygn07lfz802326gg-sqlite-3.28.0/lib/libsqlite3.so.0 | |
#2 0x00007ffff5daf505 in sqlite3RunParser () from /nix/store/rf1n8w09sq9mnikmygn07lfz802326gg-sqlite-3.28.0/lib/libsqlite3.so.0 | |
#3 0x00007ffff5db3ade in sqlite3Prepare () from /nix/store/rf1n8w09sq9mnikmygn07lfz802326gg-sqlite-3.28.0/lib/libsqlite3.so.0 | |
#4 0x00007ffff5db404e in sqlite3LockAndPrepare () from /nix/store/rf1n8w09sq9mnikmygn07lfz802326gg-sqlite-3.28.0/lib/libsqlite3.so.0 | |
#5 0x00007ffff5db50e7 in sqlite3Prepare16 () from /nix/store/rf1n8w09sq9mnikmygn07lfz802326gg-sqlite-3.28.0/lib/libsqlite3.so.0 | |
#6 0x00007fffdc0690a1 in ?? () from /nix/store/9q |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
with import <nixpkgs> {}; | |
let | |
libdjinterop = stdenv.mkDerivation { | |
name = "libdjinterop"; | |
version = "2019-06-05"; | |
src = fetchFromGitHub { | |
owner = "xsco"; | |
repo = "libdjinterop"; | |
rev = "6cdf066a8a137c3ff1fe8987e2a1dc23c86262de"; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/defaults/main.yml b/defaults/main.yml | |
index 32b63b6..df9abf9 100644 | |
--- a/defaults/main.yml | |
+++ b/defaults/main.yml | |
@@ -4,3 +4,4 @@ upgrade_restart_services_ignore: | |
- dbus | |
upgrade_do_autoremove: True | |
upgrade_do_autoclean: True | |
+upgrade_mirror_boot: False | |
diff --git a/tasks/upgrade_debian.yml b/tasks/upgrade_debian.yml |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/tasks/upgrade_debian.yml b/tasks/upgrade_debian.yml | |
index fb81f3f..9a3e9cd 100644 | |
--- a/tasks/upgrade_debian.yml | |
+++ b/tasks/upgrade_debian.yml | |
@@ -24,10 +24,44 @@ | |
debug: msg="{{ updates.stdout_lines | count }} packages to upgrade ({{ updates.stdout_lines | join(', ') }})" | |
when: updates.stdout_lines | count > 1 | |
+- name: Create mirrored /boot | |
+ file: |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
builder for '/nix/store/q2qi13xnb0mn4mki0ag7ql23216if3kp-librespot-14721f45fe7e3e5427abdfdedca6ed1ec8948d80.drv' failed with exit code 101; last 10 log lines: | |
Caused by: | |
failed to parse manifest at `/build/librespot-14721f45fe7e3e5427abdfdedca6ed1ec8948d80-vendor/fuchsia-cprng/Cargo.toml` | |
Caused by: | |
editions are unstable | |
Caused by: | |
feature `edition` is required | |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/tasks/agent.yml b/tasks/agent.yml | |
index cd78a55..a62914a 100644 | |
--- a/tasks/agent.yml | |
+++ b/tasks/agent.yml | |
@@ -65,14 +65,12 @@ | |
cmd: icinga2 pki ticket --cn "{{ inventory_hostname }}" | |
changed_when: false | |
delegate_to: "{{ icinga2_ca_host | mandatory }}" | |
- when: keypair.changed | |
register: ticket |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
{ pkgsPath ? <nixpkgs>, crossSystem ? null }: | |
let | |
mozOverlay = import ( | |
builtins.fetchTarball https://github.com/mozilla/nixpkgs-mozilla/archive/master.tar.gz | |
); | |
pkgs = import pkgsPath { | |
overlays = [ mozOverlay ]; | |
inherit crossSystem; | |
}; |
NewerOlder