From a774642d29dcc3a668abf9bbe13e88ee786b5d1d Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Sat, 23 Jul 2016 11:46:24 +0200
Subject: tv pkgs.cr: %@ -> $@

---
 tv/5pkgs/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tv/5pkgs')

diff --git a/tv/5pkgs/default.nix b/tv/5pkgs/default.nix
index affb535e..040a6ff3 100644
--- a/tv/5pkgs/default.nix
+++ b/tv/5pkgs/default.nix
@@ -10,7 +10,7 @@
           --ssl-version-min=tls1 \
           --disk-cache-dir=/tmp/chromium-disk-cache_"$LOGNAME" \
           --disk-cache-size=50000000 \
-          "%@"
+          "$@"
     '';
     ejabberd = pkgs.callPackage ./ejabberd {
       erlang = pkgs.erlangR16;
-- 
cgit v1.2.3


From ad816aaa281094fc4fde1755de618440a5a1df28 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Sat, 23 Jul 2016 11:47:46 +0200
Subject: tv pkgs.ff: drop sudo

---
 tv/5pkgs/default.nix    |  4 +++-
 tv/5pkgs/ff/default.nix | 12 ------------
 2 files changed, 3 insertions(+), 13 deletions(-)
 delete mode 100644 tv/5pkgs/ff/default.nix

(limited to 'tv/5pkgs')

diff --git a/tv/5pkgs/default.nix b/tv/5pkgs/default.nix
index 040a6ff3..0b28747d 100644
--- a/tv/5pkgs/default.nix
+++ b/tv/5pkgs/default.nix
@@ -15,7 +15,9 @@
     ejabberd = pkgs.callPackage ./ejabberd {
       erlang = pkgs.erlangR16;
     };
-    ff = pkgs.callPackage ./ff {};
+    ff = pkgs.writeDashBin "ff" ''
+      exec ${pkgs.firefoxWrapper}/bin/firefox "$@"
+    '';
     gnupg =
       if elem config.krebs.build.host.name ["xu" "wu"]
         then super.gnupg21
diff --git a/tv/5pkgs/ff/default.nix b/tv/5pkgs/ff/default.nix
deleted file mode 100644
index b1d2c579..00000000
--- a/tv/5pkgs/ff/default.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ pkgs, ... }:
-
-# TODO use krebs.setuid
-# This requires that we can create setuid executables that can only be accessed
-# by a single user. [per-user-setuid]
-
-# using bash for %q
-pkgs.writeBashBin "ff" ''
- exec /var/setuid-wrappers/sudo -u ff -i <<EOF
- exec ${pkgs.firefoxWrapper}/bin/firefox $(printf " %q" "$@")
- EOF
-''
-- 
cgit v1.2.3


From 20142392d8f2dbf95c5629b588d3cf1d94be791c Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Sat, 23 Jul 2016 13:41:06 +0200
Subject: tv pkgs: with lib

---
 tv/5pkgs/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'tv/5pkgs')

diff --git a/tv/5pkgs/default.nix b/tv/5pkgs/default.nix
index 0b28747d..baa1531a 100644
--- a/tv/5pkgs/default.nix
+++ b/tv/5pkgs/default.nix
@@ -1,5 +1,5 @@
-{ pkgs, ... }:
-
+{ config, pkgs, ... }:
+with config.krebs.lib;
 {
   nixpkgs.config.packageOverrides = {
     # TODO use XDG_RUNTIME_DIR?
-- 
cgit v1.2.3


From 751afae363d1f5492d4a54a7b3f334499d32fb5b Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Sat, 23 Jul 2016 13:46:36 +0200
Subject: tv pkgs: packageOverride with super

This is part of 0c7a44139fba572487fe853310b6d88a6ffa21c3.
---
 tv/5pkgs/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tv/5pkgs')

diff --git a/tv/5pkgs/default.nix b/tv/5pkgs/default.nix
index baa1531a..3590ad57 100644
--- a/tv/5pkgs/default.nix
+++ b/tv/5pkgs/default.nix
@@ -1,7 +1,7 @@
 { config, pkgs, ... }:
 with config.krebs.lib;
 {
-  nixpkgs.config.packageOverrides = {
+  nixpkgs.config.packageOverrides = super: {
     # TODO use XDG_RUNTIME_DIR?
     cr = pkgs.writeDashBin "cr" ''
       set -efu
-- 
cgit v1.2.3