treewide: Format all Nix files
Format all Nix files using the officially approved formatter, making the CI check introduced in the previous commit succeed: nix-build ci -A fmt.check This is the next step of the of the [implementation](https://github.com/NixOS/nixfmt/issues/153) of the accepted [RFC 166](https://github.com/NixOS/rfcs/pull/166). This commit will lead to merge conflicts for a number of PRs, up to an estimated ~1100 (~33%) among the PRs with activity in the past 2 months, but that should be lower than what it would be without the previous [partial treewide format](https://github.com/NixOS/nixpkgs/pull/322537). Merge conflicts caused by this commit can now automatically be resolved while rebasing using the [auto-rebase script](https://github.com/NixOS/nixpkgs/tree/8616af08d915377bd930395f3b700a0e93d08728/maintainers/scripts/auto-rebase). If you run into any problems regarding any of this, please reach out to the [formatting team](https://nixos.org/community/teams/formatting/) by pinging @NixOS/nix-formatting.
This commit is contained in:
@@ -1,13 +1,24 @@
|
||||
{ lib, stdenv, fetchurl, unzip, zlib, readline, ncurses
|
||||
, updateAutotoolsGnuConfigScriptsHook
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
unzip,
|
||||
zlib,
|
||||
readline,
|
||||
ncurses,
|
||||
updateAutotoolsGnuConfigScriptsHook,
|
||||
|
||||
# for tests
|
||||
, python3Packages, sqldiff, sqlite-analyzer, sqlite-rsync, tinysparql
|
||||
# for tests
|
||||
python3Packages,
|
||||
sqldiff,
|
||||
sqlite-analyzer,
|
||||
sqlite-rsync,
|
||||
tinysparql,
|
||||
|
||||
# uses readline & ncurses for a better interactive experience if set to true
|
||||
, interactive ? false
|
||||
# uses readline & ncurses for a better interactive experience if set to true
|
||||
interactive ? false,
|
||||
|
||||
, gitUpdater
|
||||
gitUpdater,
|
||||
}:
|
||||
|
||||
let
|
||||
@@ -41,11 +52,25 @@ stdenv.mkDerivation rec {
|
||||
./3.48.0-fk-conflict-handling.patch
|
||||
];
|
||||
|
||||
outputs = [ "bin" "dev" "man" "doc" "out" ];
|
||||
outputs = [
|
||||
"bin"
|
||||
"dev"
|
||||
"man"
|
||||
"doc"
|
||||
"out"
|
||||
];
|
||||
separateDebugInfo = stdenv.hostPlatform.isLinux;
|
||||
|
||||
nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook unzip ];
|
||||
buildInputs = [ zlib ] ++ lib.optionals interactive [ readline ncurses ];
|
||||
nativeBuildInputs = [
|
||||
updateAutotoolsGnuConfigScriptsHook
|
||||
unzip
|
||||
];
|
||||
buildInputs =
|
||||
[ zlib ]
|
||||
++ lib.optionals interactive [
|
||||
readline
|
||||
ncurses
|
||||
];
|
||||
|
||||
# required for aarch64 but applied for all arches for simplicity
|
||||
preConfigure = ''
|
||||
@@ -108,7 +133,12 @@ stdenv.mkDerivation rec {
|
||||
passthru = {
|
||||
tests = {
|
||||
inherit (python3Packages) sqlalchemy;
|
||||
inherit sqldiff sqlite-analyzer sqlite-rsync tinysparql;
|
||||
inherit
|
||||
sqldiff
|
||||
sqlite-analyzer
|
||||
sqlite-rsync
|
||||
tinysparql
|
||||
;
|
||||
};
|
||||
|
||||
updateScript = gitUpdater {
|
||||
|
||||
@@ -1,32 +1,50 @@
|
||||
{ lib, stdenv, fetchurl, unzip, sqlite, tcl, Foundation }:
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
unzip,
|
||||
sqlite,
|
||||
tcl,
|
||||
Foundation,
|
||||
}:
|
||||
|
||||
let
|
||||
archiveVersion = import ./archive-version.nix lib;
|
||||
mkTool = { pname, makeTarget, description, homepage, mainProgram }: stdenv.mkDerivation rec {
|
||||
inherit pname;
|
||||
version = "3.48.0";
|
||||
mkTool =
|
||||
{
|
||||
pname,
|
||||
makeTarget,
|
||||
description,
|
||||
homepage,
|
||||
mainProgram,
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
inherit pname;
|
||||
version = "3.48.0";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = assert version == sqlite.version; fetchurl {
|
||||
url = "https://sqlite.org/2025/sqlite-src-${archiveVersion version}.zip";
|
||||
hash = "sha256-LXsDK2/f6MRCqoCfhQaHqB0GOB3uzXvjMSYB0oYS5kA=";
|
||||
# nixpkgs-update: no auto update
|
||||
src =
|
||||
assert version == sqlite.version;
|
||||
fetchurl {
|
||||
url = "https://sqlite.org/2025/sqlite-src-${archiveVersion version}.zip";
|
||||
hash = "sha256-LXsDK2/f6MRCqoCfhQaHqB0GOB3uzXvjMSYB0oYS5kA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ unzip ];
|
||||
buildInputs = [ tcl ] ++ lib.optional stdenv.hostPlatform.isDarwin Foundation;
|
||||
|
||||
makeFlags = [ makeTarget ];
|
||||
|
||||
installPhase = "install -Dt $out/bin ${makeTarget}";
|
||||
|
||||
meta = with lib; {
|
||||
inherit description homepage mainProgram;
|
||||
downloadPage = "http://sqlite.org/download.html";
|
||||
license = licenses.publicDomain;
|
||||
maintainers = with maintainers; [ johnazoidberg ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ unzip ];
|
||||
buildInputs = [ tcl ] ++ lib.optional stdenv.hostPlatform.isDarwin Foundation;
|
||||
|
||||
makeFlags = [ makeTarget ];
|
||||
|
||||
installPhase = "install -Dt $out/bin ${makeTarget}";
|
||||
|
||||
meta = with lib; {
|
||||
inherit description homepage mainProgram;
|
||||
downloadPage = "http://sqlite.org/download.html";
|
||||
license = licenses.publicDomain;
|
||||
maintainers = with maintainers; [ johnazoidberg ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
};
|
||||
in
|
||||
{
|
||||
sqldiff = mkTool {
|
||||
|
||||
Reference in New Issue
Block a user