diff options
Diffstat (limited to 'pkgs')
45 files changed, 452 insertions, 186 deletions
diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/el-easydraw/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/el-easydraw/default.nix index 9cfa97c4346d0..056f604d5f0d2 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/el-easydraw/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/el-easydraw/default.nix @@ -7,17 +7,17 @@ }: let - rev = "13c9fa22155066acfb5a2e444fe76245738e7fb7"; + rev = "53c40d2395e04761a510aa7007336939538678c0"; in melpaBuild { pname = "edraw"; - version = "20240529.1009"; + version = "20240606.457"; src = fetchFromGitHub { owner = "misohena"; repo = "el-easydraw"; inherit rev; - hash = "sha256-h2auwVIWjrOBPHPCuLdJv5y3FpoV4V+MEOPf4xprfYg="; + hash = "sha256-gJboLPEMTFC3rP0PiJ679Nj8SmfI+qXYkX7kBLU6ywQ="; }; commit = rev; diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix index 76666b3b3c822..bf97add669060 100644 --- a/pkgs/applications/editors/vscode/vscodium.nix +++ b/pkgs/applications/editors/vscode/vscodium.nix @@ -15,11 +15,11 @@ let archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "1n3gb12asid2qwwzf9fj974ws9n7has9l23ni8jscx9cp63l5rbl"; - x86_64-darwin = "0gkplg2c5g7964m58fmv7b70d69g4yqrax5zn1rm4rl2agxgwyff"; - aarch64-linux = "0412222l9r81f3aa3zlzrg42hzslvvck5kds7zrmpssjrd41jxfh"; - aarch64-darwin = "1iv49m646vsbcgaxydxhpjbxspz7918brdk51gmbqf258shf8rii"; - armv7l-linux = "1sblaigrxscx4l1kln1zxzm5da5lr50y1k6qb4igq6wxbdx55iay"; + x86_64-linux = "1zmgvadhsnsbmqb559kvf66i7h6iq7vw99m7vdxcfmdl6c1pwyvb"; + x86_64-darwin = "061h423vay3d28d2015llz7pwlqcrjy0lmw47xgy3iy6hfadrra2"; + aarch64-linux = "0n288h6369bazykp6jyapi6yz0k7nivql6wz68fgkagfdyxzl1yb"; + aarch64-darwin = "13k9hvbzj8xyfi29g0x4nz80gmjq3s693zi5fi4lbf4bj7jmcamq"; + armv7l-linux = "19p6k1rgy83vs76hksjx5d4v32jq31r6aw5kzcc8gsq114xj9c2a"; }.${system} or throwSystem; sourceRoot = lib.optionalString (!stdenv.isDarwin) "."; @@ -29,7 +29,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.88.1.24104"; + version = "1.90.0.24158"; pname = "vscodium"; executableName = "codium"; diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix index e63bda1235723..5197f92d8c832 100644 --- a/pkgs/applications/networking/browsers/brave/default.nix +++ b/pkgs/applications/networking/browsers/brave/default.nix @@ -6,17 +6,17 @@ callPackage ./make-brave.nix (removeAttrs args [ "callPackage" ]) if stdenv.isAarch64 then { pname = "brave"; - version = "1.66.115"; - url = "https://github.com/brave/brave-browser/releases/download/v1.66.115/brave-browser_1.66.115_arm64.deb"; - hash = "sha256-zOrulR0a/iRYtjdFiyN0V6q0KktD7G0ZrEYSXfIwaL8="; + version = "1.66.118"; + url = "https://github.com/brave/brave-browser/releases/download/v1.66.118/brave-browser_1.66.118_arm64.deb"; + hash = "sha256-H2f6i86lDToHEkJ9JZCBp3tlpnI+zoFHY3YzLdp5lE4="; platform = "aarch64-linux"; } else if stdenv.isx86_64 then { pname = "brave"; - version = "1.66.115"; - url = "https://github.com/brave/brave-browser/releases/download/v1.66.115/brave-browser_1.66.115_amd64.deb"; - hash = "sha256-TMQips7dyxKfYEin7QJCV0ru4NHi4j3DjLh2fmzuYeQ="; + version = "1.66.118"; + url = "https://github.com/brave/brave-browser/releases/download/v1.66.118/brave-browser_1.66.118_amd64.deb"; + hash = "sha256-r7lpEOxECOqJ23XxTHqSy6KhyNPRwOkuJvnZUuuBN4k="; platform = "x86_64-linux"; } else diff --git a/pkgs/applications/networking/cluster/arkade/default.nix b/pkgs/applications/networking/cluster/arkade/default.nix index 04fdbc871511c..9eec21e4d1ddb 100644 --- a/pkgs/applications/networking/cluster/arkade/default.nix +++ b/pkgs/applications/networking/cluster/arkade/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "arkade"; - version = "0.11.12"; + version = "0.11.13"; src = fetchFromGitHub { owner = "alexellis"; repo = "arkade"; rev = version; - hash = "sha256-tioWLZ1Bd+gC2FvbhrxFPIkOJb9ycx9sGVmh+a/4hwo="; + hash = "sha256-mXT0/cDfvzE9fBCy4rY1epeOolXmc50QNNXSn3bHi1I="; }; CGO_ENABLED = 0; diff --git a/pkgs/applications/networking/cluster/k3s/1_27/chart-versions.nix b/pkgs/applications/networking/cluster/k3s/1_27/chart-versions.nix deleted file mode 100644 index aaaa3d4c29700..0000000000000 --- a/pkgs/applications/networking/cluster/k3s/1_27/chart-versions.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ - traefik-crd = { - url = "https://k3s.io/k3s-charts/assets/traefik-crd/traefik-crd-25.0.3+up25.0.0.tgz"; - sha256 = "1z693i4kd3jyf26ccnb0sxjyxadipl6k13n7jyg5v4y93fv1rpdw"; - }; - traefik = { - url = "https://k3s.io/k3s-charts/assets/traefik/traefik-25.0.3+up25.0.0.tgz"; - sha256 = "1a24qlp7c6iri72ka1i37l1lzn13xibrd26dy295z2wzr55gg7if"; - }; -} diff --git a/pkgs/applications/networking/cluster/k3s/1_27/versions.nix b/pkgs/applications/networking/cluster/k3s/1_27/versions.nix deleted file mode 100644 index c7d03c0087b31..0000000000000 --- a/pkgs/applications/networking/cluster/k3s/1_27/versions.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ - k3sVersion = "1.27.14+k3s1"; - k3sCommit = "b0b34e4d927369147a37f95ee8ba6441e4b4102b"; - k3sRepoSha256 = "0vvglvh8hl83jrpn9i2fgbck6cp7fbbwn292w76nmckmpclm47ap"; - k3sVendorHash = "sha256-eDzBpvaK1rHp28A5zvSsxnk0CNhy4oBSifBT98M7JWc="; - chartVersions = import ./chart-versions.nix; - k3sRootVersion = "0.12.2"; - k3sRootSha256 = "1gjynvr350qni5mskgm7pcc7alss4gms4jmkiv453vs8mmma9c9k"; - k3sCNIVersion = "1.4.0-k3s2"; - k3sCNISha256 = "17dg6jgjx18nrlyfmkv14dhzxsljz4774zgwz5dchxcf38bvarqa"; - containerdVersion = "1.7.15-k3s1.27"; - containerdSha256 = "0bjxw174prhq8izmgrmpyljfxzrj0lh5d0w04g3lyn0rp3kwxqsl"; - criCtlVersion = "1.26.0-rc.0-k3s1"; -} diff --git a/pkgs/applications/networking/cluster/k3s/builder.nix b/pkgs/applications/networking/cluster/k3s/builder.nix index 247ab0f339daa..9f2909802f911 100644 --- a/pkgs/applications/networking/cluster/k3s/builder.nix +++ b/pkgs/applications/networking/cluster/k3s/builder.nix @@ -338,6 +338,7 @@ buildGoModule rec { util-linux # kubelet wants 'nsenter' from util-linux: https://github.com/kubernetes/kubernetes/issues/26093#issuecomment-705994388 conntrack-tools runc + bash ]; k3sKillallDeps = [ diff --git a/pkgs/applications/networking/cluster/k3s/default.nix b/pkgs/applications/networking/cluster/k3s/default.nix index 6e7cfb0d1325c..c8e3fbc926961 100644 --- a/pkgs/applications/networking/cluster/k3s/default.nix +++ b/pkgs/applications/networking/cluster/k3s/default.nix @@ -12,17 +12,6 @@ let extraArgs = builtins.removeAttrs args [ "callPackage" ]; in { - # 1_27 can be built with the same builder as 1_30 - k3s_1_27 = common ( - (import ./1_27/versions.nix) - // { - updateScript = [ - ./update-script.sh - "27" - ]; - } - ) extraArgs; - # 1_28 can be built with the same builder as 1_30 k3s_1_28 = common ( (import ./1_28/versions.nix) diff --git a/pkgs/applications/networking/instant-messengers/element/pin.nix b/pkgs/applications/networking/instant-messengers/element/pin.nix index 5f86a28e465c8..b3b722e67529b 100644 --- a/pkgs/applications/networking/instant-messengers/element/pin.nix +++ b/pkgs/applications/networking/instant-messengers/element/pin.nix @@ -1,9 +1,9 @@ { - "version" = "1.11.67"; + "version" = "1.11.68"; "hashes" = { - "desktopSrcHash" = "sha256-oM4/PKydmIBp2zVbzJRbVYnklYO2IHH7ZBV4MfLxnQo="; - "desktopYarnHash" = "04dbsacigq5jrh7gpyxj31grwzsg58cy6d4y7k3hmcwd4gj68iid"; - "webSrcHash" = "sha256-faJiuAmEIEkNrwjgU06XT9J2NxJrJNIsPb1K5WXR0Lc="; - "webYarnHash" = "14sy3by840gbxqyvhwaj5k07hvhcsj300s39qjfsg1sx9fnfzck3"; + "desktopSrcHash" = "sha256-L3rto0V0RIf5ILWYGFnuGpwciwc55rR2+Zqj/azuWlo="; + "desktopYarnHash" = "0awz1dscksx4zvp99p08mdl2h6i7gbwjddanl3bhxkysxqdnwqb1"; + "webSrcHash" = "sha256-IRgEV4H0fYo0ijLWF8ICdewqencgTJlqstzsGzlJI0k="; + "webYarnHash" = "092m0bhc3pp9dpaz6kri3hi723kqq1pbja4vf2xbxyx4x4yf0vlz"; }; } diff --git a/pkgs/applications/office/homebank/default.nix b/pkgs/applications/office/homebank/default.nix index 99aaa7fa3bfe6..000942ff68bdd 100644 --- a/pkgs/applications/office/homebank/default.nix +++ b/pkgs/applications/office/homebank/default.nix @@ -9,6 +9,10 @@ stdenv.mkDerivation rec { hash = "sha256-YMNf6v40GuyP7Z3ksKh13A9cFnTF9YBP9xkKbGxT3AE="; }; + patches = [ + ./fix-clang-build.diff + ]; + nativeBuildInputs = [ pkg-config wrapGAppsHook3 intltool ]; buildInputs = [ gtk libofx libsoup_3 gnome.adwaita-icon-theme]; diff --git a/pkgs/applications/office/homebank/fix-clang-build.diff b/pkgs/applications/office/homebank/fix-clang-build.diff new file mode 100644 index 0000000000000..1b8c7fd359e23 --- /dev/null +++ b/pkgs/applications/office/homebank/fix-clang-build.diff @@ -0,0 +1,23 @@ +C Standard says in 6.8.1: + + labeled-statement: + identifier : statement + case constant-expression : statement + default : statement + +Notably, only expressions and no declarations are allowed. A common workaround for this +is adding an empty statement. + +diff --git a/src/rep-budget.c b/src/rep-budget.c +index eb5cce6..61e2e77 100644 +--- a/src/rep-budget.c ++++ b/src/rep-budget.c +@@ -255,7 +255,7 @@ gint tmpmode; + } + else + { +-libname: ++libname: ; + gchar *name; + + gtk_tree_model_get(model, iter, diff --git a/pkgs/applications/virtualization/crosvm/default.nix b/pkgs/applications/virtualization/crosvm/default.nix index 50c5a10b5663a..3e7eb8192ba6c 100644 --- a/pkgs/applications/virtualization/crosvm/default.nix +++ b/pkgs/applications/virtualization/crosvm/default.nix @@ -5,18 +5,18 @@ rustPlatform.buildRustPackage rec { pname = "crosvm"; - version = "124.0"; + version = "125.0"; src = fetchgit { url = "https://chromium.googlesource.com/chromiumos/platform/crosvm"; - rev = "bc2900b9ccbdf37b780a63888ca94437fd7dd6af"; - hash = "sha256-t/47u5BlSC5vbRc7OQSbGBF+wnhcDFOMjrRQc/p2HcQ="; + rev = "6a7ff1ecb7fad6820d3bbfe8b11e65854059aba5"; + hash = "sha256-y/vHU8i9YNbzSHla853z/2w914mVMFOryyaHE1uxlvM="; fetchSubmodules = true; }; separateDebugInfo = true; - cargoHash = "sha256-7zx0k7HXequpwcURHx+Ml3cDhdvLkXTg+V71F6TO/d0="; + cargoHash = "sha256-1AUfd9dhIZvVVUsVbnGoLKc0lBfccwM4wqWgU4yZWOE="; nativeBuildInputs = [ pkg-config protobuf python3 rustPlatform.bindgenHook wayland-scanner diff --git a/pkgs/applications/virtualization/podman/default.nix b/pkgs/applications/virtualization/podman/default.nix index a23ae61d598f0..18d1324764ae4 100644 --- a/pkgs/applications/virtualization/podman/default.nix +++ b/pkgs/applications/virtualization/podman/default.nix @@ -65,13 +65,13 @@ let in buildGoModule rec { pname = "podman"; - version = "5.1.0"; + version = "5.1.1"; src = fetchFromGitHub { owner = "containers"; repo = "podman"; rev = "v${version}"; - hash = "sha256-jmg/Yq80MasbW93BTo6p5EcEfNQVadeDmkYtiX7Ov1E="; + hash = "sha256-3u4QOX7K0bMcbvwkXVoCpq7p5rKkvmOlOIRSUEbjFOY="; }; patches = [ diff --git a/pkgs/by-name/ad/ad-miner/package.nix b/pkgs/by-name/ad/ad-miner/package.nix index 3987c12582c98..f3c3f6778b43f 100644 --- a/pkgs/by-name/ad/ad-miner/package.nix +++ b/pkgs/by-name/ad/ad-miner/package.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "ad-miner"; - version = "1.3.0"; + version = "1.4.0"; pyproject = true; src = fetchFromGitHub { owner = "Mazars-Tech"; repo = "AD_Miner"; rev = "refs/tags/v${version}"; - hash = "sha256-MoU38UEhk9eUa+slXnYG1eOyDW79J0q5XiM+1UYIGaM="; + hash = "sha256-SBFPGlP5hDKNuE5sYGL6PE1nYMmOCmMZji0AtNEBkAQ="; }; # All requirements are pinned diff --git a/pkgs/by-name/as/assetfinder/package.nix b/pkgs/by-name/as/assetfinder/package.nix index f307b5ec62ed5..46a2daa1723a1 100644 --- a/pkgs/by-name/as/assetfinder/package.nix +++ b/pkgs/by-name/as/assetfinder/package.nix @@ -1,14 +1,12 @@ { lib , fetchFromGitHub -, buildGoPackage +, buildGoModule }: -buildGoPackage rec { +buildGoModule rec { pname = "assetfinder"; version = "0.1.1"; - goPackagePath = "github.com/tomnomnom/assetfinder"; - src = fetchFromGitHub { owner = "tomnomnom"; repo = "assetfinder"; @@ -16,6 +14,12 @@ buildGoPackage rec { hash = "sha256-7+YF1VXBcFehKw9JzurmXNu8yeZPdqfQEuaqwtR4AuA="; }; + postPatch = '' + go mod init github.com/tomnomnom/assetfinder + ''; + + vendorHash = null; + meta = with lib; { homepage = "https://github.com/tomnomnom/assetfinder"; description = "Find domains and subdomains related to a given domain"; diff --git a/pkgs/by-name/nu/nuclei-templates/package.nix b/pkgs/by-name/nu/nuclei-templates/package.nix index 1d4910c212de7..c21a3f877b323 100644 --- a/pkgs/by-name/nu/nuclei-templates/package.nix +++ b/pkgs/by-name/nu/nuclei-templates/package.nix @@ -6,13 +6,13 @@ stdenvNoCC.mkDerivation rec { pname = "nuclei-templates"; - version = "9.8.7"; + version = "9.8.8"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "nuclei-templates"; rev = "refs/tags/v${version}"; - hash = "sha256-Masj0v9WGcLJKd/43T4klwyIM2uqhvuLSW5PBuKzsQg="; + hash = "sha256-6oY22IQKCV00MtxUw4YwY2U/xH+N06n371DSK7C0nj8="; }; installPhase = '' diff --git a/pkgs/by-name/ow/owncloud-client/package.nix b/pkgs/by-name/ow/owncloud-client/package.nix index e30304fde30b9..22666f20b3074 100644 --- a/pkgs/by-name/ow/owncloud-client/package.nix +++ b/pkgs/by-name/ow/owncloud-client/package.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "owncloud-client"; - version = "5.2.1"; + version = "5.3.0"; src = fetchFromGitHub { owner = "owncloud"; repo = "client"; rev = "refs/tags/v${version}"; - hash = "sha256-yErMHh0QbWVpJhNiXU1IIGpQ5CGARN/4cqELRMoxSac="; + hash = "sha256-2BM5XoblPwI2xr0e9VHiN4ePkyUx+NyMDY7HkWa9uZM="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ph/phpunit/package.nix b/pkgs/by-name/ph/phpunit/package.nix index 47a29be92f1de..ab4966ecf417e 100644 --- a/pkgs/by-name/ph/phpunit/package.nix +++ b/pkgs/by-name/ph/phpunit/package.nix @@ -6,16 +6,16 @@ php.buildComposerProject (finalAttrs: { pname = "phpunit"; - version = "11.1.3"; + version = "11.2.0"; src = fetchFromGitHub { owner = "sebastianbergmann"; repo = "phpunit"; rev = finalAttrs.version; - hash = "sha256-Wq2k44WpUhDhSyIx8ofn/jUR7FS3zn2CCe4OiFKHXEA="; + hash = "sha256-5MWhHMKCy9rrVO1bqyGykWFGw9zI1t6QGVkenvFpGbY="; }; - vendorHash = "sha256-kjMJCrMG08AXX662GAR5+V6w1+WOv8F9r6ONIOowP8Q="; + vendorHash = "sha256-w2Yu0T8omr8F7r5nBZOmRJE0LEdGQ3XAdxNZoK1sx1M="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/py/pyright/package.nix b/pkgs/by-name/py/pyright/package.nix index 388831d78dcb9..d790b51d52eb3 100644 --- a/pkgs/by-name/py/pyright/package.nix +++ b/pkgs/by-name/py/pyright/package.nix @@ -1,13 +1,13 @@ { lib, buildNpmPackage, fetchFromGitHub, runCommand, jq }: let - version = "1.1.365"; + version = "1.1.366"; src = fetchFromGitHub { owner = "Microsoft"; repo = "pyright"; rev = "${version}"; - hash = "sha256-plXNjT36xLmGftkLREsjKGHQWBGA12hIUOBCtTf8710="; + hash = "sha256-xs93PnDTtDsdi9YeZk0nyinCs4+eJJNFg7NagHF15rI="; }; patchedPackageJSON = runCommand "package.json" { } '' @@ -37,7 +37,7 @@ let pname = "pyright-internal"; inherit version src; sourceRoot = "${src.name}/packages/pyright-internal"; - npmDepsHash = "sha256-oBpW4nEyiDGZhv+Yt0+yKg2xrLULpFjIOFRxIBLZ3bk="; + npmDepsHash = "sha256-jGLzsrf5RuqfyI3BJpmVsqijxtNlFexsub0186cUR+8="; dontNpmBuild = true; installPhase = '' runHook preInstall @@ -51,7 +51,7 @@ buildNpmPackage rec { inherit version src; sourceRoot = "${src.name}/packages/pyright"; - npmDepsHash = "sha256-/P2rx7BgaHZPHBC3DO89JjYtPD5ri2goGmgCkGWfby4="; + npmDepsHash = "sha256-8d3gRx93wfusvI3mov2B0jJuG+WpVaL8b+jdFzmqA3w="; postPatch = '' chmod +w ../../ diff --git a/pkgs/by-name/re/regal/package.nix b/pkgs/by-name/re/regal/package.nix index dd767a21d6436..d2212b5cb6762 100644 --- a/pkgs/by-name/re/regal/package.nix +++ b/pkgs/by-name/re/regal/package.nix @@ -2,16 +2,16 @@ buildGoModule rec { name = "regal"; - version = "0.22.0"; + version = "0.23.0"; src = fetchFromGitHub { owner = "StyraInc"; repo = "regal"; rev = "v${version}"; - hash = "sha256-3Q37ukeqf3n8UhriQNCWyRCgWOcxwO4TsNcsEnJn5eg="; + hash = "sha256-isivyYBxYinHQKfuLNyfXB1MNqdqNwu5iqsUd+WRwq8="; }; - vendorHash = "sha256-ejTBfoDYMt5Jpuq+uNgpdHCafR7IUVr8OFB84+m/ZFg="; + vendorHash = "sha256-I0aJFvJmmnxlqgeETOyg2/mjGX8lUJz99t56Qe+9uZg="; meta = with lib; { description = "a linter and language server for Rego"; diff --git a/pkgs/by-name/sn/snicat/deps.nix b/pkgs/by-name/sn/snicat/deps.nix deleted file mode 100644 index dca575f883443..0000000000000 --- a/pkgs/by-name/sn/snicat/deps.nix +++ /dev/null @@ -1,12 +0,0 @@ -[ - { - goPackagePath = "github.com/therootcompany/sclient"; - fetch = { - type = "FromGitHub"; - owner = "therootcompany"; - repo = "sclient"; - rev = "v1.5.0"; - sha256 = "sha256-NAFTOx2sm92K+d746Z5UpB1HGsJI6cJgmh+YTyVkJ0w="; - }; - } -] diff --git a/pkgs/by-name/sn/snicat/package.nix b/pkgs/by-name/sn/snicat/package.nix index bbc3fded5b2f1..d38a45f593899 100644 --- a/pkgs/by-name/sn/snicat/package.nix +++ b/pkgs/by-name/sn/snicat/package.nix @@ -1,8 +1,9 @@ { lib -, buildGoPackage +, buildGoModule , fetchFromGitHub +, fetchpatch }: -buildGoPackage rec { +buildGoModule rec { pname = "snicat"; version = "0.0.1"; @@ -13,18 +14,21 @@ buildGoPackage rec { hash = "sha256-fFlTBOz127le2Y7F9KKhbcldcyFEpAU5QiJ4VCAPs9Y="; }; - goPackagePath = "github.com/CTFd/snicat"; + patches = [ + # Migrate to Go modules + (fetchpatch { + url = "https://github.com/CTFd/snicat/commit/098a5ce3141bae5d2e188338d78517d710d10f70.patch"; + hash = "sha256-pIdXViUz14nkvL1H3u3oFkm308XA2POtKIGZOKDO6p8="; + }) + ]; - goDeps = ./deps.nix; + vendorHash = "sha256-27ykI9HK1jFanxwa6QrN6ZS548JbFNSZHaXr4ciCVOE="; + proxyVendor = true; - ldflags = [ "-s" "-w" "-X main.version=v${version}" ]; + ldflags = [ "-s" "-X main.version=v${version}" ]; - installPhase = '' - runHook preInstall - - install -Dm555 go/bin/snicat $out/bin/sc - - runHook postInstall + postInstall = '' + mv $out/bin/snicat $out/bin/sc ''; meta = with lib; { diff --git a/pkgs/by-name/sr/sr2t/package.nix b/pkgs/by-name/sr/sr2t/package.nix new file mode 100644 index 0000000000000..e49303258a165 --- /dev/null +++ b/pkgs/by-name/sr/sr2t/package.nix @@ -0,0 +1,40 @@ +{ + lib, + python3, + fetchFromGitLab, +}: + +python3.pkgs.buildPythonApplication rec { + pname = "sr2t"; + version = "0.0.26"; + pyproject = true; + + src = fetchFromGitLab { + owner = "0bs1d1an"; + repo = "sr2t"; + rev = "refs/tags/${version}"; + hash = "sha256-BPsYnKBTxt5WUd2+WumMdVi8p6iryOWG2MjI97qbaCw="; + }; + + build-system = with python3.pkgs; [ hatchling ]; + + dependencies = with python3.pkgs; [ + prettytable + pyyaml + setuptools + xlsxwriter + ]; + + # Project has no tests + doCheck = false; + + pythonImportsCheck = [ "sr2t" ]; + + meta = with lib; { + description = "Tool to convert scanning reports to a tabular format"; + homepage = "https://gitlab.com/0bs1d1an/sr2t"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ fab ]; + mainProgram = "sr2t"; + }; +} diff --git a/pkgs/by-name/st/stackql/package.nix b/pkgs/by-name/st/stackql/package.nix index 69c137e12d05e..fb3f8f65998e3 100644 --- a/pkgs/by-name/st/stackql/package.nix +++ b/pkgs/by-name/st/stackql/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "stackql"; - version = "0.5.643"; + version = "0.5.652"; src = fetchFromGitHub { owner = "stackql"; repo = "stackql"; rev = "v${version}"; - hash = "sha256-9W6bEI+5Q0Kgbd14sWKde3I6WIVz1ZxsXmR009mOPog="; + hash = "sha256-yE+XMAEsEYj2W3My2gXzZ2QD+YXj62BrzOa/mL+yMCE="; }; - vendorHash = "sha256-xcly4jtdUkx/s+YWYFBVeuI2kQBu2oqbLN9ZKkHppkA="; + vendorHash = "sha256-Tcfj1A3W07GkF7CECc5Tu9Er8n+OxsDrUgv7eSlu+wA="; ldflags = [ "-s" diff --git a/pkgs/by-name/su/supersonic/package.nix b/pkgs/by-name/su/supersonic/package.nix index fee32dc5f88d9..2f877d881ae4e 100644 --- a/pkgs/by-name/su/supersonic/package.nix +++ b/pkgs/by-name/su/supersonic/package.nix @@ -20,16 +20,16 @@ assert waylandSupport -> stdenv.isLinux; buildGoModule rec { pname = "supersonic" + lib.optionalString waylandSupport "-wayland"; - version = "0.10.1"; + version = "0.11.0"; src = fetchFromGitHub { owner = "dweymouth"; repo = "supersonic"; rev = "v${version}"; - hash = "sha256-0MbR6ah3UakLn/6Mfd156BlTZe7thNK6mAPLTuz298g="; + hash = "sha256-tuXpK1KYp0INSCuCQFw1crgPjqW655AagwHZswLrodg="; }; - vendorHash = "sha256-Ld1j/SFq5W+SKppAzk7UV74RD6/Dw+PWk0BhEGML5+k="; + vendorHash = "sha256-hYFz9XEYkHv9HOCYKE3a17eDUspv6QmkH/+ipjJuaz0="; nativeBuildInputs = [ copyDesktopItems diff --git a/pkgs/by-name/te/terraform-plugin-docs/package.nix b/pkgs/by-name/te/terraform-plugin-docs/package.nix index 32c8e7d573028..01e53dd08f2b1 100644 --- a/pkgs/by-name/te/terraform-plugin-docs/package.nix +++ b/pkgs/by-name/te/terraform-plugin-docs/package.nix @@ -10,13 +10,13 @@ buildGoModule rec { pname = "terraform-plugin-docs"; - version = "0.19.3"; + version = "0.19.4"; src = fetchFromGitHub { owner = "hashicorp"; repo = "terraform-plugin-docs"; rev = "refs/tags/v${version}"; - sha256 = "sha256-UPTiIY2aW6XDmJnMb1ATNWe3BvZQnPL0BweC/gxtztQ="; + sha256 = "sha256-UEF+CsY302AJApDhnrPoTo09EcR/VOo10bXSf0XgtZk="; }; vendorHash = "sha256-ZSHCP0eZWCvSObbUOSl0ohiiX79MyGC2ALowzvMXMv4="; diff --git a/pkgs/by-name/ti/tippecanoe/package.nix b/pkgs/by-name/ti/tippecanoe/package.nix index 89740de334fa6..05d19692f375c 100644 --- a/pkgs/by-name/ti/tippecanoe/package.nix +++ b/pkgs/by-name/ti/tippecanoe/package.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "tippecanoe"; - version = "2.53.0"; + version = "2.55.0"; src = fetchFromGitHub { owner = "felt"; repo = "tippecanoe"; rev = finalAttrs.version; - hash = "sha256-0GBrGLE0owhGTc/+D1W6X+hkpuX2GPu6gXQ7J2pHK9o="; + hash = "sha256-hF1tiI5M8BdJoJEZDqC6BkzndmYRQU4jHhjUvYowBTU="; }; buildInputs = [ sqlite zlib ]; diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index 86eaf142d9205..fde8913d5158a 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -93,9 +93,9 @@ in { major = "3"; minor = "13"; patch = "0"; - suffix = "b1"; + suffix = "b2"; }; - hash = "sha256-unFqxWsDm1Ra1KkM5Yaleql4aTZFU3Ru8kRXKM7sGY4="; + hash = "sha256-vxG+AbQqB6Nlnk4jNZHgPaYxtxEqph7h4DDuuMXf2Gk="; inherit (darwin) configd; inherit passthruFun; }; diff --git a/pkgs/development/python-modules/brother/default.nix b/pkgs/development/python-modules/brother/default.nix index e93d877286146..94380a638c639 100644 --- a/pkgs/development/python-modules/brother/default.nix +++ b/pkgs/development/python-modules/brother/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + freezegun, dacite, pysnmp-lextudio, pytest-asyncio, @@ -9,11 +10,12 @@ pytestCheckHook, pythonOlder, setuptools, + syrupy }: buildPythonPackage rec { pname = "brother"; - version = "4.1.0"; + version = "4.2.0"; pyproject = true; disabled = pythonOlder "3.11"; @@ -22,7 +24,7 @@ buildPythonPackage rec { owner = "bieniu"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-W7bakj/94l0pL5fOb+CK+Z6k1cbv/CY9XjXGYZfLFY4="; + hash = "sha256-5fd+UznnOFnqYL8CPX90Y2z6q35oUH638mz4l+Ux6oE="; }; nativeBuildInputs = [ setuptools ]; @@ -33,9 +35,11 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ + freezegun pytest-asyncio pytest-error-for-skips pytestCheckHook + syrupy ]; pythonImportsCheck = [ "brother" ]; diff --git a/pkgs/development/python-modules/chromadb/default.nix b/pkgs/development/python-modules/chromadb/default.nix index ed4c8d541a145..f765aa767db97 100644 --- a/pkgs/development/python-modules/chromadb/default.nix +++ b/pkgs/development/python-modules/chromadb/default.nix @@ -136,6 +136,11 @@ buildPythonPackage rec { export HOME=$(mktemp -d) ''; + disabledTests = [ + # flaky / timing sensitive + "test_fastapi_server_token_authn_allows_when_it_should_allow" + ]; + disabledTestPaths = [ # Tests require network access "chromadb/test/property/test_cross_version_persist.py" diff --git a/pkgs/development/python-modules/hakuin/default.nix b/pkgs/development/python-modules/hakuin/default.nix new file mode 100644 index 0000000000000..d8b9ff2441d02 --- /dev/null +++ b/pkgs/development/python-modules/hakuin/default.nix @@ -0,0 +1,42 @@ +{ + lib, + aiohttp, + buildPythonPackage, + fetchFromGitHub, + jinja2, + nltk, + setuptools, +}: + +buildPythonPackage rec { + pname = "hakuin"; + version = "0-unstable-2024-03-31"; + pyproject = true; + + src = fetchFromGitHub { + owner = "pruzko"; + repo = "hakuin"; + rev = "3b7b76dcbfb8ab2b98e6dee08df02158327af772"; + hash = "sha256-tRjo9a0ZCBjKxbXTkiKFzfL4pL5awF5vXmsJlYxwoIw="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + aiohttp + jinja2 + nltk + ]; + + # Module has no test + doCheck = false; + + pythonImportsCheck = [ "hakuin" ]; + + meta = with lib; { + description = "Blind SQL Injection optimization and automation framework"; + homepage = "https://github.com/pruzko/hakuin"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/llama-index-agent-openai/default.nix b/pkgs/development/python-modules/llama-index-agent-openai/default.nix index 57e6554ba4b3a..7cd5fb8241c94 100644 --- a/pkgs/development/python-modules/llama-index-agent-openai/default.nix +++ b/pkgs/development/python-modules/llama-index-agent-openai/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "llama-index-agent-openai"; - version = "0.2.5"; + version = "0.2.7"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_agent_openai"; inherit version; - hash = "sha256-RfTMZw0Deopn9UHTpNCV9/Ycr/btLCVwJEHrERbUtJU="; + hash = "sha256-E85TXwPjLIIXY8AeJq9CIvOYEXhiJBTThoAToZRugSQ="; }; pythonRelaxDeps = [ "llama-index-llms-openai" ]; diff --git a/pkgs/development/python-modules/std-uritemplate/default.nix b/pkgs/development/python-modules/std-uritemplate/default.nix index 5b5d2faa301c7..d0dbb244299d8 100644 --- a/pkgs/development/python-modules/std-uritemplate/default.nix +++ b/pkgs/development/python-modules/std-uritemplate/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "std-uritemplate"; - version = "0.0.57"; + version = "0.0.59"; pyproject = true; disabled = pythonOlder "3.8"; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "std_uritemplate"; inherit version; - hash = "sha256-9K3HF67BOFYuZSuV2nT8aBWpQiMdlxMUhWuB9DTBuUw="; + hash = "sha256-LZHniQNIEP2p1iIigmLokse7P7PFyqbjF+xi4EOwnLc="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/tools/language-servers/lua-language-server/default.nix b/pkgs/development/tools/language-servers/lua-language-server/default.nix index 7b9ad09191d0f..79405ece97043 100644 --- a/pkgs/development/tools/language-servers/lua-language-server/default.nix +++ b/pkgs/development/tools/language-servers/lua-language-server/default.nix @@ -1,14 +1,24 @@ -{ lib, stdenv, fetchFromGitHub, ninja, makeWrapper, CoreFoundation, Foundation, ditto }: +{ + lib, + stdenv, + fetchFromGitHub, + ninja, + makeWrapper, + CoreFoundation, + Foundation, + ditto, + nix-update-script, +}: stdenv.mkDerivation (finalAttrs: { pname = "lua-language-server"; - version = "3.9.1"; + version = "3.9.2"; src = fetchFromGitHub { owner = "luals"; repo = "lua-language-server"; rev = finalAttrs.version; - hash = "sha256-M4eTrs5Ue2+b40TPdW4LZEACGYCE/J9dQodEk9d+gpY="; + hash = "sha256-DZ2YLrhqryB3kvQnhbgmwqss2kzIAsFZVXDnxFpcdLQ="; fetchSubmodules = true; }; @@ -23,29 +33,29 @@ stdenv.mkDerivation (finalAttrs: { ditto ]; - postPatch = '' - # filewatch tests are failing on darwin - # this feature is not used in lua-language-server - sed -i /filewatch/d 3rd/bee.lua/test/test.lua - - pushd 3rd/luamake - '' + lib.optionalString stdenv.isDarwin '' - # This package uses the program clang for C and C++ files. The language - # is selected via the command line argument -std, but this do not work - # in combination with the nixpkgs clang wrapper. Therefor we have to - # find all c++ compiler statements and replace $cc (which expands to - # clang) with clang++. - sed -i compile/ninja/macos.ninja \ - -e '/c++/s,$cc,clang++,' \ - -e '/test.lua/s,= .*,= true,' \ - -e '/ldl/s,$cc,clang++,' - sed -i scripts/compiler/gcc.lua \ - -e '/cxx_/s,$cc,clang++,' - ''; + postPatch = + '' + # filewatch tests are failing on darwin + # this feature is not used in lua-language-server + sed -i /filewatch/d 3rd/bee.lua/test/test.lua - ninjaFlags = [ - "-fcompile/ninja/${if stdenv.isDarwin then "macos" else "linux"}.ninja" - ]; + pushd 3rd/luamake + '' + + lib.optionalString stdenv.isDarwin '' + # This package uses the program clang for C and C++ files. The language + # is selected via the command line argument -std, but this do not work + # in combination with the nixpkgs clang wrapper. Therefor we have to + # find all c++ compiler statements and replace $cc (which expands to + # clang) with clang++. + sed -i compile/ninja/macos.ninja \ + -e '/c++/s,$cc,clang++,' \ + -e '/test.lua/s,= .*,= true,' \ + -e '/ldl/s,$cc,clang++,' + sed -i scripts/compiler/gcc.lua \ + -e '/cxx_/s,$cc,clang++,' + ''; + + ninjaFlags = [ "-fcompile/ninja/${if stdenv.isDarwin then "macos" else "linux"}.ninja" ]; postBuild = '' popd @@ -75,12 +85,18 @@ stdenv.mkDerivation (finalAttrs: { # some tests require local networking __darwinAllowLocalNetworking = true; + passthru.updateScript = nix-update-script { }; + meta = with lib; { description = "A language server that offers Lua language support"; homepage = "https://github.com/luals/lua-language-server"; changelog = "https://github.com/LuaLS/lua-language-server/blob/${finalAttrs.version}/changelog.md"; license = licenses.mit; - maintainers = with maintainers; [ figsoda gepbird sei40kr ]; + maintainers = with maintainers; [ + figsoda + gepbird + sei40kr + ]; mainProgram = "lua-language-server"; platforms = platforms.linux ++ platforms.darwin; }; diff --git a/pkgs/development/tools/rust/rustup/0001-dynamically-patchelf-binaries.patch b/pkgs/development/tools/rust/rustup/0001-dynamically-patchelf-binaries.patch index 2b191031da607..c3d3b5f8d7b19 100644 --- a/pkgs/development/tools/rust/rustup/0001-dynamically-patchelf-binaries.patch +++ b/pkgs/development/tools/rust/rustup/0001-dynamically-patchelf-binaries.patch @@ -1,39 +1,185 @@ diff --git a/src/dist/component/package.rs b/src/dist/component/package.rs -index 73a533b5..408ab815 100644 +index dfccc661..85233f3b 100644 --- a/src/dist/component/package.rs +++ b/src/dist/component/package.rs -@@ -113,6 +113,7 @@ fn install<'a>( +@@ -113,6 +113,7 @@ impl Package for DirectoryPackage { } else { builder.move_file(path.clone(), &src_path)? } -+ nix_patchelf_if_needed(&target.prefix().path().join(path.clone()), &src_path) ++ nix_patchelf_if_needed(&target.prefix().path().join(path.clone())) } "dir" => { if self.copy { -@@ -135,6 +136,29 @@ fn components(&self) -> Vec<String> { +@@ -135,6 +136,175 @@ impl Package for DirectoryPackage { } } -+fn nix_patchelf_if_needed(dest_path: &Path, src_path: &Path) { -+ let (is_bin, is_lib) = if let Some(p) = src_path.parent() { -+ (p.ends_with("bin") || p.ends_with("libexec"), p.ends_with("lib")) -+ } else { -+ (false, false) -+ }; ++fn nix_wrap_lld(dest_lld_path: &Path) -> Result<()> { ++ use std::fs; ++ use std::io::Write; ++ use std::os::unix::fs::PermissionsExt; ++ ++ let path = dest_lld_path.parent().unwrap(); ++ let mut unwrapped_name = path.file_name().unwrap().to_string_lossy().to_string(); ++ unwrapped_name.push_str("-unwrapped"); ++ let unwrapped_dir = path.with_file_name(unwrapped_name); ++ fs::create_dir(&unwrapped_dir).context("failed to create unwrapped directory")?; ++ let mut unwrapped_lld = unwrapped_dir; ++ unwrapped_lld.push(dest_lld_path.file_name().unwrap()); ++ fs::rename(dest_lld_path, &unwrapped_lld).context("failed to move file")?; ++ let mut ld_wrapper_path = std::env::current_exe()? ++ .parent() ++ .ok_or(anyhow!("failed to get parent directory"))? ++ .with_file_name("nix-support"); ++ let mut file = std::fs::File::create(dest_lld_path)?; ++ ld_wrapper_path.push("ld-wrapper.sh"); ++ ++ let wrapped_script = format!( ++ "#!/usr/bin/env bash ++set -eu -o pipefail +o posix ++shopt -s nullglob ++export PROG=\"{}\" ++\"{}\" $@", ++ unwrapped_lld.to_string_lossy().to_string(), ++ ld_wrapper_path.to_string_lossy().to_string(), ++ ); ++ file.write_all(wrapped_script.as_bytes())?; ++ let mut permissions = file.metadata()?.permissions(); ++ permissions.set_mode(0o755); ++ file.set_permissions(permissions)?; ++ Ok(()) ++} ++ ++fn nix_patchelf_if_needed(dest_path: &Path) { ++ use std::fs::File; ++ use std::os::unix::fs::FileExt; ++ ++ struct ELFReader<'a> { ++ file: &'a mut File, ++ is_32bit: bool, ++ is_little_end: bool, ++ } ++ ++ impl<'a> ELFReader<'a> { ++ const MAGIC_NUMBER: &'static [u8] = &[0x7F, 0x45, 0x4c, 0x46]; ++ const ET_EXEC: u16 = 0x2; ++ const ET_DYN: u16 = 0x3; ++ const PT_INTERP: u32 = 0x3; ++ ++ fn new(file: &'a mut File) -> Option<Self> { ++ let mut magic_number = [0; 4]; ++ file.read_exact(&mut magic_number).ok()?; ++ if Self::MAGIC_NUMBER != magic_number { ++ return None; ++ } ++ let mut ei_class = [0; 1]; ++ file.read_exact_at(&mut ei_class, 0x4).ok()?; ++ let is_32bit = ei_class[0] == 1; ++ let mut ei_data = [0; 1]; ++ file.read_exact_at(&mut ei_data, 0x5).ok()?; ++ let is_little_end = ei_data[0] == 1; ++ Some(Self { ++ file, ++ is_32bit, ++ is_little_end, ++ }) ++ } ++ ++ fn is_exec_or_dyn(&self) -> bool { ++ let e_type = self.read_u16_at(0x10); ++ e_type == Self::ET_EXEC || e_type == Self::ET_DYN ++ } ++ ++ fn e_phoff(&self) -> u64 { ++ if self.is_32bit { ++ self.read_u32_at(0x1C) as u64 ++ } else { ++ self.read_u64_at(0x20) ++ } ++ } ++ ++ fn e_phentsize(&self) -> u64 { ++ let offset = if self.is_32bit { 0x2A } else { 0x36 }; ++ self.read_u16_at(offset) as u64 ++ } ++ ++ fn e_phnum(&self) -> u64 { ++ let offset = if self.is_32bit { 0x2C } else { 0x38 }; ++ self.read_u16_at(offset) as u64 ++ } + -+ if is_bin { -+ let _ = ::std::process::Command::new("@patchelf@/bin/patchelf") ++ fn has_interp(&self) -> bool { ++ let e_phoff = self.e_phoff(); ++ let e_phentsize = self.e_phentsize(); ++ let e_phnum = self.e_phnum(); ++ for i in 0..e_phnum { ++ let p_type = self.read_u32_at(e_phoff + i * e_phentsize); ++ if p_type == Self::PT_INTERP { ++ return true; ++ } ++ } ++ false ++ } ++ ++ fn read_u16_at(&self, offset: u64) -> u16 { ++ let mut data = [0; 2]; ++ self.file.read_exact_at(&mut data, offset).unwrap(); ++ if self.is_little_end { ++ u16::from_le_bytes(data) ++ } else { ++ u16::from_be_bytes(data) ++ } ++ } ++ ++ fn read_u32_at(&self, offset: u64) -> u32 { ++ let mut data = [0; 4]; ++ self.file.read_exact_at(&mut data, offset).unwrap(); ++ if self.is_little_end { ++ u32::from_le_bytes(data) ++ } else { ++ u32::from_be_bytes(data) ++ } ++ } ++ ++ fn read_u64_at(&self, offset: u64) -> u64 { ++ let mut data = [0; 8]; ++ self.file.read_exact_at(&mut data, offset).unwrap(); ++ if self.is_little_end { ++ u64::from_le_bytes(data) ++ } else { ++ u64::from_be_bytes(data) ++ } ++ } ++ } ++ ++ let Some(mut dest_file) = File::open(dest_path).ok() else { ++ return; ++ }; ++ let Some(elf) = ELFReader::new(&mut dest_file) else { ++ return; ++ }; ++ if !elf.is_exec_or_dyn() { ++ return; ++ } ++ let mut patch_command = std::process::Command::new("@patchelf@/bin/patchelf"); ++ if elf.has_interp() { ++ patch_command + .arg("--set-interpreter") -+ .arg("@dynamicLinker@") -+ .arg(dest_path) -+ .output(); ++ .arg("@dynamicLinker@"); ++ } ++ if Some(std::ffi::OsStr::new("rust-lld")) == dest_path.file_name() || !elf.has_interp() { ++ patch_command.arg("--add-rpath").arg("@libPath@"); + } -+ else if is_lib { -+ let _ = ::std::process::Command::new("@patchelf@/bin/patchelf") -+ .arg("--set-rpath") -+ .arg("@libPath@") -+ .arg(dest_path) -+ .output(); ++ ++ debug!("patching {dest_path:?} using patchelf"); ++ if let Err(err) = patch_command.arg(dest_path).output() { ++ warn!("failed to execute patchelf: {err:?}"); ++ } ++ ++ if Some(std::ffi::OsStr::new("ld.lld")) == dest_path.file_name() { ++ if let Err(err) = nix_wrap_lld(dest_path) { ++ warn!("failed to wrap `ld.lld`: {err:?}"); ++ } + } +} + diff --git a/pkgs/development/tools/rust/rustup/default.nix b/pkgs/development/tools/rust/rustup/default.nix index e5874580d3f90..0751eb4945ae4 100644 --- a/pkgs/development/tools/rust/rustup/default.nix +++ b/pkgs/development/tools/rust/rustup/default.nix @@ -48,7 +48,12 @@ rustPlatform.buildRustPackage rec { checkFeatures = [ ]; patches = lib.optionals stdenv.isLinux [ - (runCommand "0001-dynamically-patchelf-binaries.patch" { CC = stdenv.cc; patchelf = patchelf; libPath = "$ORIGIN/../lib:${libPath}"; } '' + (runCommand "0001-dynamically-patchelf-binaries.patch" + { + CC = stdenv.cc; + patchelf = patchelf; + libPath = "${libPath}"; + } '' export dynamicLinker=$(cat $CC/nix-support/dynamic-linker) substitute ${./0001-dynamically-patchelf-binaries.patch} $out \ --subst-var patchelf \ @@ -96,8 +101,23 @@ rustPlatform.buildRustPackage rec { # Note: fish completion script is not supported. $out/bin/rustup completions bash cargo > "$out/share/bash-completion/completions/cargo" $out/bin/rustup completions zsh cargo > "$out/share/zsh/site-functions/_cargo" + + # add a wrapper script for ld.lld + mkdir -p $out/nix-support + substituteAll ${../../../../../pkgs/build-support/wrapper-common/utils.bash} $out/nix-support/utils.bash + substituteAll ${../../../../../pkgs/build-support/bintools-wrapper/add-flags.sh} $out/nix-support/add-flags.sh + substituteAll ${../../../../../pkgs/build-support/bintools-wrapper/add-hardening.sh} $out/nix-support/add-hardening.sh + export prog='$PROG' + export use_response_file_by_default=0 + substituteAll ${../../../../../pkgs/build-support/bintools-wrapper/ld-wrapper.sh} $out/nix-support/ld-wrapper.sh + chmod +x $out/nix-support/ld-wrapper.sh ''; + env = lib.optionalAttrs (pname == "rustup") { + inherit (stdenv.cc.bintools) expandResponseParams shell suffixSalt wrapperName coreutils_bin; + hardening_unsupported_flags = ""; + }; + meta = with lib; { description = "The Rust toolchain installer"; homepage = "https://www.rustup.rs/"; diff --git a/pkgs/servers/home-assistant/stubs.nix b/pkgs/servers/home-assistant/stubs.nix index 129eaa54834c4..5c624c2cad114 100644 --- a/pkgs/servers/home-assistant/stubs.nix +++ b/pkgs/servers/home-assistant/stubs.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "homeassistant-stubs"; - version = "2024.6.0"; + version = "2024.6.1"; pyproject = true; disabled = python.version != home-assistant.python.version; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "KapJI"; repo = "homeassistant-stubs"; rev = "refs/tags/${version}"; - hash = "sha256-QqY4OcICM2QvLP75aAw+6ualzJ4L+oQk+o4mmcNMax4="; + hash = "sha256-+zwhZ5og9OUb31gAZNbMM0ECswopZWKxhU+5lkjwaco="; }; build-system = [ diff --git a/pkgs/servers/monitoring/grafana-agent/default.nix b/pkgs/servers/monitoring/grafana-agent/default.nix index a1738695604b0..ec0729b2717fb 100644 --- a/pkgs/servers/monitoring/grafana-agent/default.nix +++ b/pkgs/servers/monitoring/grafana-agent/default.nix @@ -15,16 +15,16 @@ buildGoModule rec { pname = "grafana-agent"; - version = "0.41.0"; + version = "0.41.1"; src = fetchFromGitHub { owner = "grafana"; repo = "agent"; rev = "v${version}"; - hash = "sha256-I763iHBMWnfGzh6KyGGzZekafseEIetnflnVVvro/cE="; + hash = "sha256-A/h8Mwtor4VUT7e7TsNiE/0OOXCSq38GAf9j7c8ZDKk="; }; - vendorHash = "sha256-ueU9n57KUiUe2kXcxDsxpidjwmDLN8eoFO9nQRkZyKY="; + vendorHash = "sha256-W29GZoZfgjdSwGiFz4udGA9gXgmM0xIDEGld7ZE1ycQ="; proxyVendor = true; # darwin/linux hash mismatch frontendYarnOfflineCache = fetchYarnDeps { diff --git a/pkgs/servers/monitoring/prometheus/fastly-exporter.nix b/pkgs/servers/monitoring/prometheus/fastly-exporter.nix index 5a52027bc5d1a..84c990e4f7041 100644 --- a/pkgs/servers/monitoring/prometheus/fastly-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/fastly-exporter.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "fastly-exporter"; - version = "8.0.0"; + version = "8.1.0"; src = fetchFromGitHub { owner = "fastly"; repo = "fastly-exporter"; rev = "v${version}"; - hash = "sha256-3XIw9Sq7aQ6bs7kY0fYP3UGfJeq80gB2vXX69EEOtl4="; + hash = "sha256-SpYdcLPknI7ecZ2ef3kJ2nBkQ39vzjk1fNTdDaFZwO0="; }; - vendorHash = "sha256-kiP9nL/fVnekIf1ABAbSNebszcrj/xkFw9NcuBr/wKQ="; + vendorHash = "sha256-k/n9muWFtTBv8PxMdevFBeTtAOIiCDrK3GoCGeMtBn4="; passthru.tests = { inherit (nixosTests.prometheus-exporters) fastly; diff --git a/pkgs/tools/graphics/mangohud/default.nix b/pkgs/tools/graphics/mangohud/default.nix index bb14ef0f37025..eed9f33ff5e7a 100644 --- a/pkgs/tools/graphics/mangohud/default.nix +++ b/pkgs/tools/graphics/mangohud/default.nix @@ -231,8 +231,9 @@ stdenv.mkDerivation (finalAttrs: { substituteInPlace $out/share/vulkan/implicit_layer.d/MangoHud.${layerPlatform}.json \ --replace "VK_LAYER_MANGOHUD_overlay" "VK_LAYER_MANGOHUD_overlay_${toString stdenv.hostPlatform.parsed.cpu.bits}" '' + '' - # Add OpenGL driver path to RUNPATH to support NVIDIA cards + # Add OpenGL driver and libXNVCtrl paths to RUNPATH to support NVIDIA cards addOpenGLRunpath "$out/lib/mangohud/libMangoHud.so" + patchelf --add-rpath ${libXNVCtrl}/lib "$out/lib/mangohud/libMangoHud.so" '' + lib.optionalString gamescopeSupport '' addOpenGLRunpath "$out/bin/mangoapp" '' + lib.optionalString finalAttrs.finalPackage.doCheck '' diff --git a/pkgs/tools/misc/mpremote/default.nix b/pkgs/tools/misc/mpremote/default.nix index 149e3c9686ac3..5776bb5a05f5e 100644 --- a/pkgs/tools/misc/mpremote/default.nix +++ b/pkgs/tools/misc/mpremote/default.nix @@ -9,13 +9,13 @@ }: buildPythonApplication rec { pname = "mpremote"; - version = "1.22.2"; + version = "1.23.0"; src = fetchFromGitHub { owner = "micropython"; repo = "micropython"; rev = "refs/tags/v${version}"; - hash = "sha256-67CAR34VrMOzvNkukDeGRnUfoOLO66R37wsrRHjpp5E="; + hash = "sha256-TEW9aDXodPYWlm7xxodaG/2sXOCPpDUKtYVzYZgAzf4="; }; sourceRoot = "${src.name}/tools/mpremote"; format = "pyproject"; diff --git a/pkgs/tools/package-management/nix-top/default.nix b/pkgs/tools/package-management/nix-top/default.nix index dc49f2a739e94..d9dcc2d64ec68 100644 --- a/pkgs/tools/package-management/nix-top/default.nix +++ b/pkgs/tools/package-management/nix-top/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/samueldr/nix-top"; license = licenses.mit; maintainers = with maintainers; [ samueldr ]; - platforms = platforms.linux ++ platforms.darwin; + platforms = platforms.linux ++ platforms.darwin ++ platforms.freebsd; mainProgram = "nix-top"; }; } diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 92bd7f630fc1d..2a89512a8f213 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -604,6 +604,7 @@ mapAliases ({ k3s_1_24 = throw "'k3s_1_24' has been removed from nixpkgs as it has reached end of life"; # Added 2024-03-14 k3s_1_25 = throw "'k3s_1_25' has been removed from nixpkgs as it has reached end of life"; # Added 2024-03-14 k3s_1_26 = throw "'k3s_1_26' has been removed from nixpkgs as it has reached end of life"; # Added 2024-05-20 + k3s_1_27 = throw "'k3s_1_27' has been removed from nixpkgs as it has reached end of life on 2024-06-28"; # Added 2024-06-01 # k3d was a 3d editing software k-3d - "k3d has been removed because it was broken and has seen no release since 2016" Added 2022-01-04 # now kube3d/k3d will take it's place kube3d = k3d; # Added 2022-0705 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dd38484e1e66d..0c12267eb2f71 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5061,7 +5061,7 @@ with pkgs; element-desktop = callPackage ../applications/networking/instant-messengers/element/element-desktop.nix { inherit (darwin.apple_sdk.frameworks) Security AppKit CoreServices; - electron = electron_29; + electron = electron_30; }; element-desktop-wayland = writeScriptBin "element-desktop" '' #!/bin/sh @@ -32011,7 +32011,7 @@ with pkgs; inherit (callPackage ../applications/networking/cluster/k3s { buildGoModule = buildGo121Module; go = go_1_21; - }) k3s_1_27 k3s_1_28 k3s_1_29; + }) k3s_1_28 k3s_1_29; inherit (callPackage ../applications/networking/cluster/k3s { buildGoModule = buildGo122Module; go = go_1_22; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d01b3d576db6b..b287d26d9c0ec 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5296,6 +5296,8 @@ self: super: with self; { hahomematic = callPackage ../development/python-modules/hahomematic { }; + hakuin = callPackage ../development/python-modules/hakuin { }; + halo = callPackage ../development/python-modules/halo { }; halohome = callPackage ../development/python-modules/halohome { }; |