commit 40a54af0571d90f05e4f8c2e35b1b5c34aa6e0a6 · pyrox.dev/nixpkgs

+2 -2

pkgs/applications/graphics/hydrus/default.nix

···

       10
       10
        
       

     

       11
       11
        
       python3Packages.buildPythonPackage rec {

     

       12
       12
        
         pname = "hydrus";

     

       13
       13
       -
         version = "460";

     

       13
       13
       +
         version = "461";

     

       14
       14
        
         format = "other";

     

       15
       15
        
       

     

       16
       16
        
         src = fetchFromGitHub {

     

       17
       17
        
           owner = "hydrusnetwork";

     

       18
       18
        
           repo = "hydrus";

     

       19
       19
        
           rev = "v${version}";

     

       20
       20
       -
           sha256 = "sha256-cIvidbvMAWVs/XnS7I5ZQkuya9lfuRPNCRSTbFnKhSw=";

     

       20
       20
       +
           sha256 = "sha256-fVqMSzQ4VhiRh6gDFApln1jioIDs80ceyV+ClNRhjKA=";

     

       21
       21
        
         };

     

       22
       22
        
       

     

       23
       23
        
         nativeBuildInputs = [

+2 -2

pkgs/applications/misc/anytype/default.nix

···

       2
       2
        
       

     

       3
       3
        
       let

     

       4
       4
        
         pname = "anytype";

     

       5
       5
       -
         version = "0.20.9";

     

       5
       5
       +
         version = "0.21.1";

     

       6
       6
        
         name = "Anytype-${version}";

     

       7
       7
        
         nameExecutable = pname;

     

       8
       8
        
         src = fetchurl {

     

       9
       9
        
           url = "https://at9412003.fra1.digitaloceanspaces.com/Anytype-${version}.AppImage";

     

       10
       10
        
           name = "Anytype-${version}.AppImage";

     

       11
       11
       -
           sha256 = "sha256-dm3bdKbUHI0FFcyYeYd2XSuZuoPsUhk4KcEwzPHiHM8=";

     

       11
       11
       +
           sha256 = "sha256-5QsbB48g11TyfWCbR7Sz2AETEwdyG+bSJQNGRHrIueE=";

     

       12
       12
        
         };

     

       13
       13
        
         appimageContents = appimageTools.extractType2 { inherit name src; };

     

       14
       14
        
       in

+2

pkgs/applications/misc/bklk/default.nix

···

       11
       11
        
           sha256 = "sha256-R3H6tv6fzQG41Y2rui0K8fdQ/+Ywnc5hqTPFjktrhF8=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       +
         makeFlags = [ "CC=$$CXX" ];

     

       15
       15
       +
       

     

       14
       16
        
         buildInputs = [ ncurses ];

     

       15
       17
        
       

     

       16
       18
        
         installPhase = ''

+4 -19

pkgs/applications/science/electronics/librepcb/default.nix

···

       1
       1
        
       { stdenv, lib, fetchFromGitHub

     

       2
       2
       -
       , qtbase, qttools, qmake, wrapQtAppsHook

     

       2
       2
       +
       , qtbase, qttools, cmake, wrapQtAppsHook

     

       3
       3
        
       }:

     

       4
       4
        
       

     

       5
       5
        
       stdenv.mkDerivation rec {

     

       6
       6
        
         pname = "librepcb";

     

       7
       7
       -
         version = "0.1.5";

     

       7
       7
       +
         version = "0.1.6";

     

       8
       8
        
       

     

       9
       9
        
         src = fetchFromGitHub {

     

       10
       10
        
           owner  = pname;

     

       11
       11
        
           repo   = pname;

     

       12
       12
        
           rev    = version;

     

       13
       13
       -
           sha256 = "0ag8h3id2c1k9ds22rfrvyhf2vjhkv82xnrdrz4n1hnlr9566vcx";

     

       13
       13
       +
           sha256 = "0gzf3asdgdicpikb412134ybqnbbark948yrfhvba2w4i9cwbk2r";

     

       14
       14
        
           fetchSubmodules = true;

     

       15
       15
        
         };

     

       16
       16
        
       

     

       17
       17
       -
         nativeBuildInputs = [ qmake qttools wrapQtAppsHook ];

     

       17
       17
       +
         nativeBuildInputs = [ cmake qttools wrapQtAppsHook ];

     

       18
       18
        
         buildInputs = [ qtbase ];

     

       19
       19
       -
       

     

       20
       20
       -
         qmakeFlags = ["-r"];

     

       21
       21
       -
       

     

       22
       22
       -
         # the build system tries to use 'git' at build time to find the HEAD hash.

     

       23
       23
       -
         # that's a no-no, so replace it with a quick hack. NOTE: the # adds a comment

     

       24
       24
       -
         # at the end of the line to remove the git call.

     

       25
       25
       -
         postPatch = ''

     

       26
       26
       -
           substituteInPlace ./libs/librepcb/common/common.pro \

     

       27
       27
       -
             --replace 'GIT_COMMIT_SHA' 'GIT_COMMIT_SHA="\\\"${src.rev}\\\"" # '

     

       28
       28
       -
         '';

     

       29
       29
       -
       

     

       30
       30
       -
         postInstall = ''

     

       31
       31
       -
           mkdir -p $out/share/librepcb/fontobene

     

       32
       32
       -
           cp share/librepcb/fontobene/newstroke.bene $out/share/librepcb/fontobene/

     

       33
       33
       -
         '';

     

       34
       19
        
       

     

       35
       20
        
         meta = with lib; {

     

       36
       21
        
           description = "A free EDA software to develop printed circuit boards";

+3 -3

pkgs/applications/window-managers/i3/status-rust.nix

···

       12
       12
        
       

     

       13
       13
        
       rustPlatform.buildRustPackage rec {

     

       14
       14
        
         pname = "i3status-rust";

     

       15
       15
       -
         version = "0.20.5";

     

       15
       15
       +
         version = "0.20.6";

     

       16
       16
        
       

     

       17
       17
        
         src = fetchFromGitHub {

     

       18
       18
        
           owner = "greshake";

     

       19
       19
        
           repo = pname;

     

       20
       20
        
           rev = "v${version}";

     

       21
       21
       -
           sha256 = "sha256-7KEG4akn6tOUrgQUZFX0Wiz8YAKFUAr8AN16Xg8CLO4=";

     

       21
       21
       +
           sha256 = "sha256-FLMfXloAAIz/9KAtKFfB8uokQz/J8R+WsGarq/5cblo=";

     

       22
       22
        
         };

     

       23
       23
        
       

     

       24
       24
       -
         cargoSha256 = "sha256-GTE1KJ/ZpiqwmmKYx6kNzPNNmz0QHYWrIyKN49uzdZA=";

     

       24
       24
       +
         cargoSha256 = "sha256-UVAF2rz0y6h3/rcTJ+31mMyJDLG7q40n6vBK8Wxultg=";

     

       25
       25
        
       

     

       26
       26
        
         nativeBuildInputs = [ pkg-config makeWrapper ];

     

       27
       27

+1 -1

pkgs/build-support/vm/default.nix

···

       390
       390
        
             diskImage=$(pwd)/disk-image.qcow2

     

       391
       391
        
             origImage=${attrs.diskImage}

     

       392
       392
        
             if test -d "$origImage"; then origImage="$origImage/disk-image.qcow2"; fi

     

       393
       393
       -
             ${qemu}/bin/qemu-img create -b "$origImage" -f qcow2 $diskImage

     

       393
       393
       +
             ${qemu}/bin/qemu-img create -F ${attrs.diskImageFormat} -b "$origImage" -f qcow2 $diskImage

     

       394
       394
        
           '';

     

       395
       395
        
       

     

       396
       396
        
           /* Inside the VM, run the stdenv setup script normally, but at the

+3 -3

pkgs/build-support/vm/test.nix

···

       28
       28
        
         buildInDebian = runInLinuxImage (stdenv.mkDerivation {

     

       29
       29
        
           name = "deb-compile";

     

       30
       30
        
           src = patchelf.src;

     

       31
       31
       -
           diskImage = diskImages.ubuntu1204i386;

     

       31
       31
       +
           diskImage = diskImages.ubuntu1804i386;

     

       32
       32
       +
           diskImageFormat = "qcow2";

     

       32
       33
        
           memSize = 512;

     

       33
       33
       -
           prePhases = [ sysInfoPhase ];

     

       34
       34
       -
           sysInfoPhase = ''

     

       34
       34
       +
           postHook = ''

     

       35
       35
        
             dpkg-query --list

     

       36
       36
        
           '';

     

       37
       37
        
         });

+1 -1

pkgs/development/libraries/pcre2/default.nix

···

       7
       7
        
         pname = "pcre2";

     

       8
       8
        
         version = "10.37";

     

       9
       9
        
         src = fetchurl {

     

       10
       10
       -
           url = "https://ftp.pcre.org/pub/pcre/${pname}-${version}.tar.bz2";

     

       10
       10
       +
           url = "https://github.com/PhilipHazel/pcre2/releases/download/pcre2-${version}/pcre2-${version}.tar.bz2";

     

       11
       11
        
           hash = "sha256-TZWpbouAUpiTtFYr4SZI15i5V7G6Gq45YGu8KrlW0nA=";

     

       12
       12
        
         };

     

       13
       13

+3 -10

pkgs/development/libraries/pipewire/default.nix

···

       1
       1
        
       { stdenv

     

       2
       2
        
       , lib

     

       3
       3
        
       , fetchFromGitLab

     

       4
       4
       -
       , fetchpatch

     

       5
       4
        
       , removeReferencesTo

     

       6
       5
        
       , python3

     

       7
       6
        
       , meson

     
···

       63
       62
        
       

     

       64
       63
        
         self = stdenv.mkDerivation rec {

     

       65
       64
        
           pname = "pipewire";

     

       66
       66
       -
           version = "0.3.39";

     

       65
       65
       +
           version = "0.3.40";

     

       67
       66
        
       

     

       68
       67
        
           outputs = [

     

       69
       68
        
             "out"

     
···

       81
       80
        
             owner = "pipewire";

     

       82
       81
        
             repo = "pipewire";

     

       83
       82
        
             rev = version;

     

       84
       84
       -
             sha256 = "sha256-peTS1+NuQxZg1rrv8DrnJW5BR9yReleqooIwhZWHLjM=";

     

       83
       83
       +
             sha256 = "sha256-eY6uQa4+sC6yUWhF4IpAgRoppwhHO4s5fIMXOkS0z7A=";

     

       85
       84
        
           };

     

       86
       85
        
       

     

       87
       86
        
           patches = [

     
···

       97
       96
        
             ./0090-pipewire-config-template-paths.patch

     

       98
       97
        
             # Place SPA data files in lib output to avoid dependency cycles

     

       99
       98
        
             ./0095-spa-data-dir.patch

     

       100
       100
       -
             # Fix compilation on some architectures

     

       101
       101
       -
             # XXX: REMOVE ON NEXT RELEASE

     

       102
       102
       -
             (fetchpatch {

     

       103
       103
       -
               url = "https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/651f0decea5f83730c271e9bed03cdd0048fcd49.diff";

     

       104
       104
       -
               sha256 = "1bmpi5qn750mcspaw7m57ww0503sl9781jswqby4gr0f7c5wmqvj";

     

       105
       105
       -
             })

     

       106
       99
        
           ];

     

       107
       100
        
       

     

       108
       101
        
           nativeBuildInputs = [

     
···

       188
       181
        
           '';

     

       189
       182
        
       

     

       190
       183
        
           passthru = {

     

       191
       191
       -
             updateScript = ./update.sh;

     

       184
       184
       +
             updateScript = ./update-pipewire.sh;

     

       192
       185
        
             tests = {

     

       193
       186
        
               installedTests = nixosTests.installed-tests.pipewire;

     

       194
       187

+3 -2

pkgs/development/libraries/pipewire/media-session.nix

···

       20
       20
        
       

     

       21
       21
        
         self = stdenv.mkDerivation rec {

     

       22
       22
        
           pname = "pipewire-media-session";

     

       23
       23
       -
           version = "0.4.0";

     

       23
       23
       +
           version = "0.4.1";

     

       24
       24
        
       

     

       25
       25
        
           src = fetchFromGitLab {

     

       26
       26
        
             domain = "gitlab.freedesktop.org";

     

       27
       27
        
             owner = "pipewire";

     

       28
       28
        
             repo = "media-session";

     

       29
       29
        
             rev = version;

     

       30
       30
       -
             sha256 = "sha256-zhOvBlG7DuQkJ+ZZBhBhfKwk+bbLljpt3w4JlK3cJLk=";

     

       30
       30
       +
             sha256 = "sha256-e537gTkiNYMz2YJrOff/MXYWVDgHZDkqkSn8Qh+7Wr4=";

     

       31
       31
        
           };

     

       32
       32
        
       

     

       33
       33
        
           nativeBuildInputs = [

     
···

       67
       67
        
           '';

     

       68
       68
        
       

     

       69
       69
        
           passthru = {

     

       70
       70
       +
             updateScript = ./update-media-session.sh;

     

       70
       71
        
             tests = {

     

       71
       72
        
               test-paths = callPackage ./test-paths.nix { package = self; } {

     

       72
       73
        
                 paths-out = [

+24

pkgs/development/libraries/pipewire/update-media-session.sh

···

       1
       1
       +
       #!/usr/bin/env nix-shell

     

       2
       2
       +
       #!nix-shell -p nix-update -i bash

     

       3
       3
       +
       # shellcheck shell=bash

     

       4
       4
       +
       

     

       5
       5
       +
       set -o errexit -o pipefail -o nounset -o errtrace

     

       6
       6
       +
       shopt -s inherit_errexit

     

       7
       7
       +
       shopt -s nullglob

     

       8
       8
       +
       IFS=$'\n'

     

       9
       9
       +
       

     

       10
       10
       +
       NIXPKGS_ROOT="$(git rev-parse --show-toplevel)"

     

       11
       11
       +
       

     

       12
       12
       +
       cd "$NIXPKGS_ROOT"

     

       13
       13
       +
       nix-update pipewire-media-session

     

       14
       14
       +
       outputs=$(nix-build . -A pipewire-media-session)

     

       15
       15
       +
       for p in $outputs; do

     

       16
       16
       +
           conf_files=$(find "$p/nix-support/" -name '*.conf.json')

     

       17
       17
       +
           for c in $conf_files; do

     

       18
       18
       +
               file_name=$(basename "$c")

     

       19
       19
       +
               if [[ ! -e "nixos/modules/services/desktops/pipewire/media-session/$file_name" ]]; then

     

       20
       20
       +
                   echo "New file $file_name found! Add it to the module config and passthru tests!"

     

       21
       21
       +
               fi

     

       22
       22
       +
               install -m 0644 "$c" "nixos/modules/services/desktops/pipewire/media-session/"

     

       23
       23
       +
           done

     

       24
       24
       +
       done

+25

pkgs/development/libraries/pipewire/update-pipewire.sh

···

       1
       1
       +
       #!/usr/bin/env nix-shell

     

       2
       2
       +
       #!nix-shell -p nix-update -i bash

     

       3
       3
       +
       # shellcheck shell=bash

     

       4
       4
       +
       

     

       5
       5
       +
       set -o errexit -o pipefail -o nounset -o errtrace

     

       6
       6
       +
       shopt -s inherit_errexit

     

       7
       7
       +
       shopt -s nullglob

     

       8
       8
       +
       IFS=$'\n'

     

       9
       9
       +
       

     

       10
       10
       +
       NIXPKGS_ROOT="$(git rev-parse --show-toplevel)"

     

       11
       11
       +
       

     

       12
       12
       +
       cd "$NIXPKGS_ROOT"

     

       13
       13
       +
       nix-update pipewire

     

       14
       14
       +
       outputs=$(nix-build . -A pipewire)

     

       15
       15
       +
       for p in $outputs; do

     

       16
       16
       +
           conf_files=$(find "$p/nix-support/" -name '*.conf.json')

     

       17
       17
       +
           for c in $conf_files; do

     

       18
       18
       +
               file_name=$(basename "$c")

     

       19
       19
       +
               if [[ ! -e "nixos/modules/services/desktops/pipewire/daemon/$file_name" ]]; then

     

       20
       20
       +
                   echo "New file $file_name found! Add it to the module config and passthru tests!"

     

       21
       21
       +
               fi

     

       22
       22
       +
               install -m 0644 "$c" "nixos/modules/services/desktops/pipewire/daemon/"

     

       23
       23
       +
           done

     

       24
       24
       +
       done

     

       25
       25
       +

-37

pkgs/development/libraries/pipewire/update.sh

···

       1
       1
       -
       #!/usr/bin/env nix-shell

     

       2
       2
       -
       #!nix-shell -p nix-update -i bash

     

       3
       3
       -
       # shellcheck shell=bash

     

       4
       4
       -
       

     

       5
       5
       -
       set -o errexit -o pipefail -o nounset -o errtrace

     

       6
       6
       -
       shopt -s inherit_errexit

     

       7
       7
       -
       shopt -s nullglob

     

       8
       8
       -
       IFS=$'\n'

     

       9
       9
       -
       

     

       10
       10
       -
       NIXPKGS_ROOT="$(git rev-parse --show-toplevel)"

     

       11
       11
       -
       

     

       12
       12
       -
       cd "$NIXPKGS_ROOT"

     

       13
       13
       -
       nix-update pipewire

     

       14
       14
       -
       outputs=$(nix-build . -A pipewire)

     

       15
       15
       -
       for p in $outputs; do

     

       16
       16
       -
           conf_files=$(find "$p/nix-support/" -name '*.conf.json')

     

       17
       17
       -
           for c in $conf_files; do

     

       18
       18
       -
               file_name=$(basename "$c")

     

       19
       19
       -
               if [[ ! -e "nixos/modules/services/desktops/pipewire/daemon/$file_name" ]]; then

     

       20
       20
       -
                   echo "New file $file_name found! Add it to the module config and passthru tests!"

     

       21
       21
       -
               fi

     

       22
       22
       -
               install -m 0644 "$c" "nixos/modules/services/desktops/pipewire/daemon/"

     

       23
       23
       -
           done

     

       24
       24
       -
       done

     

       25
       25
       -
       

     

       26
       26
       -
       nix-update pipewire-media-session

     

       27
       27
       -
       outputs=$(nix-build . -A pipewire-media-session)

     

       28
       28
       -
       for p in $outputs; do

     

       29
       29
       -
           conf_files=$(find "$p/nix-support/" -name '*.conf.json')

     

       30
       30
       -
           for c in $conf_files; do

     

       31
       31
       -
               file_name=$(basename "$c")

     

       32
       32
       -
               if [[ ! -e "nixos/modules/services/desktops/pipewire/media-session/$file_name" ]]; then

     

       33
       33
       -
                   echo "New file $file_name found! Add it to the module config and passthru tests!"

     

       34
       34
       -
               fi

     

       35
       35
       -
               install -m 0644 "$c" "nixos/modules/services/desktops/pipewire/media-session/"

     

       36
       36
       -
           done

     

       37
       37
       -
       done

+8 -7

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

···

       1
       1
        
       { lib

     

       2
       2
       +
       , aiohttp

     

       2
       3
        
       , buildPythonPackage

     

       3
       3
       -
       , pythonOlder

     

       4
       4
        
       , fetchPypi

     

       5
       5
       -
       , aiohttp

     

       6
       6
       -
       , ratelimit

     

       5
       5
       +
       , pythonOlder

     

       7
       6
        
       }:

     

       8
       7
        
       

     

       9
       8
        
       buildPythonPackage rec {

     

       10
       9
        
         pname = "goalzero";

     

       11
       11
       -
         version = "0.2.0";

     

       10
       10
       +
         version = "0.2.1";

     

       11
       11
       +
         format = "setuptools";

     

       12
       12
        
       

     

       13
       13
        
         disabled = pythonOlder "3.6";

     

       14
       14
        
       

     

       15
       15
        
         src = fetchPypi {

     

       16
       16
        
           inherit pname version;

     

       17
       17
       -
           sha256 = "6cb67cf772a758225b2e23b394feb697e8cbfb1aff5a2d7a17a0d4ccf61e55cd";

     

       17
       17
       +
           sha256 = "sha256-PveHE317p5fGSxgx7LQkpRYF55HwdzpZFY8/F8s3CBQ=";

     

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
        
         propagatedBuildInputs = [

     

       21
       21
        
           aiohttp

     

       22
       22
       -
           ratelimit

     

       23
       22
        
         ];

     

       24
       23
        
       

     

       25
       24
        
         # no tests implemented

     

       26
       25
        
         doCheck = false;

     

       27
       26
        
       

     

       28
       28
       -
         pythonImportsCheck = [ "goalzero" ];

     

       27
       27
       +
         pythonImportsCheck = [

     

       28
       28
       +
           "goalzero"

     

       29
       29
       +
         ];

     

       29
       30
        
       

     

       30
       31
        
         meta = with lib; {

     

       31
       32
        
           description = "Goal Zero Yeti REST Api Library";

+5 -5

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

···

       1
       1
        
       { lib

     

       2
       2
        
       , aiohttp

     

       3
       3
        
       , aresponses

     

       4
       4
       -
       , async-timeout

     

       5
       4
        
       , buildPythonPackage

     

       6
       5
        
       , fetchFromGitHub

     

       7
       6
        
       , pytest-asyncio

     
···

       11
       10
        
       

     

       12
       11
        
       buildPythonPackage rec {

     

       13
       12
        
         pname = "pytautulli";

     

       14
       14
       -
         version = "21.10.1";

     

       13
       13
       +
         version = "21.11.0";

     

       15
       14
        
         format = "setuptools";

     

       16
       15
        
       

     

       17
       16
        
         disabled = pythonOlder "3.8";

     
···

       20
       19
        
           owner = "ludeeus";

     

       21
       20
        
           repo = pname;

     

       22
       21
        
           rev = version;

     

       23
       23
       -
           sha256 = "sha256-ckDqKPseOrGyWGvcPyj99cvQS+w4AHUkO4FHOIo9MDM=";

     

       22
       22
       +
           sha256 = "sha256-zODU3aN+8Fdw/GQ/EfZhn6kOuLDARKgLULzRw2+b2BM=";

     

       24
       23
        
         };

     

       25
       24
        
       

     

       26
       25
        
         postPatch = ''

     
···

       32
       31
        
       

     

       33
       32
        
         propagatedBuildInputs = [

     

       34
       33
        
           aiohttp

     

       35
       35
       -
           async-timeout

     

       36
       34
        
         ];

     

       37
       35
        
       

     

       38
       36
        
         checkInputs = [

     
···

       41
       39
        
           pytestCheckHook

     

       42
       40
        
         ];

     

       43
       41
        
       

     

       44
       44
       -
         pythonImportsCheck = [ "pytautulli" ];

     

       42
       42
       +
         pythonImportsCheck = [

     

       43
       43
       +
           "pytautulli"

     

       44
       44
       +
         ];

     

       45
       45
        
       

     

       46
       46
        
         meta = with lib; {

     

       47
       47
        
           description = "Python module to get information from Tautulli";

+24 -22

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

···

       1
       1
       -
       { lib, buildPythonPackage, fetchPypi, fetchpatch, mock

     

       2
       2
       -
       , future, six, setuptools-scm }:

     

       1
       1
       +
       { lib

     

       2
       2
       +
       , buildPythonPackage

     

       3
       3
       +
       , fetchPypi

     

       4
       4
       +
       , mock

     

       5
       5
       +
       , pytestCheckHook

     

       6
       6
       +
       , setuptools-scm

     

       7
       7
       +
       }:

     

       3
       8
        
       

     

       4
       9
        
       buildPythonPackage rec {

     

       5
       10
        
         pname = "sievelib";

     

       6
       6
       -
         version = "1.1.1";

     

       11
       11
       +
         version = "1.2.1";

     

       12
       12
       +
         format = "setuptools";

     

       7
       13
        
       

     

       8
       14
        
         src = fetchPypi {

     

       9
       15
        
           inherit pname version;

     

       10
       10
       -
           sha256 = "1sl1fnwr5jdacrrnq2rvzh4vv1dyxd3x31vnqga36gj8h546h7mz";

     

       16
       16
       +
           sha256 = "sha256-7cubQWqYWjzFt9f01+wBPjcuv5DmTJ2eAOIDEpmvOP0=";

     

       11
       17
        
         };

     

       12
       18
        
       

     

       13
       13
       -
         patches = [

     

       14
       14
       -
           (fetchpatch {

     

       15
       15
       -
             name = "pip-10-pip-req.patch";

     

       16
       16
       -
             url = "https://github.com/tonioo/sievelib/commit/1deef0e2bf039a0e817ea6f19aaf1947dc9fafbc.patch";

     

       17
       17
       -
             sha256 = "0vaj73mcij9dism8vfaai82irh8j1b2n8gf9jl1a19d2l26jrflk";

     

       18
       18
       -
           })

     

       19
       19
       -
           (fetchpatch {

     

       20
       20
       -
             name = "requirements-in-setup-py.patch";

     

       21
       21
       -
             url = "https://github.com/tonioo/sievelib/commit/91f40ec226ea288e98379da01672a46dabd89fc9.patch";

     

       22
       22
       -
             sha256 = "0hph89xn16r353rg6f05bh0cgigmwdc736bya089qc03jhssrgns";

     

       23
       23
       -
           })

     

       19
       19
       +
         nativeBuildInputs = [

     

       20
       20
       +
           setuptools-scm

     

       24
       21
        
         ];

     

       25
       22
        
       

     

       26
       26
       -
         buildInputs = [ setuptools-scm ];

     

       27
       27
       -
         propagatedBuildInputs = [ future six ];

     

       28
       28
       -
         checkInputs = [ mock ];

     

       23
       23
       +
         checkInputs = [

     

       24
       24
       +
           mock

     

       25
       25
       +
           pytestCheckHook

     

       26
       26
       +
         ];

     

       27
       27
       +
       

     

       28
       28
       +
         pythonImportsCheck = [

     

       29
       29
       +
           "sievelib"

     

       30
       30
       +
         ];

     

       29
       31
        
       

     

       30
       30
       -
         meta = {

     

       32
       32
       +
         meta = with lib; {

     

       31
       33
        
           description = "Client-side Sieve and Managesieve library written in Python";

     

       32
       32
       -
           homepage    = "https://github.com/tonioo/sievelib";

     

       33
       33
       -
           license     = lib.licenses.mit;

     

       34
       34
       -
           maintainers = with lib.maintainers; [ leenaars ];

     

       35
       34
        
           longDescription = ''

     

       36
       35
        
             A library written in Python that implements RFC 5228 (Sieve: An Email

     

       37
       36
        
             Filtering Language) and RFC 5804 (ManageSieve: A Protocol for

     
···

       43
       42
        
              * Vacation (RFC 5230)

     

       44
       43
        
              * Imap4flags (RFC 5232)

     

       45
       44
        
           '';

     

       45
       45
       +
           homepage = "https://github.com/tonioo/sievelib";

     

       46
       46
       +
           license = licenses.mit;

     

       47
       47
       +
           maintainers = with maintainers; [ leenaars ];

     

       46
       48
        
         };

     

       47
       49
        
       }

+2 -2

pkgs/development/tools/analysis/checkov/default.nix

···

       56
       56
        
       

     

       57
       57
        
       buildPythonApplication rec {

     

       58
       58
        
         pname = "checkov";

     

       59
       59
       -
         version = "2.0.563";

     

       59
       59
       +
         version = "2.0.566";

     

       60
       60
        
       

     

       61
       61
        
         src = fetchFromGitHub {

     

       62
       62
        
           owner = "bridgecrewio";

     

       63
       63
        
           repo = pname;

     

       64
       64
        
           rev = version;

     

       65
       65
       -
           sha256 = "sha256-f1rD1Xal/86q7hRR+6XneiVEYGH1TFHVXzFLOQDO17Y=";

     

       65
       65
       +
           sha256 = "sha256-Eah4dK23jdHK7s0VF8FLd6KJzHP5YpdLGcM7IXgB880=";

     

       66
       66
        
         };

     

       67
       67
        
       

     

       68
       68
        
         nativeBuildInputs = with py.pkgs; [

+1 -1

pkgs/development/tools/build-managers/dub/default.nix

···

       150
       150
        
           homepage = "https://code.dlang.org/";

     

       151
       151
        
           license = licenses.mit;

     

       152
       152
        
           maintainers = with maintainers; [ ThomasMader ];

     

       153
       153
       -
           platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ];

     

       153
       153
       +
           platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" "aarch64-darwin" ];

     

       154
       154
        
         };

     

       155
       155
        
       }

+26 -6

pkgs/os-specific/linux/waydroid/default.nix

···

       3
       3
        
       , fetchFromGitHub

     

       4
       4
        
       , python3Packages

     

       5
       5
        
       , dnsmasq

     

       6
       6
       +
       , getent

     

       7
       7
       +
       , kmod

     

       6
       8
        
       , lxc

     

       9
       9
       +
       , iproute2

     

       10
       10
       +
       , iptables

     

       7
       11
        
       , nftables

     

       8
       8
       -
       , python

     

       12
       12
       +
       , util-linux

     

       13
       13
       +
       , which

     

       14
       14
       +
       , xclip

     

       9
       15
        
       }:

     

       10
       16
        
       

     

       11
       17
        
       python3Packages.buildPythonApplication rec {

     

       12
       18
        
         pname = "waydroid";

     

       13
       13
       -
         version = "1.1.1";

     

       19
       19
       +
         version = "1.2.0";

     

       14
       20
        
       

     

       15
       21
        
         src = fetchFromGitHub {

     

       16
       22
        
           owner = pname;

     

       17
       23
        
           repo = pname;

     

       18
       24
        
           rev = version;

     

       19
       19
       -
           sha256 = "0cabh7rysh2v15wrxg250370mw26s5d073yxmczxsarbp4ri2pl4";

     

       25
       25
       +
           sha256 = "03d87sh443kn0j2mpih1g909khkx3wgb04h605f9jhd0znskkbmw";

     

       20
       26
        
         };

     

       21
       27
        
       

     

       22
       28
        
         propagatedBuildInputs = with python3Packages; [

     

       23
       29
        
           gbinder-python

     

       30
       30
       +
           pyclip

     

       24
       31
        
           pygobject3

     

       25
       32
        
         ];

     

       26
       33
        
       

     
···

       36
       43
        
       

     

       37
       44
        
           cp -ra data $out/${python3Packages.python.sitePackages}/data

     

       38
       45
        
           wrapProgram $out/${python3Packages.python.sitePackages}/data/scripts/waydroid-net.sh \

     

       39
       39
       -
              --prefix PATH ":" ${lib.makeBinPath [ dnsmasq nftables ]}

     

       46
       46
       +
              --prefix PATH ":" ${lib.makeBinPath [ dnsmasq getent iproute2 iptables nftables ]}

     

       40
       47
        
       

     

       41
       48
        
           mkdir -p $out/share/waydroid/gbinder.d

     

       42
       49
        
           cp gbinder/anbox.conf $out/share/waydroid/gbinder.d/anbox.conf

     

       43
       50
        
       

     

       51
       51
       +
           mkdir -p $out/share/applications

     

       52
       52
       +
           ln -s $out/${python3Packages.python.sitePackages}/data/Waydroid.desktop $out/share/applications/Waydroid.desktop

     

       53
       53
       +
       

     

       44
       54
        
           mkdir $out/bin

     

       45
       55
        
           cp -a waydroid.py $out/${python3Packages.python.sitePackages}/waydroid.py

     

       46
       56
        
           ln -s $out/${python3Packages.python.sitePackages}/waydroid.py $out/bin/waydroid

     

       47
       57
        
       

     

       48
       48
       -
           wrapPythonProgramsIn $out/${python3Packages.python.sitePackages} "$out ${python3Packages.gbinder-python} ${python3Packages.pygobject3} ${lxc}"

     

       58
       58
       +
           wrapPythonProgramsIn $out/${python3Packages.python.sitePackages} "${lib.concatStringsSep " " [

     

       59
       59
       +
             "$out"

     

       60
       60
       +
             python3Packages.gbinder-python

     

       61
       61
       +
             python3Packages.pygobject3

     

       62
       62
       +
             python3Packages.pyclip

     

       63
       63
       +
             kmod

     

       64
       64
       +
             lxc

     

       65
       65
       +
             util-linux

     

       66
       66
       +
             which

     

       67
       67
       +
             xclip

     

       68
       68
       +
           ]}"

     

       49
       69
        
         '';

     

       50
       70
        
       

     

       51
       71
        
         meta = with lib; {

     

       52
       52
       -
           description = "Waydroid is a container-based approach to boot a full Android system on a regular GNU/Linux system like Ubuntu.";

     

       72
       72
       +
           description = "Waydroid is a container-based approach to boot a full Android system on a regular GNU/Linux system like Ubuntu";

     

       53
       73
        
           homepage = "https://github.com/waydroid/waydroid";

     

       54
       74
        
           license = licenses.gpl3;

     

       55
       75
        
           platforms = platforms.linux;

+2 -2

pkgs/tools/misc/steampipe/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "steampipe";

     

       5
       5
       -
         version = "0.9.0";

     

       5
       5
       +
         version = "0.9.1";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "turbot";

     

       9
       9
        
           repo = "steampipe";

     

       10
       10
        
           rev = "v${version}";

     

       11
       11
       -
           sha256 = "sha256-wG5KvyY40CNxIScuQHQdJ4u8fzNU+oV7iNe9VAvTQMg=";

     

       11
       11
       +
           sha256 = "sha256-asAqRCJdy8HmzWzuE9nSvxqo6EVY8tkljzEFAClogrs=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         vendorSha256 = "sha256-3JBCiF1gxGCVn81s7abGvNIAy+eP7orAnSBOXUNImao=";

+2 -2

pkgs/tools/security/exploitdb/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "exploitdb";

     

       5
       5
       -
         version = "2021-11-09";

     

       5
       5
       +
         version = "2021-11-11";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "offensive-security";

     

       9
       9
        
           repo = pname;

     

       10
       10
        
           rev = version;

     

       11
       11
       -
           sha256 = "sha256-V/iQvA2jxeddzmzoVNJ4eoyEjkrkfws7pLw6akbBDaA=";

     

       11
       11
       +
           sha256 = "sha256-ImYbGaKnUizIJjYdiiX2X7O6uxo+ZHskcv9DcL51wY8=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         nativeBuildInputs = [ makeWrapper ];