cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge staging-next into staging

Browse source
This commit is contained in:
github-actions[bot] 2022-09-30 06:23:02 +00:00 committed by GitHub
commit 0856a67e68
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
46 changed files with 1066 additions and 870 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
nixos/modules/services/monitoring/prometheus/sachet.nix
View file

@ -14,7 +14,7 @@ in
configuration = mkOption {
type = types.nullOr types.attrs;
default = null;
example = literalExample ''
example = literalExpression ''
{
providers = {
twilio = {

6
pkgs/applications/audio/mmtc/default.nix
View file

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "mmtc";
version = "0.2.14";
version = "0.2.15";
src = fetchFromGitHub {
owner = "figsoda";
repo = pname;
rev = "v${version}";
sha256 = "sha256-g2JHY95vkG/Ep2eqz8guteF8fHUso/JuuVijNGkgykA=";
sha256 = "sha256-GQ1SoZE74o8fsXHVdjdEMbdUeefyPb4FXxidcHCy180=";
};
cargoSha256 = "sha256-tVjy/O5hfnQFC6to8VMGc39mEXhA5lwUIne6pVvDec0=";
cargoSha256 = "sha256-2IcOwjYTRl2tCB/YAuDACpgaRKZ/21IKWpVs+koYH3k=";
nativeBuildInputs = [ installShellFiles ];

114
pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix
View file

@ -643,10 +643,10 @@
elpaBuild {
pname = "code-cells";
ename = "code-cells";
version = "0.2";
version = "0.3";
src = fetchurl {
url = "https://elpa.gnu.org/packages/code-cells-0.2.tar";
sha256 = "19v6a7l23646diazl0rzjxjsam12hm08hgyq8hdcc7l3xl840ghk";
url = "https://elpa.gnu.org/packages/code-cells-0.3.tar";
sha256 = "0i5n9xqpf0www553in3xibc93vw9x6659zaqnvr5rkad95gz456x";
};
packageRequires = [ emacs ];
meta = {
@ -673,10 +673,10 @@
elpaBuild {
pname = "comint-mime";
ename = "comint-mime";
version = "0.1";
version = "0.2";
src = fetchurl {
url = "https://elpa.gnu.org/packages/comint-mime-0.1.tar";
sha256 = "1ak0ylqdslsb6a64dkpvappdbqnl1i8lc17jla9pqqs7r16sh3n0";
url = "https://elpa.gnu.org/packages/comint-mime-0.2.tar";
sha256 = "06sxsrmxr2l63cslaqmsc03birkcsqbnwbjkhn0f8y3afb4pafkf";
};
packageRequires = [ emacs ];
meta = {
@ -1086,10 +1086,10 @@
elpaBuild {
pname = "detached";
ename = "detached";
version = "0.8.1";
version = "0.9.0";
src = fetchurl {
url = "https://elpa.gnu.org/packages/detached-0.8.1.tar";
sha256 = "03riybjk2yls8wjkp1sqd30p0jpvrlz3qlj8r04cx7s1nn1kn9g3";
url = "https://elpa.gnu.org/packages/detached-0.9.0.tar";
sha256 = "1br1s2kwb5ji4ad5m89grpyvjffhc3xxydgja9q796cx6zwrnavp";
};
packageRequires = [ emacs ];
meta = {
@ -1401,10 +1401,10 @@
elpaBuild {
pname = "ef-themes";
ename = "ef-themes";
version = "0.4.2";
version = "0.5.0";
src = fetchurl {
url = "https://elpa.gnu.org/packages/ef-themes-0.4.2.tar";
sha256 = "0ik9kzdv5r1q7hw81nh3raiychpmwi61034y12pqvbq24njp0y72";
url = "https://elpa.gnu.org/packages/ef-themes-0.5.0.tar";
sha256 = "1k73q48vg7vyjmnvizinwn9if481ajq63ps2iwb01f1brrhmbf5v";
};
packageRequires = [ emacs ];
meta = {
@ -1563,10 +1563,10 @@
elpaBuild {
pname = "ement";
ename = "ement";
version = "0.1.2";
version = "0.2";
src = fetchurl {
url = "https://elpa.gnu.org/packages/ement-0.1.2.tar";
sha256 = "1n5k3rcgdq625b9fjhl53nl5zbis4dw0d00h4dk16m61nk98ra2l";
url = "https://elpa.gnu.org/packages/ement-0.2.tar";
sha256 = "1kxbkqiy5c9pxk4f5k3d3j2q3qn7cg8f21zpgds9s8fd6ax0arcf";
};
packageRequires = [
emacs
@ -1806,10 +1806,10 @@
elpaBuild {
pname = "flymake-proselint";
ename = "flymake-proselint";
version = "0.2.3";
version = "0.3.0";
src = fetchurl {
url = "https://elpa.gnu.org/packages/flymake-proselint-0.2.3.tar";
sha256 = "1384m52zkrlkkkyxg1zimp7dwrxhx8wbvw5ga5vg78yl6cqx9kbc";
url = "https://elpa.gnu.org/packages/flymake-proselint-0.3.0.tar";
sha256 = "1x1hp06hggywmpbimyw4cg0cyg7g9v39r552ypivq9pvz94kmkp0";
};
packageRequires = [ emacs ];
meta = {
@ -2255,10 +2255,10 @@
elpaBuild {
pname = "inspector";
ename = "inspector";
version = "0.7";
version = "0.8";
src = fetchurl {
url = "https://elpa.gnu.org/packages/inspector-0.7.tar";
sha256 = "0cwfbg7bx4ni0xadba9v5jbkivz2slqwxcy7q8s3zipb4m578xbk";
url = "https://elpa.gnu.org/packages/inspector-0.8.tar";
sha256 = "0yrkm5bh2kczl5f642wx1xlnzry1xrw0yxhpm0hqwjrmgmbdb9m6";
};
packageRequires = [ emacs ];
meta = {
@ -2285,10 +2285,10 @@
elpaBuild {
pname = "isearch-mb";
ename = "isearch-mb";
version = "0.5";
version = "0.6";
src = fetchurl {
url = "https://elpa.gnu.org/packages/isearch-mb-0.5.tar";
sha256 = "0fah8dmh9jv05i93ccn9dvl7qmfy32vwxqdzkf1v8gr1plsyjyx7";
url = "https://elpa.gnu.org/packages/isearch-mb-0.6.tar";
sha256 = "1rbslnnwsikpnb07jhzyk0f83z8i581834hsq3i7gnz3a99wpkx7";
};
packageRequires = [ emacs ];
meta = {
@ -2680,10 +2680,10 @@
elpaBuild {
pname = "logos";
ename = "logos";
version = "0.5.0";
version = "0.5.1";
src = fetchurl {
url = "https://elpa.gnu.org/packages/logos-0.5.0.tar";
sha256 = "026nzkgkfs96m9qxpng7h0kqvhxfah883pv4i08fz0950lrsxynd";
url = "https://elpa.gnu.org/packages/logos-0.5.1.tar";
sha256 = "0154fxl20crl0ay064cbhgsjnj70nq5jz778hzjjy3mnkwzsmbh3";
};
packageRequires = [ emacs ];
meta = {
@ -3158,6 +3158,21 @@
license = lib.licenses.free;
};
}) {};
notmuch-indicator = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "notmuch-indicator";
ename = "notmuch-indicator";
version = "0.1.0";
src = fetchurl {
url = "https://elpa.gnu.org/packages/notmuch-indicator-0.1.0.tar";
sha256 = "11kbl8y95vwww1rsgdd1q5x8i690gi4cxql4n2sg7r5dysdrbyz1";
};
packageRequires = [ emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/notmuch-indicator.html";
license = lib.licenses.free;
};
}) {};
ntlm = callPackage ({ elpaBuild, fetchurl, lib }:
elpaBuild {
pname = "ntlm";
@ -3293,6 +3308,21 @@
license = lib.licenses.free;
};
}) {};
org-contacts = callPackage ({ elpaBuild, emacs, fetchurl, lib, org }:
elpaBuild {
pname = "org-contacts";
ename = "org-contacts";
version = "1.1";
src = fetchurl {
url = "https://elpa.gnu.org/packages/org-contacts-1.1.tar";
sha256 = "1kzdw9kbnpryxdb9ywh2va4nnjcxw6asszf5n7a95rw2gl6m3l10";
};
packageRequires = [ emacs org ];
meta = {
homepage = "https://elpa.gnu.org/packages/org-contacts.html";
license = lib.licenses.free;
};
}) {};
org-edna = callPackage ({ elpaBuild, emacs, fetchurl, lib, org, seq }:
elpaBuild {
pname = "org-edna";
@ -3567,10 +3597,10 @@
elpaBuild {
pname = "persist";
ename = "persist";
version = "0.4";
version = "0.5";
src = fetchurl {
url = "https://elpa.gnu.org/packages/persist-0.4.tar";
sha256 = "0gpxy41qawzss2526j9a7lys60vqma1lvamn4bfabwza7gfhac0q";
url = "https://elpa.gnu.org/packages/persist-0.5.tar";
sha256 = "090n4479zs82by7a3vb551gyjvv8lpfcylk43ywr2lfyssc9xiq0";
};
packageRequires = [];
meta = {
@ -4198,10 +4228,10 @@
elpaBuild {
pname = "setup";
ename = "setup";
version = "1.3.0";
version = "1.3.2";
src = fetchurl {
url = "https://elpa.gnu.org/packages/setup-1.3.0.tar";
sha256 = "0r13ry73jm31j8fq7v1sh0k113fr4blfkiz85696bdpah2pnca87";
url = "https://elpa.gnu.org/packages/setup-1.3.2.tar";
sha256 = "1sr514w4mn0fbdawjb5p0fd6i6q2zi9737rbwcgakb1l9cqvb5qy";
};
packageRequires = [ emacs ];
meta = {
@ -4637,10 +4667,10 @@
elpaBuild {
pname = "taxy";
ename = "taxy";
version = "0.10";
version = "0.10.1";
src = fetchurl {
url = "https://elpa.gnu.org/packages/taxy-0.10.tar";
sha256 = "1jamry2p3qhswq8prd2g7ljh4yqk0wwblyd9fhnaclakahrn5vi3";
url = "https://elpa.gnu.org/packages/taxy-0.10.1.tar";
sha256 = "05czw8fkifb25rwl99dmncr1g0rjfx1bqijl7igqs9j6h9ia2xvg";
};
packageRequires = [ emacs ];
meta = {
@ -5107,10 +5137,10 @@
elpaBuild {
pname = "vertico";
ename = "vertico";
version = "0.26";
version = "0.27";
src = fetchurl {
url = "https://elpa.gnu.org/packages/vertico-0.26.tar";
sha256 = "070dkw7ii5lfg4m0bwl9blbyq3rgqs212my142ri69ig1fz9x5ad";
url = "https://elpa.gnu.org/packages/vertico-0.27.tar";
sha256 = "0yf02xwv0zx2pwb7c97k7qbbvmkripb1pb4mn16rvs07a9r217hz";
};
packageRequires = [ emacs ];
meta = {
@ -5450,10 +5480,10 @@
elpaBuild {
pname = "xref";
ename = "xref";
version = "1.5.0";
version = "1.5.1";
src = fetchurl {
url = "https://elpa.gnu.org/packages/xref-1.5.0.tar";
sha256 = "0xl6aiwkjbgs44c3wxk6s85diydm3y5lsd7znb0dhbqb7milid2d";
url = "https://elpa.gnu.org/packages/xref-1.5.1.tar";
sha256 = "131jxsc1sl8q3r9drhylwyfig9qjjkj3hilv3npidp868pr7xdna";
};
packageRequires = [ emacs ];
meta = {

48
pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix
View file

@ -49,10 +49,10 @@
elpaBuild {
pname = "annotate";
ename = "annotate";
version = "1.7.1";
version = "1.7.2";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/annotate-1.7.1.tar";
sha256 = "0jyzx5z10mv9b134jz4hkp1mbc9f1ki794cr5na9zwvpd9q3j9iy";
url = "https://elpa.nongnu.org/nongnu/annotate-1.7.2.tar";
sha256 = "0vdpv8k1cvkn3cvsnxqv299gvp470ga2pgmfvdqi7k1vzypgpp57";
};
packageRequires = [];
meta = {
@ -199,10 +199,10 @@
elpaBuild {
pname = "boxquote";
ename = "boxquote";
version = "2.2";
version = "2.3";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/boxquote-2.2.tar";
sha256 = "0vcqm78b5fsizkn2xalnzmdci5m02yxxypcr9q2sai04j7lhmwd9";
url = "https://elpa.nongnu.org/nongnu/boxquote-2.3.tar";
sha256 = "1d072qls4ywl71wi29khlq4w6yw9idp55vf811nvbmiihn6lwmiv";
};
packageRequires = [ cl-lib ];
meta = {
@ -1577,7 +1577,6 @@
};
}) {};
mentor = callPackage ({ async
, cl-lib ? null
, elpaBuild
, emacs
, fetchurl
@ -1587,12 +1586,12 @@
elpaBuild {
pname = "mentor";
ename = "mentor";
version = "0.3.5";
version = "0.4";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/mentor-0.3.5.tar";
sha256 = "01zrvfk2njzyzjzkvp5hv5cjl1k1qjrila1ab4bv26gf6bkq5xh3";
url = "https://elpa.nongnu.org/nongnu/mentor-0.4.tar";
sha256 = "1n51yabm4npx62fpfn8rhky09x4y779ismdxa026fycy7va7ynzz";
};
packageRequires = [ async cl-lib emacs seq xml-rpc ];
packageRequires = [ async emacs seq xml-rpc ];
meta = {
homepage = "https://elpa.gnu.org/packages/mentor.html";
license = lib.licenses.free;
@ -2348,10 +2347,10 @@
elpaBuild {
pname = "subed";
ename = "subed";
version = "1.0.8";
version = "1.0.10";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/subed-1.0.8.tar";
sha256 = "05dx4ywma7n73d0cihf4v8ayihm7gmfqpzvdycq4yk0zkxb958z1";
url = "https://elpa.nongnu.org/nongnu/subed-1.0.10.tar";
sha256 = "08vw9sv2g76yj8sfnx53dd28zkj4s0842i7qi92jam993v9s8h0z";
};
packageRequires = [ emacs ];
meta = {
@ -2500,6 +2499,21 @@
license = lib.licenses.free;
};
}) {};
treeview = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "treeview";
ename = "treeview";
version = "1.1.1";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/treeview-1.1.1.tar";
sha256 = "0ryycz2n1kam3ji0ibpy99ll5l6xnx1mx9i9bgfvma61f0ppcppd";
};
packageRequires = [ emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/treeview.html";
license = lib.licenses.free;
};
}) {};
tuareg = callPackage ({ caml, elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "tuareg";
@ -2722,10 +2736,10 @@
elpaBuild {
pname = "xah-fly-keys";
ename = "xah-fly-keys";
version = "17.22.20220909110152";
version = "18.1.20220921110635";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/xah-fly-keys-17.22.20220909110152.tar";
sha256 = "1d8xkwcyd6dcxp926mwb8kgcpdqrcpmdv62ybdhx7izx0abia95y";
url = "https://elpa.nongnu.org/nongnu/xah-fly-keys-18.1.20220921110635.tar";
sha256 = "0nnd7jq1k62cgjb5y45jg6b76gvzyqh11kha7has4zipd52psvnj";
};
packageRequires = [ emacs ];
meta = {

1206
pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json
View file

File diff suppressed because it is too large Load diff

12
pkgs/applications/editors/emacs/elisp-packages/update-from-overlay
View file

@ -24,14 +24,14 @@ commit_change() {
}
download_change "elpa/elpa-generated.nix"
nix-instantiate ../../../../../ -A emacs.pkgs.elpaPackages --show-trace
commit_change "elpa-packages" "elpa-generated.nix"
download_change "melpa/recipes-archive-melpa.json"
download_change "nongnu/nongnu-generated.nix"
nix-instantiate --show-trace ../../../../../ -A emacs.pkgs.nongnuPackages
nix-instantiate --show-trace ../../../../../ -A emacs.pkgs.elpaPackages
nix-instantiate --show-trace ../../../../../ -A emacs.pkgs.melpaStablePackages
nix-instantiate --show-trace ../../../../../ -A emacs.pkgs.melpaPackages
commit_change "melpa-packages" "recipes-archive-melpa.json"
download_change "nongnu/nongnu-generated.nix"
nix-instantiate --show-trace ../../../../../ -A emacs.pkgs.nongnuPackages
commit_change "elpa-packages" "elpa-generated.nix"
commit_change "melpa-packages" "recipes-archive-melpa.json"
commit_change "nongnu-packages" "nongnu-generated.nix"

4
pkgs/applications/misc/spicetify-cli/default.nix
View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "spicetify-cli";
version = "2.13.1";
version = "2.14.0";
src = fetchFromGitHub {
owner = "spicetify";
repo = pname;
rev = "v${version}";
sha256 = "sha256-YgT4HlVqm58CEGoc/bNjo0xEzoNIcTpKGZkSdhcAgis=";
sha256 = "sha256-iaaf5ZHaHSEkQdxqZtsc6K/3+x6gAfvgQoWWYWcFeV4=";
};
vendorSha256 = "sha256-zYIbtcDM9iYSRHagvI9D284Y7w0ZxG4Ba1p4jqmQyng=";

6
pkgs/applications/networking/novnc/default.nix
View file

@ -11,6 +11,12 @@ stdenv.mkDerivation rec {
sha256 = "sha256-Z+bks7kcwj+Z3uf/t0u25DnGOM60QhSH6uuoIi59jqU=";
};
patches = [ ./fix-paths.patch ];
postPatch = ''
substituteAllInPlace utils/novnc_proxy
'';
installPhase = ''
runHook preInstall

22
pkgs/applications/networking/novnc/fix-paths.patch Normal file
View file

@ -0,0 +1,22 @@
diff --git a/utils/novnc_proxy b/utils/novnc_proxy
index 0900f7e..a931763 100755
--- a/utils/novnc_proxy
+++ b/utils/novnc_proxy
@@ -22,7 +22,7 @@ usage() {
echo " Default: self.pem"
echo " --key KEY Path to key file, when not combined with cert"
echo " --web WEB Path to web files (e.g. vnc.html)"
- echo " Default: ./"
+ echo " Default: @out@/share/webapps/novnc"
echo " --ssl-only Disable non-https connections."
echo " "
echo " --record FILE Record traffic to FILE.session.js"
@@ -44,7 +44,7 @@ PORT="6080"
VNC_DEST="localhost:5900"
CERT=""
KEY=""
-WEB=""
+WEB="@out@/share/webapps/novnc"
proxy_pid=""
SSLONLY=""
RECORD_ARG=""

4
pkgs/applications/networking/testssl/default.nix
View file

@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "testssl.sh";
version = "3.0.7";
version = "3.0.8";
src = fetchFromGitHub {
owner = "drwetter";
repo = pname;
rev = "v${version}";
sha256 = "sha256-SZfGiKSbLq81YdDMgG0C6LC/nE5NApqeWK/PqDzQNBU=";
sha256 = "sha256-gkDtJlAC7woM2HyYDXntD1+bEuqHTEipqrn2EZjxnH8=";
};
nativeBuildInputs = [ makeWrapper ];

4
pkgs/applications/science/misc/root/default.nix
View file

@ -195,5 +195,9 @@ stdenv.mkDerivation rec {
platforms = platforms.unix;
maintainers = [ maintainers.veprbl ];
license = licenses.lgpl21;
# See https://github.com/NixOS/nixpkgs/pull/192581#issuecomment-1256860426
# for some context on issues on aarch64.
broken = stdenv.isAarch64;
};
}

6
pkgs/applications/version-management/git-and-tools/git-cola/default.nix
View file

@ -5,13 +5,13 @@ let
in buildPythonApplication rec {
pname = "git-cola";
version = "4.0.1";
version = "4.0.2";
src = fetchFromGitHub {
owner = "git-cola";
repo = "git-cola";
rev = "v${version}";
hash = "sha256-xCGXPGZa4K9f37kZRerfUY+Y7atRdqld5rxj0VYdziU=";
rev = "refs/tags/v${version}";
hash = "sha256-5PE2Ey9IwNzxl4mk7tzaSWXiTmRFlxDO5MhoIYAwEag=";
};
buildInputs = [ git gettext ];

6
pkgs/applications/version-management/git-and-tools/git-gone/default.nix
View file

@ -9,17 +9,17 @@
rustPlatform.buildRustPackage rec {
pname = "git-gone";
version = "0.4.0";
version = "0.4.1";
src = fetchFromGitea {
domain = "codeberg.org";
owner = "flausch";
repo = pname;
rev = "v${version}";
sha256 = "sha256-S9rNVWq1dbencp9Oy3eNPlJtBMdiFsiJnp5XvHi8hIw=";
sha256 = "sha256-kqKFs3xvTVHnsLpLC9gjj1dcPChhegmupNrbWy+7C6o=";
};
cargoSha256 = "sha256-ZytIBdhyBp0p68ERlXNU8CnK9zYVZaBt/wn8F2bXlII=";
cargoSha256 = "sha256-8R13eHS69fQ3r3LYlnB3nPTPX7VesUPlAUCmQEpUUdw=";
nativeBuildInputs = [ installShellFiles ];

4
pkgs/applications/version-management/git-repo/default.nix
View file

@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "git-repo";
version = "2.29.2";
version = "2.29.3";
src = fetchFromGitHub {
owner = "android";
repo = "tools_repo";
rev = "v${version}";
sha256 = "sha256-995+6AYhSkMkOSm/ZjlInS5zb1od5nbEChvUyS/8RHM=";
sha256 = "sha256-hZoiljARTEhsuaM7QEFl+XqLq4RksLfxDpht5V1aC2M=";
};
# Fix 'NameError: name 'ssl' is not defined'

4
pkgs/applications/window-managers/fvwm/3.nix
View file

@ -32,13 +32,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "fvwm3";
version = "1.0.4";
version = "1.0.5";
src = fetchFromGitHub {
owner = "fvwmorg";
repo = "fvwm3";
rev = finalAttrs.version;
hash = "sha256-ByMSX4nwXkp+ly39C2+cYy3e9B0vnGcJlyIiS7V6zoI=";
hash = "sha256-/2Ssl/sgKCXbUCtKj2WIcvEC3B16h5/1Jp87AggKxJo=";
};
nativeBuildInputs = [

6
pkgs/data/misc/v2ray-geoip/default.nix
View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "v2ray-geoip";
version = "202209220104";
version = "202209290111";
src = fetchFromGitHub {
owner = "v2fly";
repo = "geoip";
rev = "4eaa41ebcfc2aafaa5b363b8efdd867c53e3435b";
sha256 = "sha256-B0a6Zqd9WmlwBY6Kj0ZKNjZXzZWaNhRL0tLT0PM+gGA=";
rev = "1aa11a6dd94b708175a81b12037486459fa090a8";
sha256 = "sha256-CVze/QyoBKZmd+U8bfjxr+u8W95W+fs9+mAdPgyIpg4=";
};
installPhase = ''

7
pkgs/development/compilers/rust/rustc.nix
View file

@ -107,6 +107,9 @@ in stdenv.mkDerivation rec {
"${setHost}.musl-root=${pkgsBuildHost.targetPackages.stdenv.cc.libc}"
] ++ optionals stdenv.targetPlatform.isMusl [
"${setTarget}.musl-root=${pkgsBuildTarget.targetPackages.stdenv.cc.libc}"
] ++ optionals (stdenv.isDarwin && stdenv.isx86_64) [
# https://github.com/rust-lang/rust/issues/92173
"--set rust.jemalloc"
];
# The bootstrap.py will generated a Makefile that then executes the build.
@ -133,6 +136,10 @@ in stdenv.mkDerivation rec {
# Useful debugging parameter
# export VERBOSE=1
'' + lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) ''
# See https://github.com/jemalloc/jemalloc/issues/1997
# Using a value of 48 should work on both emulated and native x86_64-darwin.
export JEMALLOC_SYS_WITH_LG_VADDR=48
'';
# rustc unfortunately needs cmake to compile llvm-rt but doesn't

3
pkgs/development/coq-modules/coq-elpi/default.nix
View file

@ -15,13 +15,14 @@ in mkCoqDerivation {
owner = "LPCIC";
inherit version;
defaultVersion = lib.switch coq.coq-version [
{ case = "8.16"; out = "1.15.1"; }
{ case = "8.16"; out = "1.15.6"; }
{ case = "8.15"; out = "1.14.0"; }
{ case = "8.14"; out = "1.11.2"; }
{ case = "8.13"; out = "1.11.1"; }
{ case = "8.12"; out = "1.8.3_8.12"; }
{ case = "8.11"; out = "1.6.3_8.11"; }
] null;
release."1.15.6".sha256 = "sha256-qc0q01tW8NVm83801HHOBHe/7H1/F2WGDbKO6nCXfno=";
release."1.15.1".sha256 = "sha256-NT2RlcIsFB9AvBhMxil4ZZIgx+KusMqDflj2HgQxsZg=";
release."1.14.0".sha256 = "sha256:1v2p5dlpviwzky2i14cj7gcgf8cr0j54bdm9fl5iz1ckx60j6nvp";
release."1.13.0".sha256 = "1j7s7dlnjbw222gnbrsjgmjck1yrx7h6hwm8zikcyxi0zys17w7n";

3
pkgs/development/coq-modules/hierarchy-builder/default.nix
View file

@ -5,11 +5,12 @@ with lib; let hb = mkCoqDerivation {
owner = "math-comp";
inherit version;
defaultVersion = with versions; switch coq.coq-version [
{ case = range "8.15" "8.16"; out = "1.3.0"; }
{ case = range "8.15" "8.16"; out = "1.4.0"; }
{ case = range "8.13" "8.14"; out = "1.2.0"; }
{ case = range "8.12" "8.13"; out = "1.1.0"; }
{ case = isEq "8.11"; out = "0.10.0"; }
] null;
release."1.4.0".sha256 = "sha256-tOed9UU3kMw6KWHJ5LVLUFEmzHx1ImutXQvZ0ldW9rw=";
release."1.3.0".sha256 = "17k7rlxdx43qda6i1yafpgc64na8br285cb0mbxy5wryafcdrkrc";
release."1.2.1".sha256 = "sha256-pQYZJ34YzvdlRSGLwsrYgPdz3p/l5f+KhJjkYT08Mj0=";
release."1.2.0".sha256 = "0sk01rvvk652d86aibc8rik2m8iz7jn6mw9hh6xkbxlsvh50719d";

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

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "libmaxminddb";
version = "1.6.0";
version = "1.7.0";
src = fetchurl {
url = meta.homepage + "/releases/download/${version}/${pname}-${version}.tar.gz";
sha256 = "sha256-diCsGHxZHOIbzXvzUjdqPFapM+aEVYofa+9L1PP5gmc=";
sha256 = "sha256-StbPiRlXU183tua2Fi4SIEV5xdPksZExHQvWFj23FYw=";
};
meta = with lib; {

4
pkgs/development/libraries/qt-6/default.nix
View file

@ -49,7 +49,6 @@ let
withGtk3 = true;
inherit (srcs.qtbase) src version;
inherit bison cups harfbuzz libGL dconf gtk3 developerBuild cmake;
patches = [ ./patches/0007-qtbase-xcursor.patch ];
};
qt3d = callPackage ./modules/qt3d.nix { };
@ -59,6 +58,7 @@ let
qtdatavis3d = callPackage ./modules/qtdatavis3d.nix { };
qtdeclarative = callPackage ./modules/qtdeclarative.nix { };
qtdoc = callPackage ./modules/qtdoc.nix { };
qthttpserver = callPackage ./modules/qthttpserver.nix { };
qtimageformats = callPackage ./modules/qtimageformats.nix { };
qtlanguageserver = callPackage ./modules/qtlanguageserver.nix { };
qtlottie = callPackage ./modules/qtlottie.nix { };
@ -71,7 +71,9 @@ let
qtserialbus = callPackage ./modules/qtserialbus.nix { };
qtserialport = callPackage ./modules/qtserialport.nix { };
qtshadertools = callPackage ./modules/qtshadertools.nix { };
qtspeech = callPackage ./modules/qtspeech.nix { };
qtquick3d = callPackage ./modules/qtquick3d.nix { };
qtquick3dphysics = callPackage ./modules/qtquick3dphysics.nix { };
qtquicktimeline = callPackage ./modules/qtquicktimeline.nix { };
qtremoteobjects = callPackage ./modules/qtremoteobjects.nix { };
qtsvg = callPackage ./modules/qtsvg.nix { };

2
pkgs/development/libraries/qt-6/fetch.sh
View file

@ -1 +1 @@
WGET_ARGS=( http://download.qt.io/official_releases/qt/6.3/6.3.2/submodules/ -A '*.tar.xz' )
WGET_ARGS=( https://download.qt.io/official_releases/qt/6.4/6.4.0/submodules/ -A '*.tar.xz' )

9
pkgs/development/libraries/qt-6/modules/qtbase.nix
View file

@ -47,7 +47,6 @@
, icu
, libX11
, libXcomposite
, libXcursor
, libXext
, libXi
, libXrender
@ -183,10 +182,6 @@ stdenv.mkDerivation rec {
substituteInPlace src/corelib/CMakeLists.txt --replace /bin/ls ${coreutils}/bin/ls
'';
preConfigure = ''
export LD_LIBRARY_PATH="$PWD/build/lib:$PWD/build/plugins/platforms''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH"
'';
qtPluginPrefix = "lib/qt-6/plugins";
qtQmlPrefix = "lib/qt-6/qml";
@ -201,10 +196,6 @@ stdenv.mkDerivation rec {
"-DQT_FEATURE_openssl_linked=ON"
];
NIX_CFLAGS_COMPILE = [
''-DNIXPKGS_LIBXCURSOR="${libXcursor.out}/lib/libXcursor"''
];
outputs = [ "out" "dev" ];
postInstall = ''

9
pkgs/development/libraries/qt-6/modules/qthttpserver.nix Normal file
View file

@ -0,0 +1,9 @@
{ qtModule
, qtbase
, qtwebsockets
}:
qtModule {
pname = "qthttpserver";
qtInputs = [ qtbase qtwebsockets ];
}

9
pkgs/development/libraries/qt-6/modules/qtquick3dphysics.nix Normal file
View file

@ -0,0 +1,9 @@
{ qtModule
, qtbase
, qtquick3d
}:
qtModule {
pname = "qtquick3dphysics";
qtInputs = [ qtbase qtquick3d ];
}

15
pkgs/development/libraries/qt-6/modules/qtspeech.nix Normal file
View file

@ -0,0 +1,15 @@
{ qtModule
, qtbase
, qtmultimedia
, pkg-config
, flite
, alsa-lib
, speechd
}:
qtModule {
pname = "qtspeech";
qtInputs = [ qtbase qtmultimedia ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ flite alsa-lib speechd ];
}

4
pkgs/development/libraries/qt-6/modules/qtwebengine.nix
View file

@ -64,6 +64,7 @@
, lcms2
, re2
, libkrb5
, mesa
, xkeyboard_config
, enableProprietaryCodecs ? true
}:
@ -101,7 +102,7 @@ qtModule rec {
# Manually fix unsupported shebangs
substituteInPlace third_party/harfbuzz-ng/src/src/update-unicode-tables.make \
--replace "/usr/bin/env -S make -f" "/usr/bin/make -f" || true
substituteInPlace third_party/webgpu-cts/src/tools/deno \
substituteInPlace third_party/webgpu-cts/src/tools/run_deno \
--replace "/usr/bin/env -S deno" "/usr/bin/deno" || true
patchShebangs .
)
@ -212,6 +213,7 @@ qtModule rec {
pipewire
libkrb5
mesa
];
buildInputs = [

29
pkgs/development/libraries/qt-6/patches/0007-qtbase-xcursor.patch
View file

@ -1,29 +0,0 @@
From cc953cc3f736fabef1f5c211964f30be719fb35e Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Tue, 17 Sep 2019 05:35:58 -0500
Subject: [PATCH 07/10] qtbase-xcursor
---
src/plugins/platforms/xcb/qxcbcursor.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/plugins/platforms/xcb/qxcbcursor.cpp b/src/plugins/platforms/xcb/qxcbcursor.cpp
index fbadab4d50..c83ce0af5b 100644
--- a/src/plugins/platforms/xcb/qxcbcursor.cpp
+++ b/src/plugins/platforms/xcb/qxcbcursor.cpp
@@ -317,10 +317,10 @@ QXcbCursor::QXcbCursor(QXcbConnection *conn, QXcbScreen *screen)
#if QT_CONFIG(xcb_xlib) && QT_CONFIG(library)
static bool function_ptrs_not_initialized = true;
if (function_ptrs_not_initialized) {
- QLibrary xcursorLib(QLatin1String("Xcursor"), 1);
+ QLibrary xcursorLib(QLatin1String(NIXPKGS_LIBXCURSOR), 1);
bool xcursorFound = xcursorLib.load();
if (!xcursorFound) { // try without the version number
- xcursorLib.setFileName(QLatin1String("Xcursor"));
+ xcursorLib.setFileName(QLatin1String(NIXPKGS_LIBXCURSOR));
xcursorFound = xcursorLib.load();
}
if (xcursorFound) {
--
2.25.1

280
pkgs/development/libraries/qt-6/srcs.nix
View file

@ -4,259 +4,283 @@
{
qt3d = {
version = "6.3.2";
version = "6.4.0";
src = fetchurl {
url = "${mirror}/official_releases/qt/6.3/6.3.2/submodules/qt3d-everywhere-src-6.3.2.tar.xz";
sha256 = "0gy73dlzj0hajxr0v68sljqvqclcryirm901icszg1mfvl4xw6zj";
name = "qt3d-everywhere-src-6.3.2.tar.xz";
url = "${mirror}/official_releases/qt/6.4/6.4.0/submodules/qt3d-everywhere-src-6.4.0.tar.xz";
sha256 = "1sxxxa6gaiy573j7x2k06dr4jsxbr9r1brcjfkn0zjgl46sbbgba";
name = "qt3d-everywhere-src-6.4.0.tar.xz";
};
};
qt5compat = {
version = "6.3.2";
version = "6.4.0";
src = fetchurl {
url = "${mirror}/official_releases/qt/6.3/6.3.2/submodules/qt5compat-everywhere-src-6.3.2.tar.xz";
sha256 = "1k30hnwnlbay1hnkdavgf6plsdzrryzcqd2qz8x11r477w7sr8wi";
name = "qt5compat-everywhere-src-6.3.2.tar.xz";
url = "${mirror}/official_releases/qt/6.4/6.4.0/submodules/qt5compat-everywhere-src-6.4.0.tar.xz";
sha256 = "1h54jiqkiipbb3i3sjznrinc67y76ld237qr17ald0pp6w45sivk";
name = "qt5compat-everywhere-src-6.4.0.tar.xz";
};
};
qtactiveqt = {
version = "6.3.2";
version = "6.4.0";
src = fetchurl {
url = "${mirror}/official_releases/qt/6.3/6.3.2/submodules/qtactiveqt-everywhere-src-6.3.2.tar.xz";
sha256 = "052mcwln989hp154kdrjxmif81glx4x3qcmnhss4n1ps4m28jw7w";
name = "qtactiveqt-everywhere-src-6.3.2.tar.xz";
url = "${mirror}/official_releases/qt/6.4/6.4.0/submodules/qtactiveqt-everywhere-src-6.4.0.tar.xz";
sha256 = "1pdam1ggxanrxr0pz8rap2ya59zyd4j56b9kfqbxm5kpkps345ar";
name = "qtactiveqt-everywhere-src-6.4.0.tar.xz";
};
};
qtbase = {
version = "6.3.2";
version = "6.4.0";
src = fetchurl {
url = "${mirror}/official_releases/qt/6.3/6.3.2/submodules/qtbase-everywhere-src-6.3.2.tar.xz";
sha256 = "19m9r8sf9mvyrwipn44if3nhding4ljys2mwf04b7dkhz16vlabr";
name = "qtbase-everywhere-src-6.3.2.tar.xz";
url = "${mirror}/official_releases/qt/6.4/6.4.0/submodules/qtbase-everywhere-src-6.4.0.tar.xz";
sha256 = "0zdkv7m98axjfpdmbv8v2xqndvhnanh75c7vgygw8rw5pnh7ar6b";
name = "qtbase-everywhere-src-6.4.0.tar.xz";
};
};
qtcharts = {
version = "6.3.2";
version = "6.4.0";
src = fetchurl {
url = "${mirror}/official_releases/qt/6.3/6.3.2/submodules/qtcharts-everywhere-src-6.3.2.tar.xz";
sha256 = "1xpv7vijamm1iwx71wbyc7wqw9s35j1iz1ycp5c1a33hhq9lxa5a";
name = "qtcharts-everywhere-src-6.3.2.tar.xz";
url = "${mirror}/official_releases/qt/6.4/6.4.0/submodules/qtcharts-everywhere-src-6.4.0.tar.xz";
sha256 = "1ls077dhvkb4v7g2wwnb6v0rgg5fh4i2fx11fvzdlnsi4k7cmhr8";
name = "qtcharts-everywhere-src-6.4.0.tar.xz";
};
};
qtconnectivity = {
version = "6.3.2";
version = "6.4.0";
src = fetchurl {
url = "${mirror}/official_releases/qt/6.3/6.3.2/submodules/qtconnectivity-everywhere-src-6.3.2.tar.xz";
sha256 = "0n56z6vdf4pc4jqrimsl6gd30vgac2sirz7z2v29d71ca1n6ajg2";
name = "qtconnectivity-everywhere-src-6.3.2.tar.xz";
url = "${mirror}/official_releases/qt/6.4/6.4.0/submodules/qtconnectivity-everywhere-src-6.4.0.tar.xz";
sha256 = "0kn52xibbp7a0021x6jznp9jxlf57fk85zba0z3lqqzanmyigp2s";
name = "qtconnectivity-everywhere-src-6.4.0.tar.xz";
};
};
qtdatavis3d = {
version = "6.3.2";
version = "6.4.0";
src = fetchurl {
url = "${mirror}/official_releases/qt/6.3/6.3.2/submodules/qtdatavis3d-everywhere-src-6.3.2.tar.xz";
sha256 = "13xg4vs3wm47f3wbh56qnrd3wa130g0z4jhf494zd7y2n5vi4r7z";
name = "qtdatavis3d-everywhere-src-6.3.2.tar.xz";
url = "${mirror}/official_releases/qt/6.4/6.4.0/submodules/qtdatavis3d-everywhere-src-6.4.0.tar.xz";
sha256 = "038591l0s9mkzxxxxm3knvyrk1vdimbp0gi5m26n79bx8lw01d0d";
name = "qtdatavis3d-everywhere-src-6.4.0.tar.xz";
};
};
qtdeclarative = {
version = "6.3.2";
version = "6.4.0";
src = fetchurl {
url = "${mirror}/official_releases/qt/6.3/6.3.2/submodules/qtdeclarative-everywhere-src-6.3.2.tar.xz";
sha256 = "1hbw63828pp8vm9b46i2pkcbcpr4mq9nblhmpwrw2pflq0fi24xq";
name = "qtdeclarative-everywhere-src-6.3.2.tar.xz";
url = "${mirror}/official_releases/qt/6.4/6.4.0/submodules/qtdeclarative-everywhere-src-6.4.0.tar.xz";
sha256 = "10s35iivmafprw2spca6fw3gamf10lyp54376af9437srhpyfd1l";
name = "qtdeclarative-everywhere-src-6.4.0.tar.xz";
};
};
qtdoc = {
version = "6.3.2";
version = "6.4.0";
src = fetchurl {
url = "${mirror}/official_releases/qt/6.3/6.3.2/submodules/qtdoc-everywhere-src-6.3.2.tar.xz";
sha256 = "001mf5vrgjz0hbi90qcp66lbs5hv3iickfv6780j2nsc94wjc5mp";
name = "qtdoc-everywhere-src-6.3.2.tar.xz";
url = "${mirror}/official_releases/qt/6.4/6.4.0/submodules/qtdoc-everywhere-src-6.4.0.tar.xz";
sha256 = "11j2vp2k3liz7388702ccy7fjb5ickhxnsc0iyiyirdmll187zgf";
name = "qtdoc-everywhere-src-6.4.0.tar.xz";
};
};
qthttpserver = {
version = "6.4.0";
src = fetchurl {
url = "${mirror}/official_releases/qt/6.4/6.4.0/submodules/qthttpserver-everywhere-src-6.4.0.tar.xz";
sha256 = "10rlmpcj36qfr4465prpb515imrcfa6b2kiz16qyr8m4c86wb51i";
name = "qthttpserver-everywhere-src-6.4.0.tar.xz";
};
};
qtimageformats = {
version = "6.3.2";
version = "6.4.0";
src = fetchurl {
url = "${mirror}/official_releases/qt/6.3/6.3.2/submodules/qtimageformats-everywhere-src-6.3.2.tar.xz";
sha256 = "0fnfhlvd12v1gk81x5zhhrkmn6k80n3zfw5in0yrqxvcmr68mjqx";
name = "qtimageformats-everywhere-src-6.3.2.tar.xz";
url = "${mirror}/official_releases/qt/6.4/6.4.0/submodules/qtimageformats-everywhere-src-6.4.0.tar.xz";
sha256 = "0g2zjipayhzh0lwn6xgxw5mx6f5dpak75xszm2cg1h83bnvsf68l";
name = "qtimageformats-everywhere-src-6.4.0.tar.xz";
};
};
qtlanguageserver = {
version = "6.3.2";
version = "6.4.0";
src = fetchurl {
url = "${mirror}/official_releases/qt/6.3/6.3.2/submodules/qtlanguageserver-everywhere-src-6.3.2.tar.xz";
sha256 = "00ya6lqwv2dq2g86c53aafisp5vnkgamylslg5fqd8ym29g6wraj";
name = "qtlanguageserver-everywhere-src-6.3.2.tar.xz";
url = "${mirror}/official_releases/qt/6.4/6.4.0/submodules/qtlanguageserver-everywhere-src-6.4.0.tar.xz";
sha256 = "09bhg3cm27d8imih1s7rk00zqwf863183znbzhhr3nkl6mqscy0q";
name = "qtlanguageserver-everywhere-src-6.4.0.tar.xz";
};
};
qtlottie = {
version = "6.3.2";
version = "6.4.0";
src = fetchurl {
url = "${mirror}/official_releases/qt/6.3/6.3.2/submodules/qtlottie-everywhere-src-6.3.2.tar.xz";
sha256 = "1c092hmf114r8jfdhkhxnn3vywj93mg33whzav47gr9mbza44icq";
name = "qtlottie-everywhere-src-6.3.2.tar.xz";
url = "${mirror}/official_releases/qt/6.4/6.4.0/submodules/qtlottie-everywhere-src-6.4.0.tar.xz";
sha256 = "1d66fr2my8wcbalikppiykqwisflxahcl86zgqqy2s2wkv5bzz0w";
name = "qtlottie-everywhere-src-6.4.0.tar.xz";
};
};
qtmultimedia = {
version = "6.3.2";
version = "6.4.0";
src = fetchurl {
url = "${mirror}/official_releases/qt/6.3/6.3.2/submodules/qtmultimedia-everywhere-src-6.3.2.tar.xz";
sha256 = "0hqwq0ad6z8c5kyyvbaddj00mciijn2ns2r60jc3mqh98nm2js3z";
name = "qtmultimedia-everywhere-src-6.3.2.tar.xz";
url = "${mirror}/official_releases/qt/6.4/6.4.0/submodules/qtmultimedia-everywhere-src-6.4.0.tar.xz";
sha256 = "0vvrgqcvvr6ch5vnmq3j3lx1xci21b8vc1fv24d9aamfgj28wbp8";
name = "qtmultimedia-everywhere-src-6.4.0.tar.xz";
};
};
qtnetworkauth = {
version = "6.3.2";
version = "6.4.0";
src = fetchurl {
url = "${mirror}/official_releases/qt/6.3/6.3.2/submodules/qtnetworkauth-everywhere-src-6.3.2.tar.xz";
sha256 = "0mjnz87splyxq7jwydi5ws2aqb6j7czscrkns193w425x0dgy94l";
name = "qtnetworkauth-everywhere-src-6.3.2.tar.xz";
url = "${mirror}/official_releases/qt/6.4/6.4.0/submodules/qtnetworkauth-everywhere-src-6.4.0.tar.xz";
sha256 = "1cqp1z73d1kgnz5l5vvgxa58mfx61kdsr9xg1wgwrwbpzpw7g6v0";
name = "qtnetworkauth-everywhere-src-6.4.0.tar.xz";
};
};
qtpositioning = {
version = "6.3.2";
version = "6.4.0";
src = fetchurl {
url = "${mirror}/official_releases/qt/6.3/6.3.2/submodules/qtpositioning-everywhere-src-6.3.2.tar.xz";
sha256 = "0zh45lf164nzwl1hh96qm64nyw9wzzrnm5s7sx761glz54q6l5xz";
name = "qtpositioning-everywhere-src-6.3.2.tar.xz";
url = "${mirror}/official_releases/qt/6.4/6.4.0/submodules/qtpositioning-everywhere-src-6.4.0.tar.xz";
sha256 = "0d58zgjzdmi2fv8wbn0iz941mlpsxclcldzadwwhh0dbdmgmq6rd";
name = "qtpositioning-everywhere-src-6.4.0.tar.xz";
};
};
qtquick3d = {
version = "6.3.2";
version = "6.4.0";
src = fetchurl {
url = "${mirror}/official_releases/qt/6.3/6.3.2/submodules/qtquick3d-everywhere-src-6.3.2.tar.xz";
sha256 = "00wwla3crql4wwbaz116icgc4liszi497g692z8fxllvp4ysm80x";
name = "qtquick3d-everywhere-src-6.3.2.tar.xz";
url = "${mirror}/official_releases/qt/6.4/6.4.0/submodules/qtquick3d-everywhere-src-6.4.0.tar.xz";
sha256 = "1v0py2njivqbj0562pmwpfkqz1ylwkffsn7j943ky46lsih1c2pi";
name = "qtquick3d-everywhere-src-6.4.0.tar.xz";
};
};
qtquick3dphysics = {
version = "6.4.0";
src = fetchurl {
url = "${mirror}/official_releases/qt/6.4/6.4.0/submodules/qtquick3dphysics-everywhere-src-6.4.0.tar.xz";
sha256 = "01zx50f5gmvwg2mb853hsr2hgrciyg62h365ryq5y9fi6hs48nfw";
name = "qtquick3dphysics-everywhere-src-6.4.0.tar.xz";
};
};
qtquicktimeline = {
version = "6.3.2";
version = "6.4.0";
src = fetchurl {
url = "${mirror}/official_releases/qt/6.3/6.3.2/submodules/qtquicktimeline-everywhere-src-6.3.2.tar.xz";
sha256 = "0njidyr7ahvrq1x1676v16qcp7lz2v2rhz0x3iw2mql90vrhk2h4";
name = "qtquicktimeline-everywhere-src-6.3.2.tar.xz";
url = "${mirror}/official_releases/qt/6.4/6.4.0/submodules/qtquicktimeline-everywhere-src-6.4.0.tar.xz";
sha256 = "0msg0l75m0slwar9p3vpx99cyf3j3mfbajfra26jmi0haf5s5s3h";
name = "qtquicktimeline-everywhere-src-6.4.0.tar.xz";
};
};
qtremoteobjects = {
version = "6.3.2";
version = "6.4.0";
src = fetchurl {
url = "${mirror}/official_releases/qt/6.3/6.3.2/submodules/qtremoteobjects-everywhere-src-6.3.2.tar.xz";
sha256 = "099b3vchi458i4fci9kfwan871jplqlk5l8q78mfnh33g80qnasi";
name = "qtremoteobjects-everywhere-src-6.3.2.tar.xz";
url = "${mirror}/official_releases/qt/6.4/6.4.0/submodules/qtremoteobjects-everywhere-src-6.4.0.tar.xz";
sha256 = "1kp1as4ih021dz37z53nv7s2byb4w04cxpj4qkxqdvvgxvmps6pm";
name = "qtremoteobjects-everywhere-src-6.4.0.tar.xz";
};
};
qtscxml = {
version = "6.3.2";
version = "6.4.0";
src = fetchurl {
url = "${mirror}/official_releases/qt/6.3/6.3.2/submodules/qtscxml-everywhere-src-6.3.2.tar.xz";
sha256 = "1h90kiin6n4629nlzqkilhvn30q4ppr9kwbcxbsck4zss91yc6n5";
name = "qtscxml-everywhere-src-6.3.2.tar.xz";
url = "${mirror}/official_releases/qt/6.4/6.4.0/submodules/qtscxml-everywhere-src-6.4.0.tar.xz";
sha256 = "0r3nv4bbdab8hsvzz0d03qq977smlfmp7k4wm6n2jj2rwsjp61yl";
name = "qtscxml-everywhere-src-6.4.0.tar.xz";
};
};
qtsensors = {
version = "6.3.2";
version = "6.4.0";
src = fetchurl {
url = "${mirror}/official_releases/qt/6.3/6.3.2/submodules/qtsensors-everywhere-src-6.3.2.tar.xz";
sha256 = "1r82rpn552737n04b0wvv8g9rzqxvsr1snd22bwfb4djjn5b47j5";
name = "qtsensors-everywhere-src-6.3.2.tar.xz";
url = "${mirror}/official_releases/qt/6.4/6.4.0/submodules/qtsensors-everywhere-src-6.4.0.tar.xz";
sha256 = "1njhrbhknbil8dllknc8p3q16k65rmqdx1gkhlcn6qlzbcphg37k";
name = "qtsensors-everywhere-src-6.4.0.tar.xz";
};
};
qtserialbus = {
version = "6.3.2";
version = "6.4.0";
src = fetchurl {
url = "${mirror}/official_releases/qt/6.3/6.3.2/submodules/qtserialbus-everywhere-src-6.3.2.tar.xz";
sha256 = "04j5q2lwvbzp977zayj48ixwg4mkq0x58fk88l4kfkgy1xmrwgnh";
name = "qtserialbus-everywhere-src-6.3.2.tar.xz";
url = "${mirror}/official_releases/qt/6.4/6.4.0/submodules/qtserialbus-everywhere-src-6.4.0.tar.xz";
sha256 = "14ga962x9h5rkgybf63b4b4fn8i96c0z9q60ns2ml20jgikmbjpg";
name = "qtserialbus-everywhere-src-6.4.0.tar.xz";
};
};
qtserialport = {
version = "6.3.2";
version = "6.4.0";
src = fetchurl {
url = "${mirror}/official_releases/qt/6.3/6.3.2/submodules/qtserialport-everywhere-src-6.3.2.tar.xz";
sha256 = "0vsyqdibf8mn4481vb6sc4chgabbqzcxw1mxxm3kdik74cr0gln7";
name = "qtserialport-everywhere-src-6.3.2.tar.xz";
url = "${mirror}/official_releases/qt/6.4/6.4.0/submodules/qtserialport-everywhere-src-6.4.0.tar.xz";
sha256 = "10s4997n3b0vp51slrjcdkkfqf8kabcn8ypz5gl2h8nfhygcqj7i";
name = "qtserialport-everywhere-src-6.4.0.tar.xz";
};
};
qtshadertools = {
version = "6.3.2";
version = "6.4.0";
src = fetchurl {
url = "${mirror}/official_releases/qt/6.3/6.3.2/submodules/qtshadertools-everywhere-src-6.3.2.tar.xz";
sha256 = "1bmkrpk414clx8pnyrdslqlsnfmsdldmwrdcqzz6rwi8ymk2ggpn";
name = "qtshadertools-everywhere-src-6.3.2.tar.xz";
url = "${mirror}/official_releases/qt/6.4/6.4.0/submodules/qtshadertools-everywhere-src-6.4.0.tar.xz";
sha256 = "141vmracfa9r71l0mqilgllfb3c1ygpc913yx8pwsy411vqabmnv";
name = "qtshadertools-everywhere-src-6.4.0.tar.xz";
};
};
qtspeech = {
version = "6.4.0";
src = fetchurl {
url = "${mirror}/official_releases/qt/6.4/6.4.0/submodules/qtspeech-everywhere-src-6.4.0.tar.xz";
sha256 = "1xrx323vyvrgrphxvf3nxy8s7ps26pgxaj71rlgipl58jqhc4fw7";
name = "qtspeech-everywhere-src-6.4.0.tar.xz";
};
};
qtsvg = {
version = "6.3.2";
version = "6.4.0";
src = fetchurl {
url = "${mirror}/official_releases/qt/6.3/6.3.2/submodules/qtsvg-everywhere-src-6.3.2.tar.xz";
sha256 = "14i3f23k9k0731akpwa6zzhw5m3c0m2l5r7irvim4h4faah445ac";
name = "qtsvg-everywhere-src-6.3.2.tar.xz";
url = "${mirror}/official_releases/qt/6.4/6.4.0/submodules/qtsvg-everywhere-src-6.4.0.tar.xz";
sha256 = "09av5ky5zlsz4smf3xwvk07ylkz1wz3g5hbx73xdqx6h6yaaxz83";
name = "qtsvg-everywhere-src-6.4.0.tar.xz";
};
};
qttools = {
version = "6.3.2";
version = "6.4.0";
src = fetchurl {
url = "${mirror}/official_releases/qt/6.3/6.3.2/submodules/qttools-everywhere-src-6.3.2.tar.xz";
sha256 = "1lmfk5bhgg4daxkqrhmx4iyln7pyiz40c9cp6plyp35nz8ppvc75";
name = "qttools-everywhere-src-6.3.2.tar.xz";
url = "${mirror}/official_releases/qt/6.4/6.4.0/submodules/qttools-everywhere-src-6.4.0.tar.xz";
sha256 = "18pv3b0y9ycbn5v98rjir8wsvsy40vy8xc5pyylfg2s5ikwdbwwp";
name = "qttools-everywhere-src-6.4.0.tar.xz";
};
};
qttranslations = {
version = "6.3.2";
version = "6.4.0";
src = fetchurl {
url = "${mirror}/official_releases/qt/6.3/6.3.2/submodules/qttranslations-everywhere-src-6.3.2.tar.xz";
sha256 = "1h66n9cx4g65c9wrgp32h9gm3r47gyh1nrcn3ivbfbvngfawqxpg";
name = "qttranslations-everywhere-src-6.3.2.tar.xz";
url = "${mirror}/official_releases/qt/6.4/6.4.0/submodules/qttranslations-everywhere-src-6.4.0.tar.xz";
sha256 = "0pwjfsi4b4fr2hw9mx76fiix0mz0wss3ic4pmd9yngk91f9kmfbs";
name = "qttranslations-everywhere-src-6.4.0.tar.xz";
};
};
qtvirtualkeyboard = {
version = "6.3.2";
version = "6.4.0";
src = fetchurl {
url = "${mirror}/official_releases/qt/6.3/6.3.2/submodules/qtvirtualkeyboard-everywhere-src-6.3.2.tar.xz";
sha256 = "0czxh6wc1qgxns1qm6zcnck6i0nzaz3bzi3725qdw98738lyhvml";
name = "qtvirtualkeyboard-everywhere-src-6.3.2.tar.xz";
url = "${mirror}/official_releases/qt/6.4/6.4.0/submodules/qtvirtualkeyboard-everywhere-src-6.4.0.tar.xz";
sha256 = "087xlc7ljkbmm85n42qx0cz8rvyhfkw1dzypxp5h3c5glamhkar5";
name = "qtvirtualkeyboard-everywhere-src-6.4.0.tar.xz";
};
};
qtwayland = {
version = "6.3.2";
version = "6.4.0";
src = fetchurl {
url = "${mirror}/official_releases/qt/6.3/6.3.2/submodules/qtwayland-everywhere-src-6.3.2.tar.xz";
sha256 = "0rwiirkibgpvx05pg2842j4dcq9ckxmcqxhaf50xx2i55z64ll83";
name = "qtwayland-everywhere-src-6.3.2.tar.xz";
url = "${mirror}/official_releases/qt/6.4/6.4.0/submodules/qtwayland-everywhere-src-6.4.0.tar.xz";
sha256 = "1z32bdgcril9ijqsn4d60znm610mm72rgn1a6dblvhxy9zhsi2zh";
name = "qtwayland-everywhere-src-6.4.0.tar.xz";
};
};
qtwebchannel = {
version = "6.3.2";
version = "6.4.0";
src = fetchurl {
url = "${mirror}/official_releases/qt/6.3/6.3.2/submodules/qtwebchannel-everywhere-src-6.3.2.tar.xz";
sha256 = "0gqm09yqdq27kgb02idx5ycj14k5mjhh10ddp9jfs8lblimlgfni";
name = "qtwebchannel-everywhere-src-6.3.2.tar.xz";
url = "${mirror}/official_releases/qt/6.4/6.4.0/submodules/qtwebchannel-everywhere-src-6.4.0.tar.xz";
sha256 = "0nk92cbdph5ri91pnh54i3bdpx1pn9pbgyysmpg59265gj1nv3sj";
name = "qtwebchannel-everywhere-src-6.4.0.tar.xz";
};
};
qtwebengine = {
version = "6.3.2";
version = "6.4.0";
src = fetchurl {
url = "${mirror}/official_releases/qt/6.3/6.3.2/submodules/qtwebengine-everywhere-src-6.3.2.tar.xz";
sha256 = "09j4w9ax8242d1yx3hmic7jcwidwdrn8sp7k89hj4l0n8mzkkd35";
name = "qtwebengine-everywhere-src-6.3.2.tar.xz";
url = "${mirror}/official_releases/qt/6.4/6.4.0/submodules/qtwebengine-everywhere-src-6.4.0.tar.xz";
sha256 = "00skwxlin6za8wsh6ddhy7nmpabzjzj1lxf2w81fj04vb7nfjak6";
name = "qtwebengine-everywhere-src-6.4.0.tar.xz";
};
};
qtwebsockets = {
version = "6.3.2";
version = "6.4.0";
src = fetchurl {
url = "${mirror}/official_releases/qt/6.3/6.3.2/submodules/qtwebsockets-everywhere-src-6.3.2.tar.xz";
sha256 = "1smbvidaybphvsmaap9v1pbkibwmng11hb925g0ww4ghwzpxkb8q";
name = "qtwebsockets-everywhere-src-6.3.2.tar.xz";
url = "${mirror}/official_releases/qt/6.4/6.4.0/submodules/qtwebsockets-everywhere-src-6.4.0.tar.xz";
sha256 = "1jlvxidjaj44hky1cwm0y8gj6zynrnd70hf44dhjcdv5rllncg7z";
name = "qtwebsockets-everywhere-src-6.4.0.tar.xz";
};
};
qtwebview = {
version = "6.3.2";
version = "6.4.0";
src = fetchurl {
url = "${mirror}/official_releases/qt/6.3/6.3.2/submodules/qtwebview-everywhere-src-6.3.2.tar.xz";
sha256 = "06v69xl0fnbv4i1xbjaw7338iqyvim8d3q91qrrg7r2nqzjhiav7";
name = "qtwebview-everywhere-src-6.3.2.tar.xz";
url = "${mirror}/official_releases/qt/6.4/6.4.0/submodules/qtwebview-everywhere-src-6.4.0.tar.xz";
sha256 = "19z5d1gs6jm2776si9i3dxn4j70y3s8yh3m299gvb2b8fby8xfwl";
name = "qtwebview-everywhere-src-6.4.0.tar.xz";
};
};
}

2
pkgs/development/libraries/zint/default.nix
View file

@ -21,6 +21,8 @@ stdenv.mkDerivation rec {
sha256 = "sha256-ozhXy7ftmGz1XvmF8AS1ifWJ3Q5hLSsysB8qLUP60n8=";
};
patches = [ ./qobject.patch ];
outputs = [ "out" "dev" ];
nativeBuildInputs = [ cmake wrapQtAppsHook ];

12
pkgs/development/libraries/zint/qobject.patch Normal file
View file

@ -0,0 +1,12 @@
diff --git a/backend_qt/qzint.h b/backend_qt/qzint.h
index d57ab6a..62fb0a4 100644
--- a/backend_qt/qzint.h
+++ b/backend_qt/qzint.h
@@ -19,6 +19,7 @@
#ifndef QZINT_H
#define QZINT_H
+#include <QObject>
#include <QColor>
#include <QPainter>
#include "zint.h"

6
pkgs/development/python-modules/ansible-lint/default.nix
View file

@ -22,13 +22,13 @@
buildPythonPackage rec {
pname = "ansible-lint";
version = "6.5.2";
version = "6.7.0";
format = "pyproject";
disabled = pythonOlder "3.6";
disabled = pythonOlder "3.8";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-9EMsdMDyiyhwoYi0mZWS9jOAQvMNDG9O4RsyRAyp/+Q=";
sha256 = "sha256-oREpUVLS3oEoV8rGuyxrADMVgm2crhQQpPEOPuslWwk=";
};
postPatch = ''

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

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "argc";
version = "0.11.0";
version = "0.12.0";
src = fetchFromGitHub {
owner = "sigoden";
repo = pname;
rev = "v${version}";
sha256 = "1gzsp08x54bsvzjm09cr1lgdr5mq1gzs36x2fjd710ixwcf9fcb6";
sha256 = "sha256-Y6qXxnjep9AF3aAW6EZNx4dghMH3BSw8ExpNhTVH1QI=";
};
cargoSha256 = "sha256-LIQ/j4NMYwrwBQkEYlrqRobrfkPERwtWZqT8pwSoICA=";
cargoSha256 = "sha256-Wr+sUtxxdmY6l+sMAcQGR3Zmqvj8qybC74o9ipkwTMk=";
nativeBuildInputs = [ installShellFiles ];

6
pkgs/development/tools/continuous-integration/dagger/default.nix
View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "dagger";
version = "0.2.34";
version = "0.2.35";
src = fetchFromGitHub {
owner = "dagger";
repo = "dagger";
rev = "v${version}";
sha256 = "sha256-gUdvndL8v+7lX/GuMxHlHxp3j8YTQWEh3c+WX+fDOQU=";
sha256 = "sha256-bLeNCi9ghNuHcMjUV3JWmC7nQTUZA9lU3Rc0TO7AWto=";
};
vendorSha256 = "sha256-yNb5OvsnNAk+K0gepKVuqivS+eeLMOVCqxF/rj+Rpps=";
vendorSha256 = "sha256-ArdqEHECnGTMs3sJrPIAfmTT0D2V8SHyTYXmDODVtuo=";
subPackages = [
"cmd/dagger"

4
pkgs/development/tools/misc/seer/default.nix
View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "seer";
version = "1.10";
version = "1.11";
src = fetchFromGitHub {
owner = "epasveer";
repo = "seer";
rev = "v${version}";
sha256 = "sha256-G8kiLZBRS8Ec8LYsbppmyYZcNk3By0bcfWQFyI5epZ4=";
sha256 = "sha256-HIRNCcE1EhxsiJ5/MQZgR7IXaeM4rWoepPhALXoW7Hw=";
};
preConfigure = ''

4
pkgs/development/tools/mold/default.nix
View file

@ -12,13 +12,13 @@
stdenv.mkDerivation rec {
pname = "mold";
version = "1.5.0";
version = "1.5.1";
src = fetchFromGitHub {
owner = "rui314";
repo = pname;
rev = "v${version}";
hash = "sha256-mCuKNVWjll9+xYPR6DnwkzPxbn4gR+x+DaCCTI9BXiE=";
hash = "sha256-s57mXWZsj7S5O91I3tc/ecHJDbQR7amiyTxhYt7jzUM=";
};
nativeBuildInputs = [ cmake ninja ];

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

@ -8,16 +8,16 @@
rustPlatform.buildRustPackage rec {
pname = "ruff";
version = "0.0.47";
version = "0.0.48";
src = fetchFromGitHub {
owner = "charliermarsh";
repo = pname;
rev = "v${version}";
sha256 = "sha256-6pwhBcyWKJyV8610hUVTYgz0Ryy1FC4ZU8Alh2LnGCU=";
sha256 = "sha256-KTvssDMy9Gol98jRPxDwjRIPAWNKU2Dx0TKAFvsX2zE=";
};
cargoSha256 = "sha256-2nAnlSG1odW2I2642S7qAlDsb94cgRh9AYmxoLX6s/M=";
cargoSha256 = "sha256-9OX1s461S5KDfwYq0kEI55LV4FmLGLEWI69wWOmDxtI=";
buildInputs = lib.optionals stdenv.isDarwin [
CoreServices

6
pkgs/development/tools/rust/cargo-expand/default.nix
View file

@ -7,16 +7,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-expand";
version = "1.0.31";
version = "1.0.32";
src = fetchFromGitHub {
owner = "dtolnay";
repo = pname;
rev = version;
sha256 = "sha256-zyh5Tcs0RbZebiLfl9bIH5Ua5cizJPDlNuoVQhW3I/c=";
sha256 = "sha256-5zWJsc0OKgQMp0PeCuL99RE/Uj5sudXRMITjoKniPqQ=";
};
cargoSha256 = "sha256-WMIgBtZowpXElTradzgGjN/TQxDn9RzS7hBKfFAlFEM=";
cargoSha256 = "sha256-/euiu7WNFY89QU1BKFfOAn7k93dZpuwbS6u2A6MDsoM=";
buildInputs = lib.optional stdenv.isDarwin libiconv;

6
pkgs/tools/admin/copilot-cli/default.nix
View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "copilot-cli";
version = "1.21.1";
version = "1.22.0";
src = fetchFromGitHub {
owner = "aws";
repo = pname;
rev = "v${version}";
sha256 = "sha256-6x809FXjPQH7Q90GCZdcMI1SuqR868UGnVK1Hs5qZNo=";
sha256 = "sha256-ApIEMUit0iVwVGq48qPhQG+i4+HCCwPmiH/QQOdZNjs=";
};
vendorSha256 = "sha256-+nARXJdMmU36Gz2fjXbkFMafJGVUJx+T/zTQRcfVYik=";
vendorSha256 = "sha256-GKGMM5oFfEuXS1utbmIcH/5COqfNrSUzthLQSUxSkbo=";
nativeBuildInputs = [ installShellFiles ];

6
pkgs/tools/misc/opentelemetry-collector/contrib.nix
View file

@ -6,17 +6,17 @@
buildGoModule rec {
pname = "opentelemetry-collector-contrib";
version = "0.60.0";
version = "0.61.0";
src = fetchFromGitHub {
owner = "open-telemetry";
repo = "opentelemetry-collector-contrib";
rev = "v${version}";
sha256 = "sha256-dHxcV98z4LPI40qobNpcUTFFB4lf2FEf+f5N/50LtE4=";
sha256 = "sha256-xJCxMWAp5qg00kUWssVyy+uLpDQ/CZjO4TXXoDosXxA=";
};
# proxy vendor to avoid hash missmatches between linux and macOS
proxyVendor = true;
vendorSha256 = "sha256-p1jyycI9dRXVwLjXON13GT64SsPVhBIRPa14O6q+klk=";
vendorSha256 = "sha256-Fl2/rPrtbL3/gcM5hm4MgQwcS0PValuxa+nThYAE4l0=";
subPackages = [ "cmd/otelcontribcol" ];

3
pkgs/tools/networking/mozillavpn/default.nix
View file

@ -84,6 +84,9 @@ stdenv.mkDerivation {
substituteInPlace src/cmake/linux.cmake \
--replace '${"$"}{SYSTEMD_UNIT_DIR}' "$out/lib/systemd/system"
substituteInPlace src/connectionbenchmark/benchmarktaskdownload.cpp \
--replace 'QT_VERSION >= 0x060400' 'false'
ln -s '${netfilter-go-modules}' linux/netfilter/vendor
'';

4
pkgs/tools/package-management/nfpm/default.nix
View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "nfpm";
version = "2.19.1";
version = "2.19.2";
src = fetchFromGitHub {
owner = "goreleaser";
repo = pname;
rev = "v${version}";
sha256 = "sha256-WhPEESIPrCDI92HVRz5rr2Zvgtty/5T5ywkvNY8KleU=";
sha256 = "sha256-SCa60HOLs8+uxVmFs73UmUjS4j9v2XmKas+SLmM1xTI=";
};
vendorSha256 = "sha256-+Aq54AAZ4094xZpTEOD63mHSff3Cm0oOQneJjGTe0To=";

6
pkgs/tools/security/rekor/default.nix
View file

@ -4,13 +4,13 @@ let
generic = { pname, packageToBuild, description }:
buildGoModule rec {
inherit pname;
version = "0.12.1";
version = "0.12.2";
src = fetchFromGitHub {
owner = "sigstore";
repo = "rekor";
rev = "v${version}";
sha256 = "sha256-0Ogq/bxTMy0Ulxbcjn9PnXBg9XlHthBA1db8ZhuL+UQ=";
sha256 = "sha256-Ew9RHjzmQGZ9Vou436NdBLAj97vfnrLy9EuRKg4sNHY=";
# 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;
@ -23,7 +23,7 @@ let
'';
};
vendorSha256 = "sha256-RseDjR5RpjWC7lLVAVdFFj/jKmYX129bUVjbYKhqh54=";
vendorSha256 = "sha256-SwezkvJx50NpwNrv//Ai8yj5ONfC/hmdKbVS754ofW8=";
nativeBuildInputs = [ installShellFiles ];

6
pkgs/tools/security/vault/default.nix
View file

@ -6,16 +6,16 @@
buildGoModule rec {
pname = "vault";
version = "1.11.3";
version = "1.11.4";
src = fetchFromGitHub {
owner = "hashicorp";
repo = "vault";
rev = "v${version}";
sha256 = "sha256-L86wV47xGf3W6LEhFuH6cP30dtvETRbEGsmQNCHviCI=";
sha256 = "sha256-t7mcnXOBP5fTnYVTLVfA2HOynKri88tQdkyl6p83aFQ=";
};
vendorSha256 = "sha256-fKHo/m2QKEclNMeDxlM8kmOxAWbKu1lsXC4cKDaImdg=";
vendorSha256 = "sha256-4WbNrFK80uQPUrTvNHBRAYynqpOxAolj1t6XJ0Bb8I4=";
subPackages = [ "." ];

12
pkgs/tools/security/vault/vault-bin.nix
View file

@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
pname = "vault-bin";
version = "1.11.3";
version = "1.11.4";
src =
let
@ -16,11 +16,11 @@ stdenv.mkDerivation rec {
aarch64-darwin = "darwin_arm64";
};
sha256 = selectSystem {
x86_64-linux = "sha256-k4477q9gE5CwOZkguzfAXSzZvBL/ZiAY4GWIXwKMSPM=";
aarch64-linux = "sha256-TIQm3pxV3ix6c7IUXMFnsAvJb9wATByNQ+i0aPYHypI=";
i686-linux = "sha256-Ms7LycRSRamb3myJ97Gm/9h/kQwIJrf9r99qMvIw8Dc=";
x86_64-darwin = "sha256-eOpXf0w2Ok89rVYqM2GJEpPpx8jIKnlThgL9esSheB8=";
aarch64-darwin = "sha256-JRacHUcwM2lKt2tTC6D4LUOb312F0MgQsmFqlk626fg=";
x86_64-linux = "sha256-+txLeWsk63rj1iWOI3p9oP2aAEY/VYbvMOYtGQ6gHV8=";
aarch64-linux = "sha256-py8HF4uydQIIW1zu5W2c1VF6Dtp4yw+hUs8fPjIa7YQ=";
i686-linux = "sha256-87dmhr2HEBqjPDd4SrVGH5Fw7Rar9HqWxNRMK8Vg9yY=";
x86_64-darwin = "sha256-AsVYI5uM9b5NIaf0Qkb5/zbJ0WYxROBIa0nvbX08OcI=";
aarch64-darwin = "sha256-2Fqk5C9who8tV7+OnVODcK5DyJjE6V5akIR4oNhDQlA=";
};
in
fetchzip {

9
pkgs/tools/system/hw-probe/default.nix
View file

@ -60,13 +60,13 @@
stdenv.mkDerivation rec {
pname = "hw-probe";
version = "1.6.4";
version = "1.6.5";
src = fetchFromGitHub {
owner = "linuxhw";
repo = pname;
rev = version;
sha256 = "sha256:028wnhrbn10lfxwmcpzdbz67ygldimv7z1k1bm64ggclykvg5aim";
sha256 = "sha256-WlLSgjVLqGGtwCyyUn9X3XbE2Yhz6LD245+U2JgGd+k=";
};
makeFlags = [ "prefix=$(out)" ];
@ -100,7 +100,6 @@ stdenv.mkDerivation rec {
mesa-demos
memtester
sysstat # (iostat)
cpuid
util-linuxMinimal # (rfkill)
xinput
libva-utils # (vainfo)
@ -108,7 +107,9 @@ stdenv.mkDerivation rec {
vulkan-utils
i2c-tools
opensc
];
]
# cpuid is only compatible with i686 and x86_64
++ lib.optional (lib.elem stdenv.hostPlatform.system cpuid.meta.platforms) cpuid;
conditionallyRecommendedPrograms = lib.optional systemdSupport systemd; # (systemd-analyze)
suggestedPrograms = [
hplip # (hp-probe)