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

Merge branch 'master' into staging

Browse Source
This commit is contained in:
Vladimír Čunát 2023-04-12 18:25:54 +02:00
commit 4549be7eb0
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
20 changed files with 1168 additions and 710 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/services/x11/desktop-managers/pantheon.nix
View File

@ -288,7 +288,7 @@ in
elementary-music
elementary-photos
elementary-screenshot
# elementary-tasks
elementary-tasks
elementary-terminal
elementary-videos
epiphany

10
pkgs/applications/networking/blocky/default.nix
View File

@ -6,23 +6,25 @@
buildGoModule rec {
pname = "blocky";
version = "0.20";
version = "0.21";
src = fetchFromGitHub {
owner = "0xERR0R";
repo = pname;
rev = "v${version}";
sha256 = "sha256-l2GhqJit/+WpNDICD/NUzCAGrKrTNHzEzgpF9k3+DLk=";
sha256 = "sha256-+88QMASMEY1pJuejFUqqW1Ky7TpoSwCzUy1oueL7FKU=";
};
# needs network connection and fails at
# https://github.com/0xERR0R/blocky/blob/development/resolver/upstream_resolver_test.go
doCheck = false;
vendorSha256 = "sha256-CS8+tsE5dptG9gF46OFoJGzn1FnfjekXLTLrpwIQdFQ=";
vendorSha256 = "sha256-EsANifwaEi5PdY0Y2QZjD55sZqsqYWrC5Vh4uxpTs5A=";
ldflags = [ "-s" "-w" "-X github.com/0xERR0R/blocky/util.Version=${version}" ];
passthru.tests = { inherit (nixosTests) blocky; };
meta = with lib; {
description = "Fast and lightweight DNS proxy as ad-blocker for local network with many features.";
homepage = "https://0xerr0r.github.io/blocky";
@ -30,6 +32,4 @@ buildGoModule rec {
license = licenses.asl20;
maintainers = with maintainers; [ ratsclub ];
};
passthru.tests = { inherit (nixosTests) blocky; };
}

1645
pkgs/applications/networking/feedreaders/newsflash/Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

11
pkgs/applications/networking/feedreaders/newsflash/default.nix
View File

@ -22,20 +22,21 @@
stdenv.mkDerivation (finalAttrs: {
pname = "newsflash";
version = "2.2.4";
version = "unstable-2023-04-11";
src = fetchFromGitLab {
owner = "news-flash";
repo = "news_flash_gtk";
rev = "refs/tags/v.${finalAttrs.version}";
sha256 = "sha256-civHj8a5LYV3XaAjSJBdn15+8sdO/yLlWBXCNW56plA=";
rev = "a7bc8bfdf5e58bd78f0f36516e00be8e1296bc12";
sha256 = "sha256-VYIHbOcYopzGTVG+fGyPBS5di7aBayhk+jj9FZh5Tms=";
};
cargoDeps = rustPlatform.importCargoLock {
lockFile = ./Cargo.lock;
outputHashes = {
"news-flash-2.2.2" = "sha256-LN5VhJk+NGTR0fohI0LmfeLDS9IkfVE7IFIzmSPF4u0=";
"newsblur_api-0.2.0" = "sha256-+3AobEX+RtBRgX1TIr4rRX0ngJvNVp1oXzkbhppi73M=";
"javascriptcore6-0.1.0" = "sha256-7w8CDY13dCRlFc77XxJ2/xZqlKSjqM0eiOvILOrJ4ic=";
"news-flash-2.2.2" = "sha256-LXKhVsmkdTk1MSB0T5MDOgTJF/MXbNZ6T5cC2iZxsPs=";
"newsblur_api-0.2.0" = "sha256-6vnFeJbdFeIau2rpUk9o72DD2ZCqicljmQjFVhY71NI=";
};
};

25
pkgs/desktops/pantheon/apps/elementary-tasks/default.nix
View File

@ -1,6 +1,7 @@
{ lib
, stdenv
, fetchFromGitHub
, fetchpatch
, nix-update-script
, meson
, ninja
@ -12,10 +13,9 @@
, evolution-data-server
, granite
, geoclue2
, geocode-glib
, geocode-glib_2
, gtk3
, libchamplain
, libgdata
, libchamplain_libsoup3
, libgee
, libhandy
, libical
@ -23,15 +23,24 @@
stdenv.mkDerivation rec {
pname = "elementary-tasks";
version = "6.3.0";
version = "6.3.1";
src = fetchFromGitHub {
owner = "elementary";
repo = "tasks";
rev = version;
sha256 = "sha256-kW36bKA0uzW98Xl2bjbTkcfLm4SeQR8VB2FyKOqfPnM=";
sha256 = "sha256-b8KUlfpZxRFDiBjgrV/4XicCcEw2fWaN78NaOq6jQBk=";
};
patches = [
# Port to libsoup 3
# https://github.com/elementary/tasks/pull/345
(fetchpatch {
url = "https://github.com/elementary/tasks/commit/22e0d18693932e9eea3d2a22329f845575ce26e6.patch";
sha256 = "sha256-nLJlKf4L7G12ZnCo4wezyMRyeAf+Tf0OGHyT8I1ZuDA=";
})
];
nativeBuildInputs = [
meson
ninja
@ -46,10 +55,9 @@ stdenv.mkDerivation rec {
evolution-data-server
granite
geoclue2
geocode-glib
geocode-glib_2
gtk3
libchamplain
libgdata
libchamplain_libsoup3
libgee
libhandy
libical
@ -71,6 +79,5 @@ stdenv.mkDerivation rec {
platforms = platforms.linux;
maintainers = teams.pantheon.members;
mainProgram = "io.elementary.tasks";
broken = true; # https://github.com/elementary/tasks/issues/340
};
}

31
pkgs/development/compilers/chicken/5/overrides.nix
View File

@ -35,33 +35,46 @@ in {
freetype = addToBuildInputsWithPkgConfig pkgs.freetype;
fuse = addToBuildInputsWithPkgConfig pkgs.fuse;
# git = addToBuildInputsWithPkgConfig pkgs.libgit2;
gl-utils = addPkgConfig;
glfw3 = addToBuildInputsWithPkgConfig pkgs.glfw3;
glls = addPkgConfig;
iconv = addToBuildInputs (lib.optional stdenv.isDarwin pkgs.libiconv);
icu = addToBuildInputsWithPkgConfig pkgs.icu;
imlib2 = addToBuildInputsWithPkgConfig pkgs.imlib2;
lazy-ffi = old: (brokenOnDarwin old) // (addToBuildInputs pkgs.libffi old);
lazy-ffi = old:
# fatal error: 'ffi/ffi.h' file not found
(brokenOnDarwin old)
// (addToBuildInputs pkgs.libffi old);
leveldb = addToBuildInputs pkgs.leveldb;
magic = addToBuildInputs pkgs.file;
mdh = old: (brokenOnDarwin old) // (addToBuildInputs pkgs.pcre old);
mdh = addToBuildInputs pkgs.pcre;
nanomsg = addToBuildInputs pkgs.nanomsg;
ncurses = addToBuildInputsWithPkgConfig [ pkgs.ncurses ];
opencl = addToBuildInputs ([ pkgs.opencl-headers pkgs.ocl-icd ]
++ lib.optionals stdenv.isDarwin [ pkgs.darwin.apple_sdk.frameworks.OpenCL ]);
opengl = old:
# csc: invalid option `-framework OpenGL'
(brokenOnDarwin old)
// (addToBuildInputsWithPkgConfig [ pkgs.libGL pkgs.libGLU ] old);
openssl = addToBuildInputs pkgs.openssl;
plot = addToBuildInputs pkgs.plotutils;
postgresql = addToBuildInputsWithPkgConfig pkgs.postgresql;
rocksdb = addToBuildInputs pkgs.rocksdb;
scheme2c-compatibility = addPkgConfig;
sdl-base = addToBuildInputs pkgs.SDL;
sdl2 = addToPropagatedBuildInputsWithPkgConfig pkgs.SDL2;
sdl2-image = addToBuildInputs pkgs.SDL2_image;
sdl2-ttf = addToBuildInputs pkgs.SDL2_ttf;
soil = addToPropagatedBuildInputsWithPkgConfig pkgs.libepoxy;
sqlite3 = addToBuildInputs pkgs.sqlite;
stemmer = old: (brokenOnDarwin old) // (addToBuildInputs pkgs.libstemmer old);
stemmer = old:
# Undefined symbols for architecture arm64: "_sb_stemmer_delete"
(brokenOnDarwin old)
// (addToBuildInputs pkgs.libstemmer old);
stfl = old:
(brokenOnDarwin old) // (addToBuildInputs [ pkgs.ncurses pkgs.stfl ] old);
# Undefined symbols for architecture arm64: "_clearok"
(brokenOnDarwin old)
// (addToBuildInputs [ pkgs.ncurses pkgs.stfl ] old);
taglib = addToBuildInputs [ pkgs.zlib pkgs.taglib ];
uuid-lib = addToBuildInputs pkgs.libuuid;
ws-client = addToBuildInputs pkgs.zlib;
@ -103,13 +116,15 @@ in {
webview = broken;
# mark broken darwin
gl-utils = brokenOnDarwin;
iconv = brokenOnDarwin;
# fatal error: 'sys/inotify.h' file not found
inotify = brokenOnDarwin;
# fatal error: 'mqueue.h' file not found
posix-mq = brokenOnDarwin;
# ld: library not found for -lrt
posix-shm = brokenOnDarwin;
# Undefined symbols for architecture arm64: "_pthread_setschedprio"
pthreads = brokenOnDarwin;
rbf = brokenOnDarwin;
scheme2c-compatibility = brokenOnDarwin;
# error: use of undeclared identifier 'B4000000'
stty = brokenOnDarwin;
}

2
pkgs/development/libraries/rocm-thunk/default.nix
View File

@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
libdrm
numactl
valgrind
gcc.cc.libgcc # TODO: unhack this?
gcc.cc.libgcc or null # TODO: unhack this?
];
cmakeFlags = [

8
pkgs/development/libraries/webkit2-sharp/default.nix
View File

@ -33,6 +33,14 @@ stdenv.mkDerivation rec {
webkitgtk
];
postPatch = ''
# Workaround build failure with WebKitGTK 2.40.0
# https://github.com/hbons/webkit2-sharp/issues/6
substituteInPlace sources/webkit2-sharp-api.raw --replace \
'<field cname="parentInstance" access="public" writeable="false" readable="true" name="ParentInstance" type="GtkContainer*"/>' \
'<field cname="parent" access="public" writeable="false" readable="true" name="Parent" type="GtkContainer*"/>'
'';
ac_cv_path_MONODOCER = "no";
installFlagsArray = ["GAPIXMLDIR=/tmp/gapixml"];

37
pkgs/development/python-modules/duckduckgo-search/default.nix Normal file
View File

@ -0,0 +1,37 @@
{ buildPythonPackage
, fetchFromGitHub
, lib
, setuptools
, requests
, click
}:
buildPythonPackage rec {
pname = "duckduckgo-search";
version = "2.8.5";
src = fetchFromGitHub {
owner = "deedy5";
repo = "duckduckgo_search";
rev = "v${version}";
hash = "sha256-UXh3+kBfkylt5CIXbYTa/vniEETUvh4steUrUg5MqYU=";
};
format = "pyproject";
nativeBuildInputs = [ setuptools ];
propagatedBuildInputs = [
requests
click
];
pythonImportsCheck = [ "duckduckgo_search" ];
meta = {
description = "A python CLI and library for searching for words, documents, images, videos, news, maps and text translation using the DuckDuckGo.com search engine";
homepage = "https://github.com/deedy5/duckduckgo_search";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ ];
};
}

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

@ -5,7 +5,6 @@
, cython
, setuptools
, substituteAll
, numba
, numpy
, pandas
, cramjam
@ -14,6 +13,7 @@
, python-lzo
, pytestCheckHook
, pythonOlder
, packaging
}:
buildPythonPackage rec {
@ -53,10 +53,10 @@ buildPythonPackage rec {
propagatedBuildInputs = [
cramjam
fsspec
numba
numpy
pandas
thrift
packaging
];
passthru.optional-dependencies = {

48
pkgs/development/tools/misc/namaka/default.nix Normal file
View File

@ -0,0 +1,48 @@
{ lib
, rustPlatform
, fetchFromGitHub
, installShellFiles
, pkg-config
, oniguruma
}:
rustPlatform.buildRustPackage rec {
pname = "namaka";
version = "0.1.0";
src = fetchFromGitHub {
owner = "nix-community";
repo = "namaka";
rev = "v${version}";
hash = "sha256-1B9FWdRxDM9PykfK9LKGZcwIc+sJNAZlvBh6G9dCHW4=";
};
cargoHash = "sha256-k9FDpugRCdvJ3E+gI1tO73RXRef8lg/txOAPDrE0+XM=";
nativeBuildInputs = [
installShellFiles
pkg-config
];
buildInputs = [
oniguruma
];
env = {
GEN_ARTIFACTS = "artifacts";
RUSTONIG_SYSTEM_LIBONIG = true;
};
postInstall = ''
installManPage artifacts/*.1
installShellCompletion artifacts/namaka.{bash,fish} --zsh artifacts/_namaka
'';
meta = with lib; {
description = "Snapshot testing tool for Nix based on haumea";
homepage = "https://github.com/nix-community/namaka";
changelog = "https://github.com/nix-community/namaka/blob/${src.rev}/CHANGELOG.md";
license = licenses.mpl20;
maintainers = with maintainers; [ figsoda ];
};
}

4
pkgs/os-specific/darwin/raycast/default.nix
View File

@ -6,7 +6,7 @@
stdenvNoCC.mkDerivation rec {
pname = "raycast";
version = "1.49.0";
version = "1.49.2";
src = fetchurl {
# https://github.com/NixOS/nixpkgs/pull/223495
@ -17,7 +17,7 @@ stdenvNoCC.mkDerivation rec {
# to host GitHub Actions to periodically check for updates
# and re-release the `.dmg` file to Internet Archive (https://archive.org/details/raycast)
url = "https://archive.org/download/raycast/raycast-${version}.dmg";
sha256 = "sha256-6j5PyzJ7g3p+5gE2CQHlZrLj5b3rLdpodl+By7xxcjo=";
sha256 = "sha256-3evuSRSCZkhxRy/85ohzIVF1tKRlWy+G5BOmuCWF2hU=";
};
dontPatch = true;

20
pkgs/os-specific/darwin/raycast/update.sh Executable file
View File

@ -0,0 +1,20 @@
#!/usr/bin/env nix-shell
#!nix-shell -I nixpkgs=../../../../. -i bash -p common-updater-scripts internetarchive
set -eo pipefail
new_version="$(ia list raycast | grep -Eo '^raycast-.*\.dmg$' | sort -r | head -n1 | sed -E 's/^raycast-([0-9]+\.[0-9]+\.[0-9]+)\.dmg$/\1/')"
old_version="$(sed -nE 's/\s*version = "(.*)".*/\1/p' ./default.nix)"
if [[ "$new_version" == "$old_version" ]]; then
echo "Already up to date."
exit 0
else
echo "raycast: $old_version -> $new_version"
sed -Ei.bak '/ *version = "/s/".+"/"'"$new_version"'"/' ./default.nix
rm ./default.nix.bak
fi
hash="$(nix --extra-experimental-features nix-command store prefetch-file --json --hash-type sha256 "https://archive.org/download/raycast/raycast-$new_version.dmg" | jq -r '.hash')"
sed -Ei.bak '/ *sha256 = /{N;N; s@("sha256-)[^;"]+@"'"$hash"'@}' ./default.nix
rm ./default.nix.bak

6
pkgs/servers/invidious/versions.json
View File

@ -4,9 +4,9 @@
"sha256": "sha256-EU6T9yQCdOLx98Io8o01rEsgxDFF/Xoy42LgPopD2/A="
},
"invidious": {
"rev": "9e82e6fc1ba161245d1e36bc8422d94ec9b16829",
"sha256": "sha256-1GtW9VAImH/iX8Q46oX9rNvnOcYr/0El0baljY47an8=",
"version": "unstable-2023-03-31"
"rev": "961cae2b9a1e1dd780e3f92d55bbc7381b39ffe1",
"sha256": "sha256-8nt+N9WmfJQreRhVak5txZh/Rcm6kJPUt9DQgmwOB7g=",
"version": "unstable-2023-04-10"
},
"lsquic": {
"sha256": "sha256-hG8cUvhbCNeMOsKkaJlgGpzUrIx47E/WhmPIdI5F3qM=",

8
pkgs/servers/nitter/default.nix
View File

@ -7,13 +7,13 @@
nimPackages.buildNimPackage rec {
pname = "nitter";
version = "unstable-2022-06-04";
version = "unstable-2023-03-28";
src = fetchFromGitHub {
owner = "zedeus";
repo = "nitter";
rev = "138826fb4fbdec73fc6fee2e025fda88f7f2fb49";
hash = "sha256-fdzVfzmEFIej6Kb/K9MQyvbN8aN3hO7RetHL53cD59k=";
rev = "95893eedaa2fb0ca0a0a15257d81b720f7f3eb67";
hash = "sha256-nXa8/d8OFFudA4LWpHiCFhnGmvBw2NXMhHMAD9Sp/vk=";
};
patches = [
@ -56,7 +56,7 @@ nimPackages.buildNimPackage rec {
homepage = "https://github.com/zedeus/nitter";
description = "Alternative Twitter front-end";
license = licenses.agpl3Only;
maintainers = with maintainers; [ erdnaxe ];
maintainers = with maintainers; [ erdnaxe infinidoge ];
mainProgram = "nitter";
};

3
pkgs/tools/networking/xray/default.nix
View File

@ -51,7 +51,8 @@ buildGoModule rec {
postFixup = ''
wrapProgram $out/bin/xray \
--suffix V2RAY_LOCATION_ASSET : $assetsDrv/share/v2ray
--suffix V2RAY_LOCATION_ASSET : $assetsDrv/share/v2ray \
--suffix XRAY_LOCATION_ASSET : $assetsDrv/share/v2ray
'';
passthru = {

6
pkgs/tools/security/feroxbuster/default.nix
View File

@ -9,13 +9,13 @@
rustPlatform.buildRustPackage rec {
pname = "feroxbuster";
version = "2.9.2";
version = "2.9.3";
src = fetchFromGitHub {
owner = "epi052";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-HSZqqZngXs5ACsk9xzaqBWK5mUxPyGx3qJOtTURXPgg=";
hash = "sha256-Z97CAfGnNTQmJd2zMlvGfk5jW9zHAB/efqYoYgVRfMc=";
};
# disable linker overrides on aarch64-linux
@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec {
rm .cargo/config
'';
cargoHash = "sha256-pisMqSgW6uPlBXgTUqJBJya84dRmbOJbEYYezuut6Wo=";
cargoHash = "sha256-siLyPPSTBaZ4vpfzeKVlrqIdFMI5z3hRA8c2lRsBAGM=";
OPENSSL_NO_VENDOR = true;

4
pkgs/tools/typesetting/sile/default.nix
View File

@ -45,11 +45,11 @@ in
stdenv.mkDerivation rec {
pname = "sile";
version = "0.14.8";
version = "0.14.9";
src = fetchurl {
url = "https://github.com/sile-typesetter/sile/releases/download/v${version}/${pname}-${version}.tar.xz";
sha256 = "0r00s7c8ycc9haqf7p141gj5jn3k0kxpjdzb538f1jpwkgi6mjh9";
sha256 = "0528835iir2ws14fwb7w4dqs3wlzzcv5arjxs8v13drb194rlwcs";
};
configureFlags = [

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

@ -32589,6 +32589,8 @@ with pkgs;
mle = callPackage ../applications/editors/mle { };
namaka = callPackage ../development/tools/misc/namaka { };
nano = callPackage ../applications/editors/nano { };
nanoblogger = callPackage ../applications/misc/nanoblogger { };

2
pkgs/top-level/python-packages.nix
View File

@ -2933,6 +2933,8 @@ self: super: with self; {
duckdb-engine = callPackage ../development/python-modules/duckdb-engine { };
duckduckgo-search = callPackage ../development/python-modules/duckduckgo-search { };
duecredit = callPackage ../development/python-modules/duecredit { };
duet = callPackage ../development/python-modules/duet { };