gador/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:
nixpkgs-ci[bot]
2025-07-03 06:06:17 +00:00
committed by GitHub
parent 5bc257f6f7 f5f1c7605e
commit 6236dd697c
15 changed files with 28 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/networking/browsers/qtchan/default.nix
-37
View File
@@ -1,37 +0,0 @@
{
mkDerivation,
lib,
fetchFromGitHub,
qmake,
qtbase,
}:
mkDerivation rec {
pname = "qtchan";
version = "1.0.1";
src = fetchFromGitHub {
owner = "siavash119";
repo = "qtchan";
rev = "v${version}";
sha256 = "1x11m1kwqindzc0dkpfifcglsb362impaxs85kgzx50p898sz9ll";
};
nativeBuildInputs = [ qmake ];
buildInputs = [ qtbase ];
qmakeFlags = [ "CONFIG-=app_bundle" ];
installPhase = ''
mkdir -p $out/bin
cp qtchan $out/bin
'';
meta = with lib; {
description = "4chan browser in qt5";
mainProgram = "qtchan";
homepage = "https://github.com/siavash119/qtchan";
license = licenses.mit;
maintainers = with maintainers; [ Madouura ];
platforms = platforms.unix;
};
}
pkgs/by-name/br/brush/package.nix
+3 -3
View File
@@ -12,17 +12,17 @@
rustPlatform.buildRustPackage rec {
pname = "brush";
version = "0.2.18";
version = "0.2.19";
src = fetchFromGitHub {
owner = "reubeno";
repo = "brush";
tag = "brush-shell-v${version}";
hash = "sha256-lX8e2gqbZMbsdMD1ZUK0l5xlCq+NkzBDeZSMzrPX+zI=";
hash = "sha256-IwBPeOD4BNaeDWlZBWfixhrpMtPu3mcbCFVDMMa8UmY=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-qHbKbWzuOpoRVySZd/yeGnDNbFGb2fQmgz0ETcNLoVE=";
cargoHash = "sha256-Z2K+0q8sPsudMhw+IY4Aq+gt9bSPRau0Z6cwpi98c+s=";
nativeInstallCheckInputs = [
versionCheckHook
pkgs/by-name/fr/framework-tool/package.nix
+3 -3
View File
@@ -8,17 +8,17 @@
rustPlatform.buildRustPackage rec {
pname = "framework-tool";
version = "0.4.3";
version = "0.4.5";
src = fetchFromGitHub {
owner = "FrameworkComputer";
repo = "framework-system";
tag = "v${version}";
hash = "sha256-gO7ieyVQzK3BkNsy451WNtrx51jlzd6vhwJX8RDoj/o=";
hash = "sha256-WhdKU6vyOm5R9RInw9Fj8gELztLn4m5rFGgHbnItguU=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-fgDZgWQGQEN2dLJjghngqeOLDX+0joSiI6OigGC57Hc=";
cargoHash = "sha256-A7/Q4p26W0AzqlLguL2OJtmm7dAsBU/Yb636ScYXrPs=";
nativeBuildInputs = [ pkg-config ];
buildInputs = [ udev ];
pkgs/by-name/gd/gdevelop/darwin.nix
+1 -1
View File
@@ -18,7 +18,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
src = fetchurl {
url = "https://github.com/4ian/GDevelop/releases/download/v${version}/GDevelop-5-${version}-universal-mac.zip";
hash = "sha256-zvPum8vTEXS0LbwBpzGNmcsm3s7u2oAJBhGYvlV1PWw=";
hash = "sha256-R8RB88K8dymzQnfeZUypo24EkXzpDfcsosQg3gTo3WI=";
};
sourceRoot = ".";
pkgs/by-name/gd/gdevelop/linux.nix
+1 -1
View File
@@ -13,7 +13,7 @@ let
if stdenv.hostPlatform.system == "x86_64-linux" then
fetchurl {
url = "https://github.com/4ian/GDevelop/releases/download/v${version}/GDevelop-5-${version}.AppImage";
hash = "sha256-RjpiIy4NqZ9QCevwWR6cKLobbsFjneq+Vhr/t0JfvgU=";
hash = "sha256-ZVQ5e7Ghj/wZDE0RvoH264KNxaHP6x5fxSWEbbYsa88=";
}
else
throw "${pname}-${version} is not supported on ${stdenv.hostPlatform.system}";
pkgs/by-name/gd/gdevelop/package.nix
+1 -1
View File
@@ -5,7 +5,7 @@
...
}:
let
version = "5.5.231";
version = "5.5.233";
pname = "gdevelop";
meta = {
description = "Graphical Game Development Studio";
pkgs/by-name/om/omnom/package.nix
+3 -3
View File
@@ -13,17 +13,17 @@
buildGoModule (finalAttrs: {
pname = "omnom";
version = "0.4.0";
version = "0.6.0";
src = fetchFromGitHub {
owner = "asciimoo";
repo = "omnom";
tag = "v${finalAttrs.version}";
hash = "sha256-xspzTRIYUJSdI2Z/FAS2ecLpEEmEVGIwlhjrS5Yxh2c=";
hash = "sha256-wFUKoM8xiuAfmBCQJ4BgX7gQ1FmU2yHSs/RkQI0WxI4=";
fetchSubmodules = true;
};
vendorHash = "sha256-qOl6f83k91K7YNF7lBbL66lXb/XWbGHyXeN7ZTchsI8=";
vendorHash = "sha256-Ie486oAsgsOM5hDURD+1bfnGIUqkeW2bOaIDiwWWq+0=";
passthru.updateScript = nix-update-script { };
pkgs/by-name/st/stevenblack-blocklist/package.nix
+2 -2
View File
@@ -6,13 +6,13 @@
}:
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "stevenblack-blocklist";
version = "3.15.48";
version = "3.15.51";
src = fetchFromGitHub {
owner = "StevenBlack";
repo = "hosts";
tag = finalAttrs.version;
hash = "sha256-nUwtgfOf/JialxNHwTT9JAYZtdGZevVPKLwpLrU8T5A=";
hash = "sha256-NISp1TNEgoLn2sBglpoKfg/aiiLynNOrOWqTppkbDs0=";
};
outputs = [
pkgs/by-name/te/terramate/package.nix
+2 -2
View File
@@ -7,13 +7,13 @@
buildGoModule rec {
pname = "terramate";
version = "0.13.3";
version = "0.14.0";
src = fetchFromGitHub {
owner = "terramate-io";
repo = "terramate";
rev = "v${version}";
hash = "sha256-KPac6JyDnP2mVJSo3Ffzk3Nrzr9PrJCe4rNtl7uR+a8=";
hash = "sha256-op8mwCofnktV+kkvh4mO5tfLrynlxGbQzOxq6JR7HbE=";
};
vendorHash = "sha256-u9eXi7FjMsXm0H0y7Gs/Wu2I8tp4rRLxtjUxrrHJkEU=";
pkgs/by-name/tf/tfswitch/package.nix
+3 -3
View File
@@ -5,16 +5,16 @@
}:
buildGoModule rec {
pname = "tfswitch";
version = "1.4.5";
version = "1.4.6";
src = fetchFromGitHub {
owner = "warrensbox";
repo = "terraform-switcher";
rev = "v${version}";
sha256 = "sha256-hwAVnTvOXxLUCtCKNMvdS4MfscpMACIZHgJsJNqAJBE=";
sha256 = "sha256-KYie6nabNJDGNvs2vOQHl+ISEGNKwReHuDahMo1SmbM=";
};
vendorHash = "sha256-inMUSw75tLPAhJrcralzeib2Mo1H37CI7629Xopu/mA=";
vendorHash = "sha256-IXawIayV9RbWgoKKgnHAtr6RQrYGUBRF5CrQnPsrebc=";
# Disable tests since it requires network access and relies on the
# presence of release.hashicorp.com
pkgs/development/ocaml-modules/augeas/default.nix
+5 -9
View File
@@ -1,7 +1,7 @@
{
stdenv,
fetchurl,
fetchDebianPatch,
fetchpatch,
autoreconfHook,
makeWrapper,
pkg-config,
@@ -22,16 +22,12 @@ stdenv.mkDerivation rec {
};
patches = [
(fetchDebianPatch {
inherit pname version;
debianRevision = "1";
patch = "0001-Use-ocamlopt-g-option.patch";
(fetchpatch {
url = "https://salsa.debian.org/debian/ocaml-augeas/-/raw/07c2408a7e5a06cefe5d53a89fecaa8556a39b06/debian/patches/0001-Use-ocamlopt-g-option.patch";
hash = "sha256-EMd/EfWO2ni0AMonfS7G5FENpVVq0+q3gUPd4My+Upg=";
})
(fetchDebianPatch {
inherit pname version;
debianRevision = "1";
patch = "0002-caml_named_value-returns-const-value-pointer-in-OCam.patch";
(fetchpatch {
url = "https://salsa.debian.org/debian/ocaml-augeas/-/raw/07c2408a7e5a06cefe5d53a89fecaa8556a39b06/debian/patches/0002-caml_named_value-returns-const-value-pointer-in-OCam.patch";
hash = "sha256-Y53UHwrTVeV3hnsvABmWxlPi2Fanm0Iy1OR8Zql5Ub8=";
})
];
pkgs/development/python-modules/jupyter-server-ydoc/default.nix
+2 -2
View File
@@ -15,13 +15,13 @@
buildPythonPackage rec {
pname = "jupyter-server-ydoc";
version = "2.0.2";
version = "2.1.0";
pyproject = true;
src = fetchPypi {
pname = "jupyter_server_ydoc";
inherit version;
hash = "sha256-Iu5y57yeLZ/emIIJLRdqyMpxAfsHj2/vTLcqgSlRCSg=";
hash = "sha256-tSa+aEqmIev9lywYpUynxhPGfy0FHPUteiaqCS9zWkY=";
};
build-system = [ hatchling ];
pkgs/tools/admin/google-cloud-sdk/default.nix
+1
View File
@@ -47,6 +47,7 @@ let
pyopenssl
crcmod
numpy
grpcio
]
++ lib.optional (with-gce) google-compute-engine
);
pkgs/top-level/aliases.nix
+1
View File
@@ -1673,6 +1673,7 @@ mapAliases {
qt515 = qt5; # Added 2022-11-24
qt5ct = throw "'qt5ct' has been renamed to/replaced by 'libsForQt5.qt5ct'"; # Converted to throw 2024-10-17
qt6ct = qt6Packages.qt6ct; # Added 2023-03-07
qtchan = throw "'qtchan' has been removed due to lack of maintenance upstream"; # Added 2025-07-01
qtcurve = throw "'qtcurve' has been renamed to/replaced by 'libsForQt5.qtcurve'"; # Converted to throw 2024-10-17
qtile-unwrapped = python3.pkgs.qtile; # Added 2023-05-12
quantum-espresso-mpi = quantum-espresso; # Added 2023-11-23
pkgs/top-level/all-packages.nix
-2
View File
@@ -13561,8 +13561,6 @@ with pkgs;
qtbitcointrader = libsForQt5.callPackage ../applications/misc/qtbitcointrader { };
qtchan = libsForQt5.callPackage ../applications/networking/browsers/qtchan { };
qtemu = libsForQt5.callPackage ../applications/virtualization/qtemu { };
qtpass = libsForQt5.callPackage ../applications/misc/qtpass { };