b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse source
This commit is contained in:
github-actions[bot] 2023-03-11 06:01:15 +00:00 committed by GitHub
parent 9ffe17a0be 1e21dd6102
commit d165f35883
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
15 changed files with 34 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
nixos/modules/services/x11/desktop-managers/phosh.nix
View file

@ -173,7 +173,7 @@ in
systemd.services.phosh = { systemd.services.phosh = {
wantedBy = [ "graphical.target" ]; wantedBy = [ "graphical.target" ];
serviceConfig = { serviceConfig = {
ExecStart = "${cfg.package}/bin/phosh"; ExecStart = "${cfg.package}/bin/phosh-session";
User = cfg.user; User = cfg.user;
Group = cfg.group; Group = cfg.group;
PAMName = "login"; PAMName = "login";

5
pkgs/applications/misc/phoc/default.nix
View file

@ -52,7 +52,7 @@ let
}); });
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
pname = "phoc"; pname = "phoc";
version = "0.21.1"; version = "0.25.0";
src = fetchFromGitLab { src = fetchFromGitLab {
domain = "gitlab.gnome.org"; domain = "gitlab.gnome.org";
@ -60,7 +60,8 @@ in stdenv.mkDerivation rec {
owner = "Phosh"; owner = "Phosh";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-HPqhro6TE/Ukh4txBPrDoIuDaxSxd/ZkDVZU3+m3GFg="; sha256 = "sha256-1cbv4vzQ+RcRoT1pOT8Q0nxuZzKUlec38KCNMYaceeE=";
fetchSubmodules = true;
}; };
nativeBuildInputs = [ nativeBuildInputs = [

6
pkgs/applications/misc/ttdl/default.nix
View file

@ -5,16 +5,16 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "ttdl"; pname = "ttdl";
version = "3.6.3"; version = "3.6.5";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "VladimirMarkelov"; owner = "VladimirMarkelov";
repo = "ttdl"; repo = "ttdl";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-IR0cDXQHnMDI71Vg50atS98YorqAQKc95EF1+m9cxFY="; sha256 = "sha256-mplV++N+us6IntNJsZoH4yyKZ8eYplUYuVJeac0ZIkQ=";
}; };
cargoSha256 = "sha256-658mN3R3opjvqfnIDcbh11ZSOTDbpYnhCgGGx46Mrrc="; cargoHash = "sha256-mgvMQjScXCmr3HIQtGJ2YWRUhiSP5resL96LUCe8D+c=";
meta = with lib; { meta = with lib; {
description = "A CLI tool to manage todo lists in todo.txt format"; description = "A CLI tool to manage todo lists in todo.txt format";

6
pkgs/applications/misc/usql/default.nix
View file

@ -10,18 +10,18 @@
buildGoModule rec { buildGoModule rec {
pname = "usql"; pname = "usql";
version = "0.13.9"; version = "0.13.10";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "xo"; owner = "xo";
repo = "usql"; repo = "usql";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-hcAwwu1bp7QJLt+mrUZYK6YeX/uRmfRa8JnUfrTzf3k="; hash = "sha256-epfEw62OXWiJqqvxJ8U9tRy0ZrQkSqa8GL4TluO9Df4=";
}; };
buildInputs = [ unixODBC icu ]; buildInputs = [ unixODBC icu ];
vendorHash = "sha256-BehI6O+WpCcgMGabTFMCpYHN3CIo3Zb5rBQuGLsWRc0="; vendorHash = "sha256-mOe0rREiqOxwVwVo4S0889cbqVLknVRCW4bSiIh6IdQ=";
proxyVendor = true; proxyVendor = true;
# Exclude broken impala & hive driver # Exclude broken impala & hive driver

6
pkgs/applications/misc/zine/default.nix
View file

@ -10,14 +10,14 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "zine"; pname = "zine";
version = "0.12.0"; version = "0.12.1";
src = fetchCrate { src = fetchCrate {
inherit pname version; inherit pname version;
sha256 = "sha256-ioWgEl+bMaEDjtEQq/4vURS6Q/V9+r72NTWstyHm4mI="; sha256 = "sha256-54kbSli/cEG8MlbPWC3xauj2VFxru/5haXfHaViUCN8=";
}; };
cargoHash = "sha256-2BeImBebeO4kLXmBrGjPmAjbrsLUaS2y52KSazVITb0="; cargoHash = "sha256-youQoyJURmhPZItvfCSytUBpwRrejRf6EzfvjtgXH5E=";
nativeBuildInputs = [ nativeBuildInputs = [
pkg-config pkg-config

4
pkgs/applications/networking/nextcloud-client/default.nix
View file

@ -26,7 +26,7 @@
mkDerivation rec { mkDerivation rec {
pname = "nextcloud-client"; pname = "nextcloud-client";
version = "3.7.3"; version = "3.7.4";
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
@ -34,7 +34,7 @@ mkDerivation rec {
owner = "nextcloud"; owner = "nextcloud";
repo = "desktop"; repo = "desktop";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-SzQdT2BJ0iIMTScJ7ft47oKd+na5MlOx5xRB1SQ7CBc="; sha256 = "sha256-K9P9avZdW+QR+K+GSp4kqWVZX5J7mHpu4gyuR4smmcU=";
}; };
patches = [ patches = [

9
pkgs/applications/window-managers/phosh/default.nix
View file

@ -36,7 +36,7 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "phosh"; pname = "phosh";
version = "0.23.0"; version = "0.25.1";
src = fetchFromGitLab { src = fetchFromGitLab {
domain = "gitlab.gnome.org"; domain = "gitlab.gnome.org";
@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
fetchSubmodules = true; # including gvc and libcall-ui which are designated as subprojects fetchSubmodules = true; # including gvc and libcall-ui which are designated as subprojects
sha256 = "sha256-EMPqBKrtlwI9SJlqZjyAN5CtV4/BNwc5LapfeCEIYxc="; sha256 = "sha256-ysAZdmkFEuqJDTPe246F2I4Qp+fjtomia42PS8BuMM8=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -97,11 +97,6 @@ stdenv.mkDerivation rec {
"-Dc_args=-I${glib.dev}/include/gio-unix-2.0" "-Dc_args=-I${glib.dev}/include/gio-unix-2.0"
]; ];
postPatch = ''
chmod +x build-aux/post_install.py
patchShebangs build-aux/post_install.py
'';
checkPhase = '' checkPhase = ''
runHook preCheck runHook preCheck
export NO_AT_BRIDGE=1 export NO_AT_BRIDGE=1

4
pkgs/development/libraries/qpdf/default.nix
View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "qpdf"; pname = "qpdf";
version = "11.2.0"; version = "11.3.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "qpdf"; owner = "qpdf";
repo = "qpdf"; repo = "qpdf";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-AkLuclDm9qjVbpFqenlbgTWt/GAWzOj9d1lqgt6aPNo="; hash = "sha256-UZq973X93E+Ll1IKjfJNPQuQwBFOU3egFGODgXV21x0=";
}; };
nativeBuildInputs = [ cmake perl ]; nativeBuildInputs = [ cmake perl ];

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

@ -9,13 +9,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "tagparser"; pname = "tagparser";
version = "11.5.1"; version = "11.6.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Martchus"; owner = "Martchus";
repo = "tagparser"; repo = "tagparser";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-6HvPbbDsHIYyTs0M5M8TkgqyAz0QtgRjuNJhYWFjNG4="; hash = "sha256-zi1n5Mdto8DmUq5DWxcr4f+DX6Sq/JsK8uzRzj5f0/E=";
}; };
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];

1
pkgs/development/python-modules/torchvision/default.nix
View file

@ -68,7 +68,6 @@ buildPythonPackage {
+ lib.optionalString cudaSupport '' + lib.optionalString cudaSupport ''
export CC=${cudatoolkit.cc}/bin/cc export CC=${cudatoolkit.cc}/bin/cc
export CXX=${cudatoolkit.cc}/bin/c++ export CXX=${cudatoolkit.cc}/bin/c++
export CUDAHOSTCXX=${cudatoolkit.cc}/bin/c++
export TORCH_CUDA_ARCH_LIST="${gpuTargetString}" export TORCH_CUDA_ARCH_LIST="${gpuTargetString}"
export FORCE_CUDA=1 export FORCE_CUDA=1
''; '';

4
pkgs/development/python-modules/unidiff/default.nix
View file

@ -2,11 +2,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "unidiff"; pname = "unidiff";
version = "0.7.4"; version = "0.7.5";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "2bbcbc986e1fb97f04b1d7b864aa6002ab02f4d8a996bf03aa6e5a81447d1fc5"; sha256 = "2e5f0162052248946b9f0970a40e9e124236bf86c82b70821143a6fc1dea2574";
}; };
nativeCheckInputs = [ unittestCheckHook ]; nativeCheckInputs = [ unittestCheckHook ];

6
pkgs/development/tools/jaq/default.nix
View file

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "jaq"; pname = "jaq";
version = "0.9.0"; version = "0.10.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "01mf02"; owner = "01mf02";
repo = "jaq"; repo = "jaq";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-Y1QLNiAeHKYsSbFW235mdTiHyQFBQQsO+FtuFxDX9Hs="; sha256 = "sha256-v3dC5Qi0Op+oFCcbkbK1ZUQxWTEYVvXsc+ye9Kk9y7c=";
}; };
cargoSha256 = "sha256-+9uy5R/dO2T/6dRhtYlPCKfosaYua0JvbECvMacc3XA="; cargoHash = "sha256-N3zlaoBPVK4xI+t3F+NXz0DhqIOoE3lh3FftToACeZM=";
buildInputs = lib.optionals stdenv.isDarwin [ Security ]; buildInputs = lib.optionals stdenv.isDarwin [ Security ];

6
pkgs/tools/admin/berglas/default.nix
View file

@ -27,16 +27,16 @@ in
buildGoModule rec { buildGoModule rec {
pname = "berglas"; pname = "berglas";
version = "1.0.1"; version = "1.0.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "GoogleCloudPlatform"; owner = "GoogleCloudPlatform";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-A4TUVNsiWODH8jJzV4AYchIQjDWXysJbFPYQ5W63T08="; sha256 = "sha256-OMmvoUzdi5rie/YCkylSKjNm2ty2HnnAuFZrLAgJHZk=";
}; };
vendorSha256 = "sha256-jJuwfP0zJ70r62IFTPsXBCAEKDcuBwHsBR24jGx/IqY="; vendorHash = "sha256-WIbT1N7tRAt5vJO6j06fwUAaFxfAevRo0+r2wyy+feE=";
postPatch = skipTestsCommand; postPatch = skipTestsCommand;

4
pkgs/tools/misc/sfeed/default.nix
View file

@ -2,12 +2,12 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "sfeed"; pname = "sfeed";
version = "1.6"; version = "1.7";
src = fetchgit { src = fetchgit {
url = "git://git.codemadness.org/sfeed"; url = "git://git.codemadness.org/sfeed";
rev = version; rev = version;
sha256 = "sha256-GfRy/kzlFonje2Z/g7qNkbrDHBBIReN+fHVz1vsApqs="; sha256 = "sha256-W9AQc3Y3do1M2GM7LQVM5SN07LoWaZL7GTQD+SmQRwQ=";
}; };
buildInputs = [ ncurses ]; buildInputs = [ ncurses ];

6
pkgs/tools/video/lux/default.nix
View file

@ -2,17 +2,17 @@
buildGoModule rec { buildGoModule rec {
pname = "lux"; pname = "lux";
version = "0.16.0"; version = "0.17.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "iawia002"; owner = "iawia002";
repo = "lux"; repo = "lux";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-kB625R6Qlo9sw0iz8MbaCFOjxpMyH+9ugC6JDn7L7eM="; sha256 = "sha256-n6oWItz0tnhpyPBGsf4+fYGnJyeYyhI2owkLrJWu7uw=";
}; };
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];
vendorSha256 = "sha256-2cH5xVz3k9PPjzoMjWch3o8VBfP4nWAvakNwZNQLOeI="; vendorHash = "sha256-4pn6JKE+VieadhDLkVhbJc6XSm95cNwoNBWYGEZl8iI=";
ldflags = [ "-s" "-w" ]; ldflags = [ "-s" "-w" ];