Merge master into staging-next

This commit is contained in:
github-actions[bot] 2021-06-08 18:16:27 +00:00 committed by GitHub
commit e8f8906d68
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
50 changed files with 565 additions and 303 deletions

View file

@ -181,15 +181,6 @@
<para>GNOME desktop environment was upgraded to 40, see the release notes for <link xlink:href="https://help.gnome.org/misc/release-notes/40.0/">40.0</link> and <link xlink:href="https://help.gnome.org/misc/release-notes/3.38/">3.38</link>. The <code>gnome3</code> attribute set has been renamed to <code>gnome</code> and so have been the NixOS options.</para>
</listitem>
<listitem>
<para>
Enabling wireless networking now requires specifying at least one network
interface using <xref linkend="opt-networking.wireless.interfaces"/>.
This is to avoid a race condition with the card initialisation (see
<link xlink:href="https://github.com/NixOS/nixpkgs/issues/101963">issue
#101963</link> for more information).
</para>
</listitem>
<listitem>
<para>
If you are using <option>services.udev.extraRules</option> to assign

View file

@ -70,6 +70,24 @@ in
};
};
security.wrappers."mount.davfs" = {
program = "mount.davfs";
source = "${pkgs.davfs2}/bin/mount.davfs";
owner = "root";
group = cfg.davGroup;
setuid = true;
permissions = "u+rx,g+x";
};
security.wrappers."umount.davfs" = {
program = "umount.davfs";
source = "${pkgs.davfs2}/bin/umount.davfs";
owner = "root";
group = cfg.davGroup;
setuid = true;
permissions = "u+rx,g+x";
};
};
}

View file

@ -22,36 +22,51 @@ let
enableIwd = cfg.wifi.backend == "iwd";
configFile = pkgs.writeText "NetworkManager.conf" ''
[main]
plugins=keyfile
dhcp=${cfg.dhcp}
dns=${cfg.dns}
# If resolvconf is disabled that means that resolv.conf is managed by some other module.
rc-manager=${if config.networking.resolvconf.enable then "resolvconf" else "unmanaged"}
mkValue = v:
if v == true then "yes"
else if v == false then "no"
else if lib.isInt v then toString v
else v;
[keyfile]
${optionalString (cfg.unmanaged != [])
''unmanaged-devices=${lib.concatStringsSep ";" cfg.unmanaged}''}
[logging]
level=${cfg.logLevel}
audit=${lib.boolToString config.security.audit.enable}
[connection]
ipv6.ip6-privacy=2
ethernet.cloned-mac-address=${cfg.ethernet.macAddress}
wifi.cloned-mac-address=${cfg.wifi.macAddress}
${optionalString (cfg.wifi.powersave != null)
''wifi.powersave=${if cfg.wifi.powersave then "3" else "2"}''}
[device]
wifi.scan-rand-mac-address=${if cfg.wifi.scanRandMacAddress then "yes" else "no"}
wifi.backend=${cfg.wifi.backend}
${cfg.extraConfig}
mkSection = name: attrs: ''
[${name}]
${
lib.concatStringsSep "\n"
(lib.mapAttrsToList
(k: v: "${k}=${mkValue v}")
(lib.filterAttrs
(k: v: v != null)
attrs))
}
'';
configFile = pkgs.writeText "NetworkManager.conf" (lib.concatStringsSep "\n" [
(mkSection "main" {
plugins = "keyfile";
dhcp = cfg.dhcp;
dns = cfg.dns;
# If resolvconf is disabled that means that resolv.conf is managed by some other module.
rc-manager =
if config.networking.resolvconf.enable then "resolvconf"
else "unmanaged";
})
(mkSection "keyfile" {
unmanaged-devices =
if cfg.unmanaged == [] then null
else lib.concatStringsSep ";" cfg.unmanaged;
})
(mkSection "logging" {
audit = config.security.audit.enable;
level = cfg.logLevel;
})
(mkSection "connection" cfg.connectionConfig)
(mkSection "device" {
"wifi.scan-rand-mac-address" = cfg.wifi.scanRandMacAddress;
"wifi.backend" = cfg.wifi.backend;
})
cfg.extraConfig
]);
/*
[network-manager]
Identity=unix-group:networkmanager
@ -154,6 +169,28 @@ in {
'';
};
connectionConfig = mkOption {
type = with types; attrsOf (nullOr (oneOf [
bool
int
str
]));
default = {};
description = ''
Configuration for the [connection] section of NetworkManager.conf.
Refer to
<link xlink:href="https://developer.gnome.org/NetworkManager/stable/NetworkManager.conf.html">
https://developer.gnome.org/NetworkManager/stable/NetworkManager.conf.html#id-1.2.3.11
</link>
or
<citerefentry>
<refentrytitle>NetworkManager.conf</refentrytitle>
<manvolnum>5</manvolnum>
</citerefentry>
for more information.
'';
};
extraConfig = mkOption {
type = types.lines;
default = "";
@ -482,6 +519,18 @@ in {
(mkIf enableIwd {
wireless.iwd.enable = true;
})
{
networkmanager.connectionConfig = {
"ipv6.ip6-privacy" = 2;
"ethernet.cloned-mac-address" = cfg.ethernet.macAddress;
"wifi.cloned-mac-address" = cfg.wifi.macAddress;
"wifi.powersave" =
if cfg.wifi.powersave == null then null
else if cfg.wifi.powersave then 3
else 2;
};
}
];
boot.kernelModules = [ "ctr" ];

View file

@ -40,7 +40,13 @@ in {
default = [];
example = [ "wlan0" "wlan1" ];
description = ''
The interfaces <command>wpa_supplicant</command> will use.
The interfaces <command>wpa_supplicant</command> will use. If empty, it will
automatically use all wireless interfaces.
<warning><para>
The automatic discovery of interfaces does not work reliably on boot:
it may fail and leave the system without network. When possible, specify
a known interface name.
</para></warning>
'';
};
@ -219,18 +225,19 @@ in {
};
config = mkIf cfg.enable {
assertions = [
{ assertion = cfg.interfaces != [];
message = ''
No network interfaces for wpa_supplicant have been configured.
Please, specify at least one using networking.wireless.interfaces.
'';
}
] ++ flip mapAttrsToList cfg.networks (name: cfg: {
assertions = flip mapAttrsToList cfg.networks (name: cfg: {
assertion = with cfg; count (x: x != null) [ psk pskRaw auth ] <= 1;
message = ''options networking.wireless."${name}".{psk,pskRaw,auth} are mutually exclusive'';
});
warnings =
optional (cfg.interfaces == [] && config.systemd.services.wpa_supplicant.wantedBy != [])
''
No network interfaces for wpa_supplicant have been configured: the service
may randomly fail to start at boot. You should specify at least one using the option
networking.wireless.interfaces.
'';
environment.systemPackages = [ package ];
services.dbus.packages = [ package ];
@ -261,7 +268,20 @@ in {
then echo >&2 "<3>/etc/wpa_supplicant.conf present but ignored. Generated ${configFile} is used instead."
fi
iface_args="-s -u -D${cfg.driver} ${configStr}"
args="${concatMapStringsSep " -N " (i: "-i${i} $iface_args") ifaces}"
${if ifaces == [] then ''
for i in $(cd /sys/class/net && echo *); do
DEVTYPE=
UEVENT_PATH=/sys/class/net/$i/uevent
if [ -e "$UEVENT_PATH" ]; then
source "$UEVENT_PATH"
if [ "$DEVTYPE" = "wlan" -o -e /sys/class/net/$i/wireless ]; then
args+="''${args:+ -N} -i$i $iface_args"
fi
fi
done
'' else ''
args="${concatMapStringsSep " -N " (i: "-i${i} $iface_args") ifaces}"
''}
exec wpa_supplicant $args
'';
};

View file

@ -2,13 +2,13 @@
python3Packages.buildPythonApplication rec {
pname = "chia";
version = "1.1.5";
version = "1.1.7";
src = fetchFromGitHub {
owner = "Chia-Network";
repo = "chia-blockchain";
rev = version;
sha256 = "ZUxWOlJGQpeQCtWt0PSdcbMackHdeuNFkxHvYDPcU8Y=";
sha256 = "05hcckkv3vhz172w9kp5lh4srakizx1l383dijs50vgx2bj30m8v";
};
patches = [
@ -38,6 +38,7 @@ python3Packages.buildPythonApplication rec {
colorlog
concurrent-log-handler
cryptography
dnspython
keyrings-cryptfile
pyyaml
setproctitle

View file

@ -0,0 +1,20 @@
diff -Naur source.old/src/makefile source/src/makefile
--- source.old/src/makefile 1969-12-31 21:00:01.000000000 -0300
+++ source/src/makefile 2021-06-07 18:58:48.851231787 -0300
@@ -101,14 +101,14 @@
# need packages nodejs and libnode-dev
js_hello_v8 : js_hello_v8.cpp
- g++ -I/usr/include/v8 js_hello_v8.cpp -lv8 -lstdc++ -o js_hello_v8
+ $(CXX) -I/usr/include/v8 js_hello_v8.cpp -lv8 -lstdc++ -o js_hello_v8
HELLOEXTRA = stringfile.o messages.o msg-strings.o startwindow.o ebrc.o format.o http.o isup.o fetchmail.o sendmail.o plugin.o buffers.o dbstubs.o html.o decorate.o html-tidy.o css.o
js_hello_moz : js_hello_moz.o $(HELLOEXTRA) jseng-moz.o
$(CC) js_hello_moz.o $(HELLOEXTRA) jseng-moz.o $(LDFLAGS) -lmozjs-$(SMV) -lstdc++ -o $@
js_hello_quick : js_hello_quick.c
- gcc $(CFLAGS) js_hello_quick.c stringfile.o messages.o msg-strings.o ebrc.o format.o -o js_hello_quick -L/usr/local/lib/quickjs -lquickjs -lm -ldl -lpthread -latomic
+ $(CC) $(CFLAGS) js_hello_quick.c stringfile.o messages.o msg-strings.o ebrc.o format.o -o js_hello_quick $(QUICKJS_LDFLAGS) -lm -lpthread
hello: js_hello_duk js_hello_v8 js_hello_moz js_hello_quick

View file

@ -1,41 +1,79 @@
{ lib, stdenv, fetchFromGitHub, duktape, curl, pcre, readline, openssl, perl, html-tidy }:
{ lib
, stdenv
, fetchFromGitHub
, curl
, duktape
, html-tidy
, openssl
, pcre
, perl
, pkg-config
, quickjs
, readline
, which
}:
stdenv.mkDerivation rec {
pname = "edbrowse";
version = "3.7.7";
version = "3.8.0";
buildInputs = [ curl pcre readline openssl duktape perl html-tidy ];
src = fetchFromGitHub {
owner = "CMB";
repo = pname;
rev = "v${version}";
hash = "sha256-ZXxzQBAmu7kM3sjqg/rDLBXNucO8sFRFKXV8UxQVQZU=";
};
nativeBuildInputs = [
pkg-config
which
];
buildInputs = [
curl
duktape
html-tidy
openssl
pcre
perl
quickjs
readline
];
patches = [
# Fixes some small annoyances on src/makefile
./0001-small-fixes.patch
];
postPatch = ''
for i in ./tools/*.pl
do
substituteInPlace $i --replace "/usr/bin/perl" "${perl}/bin/perl"
substituteInPlace src/makefile --replace\
'-L/usr/local/lib/quickjs' '-L${quickjs}/lib/quickjs'
for i in $(find ./tools/ -type f ! -name '*.c'); do
patchShebangs $i
done
'';
makeFlags = [
"-C" "src"
"prefix=${placeholder "out"}"
"PREFIX=${placeholder "out"}"
];
src = fetchFromGitHub {
owner = "CMB";
repo = "edbrowse";
rev = "v${version}";
sha256 = "0cw9d60mdhwna57r1vxn53s8gl81rr3cxnvm769ifq3xyh49vfcf";
};
meta = with lib; {
homepage = "https://edbrowse.org/";
description = "Command Line Editor Browser";
longDescription = ''
Edbrowse is a combination editor, browser, and mail client that is 100% text based.
The interface is similar to /bin/ed, though there are many more features, such as editing multiple files simultaneously, and rendering html.
This program was originally written for blind users, but many sighted users have taken advantage of the unique scripting capabilities of this program, which can be found nowhere else.
A batch job, or cron job, can access web pages on the internet, submit forms, and send email, with no human intervention whatsoever.
edbrowse can also tap into databases through odbc. It was primarily written by Karl Dahlke.
'';
Edbrowse is a combination editor, browser, and mail client that is 100%
text based. The interface is similar to /bin/ed, though there are many
more features, such as editing multiple files simultaneously, and
rendering html. This program was originally written for blind users, but
many sighted users have taken advantage of the unique scripting
capabilities of this program, which can be found nowhere else. A batch
job, or cron job, can access web pages on the internet, submit forms, and
send email, with no human intervention whatsoever. edbrowse can also tap
into databases through odbc. It was primarily written by Karl Dahlke.
'';
license = licenses.gpl1Plus;
homepage = "https://edbrowse.org/";
maintainers = with maintainers; [ schmitthenner vrthra equirosa ];
platforms = platforms.linux;
};
}
# TODO: send the patch to upstream developers

View file

@ -13,14 +13,14 @@ let
pythonPackages = python3Packages;
in
mkDerivation rec {
version = "1.13";
version = "1.14";
pname = "renderdoc";
src = fetchFromGitHub {
owner = "baldurk";
repo = "renderdoc";
rev = "v${version}";
sha256 = "MBvdnB1YPeCaXSgqqtGs0SMocbarjmaWtIUkBBCvufc=";
sha256 = "VO7pOLodXI0J7O4Y9b7YSl5BdtsIxmalFG5mqfuiJEw=";
};
buildInputs = [

View file

@ -1,13 +0,0 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 763f75b..defa74a 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -212,7 +212,7 @@ CHECK_INCLUDE_FILES(endian.h HAVE_ENDIAN_H)
CHECK_INCLUDE_FILES(stdint.h HAVE_STDINT_H)
CHECK_INCLUDE_FILES(byteswap.h HAVE_BYTESWAP_H)
CHECK_LIBRARY_EXISTS(gypsy gypsy_control_get_default "" GYPSY_FOUND)
-CHECK_INCLUDE_FILES(libspeechd.h HAVE_LIBSPEECHD)
+CHECK_INCLUDE_FILES(speech-dispatcher/libspeechd.h HAVE_LIBSPEECHD)
CHECK_INCLUDE_FILES(sys/socket.h HAVE_SOCKET)
CHECK_INCLUDE_FILES(sys/shm.h HAVE_SHMEM)
CHECK_FUNCTION_EXISTS(snprintf HAVE_SNPRINTF)

View file

@ -1,90 +0,0 @@
{ lib, stdenv, fetchFromGitHub, pkg-config, gtk2, fontconfig, freetype, imlib2
, SDL_image, libGLU, libGL, libXmu, freeglut, pcre, dbus, dbus-glib, glib
, librsvg, freeimage, libxslt, cairo, gdk-pixbuf, pango
, atk, patchelf, fetchurl, bzip2, python, gettext, quesoglc
, gd, cmake, shapelib, SDL_ttf, fribidi, makeWrapper
, qtquickcontrols, qtmultimedia, qtspeech, qtsensors
, qtlocation, qtdeclarative, qtsvg
, qtSupport ? false, qtbase #need to fix qt_qpainter
, sdlSupport ? true, SDL
, xkbdSupport ? true, xkbd
, espeakSupport ? true, espeak
, postgresqlSupport ? false, postgresql
, speechdSupport ? false, speechd ? null
}:
assert speechdSupport -> speechd != null;
with lib;
stdenv.mkDerivation rec {
pname = "navit";
version = "0.5.3";
src = fetchFromGitHub {
owner = "navit-gps";
repo = "navit";
rev = "v${version}";
sha256 = "071drvqzxpxbfh0lf0lra5a97rv8ny40l96n9xl0dx0s8w30j61i";
};
sample_map = fetchurl {
url = "http://www.navit-project.org/maps/osm_bbox_11.3,47.9,11.7,48.2.osm.bz2";
name = "sample_map.bz2";
sha256 = "0vg6b6rhsa2cxqj4rbhfhhfss71syhnfa6f1jg2i2d7l88dm5x7d";
};
patches = [ ./CMakeLists.txt.patch ];
NIX_CFLAGS_COMPILE = toString (optional sdlSupport "-I${SDL.dev}/include/SDL"
++ optional speechdSupport "-I${speechd}/include/speech-dispatcher");
# we choose only cmdline and speech-dispatcher speech options.
# espeak builtins is made for non-cmdline OS as winCE
cmakeFlags = [
"-DSAMPLE_MAP=n " "-DCMAKE_BUILD_TYPE=Release"
"-Dspeech/qt5_espeak=FALSE" "-Dsupport/espeak=FALSE"
];
buildInputs = [
gtk2 fontconfig freetype imlib2 libGLU libGL freeimage
libxslt libXmu freeglut python gettext quesoglc gd
fribidi pcre dbus dbus-glib librsvg shapelib glib
cairo gdk-pixbuf pango atk
] ++ optionals sdlSupport [ SDL SDL_ttf SDL_image ]
++ optional postgresqlSupport postgresql
++ optional speechdSupport speechd
++ optionals qtSupport [
qtquickcontrols qtmultimedia qtspeech qtsensors
qtbase qtlocation qtdeclarative qtsvg
];
nativeBuildInputs = [ makeWrapper pkg-config cmake patchelf bzip2 ];
# we dont want blank screen by defaut
postInstall = ''
# emulate DSAMPLE_MAP
mkdir -p $out/share/navit/maps/
bzcat "${sample_map}" | $out/bin/maptool "$out/share/navit/maps/osm_bbox_11.3,47.9,11.7,48.2.bin"
'';
# TODO: fix upstream?
libPath = lib.makeLibraryPath ([ stdenv.cc.libc ] ++ buildInputs );
postFixup =
''
find "$out/lib" -type f -name "*.so" -exec patchelf --set-rpath $libPath {} \;
wrapProgram $out/bin/navit \
--prefix PATH : ${makeBinPath (
optional xkbdSupport xkbd
++ optional espeakSupport espeak
++ optional speechdSupport speechd ) }
'';
meta = {
homepage = "https://www.navit-project.org";
description = "Car navigation system with routing engine using OSM maps";
license = licenses.gpl2;
maintainers = [ ];
platforms = platforms.linux;
};
}

View file

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "xplr";
version = "0.13.1";
version = "0.14.0";
src = fetchCrate {
inherit pname version;
sha256 = "1aanw0l8b4ak0kikkixmb817qw48ypviq9dxdivzwc29rjvgp152";
sha256 = "1cyybqb91n91h6nig7rxxxw9c7krz80jdfl25bdr7mlbzymssn0q";
};
buildInputs = lib.optional stdenv.isDarwin libiconv;
cargoSha256 = "16iaj1pqvqwi0rq4k3lmqwd8skbjf55133ri69hj26gz88k4q43w";
cargoSha256 = "1bj1rgsmkbby4ma325fhpb911bwabhd5bihyv9j0dfvgm1ffdm8a";
meta = with lib; {
description = "A hackable, minimal, fast TUI file explorer";

View file

@ -14,6 +14,15 @@
"sha256": "1wdrjpd3l0xadsa3lqhsc9c57g8x2qkwb76q824sk8za1a7lapii",
"version": "1.5.0-patched"
},
"aiven": {
"owner": "aiven",
"provider-source-address": "registry.terraform.io/aiven/aiven",
"repo": "terraform-provider-aiven",
"rev": "v2.1.14",
"sha256": "14bfdhn3daygj1v3lm9b3791sx2cd5h0panchpp39h6vrccrpmmk",
"vendorSha256": "1j09bfbld03yxq0vv9ld0xmw5axbza2bwlz01i1gl1v9dprlnbkc",
"version": "2.1.14"
},
"akamai": {
"owner": "terraform-providers",
"provider-source-address": "registry.terraform.io/akamai/akamai",
@ -609,6 +618,7 @@
},
"metal": {
"owner": "equinix",
"provider-source-address": "registry.terraform.io/equinix/metal",
"repo": "terraform-provider-metal",
"rev": "v2.1.0",
"sha256": "06i3rj6ig8hxbncdpa8b11v8pr3zhi90ppmf77jjin1114ikd172",

View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "terragrunt";
version = "0.29.8";
version = "0.29.9";
src = fetchFromGitHub {
owner = "gruntwork-io";
repo = pname;
rev = "v${version}";
sha256 = "sha256-zHfY1pl9r9N1Jx9TzbOFYt2VR9hvHWcdFhPc36Q3apE=";
sha256 = "sha256-xgoKxA8lc72yhFVHeFkbF5j5/vGAd9TTaJ/aDEYL8Wg=";
};
vendorSha256 = "sha256-qlSCQtiGHmlk3DyETMoQbbSYhuUSZTsvAnBKuDJI8x8=";

View file

@ -1,9 +1,10 @@
{lib, stdenv, fetchurl, qtbase, qtx11extras, ncurses5, xorg, zlib, python27Packages}:
{ lib, stdenv, fetchurl, qtbase, qtx11extras, ncurses5, xorg, zlib, python27Packages }:
stdenv.mkDerivation {
name = "fdr-4.2.3";
pname = "fdr";
version = "4.2.7";
src = fetchurl {
url = "https://www.cs.ox.ac.uk/projects/fdr/downloads/fdr-3789-linux-x86_64.tar.gz";
sha256 = "0n2yqichym5xdawlgk3r7yha88k7ycnx6585jfrcm7043sls1i88";
url = "https://dl.cocotec.io/fdr/fdr-3814-linux-x86_64.tar.gz";
sha256 = "0cajz1gz4slq9nfhm8dqdgxl0kc950838n0lrf8jw4vl54gv6chh";
};
libPath = lib.makeLibraryPath [
@ -59,7 +60,7 @@ stdenv.mkDerivation {
'';
meta = with lib; {
homepage = "https://www.cs.ox.ac.uk/projects/fdr/";
homepage = "https://cocotec.io/fdr/";
description = "The CSP refinement checker";
license = licenses.unfreeRedistributable;
platforms = platforms.linux;

View file

@ -13,11 +13,11 @@ with writers;
let
bin = {
bash = writeBashBin "test_writers" ''
bash = writeBashBin "test-writers-bash-bin" ''
if [[ "test" == "test" ]]; then echo "success"; fi
'';
c = writeCBin "test_writers" { libraries = [ ]; } ''
c = writeCBin "test-writers-c" { libraries = [ ]; } ''
#include <stdio.h>
int main() {
printf("success\n");
@ -25,17 +25,17 @@ let
}
'';
dash = writeDashBin "test_writers" ''
dash = writeDashBin "test-writers-dash-bin" ''
test '~' = '~' && echo 'success'
'';
rust = writeRustBin "test_writers" {} ''
rust = writeRustBin "test-writers-rust-bin" {} ''
fn main(){
println!("success")
}
'';
haskell = writeHaskellBin "test_writers" { libraries = [ haskellPackages.acme-default ]; } ''
haskell = writeHaskellBin "test-writers-haskell-bin" { libraries = [ haskellPackages.acme-default ]; } ''
import Data.Default
int :: Int
@ -47,7 +47,7 @@ let
_ -> print "fail"
'';
js = writeJSBin "test_writers" { libraries = [ nodePackages.semver ]; } ''
js = writeJSBin "test-writers-js-bin" { libraries = [ nodePackages.semver ]; } ''
var semver = require('semver');
if (semver.valid('1.2.3')) {
@ -57,12 +57,12 @@ let
}
'';
perl = writePerlBin "test_writers" { libraries = [ perlPackages.boolean ]; } ''
perl = writePerlBin "test-writers-perl-bin" { libraries = [ perlPackages.boolean ]; } ''
use boolean;
print "success\n" if true;
'';
python2 = writePython2Bin "test_writers" { libraries = [ python2Packages.enum ]; } ''
python2 = writePython2Bin "test-writers-python2-bin" { libraries = [ python2Packages.enum ]; } ''
from enum import Enum
@ -73,7 +73,7 @@ let
print Test.a
'';
python3 = writePython3Bin "test_writers" { libraries = [ python3Packages.pyyaml ]; } ''
python3 = writePython3Bin "test-writers-python3-bin" { libraries = [ python3Packages.pyyaml ]; } ''
import yaml
y = yaml.load("""
@ -84,11 +84,11 @@ let
};
simple = {
bash = writeBash "test_bash" ''
bash = writeBash "test-writers-bash" ''
if [[ "test" == "test" ]]; then echo "success"; fi
'';
c = writeC "test_c" { libraries = [ glib.dev ]; } ''
c = writeC "test-writers-c" { libraries = [ glib.dev ]; } ''
#include <gio/gio.h>
#include <stdio.h>
int main() {
@ -106,11 +106,11 @@ let
}
'';
dash = writeDash "test_dash" ''
dash = writeDash "test-writers-dash" ''
test '~' = '~' && echo 'success'
'';
haskell = writeHaskell "test_haskell" { libraries = [ haskellPackages.acme-default ]; } ''
haskell = writeHaskell "test-writers-haskell" { libraries = [ haskellPackages.acme-default ]; } ''
import Data.Default
int :: Int
@ -122,7 +122,7 @@ let
_ -> print "fail"
'';
js = writeJS "test_js" { libraries = [ nodePackages.semver ]; } ''
js = writeJS "test-writers-js" { libraries = [ nodePackages.semver ]; } ''
var semver = require('semver');
if (semver.valid('1.2.3')) {
@ -132,12 +132,12 @@ let
}
'';
perl = writePerl "test_perl" { libraries = [ perlPackages.boolean ]; } ''
perl = writePerl "test-writers-perl" { libraries = [ perlPackages.boolean ]; } ''
use boolean;
print "success\n" if true;
'';
python2 = writePython2 "test_python2" { libraries = [ python2Packages.enum ]; } ''
python2 = writePython2 "test-writers-python2" { libraries = [ python2Packages.enum ]; } ''
from enum import Enum
@ -148,7 +148,7 @@ let
print Test.a
'';
python3 = writePython3 "test_python3" { libraries = [ python3Packages.pyyaml ]; } ''
python3 = writePython3 "test-writers-python3" { libraries = [ python3Packages.pyyaml ]; } ''
import yaml
y = yaml.load("""
@ -157,21 +157,21 @@ let
print(y[0]['test'])
'';
python2NoLibs = writePython2 "test_python2_no_libs" {} ''
python2NoLibs = writePython2 "test-writers-python2-no-libs" {} ''
print("success")
'';
python3NoLibs = writePython3 "test_python3_no_libs" {} ''
python3NoLibs = writePython3 "test-writers-python3-no-libs" {} ''
print("success")
'';
};
path = {
bash = writeBash "test_bash" (writeText "test" ''
bash = writeBash "test-writers-bash-path" (writeText "test" ''
if [[ "test" == "test" ]]; then echo "success"; fi
'');
haskell = writeHaskell "test_haskell" { libraries = [ haskellPackages.acme-default ]; } (writeText "test" ''
haskell = writeHaskell "test-writers-haskell-path" { libraries = [ haskellPackages.acme-default ]; } (writeText "test" ''
import Data.Default
int :: Int
@ -184,8 +184,8 @@ let
'');
};
writeTest = expectedValue: test:
writeDash "test-writers" ''
writeTest = expectedValue: name: test:
writeDash "run-${name}" ''
if test "$(${test})" != "${expectedValue}"; then
echo 'test ${test} failed'
exit 1
@ -196,9 +196,9 @@ in runCommand "test-writers" {
passthru = { inherit writeTest bin simple; };
meta.platforms = lib.platforms.all;
} ''
${lib.concatMapStringsSep "\n" (test: writeTest "success" "${test}/bin/test_writers") (lib.attrValues bin)}
${lib.concatMapStringsSep "\n" (test: writeTest "success" test) (lib.attrValues simple)}
${lib.concatMapStringsSep "\n" (test: writeTest "success" test) (lib.attrValues path)}
${lib.concatMapStringsSep "\n" (test: writeTest "success" test.name "${test}/bin/${test.name}") (lib.attrValues bin)}
${lib.concatMapStringsSep "\n" (test: writeTest "success" test.name test) (lib.attrValues simple)}
${lib.concatMapStringsSep "\n" (test: writeTest "success" test.name test) (lib.attrValues path)}
echo 'nix-writers successfully tested' >&2
touch $out

View file

@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
pname = "acme";
version = "unstable-2020-12-27";
version = "unstable-2021-02-14";
src = fetchsvn {
url = "svn://svn.code.sf.net/p/acme-crossass/code-0/trunk";
rev = "314";
sha256 = "08zg26rh19nlif7id91nv0syx5n243ssxhfw0nk2r2bhjm5jrjz1";
rev = "319";
sha256 = "sha256-VifIQ+UEVMKJ+cNS+Xxusazinr5Cgu1lmGuhqj/5Mpk=";
};
sourceRoot = "code-0-r${src.rev}/src";

View file

@ -0,0 +1,25 @@
{ lib, mkCoqDerivation, coq, ssreflect, version ? null }:
with lib;
mkCoqDerivation {
pname = "reglang";
releaseRev = v: "v${v}";
release."1.1.2".sha256 = "sha256-SEnMilLNxh6a3oiDNGLaBr8quQ/nO2T9Fwdf/1il2Yk=";
inherit version;
defaultVersion = with versions; switch coq.coq-version [
{ case = range "8.10" "8.13"; out = "1.1.2"; }
] null;
propagatedBuildInputs = [ ssreflect ];
meta = {
description = "Regular Language Representations in Coq";
maintainers = with maintainers; [ siraben ];
license = licenses.cecill-b;
platforms = platforms.unix;
};
}

View file

@ -1,17 +1,37 @@
{ lib, stdenv, fetchurl }:
{ lib
, stdenv
, fetchFromGitHub
, texinfo
}:
stdenv.mkDerivation rec {
pname = "quickjs";
version = "2020-11-08";
version = "2021-03-27";
src = fetchurl {
url = "https://bellard.org/${pname}/${pname}-${version}.tar.xz";
sha256 = "0yqqcjxi3cqagw184mqrxpvqg486x7c233r3cp9mxachngd6779f";
src = fetchFromGitHub {
owner = "bellard";
repo = pname;
rev = "b5e62895c619d4ffc75c9d822c8d85f1ece77e5b";
hash = "sha256-VMaxVVQuJ3DAwYrC14uJqlRBg0//ugYvtyhOXsTUbCA=";
};
makeFlags = [ "prefix=${placeholder "out"}" ];
enableParallelBuilding = true;
nativeBuildInputs = [
texinfo
];
postBuild = ''
(cd doc
makeinfo *texi)
'';
postInstall = ''
(cd doc
install -Dt $out/share/doc *texi *info)
'';
doInstallCheck = true;
installCheckPhase = ''
PATH="$out/bin:$PATH"
@ -32,7 +52,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "A small and embeddable Javascript engine";
homepage = "https://bellard.org/quickjs/";
maintainers = with maintainers; [ stesie ];
maintainers = with maintainers; [ stesie AndersonTorres ];
platforms = platforms.linux;
license = licenses.mit;
};

View file

@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "intel-media-driver";
version = "21.2.1";
version = "21.2.2";
src = fetchFromGitHub {
owner = "intel";
repo = "media-driver";
rev = "intel-media-${version}";
sha256 = "0a49087ca3li1cbsdcwp31zlakfw9dxcr2lnxzm5s3x63jvwlbag";
sha256 = "0cz2zr5qmhlsb1ydffakpkw9adyvn5n2y269fp0k2sskqwlykn48";
};
cmakeFlags = [

View file

@ -56,9 +56,9 @@ stdenv.mkDerivation rec {
done
# Ensure the default compilers are the ones mvapich was built with
substituteInPlace $out/bin/mpicc --replace 'CC="gcc"' 'CC=${stdenv.cc}/bin/gcc'
substituteInPlace $out/bin/mpicxx --replace 'CXX="g++"' 'CC=${stdenv.cc}/bin/g++'
substituteInPlace $out/bin/mpifort --replace 'FC="gfortran"' 'CC=${gfortran}/bin/gfortran'
substituteInPlace $out/bin/mpicc --replace 'CC="gcc"' 'CC=${stdenv.cc}/bin/cc'
substituteInPlace $out/bin/mpicxx --replace 'CXX="g++"' 'CXX=${stdenv.cc}/bin/c++'
substituteInPlace $out/bin/mpifort --replace 'FC="gfortran"' 'FC=${gfortran}/bin/gfortran'
'';
enableParallelBuilding = true;

View file

@ -11,7 +11,7 @@
stdenv.mkDerivation rec {
pname = "zchunk";
version = "1.1.9";
version = "1.1.11";
outputs = [ "out" "lib" "dev" ];
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
owner = "zchunk";
repo = pname;
rev = version;
hash = "sha256-MqnHtqOjLl6R5GZ4f2UX1iLoO9FUT2IfZlSN58wW8JA=";
hash = "sha256-r+qWJOUnTyPJjM9eW44Q2DMKxx4HloyfNrQ6xWDO9vQ=";
};
nativeBuildInputs = [

View file

@ -13,12 +13,12 @@
buildPythonPackage rec {
pname = "chiapos";
version = "1.0.1";
version = "1.0.2";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-kJx57EtwPBrGMpjnSzeYYhWqc/g1N1Bg8slW5oZKjg8=";
sha256 = "09mwj9m9rcvcb3zn6v2xykgd4a9lpwl6c86nwl8d1iqr82gb5hb5";
};
patches = [

View file

@ -1,14 +1,12 @@
{ lib
, buildPythonPackage
, fetchPypi
, pythonOlder
, python
}:
buildPythonPackage rec {
pname = "defusedxml";
version = "0.7.1";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;

View file

@ -0,0 +1,23 @@
{ lib, buildPythonPackage, fetchPypi, typing-extensions }:
buildPythonPackage rec {
pname = "injector";
version = "0.18.4";
src = fetchPypi {
inherit pname version;
sha256 = "10miwi58g4b8rvdf1pl7s7x9j91qyxxv3kdn5idzkfc387hqxn6f";
};
propagatedBuildInputs = [ typing-extensions ];
doCheck = false; # No tests are available
pythonImportsCheck = [ "injector" ];
meta = with lib; {
description = "Python dependency injection framework, inspired by Guice";
homepage = "https://github.com/alecthomas/injector";
maintainers = [ maintainers.ivar ];
license = licenses.bsd3;
};
}

View file

@ -3,21 +3,21 @@
, fetchPypi
, ipython
, isPyPy
, isPy27
, mock
, toml
}:
buildPythonPackage rec {
pname = "ipdb";
version = "0.13.7";
disabled = isPyPy || isPy27; # setupterm: could not find terminfo database
disabled = isPyPy; # setupterm: could not find terminfo database
src = fetchPypi {
inherit pname version;
sha256 = "178c367a61c1039e44e17c56fcc4a6e7dc11b33561261382d419b6ddb4401810";
};
propagatedBuildInputs = [ ipython ];
propagatedBuildInputs = [ ipython toml ];
checkInputs = [ mock ];
preCheck = ''

View file

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "pymfy";
version = "0.9.4";
version = "0.10.1";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "tetienne";
repo = "somfy-open-api";
rev = "v${version}";
sha256 = "1ml536dvva2xd52jfgrd557h2sr5w6567sxnyq0blhkgpyz4m2av";
sha256 = "sha256-xX7vNBQaYPdnsukFcQyEa2G1XIvf9ehADNXbLUUCRoU=";
};
nativeBuildInputs = [ poetry-core ];

View file

@ -6,19 +6,22 @@
buildPythonPackage rec {
pname = "python-velbus";
version = "2.1.2";
version = "2.1.4";
src = fetchFromGitHub {
owner = "thomasdelaet";
repo = pname;
rev = "v${version}";
sha256 = "0dv7dsjp5li87ispdphaz7jd0a9xc328rxwawf2f58b1ii904xr4";
rev = version;
sha256 = "1z0a7fc9xfrcpwi9xiimxsgbzbp2iwyi1rij6vqd5z47mzi49fv9";
};
propagatedBuildInputs = [ pyserial ];
propagatedBuildInputs = [
pyserial
];
# Project has not tests
doCheck = false;
pythonImportsCheck = [ "velbus" ];
meta = with lib; {

View file

@ -8,11 +8,11 @@
stdenv.mkDerivation rec {
pname = "sbt";
version = "1.5.1";
version = "1.5.3";
src = fetchurl {
url = "https://github.com/sbt/sbt/releases/download/v${version}/sbt-${version}.tgz";
sha256 = "0dsbqipr549awv584fyl227s1gknlpsf5krp990w7w3bbxl3avb7";
sha256 = "10kIQNy+3V1SD4uEZs/BJ4E6bTCRV3wjBN8gw9jr9VQ=";
};
postPatch = ''

View file

@ -5,7 +5,7 @@
}:
let
# Poetry2nix version
version = "1.17.0";
version = "1.17.1";
inherit (poetryLib) isCompatible readTOML moduleName;
@ -209,12 +209,12 @@ lib.makeScope pkgs.newScope (self: {
poetry-core = if __isBootstrap then null else poetryPkg.passthru.python.pkgs.poetry-core;
poetry = if __isBootstrap then null else poetryPkg;
# The canonical name is setuptools-scm
setuptools-scm = super.setuptools-scm;
__toPluginAble = toPluginAble self;
inherit (hooks) pipBuildHook removePathDependenciesHook poetry2nixFixupHook wheelUnpackHook;
} // lib.optionalAttrs (! super ? setuptools-scm) {
# The canonical name is setuptools-scm
setuptools-scm = super.setuptools_scm;
}
)
# Null out any filtered packages, we don't want python.pkgs from nixpkgs

View file

@ -89,7 +89,7 @@ pythonPackages.callPackage
# Prevent infinite recursion
skipSetupToolsSCM = [
"setuptools-scm"
"setuptools_scm"
"setuptools-scm"
"toml" # Toml is an extra for setuptools-scm
];

View file

@ -598,7 +598,7 @@ self: super:
lxml = super.lxml.overridePythonAttrs (
old: {
nativeBuildInputs = with pkgs; (old.nativeBuildInputs or [ ]) ++ [ pkg-config libxml2.dev libxslt.dev ];
nativeBuildInputs = with pkgs; (old.nativeBuildInputs or [ ]) ++ [ pkg-config libxml2.dev libxslt.dev ] ++ lib.optionals stdenv.isDarwin [ xcodebuild ];
buildInputs = with pkgs; (old.buildInputs or [ ]) ++ [ libxml2 libxslt ];
}
);
@ -636,6 +636,10 @@ self: super:
cat > setup.cfg <<EOF
[libs]
system_freetype = True
'' + lib.optionalString stdenv.isDarwin ''
# LTO not working in darwin stdenv, see NixOS/nixpkgs/pull/19312
enable_lto = false
'' + ''
EOF
'';

View file

@ -1,10 +1,10 @@
{ lib, stdenv, fetchurl, bash, jre }:
let
mcVersion = "1.16.5";
buildNum = "488";
buildNum = "771";
jar = fetchurl {
url = "https://papermc.io/api/v1/paper/${mcVersion}/${buildNum}/download";
sha256 = "07zgq6pfgwd9a9daqv1dab0q8cwgidsn6sszn7bpr37y457a4ka8";
url = "https://papermc.io/api/v1/paper/${mcVersion}/${buildNum}/download";
sha256 = "1lmlfhigbzbkgzfq6knglka0ccf4i32ch25gkny0c5fllmsnm08l";
};
in stdenv.mkDerivation {
pname = "papermc";

View file

@ -98,6 +98,7 @@ in buildFHSUserEnv rec {
xorg.libXfixes
libGL
libva
pipewire.lib
# Not formally in runtime but needed by some games
at-spi2-atk

View file

@ -8970,6 +8970,18 @@ final: prev:
meta.homepage = "https://github.com/rcarriga/vim-ultest/";
};
vim-unicoder = buildVimPluginFrom2Nix {
pname = "vim-unicoder";
version = "2019-04-16";
src = fetchFromGitHub {
owner = "arthurxavierx";
repo = "vim-unicoder";
rev = "a71fc3670f9337c56806fa9e8e97b7ea09fd5e39";
sha256 = "1kcnxx909pdvrvk0kyz3h8f9szn6hmalm8qyakq3pv6dknlkwb0b";
};
meta.homepage = "https://github.com/arthurxavierx/vim-unicoder/";
};
vim-unimpaired = buildVimPluginFrom2Nix {
pname = "vim-unimpaired";
version = "2020-04-26";

View file

@ -25,6 +25,7 @@ andys8/vim-elm-syntax
antoinemadec/coc-fzf
ap/vim-css-color
arcticicestudio/nord-vim
arthurxavierx/vim-unicoder
artur-shaik/vim-javacomplete2
autozimu/LanguageClient-neovim
axelf4/vim-strip-trailing-whitespace

View file

@ -1,14 +1,14 @@
{ fetchurl }:
rec {
version = "1.9.0";
version = "1.9.1";
src = fetchurl {
url = "https://www.openafs.org/dl/openafs/${version}/openafs-${version}-src.tar.bz2";
sha256 = "1jw99zwisq25l0smdm8f0gfwhynk532s2ch44blrvxyd7all8kcd";
sha256 = "sha256-7rHihVR4VobHAzt0ZALFOLJnlfd1Qwsa5ohpRFWBPbw=";
};
srcs = [ src
(fetchurl {
url = "https://www.openafs.org/dl/openafs/${version}/openafs-${version}-doc.tar.bz2";
sha256 = "03x1pv8l4bv2fdns1l4sfy200nggy0a4b1f7qd0mnggdaj12c4jp";
sha256 = "sha256-pvF8CdTl+5DNuymNvhb3UrGW05LcXRv8cZp2QQlXF+E=";
})];
}

View file

@ -2,18 +2,18 @@
buildGoModule rec {
pname = "chamber";
version = "2.10.0";
version = "2.10.1";
src = fetchFromGitHub {
owner = "segmentio";
repo = pname;
rev = "v${version}";
sha256 = "4G/QGoztpcLIspHxD5G+obG5h05SZek4keOJ5qS3/zg=";
sha256 = "sha256-nIIoU+iz2uOglNaqGIhQ2kUjpFOyOx+flXXwu02UG6Y=";
};
CGO_ENABLED = 0;
vendorSha256 = "XpLLolxWu9aMp1cyG4dUQk4YtknbIRMmBUdSeyY4PNk=";
vendorSha256 = "sha256-XpLLolxWu9aMp1cyG4dUQk4YtknbIRMmBUdSeyY4PNk=";
buildFlagsArray = [ "-ldflags=-s -w -X main.Version=v${version}" ];

View file

@ -2,20 +2,24 @@
stdenv.mkDerivation {
pname = "flips";
version = "unstable-2020-10-02";
version = "unstable-2021-05-18";
src = fetchFromGitHub {
owner = "Alcaro";
repo = "Flips";
rev = "5a3d2012b8ea53ae777c24b8ac4edb9a6bdb9761";
sha256 = "1ksh9j1n5z8b78yd7gjxswndsqnb1azp84xk4rc0p7zq127l0fyy";
rev = "3476e5e46fc6f10df475f0cad1714358ba04c756";
sha256 = "0s13qrmqfmlb2vy0smpgw39vjkl8vzsmpzk52jnc9r7b4hisii39";
};
nativeBuildInputs = [ pkg-config wrapGAppsHook ];
buildInputs = [ gtk3 libdivsufsort ];
patches = [ ./use-system-libdivsufsort.patch ];
makeFlags = [ "PREFIX=${placeholder "out"}" ];
buildPhase = "./make.sh";
buildPhase = ''
runHook preBuild
./make.sh
runHook postBuild
'';
meta = with lib; {
description = "A patcher for IPS and BPS files";

View file

@ -16,13 +16,13 @@ in
buildGoModule rec {
pname = "gocryptfs";
version = "2.0";
version = "2.0.1";
src = fetchFromGitHub {
owner = "rfjakob";
repo = pname;
rev = "v${version}";
sha256 = "1wpdzi1qfpab76v0ki74qkk82m3ykr4iqb8r6a8k11l4fn42fjk0";
sha256 = "0wiagmym8mwi0vpvrs5ryn3zjwha8ilh7xkavvkd1gqd5laln0kp";
};
vendorSha256 = "10az8n7z4rhsk1af2x6v3pmxg4zp7c9cal35ily8bdzzcb9cpgs0";

View file

@ -22,7 +22,7 @@ in if stdenv.isDarwin then
}
else
mkSSHFS {
version = "3.7.1";
sha256 = "088mgcsqv9f2vly4xn6lvvkmqkgr9jjmjs9qp8938hl7j6rrgd17";
version = "3.7.2";
sha256 = "0i0ycgwdxja8313hlkrlwrl85a4ykkyqddgg484jkr4rnr7ylk8w";
platforms = lib.platforms.linux;
}

View file

@ -1,27 +1,40 @@
{
stdenv, fetchFromGitHub, pkg-config, which, gtk2, gtk3, qt4, qt5, libXtst, lib,
{ stdenv
, fetchFromGitHub
, pkg-config
, which
, gtk2
, gtk3
, qt4
, qt5
, libXtst
, lib
, libchewing
, unixtools
, anthy
}:
# chewing and anthy do not work well
# so we do not enable these input method at this moment
stdenv.mkDerivation {
name = "hime";
version = "unstable-2020-06-27";
stdenv.mkDerivation rec {
pname = "hime";
version = "0.9.11";
src = fetchFromGitHub {
repo = pname;
owner = "hime-ime";
repo = "hime";
rev = "c89751a58836906e6916355fd037fc74fd7a7a15";
sha256 = "024w67q0clzxigsrvqbxpiy8firjvrqi7wbkkcapzzhzapv3nm8x";
rev = "v${version}";
sha256 = "sha256-fCqet+foQjI+LpTQ/6Egup1GzXELlL2hgbh0dCKLwPI=";
};
nativeBuildInputs = [ which pkg-config ];
buildInputs = [ libXtst gtk2 gtk3 qt4 qt5.qtbase ];
nativeBuildInputs = [ which pkg-config unixtools.whereis ];
buildInputs = [ libXtst gtk2 gtk3 qt4 qt5.qtbase libchewing anthy ];
preConfigure = "patchShebangs configure";
configureFlags = [ "--disable-lib64" "--disable-qt5-immodule" ];
dontWrapQtApps = true;
postFixup = ''
hime_rpath=$(patchelf --print-rpath $out/bin/hime)
patchelf --set-rpath $out/lib/hime:$hime_rpath $out/bin/hime
'';
meta = with lib; {
homepage = "http://hime-ime.github.io/";

View file

@ -0,0 +1,89 @@
{ lib
, stdenv
, fetchFromGitLab
, wrapGAppsHook
, makeWrapper
, pkg-config
, meson
, ninja
, cmake
, gobject-introspection
, desktop-file-utils
, python3
, gtk3
, libdazzle
, libappindicator-gtk3
, libnotify
, nvidia_x11
}:
let
pythonEnv = python3.withPackages (pypkgs: with pypkgs; [
injector
matplotlib
peewee
pynvml
pygobject3
xlib
pyxdg
requests
rx
gtk3
]);
in stdenv.mkDerivation rec {
pname = "gwe";
version = "0.15.3";
src = fetchFromGitLab {
owner = "leinardi";
repo = pname;
rev = version;
sha256 = "1znd2g02j0klg8w6cgwvaxc8anan6sidadknl0vh9jxmzz75xp9z";
};
prePatch = ''
patchShebangs scripts/{make_local_manifest,meson_post_install}.py
substituteInPlace gwe/repository/nvidia_repository.py \
--replace "from py3nvml import py3nvml" "import pynvml" \
--replace "py3nvml.py3nvml" "pynvml" \
--replace "py3nvml" "pynvml"
'';
nativeBuildInputs = [
wrapGAppsHook
pkg-config
meson
ninja
cmake
gobject-introspection
desktop-file-utils
pythonEnv
];
buildInputs = [
gtk3
libdazzle
libappindicator-gtk3
libnotify
];
postInstall = ''
mv $out/bin/gwe $out/lib/gwe-bin
makeWrapper ${pythonEnv}/bin/python $out/bin/gwe \
--add-flags "$out/lib/gwe-bin" \
--prefix LD_LIBRARY_PATH : "/run/opengl-driver/lib" \
--prefix PATH : "${builtins.concatStringsSep ":" [ (lib.makeBinPath [ nvidia_x11 nvidia_x11.settings ]) "/run/wrappers/bin" ]}" \
--unset "SHELL" \
''${gappsWrapperArgs[@]}
'';
meta = with lib; {
description = "System utility designed to provide information, control the fans and overclock your NVIDIA card";
homepage = "https://gitlab.com/leinardi/gwe";
platforms = platforms.linux;
license = licenses.gpl3Only;
maintainers = [ maintainers.ivar ];
};
}

View file

@ -2,33 +2,30 @@
stdenv.mkDerivation rec {
pname = "spiped";
version = "1.5.0";
version = "1.6.1";
src = fetchurl {
url = "https://www.tarsnap.com/spiped/${pname}-${version}.tgz";
sha256 = "1mxcbxifr3bnj6ga8lz88y4bhff016i6kjdzwbb3gzb2zcs4pxxj";
sha256 = "8d7089979db79a531a0ecc507b113ac6f2cf5f19305571eff1d3413e0ab33713";
};
buildInputs = [ openssl ];
patchPhase = ''
postPatch = ''
substituteInPlace libcperciva/cpusupport/Build/cpusupport.sh \
--replace "dirname" "${coreutils}/bin/dirname" \
--replace "2>/dev/null" "2>stderr.log"
substituteInPlace POSIX/posix-l.sh \
substituteInPlace libcperciva/POSIX/posix-l.sh \
--replace "rm" "${coreutils}/bin/rm" \
--replace ">/dev/stderr" ">stderr.log" \
--replace "2>/dev/null" "2>stderr.log"
substituteInPlace POSIX/posix-cflags.sh \
--replace "rm" "${coreutils}/bin/rm" \
--replace ">/dev/stderr" ">stderr.log" \
--replace "2>/dev/null" "2>stderr.log"
'';
'';
installPhase = ''
runHook preInstall
mkdir -p $out/bin $out/share/man/man1
make install BINDIR=$out/bin MAN1DIR=$out/share/man/man1
runHook postInstall
'';
meta = {

View file

@ -93,14 +93,12 @@ common =
patchelf --set-rpath $out/lib:${stdenv.cc.cc.lib}/lib $out/lib/libboost_thread.so.*
''}
'' +
# On all versions before c9f51e87057652db0013289a95deffba495b35e7,
# released with 2.3.8, we need to patch around an issue where the Nix
# configure step pulls in the build system's bash and other utilities
# when cross-compiling.
# On all versions before c9f51e87057652db0013289a95deffba495b35e7, which
# removes config.nix entirely and is not present in 2.3.x, we need to
# patch around an issue where the Nix configure step pulls in the build
# system's bash and other utilities when cross-compiling.
lib.optionalString (
stdenv.buildPlatform != stdenv.hostPlatform &&
(lib.versionOlder "2.3.8" version && !is24)
# The additional is24 condition is required as versionOlder doesn't understand nixUnstable version strings
stdenv.buildPlatform != stdenv.hostPlatform && !is24
) ''
mkdir tmp/
substitute corepkgs/config.nix.in tmp/config.nix.in \

View file

@ -1,18 +1,22 @@
{ lib, stdenv, fetchFromGitHub
, curl, findutils, gnugrep, gnused }:
, curl, findutils, gnugrep, gnused, shellcheck }:
stdenv.mkDerivation rec {
let
pname = "pass-checkup";
version = "0.2.0";
version = "0.2.1";
in stdenv.mkDerivation {
inherit pname version;
src = fetchFromGitHub {
owner = "etu";
repo = "pass-checkup";
repo = pname;
rev = version;
sha256 = "17fyf8zj535fg43yddjww1jhxfb3nbdkn622wjxaai2nf46jzh7y";
sha256 = "18b6rx59r7g0hvqs2affvw0g0jyifyzhanwgz2q2b8nhjgqgnar2";
};
patchPhase = ''
nativeBuildInputs = [ shellcheck ];
postPatch = ''
substituteInPlace checkup.bash \
--replace curl ${curl}/bin/curl \
--replace find ${findutils}/bin/find \
@ -21,13 +25,17 @@ stdenv.mkDerivation rec {
'';
installPhase = ''
runHook preInstall
install -D -m755 checkup.bash $out/lib/password-store/extensions/checkup.bash
runHook postInstall
'';
meta = with lib; {
description = "A pass extension to check against the Have I been pwned API to see if your passwords are publicly leaked or not";
homepage = "https://github.com/etu/pass-checkup";
license = licenses.gpl3;
license = licenses.gpl3Plus;
maintainers = with maintainers; [ etu ];
platforms = platforms.unix;
};

View file

@ -482,6 +482,7 @@ mapAliases ({
mxisd = throw "mxisd has been removed from nixpkgs as it has reached end of life, see https://github.com/kamax-matrix/mxisd/blob/535e0a5b96ab63cb0ddef90f6f42c5866407df95/EOL.md#end-of-life-notice . ma1sd may be a suitable alternative."; # added 2021-04-15
mysqlWorkbench = mysql-workbench; # added 2017-01-19
nagiosPluginsOfficial = monitoring-plugins;
navit = throw "navit has been removed from nixpkgs, due to being unmaintained"; # added 2021-06-07
ncat = nmap; # added 2016-01-26
netcat-openbsd = libressl.nc; # added 2018-04-25
netease-cloud-music = throw "netease-cloud-music has been removed together with deepin"; # added 2020-08-31

View file

@ -11153,6 +11153,10 @@ in
gprolog = callPackage ../development/compilers/gprolog { };
gwe = callPackage ../tools/misc/gwe {
nvidia_x11 = linuxPackages.nvidia_x11;
};
gwt240 = callPackage ../development/compilers/gwt/2.4.0.nix { };
idrisPackages = dontRecurseIntoAttrs (callPackage ../development/idris-modules {
@ -25667,8 +25671,6 @@ in
navipowm = callPackage ../applications/misc/navipowm { };
navit = libsForQt5.callPackage ../applications/misc/navit { };
netbeans = callPackage ../applications/editors/netbeans {
jdk = jdk11;
};

View file

@ -69,6 +69,7 @@ let
paramcoq = callPackage ../development/coq-modules/paramcoq {};
pocklington = callPackage ../development/coq-modules/pocklington {};
QuickChick = callPackage ../development/coq-modules/QuickChick {};
reglang = callPackage ../development/coq-modules/reglang {};
relation-algebra = callPackage ../development/coq-modules/relation-algebra {};
simple-io = callPackage ../development/coq-modules/simple-io { };
stdpp = callPackage ../development/coq-modules/stdpp { };

View file

@ -23939,6 +23939,21 @@ let
};
};
XSParseKeyword = buildPerlModule {
pname = "XS-Parse-Keyword";
version = "0.06";
src = fetchurl {
url = "mirror://cpan/authors/id/P/PE/PEVANS/XS-Parse-Keyword-0.06.tar.gz";
sha256 = "0nnr8akkxb2h2y3d5r51pr84vvxkq89ynmi9azkbnn79jmbcbgvq";
};
perlPreHook = lib.optionalString stdenv.isDarwin "export LD=$CC";
meta = {
description = "XS functions to assist in parsing keyword syntax";
license = with lib.licenses; [ artistic1 gpl1Plus ];
maintainers = [ maintainers.zakame ];
};
};
XSParseSublike = buildPerlModule {
pname = "XS-Parse-Sublike";
version = "0.10";

View file

@ -3400,6 +3400,8 @@ in {
iniparse = callPackage ../development/python-modules/iniparse { };
injector = callPackage ../development/python-modules/injector { };
inotify-simple = callPackage ../development/python-modules/inotify-simple { };
inquirer = callPackage ../development/python-modules/inquirer { };