From 8d5222c2f7f858d33588c3d3a9a105b9a6481025 Mon Sep 17 00:00:00 2001 From: tv Date: Wed, 11 Sep 2019 10:55:56 +0200 Subject: tv focus: init --- tv/3modules/default.nix | 1 + tv/3modules/focus.nix | 4 ++++ 2 files changed, 5 insertions(+) create mode 100644 tv/3modules/focus.nix diff --git a/tv/3modules/default.nix b/tv/3modules/default.nix index edaf50f0..db2cdcd1 100644 --- a/tv/3modules/default.nix +++ b/tv/3modules/default.nix @@ -3,6 +3,7 @@ ./charybdis ./dnsmasq.nix ./ejabberd + ./focus.nix ./hosts.nix ./iptables.nix ./slock.nix diff --git a/tv/3modules/focus.nix b/tv/3modules/focus.nix new file mode 100644 index 00000000..b1a7b2e5 --- /dev/null +++ b/tv/3modules/focus.nix @@ -0,0 +1,4 @@ +with import ; +{ + options.tv.focus.enable = mkEnableOption "tv.focus"; +} -- cgit v1.2.3 From 4c2184a0f1b4d80a62bad92a37cbc25835082052 Mon Sep 17 00:00:00 2001 From: tv Date: Wed, 11 Sep 2019 14:37:26 +0200 Subject: krebs.tinc.*.hostsArchive: fix file mode --- krebs/3modules/tinc.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/krebs/3modules/tinc.nix b/krebs/3modules/tinc.nix index 24eac715..ed00d187 100644 --- a/krebs/3modules/tinc.nix +++ b/krebs/3modules/tinc.nix @@ -110,8 +110,12 @@ let hostsArchive = mkOption { type = types.package; default = pkgs.runCommand "retiolum-hosts.tar.bz2" {} '' - ${pkgs.coreutils}/bin/ln -s ${tinc.config.hostsPackage} hosts - ${pkgs.gnutar}/bin/tar -hcjf $out hosts + cp \ + --no-preserve=mode \ + --recursive \ + ${tinc.config.hostsPackage} \ + hosts + ${pkgs.gnutar}/bin/tar -cjf $out hosts ''; readOnly = true; }; -- cgit v1.2.3 From a72d092a118dbe13b9da609d43b01d06b9f7ab54 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 22 Sep 2019 11:40:48 +0200 Subject: l: add hilum.r --- krebs/3modules/lass/default.nix | 40 ++++++++++++++++++++++++++++++++++++++++ lass/1systems/hilum/config.nix | 28 ++++++++++++++++++++++++++++ lass/1systems/hilum/physical.nix | 35 +++++++++++++++++++++++++++++++++++ 3 files changed, 103 insertions(+) create mode 100644 lass/1systems/hilum/config.nix create mode 100644 lass/1systems/hilum/physical.nix diff --git a/krebs/3modules/lass/default.nix b/krebs/3modules/lass/default.nix index a8314e11..78f3542f 100644 --- a/krebs/3modules/lass/default.nix +++ b/krebs/3modules/lass/default.nix @@ -638,6 +638,46 @@ in { ssh.privkey.path = ; ssh.pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHXS60mmNWMdMRvaPxGn91Cm/hm7zY8xn5rkI4n2KG/f "; }; + hilum = { + cores = 1; + nets = { + retiolum = { + ip4.addr = "10.243.20.123"; + ip6.addr = r6 "005b"; + aliases = [ + "hilum.r" + ]; + tinc.pubkey = '' + -----BEGIN PUBLIC KEY----- + MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAul1zLdJ76kIqVWjxT2bb + pLx6gu6VycxaDcWAoTWSjPsOT2IJf3NYC6i8D6WASnRqR6djp06OG7Onu0r5hZhi + V5nelDUvR75qVAx9ZeuQDSdNpWuVMds/C3cQM6QQHD1kFwnr2n6VH/qy0W9duW8c + SGX3C80nRpmY0cCEEnxFdFdLSd0c15M+lFVAaqh2225ujXyyvkwH874yvpWLPSdh + 4xjZdrOFarl5yb9q83HcZsdunn+469BeKCWB8bs+nRsp9Wwj1en1yAZTB3WazYNE + saFQ0xGa7VGfHN0PjqgZEF2I2IiQJ+H3N5XRQ7dcJzsDRB8lMrCx2ynJkJRSjLXz + vgZjW+Rf47V9CLRjJGCp1xh6GbXqjsIYh5yqZkgH4Sm1VpMBYdr/kLjiygwzV8jY + 8uoBUgEHLc5B73/D3GlMe3bOJmxxMfyPITVTFHgznycalBNBSsgKpIwWae6LbYhZ + wrpi66IQOyC6YYThqn8pz3KUz17HxyacA/mS6/jcRP+IiHb9CYcS4BsjTpH3NnM3 + RkSWE3FGE+ULH1W/VeA8pZRKAR1rypvMRdewbFTQpe/dNgif5O5Fe/7l/6KDzzCh + Zqqr6sEFhutPUd6PcaVtQlfzYkJ9MGYWYr4S17D7Q9V0H37a0AcRaYH59FCmlFjl + 87b8jfJNXlKFW+EBxBxN2uECAwEAAQ== + -----END PUBLIC KEY----- + ''; + }; + wiregrill = { + ip6.addr = w6 "005b"; + aliases = [ + "hilum.w" + ]; + wireguard.pubkey = '' + 0DRcCDR0O+UqV07DsGfS4On+6YaZ3LPfvni9u1NZNhw= + ''; + }; + }; + ssh.privkey.path = ; + ssh.pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPARXXe0HaP1r0pLqtInhnbYSZsP0g4VC6aaWP7qi5+w"; + syncthing.id = "J6PHKTS-2JG5NOL-H5ZWOF6-6L6ENA7-L4RO6DV-BQHU7YL-CHOLDCC-S5YX3AC"; + }; }; users = rec { lass = lass-blue; diff --git a/lass/1systems/hilum/config.nix b/lass/1systems/hilum/config.nix new file mode 100644 index 00000000..998fa147 --- /dev/null +++ b/lass/1systems/hilum/config.nix @@ -0,0 +1,28 @@ +{ config, ... }: +{ + imports = [ + + + + + + + + + + ]; + + krebs.build.host = config.krebs.hosts.hilum; + + boot.loader.grub.extraEntries = '' + menuentry "grml" { + iso_path=/isos/grml.iso + export iso_path + search --set=root --file $iso_path + loopback loop $iso_path + root=(loop) + configfile /boot/grub/loopback.cfg + loopback --delete loop + } + ''; +} diff --git a/lass/1systems/hilum/physical.nix b/lass/1systems/hilum/physical.nix new file mode 100644 index 00000000..f8bab57d --- /dev/null +++ b/lass/1systems/hilum/physical.nix @@ -0,0 +1,35 @@ +{ lib, pkgs, ... }: + +{ + imports = [ + ./config.nix + + ]; + + boot.initrd.availableKernelModules = [ "ehci_pci" "ahci" "xhci_pci" "usb_storage" "sd_mod" "sdhci_pci" ]; + boot.initrd.kernelModules = [ "dm-snapshot" ]; + boot.kernelModules = [ "kvm-intel" ]; + boot.extraModulePackages = [ ]; + + boot.loader.grub.enable = true; + boot.loader.grub.efiSupport = true; + boot.loader.grub.device = "/dev/disk/by-id/usb-General_USB_Flash_Disk_0374116060006128-0:0"; + boot.loader.grub.efiInstallAsRemovable = true; + + fileSystems."/" = + { device = "/dev/disk/by-uuid/6db29cdd-ff64-496d-b541-5f1616665dc2"; + fsType = "ext4"; + }; + + boot.initrd.luks.devices."usb_nix".device = "/dev/disk/by-uuid/3c8ab3af-57fb-4564-9e27-b2766404f5d4"; + + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/2B9E-5131"; + fsType = "vfat"; + }; + + swapDevices = [ ]; + + nix.maxJobs = lib.mkDefault 4; + powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; +} -- cgit v1.2.3 From 522ccb28ca387033aa7579fb4f593a2ec5cb042a Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 22 Sep 2019 11:42:14 +0200 Subject: haskell blessings: add future compatibility --- krebs/5pkgs/haskell/blessings.nix | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/krebs/5pkgs/haskell/blessings.nix b/krebs/5pkgs/haskell/blessings.nix index 55f2d17d..b0e81fdc 100644 --- a/krebs/5pkgs/haskell/blessings.nix +++ b/krebs/5pkgs/haskell/blessings.nix @@ -6,19 +6,10 @@ with import ; version = "1.1.0"; sha256 = "1k908zap3694fcxdk4bb29s54b0lhdh557y10ybjskfwnym7szn1"; }; - "18.09" = { - version = "2.2.0"; - sha256 = "1pb56dgf3jj2kq3cbbppwzyg3ccgqy9xara62hkjwyxzdx20clk1"; - }; - "19.03" = { - version = "2.2.0"; - sha256 = "1pb56dgf3jj2kq3cbbppwzyg3ccgqy9xara62hkjwyxzdx20clk1"; - }; - "19.09" = { - version = "2.2.0"; - sha256 = "1pb56dgf3jj2kq3cbbppwzyg3ccgqy9xara62hkjwyxzdx20clk1"; - }; - }.${versions.majorMinor version}; + }.${versions.majorMinor version} or { + version = "2.2.0"; + sha256 = "1pb56dgf3jj2kq3cbbppwzyg3ccgqy9xara62hkjwyxzdx20clk1"; + }; in mkDerivation { pname = "blessings"; -- cgit v1.2.3 From 6d70d953edc50dbb44b02d3d57492c092b1d1cad Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 22 Sep 2019 11:46:21 +0200 Subject: l prism.r: add kick-routing for riot --- lass/1systems/prism/config.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/lass/1systems/prism/config.nix b/lass/1systems/prism/config.nix index eec8e34b..845cf943 100644 --- a/lass/1systems/prism/config.nix +++ b/lass/1systems/prism/config.nix @@ -31,7 +31,15 @@ with import ; openssh.authorizedKeys.keys = [ "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC6o6sdTu/CX1LW2Ff5bNDqGEAGwAsjf0iIe5DCdC7YikCct+7x4LTXxY+nDlPMeGcOF88X9/qFwdyh+9E4g0nUAZaeL14Uc14QDqDt/aiKjIXXTepxE/i4JD9YbTqStAnA/HYAExU15yqgUdj2dnHu7OZcGxk0ZR1OY18yclXq7Rq0Fd3pN3lPP1T4QHM9w66r83yJdFV9szvu5ral3/QuxQnCNohTkR6LoJ4Ny2RbMPTRtb+jPbTQYTWUWwV69mB8ot5nRTP4MRM9pu7vnoPF4I2S5DvSnx4C5zdKzsb7zmIvD4AmptZLrXj4UXUf00Xf7Js5W100Ne2yhYyhq+35 riot@lagrange" ]; + packages = [ + (pkgs.writeDashBin "kick-routing" '' + /run/wrappers/bin/sudo ${pkgs.systemd}/bin/systemctl restart krebs-iptables.service + '') + ]; }; + security.sudo.extraConfig = '' + riot ALL=(root) NOPASSWD: ${pkgs.systemd}/bin/systemctl restart krebs-iptables.service + ''; # TODO write function for proxy_pass (ssl/nonssl) -- cgit v1.2.3 From 4e01c4c58bed5a949b4d95e76926b45461d8397b Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 22 Sep 2019 11:57:38 +0200 Subject: l prism.r: mount tank/backups --- lass/1systems/prism/physical.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lass/1systems/prism/physical.nix b/lass/1systems/prism/physical.nix index 9a84e9d6..7458f5ff 100644 --- a/lass/1systems/prism/physical.nix +++ b/lass/1systems/prism/physical.nix @@ -20,6 +20,11 @@ fsType = "ext4"; }; + fileSystems."/backups" = { + device = "tank/backups"; + fsType = "zfs"; + }; + fileSystems."/srv/http" = { device = "tank/srv-http"; fsType = "zfs"; -- cgit v1.2.3 From c58b7f25838452483295260695c1a35d040bcfd6 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 22 Sep 2019 11:59:38 +0200 Subject: l shodan.r: import nfs-dl --- lass/1systems/shodan/config.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/lass/1systems/shodan/config.nix b/lass/1systems/shodan/config.nix index 5de87d79..6513de48 100644 --- a/lass/1systems/shodan/config.nix +++ b/lass/1systems/shodan/config.nix @@ -17,6 +17,7 @@ with import ; + ]; krebs.build.host = config.krebs.hosts.shodan; -- cgit v1.2.3 From ec525a30a3c7be4880761508b18f8049eb69d120 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 22 Sep 2019 12:04:24 +0200 Subject: l mors.r: share the_playlist with xerxes --- lass/1systems/mors/config.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lass/1systems/mors/config.nix b/lass/1systems/mors/config.nix index 5076beee..1477d6d8 100644 --- a/lass/1systems/mors/config.nix +++ b/lass/1systems/mors/config.nix @@ -54,7 +54,7 @@ with import ; folders = { the_playlist = { path = "/home/lass/tmp/the_playlist"; - peers = [ "mors" "phone" "prism" ]; + peers = [ "mors" "phone" "prism" "xerxes" ]; }; free_music = { id = "mu9mn-zgvsw"; -- cgit v1.2.3 From 41342370581fd4cc0983b2ed846b4f068db45ab3 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 22 Sep 2019 12:08:42 +0200 Subject: l shodan.r: configure as media center --- lass/1systems/shodan/config.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/lass/1systems/shodan/config.nix b/lass/1systems/shodan/config.nix index 6513de48..cfb5988a 100644 --- a/lass/1systems/shodan/config.nix +++ b/lass/1systems/shodan/config.nix @@ -25,4 +25,16 @@ with import ; services.logind.extraConfig = '' HandleLidSwitch=ignore ''; + + #media center + users.users.media = { + isNormalUser = true; + uid = genid_uint31 "media"; + extraGroups = [ "video" "audio" ]; + }; + + services.xserver.displayManager.lightdm.autoLogin = { + enable = true; + user = "media"; + }; } -- cgit v1.2.3 From c19f69898589546aa225b17feeaecbb59ac43ca7 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 22 Sep 2019 12:09:11 +0200 Subject: l shodan.r: add hass config --- lass/1systems/shodan/config.nix | 74 +++++++++++++++++++++++++++++++++++++++ lass/1systems/shodan/physical.nix | 1 - 2 files changed, 74 insertions(+), 1 deletion(-) diff --git a/lass/1systems/shodan/config.nix b/lass/1systems/shodan/config.nix index cfb5988a..ad510283 100644 --- a/lass/1systems/shodan/config.nix +++ b/lass/1systems/shodan/config.nix @@ -37,4 +37,78 @@ with import ; enable = true; user = "media"; }; + + #hass + krebs.iptables.tables.filter.INPUT.rules = [ + { predicate = "-p tcp --dport 8123"; target = "ACCEPT"; } + { predicate = "-p tcp --dport 1883"; target = "ACCEPT"; } + # zerotierone + { predicate = "-p udp --dport 9993"; target = "ACCEPT"; } + ]; + + services.home-assistant = let + tasmota_s20 = name: topic: { + platform = "mqtt"; + inherit name; + state_topic = "stat/${topic}/POWER"; + command_topic = "cmnd/${topic}/POWER"; + payload_on = "ON"; + payload_off = "OFF"; + }; + in { + enable = true; + package = pkgs.home-assistant.override { + python3 = pkgs.python36; + #extraComponents = [ + # (pkgs.fetchgit { + # url = "https://github.com/marcschumacher/dwd_pollen"; + # rev = "0.1"; + # sha256 = "12vldwsds27c9l15ffc6svk9mj17jhypcz736pvpmpqbsymllz2p"; + # }) + #]; + }; + config = { + homeassistant = { + name = "Home"; time_zone = "Europe/Berlin"; + latitude = "48.7687"; + longitude = "9.2478"; + elevation = 247; + }; + sun.elevation = 66; + discovery = {}; + frontend = { }; + mqtt = { + broker = "localhost"; + port = 1883; + client_id = "home-assistant"; + username = "gg23"; + password = "gg23-mqtt"; + keepalive = 60; + protocol = 3.1; + }; + sensor = [ + ]; + switch = [ + (tasmota_s20 "Drucker Strom" "drucker") + (tasmota_s20 "Bett Licht" "bett") + ]; + device_tracker = [ + { + platform = "luci"; + } + ]; + }; + }; + + services.mosquitto = { + enable = true; + host = "0.0.0.0"; + allowAnonymous = false; + checkPasswords = true; + users.gg23 = { + password = "gg23-mqtt"; + acl = [ "topic readwrite #" ]; + }; + }; + environment.systemPackages = [ pkgs.mosquitto ]; } diff --git a/lass/1systems/shodan/physical.nix b/lass/1systems/shodan/physical.nix index 41508127..7cfeba93 100644 --- a/lass/1systems/shodan/physical.nix +++ b/lass/1systems/shodan/physical.nix @@ -13,7 +13,6 @@ initrd.luks.devices = [ { name = "luksroot"; device = "/dev/sda2"; } ]; initrd.luks.cryptoModules = [ "aes" "sha512" "sha1" "xts" ]; initrd.availableKernelModules = [ "xhci_hcd" "ehci_pci" "ahci" "usb_storage" ]; - #kernelModules = [ "kvm-intel" "msr" ]; }; fileSystems = { "/" = { -- cgit v1.2.3 From 037ca410ef84211eff8b6c53feb925a42f5beccd Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 22 Sep 2019 12:10:57 +0200 Subject: l backups: add to group syncthing --- lass/2configs/backup.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/lass/2configs/backup.nix b/lass/2configs/backup.nix index 94272fdb..f5c24178 100644 --- a/lass/2configs/backup.nix +++ b/lass/2configs/backup.nix @@ -6,6 +6,7 @@ with import ; useDefaultShell = true; home = "/backups"; createHome = true; + group = "syncthing"; openssh.authorizedKeys.keys = with config.krebs.hosts; [ blue.ssh.pubkey ]; -- cgit v1.2.3 From a58a3476f28b06ec8b339855353a5c68db68d4c8 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 22 Sep 2019 12:12:29 +0200 Subject: l baseX: manage brightness via acpilight --- lass/2configs/baseX.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/lass/2configs/baseX.nix b/lass/2configs/baseX.nix index 5003d227..a3b5e967 100644 --- a/lass/2configs/baseX.nix +++ b/lass/2configs/baseX.nix @@ -59,6 +59,7 @@ in { environment.systemPackages = with pkgs; [ acpi + acpilight ag cabal2nix cholerab @@ -81,7 +82,6 @@ in { termite xclip xephyrify - xorg.xbacklight xorg.xhost xsel zathura @@ -94,6 +94,12 @@ in { xlibs.fontschumachermisc ]; + services.udev.extraRules = '' + SUBSYSTEM=="backlight", ACTION=="add", \ + RUN+="${pkgs.coreutils}/bin/chgrp video /sys/class/backlight/%k/brightness", \ + RUN+="${pkgs.coreutils}/bin/chmod g+w /sys/class/backlight/%k/brightness" + ''; + services.xserver = { enable = true; layout = "us"; -- cgit v1.2.3 From c638d038e3880608112d6e3218eed169a313caef Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 22 Sep 2019 12:19:17 +0200 Subject: l baseX: add more pkgs --- lass/2configs/baseX.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lass/2configs/baseX.nix b/lass/2configs/baseX.nix index a3b5e967..ecbb7541 100644 --- a/lass/2configs/baseX.nix +++ b/lass/2configs/baseX.nix @@ -73,6 +73,7 @@ in { lm_sensors ncdu nix-index + nix-review nmap pavucontrol powertop @@ -80,6 +81,8 @@ in { sxiv taskwarrior termite + transgui + wirelesstools xclip xephyrify xorg.xhost -- cgit v1.2.3 From 0a7989d0f0e176b81a5ee8e0510f160e27fca071 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 22 Sep 2019 12:46:27 +0200 Subject: add nixpkgs-unstable --- krebs/nixpkgs-unstable.json | 7 +++++++ krebs/update-nixpkgs-unstable.sh | 9 +++++++++ 2 files changed, 16 insertions(+) create mode 100644 krebs/nixpkgs-unstable.json create mode 100755 krebs/update-nixpkgs-unstable.sh diff --git a/krebs/nixpkgs-unstable.json b/krebs/nixpkgs-unstable.json new file mode 100644 index 00000000..5f8f0c77 --- /dev/null +++ b/krebs/nixpkgs-unstable.json @@ -0,0 +1,7 @@ +{ + "url": "https://github.com/NixOS/nixpkgs-channels", + "rev": "d484f2b7fc0834a068e8ace851faa449a03963f5", + "date": "2019-09-20T22:58:43+02:00", + "sha256": "0jk93ikryi2hqc30l2n5i4vlgmklrlzb8cf7b3sg1q3k70q344jn", + "fetchSubmodules": false +} diff --git a/krebs/update-nixpkgs-unstable.sh b/krebs/update-nixpkgs-unstable.sh new file mode 100755 index 00000000..068da5f6 --- /dev/null +++ b/krebs/update-nixpkgs-unstable.sh @@ -0,0 +1,9 @@ +#!/bin/sh +dir=$(dirname $0) +oldrev=$(cat $dir/nixpkgs-unstable.json | jq -r .rev | sed 's/\(.\{7\}\).*/\1/') +nix-shell -p nix-prefetch-git --run 'nix-prefetch-git \ + --url https://github.com/NixOS/nixpkgs-channels \ + --rev refs/heads/nixos-unstable' \ +> $dir/nixpkgs-unstable.json +newrev=$(cat $dir/nixpkgs-unstable.json | jq -r .rev | sed 's/\(.\{7\}\).*/\1/') +git commit $dir/nixpkgs.json -m "nixpkgs-unstable: $oldrev -> $newrev" -- cgit v1.2.3 From 9612fe5a887a44a0cabbb5889531d2837cae635c Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 22 Sep 2019 12:47:02 +0200 Subject: update-channel.sh -> update-nixpkgs.sh --- krebs/update-channel.sh | 9 --------- krebs/update-nixpkgs.sh | 9 +++++++++ 2 files changed, 9 insertions(+), 9 deletions(-) delete mode 100755 krebs/update-channel.sh create mode 100755 krebs/update-nixpkgs.sh diff --git a/krebs/update-channel.sh b/krebs/update-channel.sh deleted file mode 100755 index 08354357..00000000 --- a/krebs/update-channel.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh -dir=$(dirname $0) -oldrev=$(cat $dir/nixpkgs.json | jq -r .rev | sed 's/\(.\{7\}\).*/\1/') -nix-shell -p nix-prefetch-git --run 'nix-prefetch-git \ - --url https://github.com/NixOS/nixpkgs-channels \ - --rev refs/heads/nixos-19.03' \ -> $dir/nixpkgs.json -newrev=$(cat $dir/nixpkgs.json | jq -r .rev | sed 's/\(.\{7\}\).*/\1/') -git commit $dir/nixpkgs.json -m "nixpkgs: $oldrev -> $newrev" diff --git a/krebs/update-nixpkgs.sh b/krebs/update-nixpkgs.sh new file mode 100755 index 00000000..08354357 --- /dev/null +++ b/krebs/update-nixpkgs.sh @@ -0,0 +1,9 @@ +#!/bin/sh +dir=$(dirname $0) +oldrev=$(cat $dir/nixpkgs.json | jq -r .rev | sed 's/\(.\{7\}\).*/\1/') +nix-shell -p nix-prefetch-git --run 'nix-prefetch-git \ + --url https://github.com/NixOS/nixpkgs-channels \ + --rev refs/heads/nixos-19.03' \ +> $dir/nixpkgs.json +newrev=$(cat $dir/nixpkgs.json | jq -r .rev | sed 's/\(.\{7\}\).*/\1/') +git commit $dir/nixpkgs.json -m "nixpkgs: $oldrev -> $newrev" -- cgit v1.2.3 From 53c6b483ba2a17589a5e9656eeb6cbcfbde24383 Mon Sep 17 00:00:00 2001 From: lassulus Date: Tue, 24 Sep 2019 22:01:13 +0200 Subject: nixpkgs: 8a30e24 -> 021d733 --- krebs/nixpkgs.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/krebs/nixpkgs.json b/krebs/nixpkgs.json index a72f5cad..f1dd0bf6 100644 --- a/krebs/nixpkgs.json +++ b/krebs/nixpkgs.json @@ -1,7 +1,7 @@ { "url": "https://github.com/NixOS/nixpkgs-channels", - "rev": "8a30e242181410931bcd0384f7147b6f1ce286a2", - "date": "2019-09-10T08:24:01-04:00", - "sha256": "0574zwcgy3pqjcxli4948sd3sy6h0qw6fvsm4r530gqj41gpwf6b", + "rev": "021d733ea3f87b8c9232020b4e606d08eaca160b", + "date": "2019-09-20T08:20:21+02:00", + "sha256": "13600nzrakvg2hsfg5yr7x0jp9m762nvjyddf07q60d3m7vx9jxy", "fetchSubmodules": false } -- cgit v1.2.3