diff --git a/flake.lock b/flake.lock index f4e8f48e..05bef377 100644 --- a/flake.lock +++ b/flake.lock @@ -308,7 +308,10 @@ "nix-on-droid", "nixpkgs" ], - "nmd": "nmd", + "nmd": [ + "nix-on-droid", + "nmd" + ], "nmt": "nmt" }, "locked": { @@ -336,19 +339,19 @@ ], "nixpkgs-docs": "nixpkgs-docs", "nixpkgs-for-bootstrap": "nixpkgs-for-bootstrap", - "nmd": "nmd_2" + "nmd": "nmd" }, "locked": { - "lastModified": 1720396533, - "narHash": "sha256-UFzk/hZWO1VkciIO5UPaSpJN8s765wsngUSvtJM6d5Q=", - "owner": "nix-community", + "lastModified": 1782163734, + "narHash": "sha256-zHC7IBDDlxgnfkYv4Y+Sk2DEVpb1FS5yU08Q3il7vRc=", + "owner": "newAM", "repo": "nix-on-droid", - "rev": "f3d3b8294039f2f9a8fb7ea82c320f29c6b0fe25", + "rev": "dff2d1eb9b40d88c523a62252d899219105c5517", "type": "github" }, "original": { - "owner": "nix-community", - "ref": "release-24.05", + "owner": "newAM", + "ref": "update-proot", "repo": "nix-on-droid", "type": "github" } @@ -475,22 +478,6 @@ } }, "nmd": { - "flake": false, - "locked": { - "lastModified": 1666190571, - "narHash": "sha256-Z1hc7M9X6L+H83o9vOprijpzhTfOBjd0KmUTnpHAVjA=", - "owner": "rycee", - "repo": "nmd", - "rev": "b75d312b4f33bd3294cd8ae5c2ca8c6da2afc169", - "type": "gitlab" - }, - "original": { - "owner": "rycee", - "repo": "nmd", - "type": "gitlab" - } - }, - "nmd_2": { "inputs": { "nixpkgs": [ "nix-on-droid", diff --git a/flake.nix b/flake.nix index 3106a296..d3ea7fbd 100644 --- a/flake.nix +++ b/flake.nix @@ -24,7 +24,13 @@ }; nix-on-droid = { - url = "github:nix-community/nix-on-droid/release-24.05"; + # 本来は公式の`github:nix-community/nix-on-droid`の最新版リリースを使いたい。 + # しかしNix-on-Droidが同梱するproot-termuxは`glibc 2.42`の`TCGETS2` ioctlに未対応で、 + # `26.05`の`glibc 2.42`ではインストールが`Permission denied`の権限エラーになる。 + # proot-termuxを修正する[PR](https://github.com/nix-community/nix-on-droid/pull/529)が、 + # まだ未マージなので暫定でそのブランチ(masterベース)を直接参照する。 + # 問題がなくなったら正式リリースに戻す。 + url = "github:newAM/nix-on-droid/update-proot"; inputs = { nixpkgs.follows = "nixpkgs"; home-manager.follows = "home-manager";