Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
f20ed12f93
@ -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 ];
|
||||
|
||||
@ -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 = {
|
||||
|
||||
@ -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";
|
||||
};
|
||||
|
||||
@ -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";
|
||||
};
|
||||
|
||||
@ -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 ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -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 ];
|
||||
|
||||
|
||||
@ -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)
|
||||
|
||||
@ -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=";
|
||||
|
||||
@ -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"
|
||||
@ -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
|
||||
|
||||
@ -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";
|
||||
|
||||
37
pkgs/by-name/md/mdbook-alerts/package.nix
Normal file
37
pkgs/by-name/md/mdbook-alerts/package.nix
Normal 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
|
||||
];
|
||||
};
|
||||
}
|
||||
64
pkgs/by-name/pr/previewqt/package.nix
Normal file
64
pkgs/by-name/pr/previewqt/package.nix
Normal 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;
|
||||
};
|
||||
}
|
||||
@ -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;
|
||||
};
|
||||
}
|
||||
|
||||
30
pkgs/by-name/pr/protonmail-desktop/update.sh
Executable file
30
pkgs/by-name/pr/protonmail-desktop/update.sh
Executable 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
|
||||
@ -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;
|
||||
|
||||
@ -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 ];
|
||||
|
||||
@ -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 = [
|
||||
|
||||
@ -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 ];
|
||||
};
|
||||
}
|
||||
@ -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; {
|
||||
|
||||
62
pkgs/development/python-modules/craft-platforms/default.nix
Normal file
62
pkgs/development/python-modules/craft-platforms/default.nix
Normal 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;
|
||||
};
|
||||
}
|
||||
52
pkgs/development/python-modules/datashaper/default.nix
Normal file
52
pkgs/development/python-modules/datashaper/default.nix
Normal 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 ];
|
||||
};
|
||||
}
|
||||
@ -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" ];
|
||||
|
||||
|
||||
@ -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 = [
|
||||
|
||||
122
pkgs/development/python-modules/graphrag/default.nix
Normal file
122
pkgs/development/python-modules/graphrag/default.nix
Normal 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 ];
|
||||
};
|
||||
}
|
||||
@ -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;
|
||||
|
||||
@ -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"]},
|
||||
|
||||
37
pkgs/development/python-modules/pyaml-env/default.nix
Normal file
37
pkgs/development/python-modules/pyaml-env/default.nix
Normal 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 ];
|
||||
};
|
||||
}
|
||||
52
pkgs/development/python-modules/swifter/default.nix
Normal file
52
pkgs/development/python-modules/swifter/default.nix
Normal 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 ];
|
||||
};
|
||||
}
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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"
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -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; [
|
||||
|
||||
@ -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 = [
|
||||
|
||||
@ -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 { };
|
||||
|
||||
Loading…
Reference in New Issue
Block a user