colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot] 2024-03-11 00:02:46 +00:00 committed by GitHub
commit e5f37c0e88
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
105 changed files with 1724 additions and 1341 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
maintainers/maintainer-list.nix
View File

@ -7427,6 +7427,12 @@
githubId = 21156405;
name = "GuangTao Zhang";
};
Guanran928 = {
email = "guanran928@outlook.com";
github = "Guanran928";
githubId = 68757440;
name = "Guanran928";
};
guekka = {
github = "Guekka";
githubId = 39066502;

7
nixos/modules/programs/clash-verge.nix
View File

@ -3,6 +3,7 @@
{
options.programs.clash-verge = {
enable = lib.mkEnableOption (lib.mdDoc "Clash Verge");
package = lib.mkPackageOption pkgs "clash-verge" {};
autoStart = lib.mkEnableOption (lib.mdDoc "Clash Verge auto launch");
tunMode = lib.mkEnableOption (lib.mdDoc "Clash Verge TUN mode");
};
@ -14,10 +15,10 @@
lib.mkIf cfg.enable {
environment.systemPackages = [
pkgs.clash-verge
cfg.package
(lib.mkIf cfg.autoStart (pkgs.makeAutostartItem {
name = "clash-verge";
package = pkgs.clash-verge;
package = cfg.package;
}))
];
@ -25,7 +26,7 @@
owner = "root";
group = "root";
capabilities = "cap_net_bind_service,cap_net_admin=+ep";
source = "${lib.getExe pkgs.clash-verge}";
source = "${lib.getExe cfg.package}";
};
};

2
nixos/modules/services/security/yubikey-agent.nix
View File

@ -37,7 +37,7 @@ in
# This overrides the systemd user unit shipped with the
# yubikey-agent package
systemd.user.services.yubikey-agent = mkIf (pinentryFlavor != null) {
systemd.user.services.yubikey-agent = mkIf (config.programs.gnupg.agent.pinentryPackage != null) {
path = [ config.programs.gnupg.agent.pinentryPackage ];
wantedBy = [ "default.target" ];
};

27
pkgs/applications/audio/youtube-music/default.nix
View File

@ -1,6 +1,5 @@
{ lib
, fetchFromGitHub
, buildNpmPackage
, makeWrapper
, electron
, python3
@ -14,21 +13,17 @@
, makeDesktopItem
}:
let
stdenv.mkDerivation (finalAttrs: {
pname = "youtube-music";
version = "3.1.0";
version = "3.3.1";
src = fetchFromGitHub {
owner = "th-ch";
repo = pname;
rev = "v${version}";
hash = "sha256-6ZiftpdCwxCkJzcHryVrUKzM+mM1eQpdLNFl0Dja59Q=";
repo = "youtube-music";
rev = "v${finalAttrs.version}";
hash = "sha256-N6TzDTKvMyasksE0qcEGKeNjGAD08OzxpmpoQ11/ZW4=";
};
in
stdenv.mkDerivation (finalAttrs: {
inherit pname version src;
pnpmDeps = stdenvNoCC.mkDerivation {
pname = "${finalAttrs.pname}-pnpm-deps";
inherit (finalAttrs) src version ELECTRON_SKIP_BINARY_DOWNLOAD;
@ -51,17 +46,15 @@ stdenv.mkDerivation (finalAttrs: {
dontBuild = true;
dontFixup = true;
outputHashMode = "recursive";
outputHashAlgo = "sha256";
outputHash = {
x86_64-linux = "sha256-Oy11V7FXfVhLUR9gX0sjQEFuVPFpbaVdT518oOSLcvA=";
aarch64-linux = "sha256-6nXemaGiQjp2stjjKItPJ62VcH5Q5pRf63qKtl2haXI=";
x86_64-darwin = "sha256-jSMAw+AMD63vqPckZjblw4EDngA4E8h0WlsZu3hUShY=";
aarch64-darwin = "sha256-zujXURpIcw7IOw63AW167h6cywYXydhHZMzA2apGZAs=";
x86_64-linux = "sha256-V6CSawxBWFbXmAPbck0xCXqRlANpqFAoqSAB4Duf8qM=";
aarch64-linux = "sha256-cqBn35soV14CmobKt0napRELio4HKKA8Iw3QSWTxzP8=";
x86_64-darwin = "sha256-DY9T1N8Hxr57/XisYT+u2+hQvYMIiyQ3UHeTuA6BhSY=";
aarch64-darwin = "sha256-3Zk0SyhVKaz5QdO69/xzWFZj9ueJS6GLWhfW7odWvHc=";
}.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}");
};
nativeBuildInputs =
[ makeWrapper python3 nodePackages.pnpm nodePackages.nodejs ]
nativeBuildInputs = [ makeWrapper python3 nodePackages.pnpm nodePackages.nodejs ]
++ lib.optionals (!stdenv.isDarwin) [ copyDesktopItems ];

12
pkgs/applications/editors/vscode/vscodium.nix
View File

@ -15,11 +15,11 @@ let
archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz";
sha256 = {
x86_64-linux = "0pz2dn245jzjw2n79mm9angvdlwlwxb4lwdq8za1i99g2m4il1bz";
x86_64-darwin = "0d0ivs672zh7w60pxy95awq7c8gxhs7d8wv5cf25289gnzcd6qff";
aarch64-linux = "1srir5gr0bdvnxyqrfq00p34ligg0pppr22g9zrdm8jasvrz6fb0";
aarch64-darwin = "046kcsanz5msf5xd94b1lxcwclsp3dcwxgzrcxycbsykxslz9gpq";
armv7l-linux = "0h576q3jbdy48bvg4h9swd2w7cynxmnm2klj6p719myigx7h2jzg";
x86_64-linux = "02rkp86rj7irs5011g6180yihllwfx47afk5vybxab4v23vigidr";
x86_64-darwin = "1hpj6kkyby9chr27w2382az7h2bg3x1x7c9j6i5bh8vl81s9yfd4";
aarch64-linux = "04fhmfplvyqg2l5xlqldl6kfy1m3y19sf2nikigmsm550b8m6sgc";
aarch64-darwin = "1yhyybd27ympg12mp4w46z64g2mi1hbv4d6hfl34l7fq4c5jkjf2";
armv7l-linux = "0jpjsfal67la123hqp9607bih3vnjdpbnrghyy1vywy15z71pff5";
}.${system} or throwSystem;
sourceRoot = lib.optionalString (!stdenv.isDarwin) ".";
@ -29,7 +29,7 @@ in
# Please backport all compatible updates to the stable release.
# This is important for the extension ecosystem.
version = "1.86.2.24057";
version = "1.87.1.24068";
pname = "vscodium";
executableName = "codium";

6
pkgs/applications/emulators/ripes/default.nix
View File

@ -14,14 +14,14 @@
stdenv.mkDerivation rec {
pname = "ripes";
# Pulling unstable version as latest stable does not build against gcc-13.
version = "2.2.6-unstable-2024-01-02";
version = "2.2.6-unstable-2024-03-03";
src = fetchFromGitHub {
owner = "mortbopet";
repo = "Ripes";
rev = "0faf41b669a93a1944707cd7d111a5e9241425fe";
rev = "b71f0ddd5d2d346cb97b28fd3f70fef55bb9b6b7";
fetchSubmodules = true;
hash = "sha256-3+jibS1mGYBy9jmucytc7GvB1ZKRfh7aXtDty77hA3k=";
hash = "sha256-zQrrWBHNIacRoAEIjR0dlgUTncBCiodcBeT/wbDClWg=";
};
nativeBuildInputs = [

19
pkgs/applications/misc/mkgmap/build.xml.patch
View File

@ -1,14 +1,6 @@
--- a/build.xml (revision 4555)
+++ a/build.xml (working copy)
@@ -222,13 +222,13 @@
<property name="svn.version.build" value="none"/>
<propertyfile file="${build.classes}/mkgmap-version.properties">
- <entry key="svn.version" value="${svn.version.build}" />
- <entry key="build.timestamp" value="${build.timestamp}" />
+ <entry key="svn.version" value="@version@" />
+ <entry key="build.timestamp" value="unknown" />
</propertyfile>
@@ -228,7 +228,7 @@
</target>
<!-- Compile the product itself (no tests). -->
@ -35,12 +27,3 @@
<mkdir dir="tmp/report"/>
<junit printsummary="yes" failureproperty="junit.failure" forkmode="once">
@@ -351,7 +351,7 @@
ignoreerrors="true"/>
</target>
- <target name="dist" depends="build, check-version, version-file"
+ <target name="dist" depends="build, version-file"
description="Make the distribution area">
<mkdir dir="${dist}"/>

61
pkgs/applications/misc/mkgmap/default.nix
View File

@ -1,7 +1,7 @@
{ lib, stdenv
{ lib
, stdenv
, fetchurl
, fetchsvn
, substituteAll
, jdk
, jre
, ant
@ -24,14 +24,24 @@ stdenv.mkDerivation rec {
};
patches = [
(substituteAll {
# Disable automatic download of dependencies
src = ./build.xml.patch;
inherit version;
})
# Disable automatic download of dependencies
./build.xml.patch
./ignore-impure-test.patch
];
postPatch = with deps; ''
# Fix the output jar timestamps for reproducibility
substituteInPlace build.xml \
--replace-fail '<jar ' '<jar modificationtime="0" '
# Manually create version properties file for reproducibility
mkdir -p build/classes
cat > build/classes/mkgmap-version.properties << EOF
svn.version=${version}
build.timestamp=unknown
EOF
# Put pre-fetched dependencies into the right place
mkdir -p lib/compile
cp ${fastutil} lib/compile/${fastutil.name}
cp ${osmpbf} lib/compile/${osmpbf.name}
@ -53,36 +63,51 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ jdk ant makeWrapper ];
buildPhase = "ant";
buildPhase = ''
runHook preBuild
ant
runHook postBuild
'';
inherit doCheck;
checkPhase = "ant test";
checkPhase = ''
runHook preCheck
ant test
runHook postCheck
'';
installPhase = ''
runHook preInstall
install -Dm644 dist/mkgmap.jar -t $out/share/java/mkgmap
install -Dm644 dist/doc/mkgmap.1 -t $out/share/man/man1
cp -r dist/lib/ $out/share/java/mkgmap/
makeWrapper ${jre}/bin/java $out/bin/mkgmap \
--add-flags "-jar $out/share/java/mkgmap/mkgmap.jar"
'' + lib.optionalString withExamples ''
mkdir -p $out/share/mkgmap
cp -r dist/examples $out/share/mkgmap/
${lib.optionalString withExamples ''
mkdir -p $out/share/mkgmap
cp -r dist/examples $out/share/mkgmap/
''}
runHook postInstall
'';
passthru.updateScript = [ ./update.sh "mkgmap" meta.downloadPage ];
meta = with lib; {
description = "Create maps for Garmin GPS devices from OpenStreetMap (OSM) data";
homepage = "https://www.mkgmap.org.uk/";
downloadPage = "https://www.mkgmap.org.uk/download/mkgmap.html";
sourceProvenance = with sourceTypes; [
fromSource
binaryBytecode # deps
];
homepage = "https://www.mkgmap.org.uk/";
license = licenses.gpl2Only;
mainProgram = "mkgmap";
maintainers = with maintainers; [ sikmir ];
platforms = platforms.all;
mainProgram = "mkgmap";
sourceProvenance = with sourceTypes; [
fromSource
binaryBytecode # deps
];
};
}

20
pkgs/applications/misc/mkgmap/ignore-impure-test.patch Normal file
View File

@ -0,0 +1,20 @@
diff --git a/test/uk/me/parabola/imgfmt/app/srt/SrtCollatorTest.java b/test/uk/me/parabola/imgfmt/app/srt/SrtCollatorTest.java
index e1e4ac7..954b918 100644
--- a/test/uk/me/parabola/imgfmt/app/srt/SrtCollatorTest.java
+++ b/test/uk/me/parabola/imgfmt/app/srt/SrtCollatorTest.java
@@ -17,6 +17,7 @@ import java.text.Collator;
import uk.me.parabola.mkgmap.srt.SrtTextReader;
import org.junit.Before;
+import org.junit.Ignore;
import org.junit.Test;
import static org.junit.Assert.*;
@@ -111,6 +112,7 @@ public class SrtCollatorTest {
* meant to be identical to the java one.
*/
@Test
+ @Ignore
public void testJavaRules() {
Collator collator = Collator.getInstance();

18
pkgs/applications/misc/mkgmap/splitter/build.xml.patch
View File

@ -1,13 +1,6 @@
--- a/build.xml (revision 597)
+++ a/build.xml (working copy)
@@ -207,12 +207,12 @@
<property name="svn.version.build" value="unknown"/>
<propertyfile file="${build.classes}/splitter-version.properties">
- <entry key="svn.version" value="${svn.version.build}" />
- <entry key="build.timestamp" value="${build.timestamp}" />
+ <entry key="svn.version" value="@version@" />
+ <entry key="build.timestamp" value="unknown" />
@@ -212,7 +212,7 @@
</propertyfile>
</target>
@ -25,15 +18,6 @@
<javac srcdir="${test}" destdir="${build.test-classes}" debug="yes" includeantruntime="false">
<include name="**/*.java"/>
<classpath refid="test.classpath"/>
@@ -261,7 +261,7 @@
<fail if="junit.failure" message="Test failed. See test-reports/index.html"/>
</target>
- <target name="dist" depends="build, check-version, version-file" description="Make the distribution area">
+ <target name="dist" depends="build, version-file" description="Make the distribution area">
<mkdir dir="${dist}"/>
<mkdir dir="${dist}/doc/api"/>
@@ -324,7 +324,7 @@
</target>

52
pkgs/applications/misc/mkgmap/splitter/default.nix
View File

@ -1,7 +1,7 @@
{ lib, stdenv
{ lib
, stdenv
, fetchurl
, fetchsvn
, substituteAll
, jdk
, jre
, ant
@ -23,17 +23,25 @@ stdenv.mkDerivation rec {
};
patches = [
(substituteAll {
# Disable automatic download of dependencies
src = ./build.xml.patch;
inherit version;
})
# Disable automatic download of dependencies
./build.xml.patch
# Fix func.SolverAndProblemGeneratorTest test
./fix-failing-test.patch
];
postPatch = with deps; ''
# Fix the output jar timestamps for reproducibility
substituteInPlace build.xml \
--replace-fail '<jar ' '<jar modificationtime="0" '
# Manually create version properties file for reproducibility
mkdir -p build/classes
cat > build/classes/splitter-version.properties << EOF
svn.version=${version}
build.timestamp=unknown
EOF
# Put pre-fetched dependencies into the right place
mkdir -p lib/compile
cp ${fastutil} lib/compile/${fastutil.name}
cp ${osmpbf} lib/compile/${osmpbf.name}
@ -52,32 +60,46 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ jdk ant makeWrapper ];
buildPhase = "ant";
buildPhase = ''
runHook preBuild
ant
runHook postBuild
'';
inherit doCheck;
checkPhase = "ant run.tests && ant run.func-tests";
checkPhase = ''
runHook preCheck
ant run.tests
ant run.func-tests
runHook postCheck
'';
installPhase = ''
runHook preInstall
install -Dm644 dist/splitter.jar -t $out/share/java/splitter
install -Dm644 doc/splitter.1 -t $out/share/man/man1
cp -r dist/lib/ $out/share/java/splitter/
makeWrapper ${jre}/bin/java $out/bin/splitter \
--add-flags "-jar $out/share/java/splitter/splitter.jar"
runHook postInstall
'';
passthru.updateScript = [ ../update.sh "mkgmap-splitter" meta.downloadPage ];
meta = with lib; {
description = "Utility for splitting OpenStreetMap maps into tiles";
homepage = "https://www.mkgmap.org.uk/";
downloadPage = "https://www.mkgmap.org.uk/download/splitter.html";
sourceProvenance = with sourceTypes; [
fromSource
binaryBytecode # deps
];
homepage = "https://www.mkgmap.org.uk/";
license = licenses.gpl2Only;
mainProgram = "splitter";
maintainers = with maintainers; [ sikmir ];
platforms = platforms.all;
sourceProvenance = with sourceTypes; [
fromSource
binaryBytecode # deps
];
};
}

6
pkgs/applications/networking/gnmic/default.nix
View File

@ -8,16 +8,16 @@
buildGoModule rec {
pname = "gnmic";
version = "0.35.1";
version = "0.36.2";
src = fetchFromGitHub {
owner = "openconfig";
repo = pname;
rev = "v${version}";
hash = "sha256-1Rtq/tRDU8hwrEYhP2/2qPWAYeCPL03m4NpXO3sGUdo=";
hash = "sha256-PUOIKPkzM6riiXR8R1Io0QI/qr6HaexfFgbp2Hx2SOo=";
};
vendorHash = "sha256-HoOjVfpowb5jvAYdQ3cbCQmSl1RJKPDjvOaOGfhe5TY=";
vendorHash = "sha256-zrG/rNoYtfVNN50g41txLQIcBAKi1yE5p1TODrDiXzU=";
ldflags = [
"-s" "-w"

10
pkgs/applications/networking/sync/rclone/default.nix
View File

@ -6,16 +6,16 @@
buildGoModule rec {
pname = "rclone";
version = "1.65.2";
version = "1.66.0";
src = fetchFromGitHub {
owner = pname;
repo = pname;
owner = "rclone";
repo = "rclone";
rev = "v${version}";
hash = "sha256-P7VJ6pauZ7J8LvyYNi7ANsKrYOcmInZCfRO+X+K6LzI=";
hash = "sha256-75RnAROICtRUDn95gSCNO0F6wes4CkJteNfUN38GQIY=";
};
vendorHash = "sha256-budC8psvTtfVi3kYOaJ+dy/9H11ekJVkXMmeV9RhXVU=";
vendorHash = "sha256-zGBwgIuabLDqWbutvPHDbPRo5Dd9kNfmgToZXy7KVgI=";
subPackages = [ "." ];

4
pkgs/applications/office/tryton/default.nix
View File

@ -21,13 +21,13 @@ with lib;
python3Packages.buildPythonApplication rec {
pname = "tryton";
version = "7.0.5";
version = "7.0.7";
disabled = !python3Packages.isPy3k;
src = fetchPypi {
inherit pname version;
sha256 = "sha256-NAnNBfwnMky0qbtU3P5+kHJwCj6nfIQCtYgu6nXLcaQ=";
sha256 = "sha256-NODeDEgmf/nSKrM+RxAUsUwsbVQT7OSDrTOGVBwOzpw=";
};
nativeBuildInputs = [

18
pkgs/applications/video/rtabmap/default.nix
View File

@ -27,32 +27,20 @@
stdenv.mkDerivation rec {
pname = "rtabmap";
version = "0.21.0";
version = "0.21.4";
src = fetchFromGitHub {
owner = "introlab";
repo = "rtabmap";
rev = "refs/tags/${version}";
hash = "sha256-1xb8O3VrErldid2OgAUMG28mSUO7QBUsPuSz8p03tSI";
hash = "sha256-HrIATYRuhFfTlO4oTRZo7CM30LFVyatZJON31Fe4HTQ=";
};
patches = [
# Fix build with g2o 20230806
(fetchpatch {
url = "https://github.com/introlab/rtabmap/commit/85cc6fe3c742855ad16c8442895e12dbb10b6e8b.patch";
hash = "sha256-P6GkYKCNwe9dgZdgF/oEhgjA3bJnwXFWJCPoyIknQCo=";
})
# Fix typo in previous patch
(fetchpatch {
url = "https://github.com/introlab/rtabmap/commit/c4e94bcdc31b859c1049724dbb7671e4597d86de.patch";
hash = "sha256-1btkV4/y+bnF3xEVqlUy/9F6BoANeTOEJjZLmRzG3iA=";
})
];
nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook wrapGAppsHook ];
buildInputs = [
## Required
opencv
opencv.cxxdev
pcl
liblapack
xorg.libSM

10
pkgs/by-name/as/ast-grep/package.nix
View File

@ -2,6 +2,7 @@
, rustPlatform
, fetchFromGitHub
, stdenv
, installShellFiles
}:
rustPlatform.buildRustPackage rec {
@ -22,11 +23,20 @@ rustPlatform.buildRustPackage rec {
NIX_LDFLAGS = "-l${stdenv.cc.libcxx.cxxabi.libName}";
};
nativeBuildInputs = [ installShellFiles ];
# error: linker `aarch64-linux-gnu-gcc` not found
postPatch = ''
rm .cargo/config.toml
'';
postInstall = ''
installShellCompletion --cmd sg \
--bash <($out/bin/sg completions bash) \
--fish <($out/bin/sg completions fish) \
--zsh <($out/bin/sg completions zsh)
'';
checkFlags = [
# disable flaky test
"--skip=test::test_load_parser_mac"

6
pkgs/by-name/bi/bitwarden-cli/package.nix
View File

@ -10,18 +10,18 @@
buildNpmPackage rec {
pname = "bitwarden-cli";
version = "2024.2.0";
version = "2024.2.1";
src = fetchFromGitHub {
owner = "bitwarden";
repo = "clients";
rev = "cli-v${version}";
hash = "sha256-nCjcwe+7Riml/J0hAVv/t6/oHIDPhwFD5A3iQ/LNR5Y=";
hash = "sha256-g9enDEIdVj9R3xkx5qllf7aTDa6F+MvozhwbJn9w/VY=";
};
nodejs = nodejs_18;
npmDepsHash = "sha256-GJl9pVwFWEg9yku9IXLcu2XMJZz+ZoQOxCf1TrW715Y=";
npmDepsHash = "sha256-fkoI8a8iVMWxtXAj5zNg2xwK/ZPyRZGPo7rnxHpKV7k=";
nativeBuildInputs = [
python3

42
pkgs/by-name/cl/clash-meta/package.nix
View File

@ -1,45 +1,13 @@
{ lib
, fetchFromGitHub
, buildGoModule
}:
{ mihomo }:
buildGoModule rec {
mihomo.overrideAttrs (finalAttrs: previousAttrs: {
pname = "clash-meta";
version = "1.18.1";
src = fetchFromGitHub {
owner = "MetaCubeX";
repo = "mihomo";
rev = "v${version}";
hash = "sha256-ezOkDrpytZQdc+Txe4eUyuWY6oipn9jIrmu7aO8lNlQ=";
};
vendorHash = "sha256-tvPR5kAta4MlMTwjfxwVOacRr2nVpfalbN08mfxml64=";
excludedPackages = [ "./test" ];
ldflags = [
"-s"
"-w"
"-X github.com/metacubex/mihomo/constant.Version=${version}"
];
tags = [
"with_gvisor"
];
# network required
doCheck = false;
postInstall = ''
mv $out/bin/mihomo $out/bin/clash-meta
mv $out/bin/${previousAttrs.meta.mainProgram} $out/bin/${finalAttrs.meta.mainProgram}
'';
meta = with lib; {
description = "A rule-based tunnel in Go. Present named mihomo";
homepage = "https://github.com/MetaCubeX/mihomo";
license = licenses.gpl3Only;
maintainers = with maintainers; [ oluceps ];
meta = previousAttrs.meta // {
mainProgram = "clash-meta";
};
}
})

23
pkgs/by-name/cl/clash-nyanpasu/package.nix Normal file
View File

@ -0,0 +1,23 @@
{ lib
, clash-verge
, mihomo
, fetchurl
}:
(clash-verge.override {
clash-meta = mihomo;
}).overrideAttrs (old: rec {
pname = "clash-nyanpasu";
version = "1.4.5";
src = fetchurl {
url = "https://github.com/keiko233/clash-nyanpasu/releases/download/v${version}/clash-nyanpasu_${version}_amd64.deb";
hash = "sha256-cxaq7Rndf0ytEaqc7CGQix5SOAdsTOoTj1Jlhjr5wEA=";
};
meta = old.meta // (with lib; {
homepage = "https://github.com/keiko233/clash-nyanpasu";
maintainers = with maintainers; [ Guanran928 ];
mainProgram = "clash-nyanpasu";
});
})

19
pkgs/by-name/cl/clash-verge-rev/package.nix Normal file
View File

@ -0,0 +1,19 @@
{ lib
, clash-verge
, fetchurl
}:
clash-verge.overrideAttrs (old: rec {
pname = "clash-verge-rev";
version = "1.5.4";
src = fetchurl {
url = "https://github.com/clash-verge-rev/clash-verge-rev/releases/download/v${version}/clash-verge_${version}_amd64.deb";
hash = "sha256-UJYLfefgUASBmh0gyNmjsWdAadluKhwaXZL1wlVlbjU=";
};
meta = old.meta // (with lib; {
homepage = "https://github.com/clash-verge-rev/clash-verge-rev";
maintainers = with maintainers; [ Guanran928 ];
});
})

4
pkgs/applications/networking/clash-verge/default.nix → pkgs/by-name/cl/clash-verge/package.nix
View File

@ -42,13 +42,13 @@ stdenv.mkDerivation rec {
mkdir -p $out/bin
mv usr/* $out
rm $out/bin/{clash,clash-meta}
runHook postInstall
'';
postFixup = ''
ln -s ${lib.getExe clash-meta} $out/bin/clash-meta
rm -f $out/bin/clash
ln -sf ${lib.getExe clash-meta} $out/bin/${clash-meta.meta.mainProgram}
'';
meta = with lib; {

8
pkgs/by-name/de/dep-scan/package.nix
View File

@ -5,19 +5,21 @@
python3.pkgs.buildPythonApplication rec {
pname = "dep-scan";
version = "5.0.2";
version = "5.2.11";
pyproject = true;
src = fetchFromGitHub {
owner = "owasp-dep-scan";
repo = "dep-scan";
rev = "refs/tags/v${version}";
hash = "sha256-qiJyGBGxznNF4LNG9fbmjG7wX0odhrUO2LxOWABtLQA=";
hash = "sha256-BEvuCdQcr35jWe9r9KR4Uov1zNVxfPSnENNPgy4N+nc=";
};
postPatch = ''
substituteInPlace pytest.ini \
--replace " --cov-append --cov-report term --cov depscan" ""
substituteInPlace pyproject.toml \
--replace "oras==0.1.26" "oras~=0.1.26"
'';
nativeBuildInputs = with python3.pkgs; [
@ -26,9 +28,11 @@ python3.pkgs.buildPythonApplication rec {
propagatedBuildInputs = with python3.pkgs; [
appthreat-vulnerability-db
cvss
defusedxml
jinja2
oras
packageurl-python
pdfkit
pygithub
pyyaml

14
pkgs/by-name/fr/fritz-exporter/console-script.patch
View File

@ -1,14 +0,0 @@
diff --git a/pyproject.toml b/pyproject.toml
index ffad1a4..e7551da 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -44,6 +44,9 @@ coverage = ">=6.4.4,<8.0.0"
pytest-cov = ">=3,<5"
ruff = "^0.1.7"
+[tool.poetry.scripts]
+fritzexporter = "fritzexporter.__main__:main"
+
[build-system]
requires = ["poetry-core"]
build-backend = "poetry.core.masonry.api"

10
pkgs/by-name/fr/fritz-exporter/package.nix
View File

@ -5,21 +5,16 @@
python3.pkgs.buildPythonApplication rec {
pname = "fritz-exporter";
version = "2.3.1";
version = "2.4.3";
pyproject = true;
src = fetchFromGitHub {
owner = "pdreker";
repo = "fritz_exporter";
rev = "fritzexporter-v${version}";
hash = "sha256-Dv/2Og1OJV7canZ8Y5Pai5gPRUvcRDYmSGoD2pnAkSs=";
hash = "sha256-2A8hw2XkdxkauG+lMlKfObEvLHUQk79xWmlp0hlrXYM=";
};
patches = [
# https://github.com/pdreker/fritz_exporter/pull/282
./console-script.patch
];
postPatch = ''
# don't test coverage
sed -i "/^addopts/d" pyproject.toml
@ -31,6 +26,7 @@ python3.pkgs.buildPythonApplication rec {
propagatedBuildInputs = with python3.pkgs; [
attrs
defusedxml
fritzconnection
prometheus-client
pyyaml

43
pkgs/by-name/gm/gmetronome/package.nix Normal file
View File

@ -0,0 +1,43 @@
{ lib
, stdenv
, fetchFromGitLab
, pkg-config
, autoreconfHook
, wrapGAppsHook
, gtkmm3
, libpulseaudio
}:
stdenv.mkDerivation rec {
pname = "gmetronome";
version = "0.3.3";
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
owner = "dqpb";
repo = "gmetronome";
rev = version;
hash = "sha256-ilFO1HwleWIQ51Bkzck1sm1Yu3ugqkvZrpxPOYzXydM=";
};
nativeBuildInputs = [
pkg-config
autoreconfHook
wrapGAppsHook
];
buildInputs = [
gtkmm3
libpulseaudio
];
meta = with lib; {
description = "A free software metronome and tempo measurement tool";
homepage = "https://gitlab.gnome.org/dqpb/gmetronome";
license = licenses.gpl3Plus;
platforms = platforms.unix;
maintainers = with maintainers; [ aleksana ];
mainProgram = "gmetronome";
broken = stdenv.isDarwin;
};
}

6
pkgs/by-name/in/invidtui/package.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "invidtui";
version = "0.4.2";
version = "0.4.4";
src = fetchFromGitHub {
owner = "darkhz";
repo = "invidtui";
rev = "refs/tags/v${version}";
hash = "sha256-/HsoV8HdMffD7dzRblSSBMv7kBPRpxUarM5WZoYVxvQ=";
hash = "sha256-nNJ2bjrHRIzcPs+jbZpgaHBxSWRzSRIsT6xx9EsbISg=";
};
vendorHash = "sha256-T/muFaQQp/joOCehNZQc5CWmyGakoRaGAsO2mTOODJA=";
vendorHash = "sha256-C7O2GJuEdO8geRPfHx1Sq6ZveDE/u65JBx/Egh3cnK4=";
doCheck = true;

6
pkgs/development/tools/just/default.nix → pkgs/by-name/ju/just/package.nix
View File

@ -11,17 +11,17 @@
rustPlatform.buildRustPackage rec {
pname = "just";
version = "1.25.0";
version = "1.25.1";
outputs = [ "out" "man" "doc" ];
src = fetchFromGitHub {
owner = "casey";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-ymFBR40lY1ZX6vLH6KDX0a9mI9eOuOJY4bjp2UBubG4=";
hash = "sha256-CvOnvUez2mfta9aXmdsLFxpVB/TGDw0y0ha3OyNJ2DE=";
};
cargoHash = "sha256-B10p57SZSzccs53/OtqFuftHJSxaHRpa+cHODqBo8t4=";
cargoHash = "sha256-b4hprcYOcY0z0UnUe3pGc87j+X3n52btYlaCemETLYg=";
nativeBuildInputs = [ installShellFiles mdbook ];
buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];

0
pkgs/development/tools/just/setup-hook.sh → pkgs/by-name/ju/just/setup-hook.sh
View File

68
pkgs/by-name/li/librum/package.nix Normal file
View File

@ -0,0 +1,68 @@
{ lib
, mupdf
, stdenv
, fetchFromGitHub
, substituteAll
, cmake
, qt6
, desktopToDarwinBundle
}:
let
mupdf-cxx = mupdf.override { enableCxx = true; };
in
stdenv.mkDerivation rec {
pname = "librum";
version = "0.12.1";
src = fetchFromGitHub {
owner = "Librum-Reader";
repo = "Librum";
rev = "v.${version}";
fetchSubmodules = true;
hash = "sha256-/QxTWlTMoXykPe3z+mmn6eaGRJDu2IX8BJPcXi1gUqQ=";
};
patches = [
(substituteAll {
src = ./use_mupdf_in_nixpkgs.patch;
nixMupdfLibPath = "${mupdf-cxx.out}/lib";
nixMupdfIncludePath = "${mupdf-cxx.dev}/include";
})
];
nativeBuildInputs = [
cmake
qt6.qttools
qt6.wrapQtAppsHook
] ++ lib.optionals stdenv.isDarwin [
desktopToDarwinBundle
];
buildInputs = [
qt6.qtbase
qt6.qtsvg
] ++ lib.optionals stdenv.isLinux [
qt6.qtwayland
];
meta = with lib; {
description = "An application designed to make reading enjoyable and straightforward";
longDescription = ''
Librum is an application designed to make reading enjoyable
and straightforward for everyone. It's not just an e-book
reader. With Librum, you can manage your own online library
and access it from any device anytime, anywhere. It has
features like note-taking, AI tooling, and highlighting,
while offering customization to make it as personal as you
want! Librum also provides free access to over 70,000 books
and personal reading statistics while being free and
completely open source.
'';
homepage = "https://librumreader.com";
license = licenses.gpl3Plus;
mainProgram = "librum";
maintainers = with maintainers; [ aleksana oluceps ];
platforms = platforms.unix;
};
}

109
pkgs/by-name/li/librum/use_mupdf_in_nixpkgs.patch Normal file
View File

@ -0,0 +1,109 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 191ff732..de46f35b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -71,7 +71,7 @@ endif()
# Dependencies
add_subdirectory(libs/rapidfuzz-cpp)
-
+include_directories(@nixMupdfIncludePath@)
# Build
add_subdirectory(src/)
diff --git a/src/application/CMakeLists.txt b/src/application/CMakeLists.txt
index bf122a66..64415be3 100644
--- a/src/application/CMakeLists.txt
+++ b/src/application/CMakeLists.txt
@@ -102,10 +102,9 @@ if(ANDROID)
endif()
if(UNIX)
- set(MUPDF_OUTPUT_DIR "${PROJECT_SOURCE_DIR}/libs/mupdf/build/$<IF:$<CONFIG:Debug>,shared-debug,shared-release>")
+ set(MUPDF_OUTPUT_DIR "@nixMupdfLibPath@")
set(MUPDF_OUTPUT "${MUPDF_OUTPUT_DIR}/libmupdfcpp.so")
set(MUPDF_OUTPUT "${MUPDF_OUTPUT_DIR}/libmupdfcpp.so" PARENT_SCOPE)
- set(MUPDF_BUILD_COMMAND ./scripts/mupdfwrap.py ${VENV_OPTION} -d build/$<IF:$<CONFIG:Debug>,shared-debug,shared-release> -b --m-target libs ${EXTRA_MAKE_AGRS} -j 0 m01)
elseif(WIN32)
set(MUPDF_OUTPUT_DIR "${PROJECT_SOURCE_DIR}/libs/mupdf/platform/win32/x64/$<IF:$<CONFIG:Debug>,Debug,Release>")
set(MUPDF_OUTPUT "${MUPDF_OUTPUT_DIR}/mupdfcpp64.lib" PARENT_SCOPE)
@@ -113,8 +112,6 @@ elseif(WIN32)
set(MUPDF_BUILD_COMMAND python scripts/mupdfwrap.py ${VENV_OPTION} -d build/$<IF:$<CONFIG:Debug>,shared-debug,shared-release> -b -j 0 m01)
endif()
-message("MuPdf build command: " ${MUPDF_BUILD_COMMAND})
-
set(CC_COMMAND "${CMAKE_C_COMPILER}")
set(CXX_COMMAND "${CMAKE_CXX_COMPILER}")
@@ -135,18 +132,6 @@ else()
endif()
-add_custom_target(mupdf
- COMMAND ${CMAKE_COMMAND} -E env
- ${ANDROID_COMPILERS}
- "USE_SYSTEM_LIBJPEG=${USE_SYSTEM_LIBJPEG_VALUE}"
- "USE_SONAME=no"
- ${MUPDF_BUILD_COMMAND}
- BYPRODUCTS ${MUPDF_OUTPUT}
- WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/libs/mupdf
- COMMENT "Building mupdf (This takes a while) ..."
-)
-
-
#Copy the mupdf dlls to the build directory for windows
if(WIN32)
add_custom_command(
@@ -168,8 +153,6 @@ add_library(application
interfaces/utility/i_book_getter.hpp
)
-add_dependencies(application mupdf) # Ensure the mupdf target is built before the application target
-
target_compile_definitions(application PRIVATE APPLICATION_LIBRARY)
target_include_directories(application
@@ -188,12 +171,6 @@ target_include_directories(application
${CMAKE_CURRENT_SOURCE_DIR}/core/utils
)
-# Make sure to ignore warnings from mupdf by adding it as a system include directory
-target_include_directories(application SYSTEM PUBLIC
- ${PROJECT_SOURCE_DIR}/libs/mupdf/platform/c++/include
- ${PROJECT_SOURCE_DIR}/libs/mupdf/include
-)
-
target_compile_definitions(application
PRIVATE
$<$<OR:$<CONFIG:Debug>,$<CONFIG:RelWithDebInfo>>:QT_QML_DEBUG>
@@ -236,29 +213,10 @@ if(LINUX)
install(TARGETS application
DESTINATION lib
)
-
- # Install mupdf's shared libraries
- install(FILES ${MUPDF_OUTPUT_DIR}/libmupdfcpp.so
- ${MUPDF_OUTPUT_DIR}/libmupdf.so
- DESTINATION lib)
-
- # Install links with correct permissions
- if(EXISTS "${MUPDF_OUTPUT_DIR}/libmupdfcpp.so.24.0")
- install(FILES ${MUPDF_OUTPUT_DIR}/libmupdfcpp.so.24.0
- ${MUPDF_OUTPUT_DIR}/libmupdf.so.24.0
- PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE
- GROUP_READ GROUP_EXECUTE
- WORLD_READ WORLD_EXECUTE
- DESTINATION lib)
- endif()
elseif(APPLE)
install(TARGETS application
DESTINATION lib
)
- # Install mupdf's shared libraries
- install(FILES ${MUPDF_OUTPUT_DIR}/libmupdfcpp.so
- ${MUPDF_OUTPUT_DIR}/libmupdf.dylib
- DESTINATION lib)
endif()

41
pkgs/by-name/mi/mihomo/package.nix Normal file
View File

@ -0,0 +1,41 @@
{ lib
, fetchFromGitHub
, buildGoModule
}:
buildGoModule rec {
pname = "mihomo";
version = "1.18.1";
src = fetchFromGitHub {
owner = "MetaCubeX";
repo = "mihomo";
rev = "v${version}";
hash = "sha256-ezOkDrpytZQdc+Txe4eUyuWY6oipn9jIrmu7aO8lNlQ=";
};
vendorHash = "sha256-tvPR5kAta4MlMTwjfxwVOacRr2nVpfalbN08mfxml64=";
excludedPackages = [ "./test" ];
ldflags = [
"-s"
"-w"
"-X github.com/metacubex/mihomo/constant.Version=${version}"
];
tags = [
"with_gvisor"
];
# network required
doCheck = false;
meta = with lib; {
description = "A rule-based tunnel in Go";
homepage = "https://github.com/MetaCubeX/mihomo";
license = licenses.gpl3Only;
maintainers = with maintainers; [ oluceps ];
mainProgram = "mihomo";
};
}

4
pkgs/by-name/py/pyprland/package.nix
View File

@ -2,7 +2,7 @@
python3Packages.buildPythonApplication rec {
pname = "pyprland";
version = "2.0.5";
version = "2.0.8";
format = "pyproject";
disabled = python3Packages.pythonOlder "3.10";
@ -11,7 +11,7 @@ python3Packages.buildPythonApplication rec {
owner = "hyprland-community";
repo = "pyprland";
rev = "refs/tags/${version}";
hash = "sha256-VaNJ6hSdcH23Vk7JJpmNV6Qxb7gK5xWK6WHdeyfjUvQ=";
hash = "sha256-oLatPMTiDGRgci5rWBnB6dGDXQKOUMjoh8a7h/0EHxA=";
};
nativeBuildInputs = with python3Packages; [ poetry-core ];

4
pkgs/by-name/re/renode-unstable/package.nix
View File

@ -7,10 +7,10 @@
inherit buildUnstable;
}).overrideAttrs (finalAttrs: _: {
pname = "renode-unstable";
version = "1.14.0+20240305gitcec51e561";
version = "1.14.0+20240308git65e3eb0f5";
src = fetchurl {
url = "https://builds.renode.io/renode-${finalAttrs.version}.linux-portable.tar.gz";
hash = "sha256-dXT4C/s7Aygqhq0U6MiPsQL8ZvjPfTzKYuhA6aRQKlI=";
hash = "sha256-s0SK4Ixl2hTbh6X3nddjKNpnxePjcd/SRXnP/xytInc=";
};
})

6
pkgs/by-name/se/searxng/package.nix
View File

@ -5,13 +5,13 @@
python3.pkgs.toPythonModule (python3.pkgs.buildPythonApplication rec {
pname = "searxng";
version = "0-unstable-2024-02-24";
version = "0-unstable-2024-03-08";
src = fetchFromGitHub {
owner = "searxng";
repo = "searxng";
rev = "d72fa99bd0a4d702a55188b07919ce5a764b1d6c";
hash = "sha256-1A7dyWrF63fSSvWP+2HrCS6H8o/4CUlqiP0KANVZHUA=";
rev = "9c08a0cdddae7ceafbe5e00ce94cf7f1d36c97e0";
hash = "sha256-0qlOpJqpOmseIeIafd0NLd2lF5whu18QxmwOua8dKzg=";
};
postPatch = ''

41
pkgs/by-name/so/sophus/package.nix Normal file
View File

@ -0,0 +1,41 @@
{ lib
, stdenv
, eigen
, fmt
, fetchFromGitHub
, cmake
}:
stdenv.mkDerivation (finalAttrs: {
pname = "sophus";
version = "1.22.10";
src = fetchFromGitHub {
owner = "strasdat";
repo = "Sophus";
rev = finalAttrs.version;
hash = "sha256-TNuUoL9r1s+kGE4tCOGFGTDv1sLaHJDUKa6c9x41Z7w=";
};
nativeBuildInputs = [
cmake
];
buildInputs = [
eigen
fmt
];
cmakeFlags = [
(lib.cmakeBool "BUILD_SOPHUS_TESTS" false)
(lib.cmakeBool "BUILD_SOPHUS_EXAMPLES" false)
];
meta = {
description = "C++ implementation of Lie Groups using Eigen";
homepage = "https://github.com/strasdat/Sophus";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ locochoco acowley ];
platforms = lib.platforms.all;
};
})

14
pkgs/by-name/ss/ssh-openpgp-auth/daemon.nix Normal file
View File

@ -0,0 +1,14 @@
# Ideally, this file would have been placed in
# pkgs/by-name/ss/sshd-openpgp-auth/package.nix, but since `./generic.nix` is
# outside of the directory, the nixpkgs-check-by-name test will fail the CI. So
# we call this file in all-packages.nix like in the old days.
{ callPackage }:
callPackage ./generic.nix {
pname = "sshd-openpgp-auth";
version = "0.3.0";
srcHash = "sha256-IV0Nhdqyn12HDOp1jaKz3sKTI3ktFd5b6qybCLWt27I=";
cargoHash = "sha256-/+lZkVMeFUMRD7NQ/MHDU5f3rkKDx1kDv5tjA41RExc=";
metaDescription =
"Command-line tool for creating and managing OpenPGP based trust anchors for SSH host keys";
}

82
pkgs/by-name/ss/ssh-openpgp-auth/generic.nix Normal file
View File

@ -0,0 +1,82 @@
# This file is based upon upstream's package.nix shared among both
# "ssh-openpgp-auth" and "sshd-openpgpg-auth"
{ lib
, rustPlatform
, fetchFromGitea
, pkg-config
, just
, rust-script
, installShellFiles
, bzip2
, nettle
, openssl
, sqlite
, stdenv
, darwin
, openssh
# Arguments not supplied by callPackage
, pname , version , srcHash , cargoHash, metaDescription
}:
rustPlatform.buildRustPackage {
inherit pname version;
src = fetchFromGitea {
domain = "codeberg.org";
owner = "wiktor";
repo = "ssh-openpgp-auth";
# See also: https://codeberg.org/wiktor/ssh-openpgp-auth/pulls/92#issuecomment-1635274
rev = "${pname}/${version}";
hash = srcHash;
};
buildAndTestSubdir = pname;
inherit cargoHash;
nativeBuildInputs = [
pkg-config
rustPlatform.bindgenHook
just
rust-script
installShellFiles
];
# Otherwise just's build, check and install phases take precedence over
# buildRustPackage's phases.
dontUseJustBuild = true;
dontUseJustCheck = true;
dontUseJustInstall = true;
postInstall = ''
export HOME=$(mktemp -d)
just generate manpages ${pname} $out/share/man/man1
just generate shell_completions ${pname} shell_completions
installShellCompletion --cmd ${pname} \
--bash shell_completions/${pname}.bash \
--fish shell_completions/${pname}.fish \
--zsh shell_completions/_${pname}
'';
buildInputs = [
nettle
openssl
sqlite
] ++ lib.optionals stdenv.isDarwin [
darwin.apple_sdk_11_0.frameworks.CoreFoundation
darwin.apple_sdk_11_0.frameworks.IOKit
darwin.apple_sdk_11_0.frameworks.Security
darwin.apple_sdk_11_0.frameworks.SystemConfiguration
];
doCheck = true;
nativeCheckInputs = [
openssh
];
meta = with lib; {
description = metaDescription;
homepage = "https://codeberg.org/wiktor/ssh-openpgp-auth";
license = with licenses; [ mit /* or */ asl20 ];
maintainers = with maintainers; [ doronbehar ];
mainProgram = pname;
};
}

10
pkgs/by-name/ss/ssh-openpgp-auth/package.nix Normal file
View File

@ -0,0 +1,10 @@
{ callPackage }:
callPackage ./generic.nix {
pname = "ssh-openpgp-auth";
version = "0.2.2";
srcHash = "sha256-5ew6jT6Zr54QYaWFQIGYXd8sqC3yHHZjPfoaCossm8o=";
cargoHash = "sha256-/k/XAp7PHIJaJWf4Oa1JC1mMSR5pyeM4SSPCcr77cAg=";
metaDescription =
"Command-line tool that provides client-side functionality to transparently verify the identity of remote SSH hosts";
}

1593
pkgs/by-name/ty/typst/Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

18
pkgs/by-name/ty/typst/package.nix
View File

@ -2,38 +2,48 @@
, rustPlatform
, fetchFromGitHub
, installShellFiles
, pkg-config
, openssl
, xz
, stdenv
, darwin
}:
rustPlatform.buildRustPackage rec {
pname = "typst";
version = "0.10.0";
version = "0.11.0-rc1";
src = fetchFromGitHub {
owner = "typst";
repo = "typst";
rev = "v${version}";
hash = "sha256-qiskc0G/ZdLRZjTicoKIOztRFem59TM4ki23Rl55y9s=";
hash = "sha256-jOq+aoBSRUTXldg8iWGSJ1z0y+3KbhZfVAgjZo9IsGo=";
};
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"iai-0.1.1" = "sha256-EdNzCPht5chg7uF9O8CtPWR/bzSYyfYIXNdLltqdlR0=";
"typst-dev-assets-0.10.0" = "sha256-EBOZbblbavtsr2LEnoIF0UFmpSsm8Sq7ibxxWcAMIHY=";
};
};
nativeBuildInputs = [
installShellFiles
pkg-config
];
buildInputs = lib.optionals stdenv.isDarwin [
buildInputs = [
openssl
xz
] ++ lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.CoreFoundation
darwin.apple_sdk.frameworks.CoreServices
darwin.apple_sdk.frameworks.Security
];
env = {
GEN_ARTIFACTS = "artifacts";
OPENSSL_NO_VENDOR = true;
};
postInstall = ''

20
pkgs/desktops/deepin/apps/deepin-compressor/0001-fix-build-on-new-dtk.diff Normal file
View File

@ -0,0 +1,20 @@
diff --git a/src/source/common/ddesktopservicesthread.h b/src/source/common/ddesktopservicesthread.h
index 49313744..456a5e96 100644
--- a/src/source/common/ddesktopservicesthread.h
+++ b/src/source/common/ddesktopservicesthread.h
@@ -8,10 +8,14 @@
#include <QThread>
+#include <dtkwidget_global.h>
+#include <dtkgui_global.h>
#include <DDesktopServices>
#include <QDebug>
#include <QFileInfo>
+
DWIDGET_USE_NAMESPACE
+DGUI_USE_NAMESPACE
// 文管打开文件目录线程
class DDesktopServicesThread : public QThread

17
pkgs/desktops/deepin/apps/deepin-compressor/default.nix
View File

@ -20,20 +20,24 @@
stdenv.mkDerivation rec {
pname = "deepin-compressor";
version = "5.12.23";
version = "5.12.24";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
hash = "sha256-8qfpNM2rci4subdodxfJZLP3OvAxXl7QRl4MHGr15nA=";
hash = "sha256-XNhG28VZifQrl3TZfx/OHnsAOo0eKrhGKDk+OjOYD8k=";
};
patches = [
./0001-fix-build-on-new-dtk.diff
];
postPatch = ''
substituteInPlace src/source/common/pluginmanager.cpp \
--replace "/usr/lib/" "$out/lib/"
--replace-fail "/usr/lib/" "$out/lib/"
substituteInPlace src/desktop/deepin-compressor.desktop \
--replace "/usr" "$out"
--replace-fail "/usr" "$out"
'';
nativeBuildInputs = [
@ -61,6 +65,11 @@ stdenv.mkDerivation rec {
"-DUSE_TEST=OFF"
];
# qt5integration must be placed before qtsvg in QT_PLUGIN_PATH
qtWrapperArgs = [
"--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}"
];
strictDeps = true;
meta = with lib; {

3
pkgs/desktops/deepin/apps/deepin-screen-recorder/default.nix
View File

@ -78,6 +78,9 @@ stdenv.mkDerivation rec {
gst-plugins-good
]);
# Fix build failure on dtk 5.6.20
env.NIX_CFLAGS_COMPILE = "-std=c++14";
# qt5integration must be placed before qtsvg in QT_PLUGIN_PATH
qtWrapperArgs = [
"--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}"

4
pkgs/desktops/deepin/apps/deepin-system-monitor/default.nix
View File

@ -27,13 +27,13 @@
stdenv.mkDerivation rec {
pname = "deepin-system-monitor";
version = "6.0.9";
version = "6.0.13";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
hash = "sha256-ompsCTPmmF7S0UHNNU0YDQiTdvcFglpEoS4o+XMZ7jg=";
hash = "sha256-QwZPvEOYypSmbe3deqLRsI3VL/CgVc+Ql3JlsMZ9MqY=";
};
postPatch = ''

4
pkgs/desktops/deepin/artwork/dde-account-faces/default.nix
View File

@ -5,13 +5,13 @@
stdenvNoCC.mkDerivation rec {
pname = "dde-account-faces";
version = "1.0.15";
version = "1.0.16";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
hash = "sha256-/eTGy+9fcYmGrh09RdCIZ2Cn12gTaGtg4Tluv25n5r0=";
hash = "sha256-PtbEsFQl6M5Ouadxy9CTVh1Bmmect83NODO4Ks+ckKU=";
};
makeFlags = [ "PREFIX=${placeholder "out"}/var" ];

4
pkgs/desktops/deepin/artwork/deepin-icon-theme/default.nix
View File

@ -8,13 +8,13 @@
stdenvNoCC.mkDerivation rec {
pname = "deepin-icon-theme";
version = "2023.11.28";
version = "2024.01.31";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
hash = "sha256-kCWJAmJa0VmhnuegE+acj82Ojl4Z5D8g7/q2PzppJwg=";
hash = "sha256-08maujG5Tibsv9N+5olOeD8MrXTRiZh0OQm0bg8t+Cc=";
};
makeFlags = [ "PREFIX=${placeholder "out"}" ];

4
pkgs/desktops/deepin/core/dde-app-services/default.nix
View File

@ -13,13 +13,13 @@
stdenv.mkDerivation rec {
pname = "dde-app-services";
version = "1.0.23";
version = "1.0.25";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
hash = "sha256-INxbRDpG3MqPW6IMTqEagDCGo7vwxkR6D1+lcWdjO3w=";
hash = "sha256-/lHiSUOTD8nC0WDLAHAFzm1YC0WjSS5W5JNC0cjeVEo=";
};
postPatch = ''

6
pkgs/desktops/deepin/core/dde-appearance/default.nix
View File

@ -17,13 +17,13 @@
stdenv.mkDerivation rec {
pname = "dde-appearance";
version = "1.1.6";
version = "1.1.25";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
hash = "sha256-7oRbydLXw8yRzi9L1GH/q0cjMY/DLyWbj4RUSyNpVNM=";
hash = "sha256-H9TvWF6Q0lX4GF4mQ71E3SUqWbhH7dzHIlScovbN7lM=";
};
patches = [
@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
substituteInPlace src/service/modules/api/themethumb.cpp \
--replace "/usr/lib/deepin-api" "/run/current-system/sw/lib/deepin-api"
substituteInPlace src/service/dbus/deepinwmfaker.cpp \
substituteInPlace fakewm/dbus/deepinwmfaker.cpp \
--replace "/usr/lib/deepin-daemon" "/run/current-system/sw/lib/deepin-daemon"
substituteInPlace src/service/modules/api/locale.cpp \

6
pkgs/desktops/deepin/core/dde-appearance/fix-custom-wallpapers-path.diff
View File

@ -11,10 +11,10 @@ index b612e6e..371f966 100644
"serial": 0,
"flags": [],
"name": "Background_Uris",
diff --git a/src/service/dbus/deepinwmfaker.cpp b/src/service/dbus/deepinwmfaker.cpp
diff --git a/fakewm/dbus/deepinwmfaker.cpp b/fakewm/dbus/deepinwmfaker.cpp
index 5d455fa..40ec608 100644
--- a/src/service/dbus/deepinwmfaker.cpp
+++ b/src/service/dbus/deepinwmfaker.cpp
--- 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"

42
pkgs/desktops/deepin/core/dde-application-manager/default.nix
View File

@ -1,42 +1,36 @@
{ stdenv
, lib
, fetchFromGitHub
, fetchpatch
, cmake
, pkg-config
, wrapQtAppsHook
, qtbase
, dtkwidget
, dde-polkit-agent
, gsettings-qt
, libcap
, jemalloc
, xorg
, iconv
}:
stdenv.mkDerivation rec {
pname = "dde-application-manager";
version = "1.0.19";
version = "1.1.8";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
hash = "sha256-1P265xqlL/wML66nKdfTgkRx6MCpLwrt5rXu+CyeShU=";
hash = "sha256-ImyXSyQWMFLvmtx9mBxrr4/IFOgOH1BW650mbiwFh5U=";
};
# remove this patch after next release
postPatch = ''
substituteInPlace src/modules/mimeapp/mime_app.cpp src/modules/launcher/common.h src/service/main.cpp \
misc/dconf/com.deepin.dde.appearance.json \
--replace "/usr/share" "/run/current-system/sw/share"
substituteInPlace src/lib/dlocale.cpp --replace "/usr/share/locale/locale.alias" "${iconv}/share/locale/locale.alias"
for file in $(grep -rl "/usr/bin"); do
substituteInPlace $file --replace "/usr/bin/" "/run/current-system/sw/bin/"
done
'';
patches = [
(fetchpatch {
name = "set-more-scale-envs-to-application.patch";
url = "https://github.com/linuxdeepin/dde-application-manager/commit/a1f8ad276d88c81249dd3468779862186a180238.patch";
hash = "sha256-/iKg6NZZomNEKYsZCZP1IfNr7ZAXiA9RVBnyf+M/f4w=";
})
(fetchpatch {
name = "support-execSearchPath-to-prevent-systemd-from-finding-binaries.patch";
url = "https://github.com/linuxdeepin/dde-application-manager/commit/2eaca7c6b8b841d571e9d3510f9f14c321cd976e.patch";
hash = "sha256-GWUIv4NIBLQpnY4GcjLShMjiXAfPi3zKdol3whchC/Y=";
})
];
nativeBuildInputs = [
cmake
@ -46,12 +40,6 @@ stdenv.mkDerivation rec {
buildInputs = [
qtbase
dtkwidget
gsettings-qt
libcap
jemalloc
xorg.libXdmcp
xorg.libXres
];
meta = with lib; {

4
pkgs/desktops/deepin/core/dde-calendar/default.nix
View File

@ -18,13 +18,13 @@
stdenv.mkDerivation rec {
pname = "dde-calendar";
version = "5.11.1";
version = "5.12.1";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
hash = "sha256-EQcB+a0dK2c6NdvGFbyp65a8nN2PmOpZLWx61UDOTJg=";
hash = "sha256-p+KtObh2JT7aPcDCi0jmaNmLqB1aU3IvAiYrGmhErcI=";
};
patches = [

6
pkgs/desktops/deepin/core/dde-control-center/default.nix
View File

@ -17,19 +17,20 @@
, polkit-qt
, libxcrypt
, librsvg
, gtest
, runtimeShell
, dbus
}:
stdenv.mkDerivation rec {
pname = "dde-control-center";
version = "6.0.28";
version = "6.0.44";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
hash = "sha256-kgQ4ySiYtaklOqER56QtKD9lk1CnRSEAU4QPHycl9eI=";
hash = "sha256-NN2CSIYByxeTZraK48lAsQSJYAOTDHzKT1FOa+VWMo0=";
};
postPatch = ''
@ -57,6 +58,7 @@ stdenv.mkDerivation rec {
polkit-qt
libxcrypt
librsvg
gtest
];
cmakeFlags = [

4
pkgs/desktops/deepin/core/dde-dock/default.nix
View File

@ -21,13 +21,13 @@
stdenv.mkDerivation rec {
pname = "dde-dock";
version = "6.0.22";
version = "6.0.35";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
hash = "sha256-fhc2faiPH35ZKw6SCoGTz+6mgxabNpCFQeY2p68Ba5w=";
hash = "sha256-ATC/Ze6GyjT92eCgAt9g2FIQbXLVHUMuXuAslNnbkCE=";
};
postPatch = ''

15
pkgs/desktops/deepin/core/dde-file-manager/default.nix
View File

@ -1,7 +1,6 @@
{ stdenv
, lib
, fetchFromGitHub
, fetchpatch
, runtimeShell
, dtkwidget
, qt5integration
@ -44,13 +43,13 @@
stdenv.mkDerivation rec {
pname = "dde-file-manager";
version = "6.0.31";
version = "6.0.40";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
hash = "sha256-mc2HcoLrwMXKU8w34KUEh62ZfEIfbJLVzz4JGnUE5EM=";
hash = "sha256-fvxP6wle4hezt9nEDpTgK+xB4J5XIC0mP5jWCmkjJPA=";
};
nativeBuildInputs = [
@ -63,13 +62,7 @@ stdenv.mkDerivation rec {
dontWrapGApps = true;
patches = [
./use_v23_dbus_interface.diff
(fetchpatch {
name = "use-pkgconfig-to-check-mount.patch";
url = "https://github.com/linuxdeepin/dde-file-manager/commit/b6c210057d991591df45b80607a614e7a57a9dc0.patch";
hash = "sha256-k0ZYlOVN3hHs1qvvRaJ3i6okOhDE+DoUKGs9AhSFBGU=";
})
./patch_check_v23_interface.diff
];
postPatch = ''
@ -132,6 +125,8 @@ stdenv.mkDerivation rec {
cmakeFlags = [
"-DVERSION=${version}"
"-DNIX_DEEPIN_VERSION=23"
"-DSYSTEMD_USER_UNIT_DIR=${placeholder "out"}/lib/systemd/user"
];
enableParallelBuilding = true;

6
pkgs/desktops/deepin/core/dde-file-manager/use_v23_dbus_interface.diff → pkgs/desktops/deepin/core/dde-file-manager/patch_check_v23_interface.diff
View File

@ -1,13 +1,13 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e93d3ad..94e3eca 100644
index 8a8cfb079..34092aa57 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -30,7 +30,7 @@ if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
@@ -31,7 +31,7 @@ if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
endif()
#Indentify the version
-if (${DEEPIN_OS_VERSION} MATCHES "23")
+if (TRUE)
+if (${NIX_DEEPIN_VERSION} MATCHES "23")
add_definitions(-DCOMPILE_ON_V23)
set(COMPLIE_ON_V23 TRUE)
message("COMPILE ON v23")

9
pkgs/desktops/deepin/core/dde-launchpad/default.nix
View File

@ -15,15 +15,20 @@
stdenv.mkDerivation rec {
pname = "dde-launchpad";
version = "0.3.0";
version = "0.4.4";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
hash = "sha256-8m0DjQYih3hB/n2VHuJgUYBe8tpGwBU0NdkLxr1OsFc=";
hash = "sha256-az8BC3n44NGpATNu3Exjn3H7Rumx/YqDXztEGqCpAbY=";
};
postPatch = ''
substituteInPlace desktopintegration.cpp \
--replace "AppStreamQt/pool.h" "AppStreamQt5/pool.h"
'';
nativeBuildInputs = [
cmake
qttools

4
pkgs/desktops/deepin/core/dde-network-core/default.nix
View File

@ -18,13 +18,13 @@
stdenv.mkDerivation rec {
pname = "dde-network-core";
version = "2.0.15";
version = "2.0.21";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
hash = "sha256-AMuWEz3Eyw0tG0srLWpqS7MO7Z4ZzIay4z59cZQZU0o=";
hash = "sha256-xuPEh0o62seyxlW+MKGgv/DdheYibSI1K0RJAjxraCw=";
};
nativeBuildInputs = [

4
pkgs/desktops/deepin/core/dde-session-shell/default.nix
View File

@ -25,13 +25,13 @@
stdenv.mkDerivation rec {
pname = "dde-session-shell";
version = "6.0.10";
version = "6.0.17";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
hash = "sha256-h4X3RZe7+CxVeFmk/7+7K4d/2D1+jhECKQaxl4TsuvM=";
hash = "sha256-X/aBMxrYeCT3I9ynV8cPzS23H44fHLkpkztewnfTNxA=";
};
postPatch = ''

4
pkgs/desktops/deepin/core/dde-session-ui/default.nix
View File

@ -17,13 +17,13 @@
stdenv.mkDerivation rec {
pname = "dde-session-ui";
version = "6.0.10";
version = "6.0.16";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
hash = "sha256-JwktVbwWdfqURhZuEFdB5oaKMsBZu5DekpZ2WGpcL4Q=";
hash = "sha256-hxunGK7DxRuAbmi6PtylHCBajV3b1qbFVA+AiuOCcN0=";
};
postPatch = ''

7
pkgs/desktops/deepin/core/dde-session/default.nix
View File

@ -15,16 +15,19 @@
stdenv.mkDerivation rec {
pname = "dde-session";
version = "1.1.9";
version = "1.2.5";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
hash = "sha256-CyHvvNALXe4fOMjD48By/iaU6/xNUhH9yG19Ob3bHy0=";
hash = "sha256-YYGRjVbVFyzmRhYu6sDtxzghocgM7Myr3K77AqWQk3E=";
};
postPatch = ''
substituteInPlace misc/CMakeLists.txt \
--replace "/etc" "$out/etc"
# Avoid using absolute path to distinguish applications
substituteInPlace src/dde-session/impl/sessionmanager.cpp \
--replace 'file.readAll().startsWith("/usr/bin/dde-lock")' 'file.readAll().contains("dde-lock")' \

4
pkgs/desktops/deepin/core/dde-widgets/default.nix
View File

@ -14,13 +14,13 @@
stdenv.mkDerivation rec {
pname = "dde-widgets";
version = "6.0.14";
version = "6.0.19";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
hash = "sha256-bmhT7UhMXtC5wlRtwlVnGjoq8rUQcDSk4rGQ0Xrz9ZI=";
hash = "sha256-oB0lyfmxBSwqjXO+etYdc+DghZVSBU+LXYqK1WS5DaU=";
};
nativeBuildInputs = [

4
pkgs/desktops/deepin/core/deepin-kwin/default.nix
View File

@ -36,13 +36,13 @@
stdenv.mkDerivation rec {
pname = "deepin-kwin";
version = "5.25.11";
version = "5.25.15";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
hash = "sha256-J92T1hsRmmtkjF9OPsrikRtd7bQSEG88UOYu+BHUSx0=";
hash = "sha256-aI5wHEFfvZeoz4ykw9dVx/9e96T1Yahs4YZNutv+CYM=";
};
patches = [

4
pkgs/desktops/deepin/default.nix
View File

@ -1,4 +1,4 @@
{ lib, pkgs, config, libsForQt5 }:
{ lib, pkgs, config, libsForQt5, qt6Packages }:
let
packages = self:
let
@ -28,7 +28,7 @@ let
deepin-kwin = callPackage ./core/deepin-kwin { };
dde-appearance = callPackage ./core/dde-appearance { };
dde-app-services = callPackage ./core/dde-app-services { };
dde-application-manager = callPackage ./core/dde-application-manager { };
dde-application-manager = qt6Packages.callPackage ./core/dde-application-manager { };
dde-control-center = callPackage ./core/dde-control-center { };
dde-calendar = callPackage ./core/dde-calendar { };
dde-clipboard = callPackage ./core/dde-clipboard { };

25
pkgs/desktops/deepin/go-package/dde-api/default.nix
View File

@ -1,7 +1,6 @@
{ stdenv
, lib
, fetchFromGitHub
, fetchpatch
, buildGoModule
, pkg-config
, deepin-gettext-tools
@ -21,40 +20,32 @@
buildGoModule rec {
pname = "dde-api";
version = "6.0.7";
version = "6.0.9";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
hash = "sha256-kdf1CoZUyda6bOTW0WJTgaXYhocrjRU9ptj7i+k8aaQ=";
hash = "sha256-ht5IaXi4nz0/U1zqp4JTiDkQ3NB69q24MgWfu45SpoY=";
};
patches = [
(fetchpatch {
name = "modify_PKGBUILD_to_support_OBS.patch";
url = "https://github.com/linuxdeepin/dde-api/commit/1399522d032c6c649db79a33348cdb1a233bc23a.patch";
hash = "sha256-kSHnYaOxIvv7lAJnvxpSwyRDPyDxpAq9x+gJcBdU3T8=";
})
];
vendorHash = "sha256-4Yscw3QjWG1rlju6sMRHGn3dSe65b1nx10B3KeyAzBM=";
vendorHash = "sha256-zrtUsCF2+301DKwgWectw+UbOehOp8h8u/IMf09XQ8Q=";
postPatch = ''
substituteInPlace misc/systemd/system/deepin-shutdown-sound.service \
--replace "/usr/bin/true" "${coreutils}/bin/true"
--replace-fail "/usr/bin/true" "${coreutils}/bin/true"
substituteInPlace sound-theme-player/main.go \
--replace "/usr/sbin/alsactl" "alsactl"
--replace-fail "/usr/sbin/alsactl" "alsactl"
substituteInPlace misc/{scripts/deepin-boot-sound.sh,systemd/system/deepin-login-sound.service} \
--replace "/usr/bin/dbus-send" "${dbus}/bin/dbus-send"
--replace-fail "/usr/bin/dbus-send" "${dbus}/bin/dbus-send"
substituteInPlace lunar-calendar/huangli.go adjust-grub-theme/main.go \
--replace "/usr/share/dde-api" "$out/share/dde-api"
--replace-fail "/usr/share/dde-api" "$out/share/dde-api"
substituteInPlace themes/{theme.go,settings.go} \
--replace "/usr/share" "/run/current-system/sw/share"
--replace-fail "/usr/share" "/run/current-system/sw/share"
for file in $(grep "/usr/lib/deepin-api" * -nR |awk -F: '{print $1}')
do

11
pkgs/desktops/deepin/go-package/dde-daemon/default.nix
View File

@ -38,16 +38,16 @@
buildGoModule rec {
pname = "dde-daemon";
version = "6.0.22";
version = "6.0.34";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
hash = "sha256-D7s6wWZeZHYl/aP/0qLYNn+lZEwGJAjFNbO0whKymck=";
hash = "sha256-NIFgv6EUSnCqSdPttx6wrr7K1nRV/JIZJy9uS7uu0Sc=";
};
vendorHash = "sha256-U+G5CELpor34RgFzHpxfvJ/jBfWfE4ShjY2b2Z61BhE=";
vendorHash = "sha256-F39QGxY0aD+hHWguHosSrSzcB/ahYbnFW9vVtS5oUnU=";
patches = [
./0001-dont-set-PATH.diff
@ -70,10 +70,11 @@ buildGoModule rec {
--replace "/usr/share/X11/xkb" "${xkeyboard_config}/share/X11/xkb"
substituteInPlace bin/dde-system-daemon/wallpaper.go accounts1/user.go \
--replace "/usr/share/wallpapers" "/run/current-system/sw/share/wallpapers"
--replace "/usr/share/wallpapers" "/run/current-system/sw/share/wallpapers"
substituteInPlace timedate1/zoneinfo/zone.go \
--replace "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo"
--replace "/usr/share/dde" "$out/share/dde" \
--replace "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo"
substituteInPlace accounts1/image_blur.go grub2/modify_manger.go \
--replace "/usr/lib/deepin-api" "/run/current-system/sw/lib/deepin-api"

4
pkgs/desktops/deepin/go-package/go-dbus-factory/default.nix
View File

@ -5,13 +5,13 @@
stdenv.mkDerivation rec {
pname = "go-dbus-factory";
version = "1.10.23";
version = "2.0.8";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
sha256 = "sha256-6u9Bpoa80j/K1MipncfM378/qmSSMZAlx88jE4hHYBk=";
sha256 = "sha256-yzmr61wrBfZi+CuXFhtvOk7EaFtE8y3QyVwwgEDqwKY=";
};
makeFlags = [ "PREFIX=${placeholder "out"}" ];

61
pkgs/desktops/deepin/go-package/startdde/0001-avoid-use-hardcode-path.patch
View File

@ -1,61 +0,0 @@
diff --git a/misc/auto_launch/chinese.json b/misc/auto_launch/chinese.json
index 14b8bff..2b2c412 100644
--- a/misc/auto_launch/chinese.json
+++ b/misc/auto_launch/chinese.json
@@ -3,7 +3,7 @@
"Priority": 9,
"Group": [
{
- "Command": "/usr/bin/dde-file-manager",
+ "Command": "dde-file-manager",
"Wait": false,
"Args": [
"-d"
@@ -25,7 +25,7 @@
"Priority": 7,
"Group": [
{
- "Command": "/usr/bin/dde-shutdown",
+ "Command": "dde-shutdown",
"Wait": false,
"Args": [
"-d"
diff --git a/session.go b/session.go
index da76626..bf9a2c4 100644
--- a/session.go
+++ b/session.go
@@ -14,6 +14,7 @@ import (
"sync"
"syscall"
"time"
+ "strings"
"github.com/adrg/xdg"
"github.com/godbus/dbus/v5"
@@ -85,7 +86,7 @@ type SessionManager struct {
}
const (
- cmdShutdown = "/usr/bin/dde-shutdown"
+ cmdShutdown = "dde-shutdown"
lockFrontDest = "org.deepin.dde.LockFront1"
lockFrontIfc = lockFrontDest
lockFrontObjPath = "/org/deepin/dde/LockFront1"
@@ -458,7 +459,7 @@ func (m *SessionManager) SetLocked(sender dbus.Sender, value bool) *dbus.Error {
return dbusutil.ToError(err)
}
- if exe == "/usr/bin/dde-lock" {
+ if strings.Contains(exe, "dde-lock") {
m.setLocked(value)
return nil
}
@@ -478,7 +479,7 @@ func (m *SessionManager) SetLocked(sender dbus.Sender, value bool) *dbus.Error {
return dbusutil.ToError(fmt.Errorf("desktop file %q is invalid", desktopFile))
}
exe = info.GetExecutable()
- if exe != "/usr/bin/dde-lock" {
+ if strings.Contains(exe, "dde-lock") {
return dbusutil.ToError(fmt.Errorf("exe %q of desktop file %q is invalid", exe, desktopFile))
}

14
pkgs/desktops/deepin/go-package/startdde/default.nix
View File

@ -19,29 +19,25 @@
buildGoModule rec {
pname = "startdde";
version = "6.0.10";
version = "6.0.13";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
hash = "sha256-B2B8QlA1Ps/ybVzionngtwDwTLd7H02RKJwcXymGlJM=";
hash = "sha256-sftPQq4cSyCTuvVtvjT8YJDLQOpSbmnXEVzFwFFaU4U=";
};
patches = [
./0001-avoid-use-hardcode-path.patch
];
vendorHash = "sha256-5BEOazAygYL1N+CaGAbUwdpHZ1EiHr6yNW27/bXNdZg=";
vendorHash = "sha256-Y81p3yPQayXbvyUI7N6PvFDO3hSU3SL0AuUKxvZkZNE=";
postPatch = ''
substituteInPlace display/manager.go session.go \
substituteInPlace display/manager.go \
--replace "/bin/bash" "${runtimeShell}"
substituteInPlace misc/systemd_task/dde-display-task-refresh-brightness.service \
--replace "/usr/bin/dbus-send" "${dbus}/bin/dbus-send"
substituteInPlace display/manager.go utils.go session.go \
substituteInPlace display/manager.go \
--replace "/usr/lib/deepin-daemon" "/run/current-system/sw/lib/deepin-daemon"
substituteInPlace misc/lightdm.conf --replace "/usr" "$out"

4
pkgs/desktops/deepin/library/dtkcommon/default.nix
View File

@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "dtkcommon";
version = "5.6.17";
version = "5.6.21";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
hash = "sha256-mquBuF+Gzq5txxCczeS+gI8LshdKnK5WnpOCytNki+w=";
hash = "sha256-wRTzgvtmbGJJaIwi1f5m98K2o6g7yZdnKYR1nsDDwk8=";
};
nativeBuildInputs = [

4
pkgs/desktops/deepin/library/dtkcore/default.nix
View File

@ -18,13 +18,13 @@
stdenv.mkDerivation rec {
pname = "dtkcore";
version = "5.6.17";
version = "5.6.22";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
hash = "sha256-/MGSvT8tPn+KqqlM6FY2iFsArmAkYMW5Q3Sl4g4zvH0=";
hash = "sha256-W8uLNWC8bYzrKrX/hq9p1h66dWrxp4Vt+/27zDJeAS4=";
};
patches = [

4
pkgs/desktops/deepin/library/dtkdeclarative/default.nix
View File

@ -15,13 +15,13 @@
stdenv.mkDerivation rec {
pname = "dtkdeclarative";
version = "5.6.17";
version = "5.6.24";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
hash = "sha256-P0F6GidGp+CkNplKnLiaYVtcxs6N66gGIx6UcplEt08=";
hash = "sha256-bGy8e+JAyHiAwWvO5Xz1TubHUDP4i4nWUR4h5/appM0=";
};
patches = [

11
pkgs/desktops/deepin/library/dtkgui/default.nix
View File

@ -1,7 +1,6 @@
{ stdenv
, lib
, fetchFromGitHub
, fetchpatch
, pkg-config
, cmake
, qttools
@ -16,24 +15,18 @@
stdenv.mkDerivation rec {
pname = "dtkgui";
version = "5.6.17";
version = "5.6.22";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
hash = "sha256-ssCVMFCE1vhucYMxXkEZV5YlFxT1JdYGqrzILhWX1XI=";
hash = "sha256-h3DFG6FaJXP9o9u8R31MtX3Z1+P3DrNDT8Xbd8tlI4Y=";
};
patches = [
./fix-pkgconfig-path.patch
./fix-pri-path.patch
(fetchpatch {
name = "fix_svg_with_filter_attribute_rendering_exception.patch";
url = "https://github.com/linuxdeepin/dtkgui/commit/f2c9327eb4989ab8ea96af7560c67d1cada794de.patch";
hash = "sha256-lfg09tgS4vPuYachRbHdaMYKWdZZ0lP0Hxakkr9JKGs=";
})
];
nativeBuildInputs = [

4
pkgs/desktops/deepin/library/dtkwidget/default.nix
View File

@ -20,13 +20,13 @@
stdenv.mkDerivation rec {
pname = "dtkwidget";
version = "5.6.17";
version = "5.6.22";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
hash = "sha256-oFmM0e7ht3lCL50pwS/v/BLFmT2jymQaUZ4SmLdxvMo=";
hash = "sha256-szy1gPm+PsiUXGvo5QuXKYMVPCcaqVX47iu48WXOjWU=";
};
patches = [

4
pkgs/desktops/deepin/library/image-editor/default.nix
View File

@ -15,13 +15,13 @@
stdenv.mkDerivation rec {
pname = "image-editor";
version = "1.0.35";
version = "1.0.41";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
hash = "sha256-Xr4tueipQbRHyKLStTWeUcVbX7Baiz0YooaaVk65Y+U=";
hash = "sha256-9V9B0YSUTWv/4IbTRtKJSVrZx6j8jqJxIIR9TwUZ0U0=";
};
postPatch = ''

4
pkgs/desktops/deepin/library/qt5integration/default.nix
View File

@ -15,13 +15,13 @@
stdenv.mkDerivation rec {
pname = "qt5integration";
version = "5.6.17";
version = "5.6.20";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
hash = "sha256-8ag/cFkjp5u/0/71xKR6z6dXp2NGRIYNNbzzEmgsDmc=";
hash = "sha256-cmvscSIu3LOTKuMs/+JUdJAvQ7OB4o1k+LqfRxNefZU=";
};
nativeBuildInputs = [

13
pkgs/desktops/deepin/library/qt5platform-plugins/default.nix
View File

@ -1,7 +1,6 @@
{ stdenv
, lib
, fetchFromGitHub
, fetchpatch
, cmake
, extra-cmake-modules
, pkg-config
@ -18,13 +17,13 @@
stdenv.mkDerivation rec {
pname = "qt5platform-plugins";
version = "5.6.16";
version = "5.6.22";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
hash = "sha256-1/biT8wR44+sdOMhBW/8KMUSBDK/UxuEqsyjTZyjBT4=";
hash = "sha256-0XQ4s6xpFHoG6SC8RE8WVnbHH7qNeOYkhrYUkDEH8Dc=";
};
nativeBuildInputs = [
@ -45,14 +44,6 @@ stdenv.mkDerivation rec {
qtwayland
];
patches = [
(fetchpatch {
name = "use-ECM-to-help-dwayland-find-wayland.patch";
url = "https://github.com/linuxdeepin/qt5platform-plugins/commit/d7f6230716a0ff5ce34fc7d292ec0af5bbac30e4.patch";
hash = "sha256-RY2+QBR3OjUGBX4Y9oVvIRY90IH9rTOCg8dCddkB2WE=";
})
];
cmakeFlags = [
"-DINSTALL_PATH=${placeholder "out"}/${qtbase.qtPluginPrefix}/platforms"
"-DQT_XCB_PRIVATE_HEADERS=${qtbase.src}/src/plugins/platforms/xcb"

4
pkgs/desktops/deepin/library/util-dfm/default.nix
View File

@ -13,13 +13,13 @@
stdenv.mkDerivation rec {
pname = "util-dfm";
version = "1.2.16";
version = "1.2.21";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
hash = "sha256-o5ubfCpgAHJXqihGyapq7Dj9eQlw2q6VoER/e37tM6w=";
hash = "sha256-EqNca3heIUUV5joMskpriCY+7NwjUc/vmQwomDkru80=";
};
nativeBuildInputs = [

4
pkgs/desktops/deepin/misc/deepin-desktop-base/default.nix
View File

@ -5,13 +5,13 @@
}:
stdenvNoCC.mkDerivation rec {
pname = "deepin-desktop-base";
version = "2023.09.05";
version = "2024.01.03";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
hash = "sha256-Gqp56TbkuTOI3aT7UmRuYBjUwRiOoIUHiRf0DaY0yew=";
hash = "sha256-45qR1LCnA8ZSrWykqNvvm7Dxbi5pQnAuFy6nZJrzyi0=";
};
makeFlags = [ "DESTDIR=${placeholder "out"}" ];

12
pkgs/development/compilers/cakelisp/default.nix
View File

@ -1,14 +1,14 @@
{ lib, stdenv, fetchgit, fetchpatch, gcc, unstableGitUpdater }:
{ lib, stdenv, fetchgit, gcc, unstableGitUpdater }:
stdenv.mkDerivation rec {
stdenv.mkDerivation {
pname = "cakelisp";
# using unstable as it's the only version that builds against gcc-13
version = "0.3.0-unstable-2023-12-18";
version = "0.3.0-unstable-2024-02-21";
src = fetchgit {
url = "https://macoy.me/code/macoy/cakelisp";
rev = "866fa2806d3206cc9dd398f0e86640db5be42bd6";
hash = "sha256-vwMZUNy+updwk69ahA/D9LhO68eV6wH0Prq+o/i1Q/A=";
rev = "75ce620b265bf83c6952c0093df2b9d4f7f32a54";
hash = "sha256-X+tWq2QQogy4d042pcVuldc80jcClYtV09Jr91rHJl4=";
};
buildInputs = [ gcc ];
@ -30,6 +30,8 @@ stdenv.mkDerivation rec {
runHook postBuild
'';
env.NIX_CFLAGS_COMPILE = "-Wno-error=format";
installPhase = ''
runHook preInstall
install -Dm755 bin/cakelisp -t $out/bin

14
pkgs/development/interpreters/quickjs/default.nix
View File

@ -1,25 +1,23 @@
{ lib
, stdenv
, fetchFromGitHub
, fetchurl
, texinfo
}:
stdenv.mkDerivation rec {
pname = "quickjs";
version = "2021-12-09";
version = "2024-01-13";
src = fetchFromGitHub {
owner = "bellard";
repo = pname;
rev = "daa35bc1e5d43192098af9b51caeb4f18f73f9f9";
hash = "sha256-BhAsa8tumCQ4jK/TbRbptj2iOIUFFjU1MQYdIrDMpko=";
src = fetchurl {
url = "https://bellard.org/quickjs/quickjs-${version}.tar.xz";
hash = "sha256-PEv4+JW/pUvrSGyNEhgRJ3Hs/FrDvhA2hR70FWghLgM=";
};
postPatch = lib.optionalString stdenv.isDarwin ''
substituteInPlace Makefile --replace "CONFIG_LTO=y" ""
'';
makeFlags = [ "prefix=${placeholder "out"}" ];
makeFlags = [ "PREFIX=${placeholder "out"}" ];
enableParallelBuilding = true;
nativeBuildInputs = [

4
pkgs/development/libraries/libadwaita/default.nix
View File

@ -22,7 +22,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "libadwaita";
version = "1.4.3";
version = "1.4.4";
outputs = [ "out" "dev" "devdoc" ];
outputBin = "devdoc"; # demo app
@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
owner = "GNOME";
repo = "libadwaita";
rev = finalAttrs.version;
hash = "sha256-ctHAN0SY6k68jaBpmIpMm8DngC9DPiL1vAmGhECpNic=";
hash = "sha256-AZP5OH/LIroBeKioe7AIVx0FvFdTpWJ1INdRPZcjmHQ=";
};
depsBuildBuild = [

8
pkgs/development/libraries/v8/default.nix
View File

@ -79,6 +79,14 @@ stdenv.mkDerivation rec {
patches = [
./darwin.patch
# gcc-13 build fix for mixxign <cstdint> includes
(fetchpatch {
name = "gcc-13.patch";
url = "https://chromium.googlesource.com/v8/v8/+/c2792e58035fcbaa16d0cb70998852fbeb5df4cc^!?format=TEXT";
decode = "base64 -d";
hash = "sha256-hoPAkSaCmzXflPFXaKUwVPLECMpt6N6/8m8mBSTAHbU=";
})
];
src = v8Src;

13
pkgs/development/python-modules/aiocache/default.nix
View File

@ -1,28 +1,33 @@
{ lib
, aioredis
, buildPythonPackage
, fetchFromGitHub
, msgpack
, pythonOlder
, redis
, setuptools
}:
buildPythonPackage rec {
pname = "aiocache";
version = "0.12.2";
format = "setuptools";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "aio-libs";
repo = pname;
repo = "aiocache";
rev = "refs/tags/v${version}";
hash = "sha256-yvXDNJL8uxReaU81klVWudJwh1hmvg5GeeILcNpm/YA=";
};
nativeBuildInputs = [
setuptools
];
passthru.optional-dependencies = {
redis = [
aioredis
redis
];
msgpack = [
msgpack

6
pkgs/development/python-modules/fakeredis/default.nix
View File

@ -1,8 +1,8 @@
{ lib
, aioredis
, buildPythonPackage
, fetchFromGitHub
, hypothesis
, jsonpath-ng
, lupa
, poetry-core
, pybloom-live
@ -49,8 +49,8 @@ buildPythonPackage rec {
lua = [
lupa
];
aioredis = [
aioredis
json = [
jsonpath-ng
];
bf = [
pyprobables

4
pkgs/development/python-modules/hg-git/default.nix
View File

@ -9,14 +9,14 @@
buildPythonPackage rec {
pname = "hg-git";
version = "1.1.0";
version = "1.1.1";
format = "pyproject";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-btEamGLqCC5PRigxHbe49/bnJNVGm6Czf852JaAdB38=";
hash = "sha256-r04Q6zbt8VM1jYkoGOdJZqKPPxXy4jC1X1d9nJ+fEWY=";
};
nativeBuildInputs = [

4
pkgs/development/python-modules/langchain-community/default.nix
View File

@ -17,7 +17,7 @@
buildPythonPackage rec {
pname = "langchain-community";
version = "0.0.26";
version = "0.0.27";
pyproject = true;
disabled = pythonOlder "3.8";
@ -25,7 +25,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "langchain_community";
inherit version;
hash = "sha256-K3W+HVDEWqMap4WYDnuFN0gUeJPSEe9nljJKYuqfrCg=";
hash = "sha256-Jm3/vUwWZtsYicrZU/pRAtTev/eCM1NTtteGNqdhd40=";
};
nativeBuildInputs = [

5
pkgs/development/python-modules/nevow/default.nix
View File

@ -1,12 +1,13 @@
{ lib, buildPythonPackage, fetchPypi, isPy3k, twisted }:
buildPythonPackage rec {
pname = "Nevow";
pname = "nevow";
version = "0.14.5";
disabled = isPy3k;
src = fetchPypi {
inherit version pname;
pname = "Nevow";
inherit version;
sha256 = "afb6ba85a5351953578c018fcdb9dfbd62f29a8d46c58bc9652bc000a27223f3";
};

14
pkgs/development/python-modules/systembridgemodels/default.nix
View File

@ -5,11 +5,12 @@
, fetchpatch2
, setuptools
, incremental
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "systembridgemodels";
version = "4.0.0";
version = "4.0.1";
pyproject = true;
disabled = pythonOlder "3.11";
@ -18,13 +19,13 @@ buildPythonPackage rec {
owner = "timmo001";
repo = "system-bridge-models";
rev = "refs/tags/${version}";
hash = "sha256-4nbTsVRqtoX4UhTrQS4HwoLtx0RO1VA8UewSAWOSsik=";
hash = "sha256-9k85tqJO/YtkYncfNQBelmDkd3SYtf6SHURfumvqUo0=";
};
patches = [
(fetchpatch2 {
url = "https://github.com/timmo001/system-bridge-models/commit/7cd506760fd47c0f3717b6fcfe127b673e3198f8.patch";
hash = "sha256-i+GCcoyX07ii9Kj46dtAlT85jUKfF0KHEH9++UTjiik=";
url = "https://github.com/timmo001/system-bridge-models/commit/82fcee37cb302bc77384165b2ce10f2234c2a14a.patch";
hash = "sha256-tZSaWVUPCJmuzkae9LBTdyZ3UINMvrSMbdS5AvbId8Q=";
})
];
@ -38,8 +39,9 @@ buildPythonPackage rec {
pythonImportsCheck = [ "systembridgemodels" ];
# upstream has no tests
doCheck = false;
nativeCheckInputs = [
pytestCheckHook
];
meta = {
changelog = "https://github.com/timmo001/system-bridge-models/releases/tag/${version}";

4
pkgs/development/python-modules/types-requests/default.nix
View File

@ -8,12 +8,12 @@
buildPythonPackage rec {
pname = "types-requests";
version = "2.31.0.20240218";
version = "2.31.0.20240310";
pyproject = true;
src = fetchPypi {
inherit pname version;
hash = "sha256-8XIduoOFlY9QSlOGJAuS3kc04EegikB1HBZU0awzScU=";
hash = "sha256-iiAXHgiKD3iTqsSQpffzfp9T4U1rdixdVWI76gIu4G8=";
};
nativeBuildInputs = [

4
pkgs/development/python-modules/vector/default.nix
View File

@ -15,14 +15,14 @@
buildPythonPackage rec {
pname = "vector";
version = "1.2.0";
version = "1.3.0";
format = "pyproject";
disabled = pythonOlder "3.8";
src = fetchPypi {
inherit pname version;
hash = "sha256-I7esW9qyc7T5MGFn/YZmajd3pSgE0CgqVW2YkTDLV6Q=";
hash = "sha256-nQ7tzYVOmcF0oklmhxbgH4w5cJ+cwuJi1ihich7D7yc=";
};
nativeBuildInputs = [

4
pkgs/development/tools/build-managers/xmake/default.nix
View File

@ -12,11 +12,11 @@
stdenv.mkDerivation rec {
pname = "xmake";
version = "2.8.7";
version = "2.8.8";
src = fetchurl {
url = "https://github.com/xmake-io/xmake/releases/download/v${version}/xmake-v${version}.tar.gz";
hash = "sha256-jHqMb3ex/BcF54ViTpoelEcWhEqDeP7Oc0HeJ7mfC4k=";
hash = "sha256-UJFlQJleO59K1xr3Gy0Zh751SkaNGzGZxE5CWyMv0KM=";
};
nativeBuildInputs = [

9
pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
View File

@ -1,7 +1,7 @@
{ lib, buildGoModule, fetchFromGitLab, fetchurl, bash }:
let
version = "16.7.0";
version = "16.9.1";
in
buildGoModule rec {
inherit version;
@ -17,13 +17,13 @@ buildGoModule rec {
# For patchShebangs
buildInputs = [ bash ];
vendorHash = "sha256-SHtxkB4qJMfhjo3UVjqBzD647AWIXIk10VtH/CMIB1I=";
vendorHash = "sha256-ErDwGjU6085/on5qazLME3stTLYhP8quHV/EoIZOO04=";
src = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitlab-runner";
rev = "v${version}";
sha256 = "sha256-pVD3DCrujsrDJPt/DXelMYSK+u25aV2YUMDW+22QHwI=";
sha256 = "sha256-NEDqXgc0hbQc5BzyPuxddW+rvAWUz8KxnqSkzTDDu/I=";
};
patches = [
@ -40,6 +40,7 @@ buildGoModule rec {
# No writable developer environment
rm common/build_test.go
rm common/build_settings_test.go
rm executors/custom/custom_test.go
# No docker during build
@ -67,7 +68,7 @@ buildGoModule rec {
meta = with lib; {
description = "GitLab Runner the continuous integration executor of GitLab";
license = licenses.mit;
homepage = "https://about.gitlab.com/gitlab-ci/";
homepage = "https://docs.gitlab.com/runner/";
platforms = platforms.unix ++ platforms.darwin;
maintainers = with maintainers; [ bachp zimbatm ] ++ teams.gitlab.members;
};

6
pkgs/games/openjk/default.nix
View File

@ -32,13 +32,13 @@ let
};
in stdenv.mkDerivation {
pname = "OpenJK";
version = "0-unstable-2024-02-20";
version = "0-unstable-2024-03-05";
src = fetchFromGitHub {
owner = "JACoders";
repo = "OpenJK";
rev = "1e8a7998ca2fe434daebb41d586ac3cd5296433a";
sha256 = "sha256-TKJNaz+oWNYyReFZVefg1frPXyd3Yl96JDklp1qY1to=";
rev = "62124e18ef09b293ea66a1f673b827d83e073928";
sha256 = "sha256-2LgxRWoAfxNE6YDyrpNmDH9APhi2XH4ufNCNMd91llU=";
};
dontAddPrefix = true;

25
pkgs/os-specific/linux/conky/default.nix
View File

@ -16,13 +16,14 @@
, ncursesSupport ? true , ncurses ? null
, x11Support ? true , freetype, xorg
, waylandSupport ? true , pango, wayland, wayland-protocols, wayland-scanner
, xdamageSupport ? x11Support, libXdamage ? null
, doubleBufferSupport ? x11Support
, imlib2Support ? x11Support, imlib2 ? null
, luaSupport ? true , lua ? null
, luaImlib2Support ? luaSupport && imlib2Support
, luaCairoSupport ? luaSupport && x11Support, cairo ? null
, luaCairoSupport ? luaSupport && (x11Support || waylandSupport), cairo ? null
, toluapp ? null
, wirelessSupport ? true , wirelesstools ? null
@ -76,13 +77,13 @@ stdenv.mkDerivation rec {
hash = "sha256-L8YSbdk+qQl17L4IRajFD/AEWRXb2w7xH9sM9qPGrQo=";
};
postPatch = ''
sed -i -e '/include.*CheckIncludeFile)/i include(CheckIncludeFiles)' \
cmake/ConkyPlatformChecks.cmake
'' + optionalString docsSupport ''
postPatch = optionalString docsSupport ''
substituteInPlace cmake/Conky.cmake --replace "# set(RELEASE true)" "set(RELEASE true)"
cp ${catch2}/include/catch2/catch.hpp tests/catch2/catch.hpp
'' + optionalString waylandSupport ''
substituteInPlace src/CMakeLists.txt \
--replace 'COMMAND ''${Wayland_SCANNER}' 'COMMAND wayland-scanner'
'';
env = {
@ -91,16 +92,21 @@ stdenv.mkDerivation rec {
NIX_LDFLAGS = "-lgcc_s";
};
nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ glib libXinerama ]
nativeBuildInputs = [ cmake pkg-config ]
++ optionals docsSupport [ docbook2x docbook_xsl docbook_xml_dtd_44 libxslt man less ]
++ optional waylandSupport wayland-scanner
++ optional luaImlib2Support toluapp
++ optional luaCairoSupport toluapp
;
buildInputs = [ glib libXinerama ]
++ optional ncursesSupport ncurses
++ optionals x11Support [ freetype xorg.libICE xorg.libX11 xorg.libXext xorg.libXft xorg.libSM ]
++ optionals waylandSupport [ pango wayland wayland-protocols ]
++ optional xdamageSupport libXdamage
++ optional imlib2Support imlib2
++ optional luaSupport lua
++ optionals luaImlib2Support [ toluapp imlib2 ]
++ optionals luaCairoSupport [ toluapp cairo ]
++ optional luaImlib2Support imlib2
++ optional luaCairoSupport cairo
++ optional wirelessSupport wirelesstools
++ optional curlSupport curl
++ optional rssSupport libxml2
@ -121,6 +127,7 @@ stdenv.mkDerivation rec {
++ optional (!ncursesSupport) "-DBUILD_NCURSES=OFF"
++ optional rssSupport "-DBUILD_RSS=ON"
++ optional (!x11Support) "-DBUILD_X11=OFF"
++ optional waylandSupport "-DBUILD_WAYLAND=ON"
++ optional xdamageSupport "-DBUILD_XDAMAGE=ON"
++ optional doubleBufferSupport "-DBUILD_XDBE=ON"
++ optional weatherMetarSupport "-DBUILD_WEATHER_METAR=ON"

8
pkgs/os-specific/linux/kernel/xanmod-kernels.nix
View File

@ -6,14 +6,14 @@ let
# NOTE: When updating these, please also take a look at the changes done to
# kernel config in the xanmod version commit
ltsVariant = {
version = "6.6.19";
hash = "sha256-DfoClySWV0vlDDRAJsujGj5ypnGr+HsVbszCYfi+2V0=";
version = "6.6.21";
hash = "sha256-DDkjrtKK7zIffVMuBtHvSWp0GtMA87YuOp8AhUw64+Y=";
variant = "lts";
};
mainVariant = {
version = "6.7.7";
hash = "sha256-Y+SvnvkFOGCxq+hGwpiiymNr1rYbNqppNA0d63TyUmo=";
version = "6.7.9";
hash = "sha256-/YoZTclMdJBQ8iwpfm/Ne/YLNQneN0hccy95o3fWvGM=";
variant = "main";
};

4
pkgs/os-specific/linux/r8125/default.nix
View File

@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
pname = "r8125";
# On update please verify (using `diff -r`) that the source matches the
# realtek version.
version = "9.011.01";
version = "9.012.03";
# This is a mirror. The original website[1] doesn't allow non-interactive
# downloads, instead emailing you a download link.
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
owner = "louistakepillz";
repo = "r8125";
rev = version;
sha256 = "sha256-QV1DKkWVtqcnuqgAdJnPpj6Z6ch+lw61zpouXKlyfqQ=";
sha256 = "sha256-+CrxvKB96QOcOo87McZOt/XUhriTtTV8jTQgpBG3ejs=";
};
hardeningDisable = [ "pic" ];

3
pkgs/os-specific/linux/usbutils/default.nix
View File

@ -27,8 +27,9 @@ stdenv.mkDerivation rec {
meta = with lib; {
homepage = "http://www.linux-usb.org/";
description = "Tools for working with USB devices, such as lsusb";
maintainers = with maintainers; [ ];
maintainers = with maintainers; [ cafkafk ];
license = licenses.gpl2Plus;
platforms = platforms.linux;
mainProgram = "lsusb";
};
}

6
pkgs/servers/mattermost/default.nix
View File

@ -12,13 +12,13 @@ buildGoModule rec {
# See https://docs.mattermost.com/upgrade/extended-support-release.html
# When a new ESR version is available (e.g. 8.1.x -> 9.5.x), update
# the version regex in passthru.updateScript as well.
version = "9.5.1";
version = "9.5.2";
src = fetchFromGitHub {
owner = "mattermost";
repo = "mattermost";
rev = "v${version}";
hash = "sha256-w+VF8VoS7oIcDlYS5kCFzSX4rgD9l1B99XBHeJDB6JI=";
hash = "sha256-NYP0mhON+TCvNTSx4I4hddFGF9TWtnMAwyJvX8sEdWU=";
};
# Needed because buildGoModule does not support go workspaces yet.
@ -34,7 +34,7 @@ buildGoModule rec {
webapp = fetchurl {
url = "https://releases.mattermost.com/${version}/mattermost-${version}-linux-amd64.tar.gz";
hash = "sha256-F32NWulKUhoyHPCmCCih6Hb9+W2iuF/Mxy9USrgp1pM=";
hash = "sha256-ogiowbNYHo9NTQLAg1OKXp8pV1Zn7kPcZR9ukaKvpKA=";
};
vendorHash = "sha256-TJCtgNf56A1U0EbV5gXjTro+YudVBRWiSZoBC3nJxnE=";

6
pkgs/servers/miniflux/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "miniflux";
version = "2.1.0";
version = "2.1.1";
src = fetchFromGitHub {
owner = "miniflux";
repo = "v2";
rev = "refs/tags/${version}";
hash = "sha256-c7xKgu3039gTmxdWXoYWuuYDD/oPv3/uYS3m8KRkhTk=";
hash = "sha256-vXSOHZt6Ov5g4fQBg0bubCfn76aaVrjw2b+LRebbV6s=";
};
vendorHash = "sha256-PuyWik0OA77gJipnuOyRgrCCQlDj9gTM/LDRBl6mBRo=";
vendorHash = "sha256-p31kwJZQMYff5Us6mXpPmxbPrEXyxU6Sipf4LKSG3wU=";
nativeBuildInputs = [ installShellFiles ];

6
pkgs/servers/minio/default.nix
View File

@ -21,16 +21,16 @@ let
in
buildGoModule rec {
pname = "minio";
version = "2024-02-26T09-33-48Z";
version = "2024-03-07T00-43-48Z";
src = fetchFromGitHub {
owner = "minio";
repo = "minio";
rev = "RELEASE.${version}";
hash = "sha256-V5Pmp36YA0u1Z2SBNdJZAHQuA3PgVKHmIJlDElhS24s=";
hash = "sha256-W82479M4Bgq1ERpiAR6Zc5YDr8vADOtQThV6lSlDuTs=";
};
vendorHash = "sha256-0EymK7jQhr+NJDg1zgWpcniV5zZ33Av6zpq0IDuWw7M=";
vendorHash = "sha256-VHokz58pSZd2Tt3hG8MgpeilEMFGjOZ/y6YKt9Fe5xw=";
doCheck = false;

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