diff --git a/flake.lock b/flake.lock index a52d54ba..e77198d1 100644 --- a/flake.lock +++ b/flake.lock @@ -39,11 +39,11 @@ "mobile-nixos": { "flake": false, "locked": { - "lastModified": 1674593731, - "narHash": "sha256-RHJOhxqPKLxbLLabbj1IEuUQqO76TOTtmpxYyTtfDmU=", + "lastModified": 1674779092, + "narHash": "sha256-mFBD0Dvjf8tuxWtJhsCQ+8VYqI4fQeWjd/vfWsZiRRo=", "owner": "nixos", "repo": "mobile-nixos", - "rev": "4d2093efa7efa00131d385fd9d11e54ce16bc57a", + "rev": "80ece5a61738fbf3b96fdda402ab2dfc74ee5cee", "type": "github" }, "original": { @@ -60,22 +60,22 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-P5BXhRIaKF6ze3am7CY//NFOJ4ihoys9h0ka9S15VV4=", - "path": "/nix/store/41f11k8hk1qjd440mavrybc7xgrcp9gj-source/nixpatches", + "narHash": "sha256-5pNu9Ph1LIBj5q9RWLV3r7daANjmd4u5y+MVq8vlfS4=", + "path": "/nix/store/bjzsgw8zn4av0dv4sqyj7vxhi43na16y-source/nixpatches", "type": "path" }, "original": { - "path": "/nix/store/41f11k8hk1qjd440mavrybc7xgrcp9gj-source/nixpatches", + "path": "/nix/store/bjzsgw8zn4av0dv4sqyj7vxhi43na16y-source/nixpatches", "type": "path" } }, "nixpkgs-stable": { "locked": { - "lastModified": 1674407282, - "narHash": "sha256-2qwc8mrPINSFdWffPK+ji6nQ9aGnnZyHSItVcYDZDlk=", + "lastModified": 1674692158, + "narHash": "sha256-oqGpwVg4D+eMSgF7Th5Ve1ysCiH3H3g85vGJ3nvJsZQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ab1254087f4cdf4af74b552d7fc95175d9bdbb49", + "rev": "def9e420d27c951026d57dc96ce0218c3131f412", "type": "github" }, "original": { @@ -103,11 +103,11 @@ }, "nixpkgs-unpatched": { "locked": { - "lastModified": 1674459583, - "narHash": "sha256-L0UZl/u2H3HGsrhN+by42c5kNYeKtdmJiPzIRvEVeiM=", + "lastModified": 1674641431, + "narHash": "sha256-qfo19qVZBP4qn5M5gXc/h1MDgAtPA5VxJm9s8RUAkVk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "1b1f50645af2a70dc93eae18bfd88d330bfbcf7f", + "rev": "9b97ad7b4330aacda9b2343396eb3df8a853b4fc", "type": "github" }, "original": { diff --git a/nixpatches/list.nix b/nixpatches/list.nix index eb3439a5..c7bb4ccf 100644 --- a/nixpatches/list.nix +++ b/nixpatches/list.nix @@ -6,13 +6,6 @@ sha256 = "sha256-Ne4hyHQDwBHUlWo8Z3QyRdmEv1rYGOjFGxSfOAcLUvQ="; }) - # trust-dns: init at 0.22.0 - (fetchpatch { - # https://git.uninsane.org/colin/nixpkgs/compare/master...pr-trust-dns.diff - url = "https://git.uninsane.org/colin/nixpkgs/commit/feee7e0357a74ab0510b2d113a3bdede1d509759.diff"; - sha256 = "sha256-t4sG+xLDaxbJ/mV5G18N4ag8EC3IXPgtN5FJGANh1Dc="; - }) - # splatmoji: init at 1.2.0 (fetchpatch { # https://github.com/NixOS/nixpkgs/pull/211874 @@ -20,11 +13,11 @@ hash = "sha256-IvsIcd2wPdz4b/7FMrDrcVlIZjFecCQ9uiL0Umprbx0="; }) - # matrix-synapse,mautrix-facebook: fix runtime inclusion of python3 systemd #212391 - # merged 2023/01/24 + # fix libreoffice build by: Revert "mdds: 2.0.3 -> 2.1.0" + # merged 2023/01/25 (fetchpatch { - url = "https://github.com/NixOS/nixpkgs/pull/212391.diff"; - hash = "sha256-N9lzQLi8NN9cbd+d04yx2v5mI9tVnlSKVbl0+QGE1YQ="; + url = "https://github.com/NixOS/nixpkgs/pull/212583.diff"; + hash = "sha256-nkXgwQUtxYkJT2OzG6Jc72snizW5wHvR1nmh2KDnaPc="; }) ./2022-12-19-i2p-aarch64.patch