JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot] 2021-12-01 12:01:26 +00:00 committed by GitHub
commit f6f101cca5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
50 changed files with 381 additions and 207 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/labeler.yml vendored
View File

@ -143,6 +143,8 @@
- doc/languages-frameworks/vim.section.md
- pkgs/applications/editors/vim/**/*
- pkgs/misc/vim-plugins/**/*
- nixos/modules/programs/neovim.nix
- pkgs/applications/editors/neovim/**/*
"6.topic: xfce":
- nixos/doc/manual/configuration/xfce.xml

2
nixos/doc/manual/configuration/renaming-interfaces.section.md
View File

@ -26,7 +26,7 @@ we assign the name `wan` to the interface with MAC address
```nix
systemd.network.links."10-wan" = {
matchConfig.MACAddress = "52:54:00:12:01:01";
matchConfig.PermanentMACAddress = "52:54:00:12:01:01";
linkConfig.Name = "wan";
};
```

2
nixos/doc/manual/from_md/configuration/renaming-interfaces.section.xml
View File

@ -32,7 +32,7 @@
</para>
<programlisting language="bash">
systemd.network.links.&quot;10-wan&quot; = {
matchConfig.MACAddress = &quot;52:54:00:12:01:01&quot;;
matchConfig.PermanentMACAddress = &quot;52:54:00:12:01:01&quot;;
linkConfig.Name = &quot;wan&quot;;
};
</programlisting>

21
nixos/lib/eval-config.nix
View File

@ -51,23 +51,28 @@ let
};
};
in rec {
# Merge the option definitions in all modules, forming the full
# system configuration.
inherit (lib.evalModules {
noUserModules = lib.evalModules {
inherit prefix check;
modules = baseModules ++ extraModules ++ [ pkgsModule ] ++ modules;
modules = baseModules ++ extraModules ++ [ pkgsModule ];
args = extraArgs;
specialArgs =
{ modulesPath = builtins.toString ../modules; } // specialArgs;
}) config options _module type;
};
# These are the extra arguments passed to every module. In
# particular, Nixpkgs is passed through the "pkgs" argument.
extraArgs = extraArgs_ // {
inherit baseModules extraModules modules;
inherit noUserModules baseModules extraModules modules;
};
in rec {
# Merge the option definitions in all modules, forming the full
# system configuration.
inherit (noUserModules.extendModules { inherit modules; })
config options _module type;
inherit extraArgs;
inherit (_module.args) pkgs;
}

32
nixos/modules/system/activation/top-level.nix
View File

@ -1,4 +1,4 @@
{ config, lib, pkgs, modules, baseModules, specialArgs, ... }:
{ config, lib, pkgs, extendModules, noUserModules, ... }:
with lib;
@ -11,16 +11,10 @@ let
# you can provide an easy way to boot the same configuration
# as you use, but with another kernel
# !!! fix this
children = mapAttrs (childName: childConfig:
(import ../../../lib/eval-config.nix {
inherit lib baseModules specialArgs;
system = config.nixpkgs.initialSystem;
modules =
(optionals childConfig.inheritParentConfig modules)
++ [ ./no-clone.nix ]
++ [ childConfig.configuration ];
}).config.system.build.toplevel
) config.specialisation;
children =
mapAttrs
(childName: childConfig: childConfig.configuration.system.build.toplevel)
config.specialisation;
systemBuilder =
let
@ -169,7 +163,11 @@ in
</screen>
'';
type = types.attrsOf (types.submodule (
{ ... }: {
local@{ ... }: let
extend = if local.config.inheritParentConfig
then extendModules
else noUserModules.extendModules;
in {
options.inheritParentConfig = mkOption {
type = types.bool;
default = true;
@ -178,7 +176,15 @@ in
options.configuration = mkOption {
default = {};
description = "Arbitrary NixOS configuration options.";
description = ''
Arbitrary NixOS configuration.
Anything you can add to a normal NixOS configuration, you can add
here, including imports and config values, although nested
specialisations will be ignored.
'';
visible = "shallow";
inherit (extend { modules = [ ./no-clone.nix ]; }) type;
};
})
);

11
pkgs/applications/audio/musikcube/default.nix
View File

@ -4,6 +4,7 @@
, boost
, curl
, fetchFromGitHub
, fetchpatch
, ffmpeg
, lame
, libev
@ -26,6 +27,16 @@ stdenv.mkDerivation rec {
sha256 = "1y00vwn1h10cfflxrm5bk271ak9gilhjycgi44hlkkhmf5bdgn35";
};
patches = [
# Fix pending upstream inclusion for ncuurses-6.3 support:
# https://github.com/clangen/musikcube/pull/474
(fetchpatch {
name = "ncurses-6.3.patch";
url = "https://github.com/clangen/musikcube/commit/1240720e27232fdb199a4da93ca6705864442026.patch";
sha256 = "0bhjgwnj6d24wb1m9xz1vi1k9xk27arba1absjbcimggn54pinid";
})
];
nativeBuildInputs = [
cmake
pkg-config

4
pkgs/applications/editors/neovim/default.nix
View File

@ -32,13 +32,13 @@ let
in
stdenv.mkDerivation rec {
pname = "neovim-unwrapped";
version = "0.5.1";
version = "0.6.0";
src = fetchFromGitHub {
owner = "neovim";
repo = "neovim";
rev = "v${version}";
sha256 = "0b2gda9h14lvwahrr7kq3ix8wsw99g4ngy1grmhv5544n93ypcyk";
sha256 = "sha256-mVVZiDjAsAs4PgC8lHf0Ro1uKJ4OKonoPtF59eUd888=";
};
patches = [

5
pkgs/applications/editors/neovim/wrapper.nix
View File

@ -3,6 +3,7 @@
, bundlerEnv, ruby
, nodejs
, nodePackages
, python3
, python3Packages
, callPackage
}:
@ -17,7 +18,7 @@ let
, wrapperArgs ? []
, manifestRc ? null
, withPython2 ? false
, withPython3 ? true, python3Env ? null
, withPython3 ? true, python3Env ? python3
, withNodeJs ? false
, rubyEnv ? null
, vimAlias ? false
@ -59,7 +60,7 @@ let
--replace 'Name=Neovim' 'Name=WrappedNeovim'
''
+ optionalString withPython3 ''
makeWrapper ${python3Env}/bin/python3 $out/bin/nvim-python3 --unset PYTHONPATH
makeWrapper ${python3Env.interpreter} $out/bin/nvim-python3 --unset PYTHONPATH
''
+ optionalString (rubyEnv != null) ''
ln -s ${rubyEnv}/bin/neovim-ruby-host $out/bin/nvim-ruby

8
pkgs/applications/misc/dozenal/default.nix
View File

@ -21,6 +21,14 @@ stdenv.mkDerivation rec {
patches = [ ./lua-header.patch ];
preBuild = "cd dozenal";
buildInputs = [ ncurses hdate lua5_2 ];
# Parallel builds fail due to no dependencies between subdirs.
# As a result some subdirs are atempted to build twice:
# ../dec/dec.c:39:10: fatal error: conv.h: No such file or directory
# Let's disable parallelism until it's fixed upstream:
# https://gitlab.com/dgoodmaniii/dozenal/-/issues/8
enableParallelBuilding = false;
# I remove gdozdc, as I didn't figure all it's dependency yet.
postInstall = "rm $out/bin/gdozdc";

4
pkgs/applications/misc/dunst/default.nix
View File

@ -8,13 +8,13 @@
stdenv.mkDerivation rec {
pname = "dunst";
version = "1.7.1";
version = "1.7.2";
src = fetchFromGitHub {
owner = "dunst-project";
repo = "dunst";
rev = "v${version}";
sha256 = "0v15fhwzcg7zfn092sry0f4qb6dccz9bb312y9dadg745wf3n9qw";
sha256 = "LGLo+K0FxQQ3hrPYwvjApcOnNliZ5j0T6yEtcxZAFOU=";
};
nativeBuildInputs = [ perl pkg-config which systemd makeWrapper ];

11
pkgs/applications/science/biology/mrtrix/default.nix
View File

@ -1,17 +1,17 @@
{ stdenv, lib, fetchFromGitHub, python, makeWrapper
, eigen, fftw, libtiff, libpng, zlib, ants, bc
, qt5, libGL, libGLU, libX11, libXext
, withGui ? true }:
, withGui ? true, less }:
stdenv.mkDerivation rec {
pname = "mrtrix";
version = "3.0.2";
version = "unstable-2021-11-25";
src = fetchFromGitHub {
owner = "MRtrix3";
repo = "mrtrix3";
rev = version;
sha256 = "0p4d1230j6664rnb9l65cpyfj9ncbcm39yv1r9y77br9rkkv1za3";
rev = "994498557037c9e4f7ba67f255820ef84ea899d9";
sha256 = "sha256-8eFDS5z4ZxMzi9Khk90KAS4ndma/Syd6JDXM2Fpr0M8=";
fetchSubmodules = true;
};
@ -44,6 +44,9 @@ stdenv.mkDerivation rec {
substituteInPlace ./run_tests \
--replace 'git submodule update --init $datadir >> $LOGFILE 2>&1' ""
substituteInPlace ./build \
--replace '"less -RX "' '"${less}/bin/less -RX "'
'';
configurePhase = ''

55
pkgs/applications/science/math/maxima/default.nix
View File

@ -1,24 +1,30 @@
{ lib, stdenv, fetchurl, fetchpatch, sbcl, texinfo, perl, python3, makeWrapper, autoreconfHook
, rlwrap ? null, tk ? null, gnuplot ? null, ecl ? null, ecl-fasl ? false
{ lib
, stdenv
, fetchurl
, fetchpatch
, texinfo
, perl
, python3
, makeWrapper
, autoreconfHook
, rlwrap ? null
, tk ? null
, gnuplot ? null
, lisp-compiler
}:
let
name = "maxima";
version = "5.45.0";
lisp-compiler = if ecl-fasl then ecl else sbcl;
searchPath =
lib.makeBinPath
(lib.filter (x: x != null) [ lisp-compiler rlwrap tk gnuplot ]);
# Allow to remove some executables from the $PATH of the wrapped binary
searchPath = lib.makeBinPath
(lib.filter (x: x != null) [ lisp-compiler rlwrap tk gnuplot ]);
in
stdenv.mkDerivation ({
inherit version;
name = "${name}-${version}";
stdenv.mkDerivation rec {
pname = "maxima";
version = "5.45.1";
src = fetchurl {
url = "mirror://sourceforge/${name}/${name}-${version}.tar.gz";
sha256 = "sha256-x2MfMmRIBc67e6/vOrUzHEus0sJ+OE/YgyO1A5pg0Ng=";
url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz";
sha256 = "sha256-/pAWJ2lwvvIUoaJENIVYZEUU1/36pPyLnQ6Hr8u059w=";
};
nativeBuildInputs = [
@ -49,7 +55,7 @@ stdenv.mkDerivation ({
ln -s ../maxima/${version}/emacs $out/share/emacs/site-lisp
ln -s ../maxima/${version}/doc $out/share/doc/maxima
''
+ (lib.optionalString ecl-fasl ''
+ (lib.optionalString (lisp-compiler.pname == "ecl") ''
cp src/binary-ecl/maxima.fas* "$out/lib/maxima/${version}/binary-ecl/"
'')
;
@ -67,12 +73,13 @@ stdenv.mkDerivation ({
sha256 = "06961hn66rhjijfvyym21h39wk98sfxhp051da6gz0n9byhwc6zg";
})
# undo https://sourceforge.net/p/maxima/code/ci/f5e9b0f7eb122c4e48ea9df144dd57221e5ea0ca, see see https://trac.sagemath.org/ticket/13364#comment:93
# undo https://sourceforge.net/p/maxima/code/ci/f5e9b0f7eb122c4e48ea9df144dd57221e5ea0ca
# see https://trac.sagemath.org/ticket/13364#comment:93
(fetchpatch {
url = "https://git.sagemath.org/sage.git/plain/build/pkgs/maxima/patches/undoing_true_false_printing_patch.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba";
sha256 = "0fvi3rcjv6743sqsbgdzazy9jb6r1p1yq63zyj9fx42wd1hgf7yx";
})
] ++ lib.optionals ecl-fasl [
] ++ lib.optionals (lisp-compiler.pname == "ecl") [
# build fasl, needed for ECL support
(fetchpatch {
url = "https://git.sagemath.org/sage.git/plain/build/pkgs/maxima/patches/maxima.system.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba";
@ -97,13 +104,13 @@ stdenv.mkDerivation ({
enableParallelBuilding = true;
passthru = {
ecl = ecl;
inherit lisp-compiler;
};
meta = {
meta = with lib; {
description = "Computer algebra system";
homepage = "http://maxima.sourceforge.net";
license = lib.licenses.gpl2;
license = licenses.gpl2Plus;
longDescription = ''
Maxima is a fairly complete computer algebra system written in
@ -111,7 +118,7 @@ stdenv.mkDerivation ({
DOE-MACSYMA and licensed under the GPL. Its abilities include
symbolic integration, 3D plotting, and an ODE solver.
'';
platforms = lib.platforms.unix;
maintainers = with maintainers; [ doronbehar ];
platforms = platforms.unix;
};
})
}

16
pkgs/applications/science/math/sage/default.nix
View File

@ -15,7 +15,7 @@ let
sagelib = self.callPackage ./sagelib.nix {
inherit flint arb;
inherit sage-src env-locations pynac singular;
ecl = maxima-ecl.ecl;
inherit (maxima) lisp-compiler;
linbox = pkgs.linbox.override { withSage = true; };
pkg-config = pkgs.pkg-config; # not to confuse with pythonPackages.pkg-config
};
@ -48,9 +48,8 @@ let
# the files its looking fore are located. Also see `sage-env`.
env-locations = callPackage ./env-locations.nix {
inherit pari_data;
inherit singular maxima-ecl;
inherit singular maxima;
inherit three;
ecl = maxima-ecl.ecl;
cysignals = python3.pkgs.cysignals;
mathjax = nodePackages.mathjax;
};
@ -61,22 +60,21 @@ let
sagelib = python3.pkgs.sagelib;
sage_docbuild = python3.pkgs.sage_docbuild;
inherit env-locations;
inherit python3 singular palp flint pynac pythonEnv maxima-ecl;
ecl = maxima-ecl.ecl;
inherit python3 singular palp flint pynac pythonEnv maxima;
pkg-config = pkgs.pkg-config; # not to confuse with pythonPackages.pkg-config
};
# The documentation for sage, building it takes a lot of ram.
sagedoc = callPackage ./sagedoc.nix {
inherit sage-with-env;
inherit python3 maxima-ecl;
inherit python3 maxima;
};
# sagelib with added wrappers and a dependency on sage-tests to make sure thet tests were run.
sage-with-env = callPackage ./sage-with-env.nix {
inherit python3 pythonEnv;
inherit sage-env;
inherit pynac singular maxima-ecl;
inherit pynac singular maxima;
inherit three;
pkg-config = pkgs.pkg-config; # not to confuse with pythonPackages.pkg-config
};
@ -118,8 +116,8 @@ let
singular = pkgs.singular.override { inherit flint; };
maxima-ecl = pkgs.maxima-ecl.override {
ecl = pkgs.ecl.override {
maxima = pkgs.maxima.override {
lisp-compiler = pkgs.ecl.override {
# "echo syntax error | ecl > /dev/full 2>&1" segfaults in
# ECL. We apply a patch to fix it (write_error.patch), but it
# only works if threads are disabled. sage 9.2 tests this

9
pkgs/applications/science/math/sage/env-locations.nix
View File

@ -2,13 +2,12 @@
, pari_data
, pari
, singular
, maxima-ecl
, maxima
, conway_polynomials
, graphs
, elliptic_curves
, polytopes_db
, gap
, ecl
, combinatorial_designs
, jmol
, mathjax
@ -30,14 +29,14 @@ writeTextFile rec {
export SINGULAR_SO='${singular}/lib/libSingular.so'
export GAP_SO='${gap}/lib/libgap.so'
export SINGULAR_EXECUTABLE='${singular}/bin/Singular'
export MAXIMA_FAS='${maxima-ecl}/lib/maxima/${maxima-ecl.version}/binary-ecl/maxima.fas'
export MAXIMA_PREFIX="${maxima-ecl}"
export MAXIMA_FAS='${maxima}/lib/maxima/${maxima.version}/binary-ecl/maxima.fas'
export MAXIMA_PREFIX="${maxima}"
export CONWAY_POLYNOMIALS_DATA_DIR='${conway_polynomials}/share/conway_polynomials'
export GRAPHS_DATA_DIR='${graphs}/share/graphs'
export ELLCURVE_DATA_DIR='${elliptic_curves}/share/ellcurves'
export POLYTOPE_DATA_DIR='${polytopes_db}/share/reflexive_polytopes'
export GAP_ROOT_DIR='${gap}/share/gap/build-dir'
export ECLDIR='${ecl}/lib/ecl-${ecl.version}/'
export ECLDIR='${maxima.lisp-compiler}/lib/${maxima.lisp-compiler.pname}-${maxima.lisp-compiler.version}/'
export COMBINATORIAL_DESIGN_DATA_DIR="${combinatorial_designs}/share/combinatorial_designs"
export CREMONA_MINI_DATA_DIR="${elliptic_curves}/share/cremona"
export JMOL_DIR="${jmol}/share/jmol" # point to the directory that contains JmolData.jar

7
pkgs/applications/science/math/sage/sage-env.nix
View File

@ -15,8 +15,7 @@
, pkg-config
, pari
, gap
, ecl
, maxima-ecl
, maxima
, singular
, fflas-ffpack
, givaro
@ -77,8 +76,8 @@ let
pkg-config
pari
gap
ecl
maxima-ecl
maxima.lisp-compiler
maxima
singular
giac
palp

4
pkgs/applications/science/math/sage/sage-with-env.nix
View File

@ -9,7 +9,7 @@
, singular
, gap
, giac
, maxima-ecl
, maxima
, pari
, gmp
, gfan
@ -42,7 +42,7 @@ let
pari
gmp
gfan
maxima-ecl
maxima
eclib
flintqs
ntl

4
pkgs/applications/science/math/sage/sagedoc.nix
View File

@ -1,7 +1,7 @@
{ stdenv
, sage-with-env
, python3
, maxima-ecl
, maxima
, tachyon
, jmol
, cddlib
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
buildInputs = [
sage-with-env.env.lib
python3
maxima-ecl
maxima
tachyon
jmol
cddlib

6
pkgs/applications/science/math/sage/sagelib.nix
View File

@ -10,7 +10,7 @@
, cypari2
, cysignals
, cython
, ecl
, lisp-compiler
, eclib
, ecm
, flint
@ -74,7 +74,7 @@ buildPythonPackage rec {
jupyter_core
pkg-config
pip # needed to query installed packages
ecl
lisp-compiler
];
buildInputs = [
@ -92,7 +92,7 @@ buildPythonPackage rec {
arb
brial
cliquer
ecl
lisp-compiler
eclib
ecm
fflas-ffpack

31
pkgs/applications/science/math/wxmaxima/default.nix
View File

@ -1,21 +1,37 @@
{ lib, stdenv, fetchFromGitHub
, wrapGAppsHook, cmake, gettext
, maxima, wxGTK, gnome }:
{ lib
, stdenv
, fetchFromGitHub
, wrapGAppsHook
, cmake
, gettext
, maxima
, wxGTK
, gnome
}:
stdenv.mkDerivation rec {
pname = "wxmaxima";
version = "21.05.2";
version = "21.11.0";
src = fetchFromGitHub {
owner = "wxMaxima-developers";
repo = "wxmaxima";
rev = "Version-${version}";
sha256 = "sha256-HPqdxGrPxe5FZNOimTpAP+c9VpDBkXu3Z1c1Aaf3+UA=";
sha256 = "sha256-LwuqldMGsmFR8xrNg5vsrogmdi5ysqEQGWITM460IZk=";
};
buildInputs = [ wxGTK maxima gnome.adwaita-icon-theme ];
buildInputs = [
wxGTK
maxima
# So it won't embed svg files into headers.
gnome.adwaita-icon-theme
];
nativeBuildInputs = [ wrapGAppsHook cmake gettext ];
nativeBuildInputs = [
wrapGAppsHook
cmake
gettext
];
preConfigure = ''
gappsWrapperArgs+=(--prefix PATH ":" ${maxima}/bin)
@ -25,6 +41,7 @@ stdenv.mkDerivation rec {
description = "Cross platform GUI for the computer algebra system Maxima";
license = licenses.gpl2;
homepage = "https://wxmaxima-developers.github.io/wxmaxima/";
maintainers = with maintainers; [ doronbehar ];
platforms = platforms.linux;
};
}

6
pkgs/applications/version-management/git-and-tools/git-quickfix/default.nix
View File

@ -10,13 +10,13 @@
rustPlatform.buildRustPackage rec {
pname = "git-quickfix";
version = "0.0.4";
version = "0.0.5";
src = fetchFromGitHub {
owner = "siedentop";
repo = pname;
rev = "v${version}";
sha256 = "sha256-JdRlrNzWMPS3yG1UvKKtHVRix3buSm9jfSoAUxP35BY=";
sha256 = "sha256-LDA94pH5Oodf80mEENoURh+MJSg122SVWFVo9i1TEQg=";
};
nativeBuildInputs = [ pkg-config ];
@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec {
libiconv
];
cargoSha256 = "sha256-ENeHPhEBniR9L3J5el6QZrIS1Q4O0pNiSzJqP1aQS9Q=";
cargoSha256 = "sha256-QTPy0w45AawEU4fHf2FMGpL3YM+iTNnyiI4+mDJzWaE=";
meta = with lib; {
description = "Quickfix allows you to commit changes in your git repository to a new branch without leaving the current branch";

1
pkgs/desktops/gnome/extensions/manuallyPackaged.nix
View File

@ -14,6 +14,7 @@
"no-title-bar@jonaspoehler.de" = callPackage ./no-title-bar { };
"paperwm@hedning:matrix.org" = callPackage ./paperwm { };
"pidgin@muffinmad" = callPackage ./pidgin-im-integration { };
"pop-shell@system76.com" = callPackage ./pop-shell { };
"sound-output-device-chooser@kgshank.net" = callPackage ./sound-output-device-chooser { };
"system-monitor@paradoxxx.zero.gmail.com" = callPackage ./system-monitor { };
"taskwhisperer-extension@infinicode.de" = callPackage ./taskwhisperer { };

36
pkgs/desktops/gnome/extensions/pop-shell/default.nix Normal file
View File

@ -0,0 +1,36 @@
{ stdenv, lib, fetchFromGitHub, glib, nodePackages, gjs }:
stdenv.mkDerivation rec {
pname = "gnome-shell-extension-pop-shell";
version = "unstable-2021-11-30";
src = fetchFromGitHub {
owner = "pop-os";
repo = "shell";
rev = "4b65ee865d01436ec75a239a0586a2fa6051b8c3";
sha256 = "DHmp3kzBgbyxRe0TjER/CAqyUmD9LeRqAFQ9apQDzfk=";
};
nativeBuildInputs = [ glib nodePackages.typescript gjs ];
buildInputs = [ gjs ];
patches = [
./fix-gjs.patch
];
makeFlags = [ "XDG_DATA_HOME=$(out)/share" ];
passthru = {
extensionUuid = "pop-shell@system76.com";
extensionPortalSlug = "pop-shell";
};
meta = with lib; {
description = "Keyboard-driven layer for GNOME Shell";
license = licenses.gpl3Only;
platforms = platforms.linux;
maintainers = [ maintainers.genofire ];
homepage = "https://github.com/pop-os/shell";
};
}

67
pkgs/desktops/gnome/extensions/pop-shell/fix-gjs.patch Normal file
View File

@ -0,0 +1,67 @@
diff --git a/src/color_dialog/src/main.ts b/src/color_dialog/src/main.ts
index 9522499..9911530 100644
--- a/src/color_dialog/src/main.ts
+++ b/src/color_dialog/src/main.ts
@@ -1,4 +1,4 @@
-#!/usr/bin/gjs
+#!/usr/bin/env gjs
imports.gi.versions.Gtk = '3.0';
@@ -84,4 +84,4 @@ function launch_color_dialog() {
Gtk.init(null);
-launch_color_dialog()
\ No newline at end of file
+launch_color_dialog()
diff --git a/src/extension.ts b/src/extension.ts
index 7417c46..00d5829 100644
--- a/src/extension.ts
+++ b/src/extension.ts
@@ -534,7 +534,7 @@ export class Ext extends Ecs.System<ExtEvent> {
return true
}
- const ipc = utils.async_process_ipc(["gjs", path])
+ const ipc = utils.async_process_ipc([path])
if (ipc) {
const generator = (stdout: any, res: any) => {
diff --git a/src/floating_exceptions/src/main.ts b/src/floating_exceptions/src/main.ts
index f298ec7..87a6bc4 100644
--- a/src/floating_exceptions/src/main.ts
+++ b/src/floating_exceptions/src/main.ts
@@ -1,4 +1,4 @@
-#!/usr/bin/gjs
+#!/usr/bin/env gjs
imports.gi.versions.Gtk = '3.0'
@@ -329,4 +329,4 @@ function main() {
Gtk.main()
}
-main()
\ No newline at end of file
+main()
diff --git a/src/panel_settings.ts b/src/panel_settings.ts
index 83ff56c..1bc1e98 100644
--- a/src/panel_settings.ts
+++ b/src/panel_settings.ts
@@ -338,7 +338,7 @@ function color_selector(ext: Ext, menu: any) {
color_selector_item.add_child(color_button);
color_button.connect('button-press-event', () => {
let path = Me.dir.get_path() + "/color_dialog/main.js";
- let resp = GLib.spawn_command_line_async(`gjs ${path}`);
+ let resp = GLib.spawn_command_line_async(path);
if (!resp) {
return null;
@@ -353,4 +353,4 @@ function color_selector(ext: Ext, menu: any) {
});
return color_selector_item;
-}
\ No newline at end of file
+}

3
pkgs/development/compilers/ecl/default.nix
View File

@ -28,7 +28,8 @@ let
];
in
stdenv.mkDerivation {
inherit (s) name version;
inherit (s) version;
pname = s.baseName;
inherit nativeBuildInputs propagatedBuildInputs;
src = fetchurl {

29
pkgs/development/interpreters/lush/default.nix
View File

@ -1,29 +0,0 @@
{lib, stdenv, fetchurl, libX11, xorgproto, indent, readline, gsl, freeglut, libGLU, libGL, SDL
, blas, libbfd, intltool, gettext, zlib, libSM}:
stdenv.mkDerivation rec {
baseName = "lush";
version = "2.0.1";
name = "${baseName}-${version}";
src = fetchurl {
url="mirror://sourceforge/project/lush/lush2/lush-2.0.1.tar.gz";
sha256 = "02pkfn3nqdkm9fm44911dbcz0v3r0l53vygj8xigl6id5g3iwi4k";
};
buildInputs = [
libX11 libSM xorgproto indent readline gsl freeglut libGLU libGL SDL blas libbfd
intltool gettext zlib
];
hardeningDisable = [ "pic" ];
NIX_LDFLAGS=" -lz ";
meta = {
description = "Lisp Universal SHell";
license = lib.licenses.gpl2Plus ;
maintainers = [ lib.maintainers.raskin ];
platforms = lib.platforms.linux;
};
}

4
pkgs/development/interpreters/lush/default.upstream
View File

@ -1,4 +0,0 @@
url https://sourceforge.net/projects/lush/files/lush2/
version_link '[.]tar[.]gz/download$'
SF_redirect
minimize_overwrite

9
pkgs/development/libraries/spdk/default.nix
View File

@ -1,7 +1,6 @@
{ lib, stdenv
, fetchurl
, fetchFromGitHub
, fetchpatch
, ncurses
, python3
, cunit
@ -24,6 +23,12 @@ stdenv.mkDerivation rec {
sha256 = "sha256-/hynuYVdzIfiHUUfuuOY8SBJ18DqJr2Fos2JjQQVvbg=";
};
patches = [
# Backport of upstream patch for ncurses-6.3 support.
# Will be in next release after 21.10.
./ncurses-6.3.patch
];
nativeBuildInputs = [
python3
];
@ -36,6 +41,8 @@ stdenv.mkDerivation rec {
patchShebangs .
'';
enableParallelBuilding = true;
configureFlags = [ "--with-dpdk=${dpdk}" ];
NIX_CFLAGS_COMPILE = "-mssse3"; # Necessary to compile.

48
pkgs/development/libraries/spdk/ncurses-6.3.patch Normal file
View File

@ -0,0 +1,48 @@
Backport of upstream https://review.spdk.io/gerrit/c/spdk/spdk/+/10300
--- a/app/spdk_top/spdk_top.c
+++ b/app/spdk_top/spdk_top.c
@@ -1012 +1012 @@ print_max_len(WINDOW *win, int row, uint16_t col, uint16_t max_len, enum str_ali
- mvwprintw(win, row, col, tmp_str);
+ mvwprintw(win, row, col, "%s", tmp_str);
@@ -1944 +1944 @@ display_thread(struct rpc_thread_info *thread_info)
- mvwprintw(thread_win, 3, THREAD_WIN_FIRST_COL + 6, "%" PRIu64,
+ mvwprintw(thread_win, 3, THREAD_WIN_FIRST_COL + 6, "%d",
@@ -1949 +1949 @@ display_thread(struct rpc_thread_info *thread_info)
- mvwprintw(thread_win, 3, THREAD_WIN_FIRST_COL + 32, idle_time);
+ mvwprintw(thread_win, 3, THREAD_WIN_FIRST_COL + 32, "%s", idle_time);
@@ -1951 +1951 @@ display_thread(struct rpc_thread_info *thread_info)
- mvwprintw(thread_win, 3, THREAD_WIN_FIRST_COL + 54, busy_time);
+ mvwprintw(thread_win, 3, THREAD_WIN_FIRST_COL + 54, "%s", busy_time);
@@ -1954 +1954 @@ display_thread(struct rpc_thread_info *thread_info)
- mvwprintw(thread_win, 3, THREAD_WIN_FIRST_COL + 32, idle_time);
+ mvwprintw(thread_win, 3, THREAD_WIN_FIRST_COL + 32, "%s", idle_time);
@@ -1956 +1956 @@ display_thread(struct rpc_thread_info *thread_info)
- mvwprintw(thread_win, 3, THREAD_WIN_FIRST_COL + 54, busy_time);
+ mvwprintw(thread_win, 3, THREAD_WIN_FIRST_COL + 54, "%s", busy_time);
@@ -2111 +2111 @@ show_core(uint8_t current_page)
- mvwprintw(core_win, 5, CORE_WIN_FIRST_COL + 20, idle_time);
+ mvwprintw(core_win, 5, CORE_WIN_FIRST_COL + 20, "%s", idle_time);
@@ -2118 +2118 @@ show_core(uint8_t current_page)
- mvwprintw(core_win, 7, CORE_WIN_FIRST_COL + 20, busy_time);
+ mvwprintw(core_win, 7, CORE_WIN_FIRST_COL + 20, "%s", busy_time);
@@ -2124 +2124 @@ show_core(uint8_t current_page)
- mvwprintw(core_win, i + 10, 1, core_info->threads.thread[i].name);
+ mvwprintw(core_win, i + 10, 1, "%s", core_info->threads.thread[i].name);
@@ -2137 +2137 @@ show_core(uint8_t current_page)
- mvwprintw(core_win, i + 10, 1, core_info->threads.thread[i].name);
+ mvwprintw(core_win, i + 10, 1, "%s", core_info->threads.thread[i].name);
@@ -2214 +2214 @@ show_poller(uint8_t current_page)
- mvwprintw(poller_win, 3, POLLER_WIN_FIRST_COL,
+ mvwprintw(poller_win, 3, POLLER_WIN_FIRST_COL, "%s",
@@ -2216 +2216 @@ show_poller(uint8_t current_page)
- mvwprintw(poller_win, 3, POLLER_WIN_FIRST_COL + 23, poller->thread_name);
+ mvwprintw(poller_win, 3, POLLER_WIN_FIRST_COL + 23, "%s", poller->thread_name);
@@ -2231 +2231 @@ show_poller(uint8_t current_page)
- mvwprintw(poller_win, 4, POLLER_WIN_FIRST_COL + 23, poller_period);
+ mvwprintw(poller_win, 4, POLLER_WIN_FIRST_COL + 23, "%s", poller_period);
@@ -2264 +2264 @@ print_bottom_error_message(char *msg)
- mvprintw(g_max_row - 1, g_max_col - strlen(msg) - 2, msg);
+ mvprintw(g_max_row - 1, g_max_col - strlen(msg) - 2, "%s", msg);
@@ -2434 +2434 @@ show_stats(pthread_t *data_thread)
- mvprintw(g_max_row - 1, 1, current_page_str);
+ mvprintw(g_max_row - 1, 1, "%s", current_page_str);

17
pkgs/development/libraries/spdk/spdk-dpdk-meson.patch
View File

@ -1,17 +0,0 @@
1. dpdk built with meson generates rte_build_config.h rather than rte_config.h.
2. dpdk configured with libbsd requires that dependents link with libbsd.
--- a/lib/env_dpdk/env.mk
+++ b/lib/env_dpdk/env.mk
@@ -140,6 +140,9 @@ endif
-ifneq (,$(wildcard $(DPDK_INC_DIR)/rte_config.h))
-ifneq (,$(shell grep -e "define RTE_LIBRTE_VHOST_NUMA 1" -e "define RTE_EAL_NUMA_AWARE_HUGEPAGES 1" $(DPDK_INC_DIR)/rte_config.h))
+ifneq (,$(wildcard $(DPDK_INC_DIR)/rte_build_config.h))
+ifneq (,$(shell grep -e "define RTE_LIBRTE_VHOST_NUMA 1" -e "define RTE_EAL_NUMA_AWARE_HUGEPAGES 1" $(DPDK_INC_DIR)/rte_build_config.h))
ENV_LINKER_ARGS += -lnuma
endif
+ifneq (,$(shell grep -e "define RTE_USE_LIBBSD 1" $(DPDK_INC_DIR)/rte_build_config.h))
+ENV_LINKER_ARGS += -lbsd
+endif
endif

4
pkgs/development/python-modules/ailment/default.nix
View File

@ -7,14 +7,14 @@
buildPythonPackage rec {
pname = "ailment";
version = "9.0.10651";
version = "9.0.10689";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "angr";
repo = pname;
rev = "v${version}";
sha256 = "sha256-Cgd6lT7iqpvY5OJgBFNMkDJVV7uF6WwVdzQwGGZo4Qc=";
sha256 = "sha256-U+2R/TlMwRj+FEuO1aOox7dt3RXlDjazjoG7IfN8um8=";
};
propagatedBuildInputs = [ pyvex ];

4
pkgs/development/python-modules/angr/default.nix
View File

@ -44,14 +44,14 @@ in
buildPythonPackage rec {
pname = "angr";
version = "9.0.10651";
version = "9.0.10689";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "sha256-aywfB2oEPyh+MbN5jb+qA3DMUi8Pp/f2OhuUzoTAIoA=";
sha256 = "sha256-UMPJZUtfcUTiL0Ha+p1M09yhLwaCuBLpam4KUgtYvnw=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/angrop/default.nix
View File

@ -9,14 +9,14 @@
buildPythonPackage rec {
pname = "angrop";
version = "9.0.10651";
version = "9.0.10689";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "angr";
repo = pname;
rev = "v${version}";
sha256 = "sha256-tJ+yeaBI4eBxvvN2rqAfun3aSxDLrSFtfu00d4O1sak=";
sha256 = "sha256-ZWu9Kk/d6Qz9IEDUkuaB0f5cZV0HnZAaEDnYSoiKMDI=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/archinfo/default.nix
View File

@ -7,13 +7,13 @@
buildPythonPackage rec {
pname = "archinfo";
version = "9.0.10651";
version = "9.0.10689";
src = fetchFromGitHub {
owner = "angr";
repo = pname;
rev = "v${version}";
sha256 = "sha256-Lvobjbjl1gfW3HllHfsxHnLOB4hRGbZ9Hhuf14zd94w=";
sha256 = "sha256-kye8muKTm79lVhOBJeHnI4apJBsUVtNtGYpNiykXFDs=";
};
checkInputs = [

4
pkgs/development/python-modules/claripy/default.nix
View File

@ -13,14 +13,14 @@
buildPythonPackage rec {
pname = "claripy";
version = "9.0.10651";
version = "9.0.10689";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "angr";
repo = pname;
rev = "v${version}";
sha256 = "sha256-ishKQ3BdY7sPRyhr04dB3gtGC/JqoJ/W0Cv/hxTkJXg=";
sha256 = "sha256-s3h+SnqCi29B0/BwUHp08x7n4tej+u5aI4exGpeKbxc=";
};
# Use upstream z3 implementation

4
pkgs/development/python-modules/cle/default.nix
View File

@ -15,7 +15,7 @@
let
# The binaries are following the argr projects release cycle
version = "9.0.10651";
version = "9.0.10689";
# Binary files from https://github.com/angr/binaries (only used for testing and only here)
binaries = fetchFromGitHub {
@ -35,7 +35,7 @@ buildPythonPackage rec {
owner = "angr";
repo = pname;
rev = "v${version}";
sha256 = "sha256-XhU0SS0zWPtI4t49oboc5/Fr34dR6oqm8hlI4f4q8Bk=";
sha256 = "sha256-sZVdDEs+9UqPHWiCxrZpHp3UiB1hX8dTZxR3TXrIsTQ=";
};
propagatedBuildInputs = [

6
pkgs/development/python-modules/pytenable/default.nix
View File

@ -14,17 +14,18 @@
, responses
, restfly
, semver
, typing-extensions
}:
buildPythonPackage rec {
pname = "pytenable";
version = "1.3.3";
version = "1.4.0";
src = fetchFromGitHub {
owner = "tenable";
repo = "pyTenable";
rev = version;
sha256 = "19vhy7mf972545abydywyig82gkxalp6sfwinvj71hzbihwwzjpq";
sha256 = "sha256-JdI0nAX/leTnYgGId2ct04u1a+z7eU2UY6pk2cUM4fg=";
};
propagatedBuildInputs = [
@ -40,6 +41,7 @@ buildPythonPackage rec {
requests
requests-pkcs12
restfly
typing-extensions
];
checkInputs = [

4
pkgs/development/python-modules/python-gvm/default.nix
View File

@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "python-gvm";
version = "21.10.0";
version = "21.11.0";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "greenbone";
repo = pname;
rev = "v${version}";
sha256 = "sha256-6cNoeuB9449HB2/41VjazpSAGvaHmBjG/hqmBKX5FEA=";
sha256 = "sha256-H3cM+4YA6obYbo7qm7BhLlQxW4DKV6A3X0ZKsXWPDBs=";
};
nativeBuildInputs = [

4
pkgs/development/python-modules/pyvex/default.nix
View File

@ -11,11 +11,11 @@
buildPythonPackage rec {
pname = "pyvex";
version = "9.0.10651";
version = "9.0.10689";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-GuZqaEI7y/kLNV7RfEMBXQgFsdVuRh1ouweTwlXE6r4=";
sha256 = "sha256-BP0yRsp0I6QNN6lCpF6MwBw/BXTXCsNbmzfpKNMS0fQ=";
};
postPatch = lib.optionalString stdenv.isDarwin ''

4
pkgs/development/python-modules/qcs-api-client/default.nix
View File

@ -18,14 +18,14 @@
buildPythonPackage rec {
pname = "qcs-api-client";
version = "0.20.1";
version = "0.20.3";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-rlDquNKWnmP8d3pxmFfViDN++8x59h6bGXBJv//q/dk=";
sha256 = "sha256-3PzjCdH0Mxw1GvtqvEMyAaYt96QX0zoXwK3azF2ey+U=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/vt-py/default.nix
View File

@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "vt-py";
version = "0.8.0";
version = "0.9.0";
format = "setuptools";
disabled = pythonOlder "3.6";
@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "VirusTotal";
repo = pname;
rev = version;
sha256 = "sha256-j9TlZDzl9sWFPt8TeuyoJi01JhyPBVXs1w3YJMoVvLw=";
sha256 = "sha256-PpgN9adGNZOorOUigsBVOb//ZafUaYHfo/Fv1IZf/XA=";
};
propagatedBuildInputs = [

14
pkgs/development/tools/analysis/checkov/default.nix
View File

@ -39,16 +39,6 @@ let
doCheck = false;
});
cyclonedx-python-lib = super.cyclonedx-python-lib.overridePythonAttrs (oldAttrs: rec {
version = "0.6.2";
src = fetchFromGitHub {
owner = "CycloneDX";
repo = "cyclonedx-python-lib";
rev = "v${version}";
sha256 = "10cmp2aqbnbiyrsq5r9p7ppghqj3zyg612d2dldk6m85li3jr500";
};
});
};
};
in
@ -56,13 +46,13 @@ with py.pkgs;
buildPythonApplication rec {
pname = "checkov";
version = "2.0.606";
version = "2.0.614";
src = fetchFromGitHub {
owner = "bridgecrewio";
repo = pname;
rev = version;
sha256 = "sha256-2t/yYVhJVf5j+ya96zc3EY708ggU8BtsIIIh2ug9XF0=";
sha256 = "sha256-z1d1Zcq4x2wU/j4yWpaRwJXsUqy95Ai2uM18EHqxze0=";
};
nativeBuildInputs = with py.pkgs; [

4
pkgs/development/tools/database/sqlfluff/default.nix
View File

@ -5,14 +5,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "sqlfluff";
version = "0.8.1";
version = "0.8.2";
disabled = python3.pythonOlder "3.6";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = version;
sha256 = "sha256-p2vRHJ7IDjGpAqWLkAHIjNCFRvUfpkvwVtixz8wWR8I=";
sha256 = "sha256-0FlXHUjoeZ7XfmOSlY30b13i2t/4vyWwhDKXquXKaJE=";
};
propagatedBuildInputs = with python3.pkgs; [

14
pkgs/development/tools/rust/probe-run/default.nix
View File

@ -1,18 +1,16 @@
{ lib, stdenv, rustPlatform, fetchFromGitHub, pkg-config, libusb1
{ lib, stdenv, rustPlatform, fetchCrate, pkg-config, libusb1
, libiconv, AppKit, IOKit }:
rustPlatform.buildRustPackage rec {
pname = "probe-run";
version = "0.3.0";
version = "0.3.1";
src = fetchFromGitHub {
owner = "knurling-rs";
repo = pname;
rev = "v${version}";
sha256 = "0qlpvy62wqc8k9sww6pbiqv0yrjwpnai1vgrijw5285qpvrdsdw2";
src = fetchCrate {
inherit pname version;
sha256 = "1nfbpdx378p988q75hka9r8zp3xb9zy3dnagcxmha6dca5dhgsdm";
};
cargoSha256 = "10ybgzvv2iy5bjmmw48gmgvsx6rfqclsysyfbhd820dg2lshgi44";
cargoSha256 = "05p3vmar00215x4mwsvs5knf4wrwmpq52rmbbi6b4qaqs3gqaghy";
nativeBuildInputs = [ pkg-config ];
buildInputs = [ libusb1 ]

4
pkgs/misc/vscode-extensions/default.nix
View File

@ -921,8 +921,8 @@ let
mktplcRef = {
name = "Ionide-fsharp";
publisher = "Ionide";
version = "5.5.5";
sha256 = "xrBNiIbZVJ0sGUk/4PudD8kSyX94QkrFtf7Ho/sB0Vs=";
version = "5.10.1";
sha256 = "sha256-LkWWgyh4khPyUgekVeO8ZzPK+1gTrS8d9Yz6/kHomr8=";
};
meta = with lib; {
changelog = "https://marketplace.visualstudio.com/items/Ionide.Ionide-fsharp/changelog";

6
pkgs/tools/admin/certigo/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "certigo";
version = "1.12.1";
version = "1.13.0";
src = fetchFromGitHub {
owner = "square";
repo = pname;
rev = "v${version}";
sha256 = "0siwbxxzknmbsjy23d0lvh591ngabqhr2g8mip0siwa7c1y7ivv4";
sha256 = "sha256-3VysSE4N2MlNDOZ27RbCe8rUuYChU5Z3L/CIhtvMp38=";
};
vendorSha256 = "1l6ajfl04rfbssvijgd5jrppmqc5svfrswdx01x007lr8rvdfd94";
vendorSha256 = "sha256-0wul0f8T7E4cXbsNee1j1orUgjrAToqDLgwCjiyii1Y=";
doCheck = false;

16
pkgs/tools/filesystems/wiimms-iso-tools/default.nix
View File

@ -1,4 +1,4 @@
{lib, stdenv, fetchurl, zlib, ncurses, fuse}:
{lib, stdenv, fetchurl, fetchpatch, zlib, ncurses, fuse}:
stdenv.mkDerivation rec {
name = "wiimms-iso-tools";
@ -11,7 +11,19 @@ stdenv.mkDerivation rec {
buildInputs = [ zlib ncurses fuse ];
patches = [ ./fix-paths.diff ];
patches = [
./fix-paths.diff
# Pull pending upstream fix for ncurses-6.3:
# https://github.com/Wiimm/wiimms-iso-tools/pull/14
(fetchpatch {
name = "ncurses-6.3.patch";
url = "https://github.com/Wiimm/wiimms-iso-tools/commit/3f1e84ec6915cc4f658092d33411985bd3eaf4e6.patch";
sha256 = "18cfri4y1082phg6fzh402gk5ri24wr8ff4zl8v5rlgjndh610im";
stripLen = 1;
})
];
postPatch = ''
patchShebangs setup.sh
patchShebangs gen-template.sh

6
pkgs/tools/misc/goreleaser/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "goreleaser";
version = "0.184.0";
version = "1.1.0";
src = fetchFromGitHub {
owner = "goreleaser";
repo = pname;
rev = "v${version}";
sha256 = "sha256-ujhYcihLJh52cURvQ7p1B4fZTDx8cq3WA4RfKetWEBo=";
sha256 = "1rk2n1c2ia8kwqvbfnhsf3jbbi1qzndniq7cxs8iy9drn4adl7gv";
};
vendorSha256 = "sha256-J9lAkmLDowMmbwcHV2t9/7iVzkZRnF60/4PSRS8+4Sg=";
vendorSha256 = "1hm5ya240vpfmgc8y6qv4gp4gbcqydk7hg05fwr7nzc2apj5fv6a";
ldflags = [
"-s"

4
pkgs/tools/misc/yt-dlp/default.nix
View File

@ -20,12 +20,12 @@ buildPythonPackage rec {
# The websites yt-dlp deals with are a very moving target. That means that
# downloads break constantly. Because of that, updates should always be backported
# to the latest stable release.
version = "2021.11.10.1";
version = "2021.12.1";
src = fetchPypi {
inherit pname;
version = builtins.replaceStrings [ ".0" ] [ "." ] version;
sha256 = "f0ad6ae2e2838b608df2fd125f2a777a7ad832d3e757ee6d4583b84b21e44388";
sha256 = "sha256-WNpbltSDT+gTDJYLnf1nDNLQ5TtlDNkuXEOBckFRuA8=";
};
propagatedBuildInputs = [ websockets mutagen ]

12
pkgs/tools/networking/nfstrace/default.nix
View File

@ -22,11 +22,21 @@ stdenv.mkDerivation rec {
url = "https://github.com/epam/nfstrace/commit/4562a895ed3ac0e811bdd489068ad3ebe4d7b501.patch";
sha256 = "1fbicbllyykjknik7asa81x0ixxmbwqwkiz74cnznagv10jlkj3p";
})
# Fix pending upstream inclusion for ncurses-6.3 support:
# https://github.com/epam/nfstrace/pull/50
(fetchpatch {
name = "ncurses-6.3.patch";
url = "https://github.com/epam/nfstrace/commit/29c7c415f5412df1aae9b1e6ed3a2760d2c227a0.patch";
sha256 = "134709w6bld010jx3xdy9imcjzal904a84n9f8vv0wnas5clxdmx";
})
];
postPatch = ''
# -Wall -Wextra -Werror fails on clang and newer gcc
substituteInPlace CMakeLists.txt \
--replace "-Wno-braced-scalar-init" ""
--replace "-Wno-braced-scalar-init" "" \
--replace "-Werror" ""
'';
buildInputs = [ json_c libpcap ncurses libtirpc ];

8
pkgs/top-level/all-packages.nix
View File

@ -13474,8 +13474,6 @@ with pkgs;
### End of CuboCore
lush2 = callPackage ../development/interpreters/lush {};
maude = callPackage ../development/interpreters/maude {
stdenv = if stdenv.cc.isClang then llvmPackages_5.stdenv else stdenv;
};
@ -31932,12 +31930,10 @@ with pkgs;
};
maxima = callPackage ../applications/science/math/maxima {
ecl = null;
lisp-compiler = sbcl;
};
maxima-ecl = maxima.override {
inherit ecl;
ecl-fasl = true;
sbcl = null;
lisp-compiler = ecl;
};
mxnet = callPackage ../applications/science/math/mxnet {