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

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

Browse source
This commit is contained in:
Jonathan Ringer 2021-11-22 21:33:40 -08:00
parent 4b73049ccc ebbca75dc2
commit a7dda03a2e
No known key found for this signature in database
GPG key ID: 5C841D3CFDFEC4E0
17 changed files with 159 additions and 67 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
maintainers/team-list.nix
View file

@ -93,7 +93,6 @@ with lib.maintainers; {
cstrahan
Frostman
kalbasit
mdlayher
mic92
orivej
rvolosatovs

4
pkgs/applications/editors/ghostwriter/default.nix
View file

@ -14,13 +14,13 @@
mkDerivation rec {
pname = "ghostwriter";
version = "2.0.2";
version = "2.1.0";
src = fetchFromGitHub {
owner = "wereturtle";
repo = pname;
rev = version;
sha256 = "sha256-kNt0IIAcblDJ81ENIkoJuJvrI+F+fdVgWUJ6g1YpjqU=";
sha256 = "sha256-NPuwT0msFvGyS33X7lefdPZZ3AC4pZb1tvmOzzlQlgc=";
};
nativeBuildInputs = [ qmake pkg-config qttools ];

4
pkgs/applications/graphics/ImageMagick/7.0.nix
View file

@ -18,13 +18,13 @@ in
stdenv.mkDerivation rec {
pname = "imagemagick";
version = "7.1.0-14";
version = "7.1.0-15";
src = fetchFromGitHub {
owner = "ImageMagick";
repo = "ImageMagick";
rev = version;
sha256 = "sha256-w4h4KEfmDC/dDgtk7xgEnIYvSfPlKfsvdFhx43Tn9GA=";
sha256 = "sha256-M5BhCb5caknohwk0oncJBCBJs32p0EdNs4dNqRfDRYc=";
};
outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big

13
pkgs/applications/networking/mailreaders/thunderbird/no-buildconfig.patch Normal file
View file

@ -0,0 +1,13 @@
Remove about:buildconfig. If used as-is, it would add unnecessary runtime dependencies.
--- a/comm/mail/base/jar.mn
+++ b/comm/mail/base/jar.mn
@@ -119,9 +119,6 @@ messenger.jar:
% override chrome://mozapps/content/profile/profileDowngrade.js chrome://messenger/content/profileDowngrade.js
% override chrome://mozapps/content/profile/profileDowngrade.xhtml chrome://messenger/content/profileDowngrade.xhtml
-* content/messenger/buildconfig.html (content/buildconfig.html)
-% override chrome://global/content/buildconfig.html chrome://messenger/content/buildconfig.html
-
# L10n resources and overrides.
% override chrome://mozapps/locale/profile/profileDowngrade.dtd chrome://messenger/locale/profileDowngrade.dtd
% override chrome://global/locale/netError.dtd chrome://messenger/locale/netError.dtd

2
pkgs/applications/networking/mailreaders/thunderbird/packages.nix
View file

@ -18,6 +18,8 @@ rec {
sha512 = "4938f676ddeeba37da1f2086d76a2ef2c870738169f7e10b35b83e4ed772df634825ee25c28232df1ac1e3a18a9466e97dc7ee318abbf43f1f4ce6479a13975b";
};
patches = [
# The file to be patched is different from firefox's `no-buildconfig-ffx90.patch`.
./no-buildconfig.patch
];
meta = with lib; {

4
pkgs/applications/science/electronics/kicad/default.nix
View file

@ -209,8 +209,8 @@ stdenv.mkDerivation rec {
++ optionals (stable && with3d) [ "--set-default KISYS3DMOD ${packages3d}/share/kicad/modules/packages3d" ]
++ optionals (!stable)
[
"--set-default KICAD6_FOOTPRINT_DIR ${footprints}/share/kicad/modules"
"--set-default KICAD6_SYMBOL_DIR ${symbols}/share/kicad/library"
"--set-default KICAD6_FOOTPRINT_DIR ${footprints}/share/kicad/footprints"
"--set-default KICAD6_SYMBOL_DIR ${symbols}/share/kicad/symbols"
"--set-default KICAD6_TEMPLATE_DIR ${templates}/share/kicad/template"
"--prefix KICAD6_TEMPLATE_DIR : ${symbols}/share/kicad/template"
"--prefix KICAD6_TEMPLATE_DIR : ${footprints}/share/kicad/template"

42
pkgs/applications/science/electronics/kicad/versions.nix
View file

@ -3,49 +3,49 @@
{
"kicad" = {
kicadVersion = {
version = "5.1.11";
version = "5.1.12";
src = {
rev = "d6b7f2349bcdbc45b223e7fe0460d9f169343209";
sha256 = "03658kfd313lnvr4jihq1i72g2dfbzba8j1z2y4fxg3vrs54y7a0";
rev = "84ad8e8a86f13c0697f5cbed8c17977b6545ddc9";
sha256 = "0kgikchqxds3mp71nkg307mr4c1dgv8akbmksz4w9x8jg4i1mfqq";
};
};
libVersion = {
version = "5.1.11";
version = "5.1.12";
libSources = {
i18n.rev = "0b8cef6bd08818cc0360f240544733dce509da3f";
i18n.rev = "0ad3d7e469e31c8868ad83f90e22a9c18f16aa1f";
i18n.sha256 = "0y51l0r62cnxkvpc21732p3cx7pjvaqjih8193502hlv9kv1j9p6";
symbols.rev = "7d4cbbddceafa1f69858449e16ac7229abef3c9a";
symbols.rev = "97c0bfdd2f5ebe952bc90c60f080a8e41da60615";
symbols.sha256 = "1zdajim409570xzis53kmrbdcf7000v2vmc90f49h214lrx2zhr2";
templates.rev = "f4c74f4130c8432399089c8b2dc21319b769bbe9";
templates.rev = "eca0f632eb76c8f49de4d5a590c83543090d0b7d";
templates.sha256 = "1fbhn1l3j2rwc29aida9b408wif55i23bp9ddcs7dvf83smjm05g";
footprints.rev = "e53d53ac4a30959b03ed3297d7659ea82244fb45";
footprints.rev = "b65732f8ebd7ab894fd638f3f2bf4a4e9b24f653";
footprints.sha256 = "0qpii55dgv2gxqg1qq0dngdnbb9din790qi5qv0l6qqrzx843h5s";
packages3d.rev = "be0ba9377b4ec0f11a4b9aceda150eed93027f72";
packages3d.rev = "0ddd588650fede09766b704feb15d30bcb6e144f";
packages3d.sha256 = "12w7m5nbk9kcnlnlg4sk1sd7xgb9i2kxfi0jcbd0phs89qyl7wjr";
};
};
};
"kicad-unstable" = {
kicadVersion = {
version = "2021-07-12";
version = "6.0.0-rc1";
src = {
rev = "76a6177eb7fc2efe8b5fd522355e70c44a33b150";
sha256 = "1a94z29if73cnxjx75vkgasm339dasbrjwbg2zk1c35pfygnwrj5";
rev = "9fb05440b3ef3073613ecdeba6112aeb6b26c4df";
sha256 = "1j0hd6bpmd80dyvy9mz4n4rr8f849bdwdd4vs8vfbsswf0gxj734";
};
};
libVersion = {
version = "2021-07-12";
version = "6.0.0-rc1";
libSources = {
i18n.rev = "e89d9a89bec59199c1ade56ee2556591412ab7b0";
i18n.sha256 = "04zaqyhj3qr4ymyd3k5vjpcna64j8klpsygcgjcv29s3rdi8glfl";
symbols.rev = "a6f64c12c9cdea4cda25cdd2c92708e7eb461d46";
symbols.sha256 = "0j6ng3ysqlxcggjyq3bsgqzg6j50if74q2dpyrdh5pckfqvvmv20";
templates.rev = "073d1941c428242a563dcb5301ff5c7479fe9c71";
templates.sha256 = "14p06m2zvlzzz2w74y83f2zml7mgv5dhy2nyfkpblanxawrzxv1x";
footprints.rev = "1bacc7562198e2a2985df7f2fbcd7620b4fd0d46";
footprints.sha256 = "1h17q0xpl4k4klg3mafzsbl88wzrg73xjsh8llyni2jzs531545a";
packages3d.rev = "d8b7e8c56d535f4d7e46373bf24c754a8403da1f";
packages3d.sha256 = "0dh8ixg0w43wzj5h3164dz6l1vl4llwxhi3qcdgj1lgvrs28aywd";
symbols.rev = "27b627393a7f2733e965ed82a5533a757789cbb2";
symbols.sha256 = "0p1qay6h6ibkhcz1b8xszsihi432ddi8jgnan2xr5rl4539c4ydp";
templates.rev = "8c9ff3dadb9c75cf2932f11c09a46c0c9d84784b";
templates.sha256 = "0vbjy1v5923942ma0rqcp1dhylhxk1m4vyfxjxw13sizkrpmlwr1";
footprints.rev = "4ce2242095912e491f1690210d9cb2328363b268";
footprints.sha256 = "1zx13rrpiamxyv7y27mr5xsdz0d09hpwfgc2j496p3q41q2crlq0";
packages3d.rev = "1080b6e565e56bae9be46db2278a1542092d7a2d";
packages3d.sha256 = "0vwcbzq42hzjl4f0zjaswmiff1x59hv64g5n00mx1gl0gwngnyla";
};
};
};

7
pkgs/applications/system/glances/default.nix
View file

@ -1,5 +1,5 @@
{ stdenv, buildPythonApplication, fetchFromGitHub, isPyPy, lib
, defusedxml, future, psutil, setuptools
, defusedxml, future, packaging, psutil, setuptools
# Optional dependencies:
, bottle, pysnmp
, hddtemp
@ -9,14 +9,14 @@
buildPythonApplication rec {
pname = "glances";
version = "3.2.3.1";
version = "3.2.4.2";
disabled = isPyPy;
src = fetchFromGitHub {
owner = "nicolargo";
repo = "glances";
rev = "v${version}";
sha256 = "0h7y36z4rizl1lyxacq32vpmvbwn9w2nrvrxn791060cksfw4xwd";
sha256 = "0gql61lrav3f7wbsvgc1d6vf8r0xi5xs9rz9d3sqw3wj5m90w0vq";
};
# Some tests fail in the sandbox (they e.g. require access to /sys/class/power_supply):
@ -40,6 +40,7 @@ buildPythonApplication rec {
defusedxml
future
netifaces
packaging
psutil
pysnmp
setuptools

32
pkgs/applications/system/systemdgenie/default.nix Normal file
View file

@ -0,0 +1,32 @@
{ stdenv
, lib
, cmake
, extra-cmake-modules
, kxmlgui
, fetchFromGitLab
, kdelibs4support
, wrapQtAppsHook
}:
stdenv.mkDerivation rec{
pname = "systemdgenie";
version = "0.99.0";
src = fetchFromGitLab {
domain = "invent.kde.org";
repo = "SystemdGenie";
owner = "system";
rev = "v${version}";
hash = "sha256-y+A2OuK1ZooPY5W0SsXEb1aaOAJ2b7QSwiumolmAaR4=";
};
nativeBuildInputs = [ cmake extra-cmake-modules wrapQtAppsHook ];
buildInputs = [ kxmlgui kdelibs4support ];
meta = with lib; {
description = "Systemd management utility";
homepage = "https://kde.org";
license = licenses.gpl2;
maintainers = [ maintainers.pasqui23 ];
platforms = platforms.linux;
};
}

50
pkgs/applications/video/kaffeine/default.nix Normal file
View file

@ -0,0 +1,50 @@
{ stdenv
, lib
, fetchFromGitLab
, kio
, cmake
, extra-cmake-modules
, libvlc
, libX11
, kidletime
, kdelibs4support
, libXScrnSaver
, wrapQtAppsHook
, qtx11extras
}:
stdenv.mkDerivation rec {
pname = "kaffeine";
version = "2.0.18";
src = fetchFromGitLab {
domain = "invent.kde.org";
repo = pname;
owner = "Multimedia";
rev = "v${version}";
hash = "sha256-FOaS9gkzkHglbsNBNMwjzbHCNQg3Mbf+9so/Vfbaquc=";
};
nativeBuildInputs = [
cmake
extra-cmake-modules
wrapQtAppsHook
];
buildInputs = [
libvlc
libX11
kidletime
qtx11extras
kdelibs4support
libXScrnSaver
];
meta = with lib; {
description = "KDE media player";
homepage = "https://apps.kde.org/kaffeine/";
license = licenses.gpl2;
maintainers = [ maintainers.pasqui23 ];
platforms = platforms.all;
};
}

4
pkgs/development/interpreters/erlang/R24.nix
View file

@ -3,6 +3,6 @@
# How to obtain `sha256`:
# nix-prefetch-url --unpack https://github.com/erlang/otp/archive/OTP-${version}.tar.gz
mkDerivation {
version = "24.1.6";
sha256 = "sha256-Jh9w3+ft1RZjmb4PriCmHPj0tgkx8LBFjsg1s4BGojs=";
version = "24.1.7";
sha256 = "sha256-R4rZVMn9AGvOy31eA1dsz2CFMKOG/cXkbLaJtT7zBrU=";
}

3
pkgs/development/libraries/libcanberra/default.nix
View file

@ -65,8 +65,5 @@ stdenv.mkDerivation rec {
license = licenses.lgpl2Plus;
maintainers = [ ];
platforms = platforms.unix;
# canberra-gtk-module.c:28:10: fatal error: 'gdk/gdkx.h' file not found
# #include <gdk/gdkx.h>
broken = stdenv.isDarwin && (gtkSupport == "gtk3");
};
}

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

@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "greeclimate";
version = "0.12.5";
version = "1.0.0";
format = "setuptools";
disabled = pythonOlder "3.6";
@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "cmroche";
repo = "greeclimate";
rev = version;
sha256 = "sha256-Lu6DxYrK3WgRC09QQXZLIgYSIaWydcEofNiA1PKP8Ek=";
sha256 = "sha256-zaa3Z6w1BdmOV1otoewc1Zpvltnn5QDJHkAVldZCQlY=";
};
propagatedBuildInputs = [

1
pkgs/development/python-modules/hangups/default.nix
View file

@ -32,6 +32,7 @@ buildPythonPackage rec {
postPatch = ''
substituteInPlace setup.py \
--replace "protobuf>=3.1.0,<3.17" "protobuf" \
--replace "async-timeout>=2,<4" "async-timeout" \
--replace "MechanicalSoup>=0.6.0,<0.13" "MechanicalSoup"
'';

44
pkgs/development/tools/alloy/default.nix
View file

@ -1,16 +1,20 @@
{ lib, stdenv, fetchurl, jre, makeWrapper, makeDesktopItem }:
let generic = { major, version, src }:
let generic = { version, sha256 }:
stdenv.mkDerivation rec {
name = "${nameMajor}-${version}";
nameMajor = "alloy${major}";
pname = "alloy${lib.versions.major version}";
inherit version;
src = fetchurl {
inherit sha256;
url = "https://github.com/AlloyTools/org.alloytools.alloy/releases/download/v${version}/org.alloytools.alloy.dist.jar";
};
desktopItem = makeDesktopItem rec {
name = nameMajor;
name = pname;
exec = name;
icon = name;
desktopName = "Alloy ${major}";
desktopName = "Alloy ${lib.versions.major version}";
genericName = "Relational modelling tool";
comment = meta.description;
categories = "Development;IDE;Education;";
@ -19,14 +23,14 @@ let generic = { major, version, src }:
nativeBuildInputs = [ makeWrapper ];
buildCommand = ''
jar=$out/share/alloy/${nameMajor}.jar
jar=$out/share/alloy/${pname}.jar
install -Dm644 ${src} $jar
mkdir -p $out/bin
makeWrapper ${jre}/bin/java $out/bin/${nameMajor} --add-flags \
"-jar $jar"
makeWrapper ${jre}/bin/java $out/bin/${pname} --add-flags \
"-jar $jar"
install -Dm644 ${./icon.png} $out/share/pixmaps/${nameMajor}.png
install -Dm644 ${./icon.png} $out/share/pixmaps/${pname}.png
cp -r ${desktopItem}/share/applications $out/share
'';
@ -50,22 +54,14 @@ let generic = { major, version, src }:
};
in rec {
alloy4 = let version = "4.2_2015-02-22"; in generic {
major = "4";
inherit version;
src = fetchurl {
sha256 = "0p93v8jwx9prijpikkgmfdzb9qn8ljmvga5d9wvrkxddccjx9k28";
url = "http://alloytools.org/download/alloy${version}.jar";
};
alloy5 = generic rec {
version = "5.1.0";
sha256 = "02k9khs4k5nc86x9pp5k3vcb0kiwdgcin46mlap4fycnr673xd53";
};
alloy5 = let version = "5.1.0"; in generic {
major = "5";
inherit version;
src = fetchurl {
sha256 = "02k9khs4k5nc86x9pp5k3vcb0kiwdgcin46mlap4fycnr673xd53";
url = "https://github.com/AlloyTools/org.alloytools.alloy/releases/download/v${version}/org.alloytools.alloy.dist.jar";
};
alloy6 = generic rec {
version = "6.0.0";
sha256 = "sha256-rA7mNxcu0DWkykMyfV4JwFmQqg0HOIcwjjD4jCRxNww=";
};
alloy = alloy5;

5
pkgs/tools/networking/wireguard-tools/default.nix
View file

@ -37,11 +37,8 @@ stdenv.mkDerivation rec {
substituteInPlace $out/lib/systemd/system/wg-quick@.service \
--replace /usr/bin $out/bin
'' + lib.optionalString stdenv.isLinux ''
# we want to allow users to provide their own resolvconf implementation, i.e. the one provided by systemd-resolved
for f in $out/bin/*; do
wrapProgram $f \
--prefix PATH : ${lib.makeBinPath [ procps iproute2 iptables ]} \
--suffix PATH : ${lib.makeBinPath [ openresolv ]}
wrapProgram $f --prefix PATH : ${lib.makeBinPath [ procps iproute2 iptables openresolv ]}
done
'' + lib.optionalString stdenv.isDarwin ''
for f in $out/bin/*; do

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

@ -6697,6 +6697,8 @@ with pkgs;
};
kakouneUtils = callPackage ../applications/editors/kakoune/plugins/kakoune-utils.nix { };
kaffeine = libsForQt5.callPackage ../applications/video/kaffeine { };
kak-lsp = callPackage ../tools/misc/kak-lsp {
inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration;
};
@ -9844,6 +9846,8 @@ with pkgs;
inherit (xorg) xauth xorgserver;
};
systemdgenie = libsForQt5.callPackage ../applications/system/systemdgenie { };
t = callPackage ../tools/misc/t { };
tabnine = callPackage ../development/tools/tabnine { };
@ -13869,8 +13873,8 @@ with pkgs;
inherit (callPackage ../development/tools/alloy {
jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
})
alloy4
alloy5
alloy6
alloy;
altair = callPackage ../development/tools/altair-graphql-client { };