Merge master into staging-next

This commit is contained in:
github-actions[bot] 2024-06-22 12:01:19 +00:00 committed by GitHub
commit a02890ef2c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
65 changed files with 9383 additions and 549 deletions

View File

@ -64,22 +64,21 @@ let
# linux kernel configuration
kernel = callLibs ./kernel.nix;
inherit (builtins) add addErrorContext attrNames concatLists
deepSeq elem elemAt filter genericClosure genList getAttr
hasAttr head isAttrs isBool isInt isList isPath isString length
lessThan listToAttrs pathExists readFile replaceStrings seq
stringLength sub substring tail trace;
# TODO: For consistency, all builtins should also be available from a sub-library;
# these are the only ones that are currently not
inherit (builtins) addErrorContext isPath trace;
inherit (self.trivial) id const pipe concat or and xor bitAnd bitOr bitXor
bitNot boolToString mergeAttrs flip mapNullable inNixShell isFloat min max
importJSON importTOML warn warnIf warnIfNot throwIf throwIfNot checkListOfEnum
info showWarnings nixpkgsVersion version isInOldestRelease
mod compare splitByAndCompare
mod compare splitByAndCompare seq deepSeq lessThan add sub
functionArgs setFunctionArgs isFunction toFunction mirrorFunctionArgs
toHexString toBaseDigits inPureEvalMode;
toHexString toBaseDigits inPureEvalMode isBool isInt pathExists
genericClosure readFile;
inherit (self.fixedPoints) fix fix' converge extends composeExtensions
composeManyExtensions makeExtensible makeExtensibleWithCustomName;
inherit (self.attrsets) attrByPath hasAttrByPath setAttrByPath
getAttrFromPath attrVals attrValues getAttrs catAttrs filterAttrs
getAttrFromPath attrVals attrNames attrValues getAttrs catAttrs filterAttrs
filterAttrsRecursive foldlAttrs foldAttrs collect nameValuePair mapAttrs
mapAttrs' mapAttrsToList attrsToList concatMapAttrs mapAttrsRecursive
mapAttrsRecursiveCond genAttrs isDerivation toDerivation optionalAttrs
@ -87,14 +86,16 @@ let
recursiveUpdate matchAttrs mergeAttrsList overrideExisting showAttrPath getOutput
getBin getLib getDev getMan chooseDevOutputs zipWithNames zip
recurseIntoAttrs dontRecurseIntoAttrs cartesianProduct cartesianProductOfSets
mapCartesianProduct updateManyAttrsByPath intersectAttrs removeAttrs;
mapCartesianProduct updateManyAttrsByPath listToAttrs hasAttr getAttr isAttrs intersectAttrs removeAttrs;
inherit (self.lists) singleton forEach map foldr fold foldl foldl' imap0 imap1
ifilter0 concatMap flatten remove findSingle findFirst any all count
filter ifilter0 concatMap flatten remove findSingle findFirst any all count
optional optionals toList range replicate partition zipListsWith zipLists
reverseList listDfs toposort sort sortOn naturalSort compareLists take
drop sublist last init crossLists unique allUnique intersectLists
subtractLists mutuallyExclusive groupBy groupBy';
subtractLists mutuallyExclusive groupBy groupBy' concatLists genList
length head tail elem elemAt isList;
inherit (self.strings) concatStrings concatMapStrings concatImapStrings
stringLength substring isString replaceStrings
intersperse concatStringsSep concatMapStringsSep
concatImapStringsSep concatLines makeSearchPath makeSearchPathOutput
makeLibraryPath makeIncludePath makeBinPath optionalString

View File

@ -530,6 +530,13 @@ in mkLicense lset) ({
fullName = "Unspecified free software license";
};
fsl11Mit = {
fullName = "Functional Source License, Version 1.1, MIT Future License";
url = "https://fsl.software/FSL-1.1-MIT.template.md";
free = false;
redistributable = true;
};
ftl = {
spdxId = "FTL";
fullName = "Freetype Project License";

View File

@ -1977,6 +1977,12 @@
githubId = 12958979;
name = "Mika Naylor";
};
autra = {
email = "augustin.trancart@gmail.com";
github = "autra";
githubId = 1576598;
name = "Augustin Trancart";
};
autrimpo = {
email = "michal@koutensky.net";
github = "autrimpo";

View File

@ -10,18 +10,18 @@
buildGoModule rec {
pname = "go-musicfox";
version = "4.4.1";
version = "4.5.3";
src = fetchFromGitHub {
owner = "go-musicfox";
repo = "go-musicfox";
rev = "v${version}";
hash = "sha256-pIfQ0ufn8W0opm+N6IPFBPWNxNWMOU7FudPtIFop51c=";
hash = "sha256-qf4XAAfWWlHAnNGhXaYpnjj+2z+/lWOHaTyv8R4UDgQ=";
};
deleteVendor = true;
vendorHash = "sha256-ey78zeCSEuRgteG5ZRb4uO88E6lwEgqSxKfjJg3NGT4=";
vendorHash = "sha256-oz/kVp/Jj2Lmo19UFOn2VPD/iWbSRCbmKy8fK8RdkYs=";
subPackages = [ "cmd/musicfox.go" ];

View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "dcrwallet";
version = "2.0.2";
version = "2.0.3";
src = fetchFromGitHub {
owner = "decred";
repo = "dcrwallet";
rev = "release-v${version}";
hash = "sha256-fsmil9YQNvXDyBxyt+Ei3F5U/dvbrzbZ01+v9o3+jVY=";
hash = "sha256-sRwGpOVydfZjgo7W+4RsHC4JElPyilbV5xhcHxPh2Wc=";
};
vendorHash = "sha256-ehtgsBCFzMft8285IjpsQ6y9HPb/UpZmcj9X4m8ZKXo=";
vendorHash = "sha256-lVVIS3FL8XwthCpzRKdw59NVtHVxXQ0ouD7jYQzOecM=";
subPackages = [ "." ];

View File

@ -14,14 +14,14 @@
stdenv.mkDerivation rec {
pname = "drawio";
version = "24.4.8";
version = "24.6.1";
src = fetchFromGitHub {
owner = "jgraph";
repo = "drawio-desktop";
rev = "v${version}";
fetchSubmodules = true;
hash = "sha256-dtkRi7oisdgMAbaltPcz5umxcd6/F1WOjKQpJUAFFY0=";
hash = "sha256-trBSNE5OBBNq18Dn/IwhHpD3ZQ7C5venwsBtyZxv+2k=";
};
# `@electron/fuses` tries to run `codesign` and fails. Disable and use autoSignDarwinBinariesHook instead
@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
offlineCache = fetchYarnDeps {
yarnLock = src + "/yarn.lock";
hash = "sha256-JbDIaO5jgPAoSD3hkMaKp3vLU5Avt+G5h427bvWJ08k=";
hash = "sha256-9Hq08DXEiOK0P+x89Gl3Y2+dN5r7aS7GNrCSVDGMpFs=";
};
nativeBuildInputs = [

View File

@ -29,13 +29,13 @@ let
};
in stdenv.mkDerivation rec {
pname = "organicmaps";
version = "2024.06.02-12";
version = "2024.06.19-3";
src = fetchFromGitHub {
owner = "organicmaps";
repo = "organicmaps";
rev = "${version}-android";
hash = "sha256-TOKBEnSa9kzfGsiNpMllLjcJtdhYfz9m4uAg0lUF8Z4=";
hash = "sha256-LB3yLBoO6nXRvfuWWB2JofeAgQQFtEgqNo2QFQ3k/vc=";
fetchSubmodules = true;
};

View File

@ -15,13 +15,13 @@
stdenv.mkDerivation rec {
pname = "sticky";
version = "1.20";
version = "1.21";
src = fetchFromGitHub {
owner = "linuxmint";
repo = pname;
rev = version;
hash = "sha256-HzTXaJgDu72pWM0mGNNBy2yFB0u0rqATFK9JzyOw8oE=";
hash = "sha256-EH5EyvI3iAZr+aSV3DKM9RLkPmUcwKKXlOXSU0ECsPI=";
};
postPatch = ''

View File

@ -1,89 +0,0 @@
{ lib
, callPackage
, fetchFromGitLab
, appstream
, gobject-introspection
, meson
, ninja
, pkg-config
, wrapGAppsHook3
, glib
, glib-networking
, gtk3
, libhandy
, listparser ? callPackage ./listparser.nix { }
, webkitgtk
, python3
}:
python3.pkgs.buildPythonApplication rec {
pname = "gnome-feeds";
version = "0.16.2";
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
owner = "World";
repo = "gfeeds";
rev = version;
sha256 = "sha256-66dwVR9owg050aHCHJek7jYnT+/yyCKo4AaUE0hCqBA=";
};
format = "other";
nativeBuildInputs = [
appstream
glib # for glib-compile-schemas
gobject-introspection
meson
ninja
pkg-config
wrapGAppsHook3
];
buildInputs = [
glib
glib-networking
gtk3
libhandy
webkitgtk
];
propagatedBuildInputs = with python3.pkgs; [
beautifulsoup4
python-dateutil
feedparser
html5lib
listparser
lxml
pillow
pygments
pygobject3
readability-lxml
pytz
requests
];
dontWrapGApps = true;
preFixup = ''
makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
'';
passthru = {
inherit listparser;
};
meta = with lib; {
description = "RSS/Atom feed reader for GNOME";
mainProgram = "gfeeds";
homepage = "https://gitlab.gnome.org/World/gfeeds";
license = licenses.gpl3Plus;
maintainers = [
maintainers.pbogdan
];
platforms = platforms.linux;
};
}

View File

@ -1,33 +0,0 @@
{ lib
, python3
, fetchPypi
}:
python3.pkgs.buildPythonPackage rec {
pname = "listparser";
version = "0.18";
src = fetchPypi {
inherit pname version;
sha256 = "0hdqs1mmayw1r8yla43hgb4d9y3zqs5483vgf8j9ygczkd2wrq2b";
};
propagatedBuildInputs = with python3.pkgs; [
requests
six
];
checkPhase = ''
${python3.interpreter} lptest.py
'';
meta = with lib; {
description = "Parser for subscription lists";
homepage = "https://github.com/kurtmckee/listparser";
license = licenses.lgpl3Plus;
maintainers = [
maintainers.pbogdan
];
platforms = platforms.linux;
};
}

View File

@ -4,7 +4,7 @@ let
if stdenv.isLinux then {
stable = "0.0.56";
ptb = "0.0.90";
canary = "0.0.422";
canary = "0.0.431";
development = "0.0.19";
} else {
stable = "0.0.307";
@ -25,7 +25,7 @@ let
};
canary = fetchurl {
url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz";
hash = "sha256-MTC079WTN0Vw57aLro1WkHRL09IKYjnUsfBAMiiHjI0=";
hash = "sha256-59Sv3U3osfk+QoXgorpqK7CU0nJBdpFOMkoGRgHN3v8=";
};
development = fetchurl {
url = "https://dl-development.discordapp.net/apps/linux/${version}/discord-development-${version}.tar.gz";

View File

@ -24,13 +24,13 @@
}:
let
version = "2.9.0";
version = "2.10.1";
src = fetchFromGitHub {
owner = "paperless-ngx";
repo = "paperless-ngx";
rev = "refs/tags/v${version}";
hash = "sha256-7dcZbuz3yi0sND6AEqIwIo9byeZheOpIAhmBpOW5lhU=";
hash = "sha256-M1S5ebdpw11Ot4h4xvbk/rbJxXom2dZ5Of+6eOlBIuE=";
};
# subpath installation is broken with uvicorn >= 0.26
@ -86,7 +86,7 @@ let
cd src-ui
'';
npmDepsHash = "sha256-gLEzifZK8Ok1SOo3YIIV5pTx4cbedQh025VqkodYrYQ=";
npmDepsHash = "sha256-zmlYwlH2cnGbbKf6jt5zBLh0Iv3C9/xN0iA4xVetRNE=";
nativeBuildInputs = [
pkg-config
@ -150,6 +150,7 @@ python.pkgs.buildPythonApplication rec {
django-filter
django-guardian
django-multiselectfield
django-soft-delete
djangorestframework
djangorestframework-guardian2
drf-writable-nested
@ -165,7 +166,7 @@ python.pkgs.buildPythonApplication rec {
ocrmypdf
pathvalidate
pdf2image
psycopg2
psycopg
python-dateutil
python-dotenv
python-gnupg

View File

@ -8,21 +8,23 @@
python3.pkgs.buildPythonApplication rec {
pname = "deface";
version = "1.4.0";
format = "pyproject";
version = "1.5.0";
pyproject = true;
disabled = python3.pythonOlder "3.8";
src = fetchFromGitHub {
owner = "ORB-HD";
repo = "deface";
rev = "v${version}";
hash = "sha256-tLNTgdnKKmyYHVajz0dHIb7cvC1by5LQ5CFIbMvPEYk=";
rev = "refs/tags/v${version}";
hash = "sha256-/mXWeL6OSgW4BMXtAZD/3UxQUGt7UE5ZvH8CXNCueJo=";
};
nativeBuildInputs = with python3.pkgs; [
build-system = with python3.pkgs; [
setuptools-scm
];
propagatedBuildInputs = with python3.pkgs; [
dependencies = with python3.pkgs; [
imageio
imageio-ffmpeg
numpy
@ -38,17 +40,21 @@ python3.pkgs.buildPythonApplication rec {
''--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ pkgs.onnxruntime ]}"''
];
patchPhase = ''
substituteInPlace pyproject.toml requirements.txt --replace "opencv-python" "opencv"
postPatch = ''
substituteInPlace pyproject.toml \
--replace-fail "opencv-python" "opencv"
'';
pythonImportsCheck = [ "deface" "onnx" "onnxruntime" ];
meta = with lib; {
meta = {
description = "Video anonymization by face detection";
homepage = "https://github.com/ORB-HD/deface";
license = licenses.mit;
maintainers = with maintainers; [ lurkki ];
changelog = "https://github.com/ORB-HD/deface/releases/tag/v${version}";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ lurkki ];
mainProgram = "deface";
# terminate called after throwing an instance of 'onnxruntime::OnnxRuntimeException'
broken = stdenv.hostPlatform.system == "aarch64-linux";
};
}

View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "freetube";
version = "0.20.0";
version = "0.21.0";
src = fetchurl {
url = "https://github.com/FreeTubeApp/FreeTube/releases/download/v${version}-beta/freetube_${version}_amd64.AppImage";
sha256 = "sha256-7k5hyiK3m+117AxmsoecGsgXSxs8xhyTf8+rl4oBbB8=";
sha256 = "sha256-jTDJ0oyDrgOM6T+nwiOakm3QUqKfK2UNY6AfpoaJzd0=";
};
passthru.tests = nixosTests.freetube;

View File

@ -4,7 +4,7 @@
, installShellFiles
, rustPlatform
, libiconv
, protobuf
, buildPackages
, darwin
, nixosTests
}:
@ -35,9 +35,7 @@ rustPlatform.buildRustPackage rec {
nativeBuildInputs = [ installShellFiles ];
buildInputs = [
protobuf
] ++ lib.optionals stdenv.isDarwin [
buildInputs = lib.optionals stdenv.isDarwin [
libiconv
darwin.apple_sdk_11_0.frameworks.AppKit
darwin.apple_sdk_11_0.frameworks.Security
@ -45,8 +43,8 @@ rustPlatform.buildRustPackage rec {
];
preBuild = ''
export PROTOC=${protobuf}/bin/protoc
export PROTOC_INCLUDE="${protobuf}/include";
export PROTOC=${buildPackages.protobuf}/bin/protoc
export PROTOC_INCLUDE="${buildPackages.protobuf}/include";
'';
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''

View File

@ -13,7 +13,7 @@
rustPlatform.buildRustPackage rec {
pname = "cosmic-files";
version = "unstable-2024-02-28";
version = "0-unstable-2024-06-10";
src = fetchFromGitHub {
owner = "pop-os";
@ -40,7 +40,7 @@ rustPlatform.buildRustPackage rec {
# COSMIC applications now uses vergen for the About page
# Update the COMMIT_DATE to match when the commit was made
env.VERGEN_GIT_COMMIT_DATE = "2024-02-28";
env.VERGEN_GIT_COMMIT_DATE = "2024-06-10";
env.VERGEN_GIT_SHA = src.rev;
postPatch = ''

View File

@ -7,21 +7,21 @@
}:
let
pname = "dbgate";
version = "5.3.0";
version = "5.3.1";
src =
fetchurl
{
aarch64-linux = {
url = "https://github.com/dbgate/dbgate/releases/download/v${version}/dbgate-${version}-linux_arm64.AppImage";
hash = "sha256-FoNph6phZEMjndX6KNtSH8TpOpI0x4rmpTBh11bYV3c=";
hash = "sha256-Qz0VA2pHT8muw9RdLg7Y3w3mJ3ubFnqf4dmfdZdnJHI=";
};
x86_64-linux = {
url = "https://github.com/dbgate/dbgate/releases/download/v${version}/dbgate-${version}-linux_x86_64.AppImage";
hash = "sha256-HsWT099apLtL5KAy3Shw0uEoXzpWGAyD63L3NhT/JlU=";
hash = "sha256-H/2Tb6ZnO6LJx+rv/ADdItaRMP95x4G3lPNK0sbZn9I=";
};
x86_64-darwin = {
url = "https://github.com/dbgate/dbgate/releases/download/v${version}/dbgate-${version}-mac_x64.dmg";
hash = "sha256-bdCwvfmfOCpVW1yTFxsLxveg9uQW1O8ODkCGpiujRCE=";
hash = "sha256-gZrfv9qe2arytVgiYtX9uwfwC4Z30SHEDiBUXcpF968=";
};
}
.${stdenv.system} or (throw "dbgate: ${stdenv.system} is unsupported.");

8094
pkgs/by-name/gi/gitbutler/Cargo.lock generated Normal file

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,177 @@
{
lib,
rustPlatform,
buildGoModule,
stdenv,
fetchFromGitHub,
pnpm_9,
wrapGAppsHook3,
cargo-tauri,
darwin,
desktop-file-utils,
esbuild,
git,
glib-networking,
jq,
nodejs,
pkg-config,
libsoup,
moreutils,
openssl,
webkitgtk,
nix-update-script,
}:
rustPlatform.buildRustPackage rec {
pname = "gitbutler";
version = "0.12.2";
src = fetchFromGitHub {
owner = "gitbutlerapp";
repo = "gitbutler";
rev = "release/${version}";
hash = "sha256-m2hvcnY2h4DYtM4ME+dxmwnmUh768CHSoAq5VsKl6Sk=";
};
# deactivate the upstream updater in tauri configuration
# TODO: use `tauri build`'s `--config` flag with the release configuration instead of manually merging
# them. it doesn't seem to like using paths currently, even though it should.
postPatch = ''
jq --slurp ".[0] * .[1] | .tauri.updater.active = false" crates/gitbutler-tauri/tauri.conf{,.release}.json | sponge crates/gitbutler-tauri/tauri.conf.json
'';
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"tauri-plugin-context-menu-0.7.1" = "sha256-vKfq20hrFLmfoXO94D8HwAE3UdGcuqVZf3+tOBhLqj0=";
"tauri-plugin-log-0.0.0" = "sha256-Mf2/cnKotd751ZcSHfiSLNe2nxBfo4dMBdoCwQhe7yI=";
};
};
pnpmDeps = pnpm_9.fetchDeps {
inherit pname version src;
hash = "sha256-+4SPDvhpvR1bjwTcyLO3HeBuZGL3P03OaEnOvcX9t9c=";
};
nativeBuildInputs = [
cargo-tauri
desktop-file-utils
jq
moreutils
nodejs
pkg-config
pnpm_9.configHook
wrapGAppsHook3
];
buildInputs =
[ openssl ]
++ lib.optionals stdenv.isLinux [
glib-networking
libsoup
webkitgtk
]
++ lib.optionals stdenv.isDarwin (
with darwin.apple_sdk.frameworks;
[
AppKit
CoreServices
Security
WebKit
]
);
env = {
# `pnpm`'s `fetchDeps` and `configHook` uses a specific version of pnpm, not upstream's
COREPACK_ENABLE_STRICT = 0;
# we depend on nightly features
RUSTC_BOOTSTRAP = 1;
# we also need to have `tracing` support in `tokio` for `console-subscriber`
RUSTFLAGS = "--cfg tokio_unstable";
tauriBundle =
{
Linux = "deb";
Darwin = "app";
}
.${stdenv.hostPlatform.uname.system}
or (throw "No tauri bundle available for ${stdenv.hostPlatform.uname.system}");
ESBUILD_BINARY_PATH = lib.getExe (
esbuild.override {
buildGoModule =
args:
buildGoModule (
args
// rec {
version = "0.18.20";
src = fetchFromGitHub {
owner = "evanw";
repo = "esbuild";
rev = "v${version}";
hash = "sha256-mED3h+mY+4H465m02ewFK/BgA1i/PQ+ksUNxBlgpUoI=";
};
vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ=";
}
);
}
);
};
buildPhase = ''
runHook preBuild
cargo tauri build --bundles "$tauriBundle"
runHook postBuild
'';
installPhase =
''
runHook preInstall
''
+ lib.optionalString stdenv.isDarwin ''
mkdir -p $out/bin
cp -r target/release/bundle/macos $out/Applications
mv $out/Applications/GitButler.app/Contents/MacOS/GitButler $out/bin/git-butler
ln -s $out/bin/git-butler $out/Applications/GitButler.app/Contents/MacOS/GitButler
''
+ lib.optionalString stdenv.isLinux ''
cp -r target/release/bundle/"$tauriBundle"/*/data/usr $out
desktop-file-edit \
--set-comment "A Git client for simultaneous branches on top of your existing workflow." \
--set-key="Keywords" --set-value="git;" \
--set-key="StartupWMClass" --set-value="GitButler" \
$out/share/applications/git-butler.desktop
''
+ ''
runHook postInstall
'';
# the `gitbutler-git` crate's checks do not support release mode
checkType = "debug";
nativeCheckInputs = [ git ];
passthru = {
updateScript = nix-update-script {
extraArgs = [
"--version-regex"
"release/(.*)"
];
};
};
meta = {
description = "Git client for simultaneous branches on top of your existing workflow";
homepage = "https://gitbutler.com";
changelog = "https://github.com/gitbutlerapp/gitbutler/releases/tag/release/${version}";
mainProgram = "git-butler";
license = lib.licenses.fsl11Mit;
maintainers = with lib.maintainers; [ getchoo ];
platforms = lib.platforms.linux ++ lib.platforms.darwin;
};
}

View File

@ -0,0 +1,95 @@
{
lib,
python3,
fetchFromGitLab,
fetchpatch,
appstream,
gobject-introspection,
meson,
ninja,
pkg-config,
blueprint-compiler,
wrapGAppsHook4,
glib-networking,
libadwaita,
webkitgtk_6_0,
}:
python3.pkgs.buildPythonApplication rec {
pname = "gnome-feeds";
version = "2.2.0";
pyproject = false;
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
owner = "World";
repo = "gfeeds";
rev = version;
hash = "sha256-XKwRFjz4ocH01mj8KshLGmGxbm/uvDiyYRf65KL0UFw=";
};
patches = [
# both patches needed to built with newer blueprint-compiler
(fetchpatch {
name = "fix-for-blueprint-0.8.patch";
url = "https://gitlab.gnome.org/World/gfeeds/-/commit/cfe860f44f685be302e2ad9f30b55bab08e078ce.patch";
hash = "sha256-exkq9KykB60/X8u3+T1/sShrhGP8BvNkaBWPzm2mchc=";
})
(fetchpatch {
name = "upgrade-blueprint-0.8-syntax.patch";
url = "https://gitlab.gnome.org/World/gfeeds/-/commit/d099fda0c62e338080061683a154f711cc487b30.patch";
hash = "sha256-M6QLRTj+CItk3XPDeexf3/+B1YHJoHsTjwdE6iw1xjM=";
})
];
nativeBuildInputs = [
appstream
gobject-introspection
meson
ninja
pkg-config
blueprint-compiler
wrapGAppsHook4
];
buildInputs = [
glib-networking
libadwaita
webkitgtk_6_0
];
dependencies = with python3.pkgs; [
beautifulsoup4
humanize
python-dateutil
syndication-domination
python-magic
pillow
pygments
pygobject3
readability-lxml
pytz
requests
];
dontWrapGApps = true;
preFixup = ''
makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
'';
meta = {
description = "RSS/Atom feed reader for GNOME";
mainProgram = "gfeeds";
homepage = "https://gitlab.gnome.org/World/gfeeds";
license = lib.licenses.gpl3Plus;
maintainers = with lib.maintainers; [
pbogdan
aleksana
];
platforms = lib.platforms.linux;
};
}

View File

@ -16,14 +16,14 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "home-manager";
version = "0-unstable-2024-06-13";
version = "0-unstable-2024-06-22";
src = fetchFromGitHub {
name = "home-manager-source";
owner = "nix-community";
repo = "home-manager";
rev = "8d5e27b4807d25308dfe369d5a923d87e7dbfda3";
hash = "sha256-abBpj2VU8p6qlRzTU8o22q68MmOaZ4v8zZ4UlYl5YRU=";
rev = "cd886711998fe5d9ff7979fdd4b4cbd17b1f1511";
hash = "sha256-aOKd8+mhBsLQChCu1mn/W5ww79ta5cXVE59aJFrifM8=";
};
nativeBuildInputs = [

View File

@ -23,13 +23,13 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "melonDS";
version = "0.9.5-unstable-2024-06-08";
version = "0.9.5-unstable-2024-06-18";
src = fetchFromGitHub {
owner = "melonDS-emu";
repo = "melonDS";
rev = "8e9b88d01da0d21c3c35db051d7e44d8ee0c7715";
hash = "sha256-zlOK5yhg9rmLMDnCxQ9CDAy+qWZdvKwTaKxzna1zxxk=";
rev = "cbb0f4b872ea8a5e2348c7f1a22695056968192f";
hash = "sha256-J1i7+VrOVQruHFhzjBnSf+DbmIa3o+rWISsdm8kMRC8=";
};
nativeBuildInputs = [

View File

@ -11,15 +11,15 @@
}:
python3Packages.buildPythonApplication rec {
pname = "monophony";
version = "2.9.0";
format = "other";
version = "2.11.0";
pyproject = false;
sourceRoot = "${src.name}/source";
src = fetchFromGitLab {
owner = "zehkira";
repo = "monophony";
rev = "v${version}";
hash = "sha256-fZ+EQqcHJGOLBwyHZJvML6+SkfFpnt6hb8xHedJ7VSU=";
hash = "sha256-OGUj1NNJNerYx/nBtg4g9xMbz6u4YSqKO6HeMNeYpE8=";
};
pythonPath = with python3Packages; [
@ -28,8 +28,13 @@ python3Packages.buildPythonApplication rec {
ytmusicapi
];
build-system = with python3Packages; [
pip
setuptools
wheel
];
nativeBuildInputs = [
python3Packages.nuitka
gobject-introspection
wrapGAppsHook4
];
@ -44,13 +49,17 @@ python3Packages.buildPythonApplication rec {
gstreamer
]);
# Makefile only contains `install`
dontBuild = true;
installFlags = [ "prefix=$(out)" ];
dontWrapGApps = true;
preFixup = ''
buildPythonPath "$pythonPath"
gappsWrapperArgs+=(
--prefix PYTHONPATH : "$program_PYTHONPATH"
makeWrapperArgs+=(
--prefix PATH : "${lib.makeBinPath [yt-dlp]}"
"''${gappsWrapperArgs[@]}"
)
'';

View File

@ -15,27 +15,20 @@ let
in
rustPlatform.buildRustPackage rec {
pname = "nix-web";
version = "0.3.0";
version = "0.4.2";
src = fetchFromGitea {
domain = "codeberg.org";
owner = "gorgon";
repo = "gorgon";
rev = "nix-web-v${version}";
hash = "sha256-/tjcin3p+nE9Y7bhTCj7D4lpjKEFGM1bRqKE8T6igJE=";
# Various unit tests contain /nix/store/* paths. This breaks the fetcher in a very funny way:
# error: illegal path references in fixed-output derivation '/nix/store/52nmkc6v9qhdyzszlvbncndxyrcdfjn3-source.drv'
nativeBuildInputs = [ nukeReferences ];
postFetch = ''
find $out -name "*.rs" -print0 | xargs -0 nuke-refs
'';
hash = "sha256-lAk2VfhclHswsctA0RQgEj5oEX1fowh8TCaKykGEioY=";
};
cargoHash = "sha256-5pPn6APz0kdxuBdz9pgqvECTk6KhXnW/YTjxKgiuD9Q=";
cargoHash = "sha256-romL/RALr/pmwUA8/SN4AOwc+Vndspd1Yrqs0AHPYRY=";
nativeBuildInputs = [ pkg-config ];
buildInputs = lib.optional (!stdenv.isDarwin) openssl
++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security;
++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Security SystemConfiguration ]);
postPatch = ''
substituteInPlace nix-web/nix-web.service \
@ -47,11 +40,6 @@ rustPlatform.buildRustPackage rec {
cargoBuildFlags = cargoFlags;
cargoTestFlags = cargoFlags;
checkFlags = [
# Skip tests that rely on store paths nuked by `nuke-refs`.
"--skip=test_env_value_to_html_store_path_subpath"
"--skip=test_env_value_to_html_store_path"
];
NIX_WEB_BUILD_NIX_CLI_PATH = "${nixPackage}/bin/nix";

File diff suppressed because it is too large Load Diff

View File

@ -13,21 +13,21 @@
rustPlatform.buildRustPackage rec {
pname = "pixi";
version = "0.23.0";
version = "0.24.2";
src = fetchFromGitHub {
owner = "prefix-dev";
repo = "pixi";
rev = "v${version}";
hash = "sha256-uLlScqcTU9nnBQiufRo+eee1TNyP5R52oI1jUaH6L1M=";
hash = "sha256-Qlr4CcrCq29ig3FPFWCR5oOtFrbREm/7zyGXUB3XL98=";
};
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"async_zip-0.0.17" = "sha256-Q5fMDJrQtob54CTII3+SXHeozy5S5s3iLOzntevdGOs=";
"cache-key-0.0.1" = "sha256-fbaIeM4wgwi/3S8s9KRux8wKe6FbCBNPZFPekmrq2jA=";
"pubgrub-0.2.1" = "sha256-sqC7R2mtqymYFULDW0wSbM/MKCZc8rP7Yy/gaQpjYEI=";
"cache-key-0.0.1" = "sha256-lJJqjxyAzGQKZi6RtzZ7A9pCAOyIJnstHoS8jlUWeGA=";
"pubgrub-0.2.1" = "sha256-mAPyo2R996ymzCt6TAX2G7xU1C3vDGjYF0z7R8lI1yg=";
};
};
@ -71,8 +71,12 @@ rustPlatform.buildRustPackage rec {
"--skip=test_incremental_lock_file"
"--skip=test_purl_are_added_for_pypi"
# `/usr/bin/env` required
# `/usr/bin/env` is not available during build.
# Error: /usr/bin/env: No such file or directory
"--skip=test_clean_env"
"--skip=test_full_env_activation"
"--skip=test_task_with_env"
"--skip=test_pixi_only_env_activation"
"--skip=cli::shell_hook::tests::test_environment_json"
];

View File

@ -0,0 +1,26 @@
{ lib, stdenv, fetchFromGitHub, cmake, alsa-lib }:
stdenv.mkDerivation rec {
pname = "sof-tools";
version = "2.9";
src = fetchFromGitHub {
owner = "thesofproject";
repo = "sof";
rev = "v${version}";
hash = "sha256-AOBJtC40Lu1gWM8w/Vs/nc540bisg58m+qH16F1e6jY=";
};
nativeBuildInputs = [ cmake ];
buildInputs = [ alsa-lib ];
sourceRoot = "${src.name}/tools";
meta = with lib; {
description = "Tools to develop, test and debug SoF (Sund Open Firmware)";
homepage = "https://thesofproject.github.io";
license = licenses.bsd3;
platforms = platforms.unix;
maintainers = [ maintainers.johnazoidberg ];
mainProgram = "sof-ctl";
};
}

View File

@ -0,0 +1,55 @@
{
lib,
stdenv,
fetchFromGitLab,
meson,
ninja,
pkg-config,
pugixml,
fmt,
html-tidy,
enablePython? false,
python3Packages,
}:
stdenv.mkDerivation {
pname = "syndication-domination";
# author extraction feature needed by gnome-feeds
version = "1.0-unstable-2023-03-25";
src = fetchFromGitLab {
owner = "gabmus";
repo = "syndication-domination";
rev = "75920321062d682437f3fb0319dad227d8b18f6c";
hash = "sha256-fOlE9CsNcmGkVBXaqYHxLDWB8voeRp46+dZYIJIwg7o=";
};
nativeBuildInputs = [
meson
ninja
pkg-config
];
buildInputs = [
pugixml
fmt
html-tidy
] ++ lib.optionals enablePython [
python3Packages.python
python3Packages.pybind11
];
mesonFlags = [
(lib.mesonBool "TO_JSON_BINARY" true)
(lib.mesonBool "PYTHON_BINDINGS" enablePython)
];
meta = {
description = "RSS/Atom parser written in C++ with Python binding";
homepage = "https://gitlab.com/gabmus/syndication-domination";
license = lib.licenses.agpl3Only;
mainProgram = "SyndicationDomination";
maintainers = with lib.maintainers; [ aleksana ];
platforms = lib.platforms.all;
};
}

View File

@ -0,0 +1,39 @@
{
lib,
python3Packages,
fetchFromGitHub,
}:
let
version = "0.23.1";
in
python3Packages.buildPythonApplication {
pname = "toml-sort";
inherit version;
pyproject = true;
src = fetchFromGitHub {
owner = "pappasam";
repo = "toml-sort";
rev = "refs/tags/v${version}";
hash = "sha256-7V2WBZYAdsA4Tiy9/2UPOcThSNE3ZXM713j57KDCegk=";
};
build-system = [ python3Packages.poetry-core ];
dependencies = [ python3Packages.tomlkit ];
nativeCheckInputs = [ python3Packages.pytestCheckHook ];
postPatch = ''
substituteInPlace "tests/test_cli.py" \
--replace-fail "toml-sort" "$out/bin/toml-sort"
'';
meta = {
mainProgram = "toml-sort";
homepage = "https://github.com/pappasam/toml-sort";
description = "Command line utility to sort and format your toml files";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ isabelroses ];
};
}

View File

@ -1,10 +1,10 @@
{
"darwin": {
"hash": "sha256-ZfW4pTFmEEA/IRBfEMfnVDOxWm3SxGqUCec2nC6MADA=",
"version": "0.2024.06.11.08.02.stable_03"
"hash": "sha256-qlABqTy4tQp++k7MFXOjZV562m4rnlDqYLDL2sd0/QE=",
"version": "0.2024.06.18.08.02.stable_03"
},
"linux": {
"hash": "sha256-xyE/Rc23+ael2oy0Hdq+kGzPYuq5+V8G3jAu3waA1Tk=",
"version": "0.2024.06.11.08.02.stable_03"
"hash": "sha256-8/9VgkKU7VO7m0Mgx24vM2Bv6+yqcSlhPLZ1slCTCEc=",
"version": "0.2024.06.18.08.02.stable_04"
}
}

View File

@ -36,13 +36,13 @@ let
in
stdenv.mkDerivation rec {
pname = "warpinator";
version = "1.8.4";
version = "1.8.5";
src = fetchFromGitHub {
owner = "linuxmint";
repo = pname;
rev = version;
hash = "sha256-T1boMqzAGMjUD62ZAlWNOe3xUx5H5ZwpR7MNipy/LKA=";
hash = "sha256-PODQvdi4CARHOyDG0dal6ge8icyFnvJXOdhqEcbcrAk=";
};
nativeBuildInputs = [

View File

@ -165,7 +165,9 @@ stdenv.mkDerivation (finalAttrs: {
"--with-system-bubblewrap=${bubblewrap}/bin/bwrap"
"--with-system-dbus-proxy=${xdg-dbus-proxy}/bin/xdg-dbus-proxy"
"--with-dbus-config-dir=${placeholder "out"}/share/dbus-1/system.d"
"--with-profile-dir=${placeholder "out"}/etc/profile.d"
"--localstatedir=/var"
"--sysconfdir=/etc"
"--enable-gtk-doc"
"--enable-installed-tests"
];

View File

@ -1,7 +1,7 @@
{ lib, stdenv, fetchFromGitHub, fetchpatch, pkg-config, glib, zlib, libpng, cmake, libxml2, python3 }:
{ lib, stdenv, fetchFromGitHub, pkg-config, glib, zlib, libpng, cmake, libxml2, python3 }:
let
version = "0.3.3";
version = "0.3.4";
pname = "lensfun";
# Fetch a more recent version of the repo containing a more recent lens
@ -9,8 +9,8 @@ let
lensfunDatabase = fetchFromGitHub {
owner = "lensfun";
repo = "lensfun";
rev = "ec9412d27d5fa8f377848a59c768b12c243cb80d";
sha256 = "sha256-/u/3oQzac/dQrgFaiYvzT5uQ108XarkXnA2DByA5sic=";
rev = "a1510e6f33ce9bc8b5056a823c6d5bc6b8cba033";
sha256 = "sha256-qdONyKk873Tq11M33JmznhJMAGd4dqp5KdXdVhfy/Ak=";
};
in
@ -21,19 +21,11 @@ stdenv.mkDerivation {
owner = "lensfun";
repo = "lensfun";
rev = "v${version}";
sha256 = "0ixf0f7qv0mc7zrw9w1sb60w833g4rqrfj8cjxwzv2vimqcksccz";
sha256 = "sha256-FyYilIz9ssSHG6S02Z2bXy7fjSY51+SWW3v8bm7sLvY=";
};
patches = [
(fetchpatch {
name = "fix-compilation-with-clang.patch";
url = "https://github.com/lensfun/lensfun/commit/5c2065685a22f19f8138365c0e5acf0be8329c02.patch";
sha256 = "sha256-tAOCNL37pKE7hfQCu+hUTKLFnRHWF5Dplqf+GaucG+4=";
})
];
# replace database with a more recent snapshot
# the mastr branch uses version 2 profiles, while 0.3.3 requires version 1 profiles,
# the master branch uses version 2 profiles, while 0.3.3 requires version 1 profiles,
# so we run the conversion tool the project provides,
# then untar the verson 1 profiles into the source dir before we build
prePatch = ''
@ -45,17 +37,20 @@ stdenv.mkDerivation {
'';
nativeBuildInputs = [
cmake pkg-config
python3 python3.pkgs.lxml # For the db converison
cmake
pkg-config
python3
python3.pkgs.setuptools
python3.pkgs.lxml # For the db converison
];
buildInputs = [ glib zlib libpng ];
cmakeFlags = [ "-DINSTALL_HELPER_SCRIPTS=OFF" ];
cmakeFlags = [ "-DINSTALL_HELPER_SCRIPTS=OFF" "-DCMAKE_BUILD_TYPE=RELEASE" ];
meta = with lib; {
platforms = platforms.linux ++ platforms.darwin;
maintainers = with maintainers; [ flokli ];
maintainers = with maintainers; [ flokli paperdigits ];
license = lib.licenses.lgpl3;
description = "Opensource database of photographic lenses and their characteristics";
homepage = "https://lensfun.github.io";

View File

@ -269,6 +269,9 @@ let
capstone = super.capstone.overrideLispAttrs (o: {
nativeLibs = [ pkgs.capstone ];
});
vk = super.vk.overrideLispAttrs (o: {
nativeLibs = [ pkgs.vulkan-loader ];
});
});
qlpkgs =

View File

@ -6,16 +6,16 @@
php.buildComposerProject (finalAttrs: {
pname = "phpstan";
version = "1.11.4";
version = "1.11.5";
src = fetchFromGitHub {
owner = "phpstan";
repo = "phpstan-src";
rev = finalAttrs.version;
hash = "sha256-9scH169cOc4rFUqqs6gqySI9aGEU5Exi8v4VtG9ujY8=";
hash = "sha256-J1y8+sY/amAhWQTL4odL+fe3t10KDNBIMV9Q92VzQcE=";
};
vendorHash = "sha256-u1GS1gyuU6T1ZJ1BLZZ/KbMoPemoN8VSFeR63/KgIAA=";
vendorHash = "sha256-BRm1ih+NHQIet7OuuSqXheVV/ZMS2h2wkRjdJ+nam48=";
composerStrictValidation = false;
meta = {

View File

@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "aioopenexchangerates";
version = "0.4.12";
version = "0.4.13";
pyproject = true;
disabled = pythonOlder "3.9";
@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "MartinHjelmare";
repo = "aioopenexchangerates";
rev = "refs/tags/v${version}";
hash = "sha256-A9d7nAqVwiIsS6f+A4PCGbONdhZb55JSmNuAFG990Ek=";
hash = "sha256-xVEyBE33gncw1h0/T7UJap8jd2KELBHSIlNE13YfIZA=";
};
postPatch = ''

View File

@ -8,14 +8,14 @@
buildPythonPackage rec {
pname = "aliyun-python-sdk-config";
version = "2.2.12";
version = "2.2.13";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-blrT/yCQ2vxaociSqKvRX3fUyKLsAFT3UyFGB/AzZHI=";
hash = "sha256-w4YJe3Bngg4A2KVlpIqf80FHhscLMMMk0AVkr/NfbPM=";
};
propagatedBuildInputs = [ aliyun-python-sdk-core ];

View File

@ -0,0 +1,70 @@
{
lib,
asdf-coordinates-schemas,
asdf-standard,
asdf-transform-schemas,
asdf,
astropy,
buildPythonPackage,
fetchFromGitHub,
numpy,
packaging,
pytest-astropy,
pytestCheckHook,
pythonOlder,
scipy,
setuptools-scm,
setuptools,
tomli,
wheel,
}:
buildPythonPackage rec {
pname = "asdf-astropy";
version = "0.6.1";
pyproject = true;
disabled = pythonOlder "3.10";
src = fetchFromGitHub {
owner = "astropy";
repo = "asdf-astropy";
rev = "refs/tags/${version}";
hash = "sha256-dOd9QdBOu7QotRiHkXJoIqaHG6U9odTlRmy22/nvvuw=";
};
nativeBuildInputs = [
setuptools
setuptools-scm
];
propagatedBuildInputs = [
asdf
asdf-coordinates-schemas
asdf-standard
asdf-transform-schemas
astropy
numpy
packaging
];
nativeCheckInputs = [
pytest-astropy
pytestCheckHook
scipy
];
pythonImportsCheck = [ "asdf_astropy" ];
preCheck = ''
export HOME=$(mktemp -d)
'';
meta = with lib; {
description = "Extension library for ASDF to provide support for Astropy";
homepage = "https://github.com/astropy/asdf-astropy";
changelog = "https://github.com/astropy/asdf-astropy/blob/${version}/CHANGES.rst";
license = licenses.bsd3;
maintainers = with maintainers; [ fab ];
};
}

View File

@ -0,0 +1,48 @@
{
lib,
asdf-standard,
asdf,
buildPythonPackage,
fetchFromGitHub,
pythonOlder,
setuptools-scm,
setuptools,
}:
buildPythonPackage rec {
pname = "asdf-coordinates-schemas";
version = "0.3.0";
pyproject = true;
disabled = pythonOlder "3.10";
src = fetchFromGitHub {
owner = "asdf-format";
repo = "asdf-coordinates-schemas";
rev = "refs/tags/${version}";
hash = "sha256-LuC0m25OqQwivK/Z3OfoCtdhBV87rk16XrkJxUxG07o=";
};
build-system = [
setuptools
setuptools-scm
];
dependencies = [
asdf
asdf-standard
];
# Circular dependency with asdf-astropy
doCheck = false;
pythonImportsCheck = [ "asdf_coordinates_schemas" ];
meta = with lib; {
description = "ASDF schemas for coordinates";
homepage = "https://github.com/asdf-format/asdf-coordinates-schemas";
changelog = "https://github.com/asdf-format/asdf-coordinates-schemas/blob/${version}/CHANGES.rst";
license = licenses.bsd3;
maintainers = with maintainers; [ fab ];
};
}

View File

@ -0,0 +1,56 @@
{
lib,
asdf-astropy,
asdf-coordinates-schemas,
asdf-standard,
asdf-transform-schemas,
asdf,
buildPythonPackage,
fetchFromGitHub,
pytestCheckHook,
pythonOlder,
setuptools-scm,
setuptools,
}:
buildPythonPackage rec {
pname = "asdf-wcs-schemas";
version = "0.4.0";
pyproject = true;
disabled = pythonOlder "3.10";
src = fetchFromGitHub {
owner = "asdf-format";
repo = "asdf-wcs-schemas";
rev = "refs/tags/${version}";
hash = "sha256-4CxKLMYXdNkNwkfFRX3YKkS4e+Z3wQgmz8ogbC4Z1vI=";
};
build-system = [
setuptools
setuptools-scm
];
dependencies = [
asdf-coordinates-schemas
asdf-standard
asdf-transform-schemas
];
nativeCheckInputs = [
asdf
asdf-astropy
pytestCheckHook
];
pythonImportsCheck = [ "asdf_wcs_schemas" ];
meta = with lib; {
description = "World Coordinate System (WCS) ASDF schemas";
homepage = "https://github.com/asdf-format/asdf-wcs-schemas";
changelog = "https://github.com/asdf-format/asdf-wcs-schemas/blob/${version}/CHANGES.rst";
license = licenses.bsd3;
maintainers = with maintainers; [ fab ];
};
}

View File

@ -19,7 +19,7 @@
buildPythonPackage rec {
pname = "cyclopts";
version = "2.7.0";
version = "2.7.1";
pyproject = true;
disabled = pythonOlder "3.8";
@ -28,7 +28,7 @@ buildPythonPackage rec {
owner = "BrianPugh";
repo = "cyclopts";
rev = "refs/tags/v${version}";
hash = "sha256-oYYsHT8VZdqcOkMj++Bh7xjZ3JfJ9CiacFt92lBiQmc=";
hash = "sha256-JnSWKQFPrD8wadgz/4Ulisy6Mjc264JHX3PMOX+msac=";
};
build-system = [

View File

@ -0,0 +1,31 @@
{
lib,
buildPythonPackage,
fetchPypi,
django,
setuptools,
}:
buildPythonPackage rec {
pname = "django-soft-delete";
version = "1.0.13";
pyproject = true;
src = fetchPypi {
inherit pname version;
hash = "sha256-RDwApUwG0jb/iAbDJgJD13XMU2WB1zd8J4UICxBBzh0=";
};
dependencies = [ django ];
build-system = [ setuptools ];
# No tests
doCheck = false;
meta = {
description = "Soft delete models, managers, queryset for Django";
homepage = "https://github.com/san4ezy/django_softdelete";
license = lib.licenses.mit;
};
}

View File

@ -0,0 +1,57 @@
{
lib,
buildPythonPackage,
cython,
fetchFromGitHub,
pip,
pytestCheckHook,
pythonOlder,
setuptools-scm,
setuptools,
tomli,
wheel,
}:
buildPythonPackage rec {
pname = "extension-helpers";
version = "1.1.1";
pyproject = true;
disabled = pythonOlder "3.8";
src = fetchFromGitHub {
owner = "astropy";
repo = "extension-helpers";
rev = "refs/tags/v${version}";
hash = "sha256-pYCSLb6uuQ9ZtMZOQH0DxLlfgFv3tgH+AL35IN71cNI=";
};
build-system = [
setuptools
setuptools-scm
];
dependencies = [ setuptools ] ++ lib.optionals (pythonOlder "3.11") [ tomli ];
nativeCheckInputs = [
pytestCheckHook
pip
];
pythonImportsCheck = [ "extension_helpers" ];
pytestFlagsArray = [ "extension_helpers/tests" ];
disabledTests = [
# Test require network access
"test_only_pyproject"
];
meta = with lib; {
description = "Helpers to assist with building Python packages with compiled C/Cython extensions";
homepage = "https://github.com/astropy/extension-helpers";
changelog = "https://github.com/astropy/extension-helpers/blob/${version}/CHANGES.md";
license = licenses.bsd3;
maintainers = with maintainers; [ fab ];
};
}

View File

@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "fastcore";
version = "1.5.46";
version = "1.5.47";
pyproject = true;
disabled = pythonOlder "3.8";
@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "fastai";
repo = "fastcore";
rev = "refs/tags/${version}";
hash = "sha256-Jcnex5gDNTQqF0cL9FEdLx5vuNSsAicl0RvivC8QwSM=";
hash = "sha256-kQUVYOHMR6R2o5rROpwBeVW4lqKqkcYT3O9BRyKDNmE=";
};
build-system = [ setuptools ];

View File

@ -0,0 +1,61 @@
{
lib,
asdf-astropy,
asdf-wcs-schemas,
asdf,
astropy,
buildPythonPackage,
fetchFromGitHub,
numpy,
pytest-astropy,
pytestCheckHook,
pythonOlder,
scipy,
setuptools-scm,
setuptools,
tomli,
}:
buildPythonPackage rec {
pname = "gwcs";
version = "0.21.0";
pyproject = true;
disabled = pythonOlder "3.10";
src = fetchFromGitHub {
owner = "spacetelescope";
repo = "gwcs";
rev = "refs/tags/${version}";
hash = "sha256-76h2lDIaPHj7HarVcE0t5k6CA/hLCwquaz+2wMsKj+Y=";
};
build-system = [
setuptools
setuptools-scm
];
dependencies = [
asdf
asdf-astropy
asdf-wcs-schemas
astropy
numpy
scipy
];
nativeCheckInputs = [
pytest-astropy
pytestCheckHook
];
pythonImportsCheck = [ "gwcs" ];
meta = with lib; {
description = "Module to manage the Generalized World Coordinate System";
homepage = "https://github.com/spacetelescope/gwcs";
changelog = "https://github.com/spacetelescope/gwcs/blob/${version}/CHANGES.rst";
license = licenses.bsd3;
maintainers = with maintainers; [ fab ];
};
}

View File

@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "hdate";
version = "0.10.9";
version = "0.10.11";
pyproject = true;
disabled = pythonOlder "3.8";
@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "py-libhdate";
repo = "py-libhdate";
rev = "refs/tags/v${version}";
hash = "sha256-Cni8GegB8GAhtIKKCgSn3QavE/Gi9Rcm9v0grToMyq4=";
hash = "sha256-HmdXTvtNiIE2XPFhqs7WpcceEQU7F7RsLFp6/+63yDw=";
};
pythonRelaxDeps = [

View File

@ -0,0 +1,33 @@
{ lib
, buildPythonPackage
, fetchFromGitLab
# build-system
, setuptools
}:
buildPythonPackage rec {
pname = "mathutils";
version = "3.3.0";
pyproject = true;
src = fetchFromGitLab {
owner = "ideasman42";
repo = "blender-mathutils";
rev = "d63d623a9e580a567eb6acb7dbed7cad0e4f8c28";
hash = "sha256-c28kt2ADw4wHNLN0CBPcJU/kqm6g679QRaICk4WwaBc=";
};
build-system = [
setuptools
];
pythonImportsCheck = [ "mathutils" ];
meta = with lib; {
description = "A general math utilities library providing Matrix, Vector, Quaternion, Euler and Color classes, written in C for speed";
homepage = "https://gitlab.com/ideasman42/blender-mathutils";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ autra ];
};
}

View File

@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "messagebird";
version = "2.1.0";
version = "2.2.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "messagebird";
repo = "python-rest-api";
rev = version;
hash = "sha256-2KVAxdHT5+Ie3ZRxXZhU0hLOtHWjIiJi+ferkYTlSn0=";
hash = "sha256-OiLhnmZ725VbyoOHvSf4nKQRA7JsxqcOv0VKBL6rUtU=";
};
propagatedBuildInputs = [

View File

@ -8,14 +8,14 @@
buildPythonPackage rec {
pname = "peaqevcore";
version = "19.10.12";
version = "19.10.24";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-9k6bFEZychZXr/vE5AznQ36hhm/JXgjByM9wSZmyzts=";
hash = "sha256-jpJVYANreHUW6vclkdNdnaFb/QxFfJf0nuTBl3K3qBY=";
};
postPatch = ''

View File

@ -3,24 +3,24 @@
aiohttp,
buildPythonPackage,
fetchPypi,
poetry-core,
pydantic,
pythonOlder,
setuptools,
}:
buildPythonPackage rec {
pname = "peco";
version = "0.0.30";
version = "0.1.1";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-a3MPqtbDftbLGtpJ66CFVC5wJFa9L3dqOKPfBZCaHpM=";
hash = "sha256-p9Uxckc88HbUUtpg3fHGwYojU57mCuRzh3M1RAjKLX0=";
};
build-system = [ setuptools ];
build-system = [ poetry-core ];
dependencies = [
aiohttp
@ -35,6 +35,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Library for interacting with the PECO outage map";
homepage = "https://github.com/IceBotYT/peco-outage-api";
changelog = "https://github.com/IceBotYT/peco-outage-api/releases/tag/${version}";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};

View File

@ -0,0 +1,89 @@
{
lib,
astropy,
bottleneck,
buildPythonPackage,
cython,
extension-helpers,
fetchFromGitHub,
gwcs,
matplotlib,
numpy,
photutils,
pythonOlder,
rasterio,
scikit-image,
scikit-learn,
scipy,
setuptools-scm,
setuptools,
shapely,
tomli,
tqdm,
python,
wheel,
}:
buildPythonPackage rec {
pname = "photutils";
version = "1.12.0";
pyproject = true;
disabled = pythonOlder "3.10";
src = fetchFromGitHub {
owner = "astropy";
repo = "photutils";
rev = "refs/tags/${version}";
hash = "sha256-k5MxpkCAvefSRoNPMAVIvNcCTU5HPicU4XSFXk13O9Q=";
};
postPatch = ''
substituteInPlace pyproject.toml \
--replace-fail "'numpy>=2.0.0rc1'," ""
'';
build-system = [
setuptools
setuptools-scm
wheel
];
nativeBuildInputs = [
cython
extension-helpers
numpy
];
dependencies = [
astropy
numpy
];
passthru.optional-dependencies = {
all = [
bottleneck
gwcs
matplotlib
rasterio
scikit-image
scikit-learn
scipy
shapely
tqdm
];
};
# With 1.12.0 tests have issues importing modules
doCheck = false;
pythonImportsCheck = [ "photutils" ];
meta = with lib; {
description = "Astropy package for source detection and photometry";
homepage = "https://github.com/astropy/photutils";
changelog = "https://github.com/astropy/photutils/blob/${version}/CHANGES.rst";
license = licenses.bsd3;
maintainers = with maintainers; [ fab ];
};
}

View File

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "pysigma-backend-elasticsearch";
version = "1.1.0";
version = "1.1.1";
pyproject = true;
disabled = pythonOlder "3.8";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "SigmaHQ";
repo = "pySigma-backend-elasticsearch";
rev = "refs/tags/v${version}";
hash = "sha256-1tCn0aPYhjyOQJxN0cqTMDCcE0eZwRtTK6OV3rU1a1E=";
hash = "sha256-NrA7+iwjmYIOqLGRUJSWhOjFb6V542r0PWxuZG3O/Yo=";
};
postPatch = ''

View File

@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "reconplogger";
version = "4.16.0";
version = "4.16.1";
pyproject = true;
disabled = pythonOlder "3.8";
@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "omni-us";
repo = "reconplogger";
rev = "refs/tags/v${version}";
hash = "sha256-jBWy5oHyZpRUWb8OW0dRFfpu3m3hTd5dpIOQCRO5swM=";
hash = "sha256-F/6vT3jLxpteUFtYNtGyiO/JxeRtwJKpdGXTFJ6IDCE=";
};
build-system = [ setuptools ];

View File

@ -32,7 +32,7 @@
buildPythonPackage rec {
pname = "requests-cache";
version = "1.2.0";
version = "1.2.1";
pyproject = true;
disabled = pythonOlder "3.8";
@ -41,7 +41,7 @@ buildPythonPackage rec {
owner = "requests-cache";
repo = "requests-cache";
rev = "refs/tags/v${version}";
hash = "sha256-w1ptKi/MH3kGZxLMUNq/Gs6btGx+n2fG4nfQUXCXmiY=";
hash = "sha256-juRCcBUr+Ko6kVPpUapwRbUGqWLKaRiCqppOc3S5FMU=";
};
nativeBuildInputs = [ poetry-core ];

View File

@ -20,7 +20,7 @@
buildPythonPackage rec {
pname = "twilio";
version = "9.2.0";
version = "9.2.1";
pyproject = true;
disabled = pythonOlder "3.7";
@ -29,7 +29,7 @@ buildPythonPackage rec {
owner = "twilio";
repo = "twilio-python";
rev = "refs/tags/${version}";
hash = "sha256-vENcbkWXSdhHv3QYjhu8j2UmzmEFHaSD0xDb2pbxqMM=";
hash = "sha256-lCa9dV8rYyGRff+uOKIT0eq5PRItGRuedgY7IrRZ714=";
};
build-system = [ setuptools ];

View File

@ -27,7 +27,7 @@
buildPythonPackage rec {
pname = "zha";
version = "0.0.13";
version = "0.0.15";
pyproject = true;
disabled = pythonOlder "3.12";
@ -36,7 +36,7 @@ buildPythonPackage rec {
owner = "zigpy";
repo = "zha";
rev = "refs/tags/${version}";
hash = "sha256-hcHj5bOz/zyH/Wfzncc8D2+7diIO2u4r5hXfX3Rqw/Q=";
hash = "sha256-k4Wqxv7WJGDDGXA80qW+RUICTUcgLsWJNiV+zsOkfuM=";
};
postPatch = ''

View File

@ -6,13 +6,13 @@
mkYarnPackage rec {
pname = "yaml-language-server";
version = "1.14.0";
version = "1.15.0";
src = fetchFromGitHub {
owner = "redhat-developer";
repo = "yaml-language-server";
rev = version;
hash = "sha256-DS5kMw/x8hP2MzxHdHXnBqqBGLq21NiZBb5ApjEe/ts=";
hash = "sha256-Y3Q/y9UIiy7US8Jl4vxT0Pfw8h3hiXK+Cu9TEQHyAaA=";
};
packageJSON = ./package.json;

View File

@ -1,7 +1,7 @@
{
"name": "yaml-language-server",
"description": "YAML language server",
"version": "1.14.0",
"version": "1.15.0",
"author": "Gorkem Ercan (Red Hat)",
"license": "MIT",
"contributors": [

View File

@ -10,13 +10,13 @@
buildGoModule rec {
pname = "fastly";
version = "10.12.2";
version = "10.12.3";
src = fetchFromGitHub {
owner = "fastly";
repo = "cli";
rev = "refs/tags/v${version}";
hash = "sha256-2B/7XmhHo/1Y2szdXNygiK6IsmVvcdAPtOvZI/B26pw=";
hash = "sha256-rvutRCfySapyHHzU6hVUdcQ/QdC/mqjrDhx1KTJnWlE=";
# The git commit is part of the `fastly version` original output;
# leave that output the same in nixpkgs. Use the `.git` directory
# to retrieve the commit SHA, and remove the directory afterwards,

View File

@ -439,7 +439,7 @@ let
DRM_GMA500 = whenAtLeast "5.12" module;
DRM_GMA600 = whenOlder "5.13" yes;
DRM_GMA3600 = whenOlder "5.12" yes;
DRM_VMWGFX_FBCON = whenOlder "6.2" yes;
DRM_VMWGFX_FBCON = whenOlder "6.1" yes;
# (experimental) amdgpu support for verde and newer chipsets
DRM_AMDGPU_SI = yes;
# (stable) amdgpu support for bonaire and newer chipsets
@ -621,8 +621,8 @@ let
F2FS_FS_COMPRESSION = whenAtLeast "5.6" yes;
UDF_FS = module;
NFSD_V2_ACL = whenOlder "5.15" yes;
NFSD_V3 = whenOlder "5.15" yes;
NFSD_V2_ACL = whenOlder "5.10" yes;
NFSD_V3 = whenOlder "5.10" yes;
NFSD_V3_ACL = yes;
NFSD_V4 = yes;
NFSD_V4_SECURITY_LABEL = yes;

View File

@ -46,7 +46,7 @@ let
# import <nixpkgs> { config = { showDerivationWarnings = [ "maintainerless" ]; }; }
showWarnings = config.showDerivationWarnings;
getName = attrs: attrs.name or ("${attrs.pname or "«name-missing»"}-${attrs.version or "«version-missing»"}");
getNameWithVersion = attrs: attrs.name or ("${attrs.pname or "«name-missing»"}-${attrs.version or "«version-missing»"}");
allowUnfree = config.allowUnfree
|| builtins.getEnv "NIXPKGS_ALLOW_UNFREE" == "1";
@ -123,7 +123,7 @@ let
!allowUnfree &&
!allowUnfreePredicate attrs;
allowInsecureDefaultPredicate = x: builtins.elem (getName x) (config.permittedInsecurePackages or []);
allowInsecureDefaultPredicate = x: builtins.elem (getNameWithVersion x) (config.permittedInsecurePackages or []);
allowInsecurePredicate = x: (config.allowInsecurePredicate or allowInsecureDefaultPredicate) x;
hasAllowedInsecure = attrs:
@ -230,23 +230,23 @@ let
$ export NIXPKGS_ALLOW_INSECURE=1
${flakeNote}
b) for `nixos-rebuild` you can add ${lib.getName attrs} to
b) for `nixos-rebuild` you can add ${getNameWithVersion attrs} to
`nixpkgs.config.permittedInsecurePackages` in the configuration.nix,
like so:
{
nixpkgs.config.permittedInsecurePackages = [
"${lib.getName attrs}"
"${getNameWithVersion attrs}"
];
}
c) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
${lib.getName attrs} to `permittedInsecurePackages` in
${getNameWithVersion attrs} to `permittedInsecurePackages` in
~/.config/nixpkgs/config.nix, like so:
{
permittedInsecurePackages = [
"${lib.getName attrs}"
"${getNameWithVersion attrs}"
];
}
@ -257,9 +257,9 @@ let
actualOutputs = attrs.outputs or [ "out" ];
missingOutputs = builtins.filter (output: ! builtins.elem output actualOutputs) expectedOutputs;
in ''
The package ${getName attrs} has set meta.outputsToInstall to: ${builtins.concatStringsSep ", " expectedOutputs}
The package ${getNameWithVersion attrs} has set meta.outputsToInstall to: ${builtins.concatStringsSep ", " expectedOutputs}
however ${getName attrs} only has the outputs: ${builtins.concatStringsSep ", " actualOutputs}
however ${getNameWithVersion attrs} only has the outputs: ${builtins.concatStringsSep ", " actualOutputs}
and is missing the following ouputs:
@ -269,9 +269,9 @@ let
handleEvalIssue = { meta, attrs }: { reason , errormsg ? "" }:
let
msg = if inHydra
then "Failed to evaluate ${getName attrs}: «${reason}»: ${errormsg}"
then "Failed to evaluate ${getNameWithVersion attrs}: «${reason}»: ${errormsg}"
else ''
Package ${getName attrs} in ${pos_str meta} ${errormsg}, refusing to evaluate.
Package ${getNameWithVersion attrs} in ${pos_str meta} ${errormsg}, refusing to evaluate.
'' + (builtins.getAttr reason remediation) attrs;
@ -283,8 +283,8 @@ let
handleEvalWarning = { meta, attrs }: { reason , errormsg ? "" }:
let
remediationMsg = (builtins.getAttr reason remediation) attrs;
msg = if inHydra then "Warning while evaluating ${getName attrs}: «${reason}»: ${errormsg}"
else "Package ${getName attrs} in ${pos_str meta} ${errormsg}, continuing anyway."
msg = if inHydra then "Warning while evaluating ${getNameWithVersion attrs}: «${reason}»: ${errormsg}"
else "Package ${getNameWithVersion attrs} in ${pos_str meta} ${errormsg}, continuing anyway."
+ (optionalString (remediationMsg != "") "\n${remediationMsg}");
isEnabled = findFirst (x: x == reason) null showWarnings;
in if isEnabled != null then builtins.trace msg true else true;

View File

@ -10,9 +10,9 @@
, help2man
, cmake
, zlib
, withApplePCSC ? stdenv.isDarwin
, nix-update-script
, testers
, withApplePCSC ? stdenv.isDarwin
}:
stdenv.mkDerivation (finalAttrs: {
@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: {
};
postPatch = ''
substituteInPlace CMakeLists.txt --replace "-Werror" ""
substituteInPlace CMakeLists.txt --replace-fail "-Werror" ""
'';
nativeBuildInputs = [
@ -41,32 +41,37 @@ stdenv.mkDerivation (finalAttrs: {
buildInputs = [
openssl
check
zlib.dev
]
++ (if withApplePCSC then [ PCSC ] else [ pcsclite ]);
cmakeFlags = [
"-DGENERATE_MAN_PAGES=ON"
"-DCMAKE_INSTALL_BINDIR=bin"
"-DCMAKE_INSTALL_INCLUDEDIR=include"
"-DCMAKE_INSTALL_MANDIR=share/man"
"-DCMAKE_INSTALL_LIBDIR=lib"
(lib.cmakeBool "GENERATE_MAN_PAGES" true)
(lib.cmakeFeature "BACKEND" (if withApplePCSC then "macscard" else "pcsc"))
(lib.cmakeFeature "CMAKE_INSTALL_BINDIR" "bin")
(lib.cmakeFeature "CMAKE_INSTALL_INCLUDEDIR" "include")
(lib.cmakeFeature "CMAKE_INSTALL_LIBDIR" "lib")
(lib.cmakeFeature "CMAKE_INSTALL_MANDIR" "share/man")
];
configureFlags = [ "--with-backend=${if withApplePCSC then "macscard" else "pcsc"}" ];
doCheck = true;
nativeCheckInputs = [ check ];
passthru = {
updateScript = nix-update-script {
extraArgs = [ "--version-regex" "yubico-piv-tool-([0-9.]+)$" ];
};
tests.version = testers.testVersion {
package = finalAttrs.finalPackage;
command = "yubico-piv-tool --version";
tests = {
pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
version = testers.testVersion {
package = finalAttrs.finalPackage;
command = "yubico-piv-tool --version";
};
};
};
meta = with lib; {
meta = {
homepage = "https://developers.yubico.com/yubico-piv-tool/";
changelog = "https://developers.yubico.com/yubico-piv-tool/Release_Notes.html";
description = ''
@ -80,9 +85,10 @@ stdenv.mkDerivation (finalAttrs: {
certificates, and create certificate requests, and other operations.
A shared library and a command-line tool is included.
'';
license = licenses.bsd2;
platforms = platforms.all;
maintainers = with maintainers; [ viraptor anthonyroussel ];
license = lib.licenses.bsd2;
platforms = lib.platforms.all;
maintainers = with lib.maintainers; [ viraptor anthonyroussel ];
mainProgram = "yubico-piv-tool";
pkgConfigModules = [ "ykcs11" "ykpiv" ];
};
})

View File

@ -5,13 +5,13 @@
buildGoModule rec {
pname = "checkip";
version = "0.47.4";
version = "0.47.5";
src = fetchFromGitHub {
owner = "jreisinger";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-b30Biyncg48Lv78LlojnWVwLDt30QwPhyxi97n6XjY4=";
hash = "sha256-iAMSNz5TDSId0gBm982hFkM+JR4naEREXKS7mi6z5dw=";
};
vendorHash = "sha256-awqaDEdWILm8RcQ8hrtJFMTJQA5TzGZhiBTMfexmtA0=";

View File

@ -8331,8 +8331,6 @@ with pkgs;
gnome-extension-manager = callPackage ../applications/misc/gnome-extension-manager { };
gnome-feeds = callPackage ../applications/networking/feedreaders/gnome-feeds { };
gnome-frog = callPackage ../applications/misc/gnome-frog { };
gnome-keysign = callPackage ../tools/security/gnome-keysign { };

View File

@ -787,10 +787,16 @@ self: super: with self; {
asdf = callPackage ../development/python-modules/asdf { };
asdf-astropy = callPackage ../development/python-modules/asdf-astropy { };
asdf-coordinates-schemas = callPackage ../development/python-modules/asdf-coordinates-schemas { };
asdf-standard = callPackage ../development/python-modules/asdf-standard { };
asdf-transform-schemas = callPackage ../development/python-modules/asdf-transform-schemas { };
asdf-wcs-schemas = callPackage ../development/python-modules/asdf-wcs-schemas { };
ase = callPackage ../development/python-modules/ase { };
asf-search = callPackage ../development/python-modules/asf-search { };
@ -3401,6 +3407,8 @@ self: super: with self; {
django-sites = callPackage ../development/python-modules/django-sites { };
django-soft-delete = callPackage ../development/python-modules/django-soft-delete { };
django-statici18n = callPackage ../development/python-modules/django-statici18n { };
django-storages = callPackage ../development/python-modules/django-storages { };
@ -4041,6 +4049,8 @@ self: super: with self; {
exitcode = callPackage ../development/python-modules/exitcode { };
extension-helpers = callPackage ../development/python-modules/extension-helpers { };
extract-msg = callPackage ../development/python-modules/extract-msg { };
extractcode = callPackage ../development/python-modules/extractcode { };
@ -5277,6 +5287,8 @@ self: super: with self; {
gviz-api = callPackage ../development/python-modules/gviz-api { };
gwcs = callPackage ../development/python-modules/gwcs { };
gym = callPackage ../development/python-modules/gym { };
gym-notices = callPackage ../development/python-modules/gym-notices { };
@ -7297,6 +7309,8 @@ self: super: with self; {
mathlibtools = callPackage ../development/python-modules/mathlibtools { };
mathutils = callPackage ../development/python-modules/mathutils { };
matlink-gpapi = callPackage ../development/python-modules/matlink-gpapi { };
matplotlib = callPackage ../development/python-modules/matplotlib {
@ -9780,6 +9794,8 @@ self: super: with self; {
phonenumbers = callPackage ../development/python-modules/phonenumbers { };
photutils = callPackage ../development/python-modules/photutils { };
pkgutil-resolve-name = callPackage ../development/python-modules/pkgutil-resolve-name { };
pkg-about = callPackage ../development/python-modules/pkg-about { };
@ -14844,6 +14860,11 @@ self: super: with self; {
syncer = callPackage ../development/python-modules/syncer { };
syndication-domination = toPythonModule (pkgs.syndication-domination.override {
enablePython = true;
python3Packages = self;
});
synergy = callPackage ../development/python-modules/synergy { };
synologydsm-api = callPackage ../development/python-modules/synologydsm-api { };