commit 19d5413d37d22385c3524dc9519778777bb4c9e4 · pyrox.dev/nixpkgs

+5 -4

nixos/modules/tasks/filesystems.nix

···

       7
       7
        
       

     

       8
       8
        
         addCheckDesc = desc: elemType: check: types.addCheck elemType check

     

       9
       9
        
           // { description = "${elemType.description} (with check: ${desc})"; };

     

       10
       10
       -
         nonEmptyStr = addCheckDesc "non-empty" types.str

     

       11
       11
       -
           (x: x != "" && ! (all (c: c == " " || c == "\t") (stringToCharacters x)));

     

       10
       10
       +
       

     

       11
       11
       +
         isNonEmpty = s: (builtins.match "[ \t\n]*" s) == null;

     

       12
       12
       +
         nonEmptyStr = addCheckDesc "non-empty" types.str isNonEmpty;

     

       12
       13
        
       

     

       13
       14
        
         fileSystems' = toposort fsBefore (attrValues config.fileSystems);

     

       14
       15
        
       

     
···

       28
       29
        
         coreFileSystemOpts = { name, config, ... }: {

     

       29
       30
        
       

     

       30
       31
        
           options = {

     

       31
       31
       -
       

     

       32
       32
        
             mountPoint = mkOption {

     

       33
       33
        
               example = "/mnt/usb";

     

       34
       34
       -
               type = nonEmptyStr;

     

       34
       34
       +
               type = addCheckDesc "non-empty without trailing slash" types.str

     

       35
       35
       +
                 (s: isNonEmpty s && (builtins.match ".+/" s) == null);

     

       35
       36
        
               description = "Location of the mounted the file system.";

     

       36
       37
        
             };

     

       37
       38

+2 -2

pkgs/applications/blockchains/bitcoin-classic.nix

···

       7
       7
        
       stdenv.mkDerivation rec {

     

       8
       8
        
       

     

       9
       9
        
         name = "bitcoin" + (toString (optional (!withGui) "d")) + "-classic-" + version;

     

       10
       10
       -
         version = "1.3.8";

     

       10
       10
       +
         version = "1.3.8uahf";

     

       11
       11
        
       

     

       12
       12
        
         src = fetchFromGitHub {

     

       13
       13
        
           owner = "bitcoinclassic";

     

       14
       14
        
           repo = "bitcoinclassic";

     

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

     

       16
       16
       -
           sha256 = "06ij9v7zbdnhxq9429nnxiw655cp8idldj18l7fmj94gqx07n5vh";

     

       16
       16
       +
           sha256 = "sha256-V1cOB5FLotGS5jup/aVaiDiyr/v2KJ2SLcIu/Hrjuwk=";

     

       17
       17
        
         };

     

       18
       18
        
       

     

       19
       19
        
         nativeBuildInputs = [ pkg-config autoreconfHook ];

+11

pkgs/applications/graphics/dia/CVE-2019-19451.patch

···

       1
       1
       +
       diff -ru a/app/app_procs.c b/app/app_procs.c

     

       2
       2
       +
       --- a/app/app_procs.c	2021-01-30 11:09:52.000000000 -0500

     

       3
       3
       +
       +++ b/app/app_procs.c	2021-01-30 11:11:05.000000000 -0500

     

       4
       4
       +
       @@ -785,6 +785,7 @@

     

       5
       5
       +
        

     

       6
       6
       +
        	if (!filename) {

     

       7
       7
       +
        	  g_print (_("Filename conversion failed: %s\n"), filenames[i]);

     

       8
       8
       +
       +	  ++i;

     

       9
       9
       +
        	  continue;

     

       10
       10
       +
        	}

     

       11
       11
       +

+4

pkgs/applications/graphics/dia/default.nix

···

       13
       13
        
           sha256 = "1fyxfrzdcs6blxhkw3bcgkksaf3byrsj4cbyrqgb4869k3ynap96";

     

       14
       14
        
         };

     

       15
       15
        
       

     

       16
       16
       +
         patches = [

     

       17
       17
       +
           ./CVE-2019-19451.patch

     

       18
       18
       +
         ];

     

       19
       19
       +
       

     

       16
       20
        
         buildInputs =

     

       17
       21
        
           [ gtk2 libxml2 gettext python libxml2Python docbook5

     

       18
       22
        
             libxslt docbook_xsl libart_lgpl ]

+2 -2

pkgs/applications/misc/obsidian/default.nix

···

       30
       30
        
       

     

       31
       31
        
       in stdenv.mkDerivation rec {

     

       32
       32
        
         pname = "obsidian";

     

       33
       33
       -
         version = "0.10.8";

     

       33
       33
       +
         version = "0.10.11";

     

       34
       34
        
       

     

       35
       35
        
         src = fetchurl {

     

       36
       36
        
           url =

     

       37
       37
        
             "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/obsidian-${version}.asar.gz";

     

       38
       38
       -
           sha256 = "M+iIvnenfe+4JUKLvGDJXub8d5t2BLoPTo5MrF+5xy4=";

     

       38
       38
       +
           sha256 = "RQdNTzorFq3W8clNObyOisKWUM/s+bE/CbpJ/8ABbrk=";

     

       39
       39
        
         };

     

       40
       40
        
       

     

       41
       41
        
         nativeBuildInputs = [ makeWrapper graphicsmagick ];

+4 -1

pkgs/development/compilers/swift/default.nix

···

       331
       331
        
           # Swift doesn't support 32bit Linux, unknown on other platforms.

     

       332
       332
        
           platforms = platforms.linux;

     

       333
       333
        
           badPlatforms = platforms.i686;

     

       334
       334
       -
           broken = stdenv.isAarch64; # 2018-09-04, never built on Hydra

     

       334
       334
       +
           broken = true; # 2021-01-29

     

       335
       335
       +
           knownVulnerabilities = [

     

       336
       336
       +
             "CVE-2020-9861"

     

       337
       337
       +
           ];

     

       335
       338
        
         };

     

       336
       339
        
       }

+2 -2

pkgs/development/libraries/librelp/default.nix

···

       8
       8
        
       

     

       9
       9
        
       stdenv.mkDerivation rec {

     

       10
       10
        
         pname = "librelp";

     

       11
       11
       -
         version = "1.7.0";

     

       11
       11
       +
         version = "1.9.0";

     

       12
       12
        
       

     

       13
       13
        
         src = fetchFromGitHub {

     

       14
       14
        
           owner = "rsyslog";

     

       15
       15
        
           repo = "librelp";

     

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

     

       17
       17
       -
           sha256 = "0miqjck9zh1hgsx1v395n0d4f1a1p5a8khybv2nsfjq04g9359c9";

     

       17
       17
       +
           sha256 = "sha256-nE7YavjZj+nHcTNkcl/xVAaP+9XfHlTEsW18aPO/ABY=";

     

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
        
         nativeBuildInputs = [ pkg-config autoreconfHook ];

+28

pkgs/development/ocaml-modules/progress/default.nix

···

       1
       1
       +
       { lib, buildDunePackage, fetchurl

     

       2
       2
       +
       , mtime, terminal_size, alcotest, astring, fmt

     

       3
       3
       +
       }:

     

       4
       4
       +
       

     

       5
       5
       +
       buildDunePackage rec {

     

       6
       6
       +
         pname = "progress";

     

       7
       7
       +
         version = "0.1.1";

     

       8
       8
       +
       

     

       9
       9
       +
         minimumOCamlVersion = "4.08";

     

       10
       10
       +
         useDune2 = true;

     

       11
       11
       +
       

     

       12
       12
       +
         src = fetchurl {

     

       13
       13
       +
           url = "https://github.com/CraigFe/progress/releases/download/${version}/progress-${version}.tbz";

     

       14
       14
       +
           sha256 = "90c6bec19d014a4c6b0b67006f08bdfcf36981d2176769bebe0ccd75d6785a32";

     

       15
       15
       +
         };

     

       16
       16
       +
       

     

       17
       17
       +
         propagatedBuildInputs = [ mtime terminal_size ];

     

       18
       18
       +
       

     

       19
       19
       +
         doCheck = true;

     

       20
       20
       +
         checkInputs = [ alcotest astring fmt ];

     

       21
       21
       +
       

     

       22
       22
       +
         meta = with lib; {

     

       23
       23
       +
           description = "Progress bar library for OCaml";

     

       24
       24
       +
           homepage = "https://github.com/CraigFe/progress";

     

       25
       25
       +
           license = licenses.mit;

     

       26
       26
       +
           maintainers = [ maintainers.sternenseemann ];

     

       27
       27
       +
         };

     

       28
       28
       +
       }

+2 -2

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

···

       8
       8
        
       

     

       9
       9
        
       buildPythonPackage rec {

     

       10
       10
        
         pname = "awesomeversion";

     

       11
       11
       -
         version = "21.1.3";

     

       11
       11
       +
         version = "21.1.8";

     

       12
       12
        
         disabled = pythonOlder "3.8";

     

       13
       13
        
       

     

       14
       14
        
         src = fetchFromGitHub {

     

       15
       15
        
           owner = "ludeeus";

     

       16
       16
        
           repo = pname;

     

       17
       17
        
           rev = version;

     

       18
       18
       -
           sha256 = "sha256-D31wmBrYFCArHddAINWjfTPow4K2TD+wGfmRUuIaBdA=";

     

       18
       18
       +
           sha256 = "sha256-hNsFkGSzqt5ujqk+AO1FW/yzwPxEN+AA7EVazvkwz2o=";

     

       19
       19
        
         };

     

       20
       20
        
       

     

       21
       21
        
         postPatch = ''

+2 -2

pkgs/development/python-modules/dj-email-url/default.nix

···

       5
       5
        
       }:

     

       6
       6
        
       

     

       7
       7
        
       buildPythonPackage rec {

     

       8
       8
       -
         version = "1.0.1";

     

       8
       8
       +
         version = "1.0.2";

     

       9
       9
        
         pname = "dj-email-url";

     

       10
       10
        
       

     

       11
       11
        
         src = fetchPypi {

     

       12
       12
        
           inherit pname version;

     

       13
       13
       -
           sha256 = "32dc567c5cc3d4106710ec36dd645c8c1b20e2d8f588a17ab88bcc23e347d00a";

     

       13
       13
       +
           sha256 = "838fd4ded9deba53ae757debef431e25fa7fca31d3948b3c4808ccdc84fab2b7";

     

       14
       14
        
         };

     

       15
       15
        
       

     

       16
       16
        
         checkPhase = ''

+2 -2

pkgs/development/python-modules/dogpile.cache/default.nix

···

       12
       12
        
       

     

       13
       13
        
       buildPythonPackage rec {

     

       14
       14
        
         pname = "dogpile.cache";

     

       15
       15
       -
         version = "1.1.1";

     

       15
       15
       +
         version = "1.1.2";

     

       16
       16
        
         disabled = pythonOlder "3.6";

     

       17
       17
        
       

     

       18
       18
        
         src = fetchPypi {

     

       19
       19
        
           inherit pname version;

     

       20
       20
       -
           sha256 = "40147b19696f387415a7efaaa4cf8ea0b5d31bdd1b53e5187e75d48ddfee9f0e";

     

       20
       20
       +
           sha256 = "2134464672a3deb7ef1366a8691726686d8c62540e4208f1a40c9aaa1a0b6a45";

     

       21
       21
        
         };

     

       22
       22
        
       

     

       23
       23
        
         # Disable concurrency tests that often fail,

+2 -2

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

···

       14
       14
        
       

     

       15
       15
        
       buildPythonPackage rec {

     

       16
       16
        
         pname = "duecredit";

     

       17
       17
       -
         version = "0.8.0";

     

       17
       17
       +
         version = "0.8.1";

     

       18
       18
        
         disabled = isPy27;

     

       19
       19
        
       

     

       20
       20
        
         src = fetchPypi {

     

       21
       21
        
           inherit pname version;

     

       22
       22
       -
           sha256 = "1yxd8579pakrfhq0hls0iy37nxllsm8y33na220g08znibrp7ix0";

     

       22
       22
       +
           sha256 = "43b3f01ab5fb2bf2ecc27d3fcf92b873c6b288f44becef3e2e87c96cb89d7b01";

     

       23
       23
        
         };

     

       24
       24
        
       

     

       25
       25
        
         # bin/duecredit requires setuptools at runtime

+2 -2

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

···

       1
       1
        
       { lib, buildPythonPackage, fetchFromGitHub, isPy27 }:

     

       2
       2
        
       

     

       3
       3
        
       buildPythonPackage rec {

     

       4
       4
       -
         version = "2.1.1";

     

       4
       4
       +
         version = "2.1.3";

     

       5
       5
        
         pname = "elementpath";

     

       6
       6
        
         disabled = isPy27; # uses incompatible class syntax

     

       7
       7
        
       

     
···

       9
       9
        
           owner = "sissaschool";

     

       10
       10
        
           repo = "elementpath";

     

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

     

       12
       12
       -
           sha256 = "1h910v8f0648nqnk40bxgdim3623m07yg4xdfwcips2h55d19rk2";

     

       12
       12
       +
           sha256 = "062l1dqbaz1pab3qz6x5zmja8m8gw1bxgfl4kx91gdh0zsiakg8j";

     

       13
       13
        
         };

     

       14
       14
        
       

     

       15
       15
        
         # avoid circular dependency with xmlschema which directly depends on this

+2 -2

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

···

       3
       3
        
       

     

       4
       4
        
       buildPythonPackage rec {

     

       5
       5
        
         pname = "fire";

     

       6
       6
       -
         version = "0.3.1";

     

       6
       6
       +
         version = "0.4.0";

     

       7
       7
        
       

     

       8
       8
        
         src = fetchFromGitHub {

     

       9
       9
        
           owner = "google";

     

       10
       10
        
           repo = "python-fire";

     

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

     

       12
       12
       -
           sha256 = "0s5r6l39ck2scks54hmwwdf4lcihqqnqzjfx9lz2b67vxkajpwmc";

     

       12
       12
       +
           sha256 = "1caz6j2kdhj0kccrnqri6b4g2d6wzkkx8y9vxyvm7axvrwkv2vyn";

     

       13
       13
        
         };

     

       14
       14
        
       

     

       15
       15
        
         propagatedBuildInputs = [ six termcolor ] ++ lib.optional isPy27 enum34;

+2 -2

pkgs/development/python-modules/flask-migrate/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildPythonPackage rec {

     

       4
       4
        
         pname = "Flask-Migrate";

     

       5
       5
       -
         version = "2.5.3";

     

       5
       5
       +
         version = "2.6.0";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchPypi {

     

       8
       8
        
           inherit pname version;

     

       9
       9
       -
           sha256 = "a69d508c2e09d289f6e55a417b3b8c7bfe70e640f53d2d9deb0d056a384f37ee";

     

       9
       9
       +
           sha256 = "8626af845e6071ef80c70b0dc16d373f761c981f0ad61bb143a529cab649e725";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         checkInputs = [ flask_script ] ++ lib.optional isPy3k glibcLocales;

+2 -2

pkgs/development/python-modules/flask-paginate/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildPythonPackage rec {

     

       4
       4
        
         pname = "flask-paginate";

     

       5
       5
       -
         version = "0.7.1";

     

       5
       5
       +
         version = "0.8.0";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchPypi {

     

       8
       8
        
           inherit pname version;

     

       9
       9
       -
           sha256 = "949b93d0535d1223b91ac0048586bd878aaebf4044c54c1dc3068acc9bdf441f";

     

       9
       9
       +
           sha256 = "60b2a696bf63d2bc1c90a5b1a861c280461732b88f079c267dc98021911a007b";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         propagatedBuildInputs = [ flask ];

+2 -2

pkgs/development/python-modules/google-cloud-vision/default.nix

···

       11
       11
        
       

     

       12
       12
        
       buildPythonPackage rec {

     

       13
       13
        
         pname = "google-cloud-vision";

     

       14
       14
       -
         version = "2.0.0";

     

       14
       14
       +
         version = "2.1.0";

     

       15
       15
        
       

     

       16
       16
        
         src = fetchPypi {

     

       17
       17
        
           inherit pname version;

     

       18
       18
       -
           sha256 = "0qbwhapmn5ia853c4nfnz1qiksngvr8j0xxjasrykwhxcsd7s1ka";

     

       18
       18
       +
           sha256 = "2bae8b4aca9aa38ad7459102cc5743c506adf9060ad2b3b15cff1e8021085017";

     

       19
       19
        
         };

     

       20
       20
        
       

     

       21
       21
        
         propagatedBuildInputs = [ libcst google-api-core proto-plus];

+2 -2

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

···

       4
       4
        
       

     

       5
       5
        
       buildPythonPackage rec {

     

       6
       6
        
         pname = "icecream";

     

       7
       7
       -
         version = "2.0.0";

     

       7
       7
       +
         version = "2.1.0";

     

       8
       8
        
       

     

       9
       9
        
         src = fetchPypi {

     

       10
       10
        
           inherit pname version;

     

       11
       11
       -
           sha256 = "16kpixl43nrn093cvkmxiq2dzd9xc73zwzkmwp0rs7x01nji8kj3";

     

       11
       11
       +
           sha256 = "c2e7b74c1c12caa2cfde050f2e636493ee77a9fb4a494b5593418ab359924a24";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         propagatedBuildInputs = [ asttokens colorama executing pygments ];

+2 -2

pkgs/development/python-modules/lazr/config.nix

···

       2
       2
        
       

     

       3
       3
        
       buildPythonPackage rec {

     

       4
       4
        
         pname = "lazr.config";

     

       5
       5
       -
         version = "2.2.2";

     

       5
       5
       +
         version = "2.2.3";

     

       6
       6
        
       

     

       7
       7
        
         propagatedBuildInputs = [ lazr_delegates ];

     

       8
       8
        
       

     

       9
       9
        
         src = fetchPypi {

     

       10
       10
        
           inherit pname version;

     

       11
       11
       -
           sha256 = "cdb9a70dac4a76ca1ff3528d9eafe5414c6c69c1b92e7e84d3477ae85f6bb787";

     

       11
       11
       +
           sha256 = "b74a73f8b63e6dc6732fc1f3d88e2f236596ddf089ef6e1794ece060e8cfabe1";

     

       12
       12
        
         };

     

       13
       13
        
       }

+2 -2

pkgs/development/tools/delve/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildGoPackage rec {

     

       4
       4
        
         pname = "delve";

     

       5
       5
       -
         version = "1.5.1";

     

       5
       5
       +
         version = "1.6.0";

     

       6
       6
        
       

     

       7
       7
        
         goPackagePath = "github.com/go-delve/delve";

     

       8
       8
        
         excludedPackages = "\\(_fixtures\\|scripts\\|service/test\\)";

     
···

       11
       11
        
           owner = "go-delve";

     

       12
       12
        
           repo = "delve";

     

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

     

       14
       14
       -
           sha256 = "10zvla2jqxqibxdk3zbnsxg63i0zcwcn9npvw3bbicwd2z4vvskk";

     

       14
       14
       +
           sha256 = "sha256-krNCS5GaEMuwQ9XS8w0myL+xZX6goNNNBgUiRVoZPIU=";

     

       15
       15
        
         };

     

       16
       16
        
       

     

       17
       17
        
         meta = with lib; {

+2 -2

pkgs/servers/dns/nsd/default.nix

···

       16
       16
        
       

     

       17
       17
        
       stdenv.mkDerivation rec {

     

       18
       18
        
         pname = "nsd";

     

       19
       19
       -
         version = "4.3.4";

     

       19
       19
       +
         version = "4.3.5";

     

       20
       20
        
       

     

       21
       21
        
         src = fetchurl {

     

       22
       22
        
           url = "https://www.nlnetlabs.nl/downloads/${pname}/${pname}-${version}.tar.gz";

     

       23
       23
       -
           sha256 = "0l4ba80ihwg3s2ifhnkmk7rjabrcy5zw6sz4hn0vm9sif6lk9s1v";

     

       23
       23
       +
           sha256 = "sha256-faK0PjCz1/MHcixgj3Gb+xafDZhcdko0+gZp3DNIRHI=";

     

       24
       24
        
         };

     

       25
       25
        
       

     

       26
       26
        
         prePatch = ''

+3 -3

pkgs/servers/h2/default.nix

···

       2
       2
        
       stdenv.mkDerivation rec {

     

       3
       3
        
         pname = "h2";

     

       4
       4
        
       

     

       5
       5
       -
         version = "1.4.193";

     

       5
       5
       +
         version = "1.4.199";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchzip {

     

       8
       8
       -
           url = "https://www.h2database.com/h2-2016-10-31.zip";

     

       9
       9
       -
           sha256 = "1da1qcfwi5gvh68i6w6y0qpcqp3rbgakizagkajmjxk2ryc4b3z9";

     

       8
       8
       +
           url = "https://h2database.com/h2-2019-03-13.zip";

     

       9
       9
       +
           sha256 = "0pdvbnx7nqfqs7x1zkwz2q34331l55jknpk6arf6dksvnd71hinj";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         buildInputs = [ makeWrapper ];

+3 -3

pkgs/shells/elvish/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "elvish";

     

       5
       5
       -
         version = "0.14.1";

     

       5
       5
       +
         version = "0.15.0";

     

       6
       6
        
       

     

       7
       7
        
         excludedPackages = [ "website" ];

     

       8
       8
        
       

     
···

       12
       12
        
           owner = "elves";

     

       13
       13
        
           repo = pname;

     

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

     

       15
       15
       -
           sha256 = "05wp3cx4s2cjf60yncdpmycs5h4z1dlin56dmljmfwz4z099079b";

     

       15
       15
       +
           sha256 = "1jksdpf86miz1dv3vrmvpvz4k1c2m23dway6a7b1cypg03c68a75";

     

       16
       16
        
         };

     

       17
       17
        
       

     

       18
       18
       -
         vendorSha256 = "1f971n17h9bc0qcgs9ipiaw0x9807mz761fqm605br4ch1kp0897";

     

       18
       18
       +
         vendorSha256 = "124m9680pl7wrh7ld7v39dfl86r6vih1pjk3bmbihy0fjgxnnq0b";

     

       19
       19
        
       

     

       20
       20
        
         doCheck = false;

     

       21
       21

+11 -11

pkgs/tools/inputmethods/skk/skk-dicts/default.nix

···

       3
       3
        
       let

     

       4
       4
        
         # kana to kanji

     

       5
       5
        
         small = fetchurl {

     

       6
       6
       -
           url = "https://raw.githubusercontent.com/skk-dev/dict/f61be71246602a49e9f05ded6ac4f9f82031a521/SKK-JISYO.S";

     

       7
       7
       -
           sha256 = "15kp4iwz58fp1zg0i13x7w9wwm15v8n2hhm0nf2zsl7az5mn5yi4";

     

       6
       6
       +
           url = "https://raw.githubusercontent.com/skk-dev/dict/8b35d07a7d2044d48b063d2774d9f9d00bb7cb48/SKK-JISYO.S";

     

       7
       7
       +
           sha256 = "11cjrc8m99hj4xpl2nvzxanlswpapi92vmgk9d6yimdz0jidb6cq";

     

       8
       8
        
         };

     

       9
       9
        
         medium = fetchurl {

     

       10
       10
       -
           url = "https://raw.githubusercontent.com/skk-dev/dict/f61be71246602a49e9f05ded6ac4f9f82031a521/SKK-JISYO.M";

     

       11
       11
       -
           sha256 = "1vhagixhrp9lq5x7dldxcanhznawazp00xivpp1z52kx10lnkmv0";

     

       10
       10
       +
           url = "https://raw.githubusercontent.com/skk-dev/dict/8b35d07a7d2044d48b063d2774d9f9d00bb7cb48/SKK-JISYO.M";

     

       11
       11
       +
           sha256 = "0pwjp9qjmn9sq6zc0k6632l7dc2dbjn45585ibckvvl9iwfqqxdp";

     

       12
       12
        
         };

     

       13
       13
        
         large = fetchurl {

     

       14
       14
       -
           url = "https://raw.githubusercontent.com/skk-dev/dict/f61be71246602a49e9f05ded6ac4f9f82031a521/SKK-JISYO.L";

     

       15
       15
       -
           sha256 = "07cv0j95iajkr48j4ln411vnhl3z93yx96zjc03bgs10dbpagaaz";

     

       14
       14
       +
           url = "https://raw.githubusercontent.com/skk-dev/dict/8b35d07a7d2044d48b063d2774d9f9d00bb7cb48/SKK-JISYO.L";

     

       15
       15
       +
           sha256 = "0ps0a7sbkryd6hxvphq14i7g5wci4gvr0vraac8ia2ww67a2xbyc";

     

       16
       16
        
         };

     

       17
       17
        
       

     

       18
       18
        
         # english to japanese

     

       19
       19
        
         edict = fetchurl {

     

       20
       20
       -
           url = "https://raw.githubusercontent.com/skk-dev/dict/f61be71246602a49e9f05ded6ac4f9f82031a521/SKK-JISYO.edict";

     

       21
       21
       -
           sha256 = "18k8z1wkgwgfwbs6sylf39h1nc1p5l2b00h7mfjlb8p91plkb45w";

     

       20
       20
       +
           url = "https://raw.githubusercontent.com/skk-dev/dict/8b35d07a7d2044d48b063d2774d9f9d00bb7cb48/SKK-JISYO.edict";

     

       21
       21
       +
           sha256 = "1vrwnq0vvjn61nijbln6wfinqg93802d2a8d4ad82n692v83b1li";

     

       22
       22
        
         };

     

       23
       23
        
         # misc

     

       24
       24
        
         assoc = fetchurl {

     

       25
       25
       -
           url = "https://raw.githubusercontent.com/skk-dev/dict/f61be71246602a49e9f05ded6ac4f9f82031a521/SKK-JISYO.assoc";

     

       26
       26
       -
           sha256 = "12d6xpp1bfin9nwl35ydl5yc6vx0qpwhxss0khi19n1nsbyqnixm";

     

       25
       25
       +
           url = "https://raw.githubusercontent.com/skk-dev/dict/8b35d07a7d2044d48b063d2774d9f9d00bb7cb48/SKK-JISYO.assoc";

     

       26
       26
       +
           sha256 = "1smcbyv6srrhnpl7ic9nqds9nz3g2dgqngmhzkrdlwmvcpvakp1v";

     

       27
       27
        
         };

     

       28
       28
        
       in

     

       29
       29
        
       

     

       30
       30
        
       stdenv.mkDerivation {

     

       31
       31
        
         pname = "skk-dicts-unstable";

     

       32
       32
       -
         version = "2017-10-26";

     

       32
       32
       +
         version = "2020-03-24";

     

       33
       33
        
         srcs = [ small medium large edict assoc ];

     

       34
       34
        
         nativeBuildInputs = [ skktools ] ++ lib.optional stdenv.isDarwin libiconv;

     

       35
       35

+2 -2

pkgs/tools/misc/gparted/default.nix

···

       4
       4
        
       }:

     

       5
       5
        
       

     

       6
       6
        
       stdenv.mkDerivation rec {

     

       7
       7
       -
         name = "gparted-1.1.0";

     

       7
       7
       +
         name = "gparted-1.2.0";

     

       8
       8
        
       

     

       9
       9
        
         src = fetchurl {

     

       10
       10
        
           url = "mirror://sourceforge/gparted/${name}.tar.gz";

     

       11
       11
       -
           sha256 = "092rgwjh1825fal6v3yafq2wr0i61hh0a2n0j4296zn0zdx7pzp2";

     

       11
       11
       +
           sha256 = "sha256-bJBxXSVNen7AIIspAHtkFg3Z+330xKp/jsLJ0jEUxxk=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         # Tries to run `pkexec --version` to get version.

+2 -2

pkgs/tools/misc/os-prober/default.nix

···

       11
       11
        
       }:

     

       12
       12
        
       

     

       13
       13
        
       stdenv.mkDerivation rec {

     

       14
       14
       -
         version = "1.77";

     

       14
       14
       +
         version = "1.78";

     

       15
       15
        
         pname = "os-prober";

     

       16
       16
        
         src = fetchFromGitLab {

     

       17
       17
        
           domain = "salsa.debian.org";

     

       18
       18
        
           owner = "installer-team";

     

       19
       19
        
           repo = pname;

     

       20
       20
        
           rev = version;

     

       21
       21
       -
           sha256 = "05sji756xdl67pp2sf7rk0ih9h6f6kgk9nvxlyv1bzbmcizlh2d2";

     

       21
       21
       +
           sha256 = "sha256-mfv1b40n/opXdyj6IXWVf/32sWlS+/DbXIRwE1zX4KM=";

     

       22
       22
        
         };

     

       23
       23
        
       

     

       24
       24
        
         buildInputs = [ makeWrapper ];

+2 -2

pkgs/tools/networking/privoxy/default.nix

···

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
       

     

       5
       5
        
         pname = "privoxy";

     

       6
       6
       -
         version = "3.0.29";

     

       6
       6
       +
         version = "3.0.30";

     

       7
       7
        
       

     

       8
       8
        
         src = fetchurl {

     

       9
       9
        
           url = "mirror://sourceforge/ijbswa/Sources/${version}%20%28stable%29/${pname}-${version}-stable-src.tar.gz";

     

       10
       10
       -
           sha256 = "17a8fbdyb0ixc0wwq68fg7xn7l6n7jq67njpq93psmxgzng0dii5";

     

       10
       10
       +
           sha256 = "sha256-pP4kHF2nAQsoS/ienp4xoyHx8+scx5ZVnT+6ublBXuE=";

     

       11
       11
        
         };

     

       12
       12
        
       

     

       13
       13
        
         hardeningEnable = [ "pie" ];

+3 -3

pkgs/tools/system/bottom/default.nix

···

       2
       2
        
       

     

       3
       3
        
       rustPlatform.buildRustPackage rec {

     

       4
       4
        
         pname = "bottom";

     

       5
       5
       -
         version = "0.5.6";

     

       5
       5
       +
         version = "0.5.7";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "ClementTsang";

     

       9
       9
        
           repo = pname;

     

       10
       10
        
           rev = version;

     

       11
       11
       -
           sha256 = "sha256-88uEEsb+coX8PTKrem+0t5AkamCmqJsFYsENFTZSsys=";

     

       11
       11
       +
           sha256 = "sha256-9L7FtYIaWSOwNQ8zOLvxjt51o8A5MqqfF/iIyJs2TJA=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         prePatch = ''

     
···

       19
       19
        
       

     

       20
       20
        
         buildInputs = lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.IOKit;

     

       21
       21
        
       

     

       22
       22
       -
         cargoSha256 = "sha256-qnh4Tl6JRgxBJbu+t9IJX/XChIR15rTRLvsl+/ZvPxY=";

     

       22
       22
       +
         cargoSha256 = "sha256-4oH1A88Qn0c6hkE/1b6mTrEIph8xT98j+DkP9/5JALs=";

     

       23
       23
        
       

     

       24
       24
        
         doCheck = false;

     

       25
       25

+2

pkgs/top-level/ocaml-packages.nix

···

       1014
       1014
        
       

     

       1015
       1015
        
           prof_spacetime = callPackage ../development/ocaml-modules/prof_spacetime { };

     

       1016
       1016
        
       

     

       1017
       1017
       +
           progress = callPackage ../development/ocaml-modules/progress { };

     

       1018
       1018
       +
       

     

       1017
       1019
        
           ptmap = callPackage ../development/ocaml-modules/ptmap { };

     

       1018
       1020
        
       

     

       1019
       1021
        
           ptset = callPackage ../development/ocaml-modules/ptset { };