From a019a9184cd3c92b4c6387223f5f8258501d7f31 Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 26 Sep 2021 08:42:00 +0300 Subject: [PATCH] Update --- flake.lock | 121 ++++++++++++------------------ profiles/nix/unset-is-macho.patch | 13 ++++ 2 files changed, 62 insertions(+), 72 deletions(-) create mode 100644 profiles/nix/unset-is-macho.patch diff --git a/flake.lock b/flake.lock index 8124666..a706f55 100644 --- a/flake.lock +++ b/flake.lock @@ -85,16 +85,15 @@ "deploy-rs": { "inputs": { "flake-compat": "flake-compat", - "naersk": "naersk", "nixpkgs": "nixpkgs", "utils": "utils" }, "locked": { - "lastModified": 1628752686, - "narHash": "sha256-Lzh9MYUJDsjgif+YEyOErXtj1IH+ci8J1C30g1ms69s=", + "lastModified": 1632390138, + "narHash": "sha256-RTUr/3vYgxwCLUiIVk9mqbqK6DWrJjQjF9s+3snzvuk=", "owner": "serokell", "repo": "deploy-rs", - "rev": "e5546f9c2503c26d175f08a81fc0a0f330be4cbe", + "rev": "bd91450cc1ccbe290ff161b748b770c0472b683a", "type": "github" }, "original": { @@ -105,11 +104,11 @@ }, "emacs-overlay": { "locked": { - "lastModified": 1615335717, - "narHash": "sha256-nJ4CSh9hm5U1g+x0ev1nozhgfFVG2jKU1DCKoEMBbeI=", + "lastModified": 1632589655, + "narHash": "sha256-n49ONWY8oh6mBv5R/DAY9aUPgH4gGwZDVH4zrjUsG5g=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "2d16cdb183d1c5de65758d602a7fbb2f17d2099d", + "rev": "aa581fc7bce89b3abc60124de8dcc3b7c7a9277c", "type": "github" }, "original": { @@ -121,11 +120,11 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1606424373, - "narHash": "sha256-oq8d4//CJOrVj+EcOaSXvMebvuTkmBJuT5tzlfewUnQ=", + "lastModified": 1627913399, + "narHash": "sha256-hY8g6H2KFL8ownSiFeMOjwPC8P0ueXpCVEbxgda3pko=", "owner": "edolstra", "repo": "flake-compat", - "rev": "99f1c2157fba4bfe6211a321fd0ee43199025dbf", + "rev": "12c64ca55c1014cdc1b16ed5a804aa8576601ff2", "type": "github" }, "original": { @@ -153,11 +152,11 @@ "flake-compat_3": { "flake": false, "locked": { - "lastModified": 1606424373, - "narHash": "sha256-oq8d4//CJOrVj+EcOaSXvMebvuTkmBJuT5tzlfewUnQ=", + "lastModified": 1627913399, + "narHash": "sha256-hY8g6H2KFL8ownSiFeMOjwPC8P0ueXpCVEbxgda3pko=", "owner": "edolstra", "repo": "flake-compat", - "rev": "99f1c2157fba4bfe6211a321fd0ee43199025dbf", + "rev": "12c64ca55c1014cdc1b16ed5a804aa8576601ff2", "type": "github" }, "original": { @@ -221,11 +220,11 @@ "utils": "utils_2" }, "locked": { - "lastModified": 1621010971, - "narHash": "sha256-45f23KNCn1EamHdfTGFT4Q7FV7UazJaZfHJe84KUwzI=", + "lastModified": 1632067707, + "narHash": "sha256-xoqTwzDAs/jaqetGXLpTgt8TkIyx3NhHzqwBMZwLsi4=", "owner": "soywod", "repo": "himalaya", - "rev": "c9e1609ea98c0bdb46994058e99f644494f61f1e", + "rev": "b9a9d0e6878972071c748e5ed93353b6e486abc9", "type": "github" }, "original": { @@ -239,11 +238,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1631134124, - "narHash": "sha256-C17wJ2HyuFZllJ/PbpFuuDjkzWvg8np9UIAdSrpuwS0=", + "lastModified": 1632431340, + "narHash": "sha256-9xUnx5aeDp8Irg2/rWBKn3AjiiQTtsjTX0UshzMXy94=", "owner": "rycee", "repo": "home-manager", - "rev": "039f786e609fdb3cfd9c5520ff3791750c3eaebf", + "rev": "b0651cc2173427857b172604f85da6afe69e1d41", "type": "github" }, "original": { @@ -288,16 +287,16 @@ "lowdown-src": { "flake": false, "locked": { - "lastModified": 1617481909, - "narHash": "sha256-SqnfOFuLuVRRNeVJr1yeEPJue/qWoCp5N6o5Kr///p4=", + "lastModified": 1628247802, + "narHash": "sha256-4XSXGYvKqogR7bubyqYNwBHYCtrIn6XRGXj6+u+BXNs=", "owner": "kristapsdz", "repo": "lowdown", - "rev": "148f9b2f586c41b7e36e73009db43ea68c7a1a4d", + "rev": "b4483d0ef85990f54b864158ab786b4a5b3904fa", "type": "github" }, "original": { "owner": "kristapsdz", - "ref": "VERSION_0_8_4", + "ref": "VERSION_0_8_6", "repo": "lowdown", "type": "github" } @@ -350,28 +349,6 @@ "type": "github" } }, - "naersk": { - "inputs": { - "nixpkgs": [ - "deploy-rs", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1622810282, - "narHash": "sha256-4wmvM3/xfD0hCdNDIXVzRMfL4yB1J+DjH6Zte2xbAxk=", - "owner": "nmattia", - "repo": "naersk", - "rev": "e8061169e1495871b56be97c5c51d310fae01374", - "type": "github" - }, - "original": { - "owner": "nmattia", - "ref": "master", - "repo": "naersk", - "type": "github" - } - }, "nheko": { "flake": false, "locked": { @@ -394,11 +371,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1631192496, - "narHash": "sha256-MlIDXTWPjAYktVzV5N4G8o65F3IhqOpMK2pTULB3wJY=", + "lastModified": 1632496624, + "narHash": "sha256-jd3MRDYlVRkgdCjohD5wFf/2lF+/z3jhoPRW5nPwqCg=", "owner": "NixOS", "repo": "nix", - "rev": "25b6b741759b1b1c57bde1e69eca57627358605d", + "rev": "a0bb5c4130268edbd368a4a07d4a30f1064e9c86", "type": "github" }, "original": { @@ -412,11 +389,11 @@ "nixpkgs": "nixpkgs_7" }, "locked": { - "lastModified": 1623578147, - "narHash": "sha256-tv7LT18lQCHFkld27JNFThJ55mnWIs/9/gAHXe4fcnA=", + "lastModified": 1631525216, + "narHash": "sha256-lNEEXpSJ0aRmqYkoyRhaofJXffxmPDXkZQgXZgQs0gI=", "owner": "nix-community", "repo": "nix-direnv", - "rev": "4eab19bf22d83395d80b02aed887a24c1cef9ae3", + "rev": "53c44ae33a453e2c9759cc81e028ca6a86f232d4", "type": "github" }, "original": { @@ -442,11 +419,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1622972307, - "narHash": "sha256-ENOu0FPCf95iLLoq2txhJtnA2ZpOFhIVBqQVbKM8ra0=", + "lastModified": 1632086102, + "narHash": "sha256-wVTcf0UclFS+zHtfPToB13jIO7n0U9N50MuRbPjQViE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d8eb97e3801bde96491535f40483d550b57605b9", + "rev": "e0ce3c683ae677cf5aab597d645520cddd13392b", "type": "github" }, "original": { @@ -506,11 +483,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1617636226, - "narHash": "sha256-iZhBWrOR2DoDs1C+0FlnM9AQLMol/qoGQ+d+S43CKJM=", + "lastModified": 1627857416, + "narHash": "sha256-AV0MsFVzbWI2MZbJ2j0kc8ooFLGSCZHuM9ipaWR9ds4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "3d1a7716d7f1fccbd7d30ab3b2ed3db831f43bde", + "rev": "aaf9676fbb7fb4570216ca1e189a3dc769d62c45", "type": "github" }, "original": { @@ -537,11 +514,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1631463445, - "narHash": "sha256-xqr6nm1NrD8UDaxnF0+dv78pD9Pe5Ipjb4YyXhnvllI=", + "lastModified": 1632593756, + "narHash": "sha256-ZLWYL72kaaDj1ke4uyVBIDFh5KKHtnc7JNsZsVVXxUc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8b13843f4e08c2d707acb8b558c012f0fb1cb314", + "rev": "a11b2cdb2a972fcc4204ca3d32414ddc9c888956", "type": "github" }, "original": { @@ -597,11 +574,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1631381596, - "narHash": "sha256-Xk91RO0uMyul8fWo3RP7WqEP5bsKUVucJRgLZgascAo=", + "lastModified": 1632411313, + "narHash": "sha256-lekODc44lVo9/0EwGiX6LoEt2KhiPdcfNopealMJ7n4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "f6e9e908ccbcabb365cb5434a4a38dd8c996fc72", + "rev": "51bcdc4cdaac48535dabf0ad4642a66774c609ed", "type": "github" }, "original": { @@ -661,11 +638,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1617848844, - "narHash": "sha256-nhPuATSHRrzfZNjtl8zmMhZklYFCHiQd7+uf+jQbd+o=", + "lastModified": 1627957145, + "narHash": "sha256-cY5lS2S/RMsC1xFtkcmhLXlVP7ahZoxFeKedkXDvIzY=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "70330a767d25daa6063e89e38d68b94b2d971831", + "rev": "ab6f3086de97980e4fdcb0560921852a407e0b79", "type": "github" }, "original": { @@ -743,11 +720,11 @@ }, "utils": { "locked": { - "lastModified": 1622445595, - "narHash": "sha256-m+JRe6Wc5OZ/mKw2bB3+Tl0ZbtyxxxfnAWln8Q5qs+Y=", + "lastModified": 1631561581, + "narHash": "sha256-3VQMV5zvxaVLvqqUrNz3iJelLw30mIVSfZmAaauM3dA=", "owner": "numtide", "repo": "flake-utils", - "rev": "7d706970d94bc5559077eb1a6600afddcd25a7c8", + "rev": "7e5bf3925f6fbdfaf50a2a7ca0be2879c4261d19", "type": "github" }, "original": { @@ -758,11 +735,11 @@ }, "utils_2": { "locked": { - "lastModified": 1617631617, - "narHash": "sha256-PARRCz55qN3gy07VJZIlFeOX420d0nGF0RzGI/9hVlw=", + "lastModified": 1623875721, + "narHash": "sha256-A8BU7bjS5GirpAUv4QA+QnJ4CceLHkcXdRp4xITDB0s=", "owner": "numtide", "repo": "flake-utils", - "rev": "b2c27d1a81b0dc266270fa8aeecebbd1807fc610", + "rev": "f7e004a55b120c02ecb6219596820fcd32ca8772", "type": "github" }, "original": { diff --git a/profiles/nix/unset-is-macho.patch b/profiles/nix/unset-is-macho.patch new file mode 100644 index 0000000..f79c578 --- /dev/null +++ b/profiles/nix/unset-is-macho.patch @@ -0,0 +1,13 @@ +diff --git a/src/nix/get-env.sh b/src/nix/get-env.sh +index 42c806450..a8563c772 100644 +--- a/src/nix/get-env.sh ++++ b/src/nix/get-env.sh +@@ -8,6 +8,8 @@ if [[ -n $stdenv ]]; then + source $stdenv/setup + fi + ++unset -f isMachO ++ + # Better to use compgen, but stdenv bash doesn't have it. + __vars="$(declare -p)" + __functions="$(declare -F)" \ No newline at end of file