diff --git a/nixos/doc/manual/release-notes/rl-2105.xml b/nixos/doc/manual/release-notes/rl-2105.xml index bdc2386f24c8..54abbb6e38e4 100644 --- a/nixos/doc/manual/release-notes/rl-2105.xml +++ b/nixos/doc/manual/release-notes/rl-2105.xml @@ -181,15 +181,6 @@ GNOME desktop environment was upgraded to 40, see the release notes for 40.0 and 3.38. The gnome3 attribute set has been renamed to gnome and so have been the NixOS options. - - - Enabling wireless networking now requires specifying at least one network - interface using . - This is to avoid a race condition with the card initialisation (see - issue - #101963 for more information). - - If you are using to assign diff --git a/nixos/modules/services/network-filesystems/davfs2.nix b/nixos/modules/services/network-filesystems/davfs2.nix index 4b6f85e4a2c9..8cf314fe63a5 100644 --- a/nixos/modules/services/network-filesystems/davfs2.nix +++ b/nixos/modules/services/network-filesystems/davfs2.nix @@ -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"; + }; + }; } diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix index 135f29be58c0..064018057cdb 100644 --- a/nixos/modules/services/networking/networkmanager.nix +++ b/nixos/modules/services/networking/networkmanager.nix @@ -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 + + https://developer.gnome.org/NetworkManager/stable/NetworkManager.conf.html#id-1.2.3.11 + + or + + NetworkManager.conf + 5 + + 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" ]; diff --git a/nixos/modules/services/networking/wpa_supplicant.nix b/nixos/modules/services/networking/wpa_supplicant.nix index d9308b37064a..c0a4ce40760a 100644 --- a/nixos/modules/services/networking/wpa_supplicant.nix +++ b/nixos/modules/services/networking/wpa_supplicant.nix @@ -40,7 +40,13 @@ in { default = []; example = [ "wlan0" "wlan1" ]; description = '' - The interfaces wpa_supplicant will use. + The interfaces wpa_supplicant will use. If empty, it will + automatically use all wireless interfaces. + + 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. + ''; }; @@ -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 ''; }; diff --git a/pkgs/applications/blockchains/chia/default.nix b/pkgs/applications/blockchains/chia/default.nix index 09fe6d1b2ddd..22bb3d445ada 100644 --- a/pkgs/applications/blockchains/chia/default.nix +++ b/pkgs/applications/blockchains/chia/default.nix @@ -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 diff --git a/pkgs/applications/editors/edbrowse/0001-small-fixes.patch b/pkgs/applications/editors/edbrowse/0001-small-fixes.patch new file mode 100644 index 000000000000..433b884cc5de --- /dev/null +++ b/pkgs/applications/editors/edbrowse/0001-small-fixes.patch @@ -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 + diff --git a/pkgs/applications/editors/edbrowse/default.nix b/pkgs/applications/editors/edbrowse/default.nix index 86cc81a58c26..5b37b86556b7 100644 --- a/pkgs/applications/editors/edbrowse/default.nix +++ b/pkgs/applications/editors/edbrowse/default.nix @@ -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 diff --git a/pkgs/applications/graphics/renderdoc/default.nix b/pkgs/applications/graphics/renderdoc/default.nix index 597bd1f17056..d6a2658d8626 100644 --- a/pkgs/applications/graphics/renderdoc/default.nix +++ b/pkgs/applications/graphics/renderdoc/default.nix @@ -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 = [ diff --git a/pkgs/applications/misc/navit/CMakeLists.txt.patch b/pkgs/applications/misc/navit/CMakeLists.txt.patch deleted file mode 100644 index 7f8a75f319be..000000000000 --- a/pkgs/applications/misc/navit/CMakeLists.txt.patch +++ /dev/null @@ -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) diff --git a/pkgs/applications/misc/navit/default.nix b/pkgs/applications/misc/navit/default.nix deleted file mode 100644 index c041c2969274..000000000000 --- a/pkgs/applications/misc/navit/default.nix +++ /dev/null @@ -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; - }; -} diff --git a/pkgs/applications/misc/xplr/default.nix b/pkgs/applications/misc/xplr/default.nix index 6bd2c60b09b0..fbd48287e32a 100644 --- a/pkgs/applications/misc/xplr/default.nix +++ b/pkgs/applications/misc/xplr/default.nix @@ -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"; diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 252b6272703e..bad5e68ce779 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -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", diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix index f1e23908723a..2c3deff9f15e 100644 --- a/pkgs/applications/networking/cluster/terragrunt/default.nix +++ b/pkgs/applications/networking/cluster/terragrunt/default.nix @@ -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="; diff --git a/pkgs/applications/science/programming/fdr/default.nix b/pkgs/applications/science/programming/fdr/default.nix index 8beecf2def94..62e4c6876fd7 100644 --- a/pkgs/applications/science/programming/fdr/default.nix +++ b/pkgs/applications/science/programming/fdr/default.nix @@ -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; diff --git a/pkgs/build-support/writers/test.nix b/pkgs/build-support/writers/test.nix index 689b45a126ff..d0824b17bd1b 100644 --- a/pkgs/build-support/writers/test.nix +++ b/pkgs/build-support/writers/test.nix @@ -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 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 #include 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 diff --git a/pkgs/development/compilers/acme/default.nix b/pkgs/development/compilers/acme/default.nix index f8731f554718..cebcbf3b2fa5 100644 --- a/pkgs/development/compilers/acme/default.nix +++ b/pkgs/development/compilers/acme/default.nix @@ -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"; diff --git a/pkgs/development/coq-modules/reglang/default.nix b/pkgs/development/coq-modules/reglang/default.nix new file mode 100644 index 000000000000..bc18108264a1 --- /dev/null +++ b/pkgs/development/coq-modules/reglang/default.nix @@ -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; + }; +} diff --git a/pkgs/development/interpreters/quickjs/default.nix b/pkgs/development/interpreters/quickjs/default.nix index ac70a50eaa72..4bc0ec528a01 100644 --- a/pkgs/development/interpreters/quickjs/default.nix +++ b/pkgs/development/interpreters/quickjs/default.nix @@ -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; }; diff --git a/pkgs/development/libraries/intel-media-driver/default.nix b/pkgs/development/libraries/intel-media-driver/default.nix index a782e088820d..37375f52c32e 100644 --- a/pkgs/development/libraries/intel-media-driver/default.nix +++ b/pkgs/development/libraries/intel-media-driver/default.nix @@ -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 = [ diff --git a/pkgs/development/libraries/mvapich/default.nix b/pkgs/development/libraries/mvapich/default.nix index 71c6ce38f952..704a28dbb8cd 100644 --- a/pkgs/development/libraries/mvapich/default.nix +++ b/pkgs/development/libraries/mvapich/default.nix @@ -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; diff --git a/pkgs/development/libraries/zchunk/default.nix b/pkgs/development/libraries/zchunk/default.nix index 2037d815a81b..cf0063f7780d 100644 --- a/pkgs/development/libraries/zchunk/default.nix +++ b/pkgs/development/libraries/zchunk/default.nix @@ -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 = [ diff --git a/pkgs/development/python-modules/chiapos/default.nix b/pkgs/development/python-modules/chiapos/default.nix index 1faf5a94f8cc..e0a86f499a2a 100644 --- a/pkgs/development/python-modules/chiapos/default.nix +++ b/pkgs/development/python-modules/chiapos/default.nix @@ -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 = [ diff --git a/pkgs/development/python-modules/defusedxml/default.nix b/pkgs/development/python-modules/defusedxml/default.nix index c39ca96bfe17..6ac1bab0845e 100644 --- a/pkgs/development/python-modules/defusedxml/default.nix +++ b/pkgs/development/python-modules/defusedxml/default.nix @@ -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; diff --git a/pkgs/development/python-modules/injector/default.nix b/pkgs/development/python-modules/injector/default.nix new file mode 100644 index 000000000000..921db5d1a877 --- /dev/null +++ b/pkgs/development/python-modules/injector/default.nix @@ -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; + }; +} diff --git a/pkgs/development/python-modules/ipdb/default.nix b/pkgs/development/python-modules/ipdb/default.nix index fbdfd5b7900a..b34aa13bbcfc 100644 --- a/pkgs/development/python-modules/ipdb/default.nix +++ b/pkgs/development/python-modules/ipdb/default.nix @@ -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 = '' diff --git a/pkgs/development/python-modules/pymfy/default.nix b/pkgs/development/python-modules/pymfy/default.nix index 32483eea7b9a..2c17c0a085d9 100644 --- a/pkgs/development/python-modules/pymfy/default.nix +++ b/pkgs/development/python-modules/pymfy/default.nix @@ -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 ]; diff --git a/pkgs/development/python-modules/python-velbus/default.nix b/pkgs/development/python-modules/python-velbus/default.nix index a02edfdc1f6d..c83ff853f1d5 100644 --- a/pkgs/development/python-modules/python-velbus/default.nix +++ b/pkgs/development/python-modules/python-velbus/default.nix @@ -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; { diff --git a/pkgs/development/tools/build-managers/sbt/default.nix b/pkgs/development/tools/build-managers/sbt/default.nix index 7b9c6bca7e2b..89628b81fbc2 100644 --- a/pkgs/development/tools/build-managers/sbt/default.nix +++ b/pkgs/development/tools/build-managers/sbt/default.nix @@ -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 = '' diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/default.nix b/pkgs/development/tools/poetry2nix/poetry2nix/default.nix index 712baf613e4e..3971a7631d46 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/default.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/default.nix @@ -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 diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix b/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix index 193e44935b42..b403e9941f34 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix @@ -89,7 +89,7 @@ pythonPackages.callPackage # Prevent infinite recursion skipSetupToolsSCM = [ - "setuptools-scm" + "setuptools_scm" "setuptools-scm" "toml" # Toml is an extra for setuptools-scm ]; diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix b/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix index ea0045c11474..787513855772 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix @@ -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 </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 = { diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 5f139a1b3b9d..a7b3d12f7a5d 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -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 \ diff --git a/pkgs/tools/security/pass/extensions/checkup.nix b/pkgs/tools/security/pass/extensions/checkup.nix index bafaabba843b..5ae846d4a4b3 100644 --- a/pkgs/tools/security/pass/extensions/checkup.nix +++ b/pkgs/tools/security/pass/extensions/checkup.nix @@ -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; }; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 89553642a2da..9415b6e24ae4 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fd11cbe84f32..5fa82bdb0c4a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11160,6 +11160,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 { @@ -25676,8 +25680,6 @@ in navipowm = callPackage ../applications/misc/navipowm { }; - navit = libsForQt5.callPackage ../applications/misc/navit { }; - netbeans = callPackage ../applications/editors/netbeans { jdk = jdk11; }; diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix index bd957bdb49d5..1ac8c4c40057 100644 --- a/pkgs/top-level/coq-packages.nix +++ b/pkgs/top-level/coq-packages.nix @@ -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 { }; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 1f8517a288a7..39a21cdbab16 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -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"; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c6d4128719f9..98d76bd20be6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -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 { };