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

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

Browse source
This commit is contained in:
Martin Weinelt 2022-03-27 01:45:13 +01:00
commit 7be28200e2
19 changed files with 173 additions and 96 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
nixos/modules/services/misc/dendrite.nix
View file

@ -248,14 +248,11 @@ in
RuntimeDirectory = "dendrite";
RuntimeDirectoryMode = "0700";
EnvironmentFile = lib.mkIf (cfg.environmentFile != null) cfg.environmentFile;
ExecStartPre =
if (cfg.environmentFile != null) then ''
${pkgs.envsubst}/bin/envsubst \
-i ${configurationYaml} \
-o /run/dendrite/dendrite.yaml
'' else ''
${pkgs.coreutils}/bin/cp ${configurationYaml} /run/dendrite/dendrite.yaml
'';
ExecStartPre = ''
${pkgs.envsubst}/bin/envsubst \
-i ${configurationYaml} \
-o /run/dendrite/dendrite.yaml
'';
ExecStart = lib.strings.concatStringsSep " " ([
"${pkgs.dendrite}/bin/dendrite-monolith-server"
"--config /run/dendrite/dendrite.yaml"

15
pkgs/applications/graphics/xfig/default.nix
View file

@ -3,6 +3,7 @@
, fetchurl
, xlibsWrapper
, makeWrapper
, imagemagick
, libXpm
, libXmu
, libXi
@ -21,7 +22,7 @@ stdenv.mkDerivation rec {
sha256 = "0fndgbm1mkqb1sn2v2kj3nx9mxj70jbp31y2bjvzcmmkry0q3k5j";
};
nativeBuildInputs = [ makeWrapper ];
nativeBuildInputs = [ imagemagick makeWrapper ];
buildInputs = [
xlibsWrapper
@ -34,7 +35,8 @@ stdenv.mkDerivation rec {
];
postPatch = ''
sed -i 's:"fig2dev":"${fig2dev}/bin/fig2dev":' src/main.c
substituteInPlace src/main.c --replace '"fig2dev"' '"${fig2dev}/bin/fig2dev"'
substituteInPlace xfig.desktop --replace "/usr/bin/" "$out/bin/"
'';
postInstall = ''
@ -43,6 +45,15 @@ stdenv.mkDerivation rec {
wrapProgram $out/bin/xfig \
--set XAPPLRESDIR $out/share/X11/app-defaults
mkdir -p $out/share/icons/hicolor/{16x16,22x22,48x48,64x64}/apps
for dimension in 16x16 22x22 48x48; do
convert doc/html/images/xfig-logo.png -geometry $dimension\
$out/share/icons/hicolor/16x16/apps/xfig.png
done
install doc/html/images/xfig-logo.png \
$out/share/icons/hicolor/64x64/apps/xfig.png
'';
enableParallelBuilding = true;

35
pkgs/applications/misc/freeplane/default.nix
View file

@ -1,24 +1,31 @@
{ stdenv, lib, fetchpatch, fetchFromGitHub, makeWrapper, writeText, runtimeShell, jdk11, perl, gradle_5, which }:
{ stdenv, lib, fetchpatch, fetchFromGitHub, makeWrapper, writeText, runtimeShell, jdk11, perl, gradle_6, which }:
let
pname = "freeplane";
version = "1.9.5";
version = "1.9.14";
src_sha256 = "UiXtGJs+hibB63BaDDLXgjt3INBs+NfMsKcX2Q/kxKw=";
deps_outputHash = "tHhRaMIQK8ERuzm+qB9tRe2XSesL0bN3rComB9/qWgg=";
emoji_outputHash = "w96or4lpKCRK8A5HaB4Eakr7oVSiQALJ9tCJvKZaM34=";
jdk = jdk11;
gradle = gradle_6;
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "release-${version}";
sha256 = "qfhhmF3mePxcL4U8izkEmWaiaOLi4slsaymVnDoO3sY=";
sha256 = src_sha256;
};
deps = stdenv.mkDerivation {
name = "${pname}-deps";
inherit src;
nativeBuildInputs = [ jdk11 perl gradle_5 ];
nativeBuildInputs = [ jdk perl gradle ];
buildPhase = ''
GRADLE_USER_HOME=$PWD gradle -Dorg.gradle.java.home=${jdk11} --no-daemon jar
GRADLE_USER_HOME=$PWD gradle -Dorg.gradle.java.home=${jdk} --no-daemon jar
'';
# Mavenize dependency paths
@ -31,7 +38,7 @@ let
outputHashAlgo = "sha256";
outputHashMode = "recursive";
outputHash = "xphTzaSXTGpP7vI/t4oIiv1ZpbekG2dFRzyl3ub6qnA=";
outputHash = deps_outputHash;
};
# Point to our local deps repo
@ -60,16 +67,14 @@ let
}
'';
# downloaded from unicode.org and twemoji.maxcdn.com by code in freeplane/emoji.gradle
# the below hash is for versions of freeplane that use twemoji 12.1.4, and emoji 12.1
emoji = stdenv.mkDerivation rec {
name = "${pname}-emoji";
inherit src;
nativeBuildInputs = [ jdk11 gradle_5 ];
nativeBuildInputs = [ jdk gradle ];
buildPhase = ''
GRADLE_USER_HOME=$PWD gradle -Dorg.gradle.java.home=${jdk11} --no-daemon --offline --init-script ${gradleInit} emojiGraphicsClasses emojiListClasses
GRADLE_USER_HOME=$PWD gradle -Dorg.gradle.java.home=${jdk} --no-daemon --offline --init-script ${gradleInit} :freeplane:downloadEmoji
'';
installPhase = ''
@ -80,19 +85,19 @@ let
outputHashAlgo = "sha256";
outputHashMode = "recursive";
outputHash = "0zikbakbr2fhyv4h4h52ajhznjka0hg6hiqfy1528a39i6psipn3";
outputHash = emoji_outputHash;
};
in stdenv.mkDerivation rec {
inherit pname version src;
nativeBuildInputs = [ makeWrapper jdk11 gradle_5 ];
nativeBuildInputs = [ makeWrapper jdk gradle ];
buildPhase = ''
mkdir -p -- ./freeplane/build/emoji/{txt,resources/images}
cp ${emoji}/emoji/txt/emojilist.txt ./freeplane/build/emoji/txt/emojilist.txt
cp -r ${emoji}/resources/images/emoji ./freeplane/build/emoji/resources/images/emoji
GRADLE_USER_HOME=$PWD gradle -Dorg.gradle.java.home=${jdk11} --no-daemon --offline --init-script ${gradleInit} -x test -x :freeplane:downloadEmoji build
GRADLE_USER_HOME=$PWD gradle -Dorg.gradle.java.home=${jdk} --no-daemon --offline --init-script ${gradleInit} -x test -x :freeplane:downloadEmoji build
'';
installPhase = ''
@ -102,8 +107,8 @@ in stdenv.mkDerivation rec {
cp -a ./BIN/. $out/share/${pname}
makeWrapper $out/share/${pname}/${pname}.sh $out/bin/${pname} \
--set FREEPLANE_BASE_DIR $out/share/${pname} \
--set JAVA_HOME ${jdk11} \
--prefix PATH : ${lib.makeBinPath [ jdk11 which ]}
--set JAVA_HOME ${jdk} \
--prefix PATH : ${lib.makeBinPath [ jdk which ]}
runHook postInstall
'';

49
pkgs/applications/misc/nix-tour/default.nix
View file

@ -1,35 +1,50 @@
{ lib, stdenv, fetchFromGitHub, electron, runtimeShell } :
{ lib
, stdenv
, fetchFromGitHub
, electron
, runtimeShell
, makeWrapper
, copyDesktopItems
, makeDesktopItem
}:
stdenv.mkDerivation rec {
pname = "nix-tour";
version = "0.0.1";
buildInputs = [ electron ];
version = "unstable-2022-01-03";
src = fetchFromGitHub {
owner = "nixcloud";
repo = "tour_of_nix";
rev = "v${version}";
sha256 = "sha256-a/P2ZMc9OpM4PxRFklSO6oVCc96AGWkxtGF/EmnfYSU=";
rev = "6a6784983e6dc121574b97eb9b1d03592c8cb9a7";
sha256 = "sha256-BhQz59wkwwY0ShXzqUD6MQl4NE/jUik5RbLzseEc5Bc=";
};
nativeBuildInputs = [ makeWrapper copyDesktopItems ];
buildInputs = [ electron ];
installPhase = ''
mkdir -p $out/bin
mkdir -p $out/share
cp -R * $out/share
chmod 0755 $out/share/ -R
echo "#!${runtimeShell}" > $out/bin/nix-tour
echo "cd $out/share/" >> $out/bin/nix-tour
echo "${electron}/bin/electron $out/share/electron-main.js" >> $out/bin/nix-tour
chmod 0755 $out/bin/nix-tour
install -d $out/bin $out/share/nix-tour
cp -R * $out/share/nix-tour
makeWrapper ${electron}/bin/electron $out/bin/nix-tour \
--add-flags $out/share/nix-tour/electron-main.js
'';
desktopItems = [
(makeDesktopItem {
name = pname;
desktopName = "Tour of Nix";
genericName = "Tour of Nix";
comment =
"Interactive programming guide dedicated to the nix programming language";
categories = [ "Development" "Documentation" ];
exec = "nix-tour";
})
];
meta = with lib; {
description = "'the tour of nix' from nixcloud.io/tour as offline version";
homepage = "https://nixcloud.io/tour";
license = licenses.gpl2;
platforms = platforms.linux;
maintainers = with maintainers; [ qknight ];
maintainers = with maintainers; [ qknight yuu ];
};
}

6
pkgs/applications/networking/browsers/chromium/upstream-info.json
View file

@ -1,8 +1,8 @@
{
"stable": {
"version": "99.0.4844.82",
"sha256": "0p6jqwal0yrvn8iylm2f3n07hkkaf8899iw9i3cvks0d870hpfxq",
"sha256bin64": "0zhhibz727qx2wg2pcazha3q9xwf1bcm1f9hgid7jq2pq7fq3hdr",
"version": "99.0.4844.84",
"sha256": "05bma8lsm5lad58mlfiv8bg0fw5k5mxh0v6g1ik7xp2bsd71iv10",
"sha256bin64": "0sdnsnp7hnpip91hwbz3hiw2727g0a3ydf55ldqv9bgik3vn1wln",
"deps": {
"gn": {
"version": "2022-01-10",

4
pkgs/applications/networking/mailreaders/mutt/default.nix
View file

@ -27,11 +27,11 @@ with lib;
stdenv.mkDerivation rec {
pname = "mutt";
version = "2.2.1";
version = "2.2.2";
src = fetchurl {
url = "http://ftp.mutt.org/pub/mutt/${pname}-${version}.tar.gz";
sha256 = "1ddbhwsycfpf430k52l5gggywd09h10hwcwzpydam43c5ga30vdp";
sha256 = "1k0ghbpc4gn3sydbw10xv9djin9grk1pkxdwynrw0iknyc68gphh";
};
patches = optional smimeSupport (fetchpatch {

4
pkgs/data/fonts/twitter-color-emoji/default.nix
View file

@ -14,14 +14,14 @@
}:
let
version = "13.0.2";
version = "14.0.0";
twemojiSrc = fetchFromGitHub {
name = "twemoji";
owner = "twitter";
repo = "twemoji";
rev = "v${version}";
sha256 = "069pyq09jfzwp3xla8vmhbyyam32x2iyp0s29xcxlkj22p99bg6d";
sha256 = "sha256-ar6rBYudMIMngMVe/IowDV3X8wA77JBA6g0x/M7YLMg=";
};
pythonEnv =

4
pkgs/desktops/gnome/misc/gpaste/default.nix
View file

@ -20,14 +20,14 @@
}:
stdenv.mkDerivation rec {
version = "42.0";
version = "42.1";
pname = "gpaste";
src = fetchFromGitHub {
owner = "Keruspe";
repo = "GPaste";
rev = "v${version}";
sha256 = "sha256-dwL06BL6P8fqvAfrYpifqMAh6d+3Er6RhUeP6nfCr1M=";
sha256 = "sha256-A5NZ4NiPVZUr7vPdDuNywLsLrejZ4SCg7+3//ZNRmLY=";
};
patches = [

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

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

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

@ -16,7 +16,7 @@
}:
buildPythonPackage rec {
version = "0.20.32";
version = "0.20.35";
pname = "dulwich";
format = "setuptools";
@ -24,7 +24,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
hash = "sha256-3FSYsHK9wSwe/+9LYgLNKkVCuxxtu03c/IxtU+CLSIw=";
hash = "sha256-lT9jAanfigkfqI1V7tOUqIv5mIzei+NBd1NUkQkYwZY=";
};
LC_ALL = "en_US.UTF-8";

40
pkgs/development/python-modules/glean-parser/default.nix
View file

@ -1,33 +1,34 @@
{ lib
, buildPythonPackage
, fetchPypi
, pytestCheckHook
, pythonOlder
, setuptools-scm
# build inputs
, appdirs
, buildPythonPackage
, click
, diskcache
, fetchPypi
, jinja2
, jsonschema
, pytestCheckHook
, pythonOlder
, pyyaml
, setuptools-scm
, yamllint
}:
buildPythonPackage rec {
pname = "glean_parser";
pname = "glean-parser";
version = "5.1.0";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-8oMbaGsW5Lkw9OluNsXXe2IBNbjeoIb9vDjVOt+uHR0=";
pname = "glean_parser";
inherit version;
hash = "sha256-8oMbaGsW5Lkw9OluNsXXe2IBNbjeoIb9vDjVOt+uHR0=";
};
postPatch = ''
substituteInPlace setup.py --replace "pytest-runner" ""
'';
nativeBuildInputs = [
setuptools-scm
];
propagatedBuildInputs = [
appdirs
@ -38,24 +39,29 @@ buildPythonPackage rec {
pyyaml
yamllint
];
nativeBuildInputs = [
setuptools-scm
];
checkInputs = [
pytestCheckHook
];
postPatch = ''
substituteInPlace setup.py \
--replace "pytest-runner" ""
'';
disabledTests = [
# https://bugzilla.mozilla.org/show_bug.cgi?id=1741668
"test_validate_ping"
];
pythonImportsCheck = [ "glean_parser" ];
pythonImportsCheck = [
"glean_parser"
];
meta = with lib; {
description = "Tools for parsing the metadata for Mozilla's glean telemetry SDK";
homepage = "https://github.com/mozilla/glean_parser";
license = licenses.mpl20;
maintainers = [ maintainers.kvark ];
maintainers = with maintainers; [ kvark ];
};
}

41
pkgs/development/python-modules/glean-sdk/default.nix
View file

@ -1,22 +1,27 @@
{ lib
, buildPythonPackage
, fetchPypi
, rustPlatform
, rustc
, cargo
, setuptools-rust
# build inputs
, cffi
, fetchPypi
, glean-parser
, iso8601
, pytest-localserver
, pytestCheckHook
, pythonOlder
, rustc
, rustPlatform
, setuptools-rust
}:
buildPythonPackage rec {
pname = "glean-sdk";
version = "44.0.0";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-gzLsBwq3wrFde5cEb5+oFLW4KrwoiZpr22JbJhNr1yk=";
hash = "sha256-gzLsBwq3wrFde5cEb5+oFLW4KrwoiZpr22JbJhNr1yk=";
};
cargoDeps = rustPlatform.fetchCargoTarball {
@ -26,22 +31,36 @@ buildPythonPackage rec {
};
nativeBuildInputs = [
rustc
cargo
setuptools-rust
rustc
rustPlatform.cargoSetupHook
setuptools-rust
];
propagatedBuildInputs = [
cffi
glean-parser
iso8601
];
pythonImportsCheck = [ "glean" ];
checkInputs = [
pytest-localserver
pytestCheckHook
];
postPatch = ''
substituteInPlace glean-core/python/setup.py \
--replace "glean_parser==5.0.1" "glean_parser>=5.0.1"
'';
pythonImportsCheck = [
"glean"
];
meta = with lib; {
description = "Modern cross-platform telemetry client libraries and are a part of the Glean project";
description = "Telemetry client libraries and are a part of the Glean project";
homepage = "https://mozilla.github.io/glean/book/index.html";
license = licenses.mpl20;
maintainers = [ maintainers.kvark ];
maintainers = with maintainers; [ kvark ];
};
}

3
pkgs/development/python-modules/nilearn/default.nix
View file

@ -12,7 +12,8 @@ buildPythonPackage rec {
checkInputs = [ pytestCheckHook ];
disabledTests = [ "test_clean_confounds" ]; # https://github.com/nilearn/nilearn/issues/2608
pytestFlagsArray = [ "nilearn" ];
# do subset of tests which don't fetch resources
pytestFlagsArray = [ "nilearn/connectome/tests" ];
propagatedBuildInputs = [
joblib

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

@ -2,13 +2,13 @@
buildPythonPackage rec {
pname = "robotframework";
version = "4.1.3";
version = "5.0";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "0j71awmfkwk7prz82kr1zbcl3nrih3396sshrygnqlrdjmgivd3p";
sha256 = "sha256-AblBSkTCUrYlX4M35IHUIw7j2PGzALbGXpApiJgZlWE=";
};
checkInputs = [ jsonschema ];

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

@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "scmrepo";
version = "0.0.8";
version = "0.0.13";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "iterative";
repo = pname;
rev = version;
hash = "sha256-9eKQz1edfSneY0vE9ESEQdaRyZzkqqNVuRCfhU3s85M=";
hash = "sha256-VWdewy4sfnM5zwDmeL8PdNZINN07rBosg4+GOWkkhVE=";
};
propagatedBuildInputs = [

18
pkgs/development/tools/analysis/cppcheck/default.nix
View file

@ -1,15 +1,19 @@
{ lib, stdenv, fetchurl, libxslt, docbook_xsl, docbook_xml_dtd_45, pcre, withZ3 ? true, z3 }:
{ lib, stdenv, fetchFromGitHub, libxslt, docbook_xsl, docbook_xml_dtd_45, pcre, withZ3 ? true, z3, python3 }:
stdenv.mkDerivation rec {
pname = "cppcheck";
version = "2.7";
version = "2.7.3";
src = fetchurl {
url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2";
sha256 = "sha256-rHTAlzxGoFJ2D0/3ymqEYWyleVUQVC0ZWm8SLFMHkpE=";
src = fetchFromGitHub {
owner = "danmar";
repo = "cppcheck";
rev = version;
sha256 = "0bwk89nkq67nphplb24daxvg75pv9bgh0kcqr2samhpzmjpvzxm5";
};
buildInputs = [ pcre ] ++ lib.optionals withZ3 [ z3 ];
buildInputs = [ pcre
(python3.withPackages (ps: [ps.pygments]))
] ++ lib.optionals withZ3 [ z3 ];
nativeBuildInputs = [ libxslt docbook_xsl docbook_xml_dtd_45 ];
makeFlags = [ "PREFIX=$(out)" "FILESDIR=$(out)/cfg" "HAVE_RULES=yes" ]
@ -19,6 +23,8 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
doCheck = true;
postInstall = ''
make DB2MAN=${docbook_xsl}/xml/xsl/docbook/manpages/docbook.xsl man
mkdir -p $man/share/man/man1

12
pkgs/development/tools/misc/d-feet/default.nix
View file

@ -1,6 +1,7 @@
{ lib
, pkg-config
, fetchurl
, fetchpatch
, meson
, ninja
, glib
@ -25,6 +26,17 @@ python3.pkgs.buildPythonApplication rec {
sha256 = "hzPOS5qaVOwYWx2Fv02p2dEQUogqiAdg/2D5d5stHMs=";
};
patches = [
# Fix build with meson 0.61
# data/meson.build:15:0: ERROR: Function does not take positional arguments.
# data/meson.build:27:0: ERROR: Function does not take positional arguments.
# Patch taken from https://gitlab.gnome.org/GNOME/d-feet/-/merge_requests/32
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/d-feet/-/commit/05465d486afdba116dbc22fc22c1e6573aea4f22.patch";
sha256 = "sFI3nd0YE/deGws/YcTpzC/em9QNgicyb4j7cTfOdhY=";
})
];
nativeBuildInputs = [
gettext
gobject-introspection

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

@ -54,11 +54,11 @@ let
in
stdenv.mkDerivation rec {
pname = "networkmanager";
version = "1.36.2";
version = "1.36.4";
src = fetchurl {
url = "mirror://gnome/sources/NetworkManager/${lib.versions.majorMinor version}/NetworkManager-${version}.tar.xz";
sha256 = "1aqc8z8zv1sds439ilihwqczwg9iqzki0f007fd2x0s17fz5r1db";
sha256 = "YTBOk33ZJkcdVnFb3t57q3zKyCc1bmfycA00MxfNPFk=";
};
outputs = [ "out" "dev" "devdoc" "man" "doc" ];

5
pkgs/tools/networking/xh/default.nix
View file

@ -38,6 +38,11 @@ rustPlatform.buildRustPackage rec {
--fish completions/xh.fish \
--zsh completions/_xh
installManPage doc/xh.1
ln -s $out/share/man/man1/xh.1 $out/share/man/man1/xhs.1
install -m444 -Dt $out/share/doc/xh README.md CHANGELOG.md
# https://github.com/ducaale/xh#xh-and-xhs
ln -s $out/bin/xh $out/bin/xhs
'';