nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-01 17:53:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot] 2023-12-22 06:01:23 +00:00 committed by GitHub
commit 07f3448526
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
17 changed files with 67 additions and 130 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
doc/languages-frameworks/go.section.md
View File

@ -132,7 +132,6 @@ Arguments to pass to the Go linker tool via the `-ldflags` argument of `go build
```nix
ldflags = [
"-s" "-w"
"-X main.Version=${version}"
"-X main.Commit=${version}"
];

60
pkgs/applications/finance/cryptowatch/default.nix
View File

@ -1,60 +0,0 @@
{ stdenv
, lib
, fetchurl
, autoPatchelfHook
, wrapGAppsHook
, dbus
, libGL
, libX11
, libXcursor
, libXi
, libXrandr
, udev
, unzip
, alsa-lib
}:
stdenv.mkDerivation rec {
pname = "cryptowatch-desktop";
version = "0.7.1";
src = fetchurl {
url = "https://cryptowat.ch/desktop/download/linux/${version}";
hash = "sha256-ccyHfjp00CgQH+3SiDWx9yE1skOj0RWxnBomHWY/IaU=";
};
unpackPhase = "unzip $src";
nativeBuildInputs = [
autoPatchelfHook
wrapGAppsHook
unzip
];
buildInputs = [
dbus
udev
alsa-lib
];
sourceRoot = ".";
installPhase = ''
install -m755 -D cryptowatch_desktop $out/bin/cryptowatch_desktop
'';
preFixup = ''
gappsWrapperArgs+=(
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libGL libX11 libXcursor libXrandr libXi ]}"
)
'';
meta = with lib; {
homepage = "https://cryptowat.ch";
description = "Application for visualising real-time cryptocurrency market data";
platforms = platforms.linux;
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
license = licenses.unfree;
maintainers = with maintainers; [ livnev kashw2 ];
};
}

8
pkgs/applications/misc/flowtime/default.nix
View File

@ -5,12 +5,14 @@
, meson
, ninja
, wrapGAppsHook4
, gst_all_1
, libadwaita
, libxml2
, desktop-file-utils
, pkg-config
, libportal-gtk4
, blueprint-compiler
, appstream-glib
}:
stdenv.mkDerivation rec {
@ -32,13 +34,17 @@ stdenv.mkDerivation rec {
pkg-config
vala
wrapGAppsHook4
appstream-glib
];
buildInputs = [
libadwaita
libxml2
libportal-gtk4
];
] ++ (with gst_all_1; [
gstreamer
gst-plugins-base
]);
meta = with lib; {
description = "Get what motivates you done, without losing concentration";

15
pkgs/development/libraries/hnswlib/default.nix
View File

@ -1,7 +1,6 @@
{ lib
, stdenv
, fetchFromGitHub
, fetchpatch
, cmake
, python3
}:
@ -13,26 +12,18 @@ in
stdenv.mkDerivation (finalAttrs: {
pname = "hnswlib";
version = "0.7.0";
version = "0.8.0";
src = fetchFromGitHub {
owner = "nmslib";
repo = "hnswlib";
rev = "refs/tags/v${finalAttrs.version}";
hash = "sha256-XXz0NIQ5dCGwcX2HtbK5NFTalP0TjLO6ll6TmH3oflI=";
hash = "sha256-1KkAX42j/I06KO4wCnDsDifN1JiENqYKR5NNHBjyuVA=";
};
patches = [
(fetchpatch {
name = "CVE-2023-37365.patch";
url = "https://github.com/nmslib/hnswlib/commit/f6d170ce0b41f9e75ace473b09df6e7872590757.patch";
hash = "sha256-28nakC0rh6kx6yYjv7m6r9/yJ+lWQuooRFyYYQN2rX8=";
})
];
# this is a header-only library, so we don't need to build it
# we need `cmake` only to run tests
nativeBuildInputs = lib.optionals finalAttrs.finalPackage.doCheck [
nativeCheckInputs = [
cmake
python
];

6
pkgs/development/libraries/pcl/default.nix
View File

@ -19,7 +19,7 @@
, AGL
, OpenGL
, config
, withCuda ? config.cudaSupport, cudaPackages
, cudaSupport ? config.cudaSupport, cudaPackages
}:
stdenv.mkDerivation rec {
@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
cmake
wrapQtAppsHook
]
++ lib.optionals withCuda [ cudaPackages.cuda_nvcc ];
++ lib.optionals cudaSupport [ cudaPackages.cuda_nvcc ];
buildInputs = [
eigen
@ -66,7 +66,7 @@ stdenv.mkDerivation rec {
cmakeFlags = lib.optionals stdenv.isDarwin [
"-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks"
] ++ lib.optionals withCuda [ "-DWITH_CUDA=true" ];
] ++ lib.optionals cudaSupport [ "-DWITH_CUDA=true" ];
meta = {
homepage = "https://pointclouds.org/";

4
pkgs/development/python-modules/peft/default.nix
View File

@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "peft";
version = "0.6.2";
version = "0.7.1";
format = "pyproject";
disabled = pythonOlder "3.8";
@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "huggingface";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-hqXHU6PHn2jkWBRRCRuGIGjSCUc6jfUaHgrn3glTwlE=";
hash = "sha256-sdv9rMj5Qh2/QtBVSxHMAP/Tk+ZyrHtNfX/4q8/Qw3A=";
};
nativeBuildInputs = [ setuptools ];

4
pkgs/development/tools/glamoroustoolkit/default.nix
View File

@ -21,12 +21,12 @@
stdenv.mkDerivation (finalAttrs: {
pname = "glamoroustoolkit";
version = "1.0.7";
version = "1.0.9";
src = fetchzip {
url = "https://github.com/feenkcom/gtoolkit-vm/releases/download/v${finalAttrs.version}/GlamorousToolkit-x86_64-unknown-linux-gnu.zip";
stripRoot = false;
hash = "sha256-WcAOGPWbY3sCcwmSHTjZvO3ASYYPv1T0iEA5C/VXL9I=";
hash = "sha256-Z8gTgQuGChqA6k0GSnIU49FAkRBWygLHeHNBpTlpzYo=";
};
nativeBuildInputs = [ wrapGAppsHook ];

6
pkgs/development/web/deno/default.nix
View File

@ -13,16 +13,16 @@
rustPlatform.buildRustPackage rec {
pname = "deno";
version = "1.39.0";
version = "1.39.1";
src = fetchFromGitHub {
owner = "denoland";
repo = pname;
rev = "v${version}";
hash = "sha256-TiMwbiMIbhbLzTGndl3BpvX63ojydlCeylR9o5E+ZRk=";
hash = "sha256-Rlt8gRlZlxC/axHsicbQizoMNbQJsv6egZXj4SKUARw=";
};
cargoHash = "sha256-JXghF5lwpO898/BWC8srCN0B/ClF9VpW2C1l2nXcH50=";
cargoHash = "sha256-P0g5rhnSjMd9bD7/FBYaRyXwbeC5nAjDBA2EsQ4gfXA=";
postPatch = ''
# upstream uses lld on aarch64-darwin for faster builds

2
pkgs/os-specific/linux/kernel/hardened/config.nix
View File

@ -34,7 +34,7 @@ assert (versionAtLeast version "4.9");
STRICT_KERNEL_RWX = yes;
# Perform additional validation of commonly targeted structures.
DEBUG_CREDENTIALS = yes;
DEBUG_CREDENTIALS = whenOlder "6.6" yes;
DEBUG_NOTIFIERS = yes;
DEBUG_PI_LIST = whenOlder "5.2" yes; # doesn't BUG()
DEBUG_PLIST = whenAtLeast "5.2" yes;

60
pkgs/os-specific/linux/kernel/hardened/patches.json
View File

@ -2,52 +2,52 @@
"4.19": {
"patch": {
"extra": "-hardened1",
"name": "linux-hardened-4.19.302-hardened1.patch",
"sha256": "1qr0i1swrvbwxd7sx0fy6cg85k0aya518cdnmx2v1jpydvlkhn1a",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.302-hardened1/linux-hardened-4.19.302-hardened1.patch"
"name": "linux-hardened-4.19.303-hardened1.patch",
"sha256": "0bmf88vid8312rrdy4b1bnq4x2rhkiihp01b2j2jmpjbdsj2qbya",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.303-hardened1/linux-hardened-4.19.303-hardened1.patch"
},
"sha256": "1kkkpm34p5rq0iijzrzwaq0cb62w543argargw5p1wzg8803rlsk",
"version": "4.19.302"
"sha256": "0dlbl47xs7z4yf9cxbxqzd7zs1f9070jr6ck231wgppa6lwwwb82",
"version": "4.19.303"
},
"5.10": {
"patch": {
"extra": "-hardened1",
"name": "linux-hardened-5.10.204-hardened1.patch",
"sha256": "0a1hyf7sjsv9g47x7nznpn5nq7p5jkzy2f4nsiy3pp1853f00v1d",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.204-hardened1/linux-hardened-5.10.204-hardened1.patch"
"name": "linux-hardened-5.10.205-hardened1.patch",
"sha256": "0viz1pybmh8vld40s2gh73a63743c3v7g2dbrsbqqjkh8xvn28zk",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.205-hardened1/linux-hardened-5.10.205-hardened1.patch"
},
"sha256": "1vnamiyr378q52xgkg7kvpx80zck729dim77vp06a3q6n580g5gz",
"version": "5.10.204"
"sha256": "0qw8g0h4k0b4dyvspbj51cwr68ihwjzsi2b2261ipy3l1nl1fln5",
"version": "5.10.205"
},
"5.15": {
"patch": {
"extra": "-hardened1",
"name": "linux-hardened-5.15.143-hardened1.patch",
"sha256": "0rg37d21k0ab3nzaif46qc2ql9wd3v50n800kbpfa4g9qsq51j99",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.143-hardened1/linux-hardened-5.15.143-hardened1.patch"
"name": "linux-hardened-5.15.144-hardened1.patch",
"sha256": "03b2hg01z7fpscgpiw10bvlhq5dph5shdx5zn15csg5vjy6dl2cb",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.144-hardened1/linux-hardened-5.15.144-hardened1.patch"
},
"sha256": "00lyv7zsj97mkg9i7dkb1a6km22mnr0qr687d9zz4ckjq1pb2sq9",
"version": "5.15.143"
"sha256": "0fsv18q64q17ad7mq818wfhb11dax4bdvbvqyk5ilxyfmypsylzh",
"version": "5.15.144"
},
"5.4": {
"patch": {
"extra": "-hardened1",
"name": "linux-hardened-5.4.264-hardened1.patch",
"sha256": "1rb3bc6c4qgdy1yysdl72qpizippimk1rfshajcsn7i034c9g4ca",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.264-hardened1/linux-hardened-5.4.264-hardened1.patch"
"name": "linux-hardened-5.4.265-hardened1.patch",
"sha256": "17bs86fxv5l1dm0knvcnj5940r06pq41gd3fp71rn1p1kwk622y3",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.265-hardened1/linux-hardened-5.4.265-hardened1.patch"
},
"sha256": "1c5n47dq9khb15hz24a000k3hj913vv1dda6famnm8wpjbfr176k",
"version": "5.4.264"
"sha256": "05cvvwjiznn7hfd02qklklalg0chahvh5v18w64lcva6kzj9kbjd",
"version": "5.4.265"
},
"6.1": {
"patch": {
"extra": "-hardened1",
"name": "linux-hardened-6.1.68-hardened1.patch",
"sha256": "020xh7zsdfyp7g1n3fp8mmsy4ayhw309fcb65jwmkd8ha2mzm1yc",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/6.1.68-hardened1/linux-hardened-6.1.68-hardened1.patch"
"name": "linux-hardened-6.1.69-hardened1.patch",
"sha256": "1dbwnf6bsxl9m03cngfpf3yb95j719r46dy9x8al59d9p8k0h9bn",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/6.1.69-hardened1/linux-hardened-6.1.69-hardened1.patch"
},
"sha256": "1qc4cwqlfni9i6mzh6arghdsd842hp9lb7s832dxw1p261mg4prn",
"version": "6.1.68"
"sha256": "0hdm28k49kmy9r96hckps0bvvaq9m06l72n8ih305rccs6a2cgby",
"version": "6.1.69"
},
"6.5": {
"patch": {
@ -62,11 +62,11 @@
"6.6": {
"patch": {
"extra": "-hardened1",
"name": "linux-hardened-6.6.7-hardened1.patch",
"sha256": "16yk9wz19wn0fkxdwl05qw1hwnfvidh3nmj0pnf61hgwif4kg7l3",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/6.6.7-hardened1/linux-hardened-6.6.7-hardened1.patch"
"name": "linux-hardened-6.6.8-hardened1.patch",
"sha256": "0mjrp3bxvb1pprc5v2grxk1r3ifldch35lqsxyky1nvlzhphhgb9",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/6.6.8-hardened1/linux-hardened-6.6.8-hardened1.patch"
},
"sha256": "0hfqdyxl4nqmm4pspfm1ang8616dbsaj0d968c0186ch0738xrhc",
"version": "6.6.7"
"sha256": "05i4ayj9wyjkd1s8ixx7bxwcyagqyx8rhj1zvbc3cjqyw4sc8djh",
"version": "6.6.8"
}
}

6
pkgs/servers/misc/virtiofsd/default.nix
View File

@ -2,18 +2,18 @@
rustPlatform.buildRustPackage rec {
pname = "virtiofsd";
version = "1.8.0";
version = "1.9.0";
src = fetchFromGitLab {
owner = "virtio-fs";
repo = "virtiofsd";
rev = "v${version}";
sha256 = "sha256-tbM2JWoub789s3YanT/lqCKl6JkY+FahSYb+lHvF7W8=";
sha256 = "sha256-wbfx6Ennyl4qWODRAtJ3eydSRFfE/ANCSl2GA9oq90A=";
};
separateDebugInfo = true;
cargoHash = "sha256-l2rWR9HAXTuNEarj2hWaZxpTdUNGoCnNfsZs8Y+of+s=";
cargoHash = "sha256-Vdvk700NjjCTSD0Lscr5ckxsYa4pDJdmV7Kgr++0GFY=";
LIBCAPNG_LIB_PATH = "${lib.getLib libcap_ng}/lib";
LIBCAPNG_LINK_TYPE =

6
pkgs/tools/misc/google-cloud-sql-proxy/default.nix
View File

@ -5,18 +5,18 @@
buildGoModule rec {
pname = "google-cloud-sql-proxy";
version = "2.7.2";
version = "2.8.1";
src = fetchFromGitHub {
owner = "GoogleCloudPlatform";
repo = "cloud-sql-proxy";
rev = "v${version}";
hash = "sha256-mfPh9cdsn9Jq9a1gkF5f/24inxuwcITrp7KfSfp0pMQ=";
hash = "sha256-7BkzDfAXc06pEDz2gHwlJ2HKmWWkqbVwyre8NrQHY6M=";
};
subPackages = [ "." ];
vendorHash = "sha256-GfvEurTX5r2ZIOwaDJA4ncd8SNMusoqXuhcMGYvaVwQ=";
vendorHash = "sha256-9xe/4yMkCSD7Tfm3CWvN940odeT67HPGbBAimNOGgIc=";
preCheck = ''
buildFlagsArray+="-short"

6
pkgs/tools/package-management/nfpm/default.nix
View File

@ -8,16 +8,16 @@
buildGoModule rec {
pname = "nfpm";
version = "2.34.0";
version = "2.35.0";
src = fetchFromGitHub {
owner = "goreleaser";
repo = pname;
rev = "v${version}";
hash = "sha256-O7qxJ2TE62XDYljqvNsO3ssD/YhfOLfy9zF0W++T0Hw=";
hash = "sha256-WYLXhRoB8+a5zhTs1qxJVrDjor5orCw6UJrqEt+fBBQ=";
};
vendorHash = "sha256-qihPtpygHoIfGf2wj+klDWwL4sTHqDxi1jxjv57vUx4=";
vendorHash = "sha256-P9jSQG6EyVGMZKtThy8Q7Y/pV7mbMl2eGrylea0VHRc=";
ldflags = [ "-s" "-w" "-X main.version=${version}" ];

4
pkgs/tools/text/ugrep/default.nix
View File

@ -14,13 +14,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "ugrep";
version = "4.3.6";
version = "4.4.1";
src = fetchFromGitHub {
owner = "Genivia";
repo = "ugrep";
rev = "v${finalAttrs.version}";
hash = "sha256-eCOSUtSPIRaoc7pIyQAftcwG3P8321qk6GPbeDNNevI=";
hash = "sha256-Bbt20XE+PNIxl2qDzxpIh4yjU93JgXF4gn1kb4bvdBw=";
};
buildInputs = [

2
pkgs/tools/video/svt-av1/default.nix
View File

@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: {
owner = "AOMediaCodec";
repo = "SVT-AV1";
rev = "v${finalAttrs.version}";
hash = "sha256-tZ5HwTKM7uJ4QGUYc4tDD0xbv/9aU/rQjCHWu9QAb9s=";
hash = "sha256-JV65VuEPJBrADsGviBnE6EgZmbqJ4Z4qli6cAfUMmkw=";
};
nativeBuildInputs = [

2
pkgs/top-level/aliases.nix
View File

@ -151,6 +151,7 @@ mapAliases ({
composable_kernel = throw "'composable_kernel' has been replaced with 'rocmPackages.composable_kernel'"; # Added 2023-10-08
cpp-ipfs-api = cpp-ipfs-http-client; # Project has been renamed. Added 2022-05-15
crispyDoom = crispy-doom; # Added 2023-05-01
cryptowatch-desktop = throw "Cryptowatch Desktop was sunset on September 30th 2023 and has been removed from nixpkgs"; # Added 2023-12-22
clash = throw "'clash' has been removed, upstream gone. Consider using 'clash-meta' instead."; # added 2023-11-10
clasp = clingo; # added 2022-12-22
claws-mail-gtk3 = claws-mail; # Added 2021-07-10
@ -176,6 +177,7 @@ mapAliases ({
clang14Stdenv = lowPrio llvmPackages_14.stdenv;
clang15Stdenv = lowPrio llvmPackages_15.stdenv;
clang16Stdenv = lowPrio llvmPackages_16.stdenv;
clang17Stdenv = lowPrio llvmPackages_17.stdenv;
clang-tools_7 = throw "clang-tools_7 has been removed from nixpkgs"; # Added 2023-11-19
clang_7 = throw "clang_7 has been removed from nixpkgs"; # Added 2023-11-19

5
pkgs/top-level/all-packages.nix
View File

@ -590,8 +590,6 @@ with pkgs;
crow-translate = libsForQt5.callPackage ../applications/misc/crow-translate { };
cryptowatch-desktop = callPackage ../applications/finance/cryptowatch { };
dae = callPackage ../tools/networking/dae { };
darling = callPackage ../applications/emulators/darling { };
@ -24516,7 +24514,8 @@ with pkgs;
pcg_c = callPackage ../development/libraries/pcg-c { };
pcl = libsForQt5.callPackage ../development/libraries/pcl {
inherit (darwin.apple_sdk.frameworks) Cocoa AGL OpenGL;
stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv;
inherit (darwin.apple_sdk_11_0.frameworks) Cocoa AGL OpenGL;
};
pcre = callPackage ../development/libraries/pcre { };