summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlassulus <lassulus@lassul.us>2017-10-03 23:53:53 +0200
committerlassulus <lassulus@lassul.us>2017-10-03 23:53:53 +0200
commit36fa4bf032ff4ee414fa4f26d70638f94772e6f3 (patch)
treed8293fb8b81ab5476b8510d5774873a35c0a04d1
parent387bf34e82a5cb5cf82288cf3c58fff5b1bb4ce5 (diff)
parent213356531dd1ba8c807ae90fc85a92ebbc301be0 (diff)
Merge remote-tracking branch 'ni/master'
-rw-r--r--mv/source.nix4
-rw-r--r--tv/1systems/alnus/source.nix2
-rw-r--r--tv/1systems/mu/config.nix4
-rw-r--r--tv/2configs/br.nix1
-rw-r--r--tv/2configs/gitrepos.nix2
-rw-r--r--tv/5pkgs/default.nix10
-rw-r--r--tv/5pkgs/simple/mfcl2700dncupswrapper/default.nix45
-rw-r--r--tv/5pkgs/simple/mfcl2700dnlpr/default.nix44
-rw-r--r--tv/source.nix4
9 files changed, 18 insertions, 98 deletions
diff --git a/mv/source.nix b/mv/source.nix
index 5dea13e73..2fa53a13e 100644
--- a/mv/source.nix
+++ b/mv/source.nix
@@ -9,8 +9,8 @@ in
{
nixos-config.symlink = "stockholm/mv/1systems/${name}/config.nix";
nixpkgs.git = {
- # nixos-17.03
- ref = mkDefault "3d04a557b72aa0987d9bf079e1445280b6bfd907";
+ # nixos-17.09
+ ref = mkDefault "d0f0657ca06cc8cb239cb94f430b53bcdf755887";
url = https://github.com/NixOS/nixpkgs;
};
secrets.file = getAttr builder {
diff --git a/tv/1systems/alnus/source.nix b/tv/1systems/alnus/source.nix
index c3ed4dcfb..9fd2f668c 100644
--- a/tv/1systems/alnus/source.nix
+++ b/tv/1systems/alnus/source.nix
@@ -1,4 +1,4 @@
import <stockholm/tv/source.nix> {
name = "alnus";
- override.nixpkgs.git.ref = "9b948ea439ddbaa26740ce35543e7e35d2aa6d18";
+ override.nixpkgs.git.ref = "d0f0657ca06cc8cb239cb94f430b53bcdf755887";
}
diff --git a/tv/1systems/mu/config.nix b/tv/1systems/mu/config.nix
index f3e7b515b..501200c1f 100644
--- a/tv/1systems/mu/config.nix
+++ b/tv/1systems/mu/config.nix
@@ -52,11 +52,13 @@ with import <stockholm/lib>;
networking.networkmanager.enable = true;
environment.systemPackages = with pkgs; [
+ (pkgs.kdeApplications.callPackage
+ (import <nixpkgs/pkgs/applications/kde/kde-locale-5.nix> "de" {})
+ {})
chromium
firefoxWrapper
gimp
iptables
- kdeApplications.l10n.de.qt5
libreoffice
pidginotr
pidgin-with-plugins
diff --git a/tv/2configs/br.nix b/tv/2configs/br.nix
index c7eb20e90..d660ebc35 100644
--- a/tv/2configs/br.nix
+++ b/tv/2configs/br.nix
@@ -45,5 +45,4 @@ with import <stockholm/lib>;
];
};
- systemd.services.cups.serviceConfig.PrivateTmp = true;
}
diff --git a/tv/2configs/gitrepos.nix b/tv/2configs/gitrepos.nix
index bbb1d4128..2c4b4868e 100644
--- a/tv/2configs/gitrepos.nix
+++ b/tv/2configs/gitrepos.nix
@@ -100,7 +100,7 @@ let {
);
irc-announce = args: pkgs.git-hooks.irc-announce (recursiveUpdate {
- channel = "#krebs";
+ channel = "#xxx";
# TODO make nick = config.krebs.build.host.name the default
nick = config.krebs.build.host.name;
server = "irc.r";
diff --git a/tv/5pkgs/default.nix b/tv/5pkgs/default.nix
index 1796609a9..9dc7ae7b1 100644
--- a/tv/5pkgs/default.nix
+++ b/tv/5pkgs/default.nix
@@ -13,6 +13,14 @@ foldl' mergeAttrs {}
//
{
+ brscan4 = overrideDerivation super.brscan4 (original: rec {
+ name = "brscan4-0.4.4-4";
+ src = super.fetchurl {
+ url = "http://download.brother.com/welcome/dlf006645/${name}.amd64.deb";
+ sha256 = "0xy5px96y1saq9l80vwvfn6anr2q42qlxdhm6ci2a0diwib5q9fd";
+ };
+ });
+
# TODO use XDG_RUNTIME_DIR?
cr = self.writeDashBin "cr" ''
set -efu
@@ -32,7 +40,7 @@ foldl' mergeAttrs {}
exec ${self.firefoxWrapper}/bin/firefox "$@"
'';
- gnupg = self.gnupg21;
+ gnupg = self.gnupg22;
# https://github.com/NixOS/nixpkgs/issues/16113
wvdial = let
diff --git a/tv/5pkgs/simple/mfcl2700dncupswrapper/default.nix b/tv/5pkgs/simple/mfcl2700dncupswrapper/default.nix
deleted file mode 100644
index 1ef018b33..000000000
--- a/tv/5pkgs/simple/mfcl2700dncupswrapper/default.nix
+++ /dev/null
@@ -1,45 +0,0 @@
-{ coreutils, dpkg, fetchurl, gnugrep, gnused, makeWrapper, mfcl2700dnlpr,
-perl, stdenv }:
-
-stdenv.mkDerivation rec {
- name = "mfcl2700dncupswrapper-${meta.version}";
-
- src = fetchurl {
- url = "http://download.brother.com/welcome/dlf102086/${name}.i386.deb";
- sha256 = "07w48mah0xbv4h8vsh1qd5cd4b463bx8y6gc5x9pfgsxsy6h6da1";
- };
-
- nativeBuildInputs = [ dpkg makeWrapper ];
-
- phases = [ "installPhase" ];
-
- installPhase = ''
- dpkg-deb -x $src $out
-
- basedir=${mfcl2700dnlpr}/opt/brother/Printers/MFCL2700DN
- dir=$out/opt/brother/Printers/MFCL2700DN
-
- substituteInPlace $dir/cupswrapper/brother_lpdwrapper_MFCL2700DN \
- --replace /usr/bin/perl ${perl}/bin/perl \
- --replace "basedir =~" "basedir = \"$basedir\"; #" \
- --replace "PRINTER =~" "PRINTER = \"MFCL2700DN\"; #"
-
- wrapProgram $dir/cupswrapper/brother_lpdwrapper_MFCL2700DN \
- --prefix PATH : ${stdenv.lib.makeBinPath [ coreutils gnugrep gnused ]}
-
- mkdir -p $out/lib/cups/filter
- mkdir -p $out/share/cups/model
-
- ln $dir/cupswrapper/brother_lpdwrapper_MFCL2700DN $out/lib/cups/filter
- ln $dir/cupswrapper/brother-MFCL2700DN-cups-en.ppd $out/share/cups/model
- '';
-
- meta = {
- description = "Brother MFC-L2700DN CUPS wrapper driver";
- homepage = "http://www.brother.com/";
- license = stdenv.lib.licenses.gpl2Plus;
- maintainers = [ stdenv.lib.maintainers.tv ];
- platforms = stdenv.lib.platforms.linux;
- version = "3.2.0-1";
- };
-}
diff --git a/tv/5pkgs/simple/mfcl2700dnlpr/default.nix b/tv/5pkgs/simple/mfcl2700dnlpr/default.nix
deleted file mode 100644
index fc11b53e9..000000000
--- a/tv/5pkgs/simple/mfcl2700dnlpr/default.nix
+++ /dev/null
@@ -1,44 +0,0 @@
-{ coreutils, dpkg, fetchurl, ghostscript, gnugrep, gnused, pkgsi686Linux, makeWrapper, perl, stdenv, which }:
-
-stdenv.mkDerivation rec {
- name = "mfcl2700dnlpr-${meta.version}";
-
- src = fetchurl {
- url = "http://download.brother.com/welcome/dlf102085/${name}.i386.deb";
- sha256 = "170qdzxlqikzvv2wphvfb37m19mn13az4aj88md87ka3rl5knk4m";
- };
-
- nativeBuildInputs = [ dpkg makeWrapper ];
-
- phases = [ "installPhase" ];
-
- installPhase = ''
- dpkg-deb -x $src $out
-
- dir=$out/opt/brother/Printers/MFCL2700DN
-
- substituteInPlace $dir/lpd/filter_MFCL2700DN \
- --replace /usr/bin/perl ${perl}/bin/perl \
- --replace "BR_PRT_PATH =~" "BR_PRT_PATH = \"$dir\"; #" \
- --replace "PRINTER =~" "PRINTER = \"MFCL2700DN\"; #"
-
- wrapProgram $dir/lpd/filter_MFCL2700DN \
- --prefix PATH : ${stdenv.lib.makeBinPath [
- coreutils ghostscript gnugrep gnused which
- ]}
-
- interpreter=${pkgsi686Linux.stdenv.cc.libc.out}/lib/ld-linux.so.2
- patchelf --set-interpreter "$interpreter" $dir/inf/braddprinter
- patchelf --set-interpreter "$interpreter" $dir/lpd/brprintconflsr3
- patchelf --set-interpreter "$interpreter" $dir/lpd/rawtobr3
- '';
-
- meta = {
- description = "Brother MFC-L2700DN LPR driver";
- homepage = "http://www.brother.com/";
- license = stdenv.lib.licenses.unfree;
- maintainers = [ stdenv.lib.maintainers.tv ];
- platforms = stdenv.lib.platforms.linux;
- version = "3.2.0-1";
- };
-}
diff --git a/tv/source.nix b/tv/source.nix
index 18733ee5c..f3bda2715 100644
--- a/tv/source.nix
+++ b/tv/source.nix
@@ -9,8 +9,8 @@ in
{
nixos-config.symlink = "stockholm/tv/1systems/${name}/config.nix";
nixpkgs.git = {
- # nixos-17.03
- ref = mkDefault "94941cb0455bfc50b1bf63186cfad7136d629f78";
+ # nixos-17.09
+ ref = mkDefault "d0f0657ca06cc8cb239cb94f430b53bcdf755887";
url = https://github.com/NixOS/nixpkgs;
};
secrets.file = getAttr builder {