diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix index 4b199aa22b50..ba3ea4c47ac1 100644 --- a/nixos/modules/services/misc/nix-daemon.nix +++ b/nixos/modules/services/misc/nix-daemon.nix @@ -228,13 +228,16 @@ in ''; }; protocol = mkOption { - type = types.enum [ "ssh" "ssh-ng" ]; + type = types.enum [ null "ssh" "ssh-ng" ]; default = "ssh"; example = "ssh-ng"; description = lib.mdDoc '' The protocol used for communicating with the build machine. Use `ssh-ng` if your remote builder and your local Nix version support that improved protocol. + + Use `null` when trying to change the special localhost builder + without a protocol which is for example used by hydra. ''; }; system = mkOption { @@ -680,7 +683,7 @@ in concatMapStrings (machine: (concatStringsSep " " ([ - "${machine.protocol}://${optionalString (machine.sshUser != null) "${machine.sshUser}@"}${machine.hostName}" + "${optionalString (machine.protocol != null) "${machine.protocol}://"}${optionalString (machine.sshUser != null) "${machine.sshUser}@"}${machine.hostName}" (if machine.system != null then machine.system else if machine.systems != [ ] then concatStringsSep "," machine.systems else "-") (if machine.sshKey != null then machine.sshKey else "-") (toString machine.maxJobs) diff --git a/pkgs/applications/editors/lapce/default.nix b/pkgs/applications/editors/lapce/default.nix index 715b7ee9c68c..c9af2f89627f 100644 --- a/pkgs/applications/editors/lapce/default.nix +++ b/pkgs/applications/editors/lapce/default.nix @@ -17,26 +17,30 @@ , ApplicationServices , Carbon , AppKit +, wrapGAppsHook +, gobject-introspection }: rustPlatform.buildRustPackage rec { pname = "lapce"; - version = "0.1.2"; + version = "unstable-2022-09-21"; src = fetchFromGitHub { owner = "lapce"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-jH473FdBI3rGt90L3WwMDPP8M3w0rtG5D758ceCMw94="; + rev = "c5a924ef34250e9117e2b57c19c1f29f6b9b3ea7"; + sha256 = "sha256-0nAUbtokDgSxPcJCa9xGM8Rpbu282o7OHAQtAfdNmJU="; }; - cargoSha256 = "sha256-0Kya2KcyBDlt0TpFV60VAA3+JPfwId/+k8k+H97EhB0="; + cargoSha256 = "sha256-uIFC5x8TzsvTGylQ0AttIRAUWU0k0P7UeF96vUc7cKw="; nativeBuildInputs = [ cmake pkg-config perl copyDesktopItems + wrapGAppsHook # FIX: No GSettings schemas are installed on the system + gobject-introspection ]; # Get openssl-sys to use pkg-config diff --git a/pkgs/applications/misc/chrysalis/default.nix b/pkgs/applications/misc/chrysalis/default.nix index 8c455a725cc1..749dc4b8e863 100644 --- a/pkgs/applications/misc/chrysalis/default.nix +++ b/pkgs/applications/misc/chrysalis/default.nix @@ -2,7 +2,7 @@ let pname = "chrysalis"; - version = "0.9.4"; + version = "0.11.5"; in appimageTools.wrapAppImage rec { name = "${pname}-${version}-binary"; @@ -10,7 +10,7 @@ in appimageTools.wrapAppImage rec { inherit name; src = fetchurl { url = "https://github.com/keyboardio/${pname}/releases/download/v${version}/${pname}-${version}.AppImage"; - sha256 = "sha256-DAJGS1vKOOLMRgMczAiEfrT9awRNjz9r/MEr4ZFc3Bo="; + sha256 = "sha256-3GdObGW91nDqOAlHcaI/4wnbl2EG2RGGzpwY+XYQ0u4="; }; }; diff --git a/pkgs/applications/misc/inlyne/default.nix b/pkgs/applications/misc/inlyne/default.nix new file mode 100644 index 000000000000..6d78dd559c26 --- /dev/null +++ b/pkgs/applications/misc/inlyne/default.nix @@ -0,0 +1,76 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, stdenv +, pkg-config +, fontconfig +, libXcursor +, libXi +, libXrandr +, libxcb +, libGL +, libX11 +, openssl +, AppKit +, ApplicationServices +, CoreFoundation +, CoreGraphics +, CoreServices +, CoreText +, CoreVideo +, Foundation +, Metal +, QuartzCore +, Security +, libobjc +}: + +rustPlatform.buildRustPackage rec { + pname = "inlyne"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "trimental"; + repo = pname; + rev = "v${version}"; + sha256 = "1y8nxz20agmrdcl25wry8lnpg86zbkkkkiscljwd7g7a831hlb9z"; + }; + + cargoSha256 = "sha256-NXVwydEn4hX/4NorDx6eE+sWQXj1jwZgzpDE3wg8OkU="; + + nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ]; + + buildInputs = lib.optionals stdenv.isLinux [ + fontconfig + libXcursor + libXi + libXrandr + libxcb + openssl + ] ++ lib.optionals stdenv.isDarwin [ + AppKit + ApplicationServices + CoreFoundation + CoreGraphics + CoreServices + CoreText + CoreVideo + Foundation + Metal + QuartzCore + Security + libobjc + ]; + + postFixup = lib.optionalString stdenv.isLinux '' + patchelf $out/bin/inlyne \ + --add-rpath ${lib.makeLibraryPath [ libGL libX11 ]} + ''; + + meta = with lib; { + description = "A GPU powered browserless markdown viewer"; + homepage = "https://github.com/trimental/inlyne"; + license = licenses.mit; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/pkgs/applications/networking/cluster/fluxcd/default.nix b/pkgs/applications/networking/cluster/fluxcd/default.nix index 8a837399048f..71597daea2b0 100644 --- a/pkgs/applications/networking/cluster/fluxcd/default.nix +++ b/pkgs/applications/networking/cluster/fluxcd/default.nix @@ -1,9 +1,9 @@ { lib, buildGoModule, fetchFromGitHub, fetchzip, installShellFiles, stdenv }: let - version = "0.34.0"; - sha256 = "1znxhjqvch0z0s98v3hvvh1pa3nlv0l6qhlm0f61z64srz3i5d1k"; - manifestsSha256 = "1fchzr7fb894hdya9bbh59avqsa66wcz06fck60wmwpc93m64cqs"; + version = "0.35.0"; + sha256 = "11bbrxgfwvf6gnm402mcq6na75gcifx8m1b28pzspvw01p2yshf9"; + manifestsSha256 = "0ink2cvysgnqvid4hh2x969iqc86pmz654nd7wv37iqndfhy7rd5"; manifests = fetchzip { url = @@ -23,7 +23,7 @@ in buildGoModule rec { inherit sha256; }; - vendorSha256 = "sha256-0oHcitczG+sW9mkwxY6hCdR2ASpat2XQ+IsLAiqCUb8="; + vendorSha256 = "sha256-HCBEMMFMoepr4bUYICAGMb2A42smgd3VlE7b9TR6LAc="; postUnpack = '' cp -r ${manifests} source/cmd/flux/manifests diff --git a/pkgs/applications/office/treesheets/default.nix b/pkgs/applications/office/treesheets/default.nix index 2055bfc0fc7f..e39d7b5954c2 100644 --- a/pkgs/applications/office/treesheets/default.nix +++ b/pkgs/applications/office/treesheets/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "treesheets"; - version = "unstable-2022-03-12"; + version = "unstable-2022-09-26"; src = fetchFromGitHub { owner = "aardappel"; repo = "treesheets"; - rev = "120c10d4d9ea1ce76db5c1bbd6f5d705b397b57d"; - sha256 = "oXgOvvRoZpueEeWnD3jsc6y5RIAzkXzLeEe7BSErBpw="; + rev = "4778c343ac78a3b3ccdaf079187b53d8cd64e235"; + sha256 = "UyltzT9B+7/hME7famQa/XgrDPaNw3apwchKgxwscOo="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index 8ba5d6df7417..36fa987b8463 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,15 +1,15 @@ { - "version": "15.4.0", - "repo_hash": "sha256-AONzkIZbrOJkxGUYAunoWTc9xuCykKr4YkYeQQxRW8A=", + "version": "15.4.1", + "repo_hash": "sha256-z4J0ia9WxL+tJnoYNBtb6ZMuqGHiyhQ0tc0L8kzj26w=", "yarn_hash": "1r33qrvwf2wmq5c1d2awk9qhk9nzvafqn3drdvnczfv43sda4lg8", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v15.4.0-ee", + "rev": "v15.4.1-ee", "passthru": { - "GITALY_SERVER_VERSION": "15.4.0", + "GITALY_SERVER_VERSION": "15.4.1", "GITLAB_PAGES_VERSION": "1.62.0", "GITLAB_SHELL_VERSION": "14.10.0", - "GITLAB_WORKHORSE_VERSION": "15.4.0" + "GITLAB_WORKHORSE_VERSION": "15.4.1" }, "vendored_gems": [ "bundler-checksum", diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index 718deffbaa76..390581fe4472 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -11,7 +11,7 @@ let gemdir = ./.; }; - version = "15.4.0"; + version = "15.4.1"; package_version = "v${lib.versions.major version}"; gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}"; @@ -22,7 +22,7 @@ let owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - sha256 = "sha256-cESZfLlwyC6khUrvS0LGfkvzCLudjFmlGXculYLrcDM="; + sha256 = "sha256-7f4TxCI/k2yirQxYI8i/6PXGVDs4x4ncIou1qH0TKAc="; }; vendorSha256 = "sha256-CUFYHjmOfosM3mfw0qEY+AQcR8U3J/1lU2Ml6wSZ/QM="; diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index 31b0cf680034..cf58ee92860a 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix @@ -5,7 +5,7 @@ in buildGoModule rec { pname = "gitlab-workhorse"; - version = "15.4.0"; + version = "15.4.1"; src = fetchFromGitLab { owner = data.owner; diff --git a/pkgs/applications/version-management/sourcehut/builds.nix b/pkgs/applications/version-management/sourcehut/builds.nix index b8f9a0f1522a..1655ad28aaf9 100644 --- a/pkgs/applications/version-management/sourcehut/builds.nix +++ b/pkgs/applications/version-management/sourcehut/builds.nix @@ -1,5 +1,6 @@ { lib , fetchFromSourcehut +, fetchpatch , buildGoModule , buildPythonPackage , srht @@ -12,27 +13,36 @@ , unzip }: let - version = "0.81.0"; + version = "0.82.8"; src = fetchFromSourcehut { owner = "~sircmpwn"; repo = "builds.sr.ht"; rev = version; - sha256 = "sha256-oUSzanRFZ2dQTgm/VuNhqUaUAPq7ffxR7OtBKtE61DE="; + hash = "sha256-M94zkEUJU8EwksN34sd5IkASDCQ0hHb98G5wzZsCrpg="; }; buildsrht-api = buildGoModule ({ inherit src version; pname = "buildsrht-api"; modRoot = "api"; - vendorSha256 = "sha256-roTwqtg4Y846PNtLdRN/LV3Jd0LVElqjFy3DJcrwoaI="; + vendorHash = "sha256-8z5m4bMwLeYg4i91MMjLMqbciWvqS0icCHFUJTUHBgk="; } // import ./fix-gqlgen-trimpath.nix { inherit unzip; }); buildsrht-worker = buildGoModule { inherit src version; sourceRoot = "source/worker"; pname = "buildsrht-worker"; - vendorSha256 = "sha256-Pf1M9a43eK4jr6QMi6kRHA8DodXQU0pqq9ua5VC3ER0="; + vendorHash = "sha256-y5RFPbtaGmgPpiV2Q3njeWORGZF1TJRjAbY6VgC1hek="; + + patches = [ + (fetchpatch { + name = "update-x-sys-for-go-1.18-on-aarch64-darwin.patch"; + url = "https://git.sr.ht/~sircmpwn/builds.sr.ht/commit/f58bbde6bfed7d2321a3b17e991c91fc83d4c230.patch"; + stripLen = 1; + hash = "sha256-vQR/T5G5Gz5tY+SEZZabsbnFKW44b+Bs+GDdydyeCDs="; + }) + ]; }; in buildPythonPackage rec { diff --git a/pkgs/development/libraries/libelf/default.nix b/pkgs/development/libraries/libelf/default.nix index 6d894da17d0e..07873f4197e3 100644 --- a/pkgs/development/libraries/libelf/default.nix +++ b/pkgs/development/libraries/libelf/default.nix @@ -27,6 +27,11 @@ stdenv.mkDerivation rec { doCheck = true; + preConfigure = if !stdenv.hostPlatform.useAndroidPrebuilt then null else '' + sed -i 's|DISTSUBDIRS = lib po|DISTSUBDIRS = lib|g' Makefile.in + sed -i 's|SUBDIRS = lib @POSUB@|SUBDIRS = lib|g' Makefile.in + ''; + configureFlags = [] # Configure check for dynamic lib support is broken, see # http://lists.uclibc.org/pipermail/uclibc-cvs/2005-August/019383.html diff --git a/pkgs/development/libraries/opencolorio/1.x.nix b/pkgs/development/libraries/opencolorio/1.x.nix index 1b58faf54438..7622ebbe43eb 100644 --- a/pkgs/development/libraries/opencolorio/1.x.nix +++ b/pkgs/development/libraries/opencolorio/1.x.nix @@ -29,7 +29,8 @@ stdenv.mkDerivation rec { # External libyamlcpp 0.6.* not compatible: https://github.com/imageworks/OpenColorIO/issues/517 "-DUSE_EXTERNAL_YAML=OFF" ] ++ lib.optional stdenv.isDarwin "-DOCIO_USE_BOOST_PTR=ON" - ++ lib.optional (!stdenv.hostPlatform.isx86) "-DOCIO_USE_SSE=OFF"; + ++ lib.optional (!stdenv.hostPlatform.isx86) "-DOCIO_USE_SSE=OFF" + ++ lib.optional (stdenv.isDarwin && stdenv.isAarch64) "-DCMAKE_OSX_ARCHITECTURES=arm64"; postInstall = '' mkdir -p $bin/bin; mv $out/bin $bin/ diff --git a/pkgs/development/libraries/pc-ble-driver/default.nix b/pkgs/development/libraries/pc-ble-driver/default.nix index ae139639c732..7a7b8475d7c4 100644 --- a/pkgs/development/libraries/pc-ble-driver/default.nix +++ b/pkgs/development/libraries/pc-ble-driver/default.nix @@ -10,21 +10,28 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "NordicSemiconductor"; - repo = "pc-ble-driver"; + repo = pname; rev = "v${version}"; - sha256 = "1609x17sbfi668jfwyvnfk9z29w6cgzvgv67xcpvpx5jv0czpcdj"; + hash = "sha256-srH7Gdiy9Lsv68fst/9jhifx03R2e+4kMia6pU/oCZg="; }; patches = [ + (fetchpatch { + name = "support-arm.patch"; + url = "https://github.com/NordicSemiconductor/pc-ble-driver/commit/76a6b31dba7a13ceae40587494cbfa01a29192f4.patch"; + hash = "sha256-bvK1BXjdlhIXV8R4PiCGaq8oSLzgjMmTgAwssm8N2sk="; + }) # Fix build with GCC 11 (fetchpatch { url = "https://github.com/NordicSemiconductor/pc-ble-driver/commit/37258e65bdbcd0b4369ae448faf650dd181816ec.patch"; - sha256 = "sha256-gOdzIW8YJQC+PE4FJd644I1+I7CMcBY8wpF6g02eI5g="; + hash = "sha256-gOdzIW8YJQC+PE4FJd644I1+I7CMcBY8wpF6g02eI5g="; }) ]; cmakeFlags = [ "-DNRF_BLE_DRIVER_VERSION=${version}" + ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + "-DARCH=arm64" ]; nativeBuildInputs = [ cmake git ]; diff --git a/pkgs/development/python-modules/pytest-astropy-header/default.nix b/pkgs/development/python-modules/pytest-astropy-header/default.nix index acc555035822..4d95058b9354 100644 --- a/pkgs/development/python-modules/pytest-astropy-header/default.nix +++ b/pkgs/development/python-modules/pytest-astropy-header/default.nix @@ -6,29 +6,21 @@ , pytest-cov , pytestCheckHook , numpy -, astropy -, scipy -, h5py -, scikitimage +, setuptools-scm }: buildPythonPackage rec { pname = "pytest-astropy-header"; - version = "0.1.2"; + version = "0.2.2"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "1y87agr324p6x5gvhziymxjlw54pyn4gqnd49papbl941djpkp5g"; + sha256 = "77891101c94b75a8ca305453b879b318ab6001b370df02be2c0b6d1bb322db10"; }; - patches = [ (fetchpatch { - url = "https://github.com/astropy/pytest-astropy-header/pull/16.patch"; - sha256 = "11ln63zq0kgsdx1jw3prlzpcdbxmc99p9cwr18s0x6apy0k6df31"; - }) - (fetchpatch { - url = "https://github.com/astropy/pytest-astropy-header/pull/29.patch"; - sha256 = "18l434c926r5z1iq3b6lpnp0lrssszars9y1y9hs6216r60jgjpl"; - }) + + nativeBuildInputs = [ + setuptools-scm ]; buildInputs = [ @@ -37,12 +29,7 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook - pytest-cov numpy - scipy - h5py - scikitimage - astropy ]; meta = with lib; { diff --git a/pkgs/development/python-modules/pytest-astropy/default.nix b/pkgs/development/python-modules/pytest-astropy/default.nix index 45ad26ab279e..1e1f386eef44 100644 --- a/pkgs/development/python-modules/pytest-astropy/default.nix +++ b/pkgs/development/python-modules/pytest-astropy/default.nix @@ -1,10 +1,12 @@ { lib , buildPythonPackage , fetchPypi +, attrs , hypothesis , pytest , pytest-arraydiff , pytest-astropy-header +, pytest-cov , pytest-doctestplus , pytest-filter-subpackage , pytest-mock @@ -33,9 +35,11 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ + attrs hypothesis pytest-arraydiff pytest-astropy-header + pytest-cov pytest-doctestplus pytest-filter-subpackage pytest-mock diff --git a/pkgs/development/python-modules/radio_beam/default.nix b/pkgs/development/python-modules/radio_beam/default.nix index bcb099887695..aa56e223237b 100644 --- a/pkgs/development/python-modules/radio_beam/default.nix +++ b/pkgs/development/python-modules/radio_beam/default.nix @@ -4,21 +4,22 @@ , setuptools-scm , astropy , numpy +, matplotlib , scipy , six , pytestCheckHook -, pytest-doctestplus +, pytest-astropy }: buildPythonPackage rec { pname = "radio_beam"; - version = "0.3.3"; + version = "0.3.4"; format = "pyproject"; src = fetchPypi { inherit version; pname = "radio-beam"; - sha256 = "e34902d91713ccab9f450b9d3e82317e292cf46a30bd42f9ad3c9a0519fcddcd"; + sha256 = "e032257f1501303873f251c00c74b1188180785c79677fb4443098d517852309"; }; nativeBuildInputs = [ @@ -34,14 +35,10 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook - pytest-doctestplus + matplotlib + pytest-astropy ]; - # Tests must be run in the build directory - preCheck = '' - cd build/lib - ''; - meta = { description = "Tools for Beam IO and Manipulation"; homepage = "http://radio-astro-tools.github.io"; diff --git a/pkgs/development/tools/metal-cli/default.nix b/pkgs/development/tools/metal-cli/default.nix index 06bd51bd31c5..f3bededcda8c 100644 --- a/pkgs/development/tools/metal-cli/default.nix +++ b/pkgs/development/tools/metal-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "metal-cli"; - version = "0.9.1"; + version = "0.10.0"; src = fetchFromGitHub { owner = "equinix"; repo = pname; rev = "v${version}"; - sha256 = "sha256-+G3PBYeez1dcUELc4j6CRgxDCDWCxpOfI52QlvMVkrY="; + sha256 = "sha256-bXea270m0+JAQ3j+JhkiVNds2X7rogcIqJIqRK7DS2g="; }; - vendorSha256 = "sha256-rf0EWMVvuoPUMTQKi/FnUbE2ZAs0C7XosHAzCgwB5wg="; + vendorSha256 = "sha256-bCVHPpdQSlEU7smoQzpiLZMQVPUQO8UhylrpDf0MSmk="; ldflags = [ "-s" "-w" diff --git a/pkgs/development/tools/rust/cargo-edit/default.nix b/pkgs/development/tools/rust/cargo-edit/default.nix index 618fbee79b55..2017d5ed21ba 100644 --- a/pkgs/development/tools/rust/cargo-edit/default.nix +++ b/pkgs/development/tools/rust/cargo-edit/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-edit"; - version = "0.11.2"; + version = "0.11.3"; src = fetchFromGitHub { owner = "killercup"; repo = pname; rev = "v${version}"; - hash = "sha256-pFQJ2ktn3sMO6DOWlBBe1pJOPytqgqX/EvjGZLnypdY="; + hash = "sha256-xhUI8rkABw3Op3sTctAIL7nCTX6Ejl2jMr0RI4oERIU="; }; - cargoSha256 = "sha256-uTbMiMlCq7qImM5yz1ij0dokJgIMECzdBWst8fwdaoM="; + cargoSha256 = "sha256-7Of641eBgXqa6vaAr4NotDScGPRd+RcTzWRmIn8pEeU="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/tools/rust/cargo-llvm-lines/default.nix b/pkgs/development/tools/rust/cargo-llvm-lines/default.nix index 910971fbddca..688347f886bc 100644 --- a/pkgs/development/tools/rust/cargo-llvm-lines/default.nix +++ b/pkgs/development/tools/rust/cargo-llvm-lines/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-llvm-lines"; - version = "0.4.17"; + version = "0.4.18"; src = fetchFromGitHub { owner = "dtolnay"; repo = pname; rev = version; - sha256 = "sha256-Xlzvfic2uuMTMxAwWbWGii1ZdJglYxRI3iY1YQaufNQ="; + sha256 = "sha256-MQ+T/BwDXPm9xTsujAGrWnIuhJBbij2VaXiRYpNj6ZM="; }; - cargoSha256 = "sha256-3xlKZGRgxOzKtGNQCkZpSKnnczxDNuS4kY1VO/6LxlA="; + cargoSha256 = "sha256-EeUXRcK/4Xl25Q30RnNNF/eAv4zCu6epwrAorfIu21k="; meta = with lib; { description = "Count the number of lines of LLVM IR across all instantiations of a generic function"; diff --git a/pkgs/development/tools/rust/cargo-tally/default.nix b/pkgs/development/tools/rust/cargo-tally/default.nix index 55452bbad530..5f2d8194d064 100644 --- a/pkgs/development/tools/rust/cargo-tally/default.nix +++ b/pkgs/development/tools/rust/cargo-tally/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-tally"; - version = "1.0.14"; + version = "1.0.15"; src = fetchCrate { inherit pname version; - sha256 = "sha256-hsKrkLkHD5NM3sSVHKIa/dxiW5TszryX8bksGqpZ9fI="; + sha256 = "sha256-vrDPFJB0/kRSZot8LdYO6lPI8oR5G4CZv6Z31gF7XII="; }; - cargoSha256 = "sha256-9ozabY3tsgQa6nsSsF07juOM+oFJSXGcYOz3uju/tLg="; + cargoSha256 = "sha256-dkCfOTZCu9MgqvKJRWwyVfCu1Ul0wDCJznM+N2hPpwo="; buildInputs = lib.optionals stdenv.isDarwin [ DiskArbitration diff --git a/pkgs/servers/monitoring/prometheus/collectd-exporter.nix b/pkgs/servers/monitoring/prometheus/collectd-exporter.nix index 4f059b7e84f1..b4db3ee5679f 100644 --- a/pkgs/servers/monitoring/prometheus/collectd-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/collectd-exporter.nix @@ -1,19 +1,20 @@ -{ lib, buildGoPackage, fetchFromGitHub, nixosTests }: +{ lib, buildGoModule, fetchFromGitHub, nixosTests }: -buildGoPackage rec { +buildGoModule rec { pname = "collectd-exporter"; version = "0.5.0"; - rev = version; - - goPackagePath = "github.com/prometheus/collectd_exporter"; src = fetchFromGitHub { - rev = "v${version}"; owner = "prometheus"; repo = "collectd_exporter"; + rev = "v${version}"; sha256 = "0vb6vnd2j87iqxdl86j30dk65vrv4scprv200xb83203aprngqgh"; }; + vendorSha256 = null; + + ldflags = [ "-s" "-w" ]; + passthru.tests = { inherit (nixosTests.prometheus-exporters) collectd; }; meta = with lib; { diff --git a/pkgs/shells/bash/5.1.nix b/pkgs/shells/bash/5.1.nix index 7cd7fb6905cb..390dab12c947 100644 --- a/pkgs/shells/bash/5.1.nix +++ b/pkgs/shells/bash/5.1.nix @@ -33,7 +33,11 @@ stdenv.mkDerivation rec { sha256 = "1alv68wplnfdm6mh39hm57060xgssb9vqca4yr1cyva0c342n0fc"; }; - hardeningDisable = [ "format" ]; + hardeningDisable = [ "format" ] + # bionic libc is super weird and has issues with fortify outside of its own libc, check this comment: + # https://github.com/NixOS/nixpkgs/pull/192630#discussion_r978985593 + # or you can check libc/include/sys/cdefs.h in bionic source code + ++ optional (stdenv.hostPlatform.libc == "bionic") "fortify"; outputs = [ "out" "dev" "man" "doc" "info" ]; diff --git a/pkgs/shells/fish/wrapper.nix b/pkgs/shells/fish/wrapper.nix index f978f2bdfa4d..c5c55bb71103 100644 --- a/pkgs/shells/fish/wrapper.nix +++ b/pkgs/shells/fish/wrapper.nix @@ -1,25 +1,47 @@ -{ lib, writeShellScriptBin, fish }: +{ lib, writeShellScriptBin, fish, writeTextFile }: -with lib; - -makeOverridable ({ +lib.makeOverridable ({ completionDirs ? [], functionDirs ? [], confDirs ? [], - pluginPkgs ? [] + pluginPkgs ? [], + localConfig ? "", + shellAliases ? {} }: let + aliasesStr = builtins.concatStringsSep "\n" + (lib.mapAttrsToList (k: v: "alias ${k} ${lib.escapeShellArg v}") shellAliases); + + shellAliasesFishConfig = writeTextFile { + name = "wrapfish.aliases.fish"; + destination = "/share/fish/vendor_conf.d/aliases.fish"; + text = '' + status --is-interactive; and begin + # Aliases + ${aliasesStr} + end + ''; + }; + + localFishConfig = writeTextFile { + name = "wrapfish.local.fish"; + destination = "/share/fish/vendor_conf.d/config.local.fish"; + text = localConfig; + }; + vendorDir = kind: plugin: "${plugin}/share/fish/vendor_${kind}.d"; complPath = completionDirs ++ map (vendorDir "completions") pluginPkgs; funcPath = functionDirs ++ map (vendorDir "functions") pluginPkgs; - confPath = confDirs ++ map (vendorDir "conf") pluginPkgs; + confPath = confDirs + ++ (map (vendorDir "conf") pluginPkgs) + ++ (map (vendorDir "conf") [ localFishConfig shellAliasesFishConfig ]); in writeShellScriptBin "fish" '' ${fish}/bin/fish --init-command " - set --prepend fish_complete_path ${escapeShellArgs complPath} - set --prepend fish_function_path ${escapeShellArgs funcPath} - set --local fish_conf_source_path ${escapeShellArgs confPath} + set --prepend fish_complete_path ${lib.escapeShellArgs complPath} + set --prepend fish_function_path ${lib.escapeShellArgs funcPath} + set --local fish_conf_source_path ${lib.escapeShellArgs confPath} for c in \$fish_conf_source_path/*; source \$c; end " "$@" '') diff --git a/pkgs/tools/misc/opentelemetry-collector/default.nix b/pkgs/tools/misc/opentelemetry-collector/default.nix index dcbfd58e2f57..5e8a08b71013 100644 --- a/pkgs/tools/misc/opentelemetry-collector/default.nix +++ b/pkgs/tools/misc/opentelemetry-collector/default.nix @@ -12,17 +12,17 @@ let in buildGoModule rec { pname = "opentelemetry-collector"; - version = "0.60.0"; + version = "0.61.0"; src = fetchFromGitHub { owner = "open-telemetry"; repo = "opentelemetry-collector"; rev = "v${version}"; - sha256 = "sha256-zES2795gyMQ/VoRR4/dpUsqJlGnxl0Ac9Gb05lboWlI="; + sha256 = "sha256-NwkQDqacH1vZNkHy3OzvR1wmwxO2dAPXa/OkiNMcrjs="; }; # there is a nested go.mod sourceRoot = "source/cmd/otelcorecol"; - vendorSha256 = "sha256-9YKeHCFrN7drHJpk2k9M0VGvZ54kSSb9bAiyDFEiX+g="; + vendorSha256 = "sha256-AFizQKKIMveCI9OiJ6wPxsNwDVn9XEWuPzyIqQSXbd4="; preBuild = '' # set the build version, can't be done via ldflags diff --git a/pkgs/tools/networking/aardvark-dns/default.nix b/pkgs/tools/networking/aardvark-dns/default.nix index 0c5cd2949dc0..7825b419ecf1 100644 --- a/pkgs/tools/networking/aardvark-dns/default.nix +++ b/pkgs/tools/networking/aardvark-dns/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "aardvark-dns"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = "v${version}"; - sha256 = "sha256-HxikpGeQlwulSedFCwWLADHKMlFrsgC7bMoZ1OxGCUE="; + sha256 = "sha256-pIbhrYiZOZ0GoynnHvp+h5E4O4syiwVhQeczAv1zjTo="; }; - cargoHash = "sha256-uP9caaOdFWs73T8icHE9uXNo63NdZrQ5afXFb4Iy1+I="; + cargoHash = "sha256-2aFvFP64vy0FK0k0Uq6sPVi42E5easxOUlkcZjrjoMs="; meta = with lib; { description = "Authoritative dns server for A/AAAA container records"; diff --git a/pkgs/tools/networking/netavark/default.nix b/pkgs/tools/networking/netavark/default.nix index 29136e3ce4ca..12834f9e26ed 100644 --- a/pkgs/tools/networking/netavark/default.nix +++ b/pkgs/tools/networking/netavark/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "netavark"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = "v${version}"; - sha256 = "sha256-NZt62oTD7yFO1+HTuyp+wEd2PuUwtsIrMPHwjfmz3aI="; + sha256 = "sha256-72ft1VZVv6Wxfr3RsJMOVl1Z0KMVGgCsUHKGH+filzg="; }; - cargoHash = "sha256-l+y3mkV6uZJed2nuXNWXDr6Q1UhV0YlfRhpE7rvTRrE="; + cargoHash = "sha256-FboPbOjkGRzOeoXrIkl1l2BXeid4AOiwxCJ6wlGQ66g="; nativeBuildInputs = [ installShellFiles mandown ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e4e03db2c7b7..b9d4969b9229 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -29008,6 +29008,12 @@ with pkgs; inkscape-extensions = recurseIntoAttrs (callPackages ../applications/graphics/inkscape/extensions.nix {}); + inlyne = callPackage ../applications/misc/inlyne { + inherit (xorg) libX11 libXcursor libXi libXrandr libxcb; + inherit (darwin) libobjc; + inherit (darwin.apple_sdk.frameworks) AppKit ApplicationServices CoreFoundation CoreGraphics CoreServices CoreText CoreVideo Foundation Metal QuartzCore Security; + }; + inspectrum = callPackage ../applications/radio/inspectrum { }; inputplug = callPackage ../tools/X11/inputplug { };