From 9c03c3a5b97d9712aaab2823daea63580f60b975 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Sun, 27 Feb 2022 14:11:26 +0100 Subject: bump --- accounts/gkleen@sif/default.nix | 2 +- flake.lock | 18 +++++++++--------- flake.nix | 2 +- overlays/lego.nix | 35 ++++++++--------------------------- shell.nix | 2 +- user-profiles/utils.nix | 10 +++++----- 6 files changed, 25 insertions(+), 44 deletions(-) diff --git a/accounts/gkleen@sif/default.nix b/accounts/gkleen@sif/default.nix index 2048cbfb..dc71af22 100644 --- a/accounts/gkleen@sif/default.nix +++ b/accounts/gkleen@sif/default.nix @@ -7,7 +7,7 @@ let genericName = "Text Editor"; desktopName = "emacsclient"; icon = "emacs"; - mimeType = "text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++;"; + mimeTypes = ["text/english" "text/plain" "text/x-makefile" "text/x-c++hdr" "text/x-c++src" "text/x-chdr" "text/x-csrc" "text/x-java" "text/x-moc" "text/x-pascal" "text/x-tcl" "text/x-tex" "application/x-shellscript" "text/x-c" "text/x-c++"]; exec = "${config.home-manager.users.${userName}.programs.emacs.package}/bin/emacsclient -a \"\" %F"; }; emacsScratch = pkgs.stdenv.mkDerivation rec { diff --git a/flake.lock b/flake.lock index f1aee748..78909d51 100644 --- a/flake.lock +++ b/flake.lock @@ -46,11 +46,11 @@ ] }, "locked": { - "lastModified": 1644534280, - "narHash": "sha256-Gzf/Jq/F1vvTp6XkzPU+pBCj3OSAFLiR7f0ptwRseiI=", + "lastModified": 1645924784, + "narHash": "sha256-mpwIohyuc3RAHmVXEm/vUHGMu2V9SLr4P3kh0xckwpI=", "owner": "nix-community", "repo": "home-manager", - "rev": "6d9d9294d09b5e88df65f8c6651efb8a4d7d2476", + "rev": "2499b916921adde8a694117bc007efdde8bbd918", "type": "github" }, "original": { @@ -62,11 +62,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1644687442, - "narHash": "sha256-s9zQQ4MSY7LGrtcDK+ZPC6h2POuRiZdpneCZZsKbpHU=", + "lastModified": 1645958901, + "narHash": "sha256-vcPuKbeJemK+a7Oce4fSMsGt9n99Ogwv/At0Oy/aW6E=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b74e0ecf6d4b2b18afc8c919f45470210a411afa", + "rev": "6896623f630ce8703e2201625eabd9f01dfcc5e0", "type": "github" }, "original": { @@ -91,11 +91,11 @@ ] }, "locked": { - "lastModified": 1644599065, - "narHash": "sha256-oFLRb9p954wiUGn8iU5wOCY/7yBrT4Xvg7Ew07MvSKs=", + "lastModified": 1645891244, + "narHash": "sha256-Pu3a97Zn0PpWi/prTyD9TulCmxyeVnlqofor+yScRD8=", "owner": "Mic92", "repo": "sops-nix", - "rev": "fc22eff3205e9742c1b0fd229c267bf237f0c43e", + "rev": "afb0d686dced029ea720c466f693c12ebfd4107b", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index e6ce4b05..1ef81d4c 100644 --- a/flake.nix +++ b/flake.nix @@ -111,7 +111,7 @@ // outputs // { imports = [self.nixosModules.users.${userName} or ({...}: { imports = defaultUserProfiles userName; })] ++ (outputs.imports or []); }); - systemsSelector = "(x86_64|i686)-linux"; + systemsSelector = "x86_64-linux"; forAllSystems = f: mapAttrs f (filterAttrs (system: _systemPkgs: !(isNull (builtins.match systemsSelector system))) nixpkgs.legacyPackages); forAllUsers = genAttrs (unique (map accountUserName (attrNames self.nixosModules.accounts))); diff --git a/overlays/lego.nix b/overlays/lego.nix index 2a6ef548..80e9bd4b 100644 --- a/overlays/lego.nix +++ b/overlays/lego.nix @@ -1,29 +1,10 @@ -prev: final: let - zerossl = prev.fetchpatch { - url = "https://patch-diff.githubusercontent.com/raw/go-acme/lego/pull/1501.patch"; - hash = "sha256-hLuWX607T8tcqljpBzEADViZd2FABkCgjNCLXMyWpuA="; - }; -in { - lego = prev.buildGoModule rec { - pname = "lego"; - version = "4.6.0"; - - src = prev.fetchFromGitHub { - owner = "go-acme"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-FisQS/qbl7f4aszc2Ft6nmuHNrDreOQdN0jrWMOvaAk="; - }; - patches = [zerossl]; - - vendorSha256 = "sha256-cLM4YGguQf7lO5PUPmd/at1Aqrp9m8zFG6GWqcduJmw="; - - doCheck = false; - - subPackages = [ "cmd/lego" ]; - - ldflags = [ - "-X main.version=${version}" - ]; +final: prev: { + lego = prev.lego.override { + buildGoModule = args: prev.buildGoModule (args // { + patches = (args.patches or []) ++ prev.lib.lists.singleton (prev.fetchpatch { + url = "https://patch-diff.githubusercontent.com/raw/go-acme/lego/pull/1501.patch"; + hash = "sha256-hLuWX607T8tcqljpBzEADViZd2FABkCgjNCLXMyWpuA="; + }); + }); }; } diff --git a/shell.nix b/shell.nix index d7d42460..233d1cbe 100644 --- a/shell.nix +++ b/shell.nix @@ -17,7 +17,7 @@ in pkgs.mkShell { nativeBuildInputs = with pkgs; [ nixWithFlakes sops - wireguard + wireguard-tools gup nftables deploy-rs diff --git a/user-profiles/utils.nix b/user-profiles/utils.nix index 5407276a..2e8a22f7 100644 --- a/user-profiles/utils.nix +++ b/user-profiles/utils.nix @@ -15,11 +15,11 @@ }; home.packages = with pkgs; [ - autossh usbutils pciutils exa ag pwgen unzip magic-wormhole - qrencode tty-clock dnsutils openssl sshfs psmisc mosh tree - vnstat file pv bc fast-cli zip nmap aspell aspellDicts.de - aspellDicts.en borgbackup man-pages rsync socat telnet yq - cached-nix-shell persistent-nix-shell rage + autossh usbutils pciutils exa silver-searcher pwgen unzip + magic-wormhole qrencode tty-clock dnsutils openssl sshfs psmisc + mosh tree vnstat file pv bc fast-cli zip nmap aspell + aspellDicts.de aspellDicts.en borgbackup man-pages rsync socat + inetutils yq cached-nix-shell persistent-nix-shell rage ]; }; } -- cgit v1.2.3