nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-25 00:12:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot] 2024-09-23 06:04:59 +00:00 committed by GitHub
commit 9a442c4aa9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
19 changed files with 79 additions and 113 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/by-name/db/dbeaver-bin/package.nix
View File

@ -17,7 +17,7 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "dbeaver-bin";
version = "24.2.0";
version = "24.2.1";
src =
let
@ -30,10 +30,10 @@ stdenvNoCC.mkDerivation (finalAttrs: {
aarch64-darwin = "macos-aarch64.dmg";
};
hash = selectSystem {
x86_64-linux = "sha256-N4r2immlH6B6rWluFX9abU5gnavPFY1ZoNtKpzCxwh4=";
aarch64-linux = "sha256-oRU+0iMLno1xIVI3NzeJfDrz5CuPlccICM/zpxRvV40=";
x86_64-darwin = "sha256-oUUof1HYeULP3qPr9mB69ZU83VuI4hJ09w03fjc+1Y4=";
aarch64-darwin = "sha256-JZfj0dgaqEndzyLgBwFrFebWxz7O/53qA9aTeOEWvLE=";
x86_64-linux = "sha256-U1KJxE1PzRRMvYw3jSYV2n6JuhzyL30le1HeY0kft1k=";
aarch64-linux = "sha256-AT/Xx+Hwu64sUfR1fS9nI+RTsIfdi9udF9TR9hbjnxg=";
x86_64-darwin = "sha256-hCIfBv6FaNoZiTvpx1UCdwBg15vq+ZsTG5upmbWXN0M=";
aarch64-darwin = "sha256-g0G6fqR75AoOEzlYr6MbTBL8aQ/hWQuFyw1G2w9/JlU=";
};
in
fetchurl {

6
pkgs/by-name/go/google-chrome/package.nix
View File

@ -258,11 +258,11 @@ let
darwin = stdenvNoCC.mkDerivation (finalAttrs: {
inherit pname meta passthru;
version = "128.0.6613.138";
version = "129.0.6668.59";
src = fetchurl {
url = "http://dl.google.com/release2/chrome/gtm24cqmnwgcp7dtscvlmsbrwa_128.0.6613.138/GoogleChrome-128.0.6613.138.dmg";
hash = "sha256-wd6n3AeKxKdz+5X9XxTi1QHzmByzKRgIWcc3iBHhtZs=";
url = "http://dl.google.com/release2/chrome/acinjqjzbtmzhvrebvzymzvzfaoq_129.0.6668.59/GoogleChrome-129.0.6668.59.dmg";
hash = "sha256-02J3TpcAsCvsB71C8/bfgIxiqcGIxjKiTWR32On66+g=";
};
dontPatch = true;

2
pkgs/by-name/go/google-chrome/update.sh
View File

@ -10,7 +10,7 @@ get_version_info() {
local start_pattern="$2"
local end_pattern="$3"
local url="https://versionhistory.googleapis.com/v1/chrome/platforms/${platform}/channels/stable/versions/all/releases"
local url="https://versionhistory.googleapis.com/v1/chrome/platforms/${platform}/channels/stable/versions/all/releases?filter=endtime=none,fraction>=0.5&order_by=version%20desc"
local response
local version
local current_version

23
pkgs/desktops/deepin/apps/deepin-editor/default.nix
View File

@ -4,48 +4,43 @@
fetchFromGitHub,
cmake,
pkg-config,
qttools,
wrapQtAppsHook,
dtkwidget,
qt5integration,
qt5platform-plugins,
qtbase,
qtsvg,
dde-qt-dbus-factory,
kcodecs,
syntax-highlighting,
libchardet,
libuchardet,
libiconv,
libsForQt5,
}:
stdenv.mkDerivation rec {
pname = "deepin-editor";
version = "6.5.0";
version = "6.5.2";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
hash = "sha256-f6CJlSgsKU311ziXmm7Ado8tH+3dNRpWB1e4TewVf/8=";
hash = "sha256-Z3fsnjo4Pcu1e8lKvWdWBhpoOFFy0dSrI2HehRYKJ0k=";
};
nativeBuildInputs = [
cmake
pkg-config
qttools
wrapQtAppsHook
libsForQt5.qttools
libsForQt5.wrapQtAppsHook
];
buildInputs = [
dtkwidget
qt5integration
qt5platform-plugins
qtbase
qtsvg
libsForQt5.qtbase
libsForQt5.qtsvg
dde-qt-dbus-factory
kcodecs
syntax-highlighting
libsForQt5.kcodecs
libsForQt5.syntax-highlighting
libchardet
libuchardet
libiconv

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

@ -4,35 +4,28 @@
fetchFromGitHub,
cmake,
pkg-config,
qttools,
doxygen,
wrapQtAppsHook,
wrapGAppsHook3,
wayland-scanner,
wayland,
dtkwidget,
qt5integration,
qt5platform-plugins,
libsForQt5,
deepin-pw-check,
qtbase,
qtx11extras,
qtmultimedia,
polkit-qt,
libxcrypt,
librsvg,
gtest,
runtimeShell,
dbus,
}:
stdenv.mkDerivation rec {
pname = "dde-control-center";
version = "6.0.59";
version = "6.0.65";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
hash = "sha256-OniY/B/9319AYYFFPnsUMNrnc0yVGG3rfCLPjgNFyag=";
hash = "sha256-9v2UtLjQQ3OX69UxMknLlrQhorahDI4Z4EEHItBs7G0=";
};
postPatch = ''
@ -43,24 +36,22 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
cmake
pkg-config
qttools
libsForQt5.qttools
doxygen
wrapQtAppsHook
wrapGAppsHook3
libsForQt5.wrapQtAppsHook
wayland-scanner
];
dontWrapGApps = true;
buildInputs = [
wayland
dtkwidget
qt5platform-plugins
qt5integration
deepin-pw-check
qtbase
qtx11extras
qtmultimedia
polkit-qt
libsForQt5.qtbase
libsForQt5.qtmultimedia
libsForQt5.polkit-qt
libxcrypt
librsvg
gtest
];
@ -79,17 +70,7 @@ stdenv.mkDerivation rec {
preConfigure = ''
# qt.qpa.plugin: Could not find the Qt platform plugin "minimal"
# A workaround is to set QT_PLUGIN_PATH explicitly
export QT_PLUGIN_PATH=${qtbase.bin}/${qtbase.qtPluginPrefix}
'';
# qt5integration must be placed before qtsvg in QT_PLUGIN_PATH
qtWrapperArgs = [
"--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}"
"--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ librsvg ]}"
];
preFixup = ''
qtWrapperArgs+=("''${gappsWrapperArgs[@]}")
export QT_PLUGIN_PATH=${libsForQt5.qtbase.bin}/${libsForQt5.qtbase.qtPluginPrefix}
'';
outputs = [
@ -97,12 +78,12 @@ stdenv.mkDerivation rec {
"dev"
];
meta = with lib; {
meta = {
description = "Control panel of Deepin Desktop Environment";
mainProgram = "dde-control-center";
homepage = "https://github.com/linuxdeepin/dde-control-center";
license = licenses.gpl3Plus;
platforms = platforms.linux;
maintainers = teams.deepin.members;
license = lib.licenses.gpl3Plus;
platforms = lib.platforms.linux;
maintainers = lib.teams.deepin.members;
};
}

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

@ -13,13 +13,13 @@
stdenv.mkDerivation rec {
pname = "dde-launchpad";
version = "0.8.4";
version = "1.0.2";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
hash = "sha256-MPOzKAgwhJa7pMO6EZ6vYyYgZSD/SbU/L0L1dkN9/po=";
hash = "sha256-kczdSd9+ZmMZQ2fWg3SRW+CS/aWktYLz/H+Ky81TwVM=";
};
nativeBuildInputs = [
@ -45,12 +45,12 @@ stdenv.mkDerivation rec {
cmakeFlags = [ "-DSYSTEMD_USER_UNIT_DIR=${placeholder "out"}/lib/systemd/user" ];
meta = with lib; {
meta = {
description = "'launcher' or 'start menu' component for DDE";
mainProgram = "dde-launchpad";
homepage = "https://github.com/linuxdeepin/dde-launchpad";
license = licenses.gpl3Plus;
platforms = platforms.linux;
maintainers = teams.deepin.members;
license = lib.licenses.gpl3Plus;
platforms = lib.platforms.linux;
maintainers = lib.teams.deepin.members;
};
}

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

@ -3,44 +3,40 @@
lib,
fetchFromGitHub,
cmake,
qttools,
pkg-config,
wrapQtAppsHook,
qtbase,
qtsvg,
dtkwidget,
dde-control-center,
dde-session-shell,
networkmanager-qt,
libsForQt5,
glib,
gtest,
}:
stdenv.mkDerivation rec {
pname = "dde-network-core";
version = "2.0.32";
version = "2.0.34";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
hash = "sha256-dXLvBCNitlV07dH/rPatsbP6DFf8SZQ7hcDUYtqt2FA=";
hash = "sha256-bS/PkutP5BQtqZ6MzeImFyGKoztoTswXhXaEftEv0FI=";
};
nativeBuildInputs = [
cmake
qttools
libsForQt5.qttools
pkg-config
wrapQtAppsHook
libsForQt5.wrapQtAppsHook
];
buildInputs = [
qtbase
qtsvg
libsForQt5.qtbase
libsForQt5.qtsvg
dtkwidget
dde-control-center
dde-session-shell
networkmanager-qt
libsForQt5.networkmanager-qt
glib
gtest
];
@ -49,11 +45,11 @@ stdenv.mkDerivation rec {
strictDeps = true;
meta = with lib; {
meta = {
description = "DDE network library framework";
homepage = "https://github.com/linuxdeepin/dde-network-core";
license = licenses.gpl3Plus;
platforms = platforms.linux;
maintainers = teams.deepin.members;
license = lib.licenses.gpl3Plus;
platforms = lib.platforms.linux;
maintainers = lib.teams.deepin.members;
};
}

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

@ -2,7 +2,6 @@
stdenv,
lib,
fetchFromGitHub,
fetchpatch,
cmake,
extra-cmake-modules,
pkg-config,
@ -23,22 +22,17 @@
stdenv.mkDerivation (finalAttrs: {
pname = "dde-shell";
version = "0.0.43";
version = "1.0.2";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = "dde-shell";
rev = finalAttrs.version;
hash = "sha256-wSk1gEJbTxKUPZ6DiTeVw2qyX+CwANA37ZP0tXnz0J0=";
hash = "sha256-I3z6HL1h3qmLfOrwhyLhtSz3og4kHcAdlHJx4+SgPRo=";
};
patches = [
./fix-path-for-nixos.diff
(fetchpatch {
name = "fix-libdock-plugin_so-contains-a-forbidden-reference.diff";
url = "https://github.com/linuxdeepin/dde-shell/commit/bf9a0472bc44748a3c389d796d144dad6b13617b.patch";
hash = "sha256-cP5zMsfPyi4FIR1OIbVSnn+Z+KqRuIK7a214VjVb/7w=";
})
];
postPatch = ''

10
pkgs/desktops/deepin/core/dde-tray-loader/default.nix
View File

@ -18,20 +18,20 @@
stdenv.mkDerivation (finalAttrs: {
pname = "dde-tray-loader";
version = "0.0.11";
version = "1.0.1";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = "dde-tray-loader";
rev = finalAttrs.version;
hash = "sha256-kz8+essf6O3ckeY5/5a/Z6539qNcfOnGbGTqSo5swhc=";
hash = "sha256-FEvoVgwzDYN23TJxu1kRSMSbS4hELYFFByxOsEO9JKE=";
};
patches = [
(fetchpatch {
name = "set-version-for-dde-dock_pc.patch";
url = "https://github.com/linuxdeepin/dde-tray-loader/commit/0f9b90a9aa8096a92c21c8f01d29b4785aaf04e5.patch";
hash = "sha256-A6k8XjyIDbA+XuUxYWd5yxFJ8yOWMOtUH5Vg10o//YM=";
name = "remove-useless-function.patch";
url = "https://github.com/linuxdeepin/dde-tray-loader/commit/cf85f68db52472a0291bbbc3c298d7a2b701e4bc.patch";
hash = "sha256-ks7Rg5kLQvo03XKbfQaqu/heP2yoVEbNO6UhDv99JBY=";
})
];

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

@ -14,13 +14,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "dtk6core";
version = "6.0.18";
version = "6.0.19";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = "dtk6core";
rev = finalAttrs.version;
hash = "sha256-zyhqkxxWB5U37eBxINNxcbnF5NpImg+E7H1VhfJDz60=";
hash = "sha256-3MwvTnjtVVcMjQa1f4UdagEtWhJj8aDgfUlmnGo/R7s=";
};
patches = [

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

@ -11,13 +11,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "dtk6declarative";
version = "6.0.18";
version = "6.0.19";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = "dtk6declarative";
rev = finalAttrs.version;
hash = "sha256-/bQGb87UbnIRWwR6Of67VrRUkrNk6dmY7bjgwDXc30Y";
hash = "sha256-BxWPLJeuQDbNg4UoyHD/VAMV2QFWDjWZiFx5JOEmLxg=";
};
patches = [

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

@ -12,13 +12,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "dtk6gui";
version = "6.0.18";
version = "6.0.19";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = "dtk6gui";
rev = finalAttrs.version;
hash = "sha256-w8tyc06v/juTP0YSsyWai1ONl4Aa7dzREIc5wLnI/vw=";
hash = "sha256-nqwkBMcCQiW4iqYhceTaSNNxoR5tvCNfjKUVVHkzN3A=";
};
patches = [

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

@ -13,13 +13,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "dtk6widget";
version = "6.0.18";
version = "6.0.19";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = "dtk6widget";
rev = finalAttrs.version;
hash = "sha256-6H3Dtdyq/adb3jz9lGaKmOguXqvhvZn1/G7+YajyF2k=";
hash = "sha256-VlFzecX76RMNSBpnMc9HwMPZ5z3zzzkcVcNlGKSShyA=";
};
patches = [

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

@ -11,13 +11,13 @@
stdenv.mkDerivation rec {
pname = "qt6integration";
version = "6.0.18";
version = "6.0.19";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
hash = "sha256-7FGOnAAcwOonpMDDukj88s1b4WmLJNu7MZSW7f7P44g=";
hash = "sha256-RVhAuEthrTE1QkRIKmBK4VM86frgAqLMJL31F11H8R8=";
};
nativeBuildInputs = [

4
pkgs/desktops/deepin/library/qt6platform-plugins/default.nix
View File

@ -12,13 +12,13 @@
stdenv.mkDerivation rec {
pname = "qt6platform-plugins";
version = "6.0.18";
version = "6.0.19";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
hash = "sha256-O2wylkNKqN0JxKffwFNSfv7S1hPIFrVKwSsppSGTp6I=";
hash = "sha256-aHqm+WKZLoUymiMFfrF3jgWrxgq51d6yTXWiOMsFgiQ=";
};
postUnpack = ''

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

@ -9,13 +9,13 @@
stdenv.mkDerivation rec {
pname = "tagparser";
version = "12.3.0";
version = "12.3.1";
src = fetchFromGitHub {
owner = "Martchus";
repo = "tagparser";
rev = "v${version}";
hash = "sha256-dhdUbEnwj4hP/Mn9bT6nja9OjPdXftzZou7mtH+P9bI=";
hash = "sha256-ihrtUd9R8Tdkuv0kdIZNzBDrhwmsC3LNDsmoCroSMPM=";
};
nativeBuildInputs = [ cmake ];

4
pkgs/development/ocaml-modules/angstrom/default.nix
View File

@ -2,7 +2,7 @@
buildDunePackage rec {
pname = "angstrom";
version = "0.16.0";
version = "0.16.1";
minimalOCamlVersion = "4.04";
@ -10,7 +10,7 @@ buildDunePackage rec {
owner = "inhabitedtype";
repo = pname;
rev = version;
hash = "sha256-vilGto5ciyKzVJd72z4B+AvM1nf3x3O7DHXrK5SIajQ=";
hash = "sha256-EPqDK+7RU2vHEHvuoTXb8V2FkdXQ6tGu0ghbNPS3gZ4=";
};
checkInputs = [ alcotest ppx_let ];

2
pkgs/development/tools/ocaml/ocamlbuild/default.nix
View File

@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub, ocaml, findlib
, version ? if lib.versionAtLeast ocaml.version "4.07" then "0.15.0" else "0.14.3"
, version ? if lib.versionAtLeast ocaml.version "4.08" then "0.15.0" else "0.14.3"
}:
stdenv.mkDerivation (finalAttrs: {

6
pkgs/development/tools/rust/cargo-temp/default.nix
View File

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-temp";
version = "0.2.21";
version = "0.2.22";
src = fetchFromGitHub {
owner = "yozhgoor";
repo = "cargo-temp";
rev = "v${version}";
hash = "sha256-8VkhEpggSoE0DIdZk8Y1fCYAwN6CZd2nK6auWRIbS6w=";
hash = "sha256-gsrmHCj9DC6OkGS0CD/NE2UMc/9TdjA2In6f3iKXMOg=";
};
cargoHash = "sha256-fYpG/Bl3hsbkWWTkbX59UqD/HuL9OpmcZc6hPAmnNtM=";
cargoHash = "sha256-ryvv4SuhxIXPJKa3WLdjNQZAP+JLAjWtrCfWXUm+WVg=";
meta = with lib; {
description = "CLI tool that allow you to create a temporary new Rust project using cargo with already installed dependencies";