diff --git a/nixos/modules/services/hardware/libinput.nix b/nixos/modules/services/hardware/libinput.nix index b8aa59035d33..d79055cb8d83 100644 --- a/nixos/modules/services/hardware/libinput.nix +++ b/nixos/modules/services/hardware/libinput.nix @@ -18,18 +18,21 @@ let cfg = config.services.libinput; }; accelProfile = mkOption { - type = types.enum [ "flat" "adaptive" ]; + type = types.enum [ "flat" "adaptive" "custom" ]; default = "adaptive"; example = "flat"; description = '' Sets the pointer acceleration profile to the given profile. - Permitted values are `adaptive`, `flat`. + Permitted values are `adaptive`, `flat`, `custom`. Not all devices support this option or all profiles. If a profile is unsupported, the default profile for this is used. `flat`: Pointer motion is accelerated by a constant (device-specific) factor, depending on the current speed. `adaptive`: Pointer acceleration depends on the input speed. This is the default profile for most devices. + `custom`: Allows the user to define a custom acceleration function. + To define custom functions use the accelPoints + and accelStep options. ''; }; @@ -37,7 +40,73 @@ let cfg = config.services.libinput; type = types.nullOr types.str; default = null; example = "-0.5"; - description = "Cursor acceleration (how fast speed increases from minSpeed to maxSpeed)."; + description = '' + Cursor acceleration (how fast speed increases from minSpeed to maxSpeed). + This only applies to the flat or adaptive profile. + ''; + }; + + accelPointsFallback = mkOption { + type = types.nullOr (types.listOf types.number); + default = null; + example = [ 0.0 1.0 2.4 2.5 ]; + description = '' + Sets the points of the fallback acceleration function. The value must be a list of + floating point non-negative numbers. This only applies to the custom profile. + ''; + }; + + accelPointsMotion = mkOption { + type = types.nullOr (types.listOf types.number); + default = null; + example = [ 0.0 1.0 2.4 2.5 ]; + description = '' + Sets the points of the (pointer) motion acceleration function. The value must be a + list of floating point non-negative numbers. This only applies to the custom profile. + ''; + }; + + accelPointsScroll = mkOption { + type = types.nullOr (types.listOf types.number); + default = null; + example = [ 0.0 1.0 2.4 2.5 ]; + description = '' + Sets the points of the scroll acceleration function. The value must be a list of + floating point non-negative numbers. This only applies to the custom profile. + ''; + }; + + accelStepFallback = mkOption { + type = types.nullOr types.number; + default = null; + example = 0.1; + description = '' + Sets the step between the points of the fallback acceleration function. When a step of + 0.0 is provided, libinput's Fallback acceleration function is used. This only applies + to the custom profile. + ''; + }; + + accelStepMotion = mkOption { + type = types.nullOr types.number; + default = null; + example = 0.1; + description = '' + Sets the step between the points of the (pointer) motion acceleration function. When a + step of 0.0 is provided, libinput's Fallback acceleration function is used. This only + applies to the custom profile. + ''; + }; + + accelStepScroll = mkOption { + type = types.nullOr types.number; + default = null; + example = 0.1; + description = '' + Sets the step between the points of the scroll acceleration function. When a step of + 0.0 is provided, libinput's Fallback acceleration function is used. This only applies + to the custom profile. + ''; }; buttonMapping = mkOption { @@ -203,6 +272,12 @@ let cfg = config.services.libinput; ${optionalString (cfg.${deviceType}.dev != null) ''MatchDevicePath "${cfg.${deviceType}.dev}"''} Option "AccelProfile" "${cfg.${deviceType}.accelProfile}" ${optionalString (cfg.${deviceType}.accelSpeed != null) ''Option "AccelSpeed" "${cfg.${deviceType}.accelSpeed}"''} + ${optionalString (cfg.${deviceType}.accelPointsFallback != null) ''Option "AccelPointsFallback" "${toString cfg.${deviceType}.accelPointsFallback}"''} + ${optionalString (cfg.${deviceType}.accelPointsMotion != null) ''Option "AccelPointsMotion" "${toString cfg.${deviceType}.accelPointsMotion}"''} + ${optionalString (cfg.${deviceType}.accelPointsScroll != null) ''Option "AccelPointsScroll" "${toString cfg.${deviceType}.accelPointsScroll}"''} + ${optionalString (cfg.${deviceType}.accelStepFallback != null) ''Option "AccelStepFallback" "${toString cfg.${deviceType}.accelStepFallback}"''} + ${optionalString (cfg.${deviceType}.accelStepMotion != null) ''Option "AccelStepMotion" "${toString cfg.${deviceType}.accelStepMotion}"''} + ${optionalString (cfg.${deviceType}.accelStepScroll != null) ''Option "AccelStepScroll" "${toString cfg.${deviceType}.accelStepScroll}"''} ${optionalString (cfg.${deviceType}.buttonMapping != null) ''Option "ButtonMapping" "${cfg.${deviceType}.buttonMapping}"''} ${optionalString (cfg.${deviceType}.calibrationMatrix != null) ''Option "CalibrationMatrix" "${cfg.${deviceType}.calibrationMatrix}"''} ${optionalString (cfg.${deviceType}.transformationMatrix != null) ''Option "TransformationMatrix" "${cfg.${deviceType}.transformationMatrix}"''} diff --git a/nixos/modules/system/boot/systemd/sysusers.nix b/nixos/modules/system/boot/systemd/sysusers.nix index 8d401436daa1..98f93f25c54d 100644 --- a/nixos/modules/system/boot/systemd/sysusers.nix +++ b/nixos/modules/system/boot/systemd/sysusers.nix @@ -82,7 +82,7 @@ in (username: opts: { assertion = (opts.password == opts.initialPassword || opts.password == null) && (opts.hashedPassword == opts.initialHashedPassword || opts.hashedPassword == null); - message = "${username} uses password or hashedPassword. systemd-sysupdate only supports initial passwords. It'll never update your passwords."; + message = "user '${username}' uses password or hashedPassword. systemd-sysupdate only supports initial passwords. It'll never update your passwords."; }) systemUsers; diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 0169827f7f3f..c053f5c669c1 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -1410,6 +1410,18 @@ final: prev: meta.homepage = "https://github.com/uga-rosa/ccc.nvim/"; }; + cellular-automaton-nvim = buildVimPlugin { + pname = "cellular-automaton.nvim"; + version = "2024-06-30"; + src = fetchFromGitHub { + owner = "Eandrju"; + repo = "cellular-automaton.nvim"; + rev = "11aea08aa084f9d523b0142c2cd9441b8ede09ed"; + sha256 = "0jvz2vnyhm6a2zyz93sh87n59vga2l016ijrfybfrlv44hhzp2ww"; + }; + meta.homepage = "https://github.com/Eandrju/cellular-automaton.nvim/"; + }; + chadtree = buildVimPlugin { pname = "chadtree"; version = "2024-07-25"; @@ -2874,6 +2886,18 @@ final: prev: meta.homepage = "https://github.com/scottmckendry/cyberdream.nvim/"; }; + darkearth-nvim = buildVimPlugin { + pname = "darkearth-nvim"; + version = "2024-07-19"; + src = fetchFromGitHub { + owner = "ptdewey"; + repo = "darkearth-nvim"; + rev = "d53cc2384d0a84889bd44361cee33019bac02c58"; + sha256 = "0m04m4mi8f7pzsx9d92xy20b4yw10gyqk4gmxdlr46y6byfwwlyj"; + }; + meta.homepage = "https://github.com/ptdewey/darkearth-nvim/"; + }; + dart-vim-plugin = buildVimPlugin { pname = "dart-vim-plugin"; version = "2024-07-02"; @@ -10135,6 +10159,18 @@ final: prev: meta.homepage = "https://github.com/kovisoft/slimv/"; }; + smart-open-nvim = buildVimPlugin { + pname = "smart-open.nvim"; + version = "2024-08-17"; + src = fetchFromGitHub { + owner = "danielfalk"; + repo = "smart-open.nvim"; + rev = "87626ee8748b9bba22093adec7bb58c63e7214f0"; + sha256 = "sha256-ro4qFdEAnE5u8wt7NyIc7OHobvjRotVX+LZ0P5as8EU="; + }; + meta.homepage = "https://github.com/danielfalk/smart-open.nvim/"; + }; + smart-splits-nvim = buildVimPlugin { pname = "smart-splits.nvim"; version = "2024-08-02"; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 5c34c77a3f91..159d5e1b38da 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -1477,6 +1477,10 @@ dependencies = [ self.skim ]; }; + smart-open-nvim = super.smart-open-nvim.overrideAttrs { + dependencies = with self; [ telescope-nvim sqlite-lua ]; + }; + sniprun = let version = "1.3.15"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index c28521a3a13c..9bd304b4d384 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -117,6 +117,7 @@ https://github.com/itchyny/calendar.vim/,, https://github.com/bkad/camelcasemotion/,, https://github.com/tyru/caw.vim/,, https://github.com/uga-rosa/ccc.nvim/,HEAD, +https://github.com/Eandrju/cellular-automaton.nvim/,HEAD, https://github.com/ms-jpq/chadtree/,HEAD, https://github.com/vim-scripts/changeColorScheme.vim/,, https://github.com/sudormrfbin/cheatsheet.nvim/,, @@ -239,6 +240,7 @@ https://github.com/FelikZ/ctrlp-py-matcher/,, https://github.com/amiorin/ctrlp-z/,, https://github.com/ctrlpvim/ctrlp.vim/,, https://github.com/scottmckendry/cyberdream.nvim/,, +https://github.com/ptdewey/darkearth-nvim/,HEAD, https://github.com/dart-lang/dart-vim-plugin/,, https://github.com/rizzatti/dash.vim/,HEAD, https://github.com/glepnir/dashboard-nvim/,, @@ -853,6 +855,7 @@ https://github.com/AndrewRadev/sideways.vim/,, https://github.com/lotabout/skim.vim/,, https://github.com/mopp/sky-color-clock.vim/,, https://github.com/kovisoft/slimv/,, +https://github.com/danielfalk/smart-open.nvim,0.2.x, https://github.com/mrjones2014/smart-splits.nvim/,, https://github.com/m4xshen/smartcolumn.nvim/,, https://github.com/gorkunov/smartpairs.vim/,, diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index dee4e0b12f8d..1e32a3dcc8d4 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -2846,13 +2846,14 @@ let mktplcRef = { name = "vscord"; publisher = "leonardssh"; - version = "5.2.12"; - hash = "sha256-WGDEizYG6UAqe1jnhvjfFouXDA9Yr5P+BjxPahAIsTE="; + version = "5.2.13"; + hash = "sha256-Jgm3ekXFLhylX7RM6tdfi+lRLrcl4UQGmRHbr27M59M="; }; meta = { description = "Highly customizable Discord Rich Presence extension for Visual Studio Code"; downloadPage = "https://marketplace.visualstudio.com/items?itemName=leonardssh.vscord"; homepage = "https://github.com/leonardssh/vscord"; + maintainers = [ lib.maintainers.ryand56 ]; license = lib.licenses.mit; }; }; diff --git a/pkgs/applications/emulators/wine/sources.nix b/pkgs/applications/emulators/wine/sources.nix index 8f311b6c3b83..329ff8cb31e3 100644 --- a/pkgs/applications/emulators/wine/sources.nix +++ b/pkgs/applications/emulators/wine/sources.nix @@ -69,9 +69,9 @@ in rec { unstable = fetchurl rec { # NOTE: Don't forget to change the hash for staging as well. - version = "9.15"; + version = "9.16"; url = "https://dl.winehq.org/wine/source/9.x/wine-${version}.tar.xz"; - hash = "sha256-ea3vQ23WjdvXAXhnCjwjqpjor9VUCsD0I0WJTEWLeN0="; + hash = "sha256-iQQq6MgLIzP4p9GId/xBecB9Y1erfyjMvabQbzwzDFA="; inherit (stable) patches; ## see http://wiki.winehq.org/Gecko @@ -88,9 +88,9 @@ in rec { ## see http://wiki.winehq.org/Mono mono = fetchurl rec { - version = "9.2.0"; + version = "9.3.0"; url = "https://dl.winehq.org/wine/wine-mono/${version}/wine-mono-${version}-x86.msi"; - hash = "sha256-/VgpJE2SmFuKQEdFrd21jDqbC7ttVMpMbq+G6kZnNfk="; + hash = "sha256-bKLArtCW/57CD69et2xrfX3oLZqIdax92fB5O/nD/TA="; }; updateScript = writeShellScript "update-wine-unstable" '' @@ -117,7 +117,7 @@ in rec { staging = fetchFromGitLab rec { # https://gitlab.winehq.org/wine/wine-staging inherit (unstable) version; - hash = "sha256-ss0B1MsDd37xTTFT86bEfVOt5mEAuHj14rTnGboO9i8="; + hash = "sha256-CUVUatw9SH/LwYwloGHsU8TFjAVQRhd3WBk4AP+2NH4="; domain = "gitlab.winehq.org"; owner = "wine"; repo = "wine-staging"; diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index d400dd1eba55..25e9388307b6 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -100,13 +100,13 @@ in stdenv.mkDerivation (finalAttrs: { pname = "blender"; - version = "4.2.0"; + version = "4.2.1"; srcs = [ (fetchzip { name = "source"; url = "https://download.blender.org/source/blender-${finalAttrs.version}.tar.xz"; - hash = "sha256-STG4IuEhkdA+sDPIpCAkSflyd3rSUZ9ZCS9PdB4vyTY="; + hash = "sha256-+Y4JbzeK+30fO8WdEmvjOeQjm094ofsUhRFXs9mkcxI="; }) (fetchgit { name = "assets"; @@ -427,7 +427,10 @@ stdenv.mkDerivation (finalAttrs: { ]; # the current apple sdk is too old (currently 11_0) and fails to build "metal" on x86_64-darwin broken = stdenv.hostPlatform.system == "x86_64-darwin"; - maintainers = with lib.maintainers; [ veprbl ]; + maintainers = with lib.maintainers; [ + amarshall + veprbl + ]; mainProgram = "blender"; }; }) diff --git a/pkgs/applications/misc/process-compose/default.nix b/pkgs/applications/misc/process-compose/default.nix index ebaa888baf9c..fe15d4b45e7b 100644 --- a/pkgs/applications/misc/process-compose/default.nix +++ b/pkgs/applications/misc/process-compose/default.nix @@ -8,13 +8,13 @@ let config-module = "github.com/f1bonacc1/process-compose/src/config"; in buildGoModule rec { pname = "process-compose"; - version = "1.24.0"; + version = "1.24.2"; src = fetchFromGitHub { owner = "F1bonacc1"; repo = pname; rev = "v${version}"; - hash = "sha256-CrirbzsPAoS6eNMCzQilWlLvZGm05ojkVYUiYVY/uHo="; + hash = "sha256-R+FkaCAI7Kkxd1UfdmeYo9BEUN0HUGZf2UDKxEvlTlQ="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; diff --git a/pkgs/applications/terminal-emulators/rio/default.nix b/pkgs/applications/terminal-emulators/rio/default.nix index 879ed6facd20..64f98b3ddcd9 100644 --- a/pkgs/applications/terminal-emulators/rio/default.nix +++ b/pkgs/applications/terminal-emulators/rio/default.nix @@ -55,16 +55,16 @@ let in rustPlatform.buildRustPackage rec { pname = "rio"; - version = "0.1.7"; + version = "0.1.8"; src = fetchFromGitHub { owner = "raphamorim"; repo = "rio"; rev = "refs/tags/v${version}"; - hash = "sha256-3isj4FvzJpheUi12oQRNBvOxR8daL/J4RUOGgYLeBXQ="; + hash = "sha256-NLvCLyIts3NoSqbR9PIhXj3GCeURrBXXv/zVgZecfNQ="; }; - cargoHash = "sha256-T+lXgNsMmq6cvsNe96R3F13SbboRAdd11UHumksqx4A="; + cargoHash = "sha256-TvNmTI3At2ezsdEOd5mAc6uUQXgGP47d0AMVVUUJr/A="; nativeBuildInputs = [ ncurses diff --git a/pkgs/by-name/co/cowsay/package.nix b/pkgs/by-name/co/cowsay/package.nix index 4e277a0b64a0..98110ac4c1bc 100644 --- a/pkgs/by-name/co/cowsay/package.nix +++ b/pkgs/by-name/co/cowsay/package.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "cowsay"; - version = "3.8.2"; + version = "3.8.3"; outputs = [ "out" @@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "cowsay-org"; repo = "cowsay"; rev = "v${finalAttrs.version}"; - hash = "sha256-IvodIoPrXI0D9pB95JPUBAIfxxnGDWl30P+WRf8VXIw="; + hash = "sha256-Bca+/a9jXsNnuBeYEjjtvZ1LsMMraLKiCn04CiS+uXU="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/de/deploy-rs/package.nix b/pkgs/by-name/de/deploy-rs/package.nix new file mode 100644 index 000000000000..9830785e6a30 --- /dev/null +++ b/pkgs/by-name/de/deploy-rs/package.nix @@ -0,0 +1,34 @@ +{ + lib, + stdenv, + fetchFromGitHub, + rustPlatform, + darwin, +}: + +rustPlatform.buildRustPackage { + pname = "deploy-rs"; + version = "0-unstable-2024-06-12"; + + src = fetchFromGitHub { + owner = "serokell"; + repo = "deploy-rs"; + rev = "3867348fa92bc892eba5d9ddb2d7a97b9e127a8a"; + hash = "sha256-FaGrf7qwZ99ehPJCAwgvNY5sLCqQ3GDiE/6uLhxxwSY="; + }; + + cargoHash = "sha256-lsW810bktMzHZIbuN3pz9N+IUcjNtE5J2AuB/G6pGWI="; + + buildInputs = lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.CoreServices + darwin.apple_sdk.frameworks.SystemConfiguration + ]; + + meta = { + description = "Multi-profile Nix-flake deploy tool"; + homepage = "https://github.com/serokell/deploy-rs"; + license = lib.licenses.mpl20; + maintainers = with lib.maintainers; [ teutat3s ]; + mainProgram = "deploy"; + }; +} diff --git a/pkgs/by-name/gl/glide-media-player/package.nix b/pkgs/by-name/gl/glide-media-player/package.nix index a4ea3311444f..eca436d68591 100644 --- a/pkgs/by-name/gl/glide-media-player/package.nix +++ b/pkgs/by-name/gl/glide-media-player/package.nix @@ -17,26 +17,26 @@ stdenv.mkDerivation rec { pname = "glide-media-player"; - version = "0.6.3"; + version = "0.6.5"; src = fetchFromGitHub { owner = "philn"; repo = "glide"; rev = version; - hash = "sha256-rWWMMuA41uFWazIJBVLxzaCrR5X5tI4x+GXXYkfeqz8="; + hash = "sha256-gmBXUj6LxC7VDH/ni8neYivysagqcbI/UCUq9Ly3D24="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-Kvdbo5tkhwsah9W7Y5zqpoA3bVHfmjGj7Cjsqxkljls="; + hash = "sha256-u41H746/nPX2PmpyweUp4Y9k+XIruazgMdU6B4ig708="; }; postPatch = '' substituteInPlace scripts/meson_post_install.py \ --replace-warn "gtk-update-icon-cache" "gtk4-update-icon-cache" - substituteInPlace data/net.baseart.Glide.desktop \ - --replace-warn "Icon=net.baseart.Glide.svg" "Icon=net.baseart.Glide" + substituteInPlace data/net.base_art.Glide.desktop \ + --replace-warn "Icon=net.base_art.Glide.svg" "Icon=net.baseart.Glide" patchShebangs --build \ scripts/meson_post_install.py \ build-aux/cargo-build.py diff --git a/pkgs/by-name/hy/hyprland/asahi-fix.patch b/pkgs/by-name/hy/hyprland/asahi-fix.patch new file mode 100644 index 000000000000..80791045e285 --- /dev/null +++ b/pkgs/by-name/hy/hyprland/asahi-fix.patch @@ -0,0 +1,15 @@ +diff --git a/src/protocols/LinuxDMABUF.cpp b/src/protocols/LinuxDMABUF.cpp +index 0fbf832e..c6077114 100644 +--- a/src/protocols/LinuxDMABUF.cpp ++++ b/src/protocols/LinuxDMABUF.cpp +@@ -492,9 +492,8 @@ CLinuxDMABufV1Protocol::CLinuxDMABufV1Protocol(const wl_interface* iface, const + return; + } + } else { +- protoLog(ERR, "DRM device {} has no render node, disabling linux dmabuf", device->nodes[DRM_NODE_PRIMARY] ? device->nodes[DRM_NODE_PRIMARY] : "null"); ++ protoLog(ERR, "DRM device {} has no render node, disabling linux dmabuf checks", device->nodes[DRM_NODE_PRIMARY] ? device->nodes[DRM_NODE_PRIMARY] : "null"); + drmFreeDevice(&device); +- removeGlobal(); + } + }); + } diff --git a/pkgs/by-name/hy/hyprland/package.nix b/pkgs/by-name/hy/hyprland/package.nix index 9b1a30eaa303..9d3fbdd0889d 100644 --- a/pkgs/by-name/hy/hyprland/package.nix +++ b/pkgs/by-name/hy/hyprland/package.nix @@ -77,6 +77,10 @@ stdenv.mkDerivation (finalAttrs: { }; patches = [ + # Fixes broken OpenGL applications on Apple silicon (Asahi Linux) + # Based on commit https://github.com/hyprwm/Hyprland/commit/279ec1c291021479b050c83a0435ac7076c1aee0 + ./asahi-fix.patch + # https://github.com/hyprwm/Hyprland/pull/7467 (fetchpatch { url = "https://github.com/hyprwm/Hyprland/commit/a437e44a6af8e8f42966ffe3a26c1d562fce6b33.diff"; diff --git a/pkgs/by-name/ll/llama-cpp/package.nix b/pkgs/by-name/ll/llama-cpp/package.nix index bb651b3e4a27..06656848d47b 100644 --- a/pkgs/by-name/ll/llama-cpp/package.nix +++ b/pkgs/by-name/ll/llama-cpp/package.nix @@ -69,13 +69,13 @@ let in effectiveStdenv.mkDerivation (finalAttrs: { pname = "llama-cpp"; - version = "3565"; + version = "3620"; src = fetchFromGitHub { owner = "ggerganov"; repo = "llama.cpp"; rev = "refs/tags/b${finalAttrs.version}"; - hash = "sha256-eAsChIG30Oj5aFQyFDtyWqqT2PTgmdJ2jSrsi2UH+Gc="; + hash = "sha256-jZyMDNEppMxS+qinqJMU0VfjowzYrvCp5Mn0ub9x6NE="; leaveDotGit = true; postFetch = '' git -C "$out" rev-parse --short HEAD > $out/COMMIT diff --git a/pkgs/by-name/ma/marge-bot/package.nix b/pkgs/by-name/ma/marge-bot/package.nix index f5946f4b7ed1..efa387042406 100644 --- a/pkgs/by-name/ma/marge-bot/package.nix +++ b/pkgs/by-name/ma/marge-bot/package.nix @@ -35,6 +35,9 @@ python3.pkgs.buildPythonApplication rec { # test broken when run under Nix: # "unittest.mock.InvalidSpecError: Cannot spec a Mock object." "test_get_mr_ci_status" + # broken because of an incorrect assertion: + # "AttributeError: 'has_calls' is not a valid assertion." + "test_reapprove" ]; disabledTestPaths = [ # test errors due to API mismatch in test setup: diff --git a/pkgs/by-name/n8/n8n/package.nix b/pkgs/by-name/n8/n8n/package.nix index f25979352c47..11f59068bd55 100644 --- a/pkgs/by-name/n8/n8n/package.nix +++ b/pkgs/by-name/n8/n8n/package.nix @@ -13,22 +13,23 @@ libmongocrypt, postgresql, makeWrapper, + nix-update-script, }: stdenv.mkDerivation (finalAttrs: { pname = "n8n"; - version = "1.48.3"; + version = "1.55.3"; src = fetchFromGitHub { owner = "n8n-io"; repo = "n8n"; rev = "n8n@${finalAttrs.version}"; - hash = "sha256-aCMbii5+iJ7m4P6Krr1/pcoH6fBsrFLtSjCx9DBYOeg="; + hash = "sha256-SgDw0je16Qf0ohzrVUjJM6FFovWxM2mvZjvfKkEESos="; }; pnpmDeps = pnpm.fetchDeps { inherit (finalAttrs) pname version src; - hash = "sha256-n1U5ftbB7BbiDIkZMVPG2ieoRBlJ+nPYFT3fNJRRTCI="; + hash = "sha256-KvSsWf1EHCQ46M4Z4wqyYb4mW9y9kNwB9e090YC1ZWs="; }; nativeBuildInputs = [ @@ -59,6 +60,16 @@ stdenv.mkDerivation (finalAttrs: { runHook postBuild ''; + preInstall = '' + echo "Removing non-deterministic files" + + rm -r $(find -type d -name .turbo) + rm node_modules/.modules.yaml + rm packages/nodes-base/dist/types/nodes.json + + echo "Removed non-deterministic files" + ''; + installPhase = '' runHook preInstall @@ -71,11 +82,9 @@ stdenv.mkDerivation (finalAttrs: { runHook postInstall ''; - # makes libmongocrypt bindings not look for static libraries in completely wrong places - BUILD_TYPE = "dynamic"; - passthru = { tests = nixosTests.n8n; + updateScript = nix-update-script { }; }; dontStrip = true; diff --git a/pkgs/by-name/rp/rpcs3/package.nix b/pkgs/by-name/rp/rpcs3/package.nix index a485423ad1fb..952ef7386568 100644 --- a/pkgs/by-name/rp/rpcs3/package.nix +++ b/pkgs/by-name/rp/rpcs3/package.nix @@ -33,10 +33,10 @@ let # Keep these separate so the update script can regex them - rpcs3GitVersion = "16833-981a1c56f"; - rpcs3Version = "0.0.32-16833-981a1c56f"; - rpcs3Revision = "981a1c56fbfb6056e5496bba9b8678a9dc755405"; - rpcs3Hash = "sha256-yRJ7RBRWm/HcdT/lw4t5AElsxujxFk0bA/keURCyQac="; + rpcs3GitVersion = "16857-1c16ada67"; + rpcs3Version = "0.0.32-16857-1c16ada67"; + rpcs3Revision = "1c16ada670bb396e98b33ec4510c1b3efb534724"; + rpcs3Hash = "sha256-uEk7svLCE/jsiyg6NnINZcqltE8QS9gXOEXpWZfbDF8="; inherit (qt6Packages) qtbase qtmultimedia wrapQtAppsHook qtwayland; in diff --git a/pkgs/by-name/si/simdutf/package.nix b/pkgs/by-name/si/simdutf/package.nix index e64b70155a8e..42ee43f22ae3 100644 --- a/pkgs/by-name/si/simdutf/package.nix +++ b/pkgs/by-name/si/simdutf/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "simdutf"; - version = "5.3.7"; + version = "5.4.15"; src = fetchFromGitHub { owner = "simdutf"; repo = "simdutf"; rev = "v${finalAttrs.version}"; - hash = "sha256-n99lt0OYK6OyLArdgPRabQ80ohQgHklpt9saDzKhvJw="; + hash = "sha256-oIrrI0Z5x1AvT9y0Ldg8zrkFJj1PZtebhJaL2UtEoB8="; }; # Fix build on darwin diff --git a/pkgs/by-name/we/werf/package.nix b/pkgs/by-name/we/werf/package.nix index 8ecaf0bd9891..711688f93914 100644 --- a/pkgs/by-name/we/werf/package.nix +++ b/pkgs/by-name/we/werf/package.nix @@ -11,13 +11,13 @@ buildGoModule rec { pname = "werf"; - version = "2.10.3"; + version = "2.10.4"; src = fetchFromGitHub { owner = "werf"; repo = "werf"; rev = "v${version}"; - hash = "sha256-/rgM6QQAQDkxYCOuRT3lbB/ojNGZnergCB5C+7Rn8SY="; + hash = "sha256-1PpnUTlxjUu7jptpd4U7MRKJfRM8WTeMSgbNcQJeZlM="; }; vendorHash = "sha256-OR2nIR2q3iRfaSQSQRKn+jbygETx2+WmkOIjOCIB9O8="; diff --git a/pkgs/by-name/xe/xeol/package.nix b/pkgs/by-name/xe/xeol/package.nix index 6f3d17f3fce6..7a61d509a924 100644 --- a/pkgs/by-name/xe/xeol/package.nix +++ b/pkgs/by-name/xe/xeol/package.nix @@ -6,16 +6,18 @@ buildGoModule rec { pname = "xeol"; - version = "0.9.15"; + version = "0.10.0"; src = fetchFromGitHub { owner = "xeol-io"; repo = "xeol"; rev = "refs/tags/v${version}"; - hash = "sha256-/DWBDc8m5XYM5UBX5/GWuPRR3YktRar/LbENx2d5bc4="; + hash = "sha256-5QlHfchVRFNpU/sBTS9AWOENU86jBatF6KI97NoJa50="; }; - vendorHash = "sha256-9zDzwiVEVsfgVzSrouNtLYpjumoWGlfSDpGWbj+zCGQ="; + vendorHash = "sha256-MLNUmJOpgKkIe5NUWYMA5avVvt6QLit0i4hpoaadcrs="; + + proxyVendor = true; subPackages = [ "cmd/xeol/" ]; @@ -35,6 +37,5 @@ buildGoModule rec { license = licenses.asl20; maintainers = with maintainers; [ fab ]; mainProgram = "xeol"; - platforms = platforms.linux; }; } diff --git a/pkgs/data/fonts/iosevka/default.nix b/pkgs/data/fonts/iosevka/default.nix index b2c11344cb14..f7547715abc9 100644 --- a/pkgs/data/fonts/iosevka/default.nix +++ b/pkgs/data/fonts/iosevka/default.nix @@ -55,16 +55,16 @@ assert (extraParameters != null) -> set != null; buildNpmPackage rec { pname = "Iosevka${toString set}"; - version = "31.3.0"; + version = "31.4.0"; src = fetchFromGitHub { owner = "be5invis"; repo = "iosevka"; rev = "v${version}"; - hash = "sha256-WrRxVrBJeyUwv0/DYTIHLi52+k2PilC7ay0tc5yq3Pw="; + hash = "sha256-qcxsuDk7hcVFsHB/Uj013gTOp9IGfp5cF1BLVbmH9AA="; }; - npmDepsHash = "sha256-xw0GA1aIA/J5hfLQBSE+GJzXfbfWQI2k2pYdenlM9NY="; + npmDepsHash = "sha256-bhj5q3HEtSdB5LA6IhBCo4XJwc6a3CUrHaV+d1vcj+I="; nativeBuildInputs = [ remarshal diff --git a/pkgs/desktops/deepin/apps/deepin-album/default.nix b/pkgs/desktops/deepin/apps/deepin-album/default.nix index 4cca3377492c..ed1edae06321 100644 --- a/pkgs/desktops/deepin/apps/deepin-album/default.nix +++ b/pkgs/desktops/deepin/apps/deepin-album/default.nix @@ -1,21 +1,22 @@ -{ stdenv -, lib -, fetchFromGitHub -, cmake -, pkg-config -, qttools -, wrapQtAppsHook -, dtkwidget -, dtkdeclarative -, qt5integration -, qt5platform-plugins -, qtbase -, qtsvg -, udisks2-qt5 -, gio-qt -, freeimage -, ffmpeg -, ffmpegthumbnailer +{ + stdenv, + lib, + fetchFromGitHub, + cmake, + pkg-config, + qttools, + wrapQtAppsHook, + dtkwidget, + dtkdeclarative, + qt5integration, + qt5platform-plugins, + qtbase, + qtsvg, + udisks2-qt5, + gio-qt, + freeimage, + ffmpeg, + ffmpegthumbnailer, }: stdenv.mkDerivation rec { diff --git a/pkgs/desktops/deepin/apps/deepin-calculator/default.nix b/pkgs/desktops/deepin/apps/deepin-calculator/default.nix index 6565e99401ce..631e42407875 100644 --- a/pkgs/desktops/deepin/apps/deepin-calculator/default.nix +++ b/pkgs/desktops/deepin/apps/deepin-calculator/default.nix @@ -1,17 +1,18 @@ -{ stdenv -, lib -, fetchFromGitHub -, dtkwidget -, qt5integration -, qt5platform-plugins -, qtbase -, qtsvg -, dde-qt-dbus-factory -, cmake -, qttools -, pkg-config -, wrapQtAppsHook -, gtest +{ + stdenv, + lib, + fetchFromGitHub, + dtkwidget, + qt5integration, + qt5platform-plugins, + qtbase, + qtsvg, + dde-qt-dbus-factory, + cmake, + qttools, + pkg-config, + wrapQtAppsHook, + gtest, }: stdenv.mkDerivation rec { diff --git a/pkgs/desktops/deepin/apps/deepin-camera/default.nix b/pkgs/desktops/deepin/apps/deepin-camera/default.nix index d62e8a6c91f1..19bca29ba5b2 100644 --- a/pkgs/desktops/deepin/apps/deepin-camera/default.nix +++ b/pkgs/desktops/deepin/apps/deepin-camera/default.nix @@ -1,37 +1,38 @@ -{ stdenv -, lib -, fetchFromGitHub -, cmake -, pkg-config -, qttools -, wrapQtAppsHook -, dtkwidget -, wayland -, dwayland -, qt5integration -, qt5platform-plugins -, image-editor -, qtbase -, qtmultimedia -, ffmpeg -, ffmpegthumbnailer -, libusb1 -, libpciaccess -, portaudio -, libv4l -, gst_all_1 -, systemd +{ + stdenv, + lib, + fetchFromGitHub, + cmake, + pkg-config, + qttools, + wrapQtAppsHook, + dtkwidget, + wayland, + dwayland, + qt5integration, + qt5platform-plugins, + image-editor, + qtbase, + qtmultimedia, + ffmpeg, + ffmpegthumbnailer, + libusb1, + libpciaccess, + portaudio, + libv4l, + gst_all_1, + systemd, }: stdenv.mkDerivation rec { pname = "deepin-camera"; - version = "unstable-2023-09-26"; + version = "6.0.5"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; - rev = "8ad3b6ad2a4f5f0b22a216496a0187a69a1e1bcc"; - hash = "sha256-/8ddplHJzeu7lrRzN66KhJGkFou4FcXc+BzYFK5YVeE="; + rev = version; + hash = "sha256-3q8yV8GpCPKW780YpCn+xLeFBGJFoAMmKSFCAH9OXoE="; }; # QLibrary and dlopen work with LD_LIBRARY_PATH @@ -53,26 +54,27 @@ stdenv.mkDerivation rec { wrapQtAppsHook ]; - buildInputs = [ - dtkwidget - wayland - dwayland - qt5integration - qt5platform-plugins - image-editor - qtbase - qtmultimedia - ffmpeg - ffmpegthumbnailer - libusb1 - libpciaccess - portaudio - libv4l - ] ++ (with gst_all_1 ; [ - gstreamer - gst-plugins-base - gst-plugins-good - ]); + buildInputs = + [ + dtkwidget + wayland + dwayland + qt5integration + qt5platform-plugins + image-editor + qtbase + qtmultimedia + ffmpeg + ffmpegthumbnailer + libusb1 + libpciaccess + portaudio + libv4l + ] + ++ (with gst_all_1; [ + gstreamer + gst-plugins-base + ]); cmakeFlags = [ "-DVERSION=${version}" ]; @@ -84,18 +86,29 @@ stdenv.mkDerivation rec { ]; qtWrapperArgs = [ - "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ ffmpeg ffmpegthumbnailer gst_all_1.gstreamer gst_all_1.gst-plugins-base libusb1 libv4l portaudio systemd ]}" + "--prefix LD_LIBRARY_PATH : ${ + lib.makeLibraryPath [ + ffmpeg + ffmpegthumbnailer + gst_all_1.gstreamer + gst_all_1.gst-plugins-base + libusb1 + libv4l + portaudio + systemd + ] + }" ]; preFixup = '' qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0") ''; - meta = with lib; { + meta = { description = "Tool to view camera, take photo and video"; homepage = "https://github.com/linuxdeepin/deepin-camera"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - maintainers = teams.deepin.members; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.linux; + maintainers = lib.teams.deepin.members; }; } diff --git a/pkgs/desktops/deepin/apps/deepin-compressor/default.nix b/pkgs/desktops/deepin/apps/deepin-compressor/default.nix index 07a92200cb21..29c538406c25 100644 --- a/pkgs/desktops/deepin/apps/deepin-compressor/default.nix +++ b/pkgs/desktops/deepin/apps/deepin-compressor/default.nix @@ -1,21 +1,22 @@ -{ stdenv -, lib -, fetchFromGitHub -, dtkwidget -, qt5integration -, qt5platform-plugins -, udisks2-qt5 -, cmake -, qtbase -, qttools -, pkg-config -, kcodecs -, karchive -, wrapQtAppsHook -, minizip -, libzip -, libuuid -, libarchive +{ + stdenv, + lib, + fetchFromGitHub, + dtkwidget, + qt5integration, + qt5platform-plugins, + udisks2-qt5, + cmake, + qtbase, + qttools, + pkg-config, + kcodecs, + karchive, + wrapQtAppsHook, + minizip, + libzip, + libuuid, + libarchive, }: stdenv.mkDerivation rec { @@ -62,9 +63,7 @@ stdenv.mkDerivation rec { ]; # qt5integration must be placed before qtsvg in QT_PLUGIN_PATH - qtWrapperArgs = [ - "--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}" - ]; + qtWrapperArgs = [ "--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}" ]; strictDeps = true; diff --git a/pkgs/desktops/deepin/apps/deepin-draw/default.nix b/pkgs/desktops/deepin/apps/deepin-draw/default.nix index 35de0414b47e..eaa6ee1a1cfe 100644 --- a/pkgs/desktops/deepin/apps/deepin-draw/default.nix +++ b/pkgs/desktops/deepin/apps/deepin-draw/default.nix @@ -1,15 +1,16 @@ -{ stdenv -, lib -, fetchFromGitHub -, cmake -, qttools -, pkg-config -, wrapQtAppsHook -, qtbase -, qtsvg -, dtkwidget -, qt5integration -, qt5platform-plugins +{ + stdenv, + lib, + fetchFromGitHub, + cmake, + qttools, + pkg-config, + wrapQtAppsHook, + qtbase, + qtsvg, + dtkwidget, + qt5integration, + qt5platform-plugins, }: stdenv.mkDerivation rec { diff --git a/pkgs/desktops/deepin/apps/deepin-editor/default.nix b/pkgs/desktops/deepin/apps/deepin-editor/default.nix index 7987c814b7aa..a3b1a15b6697 100644 --- a/pkgs/desktops/deepin/apps/deepin-editor/default.nix +++ b/pkgs/desktops/deepin/apps/deepin-editor/default.nix @@ -1,22 +1,23 @@ -{ stdenv -, lib -, fetchFromGitHub -, cmake -, pkg-config -, qttools -, wrapQtAppsHook -, dtkwidget -, qt5integration -, qt5platform-plugins -, qtbase -, qtsvg -, dde-qt-dbus-factory -, kcodecs -, syntax-highlighting -, libchardet -, libuchardet -, libiconv -, gitUpdater +{ + stdenv, + lib, + fetchFromGitHub, + cmake, + pkg-config, + qttools, + wrapQtAppsHook, + dtkwidget, + qt5integration, + qt5platform-plugins, + qtbase, + qtsvg, + dde-qt-dbus-factory, + kcodecs, + syntax-highlighting, + libchardet, + libuchardet, + libiconv, + gitUpdater, }: stdenv.mkDerivation rec { diff --git a/pkgs/desktops/deepin/apps/deepin-image-viewer/default.nix b/pkgs/desktops/deepin/apps/deepin-image-viewer/default.nix index 8cb889b05f44..31ce23124cd2 100644 --- a/pkgs/desktops/deepin/apps/deepin-image-viewer/default.nix +++ b/pkgs/desktops/deepin/apps/deepin-image-viewer/default.nix @@ -1,22 +1,23 @@ -{ stdenv -, lib -, fetchFromGitHub -, fetchpatch -, cmake -, pkg-config -, qttools -, wrapQtAppsHook -, qt5platform-plugins -, qtbase -, dtkwidget -, dtkdeclarative -, deepin-ocr-plugin-manager -, gio-qt -, udisks2-qt5 -, image-editor -, libraw -, libexif -, freeimage +{ + stdenv, + lib, + fetchFromGitHub, + fetchpatch, + cmake, + pkg-config, + qttools, + wrapQtAppsHook, + qt5platform-plugins, + qtbase, + dtkwidget, + dtkdeclarative, + deepin-ocr-plugin-manager, + gio-qt, + udisks2-qt5, + image-editor, + libraw, + libexif, + freeimage, }: stdenv.mkDerivation rec { diff --git a/pkgs/desktops/deepin/apps/deepin-movie-reborn/default.nix b/pkgs/desktops/deepin/apps/deepin-movie-reborn/default.nix index 494db983c2c1..cb87e366304e 100644 --- a/pkgs/desktops/deepin/apps/deepin-movie-reborn/default.nix +++ b/pkgs/desktops/deepin/apps/deepin-movie-reborn/default.nix @@ -1,33 +1,34 @@ -{ stdenv -, lib -, fetchFromGitHub -, cmake -, pkg-config -, wrapQtAppsHook -, qttools -, qtx11extras -, qtmultimedia -, dtkwidget -, qt5integration -, qt5platform-plugins -, qtmpris -, qtdbusextended -, gsettings-qt -, elfutils -, ffmpeg -, ffmpegthumbnailer -, mpv -, xorg -, pcre -, libdvdread -, libdvdnav -, libunwind -, libva -, zstd -, glib -, gst_all_1 -, gtest -, libpulseaudio +{ + stdenv, + lib, + fetchFromGitHub, + cmake, + pkg-config, + wrapQtAppsHook, + qttools, + qtx11extras, + qtmultimedia, + dtkwidget, + qt5integration, + qt5platform-plugins, + qtmpris, + qtdbusextended, + gsettings-qt, + elfutils, + ffmpeg, + ffmpegthumbnailer, + mpv, + xorg, + pcre, + libdvdread, + libdvdnav, + libunwind, + libva, + zstd, + glib, + gst_all_1, + gtest, + libpulseaudio, }: stdenv.mkDerivation rec { @@ -41,11 +42,12 @@ stdenv.mkDerivation rec { hash = "sha256-1UbrNufetedla8TMFPze1hP/R2cZN7SEYEtrK4/5/RQ="; }; - patches = [ - ./dont_use_libPath.diff - ]; + patches = [ ./dont_use_libPath.diff ]; - outputs = [ "out" "dev" ]; + outputs = [ + "out" + "dev" + ]; nativeBuildInputs = [ cmake @@ -54,34 +56,36 @@ stdenv.mkDerivation rec { wrapQtAppsHook ]; - buildInputs = [ - dtkwidget - qt5integration - qt5platform-plugins - qtx11extras - qtmultimedia - qtdbusextended - qtmpris - gsettings-qt - elfutils - ffmpeg - ffmpegthumbnailer - xorg.libXtst - xorg.libXdmcp - xorg.xcbproto - pcre.dev - libdvdread - libdvdnav - libunwind - libva - zstd - mpv - gtest - libpulseaudio - ] ++ (with gst_all_1; [ - gstreamer - gst-plugins-base - ]); + buildInputs = + [ + dtkwidget + qt5integration + qt5platform-plugins + qtx11extras + qtmultimedia + qtdbusextended + qtmpris + gsettings-qt + elfutils + ffmpeg + ffmpegthumbnailer + xorg.libXtst + xorg.libXdmcp + xorg.xcbproto + pcre.dev + libdvdread + libdvdnav + libunwind + libva + zstd + mpv + gtest + libpulseaudio + ] + ++ (with gst_all_1; [ + gstreamer + gst-plugins-base + ]); propagatedBuildInputs = [ qtmultimedia @@ -94,14 +98,20 @@ stdenv.mkDerivation rec { "-I${gst_all_1.gst-plugins-base.dev}/include/gstreamer-1.0" ]; - cmakeFlags = [ - "-DVERSION=${version}" - ]; + cmakeFlags = [ "-DVERSION=${version}" ]; strictDeps = true; qtWrapperArgs = [ - "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ mpv ffmpeg ffmpegthumbnailer gst_all_1.gstreamer gst_all_1.gst-plugins-base ]}" + "--prefix LD_LIBRARY_PATH : ${ + lib.makeLibraryPath [ + mpv + ffmpeg + ffmpegthumbnailer + gst_all_1.gstreamer + gst_all_1.gst-plugins-base + ] + }" ]; preFixup = '' diff --git a/pkgs/desktops/deepin/apps/deepin-music/default.nix b/pkgs/desktops/deepin/apps/deepin-music/default.nix index e5cbca387efb..41555483ccd0 100644 --- a/pkgs/desktops/deepin/apps/deepin-music/default.nix +++ b/pkgs/desktops/deepin/apps/deepin-music/default.nix @@ -1,24 +1,25 @@ -{ stdenv -, lib -, fetchFromGitHub -, cmake -, pkg-config -, qttools -, wrapQtAppsHook -, dtkwidget -, dtkdeclarative -, qt5integration -, qt5platform-plugins -, udisks2-qt5 -, qtmpris -, qtmultimedia -, kcodecs -, ffmpeg -, libvlc -, taglib -, SDL2 -, qtbase -, gst_all_1 +{ + stdenv, + lib, + fetchFromGitHub, + cmake, + pkg-config, + qttools, + wrapQtAppsHook, + dtkwidget, + dtkdeclarative, + qt5integration, + qt5platform-plugins, + udisks2-qt5, + qtmpris, + qtmultimedia, + kcodecs, + ffmpeg, + libvlc, + taglib, + SDL2, + qtbase, + gst_all_1, }: stdenv.mkDerivation rec { @@ -32,9 +33,7 @@ stdenv.mkDerivation rec { hash = "sha256-MLfkSO8ru8MKiwgiQ0mPO3zGlnIeSHPc0Op5jjzJ6PE="; }; - patches = [ - "${src}/patches/fix-library-path.patch" - ]; + patches = [ "${src}/patches/fix-library-path.patch" ]; nativeBuildInputs = [ cmake @@ -43,28 +42,28 @@ stdenv.mkDerivation rec { wrapQtAppsHook ]; - buildInputs = [ - dtkwidget - dtkdeclarative - qt5integration - qt5platform-plugins - udisks2-qt5 - qtmpris - qtmultimedia - kcodecs - ffmpeg - libvlc - taglib - SDL2 - ] ++ (with gst_all_1; [ - gstreamer - gst-plugins-base - gst-plugins-good - ]); + buildInputs = + [ + dtkwidget + dtkdeclarative + qt5integration + qt5platform-plugins + udisks2-qt5 + qtmpris + qtmultimedia + kcodecs + ffmpeg + libvlc + taglib + SDL2 + ] + ++ (with gst_all_1; [ + gstreamer + gst-plugins-base + gst-plugins-good + ]); - cmakeFlags = [ - "-DVERSION=${version}" - ]; + cmakeFlags = [ "-DVERSION=${version}" ]; env.NIX_CFLAGS_COMPILE = toString [ "-I${libvlc}/include/vlc/plugins" diff --git a/pkgs/desktops/deepin/apps/deepin-picker/default.nix b/pkgs/desktops/deepin/apps/deepin-picker/default.nix index 5ee86bf7b8e3..f74e2ae3513d 100644 --- a/pkgs/desktops/deepin/apps/deepin-picker/default.nix +++ b/pkgs/desktops/deepin/apps/deepin-picker/default.nix @@ -1,14 +1,15 @@ -{ stdenv -, lib -, fetchFromGitHub -, qmake -, qttools -, pkg-config -, wrapQtAppsHook -, dtkwidget -, qtbase -, qtsvg -, xorg +{ + stdenv, + lib, + fetchFromGitHub, + qmake, + qttools, + pkg-config, + wrapQtAppsHook, + dtkwidget, + qtbase, + qtsvg, + xorg, }: stdenv.mkDerivation rec { diff --git a/pkgs/desktops/deepin/apps/deepin-reader/default.nix b/pkgs/desktops/deepin/apps/deepin-reader/default.nix index d730114af4fc..2bae6bf3e778 100644 --- a/pkgs/desktops/deepin/apps/deepin-reader/default.nix +++ b/pkgs/desktops/deepin/apps/deepin-reader/default.nix @@ -1,23 +1,24 @@ -{ stdenv -, lib -, fetchFromGitHub -, qmake -, pkg-config -, qttools -, wrapQtAppsHook -, dtkwidget -, qt5integration -, qt5platform-plugins -, dde-qt-dbus-factory -, qtwebengine -, karchive -, poppler -, libchardet -, libspectre -, openjpeg -, djvulibre -, qtbase -, gtest +{ + stdenv, + lib, + fetchFromGitHub, + qmake, + pkg-config, + qttools, + wrapQtAppsHook, + dtkwidget, + qt5integration, + qt5platform-plugins, + dde-qt-dbus-factory, + qtwebengine, + karchive, + poppler, + libchardet, + libspectre, + openjpeg, + djvulibre, + qtbase, + gtest, }: stdenv.mkDerivation rec { @@ -63,9 +64,7 @@ stdenv.mkDerivation rec { gtest ]; - qmakeFlags = [ - "DEFINES+=VERSION=${version}" - ]; + qmakeFlags = [ "DEFINES+=VERSION=${version}" ]; meta = with lib; { description = "Simple memo software with texts and voice recordings"; diff --git a/pkgs/desktops/deepin/apps/deepin-screen-recorder/default.nix b/pkgs/desktops/deepin/apps/deepin-screen-recorder/default.nix index 3b775fb8bc64..6c2fffe63032 100644 --- a/pkgs/desktops/deepin/apps/deepin-screen-recorder/default.nix +++ b/pkgs/desktops/deepin/apps/deepin-screen-recorder/default.nix @@ -1,27 +1,28 @@ -{ stdenv -, lib -, fetchFromGitHub -, qmake -, pkg-config -, qttools -, wrapQtAppsHook -, dtkwidget -, qt5integration -, dde-qt-dbus-factory -, qtbase -, qtmultimedia -, qtx11extras -, image-editor -, gsettings-qt -, xorg -, libusb1 -, libv4l -, ffmpeg -, ffmpegthumbnailer -, portaudio -, kwayland -, udev -, gst_all_1 +{ + stdenv, + lib, + fetchFromGitHub, + qmake, + pkg-config, + qttools, + wrapQtAppsHook, + dtkwidget, + qt5integration, + dde-qt-dbus-factory, + qtbase, + qtmultimedia, + qtx11extras, + image-editor, + gsettings-qt, + xorg, + libusb1, + libv4l, + ffmpeg, + ffmpegthumbnailer, + portaudio, + kwayland, + udev, + gst_all_1, }: stdenv.mkDerivation rec { @@ -35,9 +36,7 @@ stdenv.mkDerivation rec { hash = "sha256-nE+axTUxWCcgrxQ5y2cjkVswW2rwv/We0m7XgB4shko="; }; - patches = [ - ./dont_use_libPath.diff - ]; + patches = [ ./dont_use_libPath.diff ]; # disable dock plugins, it's part of dde-shell now postPatch = '' @@ -57,34 +56,44 @@ stdenv.mkDerivation rec { wrapQtAppsHook ]; - buildInputs = [ - dtkwidget - dde-qt-dbus-factory - qtbase - qtmultimedia - qtx11extras - image-editor - gsettings-qt - xorg.libXdmcp - xorg.libXtst - xorg.libXcursor - libusb1 - libv4l - ffmpeg - ffmpegthumbnailer - portaudio - kwayland - udev - ] ++ (with gst_all_1; [ - gstreamer - gst-plugins-base - gst-plugins-good - ]); + buildInputs = + [ + dtkwidget + dde-qt-dbus-factory + qtbase + qtmultimedia + qtx11extras + image-editor + gsettings-qt + xorg.libXdmcp + xorg.libXtst + xorg.libXcursor + libusb1 + libv4l + ffmpeg + ffmpegthumbnailer + portaudio + kwayland + udev + ] + ++ (with gst_all_1; [ + gstreamer + gst-plugins-base + gst-plugins-good + ]); # qt5integration must be placed before qtsvg in QT_PLUGIN_PATH qtWrapperArgs = [ "--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}" - "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ udev gst_all_1.gstreamer libv4l ffmpeg ffmpegthumbnailer ]}" + "--prefix LD_LIBRARY_PATH : ${ + lib.makeLibraryPath [ + udev + gst_all_1.gstreamer + libv4l + ffmpeg + ffmpegthumbnailer + ] + }" ]; preFixup = '' diff --git a/pkgs/desktops/deepin/apps/deepin-screensaver/default.nix b/pkgs/desktops/deepin/apps/deepin-screensaver/default.nix index 5de3bb6f845e..6324cc4d7dd9 100644 --- a/pkgs/desktops/deepin/apps/deepin-screensaver/default.nix +++ b/pkgs/desktops/deepin/apps/deepin-screensaver/default.nix @@ -1,17 +1,18 @@ -{ stdenv -, lib -, fetchFromGitHub -, qmake -, qttools -, pkg-config -, wrapQtAppsHook -, qtbase -, qtx11extras -, qtdeclarative -, dtkwidget -, dde-qt-dbus-factory -, xorg -, xscreensaver +{ + stdenv, + lib, + fetchFromGitHub, + qmake, + qttools, + pkg-config, + wrapQtAppsHook, + qtbase, + qtx11extras, + qtdeclarative, + dtkwidget, + dde-qt-dbus-factory, + xorg, + xscreensaver, }: stdenv.mkDerivation rec { @@ -67,4 +68,3 @@ stdenv.mkDerivation rec { maintainers = teams.deepin.members; }; } - diff --git a/pkgs/desktops/deepin/apps/deepin-shortcut-viewer/default.nix b/pkgs/desktops/deepin/apps/deepin-shortcut-viewer/default.nix index 2a1f4cab4aa8..4542558e399e 100644 --- a/pkgs/desktops/deepin/apps/deepin-shortcut-viewer/default.nix +++ b/pkgs/desktops/deepin/apps/deepin-shortcut-viewer/default.nix @@ -1,14 +1,15 @@ -{ stdenv -, lib -, fetchFromGitHub -, dtkwidget -, qt5integration -, qt5platform-plugins -, qmake -, qtbase -, qttools -, pkg-config -, wrapQtAppsHook +{ + stdenv, + lib, + fetchFromGitHub, + dtkwidget, + qt5integration, + qt5platform-plugins, + qmake, + qtbase, + qttools, + pkg-config, + wrapQtAppsHook, }: stdenv.mkDerivation rec { @@ -50,4 +51,3 @@ stdenv.mkDerivation rec { maintainers = teams.deepin.members; }; } - diff --git a/pkgs/desktops/deepin/apps/deepin-system-monitor/default.nix b/pkgs/desktops/deepin/apps/deepin-system-monitor/default.nix index 5653aa9e147e..f37fb2dc6c25 100644 --- a/pkgs/desktops/deepin/apps/deepin-system-monitor/default.nix +++ b/pkgs/desktops/deepin/apps/deepin-system-monitor/default.nix @@ -1,29 +1,30 @@ -{ stdenv -, lib -, fetchFromGitHub -, cmake -, pkg-config -, qttools -, deepin-gettext-tools -, wrapQtAppsHook -, dtkwidget -, qt5integration -, qt5platform-plugins -, qtbase -, qtsvg -, qtx11extras -, dde-qt-dbus-factory -, dde-dock -, gsettings-qt -, polkit-qt -, procps -, libpcap -, libnl -, util-linux -, systemd -, polkit -, wayland -, dwayland +{ + stdenv, + lib, + fetchFromGitHub, + cmake, + pkg-config, + qttools, + deepin-gettext-tools, + wrapQtAppsHook, + dtkwidget, + qt5integration, + qt5platform-plugins, + qtbase, + qtsvg, + qtx11extras, + dde-qt-dbus-factory, + dde-dock, + gsettings-qt, + polkit-qt, + procps, + libpcap, + libnl, + util-linux, + systemd, + polkit, + wayland, + dwayland, }: stdenv.mkDerivation rec { @@ -82,9 +83,7 @@ stdenv.mkDerivation rec { dwayland ]; - cmakeFlags = [ - "-DVERSION=${version}" - ]; + cmakeFlags = [ "-DVERSION=${version}" ]; strictDeps = true; diff --git a/pkgs/desktops/deepin/apps/deepin-terminal/default.nix b/pkgs/desktops/deepin/apps/deepin-terminal/default.nix index 6a0e7b0ccb6e..1d5e0d390d9d 100644 --- a/pkgs/desktops/deepin/apps/deepin-terminal/default.nix +++ b/pkgs/desktops/deepin/apps/deepin-terminal/default.nix @@ -1,20 +1,21 @@ -{ stdenv -, lib -, fetchFromGitHub -, nixosTests -, dtkwidget -, qt5integration -, qt5platform-plugins -, cmake -, qtbase -, qtsvg -, qttools -, qtx11extras -, pkg-config -, wrapQtAppsHook -, libsecret -, chrpath -, lxqt +{ + stdenv, + lib, + fetchFromGitHub, + nixosTests, + dtkwidget, + qt5integration, + qt5platform-plugins, + cmake, + qtbase, + qtsvg, + qttools, + qtx11extras, + pkg-config, + wrapQtAppsHook, + libsecret, + chrpath, + lxqt, }: stdenv.mkDerivation rec { diff --git a/pkgs/desktops/deepin/apps/deepin-voice-note/default.nix b/pkgs/desktops/deepin/apps/deepin-voice-note/default.nix index 766d4962fc70..b102318c56ac 100644 --- a/pkgs/desktops/deepin/apps/deepin-voice-note/default.nix +++ b/pkgs/desktops/deepin/apps/deepin-voice-note/default.nix @@ -1,37 +1,37 @@ -{ stdenv -, lib -, fetchFromGitHub -, cmake -, pkg-config -, qttools -, wrapQtAppsHook -, qtbase -, dtkwidget -, qt5integration -, qt5platform-plugins -, qtsvg -, dde-qt-dbus-factory -, qtmultimedia -, qtwebengine -, libvlc -, gst_all_1 -, gtest +{ + stdenv, + lib, + fetchFromGitHub, + cmake, + pkg-config, + qttools, + wrapQtAppsHook, + qtbase, + dtkwidget, + qt5integration, + qt5platform-plugins, + qtsvg, + dde-qt-dbus-factory, + deepin-movie-reborn, + qtmultimedia, + qtwebengine, + libvlc, + gst_all_1, + gtest, }: stdenv.mkDerivation rec { pname = "deepin-voice-note"; - version = "6.0.15"; + version = "6.0.18"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - hash = "sha256-k6LFMs2/OQQyeGI5WXBGWkAAY4GeP8LaA8hTXFwbaCM="; + hash = "sha256-GbSYXwJoNfbg+31454GjMbXRqrtk2bSZJCk18ILfAn4="; }; - patches = [ - ./use_v23_dbus_interface.diff - ]; + patches = [ ./use_v23_dbus_interface.diff ]; postPatch = '' substituteInPlace CMakeLists.txt \ @@ -47,21 +47,23 @@ stdenv.mkDerivation rec { wrapQtAppsHook ]; - buildInputs = [ - qtbase - qtsvg - dtkwidget - qt5platform-plugins - dde-qt-dbus-factory - qtmultimedia - qtwebengine - libvlc - gtest - ] ++ (with gst_all_1; [ - gstreamer - gst-plugins-base - gst-plugins-good - ]); + buildInputs = + [ + qtbase + qtsvg + dtkwidget + qt5platform-plugins + dde-qt-dbus-factory + deepin-movie-reborn + qtmultimedia + qtwebengine + libvlc + gtest + ] + ++ (with gst_all_1; [ + gstreamer + gst-plugins-base + ]); strictDeps = true; @@ -70,18 +72,24 @@ stdenv.mkDerivation rec { # qt5integration must be placed before qtsvg in QT_PLUGIN_PATH qtWrapperArgs = [ "--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}" + "--prefix LD_LIBRARY_PATH : ${ + lib.makeLibraryPath [ + gst_all_1.gstreamer + gst_all_1.gst-plugins-base + ] + }" ]; preFixup = '' qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0") ''; - meta = with lib; { + meta = { description = "Simple memo software with texts and voice recordings"; mainProgram = "deepin-voice-note"; homepage = "https://github.com/linuxdeepin/deepin-voice-note"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - maintainers = teams.deepin.members; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.linux; + maintainers = lib.teams.deepin.members; }; } diff --git a/pkgs/desktops/deepin/artwork/dde-account-faces/default.nix b/pkgs/desktops/deepin/artwork/dde-account-faces/default.nix index b635b721a012..33dffba91c95 100644 --- a/pkgs/desktops/deepin/artwork/dde-account-faces/default.nix +++ b/pkgs/desktops/deepin/artwork/dde-account-faces/default.nix @@ -1,6 +1,7 @@ -{ stdenvNoCC -, lib -, fetchFromGitHub +{ + stdenvNoCC, + lib, + fetchFromGitHub, }: stdenvNoCC.mkDerivation rec { @@ -19,7 +20,10 @@ stdenvNoCC.mkDerivation rec { meta = with lib; { description = "Account faces of deepin desktop environment"; homepage = "https://github.com/linuxdeepin/dde-account-faces"; - license = with licenses; [ gpl3Plus cc0 ]; + license = with licenses; [ + gpl3Plus + cc0 + ]; platforms = platforms.linux; maintainers = teams.deepin.members; }; diff --git a/pkgs/desktops/deepin/artwork/deepin-desktop-theme/default.nix b/pkgs/desktops/deepin/artwork/deepin-desktop-theme/default.nix index 32109c4b6c0a..fbbd90703464 100644 --- a/pkgs/desktops/deepin/artwork/deepin-desktop-theme/default.nix +++ b/pkgs/desktops/deepin/artwork/deepin-desktop-theme/default.nix @@ -1,13 +1,14 @@ -{ stdenv -, lib -, fetchFromGitHub -, cmake -, gtk3 -, xcursorgen -, papirus-icon-theme -, breeze-icons -, hicolor-icon-theme -, deepin-icon-theme +{ + stdenv, + lib, + fetchFromGitHub, + cmake, + gtk3, + xcursorgen, + papirus-icon-theme, + breeze-icons, + hicolor-icon-theme, + deepin-icon-theme, }: stdenv.mkDerivation rec { @@ -47,7 +48,10 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Provides a variety of well-designed theme resources"; homepage = "https://github.com/linuxdeepin/deepin-desktop-theme"; - license = with licenses; [ gpl3Plus cc-by-sa-40 ]; + license = with licenses; [ + gpl3Plus + cc-by-sa-40 + ]; platforms = platforms.linux; maintainers = teams.deepin.members; }; diff --git a/pkgs/desktops/deepin/artwork/deepin-gtk-theme/default.nix b/pkgs/desktops/deepin/artwork/deepin-gtk-theme/default.nix index 80ec8c50449d..6405a95cd55d 100644 --- a/pkgs/desktops/deepin/artwork/deepin-gtk-theme/default.nix +++ b/pkgs/desktops/deepin/artwork/deepin-gtk-theme/default.nix @@ -1,7 +1,8 @@ -{ stdenvNoCC -, lib -, fetchFromGitHub -, gtk-engine-murrine +{ + stdenvNoCC, + lib, + fetchFromGitHub, + gtk-engine-murrine, }: stdenvNoCC.mkDerivation rec { @@ -15,9 +16,7 @@ stdenvNoCC.mkDerivation rec { hash = "sha256-2B2BtbPeg3cEbnEIgdGFzy8MjCMWlbP/Sq4jzG5cjmc="; }; - propagatedUserEnvPkgs = [ - gtk-engine-murrine - ]; + propagatedUserEnvPkgs = [ gtk-engine-murrine ]; makeFlags = [ "PREFIX=${placeholder "out"}" ]; diff --git a/pkgs/desktops/deepin/artwork/deepin-icon-theme/default.nix b/pkgs/desktops/deepin/artwork/deepin-icon-theme/default.nix index 0795b194ab3e..2ff8cb984351 100644 --- a/pkgs/desktops/deepin/artwork/deepin-icon-theme/default.nix +++ b/pkgs/desktops/deepin/artwork/deepin-icon-theme/default.nix @@ -1,9 +1,10 @@ -{ stdenvNoCC -, lib -, fetchFromGitHub -, gtk3 -, xcursorgen -, papirus-icon-theme +{ + stdenvNoCC, + lib, + fetchFromGitHub, + gtk3, + xcursorgen, + papirus-icon-theme, }: stdenvNoCC.mkDerivation rec { @@ -24,9 +25,7 @@ stdenvNoCC.mkDerivation rec { xcursorgen ]; - propagatedBuildInputs = [ - papirus-icon-theme - ]; + propagatedBuildInputs = [ papirus-icon-theme ]; dontDropIconThemeCache = true; diff --git a/pkgs/desktops/deepin/artwork/deepin-sound-theme/default.nix b/pkgs/desktops/deepin/artwork/deepin-sound-theme/default.nix index f779a77c3234..79e2f15716b1 100644 --- a/pkgs/desktops/deepin/artwork/deepin-sound-theme/default.nix +++ b/pkgs/desktops/deepin/artwork/deepin-sound-theme/default.nix @@ -1,6 +1,7 @@ -{ stdenvNoCC -, lib -, fetchFromGitHub +{ + stdenvNoCC, + lib, + fetchFromGitHub, }: stdenvNoCC.mkDerivation rec { diff --git a/pkgs/desktops/deepin/artwork/deepin-wallpapers/default.nix b/pkgs/desktops/deepin/artwork/deepin-wallpapers/default.nix index c0aa13f16a6d..c472244adf2a 100644 --- a/pkgs/desktops/deepin/artwork/deepin-wallpapers/default.nix +++ b/pkgs/desktops/deepin/artwork/deepin-wallpapers/default.nix @@ -1,7 +1,8 @@ -{ stdenv -, lib -, fetchFromGitHub -, dde-api +{ + stdenv, + lib, + fetchFromGitHub, + dde-api, }: stdenv.mkDerivation rec { @@ -36,7 +37,10 @@ stdenv.mkDerivation rec { meta = with lib; { description = "deepin-wallpapers provides wallpapers of dde"; homepage = "https://github.com/linuxdeepin/deepin-wallpapers"; - license = with licenses; [ gpl3Plus cc-by-sa-30 ]; + license = with licenses; [ + gpl3Plus + cc-by-sa-30 + ]; platforms = platforms.linux; maintainers = teams.deepin.members; }; diff --git a/pkgs/desktops/deepin/core/dde-app-services/default.nix b/pkgs/desktops/deepin/core/dde-app-services/default.nix index 64713d08b11f..fe8198ad6b9f 100644 --- a/pkgs/desktops/deepin/core/dde-app-services/default.nix +++ b/pkgs/desktops/deepin/core/dde-app-services/default.nix @@ -1,14 +1,15 @@ -{ stdenv -, lib -, fetchFromGitHub -, dtkwidget -, qt5integration -, qt5platform-plugins -, cmake -, wrapQtAppsHook -, qtbase -, qttools -, doxygen +{ + stdenv, + lib, + fetchFromGitHub, + dtkwidget, + qt5integration, + qt5platform-plugins, + cmake, + wrapQtAppsHook, + qtbase, + qttools, + doxygen, }: stdenv.mkDerivation rec { diff --git a/pkgs/desktops/deepin/core/dde-appearance/default.nix b/pkgs/desktops/deepin/core/dde-appearance/default.nix index 13a6ee3e7cf2..89315e2bd8a3 100644 --- a/pkgs/desktops/deepin/core/dde-appearance/default.nix +++ b/pkgs/desktops/deepin/core/dde-appearance/default.nix @@ -1,18 +1,19 @@ -{ stdenv -, lib -, fetchFromGitHub -, cmake -, pkg-config -, wrapQtAppsHook -, qtbase -, dtkgui -, gsettings-qt -, gtk3 -, kconfig -, kwindowsystem -, kglobalaccel -, xorg -, iconv +{ + stdenv, + lib, + fetchFromGitHub, + cmake, + pkg-config, + wrapQtAppsHook, + qtbase, + dtkgui, + gsettings-qt, + gtk3, + kconfig, + kwindowsystem, + kglobalaccel, + xorg, + iconv, }: stdenv.mkDerivation rec { diff --git a/pkgs/desktops/deepin/core/dde-application-manager/default.nix b/pkgs/desktops/deepin/core/dde-application-manager/default.nix index eaea04961e1f..73b412d7e6da 100644 --- a/pkgs/desktops/deepin/core/dde-application-manager/default.nix +++ b/pkgs/desktops/deepin/core/dde-application-manager/default.nix @@ -1,10 +1,11 @@ -{ stdenv -, lib -, fetchFromGitHub -, cmake -, pkg-config -, qt6Packages -, dtk6core +{ + stdenv, + lib, + fetchFromGitHub, + cmake, + pkg-config, + qt6Packages, + dtk6core, }: stdenv.mkDerivation rec { diff --git a/pkgs/desktops/deepin/core/dde-calendar/default.nix b/pkgs/desktops/deepin/core/dde-calendar/default.nix index 88235bbf08c5..6eecb85c1b60 100644 --- a/pkgs/desktops/deepin/core/dde-calendar/default.nix +++ b/pkgs/desktops/deepin/core/dde-calendar/default.nix @@ -1,19 +1,20 @@ -{ stdenv -, lib -, fetchFromGitHub -, cmake -, qttools -, pkg-config -, wrapQtAppsHook -, dtkwidget -, qt5integration -, qt5platform-plugins -, dde-qt-dbus-factory -, qtbase -, qtsvg -, libical -, sqlite -, runtimeShell +{ + stdenv, + lib, + fetchFromGitHub, + cmake, + qttools, + pkg-config, + wrapQtAppsHook, + dtkwidget, + qt5integration, + qt5platform-plugins, + dde-qt-dbus-factory, + qtbase, + qtsvg, + libical, + sqlite, + runtimeShell, }: stdenv.mkDerivation rec { @@ -27,9 +28,7 @@ stdenv.mkDerivation rec { hash = "sha256-08xkdiP0/haHY3jdHSoA1zXRxMi2t+qxLxbcRc7EO6Q="; }; - patches = [ - ./fix-wrapped-name-not-in-whitelist.diff - ]; + patches = [ ./fix-wrapped-name-not-in-whitelist.diff ]; postPatch = '' for file in $(grep -rl "/bin/bash"); do @@ -68,4 +67,3 @@ stdenv.mkDerivation rec { maintainers = teams.deepin.members; }; } - diff --git a/pkgs/desktops/deepin/core/dde-clipboard/default.nix b/pkgs/desktops/deepin/core/dde-clipboard/default.nix index 85eb71652963..7aecb9f3ba10 100644 --- a/pkgs/desktops/deepin/core/dde-clipboard/default.nix +++ b/pkgs/desktops/deepin/core/dde-clipboard/default.nix @@ -1,18 +1,19 @@ -{ stdenv -, lib -, fetchFromGitHub -, dtkwidget -, gio-qt -, cmake -, extra-cmake-modules -, qttools -, wayland -, kwayland -, dwayland -, pkg-config -, wrapQtAppsHook -, glibmm -, gtest +{ + stdenv, + lib, + fetchFromGitHub, + dtkwidget, + gio-qt, + cmake, + extra-cmake-modules, + qttools, + wayland, + kwayland, + dwayland, + pkg-config, + wrapQtAppsHook, + glibmm, + gtest, }: stdenv.mkDerivation rec { @@ -44,9 +45,7 @@ stdenv.mkDerivation rec { gtest ]; - cmakeFlags = [ - "-DSYSTEMD_USER_UNIT_DIR=${placeholder "out"}/lib/systemd/user" - ]; + cmakeFlags = [ "-DSYSTEMD_USER_UNIT_DIR=${placeholder "out"}/lib/systemd/user" ]; meta = with lib; { description = "DDE optional clipboard manager componment"; diff --git a/pkgs/desktops/deepin/core/dde-control-center/default.nix b/pkgs/desktops/deepin/core/dde-control-center/default.nix index 64bc81d8b9ad..fc8e0bfd075f 100644 --- a/pkgs/desktops/deepin/core/dde-control-center/default.nix +++ b/pkgs/desktops/deepin/core/dde-control-center/default.nix @@ -1,25 +1,26 @@ -{ stdenv -, lib -, fetchFromGitHub -, cmake -, pkg-config -, qttools -, doxygen -, wrapQtAppsHook -, wrapGAppsHook3 -, dtkwidget -, qt5integration -, qt5platform-plugins -, deepin-pw-check -, qtbase -, qtx11extras -, qtmultimedia -, polkit-qt -, libxcrypt -, librsvg -, gtest -, runtimeShell -, dbus +{ + stdenv, + lib, + fetchFromGitHub, + cmake, + pkg-config, + qttools, + doxygen, + wrapQtAppsHook, + wrapGAppsHook3, + dtkwidget, + qt5integration, + qt5platform-plugins, + deepin-pw-check, + qtbase, + qtx11extras, + qtmultimedia, + polkit-qt, + libxcrypt, + librsvg, + gtest, + runtimeShell, + dbus, }: stdenv.mkDerivation rec { @@ -89,7 +90,10 @@ stdenv.mkDerivation rec { qtWrapperArgs+=("''${gappsWrapperArgs[@]}") ''; - outputs = [ "out" "dev" ]; + outputs = [ + "out" + "dev" + ]; meta = with lib; { description = "Control panel of Deepin Desktop Environment"; diff --git a/pkgs/desktops/deepin/core/dde-dock/default.nix b/pkgs/desktops/deepin/core/dde-dock/default.nix index 61ef89a9a4dc..db3a4a052334 100644 --- a/pkgs/desktops/deepin/core/dde-dock/default.nix +++ b/pkgs/desktops/deepin/core/dde-dock/default.nix @@ -1,21 +1,22 @@ -{ stdenv -, lib -, fetchFromGitHub -, cmake -, extra-cmake-modules -, qttools -, pkg-config -, wrapQtAppsHook -, wrapGAppsHook3 -, qtbase -, dtkwidget -, qt5integration -, qt5platform-plugins -, dwayland -, qtx11extras -, gsettings-qt -, libdbusmenu -, xorg +{ + stdenv, + lib, + fetchFromGitHub, + cmake, + extra-cmake-modules, + qttools, + pkg-config, + wrapQtAppsHook, + wrapGAppsHook3, + qtbase, + dtkwidget, + qt5integration, + qt5platform-plugins, + dwayland, + qtx11extras, + gsettings-qt, + libdbusmenu, + xorg, }: stdenv.mkDerivation rec { @@ -39,7 +40,7 @@ stdenv.mkDerivation rec { for file in $(grep -rl "/usr/lib/deepin-daemon"); do substituteInPlace $file --replace "/usr/lib/deepin-daemon" "/run/current-system/sw/lib/deepin-daemon" done - ''; + ''; nativeBuildInputs = [ cmake @@ -65,14 +66,15 @@ stdenv.mkDerivation rec { xorg.libXres ]; - outputs = [ "out" "dev" ]; + outputs = [ + "out" + "dev" + ]; cmakeFlags = [ "-DVERSION=${version}" ]; # qt5integration must be placed before qtsvg in QT_PLUGIN_PATH - qtWrapperArgs = [ - "--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}" - ]; + qtWrapperArgs = [ "--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}" ]; preFixup = '' qtWrapperArgs+=("''${gappsWrapperArgs[@]}") diff --git a/pkgs/desktops/deepin/core/dde-file-manager/default.nix b/pkgs/desktops/deepin/core/dde-file-manager/default.nix index cfc610420957..7e77c7f083ff 100644 --- a/pkgs/desktops/deepin/core/dde-file-manager/default.nix +++ b/pkgs/desktops/deepin/core/dde-file-manager/default.nix @@ -1,44 +1,45 @@ -{ stdenv -, lib -, fetchFromGitHub -, runtimeShell -, dtkwidget -, qt5integration -, qt5platform-plugins -, dde-qt-dbus-factory -, docparser -, dde-dock -, cmake -, qttools -, qtx11extras -, qtmultimedia -, kcodecs -, pkg-config -, ffmpegthumbnailer -, libsecret -, libmediainfo -, mediainfo -, libzen -, poppler -, polkit-qt -, polkit -, wrapQtAppsHook -, wrapGAppsHook3 -, lucenepp -, boost -, taglib -, cryptsetup -, glib -, qtbase -, util-dfm -, deepin-pdfium -, libuuid -, libselinux -, glibmm -, pcre -, udisks2 -, libisoburn -, gsettings-qt +{ + stdenv, + lib, + fetchFromGitHub, + runtimeShell, + dtkwidget, + qt5integration, + qt5platform-plugins, + dde-qt-dbus-factory, + docparser, + dde-dock, + cmake, + qttools, + qtx11extras, + qtmultimedia, + kcodecs, + pkg-config, + ffmpegthumbnailer, + libsecret, + libmediainfo, + mediainfo, + libzen, + poppler, + polkit-qt, + polkit, + wrapQtAppsHook, + wrapGAppsHook3, + lucenepp, + boost, + taglib, + cryptsetup, + glib, + qtbase, + util-dfm, + deepin-pdfium, + libuuid, + libselinux, + glibmm, + pcre, + udisks2, + libisoburn, + gsettings-qt, }: stdenv.mkDerivation rec { @@ -61,9 +62,7 @@ stdenv.mkDerivation rec { ]; dontWrapGApps = true; - patches = [ - ./patch_check_v23_interface.diff - ]; + patches = [ ./patch_check_v23_interface.diff ]; postPatch = '' patchShebangs . @@ -132,9 +131,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; # qt5integration must be placed before qtsvg in QT_PLUGIN_PATH - qtWrapperArgs = [ - "--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}" - ]; + qtWrapperArgs = [ "--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}" ]; preFixup = '' qtWrapperArgs+=("''${gappsWrapperArgs[@]}") @@ -148,4 +145,3 @@ stdenv.mkDerivation rec { maintainers = teams.deepin.members; }; } - diff --git a/pkgs/desktops/deepin/core/dde-grand-search/default.nix b/pkgs/desktops/deepin/core/dde-grand-search/default.nix index 8b653004f27a..2d07a478fec3 100644 --- a/pkgs/desktops/deepin/core/dde-grand-search/default.nix +++ b/pkgs/desktops/deepin/core/dde-grand-search/default.nix @@ -1,21 +1,22 @@ -{ stdenv -, lib -, fetchFromGitHub -, cmake -, qttools -, pkg-config -, wrapQtAppsHook -, dtkwidget -, dde-qt-dbus-factory -, dde-dock -, deepin-pdfium -, qt5integration -, qt5platform-plugins -, taglib -, ffmpeg -, ffmpegthumbnailer -, pcre -, dbus +{ + stdenv, + lib, + fetchFromGitHub, + cmake, + qttools, + pkg-config, + wrapQtAppsHook, + dtkwidget, + dde-qt-dbus-factory, + dde-dock, + deepin-pdfium, + qt5integration, + qt5platform-plugins, + taglib, + ffmpeg, + ffmpegthumbnailer, + pcre, + dbus, }: stdenv.mkDerivation rec { diff --git a/pkgs/desktops/deepin/core/dde-gsettings-schemas/default.nix b/pkgs/desktops/deepin/core/dde-gsettings-schemas/default.nix index 46fb6480ca4d..bdbd5e1b136b 100644 --- a/pkgs/desktops/deepin/core/dde-gsettings-schemas/default.nix +++ b/pkgs/desktops/deepin/core/dde-gsettings-schemas/default.nix @@ -1,17 +1,18 @@ -{ lib -, runCommand -, glib -, gtk3 -, dde-grand-search -, startdde -, dde-session-shell -, dde-file-manager -, deepin-desktop-schemas -, deepin-movie-reborn -, deepin-system-monitor -, gsettings-desktop-schemas -, extraGSettingsOverrides ? "" -, extraGSettingsOverridePackages ? [ ] +{ + lib, + runCommand, + glib, + gtk3, + dde-grand-search, + startdde, + dde-session-shell, + dde-file-manager, + deepin-desktop-schemas, + deepin-movie-reborn, + deepin-system-monitor, + gsettings-desktop-schemas, + extraGSettingsOverrides ? "", + extraGSettingsOverridePackages ? [ ], }: let diff --git a/pkgs/desktops/deepin/core/dde-launchpad/default.nix b/pkgs/desktops/deepin/core/dde-launchpad/default.nix index 7544bc575175..d1474b5bea97 100644 --- a/pkgs/desktops/deepin/core/dde-launchpad/default.nix +++ b/pkgs/desktops/deepin/core/dde-launchpad/default.nix @@ -1,13 +1,14 @@ -{ stdenv -, lib -, fetchFromGitHub -, cmake -, pkg-config -, qt6Packages -, qt6integration -, qt6platform-plugins -, dtk6declarative -, dde-shell +{ + stdenv, + lib, + fetchFromGitHub, + cmake, + pkg-config, + qt6Packages, + qt6integration, + qt6platform-plugins, + dtk6declarative, + dde-shell, }: stdenv.mkDerivation rec { @@ -28,21 +29,21 @@ stdenv.mkDerivation rec { qt6Packages.wrapQtAppsHook ]; - buildInputs = [ - qt6integration - qt6platform-plugins - dtk6declarative - dde-shell - ] ++ (with qt6Packages; [ - qtbase - qtsvg - qtwayland - appstream-qt - ]); + buildInputs = + [ + qt6integration + qt6platform-plugins + dtk6declarative + dde-shell + ] + ++ (with qt6Packages; [ + qtbase + qtsvg + qtwayland + appstream-qt + ]); - cmakeFlags = [ - "-DSYSTEMD_USER_UNIT_DIR=${placeholder "out"}/lib/systemd/user" - ]; + cmakeFlags = [ "-DSYSTEMD_USER_UNIT_DIR=${placeholder "out"}/lib/systemd/user" ]; meta = with lib; { description = "'launcher' or 'start menu' component for DDE"; diff --git a/pkgs/desktops/deepin/core/dde-network-core/default.nix b/pkgs/desktops/deepin/core/dde-network-core/default.nix index 2c8f1860e57d..518fd99548f0 100644 --- a/pkgs/desktops/deepin/core/dde-network-core/default.nix +++ b/pkgs/desktops/deepin/core/dde-network-core/default.nix @@ -1,19 +1,20 @@ -{ stdenv -, lib -, fetchFromGitHub -, cmake -, qttools -, pkg-config -, wrapQtAppsHook -, qtbase -, qtsvg -, dtkwidget -, dde-dock -, dde-control-center -, dde-session-shell -, networkmanager-qt -, glib -, gtest +{ + stdenv, + lib, + fetchFromGitHub, + cmake, + qttools, + pkg-config, + wrapQtAppsHook, + qtbase, + qtsvg, + dtkwidget, + dde-dock, + dde-control-center, + dde-session-shell, + networkmanager-qt, + glib, + gtest, }: stdenv.mkDerivation rec { @@ -46,9 +47,7 @@ stdenv.mkDerivation rec { gtest ]; - cmakeFlags = [ - "-DVERSION=${version}" - ]; + cmakeFlags = [ "-DVERSION=${version}" ]; strictDeps = true; diff --git a/pkgs/desktops/deepin/core/dde-polkit-agent/default.nix b/pkgs/desktops/deepin/core/dde-polkit-agent/default.nix index 2e6bd31a9395..9b71012b11ca 100644 --- a/pkgs/desktops/deepin/core/dde-polkit-agent/default.nix +++ b/pkgs/desktops/deepin/core/dde-polkit-agent/default.nix @@ -1,16 +1,17 @@ -{ stdenv -, lib -, fetchFromGitHub -, dtkwidget -, qt5integration -, qt5platform-plugins -, dde-qt-dbus-factory -, pkg-config -, cmake -, qttools -, wrapQtAppsHook -, polkit-qt -, qtbase +{ + stdenv, + lib, + fetchFromGitHub, + dtkwidget, + qt5integration, + qt5platform-plugins, + dde-qt-dbus-factory, + pkg-config, + cmake, + qttools, + wrapQtAppsHook, + polkit-qt, + qtbase, }: stdenv.mkDerivation rec { @@ -39,9 +40,7 @@ stdenv.mkDerivation rec { ]; # qt5integration must be placed before qtsvg in QT_PLUGIN_PATH - qtWrapperArgs = [ - "--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}" - ]; + qtWrapperArgs = [ "--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}" ]; postFixup = '' wrapQtApp $out/lib/polkit-1-dde/dde-polkit-agent diff --git a/pkgs/desktops/deepin/core/dde-session-shell/default.nix b/pkgs/desktops/deepin/core/dde-session-shell/default.nix index 9e9be74a4d6f..91c44895e335 100644 --- a/pkgs/desktops/deepin/core/dde-session-shell/default.nix +++ b/pkgs/desktops/deepin/core/dde-session-shell/default.nix @@ -1,26 +1,27 @@ -{ stdenv -, lib -, fetchFromGitHub -, linkFarm -, cmake -, pkg-config -, qttools -, wrapQtAppsHook -, wrapGAppsHook3 -, qtbase -, dtkwidget -, qt5integration -, qt5platform-plugins -, deepin-pw-check -, gsettings-qt -, lightdm_qt -, qtx11extras -, linux-pam -, xorg -, gtest -, xkeyboard_config -, dbus -, dde-session-shell +{ + stdenv, + lib, + fetchFromGitHub, + linkFarm, + cmake, + pkg-config, + qttools, + wrapQtAppsHook, + wrapGAppsHook3, + qtbase, + dtkwidget, + qt5integration, + qt5platform-plugins, + deepin-pw-check, + gsettings-qt, + lightdm_qt, + qtx11extras, + linux-pam, + xorg, + gtest, + xkeyboard_config, + dbus, + dde-session-shell, }: stdenv.mkDerivation rec { @@ -85,21 +86,24 @@ stdenv.mkDerivation rec { gtest ]; - outputs = [ "out" "dev" ]; + outputs = [ + "out" + "dev" + ]; # qt5integration must be placed before qtsvg in QT_PLUGIN_PATH - qtWrapperArgs = [ - "--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}" - ]; + qtWrapperArgs = [ "--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}" ]; preFixup = '' qtWrapperArgs+=("''${gappsWrapperArgs[@]}") ''; - passthru.xgreeters = linkFarm "deepin-greeter-xgreeters" [{ - path = "${dde-session-shell}/share/xgreeters/lightdm-deepin-greeter.desktop"; - name = "lightdm-deepin-greeter.desktop"; - }]; + passthru.xgreeters = linkFarm "deepin-greeter-xgreeters" [ + { + path = "${dde-session-shell}/share/xgreeters/lightdm-deepin-greeter.desktop"; + name = "lightdm-deepin-greeter.desktop"; + } + ]; meta = with lib; { description = "Deepin desktop-environment - session-shell module"; diff --git a/pkgs/desktops/deepin/core/dde-session-ui/default.nix b/pkgs/desktops/deepin/core/dde-session-ui/default.nix index 24085d682f0b..a2ce7f009021 100644 --- a/pkgs/desktops/deepin/core/dde-session-ui/default.nix +++ b/pkgs/desktops/deepin/core/dde-session-ui/default.nix @@ -1,18 +1,19 @@ -{ stdenv -, lib -, fetchFromGitHub -, cmake -, pkg-config -, qttools -, wrapQtAppsHook -, qtbase -, dtkwidget -, qt5integration -, qt5platform-plugins -, dde-dock -, gsettings-qt -, qtx11extras -, gtest +{ + stdenv, + lib, + fetchFromGitHub, + cmake, + pkg-config, + qttools, + wrapQtAppsHook, + qtbase, + dtkwidget, + qt5integration, + qt5platform-plugins, + dde-dock, + gsettings-qt, + qtx11extras, + gtest, }: stdenv.mkDerivation rec { @@ -55,14 +56,10 @@ stdenv.mkDerivation rec { gtest ]; - cmakeFlags = [ - "-DDISABLE_SYS_UPDATE=ON" - ]; + cmakeFlags = [ "-DDISABLE_SYS_UPDATE=ON" ]; # qt5integration must be placed before qtsvg in QT_PLUGIN_PATH - qtWrapperArgs = [ - "--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}" - ]; + qtWrapperArgs = [ "--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}" ]; preFixup = '' qtWrapperArgs+=("''${gappsWrapperArgs[@]}") diff --git a/pkgs/desktops/deepin/core/dde-session/default.nix b/pkgs/desktops/deepin/core/dde-session/default.nix index 87fe51cb211c..291f20ea63c0 100644 --- a/pkgs/desktops/deepin/core/dde-session/default.nix +++ b/pkgs/desktops/deepin/core/dde-session/default.nix @@ -1,16 +1,17 @@ -{ stdenv -, lib -, fetchFromGitHub -, cmake -, pkg-config -, wrapQtAppsHook -, qtbase -, dtkcore -, gsettings-qt -, libsecret -, xorg -, systemd -, dde-polkit-agent +{ + stdenv, + lib, + fetchFromGitHub, + cmake, + pkg-config, + wrapQtAppsHook, + qtbase, + dtkcore, + gsettings-qt, + libsecret, + xorg, + systemd, + dde-polkit-agent, }: stdenv.mkDerivation rec { diff --git a/pkgs/desktops/deepin/core/dde-shell/default.nix b/pkgs/desktops/deepin/core/dde-shell/default.nix index 8a66181c2fc9..72696ba35214 100644 --- a/pkgs/desktops/deepin/core/dde-shell/default.nix +++ b/pkgs/desktops/deepin/core/dde-shell/default.nix @@ -1,22 +1,23 @@ -{ stdenv -, lib -, fetchFromGitHub -, cmake -, extra-cmake-modules -, pkg-config -, wrapQtAppsHook -, wayland-scanner -, dtk6declarative -, dtk6widget -, dde-qt-dbus-factory -, qt6Packages -, qt6integration -, qt6platform-plugins -, kdePackages -, wayland -, wayland-protocols -, yaml-cpp -, xorg +{ + stdenv, + lib, + fetchFromGitHub, + cmake, + extra-cmake-modules, + pkg-config, + wrapQtAppsHook, + wayland-scanner, + dtk6declarative, + dtk6widget, + dde-qt-dbus-factory, + qt6Packages, + qt6integration, + qt6platform-plugins, + kdePackages, + wayland, + wayland-protocols, + yaml-cpp, + xorg, }: stdenv.mkDerivation (finalAttrs: { @@ -73,15 +74,13 @@ stdenv.mkDerivation (finalAttrs: { env.PKG_CONFIG_SYSTEMD_SYSTEMDUSERUNITDIR = "${placeholder "out"}/lib/systemd/user"; - cmakeFlags = [ - "-DQML_INSTALL_DIR=${placeholder "out"}/${qt6Packages.qtbase.qtQmlPrefix}" - ]; + cmakeFlags = [ "-DQML_INSTALL_DIR=${placeholder "out"}/${qt6Packages.qtbase.qtQmlPrefix}" ]; qtWrapperArgs = [ - # qt6integration must be placed before qtsvg in QT_PLUGIN_PATH - "--prefix QT_PLUGIN_PATH : ${qt6integration}/${qt6Packages.qtbase.qtPluginPrefix}" - "--suffix DDE_SHELL_PLUGIN_PATH : /run/current-system/sw/lib/dde-shell" - "--suffix DDE_SHELL_PACKAGE_PATH : /run/current-system/sw/share/dde-shell" + # qt6integration must be placed before qtsvg in QT_PLUGIN_PATH + "--prefix QT_PLUGIN_PATH : ${qt6integration}/${qt6Packages.qtbase.qtPluginPrefix}" + "--suffix DDE_SHELL_PLUGIN_PATH : /run/current-system/sw/lib/dde-shell" + "--suffix DDE_SHELL_PACKAGE_PATH : /run/current-system/sw/share/dde-shell" ]; meta = { diff --git a/pkgs/desktops/deepin/core/dde-widgets/default.nix b/pkgs/desktops/deepin/core/dde-widgets/default.nix index c8019509dabf..4faa91d3ca08 100644 --- a/pkgs/desktops/deepin/core/dde-widgets/default.nix +++ b/pkgs/desktops/deepin/core/dde-widgets/default.nix @@ -1,15 +1,16 @@ -{ stdenv -, lib -, fetchFromGitHub -, cmake -, pkg-config -, dde-qt-dbus-factory -, wrapQtAppsHook -, qtbase -, qtx11extras -, dtkwidget -, qt5integration -, gtest +{ + stdenv, + lib, + fetchFromGitHub, + cmake, + pkg-config, + dde-qt-dbus-factory, + wrapQtAppsHook, + qtbase, + qtx11extras, + dtkwidget, + qt5integration, + gtest, }: stdenv.mkDerivation rec { diff --git a/pkgs/desktops/deepin/core/deepin-kwin/default.nix b/pkgs/desktops/deepin/core/deepin-kwin/default.nix index 1cd144b79e29..bb4ddee47bf2 100644 --- a/pkgs/desktops/deepin/core/deepin-kwin/default.nix +++ b/pkgs/desktops/deepin/core/deepin-kwin/default.nix @@ -1,37 +1,38 @@ -{ stdenv -, lib -, fetchFromGitHub -, cmake -, pkg-config -, wayland -, dwayland -, qtbase -, qttools -, qtx11extras -, wrapQtAppsHook -, extra-cmake-modules -, gsettings-qt -, libepoxy -, kconfig -, kconfigwidgets -, kcoreaddons -, kcrash -, kdbusaddons -, kiconthemes -, kglobalaccel -, kidletime -, knotifications -, kpackage -, plasma-framework -, kcmutils -, knewstuff -, kdecoration -, kscreenlocker -, breeze-qt5 -, libinput -, mesa -, lcms2 -, xorg +{ + stdenv, + lib, + fetchFromGitHub, + cmake, + pkg-config, + wayland, + dwayland, + qtbase, + qttools, + qtx11extras, + wrapQtAppsHook, + extra-cmake-modules, + gsettings-qt, + libepoxy, + kconfig, + kconfigwidgets, + kcoreaddons, + kcrash, + kdbusaddons, + kiconthemes, + kglobalaccel, + kidletime, + knotifications, + kpackage, + plasma-framework, + kcmutils, + knewstuff, + kdecoration, + kscreenlocker, + breeze-qt5, + libinput, + mesa, + lcms2, + xorg, }: stdenv.mkDerivation rec { @@ -45,9 +46,7 @@ stdenv.mkDerivation rec { hash = "sha256-EjPPjdxa+iL/nXhuccoM3NiLmGXh7Un2aGz8O3sP6xE="; }; - patches = [ - ./0001-hardcode-fallback-background.diff - ]; + patches = [ ./0001-hardcode-fallback-background.diff ]; # Avoid using absolute path to distinguish applications postPatch = '' @@ -101,11 +100,12 @@ stdenv.mkDerivation rec { xorg.libXScrnSaver ]; - cmakeFlags = [ - "-DKWIN_BUILD_RUNNERS=OFF" - ]; + cmakeFlags = [ "-DKWIN_BUILD_RUNNERS=OFF" ]; - outputs = [ "out" "dev" ]; + outputs = [ + "out" + "dev" + ]; meta = with lib; { description = "Fork of kwin, an easy to use, but flexible, composited Window Manager"; diff --git a/pkgs/desktops/deepin/core/deepin-service-manager/default.nix b/pkgs/desktops/deepin/core/deepin-service-manager/default.nix index a11f7717b646..c76a095b2463 100644 --- a/pkgs/desktops/deepin/core/deepin-service-manager/default.nix +++ b/pkgs/desktops/deepin/core/deepin-service-manager/default.nix @@ -1,9 +1,10 @@ -{ stdenv -, lib -, fetchFromGitHub -, cmake -, pkg-config -, wrapQtAppsHook +{ + stdenv, + lib, + fetchFromGitHub, + cmake, + pkg-config, + wrapQtAppsHook, }: stdenv.mkDerivation rec { diff --git a/pkgs/desktops/deepin/core/dpa-ext-gnomekeyring/default.nix b/pkgs/desktops/deepin/core/dpa-ext-gnomekeyring/default.nix index 82c183ca00d5..e78ba159c95d 100644 --- a/pkgs/desktops/deepin/core/dpa-ext-gnomekeyring/default.nix +++ b/pkgs/desktops/deepin/core/dpa-ext-gnomekeyring/default.nix @@ -1,14 +1,15 @@ -{ stdenv -, lib -, fetchFromGitHub -, cmake -, pkg-config -, qttools -, wrapQtAppsHook -, dtkwidget -, dde-polkit-agent -, qt5integration -, libsecret +{ + stdenv, + lib, + fetchFromGitHub, + cmake, + pkg-config, + qttools, + wrapQtAppsHook, + dtkwidget, + dde-polkit-agent, + qt5integration, + libsecret, }: stdenv.mkDerivation rec { diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix index f0a9c95ab2b9..4280b290a3e6 100644 --- a/pkgs/desktops/deepin/default.nix +++ b/pkgs/desktops/deepin/default.nix @@ -1,110 +1,118 @@ -{ lib, pkgs, config, libsForQt5 }: +{ + lib, + pkgs, + config, + libsForQt5, +}: let - packages = self: - let - inherit (self) callPackage; - in { - #### LIBRARIES - dtkcommon = callPackage ./library/dtkcommon { }; - dtkcore = callPackage ./library/dtkcore { }; - 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 { }; - deepin-wayland-protocols = callPackage ./library/deepin-wayland-protocols { }; - deepin-ocr-plugin-manager = callPackage ./library/deepin-ocr-plugin-manager { }; - dwayland = callPackage ./library/dwayland { }; - dde-qt-dbus-factory = callPackage ./library/dde-qt-dbus-factory { }; - disomaster = callPackage ./library/disomaster { }; - docparser = callPackage ./library/docparser { }; - gio-qt = callPackage ./library/gio-qt { }; - image-editor = callPackage ./library/image-editor { }; - udisks2-qt5 = callPackage ./library/udisks2-qt5 { }; - util-dfm = callPackage ./library/util-dfm { }; - dtk6core = callPackage ./library/dtk6core { }; - dtk6gui = callPackage ./library/dtk6gui { }; - 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 { }; + packages = + self: + let + inherit (self) callPackage; + in + { + #### LIBRARIES + dtkcommon = callPackage ./library/dtkcommon { }; + dtkcore = callPackage ./library/dtkcore { }; + 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 { }; + deepin-wayland-protocols = callPackage ./library/deepin-wayland-protocols { }; + deepin-ocr-plugin-manager = callPackage ./library/deepin-ocr-plugin-manager { }; + dwayland = callPackage ./library/dwayland { }; + dde-qt-dbus-factory = callPackage ./library/dde-qt-dbus-factory { }; + disomaster = callPackage ./library/disomaster { }; + docparser = callPackage ./library/docparser { }; + gio-qt = callPackage ./library/gio-qt { }; + image-editor = callPackage ./library/image-editor { }; + udisks2-qt5 = callPackage ./library/udisks2-qt5 { }; + util-dfm = callPackage ./library/util-dfm { }; + dtk6core = callPackage ./library/dtk6core { }; + dtk6gui = callPackage ./library/dtk6gui { }; + 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 { }; - #### CORE - 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-control-center = callPackage ./core/dde-control-center { }; - dde-calendar = callPackage ./core/dde-calendar { }; - dde-clipboard = callPackage ./core/dde-clipboard { }; - dde-dock = callPackage ./core/dde-dock { }; - dde-file-manager = callPackage ./core/dde-file-manager { }; - dde-launchpad = callPackage ./core/dde-launchpad { }; - dde-network-core = callPackage ./core/dde-network-core { }; - dde-session = callPackage ./core/dde-session { }; - dde-session-shell = callPackage ./core/dde-session-shell { }; - dde-session-ui = callPackage ./core/dde-session-ui { }; - deepin-service-manager = callPackage ./core/deepin-service-manager { }; - dde-polkit-agent = callPackage ./core/dde-polkit-agent { }; - dpa-ext-gnomekeyring = callPackage ./core/dpa-ext-gnomekeyring { }; - dde-gsettings-schemas = callPackage ./core/dde-gsettings-schemas { }; - dde-widgets = callPackage ./core/dde-widgets { }; - dde-shell = callPackage ./core/dde-shell { }; - dde-grand-search = callPackage ./core/dde-grand-search { }; + #### CORE + 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-control-center = callPackage ./core/dde-control-center { }; + dde-calendar = callPackage ./core/dde-calendar { }; + dde-clipboard = callPackage ./core/dde-clipboard { }; + dde-dock = callPackage ./core/dde-dock { }; + dde-file-manager = callPackage ./core/dde-file-manager { }; + dde-launchpad = callPackage ./core/dde-launchpad { }; + dde-network-core = callPackage ./core/dde-network-core { }; + dde-session = callPackage ./core/dde-session { }; + dde-session-shell = callPackage ./core/dde-session-shell { }; + dde-session-ui = callPackage ./core/dde-session-ui { }; + deepin-service-manager = callPackage ./core/deepin-service-manager { }; + dde-polkit-agent = callPackage ./core/dde-polkit-agent { }; + dpa-ext-gnomekeyring = callPackage ./core/dpa-ext-gnomekeyring { }; + dde-gsettings-schemas = callPackage ./core/dde-gsettings-schemas { }; + dde-widgets = callPackage ./core/dde-widgets { }; + dde-shell = callPackage ./core/dde-shell { }; + dde-grand-search = callPackage ./core/dde-grand-search { }; - #### Dtk Application - deepin-album = callPackage ./apps/deepin-album { }; - deepin-calculator = callPackage ./apps/deepin-calculator { }; - deepin-camera = callPackage ./apps/deepin-camera { }; - deepin-compressor = callPackage ./apps/deepin-compressor { }; - deepin-draw = callPackage ./apps/deepin-draw { }; - deepin-editor = callPackage ./apps/deepin-editor { }; - deepin-image-viewer = callPackage ./apps/deepin-image-viewer { }; - deepin-movie-reborn = callPackage ./apps/deepin-movie-reborn { }; - deepin-music = callPackage ./apps/deepin-music { }; - deepin-picker = callPackage ./apps/deepin-picker { }; - deepin-screen-recorder = callPackage ./apps/deepin-screen-recorder { }; - deepin-shortcut-viewer = callPackage ./apps/deepin-shortcut-viewer { }; - deepin-system-monitor = callPackage ./apps/deepin-system-monitor { }; - deepin-terminal = callPackage ./apps/deepin-terminal { }; - deepin-reader = callPackage ./apps/deepin-reader { }; - deepin-voice-note = callPackage ./apps/deepin-voice-note { }; - deepin-screensaver = callPackage ./apps/deepin-screensaver { }; + #### Dtk Application + deepin-album = callPackage ./apps/deepin-album { }; + deepin-calculator = callPackage ./apps/deepin-calculator { }; + deepin-camera = callPackage ./apps/deepin-camera { }; + deepin-compressor = callPackage ./apps/deepin-compressor { }; + deepin-draw = callPackage ./apps/deepin-draw { }; + deepin-editor = callPackage ./apps/deepin-editor { }; + deepin-image-viewer = callPackage ./apps/deepin-image-viewer { }; + deepin-movie-reborn = callPackage ./apps/deepin-movie-reborn { }; + deepin-music = callPackage ./apps/deepin-music { }; + deepin-picker = callPackage ./apps/deepin-picker { }; + deepin-screen-recorder = callPackage ./apps/deepin-screen-recorder { }; + deepin-shortcut-viewer = callPackage ./apps/deepin-shortcut-viewer { }; + deepin-system-monitor = callPackage ./apps/deepin-system-monitor { }; + deepin-terminal = callPackage ./apps/deepin-terminal { }; + deepin-reader = callPackage ./apps/deepin-reader { }; + deepin-voice-note = callPackage ./apps/deepin-voice-note { }; + deepin-screensaver = callPackage ./apps/deepin-screensaver { }; - #### Go Packages - dde-api = callPackage ./go-package/dde-api { }; - dde-daemon = callPackage ./go-package/dde-daemon { }; - deepin-pw-check = callPackage ./go-package/deepin-pw-check { }; - deepin-desktop-schemas = callPackage ./go-package/deepin-desktop-schemas { }; - startdde = callPackage ./go-package/startdde { }; + #### Go Packages + dde-api = callPackage ./go-package/dde-api { }; + dde-daemon = callPackage ./go-package/dde-daemon { }; + deepin-pw-check = callPackage ./go-package/deepin-pw-check { }; + deepin-desktop-schemas = callPackage ./go-package/deepin-desktop-schemas { }; + startdde = callPackage ./go-package/startdde { }; - #### TOOLS - dde-device-formatter = callPackage ./tools/dde-device-formatter { }; - deepin-gettext-tools = callPackage ./tools/deepin-gettext-tools { }; - deepin-anything = callPackage ./tools/deepin-anything { }; + #### TOOLS + dde-device-formatter = callPackage ./tools/dde-device-formatter { }; + deepin-gettext-tools = callPackage ./tools/deepin-gettext-tools { }; + deepin-anything = callPackage ./tools/deepin-anything { }; - #### ARTWORK - dde-account-faces = callPackage ./artwork/dde-account-faces { }; - deepin-icon-theme = callPackage ./artwork/deepin-icon-theme { }; - deepin-wallpapers = callPackage ./artwork/deepin-wallpapers { }; - deepin-gtk-theme = callPackage ./artwork/deepin-gtk-theme { }; - deepin-sound-theme = callPackage ./artwork/deepin-sound-theme { }; - deepin-desktop-theme = callPackage ./artwork/deepin-desktop-theme { }; + #### ARTWORK + dde-account-faces = callPackage ./artwork/dde-account-faces { }; + deepin-icon-theme = callPackage ./artwork/deepin-icon-theme { }; + deepin-wallpapers = callPackage ./artwork/deepin-wallpapers { }; + deepin-gtk-theme = callPackage ./artwork/deepin-gtk-theme { }; + deepin-sound-theme = callPackage ./artwork/deepin-sound-theme { }; + deepin-desktop-theme = callPackage ./artwork/deepin-desktop-theme { }; - #### MISC - deepin-desktop-base = callPackage ./misc/deepin-desktop-base { }; - deepin-turbo = callPackage ./misc/deepin-turbo { }; - } // lib.optionalAttrs config.allowAliases { - dde-kwin = throw "The 'deepin.dde-kwin' package was removed as it is outdated and no longer relevant."; # added 2023-09-27 - dde-launcher = throw "The 'deepin.dde-launcher' is no longer maintained. Please use 'deepin.dde-launchpad' instead."; # added 2023-11-23 - deepin-clone = throw "The 'deepin.deepin-clone' package was removed as it is broken and unmaintained."; # added 2024-08-23 - go-lib = throw "Then 'deepin.go-lib' package was removed, use 'go mod' to manage it"; # added 2024-05-31 - go-gir-generator = throw "Then 'deepin.go-gir-generator' package was removed, use 'go mod' to manage it"; # added 2024-05-31 - go-dbus-factory = throw "Then 'deepin.go-dbus-factory' package was removed, use 'go mod' to manage it"; # added 2024-05-31 - }; + #### MISC + deepin-desktop-base = callPackage ./misc/deepin-desktop-base { }; + deepin-turbo = callPackage ./misc/deepin-turbo { }; + } + // lib.optionalAttrs config.allowAliases { + dde-kwin = throw "The 'deepin.dde-kwin' package was removed as it is outdated and no longer relevant."; # added 2023-09-27 + dde-launcher = throw "The 'deepin.dde-launcher' is no longer maintained. Please use 'deepin.dde-launchpad' instead."; # added 2023-11-23 + deepin-clone = throw "The 'deepin.deepin-clone' package was removed as it is broken and unmaintained."; # added 2024-08-23 + go-lib = throw "Then 'deepin.go-lib' package was removed, use 'go mod' to manage it"; # added 2024-05-31 + go-gir-generator = throw "Then 'deepin.go-gir-generator' package was removed, use 'go mod' to manage it"; # added 2024-05-31 + go-dbus-factory = throw "Then 'deepin.go-dbus-factory' package was removed, use 'go mod' to manage it"; # added 2024-05-31 + }; in lib.makeScope libsForQt5.newScope packages diff --git a/pkgs/desktops/deepin/go-package/dde-api/default.nix b/pkgs/desktops/deepin/go-package/dde-api/default.nix index 209a631ef394..d8b848851a82 100644 --- a/pkgs/desktops/deepin/go-package/dde-api/default.nix +++ b/pkgs/desktops/deepin/go-package/dde-api/default.nix @@ -1,20 +1,21 @@ -{ lib -, fetchFromGitHub -, buildGoModule -, pkg-config -, deepin-gettext-tools -, wrapQtAppsHook -, wrapGAppsHook3 -, alsa-lib -, gtk3 -, libcanberra -, libgudev -, librsvg -, poppler -, pulseaudio -, gdk-pixbuf-xlib -, coreutils -, dbus +{ + lib, + fetchFromGitHub, + buildGoModule, + pkg-config, + deepin-gettext-tools, + wrapQtAppsHook, + wrapGAppsHook3, + alsa-lib, + gtk3, + libcanberra, + libgudev, + librsvg, + poppler, + pulseaudio, + gdk-pixbuf-xlib, + coreutils, + dbus, }: buildGoModule rec { diff --git a/pkgs/desktops/deepin/go-package/dde-daemon/default.nix b/pkgs/desktops/deepin/go-package/dde-daemon/default.nix index 68b85a3edadb..563057ddebf0 100644 --- a/pkgs/desktops/deepin/go-package/dde-daemon/default.nix +++ b/pkgs/desktops/deepin/go-package/dde-daemon/default.nix @@ -1,38 +1,39 @@ -{ lib -, fetchFromGitHub -, substituteAll -, buildGoModule -, pkg-config -, deepin-gettext-tools -, gettext -, python3 -, wrapGAppsHook3 -, ddcutil -, alsa-lib -, glib -, gtk3 -, libgudev -, libinput -, libnl -, librsvg -, linux-pam -, libxcrypt -, networkmanager -, pulseaudio -, gdk-pixbuf-xlib -, tzdata -, xkeyboard_config -, runtimeShell -, xorg -, xdotool -, getconf -, dbus -, util-linux -, dde-session-ui -, coreutils -, lshw -, dmidecode -, systemd +{ + lib, + fetchFromGitHub, + substituteAll, + buildGoModule, + pkg-config, + deepin-gettext-tools, + gettext, + python3, + wrapGAppsHook3, + ddcutil, + alsa-lib, + glib, + gtk3, + libgudev, + libinput, + libnl, + librsvg, + linux-pam, + libxcrypt, + networkmanager, + pulseaudio, + gdk-pixbuf-xlib, + tzdata, + xkeyboard_config, + runtimeShell, + xorg, + xdotool, + getconf, + dbus, + util-linux, + dde-session-ui, + coreutils, + lshw, + dmidecode, + systemd, }: buildGoModule rec { @@ -133,7 +134,16 @@ buildGoModule rec { preFixup = '' gappsWrapperArgs+=( - --prefix PATH : "${lib.makeBinPath [ util-linux dde-session-ui glib lshw dmidecode systemd ]}" + --prefix PATH : "${ + lib.makeBinPath [ + util-linux + dde-session-ui + glib + lshw + dmidecode + systemd + ] + }" ) ''; diff --git a/pkgs/desktops/deepin/go-package/deepin-desktop-schemas/default.nix b/pkgs/desktops/deepin/go-package/deepin-desktop-schemas/default.nix index 61d7c18dca2d..99b3a056dd92 100644 --- a/pkgs/desktops/deepin/go-package/deepin-desktop-schemas/default.nix +++ b/pkgs/desktops/deepin/go-package/deepin-desktop-schemas/default.nix @@ -1,8 +1,9 @@ -{ stdenv -, lib -, buildGoModule -, fetchFromGitHub -, glib +{ + stdenv, + lib, + buildGoModule, + fetchFromGitHub, + glib, }: buildGoModule rec { diff --git a/pkgs/desktops/deepin/go-package/deepin-pw-check/default.nix b/pkgs/desktops/deepin/go-package/deepin-pw-check/default.nix index 44c52c31a8e4..b1ad7c0c4c9e 100644 --- a/pkgs/desktops/deepin/go-package/deepin-pw-check/default.nix +++ b/pkgs/desktops/deepin/go-package/deepin-pw-check/default.nix @@ -1,15 +1,16 @@ -{ lib -, fetchFromGitHub -, buildGoModule -, pkg-config -, deepin-gettext-tools -, gtk3 -, glib -, libxcrypt -, gettext -, iniparser -, cracklib -, linux-pam +{ + lib, + fetchFromGitHub, + buildGoModule, + pkg-config, + deepin-gettext-tools, + gtk3, + glib, + libxcrypt, + gettext, + iniparser, + cracklib, + linux-pam, }: buildGoModule rec { @@ -23,9 +24,7 @@ buildGoModule rec { hash = "sha256-kBrkcB0IWGUV4ZrkFzwdPglRgDcnVvYDFhTXS20pKOk="; }; - patches = [ - "${src}/rpm/0001-Mangle-Suit-Cracklib2.9.6.patch" - ]; + patches = [ "${src}/rpm/0001-Mangle-Suit-Cracklib2.9.6.patch" ]; vendorHash = "sha256-L0vUEkUN70Hrx5roIvTfaZBHbbq7mf3WpQJeFAMU5HY="; diff --git a/pkgs/desktops/deepin/go-package/startdde/default.nix b/pkgs/desktops/deepin/go-package/startdde/default.nix index b5f1100874c1..89f1602a1c7a 100644 --- a/pkgs/desktops/deepin/go-package/startdde/default.nix +++ b/pkgs/desktops/deepin/go-package/startdde/default.nix @@ -1,19 +1,20 @@ -{ lib -, buildGoModule -, fetchFromGitHub -, gettext -, pkg-config -, jq -, wrapGAppsHook3 -, glib -, libgnome-keyring -, gtk3 -, alsa-lib -, pulseaudio -, libgudev -, libsecret -, runtimeShell -, dbus +{ + lib, + buildGoModule, + fetchFromGitHub, + gettext, + pkg-config, + jq, + wrapGAppsHook3, + glib, + libgnome-keyring, + gtk3, + alsa-lib, + pulseaudio, + libgudev, + libsecret, + runtimeShell, + dbus, }: buildGoModule rec { diff --git a/pkgs/desktops/deepin/library/dde-qt-dbus-factory/default.nix b/pkgs/desktops/deepin/library/dde-qt-dbus-factory/default.nix index 323a37cac79f..9c14bf1379bb 100644 --- a/pkgs/desktops/deepin/library/dde-qt-dbus-factory/default.nix +++ b/pkgs/desktops/deepin/library/dde-qt-dbus-factory/default.nix @@ -1,11 +1,12 @@ -{ stdenv -, lib -, fetchFromGitHub -, qmake -, qtbase -, wrapQtAppsHook -, python3 -, dtkcore +{ + stdenv, + lib, + fetchFromGitHub, + qmake, + qtbase, + wrapQtAppsHook, + python3, + dtkcore, }: stdenv.mkDerivation rec { diff --git a/pkgs/desktops/deepin/library/deepin-ocr-plugin-manager/default.nix b/pkgs/desktops/deepin/library/deepin-ocr-plugin-manager/default.nix index 3db5f0a0bd34..34c7b83f818f 100644 --- a/pkgs/desktops/deepin/library/deepin-ocr-plugin-manager/default.nix +++ b/pkgs/desktops/deepin/library/deepin-ocr-plugin-manager/default.nix @@ -1,14 +1,15 @@ -{ stdenv -, lib -, fetchFromGitHub -, pkg-config -, cmake -, qttools -, wrapQtAppsHook -, libisoburn -, ncnn -, opencv -, vulkan-headers +{ + stdenv, + lib, + fetchFromGitHub, + pkg-config, + cmake, + qttools, + wrapQtAppsHook, + libisoburn, + ncnn, + opencv, + vulkan-headers, }: stdenv.mkDerivation rec { diff --git a/pkgs/desktops/deepin/library/deepin-pdfium/default.nix b/pkgs/desktops/deepin/library/deepin-pdfium/default.nix index a4912eabe5f3..cbe86ed26257 100644 --- a/pkgs/desktops/deepin/library/deepin-pdfium/default.nix +++ b/pkgs/desktops/deepin/library/deepin-pdfium/default.nix @@ -1,11 +1,12 @@ -{ stdenv -, lib -, fetchFromGitHub -, qmake -, pkg-config -, libchardet -, lcms2 -, openjpeg +{ + stdenv, + lib, + fetchFromGitHub, + qmake, + pkg-config, + libchardet, + lcms2, + openjpeg, }: stdenv.mkDerivation rec { diff --git a/pkgs/desktops/deepin/library/deepin-wayland-protocols/default.nix b/pkgs/desktops/deepin/library/deepin-wayland-protocols/default.nix index ad3dce815c91..839b02633af9 100644 --- a/pkgs/desktops/deepin/library/deepin-wayland-protocols/default.nix +++ b/pkgs/desktops/deepin/library/deepin-wayland-protocols/default.nix @@ -1,8 +1,9 @@ -{ stdenv -, lib -, fetchFromGitHub -, cmake -, extra-cmake-modules +{ + stdenv, + lib, + fetchFromGitHub, + cmake, + extra-cmake-modules, }: stdenv.mkDerivation rec { diff --git a/pkgs/desktops/deepin/library/disomaster/default.nix b/pkgs/desktops/deepin/library/disomaster/default.nix index 908f328db9ff..0e398b42c176 100644 --- a/pkgs/desktops/deepin/library/disomaster/default.nix +++ b/pkgs/desktops/deepin/library/disomaster/default.nix @@ -1,11 +1,12 @@ -{ stdenv -, lib -, fetchFromGitHub -, pkg-config -, qmake -, qttools -, wrapQtAppsHook -, libisoburn +{ + stdenv, + lib, + fetchFromGitHub, + pkg-config, + qmake, + qttools, + wrapQtAppsHook, + libisoburn, }: stdenv.mkDerivation rec { diff --git a/pkgs/desktops/deepin/library/docparser/default.nix b/pkgs/desktops/deepin/library/docparser/default.nix index 41b9a8ee7ce3..a283ac1098a9 100644 --- a/pkgs/desktops/deepin/library/docparser/default.nix +++ b/pkgs/desktops/deepin/library/docparser/default.nix @@ -1,11 +1,12 @@ -{ stdenv -, lib -, fetchFromGitHub -, pkg-config -, qmake -, qttools -, wrapQtAppsHook -, poppler +{ + stdenv, + lib, + fetchFromGitHub, + pkg-config, + qmake, + qttools, + wrapQtAppsHook, + poppler, }: stdenv.mkDerivation rec { diff --git a/pkgs/desktops/deepin/library/dtk6core/default.nix b/pkgs/desktops/deepin/library/dtk6core/default.nix index cc89cbfcd87d..31bf59583c04 100644 --- a/pkgs/desktops/deepin/library/dtk6core/default.nix +++ b/pkgs/desktops/deepin/library/dtk6core/default.nix @@ -1,14 +1,15 @@ -{ stdenv -, lib -, fetchFromGitHub -, cmake -, pkg-config -, doxygen -, qt6Packages -, lshw -, libuchardet -, dtkcommon -, dtk6log +{ + stdenv, + lib, + fetchFromGitHub, + cmake, + pkg-config, + doxygen, + qt6Packages, + lshw, + libuchardet, + dtkcommon, + dtk6log, }: stdenv.mkDerivation (finalAttrs: { @@ -48,7 +49,10 @@ stdenv.mkDerivation (finalAttrs: { libuchardet ]; - propagatedBuildInputs = [ dtkcommon dtk6log ]; + propagatedBuildInputs = [ + dtkcommon + dtk6log + ]; cmakeFlags = [ "-DDTK_VERSION=${finalAttrs.version}" @@ -66,7 +70,11 @@ stdenv.mkDerivation (finalAttrs: { export QT_PLUGIN_PATH=${lib.getBin qt6Packages.qtbase}/${qt6Packages.qtbase.qtPluginPrefix} ''; - outputs = [ "out" "dev" "doc" ]; + outputs = [ + "out" + "dev" + "doc" + ]; postFixup = '' for binary in $out/libexec/dtk6/DCore/bin/*; do diff --git a/pkgs/desktops/deepin/library/dtk6declarative/default.nix b/pkgs/desktops/deepin/library/dtk6declarative/default.nix index d5f13f22ac12..83d3140db7e4 100644 --- a/pkgs/desktops/deepin/library/dtk6declarative/default.nix +++ b/pkgs/desktops/deepin/library/dtk6declarative/default.nix @@ -1,11 +1,12 @@ -{ stdenv -, lib -, fetchFromGitHub -, cmake -, pkg-config -, doxygen -, qt6Packages -, dtk6gui +{ + stdenv, + lib, + fetchFromGitHub, + cmake, + pkg-config, + doxygen, + qt6Packages, + dtk6gui, }: stdenv.mkDerivation (finalAttrs: { @@ -32,14 +33,14 @@ stdenv.mkDerivation (finalAttrs: { qt6Packages.wrapQtAppsHook ]; - propagatedBuildInputs = [ - dtk6gui - ] ++ (with qt6Packages ; [ - qtbase - qtdeclarative - qtshadertools - qt5compat - ]); + propagatedBuildInputs = + [ dtk6gui ] + ++ (with qt6Packages; [ + qtbase + qtdeclarative + qtshadertools + qt5compat + ]); cmakeFlags = [ "-DDTK_VERSION=${finalAttrs.version}" @@ -57,7 +58,11 @@ stdenv.mkDerivation (finalAttrs: { export QML2_IMPORT_PATH=${lib.getBin qt6Packages.qtdeclarative}/${qt6Packages.qtbase.qtQmlPrefix} ''; - outputs = [ "out" "dev" "doc" ]; + outputs = [ + "out" + "dev" + "doc" + ]; meta = { description = "Widget development toolkit based on QtQuick/QtQml"; diff --git a/pkgs/desktops/deepin/library/dtk6gui/default.nix b/pkgs/desktops/deepin/library/dtk6gui/default.nix index 05a3b5333854..53ca9621bb26 100644 --- a/pkgs/desktops/deepin/library/dtk6gui/default.nix +++ b/pkgs/desktops/deepin/library/dtk6gui/default.nix @@ -1,12 +1,13 @@ -{ stdenv -, lib -, fetchFromGitHub -, cmake -, pkg-config -, doxygen -, qt6Packages -, dtk6core -, librsvg +{ + stdenv, + lib, + fetchFromGitHub, + cmake, + pkg-config, + doxygen, + qt6Packages, + dtk6core, + librsvg, }: stdenv.mkDerivation (finalAttrs: { @@ -56,7 +57,11 @@ stdenv.mkDerivation (finalAttrs: { export QT_PLUGIN_PATH=${lib.getBin qt6Packages.qtbase}/${qt6Packages.qtbase.qtPluginPrefix} ''; - outputs = [ "out" "dev" "doc" ]; + outputs = [ + "out" + "dev" + "doc" + ]; postFixup = '' for binary in $out/libexec/dtk6/DGui/bin/*; do diff --git a/pkgs/desktops/deepin/library/dtk6systemsettings/default.nix b/pkgs/desktops/deepin/library/dtk6systemsettings/default.nix index f6b185582031..a3048cbd2b22 100644 --- a/pkgs/desktops/deepin/library/dtk6systemsettings/default.nix +++ b/pkgs/desktops/deepin/library/dtk6systemsettings/default.nix @@ -1,12 +1,13 @@ -{ stdenv -, lib -, fetchFromGitHub -, cmake -, pkg-config -, doxygen -, qt6Packages -, dtk6core -, libxcrypt +{ + stdenv, + lib, + fetchFromGitHub, + cmake, + pkg-config, + doxygen, + qt6Packages, + dtk6core, + libxcrypt, }: stdenv.mkDerivation rec { @@ -50,7 +51,11 @@ stdenv.mkDerivation rec { export QT_PLUGIN_PATH=${lib.getBin qt6Packages.qtbase}/${qt6Packages.qtbase.qtPluginPrefix} ''; - outputs = [ "out" "dev" "doc" ]; + outputs = [ + "out" + "dev" + "doc" + ]; meta = { description = "Qt-based development library for system settings"; diff --git a/pkgs/desktops/deepin/library/dtk6widget/default.nix b/pkgs/desktops/deepin/library/dtk6widget/default.nix index da9e83223c62..7e47a4c92ca6 100644 --- a/pkgs/desktops/deepin/library/dtk6widget/default.nix +++ b/pkgs/desktops/deepin/library/dtk6widget/default.nix @@ -1,13 +1,14 @@ -{ stdenv -, lib -, fetchFromGitHub -, cmake -, pkg-config -, doxygen -, qt6Packages -, dtk6gui -, cups -, libstartup_notification +{ + stdenv, + lib, + fetchFromGitHub, + cmake, + pkg-config, + doxygen, + qt6Packages, + dtk6gui, + cups, + libstartup_notification, }: stdenv.mkDerivation (finalAttrs: { @@ -40,14 +41,16 @@ stdenv.mkDerivation (finalAttrs: { qt6Packages.wrapQtAppsHook ]; - buildInputs = [ - cups - libstartup_notification - ] ++ (with qt6Packages; [ - qtbase - qtmultimedia - qtsvg - ]); + buildInputs = + [ + cups + libstartup_notification + ] + ++ (with qt6Packages; [ + qtbase + qtmultimedia + qtsvg + ]); propagatedBuildInputs = [ dtk6gui ]; @@ -64,7 +67,11 @@ stdenv.mkDerivation (finalAttrs: { export QT_PLUGIN_PATH=${lib.getBin qt6Packages.qtbase}/${qt6Packages.qtbase.qtPluginPrefix} ''; - outputs = [ "out" "dev" "doc" ]; + outputs = [ + "out" + "dev" + "doc" + ]; postFixup = '' for binary in $out/lib/dtk6/DWidget/bin/*; do diff --git a/pkgs/desktops/deepin/library/dtkcommon/default.nix b/pkgs/desktops/deepin/library/dtkcommon/default.nix index c1eb882a17e6..b7f7523abb9f 100644 --- a/pkgs/desktops/deepin/library/dtkcommon/default.nix +++ b/pkgs/desktops/deepin/library/dtkcommon/default.nix @@ -1,7 +1,8 @@ -{ stdenv -, lib -, fetchFromGitHub -, cmake +{ + stdenv, + lib, + fetchFromGitHub, + cmake, }: stdenv.mkDerivation rec { @@ -15,9 +16,7 @@ stdenv.mkDerivation rec { hash = "sha256-e+8kG9bB6iby2RgD8jn75GyefLRHNnjD+n04hXbi5ec="; }; - nativeBuildInputs = [ - cmake - ]; + nativeBuildInputs = [ cmake ]; dontWrapQtApps = true; diff --git a/pkgs/desktops/deepin/library/dtkcore/default.nix b/pkgs/desktops/deepin/library/dtkcore/default.nix index f4241c8a20c0..980292bbf200 100644 --- a/pkgs/desktops/deepin/library/dtkcore/default.nix +++ b/pkgs/desktops/deepin/library/dtkcore/default.nix @@ -1,15 +1,16 @@ -{ stdenv -, lib -, fetchFromGitHub -, cmake -, pkg-config -, doxygen -, libsForQt5 -, gsettings-qt -, lshw -, libuchardet -, dtkcommon -, dtklog +{ + stdenv, + lib, + fetchFromGitHub, + cmake, + pkg-config, + doxygen, + libsForQt5, + gsettings-qt, + lshw, + libuchardet, + dtkcommon, + dtklog, }: stdenv.mkDerivation rec { @@ -50,7 +51,10 @@ stdenv.mkDerivation rec { libuchardet ]; - propagatedBuildInputs = [ dtkcommon dtklog ]; + propagatedBuildInputs = [ + dtkcommon + dtklog + ]; cmakeFlags = [ "-DDTK_VERSION=${version}" @@ -69,7 +73,11 @@ stdenv.mkDerivation rec { export QT_PLUGIN_PATH=${libsForQt5.qtbase.bin}/${libsForQt5.qtbase.qtPluginPrefix} ''; - outputs = [ "out" "dev" "doc" ]; + outputs = [ + "out" + "dev" + "doc" + ]; postFixup = '' for binary in $out/libexec/dtk5/DCore/bin/*; do diff --git a/pkgs/desktops/deepin/library/dtkdeclarative/default.nix b/pkgs/desktops/deepin/library/dtkdeclarative/default.nix index 34a21b9c9cf4..189fdc13b075 100644 --- a/pkgs/desktops/deepin/library/dtkdeclarative/default.nix +++ b/pkgs/desktops/deepin/library/dtkdeclarative/default.nix @@ -1,11 +1,12 @@ -{ stdenv -, lib -, fetchFromGitHub -, cmake -, pkg-config -, doxygen -, libsForQt5 -, dtkgui +{ + stdenv, + lib, + fetchFromGitHub, + cmake, + pkg-config, + doxygen, + libsForQt5, + dtkgui, }: stdenv.mkDerivation rec { @@ -55,7 +56,11 @@ stdenv.mkDerivation rec { export QML2_IMPORT_PATH=${libsForQt5.qtdeclarative.bin}/${libsForQt5.qtbase.qtQmlPrefix} ''; - outputs = [ "out" "dev" "doc" ]; + outputs = [ + "out" + "dev" + "doc" + ]; meta = with lib; { description = "Widget development toolkit based on QtQuick/QtQml"; diff --git a/pkgs/desktops/deepin/library/dtkgui/default.nix b/pkgs/desktops/deepin/library/dtkgui/default.nix index 53fe9123dd2e..1b8c91265366 100644 --- a/pkgs/desktops/deepin/library/dtkgui/default.nix +++ b/pkgs/desktops/deepin/library/dtkgui/default.nix @@ -1,13 +1,14 @@ -{ stdenv -, lib -, fetchFromGitHub -, pkg-config -, cmake -, doxygen -, libsForQt5 -, dtkcore -, lxqt -, librsvg +{ + stdenv, + lib, + fetchFromGitHub, + pkg-config, + cmake, + doxygen, + libsForQt5, + dtkcore, + lxqt, + librsvg, }: stdenv.mkDerivation rec { @@ -58,7 +59,11 @@ stdenv.mkDerivation rec { export QT_PLUGIN_PATH=${libsForQt5.qtbase.bin}/${libsForQt5.qtbase.qtPluginPrefix} ''; - outputs = [ "out" "dev" "doc" ]; + outputs = [ + "out" + "dev" + "doc" + ]; postFixup = '' for binary in $out/libexec/dtk5/DGui/bin/*; do diff --git a/pkgs/desktops/deepin/library/dtkwidget/default.nix b/pkgs/desktops/deepin/library/dtkwidget/default.nix index b01049045cb5..56100bedbdb3 100644 --- a/pkgs/desktops/deepin/library/dtkwidget/default.nix +++ b/pkgs/desktops/deepin/library/dtkwidget/default.nix @@ -1,15 +1,16 @@ -{ stdenv -, lib -, fetchFromGitHub -, cmake -, pkg-config -, doxygen -, libsForQt5 -, dtkgui -, cups -, gsettings-qt -, libstartup_notification -, xorg +{ + stdenv, + lib, + fetchFromGitHub, + cmake, + pkg-config, + doxygen, + libsForQt5, + dtkgui, + cups, + gsettings-qt, + libstartup_notification, + xorg, }: stdenv.mkDerivation rec { @@ -68,7 +69,11 @@ stdenv.mkDerivation rec { export QT_PLUGIN_PATH=${libsForQt5.qtbase.bin}/${libsForQt5.qtbase.qtPluginPrefix} ''; - outputs = [ "out" "dev" "doc" ]; + outputs = [ + "out" + "dev" + "doc" + ]; postFixup = '' for binary in $out/lib/dtk5/DWidget/bin/*; do diff --git a/pkgs/desktops/deepin/library/dwayland/default.nix b/pkgs/desktops/deepin/library/dwayland/default.nix index 8edf79d365bb..362c7600e64c 100644 --- a/pkgs/desktops/deepin/library/dwayland/default.nix +++ b/pkgs/desktops/deepin/library/dwayland/default.nix @@ -1,15 +1,16 @@ -{ stdenv -, lib -, fetchFromGitHub -, cmake -, qtbase -, qtwayland -, wayland -, wayland-protocols -, wayland-scanner -, extra-cmake-modules -, deepin-wayland-protocols -, qttools +{ + stdenv, + lib, + fetchFromGitHub, + cmake, + qtbase, + qtwayland, + wayland, + wayland-protocols, + wayland-scanner, + extra-cmake-modules, + deepin-wayland-protocols, + qttools, }: stdenv.mkDerivation rec { @@ -42,7 +43,7 @@ stdenv.mkDerivation rec { # cmake requires that the kf5 directory must not empty postInstall = '' - mkdir $out/include/KF5 + mkdir $out/include/KF5 ''; meta = with lib; { diff --git a/pkgs/desktops/deepin/library/gio-qt/default.nix b/pkgs/desktops/deepin/library/gio-qt/default.nix index f761444ea18d..df790e6609b4 100644 --- a/pkgs/desktops/deepin/library/gio-qt/default.nix +++ b/pkgs/desktops/deepin/library/gio-qt/default.nix @@ -1,14 +1,15 @@ -{ stdenv -, lib -, fetchFromGitHub -, cmake -, pkg-config -, wrapQtAppsHook -, glibmm -, doxygen -, qttools -, qtbase -, buildDocs ? true +{ + stdenv, + lib, + fetchFromGitHub, + cmake, + pkg-config, + wrapQtAppsHook, + glibmm, + doxygen, + qttools, + qtbase, + buildDocs ? true, }: stdenv.mkDerivation rec { @@ -29,11 +30,16 @@ stdenv.mkDerivation rec { --replace "include(qt6.cmake)" " " ''; - nativeBuildInputs = [ - cmake - pkg-config - wrapQtAppsHook - ] ++ lib.optionals buildDocs [ doxygen qttools.dev ]; + nativeBuildInputs = + [ + cmake + pkg-config + wrapQtAppsHook + ] + ++ lib.optionals buildDocs [ + doxygen + qttools.dev + ]; cmakeFlags = [ "-DCMAKE_INSTALL_LIBDIR=lib" diff --git a/pkgs/desktops/deepin/library/image-editor/default.nix b/pkgs/desktops/deepin/library/image-editor/default.nix index 4a9c35b1aece..576dda7f5a3e 100644 --- a/pkgs/desktops/deepin/library/image-editor/default.nix +++ b/pkgs/desktops/deepin/library/image-editor/default.nix @@ -1,16 +1,17 @@ -{ stdenv -, lib -, fetchFromGitHub -, dtkwidget -, cmake -, qttools -, pkg-config -, wrapQtAppsHook -, opencv -, freeimage -, libmediainfo -, ffmpegthumbnailer -, pcre +{ + stdenv, + lib, + fetchFromGitHub, + dtkwidget, + cmake, + qttools, + pkg-config, + wrapQtAppsHook, + opencv, + freeimage, + libmediainfo, + ffmpegthumbnailer, + pcre, }: stdenv.mkDerivation rec { @@ -29,7 +30,12 @@ stdenv.mkDerivation rec { substituteInPlace libimagevisualresult/CMakeLists.txt --replace '/usr' '$out' ''; - nativeBuildInputs = [ cmake pkg-config qttools wrapQtAppsHook ]; + nativeBuildInputs = [ + cmake + pkg-config + qttools + wrapQtAppsHook + ]; buildInputs = [ dtkwidget @@ -40,9 +46,7 @@ stdenv.mkDerivation rec { pcre ]; - cmakeFlags = [ - "-DCMAKE_INSTALL_LIBDIR=lib" - ]; + cmakeFlags = [ "-DCMAKE_INSTALL_LIBDIR=lib" ]; meta = with lib; { description = "Image editor lib for dtk"; diff --git a/pkgs/desktops/deepin/library/qt5integration/default.nix b/pkgs/desktops/deepin/library/qt5integration/default.nix index 41b4c7f9b03d..ccf8f6a4817d 100644 --- a/pkgs/desktops/deepin/library/qt5integration/default.nix +++ b/pkgs/desktops/deepin/library/qt5integration/default.nix @@ -1,14 +1,15 @@ -{ stdenv -, lib -, fetchFromGitHub -, dtkwidget -, cmake -, pkg-config -, libsForQt5 -, lxqt -, mtdev -, xorg -, gtest +{ + stdenv, + lib, + fetchFromGitHub, + dtkwidget, + cmake, + pkg-config, + libsForQt5, + lxqt, + mtdev, + xorg, + gtest, }: stdenv.mkDerivation rec { diff --git a/pkgs/desktops/deepin/library/qt5platform-plugins/default.nix b/pkgs/desktops/deepin/library/qt5platform-plugins/default.nix index 291fc19d5474..fbf3879cf37b 100644 --- a/pkgs/desktops/deepin/library/qt5platform-plugins/default.nix +++ b/pkgs/desktops/deepin/library/qt5platform-plugins/default.nix @@ -1,16 +1,17 @@ -{ stdenv -, lib -, fetchFromGitHub -, cmake -, extra-cmake-modules -, pkg-config -, dtkcommon -, libsForQt5 -, mtdev -, cairo -, xorg -, wayland -, dwayland +{ + stdenv, + lib, + fetchFromGitHub, + cmake, + extra-cmake-modules, + pkg-config, + dtkcommon, + libsForQt5, + mtdev, + cairo, + xorg, + wayland, + dwayland, }: stdenv.mkDerivation rec { diff --git a/pkgs/desktops/deepin/library/qt6integration/default.nix b/pkgs/desktops/deepin/library/qt6integration/default.nix index 950c2ac5c325..07b93c85f74c 100644 --- a/pkgs/desktops/deepin/library/qt6integration/default.nix +++ b/pkgs/desktops/deepin/library/qt6integration/default.nix @@ -1,11 +1,12 @@ -{ stdenv -, lib -, fetchFromGitHub -, cmake -, pkg-config -, dtk6widget -, qt6Packages -, gtest +{ + stdenv, + lib, + fetchFromGitHub, + cmake, + pkg-config, + dtk6widget, + qt6Packages, + gtest, }: stdenv.mkDerivation rec { diff --git a/pkgs/desktops/deepin/library/qt6platform-plugins/default.nix b/pkgs/desktops/deepin/library/qt6platform-plugins/default.nix index 335e728f8a2b..09bd21a24835 100644 --- a/pkgs/desktops/deepin/library/qt6platform-plugins/default.nix +++ b/pkgs/desktops/deepin/library/qt6platform-plugins/default.nix @@ -1,13 +1,14 @@ -{ stdenv -, lib -, fetchFromGitHub -, fetchpatch -, cmake -, pkg-config -, mtdev -, cairo -, xorg -, qt6Packages +{ + stdenv, + lib, + fetchFromGitHub, + fetchpatch, + cmake, + pkg-config, + mtdev, + cairo, + xorg, + qt6Packages, }: stdenv.mkDerivation rec { diff --git a/pkgs/desktops/deepin/library/udisks2-qt5/default.nix b/pkgs/desktops/deepin/library/udisks2-qt5/default.nix index 84321809ebeb..3a9be5a65879 100644 --- a/pkgs/desktops/deepin/library/udisks2-qt5/default.nix +++ b/pkgs/desktops/deepin/library/udisks2-qt5/default.nix @@ -1,10 +1,11 @@ -{ stdenv -, lib -, fetchFromGitHub -, qmake -, pkg-config -, wrapQtAppsHook -, udisks +{ + stdenv, + lib, + fetchFromGitHub, + qmake, + pkg-config, + wrapQtAppsHook, + udisks, }: stdenv.mkDerivation rec { @@ -18,7 +19,11 @@ stdenv.mkDerivation rec { sha256 = "sha256-WS4fmqEYXi5dkn8RvyJBzy3+r+UgFcGDFFpQlbblLu4="; }; - nativeBuildInputs = [ qmake pkg-config wrapQtAppsHook ]; + nativeBuildInputs = [ + qmake + pkg-config + wrapQtAppsHook + ]; buildInputs = [ udisks ]; diff --git a/pkgs/desktops/deepin/library/util-dfm/default.nix b/pkgs/desktops/deepin/library/util-dfm/default.nix index e3fe31526cf4..140b28fc7327 100644 --- a/pkgs/desktops/deepin/library/util-dfm/default.nix +++ b/pkgs/desktops/deepin/library/util-dfm/default.nix @@ -1,14 +1,15 @@ -{ stdenv -, lib -, fetchFromGitHub -, cmake -, pkg-config -, qtbase -, libmediainfo -, libsecret -, libisoburn -, libuuid -, udisks +{ + stdenv, + lib, + fetchFromGitHub, + cmake, + pkg-config, + qtbase, + libmediainfo, + libsecret, + libisoburn, + libuuid, + udisks, }: stdenv.mkDerivation rec { diff --git a/pkgs/desktops/deepin/misc/deepin-desktop-base/default.nix b/pkgs/desktops/deepin/misc/deepin-desktop-base/default.nix index ae1120032450..7f4c433914c2 100644 --- a/pkgs/desktops/deepin/misc/deepin-desktop-base/default.nix +++ b/pkgs/desktops/deepin/misc/deepin-desktop-base/default.nix @@ -1,7 +1,8 @@ -{ stdenvNoCC -, lib -, fetchFromGitHub -, nixos-icons +{ + stdenvNoCC, + lib, + fetchFromGitHub, + nixos-icons, }: stdenvNoCC.mkDerivation rec { pname = "deepin-desktop-base"; @@ -39,7 +40,10 @@ stdenvNoCC.mkDerivation rec { meta = with lib; { description = "Base assets and definitions for Deepin Desktop Environment"; homepage = "https://github.com/linuxdeepin/deepin-desktop-base"; - license = with licenses; [ gpl3Plus cc-by-40 ]; + license = with licenses; [ + gpl3Plus + cc-by-40 + ]; platforms = platforms.linux; maintainers = teams.deepin.members; }; diff --git a/pkgs/desktops/deepin/misc/deepin-turbo/default.nix b/pkgs/desktops/deepin/misc/deepin-turbo/default.nix index 2d3c5a020884..973df30e5bb5 100644 --- a/pkgs/desktops/deepin/misc/deepin-turbo/default.nix +++ b/pkgs/desktops/deepin/misc/deepin-turbo/default.nix @@ -1,10 +1,11 @@ -{ stdenv -, lib -, fetchFromGitHub -, cmake -, pkg-config -, wrapQtAppsHook -, dtkwidget +{ + stdenv, + lib, + fetchFromGitHub, + cmake, + pkg-config, + wrapQtAppsHook, + dtkwidget, }: stdenv.mkDerivation rec { @@ -24,9 +25,7 @@ stdenv.mkDerivation rec { wrapQtAppsHook ]; - buildInputs = [ - dtkwidget - ]; + buildInputs = [ dtkwidget ]; postPatch = '' substituteInPlace src/{booster-dtkwidget/CMakeLists.txt,booster-desktop/{CMakeLists.txt,desktop.conf},booster-generic/CMakeLists.txt} --replace "/usr" "$out" diff --git a/pkgs/desktops/deepin/tools/dde-device-formatter/default.nix b/pkgs/desktops/deepin/tools/dde-device-formatter/default.nix index fd6ae6f42541..08093b0befd7 100644 --- a/pkgs/desktops/deepin/tools/dde-device-formatter/default.nix +++ b/pkgs/desktops/deepin/tools/dde-device-formatter/default.nix @@ -1,16 +1,17 @@ -{ stdenv -, lib -, fetchFromGitHub -, dtkwidget -, deepin-gettext-tools -, qt5integration -, qmake -, qtbase -, qttools -, qtx11extras -, pkg-config -, wrapQtAppsHook -, udisks2-qt5 +{ + stdenv, + lib, + fetchFromGitHub, + dtkwidget, + deepin-gettext-tools, + qt5integration, + qmake, + qtbase, + qttools, + qtx11extras, + pkg-config, + wrapQtAppsHook, + udisks2-qt5, }: stdenv.mkDerivation rec { @@ -49,9 +50,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DVERSION=${version}" ]; # qt5integration must be placed before qtsvg in QT_PLUGIN_PATH - qtWrapperArgs = [ - "--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}" - ]; + qtWrapperArgs = [ "--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}" ]; meta = with lib; { description = "Simple graphical interface for creating file system in a block device"; diff --git a/pkgs/desktops/deepin/tools/deepin-anything/default.nix b/pkgs/desktops/deepin/tools/deepin-anything/default.nix index cfcbb6f1c1f7..42da994bbb00 100644 --- a/pkgs/desktops/deepin/tools/deepin-anything/default.nix +++ b/pkgs/desktops/deepin/tools/deepin-anything/default.nix @@ -1,14 +1,15 @@ -{ stdenv -, lib -, fetchFromGitHub -, cmake -, pkg-config -, wrapQtAppsHook -, udisks2-qt5 -, util-linux -, libnl -, glib -, pcre +{ + stdenv, + lib, + fetchFromGitHub, + cmake, + pkg-config, + wrapQtAppsHook, + udisks2-qt5, + util-linux, + libnl, + glib, + pcre, }: stdenv.mkDerivation rec { diff --git a/pkgs/desktops/deepin/tools/deepin-gettext-tools/default.nix b/pkgs/desktops/deepin/tools/deepin-gettext-tools/default.nix index f9a789c21989..7f2db77f4567 100644 --- a/pkgs/desktops/deepin/tools/deepin-gettext-tools/default.nix +++ b/pkgs/desktops/deepin/tools/deepin-gettext-tools/default.nix @@ -1,9 +1,10 @@ -{ stdenv -, lib -, fetchFromGitHub -, gettext -, python3Packages -, perlPackages +{ + stdenv, + lib, + fetchFromGitHub, + gettext, + python3Packages, + perlPackages, }: stdenv.mkDerivation rec { @@ -30,9 +31,7 @@ stdenv.mkDerivation rec { perlPackages.XMLLibXML ]; - makeFlags = [ - "PREFIX=${placeholder "out"}" - ]; + makeFlags = [ "PREFIX=${placeholder "out"}" ]; postFixup = '' wrapPythonPrograms diff --git a/pkgs/development/libraries/libbluray/default.nix b/pkgs/development/libraries/libbluray/default.nix index f50172851d61..672908281b0e 100644 --- a/pkgs/development/libraries/libbluray/default.nix +++ b/pkgs/development/libraries/libbluray/default.nix @@ -28,6 +28,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = lib.optional withAACS libaacs; + env.JAVA_HOME = lib.optionalString withJava jdk17.home; # Fails at runtime without this env.NIX_LDFLAGS = lib.optionalString withAACS "-L${libaacs}/lib -laacs" + lib.optionalString withBDplus " -L${libbdplus}/lib -lbdplus"; diff --git a/pkgs/development/python-modules/aiovlc/default.nix b/pkgs/development/python-modules/aiovlc/default.nix index bb710c096fe5..50160231ac9d 100644 --- a/pkgs/development/python-modules/aiovlc/default.nix +++ b/pkgs/development/python-modules/aiovlc/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "aiovlc"; - version = "0.4.1"; + version = "0.4.2"; pyproject = true; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "MartinHjelmare"; repo = "aiovlc"; rev = "refs/tags/v${version}"; - hash = "sha256-6oAnij92lR/sbU80j4WIBCvScPvoVLTMRYlT5zHnVnk="; + hash = "sha256-8JDYh+Ym4UF6zjzN+xE0SzeS3BrrYv1MT6w0kn62ASQ="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/google-nest-sdm/default.nix b/pkgs/development/python-modules/google-nest-sdm/default.nix index eac1c112d881..bf576a7e5423 100644 --- a/pkgs/development/python-modules/google-nest-sdm/default.nix +++ b/pkgs/development/python-modules/google-nest-sdm/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "google-nest-sdm"; - version = "4.0.7"; + version = "5.0.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "allenporter"; repo = "python-google-nest-sdm"; rev = "refs/tags/${version}"; - hash = "sha256-jnTsr29XRDvFEiHQxPMS419O0OB5z+Z17vl6g0K125s="; + hash = "sha256-1jN3X7Cxh2yX58Hup89bW16mc8F/C3CsUcz91FZHo70="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/peaqevcore/default.nix b/pkgs/development/python-modules/peaqevcore/default.nix index 3f23d3aaffa5..38619f184f30 100644 --- a/pkgs/development/python-modules/peaqevcore/default.nix +++ b/pkgs/development/python-modules/peaqevcore/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "peaqevcore"; - version = "19.10.24"; + version = "19.11.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-jpJVYANreHUW6vclkdNdnaFb/QxFfJf0nuTBl3K3qBY="; + hash = "sha256-SVLyapbp9pNEznLetOppzmIc9fQuZF1MSfLsWVwIVGQ="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pymanopt/default.nix b/pkgs/development/python-modules/pymanopt/default.nix index 019d107e2342..0172ecc6540d 100644 --- a/pkgs/development/python-modules/pymanopt/default.nix +++ b/pkgs/development/python-modules/pymanopt/default.nix @@ -8,21 +8,31 @@ autograd, matplotlib, pytestCheckHook, + setuptools-scm, }: buildPythonPackage rec { pname = "pymanopt"; - version = "2.2.0"; - format = "setuptools"; + version = "2.2.0-unstable-2024-07-10"; + pyproject = true; + + env.SETUPTOOLS_SCM_PRETEND_VERSION = "2.2.0"; src = fetchFromGitHub { owner = pname; repo = pname; - rev = "refs/tags/${version}"; - hash = "sha256-pDFRYhswcuAHG9pcqvzXIy3Ivhxe5R5Ric7AFRh7MK4="; + rev = "1de3b6f47258820fdc072fceaeaa763b9fd263b0"; + hash = "sha256-j/fVeMgoLLBgRYFtSj2ZyNJb8iuWlnn2/YpBqUoCAFk="; }; - propagatedBuildInputs = [ + preConfigure = '' + substituteInPlace pyproject.toml --replace-fail "\"pip==22.3.1\"," "" + ''; + + build-system = [ + setuptools-scm + ]; + dependencies = [ numpy scipy torch @@ -35,14 +45,15 @@ buildPythonPackage rec { preCheck = '' substituteInPlace "tests/conftest.py" \ - --replace "import tensorflow as tf" "" + --replace-fail "import tensorflow as tf" "" substituteInPlace "tests/conftest.py" \ - --replace "tf.random.set_seed(seed)" "" + --replace-fail "tf.random.set_seed(seed)" "" ''; disabledTestPaths = [ "tests/test_examples.py" "tests/backends/test_tensorflow.py" + "tests/backends/test_jax.py" "tests/test_problem.py" ]; @@ -53,6 +64,5 @@ buildPythonPackage rec { homepage = "https://www.pymanopt.org/"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ yl3dy ]; - broken = lib.versionAtLeast scipy.version "1.10.0"; }; } diff --git a/pkgs/development/python-modules/scalene/01-manifest-no-git.patch b/pkgs/development/python-modules/scalene/01-manifest-no-git.patch new file mode 100644 index 000000000000..85f4bf7e86b4 --- /dev/null +++ b/pkgs/development/python-modules/scalene/01-manifest-no-git.patch @@ -0,0 +1,23 @@ +From 4e25ccee2f1eeed1dfdd9356b4fde511a48d9f01 Mon Sep 17 00:00:00 2001 +From: Sarah Clark +Date: Sat, 24 Aug 2024 11:32:38 -0700 +Subject: [PATCH] Update MANIFEST.in to remove .git references + +--- + MANIFEST.in | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/MANIFEST.in b/MANIFEST.in +index 5ebcb7781..7340b1982 100644 +--- a/MANIFEST.in ++++ b/MANIFEST.in +@@ -1,5 +1,5 @@ + graft vendor/Heap-Layers +-prune vendor/Heap-Layers/.git ++# prune vendor/Heap-Layers/.git + graft vendor/printf +-prune vendor/printf/.git ++# prune vendor/printf/.git + exclude scalene/old/* + +-- diff --git a/pkgs/development/python-modules/scalene/02-pyproject-unpin-setuptools.patch b/pkgs/development/python-modules/scalene/02-pyproject-unpin-setuptools.patch new file mode 100644 index 000000000000..80ab0080e631 --- /dev/null +++ b/pkgs/development/python-modules/scalene/02-pyproject-unpin-setuptools.patch @@ -0,0 +1,23 @@ +From 777be9c46c4caed5f3fcde65b70ada4d773f4298 Mon Sep 17 00:00:00 2001 +From: Sarah Clark +Date: Sat, 24 Aug 2024 11:26:30 -0700 +Subject: [PATCH] Unpin setuptools + +--- + pyproject.toml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/pyproject.toml b/pyproject.toml +index d17d12dc8..6bf1c7a38 100644 +--- a/pyproject.toml ++++ b/pyproject.toml +@@ -54,7 +54,7 @@ scalene = "scalene.__main__:main" + [build-system] + build-backend = "setuptools.build_meta" + requires = [ +- "setuptools>=65.5.1,<71.0", # Pin to setuptools<71.0 to avoid this bug: https://github.com/pypa/setuptools/issues/4496 ++ "setuptools>=65.5.1", + "setuptools_scm>=8", + "wheel", + "cython", +-- diff --git a/pkgs/development/python-modules/scalene/default.nix b/pkgs/development/python-modules/scalene/default.nix index 6f5adae67d84..820de7be473b 100644 --- a/pkgs/development/python-modules/scalene/default.nix +++ b/pkgs/development/python-modules/scalene/default.nix @@ -2,33 +2,67 @@ lib, stdenv, buildPythonPackage, - hypothesis, - fetchPypi, - setuptools, - setuptools-scm, + fetchFromGitHub, cloudpickle, cython, + hypothesis, jinja2, numpy, + nvidia-ml-py, psutil, pynvml, - nvidia-ml-py, pytestCheckHook, pythonOlder, rich, + setuptools-scm, + setuptools, }: +let + heap-layers-src = fetchFromGitHub { + owner = "emeryberger"; + repo = "heap-layers"; + name = "Heap-Layers"; + rev = "a2048eae91b531dc5d72be7a194e0b333c06bd4c"; + sha256 = "sha256-vl3z30CBX7hav/DM/UE0EQ9lLxZF48tMJrYMXuSulyA="; + }; + + printf-src = fetchFromGitHub { + owner = "mpaland"; + repo = "printf"; + name = "printf"; + rev = "v4.0.0"; + sha256 = "sha256-tgLJNJw/dJGQMwCmfkWNBvHB76xZVyyfVVplq7aSJnI="; + }; +in + buildPythonPackage rec { pname = "scalene"; - version = "1.5.43.2"; + version = "1.5.44.1"; pyproject = true; disabled = pythonOlder "3.9"; - src = fetchPypi { - inherit pname version; - hash = "sha256-LtD7v3pLz4UCnh6xlhkPdcEjyu3mt+YQPYZ0nNCLuDw="; + src = fetchFromGitHub { + owner = "plasma-umass"; + repo = "scalene"; + rev = "v${version}"; + hash = "sha256-XMz+gwiNaKiKplD4kOE1yhcg+dkzjEdDYjW0JsDEMQE="; }; + patches = [ + ./01-manifest-no-git.patch + ./02-pyproject-unpin-setuptools.patch + ]; + + prePatch = '' + cp -r ${heap-layers-src} vendor/Heap-Layers + mkdir vendor/printf + cp ${printf-src}/printf.c vendor/printf/printf.cpp + cp -r ${printf-src}/* vendor/printf + sed -i"" 's/^#define printf printf_/\/\/&/' vendor/printf/printf.h + sed -i"" 's/^#define vsnprintf vsnprintf_/\/\/&/' vendor/printf/printf.h + ''; + nativeBuildInputs = [ cython setuptools @@ -38,9 +72,10 @@ buildPythonPackage rec { propagatedBuildInputs = [ cloudpickle jinja2 + numpy psutil - rich pynvml + rich ] ++ lib.optionals stdenv.hostPlatform.isLinux [ nvidia-ml-py ]; pythonRemoveDeps = [ @@ -56,6 +91,11 @@ buildPythonPackage rec { numpy ]; + disabledTests = [ + # Flaky -- socket collision + "test_show_browser" + ]; + # remove scalene directory to prevent pytest import confusion preCheck = '' rm -rf scalene diff --git a/pkgs/kde/gear/ghostwriter/default.nix b/pkgs/kde/gear/ghostwriter/default.nix index 273e805549e7..1bcb0e004050 100644 --- a/pkgs/kde/gear/ghostwriter/default.nix +++ b/pkgs/kde/gear/ghostwriter/default.nix @@ -1,4 +1,5 @@ { + lib, mkKdeDerivation, qtsvg, qttools, @@ -8,11 +9,34 @@ pkg-config, hunspell, kdoctools, + pandoc, + multimarkdown, + cmark, }: mkKdeDerivation { pname = "ghostwriter"; - extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [qtsvg qttools qtwebchannel qtwebengine qt5compat kdoctools hunspell]; + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ + qtsvg + qttools + qtwebchannel + qtwebengine + qt5compat + kdoctools + hunspell + ]; + + qtWrapperArgs = [ + "--prefix" + "PATH" + ":" + (lib.makeBinPath [ + cmark + multimarkdown + pandoc + ]) + ]; + meta.mainProgram = "ghostwriter"; } diff --git a/pkgs/tools/misc/bat-extras/default.nix b/pkgs/tools/misc/bat-extras/default.nix index 00ef24a19e43..1c3a805367f2 100644 --- a/pkgs/tools/misc/bat-extras/default.nix +++ b/pkgs/tools/misc/bat-extras/default.nix @@ -68,11 +68,6 @@ let echo "Couldn't find any library test suites" exit 1 } - - # Skip the batdiff test because it's broken - # https://github.com/eth-p/bat-extras/issues/126 - sed -i '/test:version/a skip "batdiff test is broken."' test/suite/batdiff.sh - ./test.sh --compiled $(printf -- "--suite %q\n" "''${!test_suites[@]}") runHook postCheck ''; diff --git a/pkgs/tools/package-management/deploy-rs/default.nix b/pkgs/tools/package-management/deploy-rs/default.nix deleted file mode 100644 index ad656ca385e4..000000000000 --- a/pkgs/tools/package-management/deploy-rs/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, rustPlatform -, CoreServices -, SystemConfiguration -}: - -rustPlatform.buildRustPackage { - pname = "deploy-rs"; - version = "unstable-2024-02-16"; - - src = fetchFromGitHub { - owner = "serokell"; - repo = "deploy-rs"; - rev = "0a0187794ac7f7a1e62cda3dabf8dc041f868790"; - hash = "sha256-dTGGw2y8wvfjr+J9CjQbfdulOq72hUG17HXVNxpH1yE="; - }; - - cargoHash = "sha256-Vo/45cZM/sBAaoikhEwCvduhMQjurwSZwCjwrIQn7IA="; - - buildInputs = lib.optionals stdenv.isDarwin [ - CoreServices - SystemConfiguration - ]; - - meta = with lib; { - description = "Multi-profile Nix-flake deploy tool"; - homepage = "https://github.com/serokell/deploy-rs"; - license = licenses.mpl20; - maintainers = with maintainers; [ teutat3s ]; - mainProgram = "deploy"; - }; -} diff --git a/pkgs/tools/security/exploitdb/default.nix b/pkgs/tools/security/exploitdb/default.nix index 203bc6fc6e7d..816e3c462d29 100644 --- a/pkgs/tools/security/exploitdb/default.nix +++ b/pkgs/tools/security/exploitdb/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2024-08-05"; + version = "2024-08-24"; src = fetchFromGitLab { owner = "exploit-database"; repo = "exploitdb"; rev = "refs/tags/${version}"; - hash = "sha256-LXbcFX0yTtnZWyDr0O8d1U4CX/FrjmAqHzoDNAQiqLY="; + hash = "sha256-Ga80kO/60pbjdoBirgNXJECpx6ylDyd5d/5gHUZ5ong="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6adbc910e901..8e9d5dc71d50 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -38105,10 +38105,6 @@ with pkgs; dell-530cdn = callPackage ../misc/drivers/dell-530cdn { }; - deploy-rs = callPackage ../tools/package-management/deploy-rs { - inherit (darwin.apple_sdk.frameworks) CoreServices SystemConfiguration; - }; - dockutil = callPackage ../os-specific/darwin/dockutil { }; eiciel = callPackage ../tools/filesystems/eiciel { };