From edf890f14196c307733c9866ced0cebf4114667e Mon Sep 17 00:00:00 2001 From: Yorick van Pelt Date: Sun, 17 Sep 2023 18:17:14 +0200 Subject: [PATCH] flake update --- flake.lock | 102 ++++++++++++++++++++--------------------- flake.nix | 4 -- home-manager/emacs.nix | 8 ++-- pkgs/default.nix | 4 +- 4 files changed, 57 insertions(+), 61 deletions(-) diff --git a/flake.lock b/flake.lock index 60d6dac..4851154 100644 --- a/flake.lock +++ b/flake.lock @@ -9,11 +9,11 @@ ] }, "locked": { - "lastModified": 1690228878, - "narHash": "sha256-9Xe7JV0krp4RJC9W9W9WutZVlw6BlHTFMiUP/k48LQY=", + "lastModified": 1694793763, + "narHash": "sha256-y6gTE1C9mIoSkymRYyzCmv62PFgy+hbZ5j8fuiQK5KI=", "owner": "ryantm", "repo": "agenix", - "rev": "d8c973fd228949736dedf61b7f8cc1ece3236792", + "rev": "572baca9b0c592f71982fca0790db4ce311e3c75", "type": "github" }, "original": { @@ -69,11 +69,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1691119623, - "narHash": "sha256-zL2Lh+tni8YfRHJl1d2btxk5gl6mlOrp/NoDu9ftBRw=", + "lastModified": 1694946219, + "narHash": "sha256-bZ7RCLzaOnqr/4WE2Rs7/HcY9tLhpYJl6ZkI4i7AZ4Q=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "180dc7cbf6af0cae6ce6c404e9dd5ea3b3790733", + "rev": "7e26d097d352f41e00fcc225529292843283010c", "type": "github" }, "original": { @@ -121,11 +121,11 @@ ] }, "locked": { - "lastModified": 1690933134, - "narHash": "sha256-ab989mN63fQZBFrkk4Q8bYxQCktuHmBIBqUG1jl6/FQ=", + "lastModified": 1693611461, + "narHash": "sha256-aPODl8vAgGQ0ZYFIRisxYG5MOGSkIczvu2Cd8Gb9+1Y=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "59cf3f1447cfc75087e7273b04b31e689a8599fb", + "rev": "7f53fdb7bdc5bb237da7fefef12d099e4fd611ca", "type": "github" }, "original": { @@ -139,11 +139,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1689068808, - "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=", + "lastModified": 1694529238, + "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", "owner": "numtide", "repo": "flake-utils", - "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4", + "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", "type": "github" }, "original": { @@ -157,11 +157,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1689068808, - "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=", + "lastModified": 1694529238, + "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", "owner": "numtide", "repo": "flake-utils", - "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4", + "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", "type": "github" }, "original": { @@ -174,11 +174,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1689068808, - "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=", + "lastModified": 1694529238, + "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", "owner": "numtide", "repo": "flake-utils", - "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4", + "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", "type": "github" }, "original": { @@ -215,11 +215,11 @@ ] }, "locked": { - "lastModified": 1687871164, - "narHash": "sha256-bBFlPthuYX322xOlpJvkjUBz0C+MOBjZdDOOJJ+G2jU=", + "lastModified": 1694465129, + "narHash": "sha256-8BQiuobMrCfCbGM7w6Snx+OBYdtTIm0+cGVaKwQ5BFg=", "owner": "nix-community", "repo": "home-manager", - "rev": "07c347bb50994691d7b0095f45ebd8838cf6bc38", + "rev": "9787dffff5d315c9593d3f9fb0f9bf2097e1b57b", "type": "github" }, "original": { @@ -235,11 +235,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1690718927, - "narHash": "sha256-V8k1KLCpfG7HRjuhCxvP2Q6OVsagAw4gjXbJeO+0Y70=", + "lastModified": 1694952508, + "narHash": "sha256-0KzgnYW9RvlwUnl5qYinNOg/WsV9jEJfMPVQoJL8bmI=", "owner": "nix-community", "repo": "lib-aggregate", - "rev": "a9f0d654d500251b5dc0357f7f100476ba20d9d9", + "rev": "d44755862cce5ba5e040ec8f7df6c6b33e47c8a0", "type": "github" }, "original": { @@ -255,11 +255,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1691026117, - "narHash": "sha256-CZZnXDLpFTprAijRWF44Ory6guwBnhRb/BbV0V8Od2Y=", + "lastModified": 1694654058, + "narHash": "sha256-Wo0yw5ow7OSJvK94CD708zcSVfm9CCi5WFopP3BDaVc=", "owner": "nix-community", "repo": "nix-eval-jobs", - "rev": "a749e7c748ca8981a71b7fc36cfdb810a8834f8d", + "rev": "3e635f33fb31b39305ff378ed66149a4b3715985", "type": "github" }, "original": { @@ -275,11 +275,11 @@ ] }, "locked": { - "lastModified": 1690687539, - "narHash": "sha256-Lnwz9XKtshm+5OeWqCbj/3tKuKK+DL5tUTdKSRrKBlY=", + "lastModified": 1694921880, + "narHash": "sha256-yU36cs5UdzhTwsM9bUWUz43N//ELzQ1ro69C07pU/8E=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "d74b8171153ae35d7d323a9b1ad6c4cf7a995591", + "rev": "9d2bcc47110b3b6217dfebd6761ba20bc78aedf2", "type": "github" }, "original": { @@ -331,11 +331,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1690957133, - "narHash": "sha256-0Y4CiOIszhHDDXHFmvHUpmhUotKOIn0m3jpMlm6zUTE=", + "lastModified": 1694710316, + "narHash": "sha256-uRh46iIC86D8BD1wCDA5gRrt+hslUXiD0kx/UjnjBcs=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "24f9162b26f0debd163f6d94752aa2acb9db395a", + "rev": "570256327eb6ca6f7bebe8d93af49459092a0c43", "type": "github" }, "original": { @@ -371,11 +371,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1690927903, - "narHash": "sha256-D5gCaCROnjEKDOel//8TO/pOP87pAEtT0uT8X+0Bj/U=", + "lastModified": 1694753796, + "narHash": "sha256-QPE7dqcicQH/nq9aywVXJWWtci4FvxHaM+BSIEbGBvA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "bd836ac5e5a7358dea73cb74a013ca32864ccb86", + "rev": "360a7d31c30abefdc490d203f80e3221b7a24af2", "type": "github" }, "original": { @@ -417,11 +417,11 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1690678486, - "narHash": "sha256-Smb6j3nujZUil/NmZl92L8qC7nsPQjzfSLY+85ZKC0M=", + "lastModified": 1694911725, + "narHash": "sha256-8YqI+YU1DGclEjHsnrrGfqsQg3Wyga1DfTbJrN3Ud0c=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "4e763280df6d9391033239019265d9154348b6ab", + "rev": "819180647f428a3826bfc917a54449da1e532ce0", "type": "github" }, "original": { @@ -447,11 +447,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1690927903, - "narHash": "sha256-D5gCaCROnjEKDOel//8TO/pOP87pAEtT0uT8X+0Bj/U=", + "lastModified": 1694753796, + "narHash": "sha256-QPE7dqcicQH/nq9aywVXJWWtci4FvxHaM+BSIEbGBvA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "bd836ac5e5a7358dea73cb74a013ca32864ccb86", + "rev": "360a7d31c30abefdc490d203f80e3221b7a24af2", "type": "github" }, "original": { @@ -471,11 +471,11 @@ ] }, "locked": { - "lastModified": 1691079510, - "narHash": "sha256-4sQxpbxhUQyMOO1veBOryMZjuhpqXUp0dsLwrMLXm6Y=", + "lastModified": 1694953556, + "narHash": "sha256-kz5+IFT+Hw82aibyYt7dEftfZIA6y3Aqe65yufjzTG0=", "owner": "nix-community", "repo": "nixpkgs-wayland", - "rev": "253001f7d8fcbd5495528c095e1368a9dd551a42", + "rev": "300fc71e23270989d11408aa2d7c8232c37aa113", "type": "github" }, "original": { @@ -486,11 +486,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1691024687, - "narHash": "sha256-NlMDQSweO5xC+EE0eGsBAAuFQ0J73FMzopBmWesonok=", + "lastModified": 1694651847, + "narHash": "sha256-W+2eI96glLiEwLnX/kWn5HDO7WfKKkF0lKW9yyNLEbY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f78cfdd5ae4f4543cf0c27bfcc017232f5ed8905", + "rev": "46ea94edba83944a236850bbc0bfd92785736b00", "type": "github" }, "original": { @@ -591,11 +591,11 @@ ] }, "locked": { - "lastModified": 1690874496, - "narHash": "sha256-qYZJVAfilFbUL6U+euMjKLXUADueMNQBqwihpNzTbDU=", + "lastModified": 1694528738, + "narHash": "sha256-aWMEjib5oTqEzF9f3WXffC1cwICo6v/4dYKjwNktV8k=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "fab56c8ce88f593300cd8c7351c9f97d10c333c5", + "rev": "7a49c388d7a6b63bb551b1ddedfa4efab8f400d8", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index e965a0e..26c73c8 100644 --- a/flake.nix +++ b/flake.nix @@ -31,10 +31,6 @@ in { legacyPackages = import nixpkgs { config = { - # todo remove, copilot.vim depends on it - permittedInsecurePackages = [ - "nodejs-slim-16.20.1" - ]; allowUnfree = true; # chromium.vaapiSupport = true; android_sdk.accept_license = true; diff --git a/home-manager/emacs.nix b/home-manager/emacs.nix index 60cc693..4e7e008 100644 --- a/home-manager/emacs.nix +++ b/home-manager/emacs.nix @@ -5,20 +5,20 @@ in { enable = true; package = pkgs.emacsUnstablePgtk; extraConfig = '' - (setq copilot-node-executable "${pkgs.nodejs-slim-16_x}/bin/node") + (setq copilot-node-executable "${pkgs.nodejs-slim-18_x}/bin/node") (setq lsp-nix-server-path "${pkgs.nil}/bin/nil") ''; overrides = final: prev: { copilot = final.melpaBuild rec { pname = "copilot"; - version = "20220916.1"; - commit = "f316299bab75a380ee04e7ca49c79baf0fb296d6"; + version = "20230913"; + commit = "421703f5dd5218ec2a3aa23ddf09d5f13e5014c2"; src = pkgs.fetchFromGitHub { owner = "zerolfx"; repo = "copilot.el"; rev = commit; - sha256 = "sha256-n4bXnlNfCC00jVeODUlqZNThf7i8rj69zzMMfXBy8tk="; + hash = "sha256-7LKB2JoYAVu5i23ZKBVZPe6azCItHK/tlBNPgFXxztc="; }; packageRequires = with final; [ dash editorconfig s ]; diff --git a/pkgs/default.nix b/pkgs/default.nix index 33b138e..ae37fde 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -48,8 +48,8 @@ src = super.fetchFromGitHub { owner = "bugaevc"; repo = "wl-clipboard"; - rev = "61d5fa34b4722a1fb3ce7a83e2dbc413ffef863f"; - sha256 = "sha256-RxBW4In2ATAJ4v/cppXwwbNP6V9WgEI7GkHA6CHYQ24="; + rev = "v2.2.1"; + sha256 = "sha256-BYRXqVpGt9FrEBYQpi2kHPSZyeMk9o1SXkxjjcduhiY="; }; version = "2023-05-03"; # todo: upstream