Merge staging-next into staging

This commit is contained in:
github-actions[bot] 2021-04-14 18:11:04 +00:00 committed by GitHub
commit eb85527f6c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
36 changed files with 587 additions and 196 deletions

View file

@ -1364,6 +1364,12 @@
githubId = 302429;
name = "Marton Boros";
};
branwright1 = {
email = "branwright@protonmail.com";
github = "branwright1";
githubId = 71175207;
name = "Brandon Wright";
};
bramd = {
email = "bram@bramd.nl";
github = "bramd";
@ -2591,6 +2597,16 @@
githubId = 10198051;
name = "Drew Risinger";
};
dschrempf = {
name = "Dominik Schrempf";
email = "dominik.schrempf@gmail.com";
github = "dschrempf";
githubId = 5596239;
keys = [{
longkeyid = "rsa2048/0x875F2BCF163F1B29";
fingerprint = "62BC E2BD 49DF ECC7 35C7 E153 875F 2BCF 163F 1B29";
}];
};
dsferruzza = {
email = "david.sferruzza@gmail.com";
github = "dsferruzza";
@ -7569,6 +7585,12 @@
githubId = 28323;
name = "Peter Simons";
};
petrosagg = {
email = "petrosagg@gmail.com";
github = "petrosagg";
githubId = 939420;
name = "Petros Angelatos";
};
petterstorvik = {
email = "petterstorvik@gmail.com";
github = "storvik";

View file

@ -818,7 +818,7 @@ in
ProtectControlGroups = true;
RestrictAddressFamilies = [ "AF_UNIX" "AF_INET" "AF_INET6" ];
LockPersonality = true;
MemoryDenyWriteExecute = !(builtins.any (mod: (mod.allowMemoryWriteExecute or false)) (optionals (cfg.package ? modules) cfg.package.modules));
MemoryDenyWriteExecute = !(builtins.any (mod: (mod.allowMemoryWriteExecute or false)) cfg.package.modules);
RestrictRealtime = true;
RestrictSUIDSGID = true;
PrivateMounts = true;

View file

@ -144,7 +144,7 @@ let
inherit name version src wmClass jdk;
product = "MPS";
meta = with lib; {
homepage = https://www.jetbrains.com/mps/;
homepage = "https://www.jetbrains.com/mps/";
inherit license description;
longDescription = ''
A metaprogramming system which uses projectional editing

View file

@ -61,37 +61,40 @@ in
};
buildInputs = [ libsecret libXScrnSaver libxshmfence ]
++ lib.optionals (!stdenv.isDarwin) ([ gtk2 at-spi2-atk wrapGAppsHook ] ++ atomEnv.packages);
++ lib.optionals (!stdenv.isDarwin) ([ gtk2 at-spi2-atk ] ++ atomEnv.packages);
runtimeDependencies = lib.optional (stdenv.isLinux) [ (lib.getLib systemd) fontconfig.lib libdbusmenu ];
nativeBuildInputs = [unzip] ++ lib.optional (!stdenv.isDarwin) autoPatchelfHook;
nativeBuildInputs = [unzip] ++ lib.optionals (!stdenv.isDarwin) [ autoPatchelfHook wrapGAppsHook ];
dontBuild = true;
dontConfigure = true;
installPhase =
if system == "x86_64-darwin" then ''
mkdir -p "$out/Applications/${longName}.app" $out/bin
cp -r ./* "$out/Applications/${longName}.app"
ln -s "$out/Applications/${longName}.app/Contents/Resources/app/bin/code" $out/bin/${executableName}
'' else ''
mkdir -p $out/lib/vscode $out/bin
cp -r ./* $out/lib/vscode
installPhase = ''
runHook preInstall
'' + (if system == "x86_64-darwin" then ''
mkdir -p "$out/Applications/${longName}.app" $out/bin
cp -r ./* "$out/Applications/${longName}.app"
ln -s "$out/Applications/${longName}.app/Contents/Resources/app/bin/code" $out/bin/${executableName}
'' else ''
mkdir -p $out/lib/vscode $out/bin
cp -r ./* $out/lib/vscode
ln -s $out/lib/vscode/bin/${executableName} $out/bin
ln -s $out/lib/vscode/bin/${executableName} $out/bin
mkdir -p $out/share/applications
ln -s $desktopItem/share/applications/${executableName}.desktop $out/share/applications/${executableName}.desktop
ln -s $urlHandlerDesktopItem/share/applications/${executableName}-url-handler.desktop $out/share/applications/${executableName}-url-handler.desktop
mkdir -p $out/share/applications
ln -s $desktopItem/share/applications/${executableName}.desktop $out/share/applications/${executableName}.desktop
ln -s $urlHandlerDesktopItem/share/applications/${executableName}-url-handler.desktop $out/share/applications/${executableName}-url-handler.desktop
mkdir -p $out/share/pixmaps
cp $out/lib/vscode/resources/app/resources/linux/code.png $out/share/pixmaps/code.png
mkdir -p $out/share/pixmaps
cp $out/lib/vscode/resources/app/resources/linux/code.png $out/share/pixmaps/code.png
# Override the previously determined VSCODE_PATH with the one we know to be correct
sed -i "/ELECTRON=/iVSCODE_PATH='$out/lib/vscode'" $out/bin/${executableName}
grep -q "VSCODE_PATH='$out/lib/vscode'" $out/bin/${executableName} # check if sed succeeded
'';
# Override the previously determined VSCODE_PATH with the one we know to be correct
sed -i "/ELECTRON=/iVSCODE_PATH='$out/lib/vscode'" $out/bin/${executableName}
grep -q "VSCODE_PATH='$out/lib/vscode'" $out/bin/${executableName} # check if sed succeeded
'') + ''
runHook postInstall
'';
inherit meta;
}

View file

@ -13,10 +13,10 @@ let
archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz";
sha256 = {
x86_64-linux = "0zzdbknmljf1hizmxnrby17i8v3kp98rklinywnr632jwgjms81j";
x86_64-darwin = "0mccq1b0l6r1ipxp5gvyam43c2hh8hxdvwqikkz6g7y93p29wz9g";
aarch64-linux = "12gpday6gzl1adcykqhgz3xrdm9568a26gsndmplkn2n6l6agnp0";
armv7l-linux = "0l886vdw7az0nvvhh14pjawz0yyib59ymychy7gbk8ay5g9vfv03";
x86_64-linux = "12mdila9gspj6b9s6488j0ba264vm4a46546kplma7s6gkkpz4zx";
x86_64-darwin = "15wdznihc2ra2fjy9p4j898vazjr4h5yighaxh7jk9kcvarg1658";
aarch64-linux = "0plw1an1z3v333irbc53skrmq2klas21srriiqkvmkgkfvpx1rq2";
armv7l-linux = "1ys82pa18qshpinaqqrskxvljzap20xwj5ncffn031yacg1y2qx2";
}.${system};
sourceRoot = {
@ -33,7 +33,7 @@ in
# Please backport all compatible updates to the stable release.
# This is important for the extension ecosystem.
version = "1.55.0";
version = "1.55.2";
pname = "vscodium";
executableName = "codium";

View file

@ -0,0 +1,49 @@
{ stdenv
, lib
, fetchFromGitHub
, python3
, qt5
, installShellFiles
}:
python3.pkgs.buildPythonApplication rec {
pname = "vimiv-qt";
version = "0.8.0";
src = fetchFromGitHub {
owner = "karlch";
repo = pname;
rev = "v${version}";
sha256 = "1pj3gak7nxkw9r9m71zsfvcaq8dk9crbk5rz4n7pravxkl5hs2bg";
};
nativeBuildInputs = [ installShellFiles qt5.wrapQtAppsHook python3.pkgs.setuptools ];
propagatedBuildInputs = with python3.pkgs; [ pyqt5 py3exiv2 qt5.qtsvg ];
postInstall = ''
install -Dm644 misc/vimiv.desktop $out/share/applications/vimiv.desktop
install -Dm644 misc/org.karlch.vimiv.qt.metainfo.xml $out/metainfo/org.karlch.vimiv.qt.metainfo.xml
install -Dm644 LICENSE $out/licenses/vimiv/LICENSE
install -Dm644 icons/vimiv.svg $out/icons/hicolor/scalable/apps/vimiv.svg
installManPage misc/vimiv.1
for i in 16 32 64 128 256 512; do
install -Dm644 icons/vimiv_''${i}x''${i}.png $out/icons/hicolor/''${i}x''${i}/apps/vimiv.png
done
'';
# Vimiv has to be wrapped manually because it is a non-ELF executable.
dontWrapQtApps = true;
preFixup = ''
wrapQtApp $out/bin/vimiv
'';
meta = with lib; {
description = "Image viewer with Vim-like keybindings (Qt port)";
license = licenses.gpl3Plus;
homepage = "https://github.com/karlch/vimiv-qt";
maintainers = with maintainers; [ dschrempf ];
platforms = platforms.all;
};
}

View file

@ -6,6 +6,8 @@
import re
import textwrap
from collections import OrderedDict
import feedparser
import requests
@ -30,6 +32,7 @@ for entry in feed.entries:
fixes += " " + zero_days.group(0)
print('\n' + '\n'.join(textwrap.wrap(fixes, width=72)))
if cve_list := re.findall(r'CVE-[^: ]+', content):
cve_list = list(OrderedDict.fromkeys(cve_list)) # Remove duplicates but preserve the order
cve_string = ' '.join(cve_list)
print("\nCVEs:\n" + '\n'.join(textwrap.wrap(cve_string, width=72)))
break # We only care about the most recent stable channel update

View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "starboard";
version = "0.9.2";
version = "0.10.0";
src = fetchFromGitHub {
owner = "aquasecurity";
repo = pname;
rev = "v${version}";
sha256 = "sha256-w+xaZPEMmJYDPQG4MuAlWMhwhEyeVcpaeDwqsnIbIHA=";
sha256 = "sha256-hieenhe3HsMqg7dMhvOUcvVGzBedYXqJRxEUkw4DG6o=";
};
vendorSha256 = "sha256-aVKQcRZgxhIph+y28HhR15DUjwiz/4+t1bMrYXjPW7Q=";
vendorSha256 = "sha256-Vj8t4v2o6x+tFLWy84W3tVaIf6WtFWXpvLQfeTbeGbM=";
subPackages = [ "cmd/starboard" ];

View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, gradle, perl, jre, makeWrapper, makeDesktopItem, mplayer }:
{ lib, stdenv, fetchFromGitHub, gradle_6, perl, jre, makeWrapper, makeDesktopItem, mplayer }:
let
version = "6.6.7-build-529";
@ -25,7 +25,7 @@ let
deps = stdenv.mkDerivation {
name = "${name}-deps";
inherit src;
buildInputs = [ gradle perl ];
buildInputs = [ gradle_6 perl ];
buildPhase = ''
export GRADLE_USER_HOME=$(mktemp -d)
( cd desktop
@ -47,7 +47,7 @@ in stdenv.mkDerivation {
inherit name src;
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ gradle ];
buildInputs = [ gradle_6 ];
buildPhase = ''
export GRADLE_USER_HOME=$(mktemp -d)

View file

@ -1,106 +0,0 @@
{ lib, stdenv, fetchurl, dpkg, makeWrapper
, alsaLib, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, glib
, gnome2, gtk3, gdk-pixbuf, libnotify, libxcb, nspr, nss, pango
, systemd, xorg, xprintidle-ng }:
let
version = "1.10.45";
rpath = lib.makeLibraryPath [
alsaLib
atk
cairo
cups
curl
dbus
expat
fontconfig
freetype
glib
gnome2.GConf
gdk-pixbuf
gtk3
pango
libnotify
libxcb
nspr
nss
stdenv.cc.cc
systemd
xorg.libxkbfile
xorg.libX11
xorg.libXcomposite
xorg.libXcursor
xorg.libXdamage
xorg.libXext
xorg.libXfixes
xorg.libXi
xorg.libXrandr
xorg.libXrender
xorg.libXtst
xorg.libXScrnSaver
] + ":${stdenv.cc.cc.lib}/lib64";
src =
if stdenv.hostPlatform.system == "x86_64-linux" then
fetchurl {
url = "https://github.com/johannesjo/super-productivity/releases/download/v${version}/superProductivity_${version}_amd64.deb";
sha256 = "0jfi0lfijnhij9jvkhxgyvq8m1jzaym8n1c7707fv3hjh1h0vxn1";
}
else
throw "super-productivity is not supported on ${stdenv.hostPlatform.system}";
in stdenv.mkDerivation {
pname = "super-productivity";
inherit version;
inherit src;
buildInputs = [
dpkg
gtk3 # needed for GSETTINGS_SCHEMAS_PATH
];
nativeBuildInputs = [ makeWrapper ];
unpackPhase = "dpkg -x $src .";
installPhase = ''
runHook preInstall
mkdir -p $out
cp -R usr/share $out/share
cp -R opt $out/libexec
# Otherwise it looks "suspicious"
chmod -R g-w $out
# set linker and rpath
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$out/libexec/superProductivity/superproductivity"
patchelf --set-rpath ${rpath}:$out/libexec/superProductivity "$out/libexec/superProductivity/superproductivity"
# wrapper for xdg_data_dirs and xprintidle path
makeWrapper $out/libexec/superProductivity/superproductivity $out/bin/superproductivity \
--prefix XDG_DATA_DIRS : $GSETTINGS_SCHEMAS_PATH \
--prefix PATH : "${xprintidle-ng}/bin"
# Fix the desktop link
substituteInPlace $out/share/applications/superproductivity.desktop \
--replace /opt/superProductivity/ $out/bin/
runHook postInstall
'';
dontStrip = true;
meta = with lib; {
description = "To Do List / Time Tracker with Jira Integration";
homepage = "https://super-productivity.com";
license = licenses.mit;
platforms = [ "x86_64-linux" ];
maintainers = with maintainers; [ offline ];
};
}

View file

@ -0,0 +1,55 @@
{ stdenv , lib , fetchurl , appimageTools , makeWrapper , electron_11 }:
let
electron = electron_11;
in
stdenv.mkDerivation rec {
pname = "super-productivity";
version = "6.5.2";
src = fetchurl {
url = "https://github.com/johannesjo/super-productivity/releases/download/v${version}/superProductivity-${version}.AppImage";
sha256 = "1ivl7chsv9axgk6nqkf580pav651hchi3di0mrp0pylpsqgk6f1f";
name = "${pname}-${version}.AppImage";
};
appimageContents = appimageTools.extractType2 {
name = "${pname}-${version}";
inherit src;
};
dontUnpack = true;
dontConfigure = true;
dontBuild = true;
nativeBuildInputs = [ makeWrapper ];
installPhase = ''
runHook preInstall
mkdir -p $out/bin $out/share/${pname} $out/share/applications
cp -a ${appimageContents}/{locales,resources} $out/share/${pname}
cp -a ${appimageContents}/superproductivity.desktop $out/share/applications/${pname}.desktop
cp -a ${appimageContents}/usr/share/icons $out/share
substituteInPlace $out/share/applications/${pname}.desktop \
--replace 'Exec=AppRun' 'Exec=${pname}'
runHook postInstall
'';
postFixup = ''
makeWrapper ${electron}/bin/electron $out/bin/${pname} \
--add-flags $out/share/${pname}/resources/app.asar \
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc ]}"
'';
meta = with lib; {
description = "To Do List / Time Tracker with Jira Integration";
homepage = "https://super-productivity.com";
license = licenses.mit;
platforms = [ "x86_64-linux" ];
maintainers = with maintainers; [ offline ];
};
}

View file

@ -22,7 +22,7 @@
, libGL
, freetype
, zlib
# Apple frameworks
# Apple frameworks
, CoreGraphics
, Cocoa
, Foundation
@ -68,6 +68,10 @@ rustPlatform.buildRustPackage rec {
fetchSubmodules = true;
};
postPatch = ''
echo ${version} > .tag
'';
cargoSha256 = "sha256-UaXeeuRuQk+CWF936mEAaWTjZuTSRPmxbQ/9E2oZIqg=";
nativeBuildInputs = [

View file

@ -0,0 +1,108 @@
{ lib
, fetchFromGitHub
, fetchzip
, mkDerivation
, stdenv
, Cocoa
, CoreAudio
, CoreFoundation
, MediaPlayer
, SDL2
, cmake
, libGL
, libX11
, libXrandr
, libvdpau
, mpv
, ninja
, pkg-config
, python3
, qtbase
, qtwayland
, qtwebchannel
, qtwebengine
, qtx11extras
}:
mkDerivation rec {
pname = "jellyfin-media-player";
version = "1.3.1";
src = fetchFromGitHub {
owner = "iwalton3";
repo = "jellyfin-media-player";
rev = "v${version}";
sha256 = "sha256-rXW6vC0Ow8xFblXjGYaDExAZM8RgqLkDHiX7R8vAWjI=";
};
jmpDist = fetchzip {
url = "https://github.com/iwalton3/jellyfin-web-jmp/releases/download/jwc-10.7.2/dist.zip";
sha256 = "sha256-EpNAN4nzINiwMrmg0e4x3uJRTy5ovx4ZkmP83Kbn4S0=";
};
patches = [
# the webclient-files are not copied in the regular build script. Copy them just like the linux build
./fix-osx-resources.patch
];
buildInputs = [
SDL2
libGL
libX11
libXrandr
libvdpau
mpv
qtbase
qtwebchannel
qtwebengine
qtx11extras
] ++ lib.optionals stdenv.isLinux [
qtwayland
] ++ lib.optionals stdenv.isDarwin [
Cocoa
CoreAudio
CoreFoundation
MediaPlayer
];
nativeBuildInputs = [
cmake
ninja
pkg-config
python3
];
cmakeFlags = [
"-DCMAKE_BUILD_TYPE=Release"
"-DQTROOT=${qtbase}"
"-GNinja"
];
preBuild = ''
# copy the webclient-files to the expected "dist" directory
mkdir -p dist
cp -a ${jmpDist}/* dist
'';
postInstall = lib.optionalString stdenv.isDarwin ''
mkdir -p $out/bin $out/Applications
mv "$out/Jellyfin Media Player.app" $out/Applications
# move web-client resources
mv $out/Resources/* "$out/Applications/Jellyfin Media Player.app/Contents/Resources/"
rmdir $out/Resources
# fix 'Could not find the Qt platform plugin "cocoa" in ""' error
wrapQtApp "$out/Applications/Jellyfin Media Player.app/Contents/MacOS/Jellyfin Media Player"
ln -s "$out/Applications/Jellyfin Media Player.app/Contents/MacOS/Jellyfin Media Player" $out/bin/jellyfinmediaplayer
'';
meta = with lib; {
homepage = "https://github.com/iwalton3/jellyfin-media-player";
description = "Jellyfin Desktop Client based on Plex Media Player";
license = with licenses; [ gpl2Plus mit ];
platforms = [ "x86_64-linux" "x86_64-darwin" ];
maintainers = with maintainers; [ jojosch ];
};
}

View file

@ -0,0 +1,15 @@
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 780c0d3..d9c2341 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -108,8 +108,8 @@ endif()
set(RESOURCE_ROOT .)
if(APPLE)
set(RESOURCE_ROOT Resources)
- add_resources(TARGET ${MAIN_TARGET} SOURCES ${CMAKE_CURRENT_BINARY_DIR}/../dist/ DEST ${RESOURCE_ROOT}/web-client/desktop)
- add_resources(TARGET ${MAIN_TARGET} SOURCES ${CMAKE_SOURCE_DIR}/native/ DEST ${RESOURCE_ROOT}/web-client/extension)
+ install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/../dist/ DESTINATION ${RESOURCE_ROOT}/web-client/desktop)
+ install(DIRECTORY ${CMAKE_SOURCE_DIR}/native/ DESTINATION ${RESOURCE_ROOT}/web-client/extension)
endif()
if(NOT APPLE)

View file

@ -20,11 +20,11 @@
buildPythonApplication rec {
pname = "jellyfin-mpv-shim";
version = "1.10.3";
version = "1.10.4";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-Tl7P8SJ/ZuwIi8RxDWkhfd7LUd63xv5Ehg1UqaYHb1g=";
sha256 = "sha256-QMyb69S8Ln4X0oUuLpL6vtgxJwq8f+Q4ReNckrN4E+E=";
};
propagatedBuildInputs = [

View file

@ -0,0 +1,44 @@
{ lib, stdenv ,fetchFromGitHub
, zig, wayland, pkg-config, scdoc
, xwayland, wayland-protocols, wlroots
, libxkbcommon, pixman, udev, libevdev, libX11, libGL
}:
stdenv.mkDerivation rec {
pname = "river";
version = "unstable-2021-04-08";
src = fetchFromGitHub {
owner = "ifreund";
repo = "river";
rev = "9e3e92050e04320949c6cd995273c30319ebd515";
sha256 = "1v8dpbadsb3c7bc84sai09dbqv5s5s5d77vs12kdkd45x0ppmk3j";
fetchSubmodules = true;
};
buildInputs = [ xwayland wayland-protocols wlroots pixman
libxkbcommon pixman udev libevdev libX11 libGL
];
preBuild = ''
export HOME=$TMPDIR
'';
installPhase = ''
zig build -Drelease-safe -Dxwayland -Dman-pages --prefix $out install
'';
nativeBuildInputs = [ zig wayland scdoc pkg-config ];
installFlags = [ "DESTDIR=$(out)" ];
meta = with lib; {
description = "A dynamic tiling wayland compositor";
longDescription = ''
river is a dynamic tiling wayland compositor that takes inspiration from dwm and bspwm.
'';
homepage = "https://github.com/ifreund/river";
license = licenses.gpl3Plus;
platforms = platforms.linux;
maintainers = with maintainers; [ branwright1 ];
};
}

View file

@ -1,7 +1,7 @@
{ lib, mkCoqDerivation, coq, version ? null , paco, coq-ext-lib }:
with lib; mkCoqDerivation rec {
pname = "ITree";
pname = "InteractionTrees";
owner = "DeepSpec";
inherit version;
defaultVersion = with versions; switch coq.coq-version [

View file

@ -38,6 +38,11 @@ buildPythonPackage rec {
pytestCheckHook
];
disabledTests = [
# https://github.com/pywemo/pywemo/issues/264
"test_rules_db_from_device"
];
pythonImportsCheck = [ "pywemo" ];
meta = with lib; {

View file

@ -1,7 +1,15 @@
{ lib, stdenv, buildPythonPackage, fetchPypi, makeWrapper, pythonOlder
, crytic-compile, prettytable, setuptools
# solc is currently broken on Darwin, default to false
, solc, withSolc ? !stdenv.isDarwin
{ lib
, stdenv
, buildPythonPackage
, fetchPypi
, makeWrapper
, pythonOlder
, crytic-compile
, prettytable
, setuptools
, solc
# solc is currently broken on Darwin, default to false
, withSolc ? !stdenv.isDarwin
}:
buildPythonPackage rec {
@ -35,6 +43,6 @@ buildPythonPackage rec {
'';
homepage = "https://github.com/trailofbits/slither";
license = licenses.agpl3Plus;
maintainers = with maintainers; [ asymmetric arturcygan ];
maintainers = with maintainers; [ arturcygan ];
};
}

View file

@ -7,7 +7,6 @@
, cssselect
, dateutil
, feedparser
, futures
, gdata
, gnupg
, google-api-python-client
@ -30,6 +29,7 @@
buildPythonPackage rec {
pname = "woob";
version = "3.0";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
@ -67,7 +67,7 @@ buildPythonPackage rec {
simplejson
termcolor
unidecode
] ++ lib.optionals isPy27 [ futures ];
];
checkPhase = ''
nosetests

View file

@ -61,13 +61,12 @@ in rec {
};
};
# NOTE: Gradle 7 is a release candidate, so point to 6.8.
gradle_latest = gradle_6_8;
gradle_latest = gradle_7;
gradle_7 = gradleGen (gradleSpec {
version = "7.0-rc-2";
version = "7.0";
nativeVersion = "0.22-milestone-11";
sha256 = "0gzvigyvwwizx90vnzhdnbm5rdaki11inxna11s4y67xkn8hrnx5";
sha256 = "01f3bjn8pbpni8kmxvx1dpwpf4zz04vj7cpm6025n0k188c8k2zb";
});
gradle_6_8 = gradleGen (gradleSpec {

View file

@ -3,14 +3,14 @@
with lib;
buildGoModule rec {
pname = "fcct";
version = "0.10.0";
pname = "butane";
version = "0.11.0";
src = fetchFromGitHub {
owner = "coreos";
repo = "fcct";
repo = "butane";
rev = "v${version}";
sha256 = "0gxaj2fy889fl5vhb4s89rhih9a65aqjsz2yffhi5z4fa2im8szv";
sha256 = "1s4rkq7mj1lyi8h47jyfy3qygfxhrmpihdy8rcnn55gcy04lm0qc";
};
vendorSha256 = null;
@ -20,17 +20,17 @@ buildGoModule rec {
subPackages = [ "internal" ];
buildFlagsArray = ''
-ldflags=-X github.com/coreos/fcct/internal/version.Raw=v${version}
-ldflags=-X github.com/coreos/butane/internal/version.Raw=v${version}
'';
postInstall = ''
mv $out/bin/{internal,fcct}
mv $out/bin/{internal,butane}
'';
meta = {
description = "Translates Fedora CoreOS configs into Ignition configs";
description = "Translates human-readable Butane configs into machine-readable Ignition configs";
license = licenses.asl20;
homepage = "https://github.com/coreos/fcct";
homepage = "https://github.com/coreos/butane";
maintainers = with maintainers; [ elijahcaine ruuda ];
platforms = platforms.unix;
};

View file

@ -1,7 +1,7 @@
{ lib, stdenv, fetchFromGitHub, jdk, gradleGen, makeDesktopItem, copyDesktopItems, perl, writeText, runtimeShell, makeWrapper, glib, wrapGAppsHook }:
let
# The default one still uses jdk8 (#89731)
gradle = (gradleGen.override (old: { java = jdk; })).gradle_latest;
gradle = (gradleGen.override (old: { java = jdk; })).gradle_6_8;
pname = "scenebuilder";
version = "15.0.1";

View file

@ -2,12 +2,12 @@
"x86_64-linux": {
"alpha": {
"experimental": {
"name": "factorio_alpha_x64-1.1.30.tar.xz",
"name": "factorio_alpha_x64-1.1.32.tar.xz",
"needsAuth": true,
"sha256": "14mcf9pj6s5ms2hl68n3r5jk1q5y2qzw88wiahsb5plkv9qyqyp6",
"sha256": "0ciz7y8xqlk9vg3akvflq1aabzgbqpazfnihyk4gsadk12b6a490",
"tarDirectory": "x64",
"url": "https://factorio.com/get-download/1.1.30/alpha/linux64",
"version": "1.1.30"
"url": "https://factorio.com/get-download/1.1.32/alpha/linux64",
"version": "1.1.32"
},
"stable": {
"name": "factorio_alpha_x64-1.1.30.tar.xz",
@ -38,12 +38,12 @@
},
"headless": {
"experimental": {
"name": "factorio_headless_x64-1.1.30.tar.xz",
"name": "factorio_headless_x64-1.1.32.tar.xz",
"needsAuth": false,
"sha256": "1rac6d8v8swiw1nn2hl53rhjfhsyv98qg8hfnwhfqn76jgspspdl",
"sha256": "0dg98ycs7m8rm996pk0p1iajalpmiy30p0pwr9dw2chf1d887kvz",
"tarDirectory": "x64",
"url": "https://factorio.com/get-download/1.1.30/headless/linux64",
"version": "1.1.30"
"url": "https://factorio.com/get-download/1.1.32/headless/linux64",
"version": "1.1.32"
},
"stable": {
"name": "factorio_headless_x64-1.1.30.tar.xz",

View file

@ -2,7 +2,7 @@
, makeWrapper
, fetchFromGitHub
, nixosTests
, gradle
, gradle_6
, perl
, jre
, libpulseaudio
@ -33,7 +33,7 @@ let
deps = stdenv.mkDerivation {
pname = "${pname}-deps";
inherit version src postPatch;
nativeBuildInputs = [ gradle perl ];
nativeBuildInputs = [ gradle_6 perl ];
buildPhase = ''
export GRADLE_USER_HOME=$(mktemp -d)
# https://github.com/gradle/gradle/issues/4426
@ -54,7 +54,7 @@ let
in stdenv.mkDerivation rec {
inherit pname version src postPatch;
nativeBuildInputs = [ gradle perl makeWrapper ];
nativeBuildInputs = [ gradle_6 perl makeWrapper ];
buildPhase = ''
export GRADLE_USER_HOME=$(mktemp -d)

View file

@ -1,8 +1,8 @@
{ stdenv, stdenvNoCC, fetchcvs, lib, groff, mandoc, zlib, bison, flex
{ stdenv, stdenvNoCC, lib, groff, mandoc, zlib, bison, flex
, writeText, buildPackages, splicePackages, symlinkJoin }:
let
fetchNetBSD = path: version: sha256: fetchcvs {
fetchNetBSD = path: version: sha256: buildPackages.fetchcvs {
cvsRoot = ":pserver:anoncvs@anoncvs.NetBSD.org:/cvsroot";
module = "src/${path}";
inherit sha256;

View file

@ -142,7 +142,10 @@ stdenv.mkDerivation {
passthru = {
modules = modules;
tests.nginx = nixosTests.nginx;
tests = {
inherit (nixosTests) nginx nginx-auth nginx-etag nginx-pubhtml nginx-sandbox nginx-sso;
variants = lib.recurseIntoAttrs nixosTests.nginx-variants;
};
};
meta = if meta != null then meta else {

View file

@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub, openssl, zlib, pcre, libxml2, libxslt
, substituteAll, gd, geoip, gperftools, jemalloc
, substituteAll, gd, geoip, gperftools, jemalloc, nixosTests
, withDebug ? false
, withMail ? false
, withStream ? false
@ -111,6 +111,11 @@ stdenv.mkDerivation rec {
mv $out/sbin $out/bin
'';
passthru = {
inherit modules;
tests = nixosTests.nginx-variants.tengine;
};
meta = {
description = "A web server based on Nginx and has many advanced features, originated by Taobao";
homepage = "https://tengine.taobao.org";

View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, jre, git, gradle, perl, makeWrapper }:
{ lib, stdenv, fetchFromGitHub, jre, git, gradle_6, perl, makeWrapper }:
let
name = "ma1sd-${version}";
@ -16,7 +16,7 @@ let
deps = stdenv.mkDerivation {
name = "${name}-deps";
inherit src;
nativeBuildInputs = [ gradle perl git ];
nativeBuildInputs = [ gradle_6 perl git ];
buildPhase = ''
export MA1SD_BUILD_VERSION=${rev}
@ -41,7 +41,7 @@ let
in
stdenv.mkDerivation {
inherit name src version;
nativeBuildInputs = [ gradle perl makeWrapper ];
nativeBuildInputs = [ gradle_6 perl makeWrapper ];
buildInputs = [ jre ];
buildPhase = ''

View file

@ -14,18 +14,25 @@ buildPythonPackage rec {
leaveDotGit = true;
};
# This is just so people installing from pip also get uwsgi
# installed, AFAICT.
# Django is depended on transitively by hyperkitty and postorius,
# and mailman_web has overly restrictive version bounds on it, so
# let's remove it.
postPatch = ''
# This is just so people installing from pip also get uwsgi
# installed, AFAICT.
sed -i '/^ uwsgi$/d' setup.cfg
# Django is depended on transitively by hyperkitty and postorius,
# and mailman_web has overly restrictive version bounds on it, so
# let's remove it.
sed -i '/^ Django/d' setup.cfg
# Upstream seems to mostly target installing on top of existing
# distributions, and uses a path appropriate for that, but we are
# a distribution, so use a state directory appropriate for a
# distro package.
substituteInPlace mailman_web/settings/base.py \
--replace /opt/mailman/web /var/lib/mailman-web
'';
nativeBuildInputs = [ git setuptools-scm makeWrapper ];
nativeBuildInputs = [ git makeWrapper setuptools-scm ];
propagatedBuildInputs = [ hyperkitty postorius whoosh ];
# Tries to check runtime configuration.

View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, jre, git, gradle, perl, makeWrapper }:
{ lib, stdenv, fetchFromGitHub, jre, git, gradle_6, perl, makeWrapper }:
let
name = "mxisd-${version}";
@ -16,7 +16,7 @@ let
deps = stdenv.mkDerivation {
name = "${name}-deps";
inherit src;
nativeBuildInputs = [ gradle perl git ];
nativeBuildInputs = [ gradle_6 perl git ];
buildPhase = ''
export MXISD_BUILD_VERSION=${rev}
@ -41,7 +41,7 @@ let
in
stdenv.mkDerivation {
inherit name src version;
nativeBuildInputs = [ gradle perl makeWrapper ];
nativeBuildInputs = [ gradle_6 perl makeWrapper ];
buildInputs = [ jre ];
patches = [ ./0001-gradle.patch ];

View file

@ -0,0 +1,91 @@
{ stdenv
, lib
, fetchFromGitHub
, fetchzip
, rustPlatform
, bootstrap_cmds
, DiskArbitration
, Foundation
, cmake
, libiconv
, openssl
, perl
, pkg-config}:
let
fetchNpmPackage = {name, version, hash, js_prod_file, js_dev_file, ...} @ args:
let
package = fetchzip {
url = "https://registry.npmjs.org/${name}/-/${baseNameOf name}-${version}.tgz";
inherit hash;
};
static = "./src/materialized/src/http/static";
cssVendor = "./src/materialized/src/http/static/css/vendor";
jsProdVendor = "./src/materialized/src/http/static/js/vendor";
jsDevVendor = "./src/materialized/src/http/static-dev/js/vendor";
files = with args; [
{ src = js_prod_file; dst = "${jsProdVendor}/${name}.js"; }
{ src = js_dev_file; dst = "${jsDevVendor}/${name}.js"; }
] ++ lib.optional (args ? css_file) { src = css_file; dst = "${cssVendor}/${name}.css"; }
++ lib.optional (args ? extra_file) { src = extra_file.src; dst = "${static}/${extra_file.dst}"; };
in
lib.concatStringsSep "\n" (lib.forEach files ({src, dst}: ''
mkdir -p "${dirOf dst}"
cp "${package}/${src}" "${dst}"
''));
npmPackages = import ./npm_deps.nix;
in
rustPlatform.buildRustPackage rec {
pname = "materialize";
version = "0.7.1";
rev = "f4bd159fa73d37d44f8ed3f1db13c0c2ff85566f";
src = fetchFromGitHub {
owner = "MaterializeInc";
repo = pname;
inherit rev;
hash = "sha256-8nonB/KRv4qOGvJhh0v3UwlBzAXfzb3afeCm/7/E0AU=";
};
cargoSha256 = "sha256-5slgICqLZFqxPymgHvq98BtcD70hfJMr36pvAoQKEJ4=";
nativeBuildInputs = [ cmake perl pkg-config ]
# Provides the mig command used by the krb5-src build script
++ lib.optional stdenv.isDarwin bootstrap_cmds;
buildInputs = [ openssl ]
++ lib.optionals stdenv.isDarwin [ libiconv DiskArbitration Foundation ];
# Skip tests that use the network
checkFlags = [
"--exact"
"--skip test_client"
"--skip test_client_errors"
"--skip test_no_block"
];
postPatch = ''
${lib.concatStringsSep "\n" (map fetchNpmPackage npmPackages)}
substituteInPlace ./misc/dist/materialized.service \
--replace /usr/bin $out/bin \
--replace _Materialize root
'';
MZ_DEV_BUILD_SHA = rev;
cargoBuildFlags = [ "--package materialized" ];
postInstall = ''
install --mode=444 -D ./misc/dist/materialized.service $out/etc/systemd/system/materialized.service
'';
meta = with lib; {
homepage = "https://materialize.com";
description = "A streaming SQL materialized view engine for real-time applications";
license = licenses.bsl11;
platforms = [ "x86_64-linux" "x86_64-darwin" ];
maintainers = [ maintainers.petrosagg ];
};
}

View file

@ -0,0 +1,62 @@
# materialized doesn't use npm to pull in its few node dependencies but instead
# manually pulls the tar archives for each package and pulls out a couple of
# files.
#
# The list of modules can be found in this file
# https://github.com/MaterializeInc/materialize/blob/master/src/materialized/build/npm.rs
[
{
name = "@hpcc-js/wasm";
version = "0.3.14";
hash = "sha256-EsbuFk9qtlm9yWpG29RnqVAHrP0rk3xyibQLy8qgRT4=";
js_prod_file = "dist/index.min.js";
js_dev_file = "dist/index.js";
extra_file = {
src = "dist/graphvizlib.wasm";
dst = "js/vendor/@hpcc-js/graphvizlib.wasm";
};
}
{
name = "babel-standalone";
version = "6.26.0";
hash = "sha256-zdeTj4aOEzWvrnh90T80jL+RD8qg8PaeG0Ceua82Dz4=";
js_prod_file = "babel.min.js";
js_dev_file = "babel.js";
}
{
name = "d3";
version = "5.16.0";
hash = "sha256-aQQRhnJxV5/9C+cQslctP3v/AePGfbSw8L3chObJzK4=";
js_prod_file = "dist/d3.min.js";
js_dev_file = "dist/d3.js";
}
{
name = "d3-flame-graph";
version = "3.1.1";
hash = "sha256-Ls3MqALr6+/A+n8jqFw7frIB++6d1W3lAXKU0qFZ2ok=";
css_file = "dist/d3-flamegraph.css";
js_prod_file = "dist/d3-flamegraph.min.js";
js_dev_file = "dist/d3-flamegraph.js";
}
{
name = "pako";
version = "1.0.11";
hash = "sha256-St7nKpcYlJQl8qMmPkEHwmTufOHAeZK4lBZHo8VRXLA=";
js_prod_file = "dist/pako.min.js";
js_dev_file = "dist/pako.js";
}
{
name = "react";
version = "16.14.0";
hash = "sha256-X/8Bc4XvC8IqQWbW/PCRJQpmOBI/0AZT/hSFBf/uJU8=";
js_prod_file = "umd/react.production.min.js";
js_dev_file = "umd/react.development.js";
}
{
name = "react-dom";
version = "16.14.0";
hash = "sha256-2mYm9dwBFrWws6CB5bL6ghROTzX84RLM31hdnEbhG10=";
js_prod_file = "umd/react-dom.production.min.js";
js_dev_file = "umd/react-dom.development.js";
}
]

View file

@ -16,13 +16,13 @@
stdenv.mkDerivation rec {
pname = "ytfzf";
version = "1.1.2";
version = "1.1.3";
src = fetchFromGitHub {
owner = "pystardust";
repo = "ytfzf";
rev = "v${version}";
sha256 = "09az557479d3s1my46d2w86ndkvs2xi127kaw0csag0wlq2qq10p";
sha256 = "sha256-ST6ZSNJW4Pe8fdwRsQ0BLdCd3AE9OTG6is3J+HMdIzs=";
};
patches = [

View file

@ -185,6 +185,7 @@ mapAliases ({
exfat-utils = exfat; # 2015-09-11
facette = throw "facette has been removed."; # added 2020-01-06
fast-neural-doodle = throw "fast-neural-doodle has been removed, as the upstream project has been abandoned"; # added 2020-03-28
fedora-coreos-config-transpiler = throw "fedora-coreos-config-transpiler has been renamed to 'butane'."; # added 2021-04-13
fetchFromGithub = throw "You meant fetchFromGitHub, with a capital H.";
ffadoFull = ffado; # added 2018-05-01
firefox-esr-68 = throw "Firefox 68 ESR reached end of life with its final release 68.12esr on 2020-08-25 and was therefore removed from nixpkgs";

View file

@ -1240,8 +1240,6 @@ in
fedora-backgrounds = callPackage ../data/misc/fedora-backgrounds { };
fedora-coreos-config-transpiler = callPackage ../development/tools/fedora-coreos-config-transpiler { };
ccextractor = callPackage ../applications/video/ccextractor { };
cconv = callPackage ../tools/text/cconv { };
@ -1748,6 +1746,8 @@ in
blur-effect = callPackage ../tools/graphics/blur-effect { };
butane = callPackage ../development/tools/butane { };
charles = charles4;
inherit (callPackage ../applications/networking/charles {})
charles3
@ -2649,6 +2649,10 @@ in
jellyfin_10_5 = callPackage ../servers/jellyfin/10.5.x.nix { };
jellyfin-media-player = libsForQt5.callPackage ../applications/video/jellyfin-media-player {
inherit (darwin.apple_sdk.frameworks) CoreFoundation Cocoa CoreAudio MediaPlayer;
};
jellyfin-mpv-shim = python3Packages.callPackage ../applications/video/jellyfin-mpv-shim { };
jotta-cli = callPackage ../applications/misc/jotta-cli { };
@ -2914,6 +2918,8 @@ in
psrecord = python3Packages.callPackage ../tools/misc/psrecord {};
river = callPackage ../applications/window-managers/river { };
rmapi = callPackage ../applications/misc/remarkable/rmapi { };
rmview = libsForQt5.callPackage ../applications/misc/remarkable/rmview { };
@ -18556,6 +18562,11 @@ in
nodejs-slim = nodejs-slim-12_x;
};
materialize = callPackage ../servers/sql/materialize {
inherit (buildPackages.darwin) bootstrap_cmds;
inherit (darwin.apple_sdk.frameworks) DiskArbitration Foundation;
};
mattermost = callPackage ../servers/mattermost { };
matterircd = callPackage ../servers/mattermost/matterircd.nix { };
matterbridge = callPackage ../servers/matterbridge { };
@ -23549,7 +23560,7 @@ in
withPortAudio = stdenv.isDarwin;
};
super-productivity = callPackage ../applications/networking/super-productivity { };
super-productivity = callPackage ../applications/office/super-productivity { };
wlroots = callPackage ../development/libraries/wlroots {
inherit (xorg) xcbutilrenderutil;
@ -26273,6 +26284,8 @@ in
vimiv = callPackage ../applications/graphics/vimiv { };
vimiv-qt = callPackage ../applications/graphics/vimiv-qt { };
macvim = callPackage ../applications/editors/vim/macvim-configurable.nix { stdenv = clangStdenv; };
vimHugeX = vim_configurable;