gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot]
2024-07-25 12:01:48 +00:00
committed by GitHub
parent 3d86ffb3b3 f20ed12f93
commit 5aef1c4b8c
47 changed files with 1324 additions and 214 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/blockchains/clboss/default.nix
+2 -2
View File
@@ -11,13 +11,13 @@
stdenv.mkDerivation rec {
pname = "clboss";
version = "0.13.1";
version = "0.13.2";
src = fetchFromGitHub {
owner = "ZmnSCPxj";
repo = "clboss";
rev = "v${version}";
hash = "sha256-DQvcf+y73QQYQanEvbOCOgwQzvNOXS1ZY+hVvS6N+G0=";
hash = "sha256-BMDeqAQGl2mSWyde5Pbai+1KHqPqcY+xzaY36L26olI=";
};
nativeBuildInputs = [ autoconf-archive autoreconfHook pkg-config libev curlWithGnuTls sqlite ];
pkgs/applications/radio/gnuradio/3.8.nix
+3 -3
View File
@@ -103,11 +103,11 @@ let
runtime = [
thrift
];
pythonRuntime = with python.pkgs; [
pythonRuntime = [
python.pkgs.thrift
# For gr-perf-monitorx
matplotlib
networkx
python.pkgs.matplotlib
python.pkgs.networkx
];
};
gnuradio-companion = {
pkgs/applications/radio/gnuradio/3.9.nix
+3 -3
View File
@@ -102,11 +102,11 @@ let
libunwind
thrift
];
pythonRuntime = with python.pkgs; [
pythonRuntime = [
python.pkgs.thrift
# For gr-perf-monitorx
matplotlib
networkx
python.pkgs.matplotlib
python.pkgs.networkx
];
cmakeEnableFlag = "GR_CTRLPORT";
};
pkgs/applications/radio/gnuradio/default.nix
+5 -5
View File
@@ -44,11 +44,11 @@
# If one wishes to use a different src or name for a very custom build
, overrideSrc ? {}
, pname ? "gnuradio"
, version ? "3.10.10.0"
, version ? "3.10.11.0"
}:
let
sourceSha256 = "sha256-pEVWhXDjOevrduDbZQbiDbODZY8PpsGY4O8yxrwlCcs=";
sourceSha256 = "sha256-QOZXUj+ZmfpazsrHEs8Gx3WSmoHG/zO43NEpyhIjpN8=";
featuresInfo = {
# Needed always
basic = {
@@ -103,11 +103,11 @@ let
libunwind
thrift
];
pythonRuntime = with python.pkgs; [
pythonRuntime = [
python.pkgs.thrift
# For gr-perf-monitorx
matplotlib
networkx
python.pkgs.matplotlib
python.pkgs.networkx
];
cmakeEnableFlag = "GR_CTRLPORT";
};
pkgs/applications/radio/gnuradio/shared.nix
+4 -4
View File
@@ -123,7 +123,7 @@ in {
export QT_PLUGIN_PATH="${qt.qtbase.bin}/${qt.qtbase.qtPluginPrefix}"
'';
meta = with lib; {
meta = {
description = "Software Defined Radio (SDR) software";
mainProgram = "gnuradio-config-info";
longDescription = ''
@@ -136,8 +136,8 @@ in {
real-world radio systems.
'';
homepage = "https://www.gnuradio.org";
license = licenses.gpl3;
platforms = platforms.unix;
maintainers = with maintainers; [ doronbehar bjornfor fpletz jiegec ];
license = lib.licenses.gpl3;
platforms = lib.platforms.unix;
maintainers = with lib.maintainers; [ doronbehar bjornfor fpletz jiegec ];
};
}
pkgs/applications/version-management/gitoxide/default.nix
+3 -3
View File
@@ -19,16 +19,16 @@ let
ein = "${stdenv.hostPlatform.emulator buildPackages} $out/bin/ein";
in rustPlatform.buildRustPackage rec {
pname = "gitoxide";
version = "0.36.0";
version = "0.37.0";
src = fetchFromGitHub {
owner = "Byron";
repo = "gitoxide";
rev = "v${version}";
hash = "sha256-HXuMcLY5BAC2dODlI6sgwCyGEBDW6ojlHRCBnIQ6P6A=";
hash = "sha256-ZnfWIFphIdPHKvpzO0Cn5KCahpvKh56HZun09I1l8Vc=";
};
cargoHash = "sha256-v+HVrYMPwbD0RDyxufv11KOnWGbTljpbx6ZlSJ46Olk=";
cargoHash = "sha256-oKcCodoMUaduxXXgUV+z7zlg5mc783PSsgoECdW/Uug=";
nativeBuildInputs = [ cmake pkg-config installShellFiles ];
pkgs/build-support/node/fetch-yarn-deps/index.js
+7 -4
View File
@@ -39,7 +39,7 @@ const downloadFileHttps = (fileName, url, expectedHash, hashType = 'sha1') => {
const h = hash.read()
if (expectedHash === undefined){
console.log(`Warning: lockfile url ${url} doesn't end in "#<hash>" to validate against. Downloaded file had hash ${h}.`);
} else if (h != expectedHash) return reject(new Error(`hash mismatch, expected ${expectedHash}, got ${h}`))
} else if (h != expectedHash) return reject(new Error(`hash mismatch, expected ${expectedHash}, got ${h} for ${url}`))
resolve()
})
res.on('error', e => reject(e))
@@ -104,11 +104,14 @@ const downloadPkg = (pkg, verbose) => {
const [ url, hash ] = pkg.resolved.split('#')
if (verbose) console.log('downloading ' + url)
const fileName = urlToName(url)
const s = url.split('/')
if (url.startsWith('https://codeload.github.com/') && url.includes('/tar.gz/')) {
const s = url.split('/')
return downloadGit(fileName, `https://github.com/${s[3]}/${s[4]}.git`, s[s.length-1])
} else if (url.startsWith('https://github.com/') && url.endsWith('.tar.gz')) {
const s = url.split('/')
} else if (url.startsWith('https://github.com/') && url.endsWith('.tar.gz') &&
(
s.length <= 5 || // https://github.com/owner/repo.tgz#feedface...
s[5] == "archive" // https://github.com/owner/repo/archive/refs/tags/v0.220.1.tar.gz
)) {
return downloadGit(fileName, `https://github.com/${s[3]}/${s[4]}.git`, s[s.length-1].replace(/.tar.gz$/, ''))
} else if (isGitUrl(url)) {
return downloadGit(fileName, url.replace(/^git\+/, ''), hash)
pkgs/build-support/node/fetch-yarn-deps/tests/default.nix
+4
View File
@@ -17,6 +17,10 @@
yarnLock = ./github.lock;
sha256 = "sha256-DIKrhDKoqm7tHZmcuh9eK9VTqp6BxeW0zqDUpY4F57A=";
};
githubReleaseDep = testers.invalidateFetcherByDrvHash fetchYarnDeps {
yarnLock = ./github-release.lock;
sha256 = "sha256-g+y/H6k8LZ+IjWvkkwV7JhKQH1ycfeqzsIonNv4fDq8=";
};
gitUrlDep = testers.invalidateFetcherByDrvHash fetchYarnDeps {
yarnLock = ./giturl.lock;
sha256 = "sha256-VPnyqN6lePQZGXwR7VhbFnP7/0/LB621RZwT1F+KzVQ=";
pkgs/build-support/node/fetch-yarn-deps/tests/github-release.lock
+6
View File
@@ -0,0 +1,6 @@
"libsession_util_nodejs@https://github.com/oxen-io/libsession-util-nodejs/releases/download/v0.3.19/libsession_util_nodejs-v0.3.19.tar.gz":
version "0.3.19"
resolved "https://github.com/oxen-io/libsession-util-nodejs/releases/download/v0.3.19/libsession_util_nodejs-v0.3.19.tar.gz#221c1fc34fcc18601aea4ce1b733ebfa55af66ea"
dependencies:
cmake-js "^7.2.1"
node-addon-api "^6.1.0"
pkgs/by-name/ch/charmcraft/package.nix
+11 -10
View File
@@ -30,7 +30,7 @@ let
in
python.pkgs.buildPythonApplication rec {
pname = "charmcraft";
version = "2.7.0";
version = "3.1.1";
pyproject = true;
@@ -38,24 +38,22 @@ python.pkgs.buildPythonApplication rec {
owner = "canonical";
repo = "charmcraft";
rev = "refs/tags/${version}";
hash = "sha256-yMcGXi7OxEtfOv3zLEUlnZrR90TkFc0y9RB9jS34ZWs=";
hash = "sha256-oxNbAIf7ltdDYkGJj29zvNDNXT6vt1jWaIqHJoMr7gU=";
};
postPatch = ''
substituteInPlace setup.py \
--replace-fail 'version=determine_version()' 'version="${version}"'
# TODO remove setuptools from dependencies once this is removed
substituteInPlace charmcraft/env.py \
--replace-fail "distutils.util" "setuptools.dist"
substituteInPlace charmcraft/__init__.py --replace-fail "dev" "${version}"
'';
dependencies = with python.pkgs; [
craft-application
craft-cli
craft-parts
craft-platforms
craft-providers
craft-store
distro
docker
humanize
jinja2
jsonschema
@@ -65,19 +63,22 @@ python.pkgs.buildPythonApplication rec {
requests
requests-toolbelt
requests-unixsocket
setuptools # see substituteInPlace above
snap-helpers
tabulate
urllib3
];
build-system = with python.pkgs; [ setuptools ];
build-system = with python.pkgs; [
setuptools
setuptools-scm
];
pythonRelaxDeps = [ "urllib3" ];
nativeCheckInputs =
with python.pkgs;
[
hypothesis
pyfakefs
pytest-check
pytest-mock
pkgs/by-name/co/codeium/package.nix
+5 -5
View File
@@ -13,10 +13,10 @@ let
}.${system} or throwSystem;
hash = {
x86_64-linux = "sha256-ULHO7NrbW0DDlOYiSHGXwJ+NOa68Ma+HMHgq2WyAKBA=";
aarch64-linux = "sha256-WVqPV/D9jPADkxt5XmydqXjSG8461URPsk1+W/kyZV0=";
x86_64-darwin = "sha256-0P/eYZp0Wieza0btOA+yxqKtoIYlUN6MhN0dI6R8GEg=";
aarch64-darwin = "sha256-2Cv22+Ii+otKLDQ404l9R/x42PkKTEzPB72/gc9wfig=";
x86_64-linux = "sha256-EpmbqXLu+yShS86mXCTYpLuPVPIzvQIKVMcnVEN61OU=";
aarch64-linux = "sha256-rCglTEpIxGR0RjOSJgEgJGWhhJ/ZgI361AMkgBbnflU=";
x86_64-darwin = "sha256-C9xOdgNmapOgLVyrZGP03hcVwIpmHqFwpxQalZtbJSo=";
aarch64-darwin = "sha256-Gm5ZITOpsKNeWkqDPrn9BbPDH4AM3NkFG+nhc6hbZ+4=";
}.${system} or throwSystem;
bin = "$out/bin/codeium_language_server";
@@ -24,7 +24,7 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "codeium";
version = "1.8.80";
version = "1.10.0";
src = fetchurl {
name = "${finalAttrs.pname}-${finalAttrs.version}.gz";
url = "https://github.com/Exafunction/codeium/releases/download/language-server-v${finalAttrs.version}/language_server_${plat}.gz";
pkgs/by-name/md/mdbook-alerts/package.nix
+37
View File
@@ -0,0 +1,37 @@
{
lib,
stdenv,
fetchFromGitHub,
rustPlatform,
darwin,
CoreServices ? darwin.apple_sdk.frameworks.CoreServices,
}:
let
version = "0.6.0";
in
rustPlatform.buildRustPackage {
pname = "mdbook-alerts";
inherit version;
src = fetchFromGitHub {
owner = "lambdalisue";
repo = "rs-mdbook-alerts";
rev = "v${version}";
hash = "sha256-LKNEI4dPXQwa+7JqLXpFZeKaQSSS5DFdeGuxEGNgPCU=";
};
cargoHash = "sha256-oycBTCjC58cO9q+eeO1nFGZGKdp6Bilgs8aFHW/4gXs=";
buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ];
meta = {
description = "Preprocessor for mdbook to support the inclusion of Markdown alerts";
mainProgram = "mdbook-alerts";
homepage = "https://github.com/lambdalisue/rs-mdbook-alerts";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [
brianmcgillion
matthiasbeyer
];
};
}
pkgs/by-name/pr/previewqt/package.nix
+64
View File
@@ -0,0 +1,64 @@
{
lib,
vips,
resvg,
mpv,
libraw,
imagemagick,
libdevil,
stdenv,
fetchFromGitLab,
cmake,
libarchive,
qt6Packages,
extra-cmake-modules,
exiv2,
}:
stdenv.mkDerivation rec {
pname = "previewqt";
version = "3.0";
src = fetchFromGitLab {
owner = "lspies";
repo = "previewqt";
rev = "refs/tags/v${version}";
hash = "sha256-cDtqgezKGgSdhw8x1mM4cZ0H3SfUPEyWP6rRD+kRwXc=";
};
# can't find qtquick3d
strictDeps = false;
nativeBuildInputs = [
cmake
extra-cmake-modules
qt6Packages.wrapQtAppsHook
];
buildInputs = [
exiv2
imagemagick
qt6Packages.poppler
qt6Packages.qtmultimedia
qt6Packages.qtquick3d
qt6Packages.qtsvg
qt6Packages.qttools
qt6Packages.qtwebengine
libarchive
libdevil
libraw
mpv
resvg
vips
];
meta = {
description = "Qt-based file previewer";
homepage = "https://photoqt.org/previewqt";
changelog = "https://gitlab.com/lspies/previewqt/-/blob/v${version}/CHANGELOG";
license = lib.licenses.gpl2Plus;
maintainers = with lib.maintainers; [ eclairevoyant ];
mainProgram = "previewqt";
platforms = lib.platforms.linux;
};
}
pkgs/by-name/pr/protonmail-desktop/package.nix
+51 -32
View File
@@ -10,27 +10,33 @@
let
mainProgram = "proton-mail";
srcHashes = {
# Upstream info: It's intended to stay like this in further releases
# https://github.com/NixOS/nixpkgs/pull/326152#discussion_r1679558135
universal-darwin = "sha256-JfZwHFp0aZtHcbP7tyG7uqFs2w+LWKfnfyuxxpxDJZ8=";
x86_64-linux = "sha256-En5vkTHYtwN6GMgbtyhzsPqknOPRO9KlTqZfbBFaIFQ=";
};
in
stdenv.mkDerivation rec {
pname = "protonmail-desktop";
version = "1.0.4";
# Upstream info: "v"-prefix got dropped
version = "1.0.5";
src =
{
"x86_64-linux" = fetchurl {
url = "https://github.com/ProtonMail/inbox-desktop/releases/download/v${version}/proton-mail_${version}_amd64.deb";
hash = "sha256-KY/rjiJozOQW27FYljy5N1VKuKroJz3V485DPaH01JY=";
};
"x86_64-darwin" = fetchurl {
url = "https://github.com/ProtonMail/inbox-desktop/releases/download/v${version}/Proton.Mail-darwin-x64-${version}.zip";
hash = "sha256-I5Yj1JR3DaAmC6WKI4X/d/q9rvmsck9SE3Mx3AY6yvU=";
};
"aarch64-darwin" = fetchurl {
url = "https://github.com/ProtonMail/inbox-desktop/releases/download/v${version}/Proton.Mail-darwin-arm64-${version}.zip";
hash = "sha256-j1F8hhLSq/C1WQXGrYnvFK8nNz4qwoA1ohNzPsS3tiY=";
};
}
.${stdenv.hostPlatform.system};
src = fetchurl {
url =
if stdenv.isDarwin then
"https://github.com/ProtonMail/inbox-desktop/releases/download/${version}/Proton.Mail-darwin-universal-${version}.zip"
else
"https://github.com/ProtonMail/inbox-desktop/releases/download/${version}/proton-mail_${version}_amd64.deb";
sha256 =
{
x86_64-linux = srcHashes.x86_64-linux;
x86_64-darwin = srcHashes.universal-darwin;
aarch64-darwin = srcHashes.universal-darwin;
}
.${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}");
};
sourceRoot = lib.optionalString stdenv.isDarwin ".";
@@ -42,18 +48,25 @@ stdenv.mkDerivation rec {
] ++ lib.optional stdenv.isLinux dpkg ++ lib.optional stdenv.isDarwin unzip;
installPhase =
lib.optionalString stdenv.isLinux ''
runHook preInstall
mkdir -p $out
cp -r usr/share/ $out/
cp -r usr/lib/proton-mail/resources/app.asar $out/share/
runHook postInstall
let
darwin = ''
mkdir -p $out/{Applications,bin}
cp -r "Proton Mail.app" $out/Applications/
makeWrapper $out/Applications/"Proton Mail.app"/Contents/MacOS/Proton\ Mail $out/bin/protonmail-desktop
'';
linux = ''
runHook preInstall
mkdir -p $out
cp -r usr/share/ $out/
cp -r usr/lib/proton-mail/resources/app.asar $out/share/
'';
in
''
+ lib.optionalString stdenv.isDarwin ''
runHook preInstall
mkdir -p $out/{Applications,bin}
cp -r "Proton Mail.app" $out/Applications/
makeWrapper $out/Applications/"Proton Mail.app"/Contents/MacOS/Proton\ Mail $out/bin/protonmail-desktop
${if stdenv.isDarwin then darwin else linux}
runHook postInstall
'';
@@ -66,17 +79,23 @@ stdenv.mkDerivation rec {
--inherit-argv0
'';
meta = with lib; {
passthru.updateScript = ./update.sh;
meta = {
description = "Desktop application for Mail and Calendar, made with Electron";
homepage = "https://github.com/ProtonMail/inbox-desktop";
license = licenses.gpl3Plus;
maintainers = with maintainers; [
license = lib.licenses.gpl3Plus;
maintainers = with lib.maintainers; [
rsniezek
sebtm
matteopacini
];
platforms = [ "x86_64-linux" ] ++ platforms.darwin;
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
platforms = [
"x86_64-linux"
"x86_64-darwin"
"aarch64-darwin"
];
sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
inherit mainProgram;
};
}
pkgs/by-name/pr/protonmail-desktop/update.sh
Executable
+30
View File
@@ -0,0 +1,30 @@
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p common-updater-scripts jq
# shellcheck disable=SC1008
set -eu -o pipefail
latestVersion=$(curl https://api.github.com/repos/ProtonMail/inbox-desktop/releases/latest | jq -r '.tag_name')
declare -A platforms
platforms[x86_64-linux]="amd64"
platforms[x86_64-darwin]="x64"
platforms[aarch64-darwin]="arm64"
for platform in "${!platforms[@]}"
do
arch=${platforms[$platform]}
os=$(echo "$platform" | cut -d "-" -f2)
if [[ "$os" == "linux" ]]; then
downloadUrl="https://github.com/ProtonMail/inbox-desktop/releases/download/${latestVersion}/proton-mail_${latestVersion}_${arch}.deb"
else
downloadUrl="https://github.com/ProtonMail/inbox-desktop/releases/download/${latestVersion}/Proton.Mail-${os}-${arch}-${latestVersion}.zip"
fi
echo "$downloadUrl"
latestSha=$(nix store prefetch-file "$downloadUrl" --json | jq -r '.hash')
update-source-version "protonmail-desktop" "$latestVersion" "$latestSha" --system="$platform" --ignore-same-version --file=./pkgs/by-name/pr/protonmail-desktop/package.nix
done
pkgs/by-name/re/renovate/package.nix
+3 -3
View File
@@ -21,13 +21,13 @@ let
in
stdenv'.mkDerivation (finalAttrs: {
pname = "renovate";
version = "37.431.7";
version = "37.440.7";
src = fetchFromGitHub {
owner = "renovatebot";
repo = "renovate";
rev = "refs/tags/${finalAttrs.version}";
hash = "sha256-aaqsScfi0pXfrxOJ7xjPxtV9m9EUadhivagcAddP8HY=";
hash = "sha256-VMv55BVeauRa/hmg1Y7D15ltAbccdcMd4Azk5IInuH0=";
};
postPatch = ''
@@ -44,7 +44,7 @@ stdenv'.mkDerivation (finalAttrs: {
pnpmDeps = pnpm_9.fetchDeps {
inherit (finalAttrs) pname version src;
hash = "sha256-atTs7sYxiioCXO5r6C07UULztquKgWCi+A2iqq+30VQ=";
hash = "sha256-ZYQ7G2BKkRxuyg31dysim+P1Vje0VysJm+UFyy4xuKI=";
};
env.COREPACK_ENABLE_STRICT = 0;
pkgs/data/icons/numix-icon-theme-square/default.nix
+2 -2
View File
@@ -2,13 +2,13 @@
stdenvNoCC.mkDerivation rec {
pname = "numix-icon-theme-square";
version = "24.04.22";
version = "24.07.19";
src = fetchFromGitHub {
owner = "numixproject";
repo = pname;
rev = version;
sha256 = "sha256-Co6tMvYFl0v4pZSGtamlIb6g6koAUyC0xyxcQig62J4=";
sha256 = "sha256-mHCQpFBBnJfmMA0o5BVt8IWhHIcMSaReCezVgVqVAw4=";
};
nativeBuildInputs = [ gtk3 ];
pkgs/desktops/pantheon/artwork/elementary-wallpapers/default.nix
+2 -2
View File
@@ -10,13 +10,13 @@
stdenv.mkDerivation rec {
pname = "elementary-wallpapers";
version = "7.0.0";
version = "8.0.0";
src = fetchFromGitHub {
owner = "elementary";
repo = "wallpapers";
rev = version;
sha256 = "sha256-i9tIz5UckON8uwGlE62b/y0M0Neqt86rR3VdNUWBo04=";
sha256 = "sha256-qbqYr+3Vqwi1UBD0fRW6lI2rj5Iy51taZRGxDTpKfpg=";
};
nativeBuildInputs = [
pkgs/development/compilers/gcc/common/builder.nix
+40 -6
View File
@@ -7,6 +7,14 @@
let
forceLibgccToBuildCrtStuff =
import ./libgcc-buildstuff.nix { inherit lib stdenv; };
# todo(@reckenrode) Remove in staging. This is ugly, but it avoid unwanted rebuilds on Darwin and Linux.
enableDarwinFixesForStagingNext =
version:
stdenv.buildPlatform.isDarwin
&& stdenv.buildPlatform.isx86_64
&& lib.versionAtLeast version "6"
&& lib.versionOlder version "10";
in
originalAttrs: (stdenv.mkDerivation (finalAttrs: originalAttrs // {
@@ -20,9 +28,20 @@ originalAttrs: (stdenv.mkDerivation (finalAttrs: originalAttrs // {
if test "$staticCompiler" = "1"; then
EXTRA_LDFLAGS="-static"
else
EXTRA_LDFLAGS="-Wl,-rpath,''${!outputLib}/lib"
fi
${
if enableDarwinFixesForStagingNext finalAttrs.version then
''
elif test "''${NIX_DONT_SET_RPATH-}" != "1"; then
EXTRA_LDFLAGS="-Wl,-rpath,''${!outputLib}/lib"
else
EXTRA_LDFLAGS=""
''
else
''
else
EXTRA_LDFLAGS="-Wl,-rpath,''${!outputLib}/lib"
''
}fi
# GCC interprets empty paths as ".", which we don't want.
if test -z "''${CPATH-}"; then unset CPATH; fi
@@ -56,9 +75,24 @@ originalAttrs: (stdenv.mkDerivation (finalAttrs: originalAttrs // {
extraLDFlags=("-L/usr/lib64" "-L/usr/lib")
libc_libdir="/usr/lib"
fi
extraLDFlags=("-L$libc_libdir" "-rpath" "$libc_libdir"
"''${extraLDFlags[@]}")
for i in "''${extraLDFlags[@]}"; do
${
if enableDarwinFixesForStagingNext finalAttrs.version then
''
extraLDFlags=("-L$libc_libdir")
nixDontSetRpathVar=NIX_DONT_SET_RPATH''${post}
if test "''${!nixDontSetRpathVar-}" != "1"; then
extraLDFlags+=("-rpath" "$libc_libdir")
fi
extraLDFlags+=("''${extraLDFlags[@]}")
''
else
''
extraLDFlags=("-L$libc_libdir" "-rpath" "$libc_libdir"
"''${extraLDFlags[@]}")
''
# The strange indentation with the next line is to ensure the string renders the same when the condition is false,
# which is necessary to prevent unwanted rebuilds in staging-next.
} for i in "''${extraLDFlags[@]}"; do
declare -g EXTRA_LDFLAGS''${post}+=" -Wl,$i"
done
done
pkgs/development/compilers/gcc/default.nix
+1 -1
View File
@@ -450,7 +450,7 @@ pipe ((callFile ./common/builder.nix {}) ({
badPlatforms =
# avr-gcc8 is maintained for the `qmk` package
if (is8 && targetPlatform.isAvr) then []
else if !(is48 || is49) then [ "aarch64-darwin" ]
else if !(is48 || is49 || is6) then [ "aarch64-darwin" ]
else platforms.darwin;
} // optionalAttrs is11 {
badPlatforms = if targetPlatform != hostPlatform then [ "aarch64-darwin" ] else [ ];
pkgs/development/compilers/gcc/patches/6/AvailabilityInternal.h-fixincludes.patch
+105
View File
@@ -0,0 +1,105 @@
diff --git a/fixincludes/fixincl.x b/fixincludes/fixincl.x
index 662dc97762c..5140a04f9dd 100644
--- a/fixincludes/fixincl.x
+++ b/fixincludes/fixincl.x
@@ -3053,6 +3053,43 @@ static const char* apzDarwin_Stdint_7Patch[] = {
#endif",
(char*)NULL };
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ * Description of Darwin_Nix_Sdk_Availabilityinternal fix
+ */
+tSCC zDarwin_Nix_Sdk_AvailabilityinternalName[] =
+ "darwin_nix_sdk_availabilityinternal";
+
+/*
+ * File name selection pattern
+ */
+tSCC zDarwin_Nix_Sdk_AvailabilityinternalList[] =
+ "AvailabilityInternal.h\0";
+/*
+ * Machine/OS name selection pattern
+ */
+tSCC* apzDarwin_Nix_Sdk_AvailabilityinternalMachs[] = {
+ "*-*-darwin*",
+ (const char*)NULL };
+
+/*
+ * content selection pattern - do fix if pattern found
+ */
+tSCC zDarwin_Nix_Sdk_AvailabilityinternalSelect0[] =
+ "(.*)__has_builtin\\(__is_target_os\\)(.*)";
+
+#define DARWIN_NIX_SDK_AVAILABILITYINTERNAL_TEST_CT 1
+static tTestDesc aDarwin_Nix_Sdk_AvailabilityinternalTests[] = {
+ { TT_EGREP, zDarwin_Nix_Sdk_AvailabilityinternalSelect0, (regex_t*)NULL }, };
+
+/*
+ * Fix Command Arguments for Darwin_Nix_Sdk_Availabilityinternal
+ */
+static const char* apzDarwin_Nix_Sdk_AvailabilityinternalPatch[] = {
+ "format",
+ "%10%2",
+ (char*)NULL };
+
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description of Dec_Intern_Asm fix
@@ -9855,9 +9892,9 @@ static const char* apzX11_SprintfPatch[] = {
*
* List of all fixes
*/
-#define REGEX_COUNT 277
+#define REGEX_COUNT 278
#define MACH_LIST_SIZE_LIMIT 187
-#define FIX_COUNT 241
+#define FIX_COUNT 242
/*
* Enumerate the fixes
@@ -9933,6 +9970,7 @@ typedef enum {
DARWIN_STDINT_5_FIXIDX,
DARWIN_STDINT_6_FIXIDX,
DARWIN_STDINT_7_FIXIDX,
+ DARWIN_NIX_SDK_AVAILABILITYINTERNAL_FIXIDX,
DEC_INTERN_ASM_FIXIDX,
DJGPP_WCHAR_H_FIXIDX,
ECD_CURSOR_FIXIDX,
@@ -10457,6 +10495,11 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
DARWIN_STDINT_7_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
aDarwin_Stdint_7Tests, apzDarwin_Stdint_7Patch, 0 },
+ { zDarwin_Nix_Sdk_AvailabilityinternalName, zDarwin_Nix_Sdk_AvailabilityinternalList,
+ apzDarwin_Nix_Sdk_AvailabilityinternalMachs,
+ DARWIN_NIX_SDK_AVAILABILITYINTERNAL_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+ aDarwin_Nix_Sdk_AvailabilityinternalTests, apzDarwin_Nix_Sdk_AvailabilityinternalPatch, 0 },
+
{ zDec_Intern_AsmName, zDec_Intern_AsmList,
apzDec_Intern_AsmMachs,
DEC_INTERN_ASM_TEST_CT, FD_MACH_ONLY,
diff --git a/fixincludes/inclhack.def b/fixincludes/inclhack.def
index 98fb5b61649..8aad418dff8 100644
--- a/fixincludes/inclhack.def
+++ b/fixincludes/inclhack.def
@@ -1591,6 +1591,20 @@ fix = {
"#define UINTMAX_C(v) (v ## ULL)";
};
+/*
+ * Newer versions of AvailabilityInternal.h use `__has_builtin`,
+ * which is not implemented in or compatible with GCC.
+ */
+fix = {
+ hackname = darwin_nix_sdk_availabilityinternal;
+ mach = "*-*-darwin*";
+ files = AvailabilityInternal.h;
+ c_fix = format;
+ c_fix_arg = "%10%2";
+ select = "(.*)__has_builtin\\(__is_target_os\\)(.*)";
+ test_text = "__has_builtin(__is_target_os)";
+};
+
/*
* Fix <c_asm.h> on Digital UNIX V4.0:
* It contains a prototype for a DEC C internal asm() function,
pkgs/development/compilers/gcc/patches/7/AvailabilityInternal.h-fixincludes.patch
+105
View File
@@ -0,0 +1,105 @@
diff --git a/fixincludes/fixincl.x b/fixincludes/fixincl.x
index d12ba7c3e88..9f31b29c509 100644
--- a/fixincludes/fixincl.x
+++ b/fixincludes/fixincl.x
@@ -3468,6 +3468,43 @@ static const char* apzDarwin_Ucred__AtomicPatch[] = {
#endif\n",
(char*)NULL };
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ * Description of Darwin_Nix_Sdk_Availabilityinternal fix
+ */
+tSCC zDarwin_Nix_Sdk_AvailabilityinternalName[] =
+ "darwin_nix_sdk_availabilityinternal";
+
+/*
+ * File name selection pattern
+ */
+tSCC zDarwin_Nix_Sdk_AvailabilityinternalList[] =
+ "AvailabilityInternal.h\0";
+/*
+ * Machine/OS name selection pattern
+ */
+tSCC* apzDarwin_Nix_Sdk_AvailabilityinternalMachs[] = {
+ "*-*-darwin*",
+ (const char*)NULL };
+
+/*
+ * content selection pattern - do fix if pattern found
+ */
+tSCC zDarwin_Nix_Sdk_AvailabilityinternalSelect0[] =
+ "(.*)__has_builtin\\(__is_target_os\\)(.*)";
+
+#define DARWIN_NIX_SDK_AVAILABILITYINTERNAL_TEST_CT 1
+static tTestDesc aDarwin_Nix_Sdk_AvailabilityinternalTests[] = {
+ { TT_EGREP, zDarwin_Nix_Sdk_AvailabilityinternalSelect0, (regex_t*)NULL }, };
+
+/*
+ * Fix Command Arguments for Darwin_Nix_Sdk_Availabilityinternal
+ */
+static const char* apzDarwin_Nix_Sdk_AvailabilityinternalPatch[] = {
+ "format",
+ "%10%2",
+ (char*)NULL };
+
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description of Dec_Intern_Asm fix
@@ -10347,9 +10384,9 @@ static const char* apzX11_SprintfPatch[] = {
*
* List of all fixes
*/
-#define REGEX_COUNT 291
+#define REGEX_COUNT 292
#define MACH_LIST_SIZE_LIMIT 187
-#define FIX_COUNT 253
+#define FIX_COUNT 254
/*
* Enumerate the fixes
@@ -10435,6 +10472,7 @@ typedef enum {
DARWIN_STDINT_6_FIXIDX,
DARWIN_STDINT_7_FIXIDX,
DARWIN_UCRED__ATOMIC_FIXIDX,
+ DARWIN_NIX_SDK_AVAILABILITYINTERNAL_FIXIDX,
DEC_INTERN_ASM_FIXIDX,
DJGPP_WCHAR_H_FIXIDX,
ECD_CURSOR_FIXIDX,
@@ -11011,6 +11049,11 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
DARWIN_UCRED__ATOMIC_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
aDarwin_Ucred__AtomicTests, apzDarwin_Ucred__AtomicPatch, 0 },
+ { zDarwin_Nix_Sdk_AvailabilityinternalName, zDarwin_Nix_Sdk_AvailabilityinternalList,
+ apzDarwin_Nix_Sdk_AvailabilityinternalMachs,
+ DARWIN_NIX_SDK_AVAILABILITYINTERNAL_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+ aDarwin_Nix_Sdk_AvailabilityinternalTests, apzDarwin_Nix_Sdk_AvailabilityinternalPatch, 0 },
+
{ zDec_Intern_AsmName, zDec_Intern_AsmList,
apzDec_Intern_AsmMachs,
DEC_INTERN_ASM_TEST_CT, FD_MACH_ONLY,
diff --git a/fixincludes/inclhack.def b/fixincludes/inclhack.def
index 179e2f3c98a..70b681f35c8 100644
--- a/fixincludes/inclhack.def
+++ b/fixincludes/inclhack.def
@@ -1793,6 +1793,20 @@ fix = {
test_text = ""; /* Don't provide this for wrap fixes. */
};
+/*
+ * Newer versions of AvailabilityInternal.h use `__has_builtin`,
+ * which is not implemented in or compatible with GCC.
+ */
+fix = {
+ hackname = darwin_nix_sdk_availabilityinternal;
+ mach = "*-*-darwin*";
+ files = AvailabilityInternal.h;
+ c_fix = format;
+ c_fix_arg = "%10%2";
+ select = "(.*)__has_builtin\\(__is_target_os\\)(.*)";
+ test_text = "__has_builtin(__is_target_os)";
+};
+
/*
* Fix <c_asm.h> on Digital UNIX V4.0:
* It contains a prototype for a DEC C internal asm() function,
pkgs/development/compilers/gcc/patches/8/AvailabilityInternal.h-fixincludes.patch
+105
View File
@@ -0,0 +1,105 @@
diff --git a/fixincludes/fixincl.x b/fixincludes/fixincl.x
index 9578c99ab7b..e0ae73496c6 100644
--- a/fixincludes/fixincl.x
+++ b/fixincludes/fixincl.x
@@ -3428,6 +3428,43 @@ static const char* apzDarwin_Ucred__AtomicPatch[] = {
#endif\n",
(char*)NULL };
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ * Description of Darwin_Nix_Sdk_Availabilityinternal fix
+ */
+tSCC zDarwin_Nix_Sdk_AvailabilityinternalName[] =
+ "darwin_nix_sdk_availabilityinternal";
+
+/*
+ * File name selection pattern
+ */
+tSCC zDarwin_Nix_Sdk_AvailabilityinternalList[] =
+ "AvailabilityInternal.h\0";
+/*
+ * Machine/OS name selection pattern
+ */
+tSCC* apzDarwin_Nix_Sdk_AvailabilityinternalMachs[] = {
+ "*-*-darwin*",
+ (const char*)NULL };
+
+/*
+ * content selection pattern - do fix if pattern found
+ */
+tSCC zDarwin_Nix_Sdk_AvailabilityinternalSelect0[] =
+ "(.*)__has_builtin\\(__is_target_os\\)(.*)";
+
+#define DARWIN_NIX_SDK_AVAILABILITYINTERNAL_TEST_CT 1
+static tTestDesc aDarwin_Nix_Sdk_AvailabilityinternalTests[] = {
+ { TT_EGREP, zDarwin_Nix_Sdk_AvailabilityinternalSelect0, (regex_t*)NULL }, };
+
+/*
+ * Fix Command Arguments for Darwin_Nix_Sdk_Availabilityinternal
+ */
+static const char* apzDarwin_Nix_Sdk_AvailabilityinternalPatch[] = {
+ "format",
+ "%10%2",
+ (char*)NULL };
+
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description of Dec_Intern_Asm fix
@@ -10356,9 +10393,9 @@ static const char* apzX11_SprintfPatch[] = {
*
* List of all fixes
*/
-#define REGEX_COUNT 294
+#define REGEX_COUNT 295
#define MACH_LIST_SIZE_LIMIT 187
-#define FIX_COUNT 255
+#define FIX_COUNT 256
/*
* Enumerate the fixes
@@ -10445,6 +10482,7 @@ typedef enum {
DARWIN_STDINT_6_FIXIDX,
DARWIN_STDINT_7_FIXIDX,
DARWIN_UCRED__ATOMIC_FIXIDX,
+ DARWIN_NIX_SDK_AVAILABILITYINTERNAL_FIXIDX,
DEC_INTERN_ASM_FIXIDX,
DJGPP_WCHAR_H_FIXIDX,
ECD_CURSOR_FIXIDX,
@@ -11027,6 +11065,11 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
DARWIN_UCRED__ATOMIC_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
aDarwin_Ucred__AtomicTests, apzDarwin_Ucred__AtomicPatch, 0 },
+ { zDarwin_Nix_Sdk_AvailabilityinternalName, zDarwin_Nix_Sdk_AvailabilityinternalList,
+ apzDarwin_Nix_Sdk_AvailabilityinternalMachs,
+ DARWIN_NIX_SDK_AVAILABILITYINTERNAL_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+ aDarwin_Nix_Sdk_AvailabilityinternalTests, apzDarwin_Nix_Sdk_AvailabilityinternalPatch, 0 },
+
{ zDec_Intern_AsmName, zDec_Intern_AsmList,
apzDec_Intern_AsmMachs,
DEC_INTERN_ASM_TEST_CT, FD_MACH_ONLY,
diff --git a/fixincludes/inclhack.def b/fixincludes/inclhack.def
index 948ea1d9183..5eb403ac841 100644
--- a/fixincludes/inclhack.def
+++ b/fixincludes/inclhack.def
@@ -1697,6 +1697,20 @@ fix = {
test_text = ""; /* Don't provide this for wrap fixes. */
};
+/*
+ * Newer versions of AvailabilityInternal.h use `__has_builtin`,
+ * which is not implemented in or compatible with GCC.
+ */
+fix = {
+ hackname = darwin_nix_sdk_availabilityinternal;
+ mach = "*-*-darwin*";
+ files = AvailabilityInternal.h;
+ c_fix = format;
+ c_fix_arg = "%10%2";
+ select = "(.*)__has_builtin\\(__is_target_os\\)(.*)";
+ test_text = "__has_builtin(__is_target_os)";
+};
+
/*
* Fix <c_asm.h> on Digital UNIX V4.0:
* It contains a prototype for a DEC C internal asm() function,
pkgs/development/compilers/gcc/patches/9/AvailabilityInternal.h-fixincludes.patch
+105
View File
@@ -0,0 +1,105 @@
diff --git a/fixincludes/fixincl.x b/fixincludes/fixincl.x
index 47a3578f017..6cf22d19b2a 100644
--- a/fixincludes/fixincl.x
+++ b/fixincludes/fixincl.x
@@ -3480,6 +3480,43 @@ static const char* apzDarwin_Ucred__AtomicPatch[] = {
#endif\n",
(char*)NULL };
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ * Description of Darwin_Nix_Sdk_Availabilityinternal fix
+ */
+tSCC zDarwin_Nix_Sdk_AvailabilityinternalName[] =
+ "darwin_nix_sdk_availabilityinternal";
+
+/*
+ * File name selection pattern
+ */
+tSCC zDarwin_Nix_Sdk_AvailabilityinternalList[] =
+ "AvailabilityInternal.h\0";
+/*
+ * Machine/OS name selection pattern
+ */
+tSCC* apzDarwin_Nix_Sdk_AvailabilityinternalMachs[] = {
+ "*-*-darwin*",
+ (const char*)NULL };
+
+/*
+ * content selection pattern - do fix if pattern found
+ */
+tSCC zDarwin_Nix_Sdk_AvailabilityinternalSelect0[] =
+ "(.*)__has_builtin\\(__is_target_os\\)(.*)";
+
+#define DARWIN_NIX_SDK_AVAILABILITYINTERNAL_TEST_CT 1
+static tTestDesc aDarwin_Nix_Sdk_AvailabilityinternalTests[] = {
+ { TT_EGREP, zDarwin_Nix_Sdk_AvailabilityinternalSelect0, (regex_t*)NULL }, };
+
+/*
+ * Fix Command Arguments for Darwin_Nix_Sdk_Availabilityinternal
+ */
+static const char* apzDarwin_Nix_Sdk_AvailabilityinternalPatch[] = {
+ "format",
+ "%10%2",
+ (char*)NULL };
+
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description of Dec_Intern_Asm fix
@@ -10445,9 +10482,9 @@ static const char* apzX11_SprintfPatch[] = {
*
* List of all fixes
*/
-#define REGEX_COUNT 296
+#define REGEX_COUNT 297
#define MACH_LIST_SIZE_LIMIT 187
-#define FIX_COUNT 257
+#define FIX_COUNT 258
/*
* Enumerate the fixes
@@ -10535,6 +10572,7 @@ typedef enum {
DARWIN_STDINT_6_FIXIDX,
DARWIN_STDINT_7_FIXIDX,
DARWIN_UCRED__ATOMIC_FIXIDX,
+ DARWIN_NIX_SDK_AVAILABILITYINTERNAL_FIXIDX,
DEC_INTERN_ASM_FIXIDX,
DJGPP_WCHAR_H_FIXIDX,
ECD_CURSOR_FIXIDX,
@@ -11123,6 +11161,11 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
DARWIN_UCRED__ATOMIC_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
aDarwin_Ucred__AtomicTests, apzDarwin_Ucred__AtomicPatch, 0 },
+ { zDarwin_Nix_Sdk_AvailabilityinternalName, zDarwin_Nix_Sdk_AvailabilityinternalList,
+ apzDarwin_Nix_Sdk_AvailabilityinternalMachs,
+ DARWIN_NIX_SDK_AVAILABILITYINTERNAL_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+ aDarwin_Nix_Sdk_AvailabilityinternalTests, apzDarwin_Nix_Sdk_AvailabilityinternalPatch, 0 },
+
{ zDec_Intern_AsmName, zDec_Intern_AsmList,
apzDec_Intern_AsmMachs,
DEC_INTERN_ASM_TEST_CT, FD_MACH_ONLY,
diff --git a/fixincludes/inclhack.def b/fixincludes/inclhack.def
index bf136fdaa20..89bceb46c26 100644
--- a/fixincludes/inclhack.def
+++ b/fixincludes/inclhack.def
@@ -1727,6 +1727,20 @@ fix = {
test_text = ""; /* Don't provide this for wrap fixes. */
};
+/*
+ * Newer versions of AvailabilityInternal.h use `__has_builtin`,
+ * which is not implemented in or compatible with GCC.
+ */
+fix = {
+ hackname = darwin_nix_sdk_availabilityinternal;
+ mach = "*-*-darwin*";
+ files = AvailabilityInternal.h;
+ c_fix = format;
+ c_fix_arg = "%10%2";
+ select = "(.*)__has_builtin\\(__is_target_os\\)(.*)";
+ test_text = "__has_builtin(__is_target_os)";
+};
+
/*
* Fix <c_asm.h> on Digital UNIX V4.0:
* It contains a prototype for a DEC C internal asm() function,
pkgs/development/compilers/gcc/patches/default.nix
+8
View File
@@ -167,6 +167,14 @@ in
}) ];
}.${majorVersion} or [])
# Work around newer AvailabilityInternal.h when building older versions of GCC.
++ optionals (stdenv.isDarwin) ({
"9" = [ ../patches/9/AvailabilityInternal.h-fixincludes.patch ];
"8" = [ ../patches/8/AvailabilityInternal.h-fixincludes.patch ];
"7" = [ ../patches/7/AvailabilityInternal.h-fixincludes.patch ];
"6" = [ ../patches/6/AvailabilityInternal.h-fixincludes.patch ];
}.${majorVersion} or [])
## Windows
pkgs/development/perl-modules/XML-LibXML-clang16.patch
-47
View File
@@ -1,47 +0,0 @@
From 8751785951fbde48ffa16a476da3e4adb2bbcde5 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Mon, 16 Jan 2023 18:50:10 -0800
Subject: [PATCH] libxml-mm: Fix function prototypes in function pointers
This is now detected with latest clang16+
Fixes
error: incompatible function pointer types passing 'void (void *, void *, xmlChar *)' (aka 'void (void *, void *, unsigned char *)') to parameter of type 'xmlHashScanner' (aka 'void (*)(void *, void *, const unsigned char *)') [-Wincompatible-function-pointer-types]
xmlHashScan(r, PmmRegistryDumpHashScanner, NULL);
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
perl-libxml-mm.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/perl-libxml-mm.c b/perl-libxml-mm.c
index a3e78a2..ec2b5ea 100644
--- a/perl-libxml-mm.c
+++ b/perl-libxml-mm.c
@@ -121,7 +121,7 @@ PmmFreeHashTable(xmlHashTablePtr table)
extern SV* PROXY_NODE_REGISTRY_MUTEX;
/* Utility method used by PmmDumpRegistry */
-void PmmRegistryDumpHashScanner(void * payload, void * data, xmlChar * name)
+void PmmRegistryDumpHashScanner(void * payload, void * data, const xmlChar * name)
{
LocalProxyNodePtr lp = (LocalProxyNodePtr) payload;
ProxyNodePtr node = (ProxyNodePtr) lp->proxy;
@@ -215,7 +215,7 @@ PmmRegisterProxyNode(ProxyNodePtr proxy)
/* PP: originally this was static inline void, but on AIX the compiler
did not chew it, so I'm removing the inline */
static void
-PmmRegistryHashDeallocator(void *payload, xmlChar *name)
+PmmRegistryHashDeallocator(void *payload, const xmlChar *name)
{
Safefree((LocalProxyNodePtr) payload);
}
@@ -279,7 +279,7 @@ PmmRegistryREFCNT_dec(ProxyNodePtr proxy)
* internal, used by PmmCloneProxyNodes
*/
void *
-PmmRegistryHashCopier(void *payload, xmlChar *name)
+PmmRegistryHashCopier(void *payload, const xmlChar *name)
{
ProxyNodePtr proxy = ((LocalProxyNodePtr) payload)->proxy;
LocalProxyNodePtr lp;
pkgs/development/perl-modules/XML-LibXML-fix-tests-libxml-2.13.0.patch
+145
View File
@@ -0,0 +1,145 @@
From bee8338fd1cbd7aad4bf60c2965833343b6ead6f Mon Sep 17 00:00:00 2001
From: Nick Wellnhofer <wellnhofer@aevum.de>
Date: Tue, 21 May 2024 15:17:30 +0200
Subject: [PATCH] Fix test suite with libxml2 2.13.0
---
t/02parse.t | 7 ++++++-
t/08findnodes.t | 8 +++++++-
t/19die_on_invalid_utf8_rt_58848.t | 2 +-
t/25relaxng.t | 4 ++--
t/26schema.t | 4 ++--
t/60error_prev_chain.t | 8 ++++----
6 files changed, 22 insertions(+), 11 deletions(-)
diff --git a/t/02parse.t b/t/02parse.t
index b111507b..40aa5f13 100644
--- a/t/02parse.t
+++ b/t/02parse.t
@@ -884,7 +884,12 @@ EOXML
eval {
$doc2 = $parser->parse_string( $xmldoc );
};
- isnt($@, '', "error parsing $xmldoc");
+ # https://gitlab.gnome.org/GNOME/libxml2/-/commit/b717abdd
+ if (XML::LibXML::LIBXML_RUNTIME_VERSION() < 21300) {
+ isnt($@, '', "error parsing $xmldoc");
+ } else {
+ is( $doc2->documentElement()->firstChild()->nodeName(), "foo" );
+ }
$parser->validation(1);
diff --git a/t/08findnodes.t b/t/08findnodes.t
index 016c85a1..e9417bc5 100644
--- a/t/08findnodes.t
+++ b/t/08findnodes.t
@@ -123,7 +123,13 @@ my $docstring = q{
my @ns = $root->findnodes('namespace::*');
# TEST
-is(scalar(@ns), 2, ' TODO : Add test name' );
+# https://gitlab.gnome.org/GNOME/libxml2/-/commit/aca16fb3
+# fixed xmlCopyNamespace with XML namespace.
+if (XML::LibXML::LIBXML_RUNTIME_VERSION() < 21300) {
+ is(scalar(@ns), 2, ' TODO : Add test name' );
+} else {
+ is(scalar(@ns), 3, ' TODO : Add test name' );
+}
# bad xpaths
# TEST:$badxpath=4;
diff --git a/t/19die_on_invalid_utf8_rt_58848.t b/t/19die_on_invalid_utf8_rt_58848.t
index aa8ad105..4160cb27 100644
--- a/t/19die_on_invalid_utf8_rt_58848.t
+++ b/t/19die_on_invalid_utf8_rt_58848.t
@@ -16,7 +16,7 @@ use XML::LibXML;
my $err = $@;
# TEST
- like ("$err", qr{parser error : Input is not proper UTF-8},
+ like ("$err", qr{not proper UTF-8|Invalid bytes in character encoding},
'Parser error.',
);
}
diff --git a/t/25relaxng.t b/t/25relaxng.t
index 93e61883..71383b2a 100644
--- a/t/25relaxng.t
+++ b/t/25relaxng.t
@@ -132,7 +132,7 @@ print "# 6 check that no_network => 1 works\n";
{
my $rng = eval { XML::LibXML::RelaxNG->new( location => $netfile, no_network => 1 ) };
# TEST
- like( $@, qr{I/O error : Attempt to load network entity}, 'RNG from file location with external import and no_network => 1 throws an exception.' );
+ like( $@, qr{Attempt to load network entity}, 'RNG from file location with external import and no_network => 1 throws an exception.' );
# TEST
ok( !defined $rng, 'RNG from file location with external import and no_network => 1 is not loaded.' );
}
@@ -152,7 +152,7 @@ print "# 6 check that no_network => 1 works\n";
</grammar>
EOF
# TEST
- like( $@, qr{I/O error : Attempt to load network entity}, 'RNG from buffer with external import and no_network => 1 throws an exception.' );
+ like( $@, qr{Attempt to load network entity}, 'RNG from buffer with external import and no_network => 1 throws an exception.' );
# TEST
ok( !defined $rng, 'RNG from buffer with external import and no_network => 1 is not loaded.' );
}
diff --git a/t/26schema.t b/t/26schema.t
index 17f641e4..c404cedd 100644
--- a/t/26schema.t
+++ b/t/26schema.t
@@ -117,7 +117,7 @@ EOF
{
my $schema = eval { XML::LibXML::Schema->new( location => $netfile, no_network => 1 ) };
# TEST
- like( $@, qr{I/O error : Attempt to load network entity}, 'Schema from file location with external import and no_network => 1 throws an exception.' );
+ like( $@, qr{Attempt to load network entity}, 'Schema from file location with external import and no_network => 1 throws an exception.' );
# TEST
ok( !defined $schema, 'Schema from file location with external import and no_network => 1 is not loaded.' );
}
@@ -129,7 +129,7 @@ EOF
</xsd:schema>
EOF
# TEST
- like( $@, qr{I/O error : Attempt to load network entity}, 'Schema from buffer with external import and no_network => 1 throws an exception.' );
+ like( $@, qr{Attempt to load network entity}, 'Schema from buffer with external import and no_network => 1 throws an exception.' );
# TEST
ok( !defined $schema, 'Schema from buffer with external import and no_network => 1 is not loaded.' );
}
diff --git a/t/60error_prev_chain.t b/t/60error_prev_chain.t
index e48215c4..55ac0b2e 100644
--- a/t/60error_prev_chain.t
+++ b/t/60error_prev_chain.t
@@ -16,13 +16,11 @@ use XML::LibXML;
{
my $parser = XML::LibXML->new();
- $parser->validation(0);
- $parser->load_ext_dtd(0);
eval
{
local $^W = 0;
- $parser->parse_file('example/JBR-ALLENtrees.htm');
+ $parser->parse_string('<doc>&ldquo;&nbsp;&rdquo;</doc>');
};
my $err = $@;
@@ -31,7 +29,7 @@ use XML::LibXML;
if( $err && !ref($err) ) {
plan skip_all => 'The local libxml library does not support errors as objects to $@';
}
- plan tests => 1;
+ plan tests => 2;
while (defined($err) && $count < 200)
{
@@ -44,6 +42,8 @@ use XML::LibXML;
# TEST
ok ((!$err), "Reached the end of the chain.");
+ # TEST
+ is ($count, 3, "Correct number of errors reported")
}
=head1 COPYRIGHT & LICENSE
pkgs/development/python-modules/azure-search-documents/default.nix
+46
View File
@@ -0,0 +1,46 @@
{
lib,
buildPythonPackage,
fetchFromGitHub,
setuptools,
azure-common,
azure-core,
isodate,
pytestCheckHook,
}:
buildPythonPackage rec {
pname = "azure-search-documents";
version = "11.4.0";
pyproject = true;
src = fetchFromGitHub {
owner = "Azure";
repo = "azure-sdk-for-python";
rev = "azure-search-documents_${version}";
hash = "sha256-0J9AXDH7TOkcKDwFbICiMatLAwiFq3Jtoji8fJSOg8k=";
};
sourceRoot = "${src.name}/sdk/search/azure-search-documents";
build-system = [ setuptools ];
dependencies = [
azure-common
azure-core
isodate
];
pythonImportsCheck = [ "azure.search.documents" ];
# require devtools_testutils which is a internal package for azure-sdk
doCheck = false;
meta = {
description = "Microsoft Azure Cognitive Search Client Library for Python";
homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/search/azure-search-documents";
changelog = "https://github.com/Azure/azure-sdk-for-python/blob/${src.rev}/sdk/search/azure-search-documents/CHANGELOG.md";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ natsukium ];
};
}
pkgs/development/python-modules/commoncode/default.nix
+12 -14
View File
@@ -6,9 +6,9 @@
buildPythonPackage,
click,
fetchFromGitHub,
fetchpatch2,
pytest-xdist,
pytestCheckHook,
pythonAtLeast,
pythonOlder,
requests,
saneyaml,
@@ -19,7 +19,7 @@
buildPythonPackage rec {
pname = "commoncode";
version = "31.2.1";
format = "pyproject";
pyproject = true;
disabled = pythonOlder "3.7";
@@ -30,11 +30,19 @@ buildPythonPackage rec {
hash = "sha256-4ZgyNlMj1i1fRru4wgDOyP3qzbne8D2eH/tFI60kgrE=";
};
patches = [
# https://github.com/nexB/commoncode/pull/66
(fetchpatch2 {
url = "https://github.com/nexB/commoncode/commit/4f87b3c9272dcf209b9c4b997e98b58e0edaf570.patch";
hash = "sha256-loUtAww+SK7kMt5uqZmLQ8Wg/OqB7LWVA4BiztnwHsA=";
})
];
dontConfigure = true;
nativeBuildInputs = [ setuptools-scm ];
build-system = [ setuptools-scm ];
propagatedBuildInputs = [
dependencies = [
attrs
beautifulsoup4
click
@@ -48,11 +56,6 @@ buildPythonPackage rec {
pytest-xdist
];
preCheck = ''
# prevent readout of /etc/os-release during tests
sed -i "s/is_on_ubuntu_22()/lambda _: False/" src/commoncode/system.py
'';
disabledTests =
[
# chinese character translates different into latin
@@ -69,11 +72,6 @@ buildPythonPackage rec {
"test_searchable_paths"
];
disabledTestPaths = lib.optionals (pythonAtLeast "3.10") [
# https://github.com/nexB/commoncode/issues/36
"src/commoncode/fetch.py"
];
pythonImportsCheck = [ "commoncode" ];
meta = with lib; {
pkgs/development/python-modules/craft-platforms/default.nix
+62
View File
@@ -0,0 +1,62 @@
{
lib,
buildPythonPackage,
annotated-types,
distro,
fetchFromGitHub,
nix-update-script,
pytest-check,
pytestCheckHook,
pythonOlder,
setuptools,
setuptools-scm,
}:
buildPythonPackage rec {
pname = "craft-platforms";
version = "0.1.1";
pyproject = true;
disabled = pythonOlder "3.10";
src = fetchFromGitHub {
owner = "canonical";
repo = "craft-platforms";
rev = "refs/tags/${version}";
hash = "sha256-KzskmSw7NsH1CAYjPf2281Ob71Jd6AhWxtp5tR3IqyU=";
};
postPatch = ''
substituteInPlace craft_platforms/__init__.py --replace-fail "dev" "${version}"
'';
build-system = [
setuptools
setuptools-scm
];
dependencies = [
annotated-types
distro
];
nativeCheckInputs = [
pytestCheckHook
pytest-check
];
pythonImportsCheck = [ "craft_platforms" ];
pytestFlagsArray = [ "tests/unit" ];
passthru.updateScript = nix-update-script { };
meta = {
description = "Manage platforms and architectures for charm applications";
homepage = "https://github.com/canonical/craft-platforms";
changelog = "https://github.com/canonical/craft-platforms/releases/tag/${version}";
license = lib.licenses.lgpl3Only;
maintainers = with lib.maintainers; [ jnsgruk ];
platforms = lib.platforms.linux;
};
}
pkgs/development/python-modules/datashaper/default.nix
+52
View File
@@ -0,0 +1,52 @@
{
lib,
buildPythonPackage,
fetchPypi,
pythonOlder,
pythonRelaxDepsHook,
poetry-core,
dacite,
diskcache,
jsonschema,
pandas,
pyarrow,
}:
buildPythonPackage rec {
pname = "datashaper";
version = "0.0.49";
pyproject = true;
disabled = pythonOlder "3.10";
src = fetchPypi {
inherit pname version;
hash = "sha256-Bb+6WWRHSmK91SWew/oBc9AeNlIItqSv9OoOYwlqdTM=";
};
build-system = [ poetry-core ];
nativeBuildInputs = [ pythonRelaxDepsHook ];
pythonRelaxDeps = [ "pyarrow" ];
dependencies = [
dacite
diskcache
jsonschema
pandas
pyarrow
];
pythonImportsCheck = [ "datashaper" ];
# pypi tarball has no tests
doCheck = false;
meta = {
description = "Collection of utilities for doing lightweight data wrangling";
homepage = "https://github.com/microsoft/datashaper/tree/main/python/datashaper";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ natsukium ];
};
}
pkgs/development/python-modules/debian-inspector/default.nix
+8 -6
View File
@@ -13,9 +13,9 @@
buildPythonPackage rec {
pname = "debian-inspector";
version = "31.1.0";
format = "setuptools";
pyproject = true;
disabled = pythonOlder "3.6";
disabled = pythonOlder "3.7";
src = fetchPypi {
pname = "debian_inspector";
@@ -25,15 +25,17 @@ buildPythonPackage rec {
dontConfigure = true;
nativeBuildInputs = [ setuptools-scm ];
build-system = [ setuptools-scm ];
propagatedBuildInputs = [
dependencies = [
chardet
attrs
commoncode
];
nativeCheckInputs = [ pytestCheckHook ];
nativeCheckInputs = [
commoncode
pytestCheckHook
];
pythonImportsCheck = [ "debian_inspector" ];
pkgs/development/python-modules/devito/default.nix
+2 -2
View File
@@ -25,7 +25,7 @@
buildPythonPackage rec {
pname = "devito";
version = "4.8.10";
version = "4.8.11";
format = "setuptools";
disabled = pythonOlder "3.8";
@@ -34,7 +34,7 @@ buildPythonPackage rec {
owner = "devitocodes";
repo = "devito";
rev = "refs/tags/v${version}";
hash = "sha256-n8mbhbW5zN8hQeVF6T3MbET9tJlIy99iwFiZCOh6xTg=";
hash = "sha256-c8/b2dRwfH4naSVRaRon6/mBDva7RSDmi/TJUJp26g0=";
};
pythonRemoveDeps = [
pkgs/development/python-modules/graphrag/default.nix
+122
View File
@@ -0,0 +1,122 @@
{
lib,
buildPythonPackage,
fetchFromGitHub,
poetry-core,
poetry-dynamic-versioning,
aiofiles,
aiolimiter,
azure-identity,
azure-search-documents,
azure-storage-blob,
datashaper,
devtools,
environs,
fastparquet,
graspologic,
lancedb,
networkx,
nltk,
numba,
numpy,
openai,
pyaml-env,
pydantic,
python-dotenv,
pyyaml,
rich,
scipy,
swifter,
tenacity,
textual,
tiktoken,
typing-extensions,
uvloop,
nbformat,
pytest-asyncio,
pytestCheckHook,
}:
buildPythonPackage rec {
pname = "graphrag";
version = "0.1.1";
pyproject = true;
src = fetchFromGitHub {
owner = "microsoft";
repo = "graphrag";
rev = "refs/tags/v${version}";
hash = "sha256-hIAQOIqm9S9AtssE6UxcXfaIbSt3+506ueMrlathNaQ=";
};
build-system = [
poetry-core
poetry-dynamic-versioning
];
pythonRelaxDeps = [
"aiofiles"
"azure-identity"
"scipy"
"tiktoken"
];
dependencies = [
aiofiles
aiolimiter
azure-identity
azure-search-documents
azure-storage-blob
datashaper
devtools
environs
fastparquet
graspologic
lancedb
networkx
nltk
numba
numpy
openai
pyaml-env
pydantic
python-dotenv
pyyaml
rich
scipy
swifter
tenacity
textual
tiktoken
typing-extensions
uvloop
];
env.NUMBA_CACHE_DIR = "$TMPDIR";
pythonImportsCheck = [ "graphrag" ];
nativeCheckInputs = [
nbformat
pytest-asyncio
pytestCheckHook
];
pytestFlagsArray = [ "tests/unit" ];
disabledTests = [
# touch the network
"test_child"
"test_dotprefix"
"test_find"
"test_run_extract_entities_multiple_documents"
"test_run_extract_entities_single_document"
];
meta = {
description = "Modular graph-based Retrieval-Augmented Generation (RAG) system";
homepage = "https://github.com/microsoft/graphrag";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ natsukium ];
};
}
pkgs/development/python-modules/pdfminer-six/default.nix
+10 -17
View File
@@ -2,12 +2,9 @@
lib,
buildPythonPackage,
fetchFromGitHub,
importlib-metadata,
isPy3k,
cryptography,
charset-normalizer,
pythonOlder,
typing-extensions,
pytestCheckHook,
setuptools,
substituteAll,
@@ -16,16 +13,16 @@
buildPythonPackage rec {
pname = "pdfminer-six";
version = "20231228";
version = "20240706";
pyproject = true;
disabled = !isPy3k;
disabled = pythonOlder "3.8";
src = fetchFromGitHub {
owner = "pdfminer";
repo = "pdfminer.six";
rev = version;
hash = "sha256-LXPECQQojD3IY9zRkrDBufy4A8XUuYiRpryqUx/I3qo=";
rev = "refs/tags/${version}";
hash = "sha256-aY7GQADRxeiclr6/G3RRgrPcl8rGiC85JYEIjIa+vG0=";
};
patches = [
@@ -35,17 +32,12 @@ buildPythonPackage rec {
})
];
nativeBuildInputs = [ setuptools ];
build-system = [ setuptools ];
propagatedBuildInputs =
[
charset-normalizer
cryptography
]
++ lib.optionals (pythonOlder "3.8") [
importlib-metadata
typing-extensions
];
dependencies = [
charset-normalizer
cryptography
];
postInstall = ''
for file in $out/bin/*.py; do
@@ -67,6 +59,7 @@ buildPythonPackage rec {
};
meta = with lib; {
changelog = "https://github.com/pdfminer/pdfminer.six/blob/${src.rev}/CHANGELOG.md";
description = "PDF parser and analyzer";
homepage = "https://github.com/pdfminer/pdfminer.six";
license = licenses.mit;
pkgs/development/python-modules/pdfminer-six/disable-setuptools-git-versioning.patch
+4 -2
View File
@@ -1,13 +1,15 @@
diff --git a/setup.py b/setup.py
index 42764e2..e7b93d3 100644
--- a/setup.py
+++ b/setup.py
@@ -7,10 +7,7 @@
@@ -19,10 +19,7 @@ if sys.version_info < (3, 12):
setup(
name="pdfminer.six",
- setuptools_git_versioning={
- "enabled": True,
- },
- setup_requires=["setuptools-git-versioning<2"],
- setup_requires=["setuptools-git-versioning<3"],
+ version="@version@",
packages=["pdfminer"],
package_data={"pdfminer": ["cmap/*.pickle.gz", "py.typed"]},
pkgs/development/python-modules/pyaml-env/default.nix
+37
View File
@@ -0,0 +1,37 @@
{
lib,
buildPythonPackage,
fetchFromGitHub,
setuptools,
pyyaml,
pytestCheckHook,
}:
buildPythonPackage rec {
pname = "pyaml-env";
version = "1.2.1";
pyproject = true;
src = fetchFromGitHub {
owner = "mkaranasou";
repo = "pyaml_env";
rev = "refs/tags/v${version}";
hash = "sha256-xSu+dksSVugShJwOqedXBrXIKaH0G5JAsynauOuP3OA=";
};
build-system = [ setuptools ];
dependencies = [ pyyaml ];
pythonImportsCheck = [ "pyaml_env" ];
nativeCheckInputs = [ pytestCheckHook ];
meta = {
description = "Parse YAML configuration with environment variables in Python";
homepage = "https://github.com/mkaranasou/pyaml_env";
changelog = "https://github.com/mkaranasou/pyaml_env/releases/tag/v${version}";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ natsukium ];
};
}
pkgs/development/python-modules/swifter/default.nix
+52
View File
@@ -0,0 +1,52 @@
{
lib,
buildPythonPackage,
fetchFromGitHub,
setuptools,
dask,
pandas,
psutil,
tqdm,
ipywidgets,
ray,
}:
buildPythonPackage rec {
pname = "swifter";
version = "1.4.0";
pyproject = true;
src = fetchFromGitHub {
owner = "jmcarpenter2";
repo = "swifter";
rev = "refs/tags/${version}";
hash = "sha256-lgdf8E9GGjeLY4ERzxqtjQuYVtdtIZt2HFLSiNBbtX4=";
};
build-system = [ setuptools ];
dependencies = [
pandas
psutil
dask
tqdm
] ++ dask.optional-dependencies.dataframe;
optional-dependencies = {
groupby = [ ray ];
notebook = [ ipywidgets ];
};
pythonImportsCheck = [ "swifter" ];
# tests may hang due to ignoring cpu core limit
# https://github.com/jmcarpenter2/swifter/issues/221
doCheck = false;
meta = {
description = "Package which efficiently applies any function to a pandas dataframe or series in the fastest available manner";
homepage = "https://github.com/jmcarpenter2/swifter";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ natsukium ];
};
}
pkgs/development/tools/rust/cargo-cyclonedx/default.nix
+3 -3
View File
@@ -12,16 +12,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-cyclonedx";
version = "0.5.3";
version = "0.5.4";
src = fetchFromGitHub {
owner = "CycloneDX";
repo = "cyclonedx-rust-cargo";
rev = "${pname}-${version}";
hash = "sha256-Hq5yEYikov/+/Vgf4Bn0b23+K6yqefrJOoEbC0YdnFY=";
hash = "sha256-H/CFEz1+rFHiTEP8JBFH9W9OTHjRdIBOov9c0JO69xE=";
};
cargoHash = "sha256-Q6Qanjfu5rIIZw4KeZo0kHJML5aq+12Lkn7CTscK8yE=";
cargoHash = "sha256-OhkC8R/+mdjFI6WRisFYZk5PKxje3W9X5p9tGCgKQOw=";
nativeBuildInputs = [
pkg-config
pkgs/development/tools/rust/cargo-dist/default.nix
+3 -3
View File
@@ -14,16 +14,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-dist";
version = "0.18.0";
version = "0.19.1";
src = fetchFromGitHub {
owner = "axodotdev";
repo = "cargo-dist";
rev = "v${version}";
hash = "sha256-r7f4Ev/ucOFo4cu8zy+UDb2aJh35IMjgwuQ96j0pnw8=";
hash = "sha256-7+z9TVeSwyYwdP+qlvm5CIiDcRGXsM+AyyZnugd3Xk8=";
};
cargoHash = "sha256-GvzYoCbpn/q+jXyIfNgZ7j0cyCiJk7ipICAeGgMfkyw=";
cargoHash = "sha256-BgU99C0SJuxEOmIYRX/iy4243tiMeKCvCwc0AvKMhsk=";
nativeBuildInputs = [
pkg-config
pkgs/development/tools/rust/cargo-semver-checks/default.nix
+3 -3
View File
@@ -10,16 +10,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-semver-checks";
version = "0.32.0";
version = "0.33.0";
src = fetchFromGitHub {
owner = "obi1kenobi";
repo = pname;
rev = "v${version}";
hash = "sha256-2B9i9S6OY+7DEorZoXfQQx9cEU2Y8FoyIyytJ8C7dXU=";
hash = "sha256-E9jEZXD7nY90v35y4Wv1cUp2aoKzC7dR9bFOTI+2fqo=";
};
cargoHash = "sha256-S03fgnefhU6c5e9YtFMBart+nfBQj7f4O+lSPe8fgqg=";
cargoHash = "sha256-1lHF8S0Xf5iOLQyARoYeWGGC9i68GVpk3EvSHo21Q2w=";
nativeBuildInputs = [
cmake
pkgs/os-specific/linux/sysdig/default.nix
+13 -4
View File
@@ -26,10 +26,11 @@
clang,
libbpf,
bpftools,
fetchurl,
}:
let
# Compare with https://github.com/draios/sysdig/blob/0.38.0/cmake/modules/falcosecurity-libs.cmake
# Compare with https://github.com/draios/sysdig/blob/0.38.1/cmake/modules/falcosecurity-libs.cmake
libsRev = "0.17.2";
libsHash = "sha256-BTLXtdU7GjOJReaycHvXkSd2vtybnCn0rTR7OEsvaMQ=";
@@ -41,7 +42,7 @@ let
hash = "sha256-wvFdjsDtKH7CpbEpQjzWtLC4RVOU9+D2rSK0Xo1cJqo=";
};
# https://github.com/draios/sysdig/blob/0.38.0/cmake/modules/driver.cmake
# https://github.com/draios/sysdig/blob/0.38.1/cmake/modules/driver.cmake
driver = fetchFromGitHub {
owner = "falcosecurity";
repo = "libs";
@@ -49,7 +50,14 @@ let
hash = "sha256-FIlnJsNgofGo4HETEEpW28wpC3U9z5AZprwFR5AgFfA=";
};
version = "0.38.0";
# "main.c" from master after (https://github.com/falcosecurity/libs/pull/1884)
# Remove when an upstream release includes the driver update
driverKernel610MainC = fetchurl {
url = "https://raw.githubusercontent.com/falcosecurity/libs/fa26daf65bb4117ecfe099fcad48ea75fe86d8bb/driver/main.c";
hash = "sha256-VI/tOSXs5OcEDehSqICF3apmSnwe4QCmbkHz+DGH4uM=";
};
version = "0.38.1";
in
stdenv.mkDerivation {
pname = "sysdig";
@@ -59,7 +67,7 @@ stdenv.mkDerivation {
owner = "draios";
repo = "sysdig";
rev = version;
hash = "sha256-y6WArSz57w8vb3A3nHT37G6D8++6en2jQfeIS4YCD9U=";
hash = "sha256-oufRTr5TFdpF50pmem2L3bBFIfwxCR8f1xi0A328iHo=";
};
nativeBuildInputs = [
@@ -109,6 +117,7 @@ stdenv.mkDerivation {
cp -r ${driver} driver-src
chmod -R +w driver-src
cp ${driverKernel610MainC} driver-src/driver/main.c
cmakeFlagsArray+=(
"-DFALCOSECURITY_LIBS_SOURCE_DIR=$(pwd)/libs"
pkgs/tools/X11/skippy-xd/default.nix
+18 -16
View File
@@ -1,25 +1,26 @@
{ lib
, stdenv
, fetchFromGitHub
, xorgproto
, libX11
, libXft
, libXcomposite
, libXdamage
, libXext
, libXinerama
, libjpeg
, giflib
, pkg-config
{
lib,
stdenv,
fetchFromGitHub,
xorgproto,
libX11,
libXft,
libXcomposite,
libXdamage,
libXext,
libXinerama,
libjpeg,
giflib,
pkg-config,
}:
stdenv.mkDerivation rec {
pname = "skippy-xd";
version = "0.7.2";
version = "0.8.0";
src = fetchFromGitHub {
owner = "felixfung";
repo = "skippy-xd";
rev = "e033b9ea80b5bbe922b05c64ed6ba0bf31c3acf6";
hash = "sha256-DsoRxbAF0DitgxknJVHDWH7VL5hWMhwH9I6m1SyItMM=";
rev = "30da57cb59ccf77f766718f7d533ddbe533ba241";
hash = "sha256-YBUDbI1SHsBI/fA3f3W1sPu3wXSodMbTGvAMqOz7RCM=";
};
nativeBuildInputs = [ pkg-config ];
buildInputs = [
@@ -39,6 +40,7 @@ stdenv.mkDerivation rec {
'';
meta = with lib; {
description = "Expose-style compositing-based standalone window switcher";
homepage = "https://github.com/felixfung/skippy-xd";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ raskin ];
platforms = platforms.linux;
pkgs/tools/misc/esphome/default.nix
+2 -2
View File
@@ -19,14 +19,14 @@ let
in
python.pkgs.buildPythonApplication rec {
pname = "esphome";
version = "2024.7.1";
version = "2024.7.2";
pyproject = true;
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-V44c4+bU3pUO6S8qhI7O4GvKqo3lXB8rqLrKNkuODVc=";
hash = "sha256-DnXPCcbDwWN+jve2YIeQ3dlugamAc6AR2/7c68bpct8=";
};
nativeBuildInputs = with python.pkgs; [
pkgs/tools/misc/yt-dlp/default.nix
+2 -2
View File
@@ -25,13 +25,13 @@ buildPythonPackage rec {
# The websites yt-dlp deals with are a very moving target. That means that
# downloads break constantly. Because of that, updates should always be backported
# to the latest stable release.
version = "2024.7.16";
version = "2024.7.25";
pyproject = true;
src = fetchPypi {
inherit version;
pname = "yt_dlp";
hash = "sha256-xb1RekneoZI+yOFPUYWPEP2J3+zhTLcBOStIC0Gy9RY=";
hash = "sha256-dYeqJeI2z3sUvbk3i7//9RIC2QGwQgK+DPYsu1bTtSw=";
};
build-system = [
pkgs/top-level/perl-packages.nix
+5 -8
View File
@@ -28572,21 +28572,18 @@ with self; {
XMLLibXML = buildPerlPackage {
pname = "XML-LibXML";
version = "2.0209";
version = "2.0210";
src = fetchurl {
url = "mirror://cpan/authors/id/S/SH/SHLOMIF/XML-LibXML-2.0209.tar.gz";
hash = "sha256-tKWrvNaJqi+7yLe0UznpYcSYTkgQhJTrbCgrR0giJCU=";
url = "mirror://cpan/authors/id/S/SH/SHLOMIF/XML-LibXML-2.0210.tar.gz";
hash = "sha256-opvz8Aq5ye4EIYFU4K/I95m/I2dOuZwantTeH0BZpI0=";
};
SKIP_SAX_INSTALL = 1;
buildInputs = [ AlienBuild AlienLibxml2 ]
++ lib.optionals stdenv.isDarwin (with pkgs; [ libiconv zlib ]);
patches = [
../development/perl-modules/XML-LibXML-clang16.patch
# https://github.com/shlomif/perl-XML-LibXML/pull/87
../development/perl-modules/XML-LibXML-fix-tests-libxml-2.13.0.patch
];
# Remove test that fails after LibXML 2.11 upgrade
postPatch = ''
rm t/35huge_mode.t
'';
propagatedBuildInputs = [ XMLSAX ];
meta = {
description = "Perl Binding for libxml2";
pkgs/top-level/python-packages.nix
+12
View File
@@ -1316,6 +1316,8 @@ self: super: with self; {
azure-nspkg = callPackage ../development/python-modules/azure-nspkg { };
azure-search-documents = callPackage ../development/python-modules/azure-search-documents { };
azure-servicebus = callPackage ../development/python-modules/azure-servicebus { };
azure-servicefabric = callPackage ../development/python-modules/azure-servicefabric { };
@@ -2567,6 +2569,8 @@ self: super: with self; {
craft-parts = callPackage ../development/python-modules/craft-parts { };
craft-platforms = callPackage ../development/python-modules/craft-platforms { };
craft-providers = callPackage ../development/python-modules/craft-providers { };
craft-store = callPackage ../development/python-modules/craft-store { };
@@ -2845,6 +2849,8 @@ self: super: with self; {
datashape = callPackage ../development/python-modules/datashape { };
datashaper = callPackage ../development/python-modules/datashaper { };
datatable = callPackage ../development/python-modules/datatable { };
datauri = callPackage ../development/python-modules/datauri { };
@@ -5238,6 +5244,8 @@ self: super: with self; {
graphql-subscription-manager = callPackage ../development/python-modules/graphql-subscription-manager { };
graphrag = callPackage ../development/python-modules/graphrag { };
graph-tool = callPackage ../development/python-modules/graph-tool { };
graphtage = callPackage ../development/python-modules/graphtage { };
@@ -10891,6 +10899,8 @@ self: super: with self; {
pyaml = callPackage ../development/python-modules/pyaml { };
pyaml-env = callPackage ../development/python-modules/pyaml-env { };
pyannotate = callPackage ../development/python-modules/pyannotate { };
pyannote-audio = callPackage ../development/python-modules/pyannote-audio { };
@@ -15037,6 +15047,8 @@ self: super: with self; {
swift = callPackage ../development/python-modules/swift { };
swifter = callPackage ../development/python-modules/swifter { };
swisshydrodata = callPackage ../development/python-modules/swisshydrodata { };
swspotify = callPackage ../development/python-modules/swspotify { };