aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorrebecca “wiggles” turner <rbt@sent.as>2024-03-30 22:26:59 +0000
committerGerrit Code Review <gerrit@lix>2024-03-30 22:26:59 +0000
commit4b730f328e1ea581d09ffba4b064b5f3949af414 (patch)
treeb60619efd94d3e232a1d5dd49589a0a7156a7b89 /src
parent2041bdac2db767c51cd86cb860fc3f03df42cb4e (diff)
parent2a98ba8b97c9ff52519633c32cf63716827d6e7c (diff)
Merge "Add `pre-commit` checks" into main
Diffstat (limited to 'src')
-rw-r--r--src/libexpr/imported-drv-to-derivation.nix4
-rw-r--r--src/libstore/build/personality.hh2
-rw-r--r--src/libutil/source-path.hh2
-rw-r--r--src/libutil/thread-pool.cc2
4 files changed, 3 insertions, 7 deletions
diff --git a/src/libexpr/imported-drv-to-derivation.nix b/src/libexpr/imported-drv-to-derivation.nix
index eab8b050e..9467e6a22 100644
--- a/src/libexpr/imported-drv-to-derivation.nix
+++ b/src/libexpr/imported-drv-to-derivation.nix
@@ -15,7 +15,7 @@ let
inherit outputName;
};
};
-
+
outputsList = map outputToAttrListElement outputs;
-
+
in (builtins.head outputsList).value
diff --git a/src/libstore/build/personality.hh b/src/libstore/build/personality.hh
index 91b730fab..5b0a2edcc 100644
--- a/src/libstore/build/personality.hh
+++ b/src/libstore/build/personality.hh
@@ -8,5 +8,3 @@ namespace nix {
void setPersonality(std::string_view system);
}
-
-
diff --git a/src/libutil/source-path.hh b/src/libutil/source-path.hh
index 03cc998e3..4d4c51062 100644
--- a/src/libutil/source-path.hh
+++ b/src/libutil/source-path.hh
@@ -144,7 +144,7 @@ struct SourcePath
* Resolve any symlinks in this `SourcePath` according to the
* given resolution mode.
*
- * @param mode might only be a temporary solution for this.
+ * @param mode might only be a temporary solution for this.
* See the discussion in https://github.com/NixOS/nix/pull/9985.
*/
SourcePath resolveSymlinks(
diff --git a/src/libutil/thread-pool.cc b/src/libutil/thread-pool.cc
index c6ffa75f2..a25769d9b 100644
--- a/src/libutil/thread-pool.cc
+++ b/src/libutil/thread-pool.cc
@@ -152,5 +152,3 @@ void ThreadPool::doWork(bool mainThread)
}
}
-
-