From 8b5bf4260fb912ab893da2b58861cca1103b5839 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Thu, 10 Nov 2022 19:40:46 -0500 Subject: vulkan-headers: add Windows to meta.platforms --- pkgs/development/libraries/vulkan-headers/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/vulkan-headers/default.nix b/pkgs/development/libraries/vulkan-headers/default.nix index 47cdccf41fc19..1db531e3732cd 100644 --- a/pkgs/development/libraries/vulkan-headers/default.nix +++ b/pkgs/development/libraries/vulkan-headers/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Vulkan Header files and API registry"; homepage = "https://www.lunarg.com"; - platforms = platforms.unix; + platforms = platforms.unix ++ platforms.windows; license = licenses.asl20; maintainers = [ maintainers.ralith ]; }; -- cgit 1.4.1 From 33b682ebaf5df1db6db775e23ab4356a266cff62 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Thu, 10 Nov 2022 19:41:42 -0500 Subject: dxvk: 1.10.3 -> 2.0 --- pkgs/misc/dxvk/default.nix | 12 +++++++++--- pkgs/misc/dxvk/dxvk.nix | 15 ++++++++++++++- 2 files changed, 23 insertions(+), 4 deletions(-) (limited to 'pkgs') diff --git a/pkgs/misc/dxvk/default.nix b/pkgs/misc/dxvk/default.nix index 6664db0e9ec94..7d5af28d81072 100644 --- a/pkgs/misc/dxvk/default.nix +++ b/pkgs/misc/dxvk/default.nix @@ -22,12 +22,16 @@ stdenvNoCC.mkDerivation (finalAttrs: # platforms diverge (due to the need for Darwin-specific patches that would fail to apply). # Should that happen, set `darwin` to the last working `rev` and `hash`. srcs = rec { - darwin = { inherit (default) rev hash version; }; - default = { + darwin = { rev = "v${finalAttrs.version}"; hash = "sha256-T93ZylxzJGprrP+j6axZwl2d3hJowMCUOKNjIyNzkmE="; version = "1.10.3"; }; + default = { + rev = "v${finalAttrs.version}"; + hash = "sha256-mboVLdPgZMzmqyeF0jAloEz6xqfIDiY/X98e7l2KZnw="; + version = "2.0"; + }; }; in { @@ -60,10 +64,12 @@ stdenvNoCC.mkDerivation (finalAttrs: installPhase = '' mkdir -p $out/bin $bin $lib + # Replace both basedir forms to support both DXVK 2.0 and older versions. substitute setup_dxvk.sh $out/bin/setup_dxvk.sh \ --subst-var-by mcfgthreads32 "${pkgsCross.mingw32.windows.mcfgthreads}" \ --subst-var-by mcfgthreads64 "${pkgsCross.mingwW64.windows.mcfgthreads}" \ - --replace 'basedir=$(dirname "$(readlink -f $0)")' "basedir=$bin" + --replace 'basedir=$(dirname "$(readlink -f $0)")' "basedir=$bin" \ + --replace 'basedir="$(dirname "$(readlink -f "$0")")"' "basedir=$bin" chmod a+x $out/bin/setup_dxvk.sh declare -A dxvks=( [x32]=${dxvk32} [x64]=${dxvk64} ) for arch in "''${!dxvks[@]}"; do diff --git a/pkgs/misc/dxvk/dxvk.nix b/pkgs/misc/dxvk/dxvk.nix index 2eb4f30df2bc3..7607c9ee44128 100644 --- a/pkgs/misc/dxvk/dxvk.nix +++ b/pkgs/misc/dxvk/dxvk.nix @@ -7,18 +7,31 @@ , windows , src , version +, spirv-headers +, vulkan-headers , dxvkPatches }: +let + # DXVK 2.0+ no longer vendors certain dependencies. This derivation also needs to build on Darwin, + # which does not currently support DXVK 2.0, so adapt conditionally for this situation. + isDxvk2 = lib.versionAtLeast version "2.0"; +in stdenv.mkDerivation { pname = "dxvk"; inherit src version; nativeBuildInputs = [ glslang meson ninja ]; - buildInputs = [ windows.pthreads ]; + buildInputs = [ windows.pthreads ] + ++ lib.optionals isDxvk2 [ spirv-headers vulkan-headers ]; patches = dxvkPatches; + preConfigure = lib.optionalString isDxvk2 '' + ln -s ${lib.getDev spirv-headers}/include include/spirv/include + ln -s ${lib.getDev vulkan-headers}/include include/vulkan/include + ''; + mesonFlags = let arch = if stdenv.is32bit then "32" else "64"; -- cgit 1.4.1 From 443798ece0b6f14af7dbedf49f19119af3a7063d Mon Sep 17 00:00:00 2001 From: Matt Layher Date: Fri, 25 Nov 2022 08:08:50 -0500 Subject: prometheus-modemmanager-exporter: 0.1.0 -> 0.2.0 Signed-off-by: Matt Layher --- pkgs/servers/monitoring/prometheus/modemmanager-exporter.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'pkgs') diff --git a/pkgs/servers/monitoring/prometheus/modemmanager-exporter.nix b/pkgs/servers/monitoring/prometheus/modemmanager-exporter.nix index e6178dd52a35e..aacf991faa009 100644 --- a/pkgs/servers/monitoring/prometheus/modemmanager-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/modemmanager-exporter.nix @@ -2,18 +2,16 @@ buildGoModule rec { pname = "modemmanager-exporter"; - version = "0.1.0"; + version = "0.2.0"; src = fetchFromGitHub { owner = "mdlayher"; repo = "modemmanager_exporter"; rev = "v${version}"; - sha256 = "0d8z7qzk5j5jj0ixkwpi8dw9kki78mxrajdlzzcj2rcgbnwair91"; + sha256 = "sha256-wQATmTjYsm1J2DicPryoa/jVpbLjXz+1TTQUH5yGV6w="; }; - vendorSha256 = "0f6v97cvzdz7wygswpm87wf8r169x5rw28908vqhmqk644hli4zy"; - - doCheck = false; + vendorSha256 = "sha256-wGCRpFnt9bxc5Ygg6H1kI9sXB4mVFBdLeaahAFtvNbg="; passthru.tests = { inherit (nixosTests.prometheus-exporters) modemmanager; }; -- cgit 1.4.1 From b05e62fc64f1cfcd1101365dbc6595cef3432292 Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Fri, 9 Dec 2022 14:10:12 -0800 Subject: python310Packages.cleo: clean up crashtest patch --- pkgs/development/python-modules/cleo/default.nix | 5 ----- 1 file changed, 5 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/cleo/default.nix b/pkgs/development/python-modules/cleo/default.nix index f834ef198ca81..216065472bca8 100644 --- a/pkgs/development/python-modules/cleo/default.nix +++ b/pkgs/development/python-modules/cleo/default.nix @@ -20,11 +20,6 @@ buildPythonPackage rec { hash = "sha256-y9PYlGSPLpZl9Ad2AFuDKIopH0LRETLp35aiZtLcXzM="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace 'crashtest = "^0.3.1"' 'crashtest = "*"' - ''; - nativeBuildInputs = [ poetry-core ]; -- cgit 1.4.1 From 4ae972ab06579f33af6e9386c073ce3f1addfe95 Mon Sep 17 00:00:00 2001 From: Florian Brandes Date: Thu, 15 Dec 2022 10:16:46 +0100 Subject: ipmiview: 2.20.0 -> 2.21.0 fix build failure, because the old url isn't available anymore Signed-off-by: Florian Brandes --- pkgs/applications/misc/ipmiview/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/misc/ipmiview/default.nix b/pkgs/applications/misc/ipmiview/default.nix index fbc436c882cfc..d1162052cebb0 100644 --- a/pkgs/applications/misc/ipmiview/default.nix +++ b/pkgs/applications/misc/ipmiview/default.nix @@ -13,12 +13,12 @@ stdenv.mkDerivation rec { pname = "IPMIView"; - version = "2.20.0"; - buildVersion = "220309"; + version = "2.21.0"; + buildVersion = "221118"; src = fetchurl { url = "https://www.supermicro.com/wftp/utility/IPMIView/Linux/IPMIView_${version}_build.${buildVersion}_bundleJRE_Linux_x64.tar.gz"; - hash = "sha256-qtklBMuK0jb9Ye0IkYM2WYFRMAfZg9tk08a1JQ64cjA="; + hash = "sha256-ZN0vadGbjGj9U2wPqvHLjS9fsk3DNCbXoNvzUfnn8IM="; }; nativeBuildInputs = [ patchelf makeWrapper ]; -- cgit 1.4.1 From 5f34d08447de7842e1e1835c08eecde8baabffba Mon Sep 17 00:00:00 2001 From: David Morgan Date: Thu, 15 Dec 2022 12:52:50 +0000 Subject: mopidy-musicbox-webclient: un-mark as broken on darwin --- pkgs/applications/audio/mopidy/musicbox-webclient.nix | 1 - 1 file changed, 1 deletion(-) (limited to 'pkgs') diff --git a/pkgs/applications/audio/mopidy/musicbox-webclient.nix b/pkgs/applications/audio/mopidy/musicbox-webclient.nix index 1e2cb8d060947..65a228b8fd0a1 100644 --- a/pkgs/applications/audio/mopidy/musicbox-webclient.nix +++ b/pkgs/applications/audio/mopidy/musicbox-webclient.nix @@ -18,7 +18,6 @@ pythonPackages.buildPythonApplication rec { meta = with lib; { description = "Mopidy extension for playing music from SoundCloud"; license = licenses.mit; - broken = stdenv.isDarwin; maintainers = [ maintainers.spwhitt ]; }; } -- cgit 1.4.1 From 0e48185e741a6412ffd310cb98514e767e72cf04 Mon Sep 17 00:00:00 2001 From: David Morgan Date: Thu, 15 Dec 2022 12:57:53 +0000 Subject: mopidy-local: un-mark as broken on darwin --- pkgs/applications/audio/mopidy/local.nix | 1 - 1 file changed, 1 deletion(-) (limited to 'pkgs') diff --git a/pkgs/applications/audio/mopidy/local.nix b/pkgs/applications/audio/mopidy/local.nix index f32d9e3a3456b..717d61a92ecff 100644 --- a/pkgs/applications/audio/mopidy/local.nix +++ b/pkgs/applications/audio/mopidy/local.nix @@ -33,7 +33,6 @@ python3Packages.buildPythonApplication rec { ]; meta = with lib; { - broken = stdenv.isDarwin; homepage = "https://github.com/mopidy/mopidy-local"; description = "Mopidy extension for playing music from your local music archive"; license = licenses.asl20; -- cgit 1.4.1 From cdc29721208b62b223d794091c718fde794dcdb7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 15 Dec 2022 20:56:58 +0000 Subject: cvc5: 1.0.2 -> 1.0.3 --- pkgs/applications/science/logic/cvc5/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/science/logic/cvc5/default.nix b/pkgs/applications/science/logic/cvc5/default.nix index 1bd1c1c52bc2c..5bce776771d35 100644 --- a/pkgs/applications/science/logic/cvc5/default.nix +++ b/pkgs/applications/science/logic/cvc5/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "cvc5"; - version = "1.0.2"; + version = "1.0.3"; src = fetchFromGitHub { owner = "cvc5"; repo = "cvc5"; rev = "cvc5-${version}"; - sha256 = "sha256-RDslPz9b0R9NXaXoixSCenHEh+F3wg/8p4Ksrzh41PI="; + sha256 = "sha256-CVXK6yehfUrSbo8R1Dk1oc/siCtmV9DjEp6q+aLuVQA="; }; nativeBuildInputs = [ pkg-config cmake ]; -- cgit 1.4.1 From deac6655519bb4d081bd16956c3f621df6a771d8 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Tue, 13 Dec 2022 14:23:52 +0800 Subject: pdns: 4.7.2 -> 4.7.3 --- pkgs/servers/dns/pdns/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/servers/dns/pdns/default.nix b/pkgs/servers/dns/pdns/default.nix index 7ca466ef5a106..a4bcd8744e8ef 100644 --- a/pkgs/servers/dns/pdns/default.nix +++ b/pkgs/servers/dns/pdns/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "pdns"; - version = "4.7.2"; + version = "4.7.3"; src = fetchurl { url = "https://downloads.powerdns.com/releases/pdns-${version}.tar.bz2"; - hash = "sha256-TcrjXr3ASRWHLXv24tC8pLBcY1ChAKXPnCnfU7qlPOI="; + hash = "sha256-i601Gy4JQm9tT7A0aIGlFV/lVUl8PYUHHlMefHr+PnY="; }; # redact configure flags from version output to reduce closure size patches = [ ./version.patch ]; -- cgit 1.4.1 From 237a9bb7c9d453dca708f7a533a4a657890bdeac Mon Sep 17 00:00:00 2001 From: Alexandre Acebedo Date: Sat, 17 Dec 2022 09:13:52 +0100 Subject: vivaldi: remove useless forceDarkMode parameter --- pkgs/applications/networking/browsers/vivaldi/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index 435b5c4fe5dcc..df0a3323d72a4 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -11,7 +11,6 @@ , isSnapshot ? false , proprietaryCodecs ? false, vivaldi-ffmpeg-codecs ? null , enableWidevine ? false, vivaldi-widevine ? null -, forceDarkMode ? false , commandLineArgs ? "" , pulseSupport ? stdenv.isLinux, libpulseaudio }: @@ -80,7 +79,7 @@ in stdenv.mkDerivation rec { substituteInPlace "$out"/share/applications/*.desktop \ --replace /usr/bin/${vivaldiName} "$out"/bin/vivaldi substituteInPlace "$out"/share/applications/*.desktop \ - --replace vivaldi-stable "vivaldi ${lib.optionalString forceDarkMode "--force-dark-mode"}" + --replace vivaldi-stable vivaldi local d for d in 16 22 24 32 48 64 128 256; do mkdir -p "$out"/share/icons/hicolor/''${d}x''${d}/apps -- cgit 1.4.1 From 7fdbeda14015e55761f3b89846662ed3f5ae3980 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 17 Dec 2022 08:44:28 +0000 Subject: python310Packages.azure-mgmt-containerservice: 20.7.0 -> 21.0.0 --- .../python-modules/azure-mgmt-containerservice/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix b/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix index dff9c2fe6d656..77db6ebc714fb 100644 --- a/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "azure-mgmt-containerservice"; - version = "20.7.0"; + version = "21.0.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "zip"; - hash = "sha256-tNuBIfObCWd8JXq49CDLOzMl1pw7ulTQJua7CNJjRuo="; + hash = "sha256-9Jhhd/qmphNnmWphXtFr6V52WA7KtKA8lI6cKsdGsOE="; }; propagatedBuildInputs = [ -- cgit 1.4.1 From 337244cf4a8fda60fe84c9e76ce295a3e598d9b0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 17 Dec 2022 22:34:00 +0000 Subject: python310Packages.duckdb-engine: 0.6.5 -> 0.6.6 --- pkgs/development/python-modules/duckdb-engine/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/duckdb-engine/default.nix b/pkgs/development/python-modules/duckdb-engine/default.nix index db38ac4c29787..f78097b09b79a 100644 --- a/pkgs/development/python-modules/duckdb-engine/default.nix +++ b/pkgs/development/python-modules/duckdb-engine/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "duckdb-engine"; - version = "0.6.5"; + version = "0.6.6"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { repo = "duckdb_engine"; owner = "Mause"; rev = "refs/tags/v${version}"; - hash = "sha256-DLm/8bye8p2fhs36CW5PQAxm3uhJq1L+DT1Zn2uJhqE="; + hash = "sha256-OpVkMkZt5h4Rp615wx42cR/NFbv6dwsklqM8/xRswtw="; }; nativeBuildInputs = [ -- cgit 1.4.1 From ec8cb3435824ebf8867ae3d5ad0977b4744c0c21 Mon Sep 17 00:00:00 2001 From: figsoda Date: Sat, 17 Dec 2022 19:39:44 -0500 Subject: treewide: fix typos --- CONTRIBUTING.md | 2 +- pkgs/applications/audio/mp3val/default.nix | 2 +- .../applications/editors/kakoune/plugins/aliases.nix | 6 +++--- pkgs/applications/emulators/citra/update.sh | 4 ++-- pkgs/applications/emulators/yuzu/update.sh | 4 ++-- pkgs/applications/misc/with-shell/default.nix | 2 +- .../networking/cluster/hadoop/default.nix | 2 +- .../networking/mailreaders/mailnag/default.nix | 2 +- pkgs/applications/radio/gnuradio/3.8.nix | 2 +- pkgs/applications/radio/gnuradio/3.9.nix | 2 +- pkgs/applications/radio/gnuradio/default.nix | 2 +- pkgs/applications/radio/gnuradio/shared.nix | 2 +- pkgs/applications/science/logic/monosat/default.nix | 2 +- pkgs/applications/science/math/LiE/default.nix | 2 +- .../science/molecular-dynamics/lammps/default.nix | 2 +- pkgs/applications/video/epgstation/update.nix | 2 +- pkgs/applications/video/kodi/unwrapped.nix | 2 +- .../window-managers/herbstluftwm/default.nix | 2 +- pkgs/build-support/docker/default.nix | 2 +- .../dotnet/build-dotnet-module/default.nix | 2 +- pkgs/build-support/fetchfirefoxaddon/tests.nix | 2 +- pkgs/build-support/release/source-tarball.nix | 2 +- .../rust/build-rust-crate/test/default.nix | 2 +- .../rust/build-rust-crate/test/rcgen-crates.nix | 2 +- pkgs/build-support/vm/default.nix | 2 +- pkgs/data/fonts/google-fonts/default.nix | 2 +- pkgs/data/fonts/profont/default.nix | 2 +- pkgs/data/fonts/tamzen/default.nix | 2 +- pkgs/data/misc/cacert/update.sh | 2 +- pkgs/desktops/enlightenment/efl/default.nix | 2 +- .../desktop/elementary-session-settings/default.nix | 2 +- pkgs/development/compilers/dotnet/update.sh | 4 ++-- pkgs/development/compilers/elm/default.nix | 2 +- pkgs/development/compilers/gcc/4.9/default.nix | 2 +- .../compilers/graalvm/community-edition/mkGraal.nix | 2 +- pkgs/development/haskell-modules/lib/compose.nix | 2 +- pkgs/development/haskell-modules/lib/default.nix | 2 +- .../development/haskell-modules/make-package-set.nix | 4 ++-- pkgs/development/interpreters/lua-5/default.nix | 4 ++-- pkgs/development/interpreters/octave/default.nix | 4 ++-- .../interpreters/python/python-packages-base.nix | 2 +- .../update-python-libraries.py | 2 +- pkgs/development/libraries/glib/default.nix | 2 +- .../libraries/gobject-introspection/wrapper.nix | 20 ++++++++++---------- .../development/libraries/gstreamer/good/default.nix | 2 +- .../libraries/khronos-ocl-icd-loader/default.nix | 2 +- pkgs/development/libraries/libcommuni/default.nix | 2 +- pkgs/development/libraries/ndn-cxx/default.nix | 2 +- .../libraries/science/math/blas/default.nix | 2 +- .../libraries/science/math/zn_poly/default.nix | 2 +- .../libraries/stargate-libcds/default.nix | 2 +- pkgs/development/octave-modules/vibes/default.nix | 2 +- .../backports_shutil_get_terminal_size/default.nix | 2 +- .../python-modules/beancount_docverif/default.nix | 2 +- pkgs/development/python-modules/buildbot/plugins.nix | 2 +- pkgs/development/python-modules/ignite/default.nix | 2 +- .../development/python-modules/mezzanine/default.nix | 2 +- .../development/python-modules/mouseinfo/default.nix | 2 +- pkgs/development/python-modules/stone/default.nix | 2 +- pkgs/development/ruby-modules/gem-config/default.nix | 2 +- .../continuous-integration/github-runner/default.nix | 2 +- .../development/tools/misc/binutils/2.38/default.nix | 2 +- pkgs/development/tools/misc/binutils/default.nix | 2 +- pkgs/development/tools/misc/dura/default.nix | 2 +- .../tools/poetry2nix/poetry2nix/default.nix | 2 +- pkgs/development/tools/tapview/default.nix | 2 +- pkgs/games/gl-gsync-demo/default.nix | 2 +- pkgs/games/openra/default.nix | 2 +- pkgs/games/openra/packages.nix | 2 +- pkgs/misc/screensavers/alock/default.nix | 2 +- pkgs/misc/tmux-plugins/default.nix | 2 +- pkgs/os-specific/darwin/yabai/default.nix | 2 +- pkgs/os-specific/linux/systemd/default.nix | 4 ++-- pkgs/servers/nextcloud/default.nix | 2 +- pkgs/servers/nfd/default.nix | 2 +- pkgs/servers/sql/postgresql/default.nix | 2 +- pkgs/servers/web-apps/netbox/default.nix | 2 +- pkgs/stdenv/generic/check-meta.nix | 2 +- pkgs/tools/admin/azure-cli/default.nix | 2 +- pkgs/tools/admin/pgadmin/default.nix | 2 +- pkgs/tools/misc/fpart/default.nix | 2 +- pkgs/tools/misc/librespeed-cli/default.nix | 2 +- pkgs/tools/misc/sqlite3-to-mysql/default.nix | 2 +- pkgs/tools/networking/ipfetch/default.nix | 2 +- pkgs/tools/networking/ndn-tools/default.nix | 2 +- pkgs/tools/typesetting/docbook2odf/default.nix | 2 +- pkgs/tools/wayland/wev/default.nix | 2 +- pkgs/top-level/all-packages.nix | 4 ++-- pkgs/top-level/emacs-packages.nix | 2 +- pkgs/top-level/gnuradio-packages.nix | 2 +- pkgs/top-level/php-packages.nix | 2 +- 91 files changed, 110 insertions(+), 110 deletions(-) (limited to 'pkgs') diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 46fe47e05904f..b0479ed85efab 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -112,7 +112,7 @@ You can also create the backport manually: 2. Check out the target _release branch_, e.g. `release-22.11`. Do not use a _channel branch_ like `nixos-22.11` or `nixpkgs-22.11-darwin`. 3. Create a branch for your change, e.g. `git checkout -b backport`. 4. When the reason to backport is not obvious from the original commit message, use `git cherry-pick -xe ` and add a reason. Otherwise use `git cherry-pick -x `. That's fine for minor version updates that only include security and bug fixes, commits that fixes an otherwise broken package or similar. Please also ensure the commits exists on the master branch; in the case of squashed or rebased merges, the commit hash will change and the new commits can be found in the merge message at the bottom of the master pull request. -5. Push to GitHub and open a backport pull request. Make sure to select the release branch (e.g. `release-22.11`) as the target branch of the pull request, and link to the pull request in which the original change was comitted to `master`. The pull request title should be the commit title with the release version as prefix, e.g. `[22.11]`. +5. Push to GitHub and open a backport pull request. Make sure to select the release branch (e.g. `release-22.11`) as the target branch of the pull request, and link to the pull request in which the original change was committed to `master`. The pull request title should be the commit title with the release version as prefix, e.g. `[22.11]`. 6. When the backport pull request is merged and you have the necessary privileges you can also replace the label `9.needs: port to stable` with `8.has: port to stable` on the original pull request. This way maintainers can keep track of missing backports easier. ## Criteria for Backporting changes diff --git a/pkgs/applications/audio/mp3val/default.nix b/pkgs/applications/audio/mp3val/default.nix index dc1a308583181..2435f0cecc62c 100644 --- a/pkgs/applications/audio/mp3val/default.nix +++ b/pkgs/applications/audio/mp3val/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { files' integrity. It can be useful for finding corrupted files (e.g. incompletely downloaded, truncated, containing garbage). MP3val is also able to fix most of the problems. Being a multiplatform application, - MP3val can be runned both under Windows and under Linux (or BSD). The most + MP3val can be run both under Windows and under Linux (or BSD). The most common MPEG audio file type is MPEG 1 Layer III (mp3), but MP3val supports also other MPEG versions and layers. The tool is also aware of the most common types of tags (ID3v1, ID3v2, APEv2). diff --git a/pkgs/applications/editors/kakoune/plugins/aliases.nix b/pkgs/applications/editors/kakoune/plugins/aliases.nix index cf9a65c43f2b3..2f097dee52757 100644 --- a/pkgs/applications/editors/kakoune/plugins/aliases.nix +++ b/pkgs/applications/editors/kakoune/plugins/aliases.nix @@ -1,8 +1,8 @@ # Deprecated aliases - for backward compatibility -lib: overriden: +lib: overridden: -with overriden; +with overridden; let # Removing recurseForDerivation prevents derivations of aliased attribute @@ -21,7 +21,7 @@ let # Make sure that we are not shadowing something from # all-packages.nix. - checkInPkgs = n: alias: if builtins.hasAttr n overriden + checkInPkgs = n: alias: if builtins.hasAttr n overridden then throw "Alias ${n} is still in kakounePlugins" else alias; diff --git a/pkgs/applications/emulators/citra/update.sh b/pkgs/applications/emulators/citra/update.sh index 6b68e3327a2e2..e9150e34e0a12 100755 --- a/pkgs/applications/emulators/citra/update.sh +++ b/pkgs/applications/emulators/citra/update.sh @@ -42,7 +42,7 @@ updateNightly() { NEW_NIGHTLY_HASH="$(nix-prefetch-git --quiet --fetch-submodules --rev "nightly-${NEW_NIGHTLY_VERSION}" "https://github.com/citra-emu/citra-nightly" | jq -r '.sha256')" - echo " Succesfully fetched. hash: ${NEW_NIGHTLY_HASH}" + echo " Successfully fetched. hash: ${NEW_NIGHTLY_HASH}" sed -i "s/${OLD_NIGHTLY_VERSION}/${NEW_NIGHTLY_VERSION}/" ./default.nix sed -i "s/${OLD_NIGHTLY_HASH}/${NEW_NIGHTLY_HASH}/" ./default.nix @@ -67,7 +67,7 @@ updateCanary() { NEW_CANARY_HASH="$(nix-prefetch-git --quiet --fetch-submodules --rev "canary-${NEW_CANARY_VERSION}" "https://github.com/citra-emu/citra-canary" | jq -r '.sha256')" - echo " Succesfully fetched. hash: ${NEW_CANARY_HASH}" + echo " Successfully fetched. hash: ${NEW_CANARY_HASH}" sed -i "s/${OLD_CANARY_VERSION}/${NEW_CANARY_VERSION}/" ./default.nix sed -i "s/${OLD_CANARY_HASH}/${NEW_CANARY_HASH}/" ./default.nix diff --git a/pkgs/applications/emulators/yuzu/update.sh b/pkgs/applications/emulators/yuzu/update.sh index bfabd6a206949..7234adf977bb2 100755 --- a/pkgs/applications/emulators/yuzu/update.sh +++ b/pkgs/applications/emulators/yuzu/update.sh @@ -45,7 +45,7 @@ updateBranch() { sed -i "s,${oldVersion},${newVersion}," "$DEFAULT_NIX" sed -i "s,${oldHash},${newHash},g" "$DEFAULT_NIX" - echo " succesfully updated $attribute. new hash: $newHash" + echo " successfully updated $attribute. new hash: $newHash" } updateCompatibilityList() { @@ -72,7 +72,7 @@ updateCompatibilityList() { sed -i "s,${oldUrl},${newUrl},g" "$DEFAULT_NIX" sed -i "s,${oldHash},${newHash},g" "$DEFAULT_NIX" sed -i "s,${oldDate},${newDate},g" "$DEFAULT_NIX" - echo " succesfully updated compatibility_list. new hash: $newHash" + echo " successfully updated compatibility_list. new hash: $newHash" } if [[ "$BRANCH" = "mainline" ]] || [[ "$BRANCH" = "early-access" ]]; then diff --git a/pkgs/applications/misc/with-shell/default.nix b/pkgs/applications/misc/with-shell/default.nix index cf52d194f6172..3674a23e41bd6 100644 --- a/pkgs/applications/misc/with-shell/default.nix +++ b/pkgs/applications/misc/with-shell/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { $ with git git> add . - git> commit -a -m "Commited" + git> commit -a -m "Committed" git> push Can also be used for compound commands. diff --git a/pkgs/applications/networking/cluster/hadoop/default.nix b/pkgs/applications/networking/cluster/hadoop/default.nix index ebe21a2da45ea..58ba8a4168e9a 100644 --- a/pkgs/applications/networking/cluster/hadoop/default.nix +++ b/pkgs/applications/networking/cluster/hadoop/default.nix @@ -133,7 +133,7 @@ in }; jdk = jdk8_headless; # not using native libs because of broken openssl_1_0_2 dependency - # can be manually overriden + # can be manually overridden tests = nixosTests.hadoop_3_2; }; hadoop2 = common rec { diff --git a/pkgs/applications/networking/mailreaders/mailnag/default.nix b/pkgs/applications/networking/mailreaders/mailnag/default.nix index 7c3e5ea5c7f5c..47c448c9b3233 100644 --- a/pkgs/applications/networking/mailreaders/mailnag/default.nix +++ b/pkgs/applications/networking/mailreaders/mailnag/default.nix @@ -12,7 +12,7 @@ , gsettings-desktop-schemas , glib , gobject-introspection -# Available plugins (can be overriden) +# Available plugins (can be overridden) , availablePlugins # Used in the withPlugins interface at passthru, can be overrided directly, or # prefarably via e.g: `mailnag.withPlugins([mailnag.availablePlugins.goa])` diff --git a/pkgs/applications/radio/gnuradio/3.8.nix b/pkgs/applications/radio/gnuradio/3.8.nix index 301193a657853..1dbdbaa7225f8 100644 --- a/pkgs/applications/radio/gnuradio/3.8.nix +++ b/pkgs/applications/radio/gnuradio/3.8.nix @@ -250,7 +250,7 @@ stdenv.mkDerivation rec { }) ]; passthru = shared.passthru // { - # Deps that are potentially overriden and are used inside GR plugins - the same version must + # Deps that are potentially overridden and are used inside GR plugins - the same version must inherit boost volk diff --git a/pkgs/applications/radio/gnuradio/3.9.nix b/pkgs/applications/radio/gnuradio/3.9.nix index e54c502060a23..baf86ca434276 100644 --- a/pkgs/applications/radio/gnuradio/3.9.nix +++ b/pkgs/applications/radio/gnuradio/3.9.nix @@ -280,7 +280,7 @@ stdenv.mkDerivation rec { ./modtool-newmod-permissions.patch ]; passthru = shared.passthru // { - # Deps that are potentially overriden and are used inside GR plugins - the same version must + # Deps that are potentially overridden and are used inside GR plugins - the same version must inherit boost volk diff --git a/pkgs/applications/radio/gnuradio/default.nix b/pkgs/applications/radio/gnuradio/default.nix index 39aa9336aec9f..9dc88d1bdbd80 100644 --- a/pkgs/applications/radio/gnuradio/default.nix +++ b/pkgs/applications/radio/gnuradio/default.nix @@ -299,7 +299,7 @@ stdenv.mkDerivation rec { ./modtool-newmod-permissions.patch ]; passthru = shared.passthru // { - # Deps that are potentially overriden and are used inside GR plugins - the same version must + # Deps that are potentially overridden and are used inside GR plugins - the same version must inherit boost volk diff --git a/pkgs/applications/radio/gnuradio/shared.nix b/pkgs/applications/radio/gnuradio/shared.nix index a5ae83eb35130..ff6aaf35bea09 100644 --- a/pkgs/applications/radio/gnuradio/shared.nix +++ b/pkgs/applications/radio/gnuradio/shared.nix @@ -7,7 +7,7 @@ , features , versionAttr , sourceSha256 -# If overriden. No need to set default values, as they are given defaults in +# If overridden. No need to set default values, as they are given defaults in # the main expressions , overrideSrc , fetchFromGitHub diff --git a/pkgs/applications/science/logic/monosat/default.nix b/pkgs/applications/science/logic/monosat/default.nix index 2709b16c5770c..7295cdd30ae16 100644 --- a/pkgs/applications/science/logic/monosat/default.nix +++ b/pkgs/applications/science/logic/monosat/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchpatch, fetchFromGitHub, cmake, zlib, gmp, jdk8, - # The JDK we use on Darwin currenly makes extensive use of rpaths which are + # The JDK we use on Darwin currently makes extensive use of rpaths which are # annoying and break the python library, so let's not bother for now includeJava ? !stdenv.hostPlatform.isDarwin, includeGplCode ? true }: diff --git a/pkgs/applications/science/math/LiE/default.nix b/pkgs/applications/science/math/LiE/default.nix index 9b16fc1d67f6e..d05cc90ca44c5 100644 --- a/pkgs/applications/science/math/LiE/default.nix +++ b/pkgs/applications/science/math/LiE/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { longDescription = '' LiE is a computer algebra system that is specialised in computations involving (reductive) Lie groups and their representations. It is - publically available for free in source code. For a description of its + publicly available for free in source code. For a description of its characteristics, we refer to the following sources of information. ''; # take from the website diff --git a/pkgs/applications/science/molecular-dynamics/lammps/default.nix b/pkgs/applications/science/molecular-dynamics/lammps/default.nix index c377d961820ed..51280840a7819 100644 --- a/pkgs/applications/science/molecular-dynamics/lammps/default.nix +++ b/pkgs/applications/science/molecular-dynamics/lammps/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { for pack in ${lib.concatStringsSep " " packages}; do make "yes-$pack" SHELL=$SHELL; done ''; - # Must do manual build due to LAMMPS requiring a seperate build for + # Must do manual build due to LAMMPS requiring a separate build for # the libraries and executable. Also non-typical make script buildPhase = '' make mode=exe ${if withMPI then "mpi" else "serial"} SHELL=$SHELL LMP_INC="${lammps_includes}" FFT_PATH=-DFFT_FFTW3 FFT_LIB=-lfftw3 JPG_LIB=-lpng diff --git a/pkgs/applications/video/epgstation/update.nix b/pkgs/applications/video/epgstation/update.nix index 41b7b9ab1e17b..4b9907384e58d 100644 --- a/pkgs/applications/video/epgstation/update.nix +++ b/pkgs/applications/video/epgstation/update.nix @@ -39,7 +39,7 @@ let # Fix issue with old sqlite3 version pinned that depends on very old node-gyp 3.x ${gnused}/bin/sed -i -e 's/"sqlite3":\s*"5.0.[0-9]\+"/"sqlite3": "5.0.11"/' package.json - # Regenerate node packages to update the pre-overriden epgstation derivation. + # Regenerate node packages to update the pre-overridden epgstation derivation. # This must come *after* package.json has been regenerated. pushd ../../../development/node-packages ./generate.sh diff --git a/pkgs/applications/video/kodi/unwrapped.nix b/pkgs/applications/video/kodi/unwrapped.nix index 6eadd06af0fb1..15bf50cc571d9 100644 --- a/pkgs/applications/video/kodi/unwrapped.nix +++ b/pkgs/applications/video/kodi/unwrapped.nix @@ -34,7 +34,7 @@ , buildPackages }: -assert usbSupport -> !udevSupport; # libusb-compat-0_1 won't be used if udev is avaliable +assert usbSupport -> !udevSupport; # libusb-compat-0_1 won't be used if udev is available assert gbmSupport || waylandSupport || x11Support; let diff --git a/pkgs/applications/window-managers/herbstluftwm/default.nix b/pkgs/applications/window-managers/herbstluftwm/default.nix index b46179599cd3c..4918dad35f425 100644 --- a/pkgs/applications/window-managers/herbstluftwm/default.nix +++ b/pkgs/applications/window-managers/herbstluftwm/default.nix @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { python3.pkgs.pytestCheckHook ]; - # make the package's module avalaible + # make the package's module available preCheck = '' export PYTHONPATH="$PYTHONPATH:../python" ''; diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index 48c780e2dbe45..3d51c03f97af2 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -879,7 +879,7 @@ rec { contentsList = if builtins.isList contents then contents else [ contents ]; # We store the customisation layer as a tarball, to make sure that - # things like permissions set on 'extraCommands' are not overriden + # things like permissions set on 'extraCommands' are not overridden # by Nix. Then we precompute the sha256 for performance. customisationLayer = symlinkJoin { name = "${baseName}-customisation-layer"; diff --git a/pkgs/build-support/dotnet/build-dotnet-module/default.nix b/pkgs/build-support/dotnet/build-dotnet-module/default.nix index 5e8d76defe76d..89d423c80d72a 100644 --- a/pkgs/build-support/dotnet/build-dotnet-module/default.nix +++ b/pkgs/build-support/dotnet/build-dotnet-module/default.nix @@ -111,7 +111,7 @@ let deps = [ _nugetDeps ] ++ lib.optional (localDeps != null) localDeps; }; - # this contains all the nuget packages that are implictly referenced by the dotnet + # this contains all the nuget packages that are implicitly referenced by the dotnet # build system. having them as separate deps allows us to avoid having to regenerate # a packages dependencies when the dotnet-sdk version changes sdkDeps = mkNugetDeps { diff --git a/pkgs/build-support/fetchfirefoxaddon/tests.nix b/pkgs/build-support/fetchfirefoxaddon/tests.nix index fd70d0f82ac04..a29f65c542adb 100644 --- a/pkgs/build-support/fetchfirefoxaddon/tests.nix +++ b/pkgs/build-support/fetchfirefoxaddon/tests.nix @@ -7,7 +7,7 @@ url = "https://addons.mozilla.org/firefox/downloads/file/3059971/image_search_options-3.0.12-fx.xpi"; sha256 = "sha256-H73YWX/DKxvhEwKpWOo7orAQ7c/rQywpljeyxYxv0Gg="; }; - overidden-source = + overridden-source = let image-search-options = fetchurl { url = "https://addons.mozilla.org/firefox/downloads/file/3059971/image_search_options-3.0.12-fx.xpi"; diff --git a/pkgs/build-support/release/source-tarball.nix b/pkgs/build-support/release/source-tarball.nix index c7129ae83f928..742cce13b7bf1 100644 --- a/pkgs/build-support/release/source-tarball.nix +++ b/pkgs/build-support/release/source-tarball.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation ( - # First, attributes that can be overriden by the caller (via args): + # First, attributes that can be overridden by the caller (via args): { # By default, only configure and build a source distribution. # Some packages can only build a distribution after a general diff --git a/pkgs/build-support/rust/build-rust-crate/test/default.nix b/pkgs/build-support/rust/build-rust-crate/test/default.nix index a4536a1751c82..1ecef4c8e3270 100644 --- a/pkgs/build-support/rust/build-rust-crate/test/default.nix +++ b/pkgs/build-support/rust/build-rust-crate/test/default.nix @@ -576,7 +576,7 @@ let expectedFiles = [ "./bin/test_binary1" ] ++ lib.optionals stdenv.isDarwin [ - # On Darwin, the debug symbols are in a seperate directory. + # On Darwin, the debug symbols are in a separate directory. "./bin/test_binary1.dSYM/Contents/Info.plist" "./bin/test_binary1.dSYM/Contents/Resources/DWARF/test_binary1" ]; diff --git a/pkgs/build-support/rust/build-rust-crate/test/rcgen-crates.nix b/pkgs/build-support/rust/build-rust-crate/test/rcgen-crates.nix index 0f97c9b724bd6..e15390c3ffa80 100644 --- a/pkgs/build-support/rust/build-rust-crate/test/rcgen-crates.nix +++ b/pkgs/build-support/rust/build-rust-crate/test/rcgen-crates.nix @@ -2931,7 +2931,7 @@ rec { /* Returns a crate which depends on successful test execution of crate given as the second argument. - testCrateFlags: list of flags to pass to the test exectuable + testCrateFlags: list of flags to pass to the test executable testInputs: list of packages that should be available during test execution */ crateWithTest = { crate, testCrate, testCrateFlags, testInputs, testPreRun, testPostRun }: diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index 06e1deb478458..7b66aa3799f37 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -1156,7 +1156,7 @@ rec { of the default image parameters can be given. In particular, `extraPackages' specifies the names of additional packages from the distribution that should be included in the image; `packages' - allows the entire set of packages to be overriden; and `size' + allows the entire set of packages to be overridden; and `size' sets the size of the disk in megabytes. E.g., `diskImageFuns.ubuntu1004x86_64 { extraPackages = ["firefox"]; size = 8192; }' builds an 8 GiB image containing Firefox in diff --git a/pkgs/data/fonts/google-fonts/default.nix b/pkgs/data/fonts/google-fonts/default.nix index b1abb26f9f200..4503b09354a96 100644 --- a/pkgs/data/fonts/google-fonts/default.nix +++ b/pkgs/data/fonts/google-fonts/default.nix @@ -8,7 +8,7 @@ stdenvNoCC.mkDerivation { pname = "google-fonts"; version = "unstable-2022-11-14"; - # Adobe Blank is split out in a seperate output, + # Adobe Blank is split out in a separate output, # because it causes crashes with `libfontconfig`. # It has an absurd number of symbols outputs = [ "out" "adobeBlank" ]; diff --git a/pkgs/data/fonts/profont/default.nix b/pkgs/data/fonts/profont/default.nix index da12347af0626..e201d643afac2 100644 --- a/pkgs/data/fonts/profont/default.nix +++ b/pkgs/data/fonts/profont/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { version = "2019-11"; # Note: stripRoot doesn't work because the archive - # constains the metadata directory `__MACOSX`. + # contains the metadata directory `__MACOSX`. src = fetchzip { url = "https://tobiasjung.name/downloadfile.php?file=profont-x11.zip"; sha256 = "12dbm87wvcpmn7nzgzwlk45cybp091diara8blqm6129ps27z6kb"; diff --git a/pkgs/data/fonts/tamzen/default.nix b/pkgs/data/fonts/tamzen/default.nix index 8fcfe694299a7..f589455e9811e 100644 --- a/pkgs/data/fonts/tamzen/default.nix +++ b/pkgs/data/fonts/tamzen/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Bitmapped programming font based on Tamsyn"; longDescription = '' - Tamzen is a monospace bitmap font. It is programatically forked + Tamzen is a monospace bitmap font. It is programmatically forked from Tamsyn version 1.11, which backports glyphs from older versions while deleting deliberately empty glyphs to allow secondary/fallback fonts to provide real glyphs at those codepoints. diff --git a/pkgs/data/misc/cacert/update.sh b/pkgs/data/misc/cacert/update.sh index 9ad5ede0f7efe..d578102ad56bd 100755 --- a/pkgs/data/misc/cacert/update.sh +++ b/pkgs/data/misc/cacert/update.sh @@ -1,7 +1,7 @@ #!/usr/bin/env nix-shell #!nix-shell -i bash -p nix common-updater-scripts jq -# Build both the cacert package and an overriden version where we use the source attribute of NSS. +# Build both the cacert package and an overridden version where we use the source attribute of NSS. # Cacert and NSS are both from the same upstream sources. They are decoupled as # the cacert output only cares about a few infrequently changing files in the # sources while the NSS source code changes frequently. diff --git a/pkgs/desktops/enlightenment/efl/default.nix b/pkgs/desktops/enlightenment/efl/default.nix index fca2c591a77d8..a15975872df42 100644 --- a/pkgs/desktops/enlightenment/efl/default.nix +++ b/pkgs/desktops/enlightenment/efl/default.nix @@ -147,7 +147,7 @@ stdenv.mkDerivation rec { mesonFlags = [ "--buildtype=release" "-D build-tests=false" # disable build tests, which are not working - "-D ecore-imf-loaders-disabler=ibus,scim" # ibus is disabled by default, scim is not availabe in nixpkgs + "-D ecore-imf-loaders-disabler=ibus,scim" # ibus is disabled by default, scim is not available in nixpkgs "-D embedded-lz4=false" "-D fb=true" "-D network-backend=connman" diff --git a/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix b/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix index bf466c4d59e1d..dcb02cced50a6 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix @@ -28,7 +28,7 @@ let # Upstream relies on /etc/skel to initiate a new users home directory with plank's dockitems. # # That is not possible within nixos, but we can achieve this easily with a simple script that copies - # them. We then use a xdg autostart and initalize it during the "EarlyInitialization" phase of a gnome session + # them. We then use a xdg autostart and initialize it during the "EarlyInitialization" phase of a gnome session # which is most appropriate for installing files into $HOME. # diff --git a/pkgs/development/compilers/dotnet/update.sh b/pkgs/development/compilers/dotnet/update.sh index 8f59e58ff5a55..84bf37c3c8c13 100755 --- a/pkgs/development/compilers/dotnet/update.sh +++ b/pkgs/development/compilers/dotnet/update.sh @@ -91,7 +91,7 @@ aspnetcore_packages () { # would fail due to missing dependencies. # # Moving them to a separate list stored alongside the SDK package definitions, - # and implictly including them along in buildDotnetModule allows us + # and implicitly including them along in buildDotnetModule allows us # to make updating .NET SDK packages a lot easier - we now just update # the versions of these packages in one place, and all packages that # use buildDotnetModule continue building with the new .NET version without changes. @@ -141,7 +141,7 @@ sdk_packages () { # would fail due to missing dependencies. # # Moving them to a separate list stored alongside the SDK package definitions, - # and implictly including them along in buildDotnetModule allows us + # and implicitly including them along in buildDotnetModule allows us # to make updating .NET SDK packages a lot easier - we now just update # the versions of these packages in one place, and all packages that # use buildDotnetModule continue building with the new .NET version without changes. diff --git a/pkgs/development/compilers/elm/default.nix b/pkgs/development/compilers/elm/default.nix index f395651a0f186..080c5a8d77637 100644 --- a/pkgs/development/compilers/elm/default.nix +++ b/pkgs/development/compilers/elm/default.nix @@ -2,7 +2,7 @@ let - # To controll nodejs version we pass down + # To control nodejs version we pass down nodejs = pkgs.nodejs-14_x; fetchElmDeps = pkgs.callPackage ./fetchElmDeps.nix { }; diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix index 516cdee708d3b..c28ef88ce9338 100644 --- a/pkgs/development/compilers/gcc/4.9/default.nix +++ b/pkgs/development/compilers/gcc/4.9/default.nix @@ -147,7 +147,7 @@ stdenv.mkDerivation ({ hardeningDisable = [ "format" "pie" ]; - # When targetting darwin, libgcc_ext.10.{4,5}.dylib are created as + # When targeting darwin, libgcc_ext.10.{4,5}.dylib are created as # MH_DYLIB_STUB files, which install_name_tool can't change, so we # get a cycle between $out and $lib. outputs = if langJava || langGo || targetPlatform.isDarwin then ["out" "man" "info"] diff --git a/pkgs/development/compilers/graalvm/community-edition/mkGraal.nix b/pkgs/development/compilers/graalvm/community-edition/mkGraal.nix index 86de8aae2ef09..a06cb310e1087 100644 --- a/pkgs/development/compilers/graalvm/community-edition/mkGraal.nix +++ b/pkgs/development/compilers/graalvm/community-edition/mkGraal.nix @@ -16,7 +16,7 @@ # }; # } config - # GraalVM version that will be used unless overriden by `config..version` + # GraalVM version that will be used unless overridden by `config..version` , defaultVersion # Java version used by GraalVM , javaVersion diff --git a/pkgs/development/haskell-modules/lib/compose.nix b/pkgs/development/haskell-modules/lib/compose.nix index 5f7e127c0b4df..6d0e91e3339b7 100644 --- a/pkgs/development/haskell-modules/lib/compose.nix +++ b/pkgs/development/haskell-modules/lib/compose.nix @@ -355,7 +355,7 @@ rec { */ triggerRebuild = i: overrideCabal (drv: { postUnpack = ": trigger rebuild ${toString i}"; }); - /* Override the sources for the package and optionaly the version. + /* Override the sources for the package and optionally the version. This also takes of removing editedCabalFile. */ overrideSrc = { src, version ? null }: drv: diff --git a/pkgs/development/haskell-modules/lib/default.nix b/pkgs/development/haskell-modules/lib/default.nix index 581e9aa1016f2..ffd9ac0578906 100644 --- a/pkgs/development/haskell-modules/lib/default.nix +++ b/pkgs/development/haskell-modules/lib/default.nix @@ -279,7 +279,7 @@ rec { */ triggerRebuild = drv: i: compose.triggerRebuild i drv; - /* Override the sources for the package and optionaly the version. + /* Override the sources for the package and optionally the version. This also takes of removing editedCabalFile. */ overrideSrc = drv: src: compose.overrideSrc src drv; diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix index 3dd0194862278..8bf78dadc8ee4 100644 --- a/pkgs/development/haskell-modules/make-package-set.nix +++ b/pkgs/development/haskell-modules/make-package-set.nix @@ -33,7 +33,7 @@ # `self` as second, and returns a set of haskell packages package-set -, # The final, fully overriden package set usable with the nixpkgs fixpoint +, # The final, fully overridden package set usable with the nixpkgs fixpoint # overriding functionality extensible-self }: @@ -73,7 +73,7 @@ let mkDerivation = makeOverridable mkDerivationImpl; - # manualArgs are the arguments that were explictly passed to `callPackage`, like: + # manualArgs are the arguments that were explicitly passed to `callPackage`, like: # # callPackage foo { bar = null; }; # diff --git a/pkgs/development/interpreters/lua-5/default.nix b/pkgs/development/interpreters/lua-5/default.nix index 933f42eb26e31..ac903545b0f32 100644 --- a/pkgs/development/interpreters/lua-5/default.nix +++ b/pkgs/development/interpreters/lua-5/default.nix @@ -31,7 +31,7 @@ let generatedPackages = if (builtins.pathExists ../../lua-modules/generated-packages.nix) then (final: prev: callPackage ../../lua-modules/generated-packages.nix { inherit (final) callPackage; } final prev) else (final: prev: {}); - overridenPackages = callPackage ../../lua-modules/overrides.nix { }; + overriddenPackages = callPackage ../../lua-modules/overrides.nix { }; otherSplices = { selfBuildBuild = luaOnBuildForBuild.pkgs; @@ -44,7 +44,7 @@ let extra = spliced0: {}; extensions = lib.composeManyExtensions [ generatedPackages - overridenPackages + overriddenPackages overrides ]; in lib.makeScopeWithSplicing diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix index 8f0cd0e6a226d..dff3e4101d550 100644 --- a/pkgs/development/interpreters/octave/default.nix +++ b/pkgs/development/interpreters/octave/default.nix @@ -29,7 +29,7 @@ , blas, lapack # These two should use the same lapack and blas as the above , qrupdate, arpack, suitesparse ? null -# If set to true, the above 5 deps are overriden to use the blas and lapack +# If set to true, the above 5 deps are overridden to use the blas and lapack # with 64 bit indexes support. If all are not compatible, the build will fail. , use64BitIdx ? false , libwebp @@ -82,7 +82,7 @@ let ; qrupdate' = qrupdate.override { # If use64BitIdx is false, this override doesn't evaluate to a new - # derivation, as blas and lapack are not overriden. + # derivation, as blas and lapack are not overridden. blas = blas'; lapack = lapack'; }; diff --git a/pkgs/development/interpreters/python/python-packages-base.nix b/pkgs/development/interpreters/python/python-packages-base.nix index 81ad194a25c7c..92b0a456b0779 100644 --- a/pkgs/development/interpreters/python/python-packages-base.nix +++ b/pkgs/development/interpreters/python/python-packages-base.nix @@ -12,7 +12,7 @@ let namePrefix = python.libPrefix + "-"; - # Derivations built with `buildPythonPackage` can already be overriden with `override`, `overrideAttrs`, and `overrideDerivation`. + # Derivations built with `buildPythonPackage` can already be overridden with `override`, `overrideAttrs`, and `overrideDerivation`. # This function introduces `overridePythonAttrs` and it overrides the call to `buildPythonPackage`. makeOverridablePythonPackage = f: origArgs: let diff --git a/pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py b/pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py index 07a72a3f2eca1..feb44bef0790c 100755 --- a/pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py +++ b/pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py @@ -248,7 +248,7 @@ FORMATS = { } def _determine_fetcher(text): - # Count occurences of fetchers. + # Count occurrences of fetchers. nfetchers = sum(text.count('src = {}'.format(fetcher)) for fetcher in FETCHERS.keys()) if nfetchers == 0: raise ValueError("no fetcher.") diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index 12f46af022fc6..e444dcb806161 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -32,7 +32,7 @@ assert stdenv.isLinux -> util-linuxMinimal != null; # $out/bin/gtester-report' to postInstall if this is solved /* * Use --enable-installed-tests for GNOME-related packages, - and use them as a separately installed tests runned by Hydra + and use them as a separately installed tests run by Hydra (they should test an already installed package) https://wiki.gnome.org/GnomeGoals/InstalledTests * Support org.freedesktop.Application, including D-Bus activation from desktop files diff --git a/pkgs/development/libraries/gobject-introspection/wrapper.nix b/pkgs/development/libraries/gobject-introspection/wrapper.nix index 6ac3224b2d565..53b1a35f82125 100644 --- a/pkgs/development/libraries/gobject-introspection/wrapper.nix +++ b/pkgs/development/libraries/gobject-introspection/wrapper.nix @@ -19,24 +19,24 @@ let # passing this stdenv to `targetPackages...` breaks due to splicing not working in `.override`` argsForTarget = builtins.removeAttrs args [ "stdenv" ]; - overridenUnwrappedGir = gobject-introspection-unwrapped.override args; + overriddenUnwrappedGir = gobject-introspection-unwrapped.override args; # if we have targetPackages.gobject-introspection then propagate that overridenTargetUnwrappedGir = if targetPackages ? gobject-introspection-unwrapped then targetPackages.gobject-introspection-unwrapped.override argsForTarget - else overridenUnwrappedGir; + else overriddenUnwrappedGir; in # wrap both pkgsCrossX.buildPackages.gobject-introspection and {pkgs,pkgsSomethingExecutableOnBuildSystem).buildPackages.gobject-introspection if (!stdenv.hostPlatform.canExecute stdenv.targetPlatform) && stdenv.targetPlatform.emulatorAvailable buildPackages then - overridenUnwrappedGir.overrideAttrs + overriddenUnwrappedGir.overrideAttrs (previousAttrs: { pname = "gobject-introspection-wrapped"; passthru = previousAttrs.passthru // { - unwrapped = overridenUnwrappedGir; + unwrapped = overriddenUnwrappedGir; }; dontStrip = true; depsTargetTargetPropagated = [ overridenTargetUnwrappedGir ]; @@ -44,8 +44,8 @@ then eval fixupPhase ${lib.concatMapStrings (output: '' mkdir -p ${"$" + "${output}"} - ${lib.getExe buildPackages.xorg.lndir} ${overridenUnwrappedGir.${output}} ${"$" + "${output}"} - '') overridenUnwrappedGir.outputs} + ${lib.getExe buildPackages.xorg.lndir} ${overriddenUnwrappedGir.${output}} ${"$" + "${output}"} + '') overriddenUnwrappedGir.outputs} cp $dev/bin/g-ir-compiler $dev/bin/.g-ir-compiler-wrapped cp $dev/bin/g-ir-scanner $dev/bin/.g-ir-scanner-wrapped @@ -87,11 +87,11 @@ then ''; }) else - overridenUnwrappedGir.overrideAttrs (previousAttrs: + overriddenUnwrappedGir.overrideAttrs (previousAttrs: { pname = "gobject-introspection-wrapped"; passthru = previousAttrs.passthru // { - unwrapped = overridenUnwrappedGir; + unwrapped = overriddenUnwrappedGir; }; dontStrip = true; depsTargetTargetPropagated = [ overridenTargetUnwrappedGir ]; @@ -99,7 +99,7 @@ else eval fixupPhase ${lib.concatMapStrings (output: '' mkdir -p ${"$" + "${output}"} - ${lib.getExe buildPackages.xorg.lndir} ${overridenUnwrappedGir.${output}} ${"$" + "${output}"} - '') overridenUnwrappedGir.outputs} + ${lib.getExe buildPackages.xorg.lndir} ${overriddenUnwrappedGir.${output}} ${"$" + "${output}"} + '') overriddenUnwrappedGir.outputs} ''; }) diff --git a/pkgs/development/libraries/gstreamer/good/default.nix b/pkgs/development/libraries/gstreamer/good/default.nix index e7b72fc34e0cb..1cd9eed123c54 100644 --- a/pkgs/development/libraries/gstreamer/good/default.nix +++ b/pkgs/development/libraries/gstreamer/good/default.nix @@ -163,7 +163,7 @@ stdenv.mkDerivation rec { # fails 1 tests with "Unexpected critical/warning: g_object_set_is_valid_property: object class 'GstRtpStorage' has no property named ''" doCheck = false; - # must be explicitely set since 5590e365 + # must be explicitly set since 5590e365 dontWrapQtApps = true; meta = with lib; { diff --git a/pkgs/development/libraries/khronos-ocl-icd-loader/default.nix b/pkgs/development/libraries/khronos-ocl-icd-loader/default.nix index 8ff7b9332476b..37c007db20b4c 100644 --- a/pkgs/development/libraries/khronos-ocl-icd-loader/default.nix +++ b/pkgs/development/libraries/khronos-ocl-icd-loader/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { buildInputs = [ opencl-headers ]; meta = with lib; { - description = "Offical Khronos OpenCL ICD Loader"; + description = "Official Khronos OpenCL ICD Loader"; homepage = "https://github.com/KhronosGroup/OpenCL-ICD-Loader"; license = licenses.asl20; platforms = platforms.linux; diff --git a/pkgs/development/libraries/libcommuni/default.nix b/pkgs/development/libraries/libcommuni/default.nix index dd5472849fd9e..f7d064e0de384 100644 --- a/pkgs/development/libraries/libcommuni/default.nix +++ b/pkgs/development/libraries/libcommuni/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { dontUseQmakeConfigure = true; configureFlags = [ "-config" "release" ] - # Build mixes up dylibs/frameworks if one is not explicitely specified. + # Build mixes up dylibs/frameworks if one is not explicitly specified. ++ lib.optionals stdenv.isDarwin [ "-config" "qt_framework" ]; dontWrapQtApps = true; diff --git a/pkgs/development/libraries/ndn-cxx/default.nix b/pkgs/development/libraries/ndn-cxx/default.nix index 410ede638c06d..ee05d2606def8 100644 --- a/pkgs/development/libraries/ndn-cxx/default.nix +++ b/pkgs/development/libraries/ndn-cxx/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://named-data.net/"; - description = "A Named Data Neworking (NDN) or Content Centric Networking (CCN) abstraction"; + description = "A Named Data Networking (NDN) or Content Centric Networking (CCN) abstraction"; longDescription = '' ndn-cxx is a C++ library, implementing Named Data Networking (NDN) primitives that can be used to implement various NDN applications. diff --git a/pkgs/development/libraries/science/math/blas/default.nix b/pkgs/development/libraries/science/math/blas/default.nix index 84a4486b6e3aa..ed899a02aa783 100644 --- a/pkgs/development/libraries/science/math/blas/default.nix +++ b/pkgs/development/libraries/science/math/blas/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, cmake, gfortran -# Wether to build with ILP64 interface +# Whether to build with ILP64 interface , blas64 ? false }: diff --git a/pkgs/development/libraries/science/math/zn_poly/default.nix b/pkgs/development/libraries/science/math/zn_poly/default.nix index 3ec97e4a288e3..13344db9ebc34 100644 --- a/pkgs/development/libraries/science/math/zn_poly/default.nix +++ b/pkgs/development/libraries/science/math/zn_poly/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; - # Tuning (either autotuning or with hand-written paramters) is possible + # Tuning (either autotuning or with hand-written parameters) is possible # but not implemented here. # It seems buggy anyways (see homepage). buildFlags = [ "all" "${libbasename}${libext}" ]; diff --git a/pkgs/development/libraries/stargate-libcds/default.nix b/pkgs/development/libraries/stargate-libcds/default.nix index 409d9e820fce5..b74f19e1959a7 100644 --- a/pkgs/development/libraries/stargate-libcds/default.nix +++ b/pkgs/development/libraries/stargate-libcds/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { PLAT_FLAGS = lib.optionalString stdenv.isx86_64 "-mfpmath=sse -mssse3"; patches = [ - # Remove unecessary tests (valgrind, coverage) + # Remove unnecessary tests (valgrind, coverage) ./Makefile.patch # Fix for building on darwin diff --git a/pkgs/development/octave-modules/vibes/default.nix b/pkgs/development/octave-modules/vibes/default.nix index f60a5d7339a08..4d05a2c6893f7 100644 --- a/pkgs/development/octave-modules/vibes/default.nix +++ b/pkgs/development/octave-modules/vibes/default.nix @@ -29,7 +29,7 @@ buildOctavePackage rec { VIBes API that enables your program to communicate with the viewer in order to draw figures. This package integrates the VIBes API into Octave. The VIBes application is required for operation and must be installed - seperately. Data types from third-party interval arithmetic libraries for + separately. Data types from third-party interval arithmetic libraries for Octave are also supported. ''; # Marked this way until KarlJoad gets around to packaging the vibes program. diff --git a/pkgs/development/python-modules/backports_shutil_get_terminal_size/default.nix b/pkgs/development/python-modules/backports_shutil_get_terminal_size/default.nix index 7fd9bca3a7964..c6e92630e0067 100644 --- a/pkgs/development/python-modules/backports_shutil_get_terminal_size/default.nix +++ b/pkgs/development/python-modules/backports_shutil_get_terminal_size/default.nix @@ -9,7 +9,7 @@ if !(pythonOlder "3.3") then null else buildPythonPackage { pname = "backports.shutil_get_terminal_size"; version = "unstable-2016-02-21"; - # there have been numerous fixes commited since the initial release. + # there have been numerous fixes committed since the initial release. # Most notably fixing a problem where the backport would always return # terminal size 0. See https://trac.sagemath.org/ticket/25320#comment:5. # Unfortunately the maintainer seems inactive and has not responded to diff --git a/pkgs/development/python-modules/beancount_docverif/default.nix b/pkgs/development/python-modules/beancount_docverif/default.nix index b39b52970f01f..761da80b3ba57 100644 --- a/pkgs/development/python-modules/beancount_docverif/default.nix +++ b/pkgs/development/python-modules/beancount_docverif/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { Docverif is the "Document Verification" plugin for beancount, fulfilling the following functions: - Require that every transaction touching an account have an accompanying document on disk. - - Explictly declare the name of a document accompanying a transaction. + - Explicitly declare the name of a document accompanying a transaction. - Explicitly declare that a transaction is expected not to have an accompanying document. - Look for an "implicit" PDF document matching transaction data. - Associate (and require) a document with any type of entry, including open entries themselves. diff --git a/pkgs/development/python-modules/buildbot/plugins.nix b/pkgs/development/python-modules/buildbot/plugins.nix index 4aee37e102cac..ee36e10531f1f 100644 --- a/pkgs/development/python-modules/buildbot/plugins.nix +++ b/pkgs/development/python-modules/buildbot/plugins.nix @@ -10,7 +10,7 @@ sha256 = "sha256-t4xHfox6h5PY4+phdCQbClHd77+WfpUWErMZCEcMxu0="; }; - # Remove unneccessary circular dependency on buildbot + # Remove unnecessary circular dependency on buildbot postPatch = '' sed -i "s/'buildbot'//" setup.py ''; diff --git a/pkgs/development/python-modules/ignite/default.nix b/pkgs/development/python-modules/ignite/default.nix index 5ab12b4ec6673..439d57ff79861 100644 --- a/pkgs/development/python-modules/ignite/default.nix +++ b/pkgs/development/python-modules/ignite/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook matplotlib mock pytest-xdist torchvision ]; propagatedBuildInputs = [ packaging torch scikit-learn tqdm ]; - # runs succesfully in 3.9, however, async isn't correctly closed so it will fail after test suite. + # runs successfully in 3.9, however, async isn't correctly closed so it will fail after test suite. doCheck = pythonOlder "3.9"; # Some packages are not in NixPkgs; other tests try to build distributed diff --git a/pkgs/development/python-modules/mezzanine/default.nix b/pkgs/development/python-modules/mezzanine/default.nix index 2c5346e5763c3..d9e537b057df0 100644 --- a/pkgs/development/python-modules/mezzanine/default.nix +++ b/pkgs/development/python-modules/mezzanine/default.nix @@ -55,7 +55,7 @@ buildPythonPackage rec { # Tests Fail Due to Syntax Warning, Fixed for v3.1.11+ doCheck = false; - # sed calls will be unecessary in v3.1.11+ + # sed calls will be unnecessary in v3.1.11+ preConfigure = '' sed -i 's/==/>=/' setup.py ''; diff --git a/pkgs/development/python-modules/mouseinfo/default.nix b/pkgs/development/python-modules/mouseinfo/default.nix index 683062a790f9d..6f5f5cbe86cb9 100644 --- a/pkgs/development/python-modules/mouseinfo/default.nix +++ b/pkgs/development/python-modules/mouseinfo/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { ]; doCheck = false; - # Mouseinfo requires a X server running to import succesfully + # Mouseinfo requires a X server running to import successfully # pythonImportsCheck = [ "mouseinfo" ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/stone/default.nix b/pkgs/development/python-modules/stone/default.nix index 55f74b58fb520..f404beb4485c9 100644 --- a/pkgs/development/python-modules/stone/default.nix +++ b/pkgs/development/python-modules/stone/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook mock ]; # try to import from `test` directory, which is exported by the python interpreter - # and cannot be overriden without removing some py3 to py2 support + # and cannot be overridden without removing some py3 to py2 support disabledTestPaths = [ "test/test_tsd_types.py" "test/test_js_client.py" diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index 236570be0dcfc..ccc4430ca83cf 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -14,7 +14,7 @@ # gems that don't behave correctly, fixes are already provided in the form of # derivations. # -# This seperates "what to build" (the exact gem versions) from "how to build" +# This separates "what to build" (the exact gem versions) from "how to build" # (to make gems behave if necessary). { lib, fetchurl, writeScript, ruby, libkrb5, libxml2, libxslt, python2, stdenv, which diff --git a/pkgs/development/tools/continuous-integration/github-runner/default.nix b/pkgs/development/tools/continuous-integration/github-runner/default.nix index 3a4f0de8170fb..ab762a13e99fc 100644 --- a/pkgs/development/tools/continuous-integration/github-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/github-runner/default.nix @@ -325,7 +325,7 @@ stdenv.mkDerivation rec { # Script to create deps.nix file for dotnet dependencies. Run it with # $(nix-build -A github-runner.passthru.createDepsFile)/bin/create-deps-file # - # Default output path is /tmp/${pname}-deps.nix, but can be overriden with cli argument. + # Default output path is /tmp/${pname}-deps.nix, but can be overridden with cli argument. # # Inspired by passthru.fetch-deps in pkgs/build-support/build-dotnet-module/default.nix passthru.createDepsFile = writeShellApplication { diff --git a/pkgs/development/tools/misc/binutils/2.38/default.nix b/pkgs/development/tools/misc/binutils/2.38/default.nix index 820f667bf9d0f..9fb0a35dbf467 100644 --- a/pkgs/development/tools/misc/binutils/2.38/default.nix +++ b/pkgs/development/tools/misc/binutils/2.38/default.nix @@ -171,7 +171,7 @@ stdenv.mkDerivation { # Turn on --enable-new-dtags by default to make the linker set # RUNPATH instead of RPATH on binaries. This is important because - # RUNPATH can be overriden using LD_LIBRARY_PATH at runtime. + # RUNPATH can be overridden using LD_LIBRARY_PATH at runtime. "--enable-new-dtags" # force target prefix. Some versions of binutils will make it empty if diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix index 85d52030eafb9..c1c7da5744440 100644 --- a/pkgs/development/tools/misc/binutils/default.nix +++ b/pkgs/development/tools/misc/binutils/default.nix @@ -167,7 +167,7 @@ stdenv.mkDerivation { # Turn on --enable-new-dtags by default to make the linker set # RUNPATH instead of RPATH on binaries. This is important because - # RUNPATH can be overriden using LD_LIBRARY_PATH at runtime. + # RUNPATH can be overridden using LD_LIBRARY_PATH at runtime. "--enable-new-dtags" # force target prefix. Some versions of binutils will make it empty if diff --git a/pkgs/development/tools/misc/dura/default.nix b/pkgs/development/tools/misc/dura/default.nix index ab88298f45a34..eba3f16c36594 100644 --- a/pkgs/development/tools/misc/dura/default.nix +++ b/pkgs/development/tools/misc/dura/default.nix @@ -30,7 +30,7 @@ rustPlatform.buildRustPackage rec { ]; meta = with lib; { - description = "A background process that saves uncommited changes on git"; + description = "A background process that saves uncommitted changes on git"; longDescription = '' Dura is a background process that watches your Git repositories and commits your uncommitted changes without impacting HEAD, the current diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/default.nix b/pkgs/development/tools/poetry2nix/poetry2nix/default.nix index 87a928000c1a2..4de0b54ac1b93 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/default.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/default.nix @@ -482,7 +482,7 @@ lib.makeScope pkgs.newScope (self: { /* The default list of poetry2nix override overlays - Can be overriden by calling defaultPoetryOverrides.overrideOverlay which takes an overlay function + Can be overridden by calling defaultPoetryOverrides.overrideOverlay which takes an overlay function */ defaultPoetryOverrides = self.mkDefaultPoetryOverrides (import ./overrides { inherit pkgs lib poetryLib; }); diff --git a/pkgs/development/tools/tapview/default.nix b/pkgs/development/tools/tapview/default.nix index 966df4bed65e5..19c1113c5cd40 100644 --- a/pkgs/development/tools/tapview/default.nix +++ b/pkgs/development/tools/tapview/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-inrxICNglZU/tup+YnHaDiVss32K2OXht/7f8lOZI4g="; }; - # Remove unecessary `echo` checks: `/bin/echo` fails, and `echo -n` works as expected. + # Remove unnecessary `echo` checks: `/bin/echo` fails, and `echo -n` works as expected. patches = [ ./dont_check_echo.patch ]; makeFlags = [ "prefix=$(out)" ]; diff --git a/pkgs/games/gl-gsync-demo/default.nix b/pkgs/games/gl-gsync-demo/default.nix index a4b30c572a00d..968d4d5e4a3da 100644 --- a/pkgs/games/gl-gsync-demo/default.nix +++ b/pkgs/games/gl-gsync-demo/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ atemu ]; description = "A very basic OpenGL demo for testing NVIDIA's G-SYNC technology on Linux"; longDescription = '' - The demo simply draws a vertical bar moving accross the screen at constant speed, but deliberately rendered at a variable frame rate. + The demo simply draws a vertical bar moving across the screen at constant speed, but deliberately rendered at a variable frame rate. The min and max frame rates can be manually changed at runtime, by step of 10 fps and with a min of 10 fps. diff --git a/pkgs/games/openra/default.nix b/pkgs/games/openra/default.nix index d996630914740..76454f69e4b39 100644 --- a/pkgs/games/openra/default.nix +++ b/pkgs/games/openra/default.nix @@ -13,7 +13,7 @@ with pkgs.lib; let /* Building an engine or out-of-tree mod is very similar, but different enough not to be able to build them with the same package definition, - so instaed we define what is common between them in a seperate file. + so instaed we define what is common between them in a separate file. Although `callPackage` could be used, it would require undoing `makeOverridable`, because `common.nix` does not define a package, but just an attribute set, diff --git a/pkgs/games/openra/packages.nix b/pkgs/games/openra/packages.nix index e98ebcaee44fb..5ee78fe2b8ff1 100644 --- a/pkgs/games/openra/packages.nix +++ b/pkgs/games/openra/packages.nix @@ -3,7 +3,7 @@ pkgs: let /* Building an engine or out-of-tree mod is very similar, but different enough not to be able to build them with the same package definition, - so instaed we define what is common between them in a seperate file. + so instaed we define what is common between them in a separate file. Although `callPackage` could be used, it would require undoing `makeOverridable`, because `common.nix` does not define a package, but just an attribute set, diff --git a/pkgs/misc/screensavers/alock/default.nix b/pkgs/misc/screensavers/alock/default.nix index 74155f43c2b88..46af4b303dd6d 100644 --- a/pkgs/misc/screensavers/alock/default.nix +++ b/pkgs/misc/screensavers/alock/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { description = "Simple screen lock application for X server"; longDescription = '' alock locks the X server until the user enters a password - via the keyboard. If the authentification was successful + via the keyboard. If the authentication was successful the X server is unlocked and the user can continue to work. alock does not provide any fancy animations like xlock or diff --git a/pkgs/misc/tmux-plugins/default.nix b/pkgs/misc/tmux-plugins/default.nix index 25a84e4b30f9f..2d209ce6a18b1 100644 --- a/pkgs/misc/tmux-plugins/default.nix +++ b/pkgs/misc/tmux-plugins/default.nix @@ -101,7 +101,7 @@ in rec { }; meta = { homepage = "https://github.com/tmux-plugins/tmux-continuum"; - description = "continous saving of tmux environment"; + description = "continuous saving of tmux environment"; longDescription = '' Features: diff --git a/pkgs/os-specific/darwin/yabai/default.nix b/pkgs/os-specific/darwin/yabai/default.nix index 20aefcb882fd3..2c7114c76af75 100644 --- a/pkgs/os-specific/darwin/yabai/default.nix +++ b/pkgs/os-specific/darwin/yabai/default.nix @@ -136,7 +136,7 @@ in ''; # Defining this here exposes it as a passthru attribute, which is useful because it allows us to run `builtins.hashFile` on it in pure-eval mode. - # With that we can programatically generate an `/etc/sudoers.d` entry which disables the password requirement, so that a user-agent can run it at login. + # With that we can programmatically generate an `/etc/sudoers.d` entry which disables the password requirement, so that a user-agent can run it at login. loadScriptingAddition = writeShellScript "yabai-load-sa" '' # For whatever reason the regular commands to load the scripting addition do not work, yabai will throw an error. # The installation command mutably installs binaries to '/System', but then fails to start them. Manually running diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 0178cd7d6d45a..91746b9f10903 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -524,7 +524,7 @@ stdenv.mkDerivation { ]; preConfigure = let - # A list of all the runtime binaries that the systemd exectuables, tests and libraries are referencing in their source code, scripts and unit files. + # A list of all the runtime binaries that the systemd executables, tests and libraries are referencing in their source code, scripts and unit files. # As soon as a dependency isn't required anymore we should remove it from the list. The `where` attribute for each of the replacement patterns must be exhaustive. If another (unhandled) case is found in the source code the build fails with an error message. binaryReplacements = [ { search = "/usr/bin/getent"; replacement = "${getent}/bin/getent"; where = [ "src/nspawn/nspawn-setuid.c" ]; } @@ -578,7 +578,7 @@ stdenv.mkDerivation { "src/import/import-tar.c" ]; ignore = [ - # occurences here refer to the tar sub command + # occurrences here refer to the tar sub command "src/sysupdate/sysupdate-resource.c" "src/sysupdate/sysupdate-transfer.c" "src/import/pull.c" diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index 3c0c6d86ef9a2..23fd07d3ba00f 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -46,7 +46,7 @@ in { in your NixOS config. WARNING: if you were on Nextcloud 22 on NixOS 22.05 you have to upgrade to Nextcloud 23 - first on 22.05 because Nextcloud doesn't support upgrades accross multiple major versions! + first on 22.05 because Nextcloud doesn't support upgrades across multiple major versions! ''; nextcloud24 = generic { diff --git a/pkgs/servers/nfd/default.nix b/pkgs/servers/nfd/default.nix index 3eda5e2b25dd2..08309213aaafe 100644 --- a/pkgs/servers/nfd/default.nix +++ b/pkgs/servers/nfd/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://named-data.net/"; - description = "Named Data Neworking (NDN) Forwarding Daemon"; + description = "Named Data Networking (NDN) Forwarding Daemon"; license = licenses.gpl3Plus; platforms = platforms.unix; maintainers = [ lib.maintainers.bertof ]; diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index a8415b558e471..0d544ac17b229 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -192,7 +192,7 @@ let # Note: the duplication of executables is about 4MB size. # So a nicer solution was patching postgresql to allow setting the - # libdir explicitely. + # libdir explicitly. postBuild = '' mkdir -p $out/bin rm $out/bin/{pg_config,postgres,pg_ctl} diff --git a/pkgs/servers/web-apps/netbox/default.nix b/pkgs/servers/web-apps/netbox/default.nix index 6e48ccd59e397..a30ceae722738 100644 --- a/pkgs/servers/web-apps/netbox/default.nix +++ b/pkgs/servers/web-apps/netbox/default.nix @@ -33,7 +33,7 @@ py.pkgs.buildPythonApplication rec { # Allow setting the STATIC_ROOT from within the configuration and setting a custom redis URL ./config.patch ./graphql-3_2_0.patch - # fix compatiblity ith django 4.1 + # fix compatibility ith django 4.1 (fetchpatch { url = "https://github.com/netbox-community/netbox/pull/10341/commits/ce6bf9e5c1bc08edc80f6ea1e55cf1318ae6e14b.patch"; sha256 = "sha256-aCPQp6k7Zwga29euASAd+f13hIcZnIUu3RPAzNPqgxc="; diff --git a/pkgs/stdenv/generic/check-meta.nix b/pkgs/stdenv/generic/check-meta.nix index 95d1422b127e0..56390dc3627bc 100644 --- a/pkgs/stdenv/generic/check-meta.nix +++ b/pkgs/stdenv/generic/check-meta.nix @@ -73,7 +73,7 @@ let allowUnfreePredicate = config.allowUnfreePredicate or (x: false); # Check whether unfree packages are allowed and if not, whether the - # package has an unfree license and is not explicitely allowed by the + # package has an unfree license and is not explicitly allowed by the # `allowUnfreePredicate` function. hasDeniedUnfreeLicense = attrs: hasUnfreeLicense attrs && diff --git a/pkgs/tools/admin/azure-cli/default.nix b/pkgs/tools/admin/azure-cli/default.nix index 4237a5a412a25..6960f4ddb3502 100644 --- a/pkgs/tools/admin/azure-cli/default.nix +++ b/pkgs/tools/admin/azure-cli/default.nix @@ -12,7 +12,7 @@ let sha256 = "sha256-Y1P+cTOK7NbV7k9rg38vE7EPuZQo88IQW3IYYou8ZOI="; }; - # put packages that needs to be overriden in the py package scope + # put packages that needs to be overridden in the py package scope py = import ./python-packages.nix { inherit stdenv lib src version python3; }; diff --git a/pkgs/tools/admin/pgadmin/default.nix b/pkgs/tools/admin/pgadmin/default.nix index 35dbabed2b7bc..b2e21a045ce05 100644 --- a/pkgs/tools/admin/pgadmin/default.nix +++ b/pkgs/tools/admin/pgadmin/default.nix @@ -181,7 +181,7 @@ pythonPackages.buildPythonApplication rec { # checks will be run through nixos/tests doCheck = false; - # speaklater3 is seperate because when passing buildDeps + # speaklater3 is separate because when passing buildDeps # to the test, it fails there due to a collision with speaklater propagatedBuildInputs = buildDeps ++ [ pythonPackages.speaklater3 ]; diff --git a/pkgs/tools/misc/fpart/default.nix b/pkgs/tools/misc/fpart/default.nix index 3158bec6d2051..5437345246498 100644 --- a/pkgs/tools/misc/fpart/default.nix +++ b/pkgs/tools/misc/fpart/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { Fpart also includes a live mode, which allows it to crawl very large filesystems and produce partitions in live. Hooks are available to act on - those partitions (e.g. immediatly start a transfer using rsync(1)) + those partitions (e.g. immediately start a transfer using rsync(1)) without having to wait for the filesystem traversal job to be finished. Used this way, fpart can be seen as a powerful data migration tool. ''; diff --git a/pkgs/tools/misc/librespeed-cli/default.nix b/pkgs/tools/misc/librespeed-cli/default.nix index fba0942dab522..60fee9b5f1536 100644 --- a/pkgs/tools/misc/librespeed-cli/default.nix +++ b/pkgs/tools/misc/librespeed-cli/default.nix @@ -16,7 +16,7 @@ buildGoModule rec { vendorSha256 = "sha256-psZyyySpY06J+ji+9uHUtX7Ks1hzZC3zINszYP75NfQ="; - # Tests have additonal requirements + # Tests have additional requirements doCheck = false; meta = with lib; { diff --git a/pkgs/tools/misc/sqlite3-to-mysql/default.nix b/pkgs/tools/misc/sqlite3-to-mysql/default.nix index cb16a93dd207c..176f97275f428 100644 --- a/pkgs/tools/misc/sqlite3-to-mysql/default.nix +++ b/pkgs/tools/misc/sqlite3-to-mysql/default.nix @@ -35,7 +35,7 @@ python3Packages.buildPythonApplication rec { # tests require a mysql server instance doCheck = false; - # run package tests as a seperate nixos test + # run package tests as a separate nixos test passthru.tests = { nixosTest = nixosTests.sqlite3-to-mysql; }; diff --git a/pkgs/tools/networking/ipfetch/default.nix b/pkgs/tools/networking/ipfetch/default.nix index 29a37a1004dc0..b9b675366e56e 100755 --- a/pkgs/tools/networking/ipfetch/default.nix +++ b/pkgs/tools/networking/ipfetch/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "Neofetch but for ip adresses"; + description = "Neofetch but for ip addresses"; license = licenses.gpl3Only; platforms = platforms.all; maintainers = with maintainers; [ annaaurora ]; diff --git a/pkgs/tools/networking/ndn-tools/default.nix b/pkgs/tools/networking/ndn-tools/default.nix index 1b693f21f62eb..05804ab29c000 100644 --- a/pkgs/tools/networking/ndn-tools/default.nix +++ b/pkgs/tools/networking/ndn-tools/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://named-data.net/"; - description = "Named Data Neworking (NDN) Essential Tools"; + description = "Named Data Networking (NDN) Essential Tools"; license = licenses.gpl3Plus; platforms = platforms.unix; maintainers = with maintainers; [ bertof ]; diff --git a/pkgs/tools/typesetting/docbook2odf/default.nix b/pkgs/tools/typesetting/docbook2odf/default.nix index 0b7b67f69b591..e17acac3dd96e 100644 --- a/pkgs/tools/typesetting/docbook2odf/default.nix +++ b/pkgs/tools/typesetting/docbook2odf/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Convert DocBook to OpenDocument Format (ODF)"; longDescription = '' - Docbook2odf is a toolkit that automaticaly converts DocBook to OASIS + Docbook2odf is a toolkit that automatically converts DocBook to OASIS OpenDocument (ODF, the ISO standardized format used for texts, spreadsheets and presentations). Conversion is based on a XSLT which makes it easy to convert DocBook->ODF, ODT, ODS and ODP as all these diff --git a/pkgs/tools/wayland/wev/default.nix b/pkgs/tools/wayland/wev/default.nix index 293a440fcc0fd..51b763d6dfe62 100644 --- a/pkgs/tools/wayland/wev/default.nix +++ b/pkgs/tools/wayland/wev/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { homepage = "https://git.sr.ht/~sircmpwn/wev"; description = "Wayland event viewer"; longDescription = '' - This is a tool for debugging events on a Wayland window, analagous to the + This is a tool for debugging events on a Wayland window, analogous to the X11 tool xev. ''; license = licenses.mit; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 357e0816cce7a..3e1ffd2b4c372 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4412,7 +4412,7 @@ with pkgs; extrude = callPackage ../tools/security/extrude { }; fastly = callPackage ../misc/fastly { - # If buildGoModule is overriden, provide a matching version of the go attribute + # If buildGoModule is overridden, provide a matching version of the go attribute }; f2 = callPackage ../tools/misc/f2 {}; @@ -14566,7 +14566,7 @@ with pkgs; fstar = callPackage ../development/compilers/fstar { # Work around while compatibility with ppxlib >= 0.26 is unavailable - # Should be removed when a fix is availaible + # Should be removed when a fix is available # See https://github.com/FStarLang/FStar/issues/2681 ocamlPackages = ocamlPackages.overrideScope' (self: super: { diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix index 0ac3ae8b43392..ed7580046ef3c 100644 --- a/pkgs/top-level/emacs-packages.nix +++ b/pkgs/top-level/emacs-packages.nix @@ -71,7 +71,7 @@ in makeScope pkgs'.newScope (self: makeOverridable ({ // manualPackages // { inherit manualPackages; } // { - # Propagate overriden scope + # Propagate overridden scope emacs = emacs'.overrideAttrs(old: { passthru = (old.passthru or {}) // { pkgs = dontRecurseIntoAttrs self; diff --git a/pkgs/top-level/gnuradio-packages.nix b/pkgs/top-level/gnuradio-packages.nix index 1cd2c93da773d..7fc3c48606550 100644 --- a/pkgs/top-level/gnuradio-packages.nix +++ b/pkgs/top-level/gnuradio-packages.nix @@ -16,7 +16,7 @@ let callPackage = self.newScope ({ inherit (gnuradio) - # Packages that are potentially overriden and used as deps here. + # Packages that are potentially overridden and used as deps here. boost volk ; diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 53f29b00ac5c7..df2167b990777 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -67,7 +67,7 @@ lib.makeScope pkgs.newScope (self: with self; { # source, based on the php version. # # Name passed is the name of the extension and is automatically used - # to add the configureFlag "--enable-${name}", which can be overriden. + # to add the configureFlag "--enable-${name}", which can be overridden. # # Build inputs is used for extra deps that may be needed. And zendExtension # will mark the extension as a zend extension or not. -- cgit 1.4.1 From e89f6ffce28ade868e6460206858eaad2d1ee8bd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 18 Dec 2022 05:24:11 +0000 Subject: python310Packages.sphinxcontrib-katex: 0.9.0 -> 0.9.3 --- pkgs/development/python-modules/sphinxcontrib-katex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/sphinxcontrib-katex/default.nix b/pkgs/development/python-modules/sphinxcontrib-katex/default.nix index 54ef5bac8b7b0..fd322da16b103 100644 --- a/pkgs/development/python-modules/sphinxcontrib-katex/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-katex/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "sphinxcontrib-katex"; - version = "0.9.0"; + version = "0.9.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-HFs1+9tWl1D5VWY14dPCk+Ewv+ubedhd9DcCSrPQZnQ="; + hash = "sha256-6IUTUc4HOK2e++3qMfT2MVm+cBnfVyohSiyROtiRGzI="; }; propagatedBuildInputs = [ -- cgit 1.4.1 From 1c872e198a3d4411e016087111468e8eff883f29 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 18 Dec 2022 08:00:33 +0000 Subject: python310Packages.awacs: 2.2.0 -> 2.3.0 --- pkgs/development/python-modules/awacs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/awacs/default.nix b/pkgs/development/python-modules/awacs/default.nix index 38ca2a11563c1..666e31cc6fdf6 100644 --- a/pkgs/development/python-modules/awacs/default.nix +++ b/pkgs/development/python-modules/awacs/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "awacs"; - version = "2.2.0"; + version = "2.3.0"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-zWRQHxjHogmSKSqnvQLJCdoilkOlJ07p00lN+U46WkU="; + hash = "sha256-0tizZWcHe1qbLxpXS/IngExaFFUHZyXXlksWcNL/vEw="; }; propagatedBuildInputs = lib.lists.optionals (pythonOlder "3.8") [ -- cgit 1.4.1 From d6dff82270847812a21a5160c87167d6c924cd44 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 18 Dec 2022 08:14:58 +0000 Subject: tectonic: 0.11.0 -> 0.12.0 --- pkgs/tools/typesetting/tectonic/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/tools/typesetting/tectonic/default.nix b/pkgs/tools/typesetting/tectonic/default.nix index 0eaf307591fd4..69852885c73bc 100644 --- a/pkgs/tools/typesetting/tectonic/default.nix +++ b/pkgs/tools/typesetting/tectonic/default.nix @@ -14,17 +14,17 @@ rustPlatform.buildRustPackage rec { pname = "tectonic"; - version = "0.11.0"; + version = "0.12.0"; src = fetchFromGitHub { owner = "tectonic-typesetting"; repo = "tectonic"; rev = "tectonic@${version}"; fetchSubmodules = true; - sha256 = "tBX737Yv4TvDo64cDYuALX61vzKjhz6PTMXQhWc5S/I="; + sha256 = "sha256-m2wBZNaepad4eaT/1DTjzAYrDX2wH/7wMfdzPWHQOLI="; }; - cargoSha256 = "awDVjJLwgpSMbwptmLhczaxB5HqvsdvEOUsLYb/zTUc="; + cargoSha256 = "sha256-pMqwWWmPxJZbJavxSVfjjRd7u9fI2AUZRjHF5SxxqoU="; nativeBuildInputs = [ pkg-config makeBinaryWrapper ]; -- cgit 1.4.1 From 2890f92ac2ef3ffb90df65c01a0d9acb412ef5f5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 18 Dec 2022 10:15:13 +0100 Subject: python310Packages.sphinxcontrib-katex: add changelog to meta --- pkgs/development/python-modules/sphinxcontrib-katex/default.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/sphinxcontrib-katex/default.nix b/pkgs/development/python-modules/sphinxcontrib-katex/default.nix index fd322da16b103..93dc258cc6b09 100644 --- a/pkgs/development/python-modules/sphinxcontrib-katex/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-katex/default.nix @@ -31,6 +31,7 @@ buildPythonPackage rec { meta = with lib; { description = "Sphinx extension using KaTeX to render math in HTML"; homepage = "https://github.com/hagenw/sphinxcontrib-katex"; + changelog = "https://github.com/hagenw/sphinxcontrib-katex/blob/v${version}/CHANGELOG.rst"; license = licenses.mit; maintainers = with maintainers; [ jluttine ]; }; -- cgit 1.4.1 From 5281010e0536792829967dcd75ceb5043798676a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 18 Dec 2022 10:22:18 +0100 Subject: python310Packages.duckdb-engine: add changelog to meta --- pkgs/development/python-modules/duckdb-engine/default.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/duckdb-engine/default.nix b/pkgs/development/python-modules/duckdb-engine/default.nix index f78097b09b79a..ff995c7ac1e50 100644 --- a/pkgs/development/python-modules/duckdb-engine/default.nix +++ b/pkgs/development/python-modules/duckdb-engine/default.nix @@ -57,6 +57,7 @@ buildPythonPackage rec { meta = with lib; { description = "SQLAlchemy driver for duckdb"; homepage = "https://github.com/Mause/duckdb_engine"; + changelog = "https://github.com/Mause/duckdb_engine/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ cpcloud ]; }; -- cgit 1.4.1 From f81e05bfe239fabeaafed819277caf9906df14fd Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 18 Dec 2022 10:25:52 +0100 Subject: python310Packages.awacs: add changelog to meta --- pkgs/development/python-modules/awacs/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/awacs/default.nix b/pkgs/development/python-modules/awacs/default.nix index 666e31cc6fdf6..54e7b32825feb 100644 --- a/pkgs/development/python-modules/awacs/default.nix +++ b/pkgs/development/python-modules/awacs/default.nix @@ -3,8 +3,6 @@ , fetchPypi , pythonOlder , python - - # python dependencies , typing-extensions }: @@ -27,12 +25,15 @@ buildPythonPackage rec { ${python.interpreter} -m unittest discover ''; - pythonImportsCheck = [ "awacs" ]; + pythonImportsCheck = [ + "awacs" + ]; meta = with lib; { description = "AWS Access Policy Language creation library"; - maintainers = with maintainers; [ jlesquembre ]; - license = licenses.bsd2; homepage = "https://github.com/cloudtools/awacs"; + changelog = "https://github.com/cloudtools/awacs/blob/${version}/CHANGELOG.md"; + license = licenses.bsd2; + maintainers = with maintainers; [ jlesquembre ]; }; } -- cgit 1.4.1 From 4248fd9d36e089b60a0021e8e04be798bbab72e4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 18 Dec 2022 10:40:54 +0100 Subject: python310Packages.pyoverkiz: 1.7.2 -> 1.7.3 Diff: https://github.com/iMicknl/python-overkiz-api/compare/refs/tags/v1.7.2...v1.7.3 Changelog: https://github.com/iMicknl/python-overkiz-api/releases/tag/v1.7.3 --- pkgs/development/python-modules/pyoverkiz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/pyoverkiz/default.nix b/pkgs/development/python-modules/pyoverkiz/default.nix index f2fd9ebdf226d..c82f5cd31d936 100644 --- a/pkgs/development/python-modules/pyoverkiz/default.nix +++ b/pkgs/development/python-modules/pyoverkiz/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "pyoverkiz"; - version = "1.7.2"; + version = "1.7.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "iMicknl"; repo = "python-overkiz-api"; rev = "refs/tags/v${version}"; - hash = "sha256-9/xdFwf+r2z166w/4VIj31MahDWmaMdWLfTGot+RoYQ="; + hash = "sha256-hmi6cOBHbcxzA10vQt6fxB8qHrr4My5JFmucV5QCUVg="; }; postPatch = '' -- cgit 1.4.1 From d2e224287dd4218ebd0c7ca1dddfe2f7c777db0b Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Sun, 18 Dec 2022 13:15:04 +0300 Subject: martin: 0.6.1 → 0.6.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/servers/geospatial/martin/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/servers/geospatial/martin/default.nix b/pkgs/servers/geospatial/martin/default.nix index 8525efe970576..a187259db69ee 100644 --- a/pkgs/servers/geospatial/martin/default.nix +++ b/pkgs/servers/geospatial/martin/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "martin"; - version = "0.6.1"; + version = "0.6.2"; src = fetchFromGitHub { owner = "maplibre"; repo = "martin"; rev = "v${version}"; - hash = "sha256-k5PekD+7cmsRa7qRAqQ1gKaX7i07whKTgeU6OM39BBE="; + hash = "sha256-+XD4w6W6dyKuTItLQS0P/waksIVsPXVswcrCQ7jpw90="; }; - cargoHash = "sha256-rcyR1/b9Ap6mQR9yFDdsDJSvGxVNQrpt+t3sRSV4oPU="; + cargoHash = "sha256-U3oNyMS4S44ybAtt1/b0AXDLiag41XWt9DT5mKLQzm8="; buildInputs = lib.optional stdenv.isDarwin Security; -- cgit 1.4.1 From fc39b5ecc8bb862026facc1c96b176ffda7adaaa Mon Sep 17 00:00:00 2001 From: Vincent Bernat Date: Sat, 3 Dec 2022 18:58:33 +0100 Subject: nginx: make global redirect vhost option accept exceptions By moving the return into a location directive, one can provide exceptions by adding locations. This is similar to what the forceSSL option does. --- .../from_md/release-notes/rl-2305.section.xml | 8 ++++++++ nixos/doc/manual/release-notes/rl-2305.section.md | 2 ++ .../modules/services/web-servers/nginx/default.nix | 4 +++- nixos/tests/all-tests.nix | 1 + nixos/tests/nginx-globalredirect.nix | 24 ++++++++++++++++++++++ pkgs/servers/http/nginx/generic.nix | 2 +- 6 files changed, 39 insertions(+), 2 deletions(-) create mode 100644 nixos/tests/nginx-globalredirect.nix (limited to 'pkgs') diff --git a/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml index 539bf00a36278..e0878e65a4885 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml @@ -268,6 +268,14 @@ dynamically. + + + Enabling global redirect in + services.nginx.virtualHosts now allows one + to add exceptions with the locations + option. + + Resilio sync secret keys can now be provided using a secrets diff --git a/nixos/doc/manual/release-notes/rl-2305.section.md b/nixos/doc/manual/release-notes/rl-2305.section.md index 6a6a34efbd145..e742570fc772f 100644 --- a/nixos/doc/manual/release-notes/rl-2305.section.md +++ b/nixos/doc/manual/release-notes/rl-2305.section.md @@ -78,6 +78,8 @@ In addition to numerous new and upgraded packages, this release has the followin - The new option `users.motdFile` allows configuring a Message Of The Day that can be updated dynamically. +- Enabling global redirect in `services.nginx.virtualHosts` now allows one to add exceptions with the `locations` option. + - Resilio sync secret keys can now be provided using a secrets file at runtime, preventing these secrets from ending up in the Nix store. - The `services.fwupd` module now allows arbitrary daemon settings to be configured in a structured manner ([`services.fwupd.daemonSettings`](#opt-services.fwupd.daemonSettings)). diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix index 85c76ed59d666..0b0e0de21df2b 100644 --- a/nixos/modules/services/web-servers/nginx/default.nix +++ b/nixos/modules/services/web-servers/nginx/default.nix @@ -318,7 +318,9 @@ let ${acmeLocation} ${optionalString (vhost.root != null) "root ${vhost.root};"} ${optionalString (vhost.globalRedirect != null) '' - return 301 http${optionalString hasSSL "s"}://${vhost.globalRedirect}$request_uri; + location / { + return 301 http${optionalString hasSSL "s"}://${vhost.globalRedirect}$request_uri; + } ''} ${optionalString hasSSL '' ssl_certificate ${vhost.sslCertificate}; diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 7163d0c8dc608..1956d3c9e8c7c 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -435,6 +435,7 @@ in { nginx = handleTest ./nginx.nix {}; nginx-auth = handleTest ./nginx-auth.nix {}; nginx-etag = handleTest ./nginx-etag.nix {}; + nginx-globalredirect = handleTest ./nginx-globalredirect.nix {}; nginx-http3 = handleTest ./nginx-http3.nix {}; nginx-modsecurity = handleTest ./nginx-modsecurity.nix {}; nginx-njs = handleTest ./nginx-njs.nix {}; diff --git a/nixos/tests/nginx-globalredirect.nix b/nixos/tests/nginx-globalredirect.nix new file mode 100644 index 0000000000000..5f5f4f344d825 --- /dev/null +++ b/nixos/tests/nginx-globalredirect.nix @@ -0,0 +1,24 @@ +import ./make-test-python.nix ({ pkgs, ... }: { + name = "nginx-globalredirect"; + + nodes = { + webserver = { pkgs, lib, ... }: { + services.nginx = { + enable = true; + virtualHosts.localhost = { + globalRedirect = "other.example.com"; + # Add an exception + locations."/noredirect".return = "200 'foo'"; + }; + }; + }; + }; + + testScript = '' + webserver.wait_for_unit("nginx") + webserver.wait_for_open_port(80) + + webserver.succeed("curl --fail -si http://localhost/alf | grep '^Location:.*/alf'") + webserver.fail("curl --fail -si http://localhost/noredirect | grep '^Location:'") + ''; +}) diff --git a/pkgs/servers/http/nginx/generic.nix b/pkgs/servers/http/nginx/generic.nix index a18b771aa1c37..7d301695cac06 100644 --- a/pkgs/servers/http/nginx/generic.nix +++ b/pkgs/servers/http/nginx/generic.nix @@ -176,7 +176,7 @@ stdenv.mkDerivation { passthru = { modules = modules; tests = { - inherit (nixosTests) nginx nginx-auth nginx-etag nginx-http3 nginx-pubhtml nginx-sandbox nginx-sso; + inherit (nixosTests) nginx nginx-auth nginx-etag nginx-globalredirect nginx-http3 nginx-pubhtml nginx-sandbox nginx-sso; variants = lib.recurseIntoAttrs nixosTests.nginx-variants; acme-integration = nixosTests.acme; } // passthru.tests; -- cgit 1.4.1 From 4b3364fcb79630494c6e4a800244a1575e6adb7f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 16 Dec 2022 12:25:09 +0000 Subject: brillo: 1.4.10 -> 1.4.11 --- pkgs/os-specific/linux/brillo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/os-specific/linux/brillo/default.nix b/pkgs/os-specific/linux/brillo/default.nix index 246aa471c2a90..86fabf16445dd 100644 --- a/pkgs/os-specific/linux/brillo/default.nix +++ b/pkgs/os-specific/linux/brillo/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "brillo"; - version = "1.4.10"; + version = "1.4.11"; src = fetchFromGitLab { owner= "cameronnemo"; repo= "brillo"; rev= "v${version}"; - sha256 = "sha256-x8K6CMkOyR+kWRlqa/BmJogZo41LvsL1kfz6CZ5PaUI="; + sha256 = "sha256-R83Zx0dw9bmCF5kHTNYoNzCmJZK3cVzXNb30qAUexFc="; }; patches = [ -- cgit 1.4.1 From daaeb2a5269cbff4a88a162fed8a4c20943896c4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 16 Dec 2022 08:58:09 +0000 Subject: infra: 0.17.1 -> 0.20.0 --- pkgs/tools/admin/infra/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/tools/admin/infra/default.nix b/pkgs/tools/admin/infra/default.nix index f11d76648aeea..7c852ac35ec2c 100644 --- a/pkgs/tools/admin/infra/default.nix +++ b/pkgs/tools/admin/infra/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "infra"; - version = "0.17.1"; + version = "0.20.0"; src = fetchFromGitHub { owner = "infrahq"; repo = pname; rev = "v${version}"; - sha256 = "sha256-iBTssDECRVh/3Iunfvykeoio6i8lN/Qty/ka0Kwe294="; + sha256 = "sha256-4sExRKq4J94cQYqjxaXCKa2aEeptCG+TTvrDOrJfBUg="; }; - vendorSha256 = "sha256-3J15UAu2s65f6UDDhCPIwL9fFBSICkZT2ruS88dAVYA="; + vendorSha256 = "sha256-afbQQsluZjgliNxSOGcTS1DJwj7en5NpxtuzCDAyv98="; subPackages = [ "." ]; -- cgit 1.4.1 From 033d54eac60bd05383711b0b7203640be46f2b51 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 17 Dec 2022 21:01:58 +0000 Subject: python310Packages.dj-database-url: 1.0.0 -> 1.2.0 --- pkgs/development/python-modules/dj-database-url/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/dj-database-url/default.nix b/pkgs/development/python-modules/dj-database-url/default.nix index a28c9dd05a584..55a3d408c4e8a 100644 --- a/pkgs/development/python-modules/dj-database-url/default.nix +++ b/pkgs/development/python-modules/dj-database-url/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "dj-database-url"; - version = "1.0.0"; + version = "1.2.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-zPPocY913dFHoeIS/KiO7NqnIXWe5I44tIVIHHe8o9w="; + hash = "sha256-sjsVBGyzgYDgyVIHvMkP5enb3o7vFgZZB92Fz0ynA2w="; }; propagatedBuildInputs = [ -- cgit 1.4.1 From 78d97c36af81e28a0a76bc4ad0aa6431b15481c2 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 18 Dec 2022 12:52:12 +0000 Subject: strace: 6.0 -> 6.1 Changes: https://github.com/strace/strace/releases/tag/v6.1 --- pkgs/development/tools/misc/strace/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/tools/misc/strace/default.nix b/pkgs/development/tools/misc/strace/default.nix index 351762233db5a..538437b2a6cff 100644 --- a/pkgs/development/tools/misc/strace/default.nix +++ b/pkgs/development/tools/misc/strace/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "strace"; - version = "6.0"; + version = "6.1"; src = fetchurl { url = "https://strace.io/files/${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-ktcgpmaFXp8cahFRL9bplnSoK7/hRCVXgV8s6OEpMzg="; + sha256 = "sha256-JXnpzsN9u3hvbqC+vRX0DdVh7yveKiouzc5ZY7AYWf0="; }; depsBuildBuild = [ buildPackages.stdenv.cc ]; -- cgit 1.4.1 From fe9653a3b56915dee429c999d97461c947d1010f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 18 Dec 2022 15:32:34 +0000 Subject: faraday-cli: 2.1.8 -> 2.1.9 --- pkgs/tools/security/faraday-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/tools/security/faraday-cli/default.nix b/pkgs/tools/security/faraday-cli/default.nix index a1439ecd1ec5b..cebe1540c605b 100644 --- a/pkgs/tools/security/faraday-cli/default.nix +++ b/pkgs/tools/security/faraday-cli/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "faraday-cli"; - version = "2.1.8"; + version = "2.1.9"; format = "setuptools"; src = fetchFromGitHub { owner = "infobyte"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-b2vFejsksLcEchUqo+kw01S+dT2UMD5MPAzSWmpREgQ="; + hash = "sha256-8D1oYYqf0R41DPYtorcvykZ99p6P6Diwe7PgEN378pU="; }; propagatedBuildInputs = with python3.pkgs; [ -- cgit 1.4.1