diff --git a/flake.lock b/flake.lock index d27ba08..02e7319 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1701071203, - "narHash": "sha256-lQywA7QU/vzTdZ1apI0PfgCWNyQobXUYghVrR5zuIeM=", + "lastModified": 1702203126, + "narHash": "sha256-4BhN2Vji19MzRC7SUfPZGmtZ2WZydQeUk/ogfRBIZMs=", "owner": "nix-community", "repo": "home-manager", - "rev": "db1878f013b52ba5e4034db7c1b63e8d04173a86", + "rev": "defbb9c5857e157703e8fc7cf3c2ceb01cb95883", "type": "github" }, "original": { @@ -23,11 +23,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1701020860, - "narHash": "sha256-NwnRn04C8s+hH+KdVtGmVB1FFNIG7DtPJmQSCBDaET4=", + "lastModified": 1702245580, + "narHash": "sha256-tTVRB42Ljo2uWGP7ei5h5/qQjOsdXoz0GHRy9hrVrdw=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "b006ec52fce23b1d57f6ab4a42d7400732e9a0a2", + "rev": "030edbb68e69f2b97231479f98a9597024650df2", "type": "github" }, "original": { @@ -39,11 +39,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1700794826, - "narHash": "sha256-RyJTnTNKhO0yqRpDISk03I/4A67/dp96YRxc86YOPgU=", + "lastModified": 1702151865, + "narHash": "sha256-9VAt19t6yQa7pHZLDbil/QctAgVsA66DLnzdRGqDisg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5a09cb4b393d58f9ed0d9ca1555016a8543c2ac8", + "rev": "666fc80e7b2afb570462423cb0e1cf1a3a34fedd", "type": "github" }, "original": { diff --git a/makefile b/makefile index 64006a8..9115c17 100644 --- a/makefile +++ b/makefile @@ -3,7 +3,7 @@ all: weekly: pull clean update ci all push -cweekly: pull clean all +cweekly: clean pull all update: nix flake update @@ -22,6 +22,9 @@ push: pull: @. ~/.bash_ssh git pull + doas nix-prefetch-url file://$$PWD/$$(ls -1 pkgs/linuxx64* | tail -n1) + doas nix-prefetch-url file://$$PWD/$$(ls -1 pkgs/linuxarm64* | tail -n1) + ci: git commit -m"updates from makefile" --all diff --git a/pkgs/linuxx64-23.5.0.58.tar.gz b/pkgs/linuxx64-23.5.0.58.tar.gz deleted file mode 100644 index 09c6d38..0000000 Binary files a/pkgs/linuxx64-23.5.0.58.tar.gz and /dev/null differ diff --git a/pkgs/linuxx64-23.7.0.17.tar.gz b/pkgs/linuxx64-23.7.0.17.tar.gz deleted file mode 100644 index 0a40dd0..0000000 Binary files a/pkgs/linuxx64-23.7.0.17.tar.gz and /dev/null differ diff --git a/workstation/default.nix b/workstation/default.nix index 79ccda3..78b3772 100644 --- a/workstation/default.nix +++ b/workstation/default.nix @@ -159,7 +159,7 @@ in # Allow unfree packages nixpkgs.config.allowUnfree = true; - nixpkgs.config.permittedInsecurePackages = [ "electron-21.4.0" ]; + nixpkgs.config.permittedInsecurePackages = [ "electron-21.4.0" "electron-25.9.0" ]; environment.systemPackages = with pkgs; [ #(callPackage ../mypackages/kanshi-fix/default.nix {})