Merge master into staging-next

This commit is contained in:
github-actions[bot] 2024-06-19 18:00:54 +00:00 committed by GitHub
commit 11b7fc6440
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
68 changed files with 940 additions and 764 deletions

View File

@ -822,3 +822,4 @@ Module System:
### Internal {#sec-release-24.05-lib-internal}
- `lib` now has [Readme for contributing](https://github.com/NixOS/nixpkgs/tree/master/lib#readme).
- Some function's documentation is now written using the [accepted doc comment syntax](https://github.com/NixOS/rfcs/pull/145).
- `odoo` has been updated from `16.0.20231024` to `17.0.20240507`.

View File

@ -2,7 +2,7 @@
let
cfg = config.services.docuum;
inherit (lib) mkIf mkEnableOption mkOption getExe types;
inherit (lib) mkIf mkEnableOption mkOption getExe types optionals concatMap;
in
{
options.services.docuum = {
@ -14,6 +14,27 @@ in
default = "10 GB";
example = "50%";
};
minAge = mkOption {
description = "Sets the minimum age of images to be considered for deletion.";
type = types.nullOr types.str;
default = null;
example = "1d";
};
keep = mkOption {
description = "Prevents deletion of images for which repository:tag matches the specified regex.";
type = types.listOf types.str;
default = [];
example = [ "^my-image" ];
};
deletionChunkSize = mkOption {
description = "Removes specified quantity of images at a time.";
type = types.int;
default = 1;
example = 10;
};
};
config = mkIf cfg.enable {
@ -35,10 +56,13 @@ in
DynamicUser = true;
StateDirectory = "docuum";
SupplementaryGroups = [ "docker" ];
ExecStart = utils.escapeSystemdExecArgs [
ExecStart = utils.escapeSystemdExecArgs ([
(getExe pkgs.docuum)
"--threshold" cfg.threshold
];
"--deletion-chunk-size" cfg.deletionChunkSize
] ++ (concatMap (keep: [ "--keep" keep ]) cfg.keep)
++ (optionals (cfg.minAge != null) [ "--min-age" cfg.minAge ])
);
};
};
};

View File

@ -414,6 +414,7 @@ in {
pyload = handleTest ./pyload.nix {};
oci-containers = handleTestOn ["aarch64-linux" "x86_64-linux"] ./oci-containers.nix {};
odoo = handleTest ./odoo.nix {};
odoo16 = handleTest ./odoo.nix { package = pkgs.odoo16; };
odoo15 = handleTest ./odoo.nix { package = pkgs.odoo15; };
# 9pnet_virtio used to mount /nix partition doesn't support
# hibernation. This test happens to work on x86_64-linux but

View File

@ -14,6 +14,18 @@ import ./make-test-python.nix ({ pkgs, lib, package ? pkgs.odoo, ...} : {
package = package;
domain = "localhost";
};
# odoo does not automatically initialize its database,
# even if passing what _should_ be the equivalent of these options:
# settings = {
# options = {
# database = "odoo";
# init = "base";
# };
# };
systemd.services.odoo.preStart = ''
HOME=$STATE_DIRECTORY ${package}/bin/odoo -d odoo -i base --stop-after-init --without-demo all
'';
};
};

View File

@ -22,13 +22,13 @@
stdenv.mkDerivation rec {
pname = "lightdm-slick-greeter";
version = "2.0.4";
version = "2.0.5";
src = fetchFromGitHub {
owner = "linuxmint";
repo = "slick-greeter";
rev = version;
sha256 = "sha256-1UOODak5YkoMLdIkN1rBIrlr3Zjj5SS2yx90vmF1prA=";
sha256 = "sha256-Q37CprukHvDRBcuPbfusKg2DY+JCwmjVX1+KnfSH2iw=";
};
nativeBuildInputs = [

View File

@ -11,13 +11,13 @@
stdenv.mkDerivation rec {
pname = "clifm";
version = "1.18";
version = "1.19";
src = fetchFromGitHub {
owner = "leo-arch";
repo = pname;
rev = "v${version}";
hash = "sha256-tgCGZCLCWcF7ktXqDHjoUkeVqxg6QVOkZb7pbk3nA+U=";
hash = "sha256-QNxEvFZ5e4jQV2Tv2/D9KPRDoCoQlrqStFnbKVgcXxg=";
};
buildInputs = [

View File

@ -1,27 +0,0 @@
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p curl gnused nix coreutils nix-prefetch
set -euo pipefail
DOCKER=$(curl -s https://raw.githubusercontent.com/odoo/docker/master/16.0/Dockerfile)
get_var() {
echo "$DOCKER" | grep -E "^[A-Z][A-Z][A-Z] ODOO_$1" | sed -r "s|^[A-Z]{3} ODOO_$1.||g"
}
VERSION=$(get_var VERSION)
RELEASE=$(get_var RELEASE)
latestVersion="$VERSION.$RELEASE"
currentVersion=$(nix-instantiate --eval -E "with import ./. {}; odoo.version or (lib.getVersion odoo)" | tr -d '"')
if [[ "$currentVersion" == "$latestVersion" ]]; then
echo "odoo is up-to-date: $currentVersion"
exit 0
fi
cd "$(dirname "${BASH_SOURCE[0]}")"
sed -ri "s| hash.+ # odoo| hash = \"$(nix-prefetch -q fetchzip --url "https://nightly.odoo.com/${VERSION}/nightly/src/odoo_${latestVersion}.zip")\"; # odoo|g" default.nix
sed -ri "s| odoo_version.+| odoo_version = \"$VERSION\";|" default.nix
sed -ri "s| odoo_release.+| odoo_release = \"$RELEASE\";|" default.nix

View File

@ -3,10 +3,10 @@
{
firefox = buildMozillaMach rec {
pname = "firefox";
version = "127.0";
version = "127.0.1";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
sha512 = "5a17bce357e7f445c37540115f2c131ad5a055c0cf04f20bc2eaca18f8d241a99ac76739d172b38f2ad2681633f901a0a15893801082ac5db9e20e31fc8b8291";
sha512 = "13df770a89b703033601cab56892a2fc62427521936b366893008e68cd1f48d7b18917a3cede23764d024208819037ad0d28c2d4b73b99fdc204cbd53bb1297e";
};
extraPatches = [

View File

@ -62,6 +62,12 @@ rec {
};
kops_1_28 = mkKops rec {
version = "1.28.5";
sha256 = "sha256-spw3lTrp6RlxkTNoZ/3Yz/U2tdvBnwiYORS2QtOSX9k=";
rev = "v${version}";
};
kops_1_29 = mkKops rec {
version = "1.29.0";
sha256 = "sha256-YneB9pc4IR+tYPRFE5CS+4JK/kPOHMo5/70A3k1x1tg=";
rev = "v${version}";

View File

@ -1,97 +0,0 @@
{ lib
, stdenv
, buildGoModule
, fetchFromGitHub
, installShellFiles
, btrfs-progs
, testers
, werf
}:
buildGoModule rec {
pname = "werf";
version = "2.5.0";
src = fetchFromGitHub {
owner = "werf";
repo = "werf";
rev = "v${version}";
hash = "sha256-dZwZzBisQUmOz1lij6L0NHigXW2DtUd6s86sHYq8UPA=";
};
vendorHash = "sha256-cWOnIEvVer+USqNQJmhZ7pYSJfzY2xjq2oTxRd/y94w=";
proxyVendor = true;
subPackages = [ "cmd/werf" ];
nativeBuildInputs = [ installShellFiles ];
buildInputs = lib.optionals stdenv.isLinux [ btrfs-progs ]
++ lib.optionals stdenv.hostPlatform.isGnu [ stdenv.cc.libc.static ];
CGO_ENABLED = if stdenv.isLinux then 1 else 0;
ldflags = [
"-s"
"-w"
"-X github.com/werf/werf/v2/pkg/werf.Version=${src.rev}"
] ++ lib.optionals (CGO_ENABLED == 1) [
"-extldflags=-static"
"-linkmode external"
];
tags = [
"containers_image_openpgp"
"dfrunmount"
"dfrunnetwork"
"dfrunsecurity"
"dfssh"
] ++ lib.optionals (CGO_ENABLED == 1) [
"cni"
"exclude_graphdriver_devicemapper"
"netgo"
"no_devmapper"
"osusergo"
"static_build"
];
preCheck = ''
# Test all targets.
unset subPackages
# Remove tests that require external services.
rm -rf \
integration/suites \
pkg/true_git/*test.go \
test/e2e
'' + lib.optionalString (CGO_ENABLED == 0) ''
# A workaround for osusergo.
export USER=nixbld
'';
postInstall = ''
installShellCompletion --cmd werf \
--bash <($out/bin/werf completion --shell=bash) \
--zsh <($out/bin/werf completion --shell=zsh)
'';
passthru.tests.version = testers.testVersion {
package = werf;
command = "werf version";
version = src.rev;
};
meta = with lib; {
description = "GitOps delivery tool";
mainProgram = "werf";
longDescription = ''
The CLI tool gluing Git, Docker, Helm & Kubernetes with any CI system to
implement CI/CD and Giterminism.
'';
homepage = "https://werf.io";
changelog = "https://github.com/werf/werf/releases/tag/${src.rev}";
license = licenses.asl20;
maintainers = with maintainers; [ azahi ];
};
}

View File

@ -21,14 +21,14 @@
let
pname = "qownnotes";
appname = "QOwnNotes";
version = "24.6.1";
version = "24.6.3";
in
stdenv.mkDerivation {
inherit pname version;
src = fetchurl {
url = "https://github.com/pbek/QOwnNotes/releases/download/v${version}/qownnotes-${version}.tar.xz";
hash = "sha256-FS4VJtTh0LIrrIK+IJxSBqcEsNU7/e6KG3190FLAQC4=";
hash = "sha256-UdWyS5DalnGDoNEOx8d9MglKpJeqOXY1mTgLl3r/9gY=";
};
nativeBuildInputs = [

View File

@ -16,13 +16,13 @@
stdenv.mkDerivation rec {
pname = "qlog";
version = "0.35.2";
version = "0.36.0";
src = fetchFromGitHub {
owner = "foldynl";
repo = "QLog";
rev = "v${version}";
hash = "sha256-3ht3/J4uJ7Nyfp0xpVDYa8GnV/EvHjf09XGSEBLRGZU=";
hash = "sha256-YbjtN08zEj8rlRDC5tS/JsBOH70DV98wmL6pFQTehgg=";
fetchSubmodules = true;
};

View File

@ -10,7 +10,7 @@ rec {
, tiniRev, tiniHash
, buildxSupport ? true, composeSupport ? true, sbomSupport ? false
# package dependencies
, stdenv, fetchFromGitHub, fetchpatch, buildGoPackage
, stdenv, fetchFromGitHub, fetchpatch, buildGoModule
, makeWrapper, installShellFiles, pkg-config, glibc
, go-md2man, go, containerd, runc, tini, libtool
, sqlite, iproute2, docker-buildx, docker-compose, docker-sbom
@ -23,7 +23,7 @@ rec {
, withSeccomp ? stdenv.isLinux, libseccomp
}:
let
docker-runc = runc.overrideAttrs (oldAttrs: {
docker-runc = runc.overrideAttrs {
pname = "docker-runc";
inherit version;
@ -36,7 +36,7 @@ rec {
# docker/runc already include these patches / are not applicable
patches = [];
});
};
docker-containerd = containerd.overrideAttrs (oldAttrs: {
pname = "docker-containerd";
@ -53,7 +53,7 @@ rec {
++ lib.optionals withSeccomp [ libseccomp ];
});
docker-tini = tini.overrideAttrs (oldAttrs: {
docker-tini = tini.overrideAttrs {
pname = "docker-init";
inherit version;
@ -70,7 +70,7 @@ rec {
buildInputs = [ glibc glibc.static ];
env.NIX_CFLAGS_COMPILE = "-DMINIMAL=ON";
});
};
moby-src = fetchFromGitHub {
owner = "moby";
@ -79,13 +79,13 @@ rec {
hash = mobyHash;
};
moby = buildGoPackage (lib.optionalAttrs stdenv.isLinux rec {
moby = buildGoModule (lib.optionalAttrs stdenv.isLinux rec {
pname = "moby";
inherit version;
src = moby-src;
goPackagePath = "github.com/docker/docker";
vendorHash = null;
nativeBuildInputs = [ makeWrapper pkg-config go-md2man go libtool installShellFiles ];
buildInputs = [ sqlite ]
@ -126,16 +126,13 @@ rec {
buildPhase = ''
export GOCACHE="$TMPDIR/go-cache"
# build engine
cd ./go/src/${goPackagePath}
export AUTO_GOPATH=1
export DOCKER_GITCOMMIT="${cliRev}"
export VERSION="${version}"
./hack/make.sh dynbinary
cd -
'';
installPhase = ''
cd ./go/src/${goPackagePath}
install -Dm755 ./bundles/dynbinary-daemon/dockerd $out/libexec/docker/dockerd
install -Dm755 ./bundles/dynbinary-daemon/docker-proxy $out/libexec/docker/docker-proxy
@ -149,7 +146,7 @@ rec {
# systemd
install -Dm644 ./contrib/init/systemd/docker.service $out/etc/systemd/system/docker.service
substituteInPlace $out/etc/systemd/system/docker.service --replace /usr/bin/dockerd $out/bin/dockerd
substituteInPlace $out/etc/systemd/system/docker.service --replace-fail /usr/bin/dockerd $out/bin/dockerd
install -Dm644 ./contrib/init/systemd/docker.socket $out/etc/systemd/system/docker.socket
# rootless Docker
@ -169,7 +166,7 @@ rec {
++ lib.optional sbomSupport docker-sbom;
pluginsRef = symlinkJoin { name = "docker-plugins"; paths = plugins; };
in
buildGoPackage (lib.optionalAttrs (!clientOnly) {
buildGoModule (lib.optionalAttrs (!clientOnly) {
# allow overrides of docker components
# TODO: move packages out of the let...in into top-level to allow proper overrides
inherit docker-runc docker-containerd docker-tini moby;
@ -184,7 +181,7 @@ rec {
hash = cliHash;
};
goPackagePath = "github.com/docker/cli";
vendorHash = null;
nativeBuildInputs = [
makeWrapper pkg-config go-md2man go libtool installShellFiles
@ -197,9 +194,9 @@ rec {
postPatch = ''
patchShebangs man scripts/build/
substituteInPlace ./scripts/build/.variables --replace "set -eu" ""
substituteInPlace ./scripts/build/.variables --replace-fail "set -eu" ""
'' + lib.optionalString (plugins != []) ''
substituteInPlace ./cli-plugins/manager/manager_unix.go --replace /usr/libexec/docker/cli-plugins \
substituteInPlace ./cli-plugins/manager/manager_unix.go --replace-fail /usr/libexec/docker/cli-plugins \
"${pluginsRef}/libexec/docker/cli-plugins"
'';
@ -207,7 +204,6 @@ rec {
buildPhase = ''
export GOCACHE="$TMPDIR/go-cache"
cd ./go/src/${goPackagePath}
# Mimic AUTO_GOPATH
mkdir -p .gopath/src/github.com/docker/
ln -sf $PWD .gopath/src/github.com/docker/cli
@ -215,17 +211,14 @@ rec {
export GITCOMMIT="${cliRev}"
export VERSION="${version}"
export BUILDTIME="1970-01-01T00:00:00Z"
source ./scripts/build/.variables
export CGO_ENABLED=1
go build -tags pkcs11 --ldflags "$GO_LDFLAGS" github.com/docker/cli/cmd/docker
cd -
make dynbinary
'';
outputs = ["out"] ++ lib.optional (lib.versionOlder version "23") "man";
installPhase = ''
cd ./go/src/${goPackagePath}
install -Dm755 ./docker $out/libexec/docker/docker
install -Dm755 ./build/docker $out/libexec/docker/docker
makeWrapper $out/libexec/docker/docker $out/bin/docker \
--prefix PATH : "$out/libexec/docker:$extraPath"

View File

@ -1,23 +0,0 @@
{ lib, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
pname = "distribution";
version = "2.8.3";
rev = "v${version}";
goPackagePath = "github.com/docker/distribution";
src = fetchFromGitHub {
owner = "docker";
repo = "distribution";
inherit rev;
sha256 = "sha256-6/clOTkI1JnDjb+crcHmjbQlaqffP/sntGqUB2ftajU=";
};
meta = with lib; {
description = "Docker toolset to pack, ship, store, and deliver content";
license = licenses.asl20;
maintainers = [];
platforms = platforms.unix;
};
}

View File

@ -6,13 +6,13 @@
}:
stdenv.mkDerivation (finalAttrs: {
pname = "hyprland-protocols";
version = "0.2";
version = "0.3.0";
src = fetchFromGitHub {
owner = "hyprwm";
repo = finalAttrs.pname;
rev = "v${finalAttrs.version}";
hash = "sha256-QPzwwlGKX95tl6ZEshboZbEwwAXww6lNLdVYd6T9Mrc=";
hash = "sha256-HUklK5u86w2Yh9dOkk4FdsL8eehcOZ95jPhLixGDRQY=";
};
nativeBuildInputs = [

View File

@ -1,6 +1,6 @@
{ lib
, stdenv
, buildGoPackage
, buildGoModule
, fetchFromGitHub
, pkg-config
, cairo
@ -11,28 +11,28 @@
, gtk3
}:
buildGoPackage rec {
buildGoModule {
pname = "coyim";
version = "0.4.1";
goPackagePath = "github.com/coyim/coyim";
version = "0.4.1-unstable-2023-09-21";
src = fetchFromGitHub {
owner = "coyim";
repo = "coyim";
rev = "v${version}";
sha256 = "sha256-PmB6POaHKEXzIAaz3lAbUOhtVOzrj5oXRk90giYo6SI=";
rev = "3f84daa8c27277543b1b4ad4536dde5100d9df12";
sha256 = "sha256-lzhcUSBuAgYwcmdwnqNxKG0P6ZSjWeLS/g/gaF171D4=";
};
vendorHash = "sha256-zG7r/Db6XiwKoHRduGj3tEh/KT1hsuBoSGLYaZ+qO0Y=";
nativeBuildInputs = [ pkg-config wrapGAppsHook3 ];
buildInputs = [ glib cairo gdk-pixbuf gtk3 gnome.adwaita-icon-theme ];
meta = with lib; {
meta = {
description = "Safe and secure chat client";
mainProgram = "coyim";
homepage = "https://coy.im/";
license = licenses.gpl3;
license = lib.licenses.gpl3;
platforms = [ "x86_64-linux" "x86_64-darwin" ];
broken = stdenv.isDarwin;
};

View File

@ -0,0 +1,67 @@
{ lib
, buildGoModule
, fetchFromGitHub
, fetchpatch
, nix-update-script
, testers
, distribution
}:
buildGoModule rec {
pname = "distribution";
version = "3.0.0-alpha.1";
src = fetchFromGitHub {
owner = "distribution";
repo = "distribution";
rev = "v${version}";
hash = "sha256-reguAtBkEC9OMUTdCtFY6l0fkk28VoA0IlPcQ0sz84I=";
};
patches = [
# fix: load gcs credentials and client inside DriverConstructor
# Needed to pass the tests. Remove with next update.
(fetchpatch {
url = "https://github.com/distribution/distribution/commit/14366a2dff6a8f595e39d258085381731b43cec6.diff";
hash = "sha256-0ns9JuIeLBzRLMVxY6uaWTIYcRRbuwQ+n9tmK+Pvf4U=";
})
# fix: add missing skip in s3 driver test
# Needed to pass the tests. Remove with next update.
(fetchpatch {
url = "https://github.com/distribution/distribution/commit/6908e0d5facd31ed32046df03a09040c964be0b3.patch";
hash = "sha256-ww+BwBGw+dkZ2FhVzynehR+sNYCgq8/KkPDP9ac6NWg=";
})
];
vendorHash = null;
checkFlags = [
# TestHTTPChecker: requires internet access.
# TestInMemoryDriverSuite: timeout after 10 minutes, looks like a deadlock.
"-skip=^TestHTTPChecker$|^TestInMemoryDriverSuite$"
];
passthru = {
tests.version = testers.testVersion {
package = distribution;
version = "v${version}";
};
updateScript = nix-update-script { };
};
meta = with lib; {
description = "Toolkit to pack, ship, store, and deliver container content";
longDescription = ''
Distribution is a Open Source Registry implementation for storing and distributing container
images and other content using the OCI Distribution Specification. The goal of this project
is to provide a simple, secure, and scalable base for building a large scale registry solution
or running a simple private registry.
'';
homepage = "https://distribution.github.io/distribution/";
changelog = "https://github.com/distribution/distribution/releases/tag/v${version}";
license = licenses.asl20;
maintainers = [ ];
mainProgram = "registry";
platforms = platforms.unix;
};
}

View File

@ -21,7 +21,7 @@ let
in
buildDunePackage' rec {
pname = "docfd";
version = "6.0.1";
version = "7.0.0";
minimalOCamlVersion = "5.1";
@ -29,7 +29,7 @@ buildDunePackage' rec {
owner = "darrenldl";
repo = "docfd";
rev = version;
hash = "sha256-pNBWSPII+r9MMmyXBzxQ6hMNrN7nwcdhrpufzj00s2E=";
hash = "sha256-R/UOA1rf9NnEQQWn/ToCZuUSC48DPqglrb+5ZjCdpb0=";
};
nativeBuildInputs = [

View File

@ -7,16 +7,16 @@
rustPlatform.buildRustPackage rec {
pname = "docuum";
version = "0.24.0";
version = "0.25.0";
src = fetchFromGitHub {
owner = "stepchowfun";
repo = "docuum";
rev = "v${version}";
hash = "sha256-/30wuLnCcomgJ14c5rNbitD1dEpvyRal3L60gQdZPBU=";
hash = "sha256-nWd6h39jU1eZWPFMxhxActsmrs9k0TDMlealuzTa+o0=";
};
cargoHash = "sha256-BvZM0tAgwoOO0VFQEoifgmENnW3cfKV3Zj872/Lki6A=";
cargoHash = "sha256-uoQ1qUII6TSZsosAdNfs2CREVuN2kuT9Bmi5vuDT/rY=";
checkFlags = [
# fails, no idea why

View File

@ -17,7 +17,7 @@
}:
python3Packages.buildPythonApplication rec {
pname = "errands";
version = "46.2.2";
version = "46.2.3";
pyproject = false;
@ -25,7 +25,7 @@ python3Packages.buildPythonApplication rec {
owner = "mrvladus";
repo = "Errands";
rev = "refs/tags/${version}";
hash = "sha256-lX0exxZMbq/iC41bByMfT478vhOQadPJAN72PHiznKc=";
hash = "sha256-JBvyMWEUKUKeAOTCbzNwqpv2ox7bS9p+QsLkJv/lK8k=";
};
nativeBuildInputs = [

View File

@ -1,6 +1,7 @@
{
autoPatchelfHook,
copyDesktopItems,
fetchurl,
fetchzip,
lib,
libGL,
@ -79,6 +80,10 @@ stdenv.mkDerivation (finalAttrs: {
comment = description;
desktopName = name;
genericName = name;
icon = fetchurl {
url = "https://www.geeks3d.com/furmark/i/20240220-furmark-logo-02.png";
hash = "sha256-EqhWQgTEmF/2AcqDxgGtr2m5SMYup28hPEhI6ssFw7g=";
};
categories = [
"System"
"Monitor"

View File

@ -10,16 +10,16 @@
rustPlatform.buildRustPackage rec {
pname = "fzf-make";
version = "0.33.0";
version = "0.34.0";
src = fetchFromGitHub {
owner = "kyu08";
repo = "fzf-make";
rev = "v${version}";
hash = "sha256-ct4ugHqSekAZrkuFotjzMzcoJ0+P7d0Qhi79SqVZHPM=";
hash = "sha256-x+y0K6b/yCskowOuvjcSCJXM5ym2Qn84/Thui0ahUKU=";
};
cargoHash = "sha256-0VhcpW56OePvHVFPG4QaK8ezvNUAuWyI5gztjuKFKVQ=";
cargoHash = "sha256-cIoc3sGy33iTkVAln4oSYSBGB0iAFanv746upxnv0ZA=";
nativeBuildInputs = [ makeBinaryWrapper ];

View File

@ -14,13 +14,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "gnome-online-accounts-gtk";
version = "3.50.2";
version = "3.50.3";
src = fetchFromGitHub {
owner = "xapp-project";
repo = "gnome-online-accounts-gtk";
rev = finalAttrs.version;
hash = "sha256-6yGesg/L/9syX990uDuw5Or/uEQ8DGPQYiCRRw4OMzY=";
hash = "sha256-peElSkGl2dYeJmMUeB+xDoOY3MhHs7IsIQYr0iJZP58=";
};
nativeBuildInputs = [

View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "kor";
version = "0.4.2";
version = "0.5.0";
src = fetchFromGitHub {
owner = "yonahd";
repo = pname;
rev = "v${version}";
hash = "sha256-fyVMRHDzP7od+cwC01vNP/TOiDctD8E0y8uNWtgiEeA=";
hash = "sha256-5x0Zyk4gPMKcZtpgT0QbIm6NeWX+uJwT2NM+yS2oC3o=";
};
vendorHash = "sha256-NPmsXS7P+pCF97N8x3nQhCRoHJLMO5plNtcUqxxexVE=";
vendorHash = "sha256-9aZy1i0VrDRySt5A5aQHBXa0mPgD+rsyeqQrd6snWKc=";
preCheck = ''
HOME=$(mktemp -d)

View File

@ -22,9 +22,9 @@
}:
stdenv.mkDerivation (self: {
pname = "louvre";
version = "2.0.0-1";
version = "2.1.0-1";
rev = "v${self.version}";
hash = "sha256-tDpgFtccMlGYrahEC4vlj5cfIzkqUl664ccRhcKIVTQ=";
hash = "sha256-qRvAryZ6SIhh5yDugcosVYOM2Tq0XPuaA6ib8/jWxNI=";
src = fetchFromGitHub {
inherit (self) rev hash;

View File

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "mdsh";
version = "0.8.0";
version = "0.9.0";
src = fetchFromGitHub {
owner = "zimbatm";
repo = "mdsh";
rev = "v${version}";
hash = "sha256-ammLbKEKXDSuZMr4DwPpcRSkKh7BzNC+4ZRCqTNNCQk=";
hash = "sha256-vN8nFhbZgJIhFuFET9IOmdxT7uBKq/9X+TO9lZsDw6g=";
};
cargoHash = "sha256-wLHMccxk3ceZyGK27t5Kyal48yj9dQNgmEHjH9hR9Pc=";
cargoHash = "sha256-0D1RSUJw7fszc9d4nrp+zCzr9l0xF4Ed8DbK5/O5bEY=";
meta = with lib; {
description = "Markdown shell pre-processor";

View File

@ -7,7 +7,7 @@
nix-update-script,
}:
let
version = "2.4.3";
version = "2.4.4";
in
python3.pkgs.buildPythonApplication {
pname = "novelwriter";
@ -18,7 +18,7 @@ python3.pkgs.buildPythonApplication {
owner = "vkbo";
repo = "novelWriter";
rev = "v${version}";
hash = "sha256-PuoI/2JnbOFuSDTY3uDrySqPl/MGYna+QvSI7WQ8QMk=";
hash = "sha256-vYvrSRQTp/8jcCQIL6HgxdSJwogiPJKfVO+9hhK6emc=";
};
nativeBuildInputs = [ qt5.wrapQtAppsHook ];

View File

@ -0,0 +1,111 @@
{ stdenv
, lib
, fetchgit
, fetchzip
, python310
, rtlcss
, wkhtmltopdf
, nixosTests
, odoo_version ? "17.0"
, odoo_release ? "20240610"
}:
let
python = python310.override {
packageOverrides = final: prev: {
# requirements.txt fixes docutils at 0.17; the default 0.21.1 tested throws exceptions
docutils-0_17 = prev.docutils.overridePythonAttrs (old: rec {
version = "0.17";
src = fetchgit {
url = "git://repo.or.cz/docutils.git";
rev = "docutils-${version}";
hash = "sha256-O/9q/Dg1DBIxKdNBOhDV16yy5ez0QANJYMjeovDoWX8=";
};
buildInputs = with prev; [setuptools];
});
};
};
in python.pkgs.buildPythonApplication rec {
pname = "odoo";
version = "${odoo_version}.${odoo_release}";
format = "setuptools";
src = fetchzip {
# find latest version on https://nightly.odoo.com/${odoo_version}/nightly/src
url = "https://nightly.odoo.com/${odoo_version}/nightly/src/odoo_${version}.zip";
name = "${pname}-${version}";
hash = "sha256-blibGJyaz+MxMazOXhPbGBAJWZoGubirwSnjVYyLBJs="; # odoo
};
# needs some investigation
doCheck = false;
makeWrapperArgs = [
"--prefix" "PATH" ":" "${lib.makeBinPath [ wkhtmltopdf rtlcss ]}"
];
propagatedBuildInputs = with python.pkgs; [
babel
chardet
cryptography
decorator
docutils-0_17 # sphinx has a docutils requirement >= 18
ebaysdk
freezegun
gevent
greenlet
idna
jinja2
libsass
lxml
markupsafe
num2words
ofxparse
passlib
pillow
polib
psutil
psycopg2
pydot
pyopenssl
pypdf2
pyserial
python-dateutil
python-ldap
python-stdnum
pytz
pyusb
qrcode
reportlab
requests
rjsmin
urllib3
vobject
werkzeug
xlrd
xlsxwriter
xlwt
zeep
setuptools
mock
];
# takes 5+ minutes and there are not files to strip
dontStrip = true;
passthru = {
updateScript = ./update.sh;
tests = {
inherit (nixosTests) odoo;
};
};
meta = with lib; {
description = "Open Source ERP and CRM";
homepage = "https://www.odoo.com/";
license = licenses.lgpl3Only;
maintainers = with maintainers; [ mkg20001 siriobalmelli ];
};
}

26
pkgs/by-name/od/odoo/update.sh Executable file
View File

@ -0,0 +1,26 @@
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p curl gnused nix coreutils nix-prefetch
set -euo pipefail
VERSION="17.0" # must be incremented manually
RELEASE="$(
curl "https://nightly.odoo.com/$VERSION/nightly/src/" |
sed -nE 's/.*odoo_'"$VERSION"'.(20[0-9]{6}).tar.gz.*/\1/p' |
tail -n 1
)"
latestVersion="$VERSION.$RELEASE"
currentVersion=$(nix-instantiate --eval -E "with import ./. {}; odoo.version or (lib.getVersion odoo)" | tr -d '"')
if [[ "$currentVersion" == "$latestVersion" ]]; then
echo "odoo is up-to-date: $currentVersion"
exit 0
fi
cd "$(dirname "${BASH_SOURCE[0]}")"
sed -ri "s| hash.+ # odoo| hash = \"$(nix-prefetch -q fetchzip --url "https://nightly.odoo.com/${VERSION}/nightly/src/odoo_${latestVersion}.zip")\"; # odoo|g" package.nix
sed -ri "s|, odoo_version \? .+|, odoo_version ? \"$VERSION\"|" package.nix
sed -ri "s|, odoo_release \? .+|, odoo_release ? \"$RELEASE\"|" package.nix

View File

@ -23,6 +23,9 @@ let
inherit version;
hash = "sha256-K4wORHtLnbzIXdl7butNy69si2w74L1lTiVVPgohV9g=";
};
disabledTests = old.disabledTests ++ [
"test_response_body"
];
});
};
};
@ -99,7 +102,6 @@ in python.pkgs.buildPythonApplication rec {
dontStrip = true;
passthru = {
updateScript = ./update.sh;
tests = {
inherit (nixosTests) odoo;
};

View File

@ -11,17 +11,17 @@
rustPlatform.buildRustPackage rec {
pname = "openpgp-card-tools";
version = "0.11.0";
version = "0.11.2";
src = fetchFromGitea {
domain = "codeberg.org";
owner = "openpgp-card";
repo = "openpgp-card-tools";
rev = "v${version}";
hash = "sha256-GKBli6ybMDqB105POFEocU2X/xvd56V87k6Y6BsNt18=";
hash = "sha256-4PRUBzVy1sb15sYsbitBrOfQnsdbGKoR2OA4EjSc8B8=";
};
cargoHash = "sha256-mLZErQhgRWDMdDC5tWjG9NCvLaSdF4A3uCdN8+QMWjU=";
cargoHash = "sha256-Jm1181WQfYZPKnu0f2om/hxkJ8Bm5AA/3IwBgZkpF0I=";
nativeBuildInputs = [ pkg-config rustPlatform.bindgenHook ];

View File

@ -8,16 +8,16 @@
buildNpmPackage rec {
pname = "redocly";
version = "1.14.0";
version = "1.15.0";
src = fetchFromGitHub {
owner = "Redocly";
repo = "redocly-cli";
rev = "@redocly/cli@${version}";
hash = "sha256-R5GSkRbe7GpdQ9y3PvRcWcl27HgEJMHyOLgR0zVF6jA=";
hash = "sha256-qGjFueL05f7DgDa0/B+w1Ix2tRx7PicMneub2sWJ7Gw=";
};
npmDepsHash = "sha256-o1Z8v/LR77TUKufv60B/P4XWR7Ebf0PTX7ee3YgjnBs=";
npmDepsHash = "sha256-pO1ewVInuPCLDk2V4HRqOCFmT1VTVa/qRkJ5rxREWMU=";
npmBuildScript = "prepare";

View File

@ -150,9 +150,10 @@ stdenv.mkDerivation (finalAttrs: {
mesonFlags =
(lib.mapAttrsToList lib.mesonEnable {
"cava" = cavaSupport;
"cava" = cavaSupport && lib.asserts.assertMsg sndioSupport "Sndio support is required for Cava";
"dbusmenu-gtk" = traySupport;
"jack" = jackSupport;
"libevdev" = evdevSupport;
"libinput" = inputSupport;
"libnl" = nlSupport;
"libudev" = udevSupport;

View File

@ -0,0 +1,105 @@
{
lib,
stdenv,
buildGoModule,
fetchFromGitHub,
installShellFiles,
btrfs-progs,
testers,
werf,
}:
buildGoModule rec {
pname = "werf";
version = "2.6.1";
src = fetchFromGitHub {
owner = "werf";
repo = "werf";
rev = "v${version}";
hash = "sha256-10RyCVF1w5xj/qhFXQTlyrt9HG/4di2fUwUtDHU6t44=";
};
vendorHash = "sha256-d1Dn+JN8tiBVx7YDbtvLW0YgIW2ENrEdx4gKatYy1hw=";
proxyVendor = true;
subPackages = [ "cmd/werf" ];
nativeBuildInputs = [ installShellFiles ];
buildInputs =
lib.optionals stdenv.isLinux [ btrfs-progs ]
++ lib.optionals stdenv.hostPlatform.isGnu [ stdenv.cc.libc.static ];
CGO_ENABLED = if stdenv.isLinux then 1 else 0;
ldflags =
[
"-s"
"-w"
"-X github.com/werf/werf/v2/pkg/werf.Version=v${version}"
]
++ lib.optionals (CGO_ENABLED == 1) [
"-extldflags=-static"
"-linkmode external"
];
tags =
[
"containers_image_openpgp"
"dfrunmount"
"dfrunnetwork"
"dfrunsecurity"
"dfssh"
]
++ lib.optionals (CGO_ENABLED == 1) [
"cni"
"exclude_graphdriver_devicemapper"
"netgo"
"no_devmapper"
"osusergo"
"static_build"
];
preCheck =
''
# Test all targets.
unset subPackages
# Remove tests that require external services.
rm -rf \
integration/suites \
pkg/true_git/*test.go \
test/e2e
''
+ lib.optionalString (CGO_ENABLED == 0) ''
# A workaround for osusergo.
export USER=nixbld
'';
postInstall = ''
installShellCompletion --cmd werf \
--bash <($out/bin/werf completion --shell=bash) \
--zsh <($out/bin/werf completion --shell=zsh)
'';
passthru.tests.version = testers.testVersion {
package = werf;
command = "werf version";
version = src.rev;
};
meta = with lib; {
description = "GitOps delivery tool";
mainProgram = "werf";
longDescription = ''
The CLI tool gluing Git, Docker, Helm & Kubernetes with any CI system to
implement CI/CD and Giterminism.
'';
homepage = "https://werf.io";
changelog = "https://github.com/werf/werf/releases/tag/${src.rev}";
license = licenses.asl20;
maintainers = with maintainers; [ azahi ];
};
}

View File

@ -1,19 +1,18 @@
{ lib, buildGoPackage, fetchFromGitHub }:
{ lib, buildGoModule, fetchFromGitHub }:
buildGoPackage rec {
buildGoModule {
pname = "xmonad-log";
version = "0.1.0";
goPackagePath = "github.com/xintron/xmonad-log";
version = "0.1.0-unstable-2024-06-14";
src = fetchFromGitHub {
owner = "xintron";
repo = "xmonad-log";
rev = version;
sha256 = "1il6v0zcjw0pfb1hjj198y94jmlcx255h422ph0f1zr7afqkzmaw";
rev = "70c76d59c22cf5f412467cd42fa9ff34eeb2bd1b";
sha256 = "sha256-hDYb3mSX2+FX/2uazCKPXmNj0avDlutwSMjST7wLBVY=";
};
goDeps = ./deps.nix;
vendorHash = "sha256-58zK6t3rb+19ilaQaNgsMVFQBYKPIV40ww8klrGbpnw=";
proxyVendor = true;
meta = with lib; {
description = "xmonad DBus monitoring solution";

View File

@ -13,13 +13,13 @@
stdenv.mkDerivation rec {
pname = "bulky";
version = "3.2";
version = "3.3";
src = fetchFromGitHub {
owner = "linuxmint";
repo = "bulky";
rev = version;
hash = "sha256-Zt5J8+CYiPxp/e1wDaJp7R91vYJmGNqPQs39J/OIwiQ=";
hash = "sha256-S4wAcwlJnXHYQEnP9WApCTjvVHKMrAt7gQ2l8zvFrs0=";
};
nativeBuildInputs = [

View File

@ -31,13 +31,13 @@
stdenv.mkDerivation rec {
pname = "pix";
version = "3.4.0";
version = "3.4.1";
src = fetchFromGitHub {
owner = "linuxmint";
repo = pname;
rev = version;
sha256 = "sha256-XXt5tq+Zfm6fqorsFAWV3guii6gTK5JRgw26GkNkoos=";
sha256 = "sha256-QkgjUzoBOXE3mxXy/Lq3YkHq7f9oE97FeP7PHIBDHvc=";
};
nativeBuildInputs = [

View File

@ -27,13 +27,13 @@
stdenv.mkDerivation rec {
pname = "xviewer";
version = "3.4.4";
version = "3.4.5";
src = fetchFromGitHub {
owner = "linuxmint";
repo = pname;
rev = version;
sha256 = "sha256-Kr3GoroQUzOePJiYeJYE9wrqWKcfX7ncu3tZSxOdnvU=";
sha256 = "sha256-J6KDkGPbcRBofsJVmd+1IEapSfSd3ftjz0AggvBI8ck=";
};
nativeBuildInputs = [

View File

@ -69,10 +69,9 @@ buildPythonPackage rec {
rm tests/TaskDistantPdshMixin.py
rm tests/TaskDistantPdshTest.py
rm tests/TaskRLimitsTest.py
rm tests/TreeGatewayTest.py
nosetests -v \
-e test_channel_ctl_shell_remote1 \
-e test_channel_ctl_shell_remote2 \
-e test_fromall_grouplist \
-e test_rank_placeholder \
-e test_engine_on_the_fly_launch \
@ -92,9 +91,6 @@ buildPythonPackage rec {
-e testClushConfigSetRlimit \
-e testTimerInvalidateInHandler \
-e testTimerSetNextFireInHandler \
-e test_channel_ctl_shell_mlocal1 \
-e test_channel_ctl_shell_mlocal2 \
-e test_channel_ctl_shell_mlocal3 \
-e test_node_placeholder \
tests/*.py
'';

View File

@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "dunamai";
version = "1.19.2";
version = "1.20.0";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "mtkennerly";
repo = "dunamai";
rev = "refs/tags/v${version}";
hash = "sha256-oLJlBytdp9uVdKEdYDMz/IYnPP7XVnCUcThKO3IiW10=";
hash = "sha256-K7G5BiUm8QTRbw0W3ebTld7CAZI8sYSnRsD7vQhCptE=";
};
nativeBuildInputs = [ poetry-core ];

View File

@ -21,14 +21,14 @@
buildPythonPackage rec {
pname = "oauthenticator";
version = "16.3.0";
version = "16.3.1";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-QMddGJUfafXoBxMCjlx1lH45a4Bab3AP4j8Px7JxYaQ=";
hash = "sha256-gFhhOCcmorkrLxrup9fICh5ueCrc64fxfuZXTQG1tMk=";
};
postPatch = ''

View File

@ -3,7 +3,6 @@
buildPythonPackage,
fetchFromGitHub,
pythonOlder,
pythonRelaxDepsHook,
poetry-core,
httpx,
pydicom,
@ -11,30 +10,25 @@
buildPythonPackage rec {
pname = "pyorthanc";
version = "1.16.1";
version = "1.18.0";
disabled = pythonOlder "3.8";
format = "pyproject";
pyproject = true;
src = fetchFromGitHub {
owner = "gacou54";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-6l3L0YUAqedyRjlQ6K3SaAMdGK2C0AeKpJj6MyXi4RA=";
hash = "sha256-ObZjTiEB4a7ForsugzKZDdIsTEWOX1zbv53ZJ4AllHE=";
};
nativeBuildInputs = [
pythonRelaxDepsHook
poetry-core
];
build-system = [ poetry-core ];
propagatedBuildInputs = [
dependencies = [
httpx
pydicom
];
pythonRelaxDeps = [ "httpx" ];
doCheck = false; # requires orthanc server (not in Nixpkgs)
pythonImportsCheck = [ "pyorthanc" ];

View File

@ -5,6 +5,7 @@
fetchFromGitHub,
pdm-backend,
huggingface-hub,
numpy,
pyyaml,
safetensors,
torch,
@ -16,22 +17,23 @@
buildPythonPackage rec {
pname = "timm";
version = "1.0.3";
version = "1.0.7";
pyproject = true;
disabled = pythonOlder "3.7";
disabled = pythonOlder "3.8";
src = fetchFromGitHub {
owner = "huggingface";
repo = "pytorch-image-models";
rev = "refs/tags/v${version}";
hash = "sha256-h2J1v2zXUMGRKBBqq+RnxrXKOzlD5RRrVoODWSuj9Ms=";
hash = "sha256-0o88gOZvHXblGPwyRIz2D3sD7wdg0J0knrAFlognEOY=";
};
build-system = [ pdm-backend ];
dependencies = [
huggingface-hub
numpy
pyyaml
safetensors
torch

View File

@ -2,7 +2,7 @@
lib,
buildPythonPackage,
fetchPypi,
setuptools-scm,
setuptools,
pythonOlder,
numpy,
jsonschema,
@ -11,20 +11,21 @@
buildPythonPackage rec {
pname = "tskit";
version = "0.5.6";
format = "pyproject";
version = "0.5.7";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-3f4hPxywY822mCF3IwooBezX38fM1zAm4Th4q//SzkY=";
hash = "sha256-yD+2W1tzzi+5wFoZrqNe+jJLpWyx6ZILBgKivDE+wiM=";
};
nativeBuildInputs = [ setuptools-scm ];
build-system = [ setuptools ];
propagatedBuildInputs = [
numpy
dependencies = [
jsonschema
numpy
svgwrite
];
@ -34,11 +35,11 @@ buildPythonPackage rec {
pythonImportsCheck = [ "tskit" ];
meta = with lib; {
meta = {
description = "Tree sequence toolkit";
mainProgram = "tskit";
homepage = "https://github.com/tskit-dev/tskit";
license = licenses.mit;
maintainers = with maintainers; [ alxsimon ];
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ alxsimon ];
};
}

View File

@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
pname = "codeql";
version = "2.17.4";
version = "2.17.5";
dontConfigure = true;
dontBuild = true;
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
src = fetchzip {
url = "https://github.com/github/codeql-cli-binaries/releases/download/v${version}/codeql.zip";
hash = "sha256-4BfIu81e/XR23Kp8+b6/KRbuji2Od53a1urcyjXX1q8=";
hash = "sha256-Ay+8NOYq1sBIDhCoju2/L8Ghegmxz5NmtpBLb0hqH/E=";
};
nativeBuildInputs = [

View File

@ -2,14 +2,14 @@
rustPlatform.buildRustPackage rec {
pname = "dprint";
version = "0.46.2";
version = "0.46.3";
src = fetchCrate {
inherit pname version;
sha256 = "sha256-P7q2WLTGydC652N4jvTiF7hm4HRmSWnRv9+AuxRoC5Y=";
sha256 = "sha256-IyhKxCqLyboEZINalI6bd///sUxWvmWlQVrzMA2sNdU=";
};
cargoHash = "sha256-xmMFqqADIwIII+arW9gZyf95yXOkBMDRDOaG0Nay7hQ=";
cargoHash = "sha256-46t6Y2UuRCAnvOhEPLgYN+fHHtJYxuflRT3DClLTDQk=";
buildInputs = lib.optionals stdenv.isDarwin [ CoreFoundation Security ];

View File

@ -7,16 +7,16 @@
buildGoModule rec {
pname = "operator-sdk";
version = "1.34.2";
version = "1.35.0";
src = fetchFromGitHub {
owner = "operator-framework";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-vVa1ljPRSHSo7bVqPkRt/jbuSlzLmnVaLnyreskwOrM=";
hash = "sha256-KalG1DLhvXEjNAOeP79BMYvI74j6nKnDkOYubIJ0Shs=";
};
vendorHash = "sha256-YspUrnSS6d8Ta8dmUjx9A5D/V5Bqm08DQJrRBaIGyQg=";
vendorHash = "sha256-TuDbQoC9at3yQikGTfsAKJ5kc/naqLqfHEwXLOv+12A=";
nativeBuildInputs = [
makeWrapper

View File

@ -2,11 +2,11 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "twilio-cli";
version = "5.20.1";
version = "5.21.0";
src = fetchzip {
url = "https://twilio-cli-prod.s3.amazonaws.com/twilio-v${finalAttrs.version}/twilio-v${finalAttrs.version}.tar.gz";
hash = "sha256-tS30wEXUhzPUPh5gY+UZF274/EOfwMGU19glXUrDuw0=";
hash = "sha256-rtI89baKJS4itwTcHY9IjKeskQO6mz/c746wdVy4cG4=";
};
buildInputs = [ nodejs-slim ];

View File

@ -12,7 +12,7 @@
}:
stdenvNoCC.mkDerivation rec {
version = "1.1.13";
version = "1.1.14";
pname = "bun";
src = passthru.sources.${stdenvNoCC.hostPlatform.system} or (throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}");
@ -51,19 +51,19 @@ stdenvNoCC.mkDerivation rec {
sources = {
"aarch64-darwin" = fetchurl {
url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-aarch64.zip";
hash = "sha256-pg6nL+brc1B7GyBt8Y/FFqdBKt8uTw9KhNqITYbdi5A=";
hash = "sha256-JKUAmUW/Lh78RUZBOk1cXLpMrhxskXW6BO+WcYanWFs=";
};
"aarch64-linux" = fetchurl {
url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-aarch64.zip";
hash = "sha256-18iAnXEELi+YvRVs1PP1MqZPeROVVl4T+qu2izyE4s0=";
hash = "sha256-kBkzOLG8O4OvjwKHiDiYFEvAe3QtDJDdoGKvMzSY5wA=";
};
"x86_64-darwin" = fetchurl {
url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-x64.zip";
hash = "sha256-NeYGWYG3kRevI0CIShe4AHJzLRDV9cFbiaP7lpZO18A=";
hash = "sha256-zDngJ0zTRCQqufNmGRjwzi+77K4TpP6C/2lVqA4yEI0=";
};
"x86_64-linux" = fetchurl {
url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-x64.zip";
hash = "sha256-QC6dsWjRYiuBIojxPvs8NFMSU6ZbXbZ9Q/+u+45NmPc=";
hash = "sha256-LCfBxZMR+DI9HDvk3ZCJGFPtev+4U9AcxY/qDYbpOuA=";
};
};
updateScript = writeShellScript "update-bun" ''
@ -92,7 +92,7 @@ stdenvNoCC.mkDerivation rec {
lgpl21Only # javascriptcore and webkit
];
mainProgram = "bun";
maintainers = with maintainers; [ DAlperin jk thilobillerbeck cdmistman coffeeispower ];
maintainers = with maintainers; [ DAlperin jk thilobillerbeck cdmistman coffeeispower diogomdp ];
platforms = builtins.attrNames passthru.sources;
# Broken for Musl at 2024-01-13, tracking issue:
# https://github.com/NixOS/nixpkgs/issues/280716

View File

@ -13,16 +13,16 @@
}:
rustPlatform.buildRustPackage rec {
pname = "deno";
version = "1.44.2";
version = "1.44.3";
src = fetchFromGitHub {
owner = "denoland";
repo = pname;
rev = "v${version}";
hash = "sha256-Q76j1cbRL52jmmkpTZMkpP3/FCeGZqKYAN819mQY9BE=";
hash = "sha256-KSCHVoKZiInxsnM+2sgyl87Wz9K9mjGjT4356m3+haY=";
};
cargoHash = "sha256-UtnHOzlko5RUAbohwU755BDLSF/Rx20vabaKokEsRLU=";
cargoHash = "sha256-/ZxCM8/xLccOzzU5gfX0eC/DJwgqFngXM3cg+F/ZFAM=";
postPatch = ''
# upstream uses lld on aarch64-darwin for faster builds

View File

@ -9,18 +9,18 @@
rustPlatform.buildRustPackage rec {
pname = "ferium";
version = "4.6.0";
version = "4.7.0";
src = fetchFromGitHub {
owner = "gorilla-devs";
repo = pname;
rev = "v${version}";
hash = "sha256-a4bX5pC3FSCswvUG1wFeo3e6F+CmyfYowv7OhF2DZss=";
hash = "sha256-jj3BdaxH7ofhHNF2eu+burn6+/0bPQQZ8JfjXAFyN4A=";
};
buildInputs = lib.optionals stdenv.isDarwin [ Security SystemConfiguration ];
cargoHash = "sha256-CyDFBSTdUjapMtb6cNOEV53wTJDWotdSZZgHAQpsa9I=";
cargoHash = "sha256-dysKHi6CqPrF/q7LPn1+TwOP3p2KwauhTuqLCda3OSs=";
# Disable the GUI file picker so that GTK/XDG dependencies aren't used
buildNoDefaultFeatures = true;

View File

@ -1,7 +1,7 @@
{
"testing": {
"version": "6.10-rc3",
"hash": "sha256:11kjvjww4n0l4knq1v4rsbnac4s01r69yk1lrb9hgikszxyjklwk"
"version": "6.10-rc4",
"hash": "sha256:1cx7c25fa8pvabhwph0rdqdryalxgl7rs1ry0v4k048bxpisvahf"
},
"6.1": {
"version": "6.1.94",

View File

@ -6,7 +6,7 @@
, ... } @ args:
let
version = "5.15.158-rt76"; # updated by ./update-rt.sh
version = "5.15.160-rt77"; # updated by ./update-rt.sh
branch = lib.versions.majorMinor version;
kversion = builtins.elemAt (lib.splitString "-" version) 0;
in buildLinux (args // {
@ -19,14 +19,14 @@ in buildLinux (args // {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz";
sha256 = "1inmdpif3qf1blmvjj4i7y42bylvhv0wyj3b0apq12zxlj1iq1zr";
sha256 = "018v19a7rhzc4szybzzn86jlnk42x7jm6xkadfd2d3xq6f7727pl";
};
kernelPatches = let rt-patch = {
name = "rt";
patch = fetchurl {
url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";
sha256 = "17kw7cs1p0qgqf911prn3472c1j7r01g0mzqxsxpkdvhawxps7wy";
sha256 = "0id4m1k1xq84bxgnchm8r2iwfqw6nacv5n1ksgyzj6q6v66ik3wk";
};
}; in [ rt-patch ] ++ kernelPatches;

View File

@ -58,10 +58,6 @@ let
patches = [
./patch/cmake-includedir.patch
# Fix build with libxml 2.12 and Clang 16.
# https://github.com/MariaDB/server/pull/2983
./patch/0001-Fix-build-with-libxml2-2.12.patch
]
# Fixes a build issue as documented on
# https://jira.mariadb.org/browse/MDEV-26769?focusedCommentId=206073&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-206073
@ -248,29 +244,31 @@ in
# see https://mariadb.org/about/#maintenance-policy for EOLs
mariadb_105 = self.callPackage generic {
# Supported until 2025-06-24
version = "10.5.23";
hash = "sha256-P3wzsgjLeZ2wFKh09WcY6t/yLulXgfo2Cqa8aWEJrP4=";
# TODO should be removed
version = "10.5.25";
hash = "sha256-lhnQ9R6GQ1dGayxjMBo0pT99/ZnxjE/UUvqyK/Obpk4=";
inherit (self.darwin) cctools;
inherit (self.darwin.apple_sdk.frameworks) CoreServices;
};
mariadb_106 = self.callPackage generic {
# Supported until 2026-07-06
version = "10.6.16";
hash = "sha256-Xvg4Q+eW3Nqa6keyRpDd9thI9D9D4R+dmgzCHHj7uc8=";
version = "10.6.18";
hash = "sha256-aJihER9HEwcJ4ouix70aV+S7VxAfbhCeWX1R5tOFzxg=";
inherit (self.darwin) cctools;
inherit (self.darwin.apple_sdk.frameworks) CoreServices;
};
mariadb_1011 = self.callPackage generic {
# Supported until 2028-02-16
version = "10.11.6";
hash = "sha256-HAFjRj6Y1x9HgHQWEaQJge7ivETTkmAcpJu/lI0E3Wc=";
version = "10.11.8";
hash = "sha256-XwTz4z2fHL7/BeecVNQdMCYwUAyZWu5ysGOOL5383w8=";
inherit (self.darwin) cctools;
inherit (self.darwin.apple_sdk.frameworks) CoreServices;
};
mariadb_110 = self.callPackage generic {
# Supported until 2024-06-07
version = "11.0.4";
hash = "sha256-J2ls3zEVnyJUEOtchmW4VkWhxZmBzlr2vP9sll/u3ms=";
# TODO should be removed
version = "11.0.6";
hash = "sha256-AYnWKUbDfG20a/GkaLqVgLy6joDwWVjsSDwzh+zPmgA=";
inherit (self.darwin) cctools;
inherit (self.darwin.apple_sdk.frameworks) CoreServices;
};

View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "traefik";
version = "3.0.2";
version = "3.0.3";
# Archive with static assets for webui
src = fetchzip {
url = "https://github.com/traefik/traefik/releases/download/v${version}/traefik-v${version}.src.tar.gz";
hash = "sha256-h/LN++Jw8Yr08uH5T2Br1YVJtiAToI/1k4YDxqmFCZQ=";
hash = "sha256-vjY8sbNkY/kdQiJ020iUWxIVzxkmpkeLhxBThc6tUuE=";
stripRoot = false;
};
vendorHash = "sha256-XVRVrfraI7lQOrQKv0L557903hwZXlzI+9/tpXnAlW0=";
vendorHash = "sha256-rvo3nw9yUfikO82cy6BbukwqwBSrUCCEta3nKBprCbk=";
subPackages = [ "cmd/traefik" ];

View File

@ -9,16 +9,16 @@
buildGoModule rec {
pname = "qovery-cli";
version = "0.94.11";
version = "0.94.13";
src = fetchFromGitHub {
owner = "Qovery";
repo = "qovery-cli";
rev = "refs/tags/v${version}";
hash = "sha256-2p3KUIu3L78X2/i5B6+RoMmoyG5vqg8RWDXeUYlpqwU=";
hash = "sha256-LFVl4IlLoJyOdHv0rqL2GfUvLpp/8qT951fQkW8MHy4=";
};
vendorHash = "sha256-OKerPm5odNWCD5AqfNHqcQSeWu53ZVqCbIowzf6tO9A=";
vendorHash = "sha256-qrDadHGhjwsAIfIQIkUeT7Tehv1sTtsfzgPyKxc5zJE=";
nativeBuildInputs = [ installShellFiles ];

View File

@ -13,13 +13,13 @@ in
stdenv.mkDerivation rec {
pname = "ibus-typing-booster";
version = "2.25.8";
version = "2.25.9";
src = fetchFromGitHub {
owner = "mike-fabian";
repo = "ibus-typing-booster";
rev = version;
hash = "sha256-0fjtLsIoMiI7zhaxU8RcoG4k48e02sJZvpjEBDfB/I0=";
hash = "sha256-dQifLJjgTKkFYBOJKxGXA1w97UBa0Bh56I6nRk0GVj0=";
};
nativeBuildInputs = [ autoreconfHook pkg-config wrapGAppsHook3 gobject-introspection ];

View File

@ -10,13 +10,13 @@
stdenv.mkDerivation rec {
pname = "fdupes";
version = "2.3.0";
version = "2.3.1";
src = fetchFromGitHub {
owner = "adrianlopezroche";
repo = "fdupes";
rev = "v${version}";
hash = "sha256-BW6a5vKRAuXs/zWPHhtZs6Y4scyCEfqHEAkGUSUiwkI=";
hash = "sha256-yOUgPa13DHDcuEqJMpBQVMOKFH/rlH44rWiIPRwnztM=";
};
nativeBuildInputs = [

View File

@ -5,19 +5,19 @@
rustPlatform.buildRustPackage rec {
pname = "wasm-tools";
version = "1.210.0";
version = "1.211.1";
src = fetchFromGitHub {
owner = "bytecodealliance";
repo = pname;
rev = "v${version}";
hash = "sha256-qp00/cgx2FpdBbt5CXYFD/V6SOtz7VQfRq0zJsELVuc=";
hash = "sha256-xd5/QB6/V8cyoygShmcIzUgXZNs+kBuPtKy56BSoxKo=";
fetchSubmodules = true;
};
# Disable cargo-auditable until https://github.com/rust-secure-code/cargo-auditable/issues/124 is solved.
auditable = false;
cargoHash = "sha256-jNr0oyd+8E5ppPcV5LMAbOro4ZodgskCHAhe5TgC/6I=";
cargoHash = "sha256-H3eEwVZB6xzZwW5Bvgs7yPV58QUNvLSWSDigLzs2uG0=";
cargoBuildFlags = [ "--package" "wasm-tools" ];
cargoTestFlags = [ "--all" ];

View File

@ -1,12 +0,0 @@
# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
[
{
goPackagePath = "github.com/godbus/dbus";
fetch = {
type = "git";
url = "https://github.com/godbus/dbus";
rev = "a389bdde4dd695d414e47b755e95e72b7826432c";
sha256 = "1ckvg15zdsgmbn4mi36cazkb407ixc9mmyf7vwj8b8wi3d00rgn9";
};
}
]

View File

@ -24,7 +24,7 @@
stdenv.mkDerivation rec {
pname = "libdnf";
version = "0.73.1";
version = "0.73.2";
outputs = [ "out" "dev" "py" ];
@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
owner = "rpm-software-management";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-mZCrJ1fXqKE1sMYKWHLLQEPkdLwPwqJz+8n+DlNmxvM=";
hash = "sha256-tdAbkIb3BAhNKFbjIGHEdVNwh3E1sKFLP+L4MhifsQM=";
};
nativeBuildInputs = [

View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "epub2txt2";
version = "2.06";
version = "2.07";
src = fetchFromGitHub {
owner = "kevinboone";
repo = pname;
rev = "refs/tags/v${version}";
sha256 = "sha256-zzcig5XNh9TqUHginsfoC47WrKavqi6k6ezir+OOMJk=";
sha256 = "sha256-/P81ZXhB0wyRx2bb/CO7+kTTNspYKoGUpBGLb8Yfb5I=";
};
makeFlags = [ "CC:=$(CC)" "PREFIX:=$(out)" ];

View File

@ -10,7 +10,7 @@
buildGoModule rec {
pname = "vale";
version = "3.5.0";
version = "3.6.0";
subPackages = [ "cmd/vale" ];
@ -18,7 +18,7 @@ buildGoModule rec {
owner = "errata-ai";
repo = "vale";
rev = "v${version}";
hash = "sha256-yp3jy0iEO4DHhAskp2Y56KSjTddNTcQRf+HgxKa0o9c=";
hash = "sha256-Xkea1o0ywRKIg0cMJuxQehHbgVF0SSC9VRa53FQEong=";
};
vendorHash = "sha256-OLlViQKLTark9yknnjJFiEThFtxNNjue5LUp1P/anKU=";

View File

@ -10,18 +10,18 @@
stdenv.mkDerivation (finalAttrs: {
pname = "marp-cli";
version = "3.2.0";
version = "3.4.0";
src = fetchFromGitHub {
owner = "marp-team";
repo = "marp-cli";
rev = "v${finalAttrs.version}";
hash = "sha256-bx5mq5KI85qUct/9Hr6mby6dWmRkmpVbiIw+M8PZas8=";
hash = "sha256-azscuPkQ9/xcQtBg+5pJigXSQQVtBGvbd7ZwiLwU7Qo=";
};
offlineCache = fetchYarnDeps {
yarnLock = "${finalAttrs.src}/yarn.lock";
hash = "sha256-BogCt7ezmWxv2YfhljHYoBf47/FHR0qLZosjnoQhqgs=";
hash = "sha256-b/JyhsfXEbmM6+ajrjL65WhX9u9MEH+m1NHE6cTyf2g=";
};
nativeBuildInputs = [

View File

@ -265,6 +265,7 @@ mapAliases ({
dhcp = throw "dhcp (ISC DHCP) has been removed from nixpkgs, because it reached its end of life"; # Added 2023-04-04
dibbler = throw "dibbler was removed because it is not maintained anymore"; # Added 2024-05-14
dnnl = oneDNN; # Added 2020-04-22
docker-distribution = distribution; # Added 2023-12-26
docker-machine = throw "'docker-machine' has been removed, because the upstream project was archived"; # Added 2023-12-27
docker-machine-kvm = throw "'docker-machine-kvm' has been removed, because 'docker-machine' was archived upstream and removed"; # Added 2023-12-27
docker-machine-xhyve = throw "'docker-machine-xhyve' has been removed, because 'docker-machine' was archived upstream and removed"; # Added 2023-12-27

View File

@ -5968,9 +5968,6 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) AppKit Security;
};
odoo = callPackage ../applications/finance/odoo { };
odoo15 = callPackage ../applications/finance/odoo/odoo15.nix { };
odafileconverter = libsForQt5.callPackage ../applications/graphics/odafileconverter { };
oil-buku = callPackage ../applications/misc/oil-buku { };
@ -30048,8 +30045,6 @@ with pkgs;
coursera-dl = callPackage ../applications/misc/coursera-dl { };
coyim = callPackage ../applications/networking/instant-messengers/coyim { };
cozy-drive = callPackage ../applications/networking/cozy-drive { };
cplay-ng = callPackage ../applications/audio/cplay-ng { };
@ -30203,8 +30198,6 @@ with pkgs;
docker-machine-hyperkit = callPackage ../applications/networking/cluster/docker-machine/hyperkit.nix { };
docker-machine-kvm2 = callPackage ../applications/networking/cluster/docker-machine/kvm2.nix { };
docker-distribution = callPackage ../applications/virtualization/docker/distribution.nix { };
dockfmt = callPackage ../development/tools/dockfmt { };
afterburn = callPackage ../tools/admin/afterburn { };
@ -35582,8 +35575,6 @@ with pkgs;
xmobar = haskellPackages.xmobar.bin;
xmonad-log = callPackage ../tools/misc/xmonad-log { };
xmonad-with-packages = callPackage ../applications/window-managers/xmonad/wrapper.nix {
inherit (haskellPackages) ghcWithPackages;
packages = _: [ haskellPackages.xmonad-contrib ];
@ -39328,8 +39319,9 @@ with pkgs;
kops_1_26
kops_1_27
kops_1_28
kops_1_29
;
kops = kops_1_28;
kops = kops_1_29;
lguf-brightness = callPackage ../misc/lguf-brightness { };
@ -40708,8 +40700,6 @@ with pkgs;
webwormhole = callPackage ../tools/networking/webwormhole { };
werf = callPackage ../applications/networking/cluster/werf { };
yor = callPackage ../applications/networking/cluster/yor { };
wifi-password = callPackage ../os-specific/darwin/wifi-password { };