Merge staging-next into staging

This commit is contained in:
nixpkgs-ci[bot]
2025-08-27 00:17:25 +00:00
committed by GitHub
178 changed files with 1871 additions and 5984 deletions
+2
View File
@@ -50,6 +50,8 @@
- Zig 0.12 has been removed.
- `ansible-later` has been removed because it was discontinued by the author.
- `stalwart-mail` since `0.13.0` "introduces a significant redesign of the MTAs delivery and queueing subsystem". See [the upgrading announcement for the `0.13.0` release](https://github.com/stalwartlabs/stalwart/blob/89b561b5ca1c5a11f2a768b4a2cfef0f473b7a01/UPGRADING.md#upgrading-from-v012x-and-v011x-to-v013x).
- Greetd and its original greeters (`tuigreet`, `gtkgreet`, `qtgreet`, `regreet`, `wlgreet`) were moved from `greetd` namespace to top level (`greetd.tuigreet` -> `tuigreet`, `greetd.greetd` -> `greetd`, etc). The original attrs are available for compatibility as passthrus of `greetd`, but will emit a warning. They will be removed in future releases.
+1 -1
View File
@@ -140,7 +140,7 @@ stdenv.mkDerivation {
### Switching the MPI implementation {#sec-overlays-alternatives-mpi}
All programs that are built with [MPI](https://en.wikipedia.org/wiki/Message_Passing_Interface) support use the generic attribute `mpi` as an input. At the moment Nixpkgs natively provides two different MPI implementations:
All programs that are built with [MPI](https://en.wikipedia.org/wiki/Message_Passing_Interface) support use the generic attribute `mpi` as an input. At the moment Nixpkgs natively provides the following MPI implementations:
- [Open MPI](https://www.open-mpi.org/) (default), attribute name
`openmpi`
+36
View File
@@ -541,6 +541,12 @@
github = "aciceri";
githubId = 2318843;
};
acidbong = {
name = "Acid Bong";
email = "acidbong@tilde.club";
github = "acid-bong";
githubId = 94849097;
};
acowley = {
email = "acowley@gmail.com";
github = "acowley";
@@ -1581,6 +1587,12 @@
githubId = 587021;
name = "André V L Matos";
};
andrewbastin = {
email = "andrewbastin.k@gmail.com";
github = "AndrewBastin";
githubId = 9131943;
name = "Andrew Bastin";
};
andrewchambers = {
email = "ac@acha.ninja";
github = "andrewchambers";
@@ -2071,6 +2083,12 @@
githubId = 29145250;
name = "Armeen Mahdian";
};
armelclo = {
email = "armel@armelclo.fr";
github = "ArmelClo";
githubId = 61419525;
name = "Armel Cloarec";
};
armijnhemel = {
email = "armijn@tjaldur.nl";
github = "armijnhemel";
@@ -18476,6 +18494,12 @@
githubId = 148037;
name = "Joachim Breitner";
};
nomis = {
email = "nixpkgs@octiron.net";
github = "nomis";
githubId = 70171;
name = "Simon Arlott";
};
nomisiv = {
email = "simon@nomisiv.com";
github = "NomisIV";
@@ -18698,6 +18722,12 @@
githubId = 51034487;
matrix = "@nullcube:matrix.org";
};
nulleric = {
email = "erichelgeson@gmail.com";
name = "Eric Helgeson";
github = "erichelgeson";
githubId = 271734;
};
nullishamy = {
email = "spam@amyerskine.me";
name = "nullishamy";
@@ -23284,6 +23314,12 @@
githubId = 1588288;
name = "Shahrukh Khan";
};
shakhzodkudratov = {
email = "shakhzodkudratov@gmail.com";
github = "shakhzodkudratov";
githubId = 37299109;
name = "Shakhzod Kudratov";
};
shamilton = {
email = "sgn.hamilton@protonmail.com";
github = "SCOTT-HAMILTON";
+1
View File
@@ -1256,6 +1256,7 @@ with lib.maintainers;
orzklv
bahrom04
bemeritus
shakhzodkudratov
];
scope = "Maintain Uzbek Linux state & community packages and modules.";
shortName = "Uzinfocom Open Source";
@@ -151,6 +151,8 @@
- `renovate` was updated to v41. See the upstream release notes for [v40](https://github.com/renovatebot/renovate/releases/tag/40.0.0) and [v41](https://github.com/renovatebot/renovate/releases/tag/41.0.0) for breaking changes.
- `i18n.inputMethod.fcitx5.plasma6Support` has been removed because qt6 is the only one used for fcitx5-configtool now.
- The `boot.readOnlyNixStore` has been removed. Control over bind mount options on `/nix/store` is now offered by the `boot.nixStoreMountOpts` option.
- The Postfix module has been updated and likely requires configuration changes:
+4 -14
View File
@@ -7,11 +7,7 @@
let
imcfg = config.i18n.inputMethod;
cfg = imcfg.fcitx5;
fcitx5Package =
if cfg.plasma6Support then
pkgs.qt6Packages.fcitx5-with-addons.override { inherit (cfg) addons; }
else
pkgs.libsForQt5.fcitx5-with-addons.override { inherit (cfg) addons; };
fcitx5Package = pkgs.qt6Packages.fcitx5-with-addons.override { inherit (cfg) addons; };
settingsFormat = pkgs.formats.ini { };
in
{
@@ -33,15 +29,6 @@ in
See [Using Fcitx 5 on Wayland](https://fcitx-im.org/wiki/Using_Fcitx_5_on_Wayland).
'';
};
plasma6Support = lib.mkOption {
type = lib.types.bool;
default = config.services.desktopManager.plasma6.enable;
defaultText = lib.literalExpression "config.services.desktopManager.plasma6.enable";
description = ''
Use qt6 versions of fcitx5 packages.
Required for configuring fcitx5 in KDE System Settings.
'';
};
quickPhrase = lib.mkOption {
type = with lib.types; attrsOf str;
default = { };
@@ -109,6 +96,9 @@ in
(lib.mkRemovedOptionModule [ "i18n" "inputMethod" "fcitx5" "enableRimeData" ] ''
RIME data is now included in `fcitx5-rime` by default, and can be customized using `fcitx5-rime.override { rimeDataPkgs = ...; }`
'')
(lib.mkRemovedOptionModule [ "i18n" "inputMethod" "fcitx5" "plasma6Support" ] ''
qt6 is the only one used for fcitx5-configtool now.
'')
];
config = lib.mkIf (imcfg.enable && imcfg.type == "fcitx5") {
+10 -1
View File
@@ -286,7 +286,16 @@ in
in
{
sudo = {
source = "${lib.getExe cfg.package}";
source = lib.getExe cfg.package;
inherit
owner
group
setuid
permissions
;
};
sudoedit = {
source = lib.getExe' cfg.package "sudoedit";
inherit
owner
group
@@ -152,45 +152,48 @@ in
};
config = lib.mkMerge [
{
assertions = [
{
assertion = cfg.backupAll -> cfg.databases == [ ];
message = "config.services.postgresqlBackup.backupAll cannot be used together with config.services.postgresqlBackup.databases";
}
{
assertion =
cfg.compression == "none"
|| (cfg.compression == "gzip" && cfg.compressionLevel >= 1 && cfg.compressionLevel <= 9)
|| (cfg.compression == "zstd" && cfg.compressionLevel >= 1 && cfg.compressionLevel <= 19);
message = "config.services.postgresqlBackup.compressionLevel must be set between 1 and 9 for gzip and 1 and 19 for zstd";
}
];
}
(lib.mkIf cfg.enable {
systemd.tmpfiles.rules = [
"d '${cfg.location}' 0700 postgres - - -"
];
})
(lib.mkIf (cfg.enable && cfg.backupAll) {
systemd.services.postgresqlBackup = postgresqlBackupService "all" "pg_dumpall ${cfg.pgdumpOptions}";
})
(lib.mkIf (cfg.enable && !cfg.backupAll) {
systemd.services = lib.listToAttrs (
map (
db:
let
cmd = "pg_dump ${cfg.pgdumpOptions} ${db}";
in
config = lib.mkIf cfg.enable (
lib.mkMerge [
{
assertions = [
{
name = "postgresqlBackup-${db}";
value = postgresqlBackupService db cmd;
assertion = cfg.backupAll -> cfg.databases == [ ];
message = "config.services.postgresqlBackup.backupAll cannot be used together with config.services.postgresqlBackup.databases";
}
) cfg.databases
);
})
];
{
assertion =
cfg.compression == "none"
|| (cfg.compression == "gzip" && cfg.compressionLevel >= 1 && cfg.compressionLevel <= 9)
|| (cfg.compression == "zstd" && cfg.compressionLevel >= 1 && cfg.compressionLevel <= 19);
message = "config.services.postgresqlBackup.compressionLevel must be set between 1 and 9 for gzip and 1 and 19 for zstd";
}
];
systemd.tmpfiles.rules = [
"d '${cfg.location}' 0700 postgres - - -"
];
}
(lib.mkIf cfg.backupAll {
systemd.services.postgresqlBackup = postgresqlBackupService "all" "pg_dumpall ${cfg.pgdumpOptions}";
})
(lib.mkIf (!cfg.backupAll) {
systemd.services = lib.listToAttrs (
map (
db:
let
cmd = "pg_dump ${cfg.pgdumpOptions} ${db}";
in
{
name = "postgresqlBackup-${db}";
value = postgresqlBackupService db cmd;
}
) cfg.databases
);
})
]
);
meta.maintainers = with lib.maintainers; [ Scrumplex ];
}
+2
View File
@@ -22,6 +22,7 @@ let
"SpeedMeterIntervalSec"
"ManageForeignRoutingPolicyRules"
"ManageForeignRoutes"
"ManageForeignNextHops"
"RouteTable"
"IPv6PrivacyExtensions"
"IPv4Forwarding"
@@ -32,6 +33,7 @@ let
(assertInt "SpeedMeterIntervalSec")
(assertValueOneOf "ManageForeignRoutingPolicyRules" boolValues)
(assertValueOneOf "ManageForeignRoutes" boolValues)
(assertValueOneOf "ManageForeignNextHops" boolValues)
(assertValueOneOf "IPv6PrivacyExtensions" (
boolValues
++ [
@@ -11,7 +11,7 @@ vscode-utils.buildVscodeMarketplaceExtension {
name = "tinymist";
publisher = "myriad-dreamin";
inherit (tinymist) version;
hash = "sha256-fI+HzioLDxACH0anSkYOw47jpocVQp7m9xHh6APehis=";
hash = "sha256-wFFzUwOyaMInaVskKK/KA1eDd71fZ2j+snZ2NvFB5nU=";
};
nativeBuildInputs = [
+5 -5
View File
@@ -133,9 +133,9 @@ rec {
unstable = fetchurl rec {
# NOTE: Don't forget to change the hash for staging as well.
version = "10.12";
version = "10.13";
url = "https://dl.winehq.org/wine/source/10.x/wine-${version}.tar.xz";
hash = "sha256-zVcscaPXLof5hJCyKMfCaq6z/eON2eefw7VjkdWZ1r8=";
hash = "sha256-8fON8gVb2vpGtEwe34ZB5oMzDjoUbgn9UhnP6T4zxTE=";
patches = [
# Also look for root certificates at $NIX_SSL_CERT_FILE
@@ -145,7 +145,7 @@ rec {
# see https://gitlab.winehq.org/wine/wine-staging
staging = fetchFromGitLab {
inherit version;
hash = "sha256-a5Vw9UVawx/vvTeu6SGxf4C1GwvdmpPJDyuW0PCUob8=";
hash = "sha256-s2ceNBCBj2Zy1FLjjwEbbX3SQiqNwMPu49Ytq6X8R9U=";
domain = "gitlab.winehq.org";
owner = "wine";
repo = "wine-staging";
@@ -168,9 +168,9 @@ rec {
## see http://wiki.winehq.org/Mono
mono = fetchurl rec {
version = "10.1.0";
version = "10.2.0";
url = "https://dl.winehq.org/wine/wine-mono/${version}/wine-mono-${version}-x86.msi";
hash = "sha256-yIwkMYkLwyys7I1+pw5Tpa5LlcjFXKbnXvjbDkzPEHA=";
hash = "sha256-Th7T8C6S0FMTPQPd++/PbbSk3CMamu0zZ7FxF6iIR9g=";
};
updateScript = writeShellScript "update-wine-unstable" ''
@@ -85,13 +85,13 @@ in
stdenv.mkDerivation (finalAttrs: {
pname = "imagemagick";
version = "7.1.2-1";
version = "7.1.2-2";
src = fetchFromGitHub {
owner = "ImageMagick";
repo = "ImageMagick";
tag = finalAttrs.version;
hash = "sha256-SHzDSknIHz8/CHV0Lnlr8YtOhs67MPMXiVHfv50gfwY=";
hash = "sha256-bQzHZGTr3dl8G7cMSjC5Is+H/7pnRtqgp/rvYZeJDu0=";
};
outputs = [
+1
View File
@@ -22,6 +22,7 @@ let
gnome-desktop
libgnome-keyring
webkitgtk_4_1
adwaita-icon-theme
];
xorgDeps =
pkgs: with pkgs.xorg; [
@@ -1,10 +1,10 @@
{
"chromium": {
"version": "139.0.7258.138",
"version": "139.0.7258.154",
"chromedriver": {
"version": "139.0.7258.139",
"hash_darwin": "sha256-EqKEyT/iEJkVASSAEP0/dNptDw3yr3AwoM2yUYbn1to=",
"hash_darwin_aarch64": "sha256-3H9CUsMDvD+PJ+n/YwCv22uEIxa80y+cMvL1PWOWQg0="
"version": "139.0.7258.155",
"hash_darwin": "sha256-9tHj/QSFz9fJTQ+xivOKbssqXsE53BHViy7uCZ4OMhc=",
"hash_darwin_aarch64": "sha256-fmflqWTiruKD/VtmNWllCA71tqaB0OIOUiXsmJOTJFI="
},
"deps": {
"depot_tools": {
@@ -21,8 +21,8 @@
"DEPS": {
"src": {
"url": "https://chromium.googlesource.com/chromium/src.git",
"rev": "884e54ea8d42947ed636779015c5b4815e069838",
"hash": "sha256-MCBHB1ms3H8AXqiIDHH7C+8/NDcgsn3pDx7mKtGdfbc=",
"rev": "9e0d6b2b47ffb17007b713429c9a302f9e43847f",
"hash": "sha256-L3cq3kx7hOv8bzwkQ+nyDM9VDzsvHaRzrSwrqwyCdHA=",
"recompress": true
},
"src/third_party/clang-format/script": {
@@ -97,8 +97,8 @@
},
"src/third_party/angle": {
"url": "https://chromium.googlesource.com/angle/angle.git",
"rev": "96492b317e27ba4106ed00f5faa4534cfeaa0b8f",
"hash": "sha256-TE8vYLNnAzVkGQZ2ZYuNHnu8fwp2Qv4ANP0btgrKYSQ="
"rev": "d9fc4a372074b1079c193c422fc4a180e79b6636",
"hash": "sha256-owMOjZEXhjXkEwzKdNVUk6Uzqdfp8UQq4JLDSvbvyeA="
},
"src/third_party/angle/third_party/glmark2/src": {
"url": "https://chromium.googlesource.com/external/github.com/glmark2/glmark2",
@@ -582,8 +582,8 @@
},
"src/third_party/pdfium": {
"url": "https://pdfium.googlesource.com/pdfium.git",
"rev": "849572b5c41e5bf59dc88bf54c41067faa9b5b00",
"hash": "sha256-lTUkzpzIskbEL7b2xBWT8s9YNyu1AZ235SBo5AfQtpg="
"rev": "bbdc38bc2d1693f56154f78eb5d4ff296d8ca3da",
"hash": "sha256-LYo73KuSVBEcRN1PqG0EBFeKaLy66UPtZ3DMHP5YVXM="
},
"src/third_party/perfetto": {
"url": "https://chromium.googlesource.com/external/github.com/google/perfetto.git",
@@ -797,8 +797,8 @@
},
"src/v8": {
"url": "https://chromium.googlesource.com/v8/v8.git",
"rev": "4d36678284f92d381f411c7947588d7a09989ca4",
"hash": "sha256-X5k2R7/sS3/C2S5hC1ILSquWjnPol3Pk+xe1suzgnFs="
"rev": "a0a7886d6b3707be8d4b403e463fa82fdb3f216c",
"hash": "sha256-KjIBJw40hiBkcHNn96dD5iZs2n2HMWIkAJ6ND2+5JJQ="
}
}
},
@@ -135,13 +135,13 @@
"vendorHash": "sha256-rTQzbI04C92J+IXVX8dHtcbMvOif5jLW8ejm20qfrSA="
},
"awscc": {
"hash": "sha256-lsnmPbG5juue8ZQ/JT8zjk4vSDwMqUlIxAqKxbaR3iY=",
"hash": "sha256-RMOLAJyoIVIlg4GgU6rCSASgcZlvFMmLjFPqc5Lrdp8=",
"homepage": "https://registry.terraform.io/providers/hashicorp/awscc",
"owner": "hashicorp",
"repo": "terraform-provider-awscc",
"rev": "v1.51.0",
"rev": "v1.53.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-1PX776uNp1uXW2i23Ea7b74rEQk2hH6xpDqi7StK3Hs="
"vendorHash": "sha256-VNWa7ynbqhaPXrnZBmWLsMOExnjBRD7+gp89tMReNAY="
},
"azuread": {
"hash": "sha256-7dbBhQz0MDUAaz4U1ewM2RayWtp5gbo3FrrQ762Tb6A=",
@@ -597,11 +597,11 @@
"vendorHash": "sha256-sPvX69R2BmlY/KhXZgxCunzseoOkz1h2b8yqekBBn0k="
},
"heroku": {
"hash": "sha256-B/NaFe8KOKGJJlF3vZnpdMnbD1VxBktqodPBk+4NZEc=",
"hash": "sha256-Kc9/k+PyUHXj3F3YnqlPI+d7eroscBkdHt68nUbwyX8=",
"homepage": "https://registry.terraform.io/providers/heroku/heroku",
"owner": "heroku",
"repo": "terraform-provider-heroku",
"rev": "v5.2.8",
"rev": "v5.2.11",
"spdx": null,
"vendorHash": null
},
@@ -1,8 +1,8 @@
{
lib,
stdenv,
fetchurl,
directoryListingUpdater,
fetchFromGitLab,
nix-update-script,
meson,
ninja,
pkg-config,
@@ -39,16 +39,40 @@
evolution-data-server,
nixosTests,
gmobile,
appstream,
}:
let
# Derived from subprojects/libcall-ui.wrap
libcall-ui = fetchFromGitLab {
domain = "gitlab.gnome.org";
group = "World";
owner = "Phosh";
repo = "libcall-ui";
tag = "v0.1.4";
hash = "sha256-6fiqdvagcMnvaZ9UxC05haBwObcsqwgJL/V03LuSMF8=";
};
# Derived from subprojects/gvc.wrap
gvc = fetchFromGitLab {
domain = "gitlab.gnome.org";
owner = "GNOME";
repo = "libgnome-volume-control";
rev = "5f9768a2eac29c1ed56f1fbb449a77a3523683b6";
hash = "sha256-gdgTnxzH8BeYQAsvv++Yq/8wHi7ISk2LTBfU8hk12NM=";
};
in
stdenv.mkDerivation (finalAttrs: {
pname = "phosh";
version = "0.44.1";
version = "0.48.0";
src = fetchurl {
# Release tarball which includes subprojects gvc and libcall-ui
url = with finalAttrs; "https://sources.phosh.mobi/releases/${pname}/${pname}-${version}.tar.xz";
hash = "sha256-rczGr7YSmVFu13oa3iSTmSQ4jsjl7lv38zQtD7WmDis=";
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
group = "World";
owner = "Phosh";
repo = "phosh";
tag = "v${finalAttrs.version}";
hash = "sha256-HnjR0hVjkGfoD8RYCJqpGjRhl0W+QO8tYwSo71XFL6A=";
};
nativeBuildInputs = [
@@ -71,7 +95,6 @@ stdenv.mkDerivation (finalAttrs: {
callaudiod
evolution-data-server
pulseaudio
glib
modemmanager
gcr
networkmanager
@@ -87,6 +110,7 @@ stdenv.mkDerivation (finalAttrs: {
upower
wayland
feedbackd
appstream
];
nativeCheckInputs = [
@@ -97,10 +121,16 @@ stdenv.mkDerivation (finalAttrs: {
# Temporarily disabled - Test is broken (SIGABRT)
doCheck = false;
postPatch = ''
ln -s ${libcall-ui} subprojects/libcall-ui
ln -s ${gvc} subprojects/gvc
'';
mesonFlags = [
"-Dcompositor=${phoc}/bin/phoc"
# Save some time building if tests are disabled
"-Dtests=${lib.boolToString finalAttrs.finalPackage.doCheck}"
"-Dc_args=-I${glib.dev}/include/gio-unix-2.0/"
];
checkPhase = ''
@@ -123,7 +153,7 @@ stdenv.mkDerivation (finalAttrs: {
passthru = {
providedSessions = [ "phosh" ];
tests.phosh = nixosTests.phosh;
updateScript = directoryListingUpdater { };
updateScript = nix-update-script { };
};
meta = with lib; {
@@ -134,6 +164,7 @@ stdenv.mkDerivation (finalAttrs: {
maintainers = with maintainers; [
masipcat
zhaofengli
armelclo
];
platforms = platforms.linux;
mainProgram = "phosh-session";
@@ -3,7 +3,7 @@
stdenv,
fetchFromGitLab,
nixosTests,
directoryListingUpdater,
nix-update-script,
meson,
ninja,
pkg-config,
@@ -20,11 +20,26 @@
json-glib,
gsound,
gmobile,
gnome-desktop,
libpulseaudio,
libportal,
libportal-gtk4,
glib,
}:
let
# Derived from subprojects/gvc.wrap
gvc = fetchFromGitLab {
domain = "gitlab.gnome.org";
owner = "GNOME";
repo = "libgnome-volume-control";
rev = "5f9768a2eac29c1ed56f1fbb449a77a3523683b6";
hash = "sha256-gdgTnxzH8BeYQAsvv++Yq/8wHi7ISk2LTBfU8hk12NM=";
};
in
stdenv.mkDerivation rec {
pname = "phosh-mobile-settings";
version = "0.41.0";
version = "0.48.0";
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
@@ -32,7 +47,7 @@ stdenv.mkDerivation rec {
owner = "Phosh";
repo = "phosh-mobile-settings";
rev = "v${version}";
hash = "sha256-t5qngjQcjPltUGbcZ+CF5FbZtZkV/cD3xUhuApQbKHo=";
hash = "sha256-XnXwTjZnPlGNUmqizcIQdJ6SmrQ0dq9jNEhNsmDPzyM=";
};
nativeBuildInputs = [
@@ -42,6 +57,7 @@ stdenv.mkDerivation rec {
pkg-config
wayland-scanner
wrapGAppsHook4
glib.dev
];
buildInputs = [
@@ -55,22 +71,25 @@ stdenv.mkDerivation rec {
json-glib
gsound
gmobile
gnome-desktop
libpulseaudio
libportal
libportal-gtk4
];
postPatch = ''
# There are no schemas to compile.
substituteInPlace meson.build \
--replace 'glib_compile_schemas: true' 'glib_compile_schemas: false'
ln -s ${gvc} subprojects/gvc
'';
postInstall = ''
# this is optional, but without it phosh-mobile-settings won't know about lock screen plugins
ln -s '${phosh}/lib/phosh' "$out/lib/phosh"
glib-compile-schemas "$out/share/glib-2.0/schemas"
'';
passthru = {
tests.phosh = nixosTests.phosh;
updateScript = directoryListingUpdater { };
updateScript = nix-update-script { };
};
meta = {
@@ -79,7 +98,10 @@ stdenv.mkDerivation rec {
homepage = "https://gitlab.gnome.org/World/Phosh/phosh-mobile-settings";
changelog = "https://gitlab.gnome.org/World/Phosh/phosh-mobile-settings/-/blob/v${version}/debian/changelog";
license = lib.licenses.gpl3Plus;
maintainers = with lib.maintainers; [ rvl ];
maintainers = with lib.maintainers; [
rvl
armelclo
];
platforms = lib.platforms.linux;
};
}
@@ -0,0 +1,22 @@
diff --git a/toolkit/xre/nsXREDirProvider.cpp b/toolkit/xre/nsXREDirProvider.cpp
index 6db876975187..5882c5d7f1d6 100644
--- a/toolkit/xre/nsXREDirProvider.cpp
+++ b/toolkit/xre/nsXREDirProvider.cpp
@@ -11,6 +11,7 @@
#include "jsapi.h"
#include "xpcpublic.h"
+#include "prenv.h"
#include "prprf.h"
#include "nsIAppStartup.h"
@@ -297,7 +297,8 @@ static nsresult GetSystemParentDirectory(nsIFile** aFile) {
"/usr/lib/mozilla"_ns
# endif
;
- rv = NS_NewNativeLocalFile(dirname, getter_AddRefs(localDir));
+ const char* pathVar = PR_GetEnv("MOZ_SYSTEM_DIR");
+ rv = NS_NewNativeLocalFile((pathVar && *pathVar) ? nsDependentCString(pathVar) : reinterpret_cast<const nsCString&>(dirname), getter_AddRefs(localDir));
# endif
if (NS_SUCCEEDED(rv)) {
@@ -305,7 +305,10 @@ buildStdenv.mkDerivation {
];
patches =
# Remove references to the build clsoure
lib.optionals (lib.versionAtLeast version "136") [ ./136-no-buildconfig.patch ]
# Add MOZ_SYSTEM_DIR env var for native messaging host support
++ lib.optionals (lib.versionAtLeast version "133") [ ./133-env-var-for-system-dir.patch ]
++ lib.optionals (lib.versionAtLeast version "139" && lib.versionOlder version "141") [
# https://bugzilla.mozilla.org/show_bug.cgi?id=1955112
# https://hg-edge.mozilla.org/mozilla-central/rev/aa8a29bd1fb9
+3
View File
@@ -161,6 +161,9 @@ stdenv.mkDerivation (finalAttrs: {
# Enable support for Little/Big Endian Interoperability
(lib.cmakeBool "ADIOS2_USE_Endian_Reverse" true)
# force use of "-fallow-argument-mismatch"
(lib.cmakeBool "ADIOS2_USE_Fortran_flag_argument_mismatch" true)
(lib.cmakeBool "ADIOS2_BUILD_EXAMPLES" withExamples)
(lib.cmakeFeature "CMAKE_INSTALL_BINDIR" "bin")
(lib.cmakeFeature "CMAKE_INSTALL_LIBDIR" "lib")
-63
View File
@@ -1,63 +0,0 @@
{
lib,
fetchFromGitHub,
python3Packages,
writableTmpDirAsHomeHook,
}:
python3Packages.buildPythonApplication rec {
pname = "ansible-later";
version = "4.0.8";
pyproject = true;
src = fetchFromGitHub {
owner = "thegeeklab";
repo = "ansible-later";
tag = "v${version}";
hash = "sha256-4ZHCnLeG5gr0UtKQLU+6xnTxUbxnLcmDd51Psnaa42I=";
};
pythonRelaxDeps = [
"python-json-logger"
"yamllint"
];
build-system = with python3Packages; [
poetry-core
poetry-dynamic-versioning
];
dependencies = with python3Packages; [
pyyaml
ansible-core
ansible
anyconfig
appdirs
colorama
jsonschema
nested-lookup
pathspec
python-json-logger
toolz
unidiff
yamllint
];
nativeCheckInputs = with python3Packages; [
pytest-cov-stub
pytest-mock
pytestCheckHook
writableTmpDirAsHomeHook
];
pythonImportsCheck = [ "ansiblelater" ];
meta = {
description = "Best practice scanner for Ansible roles and playbooks";
homepage = "https://github.com/thegeeklab/ansible-later";
changelog = "https://github.com/thegeeklab/ansible-later/releases/tag/${src.tag}";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ tboerger ];
mainProgram = "ansible-later";
};
}
+3 -3
View File
@@ -7,16 +7,16 @@
buildGoModule (finalAttrs: {
pname = "atmos";
version = "1.186.0";
version = "1.188.0";
src = fetchFromGitHub {
owner = "cloudposse";
repo = "atmos";
tag = "v${finalAttrs.version}";
hash = "sha256-Mi18XmKXT27fMONfRqQqfi1TIGQ3sLTW9aeUJvPjTac=";
hash = "sha256-WQ4u/5V7zVS1d7J3XS3nix465AyZGudpdSEZiBD+HMc=";
};
vendorHash = "sha256-qYKHfLsz0rno2JGIyG4aTcNW51waaeXJK7V5tkypueA=";
vendorHash = "sha256-HlFwFzP1K/qiuRu3/XvNZiCB7oXBk5rx6mSlCB+q4kc=";
ldflags = [
"-s"
+2 -2
View File
@@ -11,14 +11,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "aws-sam-cli";
version = "1.135.0";
version = "1.143.0";
pyproject = true;
src = fetchFromGitHub {
owner = "aws";
repo = "aws-sam-cli";
tag = "v${version}";
hash = "sha256-ccYpEznuU6d7gDyrDiuUmvdCJutXI7SAH2PH9Vdq8Fs=";
hash = "sha256-QnJQ45ucziHmOkQdAT29szOljBExiIXZ2zvhiKYXBxI=";
};
build-system = with python3.pkgs; [ setuptools ];
+6
View File
@@ -38,6 +38,12 @@ let
rev = "932366c9d4d8e487162b5c1b2a2d9693e24e0483";
hash = "sha256-zOekPmP1zR/S+zxq/7OrEz24k8SInlsB+wJ8kPlmqe4=";
};
patches = [ ];
preCheck = ''
rm -rf src/coincurve
# don't run benchmark tests
rm tests/test_bench.py
'';
});
bindir = linkFarm "bindir" (
lib.mapAttrs (_: p: "${lib.getBin p}/bin") {
-65
View File
@@ -1,65 +0,0 @@
{
autoPatchelfHook,
lib,
fetchFromGitHub,
flutter324,
mpv,
makeDesktopItem,
copyDesktopItems,
}:
flutter324.buildFlutterApplication rec {
pname = "bloomeetunes";
version = "2.11.6";
src = fetchFromGitHub {
owner = "HemantKArya";
repo = "BloomeeTunes";
tag = "v${version}+171";
hash = "sha256-gSAe5S5rdcNLP4v7NTchQj3UJ/h6msLax9H77w+JJnk=";
};
pubspecLock = lib.importJSON ./pubspec.lock.json;
gitHashes = {
youtube_explode_dart = "sha256-ctUSoXLUJCu23hvEzYy5EoTCv7gG79rEiMFX7i1RGX0=";
};
nativeBuildInputs = [
autoPatchelfHook
copyDesktopItems
];
desktopItems = [
(makeDesktopItem {
name = "bloomeetunes";
exec = "bloomee";
icon = "bloomeetunes";
genericName = "Music Player";
desktopName = "Bloomee Tunes";
})
];
postInstall = ''
install -Dm644 assets/icons/bloomee_new_logo_c.png $out/share/pixmaps/bloomeetunes.png
'';
extraWrapProgramArgs = ''
--prefix LD_LIBRARY_PATH : $out/app/bloomeetunes/lib:${
lib.makeLibraryPath [
mpv
]
}
'';
passthru.updateScript = ./update.sh;
meta = {
description = "Cross-platform music app designed to bring you ad-free tunes from various sources";
homepage = "https://github.com/HemantKArya/BloomeeTunes";
mainProgram = "bloomee";
license = with lib.licenses; [ gpl2Plus ];
maintainers = with lib.maintainers; [ ];
platforms = lib.platforms.linux;
};
}
File diff suppressed because it is too large Load Diff
-24
View File
@@ -1,24 +0,0 @@
#!/usr/bin/env nix-shell
#!nix-shell -I nixpkgs=./. -i bash -p curl gnused jq yq nix bash coreutils common-updater-scripts
set -eou pipefail
ROOT="$(dirname "$(readlink -f "$0")")"
latestTag=$(curl ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} -sL https://api.github.com/repos/HemantKArya/BloomeeTunes/releases/latest | jq --raw-output .tag_name)
latestVersion=$(echo "$latestTag" | sed 's/^v//' | grep -o '^[^+]*')
RunNumber=$(echo "$latestTag" | grep -o '[^+]*$')
currentVersion=$(nix-instantiate --eval -E "with import ./. {}; bloomeetunes.version or (lib.getVersion bloomeetunes)" | tr -d '"')
if [[ "$currentVersion" == "$latestVersion" ]]; then
echo "package is up-to-date: $currentVersion"
exit 0
fi
sed -i "s/\(tag = \"v\${version}+\)[0-9]\+/\1${RunNumber}/" "$ROOT/package.nix"
hash=$(nix --extra-experimental-features nix-command hash convert --hash-algo sha256 --to sri $(nix-prefetch-url --unpack "https://github.com/HemantKArya/BloomeeTunes/archive/refs/tags/${latestTag}.tar.gz"))
update-source-version bloomeetunes $latestVersion $hash
curl https://raw.githubusercontent.com/HemantKArya/BloomeeTunes/${latestTag}/pubspec.lock | yq . >$ROOT/pubspec.lock.json
+4
View File
@@ -71,6 +71,10 @@ stdenv.mkDerivation rec {
]
++ lib.optionals (!udevSupport) [
"--disable-libudev"
]
++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
"ac_cv_func_malloc_0_nonnull=yes"
"ac_cv_func_realloc_0_nonnull=yes"
];
makeFlags = [ "udevruledir=$(out)/lib/udev/rules.d" ];
+2 -2
View File
@@ -6,13 +6,13 @@
buildGoModule rec {
pname = "cdncheck";
version = "1.1.32";
version = "1.1.33";
src = fetchFromGitHub {
owner = "projectdiscovery";
repo = "cdncheck";
tag = "v${version}";
hash = "sha256-K2nuReA5rl78qrZ8e7vfR2kuB7CSRJeUILHOE9qIIuE=";
hash = "sha256-T00lM/jA0+3z5RViQkzACNyUqsgSzYtdgGwNli+nm7w=";
};
vendorHash = "sha256-/1REkZ5+sz/H4T4lXhloz7fu5cLv1GoaD3dlttN+Qd4=";
+44
View File
@@ -0,0 +1,44 @@
{
lib,
buildDotnetModule,
fetchFromGitHub,
}:
buildDotnetModule rec {
pname = "ciderpress2";
version = "1.1.0";
src = fetchFromGitHub {
owner = "fadden";
repo = "CiderPress2";
tag = "v${version}";
hash = "sha256-nzCuKCntqYVhjSHljPkY5ziAjYH/qGUqukRPrHzhOzo=";
};
projectFile = [ "cp2/cp2.csproj" ];
executables = [ "cp2" ];
patches = [ ./retarget-net8.patch ];
preBuild = ''
# Disable MS telemetry
export DOTNET_CLI_TELEMETRY_OPTOUT=1
export DOTNET_NOLOGO=1
'';
meta = {
description = "File archive utility for Apple II disk images and file archives";
longDescription = ''
CiderPress 2 is a file archive utility for Apple II disk images and file
archives. It can extract files from disk images and file archives, and
create new archives.
'';
homepage = "https://github.com/fadden/CiderPress2";
changelog = "https://github.com/fadden/CiderPress2/releases/tag/v${version}";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ nulleric ];
platforms = lib.platforms.unix;
mainProgram = "cp2";
};
}
@@ -0,0 +1,162 @@
From 4b97c8cc49ee2068198bbfaa7eacb17cf1cf067c Mon Sep 17 00:00:00 2001
From: Eric Helgeson <erichelgeson@gmail.com>
Date: Fri, 22 Aug 2025 10:05:56 -0500
Subject: [PATCH] Retarget to .NET 8
---
AppCommon/AppCommon.csproj | 2 +-
CommonUtil/CommonUtil.csproj | 2 +-
DiskArc/DiskArc.csproj | 2 +-
DiskArcTests/DiskArcTests.csproj | 2 +-
Examples/AddFile/AddFile.csproj | 2 +-
Examples/ListContents/ListContents.csproj | 2 +-
FileConv/FileConv.csproj | 2 +-
FileConvTests/FileConvTests.csproj | 2 +-
MakeDist/MakeDist.csproj | 2 +-
cp2/cp2.csproj | 2 +-
cp2_wpf/cp2_wpf.csproj | 2 +-
11 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/AppCommon/AppCommon.csproj b/AppCommon/AppCommon.csproj
index 48e8e5c..1e58dc6 100644
--- a/AppCommon/AppCommon.csproj
+++ b/AppCommon/AppCommon.csproj
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFramework>net6.0</TargetFramework>
+ <TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>
diff --git a/CommonUtil/CommonUtil.csproj b/CommonUtil/CommonUtil.csproj
index 132c02c..30402ac 100644
--- a/CommonUtil/CommonUtil.csproj
+++ b/CommonUtil/CommonUtil.csproj
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFramework>net6.0</TargetFramework>
+ <TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>
diff --git a/DiskArc/DiskArc.csproj b/DiskArc/DiskArc.csproj
index a1c95f7..cc0baef 100644
--- a/DiskArc/DiskArc.csproj
+++ b/DiskArc/DiskArc.csproj
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFramework>net6.0</TargetFramework>
+ <TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>
diff --git a/DiskArcTests/DiskArcTests.csproj b/DiskArcTests/DiskArcTests.csproj
index 521776e..40db439 100644
--- a/DiskArcTests/DiskArcTests.csproj
+++ b/DiskArcTests/DiskArcTests.csproj
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFramework>net6.0</TargetFramework>
+ <TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>
diff --git a/Examples/AddFile/AddFile.csproj b/Examples/AddFile/AddFile.csproj
index 09d4137..690e75b 100644
--- a/Examples/AddFile/AddFile.csproj
+++ b/Examples/AddFile/AddFile.csproj
@@ -2,7 +2,7 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
- <TargetFramework>net6.0</TargetFramework>
+ <TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>
diff --git a/Examples/ListContents/ListContents.csproj b/Examples/ListContents/ListContents.csproj
index 1e27d16..ea1a510 100644
--- a/Examples/ListContents/ListContents.csproj
+++ b/Examples/ListContents/ListContents.csproj
@@ -2,7 +2,7 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
- <TargetFramework>net6.0</TargetFramework>
+ <TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>
diff --git a/FileConv/FileConv.csproj b/FileConv/FileConv.csproj
index 4c2e0e7..f44d628 100644
--- a/FileConv/FileConv.csproj
+++ b/FileConv/FileConv.csproj
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFramework>net6.0</TargetFramework>
+ <TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>
diff --git a/FileConvTests/FileConvTests.csproj b/FileConvTests/FileConvTests.csproj
index 48e8e5c..1e58dc6 100644
--- a/FileConvTests/FileConvTests.csproj
+++ b/FileConvTests/FileConvTests.csproj
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFramework>net6.0</TargetFramework>
+ <TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>
diff --git a/MakeDist/MakeDist.csproj b/MakeDist/MakeDist.csproj
index 7bcab19..69753a9 100644
--- a/MakeDist/MakeDist.csproj
+++ b/MakeDist/MakeDist.csproj
@@ -2,7 +2,7 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
- <TargetFramework>net6.0</TargetFramework>
+ <TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>
diff --git a/cp2/cp2.csproj b/cp2/cp2.csproj
index cdcac51..45234aa 100644
--- a/cp2/cp2.csproj
+++ b/cp2/cp2.csproj
@@ -2,7 +2,7 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
- <TargetFramework>net6.0</TargetFramework>
+ <TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<StartupObject>cp2.CP2Main</StartupObject>
diff --git a/cp2_wpf/cp2_wpf.csproj b/cp2_wpf/cp2_wpf.csproj
index bdfe5cc..9f5ed90 100644
--- a/cp2_wpf/cp2_wpf.csproj
+++ b/cp2_wpf/cp2_wpf.csproj
@@ -2,7 +2,7 @@
<PropertyGroup>
<OutputType>WinExe</OutputType>
- <TargetFramework>net6.0-windows</TargetFramework>
+ <TargetFramework>net8.0-windows</TargetFramework>
<Nullable>enable</Nullable>
<UseWPF>true</UseWPF>
<AssemblyName>CiderPress2</AssemblyName>
+3 -3
View File
@@ -6,18 +6,18 @@
buildGoModule rec {
pname = "cnspec";
version = "11.68.0";
version = "11.69.0";
src = fetchFromGitHub {
owner = "mondoohq";
repo = "cnspec";
tag = "v${version}";
hash = "sha256-OFV6xk8JbdmW0hj6UsrK/KW96kVNSCtzQ75dGLeuJCk=";
hash = "sha256-oMGkGZH6k5E/8/WyMOqoB5oQskKd1FZbyQJ9XS+f/G0=";
};
proxyVendor = true;
vendorHash = "sha256-vVCpA7ete2XPcwSZLmtcmdcc467g+KI5zXbZVjZsur4=";
vendorHash = "sha256-7/DjNBpecs65VwaEXnnPunx9phpzSH9p/+Y82XRWJjo=";
subPackages = [ "apps/cnspec" ];
+67
View File
@@ -0,0 +1,67 @@
{
lib,
fetchurl,
stdenv,
autoPatchelfHook,
}:
let
inherit (stdenv) hostPlatform;
sources = {
x86_64-linux = fetchurl {
url = "https://downloads.cursor.com/lab/2025.08.22-82fb571/linux/x64/agent-cli-package.tar.gz";
hash = "sha256-jfjYWM9Vuq9sYZcnqiap3TKuVWHHKt/aF7XaVilJjsE=";
};
aarch64-linux = fetchurl {
url = "https://downloads.cursor.com/lab/2025.08.22-82fb571/linux/arm64/agent-cli-package.tar.gz";
hash = "sha256-uMK5jO77TQntsrR450WWBj9q5VBowNUhO6UkZ/z1ys4=";
};
x86_64-darwin = fetchurl {
url = "https://downloads.cursor.com/lab/2025.08.22-82fb571/darwin/x64/agent-cli-package.tar.gz";
hash = "sha256-gFM+igXGdLLJXVHAou6pRTIVqsg6iPagaghBAzRcPXw=";
};
aarch64-darwin = fetchurl {
url = "https://downloads.cursor.com/lab/2025.08.22-82fb571/darwin/arm64/agent-cli-package.tar.gz";
hash = "sha256-XN2QaFt/lbVHfFfdZaznRvUlMWIHq7nUbe3uptrGjN0=";
};
};
in
stdenv.mkDerivation {
pname = "cursor-cli";
version = "0-unstable-2025-08-22";
src = sources.${hostPlatform.system};
nativeBuildInputs = lib.optionals hostPlatform.isLinux [
autoPatchelfHook
stdenv.cc.cc.lib
];
installPhase = ''
runHook preInstall
mkdir -p $out/bin $out/share/cursor-agent
cp -r * $out/share/cursor-agent/
ln -s $out/share/cursor-agent/cursor-agent $out/bin/cursor-agent
runHook postInstall
'';
passthru = {
inherit sources;
updateScript = ./update.sh;
};
meta = {
description = "Cursor CLI";
homepage = "https://cursor.com/cli";
license = lib.licenses.unfree;
maintainers = with lib.maintainers; [
sudosubin
andrewbastin
];
platforms = builtins.attrNames sources;
mainProgram = "cursor-agent";
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
};
}
+32
View File
@@ -0,0 +1,32 @@
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p curl coreutils common-updater-scripts
set -eu -o pipefail
release=$(curl -s https://cursor.com/install | grep -oP "lab/\K[^/]+")
# Check if release matches the pattern YYYY.MM.DD-{commithash}
if [[ "$release" =~ ^[0-9]{4}\.[0-9]{2}\.[0-9]{2}-[a-f0-9]+$ ]]; then
timestamp=$(echo "$release" | cut -d"-" -f1 | tr "." "-")
latestVersion="0-unstable-$timestamp"
else
latestVersion="$release"
fi
currentVersion=$(nix eval --raw -f . cursor-cli.version)
echo "latest version: $latestVersion"
echo "current version: $currentVersion"
if [[ "$latestVersion" == "$currentVersion" ]]; then
echo "package is up-to-date"
exit 0
fi
declare -A platforms=( [x86_64-linux]="linux/x64" [aarch64-linux]="linux/arm64" [x86_64-darwin]="darwin/x64" [aarch64-darwin]="darwin/arm64" )
for platform in "${!platforms[@]}"; do
url="https://downloads.cursor.com/lab/$release/${platforms[$platform]}/agent-cli-package.tar.gz"
source=$(nix-prefetch-url "$url" --name "cursor-cli-$latestVersion")
hash=$(nix-hash --to-sri --type sha256 "$source")
update-source-version cursor-cli "$latestVersion" "$hash" "$url" --system="$platform" --source-key="sources.$platform" --ignore-same-version
done
+2 -2
View File
@@ -9,7 +9,7 @@
buildGoModule rec {
pname = "doctl";
version = "1.139.0";
version = "1.141.0";
vendorHash = null;
@@ -42,7 +42,7 @@ buildGoModule rec {
owner = "digitalocean";
repo = "doctl";
tag = "v${version}";
hash = "sha256-oofG1Fj+1NiDhvSMm0k49K740aUWTrAqH4s/8KsY82o=";
hash = "sha256-IZ/CP9xdupwkiOihZuf/MXEP2cnoJ/lqYUEsFDf/ITk=";
};
meta = {
+3 -3
View File
@@ -6,18 +6,18 @@
buildGoModule rec {
pname = "dolt";
version = "1.58.3";
version = "1.58.5";
src = fetchFromGitHub {
owner = "dolthub";
repo = "dolt";
rev = "v${version}";
sha256 = "sha256-JQD/qYcVOvjkVPpE7oUxGwCJR5dkVuJpU9fMYT0W7fI=";
sha256 = "sha256-ieMAld3wssub+vdNNassjpc3X1KPSNhR6GK/EmIwQ28=";
};
modRoot = "./go";
subPackages = [ "cmd/dolt" ];
vendorHash = "sha256-MaqRgGCzWMjoNGPTDQg8xukeYwxnPzds6qd9lIEdi0U=";
vendorHash = "sha256-Mr51zbGBnO0sb9KDBiidFpRZk7wHJqbY1fYnXwgqJA8=";
proxyVendor = true;
doCheck = false;
+91
View File
@@ -0,0 +1,91 @@
{
fetchFromGitHub,
lib,
nix-update-script,
pkgs,
stdenv,
# nativeBuildInputs
gettext,
meson,
ninja,
pkg-config,
python3,
sphinx,
# buildInputs
boost,
# nativeCheckInputs
bash,
coreutils,
diffutils,
findutils,
glibcLocales,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "dtee";
version = "1.1.3";
src = fetchFromGitHub {
owner = "nomis";
repo = "dtee";
tag = finalAttrs.version;
hash = "sha256-trREhITO3cY4j75mpudWhOA3GXI0Q8GkUxNq2s6154w=";
};
passthru.updateScript = nix-update-script { };
# Make "#!/usr/bin/env bash" work in tests
postPatch = "patchShebangs tests";
nativeBuildInputs = [
gettext
meson
ninja
pkg-config
python3
sphinx # For the man page
];
buildInputs = [ boost ];
nativeCheckInputs = [
bash
coreutils
diffutils
findutils
glibcLocales # For tests that check translations work
];
# Use the correct copyright year on the man page (workaround for https://github.com/sphinx-doc/sphinx/issues/13231)
preBuild = ''
SOURCE_DATE_EPOCH=$(python3 $NIX_BUILD_TOP/$sourceRoot/release_date.py -e ${finalAttrs.version}) || exit 1
export SOURCE_DATE_EPOCH
'';
mesonFlags = [ "--unity on" ];
doCheck = true;
meta = {
description = "Run a program with standard output and standard error copied to files";
longDescription = ''
Run a program with standard output and standard error copied to files
while maintaining the original standard output and standard error in
the original order. When invoked as "cronty", allows programs to be run
from cron, suppressing all output unless the process outputs an error
message or has a non-zero exit status whereupon the original output
will be written as normal and the exit code will be appended to standard
error.
'';
homepage = "https://dtee.readthedocs.io/";
downloadPage = "https://github.com/nomis/dtee/releases/tag/${finalAttrs.version}";
changelog = "https://dtee.readthedocs.io/en/${finalAttrs.version}/changelog.html";
license = lib.licenses.gpl3Plus;
sourceProvenance = [ lib.sourceTypes.fromSource ];
maintainers = with lib.maintainers; [ nomis ];
mainProgram = "dtee";
# Only Linux has reliable local datagram sockets
platforms = lib.platforms.linux;
};
})
@@ -0,0 +1,85 @@
{
stdenv,
lib,
fetchFromGitHub,
cargo,
desktop-file-utils,
gnome-desktop,
meson,
ninja,
pkg-config,
polkit,
rustc,
rustPlatform,
wrapGAppsHook4,
gdk-pixbuf,
glib,
adwaita-icon-theme,
gtk4,
libadwaita,
openssl,
nix-update-script,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "e-imzo-manager";
version = "0.1.1";
src = fetchFromGitHub {
owner = "xinux-org";
repo = "e-imzo";
tag = finalAttrs.version;
hash = "sha256-uDaqkz2VDvqTgi+k8EGGKjLkjoH93xXHQcgUc1NVo30=";
};
cargoDeps = rustPlatform.fetchCargoVendor {
inherit (finalAttrs) pname version src;
hash = "sha256-rulWG4L/uN6+JBk+SzC0y57Pdw5N0Q1dJlpXGVo+vbQ=";
};
strictDeps = true;
nativeBuildInputs = [
meson
ninja
pkg-config
cargo
rustPlatform.cargoSetupHook
rustc
desktop-file-utils
wrapGAppsHook4
];
buildInputs = [
gdk-pixbuf
glib
gnome-desktop
adwaita-icon-theme
gtk4
libadwaita
openssl
rustPlatform.bindgenHook
polkit
];
propagatedUserEnvPkgs = [ polkit ];
postInstall = ''
gappsWrapperArgs+=(
--suffix PATH : ${lib.makeBinPath finalAttrs.propagatedUserEnvPkgs}
)
'';
passthru.updateScript = nix-update-script { };
meta = {
homepage = "https://github.com/xinux-org/e-imzo";
mainProgram = "E-IMZO-Manager";
description = "GTK application for managing E-IMZO keys";
license = with lib.licenses; [
asl20
mit
];
platforms = lib.platforms.linux;
teams = [ lib.teams.uzinfocom ];
};
})
+3 -3
View File
@@ -17,16 +17,16 @@
}:
let
version = "0.207.4";
version = "0.207.5";
src = fetchFromGitHub {
owner = "evcc-io";
repo = "evcc";
tag = version;
hash = "sha256-TQOeeGcgkaMoMyDbJQKIZIKJ6Wpz/wJqvpQjglnJRXI=";
hash = "sha256-THgW9+y634THKS1Co3e4kIkeS6Lmg7mTg9YYeuLyrZI=";
};
vendorHash = "sha256-qH0wHP5xHxnnURwlk4AA3H1NCftFFgAYAWPW3cdpwdk=";
vendorHash = "sha256-1+5SNgYblHRDpL+O1GGtvPR7pJ6lsEM/At7RMbzB5sA=";
commonMeta = with lib; {
license = licenses.mit;
+1 -1
View File
@@ -28,7 +28,7 @@ maven.buildMavenPackage rec {
postPatch = ''
substituteInPlace src/deb/filius.desktop \
--replace 'Exec=/usr/share/filius/filius.sh' 'Exec=filius'
--replace-fail 'Exec=/usr/share/filius/filius.sh' 'Exec=filius'
'';
nativeBuildInputs = [
-35
View File
@@ -1,35 +0,0 @@
{
lib,
fetchFromGitHub,
flutter324,
}:
flutter324.buildFlutterApplication rec {
pname = "flut-renamer";
version = "1.5.4";
src = fetchFromGitHub {
owner = "sun-jiao";
repo = "flut-renamer";
tag = version;
hash = "sha256-maPmZwsmmjyvHgutWF+8CIw2NA6HCB4/PPiiCAG+n8I=";
};
pubspecLock = lib.importJSON ./pubspec.lock.json;
postInstall = ''
install -Dm644 assets/desktop.png $out/share/pixmaps/flut-renamer.png
install -Dm644 appimage/flut-renamer.desktop $out/share/applications/flut-renamer.desktop
substituteInPlace $out/share/applications/flut-renamer.desktop \
--replace-fail "Icon=desktop" "Icon=flut-renamer"
'';
meta = {
description = "Bulk file renamer written in flutter";
homepage = "https://github.com/sun-jiao/flut-renamer";
mainProgram = "flut-renamer";
platforms = lib.platforms.linux;
license = with lib.licenses; [ gpl3Plus ];
maintainers = with lib.maintainers; [ ];
};
}
File diff suppressed because it is too large Load Diff
-34
View File
@@ -1,34 +0,0 @@
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p yq nix bash coreutils nix-update common-updater-scripts ripgrep flutter
set -eou pipefail
PACKAGE_DIR="$(realpath "$(dirname "$0")")"
cd "$PACKAGE_DIR"/..
while ! test -f flake.nix; do cd ..; done
NIXPKGS_DIR="$PWD"
latestVersion=$(
list-git-tags --url=https://github.com/sun-jiao/flut-renamer |
rg '^v(.*)' -r '$1' |
sort --version-sort |
tail -n1
)
currentVersion=$(nix-instantiate --eval -E "with import ./. {}; flut-renamer.version or (lib.getVersion flut-renamer)" | tr -d '"')
if [[ "$currentVersion" == "$latestVersion" ]]; then
echo "package is up-to-date: $currentVersion"
exit 0
fi
nix-update --version=$latestVersion flut-renamer
export HOME="$(mktemp -d)"
src="$(nix-build --no-link "$NIXPKGS_DIR" -A flut-renamer.src)"
TMPDIR="$(mktemp -d)"
cp --recursive --no-preserve=mode "$src"/* $TMPDIR
cd $TMPDIR
flutter pub get
yq . pubspec.lock >"$PACKAGE_DIR"/pubspec.lock.json
rm -rf $TMPDIR
+21 -15
View File
@@ -1,30 +1,36 @@
{
lib,
stdenv,
fetchurl,
writeScript,
fetchFromGitLab,
gitUpdater,
autoreconfHook,
font-util,
util-macros,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "font-alias";
version = "1.0.5";
src = fetchurl {
url = "mirror://xorg/individual/font/font-alias-${finalAttrs.version}.tar.xz";
hash = "sha256-n4niF7tz4ONjagpJP7+LfJlRVuDFPZoEdtIBtnwta24=";
src = fetchFromGitLab {
domain = "gitlab.freedesktop.org";
group = "xorg";
owner = "font";
repo = "alias";
tag = "font-alias-${finalAttrs.version}";
hash = "sha256-qglRNSt/PgFprpsvOVCeLMA+YagJw8DZMAfFdZ0m0/s=";
};
nativeBuildInputs = [
autoreconfHook
font-util
util-macros
];
passthru = {
updateScript = writeScript "update-${finalAttrs.pname}" ''
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p common-updater-scripts
version="$(list-directory-versions --pname ${finalAttrs.pname} \
--url https://xorg.freedesktop.org/releases/individual/font/ \
| sort -V | tail -n1)"
update-source-version ${finalAttrs.pname} "$version"
'';
updateScript = gitUpdater {
rev-prefix = "font-alias-";
};
};
meta = {
+5 -3
View File
@@ -27,14 +27,14 @@ let
in
python.pkgs.buildPythonApplication rec {
pname = "gdtoolkit";
version = "4.3.3";
version = "4.3.4";
format = "setuptools";
src = fetchFromGitHub {
owner = "Scony";
repo = "godot-gdscript-toolkit";
tag = version;
hash = "sha256-GS1bCDOKtdJkzgP3+CSWEUeHQ9lUcAHDT09QmPOOeVc=";
hash = "sha256-D67iwGGF3CrdAi/XKGVkusZlFCsMPIKdVpKDwcVQMrI=";
};
disabled = python.pythonOlder "3.7";
@@ -43,6 +43,7 @@ python.pkgs.buildPythonApplication rec {
docopt
lark
pyyaml
radon
setuptools
];
@@ -62,12 +63,13 @@ python.pkgs.buildPythonApplication rec {
# The tests are not working on NixOS
disabledTestPaths = [
"tests/generated/test_expression_parsing.py"
"tests/gdradon/test_executable.py"
];
pythonImportsCheck = [
"gdtoolkit"
"gdtoolkit.formatter"
"gdtoolkit.gd2py"
"gdtoolkit.gdradon"
"gdtoolkit.linter"
"gdtoolkit.parser"
];
+13 -5
View File
@@ -11,19 +11,21 @@
libuev,
gobject-introspection,
udevCheckHook,
vala,
nix-update-script,
}:
stdenv.mkDerivation (finalAttrs: {
name = "gmobile";
version = "0.2.1";
pname = "gmobile";
version = "0.4.0";
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
group = "World";
owner = "Phosh";
repo = "gmobile";
rev = "v${finalAttrs.version}";
hash = "sha256-5OQ2JT7YeEYzKXafwgg0xJk2AvtFw2dtcH3mt+cm1bI=";
tag = "v${finalAttrs.version}";
hash = "sha256-5WRsHbwReLy3ZMbfsyjr3VsGawaQoXMFIDtKw3P/loA=";
};
nativeBuildInputs = [
@@ -39,15 +41,21 @@ stdenv.mkDerivation (finalAttrs: {
glib
json-glib
libuev
vala
];
doInstallCheck = true;
passthru.updateScript = nix-update-script { };
meta = {
description = "Functions useful in mobile related, glib based projects";
homepage = "https://gitlab.gnome.org/World/Phosh/gmobile";
license = lib.licenses.lgpl21Plus;
maintainers = with lib.maintainers; [ donovanglover ];
maintainers = with lib.maintainers; [
donovanglover
armelclo
];
platforms = lib.platforms.linux;
};
})
+3 -3
View File
@@ -7,16 +7,16 @@
buildGoModule rec {
pname = "gollama";
version = "v1.35.3";
version = "v1.37.1";
src = fetchFromGitHub {
owner = "sammcj";
repo = "gollama";
tag = "v${version}";
hash = "sha256-k2SGcsWQi2jC3W2ZO8KXY+WUyh7n7qonLr6BLKZXzdY=";
hash = "sha256-HNRerVlnYfEAmxUk8nE8fyLozQ7zngFrcDrWG1RtqJw=";
};
vendorHash = "sha256-hZx4AsPnlFmJGms0vRKgBV/4Ea8uvHaNc0zNehs2RB8=";
vendorHash = "sha256-Hf1E55FHlyp7VAwaunvpG/hYNVHO2DSFDGFyaPiFieY=";
doCheck = false;
+3 -3
View File
@@ -7,17 +7,17 @@
buildGoModule rec {
pname = "goose";
version = "3.24.3";
version = "3.25.0";
src = fetchFromGitHub {
owner = "pressly";
repo = "goose";
rev = "v${version}";
hash = "sha256-GfHhjpg/fMuctAEZFWnUnpnBUFOeGn2L3BSlfI9cOuE=";
hash = "sha256-ouyvxlnJQIMqRZt4nsR01+9p227FGBlHoCMAq6Ufh7A=";
};
proxyVendor = true;
vendorHash = "sha256-uaCCbKAtkeTDAjHKXVdWykRGA/YlsszZR8CdM6YGFaw=";
vendorHash = "sha256-Cpw2xJWWW85LUS5K+KM2fCUISYwLFjsdk0gPRgIZKP4=";
# skipping: end-to-end tests require a docker daemon
postPatch = ''
+2 -2
View File
@@ -1,7 +1,7 @@
{
lib,
fetchFromGitHub,
flutter324,
flutter327,
autoPatchelfHook,
buildGoModule,
libayatana-appindicator,
@@ -44,7 +44,7 @@ let
meta = metaCommon;
};
in
flutter324.buildFlutterApplication {
flutter327.buildFlutterApplication {
inherit version src;
pname = "gopeed";
+8 -10
View File
@@ -6,21 +6,19 @@
python3.pkgs.buildPythonApplication rec {
pname = "graphinder";
version = "1.11.6";
format = "pyproject";
version = "2.0.0b4";
pyproject = true;
src = fetchFromGitHub {
owner = "Escape-Technologies";
repo = "graphinder";
tag = "v${version}";
hash = "sha256-TDc6aIFkxShlfC6fLYMKULfrFUAYhQZrIHZNDuMh68g=";
hash = "sha256-emBWhEJxYRAw3WTd8t+lurnHX8SeCcLBHGH9B+Owuag=";
};
nativeBuildInputs = with python3.pkgs; [
poetry-core
];
build-system = with python3.pkgs; [ poetry-core ];
propagatedBuildInputs = with python3.pkgs; [
dependencies = with python3.pkgs; [
aiohttp
beautifulsoup4
requests
@@ -49,10 +47,10 @@ python3.pkgs.buildPythonApplication rec {
meta = {
description = "Tool to find GraphQL endpoints using subdomain enumeration";
mainProgram = "graphinder";
homepage = "https://github.com/Escape-Technologies/graphinder";
changelog = "https://github.com/Escape-Technologies/graphinder/releases/tag/v${version}";
license = with lib.licenses; [ mit ];
changelog = "https://github.com/Escape-Technologies/graphinder/releases/tag/${src.tag}";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ fab ];
mainProgram = "graphinder";
};
}
-65
View File
@@ -1,65 +0,0 @@
{
lib,
SDL,
SDL_image,
SDL_mixer,
SDL_ttf,
buildEnv,
fetchurl,
guile,
lzip,
pkg-config,
stdenv,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "guile-sdl";
version = "0.6.1";
src = fetchurl {
url = "mirror://gnu/guile-sdl/guile-sdl-${finalAttrs.version}.tar.lz";
hash = "sha256-/9sTTvntkRXck3FoRalROjqUQC8hkePtLTnHNZotKOE=";
};
nativeBuildInputs = [
SDL
guile
lzip
pkg-config
];
configureFlags = [
(lib.enableFeature (!stdenv.hostPlatform.isDarwin) "sdltest")
];
buildInputs = [
(lib.getDev SDL)
(lib.getDev SDL_image)
(lib.getDev SDL_mixer)
(lib.getDev SDL_ttf)
guile
];
makeFlags =
let
sdl-env = buildEnv {
name = "sdl-env";
paths = finalAttrs.buildInputs;
};
in
[
"SDLMINUSI=-I${sdl-env}/include/SDL"
];
strictDeps = true;
meta = {
# clang-16: error: unsupported option '--visibility=hidden'; did you mean '-fvisibility=hidden'
broken = stdenv.hostPlatform.isDarwin;
homepage = "https://www.gnu.org/software/guile-sdl/";
description = "Guile bindings for SDL";
license = lib.licenses.gpl3Plus;
maintainers = [ ];
inherit (guile.meta) platforms;
};
})
-98
View File
@@ -1,98 +0,0 @@
{
autoPatchelfHook,
lib,
fetchFromGitHub,
flutter324,
makeDesktopItem,
libayatana-appindicator,
copyDesktopItems,
mpv,
runCommand,
_experimental-update-script-combinators,
harmony-music,
gitUpdater,
yq,
jdk,
}:
flutter324.buildFlutterApplication rec {
pname = "harmony-music";
version = "1.12.0";
src = fetchFromGitHub {
owner = "anandnet";
repo = "Harmony-Music";
tag = "v${version}";
hash = "sha256-czXtJeMcwYD0iBmYNhicywTPSnsW1Y2Yl3T2YS3uuWo=";
};
pubspecLock = lib.importJSON ./pubspec.lock.json;
gitHashes = {
just_audio_media_kit = "sha256-cNuKwOAEcFCTfbKhvBvYAdmD5qFeNW16jc3A+6ID3bM=";
sidebar_with_animation = "sha256-Y7dTO4wN7cOmm2mnzQPW/gDYltLr7wMKMXbGtAg8WzY=";
youtube_explode_dart = "sha256-+3j+B+Ea1l/SzR8ZLp0vLYco77hkwn9VKRPvDeHqIeY=";
terminate_restart = "sha256-NiznKbko9f2yWcI62MA2xc/NQgy/31fYqK0COHR1Wpk=";
};
nativeBuildInputs = [
copyDesktopItems
autoPatchelfHook
];
buildInputs = [
libayatana-appindicator
jdk
];
desktopItems = [
(makeDesktopItem {
name = "harmony-music";
exec = "harmonymusic";
icon = "harmony-music";
genericName = "Harmony Music";
desktopName = "Harmony Music";
categories = [
"AudioVideo"
];
keywords = [
"Music"
"Media"
"Streaming"
];
})
];
postInstall = ''
install -Dm644 assets/icons/icon.png $out/share/pixmaps/harmony-music.png
'';
extraWrapProgramArgs = ''
--prefix LD_LIBRARY_PATH : $out/app/harmony-music/lib:${lib.makeLibraryPath [ mpv ]}
'';
passthru = {
pubspecSource =
runCommand "pubspec.lock.json"
{
buildInputs = [ yq ];
inherit (harmony-music) src;
}
''
cat $src/pubspec.lock | yq > $out
'';
updateScript = _experimental-update-script-combinators.sequence [
(gitUpdater { rev-prefix = "v"; })
(_experimental-update-script-combinators.copyAttrOutputToFile "harmony-music.pubspecSource" ./pubspec.lock.json)
];
};
meta = {
description = "Cross platform App for streaming Music";
homepage = "https://github.com/anandnet/Harmony-Music";
mainProgram = "harmonymusic";
license = with lib.licenses; [ gpl3Plus ];
maintainers = with lib.maintainers; [ ];
platforms = lib.platforms.linux;
};
}
File diff suppressed because it is too large Load Diff
+1
View File
@@ -36,6 +36,7 @@ stdenv.mkDerivation rec {
ffmpeg-headless
kdePackages.kconfig
kdePackages.kcoreaddons
kdePackages.kdeclarative
kdePackages.kfilemetadata
kdePackages.ki18n
kdePackages.kiconthemes
+3 -3
View File
@@ -7,16 +7,16 @@
rustPackages.rustPlatform.buildRustPackage (finalAttrs: {
pname = "hawkeye";
version = "6.1.1";
version = "6.2.0";
src = fetchFromGitHub {
owner = "korandoru";
repo = "hawkeye";
tag = "v${finalAttrs.version}";
hash = "sha256-F+6zbVr3oUD/HMpTa5nDR9Tv/k9v+R644IFhVNfKwuU=";
hash = "sha256-pIDnD2w1Q85Tc28WKCatkOBURJGQwovzm3KwoBX4IrY=";
};
cargoHash = "sha256-BPSA0Z6Bk05xvztv1btkErC4+WDUcIWs7aFV2eVySwQ=";
cargoHash = "sha256-T4b2gj+QBChmNsKzMSNbEKIUbVCSKKGiHakOenkxV84=";
nativeBuildInputs = [
pkg-config
@@ -1,24 +1,23 @@
From d4d4a299de39685e59f256c81d8e60ce6efd8b23 Mon Sep 17 00:00:00 2001
From 0f77537ce2ba5c1a23d5c2a154bdc77450d1e0e5 Mon Sep 17 00:00:00 2001
From: Christoph Heiss <christoph@c8h4.io>
Date: Wed, 1 Jan 2025 18:02:40 +0100
Date: Tue, 26 Aug 2025 10:23:14 +0200
Subject: [PATCH] build: enable specifying custom sass compiler path by env-var
Signed-off-by: Felix Buehler <account@buehler.rocks>
Signed-off-by: Christoph Heiss <christoph@c8h4.io>
---
package.json | 7 ++++++-
package.json | 5 ++++-
patches/sass-embedded.patch | 15 +++++++++++++++
pnpm-lock.yaml | 35 ++++++++++++++++++++---------------
3 files changed, 41 insertions(+), 16 deletions(-)
pnpm-lock.yaml | 27 ++++++++++++++++-----------
3 files changed, 35 insertions(+), 12 deletions(-)
create mode 100644 patches/sass-embedded.patch
diff --git i/package.json w/package.json
index 897b42e..7a91a85 100644
--- i/package.json
+++ w/package.json
diff --git a/package.json b/package.json
index a67d2c6..17f17b1 100644
--- a/package.json
+++ b/package.json
@@ -32,6 +32,9 @@
"license": "Apache-2.0",
"packageManager": "pnpm@10.4.1+sha512.c753b6c3ad7afa13af388fa6d808035a008e30ea9993f58c6663e2bc5ff21679aa834db094987129aa4d488b86df57f7b634981b2f827cdcacc698cc0cfb88af",
"packageManager": "pnpm@10.14.0+sha512.ad27a79641b49c3e481a16a805baa71817a04bbe06a38d17e60e2eaee83f6a146c6a688125f5792e48dd5ba30e7da52a5cda4c3992b9ccf333f9ce223af84748",
"pnpm": {
- "neverBuiltDependencies": []
+ "neverBuiltDependencies": [],
@@ -29,7 +28,7 @@ index 897b42e..7a91a85 100644
}
diff --git a/patches/sass-embedded.patch b/patches/sass-embedded.patch
new file mode 100644
index 0000000..f941a8e
index 0000000..5e02bed
--- /dev/null
+++ b/patches/sass-embedded.patch
@@ -0,0 +1,15 @@
@@ -37,106 +36,112 @@ index 0000000..f941a8e
+index ae33aa3028e1a120d9e84b043bb19a71f1083b96..7a49d16a54982312ad638632d6750d7bec670f02 100644
+--- a/dist/lib/src/compiler-path.js
++++ b/dist/lib/src/compiler-path.js
+@@ -24,6 +24,10 @@ function isLinuxMusl(path) {
+ }
+@@ -8,6 +8,10 @@ const p = require("path");
+ const compiler_module_1 = require("./compiler-module");
+ /** The full command for the embedded compiler executable. */
+ exports.compilerCommand = (() => {
++ const binPath = process.env.SASS_EMBEDDED_BIN_PATH;
++ if (binPath) {
++ return [binPath];
++ }
+ const platform = process.platform === 'linux' && isLinuxMusl(process.execPath)
+ ? 'linux-musl'
+ : process.platform;
diff --git i/pnpm-lock.yaml w/pnpm-lock.yaml
index 5df58fb..bb27c4b 100644
--- i/pnpm-lock.yaml
+++ w/pnpm-lock.yaml
+ try {
+ return [
+ require.resolve(`${compiler_module_1.compilerModule}/dart-sass/src/dart` +
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 8f98554..44d1691 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -4,6 +4,11 @@ settings:
autoInstallPeers: true
excludeLinksFromLockfile: false
+patchedDependencies:
+ sass-embedded:
+ hash: 6wjvcsryx2tfkpottp4wf5nbzi
+ hash: 24d35db63138795a11bb26b230cf743c82f571c7e2ee061db58263799d659e20
+ path: patches/sass-embedded.patch
+
importers:
.:
@@ -29,7 +34,7 @@ importers:
version: 9.21.0
version: 9.32.0
'@vitejs/plugin-vue':
specifier: ^5.2.1
- version: 5.2.1(vite@6.1.3(sass-embedded@1.85.0)(terser@5.39.0)(yaml@2.7.0))(vue@3.5.13)
+ version: 5.2.1(vite@6.1.3(sass-embedded@1.85.0(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi))(terser@5.39.0)(yaml@2.7.0))(vue@3.5.13)
specifier: ^6.0.1
- version: 6.0.1(vite@7.0.6(sass-embedded@1.90.0)(sass@1.90.0)(terser@5.43.1)(yaml@2.8.1))(vue@3.5.18)
+ version: 6.0.1(vite@7.0.6(sass-embedded@1.90.0(patch_hash=24d35db63138795a11bb26b230cf743c82f571c7e2ee061db58263799d659e20))(sass@1.90.0)(terser@5.43.1)(yaml@2.8.1))(vue@3.5.18)
'@vue/eslint-config-prettier':
specifier: ^10.2.0
version: 10.2.0(eslint@9.21.0)(prettier@3.5.2)
version: 10.2.0(eslint@9.32.0)(prettier@3.6.2)
@@ -50,13 +55,13 @@ importers:
version: 3.5.2
version: 3.6.2
sass-embedded:
specifier: ^1.85.0
- version: 1.85.0
+ version: 1.85.0(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi)
specifier: ^1.90.0
- version: 1.90.0
+ version: 1.90.0(patch_hash=24d35db63138795a11bb26b230cf743c82f571c7e2ee061db58263799d659e20)
vite:
specifier: ^6.1.3
- version: 6.1.3(sass-embedded@1.85.0)(terser@5.39.0)(yaml@2.7.0)
+ version: 6.1.3(sass-embedded@1.85.0(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi))(terser@5.39.0)(yaml@2.7.0)
specifier: ^7.0.6
- version: 7.0.6(sass-embedded@1.90.0)(sass@1.90.0)(terser@5.43.1)(yaml@2.8.1)
+ version: 7.0.6(sass-embedded@1.90.0(patch_hash=24d35db63138795a11bb26b230cf743c82f571c7e2ee061db58263799d659e20))(sass@1.90.0)(terser@5.43.1)(yaml@2.8.1)
vite-plugin-pwa:
specifier: ^0.21.1
- version: 0.21.1(vite@6.1.3(sass-embedded@1.85.0)(terser@5.39.0)(yaml@2.7.0))(workbox-build@7.3.0)(workbox-window@7.3.0)
+ version: 0.21.1(vite@6.1.3(sass-embedded@1.85.0(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi))(terser@5.39.0)(yaml@2.7.0))(workbox-build@7.3.0)(workbox-window@7.3.0)
specifier: ^1.0.2
- version: 1.0.2(vite@7.0.6(sass-embedded@1.90.0)(sass@1.90.0)(terser@5.43.1)(yaml@2.8.1))(workbox-build@7.3.0)(workbox-window@7.3.0)
+ version: 1.0.2(vite@7.0.6(sass-embedded@1.90.0(patch_hash=24d35db63138795a11bb26b230cf743c82f571c7e2ee061db58263799d659e20))(sass@1.90.0)(terser@5.43.1)(yaml@2.8.1))(workbox-build@7.3.0)(workbox-window@7.3.0)
packages:
@@ -3477,9 +3482,9 @@ snapshots:
@@ -3634,10 +3639,10 @@ snapshots:
'@types/trusted-types@2.0.7': {}
- '@vitejs/plugin-vue@5.2.1(vite@6.1.3(sass-embedded@1.85.0)(terser@5.39.0)(yaml@2.7.0))(vue@3.5.13)':
+ '@vitejs/plugin-vue@5.2.1(vite@6.1.3(sass-embedded@1.85.0(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi))(terser@5.39.0)(yaml@2.7.0))(vue@3.5.13)':
- '@vitejs/plugin-vue@6.0.1(vite@7.0.6(sass-embedded@1.90.0)(sass@1.90.0)(terser@5.43.1)(yaml@2.8.1))(vue@3.5.18)':
+ '@vitejs/plugin-vue@6.0.1(vite@7.0.6(sass-embedded@1.90.0(patch_hash=24d35db63138795a11bb26b230cf743c82f571c7e2ee061db58263799d659e20))(sass@1.90.0)(terser@5.43.1)(yaml@2.8.1))(vue@3.5.18)':
dependencies:
- vite: 6.1.3(sass-embedded@1.85.0)(terser@5.39.0)(yaml@2.7.0)
+ vite: 6.1.3(sass-embedded@1.85.0(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi))(terser@5.39.0)(yaml@2.7.0)
vue: 3.5.13
'@vue/compiler-core@3.5.13':
@@ -4702,7 +4707,7 @@ snapshots:
sass-embedded-win32-x64@1.85.0:
'@rolldown/pluginutils': 1.0.0-beta.29
- vite: 7.0.6(sass-embedded@1.90.0)(sass@1.90.0)(terser@5.43.1)(yaml@2.8.1)
+ vite: 7.0.6(sass-embedded@1.90.0(patch_hash=24d35db63138795a11bb26b230cf743c82f571c7e2ee061db58263799d659e20))(sass@1.90.0)(terser@5.43.1)(yaml@2.8.1)
vue: 3.5.18
'@vue/compiler-core@3.5.18':
@@ -4869,7 +4874,7 @@ snapshots:
sass-embedded-win32-x64@1.90.0:
optional: true
- sass-embedded@1.85.0:
+ sass-embedded@1.85.0(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi):
- sass-embedded@1.90.0:
+ sass-embedded@1.90.0(patch_hash=24d35db63138795a11bb26b230cf743c82f571c7e2ee061db58263799d659e20):
dependencies:
'@bufbuild/protobuf': 2.2.3
'@bufbuild/protobuf': 2.6.3
buffer-builder: 0.2.0
@@ -5001,25 +5006,25 @@ snapshots:
@@ -5184,18 +5189,18 @@ snapshots:
varint@6.0.0: {}
- vite-plugin-pwa@0.21.1(vite@6.1.3(sass-embedded@1.85.0)(terser@5.39.0)(yaml@2.7.0))(workbox-build@7.3.0)(workbox-window@7.3.0):
+ vite-plugin-pwa@0.21.1(vite@6.1.3(sass-embedded@1.85.0(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi))(terser@5.39.0)(yaml@2.7.0))(workbox-build@7.3.0)(workbox-window@7.3.0):
- vite-plugin-pwa@1.0.2(vite@7.0.6(sass-embedded@1.90.0)(sass@1.90.0)(terser@5.43.1)(yaml@2.8.1))(workbox-build@7.3.0)(workbox-window@7.3.0):
+ vite-plugin-pwa@1.0.2(vite@7.0.6(sass-embedded@1.90.0(patch_hash=24d35db63138795a11bb26b230cf743c82f571c7e2ee061db58263799d659e20))(sass@1.90.0)(terser@5.43.1)(yaml@2.8.1))(workbox-build@7.3.0)(workbox-window@7.3.0):
dependencies:
debug: 4.4.0
debug: 4.4.1
pretty-bytes: 6.1.1
tinyglobby: 0.2.12
- vite: 6.1.3(sass-embedded@1.85.0)(terser@5.39.0)(yaml@2.7.0)
+ vite: 6.1.3(sass-embedded@1.85.0(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi))(terser@5.39.0)(yaml@2.7.0)
tinyglobby: 0.2.14
- vite: 7.0.6(sass-embedded@1.90.0)(sass@1.90.0)(terser@5.43.1)(yaml@2.8.1)
+ vite: 7.0.6(sass-embedded@1.90.0(patch_hash=24d35db63138795a11bb26b230cf743c82f571c7e2ee061db58263799d659e20))(sass@1.90.0)(terser@5.43.1)(yaml@2.8.1)
workbox-build: 7.3.0
workbox-window: 7.3.0
transitivePeerDependencies:
- supports-color
- vite@6.1.3(sass-embedded@1.85.0)(terser@5.39.0)(yaml@2.7.0):
+ vite@6.1.3(sass-embedded@1.85.0(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi))(terser@5.39.0)(yaml@2.7.0):
- vite@7.0.6(sass-embedded@1.90.0)(sass@1.90.0)(terser@5.43.1)(yaml@2.8.1):
+ vite@7.0.6(sass-embedded@1.90.0(patch_hash=24d35db63138795a11bb26b230cf743c82f571c7e2ee061db58263799d659e20))(sass@1.90.0)(terser@5.43.1)(yaml@2.8.1):
dependencies:
esbuild: 0.24.2
postcss: 8.5.3
rollup: 4.38.0
esbuild: 0.25.8
fdir: 6.4.6(picomatch@4.0.3)
@@ -5206,7 +5211,7 @@ snapshots:
optionalDependencies:
fsevents: 2.3.3
- sass-embedded: 1.85.0
+ sass-embedded: 1.85.0(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi)
terser: 5.39.0
yaml: 2.7.0
sass: 1.90.0
- sass-embedded: 1.90.0
+ sass-embedded: 1.90.0(patch_hash=24d35db63138795a11bb26b230cf743c82f571c7e2ee061db58263799d659e20)
terser: 5.43.1
yaml: 2.8.1
--
2.50.1
+9 -8
View File
@@ -2,31 +2,32 @@
lib,
stdenvNoCC,
fetchFromGitHub,
pnpm_9,
pnpm_10,
nodejs,
dart-sass,
nix-update-script,
nixosTests,
}:
stdenvNoCC.mkDerivation rec {
pname = "homer";
version = "25.04.1";
version = "25.08.1";
src = fetchFromGitHub {
owner = "bastienwirtz";
repo = "homer";
rev = "v${version}";
hash = "sha256-hvDrFGv6Mht9whA2lJbDLQnP2LkOiCo3NtjMpWr/q6A=";
hash = "sha256-DA2gdh6o67QDC4y+N5DVG0ktjt/ORNbycU/y2cUjUE0=";
};
pnpmDeps = pnpm_9.fetchDeps {
pnpmDeps = pnpm_10.fetchDeps {
inherit
pname
version
src
patches
;
fetcherVersion = 1;
hash = "sha256-y1R+rlaOtFOHHAgEHPBl40536U10Ft0iUSfGcfXS08Y=";
fetcherVersion = 2;
hash = "sha256-y/4f/39NOVV46Eg3h7fw8K43/kUIBqtiokTRRlX7398=";
};
# Enables specifying a custom Sass compiler binary path via `SASS_EMBEDDED_BIN_PATH` environment variable.
@@ -35,7 +36,7 @@ stdenvNoCC.mkDerivation rec {
nativeBuildInputs = [
nodejs
dart-sass
pnpm_9.configHook
pnpm_10.configHook
];
buildPhase = ''
@@ -65,7 +66,7 @@ stdenvNoCC.mkDerivation rec {
meta = with lib; {
description = "Very simple static homepage for your server";
homepage = "https://homer-demo.netlify.app/";
homepage = "https://github.com/bastienwirtz/homer";
changelog = "https://github.com/bastienwirtz/homer/releases";
license = licenses.asl20;
maintainers = with maintainers; [
+1 -1
View File
@@ -27,7 +27,7 @@ stdenv.mkDerivation {
postPatch = ''
patchShebangs --host ipfetch
# Not only does `/usr` have to be replaced but also `/flags` needs to be added because with Nix the script is broken without this. The `/flags` is somehow not needed if you install via the install script in the source repository.
substituteInPlace ./ipfetch --replace /usr/share/ipfetch $out/usr/share/ipfetch/flags
substituteInPlace ./ipfetch --replace-fail /usr/share/ipfetch $out/usr/share/ipfetch/flags
'';
installPhase = ''
mkdir -p $out/bin
+3 -3
View File
@@ -6,16 +6,16 @@
rustPlatform.buildRustPackage rec {
pname = "iroh";
version = "0.91.0";
version = "0.91.2";
src = fetchFromGitHub {
owner = "n0-computer";
repo = "iroh";
rev = "v${version}";
hash = "sha256-eY/w3YBuNPsCDhu58S7cykFCY0ikpMR4RFWHVMjH33Q=";
hash = "sha256-O1hWQNBLUqkBPoaW1lxmTrai+lktIAFgPX2Qa3y5HPc=";
};
cargoHash = "sha256-tkqomIOOfPSbyNMNJskqZLXdU8uDK91f9IGjhz+q300=";
cargoHash = "sha256-CgEit1HR6w0Y5SmSpErJnag3vaNgyocymLaM4RjYIBo=";
# Some tests require network access which is not available in nix build sandbox.
doCheck = false;
+3 -3
View File
@@ -6,16 +6,16 @@
buildGoModule rec {
pname = "kafkactl";
version = "5.11.1";
version = "5.12.0";
src = fetchFromGitHub {
owner = "deviceinsight";
repo = "kafkactl";
tag = "v${version}";
hash = "sha256-kemN4XJcXH3V7/RT9S2FLiUgS7tisK6wmHyUQnyBfhU=";
hash = "sha256-wNqoGb3tVzoj+cUNNxqJvnq2Qr8BF0BC0FM01QAnu2o=";
};
vendorHash = "sha256-rxQxNf3FBAGudgrE2wxHw4mVHxTEpQpQ+DX/nEVpoJY=";
vendorHash = "sha256-sVvEHMXpjas+l93IZfAChDX5eDm0lkUNCr5r1JaVQ9I=";
doCheck = false;
+5 -6
View File
@@ -1,7 +1,7 @@
GEM
remote: https://rubygems.org/
specs:
activesupport (8.0.2)
activesupport (8.0.2.1)
base64
benchmark (>= 0.3)
bigdecimal
@@ -27,7 +27,7 @@ GEM
ed25519 (1.4.0)
i18n (1.14.7)
concurrent-ruby (~> 1.0)
kamal (2.6.1)
kamal (2.7.0)
activesupport (>= 7.0)
base64 (~> 0.2)
bcrypt_pbkdf (~> 1.0)
@@ -45,7 +45,7 @@ GEM
net-sftp (4.0.0)
net-ssh (>= 5.0.0, < 8.0.0)
net-ssh (7.3.0)
ostruct (0.6.1)
ostruct (0.6.3)
securerandom (0.4.1)
sshkit (1.24.0)
base64
@@ -54,7 +54,7 @@ GEM
net-sftp (>= 2.1.2)
net-ssh (>= 2.8.0)
ostruct
thor (1.3.2)
thor (1.4.0)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
uri (1.0.3)
@@ -64,10 +64,9 @@ PLATFORMS
arm64-darwin
ruby
x86_64-darwin
x86_64-linux
DEPENDENCIES
kamal
BUNDLED WITH
2.5.22
2.6.9
+8 -8
View File
@@ -18,10 +18,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0pm40y64wfc50a9sj87kxvil2102rmpdcbv82zf0r40vlgdwsrc5";
sha256 = "1ik1sm5sizrsnr3di0klh7rvsy9r9mmd805fv5srk66as5psf184";
type = "gem";
};
version = "8.0.2";
version = "8.0.2.1";
};
base64 = {
groups = [ "default" ];
@@ -141,10 +141,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0ak5yn5i99prqhyr0qry90lhi30z3qpyai8pkjs4nfs8b9fski0z";
sha256 = "1y5l2f1q484wbmlxiwdxsky0s44whj0y3xqp31m8hh57czcn7f36";
type = "gem";
};
version = "2.6.1";
version = "2.7.0";
};
logger = {
groups = [ "default" ];
@@ -203,10 +203,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "05xqijcf80sza5pnlp1c8whdaay8x5dc13214ngh790zrizgp8q9";
sha256 = "04nrir9wdpc4izqwqbysxyly8y7hsfr4fsv69rw91lfi9d5fv8lm";
type = "gem";
};
version = "0.6.1";
version = "0.6.3";
};
securerandom = {
groups = [ "default" ];
@@ -241,10 +241,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1nmymd86a0vb39pzj2cwv57avdrl6pl3lf5bsz58q594kqxjkw7f";
sha256 = "0gcarlmpfbmqnjvwfz44gdjhcmm634di7plcx2zdgwdhrhifhqw7";
type = "gem";
};
version = "1.3.2";
version = "1.4.0";
};
tzinfo = {
dependencies = [ "concurrent-ruby" ];
-1
View File
@@ -2,7 +2,6 @@
lib,
ruby,
bundlerApp,
bundlerUpdateScript,
}:
bundlerApp {
+1 -1
View File
@@ -1,5 +1,5 @@
{
"desktop_webview_window": "sha256-Z9ehzDKe1W3wGa2AcZoP73hlSwydggO6DaXd9mop+cM=",
"desktop_webview_window": "sha256-GcTwBQKPFwG6fVYd9v2HVvc/Meyxmc8cD5GcgcnPpgo=",
"media_kit": "sha256-N6QoktM8u9NYF8MAXLsxM9RlV8nICM4NbnmABHTRkZg=",
"media_kit_libs_android_video": "sha256-N6QoktM8u9NYF8MAXLsxM9RlV8nICM4NbnmABHTRkZg=",
"media_kit_libs_ios_video": "sha256-N6QoktM8u9NYF8MAXLsxM9RlV8nICM4NbnmABHTRkZg=",
+4 -4
View File
@@ -1,7 +1,7 @@
{
lib,
stdenv,
flutter332,
flutter335,
fetchFromGitHub,
autoPatchelfHook,
alsa-lib,
@@ -17,16 +17,16 @@
}:
let
version = "1.7.6";
version = "1.7.7";
src = fetchFromGitHub {
owner = "Predidit";
repo = "Kazumi";
tag = version;
hash = "sha256-avZ0IxxJO9e0xWE58QYkTspDqgwu+nCwzzvV+4rCLOk=";
hash = "sha256-t+RhLzfQwiBa49BCZ0qeUijAylPWYR8UYZHKk6bVgZc=";
};
in
flutter332.buildFlutterApplication {
flutter335.buildFlutterApplication {
pname = "kazumi";
inherit version src;
+41 -57
View File
@@ -4,27 +4,21 @@
"dependency": "transitive",
"description": {
"name": "_fe_analyzer_shared",
"sha256": "16e298750b6d0af7ce8a3ba7c18c69c3785d11b15ec83f6dcd0ad2a0009b3cab",
"sha256": "0b2f2bd91ba804e53a61d757b986f89f1f9eaed5b11e4b2f5a2468d86d6c9fc7",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "76.0.0"
},
"_macros": {
"dependency": "transitive",
"description": "dart",
"source": "sdk",
"version": "0.3.3"
"version": "67.0.0"
},
"analyzer": {
"dependency": "transitive",
"description": {
"name": "analyzer",
"sha256": "1f14db053a8c23e260789e9b0980fa27f2680dd640932cae5e1137cce0e46e1e",
"sha256": "37577842a27e4338429a1cbc32679d508836510b056f1eedf0c8d20e39c1383d",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "6.11.0"
"version": "6.4.1"
},
"ansicolor": {
"dependency": "transitive",
@@ -110,11 +104,11 @@
"dependency": "transitive",
"description": {
"name": "build",
"sha256": "51dc711996cbf609b90cbe5b335bbce83143875a9d58e4b5c6d3c4f684d3dda7",
"sha256": "80184af8b6cb3e5c1c4ec6d8544d27711700bc3e6d2efad04238c7b5290889f0",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.5.4"
"version": "2.4.1"
},
"build_config": {
"dependency": "transitive",
@@ -140,31 +134,31 @@
"dependency": "transitive",
"description": {
"name": "build_resolvers",
"sha256": "ee4257b3f20c0c90e72ed2b57ad637f694ccba48839a821e87db762548c22a62",
"sha256": "339086358431fa15d7eca8b6a36e5d783728cf025e559b834f4609a1fcfb7b0a",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.5.4"
"version": "2.4.2"
},
"build_runner": {
"dependency": "direct dev",
"description": {
"name": "build_runner",
"sha256": "382a4d649addbfb7ba71a3631df0ec6a45d5ab9b098638144faf27f02778eb53",
"sha256": "028819cfb90051c6b5440c7e574d1896f8037e3c96cf17aaeb054c9311cfbf4d",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.5.4"
"version": "2.4.13"
},
"build_runner_core": {
"dependency": "transitive",
"description": {
"name": "build_runner_core",
"sha256": "85fbbb1036d576d966332a3f5ce83f2ce66a40bea1a94ad2d5fc29a19a0d3792",
"sha256": "f8126682b87a7282a339b871298cc12009cb67109cfa1614d6436fb0289193e0",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "9.1.2"
"version": "7.3.2"
},
"built_collection": {
"dependency": "transitive",
@@ -230,11 +224,11 @@
"dependency": "direct main",
"description": {
"name": "card_settings_ui",
"sha256": "ee92c90366096c84e43a4e2942902b81d3ecd53e7c4643ab804d342d0469cb77",
"sha256": "69946704bf4e05830e4737645188f14420285063c8e15f82ef8f5708dba55df8",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.2.0"
"version": "2.0.0"
},
"characters": {
"dependency": "transitive",
@@ -380,11 +374,11 @@
"dependency": "transitive",
"description": {
"name": "dart_style",
"sha256": "7306ab8a2359a48d22310ad823521d723acfed60ee1f7e37388e8986853b6820",
"sha256": "99e066ce75c89d6b29903d788a7bb9369cf754f7b24bf70bf4b6d6d6b26853b9",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.3.8"
"version": "2.3.6"
},
"dbus": {
"dependency": "transitive",
@@ -400,8 +394,8 @@
"dependency": "direct main",
"description": {
"path": ".",
"ref": "no_texture",
"resolved-ref": "109f1739727a71d8da60696143f5af91061faab2",
"ref": "user_script",
"resolved-ref": "0372b6b20c7d48b5777180b8d3cb0124f2e6b061",
"url": "https://github.com/Predidit/linux_webview_window.git"
},
"source": "git",
@@ -895,31 +889,31 @@
"dependency": "transitive",
"description": {
"name": "leak_tracker",
"sha256": "6bb818ecbdffe216e81182c2f0714a2e62b593f4a4f13098713ff1685dfb6ab0",
"sha256": "8dcda04c3fc16c14f48a7bb586d4be1f0d1572731b6d81d51772ef47c02081e0",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "10.0.9"
"version": "11.0.1"
},
"leak_tracker_flutter_testing": {
"dependency": "transitive",
"description": {
"name": "leak_tracker_flutter_testing",
"sha256": "f8b613e7e6a13ec79cfdc0e97638fddb3ab848452eff057653abd3edba760573",
"sha256": "1dbc140bb5a23c75ea9c4811222756104fbcd1a27173f0c34ca01e16bea473c1",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "3.0.9"
"version": "3.0.10"
},
"leak_tracker_testing": {
"dependency": "transitive",
"description": {
"name": "leak_tracker_testing",
"sha256": "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3",
"sha256": "8d5a2d49f4a66b49744b23b018848400d23e54caf9463f4eb20df3eb8acb2eb1",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "3.0.1"
"version": "3.0.2"
},
"lints": {
"dependency": "transitive",
@@ -951,16 +945,6 @@
"source": "hosted",
"version": "1.3.0"
},
"macros": {
"dependency": "transitive",
"description": {
"name": "macros",
"sha256": "1d9e801cd66f7ea3663c45fc708450db1fa57f988142c64289142c9b7ee80656",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "0.1.3-main.0"
},
"matcher": {
"dependency": "transitive",
"description": {
@@ -985,7 +969,7 @@
"dependency": "direct main",
"description": {
"path": "media_kit",
"ref": "main",
"ref": "ad84c59faa2b871926cb31516bdeec65d7676884",
"resolved-ref": "ad84c59faa2b871926cb31516bdeec65d7676884",
"url": "https://github.com/Predidit/media-kit.git"
},
@@ -996,7 +980,7 @@
"dependency": "direct overridden",
"description": {
"path": "libs/android/media_kit_libs_android_video",
"ref": "main",
"ref": "ad84c59faa2b871926cb31516bdeec65d7676884",
"resolved-ref": "ad84c59faa2b871926cb31516bdeec65d7676884",
"url": "https://github.com/Predidit/media-kit.git"
},
@@ -1007,7 +991,7 @@
"dependency": "direct overridden",
"description": {
"path": "libs/ios/media_kit_libs_ios_video",
"ref": "main",
"ref": "ad84c59faa2b871926cb31516bdeec65d7676884",
"resolved-ref": "ad84c59faa2b871926cb31516bdeec65d7676884",
"url": "https://github.com/Predidit/media-kit.git"
},
@@ -1018,7 +1002,7 @@
"dependency": "direct overridden",
"description": {
"path": "libs/linux/media_kit_libs_linux",
"ref": "main",
"ref": "ad84c59faa2b871926cb31516bdeec65d7676884",
"resolved-ref": "ad84c59faa2b871926cb31516bdeec65d7676884",
"url": "https://github.com/Predidit/media-kit.git"
},
@@ -1029,7 +1013,7 @@
"dependency": "direct overridden",
"description": {
"path": "libs/macos/media_kit_libs_macos_video",
"ref": "main",
"ref": "ad84c59faa2b871926cb31516bdeec65d7676884",
"resolved-ref": "ad84c59faa2b871926cb31516bdeec65d7676884",
"url": "https://github.com/Predidit/media-kit.git"
},
@@ -1040,7 +1024,7 @@
"dependency": "direct main",
"description": {
"path": "libs/universal/media_kit_libs_video",
"ref": "main",
"ref": "ad84c59faa2b871926cb31516bdeec65d7676884",
"resolved-ref": "ad84c59faa2b871926cb31516bdeec65d7676884",
"url": "https://github.com/Predidit/media-kit.git"
},
@@ -1051,7 +1035,7 @@
"dependency": "direct overridden",
"description": {
"path": "libs/windows/media_kit_libs_windows_video",
"ref": "main",
"ref": "ad84c59faa2b871926cb31516bdeec65d7676884",
"resolved-ref": "ad84c59faa2b871926cb31516bdeec65d7676884",
"url": "https://github.com/Predidit/media-kit.git"
},
@@ -1062,7 +1046,7 @@
"dependency": "direct main",
"description": {
"path": "media_kit_video",
"ref": "main",
"ref": "ad84c59faa2b871926cb31516bdeec65d7676884",
"resolved-ref": "ad84c59faa2b871926cb31516bdeec65d7676884",
"url": "https://github.com/Predidit/media-kit.git"
},
@@ -1113,11 +1097,11 @@
"dependency": "direct dev",
"description": {
"name": "mobx_codegen",
"sha256": "e0abbbc651a69550440f6b65c99ec222a1e2a4afd7baec8ba0f3088c7ca582a8",
"sha256": "990da80722f7d7c0017dec92040b31545d625b15d40204c36a1e63d167c73cdc",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.7.1"
"version": "2.7.0"
},
"modular_core": {
"dependency": "transitive",
@@ -1613,11 +1597,11 @@
"dependency": "transitive",
"description": {
"name": "shelf_web_socket",
"sha256": "3632775c8e90d6c9712f883e633716432a27758216dfb61bd86a8321c0580925",
"sha256": "cc36c297b52866d203dbf9332263c94becc2fe0ceaa9681d07b6ef9807023b67",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "3.0.0"
"version": "2.0.1"
},
"shortid": {
"dependency": "transitive",
@@ -1799,11 +1783,11 @@
"dependency": "transitive",
"description": {
"name": "test_api",
"sha256": "fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd",
"sha256": "522f00f556e73044315fa4585ec3270f1808a4b186c936e612cab0b565ff1e00",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "0.7.4"
"version": "0.7.6"
},
"timing": {
"dependency": "transitive",
@@ -1999,11 +1983,11 @@
"dependency": "transitive",
"description": {
"name": "vector_math",
"sha256": "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803",
"sha256": "d530bd74fea330e6e364cda7a85019c434070188383e1cd8d9777ee586914c5b",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.1.4"
"version": "2.2.0"
},
"version": {
"dependency": "transitive",
@@ -2239,6 +2223,6 @@
},
"sdks": {
"dart": ">=3.8.0 <4.0.0",
"flutter": ">=3.32.8"
"flutter": ">=3.35.1"
}
}
+3 -3
View File
@@ -5,14 +5,14 @@
}:
buildGoModule rec {
pname = "kin-openapi";
version = "0.132.0";
vendorHash = "sha256-VtN2dOJEBAS7khjn2GlvMspFvd7SgMqNWBte3gwbWng=";
version = "0.133.0";
vendorHash = "sha256-SFT4mY0TVUa/hMMe7sOVToSX8qA1OimOiNs4kBjRdBU=";
src = fetchFromGitHub {
owner = "getkin";
repo = "kin-openapi";
tag = "v${version}";
hash = "sha256-2iDT9sI4dy7KEFKfWhPhccTc1/1jpSjYt+cXz+RE9ys=";
hash = "sha256-7KC+cHdI3zArJbSMfao8JIb3sUZJK1PQfrIiFI0zHM8=";
};
checkFlags =
+4 -4
View File
@@ -22,21 +22,21 @@ let
url = "https://download.fcitx-im.org/data/lm_sc.arpa-${arpaVer}.tar.zst";
hash = "sha256-7oPs8g1S6LzNukz2zVcYPVPCV3E6Xrd+46Y9UPw3lt0=";
};
dictVer = "20241001";
dictVer = "20250327";
dict = fetchurl {
url = "https://download.fcitx-im.org/data/dict-${dictVer}.tar.zst";
hash = "sha256-0zE7iKaGIKI7yNX5VkzxtniEjcevVBxPXwIZjlo2hr8=";
hash = "sha256-fKa+R1TA1MJ7p3AsDc5lFlm9LKH6pcvyhI2BoAU8jBM=";
};
in
stdenv.mkDerivation rec {
pname = "libime";
version = "1.1.10";
version = "1.1.11";
src = fetchFromGitHub {
owner = "fcitx";
repo = "libime";
tag = version;
hash = "sha256-liVJEBUYcVYjjJCMW68xXbEHKQpAgTLCPm2yIdWG3IQ=";
hash = "sha256-C9l7VBSUdSpnt+8ghdmLljZXHFswTyi/ItqeeYTjF4Y=";
fetchSubmodules = true;
};
+2 -2
View File
@@ -3,7 +3,7 @@
stdenv,
fetchurl,
fetchFromGitHub,
flutter324,
flutter327,
makeDesktopItem,
copyDesktopItems,
nixosTests,
@@ -16,7 +16,7 @@ let
pname = "localsend";
version = "1.17.0";
linux = flutter324.buildFlutterApplication rec {
linux = flutter327.buildFlutterApplication rec {
inherit pname version;
src = fetchFromGitHub {
+3 -3
View File
@@ -5,16 +5,16 @@
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "markdown-oxide";
version = "0.25.6";
version = "0.25.8";
src = fetchFromGitHub {
owner = "Feel-ix-343";
repo = "markdown-oxide";
tag = "v${finalAttrs.version}";
hash = "sha256-GIwvypvfHwOmT5Y01Xho9ClD9PcY+K2PJAd5VPEIr/8=";
hash = "sha256-Y3xMiWnLHDVeRn1KbmsC/5yJWhukKFB6X9VHnuEkFU8=";
};
cargoHash = "sha256-c6m/sbCbXIYQ5FMm7cdiuMJrX2iz64ZHFiiRuvSGu+Y=";
cargoHash = "sha256-M4LwkF031bv7aIC9aEh5bF6Vk/DJt3DH1Rh3dUNopX4=";
meta = {
description = "Markdown LSP server inspired by Obsidian";
@@ -14,19 +14,19 @@
python3Packages.buildPythonApplication rec {
pname = "matrix-synapse";
version = "1.136.0";
version = "1.137.0";
format = "pyproject";
src = fetchFromGitHub {
owner = "element-hq";
repo = "synapse";
rev = "v${version}";
hash = "sha256-9nN4sQXCamVi+FRN9++FN5nQmjYZnPKDLxjxEuga6EM=";
hash = "sha256-jnbW1p5JK00Of6XqoDfWs/4SqIztafjkvXUDWhMTm30=";
};
cargoDeps = rustPlatform.fetchCargoVendor {
inherit pname version src;
hash = "sha256-GX4lVg6aPVlqFgSSGsUg3wi7bne9jVWPTVx8rO5SjL8=";
hash = "sha256-qpgDErV1VVzaUHHQX4ReXCPihdrSKI/4HtbDeQIblR8=";
};
build-system = with python3Packages; [
+41
View File
@@ -0,0 +1,41 @@
{
lib,
rustPlatform,
fetchFromGitHub,
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "mpdris2-rs";
version = "1.0.2";
src = fetchFromGitHub {
owner = "szclsya";
repo = "mpdris2-rs";
tag = "v${finalAttrs.version}";
hash = "sha256-E9H6bjmWZx35fZo/ZPvJL1w/YQ34pJ7z81YbB5fUZSU=";
};
cargoHash = "sha256-rA/za8fc2RiURaiijc49y+2QBcS6cDavZQFjVh+7Iow=";
postPatch = ''
substituteInPlace misc/mpdris2-rs.service --replace-fail "/usr/local" "$out"
'';
postInstall = ''
install -Dm644 misc/mpdris2-rs.service -t $out/lib/systemd/user
'';
meta = {
description = "Exposing MPRIS V2.2 D-Bus interface for MPD";
longDescription = ''
A lightweight implementation of MPD to D-Bus bridge, which exposes MPD
player and playlist information onto MPRIS2 interface so other programs
can use this generic interface to retrieve MPD's playback state.
'';
homepage = "https://github.com/szclsya/mpdris2-rs";
changelog = "https://github.com/szclsya/mpdris2-rs/blob/${finalAttrs.src.rev}/Changes.md";
license = lib.licenses.gpl3Plus;
maintainers = with lib.maintainers; [
acidbong
];
mainProgram = "mpdris2-rs";
};
})
+3
View File
@@ -39,6 +39,9 @@ buildDotnetModule rec {
# Embedded base64-encoded app icon in resx fails to parse. Delete it
sed -zi 's|<data name="$this.Icon".*</data>||g' NetworkMiner/NamedPipeForm.resx
sed -zi 's|<data name="$this.Icon".*</data>||g' NetworkMiner/UpdateCheck.resx
# Remove the UTF-8 BOM from the desktop file.
dos2unix -r NetworkMiner/NetworkMiner.desktop
'';
nugetDeps = ./deps.json;
+2 -2
View File
@@ -7,13 +7,13 @@
buildGoModule rec {
pname = "nuclei";
version = "3.4.8";
version = "3.4.10";
src = fetchFromGitHub {
owner = "projectdiscovery";
repo = "nuclei";
tag = "v${version}";
hash = "sha256-SESLzN2Fc+GY4ztJ8V9GfSb/Ja88PPpgptJLL2jx1SI=";
hash = "sha256-lFyp5VXEX0nK83p2LmWdhNoQKvNtgln1GG3OpZEXaL8=";
};
vendorHash = "sha256-cDK0xP3vHRVBeFK2dKDnaCNge7EBKkMcrYen12XI7G0=";
+4 -4
View File
@@ -47,23 +47,23 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "peertube";
version = "7.2.1";
version = "7.2.3";
src = fetchFromGitHub {
owner = "Chocobozzz";
repo = "PeerTube";
tag = "v${finalAttrs.version}";
hash = "sha256-I53LCCtB8iNGuABgvhRjUfxocasXCv4TV7jXtHVpMnU=";
hash = "sha256-vbjQoysm5ERY6kG3JhG6z/zKxVlmWmRXQyUnCrVgjFk=";
};
yarnOfflineCacheServer = fetchYarnDeps {
yarnLock = "${finalAttrs.src}/yarn.lock";
hash = "sha256-PMU6ZMcT+9Z3Y6+085e3hRnvs4Xii5FIkkOPvsltfMY=";
hash = "sha256-baQgvzJ3W5lULrdukwM9niovtzAI0yvc2c7mqhtCDxk=";
};
yarnOfflineCacheClient = fetchYarnDeps {
yarnLock = "${finalAttrs.src}/client/yarn.lock";
hash = "sha256-AWUnxC/cwtKCa70MKmHeOr6ussMYyQ5awQAnWYzCA1s=";
hash = "sha256-Y1boUDDegqCRt9fQaP+svIKYFz+gowGyV6sV7vq8vMA=";
};
yarnOfflineCacheAppsCli = fetchYarnDeps {
+21 -6
View File
@@ -19,17 +19,27 @@
wayland,
libdrm,
libxkbcommon,
wlroots_0_17,
wlroots_0_19,
xorg,
directoryListingUpdater,
nix-update-script,
nixosTests,
testers,
gmobile,
}:
let
# Derived from subprojects/gvdb.wrap
gvdb = fetchFromGitLab {
domain = "gitlab.gnome.org";
owner = "GNOME";
repo = "gvdb";
rev = "4758f6fb7f889e074e13df3f914328f3eecb1fd3";
hash = "sha256-4mqoHPlrMPenoGPwDqbtv4/rJ/uq9Skcm82pRvOxNIk=";
};
in
stdenv.mkDerivation (finalAttrs: {
pname = "phoc";
version = "0.44.1";
version = "0.48.0";
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
@@ -37,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: {
owner = "Phosh";
repo = "phoc";
rev = "v${finalAttrs.version}";
hash = "sha256-Whke7wTRp5NaRauiiQZLjs0pSD1uAyr0aAhlK5e1+Hw=";
hash = "sha256-ve69Na6iZwsNM0y7AZ0p/CObUfE6uEbhOV4sb5NaCYg=";
};
nativeBuildInputs = [
@@ -66,11 +76,15 @@ stdenv.mkDerivation (finalAttrs: {
gmobile
];
postPatch = ''
ln -s ${gvdb} subprojects/gvdb
'';
mesonFlags = [ "-Dembed-wlroots=disabled" ];
# Patch wlroots to remove a check which crashes Phosh.
# This patch can be found within the phoc source tree.
wlroots = wlroots_0_17.overrideAttrs (old: {
wlroots = wlroots_0_19.overrideAttrs (old: {
patches = (old.patches or [ ]) ++ [
(stdenvNoCC.mkDerivation {
name = "0001-Revert-layer-shell-error-on-0-dimension-without-anch.patch";
@@ -87,7 +101,7 @@ stdenv.mkDerivation (finalAttrs: {
tests.version = testers.testVersion {
package = finalAttrs.finalPackage;
};
updateScript = directoryListingUpdater { };
updateScript = nix-update-script { };
};
meta = with lib; {
@@ -98,6 +112,7 @@ stdenv.mkDerivation (finalAttrs: {
maintainers = with maintainers; [
masipcat
zhaofengli
armelclo
];
platforms = platforms.linux;
};
+3 -3
View File
@@ -8,15 +8,15 @@
rustPlatform.buildRustPackage rec {
pname = "planus";
version = "1.1.1";
version = "1.2.0";
src = fetchCrate {
pname = "planus-cli";
inherit version;
hash = "sha256-Tulp2gD4CbNaxRAc+7/rWY4SjXp66Kui9/PuKfnaeMs=";
hash = "sha256-z1fXLXSk9xprKMCsbkvJfDB3qz9aR6Bslf517TyQ7qI=";
};
cargoHash = "sha256-3wZ6kmWzGjS2pnBDBi3t2A9kSlWUyG5ohsGfK2ViTcY=";
cargoHash = "sha256-igja5/FaYBrJSBc9Gw3091UorEV+UmlxPzfk5FYaWXo=";
nativeBuildInputs = [
installShellFiles
+4 -3
View File
@@ -29,6 +29,9 @@
let
sources = callPackage ./sources.nix { };
vulkan-headers-qmplay2 = vulkan-headers.overrideAttrs (oldAttrs: {
inherit (sources.vulkan-headers-qmplay2) version src;
});
in
assert lib.elem qtVersion [
"5"
@@ -43,8 +46,6 @@ stdenv.mkDerivation (finalAttrs: {
cp -va ${sources.qmvk.src}/* qmvk/
chmod --recursive 744 qmvk
popd
substituteInPlace src/qmplay2/vulkan/VulkanWindow.cpp \
--replace-fail "getSubmitInfo()" "getSubmitInfo(0)"
'';
nativeBuildInputs = [
@@ -70,7 +71,7 @@ stdenv.mkDerivation (finalAttrs: {
libva
libxcb
taglib
vulkan-headers
vulkan-headers-qmplay2
vulkan-tools
]
++ lib.optionals (qtVersion == "6") [
+18 -3
View File
@@ -5,14 +5,29 @@
let
self = {
pname = "qmplay2";
version = "25.01.19";
version = "25.06.27";
src = fetchFromGitHub {
owner = "zaps166";
repo = "QMPlay2";
tag = self.version;
hash = "sha256-Of/zEQ6o2J/wXfAoY10IPtCaMaSk8ux8L6MrimeMWVA=";
fetchSubmodules = true;
hash = "sha256-+kDaRKwXOHnHje1RntC9y9xiTaMzs8SGMLVoJ+6IDNk=";
};
};
in
self;
vulkan-headers-qmplay2 =
let
self = {
pname = "vulkan-headers";
version = "1.3.300";
src = fetchFromGitHub {
owner = "KhronosGroup";
repo = "Vulkan-Headers";
tag = "v${self.version}";
hash = "sha256-6J+6yvbEQXLY+Wkf1pWKtUAZGbe5Tc01uVh3Wqmk2+8=";
};
};
in
+78 -60
View File
@@ -67,9 +67,9 @@
},
{
"pname": "Microsoft.CodeAnalysis.Analyzers",
"version": "5.0.0-2.25380.11",
"hash": "sha256-BTfux6b560oPleV/AkF262NGcA6ODfNpuUjQrTENCP0=",
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.analyzers/5.0.0-2.25380.11/microsoft.codeanalysis.analyzers.5.0.0-2.25380.11.nupkg"
"version": "5.0.0-2.25418.8",
"hash": "sha256-dlQ7KyYZLqSE3D0j6ZAPBv8gbSuE+8IVQhJAeoo2K8g=",
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.analyzers/5.0.0-2.25418.8/microsoft.codeanalysis.analyzers.5.0.0-2.25418.8.nupkg"
},
{
"pname": "Microsoft.CodeAnalysis.BannedApiAnalyzers",
@@ -79,27 +79,27 @@
},
{
"pname": "Microsoft.CodeAnalysis.Common",
"version": "5.0.0-2.25380.11",
"hash": "sha256-TJCSoPNZkL8ZeaMbM3gxk02Kgw6SOn8sfiLcvhseQNc=",
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.common/5.0.0-2.25380.11/microsoft.codeanalysis.common.5.0.0-2.25380.11.nupkg"
"version": "5.0.0-2.25418.8",
"hash": "sha256-O1yCn9+EAwtxZ/GwmAcyDWDPrhjMM4jAuSHvDYCMYiI=",
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.common/5.0.0-2.25418.8/microsoft.codeanalysis.common.5.0.0-2.25418.8.nupkg"
},
{
"pname": "Microsoft.CodeAnalysis.CSharp",
"version": "5.0.0-2.25380.11",
"hash": "sha256-BOz8ZUYWjrrN0pL2tQPtVgK4xCrSRgl691+xPhV+Xi0=",
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp/5.0.0-2.25380.11/microsoft.codeanalysis.csharp.5.0.0-2.25380.11.nupkg"
"version": "5.0.0-2.25418.8",
"hash": "sha256-aO1ZCPkpE0SiF1YgELlOVTe2Mq6mbdZhc8acKsgGYCM=",
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp/5.0.0-2.25418.8/microsoft.codeanalysis.csharp.5.0.0-2.25418.8.nupkg"
},
{
"pname": "Microsoft.CodeAnalysis.CSharp.Features",
"version": "5.0.0-2.25380.11",
"hash": "sha256-4lvcDmiNtG/diRxzppu+NlW9DFN8CtMtt3vXU290Ky8=",
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp.features/5.0.0-2.25380.11/microsoft.codeanalysis.csharp.features.5.0.0-2.25380.11.nupkg"
"version": "5.0.0-2.25418.8",
"hash": "sha256-KFlqI0142Cli+8LgWlfK1DCNO+TlFPQK8NtmCvJZz6A=",
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp.features/5.0.0-2.25418.8/microsoft.codeanalysis.csharp.features.5.0.0-2.25418.8.nupkg"
},
{
"pname": "Microsoft.CodeAnalysis.CSharp.Workspaces",
"version": "5.0.0-2.25380.11",
"hash": "sha256-cPsgAyt7k7T1DSgH2Cm/je431GQgVO/4pt+Z7rhQ3Zk=",
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp.workspaces/5.0.0-2.25380.11/microsoft.codeanalysis.csharp.workspaces.5.0.0-2.25380.11.nupkg"
"version": "5.0.0-2.25418.8",
"hash": "sha256-TigMGogMhbbRaWR4/9Aj+o5lxmVWUoIjBtmUiBHFhxM=",
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp.workspaces/5.0.0-2.25418.8/microsoft.codeanalysis.csharp.workspaces.5.0.0-2.25418.8.nupkg"
},
{
"pname": "Microsoft.CodeAnalysis.Elfie",
@@ -109,21 +109,21 @@
},
{
"pname": "Microsoft.CodeAnalysis.ExternalAccess.Razor.Features",
"version": "5.0.0-2.25380.11",
"hash": "sha256-v9VPJ6Q7WN6ymh2EdvEHciBuZpJZOpYEkDamVxv7pW4=",
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.externalaccess.razor.features/5.0.0-2.25380.11/microsoft.codeanalysis.externalaccess.razor.features.5.0.0-2.25380.11.nupkg"
"version": "5.0.0-2.25418.8",
"hash": "sha256-153NrMy6dA1FuUD0XfRASHiALANMSKXIigf49pQ8emI=",
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.externalaccess.razor.features/5.0.0-2.25418.8/microsoft.codeanalysis.externalaccess.razor.features.5.0.0-2.25418.8.nupkg"
},
{
"pname": "Microsoft.CodeAnalysis.Features",
"version": "5.0.0-2.25380.11",
"hash": "sha256-np7X7tCTIGZRKtBHvM8ToG8/vjCsmEsedLJTVy/QZes=",
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.features/5.0.0-2.25380.11/microsoft.codeanalysis.features.5.0.0-2.25380.11.nupkg"
"version": "5.0.0-2.25418.8",
"hash": "sha256-dYmfiCnerjAArbF4LuXNi6oF9dY8lcDw2M3MX1IswhI=",
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.features/5.0.0-2.25418.8/microsoft.codeanalysis.features.5.0.0-2.25418.8.nupkg"
},
{
"pname": "Microsoft.CodeAnalysis.LanguageServer.Protocol",
"version": "5.0.0-2.25380.11",
"hash": "sha256-o7B62H5VNz/pA5+IM3i5zUIYDsa2UEzWlkOMDrUtj/4=",
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.languageserver.protocol/5.0.0-2.25380.11/microsoft.codeanalysis.languageserver.protocol.5.0.0-2.25380.11.nupkg"
"version": "5.0.0-2.25418.8",
"hash": "sha256-cgAS5pZY6qb2I8QlTaDWl3zLGURNBblPKf69lYHF+xc=",
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.languageserver.protocol/5.0.0-2.25418.8/microsoft.codeanalysis.languageserver.protocol.5.0.0-2.25418.8.nupkg"
},
{
"pname": "Microsoft.CodeAnalysis.PublicApiAnalyzers",
@@ -133,27 +133,27 @@
},
{
"pname": "Microsoft.CodeAnalysis.Remote.Workspaces",
"version": "5.0.0-2.25380.11",
"hash": "sha256-z6+Bv8EQmqX9oEb1VgS+k0qj8FYDxRuXkTeuSrKGfTM=",
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.remote.workspaces/5.0.0-2.25380.11/microsoft.codeanalysis.remote.workspaces.5.0.0-2.25380.11.nupkg"
"version": "5.0.0-2.25418.8",
"hash": "sha256-bHlIsWZus8Ms10WTAgSsKaAsIWyxwCMLd3zfXO3eFXA=",
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.remote.workspaces/5.0.0-2.25418.8/microsoft.codeanalysis.remote.workspaces.5.0.0-2.25418.8.nupkg"
},
{
"pname": "Microsoft.CodeAnalysis.Scripting.Common",
"version": "5.0.0-2.25380.11",
"hash": "sha256-NtfvByHwKt9PISAoHUAy/x1oBwg3hqGcm2gJ+SXcPOc=",
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.scripting.common/5.0.0-2.25380.11/microsoft.codeanalysis.scripting.common.5.0.0-2.25380.11.nupkg"
"version": "5.0.0-2.25418.8",
"hash": "sha256-jmvE90GOWoZLsHcX0SaBHXSJIfDeL/s/47k7uaG0DiE=",
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.scripting.common/5.0.0-2.25418.8/microsoft.codeanalysis.scripting.common.5.0.0-2.25418.8.nupkg"
},
{
"pname": "Microsoft.CodeAnalysis.Workspaces.Common",
"version": "5.0.0-2.25380.11",
"hash": "sha256-ybwUauakjco08QhfKzj1n9zai/N2LwBzsZ+mx3ZA9rg=",
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.workspaces.common/5.0.0-2.25380.11/microsoft.codeanalysis.workspaces.common.5.0.0-2.25380.11.nupkg"
"version": "5.0.0-2.25418.8",
"hash": "sha256-+LI3eEQDmdLTGaab4gu225NblD1l+RWZ+noosDWbxFM=",
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.workspaces.common/5.0.0-2.25418.8/microsoft.codeanalysis.workspaces.common.5.0.0-2.25418.8.nupkg"
},
{
"pname": "Microsoft.CommonLanguageServerProtocol.Framework",
"version": "5.0.0-2.25380.11",
"hash": "sha256-QyWWR0EvtMs9oF5elCLYhypzUeAZBy1vzKCqVrLPinc=",
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.commonlanguageserverprotocol.framework/5.0.0-2.25380.11/microsoft.commonlanguageserverprotocol.framework.5.0.0-2.25380.11.nupkg"
"version": "5.0.0-2.25418.8",
"hash": "sha256-b5QMnPTP/+wpkD2RmS6UtaO5RNYC3PxirboyVgniG04=",
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.commonlanguageserverprotocol.framework/5.0.0-2.25418.8/microsoft.commonlanguageserverprotocol.framework.5.0.0-2.25418.8.nupkg"
},
{
"pname": "Microsoft.CSharp",
@@ -205,9 +205,9 @@
},
{
"pname": "Microsoft.Net.Compilers.Toolset",
"version": "5.0.0-2.25380.11",
"hash": "sha256-IDw4PtfjbHvXVat7tNiQo3i4AhKYERkHuK4UZ2k0qrA=",
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.net.compilers.toolset/5.0.0-2.25380.11/microsoft.net.compilers.toolset.5.0.0-2.25380.11.nupkg"
"version": "5.0.0-2.25418.8",
"hash": "sha256-/Vr5J7ORwruP5mLMeVdbUPjUWYmCbLmZbi+aJBq8HmU=",
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.net.compilers.toolset/5.0.0-2.25418.8/microsoft.net.compilers.toolset.5.0.0-2.25418.8.nupkg"
},
{
"pname": "Microsoft.NET.StringTools",
@@ -313,15 +313,9 @@
},
{
"pname": "Microsoft.ServiceHub.Client",
"version": "4.2.1017",
"hash": "sha256-Achfy4EpZfcIOf02P8onWJH1cte+rP9ZAy94Gf4MVCA=",
"url": "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/2a239fd0-3e21-40b0-b9d6-bc122fec7eb2/nuget/v3/flat2/microsoft.servicehub.client/4.2.1017/microsoft.servicehub.client.4.2.1017.nupkg"
},
{
"pname": "Microsoft.ServiceHub.Framework",
"version": "4.2.100",
"hash": "sha256-xr3E+4mhhp7rTulh9OVdLQgLXWvt14SFMuLGv4/fqgw=",
"url": "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/491596af-6d2d-439e-80bb-1ebb3b54f9a8/nuget/v3/flat2/microsoft.servicehub.framework/4.2.100/microsoft.servicehub.framework.4.2.100.nupkg"
"version": "4.6.3200",
"hash": "sha256-cEXlKEJbQxKztw5g+k9GNTZ0fbHVDCp8/JuMqCK6bAE=",
"url": "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/491596af-6d2d-439e-80bb-1ebb3b54f9a8/nuget/v3/flat2/microsoft.servicehub.client/4.6.3200/microsoft.servicehub.client.4.6.3200.nupkg"
},
{
"pname": "Microsoft.ServiceHub.Framework",
@@ -329,18 +323,18 @@
"hash": "sha256-GZCNC6Nd++vHi5A0UZtTI1sl/63N+NDX2JFfPdTGMDQ=",
"url": "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/491596af-6d2d-439e-80bb-1ebb3b54f9a8/nuget/v3/flat2/microsoft.servicehub.framework/4.8.40/microsoft.servicehub.framework.4.8.40.nupkg"
},
{
"pname": "Microsoft.ServiceHub.Framework",
"version": "4.8.47",
"hash": "sha256-E6M1/jt84cr0HoODwO5BjcelOs+YsD61mlHQnvaMg20=",
"url": "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/491596af-6d2d-439e-80bb-1ebb3b54f9a8/nuget/v3/flat2/microsoft.servicehub.framework/4.8.47/microsoft.servicehub.framework.4.8.47.nupkg"
},
{
"pname": "Microsoft.ServiceHub.Framework",
"version": "4.9.11-beta",
"hash": "sha256-sAdzwH8lt1Z44YMGYTTwMSS8uceK8FXWR5h1p3Iu1OQ=",
"url": "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/491596af-6d2d-439e-80bb-1ebb3b54f9a8/nuget/v3/flat2/microsoft.servicehub.framework/4.9.11-beta/microsoft.servicehub.framework.4.9.11-beta.nupkg"
},
{
"pname": "Microsoft.ServiceHub.Resources",
"version": "4.2.1017",
"hash": "sha256-6nq1jsXLThMritNI1CZj5Batfo/0W0Pt2iLY72yZGNw=",
"url": "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/2a239fd0-3e21-40b0-b9d6-bc122fec7eb2/nuget/v3/flat2/microsoft.servicehub.resources/4.2.1017/microsoft.servicehub.resources.4.2.1017.nupkg"
},
{
"pname": "Microsoft.VisualStudio.Composition",
"version": "17.12.18",
@@ -683,12 +677,6 @@
"hash": "sha256-l8S9gt6dk3qYG6HYonHtdlYtBKyPb29uQ6NDjmrt3V4=",
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.unix.system.runtime.extensions/4.3.0/runtime.unix.system.runtime.extensions.4.3.0.nupkg"
},
{
"pname": "StreamJsonRpc",
"version": "2.15.26",
"hash": "sha256-Wsqxh+1NDGdDklTXJBj25B64I8KCqu68nKxg4O9d+Jg=",
"url": "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/491596af-6d2d-439e-80bb-1ebb3b54f9a8/nuget/v3/flat2/streamjsonrpc/2.15.26/streamjsonrpc.2.15.26.nupkg"
},
{
"pname": "StreamJsonRpc",
"version": "2.20.20",
@@ -701,6 +689,12 @@
"hash": "sha256-Ufx0QWwG9dNm/OrHRzkztVvbQHyKdj6MtTzNTQwTwl0=",
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/streamjsonrpc/2.21.10/streamjsonrpc.2.21.10.nupkg"
},
{
"pname": "StreamJsonRpc",
"version": "2.22.12",
"hash": "sha256-sZVXFHQgA/qdnZeuZ/u54zg2JfMRSGgR0Ub+VxiWoFg=",
"url": "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/491596af-6d2d-439e-80bb-1ebb3b54f9a8/nuget/v3/flat2/streamjsonrpc/2.22.12/streamjsonrpc.2.22.12.nupkg"
},
{
"pname": "StreamJsonRpc",
"version": "2.23.39-alpha",
@@ -1091,12 +1085,30 @@
"hash": "sha256-ueSG+Yn82evxyGBnE49N4D+ngODDXgornlBtQ3Omw54=",
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.accesscontrol/5.0.0/system.security.accesscontrol.5.0.0.nupkg"
},
{
"pname": "System.Security.AccessControl",
"version": "6.0.0",
"hash": "sha256-qOyWEBbNr3EjyS+etFG8/zMbuPjA+O+di717JP9Cxyg=",
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.accesscontrol/6.0.0/system.security.accesscontrol.6.0.0.nupkg"
},
{
"pname": "System.Security.Cryptography.ProtectedData",
"version": "9.0.0",
"hash": "sha256-gPgPU7k/InTqmXoRzQfUMEKL3QuTnOKowFqmXTnWaBQ=",
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.cryptography.protecteddata/9.0.0/system.security.cryptography.protecteddata.9.0.0.nupkg"
},
{
"pname": "System.Security.Permissions",
"version": "8.0.0",
"hash": "sha256-+YUPY+3HnTmfPLZzr+5qEk0RqalCbFZBgLXee1yCH1M=",
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.permissions/8.0.0/system.security.permissions.8.0.0.nupkg"
},
{
"pname": "System.Security.Permissions",
"version": "9.0.0",
"hash": "sha256-BFrA9ottmQtLIAiKiGRbfSUpzNJwuaOCeFRDN4Z0ku0=",
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.permissions/9.0.0/system.security.permissions.9.0.0.nupkg"
},
{
"pname": "System.Security.Principal",
"version": "4.3.0",
@@ -1210,5 +1222,11 @@
"version": "4.5.0",
"hash": "sha256-niH6l2fU52vAzuBlwdQMw0OEoRS/7E1w5smBFoqSaAI=",
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.valuetuple/4.5.0/system.valuetuple.4.5.0.nupkg"
},
{
"pname": "System.Windows.Extensions",
"version": "9.0.0",
"hash": "sha256-RErD+Ju15qtnwdwB7E0SjjJGAnhXwJyC7UPcl24Z3Vs=",
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.windows.extensions/9.0.0/system.windows.extensions.9.0.0.nupkg"
}
]
+3 -3
View File
@@ -25,11 +25,11 @@ buildDotnetModule {
src = fetchFromGitHub {
owner = "dotnet";
repo = "razor";
rev = "9ab78c78721106dcf827e397ff71b07114577712";
hash = "sha256-ank/7cg5qubP9oAbj14WZtJ81nNKDh6g8FRVbkdUQAQ=";
rev = "f2270a5492e831864b60a8853c7435ded110ad6f";
hash = "sha256-QMeIQmX/1W3N3r27fG5/Q6CsW/Wh+EI5+poGlJ2sbsQ=";
};
version = "10.0.0-preview.25411.5";
version = "10.0.0-preview.25424.9";
projectFile = "src/Razor/src/rzls/rzls.csproj";
useDotnetFromEnv = true;
nugetDeps = ./deps.json;
+3 -3
View File
@@ -12,18 +12,18 @@
buildGoModule rec {
pname = "shellhub-agent";
version = "0.20.0";
version = "0.20.1";
src = fetchFromGitHub {
owner = "shellhub-io";
repo = "shellhub";
rev = "v${version}";
hash = "sha256-cDCpZB9lkEnkltY2OQ/Y5HSZmlukeQFbuxhtbeb8E2s=";
hash = "sha256-VO8uQ5tXYK1k1WZiJAq8/VcvCiCcbjzGMDWfZwKSw9w=";
};
modRoot = "./agent";
vendorHash = "sha256-17D8xrLlwX57JW4yXfPlo9RQRMCxVa7MjQQmzI/MBas=";
vendorHash = "sha256-BAZ/rZqI51FYAHLcxbsPQofeNvRZRWihWAMEf91DDHI=";
ldflags = [
"-s"
-137
View File
@@ -1,137 +0,0 @@
{
lib,
stdenv,
fetchFromGitHub,
fetchpatch,
perl,
makeWrapper,
makeDesktopItem,
which,
perlPackages,
boost,
wrapGAppsHook3,
}:
stdenv.mkDerivation rec {
version = "1.3.0";
pname = "slic3r";
src = fetchFromGitHub {
owner = "alexrj";
repo = "Slic3r";
rev = version;
sha256 = "sha256-cf0QTOzhLyTcbJryCQoTVzU8kfrPV6SLpqi4s36X5N0=";
};
nativeBuildInputs = [
makeWrapper
which
wrapGAppsHook3
];
buildInputs = [
boost
]
++ (with perlPackages; [
perl
EncodeLocale
MathClipper
ExtUtilsXSpp
MathConvexHullMonotoneChain
MathGeometryVoronoi
MathPlanePath
Moo
IOStringy
ClassXSAccessor
Wx
GrowlGNTP
NetDBus
ImportInto
XMLSAX
ExtUtilsMakeMaker
OpenGL
WxGLCanvas
ModuleBuild
LWP
ExtUtilsCppGuess
ModuleBuildWithXSpp
ExtUtilsTypemapsDefault
DevelChecklib
locallib
]);
desktopItem = makeDesktopItem {
name = "slic3r";
exec = "slic3r";
icon = "slic3r";
comment = "G-code generator for 3D printers";
desktopName = "Slic3r";
genericName = "3D printer tool";
categories = [ "Development" ];
};
prePatch = ''
# In nix ioctls.h isn't available from the standard kernel-headers package
# on other distributions. As the copy in glibc seems to be identical to the
# one in the kernel, we use that one instead.
sed -i 's|"/usr/include/asm-generic/ioctls.h"|<asm-generic/ioctls.h>|g' xs/src/libslic3r/GCodeSender.cpp
'';
patches = [
(fetchpatch {
url = "https://web.archive.org/web/20230606220657if_/https://sources.debian.org/data/main/s/slic3r/1.3.0%2Bdfsg1-5/debian/patches/Drop-error-admesh-works-correctly-on-little-endian-machin.patch";
hash = "sha256-+F94jzMFBdI++SKgyEZTBaHFVbjxWwgJa8YVbpK0euI=";
})
(fetchpatch {
url = "https://web.archive.org/web/20230606220036if_/https://sources.debian.org/data/main/s/slic3r/1.3.0+dfsg1-5/debian/patches/0006-Fix-FTBFS-with-Boost-1.71.patch";
hash = "sha256-4jvNccttig5YI1hXSANAWxVz6C4+kowlacMXVCpFgOo=";
})
(fetchpatch {
url = "https://web.archive.org/web/20230606220054if_/https://sources.debian.org/data/main/s/slic3r/1.3.0+dfsg1-5/debian/patches/fix_boost_174.patch";
hash = "sha256-aSmxc2htmrla9l/DIRWeKdBW0LTV96wMUZSLLNjgbzY=";
})
];
buildPhase = ''
export SLIC3R_NO_AUTO=true
export LD=$CXX
export PERL5LIB="./xs/blib/arch/:./xs/blib/lib:$PERL5LIB"
substituteInPlace Build.PL \
--replace "0.9918" "0.9923" \
--replace "eval" ""
pushd xs
perl Build.PL
perl Build
popd
perl Build.PL --gui
'';
installPhase = ''
mkdir -p "$out/share/slic3r/"
cp -r * "$out/share/slic3r/"
wrapProgram "$out/share/slic3r/slic3r.pl" \
--prefix PERL5LIB : "$out/share/slic3r/xs/blib/arch:$out/share/slic3r/xs/blib/lib:$PERL5LIB"
mkdir -p "$out/bin"
ln -s "$out/share/slic3r/slic3r.pl" "$out/bin/slic3r"
mkdir -p "$out/share/pixmaps/"
ln -s "$out/share/slic3r/var/Slic3r.png" "$out/share/pixmaps/slic3r.png"
mkdir -p "$out/share/applications"
cp "$desktopItem"/share/applications/* "$out/share/applications/"
'';
meta = with lib; {
description = "G-code generator for 3D printers";
mainProgram = "slic3r";
longDescription = ''
Slic3r is the tool you need to convert a digital 3D model into printing
instructions for your 3D printer. It cuts the model into horizontal
slices (layers), generates toolpaths to fill them and calculates the
amount of material to be extruded.'';
homepage = "https://slic3r.org/";
license = licenses.agpl3Plus;
platforms = platforms.linux;
maintainers = with maintainers; [ bjornfor ];
};
}
+3 -3
View File
@@ -8,7 +8,7 @@
}:
let
version = "1.1298.2";
version = "1.1298.3";
in
buildNpmPackage {
pname = "snyk";
@@ -18,10 +18,10 @@ buildNpmPackage {
owner = "snyk";
repo = "cli";
tag = "v${version}";
hash = "sha256-8VnbXxvz5mWWMq6sjffshMbHBf2H6s/xmPbQZsZC/4A=";
hash = "sha256-hn9SheBMFmtcIIo9oKMQ8dFTuFGeUby9sLZBIkaTzBM=";
};
npmDepsHash = "sha256-7fHehEKjNNRdRk9+kARzn75G0r1pse7ULn/Oz6mQRKM=";
npmDepsHash = "sha256-jJ72jIg04iRBxppji9iRGBBmkzP6fjAUj0W2m+hwRSI=";
postPatch = ''
substituteInPlace package.json \
+2 -2
View File
@@ -16,10 +16,10 @@ stdenv.mkDerivation rec {
};
postPatch = ''
substituteInPlace src/starfetch.cpp --replace /usr/local/ $out/
substituteInPlace src/starfetch.cpp --replace-fail /usr/local/ $out/
''
+ lib.optionalString stdenv.cc.isClang ''
substituteInPlace makefile --replace g++ clang++
substituteInPlace makefile --replace-warn g++ clang++
'';
installPhase = ''
+3 -3
View File
@@ -7,16 +7,16 @@
buildGoModule rec {
pname = "sttr";
version = "0.2.26";
version = "0.2.27";
src = fetchFromGitHub {
owner = "abhimanyu003";
repo = "sttr";
rev = "v${version}";
hash = "sha256-VyO4NyiTWWQJjbhKHoIC86B4KdSowlrR6XR3HCKr0U4=";
hash = "sha256-tJljVXyTIYFsjPTzmlzJ/jC9rm8DC2SA1eU6GTyXnG8=";
};
vendorHash = "sha256-g35BCThoym9awjMObMUecRkkLsQyEIviYc4rdQsIICY=";
vendorHash = "sha256-QVLOcFRZ7Ovft7Tzn47+mstSikpqRVZAqyMEVgemwA8=";
nativeBuildInputs = [ installShellFiles ];
+3
View File
@@ -38,6 +38,9 @@ rustPlatform.buildRustPackage (finalAttrs: {
ln -vs $(basename "$man_fn") "$man_fn_fixed"
installManPage "$man_fn_fixed"
done
ln -s $out/share/man/man8/{sudo,sudoedit}.8.gz
ln -s $out/bin/{sudo,sudoedit}
'';
checkFlags = map (t: "--skip=${t}") [
+16 -9
View File
@@ -12,32 +12,31 @@
openssl,
gamemode,
shaderc,
ensureNewerSourcesForZipFilesHook,
makeWrapper,
# Runtime depends
glfw,
SDL2,
sdl3,
SDL2_mixer,
cglm,
freetype,
libpng,
libwebp,
libzip,
zlib,
zstd,
spirv-cross,
mimalloc,
gamemodeSupport ? stdenv.hostPlatform.isLinux,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "taisei";
version = "1.4.2";
version = "1.4.4";
src = fetchFromGitHub {
owner = "taisei-project";
repo = "taisei";
tag = "v${finalAttrs.version}";
hash = "sha256-rThLz8o6IYhIBUc0b1sAQi2aF28btajcM1ScTv+qn6c=";
hash = "sha256-Cs66kyNSVjUZUH+ddZGjFwSUQtwqX4uuGQh+ZLv6N6o=";
fetchSubmodules = true;
};
@@ -48,24 +47,24 @@ stdenv.mkDerivation (finalAttrs: {
pkg-config
python3Packages.python
python3Packages.zstandard
ensureNewerSourcesForZipFilesHook
shaderc
makeWrapper
];
buildInputs = [
glfw
SDL2
sdl3
SDL2_mixer
cglm
freetype
libpng
libwebp
libzip
zlib
zstd
opusfile
openssl
spirv-cross
mimalloc
]
++ lib.optional gamemodeSupport gamemode;
@@ -74,13 +73,21 @@ stdenv.mkDerivation (finalAttrs: {
(lib.mesonEnable "install_macos_bundle" false)
(lib.mesonEnable "install_relocatable" false)
(lib.mesonEnable "shader_transpiler" false)
(lib.mesonEnable "shader_transpiler_dxbc" false)
(lib.mesonEnable "gamemode" gamemodeSupport)
(lib.mesonEnable "package_data" false)
(lib.mesonEnable "vfs_zip" false)
];
preConfigure = ''
patchShebangs .
'';
postInstall = lib.optionalString gamemodeSupport ''
wrapProgram $out/bin/taisei \
--set LD_LIBRARY_PATH ${lib.makeLibraryPath [ gamemode ]}
'';
strictDeps = true;
meta = {
+3 -3
View File
@@ -15,16 +15,16 @@ rustPlatform.buildRustPackage (finalAttrs: {
pname = "tinymist";
# Please update the corresponding vscode extension when updating
# this derivation.
version = "0.13.22";
version = "0.13.24";
src = fetchFromGitHub {
owner = "Myriad-Dreamin";
repo = "tinymist";
tag = "v${finalAttrs.version}";
hash = "sha256-OLFffYjgo+go6fEQNM2TVdZL9cHVuA8Tgv73a3ex3JM=";
hash = "sha256-/QDqeHTa2TT9TOEGype0yG8pUq0VR4ENvwAbAnfqk5A=";
};
cargoHash = "sha256-IyGYBbb8ilK+8fsFAm1N2A0Cw0qrbTqG20TgQs+1yaA=";
cargoHash = "sha256-1kcpITV2Mj1z46Y8aa0J2WQ6zHJ3WXurgF2Ujh1GnPM=";
nativeBuildInputs = [
installShellFiles
+4 -3
View File
@@ -13,15 +13,15 @@
buildGoModule rec {
pname = "transito";
version = "0.9.1";
version = "0.10.0";
src = fetchFromSourcehut {
owner = "~mil";
repo = "transito";
rev = "v${version}";
hash = "sha256-5aG/hmpUAN2qYxpqMKLl2WnYgR/sPdtAwLGkFXVyrNs=";
hash = "sha256-87U9RdlP260ApkGJB3dLitxAdY3I9nWrukxzRnwuJ2E=";
};
vendorHash = "sha256-7QMO+/f+yc5GfxvDLIXuf+QT2cAmbgI6iQqWmQIkMMA=";
vendorHash = "sha256-mgvfrNKvdjLa7O0oTSec8u3eHHU66ZDqpKzNeeyy2J0=";
nativeBuildInputs = [ pkg-config ];
buildInputs = [
@@ -66,6 +66,7 @@ buildGoModule rec {
GTFS data, to name a few: Lisbon, NYC, Brussels, Krakow, and Bourges.
'';
homepage = "https://git.sr.ht/~mil/transito";
changelog = "https://git.sr.ht/~mil/transito/refs/v${version}";
license = licenses.gpl3Plus;
maintainers = [ maintainers.McSinyx ];
mainProgram = "transito";
+7 -2
View File
@@ -11,11 +11,11 @@
stdenv.mkDerivation rec {
pname = "unityhub";
version = "3.13.1";
version = "3.14.0";
src = fetchurl {
url = "https://hub-dist.unity3d.com/artifactory/hub-debian-prod-local/pool/main/u/unity/unityhub_amd64/unityhub-amd64-${version}.deb";
hash = "sha256-gBQrz6CNlUyhxeLmY6tNtxpaQJSEW00r7MGyIDtYdiY=";
hash = "sha256-pOtdvu7sVe+n2FzItM6SA2sFhOwE48Tk5L+cbK7TTq8=";
};
nativeBuildInputs = [
@@ -139,6 +139,11 @@ stdenv.mkDerivation rec {
substituteInPlace $out/share/applications/unityhub.desktop \
--replace-fail /opt/unityhub/unityhub $out/opt/unityhub/unityhub
# This file is used by auto updater to determine whether this install is
# a .deb, .rpm, etc. Remove this to disable the auto updater, which auto
# downloads the update, in addition to being useless.
rm $out/opt/unityhub/resources/package-type
runHook postInstall
'';
@@ -9,12 +9,12 @@
let
generator = pkgsBuildBuild.buildGoModule rec {
pname = "v2ray-domain-list-community";
version = "20250814002625";
version = "20250826193754";
src = fetchFromGitHub {
owner = "v2fly";
repo = "domain-list-community";
rev = version;
hash = "sha256-HNnwVnZFcvwAzrfEuZCG1SQlnIlUeb7o2Yis8X8MaF0=";
hash = "sha256-t1+Jd/d6U3WjsFwxWxKWbDd4v4y+EWODcRSoDHv7hwY=";
};
vendorHash = "sha256-NLh14rXRci4hgDkBJVJDIDvobndB7KYRKAX7UjyqSsg=";
meta = with lib; {
+6 -6
View File
@@ -1,7 +1,7 @@
{
lib,
stdenv,
fetchFromGitHub,
fetchFromGitLab,
alacritty,
cage,
cairo,
@@ -22,13 +22,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "wio";
version = "0.17.3-unstable-2024-04-30";
version = "0.19.0";
src = fetchFromGitHub {
owner = "Rubo3";
src = fetchFromGitLab {
owner = "Rubo";
repo = "wio";
rev = "9d459df379efdcf20ea10906c48c79c506c32066";
hash = "sha256-Bn7mCVQPH/kH2WRsGPPGIGgvk0r894zZHCHl6BVmWVg=";
rev = finalAttrs.version;
hash = "sha256-Ol9/dMYg1L+3jGFMpKsAPUAA7hkxu/v88JrI3v+ozAM=";
};
nativeBuildInputs = [
+2 -2
View File
@@ -6,14 +6,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "wlr-layout-ui";
version = "1.6.15";
version = "1.6.16";
pyproject = true;
src = fetchFromGitHub {
owner = "fdev31";
repo = "wlr-layout-ui";
tag = version;
hash = "sha256-9dGwqh4uq7Hc8OjD8mxAnwesoOSCXHjYIWBPylznxu4=";
hash = "sha256-CghOj5fQnuHd6PMeLOX4NKdVw7+pueZXahzYcAMwNOA=";
};
nativeBuildInputs = [
-1
View File
@@ -102,7 +102,6 @@ stdenv.mkDerivation rec {
libmysqlclient
llvmPackages.openmp
dbus
libsForQt5.fcitx5-qt
];
dontWrapQtApps = true;
@@ -17,13 +17,13 @@
stdenv.mkDerivation rec {
pname = "elementary-screenshot";
version = "8.0.2";
version = "8.0.3";
src = fetchFromGitHub {
owner = "elementary";
repo = "screenshot";
rev = version;
hash = "sha256-yCLaiwR1zRoQZI8QVt0oMMGyS7xjaO7gbj7XfphBL2o=";
hash = "sha256-nEJCyQs77zcUb9mc2dUBbZP3zWdPFHTOORROe3u6sSA=";
};
nativeBuildInputs = [
@@ -19,7 +19,7 @@
buildPythonPackage rec {
pname = "aiohomeconnect";
version = "0.18.1";
version = "0.19.0";
pyproject = true;
disabled = pythonOlder "3.11";
@@ -28,7 +28,7 @@ buildPythonPackage rec {
owner = "MartinHjelmare";
repo = "aiohomeconnect";
tag = "v${version}";
hash = "sha256-Gi6uSImA3R1/7CYbyzg/0j6z/wVFpuEzJNeTCoglhpY=";
hash = "sha256-1JIUwC2HtYXwbqmzdjmKzeEZcpSrRem2wdCoQKaRdmc=";
};
build-system = [ setuptools ];
@@ -1,30 +1,35 @@
{
lib,
buildPythonPackage,
fetchPypi,
isPy3k,
pythonAtLeast,
fetchFromGitHub,
setuptools,
}:
buildPythonPackage rec {
pname = "astropy-helpers";
version = "4.0.1";
format = "setuptools";
pyproject = true;
# ModuleNotFoundError: No module named 'imp'
disabled = !isPy3k || pythonAtLeast "3.12";
doCheck = false; # tests requires sphinx-astropy
src = fetchPypi {
inherit pname version;
sha256 = "f1096414d108778218d6bea06d4d9c7b2ff7c83856a451331ac194e74de9f413";
src = fetchFromGitHub {
owner = "astropy";
repo = "astropy-helpers";
tag = "v${version}";
hash = "sha256-MjL/I+ApyoyoD2NmKuKWpDbyuEgvBb2OBhxqj/w/3lk=";
};
meta = with lib; {
patches = [
# Fixes build with Python 3.12+
./python-imp.patch
];
build-system = [ setuptools ];
pythonImportsCheck = [ "astropy_helpers" ];
meta = {
description = "Utilities for building and installing Astropy, Astropy affiliated packages, and their respective documentation";
homepage = "https://github.com/astropy/astropy-helpers";
license = licenses.bsd3;
maintainers = [ maintainers.smaret ];
license = lib.licenses.bsd3;
maintainers = [ lib.maintainers.smaret ];
};
}
@@ -0,0 +1,63 @@
diff --git a/astropy_helpers/tests/test_git_helpers.py b/astropy_helpers/tests/test_git_helpers.py
index 6b826fc..3fb3a29 100644
--- a/astropy_helpers/tests/test_git_helpers.py
+++ b/astropy_helpers/tests/test_git_helpers.py
@@ -1,5 +1,5 @@
import glob
-import imp
+import importlib as imp
import os
import pkgutil
import re
diff --git a/astropy_helpers/utils.py b/astropy_helpers/utils.py
index 115c915..0cfc9e3 100644
--- a/astropy_helpers/utils.py
+++ b/astropy_helpers/utils.py
@@ -1,12 +1,12 @@
# Licensed under a 3-clause BSD style license - see LICENSE.rst
import contextlib
-import imp
import os
import sys
import glob
from importlib import machinery as import_machinery
+from importlib import util as importlib_util
# Note: The following Warning subclasses are simply copies of the Warnings in
@@ -54,9 +54,9 @@ def get_numpy_include_path():
import builtins
if hasattr(builtins, '__NUMPY_SETUP__'):
del builtins.__NUMPY_SETUP__
- import imp
+ import importlib
import numpy
- imp.reload(numpy)
+ importlib.reload(numpy)
try:
numpy_include = numpy.get_include()
@@ -208,8 +208,6 @@ def import_file(filename, name=None):
# generates an underscore-separated name which is more likely to
# be unique, and it doesn't really matter because the name isn't
# used directly here anyway.
- mode = 'r'
-
if name is None:
basename = os.path.splitext(filename)[0]
name = '_'.join(os.path.relpath(basename).split(os.sep)[1:])
@@ -221,8 +219,10 @@ def import_file(filename, name=None):
loader = import_machinery.SourceFileLoader(name, filename)
mod = loader.load_module()
else:
- with open(filename, mode) as fd:
- mod = imp.load_module(name, fd, filename, ('.py', mode, 1))
+ importlib_util
+ spec = importlib_util.spec_from_file_location(name, filename)
+ mod = importlib_util.module_from_spec(spec)
+ spec.loader.exec_module(mod)
return mod
@@ -1,8 +1,10 @@
{
pkgs,
lib,
buildPythonPackage,
fetchPypi,
fetchFromGitHub,
fetchpatch2,
astropy,
boto3,
requests,
keyring,
beautifulsoup4,
@@ -17,22 +19,35 @@
pyvo,
astropy-helpers,
setuptools,
isPy3k,
}:
buildPythonPackage rec {
pname = "astroquery";
version = "0.4.10";
format = "pyproject";
pyproject = true;
src = fetchPypi {
inherit pname version;
hash = "sha256-6s2R6do3jmQXQPvDEjhQ2qg7oJJqb/9MQMy/XcbVpAY=";
src = fetchFromGitHub {
owner = "astropy";
repo = "astroquery";
tag = "v${version}";
hash = "sha256-5pNKV+XNfUQca7WoWboVphXffzyVIHCmfxwr4nBMaEk=";
};
disabled = !isPy3k;
patches = [
# https://github.com/astropy/astroquery/pull/3311
(fetchpatch2 {
name = "setuptools-package-index.patch";
url = "https://github.com/astropy/astroquery/commit/9d43beb4b7bea424d73fff0b602ca90026155519.patch";
hash = "sha256-3QdOwP1rlWeScGxHT9ZVPmffE7S1XE0cbtnQ8T4bIYw=";
})
];
propagatedBuildInputs = [
build-system = [
astropy-helpers
setuptools
];
dependencies = [
astropy
requests
keyring
@@ -41,11 +56,6 @@ buildPythonPackage rec {
pyvo
];
nativeBuildInputs = [
astropy-helpers
setuptools
];
# Disable automatic update of the astropy-helper module
postPatch = ''
substituteInPlace setup.cfg --replace "auto_use = True" "auto_use = False"
@@ -54,6 +64,7 @@ buildPythonPackage rec {
nativeCheckInputs = [ pytestCheckHook ];
checkInputs = [
boto3
matplotlib
pillow
pytest
@@ -76,10 +87,10 @@ buildPythonPackage rec {
pythonImportsCheck = [ "astroquery" ];
meta = with pkgs.lib; {
meta = {
description = "Functions and classes to access online data resources";
homepage = "https://astroquery.readthedocs.io/";
license = licenses.bsd3;
maintainers = [ maintainers.smaret ];
license = lib.licenses.bsd3;
maintainers = [ lib.maintainers.smaret ];
};
}

Some files were not shown because too many files have changed in this diff Show More