From 2dc6c6b4fb331034c9322aa143abaa71235a5ee5 Mon Sep 17 00:00:00 2001 From: Greg Hellings Date: Sat, 20 Jan 2024 22:45:17 -0600 Subject: [PATCH] Update unstable and copier --- flake.lock | 12 ++++++------ overlays/default.nix | 16 ++++++++++------ 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index fcaffdf..38c4257 100644 --- a/flake.lock +++ b/flake.lock @@ -180,11 +180,11 @@ ] }, "locked": { - "lastModified": 1701728041, - "narHash": "sha256-x0pyrI1vC8evVDxCxyO6olOyr4wlFg9+VS3C3p4xFYQ=", + "lastModified": 1705794055, + "narHash": "sha256-mv/KrxEAZNhpPJcDqdQ709If9p2DTEYIDPo2r9xchlg=", "owner": "nix-community", "repo": "home-manager", - "rev": "ac7216918cd65f3824ba7817dea8f22e61221eaf", + "rev": "9b378afae72cb07471e19aefc30e8e05ef2d7a61", "type": "github" }, "original": { @@ -406,11 +406,11 @@ }, "nixunstable": { "locked": { - "lastModified": 1703255338, - "narHash": "sha256-Z6wfYJQKmDN9xciTwU3cOiOk+NElxdZwy/FiHctCzjU=", + "lastModified": 1705677747, + "narHash": "sha256-eyM3okYtMgYDgmYukoUzrmuoY4xl4FUujnsv/P6I/zI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6df37dc6a77654682fe9f071c62b4242b5342e04", + "rev": "bbe7d8f876fbbe7c959c90ba2ae2852220573261", "type": "github" }, "original": { diff --git a/overlays/default.nix b/overlays/default.nix index 129a880..951b9f1 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -38,18 +38,22 @@ in rec { xonsh-apipenv = cp ./xonsh-apipenv.nix {}; xonsh-direnv = cp ./xonsh-direnv.nix {}; xontrib-vox = cp ./xonsh-vox.nix {}; - copier = cp ./copier.nix { - inherit (python-final) - iteration-utilities - jinja2-ansible-filters - pyyaml-include; - }; }) ]; aacs = prev.callPackage ./aacs.nix {}; brew = prev.callPackage ./homebrew.nix {}; configure_aws_creds = prev.callPackage ./configure_aws_creds.nix {}; + copier = prev.copier.overridePythonAttrs (old: { + version = "9.1.1"; + src = final.fetchFromGitHub { + owner = "copier-org"; + repo = "copier"; + rev = "v9.1.0"; + hash = "sha256-x5r7Xv4lAOMkR+UIEeSY7LvbYMLpTWYuICYe9ygz1tA="; + postFetch = "rm $out/tests/demo/doc/ma*ana.txt"; + }; + }); enwiki-dump = prev.callPackage ./enwiki-dump.nix {}; hms = prev.callPackage ./hms { pkgs = final.pkgs;