From a2ffe642ef0432d4e9c340c291a14a16ef04188a Mon Sep 17 00:00:00 2001 From: NotAShelf Date: Sat, 19 Apr 2025 19:39:07 +0300 Subject: [PATCH] treewide: nix fmt --- default.nix | 4 +- npins/default.nix | 186 ++++++++++++++++++++++++---------------------- 2 files changed, 99 insertions(+), 91 deletions(-) diff --git a/default.nix b/default.nix index 00b6580..0472edb 100644 --- a/default.nix +++ b/default.nix @@ -7,7 +7,9 @@ in fetchTarball { url = - lock.nodes.${nodeName}.locked.url + lock.nodes.${ + nodeName + }.locked.url or "https://github.com/edolstra/flake-compat/archive/${ lock.nodes.${nodeName}.locked.rev }.tar.gz"; diff --git a/npins/default.nix b/npins/default.nix index 6592476..6e3194a 100644 --- a/npins/default.nix +++ b/npins/default.nix @@ -1,11 +1,11 @@ /* - This file is provided under the MIT licence: +This file is provided under the MIT licence: - Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: - The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. +The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ # Generated by npins. Do not modify; will be overwritten regularly let @@ -13,8 +13,10 @@ let version = data.version; # https://github.com/NixOS/nixpkgs/blob/0258808f5744ca980b9a1f24fe0b1e6f0fecee9c/lib/lists.nix#L295 - range = - first: last: if first > last then [ ] else builtins.genList (n: first + n) (last - first + 1); + range = first: last: + if first > last + then [] + else builtins.genList (n: first + n) (last - first + 1); # https://github.com/NixOS/nixpkgs/blob/0258808f5744ca980b9a1f24fe0b1e6f0fecee9c/lib/strings.nix#L257 stringToCharacters = s: map (p: builtins.substring p 1 s) (range 0 (builtins.stringLength s - 1)); @@ -27,120 +29,124 @@ let # If the environment variable NPINS_OVERRIDE_${name} is set, then use # the path directly as opposed to the fetched source. # (Taken from Niv for compatibility) - mayOverride = - name: path: - let - envVarName = "NPINS_OVERRIDE_${saneName}"; - saneName = stringAsChars (c: if (builtins.match "[a-zA-Z0-9]" c) == null then "_" else c) name; - ersatz = builtins.getEnv envVarName; - in - if ersatz == "" then - path + mayOverride = name: path: let + envVarName = "NPINS_OVERRIDE_${saneName}"; + saneName = stringAsChars (c: + if (builtins.match "[a-zA-Z0-9]" c) == null + then "_" + else c) + name; + ersatz = builtins.getEnv envVarName; + in + if ersatz == "" + then path else # this turns the string into an actual Nix path (for both absolute and # relative paths) builtins.trace "Overriding path of \"${name}\" with \"${ersatz}\" due to set \"${envVarName}\"" ( - if builtins.substring 0 1 ersatz == "/" then - /. + ersatz - else - /. + builtins.getEnv "PWD" + "/${ersatz}" + if builtins.substring 0 1 ersatz == "/" + then /. + ersatz + else /. + builtins.getEnv "PWD" + "/${ersatz}" ); - mkSource = - name: spec: - assert spec ? type; - let + mkSource = name: spec: + assert spec ? type; let path = - if spec.type == "Git" then - mkGitSource spec - else if spec.type == "GitRelease" then - mkGitSource spec - else if spec.type == "PyPi" then - mkPyPiSource spec - else if spec.type == "Channel" then - mkChannelSource spec - else if spec.type == "Tarball" then - mkTarballSource spec - else - builtins.throw "Unknown source type ${spec.type}"; + if spec.type == "Git" + then mkGitSource spec + else if spec.type == "GitRelease" + then mkGitSource spec + else if spec.type == "PyPi" + then mkPyPiSource spec + else if spec.type == "Channel" + then mkChannelSource spec + else if spec.type == "Tarball" + then mkTarballSource spec + else builtins.throw "Unknown source type ${spec.type}"; in - spec // { outPath = mayOverride name path; }; + spec // {outPath = mayOverride name path;}; - mkGitSource = - { - repository, - revision, - url ? null, - submodules, - hash, - branch ? null, - ... - }: + mkGitSource = { + repository, + revision, + url ? null, + submodules, + hash, + branch ? null, + ... + }: assert repository ? type; # At the moment, either it is a plain git repository (which has an url), or it is a GitHub/GitLab repository # In the latter case, there we will always be an url to the tarball - if url != null && !submodules then - builtins.fetchTarball { - inherit url; - sha256 = hash; # FIXME: check nix version & use SRI hashes - } - else - let + if url != null && !submodules + then + builtins.fetchTarball { + inherit url; + sha256 = hash; # FIXME: check nix version & use SRI hashes + } + else let url = - if repository.type == "Git" then - repository.url - else if repository.type == "GitHub" then - "https://github.com/${repository.owner}/${repository.repo}.git" - else if repository.type == "GitLab" then - "${repository.server}/${repository.repo_path}.git" - else - throw "Unrecognized repository type ${repository.type}"; - urlToName = - url: rev: - let - matched = builtins.match "^.*/([^/]*)(\\.git)?$" url; + if repository.type == "Git" + then repository.url + else if repository.type == "GitHub" + then "https://github.com/${repository.owner}/${repository.repo}.git" + else if repository.type == "GitLab" + then "${repository.server}/${repository.repo_path}.git" + else throw "Unrecognized repository type ${repository.type}"; + urlToName = url: rev: let + matched = builtins.match "^.*/([^/]*)(\\.git)?$" url; - short = builtins.substring 0 7 rev; + short = builtins.substring 0 7 rev; - appendShort = if (builtins.match "[a-f0-9]*" rev) != null then "-${short}" else ""; - in - "${if matched == null then "source" else builtins.head matched}${appendShort}"; + appendShort = + if (builtins.match "[a-f0-9]*" rev) != null + then "-${short}" + else ""; + in "${ + if matched == null + then "source" + else builtins.head matched + }${appendShort}"; name = urlToName url revision; in - builtins.fetchGit { - rev = revision; - inherit name; - # hash = hash; - inherit url submodules; - }; + builtins.fetchGit { + rev = revision; + inherit name; + # hash = hash; + inherit url submodules; + }; - mkPyPiSource = - { url, hash, ... }: + mkPyPiSource = { + url, + hash, + ... + }: builtins.fetchurl { inherit url; sha256 = hash; }; - mkChannelSource = - { url, hash, ... }: + mkChannelSource = { + url, + hash, + ... + }: builtins.fetchTarball { inherit url; sha256 = hash; }; - mkTarballSource = - { - url, - locked_url ? url, - hash, - ... - }: + mkTarballSource = { + url, + locked_url ? url, + hash, + ... + }: builtins.fetchTarball { url = locked_url; sha256 = hash; }; in -if version == 5 then - builtins.mapAttrs mkSource data.pins -else - throw "Unsupported format version ${toString version} in sources.json. Try running `npins upgrade`" + if version == 5 + then builtins.mapAttrs mkSource data.pins + else throw "Unsupported format version ${toString version} in sources.json. Try running `npins upgrade`"