Merge master into staging-next

This commit is contained in:
github-actions[bot] 2021-07-29 00:01:33 +00:00 committed by GitHub
commit 4fc7a31edb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
42 changed files with 590 additions and 145 deletions

View file

@ -520,7 +520,7 @@ If you do need to do create this sort of patch file, one way to do so is with gi
4. Use git to create a diff, and pipe the output to a patch file:
```ShellSession
$ git diff > nixpkgs/pkgs/the/package/0001-changes.patch
$ git diff -a > nixpkgs/pkgs/the/package/0001-changes.patch
```
If a patch is available online but does not cleanly apply, it can be modified in some fixed ways by using additional optional arguments for `fetchpatch`:

View file

@ -133,6 +133,13 @@
<link linkend="opt-services.prometheus.exporters.influxdb.enable">services.prometheus.exporters.influxdb</link>.
</para>
</listitem>
<listitem>
<para>
<link xlink:href="https://github.com/matrix-discord/mx-puppet-discord">mx-puppet-discord</link>,
a discord puppeting bridge for matrix. Available as
<link linkend="opt-services.mx-puppet-discord.enable">services.mx-puppet-discord</link>.
</para>
</listitem>
</itemizedlist>
</section>
<section xml:id="sec-release-21.11-incompatibilities">

View file

@ -41,6 +41,8 @@ pt-services.clipcat.enable).
- [influxdb-exporter](https://github.com/prometheus/influxdb_exporter) a Prometheus exporter that exports metrics received on an InfluxDB compatible endpoint is now available as [services.prometheus.exporters.influxdb](#opt-services.prometheus.exporters.influxdb.enable).
- [mx-puppet-discord](https://github.com/matrix-discord/mx-puppet-discord), a discord puppeting bridge for matrix. Available as [services.mx-puppet-discord](#opt-services.mx-puppet-discord.enable).
## Backward Incompatibilities {#sec-release-21.11-incompatibilities}
- The `staticjinja` package has been upgraded from 1.0.4 to 3.0.1

View file

@ -654,7 +654,11 @@ in
];
fileSystems."/" =
{ fsType = "tmpfs";
# This module is often over-layed onto an existing host config
# that defines `/`. We use mkOverride 60 to override standard
# values, but at the same time leave room for mkForce values
# targeted at the image build.
{ fsType = mkOverride 60 "tmpfs";
options = [ "mode=0755" ];
};

View file

@ -30,7 +30,11 @@ with lib;
else [ pkgs.grub2 pkgs.syslinux ]);
fileSystems."/" =
{ fsType = "tmpfs";
# This module is often over-layed onto an existing host config
# that defines `/`. We use mkOverride 60 to override standard
# values, but at the same time leave room for mkForce values
# targeted at the image build.
{ fsType = mkOverride 60 "tmpfs";
options = [ "mode=0755" ];
};

View file

@ -1,7 +1,7 @@
{
x86_64-linux = "/nix/store/qsgz2hhn6mzlzp53a7pwf9z2pq3l5z6h-nix-2.3.14";
i686-linux = "/nix/store/1yw40bj04lykisw2jilq06lir3k9ga4a-nix-2.3.14";
aarch64-linux = "/nix/store/32yzwmynmjxfrkb6y6l55liaqdrgkj4a-nix-2.3.14";
x86_64-darwin = "/nix/store/06j0vi2d13w4l0p3jsigq7lk4x6gkycj-nix-2.3.14";
aarch64-darwin = "/nix/store/77wi7vpbrghw5rgws25w30bwb8yggnk9-nix-2.3.14";
x86_64-linux = "/nix/store/jhbxh1jwjc3hjhzs9y2hifdn0rmnfwaj-nix-2.3.15";
i686-linux = "/nix/store/9pspwnkdrgzma1l4xlv7arhwa56y16di-nix-2.3.15";
aarch64-linux = "/nix/store/72aqi5g7f4fhgvgafbcqwcpqjgnczj48-nix-2.3.15";
x86_64-darwin = "/nix/store/6p6qwp73dgfkqhynmxrzbx1lcfgfpqal-nix-2.3.15";
aarch64-darwin = "/nix/store/dmq2vksdhssgfl822shd0ky3x5x0klh4-nix-2.3.15";
}

View file

@ -529,6 +529,7 @@
./services/misc/mediatomb.nix
./services/misc/metabase.nix
./services/misc/mwlib.nix
./services/misc/mx-puppet-discord.nix
./services/misc/n8n.nix
./services/misc/nix-daemon.nix
./services/misc/nix-gc.nix

View file

@ -0,0 +1,120 @@
{ config, pkgs, lib, ... }:
with lib;
let
dataDir = "/var/lib/mx-puppet-discord";
registrationFile = "${dataDir}/discord-registration.yaml";
cfg = config.services.mx-puppet-discord;
settingsFormat = pkgs.formats.json {};
settingsFile = settingsFormat.generate "mx-puppet-discord-config.json" cfg.settings;
in {
options = {
services.mx-puppet-discord = {
enable = mkEnableOption ''
mx-puppet-discord is a discord puppeting bridge for matrix.
It handles bridging private and group DMs, as well as Guilds (servers)
'';
settings = mkOption rec {
apply = recursiveUpdate default;
inherit (settingsFormat) type;
default = {
bridge.port = 8434;
presence = {
enabled = true;
interval = 500;
};
provisioning.whitelist = [ ];
relay.whitelist = [ ];
# variables are preceded by a colon.
namePatterns = {
user = ":name";
userOverride = ":displayname";
room = ":name";
group = ":name";
};
#defaults to sqlite but can be configured to use postgresql with
#connstring
database.filename = "${dataDir}/mx-puppet-discord/database.db";
logging = {
console = "info";
lineDateFormat = "MMM-D HH:mm:ss.SSS";
};
};
example = literalExample ''
{
bridge = {
bindAddress = "localhost";
domain = "example.com";
homeserverUrl = "https://example.com";
};
provisioning.whitelist = [ "@admin:example.com" ];
relay.whitelist = [ "@.*:example.com" ];
}
'';
description = ''
<filename>config.yaml</filename> configuration as a Nix attribute set.
Configuration options should match those described in
<link xlink:href="https://github.com/matrix-discord/mx-puppet-discord/blob/master/sample.config.yaml">
sample.config.yaml</link>.
'';
};
serviceDependencies = mkOption {
type = with types; listOf str;
default = optional config.services.matrix-synapse.enable "matrix-synapse.service";
description = ''
List of Systemd services to require and wait for when starting the application service.
'';
};
};
};
config = mkIf cfg.enable {
systemd.services.mx-puppet-discord = {
description = ''
mx-puppet-discord is a discord puppeting bridge for matrix.
It handles bridging private and group DMs, as well as Guilds (servers).
'';
wantedBy = [ "multi-user.target" ];
wants = [ "network-online.target" ] ++ cfg.serviceDependencies;
after = [ "network-online.target" ] ++ cfg.serviceDependencies;
preStart = ''
# generate the appservice's registration file if absent
if [ ! -f '${registrationFile}' ]; then
${pkgs.mx-puppet-discord}/bin/mx-puppet-discord -r -c ${settingsFile} \
-f ${registrationFile}
fi
'';
serviceConfig = {
Type = "simple";
Restart = "always";
ProtectSystem = "strict";
ProtectHome = true;
ProtectKernelTunables = true;
ProtectKernelModules = true;
ProtectControlGroups = true;
DynamicUser = true;
PrivateTmp = true;
WorkingDirectory = pkgs.mx-puppet-discord;
StateDirectory = baseNameOf dataDir;
UMask = 0027;
ExecStart = ''
${pkgs.mx-puppet-discord}/bin/mx-puppet-discord -c ${settingsFile}
'';
};
};
};
meta.maintainers = with maintainers; [ govanify ];
}

View file

@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
pname = "geeqie";
version = "1.5.1";
version = "1.6.0";
src = fetchurl {
url = "http://geeqie.org/${pname}-${version}.tar.xz";
sha256 = "02m1vqaasin249xx792cdj11xyag8lnanwzxd108y7y34g9xam28";
url = "https://github.com/BestImageViewer/geeqie/archive/refs/tags/v1.6.tar.gz";
sha256 = "0ky248j6n8hszkwwi949i1ypm2l5444byaspaa6564d9rpij01aj";
};
patches = [
@ -23,9 +23,10 @@ stdenv.mkDerivation rec {
preConfigure = "./autogen.sh";
nativeBuildInputs = [ pkg-config autoconf automake gettext intltool
wrapGAppsHook
];
nativeBuildInputs =
[ pkg-config autoconf automake gettext intltool
wrapGAppsHook
];
buildInputs = [
gtk3 lcms2 exiv2 libchamplain clutter-gtk ffmpegthumbnailer fbida

View file

@ -1,4 +1,4 @@
{lib, stdenv, fetchFromGitHub, ocamlPackages, fontschumachermisc, xset, makeWrapper, ncurses, gnugrep, fetchpatch
{lib, stdenv, fetchFromGitHub, ocamlPackages, fontschumachermisc, xset, makeWrapper, ncurses, gnugrep, fetchpatch, copyDesktopItems, makeDesktopItem
, enableX11 ? true}:
let inherit (ocamlPackages) ocaml lablgtk; in
@ -14,7 +14,7 @@ stdenv.mkDerivation (rec {
sha256 = "sha256-42hmdMwOYSWGiDCmhuqtpCWtvtyD2l+kA/bhHD/Qh5Y=";
};
nativeBuildInputs = [ makeWrapper ];
nativeBuildInputs = [ makeWrapper ] ++ (lib.lists.optional enableX11 copyDesktopItems);
buildInputs = [ ocaml ncurses ];
patches = [
@ -27,9 +27,9 @@ stdenv.mkDerivation (rec {
})
];
preBuild = (if enableX11 then ''
preBuild = (lib.strings.optionalString enableX11 ''
sed -i "s|\(OCAMLOPT=.*\)$|\1 -I $(echo "${lablgtk}"/lib/ocaml/*/site-lib/lablgtk2)|" src/Makefile.OCaml
'' else "") + ''
'') + ''
echo -e '\ninstall:\n\tcp $(FSMONITOR)$(EXEC_EXT) $(INSTALLDIR)' >> src/fsmonitor/linux/Makefile
'';
@ -40,15 +40,32 @@ stdenv.mkDerivation (rec {
preInstall = "mkdir -p $out/bin";
postInstall = if enableX11 then ''
postInstall = lib.strings.optionalString enableX11 ''
for i in $(cd $out/bin && ls); do
wrapProgram $out/bin/$i \
--run "[ -n \"\$DISPLAY\" ] && (${xset}/bin/xset q | ${gnugrep}/bin/grep -q \"${fontschumachermisc}\" || ${xset}/bin/xset +fp \"${fontschumachermisc}/lib/X11/fonts/misc\")"
done
'' else "";
install -D $src/icons/U.svg $out/share/icons/hicolor/scalable/apps/unison.svg
'';
dontStrip = !ocaml.nativeCompilers;
desktopItems = lib.lists.optional enableX11 (makeDesktopItem {
name = pname;
desktopName = "Unison";
comment = "Bidirectional file synchronizer";
genericName = "File synchronization tool";
exec = "unison";
icon = "unison";
categories = "Utility;FileTools;GTK;";
extraDesktopEntries={
StartupWMClass="Unison";
StartupNotify="true";
X-MultipleArgs="false";
};
});
meta = {
homepage = "https://www.cis.upenn.edu/~bcpierce/unison/";
description = "Bidirectional file synchronizer";

View file

@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
makeFlags = [
"prefix=$(out)"
"CGIT_SCRIPT_PATH=$out/cgit/"
"CGIT_SCRIPT_PATH=$(out)/cgit/"
"CC=${stdenv.cc.targetPrefix}cc"
"AR=${stdenv.cc.targetPrefix}ar"
];

View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "virt-what";
version = "1.20";
version = "1.21";
src = fetchurl {
url = "https://people.redhat.com/~rjones/virt-what/files/${pname}-${version}.tar.gz";
sha256 = "1s0hg5w47gmnllbs935bx21k3zqrgvqx1wn0zzij2lfxkb9dq4zr";
sha256 = "0yqz1l4di57d4y1z94yhdmkiykg9a8i7xwkqmd9zsk5a6i9lbjqj";
};
meta = with lib; {

View file

@ -11,13 +11,13 @@
stdenv.mkDerivation rec {
pname = "gnome-autoar";
version = "0.3.2";
version = "0.3.3";
outputs = [ "out" "dev" ];
src = fetchurl {
url = "mirror://gnome/sources/gnome-autoar/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0wkwix44yg126xn1v4f2j60bv9yiyadfpzf8ifx0bvd9x5f4v354";
sha256 = "JyQA9zo3Wn6I/fHhJZG/uPPwPt8BeAytzXT3C2E+XAQ=";
};
passthru = {

View file

@ -21,8 +21,8 @@ let
release_version = "13.0.0";
candidate = ""; # empty or "rcN"
dash-candidate = lib.optionalString (candidate != "") "-${candidate}";
rev = "1605fce6c3074f8d1dff5a917a1840ffa66abd86"; # When using a Git commit
rev-version = "unstable-2021-06-19"; # When using a Git commit
rev = "98033fdc50e61273b1d5c77ba5f0f75afe3965c1"; # When using a Git commit
rev-version = "unstable-2021-07-12"; # When using a Git commit
version = if rev != "" then rev-version else "${release_version}${dash-candidate}";
targetConfig = stdenv.targetPlatform.config;
@ -30,7 +30,7 @@ let
owner = "llvm";
repo = "llvm-project";
rev = if rev != "" then rev else "llvmorg-${version}";
sha256 = "1jf0b9vn4qv5gsvhyg6xsqdkdl4vzn7j4sfcldl8bggcgjmzp0q1";
sha256 = "0m28wpkyymzgqflp8xwyab0vryn3jln565qk15qm839n0d0mq3hh";
};
llvm_meta = {

View file

@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "regenmaschine";
version = "3.1.3";
version = "3.1.4";
format = "pyproject";
disabled = pythonOlder "3.6";
@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "bachya";
repo = pname;
rev = version;
sha256 = "sha256-3Q0JQQVspzuQQAn3S46uFbOYW2zQ7c1UL4zjEOnifDY=";
sha256 = "07ldbajm1y92szdc36z5cl02dpvbarsb8clq9m45849gm8g7yczd";
};
nativeBuildInputs = [

View file

@ -72,7 +72,7 @@ let
tfFeature = x: if x then "1" else "0";
version = "2.4.1";
version = "2.4.2";
variant = if cudaSupport then "-gpu" else "";
pname = "tensorflow${variant}";
@ -110,7 +110,7 @@ let
owner = "tensorflow";
repo = "tensorflow";
rev = "v${version}";
sha256 = "sha256-J62QfP45g5nxN9Nqa1tAGyc4vD2JKh50ddHLrd6/qsY=";
sha256 = "07a2y05hixch1bjag5pzw3p1m7bdj3bq4gdvmsfk2xraz49b1pi8";
};
patches = [

View file

@ -10,14 +10,22 @@ stdenv.mkDerivation rec {
buildInputs = [motif ncurses libX11 libXt];
configureFlags = [ "--with-x" ];
patches = [ ./gcc44.patch ];
patches = [
# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=504868
./gcc44.patch
];
NIX_CFLAGS_COMPILE = "-fpermissive";
postInstall = ''
install -D icons/ddd.xpm $out/share/pixmaps/ddd.xpm
'';
meta = {
homepage = "https://www.gnu.org/software/ddd";
description = "Graphical front-end for command-line debuggers";
license = lib.licenses.gpl2;
license = lib.licenses.gpl3Plus;
platforms = lib.platforms.linux;
maintainers = with lib.maintainers; [ angustrau ];
};
}

View file

@ -0,0 +1,61 @@
{ lib, stdenv, fetchsvn, wrapQtAppsHook, qtbase, qttools, qmake, bison, flex, ... }:
stdenv.mkDerivation rec {
pname = "qtspim";
version = "9.1.22";
src = fetchsvn {
url = "https://svn.code.sf.net/p/spimsimulator/code/";
rev = "r739";
sha256 = "1kazfgrbmi4xq7nrkmnqw1280rhdyc1hmr82flrsa3g1b1rlmj1s";
};
postPatch = ''
cd QtSpim
# Patches from https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=qtspim
sed -i 's/zero_imm/is_zero_imm/g' parser_yacc.cpp
sed -i 's/^int data_dir/bool data_dir/g' parser_yacc.cpp
sed -i 's/^int text_dir/bool text_dir/g' parser_yacc.cpp
sed -i 's/^int parse_error_occurred/bool parse_error_occurred/g' parser_yacc.cpp
substituteInPlace QtSpim.pro --replace /usr/lib/qtspim/lib $out/lib
substituteInPlace menu.cpp \
--replace /usr/lib/qtspim/bin/assistant ${qttools.dev}/bin/assistant \
--replace /usr/lib/qtspim/help/qtspim.qhc $out/share/help/qtspim.qhc
substituteInPlace ../Setup/qtspim_debian_deployment/qtspim.desktop \
--replace /usr/bin/qtspim qtspim \
--replace /usr/lib/qtspim/qtspim.png qtspim
'';
nativeBuildInputs = [ wrapQtAppsHook qttools qmake bison flex ];
buildInputs = [ qtbase ];
QT_PLUGIN_PATH = "${qtbase}/${qtbase.qtPluginPrefix}";
qmakeFlags = [
"QtSpim.pro"
"-spec"
"linux-g++"
"CONFIG+=release"
];
installPhase = ''
runHook preInstall
install -D QtSpim $out/bin/qtspim
install -D ../Setup/qtspim_debian_deployment/copyright $out/share/licenses/qtspim/copyright
install -D ../Setup/qtspim_debian_deployment/qtspim.desktop $out/share/applications/qtspim.desktop
install -D ../Setup/NewIcon48x48.png $out/share/icons/hicolor/48x48/apps/qtspim.png
install -D ../Setup/NewIcon256x256.png $out/share/icons/hicolor/256x256/apps/qtspim.png
cp -r help $out/share/help
runHook postInstall
'';
meta = with lib; {
description = "New user interface for spim, a MIPS simulator";
homepage = "http://spimsimulator.sourceforge.net/";
license = licenses.bsdOriginal;
maintainers = with maintainers; [ angustrau ];
platforms = platforms.linux;
};
}

View file

@ -0,0 +1,49 @@
{ lib, stdenv, fetchsvn, imake, bison, flex, xlibsWrapper, libXaw, libXpm, ... }:
stdenv.mkDerivation rec {
pname = "xspim";
version = "9.1.22";
src = fetchsvn {
url = "https://svn.code.sf.net/p/spimsimulator/code/";
rev = "r739";
sha256 = "1kazfgrbmi4xq7nrkmnqw1280rhdyc1hmr82flrsa3g1b1rlmj1s";
};
nativeBuildInputs = [ imake bison flex ];
buildInputs = [ xlibsWrapper libXaw libXpm ];
preConfigure = ''
cd xspim
xmkmf
'';
makeFlags = [
"BIN_DIR=${placeholder "out"}/bin"
"EXCEPTION_DIR=${placeholder "out"}/share/spim"
"MAN_DIR=${placeholder "out"}/share/man/man1"
];
doCheck = true;
preCheck = ''
pushd ../spim
'';
postCheck = ''
popd
'';
preInstall = ''
mkdir -p $out/share/spim
install -D ../spim/spim $out/bin/spim
install -D ../Documentation/spim.man $out/share/man/man1/spim.1
install -D ../Documentation/xspim.man $out/share/man/man1/xspim.1
'';
meta = with lib; {
description = "A MIPS32 simulator";
homepage = "http://spimsimulator.sourceforge.net/";
license = licenses.bsdOriginal;
maintainers = with maintainers; [ angustrau ];
platforms = platforms.linux;
};
}

View file

@ -0,0 +1,43 @@
{ lib, stdenv, fetchurl, imake, xlibsWrapper, gccmakedep, libXaw }:
stdenv.mkDerivation rec {
pname = "xxgdb";
version = "1.12";
src = fetchurl {
url = "http://deb.debian.org/debian/pool/main/x/xxgdb/xxgdb_${version}.orig.tar.gz";
sha256 = "0jwazg99wk2l7r390ggw0yr8xipl07bp0qynni141xss530i6d1a";
};
patches = [
# http://zhu-qy.blogspot.com.es/2012/11/slackware-14-i-still-got-xxgdb-all-ptys.html
./xxgdb-pty.patch
];
nativeBuildInputs = [ imake gccmakedep ];
buildInputs = [ xlibsWrapper libXaw ];
preConfigure = ''
mkdir build
xmkmf
'';
makeFlags = [
"DESTDIR=build"
];
postInstall = ''
# Fix up install paths
shopt -s globstar
mv build/**/bin $out/bin
install -D xxgdb.1 $out/share/man/man1/xxgdb.1
'';
meta = with lib; {
description = "A simple but powerful graphical interface to gdb";
license = licenses.mit;
maintainers = with maintainers; [ angustrau ];
platforms = platforms.all;
};
}

View file

@ -0,0 +1,84 @@
--- xxgdb-1.12-org/calldbx.c 2012-10-26 17:17:49.810750909 -0700
+++ xxgdb-1.12/calldbx.c 2012-10-26 17:53:59.209918816 -0700
@@ -69,6 +69,12 @@
* create_io_window(): create an io window for gdb to use
*/
+#ifdef linux
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE
+#endif
+#endif
+
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -126,6 +132,13 @@
{
int master;
+#ifdef _POSIX_SOURCE
+ if ((master = posix_openpt (O_RDWR|O_NOCTTY)) < 0) {
+ perror("posix_openpt failed:");
+ } else {
+ return master;
+ }
+#else
#ifdef SVR4 /* (MJH) Use STREAMS */
if((master = open(MASTER_CLONE, O_RDWR)) < 0)
@@ -152,6 +165,7 @@
}
#endif
#endif /* SVR4 */
+#endif /* _POSIX_SOURCE */
#ifdef GDB
fprintf(stderr, "xxgdb: all ptys in use\n");
@@ -167,7 +181,28 @@
{
int slave;
-#ifdef SVR4 /* (MJH) */
+#ifdef _POSIX_SOURCE
+ char *slave_name = ptsname (master);
+ if (slave_name == NULL) {
+ perror ("Pseudo-tty slave");
+ exit (2);
+ } // end if
+ if (grantpt (master) < 0) {
+ perror ("grantpt error");
+ exit (3);
+ }
+ if (unlockpt (master) < 0) {
+ perror ("unlockpt error");
+ exit (4);
+ }
+ if ((slave = open (slave_name, O_RDWR)) < 0) {
+ perror (slave_name);
+ exit (5);
+ } // end if
+ return slave;
+#else
+#ifdef SVR4
+ /* (MJH) */
char *slave_name = "unknown";
extern char *ptsname(int master);
void (*handler)();
@@ -194,6 +229,7 @@
}
return slave;
#endif /* SVR4 */
+#endif /* _POSIX_SOURCE */
}
#ifdef CREATE_IO_WINDOW
@@ -230,7 +266,7 @@
{
/* child */
/* printf("xterm xterm -l -e xxgdbiowin\n");*/
- if (execlp("xterm", "xterm", "-e", "xxgdbiowin", 0))
+ if (execlp("xterm", "xterm", "-e", "xxgdbiowin", NULL))
{
printf("exec of 'xterm -e xxgdbiowin' fails\n");
unlink("/tmp/iowindowtty");

View file

@ -1,11 +1,11 @@
{ fetchFromGitHub }:
rec {
version = "4.0.9";
version = "4.1.5";
src = fetchFromGitHub {
owner = "NICMx";
repo = "Jool";
rev = "v${version}";
sha256 = "0zhdpk1sbsv1iyr9rvj94wk853684avz3zzn4cv2k4254d7n25m7";
sha256 = "05dwz4q6v6azgpyj9dzwihnw1lalhhym116q2ya7spvgxzxi04ax";
};
}

View file

@ -1,17 +1,20 @@
{ lib, stdenv, fetchurl, fetchpatch, gettext, libnl, ncurses, pciutils, pkg-config, zlib }:
{ lib, stdenv, fetchFromGitHub, fetchpatch, gettext, libnl, ncurses, pciutils
, pkg-config, zlib, autoreconfHook }:
stdenv.mkDerivation rec {
pname = "powertop";
version = "2.13";
version = "2.14";
src = fetchurl {
url = "https://01.org/sites/default/files/downloads/${pname}-${version}.tar.gz";
sha256 = "0y1ixw8v17fdb1ima0zshrd0rh4zxdh10r93nrrvq6d4lhn9jpx6";
src = fetchFromGitHub {
owner = "fenrus75";
repo = pname;
rev = "v${version}";
sha256 = "1zkr2y5nb1nr22nq8a3zli87iyfasfq6489p7h1k428pv8k45w4f";
};
outputs = [ "out" "man" ];
nativeBuildInputs = [ pkg-config ];
nativeBuildInputs = [ pkg-config autoreconfHook ];
buildInputs = [ gettext libnl ncurses pciutils zlib ];
patches = lib.optional stdenv.hostPlatform.isMusl (
@ -22,6 +25,8 @@ stdenv.mkDerivation rec {
}
);
NIX_LDFLAGS = [ "-lpthread" ];
postPatch = ''
substituteInPlace src/main.cpp --replace "/sbin/modprobe" "modprobe"
substituteInPlace src/calibrate/calibrate.cpp --replace "/usr/bin/xset" "xset"

View file

@ -1,12 +1,13 @@
{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, cmocka, acl, libuuid, lzo, zlib, zstd }:
{ lib, stdenv, fetchgit, autoreconfHook, pkg-config, cmocka, acl, libuuid, lzo, zlib, zstd }:
stdenv.mkDerivation rec {
pname = "mtd-utils";
version = "2.1.2";
version = "2.1.3";
src = fetchurl {
url = "ftp://ftp.infradead.org/pub/${pname}/${pname}-${version}.tar.bz2";
sha256 = "sha256-itTF80cW1AZGqihySi9WFtMlpvEZJU+RTiaXbx926dY=";
src = fetchgit {
url = "git://git.infradead.org/mtd-utils.git";
rev = "v${version}";
sha256 = "sha256-w20Zp1G0WbNvEJwqpLw2f8VvmW8ZBEL0GSHze8qpPWg";
};
nativeBuildInputs = [ autoreconfHook pkg-config ] ++ lib.optional doCheck cmocka;
@ -21,6 +22,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Tools for MTD filesystems";
downloadPage = "https://git.infradead.org/mtd-utils.git";
license = licenses.gpl2Plus;
homepage = "http://www.linux-mtd.infradead.org/";
maintainers = with maintainers; [ viric superherointj ];

View file

@ -1,4 +1,13 @@
{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, libexif, popt, libintl }:
{ lib
, stdenv
, fetchFromGitHub
, fetchpatch
, autoreconfHook
, pkg-config
, libexif
, popt
, libintl
}:
stdenv.mkDerivation rec {
pname = "exif";
@ -11,6 +20,19 @@ stdenv.mkDerivation rec {
sha256 = "1xlb1gdwxm3rmw7vlrynhvjp9dkwmvw23mxisdbdmma7ah2nda3i";
};
patches = [
(fetchpatch {
name = "CVE-2021-27815.part-1.patch";
url = "https://github.com/libexif/exif/commit/f6334d9d32437ef13dc902f0a88a2be0063d9d1c.patch";
sha256 = "0mfx7l8w3w1c2mn5h5d6s7gdfyd91wnml8v0f19v5sdn70hx5aa4";
})
(fetchpatch {
name = "CVE-2021-27815.part-2.patch";
url = "https://github.com/libexif/exif/commit/eb84b0e3c5f2a86013b6fcfb800d187896a648fa.patch";
sha256 = "11lyvy20maisiyhxgxvm85v5l5ba7p0bpd4m0g4ryli32mrwwy0l";
})
];
nativeBuildInputs = [ autoreconfHook pkg-config ];
buildInputs = [ libexif popt libintl ];

View file

@ -57,10 +57,12 @@ stdenv.mkDerivation rec {
--replace /bin/rm ${coreutils}/bin/rm
'';
postFixup = ''
preFixup = ''
# remove unwanted build-dependency references
sed -i -e "s!PKG_CONFIG_PATH=''${PKG_CONFIG_PATH}!PKG_CONFIG_PATH=$(echo "$PKG_CONFIG_PATH" | sed -e 's/./0/g')!" $out/bin/mc
'' + lib.optionalString (!stdenv.isDarwin) ''
'';
postFixup = lib.optionalString (!stdenv.isDarwin) ''
# libX11.so is loaded dynamically so autopatch doesn't detect it
patchelf \
--add-needed ${libX11}/lib/libX11.so \

View file

@ -2,13 +2,13 @@
python3Packages.buildPythonApplication rec {
pname = "trash-cli";
version = "0.21.7.23";
version = "0.21.7.24";
src = fetchFromGitHub {
owner = "andreafrancia";
repo = "trash-cli";
rev = version;
sha256 = "1kdkzs9mbyac8ndc6r0wa39z8d3fj8zglqp149id4j37aydxb10l";
sha256 = "082mfl4mza4xkm3fdn5aka9rsbd8c149qj3cqqk62idrnszmgzg5";
};
propagatedBuildInputs = [ python3Packages.psutil ];

View file

@ -7,13 +7,13 @@
stdenv.mkDerivation rec {
pname = "mu";
version = "1.4.15";
version = "1.6.0";
src = fetchFromGitHub {
owner = "djcb";
repo = "mu";
rev = version;
sha256 = "sha256-VIUA0W+AmEbvGWatv4maBGILvUTGhBgO3iQtjIc3vG8=";
sha256 = "d2REyoSbznMhqV4PNntvg8uQmU66Bsi4OwH2Gj7gQ10=";
};
postPatch = lib.optionalString (batchSize != null) ''

View file

@ -0,0 +1,27 @@
{ lib, stdenv, fetchurl, ... }:
stdenv.mkDerivation rec {
pname = "nttcp";
version = "1.47";
src = fetchurl {
url = "http://deb.debian.org/debian/pool/non-free/n/nttcp/nttcp_${version}.orig.tar.gz";
sha256 = "1bl17dsd53lbpjdqfmpgpd7dms6d2w3scpg7ki7qgfjhs8sarq50";
};
patches = [
# Fix format string compiler error
./format-security.patch
];
makeFlags = [
"prefix=${placeholder "out"}"
];
meta = with lib; {
description = "New test TCP program";
license = licenses.unfree;
maintainers = with maintainers; [ angustrau ];
platforms = platforms.all;
};
}

View file

@ -0,0 +1,12 @@
diff -Nur -x '*.orig' -x '*~' nttcp-1.47/nttcp.c nttcp-1.47.new/nttcp.c
--- nttcp-1.47/nttcp.c 2000-12-18 05:16:54.000000000 -0500
+++ nttcp-1.47.new/nttcp.c 2012-01-30 23:44:02.260501225 -0500
@@ -372,7 +372,7 @@
#define Message(x) fMessage(stdout, x)
void Exit(char *s, int ret) {
- syslog(LOG_DEBUG, s);
+ syslog(LOG_DEBUG, "%s", s);
fMessage(stderr,s);
exit(ret);
}

View file

@ -0,0 +1,31 @@
{ lib, stdenv, fetchFromGitHub, autoreconfHook, doxygen
, enableTool ? false
, enableTest ? false }:
stdenv.mkDerivation rec {
pname = "sockperf";
version = "3.7";
src = fetchFromGitHub {
owner = "Mellanox";
repo = "sockperf";
rev = version;
sha256 = "MtpV21lCEAv7ARxk0dAxoOxxlqDM+skdQnPlqOvksjw=";
};
nativeBuildInputs = [ autoreconfHook doxygen ];
configureFlags = [ "--enable-doc" ]
++ lib.optional enableTest "--enable-test"
++ lib.optional enableTool "--enable-tool";
doCheck = true;
meta = with lib; {
description = "Network Benchmarking Utility";
homepage = "https://github.com/Mellanox/sockperf";
license = licenses.bsd3;
maintainers = with maintainers; [ angustrau ];
platforms = platforms.all;
};
}

View file

@ -1,14 +1,14 @@
{ lib, stdenv, fetchFromGitHub, perl, gettext, pkg-config, libidn2, libiconv }:
stdenv.mkDerivation rec {
version = "5.5.8";
version = "5.5.10";
pname = "whois";
src = fetchFromGitHub {
owner = "rfc1036";
repo = "whois";
rev = "v${version}";
sha256 = "sha256-WSAqJMVeHkcqzcgwvFKKBXJiIfKXBQr2mjioG7CgkIo=";
sha256 = "179hgmh9yqk8jq26ybik4cr3lgryd5p6kdwccc3r7mfssk3yp8lz";
};
nativeBuildInputs = [ perl gettext pkg-config ];

View file

@ -2,14 +2,14 @@
rustPlatform.buildRustPackage rec {
pname = "b3sum";
version = "0.3.8";
version = "1.0.0";
src = fetchCrate {
inherit version pname;
sha256 = "1a42kwbl886yymm3v7h6y957x5f4yi9j40jy4szg9k0iy8bsdfmh";
sha256 = "sha256-eWsvCpMG3iWB2cYIKaaP6h9QwKQQrpFNliHTqBtdzVw=";
};
cargoSha256 = "0v7ric12agicppg5ax5q0vwbslw7kmxpinafvdjj5sc2ysinw1zm";
cargoSha256 = "sha256-YglKiEz/D5+Dz6CIzWIpoc33bhMSdGTM4MP/uJCxe7E=";
meta = {
description = "BLAKE3 cryptographic hash function";

View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "cosign";
version = "0.6.0";
version = "1.0.0";
src = fetchFromGitHub {
owner = "sigstore";
repo = pname;
rev = "v${version}";
sha256 = "1h0lhbcrynaiwpgpkcn10yrn90j03g00w9hr2lvsj3cwmdbz0rcz";
sha256 = "0s9mv580habr8pprdz2n5jisxakd10vv1y79fhwfcs29njr7yi7v";
};
buildInputs =
@ -17,7 +17,7 @@ buildGoModule rec {
nativeBuildInputs = [ pkg-config ];
vendorSha256 = "0f3al6ds0kqyv2fapgdg9i38rfx6h169pmj6az0sfnkh2psq73ia";
vendorSha256 = "0njvgykzpiym5w5b4ddnnq597qm90hcng51lf01yf6csir7nyr12";
excludedPackages = "\\(copasetic\\)";

View file

@ -1,65 +0,0 @@
{ lib
, stdenv
, fetchurl
, libpcap
, pkg-config
, openssl
, lua5_3
, pcre
, liblinear
, libssh2
, zlib
, withLua ? true
}:
stdenv.mkDerivation rec {
pname = "nmap-unfree";
version = "7.91";
src = fetchurl {
url = "https://nmap.org/dist/nmap-${version}.tar.bz2";
sha256 = "001kb5xadqswyw966k2lqi6jr6zz605jpp9w4kmm272if184pk0q";
};
prePatch = lib.optionalString stdenv.isDarwin ''
substituteInPlace libz/configure \
--replace /usr/bin/libtool ar \
--replace 'AR="libtool"' 'AR="ar"' \
--replace 'ARFLAGS="-o"' 'ARFLAGS="-r"'
'';
configureFlags = [
(if withLua then "--with-liblua=${lua5_3}" else "--without-liblua")
];
makeFlags = lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
"AR=${stdenv.cc.bintools.targetPrefix}ar"
"RANLIB=${stdenv.cc.bintools.targetPrefix}ranlib"
"CC=${stdenv.cc.targetPrefix}gcc"
];
nativeBuildInputs = [ pkg-config ];
buildInputs = [
pcre
liblinear
libssh2
libpcap
openssl
zlib
];
enableParallelBuilding = true;
# Tests require network access
doCheck = false;
meta = with lib; {
description = "Open source utility for network discovery and security auditing";
homepage = "http://www.nmap.org";
# Nmap Public Source License Version 0.93
# https://github.com/nmap/nmap/blob/master/LICENSE
license = licenses.unfree;
maintainers = with maintainers; [ fab SuperSandro2000 ];
};
}

View file

@ -12,11 +12,11 @@ with lib;
stdenv.mkDerivation rec {
name = "nmap${optionalString graphicalSupport "-graphical"}-${version}";
version = "7.80";
version = "7.91";
src = fetchurl {
url = "https://nmap.org/dist/nmap-${version}.tar.bz2";
sha256 = "1aizfys6l9f9grm82bk878w56mg0zpkfns3spzj157h98875mypw";
sha256 = "001kb5xadqswyw966k2lqi6jr6zz605jpp9w4kmm272if184pk0q";
};
patches = [ ./zenmap.patch ]

View file

@ -1,14 +1,14 @@
{ stdenv, lib, fetchFromGitHub, buildGoModule, libnotify, makeWrapper, pcsclite, pinentry_mac, pkg-config, darwin }:
{ stdenv, lib, fetchFromGitHub, buildGoModule, libnotify, makeWrapper, pcsclite, pkg-config, darwin }:
buildGoModule rec {
pname = "yubikey-agent";
version = "0.1.4";
version = "0.1.5";
src = fetchFromGitHub {
owner = "FiloSottile";
repo = pname;
rev = "v${version}";
sha256 = "1b4522s7xkh6q74m0lprbnzg2hspg1pr9rzn94qmd06sry82d3fd";
sha256 = "14s61jgcmpqh70jz0krrai8xg0xqhwmillxkij50vbsagpxjssk6";
};
buildInputs =
@ -27,11 +27,7 @@ buildGoModule rec {
subPackages = [ "." ];
# On macOS, there isn't a choice of pinentry program, so let's
# ensure the nixpkgs-provided one is available
postInstall = lib.optionalString stdenv.isDarwin ''
wrapProgram $out/bin/yubikey-agent --suffix PATH : $(dirname ${pinentry_mac}/${pinentry_mac.binaryPath})
'' + lib.optionalString stdenv.isLinux ''
postInstall = lib.optionalString stdenv.isLinux ''
mkdir -p $out/lib/systemd/user
substitute contrib/systemd/user/yubikey-agent.service $out/lib/systemd/user/yubikey-agent.service \
--replace 'ExecStart=yubikey-agent' "ExecStart=$out/bin/yubikey-agent"

View file

@ -1,10 +1,11 @@
{ lib, stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "stress-1.0.4";
pname = "stress";
version = "1.0.4";
src = fetchurl {
url = "https://people.seas.harvard.edu/~apw/stress/${name}.tar.gz";
url = "https://people.seas.harvard.edu/~apw/stress/stress-${version}.tar.gz";
sha256 = "0nw210jajk38m3y7h8s130ps2qsbz7j75wab07hi2r3hlz14yzh5";
};

View file

@ -3,8 +3,8 @@
}:
stdenv.mkDerivation rec {
name = "ts-1.0";
pname = "ts";
version = "1.0";
installPhase=''make install "PREFIX=$out"'';
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
'';
src = fetchurl {
url = "http://viric.name/~viric/soft/ts/${name}.tar.gz";
url = "https://viric.name/~viric/soft/ts/ts-${version}.tar.gz";
sha256 = "15dkzczx10fhl0zs9bmcgkxfbwq2znc7bpscljm4rchbzx7y6lsg";
};

View file

@ -1,7 +1,9 @@
{ lib, stdenv, fetchFromGitHub }:
stdenv.mkDerivation {
name = "undaemonize-2017-07-11";
pname = "undaemonize";
version = "unstable-2017-07-11";
src = fetchFromGitHub {
repo = "undaemonize";
owner = "nickstenning";

View file

@ -527,6 +527,7 @@ mapAliases ({
nix-review = nixpkgs-review; # added 2019-12-22
nixFlakes = nixUnstable; # added 2021-05-21
nmap_graphical = nmap-graphical; # added 2017-01-19
nmap-unfree = nmap; # added 2021-04-06
nologin = shadow; # added 2018-04-25
nordic-polar = throw "nordic-polar was removed on 2021-05-27, now integrated in nordic"; # added 2021-05-27
nxproxy = nx-libs; # added 2019-02-15

View file

@ -7495,8 +7495,6 @@ in
graphicalSupport = true;
};
nmap-unfree = callPackage ../tools/security/nmap-unfree { };
nmapsi4 = libsForQt514.callPackage ../tools/security/nmap/qt.nix { };
nnn = callPackage ../applications/misc/nnn { };
@ -7546,6 +7544,8 @@ in
numlockx = callPackage ../tools/X11/numlockx { };
nttcp = callPackage ../tools/networking/nttcp { };
nuttcp = callPackage ../tools/networking/nuttcp { };
nssmdns = callPackage ../tools/networking/nss-mdns { };
@ -8344,6 +8344,8 @@ in
qtikz = libsForQt5.callPackage ../applications/graphics/ktikz { };
qtspim = libsForQt5.callPackage ../development/tools/misc/qtspim { };
quadrafuzz = callPackage ../applications/audio/quadrafuzz { };
quickfix = callPackage ../development/libraries/quickfix { };
@ -9015,6 +9017,8 @@ in
socat2pre = lowPrio (callPackage ../tools/networking/socat/2.x.nix { });
sockperf = callPackage ../tools/networking/sockperf { };
solaar = callPackage ../applications/misc/solaar {};
solanum = callPackage ../servers/irc/solanum {
@ -10044,6 +10048,8 @@ in
xsensors = callPackage ../os-specific/linux/xsensors { };
xspim = callPackage ../development/tools/misc/xspim { };
xcruiser = callPackage ../applications/misc/xcruiser { };
xwallpaper = callPackage ../tools/X11/xwallpaper { };
@ -14546,6 +14552,8 @@ in
xxdiff-tip = xxdiff;
xxgdb = callPackage ../development/tools/misc/xxgdb { };
yaml2json = callPackage ../development/tools/yaml2json { };
yams = callPackage ../applications/audio/yams { };