commit f220ef48f81419bf1fd03621b04e9d942b91ef96 · pyrox.dev/nixpkgs

+13

maintainers/maintainer-list.nix

···

       8174
       8174
        
           githubId = 6445082;

     

       8175
       8175
        
           name = "Joseph Lukasik";

     

       8176
       8176
        
         };

     

       8177
       8177
       +
         jgoux = {

     

       8178
       8178
       +
           email = "hi@jgoux.dev";

     

       8179
       8179
       +
           github = "jgoux";

     

       8180
       8180
       +
           githubId = 1443499;

     

       8181
       8181
       +
           name = "Julien Goux";

     

       8182
       8182
       +
         };

     

       8177
       8183
        
         jhh = {

     

       8178
       8184
        
           email = "jeff@j3ff.io";

     

       8179
       8185
        
           github = "jhh";

     
···

       19256
       19262
        
           matrix = "@yorik.sar:matrix.org";

     

       19257
       19263
        
           github = "YorikSar";

     

       19258
       19264
        
           githubId = 428074;

     

       19265
       19265
       +
         };

     

       19266
       19266
       +
         YoshiRulz = {

     

       19267
       19267
       +
           name = "YoshiRulz";

     

       19268
       19268
       +
           email = "OSSYoshiRulz+Nixpkgs@gmail.com";

     

       19269
       19269
       +
           matrix = "@YoshiRulz:matrix.org";

     

       19270
       19270
       +
           github = "YoshiRulz";

     

       19271
       19271
       +
           githubId = 13409956;

     

       19259
       19272
        
         };

     

       19260
       19273
        
         yrashk = {

     

       19261
       19274
        
           email = "yrashk@gmail.com";

+1 -1

nixos/modules/services/mail/mailman.nix

···

       314
       314
        
               queue_dir = "$var_dir/queue";

     

       315
       315
        
               template_dir = "$var_dir/templates";

     

       316
       316
        
               log_dir = "/var/log/mailman";

     

       317
       317
       -
               lock_dir = "$var_dir/lock";

     

       317
       317
       +
               lock_dir = "/run/mailman/lock";

     

       318
       318
        
               etc_dir = "/etc";

     

       319
       319
        
               pid_file = "/run/mailman/master.pid";

     

       320
       320
        
             };

+6

nixos/tests/mailman.nix

···

       63
       63
        
               wait_for_api()

     

       64
       64
        
               machine.succeed("curl --fail-with-body -sLSu restadmin:secretpassword http://localhost:8001/3.1/domains")

     

       65
       65
        
               machine.succeed("curl --fail-with-body -sILS http://localhost/")

     

       66
       66
       +
       

     

       67
       67
       +
           with subtest("service locking"):

     

       68
       68
       +
               machine.fail("su -s /bin/sh -c 'mailman start' mailman")

     

       69
       69
       +
               machine.execute("systemctl kill --signal=SIGKILL mailman")

     

       70
       70
       +
               machine.succeed("systemctl restart mailman")

     

       71
       71
       +
               wait_for_api()

     

       66
       72
        
         '';

     

       67
       73
        
       }

+10 -7

pkgs/applications/misc/wallust/default.nix

···

       3
       3
        
       , rustPlatform

     

       4
       4
        
       , nix-update-script

     

       5
       5
        
       }:

     

       6
       6
       -
       rustPlatform.buildRustPackage rec {

     

       6
       6
       +
       let

     

       7
       7
       +
         version = "2.7.1";

     

       8
       8
       +
       in

     

       9
       9
       +
       rustPlatform.buildRustPackage {

     

       7
       10
        
         pname = "wallust";

     

       8
       8
       -
         version = "2.7.1";

     

       11
       11
       +
         inherit version;

     

       9
       12
        
       

     

       10
       13
        
         src = fetchFromGitea {

     

       11
       14
        
           domain = "codeberg.org";

     

       12
       15
        
           owner = "explosion-mental";

     

       13
       13
       -
           repo = pname;

     

       16
       16
       +
           repo = "wallust";

     

       14
       17
        
           rev = version;

     

       15
       18
        
           hash = "sha256-WhL2HWM1onRrCqWJPLnAVMd/f/xfLrK3mU8jFSLFjAM=";

     

       16
       19
        
         };

     
···

       19
       22
        
       

     

       20
       23
        
         passthru.updateScript = nix-update-script { };

     

       21
       24
        
       

     

       22
       22
       -
         meta = with lib; {

     

       25
       25
       +
         meta = {

     

       23
       26
        
           description = "A better pywal";

     

       24
       27
        
           homepage = "https://codeberg.org/explosion-mental/wallust";

     

       25
       25
       -
           license = licenses.mit;

     

       26
       26
       -
           maintainers = with maintainers; [ onemoresuza iynaix ];

     

       28
       28
       +
           license = lib.licenses.mit;

     

       29
       29
       +
           maintainers = with lib.maintainers; [ onemoresuza iynaix ];

     

       27
       30
        
           downloadPage = "https://codeberg.org/explosion-mental/wallust/releases/tag/${version}";

     

       28
       28
       -
           platforms = platforms.unix;

     

       31
       31
       +
           platforms = lib.platforms.unix;

     

       29
       32
        
           mainProgram = "wallust";

     

       30
       33
        
         };

     

       31
       34
        
       }

+2 -2

pkgs/data/icons/numix-icon-theme-circle/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenvNoCC.mkDerivation rec {

     

       4
       4
        
         pname = "numix-icon-theme-circle";

     

       5
       5
       -
         version = "23.09.11";

     

       5
       5
       +
         version = "23.10.09";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "numixproject";

     

       9
       9
        
           repo = pname;

     

       10
       10
        
           rev = version;

     

       11
       11
       -
           sha256 = "sha256-9GTNE9Gt+dxdfOLD0Qv1utSkwigalAPxixGSC5Nj8XM=";

     

       11
       11
       +
           sha256 = "sha256-H5zkBV8WV03mPKAq0IqFXv/O2qE3zT9UJJMo4tt1Agc=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         nativeBuildInputs = [ gtk3 ];

+2 -2

pkgs/data/icons/numix-icon-theme-square/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenvNoCC.mkDerivation rec {

     

       4
       4
        
         pname = "numix-icon-theme-square";

     

       5
       5
       -
         version = "23.09.11";

     

       5
       5
       +
         version = "23.10.09";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "numixproject";

     

       9
       9
        
           repo = pname;

     

       10
       10
        
           rev = version;

     

       11
       11
       -
           sha256 = "sha256-YipdEvmQnqiuxheYS+y5t37uonzr/nH54PVLm4xp31E=";

     

       11
       11
       +
           sha256 = "sha256-NAvgrD0ckAC0vpF7BkEVWGmsuoWeMuSOdp2c9wEzv4s=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         nativeBuildInputs = [ gtk3 ];

+3 -3

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

···

       14
       14
        
       

     

       15
       15
        
       buildPythonPackage rec {

     

       16
       16
        
         pname = "google-cloud-dataproc";

     

       17
       17
       -
         version = "5.5.1";

     

       17
       17
       +
         version = "5.6.0";

     

       18
       18
        
         format = "setuptools";

     

       19
       19
        
       

     

       20
       20
        
         disabled = pythonOlder "3.7";

     

       21
       21
        
       

     

       22
       22
        
         src = fetchPypi {

     

       23
       23
        
           inherit pname version;

     

       24
       24
       -
           hash = "sha256-+tfaWdOR/sFfGih71x1VznI3gZ2quQ4h1rEUCFHZ1DQ=";

     

       24
       24
       +
           hash = "sha256-X6nfuIQzwtDBOLfrtq3hdBA743YszQObJNU8dEjjdg0=";

     

       25
       25
        
         };

     

       26
       26
        
       

     

       27
       27
        
         propagatedBuildInputs = [

     
···

       51
       51
        
         meta = with lib; {

     

       52
       52
        
           description = "Google Cloud Dataproc API client library";

     

       53
       53
        
           homepage = "https://github.com/googleapis/python-dataproc";

     

       54
       54
       -
           changelog = "https://github.com/googleapis/python-dataproc/blob/v${version}/CHANGELOG.md";

     

       54
       54
       +
           changelog = "https://github.com/googleapis/google-cloud-python/blob/google-cloud-dataproc-v${version}/packages/google-cloud-dataproc/CHANGELOG.md";

     

       55
       55
        
           license = licenses.asl20;

     

       56
       56
        
           maintainers = with maintainers; [ ];

     

       57
       57
        
         };

+9 -19

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

···

       2
       2
        
       , aiohttp

     

       3
       3
        
       , aresponses

     

       4
       4
        
       , buildPythonPackage

     

       5
       5
       +
       , certifi

     

       5
       6
        
       , fetchFromGitHub

     

       6
       6
       -
       , fetchpatch

     

       7
       7
        
       , poetry-core

     

       8
       8
        
       , pytest-aiohttp

     

       9
       9
        
       , pytest-asyncio

     

       10
       10
        
       , pytestCheckHook

     

       11
       11
        
       , pythonOlder

     

       12
       12
       +
       , yarl

     

       12
       13
        
       }:

     

       13
       14
        
       

     

       14
       15
        
       buildPythonPackage rec {

     

       15
       16
        
         pname = "pytile";

     

       16
       16
       -
         version = "2023.08.0";

     

       17
       17
       +
         version = "2023.10.0";

     

       17
       18
        
         format = "pyproject";

     

       18
       19
        
       

     

       19
       19
       -
         disabled = pythonOlder "3.8";

     

       20
       20
       +
         disabled = pythonOlder "3.10";

     

       20
       21
        
       

     

       21
       22
        
         src = fetchFromGitHub {

     

       22
       23
        
           owner = "bachya";

     

       23
       23
       -
           repo = pname;

     

       24
       24
       +
           repo = "pytile";

     

       24
       25
        
           rev = "refs/tags/${version}";

     

       25
       25
       -
           hash = "sha256-wPtGofli3ZKBcAwjwjCbeYnLaSZ5lLshlBSz1/WlAcg=";

     

       26
       26
       +
           hash = "sha256-L1Ovpxn7Y+reK8YcVBPwoRjKxcyByrPGz5i/csGzKfE=";

     

       26
       27
        
         };

     

       27
       28
        
       

     

       28
       28
       -
         patches = [

     

       29
       29
       -
           # This patch removes references to setuptools and wheel that are no longer

     

       30
       30
       -
           # necessary and changes poetry to poetry-core, so that we don't need to add

     

       31
       31
       -
           # unnecessary nativeBuildInputs.

     

       32
       32
       -
           #

     

       33
       33
       -
           #   https://github.com/bachya/pytile/pull/286

     

       34
       34
       -
           #

     

       35
       35
       -
           (fetchpatch {

     

       36
       36
       -
             name = "clean-up-build-dependencies.patch";

     

       37
       37
       -
             url = "https://github.com/bachya/pytile/commit/bdb5d96ba9d640bf85a1ae9c3787704dbc2ced23.patch";

     

       38
       38
       -
             hash = "sha256-RLRbHmaR2A8MNc96WHx0L8ccyygoBUaOulAuRJkFuUM=";

     

       39
       39
       -
           })

     

       40
       40
       -
         ];

     

       41
       41
       -
       

     

       42
       29
        
         nativeBuildInputs = [

     

       43
       30
        
           poetry-core

     

       44
       31
        
         ];

     

       45
       32
        
       

     

       46
       33
        
         propagatedBuildInputs = [

     

       47
       34
        
           aiohttp

     

       35
       35
       +
           certifi

     

       36
       36
       +
           yarl

     

       48
       37
        
         ];

     

       49
       38
        
       

     

       50
       39
        
         nativeCheckInputs = [

     
···

       72
       61
        
             Bluetooth trackers (including last location and more).

     

       73
       62
        
           '';

     

       74
       63
        
           homepage = "https://github.com/bachya/pytile";

     

       64
       64
       +
           changelog = "https://github.com/bachya/pytile/releases/tag/${version}";

     

       75
       65
        
           license = with licenses; [ mit ];

     

       76
       66
        
           maintainers = with maintainers; [ fab ];

     

       77
       67
        
         };

+2 -2

pkgs/development/python-modules/types-requests/default.nix

···

       6
       6
        
       

     

       7
       7
        
       buildPythonPackage rec {

     

       8
       8
        
         pname = "types-requests";

     

       9
       9
       -
         version = "2.31.0.7";

     

       9
       9
       +
         version = "2.31.0.8";

     

       10
       10
        
         format = "setuptools";

     

       11
       11
        
       

     

       12
       12
        
         src = fetchPypi {

     

       13
       13
        
           inherit pname version;

     

       14
       14
       -
           hash = "sha256-TZMNyrvCRS49cHKOWBrErIwtE/YlCa2RFGc/VCr4y04=";

     

       14
       14
       +
           hash = "sha256-4bMlxoezSUovUoqwbkEdcJLMVGzJJFwAC6zC/KWultQ=";

     

       15
       15
        
         };

     

       16
       16
        
       

     

       17
       17
        
         propagatedBuildInputs = [

+7 -7

pkgs/development/tools/infisical/default.nix

···

       14
       14
        
         archive_fmt = "tar.gz";

     

       15
       15
        
       

     

       16
       16
        
         sha256 = {

     

       17
       17
       -
           x86_64-linux = "194akxb692xpqppakw49aywp5ma43yfcwv5imw4pm05cna0n06b1";

     

       18
       18
       -
           x86_64-darwin = "0bgjx54c00v0nb88rzdv09g92yw9qsf2fxd8565g6fsw591va1pa";

     

       19
       19
       -
           aarch64-linux = "0z07aikjhk9055apbvyaxdp8cgjl291fqgwgfbp9y3826q7s0riq";

     

       20
       20
       -
           aarch64-darwin = "0garlx458jy6dpqbfd0y2p7xj9hagm815cflybbbxf5yz2v9da01";

     

       17
       17
       +
           x86_64-linux = "e85c5f2ddca89caa6b44c61554c1dffeacdabc96c25a7e6881dc5722515270d1";

     

       18
       18
       +
           x86_64-darwin = "eddbcde10271f791eb1473ba00b85b442aa059cdfee38021b8f8880f33754821";

     

       19
       19
       +
           aarch64-linux = "9793a6db476492802ffec7f933d7f8f107a1c89fee09c8eb6bdb975b1fccecea";

     

       20
       20
       +
           aarch64-darwin = "46c8a82a71da5731c108d24b4a960a507af66d91bba7b7246dd3a3415afaf7d3";

     

       21
       21
        
         }.${system} or throwSystem;

     

       22
       22
        
       in

     

       23
       23
        
         stdenv.mkDerivation (finalAttrs: {

     

       24
       24
        
           pname = "infisical";

     

       25
       25
       -
           version = "0.3.7";

     

       25
       25
       +
           version = "0.14.2";

     

       26
       26
        
       

     

       27
       27
        
           src = fetchurl {

     

       28
       28
       -
             url = "https://github.com/Infisical/infisical/releases/download/v${finalAttrs.version}/infisical_${finalAttrs.version}_${plat}.tar.gz";

     

       28
       28
       +
             url = "https://github.com/Infisical/infisical/releases/download/infisical-cli%2Fv${finalAttrs.version}/infisical_${finalAttrs.version}_${plat}.tar.gz";

     

       29
       29
        
             inherit sha256;

     

       30
       30
        
           };

     

       31
       31
        
       

     
···

       53
       53
        
             homepage = "https://infisical.com/";

     

       54
       54
        
             downloadPage = "https://github.com/Infisical/infisical/releases/";

     

       55
       55
        
             license = licenses.mit;

     

       56
       56
       -
             maintainers = [ maintainers.ivanmoreau ];

     

       56
       56
       +
             maintainers = [ maintainers.ivanmoreau maintainers.jgoux ];

     

       57
       57
        
             platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" "aarch64-linux" ];

     

       58
       58
        
           };

     

       59
       59
        
         })

+1

pkgs/development/tools/parsing/tree-sitter/grammars/default.nix

···

       66
       66
        
         tree-sitter-php = lib.importJSON ./tree-sitter-php.json;

     

       67
       67
        
         tree-sitter-pioasm = lib.importJSON ./tree-sitter-pioasm.json;

     

       68
       68
        
         tree-sitter-prisma = lib.importJSON ./tree-sitter-prisma.json;

     

       69
       69
       +
         tree-sitter-proto = lib.importJSON ./tree-sitter-proto.json;

     

       69
       70
        
         tree-sitter-pug = lib.importJSON ./tree-sitter-pug.json;

     

       70
       71
        
         tree-sitter-python = lib.importJSON ./tree-sitter-python.json;

     

       71
       72
        
         tree-sitter-ql = lib.importJSON ./tree-sitter-ql.json;

+12

pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-proto.json

···

       1
       1
       +
       {

     

       2
       2
       +
         "url": "https://github.com/mitchellh/tree-sitter-proto",

     

       3
       3
       +
         "rev": "42d82fa18f8afe59b5fc0b16c207ee4f84cb185f",

     

       4
       4
       +
         "date": "2021-06-12T09:29:04-07:00",

     

       5
       5
       +
         "path": "/nix/store/dsfx2jxc6nll0324pl3w6qcdv5acvyj5-tree-sitter-proto",

     

       6
       6
       +
         "sha256": "001y2z2683fagryqj5f0gs3rcgx2nbw3x3r9afydhss80ihb8zvi",

     

       7
       7
       +
         "hash": "sha256-cX+0YARIa9i8UymPPviyoj+Wh37AFYl9fsoNZMQXPgA=",

     

       8
       8
       +
         "fetchLFS": false,

     

       9
       9
       +
         "fetchSubmodules": false,

     

       10
       10
       +
         "deepClone": false,

     

       11
       11
       +
         "leaveDotGit": false

     

       12
       12
       +
       }

+39 -33

pkgs/development/tools/parsing/tree-sitter/update.nix

···

       126
       126
        
             orga = "MDeiml";

     

       127
       127
        
             repo = "tree-sitter-markdown";

     

       128
       128
        
           };

     

       129
       129
       +
           "tree-sitter-proto" = {

     

       130
       130
       +
             orga = "mitchellh";

     

       131
       131
       +
             repo = "tree-sitter-proto";

     

       132
       132
       +
           };

     

       129
       133
        
           "tree-sitter-rego" = {

     

       130
       134
        
             orga = "FallenAngel97";

     

       131
       135
        
             repo = "tree-sitter-rego";

     
···

       403
       407
        
         jsonFile = name: val: (formats.json { }).generate name val;

     

       404
       408
        
       

     

       405
       409
        
         # implementation of the updater

     

       406
       406
       -
         updateImpl = passArgs "updateImpl-with-args" {

     

       410
       410
       +
         updateImpl = passArgs "updateImpl-with-args"

     

       411
       411
       +
           {

     

       407
       412
        
             binaries = {

     

       408
       413
        
               curl = "${curl}/bin/curl";

     

       409
       414
        
               nix-prefetch-git = "${nix-prefetch-git}/bin/nix-prefetch-git";

     
···

       414
       419
        
               ignoredTreeSitterOrgRepos

     

       415
       420
        
               ;

     

       416
       421
        
           }

     

       417
       417
       -
           (writers.writePython3 "updateImpl" {

     

       418
       418
       -
               flakeIgnore = ["E501"];

     

       419
       419
       -
           } ./update_impl.py);

     

       422
       422
       +
           (writers.writePython3 "updateImpl"

     

       423
       423
       +
             {

     

       424
       424
       +
               flakeIgnore = [ "E501" ];

     

       425
       425
       +
             } ./update_impl.py);

     

       420
       426
        
       

     

       421
       427
        
         # Pass the given arguments to the command, in the ARGS environment variable.

     

       422
       428
        
         # The arguments are just a json object that should be available in the script.

     
···

       429
       435
        
           lib.concatMapStringsSep "\n" f

     

       430
       436
        
             (lib.mapAttrsToList (k: v: { name = k; } // v) attrs);

     

       431
       437
        
       

     

       432
       432
       -
         jsonNewlines = lib.concatMapStringsSep "\n" (lib.generators.toJSON {});

     

       438
       438
       +
         jsonNewlines = lib.concatMapStringsSep "\n" (lib.generators.toJSON { });

     

       433
       439
        
       

     

       434
       440
        
         # Run the given script for each of the attr list.

     

       435
       441
        
         # The attrs are passed to the script as a json value.

     
···

       443
       449
        
         outputDir = "${toString ./.}/grammars";

     

       444
       450
        
       

     

       445
       451
        
         update-all-grammars = writeShellScript "update-all-grammars.sh" ''

     

       446
       446
       -
           set -euo pipefail

     

       447
       447
       -
          ${updateImpl} fetch-and-check-tree-sitter-repos '{}'

     

       448
       448
       -
           echo "writing files to ${outputDir}" 1>&2

     

       449
       449
       -
           mkdir -p "${outputDir}"

     

       450
       450
       -
           ${forEachParallel

     

       451
       451
       -
               "repos-to-fetch"

     

       452
       452
       -
               (writeShellScript "fetch-repo" ''

     

       453
       453
       -
                   ${updateImpl} fetch-repo "$1"

     

       454
       454
       -
               '')

     

       455
       455
       -
               (lib.mapAttrsToList

     

       456
       456
       -
                 (nixRepoAttrName: attrs: attrs // {

     

       457
       457
       -
                   inherit

     

       458
       458
       -
                     nixRepoAttrName

     

       459
       459
       -
                     outputDir;

     

       460
       460
       -
                 })

     

       461
       461
       -
                 allGrammars)

     

       462
       462
       -
           }

     

       463
       463
       -
           ${updateImpl} print-all-grammars-nix-file "$(< ${

     

       464
       464
       -
               jsonFile "all-grammars.json" {

     

       465
       465
       -
                 allGrammars =

     

       466
       466
       -
                   (lib.mapAttrsToList

     

       467
       467
       -
                     (nixRepoAttrName: attrs: attrs // {

     

       468
       468
       -
                       inherit nixRepoAttrName;

     

       469
       469
       -
                     })

     

       470
       470
       -
                     allGrammars);

     

       471
       471
       -
                 inherit outputDir;

     

       472
       472
       -
               }

     

       473
       473
       -
           })"

     

       452
       452
       +
            set -euo pipefail

     

       453
       453
       +
           ${updateImpl} fetch-and-check-tree-sitter-repos '{}'

     

       454
       454
       +
            echo "writing files to ${outputDir}" 1>&2

     

       455
       455
       +
            mkdir -p "${outputDir}"

     

       456
       456
       +
            ${forEachParallel

     

       457
       457
       +
                "repos-to-fetch"

     

       458
       458
       +
                (writeShellScript "fetch-repo" ''

     

       459
       459
       +
                    ${updateImpl} fetch-repo "$1"

     

       460
       460
       +
                '')

     

       461
       461
       +
                (lib.mapAttrsToList

     

       462
       462
       +
                  (nixRepoAttrName: attrs: attrs // {

     

       463
       463
       +
                    inherit

     

       464
       464
       +
                      nixRepoAttrName

     

       465
       465
       +
                      outputDir;

     

       466
       466
       +
                  })

     

       467
       467
       +
                  allGrammars)

     

       468
       468
       +
            }

     

       469
       469
       +
            ${updateImpl} print-all-grammars-nix-file "$(< ${

     

       470
       470
       +
                jsonFile "all-grammars.json" {

     

       471
       471
       +
                  allGrammars =

     

       472
       472
       +
                    (lib.mapAttrsToList

     

       473
       473
       +
                      (nixRepoAttrName: attrs: attrs // {

     

       474
       474
       +
                        inherit nixRepoAttrName;

     

       475
       475
       +
                      })

     

       476
       476
       +
                      allGrammars);

     

       477
       477
       +
                  inherit outputDir;

     

       478
       478
       +
                }

     

       479
       479
       +
            })"

     

       474
       480
        
         '';

     

       475
       481
        
       

     

       476
       482

+3 -3

pkgs/servers/matrix-synapse/sliding-sync/default.nix

···

       5
       5
        
       

     

       6
       6
        
       buildGoModule rec {

     

       7
       7
        
         pname = "matrix-sliding-sync";

     

       8
       8
       -
         version = "0.99.10";

     

       8
       8
       +
         version = "0.99.11";

     

       9
       9
        
       

     

       10
       10
        
         src = fetchFromGitHub {

     

       11
       11
        
           owner = "matrix-org";

     

       12
       12
        
           repo = "sliding-sync";

     

       13
       13
        
           rev = "refs/tags/v${version}";

     

       14
       14
       -
           hash = "sha256-TjChelGVicA59q6iIIDTI7nSj8KtjpA4bfZqsfoiOQg=";

     

       14
       14
       +
           hash = "sha256-Wd/nnJhKg+BDyOIz42zEScjzQRrpEq6YG9/9Tk24hgg=";

     

       15
       15
        
         };

     

       16
       16
        
       

     

       17
       17
       -
         vendorHash = "sha256-E3nCcw6eTKKcL55ls6n5pYlRFffsefsN0G1Hwd49uh8=";

     

       17
       17
       +
         vendorHash = "sha256-0QSyYhOht1j1tWNxHQh+NUZA/W1xy7ANu+29H/gusOE=";

     

       18
       18
        
       

     

       19
       19
        
         subPackages = [ "cmd/syncv3" ];

     

       20
       20

+2 -2

pkgs/tools/text/kdiff3/default.nix

···

       14
       14
        
       

     

       15
       15
        
       mkDerivation rec {

     

       16
       16
        
         pname = "kdiff3";

     

       17
       17
       -
         version = "1.10.5";

     

       17
       17
       +
         version = "1.10.6";

     

       18
       18
        
       

     

       19
       19
        
         src = fetchurl {

     

       20
       20
        
           url = "https://download.kde.org/stable/${pname}/${pname}-${version}.tar.xz";

     

       21
       21
       -
           sha256 = "sha256-2wMm0khBGnqaxBMBx/8O83ecvwQKMw/yhQDdwtTxjIw=";

     

       21
       21
       +
           hash = "sha256-EzOu+dZjbGs0ZqF/0sXZbpGdTrUh6isjUoJUETau+zE=";

     

       22
       22
        
         };

     

       23
       23
        
       

     

       24
       24
        
         buildInputs = [ boost ];