Merge master into staging-next
This commit is contained in:
nixpkgs-ci[bot]
@@ -95,8 +95,8 @@ rec {
|
||||
thunderbird = thunderbird-latest;
|
||||
|
||||
thunderbird-latest = common {
|
||||
version = "140.0";
|
||||
sha512 = "2e9a5fb44b21eba3e3295205142bfad666a65f9eea43118388968320597a940cf3c5675fbcf458fbbaa9e1bb85fe8a663feda6461b7e23f7103c5bb7a1103bd4";
|
||||
version = "140.0.1";
|
||||
sha512 = "fbef1d0228c49fc9c11425b6be03bb7e44e6abc6f2027ee23317270ca2c6b0a935bb41b38667acf014bd9e1166cbe62754f1e919e04f2355dc4c833e015c78b8";
|
||||
|
||||
updateScript = callPackage ./update.nix {
|
||||
attrPath = "thunderbirdPackages.thunderbird-latest";
|
||||
|
||||
@@ -2,39 +2,45 @@
|
||||
lib,
|
||||
stdenv,
|
||||
pkg-config,
|
||||
gtk2,
|
||||
keybinder,
|
||||
fetchFromGitLab,
|
||||
gtk3,
|
||||
glib,
|
||||
keybinder3,
|
||||
fetchFromGitea,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "fehlstart";
|
||||
version = "unstable-2016-05-23";
|
||||
version = "0.5-unstable-2025-01-12";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "fehlstart";
|
||||
src = fetchFromGitea {
|
||||
domain = "codeberg.org";
|
||||
owner = "chuvok";
|
||||
repo = "fehlstart";
|
||||
rev = "9f4342d75ec5e2a46c13c99c34894bc275798441";
|
||||
sha256 = "1rfzh7w6n2s9waprv7m1bhvqrk36a77ada7w655pqiwkhdj5q95i";
|
||||
rev = "cf08d6c3964da9abc8d1af0725894fef62352064";
|
||||
hash = "sha256-qq0IhLzSvYnooPb4w+lno8P/tbedrDKTk27HGtQlp2I=";
|
||||
};
|
||||
|
||||
patches = [ ./use-nix-profiles.patch ];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
buildInputs = [
|
||||
gtk2
|
||||
keybinder
|
||||
gtk3
|
||||
keybinder3
|
||||
];
|
||||
|
||||
preConfigure = ''
|
||||
export PREFIX=$out
|
||||
'';
|
||||
env.NIX_CFLAGS_COMPILE = "-I${lib.getDev glib}/include/gio-unix-2.0";
|
||||
|
||||
meta = with lib; {
|
||||
makeFlags = [ "PREFIX=$(out)" ];
|
||||
|
||||
meta = {
|
||||
description = "Small desktop application launcher with reasonable memory footprint";
|
||||
homepage = "https://gitlab.com/fehlstart/fehlstart";
|
||||
license = licenses.gpl3;
|
||||
maintainers = [ maintainers.mounium ];
|
||||
platforms = platforms.all;
|
||||
homepage = "https://codeberg.org/Chuvok/fehlstart";
|
||||
license = lib.licenses.gpl3Only;
|
||||
maintainers = [ lib.maintainers.mounium ];
|
||||
platforms = lib.platforms.linux;
|
||||
mainProgram = "fehlstart";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,21 +1,21 @@
|
||||
--- fehlstart-9f4342d75ec5e2a46c13c99c34894bc275798441-src/fehlstart.c 1970-01-01 01:00:01.000000000 +0100
|
||||
+++ fehlstart.c 2016-08-10 12:21:11.231638418 +0200
|
||||
@@ -779,8 +779,15 @@
|
||||
read_settings(setting_file, &settings);
|
||||
update_commands();
|
||||
g_hash_table_foreach(action_map, update_launcher, NULL);
|
||||
- add_launchers(STR_S(APPLICATIONS_DIR_0));
|
||||
- add_launchers(STR_S(APPLICATIONS_DIR_1));
|
||||
- add_launchers(STR_S(USER_APPLICATIONS_DIR));
|
||||
diff --git a/fehlstart.c b/fehlstart.c
|
||||
index b33c8ff..ce467b5 100644
|
||||
--- a/fehlstart.c
|
||||
+++ b/fehlstart.c
|
||||
@@ -802,6 +802,16 @@ static void* update_all(void* user_data)
|
||||
add_launchers(APPLICATIONS_DIR_0);
|
||||
add_launchers(APPLICATIONS_DIR_1);
|
||||
add_launchers(USER_APPLICATIONS_DIR);
|
||||
+ const char* nixprofiles = getenv("NIX_PROFILES");
|
||||
+ if(nixprofiles != NULL) {
|
||||
+ const char* pch = strtok(nixprofiles, " ");
|
||||
+ while (pch != NULL)
|
||||
+ {
|
||||
+ String nix_dir = str_concat((String) { pch, strlen(pch), false },STR_S("/share/applications"));
|
||||
+ char* nix_dir = g_strconcat(pch, "/share/applications", NULL);
|
||||
+ add_launchers(nix_dir);
|
||||
+ pch = strtok(NULL, " ");
|
||||
+ }
|
||||
+ }
|
||||
return NULL;
|
||||
}
|
||||
|
||||
|
||||
@@ -2,11 +2,11 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
python3,
|
||||
python312,
|
||||
writableTmpDirAsHomeHook,
|
||||
}:
|
||||
let
|
||||
python = python3.override {
|
||||
python = python312.override {
|
||||
self = python;
|
||||
packageOverrides = self: super: {
|
||||
impacket = super.impacket.overridePythonAttrs {
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
fetchFromGitHub,
|
||||
makeWrapper,
|
||||
copyDesktopItems,
|
||||
electron_36,
|
||||
electron_37,
|
||||
nodejs,
|
||||
pnpm_10,
|
||||
makeDesktopItem,
|
||||
@@ -18,11 +18,11 @@
|
||||
}:
|
||||
|
||||
let
|
||||
electron = electron_36;
|
||||
electron = electron_37;
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "podman-desktop";
|
||||
version = "1.19.2";
|
||||
version = "1.20.1";
|
||||
|
||||
passthru.updateScript = _experimental-update-script-combinators.sequence [
|
||||
(nix-update-script { })
|
||||
@@ -55,12 +55,12 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
owner = "containers";
|
||||
repo = "podman-desktop";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-Yw4HPHtMMxaI7MLamZy+MglvHHpO6h4/kHY2TBXWErg=";
|
||||
hash = "sha256-diqlooa4SsFtmzl3A25PEaV0ALnghoj7htBGRgXn6As=";
|
||||
};
|
||||
|
||||
pnpmDeps = pnpm_10.fetchDeps {
|
||||
inherit (finalAttrs) pname version src;
|
||||
hash = "sha256-6xXTzqEeWpDKhZN6z4dSHrU7qWK9AAlD2DXnr7ac0So=";
|
||||
hash = "sha256-8lNmCLfuAkXK1Du4iYYasRTozZf0HoAttf8Dfc6Jglw=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@@ -70,10 +70,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
|
||||
|
||||
# Don't attempt to sign the darwin app bundle.
|
||||
# It's impure and may fail in some restricted environments.
|
||||
CSC_IDENTITY_AUTO_DISCOVERY = lib.optionals stdenv.hostPlatform.isDarwin "false";
|
||||
|
||||
nativeBuildInputs =
|
||||
[
|
||||
nodejs
|
||||
@@ -94,9 +90,13 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
chmod -R u+w electron-dist
|
||||
|
||||
pnpm build
|
||||
|
||||
# Explicitly set identity to null to avoid signing on arm64 macs with newer electron-builder.
|
||||
# See: https://github.com/electron-userland/electron-builder/pull/9007
|
||||
./node_modules/.bin/electron-builder \
|
||||
--dir \
|
||||
--config .electron-builder.config.cjs \
|
||||
-c.mac.identity=null \
|
||||
-c.electronDist=electron-dist \
|
||||
-c.electronVersion=${electron.version}
|
||||
|
||||
|
||||
@@ -5,10 +5,10 @@
|
||||
}:
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "rime-moegirl";
|
||||
version = "20250610";
|
||||
version = "20250711";
|
||||
src = fetchurl {
|
||||
url = "https://github.com/outloudvi/mw2fcitx/releases/download/${finalAttrs.version}/moegirl.dict.yaml";
|
||||
hash = "sha256-ctAxF/H4gnmAvHyLsC4oUNCdGFbi5X7+Db/Lwmknlsw=";
|
||||
hash = "sha256-gs/JhdSeLFkBKvBdVRxk3RhqlkOhly18w4Pz63GG814=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
@@ -9,18 +9,18 @@
|
||||
|
||||
buildNpmPackage (finalAttrs: {
|
||||
pname = "vscode-css-languageserver";
|
||||
version = "1.101.2";
|
||||
version = "1.102.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "microsoft";
|
||||
repo = "vscode";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-wdI6VlJ4WoSNnwgkb6dkVYcq/P/yzflv5mE9PuYBVx4=";
|
||||
hash = "sha256-IfqtwH86R9yp9YEpRHvTz/SUwKzG/nwdEVneRYyAYJ8=";
|
||||
};
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/extensions/css-language-features/server";
|
||||
|
||||
npmDepsHash = "sha256-wGW2n+16NYHuFpYMq8nuvGgir8QwGc9Ud2yauR4ltIQ=";
|
||||
npmDepsHash = "sha256-DUcH+C5LB794Op3FYnuL3uNrUCNAxWouqrtV6bpgqRI=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
makeBinaryWrapper
|
||||
|
||||
@@ -12,21 +12,18 @@
|
||||
microsoft-kiota-serialization-multipart,
|
||||
microsoft-kiota-serialization-text,
|
||||
msgraph-core,
|
||||
pythonOlder,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "msgraph-sdk";
|
||||
version = "1.35.0";
|
||||
version = "1.37.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "microsoftgraph";
|
||||
repo = "msgraph-sdk-python";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-fgblM9KdKbP8mXsOF5FX4pXiJrE6FRxjlh2Kz6Q/rB0=";
|
||||
hash = "sha256-1oz+2UQhBjRj2F243GNxmUfknVJFL/V2+jpqKZTDmDw=";
|
||||
};
|
||||
|
||||
build-system = [ flit-core ];
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pydrawise";
|
||||
version = "2025.6.0";
|
||||
version = "2025.7.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.10";
|
||||
@@ -27,7 +27,7 @@ buildPythonPackage rec {
|
||||
owner = "dknowles2";
|
||||
repo = "pydrawise";
|
||||
tag = version;
|
||||
hash = "sha256-9WwVhA5dJTApjbSVLDGzfyzFXWFx/YJaUSRmaLkh2L0=";
|
||||
hash = "sha256-bHdGHg+TxGf+evJdGUou7UXMVcGSgDXHx1GCAzTl7U0=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "resend";
|
||||
version = "2.10.0";
|
||||
version = "2.11.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@@ -20,7 +20,7 @@ buildPythonPackage rec {
|
||||
owner = "resend";
|
||||
repo = "resend-python";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-K/Wk1TZWurhSm3fIAijO+L1ao4pURnlthwxdkI6yZWM=";
|
||||
hash = "sha256-ubStw6SphRabXIaRDMXMbki4pkg9Wjt/J0CinQvytz4=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -34,12 +34,12 @@
|
||||
},
|
||||
"36": {
|
||||
"hashes": {
|
||||
"aarch64-darwin": "e79f3fd064cec1b8cd867cd567fbe69f3346520740e22748bfe9b5fb2f01f521",
|
||||
"aarch64-linux": "0e84759948f590538e7e0a00eafd128d68c9d3572b0cce0a8758a78a79de6e86",
|
||||
"armv7l-linux": "94c5a1f3aec2cf72f5df820e8aa7d3e6fb5945bd6b75451ffef1efd08fa074aa",
|
||||
"aarch64-darwin": "e4b79adf57b6e85ab6c818c283a2ed075fdc989da201e279ff94ace89051501d",
|
||||
"aarch64-linux": "7511e5e62393f5ee1a7e97c39b0c6d78e5d083817d5589d6c07a2924dd9c277a",
|
||||
"armv7l-linux": "089ebc98b798398b0413afb04836ad8c9db2adc4c41057ba4089e50e7f485c38",
|
||||
"headers": "09808hmprjpm33h5lx739i1yllwqy89n62ycaxrh6w42sncb2gm9",
|
||||
"x86_64-darwin": "93d60bd40a9b41f126ab04442a1781ccdb7934d012d8606cfdebe059d922e308",
|
||||
"x86_64-linux": "27b4efb0d86a628407716268c2b4057c7b695390bd121f500c0daaea2e6c9af5"
|
||||
"x86_64-darwin": "95ebf1d455cc3b694fe057221d8053a0f1cbbb64b74bf5982d5a43cffc7e074b",
|
||||
"x86_64-linux": "315da2bc92bf40bcab5b1da28778048fb5f4eeca75bcc78e0f25cda1773e094e"
|
||||
},
|
||||
"version": "36.7.1"
|
||||
},
|
||||
|
||||
@@ -34,12 +34,12 @@
|
||||
},
|
||||
"36": {
|
||||
"hashes": {
|
||||
"aarch64-darwin": "58620f79f034970abe41b7c3ae2e317dc8935d937ca07a37017ff528fb7affd3",
|
||||
"aarch64-linux": "cd87231b0db40c8193e65bedf69451604c246867e56c7d52deb15dbdf4e7d527",
|
||||
"armv7l-linux": "cab434d3c281756ebd6f4fda4477a744a8081ac5eb8c938824d7391f8d5e2e32",
|
||||
"aarch64-darwin": "cdcf2c88d2d951761517669886521043d4e63fb5538fab01a5469594f8af4fa9",
|
||||
"aarch64-linux": "f629a35f5ee5ce902581ae4d4cdfacbd25dc72573805abe8484f28a6b7f74abe",
|
||||
"armv7l-linux": "b9db0483bdff794d08cdd0e30a861b6b9e31a94f99b37893f2a7fbc6069e74ff",
|
||||
"headers": "09808hmprjpm33h5lx739i1yllwqy89n62ycaxrh6w42sncb2gm9",
|
||||
"x86_64-darwin": "bd851936d81cc4ddb2591ff2544ce6952ce49052ed6c929eb6c2a712e63ce4ea",
|
||||
"x86_64-linux": "c4219caa0f8806e9ffabc7dccfb29ae2f9bca02a11fedd1090ad4c800c9783b1"
|
||||
"x86_64-darwin": "3d212fd07716510f894b3e5833d5bb7a53298a8add1fe96d5264d16c2235eda1",
|
||||
"x86_64-linux": "1a6f7a0df64475a467b20548ab41c8576781b5e34a6bf74751c7384623acd2fb"
|
||||
},
|
||||
"version": "36.7.1"
|
||||
},
|
||||
|
||||
@@ -209,6 +209,20 @@ lib.makeExtensible (
|
||||
|
||||
nix_2_29 = addTests "nix_2_29" self.nixComponents_2_29.nix-everything;
|
||||
|
||||
nixComponents_2_30 = nixDependencies.callPackage ./modular/packages.nix rec {
|
||||
version = "2.30.1";
|
||||
inherit (self.nix_2_24.meta) maintainers teams;
|
||||
otherSplices = generateSplicesForNixComponents "nixComponents_2_30";
|
||||
src = fetchFromGitHub {
|
||||
owner = "NixOS";
|
||||
repo = "nix";
|
||||
tag = version;
|
||||
hash = "sha256-4+xPVJBeYLlIn+fOS5F0iq/DclpCXnmh4Y7VzAIr/a8=";
|
||||
};
|
||||
};
|
||||
|
||||
nix_2_30 = addTests "nix_2_30" self.nixComponents_2_30.nix-everything;
|
||||
|
||||
nixComponents_git = nixDependencies.callPackage ./modular/packages.nix rec {
|
||||
version = "2.31pre20250712_${lib.substring 0 8 src.rev}";
|
||||
inherit (self.nix_2_24.meta) maintainers teams;
|
||||
|
||||
Reference in New Issue
Block a user