From 1ebd26d96de5714f35f31fcefc89cbb414c21093 Mon Sep 17 00:00:00 2001 From: lassulus Date: Tue, 6 Jun 2017 14:27:42 +0200 Subject: l 2 nixpkgs: f8dfdd7 -> 8804775 --- lass/2configs/nixpkgs.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lass/2configs') diff --git a/lass/2configs/nixpkgs.nix b/lass/2configs/nixpkgs.nix index a3916a2ea..60c942367 100644 --- a/lass/2configs/nixpkgs.nix +++ b/lass/2configs/nixpkgs.nix @@ -3,6 +3,6 @@ { krebs.build.source.nixpkgs.git = { url = https://cgit.lassul.us/nixpkgs; - ref = "f8dfdd7"; + ref = "8804775"; }; } -- cgit v1.3.1 From e0f2449d526ba0f6a5bb8feebb8ca67bbc822554 Mon Sep 17 00:00:00 2001 From: lassulus Date: Thu, 15 Jun 2017 19:15:50 +0200 Subject: l 2 nixpkgs: 8804775 -> 0a4db15 --- lass/2configs/nixpkgs.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lass/2configs') diff --git a/lass/2configs/nixpkgs.nix b/lass/2configs/nixpkgs.nix index 60c942367..1c68d58d5 100644 --- a/lass/2configs/nixpkgs.nix +++ b/lass/2configs/nixpkgs.nix @@ -3,6 +3,6 @@ { krebs.build.source.nixpkgs.git = { url = https://cgit.lassul.us/nixpkgs; - ref = "8804775"; + ref = "0a4db15"; }; } -- cgit v1.3.1 From 1ec7dabe6233ecec74a0b387f1e7851f55c72ad5 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 18 Jun 2017 14:00:05 +0200 Subject: krebszones -> ovh-zone --- krebs/5pkgs/simple/krebszones/default.nix | 25 ------------------------- krebs/5pkgs/simple/ovh-zone/default.nix | 25 +++++++++++++++++++++++++ lass/1systems/mors.nix | 2 +- lass/2configs/buildbot-standalone.nix | 2 +- makefu/2configs/tools/dev.nix | 2 +- tv/2configs/default.nix | 2 +- 6 files changed, 29 insertions(+), 29 deletions(-) delete mode 100644 krebs/5pkgs/simple/krebszones/default.nix create mode 100644 krebs/5pkgs/simple/ovh-zone/default.nix (limited to 'lass/2configs') diff --git a/krebs/5pkgs/simple/krebszones/default.nix b/krebs/5pkgs/simple/krebszones/default.nix deleted file mode 100644 index 9230192bd..000000000 --- a/krebs/5pkgs/simple/krebszones/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, pkgs,python3Packages,fetchurl, ... }: - -# TODO: Prepare a diff of future and current -## ovh-zone export krebsco.de --config ~/secrets/krebs/cfg.json |sed 's/[ ]\+/ /g' | sort current -## sed 's/[ ]\+/ /g'/etc/zones/krebsco.de | sort > future -## diff future.sorted current.sorted - -python3Packages.buildPythonPackage rec { - name = "krebszones-${version}"; - version = "0.4.4"; - propagatedBuildInputs = with pkgs.python3Packages;[ - d2to1 # for setup to work - ovh - docopt - ]; - src = fetchurl { - url = "https://pypi.python.org/packages/source/k/krebszones/krebszones-${version}.tar.gz"; - sha256 = "1bzfc2b9468769j1yj93j12zdlccqbjiqfhql2larximh491sg4d"; - }; - meta = { - homepage = http://krebsco.de/; - description = "OVH Zone Upload"; - license = lib.licenses.wtfpl; - }; -} diff --git a/krebs/5pkgs/simple/ovh-zone/default.nix b/krebs/5pkgs/simple/ovh-zone/default.nix new file mode 100644 index 000000000..051a14e8d --- /dev/null +++ b/krebs/5pkgs/simple/ovh-zone/default.nix @@ -0,0 +1,25 @@ +{ lib, pkgs,python3Packages,fetchurl, ... }: + +# TODO: Prepare a diff of future and current +## ovh-zone export krebsco.de --config ~/secrets/krebs/cfg.json |sed 's/[ ]\+/ /g' | sort current +## sed 's/[ ]\+/ /g'/etc/zones/krebsco.de | sort > future +## diff future.sorted current.sorted + +python3Packages.buildPythonPackage rec { + name = "ovh-zone-${version}"; + version = "0.4.4"; + propagatedBuildInputs = with pkgs.python3Packages;[ + d2to1 # for setup to work + ovh + docopt + ]; + src = fetchurl { + url = "https://pypi.python.org/packages/source/k/krebszones/krebszones-${version}.tar.gz"; + sha256 = "1bzfc2b9468769j1yj93j12zdlccqbjiqfhql2larximh491sg4d"; + }; + meta = { + homepage = http://krebsco.de/; + description = "OVH Zone Upload"; + license = lib.licenses.wtfpl; + }; +} diff --git a/lass/1systems/mors.nix b/lass/1systems/mors.nix index dd3777c64..a5305c07c 100644 --- a/lass/1systems/mors.nix +++ b/lass/1systems/mors.nix @@ -76,7 +76,7 @@ with import ; } { environment.systemPackages = [ - pkgs.krebszones + pkgs.ovh-zone ]; } { diff --git a/lass/2configs/buildbot-standalone.nix b/lass/2configs/buildbot-standalone.nix index 227152482..5edd1075d 100644 --- a/lass/2configs/buildbot-standalone.nix +++ b/lass/2configs/buildbot-standalone.nix @@ -178,11 +178,11 @@ in { "haskellPackages.scanner", "haskellPackages.xmonad-stockholm", "krebspaste", - "krebszones", "logf", "much", "newsbot-js", "noVNC", + "ovh-zone", "passwdqc-utils", "populate", "posix-array", diff --git a/makefu/2configs/tools/dev.nix b/makefu/2configs/tools/dev.nix index 8e4e3270d..4fe7f8bf4 100644 --- a/makefu/2configs/tools/dev.nix +++ b/makefu/2configs/tools/dev.nix @@ -11,6 +11,6 @@ esptool cac-api cac-panel - krebszones + ovh-zone ]; } diff --git a/tv/2configs/default.nix b/tv/2configs/default.nix index b2560084d..b1d739ef3 100644 --- a/tv/2configs/default.nix +++ b/tv/2configs/default.nix @@ -155,7 +155,7 @@ with import ; environment.systemPackages = [ pkgs.get pkgs.krebspaste - pkgs.krebszones + pkgs.ovh-zone pkgs.nix-prefetch-scripts pkgs.push ]; -- cgit v1.3.1 From bf62457ec2655ba4d6ef24c1eb801a80cb7b96bf Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 18 Jun 2017 16:07:15 +0200 Subject: l: RIP krebs-pass --- lass/1systems/mors.nix | 1 - lass/2configs/krebs-pass.nix | 21 --------------------- 2 files changed, 22 deletions(-) delete mode 100644 lass/2configs/krebs-pass.nix (limited to 'lass/2configs') diff --git a/lass/1systems/mors.nix b/lass/1systems/mors.nix index a5305c07c..6790c0aea 100644 --- a/lass/1systems/mors.nix +++ b/lass/1systems/mors.nix @@ -21,7 +21,6 @@ with import ; ../2configs/fetchWallpaper.nix #../2configs/c-base.nix ../2configs/mail.nix - ../2configs/krebs-pass.nix ../2configs/repo-sync.nix ../2configs/ircd.nix ../2configs/logf.nix diff --git a/lass/2configs/krebs-pass.nix b/lass/2configs/krebs-pass.nix deleted file mode 100644 index a605bc84b..000000000 --- a/lass/2configs/krebs-pass.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ pkgs, ... }: - -let - - #TODO: tab-completion - krebs-pass = pkgs.writeDashBin "krebs-pass" '' - PASSWORD_STORE_DIR=$HOME/.krebs-pass \ - exec ${pkgs.pass}/bin/pass $@ - ''; - - krebs-passmenu = pkgs.writeDashBin "krebs-passmenu" '' - PASSWORD_STORE_DIR=$HOME/.krebs-pass \ - exec ${pkgs.pass}/bin/passmenu $@ - ''; - -in { - krebs.per-user.lass.packages = [ - krebs-pass - krebs-passmenu - ]; -} -- cgit v1.3.1