diff --git a/flake.lock b/flake.lock index bf68e80f..c3dfaa11 100644 --- a/flake.lock +++ b/flake.lock @@ -45,11 +45,11 @@ ] }, "locked": { - "lastModified": 1742985972, - "narHash": "sha256-RQ283gaz2bxCNaY+8CJZURYL0gJSLT+da7wSYmxYR10=", + "lastModified": 1743201729, + "narHash": "sha256-k3B3dlY9TbBib8VR0w15gOZ9yVV5pYU0++DmG0R02S8=", "owner": "accentor", "repo": "api", - "rev": "37f102a1a7792aaf3b61165ca169e8a16792c7c1", + "rev": "0bc4d919a9f8d7dd0e674c97f1aeb1b347feb133", "type": "github" }, "original": { @@ -74,11 +74,11 @@ ] }, "locked": { - "lastModified": 1742986115, - "narHash": "sha256-zOijWG+HRfg4okuwvgulTgqS6OosD/jqmqmQOfLGou0=", + "lastModified": 1743201857, + "narHash": "sha256-ADAd7iYIVhK9/ZYDCWbNhE4JVU1sG1cJAd7AWHTi0Qg=", "owner": "accentor", "repo": "web", - "rev": "204b53502032355dbdea0adbc3ddb601863fe3c5", + "rev": "3295765ef64ad62533bb608fe277113b4bccbb10", "type": "github" }, "original": { @@ -139,11 +139,11 @@ ] }, "locked": { - "lastModified": 1743125241, - "narHash": "sha256-TA/xYqZbBwCCprXf8ABORDsjJy0Idw6OdQNqYQhgKCM=", + "lastModified": 1743221873, + "narHash": "sha256-i8VPNm4UBsC3Ni6VwjojVJvCpS9GZ4vPrpFRtCGJzBs=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "75f8e4dbc553d3052f917e66ee874f69d49c9981", + "rev": "53d0f0ed11487a4476741fde757d0feabef4cc4e", "type": "github" }, "original": { @@ -184,11 +184,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1743184222, - "narHash": "sha256-B2R43Vsz7NgcaMZQRLQkklosgW1Uo1Z5AS+8R6f1s/A=", + "lastModified": 1743239789, + "narHash": "sha256-WvJj6PCAdBmWx69OYvAUVtLG9gFdChMteHZTaYrADqQ=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "849cd4920ec9a1976dc916b192f7f2401ec13c5b", + "rev": "2ac7be36de0ef1e6936c7ba89fbf8d2ae87f4ddd", "type": "github" }, "original": { @@ -374,11 +374,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1742889210, - "narHash": "sha256-hw63HnwnqU3ZQfsMclLhMvOezpM7RSB0dMAtD5/sOiw=", + "lastModified": 1743095683, + "narHash": "sha256-gWd4urRoLRe8GLVC/3rYRae1h+xfQzt09xOfb0PaHSk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "698214a32beb4f4c8e3942372c694f40848b360d", + "rev": "5e5402ecbcb27af32284d4a62553c019a3a49ea6", "type": "github" }, "original": { @@ -444,11 +444,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1743194326, - "narHash": "sha256-FWTIRoGBkEUltXM+5E0TxF5wEy9d9vdN7O9sP/kp8qQ=", + "lastModified": 1743248707, + "narHash": "sha256-ja4k4iNBzU4TbbDu9qoIDoc6MdW8pTa8zQjCy26KPBw=", "owner": "nix-community", "repo": "NUR", - "rev": "7a5319dbd42839af702f15077df610ce59e94879", + "rev": "851424d4299116e87df3b1f74f4a5e7f8cc623d1", "type": "github" }, "original": { @@ -507,11 +507,11 @@ ] }, "locked": { - "lastModified": 1742985818, - "narHash": "sha256-32n52OiAuf40VtjqKAUtWlIkE6O7zMVMiCJRFu1QXi4=", + "lastModified": 1743201565, + "narHash": "sha256-RqJB0RT0OnLG2jIduxkcfDuoKVFGIhfeYt6ycZYhYfk=", "owner": "chvp", "repo": "tetris", - "rev": "e7ab5cd51385ad09807fbc44f519d6045b7ec76c", + "rev": "c3c69988035fd0cb3c53aa5b8af64004ca871f88", "type": "github" }, "original": { @@ -557,11 +557,11 @@ ] }, "locked": { - "lastModified": 1742985351, - "narHash": "sha256-Fgy7qd1QxVL2nse9WUvhTgLmtDdsT25lGVntsrQ+YCo=", + "lastModified": 1743201377, + "narHash": "sha256-ubZUOdeQP7GcaoOISgGuNlU9WFQ0OsziE6B8oMp8HxU=", "ref": "refs/heads/main", - "rev": "0ba0f88a6e3613c7dd776ab31bd62dc107dc3a0e", - "revCount": 100, + "rev": "4d109d9589e00913128dfa4cbab05e0dd73458db", + "revCount": 101, "type": "git", "url": "https://git.chvp.be/chvp/www.chvp.be" }, diff --git a/patches/393314.patch b/patches/393314.patch deleted file mode 100644 index 07590c43..00000000 --- a/patches/393314.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/pkgs/applications/editors/emacs/build-support/generic.nix b/pkgs/applications/editors/emacs/build-support/generic.nix -index b4e96f6490fb05..167f0fcb86b4b6 100644 ---- a/pkgs/applications/editors/emacs/build-support/generic.nix -+++ b/pkgs/applications/editors/emacs/build-support/generic.nix -@@ -61,7 +61,8 @@ lib.extendMkDerivation { - propagatedUserEnvPkgs = finalAttrs.packageRequires ++ propagatedUserEnvPkgs; - - strictDeps = args.strictDeps or true; -- __structuredAttrs = args.__structuredAttrs or true; -+ # TODO re-enable after #392928 reaches master -+ # __structuredAttrs = args.__structuredAttrs or true; - - inherit turnCompilationWarningToError ignoreCompilationError; -