tjh.dev
+4
-1
nixos/modules/services/continuous-integration/woodpecker/agents.nix
+4
-1
nixos/modules/services/continuous-integration/woodpecker/agents.nix
+15
pkgs/applications/office/tagainijisho/0000-fix-cmake-min.patch
+15
pkgs/applications/office/tagainijisho/0000-fix-cmake-min.patch
···
1
+
diff --git a/CMakeLists.txt b/CMakeLists.txt
2
+
index a3816f7..81116dd 100644
3
+
--- a/CMakeLists.txt
4
+
+++ b/CMakeLists.txt
5
+
@@ -19,8 +19,8 @@ set(VERSION 1.2.2)
6
+
set(QTVERSION 5.12)
7
+
set(CMAKE_AUTOMOC ON)
8
+
9
+
-cmake_minimum_required(VERSION 2.8.12)
10
+
-cmake_policy(VERSION 2.8.12)
11
+
+cmake_minimum_required(VERSION 3.10)
12
+
+cmake_policy(VERSION 3.10)
13
+
14
+
find_package(Qt5 ${QTVERSION} REQUIRED COMPONENTS Core Widgets PrintSupport Network LinguistTools)
15
+
+5
pkgs/applications/office/tagainijisho/default.nix
+5
pkgs/applications/office/tagainijisho/default.nix
+3
-3
pkgs/by-name/gi/git-statuses/package.nix
+3
-3
pkgs/by-name/gi/git-statuses/package.nix
···
13
13
14
14
rustPlatform.buildRustPackage (finalAttrs: {
15
15
pname = "git-statuses";
16
-
version = "0.6.1";
16
+
version = "0.6.2";
17
17
18
18
src = fetchFromGitHub {
19
19
owner = "bircni";
20
20
repo = "git-statuses";
21
21
tag = finalAttrs.version;
22
-
hash = "sha256-phGEp9wo46owe47H+XjfDD5OlcN8cGr1oaeYMpkWies=";
22
+
hash = "sha256-ZjlLpPFd+T3NIK2lrzaCfNI7308n3wOco+scGJhxFNI=";
23
23
};
24
24
25
-
cargoHash = "sha256-yG5oSwnhoFVbwdTteRgW1ljVmTnxoh8l4gG/pGuRmic=";
25
+
cargoHash = "sha256-30WX9dCvrjvPUhn2oIn6unAWEkTB8U2mCEXmixYVIkk=";
26
26
27
27
# Needed to get openssl-sys to use pkg-config.
28
28
env.OPENSSL_NO_VENDOR = 1;
+49
pkgs/by-name/pg/pgit/package.nix
+49
pkgs/by-name/pg/pgit/package.nix
···
1
+
{
2
+
lib,
3
+
buildGoModule,
4
+
fetchFromGitHub,
5
+
runCommand,
6
+
git, # for passthru tests
7
+
pgit, # for passthru tests
8
+
}:
9
+
10
+
buildGoModule (finalAttrs: {
11
+
pname = "pgit";
12
+
version = "1.1.0";
13
+
14
+
src = fetchFromGitHub {
15
+
owner = "picosh";
16
+
repo = "pgit";
17
+
rev = "v${finalAttrs.version}";
18
+
hash = "sha256-81ZiaY973+mGnYbDX+6fhe9NTYjQhWsvdpW0v42pasw=";
19
+
};
20
+
21
+
vendorHash = "sha256-in8GVcOlGsvmcbegJmYwvE0AVJhVJ83x1v3ymV0uTpg=";
22
+
23
+
passthru.tests.smoke =
24
+
runCommand "pgit-smoke-test"
25
+
{
26
+
buildInputs = [ git ];
27
+
}
28
+
''
29
+
${lib.getExe git} init -b smoke
30
+
${lib.getExe git} config --local user.name "Nick Spackages"
31
+
${lib.getExe git} config --local user.email "nixbld@localhost"
32
+
echo "Read me please" > README
33
+
${lib.getExe git} add README
34
+
${lib.getExe git} commit -m "First commit"
35
+
${lib.getExe pgit} -desc "The description" -revs smoke -repo . -out ./public
36
+
grep "The description" ./public/index.html
37
+
grep "First commit" ./public/logs/smoke/index.html
38
+
grep "Read me please" ./public/tree/smoke/item/README.html
39
+
touch $out
40
+
'';
41
+
42
+
meta = with lib; {
43
+
description = "static site generator for git";
44
+
homepage = "https://pgit.pico.sh/";
45
+
license = licenses.mit;
46
+
mainProgram = "pgit";
47
+
maintainers = with maintainers; [ jaculabilis ];
48
+
};
49
+
})
+10
-10
pkgs/by-name/ra/radarr/deps.json
+10
-10
pkgs/by-name/ra/radarr/deps.json
···
98
98
},
99
99
{
100
100
"pname": "Microsoft.AspNetCore.Cryptography.Internal",
101
-
"version": "8.0.16",
102
-
"hash": "sha256-uw/5GAPpefPeMrfG69EBOVciSHxBKs0E8Txkf+rttzs="
101
+
"version": "8.0.17",
102
+
"hash": "sha256-CS/I8fajxwimZC2WNpN5ai/hEVU6Pk4El8hKNr/QgfU="
103
103
},
104
104
{
105
105
"pname": "Microsoft.AspNetCore.Cryptography.KeyDerivation",
106
-
"version": "8.0.16",
107
-
"hash": "sha256-Zpt7vlY0xdrk/6XDRtXb0t9MK6SiPP6sr3fC6gQ1/YQ="
106
+
"version": "8.0.17",
107
+
"hash": "sha256-fXjTm7dua1WoGVSkGX6swTFvsNwdhAJvI3Y6onrR3p4="
108
108
},
109
109
{
110
110
"pname": "Microsoft.Bcl.AsyncInterfaces",
···
599
599
},
600
600
{
601
601
"pname": "Polly",
602
-
"version": "8.5.2",
603
-
"hash": "sha256-IrN06ddOIJ0VYuVefe3LvfW0kX20ATRQkEBg9CBomRA="
602
+
"version": "8.6.0",
603
+
"hash": "sha256-wlvYcfcOExa3LopwRFO4axW682jkUZvioHe+kznspHk="
604
604
},
605
605
{
606
606
"pname": "Polly.Contrib.WaitAndRetry",
···
609
609
},
610
610
{
611
611
"pname": "Polly.Core",
612
-
"version": "8.5.2",
613
-
"hash": "sha256-PAwsWqrCieCf/7Y87fV7XMKoaY2abCQNtI+4oyyMifk="
612
+
"version": "8.6.0",
613
+
"hash": "sha256-NEGMMQ+3+i4ytsGekKfP1trUe0mRZP7MV0eBiSFXHW8="
614
614
},
615
615
{
616
616
"pname": "RestSharp",
···
970
970
},
971
971
{
972
972
"pname": "SixLabors.ImageSharp",
973
-
"version": "3.1.9",
974
-
"hash": "sha256-sB1wGc419iqT+Stm+RFMFhBy3LM0YnHhrgmhYiGlf4Q="
973
+
"version": "3.1.11",
974
+
"hash": "sha256-MlRF+3SGfahbsB1pZGKMOrsfUCx//hCo7ECrXr03DpA="
975
975
},
976
976
{
977
977
"pname": "Swashbuckle.AspNetCore.Annotations",
+5
-5
pkgs/by-name/ra/radarr/package.nix
+5
-5
pkgs/by-name/ra/radarr/package.nix
···
21
21
applyPatches,
22
22
}:
23
23
let
24
-
version = "5.26.2.10099";
24
+
version = "5.28.0.10274";
25
25
# The dotnet8 compatibility patches also change `yarn.lock`, so we must pass
26
26
# the already patched lockfile to `fetchYarnDeps`.
27
27
src = applyPatches {
···
29
29
owner = "Radarr";
30
30
repo = "Radarr";
31
31
tag = "v${version}";
32
-
hash = "sha256-7tU9oxE1F/dcR5bwb/qHyux3WA6lEwdozLloDgOMVbU=";
32
+
hash = "sha256-iETtSByI9VjZdVjFHdfDcfSHUGz5Es8K8/HiB99KUqc=";
33
33
};
34
34
postPatch = ''
35
35
mv src/NuGet.config NuGet.Config
···
41
41
# However, the patches cleanly apply to v5 as well.
42
42
(fetchpatch {
43
43
name = "dotnet8-compatibility";
44
-
url = "https://github.com/Radarr/Radarr/commit/490891c63de589604bdc3373cfc85068c3826648.patch";
45
-
hash = "sha256-SCP7MPUkEZLSrls8ouekSXpXdgAJTwNFPirHjaMkQ6s=";
44
+
url = "https://github.com/Radarr/Radarr/commit/2235823af313ea1f39fd1189b69a75fc5d380c41.patch";
45
+
hash = "sha256-3YgQV4xc2i5DNWp2KxVz6M5S8n//a/Js7pckGZ06fWc=";
46
46
})
47
47
(fetchpatch {
48
48
name = "dotnet8-darwin-compatibility";
49
-
url = "https://github.com/Radarr/Radarr/commit/f38a129289c49a242d8901dc2f041f9dc8bfc303.patch";
49
+
url = "https://github.com/Radarr/Radarr/commit/2a886fb26a70b4d48a4ad08d7ee23e5e4d81f522.patch";
50
50
hash = "sha256-SAMUHqlSj8FPq20wY8NWbRytVZXTPtMXMfM3CoM8kSA=";
51
51
})
52
52
];
+2
-2
pkgs/by-name/sg/sgt-puzzles/package.nix
+2
-2
pkgs/by-name/sg/sgt-puzzles/package.nix
···
18
18
19
19
stdenv.mkDerivation (finalAttrs: {
20
20
pname = "sgt-puzzles";
21
-
version = "20250926.e00cb46";
21
+
version = "20251011.d928126";
22
22
23
23
src = fetchurl {
24
24
url = "http://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-${finalAttrs.version}.tar.gz";
25
-
hash = "sha256-CsMrhYpaTRMz364kt5b/bCY67PCoYwS50Fxw8mi2QCY=";
25
+
hash = "sha256-/Iazd5voyNRocz68qILv5NoytZehKFX40a2vr+7YKqE=";
26
26
};
27
27
28
28
sgt-puzzles-menu = fetchurl {
+2
-2
pkgs/by-name/tr/tremotesf/package.nix
+2
-2
pkgs/by-name/tr/tremotesf/package.nix
···
12
12
13
13
stdenv.mkDerivation (finalAttrs: {
14
14
pname = "tremotesf";
15
-
version = "2.8.2";
15
+
version = "2.9.0";
16
16
17
17
src = fetchFromGitHub {
18
18
owner = "equeim";
19
19
repo = "tremotesf2";
20
20
tag = finalAttrs.version;
21
-
hash = "sha256-o6GSuRKO2LNpaFUuSu6VUeZN/blfpsz/piE7RZ47YfI=";
21
+
hash = "sha256-0nqdCf0rRPEf8O5ZuC2uYLSJavXIDhhiB3sNMryP3Jg=";
22
22
# We need this for src/libtremotesf
23
23
fetchSubmodules = true;
24
24
};
+4
-1
pkgs/by-name/wo/woodpecker-plugin-git/package.nix
+4
-1
pkgs/by-name/wo/woodpecker-plugin-git/package.nix
···
38
38
changelog = "https://github.com/woodpecker-ci/plugin-git/releases/tag/${version}";
39
39
license = lib.licenses.asl20;
40
40
mainProgram = "plugin-git";
41
-
maintainers = with lib.maintainers; [ ambroisie ];
41
+
maintainers = with lib.maintainers; [
42
+
ambroisie
43
+
marcusramberg
44
+
];
42
45
};
43
46
}
+5
-1
pkgs/development/interpreters/ruby/default.nix
+5
-1
pkgs/development/interpreters/ruby/default.nix
···
57
57
}:
58
58
let
59
59
ver = version;
60
+
isCross = stdenv.buildPlatform != stdenv.hostPlatform;
60
61
# https://github.com/ruby/ruby/blob/v3_2_2/yjit.h#L21
61
62
yjitSupported =
62
-
stdenv.hostPlatform.isx86_64 || (!stdenv.hostPlatform.isWindows && stdenv.hostPlatform.isAarch64);
63
+
!isCross
64
+
&& (
65
+
stdenv.hostPlatform.isx86_64 || (!stdenv.hostPlatform.isWindows && stdenv.hostPlatform.isAarch64)
66
+
);
63
67
rubyDrv = lib.makeOverridable (
64
68
{
65
69
stdenv,
+2
-5
pkgs/development/python-modules/google-cloud-audit-log/default.nix
+2
-5
pkgs/development/python-modules/google-cloud-audit-log/default.nix
···
4
4
fetchPypi,
5
5
googleapis-common-protos,
6
6
protobuf,
7
-
pythonOlder,
8
7
setuptools,
9
8
}:
10
9
11
10
buildPythonPackage rec {
12
11
pname = "google-cloud-audit-log";
13
-
version = "0.3.2";
12
+
version = "0.3.3";
14
13
pyproject = true;
15
14
16
-
disabled = pythonOlder "3.7";
17
-
18
15
src = fetchPypi {
19
16
pname = "google_cloud_audit_log";
20
17
inherit version;
21
-
hash = "sha256-JZjxUzp9fN1se/RIwS5VGcHVMWLXh4ThC83R32d5G8M=";
18
+
hash = "sha256-zKeB4fG1SY3xgyoLaDqZ6GwAsxAVu77vMAI4H3qWpj8=";
22
19
};
23
20
24
21
build-system = [ setuptools ];
+2
-2
pkgs/development/python-modules/iamdata/default.nix
+2
-2
pkgs/development/python-modules/iamdata/default.nix
···
8
8
9
9
buildPythonPackage rec {
10
10
pname = "iamdata";
11
-
version = "0.1.202510101";
11
+
version = "0.1.202510121";
12
12
pyproject = true;
13
13
14
14
src = fetchFromGitHub {
15
15
owner = "cloud-copilot";
16
16
repo = "iam-data-python";
17
17
tag = "v${version}";
18
-
hash = "sha256-/w2DDDjrEGwskvtP0v3w+xKNDCoJpeVQpHS38jFnfE8=";
18
+
hash = "sha256-JmVT8miQXDV9QZCj3IhYNFY5Bdn8Du13vM6jtiENYO4=";
19
19
};
20
20
21
21
build-system = [ hatchling ];
+2
-2
pkgs/development/python-modules/pyoverkiz/default.nix
+2
-2
pkgs/development/python-modules/pyoverkiz/default.nix
···
16
16
17
17
buildPythonPackage rec {
18
18
pname = "pyoverkiz";
19
-
version = "1.18.2";
19
+
version = "1.19.0";
20
20
pyproject = true;
21
21
22
22
disabled = pythonOlder "3.11";
···
25
25
owner = "iMicknl";
26
26
repo = "python-overkiz-api";
27
27
tag = "v${version}";
28
-
hash = "sha256-kGcDZp1oLkjHy/+iAdnsAceSY+jX9+hw3mFxCaT18YA=";
28
+
hash = "sha256-Iur39lUkHBd0VaP5YB36o04D8aY371BeSZ07iN7A9Wk=";
29
29
};
30
30
31
31
build-system = [ hatchling ];
+1
pkgs/development/tools/continuous-integration/woodpecker/common.nix
+1
pkgs/development/tools/continuous-integration/woodpecker/common.nix
+2
-2
pkgs/servers/sql/postgresql/ext/pg_partman.nix
+2
-2
pkgs/servers/sql/postgresql/ext/pg_partman.nix
···
7
7
8
8
postgresqlBuildExtension (finalAttrs: {
9
9
pname = "pg_partman";
10
-
version = "5.2.4";
10
+
version = "5.3.0";
11
11
12
12
src = fetchFromGitHub {
13
13
owner = "pgpartman";
14
14
repo = "pg_partman";
15
15
tag = "v${finalAttrs.version}";
16
-
hash = "sha256-i/o+JZEXnJRO17kfdTw87aca28+I8pvuFZsPMA/kf+w=";
16
+
hash = "sha256-Lib7UY06qjv95ndwx3sjPBcL5MtsLNx8IVOpZ1CgDG8=";
17
17
};
18
18
19
19
meta = {