Compare commits

...

112 commits

Author SHA1 Message Date
Gaétan Lepage
7501049bfe
python3Packages.skorch: disable package on darwin (#415117) 2025-06-09 09:59:00 +02:00
Gaétan Lepage
b155f2ea5a
python3Packages.jupytext: 1.17.1 -> 1.17.2 (#414849) 2025-06-09 09:57:03 +02:00
Aleksana
143d71f8ec
xarchiver: enable on darwin (#413440) 2025-06-09 15:52:55 +08:00
Aleksana
9012f9a52a
icewm: enable on darwin (#413470) 2025-06-09 15:52:28 +08:00
Ivan Mincik
db1256acbb
geoserver: 2.27.0 -> 2.27.1 (#415077) 2025-06-09 09:38:08 +02:00
Aleksana
0b35f05269
submit50: init at 3.2.0 (#412429) 2025-06-09 15:09:50 +08:00
Aleksana
0d7af97789
ubootVisionFive2: init (#414583) 2025-06-09 15:05:32 +08:00
Fabian Affolter
89a8851be7
python3Packages.python-bsblan: 1.2.2 -> 2.1.0 (#414828) 2025-06-09 08:56:45 +02:00
Fabian Affolter
c6bbb9f1e7
python3Packages.llama-cloud-services: 0.6.23 -> 0.6.28 (#414265) 2025-06-09 08:55:50 +02:00
Fabian Affolter
9fe18d232d
quark-engine: 25.5.1 -> 25.6.1 (#415069) 2025-06-09 08:55:21 +02:00
Fabian Affolter
41a20e0fa4
greenmask: 0.2.11 -> 0.2.12 (#415098) 2025-06-09 08:54:53 +02:00
Fabian Affolter
93a6c6c5d3
python3Packages.mkdocstrings-python: 1.16.11 -> 1.16.12 (#415141) 2025-06-09 08:54:34 +02:00
Aleksana
0b1cd15004
dqlite: refactor (#414919) 2025-06-09 14:51:58 +08:00
Fabian Affolter
7bcba8f93e
prowler: 5.7.2 -> 5.7.3 (#415004) 2025-06-09 08:51:21 +02:00
Fabian Affolter
599163c2f5
jwt-hack: 1.2.0 -> 2.0.0 (#415003) 2025-06-09 08:50:56 +02:00
Aleksana
ed2f18fd2d
kaidan: move to by-name and clean-up (#414446) 2025-06-09 14:49:01 +08:00
Pol Dellaiera
1000c0cf52
soundsource: 5.8.2 -> 5.8.3 (#412929) 2025-06-09 08:46:53 +02:00
Pol Dellaiera
5253e7c6cb
server-box: init at 1.0.1130-unstable-2025-04-25 (#404483) 2025-06-09 08:44:50 +02:00
Pol Dellaiera
00b900367b
crypto-org-wallet: 0.1.1 -> 1.5.1 (#399621) 2025-06-09 08:44:28 +02:00
Aleksana
9fb01a41d7
gcdemu: fix tray icon on wayland (#415194) 2025-06-09 14:30:57 +08:00
Doron Behar
101d1dbf26
harlequin: 2.0.0 -> 2.1.2 (#409007) 2025-06-09 09:12:01 +03:00
nixpkgs-merge-bot[bot]
05bf45e09b
lib60870: 2.3.5 -> 2.3.6 (#415189)
Co-authored-by: stv0g <post@steffenvogel.de>
2025-06-09 06:09:57 +00:00
Aleksana
cc0f2673ae
codec2: revert mark cross as broken (#414971) 2025-06-09 14:02:55 +08:00
Aleksana
e5c43553bb
logdy: fix hash (#414924) 2025-06-09 13:56:11 +08:00
Aleksana
e8a52d0c59
wechat-uos: Fix icon missing on GNOME (#413506) 2025-06-09 13:49:13 +08:00
Aleksana
6cba901465
dnstake: fix build (#414918) 2025-06-09 13:44:04 +08:00
Aleksana
2382728eaf
apt-dater: fix build (#414933) 2025-06-09 13:32:06 +08:00
Aleksana
682fb1eb2f
openttd: clean up derivation, fix cross-compilation (#413072) 2025-06-09 13:29:58 +08:00
Lan Tian
15392a8760
gcdemu: fix tray icon on wayland 2025-06-08 22:18:13 -07:00
Aleksana
ac300460e0
scite: 5.5.6 -> 5.5.7 (#415010) 2025-06-09 13:16:54 +08:00
Aleksana
5fe0b01c64
lazpaint: 7.2.2-unstable-2024-01-23 → 7.3 (#412180) 2025-06-09 13:13:43 +08:00
dotlambda
a24c4ed7c3
python3Packages.netbox-routing: 0.3.0 -> 0.3.1 (#415187) 2025-06-08 22:07:33 -07:00
nixpkgs-merge-bot[bot]
ac47709a2c
cura-appimage: 5.10.0 -> 5.10.1 (#415127)
Co-authored-by: pbek <patrizio@bekerle.com>
2025-06-09 05:01:45 +00:00
dotlambda
cc0499fcea
python3Packages.google-genai: 1.17.0 -> 1.19.0 (#415185) 2025-06-08 21:57:55 -07:00
nixpkgs-merge-bot[bot]
9c354530b5
amp-cli: 0.0.1748865683-g71e54e -> 0.0.1749297687-g3e4f54 (#414759)
Co-authored-by: keegancsmith <keegancsmith@users.noreply.github.com>
2025-06-09 04:55:17 +00:00
R. Ryantm
8896c64c22 lib60870: 2.3.5 -> 2.3.6 2025-06-09 04:45:05 +00:00
R. Ryantm
7b29c2d399 androidStudioPackages.canary: 2025.1.2.2 -> 2025.1.2.4 2025-06-09 09:59:51 +05:30
R. Ryantm
73440b7693 python3Packages.netbox-routing: 0.3.0 -> 0.3.1 2025-06-09 04:27:50 +00:00
nixpkgs-merge-bot[bot]
33b17b2581
boxflat: 1.31.0 -> 1.32.0 (#415179)
Co-authored-by: DaRacci <me@racci.dev>
2025-06-09 04:25:21 +00:00
R. Ryantm
72fc0cff08 python3Packages.google-genai: 1.17.0 -> 1.19.0 2025-06-09 04:16:47 +00:00
Peder Bergebakken Sundt
0a81508bd9
fwupd-efi: 1.6 -> 1.7 (#414593) 2025-06-09 05:31:57 +02:00
Peder Bergebakken Sundt
df86b2cbe7
vale: 3.11.2 -> 3.12.0 (#415173) 2025-06-09 05:28:36 +02:00
Martin Weinelt
bf7b973a2d
docs/language-frameworks/python: clarify how to best comment on disabled tests (#415167) 2025-06-09 05:15:37 +02:00
Peder Bergebakken Sundt
2c8348cc4a fwupd-efi: avoid using pname 2025-06-09 05:04:29 +02:00
R. Ryantm
f267d06cf7 boxflat: 1.31.0 -> 1.32.0 2025-06-09 03:01:44 +00:00
Peder Bergebakken Sundt
de180a3a29
python3Packages.gotify: stdenv.isDarwin -> stdenv.buildPlatform.isDarwin (#413978) 2025-06-09 04:56:40 +02:00
R. Ryantm
36ca75f247 vale: 3.11.2 -> 3.12.0 2025-06-09 02:30:54 +00:00
Peder Bergebakken Sundt
c92582fcbb docs/language-frameworks/python: clarify how to best comment on disabled tests 2025-06-09 04:26:55 +02:00
Yt
5682734cc3
python313Packages.pdfminer-six: 20240706 -> 20250506 (#409226) 2025-06-08 22:03:05 -04:00
nixpkgs-merge-bot[bot]
eaea8aa7df
newelle: 0.9.7 -> 0.9.8 (#415159)
Co-authored-by: emaryn <emaryn@users.noreply.github.com>
2025-06-09 02:02:53 +00:00
Yt
ee0e8c57c4
tailwindcss-language-server: 0.14.19 -> 0.14.21 (#415134) 2025-06-08 21:59:42 -04:00
dotlambda
e9761a0d66
python3Packages.aioimmich: 0.9.0 -> 0.9.1 (#415158) 2025-06-08 18:47:27 -07:00
dotlambda
b5ebffa131
python3Packages.aioamazondevices: 3.0.5 -> 3.0.6 (#415153) 2025-06-08 18:38:12 -07:00
R. Ryantm
c9390a5353 newelle: 0.9.7 -> 0.9.8 2025-06-09 01:26:51 +00:00
nixpkgs-merge-bot[bot]
9ce178796e
pkgsite: 0-unstable-2025-05-23 -> 0-unstable-2025-06-08 (#415133)
Co-authored-by: phanirithvij <madlad@duck.com>
2025-06-09 01:23:22 +00:00
R. Ryantm
2c0310577e python3Packages.aioimmich: 0.9.0 -> 0.9.1 2025-06-09 01:18:52 +00:00
nixpkgs-merge-bot[bot]
8752156693
plasma-panel-colorizer: 4.2.0 -> 4.3.0 (#414908)
Co-authored-by: HeitorAugustoLN <IAm.HeitorALN@proton.me>
2025-06-09 00:57:08 +00:00
R. Ryantm
12c07adcba python3Packages.aioamazondevices: 3.0.5 -> 3.0.6 2025-06-09 00:45:41 +00:00
dotlambda
8e2c624ef4
python3Packages.pdoc: 15.0.3 -> 15.0.4 (#414572) 2025-06-08 17:44:37 -07:00
Peder Bergebakken Sundt
047f31d25b
eukleides: unbreak, switch to mirror; texinfo4: drop (#415009) 2025-06-09 02:04:50 +02:00
emaryn
b6007ceed5 python313Packages.pdfplumber: 0.11.5 -> 0.11.6
Diff: https://github.com/jsvine/pdfplumber/compare/refs/tags/v0.11.5...refs/tags/v0.11.6

Changelog: https://github.com/jsvine/pdfplumber/releases/tag/v0.11.6
2025-06-09 08:03:06 +08:00
emaryn
2747c473cc python313Packages.pdfminer-six: 20240706 -> 20250506 2025-06-09 08:03:06 +08:00
Peder Bergebakken Sundt
450f24c394
_2048-cli{,-curses,-terminal}: drop (#414622) 2025-06-09 01:54:36 +02:00
R. Ryantm
4fca7dcdaf python3Packages.mkdocstrings-python: 1.16.11 -> 1.16.12 2025-06-08 23:52:37 +00:00
Gaetan Lepage
5c4ede54b4 python3Packages.skorch: disable package on darwin 2025-06-09 01:06:38 +02:00
R. Ryantm
07440544a9 tailwindcss-language-server: 0.14.19 -> 0.14.21 2025-06-08 22:41:49 +00:00
R. Ryantm
5905967b3a pkgsite: 0-unstable-2025-05-23 -> 0-unstable-2025-06-08 2025-06-08 22:39:19 +00:00
David Hagege
74799e9308
harlequin: 2.0.0 -> 2.1.2 2025-06-09 00:31:29 +02:00
Gaetan Lepage
dd23a4ec89 python3Packages.jupyter-book: skip flaky test 2025-06-09 00:15:50 +02:00
R. Ryantm
eb0af68971 cura-appimage: 5.10.0 -> 5.10.1 2025-06-08 22:10:50 +00:00
R. Ryantm
5eb7eb17f0 python3Packages.jupytext: 1.17.1 -> 1.17.2 2025-06-09 00:06:39 +02:00
R. Ryantm
a91a66d4ca greenmask: 0.2.11 -> 0.2.12 2025-06-08 19:33:52 +00:00
Nikolay Korotkiy
8d8285253b
geoserver: modernize 2025-06-08 23:22:29 +04:00
David Hagege
50e7996cfa
harlequin: Add tree-sitter-sql as dependency 2025-06-08 21:00:20 +02:00
Sigmanificient
7abdffe2fb logdy: fix hash 2025-06-08 20:53:32 +02:00
R. Ryantm
e64838938a geoserver: 2.27.0 -> 2.27.1 2025-06-08 17:32:01 +00:00
R. Ryantm
35cbcbb8e8 quark-engine: 25.5.1 -> 25.6.1 2025-06-08 16:54:31 +00:00
Jared Biel
b25e4397da fwupd-efi: 1.6 -> 1.7 2025-06-08 11:06:30 -05:00
Fabian Affolter
e38a23bc14 jwt-hack: 1.2.0 -> 2.0.0
Changelog: https://github.com/hahwul/jwt-hack/releases/tag/v2.0.0
2025-06-08 15:10:43 +02:00
Petr Zahradnik
a4ad6a2686 texinfo4: drop 2025-06-08 14:42:36 +02:00
R. Ryantm
5b31e8bfef scite: 5.5.6 -> 5.5.7 2025-06-08 12:37:39 +00:00
Petr Zahradnik
055b892a4f eukleides: unbreak, switch to mirror 2025-06-08 14:36:32 +02:00
Fabian Affolter
8cf5bf4561 prowler: 5.7.2 -> 5.7.3
Diff: https://github.com/prowler-cloud/prowler/compare/refs/tags/5.7.2...refs/tags/5.7.3

Changelog: https://github.com/prowler-cloud/prowler/releases/tag/5.7.3
2025-06-08 14:06:25 +02:00
phanirithvij
f1b5c16260 codec2: revert mark cross as broken
This reverts commit bd00d7fafb.
2025-06-08 15:39:28 +05:30
Sizhe Zhao
3bd0085ec5
apt-dater: fix build 2025-06-08 15:17:54 +08:00
Sizhe Zhao
7836a555c3
dqlite: avoid with lib; 2025-06-08 13:22:27 +08:00
Sizhe Zhao
aec172c0df
dqlite: use finalAttrs 2025-06-08 13:21:37 +08:00
Sizhe Zhao
3079f2814c
dnstake: fix build 2025-06-08 13:10:40 +08:00
R. Ryantm
5349cc6661 plasma-panel-colorizer: 4.2.0 -> 4.3.0 2025-06-08 03:54:21 +00:00
Peder Bergebakken Sundt
edbdd96122 python3Packages.pdoc: 15.0.3 -> 15.0.4
Changelog: https://github.com/mitmproxy/pdoc/blob/v15.0.4/CHANGELOG.md
2025-06-08 05:05:09 +02:00
R. Ryantm
69cc10fe0c python3Packages.python-bsblan: 1.2.2 -> 2.1.0 2025-06-07 19:07:20 +00:00
R. Ryantm
5350889704 amp-cli: 0.0.1748865683-g71e54e -> 0.0.1749297687-g3e4f54 2025-06-07 14:36:53 +00:00
Nikolay Korotkiy
6cad81fed5
lazpaint: 7.2.2-unstable-2024-01-23 → 7.3 2025-06-07 18:26:55 +04:00
aleksana
c0ffafcd56 _2048-cli{,-curses,-terminal}: drop 2025-06-07 10:26:43 +08:00
Jakob Leifhelm
319feec0a2 ubootVisionFive2: init 2025-06-06 17:22:25 +03:00
Sizhe Zhao
209dc6172e
kaidan: avoid with lib; 2025-06-06 15:25:32 +08:00
Sizhe Zhao
1001a577e6
kaidan: use finalAttrs 2025-06-06 15:25:32 +08:00
Sizhe Zhao
ee862a54b7
kaidan: move to by-name 2025-06-06 15:25:32 +08:00
R. Ryantm
9c48df34df python3Packages.llama-cloud-services: 0.6.23 -> 0.6.28 2025-06-05 15:36:02 +00:00
Peder Bergebakken Sundt
835f60e578 python3Packages.gotify: stdenv.isDarwin -> stdenv.buildPlatform.isDarwin 2025-06-04 18:57:28 +02:00
Ihar Hrachyshka
b08ea14f5e xarchiver: enable on darwin
Signed-off-by: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
2025-06-03 22:35:37 -04:00
Bu Kun
4bdc2a156d
wechat-uos: Fix icon missing on GNOME 2025-06-03 15:39:00 +08:00
Ihar Hrachyshka
5957890e5b icewm: modernize
Signed-off-by: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
2025-06-02 23:29:26 -04:00
Ihar Hrachyshka
55bd133882 icewm: enable on darwin
Signed-off-by: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>

XXX

Signed-off-by: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
2025-06-02 23:17:53 -04:00
Stefan Frijters
17effa31a8
openttd: fix cross-compilation 2025-06-02 21:33:50 +02:00
Stefan Frijters
045f0b2c79
openttd: remove dependency on nlohmann_json
This was vendored from ba67f39db6 onwards.
2025-06-02 01:40:18 +02:00
Stefan Frijters
2aa44cba7f
openttd: modernize derivation 2025-06-02 01:40:18 +02:00
Stefan Frijters
da907856cb
openttd: remove unused flags 2025-06-02 01:13:23 +02:00
DontEatOreo
fe0bdbbfd3
soundsource: 5.8.2 -> 5.8.3 2025-06-01 15:45:39 +03:00
Ethan Carter Edwards
1607bc4319
submit50: init at 3.2.0
Signed-off-by: Ethan Carter Edwards <ethan@ethancedwards.com>
2025-05-30 14:10:54 -04:00
emaryn
f248446f9b server-box: init at 1.0.1130-unstable-2025-04-25 2025-05-06 04:38:04 +08:00
emaryn
6778147565 crypto-org-wallet: 0.1.1 -> 1.5.1 2025-04-18 08:05:27 +08:00
61 changed files with 4034 additions and 473 deletions

View file

@ -2180,7 +2180,8 @@ The following rules are desired to be respected:
* Make sure the tests are enabled using for example [`pytestCheckHook`](#using-pytestcheckhook) and, in the case of * Make sure the tests are enabled using for example [`pytestCheckHook`](#using-pytestcheckhook) and, in the case of
libraries, are passing for all interpreters. If certain tests fail they can be libraries, are passing for all interpreters. If certain tests fail they can be
disabled individually. Try to avoid disabling the tests altogether. In any disabled individually. Try to avoid disabling the tests altogether. In any
case, when you disable tests, leave a comment explaining why. case, when you disable tests, leave a comment explaining not only _what_ the failure
is but _why_ the test failure can be ignored for safe distribution with nixpkgs.
* `pythonImportsCheck` is set. This is still a good smoke test even if `pytestCheckHook` is set. * `pythonImportsCheck` is set. This is still a good smoke test even if `pytestCheckHook` is set.
* `meta.platforms` takes the default value in many cases. * `meta.platforms` takes the default value in many cases.
It does not need to be set explicitly unless the package requires a specific platform. It does not need to be set explicitly unless the package requires a specific platform.

View file

@ -24,8 +24,8 @@ let
sha256Hash = "sha256-tPRTDFyKGPR1DKuJRBcwjWjNxylS/8Zv/Nd6vBmcujg="; sha256Hash = "sha256-tPRTDFyKGPR1DKuJRBcwjWjNxylS/8Zv/Nd6vBmcujg=";
}; };
latestVersion = { latestVersion = {
version = "2025.1.2.2"; # "Android Studio Narwhal Feature Drop | 2025.1.2 Canary 2" version = "2025.1.2.4"; # "Android Studio Narwhal Feature Drop | 2025.1.2 Canary 4"
sha256Hash = "sha256-zQ3PK9Fq8iYocSRFsYXNrnJ34QJGUkQoLtSNhFA2Ido="; sha256Hash = "sha256-MhonmDupcXGvwWUB+p/9AkqxCP9+j8a7D1bCseEu8GY=";
}; };
in in
{ {

View file

@ -9,6 +9,7 @@
intltool, intltool,
adwaita-icon-theme, adwaita-icon-theme,
gdk-pixbuf, gdk-pixbuf,
libappindicator-gtk3,
}: }:
python3Packages.buildPythonApplication { python3Packages.buildPythonApplication {
@ -35,6 +36,7 @@ python3Packages.buildPythonApplication {
libnotify libnotify
adwaita-icon-theme adwaita-icon-theme
gdk-pixbuf gdk-pixbuf
libappindicator-gtk3
]; ];
propagatedBuildInputs = with python3Packages; [ pygobject3 ]; propagatedBuildInputs = with python3Packages; [ pygobject3 ];

View file

@ -5,7 +5,7 @@
"packages": { "packages": {
"": { "": {
"dependencies": { "dependencies": {
"@sourcegraph/amp": "^0.0.1748865683-g71e54e" "@sourcegraph/amp": "^0.0.1749297687-g3e4f54"
} }
}, },
"node_modules/@colors/colors": { "node_modules/@colors/colors": {
@ -29,9 +29,9 @@
} }
}, },
"node_modules/@sourcegraph/amp": { "node_modules/@sourcegraph/amp": {
"version": "0.0.1748865683-g71e54e", "version": "0.0.1749297687-g3e4f54",
"resolved": "https://registry.npmjs.org/@sourcegraph/amp/-/amp-0.0.1748865683-g71e54e.tgz", "resolved": "https://registry.npmjs.org/@sourcegraph/amp/-/amp-0.0.1749297687-g3e4f54.tgz",
"integrity": "sha512-ZiNbIbgCb/l7Q7wRT0sva6Ju7VDtq7+lijMWK8jotPorTq1DYUy3h7XJIOjyJEdvqlQkEfwrnbOfREmsnwlPyg==", "integrity": "sha512-KfAu6Ju4aeTKW3dQ17GmaVXJ+96IqUMCC8KJlb1uzOBcNudGVnwYogjkEAMu4N3hg1PJH6XcrimqmFRqPZb1+Q==",
"dependencies": { "dependencies": {
"@types/runes": "^0.4.3", "@types/runes": "^0.4.3",
"@vscode/ripgrep": "1.15.11", "@vscode/ripgrep": "1.15.11",

View file

@ -9,11 +9,11 @@
buildNpmPackage (finalAttrs: { buildNpmPackage (finalAttrs: {
pname = "amp-cli"; pname = "amp-cli";
version = "0.0.1748865683-g71e54e"; version = "0.0.1749297687-g3e4f54";
src = fetchzip { src = fetchzip {
url = "https://registry.npmjs.org/@sourcegraph/amp/-/amp-${finalAttrs.version}.tgz"; url = "https://registry.npmjs.org/@sourcegraph/amp/-/amp-${finalAttrs.version}.tgz";
hash = "sha256-kkQKjw1SzDjV8/206i+NUyxeDhZ/35My9gyXRe/U7I8="; hash = "sha256-WreJsyqyW/Z+TUPnQC7sKIpSgdpIzXQTgkXBthKCMZ4=";
}; };
postPatch = '' postPatch = ''
@ -45,7 +45,7 @@ buildNpmPackage (finalAttrs: {
chmod +x bin/amp-wrapper.js chmod +x bin/amp-wrapper.js
''; '';
npmDepsHash = "sha256-yeZ5UCVUCbVjpYTYYN5mI6eCkShtnCKxumjpb5GRCws="; npmDepsHash = "sha256-dAJePSRKnXrdW8hr72JNxunQAiUtxH53sDrtYYX6++0=";
propagatedBuildInputs = [ propagatedBuildInputs = [
ripgrep ripgrep

View file

@ -44,7 +44,8 @@ stdenv.mkDerivation {
prePatch = '' prePatch = ''
substituteInPlace etc/Makefile.am \ substituteInPlace etc/Makefile.am \
--replace-fail 02770 0770 --replace-fail 02770 0770 \
--replace-fail '../../../$(pkglibdir)' '$(pkglibdir)'
''; '';
postPatch = '' postPatch = ''

View file

@ -13,14 +13,14 @@
python3Packages.buildPythonPackage rec { python3Packages.buildPythonPackage rec {
pname = "boxflat"; pname = "boxflat";
version = "1.31.0"; version = "1.32.0";
pyproject = true; pyproject = true;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Lawstorant"; owner = "Lawstorant";
repo = "boxflat"; repo = "boxflat";
tag = "v${version}"; tag = "v${version}";
hash = "sha256-2x7voGnbvaUg1G2SfdjD0QPVXolHkUcrwGyoclnOLMo="; hash = "sha256-zxaBz2ooo+h3a9svtC+j23EhpH8TTQIxjdRDCnhAvJ4=";
}; };
build-system = [ python3Packages.setuptools ]; build-system = [ python3Packages.setuptools ];

View file

@ -84,8 +84,6 @@ stdenv.mkDerivation (finalAttrs: {
license = licenses.lgpl21Only; license = licenses.lgpl21Only;
platforms = platforms.unix; platforms = platforms.unix;
maintainers = with maintainers; [ markuskowa ]; maintainers = with maintainers; [ markuskowa ];
# generate_codebook only built for host platform
broken = !stdenv.buildPlatform.canExecute stdenv.hostPlatform;
pkgConfigModules = [ "codec2" ]; pkgConfigModules = [ "codec2" ];
}; };
}) })

View file

@ -5,33 +5,31 @@
imagemagick, imagemagick,
}: }:
let appimageTools.wrapAppImage rec {
pname = "chain-desktop-wallet"; pname = "chain-desktop-wallet";
version = "0.1.1"; version = "1.5.1";
src = fetchurl { src = appimageTools.extractType2 {
url = "https://github.com/crypto-com/${pname}/releases/download/v${version}/${pname}-${version}-x86_64.AppImage"; inherit pname version;
sha256 = "12076hf8dlz0hg1pb2ixwlslrh8gi6s1iawnvhnn6vz4jmjvq356"; src = fetchurl {
url = "https://github.com/crypto-com/chain-desktop-wallet/releases/download/v${version}/Crypto.com-DeFi-Desktop-Wallet-${version}.AppImage";
hash = "sha256-dXJMU6abg31ZyETKl5Hh6fxn1Gd1FbSHGJh1z0R7XPM=";
};
}; };
appimageContents = appimageTools.extractType2 { inherit pname version src; };
in
appimageTools.wrapType2 rec {
inherit pname version src;
extraInstallCommands = '' extraInstallCommands = ''
install -m 444 -D ${appimageContents}/${pname}.desktop $out/share/applications/${pname}.desktop install -m 444 -D ${src}/chain-desktop-wallet.desktop $out/share/applications/chain-desktop-wallet.desktop
${imagemagick}/bin/convert ${appimageContents}/${pname}.png -resize 512x512 ${pname}_512.png ${imagemagick}/bin/magick ${src}/chain-desktop-wallet.png -resize 512x512 chain-desktop-wallet_512.png
install -m 444 -D ${pname}_512.png $out/share/icons/hicolor/512x512/apps/${pname}.png install -m 444 -D chain-desktop-wallet_512.png $out/share/icons/hicolor/512x512/apps/chain-desktop-wallet.png
substituteInPlace $out/share/applications/${pname}.desktop \ substituteInPlace $out/share/applications/chain-desktop-wallet.desktop \
--replace 'Exec=AppRun --no-sandbox %U' 'Exec=${pname} %U' --replace-fail "Exec=AppRun --no-sandbox %U" "Exec=chain-desktop-wallet %U"
''; '';
meta = with lib; { meta = {
description = "Crypto.org Chain desktop wallet (Beta)"; description = "Crypto.org Chain desktop wallet (Beta)";
homepage = "https://github.com/crypto-com/chain-desktop-wallet"; homepage = "https://github.com/crypto-com/chain-desktop-wallet";
license = licenses.asl20; license = lib.licenses.asl20;
maintainers = with maintainers; [ th0rgal ]; maintainers = with lib.maintainers; [ th0rgal ];
platforms = [ "x86_64-linux" ]; platforms = [ "x86_64-linux" ];
mainProgram = "chain-desktop-wallet"; mainProgram = "chain-desktop-wallet";
}; };

View file

@ -13,7 +13,7 @@
stdenvNoCC.mkDerivation rec { stdenvNoCC.mkDerivation rec {
pname = "cura-appimage"; pname = "cura-appimage";
version = "5.10.0"; version = "5.10.1";
# Give some good names so the intermediate packages are easy # Give some good names so the intermediate packages are easy
# to recognise by name in the Nix store. # to recognise by name in the Nix store.
@ -22,7 +22,7 @@ stdenvNoCC.mkDerivation rec {
src = fetchurl { src = fetchurl {
url = "https://github.com/Ultimaker/Cura/releases/download/${version}/Ultimaker-Cura-${version}-linux-X64.AppImage"; url = "https://github.com/Ultimaker/Cura/releases/download/${version}/Ultimaker-Cura-${version}-linux-X64.AppImage";
hash = "sha256-8Km249t0m4YnOsyXyjJJD0y4n9kUCrA/AcsqBcrVf5Q="; hash = "sha256-c89GkgfOSY4hriY66GUCgBYiiJJspM9Fg07lne+KXgw=";
}; };
appimageContents = appimageTools.extract { appimageContents = appimageTools.extract {

View file

@ -16,7 +16,7 @@ buildGoModule rec {
hash = "sha256-k6j7DIwK8YAKmEjn8JJO7XBcap9ui6cgUSJG7CeHAAM="; hash = "sha256-k6j7DIwK8YAKmEjn8JJO7XBcap9ui6cgUSJG7CeHAAM=";
}; };
vendorHash = "sha256-lV6dUl+OMUQfhlgNL38k0Re1Mr3VP9b8SI3vTJ8CP18="; vendorHash = "sha256-l3IKvcO10C+PVDX962tFWny7eMNC48ATIVqiHjpVH/Y=";
meta = with lib; { meta = with lib; {
description = "Tool to check missing hosted DNS zones"; description = "Tool to check missing hosted DNS zones";

View file

@ -11,14 +11,14 @@
lxd-lts, lxd-lts,
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation (finalAttrs: {
pname = "dqlite"; pname = "dqlite";
version = "1.18.1"; version = "1.18.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "canonical"; owner = "canonical";
repo = "dqlite"; repo = "dqlite";
tag = "v${version}"; tag = "v${finalAttrs.version}";
hash = "sha256-7ou077ozbpH21PcvEEcprr4UYJ/X398Ph9dh5C3YyBQ="; hash = "sha256-7ou077ozbpH21PcvEEcprr4UYJ/X398Ph9dh5C3YyBQ=";
}; };
@ -47,14 +47,14 @@ stdenv.mkDerivation rec {
inherit lxd-lts; inherit lxd-lts;
}; };
meta = with lib; { meta = {
description = '' description = ''
Expose a SQLite database over the network and replicate it across a Expose a SQLite database over the network and replicate it across a
cluster of peers cluster of peers
''; '';
homepage = "https://dqlite.io/"; homepage = "https://dqlite.io/";
license = licenses.asl20; license = lib.licenses.asl20;
maintainers = [ ]; maintainers = [ ];
platforms = platforms.linux; platforms = lib.platforms.linux;
}; };
} })

View file

@ -1,23 +1,28 @@
{ {
lib, lib,
stdenv, stdenv,
fetchurl, fetchFromGitLab,
bison, bison,
flex, flex,
makeWrapper, makeWrapper,
texinfo4,
getopt, getopt,
readline, readline,
texinfo,
texlive, texlive,
versionCheckHook,
}: }:
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "eukleides"; pname = "eukleides";
version = "1.5.4"; version = "1.5.4";
src = fetchurl { src = fetchFromGitLab {
url = "http://www.eukleides.org/files/eukleides-${finalAttrs.version}.tar.bz2"; # official upstream www.eukleides.org is down
sha256 = "0s8cyh75hdj89v6kpm3z24i48yzpkr8qf0cwxbs9ijxj1i38ki0q"; domain = "salsa.debian.org";
owner = "georgesk";
repo = "eukleides";
rev = "upstream/${finalAttrs.version}";
hash = "sha256-keX7k14X/97zHh87A/7vUsfGc/S6fByd+rewW+LkJeM=";
}; };
patches = [ patches = [
@ -25,12 +30,14 @@ stdenv.mkDerivation (finalAttrs: {
./use-CC.patch ./use-CC.patch
# allow PostScript transparency in epstopdf call # allow PostScript transparency in epstopdf call
./gs-allowpstransparency.patch ./gs-allowpstransparency.patch
# fix curly brace escaping in eukleides.texi for newer texinfo compatiblity
./texinfo-escape.patch
]; ];
nativeBuildInputs = [ nativeBuildInputs = [
bison bison
flex flex
texinfo4 texinfo
makeWrapper makeWrapper
]; ];
@ -41,14 +48,14 @@ stdenv.mkDerivation (finalAttrs: {
preConfigure = '' preConfigure = ''
substituteInPlace Makefile \ substituteInPlace Makefile \
--replace mktexlsr true --replace-fail mktexlsr true
substituteInPlace doc/Makefile \ substituteInPlace doc/Makefile \
--replace ginstall-info install-info --replace-fail ginstall-info install-info
substituteInPlace Config \ substituteInPlace Config \
--replace '/usr/local' "$out" \ --replace-fail '/usr/local' "$out" \
--replace '$(SHARE_DIR)/texmf' "$tex" --replace-fail '$(SHARE_DIR)/texmf' "$tex"
''; '';
# Workaround build failure on -fno-common toolchains like upstream # Workaround build failure on -fno-common toolchains like upstream
@ -57,6 +64,13 @@ stdenv.mkDerivation (finalAttrs: {
# eukleides_build/quadrilateral.o:(.bss+0x18): first defined here # eukleides_build/quadrilateral.o:(.bss+0x18): first defined here
env.NIX_CFLAGS_COMPILE = "-fcommon"; env.NIX_CFLAGS_COMPILE = "-fcommon";
preBuild = ''
mkdir build/eukleides_build
mkdir build/euktopst_build
'';
enableParallelBuilding = true;
preInstall = '' preInstall = ''
mkdir -p $out/bin mkdir -p $out/bin
''; '';
@ -84,6 +98,10 @@ stdenv.mkDerivation (finalAttrs: {
pkgs = [ finalAttrs.finalPackage.tex ]; pkgs = [ finalAttrs.finalPackage.tex ];
}; };
doInstallCheck = true;
nativeInstallCheckInputs = [ versionCheckHook ];
versionCheckProgramArg = "--version";
meta = { meta = {
description = "Geometry Drawing Language"; description = "Geometry Drawing Language";
homepage = "http://www.eukleides.org/"; homepage = "http://www.eukleides.org/";

View file

@ -0,0 +1,19 @@
--- a/doc/eukleides.texi
+++ b/doc/eukleides.texi
@@ -6,12 +6,12 @@
% ------------------------------------------------------------------------------
-\def\LaTeX{L\kern-.34em\raise.49ex\hbox{\sevenrm A}\kern-.18em\TeX}
-\def\mdeg{$^\circ$}
+\def\LaTeX@{L\kern-.34em\raise.49ex\hbox@{\sevenrm A@}\kern-.18em\TeX@}
+\def\mdeg@{$^\circ$@}
\font\degfont=cmtt8
-\def\deg{\raise.7ex\hbox{\degfont o}}
-\def\exm#1{\noindent{\textit Example:}\quad{\texttt #1}}
-\def\exmp{\noindent{\textit Example:}}
+\def\deg@{\raise.7ex\hbox@{\degfont o@}@}
+\def\exm#1@{\noindent@{\textit Example:@}\quad@{\texttt #1@}@}
+\def\exmp@{\noindent@{\textit Example:@}@}
% ------------------------------------------------------------------------------

View file

@ -1,7 +1,7 @@
{ {
lib, lib,
stdenv, stdenv,
fetchurl, fetchFromGitHub,
pkg-config, pkg-config,
meson, meson,
ninja, ninja,
@ -10,13 +10,15 @@
python3Packages, python3Packages,
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation (finalAttrs: {
pname = "fwupd-efi"; pname = "fwupd-efi";
version = "1.6"; version = "1.7";
src = fetchurl { src = fetchFromGitHub {
url = "https://github.com/fwupd/fwupd-efi/releases/download/${version}/fwupd-efi-${version}.tar.xz"; owner = "fwupd";
hash = "sha256-r9CAWirQgafK/y71vABM46AUe1OAFejsqWY0FxaxJg4="; repo = "fwupd-efi";
rev = "${finalAttrs.version}";
hash = "sha256-PcVqnnFrxedkhYgm+8EUF2I65R5gTXqbVrk69Pw1m1g=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -43,9 +45,10 @@ stdenv.mkDerivation rec {
"-Defi-ldsdir=${gnu-efi}/lib" "-Defi-ldsdir=${gnu-efi}/lib"
"-Defi_sbat_distro_id=nixos" "-Defi_sbat_distro_id=nixos"
"-Defi_sbat_distro_summary=NixOS" "-Defi_sbat_distro_summary=NixOS"
"-Defi_sbat_distro_pkgname=${pname}" "-Defi_sbat_distro_pkgname=${finalAttrs.pname}"
"-Defi_sbat_distro_version=${version}" "-Defi_sbat_distro_version=${finalAttrs.version}"
"-Defi_sbat_distro_url=https://search.nixos.org/packages?channel=unstable&show=fwupd-efi&from=0&size=50&sort=relevance&query=fwupd-efi" "-Defi_sbat_distro_url=https://search.nixos.org/packages?channel=unstable&show=fwupd-efi&from=0&size=50&sort=relevance&query=fwupd-efi"
"-Dgenpeimg=disabled"
]; ];
meta = with lib; { meta = with lib; {
@ -54,4 +57,4 @@ stdenv.mkDerivation rec {
license = licenses.lgpl21Plus; license = licenses.lgpl21Plus;
platforms = platforms.linux; platforms = platforms.linux;
}; };
} })

View file

@ -42,325 +42,325 @@ in
{ {
app-schema = mkGeoserverExtension { app-schema = mkGeoserverExtension {
name = "app-schema"; name = "app-schema";
version = "2.27.0"; # app-schema version = "2.27.1"; # app-schema
hash = "sha256-S7WtIbmn9RF0mmTRiOH5zFsjZ6y0mvVu0H8jKCdTPHM="; # app-schema hash = "sha256-en9j/FhM7llsgvg26nIqqpt3wVJ9wtshkimMQ4bn1O4="; # app-schema
}; };
authkey = mkGeoserverExtension { authkey = mkGeoserverExtension {
name = "authkey"; name = "authkey";
version = "2.27.0"; # authkey version = "2.27.1"; # authkey
hash = "sha256-GwA/f5wMf701TEs04Dgx/zcEA/jBHgw0JuJMKqTuRTU="; # authkey hash = "sha256-c2m5qfeeAlRoKl1ZgGzlURYivgUMh/22MBNXscKiRi8="; # authkey
}; };
cas = mkGeoserverExtension { cas = mkGeoserverExtension {
name = "cas"; name = "cas";
version = "2.27.0"; # cas version = "2.27.1"; # cas
hash = "sha256-poD8OBeR7txtM1nJDy5MV6GVREVonLvx3TUY3a1V2Mc="; # cas hash = "sha256-42ePZ90vATFsTkT9e2XaKM2uR05K5xUYbmwFPyQR4xk="; # cas
}; };
charts = mkGeoserverExtension { charts = mkGeoserverExtension {
name = "charts"; name = "charts";
version = "2.27.0"; # charts version = "2.27.1"; # charts
hash = "sha256-8FoaN9EoFZ56YPev//IphMjce1iJQnMbP6xCdVSwMiU="; # charts hash = "sha256-y2N7/ZnxeiP0cNtLXMzN0jSIAGc8t1QzSLD1wEVa/LY="; # charts
}; };
control-flow = mkGeoserverExtension { control-flow = mkGeoserverExtension {
name = "control-flow"; name = "control-flow";
version = "2.27.0"; # control-flow version = "2.27.1"; # control-flow
hash = "sha256-DyZp/dcRm/xuvxv49qvepcDJPyHGiG4wMbEzKNhNcH0="; # control-flow hash = "sha256-/Vv2otkJuaPAHxs7bZZ4UkB5tXR7YLb2Qn0eA5wRJkk="; # control-flow
}; };
css = mkGeoserverExtension { css = mkGeoserverExtension {
name = "css"; name = "css";
version = "2.27.0"; # css version = "2.27.1"; # css
hash = "sha256-PKRgGbDlTjrFkhrDpbjDjAl+Q/gjWXFw9C0QpKB8+Ro="; # css hash = "sha256-ZQtyljZuQdX7fS+4oGALXZBsscr8M6m1hgAN0EoBRVM="; # css
}; };
csw = mkGeoserverExtension { csw = mkGeoserverExtension {
name = "csw"; name = "csw";
version = "2.27.0"; # csw version = "2.27.1"; # csw
hash = "sha256-sddOghBd8OVjKmaF3PqM/G+RkpsUk6vmCZv7uQJTJnU="; # csw hash = "sha256-P0PMs8JNxHXwPy610mYc9Fz6uO+LnYWm7fd8i2R3vTY="; # csw
}; };
csw-iso = mkGeoserverExtension { csw-iso = mkGeoserverExtension {
name = "csw-iso"; name = "csw-iso";
version = "2.27.0"; # csw-iso version = "2.27.1"; # csw-iso
hash = "sha256-WVKVoQWIusgpAZUWPybBBIMbtWB56uNix3T50hy0x5w="; # csw-iso hash = "sha256-aQCFUTQeTx+RuBjXksq3guHQ+LIaA3RCSLv9XQ9BdtA="; # csw-iso
}; };
db2 = mkGeoserverExtension { db2 = mkGeoserverExtension {
name = "db2"; name = "db2";
version = "2.27.0"; # db2 version = "2.27.1"; # db2
hash = "sha256-jlyRGOGBFJ0+sArKXqchITlS6swE/v4ScdxPKWANFaE="; # db2 hash = "sha256-RO1IH1AZ3iiEHzx95ZC9+aqD7pB7lMQ0MQ8uHjfQLR4="; # db2
}; };
# Needs wps extension. # Needs wps extension.
dxf = mkGeoserverExtension { dxf = mkGeoserverExtension {
name = "dxf"; name = "dxf";
version = "2.27.0"; # dxf version = "2.27.1"; # dxf
hash = "sha256-hdn5X7T5/H7Ti0UK3MdG0TFGInwu7S7Z4VghcWx+hdQ="; # dxf hash = "sha256-DxQWW59+FslrmX601CffZabF+uZA+ujHVGmbwatQT9M="; # dxf
}; };
excel = mkGeoserverExtension { excel = mkGeoserverExtension {
name = "excel"; name = "excel";
version = "2.27.0"; # excel version = "2.27.1"; # excel
hash = "sha256-EH1TZeYPk+sb9+7ZfjbaEsNgQJ+/57XCc2+CvELsY88="; # excel hash = "sha256-G6KBuBVxW879GffpKJVJgK2sO65S+zfUsKomXPBUejA="; # excel
}; };
feature-pregeneralized = mkGeoserverExtension { feature-pregeneralized = mkGeoserverExtension {
name = "feature-pregeneralized"; name = "feature-pregeneralized";
version = "2.27.0"; # feature-pregeneralized version = "2.27.1"; # feature-pregeneralized
hash = "sha256-0389xo0NjTREGQLMrqJesl/XrFOrjFjjFBL7GSUMl/Y="; # feature-pregeneralized hash = "sha256-wbUZAWTSFDutmGUhkFI0Hl/WbZRb5sLet2FdZmxLeLM="; # feature-pregeneralized
}; };
# Note: The extension name ("gdal") clashes with pkgs.gdal. # Note: The extension name ("gdal") clashes with pkgs.gdal.
gdal = mkGeoserverExtension { gdal = mkGeoserverExtension {
name = "gdal"; name = "gdal";
version = "2.27.0"; # gdal version = "2.27.1"; # gdal
buildInputs = [ pkgs.gdal ]; buildInputs = [ pkgs.gdal ];
hash = "sha256-oTSEk+AmgXydSF4TZD9m5ViyeWh5HpAprMZAPMdP2LI="; # gdal hash = "sha256-xw6DoOxImOLnmPxYMkaH4bKes0vVobzvT1IiDywq828="; # gdal
}; };
# Throws "java.io.FileNotFoundException: URL [jar:file:/nix/store/.../WEB-INF/lib/gs-geofence-server-2.24.1.jar!/geofence-default-override.properties] cannot be resolved to absolute file path because it does not reside in the file system: jar:file:/nix/store/.../WEB-INF/lib/gs-geofence-server-2.24.1.jar!/geofence-default-override.properties" but seems to work out of the box. # Throws "java.io.FileNotFoundException: URL [jar:file:/nix/store/.../WEB-INF/lib/gs-geofence-server-2.24.1.jar!/geofence-default-override.properties] cannot be resolved to absolute file path because it does not reside in the file system: jar:file:/nix/store/.../WEB-INF/lib/gs-geofence-server-2.24.1.jar!/geofence-default-override.properties" but seems to work out of the box.
#geofence = mkGeoserverExtension { #geofence = mkGeoserverExtension {
# name = "geofence"; # name = "geofence";
# version = "2.27.0"; # geofence # version = "2.27.1"; # geofence
# hash = "sha256-P7ZHvC4qv1meziqPmBfOgQ+Y06Ico0N1trUi9LMZUJQ="; # geofence # hash = "sha256-ccbCBCrb4zbZQ2eCDZo/FOT2IiUhruV62h7SrITdPdw="; # geofence
#}; #};
#geofence-server = mkGeoserverExtension { #geofence-server = mkGeoserverExtension {
# name = "geofence-server"; # name = "geofence-server";
# version = "2.27.0"; # geofence-server # version = "2.27.1"; # geofence-server
# hash = ""; # geofence-server # hash = ""; # geofence-server
#}; #};
#geofence-wps = mkGeoserverExtension { #geofence-wps = mkGeoserverExtension {
# name = "geofence-wps"; # name = "geofence-wps";
# version = "2.27.0"; # geofence-wps # version = "2.27.1"; # geofence-wps
# hash = "sha256-8Wvb/elunsYTFD1GgEQunM8i0eDyOA/W52KZ9+7uvvk="; # geofence-wps # hash = "sha256-k2z+xBUZw7cz/sPRjAEsKey6oqY1FzpaMGJcCm73kdg="; # geofence-wps
#}; #};
geopkg-output = mkGeoserverExtension { geopkg-output = mkGeoserverExtension {
name = "geopkg-output"; name = "geopkg-output";
version = "2.27.0"; # geopkg-output version = "2.27.1"; # geopkg-output
hash = "sha256-VUqBTt0XfSY2Q8cfeCpVmr398PK+Sb74APSrBODJNlw="; # geopkg-output hash = "sha256-wECoUeBJLh00hJHT/adz7YF8AraPl1rOd9GLL1BP5dU="; # geopkg-output
}; };
grib = mkGeoserverExtension { grib = mkGeoserverExtension {
name = "grib"; name = "grib";
version = "2.27.0"; # grib version = "2.27.1"; # grib
hash = "sha256-xX9LAgo5exeD2UxZ8/LROZWobLHLw33jcpwERGUGPys="; # grib hash = "sha256-gu8sDIA46u0Uj9+lJJ65mn3FD6D+DjsTN8KbNUeoOP0="; # grib
buildInputs = [ netcdf ]; buildInputs = [ netcdf ];
}; };
gwc-s3 = mkGeoserverExtension { gwc-s3 = mkGeoserverExtension {
name = "gwc-s3"; name = "gwc-s3";
version = "2.27.0"; # gwc-s3 version = "2.27.1"; # gwc-s3
hash = "sha256-/koF00Rki1xiY/g4ahhvFZNQxGnvIbbnqNmYHBqArBI="; # gwc-s3 hash = "sha256-UBy17pwwjDJFBIgUyQSThj3Kn1bber/pglsUr/h4d+Q="; # gwc-s3
}; };
h2 = mkGeoserverExtension { h2 = mkGeoserverExtension {
name = "h2"; name = "h2";
version = "2.27.0"; # h2 version = "2.27.1"; # h2
hash = "sha256-lfWu3812AMv0bB2dllNlcOSyN+IMASI/nkjLaStvUtw="; # h2 hash = "sha256-cXtc5OBAn3ppoGns6MvivgCYW841LJt1SPi5nNDE2O8="; # h2
}; };
iau = mkGeoserverExtension { iau = mkGeoserverExtension {
name = "iau"; name = "iau";
version = "2.27.0"; # iau version = "2.27.1"; # iau
hash = "sha256-9PhWejZILq1hcWBdvWh9SdtfLOlpFcaIU9TeJ8z7UUw="; # iau hash = "sha256-77ULte2jCRN+gfd9/tOL26RX7EjKK6h5JaqQBR8TSI8="; # iau
}; };
importer = mkGeoserverExtension { importer = mkGeoserverExtension {
name = "importer"; name = "importer";
version = "2.27.0"; # importer version = "2.27.1"; # importer
hash = "sha256-oqlNcUkO7XlcI6QQF+44kt69ZWtPSdcpyuA5xGtVrAQ="; # importer hash = "sha256-qrwMz7R/m/BtwNUcJV+mJu8pTNS+00EjWq/hMnF3/T0="; # importer
}; };
inspire = mkGeoserverExtension { inspire = mkGeoserverExtension {
name = "inspire"; name = "inspire";
version = "2.27.0"; # inspire version = "2.27.1"; # inspire
hash = "sha256-irSJm3gDJAiDHczkS84OW+noOIryCOmSwiIU4GAKqoQ="; # inspire hash = "sha256-fjMkmAmq9BGsnwjUH8I/iCZveAPEYi9E9/R2WNg6rxo="; # inspire
}; };
# Needs Kakadu plugin from # Needs Kakadu plugin from
# https://github.com/geosolutions-it/imageio-ext # https://github.com/geosolutions-it/imageio-ext
#jp2k = mkGeoserverExtension { #jp2k = mkGeoserverExtension {
# name = "jp2k"; # name = "jp2k";
# version = "2.27.0"; # jp2k # version = "2.27.1"; # jp2k
# hash = "sha256-WKWtNKv1sQrdrraCj9jmEODtIhCVF25HFbQNROdlyxg="; # jp2k # hash = "sha256-guNAdKOu32t0a648nuUjkt5bu17OKLAn6QXYeyAe1ZA="; # jp2k
#}; #};
libjpeg-turbo = mkGeoserverExtension { libjpeg-turbo = mkGeoserverExtension {
name = "libjpeg-turbo"; name = "libjpeg-turbo";
version = "2.27.0"; # libjpeg-turbo version = "2.27.1"; # libjpeg-turbo
hash = "sha256-tMov4w8Kfbrr7hkNK4o+XFUuenyidCem7Z36KXinfTE="; # libjpeg-turbo hash = "sha256-ZAIQJzzDNSgCX4BUchyRktobJkyLHgWYwfPz8B9vNTQ="; # libjpeg-turbo
buildInputs = [ libjpeg.out ]; buildInputs = [ libjpeg.out ];
}; };
mapml = mkGeoserverExtension { mapml = mkGeoserverExtension {
name = "mapml"; name = "mapml";
version = "2.27.0"; # mapml version = "2.27.1"; # mapml
hash = "sha256-HONocKWnjkGqGRmtDxcJSwnDHwVouY6YeORRBjAbu4M="; # mapml hash = "sha256-znx6KjpTT109wG2wsTyvwKFcij29TVJ0cOkEIJw1D0g="; # mapml
}; };
mbstyle = mkGeoserverExtension { mbstyle = mkGeoserverExtension {
name = "mbstyle"; name = "mbstyle";
version = "2.27.0"; # mbstyle version = "2.27.1"; # mbstyle
hash = "sha256-c1QijJj/WfbTxc4vM55lz+wx2PW4BY3tXneSM+3zXRA="; # mbstyle hash = "sha256-t2g9Pm1PsfbiP1UWHcZaILZQFeOxnKUMXGS1sJfQcVg="; # mbstyle
}; };
metadata = mkGeoserverExtension { metadata = mkGeoserverExtension {
name = "metadata"; name = "metadata";
version = "2.27.0"; # metadata version = "2.27.1"; # metadata
hash = "sha256-5b9gtSzP9DOyhwoNdFVnv08WjlH+m0ZFPO+jqtbUJ1A="; # metadata hash = "sha256-DPD83rrjn8oPRXn28EFDgvxdhUtI3goPN2FpyPjyGks="; # metadata
}; };
mongodb = mkGeoserverExtension { mongodb = mkGeoserverExtension {
name = "mongodb"; name = "mongodb";
version = "2.27.0"; # mongodb version = "2.27.1"; # mongodb
hash = "sha256-Y9KQ7lqfCnPfTdPUzidi9wNZPeiTTqB+4lf5q7mSQ88="; # mongodb hash = "sha256-lVaEOf91CKBYfI8QLXhERfQ+aWNTTok2DveiZlWygjQ="; # mongodb
}; };
monitor = mkGeoserverExtension { monitor = mkGeoserverExtension {
name = "monitor"; name = "monitor";
version = "2.27.0"; # monitor version = "2.27.1"; # monitor
hash = "sha256-uAkOudY7yACJ9A+FxcKSDUhGiID+uTvBibCejFwEiT0="; # monitor hash = "sha256-goZz5+dxB787hjcoR/Cmo92mw+rhpoooETzxg8bQ4eE="; # monitor
}; };
mysql = mkGeoserverExtension { mysql = mkGeoserverExtension {
name = "mysql"; name = "mysql";
version = "2.27.0"; # mysql version = "2.27.1"; # mysql
hash = "sha256-qA3l9gx4AuqqbPHfQkbvJNYfURrBSnmq4S4nEPrFpO4="; # mysql hash = "sha256-jn+zmnrJHWw6/OXCnEpoBPtUALhINjL42va1+eGXgeU="; # mysql
}; };
netcdf = mkGeoserverExtension { netcdf = mkGeoserverExtension {
name = "netcdf"; name = "netcdf";
version = "2.27.0"; # netcdf version = "2.27.1"; # netcdf
hash = "sha256-3pxGeIWcsBnJMdZjupOR/GmglxYWJp8KjJsmZSCRK00="; # netcdf hash = "sha256-W/ICO05gBf5o6ZAc8vbxv9ZWd02m6AMQKqyimpVvRX8="; # netcdf
buildInputs = [ netcdf ]; buildInputs = [ netcdf ];
}; };
netcdf-out = mkGeoserverExtension { netcdf-out = mkGeoserverExtension {
name = "netcdf-out"; name = "netcdf-out";
version = "2.27.0"; # netcdf-out version = "2.27.1"; # netcdf-out
hash = "sha256-GfwJqdoO1Z265OmfAvjoKy0/DLX8e06Mu58o4Zps4q0="; # netcdf-out hash = "sha256-0l74QlXo3CwTja2DDx8fmD9DTJV3S6fdCi2r6oq6UwE="; # netcdf-out
buildInputs = [ netcdf ]; buildInputs = [ netcdf ];
}; };
ogr-wfs = mkGeoserverExtension { ogr-wfs = mkGeoserverExtension {
name = "ogr-wfs"; name = "ogr-wfs";
version = "2.27.0"; # ogr-wfs version = "2.27.1"; # ogr-wfs
buildInputs = [ pkgs.gdal ]; buildInputs = [ pkgs.gdal ];
hash = "sha256-FX3sojRnR6FQSFSK4n62w/lrPbHTdbLn9NtR2nE/3dU="; # ogr-wfs hash = "sha256-UXTpC4vd/2lq2mRMaTEwiIb58NtnsM+PEX2F6hsCv3s="; # ogr-wfs
}; };
# Needs ogr-wfs extension. # Needs ogr-wfs extension.
ogr-wps = mkGeoserverExtension { ogr-wps = mkGeoserverExtension {
name = "ogr-wps"; name = "ogr-wps";
version = "2.27.0"; # ogr-wps version = "2.27.1"; # ogr-wps
# buildInputs = [ pkgs.gdal ]; # buildInputs = [ pkgs.gdal ];
hash = "sha256-Nb7rkbZPw85+EAcR+ist4iW16HVfsH9cSYwplHyO4RY="; # ogr-wps hash = "sha256-GgVVGEBm7ci4Qxe+hNiIuGGOoJQRvaZE+NYKY0ZJlAQ="; # ogr-wps
}; };
oracle = mkGeoserverExtension { oracle = mkGeoserverExtension {
name = "oracle"; name = "oracle";
version = "2.27.0"; # oracle version = "2.27.1"; # oracle
hash = "sha256-4KnZ48oKmgap3qZiJE4TSCQZpMvCQd4PULWponW5f1c="; # oracle hash = "sha256-7NH0XW+dZWIgJ8rwzNjCXLS2c4lCFg0FzNM8AD17Z3E="; # oracle
}; };
params-extractor = mkGeoserverExtension { params-extractor = mkGeoserverExtension {
name = "params-extractor"; name = "params-extractor";
version = "2.27.0"; # params-extractor version = "2.27.1"; # params-extractor
hash = "sha256-0NnL87Cn/DcLXTnBJhgcGHNmC6SYKRc7TY+4r7VcYJQ="; # params-extractor hash = "sha256-Z3pM5Mt1RE1+aDfsjcMrx4u6SvUzOUQmrmfghCCQIYk="; # params-extractor
}; };
printing = mkGeoserverExtension { printing = mkGeoserverExtension {
name = "printing"; name = "printing";
version = "2.27.0"; # printing version = "2.27.1"; # printing
hash = "sha256-10uBc9ZI9M9m5vmKMXfB1TieJBr7cx/SeD1AiXNVJo8="; # printing hash = "sha256-/kkUQpARHi2J/+4Tc9z7pVGLhnwbrlxOxiUlbg646KQ="; # printing
}; };
pyramid = mkGeoserverExtension { pyramid = mkGeoserverExtension {
name = "pyramid"; name = "pyramid";
version = "2.27.0"; # pyramid version = "2.27.1"; # pyramid
hash = "sha256-K38fYjM0Oh+FHT5Wadjuc3KIhFP2x5q5cxW5aucZNNw="; # pyramid hash = "sha256-b4ZZNXHOgywXkPwTWBANyl0r1bok4bybusI0tKZ7rY8="; # pyramid
}; };
querylayer = mkGeoserverExtension { querylayer = mkGeoserverExtension {
name = "querylayer"; name = "querylayer";
version = "2.27.0"; # querylayer version = "2.27.1"; # querylayer
hash = "sha256-5OPfTUB0d08jWjxWd77BxffZgx+eM5eJX9bX0kt/WpM="; # querylayer hash = "sha256-8leo1ZtrYbN9XISJLVZvOF34arOEnh0Y8CIeWih8XOE="; # querylayer
}; };
sldservice = mkGeoserverExtension { sldservice = mkGeoserverExtension {
name = "sldservice"; name = "sldservice";
version = "2.27.0"; # sldservice version = "2.27.1"; # sldservice
hash = "sha256-rWIbWCsX4Hkank0L02sluTF137Y6Pex15Gobiwv2pNM="; # sldservice hash = "sha256-nKG1/+NwmTaardqZAhB4A1QV6bPxc30jW9Ip/q2vUJ0="; # sldservice
}; };
sqlserver = mkGeoserverExtension { sqlserver = mkGeoserverExtension {
name = "sqlserver"; name = "sqlserver";
version = "2.27.0"; # sqlserver version = "2.27.1"; # sqlserver
hash = "sha256-ghf3z9b586RUgvicyOXlW2K8Uq9TolRb7CrcKT1Jt1M="; # sqlserver hash = "sha256-aqQf7NwUPnNn9Byu8YmbMnsU3n3aq832rvXbvicQsrM="; # sqlserver
}; };
vectortiles = mkGeoserverExtension { vectortiles = mkGeoserverExtension {
name = "vectortiles"; name = "vectortiles";
version = "2.27.0"; # vectortiles version = "2.27.1"; # vectortiles
hash = "sha256-ho/Vp1cFq2/xY9fIaQUR+vBQ6Vfdf+Z2eYvL7eI1qMY="; # vectortiles hash = "sha256-8nITeBDeFX6bDx+2Sn4yHfb333XUdNGPV6I883nZLV0="; # vectortiles
}; };
wcs2_0-eo = mkGeoserverExtension { wcs2_0-eo = mkGeoserverExtension {
name = "wcs2_0-eo"; name = "wcs2_0-eo";
version = "2.27.0"; # wcs2_0-eo version = "2.27.1"; # wcs2_0-eo
hash = "sha256-GcoOT3JNQPUN8ETX4spJXteJvbNM9+YO85FH+dw3oSg="; # wcs2_0-eo hash = "sha256-y3QOWFmYW+dxIAAlolcotJ0oNulRIJKvLeQqSTZKq/w="; # wcs2_0-eo
}; };
web-resource = mkGeoserverExtension { web-resource = mkGeoserverExtension {
name = "web-resource"; name = "web-resource";
version = "2.27.0"; # web-resource version = "2.27.1"; # web-resource
hash = "sha256-4TGt9MklLWbJexY7kjT+ijIX/V4OLw7U6mDkBoVXuwk="; # web-resource hash = "sha256-hfP/qnb4isWg4eoxfBCDpiLS4GBG/ysrGBE6HVbglMg="; # web-resource
}; };
wmts-multi-dimensional = mkGeoserverExtension { wmts-multi-dimensional = mkGeoserverExtension {
name = "wmts-multi-dimensional"; name = "wmts-multi-dimensional";
version = "2.27.0"; # wmts-multi-dimensional version = "2.27.1"; # wmts-multi-dimensional
hash = "sha256-8I3XbAToqTgwf4y+C3ulAhCY7axyS739GV4+jxwO33g="; # wmts-multi-dimensional hash = "sha256-/KfE5dLvbSeMn/w7NYKQtUIY/Wb1oWeLvdMEqgrNAhg="; # wmts-multi-dimensional
}; };
wps = mkGeoserverExtension { wps = mkGeoserverExtension {
name = "wps"; name = "wps";
version = "2.27.0"; # wps version = "2.27.1"; # wps
hash = "sha256-9OrjyVaf9JzDPXyqHqqg51aAllhcAf4bOvQQyV1dHpI="; # wps hash = "sha256-rsBUWUthRrBkSNIzZZZzIy56bsJYt9zy3cIzWQVHVGc="; # wps
}; };
# Needs hazelcast (https://github.com/hazelcast/hazelcast (?)) which is not # Needs hazelcast (https://github.com/hazelcast/hazelcast (?)) which is not
# available in nixpgs as of 2024/01. # available in nixpgs as of 2024/01.
#wps-cluster-hazelcast = mkGeoserverExtension { #wps-cluster-hazelcast = mkGeoserverExtension {
# name = "wps-cluster-hazelcast"; # name = "wps-cluster-hazelcast";
# version = "2.27.0"; # wps-cluster-hazelcast # version = "2.27.1"; # wps-cluster-hazelcast
# hash = "sha256-amHfS5eBRoiMdj3wJzRNg9krYo5DJrCvCvhtj/Z9mUw="; # wps-cluster-hazelcast # hash = "sha256-W0hIz/Bx/x0ATLhcljSWa9/qzltt3FKlWyxub4Lnsx0="; # wps-cluster-hazelcast
#}; #};
wps-download = mkGeoserverExtension { wps-download = mkGeoserverExtension {
name = "wps-download"; name = "wps-download";
version = "2.27.0"; # wps-download version = "2.27.1"; # wps-download
hash = "sha256-vQpSGiOUh9N4PDQ4w/mTNjooz0lYDXwwRpZsq9VhEMA="; # wps-download hash = "sha256-gt3u/zm8ME99d7zJV1EHQQYjC1IZyG7f5pV+Zt2XeJU="; # wps-download
}; };
# Needs Postrgres configuration or similar. # Needs Postrgres configuration or similar.
# See https://docs.geoserver.org/main/en/user/extensions/wps-jdbc/index.html # See https://docs.geoserver.org/main/en/user/extensions/wps-jdbc/index.html
wps-jdbc = mkGeoserverExtension { wps-jdbc = mkGeoserverExtension {
name = "wps-jdbc"; name = "wps-jdbc";
version = "2.27.0"; # wps-jdbc version = "2.27.1"; # wps-jdbc
hash = "sha256-YWBOLL3X6Ztv+9EWmHKd5N020+qkVNtXXbObSlBhp2s="; # wps-jdbc hash = "sha256-5RtViHAgqAtnHQolqGMC7QYgnwQmn/sO4WdUx2gyxe8="; # wps-jdbc
}; };
ysld = mkGeoserverExtension { ysld = mkGeoserverExtension {
name = "ysld"; name = "ysld";
version = "2.27.0"; # ysld version = "2.27.1"; # ysld
hash = "sha256-fPF4LM0WC4YaAMnPhz3A/XXOoMu+v8TsO6XIcXHWRi4="; # ysld hash = "sha256-DvQ8b6ODmU09Qixwe14wze92ktWyt54+zaEMfXjiEko="; # ysld
}; };
} }

View file

@ -10,20 +10,14 @@
}: }:
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "geoserver"; pname = "geoserver";
version = "2.27.0"; version = "2.27.1";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/geoserver/GeoServer/${finalAttrs.version}/geoserver-${finalAttrs.version}-bin.zip"; url = "mirror://sourceforge/geoserver/GeoServer/${finalAttrs.version}/geoserver-${finalAttrs.version}-bin.zip";
hash = "sha256-bhL+u+BoKgW2cwOXEzaq0h07dKFz9u9WB2jW8nAF0vI="; hash = "sha256-7IrnznWa5NI/2gFHVTRQ0IerOkodStbr0aGpKPpeLQk=";
}; };
sourceRoot = "source"; sourceRoot = ".";
unpackPhase = ''
runHook preUnpack
unzip $src -d "$sourceRoot"
runHook postUnpack
'';
patches = [ patches = [
# set GEOSERVER_DATA_DIR to current working directory if not provided # set GEOSERVER_DATA_DIR to current working directory if not provided
@ -92,12 +86,12 @@ stdenv.mkDerivation (finalAttrs: {
updateScript = ./update.sh; updateScript = ./update.sh;
}; };
meta = with lib; { meta = {
description = "Open source server for sharing geospatial data"; description = "Open source server for sharing geospatial data";
homepage = "https://geoserver.org/"; homepage = "https://geoserver.org/";
sourceProvenance = with sourceTypes; [ binaryBytecode ]; sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
license = licenses.gpl2Plus; license = lib.licenses.gpl2Plus;
teams = [ teams.geospatial ]; teams = [ lib.teams.geospatial ];
platforms = platforms.all; platforms = lib.platforms.all;
}; };
}) })

View file

@ -7,16 +7,16 @@
buildGoModule rec { buildGoModule rec {
pname = "greenmask"; pname = "greenmask";
version = "0.2.11"; version = "0.2.12";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "GreenmaskIO"; owner = "GreenmaskIO";
repo = "greenmask"; repo = "greenmask";
tag = "v${version}"; tag = "v${version}";
hash = "sha256-KHM/r4zDJrZMIC7+Kp+98xhV5r4zkpxc1ffqf0jgnLs="; hash = "sha256-Tgr6olU8EBiiHX4fNOL6EXdrFs2eckFk4ooBBoxc+ms=";
}; };
vendorHash = "sha256-g3/WuLDb4mAzklT+nxQ1U/l+JDzSubENMB5hWjIaIIU="; vendorHash = "sha256-t2U65GAGBGdMRXPTkCQCuXfLuqohA6erTlvAN/xx/ek=";
subPackages = [ "cmd/greenmask/" ]; subPackages = [ "cmd/greenmask/" ];

View file

@ -11,21 +11,21 @@
}: }:
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
pname = "harlequin"; pname = "harlequin";
version = "2.0.0"; version = "2.1.2";
pyproject = true; pyproject = true;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "tconbeer"; owner = "tconbeer";
repo = "harlequin"; repo = "harlequin";
tag = "v${version}"; tag = "v${version}";
hash = "sha256-IUzN+rWL69TUUS9npcmfSAPqy/8SYNusNAN/muCMqNI="; hash = "sha256-uHzhAI8ppp6aoveMPcLCQX2slhbor5Qy+IoTui+RP7M=";
}; };
pythonRelaxDeps = [ pythonRelaxDeps = [
"numpy" "numpy"
"pyarrow" "pyarrow"
"textual" "textual"
"syrupy" "tree-sitter-sql"
]; ];
build-system = with python3Packages; [ poetry-core ]; build-system = with python3Packages; [ poetry-core ];
@ -41,6 +41,7 @@ python3Packages.buildPythonApplication rec {
numpy numpy
packaging packaging
platformdirs platformdirs
pyarrow
questionary questionary
rich-click rich-click
sqlfmt sqlfmt
@ -48,6 +49,7 @@ python3Packages.buildPythonApplication rec {
textual-fastdatatable textual-fastdatatable
textual-textarea textual-textarea
tomlkit tomlkit
tree-sitter-sql
] ]
++ lib.optionals withPostgresAdapter [ harlequin-postgres ] ++ lib.optionals withPostgresAdapter [ harlequin-postgres ]
++ lib.optionals withBigQueryAdapter [ harlequin-bigquery ]; ++ lib.optionals withBigQueryAdapter [ harlequin-bigquery ];

View file

@ -1,6 +1,6 @@
{ {
lib, lib,
stdenv, gccStdenv,
fetchFromGitHub, fetchFromGitHub,
cmake, cmake,
expat, expat,
@ -39,7 +39,7 @@
pkg-config, pkg-config,
}: }:
stdenv.mkDerivation (finalAttrs: { gccStdenv.mkDerivation (finalAttrs: {
pname = "icewm"; pname = "icewm";
version = "3.7.5"; version = "3.7.5";
@ -99,13 +99,15 @@ stdenv.mkDerivation (finalAttrs: {
"-DCFGDIR=/etc/icewm" "-DCFGDIR=/etc/icewm"
]; ];
env.NIX_CFLAGS_COMPILE = lib.optionalString gccStdenv.hostPlatform.isDarwin "-D_DARWIN_C_SOURCE";
# install legacy themes # install legacy themes
postInstall = '' postInstall = ''
cp -r ../lib/themes/{gtk2,Natural,nice,nice2,warp3,warp4,yellowmotif} \ cp -r ../lib/themes/{gtk2,Natural,nice,nice2,warp3,warp4,yellowmotif} \
$out/share/icewm/themes/ $out/share/icewm/themes/
''; '';
meta = with lib; { meta = {
homepage = "https://ice-wm.org/"; homepage = "https://ice-wm.org/";
description = "Simple, lightweight X window manager"; description = "Simple, lightweight X window manager";
longDescription = '' longDescription = ''
@ -121,8 +123,8 @@ stdenv.mkDerivation (finalAttrs: {
optional external background wallpaper manager with transparency support, optional external background wallpaper manager with transparency support,
a simple session manager and a system tray. a simple session manager and a system tray.
''; '';
license = licenses.lgpl2Only; license = lib.licenses.lgpl2Only;
maintainers = [ ]; maintainers = [ ];
platforms = platforms.linux; platforms = lib.platforms.unix;
}; };
}) })

1299
pkgs/by-name/jw/jwt-hack/Cargo.lock generated Normal file

File diff suppressed because it is too large Load diff

View file

@ -1,31 +1,32 @@
{ {
lib, lib,
buildGoModule, rustPlatform,
fetchFromGitHub, fetchFromGitHub,
}: }:
buildGoModule rec { rustPlatform.buildRustPackage rec {
pname = "jwt-hack"; pname = "jwt-hack";
version = "1.2.0"; version = "2.0.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "hahwul"; owner = "hahwul";
repo = "jwt-hack"; repo = "jwt-hack";
tag = "v${version}"; tag = "v${version}";
hash = "sha256-IHR+ItI4ToINLpkVc7yrgpNTS17nD02G6x3pNMEfIW4="; hash = "sha256-uJur/ABoAaQT3BBO2yprK/0/bQPT138Yg9IbztZ6w2w=";
}; };
vendorHash = "sha256-YEH+epSvyy1j0s8AIJ5+BdF47H7KqgBRC4t81noOkjo="; cargoLock = {
lockFile = ./Cargo.lock;
};
ldflags = [ postPatch = ''
"-w" ln -s ${./Cargo.lock} Cargo.lock
"-s" '';
];
meta = { meta = {
description = "Tool for attacking JWT"; description = "JSON Web Token Hack Toolkit";
homepage = "https://github.com/hahwul/jwt-hack"; homepage = "https://github.com/hahwul/jwt-hack";
changelog = "https://github.com/hahwul/jwt-hack/releases/tag/v${version}"; changelog = "https://github.com/hahwul/jwt-hack/releases/tag/${src.tag}";
license = lib.licenses.mit; license = lib.licenses.mit;
maintainers = with lib.maintainers; [ fab ]; maintainers = with lib.maintainers; [ fab ];
mainProgram = "jwt-hack"; mainProgram = "jwt-hack";

View file

@ -5,33 +5,21 @@
cmake, cmake,
extra-cmake-modules, extra-cmake-modules,
pkg-config, pkg-config,
wrapQtAppsHook, kdePackages,
qtbase,
qttools,
qtmultimedia,
qtlocation,
qqc2-desktop-style,
kirigami-addons,
kirigami,
kio,
knotifications,
kquickimageedit,
zxing-cpp, zxing-cpp,
qxmpp, qxmpp,
sonnet,
gst_all_1, gst_all_1,
prison,
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation (finalAttrs: {
pname = "kaidan"; pname = "kaidan";
version = "0.11.0"; version = "0.11.0";
src = fetchFromGitLab { src = fetchFromGitLab {
domain = "invent.kde.org"; domain = "invent.kde.org";
owner = "network"; owner = "network";
repo = pname; repo = "kaidan";
rev = "v${version}"; rev = "v${finalAttrs.version}";
hash = "sha256-8pC4vINeKSYY+LlVgCXUtBq9UjraPdTikBOwLBLeQ3Y="; hash = "sha256-8pC4vINeKSYY+LlVgCXUtBq9UjraPdTikBOwLBLeQ3Y=";
}; };
@ -39,34 +27,34 @@ stdenv.mkDerivation rec {
cmake cmake
extra-cmake-modules extra-cmake-modules
pkg-config pkg-config
wrapQtAppsHook kdePackages.wrapQtAppsHook
]; ];
buildInputs = with gst_all_1; [ buildInputs = [
qtbase kdePackages.kio
qttools kdePackages.kirigami
qtmultimedia kdePackages.kirigami-addons
qtlocation kdePackages.knotifications
qqc2-desktop-style kdePackages.kquickimageedit
kirigami-addons kdePackages.prison
kirigami kdePackages.qtbase
kio kdePackages.qttools
knotifications kdePackages.qtmultimedia
kquickimageedit kdePackages.qtlocation
kdePackages.qqc2-desktop-style
kdePackages.sonnet
zxing-cpp zxing-cpp
qxmpp qxmpp
sonnet gst_all_1.gstreamer
gstreamer gst_all_1.gst-plugins-bad
gst-plugins-bad gst_all_1.gst-plugins-base
gst-plugins-base (gst_all_1.gst-plugins-good.override { qt6Support = true; })
(gst-plugins-good.override { qt6Support = true; })
prison
]; ];
postInstall = '' postInstall = ''
qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0") qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0")
''; '';
meta = with lib; { meta = {
description = "User-friendly and modern chat app, using XMPP"; description = "User-friendly and modern chat app, using XMPP";
mainProgram = "kaidan"; mainProgram = "kaidan";
longDescription = '' longDescription = ''
@ -79,13 +67,13 @@ stdenv.mkDerivation rec {
messages, and file sharing. messages, and file sharing.
''; '';
homepage = "https://www.kaidan.im"; homepage = "https://www.kaidan.im";
license = with licenses; [ license = with lib.licenses; [
gpl3Plus gpl3Plus
mit mit
asl20 asl20
cc-by-sa-40 cc-by-sa-40
]; ];
maintainers = with maintainers; [ astro ]; maintainers = with lib.maintainers; [ astro ];
platforms = with platforms; linux; platforms = with lib.platforms; linux;
}; };
} })

View file

@ -10,29 +10,27 @@
python3, python3,
}: }:
let stdenv.mkDerivation (finalAttrs: {
bgrabitmap = fetchFromGitHub {
owner = "bgrabitmap";
repo = "bgrabitmap";
rev = "2814b069d55f726b9f3b4774d85d00dd72be9c05";
hash = "sha256-YibwdhlgjgI30gqYsKchgDPlOSpBiDBDJNlUDFMygGs=";
};
bgracontrols = fetchFromGitHub {
owner = "bgrabitmap";
repo = "bgracontrols";
rev = "v8.0";
hash = "sha256-5L05eGVN+xncd0/0XLFN6EL2ux4aAOsiU0BMoy0dKgg=";
};
in
stdenv.mkDerivation {
pname = "lazpaint"; pname = "lazpaint";
version = "7.2.2-unstable-2024-01-23"; version = "7.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "bgrabitmap"; owner = "bgrabitmap";
repo = "lazpaint"; repo = "lazpaint";
rev = "45a7a471d531d6adb5ee557ff917a99af76e92f1"; tag = "v${finalAttrs.version}";
hash = "sha256-KgCxSK72Ow29T58mlcYCJiS4D0Ov2/p37c1FSNgKZew="; hash = "sha256-yT1HyvJcYEJgMkQxzCSD8s7/ttemxZaur9T+As8WdIo=";
};
bgrabitmap = fetchFromGitHub {
owner = "bgrabitmap";
repo = "bgrabitmap";
tag = "v11.6.6";
hash = "sha256-bA8tvo7Srm5kIZTVWEA2+gjqHab7LByyL/zqdQxeFlA=";
};
bgracontrols = fetchFromGitHub {
owner = "bgrabitmap";
repo = "bgracontrols";
tag = "v9.0.2";
hash = "sha256-HqX9n4VpOyMwTz3fTweTTqzW+jA2BU62mm/X7Iwjd/8=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -59,8 +57,8 @@ stdenv.mkDerivation {
runHook preBuild runHook preBuild
export HOME=$(mktemp -d) export HOME=$(mktemp -d)
cp -r --no-preserve=mode ${bgrabitmap} bgrabitmap cp -r --no-preserve=mode ${finalAttrs.bgrabitmap} bgrabitmap
cp -r --no-preserve=mode ${bgracontrols} bgracontrols cp -r --no-preserve=mode ${finalAttrs.bgracontrols} bgracontrols
lazbuild --lazarusdir=${lazarus-qt5}/share/lazarus \ lazbuild --lazarusdir=${lazarus-qt5}/share/lazarus \
--build-mode=ReleaseQt5 \ --build-mode=ReleaseQt5 \
@ -86,4 +84,4 @@ stdenv.mkDerivation {
maintainers = with lib.maintainers; [ aleksana ]; maintainers = with lib.maintainers; [ aleksana ];
mainProgram = "lazpaint"; mainProgram = "lazpaint";
}; };
} })

View file

@ -9,13 +9,13 @@
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "lib60870"; pname = "lib60870";
version = "2.3.5"; version = "2.3.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "mz-automation"; owner = "mz-automation";
repo = "lib60870"; repo = "lib60870";
rev = "v${finalAttrs.version}"; rev = "v${finalAttrs.version}";
hash = "sha256-TjphTBBGjzbevUR0N1GHK/nic1pAdjWeiqxEMLozQOc="; hash = "sha256-9VqLl1pDmi8TauBA8uCyymzsYd3w4b5AKtqH7XW80N4=";
}; };
sourceRoot = "${finalAttrs.src.name}/lib60870-C"; sourceRoot = "${finalAttrs.src.name}/lib60870-C";

View file

@ -13,7 +13,7 @@ buildGoModule rec {
owner = "logdyhq"; owner = "logdyhq";
repo = "logdy-core"; repo = "logdy-core";
tag = "v${version}"; tag = "v${version}";
hash = "sha256-779ZO9WhE3IKbHJLchCfrIepMH+GOrlQJALLpoNZvbc="; hash = "sha256-hhmzTJn136J8DZ719WSu8tafRp8s4MBj6vDVWYTfFyc=";
}; };
vendorHash = "sha256-kFhcbBMymzlJ+2zw7l09LJfCdps26Id+VzOehqrLDWU="; vendorHash = "sha256-kFhcbBMymzlJ+2zw7l09LJfCdps26Id+VzOehqrLDWU=";

View file

@ -20,14 +20,14 @@
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
pname = "newelle"; pname = "newelle";
version = "0.9.7"; version = "0.9.8";
pyproject = false; # uses meson pyproject = false; # uses meson
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "qwersyk"; owner = "qwersyk";
repo = "Newelle"; repo = "Newelle";
tag = version; tag = version;
hash = "sha256-h0dWjnUqWcPdSbR60HF2KvQxUyYeR3qHf2GMHt/kSm0="; hash = "sha256-VyUng/ZX8+wInRX705IWdBgTbX439R60h62ONdpZ0+8=";
}; };
postPatch = '' postPatch = ''

View file

@ -7,16 +7,16 @@
buildGoModule { buildGoModule {
pname = "pkgsite"; pname = "pkgsite";
version = "0-unstable-2025-05-23"; version = "0-unstable-2025-06-08";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "golang"; owner = "golang";
repo = "pkgsite"; repo = "pkgsite";
rev = "0e6de173c6b5ef31749de2ae384bb05ddc6726ba"; rev = "82c52f1754cd0ea741a56981d4830176071531d3";
hash = "sha256-WRNw+BjUY8/gj7tcPs0Ifz47JtBlU+SEIt12EZmtOjw="; hash = "sha256-bI5jVmCM5pSdiT+OJGrg1pBQ6ozPbXdZzrdLxr9cMUU=";
}; };
vendorHash = "sha256-s8uYvMQENqeUN8DbZ/jNhcTe2dJeiE9UYPCPGeScO10="; vendorHash = "sha256-dZKm3dMI969HKPBrC95vVmY1cZmjy+NWq7xOzXsTE14=";
subPackages = [ "cmd/pkgsite" ]; subPackages = [ "cmd/pkgsite" ];

View file

@ -9,13 +9,13 @@
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "plasma-panel-colorizer"; pname = "plasma-panel-colorizer";
version = "4.2.0"; version = "4.3.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "luisbocanegra"; owner = "luisbocanegra";
repo = "plasma-panel-colorizer"; repo = "plasma-panel-colorizer";
tag = "v${finalAttrs.version}"; tag = "v${finalAttrs.version}";
hash = "sha256-fqhuW7SoUluUJU0tv1MIUX1IhOn3j514Hlrdxlnqvvg="; hash = "sha256-B0aP49udYTV/zfEdZS4uvkGG4wZUScqTVn9+d5SYCEQ=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View file

@ -21,14 +21,14 @@ let
in in
py.pkgs.buildPythonApplication rec { py.pkgs.buildPythonApplication rec {
pname = "prowler"; pname = "prowler";
version = "5.7.2"; version = "5.7.3";
pyproject = true; pyproject = true;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "prowler-cloud"; owner = "prowler-cloud";
repo = "prowler"; repo = "prowler";
tag = version; tag = version;
hash = "sha256-yVUZsH/hLl/VCbLdaMujIl6NT6FzgkPfhpcOrQMcHGk="; hash = "sha256-b7tgSvX9o6lJZp5uKXBCn8g+RowgsTDDRYaJ8UmGX74=";
}; };
pythonRelaxDeps = true; pythonRelaxDeps = true;

View file

@ -7,14 +7,14 @@
python3.pkgs.buildPythonApplication rec { python3.pkgs.buildPythonApplication rec {
pname = "quark-engine"; pname = "quark-engine";
version = "25.5.1"; version = "25.6.1";
pyproject = true; pyproject = true;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "quark-engine"; owner = "quark-engine";
repo = "quark-engine"; repo = "quark-engine";
tag = "v${version}"; tag = "v${version}";
hash = "sha256-gu9W8+LyJHEqvn7Mrvjn7XjDjObAh8zRchNbTNWkT1M="; hash = "sha256-DAD37fzswY3c0d+ubOCYImxs4qyD4fhC3m2l0iD977A=";
}; };
build-system = with python3.pkgs; [ setuptools ]; build-system = with python3.pkgs; [ setuptools ];

View file

@ -8,11 +8,11 @@
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "scite"; pname = "scite";
version = "5.5.6"; version = "5.5.7";
src = fetchurl { src = fetchurl {
url = "https://www.scintilla.org/scite${lib.replaceStrings [ "." ] [ "" ] finalAttrs.version}.tgz"; url = "https://www.scintilla.org/scite${lib.replaceStrings [ "." ] [ "" ] finalAttrs.version}.tgz";
hash = "sha256-VmNP6NepkF7Ln9eh9pfStmch9nwIKKZTOYxkeduSxrI="; hash = "sha256-L/UceHGFgFbzUPvc2VBehXXJNmwyyPwBfgxvuv3Vxu8=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View file

@ -0,0 +1,89 @@
{
lib,
flutter329,
fetchFromGitHub,
autoPatchelfHook,
copyDesktopItems,
makeDesktopItem,
runCommand,
yq,
server-box,
_experimental-update-script-combinators,
gitUpdater,
}:
flutter329.buildFlutterApplication {
pname = "server-box";
version = "1.0.1130-unstable-2025-04-25";
src = fetchFromGitHub {
owner = "lollipopkit";
repo = "flutter_server_box";
rev = "8f09085cf30f9b48209c7c3c1e9dceac5aa5eeeb";
hash = "sha256-D2FzL34FV+7FnxyEVi/Rm2qO3c9eQmCjlH/4pMWlU5s=";
};
pubspecLock = lib.importJSON ./pubspec.lock.json;
gitHashes = {
circle_chart = "sha256-BcnL/hRf+Yv2U8Nkl7pc8BtncBW+M2by86jO5IbFIRk=";
computer = "sha256-qaD6jn78zDyZBktwJ4WTQa8oCvCWQJOBDaozBVsXNb8=";
dartssh2 = "sha256-bS916CwUuOKhRyymtmvMxt7vGXmlyiLep4AZsxRJ6iU=";
fl_build = "sha256-CSKe2yEIisftM0q79HbDTghShirWg02zi9v+hD5R57g=";
fl_lib = "sha256-+eHUpn89BI7k/MbCp09gUWGMlqLBrxOy9PgL9uXnkDI=";
plain_notification_token = "sha256-Cy1/S8bAtKCBnjfDEeW4Q2nP4jtwyCstAC1GH1efu8I=";
watch_connectivity = "sha256-9TyuElr0PNoiUvbSTOakdw1/QwWp6J2GAwzVHsgYWtM=";
xterm = "sha256-LTCMaGVqehL+wFSzWd63KeTBjjU4xCyuhfD9QmQaP0Q=";
};
nativeBuildInputs = [
copyDesktopItems
autoPatchelfHook
];
desktopItems = [
(makeDesktopItem {
name = "server-box";
exec = "server-box";
icon = "server-box";
genericName = "ServerBox";
desktopName = "ServerBox";
categories = [ "Utility" ];
keywords = [
"server"
"ssh"
"sftp"
"system"
];
})
];
postInstall = ''
install -Dm0644 assets/app_icon.png $out/share/pixmaps/server-box.png
'';
passthru = {
pubspecSource =
runCommand "pubspec.lock.json"
{
nativeBuildInputs = [ yq ];
inherit (server-box) src;
}
''
cat $src/pubspec.lock | yq > $out
'';
updateScript = _experimental-update-script-combinators.sequence [
(gitUpdater { rev-prefix = "v"; })
(_experimental-update-script-combinators.copyAttrOutputToFile "server-box.pubspecSource" ./pubspec.lock.json)
];
};
meta = {
description = "Server status & toolbox";
homepage = "https://github.com/lollipopkit/flutter_server_box";
mainProgram = "ServerBox";
license = lib.licenses.gpl3Plus;
platforms = lib.platforms.linux;
maintainers = with lib.maintainers; [ emaryn ];
};
}

File diff suppressed because it is too large Load diff

View file

@ -6,11 +6,11 @@
}: }:
stdenvNoCC.mkDerivation (finalAttrs: { stdenvNoCC.mkDerivation (finalAttrs: {
pname = "soundsource"; pname = "soundsource";
version = "5.8.2"; version = "5.8.3";
src = fetchurl { src = fetchurl {
url = "https://web.archive.org/web/20250424131232/https://cdn.rogueamoeba.com/soundsource/download/SoundSource.zip"; url = "https://web.archive.org/web/20250601123927/https://cdn.rogueamoeba.com/soundsource/download/SoundSource.zip";
hash = "sha256-RilL2nD0pUQKCb63uip7q9kmsKVXvEPcT+GUfZKtKNM="; hash = "sha256-tomlsji65xVPTqX36UKf7S04M1iBxsXVJFEFqWPgBac=";
}; };
dontUnpack = true; dontUnpack = true;

View file

@ -0,0 +1,49 @@
{
lib,
python3Packages,
fetchFromGitHub,
versionCheckHook,
}:
python3Packages.buildPythonApplication rec {
pname = "submit50";
version = "3.2.0";
pyproject = true;
src = fetchFromGitHub {
owner = "cs50";
repo = "submit50";
tag = "v${version}";
hash = "sha256-i1hO9P3FGamo4b733/U7d2fiWLdnTskrHM2BXxxDePc=";
};
build-system = [
python3Packages.setuptools
];
dependencies = with python3Packages; [
lib50
packaging
pytz
requests
termcolor
];
pythonImportsCheck = [ "submit50" ];
nativeCheckInputs = [ versionCheckHook ];
versionCheckProgramArg = "--version";
# no python tests
meta = {
description = "Tool for submitting student CS50 code";
homepage = "https://cs50.readthedocs.io/submit50/";
downloadPage = "https://github.com/cs50/submit50";
changelog = "https://github.com/cs50/submit50/releases/tag/v${version}";
license = lib.licenses.gpl3Only;
platforms = lib.platforms.unix;
maintainers = with lib.maintainers; [ ethancedwards8 ];
mainProgram = "submit50";
};
}

View file

@ -10,13 +10,13 @@
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "tailwindcss-language-server"; pname = "tailwindcss-language-server";
version = "0.14.19"; version = "0.14.21";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "tailwindlabs"; owner = "tailwindlabs";
repo = "tailwindcss-intellisense"; repo = "tailwindcss-intellisense";
tag = "v${finalAttrs.version}"; tag = "v${finalAttrs.version}";
hash = "sha256-lAZ3BoecPB3+zmI8RataAcbk32avV9Ie+Ek6q/JcXnU="; hash = "sha256-UmeaNCMuXSPVuzYAjOhhHkKkTcsBnjLbB3oeXG8uv5U=";
}; };
pnpmDeps = pnpm_9.fetchDeps { pnpmDeps = pnpm_9.fetchDeps {
@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
pnpmWorkspaces pnpmWorkspaces
prePnpmInstall prePnpmInstall
; ;
hash = "sha256-TxWaapm/nkyMi3JCj6TE56DhJYPBWBDGXOnzgB9uPjs="; hash = "sha256-SUEq20gZCiTDkFuNgMc5McHBPgW++8P9Q1MJb7a7pY8=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View file

@ -11,7 +11,7 @@
buildGoModule rec { buildGoModule rec {
pname = "vale"; pname = "vale";
version = "3.11.2"; version = "3.12.0";
subPackages = [ "cmd/vale" ]; subPackages = [ "cmd/vale" ];
@ -19,10 +19,10 @@ buildGoModule rec {
owner = "errata-ai"; owner = "errata-ai";
repo = "vale"; repo = "vale";
tag = "v${version}"; tag = "v${version}";
hash = "sha256-7wBMdATN2kAXUG6fWwq/8JifLrhxDjjPWlZSA47yrxM="; hash = "sha256-j228Gt2cHkO1XZv+KqH6U8EjttQzDZiOMLppdJUJwvA=";
}; };
vendorHash = "sha256-Zhhp/qbwGTQEZ28S+p7GJodwQcnkFNqNU7WCZKdeoz0="; vendorHash = "sha256-3gmgKcpCEeFjHpm+iKQvm4Cv5UfzFrcDDNIAnlY/a5s=";
ldflags = [ ldflags = [
"-s" "-s"

View file

@ -210,6 +210,12 @@ buildFHSEnv {
substituteInPlace $out/share/applications/com.tencent.wechat.desktop \ substituteInPlace $out/share/applications/com.tencent.wechat.desktop \
--replace-quiet 'Exec=/usr/bin/wechat' "Exec=$out/bin/wechat-uos --" --replace-quiet 'Exec=/usr/bin/wechat' "Exec=$out/bin/wechat-uos --"
# See https://github.com/NixOS/nixpkgs/issues/413491
sed -i \
-e '/\[Desktop Entry\]/a\' \
-e 'StartupWMClass=wechat' \
$out/share/applications/com.tencent.wechat.desktop
''; '';
targetPkgs = pkgs: [ wechat-uos-env ]; targetPkgs = pkgs: [ wechat-uos-env ];

View file

@ -18,6 +18,7 @@
gzip, gzip,
lhasa, lhasa,
wrapGAppsHook3, wrapGAppsHook3,
desktopToDarwinBundle,
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -37,7 +38,8 @@ stdenv.mkDerivation rec {
makeWrapper makeWrapper
pkg-config pkg-config
wrapGAppsHook3 wrapGAppsHook3
]; ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ desktopToDarwinBundle ];
buildInputs = [ buildInputs = [
gtk3 gtk3
bash # so patchShebangs can patch #!/bin/sh in xarchiver.tap bash # so patchShebangs can patch #!/bin/sh in xarchiver.tap
@ -63,7 +65,6 @@ stdenv.mkDerivation rec {
strictDeps = true; strictDeps = true;
meta = { meta = {
broken = stdenv.hostPlatform.isDarwin;
description = "GTK frontend to 7z,zip,rar,tar,bzip2, gzip,arj, lha, rpm and deb (open and extract only)"; description = "GTK frontend to 7z,zip,rar,tar,bzip2, gzip,arj, lha, rpm and deb (open and extract only)";
homepage = "https://github.com/ib/xarchiver"; homepage = "https://github.com/ib/xarchiver";
maintainers = [ lib.maintainers.domenkozar ]; maintainers = [ lib.maintainers.domenkozar ];

View file

@ -16,14 +16,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "aioamazondevices"; pname = "aioamazondevices";
version = "3.0.5"; version = "3.0.6";
pyproject = true; pyproject = true;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "chemelli74"; owner = "chemelli74";
repo = "aioamazondevices"; repo = "aioamazondevices";
tag = "v${version}"; tag = "v${version}";
hash = "sha256-CgIkrq5Eni7Iva/bzlcbj1/mqtKPA4mknHC/fQzL7RU="; hash = "sha256-+o3LOp0gSjG1/x5IFA0FK5LQUFG9T6JgDLb104vJcM0=";
}; };
build-system = [ poetry-core ]; build-system = [ poetry-core ];

View file

@ -13,14 +13,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "aioimmich"; pname = "aioimmich";
version = "0.9.0"; version = "0.9.1";
pyproject = true; pyproject = true;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "mib1185"; owner = "mib1185";
repo = "aioimmich"; repo = "aioimmich";
tag = "v${version}"; tag = "v${version}";
hash = "sha256-s2W/Z/psCLvd7zMsaaYi3ZIcEuuRSpyRSvUUfIPe8a4="; hash = "sha256-bEbWvDNcKH/9Mtr3fZMk7+Qa41suSUpVAGAsnCmzGaY=";
}; };
postPatch = '' postPatch = ''

View file

@ -16,14 +16,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "google-genai"; pname = "google-genai";
version = "1.17.0"; version = "1.19.0";
pyproject = true; pyproject = true;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "googleapis"; owner = "googleapis";
repo = "python-genai"; repo = "python-genai";
tag = "v${version}"; tag = "v${version}";
hash = "sha256-ks8MU+Sg6TM57QiNmZD6rTGF8Di32mKtHFTF1pCTouQ="; hash = "sha256-p9W34v1ToLwketM+wOfrouLLl9pFBljL5doykuZRINo=";
}; };
build-system = [ build-system = [

View file

@ -33,7 +33,7 @@ buildPythonPackage rec {
]; ];
# tests raise an exception if the system is not Linux or Windows # tests raise an exception if the system is not Linux or Windows
doCheck = !stdenv.isDarwin; doCheck = !stdenv.buildPlatform.isDarwin;
# tests require gotify-server to be located in ./tests/test-server/gotify-linux-{arch} # tests require gotify-server to be located in ./tests/test-server/gotify-linux-{arch}
postPatch = '' postPatch = ''

View file

@ -1,6 +1,5 @@
{ {
lib, lib,
stdenv,
buildPythonPackage, buildPythonPackage,
fetchFromGitHub, fetchFromGitHub,
@ -116,6 +115,7 @@ buildPythonPackage rec {
# pytest.PytestUnraisableExceptionWarning: Exception ignored in: <sqlite3.Connection object at 0x115dcc9a0> # pytest.PytestUnraisableExceptionWarning: Exception ignored in: <sqlite3.Connection object at 0x115dcc9a0>
# ResourceWarning: unclosed database in <sqlite3.Connection object at 0x115dcc9a0> # ResourceWarning: unclosed database in <sqlite3.Connection object at 0x115dcc9a0>
"test_clean_book" "test_clean_book"
"test_clean_html"
"test_clean_html_latex" "test_clean_html_latex"
"test_clean_latex" "test_clean_latex"
]; ];

View file

@ -31,14 +31,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "jupytext"; pname = "jupytext";
version = "1.17.1"; version = "1.17.2";
pyproject = true; pyproject = true;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "mwouts"; owner = "mwouts";
repo = "jupytext"; repo = "jupytext";
tag = "v${version}"; tag = "v${version}";
hash = "sha256-Rkz2rite0hKcts4+3SmFsDF6tH2kQa4d2DtyZsAx3rA="; hash = "sha256-xMmtppXect+PRlEp2g0kJurALVvcfza+FBbZbK2SbHc=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View file

@ -17,14 +17,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "llama-cloud-services"; pname = "llama-cloud-services";
version = "0.6.23"; version = "0.6.28";
pyproject = true; pyproject = true;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "run-llama"; owner = "run-llama";
repo = "llama_cloud_services"; repo = "llama_cloud_services";
tag = "v${version}"; tag = "v${version}";
hash = "sha256-G1qjm7GpSZDgGWys+toXiQoRJHIQUcwG6+0JK8k3XfE="; hash = "sha256-2ANsXUOTTWhIS6/BPvlOox4KJcQI0lngPMAf3Hous7s=";
}; };
pythonRelaxDeps = [ "llama-cloud" ]; pythonRelaxDeps = [ "llama-cloud" ];

View file

@ -14,14 +14,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "mkdocstrings-python"; pname = "mkdocstrings-python";
version = "1.16.11"; version = "1.16.12";
pyproject = true; pyproject = true;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "mkdocstrings"; owner = "mkdocstrings";
repo = "python"; repo = "python";
tag = version; tag = version;
hash = "sha256-Vee8pNslf/nELnIeMPkuBsbMVLLcK5CyIAaKTh/OEMM="; hash = "sha256-NL5gn8HgT0hvIlUDs//sErAaSVXvxLDJGT7nZX65ZVU=";
}; };
build-system = [ pdm-backend ]; build-system = [ pdm-backend ];

View file

@ -11,14 +11,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "netbox-routing"; pname = "netbox-routing";
version = "0.3.0"; version = "0.3.1";
pyproject = true; pyproject = true;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "DanSheps"; owner = "DanSheps";
repo = "netbox-routing"; repo = "netbox-routing";
tag = "v${version}"; tag = "v${version}";
hash = "sha256-QJ4/6eRPo2SIgOWNiK+3jrXW+KaXvzERLcXQqKwCNDU="; hash = "sha256-qtGzZDRo80pdmt3CbM+HG/S7uLvLS7V6lHNB8sM6bcA=";
}; };
build-system = [ setuptools ]; build-system = [ setuptools ];

View file

@ -2,53 +2,39 @@
lib, lib,
buildPythonPackage, buildPythonPackage,
fetchFromGitHub, fetchFromGitHub,
fetchpatch2,
cryptography, cryptography,
charset-normalizer, charset-normalizer,
pythonOlder,
pytestCheckHook, pytestCheckHook,
setuptools, setuptools,
replaceVars, setuptools-scm,
ocrmypdf, ocrmypdf,
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "pdfminer-six"; pname = "pdfminer-six";
version = "20240706"; version = "20250506";
pyproject = true; pyproject = true;
disabled = pythonOlder "3.8";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "pdfminer"; owner = "pdfminer";
repo = "pdfminer.six"; repo = "pdfminer.six";
tag = version; tag = version;
hash = "sha256-aY7GQADRxeiclr6/G3RRgrPcl8rGiC85JYEIjIa+vG0="; hash = "sha256-BE/HMl/e1KnkSc2jXU5Du5FMF+rCBv5AJ7a88oFrBgM=";
}; };
patches = [ build-system = [
# https://github.com/pdfminer/pdfminer.six/pull/1027 setuptools
(fetchpatch2 { setuptools-scm
name = "fix-dereference-MediaBox.patch";
url = "https://github.com/pdfminer/pdfminer.six/pull/1027/commits/ad101c152c71431a21bfa5a8dbe33b3ba385ceec.patch?full_index=1";
excludes = [ "CHANGELOG.md" ];
hash = "sha256-fsSXvN92MVtNFpAst0ctvGrbxVvoe4Nyz4wMZqJ1aw8=";
})
(replaceVars ./disable-setuptools-git-versioning.patch {
inherit version;
})
]; ];
build-system = [ setuptools ];
dependencies = [ dependencies = [
charset-normalizer charset-normalizer
cryptography cryptography
]; ];
postInstall = '' postInstall = ''
for file in $out/bin/*.py; do for file in "$out/bin/"*.py; do
ln $file ''${file//.py/} mv "$file" "''${file%.py}"
done done
''; '';
@ -71,11 +57,11 @@ buildPythonPackage rec {
}; };
}; };
meta = with lib; { meta = {
changelog = "https://github.com/pdfminer/pdfminer.six/blob/${src.rev}/CHANGELOG.md"; changelog = "https://github.com/pdfminer/pdfminer.six/blob/${src.rev}/CHANGELOG.md";
description = "PDF parser and analyzer"; description = "PDF parser and analyzer";
homepage = "https://github.com/pdfminer/pdfminer.six"; homepage = "https://github.com/pdfminer/pdfminer.six";
license = licenses.mit; license = lib.licenses.mit;
maintainers = with maintainers; [ psyanticy ]; maintainers = with lib.maintainers; [ psyanticy ];
}; };
} }

View file

@ -1,16 +0,0 @@
diff --git a/setup.py b/setup.py
index 42764e2..e7b93d3 100644
--- a/setup.py
+++ b/setup.py
@@ -19,10 +19,7 @@ if sys.version_info < (3, 12):
setup(
name="pdfminer.six",
- setuptools_git_versioning={
- "enabled": True,
- },
- setup_requires=["setuptools-git-versioning<3"],
+ version="@version@",
packages=["pdfminer"],
package_data={"pdfminer": ["cmap/*.pickle.gz", "py.typed"]},
install_requires=[

View file

@ -1,8 +1,9 @@
{ {
lib,
pkgs, pkgs,
lib,
buildPythonPackage, buildPythonPackage,
fetchFromGitHub, fetchFromGitHub,
setuptools,
jupyterlab, jupyterlab,
nbexec, nbexec,
pandas, pandas,
@ -14,33 +15,29 @@
pytest-parallel, pytest-parallel,
pytestCheckHook, pytestCheckHook,
types-pillow, types-pillow,
writableTmpDirAsHomeHook,
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "pdfplumber"; pname = "pdfplumber";
version = "0.11.5"; version = "0.11.6";
format = "setuptools"; pyproject = true;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "jsvine"; owner = "jsvine";
repo = "pdfplumber"; repo = "pdfplumber";
tag = "v${version}"; tag = "v${version}";
hash = "sha256-oe6lZyQKXASzG7Ho6o7mlXY+BOgVBaACebxbYD+1+x0="; hash = "sha256-ljoM252w0oOqTUgYT6jtAW+jElPU9a49K6Atwdv5Dvo=";
}; };
build-system = [ setuptools ];
dependencies = [ dependencies = [
pdfminer-six pdfminer-six
pillow pillow
pypdfium2 pypdfium2
]; ];
preCheck = ''
export HOME=$(mktemp -d)
# test_issue_1089 assumes the soft limit on open files is "low", otherwise it never completes
# reported at: https://github.com/jsvine/pdfplumber/issues/1263
ulimit -n 1024
'';
nativeCheckInputs = [ nativeCheckInputs = [
pkgs.ghostscript pkgs.ghostscript
jupyterlab jupyterlab
@ -51,6 +48,16 @@ buildPythonPackage rec {
pytest-parallel pytest-parallel
pytestCheckHook pytestCheckHook
types-pillow types-pillow
writableTmpDirAsHomeHook
];
pythonRelaxDeps = [ "pdfminer.six" ];
disabledTestPaths = [
# AssertionError
"tests/test_convert.py::Test::test_cli_csv"
"tests/test_convert.py::Test::test_cli_csv_exclude"
"tests/test_convert.py::Test::test_csv"
]; ];
pythonImportsCheck = [ "pdfplumber" ]; pythonImportsCheck = [ "pdfplumber" ];

View file

@ -15,7 +15,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "pdoc"; pname = "pdoc";
version = "15.0.3"; version = "15.0.4";
disabled = pythonOlder "3.9"; disabled = pythonOlder "3.9";
pyproject = true; pyproject = true;
@ -23,8 +23,8 @@ buildPythonPackage rec {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "mitmproxy"; owner = "mitmproxy";
repo = "pdoc"; repo = "pdoc";
rev = "v${version}"; tag = "v${version}";
hash = "sha256-qr0K+ZOmEPWMkm/cPisdw6gSPZI4FvICaKQNt/sef40="; hash = "sha256-l0aaQbjxAMcTZZwDN6g8A7bjSsl6yP2FoAnwTYkKYH8=";
}; };
build-system = [ setuptools ]; build-system = [ setuptools ];

View file

@ -20,7 +20,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "python-bsblan"; pname = "python-bsblan";
version = "1.2.2"; version = "2.1.0";
pyproject = true; pyproject = true;
disabled = pythonOlder "3.12"; disabled = pythonOlder "3.12";
@ -29,7 +29,7 @@ buildPythonPackage rec {
owner = "liudger"; owner = "liudger";
repo = "python-bsblan"; repo = "python-bsblan";
tag = "v${version}"; tag = "v${version}";
hash = "sha256-qzQP77bfV21g7DIdZfJCyv9FN/U6aQk9wWV9xPZFolk="; hash = "sha256-HaB1ypC2IkSEnM5Ek583CFvwWt1nm1gWUdoh5MH09YQ=";
}; };
postPatch = '' postPatch = ''
@ -65,7 +65,7 @@ buildPythonPackage rec {
meta = with lib; { meta = with lib; {
description = "Module to control and monitor an BSBLan device programmatically"; description = "Module to control and monitor an BSBLan device programmatically";
homepage = "https://github.com/liudger/python-bsblan"; homepage = "https://github.com/liudger/python-bsblan";
changelog = "https://github.com/liudger/python-bsblan/releases/tag/v${version}"; changelog = "https://github.com/liudger/python-bsblan/releases/tag/${src.tag}";
license = licenses.mit; license = licenses.mit;
maintainers = with maintainers; [ fab ]; maintainers = with maintainers; [ fab ];
}; };

View file

@ -96,5 +96,10 @@ buildPythonPackage rec {
changelog = "https://github.com/skorch-dev/skorch/blob/master/CHANGES.md"; changelog = "https://github.com/skorch-dev/skorch/blob/master/CHANGES.md";
license = lib.licenses.bsd3; license = lib.licenses.bsd3;
maintainers = with lib.maintainers; [ bcdarwin ]; maintainers = with lib.maintainers; [ bcdarwin ];
badPlatforms = [
# Most tests fail with:
# Fatal Python error: Segmentation fault
lib.systems.inspect.patterns.isDarwin
];
}; };
} }

View file

@ -69,25 +69,6 @@ let
}; };
in in
{ {
texinfo413 = stdenv.mkDerivation (finalAttrs: {
pname = "texinfo";
version = "4.13a";
src = fetchurl {
url = "mirror://gnu/texinfo/texinfo-${finalAttrs.version}.tar.lzma";
hash = "sha256-bSiwzq6GbjU2FC/FUuejvJ+EyDAxGcJXMbJHju9kyeU=";
};
buildInputs = [ ncurses ];
nativeBuildInputs = [ xz ];
# Disabled because we don't have zdiff in the stdenv bootstrap.
#doCheck = true;
meta = meta // {
branch = finalAttrs.version;
};
});
texinfo6_5 = buildTexinfo { texinfo6_5 = buildTexinfo {
version = "6.5"; version = "6.5";
hash = "sha256-d3dLP0oGwgcFzC7xyASGRCLjz5UjXpZbHwCkbffaX2I="; hash = "sha256-d3dLP0oGwgcFzC7xyASGRCLjz5UjXpZbHwCkbffaX2I=";

View file

@ -1,65 +0,0 @@
{
lib,
stdenv,
fetchFromGitHub,
gettext,
installShellFiles,
ncurses,
ui ? "terminal",
}:
assert lib.elem ui [
"terminal"
"curses"
];
stdenv.mkDerivation (finalAttrs: {
pname = "2048-cli";
version = "unstable-2019-12-10";
src = fetchFromGitHub {
owner = "tiehuis";
repo = "2048-cli";
rev = "67439255df7d4f70209ca628d65128cd41d33e8d";
hash = "sha256-U7g2wCZgR7Lp/69ktQIZZ1cScll2baCequemTl3Mc3I=";
};
postPatch = ''
substituteInPlace Makefile \
--replace "-lcurses" "-lncurses"
'';
nativeBuildInputs = [
installShellFiles
];
buildInputs = [
gettext
] ++ (lib.optional (ui == "curses") ncurses);
dontConfigure = true;
env.NIX_CFLAGS_COMPILE = "-I${lib.getDev gettext}/share/gettext/";
makeFlags = [
"CC=${stdenv.cc.targetPrefix}cc"
ui
];
installPhase = ''
runHook preInstall
install -Dm755 -t $out/bin 2048
installManPage man/2048.6
runHook postInstall
'';
meta = {
homepage = "https://github.com/tiehuis/2048-cli";
description = "Game 2048 for your Linux terminal";
license = lib.licenses.mit;
maintainers = [ ];
platforms = lib.platforms.unix;
mainProgram = "2048";
};
})

View file

@ -11,7 +11,6 @@
xz, xz,
freetype, freetype,
fontconfig, fontconfig,
nlohmann_json,
curl, curl,
icu, icu,
harfbuzz, harfbuzz,
@ -35,30 +34,43 @@
alsa-lib, alsa-lib,
libjack2, libjack2,
makeWrapper, makeWrapper,
buildPackages,
}: }:
let let
opengfx = fetchzip { opengfx = fetchzip {
url = "https://cdn.openttd.org/opengfx-releases/7.1/opengfx-7.1-all.zip"; url = "https://cdn.openttd.org/opengfx-releases/7.1/opengfx-7.1-all.zip";
sha256 = "sha256-daJ/Qwg/okpmLQkXcCjruIiP8GEwyyp02YWcGQepxzs="; hash = "sha256-daJ/Qwg/okpmLQkXcCjruIiP8GEwyyp02YWcGQepxzs=";
}; };
opensfx = fetchzip { opensfx = fetchzip {
url = "https://cdn.openttd.org/opensfx-releases/1.0.3/opensfx-1.0.3-all.zip"; url = "https://cdn.openttd.org/opensfx-releases/1.0.3/opensfx-1.0.3-all.zip";
sha256 = "sha256-QmfXizrRTu/fUcVOY7tCndv4t4BVW+fb0yUi8LgSYzM="; hash = "sha256-QmfXizrRTu/fUcVOY7tCndv4t4BVW+fb0yUi8LgSYzM=";
}; };
openmsx = fetchzip { openmsx = fetchzip {
url = "https://cdn.openttd.org/openmsx-releases/0.4.2/openmsx-0.4.2-all.zip"; url = "https://cdn.openttd.org/openmsx-releases/0.4.2/openmsx-0.4.2-all.zip";
sha256 = "sha256-Cgrg2m+uTODFg39mKgX+hE8atV7v5bVyZd716vSZB8M="; hash = "sha256-Cgrg2m+uTODFg39mKgX+hE8atV7v5bVyZd716vSZB8M=";
}; };
# OpenTTD builds and uses some of its own tools during the build and we need those to be available for cross-compilation.
# Build the tools for buildPlatform with minimal dependencies, using the "OPTION_TOOLS_ONLY" flag.
crossTools = buildPackages.openttd.overrideAttrs (oldAttrs: {
pname = "openttd-tools";
buildInputs = [ ];
cmakeFlags = oldAttrs.cmakeFlags or [ ] ++ [ (lib.cmakeBool "OPTION_TOOLS_ONLY" true) ];
installPhase = ''
install -Dm555 src/strgen/strgen -t $out/bin
install -Dm555 src/settingsgen/settingsgen -t $out/bin
'';
});
in in
stdenv.mkDerivation rec { stdenv.mkDerivation (finalAttrs: {
pname = "openttd"; pname = "openttd";
version = "14.1"; version = "14.1";
src = fetchzip { src = fetchzip {
url = "https://cdn.openttd.org/openttd-releases/${version}/${pname}-${version}-source.tar.xz"; url = "https://cdn.openttd.org/openttd-releases/${finalAttrs.version}/openttd-${finalAttrs.version}-source.tar.xz";
hash = "sha256-YT4IE/rJ9pnpeMWKbOra6AbSUwW19RwOKlXkxwoMeKY="; hash = "sha256-YT4IE/rJ9pnpeMWKbOra6AbSUwW19RwOKlXkxwoMeKY=";
}; };
@ -72,11 +84,16 @@ stdenv.mkDerivation rec {
}) })
]; ];
nativeBuildInputs = [ nativeBuildInputs =
cmake [
pkg-config cmake
makeWrapper pkg-config
]; makeWrapper
]
++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
crossTools
];
buildInputs = buildInputs =
[ [
SDL2 SDL2
@ -85,7 +102,6 @@ stdenv.mkDerivation rec {
zlib zlib
freetype freetype
fontconfig fontconfig
nlohmann_json
curl curl
icu icu
harfbuzz harfbuzz
@ -107,9 +123,7 @@ stdenv.mkDerivation rec {
libjack2 libjack2
]; ];
prefixKey = "--prefix-dir="; strictDeps = true;
configureFlags = [ "--without-liblzo2" ];
postPatch = '' postPatch = ''
substituteInPlace src/music/fluidsynth.cpp \ substituteInPlace src/music/fluidsynth.cpp \
@ -128,7 +142,7 @@ stdenv.mkDerivation rec {
tar -xf ${openmsx}/*.tar -C $out/share/games/openttd/baseset tar -xf ${openmsx}/*.tar -C $out/share/games/openttd/baseset
''; '';
meta = with lib; { meta = {
description = ''Open source clone of the Microprose game "Transport Tycoon Deluxe"''; description = ''Open source clone of the Microprose game "Transport Tycoon Deluxe"'';
mainProgram = "openttd"; mainProgram = "openttd";
longDescription = '' longDescription = ''
@ -142,12 +156,12 @@ stdenv.mkDerivation rec {
- observe as spectators - observe as spectators
''; '';
homepage = "https://www.openttd.org/"; homepage = "https://www.openttd.org/";
changelog = "https://cdn.openttd.org/openttd-releases/${version}/changelog.txt"; changelog = "https://cdn.openttd.org/openttd-releases/${finalAttrs.version}/changelog.txt";
license = licenses.gpl2Only; license = lib.licenses.gpl2Only;
platforms = platforms.linux; platforms = lib.platforms.linux;
maintainers = with maintainers; [ maintainers = with lib.maintainers; [
jcumming jcumming
fpletz fpletz
]; ];
}; };
} })

View file

@ -27,6 +27,7 @@
armTrustedFirmwareRK3568, armTrustedFirmwareRK3568,
armTrustedFirmwareRK3588, armTrustedFirmwareRK3588,
armTrustedFirmwareS905, armTrustedFirmwareS905,
opensbi,
buildPackages, buildPackages,
}@pkgs: }@pkgs:
@ -808,6 +809,26 @@ in
# sf probe; sf update $loadaddr 0 80000 # sf probe; sf update $loadaddr 0 80000
}; };
ubootVisionFive2 =
let
opensbi_vf2 = opensbi.overrideAttrs (attrs: {
makeFlags = attrs.makeFlags ++ [
# Matches u-boot documentation: https://docs.u-boot.org/en/latest/board/starfive/visionfive2.html
"FW_TEXT_START=0x40000000"
"FW_OPTIONS=0"
];
});
in
buildUBoot {
defconfig = "starfive_visionfive2_defconfig";
extraMeta.platforms = [ "riscv64-linux" ];
OPENSBI = "${opensbi_vf2}/share/opensbi/lp64/generic/firmware/fw_dynamic.bin";
filesToInstall = [
"spl/u-boot-spl.bin.normal.out"
"u-boot.itb"
];
};
ubootWandboard = buildUBoot { ubootWandboard = buildUBoot {
defconfig = "wandboard_defconfig"; defconfig = "wandboard_defconfig";
extraMeta.platforms = [ "armv7l-linux" ]; extraMeta.platforms = [ "armv7l-linux" ];

View file

@ -224,6 +224,9 @@ mapAliases {
### _ ### ### _ ###
_1password = lib.warnOnInstantiate "_1password has been renamed to _1password-cli to better follow upstream name usage" _1password-cli; # Added 2024-10-24 _1password = lib.warnOnInstantiate "_1password has been renamed to _1password-cli to better follow upstream name usage" _1password-cli; # Added 2024-10-24
_2048-cli = throw "'_2048-cli' has been removed due to archived upstream. Consider using '_2048-in-terminal' instead."; # Added 2025-06-07
_2048-cli-curses = throw "'_2048-cli-curses' has been removed due to archived upstream. Consider using '_2048-in-terminal' instead."; # Added 2025-06-07
_2048-cli-terminal = throw "'_2048-cli-curses' has been removed due to archived upstream. Consider using '_2048-in-terminal' instead."; # Added 2025-06-07
_5etools = throw "'_5etools' has been removed, as upstream is in a questionable legal position and the build was broken."; _5etools = throw "'_5etools' has been removed, as upstream is in a questionable legal position and the build was broken.";
"7z2hashcat" = "7z2hashcat" =
throw "'7z2hashcat' has been renamed to '_7z2hashcat' as the former isn't a valid variable name."; # Added 2024-11-27 throw "'7z2hashcat' has been renamed to '_7z2hashcat' as the former isn't a valid variable name."; # Added 2024-11-27
@ -1896,6 +1899,7 @@ mapAliases {
tepl = libgedit-tepl; # Added 2024-04-29 tepl = libgedit-tepl; # Added 2024-04-29
termplay = throw "'termplay' has been removed due to lack of maintenance upstream"; # Added 2025-01-25 termplay = throw "'termplay' has been removed due to lack of maintenance upstream"; # Added 2025-01-25
testVersion = testers.testVersion; # Added 2022-04-20 testVersion = testers.testVersion; # Added 2022-04-20
texinfo4 = throw "'texinfo4' has been removed in favor of the latest version"; # Added 2025-06-08
tezos-rust-libs = ligo; # Added 2025-06-03 tezos-rust-libs = ligo; # Added 2025-06-03
tfplugindocs = terraform-plugin-docs; # Added 2023-11-01 tfplugindocs = terraform-plugin-docs; # Added 2023-11-01
thiefmd = throw "'thiefmd' has been removed due to lack of maintenance upstream and incompatible with newer Pandoc. Please use 'apostrophe' or 'folio' instead"; # Added 2025-02-20 thiefmd = throw "'thiefmd' has been removed due to lack of maintenance upstream and incompatible with newer Pandoc. Please use 'apostrophe' or 'folio' instead"; # Added 2025-02-20

View file

@ -7689,13 +7689,11 @@ with pkgs;
texinfoPackages = callPackages ../development/tools/misc/texinfo/packages.nix { }; texinfoPackages = callPackages ../development/tools/misc/texinfo/packages.nix { };
inherit (texinfoPackages) inherit (texinfoPackages)
texinfo413
texinfo6_5 # needed for allegro texinfo6_5 # needed for allegro
texinfo6_7 # needed for gpm, iksemel and fwknop texinfo6_7 # needed for gpm, iksemel and fwknop
texinfo6 texinfo6
texinfo7 texinfo7
; ;
texinfo4 = texinfo413; # needed for eukleides and singular
texinfo = texinfo7; texinfo = texinfo7;
texinfoInteractive = texinfo.override { interactive = true; }; texinfoInteractive = texinfo.override { interactive = true; };
@ -11517,6 +11515,7 @@ with pkgs;
ubootSopine ubootSopine
ubootTuringRK1 ubootTuringRK1
ubootUtilite ubootUtilite
ubootVisionFive2
ubootWandboard ubootWandboard
; ;
@ -12981,8 +12980,6 @@ with pkgs;
kbibtex = libsForQt5.callPackage ../applications/office/kbibtex { }; kbibtex = libsForQt5.callPackage ../applications/office/kbibtex { };
kaidan = kdePackages.callPackage ../applications/networking/instant-messengers/kaidan { };
kexi = libsForQt5.callPackage ../applications/office/kexi { }; kexi = libsForQt5.callPackage ../applications/office/kexi { };
kgraphviewer = callPackage ../applications/graphics/kgraphviewer { }; kgraphviewer = callPackage ../applications/graphics/kgraphviewer { };
@ -14789,10 +14786,6 @@ with pkgs;
### GAMES ### GAMES
_2048-cli = _2048-cli-terminal;
_2048-cli-curses = callPackage ../games/2048-cli { ui = "curses"; };
_2048-cli-terminal = callPackage ../games/2048-cli { ui = "terminal"; };
_90secondportraits = callPackage ../games/90secondportraits { love = love_0_10; }; _90secondportraits = callPackage ../games/90secondportraits { love = love_0_10; };
inherit (callPackages ../games/fteqw { }) inherit (callPackages ../games/fteqw { })