commit ceea0e5f2ab6392d8265f6c4d9c1e5fb79bc837c · pyrox.dev/nixpkgs

+7

maintainers/maintainer-list.nix

···

       3728
       3728
        
           githubId = 541748;

     

       3729
       3729
        
           name = "Felipe Espinoza";

     

       3730
       3730
        
         };

     

       3731
       3731
       +
         fedx-sudo = {

     

       3732
       3732
       +
           email = "fedx-sudo@pm.me";

     

       3733
       3733
       +
           github = "Fedx-sudo";

     

       3734
       3734
       +
           githubId = 66258975;

     

       3735
       3735
       +
           name = "Fedx sudo";

     

       3736
       3736
       +
           matrix = "fedx:matrix.org";

     

       3737
       3737
       +
         };

     

       3731
       3738
        
         fehnomenal = {

     

       3732
       3739
        
           email = "fehnomenal@fehn.systems";

     

       3733
       3740
        
           github = "fehnomenal";

+18

nixos/modules/hardware/gkraken.nix

···

       1
       1
       +
       { config, lib, pkgs, ... }:

     

       2
       2
       +
       

     

       3
       3
       +
       with lib;

     

       4
       4
       +
       

     

       5
       5
       +
       let

     

       6
       6
       +
         cfg = config.hardware.gkraken;

     

       7
       7
       +
       in

     

       8
       8
       +
       {

     

       9
       9
       +
         options.hardware.gkraken = {

     

       10
       10
       +
           enable = mkEnableOption "gkraken's udev rules for NZXT AIO liquid coolers";

     

       11
       11
       +
         };

     

       12
       12
       +
       

     

       13
       13
       +
         config = mkIf cfg.enable {

     

       14
       14
       +
           services.udev.packages = with pkgs; [

     

       15
       15
       +
             gkraken

     

       16
       16
       +
           ];

     

       17
       17
       +
         };

     

       18
       18
       +
       }

+1

nixos/modules/module-list.nix

···

       48
       48
        
         ./hardware/corectrl.nix

     

       49
       49
        
         ./hardware/digitalbitbox.nix

     

       50
       50
        
         ./hardware/device-tree.nix

     

       51
       51
       +
         ./hardware/gkraken.nix

     

       51
       52
        
         ./hardware/i2c.nix

     

       52
       53
        
         ./hardware/sensor/hddtemp.nix

     

       53
       54
        
         ./hardware/sensor/iio.nix

+1 -1

nixos/modules/services/web-servers/nginx/default.nix

···

       889
       889
        
               RestrictAddressFamilies = [ "AF_UNIX" "AF_INET" "AF_INET6" ];

     

       890
       890
        
               RestrictNamespaces = true;

     

       891
       891
        
               LockPersonality = true;

     

       892
       892
       -
               MemoryDenyWriteExecute = !(builtins.any (mod: (mod.allowMemoryWriteExecute or false)) cfg.package.modules);

     

       892
       892
       +
               MemoryDenyWriteExecute = !((builtins.any (mod: (mod.allowMemoryWriteExecute or false)) cfg.package.modules) || (cfg.package == pkgs.openresty));

     

       893
       893
        
               RestrictRealtime = true;

     

       894
       894
        
               RestrictSUIDSGID = true;

     

       895
       895
        
               RemoveIPC = true;

+1

nixos/tests/all-tests.nix

···

       323
       323
        
         ombi = handleTest ./ombi.nix {};

     

       324
       324
        
         openarena = handleTest ./openarena.nix {};

     

       325
       325
        
         openldap = handleTest ./openldap.nix {};

     

       326
       326
       +
         openresty-lua = handleTest ./openresty-lua.nix {};

     

       326
       327
        
         opensmtpd = handleTest ./opensmtpd.nix {};

     

       327
       328
        
         opensmtpd-rspamd = handleTest ./opensmtpd-rspamd.nix {};

     

       328
       329
        
         openssh = handleTest ./openssh.nix {};

+55

nixos/tests/openresty-lua.nix

···

       1
       1
       +
       import ./make-test-python.nix ({ pkgs, lib, ... }:

     

       2
       2
       +
         let

     

       3
       3
       +
           lualibs = [

     

       4
       4
       +
             pkgs.lua.pkgs.markdown

     

       5
       5
       +
           ];

     

       6
       6
       +
       

     

       7
       7
       +
           getPath = lib: type: "${lib}/share/lua/${pkgs.lua.luaversion}/?.${type}";

     

       8
       8
       +
           getLuaPath = lib: getPath lib "lua";

     

       9
       9
       +
           luaPath = lib.concatStringsSep ";" (map getLuaPath lualibs);

     

       10
       10
       +
         in

     

       11
       11
       +
         {

     

       12
       12
       +
           name = "openresty-lua";

     

       13
       13
       +
           meta = with pkgs.lib.maintainers; {

     

       14
       14
       +
             maintainers = [ bbigras ];

     

       15
       15
       +
           };

     

       16
       16
       +
       

     

       17
       17
       +
           nodes = {

     

       18
       18
       +
             webserver = { pkgs, lib, ... }: {

     

       19
       19
       +
               services.nginx = {

     

       20
       20
       +
                 enable = true;

     

       21
       21
       +
                 package = pkgs.openresty;

     

       22
       22
       +
       

     

       23
       23
       +
                 commonHttpConfig = ''

     

       24
       24
       +
                   lua_package_path '${luaPath};;';

     

       25
       25
       +
                 '';

     

       26
       26
       +
       

     

       27
       27
       +
                 virtualHosts."default" = {

     

       28
       28
       +
                   default = true;

     

       29
       29
       +
                   locations."/" = {

     

       30
       30
       +
                     extraConfig = ''

     

       31
       31
       +
                       default_type text/html;

     

       32
       32
       +
                       access_by_lua '

     

       33
       33
       +
                         local markdown = require "markdown"

     

       34
       34
       +
                         markdown("source")

     

       35
       35
       +
                       ';

     

       36
       36
       +
                     '';

     

       37
       37
       +
                   };

     

       38
       38
       +
                 };

     

       39
       39
       +
               };

     

       40
       40
       +
             };

     

       41
       41
       +
           };

     

       42
       42
       +
       

     

       43
       43
       +
           testScript = { nodes, ... }:

     

       44
       44
       +
             ''

     

       45
       45
       +
               url = "http://localhost"

     

       46
       46
       +
       

     

       47
       47
       +
               webserver.wait_for_unit("nginx")

     

       48
       48
       +
               webserver.wait_for_open_port(80)

     

       49
       49
       +
       

     

       50
       50
       +
               http_code = webserver.succeed(

     

       51
       51
       +
                 f"curl -w '%{{http_code}}' --head --fail {url}"

     

       52
       52
       +
               )

     

       53
       53
       +
               assert http_code.split("\n")[-1] == "200"

     

       54
       54
       +
             '';

     

       55
       55
       +
         })

+23

pkgs/applications/backup/urbackup-client/default.nix

···

       1
       1
       +
       { stdenv, lib, fetchzip, wxGTK30, zlib, zstd }:

     

       2
       2
       +
       

     

       3
       3
       +
       stdenv.mkDerivation rec {

     

       4
       4
       +
         pname = "urbackup-client";

     

       5
       5
       +
         version = "2.4.11";

     

       6
       6
       +
       

     

       7
       7
       +
         src = fetchzip {

     

       8
       8
       +
           url = "https://hndl.urbackup.org/Client/${version}/urbackup-client-${version}.tar.gz";

     

       9
       9
       +
           sha256 = "0cciy9v1pxj9qaklpbhp2d5rdbkmfm74vhpqx6b4phww0f10wvzh";

     

       10
       10
       +
         };

     

       11
       11
       +
       

     

       12
       12
       +
         configureFlags = [ "--enable-embedded-cryptopp" ];

     

       13
       13
       +
         buildInputs = [ wxGTK30 zlib zstd ];

     

       14
       14
       +
       

     

       15
       15
       +
         meta = with lib; {

     

       16
       16
       +
           description = "An easy to setup Open Source client/server backup system";

     

       17
       17
       +
           longDescription = "An easy to setup Open Source client/server backup system, that through a combination of image and file backups accomplishes both data safety and a fast restoration time";

     

       18
       18
       +
           homepage = "https://www.urbackup.org/index.html";

     

       19
       19
       +
           license = licenses.agpl3;

     

       20
       20
       +
           platforms = platforms.linux;

     

       21
       21
       +
           maintainers = [ maintainers.mgttlinger ];

     

       22
       22
       +
         };

     

       23
       23
       +
       }

+14 -14

pkgs/applications/editors/vscode/generic.nix

···

       81
       81
        
           installPhase = ''

     

       82
       82
        
             runHook preInstall

     

       83
       83
        
           '' + (if stdenv.isDarwin then ''

     

       84
       84
       -
             mkdir -p "$out/Applications/${longName}.app" $out/bin

     

       84
       84
       +
             mkdir -p "$out/Applications/${longName}.app" "$out/bin"

     

       85
       85
        
             cp -r ./* "$out/Applications/${longName}.app"

     

       86
       86
       -
             ln -s "$out/Applications/${longName}.app/Contents/Resources/app/bin/${sourceExecutableName}" $out/bin/${executableName}

     

       86
       86
       +
             ln -s "$out/Applications/${longName}.app/Contents/Resources/app/bin/${sourceExecutableName}" "$out/bin/${executableName}"

     

       87
       87
        
           '' else ''

     

       88
       88
       -
             mkdir -p $out/lib/vscode $out/bin

     

       89
       89
       -
             cp -r ./* $out/lib/vscode

     

       88
       88
       +
             mkdir -p "$out/lib/vscode" "$out/bin"

     

       89
       89
       +
             cp -r ./* "$out/lib/vscode"

     

       90
       90
        
       

     

       91
       91
       -
             ln -s $out/lib/vscode/bin/${sourceExecutableName} $out/bin/${executableName}

     

       91
       91
       +
             ln -s "$out/lib/vscode/bin/${sourceExecutableName}" "$out/bin/${executableName}"

     

       92
       92
        
       

     

       93
       93
       -
             mkdir -p $out/share/applications

     

       94
       94
       -
             ln -s $desktopItem/share/applications/${executableName}.desktop $out/share/applications/${executableName}.desktop

     

       95
       95
       -
             ln -s $urlHandlerDesktopItem/share/applications/${executableName}-url-handler.desktop $out/share/applications/${executableName}-url-handler.desktop

     

       93
       93
       +
             mkdir -p "$out/share/applications"

     

       94
       94
       +
             ln -s "$desktopItem/share/applications/${executableName}.desktop" "$out/share/applications/${executableName}.desktop"

     

       95
       95
       +
             ln -s "$urlHandlerDesktopItem/share/applications/${executableName}-url-handler.desktop" "$out/share/applications/${executableName}-url-handler.desktop"

     

       96
       96
        
       

     

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

     

       98
       98
       -
             cp $out/lib/vscode/resources/app/resources/linux/code.png $out/share/pixmaps/code.png

     

       97
       97
       +
             mkdir -p "$out/share/pixmaps"

     

       98
       98
       +
             cp "$out/lib/vscode/resources/app/resources/linux/code.png" "$out/share/pixmaps/code.png"

     

       99
       99
        
       

     

       100
       100
        
             # Override the previously determined VSCODE_PATH with the one we know to be correct

     

       101
       101
       -
             sed -i "/ELECTRON=/iVSCODE_PATH='$out/lib/vscode'" $out/bin/${executableName}

     

       102
       102
       -
             grep -q "VSCODE_PATH='$out/lib/vscode'" $out/bin/${executableName} # check if sed succeeded

     

       101
       101
       +
             sed -i "/ELECTRON=/iVSCODE_PATH='$out/lib/vscode'" "$out/bin/${executableName}"

     

       102
       102
       +
             grep -q "VSCODE_PATH='$out/lib/vscode'" "$out/bin/${executableName}" # check if sed succeeded

     

       103
       103
        
           '') + ''

     

       104
       104
        
             runHook postInstall

     

       105
       105
        
           '';

     
···

       162
       162
        
       

     

       163
       163
        
           # restore desktop item icons

     

       164
       164
        
           extraInstallCommands = ''

     

       165
       165
       -
             mkdir -p $out/share/applications

     

       165
       165
       +
             mkdir -p "$out/share/applications"

     

       166
       166
        
             for item in ${unwrapped}/share/applications/*.desktop; do

     

       167
       167
       -
               ln -s $item $out/share/applications/

     

       167
       167
       +
               ln -s "$item" "$out/share/applications/"

     

       168
       168
        
             done

     

       169
       169
        
           '';

     

       170
       170

+13 -8

pkgs/applications/misc/icesl/default.nix

···

       1
       1
       -
       { stdenv, lib, fetchzip, freeglut, libXmu, libXi, libX11, libICE, libGLU, libGL, libSM, libXext, dialog, makeWrapper }:

     

       1
       1
       +
       { stdenv, lib, fetchzip, freeglut, libXmu, libXi, libX11, libICE, libGLU, libGL, libSM

     

       2
       2
       +
       , libXext, glibc, lua, luabind, glfw, libgccjit, dialog, makeWrapper

     

       3
       3
       +
       }:

     

       2
       4
        
       let

     

       3
       3
       -
         lpath = lib.makeLibraryPath [ libXmu libXi libX11 freeglut libICE libGLU libGL libSM libXext ];

     

       5
       5
       +
         lpath = lib.makeLibraryPath [ libXmu libXi libX11 freeglut libICE libGLU libGL libSM libXext  glibc lua glfw luabind libgccjit ];

     

       4
       6
        
       in

     

       5
       7
        
       stdenv.mkDerivation rec {

     

       6
       8
        
         pname = "iceSL";

     

       7
       7
       -
         version = "2.1.10";

     

       9
       9
       +
         version = "2.4.1";

     

       8
       10
        
       

     

       9
       11
        
         src =  if stdenv.hostPlatform.system == "x86_64-linux" then fetchzip {

     

       10
       10
       -
           url = "https://gforge.inria.fr/frs/download.php/file/37268/icesl${version}-amd64.zip";

     

       11
       11
       -
           sha256 = "0dv3mq6wy46xk9blzzmgbdxpsjdaxid3zadfrysxlhmgl7zb2cn2";

     

       12
       12
       +
           url = "https://icesl.loria.fr/assets/other/download.php?build=${version}&os=amd64";

     

       13
       13
       +
           extension = "zip";

     

       14
       14
       +
           sha256 = "0rrnkqkhlsjclif5cjbf17qz64vs95ja49xarxjvq54wb4jhbs4l";

     

       12
       15
        
         } else if stdenv.hostPlatform.system == "i686-linux" then fetchzip {

     

       13
       13
       -
           url = "https://gforge.inria.fr/frs/download.php/file/37267/icesl${version}-i386.zip";

     

       14
       14
       -
           sha256 = "0sl54fsb2gz6dy0bwdscpdq1ab6ph5b7zald3bwzgkqsvna7p1jr";

     

       16
       16
       +
           url = "https://icesl.loria.fr/assets/other/download.php?build=${version}&os=i386";

     

       17
       17
       +
           extension = "zip";

     

       18
       18
       +
           sha256 = "0n2yyxzw0arkc70f0qli4n5chdlh9vc7aqizk4v7825mcglhwlyh";

     

       15
       19
        
         } else throw "Unsupported architecture";

     

       16
       20
        
       

     

       17
       21
        
         nativeBuildInputs = [ makeWrapper ];

     

       18
       22
        
         installPhase = ''

     

       19
       23
        
           cp -r ./ $out

     

       24
       24
       +
           rm $out/bin/*.so

     

       20
       25
        
           mkdir $out/oldbin

     

       21
       26
        
           mv $out/bin/IceSL-slicer $out/oldbin/IceSL-slicer

     

       22
       27
        
           runHook postInstall

     
···

       31
       36
        
       

     

       32
       37
        
         meta = with lib; {

     

       33
       38
        
           description = "GPU-accelerated procedural modeler and slicer for 3D printing";

     

       34
       34
       -
           homepage = "http://shapeforge.loria.fr/icesl/index.html";

     

       39
       39
       +
           homepage = "https://icesl.loria.fr/";

     

       35
       40
        
           license = licenses.inria-icesl;

     

       36
       41
        
           platforms = [ "i686-linux" "x86_64-linux" ];

     

       37
       42
        
           maintainers = with maintainers; [ mgttlinger ];

+2 -2

pkgs/applications/misc/jquake/default.nix

···

       4
       4
        
       

     

       5
       5
        
       stdenv.mkDerivation rec {

     

       6
       6
        
         pname = "jquake";

     

       7
       7
       -
         version = "1.6.1";

     

       7
       7
       +
         version = "1.6.2";

     

       8
       8
        
       

     

       9
       9
        
         src = fetchurl {

     

       10
       10
        
           url = "https://fleneindre.github.io/downloads/JQuake_${version}_linux.zip";

     

       11
       11
       -
           sha256 = "0nw6xjc3i1b8rk15arc5d0ji2bycc40rz044qd03vzxvh0h8yvgl";

     

       11
       11
       +
           sha256 = "1k12yw9fwq1z3gg0d38dxs4mmyn912zfcm6zsbjkv27q6lvhvwng";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         nativeBuildInputs = [ unzip copyDesktopItems ];

+2 -2

pkgs/applications/misc/taskwarrior/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "taskwarrior";

     

       5
       5
       -
         version = "2.6.0";

     

       5
       5
       +
         version = "2.6.1";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "GothenburgBitFactory";

     

       9
       9
        
           repo = "taskwarrior";

     

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

     

       11
       11
       -
           sha256 = "sha256-2wVjRecfIlNFAxXFaiKfxy9zArDIYDTfDdrnSM7H8fM=";

     

       11
       11
       +
           sha256 = "sha256-jMZzo2cegoapEHTvfD6ThU1IsXru3iOcpyDbZxkSXzQ=";

     

       12
       12
        
           fetchSubmodules = true;

     

       13
       13
        
         };

     

       14
       14

+8 -6

pkgs/applications/misc/xplr/default.nix

···

       1
       1
       -
       { lib, stdenv, rustPlatform, fetchCrate, libiconv }:

     

       1
       1
       +
       { lib, stdenv, rustPlatform, fetchFromGitHub, libiconv }:

     

       2
       2
        
       

     

       3
       3
        
       rustPlatform.buildRustPackage rec {

     

       4
       4
        
         pname = "xplr";

     

       5
       5
       -
         version = "0.14.7";

     

       5
       5
       +
         version = "0.15.2";

     

       6
       6
        
       

     

       7
       7
       -
         src = fetchCrate {

     

       8
       8
       -
           inherit pname version;

     

       9
       9
       -
           sha256 = "sha256-rGU9Jf+MHDs3pnuddqxLaWc8YqL+Ka7Rex+fTuU62sM=";

     

       7
       7
       +
         src = fetchFromGitHub {

     

       8
       8
       +
           owner = "sayanarijit";

     

       9
       9
       +
           repo = pname;

     

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

     

       11
       11
       +
           sha256 = "1znb6n9xbzbi9sif76xlwnqrzkh50g9yz6k36m0hm5iacd1fapab";

     

       10
       12
        
         };

     

       11
       13
        
       

     

       12
       14
        
         buildInputs = lib.optional stdenv.isDarwin libiconv;

     

       13
       15
        
       

     

       14
       14
       -
         cargoSha256 = "sha256-GwepsY7PcWjKZpJ7H4D9vtXwd2XGFgG1c+QvinMAG4Q=";

     

       16
       16
       +
         cargoSha256 = "0gbhkpha02ymr861av0fmyz6h007ajwkqcajq8hrnfzjk8rii47m";

     

       15
       17
        
       

     

       16
       18
        
         meta = with lib; {

     

       17
       19
        
           description = "A hackable, minimal, fast TUI file explorer";

+2 -2

pkgs/applications/networking/mailreaders/notmuch/default.nix

···

       11
       11
        
       

     

       12
       12
        
       stdenv.mkDerivation rec {

     

       13
       13
        
         pname = "notmuch";

     

       14
       14
       -
         version = "0.33.2";

     

       14
       14
       +
         version = "0.34";

     

       15
       15
        
       

     

       16
       16
        
         src = fetchurl {

     

       17
       17
        
           url = "https://notmuchmail.org/releases/notmuch-${version}.tar.xz";

     

       18
       18
       -
           hash = "sha256:1bic1f2va136aygfy53bsgziwiidcpb7qf1v05mlza2jmgv94j14";

     

       18
       18
       +
           sha256 = "1dk16xa9q7adp1jaswxvw4p92f4h5mg0zkrh3zv8gqxn88amisc3";

     

       19
       19
        
         };

     

       20
       20
        
       

     

       21
       21
        
         nativeBuildInputs = [

+7 -4

pkgs/development/compilers/unison/default.nix

···

       6
       6
        
       

     

       7
       7
        
       stdenv.mkDerivation rec {

     

       8
       8
        
         pname = "unison-code-manager";

     

       9
       9
       -
         milestone_id = "M2g";

     

       9
       9
       +
         milestone_id = "M2j";

     

       10
       10
        
         version = "1.0.${milestone_id}-alpha";

     

       11
       11
        
       

     

       12
       12
        
         src = if (stdenv.isDarwin) then

     

       13
       13
        
           fetchurl {

     

       14
       14
        
             url = "https://github.com/unisonweb/unison/releases/download/release/${milestone_id}/ucm-macos.tar.gz";

     

       15
       15
       -
             sha256 = "1ib9pdzrfpzbi35fpwm9ym621nlydplvzgbhnyd86dbwbv3i9sga";

     

       15
       15
       +
             sha256 = "0lrj37mfqzwg9n757ymjb440jx51kj1s8g6qv9vis9pxckmy0m08";

     

       16
       16
        
           }

     

       17
       17
        
         else

     

       18
       18
        
           fetchurl {

     

       19
       19
        
             url = "https://github.com/unisonweb/unison/releases/download/release/${milestone_id}/ucm-linux.tar.gz";

     

       20
       20
       -
             sha256 = "004jx7q657mkcrvilk4lfkp8xcpl2bjflpn9m2p7jzlrlk97v9nj";

     

       20
       20
       +
             sha256 = "0qvin1rlkjwijchsijq3vbnn4injawchh2w97kyq7i3idh8ccl59";

     

       21
       21
        
           };

     

       22
       22
        
       

     

       23
       23
        
         # The tarball is just the prebuilt binary, in the archive root.

     
···

       31
       31
        
         installPhase = ''

     

       32
       32
        
           mkdir -p $out/bin

     

       33
       33
        
           mv ucm $out/bin

     

       34
       34
       -
           wrapProgram $out/bin/ucm --prefix PATH ":" "${lib.makeBinPath [ less ]}";

     

       34
       34
       +
           mv ui $out/ui

     

       35
       35
       +
           wrapProgram $out/bin/ucm \

     

       36
       36
       +
             --prefix PATH ":" "${lib.makeBinPath [ less ]}" \

     

       37
       37
       +
             --set UCM_WEB_UI "$out/ui"

     

       35
       38
        
         '';

     

       36
       39
        
       

     

       37
       40
        
         meta = with lib; {

+1 -1

pkgs/development/libraries/libguestfs/default.nix

···

       22
       22
        
         strictDeps = true;

     

       23
       23
        
         nativeBuildInputs = [

     

       24
       24
        
           autoreconfHook bison cdrkit cpio flex getopt gperf makeWrapper pkg-config qemu

     

       25
       25
       -
         ] ++ (with perlPackages; [ perl libintl_perl GetoptLong SysVirt ])

     

       25
       25
       +
         ] ++ (with perlPackages; [ perl libintl-perl GetoptLong SysVirt ])

     

       26
       26
        
           ++ (with ocamlPackages; [ ocaml findlib ]);

     

       27
       27
        
         buildInputs = [

     

       28
       28
        
           ncurses jansson

+2 -2

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

···

       7
       7
        
       

     

       8
       8
        
       buildPythonPackage rec {

     

       9
       9
        
         pname = "aioymaps";

     

       10
       10
       -
         version = "1.2.0";

     

       10
       10
       +
         version = "1.2.1";

     

       11
       11
        
       

     

       12
       12
        
         disabled = pythonOlder "3.6";

     

       13
       13
        
       

     

       14
       14
        
         src = fetchPypi {

     

       15
       15
        
           inherit pname version;

     

       16
       16
       -
           sha256 = "sha256-YkSoxYf/Ti/gc1BFSYR24P3OzDrmcGWKhcOcrGpkRjU=";

     

       16
       16
       +
           sha256 = "sha256-8U8I2pqvvm87IW1hhR4CGyIWdM/jsRPRP6u2yYGXdBw=";

     

       17
       17
        
         };

     

       18
       18
        
       

     

       19
       19
        
         propagatedBuildInputs = [

+2 -2

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

···

       13
       13
        
       

     

       14
       14
        
       buildPythonPackage rec {

     

       15
       15
        
         pname = "bidict";

     

       16
       16
       -
         version = "0.21.3";

     

       16
       16
       +
         version = "0.21.4";

     

       17
       17
        
       

     

       18
       18
        
         disabled = pythonOlder "3.7";

     

       19
       19
        
       

     

       20
       20
        
         src = fetchPypi {

     

       21
       21
        
           inherit pname version;

     

       22
       22
       -
           sha256 = "sha256-1QvYH65140GY/8lJeaDrCTn/mts+8yvMk6kT2LPj7R0=";

     

       22
       22
       +
           sha256 = "sha256-QshP++b43omK9gc7S+nqfM7c1400dKqETFTknVoHn28=";

     

       23
       23
        
         };

     

       24
       24
        
       

     

       25
       25
        
         propagatedBuildInputs = [

+6

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

···

       31
       31
        
           typing-extensions

     

       32
       32
        
         ];

     

       33
       33
        
       

     

       34
       34
       +
         # make compatible with libusb1 2.x

     

       35
       35
       +
         postPatch = ''

     

       36
       36
       +
           substituteInPlace setup.py \

     

       37
       37
       +
             --replace 'libusb1>=1.7,<2.0' 'libusb1>=1.7'

     

       38
       38
       +
         '';

     

       39
       39
       +
       

     

       34
       40
        
         # tests require to clone quite a few firmwares

     

       35
       41
        
         doCheck = false;

     

       36
       42

+2 -2

pkgs/development/python-modules/mypy-boto3-s3/default.nix

···

       8
       8
        
       

     

       9
       9
        
       buildPythonPackage rec {

     

       10
       10
        
         pname = "mypy-boto3-s3";

     

       11
       11
       -
         version = "1.19.1";

     

       11
       11
       +
         version = "1.19.2";

     

       12
       12
        
       

     

       13
       13
        
         disabled = pythonOlder "3.6";

     

       14
       14
        
       

     

       15
       15
        
         src = fetchPypi {

     

       16
       16
        
           inherit pname version;

     

       17
       17
       -
           sha256 = "sha256-Ov3JVCYa+3VU26VYtPYcqwSUMdDowSk8GWGt4PX/DKk=";

     

       17
       17
       +
           sha256 = "sha256-wRJ5pY3zrWDEAm30xvBfiMpCxQKHWgcEemNiQ+v0+9o=";

     

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
        
         propagatedBuildInputs = [

+2 -2

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

···

       6
       6
        
       

     

       7
       7
        
       buildPythonPackage rec {

     

       8
       8
        
         pname = "venstarcolortouch";

     

       9
       9
       -
         version = "0.14";

     

       9
       9
       +
         version = "0.15";

     

       10
       10
        
       

     

       11
       11
        
         src = fetchPypi {

     

       12
       12
        
           inherit pname version;

     

       13
       13
       -
           sha256 = "sha256-wrsu1SffD4/RvDiE6yABfZN/oSDH8Ao/RJK7yL2QKy8=";

     

       13
       13
       +
           sha256 = "sha256-7JUqXHk/yL+/EvfQoGLaKmPPy4DkljT9olqK0a/Nmkk=";

     

       14
       14
        
         };

     

       15
       15
        
       

     

       16
       16
        
         propagatedBuildInputs = [

+72

pkgs/development/quickemu/default.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , fetchFromGitHub

     

       3
       3
       +
       , stdenv

     

       4
       4
       +
       , makeWrapper

     

       5
       5
       +
       , qemu

     

       6
       6
       +
       , gnugrep

     

       7
       7
       +
       , lsb-release

     

       8
       8
       +
       , jq

     

       9
       9
       +
       , procps

     

       10
       10
       +
       , python3

     

       11
       11
       +
       , cdrtools

     

       12
       12
       +
       , usbutils

     

       13
       13
       +
       , util-linux

     

       14
       14
       +
       , spicy

     

       15
       15
       +
       , swtpm

     

       16
       16
       +
       , wget

     

       17
       17
       +
       , xdg-user-dirs

     

       18
       18
       +
       , xrandr

     

       19
       19
       +
       , zsync

     

       20
       20
       +
       }:

     

       21
       21
       +
       let

     

       22
       22
       +
         runtimePaths = [

     

       23
       23
       +
           qemu

     

       24
       24
       +
           gnugrep

     

       25
       25
       +
           jq

     

       26
       26
       +
           lsb-release

     

       27
       27
       +
           procps

     

       28
       28
       +
           python3

     

       29
       29
       +
           cdrtools

     

       30
       30
       +
           usbutils

     

       31
       31
       +
           util-linux

     

       32
       32
       +
           spicy

     

       33
       33
       +
           swtpm

     

       34
       34
       +
           wget

     

       35
       35
       +
           xdg-user-dirs

     

       36
       36
       +
           xrandr

     

       37
       37
       +
           zsync

     

       38
       38
       +
         ];

     

       39
       39
       +
       in

     

       40
       40
       +
       

     

       41
       41
       +
       stdenv.mkDerivation rec {

     

       42
       42
       +
         pname = "quickemu";

     

       43
       43
       +
         version = "2.2.6";

     

       44
       44
       +
       

     

       45
       45
       +
         src = fetchFromGitHub {

     

       46
       46
       +
           owner = "wimpysworld";

     

       47
       47
       +
           repo = pname;

     

       48
       48
       +
           rev = version;

     

       49
       49
       +
           sha256 = "sha256-gextBOWxJafwdWzkp89thhRgcy1XBTDh2VyseHQM1G0=";

     

       50
       50
       +
         };

     

       51
       51
       +
       

     

       52
       52
       +
         nativeBuildInputs = [ makeWrapper ];

     

       53
       53
       +
       

     

       54
       54
       +
         installPhase = ''

     

       55
       55
       +
           runHook preInstall

     

       56
       56
       +
       

     

       57
       57
       +
           install -Dm755 -t "$out/bin" quickemu quickget macrecovery

     

       58
       58
       +
       

     

       59
       59
       +
          for f in quickget macrecovery quickemu; do

     

       60
       60
       +
           wrapProgram $out/bin/$f --prefix PATH : "${lib.makeBinPath runtimePaths}"

     

       61
       61
       +
          done

     

       62
       62
       +
       

     

       63
       63
       +
           runHook postInstall

     

       64
       64
       +
         '';

     

       65
       65
       +
       

     

       66
       66
       +
         meta = with lib; {

     

       67
       67
       +
           description = "Quickly create and run optimised Windows, macOS and Linux desktop virtual machines";

     

       68
       68
       +
           homepage = "https://github.com/wimpysworld/quickemu";

     

       69
       69
       +
           license = licenses.mit;

     

       70
       70
       +
           maintainers = with maintainers; [ fedx-sudo ];

     

       71
       71
       +
         };

     

       72
       72
       +
       }

+2 -2

pkgs/development/tools/altair-graphql-client/default.nix

···

       2
       2
        
       

     

       3
       3
        
       let

     

       4
       4
        
         pname = "altair";

     

       5
       5
       -
         version = "4.0.2";

     

       5
       5
       +
         version = "4.1.0";

     

       6
       6
        
         name = "${pname}-v${version}";

     

       7
       7
        
       

     

       8
       8
        
         src = fetchurl {

     

       9
       9
        
           url = "https://github.com/imolorhe/altair/releases/download/v${version}/altair_${version}_x86_64_linux.AppImage";

     

       10
       10
       -
           sha256 = "sha256-HCoK+ljcTmyBZSCDe6u2x2urqrQfi3DIlXfCqGWvl3E=";

     

       10
       10
       +
           sha256 = "sha256-YuG7H+7FXYGbNNhM5vxps72dqltcj3bA325e7ZbW8aI=";

     

       11
       11
        
         };

     

       12
       12
        
       

     

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

+2 -2

pkgs/development/web/postman/default.nix

···

       7
       7
        
       

     

       8
       8
        
       stdenv.mkDerivation rec {

     

       9
       9
        
         pname = "postman";

     

       10
       10
       -
         version = "9.0.5";

     

       10
       10
       +
         version = "9.1.1";

     

       11
       11
        
       

     

       12
       12
        
         src = fetchurl {

     

       13
       13
        
           url = "https://dl.pstmn.io/download/version/${version}/linux64";

     

       14
       14
       -
           sha256 = "1z28v5vrjld99ydai66k8hw01x54647324ax459bvblw989lzp7v";

     

       14
       14
       +
           sha256 = "QqlA/8fEOwucs+nU6ahDh3GB64PdhY8JFWPiyEBxGsE=";

     

       15
       15
        
           name = "${pname}.tar.gz";

     

       16
       16
        
         };

     

       17
       17

+3 -3

pkgs/misc/emulators/wine/sources.nix

···

       44
       44
        
       

     

       45
       45
        
         unstable = fetchurl rec {

     

       46
       46
        
           # NOTE: Don't forget to change the SHA256 for staging as well.

     

       47
       47
       -
           version = "6.19";

     

       47
       47
       +
           version = "6.20";

     

       48
       48
        
           url = "https://dl.winehq.org/wine/source/6.x/wine-${version}.tar.xz";

     

       49
       49
       -
           sha256 = "sha256-QYLi2WJ3BMw3b0b8MQlYDqkHd5b0T17oPgjj6Wvwq2Y=";

     

       49
       49
       +
           sha256 = "0wc4a8slb3k859sdw9wwy92zc4pq7xw1kbq4frnxbzbvkiz26a20";

     

       50
       50
        
           inherit (stable) gecko32 gecko64;

     

       51
       51
        
       

     

       52
       52
        
           ## see http://wiki.winehq.org/Mono

     
···

       65
       65
        
         staging = fetchFromGitHub rec {

     

       66
       66
        
           # https://github.com/wine-staging/wine-staging/releases

     

       67
       67
        
           inherit (unstable) version;

     

       68
       68
       -
           sha256 = "sha256-1Ng+kFFnqEndlCvI0eG1YmyqPdcolD3cVJ2KU5GU7Z4=";

     

       68
       68
       +
           sha256 = "12fvfn77rsqwdprkxiylq09jc81lq34bm8p1zhhn85q6yawpjlbn";

     

       69
       69
        
           owner = "wine-staging";

     

       70
       70
        
           repo = "wine-staging";

     

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

+4 -4

pkgs/misc/emulators/yuzu/default.nix

···

       4
       4
        
       in {

     

       5
       5
        
         mainline = libsForQt5.callPackage ./base.nix rec {

     

       6
       6
        
           pname = "yuzu-mainline";

     

       7
       7
       -
           version = "679";

     

       7
       7
       +
           version = "788";

     

       8
       8
        
           branchName = branch;

     

       9
       9
        
           src = fetchFromGitHub {

     

       10
       10
        
             owner = "yuzu-emu";

     

       11
       11
        
             repo = "yuzu-mainline";

     

       12
       12
        
             rev = "mainline-0-${version}";

     

       13
       13
       -
             sha256 = "1wkxkgfff5nn30mn2pqcrlsr7fja6bgaallsx1ainlcbamfyspcz";

     

       13
       13
       +
             sha256 = "0vgj1jvbc1ylrzvbl7njdwpajhmp8l39i2k6hgh4az34ry4iaayy";

     

       14
       14
        
             fetchSubmodules = true;

     

       15
       15
        
           };

     

       16
       16
        
         };

     

       17
       17
        
         early-access = libsForQt5.callPackage ./base.nix rec {

     

       18
       18
        
           pname = "yuzu-ea";

     

       19
       19
       -
           version = "1874";

     

       19
       19
       +
           version = "2156";

     

       20
       20
        
           branchName = branch;

     

       21
       21
        
           src = fetchFromGitHub {

     

       22
       22
        
             owner = "pineappleEA";

     

       23
       23
        
             repo = "pineapple-src";

     

       24
       24
        
             rev = "EA-${version}";

     

       25
       25
       -
             sha256 = "0ryrz7dl1sg30vvd7wrf05pjj8swah86055fn7qm6mr2bfslww0h";

     

       25
       25
       +
             sha256 = "1x8x808x3i8jr9zghx01vakb6q6hkwnarawr9arxvqnd9x79j8ga";

     

       26
       26
        
           };

     

       27
       27
        
         };

     

       28
       28
        
       }.${branch}

+2 -1

pkgs/servers/http/nginx/generic.nix

···

       21
       21
        
       , preConfigure ? ""

     

       22
       22
        
       , postInstall ? null

     

       23
       23
        
       , meta ? null

     

       24
       24
       +
       , passthru ? { tests = {}; }

     

       24
       25
        
       }:

     

       25
       26
        
       

     

       26
       27
        
       with lib;

     
···

       146
       147
        
             inherit (nixosTests) nginx nginx-auth nginx-etag nginx-pubhtml nginx-sandbox nginx-sso;

     

       147
       148
        
             variants = lib.recurseIntoAttrs nixosTests.nginx-variants;

     

       148
       149
        
             acme-integration = nixosTests.acme;

     

       149
       149
       -
           };

     

       150
       150
       +
           } // passthru.tests;

     

       150
       151
        
         };

     

       151
       152
        
       

     

       152
       153
        
         meta = if meta != null then meta else {

+5

pkgs/servers/http/openresty/default.nix

···

       3
       3
        
       , lib

     

       4
       4
        
       , fetchurl

     

       5
       5
        
       , postgresql

     

       6
       6
       +
       , nixosTests

     

       6
       7
        
       , ...

     

       7
       8
        
       }@args:

     

       8
       9
        
       

     
···

       41
       42
        
           ln -s $out/nginx/conf $out/conf

     

       42
       43
        
           ln -s $out/nginx/html $out/html

     

       43
       44
        
         '';

     

       45
       45
       +
       

     

       46
       46
       +
         passthru.tests = {

     

       47
       47
       +
           inherit (nixosTests) openresty-lua;

     

       48
       48
       +
         };

     

       44
       49
        
       

     

       45
       50
        
         meta = {

     

       46
       51
        
           description = "A fast web application server built on Nginx";

+1 -1

pkgs/servers/mail/sympa/default.nix

···

       24
       24
        
           IO

     

       25
       25
        
           IOStringy

     

       26
       26
        
           LWP

     

       27
       27
       -
           libintl_perl

     

       27
       27
       +
           libintl-perl

     

       28
       28
        
       

     

       29
       29
        
           MHonArc

     

       30
       30
        
           MIMECharset

+1 -1

pkgs/servers/openxpki/default.nix

···

       15
       15
        
         buildInputs = [ perl openssl gettext python3Packages.sphinx ];

     

       16
       16
        
         propagatedBuildInputs = with perlPackages;

     

       17
       17
        
           [ # dependencies from Makefile.PL

     

       18
       18
       -
             libintl_perl ConfigVersioned LWP ClassAccessorChained IOSocketSSL ClassStd

     

       18
       18
       +
             libintl-perl ConfigVersioned LWP ClassAccessorChained IOSocketSSL ClassStd

     

       19
       19
        
             CGISession ConfigStd ConfigMerge Connector CryptCBC CryptOpenSSLAES CryptPKCS10

     

       20
       20
        
             DBDMock DataPassword DataSerializer DateTimeFormatDateParse IOPrompt

     

       21
       21
        
             IPCShareLite JSON LogLog4perl LWPProtocolConnect LWPProtocolHttps MailRFC822Address

+5 -7

pkgs/servers/web-apps/cryptpad/bower-packages.nix

···

       5
       5
        
         (fetchbower "tweetnacl" "0.12.2" "0.12.2" "1lfzbfrdaly3zyzbcp1p53yhxlrx56k8x04q924kg7l52gblm65g")

     

       6
       6
        
         (fetchbower "components-font-awesome" "4.7.0" "^4.6.3" "1w27im6ayjrbgjqa0i49ml5d3wy4ld40h9b29hz9myv77bpx4lg1")

     

       7
       7
        
         (fetchbower "ckeditor" "4.14.0" "4.14.0" "0lw9q0k8c0jlxvf35vrccab9c3c8rgpc6x66czj9si8yy2lyliyp")

     

       8
       8
       -
         (fetchbower "codemirror" "5.61.1" "^5.19.0" "1abm1fcps86y2qm033wa96pd6ixf9w01vlhly5i51j0j94arnz4g")

     

       8
       8
       +
         (fetchbower "codemirror" "5.63.3" "^5.19.0" "09di53sfsgpd328fvz1qjlmybk5mmnb2p9r38xw329bi9b21rq0r")

     

       9
       9
        
         (fetchbower "requirejs" "2.3.5" "2.3.5" "05lyvgz914h2w08r24rk0vkk3yxmqrvlg7j3i5av9ffkg9lpzsli")

     

       10
       10
        
         (fetchbower "marked" "1.1.0" "1.1.0" "1sdgqw9iki9c1pfm4c5h6c956mchbip2jywjrcmrlb75k53flsjz")

     

       11
       11
        
         (fetchbower "rangy" "rangy-release#1.3.0" "rangy-release#~1.3.0" "13x3wci003p8jyv2ncir0k23bxckx99b3555r0zvgmlwycg7w0zv")

     
···

       13
       13
        
         (fetchbower "secure-fabric.js" "secure-v1.7.9" "secure-v1.7.9" "1l56mk7hbnsm9cdg5zdcmg95p7a9w96dq0bbl8fp11vs0awjil7a")

     

       14
       14
        
         (fetchbower "hyperjson" "1.4.0" "~1.4.0" "1n68ls3x4lyhg1yy8i4q3xkgh5xqpyakf45sny4x91mkr68x4bd9")

     

       15
       15
        
         (fetchbower "chainpad-crypto" "0.2.6" "^0.2.0" "0h6ibv6gcym7mm080swdw4l6l159xjmxgqnahyxw3aydha5cj1z0")

     

       16
       16
       -
         (fetchbower "chainpad-listmap" "0.10.2" "^0.10.0" "03j3qws0icam4c0yqrz7f6maf1dxhlc56hc6csr2d9dx0wshd57s")

     

       16
       16
       +
         (fetchbower "chainpad-listmap" "1.0.0" "^1.0.0" "0qzqblw67y1p69xc9n734srfhjviwwb2jbqxgxs0rf4vdyspwvcb")

     

       17
       17
        
         (fetchbower "chainpad" "5.2.4" "^5.2.0" "1f4nap0r8w50qpmjdfhhjhpz5xcl0n4zaxxnav1qaxi5j6dyg8h6")

     

       18
       18
        
         (fetchbower "file-saver" "1.3.1" "1.3.1" "065nzkvdiicxnw06z1sjz1sbp9nyis8z839hv6ng1fk25dc5kvkg")

     

       19
       19
        
         (fetchbower "alertifyjs" "1.0.11" "1.0.11" "0v7323bzq90k35shm3h6azj4wd9la3kbi1va1pw4qyvndkwma69l")

     

       20
       20
        
         (fetchbower "scrypt-async" "1.2.0" "1.2.0" "0d076ax708p9b8hcmk4f82j925nlnm0hmp0ni45ql37g7iirfpyv")

     

       21
       21
        
         (fetchbower "require-css" "0.1.10" "0.1.10" "106gz9i76v71q9zx2pnqkkj342m630lvssnw54023a0ljc0gqcwq")

     

       22
       22
       -
         (fetchbower "less" "3.7.1" "3.7.1" "1n7ps4xlbrc9m63b3q62mg3p6i7d5hwchhpjshb0drzj5crvz556")

     

       23
       22
        
         (fetchbower "bootstrap" "4.6.0" "^v4.0.0" "1pp2n88pkms25p7mbna7vxxl5mkpdn8nvnfzwcwpp6b0871njmr6")

     

       24
       23
        
         (fetchbower "diff-dom" "2.1.1" "2.1.1" "0nrn6xqlhp0p5ixjxdk8qg3939crkggh1l8swd20d7bsz186l5f1")

     

       25
       24
        
         (fetchbower "nthen" "0.1.7" "0.1.7" "03yap5ildigaw4rwxmxs37pcwhq415iham8w39zd56ka98gpfxa5")

     

       26
       25
        
         (fetchbower "open-sans-fontface" "1.4.2" "^1.4.2" "0ksav1fcq640fmdz49ra4prwsrrfj35y2p4shx1jh1j7zxd044nf")

     

       27
       26
        
         (fetchbower "bootstrap-tokenfield" "0.12.1" "0.12.1" "1dh791s6ih8bf9ihck9n39h68c273jb3lg4mqk94bvqraz45fvwx")

     

       28
       28
       -
         (fetchbower "localforage" "1.9.0" "^1.5.2" "18ds5427gaschld5afwi128hqy8kysa1b1ckbrzbmqz8xnlshmc2")

     

       27
       27
       +
         (fetchbower "localforage" "1.10.0" "^1.5.2" "019rh006v2w5x63mgk78qhw59kf8czbkwdvfngmac8fs6gz88lc8")

     

       29
       28
        
         (fetchbower "html2canvas" "0.4.1" "^0.4.1" "0yg7y90nav068q0i5afc2c221zkddpf28hi0hwc46cawx4180c69")

     

       30
       29
        
         (fetchbower "croppie" "2.6.5" "^2.5.0" "1j1v5620zi13ad42r358i4ay891abwn6nz357484kgq2bgjj6ccx")

     

       31
       30
        
         (fetchbower "sortablejs" "1.14.0" "^1.6.0" "104d688lrbwxi3hnfr4q169850ffyfv1s8qnycqxhx0zfh3887m0")

     
···

       34
       33
        
         (fetchbower "requirejs-plugins" "1.0.3" "^1.0.3" "00s3sdz1ykygx5shldwhhhybwgw7c99vkqd94i5i5x0gl97ifxf5")

     

       35
       34
        
         (fetchbower "dragula.js" "3.7.2" "3.7.2" "0dbkmrl8bcxiplprmmp9fj96ri5nahb2ql8cc7zwawncv0drvlh0")

     

       36
       35
        
         (fetchbower "MathJax" "3.0.5" "3.0.5" "087a9av15qj43m8pr3b9g59ncmydhmg40m6dfzsac62ykianh2a0")

     

       37
       37
       -
         (fetchbower "chainpad-netflux" "0.12.9" "^0.12.0" "1b2jkfl354gs9iy05i6db9g0hnngacxd2wdv59lc0icbmx62fpvi")

     

       38
       38
       -
         (fetchbower "netflux-websocket" "0.1.21" "^0.1.20" "13ia8cqipq1jnyzzxwf9yy91gzwnwb2g5kzb6l8id5gdr415q5yn")

     

       39
       39
       -
         (fetchbower "es6-promise" "3.3.1" "^3.2.2" "0ai6z5admfs84fdx6663ips49kqgz4x68ays78cic0xfb7pp6vcz")

     

       36
       36
       +
         (fetchbower "chainpad-netflux" "1.0.0" "^1.0.0" "08rpc73x1vyvd6zkb7w0m1smzjhq3b7cwb30nlmg93x873zjlsl6")

     

       37
       37
       +
         (fetchbower "netflux-websocket" "1.0.0" "^1.0.0" "10hgc5ra3ll7qc2r8aal6p03gx6dgz06l2b54lh995pvf901wzi6")

     

       40
       38
        
       ]; }

+14 -14

pkgs/servers/web-apps/cryptpad/node-packages-generated.nix

···

       346
       346
        
               sha512 = "KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==";

     

       347
       347
        
             };

     

       348
       348
        
           };

     

       349
       349
       -
           "mime-db-1.49.0" = {

     

       349
       349
       +
           "mime-db-1.50.0" = {

     

       350
       350
        
             name = "mime-db";

     

       351
       351
        
             packageName = "mime-db";

     

       352
       352
       -
             version = "1.49.0";

     

       352
       352
       +
             version = "1.50.0";

     

       353
       353
        
             src = fetchurl {

     

       354
       354
       -
               url = "https://registry.npmjs.org/mime-db/-/mime-db-1.49.0.tgz";

     

       355
       355
       -
               sha512 = "CIc8j9URtOVApSFCQIF+VBkX1RwXp/oMMOrqdyXSBXq5RWNEsRfyj1kiRnQgmNXmHxPoFIxOroKA3zcU9P+nAA==";

     

       354
       354
       +
               url = "https://registry.npmjs.org/mime-db/-/mime-db-1.50.0.tgz";

     

       355
       355
       +
               sha512 = "9tMZCDlYHqeERXEHO9f/hKfNXhre5dK2eE/krIvUjZbS2KPcqGDfNShIWS1uW9XOTKQKqK6qbeOci18rbfW77A==";

     

       356
       356
        
             };

     

       357
       357
        
           };

     

       358
       358
       -
           "mime-types-2.1.32" = {

     

       358
       358
       +
           "mime-types-2.1.33" = {

     

       359
       359
        
             name = "mime-types";

     

       360
       360
        
             packageName = "mime-types";

     

       361
       361
       -
             version = "2.1.32";

     

       361
       361
       +
             version = "2.1.33";

     

       362
       362
        
             src = fetchurl {

     

       363
       363
       -
               url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.32.tgz";

     

       364
       364
       -
               sha512 = "hJGaVS4G4c9TSMYh2n6SQAGrC4RnfU+daP8G7cSCmaqNjiOoUY0VHCMS42pxnQmVF1GWwFhbHWn3RIxCqTmZ9A==";

     

       363
       363
       +
               url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.33.tgz";

     

       364
       364
       +
               sha512 = "plLElXp7pRDd0bNZHw+nMd52vRYjLwQjygaNg7ddJ2uJtTlmnTCjWuPKxVu6//AdaRuME84SvLW91sIkBqGT0g==";

     

       365
       365
        
             };

     

       366
       366
        
           };

     

       367
       367
        
           "ms-2.0.0" = {

     
···

       656
       656
        
         };

     

       657
       657
        
       in

     

       658
       658
        
       {

     

       659
       659
       -
         "cryptpad-git+https://github.com/xwiki-labs/cryptpad.git#4.9.0" = nodeEnv.buildNodePackage {

     

       659
       659
       +
         "cryptpad-git+https://github.com/xwiki-labs/cryptpad.git#4.11.0" = nodeEnv.buildNodePackage {

     

       660
       660
        
           name = "cryptpad";

     

       661
       661
        
           packageName = "cryptpad";

     

       662
       662
       -
           version = "4.9.0";

     

       662
       662
       +
           version = "4.11.0";

     

       663
       663
        
           src = fetchgit {

     

       664
       664
        
             url = "https://github.com/xwiki-labs/cryptpad.git";

     

       665
       665
       -
             rev = "b1281fb4abd14e9758d58df4801e0a00eda7bc44";

     

       666
       666
       -
             sha256 = "ed2d0e2520645fccdada7fa5f25bb878c0ee0e61d6c81a98c18906c12750578c";

     

       665
       665
       +
             rev = "390e38acf63a9d7ae581eaa926ea678a519fcc14";

     

       666
       666
       +
             sha256 = "d75f0568fd146da6512646d9516138f94b0bbbd9a4691eef11d370bf5810176a";

     

       667
       667
        
           };

     

       668
       668
        
           dependencies = [

     

       669
       669
        
             sources."@mcrowe/minibloom-0.2.0"

     
···

       708
       708
        
             sources."merge-descriptors-1.0.1"

     

       709
       709
        
             sources."methods-1.1.2"

     

       710
       710
        
             sources."mime-1.4.1"

     

       711
       711
       -
             sources."mime-db-1.49.0"

     

       712
       712
       -
             sources."mime-types-2.1.32"

     

       711
       711
       +
             sources."mime-db-1.50.0"

     

       712
       712
       +
             sources."mime-types-2.1.33"

     

       713
       713
        
             sources."ms-2.0.0"

     

       714
       714
        
             sources."negotiator-0.6.2"

     

       715
       715
        
             sources."netflux-websocket-0.1.21"

+1 -1

pkgs/servers/web-apps/cryptpad/node-packages.json

···

       1
       1
        
       [

     

       2
       2
       -
         { "cryptpad": "git+https://github.com/xwiki-labs/cryptpad.git#4.9.0" }

     

       2
       2
       +
         { "cryptpad": "git+https://github.com/xwiki-labs/cryptpad.git#4.11.0" }

     

       3
       3
        
       ]

+6 -4

pkgs/tools/X11/bgs/default.nix

···

       1
       1
       -
       {lib, stdenv, fetchurl, pkg-config, libX11, libXinerama, imlib2}:

     

       1
       1
       +
       { lib, stdenv, fetchFromGitHub, pkg-config, libX11, libXinerama, imlib2 }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
       

     

       5
       5
        
         pname = "bgs";

     

       6
       6
        
         version = "0.8";

     

       7
       7
        
       

     

       8
       8
       -
         src = fetchurl {

     

       9
       9
       -
           url = "https://github.com/Gottox/bgs/archive/v${version}.tar.gz";

     

       10
       10
       -
           sha256 = "1rw9ingkkpvvr2dixx126ziim67a54r8k49918h1mbph0fjj08n5";

     

       8
       8
       +
         src = fetchFromGitHub {

     

       9
       9
       +
           owner = "Gottox";

     

       10
       10
       +
           repo = "bgs";

     

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

     

       12
       12
       +
           sha256 = "V8GP+xLSiCvaYZt8Bi3/3KlTBaGnMYQUeNCHwH6Ejzo=";

     

       11
       13
        
         };

     

       12
       14
        
       

     

       13
       15
        
         nativeBuildInputs = [ pkg-config ];

+6 -4

pkgs/tools/X11/wmutils-core/default.nix

···

       1
       1
       -
       { lib, stdenv, fetchurl, libxcb, xcbutil, xcb-util-cursor }:

     

       1
       1
       +
       { lib, stdenv, fetchFromGitHub, libxcb, xcbutil, xcb-util-cursor }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "wmutils-core";

     

       5
       5
        
         version = "1.5";

     

       6
       6
        
       

     

       7
       7
       -
         src = fetchurl {

     

       8
       8
       -
           url = "https://github.com/wmutils/core/archive/v${version}.tar.gz";

     

       9
       9
       -
           sha256 = "0wk39aq2lrnc0wjs8pv3cigw3lwy2qzaw0v61bwknd5wabm25bvj";

     

       7
       7
       +
         src = fetchFromGitHub {

     

       8
       8
       +
           owner = "wmutils";

     

       9
       9
       +
           repo = "core";

     

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

     

       11
       11
       +
           sha256 = "XPVH7vXlpmUsvNyGKMxLSZnWLnH/J5nGkXizcVqDwzM=";

     

       10
       12
        
         };

     

       11
       13
        
       

     

       12
       14
        
         buildInputs = [ libxcb xcbutil xcb-util-cursor ];

+7 -4

pkgs/tools/X11/xinput_calibrator/default.nix

···

       1
       1
       -
       { lib, stdenv, fetchurl, libXi, xorgproto, autoconf, automake, libtool, m4, xlibsWrapper, pkg-config }:

     

       1
       1
       +
       { lib, stdenv, fetchFromGitHub, libXi, xorgproto, autoconf, automake, libtool, m4, xlibsWrapper, pkg-config }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "xinput_calibrator";

     

       5
       5
        
         version = "0.7.5";

     

       6
       6
       -
         src = fetchurl {

     

       7
       7
       -
           url = "https://github.com/tias/${pname}/archive/v${version}.tar.gz";

     

       8
       8
       -
           sha256 = "d8edbf84523d60f52311d086a1e3ad0f3536f448360063dd8029bf6290aa65e9";

     

       6
       6
       +
       

     

       7
       7
       +
         src = fetchFromGitHub {

     

       8
       8
       +
           owner = "tias";

     

       9
       9
       +
           repo = "xinput_calibrator";

     

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

     

       11
       11
       +
           sha256 = "5ZkNw+CKNUcPt1PY5PLzB/OT2wcf5n3UcaQlmMcwRVE=";

     

       9
       12
        
         };

     

       10
       13
        
       

     

       11
       14
        
         preConfigure = "./autogen.sh --with-gui=X11";

+26 -17

pkgs/tools/misc/barman/default.nix

···

       1
       1
       -
       { buildPythonApplication, fetchurl, lib

     

       2
       2
       -
       , python-dateutil, argcomplete, argh, psycopg2, boto3

     

       1
       1
       +
       { fetchFromGitHub

     

       2
       2
       +
       , lib

     

       3
       3
       +
       , python3Packages

     

       3
       4
        
       }:

     

       4
       4
       -
       

     

       5
       5
       -
       buildPythonApplication rec {

     

       5
       5
       +
       python3Packages.buildPythonApplication rec {

     

       6
       6
        
         pname = "barman";

     

       7
       7
       -
         version = "2.12";

     

       7
       7
       +
         version = "2.15";

     

       8
       8
        
       

     

       9
       9
       -
         outputs = [ "out" "man" ];

     

       10
       10
       -
         src = fetchurl {

     

       11
       11
       -
           url = "mirror://sourceforge/pgbarman/${version}/barman-${version}.tar.gz";

     

       12
       12
       -
           sha256 = "Ts8I6tlP2GRp90OIIKXy+cRWWvUO3Sm86zq2dtVP5YE=";

     

       9
       9
       +
         src = fetchFromGitHub {

     

       10
       10
       +
           owner = "EnterpriseDB";

     

       11
       11
       +
           repo = pname;

     

       12
       12
       +
           rev = "release/${version}";

     

       13
       13
       +
           sha256 = "127cqndg0405rad9jzba1mfhpqmyfa3kx16w345kd4n822w17ak9";

     

       13
       14
        
         };

     

       14
       15
        
       

     

       15
       15
       -
         propagatedBuildInputs = [ python-dateutil argh psycopg2 boto3 argcomplete ];

     

       16
       16
       +
         checkInputs = with python3Packages; [

     

       17
       17
       +
           mock

     

       18
       18
       +
           pytestCheckHook

     

       19
       19
       +
         ];

     

       16
       20
        
       

     

       17
       17
       -
         # Tests are not present in tarball

     

       18
       18
       -
         checkPhase = ''

     

       19
       19
       -
           $out/bin/barman --help > /dev/null

     

       20
       20
       -
         '';

     

       21
       21
       +
         propagatedBuildInputs = with python3Packages; [

     

       22
       22
       +
           argcomplete

     

       23
       23
       +
           argh

     

       24
       24
       +
           azure-identity

     

       25
       25
       +
           azure-storage-blob

     

       26
       26
       +
           boto3

     

       27
       27
       +
           psycopg2

     

       28
       28
       +
           python-dateutil

     

       29
       29
       +
         ];

     

       21
       30
        
       

     

       22
       31
        
         meta = with lib; {

     

       23
       23
       -
           homepage = "https://www.2ndquadrant.com/en/resources/barman/";

     

       24
       24
       -
           description = "Backup and Disaster Recovery Manager for PostgreSQL";

     

       32
       32
       +
           homepage = "https://www.pgbarman.org/";

     

       33
       33
       +
           description = "Backup and Recovery Manager for PostgreSQL";

     

       25
       34
        
           maintainers = with maintainers; [ freezeboy ];

     

       26
       26
       -
           license = licenses.gpl2;

     

       35
       35
       +
           license = licenses.gpl3Plus;

     

       27
       36
        
           platforms = platforms.unix;

     

       28
       37
        
         };

     

       29
       38
        
       }

+3 -3

pkgs/tools/misc/fclones/default.nix

···

       8
       8
        
       

     

       9
       9
        
       rustPlatform.buildRustPackage rec {

     

       10
       10
        
         pname = "fclones";

     

       11
       11
       -
         version = "0.16.1";

     

       11
       11
       +
         version = "0.17.0";

     

       12
       12
        
       

     

       13
       13
        
         src = fetchFromGitHub {

     

       14
       14
        
           owner = "pkolaczk";

     

       15
       15
        
           repo = pname;

     

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

     

       17
       17
       -
           sha256 = "sha256-7rwiqjjXB1+R+/kauGjiJOX/UtMmQW3U3xGL/rsSiQ0=";

     

       17
       17
       +
           sha256 = "sha256-JygW1Ri9BA4Qssu6MlQCCjnAok9OD2pcGdavOyHxbIo=";

     

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
       -
         cargoSha256 = "sha256-g4z+05jiVaH3KCPVwJmvQbi0OCYtuafyZyVZDRRyPRA=";

     

       20
       20
       +
         cargoSha256 = "sha256-sDHsj0qxKW5JJCI9H0WytgugtEmLaLU2EIgCcXdfQH0=";

     

       21
       21
        
       

     

       22
       22
        
         buildInputs = lib.optionals stdenv.isDarwin [

     

       23
       23
        
           AppKit

+1 -1

pkgs/tools/misc/fntsample/default.nix

···

       61
       61
        
               ExporterTiny

     

       62
       62
        
               ListMoreUtils

     

       63
       63
        
               PDFAPI2

     

       64
       64
       -
               libintl_perl

     

       64
       64
       +
               libintl-perl

     

       65
       65
        
             ];

     

       66
       66
        
           in ''

     

       67
       67
        
           for cmd in pdfoutline pdf-extract-outline; do

+6 -4

pkgs/tools/security/b2sum/default.nix

···

       1
       1
       -
       { lib, stdenv, fetchzip, openmp ? null }:

     

       1
       1
       +
       { lib, stdenv, fetchFromGitHub, openmp ? null }:

     

       2
       2
        
       

     

       3
       3
        
       with lib;

     

       4
       4
        
       

     
···

       6
       6
        
         pname = "b2sum";

     

       7
       7
        
         version = "unstable-2018-06-11";

     

       8
       8
        
       

     

       9
       9
       -
         src = fetchzip {

     

       10
       10
       -
           url = "https://github.com/BLAKE2/BLAKE2/archive/320c325437539ae91091ce62efec1913cd8093c2.tar.gz";

     

       11
       11
       -
           sha256 = "0agmc515avdpr64bsgv87wby2idm0d3wbndxzkhdfjgzhgv0rb8k";

     

       9
       9
       +
         src = fetchFromGitHub {

     

       10
       10
       +
           owner = "BLAKE2";

     

       11
       11
       +
           repo = "BLAKE2";

     

       12
       12
       +
           rev = "320c325437539ae91091ce62efec1913cd8093c2";

     

       13
       13
       +
           sha256 = "E60M9oP/Sdfg/L3ZxUcDtUXhFz9oP72IybdtVUJh9Sk=";

     

       12
       14
        
         };

     

       13
       15
        
       

     

       14
       16
        
         sourceRoot = "source/b2sum";

+8 -6

pkgs/tools/system/daemonize/default.nix

···

       1
       1
       -
       { lib, stdenv, fetchurl }:

     

       1
       1
       +
       { lib, stdenv, fetchFromGitHub }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "daemonize";

     

       5
       5
        
         version = "1.7.8";

     

       6
       6
        
       

     

       7
       7
       -
         src = fetchurl {

     

       8
       8
       -
           url    = "https://github.com/bmc/daemonize/archive/release-${version}.tar.gz";

     

       9
       9
       -
           sha256 = "0q2c3i3si3k7wfhl6fyckkmkc81yp67pz52p3ggis79p4nczri10";

     

       7
       7
       +
         src = fetchFromGitHub {

     

       8
       8
       +
           owner = "bmc";

     

       9
       9
       +
           repo = "daemonize";

     

       10
       10
       +
           rev = "release-${version}";

     

       11
       11
       +
           sha256 = "1e6LZXf/lK7sB2CbXwOg7LOi0Q8IBQNAa4d7rX0Ej3A=";

     

       10
       12
        
         };

     

       11
       13
        
       

     

       12
       14
        
         meta = with lib; {

     

       13
       15
        
           description = "Runs a command as a Unix daemon";

     

       14
       14
       -
           homepage    = "http://software.clapper.org/daemonize/";

     

       15
       15
       -
           license     = licenses.bsd3;

     

       16
       16
       +
           homepage = "http://software.clapper.org/daemonize/";

     

       17
       17
       +
           license = licenses.bsd3;

     

       16
       18
        
           platforms = with platforms; linux ++ freebsd ++ darwin;

     

       17
       19
        
         };

     

       18
       20
        
       }

+86

pkgs/tools/system/gkraken/default.nix

···

       1
       1
       +
       { python3Packages

     

       2
       2
       +
       , lib

     

       3
       3
       +
       , fetchFromGitLab

     

       4
       4
       +
       , meson

     

       5
       5
       +
       , pkg-config

     

       6
       6
       +
       , glib

     

       7
       7
       +
       , ninja

     

       8
       8
       +
       , desktop-file-utils

     

       9
       9
       +
       , gobject-introspection

     

       10
       10
       +
       , gtk3

     

       11
       11
       +
       , libnotify

     

       12
       12
       +
       , dbus

     

       13
       13
       +
       , wrapGAppsHook

     

       14
       14
       +
       }:

     

       15
       15
       +
       

     

       16
       16
       +
       python3Packages.buildPythonApplication rec {

     

       17
       17
       +
         pname = "gkraken";

     

       18
       18
       +
         version = "1.1.6";

     

       19
       19
       +
       

     

       20
       20
       +
         src = fetchFromGitLab {

     

       21
       21
       +
           owner = "leinardi";

     

       22
       22
       +
           repo = "gkraken";

     

       23
       23
       +
           rev = version;

     

       24
       24
       +
           sha256 = "085zz6m7c3xzsrvkw50gbbz8l9fmswxj2hjya2f52dvgs8daijdy";

     

       25
       25
       +
         };

     

       26
       26
       +
       

     

       27
       27
       +
         format = "other";

     

       28
       28
       +
       

     

       29
       29
       +
         postPatch = ''

     

       30
       30
       +
           patchShebangs scripts/meson_post_install.py

     

       31
       31
       +
         '';

     

       32
       32
       +
       

     

       33
       33
       +
         nativeBuildInputs = [

     

       34
       34
       +
           meson

     

       35
       35
       +
           pkg-config

     

       36
       36
       +
           glib

     

       37
       37
       +
           ninja

     

       38
       38
       +
           gtk3

     

       39
       39
       +
           desktop-file-utils

     

       40
       40
       +
           wrapGAppsHook

     

       41
       41
       +
         ];

     

       42
       42
       +
       

     

       43
       43
       +
         buildInputs = [

     

       44
       44
       +
           gobject-introspection

     

       45
       45
       +
           glib

     

       46
       46
       +
           gtk3

     

       47
       47
       +
           libnotify

     

       48
       48
       +
           dbus

     

       49
       49
       +
         ];

     

       50
       50
       +
       

     

       51
       51
       +
         propagatedBuildInputs = with python3Packages; [

     

       52
       52
       +
           pygobject3

     

       53
       53
       +
           peewee

     

       54
       54
       +
           rx

     

       55
       55
       +
           injector

     

       56
       56
       +
           liquidctl

     

       57
       57
       +
           pyxdg

     

       58
       58
       +
           requests

     

       59
       59
       +
           matplotlib

     

       60
       60
       +
           dbus-python

     

       61
       61
       +
         ];

     

       62
       62
       +
       

     

       63
       63
       +
         dontWrapGApps = true;

     

       64
       64
       +
       

     

       65
       65
       +
         # Extract udev rules from python code

     

       66
       66
       +
         postInstall = ''

     

       67
       67
       +
           mkdir -p $out/lib/udev/rules.d

     

       68
       68
       +
           sed -e '/\s*\(from\|@singleton\|@inject\)/d' $src/gkraken/interactor/udev_interactor.py > udev_interactor.py

     

       69
       69
       +
           python -c 'from udev_interactor import _UDEV_RULE; print(_UDEV_RULE)' > $out/lib/udev/rules.d/60-gkraken.rules

     

       70
       70
       +
         '';

     

       71
       71
       +
       

     

       72
       72
       +
         preFixup = ''

     

       73
       73
       +
           makeWrapperArgs+=(

     

       74
       74
       +
             "''${gappsWrapperArgs[@]}"

     

       75
       75
       +
           )

     

       76
       76
       +
         '';

     

       77
       77
       +
       

     

       78
       78
       +
         meta = with lib; {

     

       79
       79
       +
           description = "GUI that allows to control the cooling (fan and/or pump profiles) of NZXT Kraken AIO liquid coolers from Linux";

     

       80
       80
       +
           homepage = "https://gitlab.com/leinardi/gkraken";

     

       81
       81
       +
           changelog = "https://gitlab.com/leinardi/gkraken/-/tags/${version}";

     

       82
       82
       +
           license = licenses.gpl3Plus;

     

       83
       83
       +
           maintainers = with maintainers; [ OPNA2608 ];

     

       84
       84
       +
           platforms = platforms.linux;

     

       85
       85
       +
         };

     

       86
       86
       +
       }

+6 -4

pkgs/tools/system/symlinks/default.nix

···

       1
       1
       -
       { fetchurl, lib, stdenv }:

     

       1
       1
       +
       { fetchFromGitHub, lib, stdenv }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "symlinks";

     

       5
       5
        
         version = "1.4.3";

     

       6
       6
        
       

     

       7
       7
       -
         src = fetchurl {

     

       8
       8
       -
           url = "https://github.com/brandt/symlinks/archive/v${version}.tar.gz";

     

       9
       9
       -
           sha256 = "1cihrd3dap52z1msdhhgda7b7wy1l5ysfvyba8yxb3zjk0l5n417";

     

       7
       7
       +
         src = fetchFromGitHub {

     

       8
       8
       +
           owner = "brandt";

     

       9
       9
       +
           repo = "symlinks";

     

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

     

       11
       11
       +
           sha256 = "EMWd7T/k4v1uvXe2QxhyPoQKUpKIUANE9AOwX461FgU=";

     

       10
       12
        
         };

     

       11
       13
        
       

     

       12
       14
        
         buildFlags = [ "CC=${stdenv.cc}/bin/cc" ];

+6 -4

pkgs/tools/text/cconv/default.nix

···

       1
       1
       -
       { lib, stdenv, fetchurl, autoreconfHook, libiconv }:

     

       1
       1
       +
       { lib, stdenv, fetchFromGitHub, autoreconfHook, libiconv }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "cconv";

     

       5
       5
        
         version = "0.6.3";

     

       6
       6
        
       

     

       7
       7
       -
         src = fetchurl {

     

       8
       8
       -
           url = "https://github.com/xiaoyjy/cconv/archive/v${version}.tar.gz";

     

       9
       9
       -
           sha256 = "82f46a94829f5a8157d6f686e302ff5710108931973e133d6e19593061b81d84";

     

       7
       7
       +
         src = fetchFromGitHub {

     

       8
       8
       +
           owner = "xiaoyjy";

     

       9
       9
       +
           repo = "cconv";

     

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

     

       11
       11
       +
           sha256 = "RAFl/+I+usUfeG/l17F3ltThK7G4+TekyQGwzQIgeH8=";

     

       10
       12
        
         };

     

       11
       13
        
       

     

       12
       14
        
         nativeBuildInputs = [ autoreconfHook ];

+6 -4

pkgs/tools/text/qshowdiff/default.nix

···

       1
       1
       -
       {lib, stdenv, fetchurl, qt4, perl, pkg-config }:

     

       1
       1
       +
       { lib, stdenv, fetchFromGitHub, qt4, perl, pkg-config }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "qshowdiff";

     

       5
       5
        
         version = "1.2";

     

       6
       6
        
       

     

       7
       7
       -
         src = fetchurl {

     

       8
       8
       -
           url = "https://github.com/danfis/qshowdiff/archive/v${version}.tar.gz";

     

       9
       9
       -
           sha256 = "027959xbzvi5c2w9y1x122sr5i26k9mvp43banz2wln6gd860n1a";

     

       7
       7
       +
         src = fetchFromGitHub {

     

       8
       8
       +
           owner = "danfis";

     

       9
       9
       +
           repo = "qshowdiff";

     

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

     

       11
       11
       +
           sha256 = "g3AWQ6/LSF59ztzdgNuLi+8d6fFTPiC9z0yXMdPdB5U=";

     

       10
       12
        
         };

     

       11
       13
        
       

     

       12
       14
        
         nativeBuildInputs = [ pkg-config ];

+6 -4

pkgs/tools/typesetting/odpdown/default.nix

···

       1
       1
       -
       { lib, fetchurl, pythonPackages, libreoffice }:

     

       1
       1
       +
       { lib, fetchFromGitHub, pythonPackages, libreoffice }:

     

       2
       2
        
       

     

       3
       3
        
       pythonPackages.buildPythonApplication rec {

     

       4
       4
        
       

     

       5
       5
        
         pname = "odpdown";

     

       6
       6
        
         version = "0.4.1";

     

       7
       7
        
       

     

       8
       8
       -
         src = fetchurl {

     

       9
       9
       -
           url = "https://github.com/thorstenb/odpdown/archive/v${version}.tar.gz";

     

       10
       10
       -
           sha256 = "005eecc73c65b9d4c09532547940718a7b308cd565f62a213dfa040827d4d565";

     

       8
       8
       +
         src = fetchFromGitHub {

     

       9
       9
       +
           owner = "thorstenb";

     

       10
       10
       +
           repo = "odpdown";

     

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

     

       12
       12
       +
           sha256 = "r2qbgD9PAalbypt+vjp2YcYggUGPQMEG2FDxMtohqG4=";

     

       11
       13
        
         };

     

       12
       14
        
       

     

       13
       15
        
         propagatedBuildInputs = with pythonPackages; [ libreoffice lpod lxml mistune pillow pygments ];

+7 -1

pkgs/top-level/all-packages.nix

···

       164
       164
        
       

     

       165
       165
        
         addOpenGLRunpath = callPackage ../build-support/add-opengl-runpath { };

     

       166
       166
        
       

     

       167
       167
       +
         quickemu = callPackage ../development/quickemu { };

     

       168
       168
       +
       

     

       167
       169
        
         aether = callPackage ../applications/networking/aether { };

     

       168
       170
        
       

     

       169
       171
        
         alda = callPackage ../development/interpreters/alda { };

     
···

       1432
       1434
        
       

     

       1433
       1435
        
         automirror = callPackage ../tools/misc/automirror { };

     

       1434
       1436
        
       

     

       1435
       1435
       -
         barman = python3Packages.callPackage ../tools/misc/barman { };

     

       1437
       1437
       +
         barman = callPackage ../tools/misc/barman { };

     

       1436
       1438
        
       

     

       1437
       1439
        
         base16-universal-manager = callPackage ../applications/misc/base16-universal-manager { };

     

       1438
       1440
        
       

     
···

       5973
       5975
        
         gtest = callPackage ../development/libraries/gtest { };

     

       5974
       5976
        
       

     

       5975
       5977
        
         gbenchmark = callPackage ../development/libraries/gbenchmark {};

     

       5978
       5978
       +
       

     

       5979
       5979
       +
         gkraken = callPackage ../tools/system/gkraken { };

     

       5976
       5980
        
       

     

       5977
       5981
        
         gtkdatabox = callPackage ../development/libraries/gtkdatabox {};

     

       5978
       5982
        
       

     
···

       12952
       12956
        
         urweb = callPackage ../development/compilers/urweb {

     

       12953
       12957
        
           icu = icu67;

     

       12954
       12958
        
         };

     

       12959
       12959
       +
       

     

       12960
       12960
       +
         urbackup-client = callPackage ../applications/backup/urbackup-client { };

     

       12955
       12961
        
       

     

       12956
       12962
        
         vlang = callPackage ../development/compilers/vlang { };

     

       12957
       12963

+5 -4

pkgs/top-level/perl-packages.nix

···

       852
       852
        
             sha256 = "ee146cd75d6300837e6ca559bb0bde247d42123c96b2c5d4b2800f38d3e3d1ab";

     

       853
       853
        
           };

     

       854
       854
        
           buildInputs = [ CaptureTiny TestDeep TestDir TestException TestFile TestFileContents TestMockModule TestMockObject TestNoWarnings TestWarn ];

     

       855
       855
       -
           propagatedBuildInputs = [ Clone ConfigGitLike DBI DateTime EncodeLocale HashMerge IOPager IPCRun3 IPCSystemSimple ListMoreUtils PathClass PerlIOutf8_strict PodParser StringFormatter StringShellQuote TemplateTiny Throwable TypeTiny URIdb libintl_perl ];

     

       855
       855
       +
           propagatedBuildInputs = [ Clone ConfigGitLike DBI DateTime EncodeLocale HashMerge IOPager IPCRun3 IPCSystemSimple ListMoreUtils PathClass PerlIOutf8_strict PodParser StringFormatter StringShellQuote TemplateTiny Throwable TypeTiny URIdb libintl-perl ];

     

       856
       856
        
           doCheck = false;  # Can't find home directory.

     

       857
       857
        
           meta = {

     

       858
       858
        
             homepage = "https://sqitch.org/";

     
···

       11760
       11760
        
           };

     

       11761
       11761
        
         };

     

       11762
       11762
        
       

     

       11763
       11763
       -
         libintl_perl = buildPerlPackage {

     

       11763
       11763
       +
         libintl-perl = buildPerlPackage {

     

       11764
       11764
        
           pname = "libintl-perl";

     

       11765
       11765
        
           version = "1.32";

     

       11766
       11766
        
           src = fetchurl {

     
···

       18612
       18612
        
             url = "mirror://cpan/authors/id/K/KR/KRYDE/podlinkcheck-15.tar.gz";

     

       18613
       18613
        
             sha256 = "4e3bebec1bf82dbf850a94ae26a253644cf5806ec41afc74e43e1710a37321db";

     

       18614
       18614
        
           };

     

       18615
       18615
       -
           propagatedBuildInputs = [ FileFindIterator FileHomeDir IPCRun PodParser constant-defer libintl_perl ];

     

       18615
       18615
       +
           propagatedBuildInputs = [ FileFindIterator FileHomeDir IPCRun PodParser constant-defer libintl-perl ];

     

       18616
       18616
        
           meta = {

     

       18617
       18617
        
             homepage = "http://user42.tuxfamily.org/podlinkcheck/index.html";

     

       18618
       18618
        
             description = "Check POD L<> link references";

     
···

       25222
       25222
        
         EmailMIMEModifier = self.EmailMIME;

     

       25223
       25223
        
         ExtUtilsCommand = self.ExtUtilsMakeMaker;

     

       25224
       25224
        
         IOstringy = self.IOStringy;

     

       25225
       25225
       -
         libintlperl = self.libintl_perl;

     

       25225
       25225
       +
         libintl_perl = self.libintl-perl;

     

       25226
       25226
       +
         libintlperl = self.libintl-perl;

     

       25226
       25227
        
         LWPProtocolconnect = self.LWPProtocolConnect;

     

       25227
       25228
        
         LWPProtocolhttps = self.LWPProtocolHttps;

     

       25228
       25229
        
         LWPUserAgent = self.LWP;