back interdiff of round #2 and #1

chore(npins): upgrade & update #109

closed
opened by thecoded.prof targeting main from private/coded/push-lsovxmttznrt
files
packetmix
sprinkles
ERROR
packetmix/npins/default.nix

Failed to calculate interdiff for this file.

ERROR
packetmix/npins/sources.json

Failed to calculate interdiff for this file.

NEW
sprinkles/npins/default.nix
··· 9 9 */ 10 10 # Generated by npins. Do not modify; will be overwritten regularly 11 11 let 12 - data = builtins.fromJSON (builtins.readFile ./sources.json); 13 - version = data.version; 12 + # Backwards-compatibly make something that previously didn't take any arguments take some 13 + # The function must return an attrset, and will unfortunately be eagerly evaluated 14 + # Same thing, but it catches eval errors on the default argument so that one may still call it with other arguments 15 + mkFunctor = 16 + fn: 17 + let 18 + e = builtins.tryEval (fn { }); 19 + in 20 + (if e.success then e.value else { error = fn { }; }) // { __functor = _self: fn; }; 14 21 15 22 # https://github.com/NixOS/nixpkgs/blob/0258808f5744ca980b9a1f24fe0b1e6f0fecee9c/lib/lists.nix#L295 16 23 range = ··· 21 28 22 29 # https://github.com/NixOS/nixpkgs/blob/0258808f5744ca980b9a1f24fe0b1e6f0fecee9c/lib/strings.nix#L269 23 30 stringAsChars = f: s: concatStrings (map f (stringToCharacters s)); 24 - concatMapStrings = f: list: concatStrings (map f list); 25 31 concatStrings = builtins.concatStringsSep ""; 26 32 27 33 # If the environment variable NPINS_OVERRIDE_${name} is set, then use ··· 48 54 49 55 mkSource = 50 56 name: spec: 57 + { 58 + pkgs ? null, 59 + }: 51 60 assert spec ? type; 52 61 let 62 + # Unify across builtin and pkgs fetchers. 63 + # `fetchGit` requires a wrapper because of slight API differences. 64 + fetchers = 65 + if pkgs == null then 66 + { 67 + inherit (builtins) fetchTarball fetchurl; 68 + # For some fucking reason, fetchGit has a different signature than the other builtin fetchers … 69 + fetchGit = args: (builtins.fetchGit args).outPath; 70 + } 71 + else 72 + { 73 + fetchTarball = 74 + { 75 + url, 76 + sha256, 77 + }: 78 + pkgs.fetchzip { 79 + inherit url sha256; 80 + extension = "tar"; 81 + }; 82 + inherit (pkgs) fetchurl; 83 + fetchGit = 84 + { 85 + url, 86 + submodules, 87 + rev, 88 + name, 89 + narHash, 90 + }: 91 + pkgs.fetchgit { 92 + inherit url rev name; 93 + fetchSubmodules = submodules; 94 + hash = narHash; 95 + }; 96 + }; 97 + 98 + # Dispatch to the correct code path based on the type 53 99 path = 54 100 if spec.type == "Git" then 55 - mkGitSource spec 101 + mkGitSource fetchers spec 56 102 else if spec.type == "GitRelease" then 57 - mkGitSource spec 103 + mkGitSource fetchers spec 58 104 else if spec.type == "PyPi" then 59 - mkPyPiSource spec 105 + mkPyPiSource fetchers spec 60 106 else if spec.type == "Channel" then 61 - mkChannelSource spec 107 + mkChannelSource fetchers spec 62 108 else if spec.type == "Tarball" then 63 - mkTarballSource spec 109 + mkTarballSource fetchers spec 110 + else if spec.type == "Container" then 111 + mkContainerSource pkgs spec 64 112 else 65 113 builtins.throw "Unknown source type ${spec.type}"; 66 114 in 67 115 spec // { outPath = mayOverride name path; }; 68 116 69 117 mkGitSource = 118 + { 119 + fetchTarball, 120 + fetchGit, 121 + ... 122 + }: 70 123 { 71 124 repository, 72 125 revision, 73 126 url ? null, 74 127 submodules, 75 128 hash, 76 - branch ? null, 77 129 ... 78 130 }: 79 131 assert repository ? type; 80 132 # At the moment, either it is a plain git repository (which has an url), or it is a GitHub/GitLab repository 81 133 # In the latter case, there we will always be an url to the tarball 82 134 if url != null && !submodules then 83 - builtins.fetchTarball { 135 + fetchTarball { 84 136 inherit url; 85 137 sha256 = hash; 86 138 } ··· 107 159 "${if matched == null then "source" else builtins.head matched}${appendShort}"; 108 160 name = urlToName url revision; 109 161 in 110 - builtins.fetchGit { 162 + fetchGit { 111 163 rev = revision; 112 164 narHash = hash; 113 165 ··· 115 167 }; 116 168 117 169 mkPyPiSource = 118 - { url, hash, ... }: 119 - builtins.fetchurl { 170 + { fetchurl, ... }: 171 + { 172 + url, 173 + hash, 174 + ... 175 + }: 176 + fetchurl { 120 177 inherit url; 121 178 sha256 = hash; 122 179 }; 123 180 124 181 mkChannelSource = 125 - { url, hash, ... }: 126 - builtins.fetchTarball { 182 + { fetchTarball, ... }: 183 + { 184 + url, 185 + hash, 186 + ... 187 + }: 188 + fetchTarball { 127 189 inherit url; 128 190 sha256 = hash; 129 191 }; 130 192 131 193 mkTarballSource = 194 + { fetchTarball, ... }: 132 195 { 133 196 url, 134 197 locked_url ? url, 135 198 hash, 136 199 ... 137 200 }: 138 - builtins.fetchTarball { 201 + fetchTarball { 139 202 url = locked_url; 140 203 sha256 = hash; 141 204 }; 205 + 206 + mkContainerSource = 207 + pkgs: 208 + { 209 + image_name, 210 + image_tag, 211 + image_digest, 212 + ... 213 + }: 214 + if pkgs == null then 215 + builtins.throw "container sources require passing in a Nixpkgs value: https://github.com/andir/npins/blob/master/README.md#using-the-nixpkgs-fetchers" 216 + else 217 + pkgs.dockerTools.pullImage { 218 + imageName = image_name; 219 + imageDigest = image_digest; 220 + finalImageTag = image_tag; 221 + }; 142 222 in 143 - if version == 6 then 144 - builtins.mapAttrs mkSource data.pins 145 - else 146 - throw "Unsupported format version ${toString version} in sources.json. Try running `npins upgrade`" 223 + mkFunctor ( 224 + { 225 + input ? ./sources.json, 226 + }: 227 + let 228 + data = 229 + if builtins.isPath input then 230 + # while `readFile` will throw an error anyways if the path doesn't exist, 231 + # we still need to check beforehand because *our* error can be caught but not the one from the builtin 232 + # *piegames sighs* 233 + if builtins.pathExists input then 234 + builtins.fromJSON (builtins.readFile input) 235 + else 236 + throw "Input path ${toString input} does not exist" 237 + else if builtins.isAttrs input then 238 + input 239 + else 240 + throw "Unsupported input type ${builtins.typeOf input}, must be a path or an attrset"; 241 + version = data.version; 242 + in 243 + if version == 7 then 244 + builtins.mapAttrs (name: spec: mkFunctor (mkSource name spec)) data.pins 245 + else 246 + throw "Unsupported format version ${toString version} in sources.json. Try running `npins upgrade`" 247 + )
NEW
sprinkles/npins/sources.json
··· 9 9 }, 10 10 "branch": "monthly", 11 11 "submodules": false, 12 - "revision": "f44d7c3596ff028ad9f7fcc31d1941ed585f11b3", 13 - "url": "https://github.com/nix-community/fenix/archive/f44d7c3596ff028ad9f7fcc31d1941ed585f11b3.tar.gz", 14 - "hash": "sha256-6RzWfxENGlO73jQb3uQNgOvubUFwvveeIg+PZxhAu6s=" 12 + "revision": "3107255abfe4f2d1c3eee7a3e2f5a5eb6f2200fe", 13 + "url": "https://github.com/nix-community/fenix/archive/3107255abfe4f2d1c3eee7a3e2f5a5eb6f2200fe.tar.gz", 14 + "hash": "sha256-isqMvjTk3jdTHN6KA/BWQvOSVe7O35OQKAZNtLK76OY=" 15 15 }, 16 16 "nilla": { 17 17 "type": "Git", ··· 22 22 }, 23 23 "branch": "main", 24 24 "submodules": false, 25 - "revision": "4e6038f4ebc89487194013af6a1e077dfeb00359", 26 - "url": "https://github.com/nilla-nix/nilla/archive/4e6038f4ebc89487194013af6a1e077dfeb00359.tar.gz", 27 - "hash": "sha256-7iLzbTLtgdFtm9em3xxHO9BunN2YpgYquMLKXh5hEpQ=" 25 + "revision": "b617bdbaa5faa9345ca077cd497372ece77bf119", 26 + "url": "https://github.com/nilla-nix/nilla/archive/b617bdbaa5faa9345ca077cd497372ece77bf119.tar.gz", 27 + "hash": "sha256-eCKqHY7uUiNqmP0XqWlXxpBLABuk65MRPLH2INFEE5U=" 28 28 }, 29 29 "nixpkgs": { 30 30 "type": "Git", ··· 35 35 }, 36 36 "branch": "nixos-unstable", 37 37 "submodules": false, 38 - "revision": "a84ebe20c6bc2ecbcfb000a50776219f48d134cc", 39 - "url": "https://github.com/nixos/nixpkgs/archive/a84ebe20c6bc2ecbcfb000a50776219f48d134cc.tar.gz", 40 - "hash": "sha256-mNqIplmEohk5jRkqYqG19GA8MbQ/D4gQSK0Mu4LvfRQ=" 38 + "revision": "ae814fd3904b621d8ab97418f1d0f2eb0d3716f4", 39 + "url": "https://github.com/nixos/nixpkgs/archive/ae814fd3904b621d8ab97418f1d0f2eb0d3716f4.tar.gz", 40 + "hash": "sha256-YRqMDEtSMbitIMj+JLpheSz0pwEr0Rmy5mC7myl17xs=" 41 41 }, 42 42 "quickshell": { 43 43 "type": "GitRelease", ··· 49 49 "version_upper_bound": null, 50 50 "release_prefix": null, 51 51 "submodules": false, 52 - "version": "v0.2.0", 53 - "revision": "a5431dd02dc23d9ef1680e67777fed00fe5f7cda", 52 + "version": "v0.2.1", 53 + "revision": "a1a150fab00a93ea983aaca5df55304bc837f51b", 54 54 "url": null, 55 - "hash": "sha256-vqkSDvh7hWhPvNjMjEDV4KbSCv2jyl2Arh73ZXe274k=" 55 + "hash": "sha256-e++Ogy91Sv7gGLMdAqZaBzbH/UmPWZ4GAt7VDCA66aU=" 56 56 } 57 57 }, 58 - "version": 6 58 + "version": 7 59 59 }