Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
7c74352f2f
|
|
@ -4156,6 +4156,17 @@
|
|||
githubId = 16950437;
|
||||
name = "cwyc";
|
||||
};
|
||||
cybershadow = {
|
||||
name = "Vladimir Panteleev";
|
||||
email = "nixpkgs@cy.md";
|
||||
matrix = "@cybershadow:cy.md";
|
||||
github = "CyberShadow";
|
||||
githubId = 160894;
|
||||
|
||||
keys = [{
|
||||
fingerprint = "BBED 1B08 8CED 7F95 8917 FBE8 5004 F0FA D051 576D";
|
||||
}];
|
||||
};
|
||||
cynerd = {
|
||||
name = "Karel Kočí";
|
||||
email = "cynerd@email.cz";
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "f3d";
|
||||
version = "2.3.1";
|
||||
version = "2.4.0";
|
||||
|
||||
outputs = [ "out" "man" ];
|
||||
|
||||
|
|
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
|
|||
owner = "f3d-app";
|
||||
repo = "f3d";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-A6PD++wZZfVp/3hV7yefQPhxTpvpZHN0h0pRCxA6vkU=";
|
||||
hash = "sha256-mqkPegbGos38S50CoV4Qse9Z4wZ327UmIwmSrrP35uI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -63,6 +63,7 @@
|
|||
, upowerSupport ? true
|
||||
, wireplumberSupport ? true
|
||||
, withMediaPlayer ? mprisSupport && false
|
||||
, nix-update-script
|
||||
}:
|
||||
|
||||
let
|
||||
|
|
@ -189,6 +190,8 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
--prefix PYTHONPATH : "$PYTHONPATH:$out/${python3.sitePackages}"
|
||||
'';
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/alexays/waybar";
|
||||
description = "Highly customizable Wayland bar for Sway and Wlroots based compositors";
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@
|
|||
, fetchFromGitHub
|
||||
, rustPlatform
|
||||
, darwin
|
||||
, nix-update-script
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
|
|
@ -20,6 +21,8 @@ rustPlatform.buildRustPackage rec {
|
|||
|
||||
cargoHash = "sha256-HxSyGME95FWR5VwodmrMUX0jPlfE9SJV0WBbICuuTok=";
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "A simple but detailed weather indicator for Waybar using wttr.in";
|
||||
homepage = "https://github.com/bjesus/wttrbar";
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
(callPackage ./generic.nix { }) {
|
||||
channel = "edge";
|
||||
version = "24.3.4";
|
||||
sha256 = "0v9yjcy5wlkg3z9gl25s75j2irvn9jkgc542cz5w1gbc88i4b69v";
|
||||
vendorHash = "sha256-TmH3OhiSmUaKv2QPzMuzTq6wRTMu8LejE1y4Vy/tVRg=";
|
||||
version = "24.3.5";
|
||||
sha256 = "0sl4xxdsabma6q15fh0cqhgi5gmq3q2kzlw2wvcxhy78mm8qn8b0";
|
||||
vendorHash = "sha256-Oe8NMpcLGHmmlt3ceQQHHt1aV0zrWUI/TmCpyOVElCg=";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "pachyderm";
|
||||
version = "2.9.2";
|
||||
version = "2.9.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pachyderm";
|
||||
repo = "pachyderm";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-/9j7umcIffG5jAaUW/jmIX5CUD9dUq5/ZKhzbKx0Kw4=";
|
||||
hash = "sha256-4ER0kjp3H5B2TrR4pI3XMvmtGrUv5ZuSM8dbDeufm2s=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-6iwiepmzxZ4cGsPeHQDNFd2VuhmjTAX9kBdjaQPBMKU=";
|
||||
vendorHash = "sha256-+0Df3pelty9mE1E8V+4L99/SrGK5msWn68LeB0nmAIA=";
|
||||
|
||||
subPackages = [ "src/server/cmd/pachctl" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -22,14 +22,14 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pan";
|
||||
version = "0.155";
|
||||
version = "0.157";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.gnome.org";
|
||||
owner = "GNOME";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-DsoTqZLcZOc3HlpCC8rmu/rcFeHkb9IWd4PSLwxKqJI=";
|
||||
hash = "sha256-+zzAnppP6ICIhhlqXGVF4h/yIDa6oE1lxenmzcr2BQo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config gettext intltool itstool libxml2 makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -10,16 +10,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-make";
|
||||
version = "0.37.10";
|
||||
version = "0.37.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sagiegurari";
|
||||
repo = "cargo-make";
|
||||
rev = version;
|
||||
hash = "sha256-qahmRwRjwefkp21f4nsIR4THGibkQ8+20qVmQmJ7+Vk=";
|
||||
hash = "sha256-a8iNMvMB52PEFVQq4Hv3bnIrA8k5p1a5M7JBp67SUDk=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-NTi+1ULK+k1JIP7z3/3v7gPUxXgliq3i8gtJQVLDGEY=";
|
||||
cargoHash = "sha256-UrVSGxDRhD3Tm25cUYOkkf/A2mgLZAyBImu1AeNOdX4=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
|
|
|||
|
|
@ -12,16 +12,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "gitu";
|
||||
version = "0.11.0";
|
||||
version = "0.13.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "altsem";
|
||||
repo = "gitu";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-SAGihNV6lTFq0adNh7QDm7Mcg7kVCKq2IstFe965Lcc=";
|
||||
hash = "sha256-1wfc3n3uSkox2wa5i+Qiv7PZ0d2dXXbwjWw8NMXJXj8=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-RfjefPr/NuZaT56JkP1pDpH7I7K0vhIelwASEBQFJFc=";
|
||||
cargoHash = "sha256-JwNyzA6D8mIzp/+egjD2C7T9mGbcCKKtwFRXBuXMQ+U=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@
|
|||
, overrideSDK
|
||||
, darwin
|
||||
, testers
|
||||
, nix-update-script
|
||||
}:
|
||||
let
|
||||
stdenv = overrideSDK pkgs.stdenv "11.0";
|
||||
|
|
@ -41,9 +42,13 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru.tests.version = testers.testVersion {
|
||||
package = finalAttrs.finalPackage;
|
||||
version = "borders-v${finalAttrs.version}";
|
||||
passthru = {
|
||||
tests.version = testers.testVersion {
|
||||
package = finalAttrs.finalPackage;
|
||||
version = "borders-v${finalAttrs.version}";
|
||||
};
|
||||
|
||||
updateScript = nix-update-script { };
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
|
||||
let
|
||||
pname = "lefthook";
|
||||
version = "1.6.7";
|
||||
version = "1.6.8";
|
||||
in
|
||||
buildGoModule {
|
||||
inherit pname version;
|
||||
|
|
@ -15,10 +15,10 @@ buildGoModule {
|
|||
owner = "evilmartians";
|
||||
repo = "lefthook";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-4nbAT4g5tnq0bL7i9PsUKbSGoeaWHdApARYE4oWuwNk=";
|
||||
hash = "sha256-GeI2vhTRiz8krYuolUxsWvFy4TIflOvFCAaa1b7Fex0=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-b+1Y75CG4ayDmnhYfPwpzMFrHCPmZ0FMbMsLiToac5c=";
|
||||
vendorHash = "sha256-/eNhVD/9MZm1nVNmfqmLEfoySa8Krdzle2SLKpf1XlM=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,52 @@
|
|||
{
|
||||
"depends": [
|
||||
{
|
||||
"method": "fetchzip",
|
||||
"packages": [
|
||||
"checksums"
|
||||
],
|
||||
"path": "/nix/store/z6799507gzbw46lzbi1i8mwm0nbvrvnx-source",
|
||||
"ref": "v0.1.0",
|
||||
"rev": "7ff0b762332d2591bbeb65df9bb86d52ea44ec01",
|
||||
"sha256": "11612prr2wwbx414ip0zjh1fv638dgfvzxfd6v2f432n0wfwhjhj",
|
||||
"srcDir": "src",
|
||||
"url": "https://github.com/nim-lang/checksums/archive/7ff0b762332d2591bbeb65df9bb86d52ea44ec01.tar.gz"
|
||||
},
|
||||
{
|
||||
"method": "fetchzip",
|
||||
"packages": [
|
||||
"minline"
|
||||
],
|
||||
"path": "/nix/store/rirdlc80sn6pp5vmbw32xaaj56n1zxl8-source",
|
||||
"ref": "v0.1.1",
|
||||
"rev": "a1f11470316500dceb88d7d6c30979c35aab14ff",
|
||||
"sha256": "0wy8svpw0cldh1j6g5af4pxh6d6lac79sngg0i24dplh9pli7wb3",
|
||||
"srcDir": ".",
|
||||
"url": "https://github.com/h3rald/minline/archive/a1f11470316500dceb88d7d6c30979c35aab14ff.tar.gz"
|
||||
},
|
||||
{
|
||||
"method": "fetchzip",
|
||||
"packages": [
|
||||
"nimquery"
|
||||
],
|
||||
"path": "/nix/store/mys0888vyyd12h0qhzg709jk9jb6rmxa-source",
|
||||
"ref": "v2.0.1",
|
||||
"rev": "83e2866422788a1db1906734de056b410a49d047",
|
||||
"sha256": "0g1mcpfx42wnv2sg551gbgfralp7bf9fv83l2inbv2bhb063fx0z",
|
||||
"srcDir": "",
|
||||
"url": "https://github.com/GULPF/nimquery/archive/83e2866422788a1db1906734de056b410a49d047.tar.gz"
|
||||
},
|
||||
{
|
||||
"method": "fetchzip",
|
||||
"packages": [
|
||||
"zippy"
|
||||
],
|
||||
"path": "/nix/store/9iz31kiizzg76vpcc5jq53rf0wzjvbh8-source",
|
||||
"ref": "0.5.14",
|
||||
"rev": "21c8e279e257b0bc2a063b34e2304ea3aade21ec",
|
||||
"sha256": "05g7w61ql9kgrmnpm64y94lkiwj36i551c387gc71lz3dpllcn6q",
|
||||
"srcDir": "src",
|
||||
"url": "https://github.com/guzba/zippy/archive/21c8e279e257b0bc2a063b34e2304ea3aade21ec.tar.gz"
|
||||
}
|
||||
]
|
||||
}
|
||||
|
|
@ -0,0 +1,45 @@
|
|||
{ lib, buildNimPackage, fetchFromGitHub, openssl, pcre }:
|
||||
|
||||
buildNimPackage (finalAttrs: {
|
||||
pname = "min";
|
||||
version = "0.43.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "h3rald";
|
||||
repo = "min";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-4coeasFZrbwYQ6FM0ENkh/pPcvN3rCuheUpmHr1f3wM=";
|
||||
};
|
||||
|
||||
lockFile = ./lock.json;
|
||||
|
||||
buildInputs = [ openssl pcre ];
|
||||
|
||||
prePatch = ''
|
||||
# substitude our code for their code for data
|
||||
substituteInPlace min.nimble \
|
||||
--replace-fail 'import' "" \
|
||||
--replace-warn 'minpkg/core/meta' "" \
|
||||
--replace-warn 'pkgVersion' '"${finalAttrs.version}"' \
|
||||
--replace-warn 'pkgAuthor' '""' \
|
||||
--replace-warn 'pkgDescription' '""' \
|
||||
--replace-warn 'pkgName' '"${finalAttrs.pname}"' \
|
||||
|
||||
# remove vendorabilities
|
||||
find . -name '*.a' -delete
|
||||
find minpkg/lib -name '*.nim' \
|
||||
-exec sed 's|{\.passL:.*\.}|discard|g' -i {} \;
|
||||
'';
|
||||
|
||||
NIX_LDFLAGS = [ "-lpcre" ];
|
||||
|
||||
meta = {
|
||||
description =
|
||||
"A functional, concatenative programming language with a minimalist syntax";
|
||||
homepage = "https://min-lang.org/";
|
||||
license = lib.licenses.mit;
|
||||
mainProgram = "min";
|
||||
maintainers = with lib.maintainers; [ ehmry ];
|
||||
};
|
||||
|
||||
})
|
||||
|
|
@ -1,12 +0,0 @@
|
|||
diff --git a/src/pretix/_build_settings.py b/src/pretix/_build_settings.py
|
||||
index d1ea73b84..9e13cdc87 100644
|
||||
--- a/src/pretix/_build_settings.py
|
||||
+++ b/src/pretix/_build_settings.py
|
||||
@@ -49,6 +49,7 @@ HAS_MEMCACHED = False
|
||||
HAS_CELERY = False
|
||||
HAS_GEOIP = False
|
||||
SENTRY_ENABLED = False
|
||||
+LANGUAGES = ALL_LANGUAGES
|
||||
|
||||
for entry_point in entry_points(group='pretix.plugin'):
|
||||
INSTALLED_APPS.append(entry_point.module) # noqa: F405
|
||||
|
|
@ -2,7 +2,6 @@
|
|||
, buildNpmPackage
|
||||
, fetchFromGitHub
|
||||
, fetchPypi
|
||||
, fetchpatch2
|
||||
, nodejs
|
||||
, python3
|
||||
, gettext
|
||||
|
|
@ -30,13 +29,13 @@ let
|
|||
};
|
||||
|
||||
pname = "pretix";
|
||||
version = "2024.2.0";
|
||||
version = "2024.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pretix";
|
||||
repo = "pretix";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-emtF5dDXEXN8GIucHbjF+m9Vkg1Jj6nmQdHhBOkXMAs=";
|
||||
hash = "sha256-Wz1vZcqgwyS0xJgTtRxqfaJpJ1fAMhIyxvTvBT/ABSo=";
|
||||
};
|
||||
|
||||
npmDeps = buildNpmPackage {
|
||||
|
|
@ -44,7 +43,7 @@ let
|
|||
inherit version src;
|
||||
|
||||
sourceRoot = "${src.name}/src/pretix/static/npm_dir";
|
||||
npmDepsHash = "sha256-kE13dcTdWZZNHPMcHEiK0a2dEcu3Z3/q815YhaVkLbQ=";
|
||||
npmDepsHash = "sha256-2fHlEEmYzpF3SyvF7+FbwCt+zQVGF0/kslDFnJ+DQGE=";
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
|
|
@ -66,18 +65,6 @@ python.pkgs.buildPythonApplication rec {
|
|||
# Discover pretix.plugin entrypoints during build and add them into
|
||||
# INSTALLED_APPS, so that their static files are collected.
|
||||
./plugin-build.patch
|
||||
|
||||
# Configure django-statici18n to compile all available languages at
|
||||
# build time.
|
||||
./language-build.patch
|
||||
|
||||
(fetchpatch2 {
|
||||
# Allow customization of cache and log directory
|
||||
# https://github.com/pretix/pretix/pull/3997
|
||||
name = "pretix-directory-customization.patch";
|
||||
url = "https://github.com/pretix/pretix/commit/e151d1d1f08917e547df49da0779b36bb73b7294.patch";
|
||||
hash = "sha256-lO5eCKSqUaCwSm7rouMTFMwauWl9Tz/Yf0JE/IO+bnI=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
|
@ -94,13 +81,15 @@ python.pkgs.buildPythonApplication rec {
|
|||
--replace-fail psycopg2-binary psycopg2 \
|
||||
--replace-fail vat_moss_forked==2020.3.20.0.11.0 vat-moss \
|
||||
--replace-fail "bleach==5.0.*" bleach \
|
||||
--replace-fail "dnspython==2.5.*" dnspython \
|
||||
--replace-fail "dnspython==2.6.*" dnspython \
|
||||
--replace-fail "django-filter==24.1" django-filter \
|
||||
--replace-fail "importlib_metadata==7.*" importlib_metadata \
|
||||
--replace-fail "protobuf==4.25.*" protobuf \
|
||||
--replace-fail "markdown==3.6" markdown \
|
||||
--replace-fail "protobuf==5.26.*" protobuf \
|
||||
--replace-fail "pycryptodome==3.20.*" pycryptodome \
|
||||
--replace-fail "pypdf==3.9.*" pypdf \
|
||||
--replace-fail "python-dateutil==2.8.*" python-dateutil \
|
||||
--replace-fail "sentry-sdk==1.40.*" sentry-sdk \
|
||||
--replace-fail "python-dateutil==2.9.*" python-dateutil \
|
||||
--replace-fail "sentry-sdk==1.42.*" sentry-sdk \
|
||||
--replace-fail "stripe==7.9.*" stripe
|
||||
'';
|
||||
|
||||
|
|
@ -222,11 +211,6 @@ python.pkgs.buildPythonApplication rec {
|
|||
|
||||
pytestFlagsArray = [
|
||||
"--reruns" "3"
|
||||
|
||||
# tests fail when run before 4:30am
|
||||
# https://github.com/pretix/pretix/pull/3987
|
||||
"--deselect=src/tests/base/test_orders.py::PaymentReminderTests::test_sent_days"
|
||||
"--deselect=src/tests/plugins/sendmail/test_rules.py::test_sendmail_rule_specified_subevent"
|
||||
];
|
||||
|
||||
preCheck = ''
|
||||
|
|
|
|||
|
|
@ -1,33 +1,27 @@
|
|||
{ lib, stdenv, fetchFromGitHub, fuse3, macfuse-stubs, pkg-config, sqlite, pcre }:
|
||||
{ lib, stdenv, fetchFromGitHub, fuse3, macfuse-stubs, pkg-config, sqlite, pcre2 }:
|
||||
|
||||
let
|
||||
fuse = if stdenv.isDarwin then macfuse-stubs else fuse3;
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "tup";
|
||||
version = "0.7.11";
|
||||
version = "0.8";
|
||||
outputs = [ "bin" "man" "out" ];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gittup";
|
||||
repo = "tup";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Q2Y5ErcfhLChi9Wezn8+7eNXYX2UXW1fBOqEclmgzOo=";
|
||||
hash = "sha256-biVR932wHiUG56mvXoKWFzrzpkclbW9RWM4vY1+OMZ0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ fuse pcre sqlite ];
|
||||
buildInputs = [ fuse pcre2 sqlite ];
|
||||
|
||||
patches = [ ./fusermount-setuid.patch ];
|
||||
|
||||
configurePhase = ''
|
||||
substituteInPlace src/tup/link.sh --replace '`git describe' '`echo ${version}'
|
||||
|
||||
for f in Tupfile Tuprules.tup src/tup/server/Tupfile build.sh; do
|
||||
substituteInPlace "$f" \
|
||||
--replace "pkg-config" "${stdenv.cc.targetPrefix}pkg-config" \
|
||||
--replace "pcre-config" "${stdenv.cc.targetPrefix}pkg-config libpcre"
|
||||
done
|
||||
|
||||
cat << EOF > tup.config
|
||||
CONFIG_CC=${stdenv.cc.targetPrefix}cc
|
||||
CONFIG_AR=${stdenv.cc.targetPrefix}ar
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
{ lib
|
||||
, fetchgit
|
||||
, buildGoModule
|
||||
, unstableGitUpdater
|
||||
}:
|
||||
|
||||
buildGoModule {
|
||||
|
|
@ -20,6 +21,8 @@ buildGoModule {
|
|||
"-w"
|
||||
];
|
||||
|
||||
passthru.updateScript = unstableGitUpdater { };
|
||||
|
||||
meta = with lib; {
|
||||
description = "A waybar component/utility for displaying and controlling MPRIS2 compliant media players individually";
|
||||
homepage = "https://git.hrfee.pw/hrfee/waybar-mpris";
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
{ lib
|
||||
, stdenvNoCC
|
||||
, fetchFromGitHub
|
||||
, unstableGitUpdater
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation {
|
||||
|
|
@ -26,6 +27,8 @@ stdenvNoCC.mkDerivation {
|
|||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru.updateScript = unstableGitUpdater { };
|
||||
|
||||
meta = {
|
||||
description = "Soothing pastel theme for SDDM based on corners theme.";
|
||||
homepage = "https://github.com/khaneliman/sddm-catppuccin-corners";
|
||||
|
|
|
|||
|
|
@ -25,11 +25,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mate-panel";
|
||||
version = "1.28.0";
|
||||
version = "1.28.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "s70EoJTQ61vX3DOA728MSdmp1SCXM9fM17RtBmogjLo=";
|
||||
sha256 = "UTPGT1lpro7uvm6LukUN6nkssL4G2a4cNuhWnS+FJLo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libmspack";
|
||||
version = "0.10.1alpha";
|
||||
version = "0.11alpha";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.cabextract.org.uk/libmspack/${pname}-${version}.tar.gz";
|
||||
sha256 = "13janaqsvm7aqc4agjgd4819pbgqv50j88bh5kci1z70wvg65j5s";
|
||||
hash = "sha256-cN0fsvCuzDZ5G3Gh4YQOYhcweeraoIEZLRwyOg7uohs=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
|
|
|||
|
|
@ -9,14 +9,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "azure-batch";
|
||||
version = "14.1.0";
|
||||
version = "14.2.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-lhayyqYpx0ABItaF1VfrzQF5famImQgxj5pUdIQ5es0=";
|
||||
hash = "sha256-x5Jn1sPT/hShakIqtbv6vL1o7QtYtrvN+gyDRcTHhTI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -6,22 +6,21 @@
|
|||
, djangorestframework
|
||||
, pytestCheckHook
|
||||
, pytest-django
|
||||
, python
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "django-filter";
|
||||
version = "23.5";
|
||||
format = "pyproject";
|
||||
version = "24.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-Z1g6pDuR/oxJ90qDLZX02EQr5ij9TG1l6fgR9RU6Tlw=";
|
||||
hash = "sha256-SOX8HaPM1soNX5u1UJc1GM6Xek7d6dKooVSn9PC5+W4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ flit-core ];
|
||||
build-system = [ flit-core ];
|
||||
|
||||
propagatedBuildInputs = [ django ];
|
||||
dependencies = [ django ];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"django_filters"
|
||||
|
|
@ -38,7 +37,7 @@ buildPythonPackage rec {
|
|||
meta = with lib; {
|
||||
description = "Reusable Django application for allowing users to filter querysets dynamically";
|
||||
homepage = "https://github.com/carltongibson/django-filter";
|
||||
changelog = "https://github.com/carltongibson/django-filter/blob/v${version}/CHANGES.rst";
|
||||
changelog = "https://github.com/carltongibson/django-filter/blob/${version}/CHANGES.rst";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ mmai ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
, pythonOlder
|
||||
, substituteAll
|
||||
|
||||
# build
|
||||
# build-system
|
||||
, setuptools
|
||||
|
||||
# patched in
|
||||
|
|
@ -14,11 +14,11 @@
|
|||
, gdal
|
||||
, withGdal ? false
|
||||
|
||||
# propagates
|
||||
# dependencies
|
||||
, asgiref
|
||||
, sqlparse
|
||||
|
||||
# extras
|
||||
# optional-dependencies
|
||||
, argon2-cffi
|
||||
, bcrypt
|
||||
|
||||
|
|
@ -43,7 +43,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "django";
|
||||
version = "5.0.3";
|
||||
version = "5.0.4";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.10";
|
||||
|
|
@ -51,7 +51,7 @@ buildPythonPackage rec {
|
|||
src = fetchPypi {
|
||||
pname = "Django";
|
||||
inherit version;
|
||||
hash = "sha256-X7N1gNz0omL5JYwfQ3OBmqzKkGQx9QXkaI4386mRld8=";
|
||||
hash = "sha256-S9AajIMLt3qKOw59iyW4h+U2rReoG6Lc5UdhNcczEr0=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
@ -83,16 +83,16 @@ buildPythonPackage rec {
|
|||
--replace-fail "test_files" "dont_test_files"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
build-system = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dependencies = [
|
||||
asgiref
|
||||
sqlparse
|
||||
];
|
||||
|
||||
passthru.optional-dependencies = {
|
||||
optional-dependencies = {
|
||||
argon2 = [
|
||||
argon2-cffi
|
||||
];
|
||||
|
|
@ -118,7 +118,7 @@ buildPythonPackage rec {
|
|||
selenium
|
||||
tblib
|
||||
tzdata
|
||||
] ++ lib.flatten (lib.attrValues passthru.optional-dependencies);
|
||||
] ++ lib.flatten (lib.attrValues optional-dependencies);
|
||||
|
||||
doCheck = !stdenv.isDarwin;
|
||||
|
||||
|
|
|
|||
|
|
@ -10,14 +10,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "msal";
|
||||
version = "1.27.0";
|
||||
version = "1.28.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-MQlQPAOLprMHFSsOjTT5gRPy56eJhuKNC69bUwOv2lI=";
|
||||
hash = "sha256-gLur40Vny3NO/S7BhpstmBlcknRVNp2Ad7PFQgiMXJ0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "oci";
|
||||
version = "2.125.0";
|
||||
version = "2.125.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -23,7 +23,7 @@ buildPythonPackage rec {
|
|||
owner = "oracle";
|
||||
repo = "oci-python-sdk";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-H4LGMl2SuXAGD2cdaDQYkWkYqhjp+EDFOnrku6cG6jk=";
|
||||
hash = "sha256-74Y/Rr3jmq4yO78FOrDja+wQIoXom6MBpXCiv/4zA0c=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
|
|
|
|||
|
|
@ -15,14 +15,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "torchaudio";
|
||||
version = "2.2.1";
|
||||
version = "2.2.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pytorch";
|
||||
repo = "audio";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-ejgxWVIkusGi7zwg3nyAHHdjEPrFaS1TN7nN+PpSgOE=";
|
||||
hash = "sha256-rW4xLUFTpGpUeMnTBdrI/2OjgZX1ihK0EfcVK6snmpk=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ let
|
|||
};
|
||||
sources = {
|
||||
"x86_64-linux" = fetchBinary "linux-x64";
|
||||
"x86_64-darwin" = fetchBinary "macOS";
|
||||
"x86_64-darwin" = fetchBinary "osx-x64";
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
|
|
|
|||
|
|
@ -8,16 +8,16 @@
|
|||
|
||||
buildNpmPackage rec {
|
||||
pname = "firebase-tools";
|
||||
version = "13.6.0";
|
||||
version = "13.6.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "firebase";
|
||||
repo = "firebase-tools";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-69fIejqLs/27nISW7b7+kPRoUiEGQF0DSGz5nkus6Us=";
|
||||
hash = "sha256-2L1bmv47H0VXviCXTIA72+QWNIRnC4BDwXlyTB4YHnM=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-m9mAuR0lqC83uHY+b1rOLuv6bRSl9eVnYVE7pvLi9+s=";
|
||||
npmDepsHash = "sha256-Pp3AbodWh/oRfsylMs2iq6qKMIcKtXl9qFZCsCx8CZs=";
|
||||
|
||||
postPatch = ''
|
||||
ln -s npm-shrinkwrap.json package-lock.json
|
||||
|
|
|
|||
|
|
@ -6,16 +6,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "hcloud";
|
||||
version = "1.42.0";
|
||||
version = "1.43.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hetznercloud";
|
||||
repo = "cli";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-cJNCp60OZBPXtda787PDT9iInxidTvzYmf9orifmS/A=";
|
||||
hash = "sha256-czuMlnVhUDWGVbIZ0V7vaoOnT84WKPFjhcUvt5BzBXo=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-IIszQCAsNSQYieM1JQH1Dald9saUhZ2kPhwZ1p2GTp4=";
|
||||
vendorHash = "sha256-0XFgi2cPlsL4zCbttGrEsm0j5ftB8MAuphu3YNlPbIs=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
|
|
|||
|
|
@ -11,13 +11,13 @@
|
|||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "sentry-cli";
|
||||
version = "2.30.4";
|
||||
version = "2.31.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "getsentry";
|
||||
repo = "sentry-cli";
|
||||
rev = version;
|
||||
sha256 = "sha256-J+8/sCFSd2BYQgKOl8OZoxlFLB8scDY5Bl7GAQ54/RM=";
|
||||
sha256 = "sha256-2F8f+vw559FI7CCiLkP8WLpLzDYzr3SHf/Ec8yFHu6g=";
|
||||
};
|
||||
doCheck = false;
|
||||
|
||||
|
|
@ -27,7 +27,7 @@ rustPlatform.buildRustPackage rec {
|
|||
buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ CoreServices Security SystemConfiguration ];
|
||||
nativeBuildInputs = [ installShellFiles pkg-config ];
|
||||
|
||||
cargoHash = "sha256-622cEaHEMmVspabsIYgQ5ySbaDr9qB1FjxJ5NwbeGx8=";
|
||||
cargoHash = "sha256-G/c84j9BquLCJcl60H0ZZZDxjTHpaGHflfJL/hzdgYQ=";
|
||||
|
||||
postInstall = ''
|
||||
installShellCompletion --cmd sentry-cli \
|
||||
|
|
|
|||
|
|
@ -8,20 +8,18 @@ let
|
|||
|
||||
in stdenv.mkDerivation {
|
||||
pname = "snipes";
|
||||
version = "20180930";
|
||||
version = "20240317";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Davidebyzero";
|
||||
repo = "Snipes";
|
||||
rev = "594af45108e07aa4159c3babc9b5e53609c3fd6e";
|
||||
sha256 = "0gmh38swm74jmljy0bq27ipqzb4h8y9rzwc1j6harbd9qqz5knac";
|
||||
rev = "caa2ce036a9f6461ccdb7ef8306edbd126dd4081";
|
||||
sha256 = "sha256-iIoh5odCziX1cKs5qf4hJdXpUhy9kdht0YMLLfhvKZA=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substitute config-sample.h config.h \
|
||||
--replace SnipesConsole.ttf $out/share/snipes/SnipesConsole.ttf
|
||||
substituteInPlace GNUmakefile \
|
||||
--replace 'CFLAGS=-Werror -Wall' 'CFLAGS=-Wall'
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
|
@ -43,6 +41,7 @@ in stdenv.mkDerivation {
|
|||
mainProgram = "snipes";
|
||||
homepage = "https://www.vogons.org/viewtopic.php?f=7&t=49073";
|
||||
license = licenses.free; # This reverse-engineered source code is released with the original authors' permission.
|
||||
maintainers = with maintainers; [ peterhoeg ];
|
||||
maintainers = with maintainers; [ peterhoeg cybershadow ];
|
||||
broken = stdenv.isDarwin; # not supported upstream - https://github.com/Davidebyzero/Snipes/issues/8#issuecomment-433720046
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -11,6 +11,7 @@
|
|||
, MediaRemote
|
||||
, SkyLight
|
||||
, testers
|
||||
, nix-update-script
|
||||
}:
|
||||
|
||||
let
|
||||
|
|
@ -56,9 +57,13 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru.tests.version = testers.testVersion {
|
||||
package = finalAttrs.finalPackage;
|
||||
version = "sketchybar-v${finalAttrs.version}";
|
||||
passthru = {
|
||||
tests.version = testers.testVersion {
|
||||
package = finalAttrs.finalPackage;
|
||||
version = "sketchybar-v${finalAttrs.version}";
|
||||
};
|
||||
|
||||
updateScript = nix-update-script { };
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@
|
|||
, Carbon
|
||||
, Cocoa
|
||||
, testers
|
||||
, nix-update-script
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
|
|
@ -34,9 +35,13 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
substituteInPlace $out/Library/LaunchDaemons/org.nixos.skhd.plist --subst-var out
|
||||
'';
|
||||
|
||||
passthru.tests.version = testers.testVersion {
|
||||
package = finalAttrs.finalPackage;
|
||||
version = "skhd-v${finalAttrs.version}";
|
||||
passthru = {
|
||||
tests.version = testers.testVersion {
|
||||
package = finalAttrs.finalPackage;
|
||||
version = "skhd-v${finalAttrs.version}";
|
||||
};
|
||||
|
||||
updateScript = nix-update-script { };
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
|
|
|||
|
|
@ -5,16 +5,16 @@
|
|||
|
||||
buildNpmPackage rec {
|
||||
pname = "mushroom";
|
||||
version = "3.5.2";
|
||||
version = "3.5.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "piitaya";
|
||||
repo = "lovelace-mushroom";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-mVodC7IEk1Y9ppMdDRXK/8cxQkW+uaC2RzQFnMwNvTQ=";
|
||||
hash = "sha256-ppEXgVrB7C5ZrNmYyXdrnQMbTNU5rTGherNlimMqImM=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-g8A8zm7GyASOpuoxuOYGcyUVa6RBc9LGoYLqcFcT64c=";
|
||||
npmDepsHash = "sha256-4B295Wc4tj+Rhse4521sCGNv/WMrNImxZwtTFkFp14c=";
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "exoscale-cli";
|
||||
version = "1.76.2";
|
||||
version = "1.77.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "exoscale";
|
||||
repo = "cli";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-0wobPnSrKVJ61+gj3cZsNUt6hun3qa/zVoBZlP3viSk=";
|
||||
sha256 = "sha256-mUigWOFNfo/tI/2Vf3r2FWw+LHQU7vGodnXnJ6bIwAM=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
|
|
|||
|
|
@ -7,24 +7,22 @@
|
|||
, coreutils
|
||||
, git
|
||||
, pkg-config
|
||||
, qtbase
|
||||
, qtsvg
|
||||
, qttools
|
||||
, qt6
|
||||
, snapper
|
||||
, util-linux
|
||||
, wrapQtAppsHook
|
||||
, enableSnapper ? true
|
||||
, nix-update-script
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "btrfs-assistant";
|
||||
version = "1.9";
|
||||
version = "2.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "btrfs-assistant";
|
||||
repo = "btrfs-assistant";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-a854WI8f9/G/BRU5rn1FKC6WRZyXNYsUL4p258C8ppw=";
|
||||
hash = "sha256-nE8Vsc0leXWhbrjMgJDef6jl9MqdojRniGcvUmrQNUQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -35,12 +33,13 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
|
||||
buildInputs = [
|
||||
btrfs-progs
|
||||
qtbase
|
||||
qtsvg
|
||||
qttools
|
||||
qt6.qtbase
|
||||
qt6.qtsvg
|
||||
qt6.qttools
|
||||
qt6.qtwayland
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [ wrapQtAppsHook ];
|
||||
propagatedBuildInputs = [ qt6.wrapQtAppsHook ];
|
||||
|
||||
prePatch = ''
|
||||
substituteInPlace src/util/System.cpp \
|
||||
|
|
@ -78,6 +77,8 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
"--prefix PATH : ${runtimeDeps}"
|
||||
];
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "A GUI management tool to make managing a Btrfs filesystem easier";
|
||||
homepage = "https://gitlab.com/btrfs-assistant/btrfs-assistant";
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@
|
|||
, dooit
|
||||
, python3
|
||||
, testers
|
||||
, nix-update-script
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
|
|
@ -39,9 +40,13 @@ python3.pkgs.buildPythonApplication rec {
|
|||
# No tests available
|
||||
doCheck = false;
|
||||
|
||||
passthru.tests.version = testers.testVersion {
|
||||
package = dooit;
|
||||
command = "HOME=$(mktemp -d) dooit --version";
|
||||
passthru = {
|
||||
tests.version = testers.testVersion {
|
||||
package = dooit;
|
||||
command = "HOME=$(mktemp -d) dooit --version";
|
||||
};
|
||||
|
||||
updateScript = nix-update-script { };
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -7,22 +7,29 @@
|
|||
, stdenv
|
||||
, darwin
|
||||
, python3
|
||||
, perl
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "bws";
|
||||
version = "0.3.0";
|
||||
version = "0.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bitwarden";
|
||||
repo = "sdk";
|
||||
rev = "bws-v${version}";
|
||||
hash = "sha256-o+tmO9E881futhA/fN6+EX2yEBKnKUmKk/KilIt5vYY=";
|
||||
hash = "sha256-oCAyUTVAUfXBEb2K7vkYBOzcwqCsm2wxEKsYLZcfm6w=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-nmsAfXNn1nqmqHzGD7jl2JNrif/nJycCJZWZYjv7G4c=";
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"uniffi-0.25.2" = "sha256-YckrtociJV3VKGs5DJ0a1r1Cvq06S/mtr9iL1kLmAi8=";
|
||||
};
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
perl
|
||||
pkg-config
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -3563,7 +3563,7 @@ with pkgs;
|
|||
|
||||
boulder = callPackage ../tools/admin/boulder { };
|
||||
|
||||
btrfs-assistant = libsForQt5.callPackage ../tools/misc/btrfs-assistant { };
|
||||
btrfs-assistant = qt6.callPackage ../tools/misc/btrfs-assistant { };
|
||||
|
||||
btrfs-heatmap = callPackage ../tools/filesystems/btrfs-heatmap { };
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue