Merge master into staging-next

maintainers/maintainer-list.nix

@@ -5696,6 +5696,12 @@
     githubId = 2971615;
     name = "Marius Bergmann";
   };
+  mcaju = {
+    email = "cajum.bugs@yandex.com";
+    github = "CajuM";
+    githubId = 10420834;
+    name = "Mihai-Drosi Caju";
+  };
   mcbeth = {
     email = "mcbeth@broggs.org";
     github = "mcbeth";
@@ -7003,6 +7009,12 @@
     githubId = 28323;
     name = "Peter Simons";
   };
+  petterstorvik = {
+    email = "petterstorvik@gmail.com";
+    github = "storvik";
+    githubId = 3438604;
+    name = "Petter Storvik";
+  };
   philandstuff = {
     email = "philip.g.potter@gmail.com";
     github = "philandstuff";
@@ -7575,6 +7587,12 @@
     githubId = 395821;
     name = "rht";
   };
+  rhoriguchi = {
+    email = "ryan.horiguchi@gmail.com";
+    github = "rhoriguchi ";
+    githubId = 6047658;
+    name = "Ryan Horiguchi";
+  };
   richardipsum = {
     email = "richardipsum@fastmail.co.uk";
     github = "richardipsum";

nixos/maintainers/scripts/ec2/create-amis.sh

@@ -219,7 +219,7 @@ upload_image() {
         log "Registering snapshot $snapshot_id as AMI"
 
         local block_device_mappings=(
-            "DeviceName=/dev/xvda,Ebs={SnapshotId=$snapshot_id,VolumeSize=$image_logical_gigabytes,DeleteOnTermination=true,VolumeType=gp2}"
+            "DeviceName=/dev/xvda,Ebs={SnapshotId=$snapshot_id,VolumeSize=$image_logical_gigabytes,DeleteOnTermination=true,VolumeType=gp3}"
         )
 
         local extra_flags=(

pkgs/applications/video/sub-batch/default.nix

@@ -0,0 +1,27 @@
+{ stdenv
+, fetchFromGitHub
+, rustPlatform
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "sub-batch";
+  version = "0.3.0";
+
+  src = fetchFromGitHub {
+    owner = "kl";
+    repo = pname;
+    # Upstream doesn't tag releases.
+    rev = "631bd6e2d931f8a8e12798f4b6460739a14bcfff";
+    sha256 = "sha256-424e40v2LBxlmgDKxvsT/iuUn/IKWPKMwih0cSQ5sFE=";
+  };
+
+  cargoSha256 = "sha256-l+BTF9PGb8bG8QHhNCoBsrsVX8nlRjPlaea1ESFfMW0=";
+
+  meta = with stdenv.lib; {
+    description = "Match and rename subtitle files to video files and perform other batch operations on subtitle files";
+    homepage = "https://github.com/kl/sub-batch";
+    license = licenses.mit;
+    maintainers = with maintainers; [ erictapen ];
+    broken = stdenv.isDarwin;
+  };
+}

pkgs/data/misc/prjxray-db/default.nix

@@ -0,0 +1,43 @@
+{ stdenv
+, fetchFromGitHub
+}:
+
+stdenv.mkDerivation rec {
+  pname   = "prjxray-db";
+  version = "0.0-0232-g303a61d";
+
+  src = fetchFromGitHub {
+    owner  = "SymbiFlow";
+    repo   = "prjxray-db";
+    rev    = "303a61d8bc552f7a533b91b17448c59e908aa391";
+    sha256 = "0r75xig16dbgh3nfygggir0a160x52y766h7hd9xcib9m88jixb2";
+  };
+
+  enableParallelBuilding = true;
+
+  installPhase = ''
+    runHook preInstall
+
+    DBDIR="$out/share/symbiflow/prjxray-db/"
+    DB_CONFIG="$out/bin/prjxray-config"
+
+    mkdir -p $DBDIR $out/bin
+
+    for device in artix7 kintex7 zynq7; do
+      cp -r $src/$device $DBDIR
+    done
+
+    echo -e "#!/bin/sh\n\necho $DBDIR" > $DB_CONFIG
+    chmod +x $DB_CONFIG
+
+    runHook postInstall
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Project X-Ray - Xilinx Series 7 Bitstream Documentation";
+    homepage    = "https://github.com/SymbiFlow/prjxray-db";
+    license     = licenses.cc0;
+    maintainers = with maintainers; [ mcaju ];
+    platforms   = platforms.all;
+  };
+}

pkgs/data/misc/symbiflow-arch-defs/default.nix

@@ -0,0 +1,47 @@
+{ stdenv
+, fetchurl
+, autoPatchelfHook
+, python3Packages
+, archs ? [ "xc7a100t" "xc7a50t" "xc7z010" "xc7z020" ]
+}:
+
+stdenv.mkDerivation rec {
+  pname   = "symbiflow-arch-defs";
+  version = "20200914-111752-g05d68df0";
+
+  src = fetchurl {
+    url = "https://storage.googleapis.com/symbiflow-arch-defs/artifacts/prod/foss-fpga-tools/symbiflow-arch-defs/continuous/install/66/20200914-111752/symbiflow-arch-defs-install-05d68df0.tar.xz";
+    sha256 = "1gmynybh8n33ag521w17c2kd16n834hqc6d8hi2pfs5kg1jl1a74";
+  };
+
+  sourceRoot = ".";
+
+  propagatedBuildInputs = [
+    python3Packages.lxml
+    python3Packages.python-constraint
+  ];
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp -r bin/{symbiflow_*,vpr_common,python} $out/bin
+    for script in $out/bin/symbiflow_*; do
+        substituteInPlace $script --replace '/env' '/symbiflow_env'
+    done
+    cp bin/env $out/bin/symbiflow_env
+
+    mkdir -p $out/share/symbiflow/arch
+    cp -r share/symbiflow/{scripts,techmaps} $out/share/symbiflow/
+
+    for arch in ${builtins.concatStringsSep " " archs}; do
+        cp -r share/symbiflow/arch/"$arch"_test* $out/share/symbiflow/arch/
+    done
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Project X-Ray - Xilinx Series 7 Bitstream Documentation";
+    homepage    = "https://github.com/SymbiFlow/symbiflow-arch-defs";
+    hydraPlatforms = [];
+    license     = licenses.isc;
+    platforms   = platforms.all;
+  };
+}

pkgs/desktops/gnome-3/extensions/unite-shell/default.nix

@@ -0,0 +1,39 @@
+{ stdenv, gnome3, fetchFromGitHub, xprop, glib, coreutils }:
+stdenv.mkDerivation rec {
+  pname = "gnome-shell-extension-unite-shell";
+  version = "44";
+
+  src = fetchFromGitHub {
+    owner = "hardpixel";
+    repo = "unite-shell";
+    rev = "v${version}";
+    sha256 = "0nqc1q2yz4xa3fdfx45w6da1wijmdwzhdrch0mqwblgbpjr4fs9g";
+  };
+
+  uuid = "unite@hardpixel.eu";
+
+  nativeBuildInputs = [ glib ];
+
+  buildInputs = [ xprop ];
+
+  buildPhase = ''
+    runHook preBuild
+    glib-compile-schemas --strict --targetdir=${uuid}/schemas/ ${uuid}/schemas
+    runHook postBuild
+  '';
+
+  installPhase = ''
+    runHook preInstall
+    mkdir -p $out/share/gnome-shell/extensions
+    cp -r ${uuid} $out/share/gnome-shell/extensions
+    runHook postInstall
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Unite is a GNOME Shell extension which makes a few layout tweaks to the top panel and removes window decorations to make it look like Ubuntu Unity Shell";
+    license = licenses.gpl3Only;
+    maintainers = with maintainers; [ rhoriguchi ];
+    homepage = "https://github.com/hardpixel/unite-shell";
+    broken = versionOlder gnome3.gnome-shell.version "3.32";
+  };
+}

pkgs/development/compilers/prjxray-tools/default.nix

@@ -0,0 +1,29 @@
+{ stdenv
+, fetchFromGitHub
+, cmake
+}:
+
+stdenv.mkDerivation rec {
+  pname   = "prjxray-tools";
+  version = "0.1-2676-gac8d30e3";
+
+  src = fetchFromGitHub {
+    owner  = "SymbiFlow";
+    repo   = "prjxray";
+    fetchSubmodules = true;
+    rev    = "ac8d30e3fe2029122408888d2313844b3e0c265b";
+    sha256 = "1ag7dk12hdhip821crwinncp8vgyzs0r85l1h2vbgn61lnxc7f4h";
+  };
+
+  nativeBuildInputs = [ cmake ];
+
+  doCheck = true;
+
+  meta = with stdenv.lib; {
+    description = "Documenting the Xilinx 7-series bit-stream format";
+    homepage    = "https://github.com/SymbiFlow/prjxray";
+    license     = licenses.isc;
+    platforms   = platforms.all;
+    maintainers = with maintainers; [ mcaju ];
+  };
+}

pkgs/development/compilers/symbiflow-vtr/default.nix

@@ -0,0 +1,40 @@
+{ stdenv
+, fetchFromGitHub
+, bison
+, cmake
+, flex
+, pkg-config
+}:
+
+stdenv.mkDerivation rec {
+  pname   = "symbiflow-vtr";
+  version = "8.0.0.rc2-4003-g8980e4621";
+
+  src = fetchFromGitHub {
+    owner  = "SymbiFlow";
+    repo   = "vtr-verilog-to-routing";
+    rev    = "8980e46218542888fac879961b13aa7b0fba8432";
+    sha256 = "1sq7f1f3dzfm48a9vq5nvp0zllby0nasm3pvqab70f4jaq0m1aaa";
+  };
+
+  nativeBuildInputs = [
+    bison
+    cmake
+    flex
+    pkg-config
+  ];
+
+  cmakeFlags = [
+    "-DWITH_ODIN=OFF"
+    "-DWITH_ABC=OFF"
+  ];
+
+  doCheck = true;
+
+  meta = with stdenv.lib; {
+    description = "SymbiFlow WIP changes for Verilog to Routing (VTR)";
+    homepage    = "https://github.com/SymbiFlow/vtr-verilog-to-routing";
+    platforms   = platforms.all;
+    maintainers = with maintainers; [ mcaju ];
+  };
+}

pkgs/development/compilers/symbiflow-yosys-plugins/default.nix

@@ -0,0 +1,37 @@
+{ stdenv
+, fetchFromGitHub
+, symbiflow-yosys
+, zlib
+, readline
+}:
+
+stdenv.mkDerivation rec {
+  pname   = "symbiflow-yosys-plugins";
+  version = "1.0.0.7-0060-g7454cd6b";
+
+  src = fetchFromGitHub {
+    owner  = "SymbiFlow";
+    repo   = "yosys-symbiflow-plugins";
+    rev    = "7454cd6b5e4fd22854e2ada219a5e3c3a06e0717";
+    sha256 = "0r9r31p7fy4ylfrwvwlbivq5a03xrph34blxbxzx2c8bc02mbv0s";
+  };
+
+  enableParallelBuilding = true;
+
+  nativeBuildInputs = [ symbiflow-yosys ];
+
+  buildInputs = [
+    readline
+    zlib
+  ];
+
+  makeFlags = [ "PLUGINS_DIR=${placeholder "out"}/share/yosys/plugins" ];
+
+  meta = with stdenv.lib; {
+    description = "Yosys SymbiFlow Plugins";
+    homepage    = "https://github.com/SymbiFlow/yosys-symbiflow-plugins";
+    license     = licenses.isc;
+    platforms   = platforms.all;
+    maintainers = with maintainers; [ mcaju ];
+  };
+}

pkgs/development/compilers/symbiflow-yosys/default.nix

@@ -0,0 +1,37 @@
+{ stdenv
+, abc-verifier
+, fetchFromGitHub
+, yosys
+, plugins ? []
+}:
+
+let
+  localAbc-verifier = abc-verifier.overrideAttrs (_: rec {
+    pname = "abc-verifier";
+    version = "2020.06.22";
+
+    src = fetchFromGitHub {
+      owner  = "YosysHQ";
+      repo   = "abc";
+      rev    = "341db25668f3054c87aa3372c794e180f629af5d";
+      sha256 = "14cgv34vz5ljkcms6nrv19vqws2hs8bgjgffk5q03cbxnm2jxv5s";
+    };
+
+    passthru.rev = src.rev;
+  });
+in
+
+(yosys.overrideAttrs (oldAttrs: rec {
+  pname   = "symbiflow-yosys";
+  version = "0.9+2406";
+
+  src = fetchFromGitHub {
+    owner  = "SymbiFlow";
+    repo   = "yosys";
+    rev    = "d8b2d1a2b1a93057678cf49bb8f0329f191faba1";
+    sha256 = "1w8jnqzabvzixjllhb6ak2n2gmjvsn6qd996i7z70bsq5rgdkq9g";
+  };
+})).override {
+  abc-verifier = localAbc-verifier;
+  plugins = plugins;
+}

pkgs/development/compilers/yosys/default.nix

@@ -5,13 +5,14 @@
 , fetchFromGitHub
 , flex
 , libffi
-, pkgconfig
+, pkg-config
 , protobuf
 , python3
 , readline
 , tcl
 , verilog
 , zlib
+, plugins ? []
 }:
 
 # NOTE: as of late 2020, yosys has switched to an automation robot that
@@ -32,6 +33,8 @@
 # ultimately less confusing than using dates.
 
 stdenv.mkDerivation rec {
+  inherit plugins;
+
   pname   = "yosys";
   version = "0.9+3830";
 
@@ -43,21 +46,16 @@ stdenv.mkDerivation rec {
   };
 
   enableParallelBuilding = true;
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ tcl readline libffi python3 bison flex protobuf zlib ];
+  nativeBuildInputs = [ pkg-config protobuf flex bison python3 ];
+  buildInputs = [ tcl readline libffi python3 protobuf zlib ];
 
   makeFlags = [ "ENABLE_PROTOBUF=1" "PREFIX=${placeholder "out"}"];
 
   patchPhase = ''
     substituteInPlace ./Makefile \
-      --replace 'CXX = clang' "" \
-      --replace 'LD = clang++' 'LD = $(CXX)' \
-      --replace 'CXX = gcc' "" \
-      --replace 'LD = gcc' 'LD = $(CXX)' \
-      --replace 'ABCMKARGS = CC="$(CXX)" CXX="$(CXX)"' 'ABCMKARGS =' \
       --replace 'echo UNKNOWN' 'echo ${builtins.substring 0 10 src.rev}'
-    substituteInPlace ./misc/yosys-config.in \
-      --replace '/bin/bash' '${bash}/bin/bash'
+    chmod +x ./misc/yosys-config.in
+    patchShebangs ./misc/yosys-config.in
     patchShebangs tests
   '';
 
@@ -76,8 +74,8 @@ stdenv.mkDerivation rec {
       exit 1
     fi
 
-    if ! grep -q "YOSYS_VER := ${version}" Makefile; then
-      echo "ERROR: yosys version in Makefile isn't equivalent to version of the nix package (${version}), failing."
+    if ! grep -q "YOSYS_VER := $version" Makefile; then
+      echo "ERROR: yosys version in Makefile isn't equivalent to version of the nix package ($version), failing."
       exit 1
     fi
   '';
@@ -94,7 +92,14 @@ stdenv.mkDerivation rec {
   # add a symlink to fake things so that both variants work the same way. this
   # is also needed at build time for the test suite.
   postBuild   = "ln -sfv ${abc-verifier}/bin/abc ./yosys-abc";
-  postInstall = "ln -sfv ${abc-verifier}/bin/abc $out/bin/yosys-abc";
+  postInstall = ''
+    ln -sfv ${abc-verifier}/bin/abc $out/bin/yosys-abc
+
+    mkdir -p $out/share/yosys/plugins
+    for plugin in $plugins; do
+        ln -sfv $plugin/share/yosys/plugins/* $out/share/yosys/plugins/
+    done
+  '';
 
   meta = with stdenv.lib; {
     description = "Open RTL synthesis framework and tools";

pkgs/development/libraries/gensio/default.nix

@@ -1,21 +1,42 @@
-{ stdenv, lib, fetchFromGitHub, autoreconfHook }:
+{ autoreconfHook
+, fetchFromGitHub
+, fetchpatch
+, lib
+, nix-update-script
+, pkg-config
+, stdenv
+}:
 
 stdenv.mkDerivation rec {
   pname = "gensio";
-  version = "2.1.7";
+  version = "2.2.1";
 
   src = fetchFromGitHub {
     owner = "cminyard";
     repo = pname;
     rev = "v${version}";
-    sha256 = "07m8rbdk05biarc9xskwcx9lghj0dff1msxasfc6hi3jywc3xaih";
+    sha256 = "083khzvyvcgi9j99hbaswglivm9s6dly6spjvisvyacavaybgwgb";
+  };
+
+  patches =  [
+    # Fix compilation without openipmi, can be dropped for the next release.
+    (fetchpatch {
+      url = "https://github.com/cminyard/gensio/commit/12f6203e6f7aa42172177d7b0870777b605af8d9.patch";
+      sha256 = "19dr4iacccc4il3asdxkag6cj2yc4bxd8p451syfxdm6289rwxic";
+    })
+  ];
+
+  passthru = {
+    updateScript = nix-update-script {
+      attrPath = pname;
+    };
   };
 
   configureFlags = [
     "--with-python=no"
   ];
 
-  buildInputs = [ autoreconfHook ];
+  nativeBuildInputs = [ autoreconfHook pkg-config ];
 
   meta = with lib; {
     description = "General Stream I/O";

pkgs/development/python-modules/cloudscraper/default.nix

@@ -0,0 +1,38 @@
+{ lib
+, buildPythonPackage
+, isPy3k
+, fetchPypi
+, requests
+, requests-toolbelt
+, pyparsing
+}:
+
+buildPythonPackage rec {
+  pname = "cloudscraper";
+  version = "1.2.52";
+  disabled = !isPy3k;
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "07j2nhzimzhcskj2wpxpvpb3dhpci19daw02r2ckkjiq3zifhm6v";
+  };
+
+  propagatedBuildInputs = [
+    requests
+    requests-toolbelt
+    pyparsing
+  ];
+
+  # The tests require several other dependencies, some of which aren't in
+  # nixpkgs yet, and also aren't included in the PyPI bundle.  TODO.
+  doCheck = false;
+
+  pythonImportsCheck = [ "cloudscraper" ];
+
+  meta = with lib; {
+    description = "A Python module to bypass Cloudflare's anti-bot page";
+    homepage = https://github.com/venomous/cloudscraper;
+    license = licenses.mit;
+    maintainers = with maintainers; [ kini ];
+  };
+}

pkgs/development/python-modules/johnnycanencrypt/default.nix

@@ -0,0 +1,92 @@
+{ stdenv
+, rustPlatform
+, fetchFromGitHub
+, pipInstallHook
+, llvmPackages
+, pkg-config
+, maturin
+, pcsclite
+, nettle
+, python
+, requests
+, vcrpy
+, numpy
+, pytestCheckHook
+, pythonOlder
+, PCSC
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "johnnycanencrypt";
+  version = "0.5.0";
+  disabled = pythonOlder "3.7";
+
+  src = fetchFromGitHub {
+    owner = "kushaldas";
+    repo = "johnnycanencrypt";
+    rev = "v${version}";
+    sha256 = "192wfrlyylrpzq70yki421mi1smk8q2cyki2a1d03q7h6apib3j4";
+  };
+  cargoPatches = [ ./Cargo.lock.patch ];
+
+  cargoSha256 = "0ifvpdizcdp2c5x2x2j1bhhy5a75q0pk7a63dmh52mlpmh45fy6r";
+
+  LIBCLANG_PATH = llvmPackages.libclang + "/lib";
+
+  propagatedBuildInputs = [
+    requests
+    vcrpy
+  ];
+
+  nativeBuildInputs = [
+    llvmPackages.clang
+    pkg-config
+    python
+    maturin
+    pipInstallHook
+  ];
+
+  buildInputs = [
+    pcsclite
+    nettle
+  ] ++ stdenv.lib.optionals stdenv.isDarwin [ PCSC ];
+
+  # Needed b/c need to check AFTER python wheel is installed (using Rust Build, not buildPythonPackage)
+  doCheck = false;
+  doInstallCheck = true;
+
+  installCheckInputs = [
+    pytestCheckHook
+    numpy
+  ];
+
+  buildPhase = ''
+    runHook preBuild
+    maturin build --release --manylinux off --strip --cargo-extra-args="-j $NIX_BUILD_CORES --frozen"
+    runHook postBuild
+  '';
+
+  installPhase = ''
+    install -Dm644 -t dist target/wheels/*.whl
+    pipInstallPhase
+  '';
+
+  preCheck = ''
+    export TESTDIR=$(mktemp -d)
+    cp -r tests/ $TESTDIR
+    pushd $TESTDIR
+  '';
+
+  postCheck = ''
+    popd
+  '';
+
+  pythonImportsCheck = [ "johnnycanencrypt" ];
+
+  meta = with stdenv.lib; {
+    homepage = "https://github.com/kushaldas/johnnycanencrypt";
+    description = "Python module for OpenPGP written in Rust";
+    license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ _0x4A6F ];
+  };
+}

pkgs/development/python-modules/python-prjxray/default.nix

@@ -0,0 +1,44 @@
+{ stdenv
+, fetchFromGitHub
+, pkgs
+, buildPythonPackage
+, intervaltree
+, numpy
+, openpyxl
+, parse
+, progressbar
+, pyjson5
+, pyyaml
+, simplejson
+, symbiflow-fasm
+, textx
+}:
+
+buildPythonPackage rec {
+  pname = "python-prjxray";
+  version = pkgs.prjxray-tools.version;
+
+  src = pkgs.prjxray-tools.src;
+
+  propagatedBuildInputs = [
+    intervaltree
+    numpy
+    openpyxl
+    parse
+    progressbar
+    pyjson5
+    pyyaml
+    simplejson
+    symbiflow-fasm
+    textx
+  ];
+
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    description = "Documenting the Xilinx 7-series bit-stream format";
+    homepage    = "https://github.com/SymbiFlow/prjxray";
+    license     = licenses.isc;
+    maintainers = with maintainers; [ mcaju ];
+  };
+}

pkgs/development/python-modules/symbiflow-fasm/default.nix

@@ -0,0 +1,27 @@
+{ stdenv
+, pkgs
+, fetchFromGitHub
+, buildPythonPackage
+, textx
+}:
+
+buildPythonPackage rec {
+  pname = "symbiflow-fasm";
+  version = "0.0.1-g4857dde";
+
+  src = fetchFromGitHub {
+    owner = "SymbiFlow";
+    repo = "fasm";
+    rev = "4857dde757edd88688c2faf808774d85bdbe3900";
+    sha256 = "1za7f8slf8wvp1mfbfc3vdv61115p49k0vwngs4db6ips1qg1435";
+  };
+
+  propagatedBuildInputs = [ textx ];
+
+  meta = with stdenv.lib; {
+    description = "FPGA Assembly (FASM) Parser and Generation library";
+    homepage = "https://github.com/SymbiFlow/fasm";
+    license = licenses.isc;
+    maintainers = with maintainers; [ mcaju ];
+  };
+}

pkgs/development/python-modules/textx/default.nix

@@ -0,0 +1,36 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, pytestCheckHook
+, arpeggio
+, click
+, jinja2
+}:
+
+buildPythonPackage rec {
+  pname = "textX";
+  version = "2.2.0";
+
+  src = fetchPypi {
+    inherit pname;
+    inherit version;
+    sha256 = "00mwd588ms96qp27m5vpjkzk30wfw53hnmv8y77slxca8lw9vq82";
+  };
+
+  checkInputs = [ pytestCheckHook ];
+
+  pytestFlagsArray = [ "tests/functional" ];
+
+  propagatedBuildInputs = [
+    arpeggio
+    click
+    jinja2
+  ];
+
+  meta = with stdenv.lib; {
+    description = "textX is a meta-language for building Domain-Specific Languages (DSLs) in Python";
+    homepage = "https://textx.github.io";
+    license = licenses.mit;
+    maintainers = with maintainers; [ mcaju ];
+  };
+}

pkgs/development/python-modules/tumpa/default.nix

@@ -0,0 +1,36 @@
+{ stdenv
+, buildPythonPackage
+, fetchFromGitHub
+, setuptools
+, pyside2
+, johnnycanencrypt
+, pythonOlder
+}:
+
+buildPythonPackage rec {
+  pname = "tumpa";
+  version = "0.1.1";
+  disabled = pythonOlder "3.7";
+
+  src = fetchFromGitHub {
+    owner = "kushaldas";
+    repo = "tumpa";
+    rev = "v${version}";
+    sha256 = "1wvs64s0jxn4p8zr643d2hcczw3a175r6ib3481gdhjx38kgxjbq";
+  };
+
+  propagatedBuildInputs = [
+    setuptools
+    johnnycanencrypt
+    pyside2
+  ];
+
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    description = "OpenPGP key creation and smartcard access";
+    homepage = "https://github.com/kushaldas/tumpa";
+    license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ _0x4A6F ];
+  };
+}

pkgs/development/python-modules/xc-fasm/default.nix

@@ -0,0 +1,45 @@
+{ stdenv
+, fetchFromGitHub
+, buildPythonPackage
+, pytestCheckHook
+, simplejson
+, intervaltree
+, python-prjxray
+, symbiflow-fasm
+, textx
+}:
+
+buildPythonPackage rec {
+  pname = "xc-fasm";
+  version = "0.0.1-g0ddd9516";
+
+  src = fetchFromGitHub {
+    owner = "SymbiFlow";
+    repo = "xc-fasm";
+    rev = "0ddd951602d47d5b95f2072f8aa751af5e81e577";
+    sha256 = "15bzw92sx99s0zldr48na4yhrnp7b90nxsd8ya6ag1pvvijp2al4";
+  };
+
+  propagatedBuildInputs = [
+    simplejson
+    intervaltree
+    python-prjxray
+    symbiflow-fasm
+    textx
+  ];
+
+  # Pip will check for and then install missing dependecies.
+  # Because some of them are installed from git, it will try
+  # to download them even if they're present in
+  # propagatedBuildInputs.
+  pipInstallFlags = [ "--no-deps" ];
+
+  checkInputs = [ pytestCheckHook ];
+
+  meta = with stdenv.lib; {
+    description = "XC FASM libraries";
+    homepage = "https://github.com/SymbiFlow/xc-fasm";
+    license = licenses.isc;
+    maintainers = with maintainers; [ mcaju ];
+  };
+}

pkgs/development/tools/clpm/default.nix

@@ -0,0 +1,44 @@
+{ stdenv
+, fetchgit
+, wrapLisp
+, sbcl
+, openssl
+}:
+
+stdenv.mkDerivation rec {
+  pname = "clpm";
+  version = "0.3.5";
+
+  src = fetchgit {
+    url = "https://gitlab.common-lisp.net/clpm/clpm";
+    rev = "v${version}";
+    fetchSubmodules = true;
+    sha256 = "0jivnnp3z148yf4c2nzzr5whz76w5kjhsb97z2vs5maiwf79y2if";
+  };
+
+  buildInputs = [
+    (wrapLisp sbcl)
+    openssl
+  ];
+
+  buildPhase = ''
+    ln -s ${openssl.out}/lib/libcrypto.so.* .
+    ln -s ${openssl.out}/lib/libssl.so.* .
+    common-lisp.sh --script scripts/build.lisp
+  '';
+
+  installPhase = ''
+    INSTALL_ROOT=$out sh install.sh
+  '';
+
+  # fixupPhase results in fatal error in SBCL, `Can't find sbcl.core`
+  dontFixup = true;
+
+  meta = with stdenv.lib; {
+    description = "Common Lisp Package Manager";
+    homepage = "https://www.clpm.dev/";
+    license = licenses.bsd2;
+    maintainers = [ maintainers.petterstorvik ];
+    platforms = platforms.all;
+  };
+}

pkgs/servers/pinnwand/default.nix

@@ -1,4 +1,4 @@
-{ lib, python3, fetchFromGitHub, nixosTests, fetchpatch }:
+{ lib, python3, fetchFromGitHub, nixosTests }:
 
 let
   python = python3.override {
@@ -14,14 +14,14 @@ let
   };
 in with python.pkgs; buildPythonApplication rec {
   pname = "pinnwand";
-  version = "1.2.2";
+  version = "1.2.3";
   format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "supakeen";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0cxdpc3lxgzakzgvdyyrn234380dm05svnwr8av5nrjp4nm9s8z4";
+    sha256 = "1p6agvp136q6km7gjfv8dpjn6x4ap770lqa40ifblyhw13bsrqlh";
   };
 
   nativeBuildInputs = [
@@ -37,19 +37,9 @@ in with python.pkgs; buildPythonApplication rec {
     sqlalchemy
   ];
 
-  checkInputs = [ pytest ];
+  checkInputs = [ pytestCheckHook ];
 
-  checkPhase = ''
-    pytest
-  '';
-
-  patches = [
-    # Use poetry-core instead of poetry. Fixed in 1.2.3
-    (fetchpatch {
-      url = "https://github.com/supakeen/pinnwand/commit/38ff5729c59abb97e4b416d3ca66466528b0eac7.patch";
-      sha256 = "F3cZe29z/7glmS3KWzcfmZnhYmC0LrLLS0zHk7WS2rQ=";
-    })
-  ];
+  __darwinAllowLocalNetworking = true;
 
   passthru.tests = nixosTests.pinnwand;
 

pkgs/servers/pinnwand/steck.nix

@@ -2,11 +2,11 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "steck";
-  version = "0.6.0";
+  version = "0.7.0";
 
   src = python3Packages.fetchPypi {
     inherit pname version;
-    sha256 = "07gc5iwbyprb8nihnjjl2zd06z8p4nl3a3drzh9a8ny35ig1khq0";
+    sha256 = "1a3l427ibwck9zzzy1sp10hmjgminya08i4r9j4559qzy7lxghs1";
   };
 
   propagatedBuildInputs = with python3Packages; [
@@ -19,6 +19,9 @@ python3Packages.buildPythonApplication rec {
     toml
   ];
 
+  # tests are not in pypi package
+  doCheck = false;
+
   passthru.tests = nixosTests.pinnwand;
 
   meta = with lib; {

pkgs/servers/ser2net/default.nix

@@ -1,17 +1,33 @@
-{ stdenv, lib, fetchFromGitHub, gensio, libyaml, autoreconfHook, pkgconfig }:
+{ autoreconfHook
+, fetchFromGitHub
+, gensio
+, lib
+, libyaml
+, nix-update-script
+, pkg-config
+, stdenv
+}:
 
 stdenv.mkDerivation rec {
   pname = "ser2net";
-  version = "4.2.1";
+  version = "4.3.0";
 
   src = fetchFromGitHub {
     owner = "cminyard";
     repo = pname;
     rev = "v${version}";
-    sha256 = "01w82nrgffsfz2c80p4cyppg3bz56d90jm6i6356j0nva3784haw";
+    sha256 = "13zhds3zav03f1snc4bb1j07i2x606bmnqm17yx37frib2hjs4nx";
   };
 
-  buildInputs = [ pkgconfig autoreconfHook gensio libyaml ];
+  passthru = {
+    updateScript = nix-update-script {
+      attrPath = pname;
+    };
+  };
+
+  nativeBuildInputs = [ pkg-config autoreconfHook ];
+
+  buildInputs = [ gensio libyaml ];
 
   meta = with lib; {
     description = "Serial to network connection server";

pkgs/tools/backup/bacula/default.nix

@@ -3,11 +3,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "bacula-9.6.6";
+  pname = "bacula";
+  version = "11.0.0";
 
   src = fetchurl {
-    url    = "mirror://sourceforge/bacula/${name}.tar.gz";
-    sha256 = "10c25igfvff09nz5ll8rxc46f659rnwimj1v9cdhr67lwdswk1k2";
+    url    = "mirror://sourceforge/bacula/${pname}-${version}.tar.gz";
+    sha256 = "JmBTwI/wUEytkhu0SYbTX6/dDQG6xvN2odEYTVpztok=";
   };
 
   buildInputs = [ postgresql sqlite zlib ncurses openssl readline ]
@@ -39,7 +40,7 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     description = "Enterprise ready, Network Backup Tool";
     homepage    = "http://bacula.org/";
-    license     = licenses.gpl2;
+    license     = with licenses; [ agpl3Only bsd2 ];
     maintainers = with maintainers; [ domenkozar lovek323 eleanor ];
     platforms   = platforms.all;
   };

pkgs/tools/misc/vsh/default.nix

@@ -0,0 +1,26 @@
+{ buildGoModule, fetchFromGitHub, lib }:
+
+buildGoModule rec {
+  pname = "vsh";
+  version = "0.7.2";
+
+  src = fetchFromGitHub {
+    owner = "fishi0x01";
+    repo = "vsh";
+    rev = "v${version}";
+    sha256 = "0k9bbfzqhijzimng8plk2xx9h37h7d2wj8g3plvvs3wrf7pmwxs7";
+  };
+
+  # vendor dir is already part of repository
+  vendorSha256 = null;
+
+  # make sure version gets set at compile time
+  buildFlagsArray = [ "-ldflags=-s -w -X main.vshVersion=v${version}" ];
+
+  meta = with lib; {
+    description = "HashiCorp Vault interactive shell";
+    homepage = "https://github.com/fishi0x01/vsh";
+    license = licenses.mit;
+    maintainers = with maintainers; [ fishi0x01 ];
+  };
+}

pkgs/tools/system/inxi/default.nix

@@ -22,13 +22,13 @@ let
     ++ recommendedDisplayInformationPrograms;
 in stdenv.mkDerivation rec {
   pname = "inxi";
-  version = "3.2.01-1";
+  version = "3.2.02-1";
 
   src = fetchFromGitHub {
     owner = "smxi";
     repo = "inxi";
     rev = version;
-    sha256 = "15bakrv3jzj5h88c3bd0cfhh6hb8b4hm79924k1ygn29sqzgyw65";
+    hash = "sha256-+6EURaeN1kJ4X+xdhN8ojuCbcBtxqNksGFEqPhIwCc4=";
   };
 
   buildInputs = [ perl makeWrapper ];

pkgs/tools/text/poedit/default.nix

@@ -1,5 +1,5 @@
-{ lib, stdenv, fetchurl, autoconf, automake, libtool, gettext, pkgconfig, wxGTK30,
-  boost, icu, lucenepp, asciidoc, libxslt, xmlto, gtk2, gtkspell2, pugixml,
+{ lib, stdenv, fetchurl, autoconf, automake, libtool, gettext, pkgconfig, wxGTK30-gtk3,
+  boost, icu, lucenepp, asciidoc, libxslt, xmlto, gtk3, gtkspell3, pugixml,
   nlohmann_json, hicolor-icon-theme, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ autoconf automake asciidoc wrapGAppsHook
     libxslt xmlto boost libtool pkgconfig ];
 
-  buildInputs = [ lucenepp nlohmann_json wxGTK30 icu pugixml gtk2 gtkspell2 hicolor-icon-theme ];
+  buildInputs = [ lucenepp nlohmann_json wxGTK30-gtk3 icu pugixml gtk3 gtkspell3 hicolor-icon-theme ];
 
   propagatedBuildInputs = [ gettext ];
 

pkgs/top-level/all-packages.nix

@@ -10507,6 +10507,12 @@ in
 
   swift = callPackage ../development/compilers/swift { };
 
+  symbiflow-vtr = callPackage ../development/compilers/symbiflow-vtr { };
+
+  symbiflow-yosys = callPackage ../development/compilers/symbiflow-yosys { };
+
+  symbiflow-yosys-plugins = callPackage ../development/compilers/symbiflow-yosys-plugins { };
+
   swiProlog = callPackage ../development/compilers/swi-prolog {
     inherit (darwin.apple_sdk.frameworks) Security;
     jdk = openjdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
@@ -10877,6 +10883,8 @@ in
   polyml56 = callPackage ../development/compilers/polyml/5.6.nix { };
   polyml57 = callPackage ../development/compilers/polyml/5.7.nix { };
 
+  prjxray-tools = callPackage ../development/compilers/prjxray-tools { };
+
   pure = callPackage ../development/interpreters/pure {
     /*llvm = llvm_35;*/
   };
@@ -11506,6 +11514,8 @@ in
 
   cloudfoundry-cli = callPackage ../development/tools/cloudfoundry-cli { };
 
+  clpm = callPackage ../development/tools/clpm {};
+
   coan = callPackage ../development/tools/analysis/coan { };
 
   compile-daemon = callPackage ../development/tools/compile-daemon { };
@@ -16319,6 +16329,8 @@ in
   streamlink = callPackage ../applications/video/streamlink { pythonPackages = python3Packages; };
   streamlink-twitch-gui-bin = callPackage ../applications/video/streamlink-twitch-gui/bin.nix {};
 
+  sub-batch = callPackage ../applications/video/sub-batch { };
+
   subdl = callPackage ../applications/video/subdl { };
 
   subtitleeditor = callPackage ../applications/video/subtitleeditor { enchant = enchant1; };
@@ -20167,6 +20179,8 @@ in
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
+  prjxray-db = callPackage ../data/misc/prjxray-db { };
+
   profont = callPackage ../data/fonts/profont
     { inherit (buildPackages.xorg) mkfontscale; };
 
@@ -20202,6 +20216,8 @@ in
 
   sweet = callPackage ../data/themes/sweet { };
 
+  symbiflow-arch-defs = callPackage ../data/misc/symbiflow-arch-defs { };
+
   mime-types = callPackage ../data/misc/mime-types { };
 
   shared-mime-info = callPackage ../data/misc/shared-mime-info { };
@@ -26762,6 +26778,7 @@ in
     tilingnome = callPackage ../desktops/gnome-3/extensions/tilingnome { };
     timepp = callPackage ../desktops/gnome-3/extensions/timepp { };
     topicons-plus = callPackage ../desktops/gnome-3/extensions/topicons-plus { };
+    unite-shell = callPackage ../desktops/gnome-3/extensions/unite-shell { };
     window-corner-preview = callPackage ../desktops/gnome-3/extensions/window-corner-preview { };
     window-is-ready-remover = callPackage ../desktops/gnome-3/extensions/window-is-ready-remover { };
     workspace-matrix = callPackage ../desktops/gnome-3/extensions/workspace-matrix { };
@@ -28790,6 +28807,8 @@ in
     inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly;
   };
 
+  vsh = callPackage ../tools/misc/vsh { };
+
   vttest = callPackage ../tools/misc/vttest { };
 
   wacomtablet = libsForQt5.callPackage ../tools/misc/wacomtablet { };

pkgs/top-level/python-packages.nix

@@ -1294,6 +1294,8 @@ in {
 
   cloudpickle = callPackage ../development/python-modules/cloudpickle { };
 
+  cloudscraper = callPackage ../development/python-modules/cloudscraper { };
+
   clustershell = callPackage ../development/python-modules/clustershell { };
 
   cma = callPackage ../development/python-modules/cma { };
@@ -3233,6 +3235,10 @@ in {
 
   joblib = callPackage ../development/python-modules/joblib { };
 
+  johnnycanencrypt = callPackage ../development/python-modules/johnnycanencrypt {
+    inherit (pkgs.darwin.apple_sdk.frameworks) PCSC;
+  };
+
   josepy = callPackage ../development/python-modules/josepy { };
 
   journalwatch = callPackage ../tools/system/journalwatch { inherit (self) systemd pytest; };
@@ -4786,6 +4792,8 @@ in {
 
   python-openems = callPackage ../development/python-modules/python-openems { };
 
+  python-prjxray = callPackage ../development/python-modules/python-prjxray { };
+
   python-tado = callPackage ../development/python-modules/python-tado { };
 
   pkutils = callPackage ../development/python-modules/pkutils { };
@@ -7347,6 +7355,8 @@ in {
 
   sybil = callPackage ../development/python-modules/sybil { };
 
+  symbiflow-fasm = callPackage ../development/python-modules/symbiflow-fasm { };
+
   symengine = callPackage ../development/python-modules/symengine { symengine = pkgs.symengine; };
 
   sympy = if isPy3k then
@@ -7464,6 +7474,8 @@ in {
 
   textfsm = callPackage ../development/python-modules/textfsm { };
 
+  textx = callPackage ../development/python-modules/textx { };
+
   testpath = callPackage ../development/python-modules/testpath { };
 
   testrepository = callPackage ../development/python-modules/testrepository { };
@@ -7663,6 +7675,8 @@ in {
 
   tubeup = callPackage ../development/python-modules/tubeup { };
 
+  tumpa = callPackage ../development/python-modules/tumpa { };
+
   tvdb_api = callPackage ../development/python-modules/tvdb_api { };
 
   tvnamer = callPackage ../development/python-modules/tvnamer { };
@@ -8102,6 +8116,8 @@ in {
 
   xattr = callPackage ../development/python-modules/xattr { };
 
+  xc-fasm = callPackage ../development/python-modules/xc-fasm { };
+
   xcaplib = callPackage ../development/python-modules/xcaplib { };
 
   xcffib = callPackage ../development/python-modules/xcffib { };