Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
2b6097bbb8
@ -16,7 +16,7 @@
|
||||
withIvy ? false,
|
||||
}:
|
||||
|
||||
let
|
||||
melpaBuild {
|
||||
pname = "notdeft";
|
||||
version = "0-unstable-2021-12-04";
|
||||
|
||||
@ -27,47 +27,12 @@ let
|
||||
hash = "sha256-LMMLJFVpmoE/y3MqrgY2fmsehmzk6TkLsVoHmFUxiSw=";
|
||||
};
|
||||
|
||||
# Xapian bindings for NotDeft
|
||||
notdeft-xapian = stdenv.mkDerivation {
|
||||
pname = "notdeft-xapian";
|
||||
inherit version src;
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
buildInputs = [
|
||||
tclap
|
||||
xapian
|
||||
];
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
|
||||
$CXX -std=c++11 -o notdeft-xapian xapian/notdeft-xapian.cc -lxapian
|
||||
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/bin
|
||||
cp notdeft-xapian $out/bin
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
};
|
||||
in
|
||||
melpaBuild {
|
||||
inherit pname version src;
|
||||
|
||||
packageRequires = lib.optional withHydra hydra ++ lib.optional withIvy ivy;
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace notdeft-xapian.el \
|
||||
--replace 'defcustom notdeft-xapian-program nil' \
|
||||
"defcustom notdeft-xapian-program \"${notdeft-xapian}/bin/notdeft-xapian\""
|
||||
--replace-fail 'defcustom notdeft-xapian-program nil' \
|
||||
"defcustom notdeft-xapian-program \"$out/bin/notdeft-xapian\""
|
||||
'';
|
||||
|
||||
files = ''
|
||||
@ -77,8 +42,24 @@ melpaBuild {
|
||||
${lib.optionalString withIvy ''"extras/notdeft-ivy.el"''})
|
||||
'';
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
buildInputs = [
|
||||
tclap
|
||||
xapian
|
||||
];
|
||||
|
||||
preBuild = ''
|
||||
$CXX -std=c++11 -o notdeft-xapian xapian/notdeft-xapian.cc -lxapian
|
||||
'';
|
||||
|
||||
preInstall = ''
|
||||
install -D --target-directory=$out/bin source/notdeft-xapian
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
inherit notdeft-xapian;
|
||||
updateScript = unstableGitUpdater { hardcodeZeroVersion = true; };
|
||||
};
|
||||
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
{
|
||||
stable = {
|
||||
chromedriver = {
|
||||
hash_darwin = "sha256-Evz39J4o3FJdJbYsFxmnLiZ9QiMeZttcbTtZ6wAVXoQ=";
|
||||
hash_darwin = "sha256-z+08R1CYi53edNEDSvJ303+hc/pqiFvVhUkD+g4q6tE=";
|
||||
hash_darwin_aarch64 =
|
||||
"sha256-4Dkdi5C6dcuEewYvy60F5m4ynzb5lGWrJFs1Q+4vapI=";
|
||||
hash_linux = "sha256-Lls/gwyA28G8X41wXEIKlgNdmKWgWnPf6iHZGrU8e54=";
|
||||
version = "127.0.6533.99";
|
||||
"sha256-q60NWIka3QzLsWg3X/+qTWby6UTf7wvjCDdZWlUjzPA=";
|
||||
hash_linux = "sha256-6E6LaQCx+2Xd/vjjaiQR3vJgkP7L4MRkA7Bb0jTrakc=";
|
||||
version = "127.0.6533.119";
|
||||
};
|
||||
deps = {
|
||||
gn = {
|
||||
@ -15,8 +15,8 @@
|
||||
version = "2024-06-06";
|
||||
};
|
||||
};
|
||||
hash = "sha256-VKPlcBfS6iw4E1nz0nYJLg273XmJ+RcGGktRbqQTTwQ=";
|
||||
version = "127.0.6533.99";
|
||||
hash = "sha256-LuUDEpYCJLR/X+zjsF26aum4/Wfu2MNowofPu8iRVxI=";
|
||||
version = "127.0.6533.119";
|
||||
};
|
||||
ungoogled-chromium = {
|
||||
deps = {
|
||||
@ -27,11 +27,11 @@
|
||||
version = "2024-06-06";
|
||||
};
|
||||
ungoogled-patches = {
|
||||
hash = "sha256-4iI+1mVMoI1xg2t+33PiYDsiuXw0v4oUbSbYX+I9Q7s=";
|
||||
rev = "127.0.6533.99-1";
|
||||
hash = "sha256-m1H/7JsSF7Akm5eBlPB/F4mAdFjUPtOQIUoXup09w40=";
|
||||
rev = "127.0.6533.119-1";
|
||||
};
|
||||
};
|
||||
hash = "sha256-VKPlcBfS6iw4E1nz0nYJLg273XmJ+RcGGktRbqQTTwQ=";
|
||||
version = "127.0.6533.99";
|
||||
hash = "sha256-LuUDEpYCJLR/X+zjsF26aum4/Wfu2MNowofPu8iRVxI=";
|
||||
version = "127.0.6533.119";
|
||||
};
|
||||
}
|
||||
|
||||
@ -56,7 +56,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "root";
|
||||
version = "6.32.02";
|
||||
version = "6.32.04";
|
||||
|
||||
passthru = {
|
||||
tests = import ./tests { inherit callPackage; };
|
||||
@ -64,15 +64,15 @@ stdenv.mkDerivation rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://root.cern.ch/download/root_v${version}.source.tar.gz";
|
||||
hash = "sha256-PQ92vwWFfhgHzPssngFPUlvLYl+UojcLRV9LFklhYC0=";
|
||||
hash = "sha256-Ey8Saq59MO+8zX3NmRt62hiQrleYDvMAwWQh+dTQfqg=";
|
||||
};
|
||||
|
||||
clad_src = fetchgit {
|
||||
url = "https://github.com/vgvassilev/clad";
|
||||
# Make sure that this is the same tag as in the ROOT build files!
|
||||
# https://github.com/root-project/root/blob/master/interpreter/cling/tools/plugins/clad/CMakeLists.txt#L76
|
||||
rev = "refs/tags/v1.5";
|
||||
hash = "sha256-s0DbHfLthv51ZICnTd30O4qG/DyZPk5tADeu3bBRoOw=";
|
||||
rev = "refs/tags/v1.6";
|
||||
hash = "sha256-Fv3i84lgoifxtyWKhQjj1c4bR9wSl5SPzUh0ZhZBxFI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper cmake pkg-config git ];
|
||||
@ -165,6 +165,7 @@ stdenv.mkDerivation rec {
|
||||
"-Dfail-on-missing=ON"
|
||||
"-Dfitsio=OFF"
|
||||
"-Dgnuinstall=ON"
|
||||
"-Dmathmore=ON"
|
||||
"-Dmysql=OFF"
|
||||
"-Dpgsql=OFF"
|
||||
"-Dsqlite=OFF"
|
||||
|
||||
@ -6,18 +6,18 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "crosvm";
|
||||
version = "126.0";
|
||||
version = "127.0";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://chromium.googlesource.com/chromiumos/platform/crosvm";
|
||||
rev = "5533201f3ff3230d121e06100557d369c055e6dc";
|
||||
hash = "sha256-Ufi8dIhNgXvD53PWLG2uj7CD37UZIegrqAQz3wTKTvE=";
|
||||
rev = "8fdfed12c960850e9d5e809cfd2a40ce3bdd98d6";
|
||||
hash = "sha256-W0zLYM91xoq9vURgYs2noc9F9RtvoXztIIHMx0HVK5g=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
separateDebugInfo = true;
|
||||
|
||||
cargoHash = "sha256-E2lyBgptQs+/5JS2WJc4ietguXdK16DFEVzqylmX+Pk=";
|
||||
cargoHash = "sha256-nEJBRlwMqTahaIC9WdtoxGLVfc+U9sJ0ilzLhavcbD0=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config protobuf python3 rustPlatform.bindgenHook wayland-scanner
|
||||
|
||||
@ -12,7 +12,11 @@ let
|
||||
inherit fetchpatch;
|
||||
};
|
||||
|
||||
upstreamPatchList = lib.lists.flatten [ upstreamPatches.XSA_458 ];
|
||||
upstreamPatchList = lib.lists.flatten [
|
||||
upstreamPatches.XSA_458
|
||||
upstreamPatches.XSA_460
|
||||
upstreamPatches.XSA_461
|
||||
];
|
||||
in
|
||||
|
||||
callPackage (import ../generic.nix {
|
||||
|
||||
@ -15,6 +15,8 @@ let
|
||||
upstreamPatchList = lib.lists.flatten [
|
||||
upstreamPatches.QUBES_REPRODUCIBLE_BUILDS
|
||||
upstreamPatches.XSA_458
|
||||
upstreamPatches.XSA_460
|
||||
upstreamPatches.XSA_461
|
||||
];
|
||||
in
|
||||
|
||||
|
||||
@ -15,6 +15,8 @@ let
|
||||
upstreamPatchList = lib.lists.flatten [
|
||||
upstreamPatches.QUBES_REPRODUCIBLE_BUILDS
|
||||
upstreamPatches.XSA_458
|
||||
upstreamPatches.XSA_460
|
||||
upstreamPatches.XSA_461
|
||||
];
|
||||
in
|
||||
|
||||
|
||||
@ -12,7 +12,11 @@ let
|
||||
inherit fetchpatch;
|
||||
};
|
||||
|
||||
upstreamPatchList = lib.lists.flatten [ upstreamPatches.QUBES_REPRODUCIBLE_BUILDS ];
|
||||
upstreamPatchList = lib.lists.flatten [
|
||||
upstreamPatches.QUBES_REPRODUCIBLE_BUILDS
|
||||
upstreamPatches.XSA_460
|
||||
upstreamPatches.XSA_461
|
||||
];
|
||||
in
|
||||
|
||||
callPackage (import ../generic.nix {
|
||||
|
||||
@ -99,7 +99,7 @@ in
|
||||
})
|
||||
];
|
||||
|
||||
# Xen Security Advisory #458: (4.16 - 4.19-rc3)
|
||||
# Xen Security Advisory #458: (4.16.6 - 4.19-rc3)
|
||||
"XSA_458" = xsaPatch {
|
||||
id = "458";
|
||||
title = "Double unlock in x86 guest IRQ handling";
|
||||
@ -114,4 +114,39 @@ in
|
||||
cve = [ "CVE-2024-31143" ];
|
||||
hash = "sha256-yHI9Sp/7Ed40iIYQ/HOOIULlfzAzL0c0MGqdF+GR+AQ=";
|
||||
};
|
||||
# Xen Security Advisory #460: (4.16.6 - 4.19.0)
|
||||
"XSA_460" = xsaPatch {
|
||||
id = "460";
|
||||
title = "Error handling in x86 IOMMU identity mapping";
|
||||
description = ''
|
||||
Certain PCI devices in a system might be assigned Reserved Memory
|
||||
Regions (specified via Reserved Memory Region Reporting, "RMRR") for
|
||||
Intel VT-d or Unity Mapping ranges for AMD-Vi. These are typically used
|
||||
for platform tasks such as legacy USB emulation.
|
||||
Since the precise purpose of these regions is unknown, once a device
|
||||
associated with such a region is active, the mappings of these regions
|
||||
need to remain continuouly accessible by the device. In the logic
|
||||
establishing these mappings, error handling was flawed, resulting in
|
||||
such mappings to potentially remain in place when they should have been
|
||||
removed again. Respective guests would then gain access to memory
|
||||
regions which they aren't supposed to have access to.
|
||||
'';
|
||||
cve = [ "CVE-2024-31145" ];
|
||||
hash = "sha256-3q4nAP2xGEptX6BIpSlALOt2r0kjj1up5pF3xCFp+l0=";
|
||||
};
|
||||
# Xen Security Advisory #461: (4.16.6 - 4.19.0)
|
||||
"XSA_461" = xsaPatch {
|
||||
id = "461";
|
||||
title = "PCI device pass-through with shared resources";
|
||||
description = ''
|
||||
When multiple devices share resources and one of them is to be passed
|
||||
through to a guest, security of the entire system and of respective
|
||||
guests individually cannot really be guaranteed without knowing
|
||||
internals of any of the involved guests. Therefore such a configuration
|
||||
cannot really be security-supported, yet making that explicit was so far
|
||||
missing.
|
||||
'';
|
||||
cve = [ "CVE-2024-31146" ];
|
||||
hash = "sha256-JQWoqf47hy9WXNkVC/LgmjUhkxN0SBF6w8PF4aFZxhM=";
|
||||
};
|
||||
}
|
||||
|
||||
@ -22,11 +22,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "e16";
|
||||
version = "1.0.29";
|
||||
version = "1.0.30";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/enlightenment/e16-${version}.tar.xz";
|
||||
hash = "sha256-LvLiw6+hduAl8dNBTtBwqvgKBRwojBUd5tNm1hZl5Hs=";
|
||||
hash = "sha256-JKBmBgC5cN4XO03r0NR78Ly9tpI733/sUEPL0GLU5B0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -767,7 +767,7 @@ rec {
|
||||
# writePython3 "test_python3" { libraries = [ pkgs.python3Packages.pyyaml ]; } ''
|
||||
# import yaml
|
||||
#
|
||||
# y = yaml.load("""
|
||||
# y = yaml.safe_load("""
|
||||
# - test: success
|
||||
# """)
|
||||
# print(y[0]['test'])
|
||||
@ -784,7 +784,7 @@ rec {
|
||||
# writePyPy3 "test_pypy3" { libraries = [ pkgs.pypy3Packages.pyyaml ]; } ''
|
||||
# import yaml
|
||||
#
|
||||
# y = yaml.load("""
|
||||
# y = yaml.safe_load("""
|
||||
# - test: success
|
||||
# """)
|
||||
# print(y[0]['test'])
|
||||
|
||||
@ -21,7 +21,14 @@ rustPlatform.buildRustPackage rec {
|
||||
hash = "sha256-A4/1UdM8N5CHP44PBNB+ZH2Gcl84rcpUBwQRSnubBGc=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-ahoiCAUREtXgXLNrWVQ2Gc65bWMo4pIJXP9xjnQAlaI=";
|
||||
cargoPatches = [
|
||||
# TODO: Remove next release
|
||||
# Updates the `time` crate to work around
|
||||
# https://github.com/NixOS/nixpkgs/issues/332957
|
||||
./rust-1.80.0.patch
|
||||
];
|
||||
|
||||
cargoHash = "sha256-Obq4oRXZ7IHDT+B9gKrVflq/FDzoN7ttZi8Aj2uOGxM=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
rustPlatform.bindgenHook
|
||||
|
||||
48
pkgs/by-name/av/av1an-unwrapped/rust-1.80.0.patch
Normal file
48
pkgs/by-name/av/av1an-unwrapped/rust-1.80.0.patch
Normal file
@ -0,0 +1,48 @@
|
||||
diff --git a/Cargo.lock b/Cargo.lock
|
||||
index e5a1c65..b8cb96f 100644
|
||||
--- a/Cargo.lock
|
||||
+++ b/Cargo.lock
|
||||
@@ -1008,6 +1008,12 @@ dependencies = [
|
||||
"num-traits",
|
||||
]
|
||||
|
||||
+[[package]]
|
||||
+name = "num-conv"
|
||||
+version = "0.1.0"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
|
||||
+
|
||||
[[package]]
|
||||
name = "num-derive"
|
||||
version = "0.3.3"
|
||||
@@ -1684,13 +1690,14 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "time"
|
||||
-version = "0.3.31"
|
||||
+version = "0.3.36"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "f657ba42c3f86e7680e53c8cd3af8abbe56b5491790b46e22e19c0d57463583e"
|
||||
+checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885"
|
||||
dependencies = [
|
||||
"deranged",
|
||||
"itoa",
|
||||
"libc",
|
||||
+ "num-conv",
|
||||
"num_threads",
|
||||
"powerfmt",
|
||||
"serde",
|
||||
@@ -1706,10 +1713,11 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
|
||||
|
||||
[[package]]
|
||||
name = "time-macros"
|
||||
-version = "0.2.16"
|
||||
+version = "0.2.18"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "26197e33420244aeb70c3e8c78376ca46571bc4e701e4791c2cd9f57dcb3a43f"
|
||||
+checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf"
|
||||
dependencies = [
|
||||
+ "num-conv",
|
||||
"time-core",
|
||||
]
|
||||
|
||||
@ -1,13 +1,13 @@
|
||||
{ lib, buildNpmPackage, fetchFromGitHub, runCommand, jq }:
|
||||
|
||||
let
|
||||
version = "1.1.375";
|
||||
version = "1.1.376";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Microsoft";
|
||||
repo = "pyright";
|
||||
rev = "${version}";
|
||||
hash = "sha256-9GiwWCbo6z9/x9qBEsRoTh9WYNJ0XnlMq1BD7vrIHfA=";
|
||||
hash = "sha256-OxLZF2ZqAHdiXRAO+bC9e9gU05di+NufZhmN/wesm3I=";
|
||||
};
|
||||
|
||||
patchedPackageJSON = runCommand "package.json" { } ''
|
||||
@ -37,7 +37,7 @@ let
|
||||
pname = "pyright-internal";
|
||||
inherit version src;
|
||||
sourceRoot = "${src.name}/packages/pyright-internal";
|
||||
npmDepsHash = "sha256-4roH83gyZg6g6HjqassEAcn36bgqd1lwrq/ArST2+18=";
|
||||
npmDepsHash = "sha256-j7+uigtOnYFqHKxcnOJWaQcvGoHJ5FM3BkW6folfkuw=";
|
||||
dontNpmBuild = true;
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
@ -51,7 +51,7 @@ buildNpmPackage rec {
|
||||
inherit version src;
|
||||
|
||||
sourceRoot = "${src.name}/packages/pyright";
|
||||
npmDepsHash = "sha256-BJgdf7rDxs4NvXDJ4Y8z+DEAX77CXrB7FXzGEqH+YwI=";
|
||||
npmDepsHash = "sha256-m66enEsj5G0jq3xTnJySIc9bS9SW6YagO00H37lIEIU=";
|
||||
|
||||
postPatch = ''
|
||||
chmod +w ../../
|
||||
|
||||
5170
pkgs/by-name/ru/rustic/Cargo.lock
generated
Normal file
5170
pkgs/by-name/ru/rustic/Cargo.lock
generated
Normal file
File diff suppressed because it is too large
Load Diff
@ -1,36 +1,51 @@
|
||||
{ lib
|
||||
, fetchFromGitHub
|
||||
, rustPlatform
|
||||
, stdenv
|
||||
, Security
|
||||
, SystemConfiguration
|
||||
, installShellFiles
|
||||
, nix-update-script
|
||||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
rustPlatform,
|
||||
stdenv,
|
||||
Security,
|
||||
SystemConfiguration,
|
||||
installShellFiles,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "rustic";
|
||||
version = "0.7.0";
|
||||
version = "0.7.0-unstable-2024-08-10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rustic-rs";
|
||||
repo = "rustic";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-jUAmboJTzX4oJZy9rFiPRbm94bVpZGa0SaqotoCU/Ss=";
|
||||
# rev = "refs/tags/v${version}";
|
||||
rev = "1c9969c";
|
||||
hash = "sha256-+YVF59xHb82TOn7Gl0BbX2Yx6Owsp0LiOBgEXHN9QVI=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-8YGvxnwD9Vshah2jZ+XxOW0qB4nvWsOyLY1W8k+xQzU=";
|
||||
# With the next release please go back to `cargoHash` and remove the vendored
|
||||
# `Cargo.lock` if possible.
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"rustic_backend-0.1.1" = "sha256-6VC0DKqV9NPzwKs6SOI3dQMKrGZd2azUBMbU9dejHKs=";
|
||||
};
|
||||
};
|
||||
|
||||
# At the time of writing, upstream defaults to "self-update" and "webdav".
|
||||
# At the time of writing, upstream defaults to "self-update", "tui", and "webdav".
|
||||
# "self-update" is a self-updater, which we don't want in nixpkgs.
|
||||
# With each update we should therefore ensure that we mimic the default features
|
||||
# as closely as possible.
|
||||
buildNoDefaultFeatures = true;
|
||||
buildFeatures = [
|
||||
"tui"
|
||||
"webdav"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ Security SystemConfiguration ];
|
||||
buildInputs = lib.optionals stdenv.isDarwin [
|
||||
Security
|
||||
SystemConfiguration
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
for shell in {ba,fi,z}sh; do
|
||||
@ -48,7 +63,10 @@ rustPlatform.buildRustPackage rec {
|
||||
description = "fast, encrypted, deduplicated backups powered by pure Rust";
|
||||
mainProgram = "rustic";
|
||||
platforms = lib.platforms.linux ++ lib.platforms.darwin;
|
||||
license = [ lib.licenses.mit lib.licenses.asl20 ];
|
||||
license = [
|
||||
lib.licenses.mit
|
||||
lib.licenses.asl20
|
||||
];
|
||||
maintainers = [ lib.maintainers.nobbz ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -15,13 +15,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "uxplay";
|
||||
version = "1.68.3";
|
||||
version = "1.69";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "FDH2";
|
||||
repo = "UxPlay";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-Ev+VXI37zLRQ3yqllJVo1JZK/U82HeB65Hi9+c0O8Ks=";
|
||||
hash = "sha256-4QNuM/yMb5wSTSjTbqrTgU+FHFMIyIH8pRBwuGhAJU4=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -15,6 +15,7 @@
|
||||
, dde-qt-dbus-factory
|
||||
, dde-dock
|
||||
, gsettings-qt
|
||||
, polkit-qt
|
||||
, procps
|
||||
, libpcap
|
||||
, libnl
|
||||
@ -27,13 +28,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "deepin-system-monitor";
|
||||
version = "6.0.13";
|
||||
version = "6.0.23";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxdeepin";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-QwZPvEOYypSmbe3deqLRsI3VL/CgVc+Ql3JlsMZ9MqY=";
|
||||
hash = "sha256-LcXc8yI81YslVjof74TvOm6eWiN4UaHgUFU+HSCNZxQ=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@ -73,6 +74,7 @@ stdenv.mkDerivation rec {
|
||||
dde-qt-dbus-factory
|
||||
dde-dock
|
||||
gsettings-qt
|
||||
polkit-qt
|
||||
procps
|
||||
libpcap
|
||||
libnl
|
||||
|
||||
@ -17,23 +17,20 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dde-appearance";
|
||||
version = "1.1.25";
|
||||
version = "1.1.29";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxdeepin";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-H9TvWF6Q0lX4GF4mQ71E3SUqWbhH7dzHIlScovbN7lM=";
|
||||
hash = "sha256-M39EugV0uGCIaXK4isTQpHd6Rh2Vl6sg3Jp8JIEFEE4=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./fix-custom-wallpapers-path.diff
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace src/service/impl/appearancemanager.cpp \
|
||||
src/service/modules/api/compatibleengine.cpp \
|
||||
src/service/modules/subthemes/customtheme.cpp \
|
||||
src/service/modules/{api/compatibleengine.cpp,subthemes/customtheme.cpp,background/backgrounds.cpp} \
|
||||
misc/dconfig/org.deepin.dde.appearance.json \
|
||||
fakewm/dbus/deepinwmfaker.cpp \
|
||||
--replace "/usr/share" "/run/current-system/sw/share"
|
||||
|
||||
for file in $(grep -rl "/usr/bin/dde-appearance"); do
|
||||
|
||||
@ -1,68 +0,0 @@
|
||||
diff --git a/misc/dconfig/org.deepin.dde.appearance.json b/misc/dconfig/org.deepin.dde.appearance.json
|
||||
index b612e6e..371f966 100644
|
||||
--- a/misc/dconfig/org.deepin.dde.appearance.json
|
||||
+++ b/misc/dconfig/org.deepin.dde.appearance.json
|
||||
@@ -143,7 +143,7 @@
|
||||
"visibility": "private"
|
||||
},
|
||||
"Background_Uris": {
|
||||
- "value": ["file:///usr/share/backgrounds/default_background.jpg"],
|
||||
+ "value": ["file:///run/current-system/sw/share/backgrounds/default_background.jpg"],
|
||||
"serial": 0,
|
||||
"flags": [],
|
||||
"name": "Background_Uris",
|
||||
diff --git a/fakewm/dbus/deepinwmfaker.cpp b/fakewm/dbus/deepinwmfaker.cpp
|
||||
index 5d455fa..40ec608 100644
|
||||
--- a/fakewm/dbus/deepinwmfaker.cpp
|
||||
+++ b/fakewm/dbus/deepinwmfaker.cpp
|
||||
@@ -54,13 +54,13 @@ Q_GLOBAL_STATIC_WITH_ARGS(QGSettings, _gsettings_dde_zone, ("com.deepin.dde.zone
|
||||
|
||||
#define KWinDBusCompositorInterface "org.kde.kwin.Compositing"
|
||||
#define KWinDBusCompositorPath "/Compositor"
|
||||
-const char defaultFirstBackgroundUri[] = "file:///usr/share/wallpapers/deepin/desktop.jpg";
|
||||
+const char defaultFirstBackgroundUri[] = "file:///run/current-system/sw/share/wallpapers/deepin/desktop.jpg";
|
||||
const char defaultSecondBackgroundUri[] = "francesco-ungaro-1fzbUyzsHV8-unsplash";
|
||||
|
||||
//default cursor size :24
|
||||
#define DEFAULTCURSORSIZE 24
|
||||
|
||||
-const char fallback_background_name[] = "file:///usr/share/backgrounds/default_background.jpg";
|
||||
+const char fallback_background_name[] = "file:///run/current-system/sw/share/backgrounds/default_background.jpg";
|
||||
|
||||
//using org::kde::KWin;
|
||||
|
||||
diff --git a/src/service/impl/appearancemanager.cpp b/src/service/impl/appearancemanager.cpp
|
||||
index 360ca6f..6db93ab 100644
|
||||
--- a/src/service/impl/appearancemanager.cpp
|
||||
+++ b/src/service/impl/appearancemanager.cpp
|
||||
@@ -821,7 +821,7 @@ void AppearanceManager::doUpdateWallpaperURIs()
|
||||
}
|
||||
|
||||
// 如果是用户自己设置的桌面壁纸, 需要将主题更新为自定义
|
||||
- if (!monitorWallpaperUris.first().startsWith("/usr/share/wallpapers/deepin")) {
|
||||
+ if (!monitorWallpaperUris.first().startsWith("/run/current-system/sw/share/wallpapers/deepin")) {
|
||||
updateCustomTheme(TYPEWALLPAPER, monitorWallpaperUris.first());
|
||||
}
|
||||
}
|
||||
@@ -1689,7 +1689,7 @@ QString AppearanceManager::getWallpaperUri(const QString &index, const QString &
|
||||
const Background &bg = backgroudlist.at(QRandomGenerator::global()->generate() % backgroudlist.size());
|
||||
wallpaper = bg.getId();
|
||||
} else {
|
||||
- wallpaper = "file:///usr/share/wallpapers/deepin/desktop.jpg";
|
||||
+ wallpaper = "file:///run/current-system/sw/share/wallpapers/deepin/desktop.jpg";
|
||||
}
|
||||
|
||||
PhaseWallPaper::setWallpaperUri(index, monitorName, wallpaper);
|
||||
diff --git a/src/service/modules/background/backgrounds.cpp b/src/service/modules/background/backgrounds.cpp
|
||||
index bf739a5..1076d59 100644
|
||||
--- a/src/service/modules/background/backgrounds.cpp
|
||||
+++ b/src/service/modules/background/backgrounds.cpp
|
||||
@@ -11,7 +11,7 @@
|
||||
#include <pwd.h>
|
||||
#include <QDBusReply>
|
||||
|
||||
-QStringList Backgrounds::systemWallpapersDir = { "/usr/share/wallpapers/deepin" };
|
||||
+QStringList Backgrounds::systemWallpapersDir = { "/run/current-system/sw/share/wallpapers/deepin" };
|
||||
QStringList Backgrounds::uiSupportedFormats = { "jpeg", "png", "bmp", "tiff", "gif" };
|
||||
|
||||
Backgrounds::Backgrounds(QObject *parent)
|
||||
@ -9,13 +9,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dde-application-manager";
|
||||
version = "1.2.13";
|
||||
version = "1.2.15";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxdeepin";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-nyT5bp37gOWKbpPBmLULJmeL9oZyBwIC5vYwPyBLcAc=";
|
||||
hash = "sha256-9WKKM3SAMgW+UL0DnzDFqA+HHi7euF/yyTyKSbrIgV4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -18,13 +18,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dde-calendar";
|
||||
version = "5.13.1";
|
||||
version = "5.14.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxdeepin";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-Hn759Cxtzv+HBllA2vdZcH6P8EWZkjawpgkmLiE2+uA=";
|
||||
hash = "sha256-08xkdiP0/haHY3jdHSoA1zXRxMi2t+qxLxbcRc7EO6Q=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@ -17,13 +17,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dde-clipboard";
|
||||
version = "6.0.9";
|
||||
version = "6.0.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxdeepin";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-9sBAurO3v/9HOc5k1RrtdNHusImTHLklpxetLMuQuW4=";
|
||||
hash = "sha256-VSwip3WgpOYvqGw7/A8bqsYrVSACrVgoIp/pjXSAKcU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -24,13 +24,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dde-control-center";
|
||||
version = "6.0.55";
|
||||
version = "6.0.59";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxdeepin";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-dCUtCS7Vmd7LX34JA70P3dgsmSdRefgO//NERhKlRlE=";
|
||||
hash = "sha256-OniY/B/9319AYYFFPnsUMNrnc0yVGG3rfCLPjgNFyag=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -20,13 +20,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dde-dock";
|
||||
version = "6.0.35";
|
||||
version = "6.0.37";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxdeepin";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-ATC/Ze6GyjT92eCgAt9g2FIQbXLVHUMuXuAslNnbkCE=";
|
||||
hash = "sha256-5VowwQ0NoV6jV6DwnoxPKnRi6n28Teh/UQZwRc3URWY=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -18,13 +18,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dde-network-core";
|
||||
version = "2.0.26";
|
||||
version = "2.0.31";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxdeepin";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-eicwutePtKPY5DmNmIFSTQkdrE/i2RKfu766lQWy+iY=";
|
||||
hash = "sha256-vTcADZElqNZMzWKDCEFtH3oXNyW8i4wxAwnaBnyz6X8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -25,13 +25,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dde-session-shell";
|
||||
version = "6.0.20";
|
||||
version = "6.0.21";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxdeepin";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-RPVGjCg7U0nWxqesoSNDtEzh/+OYDSsX31YU+LLllVM=";
|
||||
hash = "sha256-v0+Bz6J77Kgf4YV1iDhCqhmcNn493GFq1IEQbXBAVUU=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -17,13 +17,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dde-session-ui";
|
||||
version = "6.0.19";
|
||||
version = "6.0.20";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxdeepin";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-elDtY7fZf2I8ngEmMB9sRRhm78nEDf5ag6jny7UDG70=";
|
||||
hash = "sha256-3twtJ1KT7TqpyLopHqPY2Lo8oZsH9liir0SJUV/k3OU=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -15,13 +15,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dde-session";
|
||||
version = "1.2.10";
|
||||
version = "1.2.12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxdeepin";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-nLoSVsPyrNA996H7C8N77aiheaiLs3Sd7ZVuxiuNLE4=";
|
||||
hash = "sha256-WiWG4f+vMgAYDBp/porjiV9a6ZqqdmxdXAqX1ISdlfU=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -14,13 +14,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dde-widgets";
|
||||
version = "6.0.22";
|
||||
version = "6.0.23";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxdeepin";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-rE/7AoTID9UWxAS+LVYY5WYDNAo8GnSJmUrJFn3l+1M=";
|
||||
hash = "sha256-aeWQdWi1mMche7AJhAvchRXu89hiZ+CM/RR9HvvbXTw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -36,13 +36,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "deepin-kwin";
|
||||
version = "5.25.26";
|
||||
version = "5.25.27";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxdeepin";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-xBCJu89OV+JMGsd/txAqj2Kce91mnOsRK31WGz7qS40=";
|
||||
hash = "sha256-EjPPjdxa+iL/nXhuccoM3NiLmGXh7Un2aGz8O3sP6xE=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@ -10,6 +10,7 @@ let
|
||||
dtkgui = callPackage ./library/dtkgui { };
|
||||
dtkwidget = callPackage ./library/dtkwidget { };
|
||||
dtkdeclarative = callPackage ./library/dtkdeclarative { };
|
||||
dtklog = callPackage ./library/dtklog { };
|
||||
deepin-pdfium = callPackage ./library/deepin-pdfium { };
|
||||
qt5platform-plugins = callPackage ./library/qt5platform-plugins { };
|
||||
qt5integration = callPackage ./library/qt5integration { };
|
||||
@ -28,6 +29,7 @@ let
|
||||
dtk6widget = callPackage ./library/dtk6widget { };
|
||||
dtk6declarative = callPackage ./library/dtk6declarative { };
|
||||
dtk6systemsettings = callPackage ./library/dtk6systemsettings { };
|
||||
dtk6log = callPackage ./library/dtk6log { };
|
||||
qt6platform-plugins = callPackage ./library/qt6platform-plugins { };
|
||||
qt6integration = callPackage ./library/qt6integration { };
|
||||
|
||||
|
||||
@ -90,27 +90,3 @@ index cda69a77..e394ae07 100644
|
||||
cmd = exec.Command("runuser", "-u", "lightdm", "glxinfo") // runuser -u lightdm glxinfo
|
||||
} else {
|
||||
cmd = exec.Command("glxinfo")
|
||||
diff --git a/system/power1/manager_lmt.go b/system/power1/manager_lmt.go
|
||||
index 87556893..f67cb5b0 100644
|
||||
--- a/system/power1/manager_lmt.go
|
||||
+++ b/system/power1/manager_lmt.go
|
||||
@@ -8,6 +8,7 @@ import (
|
||||
"bufio"
|
||||
"io/ioutil"
|
||||
"os"
|
||||
+ "os/exec"
|
||||
"path/filepath"
|
||||
"strings"
|
||||
|
||||
@@ -28,7 +29,7 @@ const (
|
||||
const lowBatteryThreshold = 20.0
|
||||
|
||||
func isLaptopModeBinOk() bool {
|
||||
- _, err := os.Stat(laptopModeBin)
|
||||
+ _, err := exec.LookPath("laptop_mode")
|
||||
return err == nil
|
||||
}
|
||||
|
||||
--
|
||||
2.40.1
|
||||
|
||||
|
||||
@ -1,17 +0,0 @@
|
||||
diff --git a/bin/backlight_helper/ddcci/ddcci.go b/bin/backlight_helper/ddcci/ddcci.go
|
||||
index 679beea3..ccbfc508 100644
|
||||
--- a/bin/backlight_helper/ddcci/ddcci.go
|
||||
+++ b/bin/backlight_helper/ddcci/ddcci.go
|
||||
@@ -103,11 +103,6 @@ func newDDCCI() (*ddcci, error) {
|
||||
displayHandleMap: make(map[string]*displayHandle),
|
||||
}
|
||||
|
||||
- status := C.ddca_set_max_tries(C.DDCA_MULTI_PART_TRIES, 5)
|
||||
- if status < C.int(0) {
|
||||
- return nil, fmt.Errorf("brightness: Error setting retries: %d", status)
|
||||
- }
|
||||
-
|
||||
err := ddc.RefreshDisplays()
|
||||
if err != nil {
|
||||
return nil, err
|
||||
|
||||
@ -37,16 +37,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "dde-daemon";
|
||||
version = "6.0.34";
|
||||
version = "6.0.43";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxdeepin";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-NIFgv6EUSnCqSdPttx6wrr7K1nRV/JIZJy9uS7uu0Sc=";
|
||||
hash = "sha256-3BzFFlcNwNWNcysD3qRYfdyGaX7gW2XJZ4HzdGiK7jU=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-F39QGxY0aD+hHWguHosSrSzcB/ahYbnFW9vVtS5oUnU=";
|
||||
vendorHash = "sha256-3kUAaVXERqNZhBFytzVbWY6/a8M0jIkWrN+QHdWp1HU=";
|
||||
|
||||
patches = [
|
||||
./0001-dont-set-PATH.diff
|
||||
@ -58,7 +58,6 @@ buildGoModule rec {
|
||||
src = ./0003-aviod-use-hardcode-path.diff;
|
||||
inherit dbus;
|
||||
})
|
||||
./0004-fix-build-with-ddcutil-2.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -18,13 +18,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "startdde";
|
||||
version = "6.0.14";
|
||||
version = "6.0.15";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxdeepin";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-2aPQaH78+J18a/SXA2i+gQ5iypsjNhcYaORGN2qkz7c=";
|
||||
hash = "sha256-RSfdlLT2v3fM4P8E0mIyZZ8A1MWVIS0N0MDczqq7Y64=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Y81p3yPQayXbvyUI7N6PvFDO3hSU3SL0AuUKxvZkZNE=";
|
||||
|
||||
@ -1,38 +1,30 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, cmake
|
||||
, pkg-config
|
||||
, doxygen
|
||||
, qt6Packages
|
||||
, lshw
|
||||
, libuchardet
|
||||
, spdlog
|
||||
, dtkcommon
|
||||
, systemd
|
||||
, withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd
|
||||
, dtk6log
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "dtk6core";
|
||||
version = "6.0.16";
|
||||
version = "6.0.18";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxdeepin";
|
||||
repo = "dtk6core";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-m2unpWx8FBvZT8AmdFlzc5dp55kgtDsR62SHF8RwHhU=";
|
||||
hash = "sha256-zyhqkxxWB5U37eBxINNxcbnF5NpImg+E7H1VhfJDz60=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./fix-pkgconfig-path.patch
|
||||
./fix-pri-path.patch
|
||||
(fetchpatch {
|
||||
name = "fix-build-on-qt-6_7_1.patch";
|
||||
url = "https://github.com/linuxdeepin/dtkcore/commit/10bd3842bbde41fbc61c35b81d280075d053119b.patch";
|
||||
hash = "sha256-xZ3BhiMB6S5NJtPUEjtChCB9Jr1BI0mu7AMjyNMqt9w=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
@ -54,11 +46,9 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
qt6Packages.qtbase
|
||||
lshw
|
||||
libuchardet
|
||||
spdlog
|
||||
]
|
||||
++ lib.optional withSystemd systemd;
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [ dtkcommon ];
|
||||
propagatedBuildInputs = [ dtkcommon dtk6log ];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DDTK_VERSION=${finalAttrs.version}"
|
||||
@ -68,7 +58,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
"-DDSG_PREFIX_PATH='/run/current-system/sw'"
|
||||
"-DMKSPECS_INSTALL_DIR=${placeholder "out"}/mkspecs/modules"
|
||||
"-DD_DSG_APP_DATA_FALLBACK=/var/dsg/appdata"
|
||||
"-DBUILD_WITH_SYSTEMD=${if withSystemd then "ON" else "OFF"}"
|
||||
];
|
||||
|
||||
preConfigure = ''
|
||||
|
||||
@ -10,13 +10,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "dtk6declarative";
|
||||
version = "6.0.16";
|
||||
version = "6.0.18";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxdeepin";
|
||||
repo = "dtk6declarative";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-OvLmK/UAuF9VEnT7DO3/m7S9Xjze5WQuZAYBTcgZbyk=";
|
||||
hash = "sha256-/bQGb87UbnIRWwR6Of67VrRUkrNk6dmY7bjgwDXc30Y";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@ -11,13 +11,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "dtk6gui";
|
||||
version = "6.0.16";
|
||||
version = "6.0.18";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxdeepin";
|
||||
repo = "dtk6gui";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-fnbCKqeeQE5WBnNJ0D1ihsZswDSJ/Oj98eUXFrOuk+w=";
|
||||
hash = "sha256-w8tyc06v/juTP0YSsyWai1ONl4Aa7dzREIc5wLnI/vw=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
51
pkgs/desktops/deepin/library/dtk6log/default.nix
Normal file
51
pkgs/desktops/deepin/library/dtk6log/default.nix
Normal file
@ -0,0 +1,51 @@
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
pkg-config,
|
||||
qt6Packages,
|
||||
spdlog,
|
||||
systemd,
|
||||
withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "dtk6log";
|
||||
version = "0.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxdeepin";
|
||||
repo = "dtk6log";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-R+jxlS8/FXUxnnzIDIePU2NwwNQU624n++E3q3oElco=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
qt6Packages.wrapQtAppsHook
|
||||
];
|
||||
|
||||
dontWrapQtApps = true;
|
||||
|
||||
buildInputs = [
|
||||
qt6Packages.qtbase
|
||||
spdlog
|
||||
] ++ lib.optional withSystemd systemd;
|
||||
|
||||
cmakeFlags = [
|
||||
(lib.cmakeBool "BUILD_WITH_QT6" true)
|
||||
(lib.cmakeBool "BUILD_WITH_SYSTEMD" withSystemd)
|
||||
(lib.cmakeFeature "CMAKE_INSTALL_LIBDIR" "lib")
|
||||
(lib.cmakeFeature "CMAKE_INSTALL_INCLUDEDIR" "include")
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Simple, convinient and thread safe logger for Qt-based C++ apps";
|
||||
homepage = "https://github.com/linuxdeepin/dtk6log";
|
||||
license = lib.licenses.lgpl21Plus;
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = lib.teams.deepin.members;
|
||||
};
|
||||
})
|
||||
@ -12,13 +12,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "dtk6widget";
|
||||
version = "6.0.16";
|
||||
version = "6.0.18";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxdeepin";
|
||||
repo = "dtk6widget";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-4WmnO4msQVWAEOzH1zOWfvJl5X+/VKWv4bbZAH//IXg=";
|
||||
hash = "sha256-6H3Dtdyq/adb3jz9lGaKmOguXqvhvZn1/G7+YajyF2k=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@ -6,13 +6,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dtkcommon";
|
||||
version = "5.6.29";
|
||||
version = "5.6.32";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxdeepin";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-1u+GhPI5F3t2h14VlRKpyPNArGoGgWOk2zA8D6vR6nU=";
|
||||
hash = "sha256-e+8kG9bB6iby2RgD8jn75GyefLRHNnjD+n04hXbi5ec=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -3,28 +3,24 @@
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, pkg-config
|
||||
, qttools
|
||||
, doxygen
|
||||
, wrapQtAppsHook
|
||||
, qtbase
|
||||
, libsForQt5
|
||||
, gsettings-qt
|
||||
, lshw
|
||||
, libuchardet
|
||||
, spdlog
|
||||
, dtkcommon
|
||||
, systemd
|
||||
, withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd
|
||||
, dtklog
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dtkcore";
|
||||
version = "5.6.29";
|
||||
version = "5.6.32";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxdeepin";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-toqbEobi2R5tGnCYaShLyFdp4toEybMrWU+IORI/vu4=";
|
||||
hash = "sha256-APuBVgewr701wzfTRwaQIg/ERFIhabEs5Jd6+GvD04k=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@ -40,40 +36,37 @@ stdenv.mkDerivation rec {
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
qttools
|
||||
doxygen
|
||||
wrapQtAppsHook
|
||||
libsForQt5.qttools
|
||||
libsForQt5.wrapQtAppsHook
|
||||
];
|
||||
|
||||
dontWrapQtApps = true;
|
||||
|
||||
buildInputs = [
|
||||
qtbase
|
||||
libsForQt5.qtbase
|
||||
gsettings-qt
|
||||
lshw
|
||||
libuchardet
|
||||
spdlog
|
||||
]
|
||||
++ lib.optional withSystemd systemd;
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [ dtkcommon ];
|
||||
propagatedBuildInputs = [ dtkcommon dtklog ];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DDTK_VERSION=${version}"
|
||||
"-DBUILD_DOCS=ON"
|
||||
"-DBUILD_EXAMPLES=OFF"
|
||||
"-DQCH_INSTALL_DESTINATION=${placeholder "doc"}/${qtbase.qtDocPrefix}"
|
||||
"-DQCH_INSTALL_DESTINATION=${placeholder "doc"}/${libsForQt5.qtbase.qtDocPrefix}"
|
||||
"-DDSG_PREFIX_PATH='/run/current-system/sw'"
|
||||
"-DMKSPECS_INSTALL_DIR=${placeholder "out"}/mkspecs/modules"
|
||||
"-DTOOL_INSTALL_DIR=${placeholder "out"}/libexec/dtk5/DCore/bin"
|
||||
"-DD_DSG_APP_DATA_FALLBACK=/var/dsg/appdata"
|
||||
"-DBUILD_WITH_SYSTEMD=${if withSystemd then "ON" else "OFF"}"
|
||||
];
|
||||
|
||||
preConfigure = ''
|
||||
# qt.qpa.plugin: Could not find the Qt platform plugin "minimal"
|
||||
# A workaround is to set QT_PLUGIN_PATH explicitly
|
||||
export QT_PLUGIN_PATH=${qtbase.bin}/${qtbase.qtPluginPrefix}
|
||||
export QT_PLUGIN_PATH=${libsForQt5.qtbase.bin}/${libsForQt5.qtbase.qtPluginPrefix}
|
||||
'';
|
||||
|
||||
outputs = [ "out" "dev" "doc" ];
|
||||
|
||||
@ -3,25 +3,20 @@
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, pkg-config
|
||||
, qttools
|
||||
, doxygen
|
||||
, wrapQtAppsHook
|
||||
, qtbase
|
||||
, libsForQt5
|
||||
, dtkgui
|
||||
, qtdeclarative
|
||||
, qtquickcontrols2
|
||||
, qtgraphicaleffects
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dtkdeclarative";
|
||||
version = "5.6.29";
|
||||
version = "5.6.32";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxdeepin";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-7pAC7NHsmQudAO2KvEgI5BbnsgjqxaJY5v9GNfKBm1U=";
|
||||
hash = "sha256-MOiNpuvYwJi9rNKx6TuUuWnlGhmZrRbL48EFapy442M=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@ -33,15 +28,15 @@ stdenv.mkDerivation rec {
|
||||
cmake
|
||||
pkg-config
|
||||
doxygen
|
||||
qttools
|
||||
wrapQtAppsHook
|
||||
libsForQt5.qttools
|
||||
libsForQt5.wrapQtAppsHook
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dtkgui
|
||||
qtdeclarative
|
||||
qtquickcontrols2
|
||||
qtgraphicaleffects
|
||||
libsForQt5.qtdeclarative
|
||||
libsForQt5.qtquickcontrols2
|
||||
libsForQt5.qtgraphicaleffects
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
@ -49,15 +44,15 @@ stdenv.mkDerivation rec {
|
||||
"-DBUILD_DOCS=ON"
|
||||
"-DBUILD_EXAMPLES=ON"
|
||||
"-DMKSPECS_INSTALL_DIR=${placeholder "dev"}/mkspecs/modules"
|
||||
"-DQCH_INSTALL_DESTINATION=${placeholder "doc"}/${qtbase.qtDocPrefix}"
|
||||
"-DQML_INSTALL_DIR=${placeholder "out"}/${qtbase.qtQmlPrefix}"
|
||||
"-DQCH_INSTALL_DESTINATION=${placeholder "doc"}/${libsForQt5.qtbase.qtDocPrefix}"
|
||||
"-DQML_INSTALL_DIR=${placeholder "out"}/${libsForQt5.qtbase.qtQmlPrefix}"
|
||||
];
|
||||
|
||||
preConfigure = ''
|
||||
# qt.qpa.plugin: Could not find the Qt platform plugin "minimal"
|
||||
# A workaround is to set QT_PLUGIN_PATH explicitly
|
||||
export QT_PLUGIN_PATH=${qtbase.bin}/${qtbase.qtPluginPrefix}
|
||||
export QML2_IMPORT_PATH=${qtdeclarative.bin}/${qtbase.qtQmlPrefix}
|
||||
export QT_PLUGIN_PATH=${libsForQt5.qtbase.bin}/${libsForQt5.qtbase.qtPluginPrefix}
|
||||
export QML2_IMPORT_PATH=${libsForQt5.qtdeclarative.bin}/${libsForQt5.qtbase.qtQmlPrefix}
|
||||
'';
|
||||
|
||||
outputs = [ "out" "dev" "doc" ];
|
||||
|
||||
@ -3,25 +3,22 @@
|
||||
, fetchFromGitHub
|
||||
, pkg-config
|
||||
, cmake
|
||||
, qttools
|
||||
, doxygen
|
||||
, wrapQtAppsHook
|
||||
, qtbase
|
||||
, libsForQt5
|
||||
, dtkcore
|
||||
, qtimageformats
|
||||
, lxqt
|
||||
, librsvg
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dtkgui";
|
||||
version = "5.6.29";
|
||||
version = "5.6.32";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxdeepin";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-TSU6sqdwBa86k7HcyNSJeJ6gj+n6EfIMjE8skSG5o0c=";
|
||||
hash = "sha256-F3tuLV1hWoUZle0O66MQ+Ew9LRnP6N++HaqS88xBLRY=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@ -31,34 +28,34 @@ stdenv.mkDerivation rec {
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
qttools
|
||||
doxygen
|
||||
pkg-config
|
||||
wrapQtAppsHook
|
||||
libsForQt5.qttools
|
||||
libsForQt5.wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
qtbase
|
||||
libsForQt5.qtbase
|
||||
lxqt.libqtxdg
|
||||
librsvg
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dtkcore
|
||||
qtimageformats
|
||||
libsForQt5.qtimageformats
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DDTK_VERSION=${version}"
|
||||
"-DBUILD_DOCS=ON"
|
||||
"-DMKSPECS_INSTALL_DIR=${placeholder "out"}/mkspecs/modules"
|
||||
"-DQCH_INSTALL_DESTINATION=${placeholder "doc"}/${qtbase.qtDocPrefix}"
|
||||
"-DQCH_INSTALL_DESTINATION=${placeholder "doc"}/${libsForQt5.qtbase.qtDocPrefix}"
|
||||
];
|
||||
|
||||
preConfigure = ''
|
||||
# qt.qpa.plugin: Could not find the Qt platform plugin "minimal"
|
||||
# A workaround is to set QT_PLUGIN_PATH explicitly
|
||||
export QT_PLUGIN_PATH=${qtbase.bin}/${qtbase.qtPluginPrefix}
|
||||
export QT_PLUGIN_PATH=${libsForQt5.qtbase.bin}/${libsForQt5.qtbase.qtPluginPrefix}
|
||||
'';
|
||||
|
||||
outputs = [ "out" "dev" "doc" ];
|
||||
|
||||
50
pkgs/desktops/deepin/library/dtklog/default.nix
Normal file
50
pkgs/desktops/deepin/library/dtklog/default.nix
Normal file
@ -0,0 +1,50 @@
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
pkg-config,
|
||||
libsForQt5,
|
||||
spdlog,
|
||||
systemd,
|
||||
withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "dtklog";
|
||||
version = "0.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxdeepin";
|
||||
repo = "dtklog";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-8c3KL6pjAFPC4jRpOpPEbEDRBMWnDptwBSbEtcQcf5E=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
libsForQt5.wrapQtAppsHook
|
||||
];
|
||||
|
||||
dontWrapQtApps = true;
|
||||
|
||||
buildInputs = [
|
||||
libsForQt5.qtbase
|
||||
spdlog
|
||||
] ++ lib.optional withSystemd systemd;
|
||||
|
||||
cmakeFlags = [
|
||||
(lib.cmakeBool "BUILD_WITH_SYSTEMD" withSystemd)
|
||||
(lib.cmakeFeature "CMAKE_INSTALL_LIBDIR" "lib")
|
||||
(lib.cmakeFeature "CMAKE_INSTALL_INCLUDEDIR" "include")
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Simple, convinient and thread safe logger for Qt-based C++ apps";
|
||||
homepage = "https://github.com/linuxdeepin/dtklog";
|
||||
license = lib.licenses.lgpl21Plus;
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = lib.teams.deepin.members;
|
||||
};
|
||||
})
|
||||
@ -3,14 +3,9 @@
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, pkg-config
|
||||
, qttools
|
||||
, doxygen
|
||||
, wrapQtAppsHook
|
||||
, libsForQt5
|
||||
, dtkgui
|
||||
, qtbase
|
||||
, qtmultimedia
|
||||
, qtsvg
|
||||
, qtx11extras
|
||||
, cups
|
||||
, gsettings-qt
|
||||
, libstartup_notification
|
||||
@ -19,13 +14,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dtkwidget";
|
||||
version = "5.6.29";
|
||||
version = "5.6.31";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxdeepin";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-eFEigOJGw5gTi0G13/rtnqoaeTdnO0aSLfZlRwHg3yE=";
|
||||
hash = "sha256-FAF66FsmUX0dhFlbT5wAUWkxY0TOU6dcKNwlY10Qou0=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@ -41,17 +36,17 @@ stdenv.mkDerivation rec {
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
qttools
|
||||
doxygen
|
||||
pkg-config
|
||||
wrapQtAppsHook
|
||||
libsForQt5.qttools
|
||||
libsForQt5.wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
qtbase
|
||||
qtmultimedia
|
||||
qtsvg
|
||||
qtx11extras
|
||||
libsForQt5.qtbase
|
||||
libsForQt5.qtmultimedia
|
||||
libsForQt5.qtsvg
|
||||
libsForQt5.qtx11extras
|
||||
cups
|
||||
gsettings-qt
|
||||
libstartup_notification
|
||||
@ -64,13 +59,13 @@ stdenv.mkDerivation rec {
|
||||
"-DDTK_VERSION=${version}"
|
||||
"-DBUILD_DOCS=ON"
|
||||
"-DMKSPECS_INSTALL_DIR=${placeholder "dev"}/mkspecs/modules"
|
||||
"-DQCH_INSTALL_DESTINATION=${placeholder "doc"}/${qtbase.qtDocPrefix}"
|
||||
"-DQCH_INSTALL_DESTINATION=${placeholder "doc"}/${libsForQt5.qtbase.qtDocPrefix}"
|
||||
];
|
||||
|
||||
preConfigure = ''
|
||||
# qt.qpa.plugin: Could not find the Qt platform plugin "minimal"
|
||||
# A workaround is to set QT_PLUGIN_PATH explicitly
|
||||
export QT_PLUGIN_PATH=${qtbase.bin}/${qtbase.qtPluginPrefix}
|
||||
export QT_PLUGIN_PATH=${libsForQt5.qtbase.bin}/${libsForQt5.qtbase.qtPluginPrefix}
|
||||
'';
|
||||
|
||||
outputs = [ "out" "dev" "doc" ];
|
||||
|
||||
@ -13,15 +13,22 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gio-qt";
|
||||
version = "0.0.12";
|
||||
version = "0.0.14";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxdeepin";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-/wLaVR31T+EcT6D5Cw0QIjZasioPWC74KNmt1tckwXk=";
|
||||
hash = "sha256-qDkkLqGsrw+otUy3/iZJJZ2RtpNYPGc/wktdVpw2weg=";
|
||||
};
|
||||
|
||||
# Upstream compiles both qt5 and qt6 versions, which is not possible in nixpkgs
|
||||
# because of the conflict between qt5 hooks and qt6 hooks
|
||||
postPatch = ''
|
||||
substituteInPlace {gio-qt,qgio-tools}/CMakeLists.txt \
|
||||
--replace "include(qt6.cmake)" " "
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
|
||||
@ -4,9 +4,7 @@
|
||||
, dtkwidget
|
||||
, cmake
|
||||
, pkg-config
|
||||
, qtbase
|
||||
, qtsvg
|
||||
, qtx11extras
|
||||
, libsForQt5
|
||||
, lxqt
|
||||
, mtdev
|
||||
, xorg
|
||||
@ -15,13 +13,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "qt5integration";
|
||||
version = "5.6.29";
|
||||
version = "5.6.32";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxdeepin";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-yFY+bsvmVo92u6eLw9VYGAz5nehVrFob4AkdyG0nvjM=";
|
||||
hash = "sha256-WRMeH66X21Z6TBKPEabnWqzC95+OR9M5azxvAp6K7T4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -31,9 +29,9 @@ stdenv.mkDerivation rec {
|
||||
|
||||
buildInputs = [
|
||||
dtkwidget
|
||||
qtbase
|
||||
qtsvg
|
||||
qtx11extras
|
||||
libsForQt5.qtbase
|
||||
libsForQt5.qtsvg
|
||||
libsForQt5.qtx11extras
|
||||
mtdev
|
||||
lxqt.libqtxdg_3_12
|
||||
xorg.xcbutilrenderutil
|
||||
@ -41,7 +39,7 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DPLUGIN_INSTALL_BASE_DIR=${placeholder "out"}/${qtbase.qtPluginPrefix}"
|
||||
"-DPLUGIN_INSTALL_BASE_DIR=${placeholder "out"}/${libsForQt5.qtbase.qtPluginPrefix}"
|
||||
];
|
||||
|
||||
dontWrapQtApps = true;
|
||||
|
||||
@ -5,25 +5,23 @@
|
||||
, extra-cmake-modules
|
||||
, pkg-config
|
||||
, dtkcommon
|
||||
, qtbase
|
||||
, qtx11extras
|
||||
, libsForQt5
|
||||
, mtdev
|
||||
, cairo
|
||||
, xorg
|
||||
, wayland
|
||||
, dwayland
|
||||
, qtwayland
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "qt5platform-plugins";
|
||||
version = "5.6.29";
|
||||
version = "5.6.32";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxdeepin";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-KoX3TkEzGNwqG8XL6op0mpTVvdSQTzqd5OpAuCU2Ok4";
|
||||
hash = "sha256-jbt+ym6TQX3tecFCSlz8Z2ZnqOa69zYgaB5ohQM3lQg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -36,17 +34,17 @@ stdenv.mkDerivation rec {
|
||||
dtkcommon
|
||||
mtdev
|
||||
cairo
|
||||
qtbase
|
||||
qtx11extras
|
||||
libsForQt5.qtbase
|
||||
libsForQt5.qtx11extras
|
||||
xorg.libSM
|
||||
wayland
|
||||
dwayland
|
||||
qtwayland
|
||||
libsForQt5.qtwayland
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DINSTALL_PATH=${placeholder "out"}/${qtbase.qtPluginPrefix}/platforms"
|
||||
"-DQT_XCB_PRIVATE_HEADERS=${qtbase.src}/src/plugins/platforms/xcb"
|
||||
"-DINSTALL_PATH=${placeholder "out"}/${libsForQt5.qtbase.qtPluginPrefix}/platforms"
|
||||
"-DQT_XCB_PRIVATE_HEADERS=${libsForQt5.qtbase.src}/src/plugins/platforms/xcb"
|
||||
];
|
||||
|
||||
dontWrapQtApps = true;
|
||||
|
||||
@ -10,13 +10,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "qt6integration";
|
||||
version = "6.0.16";
|
||||
version = "6.0.18";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxdeepin";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-2QNHJZ4Bz21UyuRhD/9gC7Ls9GggHp4QwtFzoxyyAL4=";
|
||||
hash = "sha256-7FGOnAAcwOonpMDDukj88s1b4WmLJNu7MZSW7f7P44g=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -24,9 +24,9 @@ let
|
||||
"18.1.8".officialRelease.sha256 = "sha256-iiZKMRo/WxJaBXct9GdAcAT3cz9d9pnAcO1mmR6oPNE=";
|
||||
"19.1.0-rc2".officialRelease.sha256 = "sha256-/WiT3Tp5HsmfOgscvFF4NLHx4tqYroSUC335sm49vs8=";
|
||||
"20.0.0-git".gitRelease = {
|
||||
rev = "5f7e921fe3b5402127868faf5855a835cf238196";
|
||||
rev-version = "20.0.0-unstable-2024-08-04";
|
||||
sha256 = "sha256-gW5yPHqmM3sbL9KCt7oXHG8I1ECdKAxNlSZkubve60A=";
|
||||
rev = "4f5d866af7fed0de1671a68530d3023e9762b71e";
|
||||
rev-version = "20.0.0-unstable-2024-08-13";
|
||||
sha256 = "sha256-gr1DjZHfJlyGRDwkK7B82agTF8lRlYmCprcb/O4Do9E=";
|
||||
};
|
||||
} // llvmVersions;
|
||||
|
||||
|
||||
@ -13,7 +13,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiohttp-middlewares";
|
||||
version = "2.3.0";
|
||||
version = "2.4.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -22,7 +22,7 @@ buildPythonPackage rec {
|
||||
owner = "playpauseandstop";
|
||||
repo = "aiohttp-middlewares";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-/xij16JUtq5T5KYinduEP+o4XxFQPyL7pfwvZnS96+U=";
|
||||
hash = "sha256-jUH1XhkytRwR76wUTsGQGu6m8s+SZ/GO114Lz9atwE8=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -35,7 +35,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiosonic";
|
||||
version = "0.20.1";
|
||||
version = "0.21.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -46,7 +46,7 @@ buildPythonPackage rec {
|
||||
owner = "sonic182";
|
||||
repo = "aiosonic";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-RMkmmXUqzt9Nsx8N+f9Xdbgjt1nd5NuJHs9dzarx8IY=";
|
||||
hash = "sha256-YvqRuxl+Dgnsla/iotvWREdh93jwnXaq+F9py9MGP0o=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -19,14 +19,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "cashews";
|
||||
version = "7.1.0";
|
||||
version = "7.2.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Krukov";
|
||||
repo = "cashews";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-VzIW6/xhKk+ZWd29BYQp6sjpBst8IVz8t/hCLc2LFT4=";
|
||||
hash = "sha256-7T9M8ioeTjW7OmcHyxZ6awNfp9kVU8Hi+Lgy17jXxK4=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@ -15,7 +15,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "dvc-data";
|
||||
version = "3.16.0";
|
||||
version = "3.16.3";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -24,12 +24,12 @@ buildPythonPackage rec {
|
||||
owner = "iterative";
|
||||
repo = "dvc-data";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-NBZbuOgM6m/8qhW+izXE4QRI3Ou28mF4nhESWF7Mmn0=";
|
||||
hash = "sha256-23DsG5uEc8SGvbPrUavCCPzhf/lRaTcBKHmSJ35+sDU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools-scm ];
|
||||
build-system = [ setuptools-scm ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dependencies = [
|
||||
dictdiffer
|
||||
diskcache
|
||||
dvc-objects
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
{
|
||||
lib,
|
||||
fetchPypi,
|
||||
fetchpatch,
|
||||
buildPythonPackage,
|
||||
pythonOlder,
|
||||
setuptools,
|
||||
@ -39,6 +40,11 @@ buildPythonPackage rec {
|
||||
# Unlock an overly strict locking of mpi4py version (seems not to be necessary).
|
||||
# See also: https://github.com/h5py/h5py/pull/2418/files#r1589372479
|
||||
./mpi4py-requirement.patch
|
||||
# Fix 16-bit float dtype and tests on darwin (remove in next release)
|
||||
(fetchpatch {
|
||||
url = "https://github.com/h5py/h5py/commit/a27a1f49ce92d985e14b8a24fa80d30e5174add2.patch";
|
||||
hash = "sha256-7TcmNSJucknq+Vnv4ViT6S0nWeH1+krarWxq6WXLYEA=";
|
||||
})
|
||||
];
|
||||
|
||||
# avoid strict pinning of numpy, can't be replaced with pythonRelaxDepsHook,
|
||||
@ -99,9 +105,5 @@ buildPythonPackage rec {
|
||||
homepage = "http://www.h5py.org/";
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = with lib.maintainers; [ doronbehar ];
|
||||
# When importing `h5py` during the build, we get:
|
||||
#
|
||||
# ValueError: Not a datatype (not a datatype)
|
||||
broken = stdenv.isDarwin && stdenv.isx86_64;
|
||||
};
|
||||
}
|
||||
|
||||
@ -15,16 +15,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-lambda";
|
||||
version = "1.2.1";
|
||||
version = "1.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-E9jUlEiHyf5UR/UZxJj9LTfyAxGR/WsvRQdFdIVvLG8=";
|
||||
hash = "sha256-6259HRTMQZWQ8wDcsExvUVzl9IaChsMmB6zaVAeSSAM=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-IXMkgpyYwll8NwTXRffbsSP5uFHGJe1n2RQ1Mbu+E70=";
|
||||
cargoHash = "sha256-fMQFifEnEsDU99vWifPWgHpGGZae84xez3m01MLK7Mo=";
|
||||
|
||||
nativeCheckInputs = [cacert];
|
||||
|
||||
@ -49,6 +49,14 @@ rustPlatform.buildRustPackage rec {
|
||||
"--skip=test_init_subcommand_without_override"
|
||||
"--skip=test_build_example"
|
||||
"--skip=test_deploy_workspace"
|
||||
"--skip=test_add_files"
|
||||
"--skip=test_consistent_hash"
|
||||
"--skip=test_create_binary_archive_from_target"
|
||||
"--skip=test_create_binary_archive_with_base_path"
|
||||
"--skip=test_zip_extension"
|
||||
"--skip=test_zip_funcion"
|
||||
"--skip=test_zip_funcion_with_files"
|
||||
"--skip=test_zip_internal_extension"
|
||||
];
|
||||
|
||||
# remove date from version output to make reproducible
|
||||
|
||||
@ -1,15 +1,16 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
, openssl
|
||||
, pkg-config
|
||||
, glibc
|
||||
, libsoup
|
||||
, cairo
|
||||
, gtk3
|
||||
, webkitgtk
|
||||
, darwin
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
openssl,
|
||||
pkg-config,
|
||||
glibc,
|
||||
libsoup,
|
||||
cairo,
|
||||
gtk3,
|
||||
webkitgtk,
|
||||
darwin,
|
||||
}:
|
||||
|
||||
let
|
||||
@ -17,30 +18,48 @@ let
|
||||
in
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "tauri";
|
||||
version = "1.7.1";
|
||||
version = "2.0.0-rc.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tauri-apps";
|
||||
repo = pname;
|
||||
repo = "tauri";
|
||||
rev = "tauri-v${version}";
|
||||
hash = "sha256-xQsj+NjfWc4nU/MKPzWal6n+YZpruypPoUm926JiI7k=";
|
||||
hash = "sha256-V3Lck5RzEAxXRHPAy0M2elRk9geF8qHWoi01N6wcHc4=";
|
||||
};
|
||||
|
||||
# Manually specify the sourceRoot since this crate depends on other crates in the workspace. Relevant info at
|
||||
# https://discourse.nixos.org/t/difficulty-using-buildrustpackage-with-a-src-containing-multiple-cargo-workspaces/10202
|
||||
sourceRoot = "${src.name}/tooling/cli";
|
||||
|
||||
cargoHash = "sha256-xcytn3cV1Tw6O9glihbyCvERuUBA1yioR4PIbL1T53Q=";
|
||||
cargoHash = "sha256-fGnre+vPzWtpp9NLLQtb/Feh06pBQipkCQ2kFCDTC+Y=";
|
||||
|
||||
buildInputs = [ openssl ] ++ lib.optionals stdenv.isLinux [ glibc libsoup cairo gtk3 webkitgtk ]
|
||||
++ lib.optionals stdenv.isDarwin [ CoreServices Security SystemConfiguration ];
|
||||
buildInputs =
|
||||
[ openssl ]
|
||||
++ lib.optionals stdenv.isLinux [
|
||||
glibc
|
||||
libsoup
|
||||
cairo
|
||||
gtk3
|
||||
webkitgtk
|
||||
]
|
||||
++ lib.optionals stdenv.isDarwin [
|
||||
CoreServices
|
||||
Security
|
||||
SystemConfiguration
|
||||
];
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Build smaller, faster, and more secure desktop applications with a web frontend";
|
||||
mainProgram = "cargo-tauri";
|
||||
homepage = "https://tauri.app/";
|
||||
license = with licenses; [ asl20 /* or */ mit ];
|
||||
maintainers = with maintainers; [ dit7ya happysalada ];
|
||||
license = with lib.licenses; [
|
||||
asl20 # or
|
||||
mit
|
||||
];
|
||||
maintainers = with lib.maintainers; [
|
||||
dit7ya
|
||||
happysalada
|
||||
];
|
||||
};
|
||||
}
|
||||
|
||||
@ -18,16 +18,16 @@ let
|
||||
}.${system} or throwSystem;
|
||||
|
||||
hash = {
|
||||
aarch64-darwin = "sha256-Dto7yP6QUGt7nly5MDEgQnMLdqfxgCbRlBTUj7sxAO0=";
|
||||
aarch64-linux = "sha256-QUam9TT/+yf5XemSbXgGpuQy7rflXLiFClfE4GJonCs=";
|
||||
armv7l-linux = "sha256-hcTHFhjwv82w7fJG7W7jlKet24rzTtfb3OkpgnkkOZQ=";
|
||||
x86_64-darwin = "sha256-j4tc0y/DWEPsJLvNshTpct9qnEhb9NT9BJFA+8x2a8w=";
|
||||
x86_64-linux = "sha256-PCMh5mcY855IOIcHzotYeUYzj4LvPWNsjuGWcFFNM5Q=";
|
||||
aarch64-darwin = "sha256-8ZEfjHzAKl3zhR411+DG1dYCvH+5kjyKCaAsvGPxufM=";
|
||||
aarch64-linux = "sha256-5SHOyRnJJusu07zCLg6t+Y+N9fchHrw/CDIea77p140=";
|
||||
armv7l-linux = "sha256-Gww+nE22t1IGiZgMozdFt6UAARjS5GUU+TAouPCJU2s=";
|
||||
x86_64-darwin = "sha256-kUQH5sENMfgL8AStspXMJfCaP+/KQ6t3i+1bqFbMndg=";
|
||||
x86_64-linux = "sha256-DD4h2EeaTFP/4c/H/pZfa2DYz1l73zTbEyuMZcYUNUE=";
|
||||
}.${system} or throwSystem;
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tailwindcss";
|
||||
version = "3.4.7";
|
||||
version = "3.4.10";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/tailwindlabs/tailwindcss/releases/download/v${version}/tailwindcss-${plat}";
|
||||
|
||||
@ -17,13 +17,13 @@
|
||||
let
|
||||
data = stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "path-of-building-data";
|
||||
version = "2.47.3";
|
||||
version = "2.48.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "PathOfBuildingCommunity";
|
||||
repo = "PathOfBuilding";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-wxsU178BrjdeBTTPY2C3REWlyORWI+/fFijn5oa2Gms=";
|
||||
hash = "sha256-b6tHBlMFJqm0FaXj+5gY+ltd3J3N3IM9QZGd0i1iXLk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ unzip ];
|
||||
|
||||
@ -8,11 +8,11 @@ self: with self; {
|
||||
# THIS IS A GENERATED FILE. DO NOT EDIT!
|
||||
appres = callPackage ({ stdenv, pkg-config, fetchurl, libX11, xorgproto, libXt, testers }: stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "appres";
|
||||
version = "1.0.6";
|
||||
version = "1.0.7";
|
||||
builder = ./builder.sh;
|
||||
src = fetchurl {
|
||||
url = "mirror://xorg/individual/app/appres-1.0.6.tar.xz";
|
||||
sha256 = "02sr4f1bm3y1w24gsvjfzvbpac1kgkq27v1s68q87bd1l3i5f8lb";
|
||||
url = "mirror://xorg/individual/app/appres-1.0.7.tar.xz";
|
||||
sha256 = "17w17gqnfmpfmqgbjci1j4lnsd468k5yscxl3n6pmn4z4f4v250i";
|
||||
};
|
||||
hardeningDisable = [ "bindnow" "relro" ];
|
||||
strictDeps = true;
|
||||
@ -2458,11 +2458,11 @@ self: with self; {
|
||||
# THIS IS A GENERATED FILE. DO NOT EDIT!
|
||||
xconsole = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXaw, libXmu, xorgproto, libXt, wrapWithXFileSearchPathHook, testers }: stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "xconsole";
|
||||
version = "1.0.8";
|
||||
version = "1.1.0";
|
||||
builder = ./builder.sh;
|
||||
src = fetchurl {
|
||||
url = "mirror://xorg/individual/app/xconsole-1.0.8.tar.xz";
|
||||
sha256 = "195vhqjrzjf4kkzmy0kx50n1bv2kj9fg7mi18mm2w3p4d3q6ljkv";
|
||||
url = "mirror://xorg/individual/app/xconsole-1.1.0.tar.xz";
|
||||
sha256 = "128i77kn5pfrcrw31p90cb97g8a5y5173admr3gpdnndr9w5jxqc";
|
||||
};
|
||||
hardeningDisable = [ "bindnow" "relro" ];
|
||||
strictDeps = true;
|
||||
@ -3678,11 +3678,11 @@ self: with self; {
|
||||
# THIS IS A GENERATED FILE. DO NOT EDIT!
|
||||
xfs = callPackage ({ stdenv, pkg-config, fetchurl, libXfont2, xorgproto, xtrans, testers }: stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "xfs";
|
||||
version = "1.2.1";
|
||||
version = "1.2.2";
|
||||
builder = ./builder.sh;
|
||||
src = fetchurl {
|
||||
url = "mirror://xorg/individual/app/xfs-1.2.1.tar.xz";
|
||||
sha256 = "1rn1l76z4l133491wb1klixbwb8az5cnrzwx37fb3vnpmplc72ix";
|
||||
url = "mirror://xorg/individual/app/xfs-1.2.2.tar.xz";
|
||||
sha256 = "1k4f15nrgmqkvsn48hnl1j4giwxpmcpdrnq0bq7b6hg265ix82xp";
|
||||
};
|
||||
hardeningDisable = [ "bindnow" "relro" ];
|
||||
strictDeps = true;
|
||||
|
||||
@ -45,7 +45,10 @@ self: super:
|
||||
postInstallHooks+=(wrapWithXFileSearchPath)
|
||||
'')) {};
|
||||
|
||||
appres = addMainProgram super.appres { };
|
||||
appres = super.appres.overrideAttrs (attrs: {
|
||||
nativeBuildInputs = attrs.nativeBuildInputs ++ [ meson ninja ];
|
||||
meta = attrs.meta // { mainProgram = "appres"; };
|
||||
});
|
||||
|
||||
bdftopcf = super.bdftopcf.overrideAttrs (attrs: {
|
||||
buildInputs = attrs.buildInputs ++ [ xorg.xorgproto ];
|
||||
|
||||
@ -6,7 +6,7 @@ mirror://xorg/individual/xcb/xcb-util-image-0.4.1.tar.xz
|
||||
mirror://xorg/individual/xcb/xcb-util-keysyms-0.4.1.tar.xz
|
||||
mirror://xorg/individual/xcb/xcb-util-renderutil-0.3.10.tar.xz
|
||||
mirror://xorg/individual/xcb/xcb-util-wm-0.4.2.tar.xz
|
||||
mirror://xorg/individual/app/appres-1.0.6.tar.xz
|
||||
mirror://xorg/individual/app/appres-1.0.7.tar.xz
|
||||
mirror://xorg/individual/app/bitmap-1.1.1.tar.xz
|
||||
mirror://xorg/individual/app/editres-1.0.9.tar.xz
|
||||
mirror://xorg/individual/app/fonttosfnt-1.2.3.tar.xz
|
||||
@ -28,7 +28,7 @@ mirror://xorg/individual/app/xcalc-1.1.2.tar.xz
|
||||
mirror://xorg/individual/app/xclock-1.1.1.tar.xz
|
||||
mirror://xorg/individual/app/xcmsdb-1.0.6.tar.xz
|
||||
mirror://xorg/individual/app/xcompmgr-1.1.9.tar.xz
|
||||
mirror://xorg/individual/app/xconsole-1.0.8.tar.xz
|
||||
mirror://xorg/individual/app/xconsole-1.1.0.tar.xz
|
||||
mirror://xorg/individual/app/xcursorgen-1.0.8.tar.xz
|
||||
mirror://xorg/individual/app/xdm-1.1.16.tar.xz
|
||||
mirror://xorg/individual/app/xdpyinfo-1.3.4.tar.xz
|
||||
@ -37,7 +37,7 @@ mirror://xorg/individual/app/xev-1.2.6.tar.xz
|
||||
mirror://xorg/individual/app/xeyes-1.3.0.tar.xz
|
||||
mirror://xorg/individual/app/xfd-1.1.4.tar.xz
|
||||
mirror://xorg/individual/app/xfontsel-1.1.1.tar.xz
|
||||
mirror://xorg/individual/app/xfs-1.2.1.tar.xz
|
||||
mirror://xorg/individual/app/xfs-1.2.2.tar.xz
|
||||
mirror://xorg/individual/app/xfsinfo-1.0.7.tar.xz
|
||||
mirror://xorg/individual/app/xgamma-1.0.7.tar.xz
|
||||
mirror://xorg/individual/app/xgc-1.0.6.tar.xz
|
||||
|
||||
@ -6,16 +6,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "httpx";
|
||||
version = "1.6.7";
|
||||
version = "1.6.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "projectdiscovery";
|
||||
repo = "httpx";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-u62stmQsTtWziuCAsFkG4a3c6eWI9sYgDiwHmoHU2y4=";
|
||||
hash = "sha256-YN79sO/XNU9/HqzN/MWfrcsIyAIcWJGdSIfn00o3alY=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-EIX7fs2nr6OsVvRxLxO0QjGjEPXqzl861KoxAvPB4VY=";
|
||||
vendorHash = "sha256-8QC6CiaI69U/pE3JcSi3key6IscvZkWcdbmNvikbP1w=";
|
||||
|
||||
subPackages = [ "cmd/httpx" ];
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user