BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge master into haskell-updates

Browse source
This commit is contained in:
github-actions[bot] 2021-12-12 00:08:22 +00:00 committed by GitHub
commit 5708a53249
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
203 changed files with 2394 additions and 1626 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
nixos/modules/security/acme.nix
View file

@ -163,9 +163,8 @@ let
[ "--dns" data.dnsProvider ]
++ optionals (!data.dnsPropagationCheck) [ "--dns.disable-cp" ]
++ optionals (data.dnsResolver != null) [ "--dns.resolvers" data.dnsResolver ]
) else (
[ "--http" "--http.webroot" data.webroot ]
);
) else if data.listenHTTP != null then [ "--http" "--http.port" data.listenHTTP ]
else [ "--http" "--http.webroot" data.webroot ];
commonOpts = [
"--accept-tos" # Checking the option is covered by the assertions
@ -321,6 +320,8 @@ let
}
fi
'');
} // optionalAttrs (data.listenHTTP != null && toInt (elemAt (splitString ":" data.listenHTTP) 1) < 1024) {
AmbientCapabilities = "CAP_NET_BIND_SERVICE";
};
# Working directory will be /tmp
@ -454,6 +455,17 @@ let
'';
};
listenHTTP = mkOption {
type = types.nullOr types.str;
default = null;
example = ":1360";
description = ''
Interface and port to listen on to solve HTTP challenges
in the form [INTERFACE]:PORT.
If you use a port other than 80, you must proxy port 80 to this port.
'';
};
server = mkOption {
type = types.nullOr types.str;
default = null;
@ -783,6 +795,28 @@ in {
`security.acme.certs.${cert}.webroot` are mutually exclusive.
'';
}
{
assertion = data.webroot == null || data.listenHTTP == null;
message = ''
Options `security.acme.certs.${cert}.webroot` and
`security.acme.certs.${cert}.listenHTTP` are mutually exclusive.
'';
}
{
assertion = data.listenHTTP == null || data.dnsProvider == null;
message = ''
Options `security.acme.certs.${cert}.listenHTTP` and
`security.acme.certs.${cert}.dnsProvider` are mutually exclusive.
'';
}
{
assertion = data.dnsProvider != null || data.webroot != null || data.listenHTTP != null;
message = ''
One of `security.acme.certs.${cert}.dnsProvider`,
`security.acme.certs.${cert}.webroot`, or
`security.acme.certs.${cert}.listenHTTP` must be provided.
'';
}
]) cfg.certs));
users.users.acme = {

2
nixos/modules/services/misc/nitter.nix
View file

@ -299,7 +299,7 @@ in
systemd.services.nitter = {
description = "Nitter (An alternative Twitter front-end)";
wantedBy = [ "multi-user.target" ];
after = [ "syslog.target" "network.target" ];
after = [ "network.target" ];
serviceConfig = {
DynamicUser = true;
StateDirectory = "nitter";

2
nixos/modules/services/network-filesystems/openafs/server.nix
View file

@ -248,7 +248,7 @@ in {
systemd.services = {
openafs-server = {
description = "OpenAFS server";
after = [ "syslog.target" "network.target" ];
after = [ "network.target" ];
wantedBy = [ "multi-user.target" ];
restartIfChanged = false;
unitConfig.ConditionPathExists = [

2
nixos/modules/services/networking/adguardhome.nix
View file

@ -56,7 +56,7 @@ in
config = mkIf cfg.enable {
systemd.services.adguardhome = {
description = "AdGuard Home: Network-level blocker";
after = [ "syslog.target" "network.target" ];
after = [ "network.target" ];
wantedBy = [ "multi-user.target" ];
unitConfig = {
StartLimitIntervalSec = 5;

2
nixos/modules/services/networking/eternal-terminal.nix
View file

@ -67,7 +67,7 @@ in
eternal-terminal = {
description = "Eternal Terminal server.";
wantedBy = [ "multi-user.target" ];
after = [ "syslog.target" "network.target" ];
after = [ "network.target" ];
serviceConfig = {
Type = "forking";
ExecStart = "${pkgs.eternal-terminal}/bin/etserver --daemon --cfgfile=${pkgs.writeText "et.cfg" ''

9
nixos/modules/services/networking/xrdp.nix
View file

@ -97,6 +97,11 @@ in
'';
};
confDir = mkOption {
type = types.path;
default = confDir;
description = "The location of the config files for xrdp.";
};
};
};
@ -149,7 +154,7 @@ in
User = "xrdp";
Group = "xrdp";
PermissionsStartOnly = true;
ExecStart = "${cfg.package}/bin/xrdp --nodaemon --port ${toString cfg.port} --config ${confDir}/xrdp.ini";
ExecStart = "${cfg.package}/bin/xrdp --nodaemon --port ${toString cfg.port} --config ${cfg.confDir}/xrdp.ini";
};
};
@ -159,7 +164,7 @@ in
description = "xrdp session manager";
restartIfChanged = false; # do not restart on "nixos-rebuild switch". like "display-manager", it can have many interactive programs as children
serviceConfig = {
ExecStart = "${cfg.package}/bin/xrdp-sesman --nodaemon --config ${confDir}/sesman.ini";
ExecStart = "${cfg.package}/bin/xrdp-sesman --nodaemon --config ${cfg.confDir}/sesman.ini";
ExecStop = "${pkgs.coreutils}/bin/kill -INT $MAINPID";
};
};

2
nixos/modules/services/web-apps/invidious.nix
View file

@ -11,7 +11,7 @@ let
systemd.services.invidious = {
description = "Invidious (An alternative YouTube front-end)";
wants = [ "network-online.target" ];
after = [ "syslog.target" "network-online.target" ];
after = [ "network-online.target" ];
wantedBy = [ "multi-user.target" ];
script =

8
nixos/modules/services/web-apps/tt-rss.nix
View file

@ -18,11 +18,11 @@ let
tt-rss-config = let
password =
if (cfg.database.password != null) then
"${(escape ["'" "\\"] cfg.database.password)}"
"'${(escape ["'" "\\"] cfg.database.password)}'"
else if (cfg.database.passwordFile != null) then
"file_get_contents('${cfg.database.passwordFile}'"
"file_get_contents('${cfg.database.passwordFile}')"
else
""
null
;
in pkgs.writeText "config.php" ''
<?php
@ -40,7 +40,7 @@ let
putenv('TTRSS_DB_HOST=${optionalString (cfg.database.host != null) cfg.database.host}');
putenv('TTRSS_DB_USER=${cfg.database.user}');
putenv('TTRSS_DB_NAME=${cfg.database.name}');
putenv('TTRSS_DB_PASS=${password}');
putenv('TTRSS_DB_PASS=' ${optionalString (password != null) ". ${password}"});
putenv('TTRSS_DB_PORT=${toString dbPort}');
putenv('TTRSS_AUTH_AUTO_CREATE=${boolToString cfg.auth.autoCreate}');

10
pkgs/applications/audio/helio-workstation/default.nix
View file

@ -5,14 +5,14 @@
stdenv.mkDerivation rec {
pname = "helio-workstation";
version = "3.6";
version = "3.8";
src = fetchFromGitHub {
owner = "helio-fm";
repo = pname;
rev = version;
fetchSubmodules = true;
sha256 = "sha256-qW39g6rQ5VPQ3Hx9NmwLbpZiITnzFZDZlcLkE+pJKPc=";
sha256 = "sha256-uwRSOJ5WvDH4mfL9pCTCGzuSRT8SIBrI+Wsbumzejv0=";
};
buildInputs = [
@ -30,13 +30,13 @@ stdenv.mkDerivation rec {
installPhase = ''
mkdir -p $out/bin
install -Dm755 build/Helio $out/bin
wrapProgram $out/bin/Helio --prefix PATH ":" ${gnome.zenity}/bin
install -Dm755 build/helio $out/bin
wrapProgram $out/bin/helio --prefix PATH ":" ${gnome.zenity}/bin
mkdir -p $out/share
cp -r ../Deployment/Linux/Debian/x64/usr/share/* $out/share
substituteInPlace $out/share/applications/Helio.desktop \
--replace "/usr/bin/helio" "$out/bin/Helio"
--replace "/usr/bin/helio" "$out/bin/helio"
'';
meta = with lib; {

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

@ -3,12 +3,12 @@
mkDerivation rec {
pname = "jamulus";
version = "3.8.0";
version = "3.8.1";
src = fetchFromGitHub {
owner = "jamulussoftware";
repo = "jamulus";
rev = "r${lib.replaceStrings [ "." ] [ "_" ] version}";
sha256 = "sha256-Ni6N7XW34OFNuEkqBEgMcYGmIqb+UZ0uhLt/shRkWRs=";
sha256 = "sha256-QtlvcKVqKgRAO/leHy4CgvjNW49HAyZLI2JtKERP7HQ=";
};
nativeBuildInputs = [ pkg-config qmake ];

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

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "JMusicBot";
version = "0.3.4";
version = "0.3.6";
src = fetchurl {
url = "https://github.com/jagrosh/MusicBot/releases/download/${version}/JMusicBot-${version}.jar";
sha256 = "sha256-++/ot9k74pkN9Wl7IEjiMIv/q5zklIEdU6uFjam0tmU=";
sha256 = "sha256-Hc3dsOADC+jVZScY19OYDkHimntMjdw/BoB3EUS/d0k=";
};
dontUnpack = true;

9
pkgs/applications/audio/molot-lite/default.nix
View file

@ -1,18 +1,19 @@
{ lib, stdenv, fetchFromGitHub, lv2 }:
{ lib, stdenv, fetchFromGitHub, lv2, cairo, pkg-config }:
stdenv.mkDerivation rec {
pname = "molot-lite";
version = "1.0.0";
version = "1.1.0";
src = fetchFromGitHub {
owner = "magnetophon";
repo = pname;
rev = version;
sha256 = "0xbvicfk1rgp01nlg6hlym9bnygry0nrbv88mv7w6hnacvl63ba4";
sha256 = "sha256-0tmobsdCNon6udbkbQw7+EYQKBg2oaXlHIgNEf9U3XE=";
};
buildInputs = [ lv2 ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ lv2 cairo ];
makeFlags = [ "INSTALL_DIR=$out/lib/lv2" ];

4
pkgs/applications/backup/deja-dup/default.nix
View file

@ -21,14 +21,14 @@
stdenv.mkDerivation rec {
pname = "deja-dup";
version = "42.7";
version = "42.8";
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
owner = "World";
repo = pname;
rev = version;
sha256 = "1q66wccnph78cp1r5mln2iq4bcqdrrchxq3c1pjrzkmzwc6l93gz";
sha256 = "sha256-DkRqZAj47wzt4lDvhAbO0PYcRA7oHEo2k69IMLOD3Ps=";
};
patches = [

18
pkgs/applications/editors/nvpy/default.nix
View file

@ -1,20 +1,24 @@
{ pkgs, fetchurl, python2Packages }:
{ pkgs, fetchFromGitHub, python3Packages }:
let
pythonPackages = python2Packages;
pythonPackages = python3Packages;
in pythonPackages.buildPythonApplication rec {
version = "0.9.7";
version = "2.1.0";
pname = "nvpy";
src = fetchurl {
url = "https://github.com/cpbotha/nvpy/archive/v${version}.tar.gz";
sha256 = "1rd3vlaqkg16iz6qcw6rkbq0jmyvc0843wa3brnvn1nz0kla243f";
src = fetchFromGitHub {
owner = "cpbotha";
repo = pname;
rev = "v${version}";
sha256 = "02njvybd8yaqdnc5ghwrm8225z57gg4w7rhmx3w5jqzh16ld4mhh";
};
propagatedBuildInputs = with pythonPackages; [
markdown
tkinter
docutils
simplenote
tkinter
];
# No tests

4
pkgs/applications/gis/gmt/dcw.nix
View file

@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
pname = "dcw-gmt";
version = "1.1.4";
version = "2.0.1";
src = fetchurl {
url = "ftp://ftp.soest.hawaii.edu/gmt/dcw-gmt-${version}.tar.gz";
sha256 = "8d47402abcd7f54a0f711365cd022e4eaea7da324edac83611ca035ea443aad3";
sha256 = "sha256-XJCylo9Alc9epEo1TcnY+d0bj+VRTgM4/4W0jgNUeiU=";
};
installPhase = ''

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

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "fetchmail";
version = "6.4.22";
version = "6.4.24";
src = fetchurl {
url = "mirror://sourceforge/fetchmail/fetchmail-${version}.tar.xz";
sha256 = "sha256-zGgYvVlDVgIWn6KS1tFj1Wshx/UxEoKUcKOs6r5hLIQ=";
sha256 = "sha256-nJYd8lzZIvU5IYsLVqd+ekd3jkntkH7apbSUGtOyU88=";
};
buildInputs = [ openssl ];

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

@ -10,13 +10,13 @@
stdenv.mkDerivation rec {
pname = "free42";
version = "3.0.6";
version = "3.0.7";
src = fetchFromGitHub {
owner = "thomasokken";
repo = pname;
rev = "v${version}";
sha256 = "sha256-PIHokB7GlGtx1A0IqFX9+HA/Vab1CDpVS/qhk/y8Nzk=";
sha256 = "sha256-wGzZRp+7KBV/sxm08XCkCDx+A8nR9To5MCmcdWdlttM=";
};
nativeBuildInputs = [ copyDesktopItems pkg-config ];

4
pkgs/applications/misc/jotta-cli/default.nix
View file

@ -5,10 +5,10 @@ let
in
stdenv.mkDerivation rec {
pname = "jotta-cli";
version = "0.11.44593";
version = "0.12.51202";
src = fetchzip {
url = "https://repo.jotta.us/archives/linux/${arch}/jotta-cli-${version}_linux_${arch}.tar.gz";
sha256 = "1f06zmcpvm0f3phwc43ai6v4ykhkrd4f3br2j89nx9bfmj6ss2ic";
sha256 = "sha256-B7Rn/0hFVUsEK2Wo8KbqAnzOwQmMKkAssfmaN3dPAUY=";
stripRoot = false;
};

16
pkgs/applications/misc/loxodo/default.nix
View file

@ -1,17 +1,17 @@
{ lib, python2, fetchFromGitHub }:
{ lib, python3, fetchFromGitHub }:
python2.pkgs.buildPythonApplication {
python3.pkgs.buildPythonApplication {
pname = "loxodo";
version = "unstable-2015-01-24";
version = "unstable-2021-02-08";
src = fetchFromGitHub {
owner = "sommer";
repo = "loxodo";
rev = "6c56efb4511fd6f645ad0f8eb3deafc8071c5795";
sha256 = "1cg0dfcv57ps54f1a0ksib7hgkrbdi9q699w302xyyfyvjcb5dd2";
rev = "7add982135545817e9b3e2bbd0d27a2763866133";
sha256 = "1cips4pvrqga8q1ibs23vjrf8dwan860x8jvjmc52h6qvvvv60yl";
};
propagatedBuildInputs = with python2.pkgs; [ wxPython ];
propagatedBuildInputs = with python3.pkgs; [ six wxPython_4_0 ];
postInstall = ''
mv $out/bin/loxodo.py $out/bin/loxodo
@ -20,13 +20,15 @@ python2.pkgs.buildPythonApplication {
[Desktop Entry]
Type=Application
Exec=$out/bin/loxodo
Icon=$out/lib/${python2.libPrefix}/site-packages/resources/loxodo-icon.png
Icon=$out/lib/${python3.libPrefix}/site-packages/resources/loxodo-icon.png
Name=Loxodo
GenericName=Password Vault
Categories=Application;Other;
EOF
'';
doCheck = false; # Tests are interactive.
meta = with lib; {
description = "A Password Safe V3 compatible password vault";
homepage = "https://www.christoph-sommer.de/loxodo/";

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

@ -5,13 +5,13 @@
python3Packages.buildPythonApplication rec {
pname = "pdfarranger";
version = "1.8.0";
version = "1.8.1";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = version;
sha256 = "0xfxcwb24rp0kni2b4wdk6fvhqnhd6fh559ag6wdr4sspzkqwdjf";
sha256 = "1lcmlr7x4143f7wcn0m1ijlvch07nww2qfp3jfnacgy889ijvbfx";
};
nativeBuildInputs = [

9
pkgs/applications/misc/rofi/default.nix
View file

@ -1,7 +1,8 @@
{ stdenv
, lib
, fetchFromGitHub
, autoreconfHook
, meson
, ninja
, pkg-config
, libxkbcommon
, pango
@ -22,14 +23,14 @@
stdenv.mkDerivation rec {
pname = "rofi-unwrapped";
version = "1.7.0";
version = "1.7.2";
src = fetchFromGitHub {
owner = "davatorium";
repo = "rofi";
rev = version;
fetchSubmodules = true;
sha256 = "03wdy56b3g8p2czb0qydrddyyhj3x037pirnhyqr5qbfczb9a63v";
sha256 = "vre8kFou01P7S6KBBtfzvfFP554mhV+d6rjvY+GfWXk=";
};
preConfigure = ''
@ -38,7 +39,7 @@ stdenv.mkDerivation rec {
sed -i 's/~root/~nobody/g' test/helper-expand.c
'';
nativeBuildInputs = [ autoreconfHook pkg-config ];
nativeBuildInputs = [ meson ninja pkg-config ];
buildInputs = [
libxkbcommon
pango

12
pkgs/applications/misc/zola/default.nix
View file

@ -9,20 +9,22 @@
, CoreServices
, installShellFiles
, libsass
, zola
, testVersion
}:
rustPlatform.buildRustPackage rec {
pname = "zola";
version = "0.15.0";
version = "0.15.2";
src = fetchFromGitHub {
owner = "getzola";
repo = "zola";
rev = "v${version}";
sha256 = "152ydi2gxfhyqsw6i79f9h1xwvwfq729likbagjy5z2bv822m44v";
sha256 = "sha256-X4J3T/ob0NfCFxddadBtsPsDhfvesg6/sBJybWeubMM=";
};
cargoSha256 = "0bv2yyqy9l896p0dk1668ayw3xf71h9ddyymimx44j6nw389fxx3";
cargoSha256 = "sha256-0tynm/DTX2oiqZOdWjRBGPk8IPIN07x2+FCXQmQ4Fzo=";
nativeBuildInputs = [
cmake
@ -46,13 +48,13 @@ rustPlatform.buildRustPackage rec {
--bash completions/zola.bash
'';
passthru.tests.version = testVersion { package = zola; };
meta = with lib; {
description = "A fast static site generator with everything built-in";
homepage = "https://www.getzola.org/";
changelog = "https://github.com/getzola/zola/raw/v${version}/CHANGELOG.md";
license = licenses.mit;
maintainers = with maintainers; [ dandellion dywedir _0x4A6F ];
# set because of unstable-* version
mainProgram = "zola";
};
}

4
pkgs/applications/networking/browsers/brave/default.nix
View file

@ -93,11 +93,11 @@ in
stdenv.mkDerivation rec {
pname = "brave";
version = "1.32.113";
version = "1.32.115";
src = fetchurl {
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
sha256 = "PucDKfNPwos5LKzftdXR9Hkkf1UDzHULgyFIdjPiI4g=";
sha256 = "6DY3gLyaMSkjZEPR9o1hiuFFsL22bTeq2SN9Nt3DCSc=";
};
dontConfigure = true;

6
pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
View file

@ -87,7 +87,7 @@ let
fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ];
# Upstream source
version = "11.0";
version = "11.0.2";
lang = "en-US";
@ -97,7 +97,7 @@ let
"https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"
"https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"
];
sha256 = "0938a9yjfg9qa9rv5acrmbgqq11mc8j0pvl1n64jrdz29crk6sj2";
sha256 = "1bqlb8dlh92dpl9gmfh3yclq5ii09vv333yisa0i5gpwwzajnh5s";
};
i686-linux = fetchurl {
@ -105,7 +105,7 @@ let
"https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"
"https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"
];
sha256 = "07v1ca66a69jl238qdq81mw654yffrcyq685y4rvv8xvx11fnzzp";
sha256 = "1blp4z9rmnnsvl3bk0ajdccvpzfshnpyijjfiqb9ma02qw2z0gff";
};
};
in

6
pkgs/applications/networking/cluster/kpt/default.nix
View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "kpt";
version = "0.38.1";
version = "0.39.2";
src = fetchFromGitHub {
owner = "GoogleContainerTools";
repo = pname;
rev = "v${version}";
sha256 = "sha256-gJAdxg/evsQ+mKsNx/migDMK5lCZ2qSrksbsGDr4fmU=";
sha256 = "sha256-PG4SzycXRguKyaQ7LDnTtxF3EgqcjfjeEWD5rROXBPI=";
};
vendorSha256 = "sha256-GvkT51JudEdPz6zbqyf5qY6P2AbsaSMbirnxXmza5aI=";
vendorSha256 = "sha256-CoXlUX9hkP8gijA/vg19AS9030w95A2oKGD1wjzO8ak=";
subPackages = [ "." ];

23
pkgs/applications/networking/cluster/kubectl-tree/default.nix Normal file
View file

@ -0,0 +1,23 @@
{ lib, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "kubectl-tree";
version = "0.4.1";
src = fetchFromGitHub {
owner = "ahmetb";
repo = pname;
rev = "v${version}";
sha256 = "sha256-5+INUr7ewSJrFwdhDgdrRu+xDB3FkWRjWbbVJO8cgkc=";
};
vendorSha256 = "sha256-/GLzIoFHXpTmY2601zA83tB2V2XS0rWy1bEDQ6P6D8k=";
meta = with lib; {
description = "kubectl plugin to browse Kubernetes object hierarchies as a tree";
homepage = "https://github.com/ahmetb/kubectl-tree";
changelog = "https://github.com/ahmetb/kubectl-tree/releases/tag/v${version}";
license = licenses.asl20;
maintainers = [ maintainers.ivankovnatsky ];
};
}

4
pkgs/applications/networking/cluster/tilt/default.nix
View file

@ -5,13 +5,13 @@ buildGoModule rec {
/* Do not use "dev" as a version. If you do, Tilt will consider itself
running in development environment and try to serve assets from the
source tree, which is not there once build completes. */
version = "0.22.15";
version = "0.23.2";
src = fetchFromGitHub {
owner = "tilt-dev";
repo = pname;
rev = "v${version}";
sha256 = "sha256-Aim80bg1vGRkiIlVqDa4qOFQ+mwSOL75HOPYQYovYlE=";
sha256 = "sha256-lCo+sTkbqpbCI9aCh/QqlDw7jzYzKt3Gf67shvBIc7k=";
};
vendorSha256 = null;

4
pkgs/applications/networking/flexget/default.nix
View file

@ -2,14 +2,14 @@
python3Packages.buildPythonApplication rec {
pname = "flexget";
version = "3.2.1";
version = "3.2.4";
# Fetch from GitHub in order to use `requirements.in`
src = fetchFromGitHub {
owner = "flexget";
repo = "flexget";
rev = "v${version}";
sha256 = "sha256-EOE72zpQj2yxxqDL9gqmu1NQ1B/lY1fh3EUwqpxf2xg=";
sha256 = "sha256-kwvZvIu+uACI2vBBy9eVuLLJlv1evUJ/4gI6rx1NW/g=";
};
postPatch = ''

3
pkgs/applications/networking/gmailctl/default.nix
View file

@ -34,7 +34,6 @@ buildGoModule rec {
description = "Declarative configuration for Gmail filters";
homepage = "https://github.com/mbrt/gmailctl";
license = licenses.mit;
maintainers = [ maintainers.doronbehar ];
platforms = platforms.unix;
maintainers = with maintainers; [ doronbehar SuperSandro2000 ];
};
}

4
pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
View file

@ -24,7 +24,7 @@ let
in stdenv.mkDerivation rec {
pname = "signal-desktop";
version = "5.25.0"; # Please backport all updates to the stable channel.
version = "5.25.1"; # Please backport all updates to the stable channel.
# All releases have a limited lifetime and "expire" 90 days after the release.
# When releases "expire" the application becomes unusable until an update is
# applied. The expiration date for the current release can be extracted with:
@ -34,7 +34,7 @@ in stdenv.mkDerivation rec {
src = fetchurl {
url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
sha256 = "0ql9rzxrisqms3plcrmf3fjinpxba10asmpsxvhn0zlfajy47d0a";
sha256 = "1b634sy2bac5i548g1z1fd5qqy8jr6abl5kbhq50d1kmwnqy1a5l";
};
nativeBuildInputs = [

27
pkgs/applications/networking/instant-messengers/signald/default.nix
View file

@ -1,15 +1,15 @@
{ lib, stdenv, fetchurl, fetchFromGitLab, jre_headless, coreutils, gradle_6, git, perl
{ lib, stdenv, fetchurl, fetchFromGitLab, jdk17_headless, coreutils, gradle_6, git, perl
, makeWrapper }:
let
pname = "signald";
version = "0.14.1";
version = "0.15.0";
src = fetchFromGitLab {
owner = pname;
repo = pname;
rev = version;
sha256 = "K/G5+w1GINLZwJIG5a7u0TxlGe+Cyp4wQm+pgm28qCA=";
sha256 = "ftK+oeqzJ+TxrlvqivFkAi5RCcyJ5Y0oQAJuo0YheBg=";
};
buildConfigJar = fetchurl {
@ -17,15 +17,10 @@ let
sha256 = "0y1f42y7ilm3ykgnm6s3ks54d71n8lsy5649xgd9ahv28lj05x9f";
};
postPatch = ''
patchShebangs gradlew
sed -i -e 's|BuildConfig.jar|${buildConfigJar}|' build.gradle
'';
# fake build to pre-download deps into fixed-output derivation
deps = stdenv.mkDerivation {
name = "${pname}-deps";
inherit src version postPatch;
pname = "${pname}-deps";
inherit src version;
nativeBuildInputs = [ gradle_6 perl ];
buildPhase = ''
export GRADLE_USER_HOME=$(mktemp -d)
@ -43,16 +38,20 @@ let
outputHashMode = "recursive";
# Downloaded jars differ by platform
outputHash = {
x86_64-linux = "/gJFoT+vvdSWr33oI44XiZXlFfyUjtRVB1M6CMzSztM=";
aarch64-linux = "v71stMWBbNALasfGAHvsVTBaDOZfpKK3sQrjNJ6FG1A=";
x86_64-linux = "gEaOOsELhfKC1cFV8tqRHbBUI6+M/cDOaqN8FQ1J/TE=";
aarch64-linux = "UhnQ+Ge48/NdTqUWIxd0VNadHFvQ9awBTtn65Nz3+UM=";
}.${stdenv.system} or (throw "Unsupported platform");
};
in stdenv.mkDerivation rec {
inherit pname src version postPatch;
inherit pname src version;
patches = [ ./gradle-plugin.patch ];
postPatch = ''
sed -i 's|BuildConfig.jar|${buildConfigJar}|' build.gradle
'';
buildPhase = ''
runHook preBuild
@ -73,7 +72,7 @@ in stdenv.mkDerivation rec {
tar xvf ./build/distributions/signald.tar --strip-components=1 --directory $out/
wrapProgram $out/bin/signald \
--prefix PATH : ${lib.makeBinPath [ coreutils ]} \
--set JAVA_HOME "${jre_headless}"
--set JAVA_HOME "${jdk17_headless}"
runHook postInstall
'';

5
pkgs/applications/networking/mullvad-vpn/default.nix
View file

@ -33,6 +33,7 @@ let deps = [
xorg.libXrender
xorg.libXtst
xorg.libxcb
xorg.libxshmfence
nspr
nss
systemd
@ -42,11 +43,11 @@ in
stdenv.mkDerivation rec {
pname = "mullvad-vpn";
version = "2021.5";
version = "2021.6";
src = fetchurl {
url = "https://github.com/mullvad/mullvadvpn-app/releases/download/${version}/MullvadVPN-${version}_amd64.deb";
sha256 = "186va4pllimmcqnlbry5ni8gi8p3mbpgjf7sdspmhy2hlfjvlz47";
sha256 = "0vpahryw4hm1k9p4vang84ji88znz67s7wxnwqndf02a627n7fcm";
};
nativeBuildInputs = [

13
pkgs/applications/science/chemistry/cp2k/default.nix
View file

@ -1,6 +1,8 @@
{ lib, stdenv, fetchFromGitHub, python3, gfortran, blas, lapack
, fftw, libint, libvori, libxc, mpi, gsl, scalapack, openssh, makeWrapper
, libxsmm, spglib, which, elpa, pkg-config
, libxsmm, spglib, which, pkg-config
, enableElpa ? false
, elpa
} :
let
@ -21,7 +23,6 @@ in stdenv.mkDerivation rec {
nativeBuildInputs = [ python3 which openssh makeWrapper pkg-config ];
buildInputs = [
elpa
gfortran
fftw
gsl
@ -33,7 +34,7 @@ in stdenv.mkDerivation rec {
scalapack
blas
lapack
];
] ++ lib.optional enableElpa elpa;
propagatedBuildInputs = [ mpi ];
propagatedUserEnvPkgs = [ mpi ];
@ -61,20 +62,20 @@ in stdenv.mkDerivation rec {
AR = ar -r
DFLAGS = -D__FFTW3 -D__LIBXC -D__LIBINT -D__parallel -D__SCALAPACK \
-D__MPI_VERSION=3 -D__F2008 -D__LIBXSMM -D__SPGLIB \
-D__MAX_CONTR=4 -D__LIBVORI -D__ELPA
-D__MAX_CONTR=4 -D__LIBVORI ${lib.optionalString enableElpa "-D__ELPA"}
CFLAGS = -fopenmp
FCFLAGS = \$(DFLAGS) -O2 -ffree-form -ffree-line-length-none \
-ftree-vectorize -funroll-loops -msse2 \
-std=f2008 \
-fopenmp -ftree-vectorize -funroll-loops \
-I${libxc}/include -I${libxsmm}/include \
-I${libint}/include $(pkg-config --variable=fcflags elpa)
-I${libint}/include ${lib.optionalString enableElpa "$(pkg-config --variable=fcflags elpa)"}
LIBS = -lfftw3 -lfftw3_threads \
-lscalapack -lblas -llapack \
-lxcf03 -lxc -lxsmmf -lxsmm -lsymspg \
-lint2 -lstdc++ -lvori \
-lgomp -lpthread -lm \
-fopenmp $(pkg-config --libs elpa)
-fopenmp ${lib.optionalString enableElpa "$(pkg-config --libs elpa)"}
LDFLAGS = \$(FCFLAGS) \$(LIBS)
EOF
'';

4
pkgs/applications/science/chemistry/gwyddion/default.nix
View file

@ -35,10 +35,10 @@ in
stdenv.mkDerivation rec {
pname = "gwyddion";
version = "2.59";
version = "2.60";
src = fetchurl {
url = "mirror://sourceforge/gwyddion/gwyddion-${version}.tar.xz";
sha256 = "sha256-APMOJeZt/zp8JvXghKZ5lQFRKWO/4TVDORok8qAgEBk=";
sha256 = "sha256-38PIardlOzDrVKWvV4AiQlecTYmwYegtzRya713Au/Y=";
};
nativeBuildInputs = [ pkg-config file ];

4
pkgs/applications/science/logic/cryptoverif/default.nix
View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "cryptoverif";
version = "2.04";
version = "2.05";
src = fetchurl {
url = "http://prosecco.gforge.inria.fr/personal/bblanche/cryptoverif/cryptoverif${version}.tar.gz";
sha256 = "1mzk6n0g2vdsv38y493zg85lxrpz72b92cmsray3g970xzanqd6s";
sha256 = "sha256-F5eVN5ATYo9Ivpi2eYh96ktuTWUeoqgWMR4BqHu8EFs=";
};
buildInputs = [ ocaml ];

4
pkgs/applications/science/math/gretl/default.nix
View file

@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
pname = "gretl";
version = "2021b";
version = "2021d";
src = fetchurl {
url = "mirror://sourceforge/gretl/${pname}-${version}.tar.xz";
sha256 = "sha256-3KSAA0UPx3cqMXf/G5nrlCfLjWcDiGtzvJe/syRyE6c=";
sha256 = "sha256-zij337P/MemCwvMah2bUE3odv0Kf/KW6fUl2OgMzjuI=";
};
buildInputs = [

4
pkgs/applications/version-management/cvs-fast-export/default.nix
View file

@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
pname = "cvs-fast-export";
version = "1.58";
version = "1.59";
src = fetchurl {
url = "http://www.catb.org/~esr/cvs-fast-export/cvs-fast-export-${version}.tar.gz";
sha256 = "sha256-jY/GURa6WzULwpnoqBmzVQdK4WH95tf59v07y8gHeWM=";
sha256 = "sha256-JDnNg/VMmPJI6F07o77L4ChYDollLFB1YCL75WSp6No=";
};
strictDeps = true;

4
pkgs/applications/video/bino3d/default.nix
View file

@ -2,11 +2,11 @@
mkDerivation rec {
pname = "bino";
version = "1.6.7";
version = "1.6.8";
src = fetchurl {
url = "https://bino3d.org/releases/${pname}-${version}.tar.xz";
sha256 = "04yl7ibnhajlli4a5x77az8jxbzw6b2wjay8aa6px551nmiszn9k";
sha256 = "sha256-8sIdX+qm7CGPHIziFBHHIe+KEbhbwDY6w/iRm1V+so4=";
};
nativeBuildInputs = [ pkg-config ];

4
pkgs/applications/video/kodi-packages/inputstream-adaptive/default.nix
View file

@ -2,13 +2,13 @@
buildKodiBinaryAddon rec {
pname = "inputstream-adaptive";
namespace = "inputstream.adaptive";
version = "2.6.23";
version = "19.0.0";
src = fetchFromGitHub {
owner = "xbmc";
repo = "inputstream.adaptive";
rev = "${version}-${rel}";
sha256 = "sha256-3w/fMaGqaOHSE7GUJtYoWovBKSOv3sNOIX1UOcp8hQE=";
sha256 = "sha256-o3tiNEVc17RIlEgf3V2oOK04da0DpmexT9m8m/xtI4I=";
};
extraNativeBuildInputs = [ gtest ];

4
pkgs/applications/video/kodi-packages/inputstream-ffmpegdirect/default.nix
View file

@ -3,13 +3,13 @@
buildKodiBinaryAddon rec {
pname = "inputstream-ffmpegdirect";
namespace = "inputstream.ffmpegdirect";
version = "1.21.8";
version = "19.0.0";
src = fetchFromGitHub {
owner = "xbmc";
repo = "inputstream.ffmpegdirect";
rev = "${version}-${rel}";
sha256 = "0iq89vfb3p3b5qhivxs95xk122vgmbpixdvqpmkxp19rlyn3z9j6";
sha256 = "sha256-qdN2tmwS6uD9wrHnKC3iNvHnA2WlJAoNhdwvw16/L0U=";
};
extraBuildInputs = [ bzip2 zlib kodi.ffmpeg ];

4
pkgs/applications/video/kodi-packages/inputstream-rtmp/default.nix
View file

@ -3,13 +3,13 @@
buildKodiBinaryAddon rec {
pname = "inputstream-rtmp";
namespace = "inputstream.rtmp";
version = "3.4.0";
version = "19.0.0";
src = fetchFromGitHub {
owner = "xbmc";
repo = "inputstream.rtmp";
rev = "${version}-${rel}";
sha256 = "1q4k6plkjasnjs7gnbcc1x2mwr562ach7bkqk1z1y343s0dp9qnq";
sha256 = "sha256-76yGttcLJJ5XJKsFJ3GnEuPs9+9J0Tr8Znm45676OI8=";
};
extraBuildInputs = [ openssl rtmpdump zlib ];

4
pkgs/applications/video/kodi-packages/pvr-hdhomerun/default.nix
View file

@ -2,13 +2,13 @@
buildKodiBinaryAddon rec {
pname = "pvr-hdhomerun";
namespace = "pvr.hdhomerun";
version = "7.1.1";
version = "19.0.0";
src = fetchFromGitHub {
owner = "kodi-pvr";
repo = "pvr.hdhomerun";
rev = "${version}-${rel}";
sha256 = "sha256-mQeeeCOxhUTiUcOJ1OiIiJ+7envAIGO67Bp4EAf4sIE=";
sha256 = "sha256-KaT+BPRrkhw5R18aUNdnA9PKXF87EzwQLaY9ep86OvE=";
};
extraBuildInputs = [ jsoncpp libhdhomerun ];

4
pkgs/applications/video/kodi-packages/pvr-hts/default.nix
View file

@ -2,13 +2,13 @@
buildKodiBinaryAddon rec {
pname = "pvr-hts";
namespace = "pvr.hts";
version = "8.3.4";
version = "19.0.3";
src = fetchFromGitHub {
owner = "kodi-pvr";
repo = "pvr.hts";
rev = "${version}-${rel}";
sha256 = "15gv499r6jf89chp7xpv0z4v0nia907czs83lz57lxydqcbmmjnn";
sha256 = "sha256-kO+wRFt4MudYP9UOTaruRCWs/QMla+BYTRfSUdlVpR8=";
};
meta = with lib; {

4
pkgs/applications/video/kodi-packages/pvr-iptvsimple/default.nix
View file

@ -6,13 +6,13 @@
buildKodiBinaryAddon rec {
pname = "pvr-iptvsimple";
namespace = "pvr.iptvsimple";
version = "7.6.9";
version = "19.0.2";
src = fetchFromGitHub {
owner = "kodi-pvr";
repo = "pvr.iptvsimple";
rev = "${version}-${rel}";
sha256 = "1nj4qgr35cw5ly16w2fdgscz5245d7mgvm4sxgxy19jkyv7jmzn3";
sha256 = "sha256-WPLXESP5QvjroCygzMQc3+QKbsA05ri0oKvsqBQv8w0=";
};
extraBuildInputs = [

4
pkgs/applications/video/obs-studio/plugins/obs-websocket.nix
View file

@ -11,13 +11,13 @@
stdenv.mkDerivation rec {
pname = "obs-websocket";
version = "4.9.0";
version = "4.9.1";
src = fetchFromGitHub {
owner = "Palakis";
repo = "obs-websocket";
rev = version;
sha256 = "1dxih5czcfs1vczbq48784jvmgs8awbsrwk8mdfi4pg8n577cr1w";
sha256 = "sha256-XCiSNWTiA/u+3IbYlhIc5bCjKjLHDRVjYIG5MEoYnr0=";
};
nativeBuildInputs = [ cmake ];

6
pkgs/applications/virtualization/docker/compose.nix
View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "docker-compose";
version = "2.0.1";
version = "2.2.2";
src = fetchFromGitHub {
owner = "docker";
repo = "compose";
rev = "v${version}";
sha256 = "sha256-6OjA3f6c9s/86UPxy9EqLIc/0ZuW6UhKyQdkM7YoTsU=";
sha256 = "sha256-2wNC3APKbJ3Ug8M3w4nllfWlKTd10W7W/Csq/3xbXAI=";
};
vendorSha256 = "sha256-6h36TZmo0RvB3YzZRmsrs2Fbl+8zPTuL9LxWkuNgRqw=";
vendorSha256 = "sha256-RzAQnuOjT8eMH+rJm+/JrF96PZbCgzDVNPQYUeXPWnY=";
doCheck = false;
installPhase = ''

4
pkgs/applications/virtualization/virt-manager/default.nix
View file

@ -47,10 +47,14 @@ python3Packages.buildPythonApplication rec {
setupPyGlobalFlags = [ "--no-update-icon-cache" ];
dontWrapGApps = true;
preFixup = ''
gappsWrapperArgs+=(--set PYTHONPATH "$PYTHONPATH")
# these are called from virt-install in initrdinject.py
gappsWrapperArgs+=(--prefix PATH : "${makeBinPath [ cpio e2fsprogs file findutils gzip ]}")
makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
'';
checkInputs = with python3Packages; [ cpio cdrtools pytestCheckHook ];

4
pkgs/build-support/vm/default.nix
View file

@ -90,6 +90,10 @@ rec {
done
mount -t devtmpfs devtmpfs /dev
ln -s /proc/self/fd /dev/fd
ln -s /proc/self/fd/0 /dev/stdin
ln -s /proc/self/fd/1 /dev/stdout
ln -s /proc/self/fd/2 /dev/stderr
ifconfig lo up

4
pkgs/data/documentation/gnome-user-docs/default.nix
View file

@ -9,11 +9,11 @@
stdenv.mkDerivation rec {
pname = "gnome-user-docs";
version = "41.0";
version = "41.1";
src = fetchurl {
url = "mirror://gnome/sources/gnome-user-docs/${lib.versions.major version}/${pname}-${version}.tar.xz";
sha256 = "0lfxj8irwm88n3ba351ak85r97pqlds6y2hqbsic714yj4k8df1a";
sha256 = "Ve499XfRcX/BUvwq64nQr3qeyoZsiXTGdfYL1jCIjEg=";
};
nativeBuildInputs = [

13
pkgs/desktops/gnome/core/evince/default.nix
View file

@ -1,5 +1,7 @@
{ lib, stdenv
{ lib
, stdenv
, fetchurl
, fetchpatch
, meson
, ninja
, pkg-config
@ -57,9 +59,12 @@ stdenv.mkDerivation rec {
patches = lib.optionals withPantheon [
# Make this respect dark mode settings from Pantheon
# https://github.com/elementary/evince
# The patch currently differs from upstream (updated for evince 41).
./pantheon-dark-style.patch
# https://github.com/elementary/evince/pull/21
# https://github.com/elementary/evince/pull/31
(fetchpatch {
url = "https://raw.githubusercontent.com/elementary/evince/c8364019ee2c2dffd2a1bccf79b8f4e526aa22af/dark-style.patch";
sha256 = "sha256-nKELRXnM6gMRTGmWdO1Qqlo9ciy+4HOK5z2CYOoi2Lo=";
})
];
postPatch = ''

86
pkgs/desktops/gnome/core/evince/pantheon-dark-style.patch
View file

@ -1,86 +0,0 @@
diff --git a/meson.build b/meson.build
index bcb69cf7..4a18c08c 100644
--- a/meson.build
+++ b/meson.build
@@ -162,6 +162,7 @@ gmodule_dep = dependency('gmodule-2.0')
gmodule_no_export_dep = dependency('gmodule-no-export-2.0', version: glib_req_version)
gtk_dep = dependency('gtk+-3.0', version: gtk_req_version)
gthread_dep = dependency('gthread-2.0', version: glib_req_version)
+granite_dep = dependency('granite')
# Keep the version here synchronised with subprojects/libhandy.wrap
hdy_dep = dependency('libhandy-1', version: hdy_req_version, fallback: ['libhandy', 'libhandy_dep'])
diff --git a/shell/ev-application.c b/shell/ev-application.c
index e704bda2..d705328c 100644
--- a/shell/ev-application.c
+++ b/shell/ev-application.c
@@ -30,6 +30,7 @@
#include <glib/gi18n.h>
#include <glib/gstdio.h>
#include <gtk/gtk.h>
+#include <granite.h>
#include <handy.h>
#ifdef GDK_WINDOWING_X11
#include <gdk/gdkx.h>
@@ -176,7 +177,7 @@ ev_spawn (const char *uri,
g_string_append_printf (cmd, " %s", path);
g_free (path);
-
+
/* Page label */
if (dest) {
switch (ev_link_dest_get_dest_type (dest)) {
@@ -940,6 +941,20 @@ ev_application_migrate_config_dir (EvApplication *application)
g_free (old_accels);
}
+static void
+ev_application_set_prefers_color_scheme ()
+{
+ GtkSettings* gtk_settings = gtk_settings_get_default ();
+ GraniteSettings* granite_settings = granite_settings_get_default ();
+
+ g_object_set (
+ gtk_settings,
+ "gtk-application-prefer-dark-theme",
+ granite_settings_get_prefers_color_scheme (granite_settings) == GRANITE_SETTINGS_COLOR_SCHEME_DARK,
+ NULL
+ );
+}
+
static void
ev_application_startup (GApplication *gapplication)
{
@@ -992,6 +1007,7 @@ ev_application_startup (GApplication *gapplication)
EvApplication *application = EV_APPLICATION (gapplication);
const gchar **it;
+ GraniteSettings* granite_settings = granite_settings_get_default ();
g_application_set_resource_base_path (gapplication, "/org/gnome/evince");
@@ -999,6 +1015,11 @@ ev_application_startup (GApplication *gapplication)
hdy_init ();
+ ev_application_set_prefers_color_scheme ();
+
+ g_signal_connect (granite_settings, "notify::prefers-color-scheme",
+ G_CALLBACK(ev_application_set_prefers_color_scheme), NULL);
+
for (it = action_accels; it[0]; it += g_strv_length ((gchar **)it) + 1)
gtk_application_set_accels_for_action (GTK_APPLICATION (application), it[0], &it[1]);
}
diff --git a/shell/meson.build b/shell/meson.build
index 7cbc48f2..a3089b13 100644
--- a/shell/meson.build
+++ b/shell/meson.build
@@ -52,6 +52,7 @@ sources += gnome.compile_resources(
deps = [
gdk_pixbuf_dep,
gnome_desktop_dep,
+ granite_dep,
hdy_dep,
libevmisc_dep,
libevproperties_dep,

4
pkgs/desktops/pantheon/apps/appcenter/default.nix
View file

@ -30,13 +30,13 @@
stdenv.mkDerivation rec {
pname = "appcenter";
version = "3.9.0";
version = "3.9.1";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
sha256 = "sha256-+r19n42FPoBArZNDF4ZAdUBZqsSxpLwpeBoyaRJBCrg=";
sha256 = "sha256-xktIHQHmz5gh72NEz9UQ9fMvBlj1BihWxHgxsHmTIB0=";
};
passthru = {

8
pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix
View file

@ -26,15 +26,13 @@
stdenv.mkDerivation rec {
pname = "wingpanel-applications-menu";
version = "2.10.1";
repoName = "applications-menu";
version = "2.10.2";
src = fetchFromGitHub {
owner = "elementary";
repo = repoName;
repo = "applications-menu";
rev = version;
sha256 = "sha256-e9InWx5b2DAFK7m7z/oCW7Mw/ymBNz1Sc7vT65kkZ9o=";
sha256 = "sha256-xBuMJzIFOueSvNwvXc85AI9NHuMW3bOblNsyuDkIzyk=";
};
patches = [

11
pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix
View file

@ -1,7 +1,6 @@
{ lib
, stdenv
, fetchFromGitHub
, fetchpatch
, nix-update-script
, substituteAll
, pkg-config
@ -24,13 +23,13 @@
stdenv.mkDerivation rec {
pname = "wingpanel-indicator-datetime";
version = "2.3.1";
version = "2.4.0";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
sha256 = "sha256-/kbwZVzOlC3ATCuXVMdf2RIskoGQKG1evaDYO3yFerg=";
sha256 = "sha256-GxlnzLDrZmDDAGlUMoM4k4SkbCqra3Th6ugRAj3Wse4=";
};
patches = [
@ -38,12 +37,6 @@ stdenv.mkDerivation rec {
src = ./fix-paths.patch;
elementary_calendar = elementary-calendar;
})
# Fix incorrect month shown on re-opening indicator if previously changed month
# https://github.com/elementary/wingpanel-indicator-datetime/pull/284
(fetchpatch {
url = "https://github.com/elementary/wingpanel-indicator-datetime/commit/9b0bed98e09dfdad62f43a95d956d2f53d824e65.patch";
sha256 = "sha256-MQfz4Uzo59SmmfQNi58OA7CIHHkm2TODQz2fmmIall4=";
})
];
nativeBuildInputs = [

17
pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/fix-paths.patch
View file

@ -1,8 +1,21 @@
diff --git a/src/Indicator.vala b/src/Indicator.vala
index 4aba03c..6385bc9 100644
--- a/src/Indicator.vala
+++ b/src/Indicator.vala
@@ -55,7 +55,7 @@ public class DateTime.Indicator : Wingpanel.Indicator {
panel_label.button_press_event.connect ((e) => {
if (e.button == Gdk.BUTTON_MIDDLE) {
- var command = "io.elementary.calendar --show-day %s".printf (new GLib.DateTime.now_local ().format ("%F"));
+ var command = "@elementary_calendar@/bin/io.elementary.calendar --show-day %s".printf (new GLib.DateTime.now_local ().format ("%F"));
try {
var appinfo = AppInfo.create_from_commandline (command, null, AppInfoCreateFlags.NONE);
appinfo.launch_uris (null, null);
diff --git a/src/Widgets/calendar/CalendarView.vala b/src/Widgets/calendar/CalendarView.vala
index 6e0d530a..2f90f96c 100644
index cb54253..7477d1a 100644
--- a/src/Widgets/calendar/CalendarView.vala
+++ b/src/Widgets/calendar/CalendarView.vala
@@ -222,7 +222,7 @@ public class DateTime.Widgets.CalendarView : Gtk.Grid {
@@ -242,7 +242,7 @@ public class DateTime.Widgets.CalendarView : Gtk.Grid {
// TODO: As far as maya supports it use the Dbus Activation feature to run the calendar-app.
public void show_date_in_maya (GLib.DateTime date) {

4
pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix
View file

@ -16,13 +16,13 @@
stdenv.mkDerivation rec {
pname = "wingpanel-indicator-notifications";
version = "6.0.2";
version = "6.0.3";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
sha256 = "sha256-ZuOZlfxtRq8ZcrXGe9wlFGwn2isdvMoXQveKKnEPFdo=";
sha256 = "sha256-iHhZJwaomQgH1Sal8uejl4QlavOQ75UKZ9xchTi1X3U=";
};
nativeBuildInputs = [

4
pkgs/development/compilers/chez/default.nix
View file

@ -5,13 +5,13 @@
stdenv.mkDerivation rec {
pname = "chez-scheme";
version = "9.5.4";
version = "9.5.6";
src = fetchFromGitHub {
owner = "cisco";
repo = "ChezScheme";
rev = "refs/tags/v${version}";
sha256 = "065dir19cqpn0d1bk9w49wnwzn6qfrgvcqw8da2fdhkafhfcb1bj";
sha256 = "sha256-1C5fEbVIpFXlDQ5wFmYZ2nrDUq9jBmvnku/7f0MH7vc=";
fetchSubmodules = true;
};

4
pkgs/development/compilers/chicken/5/chicken.nix
View file

@ -10,13 +10,13 @@ let
in
stdenv.mkDerivation rec {
pname = "chicken";
version = "5.2.0";
version = "5.3.0";
binaryVersion = 11;
src = fetchurl {
url = "https://code.call-cc.org/releases/${version}/chicken-${version}.tar.gz";
sha256 = "1yl0hxm9cirgcp8jgxp6vv29lpswfvaw3zfkh6rsj0vkrv44k4c1";
sha256 = "sha256-w62Z2PnhftgQkS75gaw7DC4vRvsOzAM7XDttyhvbDXY=";
};
setupHook = lib.optional (bootstrap-chicken != null) ./setup-hook.sh;

4
pkgs/development/compilers/closure/default.nix
View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "closure-compiler";
version = "20210808";
version = "20211107";
src = fetchurl {
url = "mirror://maven/com/google/javascript/closure-compiler/v${version}/closure-compiler-v${version}.jar";
sha256 = "1cvibvm8l4mp64ml6lpsh3w62bgbr42pi3i7ga8ss0prhr0dsk3y";
sha256 = "sha256-cz8A8KFlHJ1UCdkWLm+U8KPmFGNiiSXT1u9mvmDsFKY=";
};
dontUnpack = true;

4
pkgs/development/compilers/fasm/bin.nix
View file

@ -3,11 +3,11 @@
stdenvNoCC.mkDerivation rec {
pname = "fasm-bin";
version = "1.73.27";
version = "1.73.28";
src = fetchurl {
url = "https://flatassembler.net/fasm-${version}.tgz";
sha256 = "sha256-aAFIN3+207ZmOFKID6oDUU1zJrWZV0LTOofiRPSM8LE=";
sha256 = "sha256-ntHrtIX9EXQRGpTrdzEFojSRE5jgUJD15xSr9iyAkpI=";
};
installPhase = ''

2
pkgs/development/compilers/openjdk/darwin/17.nix
View file

@ -12,7 +12,7 @@ let
aarch64-darwin = {
arch = "aarch64";
zuluVersion = "17.30.19";
zuluVersion = "17.30.15";
jdkVersion = "17.0.1";
sha256 = "sha256-zhBCXOnO/fsj6+q+vAlEz7QVMRFKLVvYnjwZzFz6mRM=";
};

3
pkgs/development/haskell-modules/configuration-ghcjs.nix
View file

@ -101,9 +101,6 @@ self: super:
# still present here https://github.com/glguy/th-abstraction/issues/53
th-abstraction = dontCheck super.th-abstraction;
# https://github.com/haskell/vector/issues/410
vector = appendPatch super.vector (../compilers/ghcjs/patches/vector-ghcjs-storable-set.patch);
# Need hedgehog for tests, which fails to compile due to dep on concurrent-output
zenc = dontCheck super.zenc;
}

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

@ -6,11 +6,11 @@ rubyVersion = callPackage ../ruby/ruby-version.nix {} "2" "5" "7" "";
jruby = stdenv.mkDerivation rec {
pname = "jruby";
version = "9.2.19.0";
version = "9.3.2.0";
src = fetchurl {
url = "https://s3.amazonaws.com/jruby.org/downloads/${version}/jruby-bin-${version}.tar.gz";
sha256 = "sha256-H3SIWi0/pYn8vrKSo5+s9/hr4+rBqwFeMsZdMqzz878=";
sha256 = "sha256-JmmcoCvur6gyZXPBElxXpZcbqLlNFfhOazuvJZQkTzM=";
};
nativeBuildInputs = [ makeWrapper ];

2
pkgs/development/libraries/audio/libbass/default.nix
View file

@ -60,6 +60,8 @@ let
homepage = "https://www.un4seen.com/";
license = licenses.unfreeRedistributable;
platforms = builtins.attrNames bass.so;
# until upstream has stable URLs, this package is prone to always being broken
broken = true;
};
};

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

@ -7,7 +7,7 @@
stdenv.mkDerivation rec {
pname = "bzrtp";
version = "5.0.0";
version = "5.0.55";
src = fetchFromGitLab {
domain = "gitlab.linphone.org";
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
group = "BC";
repo = pname;
rev = version;
sha256 = "sha256-cagRN0DQw1/efCuMWngcF04SE9bViHANaNsQNKB5txA=";
sha256 = "sha256-+rUDKdMUeVnGsvG7NgQkN6e+DY2bThIyuPTvqxG6uDk=";
};
buildInputs = [ bctoolbox sqlite ];

8
pkgs/development/libraries/cdk/default.nix
View file

@ -16,8 +16,16 @@ stdenv.mkDerivation rec {
sha256 = "sha256-xBbJh793tPGycD18XkM7qUWMi+Uma/RUy/gBrYfnKTY=";
};
patches = [
# Proposed upstream as https://lists.gnu.org/archive/html/bug-ncurses/2021-12/msg00004.html
./parallel.patch
];
enableParallelBuilding = true;
meta = with lib; {
description = "Curses development kit";
homepage = "https://invisible-island.net/cdk/";
license = licenses.bsdOriginal ;
maintainers = [ maintainers.raskin ];
platforms = platforms.linux;

13
pkgs/development/libraries/cdk/parallel.patch Normal file
View file

@ -0,0 +1,13 @@
--- a/Makefile.in
+++ b/Makefile.in
@@ -296,7 +296,9 @@ LIB_OBJECT = @LIB_OBJECT@
all sources :: $(AUTO_SRC)
-$(OBJECTS) : include/cdk_config.h
+# make sure we generate all headers before trying
+# to build first source file.
+$(OBJECTS) : $(MY_HDR)
#
# Standard library directive.

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

@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
pname = "drumstick";
version = "2.3.1";
version = "2.4.1";
src = fetchurl {
url = "mirror://sourceforge/drumstick/${version}/${pname}-${version}.tar.bz2";
sha256 = "sha256-0DUFmL8sifxbC782CYT4eoe4m1kq8T1tEs3YNy8iQuc=";
sha256 = "sha256-nmqgS08ZBQ2vBEDtoriNbYLaNQA1DWeDhbRo70rBOP0=";
};
patches = [

4
pkgs/development/libraries/hamlib/4.nix
View file

@ -20,11 +20,11 @@
stdenv.mkDerivation rec {
pname = "hamlib";
version = "4.2";
version = "4.4";
src = fetchurl {
url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz";
sha256 = "1m8gb20i8ga6ndnnw187ry1h4z8wx27v1hl7c610r6ky60pv4072";
sha256 = "sha256-i/AQewcfUvCFh/OOLe6KeEjeE0NDWzJvj2bZXh+KJIc=";
};
nativeBuildInputs = [

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

@ -2,11 +2,11 @@
tcl.mkTclDerivation rec {
pname = "incrtcl";
version = "4.2.0";
version = "4.2.2";
src = fetchurl {
url = "mirror://sourceforge/incrtcl/%5BIncr%20Tcl_Tk%5D-source/3.4/itcl${version}.tar.gz";
sha256 = "0w28v0zaraxcq1s9pa6cihqqwqvvwfgz275lks7w4gl7hxjxmasw";
sha256 = "sha256-rExnDq8bWyVb/KzKgyCzPVa72S/VRGPGPW9pmocOFWw=";
};
enableParallelBuilding = true;

4
pkgs/development/libraries/intel-media-sdk/default.nix
View file

@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "intel-media-sdk";
version = "21.3.1";
version = "21.4.3";
src = fetchFromGitHub {
owner = "Intel-Media-SDK";
repo = "MediaSDK";
rev = "intel-mediasdk-${version}";
sha256 = "sha256-Ki+gTDL6gj+f3wjhVp4EIVvrPn6NRmCCkCj5g//kAW8=";
sha256 = "sha256-Z6wIwgcKa+EaqSmbD//pYzGjDezASNWGnLCROiRvACo=";
};
nativeBuildInputs = [ cmake pkg-config ];

4
pkgs/development/libraries/java/commons/io/default.nix
View file

@ -1,12 +1,12 @@
{ lib, stdenv, fetchurl }:
stdenv.mkDerivation rec {
version = "2.8.0";
version = "2.11.0";
pname = "commons-io";
src = fetchurl {
url = "mirror://apache/commons/io/binaries/${pname}-${version}-bin.tar.gz";
sha256 = "02c54cjf3sdwbc9rcgg3xkx1f3yk8p5iv3iwvq78f5vfxsj53lkk";
sha256 = "sha256-9RXVNzjEhdYCYWbB9/xW3rm+gSOuD6+jwAO9zJVt4fk=";
};
installPhase = ''

4
pkgs/development/libraries/java/hsqldb/default.nix
View file

@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
pname = "hsqldb";
version = "2.6.0";
version = "2.6.1";
underscoreMajMin = lib.strings.replaceChars ["."] ["_"] (lib.versions.majorMinor version);
src = fetchurl {
url = "mirror://sourceforge/project/hsqldb/hsqldb/hsqldb_${underscoreMajMin}/hsqldb-${version}.zip";
sha256 = "sha256-GhuTBJl1E+aoWa8pTWEqzghHDXXiCQFIt++8pjCQYik=";
sha256 = "sha256-cixyEwjEt68UOotd1TcJNyVUxTRDx4XyfyYg9k6kRtQ=";
};
nativeBuildInputs = [ unzip makeWrapper ];

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

@ -8,13 +8,13 @@
mkDerivation rec {
pname = "KDDockWidgets";
version = "1.4.0";
version = "1.5.0";
src = fetchFromGitHub {
owner = "KDAB";
repo = pname;
rev = "v${version}";
sha256 = "sha256-lgNRuRoJhBw0n/Hb58uxpa+4aXoOrK4bRldtIXYIKLI=";
sha256 = "sha256-7jC0zl5ESwqZXzvFJYmPvRhwFitse05NuYoTgFWiHac=";
};
nativeBuildInputs = [ cmake ];

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

@ -7,13 +7,13 @@
stdenv.mkDerivation rec {
pname = "kronosnet";
version = "1.21";
version = "1.23";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "14i4fl3g60gn5ay3dbwjcay3dnmnqr16zcp3g0wv9a3hjwh1if28";
sha256 = "sha256-+uQXV5tOLsBPFzfFHqwV1Oz4+KwZMkdjO8zfIljV+ro=";
};
nativeBuildInputs = [ autoreconfHook pkg-config doxygen ];

6
pkgs/development/libraries/libabigail/default.nix
View file

@ -10,13 +10,13 @@
stdenv.mkDerivation rec {
pname = "libabigail";
version = "1.8.2";
version = "2.0";
outputs = [ "bin" "out" "dev" ];
src = fetchurl {
url = "https://mirrors.kernel.org/sourceware/${pname}/${pname}-${version}.tar.gz";
sha256 = "sha256-hjR8nwqGZvJj/WP4w/5MT5yxvbPsQmDsuvEX0Tfol4c=";
sha256 = "sha256-NwSul6Vr8HbKCPtd6msh25mPu/FMT53hKCS3jbU7b9o=";
};
nativeBuildInputs = [
@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "ABI Generic Analysis and Instrumentation Library";
homepage = "https://sourceware.org/libabigail/";
license = licenses.lgpl3Plus;
license = with licenses; [ asl20 llvm-exception ];
maintainers = with maintainers; [ jtojnar ];
platforms = platforms.linux;
};

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

@ -4,14 +4,14 @@
stdenv.mkDerivation rec {
pname = "libaec";
version = "1.0.5";
version = "1.0.6";
src = fetchFromGitLab {
domain = "gitlab.dkrz.de";
owner = "k202009";
repo = "libaec";
rev = "v${version}";
sha256 = "sha256-Vi0fCd9V/EH+PcD+e6RZK2/isR1xGX25POhm1Xen5ak=";
sha256 = "sha256-N0YwJuVqv8jv/uSbpn/eJBTMhlHDcY/74+anH2vNvpI=";
};
nativeBuildInputs = [

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

@ -11,13 +11,13 @@
stdenv.mkDerivation rec {
pname = "libavif";
version = "0.9.2";
version = "0.9.3";
src = fetchFromGitHub {
owner = "AOMediaCodec";
repo = pname;
rev = "v${version}";
sha256 = "sha256-0/5JLynYzr7ZewBbrNoxr26UkVzpSP9RqlmH2ql8tfs=";
sha256 = "sha256-ME/mkaHhFeHajTbc7zhg9vtf/8XgkgSRu9I/mlQXnds=";
};
# reco: encode libaom slowest but best, decode dav1d fastest

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

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "libexttextcat";
version = "3.4.5";
version = "3.4.6";
src = fetchurl {
url = "https://dev-www.libreoffice.org/src/libexttextcat/${pname}-${version}.tar.xz";
sha256 = "1j6sjwkyhqvsgyw938bxxfwkzzi1mahk66g5342lv6j89jfvrz8k";
sha256 = "sha256-bXfqziDp6hBsEzDiaO3nDJpKiXRN3CVxVoJ1TsozaN8=";
};
meta = with lib; {

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

@ -11,11 +11,11 @@
stdenv.mkDerivation rec {
pname = "libfilezilla";
version = "0.31.1";
version = "0.34.2";
src = fetchurl {
url = "https://download.filezilla-project.org/${pname}/${pname}-${version}.tar.bz2";
sha256 = "sha256-mX1Yh7YBXzhp03Wwy8S0lC/LJNvktDRohclGz+czFm8=";
sha256 = "sha256-IKKLd+whs4CtAgLbAWbtHHycItRQSN1oBtXsn+J/7Uo=";
};
nativeBuildInputs = [ autoreconfHook pkg-config ];

4
pkgs/development/libraries/libgpg-error/default.nix
View file

@ -38,8 +38,8 @@ in stdenv.mkDerivation (rec {
'' + lib.optionalString (stdenv.hostPlatform.isi686 && stdenv.hostPlatform.isMusl) ''
ln -s lock-obj-pub.i686-unknown-linux-gnu.h src/syscfg/lock-obj-pub.linux-musl.h
'' + lib.optionalString (stdenv.hostPlatform.isAarch32 && stdenv.hostPlatform.isMusl) ''
ln -s src/syscfg/lock-obj-pub.arm-unknown-linux-gnueabi.h src/syscfg/lock-obj-pub.arm-unknown-linux-musleabihf.h
ln -s src/syscfg/lock-obj-pub.arm-unknown-linux-gnueabi.h src/syscfg/lock-obj-pub.linux-musleabihf.h
ln -s lock-obj-pub.arm-unknown-linux-gnueabi.h src/syscfg/lock-obj-pub.arm-unknown-linux-musleabihf.h
ln -s lock-obj-pub.arm-unknown-linux-gnueabi.h src/syscfg/lock-obj-pub.linux-musleabihf.h
'';
outputs = [ "out" "dev" "info" ];

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

@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
pname = "libiodbc";
version = "3.52.12";
version = "3.52.15";
src = fetchurl {
url = "mirror://sourceforge/iodbc/${pname}-${version}.tar.gz";
sha256 = "0qpvklgr1lcn5g8xbz7fbc9rldqf9r8s6xybhqj20m4sglxgziai";
sha256 = "sha256-x0VB4zJ/yaHHzPEDZFRxxnvAFFQtcPVyR26wfAst1Dw=";
};
nativeBuildInputs = [ pkg-config ];

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

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "liblscp";
version = "0.9.2";
version = "0.9.4";
src = fetchurl {
url = "https://download.linuxsampler.org/packages/${pname}-${version}.tar.gz";
sha256 = "sha256-GTW6SBQVCDtzeU+arLmAJi6N9jtN68NdI69p6RSazvs=";
sha256 = "sha256-8+3qHgIv32wfNHHggXID1W8M7pTqji4bHNGob3DTkho=";
};
nativeBuildInputs = [ autoconf automake libtool pkg-config ];

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

@ -1,14 +1,14 @@
{ lib, stdenv, fetchFromGitHub, cmake, ninja, zlib, expat, rpm, db }:
stdenv.mkDerivation rec {
version = "0.7.19";
version = "0.7.20";
pname = "libsolv";
src = fetchFromGitHub {
owner = "openSUSE";
repo = "libsolv";
rev = version;
sha256 = "sha256-AN4cgpMBqTtK04CU89Yqd1ZfWyPrCociPd3XKdVONMU=";
sha256 = "sha256-NVyLa/fPGnO5jAz9rePFXg/z6RZeFCrkJBCG3gGh+YM=";
};
cmakeFlags = [

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

@ -1,14 +1,14 @@
{ lib, stdenv, fetchurl }:
let
name = "log4cplus-2.0.6";
name = "log4cplus-2.0.7";
in
stdenv.mkDerivation {
inherit name;
src = fetchurl {
url = "mirror://sourceforge/log4cplus/${name}.tar.bz2";
sha256 = "sha256-GpY6/Q+IPWLelGsYkn0jgFH9R5NuQV6r7/4rE5fxbso=";
sha256 = "sha256-j626/uK6TlWKD3iEJhPJ+yOcd12D8jNA0JEITA4bEqs=";
};
meta = {

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

@ -2,14 +2,14 @@
stdenv.mkDerivation rec {
pname = "lzlib";
version = "1.10";
version = "1.12";
outputs = [ "out" "info" ];
nativeBuildInputs = [ texinfo ];
src = fetchurl {
url = "mirror://savannah/lzip/${pname}/${pname}-${version}.tar.gz";
sha256 = "sha256-HWq3gApbQ+Vv0gYH/Sz9qeVQNQ3JX1vrakzhT4W0EEM=";
sha256 = "sha256-jl2EJC61LPHcyY5YvZuo7xrvpQFDGr3QJzoiv0zjN7E=";
};
makeFlags = [ "AR:=$(AR)" "CC:=$(CC)" ];

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

@ -19,7 +19,7 @@
stdenv.mkDerivation rec {
pname = "malcontent";
version = "0.10.1";
version = "0.10.3";
outputs = [ "bin" "out" "lib" "pam" "dev" "man" "installedTests" ];
@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
owner = "pwithnall";
repo = pname;
rev = version;
sha256 = "sha256-GgY+E+1gzmiAAALzdKu1CjN3xPeVMhbmNLqJNB1zHaU=";
sha256 = "sha256-SA4QyzV/aNUmyr9BYTsemx5x7S6WpxdTBK6zmVMkwh4=";
};
patches = [

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

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "mdds";
version = "1.7.0";
version = "2.0.1";
src = fetchurl {
url = "https://kohei.us/files/${pname}/src/${pname}-${version}.tar.bz2";
sha256 = "1kzy70b18f2dsqarmdmzbj9nc9kf2lvc5xxgkg6wdax3jf12lsm6";
sha256 = "sha256-OrM/zljmrPlUDMGlImS+aGPvgPVawocZTMmM2kjnH+Y=";
};
postInstall = ''

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

@ -3,13 +3,13 @@
stdenv.mkDerivation rec
{
pname = "ptex";
version = "2.3.2";
version = "2.4.1";
src = fetchFromGitHub {
owner = "wdas";
repo = "ptex";
rev = "v${version}";
sha256 = "1c3pdqszn4y3d86qzng8b0hqdrchnl39adq5ab30wfnrgl2hnm4z";
sha256 = "sha256-TuwgZJHvQUqBEFeZYvzpi+tmXB97SkOairYnuUahtSA=";
};
outputs = [ "bin" "dev" "out" "lib" ];

15
pkgs/development/libraries/qt-5/5.15/qtwebkit-darwin-no-readline.patch
View file

@ -28,18 +28,3 @@ diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h
#define HAVE_SYS_TIMEB_H 1
#if !PLATFORM(GTK) && !PLATFORM(QT)
diff --git a/Source/WTF/wtf/PlatformMac.cmake b/Source/WTF/wtf/PlatformMac.cmake
--- a/Source/WTF/wtf/PlatformMac.cmake
+++ b/Source/WTF/wtf/PlatformMac.cmake
@@ -2,11 +2,9 @@ set(WTF_LIBRARY_TYPE SHARED)
find_library(COCOA_LIBRARY Cocoa)
find_library(COREFOUNDATION_LIBRARY CoreFoundation)
-find_library(READLINE_LIBRARY Readline)
list(APPEND WTF_LIBRARIES
${COREFOUNDATION_LIBRARY}
${COCOA_LIBRARY}
- ${READLINE_LIBRARY}
libicucore.dylib
)

1
pkgs/development/node-packages/node-packages.json
View file

@ -269,6 +269,7 @@
, "svelte-language-server"
, "svgo"
, "swagger"
, "tailwindcss"
, {"tedicross": "git+https://github.com/TediCross/TediCross.git#v0.8.7"}
, "teck-programmer"
, "tern"

1980
pkgs/development/node-packages/node-packages.nix generated
View file

File diff suppressed because it is too large Load diff

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

@ -19,7 +19,7 @@
buildPythonPackage rec {
pname = "anyio";
version = "3.3.2";
version = "3.3.4";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -27,7 +27,7 @@ buildPythonPackage rec {
owner = "agronholm";
repo = pname;
rev = version;
sha256 = "sha256-XBIrFb/XDneaOf/TeHxyeEfyQ7qQcWO7LJF0k1f4Ark=";
sha256 = "sha256-aMnXZ+4dlybId2QhjE/3STY+Sj/vzI6K7wmqqx+P8yE=";
};
preBuild = ''

4
pkgs/development/python-modules/azure-mgmt-datafactory/default.nix
View file

@ -11,12 +11,12 @@
buildPythonPackage rec {
pname = "azure-mgmt-datafactory";
version = "2.0.0";
version = "2.1.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "df14272a1835f743d1889f901e972ed6ec9ea9d6f8966ba2865bf10306a621cc";
sha256 = "d2a3cfe844bd9e51499b81bba7510e2c8df4fc3a40a7059e6224ed043d65a786";
};
propagatedBuildInputs = [

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

@ -5,11 +5,11 @@
buildPythonPackage rec {
pname = "celery";
version = "5.2.0";
version = "5.2.1";
src = fetchPypi {
inherit pname version;
sha256 = "4d858a8fe53c07a9f0cbf8cf1da28e8abe5464d0aba5713bf83908e74277734b";
sha256 = "sha256-tBpZC0nK+OZJilfbYo5YDV+Nxv69oPQt5deDrtW3+Ag=";
};
propagatedBuildInputs = [ billiard click click-didyoumean click-plugins click-repl kombu pytz vine ];

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

@ -9,11 +9,11 @@
buildPythonPackage rec {
pname = "colorcet";
version = "2.0.6";
version = "3.0.0";
src = fetchPypi {
inherit pname version;
sha256 = "efa44b6f4078261e62d0039c76aba17ac8d3ebaf0bc2291a111aee3905313433";
sha256 = "21c522346a7aa81a603729f2996c22ac3f7822f4c8c303c59761e27d2dfcf3db";
};
propagatedBuildInputs = [

39
pkgs/development/python-modules/cometblue-lite/default.nix Normal file
View file

@ -0,0 +1,39 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, bluepy
, pythonOlder
}:
buildPythonPackage rec {
pname = "cometblue-lite";
version = "0.4.1";
format = "setuptools";
disabled = pythonOlder "3.8";
src = fetchFromGitHub {
owner = "neffs";
repo = "python-cometblue_lite";
rev = version;
sha256 = "sha256-kK6P8almFQac/bt7we02Q96RIB/s9wAqb+dn09tFx7k=";
};
propagatedBuildInputs = [
bluepy
];
# Module has no tests
doCheck = false;
pythonImportsCheck = [
"cometblue_lite"
];
meta = with lib; {
description = "Python module for Eurotronic Comet Blue thermostats";
homepage = "https://github.com/neffs/python-cometblue_lite";
license = licenses.mit;
maintainers = with maintainers; [ fab ];
};
}

47
pkgs/development/python-modules/django-sites/default.nix
View file

@ -1,31 +1,40 @@
{ lib, buildPythonPackage, fetchPypi, django }:
{ lib
, buildPythonPackage
, fetchFromGitHub
, django
, django-jinja
, python
}:
buildPythonPackage rec {
pname = "django-sites";
version = "0.11";
src = fetchPypi {
inherit pname version;
sha256 = "1cbee714fdf2bfbe92e4f5055de4e6c41b64ebb32e1f96b1016c0748210928b8";
src = fetchFromGitHub {
owner = "niwinz";
repo = "django-sites";
rev = version;
sha256 = "sha256-MQtQC+9DyS1ICXXovbqPpkKIQ5wpuJDgq3Lcd/1kORU=";
};
# LICENSE file appears to be missing from pypi package, but expected by the installer
# https://github.com/niwinz/django-sites/issues/11
postPatch = ''
touch LICENSE
propagatedBuildInputs = [
django
];
checkInputs = [
django-jinja
];
checkPhase = ''
runHook preCheck
${python.interpreter} runtests.py
runHook postCheck
'';
propagatedBuildInputs = [ django ];
# required files for test don't seem to be included in pypi package, full source for 0.10
# version doesn't appear to be present on github
# https://github.com/niwinz/django-sites/issues/9
doCheck = false;
meta = {
description = ''
Alternative implementation of django "sites" framework
based on settings instead of models.
'';
description = "Alternative implementation of django sites framework";
homepage = "https://github.com/niwinz/django-sites";
license = lib.licenses.bsd3;
};

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

@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "dotmap";
version = "1.3.25";
version = "1.3.26";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-wOJjGlMUjTYj2af8I8dg1LfehCL2u4gYuEfkYHKrTPA=";
sha256 = "cc87300f3a61d70f2bd18103ea2747dea846a2381a8321f43ce65cbd7afdfe3d";
};
checkInputs = [

43
pkgs/development/python-modules/finitude/default.nix Normal file
View file

@ -0,0 +1,43 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, prometheus-client
, pyserial
, pythonOlder
, pyyaml
}:
buildPythonPackage rec {
pname = "finitude";
version = "0.1.1";
format = "pyproject";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "dulitz";
repo = pname;
rev = "v${version}";
sha256 = "sha256-yCI5UCRDhw+dJoTKyjmHbAGBm3by2AyxHKlqCywnLcs=";
};
propagatedBuildInputs = [
pyserial
prometheus-client
pyyaml
];
# Module has no tests
doCheck = false;
pythonImportsCheck = [
"finitude"
];
meta = with lib; {
description = "Python module to get data from ABCD bus (RS-485) used by Carrier Infinity and Bryant Evolution HVAC systems";
homepage = "https://github.com/dulitz/finitude";
license = licenses.mit;
maintainers = with maintainers; [ fab ];
};
}

Some files were not shown because too many files have changed in this diff Show more