jolheiser/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into staging-next

Browse Source
This commit is contained in:
Martin Weinelt 2022-03-29 18:17:36 +02:00
commit 630d5e1d0d
38 changed files with 240 additions and 141 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
maintainers/maintainer-list.nix
View File

@ -929,6 +929,12 @@
githubId = 1296771;
name = "Anders Riutta";
};
arjan-s = {
email = "github@anymore.nl";
github = "arjan-s";
githubId = 10400299;
name = "Arjan Schrijver";
};
arkivm = {
email = "vikram186@gmail.com";
github = "arkivm";

9
nixos/modules/services/games/factorio.nix
View File

@ -53,6 +53,14 @@ in
'';
};
bind = mkOption {
type = types.str;
default = "0.0.0.0";
description = ''
The address to which the service should bind.
'';
};
admins = mkOption {
type = types.listOf types.str;
default = [];
@ -241,6 +249,7 @@ in
"${cfg.package}/bin/factorio"
"--config=${cfg.configFile}"
"--port=${toString cfg.port}"
"--bind=${cfg.bind}"
"--start-server=${mkSavePath cfg.saveName}"
"--server-settings=${serverSettingsFile}"
(optionalString (cfg.mods != []) "--mod-directory=${modDir}")

5
pkgs/applications/blockchains/polkadot/default.nix
View File

@ -5,6 +5,7 @@
, protobuf
, rustPlatform
, writeShellScriptBin
, Security
}:
rustPlatform.buildRustPackage rec {
pname = "polkadot";
@ -32,6 +33,8 @@ rustPlatform.buildRustPackage rec {
cargoSha256 = "sha256-Gc5WbayQUlsl7Fk8NyLPh2Zg2yrLl3WJqKorNZMLi94=";
buildInputs = [ Security ];
nativeBuildInputs = [ clang ];
preBuild = ''
@ -56,6 +59,6 @@ rustPlatform.buildRustPackage rec {
homepage = "https://polkadot.network";
license = licenses.gpl3Only;
maintainers = with maintainers; [ akru andresilva asymmetric FlorianFranzen RaghavSood ];
platforms = platforms.linux;
platforms = platforms.unix;
};
}

4
pkgs/applications/editors/cudatext/default.nix
View File

@ -38,13 +38,13 @@ let
in
stdenv.mkDerivation rec {
pname = "cudatext";
version = "1.159.0";
version = "1.159.2";
src = fetchFromGitHub {
owner = "Alexey-T";
repo = "CudaText";
rev = version;
sha256 = "sha256-DRVJLzAdhw+ke+B2KFlkgLXgU4+Mq3LQ0PRYg52Aq/o=";
sha256 = "sha256-dSZd+Dsln7xUfN/cqTZSdnpnINHsDCBrbNGcDLwqzzU=";
};
postPatch = ''

8
pkgs/applications/editors/cudatext/deps.json
View File

@ -26,13 +26,13 @@
},
"EControl": {
"owner": "Alexey-T",
"rev": "2022.03.23",
"sha256": "sha256-QXq75VoAnYqAhe3Fvsz1szZyBz4dHEpYJZqTSCR80v8="
"rev": "2022.03.28",
"sha256": "sha256-jh3lqisiPNMxCapP6O5oJdUL3PLQ3JyomtgWix+bML0="
},
"ATSynEdit_Ex": {
"owner": "Alexey-T",
"rev": "2022.03.23",
"sha256": "sha256-m1rkWvRC1i1nLPIhiG6g8LGU96vTuGGqLFrSzw9A9x0="
"rev": "2022.03.28",
"sha256": "sha256-TpAaL7/bhnrQgAq1mUTdEWXecSmznWy/iAw+TMMrQGo="
},
"Python-for-Lazarus": {
"owner": "Alexey-T",

19
pkgs/applications/misc/obsidian/default.nix
View File

@ -12,7 +12,7 @@
let
inherit (stdenv.hostPlatform) system;
pname = "obsidian";
version = "0.13.31";
version = "0.14.2";
meta = with lib; {
description = "A powerful knowledge base that works on top of a local folder of plain text Markdown files";
homepage = "https://obsidian.md";
@ -21,23 +21,12 @@ let
maintainers = with maintainers; [ conradmearns zaninime opeik ];
};
filename = if stdenv.isDarwin then "Obsidian-${version}-universal.dmg" else "obsidian-${version}.tar.gz";
src = fetchurl {
url = "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/obsidian-${version}${extension}";
inherit sha256;
url = "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/${filename}";
sha256 = if stdenv.isDarwin then "128kgqkf54ljkglwqa6i0qnfqhhmsv7hwbaqnml95n5dzyxrbm4s" else "00gip6pvkbywywlx71j87sxyh8yhkd36i1ydncbpnhsplr6smsq3";
};
sha256 = rec {
x86_64-linux = "v3Zm5y8V1KyWDQeJxhryBojz56OTT7gfT+pLGDUD4zs=";
x86_64-darwin = "m/81uuDhMJJ1tHTUPww+xNdwsaYCOmeNtbjdwMAwhBU=";
aarch64-darwin = x86_64-darwin;
}.${system};
extension = rec {
x86_64-linux = ".tar.gz";
x86_64-darwin = "-universal.dmg";
aarch64-darwin = x86_64-darwin;
}.${system};
linux = stdenv.mkDerivation rec {
icon = fetchurl {
url = "https://forum.obsidian.md/uploads/default/original/1X/bf119bd48f748f4fd2d65f2d1bb05d3c806883b5.png";

9
pkgs/applications/misc/slic3r/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchgit, perl, makeWrapper
{ lib, stdenv, fetchFromGitHub, perl, makeWrapper
, makeDesktopItem, which, perlPackages, boost
}:
@ -6,10 +6,11 @@ stdenv.mkDerivation rec {
version = "1.3.0";
pname = "slic3r";
src = fetchgit {
url = "https://github.com/alexrj/Slic3r";
src = fetchFromGitHub {
owner = "alexrj";
repo = "Slic3r";
rev = version;
sha256 = "1pg4jxzb7f58ls5s8mygza8kqdap2c50kwlsdkf28bz1xi611zbi";
sha256 = "sha256-cf0QTOzhLyTcbJryCQoTVzU8kfrPV6SLpqi4s36X5N0=";
};
buildInputs =

42
pkgs/applications/networking/instant-messengers/session-desktop-appimage/default.nix
View File

@ -1,15 +1,53 @@
{ lib
, makeDesktopItem
, copyDesktopItems
, stdenvNoCC
, fetchurl
, appimageTools
}:
appimageTools.wrapType2 rec {
pname = "session-desktop-appimage";
let
version = "1.7.9";
pname = "session-desktop-appimage";
src = fetchurl {
url = "https://github.com/oxen-io/session-desktop/releases/download/v${version}/session-desktop-linux-x86_64-${version}.AppImage";
sha256 = "ca7754e59146633b71e66b02a90cff87e4f2574e57ff831ca4a5f983b7e2fbef";
};
appimage = appimageTools.wrapType2 {
inherit version pname src;
};
appimage-contents = appimageTools.extractType2 {
inherit version pname src;
};
in
stdenvNoCC.mkDerivation {
inherit version pname;
src = appimage;
nativeBuildInputs = [ copyDesktopItems ];
desktopItems = [
(makeDesktopItem {
name = "Session";
desktopName = "Session";
comment = "Onion routing based messenger";
exec = "${appimage}/bin/session-desktop-appimage-${version}";
icon = "${appimage-contents}/session-desktop.png";
terminal = false;
type = "Application";
categories = [ "Network" ];
})
];
installPhase = ''
runHook preInstall
mkdir -p $out/
cp -r bin $out/bin
runHook postInstall
'';
meta = with lib; {
description = "Onion routing based messenger";

10
pkgs/applications/networking/p2p/twister/default.nix
View File

@ -1,15 +1,15 @@
{ lib, stdenv, fetchFromGitHub, fetchpatch, autoconf, automake, libtool, pkg-config, python2
, boost, db, openssl, geoip, libiconv, miniupnpc
, srcOnly, fetchgit
, boost, db, openssl, geoip, libiconv, miniupnpc, srcOnly
}:
let
twisterHTML = srcOnly {
name = "twister-html";
src = fetchgit {
url = "https://github.com/miguelfreitas/twister-html.git";
src = fetchFromGitHub {
owner = "miguelfreitas";
repo = "twister-html";
rev = "01e7f7ca9b7e42ed90f91bc42da2c909ca5c0b9b";
sha256 = "0scjbin6s1kmi0bqq0dx0qyjw4n5xgmj567n0156i39f9h0dabqy";
sha256 = "sha256-Hi/VAEwujWhKAPaYIuvrxRIuPQa9AYwXiHUGbWxckmk=";
};
};

9
pkgs/applications/version-management/git-and-tools/darcs-to-git/default.nix
View File

@ -1,13 +1,14 @@
{ lib, stdenv, fetchgit, ruby, gnugrep, diffutils, git, darcs }:
{ lib, stdenv, fetchFromGitHub, ruby, gnugrep, diffutils, git, darcs }:
stdenv.mkDerivation {
pname = "darcs-to-git";
version = "2015-06-04";
src = fetchgit {
url = "https://github.com/purcell/darcs-to-git.git";
src = fetchFromGitHub {
owner = "purcell";
repo = "darcs-to-git";
rev = "e5fee32495908fe0f7d700644c7b37347b7a0a5b";
sha256 = "0lxcx0x0m1cv2j4x9ykpjf6r2zg6lh5rya016x93vkmlzxm3f0ji";
sha256 = "sha256-UQI3av+0zj1SNwEonwuk5n2RjZN3+tSJFJuFCjrorFM=";
};
patchPhase = let

8
pkgs/desktops/gnome/core/gnome-control-center/default.nix
View File

@ -2,6 +2,7 @@
, lib
, stdenv
, substituteAll
, fetchpatch
, accountsservice
, adwaita-icon-theme
, colord
@ -78,6 +79,13 @@ stdenv.mkDerivation rec {
inherit glibc libgnomekbd tzdata;
inherit cups networkmanagerapplet;
})
# Fix Online Accounts configuration on X11
# https://gitlab.gnome.org/GNOME/gnome-control-center/-/merge_requests/1272
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/gnome-control-center/-/commit/7fe322b9cedae313cd9af6f403eab9bfc6027674.patch";
sha256 = "cv1abqv0Kbfkfu7mZzEaZKXPE85yVBcQbjNHW+8ODFE=";
})
];
nativeBuildInputs = [

9
pkgs/development/compilers/ghcjs/ghcjs-base.nix
View File

@ -1,5 +1,5 @@
{ mkDerivation, aeson, array, attoparsec, base, binary, bytestring
, containers, deepseq, directory, dlist, fetchgit, ghc-prim
, containers, deepseq, directory, dlist, fetchFromGitHub, ghc-prim
, ghcjs-prim, hashable, HUnit, integer-gmp, primitive, QuickCheck
, quickcheck-unicode, random, scientific, test-framework
, test-framework-hunit, test-framework-quickcheck2, text, time
@ -9,10 +9,11 @@
mkDerivation {
pname = "ghcjs-base";
version = "0.2.0.3";
src = fetchgit {
url = "https://github.com/ghcjs/ghcjs-base";
sha256 = "15fdkjv0l7hpbbsn5238xxgzfdg61g666nzbv2sgxkwryn5rycv0";
src = fetchFromGitHub {
owner = "ghcjs";
repo = "ghcjs-base";
rev = "85e31beab9beffc3ea91b954b61a5d04e708b8f2";
sha256 = "sha256-YDOfi/WZz/602OtbY8wL5jX3X+9oiGL1WhceCraczZU=";
};
libraryHaskellDepends = [
aeson attoparsec base binary bytestring containers deepseq dlist

4
pkgs/development/interpreters/clojure/default.nix
View File

@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
pname = "clojure";
version = "1.11.0.1097";
version = "1.11.0.1100";
src = fetchurl {
# https://clojure.org/releases/tools
url = "https://download.clojure.org/install/clojure-tools-${version}.tar.gz";
sha256 = "sha256-8n/XOguemlqzVq9Vihd3QT5PsHSKcW3tTlOJtClrzKs=";
sha256 = "sha256-9KEsO32118fvKE1Gls+9nAeRdlhTKfmJylsiSYCoKKU=";
};
nativeBuildInputs = [

4
pkgs/development/interpreters/picoc/default.nix
View File

@ -13,6 +13,8 @@ stdenv.mkDerivation rec {
buildInputs = [ readline ];
makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ];
postPatch = ''
substituteInPlace Makefile --replace '`svnversion -n`' "${version}"
'';
@ -46,6 +48,6 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/zsaleeba/picoc";
downloadPage = "https://code.google.com/p/picoc/downloads/list";
license = licenses.bsd3;
platforms = platforms.linux;
platforms = platforms.unix;
};
}

9
pkgs/development/interpreters/scsh/default.nix
View File

@ -1,14 +1,15 @@
{ lib, stdenv, fetchgit, autoreconfHook, scheme48 }:
{ lib, stdenv, fetchFromGitHub, autoreconfHook, scheme48 }:
stdenv.mkDerivation {
pname = "scsh";
version = "0.7pre";
src = fetchgit {
url = "https://github.com/scheme/scsh.git";
src = fetchFromGitHub {
owner = "scheme";
repo = "scsh";
rev = "f99b8c5293628cfeaeb792019072e3a96841104f";
sha256 = "sha256-vcVtqoUhozdJq1beUN8/rcI2qOJYUN+0CPSiDWGCIjI=";
fetchSubmodules = true;
sha256 = "0ci2h9hhv8pl12sdyl2qwal3dhmd7zgm1pjnmd4kg8r1hnm6vidx";
};
nativeBuildInputs = [ autoreconfHook ];

4
pkgs/development/python-modules/azure-keyvault-administration/default.nix
View File

@ -6,13 +6,13 @@
buildPythonPackage rec {
pname = "azure-keyvault-administration";
version = "4.0.0";
version = "4.1.0";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "b05a0372f35921cedb7a231426077745eee9a65881088de6d4d8b73d9709a6cb";
sha256 = "sha256-V8tppRExyvSt41nN+j2QoxGSund6RKvE4g5p6AWZ3qI=";
};
propagatedBuildInputs = [

12
pkgs/development/python-modules/backports_functools_lru_cache/default.nix
View File

@ -3,10 +3,7 @@
, fetchPypi
, setuptools-scm
, isPy3k
, pytest
, pytest-black
, pytest-flake8
, pytest-cov
, pytestCheckHook
}:
buildPythonPackage rec {
@ -20,12 +17,7 @@ buildPythonPackage rec {
nativeBuildInputs = [ setuptools-scm ];
checkInputs = [ pytest pytest-flake8 pytest-black pytest-cov ];
# ironically, they fail a linting test, and pytest.ini forces that test suite
checkPhase = ''
rm backports/functools_lru_cache.py
pytest -k 'not format'
'';
checkInputs = [ pytestCheckHook ];
# Test fail on Python 2
doCheck = isPy3k;

52
pkgs/development/python-modules/notifymuch/default.nix Normal file
View File

@ -0,0 +1,52 @@
{ lib
, buildPythonApplication
, isPy3k
, fetchFromGitHub
, notmuch
, pygobject3
, gobject-introspection
, libnotify
, wrapGAppsHook
, gtk3
}:
buildPythonApplication rec {
pname = "notifymuch";
version = "0.1";
disabled = !isPy3k;
src = fetchFromGitHub {
owner = "kspi";
repo = "notifymuch";
# https://github.com/kspi/notifymuch/issues/11
rev = "9d4aaf54599282ce80643b38195ff501120807f0";
sha256 = "1lssr7iv43mp5v6nzrfbqlfzx8jcc7m636wlfyhhnd8ydd39n6k4";
};
propagatedBuildInputs = [
notmuch
pygobject3
libnotify
gtk3
];
nativeBuildInputs = [
gobject-introspection
wrapGAppsHook
];
dontWrapGApps = true;
preFixup = ''
makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
'';
strictDeps = false;
meta = with lib; {
description = "Display desktop notifications for unread mail in a notmuch database";
homepage = "https://github.com/kspi/notifymuch";
maintainers = with maintainers; [ arjan-s ];
license = licenses.gpl3;
};
}

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

@ -3,14 +3,14 @@
buildPythonPackage rec {
pname = "osmnx";
version = "1.1.1";
version = "1.1.2";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "gboeing";
repo = pname;
rev = "v${version}";
sha256 = "0dkv3fnlq23d7d30lhdf4a313lxy3a5qfldidvszs1z9n16ycnwb";
sha256 = "sha256-qrTAXZFm88elMrVjvGwfdNwTA/PRdCOHFqpcgoKVGNk=";
};
propagatedBuildInputs = [ geopandas matplotlib networkx numpy pandas requests Rtree shapely folium scikit-learn scipy gdal rasterio ];

13
pkgs/development/python-modules/portend/black-19.10b0.patch
View File

@ -1,13 +0,0 @@
diff --git a/test_portend.py b/test_portend.py
index b2de8c2..3f90276 100644
--- a/test_portend.py
+++ b/test_portend.py
@@ -21,7 +21,7 @@ def socket_infos():
def id_for_info(info):
- af, = info[:1]
+ (af,) = info[:1]
return str(af)

12
pkgs/development/python-modules/portend/default.nix
View File

@ -1,5 +1,5 @@
{ lib, buildPythonPackage, fetchPypi
, pytest, setuptools-scm, tempora, pytest-black, pytest-cov }:
, pytestCheckHook, setuptools-scm, tempora }:
buildPythonPackage rec {
pname = "portend";
@ -10,19 +10,11 @@ buildPythonPackage rec {
sha256 = "239e3116045ea823f6df87d6168107ad75ccc0590e37242af0cc1e98c5d224e4";
};
postPatch = ''
substituteInPlace pytest.ini --replace "--flake8" ""
'';
nativeBuildInputs = [ setuptools-scm ];
propagatedBuildInputs = [ tempora ];
checkInputs = [ pytest pytest-black pytest-cov ];
checkPhase = ''
py.test --deselect=test_portend.py::TestChecker::test_check_port_listening
'';
checkInputs = [ pytestCheckHook ];
# Some of the tests use localhost networking.
__darwinAllowLocalNetworking = true;

6
pkgs/development/tools/build-managers/fac/default.nix
View File

@ -1,4 +1,4 @@
{ lib, rustPlatform, fetchCrate, git }:
{ lib, stdenv, rustPlatform, fetchCrate, git, CoreServices }:
rustPlatform.buildRustPackage rec {
pname = "fac-build";
@ -10,6 +10,8 @@ rustPlatform.buildRustPackage rec {
sha256 = "sha256-+JJVuKUdnjJoQJ4a2EE0O6jZdVoFxPwbPgfD2LfiDPI=";
};
buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ];
cargoSha256 = "sha256-XT4FQVE+buORuZAFZK5Qnf/Fl3QSvw4SHUuCzWhxUdk=";
# fac includes a unit test called ls_files_works which assumes it's
@ -40,7 +42,7 @@ rustPlatform.buildRustPackage rec {
'';
homepage = "https://physics.oregonstate.edu/~roundyd/fac";
license = licenses.gpl2Plus;
platforms = platforms.linux;
platforms = platforms.unix;
maintainers = with maintainers; [ dpercy ];
mainProgram = "fac";
};

10
pkgs/development/tools/misc/clojure-lsp/default.nix
View File

@ -2,18 +2,18 @@
buildGraalvmNativeImage rec {
pname = "clojure-lsp";
version = "2022.02.23-12.12.12";
version = "2022.03.26-18.47.08";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = version;
sha256 = "sha256-PfO1G66Z3zQ+Hyjb6J0bomsT8juQURwF2mPKJY5auMw=";
sha256 = "sha256-tlI4h9/DTc3JwqCM58YC5x4FDpuPm7Qeik3PJe64nVA=";
};
jar = fetchurl {
url = "https://github.com/clojure-lsp/clojure-lsp/releases/download/${version}/clojure-lsp-standalone.jar";
sha256 = "sha256-f8bEALl9j0aDkKZtThLTseqibeYIUeOx4ulelPWQkoo=";
sha256 = "4973f5cf45f0b8120206d057d88d6a7fca03e071c8ad1ecd7229db46a0604ed2";
};
extraNativeImageBuildArgs = [
@ -42,9 +42,9 @@ buildGraalvmNativeImage rec {
latest_version=$(curl -s https://api.github.com/repos/clojure-lsp/clojure-lsp/releases/latest | jq --raw-output .tag_name)
old_jar_hash=$(nix-instantiate --eval --strict -A "clojure-lsp-standalone.jar.drvAttrs.outputHash" | tr -d '"' | sed -re 's|[+]|\\&|g')
old_jar_hash=$(nix-instantiate --eval --strict -A "clojure-lsp.jar.drvAttrs.outputHash" | tr -d '"' | sed -re 's|[+]|\\&|g')
curl -o clojure-lsp.jar -sL https://github.com/clojure-lsp/clojure-lsp/releases/download/$latest_version/clojure-lsp-standalone.jar
curl -o clojure-lsp-standalone.jar -sL https://github.com/clojure-lsp/clojure-lsp/releases/download/$latest_version/clojure-lsp-standalone.jar
new_jar_hash=$(nix-hash --flat --type sha256 clojure-lsp-standalone.jar | sed -re 's|[+]|\\&|g')
rm -f clojure-lsp-standalone.jar

9
pkgs/development/tools/parsing/hammer/default.nix
View File

@ -1,13 +1,14 @@
{ lib, stdenv, fetchgit, glib, pkg-config, scons }:
{ lib, stdenv, fetchFromGitHub, glib, pkg-config, scons }:
stdenv.mkDerivation {
pname = "hammer";
version = "e7aa734";
src = fetchgit {
url = "https://github.com/UpstandingHackers/hammer";
sha256 = "01l0wbhz7dymxlndacin2vi8sqwjlw81ds2i9xyi200w51nsdm38";
src = fetchFromGitHub {
owner = "UpstandingHackers";
repo = "hammer";
rev = "47f34b81e4de834fd3537dd71928c4f3cdb7f533";
sha256 = "sha256-aNSmbSgcABF9T1HoFhCnkmON4hY2MtUs7dW38+HigAY=";
};
nativeBuildInputs = [ pkg-config scons ];

4
pkgs/games/xtris/default.nix
View File

@ -18,10 +18,12 @@ stdenv.mkDerivation rec {
'';
buildInputs = [ xorg.libX11 ];
makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ];
meta = with lib; {
description = "A multi-player version of the classical game of Tetris, for the X Window system";
homepage = "https://web.archive.org/web/20120315061213/http://www.iagora.com/~espel/xtris/xtris.html";
license = licenses.gpl2;
platforms = platforms.linux;
platforms = platforms.unix;
};
}

9
pkgs/os-specific/linux/disk-indicator/default.nix
View File

@ -1,13 +1,14 @@
{ lib, stdenv, fetchgit, libX11 }:
{ lib, stdenv, fetchFromGitHub, libX11 }:
stdenv.mkDerivation {
pname = "disk-indicator";
version = "unstable-2014-05-19";
src = fetchgit {
url = "https://github.com/MeanEYE/Disk-Indicator.git";
src = fetchFromGitHub {
owner = "MeanEYE";
repo = "Disk-Indicator";
rev = "51ef4afd8141b8d0659cbc7dc62189c56ae9c2da";
sha256 = "10jx6mx9qarn21p2l2jayxkn1gmqhvck1wymgsr4jmbwxl8ra5kd";
sha256 = "sha256-bRaVEe18VUmyftXzMNmGuL5gZ/dKCipuEDYrnHo1XYI=";
};
buildInputs = [ libX11 ];

10
pkgs/os-specific/linux/lvm2/common.nix
View File

@ -9,8 +9,8 @@
, libaio
, enableCmdlib ? false
, enableDmeventd ? false
, udevSupport ? !stdenv.targetPlatform.isStatic, udev ? null
, onlyLib ? stdenv.targetPlatform.isStatic
, udevSupport ? !stdenv.hostPlatform.isStatic, udev ? null
, onlyLib ? stdenv.hostPlatform.isStatic
, nixosTests
}:
@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
] ++ lib.optionals udevSupport [
"--enable-udev_rules"
"--enable-udev_sync"
] ++ lib.optionals stdenv.targetPlatform.isStatic [
] ++ lib.optionals stdenv.hostPlatform.isStatic [
"--enable-static_link"
];
@ -91,7 +91,7 @@ stdenv.mkDerivation rec {
url = "https://git.alpinelinux.org/aports/plain/main/lvm2/mallinfo.patch?h=3.7-stable&id=31bd4a8c2dc00ae79a821f6fe0ad2f23e1534f50";
sha256 = "0g6wlqi215i5s30bnbkn8w7axrs27y3bnygbpbnf64wwx7rxxlj0";
})
] ++ lib.optionals stdenv.targetPlatform.isStatic [
] ++ lib.optionals stdenv.hostPlatform.isStatic [
./no-shared.diff
];
@ -114,7 +114,7 @@ stdenv.mkDerivation rec {
];
installPhase = lib.optionalString onlyLib ''
install -D -t $out/lib libdm/ioctl/libdevmapper.${if stdenv.targetPlatform.isStatic then "a" else "so"}
install -D -t $out/lib libdm/ioctl/libdevmapper.${if stdenv.hostPlatform.isStatic then "a" else "so"}
make -C libdm install_include
make -C libdm install_pkgconfig
'';

6
pkgs/servers/clickhouse/default.nix
View File

@ -8,7 +8,7 @@
stdenv.mkDerivation rec {
pname = "clickhouse";
version = "21.8.12.29";
version = "22.3.2.2";
broken = stdenv.buildPlatform.is32bit; # not supposed to work on 32-bit https://github.com/ClickHouse/ClickHouse/pull/23959#issuecomment-835343685
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
repo = "ClickHouse";
rev = "v${version}-lts";
fetchSubmodules = true;
sha256 = "1qqacb7v7mhr9k162yll8mcbh0cxa347f5hypz0a8l54v1dz5fyl";
sha256 = "0rhzgm0gvwpx4h5xyr7y393y7s9slcr4a7grw9316f5m70frxg2v";
};
nativeBuildInputs = [ cmake libtool llvm-bintools ninja ];
@ -37,8 +37,6 @@ stdenv.mkDerivation rec {
--replace 'git rev-parse --show-toplevel' '$src'
substituteInPlace utils/check-style/check-ungrouped-includes.sh \
--replace 'git rev-parse --show-toplevel' '$src'
substituteInPlace utils/generate-ya-make/generate-ya-make.sh \
--replace 'git rev-parse --show-toplevel' '$src'
substituteInPlace utils/list-licenses/list-licenses.sh \
--replace 'git rev-parse --show-toplevel' '$src'
substituteInPlace utils/check-style/check-style \

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

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

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

@ -176,7 +176,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.3.7";
hassVersion = "2022.3.8";
in python.pkgs.buildPythonApplication rec {
pname = "homeassistant";
@ -194,7 +194,7 @@ in python.pkgs.buildPythonApplication rec {
owner = "home-assistant";
repo = "core";
rev = version;
hash = "sha256-AewJf4GS3jfEN8Xq82NDV8PNpXXZIs2DHix/+tJpB8c=";
hash = "sha256-FGsMFt/EEokaast81iiwKHqSsB1E4Si5ejTw+MV1MnQ=";
};
# leave this in, so users don't have to constantly update their downstream patch handling

4
pkgs/servers/unifi/default.nix
View File

@ -65,7 +65,7 @@ in rec {
};
unifi7 = generic {
version = "7.0.23";
sha256 = "1y2z02blgbqa6xvwjrvzx6mfwbbbmmv50rq409rsg1hkkzispxmw";
version = "7.0.25";
sha256 = "sha256-DZi2xy6mS3hfqxX1ikiHKPlJ12eaoZVgyl9jKYt91hg=";
};
}

9
pkgs/tools/audio/pa-applet/default.nix
View File

@ -1,13 +1,14 @@
{ lib, stdenv, fetchgit, libpulseaudio, pkg-config, gtk3, glibc, autoconf, automake, libnotify, libX11, xf86inputevdev }:
{ lib, stdenv, fetchFromGitHub, libpulseaudio, pkg-config, gtk3, glibc, autoconf, automake, libnotify, libX11, xf86inputevdev }:
stdenv.mkDerivation {
pname = "pa-applet";
version = "unstable-2012-04-11";
src = fetchgit {
url = "https://github.com/fernandotcl/pa-applet.git";
src = fetchFromGitHub {
owner = "fernandotcl";
repo = "pa-applet";
rev = "005f192df9ba6d2e6491f9aac650be42906b135a";
sha256 = "1242sdri67wnm1cd0hr40mxarkh7qs7mb9n2m0g9dbz0f4axj6wa";
sha256 = "sha256-ihvZFXHgr5YeqMKmVY/GB86segUkQ9BYqJYfE3PTgog=";
};
nativeBuildInputs = [ pkg-config ];

6
pkgs/tools/misc/gotify-desktop/default.nix
View File

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "gotify-desktop";
version = "1.2.0";
version = "1.3.1";
src = fetchFromGitHub {
owner = "desbma";
repo = pname;
rev = version;
sha256 = "sha256-QQpZeXFv8BqFOQ+7ANWmtsgNlMakAL2ML4rlG2cFZJE=";
sha256 = "sha256-EDLOSxmODC7OzVSZJxwKNnFA2yh+QKE8aXmYJ+Dnv40=";
};
cargoSha256 = "sha256-zcSAsI/yGGJer7SPKDKZ6NQ3UgTdBcDighS6VTNITMo=";
cargoSha256 = "sha256-opSXndOjdmYG5DJ3CDUHWhN6O7AQp4Cleldzq1Hfr1o=";
nativeBuildInputs = [ pkg-config ];

9
pkgs/tools/networking/carddav-util/default.nix
View File

@ -1,13 +1,14 @@
{ lib, stdenv, fetchgit, python3Packages, makeWrapper }:
{ lib, stdenv, fetchFromGitHub, python3Packages, makeWrapper }:
stdenv.mkDerivation {
pname = "carddav";
version = "0.1-2014-02-26";
src = fetchgit {
url = "https://github.com/ljanyst/carddav-util";
src = fetchFromGitHub {
owner = "ljanyst";
repo = "carddav-util";
rev = "53b181faff5f154bcd180467dd04c0ce69405564";
sha256 = "0f0raffdy032wlnxfck6ky60r163nhqfbr311y4ry55l60s4497n";
sha256 = "sha256-9iRCNDC0FJ+JD2Hk5TC0w4QMjJ9mMtct5WIA35xTGTg=";
};
nativeBuildInputs = [ makeWrapper ];

18
pkgs/tools/package-management/nixui/default.nix
View File

@ -1,12 +1,6 @@
{ lib, stdenv, pkgs, fetchgit, nix, node_webkit, makeDesktopItem
{ lib, stdenv, pkgs, fetchFromGitHub, nix, node_webkit, makeDesktopItem
, writeScript }:
let
version = "0.2.1";
src = fetchgit {
url = "https://github.com/matejc/nixui.git";
rev = "845a5f4a33f1d0c509c727c130d0792a5b450a38";
sha256 = "1ay3i4lgzs3axbby06l4vvspxi0aa9pwiil84qj0dqq1jb6isara";
};
nixui = (import ./nixui.nix {
inherit pkgs;
inherit (stdenv.hostPlatform) system;
@ -24,9 +18,15 @@ let
genericName = "NixUI";
};
in
stdenv.mkDerivation {
stdenv.mkDerivation rec {
pname = "nixui";
inherit version src;
version = "0.2.1";
src = fetchFromGitHub {
owner = "matejc";
repo = "nixui";
rev = version;
sha256 = "sha256-KisdzZIB4wYkJojGyG9SCsR+9d6EGuDX6mro/yiJw6s=";
};
installPhase = ''
mkdir -p $out/bin
ln -s ${script} $out/bin/nixui

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

@ -21289,9 +21289,10 @@ with pkgs;
clamsmtp = callPackage ../servers/mail/clamsmtp { };
clickhouse = callPackage ../servers/clickhouse {
# upstream requires llvm10 as of v20.11.4.13
inherit (llvmPackages_10) clang-unwrapped lld llvm;
llvm-bintools = llvmPackages_10.bintools;
# upstream requires llvm12 as of v22.3.2.2
inherit (llvmPackages_12) clang-unwrapped lld llvm;
llvm-bintools = llvmPackages_12.bintools;
stdenv = llvmPackages_12.stdenv;
};
clickhouse-cli = with python3Packages; toPythonApplication clickhouse-cli;
@ -22989,7 +22990,7 @@ with pkgs;
lvm2-2_02 = callPackage ../os-specific/linux/lvm2/2_02.nix {
udev = systemdMinimal;
};
lvm2 = if stdenv.targetPlatform.isMusl then lvm2-2_02 else lvm2-2_03;
lvm2 = if stdenv.hostPlatform.isMusl then lvm2-2_02 else lvm2-2_03;
lvm2_dmeventd = lvm2.override {
enableDmeventd = true;
@ -30836,7 +30837,9 @@ with pkgs;
openethereum = callPackage ../applications/blockchains/openethereum { };
polkadot = callPackage ../applications/blockchains/polkadot { };
polkadot = callPackage ../applications/blockchains/polkadot {
inherit (darwin.apple_sdk.frameworks) Security;
};
particl-core = callPackage ../applications/blockchains/particl-core { miniupnpc = miniupnpc_2; };
@ -34999,7 +35002,9 @@ with pkgs;
unifi-poller = callPackage ../servers/monitoring/unifi-poller {};
fac-build = callPackage ../development/tools/build-managers/fac {};
fac-build = callPackage ../development/tools/build-managers/fac {
inherit (darwin.apple_sdk.frameworks) CoreServices;
};
treefmt = callPackage ../development/tools/treefmt { };

4
pkgs/top-level/perl-packages.nix
View File

@ -18200,6 +18200,10 @@ let
sha256 = "0278anidj7bgassj32g20cbki2kkqakkr3axyq4k90nj4snw7p6x";
};
propagatedBuildInputs = [ Future IOAsync PPI PPR PathTiny PerlCritic PerlTidy PodMarkdown URI ];
nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang;
postInstall = lib.optionalString stdenv.isDarwin ''
shortenPerlShebang $out/bin/pls
'';
meta = {
homepage = "https://github.com/FractalBoy/perl-language-server";
description = "Perl Language Server";

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

@ -5627,6 +5627,8 @@ in {
notify2 = callPackage ../development/python-modules/notify2 { };
notifymuch = callPackage ../development/python-modules/notifymuch {};
notmuch = callPackage ../development/python-modules/notmuch {
inherit (pkgs) notmuch;
};