commit ca65d6f7d263021b4ec6795958b1150b128d1c7c · pyrox.dev/nixpkgs

+3 -3

pkgs/applications/networking/cluster/starboard/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "starboard";

     

       5
       5
       -
         version = "0.10.0";

     

       5
       5
       +
         version = "0.10.1";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "aquasecurity";

     

       9
       9
        
           repo = pname;

     

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

     

       11
       11
       -
           sha256 = "sha256-hieenhe3HsMqg7dMhvOUcvVGzBedYXqJRxEUkw4DG6o=";

     

       11
       11
       +
           sha256 = "sha256-cDqZo0GTpvvkEiccP42u9X2ydHkSBuoD8Zfp+i+/qjo=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         vendorSha256 = "sha256-Vj8t4v2o6x+tFLWy84W3tVaIf6WtFWXpvLQfeTbeGbM=";

     

       14
       14
       +
         vendorSha256 = "sha256-noK4fF9wCP1dYfDgmJVZehcF+eunzP+d9n1SiPO9UEU=";

     

       15
       15
        
       

     

       16
       16
        
         subPackages = [ "cmd/starboard" ];

     

       17
       17

+3 -3

pkgs/applications/networking/dnscontrol/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "dnscontrol";

     

       5
       5
       -
         version = "3.8.0";

     

       5
       5
       +
         version = "3.8.1";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "StackExchange";

     

       9
       9
        
           repo = pname;

     

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

     

       11
       11
       -
           sha256 = "sha256-VSNvyigaGfGDbcng6ltdq+X35zT2tb2p4j/4KAjd1Yk=";

     

       11
       11
       +
           sha256 = "sha256-x002p7wPKbcmr4uE04mgKBagHQV/maEo99Y2Jr7xgK4=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         vendorSha256 = "sha256-VU0uJDp5koVU+wDwr3ctrDY0R3vd/JmpA7gtWWpwpfw=";

     

       14
       14
       +
         vendorSha256 = "sha256-lR5+xVi/ROOFoRWyK0h/8uiSP/joQ9Zr9kMaQ+sWNhM=";

     

       15
       15
        
       

     

       16
       16
        
         subPackages = [ "." ];

     

       17
       17

+2 -2

pkgs/applications/networking/instant-messengers/jitsi-meet-electron/default.nix

···

       11
       11
        
       in

     

       12
       12
        
       stdenv.mkDerivation rec {

     

       13
       13
        
         pname = "jitsi-meet-electron";

     

       14
       14
       -
         version = "2.7.0";

     

       14
       14
       +
         version = "2.8.5";

     

       15
       15
        
       

     

       16
       16
        
         src = fetchurl {

     

       17
       17
        
           url = "https://github.com/jitsi/jitsi-meet-electron/releases/download/v${version}/jitsi-meet-x86_64.AppImage";

     

       18
       18
       -
           sha256 = "1g8was4anrsdpv4h11z544mi0v79him2xjyknixyrqfy87cbh97n";

     

       18
       18
       +
           sha256 = "0r3jj3qjx38l1g733vhrwcm2yg7ppp23ciz84x2kqq51mlzr84c6";

     

       19
       19
        
           name = "${pname}-${version}.AppImage";

     

       20
       20
        
         };

     

       21
       21

+6 -11

pkgs/applications/networking/instant-messengers/zoom-us/default.nix

···

       7
       7
        
       , atk

     

       8
       8
        
       , cairo

     

       9
       9
        
       , dbus

     

       10
       10
       -
       , dpkg

     

       11
       10
        
       , libGL

     

       12
       11
        
       , fontconfig

     

       13
       12
        
       , freetype

     
···

       33
       32
        
         version = "5.6.16775.0418";

     

       34
       33
        
         srcs = {

     

       35
       34
        
           x86_64-linux = fetchurl {

     

       36
       36
       -
             url = "https://zoom.us/client/${version}/zoom_amd64.deb";

     

       37
       37
       -
             sha256 = "1fmzwxq8jv5k1b2kvg1ij9g6cdp1hladd8vm3cxzd8fywdjcndim";

     

       35
       35
       +
             url = "https://zoom.us/client/${version}/zoom_x86_64.pkg.tar.xz";

     

       36
       36
       +
             sha256 = "twtxzniojgyLTx6Kda8Ej96uyw2JQB/jIhLdTgTqpCo=";

     

       38
       37
        
           };

     

       39
       38
        
         };

     

       40
       39
        
       

     
···

       71
       70
        
         inherit version;

     

       72
       71
        
         src = srcs.${stdenv.hostPlatform.system};

     

       73
       72
        
       

     

       73
       73
       +
         dontUnpack = true;

     

       74
       74
       +
       

     

       74
       75
        
         nativeBuildInputs = [

     

       75
       75
       -
           dpkg

     

       76
       76
        
           makeWrapper

     

       77
       77
        
         ];

     

       78
       78
        
       

     

       79
       79
       -
         unpackCmd = ''

     

       80
       80
       -
           mkdir out

     

       81
       81
       -
           dpkg -x $curSrc out

     

       82
       82
       -
         '';

     

       83
       83
       -
       

     

       84
       79
        
         installPhase = ''

     

       85
       80
        
           runHook preInstall

     

       86
       81
        
           mkdir $out

     

       87
       87
       -
           mv usr/* $out/

     

       88
       88
       -
           mv opt $out/

     

       82
       82
       +
           tar -C $out -xf ${src}

     

       83
       83
       +
           mv $out/usr/* $out/

     

       89
       84
        
           runHook postInstall

     

       90
       85
        
         '';

     

       91
       86

+23 -44

pkgs/applications/video/jellyfin-mpv-shim/default.nix

···

       1
       1
        
       { lib

     

       2
       2
        
       , buildPythonApplication

     

       3
       3
       -
       , copyDesktopItems

     

       4
       3
        
       , fetchPypi

     

       5
       5
       -
       , makeDesktopItem

     

       6
       6
       -
       , flask

     

       7
       4
        
       , jellyfin-apiclient-python

     

       8
       5
        
       , jinja2

     

       9
       6
        
       , mpv

     

       10
       7
        
       , pillow

     

       11
       11
       -
       , pydantic

     

       12
       12
       -
       , pyqtwebengine

     

       13
       8
        
       , pystray

     

       14
       9
        
       , python-mpv-jsonipc

     

       15
       10
        
       , pywebview

     

       16
       16
       -
       , qt5

     

       17
       11
        
       , tkinter

     

       18
       18
       -
       , werkzeug

     

       19
       12
        
       }:

     

       20
       13
        
       

     

       21
       14
        
       buildPythonApplication rec {

     

       22
       15
        
         pname = "jellyfin-mpv-shim";

     

       23
       23
       -
         version = "1.10.4";

     

       16
       16
       +
         version = "2.0.1";

     

       24
       17
        
       

     

       25
       18
        
         src = fetchPypi {

     

       26
       19
        
           inherit pname version;

     

       27
       27
       -
           sha256 = "sha256-QMyb69S8Ln4X0oUuLpL6vtgxJwq8f+Q4ReNckrN4E+E=";

     

       20
       20
       +
           sha256 = "sha256-NXDLqQzCUfDPoKNPrmIn5FMedMKYxtDhkawRE2lg/vI=";

     

       28
       21
        
         };

     

       29
       22
        
       

     

       30
       23
        
         propagatedBuildInputs = [

     

       31
       24
        
           jellyfin-apiclient-python

     

       32
       25
        
           mpv

     

       33
       26
        
           pillow

     

       34
       34
       -
           pydantic

     

       35
       27
        
           python-mpv-jsonipc

     

       36
       28
        
       

     

       37
       29
        
           # gui dependencies

     
···

       41
       33
        
           # display_mirror dependencies

     

       42
       34
        
           jinja2

     

       43
       35
        
           pywebview

     

       44
       44
       -
       

     

       45
       45
       -
           # desktop dependencies

     

       46
       46
       -
           flask

     

       47
       47
       -
           pyqtwebengine

     

       48
       48
       -
           werkzeug

     

       49
       49
       -
         ];

     

       50
       50
       -
       

     

       51
       51
       -
         nativeBuildInputs = [

     

       52
       52
       -
           copyDesktopItems

     

       53
       53
       -
           qt5.wrapQtAppsHook

     

       54
       54
       -
         ];

     

       55
       55
       -
       

     

       56
       56
       -
         desktopItems = [

     

       57
       57
       -
           (makeDesktopItem {

     

       58
       58
       -
             name = "Jellyfin Desktop";

     

       59
       59
       -
             exec = "jellyfin-desktop";

     

       60
       60
       -
             icon = "jellyfin-desktop";

     

       61
       61
       -
             desktopName = "jellyfin-desktop";

     

       62
       62
       -
             comment = "MPV-based desktop and cast client for Jellyfin";

     

       63
       63
       -
             genericName = "MPV-based desktop and cast client for Jellyfin";

     

       64
       64
       -
             categories = "Video;AudioVideo;TV;Player";

     

       65
       65
       -
           })

     

       66
       36
        
         ];

     

       67
       37
        
       

     

       68
       38
        
         # override $HOME directory:

     
···

       82
       52
        
             --replace "notify_updates: bool = True" "notify_updates: bool = False"

     

       83
       53
        
         '';

     

       84
       54
        
       

     

       85
       85
       -
         postInstall = ''

     

       86
       86
       -
           mkdir -p $out/share/pixmaps

     

       87
       87
       -
           cp jellyfin_mpv_shim/integration/jellyfin-256.png $out/share/pixmaps/jellyfin-desktop.png

     

       88
       88
       -
         '';

     

       89
       89
       -
       

     

       90
       90
       -
         postFixup = ''

     

       91
       91
       -
           wrapQtApp $out/bin/jellyfin-desktop

     

       92
       92
       -
           wrapQtApp $out/bin/jellyfin-mpv-desktop

     

       93
       93
       -
         '';

     

       94
       94
       -
       

     

       95
       55
        
         # no tests

     

       96
       56
        
         doCheck = false;

     

       97
       57
        
         pythonImportsCheck = [ "jellyfin_mpv_shim" ];

     

       98
       58
        
       

     

       99
       59
        
         meta = with lib; {

     

       100
       100
       -
           homepage = "https://github.com/jellyfin/jellyfin-desktop";

     

       60
       60
       +
           homepage = "https://github.com/jellyfin/jellyfin-mpv-shim";

     

       101
       61
        
           description = "Allows casting of videos to MPV via the jellyfin mobile and web app";

     

       102
       102
       -
           license = licenses.gpl3;

     

       62
       62
       +
           longDescription = ''

     

       63
       63
       +
             Jellyfin MPV Shim is a client for the Jellyfin media server which plays media in the

     

       64
       64
       +
             MPV media player. The application runs in the background and opens MPV only

     

       65
       65
       +
             when media is cast to the player. The player supports most file formats, allowing you

     

       66
       66
       +
             to prevent needless transcoding of your media files on the server. The player also has

     

       67
       67
       +
             advanced features, such as bulk subtitle updates and launching commands on events.

     

       68
       68
       +
           '';

     

       69
       69
       +
           license = with licenses; [

     

       70
       70
       +
             # jellyfin-mpv-shim

     

       71
       71
       +
             gpl3Only

     

       72
       72
       +
             mit

     

       73
       73
       +
       

     

       74
       74
       +
             # shader-pack licenses (github:iwalton3/default-shader-pack)

     

       75
       75
       +
             # KrigBilateral, SSimDownscaler, NNEDI3

     

       76
       76
       +
             gpl3Plus

     

       77
       77
       +
             # Anime4K, FSRCNNX

     

       78
       78
       +
             mit

     

       79
       79
       +
             # Static Grain

     

       80
       80
       +
             unlicense

     

       81
       81
       +
           ];

     

       103
       82
        
           maintainers = with maintainers; [ jojosch ];

     

       104
       83
        
         };

     

       105
       84
        
       }

+12 -12

pkgs/applications/video/mpv/scripts/convert.nix

···

       12
       12
        
       

     

       13
       13
        
         patches = [ ./convert.patch ];

     

       14
       14
        
       

     

       15
       15
       -
         postPatch =

     

       16
       16
       -
           let

     

       17
       17
       -
             t = k: v: '' 'local ${k} = "${v}"' '';

     

       18
       18
       -
             subs = var: orig: repl: "--replace " + t var orig + t var repl;

     

       19
       19
       -
           in ''

     

       20
       20
       -
             substituteInPlace convert_script.lua \

     

       21
       21
       -
               ${subs "NOTIFY_CMD" "notify-send" "${libnotify}/bin/notify-send"} \

     

       22
       22
       -
               ${subs "YAD_CMD" "yad" "${yad}/bin/yad"} \

     

       23
       23
       -
               ${subs "MKVMERGE_CMD" "mkvmerge" "${mkvtoolnix-cli}/bin/mkvmerge"}

     

       15
       15
       +
         postPatch = ''

     

       16
       16
       +
           substituteInPlace convert_script.lua \

     

       17
       17
       +
             --replace 'mkvpropedit_exe = "mkvpropedit"' \

     

       18
       18
       +
                       'mkvpropedit_exe = "${mkvtoolnix-cli}/bin/mkvpropedit"' \

     

       19
       19
       +
             --replace 'mkvmerge_exe = "mkvmerge"' \

     

       20
       20
       +
                       'mkvmerge_exe = "${mkvtoolnix-cli}/bin/mkvmerge"' \

     

       21
       21
       +
             --replace 'yad_exe = "yad"' \

     

       22
       22
       +
                       'yad_exe = "${yad}/bin/yad"' \

     

       23
       23
       +
             --replace 'notify_send_exe = "notify-send"' \

     

       24
       24
       +
                       'notify_send_exe = "${libnotify}/bin/notify-send"' \

     

       25
       25
       +
       

     

       24
       26
        
         '';

     

       25
       27
        
       

     

       26
       28
        
         dontBuild = true;

     
···

       38
       40
        
             When this script is loaded into mpv, you can hit Alt+W to mark the beginning

     

       39
       41
        
             and Alt+W again to mark the end of the clip. Then a settings window opens.

     

       40
       42
        
           '';

     

       43
       43
       +
           # author was asked to add a license https://gist.github.com/Zehkul/25ea7ae77b30af959be0#gistcomment-3715700

     

       41
       44
        
           license = licenses.unfree;

     

       42
       42
       -
           # script crashes mpv. See https://github.com/NixOS/nixpkgs/issues/113202

     

       43
       43
       -
           broken = true;

     

       44
       45
        
         };

     

       45
       46
        
       }

     

       46
       46
       -

+58 -23

pkgs/applications/video/mpv/scripts/convert.patch

···

       1
       1
       -
       --- convert/convert_script.lua	2016-03-18 19:30:49.675401969 +0100

     

       2
       2
       -
       +++ convert_script.lua	2016-03-19 01:18:00.801897043 +0100

     

       3
       3
       -
       @@ -3,6 +3,10 @@

     

       1
       1
       +
       diff --git "a/Convert Script \342\200\223 README.md" "b/Convert Script \342\200\223 README.md"

     

       2
       2
       +
       index 8e062c1..6e0d798 100644

     

       3
       3
       +
       --- "a/Convert Script \342\200\223 README.md"	

     

       4
       4
       +
       +++ "b/Convert Script \342\200\223 README.md"	

     

       5
       5
       +
       @@ -68,7 +68,7 @@ and set some options in ``mpv/lua-settings/convert_script.conf`` or with ``--scr

     

       6
       6
       +
            If you don’t want to upgrade your yad. Features like appending segments won’t be available. 

     

       7
       7
       +
        

     

       8
       8
       +
            libvpx_fps

     

       9
       9
       +
       -    Default: --oautofps

     

       10
       10
       +
       +    Default: ""

     

       11
       11
       +
            FPS settings (or any other settings really) for libvpx encoding. Set it to --ofps=24000/1001 for example. 

     

       12
       12
       +
        

     

       13
       13
       +
       -Warning: Some of these options aren’t very robust and setting them to bogus values will break the script. 

     

       14
       14
       +
       \ No newline at end of file

     

       15
       15
       +
       +Warning: Some of these options aren’t very robust and setting them to bogus values will break the script. 

     

       16
       16
       +
       diff --git a/convert_script.lua b/convert_script.lua

     

       17
       17
       +
       index 17d3100..90f88ec 100644

     

       18
       18
       +
       --- a/convert_script.lua

     

       19
       19
       +
       +++ b/convert_script.lua

     

       20
       20
       +
       @@ -3,6 +3,12 @@ local msg = require 'mp.msg'

     

       4
       21
        
        local opt = require 'mp.options'

     

       5
       22
        
        local utils = require 'mp.utils'

     

       6
       23
        
        

     

       7
       7
       -
       +local NOTIFY_CMD = "notify-send"

     

       8
       8
       -
       +local YAD_CMD = "yad"

     

       9
       9
       -
       +local MKVMERGE_CMD = "mkvmerge"

     

       24
       24
       +
       +-- executables

     

       25
       25
       +
       +local mkvpropedit_exe = "mkvpropedit"

     

       26
       26
       +
       +local mkvmerge_exe = "mkvmerge"

     

       27
       27
       +
       +local yad_exe = "yad"

     

       28
       28
       +
       +local notify_send_exe = "notify-send"

     

       10
       29
        
       +

     

       11
       30
        
        -- default options, convert_script.conf is read

     

       12
       31
        
        local options = {

     

       13
       32
        
            bitrate_multiplier = 0.975,			-- to make sure the file won’t go over the target file size, set it to 1 if you don’t care

     

       14
       14
       -
       @@ -247,12 +247,12 @@

     

       33
       33
       +
       @@ -14,7 +20,7 @@ local options = {

     

       34
       34
       +
            libvpx_options = "--ovcopts-add=cpu-used=0,auto-alt-ref=1,lag-in-frames=25,quality=good",

     

       35
       35
       +
            libvpx_vp9_options = "",

     

       36
       36
       +
            legacy_yad = false,				-- if you don’t want to upgrade to at least yad 0.18

     

       37
       37
       +
       -    libvpx_fps = "--oautofps",			-- --ofps=24000/1001 for example

     

       38
       38
       +
       +    libvpx_fps = "",			-- --ofps=24000/1001 for example

     

       39
       39
       +
            audio_bitrate = 112,			-- mpv default, in kbps

     

       40
       40
       +
        }

     

       41
       41
       +
        

     

       42
       42
       +
       @@ -247,12 +253,12 @@ function encode(enc)

     

       15
       43
        
            if string.len(vf) > 0 then

     

       16
       44
        
                vf = vf .. ","

     

       17
       45
        
            end

     
···

       26
       54
        
            local audio_file = ""

     

       27
       55
        
            for index, param in pairs(audio_file_table) do

     

       28
       56
        
                audio_file = audio_file .. " --audio-file='" .. string.gsub(tostring(param), "'", "'\\''") .. "'"

     

       29
       29
       -
       @@ -354,9 +358,9 @@

     

       57
       57
       +
       @@ -354,9 +360,9 @@ function encode(enc)

     

       30
       58
        
            if ovc == "gif" then

     

       31
       59
        
                full_command = full_command .. ' --vf-add=lavfi=graph=\\"framestep=' .. framestep .. '\\" && convert ' 

     

       32
       60
        
                .. tmpfolder .. '/*.png -set delay ' .. delay .. ' -loop 0 -fuzz ' .. fuzz .. '% ' .. dither .. ' -layers optimize '

     

       33
       61
        
       -        .. full_output_path .. ' && rm -rf ' .. tmpfolder .. ' && notify-send "Gif done") & disown'

     

       34
       34
       -
       +        .. full_output_path .. ' && rm -rf ' .. tmpfolder .. ' && ' .. NOTIFY_CMD .. ' "Gif done") & disown'

     

       62
       62
       +
       +        .. full_output_path .. ' && rm -rf ' .. tmpfolder .. ' && ' .. notify_send_exe .. ' "Gif done") & disown'

     

       35
       63
        
            else

     

       36
       64
        
       -        full_command = full_command .. ' && notify-send "Encoding done"; mkvpropedit '

     

       37
       37
       -
       +        full_command = full_command .. ' && ' .. NOTIFY_CMD .. ' "Encoding done"; mkvpropedit '

     

       65
       65
       +
       +        full_command = full_command .. ' && ' .. notify_send_exe .. ' "Encoding done"; ' .. mkvpropedit_exe .. ' '

     

       38
       66
        
                .. full_output_path .. ' -s title="' .. metadata_title .. '") & disown'

     

       39
       67
        
            end

     

       40
       68
        
            

     

       41
       41
       -
       @@ -409,7 +413,7 @@

     

       69
       69
       +
       @@ -409,7 +415,7 @@ function encode_copy(enc)

     

       42
       70
        
            sep = ",+"

     

       43
       71
        
            

     

       44
       72
        
            if enc then

     

       45
       73
        
       -        local command = "mkvmerge '" .. video .. "' " .. mkvmerge_parts .. " -o " .. full_output_path

     

       46
       46
       -
       +        local command = MKVMERGE_CMD .. " '" .. video .. "' " .. mkvmerge_parts .. " -o " .. full_output_path

     

       74
       74
       +
       +        local command = mkvmerge_exe .. " '" .. video .. "' " .. mkvmerge_parts .. " -o " .. full_output_path

     

       47
       75
        
                msg.info(command)

     

       48
       76
        
                os.execute(command)

     

       49
       77
        
                clear()

     

       50
       50
       -
       @@ -508,7 +512,7 @@

     

       78
       78
       +
       @@ -508,7 +514,7 @@ function call_gui ()

     

       51
       79
        
            end

     

       52
       80
        
            

     

       53
       81
        
            

     

       54
       82
        
       -    local yad_command = [[LC_NUMERIC=C yad --title="Convert Script" --center --form --fixed --always-print-result \

     

       55
       55
       -
       +    local yad_command = [[LC_NUMERIC=C ]] .. YAD_CMD .. [[ --title="Convert Script" --center --form --fixed --always-print-result \

     

       83
       83
       +
       +    local yad_command = [[LC_NUMERIC=C ]] .. yad_exe .. [[ --title="Convert Script" --center --form --fixed --always-print-result \

     

       56
       84
        
            --name "convert script" --class "Convert Script" --field="Resize to height:NUM" "]] .. scale_sav		--yad_table 1

     

       57
       85
        
            .. [[" --field="Resize to width instead:CHK" ]] .. resize_to_width_instead .. " "				--yad_table 2

     

       58
       86
        
            if options.legacy_yad then

     

       59
       59
       -
       @@ -543,7 +547,7 @@

     

       60
       60
       -
            yad_command = yad_command .. [[ --button="Crop:1" --button="gtk-cancel:2" --button="gtk-ok:0"; ret=$? && echo $ret]]

     

       61
       61
       -
            

     

       62
       62
       -
            if gif_dialog then

     

       63
       63
       -
       -        yad_command = [[echo $(LC_NUMERIC=C yad --title="Gif settings" --name "convert script" --class "Convert Script" \

     

       64
       64
       -
       +        yad_command = [[echo $(LC_NUMERIC=C ]] .. YAD_CMD .. [[ --title="Gif settings" --name "convert script" --class "Convert Script" \

     

       65
       65
       -
                --center --form --always-print-result --separator="…" \

     

       66
       66
       -
                --field="Fuzz Factor:NUM" '1!0..100!0.5!1' \

     

       67
       67
       -
                --field="Framestep:NUM" '3!1..3!1' \

     

       87
       87
       +
       @@ -524,7 +530,7 @@ function call_gui ()

     

       88
       88
       +
                yad_command = yad_command

     

       89
       89
       +
                .. [[--field="2pass:CHK" "false" ]]									--yad_table 5

     

       90
       90
       +
                .. [[--field="Encode options::CBE" '! --ovcopts=b=2000,cpu-used=0,auto-alt-ref=1,lag-in-frames=25,quality=good,threads=4' ]]	--yad_table 6

     

       91
       91
       +
       -        .. [[--field="Output format::CBE" ' --ovc=libx264! --oautofps --of=webm --ovc=libvpx' ]]		

     

       92
       92
       +
       +        .. [[--field="Output format::CBE" ' --ovc=libx264! --of=webm --ovc=libvpx' ]]

     

       93
       93
       +
                .. [[--field="Simple:FBTN" 'bash -c "echo \"simple\" && kill -s SIGUSR1 \"$YAD_PID\""' ]]

     

       94
       94
       +
                advanced = true

     

       95
       95
       +
            else

     

       96
       96
       +
       @@ -734,4 +740,4 @@ mp.set_key_bindings({

     

       97
       97
       +
        

     

       98
       98
       +
        mp.add_key_binding("alt+w", "convert_script", convert_script_hotkey_call)

     

       99
       99
       +
        

     

       100
       100
       +
       -mp.register_event("tick", tick)

     

       101
       101
       +
       \ No newline at end of file

     

       102
       102
       +
       +mp.register_event("tick", tick)

+1 -1

pkgs/development/beam-modules/elixir_ls.nix

···

       9
       9
        
         src = fetchFromGitHub {

     

       10
       10
        
           owner = "elixir-lsp";

     

       11
       11
        
           repo = "elixir-ls";

     

       12
       12
       -
           rev = "v{version}";

     

       12
       12
       +
           rev = "v${version}";

     

       13
       13
        
           sha256 = "0d0hqc35hfjkpm88vz21mnm2a9rxiqfrdi83whhhh6d2ba216b7s";

     

       14
       14
        
           fetchSubmodules = true;

     

       15
       15
        
         };

+2 -2

pkgs/development/beam-modules/hex/default.nix

···

       8
       8
        
       

     

       9
       9
        
         pkg = self: stdenv.mkDerivation rec {

     

       10
       10
        
           pname = "hex";

     

       11
       11
       -
           version = "0.21.1";

     

       11
       11
       +
           version = "0.21.2";

     

       12
       12
        
       

     

       13
       13
        
           src = fetchFromGitHub {

     

       14
       14
        
             owner = "hexpm";

     

       15
       15
        
             repo = "hex";

     

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

     

       17
       17
       -
             sha256 = "3V7hp+gK+ixEX+v9vkzQ5y81LN+CSzOIlSkCJB2RFb8=";

     

       17
       17
       +
             sha256 = "18vwrc5b7pyi3nifmx5hd5wbz8fy3h6sfvkmskjg5acmz66fys0g";

     

       18
       18
        
           };

     

       19
       19
        
       

     

       20
       20
        
           setupHook = writeText "setupHook.sh" ''

+5 -6

pkgs/development/libraries/eigen/2.0.nix

···

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitLab {

     

       8
       8
        
           owner = "libeigen";

     

       9
       9
       -
           repo = "eigen";

     

       9
       9
       +
           repo = pname;

     

       10
       10
        
           rev = version;

     

       11
       11
       -
           sha256 = "0d4knrcz04pxmxaqs5r3wv092950kl1z9wsw87vdzi9kgvc6wl0b";

     

       11
       11
       +
           hash = "sha256-C1Bu2H4zxd/2QVzz9AOdoCSRwOYjF41Vr/0S8Fm2kzQ=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         nativeBuildInputs = [ cmake ];

     

       15
       15
        
       

     

       16
       16
        
         meta = with lib; {

     

       17
       17
       +
           homepage = "https://eigen.tuxfamily.org";

     

       17
       18
        
           description = "C++ template library for linear algebra: vectors, matrices, and related algorithms";

     

       18
       19
        
           license = licenses.lgpl3Plus;

     

       19
       19
       -
           homepage = "https://eigen.tuxfamily.org";

     

       20
       20
       -
           maintainers = with lib.maintainers; [ sander raskin ];

     

       21
       21
       -
           branch = "2";

     

       22
       22
       -
           platforms = with lib.platforms; unix;

     

       20
       20
       +
           maintainers = with maintainers; [ sander raskin ];

     

       21
       21
       +
           platforms = platforms.unix;

     

       23
       22
        
         };

     

       24
       23
        
       }

+9 -6

pkgs/development/libraries/eigen/default.nix

···

       1
       1
       -
       { lib, stdenv, fetchFromGitLab, cmake }:

     

       1
       1
       +
       { lib

     

       2
       2
       +
       , stdenv

     

       3
       3
       +
       , fetchFromGitLab

     

       4
       4
       +
       , cmake

     

       5
       5
       +
       }:

     

       2
       6
        
       

     

       3
       7
        
       stdenv.mkDerivation rec {

     

       4
       8
        
         pname = "eigen";

     
···

       6
       10
        
       

     

       7
       11
        
         src = fetchFromGitLab {

     

       8
       12
        
           owner = "libeigen";

     

       9
       9
       -
           repo = "eigen";

     

       13
       13
       +
           repo = pname;

     

       10
       14
        
           rev = version;

     

       11
       11
       -
           sha256 = "1i3cvg8d70dk99fl3lrv3wqhfpdnm5kx01fl7r2bz46sk9bphwm1";

     

       15
       15
       +
           hash = "sha256-oXJ4V5rakL9EPtQF0Geptl0HMR8700FdSrOB09DbbMQ=";

     

       12
       16
        
         };

     

       13
       17
        
       

     

       14
       18
        
         patches = [

     
···

       18
       22
        
         nativeBuildInputs = [ cmake ];

     

       19
       23
        
       

     

       20
       24
        
         meta = with lib; {

     

       25
       25
       +
           homepage = "https://eigen.tuxfamily.org";

     

       21
       26
        
           description = "C++ template library for linear algebra: vectors, matrices, and related algorithms";

     

       22
       27
        
           license = licenses.lgpl3Plus;

     

       23
       23
       -
           homepage = "https://eigen.tuxfamily.org";

     

       28
       28
       +
           maintainers = with maintainers; [ sander raskin ];

     

       24
       29
        
           platforms = platforms.unix;

     

       25
       25
       -
           maintainers = with lib.maintainers; [ sander raskin ];

     

       26
       26
       -
           inherit version;

     

       27
       30
        
         };

     

       28
       31
        
       }

+60 -4

pkgs/development/libraries/lief/default.nix

···

       1
       1
       -
       { lib, fetchzip }:

     

       1
       1
       +
       { lib

     

       2
       2
       +
       , stdenv

     

       3
       3
       +
       , fetchFromGitHub

     

       4
       4
       +
       , python

     

       5
       5
       +
       , cmake

     

       6
       6
       +
       }:

     

       2
       7
        
       

     

       3
       3
       -
       fetchzip {

     

       4
       4
       -
         url = "https://github.com/lief-project/LIEF/releases/download/0.9.0/LIEF-0.9.0-Linux.tar.gz";

     

       5
       5
       -
         sha256 = "1c47hwd00bp4mqd4p5b6xjfl89c3wwk9ccyc3a2gk658250g2la6";

     

       8
       8
       +
       let

     

       9
       9
       +
         pyEnv = python.withPackages (ps: [ ps.setuptools ]);

     

       10
       10
       +
       in

     

       11
       11
       +
       stdenv.mkDerivation rec {

     

       12
       12
       +
         pname = "lief";

     

       13
       13
       +
         version = "0.11.4";

     

       14
       14
       +
       

     

       15
       15
       +
         src = fetchFromGitHub {

     

       16
       16
       +
           owner = "lief-project";

     

       17
       17
       +
           repo = "LIEF";

     

       18
       18
       +
           rev = version;

     

       19
       19
       +
           sha256 = "DgsTrJ2+zdXJK6CdDOan7roakaaxQiwrVeiQnzJnk0A=";

     

       20
       20
       +
         };

     

       21
       21
       +
       

     

       22
       22
       +
         outputs = [ "out" "py" ];

     

       23
       23
       +
       

     

       24
       24
       +
         nativeBuildInputs = [

     

       25
       25
       +
           cmake

     

       26
       26
       +
         ];

     

       27
       27
       +
       

     

       28
       28
       +
         # Not a propagatedBuildInput because only the $py output needs it; $out is

     

       29
       29
       +
         # just the library itself (e.g. C/C++ headers).

     

       30
       30
       +
         buildInputs = [

     

       31
       31
       +
           python

     

       32
       32
       +
         ];

     

       33
       33
       +
       

     

       34
       34
       +
         dontUseCmakeConfigure = true;

     

       35
       35
       +
       

     

       36
       36
       +
         buildPhase = ''

     

       37
       37
       +
           runHook preBuild

     

       38
       38
       +
       

     

       39
       39
       +
           substituteInPlace setup.py \

     

       40
       40
       +
             --replace 'cmake_args = []' "cmake_args = [ \"-DCMAKE_INSTALL_PREFIX=$prefix\" ]"

     

       41
       41
       +
           ${pyEnv.interpreter} setup.py --sdk build --parallel=$NIX_BUILD_CORES

     

       42
       42
       +
       

     

       43
       43
       +
           runHook postBuild

     

       44
       44
       +
         '';

     

       45
       45
       +
       

     

       46
       46
       +
         # I was unable to find a way to build the library itself and have it install

     

       47
       47
       +
         # to $out, while also installing the Python bindings to $py without building

     

       48
       48
       +
         # the project twice (using cmake), so this is the best we've got. It uses

     

       49
       49
       +
         # something called CPack to create the tarball, but it's not obvious to me

     

       50
       50
       +
         # *how* that happens, or how to intercept it to just get the structured

     

       51
       51
       +
         # library output.

     

       52
       52
       +
         installPhase = ''

     

       53
       53
       +
           runHook preInstall

     

       54
       54
       +
       

     

       55
       55
       +
           mkdir -p $out $py/nix-support

     

       56
       56
       +
           echo "${python}" >> $py/nix-support/propagated-build-inputs

     

       57
       57
       +
           tar xf build/*.tar.gz --directory $out --strip-components 1

     

       58
       58
       +
           ${pyEnv.interpreter} setup.py install --skip-build --root=/ --prefix=$py

     

       59
       59
       +
       

     

       60
       60
       +
           runHook postInstall

     

       61
       61
       +
         '';

     

       6
       62
        
       

     

       7
       63
        
         meta = with lib; {

     

       8
       64
        
           description = "Library to Instrument Executable Formats";

+2 -2

pkgs/development/libraries/opencascade-occt/default.nix

···

       3
       3
        
       

     

       4
       4
        
       stdenv.mkDerivation rec {

     

       5
       5
        
         pname = "opencascade-occt";

     

       6
       6
       -
         version = "7.5.0";

     

       6
       6
       +
         version = "7.5.1";

     

       7
       7
        
         commit = "V${builtins.replaceStrings ["."] ["_"] version}";

     

       8
       8
        
       

     

       9
       9
        
         src = fetchurl {

     

       10
       10
        
           name = "occt-${commit}.tar.gz";

     

       11
       11
        
           url = "https://git.dev.opencascade.org/gitweb/?p=occt.git;a=snapshot;h=${commit};sf=tgz";

     

       12
       12
       -
           sha256 = "0bpzpaqki3k6i7xmhan0f1c1fr05smpcmgrp4vh572j61lwpq1r3";

     

       12
       12
       +
           sha256 = "sha256-1whKU+7AMVYabfs15x8MabohKonn5oM54ZEtxF93wAo=";

     

       13
       13
        
         };

     

       14
       14
        
       

     

       15
       15
        
         nativeBuildInputs = [ cmake ninja ];

+3 -3

pkgs/development/libraries/pupnp/default.nix

···

       6
       6
        
       

     

       7
       7
        
       stdenv.mkDerivation rec {

     

       8
       8
        
         pname = "libupnp";

     

       9
       9
       -
         version = "1.14.4";

     

       9
       9
       +
         version = "1.14.6";

     

       10
       10
        
       

     

       11
       11
        
         outputs = [ "out" "dev" ];

     

       12
       12
        
       

     

       13
       13
        
         src = fetchFromGitHub {

     

       14
       14
       -
           owner = "mrjimenez";

     

       14
       14
       +
           owner = "pupnp";

     

       15
       15
        
           repo = "pupnp";

     

       16
       16
        
           rev = "release-${version}";

     

       17
       17
       -
           sha256 = "sha256-4VuTbcEjr9Ffrowb3eOtXFU8zPNu1NXS531EOZpI07A=";

     

       17
       17
       +
           sha256 = "1f9861q5dicp6rx3jnp1j788xfjfaf3k4620p9r0b0k0lj2gk38c";

     

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
        
         nativeBuildInputs = [

+26

pkgs/development/python-modules/css-html-js-minify/default.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , buildPythonPackage

     

       3
       3
       +
       , fetchPypi

     

       4
       4
       +
       }:

     

       5
       5
       +
       

     

       6
       6
       +
       buildPythonPackage rec {

     

       7
       7
       +
         pname = "css-html-js-minify";

     

       8
       8
       +
         version = "2.5.5";

     

       9
       9
       +
       

     

       10
       10
       +
         src = fetchPypi {

     

       11
       11
       +
           inherit pname version;

     

       12
       12
       +
           extension = "zip";

     

       13
       13
       +
           sha256 = "4a9f11f7e0496f5284d12111f3ba4ff5ff2023d12f15d195c9c48bd97013746c";

     

       14
       14
       +
         };

     

       15
       15
       +
       

     

       16
       16
       +
         doCheck = false; # Tests are useless and broken

     

       17
       17
       +
       

     

       18
       18
       +
         pythonImportsCheck = [ "css_html_js_minify" ];

     

       19
       19
       +
       

     

       20
       20
       +
         meta = with lib; {

     

       21
       21
       +
           description = "StandAlone Async cross-platform Minifier for the Web";

     

       22
       22
       +
           homepage = "https://github.com/juancarlospaco/css-html-js-minify";

     

       23
       23
       +
           license = with licenses; [ gpl3Plus lgpl3Plus mit ];

     

       24
       24
       +
           maintainers = with maintainers; [ FlorianFranzen ];

     

       25
       25
       +
         };

     

       26
       26
       +
       }

+33

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

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , buildPythonPackage

     

       3
       3
       +
       , fetchPypi

     

       4
       4
       +
       , gcc-unwrapped

     

       5
       5
       +
       }:

     

       6
       6
       +
       buildPythonPackage rec {

     

       7
       7
       +
         pname = "cxxfilt";

     

       8
       8
       +
         version = "0.2.2";

     

       9
       9
       +
       

     

       10
       10
       +
         src = fetchPypi {

     

       11
       11
       +
           inherit pname version;

     

       12
       12
       +
           sha256 = "ef6810e76d16c95c11b96371e2d8eefd1d270ec03f9bcd07590e8dcc2c69e92b";

     

       13
       13
       +
         };

     

       14
       14
       +
       

     

       15
       15
       +
         postPatch = ''

     

       16
       16
       +
           substituteInPlace cxxfilt/__init__.py \

     

       17
       17
       +
             --replace "find_any_library('stdc++', 'c++')" '"${lib.getLib gcc-unwrapped}/lib/libstdc++.so"'

     

       18
       18
       +
         '';

     

       19
       19
       +
       

     

       20
       20
       +
         # no tests

     

       21
       21
       +
         doCheck = false;

     

       22
       22
       +
       

     

       23
       23
       +
         pythonImportsCheck = [

     

       24
       24
       +
           "cxxfilt"

     

       25
       25
       +
         ];

     

       26
       26
       +
       

     

       27
       27
       +
         meta = with lib; {

     

       28
       28
       +
           description = "Demangling C++ symbols in Python / interface to abi::__cxa_demangle ";

     

       29
       29
       +
           homepage = "https://github.com/afq984/python-cxxfilt";

     

       30
       30
       +
           license = licenses.bsd2;

     

       31
       31
       +
           maintainers = teams.determinatesystems.members;

     

       32
       32
       +
         };

     

       33
       33
       +
       }

+47

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

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , buildPythonPackage

     

       3
       3
       +
       , fetchFromGitHub

     

       4
       4
       +
       , pythonOlder

     

       5
       5
       +
       , requests

     

       6
       6
       +
       , tornado

     

       7
       7
       +
       , poetry-core

     

       8
       8
       +
       , pytestCheckHook

     

       9
       9
       +
       , pytest-cov

     

       10
       10
       +
       , pytest-vcr

     

       11
       11
       +
       }:

     

       12
       12
       +
       

     

       13
       13
       +
       buildPythonPackage rec {

     

       14
       14
       +
         pname = "deezer-python";

     

       15
       15
       +
         version = "2.2.2";

     

       16
       16
       +
         disabled = pythonOlder "3.6";

     

       17
       17
       +
         format = "pyproject";

     

       18
       18
       +
       

     

       19
       19
       +
         src = fetchFromGitHub {

     

       20
       20
       +
           owner = "browniebroke";

     

       21
       21
       +
           repo = pname;

     

       22
       22
       +
           rev = "v${version}";

     

       23
       23
       +
           sha256 = "1l8l4lxlqsj921gk1mxcilp11jx31addiyd9pk604aldgqma709y";

     

       24
       24
       +
         };

     

       25
       25
       +
       

     

       26
       26
       +
         nativeBuildInputs = [

     

       27
       27
       +
           poetry-core

     

       28
       28
       +
         ];

     

       29
       29
       +
       

     

       30
       30
       +
         checkInputs = [

     

       31
       31
       +
           pytestCheckHook

     

       32
       32
       +
           pytest-cov

     

       33
       33
       +
           pytest-vcr

     

       34
       34
       +
         ];

     

       35
       35
       +
       

     

       36
       36
       +
         propagatedBuildInputs = [

     

       37
       37
       +
           requests

     

       38
       38
       +
           tornado

     

       39
       39
       +
         ];

     

       40
       40
       +
       

     

       41
       41
       +
         meta = with lib; {

     

       42
       42
       +
           description = "A friendly Python wrapper around the Deezer API";

     

       43
       43
       +
           homepage = "https://github.com/browniebroke/deezer-python";

     

       44
       44
       +
           license = licenses.mit;

     

       45
       45
       +
           maintainers = with maintainers; [ synthetica ];

     

       46
       46
       +
         };

     

       47
       47
       +
       }

+31

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

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , buildPythonPackage

     

       3
       3
       +
       , fetchPypi

     

       4
       4
       +
       , pytestCheckHook

     

       5
       5
       +
       , pytest-cov

     

       6
       6
       +
       }:

     

       7
       7
       +
       buildPythonPackage rec {

     

       8
       8
       +
         pname = "multimethod";

     

       9
       9
       +
         version = "1.5";

     

       10
       10
       +
       

     

       11
       11
       +
         src = fetchPypi {

     

       12
       12
       +
           inherit pname version;

     

       13
       13
       +
           sha256 = "b9c6f85ecf187f14a3951fff319643e1fac3086d757dec64f2469e1fd136b65d";

     

       14
       14
       +
         };

     

       15
       15
       +
       

     

       16
       16
       +
         checkInputs = [

     

       17
       17
       +
           pytestCheckHook

     

       18
       18
       +
           pytest-cov

     

       19
       19
       +
         ];

     

       20
       20
       +
       

     

       21
       21
       +
         pythomImportsCheck = [

     

       22
       22
       +
           "multimethod"

     

       23
       23
       +
         ];

     

       24
       24
       +
       

     

       25
       25
       +
         meta = with lib; {

     

       26
       26
       +
           description = "Multiple argument dispatching";

     

       27
       27
       +
           homepage = "https://github.com/coady/multimethod";

     

       28
       28
       +
           license = licenses.asl20;

     

       29
       29
       +
           maintainers = teams.determinatesystems.members;

     

       30
       30
       +
         };

     

       31
       31
       +
       }

+7 -4

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

···

       8
       8
        
       

     

       9
       9
        
       buildPythonPackage rec {

     

       10
       10
        
         pname = "pg8000";

     

       11
       11
       -
         version = "1.19.0";

     

       11
       11
       +
         version = "1.19.2";

     

       12
       12
        
         disabled = pythonOlder "3.6";

     

       13
       13
        
       

     

       14
       14
        
         src = fetchPypi {

     

       15
       15
        
           inherit pname version;

     

       16
       16
       -
           sha256 = "sha256-EexwwLIOpECAfiyGmUDxSE7qk9cbQ1gHtjhW3YK3RN0=";

     

       16
       16
       +
           sha256 = "sha256-RMu008kS8toWfKAr+YoAQPfpMmDk7xFMKNXWFSAS6gc=";

     

       17
       17
        
         };

     

       18
       18
        
       

     

       19
       19
       -
         propagatedBuildInputs = [passlib scramp ];

     

       19
       19
       +
         propagatedBuildInputs = [

     

       20
       20
       +
           passlib

     

       21
       21
       +
           scramp

     

       22
       22
       +
         ];

     

       20
       23
        
       

     

       21
       24
        
         postPatch = ''

     

       22
       25
        
           substituteInPlace setup.py \

     

       23
       23
       -
             --replace "scramp==1.3.0" "scramp>=1.3.0"

     

       26
       26
       +
             --replace "scramp==1.4.0" "scramp>=1.4.0"

     

       24
       27
        
         '';

     

       25
       28
        
       

     

       26
       29
        
         # Tests require a running PostgreSQL instance

+27

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

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , buildPythonPackage

     

       3
       3
       +
       , fetchPypi

     

       4
       4
       +
       }:

     

       5
       5
       +
       buildPythonPackage rec {

     

       6
       6
       +
         pname = "plugnplay";

     

       7
       7
       +
         version = "0.5.4";

     

       8
       8
       +
       

     

       9
       9
       +
         src = fetchPypi {

     

       10
       10
       +
           inherit pname version;

     

       11
       11
       +
           sha256 = "877e2d2500a45aaf31e5175f9f46182088d3e2d64c1c6b9ff6c778ae0ee594c8";

     

       12
       12
       +
         };

     

       13
       13
       +
       

     

       14
       14
       +
         # no tests

     

       15
       15
       +
         doCheck = false;

     

       16
       16
       +
       

     

       17
       17
       +
         pythonImportsCheck = [

     

       18
       18
       +
           "plugnplay"

     

       19
       19
       +
         ];

     

       20
       20
       +
       

     

       21
       21
       +
         meta = with lib; {

     

       22
       22
       +
           description = "A Generic plug-in system for python applications";

     

       23
       23
       +
           homepage = "https://github.com/daltonmatos/plugnplay";

     

       24
       24
       +
           license = licenses.gpl2Only;

     

       25
       25
       +
           maintainers = teams.determinatesystems.members;

     

       26
       26
       +
         };

     

       27
       27
       +
       }

+12

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

···

       1
       1
        
       { buildPythonPackage

     

       2
       2
       +
       , addOpenGLRunpath

     

       2
       3
        
       , fetchPypi

     

       3
       4
        
       , fetchFromGitHub

     

       4
       5
        
       , Mako

     
···

       40
       41
        
           ln -s ${compyte} $out/${python.sitePackages}/pycuda/compyte

     

       41
       42
        
         '';

     

       42
       43
        
       

     

       44
       44
       +
         postFixup = ''

     

       45
       45
       +
           find $out/lib -type f \( -name '*.so' -or -name '*.so.*' \) | while read lib; do

     

       46
       46
       +
             echo "setting opengl runpath for $lib..."

     

       47
       47
       +
             addOpenGLRunpath "$lib"

     

       48
       48
       +
           done

     

       49
       49
       +
         '';

     

       50
       50
       +
       

     

       43
       51
        
         # Requires access to libcuda.so.1 which is provided by the driver

     

       44
       52
        
         doCheck = false;

     

       45
       53
        
       

     

       46
       54
        
         checkPhase = ''

     

       47
       55
        
           py.test

     

       48
       56
        
         '';

     

       57
       57
       +
       

     

       58
       58
       +
         nativeBuildInputs = [

     

       59
       59
       +
           addOpenGLRunpath

     

       60
       60
       +
         ];

     

       49
       61
        
       

     

       50
       62
        
         propagatedBuildInputs = [

     

       51
       63
        
           numpy

+9 -4

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

···

       2
       2
        
       

     

       3
       3
        
       buildPythonPackage rec {

     

       4
       4
        
         pname = "pymavlink";

     

       5
       5
       -
         version = "2.4.14";

     

       5
       5
       +
         version = "2.4.15";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchPypi {

     

       8
       8
        
           inherit pname version;

     

       9
       9
       -
           sha256 = "3bc3709c735ebb3f98f19e96c8887868f4671077d4808076cfc5445912633881";

     

       9
       9
       +
           sha256 = "106va20k0ahy0l2qvxf8k5pvqkgdmxbgzd9kij9fkrahlba5mx3v";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         propagatedBuildInputs = [ future lxml ];

     

       13
       13
        
       

     

       14
       14
       -
         # No tests included in PyPI tarball

     

       14
       14
       +
         # No tests included in PyPI tarball. We cannot use the GitHub tarball because

     

       15
       15
       +
         # we would like to use the same commit of the mavlink messages repo as

     

       16
       16
       +
         # included in the PyPI tarball, and there is no easy way to determine what

     

       17
       17
       +
         # commit is included.

     

       15
       18
        
         doCheck = false;

     

       16
       19
        
       

     

       20
       20
       +
         pythonImportsCheck = [ "pymavlink" ];

     

       21
       21
       +
       

     

       17
       22
        
         meta = with lib; {

     

       18
       23
        
           description = "Python MAVLink interface and utilities";

     

       19
       24
        
           homepage = "https://github.com/ArduPilot/pymavlink";

     

       20
       20
       -
           license = licenses.lgpl3;

     

       25
       25
       +
           license = with licenses; [ lgpl3Only mit ];

     

       21
       26
        
           maintainers = with maintainers; [ lopsided98 ];

     

       22
       27
        
         };

     

       23
       28
        
       }

+1 -1

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

···

       18
       18
        
       }:

     

       19
       19
        
       

     

       20
       20
        
       buildPythonPackage rec {

     

       21
       21
       -
         pname = "python-slackclient";

     

       21
       21
       +
         pname = "slackclient";

     

       22
       22
        
         version = "2.9.3";

     

       23
       23
        
       

     

       24
       24
        
         disabled = !isPy3k;

+41

pkgs/development/python-modules/sphinx-material/default.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , buildPythonPackage

     

       3
       3
       +
       , fetchPypi

     

       4
       4
       +
       , sphinx

     

       5
       5
       +
       , beautifulsoup4

     

       6
       6
       +
       , python-slugify

     

       7
       7
       +
       , unidecode

     

       8
       8
       +
       , css-html-js-minify

     

       9
       9
       +
       , lxml

     

       10
       10
       +
       }:

     

       11
       11
       +
       

     

       12
       12
       +
       buildPythonPackage rec {

     

       13
       13
       +
         pname = "sphinx-material";

     

       14
       14
       +
         version = "0.0.32";

     

       15
       15
       +
       

     

       16
       16
       +
         src = fetchPypi {

     

       17
       17
       +
           pname = "sphinx_material";

     

       18
       18
       +
           inherit version;

     

       19
       19
       +
           sha256 = "ec02825a1bbe8b662fe624c11b87f1cd8d40875439b5b18c38649cf3366201fa";

     

       20
       20
       +
         };

     

       21
       21
       +
       

     

       22
       22
       +
         propagatedBuildInputs = [

     

       23
       23
       +
           sphinx

     

       24
       24
       +
           beautifulsoup4

     

       25
       25
       +
           python-slugify

     

       26
       26
       +
           unidecode

     

       27
       27
       +
           css-html-js-minify

     

       28
       28
       +
           lxml

     

       29
       29
       +
         ];

     

       30
       30
       +
       

     

       31
       31
       +
         doCheck = false; # no tests

     

       32
       32
       +
       

     

       33
       33
       +
         pythonImportsCheck = [ "sphinx_material" ];

     

       34
       34
       +
       

     

       35
       35
       +
         meta = with lib; {

     

       36
       36
       +
           description = "A material-based, responsive theme inspired by mkdocs-material";

     

       37
       37
       +
           homepage = "https://bashtage.github.io/sphinx-material";

     

       38
       38
       +
           license = licenses.mit;

     

       39
       39
       +
           maintainers = with maintainers; [ FlorianFranzen ];

     

       40
       40
       +
         };

     

       41
       41
       +
       }

+49

pkgs/development/python-modules/viv-utils/default.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , buildPythonPackage

     

       3
       3
       +
       , isPy3k

     

       4
       4
       +
       , fetchFromGitHub

     

       5
       5
       +
       , funcy

     

       6
       6
       +
       , pefile

     

       7
       7
       +
       , vivisect

     

       8
       8
       +
       , intervaltree

     

       9
       9
       +
       , setuptools

     

       10
       10
       +
       }:

     

       11
       11
       +
       buildPythonPackage rec {

     

       12
       12
       +
         pname = "viv-utils";

     

       13
       13
       +
         version = "0.3.17";

     

       14
       14
       +
         disabled = isPy3k;

     

       15
       15
       +
       

     

       16
       16
       +
         src = fetchFromGitHub {

     

       17
       17
       +
           owner = "williballenthin";

     

       18
       18
       +
           repo = "viv-utils";

     

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

     

       20
       20
       +
           sha256 = "wZWp6PMn1to/jP6lzlY/x0IhS/0w0Ys7AdklNQ+Vmyc=";

     

       21
       21
       +
         };

     

       22
       22
       +
       

     

       23
       23
       +
         # argparse is provided by Python itself

     

       24
       24
       +
         preBuild = ''

     

       25
       25
       +
           sed '/"argparse",/d' -i setup.py

     

       26
       26
       +
         '';

     

       27
       27
       +
       

     

       28
       28
       +
         propagatedBuildInputs = [

     

       29
       29
       +
           funcy

     

       30
       30
       +
           pefile

     

       31
       31
       +
           vivisect

     

       32
       32
       +
           intervaltree

     

       33
       33
       +
           setuptools

     

       34
       34
       +
         ];

     

       35
       35
       +
       

     

       36
       36
       +
         # no tests

     

       37
       37
       +
         doCheck = false;

     

       38
       38
       +
       

     

       39
       39
       +
         pythonImportsCheck = [

     

       40
       40
       +
           "viv_utils"

     

       41
       41
       +
         ];

     

       42
       42
       +
       

     

       43
       43
       +
         meta = with lib; {

     

       44
       44
       +
           description = "Utilities for working with vivisect";

     

       45
       45
       +
           homepage = "https://github.com/williballenthin/viv-utils";

     

       46
       46
       +
           license = licenses.asl20;

     

       47
       47
       +
           maintainers = teams.determinatesystems.members;

     

       48
       48
       +
         };

     

       49
       49
       +
       }

+46

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

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , buildPythonPackage

     

       3
       3
       +
       , isPy3k

     

       4
       4
       +
       , fetchPypi

     

       5
       5
       +
       , pyasn1

     

       6
       6
       +
       , pyasn1-modules

     

       7
       7
       +
       , cxxfilt

     

       8
       8
       +
       , msgpack

     

       9
       9
       +
       , pycparser

     

       10
       10
       +
       }:

     

       11
       11
       +
       buildPythonPackage rec {

     

       12
       12
       +
         pname = "vivisect";

     

       13
       13
       +
         version = "0.1.0";

     

       14
       14
       +
         disabled = isPy3k;

     

       15
       15
       +
       

     

       16
       16
       +
         src = fetchPypi {

     

       17
       17
       +
           inherit pname version;

     

       18
       18
       +
           sha256 = "ed5e8c24684841d30dc7b41f2bee87c0198816a453417ae2e130b7845ccb2629";

     

       19
       19
       +
         };

     

       20
       20
       +
       

     

       21
       21
       +
         propagatedBuildInputs = [

     

       22
       22
       +
           pyasn1

     

       23
       23
       +
           pyasn1-modules

     

       24
       24
       +
           cxxfilt

     

       25
       25
       +
           msgpack

     

       26
       26
       +
           pycparser

     

       27
       27
       +
         ];

     

       28
       28
       +
       

     

       29
       29
       +
         preBuild = ''

     

       30
       30
       +
           sed "s@==.*'@'@" -i setup.py

     

       31
       31
       +
         '';

     

       32
       32
       +
       

     

       33
       33
       +
         # requires another repo for test files

     

       34
       34
       +
         doCheck = false;

     

       35
       35
       +
       

     

       36
       36
       +
         pythonImportsCheck = [

     

       37
       37
       +
           "vivisect"

     

       38
       38
       +
         ];

     

       39
       39
       +
       

     

       40
       40
       +
         meta = with lib; {

     

       41
       41
       +
           description = "Pure python disassembler, debugger, emulator, and static analysis framework";

     

       42
       42
       +
           homepage = "https://github.com/vivisect/vivisect";

     

       43
       43
       +
           license = licenses.asl20;

     

       44
       44
       +
           maintainers = teams.determinatesystems.members;

     

       45
       45
       +
         };

     

       46
       46
       +
       }

+2 -3

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

···

       1
       1
        
       { lib

     

       2
       2
        
       , buildPythonPackage

     

       3
       3
        
       , fetchFromGitHub

     

       4
       4
       -
       , pytestCheckHook

     

       5
       4
        
       , inetutils

     

       6
       5
        
       }:

     

       7
       6
        
       

     

       8
       7
        
       buildPythonPackage rec {

     

       9
       8
        
         pname = "whois";

     

       10
       10
       -
         version = "0.9.7";

     

       9
       9
       +
         version = "0.9.13";

     

       11
       10
        
       

     

       12
       11
        
         src = fetchFromGitHub {

     

       13
       12
        
           owner = "DannyCork";

     

       14
       13
        
           repo = "python-whois";

     

       15
       14
        
           rev = version;

     

       16
       16
       -
           sha256 = "1rbc4xif4dn455vc8dhxdvwszrb0nik5q9fy12db6mxfx6zikb7z";

     

       15
       15
       +
           sha256 = "0y2sfs6nkr2j2crrn81wkfdzn9aphb3iaddya5zd2midlgdqq7bw";

     

       17
       16
        
         };

     

       18
       17
        
       

     

       19
       18
        
         # whois is needed

+36

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

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , buildPythonPackage

     

       3
       3
       +
       , fetchPypi

     

       4
       4
       +
       , click

     

       5
       5
       +
       , multimethod

     

       6
       6
       +
       , numpy

     

       7
       7
       +
       }:

     

       8
       8
       +
       buildPythonPackage rec {

     

       9
       9
       +
         pname = "woodblock";

     

       10
       10
       +
         version = "0.1.7";

     

       11
       11
       +
       

     

       12
       12
       +
         src = fetchPypi {

     

       13
       13
       +
           inherit pname version;

     

       14
       14
       +
           sha256 = "c0347ece920b7009d94551983a01f42db02920ca8d7b0ff36d24a337e2c937f7";

     

       15
       15
       +
         };

     

       16
       16
       +
       

     

       17
       17
       +
         propagatedBuildInputs = [

     

       18
       18
       +
           click

     

       19
       19
       +
           multimethod

     

       20
       20
       +
           numpy

     

       21
       21
       +
         ];

     

       22
       22
       +
       

     

       23
       23
       +
         # no tests

     

       24
       24
       +
         doCheck = false;

     

       25
       25
       +
       

     

       26
       26
       +
         pythonImportsCheck = [

     

       27
       27
       +
           "woodblock"

     

       28
       28
       +
         ];

     

       29
       29
       +
       

     

       30
       30
       +
         meta = with lib; {

     

       31
       31
       +
           description = "A framework to generate file carving test data";

     

       32
       32
       +
           homepage = "https://github.com/fkie-cad/woodblock";

     

       33
       33
       +
           license = licenses.mit;

     

       34
       34
       +
           maintainers = teams.determinatesystems.members;

     

       35
       35
       +
         };

     

       36
       36
       +
       }

+3 -3

pkgs/development/tools/azcopy/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "azure-storage-azcopy";

     

       5
       5
       -
         version = "10.9.0";

     

       5
       5
       +
         version = "10.10.0";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "Azure";

     

       9
       9
        
           repo = "azure-storage-azcopy";

     

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

     

       11
       11
       -
           sha256 = "sha256-IVbvBqp/7Y3La0pP6gbWl0ATfEvkCuR4J9ChTDPNhB0=";

     

       11
       11
       +
           sha256 = "sha256-gWU219QlV+24RxnTHqQzQeGZHzVwmBXNKU+3QI6WvHI=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         subPackages = [ "." ];

     

       15
       15
        
       

     

       16
       16
       -
         vendorSha256 = "sha256-mj1TvNuFFPJGAJCBTQtU5WWPhHbiXUxRiMZQ/XvEy0U=";

     

       16
       16
       +
         vendorSha256 = "sha256-d965Rt8W74bsIZAZPZLe3twuUpp4wrnNc0qwjsKikOE=";

     

       17
       17
        
       

     

       18
       18
        
         doCheck = false;

     

       19
       19

+2 -2

pkgs/servers/home-assistant/component-packages.nix

···

       90
       90
        
           "blueprint" = ps: with ps; [ ];

     

       91
       91
        
           "bluesound" = ps: with ps; [ xmltodict ];

     

       92
       92
        
           "bluetooth_le_tracker" = ps: with ps; [ ]; # missing inputs: pygatt[GATTTOOL]

     

       93
       93
       -
           "bluetooth_tracker" = ps: with ps; [ bt_proximity ]; # missing inputs: pybluez

     

       93
       93
       +
           "bluetooth_tracker" = ps: with ps; [ bt_proximity pybluez ];

     

       94
       94
        
           "bme280" = ps: with ps; [ smbus-cffi ]; # missing inputs: i2csense

     

       95
       95
        
           "bme680" = ps: with ps; [ bme680 smbus-cffi ];

     

       96
       96
        
           "bmp280" = ps: with ps; [ ]; # missing inputs: RPi.GPIO adafruit-circuitpython-bmp280

     
···

       750
       750
        
           "sky_hub" = ps: with ps; [ ]; # missing inputs: pyskyqhub

     

       751
       751
        
           "skybeacon" = ps: with ps; [ ]; # missing inputs: pygatt[GATTTOOL]

     

       752
       752
        
           "skybell" = ps: with ps; [ skybellpy ];

     

       753
       753
       -
           "slack" = ps: with ps; [ ]; # missing inputs: slackclient

     

       753
       753
       +
           "slack" = ps: with ps; [ slackclient ];

     

       754
       754
        
           "sleepiq" = ps: with ps; [ sleepyq ];

     

       755
       755
        
           "slide" = ps: with ps; [ ]; # missing inputs: goslide-api

     

       756
       756
        
           "sma" = ps: with ps; [ pysma ];

+1

pkgs/servers/home-assistant/default.nix

+4 -1

pkgs/servers/home-assistant/parse-requirements.py

···

       124
       124
        
           for name in names:

     

       125
       125
        
               # treat "-" and "_" equally

     

       126
       126
        
               name = re.sub("[-_]", "[-_]", name)

     

       127
       127
       -
               pattern = re.compile("^python\\d\\.\\d-{}-\\d".format(name), re.I)

     

       127
       127
       +
               # python(minor).(major)-(pname)-(version or unstable-date)

     

       128
       128
       +
               # we need the version qualifier, or we'll have multiple matches

     

       129
       129
       +
               # (e.g. pyserial and pyserial-asyncio when looking for pyserial)

     

       130
       130
       +
               pattern = re.compile("^python\\d\\.\\d-{}-(?:\\d|unstable-.*)".format(name), re.I)

     

       128
       131
        
               for attr_path, package in packages.items():

     

       129
       132
        
                   if pattern.match(package["name"]):

     

       130
       133
        
                       attr_paths.add(attr_path)

+29

pkgs/servers/sql/postgresql/ext/pgvector.nix

···

       1
       1
       +
       { lib, stdenv, fetchFromGitHub, postgresql }:

     

       2
       2
       +
       

     

       3
       3
       +
       stdenv.mkDerivation rec {

     

       4
       4
       +
         pname = "pgvector";

     

       5
       5
       +
         version = "0.1.0";

     

       6
       6
       +
       

     

       7
       7
       +
         src = fetchFromGitHub {

     

       8
       8
       +
           owner = "ankane";

     

       9
       9
       +
           repo = pname;

     

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

     

       11
       11
       +
           sha256 = "03i8rq9wp9j2zdba82q31lzbrqpnhrqc8867pxxy3z505fxsvfzb";

     

       12
       12
       +
         };

     

       13
       13
       +
       

     

       14
       14
       +
         buildInputs = [ postgresql ];

     

       15
       15
       +
       

     

       16
       16
       +
         installPhase = ''

     

       17
       17
       +
           install -D -t $out/lib vector.so

     

       18
       18
       +
           install -D -t $out/share/postgresql/extension vector-*.sql

     

       19
       19
       +
           install -D -t $out/share/postgresql/extension vector.control

     

       20
       20
       +
         '';

     

       21
       21
       +
       

     

       22
       22
       +
         meta = with lib; {

     

       23
       23
       +
           description = "Open-source vector similarity search for PostgreSQL";

     

       24
       24
       +
           homepage = "https://github.com/ankane/pgvector";

     

       25
       25
       +
           license = licenses.postgresql;

     

       26
       26
       +
           platforms = postgresql.meta.platforms;

     

       27
       27
       +
           maintainers = [ maintainers.marsam ];

     

       28
       28
       +
         };

     

       29
       29
       +
       }

+2

pkgs/servers/sql/postgresql/packages.nix

···

       25
       25
        
       

     

       26
       26
        
           pgroonga = super.callPackage ./ext/pgroonga.nix { };

     

       27
       27
        
       

     

       28
       28
       +
           pgvector = super.callPackage ./ext/pgvector.nix { };

     

       29
       29
       +
       

     

       28
       30
        
           plpgsql_check = super.callPackage ./ext/plpgsql_check.nix { };

     

       29
       31
        
       

     

       30
       32
        
           plr = super.callPackage ./ext/plr.nix { };

+3 -3

pkgs/tools/misc/chezmoi/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "chezmoi";

     

       5
       5
       -
         version = "2.0.9";

     

       5
       5
       +
         version = "2.0.10";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "twpayne";

     

       9
       9
        
           repo = "chezmoi";

     

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

     

       11
       11
       -
           sha256 = "sha256-yDd9u9cwC+bjB0ZQW0EgEDaHmWwkUprwXIiVrOVP2nk=";

     

       11
       11
       +
           sha256 = "sha256-WVG4rww9Wd1H6zw5lRBErX9VwnA21dhvith9BQFYqxw=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         vendorSha256 = "sha256-c6YIWpC8sQA/gbgD2vuuFvwccEE00aUrj6gcPpJsn0k=";

     

       14
       14
       +
         vendorSha256 = "sha256-khYcNP3xAXeQR9vaghkGq8x6KB1k5hLEcE7Zx8H+CfA=";

     

       15
       15
        
       

     

       16
       16
        
         doCheck = false;

     

       17
       17

+3 -3

pkgs/tools/misc/goreleaser/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "goreleaser";

     

       5
       5
       -
         version = "0.162.0";

     

       5
       5
       +
         version = "0.163.1";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "goreleaser";

     

       9
       9
        
           repo = pname;

     

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

     

       11
       11
       -
           sha256 = "sha256-nhl6GATzFsfEQjKVxz65REn9QTvOH49omU00ZCfO6CY=";

     

       11
       11
       +
           sha256 = "sha256-2SDy/Mk4TkXkJKF1gFW7/FH4Y31TE2X38I0r/Ng/BjU=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         vendorSha256 = "sha256-zq/RIOK/Hs1GJ2yLE7pe0UoDuR6LGUrPQAuQzrTvuKs=";

     

       14
       14
       +
         vendorSha256 = "sha256-+Qdxnd+IhBNfZ0R2lCfPGJSjpTw1TA6uPjykCfrYtMk=";

     

       15
       15
        
       

     

       16
       16
        
         buildFlagsArray = [

     

       17
       17
        
           "-ldflags="

+2 -2

pkgs/tools/misc/pcb2gcode/default.nix

···

       13
       13
        
       

     

       14
       14
        
       stdenv.mkDerivation rec {

     

       15
       15
        
         pname = "pcb2gcode";

     

       16
       16
       -
         version = "2.3.0";

     

       16
       16
       +
         version = "2.3.1";

     

       17
       17
        
       

     

       18
       18
        
         src = fetchFromGitHub {

     

       19
       19
        
           owner = "pcb2gcode";

     

       20
       20
        
           repo = "pcb2gcode";

     

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

     

       22
       22
       -
           sha256 = "sha256-BELugmnnedqXTnSwiQN3XbqkWKTKF27ElQAwrEWNSao=";

     

       22
       22
       +
           sha256 = "sha256-blbfpMBe7X3OrNbBiz8fNzKcS/bbViQUTXtdxZpXPBk=";

     

       23
       23
        
         };

     

       24
       24
        
       

     

       25
       25
        
         nativeBuildInputs = [ autoreconfHook pkg-config ];

+3 -3

pkgs/tools/misc/starship/default.nix

···

       11
       11
        
       

     

       12
       12
        
       rustPlatform.buildRustPackage rec {

     

       13
       13
        
         pname = "starship";

     

       14
       14
       -
         version = "0.51.0";

     

       14
       14
       +
         version = "0.52.1";

     

       15
       15
        
       

     

       16
       16
        
         src = fetchFromGitHub {

     

       17
       17
        
           owner = "starship";

     

       18
       18
        
           repo = pname;

     

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

     

       20
       20
       -
           sha256 = "1bmnwvjhw2ba7yqn9if83d57b8qbrbqgy2br8q2drz4ylk0gjirg";

     

       20
       20
       +
           sha256 = "sha256-BX+NUF7mgZyrloj3h9YcG2r6ZZWO20hXQYbBvaK34JQ=";

     

       21
       21
        
         };

     

       22
       22
        
       

     

       23
       23
        
         nativeBuildInputs = [ installShellFiles ] ++ lib.optionals stdenv.isLinux [ pkg-config ];

     
···

       32
       32
        
           done

     

       33
       33
        
         '';

     

       34
       34
        
       

     

       35
       35
       -
         cargoSha256 = "1d4ca8yzx437x53i7z2kddv9db89zy6ywbgl6y1cwwd6wscbrxcq";

     

       35
       35
       +
         cargoSha256 = "sha256-8xqbPkdIVfAkeG1WZFq56N0rcF+uh2FeMKzz4FgMFYs=";

     

       36
       36
        
       

     

       37
       37
        
         preCheck = ''

     

       38
       38
        
           HOME=$TMPDIR

+3 -3

pkgs/tools/misc/vector/default.nix

···

       18
       18
        
       

     

       19
       19
        
       rustPlatform.buildRustPackage rec {

     

       20
       20
        
         pname = "vector";

     

       21
       21
       -
         version = "0.12.2";

     

       21
       21
       +
         version = "0.13.0";

     

       22
       22
        
       

     

       23
       23
        
         src = fetchFromGitHub {

     

       24
       24
        
           owner = "timberio";

     

       25
       25
        
           repo = pname;

     

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

     

       27
       27
       -
           sha256 = "sha256-LutCzpJo47wvEze7bAObRVraNhVuQFc9NQ79NzKA9CM=";

     

       27
       27
       +
           sha256 = "sha256-Sur5QfPIoJXkcYdyNlIHOvmV2yBedhNm7UinmaFEc2E=";

     

       28
       28
        
         };

     

       29
       29
        
       

     

       30
       30
       -
         cargoSha256 = "sha256-GU5p9DB5Bk8eQc1B/WA87grbVJVcT1ELJ0WzmRYgDzc=";

     

       30
       30
       +
         cargoSha256 = "sha256-1Xm1X1pfx9J0tBck2WA+zt2OxtQsqustcWPazsPyKPY=";

     

       31
       31
        
         nativeBuildInputs = [ pkg-config ];

     

       32
       32
        
         buildInputs = [ openssl protobuf rdkafka ]

     

       33
       33
        
           ++ lib.optional stdenv.isDarwin [ Security libiconv coreutils CoreServices ];

+3 -3

pkgs/tools/networking/croc/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "croc";

     

       5
       5
       -
         version = "8.6.12";

     

       5
       5
       +
         version = "9.1.0";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "schollz";

     

       9
       9
        
           repo = pname;

     

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

     

       11
       11
       -
           sha256 = "sha256-Oad0JpeeCpIHfH9e1pTKtrnvZ+eFx3dR5GP6g6piFS0=";

     

       11
       11
       +
           sha256 = "sha256-teH4Y6PrUSE7Rxw0WV7Ka+CB44nwYXy9q09wOAhC8Bc=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         vendorSha256 = "sha256-LYMZFaCNlJg+9Hoh2VbY6tMHv6oT7r+JHBcQYpOceRQ=";

     

       14
       14
       +
         vendorSha256 = "sha256-HPUvL22BrVH9/j41VFaystZWs0LO6KNIf2cNYqKxWnY=";

     

       15
       15
        
       

     

       16
       16
        
         doCheck = false;

     

       17
       17

+4 -4

pkgs/tools/networking/lychee/default.nix

···

       7
       7
        
       

     

       8
       8
        
       rustPlatform.buildRustPackage rec {

     

       9
       9
        
         pname = "lychee";

     

       10
       10
       -
         version = "0.5.0";

     

       10
       10
       +
         version = "0.7.0";

     

       11
       11
        
       

     

       12
       12
        
         src = fetchFromGitHub {

     

       13
       13
        
           owner = "lycheeverse";

     

       14
       14
        
           repo = pname;

     

       15
       15
       -
           rev = "v${version}";

     

       16
       16
       -
           sha256 = "03dsp0384mwr51dkqfl25xba0m17sppabiz7slhxcig89b0ksykm";

     

       15
       15
       +
           rev = version;

     

       16
       16
       +
           sha256 = "0kpwpbv0dqb0p4bxjlcjas6x1n91rdsvy2psrc1nyr1sh6gb1q5j";

     

       17
       17
        
         };

     

       18
       18
        
       

     

       19
       19
       -
         cargoSha256 = "08y2wpm2qgm2jsy257b2p2anxy4q3bj2kfdr5cnb6wnaz9g4ypq2";

     

       19
       19
       +
         cargoSha256 = "1b915zkg41n3azk4hhg6fgc83n7iq8p7drvdyil2m2a4qdjvp9r3";

     

       20
       20
        
       

     

       21
       21
        
         nativeBuildInputs = [ pkg-config ];

     

       22
       22

+46

pkgs/tools/security/flare-floss/default.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , python2

     

       3
       3
       +
       , fetchFromGitHub

     

       4
       4
       +
       }:

     

       5
       5
       +
       python2.pkgs.buildPythonPackage rec {

     

       6
       6
       +
         pname = "flare-floss";

     

       7
       7
       +
         version = "1.7.0";

     

       8
       8
       +
       

     

       9
       9
       +
         src = fetchFromGitHub {

     

       10
       10
       +
           owner = "fireeye";

     

       11
       11
       +
           repo = "flare-floss";

     

       12
       12
       +
           rev = "v${version}";

     

       13
       13
       +
           sha256 = "GMOA1+qM2A/Qw33kOTIINEvjsfqjWQWBXHNemh3IK8w=";

     

       14
       14
       +
         };

     

       15
       15
       +
       

     

       16
       16
       +
         propagatedBuildInputs = with python2.pkgs; [

     

       17
       17
       +
           pyyaml

     

       18
       18
       +
           simplejson

     

       19
       19
       +
           tabulate

     

       20
       20
       +
           vivisect

     

       21
       21
       +
           plugnplay

     

       22
       22
       +
           viv-utils

     

       23
       23
       +
           enum34

     

       24
       24
       +
         ];

     

       25
       25
       +
       

     

       26
       26
       +
         checkInputs = [

     

       27
       27
       +
           python2.pkgs.pytestCheckHook

     

       28
       28
       +
         ];

     

       29
       29
       +
       

     

       30
       30
       +
         disabledTests = [

     

       31
       31
       +
           # test data is in a submodule

     

       32
       32
       +
           "test_main"

     

       33
       33
       +
         ];

     

       34
       34
       +
       

     

       35
       35
       +
         pythonImportsCheck = [

     

       36
       36
       +
           "floss"

     

       37
       37
       +
           "floss.plugins"

     

       38
       38
       +
         ];

     

       39
       39
       +
       

     

       40
       40
       +
         meta = with lib; {

     

       41
       41
       +
           description = "Automatically extract obfuscated strings from malware";

     

       42
       42
       +
           homepage = "https://github.com/fireeye/flare-floss";

     

       43
       43
       +
           license = licenses.asl20;

     

       44
       44
       +
           maintainers = teams.determinatesystems.members;

     

       45
       45
       +
         };

     

       46
       46
       +
       }

+11 -4

pkgs/tools/security/yarGen/default.nix

···

       1
       1
        
       { lib

     

       2
       2
        
       , python3

     

       3
       3
        
       , fetchFromGitHub

     

       4
       4
       +
       , fetchpatch

     

       4
       5
        
       }:

     

       5
       6
        
       python3.pkgs.buildPythonApplication rec {

     

       6
       7
        
         pname = "yarGen";

     
···

       14
       15
        
           sha256 = "6PJNAeeLAyUlZcIi0g57sO1Ex6atn7JhbK9kDbNrZ6A=";

     

       15
       16
        
         };

     

       16
       17
        
       

     

       18
       18
       +
         patches = [

     

       19
       19
       +
           # https://github.com/Neo23x0/yarGen/pull/33

     

       20
       20
       +
           (fetchpatch {

     

       21
       21
       +
             name = "use-built-in-scandir.patch";

     

       22
       22
       +
             url = "https://github.com/Neo23x0/yarGen/commit/cae14ac8efeb5536885792cae99d1d0f7fb6fde3.patch";

     

       23
       23
       +
             sha256 = "0z6925r7n1iysld5c8li5nkm1dbxg8j7pn0626a4vic525vf8ndl";

     

       24
       24
       +
           })

     

       25
       25
       +
         ];

     

       26
       26
       +
       

     

       17
       27
        
         installPhase = ''

     

       18
       28
        
           runHook preInstall

     

       19
       29
        
       

     

       20
       20
       -
           mkdir -p $out/bin

     

       21
       21
       -
           chmod +x yarGen.py

     

       22
       22
       -
           mv yarGen.py $out/bin/yargen

     

       30
       30
       +
           install -Dt "$out/bin" yarGen.py

     

       23
       31
        
       

     

       24
       32
        
           runHook postInstall

     

       25
       33
        
         '';

     

       26
       34
        
       

     

       27
       35
        
         propagatedBuildInputs = with python3.pkgs; [

     

       28
       28
       -
           scandir

     

       29
       36
        
           pefile

     

       30
       37
        
           lxml

     

       31
       38
        
         ];

+48

pkgs/tools/text/dcs/default.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , buildGoModule

     

       3
       3
       +
       , fetchFromGitHub

     

       4
       4
       +
       , python3Packages

     

       5
       5
       +
       , perl

     

       6
       6
       +
       , zopfli

     

       7
       7
       +
       , stdenv

     

       8
       8
       +
       }:

     

       9
       9
       +
       buildGoModule {

     

       10
       10
       +
         pname = "dcs";

     

       11
       11
       +
         version = "unstable-2021-04-07";

     

       12
       12
       +
       

     

       13
       13
       +
         src = fetchFromGitHub {

     

       14
       14
       +
           owner = "Debian";

     

       15
       15
       +
           repo = "dcs";

     

       16
       16
       +
           rev = "da46accc4d55e9bfde1a6852ac5a9e730fcbbb2c";

     

       17
       17
       +
           sha256 = "N+6BXlKn1YTlh0ZdPNWa0nuJNcQtlUIc9TocM8cbzQk=";

     

       18
       18
       +
         };

     

       19
       19
       +
       

     

       20
       20
       +
         vendorSha256 = "l2mziuisx0HzuP88rS5M+Wha6lu8P036wJYZlmzjWfs=";

     

       21
       21
       +
       

     

       22
       22
       +
         # Depends on dcs binaries

     

       23
       23
       +
         doCheck = false;

     

       24
       24
       +
       

     

       25
       25
       +
         nativeBuildInputs = [

     

       26
       26
       +
           python3Packages.slimit

     

       27
       27
       +
           (perl.withPackages (p: [ p.CSSMinifier ]))

     

       28
       28
       +
           zopfli

     

       29
       29
       +
         ];

     

       30
       30
       +
       

     

       31
       31
       +
         postBuild = ''

     

       32
       32
       +
           make -C static -j$NIX_BUILD_CORES

     

       33
       33
       +
         '';

     

       34
       34
       +
       

     

       35
       35
       +
         postInstall = ''

     

       36
       36
       +
           mkdir -p $out/share/dcs

     

       37
       37
       +
           cp -r cmd/dcs-web/templates $out/share/dcs

     

       38
       38
       +
           cp -r static $out/share/dcs

     

       39
       39
       +
         '';

     

       40
       40
       +
       

     

       41
       41
       +
         meta = with lib; {

     

       42
       42
       +
           description = "Debian Code Search";

     

       43
       43
       +
           homepage = "https://github.com/Debian/dcs";

     

       44
       44
       +
           license = licenses.bsd3;

     

       45
       45
       +
           maintainers = teams.determinatesystems.members;

     

       46
       46
       +
           broken = stdenv.isAarch64;

     

       47
       47
       +
         };

     

       48
       48
       +
       }

+10 -4

pkgs/top-level/all-packages.nix

···

       404
       404
        
       

     

       405
       405
        
         find-cursor = callPackage ../tools/X11/find-cursor { };

     

       406
       406
        
       

     

       407
       407
       +
         flare-floss = callPackage ../tools/security/flare-floss { };

     

       408
       408
       +
       

     

       407
       409
        
         prefer-remote-fetch = import ../build-support/prefer-remote-fetch;

     

       408
       410
        
       

     

       409
       411
        
         global-platform-pro = callPackage ../development/tools/global-platform-pro/default.nix { };

     
···

       2725
       2727
        
       

     

       2726
       2728
        
         lexicon = callPackage ../tools/admin/lexicon { };

     

       2727
       2729
        
       

     

       2728
       2728
       -
         lief = callPackage ../development/libraries/lief {};

     

       2730
       2730
       +
         lief = callPackage ../development/libraries/lief {

     

       2731
       2731
       +
           python = python3;

     

       2732
       2732
       +
         };

     

       2729
       2733
        
       

     

       2730
       2734
        
         libnbd = callPackage ../development/libraries/libnbd { };

     

       2731
       2735
        
       

     
···

       3779
       3783
        
         dconf2nix = callPackage ../development/tools/haskell/dconf2nix { };

     

       3780
       3784
        
       

     

       3781
       3785
        
         dcraw = callPackage ../tools/graphics/dcraw { };

     

       3786
       3786
       +
       

     

       3787
       3787
       +
         dcs = callPackage ../tools/text/dcs { };

     

       3782
       3788
        
       

     

       3783
       3789
        
         dcfldd = callPackage ../tools/system/dcfldd { };

     

       3784
       3790
        
       

     
···

       12647
       12653
        
         csmith = callPackage ../development/tools/misc/csmith { };

     

       12648
       12654
        
       

     

       12649
       12655
        
         csslint = callPackage ../development/web/csslint { };

     

       12656
       12656
       +
       

     

       12657
       12657
       +
         css-html-js-minify = with python3Packages; toPythonApplication css-html-js-minify;

     

       12650
       12658
        
       

     

       12651
       12659
        
         cvise = python3Packages.callPackage ../development/tools/misc/cvise {

     

       12652
       12660
        
           inherit (llvmPackages_11) llvm clang-unwrapped;

     
···

       29060
       29068
        
       

     

       29061
       29069
        
         aspino = callPackage ../applications/science/logic/aspino {};

     

       29062
       29070
        
       

     

       29063
       29063
       -
         beluga = callPackage ../applications/science/logic/beluga {

     

       29064
       29064
       -
           ocamlPackages = ocaml-ng.ocamlPackages_4_07;

     

       29065
       29065
       -
         };

     

       29071
       29071
       +
         beluga = callPackage ../applications/science/logic/beluga {};

     

       29066
       29072
        
       

     

       29067
       29073
        
         boogie = dotnetPackages.Boogie;

     

       29068
       29074

+14

pkgs/top-level/perl-packages.nix

···

       4481
       4481
        
           propagatedBuildInputs = [ Clone ];

     

       4482
       4482
        
         };

     

       4483
       4483
        
       

     

       4484
       4484
       +
         CSSMinifier = buildPerlPackage {

     

       4485
       4485
       +
           pname = "CSS-Minifier";

     

       4486
       4486
       +
           version = "0.01";

     

       4487
       4487
       +
           src = fetchurl {

     

       4488
       4488
       +
             url = "mirror://cpan/authors/id/P/PM/PMICHAUX/CSS-Minifier-0.01.tar.gz";

     

       4489
       4489
       +
             sha256 = "0Kk0m46LfoOrcM+IVM+7Qv8pwfbHyCmPIlfdIaoMf+8=";

     

       4490
       4490
       +
           };

     

       4491
       4491
       +
           meta = with lib; {

     

       4492
       4492
       +
             description = "Perl extension for minifying CSS";

     

       4493
       4493
       +
             license = licenses.artistic1;

     

       4494
       4494
       +
             maintainers = teams.determinatesystems.members;

     

       4495
       4495
       +
           };

     

       4496
       4496
       +
         };

     

       4497
       4497
       +
       

     

       4484
       4498
        
         CSSMinifierXS = buildPerlModule {

     

       4485
       4499
        
           pname = "CSS-Minifier-XS";

     

       4486
       4500
        
           version = "0.09";

+22

pkgs/top-level/python-packages.nix

···

       1566
       1566
        
       

     

       1567
       1567
        
         cssmin = callPackage ../development/python-modules/cssmin { };

     

       1568
       1568
        
       

     

       1569
       1569
       +
         css-html-js-minify = callPackage ../development/python-modules/css-html-js-minify { };

     

       1570
       1570
       +
       

     

       1569
       1571
        
         css-parser = callPackage ../development/python-modules/css-parser { };

     

       1570
       1572
        
       

     

       1571
       1573
        
         cssselect2 = callPackage ../development/python-modules/cssselect2 { };

     
···

       1602
       1604
        
         cx_Freeze = callPackage ../development/python-modules/cx_freeze { };

     

       1603
       1605
        
       

     

       1604
       1606
        
         cx_oracle = callPackage ../development/python-modules/cx_oracle { };

     

       1607
       1607
       +
       

     

       1608
       1608
       +
         cxxfilt = callPackage ../development/python-modules/cxxfilt { };

     

       1605
       1609
        
       

     

       1606
       1610
        
         cycler = callPackage ../development/python-modules/cycler { };

     

       1607
       1611
        
       

     
···

       1718
       1722
        
         deepmerge = callPackage ../development/python-modules/deepmerge { };

     

       1719
       1723
        
       

     

       1720
       1724
        
         deeptoolsintervals = callPackage ../development/python-modules/deeptoolsintervals { };

     

       1725
       1725
       +
       

     

       1726
       1726
       +
         deezer-python = callPackage ../development/python-modules/deezer-python { };

     

       1721
       1727
        
       

     

       1722
       1728
        
         defcon = callPackage ../development/python-modules/defcon { };

     

       1723
       1729
        
       

     
···

       3789
       3795
        
       

     

       3790
       3796
        
         license-expression = callPackage ../development/python-modules/license-expression { };

     

       3791
       3797
        
       

     

       3798
       3798
       +
         lief = (toPythonModule (pkgs.lief.override {

     

       3799
       3799
       +
           inherit python;

     

       3800
       3800
       +
         })).py;

     

       3801
       3801
       +
       

     

       3792
       3802
        
         lightgbm = callPackage ../development/python-modules/lightgbm { };

     

       3793
       3803
        
       

     

       3794
       3804
        
         lightning = callPackage ../development/python-modules/lightning { };

     
···

       4221
       4231
        
       

     

       4222
       4232
        
         multi_key_dict = callPackage ../development/python-modules/multi_key_dict { };

     

       4223
       4233
        
       

     

       4234
       4234
       +
         multimethod = callPackage ../development/python-modules/multimethod { };

     

       4235
       4235
       +
       

     

       4224
       4236
        
         multipledispatch = callPackage ../development/python-modules/multipledispatch { };

     

       4225
       4237
        
       

     

       4226
       4238
        
         multiprocess = callPackage ../development/python-modules/multiprocess { };

     
···

       4949
       4961
        
         pluggy = callPackage ../development/python-modules/pluggy { };

     

       4950
       4962
        
       

     

       4951
       4963
        
         pluginbase = callPackage ../development/python-modules/pluginbase { };

     

       4964
       4964
       +
       

     

       4965
       4965
       +
         plugnplay = callPackage ../development/python-modules/plugnplay { };

     

       4952
       4966
        
       

     

       4953
       4967
        
         plugwise = callPackage ../development/python-modules/plugwise { };

     

       4954
       4968
        
       

     
···

       7533
       7547
        
       

     

       7534
       7548
        
         sphinx-jinja = callPackage ../development/python-modules/sphinx-jinja { };

     

       7535
       7549
        
       

     

       7550
       7550
       +
         sphinx-material = callPackage ../development/python-modules/sphinx-material { };

     

       7551
       7551
       +
       

     

       7536
       7552
        
         sphinx-navtree = callPackage ../development/python-modules/sphinx-navtree { };

     

       7537
       7553
        
       

     

       7538
       7554
        
         sphinx_pypi_upload = callPackage ../development/python-modules/sphinx_pypi_upload { };

     
···

       8306
       8322
        
       

     

       8307
       8323
        
         vispy = callPackage ../development/python-modules/vispy { };

     

       8308
       8324
        
       

     

       8325
       8325
       +
         vivisect = callPackage ../development/python-modules/vivisect { };

     

       8326
       8326
       +
       

     

       8327
       8327
       +
         viv-utils = callPackage ../development/python-modules/viv-utils { };

     

       8328
       8328
       +
       

     

       8309
       8329
        
         vmprof = callPackage ../development/python-modules/vmprof { };

     

       8310
       8330
        
       

     

       8311
       8331
        
         vncdo = callPackage ../development/python-modules/vncdo { };

     
···

       8455
       8475
        
         wled = callPackage ../development/python-modules/wled { };

     

       8456
       8476
        
       

     

       8457
       8477
        
         woob = callPackage ../development/python-modules/woob { };

     

       8478
       8478
       +
       

     

       8479
       8479
       +
         woodblock = callPackage ../development/python-modules/woodblock { };

     

       8458
       8480
        
       

     

       8459
       8481
        
         word2vec = callPackage ../development/python-modules/word2vec { };

     

       8460
       8482