Merge master into staging-next

This commit is contained in:
github-actions[bot] 2022-06-07 00:01:57 +00:00 committed by GitHub
commit 2f2c028d6c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
77 changed files with 371 additions and 5296 deletions

View File

@ -3770,12 +3770,6 @@
githubId = 57923898;
name = "Elyhaka";
};
em0lar = {
email = "nix@em0lar.dev";
github = "em0lar";
githubId = 11006031;
name = "Leo Maroni";
};
emmabastas = {
email = "emma.bastas@protonmail.com";
matrix = "@emmabastas:matrix.org";
@ -7288,6 +7282,12 @@
githubId = 8355305;
name = "leo60228";
};
leona = {
email = "nix@leona.is";
github = "leona-ya";
githubId = 11006031;
name = "Leona Maroni";
};
leonardoce = {
email = "leonardo.cecchi@gmail.com";
github = "leonardoce";
@ -10235,6 +10235,12 @@
githubId = 10473184;
name = "Jia Xiaodong";
};
pogobanane = {
email = "mail@peter-okelmann.de";
github = "pogobanane";
githubId = 38314551;
name = "Peter Okelmann";
};
polarmutex = {
email = "brian@brianryall.xyz";
github = "polarmutex";
@ -12006,6 +12012,12 @@
githubId = 26806;
name = "Scott Olson";
};
somasis = {
email = "kylie@somas.is";
github = "somasis";
githubId = 264788;
name = "Kylie McClain";
};
SomeoneSerge = {
email = "sergei.kozlukov@aalto.fi";
matrix = "@ss:someonex.net";

View File

@ -310,7 +310,11 @@ in
mkdir -m 0700 -p ${baseDir}/queue-runner
mkdir -m 0750 -p ${baseDir}/build-logs
chown hydra-queue-runner:hydra ${baseDir}/queue-runner ${baseDir}/build-logs
mkdir -m 0750 -p ${baseDir}/runcommand-logs
chown hydra-queue-runner.hydra \
${baseDir}/queue-runner \
${baseDir}/build-logs \
${baseDir}/runcommand-logs
${optionalString haveLocalDB ''
if ! [ -e ${baseDir}/.db-created ]; then

View File

@ -51,9 +51,6 @@ in {
extraModulePaths = mkOption {
type = types.listOf types.str;
default = [];
example = literalExpression ''
[ "''${pkgs.syslogng_incubator}/lib/syslog-ng" ]
'';
description = ''
A list of paths that should be included in syslog-ng's
<literal>--module-path</literal> option. They should usually

View File

@ -17,6 +17,7 @@ let
# Run the tests for each platform. You can run a test by doing
# e.g. nix-build -A tests.login.x86_64-linux, or equivalently,
# nix-build tests/login.nix -A result.
# See also nixosTests in pkgs/top-level/all-packages.nix
allTestsForSystem = system:
import ./tests/all-tests.nix {
inherit system;
@ -24,7 +25,19 @@ let
callTest = t: {
${system} = hydraJob t.test;
};
} // {
# for typechecking of the scripts and evaluation of
# the nodes, without running VMs.
allDrivers =
import ./tests/all-tests.nix {
inherit system;
pkgs = import ./.. { inherit system; };
callTest = t: {
${system} = hydraJob t.test.driver;
};
};
};
allTests =
foldAttrs recursiveUpdate {} (map allTestsForSystem supportedSystems);

View File

@ -27,21 +27,7 @@ let
};
evalMinimalConfig = module: nixosLib.evalModules { modules = [ module ]; };
allDrivers = getDrivers tests;
getDrivers = ts:
if isDerivation ts
then ts.driver or null
else if isAttrs ts
then recurseIntoAttrs (mapAttrs (k: getDrivers) ts)
else null;
tests = {
# for typechecking of the scripts and evaluation of
# the nodes, without running VMs.
inherit allDrivers;
in {
_3proxy = handleTest ./3proxy.nix {};
acme = handleTest ./acme.nix {};
adguardhome = handleTest ./adguardhome.nix {};
@ -634,5 +620,4 @@ let
zookeeper = handleTest ./zookeeper.nix {};
zrepl = handleTest ./zrepl.nix {};
zsh-history = handleTest ./zsh-history.nix {};
};
in tests
}

View File

@ -12,7 +12,7 @@ with lib;
testScript = ''
machine.wait_for_unit("radarr.service")
machine.wait_for_open_port("7878")
machine.wait_for_open_port(7878)
machine.succeed("curl --fail http://localhost:7878/")
'';
})

View File

@ -1,9 +1,7 @@
import ./make-test-python.nix ({ pkgs, lib, ... }: {
name = "vikunja";
meta = with lib.maintainers; {
maintainers = [ em0lar ];
};
meta.maintainers = with lib.maintainers; [ leona ];
nodes = {
vikunjaSqlite = { ... }: {

View File

@ -19,20 +19,20 @@
stdenv.mkDerivation rec {
pname = "amberol";
version = "0.6.3";
version = "0.7.0";
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
owner = "World";
repo = pname;
rev = version;
hash = "sha256-KV3nYJbLaQxpMpC7aCzfpNMe9bYpZKrdoOtYA++eC74=";
hash = "sha256-cBHFyPqhgcFOeYqMhF1aX3XCGAtqEZpI7Mj7b78Etmo=";
};
cargoDeps = rustPlatform.fetchCargoTarball {
inherit src;
name = "${pname}-${version}";
hash = "sha256-UjHL/5iVht2jPnOiYjoIKWJdvwQQkNuKfF8rpi48j3c=";
hash = "sha256-GaMJsIrTbhI1tmahEMlI1v5hmjw+tFEv9Wdne/kiYIA=";
};
postPatch = ''
@ -68,7 +68,7 @@ stdenv.mkDerivation rec {
];
meta = with lib; {
homepage = "https://gitlab.gnome.org/ebassi/amberol";
homepage = "https://gitlab.gnome.org/World/amberol";
description = "A small and simple sound and music player";
maintainers = with maintainers; [ linsui ];
license = licenses.gpl3Plus;

View File

@ -5,6 +5,7 @@
, python3Packages
, ffmpeg
, flac
, libjxl
, librsvg
, gobject-introspection
, gtk3
@ -14,6 +15,7 @@
, mpg123
, libopenmpt
, opusfile
, wavpack
, pango
, pulseaudio
, withDiscordRPC ? false
@ -21,13 +23,13 @@
stdenv.mkDerivation rec {
pname = "tauon";
version = "7.1.3";
version = "7.2.1";
src = fetchFromGitHub {
owner = "Taiko2k";
repo = "TauonMusicBox";
rev = "v${version}";
sha256 = "sha256-UadE8qsQxRjE+POHLAUY1tRUInNXsMEqTAP02zSDSZ4=";
sha256 = "sha256-wEGdqMKLhKjnxNTgqNQpUpYkMk/FuRAKsWX+P/9nUG4=";
};
postPatch = ''
@ -70,6 +72,7 @@ stdenv.mkDerivation rec {
opusfile
pango
pulseaudio
wavpack
];
pythonPath = with python3Packages; [
@ -77,12 +80,15 @@ stdenv.mkDerivation rec {
gst-python
dbus-python
isounidecode
libjxl
musicbrainzngs
mutagen
natsort
pillow
plexapi
pulsectl
pycairo
PyChromecast
pylast
pygobject3
pylyrics

View File

@ -1,73 +0,0 @@
{ lib, python3Packages, fetchFromGitHub, imagemagick, librsvg, gtk3, jhead
, gnome
# Test requirements
, dbus, xvfb-run, xdotool
}:
python3Packages.buildPythonApplication rec {
pname = "vimiv";
version = "0.7.3";
src = fetchFromGitHub {
owner = "karlch";
repo = "vimiv";
rev = "v${version}";
sha256 = "18dn81n8hcrqhrqfida34qz7a0ar9rz2rrmzsvyp54zc6nyvv1cn";
};
testimages = fetchFromGitHub {
owner = "karlch";
repo = "vimiv";
rev = "6f4d1372b27f2065c56eafdb521d230d9bb8f4e2";
sha256 = "0a3aybzpms0381dz9japhm4c7j5klhmw91prcac6zaww6x34nmxb";
};
postPatch = ''
patchShebangs scripts/install_icons.sh
sed -i -e 's,/usr,,g' -e '/setup\.py/d' Makefile scripts/install_icons.sh
sed -i \
-e 's,/etc/vimiv/\(vimivrc\|keys\.conf\),'"$out"'&,g' \
man/* vimiv/parser.py
sed -i \
-e 's!"mogrify"!"${imagemagick}/bin/mogrify"!g' \
-e '/cmd *=/s!"jhead"!"${jhead}/bin/jhead"!g' \
vimiv/imageactions.py
'';
checkInputs = [ python3Packages.nose dbus.daemon xvfb-run xdotool ];
buildInputs = [ gnome.adwaita-icon-theme librsvg ];
propagatedBuildInputs = with python3Packages; [ pillow pygobject3 gtk3 ];
makeWrapperArgs = [
"--prefix GI_TYPELIB_PATH : \"$GI_TYPELIB_PATH\""
"--suffix XDG_DATA_DIRS : \"$XDG_ICON_DIRS:$out/share\""
"--set GDK_PIXBUF_MODULE_FILE \"$GDK_PIXBUF_MODULE_FILE\""
];
postCheck = ''
# Some tests assume that the directory only contains one vimiv directory
rm -rf vimiv.egg-info vimiv.desktop
# Re-use the wrapper args from the main program
makeWrapper "$SHELL" run-tests $makeWrapperArgs
cp -Rd --no-preserve=mode "$testimages/testimages" vimiv/testimages
HOME="$(mktemp -d)" PATH="$out/bin:$PATH" \
xvfb-run -s '-screen 0 800x600x24' dbus-run-session \
--config-file=${dbus.daemon}/share/dbus-1/session.conf \
./run-tests -c 'python tests/main_test.py && nosetests -vx'
'';
postInstall = "make DESTDIR=\"$out\" install";
meta = {
homepage = "https://github.com/karlch/vimiv";
description = "An image viewer with Vim-like keybindings";
license = lib.licenses.mit;
platforms = lib.platforms.linux;
broken = true;
};
}

View File

@ -41,7 +41,7 @@ buildDotnetModule rec {
'';
passthru = {
updateScript = ./updater.sh;
updateScript = ./update.sh;
ui = callPackage ./web-ui { };
};

View File

@ -1,6 +1,6 @@
#!/usr/bin/env nix-shell
#!nix-shell -I nixpkgs=../../../.. -i bash -p curl gnused jq common-updater-scripts nuget-to-nix
set -exo pipefail
set -euox pipefail
cd "$(dirname "${BASH_SOURCE[0]}")"
deps_file="$(realpath ./deps)"
@ -15,15 +15,21 @@ if [[ "$new_version" == "$old_version" ]]; then
fi
fi
asf_path=$(pwd)
cd ../../../..
nixpkgs_path=$(pwd)
if [[ "$1" != "--deps-only" ]]; then
if [[ "${1:-}" != "--deps-only" ]]; then
update-source-version ArchiSteamFarm "$new_version"
fi
store_src="$(nix-build -A ArchiSteamFarm.src --no-out-link)"
platforms="$(nix-instantiate --strict --eval --json -A ArchiSteamFarm.meta.platforms | jq -r .[])"
src="$(mktemp -d /tmp/ArchiSteamFarm-src.XXX)"
trap '
rm -r "$src"
' EXIT
cp -rT "$store_src" "$src"
chmod -R +w "$src"
@ -36,15 +42,12 @@ for i in $platforms; do
nix-shell -I nixpkgs="$nixpkgs_path" -p dotnet-sdk_6 --argstr system $i --run "
mkdir ./nuget_pkgs-$i
for project in ArchiSteamFarm/ArchiSteamFarm.csproj ArchiSteamFarm.Tests/ArchiSteamFarm.Tests.csproj; do
dotnet restore $project --packages ./nuget_pkgs-$i
dotnet restore \$project --packages ./nuget_pkgs-$i
done;
nuget-to-nix ./nuget_pkgs-$i > $deps_file-$i.nix" \
|| echo "Did you set up binformat for $i?";
done;
trap '
popd
rm -r "$src"
' EXIT
cd "$asf_path"
./web-ui/update.sh

View File

@ -1,17 +1,19 @@
#!/usr/bin/env nix-shell
#! nix-shell -i bash -p nodePackages.node2nix gnused jq curl
#! nix-shell -I nixpkgs=../../../.. -i bash -p nodePackages.node2nix gnused jq curl
set -eoux pipefail
pushd ../../../..
version=$(nix-instantiate --strict --eval -A ArchiSteamFarm.version | jq -r)
ui=$(curl ${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} https://api.github.com/repos/JustArchiNET/ArchiSteamFarm/contents/ASF-ui?ref=${version} | jq -r .sha)
popd
pushd "$(dirname "$0")"
ui=$(curl ${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} "https://api.github.com/repos/JustArchiNET/ArchiSteamFarm/contents/ASF-ui?ref=$version" | jq -r .sha)
pushd $(dirname "$0")
curl https://raw.githubusercontent.com/JustArchiNET/ASF-ui/${ui}/package-lock.json -o package-lock.json
curl https://raw.githubusercontent.com/JustArchiNET/ASF-ui/${ui}/package.json -o package.json
curl "https://raw.githubusercontent.com/JustArchiNET/ASF-ui/$ui/package-lock.json" -o package-lock.json
curl "https://raw.githubusercontent.com/JustArchiNET/ASF-ui/$ui/package.json" -o package.json
# update-source-version doesn't work for some reason
sed -i "s/rev\\s*=\\s*.*/rev = \"$ui\";/" default.nix
sed -i "s/sha256\\s*=\\s*.*/sha256 = \"$(nix-prefetch-url --unpack https://github.com/JustArchiNET/ASF-ui/archive/$ui.tar.gz)\";/" default.nix
sed -i "s/sha256\\s*=\\s*.*/sha256 = \"$(nix-prefetch-url --unpack "https://github.com/JustArchiNET/ASF-ui/archive/$ui.tar.gz")\";/" default.nix
node2nix \
--nodejs-14 \

View File

@ -3,42 +3,38 @@
, fetchFromGitHub
, qtbase
, qmake
, qttools
, wrapQtAppsHook
, copyDesktopItems
, makeDesktopItem
}:
stdenv.mkDerivation rec {
pname = "cubiomes-viewer";
version = "2.1.1";
version = "2.2.2";
src = fetchFromGitHub {
owner = "Cubitect";
repo = pname;
rev = version;
sha256 = "sha256-cIA6W82XEeW0k9WNygZ/KVFZE31QThpkV4OazVEvmtw=";
sha256 = "sha256-jwYmgA2JtWpEbuuFPwGdKKaSZ2uAs3t7CCCeu6eD9nI=";
fetchSubmodules = true;
};
postPatch = ''
substituteInPlace cubiomes-viewer.pro \
--replace '$$[QT_INSTALL_BINS]/lupdate' lupdate \
--replace '$$[QT_INSTALL_BINS]/lrelease' lrelease
'';
buildInputs = [
qtbase
];
nativeBuildInputs = [
qmake
qttools
wrapQtAppsHook
copyDesktopItems
];
desktopItems = [ (makeDesktopItem {
name = pname;
desktopName = "Cubiomes Viewer";
exec = pname;
icon = pname;
categories = [ "Game" ];
comment = meta.description;
}) ];
preBuild = ''
# QMAKE_PRE_LINK is not executed (I dont know why)
make -C ./cubiomes libcubiomes CFLAGS="-DSTRUCT_CONFIG_OVERRIDE=1" all
@ -50,8 +46,9 @@ stdenv.mkDerivation rec {
mkdir -p $out/bin
cp cubiomes-viewer $out/bin
mkdir -p $out/share/pixmaps
cp rc/icons/map.png $out/share/pixmaps/cubiomes-viewer.png
mkdir -p $out/share/{pixmaps,applications}
cp rc/icons/map.png $out/share/pixmaps/com.github.cubitect.cubiomes-viewer.png
cp etc/com.github.cubitect.cubiomes-viewer.desktop $out/share/applications
runHook postInstall
'';

View File

@ -1,19 +0,0 @@
QT += core network widgets
DEFINES += APP_ENVIRONMENT=\\\"production\\\"
DEFINES += APP_VERSION=\\\"@version@\\\"
TARGET = toggldesktop
TEMPLATE = app
SOURCES += *.cpp
HEADERS += *.h
FORMS += *.ui
RESOURCES += *.qrc
target.path = $$PREFIX
INSTALLS += target
CONFIG += link_pkgconfig
PKGCONFIG += bugsnag-qt qxtglobalshortcut qt-oauth-lib toggl x11 xscrnsaver

View File

@ -1,157 +0,0 @@
{ mkDerivation, lib, fetchFromGitHub, buildEnv, makeDesktopItem, runCommand, writeText, pkg-config
, cmake, qmake, cacert, jsoncpp, libX11, libXScrnSaver, lua, openssl, poco
, qtbase, qtwebengine, qtx11extras, sqlite }:
let
name = "toggldesktop-${version}";
version = "7.4.231";
src = fetchFromGitHub {
owner = "toggl";
repo = "toggldesktop";
rev = "v${version}";
sha256 = "sha256-YaeeUlwz42i1ik5nUKSIy0IBrvu1moi95dBK2lKfGAY=";
};
bugsnag-qt = mkDerivation rec {
pname = "bugsnag-qt";
version = "20180522.005732";
src = fetchFromGitHub {
owner = "alpakido";
repo = "bugsnag-qt";
rev = version;
sha256 = "sha256-2L7pxdQOniwrp1Kgq3Q8BFbjb2yGtGoKUiQC+B6tRgs=";
};
nativeBuildInputs = [ qmake ];
buildInputs = [ qtbase ];
};
qxtglobalshortcut = mkDerivation rec {
pname = "qxtglobalshortcut";
version = "f584471dada2099ba06c574bdfdd8b078c2e3550";
src = fetchFromGitHub {
owner = "hluk";
repo = "qxtglobalshortcut";
rev = version;
sha256 = "sha256-gb94rqK8j1mbD4YSXdOaxCdczZJFC6MU+iBsdf07wcc=";
};
nativeBuildInputs = [ cmake ];
buildInputs = [ qtbase qtx11extras ];
};
qt-oauth-lib = mkDerivation rec {
pname = "qt-oauth-lib";
version = "20190125.190943";
src = fetchFromGitHub {
owner = "alpakido";
repo = "qt-oauth-lib";
rev = version;
sha256 = "sha256-MjtNAN4F9JJFxM8MYpCv8tPe26RHtbXdq+lY49p+rn4=";
};
nativeBuildInputs = [ qmake ];
buildInputs = [ qtbase qtwebengine ];
};
poco-pc = writeText "poco.pc" ''
Name: Poco
Description: ${poco.meta.description}
Version: ${poco.version}
Libs: -L${poco}/lib -lPocoDataSQLite -lPocoData -lPocoNet -lPocoNetSSL -lPocoCrypto -lPocoUtil -lPocoXML -lPocoFoundation
Cflags: -I${poco}/include/Poco
'';
poco-pc-wrapped = runCommand "poco-pc-wrapped" {} ''
mkdir -p $out/lib/pkgconfig && ln -s ${poco-pc} $_/poco.pc
'';
libtoggl = mkDerivation {
name = "libtoggl-${version}";
inherit src version;
sourceRoot = "source/src";
nativeBuildInputs = [ qmake pkg-config ];
buildInputs = [ jsoncpp lua openssl poco poco-pc-wrapped sqlite libX11 ];
postPatch = ''
cat ${./libtoggl.pro} > libtoggl.pro
rm get_focused_window_{mac,windows}.cc
'';
};
toggldesktop = mkDerivation {
name = "${name}-unwrapped";
inherit src version;
sourceRoot = "source/src/ui/linux/TogglDesktop";
postPatch = ''
substituteAll ${./TogglDesktop.pro} TogglDesktop.pro
substituteInPlace toggl.cpp \
--replace ./../../../toggl_api.h toggl_api.h
'';
postInstall = ''
ln -s ${cacert}/etc/ssl/certs/ca-bundle.crt $out/cacert.pem
'';
nativeBuildInputs = [ qmake pkg-config ];
buildInputs = [
bugsnag-qt
libtoggl
qxtglobalshortcut
qtbase
qtwebengine
qt-oauth-lib
qtx11extras
libX11
libXScrnSaver
];
};
toggldesktop-icons = mkDerivation {
name = "${name}-icons";
inherit (toggldesktop) src sourceRoot;
installPhase = ''
for f in icons/*; do
mkdir -p $out/share/icons/hicolor/$(basename $f)/apps
mv $f/toggldesktop.png $_
done
'';
};
toggldesktop-wrapped = runCommand "toggldesktop-wrapped" {} ''
mkdir -p $out/bin && ln -s ${toggldesktop}/toggldesktop $_
'';
desktopItem = makeDesktopItem rec {
categories = [ "Utility" ];
desktopName = "Toggl";
genericName = desktopName;
name = "toggldesktop";
exec = "${toggldesktop-wrapped}/bin/toggldesktop";
icon = "toggldesktop";
};
in
buildEnv {
inherit name;
paths = [ desktopItem toggldesktop-icons toggldesktop-wrapped ];
meta = with lib; {
broken = true; # libtoggl is broken
description = "Client for Toggl time tracking service";
homepage = "https://github.com/toggl/toggldesktop";
license = licenses.bsd3;
maintainers = with maintainers; [ yana ];
platforms = platforms.linux;
};
}

View File

@ -1,20 +0,0 @@
TARGET = toggl
TEMPLATE = lib
SOURCES += *.cc
HEADERS += *.h
headers.files = $$HEADERS
headers.path = $$PREFIX/include
target.path = $$PREFIX/lib
INSTALLS += headers target
CONFIG += create_prl create_pc link_pkgconfig
PKGCONFIG += jsoncpp openssl lua poco sqlite3 x11
QMAKE_PKGCONFIG_NAME = $$TARGET
QMAKE_PKGCONFIG_PREFIX = $$PREFIX
QMAKE_PKGCONFIG_LIBDIR = $$target.path
QMAKE_PKGCONFIG_INCDIR = $$headers.path
QMAKE_PKGCONFIG_DESTDIR = pkgconfig

View File

@ -978,6 +978,15 @@
"vendorSha256": "sha256-MMUit5RxsymBNX9fH8B6D2gJ/k5zaN6FCyP9N/+TV+E=",
"version": "3.2.0"
},
"remote": {
"owner": "tenstad",
"provider-source-address": "registry.terraform.io/tenstad/remote",
"repo": "terraform-provider-remote",
"rev": "v0.0.24",
"sha256": "sha256-ksOp9okCdJXOQOsJrJ6tD+aLpPIuwkIxuIGtQ+d7e4k=",
"vendorSha256": "sha256-AAqilm26uz3Kt/JxwEbi8GULZstIs/6Vc+uShXbsZTs=",
"version": "0.0.24"
},
"rundeck": {
"owner": "rundeck",
"provider-source-address": "registry.terraform.io/rundeck/rundeck",

View File

@ -1,27 +0,0 @@
{ lib, stdenv, fetchurl, libxslt, glib, libxml2, telepathy-glib, python2, avahi, libsoup
, libuuid, openssl, pcre, sqlite, pkg-config }:
stdenv.mkDerivation rec {
pname = "telepathy-salut";
version = "0.8.1";
src = fetchurl {
url = "https://telepathy.freedesktop.org/releases/telepathy-salut/telepathy-salut-${version}.tar.gz";
sha256 = "13k112vrr3zghzr03pnbqc1id65qvpj0sn0virlbf4dmr2511fbh";
};
# pcre needed because https://github.com/NixOS/nixpkgs/pull/15046
buildInputs = [ glib libxml2 telepathy-glib avahi libsoup libuuid openssl
sqlite pcre python2 ];
nativeBuildInputs = [ libxslt pkg-config ];
configureFlags = [ "--disable-avahi-tests" ];
meta = with lib; {
description = "Link-local XMPP connection manager for Telepathy";
platforms = platforms.gnu ++ platforms.linux; # Random choice
maintainers = [ ];
broken = true;
};
}

View File

@ -1,34 +0,0 @@
{lib, stdenv, fetchurl, ncurses}:
stdenv.mkDerivation rec {
pname = "iptraf";
version = "3.0.1";
src = fetchurl {
url = "ftp://iptraf.seul.org/pub/iptraf/iptraf-${version}tar.gz";
sha256 = "12n059j9iihhpf6spmlaspqzxz3wqan6kkpnhmlj08jdijpnk84m";
};
hardeningDisable = [ "format" ];
patchPhase = ''
sed -i -e 's,#include <linux/if_tr.h>,#include <netinet/if_tr.h>,' src/*
'';
preConfigure = "cd src";
installPhase = ''
mkdir -p $out/bin
cp iptraf $out/bin
'';
buildInputs = [ncurses];
meta = {
homepage = "http://iptraf.seul.org/";
license = lib.licenses.gpl2Plus;
description = "Console-based network statistics utility for Linux";
platforms = lib.platforms.linux;
broken = true; # required isdn headers have been removed from the linux kernel
};
}

View File

@ -1,66 +0,0 @@
{ lib, fetchFromGitHub, fetchpatch, libnotify, librsvg, killall
, gtk3, libappindicator-gtk3, substituteAll, syncthing, wrapGAppsHook
, gnome, buildPythonApplication, python-dateutil, pyinotify, pygobject3
, bcrypt, gobject-introspection, gsettings-desktop-schemas
, pango, gdk-pixbuf, atk }:
buildPythonApplication rec {
version = "0.9.4.4";
pname = "syncthing-gtk";
src = fetchFromGitHub {
owner = "syncthing";
repo = "syncthing-gtk";
rev = "v${version}";
sha256 = "0nc0wd7qvyri7841c3dd9in5d7367hys0isyw8znv5fj4c0a6v1f";
};
nativeBuildInputs = [
wrapGAppsHook
# For setup hook populating GI_TYPELIB_PATH
gobject-introspection
pango gdk-pixbuf atk libnotify
];
buildInputs = [
gtk3 librsvg libappindicator-gtk3
libnotify gnome.adwaita-icon-theme
# Schemas with proxy configuration
gsettings-desktop-schemas
];
propagatedBuildInputs = [
python-dateutil pyinotify pygobject3 bcrypt
];
patches = [
(substituteAll {
src = ./paths.patch;
killall = "${killall}/bin/killall";
syncthing = "${syncthing}/bin/syncthing";
})
];
# repo doesn't have any tests
doCheck = false;
setupPyBuildFlags = [ "build_py" "--nofinddaemon" "--nostdownloader" ];
postPatch = ''
substituteInPlace setup.py --replace "version = get_version()" "version = '${version}'"
substituteInPlace scripts/syncthing-gtk --replace "/usr/share" "$out/share"
substituteInPlace syncthing_gtk/app.py --replace "/usr/share" "$out/share"
substituteInPlace syncthing_gtk/uisettingsdialog.py --replace "/usr/share" "$out/share"
substituteInPlace syncthing_gtk/wizard.py --replace "/usr/share" "$out/share"
substituteInPlace syncthing-gtk.desktop --replace "/usr/bin/syncthing-gtk" "$out/bin/syncthing-gtk"
'';
meta = with lib; {
description = "GTK3 & python based GUI for Syncthing";
homepage = "https://github.com/syncthing/syncthing-gtk";
license = licenses.gpl2;
broken = true;
maintainers = with maintainers; [ ];
platforms = syncthing.meta.platforms;
};
}

View File

@ -1,67 +0,0 @@
{stdenv, fetchurl, lib, gfortran
, ncurses
, withXaw3d ? false
#, withPVMlib ? false
, tcl, tk, withTk ? true
, gtk2, withGtk ? false # working ?
#, withF2c ? false
, ocaml, withOCaml ? true
#, withJava ? false
#, atlasMath, withAtlas ? false
, xlibsWrapper, withX ? true
}:
stdenv.mkDerivation rec {
version = "4.1.2";
pname = "scilab";
src = fetchurl {
url = "https://www.scilab.org/download/${version}/${pname}-${version}-src.tar.gz";
sha256 = "1adk6jqlj7i3gjklvlf1j3il1nb22axnp4rvwl314an62siih0sc";
};
nativeBuildInputs = [ gfortran ];
buildInputs = [ ncurses ]
++ lib.optionals withGtk [ gtk2 ]
++ lib.optionals withOCaml [ ocaml ]
++ lib.optional withX xlibsWrapper;
/*
--with-atlas-library=DIR Atlas library files are in DIR and we use Atlas
*/
configureFlags = [
# use gcc C compiler and gnu Fortran compiler (g77 or gfortran)
"--with-gcc" "--with-g77"
# do not compile with PVM library
"--without-pvm"
# compile with GTK
(lib.enableFeature withGtk "gtk")
(lib.enableFeature withGtk "gtk2")
# compile with ocaml
(lib.withFeature withOCaml "ocaml")
# do not compile Java interface
"--without-java"
# use the X Window System
(lib.withFeature withX "x")
# compile with TCL/TK
] ++ lib.optionals withTk [
"--with-tk"
"--with-tcl-library=${tcl}/lib"
"--with-tcl-include=${tcl}/include"
"--with-tk-library=${tk}/lib"
"--with-tk-include=${tk}/include"
] # use Xaw3d widgets given with Scilab
++ lib.optional (!withXaw3d) "--with-local-xaw"
;
makeFlags = [ "all" ];
meta = {
homepage = "http://www.scilab.org/";
description = "Scientific software package for numerical computations (Matlab lookalike)";
# see http://www.scilab.org/legal
license = "SciLab";
broken = true;
};
}

View File

@ -1,14 +1,14 @@
{
"version": "15.0.1",
"repo_hash": "sha256-GMdR8drmnLR5KH/N0iyLmPi2sggeQX7PT2KP3QO5+/Y=",
"version": "15.0.2",
"repo_hash": "sha256-B5zD8yBY6d+jkIghuxShsR73+2X7Jd9mai1ouraEM44=",
"yarn_hash": "1a8k3x3b9sirzicqkwmr10m27n593iljfh8awdc9700akbj155lr",
"owner": "gitlab-org",
"repo": "gitlab",
"rev": "v15.0.1-ee",
"rev": "v15.0.2-ee",
"passthru": {
"GITALY_SERVER_VERSION": "15.0.1",
"GITALY_SERVER_VERSION": "15.0.2",
"GITLAB_PAGES_VERSION": "1.58.0",
"GITLAB_SHELL_VERSION": "14.3.0",
"GITLAB_WORKHORSE_VERSION": "15.0.1"
"GITLAB_WORKHORSE_VERSION": "15.0.2"
}
}

View File

@ -11,7 +11,7 @@ let
gemdir = ./.;
};
version = "15.0.1";
version = "15.0.2";
package_version = "v14";
gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}";
in
@ -24,7 +24,7 @@ buildGoModule {
owner = "gitlab-org";
repo = "gitaly";
rev = "v${version}";
sha256 = "sha256-pNVeXB2A8jYUVir6t8jz6ifBksWucZjUn6RIszXdwJY=";
sha256 = "sha256-jwPXar16FOq0xCg3xUXH72YPmoVa91ae3bgz95ZmYo4=";
};
vendorSha256 = "sha256-/tHKWo09ZV31TSIqlOk36V3y7gNikziUJHf+nS1gHEw=";

View File

@ -5,7 +5,7 @@ in
buildGoModule rec {
pname = "gitlab-workhorse";
version = "15.0.1";
version = "15.0.2";
src = fetchFromGitLab {
owner = data.owner;

View File

@ -1,35 +0,0 @@
{ lib, stdenv, fetchFromGitHub, rustPlatform, cmake, libzip, gnupg,
# Darwin
libiconv, CoreFoundation, Security }:
rustPlatform.buildRustPackage rec {
pname = "sit";
version = "0.4.1";
src = fetchFromGitHub {
owner = "sit-fyi";
repo = "sit";
rev = "v${version}";
sha256 = "06xkhlfix0h6di6cnvc4blbj3mjy90scbh89dvywbx16wjlc79pf";
};
nativeBuildInputs = [ cmake ];
buildInputs = [ libzip gnupg ]
++ (lib.optionals stdenv.isDarwin [ libiconv CoreFoundation Security ]);
preCheck = ''
export HOME=$(mktemp -d)
'';
cargoSha256 = "1ghr01jcq12ddna5qadvjy6zbgqgma5nf0qv06ayxnra37d2l92l";
meta = with lib; {
description = "Serverless Information Tracker";
homepage = "https://sit.fyi/";
license = with licenses; [ asl20 /* or */ mit ];
maintainers = with maintainers; [ dywedir yrashk ];
# Upstream has not had a release in several years, and dependencies no
# longer compile with the latest Rust compiler.
broken = true;
};
}

View File

@ -1,41 +1,79 @@
{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook, gettext
, which, xorg, libX11, libXext, libXinerama, libXpm, libXft, libXau, libXdmcp
, libXmu, libpng, libjpeg, expat, xorgproto, librsvg, freetype, fontconfig }:
{ lib
, stdenv
, fetchFromGitHub
, autoconf
, automake
, expat
, fontconfig
, freetype
, gettext
, libX11
, libXau
, libXdmcp
, libXext
, libXft
, libXinerama
, libXmu
, libXpm
, libjpeg
, libpng
, librsvg
, pango
, pkg-config
, which
, xorg
, xorgproto
, gitUpdater
}:
stdenv.mkDerivation rec {
pname = "jwm";
version = "2.4.1";
version = "2.4.2";
src = fetchFromGitHub {
owner = "joewing";
repo = "jwm";
rev = "v${version}";
sha256 = "sha256-7CEL2ddlABM7SYjMVUs3pu0O+2cVsz04slsdUIbgZuM=";
sha256 = "sha256-rvuz2Pmon3XBqRMgDwZNrQlWDyLNSK30JPmmQTlN+Rs=";
};
nativeBuildInputs = [ pkg-config gettext which autoreconfHook ];
buildInputs = [
libX11
libXext
libXinerama
libXpm
libXft
xorg.libXrender
libXau
libXdmcp
libXmu
libpng
libjpeg
expat
xorgproto
librsvg
freetype
fontconfig
nativeBuildInputs = [
autoconf
automake
gettext
pkg-config
which
];
buildInputs = [
expat
fontconfig
freetype
libX11
libXau
libXdmcp
libXext
libXft
libXinerama
libXmu
libXpm
libjpeg
libpng
librsvg
pango
xorg.libXrender
xorgproto
];
preConfigure = "NOCONFIGURE=1 ./autogen.sh";
enableParallelBuilding = true;
passthru.updateScript = gitUpdater {
inherit pname version;
rev-prefix = "v";
};
meta = {
homepage = "http://joewing.net/projects/jwm/";
description = "Joe's Window Manager is a light-weight X11 window manager";

View File

@ -1,12 +0,0 @@
source "$stdenv/setup" || exit 1
# XXX: Eventually we could consider building the PDF/PS files as well.
echo "source is \`$src', report name is \`$reportName'"
mkdir -p "$out/share/info" && \
makeinfo -o "$out/share/info/${reportName}.info" "$src"
# XXX: HTML output is apparently broken.
#mkdir -p "$out/share/doc/${reportName}" && \
#makeinfo -o "$out/share/doc/${reportName}/html" --html --force "$src"

View File

@ -1,30 +0,0 @@
{ fetchurl, stdenv, texinfo, revision, sha256 }:
stdenv.mkDerivation rec {
name = "r${toString revision}rs";
src = fetchurl {
url = "http://swiss.csail.mit.edu/ftpdir/scm/${name}.txi";
inherit sha256;
};
buildInputs = [ texinfo ];
# Tell the builder about the name of the report.
reportName = name;
builder = ./builder.sh;
meta = {
description = "Revised^${toString revision} Report on the Algorithmic Language Scheme";
longDescription = ''
This package contains the GNU Info version of the
the ${toString revision}th revision of the Report on the
Algorithmic Language Scheme.
'';
homepage = "http://swiss.csail.mit.edu/~jaffer/Scheme";
broken = true;
};
}

View File

@ -1,7 +0,0 @@
{ fetchurl, stdenv, texinfo }:
import ./common.nix {
inherit fetchurl stdenv texinfo;
revision = 4;
sha256 = "02jgy0lvi5ymkdxwjasg50zl03zmyj8sgnfxxnjnbmif72c0k4p8";
}

View File

@ -1,7 +0,0 @@
{ fetchurl, stdenv, texinfo }:
import ./common.nix {
inherit fetchurl stdenv texinfo;
revision = 5;
sha256 = "1s2wcslwcgb9j89vjn7qs63qlnsv1481jaw1sgg33fgbgk6a8wrk";
}

View File

@ -22,6 +22,6 @@ tcl.mkTclDerivation rec {
description = "High-level widget set for Tcl/Tk";
maintainers = with lib.maintainers; [ agbrooks ];
license = lib.licenses.tcltk;
platforms = lib.platforms.linux;
platforms = lib.platforms.unix;
};
}

View File

@ -1,27 +0,0 @@
{lib, stdenv, fetchurl}:
stdenv.mkDerivation rec {
pname = "STLport";
version = "5.2.1";
src = fetchurl {
url = "mirror://sourceforge/stlport/${pname}-${version}.tar.bz2";
sha256 = "1jbgak1m1qk7d4gyn1p2grbws2icsf7grbs3dh44ai9ck1xh0nvm";
};
# fix hardcoded /usr/bin; not recognizing the standard --disable-static flag
configurePhase = ''
echo Preconf: build/Makefiles/gmake/*/sys.mak
for f in build/Makefiles/gmake/*/sys.mak; do
substituteInPlace "$f" --replace /usr/bin/ ""
done
./configure --prefix=$out
'';
meta = {
description = "An implementation of the C++ Standard Library";
homepage = "https://sourceforge.net/projects/stlport/";
license = lib.licenses.free; # seems BSD-like
broken = true; # probably glibc-2.20 -related issue
};
}

View File

@ -0,0 +1,47 @@
{ lib
, aiofiles
, aiohttp
, aresponses
, buildPythonPackage
, fetchFromGitHub
, pytest-asyncio
, pytestCheckHook
, pythonOlder
}:
buildPythonPackage rec {
pname = "aioskybell";
version = "22.6.0";
format = "setuptools";
disabled = pythonOlder "3.9";
src = fetchFromGitHub {
owner = "tkdrob";
repo = pname;
rev = version;
hash = "sha256-2AsEVGZ4cA1GeoxtGFuvjZ05W4FjQ5GFSM8euu9iY4s==";
};
propagatedBuildInputs = [
aiohttp
aiofiles
];
checkInputs = [
aresponses
pytest-asyncio
pytestCheckHook
];
pythonImportsCheck = [
"aioskybell"
];
meta = with lib; {
description = "API client for Skybell doorbells";
homepage = "https://github.com/tkdrob/aioskybell";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};
}

View File

@ -26,7 +26,7 @@ buildPythonPackage rec {
hash = "sha256-zOxlC4NdSBkhOMhTKa4Dc15s7VjpstnCFG1shMBvpT4=";
};
patches = [
patches = lib.optionals (lib.versionAtLeast werkzeug.version "2.1.0") [
./werkzeug-2.1.0-compat.patch
];

View File

@ -11,14 +11,14 @@
buildPythonPackage rec {
pname = "holidays";
version = "0.13";
version = "0.14.2";
format = "setuptools";
disabled = pythonOlder "3.6";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-xvfDq4ralIBnAtqTHZTTfNYbz6kstNOdNRtqnFIQZ1w=";
hash = "sha256-DnD9F0gErqHIcLFRMZ+uvNXNsNlVt4IwQ04a/Rd4SY4=";
};
propagatedBuildInputs = [

View File

@ -2,18 +2,23 @@
, aiohttp
, xmltodict
, buildPythonPackage
, pythonOlder
, fetchFromGitHub
}:
buildPythonPackage rec {
pname = "omnilogic";
version = "0.4.5";
version = "0.4.6";
disabled = pythonOlder "3.4";
format = "setuptools";
src = fetchFromGitHub {
owner = "djtimca";
repo = "omnilogic-api";
rev = version;
sha256 = "081awb0fl40b5ighc9yxfq1xkgxz7l5dvz5544hx965q2r20wvsg";
hash = "sha256-XyAniuUr/Kt8VfBtovD4kKLG+ehOqE26egEG7j8q9LY=";
};
propagatedBuildInputs = [
@ -21,11 +26,6 @@ buildPythonPackage rec {
xmltodict
];
postPatch = ''
# Is not used but still present in setup.py
substituteInPlace setup.py --replace "'config'," ""
'';
# Project has no tests
doCheck = false;
pythonImportsCheck = [ "omnilogic" ];

View File

@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "pynx584";
version = "0.7";
version = "0.8";
disabled = pythonOlder "3.6";
@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "kk7ds";
repo = pname;
rev = version;
sha256 = "sha256-44JFq19fpJmpZzLeVcBILs8c9bOfWyMrb2jA4Yx8+Co=";
sha256 = "sha256-aTwAQnz3my58MgXNe61lStLth6PZXLVLLDI2HUJiNm8=";
};
propagatedBuildInputs = [

View File

@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "pywemo";
version = "0.8.1";
version = "0.9.0";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = pname;
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-kkZmn+rGRZGh9WmrHAmpqxTjw6MyCSWCeesJ0JGarKM=";
hash = "sha256-x4wIn+X70z5cCIhOfpQCj7qy0kEagnMcscxUls1697o=";
};
nativeBuildInputs = [

View File

@ -14,7 +14,7 @@ buildPythonPackage rec {
pname = "safety";
version = "1.10.3";
diabled = pythonOlder "3.5";
disabled = pythonOlder "3.5";
format = "setuptools";

View File

@ -9,13 +9,13 @@
buildPythonPackage rec {
pname = "wallbox";
version = "0.4.8";
version = "0.4.9";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "f8965b0ae3a873f570986e712a4e667d0b6634c9e3afb51fbd5596856412878c";
sha256 = "90e664cf7d99eb1baf20a9ff5fd415dfa14ddafabcefd606e15b5bcd25f969e9";
};
propagatedBuildInputs = [

View File

@ -1,27 +0,0 @@
{ lib, stdenv, fetchFromGitHub, buildGoPackage, CoreFoundation }:
buildGoPackage rec {
pname = "tychus";
version = "0.6.3";
goPackagePath = "github.com/devlocker/tychus";
goDeps = ./deps.nix;
subPackages = [];
src = fetchFromGitHub {
owner = "devlocker";
repo = "tychus";
rev = "v${version}";
sha256 = "02ybxjsfga89gpg0k21zmykhhnpx1vy3ny8fcwj0qsg73i11alvw";
};
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreFoundation ];
tags = [ "release" ];
meta = {
description = "Command line utility to live-reload your application";
homepage = "https://github.com/devlocker/tychus";
license = lib.licenses.mit;
};
}

View File

@ -1,30 +0,0 @@
# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix)
[
{
goPackagePath = "github.com/inconshreveable/mousetrap";
fetch = {
type = "git";
url = "https://github.com/inconshreveable/mousetrap";
rev = "76626ae9c91c4f2a10f34cad8ce83ea42c93bb75";
sha256 = "1mn0kg48xkd74brf48qf5hzp0bc6g8cf5a77w895rl3qnlpfw152";
};
}
{
goPackagePath = "github.com/spf13/cobra";
fetch = {
type = "git";
url = "https://github.com/spf13/cobra";
rev = "f91529fc609202eededff4de2dc0ba2f662240a3";
sha256 = "10c3d5dp98rys134dnsl19ldj8bca183z91lj8rkbsy78qzrr9af";
};
}
{
goPackagePath = "github.com/spf13/pflag";
fetch = {
type = "git";
url = "https://github.com/spf13/pflag";
rev = "e57e3eeb33f795204c1ca35f56c44f83227c6e66";
sha256 = "13mhx4i913jil32j295m3a36jzvq1y64xig0naadiz7q9ja011r2";
};
}
]

View File

@ -1,22 +0,0 @@
{ lib, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
pname = "ws";
version = "0.2.1";
goPackagePath = "github.com/hashrocket/ws";
src = fetchFromGitHub {
owner = "hashrocket";
repo = "ws";
rev = "e9404cb37e339333088b36f6a7909ff3be76931d";
sha256 = "sha256-q6c761Evz7Q6nH1fHgEn2uCFokoN0OzqhyxIFn6mWqQ=";
};
meta = with lib; {
description = "websocket command line tool";
homepage = "https://github.com/hashrocket/ws";
license = licenses.mit;
platforms = platforms.unix;
};
}

View File

@ -1,74 +0,0 @@
{ stdenv, lib, fetchFromGitHub, nodejs, pkgs }:
with lib;
let
# highlight.js is a git submodule of remark
highlightjs = fetchFromGitHub {
owner = "isagalaev";
repo = "highlight.js";
rev = "10b9500b67983f0a9c42d8ce8bf8e8c469f7078c";
sha256 = "1yy8by15kfklw8lwh17z1swpj067q0skjjih12yawbryraig41m0";
};
nodePackages = import ./nodepkgs.nix {
inherit pkgs;
inherit (stdenv.hostPlatform) system;
};
in
stdenv.mkDerivation rec {
pname = "remarkjs";
version = "0.7.0";
src = fetchFromGitHub {
owner = "gnab";
repo = "remark";
rev = "v${version}";
sha256 = "sha256-zhHuW4pBqXQEBlSxuyvHKh+ftyIdcqpYgIZZHArUtns=";
};
buildInputs = [ nodejs ] ++ (with nodePackages; [
marked
browserify
uglify-js
less
mocha
#mocha-phantomjs
should
sinon
jshint
shelljs
]);
configurePhase = ''
mkdir -p node_modules/.bin
${concatStrings (map (dep: ''
test -d ${dep}/bin && (for b in $(ls ${dep}/bin); do
ln -sv -t node_modules/.bin ${dep}/bin/$b
done)
'') buildInputs)}
'';
buildPhase = ''
substituteInPlace make.js --replace "target.test();" ""
substituteInPlace make.js --replace vendor/highlight.js ${highlightjs}
node make all
'';
installPhase = ''
mkdir -p $out/lib
cp -v out/* $out/lib/
'';
meta = {
homepage = "https://remarkjs.com";
description = "A simple, in-browser, markdown-driven slideshow tool";
maintainers = [ ];
platforms = lib.platforms.linux;
license = lib.licenses.mit;
broken = true;
};
}

View File

@ -1,3 +0,0 @@
#!/bin/sh -e
node2nix --nodejs-10 -i pkgs.json -c nodepkgs.nix -e ../../node-packages/node-env.nix

File diff suppressed because it is too large Load Diff

View File

@ -1,17 +0,0 @@
# This file has been generated by node2nix 1.9.0. Do not edit!
{pkgs ? import <nixpkgs> {
inherit system;
}, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-10_x"}:
let
nodeEnv = import ../../node-packages/node-env.nix {
inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript;
inherit pkgs nodejs;
libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
};
in
import ./node-packages.nix {
inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit;
inherit nodeEnv;
}

View File

@ -1,12 +0,0 @@
[
"marked"
, "browserify"
, "uglify-js"
, "less"
, "mocha"
, "mocha-phantomjs"
, "should"
, "sinon"
, "jshint"
, "shelljs"
]

View File

@ -1,82 +0,0 @@
{ lib, stdenv, fetchurl, unzip, libGLU, libGL, libX11, SDL, openal, runtimeShell }:
stdenv.mkDerivation rec {
pname = "tremulous";
version = "1.1.0";
src1 = fetchurl {
url = "mirror://sourceforge/tremulous/${pname}-${version}.zip";
sha256 = "11w96y7ggm2sn5ncyaffsbg0vy9pblz2av71vqp9725wbbsndfy7";
};
# http://tremulous.net/wiki/Client_versions
src2 = fetchurl {
url = "http://releases.mercenariesguild.net/client/mgclient_source_Release_1.011.tar.gz";
sha256 = "1vrsi7va7hdp8k824663s1pyw9zpsd4bwwr50j7i1nn72b0v9a26";
};
src3 = fetchurl {
url = "http://releases.mercenariesguild.net/tremded/mg_tremded_source_1.01.tar.gz";
sha256 = "1njrqlhzjvy9myddzkagszwdcf3m4h08wip888w2rmbshs6kz6ql";
};
nativeBuildInputs = [ unzip ];
buildInputs = [ libGLU libGL libX11 SDL openal ];
unpackPhase = ''
unzip $src1
cd tremulous
tar xvf $src2
mkdir mg_tremded_source
cd mg_tremded_source
tar xvf $src3
cd ..
'';
patches = [ ./parse.patch ];
patchFlags = [ "-p" "0" ];
NIX_LD_FLAGS = ''
-rpath ${stdenv.cc}/lib
-rpath ${stdenv.cc}/lib64
'';
buildPhase = ''
cd Release_1.011
make
cd ..
cd mg_tremded_source
make
cd ..
'';
installPhase = ''
arch=$(uname -m | sed -e s/i.86/x86/)
mkdir -p $out/opt/tremulous
cp -v Release_1.011/build/release-linux-$arch/tremulous.$arch $out/opt/tremulous/
cp -v mg_tremded_source/build/release-linux-$arch/tremded.$arch $out/opt/tremulous/
cp -rv base $out/opt/tremulous
mkdir -p $out/bin
for b in tremulous tremded
do
cat << EOF > $out/bin/$b
#!${runtimeShell}
cd $out/opt/tremulous
exec ./$b.$arch "\$@"
EOF
chmod +x $out/bin/$b
done
'';
dontPatchELF = true;
meta = with lib; {
description = "A game that blends a team based FPS with elements of an RTS";
longDescription = ''
Tremulous is a free, open source game that blends a team based FPS with
elements of an RTS. Players can choose from 2 unique races, aliens and
humans. Players on both teams are able to build working structures
in-game like an RTS. These structures provide many functions, the most
important being spawning. The designated builders must ensure there are
spawn structures or other players will not be able to rejoin the game
after death. Other structures provide automated base defense (to some
degree), healing functions and much more...
'';
homepage = "http://www.tremulous.net";
license = with licenses; [
gpl2
cc-by-sa-25 /* media */
];
maintainers = with maintainers; [ astsmtl ];
platforms = platforms.linux;
broken = true;
};
}

View File

@ -1,21 +0,0 @@
diff -ruN Release_1.011-old/src/qcommon/parse.c Release_1.011/src/qcommon/parse.c
--- Release_1.011-old/src/qcommon/parse.c 2011-12-02 19:11:49.307368651 -0500
+++ Release_1.011/src/qcommon/parse.c 2011-12-02 19:13:27.556836387 -0500
@@ -981,7 +981,7 @@
{
if (*string == '\"')
{
- strcpy(string, string+1);
+ memmove(string, string+1, strlen(string));
}
if (string[strlen(string)-1] == '\"')
{
@@ -1784,7 +1784,7 @@
if ((*ptr == '\\' || *ptr == '/') &&
(*(ptr+1) == '\\' || *(ptr+1) == '/'))
{
- strcpy(ptr, ptr+1);
+ memmove(ptr, ptr+1, strlen(ptr));
}
else
{

View File

@ -1,59 +0,0 @@
{ lib, stdenv, fetchurl, ncurses, flex, bison, autoconf, automake, m4, coreutils }:
stdenv.mkDerivation rec {
pname = "zangband";
version = "2.7.4b";
src = fetchurl {
url = "mirror://sourceforge/project/${pname}/${pname}-src/${version}/${pname}-${version}.tar.gz";
sha256 = "0kkz6f9myhjnr3308sdab8q186rd55lapvcp38w8qmakdbhc828j";
};
nativeBuildInputs = [ autoconf automake ];
buildInputs = [
ncurses flex bison m4
];
preConfigure = ''
sed -re 's/ch(own|grp|mod)/true/' -i lib/*/makefile.zb makefile.in
sed -e '/FIXED_PATHS/d' -i src/z-config.h
autoconf
'';
preInstall = ''
mkdir -p $out/share/games/zangband
mkdir -p $out/share/man
mkdir -p $out/bin
'';
postInstall = ''
mv $out/bin/zangband $out/bin/.zangband.real
echo '#! ${stdenv.shell}
PATH="$PATH:${coreutils}/bin"
ZANGBAND_PATH="$HOME/.zangband"
ORIG_PATH="'$out'"/share/games/zangband
mkdir -p "$ZANGBAND_PATH"
cd "$ZANGBAND_PATH"
for i in $(find "$ORIG_PATH" -type f); do
REL_PATH="''${i#$ORIG_PATH/}"
mkdir -p "$(dirname "$REL_PATH")"
ln -s "$i" "$REL_PATH" &>/dev/null
done
mkdir -p lib/user lib/save
for i in lib/*/*.raw; do
test -L "$i" && rm "$i";
done
for i in $(find lib -type l); do if ! test -e $(readlink "$i"); then rm "$i"; fi; done;
export ANGBAND_PATH="$PWD"
"'$out'/bin/.zangband.real" "$@"
' > $out/bin/zangband
chmod +x $out/bin/zangband
'';
meta = {
description = "Rogue-like game";
license = lib.licenses.unfree;
broken = true; # broken in runtime, will not get pass character generation
};
}

View File

@ -1,26 +0,0 @@
{ lib, stdenv, fetchurl, pkg-config, automake, autoconf, udisks1, dbus-glib, glib, libconfuse }:
stdenv.mkDerivation rec {
pname = "udisks-glue";
version = "1.3.5";
src = fetchurl {
url = "https://github.com/fernandotcl/udisks-glue/archive/release-${version}.tar.gz";
sha256 = "317d25bf249278dc8f6a5dcf18f760512427c772b9afe3cfe34e6e1baa258176";
};
nativeBuildInputs = [ pkg-config automake autoconf ];
buildInputs = [ udisks1 dbus-glib glib libconfuse ];
preConfigure = "sh autogen.sh";
meta = {
homepage = "https://github.com/fernandotcl/udisks-glue";
description = "A tool to associate udisks events to user-defined actions";
platforms = lib.platforms.linux;
maintainers = with lib.maintainers; [ pSub ];
license = lib.licenses.bsd2;
broken = true;
hydraPlatforms = [ ];
};
}

View File

@ -1,78 +0,0 @@
{ lib
, stdenv
, fetchurl
, pkg-config
, sg3_utils
, udev
, glib
, dbus
, dbus-glib
, polkit
, parted
, lvm2
, libatasmart
, intltool
, libuuid
, mdadm
, libxslt
, docbook_xsl
, util-linux
, libgudev
}:
stdenv.mkDerivation rec {
pname = "udisks";
version = "1.0.5";
src = fetchurl {
url = "https://hal.freedesktop.org/releases/udisks-${version}.tar.gz";
sha256 = "0wbg3jrv8limdgvcygf4dqin3y6d30y9pcmmk711vq571vmq5v7j";
};
patches = [ ./purity.patch ./no-pci-db.patch ./glibc.patch ];
preConfigure =
''
configureFlagsArray+=(--with-systemdsystemunitdir=$out/lib/systemd/system)
'';
postPatch =
''
sed -e 's,/sbin/mdadm,${mdadm}&,g' -e "s,@slashlibdir@,$out/lib,g" -i data/80-udisks.rules
substituteInPlace src/main.c --replace \
"/sbin:/bin:/usr/sbin:/usr/bin" \
"${util-linux}/bin:${mdadm}/sbin:/run/current-system/sw/bin:/run/current-system/sw/bin"
'';
buildInputs =
[
sg3_utils
udev
glib
dbus
dbus-glib
polkit
parted
libgudev
lvm2
libatasmart
intltool
libuuid
libxslt
docbook_xsl
];
nativeBuildInputs = [ pkg-config ];
configureFlags = [ "--localstatedir=/var" "--enable-lvm2" ];
meta = with lib; {
homepage = "http://www.freedesktop.org/wiki/Software/udisks";
description = "A daemon and command-line utility for querying and manipulating storage devices";
platforms = platforms.linux;
license = with licenses; [ gpl2 lgpl2Plus ];
broken = true;
hydraPlatforms = [ ];
};
}

View File

@ -1,25 +0,0 @@
From 0aa652a7b257f98f9e8e7dc7b0ddc9bc62377d09 Mon Sep 17 00:00:00 2001
From: Alexandre Rostovtsev <tetromino@gentoo.org>
Date: Fri, 29 May 2015 21:09:39 -0400
Subject: [PATCH] Bug 90778 - fix build with newer glibc versions
https://bugs.freedesktop.org/show_bug.cgi?id=90778
---
src/helpers/job-drive-detach.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/helpers/job-drive-detach.c b/src/helpers/job-drive-detach.c
index eeafcab..d122a1f 100644
--- a/src/helpers/job-drive-detach.c
+++ b/src/helpers/job-drive-detach.c
@@ -18,6 +18,7 @@
*
*/
+#include <sys/stat.h>
#include <stdio.h>
#include <string.h>
#include <errno.h>
--
2.4.2

View File

@ -1,13 +0,0 @@
Systemd no longer has the pci-db program.
diff -ru -x '*~' udisks-1.0.4-orig/data/80-udisks.rules udisks-1.0.4/data/80-udisks.rules
--- udisks-1.0.4-orig/data/80-udisks.rules 2011-08-25 23:31:20.000000000 +0200
+++ udisks-1.0.4/data/80-udisks.rules 2012-12-13 13:06:52.189650854 +0100
@@ -3,7 +3,6 @@
# import names for PCI storage controllers
#
-SUBSYSTEM=="pci", ACTION=="add|change", ENV{ID_MODEL_FROM_DATABASE}=="", ATTR{class}=="0x01*", IMPORT{program}="pci-db %p"
# Set eSATA port type for known eSATA CardBus adapters - first we want to ensure
# the device is on a cardbus controller (upper PCI device) - then we check

View File

@ -1,57 +0,0 @@
diff --git a/data/80-udisks.rules b/data/80-udisks.rules
index 6720394..60b67ed 100644
--- a/data/80-udisks.rules
+++ b/data/80-udisks.rules
@@ -23,7 +23,7 @@ LABEL="ata_port_cardbus_end"
# this is the case we can trigger a 'change' on the sas_expander device
# when the bsg device appears)
#
-SUBSYSTEM=="sas_expander", ACTION=="add|change", IMPORT{program}="udisks-probe-sas-expander /sys/%p"
+SUBSYSTEM=="sas_expander", ACTION=="add|change", IMPORT{program}="@slashlibdir@/udev/udisks-probe-sas-expander /sys/%p"
##############################################################################################################
@@ -54,7 +54,7 @@ ENV{DM_UDEV_DISABLE_DISK_RULES_FLAG}=="1", GOTO="udisks_end"
# import UDISKS_DM_* and UDISKS_LVM2_* properties - the long-term plan is to make the lvm2 and
# device-mapper packages provide this information
#
-KERNEL=="dm-*", IMPORT{program}="udisks-dm-export %M %m"
+KERNEL=="dm-*", IMPORT{program}="@slashlibdir@/udev/udisks-dm-export %M %m"
# Make udevd synthesize a 'change' uevent when last opener of a rw-fd closes the fd - this
# should be part of the device-mapper rules
@@ -63,7 +63,7 @@ KERNEL=="dm-*", OPTIONS+="watch"
##############################################################################################################
# Probe LVM2 Physical Volumes - this will eventually be part of the LVM2 package
-ENV{ID_FS_TYPE}=="LVM2_member", TEST=="/lib/udev/udisks-lvm-pv-export", IMPORT{program}="udisks-lvm-pv-export $env{ID_FS_UUID}"
+ENV{ID_FS_TYPE}=="LVM2_member", TEST=="@slashlibdir@/udev/udisks-lvm-pv-export", IMPORT{program}="@slashlibdir@/udev/udisks-lvm-pv-export $env{ID_FS_UUID}"
##############################################################################################################
@@ -85,7 +85,7 @@ KERNEL=="sr*", ENV{ID_CDROM_MEDIA_TRACK_COUNT_DATA}=="", GOTO="probe_parttable_e
# scan for partition tables both on whole-disk and partitions
#
-IMPORT{program}="udisks-part-id $tempnode"
+IMPORT{program}="@slashlibdir@/udev/udisks-part-id $tempnode"
LABEL="probe_parttable_end"
@@ -109,13 +109,13 @@ LABEL="md_end"
#
# USB ATA enclosures with a SAT layer
-KERNEL=="sd*[!0-9]", ATTR{removable}=="0", ENV{ID_BUS}=="usb", ENV{DEVTYPE}=="disk", IMPORT{program}="udisks-probe-ata-smart $tempnode"
+KERNEL=="sd*[!0-9]", ATTR{removable}=="0", ENV{ID_BUS}=="usb", ENV{DEVTYPE}=="disk", IMPORT{program}="@slashlibdir@/udev/udisks-probe-ata-smart $tempnode"
# ATA disks driven by libata
-KERNEL=="sd*[!0-9]", ATTR{removable}=="0", ENV{ID_BUS}=="ata", ENV{DEVTYPE}=="disk", IMPORT{program}="udisks-probe-ata-smart $tempnode"
+KERNEL=="sd*[!0-9]", ATTR{removable}=="0", ENV{ID_BUS}=="ata", ENV{DEVTYPE}=="disk", IMPORT{program}="@slashlibdir@/udev/udisks-probe-ata-smart $tempnode"
# ATA disks connected via SAS (not driven by libata)
-KERNEL=="sd*[!0-9]", ATTR{removable}=="0", ENV{ID_BUS}=="scsi", ENV{DEVTYPE}=="disk", ENV{ID_VENDOR}=="ATA", IMPORT{program}="udisks-probe-ata-smart $tempnode"
+KERNEL=="sd*[!0-9]", ATTR{removable}=="0", ENV{ID_BUS}=="scsi", ENV{DEVTYPE}=="disk", ENV{ID_VENDOR}=="ATA", IMPORT{program}="@slashlibdir@/udev/udisks-probe-ata-smart $tempnode"
# Example rule for tagging a device with a specific media type. Where and

View File

@ -9,14 +9,14 @@ let
}."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
hash = {
x64-linux_hash = "sha256-4jzQ/bax323r4OzWwr9vq+6x0GasBZhRT+i6bDS/RMs=";
arm64-linux_hash = "sha256-IOFKlqey9biL8wCpbIxMnZZ5Svvrh6KMkNoZ7GBht3M=";
x64-osx_hash = "sha256-tdyEYY6qXNKjMPW652gtPAhTm/aNyTe+CgZ5aA9k2EM=";
x64-linux_hash = "sha256-3oxCBg+lxN8eGaS1kmIK0kL2qUNOLHhLnkMPmPlZcyw=";
arm64-linux_hash = "sha256-OaCI2neL8bMFf/QuZEZXKuZgJBnUT+Q2XMChfSqF5Bc=";
x64-osx_hash = "sha256-vv3ds5BE2PDA94Hkr//MB0a7CF3dnk7r7wYF9SAzL48=";
}."${arch}-${os}_hash";
in stdenv.mkDerivation rec {
pname = "radarr";
version = "4.0.5.5981";
version = "4.1.0.6175";
src = fetchurl {
url = "https://github.com/Radarr/Radarr/releases/download/v${version}/Radarr.master.${version}.${os}-core-${arch}.tar.gz";

View File

@ -29,7 +29,7 @@ buildGoModule rec {
homepage = "https://github.com/vouch/vouch-proxy";
description = "An SSO and OAuth / OIDC login solution for NGINX using the auth_request module";
license = licenses.mit;
maintainers = with maintainers; [ em0lar erictapen ];
maintainers = with maintainers; [ leona erictapen ];
platforms = lib.platforms.linux;
};
}

View File

@ -51,7 +51,7 @@ buildGoModule rec {
description = "API of the Vikunja to-do list app";
homepage = "https://vikunja.io/";
license = lib.licenses.agpl3Plus;
maintainers = with lib.maintainers; [ em0lar ];
maintainers = with lib.maintainers; [ leona ];
mainProgram = "vikunja";
platforms = lib.platforms.all;
};

View File

@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
description = "Frontend of the Vikunja to-do list app";
homepage = "https://vikunja.io/";
license = lib.licenses.agpl3Plus;
maintainers = with lib.maintainers; [ em0lar ];
maintainers = with lib.maintainers; [ leona ];
platforms = lib.platforms.all;
};
}

View File

@ -23,6 +23,6 @@ stdenvNoCC.mkDerivation rec {
homepage = "https://github.com/marlonrichert/zsh-autocomplete/";
license = licenses.mit;
platforms = platforms.unix;
maintainers = [ maintainers.em0lar ];
maintainers = [ maintainers.leona ];
};
}

View File

@ -1,10 +0,0 @@
--- a/sct.c 2017-09-22 00:44:20.270421881 +0000
+++ b/sct.c 2017-09-26 10:50:38.964562740 +0000
@@ -36,6 +36,7 @@
main(int argc, char **argv)
{
Display *dpy = XOpenDisplay(NULL);
+ if (!dpy) exit(1);
int screen = DefaultScreen(dpy);
Window root = RootWindow(dpy, screen);

View File

@ -1,26 +1,26 @@
{ lib, stdenv, fetchurl, libX11, libXrandr }:
{ lib, stdenv, fetchzip, libX11, libXrandr, xorgproto }:
stdenv.mkDerivation rec {
pname = "sct";
version = "unstable-2015-11-16";
version = "0.5";
src = fetchurl {
url = "http://www.tedunangst.com/flak/files/sct.c";
sha256 = "01f3ndx3s6d2qh2xmbpmhd4962dyh8yp95l87xwrs4plqdz6knhd";
src = fetchzip {
url = "https://www.umaxx.net/dl/sct-0.5.tar.gz";
sha256 = "sha256-nyYcdnCq8KcSUpc0HPCGzJI6NNrrTJLAHqPawfwPR/Q=";
};
unpackPhase = "cat ${src} > sct.c";
patches = [ ./DISPLAY-segfault.patch ];
buildInputs = [ libX11 libXrandr xorgproto ];
buildInputs = [ libX11 libXrandr ];
buildPhase = "cc sct.c -o sct -lm -lX11 -lXrandr";
preInstall = ''
mkdir -p $out/bin $out/share/man/man1
'';
installPhase = "install -Dt $out/bin sct";
makeFlags = [ "PREFIX=$(out)" ];
meta = with lib; {
homepage = "https://www.tedunangst.com/flak/post/sct-set-color-temperature";
homepage = "https://www.umaxx.net/";
description = "A minimal utility to set display colour temperature";
maintainers = [ maintainers.raskin ];
maintainers = with maintainers; [ raskin somasis ];
license = licenses.publicDomain;
platforms = with platforms; linux ++ freebsd ++ openbsd;
};

View File

@ -1,26 +0,0 @@
{ lib
, python3Packages
, salt
}:
python3Packages.buildPythonApplication rec {
pname = "salt-pepper";
version = "0.7.5";
src = python3Packages.fetchPypi {
inherit pname version;
sha256 = "1wh6yidwdk8jvjpr5g3azhqgsk24c5rlzmw6l86dmi0mpvmxm94w";
};
buildInputs = with python3Packages; [ setuptools setuptools-scm salt ];
checkInputs = with python3Packages; [
pytest mock pyzmq pytest-rerunfailures pytest-cov cherrypy tornado
];
meta = with lib; {
description = "A CLI front-end to a running salt-api system";
homepage = "https://github.com/saltstack/pepper";
maintainers = [ maintainers.pierrer ];
license = licenses.asl20;
broken = true; # ModuleNotFoundError: No module named 'pytestsalt'
};
}

View File

@ -1,26 +0,0 @@
{ lib, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
pname = "azure-vhd-utils";
version = "unstable-2016-06-14";
goPackagePath = "github.com/Microsoft/azure-vhd-utils";
src = fetchFromGitHub {
owner = "Microsoft";
repo = "azure-vhd-utils";
rev = "070db2d701a462ca2edcf89d677ed3cac309d8e8";
sha256 = "sha256-8EH7RpuAeYKd5z64mklKKlFi20KYcx2WhVmkRbdaMy0=";
};
goDeps = ./deps.nix;
meta = with lib; {
homepage = "https://github.com/Microsoft/azure-vhd-utils";
description = "Read, inspect and upload VHD files for Azure";
longDescription = "Go package to read Virtual Hard Disk (VHD) file, a CLI interface to upload local VHD to Azure storage and to inspect a local VHD";
license = licenses.mit;
platforms = platforms.unix;
};
}

View File

@ -1,29 +0,0 @@
[
{
goPackagePath = "github.com/Azure/azure-sdk-for-go";
fetch = {
type = "git";
url = "https://github.com/Azure/azure-sdk-for-go";
rev = "0884ebb4c8e7c980527348a4d134a65286042afc";
sha256 = "0ixsq409akq1ff12352kp5gkbh370rpbw0m0pbwjr42cqvnzs9k0";
};
}
{
goPackagePath = "github.com/Microsoft/azure-vhd-utils-for-go";
fetch = {
type = "git";
url = "https://github.com/Microsoft/azure-vhd-utils-for-go";
rev = "070db2d701a462ca2edcf89d677ed3cac309d8e8";
sha256 = "0b9kbavlb92rhnb1swwq8bdn4l9a994rmf1ywyfq4yc0kd3gnhgh";
};
}
{
goPackagePath = "github.com/codegangsta/cli";
fetch = {
type = "git";
url = "https://github.com/codegangsta/cli";
rev = "f614c177b70c0f0e92c368d623c8770bf337c5d6";
sha256 = "1l70f07v0dsp2k2pm0lmr42fp4y72j1g0czf4fkxwhvgbly3al98";
};
}
]

View File

@ -1,27 +0,0 @@
# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
{ lib, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
version = "1.0.0";
pname = "envdir";
goPackagePath = "github.com/d10n/envdir";
src = fetchFromGitHub {
rev = "v${version}";
owner = "d10n";
repo = "envdir";
sha256 = "1wdlblj127skgynf9amk7waabc3abbyxys9dvyc6c72zpcpdy5nc";
};
# TODO: is there a way to get the commit ref so we can set main.buildCommit?
ldflags = [
"-X main.buildDate=1970-01-01T00:00:00+0000" "-X main.buildVersion=${version}"
];
meta = {
description = "A go rewrite of envdir";
homepage = "https://github.com/d10n/envdir";
maintainers = with lib.maintainers; [ edude03 ];
};
}

View File

@ -0,0 +1,32 @@
{ lib, stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
pname = "map";
version = "0.1.1";
src = fetchFromGitHub {
owner = "soveran";
repo = "map";
rev = version;
sha256 = "sha256-yGzmhZwv1qKy0JNcSzqL996APQO8OGWQ1GBkEkKTOXA=";
};
makeFlags = [ "PREFIX=$(out)" ];
postInstall = ''
mkdir -p "$out/share/doc/${pname}"
cp README* LICENSE "$out/share/doc/${pname}"
'';
doCheck = true;
checkPhase = "./test/tests.sh";
meta = with lib; {
description = "Map lines from stdin to commands";
homepage = "https://github.com/soveran/map";
license = licenses.bsd2;
maintainers = with maintainers; [ pogobanane ];
platforms = platforms.unix;
};
}

View File

@ -1,88 +0,0 @@
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, glibc
, bison, curl, flex, gperftools, jansson, jemalloc, libkrb5, lua, libmysqlclient
, ncurses, openssl, pcre, pcre2, perl, rabbitmq-c, sqlite, tcl
, libaio, libedit, libtool, libui, libuuid, zlib
}:
stdenv.mkDerivation rec {
pname = "maxscale";
version = "2.1.17";
src = fetchFromGitHub {
owner = "mariadb-corporation";
repo = "MaxScale";
rev = "${pname}-${version}";
sha256 = "161kc6aqqj3z509q4qwvsd86h06hlyzdask4gawn2ij0h3ca58q6";
};
nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [
bison curl flex gperftools jansson jemalloc libkrb5 lua libmysqlclient
ncurses openssl pcre pcre2 perl rabbitmq-c sqlite tcl
libaio libedit libtool libui libuuid zlib
];
patches = [ ./getopt.patch ];
preConfigure = ''
for i in `grep -l -R '#include <getopt.h>' .`; do
substituteInPlace $i --replace "#include <getopt.h>" "#include <${glibc.dev}/include/getopt.h>"
done
'';
cmakeFlags = [
"-DUSE_C99=YES"
"-DDEFAULT_ADMIN_USER=root"
"-DWITH_MAXSCALE_CNF=YES"
"-DSTATIC_EMBEDDED=YES"
"-DBUILD_RABBITMQ=YES"
"-DBUILD_BINLOG=YES"
"-DBUILD_CDC=NO"
"-DBUILD_MMMON=YES"
"-DBUILD_LUAFILTER=YES"
"-DLUA_LIBRARIES=${lua}/lib"
"-DLUA_INCLUDE_DIR=${lua}/include"
"-DGCOV=NO"
"-DWITH_SCRIPTS=OFF"
"-DBUILD_TESTS=NO"
"-DBUILD_TOOLS=NO"
"-DPROFILE=NO"
"-DWITH_TCMALLOC=YES"
"-DWITH_JEMALLOC=YES"
"-DINSTALL_EXPERIMENTAL=YES"
"-DTARGET_COMPONENT=all"
];
CFLAGS = "-std=gnu99";
enableParallelBuilding = false;
dontStrip = true;
postInstall = ''
find $out/bin -type f -perm -0100 | while read f1; do
patchelf \
--set-rpath "$(patchelf --print-rpath $f1):${libmysqlclient}/lib/mariadb:$out/lib/maxscale" \
--set-interpreter "$(cat ${stdenv.cc}/nix-support/dynamic-linker)" $f1 \
&& patchelf --shrink-rpath $f1
done
find $out/lib/maxscale -type f -perm -0100 | while read f2; do
patchelf \
--set-rpath "$(patchelf --print-rpath $f2)":$out/lib/maxscale $f2
done
mv $out/share/maxscale/create_grants $out/bin
rm -rf $out/{etc,var}
'';
meta = with lib; {
description = "MaxScale database proxy extends MariaDB Server's high availability";
homepage = "https://mariadb.com/products/technology/maxscale";
license = licenses.bsl11;
platforms = platforms.linux;
maintainers = with maintainers; [ izorkin ];
broken = true;
};
}

View File

@ -1,11 +0,0 @@
--- a/server/core/maxpasswd.c 2018-01-12 05:06:49.000000000 -0500
+++ b/server/core/maxpasswd.c 2018-01-12 06:50:18.518000000 -0500
@@ -25,6 +25,7 @@
#include <maxscale/cdefs.h>
+#include <getopt.h>
#include <stdio.h>
#include <errno.h>
#include <sys/stat.h>

View File

@ -2,20 +2,19 @@
htop.overrideAttrs (oldAttrs: rec {
pname = "htop-vim";
version = "unstable-2021-10-11";
version = "unstable-2022-05-24";
src = fetchFromGitHub {
owner = "KoffeinFlummi";
repo = pname;
rev = "ba6fd3891e9af60b41bd092524cc05f2469fec4b";
sha256 = "sha256-G83+5GgEz41begDkdK8zNx48UleufFCJ9pOQ9nbtFNs=";
rev = "830ef7144940875d9d9716e33aff8651d164026e";
sha256 = "sha256-ojStkpWvhb+W3dWyRev0VwjtCVL/I9L8FhtXcQ+ODLA=";
};
meta = with lib; {
inherit (htop.meta) platforms license;
description = "An interactive process viewer for Linux, with vim-style keybindings";
homepage = "https://github.com/KoffeinFlummi/htop-vim";
license = licenses.gpl2Only;
platforms = platforms.all;
maintainers = with maintainers; [ thiagokokada ];
mainProgram = "htop";
};

View File

@ -1,34 +0,0 @@
{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, glib, syslogng
, eventlog, perl, python2, bison, protobufc, libivykis, libcap, czmq
}:
stdenv.mkDerivation rec {
pname = "syslog-ng-incubator";
version = "0.6.2";
src = fetchFromGitHub {
owner = "balabit";
repo = "syslog-ng-incubator";
rev = "${pname}-${version}";
sha256 = "17y85cqcyfbp882gaii731cvz5bg1s8rgda271jh6kgnrz5rbd4s";
};
nativeBuildInputs = [ pkg-config autoreconfHook bison ];
buildInputs = [
glib syslogng eventlog perl python2 protobufc libivykis libcap czmq
];
configureFlags = [
"--with-module-dir=$(out)/lib/syslog-ng"
];
meta = with lib; {
homepage = "https://github.com/balabit/syslog-ng-incubator";
description = "A collection of tools and modules for syslog-ng";
license = licenses.gpl2;
maintainers = [];
platforms = platforms.linux;
broken = true; # 2018-05-12
};
}

View File

@ -96,6 +96,7 @@ mapAliases ({
awesome-4-0 = awesome; # Added 2022-05-05
aws-okta = throw "aws-okta is on indefinite hiatus. See https://github.com/segmentio/aws-okta/issues/278"; # Added 2022-04-05;
axoloti = throw "axoloti has been removed: abandoned by upstream"; # Added 2022-05-13
azure-vhd-utils = throw "azure-vhd-utils has been dropped due to the lack of maintenance from upstream since 2018"; # Added 2022-06-03
azureus = throw "azureus is now known as vuze and the version in nixpkgs was really outdated"; # Added 2021-08-02
### B ###
@ -385,6 +386,7 @@ mapAliases ({
enblendenfuse = throw "'enblendenfuse' has been renamed to/replaced by 'enblend-enfuse'"; # Converted to throw 2022-02-22
encryptr = throw "encryptr was removed because it reached end of life"; # Added 2022-02-06
envdir = throw "envdir has been dropped due to the lack of maintenance from upstream since 2018"; # Added 2022-06-03
envelope = throw "envelope has been removed from nixpkgs, as it was unmaintained"; # Added 2021-08-05
epoxy = libepoxy; # Added 2021-11-11
epsxe = throw "epsxe has been removed from nixpkgs, as it was unmaintained."; # added 2021-12-15
@ -1335,7 +1337,6 @@ mapAliases ({
telepathy_mission_control = throw "'telepathy_mission_control' has been renamed to/replaced by 'telepathy-mission-control'"; # Converted to throw 2022-02-22
telepathy_qt = throw "'telepathy_qt' has been renamed to/replaced by 'telepathy-qt'"; # Converted to throw 2022-02-22
telepathy_qt5 = throw "'telepathy_qt5' has been renamed to/replaced by 'libsForQt5.telepathy'"; # Converted to throw 2022-02-22
telepathy_salut = throw "'telepathy_salut' has been renamed to/replaced by 'telepathy-salut'"; # Converted to throw 2022-02-22
telnet = throw "'telnet' has been renamed to/replaced by 'inetutils'"; # Converted to throw 2022-02-22
terminus = throw "terminus has been removed, it was unmaintained in nixpkgs"; # Added 2021-08-21
terraform-provider-ibm = throw "'terraform-provider-ibm' has been renamed to/replaced by 'terraform-providers.ibm'"; # Converted to throw 2022-02-22
@ -1380,6 +1381,7 @@ mapAliases ({
tuijam = throw "tuijam has been removed because Google Play Music was discontinued"; # Added 2021-03-07
turbo-geth = throw "turbo-geth has been renamed to erigon"; # Added 2021-08-08
twister = throw "twister has been removed: abandoned by upstream and python2-only"; # Added 2022-04-26
tychus = throw "tychus has been dropped due to the lack of maintenance from upstream since 2018"; # Added 2022-06-03
typora = throw "Newer versions of typora use anti-user encryption and refuse to start. As such it has been removed"; # Added 2021-09-11
### U ###
@ -1449,6 +1451,7 @@ mapAliases ({
wireguard = throw "'wireguard' has been renamed to/replaced by 'wireguard-tools'"; # Converted to throw 2022-02-22
wormhole-rs = magic-wormhole-rs; # Added 2022-05-30. preserve, reason: Arch package name, main binary name
wmii_hg = wmii;
ws = throw "ws has been dropped due to the lack of maintenance from upstream since 2018"; # Added 2022-06-03
wxmupen64plus = throw "wxmupen64plus was removed because the upstream disappeared"; # Added 2022-01-31
### X ###

View File

@ -133,10 +133,19 @@ with pkgs;
### Push NixOS tests inside the fixed point
# See also allTestsForSystem in nixos/release.nix
nixosTests = import ../../nixos/tests/all-tests.nix {
inherit pkgs;
system = stdenv.hostPlatform.system;
callTest = t: t.test;
} // {
# for typechecking of the scripts and evaluation of
# the nodes, without running VMs.
allDrivers = import ../../nixos/tests/all-tests.nix {
inherit pkgs;
system = stdenv.hostPlatform.system;
callTest = t: t.test.driver;
};
};
### BUILD SUPPORT
@ -1900,8 +1909,6 @@ with pkgs;
azure-storage-azcopy = callPackage ../development/tools/azcopy { };
azure-vhd-utils = callPackage ../tools/misc/azure-vhd-utils { };
awless = callPackage ../tools/virtualization/awless { };
bashblog = callPackage ../tools/text/bashblog { };
@ -2982,6 +2989,8 @@ with pkgs;
clac = callPackage ../tools/misc/clac {};
map-cmd = callPackage ../tools/misc/map {};
clash = callPackage ../tools/networking/clash {
buildGoModule = buildGo118Module;
};
@ -4269,8 +4278,6 @@ with pkgs;
syslogng = callPackage ../tools/system/syslog-ng { };
syslogng_incubator = callPackage ../tools/system/syslog-ng-incubator { };
svt-av1 = callPackage ../tools/video/svt-av1 { };
inherit (callPackages ../servers/rainloop { })
@ -9217,8 +9224,6 @@ with pkgs;
pell = callPackage ../applications/misc/pell { };
pepper = callPackage ../tools/admin/salt/pepper { };
perceptualdiff = callPackage ../tools/graphics/perceptualdiff { };
percona-xtrabackup = percona-xtrabackup_8_0;
@ -9864,8 +9869,6 @@ with pkgs;
relic = callPackage ../development/tools/relic { };
remarkjs = callPackage ../development/web/remarkjs { };
alarm-clock-applet = callPackage ../tools/misc/alarm-clock-applet { };
remind = callPackage ../tools/misc/remind { };
@ -10310,10 +10313,6 @@ with pkgs;
sisco.lv2 = callPackage ../applications/audio/sisco.lv2 { };
sit = callPackage ../applications/version-management/sit {
inherit (darwin.apple_sdk.frameworks) CoreFoundation Security;
};
sixpair = callPackage ../tools/misc/sixpair {};
sketchybar = callPackage ../os-specific/darwin/sketchybar {
@ -16385,10 +16384,6 @@ with pkgs;
tweak = callPackage ../applications/editors/tweak { };
tychus = callPackage ../development/tools/tychus {
inherit (darwin.apple_sdk.frameworks) CoreFoundation;
};
uddup = callPackage ../tools/security/uddup { };
udis86 = callPackage ../development/tools/udis86 { };
@ -20787,8 +20782,6 @@ with pkgs;
stegseek = callPackage ../tools/security/stegseek {};
stlport = callPackage ../development/libraries/stlport { };
streamlink = callPackage ../applications/video/streamlink { };
streamlink-twitch-gui-bin = callPackage ../applications/video/streamlink-twitch-gui/bin.nix {};
@ -21432,8 +21425,6 @@ with pkgs;
vgo2nix = callPackage ../development/tools/vgo2nix { };
ws = callPackage ../development/tools/ws { };
### DEVELOPMENT / JAVA MODULES
javaPackages = recurseIntoAttrs (callPackage ./java-packages.nix { });
@ -23963,12 +23954,9 @@ with pkgs;
libudev0-shim = callPackage ../os-specific/linux/libudev0-shim { };
udisks1 = callPackage ../os-specific/linux/udisks/1-default.nix { };
udisks2 = callPackage ../os-specific/linux/udisks/2-default.nix { };
udisks = udisks2;
udisks_glue = callPackage ../os-specific/linux/udisks-glue { };
ugtrain = callPackage ../tools/misc/ugtrain { };
unscd = callPackage ../os-specific/linux/unscd { };
@ -24296,8 +24284,6 @@ with pkgs;
envypn-font = callPackage ../data/fonts/envypn-font
{ inherit (buildPackages.xorg) fonttosfnt mkfontscale; };
envdir = callPackage ../tools/misc/envdir-go { };
execline-man-pages = skawarePackages.execline-man-pages;
ezra-sil = callPackage ../data/fonts/ezra-sil { };
@ -24870,10 +24856,6 @@ with pkgs;
quattrocento-sans = callPackage ../data/fonts/quattrocento-sans {};
r4rs = callPackage ../data/documentation/rnrs/r4rs.nix { };
r5rs = callPackage ../data/documentation/rnrs/r5rs.nix { };
raleway = callPackage ../data/fonts/raleway { };
recursive = callPackage ../data/fonts/recursive { };
@ -27438,8 +27420,6 @@ with pkgs;
lua5 = lua5_3;
};
iptraf = callPackage ../applications/networking/iptraf { };
iptraf-ng = callPackage ../applications/networking/iptraf-ng { };
irccloud = callPackage ../applications/networking/irc/irccloud { };
@ -28637,10 +28617,6 @@ with pkgs;
maxlib = callPackage ../applications/audio/pd-plugins/maxlib { };
maxscale = callPackage ../tools/networking/maxscale {
stdenv = gcc6Stdenv;
};
pdfdiff = callPackage ../applications/misc/pdfdiff { };
pdfsam-basic = callPackage ../applications/misc/pdfsam-basic { };
@ -29865,8 +29841,6 @@ with pkgs;
syncthing-discovery
syncthing-relay;
syncthing-gtk = python2Packages.callPackage ../applications/networking/syncthing-gtk { };
syncthing-tray = callPackage ../applications/misc/syncthing-tray { };
syncthingtray = libsForQt5.callPackage ../applications/misc/syncthingtray { };
@ -29963,8 +29937,6 @@ with pkgs;
telepathy-mission-control = callPackage ../applications/networking/instant-messengers/telepathy/mission-control { };
telepathy-salut = callPackage ../applications/networking/instant-messengers/telepathy/salut {};
telepathy-idle = callPackage ../applications/networking/instant-messengers/telepathy/idle {};
teleprompter = callPackage ../applications/misc/teleprompter {};
@ -30099,8 +30071,6 @@ with pkgs;
todoman = callPackage ../applications/office/todoman { };
toggldesktop = libsForQt514.callPackage ../applications/misc/toggldesktop { };
topydo = callPackage ../applications/misc/topydo {};
torchat = callPackage ../applications/networking/instant-messengers/torchat { };
@ -30292,8 +30262,6 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) Carbon Cocoa;
});
vimiv = callPackage ../applications/graphics/vimiv { };
vimiv-qt = callPackage ../applications/graphics/vimiv-qt { };
macvim = callPackage ../applications/editors/vim/macvim-configurable.nix { stdenv = clangStdenv; };
@ -32378,8 +32346,6 @@ with pkgs;
trackballs = callPackage ../games/trackballs { };
tremulous = callPackage ../games/tremulous { };
tumiki-fighters = callPackage ../games/tumiki-fighters { };
tuxpaint = callPackage ../games/tuxpaint { };
@ -32536,8 +32502,6 @@ with pkgs;
serverOnly = true;
};
zangband = callPackage ../games/zangband { };
zaz = callPackage ../games/zaz { };
zdbsp = callPackage ../games/zdoom/zdbsp.nix { };
@ -33655,8 +33619,6 @@ with pkgs;
singular = callPackage ../applications/science/math/singular { };
scilab = callPackage ../applications/science/math/scilab { };
scilab-bin = callPackage ../applications/science/math/scilab-bin {};
scilla = callPackage ../tools/security/scilla { };

View File

@ -6,7 +6,7 @@
be almost as much code as the function itself. */
{ config
, stdenv, lib, buildPackages, pkgs
, stdenv, lib, buildPackages, pkgs, darwin
, fetchurl, fetchgit, fetchpatch, fetchFromGitHub, fetchFromGitLab
, perl, overrides, buildPerl, shortenPerlShebang
, nixosTests
@ -21045,6 +21045,57 @@ let
};
};
Tcl = buildPerlPackage {
pname = "Tcl";
version = "1.27";
src = fetchurl {
url = "mirror://cpan/authors/id/V/VK/VKON/Tcl-1.27.tar.gz";
sha256 = "sha256-+DhYd6Sp7Z89OQPS0PfNcPrDzmgyxg9gCmghzuP7WHI=";
};
propagatedBuildInputs = [
pkgs.bwidget
pkgs.tcl
pkgs.tix
pkgs.tk
] ++ lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.CoreServices ];
makeMakerFlags = lib.optionalString stdenv.isLinux
"--tclsh=${pkgs.tcl}/bin/tclsh --nousestubs";
meta = {
description = "Tcl extension module for perl";
license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
TclpTk = buildPerlPackage {
pname = "Tcl-pTk";
version = "1.09";
src = fetchurl {
url = "mirror://cpan/authors/id/C/CA/CAC/Tcl-pTk-1.09.tar.gz";
sha256 = "sha256-LR+YBlKS9+W7mBBy9/EkAOjxGVVe4MC5zToPr/pXl24=";
};
propagatedBuildInputs = [
ClassISA
SubName
Tcl
TestDeep
];
buildPhase = ''
perl Makefile.PL --tclsh "${pkgs.tk.tcl}/bin/tclsh" INSTALL_BASE=$out --no-test-for-tk
'';
postInstall = ''
mkdir -p $out/lib/perl5/site_perl
mv $out/lib/perl5/Tcl $out/lib/perl5/site_perl/
mv $out/lib/perl5/auto $out/lib/perl5/site_perl/
'' + lib.optionalString stdenv.isDarwin ''
mv $out/lib/perl5/darwin-thread-multi-2level $out/lib/perl5/site_perl/
'';
meta = {
description = "Interface to Tcl/Tk with Perl/Tk compatible syntax";
license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
TemplatePluginAutoformat = buildPerlPackage {
pname = "Template-Plugin-Autoformat";
version = "2.77";
@ -24167,6 +24218,21 @@ let
};
};
TkToolBar = buildPerlPackage {
pname = "Tk-ToolBar";
version = "0.12";
src = fetchurl {
url = "mirror://cpan/authors/id/A/AS/ASB/Tk-ToolBar-0.12.tar.gz";
sha256 = "sha256-Rj4oTsRxN+fEJclpGwKo3sXOJytY6h9jWa6AQaI53Q8=";
};
makeMakerFlags = "X11INC=${pkgs.xorg.libX11.dev}/include X11LIB=${pkgs.xorg.libX11.out}/lib";
buildInputs = [ Tk ];
doCheck = false; # Expects working X11.
meta = {
license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
TreeDAGNode = buildPerlPackage {
pname = "Tree-DAG_Node";
version = "1.31";

View File

@ -405,6 +405,8 @@ in {
aioshutil = callPackage ../development/python-modules/aioshutil { };
aioskybell = callPackage ../development/python-modules/aioskybell { };
aiosignal = callPackage ../development/python-modules/aiosignal { };
aioslimproto = callPackage ../development/python-modules/aioslimproto { };