diff options
Diffstat (limited to 'pkgs')
59 files changed, 538 insertions, 408 deletions
diff --git a/pkgs/applications/editors/lapce/default.nix b/pkgs/applications/editors/lapce/default.nix index 3f874f896a4ec..ba02a06a6ee87 100644 --- a/pkgs/applications/editors/lapce/default.nix +++ b/pkgs/applications/editors/lapce/default.nix @@ -1,7 +1,7 @@ { lib , stdenv , fetchFromGitHub -, gitUpdater +, nix-update-script , rustPlatform , cmake , pkg-config @@ -24,16 +24,16 @@ rustPlatform.buildRustPackage rec { pname = "lapce"; - version = "0.2.4"; + version = "0.2.5"; src = fetchFromGitHub { owner = "lapce"; repo = pname; rev = "v${version}"; - sha256 = "sha256-A0HeZB022GFrZFkdcSuzUmNBxxZHKCcqtTUh5MbGsEg="; + sha256 = "sha256-WFFn1l7d70x5v6jo5m+Thq1WoZjY7f8Lvr3U473xx48="; }; - cargoSha256 = "sha256-XracOWjkFZiv5bc3Xfm8sRta6CdO5rjrYAzRs3JT0rc="; + cargoSha256 = "sha256-9e0pUztrIL5HGHrS2pHA1hkH2v24AEQ2RiogLRAxyeo="; nativeBuildInputs = [ cmake @@ -76,8 +76,8 @@ rustPlatform.buildRustPackage rec { categories = [ "Development" "Utility" "TextEditor" ]; }) ]; - passthru.updateScript = gitUpdater { - rev-prefix = "v"; + passthru.updateScript = nix-update-script { + attrPath = pname; }; meta = with lib; { diff --git a/pkgs/applications/editors/vscode/extensions/rust-analyzer/default.nix b/pkgs/applications/editors/vscode/extensions/rust-analyzer/default.nix index c7088c9f24619..531e44f666852 100644 --- a/pkgs/applications/editors/vscode/extensions/rust-analyzer/default.nix +++ b/pkgs/applications/editors/vscode/extensions/rust-analyzer/default.nix @@ -69,6 +69,8 @@ vscode-utils.buildVscodeExtension { name = "${pname}-${version}"; src = "${vsix}/${pname}.zip"; vscodeExtUniqueId = "${publisher}.${pname}"; + vscodeExtPublisher = publisher; + vscodeExtName = pname; nativeBuildInputs = lib.optionals setDefaultServerPath [ jq moreutils ]; diff --git a/pkgs/applications/editors/vscode/extensions/vscode-lldb/default.nix b/pkgs/applications/editors/vscode/extensions/vscode-lldb/default.nix index f87ab47726b04..c704e6f473006 100644 --- a/pkgs/applications/editors/vscode/extensions/vscode-lldb/default.nix +++ b/pkgs/applications/editors/vscode/extensions/vscode-lldb/default.nix @@ -8,6 +8,8 @@ let version = "1.8.1"; vscodeExtUniqueId = "${publisher}.${pname}"; + vscodeExtPublisher = publisher; + vscodeExtName = pname; src = fetchFromGitHub { owner = "vadimcn"; @@ -52,7 +54,7 @@ let in stdenv.mkDerivation { pname = "vscode-extension-${publisher}-${pname}"; - inherit src version vscodeExtUniqueId; + inherit src version vscodeExtUniqueId vscodeExtPublisher vscodeExtName; installPrefix = "share/vscode/extensions/${vscodeExtUniqueId}"; diff --git a/pkgs/applications/editors/vscode/extensions/vscode-utils.nix b/pkgs/applications/editors/vscode/extensions/vscode-utils.nix index 8f0112e5f608a..a9f66d8e9d484 100644 --- a/pkgs/applications/editors/vscode/extensions/vscode-utils.nix +++ b/pkgs/applications/editors/vscode/extensions/vscode-utils.nix @@ -5,6 +5,8 @@ let src, # Same as "Unique Identifier" on the extension's web page. # For the moment, only serve as unique extension dir. + vscodeExtPublisher, + vscodeExtName, vscodeExtUniqueId, configurePhase ? '' runHook preConfigure @@ -23,7 +25,10 @@ let name = "vscode-extension-${name}"; - inherit vscodeExtUniqueId; + passthru = { + inherit vscodeExtPublisher vscodeExtName vscodeExtUniqueId; + }; + inherit configurePhase buildPhase dontPatchELF dontStrip; installPrefix = "share/vscode/extensions/${vscodeExtUniqueId}"; @@ -54,9 +59,12 @@ let }: assert "" == name; assert null == src; buildVscodeExtension ((removeAttrs a [ "mktplcRef" "vsix" ]) // { name = "${mktplcRef.publisher}-${mktplcRef.name}-${mktplcRef.version}"; + version = mktplcRef.version; src = if (vsix != null) then vsix else fetchVsixFromVscodeMarketplace mktplcRef; + vscodeExtPublisher = mktplcRef.publisher; + vscodeExtName = mktplcRef.name; vscodeExtUniqueId = "${mktplcRef.publisher}.${mktplcRef.name}"; }); diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index 5f7204012762d..1e1db2ea8937e 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -18,17 +18,17 @@ let archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "1m5mz6wdrivqrw699iivvh62bdn4yzm6hmph455sdyvk5icq59dq"; - x86_64-darwin = "1zn0h9p05kb3fcn816fpxh8asaglycjmpiwkrmxd0s8jwjq7m4gn"; - aarch64-linux = "1gs810iz08jxqfhcgi6ab41m46ib5h3m7i3pnyvlimxx99r5lirf"; - aarch64-darwin = "1dvasr1h28snxi33m6yx95pp3jd4irwy6yav4ilwrcl22cf6ybvi"; - armv7l-linux = "1j5vrpdaqihcr02pdsd5nz07zsk0027xmkfp30npnjy1gjrjvnim"; + x86_64-linux = "0f5l720gc47dygbk7mahx7pb088a8bfrnf69j3igvczbnfapx5sy"; + x86_64-darwin = "0qmji8bfnqvrxv4yk3rscvns1hk5wfwwdng8jblh5bilf657g1fc"; + aarch64-linux = "0qcmcsb97q303izhw8k4242nsb72my1vnf24hsfml4vr76f5qqbd"; + aarch64-darwin = "1cc8p5s8vr5bml715yx2lzkqa9q85rziswrhl1d11zagymvswjzn"; + armv7l-linux = "086c3wazjk30f8r8dgi0bjsvzcc6sa9d80cy4500pim7rb7s6ppn"; }.${system} or throwSystem; in callPackage ./generic.nix rec { # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.73.1"; + version = "1.74.1"; pname = "vscode"; executableName = "code" + lib.optionalString isInsiders "-insiders"; diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix index fcf6dea5e1472..19d656461471b 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 = "09ymqhg10flv3w38cb3fhrf5fvxz6aa12y75i009j01rjckvsymr"; - x86_64-darwin = "0kd9a8vk4ddp78m0y1fbzbpgpr5rwhxnfbg52wvky0grl58dh6v6"; - aarch64-linux = "17hwxwvvl3vy2s6wl1n2qkkdhlrf40z8wy0r5jhqrni79f6drkjz"; - aarch64-darwin = "1skgnn6rq0rkhj98q8y19cyyllk8xa1752lwn4qcgi568anap1lw"; - armv7l-linux = "0drz8kigjl82m3hfkpbqnmymy6fpgwmgbpkdwl2jkbl81iijvxvp"; + x86_64-linux = "07njvkgashg9mbkdf7cw40xdxh08qs8gbgh24gdznvs397bvk2jk"; + x86_64-darwin = "155f7rbyb413igvxddrrad0y1s7i9rfldm6d9fvbyz6p8nzyqfvh"; + aarch64-linux = "08wz44js381hjlnpssd09i2xz9min603n7a5v3x2sah4z9vi220d"; + aarch64-darwin = "0ikw0kcbvjwn6b0ac5zfp0shavay31yfhn000xrw9il3py741x7k"; + armv7l-linux = "1pvybhaf96ayjl832vz9c0y2m07mb5a16c2hr13l0vw52sbl30md"; }.${system} or throwSystem; sourceRoot = if stdenv.isDarwin then "" else "."; @@ -29,7 +29,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.73.1.22314"; + version = "1.74.1.22349"; pname = "vscodium"; executableName = "codium"; diff --git a/pkgs/applications/editors/vscode/with-extensions.nix b/pkgs/applications/editors/vscode/with-extensions.nix index 1c9c4be45631c..b748a8dee9763 100644 --- a/pkgs/applications/editors/vscode/with-extensions.nix +++ b/pkgs/applications/editors/vscode/with-extensions.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, runCommand, buildEnv, vscode, makeWrapper +{ lib, stdenv, runCommand, buildEnv, vscode, makeWrapper, writeText , vscodeExtensions ? [] }: /* @@ -46,12 +46,47 @@ let wrappedPkgVersion = lib.getVersion vscode; wrappedPkgName = lib.removeSuffix "-${wrappedPkgVersion}" vscode.name; + toExtensionJsonEntry = drv: rec { + identifier = { + id = "${drv.vscodeExtPublisher}.${drv.vscodeExtName}"; + uuid = ""; + }; + + version = drv.version; + + location = { + "$mid" = 1; + fsPath = drv.outPath + "/share/vscode/extensions/${drv.vscodeExtUniqueId}"; + path = location.fsPath; + scheme = "file"; + }; + + metadata = { + id = identifier.uuid; + publisherId = ""; + publisherDisplayName = drv.vscodeExtPublisher; + targetPlatform = "undefined"; + isApplicationScoped = false; + updated = false; + isPreReleaseVersion = false; + installedTimestamp = 0; + preRelease = false; + }; + }; + + extensionJson = builtins.toJSON (map toExtensionJsonEntry vscodeExtensions); + extensionJsonFile = writeText "extensions.json" extensionJson; + extensionJsonOutput = runCommand "vscode-extensions-json" {} '' + mkdir -p $out/share/vscode/extensions + cp ${extensionJsonFile} $out/share/vscode/extensions/extensions.json + ''; + combinedExtensionsDrv = buildEnv { name = "vscode-extensions"; - paths = vscodeExtensions; + paths = vscodeExtensions ++ [ extensionJsonOutput ]; }; - extensionsFlag = lib.optionalString (vscodeExtensions != []) '' + extensionsFlag = '' --add-flags "--extensions-dir ${combinedExtensionsDrv}/share/vscode/extensions" ''; in diff --git a/pkgs/applications/misc/openrgb/default.nix b/pkgs/applications/misc/openrgb/default.nix index ab8415a188230..ea81b58a2098c 100644 --- a/pkgs/applications/misc/openrgb/default.nix +++ b/pkgs/applications/misc/openrgb/default.nix @@ -1,35 +1,23 @@ -{ lib, mkDerivation, fetchFromGitLab, qmake, libusb1, hidapi, pkg-config, coreutils, mbedtls_2 }: +{ lib, stdenv, fetchFromGitLab, qmake, wrapQtAppsHook, libusb1, hidapi, pkg-config, coreutils, mbedtls_2, qtbase, qttools }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "openrgb"; - version = "0.7"; + version = "0.8"; src = fetchFromGitLab { owner = "CalcProgrammer1"; repo = "OpenRGB"; rev = "release_${version}"; - sha256 = "0xhfaz0b74nfnh7il2cz5c0338xlzay00g6hc2h3lsncarj8d5n7"; + sha256 = "sha256-46dL1D5oVlw6mNuFDCbbrUDmq42yFXV/qFJ1JnPT5/s="; }; - nativeBuildInputs = [ qmake pkg-config ]; - buildInputs = [ libusb1 hidapi mbedtls_2 ]; + nativeBuildInputs = [ qmake pkg-config wrapQtAppsHook ]; + buildInputs = [ libusb1 hidapi mbedtls_2 qtbase qttools ]; - installPhase = '' - runHook preInstall - - mkdir -p $out/bin - cp openrgb $out/bin - - substituteInPlace 60-openrgb.rules \ + postPatch = '' + patchShebangs scripts/build-udev-rules.sh + substituteInPlace scripts/build-udev-rules.sh \ --replace /bin/chmod "${coreutils}/bin/chmod" - - mkdir -p $out/etc/udev/rules.d - cp 60-openrgb.rules $out/etc/udev/rules.d - - install -Dm444 -t "$out/share/applications" qt/OpenRGB.desktop - install -Dm444 -t "$out/share/icons/hicolor/128x128/apps" qt/OpenRGB.png - - runHook postInstall ''; doInstallCheck = true; diff --git a/pkgs/applications/misc/zine/default.nix b/pkgs/applications/misc/zine/default.nix index ee4348608ce5c..0840aad4f2f06 100644 --- a/pkgs/applications/misc/zine/default.nix +++ b/pkgs/applications/misc/zine/default.nix @@ -10,14 +10,14 @@ rustPlatform.buildRustPackage rec { pname = "zine"; - version = "0.8.1"; + version = "0.9.0"; src = fetchCrate { inherit pname version; - sha256 = "sha256-mcYBaNmfpXDMhZuDxZ8WgwRb0CM3WjATrMH5YcU2Dxo="; + sha256 = "sha256-Z47BkBTKdzfjBJKjelJFu0tOU5bdjhLviDQ2fJQAlXE="; }; - cargoSha256 = "sha256-Xfy7RRQairzfhVmh2E5ny07/9jACDdTqU2aj4IT1rkE="; + cargoSha256 = "sha256-sEIuilAjPZupSJojAu5DLtgToLCgMJKlJXWIAGcLeCQ="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/applications/networking/cluster/argo/default.nix b/pkgs/applications/networking/cluster/argo/default.nix index 577e4ba883d1a..f02b6e416c332 100644 --- a/pkgs/applications/networking/cluster/argo/default.nix +++ b/pkgs/applications/networking/cluster/argo/default.nix @@ -1,4 +1,11 @@ -{ lib, buildGoModule, buildGoPackage, fetchFromGitHub, installShellFiles, pkgsBuildBuild, stdenv }: +{ lib +, stdenv +, buildGoModule +, buildGoPackage +, fetchFromGitHub +, installShellFiles +, pkgsBuildBuild +}: let # Argo can package a static server in the CLI using the `staticfiles` go module. @@ -19,22 +26,26 @@ let in buildGoModule rec { pname = "argo"; - version = "3.4.3"; + version = "3.4.4"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo"; - rev = "v${version}"; - sha256 = "sha256-eVd3tH77Z3AlNpMEx+xnOQTELXFeGTLIslE++++Sdkw="; + rev = "refs/tags/v${version}"; + hash = "sha256-ZG10ruusSywXWn88UqrHVfAWrio2KoK2YoM9qdtMlhU="; }; - vendorSha256 = "sha256-n8NAxfNZ/q2gdA5N7dTNgvdB549aiRxFPJO4UsfIn2U="; + vendorHash = "sha256-Tqn5HGhRbN++yAo9JajUMTxFjVLw5QTvsis8wcfRIHw="; doCheck = false; - subPackages = [ "cmd/argo" ]; + subPackages = [ + "cmd/argo" + ]; - nativeBuildInputs = [ installShellFiles ]; + nativeBuildInputs = [ + installShellFiles + ]; preBuild = '' mkdir -p ui/dist/app @@ -65,6 +76,7 @@ buildGoModule rec { meta = with lib; { description = "Container native workflow engine for Kubernetes"; homepage = "https://github.com/argoproj/argo"; + changelog = "https://github.com/argoproj/argo-workflows/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ groodt ]; platforms = platforms.unix; diff --git a/pkgs/applications/networking/cluster/clusterctl/default.nix b/pkgs/applications/networking/cluster/clusterctl/default.nix index fef3619fa2a03..ba8a98d3400a5 100644 --- a/pkgs/applications/networking/cluster/clusterctl/default.nix +++ b/pkgs/applications/networking/cluster/clusterctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "clusterctl"; - version = "1.3.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = "cluster-api"; rev = "v${version}"; - sha256 = "sha256-lqHHZtEtedU0Qtm6o6iy6JrQ1UiB9nSTZVyfq0cj0vI="; + sha256 = "sha256-Qaq0I7ZCXRXIWtUN3fcpoN4SURq/OfH+u73nyWYmJOY="; }; - vendorSha256 = "sha256-7e2ZJa6MfzznOoaBq0xQIXrdmDAzPzKh9QFlRfbxYMM="; + vendorSha256 = "sha256-VDSMXE+Vlgmo7T1b+A7uW9BqSDBDyhrneJX1yH+XfDc="; subPackages = [ "cmd/clusterctl" ]; diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix index 04be5713c9bf6..ac8e3129bb0be 100644 --- a/pkgs/applications/networking/flexget/default.nix +++ b/pkgs/applications/networking/flexget/default.nix @@ -5,7 +5,7 @@ python3Packages.buildPythonApplication rec { pname = "flexget"; - version = "3.5.10"; + version = "3.5.11"; format = "pyproject"; # Fetch from GitHub in order to use `requirements.in` @@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec { owner = "flexget"; repo = "flexget"; rev = "refs/tags/v${version}"; - hash = "sha256-vxwhqbupXr0Kj3+HeXBrI2pfvr+ClaVlCblva+gq0/k="; + hash = "sha256-KGeTzERLlsrBHQxskrMhFHw9XyYyl33bJJK+SN++EU4="; }; postPatch = '' diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 0240528202056..de091aec53d44 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -1,12 +1,12 @@ { callPackage }: builtins.mapAttrs (pname: attrs: callPackage ./generic.nix (attrs // { inherit pname; })) { signal-desktop = { dir = "Signal"; - version = "6.0.1"; - hash = "sha256-7Cojhz3wBPd/13uVg2MgJXvR9QMPZcwBibk/sCrRMAE="; + version = "6.1.0"; + hash = "sha256-70IQ/2yjHbez8SpZxqZKa/XWIEYA3cN7JAIM9kgjN30="; }; signal-desktop-beta = { dir = "Signal Beta"; - version = "6.1.0-beta.1"; - hash = "sha256-zfXHSAYJH9/y0IaB6dTb1T85hZzDXyNX6sCpaHnL32k="; + version = "6.2.0-beta.1"; + hash = "sha256-OA7DHe/sfW8xpqJPEu7BWotpnaJYj5SatPB21byZHrY="; }; } diff --git a/pkgs/applications/science/electronics/dataexplorer/default.nix b/pkgs/applications/science/electronics/dataexplorer/default.nix index 5745a43df26c6..9d06f614870aa 100644 --- a/pkgs/applications/science/electronics/dataexplorer/default.nix +++ b/pkgs/applications/science/electronics/dataexplorer/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "dataexplorer"; - version = "3.6.2"; + version = "3.7.3"; src = fetchurl { url = "mirror://savannah/dataexplorer/dataexplorer-${version}-src.tar.gz"; - sha256 = "sha256-2e8qeoJh7z/RIowMtAd8PGcMPck5H8iHqel6bW7EQ0E="; + sha256 = "sha256-cqvlPV4i9m0x3hbruC5y2APsyjfI5y9RT8XVzsDaT/Q="; }; nativeBuildInputs = [ ant makeWrapper ]; @@ -38,11 +38,11 @@ stdenv.mkDerivation rec { # So we create our own wrapper, using similar cmdline args as upstream. mkdir -p $out/bin makeWrapper ${jre}/bin/java $out/bin/DataExplorer \ - --add-flags "-Dfile.encoding=UTF-8 -Xms64m -Xmx3092m -jar $out/share/DataExplorer/DataExplorer.jar" \ + --add-flags "-Xms64m -Xmx3092m -jar $out/share/DataExplorer/DataExplorer.jar" \ --set SWT_GTK3 0 makeWrapper ${jre}/bin/java $out/bin/DevicePropertiesEditor \ - --add-flags "-Dfile.encoding=UTF-8 -Xms32m -Xmx512m -classpath $out/share/DataExplorer/DataExplorer.jar gde.ui.dialog.edit.DevicePropertiesEditor" \ + --add-flags "-Xms32m -Xmx512m -classpath $out/share/DataExplorer/DataExplorer.jar gde.ui.dialog.edit.DevicePropertiesEditor" \ --set SWT_GTK3 0 \ --set LIBOVERLAY_SCROLLBAR 0 @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { homepage = "https://www.nongnu.org/dataexplorer/index.html"; license = licenses.gpl3Plus; maintainers = with maintainers; [ panicgh ]; - platforms = jdk.meta.platforms; + platforms = [ "x86_64-linux" ]; sourceProvenance = with sourceTypes; [ fromSource binaryNativeCode # contains RXTXcomm (JNI library with *.so files) diff --git a/pkgs/applications/science/misc/boinc/default.nix b/pkgs/applications/science/misc/boinc/default.nix index 641e5a8997b5c..8dc19a57be54f 100644 --- a/pkgs/applications/science/misc/boinc/default.nix +++ b/pkgs/applications/science/misc/boinc/default.nix @@ -24,21 +24,16 @@ , libxcb }: -let - majorVersion = "7.20"; - minorVersion = "2"; -in - stdenv.mkDerivation rec { - version = "${majorVersion}.${minorVersion}"; pname = "boinc"; + version = "7.20.5"; src = fetchFromGitHub { name = "${pname}-${version}-src"; owner = "BOINC"; repo = "boinc"; - rev = "client_release/${majorVersion}/${version}"; - sha256 = "sha256-vMb5Vq/6I6lniG396wd7+FfslsByedMRPIpiItp1d1s="; + rev = "client_release/${lib.versions.majorMinor version}/${version}"; + hash = "sha256-KqD986Q7npKTnh0DdNgMHro+1M/UQHiNsXaRl9WjONw="; }; nativeBuildInputs = [ libtool automake autoconf m4 pkg-config ]; diff --git a/pkgs/applications/science/physics/crystfel/default.nix b/pkgs/applications/science/physics/crystfel/default.nix index 81c1fdd6b0549..74cc677963e3d 100644 --- a/pkgs/applications/science/physics/crystfel/default.nix +++ b/pkgs/applications/science/physics/crystfel/default.nix @@ -54,7 +54,7 @@ let # We hard-code this by providing a little patch and then passing the absolute path to syminfo.lib as a # preprocessor flag. preBuild = '' - makeFlagsArray+=(CFLAGS='-DNIX_PROVIDED_SYMOP_FILE=\"$out/share/syminfo.lib\"') + makeFlagsArray+=(CFLAGS='-DNIX_PROVIDED_SYMOP_FILE=\"${placeholder "out"}/share/syminfo.lib\"') export NIX_LDFLAGS="-L${gfortran.cc}/lib64 -L${gfortran.cc}/lib $NIX_LDFLAGS"; ''; makeFlags = [ "CFLAGS='-DNIX_PROVIDED_SYMOP_FILE=\"${placeholder "out"}/share/syminfo.lib\"" ]; diff --git a/pkgs/applications/science/physics/crystfel/libccp4-use-hardcoded-syminfo-lib.patch b/pkgs/applications/science/physics/crystfel/libccp4-use-hardcoded-syminfo-lib.patch index 9c5e1365492b8..1806d9b2b9dad 100644 --- a/pkgs/applications/science/physics/crystfel/libccp4-use-hardcoded-syminfo-lib.patch +++ b/pkgs/applications/science/physics/crystfel/libccp4-use-hardcoded-syminfo-lib.patch @@ -1,11 +1,12 @@ diff --git a/ccp4/csymlib.c b/ccp4/csymlib.c -index 76bc70b..7a0c5dc 100644 +index 76bc70b..3616121 100644 --- a/ccp4/csymlib.c +++ b/ccp4/csymlib.c -@@ -137,24 +137,7 @@ CCP4SPG *ccp4spg_load_spacegroup(const int numspg, const int ccp4numspg, +@@ -136,25 +136,7 @@ CCP4SPG *ccp4spg_load_spacegroup(const int numspg, const int ccp4numspg, + } } - /* Open the symop file: */ +- /* Open the symop file: */ - if (!(symopfile = getenv("SYMINFO"))) { - if (debug) - printf("Environment variable SYMINFO not set ... guessing location of symmetry file. \n"); @@ -28,3 +29,12 @@ index 76bc70b..7a0c5dc 100644 filein = fopen(symopfile,"r"); if (!filein) { +@@ -162,8 +144,6 @@ CCP4SPG *ccp4spg_load_spacegroup(const int numspg, const int ccp4numspg, + return NULL; + } + +- if (!(getenv("SYMINFO"))) free(symopfile); +- + parser = ccp4_parse_start(20); + if (parser == NULL) + ccp4_signal(CSYM_ERRNO(CSYMERR_ParserFail),"ccp4spg_load_spacegroup",NULL); diff --git a/pkgs/data/fonts/iosevka/bin.nix b/pkgs/data/fonts/iosevka/bin.nix index 0eabedc7c0bb3..c797587dd07f2 100644 --- a/pkgs/data/fonts/iosevka/bin.nix +++ b/pkgs/data/fonts/iosevka/bin.nix @@ -11,7 +11,7 @@ let (builtins.attrNames (builtins.removeAttrs variantHashes [ "iosevka" ])); in stdenv.mkDerivation rec { pname = "${name}-bin"; - version = "16.4.0"; + version = "16.7.0"; src = fetchurl { url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/ttc-${name}-${version}.zip"; diff --git a/pkgs/data/fonts/iosevka/variants.nix b/pkgs/data/fonts/iosevka/variants.nix index ff64990d65284..0edc0984cea14 100644 --- a/pkgs/data/fonts/iosevka/variants.nix +++ b/pkgs/data/fonts/iosevka/variants.nix @@ -1,95 +1,95 @@ # This file was autogenerated. DO NOT EDIT! { - iosevka = "07v98pr0anqbxn1yc55245k5ixxzfk2wmfq67zhz84aa18viqhbc"; - iosevka-aile = "03y0xijb7c0kampm3gjb69mv8hikhsgqhlw1w3zfcjhr2vc62g6q"; - iosevka-curly = "1i31zj0j8npgx7wn2qibih48s76qjxakz14sa2hgx908p8xyfwq5"; - iosevka-curly-slab = "1xijhk5vbgs3c89a7g9cfjqjqv801gimjja4wqpvaficab692jh2"; - iosevka-etoile = "1rqagk6gyja15fa4m107ylbjwbhn811gbl9lbr9yzashw4drjpp9"; - iosevka-slab = "063qk1d75l1jq7gdwzqxd7j8j56g7da0aagsqm0lvwl217l7x48b"; - iosevka-ss01 = "0rjbyfmm46ffslf0glvn5yrsxiaznj3bk53si5jhnipphqw11r9v"; - iosevka-ss02 = "0sgpaqzcp4zpk96xr2nz04sfg026ph4glkkzky7z1245z12lzdlc"; - iosevka-ss03 = "01wjv069mmyjw9mk9hkcj4d23f0lgwdy91j21lcja6gybawly5g6"; - iosevka-ss04 = "0j2qjly3z8vr8z62g2dlj1i6cpx5mlzfvng41x8hxq23j9gfr2y6"; - iosevka-ss05 = "1aimq0mm749mai3ykh6975ya8ng402ddkzb1hhxz3nnm8v6cwd27"; - iosevka-ss06 = "1yd882vj4l0qhz67nbba61nyplg9psyr3hnvknvkmr2wnj723dbm"; - iosevka-ss07 = "09x54z8lzg85akfdc95k6gyka77qgmz3fnhq2ji01apshf8hc751"; - iosevka-ss08 = "1lmsgcc5q68wm2hs0h35s374bql7rl8r5yp7z17vrjz2qwp3n7b4"; - iosevka-ss09 = "1p5f2885b18xgxbl63g5zphr2kz52swdpm98d0rcwr60bkqkf79l"; - iosevka-ss10 = "0kmc0fxyi1imndw88wsdfg6nhvijprrxc2d6nmgvnalnwrx95d33"; - iosevka-ss11 = "15k64sn23jh2plwwqsvplc04099xv9w16fmmzxzz9vd4js8j4245"; - iosevka-ss12 = "10y5ll8256h61ycgyjrysfaki9h93va271qgam0b5bjl0v9vhdlk"; - iosevka-ss13 = "1lv9w2yiqy09sggbzd17vx8nn8vh1qv7yn9rsnwcq95xqd4dpw60"; - iosevka-ss14 = "1pb53ahx5jig7a6yjb4kwpcgbpdbxans25p3amiswy7xyklhw3la"; - iosevka-ss15 = "1jax0zx17k8mzp7489fd1bprvh79ww4ghcy6vhih2nbg18kzxsqc"; - iosevka-ss16 = "0s3xq3ijrd8b51myh779hf5cvwvxvxz8xx9gxksnbzh1pml9zz1a"; - iosevka-ss17 = "1mnw0lh65yj936p3shsayq6k31s708cqb60qys82hcwas5bacidr"; - iosevka-ss18 = "1jyywvp9j6rj21v99psbwsr8xrfzfvq76z54hw0acb3j5mhl7s4r"; - sgr-iosevka = "1p2n8q6nj9f8nibb7zzy60ck0sp2cg6lz1z3inizs5i9lpnr8mx3"; - sgr-iosevka-aile = "1nxysymkc273cmk00b44bky63lm73dl3p9yai8lcn14lv1apdjg6"; - sgr-iosevka-curly = "0bwlalijphm1aykv8j652lp9p1xl4jj4gmc26ag8s13gmbx6gxhy"; - sgr-iosevka-curly-slab = "11d3biggpk6r0pa7k7ig8sgxmjw80b723ass3pqxns13y3krm8il"; - sgr-iosevka-etoile = "0lspbn81bajdc905wafqmfp8cjlw6q6xlvry1alq7y7ng19vm5dh"; - sgr-iosevka-fixed = "1zzqi09pafma9fj9603ixhygwa2aayzk27xda2yzhixiw11wxz33"; - sgr-iosevka-fixed-curly = "1j07rqa1495dr0s2ppcypycclmzgpbpl0yibkd7f1mlzl629gk38"; - sgr-iosevka-fixed-curly-slab = "1wlq2qdl3nx8q6a39dc3sv6h2gr8v3bhswgvgavbr7m2q6jcss8g"; - sgr-iosevka-fixed-slab = "1m20f9zc4q2rv16yl5pfvx4l2031783ixv4k6vhnzwqkvqqrk9dg"; - sgr-iosevka-fixed-ss01 = "1c7ldr1h2bgl6w8ggwbsifad7n3mincwplfiam4w4n56xkn19qdx"; - sgr-iosevka-fixed-ss02 = "1hck8rcja59c0jgl62dk9i5xrixxihd3mzcma6yqqsxadgvf6cc5"; - sgr-iosevka-fixed-ss03 = "1qck9qdanfwl1jgbjmyzvv52dgxa46gw9h6ygn3pp34pgbgj6lnd"; - sgr-iosevka-fixed-ss04 = "1d3gv5zcs66qjazxwig2kw6nlwqzvn3pmnpbwif65xd5hlqs1m3c"; - sgr-iosevka-fixed-ss05 = "1l335c8fnh3ijhx7bl2wpa8k1vnjskhrlhcg7k04z9jhjcyagr9f"; - sgr-iosevka-fixed-ss06 = "06zm8yr6n17b6vmic9ngv3iv7jvnps0bazvdi8y38r371gwp4af9"; - sgr-iosevka-fixed-ss07 = "0ambs05hjxvx6v905wzqk8wjl8a8yrd216fm8sy23wr8vkm7zrca"; - sgr-iosevka-fixed-ss08 = "10zgxj5p50hzbczh33mq1qw708srwcwp615ajfmmx0b86qgxmfqw"; - sgr-iosevka-fixed-ss09 = "1k0hd06lislhzvgd5vz7sra9pbwnl7nv0cxzmxglmlskafcls7zb"; - sgr-iosevka-fixed-ss10 = "0bgkfk31fd60w7x1nzy6x3p7gi2d72z7cf8f5av54rnamw4a4hnq"; - sgr-iosevka-fixed-ss11 = "0vsv9plkcmynrj6s75kbb57kkfpxay4k90nlimgb3s1z7d17az0a"; - sgr-iosevka-fixed-ss12 = "040bpjhgjii0s19ilfrvg1261ssk4n9xyynw61cbn65rh2dpfdcl"; - sgr-iosevka-fixed-ss13 = "0bmmfpynl5j74i71b0cyi9vyrrb6d5axz3frsg48q8pwqac2vkx7"; - sgr-iosevka-fixed-ss14 = "1bqfbv4rcvcpbrzsg2zpk870yq2a6j7ishsgc6p9xsqfblnw1p6a"; - sgr-iosevka-fixed-ss15 = "1rhks1drqs0yx2sbcdqyq9lvxrh11adqisw7pxncgm6flcgkhx29"; - sgr-iosevka-fixed-ss16 = "14kkdvmj2gpyxs5dcbfyghidbqaz147r114xi42yhl4fpsdppkrk"; - sgr-iosevka-fixed-ss17 = "0csd2ag4h8cdngscbmhj5kh1rlj022pmg8ig758hxp25ddmb2h8l"; - sgr-iosevka-fixed-ss18 = "0hpkzzx35a1nmspb2k7gg5z9kp00i4hd4k1nni4jg661mgvilldp"; - sgr-iosevka-slab = "1y8csc7kgm2xipa6s2jy0ibgb4j9pj6wxpjlxyad3ssbsqf5yfvc"; - sgr-iosevka-ss01 = "0hq5s1ajqfmq6y3l189h2xjkawayq10sjwpcmzkbf4565qifinm6"; - sgr-iosevka-ss02 = "0921izv9x38zziw8vfha4aqvvdb5g926gycg6rl2rxfymjsg2f1m"; - sgr-iosevka-ss03 = "0c9sfswgf4rgmwbsm4wwyfaqk7brp0dmw76krzylbppcyzsczjbr"; - sgr-iosevka-ss04 = "0ic7g811156cwkrsizjd5f051k964lpr216nrd15ap06viar4vk4"; - sgr-iosevka-ss05 = "0hxpi57xzxw03qr9ss2mrpl4p479v14c15y9iqjflb478qdicxg0"; - sgr-iosevka-ss06 = "04ny0vyr0sayfymaxgsqfnvqsx1afsh9fjdpcfna5vpl661ljnsf"; - sgr-iosevka-ss07 = "10s8vhcikk6xrvyjmzjq7k4b81cf9i71c6dhsrnwxvn732dx5awl"; - sgr-iosevka-ss08 = "0ji3gsf26xji6qfx99azhxj816q7bhpzqdxh43ncs86snl86g9xf"; - sgr-iosevka-ss09 = "0c1n399v3vf68q165mn26qc0cnbi5yfvvkxwxp1inl7vdsgzhslw"; - sgr-iosevka-ss10 = "07g2zbpgd8zbb2zyqk9kfb9s1hd94wmx1ijaf9fh6c6sby2wgssk"; - sgr-iosevka-ss11 = "0kfiln8w5gim2swyk80k2bnvnyr853imgp91z2v330hdllca99ra"; - sgr-iosevka-ss12 = "01kljfahn4ljss2rd66srp2lwj94fvkigpzk315zd21qxyy4wfl2"; - sgr-iosevka-ss13 = "0bgxfrpfn4yh6852155qj0j7zfsrf14rg4gc3ffidmszhindllcc"; - sgr-iosevka-ss14 = "04qldb75h61wca2pzkmks3amcq6q3n0dhjva0b5v1dg0y6qzs2c9"; - sgr-iosevka-ss15 = "1344wgx2nx1a7aphi06xkl6niij5cqlnnydbb6la0k75invyz2i6"; - sgr-iosevka-ss16 = "1apkrdmhz69vdbjhr88288qyqz4pfya11fj4gpxkb3hk01dbkwzs"; - sgr-iosevka-ss17 = "0mba09669408icz6p944pivfb0m99pirapmml1d1glni0xj4mndd"; - sgr-iosevka-ss18 = "0j463s8is0w0rvgqn63mxhf3wcx0r5a7q4zs6621f3xigqvbhkdm"; - sgr-iosevka-term = "034p2llrz2ffm5aslxg1ah8l0bj6kr9lx53yi1hg61cnx18z3yx0"; - sgr-iosevka-term-curly = "0zixih0y7ksav7qxswysijfdnnj1jjb74znz0bkb0f7cviaa6w2i"; - sgr-iosevka-term-curly-slab = "1vsz17s0yp3v01054342plc62pag3mx7xs5jb8llx729zc5qzpd7"; - sgr-iosevka-term-slab = "04bsgvzyjy2d0jndzxb2d0pv6sfr9gm3ryv94va65rxv3fc0mj73"; - sgr-iosevka-term-ss01 = "12hfzalx076gh9kskfxvgr9b3w8i3kk2lhbcsj417vsn5nx48grq"; - sgr-iosevka-term-ss02 = "15chkrw65nyfl9vd23y12cqvsn4sddrnf3zmxy0jval5paz8hnx3"; - sgr-iosevka-term-ss03 = "0ivxs8pdpbx1lcmfm1r6qkvzsx82swwi7xn4ja92rh8zix9i78bv"; - sgr-iosevka-term-ss04 = "08zfbmq6cvc7jzkindyvx7mlfvyhhicdxqm4pyblgb9xfh6vvk0k"; - sgr-iosevka-term-ss05 = "0c8mbjbkw6a5hpxshr20qsrwp0chwnxxijm3sqaf28hg2ka79qhg"; - sgr-iosevka-term-ss06 = "1ymdi01cl9v86qlcl0ka9v1p9ry129wqjmsjy1i60ld579yy8x05"; - sgr-iosevka-term-ss07 = "09qqjmn7iaykl08pdd4qj57z12npap246y8c0kp3rvwjdyh3p7y1"; - sgr-iosevka-term-ss08 = "10qca50vbwb5fa509jrb3w63dxk6ny7i7ffdmyiz1slv418jjjha"; - sgr-iosevka-term-ss09 = "0chhlxql7j1b0nfa6pnw3dfrjv6wij8wsl0i2xf5ar52rgzr2s95"; - sgr-iosevka-term-ss10 = "1z6za3sdaf793vma9d70a38rlb47nzqj08pnp6jqir2fifdsvzl1"; - sgr-iosevka-term-ss11 = "1midlf29xqli721gv195gy6mjmp9w8nq8kc1ly2d62spq3lhqmqw"; - sgr-iosevka-term-ss12 = "0bagnqg4r0a76p32d3yg8j6raxwzc7wbhx5kv7habpbinhq96ink"; - sgr-iosevka-term-ss13 = "0wj3gx4h4r99whfsnqja8j3a737b8firn5sga6320qm33szzgh69"; - sgr-iosevka-term-ss14 = "0zsmy58w23355laqjs9xh76i4bz80yha65yaj44ssrsz1h0f9bpn"; - sgr-iosevka-term-ss15 = "1yp9kywi00lykwj2wwvwvw4qblaw1549lj0ahrhrhljnijjc1zmb"; - sgr-iosevka-term-ss16 = "12c8i4gwshxj3mnzz7ycprwlmc5nhfc9dvg1wwcvc59xvdphpgzc"; - sgr-iosevka-term-ss17 = "0fiji4hbb9cbssx3whvjhsvm7zi1chrnrp46q01627z4nzw2s5a7"; - sgr-iosevka-term-ss18 = "0hmdpzffywgdls5qy38sq04jfsx9ym56lypb6fiwjvppgn8vkcgl"; + iosevka = "0wyi99j9zangbfj8rdfwgmgnl7f2s4d07pc8pvkjnzw8n4nz4rkn"; + iosevka-aile = "1szwyzri6j9rfgw3jrppg1gnj48bl77pvgm944jiwxhdl1dhzlqh"; + iosevka-curly = "0mzdq2shi51c6hhca8waxbj8i0pb3jw7b4rn0h4941kq8y9qddzs"; + iosevka-curly-slab = "106f97mh5ph2ykk2mk4am9vbavr41vznl8f2w02jaj81wk5xv6gd"; + iosevka-etoile = "1axnc8hvwvn0y2pzfid63s3lzzwh3ig89hj7k80cdcrsnbv5wvpi"; + iosevka-slab = "0mgrngn2g5i1s5285ds6x53gwl3ragdr3pkmp3kwk7m88jivx4n8"; + iosevka-ss01 = "0r0zn3dickzpkcqfdy6lw245301v8hqiy073bk7q7dykg7514wic"; + iosevka-ss02 = "05ifncnsy9bfb66qxpx57hkadq4vwa8bb5qki69skwfsfrfc217y"; + iosevka-ss03 = "1hh1x10v3igagaa70xmw7hhfa6jm99pn46w4wlgv0ydfz441hfcd"; + iosevka-ss04 = "13cwjc472gqvkz72lxx82xp9ka71ycdid7zldl5r38sakjqymxcv"; + iosevka-ss05 = "0y4zgda1n4shcqrw950w55jmlh71mi7fc9g6fjjb1ik5v227k8h3"; + iosevka-ss06 = "15xcg3dqjqb9hzzaf7pvq7lnn0qrvk828xy9ngq9xznhdzzlh0s3"; + iosevka-ss07 = "1w2lyqcvcn6k70a00xdi650rsw91lb8rgrbdpb92m4p3lr7b4vzg"; + iosevka-ss08 = "08b38c8vrvys8cxq3gqscr33ijm0wn6xnw6wjr21r8f6y2i1rhfp"; + iosevka-ss09 = "1mgp38665llp1rqlmzr62z5vxxlwl5g75mdd9qf8zah17babi88p"; + iosevka-ss10 = "06f8mkxfrxl7kkph9ljzsgsxf5qlnw0ggkb2bv518ajpycc9g77c"; + iosevka-ss11 = "17nxf0215s8vgyicbj6rhqia4hw5gsrljdk1jc5hd1yd50c8351q"; + iosevka-ss12 = "152f4bljjm3w49x4wfr1fr557pi4qpvgyk6icccrbig4r3idkqhg"; + iosevka-ss13 = "04kh77ry46gdgmp87p3nwbqmrkbwjjvfk2mrb43lw19vwmbax3aw"; + iosevka-ss14 = "1fln5kz531yp8gk447cw71xm9ddvw70dwyamjd9sl39vay32b534"; + iosevka-ss15 = "0iwy88pfxan94zhvjnqxsh9i39r1nzi0hc0q4xi1mqyaygml3y6c"; + iosevka-ss16 = "1xxir89gqbcqms158c1znlnbky39safjcgzyd1qvr5w78w7dz5gc"; + iosevka-ss17 = "0dac2m9vxif6s02ryzx9kw9j87dgm53cjjzh4h6bqm3wqjmy3hgy"; + iosevka-ss18 = "0igj1k7jm1xk649hpn2h3c1n9j8dcb7l5kvr6wb97r8w2s5kiz20"; + sgr-iosevka = "1f6c3sd022ss0m8myb03fpr03d4mmw6yapgamkp8xbskxny11sik"; + sgr-iosevka-aile = "02h8bd89pxdalfd7ysybzr6lrga5vilwsdsmbl9f6c74pdxp9wsq"; + sgr-iosevka-curly = "015wqd61iww7q15hfp4ifk7yb8p2070v0vi1v7jb0zqgim7lky4g"; + sgr-iosevka-curly-slab = "132ixkvfny95nsmil4b68zyag2gg9dxsn7yzfdmzr6ld392a2gxn"; + sgr-iosevka-etoile = "0vgkf40q81bgcm2q8nb4z40lzvib50k5mmsardgwaigwlhsjpnr1"; + sgr-iosevka-fixed = "0y7jrly440k8dq5av6yx257wyvaprh4nr6a0axqd9v9h0kw27s00"; + sgr-iosevka-fixed-curly = "1xvjsnay8bqji6mw13llfmnyzrahqwyymwbalc9gdgxd85abdndm"; + sgr-iosevka-fixed-curly-slab = "0q2s371z6cgnh07g1svl2jn10655kn2wyill1w274sb8qvx972m7"; + sgr-iosevka-fixed-slab = "0q41blbalb9r40c56gci184nbp2nyvglbqyyr2rmv87c2qqvnzrj"; + sgr-iosevka-fixed-ss01 = "05lvvnfa35p2xa1j2ygbwzwmn5jj8djafm2ykjv17992ljs6zlns"; + sgr-iosevka-fixed-ss02 = "1c13rybqmzikjvq7m4nkjkl147m6w7i389r5a9vl3c8v281g89q8"; + sgr-iosevka-fixed-ss03 = "0wykv3wa18i53659avb4n0wirrbcrj24wslwx1g151an9vrfbixq"; + sgr-iosevka-fixed-ss04 = "11k74l40323q0bcz3zf4a7gnpgnf4j2rjrgqqla6nfmjkacbfngy"; + sgr-iosevka-fixed-ss05 = "0p78q0ik8m815shbac2pyw5yas25rbzw7r9abb94md1fh175csx5"; + sgr-iosevka-fixed-ss06 = "1rg0nagpf3nrgmnlmy3lvrr665492ygkdqaxi1js5hqnmy9xhsml"; + sgr-iosevka-fixed-ss07 = "0j2iiv6jzd9v4ggdj88hpyqhmf04rsq8jc6llg50mx6nr89y7fbf"; + sgr-iosevka-fixed-ss08 = "10zlla2qkr6xpvdchawlixfn3yxnakhi0lg3naskk0zj00vifxay"; + sgr-iosevka-fixed-ss09 = "1l0h7m292hi6613j9spfxpy25n74718s0b96sn8ycw3qbpjlybkm"; + sgr-iosevka-fixed-ss10 = "064hjwhi78a7lb3gn8s1ga6kw2sk5j1y38cqrmxizja76msw3cxm"; + sgr-iosevka-fixed-ss11 = "1adnn6fpkx20zfmip62csxrasfn0fs7gxv00q8wkd69chgzz7k6l"; + sgr-iosevka-fixed-ss12 = "1yqv5b8az0dxilvrabm82lkrnvn1x8z43jg1pfh6ykd49kgim5ma"; + sgr-iosevka-fixed-ss13 = "0vkxzb3b3r61z0k6rix6j9paw5kxgd5k3a76k3ri0mw6fnh3kzks"; + sgr-iosevka-fixed-ss14 = "111ck61z1bbcrgrryw3dc1ariicfs7brga8zzrs9angg8xwcdky9"; + sgr-iosevka-fixed-ss15 = "0hb4lh87f0dw7acra9w6j7r17lc9xpfjh8hkp5096fbjfffyn786"; + sgr-iosevka-fixed-ss16 = "1rq4s7rqj0nnkq1b94ahhlqma9x50kagndrfc8wxqz26x1na88a6"; + sgr-iosevka-fixed-ss17 = "1jz54ilc36q6z6s8xqffbrb9g2w6yhikwyr8hjvghb0imvwa99vi"; + sgr-iosevka-fixed-ss18 = "1nsbxq4m2h1vbwcl0zfwmfrd48brlrmi5cb1099ybqqp9lkrpddf"; + sgr-iosevka-slab = "15k6r7847al2wh9df0fzq04brn8scix5d0wwnbbnyy2p8hg8r0jk"; + sgr-iosevka-ss01 = "0yaw30j2wj0i876xkpvh3k76hyyjjbqqm3vfwqn0nahn83sk7lq9"; + sgr-iosevka-ss02 = "048bgm59gnk5qpxfpflj4q8iryjlcnybyaqcmdkwhklqyracqada"; + sgr-iosevka-ss03 = "151ai1pkiszrd1zrdviqd7701hqmp48gqkfn86xz4bw7p84qniyv"; + sgr-iosevka-ss04 = "03ih3c0n0ab3wkp9w6ngzn4x6fmn4z19p506r0fvkg0n8rcmx35v"; + sgr-iosevka-ss05 = "0zh9zb2vl5z2xc4j0ascv2ps6789ll9qgjmvd6hhb23rf540d371"; + sgr-iosevka-ss06 = "15wd5sni08ckpbqr8cnkiv9pwhnqp9jh70nl3wv93bwvyqzycx6p"; + sgr-iosevka-ss07 = "12lgjhqaqj8qag59xz49l0d2wb39aymigfknhxj72yjgqrv6nmli"; + sgr-iosevka-ss08 = "1f8g0rsdjpykq1061hxbk46wl6x7rr6n4n5mx0kxl0q0rry8zk29"; + sgr-iosevka-ss09 = "0zjn4wyldmynldinhiqadpw3mldi46vsnw3wgsq8w0j90hcz1rg8"; + sgr-iosevka-ss10 = "0bxyvm2xs1iqdpwv6vhz0zc6k6h1jd2xr9alc6jhavyzwzgwsrnq"; + sgr-iosevka-ss11 = "1fl2insp3i1q697pim7jbk569cx2dpv0ivs8q1sgk7kl86mq5k8m"; + sgr-iosevka-ss12 = "1h003xf0g5w6jmcl8882lmsi3ri0dqnayiq37rwlygbi3zhchgpi"; + sgr-iosevka-ss13 = "1r30r7inci5clyp7wxl5a8jcvanlipwwbx5nc7vwq8n7q48n3i0j"; + sgr-iosevka-ss14 = "0h2fqnlrg3f5hba7v2v2xnfp7z0cdipkgj9g1iyzr71r1fpm4wwi"; + sgr-iosevka-ss15 = "03kdf4lvg9x6g9130l4by4q5bh0fra3mpvyap29rs1gm47w0n84k"; + sgr-iosevka-ss16 = "0cmkw1654figbsj9biqcjh6x86dffhn10b05y0s4qlj1ackzpciz"; + sgr-iosevka-ss17 = "0iyi20lzswcshikqvxlmbf8wkyfs8xz8bjw6lxix81818skgavhx"; + sgr-iosevka-ss18 = "0m82akjnb1xkqissh86s3vhm1fbsy9wlkqabcfhk1jyhj3w2q3i8"; + sgr-iosevka-term = "0r1v50n1fjy40df16kjcv92ihnka9sb1h1lkwigvy12pp8df0fbw"; + sgr-iosevka-term-curly = "1hk42bsf157131smbxali2g681jwh4fynjhnswsd05k04p20lndp"; + sgr-iosevka-term-curly-slab = "092fx48mf26zpaj2qvbbhr2qi3bpqhyhynznffdjadzdqnsqyxyy"; + sgr-iosevka-term-slab = "0kndz8q7him9wkfiaxkjfjkqsmsqg5y6n9bmzh0gvz304019s1gz"; + sgr-iosevka-term-ss01 = "0awxqg4r5pq7kcvqjabsgzjagmf66ads8bp0w1bw27w6f5vc21hf"; + sgr-iosevka-term-ss02 = "1zfvjw32z8kf25j9gvdq7aa4p94s4r8vvh7kncnxcm2prrc40fvc"; + sgr-iosevka-term-ss03 = "122qm2s6w6clw4fgy59cj8p54mlyavyfr81g06zjgy46i8skrpsw"; + sgr-iosevka-term-ss04 = "14y4rarp17qm0qy59rshhd581pdn1niqx6h2y74yyc6kms6q94rn"; + sgr-iosevka-term-ss05 = "18cv0bl7ngb4gp5phzh77r8q0y863ym598px2n5jf00maaigfahc"; + sgr-iosevka-term-ss06 = "14rp2kd2b609ijhg8gmnc5sgjniwgbfkcnp5xa5m9bbshbjmikqn"; + sgr-iosevka-term-ss07 = "09sppprv46d62cyp0aw77p3wr6s514qzc5p3lb1qxiakic5gn2js"; + sgr-iosevka-term-ss08 = "02slv5va9yn09pcscmx6snjp2swjznrrhnwjf9fwi74siypza1xx"; + sgr-iosevka-term-ss09 = "0hdhsd1rkiqgz91x9kkn2rd37ya6q91qkyv3w5ry8flfffba421z"; + sgr-iosevka-term-ss10 = "13b29x2znqm8l3ydakc0sq5skr1mk4xjfikvayp5vc1a4krjyzwn"; + sgr-iosevka-term-ss11 = "15qq6lvf7mdnch20shsigrr7xk7qbgr2wz7qbqwyaidd1vlk57px"; + sgr-iosevka-term-ss12 = "09nyj7dcc7ldi7kn8scxjaszp8gxzdxq860zig1bpsjrssm20870"; + sgr-iosevka-term-ss13 = "0v28swz2dbg8kc2wx5h4llkki5i1rpdk5f6ip08xjzlb35bphwwk"; + sgr-iosevka-term-ss14 = "1q94pvfs2yqz8sjvpchs44w83rnf08v6njz27pz4da5g1v7qg4s2"; + sgr-iosevka-term-ss15 = "077cl1259xgfb26p67wih69vq2vw20ardq479jajc5r7cn2cbxia"; + sgr-iosevka-term-ss16 = "0fy1810yxi2faacdc1fsy0nlzh781fijs6l8kfsh2xb22sk2ydf2"; + sgr-iosevka-term-ss17 = "1m8jv2rvxsj0aj1lwz38radvq2fivx1qgivsaly2sf992lga5w3v"; + sgr-iosevka-term-ss18 = "0rm8ki7g0brwcxmidapyn5r2jd55n9hlx2prhzskgyph4ikmnmrh"; } diff --git a/pkgs/desktops/cinnamon/cinnamon-common/default.nix b/pkgs/desktops/cinnamon/cinnamon-common/default.nix index 4e09ca3b3d06a..99df416053263 100644 --- a/pkgs/desktops/cinnamon/cinnamon-common/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-common/default.nix @@ -54,13 +54,13 @@ stdenv.mkDerivation rec { pname = "cinnamon-common"; - version = "5.6.4"; + version = "5.6.5"; src = fetchFromGitHub { owner = "linuxmint"; repo = "cinnamon"; rev = version; - hash = "sha256-IPu3J05y4xEFn82cI0y9eN+4kJRChKS/zEGZOWaJnZw="; + hash = "sha256-UAPzB4Ps/w0VQjbbVl4KMRghwMc4roJR2/ZWkmwOSos="; }; patches = [ diff --git a/pkgs/desktops/cinnamon/xreader/default.nix b/pkgs/desktops/cinnamon/xreader/default.nix index d5755a4116abf..b03035bb0e1b8 100644 --- a/pkgs/desktops/cinnamon/xreader/default.nix +++ b/pkgs/desktops/cinnamon/xreader/default.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation rec { pname = "xreader"; - version = "3.6.0"; + version = "3.6.2"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - sha256 = "sha256-CXhktA0BvJ0mczhH6kTOMzLeDG9rThy3g3VOcOWlBDw="; + sha256 = "sha256-cQ8ofBTOzHD1te2lXuCgJImgK3M1/lXmnh4yL4LfYx4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/awkward-cpp/default.nix b/pkgs/development/python-modules/awkward-cpp/default.nix new file mode 100644 index 0000000000000..00c50e9120162 --- /dev/null +++ b/pkgs/development/python-modules/awkward-cpp/default.nix @@ -0,0 +1,46 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, cmake +, numpy +, pybind11 +, scikit-build-core +, typing-extensions +}: + +buildPythonPackage rec { + pname = "awkward-cpp"; + version = "2"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-XmP0PjE19224Hgkkp07PSHD1hcEan0MlaLN3wEAohow="; + }; + + nativeBuildInputs = [ + cmake + pybind11 + scikit-build-core + ] ++ scikit-build-core.optional-dependencies.pyproject; + + propagatedBuildInputs = [ + numpy + ]; + + dontUseCmakeConfigure = true; + + pythonImportsCheck = [ + "awkward_cpp" + ]; + + meta = with lib; { + description = "CPU kernels and compiled extensions for Awkward Array"; + homepage = "https://github.com/scikit-hep/awkward"; + license = licenses.bsd3; + maintainers = with maintainers; [ veprbl ]; + }; +} diff --git a/pkgs/development/python-modules/awkward/default.nix b/pkgs/development/python-modules/awkward/default.nix index 9e8ef3098a9dd..f15810ae8ab8c 100644 --- a/pkgs/development/python-modules/awkward/default.nix +++ b/pkgs/development/python-modules/awkward/default.nix @@ -1,40 +1,40 @@ { lib , buildPythonPackage , fetchPypi -, cmake +, pythonOlder +, awkward-cpp +, hatch-fancy-pypi-readme +, hatchling , numba , numpy +, packaging +, typing-extensions , pytestCheckHook -, pythonOlder -, pyyaml -, rapidjson -, setuptools }: buildPythonPackage rec { pname = "awkward"; - version = "1.10.2"; - format = "setuptools"; + version = "2.0.0"; + format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-MDvAkZ8JMts+eKklTBf83rEl5L5lzYlLQN+8O/3fwFQ="; + hash = "sha256-N4KzRkMIPW7nZE6f2z2ur8S2AwpmfyGf1hy3sjSXa2g="; }; nativeBuildInputs = [ - cmake - ]; - - buildInputs = [ - pyyaml - rapidjson + hatch-fancy-pypi-readme + hatchling ]; propagatedBuildInputs = [ + awkward-cpp numpy - setuptools + packaging + ] ++ lib.optionals (pythonOlder "3.11") [ + typing-extensions ]; dontUseCmakeConfigure = true; @@ -44,11 +44,6 @@ buildPythonPackage rec { numba ]; - disabledTests = [ - # incomatible with numpy 1.23 - "test_numpyarray" - ]; - disabledTestPaths = [ "tests-cuda" ]; diff --git a/pkgs/development/python-modules/awkward0/default.nix b/pkgs/development/python-modules/awkward0/default.nix deleted file mode 100644 index ce9f1eabc77a2..0000000000000 --- a/pkgs/development/python-modules/awkward0/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, numpy -, pytest-runner -, pytestCheckHook -}: - -buildPythonPackage rec { - pname = "awkward0"; - version = "0.15.5"; - - src = fetchFromGitHub { - owner = "scikit-hep"; - repo = "awkward-0.x"; - rev = version; - sha256 = "039pxzgll2yz8xpr6bw788ymvgvqgna5kgl9m6d9mzi4yhbjsjpx"; - }; - - nativeBuildInputs = [ pytest-runner ]; - - propagatedBuildInputs = [ numpy ]; - - checkInputs = [ pytestCheckHook ]; - - # Can't find a fixture - disabledTests = [ "test_import_pandas" ]; - - pythonImportsCheck = [ "awkward0" ]; - - meta = with lib; { - description = "Manipulate jagged, chunky, and/or bitmasked arrays as easily as Numpy"; - homepage = "https://github.com/scikit-hep/awkward-array"; - license = licenses.bsd3; - maintainers = with maintainers; [ costrouc SuperSandro2000 ]; - }; -} diff --git a/pkgs/development/python-modules/r2pipe/default.nix b/pkgs/development/python-modules/r2pipe/default.nix index 89548dbc9f0c3..a6c2afa7d5ee8 100644 --- a/pkgs/development/python-modules/r2pipe/default.nix +++ b/pkgs/development/python-modules/r2pipe/default.nix @@ -5,11 +5,15 @@ , fetchPypi , radare2 , coreutils +, pythonOlder }: buildPythonPackage rec { pname = "r2pipe"; - version = "1.7.3"; + version = "1.7.4"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; postPatch = let r2lib = "${lib.getOutput "lib" radare2}/lib"; @@ -27,7 +31,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-zhKV0+467xFpzmSDswIWPEGpks0X/F+ecBWPWpvakik="; + sha256 = "sha256-bmr9/iqlp5GghY6DOpFhBH3k69ErqR3DHx7iAu3m6f0="; }; # Tiny sanity check to make sure r2pipe finds radare2 (since r2pipe doesn't diff --git a/pkgs/development/python-modules/rpyc/default.nix b/pkgs/development/python-modules/rpyc/default.nix index 5d9c5958bd55e..b92252cae5ebc 100644 --- a/pkgs/development/python-modules/rpyc/default.nix +++ b/pkgs/development/python-modules/rpyc/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "rpyc"; - version = "5.2.3"; + version = "5.3.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -18,8 +18,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "tomerfiliba"; repo = pname; - rev = version; - hash = "sha256-SDt6Oh+8qRIdM02FEFM+Xw1y/bBn66D6KbOrhGVs6ng="; + rev = "refs/tags/${version}"; + hash = "sha256-gqYjCvyiLhgosmzYITrthMkjLA6WJcBbmjkTNXZKUxc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/scikit-build-core/default.nix b/pkgs/development/python-modules/scikit-build-core/default.nix new file mode 100644 index 0000000000000..802b50cab32f0 --- /dev/null +++ b/pkgs/development/python-modules/scikit-build-core/default.nix @@ -0,0 +1,83 @@ +{ lib +, buildPythonPackage +, fetchPypi +, distlib +, pythonOlder +, exceptiongroup +, hatch-vcs +, hatchling +, cattrs +, cmake +, packaging +, pathspec +, pyproject-metadata +, pytest-subprocess +, pytestCheckHook +, tomli +}: + +buildPythonPackage rec { + pname = "scikit-build-core"; + version = "0.1.3"; + format = "pyproject"; + + src = fetchPypi { + pname = "scikit_build_core"; + inherit version; + hash = "sha256-qkVj7fS2+JB8mpJ788vTw4jhD/TGtZAMtCiBlmjbFM8="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'minversion = "7.2"' "" \ + --replace '"error",' '"error", "ignore::DeprecationWarning", "ignore::UserWarning",' + ''; + + nativeBuildInputs = [ + hatch-vcs + hatchling + ]; + + propagatedBuildInputs = [ + packaging + ] ++ lib.optionals (pythonOlder "3.11") [ + exceptiongroup + tomli + ]; + + passthru.optional-dependencies = { + pyproject = [ + distlib + pathspec + pyproject-metadata + ]; + }; + + dontUseCmakeConfigure = true; + + checkInputs = [ + cattrs + cmake + pytest-subprocess + pytestCheckHook + ] ++ passthru.optional-dependencies.pyproject; + + disabledTestPaths = [ + # runs pip, requires network access + "tests/test_pyproject_pep517.py" + "tests/test_pyproject_pep518.py" + "tests/test_setuptools_pep517.py" + "tests/test_setuptools_pep518.py" + ]; + + pythonImportsCheck = [ + "scikit_build_core" + ]; + + meta = with lib; { + description = "A next generation Python CMake adaptor and Python API for plugins"; + homepage = "https://github.com/scikit-build/scikit-build-core"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ veprbl ]; + }; +} diff --git a/pkgs/development/python-modules/scikit-hep-testdata/default.nix b/pkgs/development/python-modules/scikit-hep-testdata/default.nix index ed0cbd28acb6a..a4fc84d2f66b2 100644 --- a/pkgs/development/python-modules/scikit-hep-testdata/default.nix +++ b/pkgs/development/python-modules/scikit-hep-testdata/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "scikit-hep-testdata"; - version = "0.4.21"; + version = "0.4.24"; format = "pyproject"; # fetch from github as we want the data files @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "scikit-hep"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-DhOtoxjhczsYqOn+CwLGlRIPa2hh7mH6EfwcLLPMQcw="; + sha256 = "sha256-Q9yyzwFQpqN3Q1SmNKDBxdo51uMqKp8xJ9Ilo9eCTV0="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/smart-open/default.nix b/pkgs/development/python-modules/smart-open/default.nix index 668cdb1643da2..097ba1d5580c2 100644 --- a/pkgs/development/python-modules/smart-open/default.nix +++ b/pkgs/development/python-modules/smart-open/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "smart-open"; - version = "6.2.0"; + version = "6.3.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -23,8 +23,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "RaRe-Technologies"; repo = "smart_open"; - rev = "v${version}"; - sha256 = "sha256-AtFIluoI2QeHUX2dclEmOxsv/cEtusWq7GyViRBhL5g="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-sVKrCph5M7xsE7gtzsP/eVEbZyFfoucW3p30YYpwVFI="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/snowflake-connector-python/default.nix b/pkgs/development/python-modules/snowflake-connector-python/default.nix index 89cccc5d8b1e1..880eab4629c62 100644 --- a/pkgs/development/python-modules/snowflake-connector-python/default.nix +++ b/pkgs/development/python-modules/snowflake-connector-python/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "snowflake-connector-python"; - version = "2.8.2"; + version = "2.9.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-JvPnxwi+xOsp+hhXIs0GyYx4oz6aovmvHsgHk9R6z8o="; + hash = "sha256-dVGyQEsmhQ+xLGIy0BW6XRCtsTsJHjef6Lg2ZJL2JLg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/snowflake-sqlalchemy/default.nix b/pkgs/development/python-modules/snowflake-sqlalchemy/default.nix index d66a5128db52f..94a4a2a14a528 100644 --- a/pkgs/development/python-modules/snowflake-sqlalchemy/default.nix +++ b/pkgs/development/python-modules/snowflake-sqlalchemy/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "snowflake-sqlalchemy"; - version = "1.4.4"; + version = "1.4.5"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-p1ryAD/rVvqGXV2Aev+e8A5Jvltgixg81LKcjbQwAic="; + hash = "sha256-clUDElZ17xxbrJ+O0oplzVAxL1afWDwdk/g5ZofEhOs="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/spacy-loggers/default.nix b/pkgs/development/python-modules/spacy-loggers/default.nix index 9de42f2a6c0fc..cc3aebff1bbd2 100644 --- a/pkgs/development/python-modules/spacy-loggers/default.nix +++ b/pkgs/development/python-modules/spacy-loggers/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "spacy-loggers"; - version = "1.0.3"; + version = "1.0.4"; src = fetchPypi { inherit pname version; - sha256 = "sha256-APb9VU25/R/eZQGyPh8Ocvbu8Uux5/wVRW0R0dLekso="; + sha256 = "sha256-5vmDv3EjAJHVu3sRv2S9VEFeyoORCNX4PZFV0LqTvyg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/uproot/default.nix b/pkgs/development/python-modules/uproot/default.nix index 784d02dafa42c..03ac20ad60381 100644 --- a/pkgs/development/python-modules/uproot/default.nix +++ b/pkgs/development/python-modules/uproot/default.nix @@ -1,13 +1,15 @@ { lib -, awkward , buildPythonPackage , fetchFromGitHub +, pythonOlder +, awkward +, hatchling , importlib-metadata -, lz4 , numpy , packaging , pytestCheckHook -, pythonOlder +, lz4 +, pytest-timeout , scikit-hep-testdata , xxhash , zstandard @@ -15,32 +17,37 @@ buildPythonPackage rec { pname = "uproot"; - version = "4.3.6"; - format = "setuptools"; + version = "5.0.0"; + format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "scikit-hep"; - repo = "uproot4"; + repo = "uproot5"; rev = "refs/tags/v${version}"; - hash = "sha256-Te4D2tHVD5fD8DH2njjQMGnTUvLQdcGBzApklnGn6g8="; + hash = "sha256-3i6AUQKKWu5KOtfLdLK2LpgkHyiqG30Eiyy6OH4fjUY="; }; + nativeBuildInputs = [ + hatchling + ]; + propagatedBuildInputs = [ awkward numpy - lz4 packaging - xxhash - zstandard ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; checkInputs = [ pytestCheckHook + lz4 + pytest-timeout scikit-hep-testdata + xxhash + zstandard ]; preCheck = '' diff --git a/pkgs/development/python-modules/uproot3-methods/default.nix b/pkgs/development/python-modules/uproot3-methods/default.nix deleted file mode 100644 index f5760b974ffd4..0000000000000 --- a/pkgs/development/python-modules/uproot3-methods/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, numpy -, awkward0 -}: - -buildPythonPackage rec { - version = "0.10.1"; - pname = "uproot3-methods"; - - src = fetchPypi { - inherit pname version; - sha256 = "dd68f90be1ea276360b96369836849df29045f7fe4e534f9ac21ea00798ee358"; - }; - - nativeBuildInputs = [ awkward0 ]; - - propagatedBuildInputs = [ numpy awkward0 ]; - - # No tests on PyPi - doCheck = false; - pythonImportsCheck = [ "uproot3_methods" ]; - - meta = with lib; { - homepage = "https://github.com/scikit-hep/uproot3-methods"; - description = "Pythonic mix-ins for ROOT classes"; - license = licenses.bsd3; - maintainers = with maintainers; [ costrouc SuperSandro2000 ]; - }; -} diff --git a/pkgs/development/python-modules/uproot3/default.nix b/pkgs/development/python-modules/uproot3/default.nix deleted file mode 100644 index e5b3903eefa7e..0000000000000 --- a/pkgs/development/python-modules/uproot3/default.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ lib, fetchFromGitHub, buildPythonPackage, isPy27 -, awkward0, backports_lzma ? null, cachetools, lz4, pandas -, pytestCheckHook, pkgconfig, mock -, numpy, requests, uproot3-methods, xxhash, zstandard -}: - -buildPythonPackage rec { - pname = "uproot3"; - version = "3.14.4"; - - src = fetchFromGitHub { - owner = "scikit-hep"; - repo = "uproot3"; - rev = version; - sha256 = "sha256-hVJpKdYvyoCPyqgZzKYp30SvkYm+HWSNBdd9bYCYACE="; - }; - - postPatch = '' - substituteInPlace setup.py \ - --replace '"pytest-runner"' "" - ''; - - propagatedBuildInputs = [ - awkward0 - cachetools - lz4 - numpy - uproot3-methods - xxhash - zstandard - ] ++ lib.optional isPy27 backports_lzma; - - checkInputs = [ - mock - pandas - pkgconfig - pytestCheckHook - requests - ] ++ lib.optional isPy27 backports_lzma; - - meta = with lib; { - homepage = "https://github.com/scikit-hep/uproot3"; - description = "ROOT I/O in pure Python and Numpy"; - license = licenses.bsd3; - maintainers = with maintainers; [ ktf SuperSandro2000 ]; - }; -} diff --git a/pkgs/development/tools/coder/default.nix b/pkgs/development/tools/coder/default.nix index 6cc572b87bc17..cd82bfd16aa1b 100644 --- a/pkgs/development/tools/coder/default.nix +++ b/pkgs/development/tools/coder/default.nix @@ -5,13 +5,13 @@ }: buildGoModule rec { pname = "coder"; - version = "0.13.1"; + version = "0.13.2"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-85eH3gKn1khMiksA/kL+fHt1WiaOzVntYCiL1PR/0Cg="; + hash = "sha256-iuNTp+28tOggK3fgsa7yHmqXKz/zW/o47e5UKNppNWs="; }; # integration tests require network access diff --git a/pkgs/development/tools/doctl/default.nix b/pkgs/development/tools/doctl/default.nix index f2008614db6ad..1a94a3791d624 100644 --- a/pkgs/development/tools/doctl/default.nix +++ b/pkgs/development/tools/doctl/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "doctl"; - version = "1.88.0"; + version = "1.90.0"; vendorSha256 = null; @@ -31,7 +31,7 @@ buildGoModule rec { owner = "digitalocean"; repo = "doctl"; rev = "v${version}"; - sha256 = "sha256-Z1c+h+o2x5GeYK8DN5l2NXWJJNwg6NKvFpCuFMVSCeA="; + sha256 = "sha256-b6Tj1A2kF5dZ/dPSGAq9Bd0PB7zQ61RIKTKhFv422tw="; }; meta = with lib; { diff --git a/pkgs/development/tools/ruff/default.nix b/pkgs/development/tools/ruff/default.nix index 620c932d364e1..85a281c693dde 100644 --- a/pkgs/development/tools/ruff/default.nix +++ b/pkgs/development/tools/ruff/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "ruff"; - version = "0.0.179"; + version = "0.0.182"; src = fetchFromGitHub { owner = "charliermarsh"; repo = pname; rev = "v${version}"; - sha256 = "sha256-vc4gYTsA4bbrbn1NMf4ixIrDRS1Abak0FyXkGKUX8Eo="; + sha256 = "sha256-/ZivsD9PQPgF5Q/r6nYwth1MEyT5qOqy1HPvMibDZpI="; }; - cargoSha256 = "sha256-etuiSRAXoWPZwsZxFVTE0PG+TK6HlRTQG4WkLWdCg0M="; + cargoSha256 = "sha256-mijDys0Zmh+2+WwcMCq3Fouyhzqlr36ziB0vuSafT+o="; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices diff --git a/pkgs/development/tools/rust/cargo-tauri/default.nix b/pkgs/development/tools/rust/cargo-tauri/default.nix index 1112ae8cb0364..45e4a2b2e7848 100644 --- a/pkgs/development/tools/rust/cargo-tauri/default.nix +++ b/pkgs/development/tools/rust/cargo-tauri/default.nix @@ -11,20 +11,20 @@ rustPlatform.buildRustPackage rec { pname = "tauri"; - version = "1.0.5"; + version = "1.2.2"; src = fetchFromGitHub { owner = "tauri-apps"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-mp9U46H03NTMumUkx5kjsh9LnbPBrvlhh3yCH6FYdbE="; + rev = "tauri-v${version}"; + sha256 = "sha256-RBaIF9vWQwQAdqN3p3JS1WO6u3IMxi8CuCkrwQbd2gI="; }; # Manually specify the sourceRoot since this crate depends on other crates in the workspace. Relevant info at # https://discourse.nixos.org/t/difficulty-using-buildrustpackage-with-a-src-containing-multiple-cargo-workspaces/10202 sourceRoot = "source/tooling/cli"; - cargoSha256 = "sha256-iFXuVrxE/QmM+TAZmN8Ivt6Le19NWYIfVn1PNPvmhZo="; + cargoSha256 = "sha256-8sdCVOtPwIjW2x1yh1B0oybVi2kz3LQoK3OcaJvUsxQ="; buildInputs = [ glibc libsoup cairo gtk3 webkitgtk ]; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/tools/symfony-cli/default.nix b/pkgs/development/tools/symfony-cli/default.nix index 0812e35a04e3b..f42c4abd6c522 100644 --- a/pkgs/development/tools/symfony-cli/default.nix +++ b/pkgs/development/tools/symfony-cli/default.nix @@ -12,12 +12,20 @@ buildGoModule rec { sha256 = "sha256-GAsyI8I+tHFMV/LqwPx2ph+w3zaqKSn9vieVQcuO+y0="; }; + ldflags = [ + "-s" + "-w" + "-X main.version=${version}" + ]; + postInstall = '' mv $out/bin/symfony-cli $out/bin/symfony ''; # Tests requires network access - doCheck = false; + checkPhase = '' + $GOPATH/bin/symfony-cli + ''; meta = with lib; { description = "Symfony CLI"; diff --git a/pkgs/development/web/deno/default.nix b/pkgs/development/web/deno/default.nix index ef7f7a6dc69c3..5c5c6107346ec 100644 --- a/pkgs/development/web/deno/default.nix +++ b/pkgs/development/web/deno/default.nix @@ -17,15 +17,15 @@ rustPlatform.buildRustPackage rec { pname = "deno"; - version = "1.28.3"; + version = "1.29.1"; src = fetchFromGitHub { owner = "denoland"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Rkzr5Y50Z2A+TeWCrrC6GUvu8/x6IgDxvd8D6mKbIGE="; + sha256 = "sha256-RumRA3uCerWDgWZfLVJhqhaxsZs2YYpINaCjgJDmQBo="; }; - cargoSha256 = "sha256-n2K0CghobLri69oMrs8nCNSwq/5eH3YlzLtC9JRriQ8="; + cargoSha256 = "sha256-xKCslS98RB4yjt4v74dW8kSpHNGet0I4YhcA4mLLNwI="; postPatch = '' # upstream uses lld on aarch64-darwin for faster builds diff --git a/pkgs/development/web/deno/librusty_v8.nix b/pkgs/development/web/deno/librusty_v8.nix index 1de5bc0b541d6..ec13f634ea5cd 100644 --- a/pkgs/development/web/deno/librusty_v8.nix +++ b/pkgs/development/web/deno/librusty_v8.nix @@ -11,11 +11,11 @@ let }; in fetch_librusty_v8 { - version = "0.58.0"; + version = "0.60.0"; shas = { - x86_64-linux = "sha256-x4KLjexiLobbrLBvrE99XsVIw2LcUuu2Huk7nRBLRM4="; - aarch64-linux = "sha256-HSRLRF86nriU5ZkuZhQcqLFFMO4bstP8bR2tgF2XvbU="; - x86_64-darwin = "sha256-dHrotM/my1DQYGvHHQm726JgaLbC64IvwJGKgw9kZMM="; - aarch64-darwin = "sha256-QDBF/ssxXMIWEZHSv7e/E75XZVPx/MvGvGI/C45q2bE="; + x86_64-linux = "sha256-2cq9fpKhx3ctZ5Lo2RofXD5bXfVUUN6bRtG453MQMW4="; + aarch64-linux = "sha256-hjVUzCYdGkc3kMC/cSXDFOaqJmMBi83dqqASS5R2158="; + x86_64-darwin = "sha256-EyYWfDU0eVFVzSVAHBFUbsppzpHtwe+Fd+z2ZmIub2c="; + aarch64-darwin = "sha256-2VyEFqWsPZlkEDvNxkmrMCIKfsO7LAO+VvsjSMcyFUo="; }; } diff --git a/pkgs/games/opendungeons/default.nix b/pkgs/games/opendungeons/default.nix index 3b3e22dbb85d6..61f8aad304c8b 100644 --- a/pkgs/games/opendungeons/default.nix +++ b/pkgs/games/opendungeons/default.nix @@ -29,7 +29,5 @@ stdenv.mkDerivation rec { homepage = "https://opendungeons.github.io"; license = with licenses; [ gpl3Plus zlib mit cc-by-sa-30 cc0 ofl cc-by-30 ]; platforms = platforms.linux; - # never built on aarch64-linux since first introduction in nixpkgs - broken = stdenv.isLinux && stdenv.isAarch64; }; } diff --git a/pkgs/games/scummvm/default.nix b/pkgs/games/scummvm/default.nix index 1943036a83ef1..9b989ac70e059 100644 --- a/pkgs/games/scummvm/default.nix +++ b/pkgs/games/scummvm/default.nix @@ -47,7 +47,5 @@ stdenv.mkDerivation rec { license = licenses.gpl2; maintainers = [ maintainers.peterhoeg ]; platforms = platforms.unix; - # never built on aarch64-darwin since first introduction in nixpkgs - broken = stdenv.isDarwin && stdenv.isAarch64; }; } diff --git a/pkgs/os-specific/linux/hostapd/default.nix b/pkgs/os-specific/linux/hostapd/default.nix index 3fdbaa9149a68..f1cd6b67165b0 100644 --- a/pkgs/os-specific/linux/hostapd/default.nix +++ b/pkgs/os-specific/linux/hostapd/default.nix @@ -72,7 +72,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "https://hostap.epitest.fi"; + homepage = "https://w1.fi/hostapd/"; description = "A user space daemon for access point and authentication servers"; license = licenses.gpl2; maintainers = with maintainers; [ ninjatrappeur hexa ]; diff --git a/pkgs/servers/http/nginx/generic.nix b/pkgs/servers/http/nginx/generic.nix index c4fe7f8920512..a18b771aa1c37 100644 --- a/pkgs/servers/http/nginx/generic.nix +++ b/pkgs/servers/http/nginx/generic.nix @@ -32,6 +32,9 @@ with lib; let + moduleNames = map (mod: mod.name or (throw "The nginx module with source ${toString mod.src} does not have a `name` attribute. This prevents duplicate module detection and is no longer supported.")) + modules; + mapModules = attrPath: flip concatMap modules (mod: let supports = mod.supports or (_: true); @@ -41,6 +44,9 @@ let in +assert assertMsg (unique moduleNames == moduleNames) + "nginx: duplicate modules: ${concatStringsSep ", " moduleNames}. A common cause for this is that services.nginx.additionalModules adds a module which the nixos module itself already adds."; + stdenv.mkDerivation { inherit pname; inherit version; diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix index 7d8a6716bc973..2eebf84b41eaf 100644 --- a/pkgs/servers/http/nginx/modules.nix +++ b/pkgs/servers/http/nginx/modules.nix @@ -1,8 +1,9 @@ -{ fetchFromGitHub, fetchFromGitLab, fetchhg, lib, pkgs }: +{ config, fetchFromGitHub, fetchFromGitLab, fetchhg, lib, pkgs }: let http_proxy_connect_module_generic = patchName: rec { + name = "http_proxy_connect"; src = fetchFromGitHub { name = "http_proxy_connect_module_generic"; owner = "chobits"; @@ -10,7 +11,6 @@ let rev = "96ae4e06381f821218f368ad0ba964f87cbe0266"; sha256 = "1nc7z31i7x9dzp67kzgvs34hs6ps749y26wcpi3wf5mm63i803rh"; }; - patches = [ "${src}/patch/${patchName}.patch" ]; @@ -18,11 +18,12 @@ let in -{ +let self = { fastcgi-cache-purge = throw "fastcgi-cache-purge was renamed to cache-purge"; ngx_aws_auth = throw "ngx_aws_auth was renamed to aws-auth"; akamai-token-validate = { + name = "akamai-token-validate"; src = fetchFromGitHub { name = "akamai-token-validate"; owner = "kaltura"; @@ -34,6 +35,7 @@ in }; auth-a2aclr = { + name = "auth-a2aclr"; src = fetchFromGitLab { name = "auth-a2aclr"; owner = "arpa2"; @@ -57,6 +59,7 @@ in }; aws-auth = { + name = "aws-auth"; src = fetchFromGitHub { name = "aws-auth"; owner = "anomalizer"; @@ -67,6 +70,7 @@ in }; brotli = { + name = "brotli"; src = let gitsrc = pkgs.fetchFromGitHub { name = "brotli"; owner = "google"; @@ -83,6 +87,7 @@ in }; cache-purge = { + name = "cache-purge"; src = fetchFromGitHub { name = "cache-purge"; owner = "nginx-modules"; @@ -93,6 +98,7 @@ in }; coolkit = { + name = "coolkit"; src = fetchFromGitHub { name = "coolkit"; owner = "FRiCKLE"; @@ -103,6 +109,7 @@ in }; dav = { + name = "dav"; src = fetchFromGitHub { name = "dav"; owner = "arut"; @@ -114,6 +121,7 @@ in }; develkit = { + name = "develkit"; src = fetchFromGitHub { name = "develkit"; owner = "vision5"; @@ -124,6 +132,7 @@ in }; echo = { + name = "echo"; src = fetchFromGitHub { name = "echo"; owner = "openresty"; @@ -134,6 +143,7 @@ in }; fancyindex = { + name = "fancyindex"; src = fetchFromGitHub { name = "fancyindex"; owner = "aperezdc"; @@ -147,6 +157,7 @@ in }; fluentd = { + name = "fluentd"; src = fetchFromGitHub { name = "fluentd"; owner = "fluent"; @@ -157,6 +168,7 @@ in }; geoip2 = { + name = "geoip2"; src = fetchFromGitHub { name = "geoip2"; owner = "leev"; @@ -180,6 +192,7 @@ in }; ipscrub = { + name = "ipscrub"; src = fetchFromGitHub { name = "ipscrub"; @@ -192,6 +205,7 @@ in }; limit-speed = { + name = "limit-speed"; src = fetchFromGitHub { name = "limit-speed"; owner = "yaoweibin"; @@ -202,6 +216,7 @@ in }; live = { + name = "live"; src = fetchFromGitHub { name = "live"; owner = "arut"; @@ -212,6 +227,7 @@ in }; lua = { + name = "lua"; src = fetchFromGitHub { name = "lua"; owner = "openresty"; @@ -228,6 +244,7 @@ in }; lua-upstream = { + name = "lua-upstream"; src = fetchFromGitHub { name = "lua-upstream"; owner = "openresty"; @@ -240,14 +257,7 @@ in }; modsecurity = { - src = "${pkgs.modsecurity_standalone.nginx}/nginx/modsecurity"; - inputs = [ pkgs.curl pkgs.apr pkgs.aprutil pkgs.apacheHttpd pkgs.yajl ]; - preConfigure = '' - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${pkgs.aprutil.dev}/include/apr-1 -I${pkgs.apacheHttpd.dev}/include -I${pkgs.apr.dev}/include/apr-1 -I${pkgs.yajl}/include" - ''; - }; - - modsecurity-nginx = { + name = "modsecurity"; src = fetchFromGitHub { name = "modsecurity-nginx"; owner = "SpiderLabs"; @@ -260,6 +270,7 @@ in }; moreheaders = { + name = "moreheaders"; src = fetchFromGitHub { name = "moreheaders"; owner = "openresty"; @@ -270,6 +281,7 @@ in }; mpeg-ts = { + name = "mpeg-ts"; src = fetchFromGitHub { name = "mpeg-ts"; owner = "arut"; @@ -280,17 +292,18 @@ in }; naxsi = { - src = fetchFromGitHub - { - name = "naxsi"; - owner = "nbs-system"; - repo = "naxsi"; - rev = "95ac520eed2ea04098a76305fd0ad7e9158840b7"; - sha256 = "0b5pnqkgg18kbw5rf2ifiq7lsx5rqmpqsql6hx5ycxjzxj6acfb3"; - } + "/naxsi_src"; + name = "naxsi"; + src = fetchFromGitHub { + name = "naxsi"; + owner = "nbs-system"; + repo = "naxsi"; + rev = "95ac520eed2ea04098a76305fd0ad7e9158840b7"; + sha256 = "0b5pnqkgg18kbw5rf2ifiq7lsx5rqmpqsql6hx5ycxjzxj6acfb3"; + } + "/naxsi_src"; }; njs = rec { + name = "njs"; src = fetchhg { url = "https://hg.nginx.org/njs"; rev = "0.7.8"; @@ -313,6 +326,7 @@ in }; opentracing = { + name = "opentracing"; src = let src' = fetchFromGitHub { name = "opentracing"; @@ -353,12 +367,14 @@ in ''; in { + name = "pagespeed"; src = ngx_pagespeed; inputs = [ pkgs.zlib pkgs.libuuid ]; # psol deps allowMemoryWriteExecute = true; }; pam = { + name = "pam"; src = fetchFromGitHub { name = "pam"; owner = "sto"; @@ -370,6 +386,7 @@ in }; pinba = { + name = "pinba"; src = fetchFromGitHub { name = "pinba"; owner = "tony2001"; @@ -380,6 +397,7 @@ in }; push-stream = { + name = "push-stream"; src = fetchFromGitHub { name = "push-stream"; owner = "wandenberg"; @@ -390,6 +408,7 @@ in }; rtmp = { + name = "rtmp"; src = fetchFromGitHub { name = "rtmp"; owner = "arut"; @@ -400,6 +419,7 @@ in }; secure-token = { + name = "secure-token"; src = fetchFromGitHub { name = "secure-token"; owner = "kaltura"; @@ -411,6 +431,7 @@ in }; set-misc = { + name = "set-misc"; src = fetchFromGitHub { name = "set-misc"; owner = "openresty"; @@ -421,6 +442,7 @@ in }; shibboleth = { + name = "shibboleth"; src = fetchFromGitHub { name = "shibboleth"; owner = "nginx-shib"; @@ -431,6 +453,7 @@ in }; sla = { + name = "sla"; src = fetchFromGitHub { name = "sla"; owner = "goldenclone"; @@ -441,6 +464,7 @@ in }; slowfs-cache = { + name = "slowfs-cache"; src = fetchFromGitHub { name = "slowfs-cache"; owner = "FRiCKLE"; @@ -451,6 +475,7 @@ in }; sorted-querystring = { + name = "sorted-querystring"; src = fetchFromGitHub { name = "sorted-querystring"; owner = "wandenberg"; @@ -461,6 +486,7 @@ in }; spnego-http-auth = { + name = "spnego-http-auth"; src = fetchFromGitHub { name = "spnego-http-auth"; owner = "stnoonan"; @@ -471,6 +497,7 @@ in }; statsd = { + name = "statsd"; src = fetchFromGitHub { name = "statsd"; owner = "harvesthq"; @@ -481,6 +508,7 @@ in }; stream-sts = { + name = "stream-sts"; src = fetchFromGitHub { name = "stream-sts"; owner = "vozlt"; @@ -491,6 +519,7 @@ in }; sts = { + name = "sts"; src = fetchFromGitHub { name = "sts"; owner = "vozlt"; @@ -501,6 +530,7 @@ in }; subsFilter = { + name = "subsFilter"; src = fetchFromGitHub { name = "subsFilter"; owner = "yaoweibin"; @@ -511,6 +541,7 @@ in }; sysguard = { + name = "sysguard"; src = fetchFromGitHub { name = "sysguard"; owner = "vozlt"; @@ -521,6 +552,7 @@ in }; upload = { + name = "upload"; src = fetchFromGitHub { name = "upload"; owner = "fdintino"; @@ -531,6 +563,7 @@ in }; upstream-check = { + name = "upstream-check"; src = fetchFromGitHub { name = "upstream-check"; owner = "yaoweibin"; @@ -541,6 +574,7 @@ in }; upstream-tarantool = { + name = "upstream-tarantool"; src = fetchFromGitHub { name = "upstream-tarantool"; owner = "tarantool"; @@ -552,6 +586,7 @@ in }; url = { + name = "url"; src = fetchFromGitHub { name = "url"; owner = "vozlt"; @@ -562,6 +597,7 @@ in }; video-thumbextractor = { + name = "video-thumbextractor"; src = fetchFromGitHub { name = "video-thumbextractor"; owner = "wandenberg"; @@ -573,6 +609,7 @@ in }; vod = { + name = "vod"; src = fetchFromGitHub { name = "vod"; owner = "kaltura"; @@ -584,6 +621,7 @@ in }; vts = { + name = "vts"; src = fetchFromGitHub { name = "vts"; owner = "vozlt"; @@ -592,4 +630,7 @@ in sha256 = "sha256-x4ry5ljPeJQY+7Mp04/xYIGf22d6Nee7CSqHezdK4gQ="; }; }; +}; in self // lib.optionalAttrs config.allowAliases { + # deprecated or renamed packages + modsecurity-nginx = self.modsecurity; } diff --git a/pkgs/servers/invidious/default.nix b/pkgs/servers/invidious/default.nix index 8b9138e0a4cb1..b3b0d2d47ad0b 100644 --- a/pkgs/servers/invidious/default.nix +++ b/pkgs/servers/invidious/default.nix @@ -115,6 +115,5 @@ crystal.buildCrystalPackage rec { homepage = "https://invidious.io/"; license = licenses.agpl3; maintainers = with maintainers; [ infinisil sbruder ]; - broken = stdenv.isDarwin && stdenv.isAarch64; }; } diff --git a/pkgs/servers/invidious/lsquic.nix b/pkgs/servers/invidious/lsquic.nix index ca04c97c12800..c2c88dd8e3b87 100644 --- a/pkgs/servers/invidious/lsquic.nix +++ b/pkgs/servers/invidious/lsquic.nix @@ -54,8 +54,7 @@ let }) ]; - preBuild = '' - ${preBuild} + preBuild = preBuild + lib.optionalString stdenv.isLinux '' sed -e '/^build crypto\/fipsmodule\/CMakeFiles\/fipsmodule\.dir\/bcm\.c\.o:/,/^ *FLAGS =/ s/^ *FLAGS = -Werror/& -Wno-error=stringop-overflow/' \ -i build.ninja ''; @@ -73,6 +72,11 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace ".so" "${stdenv.hostPlatform.extensions.sharedLibrary}" + ''; + nativeBuildInputs = [ cmake perl ]; buildInputs = [ boringssl' libevent zlib ]; diff --git a/pkgs/servers/monitoring/vmagent/default.nix b/pkgs/servers/monitoring/vmagent/default.nix index aa6b4c727f9a6..71038d5637de4 100644 --- a/pkgs/servers/monitoring/vmagent/default.nix +++ b/pkgs/servers/monitoring/vmagent/default.nix @@ -1,13 +1,13 @@ { lib, fetchFromGitHub, buildGoModule }: buildGoModule rec { pname = "vmagent"; - version = "1.84.0"; + version = "1.85.0"; src = fetchFromGitHub { owner = "VictoriaMetrics"; repo = "VictoriaMetrics"; rev = "v${version}"; - sha256 = "sha256-94QhjsCow1Ate/Bbia7KpWY3WgHk3oOarAY95Fq75hU="; + sha256 = "sha256-ez/gq+QBDy2xGqUBoUWQFDDUpd4i0zpj9mUDZUWKbIw="; }; ldflags = [ "-s" "-w" "-X github.com/VictoriaMetrics/VictoriaMetrics/lib/buildinfo.Version=${version}" ]; diff --git a/pkgs/servers/uxplay/default.nix b/pkgs/servers/uxplay/default.nix index 5b91d7c0df5d5..40e67a4818a50 100644 --- a/pkgs/servers/uxplay/default.nix +++ b/pkgs/servers/uxplay/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "uxplay"; - version = "1.58"; + version = "1.59"; src = fetchFromGitHub { owner = "FDH2"; repo = "UxPlay"; rev = "v${version}"; - sha256 = "sha256-KkYIj5W6yMQi8En24Bo77GMK/AOS2qJhadQJYSd7gXs="; + sha256 = "sha256-A56ks9E59FLka8/u9OYzSvMeCz1nZxeoNqZ0ITu0Vhg="; }; postPatch = '' diff --git a/pkgs/tools/admin/chamber/default.nix b/pkgs/tools/admin/chamber/default.nix index fff2343cf21de..96934ba366bf4 100644 --- a/pkgs/tools/admin/chamber/default.nix +++ b/pkgs/tools/admin/chamber/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "chamber"; - version = "2.10.12"; + version = "2.11.0"; src = fetchFromGitHub { owner = "segmentio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-KbKOaUwJEy/mT59yW0VhZ3MIWkXarCRY8cyNlaI51mQ="; + sha256 = "sha256-QoFdcPfwbcX8rVqX5yHg0B7sIAKE3iLWzwLV991t7a0="; }; CGO_ENABLED = 0; diff --git a/pkgs/tools/misc/watchlog/default.nix b/pkgs/tools/misc/watchlog/default.nix index b89d42354e1bb..56c56f9c669b8 100644 --- a/pkgs/tools/misc/watchlog/default.nix +++ b/pkgs/tools/misc/watchlog/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "watchlog"; - version = "1.152.0"; + version = "1.197.0"; src = fetchFromGitLab { owner = "kevincox"; repo = "watchlog"; rev = "v${version}"; - sha256 = "sha256-m0sqLi5qxQKfdFtHxo0DX4bV6lUNZP1JWt8NAfY+F5A="; + sha256 = "sha256-6/SF+bsf4KAVdbda8AmeNxZiOZsyU2MfGmR4b+geETE="; }; - cargoSha256 = "sha256-uIaGIHBB/ntGyBZL45E61E9fELR8UGRieb/fJQsB5NE="; + cargoSha256 = "sha256-8lBHsWGzu0h+hHsFK4DuPz6cTsgOT3JZFbsecJskdok="; meta = { description = "Easier monitoring of live logs"; diff --git a/pkgs/tools/networking/dnsproxy/default.nix b/pkgs/tools/networking/dnsproxy/default.nix index 1940cf907d8e2..730c840d2be49 100644 --- a/pkgs/tools/networking/dnsproxy/default.nix +++ b/pkgs/tools/networking/dnsproxy/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "dnsproxy"; - version = "0.46.4"; + version = "0.46.5"; src = fetchFromGitHub { owner = "AdguardTeam"; repo = pname; rev = "v${version}"; - sha256 = "sha256-QJ9qLcQKuv2T3Vf9ASuCI+w6+6NysZJAYbUEEglWLts="; + sha256 = "sha256-NoRB0S9hdxy6udiIbvYW8yYSuVNXIC12CXuMoNB4nNo="; }; vendorSha256 = null; diff --git a/pkgs/tools/security/enum4linux-ng/default.nix b/pkgs/tools/security/enum4linux-ng/default.nix index a84de966b6f4c..5ae5d53c5f270 100644 --- a/pkgs/tools/security/enum4linux-ng/default.nix +++ b/pkgs/tools/security/enum4linux-ng/default.nix @@ -9,13 +9,13 @@ buildPythonApplication rec { pname = "enum4linux-ng"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "cddmp"; repo = pname; - rev = "v${version}"; - sha256 = "0fk6hzmvxb5y3nb41qr6dssxhdahkh5nxhbx480x42fhnqpssir5"; + rev = "refs/tags/v${version}"; + hash = "sha256-9J7MiSxfAuzp1M9v4MMWOnK0/lg/X7I4pC6C2yMpMr0="; }; propagatedBuildInputs = [ @@ -35,6 +35,7 @@ buildPythonApplication rec { enumerating information from Windows and Samba systems. ''; homepage = "https://github.com/cddmp/enum4linux-ng"; + changelog = "https://github.com/cddmp/enum4linux-ng/releases/tag/v${version}"; license = with licenses; [ gpl3Plus ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/tools/security/volatility3/default.nix b/pkgs/tools/security/volatility3/default.nix index e019d96129f54..d5a7cc31eba61 100644 --- a/pkgs/tools/security/volatility3/default.nix +++ b/pkgs/tools/security/volatility3/default.nix @@ -5,13 +5,13 @@ python3.pkgs.buildPythonApplication rec { pname = "volatility3"; - version = "2.0.1"; + version = "2.4.0"; src = fetchFromGitHub { owner = "volatilityfoundation"; repo = pname; - rev = "v${version}"; - hash = "sha256-rEqp+V5r4Sk4D+r2ukR1uy4IDj9XQGhYwoYSPeMyKpA="; + rev = "refs/tags/v${version}"; + hash = "sha256-tbnyNxC4qyiHEeLzMgMJj9/uGLQTxDzNr1x22oSTM6k="; }; propagatedBuildInputs = with python3.pkgs; [ @@ -36,6 +36,7 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { description = "Volatile memory extraction frameworks"; homepage = "https://www.volatilityfoundation.org/"; + changelog = "https://github.com/volatilityfoundation/volatility3/releases/tag/v${version}"; license = { # Volatility Software License 1.0 free = false; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b033268758f56..306aa5986bf57 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -34934,7 +34934,7 @@ with pkgs; tengine = callPackage ../servers/http/tengine { openssl = openssl_1_1; - modules = with nginxModules; [ rtmp dav moreheaders modsecurity-nginx ]; + modules = with nginxModules; [ rtmp dav moreheaders modsecurity ]; }; tennix = callPackage ../games/tennix { }; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 4bca35a3e1ac2..8223de074b811 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -38,6 +38,7 @@ mapAliases ({ anyjson = throw "anyjson has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2022-01-18 argon2_cffi = argon2-cffi; # added 2022-05-09 asyncio-nats-client = nats-py; # added 2022-02-08 + awkward0 = throw "awkward0 has been removed, use awkward instead"; # added 2022-12-13 Babel = babel; # added 2022-05-06 bitcoin-price-api = throw "bitcoin-price-api has been removed, it was using setuptools 2to3 translation feautre, which has been removed in setuptools 58"; # added 2022-02-15 blockdiagcontrib-cisco = throw "blockdiagcontrib-cisco is not compatible with blockdiag 2.0.0 and has been removed."; # added 2020-11-29 @@ -219,6 +220,8 @@ mapAliases ({ types-cryptography = throw "types-cryptography has been removed because it is obsolete since cryptography version 3.4.4."; # added 2022-05-30 types-paramiko = throw "types-paramiko has been removed because it was unused."; # added 2022-05-30 unittest2 = throw "unittest2 has been removed as it's a backport of unittest that's unmaintained and not needed beyond Python 3.4."; # added 2022-12-01 + uproot3 = throw "uproot3 has been removed, use uproot instead"; # added 2022-12-13 + uproot3-methods = throw "uproot3-methods has been removed"; # added 2022-12-13 Wand = wand; # added 2022-11-13 WazeRouteCalculator = wazeroutecalculator; # added 2021-09-29 weakrefmethod = throw "weakrefmethod was removed since it's not needed in Python >= 3.4"; # added 2022-12-01 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 585870478f081..127bee350da6f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -817,9 +817,10 @@ self: super: with self; { awesomeversion = callPackage ../development/python-modules/awesomeversion { }; - awkward0 = callPackage ../development/python-modules/awkward0 { }; awkward = callPackage ../development/python-modules/awkward { }; + awkward-cpp = callPackage ../development/python-modules/awkward-cpp { }; + aws-adfs = callPackage ../development/python-modules/aws-adfs { }; aws-lambda-builders = callPackage ../development/python-modules/aws-lambda-builders { }; @@ -10078,6 +10079,8 @@ self: super: with self; { scikit-build = callPackage ../development/python-modules/scikit-build { }; + scikit-build-core = callPackage ../development/python-modules/scikit-build-core { }; + scikit-fmm = callPackage ../development/python-modules/scikit-fmm { }; scikit-fuzzy = callPackage ../development/python-modules/scikit-fuzzy { }; @@ -11667,10 +11670,6 @@ self: super: with self; { uproot = callPackage ../development/python-modules/uproot { }; - uproot3 = callPackage ../development/python-modules/uproot3 { }; - - uproot3-methods = callPackage ../development/python-modules/uproot3-methods { }; - uptime = callPackage ../development/python-modules/uptime { }; uptime-kuma-monitor = callPackage ../development/python-modules/uptime-kuma-monitor { }; |