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

Merge staging-next into staging

Browse source
This commit is contained in:
github-actions[bot] 2022-02-19 06:01:44 +00:00 committed by GitHub
parent e2955b342d 422949113b
commit 4c21d3f2d3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
44 changed files with 675 additions and 474 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
maintainers/maintainer-list.nix
View file

@ -11096,6 +11096,16 @@
github = "shikanime";
githubId = 22115108;
};
shiryel = {
email = "contact@shiryel.com";
name = "Shiryel";
github = "shiryel";
githubId = 35617139;
keys = [{
longkeyid = "ed25519/0xC4041EA6B32633DE";
fingerprint = "AB63 4CD9 3322 BD42 6231 F764 C404 1EA6 B326 33DE";
}];
};
shlevy = {
email = "shea@shealevy.com";
github = "shlevy";

1
nixos/modules/services/misc/mediatomb.nix
View file

@ -366,6 +366,7 @@ in {
wantedBy = [ "multi-user.target" ];
serviceConfig.ExecStart = "${binaryCommand} --port ${toString cfg.port} ${interfaceFlag} ${configFlag} --home ${cfg.dataDir}";
serviceConfig.User = cfg.user;
serviceConfig.Group = cfg.group;
};
users.groups = optionalAttrs (cfg.group == "mediatomb") {

4
pkgs/applications/audio/pyradio/default.nix
View file

@ -2,7 +2,7 @@
python3Packages.buildPythonApplication rec {
pname = "pyradio";
version = "0.8.9.12";
version = "0.8.9.14";
propagatedBuildInputs = with python3Packages; [
requests
@ -14,7 +14,7 @@ python3Packages.buildPythonApplication rec {
owner = "coderholic";
repo = pname;
rev = version;
sha256 = "sha256-ZBlb0wpw5/s3JuyV2OpGZwlY1UcQzLHP1/VhGlEr6Zo=";
sha256 = "sha256-9q+YsQPFB7Ql5WnXvPj100cD7pGkmr1hHztqbpZStt8=";
};
checkPhase = ''

4
pkgs/applications/blockchains/ledger-live-desktop/default.nix
View file

@ -2,12 +2,12 @@
let
pname = "ledger-live-desktop";
version = "2.38.2";
version = "2.38.3";
name = "${pname}-${version}";
src = fetchurl {
url = "https://github.com/LedgerHQ/${pname}/releases/download/v${version}/${pname}-${version}-linux-x86_64.AppImage";
hash = "sha256-k6Rbxpe5BpRmlE+WL7iiFUtRCs5KlrLH2c3iSucUhqo=";
hash = "sha256-svNsVdenolrfMGKJvB/8HQMq08Ov5Oe5QooI1jFAcbI=";
};
appimageContents = appimageTools.extractType2 {

1
pkgs/applications/editors/nvi/default.nix
View file

@ -35,5 +35,6 @@ stdenv.mkDerivation rec {
description = "The Berkeley Vi Editor";
license = licenses.free;
platforms = platforms.unix;
broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/nvi.x86_64-darwin
};
}

4
pkgs/applications/misc/anytype/default.nix
View file

@ -2,13 +2,13 @@
let
pname = "anytype";
version = "0.23.0";
version = "0.23.5";
name = "Anytype-${version}";
nameExecutable = pname;
src = fetchurl {
url = "https://at9412003.fra1.digitaloceanspaces.com/Anytype-${version}.AppImage";
name = "Anytype-${version}.AppImage";
sha256 = "sha256-53DyT8tunk0s1VGrlj6qQLOKNPN4Haqdyd8ozPi5z8w=";
sha256 = "sha256-kVM/F0LsIgMtur8jHZzUWkFIcfHe0i8y9Zxe3z5SkVM=";
};
appimageContents = appimageTools.extractType2 { inherit name src; };
in

786
pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
View file

File diff suppressed because it is too large Load diff

4
pkgs/applications/networking/browsers/firefox/packages.nix
View file

@ -7,10 +7,10 @@ in
rec {
firefox = common rec {
pname = "firefox";
version = "97.0";
version = "97.0.1";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
sha512 = "a913695a42cb06ee9bda2a20e65cc573e40ca93e9f75b7ee0a43ebd1935b371e7e80d5fc8d5f126ad0712ab848635a8624bbeed43807e5c179537aa32c884186";
sha512 = "8620aace77167593aab5acd230860eb3e67eeddc49c0aad0491b5dc20bd0ddb6089dbb8975aed241426f57b2ad772238b04d03b95390175f580cbd80bb6d5f6c";
};
meta = {

11
pkgs/applications/video/clipgrab/default.nix
View file

@ -1,6 +1,7 @@
{ lib, fetchurl, makeDesktopItem, ffmpeg
, qmake, qttools, mkDerivation
, qtbase, qtdeclarative, qtlocation, qtquickcontrols2, qtwebchannel, qtwebengine
, yt-dlp
}:
mkDerivation rec {
@ -16,7 +17,15 @@ mkDerivation rec {
buildInputs = [ ffmpeg qtbase qtdeclarative qtlocation qtquickcontrols2 qtwebchannel qtwebengine ];
nativeBuildInputs = [ qmake qttools ];
postPatch = lib.optionalString (ffmpeg != null) ''
patches = [
./yt-dlp-path.patch
];
postPatch = ''
substituteInPlace youtube_dl.cpp \
--replace 'QString YoutubeDl::path = QString();' \
'QString YoutubeDl::path = QString("${yt-dlp}/bin/yt-dlp");'
'' + lib.optionalString (ffmpeg != null) ''
substituteInPlace converter_ffmpeg.cpp \
--replace '"ffmpeg"' '"${ffmpeg.bin}/bin/ffmpeg"' \
--replace '"ffmpeg ' '"${ffmpeg.bin}/bin/ffmpeg '

86
pkgs/applications/video/clipgrab/yt-dlp-path.patch Normal file
View file

@ -0,0 +1,86 @@
--- a/main.cpp
+++ b/main.cpp
@@ -91,14 +91,5 @@ int main(int argc, char *argv[])
w.show();
}
- QTimer::singleShot(0, [=] {
- cg->getUpdateInfo();
- QObject::connect(cg, &ClipGrab::updateInfoProcessed, [cg] {
- bool force = QSettings().value("forceYoutubeDlDownload", false).toBool();
- if (force) QSettings().setValue("forceYoutubeDlDownload", false);
- cg->downloadYoutubeDl(force);
- });
- });
-
return app.exec();
}
--- a/youtube_dl.cpp
+++ b/youtube_dl.cpp
@@ -8,52 +8,16 @@ YoutubeDl::YoutubeDl()
QString YoutubeDl::path = QString();
QString YoutubeDl::find(bool force) {
- if (!force && !path.isEmpty()) return path;
-
- // Prefer downloaded youtube-dl
- QString localPath = QStandardPaths::locate(QStandardPaths::AppDataLocation, "yt-dlp");
- QProcess* process = instance(localPath, QStringList() << "--version");
- process->start();
- process->waitForFinished();
- process->deleteLater();
- if (process->state() != QProcess::NotRunning) process->kill();
- if (process->exitCode() == QProcess::ExitStatus::NormalExit) {
- path = localPath;
- return path;
- }
-
- // Try system-wide youtube-dlp installation
- QString globalPath = QStandardPaths::findExecutable("yt-dlp");
- process = instance(globalPath, QStringList() << "--version");
- process->start();
- process->waitForFinished();
- process->deleteLater();
- if (process->state() != QProcess::NotRunning) process->kill();
- if (process->exitCode() == QProcess::ExitStatus::NormalExit) {
- path = globalPath;
- return path;
- }
-
- return "";
+ // We supply yt-dlp from nixpkgs, so the downloading
+ // machinery is not needed anymore.
+ (void)force;
+ return path;
}
QProcess* YoutubeDl::instance(QStringList arguments) {
- return instance(find(), arguments);
-}
-
-QProcess* YoutubeDl::instance(QString path, QStringList arguments) {
QProcess *process = new QProcess();
- QString execPath = QCoreApplication::applicationDirPath();
- QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
- env.insert("PATH", execPath + ":" + env.value("PATH"));
- process->setEnvironment(env.toStringList());
-
- #if defined Q_OS_WIN
- process->setProgram(execPath + "/python/python.exe");
- #else
- process->setProgram(QStandardPaths::findExecutable("python3"));
- #endif
+ process->setProgram(path);
QSettings settings;
QStringList proxyArguments;
@@ -81,7 +45,7 @@ QProcess* YoutubeDl::instance(QString path, QStringList arguments) {
networkArguments << "--force-ipv4";
}
- process->setArguments(QStringList() << path << arguments << proxyArguments << networkArguments);
+ process->setArguments(QStringList() << arguments << proxyArguments << networkArguments);
return process;
}

4
pkgs/desktops/gnome/core/gnome-shell/default.nix
View file

@ -66,13 +66,13 @@ let
in
stdenv.mkDerivation rec {
pname = "gnome-shell";
version = "41.3";
version = "41.4";
outputs = [ "out" "devdoc" ];
src = fetchurl {
url = "mirror://gnome/sources/gnome-shell/${lib.versions.major version}/${pname}-${version}.tar.xz";
sha256 = "Hj36KgvklFQYK0rOd/EdENP1uYjvD8tzK3MTVzlJ3tE=";
sha256 = "x+73SvMEZJwDuG25m9C6x1oBH7/2d0yO41WD282tivQ=";
};
patches = [

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

@ -14,6 +14,7 @@
, libobjc
, rustPlatform
, rustc
, rust
, cargo
, gnome
, vala
@ -78,7 +79,8 @@ stdenv.mkDerivation rec {
"--enable-installed-tests"
"--enable-always-build-tests"
] ++ lib.optional stdenv.isDarwin "--disable-Bsymbolic";
] ++ lib.optional stdenv.isDarwin "--disable-Bsymbolic"
++ lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) "RUST_TARGET=${rust.toRustTarget stdenv.hostPlatform}";
makeFlags = [
"installed_test_metadir=${placeholder "installedTests"}/share/installed-tests/RSVG"

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

@ -8,14 +8,14 @@
buildPythonPackage rec {
pname = "aiohue";
version = "4.2.0";
version = "4.2.1";
format = "setuptools";
disabled = pythonOlder "3.8";
src = fetchPypi {
inherit pname version;
hash = "sha256-/NcCo4Jvq1JeXD1UTrzNpPNDNmEt7GOrbCl79V00+eM=";
hash = "sha256-bcSCYNJt9xYBMmuZYM6s+PWV0TAUFOn3ibHE0KRX+iw=";
};
propagatedBuildInputs = [

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

@ -2,13 +2,13 @@
buildPythonPackage rec {
pname = "autopage";
version = "0.4.0";
version = "0.5.0";
format = "pyproject";
src = fetchPypi {
inherit pname version;
sha256 = "18f511d8ef2e4d3cc22a986d345eab0e03f95b9fa80b74ca63b7fb001551dc42";
sha256 = "sha256-UwW0PMB5gXDXEk5aL+7Plp5F9KC691yzUROBFOr3a4M=";
};
pythonImportsCheck = [ "autopage" ];

27
pkgs/development/python-modules/chispa/default.nix Normal file
View file

@ -0,0 +1,27 @@
{ buildPythonPackage, fetchFromGitHub, lib, poetry-core, pyspark }:
buildPythonPackage rec {
pname = "chispa";
version = "0.8.3";
format = "pyproject";
src = fetchFromGitHub {
repo = "chispa";
owner = "MrPowers";
rev = "v${version}";
sha256 = "sha256-1ePx8VbU8pMd5EsZhFp6qyMptlUxpoCvJfuDm9xXOdc=";
};
checkInputs = [ pyspark ];
nativeBuildInputs = [ poetry-core ];
pythonImportsCheck = [ "chispa" ];
meta = with lib; {
homepage = "https://github.com/MrPowers/chispa";
description = "PySpark test helper methods with beautiful error messages";
license = licenses.mit;
maintainers = with maintainers; [ ratsclub ];
};
}

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

@ -16,11 +16,11 @@
buildPythonPackage rec {
pname = "cliff";
version = "3.10.0";
version = "3.10.1";
src = fetchPypi {
inherit pname version;
sha256 = "c68aac08d0d25853234a38fdbf1f33503849af3d5d677a4d0aacd42b0be6a4a1";
sha256 = "sha256-BFruPzxkRxll161QfOhHSk4vIIFfu1QFp3D4WWoqAKA=";
};
postPatch = ''

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

@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "debtcollector";
version = "2.3.0";
version = "2.4.0";
src = fetchPypi {
inherit pname version;
sha256 = "c7a9fac814ab5904e23905516b18356cc907e7d27c05da58d37103f001967846";
sha256 = "sha256-G8A+LZAX3kgMQc8+Wg2MyV8bDI8TOSgbTsqKIqz3aiM=";
};
nativeBuildInputs = [ pbr ];

46
pkgs/development/python-modules/gdtoolkit/default.nix Normal file
View file

@ -0,0 +1,46 @@
{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder, lark, docopt, pyyaml, setuptools }:
let lark080 = lark.overrideAttrs (old: rec {
# gdtoolkit needs exactly this lark version
version = "0.8.0";
src = fetchFromGitHub {
owner = "lark-parser";
repo = "lark";
rev = version;
sha256 = "su7kToZ05OESwRCMPG6Z+XlFUvbEb3d8DgsTEcPJMg4=";
};
});
in
buildPythonPackage rec {
pname = "gdtoolkit";
version = "3.3.1";
propagatedBuildInputs = [
lark080
docopt
pyyaml
setuptools
];
# If we try to get using fetchPypi it requires GeoIP (but the package dont has that dep!?)
src = fetchFromGitHub {
owner = "Scony";
repo = "godot-gdscript-toolkit";
rev = version;
sha256 = "13nnpwy550jf5qnm9ixpxl1bwfnhhbiys8vqfd25g3aim4bm3gnn";
};
disabled = pythonOlder "3.7";
# Tests cannot be run because they need network to install additional dependencies using pip and tox
doCheck = false;
pythonImportsCheck = [ "gdtoolkit" "gdtoolkit.formatter" "gdtoolkit.linter" "gdtoolkit.parser" ];
meta = with lib; {
description = "Independent set of tools for working with Godot's GDScript - parser, linter and formatter";
homepage = "https://github.com/Scony/godot-gdscript-toolkit";
license = licenses.mit;
maintainers = with maintainers; [ shiryel ];
};
}

4
pkgs/development/python-modules/google-api-core/default.nix
View file

@ -16,14 +16,14 @@
buildPythonPackage rec {
pname = "google-api-core";
version = "2.4.0";
version = "2.5.0";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-uoeHt8YWMs0DQPCV4cA2vvlCayWU8Qr7KQujEa6Msss=";
sha256 = "sha256-8zhjpnCWUXA7ixi2cJNRSDjHnysE0CqlASAwefJLgBg=";
};
propagatedBuildInputs = [

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

@ -18,11 +18,11 @@
buildPythonPackage rec {
pname = "google-auth";
version = "2.3.3";
version = "2.6.0";
src = fetchPypi {
inherit pname version;
sha256 = "d83570a664c10b97a1dc6f8df87e5fdfff012f48f62be131e449c20dfc32630e";
sha256 = "sha256-rRYPweqPGeMxoWoUp589ZD2BOmlTS6lhHSyA3BBDna0=";
};
postPatch = ''

4
pkgs/development/python-modules/google-cloud-bigquery/default.nix
View file

@ -18,12 +18,12 @@
buildPythonPackage rec {
pname = "google-cloud-bigquery";
version = "2.33.0";
version = "2.34.0";
format = "setuptools";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-4VIlDMUmpwWE+AIAZs7L3y+i35hEF7a76/+Wqtwy498=";
sha256 = "sha256-K3XhnlPIWSRBIBgMcqGqmehJFW48BBMHGkv7rgt0xTA=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/google-cloud-bigtable/default.nix
View file

@ -12,11 +12,11 @@
buildPythonPackage rec {
pname = "google-cloud-bigtable";
version = "2.5.0";
version = "2.5.1";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-R7HGbURhqOxPXUlKN3+mk5+qP6Em5HmxBAa7LHsjJJk=";
sha256 = "sha256-zqyLJX3ufjIpdiS7Qw85R6K/2p2m1KbYtmH2DH/r0nE=";
};
propagatedBuildInputs = [

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

@ -13,11 +13,11 @@
buildPythonPackage rec {
pname = "osc-lib";
version = "2.4.2";
version = "2.5.0";
src = fetchPypi {
inherit pname version;
sha256 = "d6b530e3e50646840a6a5ef134e00f285cc4a04232c163f28585226ed40cc968";
sha256 = "sha256-2PikUPqyoSlOCu+M3JolWhvMW1jhsvYJjjXm2x4T6dE=";
};
nativeBuildInputs = [

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

@ -5,12 +5,12 @@
}:
buildPythonPackage rec {
version = "2.3.2";
version = "2.4.0";
pname = "portalocker";
src = fetchPypi {
inherit pname version;
sha256 = "75cfe02f702737f1726d83e04eedfa0bda2cc5b974b1ceafb8d6b42377efbd5f";
sha256 = "sha256-pkitdhuOonNwy1kVNQEizYB7gg0hk+1cnMKPFj32N/Q=";
};
propagatedBuildInputs = [

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

@ -16,7 +16,7 @@
buildPythonPackage rec {
pname = "pyinsteon";
version = "1.0.15";
version = "1.0.16";
format = "setuptools";
disabled = pythonOlder "3.6";
@ -25,7 +25,7 @@ buildPythonPackage rec {
owner = pname;
repo = pname;
rev = version;
hash = "sha256-bR+2885JdGoVHBIZQG8iF0OXsECew7m5N9vopKtGp3I=";
hash = "sha256-V0niLQAplN/uZ0YeN6g8uax3U/d0LUT4aXxe3ENXIHc=";
};
propagatedBuildInputs = [

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

@ -23,11 +23,11 @@
buildPythonPackage rec {
pname = "swift";
version = "2.28.0";
version = "2.29.0";
src = fetchPypi {
inherit pname version;
sha256 = "79a216498a842226f71e9dfbbce4dba4a5718cda9b2be92b6e0aa21df977f70d";
sha256 = "sha256-sGHARvi1PAFajz82GAegDVpy6A98QEyMfrDHZjNtDGQ=";
};
postPatch = ''

15
pkgs/development/python-modules/warlock/default.nix
View file

@ -22,6 +22,12 @@ buildPythonPackage rec {
hash = "sha256-59V4KOwjs/vhA3F3E0j3p5L4JnKPgcExN+mgSWs0Cn0=";
};
postPatch = ''
substituteInPlace requirements.txt \
--replace "jsonschema>=0.7,<4" "jsonschema"
sed -i "/--cov/d" pytest.ini
'';
propagatedBuildInputs = [
jsonpatch
jsonschema
@ -32,11 +38,10 @@ buildPythonPackage rec {
pytestCheckHook
];
postPatch = ''
substituteInPlace requirements.txt \
--replace "jsonschema>=0.7,<4" "jsonschema"
sed -i "/--cov/d" pytest.ini
'';
disabledTests = [
# https://github.com/bcwaldon/warlock/issues/64
"test_recursive_models"
];
pythonImportsCheck = [
"warlock"

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

@ -5,14 +5,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "circup";
version = "1.0.3";
version = "1.0.4";
format = "setuptools";
src = fetchFromGitHub {
owner = "adafruit";
repo = pname;
rev = version;
hash = "sha256-1UNruZgA7Z0G1t3GLffiA/p+gjPYBPpdn5QqQk6D/o0=";
hash = "sha256-qX3kSlqA2qP8+XiLYx/hKYfyeB6p3tnXEhESox0c/lY=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;

2
pkgs/servers/home-assistant/component-packages.nix
View file

@ -2,7 +2,7 @@
# Do not edit!
{
version = "2022.2.8";
version = "2022.2.9";
components = {
"abode" = ps: with ps; [ abodepy ];
"accuweather" = ps: with ps; [ accuweather ];

4
pkgs/servers/home-assistant/default.nix
View file

@ -138,7 +138,7 @@ let
extraPackagesFile = writeText "home-assistant-packages" (lib.concatMapStringsSep "\n" (pkg: pkg.pname) extraBuildInputs);
# Don't forget to run parse-requirements.py after updating
hassVersion = "2022.2.8";
hassVersion = "2022.2.9";
in python.pkgs.buildPythonApplication rec {
pname = "homeassistant";
@ -156,7 +156,7 @@ in python.pkgs.buildPythonApplication rec {
owner = "home-assistant";
repo = "core";
rev = version;
hash = "sha256-BzBlAKI1u8DqsfmivCVaK3fhYzgEmqlVkRMI17VRu0w=";
hash = "sha256-So/MAKyFVa1TchrVE4ego1fRbgOXCoXR3w/rJLFSBqI=";
};
# leave this in, so users don't have to constantly update their downstream patch handling

4
pkgs/servers/home-assistant/frontend.nix
View file

@ -4,7 +4,7 @@ buildPythonPackage rec {
# the frontend version corresponding to a specific home-assistant version can be found here
# https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json
pname = "home-assistant-frontend";
version = "20220203.0";
version = "20220203.1";
format = "wheel";
src = fetchPypi {
@ -12,7 +12,7 @@ buildPythonPackage rec {
pname = "home_assistant_frontend";
dist = "py3";
python = "py3";
sha256 = "sha256-5iODXctmkw+MIdf/GECGhhWOMruMqeWBDWwwwrNQMjU=";
sha256 = "sha256-6+TzBhHo9+eo6Hlk8RF+BAt4O0i759iAN+dKAPDmTNY=";
};
# there is nothing to strip in this package

6
pkgs/servers/maddy/default.nix
View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "maddy";
version = "0.5.2";
version = "0.5.3";
src = fetchFromGitHub {
owner = "foxcpp";
repo = "maddy";
rev = "v${version}";
sha256 = "sha256-b85g8Eu7qWTI+ggMr7JL/2BAVbkXocpsR89P6s6TfMg=";
sha256 = "sha256-UB9Y2nNkiN0L3NIfUqnpaJJqNuAnCYIeEyS60TnnIRs=";
};
vendorSha256 = "sha256-kzSwqT3r6uGxq1GNzCWCn8VoCxmVtiUb23XLCpsPv/c=";
vendorSha256 = "sha256-lL9hlICc9t/2v6eawG8LU6hpAKpY7raTg5l1RagewPs=";
ldflags = [ "-s" "-w" "-X github.com/foxcpp/maddy.Version=${version}" ];

4
pkgs/servers/mpd/default.nix
View file

@ -157,6 +157,10 @@ let
outputs = [ "out" "doc" ]
++ lib.optional (builtins.elem "documentation" features_) "man";
CXXFLAGS = lib.optionals stdenv.isDarwin [
"-D__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES=0"
];
mesonFlags = [
"-Dtest=true"
"-Dmanpages=true"

8
pkgs/servers/radarr/default.nix
View file

@ -9,14 +9,14 @@ let
}."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
hash = {
x64-linux_hash = "sha256-IwD7PFRz6mjEjUTbpqItorvFMB/hcMcRhHG8XQHv0iM=";
arm64-linux_hash = "sha256-9Ou08PI3HNQO6Da76ZMkzx1QlU+oaq9Tr+vqPT05xnw=";
x64-osx_hash = "sha256-Nfm9vWB+ii2ZST6I4I8Y2PuG2a1qY7rbki57y88Ft8A=";
x64-linux_hash = "sha256-2DZUQ11sAsIbI3hkU+6Hj+xHz3EbsTelisUCOlRBvvQ=";
arm64-linux_hash = "sha256-j5gUC50NfvF2/W/aYgCiMoW1jF9F30L7pnVaFfX1Fwk=";
x64-osx_hash = "sha256-iOaOzisG54+nstPNNUXOYwhEaM1Uh4wHPISVtEf8vTQ=";
}."${arch}-${os}_hash";
in stdenv.mkDerivation rec {
pname = "radarr";
version = "3.2.2.5080";
version = "4.0.4.5922";
src = fetchurl {
url = "https://github.com/Radarr/Radarr/releases/download/v${version}/Radarr.master.${version}.${os}-core-${arch}.tar.gz";

4
pkgs/servers/radarr/update.sh
View file

@ -15,7 +15,7 @@ updateHash()
url="https://github.com/Radarr/Radarr/releases/download/v$version/Radarr.master.$version.$os-core-$arch.tar.gz"
hash=$(nix-prefetch-url --type sha256 $url)
sriHash="$(nix to-sri --type sha256 $hash)"
sriHash="$(nix hash to-sri --type sha256 $hash)"
sed -i "s|$hashKey = \"[a-zA-Z0-9\/+-=]*\";|$hashKey = \"$sriHash\";|g" "$dirname/default.nix"
}
@ -25,7 +25,7 @@ updateVersion()
sed -i "s/version = \"[0-9.]*\";/version = \"$1\";/g" "$dirname/default.nix"
}
currentVersion=$(cd $dirname && nix eval --raw '(with import ../../.. {}; radarr.version)')
currentVersion=$(cd $dirname && nix eval --raw -f ../../.. radarr.version)
latestTag=$(curl https://api.github.com/repos/Radarr/Radarr/releases/latest | jq -r ".tag_name")
latestVersion="$(expr $latestTag : 'v\(.*\)')"

13
pkgs/tools/misc/colord-gtk/default.nix
View file

@ -1,4 +1,5 @@
{ lib, stdenv
{ lib
, stdenv
, fetchurl
, colord
, gettext
@ -7,24 +8,25 @@
, gobject-introspection
, gtk-doc
, docbook-xsl-ns
, docbook_xsl
, docbook-xsl-nons
, docbook_xml_dtd_412
, libxslt
, glib
, gtk3
, gtk4
, pkg-config
, lcms2
}:
stdenv.mkDerivation rec {
pname = "colord-gtk";
version = "0.2.0";
version = "0.3.0";
outputs = [ "out" "dev" "devdoc" ];
src = fetchurl {
url = "https://www.freedesktop.org/software/colord/releases/${pname}-${version}.tar.xz";
sha256 = "05y78jbcbar22sgyhzffhv98dbpl4v6k8j9p807h17y6ighglk1a";
sha256 = "uUZmVtZtmm/7wt0E+pHI9q9Ra/nvqstpdE7sD1bzwdA=";
};
nativeBuildInputs = [
@ -35,7 +37,7 @@ stdenv.mkDerivation rec {
gobject-introspection
gtk-doc
docbook-xsl-ns
docbook_xsl
docbook-xsl-nons
docbook_xml_dtd_412
libxslt
];
@ -48,6 +50,7 @@ stdenv.mkDerivation rec {
propagatedBuildInputs = [
colord
gtk3
gtk4
];
meta = with lib; {

9
pkgs/tools/misc/colord/default.nix
View file

@ -1,4 +1,5 @@
{ lib, stdenv
{ lib
, stdenv
, fetchurl
, nixosTests
, bash-completion
@ -29,13 +30,13 @@
stdenv.mkDerivation rec {
pname = "colord";
version = "1.4.5";
version = "1.4.6";
outputs = [ "out" "dev" "devdoc" "man" "installedTests" ];
src = fetchurl {
url = "https://www.freedesktop.org/software/colord/releases/${pname}-${version}.tar.xz";
sha256 = "05sydi6qqqx1rrqwnga1vbg9srkf89wdcfw5w4p4m7r37m2flx5p";
sha256 = "dAdjGie/5dG2cueuQndwAcEF2GC3tzkig8jGMA3ojm8=";
};
patches = [
@ -95,7 +96,7 @@ stdenv.mkDerivation rec {
PKG_CONFIG_SYSTEMD_SYSTEMDSYSTEMUNITDIR = "${placeholder "out"}/lib/systemd/system";
PKG_CONFIG_SYSTEMD_SYSTEMDUSERUNITDIR = "${placeholder "out"}/lib/systemd/user";
PKG_CONFIG_SYSTEMD_TMPFILESDIR = "${placeholder "out"}/lib/tmpfiles.d";
PKG_CONFIG_BASH_COMPLETION_COMPLETIONSDIR= "${placeholder "out"}/share/bash-completion/completions";
PKG_CONFIG_BASH_COMPLETION_COMPLETIONSDIR = "${placeholder "out"}/share/bash-completion/completions";
PKG_CONFIG_UDEV_UDEVDIR = "${placeholder "out"}/lib/udev";
passthru = {

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

@ -12,17 +12,17 @@ let
in
buildGoModule rec {
pname = "opentelemetry-collector";
version = "0.44.0";
version = "0.45.0";
src = fetchFromGitHub {
owner = "open-telemetry";
repo = "opentelemetry-collector";
rev = "v${version}";
sha256 = "sha256-8BfnxiBBql4X4veUzSV8oo2Wakt5hENz4aYcOemFtbw=";
sha256 = "sha256-uwQR38L81galqrOEF2qWxKi1UelaUmpkeg0WbkcbYfs=";
};
# there is a nested go.mod
sourceRoot = "source/cmd/otelcorecol";
vendorSha256 = "sha256-0A0PKmmbg11f3ilf/3bh0sVtHlZXgn72LQv4CRCu/VQ=";
vendorSha256 = "sha256-wzGv46wcPjpxiQsiNZQGC4DMHcMrWOEmacC5E0F2YCs=";
preBuild = ''
# set the build version, can't be done via ldflags

4
pkgs/tools/misc/yle-dl/default.nix
View file

@ -2,13 +2,13 @@
python3Packages.buildPythonApplication rec {
pname = "yle-dl";
version = "20211213";
version = "20220213";
src = fetchFromGitHub {
owner = "aajanki";
repo = "yle-dl";
rev = version;
sha256 = "sha256-U7ydZ6nSVtMv9mxNSWT/IICwbjK3PCBKxfqjrQ9jwW0=";
sha256 = "sha256-lFb8NwKg8GBgkVsg01rlGrP31APwhFaCFT7QdqiT6J0=";
};
propagatedBuildInputs = with python3Packages; [

4
pkgs/tools/networking/dnsproxy/default.nix
View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "dnsproxy";
version = "0.41.1";
version = "0.41.2";
src = fetchFromGitHub {
owner = "AdguardTeam";
repo = pname;
rev = "v${version}";
sha256 = "sha256-QwX31R/FuV8vACpgBJ5z94y1U4zH+ToEiloJ16kXqVc=";
sha256 = "sha256-Bo6OxHNZYA1cP2iP/QnaN80DcwBGIVCQXH/mc75hFUY=";
};
vendorSha256 = null;

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

@ -3,6 +3,7 @@
, fetchzip
, pkg-config
, libressl
, memstreamHook
}:
stdenv.mkDerivation rec {
@ -20,6 +21,8 @@ stdenv.mkDerivation rec {
buildInputs = [
libressl
] ++ lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [
memstreamHook
];
meta = {

14
pkgs/tools/nix/alejandra/default.nix
View file

@ -7,16 +7,20 @@
rustPlatform.buildRustPackage rec {
pname = "alejandra";
version = "0.2.0";
version = "0.3.0";
src = fetchFromGitHub {
owner = "kamadorueda";
repo = "alejandra";
rev = version;
sha256 = "sha256-bM+z3s7oG0+8P7TVmyw7NW3eavN109zgsw9exUSQCaQ=";
sha256 = "sha256-Gtz+z8ESIqY/2V6X/rLMweqio66IGaUVGmIT/Y20+JY=";
};
cargoSha256 = "sha256-GxQxyUyrDKTf+7cye0Ob/le06GnAI+FMGCUB5dts+k0=";
cargoSha256 = "sha256-kydMIbx5Fu7+uwXn7KrrNd1fhXZQ5sabX4TBYpvmimk=";
passthru.tests = {
version = testVersion { package = alejandra; };
};
meta = with lib; {
description = "The Uncompromising Nix Code Formatter";
@ -24,8 +28,4 @@ rustPlatform.buildRustPackage rec {
license = licenses.unlicense;
maintainers = with maintainers; [ _0x4A6F kamadorueda ];
};
passthru.tests = {
version = testVersion { package = alejandra; };
};
}

1
pkgs/top-level/all-packages.nix
View file

@ -21305,7 +21305,6 @@ with pkgs;
mod_timestamp = apacheHttpdPackages.mod_timestamp;
inherit (callPackages ../servers/mpd {
stdenv = if (with stdenv; cc.isClang && isx86_64) then llvmPackages_8.stdenv else stdenv;
inherit (darwin.apple_sdk.frameworks) AudioToolbox AudioUnit;
}) mpd mpd-small mpdWithFeatures;

4
pkgs/top-level/python-packages.nix
View file

@ -1583,6 +1583,8 @@ in {
chirpstack-api = callPackage ../development/python-modules/chirpstack-api { };
chispa = callPackage ../development/python-modules/chispa { };
ci-info = callPackage ../development/python-modules/ci-info { };
ci-py = callPackage ../development/python-modules/ci-py { };
@ -3161,6 +3163,8 @@ in {
gdown = callPackage ../development/python-modules/gdown { };
gdtoolkit = callPackage ../development/python-modules/gdtoolkit { };
ge25519 = callPackage ../development/python-modules/ge25519 { };
geant4 = toPythonModule (pkgs.geant4.override {