commit 71c41d360a50e63572570dfeab4ff452c763e9d7 · pyrox.dev/nixpkgs

+9

maintainers/maintainer-list.nix

···

       13135
       13135
        
           githubId = 8214542;

     

       13136
       13136
        
           name = "Nicolò Balzarotti";

     

       13137
       13137
        
         };

     

       13138
       13138
       +
         nicolas-goudry = {

     

       13139
       13139
       +
           email = "goudry.nicolas@gmail.com";

     

       13140
       13140
       +
           github = "nicolas-goudry";

     

       13141
       13141
       +
           githubId = 8753998;

     

       13142
       13142
       +
           name = "Nicolas Goudry";

     

       13143
       13143
       +
           keys = [{

     

       13144
       13144
       +
             fingerprint = "21B6 A59A 4E89 0B1B 83E3 0CDB 01C8 8C03 5450 9AA9";

     

       13145
       13145
       +
           }];

     

       13146
       13146
       +
         };

     

       13138
       13147
        
         nicoo = {

     

       13139
       13148
        
           email = "nicoo@debian.org";

     

       13140
       13149
        
           github = "nbraud";

-1

maintainers/scripts/luarocks-packages.csv

···

       97
       97
        
       mpack,,,,,,

     

       98
       98
        
       moonscript,https://github.com/leafo/moonscript.git,dev-1,,,,arobyn

     

       99
       99
        
       nui.nvim,,,,,,mrcjkb

     

       100
       100
       -
       nvim-client,https://github.com/neovim/lua-client.git,,,,,

     

       101
       100
        
       nvim-cmp,https://github.com/hrsh7th/nvim-cmp,,,,,

     

       102
       101
        
       penlight,https://github.com/lunarmodules/Penlight.git,,,,,alerque

     

       103
       102
        
       plenary.nvim,https://github.com/nvim-lua/plenary.nvim.git,,,,5.1,

+2

nixos/doc/manual/release-notes/rl-2405.section.md

···

       29
       29
        
       

     

       30
       30
        
       - [Clevis](https://github.com/latchset/clevis), a pluggable framework for automated decryption, used to unlock encrypted devices in initrd. Available as [boot.initrd.clevis.enable](#opt-boot.initrd.clevis.enable).

     

       31
       31
        
       

     

       32
       32
       +
       - [TuxClocker](https://github.com/Lurkki14/tuxclocker), a hardware control and monitoring program. Available as [programs.tuxclocker](#opt-programs.tuxclocker.enable).

     

       33
       33
       +
       

     

       32
       34
        
       ## Backward Incompatibilities {#sec-release-24.05-incompatibilities}

     

       33
       35
        
       

     

       34
       36
        
       <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->

+1

nixos/modules/module-list.nix

···

       770
       770
        
         ./services/misc/tautulli.nix

     

       771
       771
        
         ./services/misc/tiddlywiki.nix

     

       772
       772
        
         ./services/misc/tp-auto-kbbl.nix

     

       773
       773
       +
         ./services/misc/tuxclocker.nix

     

       773
       774
        
         ./services/misc/tzupdate.nix

     

       774
       775
        
         ./services/misc/uhub.nix

     

       775
       776
        
         ./services/misc/weechat.nix

+71

nixos/modules/services/misc/tuxclocker.nix

···

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

     

       2
       2
       +
       

     

       3
       3
       +
       with lib;

     

       4
       4
       +
       

     

       5
       5
       +
       let

     

       6
       6
       +
         cfg = config.programs.tuxclocker;

     

       7
       7
       +
       in

     

       8
       8
       +
       {

     

       9
       9
       +
         options.programs.tuxclocker = {

     

       10
       10
       +
           enable = mkEnableOption (lib.mdDoc ''

     

       11
       11
       +
             TuxClocker, a hardware control and monitoring program

     

       12
       12
       +
           '');

     

       13
       13
       +
       

     

       14
       14
       +
           enableAMD = mkEnableOption (lib.mdDoc ''

     

       15
       15
       +
             AMD GPU controls.

     

       16
       16
       +
             Sets the `amdgpu.ppfeaturemask` kernel parameter to 0xfffd7fff to enable all TuxClocker controls

     

       17
       17
       +
           '');

     

       18
       18
       +
       

     

       19
       19
       +
           enabledNVIDIADevices = mkOption {

     

       20
       20
       +
             type = types.listOf types.int;

     

       21
       21
       +
             default = [ ];

     

       22
       22
       +
             example = [ 0 1 ];

     

       23
       23
       +
             description = lib.mdDoc ''

     

       24
       24
       +
               Enable NVIDIA GPU controls for a device by index.

     

       25
       25
       +
               Sets the `Coolbits` Xorg option to enable all TuxClocker controls.

     

       26
       26
       +
             '';

     

       27
       27
       +
           };

     

       28
       28
       +
       

     

       29
       29
       +
           useUnfree = mkOption {

     

       30
       30
       +
             type = types.bool;

     

       31
       31
       +
             default = false;

     

       32
       32
       +
             example = true;

     

       33
       33
       +
             description = lib.mdDoc ''

     

       34
       34
       +
               Whether to use components requiring unfree dependencies.

     

       35
       35
       +
               Disabling this allows you to get everything from the binary cache.

     

       36
       36
       +
             '';

     

       37
       37
       +
           };

     

       38
       38
       +
         };

     

       39
       39
       +
       

     

       40
       40
       +
         config = let

     

       41
       41
       +
             package = if cfg.useUnfree then pkgs.tuxclocker else pkgs.tuxclocker-without-unfree;

     

       42
       42
       +
           in

     

       43
       43
       +
             mkIf cfg.enable {

     

       44
       44
       +
               environment.systemPackages = [

     

       45
       45
       +
                 package

     

       46
       46
       +
               ];

     

       47
       47
       +
       

     

       48
       48
       +
               services.dbus.packages = [

     

       49
       49
       +
                 package

     

       50
       50
       +
               ];

     

       51
       51
       +
       

     

       52
       52
       +
               # MSR is used for some features

     

       53
       53
       +
               boot.kernelModules = [ "msr" ];

     

       54
       54
       +
       

     

       55
       55
       +
               # https://download.nvidia.com/XFree86/Linux-x86_64/430.14/README/xconfigoptions.html#Coolbits

     

       56
       56
       +
               services.xserver.config = let

     

       57
       57
       +
                 configSection = (i: ''

     

       58
       58
       +
                   Section "Device"

     

       59
       59
       +
                     Driver "nvidia"

     

       60
       60
       +
                     Option "Coolbits" "31"

     

       61
       61
       +
                     Identifier "Device-nvidia[${toString i}]"

     

       62
       62
       +
                   EndSection

     

       63
       63
       +
                 '');

     

       64
       64
       +
               in

     

       65
       65
       +
                 concatStrings (map configSection cfg.enabledNVIDIADevices);

     

       66
       66
       +
       

     

       67
       67
       +
               # https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/drivers/gpu/drm/amd/include/amd_shared.h#n207

     

       68
       68
       +
               # Enable everything modifiable in TuxClocker

     

       69
       69
       +
               boot.kernelParams = mkIf cfg.enableAMD [ "amdgpu.ppfeaturemask=0xfffd7fff" ];

     

       70
       70
       +
             };

     

       71
       71
       +
       }

+1 -1

nixos/tests/nixos-rebuild-specialisations.nix

···

       23
       23
        
       

     

       24
       24
        
             virtualisation = {

     

       25
       25
        
               cores = 2;

     

       26
       26
       -
               memorySize = 2048;

     

       26
       26
       +
               memorySize = 4096;

     

       27
       27
        
             };

     

       28
       28
        
           };

     

       29
       29
        
         };

+2 -2

pkgs/applications/audio/monkeys-audio/default.nix

···

       5
       5
        
       }:

     

       6
       6
        
       

     

       7
       7
        
       stdenv.mkDerivation (finalAttrs: {

     

       8
       8
       -
         version = "10.28";

     

       8
       8
       +
         version = "10.30";

     

       9
       9
        
         pname = "monkeys-audio";

     

       10
       10
        
       

     

       11
       11
        
         src = fetchzip {

     

       12
       12
        
           url = "https://monkeysaudio.com/files/MAC_${

     

       13
       13
        
             builtins.concatStringsSep "" (lib.strings.splitString "." finalAttrs.version)}_SDK.zip";

     

       14
       14
       -
           sha256 = "sha256-9EFZvD3CicT68hBcc/fS73zonQKDwbV/iNY0CbBmhtE=";

     

       14
       14
       +
           sha256 = "sha256-vTpfHw58WRRjS/h7FVYjYwHSqoXAF08i8Q/i9xI+9Io=";

     

       15
       15
        
           stripRoot = false;

     

       16
       16
        
         };

     

       17
       17
        
         nativeBuildInputs = [

+2 -2

pkgs/applications/audio/mympd/default.nix

···

       16
       16
        
       

     

       17
       17
        
       stdenv.mkDerivation (finalAttrs: {

     

       18
       18
        
         pname = "mympd";

     

       19
       19
       -
         version = "13.0.0";

     

       19
       19
       +
         version = "13.0.5";

     

       20
       20
        
       

     

       21
       21
        
         src = fetchFromGitHub {

     

       22
       22
        
           owner = "jcorporation";

     

       23
       23
        
           repo = "myMPD";

     

       24
       24
        
           rev = "v${finalAttrs.version}";

     

       25
       25
       -
           sha256 = "sha256-cYoGjge2VtU+QqIURGd/EpkSQ4fhvsdnYZYyESAd56U=";

     

       25
       25
       +
           sha256 = "sha256-9TOQoef5aVHFeDc0y3k6SCHBeKON5ueU7275HAmPw9M=";

     

       26
       26
        
         };

     

       27
       27
        
       

     

       28
       28
        
         nativeBuildInputs = [

-1

pkgs/applications/editors/neovim/default.nix

···

       43
       43
        
           luabitop

     

       44
       44
        
           mpack

     

       45
       45
        
         ] ++ lib.optionals doCheck [

     

       46
       46
       -
           nvim-client

     

       47
       46
        
           luv

     

       48
       47
        
           coxpcall

     

       49
       48
        
           busted

+2 -2

pkgs/applications/editors/vscode/extensions/default.nix

···

       3557
       3557
        
               mktplcRef = {

     

       3558
       3558
        
                 name = "uiua-vscode";

     

       3559
       3559
        
                 publisher = "uiua-lang";

     

       3560
       3560
       -
                 version = "0.0.26";

     

       3561
       3561
       -
                 sha256 = "sha256-EKWThidMgbd+a4Vw4SQo988ggVbCTnCakohvq3/mZQ0=";

     

       3560
       3560
       +
                 version = "0.0.27";

     

       3561
       3561
       +
                 sha256 = "sha256-wEY1FZjgiQJ7VrJGZX0SgZqz/14v//jxgrqdafLjIfM=";

     

       3562
       3562
        
               };

     

       3563
       3563
        
               meta = {

     

       3564
       3564
        
                 description = "VSCode language extension for Uiua";

+7 -16

pkgs/applications/misc/clipcat/default.nix

···

       2
       2
        
       , fetchFromGitHub

     

       3
       3
        
       , rustPlatform

     

       4
       4
        
       , protobuf

     

       5
       5
       -
       , xvfb-run

     

       6
       5
        
       , installShellFiles

     

       7
       6
        
       }:

     

       8
       7
        
       

     

       9
       8
        
       rustPlatform.buildRustPackage rec {

     

       10
       9
        
         pname = "clipcat";

     

       11
       11
       -
         version = "0.14.0";

     

       10
       10
       +
         version = "0.15.0";

     

       12
       11
        
       

     

       13
       12
        
         src = fetchFromGitHub {

     

       14
       13
        
           owner = "xrelkd";

     

       15
       14
        
           repo = pname;

     

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

     

       17
       17
       -
           hash = "sha256-Q9uGufIfqRLk3YJjaEEyu29JP8vSwUCe4ch9tf6Vz9g=";

     

       16
       16
       +
           hash = "sha256-NuljH6cqgdtTJDkNv4w44s1UM4/R1gmpVyWpCzCJ3DU=";

     

       18
       17
        
         };

     

       19
       18
        
       

     

       20
       20
       -
         cargoHash = "sha256-9TPj4W+BSpHlOWkbiV7jNgjiYJjjw9j2c3o8vesrJeI=";

     

       19
       19
       +
         cargoHash = "sha256-5+qa9/QGZyZBaO2kbvpP7Ybs1EXIO1MlPFm0PDTNqCQ=";

     

       21
       20
        
       

     

       22
       21
        
         nativeBuildInputs = [

     

       23
       22
        
           protobuf

     

       24
       23
        
           installShellFiles

     

       25
       24
        
         ];

     

       26
       25
        
       

     

       27
       27
       -
         nativeCheckInputs = [

     

       28
       28
       -
           xvfb-run

     

       26
       26
       +
         checkFlags = [

     

       27
       27
       +
           # Some test cases interact with X11, skip them

     

       28
       28
       +
           "--skip=test_x11_clipboard"

     

       29
       29
       +
           "--skip=test_x11_primary"

     

       29
       30
        
         ];

     

       30
       30
       -
       

     

       31
       31
       -
         useNextest = true;

     

       32
       32
       -
       

     

       33
       33
       -
         # cargo-nextest help us retry the failed test cases

     

       34
       34
       -
         NEXTEST_RETRIES = 5;

     

       35
       35
       -
       

     

       36
       36
       -
         # Some test cases interact with X11, we use xvfb-run here

     

       37
       37
       -
         checkPhase = ''

     

       38
       38
       -
           xvfb-run --auto-servernum cargo nextest run --release --workspace --no-fail-fast --no-capture

     

       39
       39
       -
         '';

     

       40
       31
        
       

     

       41
       32
        
         postInstall = ''

     

       42
       33
        
           for cmd in clipcatd clipcatctl clipcat-menu clipcat-notify; do

+2 -2

pkgs/applications/misc/kaufkauflist/default.nix

···

       21
       21
        
         };

     

       22
       22
        
       in buildNpmPackage rec {

     

       23
       23
        
         pname = "kaufkauflist";

     

       24
       24
       -
         version = "3.0.0";

     

       24
       24
       +
         version = "3.1.0";

     

       25
       25
        
       

     

       26
       26
        
         src = fetchFromGitea {

     

       27
       27
        
           domain = "codeberg.org";

     

       28
       28
        
           owner = "annaaurora";

     

       29
       29
        
           repo = "kaufkauflist";

     

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

     

       31
       31
       -
           hash = "sha256-W/FlHLZYYG/s9NdAqm0OJHlpTZtEG4iaegc4iOnAwWk=";

     

       31
       31
       +
           hash = "sha256-gIwJtfausORMfmZONhSOZ1DRW5CSH+cLDCNy3j+u6d0=";

     

       32
       32
        
         };

     

       33
       33
        
       

     

       34
       34
        
         npmDepsHash = "sha256-d1mvC72ugmKLNStoemUr8ISCUYjyo9EDWdWUCD1FMiM=";

+3 -3

pkgs/applications/misc/nwg-bar/default.nix

···

       9
       9
        
       

     

       10
       10
        
       buildGoModule rec {

     

       11
       11
        
         pname = "nwg-bar";

     

       12
       12
       -
         version = "0.1.4";

     

       12
       12
       +
         version = "0.1.5";

     

       13
       13
        
       

     

       14
       14
        
         src = fetchFromGitHub {

     

       15
       15
        
           owner = "nwg-piotr";

     

       16
       16
        
           repo = pname;

     

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

     

       18
       18
       -
           sha256 = "sha256-kqLQwqZ2RPSKNdw1yzKUfqSe8hQcJe/6/8UzTT/Gz/8=";

     

       18
       18
       +
           sha256 = "sha256-e64qCthZfGeFIe/g4Bu342d/C46qzJRBdxzzP6rM408=";

     

       19
       19
        
         };

     

       20
       20
        
       

     

       21
       21
        
         patches = [ ./fix-paths.patch ];

     
···

       24
       24
        
           substituteInPlace tools.go --subst-var out

     

       25
       25
        
         '';

     

       26
       26
        
       

     

       27
       27
       -
         vendorHash = "sha256-vdDlPsjfHl7w1ufosLYquHAKOvkolNBr04bt+OQBlFE=";

     

       27
       27
       +
         vendorHash = "sha256-YMpq9pgA3KjQMcw7JDwEDbHZ5h3N7ziFVIGvQ+xA3Ds=";

     

       28
       28
        
       

     

       29
       29
        
         nativeBuildInputs = [ pkg-config wrapGAppsHook ];

     

       30
       30

+66

pkgs/applications/misc/tuxclocker/default.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , stdenv

     

       3
       3
       +
       , boost

     

       4
       4
       +
       , fetchFromGitHub

     

       5
       5
       +
       , git

     

       6
       6
       +
       , makeWrapper

     

       7
       7
       +
       , meson

     

       8
       8
       +
       , ninja

     

       9
       9
       +
       , pkg-config

     

       10
       10
       +
       , python3

     

       11
       11
       +
       , qtbase

     

       12
       12
       +
       , qtcharts

     

       13
       13
       +
       , tuxclocker-plugins

     

       14
       14
       +
       , wrapQtAppsHook

     

       15
       15
       +
       }:

     

       16
       16
       +
       

     

       17
       17
       +
       stdenv.mkDerivation (finalAttrs: {

     

       18
       18
       +
         pname = "tuxclocker";

     

       19
       19
       +
         version = "1.4.0";

     

       20
       20
       +
       

     

       21
       21
       +
         src = fetchFromGitHub {

     

       22
       22
       +
           owner = "Lurkki14";

     

       23
       23
       +
           repo = "tuxclocker";

     

       24
       24
       +
           fetchSubmodules = true;

     

       25
       25
       +
           rev = "${finalAttrs.version}";

     

       26
       26
       +
           hash = "sha256-8dtuZXBWftXNQpqYgNQOayPGfvEIu9QfbqDShfkt1qA=";

     

       27
       27
       +
         };

     

       28
       28
       +
       

     

       29
       29
       +
         # Meson doesn't find boost without these

     

       30
       30
       +
         BOOST_INCLUDEDIR = "${lib.getDev boost}/include";

     

       31
       31
       +
         BOOST_LIBRARYDIR = "${lib.getLib boost}/lib";

     

       32
       32
       +
       

     

       33
       33
       +
         nativeBuildInputs = [

     

       34
       34
       +
           git

     

       35
       35
       +
           makeWrapper

     

       36
       36
       +
           meson

     

       37
       37
       +
           ninja

     

       38
       38
       +
           pkg-config

     

       39
       39
       +
           wrapQtAppsHook

     

       40
       40
       +
         ];

     

       41
       41
       +
       

     

       42
       42
       +
         buildInputs = [

     

       43
       43
       +
           boost

     

       44
       44
       +
           qtbase

     

       45
       45
       +
           qtcharts

     

       46
       46
       +
         ];

     

       47
       47
       +
       

     

       48
       48
       +
         postInstall = ''

     

       49
       49
       +
           wrapProgram "$out/bin/tuxclockerd" \

     

       50
       50
       +
             --prefix "TEXTDOMAINDIR" : "${tuxclocker-plugins}/share/locale" \

     

       51
       51
       +
             --prefix "TUXCLOCKER_PLUGIN_PATH" : "${tuxclocker-plugins}/lib/tuxclocker/plugins" \

     

       52
       52
       +
             --prefix "PYTHONPATH" : "${python3.pkgs.hwdata}/${python3.sitePackages}"

     

       53
       53
       +
         '';

     

       54
       54
       +
       

     

       55
       55
       +
         mesonFlags = [

     

       56
       56
       +
           "-Dplugins=false"

     

       57
       57
       +
         ];

     

       58
       58
       +
       

     

       59
       59
       +
         meta = with lib; {

     

       60
       60
       +
           description = "Qt overclocking tool for GNU/Linux";

     

       61
       61
       +
           homepage = "https://github.com/Lurkki14/tuxclocker";

     

       62
       62
       +
           license = licenses.gpl3Only;

     

       63
       63
       +
           maintainers = with maintainers; [ lurkki ];

     

       64
       64
       +
           platforms = platforms.linux;

     

       65
       65
       +
         };

     

       66
       66
       +
       })

+3 -3

pkgs/applications/networking/cluster/kubectl-cnpg/default.nix

···

       5
       5
        
       

     

       6
       6
        
       buildGoModule rec {

     

       7
       7
        
         pname = "kubectl-cnpg";

     

       8
       8
       -
         version = "1.21.0";

     

       8
       8
       +
         version = "1.21.1";

     

       9
       9
        
       

     

       10
       10
        
         src = fetchFromGitHub {

     

       11
       11
        
           owner = "cloudnative-pg";

     

       12
       12
        
           repo = "cloudnative-pg";

     

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

     

       14
       14
       -
           hash = "sha256-FRSypaZex55ABE+e23kvNZFTTn6Z8AEy8ag3atwMdEk=";

     

       14
       14
       +
           hash = "sha256-xDjDBbnYR0PnSrF/vr+HXVGMoba9NmE/uMX/DRm+CVE=";

     

       15
       15
        
         };

     

       16
       16
        
       

     

       17
       17
       -
         vendorHash = "sha256-mirnieBrrVwRccJDgelZvSfQaAVlTsttOh3nJBN6ev0=";

     

       17
       17
       +
         vendorHash = "sha256-NqQGqvvwLi6niey9Mi9hJSRYrRXE4Dj4VWiMu5wUXXw=";

     

       18
       18
        
       

     

       19
       19
        
         subPackages = [ "cmd/kubectl-cnpg" ];

     

       20
       20

+3 -3

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

···

       10
       10
        
       

     

       11
       11
        
       buildGoModule rec {

     

       12
       12
        
         pname = "nerdctl";

     

       13
       13
       -
         version = "1.7.1";

     

       13
       13
       +
         version = "1.7.2";

     

       14
       14
        
       

     

       15
       15
        
         src = fetchFromGitHub {

     

       16
       16
        
           owner = "containerd";

     

       17
       17
        
           repo = pname;

     

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

     

       19
       19
       -
           hash = "sha256-jjYSvY7NT9G/tcsM+9qHnsL81QKItyVMZZWuD2mpln0=";

     

       19
       19
       +
           hash = "sha256-6YMDGvNl1uNMWR1xTPRjYGwaKXC5c4oUy88VRY2Bedw=";

     

       20
       20
        
         };

     

       21
       21
        
       

     

       22
       22
       -
         vendorHash = "sha256-O48QzyQLkt7T9j+CKQG8TcHlmtS+ykoMoCamsEswPjk=";

     

       22
       22
       +
         vendorHash = "sha256-tXLuOZUoMhVfhhYxnxNw+nYofhEFMKI1b94lVPySd3E=";

     

       23
       23
        
       

     

       24
       24
        
         nativeBuildInputs = [ makeWrapper installShellFiles ];

     

       25
       25

+2 -2

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

···

       14
       14
        
       let

     

       15
       15
        
         package =  buildGoModule rec {

     

       16
       16
        
           pname = "opentofu";

     

       17
       17
       -
           version = "1.6.0-beta4";

     

       17
       17
       +
           version = "1.6.0-beta5";

     

       18
       18
        
       

     

       19
       19
        
           src = fetchFromGitHub {

     

       20
       20
        
             owner = "opentofu";

     

       21
       21
        
             repo = "opentofu";

     

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

     

       23
       23
       -
             hash = "sha256-AFy7xg1UwVWlFZjelYhxfkhj4Tk93uVvF1i3PHa2jEM=";

     

       23
       23
       +
             hash = "sha256-RHAhftoqGs9ZoO+NGvZ0AAvT5UWRKzV7cHX1/qVCAMU=";

     

       24
       24
        
           };

     

       25
       25
        
       

     

       26
       26
        
           vendorHash = "sha256-kSm5RZqQRgbmPaKt5IWmuMhHwAu+oJKTX1q1lbE7hWk=";

+2 -2

pkgs/applications/networking/instant-messengers/neosay/default.nix

···

       5
       5
        
       

     

       6
       6
        
       buildGoModule rec {

     

       7
       7
        
         pname = "neosay";

     

       8
       8
       -
         version = "1.0.0";

     

       8
       8
       +
         version = "1.0.1";

     

       9
       9
        
       

     

       10
       10
        
         src = fetchFromGitHub {

     

       11
       11
        
           owner = "donuts-are-good";

     

       12
       12
        
           repo = "neosay";

     

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

     

       14
       14
       -
           hash = "sha256-Uwz6Y26AtzWXLFgJY0WVD0HBb+vbMeeMKt8gCk6viec=";

     

       14
       14
       +
           hash = "sha256-2tFjvAobDpBh1h0ejdtqxDsC+AqyneN+xNssOJNfEbk=";

     

       15
       15
        
         };

     

       16
       16
        
       

     

       17
       17
        
         vendorHash = "sha256-w0aZnel5Obq73UXcG9wmO9t/7qQTE8ru656u349cvzQ=";

+2 -2

pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-aarch64.nix

···

       2
       2
        
       callPackage ./generic.nix { } rec {

     

       3
       3
        
         pname = "signal-desktop";

     

       4
       4
        
         dir = "Signal";

     

       5
       5
       -
         version = "6.40.0";

     

       5
       5
       +
         version = "6.42.0";

     

       6
       6
        
         url = "https://github.com/0mniteck/Signal-Desktop-Mobian/raw/${version}/builds/release/signal-desktop_${version}_arm64.deb";

     

       7
       7
       -
         hash = "sha256-3Pi0c+CGcJR1M4ll51m+B5PmGIcIjjlc0qa9b8rkMeU=";

     

       7
       7
       +
         hash = "sha256-kr8FM+EAtL/7TrgJlI33oDd4CPGMJ+F2PpQCR4OL6j4=";

     

       8
       8
        
       }

+2 -2

pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-beta.nix

···

       2
       2
        
       callPackage ./generic.nix {} rec {

     

       3
       3
        
         pname = "signal-desktop-beta";

     

       4
       4
        
         dir = "Signal Beta";

     

       5
       5
       -
         version = "6.40.0-beta.2";

     

       5
       5
       +
         version = "6.43.0-beta.1";

     

       6
       6
        
         url = "https://updates.signal.org/desktop/apt/pool/s/signal-desktop-beta/signal-desktop-beta_${version}_amd64.deb";

     

       7
       7
       -
         hash = "sha256-pfedkxbZ25DFgz+/N7ZEb9LwKrHuoMM+Zi+Tc21QPsg=";

     

       7
       7
       +
         hash = "sha256-7UlfpOWAalJjZjAJLa2CL3HdR2LFlE1/5sdec5Sj/tg=";

     

       8
       8
        
       }

+1

pkgs/applications/networking/msmtp/default.nix

···

       40
       40
        
           license = licenses.gpl3Plus;

     

       41
       41
        
           maintainers = with maintainers; [ peterhoeg ];

     

       42
       42
        
           platforms = platforms.unix;

     

       43
       43
       +
           mainProgram = "msmtp";

     

       43
       44
        
         };

     

       44
       45
        
       

     

       45
       46
        
         binaries = stdenv.mkDerivation {

+3 -3

pkgs/applications/networking/mullvad-vpn/default.nix

···

       64
       64
        
           systemd

     

       65
       65
        
         ];

     

       66
       66
        
       

     

       67
       67
       -
         version = "2023.5";

     

       67
       67
       +
         version = "2023.6";

     

       68
       68
        
       

     

       69
       69
        
         selectSystem = attrs: attrs.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");

     

       70
       70
        
       

     
···

       74
       74
        
         };

     

       75
       75
        
       

     

       76
       76
        
         hash = selectSystem {

     

       77
       77
       -
           x86_64-linux = "sha256-FpVruI80PmpBo2JrMvgvOg7ou6LceTeit9HbWKgcPa4=";

     

       78
       78
       -
           aarch64-linux = "sha256-NlYh8K5Xbad4xSoZ02yC5fh3SrQzyNyS9uoA73REcpo=";

     

       77
       77
       +
           x86_64-linux = "sha256-IhE93NXX8iwlvso+ei9wbVyJJLtkjrZf8qB43AZre+4=";

     

       78
       78
       +
           aarch64-linux = "sha256-HRAGDps0Cf7qOWTS7die9uouxMpAaM83t1Ixz7ElF6g=";

     

       79
       79
        
         };

     

       80
       80
        
       in

     

       81
       81

+2 -2

pkgs/applications/science/chemistry/jmol/default.nix

···

       25
       25
        
         };

     

       26
       26
        
       in

     

       27
       27
        
       stdenv.mkDerivation rec {

     

       28
       28
       -
         version = "16.1.45";

     

       28
       28
       +
         version = "16.1.47";

     

       29
       29
        
         pname = "jmol";

     

       30
       30
        
       

     

       31
       31
        
         src = let

     

       32
       32
        
           baseVersion = "${lib.versions.major version}.${lib.versions.minor version}";

     

       33
       33
        
         in fetchurl {

     

       34
       34
        
           url = "mirror://sourceforge/jmol/Jmol/Version%20${baseVersion}/Jmol%20${version}/Jmol-${version}-binary.tar.gz";

     

       35
       35
       -
           hash = "sha256-rLq0QrY1M0OptmRZ/dKUVssREnH1im9Ti89AbpsiFtg=";

     

       35
       35
       +
           hash = "sha256-3hsH+RkPPoViKp1bc/88GDVSG8jf9hiPKPkUfe9PIkk=";

     

       36
       36
        
         };

     

       37
       37
        
       

     

       38
       38
        
         patchPhase = ''

+2 -2

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

···

       16
       16
        
       

     

       17
       17
        
       stdenv.mkDerivation rec {

     

       18
       18
        
         pname = "nvc";

     

       19
       19
       -
         version = "1.11.0";

     

       19
       19
       +
         version = "1.11.1";

     

       20
       20
        
       

     

       21
       21
        
         src = fetchFromGitHub {

     

       22
       22
        
           owner = "nickg";

     

       23
       23
        
           repo = "nvc";

     

       24
       24
        
           rev = "r${version}";

     

       25
       25
       -
           hash = "sha256-95vIyBQ38SGpI+gnDqK1MRRzOT6uiYjDr1c//folqZ8=";

     

       25
       25
       +
           hash = "sha256-aBH3TtPFuJXtVvGTJcGJev5DYVwqjUAM9cf5PatJq9Y=";

     

       26
       26
        
         };

     

       27
       27
        
       

     

       28
       28
        
         nativeBuildInputs = [

+2 -2

pkgs/applications/science/logic/alt-ergo/default.nix

···

       1
       1
       -
       { fetchurl, fetchpatch, lib, ocamlPackages }:

     

       1
       1
       +
       { darwin, fetchurl, lib, ocamlPackages, stdenv }:

     

       2
       2
        
       

     

       3
       3
        
       let

     

       4
       4
        
         pname = "alt-ergo";

     
···

       28
       28
        
       

     

       29
       29
        
         inherit pname version src;

     

       30
       30
        
       

     

       31
       31
       -
         nativeBuildInputs = [ ocamlPackages.menhir ];

     

       31
       31
       +
         nativeBuildInputs = [ ocamlPackages.menhir ] ++ lib.optionals stdenv.isDarwin [ darwin.sigtool ];

     

       32
       32
        
         buildInputs = [ alt-ergo-parsers ] ++ (with ocamlPackages; [ cmdliner dune-site ]);

     

       33
       33
        
       

     

       34
       34
        
         meta = {

+8 -6

pkgs/applications/science/robotics/mujoco/default.nix

···

       22
       22
        
           benchmark = fetchFromGitHub {

     

       23
       23
        
             owner = "google";

     

       24
       24
        
             repo = "benchmark";

     

       25
       25
       -
             rev = "344117638c8ff7e239044fd0fa7085839fc03021";

     

       26
       26
       -
             hash = "sha256-gztnxui9Fe/FTieMjdvfJjWHjkImtlsHn6fM1FruyME=";

     

       25
       25
       +
             rev = "e45585a4b8e75c28479fa4107182c28172799640";

     

       26
       26
       +
             hash = "sha256-pgHvmRpPd99ePUVRsi7WXLVSZngZ5q6r1vWW4mdGvxY=";

     

       27
       27
        
           };

     

       28
       28
        
           ccd = fetchFromGitHub {

     

       29
       29
        
             owner = "danfis";

     
···

       34
       34
        
           eigen3 = fetchFromGitLab {

     

       35
       35
        
             owner = "libeigen";

     

       36
       36
        
             repo = "eigen";

     

       37
       37
       -
             rev = "e8515f78ac098329ab9f8cab21c87caede090a3f";

     

       38
       38
       -
             hash = "sha256-HXKtFJsKGpug+wNPjYynTuyaG0igo3oG4rFQktveh1g=";

     

       37
       37
       +
             rev = "454f89af9d6f3525b1df5f9ef9c86df58bf2d4d3";

     

       38
       38
       +
             hash = "sha256-a9QAnv6vIM8a9Bn8ZmfeMT0+kbtb0QGxM0+m5xwIqm8=";

     

       39
       39
        
           };

     

       40
       40
        
           googletest = fetchFromGitHub {

     

       41
       41
        
             owner = "google";

     
···

       129
       129
        
       

     

       130
       130
        
       in stdenv.mkDerivation rec {

     

       131
       131
        
         pname = "mujoco";

     

       132
       132
       -
         version = "3.0.1";

     

       132
       132
       +
         version = "3.1.0";

     

       133
       133
        
       

     

       134
       134
       +
         # Bumping version? Make sure to look though the MuJoCo's commit

     

       135
       135
       +
         # history for bumped dependency pins!

     

       134
       136
        
         src = fetchFromGitHub {

     

       135
       137
        
           owner = "google-deepmind";

     

       136
       138
        
           repo = pname;

     

       137
       139
        
           rev = version;

     

       138
       138
       -
           hash = "sha256-UXE+7KDti8RarpoJoo9Ei3TgW/Qdnj3ASRo8uTWhGrU=";

     

       140
       140
       +
           hash = "sha256-a8h30psoAlj9dI4j8IfY3WzWjY4MrRosGbvgt79s1BQ=";

     

       139
       141
        
         };

     

       140
       142
        
       

     

       141
       143
        
         patches = [ ./mujoco-system-deps-dont-fetch.patch ];

+5 -5

pkgs/applications/version-management/gitkraken/default.nix

···

       10
       10
        
       

     

       11
       11
        
       let

     

       12
       12
        
         pname = "gitkraken";

     

       13
       13
       -
         version = "9.9.2";

     

       13
       13
       +
         version = "9.10.0";

     

       14
       14
        
       

     

       15
       15
        
         throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}";

     

       16
       16
        
       

     

       17
       17
        
         srcs = {

     

       18
       18
        
           x86_64-linux = fetchzip {

     

       19
       19
        
             url = "https://release.axocdn.com/linux/GitKraken-v${version}.tar.gz";

     

       20
       20
       -
             sha256 = "sha256-UfzHkgqxEaSsoiDwFLsyIBW2min9AvSBrLPJ2MlKh3U=";

     

       20
       20
       +
             hash = "sha256-JVeJY0VUNyIeR/IQcfoLBN0I1WQNFy7PpCjzk5bPv/Q=";

     

       21
       21
        
           };

     

       22
       22
        
       

     

       23
       23
        
           x86_64-darwin = fetchzip {

     

       24
       24
        
             url = "https://release.axocdn.com/darwin/GitKraken-v${version}.zip";

     

       25
       25
       -
             sha256 = "sha256-ble0n+giM8xmuSewBVdj+RuT2093rW0taNzsyQLO92I=";

     

       25
       25
       +
             hash = "sha256-npc+dwHH0tlVKkAZxmGwpoiHXeDn0VHkivqbwoJsI7M=";

     

       26
       26
        
           };

     

       27
       27
        
       

     

       28
       28
        
           aarch64-darwin = fetchzip {

     

       29
       29
        
             url = "https://release.axocdn.com/darwin-arm64/GitKraken-v${version}.zip";

     

       30
       30
       -
             sha256 = "sha256-QYhYzjqbCO0/pRDK7c5jYifj+/UY7SLpRqQUQ3LBFkE=";

     

       30
       30
       +
             hash = "sha256-fszsGdNKcVgKdv97gBBf+fSODzjKbOBB4MyCvWzm3CA=";

     

       31
       31
        
           };

     

       32
       32
        
         };

     

       33
       33
        
       

     
···

       39
       39
        
           sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];

     

       40
       40
        
           license = licenses.unfree;

     

       41
       41
        
           platforms = builtins.attrNames srcs;

     

       42
       42
       -
           maintainers = with maintainers; [ xnwdd evanjs arkivm ];

     

       42
       42
       +
           maintainers = with maintainers; [ xnwdd evanjs arkivm nicolas-goudry ];

     

       43
       43
        
           mainProgram = "gitkraken";

     

       44
       44
        
         };

     

       45
       45

+2 -2

pkgs/applications/video/obs-studio/plugins/obs-vertical-canvas.nix

···

       9
       9
        
       

     

       10
       10
        
       stdenv.mkDerivation rec {

     

       11
       11
        
         pname = "obs-vertical-canvas";

     

       12
       12
       -
         version = "1.3.0";

     

       12
       12
       +
         version = "1.3.1";

     

       13
       13
        
       

     

       14
       14
        
         src = fetchFromGitHub {

     

       15
       15
        
           owner = "Aitum";

     

       16
       16
        
           repo = "obs-vertical-canvas";

     

       17
       17
        
           rev = version;

     

       18
       18
       -
           sha256 = "sha256-gDM2S/ygN58iodfO5d34LYUclkzf+nAIBWp+wFeWWik=";

     

       18
       18
       +
           sha256 = "sha256-kJJepKUH/tc6iV/zFDtrAa4bM9Gaqc9M7IItytknkGA=";

     

       19
       19
        
         };

     

       20
       20
        
       

     

       21
       21
        
         nativeBuildInputs = [ cmake ];

+3 -3

pkgs/applications/virtualization/nixpacks/default.nix

···

       2
       2
        
       

     

       3
       3
        
       rustPlatform.buildRustPackage rec {

     

       4
       4
        
         pname = "nixpacks";

     

       5
       5
       -
         version = "1.19.0";

     

       5
       5
       +
         version = "1.20.0";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "railwayapp";

     

       9
       9
        
           repo = pname;

     

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

     

       11
       11
       -
           sha256 = "sha256-yeZGhE+ImWXW3HPpAo+E1GOSEwPr7yK78XVmCocGqH4=";

     

       11
       11
       +
           sha256 = "sha256-EaJYuapTWzVD80UyhzjP1q1SCCNmUozf+hUl4wBgC14=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         cargoHash = "sha256-xqKYd80PCM7Rnj+9dV2XjigE4sweOnL4HfOQiOYzCEQ=";

     

       14
       14
       +
         cargoHash = "sha256-Vh5mdxxROVthDUzK+PRhl9AY5jcmvhEXP5UqOeqOm6o=";

     

       15
       15
        
       

     

       16
       16
        
         # skip test due FHS dependency

     

       17
       17
        
         doCheck = false;

+32

pkgs/by-name/an/anime4k/package.nix

···

       1
       1
       +
       { fetchFromGitHub

     

       2
       2
       +
       , lib

     

       3
       3
       +
       , stdenvNoCC

     

       4
       4
       +
       }:

     

       5
       5
       +
       

     

       6
       6
       +
       stdenvNoCC.mkDerivation (finalAttrs: {

     

       7
       7
       +
         pname = "anime4k";

     

       8
       8
       +
         version = "4.0.1";

     

       9
       9
       +
       

     

       10
       10
       +
         src = fetchFromGitHub {

     

       11
       11
       +
           owner = "bloc97";

     

       12
       12
       +
           repo = "Anime4k";

     

       13
       13
       +
           rev = "v${finalAttrs.version}";

     

       14
       14
       +
           hash = "sha256-OQWJWcDpwmnJJ/kc4uEReaO74dYFlxNQwf33E5Oagb0=";

     

       15
       15
       +
         };

     

       16
       16
       +
       

     

       17
       17
       +
         installPhase = ''

     

       18
       18
       +
           runHook preInstall

     

       19
       19
       +
       

     

       20
       20
       +
           install -Dm644 glsl/*/*.glsl -t $out

     

       21
       21
       +
       

     

       22
       22
       +
           runHook postInstall

     

       23
       23
       +
         '';

     

       24
       24
       +
       

     

       25
       25
       +
         meta = with lib; {

     

       26
       26
       +
           description = "A high-quality real time upscaler for anime";

     

       27
       27
       +
           homepage = "https://github.com/bloc97/Anime4K";

     

       28
       28
       +
           license = licenses.mit;

     

       29
       29
       +
           maintainers = with maintainers; [ surfaceflinger ];

     

       30
       30
       +
           platforms = platforms.all;

     

       31
       31
       +
         };

     

       32
       32
       +
       })

+35

pkgs/by-name/na/nautilus-open-in-blackbox/package.nix

···

       1
       1
       +
       { python3, fetchFromGitHub, gnome, stdenv, lib }:

     

       2
       2
       +
       stdenv.mkDerivation rec {

     

       3
       3
       +
         pname = "nautilus-open-in-blackbox";

     

       4
       4
       +
         version = "0.1.1";

     

       5
       5
       +
       

     

       6
       6
       +
         src = fetchFromGitHub {

     

       7
       7
       +
             owner = "ppvan";

     

       8
       8
       +
             repo = "nautilus-open-in-blackbox";

     

       9
       9
       +
             rev = "refs/tags/${version}";

     

       10
       10
       +
             hash = "sha256-5rvh3qNalpjamcBVQrnAW6GxhwPPlRxP5h045YDqvrM=";

     

       11
       11
       +
         };

     

       12
       12
       +
       

     

       13
       13
       +
         # The Orignal Source code tries to execute `/usr/bin/blackbox` which is not valid in NixOS

     

       14
       14
       +
         # This patch replaces the call with `blackbox`

     

       15
       15
       +
         patches = [ ./paths.patch ];

     

       16
       16
       +
       

     

       17
       17
       +
         buildInputs = [

     

       18
       18
       +
           gnome.nautilus-python

     

       19
       19
       +
           python3.pkgs.pygobject3

     

       20
       20
       +
         ];

     

       21
       21
       +
       

     

       22
       22
       +
         installPhase = ''

     

       23
       23
       +
           runHook preInstall

     

       24
       24
       +
           install -Dm555 ./nautilus-open-in-blackbox.py -t $out/share/nautilus-python/extensions

     

       25
       25
       +
           runHook postInstall

     

       26
       26
       +
         '';

     

       27
       27
       +
       

     

       28
       28
       +
         meta = with lib; {

     

       29
       29
       +
           description = "Extension for nautilus, which adds an context-entry for opening in blackbox";

     

       30
       30
       +
           license = licenses.gpl3Plus;

     

       31
       31
       +
           maintainers = with maintainers; [ blankparticle ];

     

       32
       32
       +
           homepage = "https://github.com/ppvan/nautilus-open-in-blackbox";

     

       33
       33
       +
           platforms = platforms.linux;

     

       34
       34
       +
         };

     

       35
       35
       +
       }

+23

pkgs/by-name/na/nautilus-open-in-blackbox/paths.patch

···

       1
       1
       +
       diff --git a/nautilus-open-in-blackbox.py b/nautilus-open-in-blackbox.py

     

       2
       2
       +
       index 9a43f90..0a5b632 100755

     

       3
       3
       +
       --- a/nautilus-open-in-blackbox.py

     

       4
       4
       +
       +++ b/nautilus-open-in-blackbox.py

     

       5
       5
       +
       @@ -78,17 +78,10 @@ class BlackBoxNautilus(GObject.GObject, Nautilus.MenuProvider):

     

       6
       6
       +
        

     

       7
       7
       +
                return item

     

       8
       8
       +
        

     

       9
       9
       +
       -    def is_native(self):

     

       10
       10
       +
       -        return shutil.which("blackbox") == "/usr/bin/blackbox"

     

       11
       11
       +
       -

     

       12
       12
       +
            def _nautilus_run(self, menu, path):

     

       13
       13
       +
                """'Open with BlackBox 's menu item callback."""

     

       14
       14
       +
                print("Openning:", path)

     

       15
       15
       +
       -        args = None

     

       16
       16
       +
       -        if self.is_native():

     

       17
       17
       +
       -            args = args = ["blackbox", "-w", path]

     

       18
       18
       +
       -        else:

     

       19
       19
       +
       -            args = ["/usr/bin/flatpak", "run", TERMINAL_NAME, "-w", path]

     

       20
       20
       +
       +        args = ["blackbox", "-w", path]

     

       21
       21
       +
        

     

       22
       22
       +
                subprocess.Popen(args, cwd=path)

     

       23
       23
       +

+3 -3

pkgs/by-name/or/orchard/package.nix

···

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "orchard";

     

       5
       5
       -
         version = "0.14.3";

     

       5
       5
       +
         version = "0.15.0";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "cirruslabs";

     

       9
       9
        
           repo = pname;

     

       10
       10
        
           rev = version;

     

       11
       11
       -
           hash = "sha256-hQP48druIwkVVKeC1TKq+DEGOJOmkendc3Ij9ft+uDQ=";

     

       11
       11
       +
           hash = "sha256-9hxfRiZ3V65wvh8n1SGeTzNdjdoEfRtyFOv4+f/u+O8=";

     

       12
       12
        
           # populate values that require us to use git. By doing this in postFetch we

     

       13
       13
        
           # can delete .git afterwards and maintain better reproducibility of the src.

     

       14
       14
        
           leaveDotGit = true;

     
···

       19
       19
        
           '';

     

       20
       20
        
         };

     

       21
       21
        
       

     

       22
       22
       -
         vendorHash = "sha256-opPxsCukXcLcrf/sD9AW1iIYOK5BmTLnc/QGUvzVLwg=";

     

       22
       22
       +
         vendorHash = "sha256-LBvd8qah+v0y3dHadSs69/y6pr8TyZ0nDJgHR+8qlEo=";

     

       23
       23
        
       

     

       24
       24
        
         nativeBuildInputs = [ installShellFiles ];

     

       25
       25

+2 -2

pkgs/by-name/pa/passes/package.nix

···

       17
       17
        
       

     

       18
       18
        
       stdenv.mkDerivation (finalAttrs: {

     

       19
       19
        
         pname = "passes";

     

       20
       20
       -
         version = "0.8";

     

       20
       20
       +
         version = "0.9";

     

       21
       21
        
       

     

       22
       22
        
         src = fetchFromGitHub {

     

       23
       23
        
           owner = "pablo-s";

     

       24
       24
        
           repo = "passes";

     

       25
       25
        
           rev = "v${finalAttrs.version}";

     

       26
       26
       -
           hash = "sha256-SIJLBVWyW9+Hzb6ebfUnBfUuvNmYBm9ojKrnFOS3BGc=";

     

       26
       26
       +
           hash = "sha256-RfoqIyqc9zwrWZ5RLhQl+6vTccbCTwtDcMlnWPCDOag=";

     

       27
       27
        
         };

     

       28
       28
        
       

     

       29
       29
        
         postPatch = ''

+14

pkgs/by-name/tu/tuxclocker-nvidia-plugin/no-cpu-plugin.patch

···

       1
       1
       +
       diff --git a/src/plugins/meson.build b/src/plugins/meson.build

     

       2
       2
       +
       index cdd3b5b..a5a2174 100644

     

       3
       3
       +
       --- a/src/plugins/meson.build

     

       4
       4
       +
       +++ b/src/plugins/meson.build

     

       5
       5
       +
       @@ -63,9 +63,3 @@ if all_nvidia_linux_libs

     

       6
       6
       +
        		install : true,

     

       7
       7
       +
        		link_with : libtuxclocker)

     

       8
       8
       +
        endif

     

       9
       9
       +
       -

     

       10
       10
       +
       -shared_library('cpu', 'CPU.cpp', 'Utils.cpp',

     

       11
       11
       +
       -        include_directories : [incdir, fplus_inc],

     

       12
       12
       +
       -        install_dir : get_option('libdir') / 'tuxclocker' / 'plugins',

     

       13
       13
       +
       -        install : true,

     

       14
       14
       +
       -        link_with : libtuxclocker)

+34

pkgs/by-name/tu/tuxclocker-nvidia-plugin/package.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , stdenv

     

       3
       3
       +
       , boost

     

       4
       4
       +
       , libX11

     

       5
       5
       +
       , libXext

     

       6
       6
       +
       , linuxPackages

     

       7
       7
       +
       , openssl

     

       8
       8
       +
       , tuxclocker-plugins

     

       9
       9
       +
       }:

     

       10
       10
       +
       

     

       11
       11
       +
       stdenv.mkDerivation {

     

       12
       12
       +
         pname = "tuxclocker-nvidia-plugin";

     

       13
       13
       +
       

     

       14
       14
       +
         inherit (tuxclocker-plugins) src version meta BOOST_INCLUDEDIR BOOST_LIBRARYDIR nativeBuildInputs;

     

       15
       15
       +
       

     

       16
       16
       +
         buildInputs = [

     

       17
       17
       +
           boost

     

       18
       18
       +
           libX11

     

       19
       19
       +
           libXext

     

       20
       20
       +
           linuxPackages.nvidia_x11

     

       21
       21
       +
           linuxPackages.nvidia_x11.settings.libXNVCtrl

     

       22
       22
       +
           openssl

     

       23
       23
       +
         ];

     

       24
       24
       +
       

     

       25
       25
       +
         # Build doesn't have a way to disable building the CPU plugin, which is already

     

       26
       26
       +
         # provided by 'tuxclocker-plugins'

     

       27
       27
       +
         patches = [ ./no-cpu-plugin.patch ];

     

       28
       28
       +
       

     

       29
       29
       +
         mesonFlags = [

     

       30
       30
       +
           "-Ddaemon=false"

     

       31
       31
       +
           "-Dgui=false"

     

       32
       32
       +
           "-Drequire-nvidia=true"

     

       33
       33
       +
         ];

     

       34
       34
       +
       }

+16

pkgs/by-name/tu/tuxclocker-plugins-with-unfree/package.nix

···

       1
       1
       +
       { symlinkJoin

     

       2
       2
       +
       , tuxclocker-nvidia-plugin

     

       3
       3
       +
       , tuxclocker-plugins

     

       4
       4
       +
       }:

     

       5
       5
       +
       

     

       6
       6
       +
       symlinkJoin rec {

     

       7
       7
       +
         inherit (tuxclocker-plugins) version meta;

     

       8
       8
       +
       

     

       9
       9
       +
         pname = "tuxclocker-plugins-with-unfree";

     

       10
       10
       +
         name = "${pname}-${version}";

     

       11
       11
       +
       

     

       12
       12
       +
         paths = [

     

       13
       13
       +
           tuxclocker-nvidia-plugin

     

       14
       14
       +
           tuxclocker-plugins

     

       15
       15
       +
         ];

     

       16
       16
       +
       }

+42

pkgs/by-name/tu/tuxclocker-plugins/package.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , stdenv

     

       3
       3
       +
       , boost

     

       4
       4
       +
       , cmake

     

       5
       5
       +
       , gettext

     

       6
       6
       +
       , git

     

       7
       7
       +
       , libdrm

     

       8
       8
       +
       , meson

     

       9
       9
       +
       , ninja

     

       10
       10
       +
       , openssl

     

       11
       11
       +
       , pkg-config

     

       12
       12
       +
       , python3

     

       13
       13
       +
       , tuxclocker

     

       14
       14
       +
       }:

     

       15
       15
       +
       

     

       16
       16
       +
       stdenv.mkDerivation {

     

       17
       17
       +
         inherit (tuxclocker) src version meta BOOST_INCLUDEDIR BOOST_LIBRARYDIR;

     

       18
       18
       +
       

     

       19
       19
       +
         pname = "tuxclocker-plugins";

     

       20
       20
       +
       

     

       21
       21
       +
         nativeBuildInputs = [

     

       22
       22
       +
           gettext

     

       23
       23
       +
           git

     

       24
       24
       +
           meson

     

       25
       25
       +
           ninja

     

       26
       26
       +
           pkg-config

     

       27
       27
       +
           (python3.withPackages(p: [ p.hwdata ]))

     

       28
       28
       +
         ];

     

       29
       29
       +
       

     

       30
       30
       +
         buildInputs = [

     

       31
       31
       +
           boost

     

       32
       32
       +
           libdrm

     

       33
       33
       +
           openssl

     

       34
       34
       +
         ];

     

       35
       35
       +
       

     

       36
       36
       +
         mesonFlags = [

     

       37
       37
       +
           "-Ddaemon=false"

     

       38
       38
       +
           "-Dgui=false"

     

       39
       39
       +
           "-Drequire-amd=true"

     

       40
       40
       +
           "-Drequire-python-hwdata=true"

     

       41
       41
       +
         ];

     

       42
       42
       +
       }

+4 -4

pkgs/by-name/ui/uiua/package.nix

···

       14
       14
        
       

     

       15
       15
        
       rustPlatform.buildRustPackage rec {

     

       16
       16
        
         pname = "uiua";

     

       17
       17
       -
         version = "0.6.1";

     

       17
       17
       +
         version = "0.7.0";

     

       18
       18
        
       

     

       19
       19
        
         src = fetchFromGitHub {

     

       20
       20
        
           owner = "uiua-lang";

     

       21
       21
        
           repo = "uiua";

     

       22
       22
        
           rev = version;

     

       23
       23
       -
           hash = "sha256-/yeLsuwEKw6+jBKd7CAnR9RuVaKwXjVpcvO3v0FaAck=";

     

       23
       23
       +
           hash = "sha256-QQgwUXWro2CQjUsVuaZghNUPwSm1kNr5YgLL3SMgCPw=";

     

       24
       24
        
         };

     

       25
       25
        
       

     

       26
       26
       -
         cargoHash = "sha256-4tR1n96s91EFZLO4RIBpNKLjOSbGrBIApJrS60RBuQQ=";

     

       26
       26
       +
         cargoHash = "sha256-DaKIzadivG6KGXUVP8LbHhjExY87xwsGESqiWANJxjw=";

     

       27
       27
        
       

     

       28
       28
        
         nativeBuildInputs = lib.optionals stdenv.isDarwin [

     

       29
       29
        
           rustPlatform.bindgenHook

     
···

       48
       48
        
         '';

     

       49
       49
        
       

     

       50
       50
        
         meta = {

     

       51
       51
       -
           changelog = "https://github.com/uiua-lang/uiua/releases/tag/${src.rev}";

     

       51
       51
       +
           changelog = "https://github.com/uiua-lang/uiua/blob/${src.rev}/changelog.md";

     

       52
       52
        
           description = "A stack-oriented array programming language with a focus on simplicity, beauty, and tacit code";

     

       53
       53
        
           longDescription = ''

     

       54
       54
        
             Uiua combines the stack-oriented and array-oriented paradigms in a single

+28

pkgs/by-name/zb/zbus-xmlgen/package.nix

···

       1
       1
       +
       { lib, rustPlatform, fetchCrate, makeBinaryWrapper, rustfmt }:

     

       2
       2
       +
       

     

       3
       3
       +
       rustPlatform.buildRustPackage rec {

     

       4
       4
       +
         pname = "zbus_xmlgen";

     

       5
       5
       +
         version = "3.1.1";

     

       6
       6
       +
       

     

       7
       7
       +
         src = fetchCrate {

     

       8
       8
       +
           inherit pname version;

     

       9
       9
       +
           hash = "sha256-vaefyfasOLFFYWPjSJFgjIFkvnRiJVe/GLYUQxUYlt0=";

     

       10
       10
       +
         };

     

       11
       11
       +
       

     

       12
       12
       +
         cargoHash = "sha256-WXJ49X4B2aNy1zPbTllIzRhZJvF+RwfQ0Hhm/D+LQfk=";

     

       13
       13
       +
       

     

       14
       14
       +
         nativeBuildInputs = [ makeBinaryWrapper ];

     

       15
       15
       +
       

     

       16
       16
       +
         postInstall = ''

     

       17
       17
       +
           wrapProgram $out/bin/zbus-xmlgen \

     

       18
       18
       +
               --prefix PATH : ${lib.makeBinPath [ rustfmt ]}

     

       19
       19
       +
         '';

     

       20
       20
       +
       

     

       21
       21
       +
         meta = with lib; {

     

       22
       22
       +
           homepage = "https://crates.io/crates/zbus_xmlgen";

     

       23
       23
       +
           description = "D-Bus XML interface Rust code generator";

     

       24
       24
       +
           mainProgram = "zbus-xmlgen";

     

       25
       25
       +
           maintainers = with maintainers; [ qyliss ];

     

       26
       26
       +
           license = licenses.mit;

     

       27
       27
       +
         };

     

       28
       28
       +
       }

+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.11.11";

     

       5
       5
       +
         version = "23.12.10";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "numixproject";

     

       9
       9
        
           repo = pname;

     

       10
       10
        
           rev = version;

     

       11
       11
       -
           sha256 = "sha256-sIC5GYROj53vrMRdKKEHprGP+jHZqgz2lbPPFIVuj74=";

     

       11
       11
       +
           sha256 = "sha256-DZmjSMJ1I+Ir/Hz/fmsw36dFSp5S3YF024nJLb/Xxig=";

     

       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.11.11";

     

       5
       5
       +
         version = "23.12.10";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "numixproject";

     

       9
       9
        
           repo = pname;

     

       10
       10
        
           rev = version;

     

       11
       11
       -
           sha256 = "sha256-yu9ufr1l21l6v8bRXLJcVkpBD0fDIlgePbStTLH+CDc=";

     

       11
       11
       +
           sha256 = "sha256-kNO0YHHapoIKAosGvCMUEhjP6FkD/CRNhrv5D3dxgoI=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         nativeBuildInputs = [ gtk3 ];

+2 -2

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

···

       11
       11
        
       

     

       12
       12
        
       stdenvNoCC.mkDerivation rec {

     

       13
       13
        
         pname = "numix-icon-theme";

     

       14
       14
       -
         version = "23.11.20";

     

       14
       14
       +
         version = "23.12.02";

     

       15
       15
        
       

     

       16
       16
        
         src = fetchFromGitHub {

     

       17
       17
        
           owner = "numixproject";

     

       18
       18
        
           repo = pname;

     

       19
       19
        
           rev = version;

     

       20
       20
       -
           sha256 = "sha256-jH3bzwyiDRovrH8GyJhwMJRHM5du8ek4leKnFSO8vAo=";

     

       20
       20
       +
           sha256 = "sha256-ks2JJROSYzeDqq7i6Y4iJAB994ZRcDOGGRcCL3Dt1zI=";

     

       21
       21
        
         };

     

       22
       22
        
       

     

       23
       23
        
         nativeBuildInputs = [

+2

pkgs/desktops/lomiri/default.nix

···

       18
       18
        
           gmenuharness = callPackage ./development/gmenuharness { };

     

       19
       19
        
           libusermetrics = callPackage ./development/libusermetrics { };

     

       20
       20
        
           lomiri-api = callPackage ./development/lomiri-api { };

     

       21
       21
       +
           trust-store = callPackage ./development/trust-store { };

     

       21
       22
        
           u1db-qt = callPackage ./development/u1db-qt { };

     

       22
       23
        
       

     

       23
       24
        
           #### QML / QML-related

     
···

       28
       29
        
           biometryd = callPackage ./services/biometryd { };

     

       29
       30
        
           hfd-service = callPackage ./services/hfd-service { };

     

       30
       31
        
           lomiri-app-launch = callPackage ./development/lomiri-app-launch { };

     

       32
       32
       +
           mediascanner2 = callPackage ./services/mediascanner2 { };

     

       31
       33
        
         };

     

       32
       34
        
       in

     

       33
       35
        
         lib.makeScope libsForQt5.newScope packages

+119

pkgs/desktops/lomiri/development/trust-store/default.nix

···

       1
       1
       +
       { stdenv

     

       2
       2
       +
       , lib

     

       3
       3
       +
       , fetchFromGitLab

     

       4
       4
       +
       , testers

     

       5
       5
       +
       , boost

     

       6
       6
       +
       , cmake

     

       7
       7
       +
       , cmake-extras

     

       8
       8
       +
       , dbus

     

       9
       9
       +
       , dbus-cpp

     

       10
       10
       +
       , doxygen

     

       11
       11
       +
       , gettext

     

       12
       12
       +
       , glog

     

       13
       13
       +
       , graphviz

     

       14
       14
       +
       , gtest

     

       15
       15
       +
       , libapparmor

     

       16
       16
       +
       , newt

     

       17
       17
       +
       , pkg-config

     

       18
       18
       +
       , process-cpp

     

       19
       19
       +
       , properties-cpp

     

       20
       20
       +
       , qtbase

     

       21
       21
       +
       , qtdeclarative

     

       22
       22
       +
       }:

     

       23
       23
       +
       

     

       24
       24
       +
       stdenv.mkDerivation (finalAttrs: {

     

       25
       25
       +
         pname = "trust-store";

     

       26
       26
       +
         version = "unstable-2023-10-17";

     

       27
       27
       +
       

     

       28
       28
       +
         src = fetchFromGitLab {

     

       29
       29
       +
           owner = "ubports";

     

       30
       30
       +
           repo = "development/core/trust-store";

     

       31
       31
       +
           rev = "7aa7ab5b7f3843e24c13ae6d9b8607455296d60e";

     

       32
       32
       +
           hash = "sha256-j+4FZzbG3qh1pGRapFuuMiwT4Lv9P6Ji9/3Z0uGvXmw=";

     

       33
       33
       +
         };

     

       34
       34
       +
       

     

       35
       35
       +
         outputs = [

     

       36
       36
       +
           "out"

     

       37
       37
       +
           "dev"

     

       38
       38
       +
           "doc"

     

       39
       39
       +
           "bin"

     

       40
       40
       +
         ];

     

       41
       41
       +
       

     

       42
       42
       +
         postPatch = ''

     

       43
       43
       +
           # pkg-config patching hook expects prefix variable

     

       44
       44
       +
           substituteInPlace data/trust-store.pc.in \

     

       45
       45
       +
             --replace 'includedir=''${exec_prefix}' 'includedir=''${prefix}'

     

       46
       46
       +
       

     

       47
       47
       +
           substituteInPlace src/core/trust/terminal_agent.h \

     

       48
       48
       +
             --replace '/bin/whiptail' '${lib.getExe' newt "whiptail"}'

     

       49
       49
       +
         '' + lib.optionalString (!finalAttrs.doCheck) ''

     

       50
       50
       +
           sed -i CMakeLists.txt -e '/add_subdirectory(tests)/d'

     

       51
       51
       +
         '';

     

       52
       52
       +
       

     

       53
       53
       +
         strictDeps = true;

     

       54
       54
       +
       

     

       55
       55
       +
         nativeBuildInputs = [

     

       56
       56
       +
           cmake

     

       57
       57
       +
           doxygen

     

       58
       58
       +
           gettext

     

       59
       59
       +
           graphviz

     

       60
       60
       +
           pkg-config

     

       61
       61
       +
         ];

     

       62
       62
       +
       

     

       63
       63
       +
         buildInputs = [

     

       64
       64
       +
           boost

     

       65
       65
       +
           cmake-extras

     

       66
       66
       +
           dbus-cpp

     

       67
       67
       +
           glog

     

       68
       68
       +
           libapparmor

     

       69
       69
       +
           newt

     

       70
       70
       +
           process-cpp

     

       71
       71
       +
           properties-cpp

     

       72
       72
       +
           qtbase

     

       73
       73
       +
           qtdeclarative

     

       74
       74
       +
         ];

     

       75
       75
       +
       

     

       76
       76
       +
         nativeCheckInputs = [

     

       77
       77
       +
           dbus

     

       78
       78
       +
         ];

     

       79
       79
       +
       

     

       80
       80
       +
         checkInputs = [

     

       81
       81
       +
           gtest

     

       82
       82
       +
         ];

     

       83
       83
       +
       

     

       84
       84
       +
         dontWrapQtApps = true;

     

       85
       85
       +
       

     

       86
       86
       +
         cmakeFlags = [

     

       87
       87
       +
           # Requires mirclient API, unavailable in Mir 2.x

     

       88
       88
       +
           # https://gitlab.com/ubports/development/core/trust-store/-/issues/2

     

       89
       89
       +
           "-DTRUST_STORE_MIR_AGENT_ENABLED=OFF"

     

       90
       90
       +
           "-DTRUST_STORE_ENABLE_DOC_GENERATION=ON"

     

       91
       91
       +
         ];

     

       92
       92
       +
       

     

       93
       93
       +
         # Not working

     

       94
       94
       +
         # - remote_agent_test cases using unix domain socket fail to do *something*, with std::system_error "Invalid argument" + follow-up "No such file or directory".

     

       95
       95
       +
         #   potentially something broken/missing on our end

     

       96
       96
       +
         # - dbus_test hangs indefinitely waiting for a std::future, not provicient enough to debug this.

     

       97
       97
       +
         #   same hang on upstream CI

     

       98
       98
       +
         doCheck = false;

     

       99
       99
       +
       

     

       100
       100
       +
         preCheck = ''

     

       101
       101
       +
           export XDG_DATA_HOME=$TMPDIR

     

       102
       102
       +
         '';

     

       103
       103
       +
       

     

       104
       104
       +
         # Starts & talks to DBus

     

       105
       105
       +
         enableParallelChecking = false;

     

       106
       106
       +
       

     

       107
       107
       +
         passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;

     

       108
       108
       +
       

     

       109
       109
       +
         meta = with lib; {

     

       110
       110
       +
           description = "Common implementation of a trust store to be used by trusted helpers";

     

       111
       111
       +
           homepage = "https://gitlab.com/ubports/development/core/trust-store";

     

       112
       112
       +
           license = licenses.lgpl3Only;

     

       113
       113
       +
           maintainers = teams.lomiri.members;

     

       114
       114
       +
           platforms = platforms.linux;

     

       115
       115
       +
           pkgConfigModules = [

     

       116
       116
       +
             "trust-store"

     

       117
       117
       +
           ];

     

       118
       118
       +
         };

     

       119
       119
       +
       })

+122

pkgs/desktops/lomiri/services/mediascanner2/default.nix

···

       1
       1
       +
       { stdenv

     

       2
       2
       +
       , lib

     

       3
       3
       +
       , fetchFromGitLab

     

       4
       4
       +
       , gitUpdater

     

       5
       5
       +
       , testers

     

       6
       6
       +
       , boost

     

       7
       7
       +
       , cmake

     

       8
       8
       +
       , cmake-extras

     

       9
       9
       +
       , dbus

     

       10
       10
       +
       , dbus-cpp

     

       11
       11
       +
       , gdk-pixbuf

     

       12
       12
       +
       , glib

     

       13
       13
       +
       , gst_all_1

     

       14
       14
       +
       , gtest

     

       15
       15
       +
       , libapparmor

     

       16
       16
       +
       , libexif

     

       17
       17
       +
       , pkg-config

     

       18
       18
       +
       , properties-cpp

     

       19
       19
       +
       , qtbase

     

       20
       20
       +
       , qtdeclarative

     

       21
       21
       +
       , shared-mime-info

     

       22
       22
       +
       , sqlite

     

       23
       23
       +
       , taglib

     

       24
       24
       +
       , udisks

     

       25
       25
       +
       , wrapQtAppsHook

     

       26
       26
       +
       }:

     

       27
       27
       +
       

     

       28
       28
       +
       stdenv.mkDerivation (finalAttrs: {

     

       29
       29
       +
         pname = "mediascanner2";

     

       30
       30
       +
         version = "0.115";

     

       31
       31
       +
       

     

       32
       32
       +
         src = fetchFromGitLab {

     

       33
       33
       +
           owner = "ubports";

     

       34
       34
       +
           repo = "development/core/mediascanner2";

     

       35
       35
       +
           rev = finalAttrs.version;

     

       36
       36
       +
           hash = "sha256-UEwFe65VB2asxQhuWGEAVow/9rEvZxry4dd2/60fXN4=";

     

       37
       37
       +
         };

     

       38
       38
       +
       

     

       39
       39
       +
         outputs = [

     

       40
       40
       +
           "out"

     

       41
       41
       +
           "dev"

     

       42
       42
       +
         ];

     

       43
       43
       +
       

     

       44
       44
       +
         postPatch = ''

     

       45
       45
       +
           substituteInPlace src/qml/MediaScanner.*/CMakeLists.txt \

     

       46
       46
       +
             --replace "\''${CMAKE_INSTALL_LIBDIR}/qt5/qml" "\''${CMAKE_INSTALL_PREFIX}/${qtbase.qtQmlPrefix}"

     

       47
       47
       +
       

     

       48
       48
       +
           # Lomiri desktop doesn't identify itself under Canonical's name anymore

     

       49
       49
       +
           substituteInPlace src/daemon/scannerdaemon.cc \

     

       50
       50
       +
             --replace 'Unity8' 'Lomiri'

     

       51
       51
       +
         '';

     

       52
       52
       +
       

     

       53
       53
       +
         strictDeps = true;

     

       54
       54
       +
       

     

       55
       55
       +
         nativeBuildInputs = [

     

       56
       56
       +
           cmake

     

       57
       57
       +
           gst_all_1.gstreamer # GST_PLUGIN_SYSTEM_PATH_1_0 setup hook

     

       58
       58
       +
           pkg-config

     

       59
       59
       +
           wrapQtAppsHook

     

       60
       60
       +
         ];

     

       61
       61
       +
       

     

       62
       62
       +
         buildInputs = [

     

       63
       63
       +
           boost

     

       64
       64
       +
           cmake-extras

     

       65
       65
       +
           dbus

     

       66
       66
       +
           dbus-cpp

     

       67
       67
       +
           gdk-pixbuf

     

       68
       68
       +
           glib

     

       69
       69
       +
           libapparmor

     

       70
       70
       +
           libexif

     

       71
       71
       +
           properties-cpp

     

       72
       72
       +
           qtbase

     

       73
       73
       +
           qtdeclarative

     

       74
       74
       +
           shared-mime-info

     

       75
       75
       +
           sqlite

     

       76
       76
       +
           taglib

     

       77
       77
       +
           udisks

     

       78
       78
       +
         ] ++ (with gst_all_1; [

     

       79
       79
       +
           gstreamer

     

       80
       80
       +
           gst-plugins-base

     

       81
       81
       +
           gst-plugins-good

     

       82
       82
       +
         ]);

     

       83
       83
       +
       

     

       84
       84
       +
         checkInputs = [

     

       85
       85
       +
           gtest

     

       86
       86
       +
         ];

     

       87
       87
       +
       

     

       88
       88
       +
         cmakeFlags = [

     

       89
       89
       +
           "-DENABLE_TESTS=${lib.boolToString finalAttrs.doCheck}"

     

       90
       90
       +
         ];

     

       91
       91
       +
       

     

       92
       92
       +
         doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;

     

       93
       93
       +
       

     

       94
       94
       +
         preCheck = ''

     

       95
       95
       +
           export QT_PLUGIN_PATH=${lib.getBin qtbase}/${qtbase.qtPluginPrefix}

     

       96
       96
       +
           export XDG_DATA_DIRS=${shared-mime-info}/share:$XDG_DATA_DIRS

     

       97
       97
       +
         '';

     

       98
       98
       +
       

     

       99
       99
       +
         preFixup = ''

     

       100
       100
       +
           qtWrapperArgs+=(

     

       101
       101
       +
             --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0"

     

       102
       102
       +
             --prefix XDG_DATA_DIRS : ${shared-mime-info}/share

     

       103
       103
       +
           )

     

       104
       104
       +
         '';

     

       105
       105
       +
       

     

       106
       106
       +
         passthru = {

     

       107
       107
       +
           tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;

     

       108
       108
       +
           updateScript = gitUpdater { };

     

       109
       109
       +
         };

     

       110
       110
       +
       

     

       111
       111
       +
         meta = with lib; {

     

       112
       112
       +
           description = "Media scanner service & access library";

     

       113
       113
       +
           homepage = "https://gitlab.com/ubports/development/core/mediascanner2";

     

       114
       114
       +
           license = licenses.gpl3Only;

     

       115
       115
       +
           maintainers = teams.lomiri.members;

     

       116
       116
       +
           mainProgram = "mediascanner-service-2.0";

     

       117
       117
       +
           platforms = platforms.linux;

     

       118
       118
       +
           pkgConfigModules = [

     

       119
       119
       +
             "mediascanner-2.0"

     

       120
       120
       +
           ];

     

       121
       121
       +
         };

     

       122
       122
       +
       })

+2 -2

pkgs/development/compilers/mlkit/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "mlkit";

     

       5
       5
       -
         version = "4.7.5";

     

       5
       5
       +
         version = "4.7.7";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "melsman";

     

       9
       9
        
           repo = "mlkit";

     

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

     

       11
       11
       -
           sha256 = "sha256-LAlJCAF8nyXVUlkOEdcoxq5bZn1bd7dqwx6PxOxJRsM=";

     

       11
       11
       +
           sha256 = "sha256-XwyZpv80keMhwPm/kvhwrMQg04E8IFjt0UMl9Ocxtyc=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         nativeBuildInputs = [ autoreconfHook mlton ];

+2 -2

pkgs/development/libraries/libzim/default.nix

···

       13
       13
        
       

     

       14
       14
        
       stdenv.mkDerivation rec {

     

       15
       15
        
         pname = "libzim";

     

       16
       16
       -
         version = "9.0.0";

     

       16
       16
       +
         version = "9.1.0";

     

       17
       17
        
       

     

       18
       18
        
         src = fetchFromGitHub {

     

       19
       19
        
           owner = "openzim";

     

       20
       20
        
           repo = pname;

     

       21
       21
        
           rev = "refs/tags/${version}";

     

       22
       22
       -
           hash = "sha256-K1S2MiugUeqCfPq0Oclmghb9064xrsKgUEVjFCJHt0U=";

     

       22
       22
       +
           hash = "sha256-yWnW/+CaQwbemrNLzvQpXw5yvW2Q6LtwDgvA58+fVUs=";

     

       23
       23
        
         };

     

       24
       24
        
       

     

       25
       25
        
         nativeBuildInputs = [

+2 -2

pkgs/development/libraries/nanoflann/default.nix

···

       6
       6
        
       }:

     

       7
       7
        
       

     

       8
       8
        
       stdenv.mkDerivation (finalAttrs: {

     

       9
       9
       -
         version = "1.5.1";

     

       9
       9
       +
         version = "1.5.3";

     

       10
       10
        
         pname = "nanoflann";

     

       11
       11
        
       

     

       12
       12
        
         src = fetchFromGitHub {

     

       13
       13
        
           owner = "jlblancoc";

     

       14
       14
        
           repo = "nanoflann";

     

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

     

       16
       16
       -
           hash = "sha256-ozFYqEq6PSe1C6Lc13Szxt8+sUTTlbXrmMgb8cvX04I=";

     

       16
       16
       +
           hash = "sha256-cTi3Q+SUSNQkSgi2K7nPqfqEQFMkbchbn2+pE2ol9xQ=";

     

       17
       17
        
         };

     

       18
       18
        
       

     

       19
       19
        
         nativeBuildInputs = [ cmake ];

+2 -2

pkgs/development/libraries/nghttp3/default.nix

···

       6
       6
        
       

     

       7
       7
        
       stdenv.mkDerivation rec {

     

       8
       8
        
         pname = "nghttp3";

     

       9
       9
       -
         version = "1.0.0";

     

       9
       9
       +
         version = "1.1.0";

     

       10
       10
        
       

     

       11
       11
        
         src = fetchFromGitHub {

     

       12
       12
        
           owner = "ngtcp2";

     

       13
       13
        
           repo = pname;

     

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

     

       15
       15
       -
           hash = "sha256-mw0zI7528lvEZlv+/KuST7PWjuu37p/+EGGsjIEto2Q=";

     

       15
       15
       +
           hash = "sha256-B/5r0mRpOEi5DQ7OUAAcDmAm1nnak6qNz4qjDrzWlDc=";

     

       16
       16
        
         };

     

       17
       17
        
       

     

       18
       18
        
         outputs = [ "out" "dev" "doc" ];

+2 -2

pkgs/development/libraries/ngtcp2/default.nix

···

       8
       8
        
       

     

       9
       9
        
       stdenv.mkDerivation rec {

     

       10
       10
        
         pname = "ngtcp2";

     

       11
       11
       -
         version = "1.0.0";

     

       11
       11
       +
         version = "1.1.0";

     

       12
       12
        
       

     

       13
       13
        
         src = fetchFromGitHub {

     

       14
       14
        
           owner = "ngtcp2";

     

       15
       15
        
           repo = pname;

     

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

     

       17
       17
       -
           hash = "sha256-dnYIRcNGTIzETu2OjTJa0IWB1+xttdGFKRBmMkTwrXk=";

     

       17
       17
       +
           hash = "sha256-z6lvtfO5XL/bZgbE+Sak+32QzjEhAdOnkpIO731h+bk=";

     

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
        
         outputs = [ "out" "dev" "doc" ];

+2 -10

pkgs/development/libraries/utf8cpp/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "utf8cpp";

     

       5
       5
       -
         version = "3.2.5";

     

       5
       5
       +
         version = "4.0.3";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "nemtrif";

     

       9
       9
        
           repo = "utfcpp";

     

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

     

       11
       11
        
           fetchSubmodules = true;

     

       12
       12
       -
           sha256 = "sha256-cWiGggn2GP25K/8eopvnFPq6iwcBteNI3i9Lo1Sr+ig=";

     

       12
       12
       +
           hash = "sha256-oUr476HMBYzX64x28Kcudw0B1BVqLUPVVdRzRe82AOc=";

     

       13
       13
        
         };

     

       14
       14
        
       

     

       15
       15
       -
         cmakeFlags = [

     

       16
       16
       -
           "-DCMAKE_INSTALL_LIBDIR=lib"

     

       17
       17
       -
         ];

     

       18
       18
       -
       

     

       19
       15
        
         nativeBuildInputs = [ cmake ];

     

       20
       20
       -
       

     

       21
       21
       -
         # Tests fail on darwin, probably due to a bug in the test framework:

     

       22
       22
       -
         # https://github.com/nemtrif/utfcpp/issues/84

     

       23
       23
       -
         doCheck = !stdenv.isDarwin;

     

       24
       16
        
       

     

       25
       17
        
         meta = with lib; {

     

       26
       18
        
           homepage = "https://github.com/nemtrif/utfcpp";

+1

pkgs/development/lua-modules/aliases.nix

···

       42
       42
        
         lpty = throw "lpy was removed because broken and unmaintained "; # added 2023-10-14

     

       43
       43
        
         cyrussasl = throw "cyrussasl was removed because broken and unmaintained "; # added 2023-10-18

     

       44
       44
        
         nlua-nvim = throw "nlua-nvim was removed, use neodev-nvim instead"; # added 2023-12-16

     

       45
       45
       +
         nvim-client = throw "nvim-client was removed because it is now part of neovim"; # added 2023-12-17

     

       45
       46
        
       }

-20

pkgs/development/lua-modules/generated-packages.nix

···

       2784
       2784
        
         };

     

       2785
       2785
        
       }) {};

     

       2786
       2786
        
       

     

       2787
       2787
       -
       nvim-client = callPackage({ buildLuarocksPackage, coxpcall, fetchurl, lua, luaOlder, luv, mpack }:

     

       2788
       2788
       -
       buildLuarocksPackage {

     

       2789
       2789
       -
         pname = "nvim-client";

     

       2790
       2790
       -
         version = "0.2.4-1";

     

       2791
       2791
       -
       

     

       2792
       2792
       -
         src = fetchurl {

     

       2793
       2793
       -
           url    = "https://github.com/neovim/lua-client/archive/0.2.4-1.tar.gz";

     

       2794
       2794
       -
           sha256 = "0sk1lmj0r7pyj9k3p6n0wqjbd95br44ansz0ck3amp6ql8f9kprf";

     

       2795
       2795
       -
         };

     

       2796
       2796
       -
       

     

       2797
       2797
       -
         disabled = (luaOlder "5.1");

     

       2798
       2798
       -
         propagatedBuildInputs = [ coxpcall lua luv mpack ];

     

       2799
       2799
       -
       

     

       2800
       2800
       -
         meta = {

     

       2801
       2801
       -
           homepage = "https://github.com/neovim/lua-client";

     

       2802
       2802
       -
           description = "Lua client to Nvim";

     

       2803
       2803
       -
           license.fullName = "Apache";

     

       2804
       2804
       -
         };

     

       2805
       2805
       -
       }) {};

     

       2806
       2806
       -
       

     

       2807
       2787
        
       nvim-cmp = callPackage({ buildLuarocksPackage, fetchgit, lua, luaAtLeast, luaOlder }:

     

       2808
       2788
        
       buildLuarocksPackage {

     

       2809
       2789
        
         pname = "nvim-cmp";

+24 -13

pkgs/development/mobile/androidenv/emulate-app.nix

···

       1
       1
        
       { composeAndroidPackages, stdenv, lib, runtimeShell }:

     

       2
       2
       -
       { name, app ? null

     

       2
       2
       +
       { name

     

       3
       3
       +
       , app ? null

     

       3
       4
        
       , platformVersion ? "33"

     

       4
       5
        
       , abiVersion ? "armeabi-v7a"

     

       5
       6
        
       , systemImageType ? "default"

     

       6
       6
       -
       , enableGPU ? false

     

       7
       7
       -
       , extraAVDFiles ? []

     

       7
       7
       +
       , enableGPU ? false # Enable GPU acceleration. It's deprecated, instead use `configOptions` below.

     

       8
       8
       +
       , configOptions ? (

     

       9
       9
       +
           # List of options to add in config.ini

     

       10
       10
       +
           lib.optionalAttrs enableGPU

     

       11
       11
       +
             (lib.warn

     

       12
       12
       +
               "enableGPU argument is deprecated and will be removed; use configOptions instead"

     

       13
       13
       +
               { "hw.gpu.enabled" = "yes"; }

     

       14
       14
       +
             )

     

       15
       15
       +
         )

     

       16
       16
       +
       , extraAVDFiles ? [ ]

     

       8
       17
        
       , package ? null

     

       9
       18
        
       , activity ? null

     

       10
       19
        
       , androidUserHome ? null

     

       11
       20
        
       , avdHomeDir ? null # Support old variable with non-standard naming!

     

       12
       21
        
       , androidAvdHome ? avdHomeDir

     

       13
       13
       -
       , sdkExtraArgs ? {}

     

       22
       22
       +
       , deviceName ? "device"

     

       23
       23
       +
       , sdkExtraArgs ? { }

     

       14
       24
        
       , androidAvdFlags ? null

     

       15
       25
        
       , androidEmulatorFlags ? null

     

       16
       26
        
       }:

     
···

       99
       109
        
           export ANDROID_SERIAL="emulator-$port"

     

       100
       110
        
       

     

       101
       111
        
           # Create a virtual android device for testing if it does not exist

     

       102
       102
       -
           if [ "$(${sdk}/bin/avdmanager list avd | grep 'Name: device')" = "" ]

     

       112
       112
       +
           if [ "$(${sdk}/bin/avdmanager list avd | grep 'Name: ${deviceName}')" = "" ]

     

       103
       113
        
           then

     

       104
       114
        
               # Create a virtual android device

     

       105
       105
       -
               yes "" | ${sdk}/bin/avdmanager create avd --force -n device -k "system-images;android-${platformVersion};${systemImageType};${abiVersion}" -p $ANDROID_AVD_HOME $NIX_ANDROID_AVD_FLAGS

     

       115
       115
       +
               yes "" | ${sdk}/bin/avdmanager create avd --force -n ${deviceName} -k "system-images;android-${platformVersion};${systemImageType};${abiVersion}" -p $ANDROID_AVD_HOME/${deviceName}.avd $NIX_ANDROID_AVD_FLAGS

     

       106
       116
        
       

     

       107
       107
       -
               ${lib.optionalString enableGPU ''

     

       108
       108
       -
                 # Enable GPU acceleration

     

       109
       109
       -
                 echo "hw.gpu.enabled=yes" >> $ANDROID_AVD_HOME/device.avd/config.ini

     

       110
       110
       -
               ''}

     

       117
       117
       +
               ${builtins.concatStringsSep "\n" (

     

       118
       118
       +
                 lib.mapAttrsToList (configKey: configValue: ''

     

       119
       119
       +
                   echo "${configKey} = ${configValue}" >> $ANDROID_AVD_HOME/${deviceName}.avd/config.ini

     

       120
       120
       +
                 '') configOptions

     

       121
       121
       +
               )}

     

       111
       122
        
       

     

       112
       123
        
               ${lib.concatMapStrings (extraAVDFile: ''

     

       113
       113
       -
                 ln -sf ${extraAVDFile} $ANDROID_AVD_HOME/device.avd

     

       124
       124
       +
                 ln -sf ${extraAVDFile} $ANDROID_AVD_HOME/${deviceName}.avd

     

       114
       125
        
               '') extraAVDFiles}

     

       115
       126
        
           fi

     

       116
       127
        
       

     

       117
       128
        
           # Launch the emulator

     

       118
       129
        
           echo "\nLaunch the emulator"

     

       119
       119
       -
           $ANDROID_SDK_ROOT/emulator/emulator -avd device -no-boot-anim -port $port $NIX_ANDROID_EMULATOR_FLAGS &

     

       130
       130
       +
           $ANDROID_SDK_ROOT/emulator/emulator -avd ${deviceName} -no-boot-anim -port $port $NIX_ANDROID_EMULATOR_FLAGS &

     

       120
       131
        
       

     

       121
       132
        
           # Wait until the device has completely booted

     

       122
       122
       -
           echo "Waiting until the emulator has booted the device and the package manager is ready..." >&2

     

       133
       133
       +
           echo "Waiting until the emulator has booted the ${deviceName} and the package manager is ready..." >&2

     

       123
       134
        
       

     

       124
       135
        
           ${sdk}/libexec/android-sdk/platform-tools/adb -s emulator-$port wait-for-device

     

       125
       136

+1

pkgs/development/mobile/androidenv/examples/shell-with-emulator.nix

···

       78
       78
        
         androidComposition = androidEnv.composeAndroidPackages sdkArgs;

     

       79
       79
        
         androidEmulator = androidEnv.emulateApp {

     

       80
       80
        
           name = "android-sdk-emulator-demo";

     

       81
       81
       +
           configOptions = { "hw.keyboard" = "yes"; };

     

       81
       82
        
           sdkExtraArgs = sdkArgs;

     

       82
       83
        
         };

     

       83
       84
        
         androidSdk = androidComposition.androidsdk;

+2 -2

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

···

       7
       7
        
       

     

       8
       8
        
       buildPythonPackage rec {

     

       9
       9
        
         pname = "bitarray";

     

       10
       10
       -
         version = "2.8.3";

     

       10
       10
       +
         version = "2.8.5";

     

       11
       11
        
         format = "setuptools";

     

       12
       12
        
       

     

       13
       13
        
         disabled = pythonOlder "3.7";

     

       14
       14
        
       

     

       15
       15
        
         src = fetchPypi {

     

       16
       16
        
           inherit pname version;

     

       17
       17
       -
           hash = "sha256-4VWHsr3xjTLrO6JfX1pRvt0NwGsxEqTFPated1O8ZYg=";

     

       17
       17
       +
           hash = "sha256-t1ZP0hjMRHn38BBtNB4Jb3iQe0eGWu7/cCyAffGSfAE=";

     

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
        
         checkPhase = ''

+66

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

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , buildPythonPackage

     

       3
       3
       +
       , fetchFromGitHub

     

       4
       4
       +
       , setuptools

     

       5
       5
       +
       , wheel

     

       6
       6
       +
       

     

       7
       7
       +
       , psycopg

     

       8
       8
       +
       , aiosqlite

     

       9
       9
       +
       , asyncmy

     

       10
       10
       +
       

     

       11
       11
       +
       # test

     

       12
       12
       +
       , pytest-asyncio

     

       13
       13
       +
       

     

       14
       14
       +
       , pytestCheckHook

     

       15
       15
       +
       }:

     

       16
       16
       +
       

     

       17
       17
       +
       buildPythonPackage rec {

     

       18
       18
       +
         pname = "mayim";

     

       19
       19
       +
         version = "1.1.0";

     

       20
       20
       +
         pyproject = true;

     

       21
       21
       +
       

     

       22
       22
       +
         src = fetchFromGitHub {

     

       23
       23
       +
           owner = "ahopkins";

     

       24
       24
       +
           repo = "mayim";

     

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

     

       26
       26
       +
           hash = "sha256-nb0E9kMEJUihaCp8RnqGh0nSyDQo50eL1C4K5lBPlPQ=";

     

       27
       27
       +
         };

     

       28
       28
       +
       

     

       29
       29
       +
         nativeBuildInputs = [

     

       30
       30
       +
           setuptools

     

       31
       31
       +
           wheel

     

       32
       32
       +
         ];

     

       33
       33
       +
       

     

       34
       34
       +
         postPatch = ''

     

       35
       35
       +
           substituteInPlace pyproject.toml \

     

       36
       36
       +
             --replace "--cov=src --cov-append --cov-report term-missing" ""

     

       37
       37
       +
         '';

     

       38
       38
       +
       

     

       39
       39
       +
         passthru.optional-dependencies = {

     

       40
       40
       +
           postgres = [

     

       41
       41
       +
             psycopg

     

       42
       42
       +
           ] ++ psycopg.optional-dependencies.pool;

     

       43
       43
       +
           mysql = [

     

       44
       44
       +
             asyncmy

     

       45
       45
       +
           ];

     

       46
       46
       +
           sqlite = [

     

       47
       47
       +
             aiosqlite

     

       48
       48
       +
           ];

     

       49
       49
       +
         };

     

       50
       50
       +
       

     

       51
       51
       +
         nativeCheckInputs = [

     

       52
       52
       +
           pytestCheckHook

     

       53
       53
       +
           pytest-asyncio

     

       54
       54
       +
         ] ++ (with passthru.optional-dependencies; [postgres mysql sqlite]);

     

       55
       55
       +
       

     

       56
       56
       +
         pythonImportsCheck = [

     

       57
       57
       +
           "mayim"

     

       58
       58
       +
         ];

     

       59
       59
       +
       

     

       60
       60
       +
         meta = with lib; {

     

       61
       61
       +
           description = "Asynchronous SQL hydrator";

     

       62
       62
       +
           homepage = "https://github.com/ahopkins/mayim";

     

       63
       63
       +
           license = licenses.mit;

     

       64
       64
       +
           maintainers = with maintainers; [ huyngo ];

     

       65
       65
       +
         };

     

       66
       66
       +
       }

+6 -7

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

···

       14
       14
        
       

     

       15
       15
        
       buildPythonPackage rec {

     

       16
       16
        
         pname = "mujoco";

     

       17
       17
       -
         version = "3.0.1";

     

       17
       17
       +
         version = "3.1.0";

     

       18
       18
        
       

     

       19
       19
        
         pyproject = true;

     

       20
       20
        
       

     
···

       24
       24
        
         # in the project's CI.

     

       25
       25
        
         src = fetchPypi {

     

       26
       26
        
           inherit pname version;

     

       27
       27
       -
           hash = "sha256-pftecOk4q19qKBHs9hBBVenI+SgJg9VT7vc6NKuiY0s=";

     

       27
       27
       +
           hash = "sha256-rZNVihIuvNJnQWqA5tV9DG5r3/LttWNW6fN2js+fDb8=";

     

       28
       28
        
         };

     

       29
       29
        
       

     

       30
       30
        
         nativeBuildInputs = [ cmake setuptools ];

     
···

       36
       36
        
       

     

       37
       37
        
         env.MUJOCO_PATH = "${mujoco}";

     

       38
       38
        
         env.MUJOCO_PLUGIN_PATH = "${mujoco}/lib";

     

       39
       39
       -
         env.MUJOCO_CMAKE_ARGS = "-DMUJOCO_SIMULATE_USE_SYSTEM_GLFW=ON";

     

       39
       39
       +
         env.MUJOCO_CMAKE_ARGS = lib.concatStringsSep " " [

     

       40
       40
       +
           "-DMUJOCO_SIMULATE_USE_SYSTEM_GLFW=ON"

     

       41
       41
       +
           "-DMUJOCO_PYTHON_USE_SYSTEM_PYBIND11=ON"

     

       42
       42
       +
         ];

     

       40
       43
        
       

     

       41
       44
        
         preConfigure =

     

       42
       42
       -
           # Use system packages for pybind

     

       43
       43
       -
           ''

     

       44
       44
       -
             ${perl}/bin/perl -0777 -i -pe "s/(findorfetch\(.{3}USE_SYSTEM_PACKAGE.{3})(OFF)(.{3}PACKAGE_NAME.{3}pybind11.*\))/\1ON\3/gms" mujoco/CMakeLists.txt

     

       45
       45
       -
           '' +

     

       46
       45
        
           # Use non-system eigen3, lodepng, abseil: Remove mirror info and prefill

     

       47
       46
        
           # dependency directory. $build from setuptools.

     

       48
       47
        
           (let

+2 -2

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

···

       8
       8
        
       

     

       9
       9
        
       buildPythonPackage rec {

     

       10
       10
        
         pname = "pglast";

     

       11
       11
       -
         version = "5.5";

     

       11
       11
       +
         version = "5.6";

     

       12
       12
        
         format = "setuptools";

     

       13
       13
        
       

     

       14
       14
        
         disabled = pythonOlder "3.7";

     

       15
       15
        
       

     

       16
       16
        
         src = fetchPypi {

     

       17
       17
        
           inherit pname version;

     

       18
       18
       -
           hash = "sha256-yz6Q+Vt7ZuT9NaxuQQA+BH7U6Efaim7No6GJmnOQo1o=";

     

       18
       18
       +
           hash = "sha256-WHFc8rXzdcRrp1U6tAuepQYagFYo8+0WQr8783w/Ql8=";

     

       19
       19
        
         };

     

       20
       20
        
       

     

       21
       21
        
         propagatedBuildInputs = [

+3 -3

pkgs/development/tools/kubedock/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "kubedock";

     

       5
       5
       -
         version = "0.14.1";

     

       5
       5
       +
         version = "0.15.0";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "joyrex2001";

     

       9
       9
        
           repo = "kubedock";

     

       10
       10
        
           rev = version;

     

       11
       11
       -
           hash = "sha256-xjt/RqvkOHTSTZwNgxmlUeYndPW9jwUE1knLyNXDxaE=";

     

       11
       11
       +
           hash = "sha256-UCoQm/lg8QRwsK2riJyHmCLg+Ash8Pg+6Va1RVemdt0=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         vendorHash = "sha256-4X4v40c4J5SPwj53Zk+j+A9k0RkHGwqz128E+FnLr1c=";

     

       14
       14
       +
         vendorHash = "sha256-mkzj+8c1MJgPHohSjSj7OW+xoYvI9Qoj3cXJ1iRDeWc=";

     

       15
       15
        
       

     

       16
       16
        
         # config.Build not defined as it would break r-ryantm

     

       17
       17
        
         ldflags = [

+43 -37

pkgs/development/tools/language-servers/millet/Cargo.lock

···

       28
       28
        
       

     

       29
       29
        
       [[package]]

     

       30
       30
        
       name = "analysis"

     

       31
       31
       -
       version = "0.14.0"

     

       31
       31
       +
       version = "0.14.2"

     

       32
       32
        
       dependencies = [

     

       33
       33
        
        "config",

     

       34
       34
        
        "diagnostic",

     
···

       118
       118
        
       

     

       119
       119
        
       [[package]]

     

       120
       120
        
       name = "chain-map"

     

       121
       121
       -
       version = "0.14.0"

     

       121
       121
       +
       version = "0.14.2"

     

       122
       122
        
       dependencies = [

     

       123
       123
        
        "fast-hash",

     

       124
       124
        
        "str-util",

     
···

       131
       131
        
       

     

       132
       132
        
       [[package]]

     

       133
       133
        
       name = "cm-syntax"

     

       134
       134
       -
       version = "0.14.0"

     

       134
       134
       +
       version = "0.14.2"

     

       135
       135
        
       dependencies = [

     

       136
       136
        
        "lex-util",

     

       137
       137
        
        "paths",

     
···

       161
       161
        
       

     

       162
       162
        
       [[package]]

     

       163
       163
        
       name = "config"

     

       164
       164
       -
       version = "0.14.0"

     

       164
       164
       +
       version = "0.14.2"

     

       165
       165
        
       dependencies = [

     

       166
       166
        
        "fast-hash",

     

       167
       167
        
        "serde",

     
···

       189
       189
        
       

     

       190
       190
        
       [[package]]

     

       191
       191
        
       name = "cov-mark"

     

       192
       192
       -
       version = "0.14.0"

     

       192
       192
       +
       version = "0.14.2"

     

       193
       193
        
       dependencies = [

     

       194
       194
        
        "fast-hash",

     

       195
       195
        
        "once_cell",

     
···

       417
       417
        
       

     

       418
       418
        
       [[package]]

     

       419
       419
        
       name = "input"

     

       420
       420
       -
       version = "0.14.0"

     

       420
       420
       +
       version = "0.14.2"

     

       421
       421
        
       dependencies = [

     

       422
       422
        
        "cm-syntax",

     

       423
       423
        
        "config",

     
···

       466
       466
        
       

     

       467
       467
        
       [[package]]

     

       468
       468
        
       name = "lang-srv"

     

       469
       469
       -
       version = "0.14.0"

     

       469
       469
       +
       version = "0.14.2"

     

       470
       470
        
       dependencies = [

     

       471
       471
        
        "analysis",

     

       472
       472
        
        "anyhow",

     
···

       494
       494
        
       

     

       495
       495
        
       [[package]]

     

       496
       496
        
       name = "lex-util"

     

       497
       497
       -
       version = "0.14.0"

     

       497
       497
       +
       version = "0.14.2"

     

       498
       498
        
       

     

       499
       499
        
       [[package]]

     

       500
       500
        
       name = "libc"

     
···

       566
       566
        
       

     

       567
       567
        
       [[package]]

     

       568
       568
        
       name = "millet-cli"

     

       569
       569
       -
       version = "0.14.0"

     

       569
       569
       +
       version = "0.14.2"

     

       570
       570
        
       dependencies = [

     

       571
       571
        
        "analysis",

     

       572
       572
        
        "codespan-reporting",

     
···

       584
       584
        
       

     

       585
       585
        
       [[package]]

     

       586
       586
        
       name = "millet-ls"

     

       587
       587
       -
       version = "0.14.0"

     

       587
       587
       +
       version = "0.14.2"

     

       588
       588
        
       dependencies = [

     

       589
       589
        
        "anyhow",

     

       590
       590
        
        "env_logger",

     
···

       604
       604
        
       

     

       605
       605
        
       [[package]]

     

       606
       606
        
       name = "mlb-hir"

     

       607
       607
       -
       version = "0.14.0"

     

       607
       607
       +
       version = "0.14.2"

     

       608
       608
        
       dependencies = [

     

       609
       609
        
        "fast-hash",

     

       610
       610
        
        "paths",

     
···

       616
       616
        
       

     

       617
       617
        
       [[package]]

     

       618
       618
        
       name = "mlb-statics"

     

       619
       619
       -
       version = "0.14.0"

     

       619
       619
       +
       version = "0.14.2"

     

       620
       620
        
       dependencies = [

     

       621
       621
        
        "config",

     

       622
       622
        
        "diagnostic",

     
···

       641
       641
        
       

     

       642
       642
        
       [[package]]

     

       643
       643
        
       name = "mlb-syntax"

     

       644
       644
       -
       version = "0.14.0"

     

       644
       644
       +
       version = "0.14.2"

     

       645
       645
        
       dependencies = [

     

       646
       646
        
        "lex-util",

     

       647
       647
        
        "paths",

     
···

       705
       705
        
       

     

       706
       706
        
       [[package]]

     

       707
       707
        
       name = "panic-hook"

     

       708
       708
       -
       version = "0.14.0"

     

       708
       708
       +
       version = "0.14.2"

     

       709
       709
        
       dependencies = [

     

       710
       710
        
        "better-panic",

     

       711
       711
        
       ]

     
···

       928
       928
        
       

     

       929
       929
        
       [[package]]

     

       930
       930
        
       name = "slash-var-path"

     

       931
       931
       -
       version = "0.14.0"

     

       931
       931
       +
       version = "0.14.2"

     

       932
       932
        
       dependencies = [

     

       933
       933
        
        "fast-hash",

     

       934
       934
        
        "str-util",

     
···

       936
       936
        
       

     

       937
       937
        
       [[package]]

     

       938
       938
        
       name = "sml-comment"

     

       939
       939
       -
       version = "0.14.0"

     

       939
       939
       +
       version = "0.14.2"

     

       940
       940
        
       dependencies = [

     

       941
       941
        
        "sml-syntax",

     

       942
       942
        
       ]

     

       943
       943
        
       

     

       944
       944
        
       [[package]]

     

       945
       945
        
       name = "sml-dynamics"

     

       946
       946
       -
       version = "0.14.0"

     

       946
       946
       +
       version = "0.14.2"

     

       947
       947
        
       dependencies = [

     

       948
       948
        
        "fast-hash",

     

       949
       949
        
        "fmt-util",

     
···

       954
       954
        
       

     

       955
       955
        
       [[package]]

     

       956
       956
        
       name = "sml-dynamics-tests"

     

       957
       957
       -
       version = "0.14.0"

     

       957
       957
       +
       version = "0.14.2"

     

       958
       958
        
       dependencies = [

     

       959
       959
        
        "config",

     

       960
       960
        
        "pretty_assertions",

     
···

       971
       971
        
       

     

       972
       972
        
       [[package]]

     

       973
       973
        
       name = "sml-file"

     

       974
       974
       -
       version = "0.14.0"

     

       974
       974
       +
       version = "0.14.2"

     

       975
       975
        
       

     

       976
       976
        
       [[package]]

     

       977
       977
        
       name = "sml-file-syntax"

     

       978
       978
       -
       version = "0.14.0"

     

       978
       978
       +
       version = "0.14.2"

     

       979
       979
        
       dependencies = [

     

       980
       980
        
        "config",

     

       981
       981
        
        "elapsed",

     
···

       990
       990
        
       

     

       991
       991
        
       [[package]]

     

       992
       992
        
       name = "sml-fixity"

     

       993
       993
       -
       version = "0.14.0"

     

       993
       993
       +
       version = "0.14.2"

     

       994
       994
        
       dependencies = [

     

       995
       995
        
        "fast-hash",

     

       996
       996
        
        "once_cell",

     
···

       999
       999
        
       

     

       1000
       1000
        
       [[package]]

     

       1001
       1001
        
       name = "sml-hir"

     

       1002
       1002
       -
       version = "0.14.0"

     

       1002
       1002
       +
       version = "0.14.2"

     

       1003
       1003
        
       dependencies = [

     

       1004
       1004
        
        "la-arena",

     

       1005
       1005
        
        "sml-lab",

     
···

       1010
       1010
        
       

     

       1011
       1011
        
       [[package]]

     

       1012
       1012
        
       name = "sml-hir-lower"

     

       1013
       1013
       -
       version = "0.14.0"

     

       1013
       1013
       +
       version = "0.14.2"

     

       1014
       1014
        
       dependencies = [

     

       1015
       1015
        
        "config",

     

       1016
       1016
        
        "cov-mark",

     
···

       1022
       1022
        
        "sml-path",

     

       1023
       1023
        
        "sml-syntax",

     

       1024
       1024
        
        "str-util",

     

       1025
       1025
       +
        "text-size-util",

     

       1025
       1026
        
       ]

     

       1026
       1027
        
       

     

       1027
       1028
        
       [[package]]

     

       1028
       1029
        
       name = "sml-lab"

     

       1029
       1029
       -
       version = "0.14.0"

     

       1030
       1030
       +
       version = "0.14.2"

     

       1030
       1031
        
       dependencies = [

     

       1031
       1032
        
        "str-util",

     

       1032
       1033
        
       ]

     

       1033
       1034
        
       

     

       1034
       1035
        
       [[package]]

     

       1035
       1036
        
       name = "sml-lex"

     

       1036
       1036
       -
       version = "0.14.0"

     

       1037
       1037
       +
       version = "0.14.2"

     

       1037
       1038
        
       dependencies = [

     

       1038
       1039
        
        "cov-mark",

     

       1039
       1040
        
        "diagnostic",

     

       1040
       1041
        
        "lex-util",

     

       1041
       1042
        
        "sml-syntax",

     

       1043
       1043
       +
        "text-size-util",

     

       1044
       1044
       +
        "token",

     

       1042
       1045
        
       ]

     

       1043
       1046
        
       

     

       1044
       1047
        
       [[package]]

     
···

       1048
       1051
        
       

     

       1049
       1052
        
       [[package]]

     

       1050
       1053
        
       name = "sml-naive-fmt"

     

       1051
       1051
       -
       version = "0.14.0"

     

       1054
       1054
       +
       version = "0.14.2"

     

       1052
       1055
        
       dependencies = [

     

       1053
       1056
        
        "fast-hash",

     

       1054
       1057
        
        "sml-comment",

     

       1055
       1058
        
        "sml-syntax",

     

       1059
       1059
       +
        "text-size-util",

     

       1056
       1060
        
       ]

     

       1057
       1061
        
       

     

       1058
       1062
        
       [[package]]

     

       1059
       1063
        
       name = "sml-namespace"

     

       1060
       1060
       -
       version = "0.14.0"

     

       1064
       1064
       +
       version = "0.14.2"

     

       1061
       1065
        
       

     

       1062
       1066
        
       [[package]]

     

       1063
       1067
        
       name = "sml-parse"

     

       1064
       1064
       -
       version = "0.14.0"

     

       1068
       1068
       +
       version = "0.14.2"

     

       1065
       1069
        
       dependencies = [

     

       1066
       1070
        
        "diagnostic",

     

       1067
       1071
        
        "event-parse",

     
···

       1069
       1073
        
        "sml-fixity",

     

       1070
       1074
        
        "sml-syntax",

     

       1071
       1075
        
        "str-util",

     

       1076
       1076
       +
        "text-size-util",

     

       1077
       1077
       +
        "token",

     

       1072
       1078
        
       ]

     

       1073
       1079
        
       

     

       1074
       1080
        
       [[package]]

     

       1075
       1081
        
       name = "sml-path"

     

       1076
       1076
       -
       version = "0.14.0"

     

       1082
       1082
       +
       version = "0.14.2"

     

       1077
       1083
        
       dependencies = [

     

       1078
       1084
        
        "str-util",

     

       1079
       1085
        
       ]

     

       1080
       1086
        
       

     

       1081
       1087
        
       [[package]]

     

       1082
       1088
        
       name = "sml-scon"

     

       1083
       1083
       -
       version = "0.14.0"

     

       1089
       1089
       +
       version = "0.14.2"

     

       1084
       1090
        
       dependencies = [

     

       1085
       1091
        
        "num-bigint",

     

       1086
       1092
        
        "num-traits",

     
···

       1089
       1095
        
       

     

       1090
       1096
        
       [[package]]

     

       1091
       1097
        
       name = "sml-statics"

     

       1092
       1092
       -
       version = "0.14.0"

     

       1098
       1098
       +
       version = "0.14.2"

     

       1093
       1099
        
       dependencies = [

     

       1094
       1100
        
        "chain-map",

     

       1095
       1101
        
        "config",

     
···

       1112
       1118
        
       

     

       1113
       1119
        
       [[package]]

     

       1114
       1120
        
       name = "sml-statics-types"

     

       1115
       1115
       -
       version = "0.14.0"

     

       1121
       1121
       +
       version = "0.14.2"

     

       1116
       1122
        
       dependencies = [

     

       1117
       1123
        
        "chain-map",

     

       1118
       1124
        
        "code-h2-md-map",

     
···

       1131
       1137
        
       

     

       1132
       1138
        
       [[package]]

     

       1133
       1139
        
       name = "sml-symbol-kind"

     

       1134
       1134
       -
       version = "0.14.0"

     

       1140
       1140
       +
       version = "0.14.2"

     

       1135
       1141
        
       dependencies = [

     

       1136
       1142
        
        "sml-namespace",

     

       1137
       1143
        
        "sml-statics-types",

     
···

       1139
       1145
        
       

     

       1140
       1146
        
       [[package]]

     

       1141
       1147
        
       name = "sml-syntax"

     

       1142
       1142
       -
       version = "0.14.0"

     

       1148
       1148
       +
       version = "0.14.2"

     

       1143
       1149
        
       dependencies = [

     

       1144
       1150
        
        "code-h2-md-map",

     

       1145
       1151
        
        "fast-hash",

     
···

       1150
       1156
        
       

     

       1151
       1157
        
       [[package]]

     

       1152
       1158
        
       name = "sml-ty-var-scope"

     

       1153
       1153
       -
       version = "0.14.0"

     

       1159
       1159
       +
       version = "0.14.2"

     

       1154
       1160
        
       dependencies = [

     

       1155
       1161
        
        "fast-hash",

     

       1156
       1162
        
        "sml-hir",

     
···

       1223
       1229
        
       

     

       1224
       1230
        
       [[package]]

     

       1225
       1231
        
       name = "tests"

     

       1226
       1226
       -
       version = "0.14.0"

     

       1232
       1232
       +
       version = "0.14.2"

     

       1227
       1233
        
       dependencies = [

     

       1228
       1234
        
        "analysis",

     

       1229
       1235
        
        "cm-syntax",

     
···

       1634
       1640
        
       

     

       1635
       1641
        
       [[package]]

     

       1636
       1642
        
       name = "xtask"

     

       1637
       1637
       -
       version = "0.14.0"

     

       1643
       1643
       +
       version = "0.14.2"

     

       1638
       1644
        
       dependencies = [

     

       1639
       1645
        
        "anyhow",

     

       1640
       1646
        
        "flate2",

+2 -2

pkgs/development/tools/language-servers/millet/default.nix

···

       2
       2
        
       

     

       3
       3
        
       rustPlatform.buildRustPackage rec {

     

       4
       4
        
         pname = "millet";

     

       5
       5
       -
         version = "0.14.0";

     

       5
       5
       +
         version = "0.14.2";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "azdavis";

     

       9
       9
        
           repo = pname;

     

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

     

       11
       11
       -
           hash = "sha256-dTYnJofXzpkfXfS4RoJHqXEMlPKW5w1z+X39rL+VoQE=";

     

       11
       11
       +
           hash = "sha256-UtdkflM9ftmSVQI4CF0PAlLlbQ9l0EHF5SzJL4sU08Q=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         cargoLock = {

+3 -3

pkgs/development/tools/language-servers/neocmakelsp/default.nix

···

       5
       5
        
       

     

       6
       6
        
       rustPlatform.buildRustPackage rec {

     

       7
       7
        
         pname = "neocmakelsp";

     

       8
       8
       -
         version = "0.6.11";

     

       8
       8
       +
         version = "0.6.17";

     

       9
       9
        
       

     

       10
       10
        
         src = fetchFromGitHub {

     

       11
       11
        
           owner = "Decodetalkers";

     

       12
       12
        
           repo = "neocmakelsp";

     

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

     

       14
       14
       -
           hash = "sha256-ZLZGPigZSrW2C909Kc8t0U3+5sWRGkhT820fl+k37x4=";

     

       14
       14
       +
           hash = "sha256-0Rc5oPm6BAjPmoRHUO3gVivbQt2p2y62VbT5NIzHtpI=";

     

       15
       15
        
         };

     

       16
       16
        
       

     

       17
       17
       -
         cargoHash = "sha256-dONoaLX2nlnJIjnRPSgQ5oHWqWw632nSpoWUOiU0w58=";

     

       17
       17
       +
         cargoHash = "sha256-7ifdmW9JBjz0jxpltn5gFa60oNsB4daA6cXCLnBne7o=";

     

       18
       18
        
       

     

       19
       19
        
         meta = with lib; {

     

       20
       20
        
           description = "A cmake lsp based on tower-lsp and treesitter";

+2 -2

pkgs/development/tools/misc/saleae-logic-2/default.nix

···

       1
       1
        
       { lib, fetchurl, makeDesktopItem, appimageTools }:

     

       2
       2
        
       let

     

       3
       3
        
         name = "saleae-logic-2";

     

       4
       4
       -
         version = "2.4.12";

     

       4
       4
       +
         version = "2.4.13";

     

       5
       5
        
         src = fetchurl {

     

       6
       6
        
           url = "https://downloads.saleae.com/logic2/Logic-${version}-linux-x64.AppImage";

     

       7
       7
       -
           hash = "sha256-QqGtozLZtrS5UgnLmsKWxqbcTykLhlossVxuN4WNYzo=";

     

       7
       7
       +
           hash = "sha256-0GIZQKQDY3arDUlxjQKWOHDB3j76xVwkx5H+8q+d0Rc=";

     

       8
       8
        
         };

     

       9
       9
        
         desktopItem = makeDesktopItem {

     

       10
       10
        
           inherit name;

+2 -2

pkgs/development/tools/mod/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "mod";

     

       5
       5
       -
         version = "0.7.0";

     

       5
       5
       +
         version = "0.7.1";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "marwan-at-work";

     

       9
       9
        
           repo = "mod";

     

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

     

       11
       11
       -
           sha256 = "sha256-ZFAjiTCmx9o/rUa1vK1Fmz6sE695zzlexTyWJO05M6k=";

     

       11
       11
       +
           sha256 = "sha256-QkLARUN/NiN0D6VEhosdFJSce6DP+sWRWFwAEocZaOQ=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         vendorHash = "sha256-5A4W99wcuXMWH0s+uykBWuKCxo8wr3GbTpUKj+Ql0os=";

+12 -2

pkgs/development/tools/parsing/antlr/4.nix

···

       15
       15
        
         mkAntlr = {

     

       16
       16
        
           version, sourceSha256, jarSha256,

     

       17
       17
        
           extraCppBuildInputs ? [],

     

       18
       18
       -
           extraCppCmakeFlags ? []

     

       18
       18
       +
           extraCppCmakeFlags ? [],

     

       19
       19
       +
           extraPatches ? [ ]

     

       19
       20
        
         }: rec {

     

       20
       21
        
           source = fetchFromGitHub {

     

       21
       22
        
             owner = "antlr";

     
···

       81
       82
        
               pname = "antlr-runtime-cpp";

     

       82
       83
        
               inherit version;

     

       83
       84
        
               src = source;

     

       84
       84
       -
               sourceRoot = "${source.name}/runtime/Cpp";

     

       85
       85
       +
       

     

       86
       86
       +
               patches = extraPatches;

     

       85
       87
        
       

     

       86
       88
        
               outputs = [ "out" "dev" "doc" ];

     

       87
       89
        
       

     
···

       90
       92
        
                 lib.optional stdenv.isDarwin CoreFoundation ++

     

       91
       93
        
                 extraCppBuildInputs;

     

       92
       94
        
       

     

       95
       95
       +
               cmakeDir = "../runtime/Cpp";

     

       96
       96
       +
       

     

       93
       97
        
               cmakeFlags = extraCppCmakeFlags;

     

       94
       98
        
       

     

       95
       99
        
               meta = with lib; {

     
···

       162
       166
        
           jarSha256 = "0dnz2x54kigc58bxnynjhmr5iq49f938vj6p50gdir1xdna41kdg";

     

       163
       167
        
           extraCppBuildInputs = [ utf8cpp ]

     

       164
       168
        
             ++ lib.optional stdenv.isLinux libuuid;

     

       169
       169
       +
           extraCppCmakeFlags = [

     

       170
       170
       +
             "-DCMAKE_CXX_FLAGS='-I${lib.getDev utf8cpp}/include/utf8cpp'"

     

       171
       171
       +
           ];

     

       172
       172
       +
           extraPatches = [

     

       173
       173
       +
             ./utf8cpp.patch

     

       174
       174
       +
           ];

     

       165
       175
        
         }).antlr;

     

       166
       176
        
       

     

       167
       177
        
         antlr4_8 = (mkAntlr {

+15

pkgs/development/tools/parsing/antlr/utf8cpp.patch

···

       1
       1
       +
       diff --git a/runtime/Cpp/runtime/CMakeLists.txt b/runtime/Cpp/runtime/CMakeLists.txt

     

       2
       2
       +
       index c8b16c6cf..e8da7960d 100644

     

       3
       3
       +
       --- a/runtime/Cpp/runtime/CMakeLists.txt

     

       4
       4
       +
       +++ b/runtime/Cpp/runtime/CMakeLists.txt

     

       5
       5
       +
       @@ -40,8 +40,8 @@ find_package(utf8cpp QUIET)

     

       6
       6
       +
        set(INSTALL_utf8cpp FALSE)

     

       7
       7
       +
        

     

       8
       8
       +
        if (utf8cpp_FOUND)

     

       9
       9
       +
       -  target_link_libraries(antlr4_shared utf8cpp)

     

       10
       10
       +
       -  target_link_libraries(antlr4_static utf8cpp)

     

       11
       11
       +
       +  target_link_libraries(antlr4_shared utf8cpp::utf8cpp)

     

       12
       12
       +
       +  target_link_libraries(antlr4_static utf8cpp::utf8cpp)

     

       13
       13
       +
        else()

     

       14
       14
       +
        

     

       15
       15
       +
          # older utf8cpp doesn't define the package above

+3 -3

pkgs/development/tools/rust/cargo-hack/default.nix

···

       2
       2
        
       

     

       3
       3
        
       rustPlatform.buildRustPackage rec {

     

       4
       4
        
         pname = "cargo-hack";

     

       5
       5
       -
         version = "0.6.14";

     

       5
       5
       +
         version = "0.6.15";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchCrate {

     

       8
       8
        
           inherit pname version;

     

       9
       9
       -
           hash = "sha256-RWYCESNNrB4eZGHGbbXAZJ+NhrRY5rImoAG7OFRPHZ0=";

     

       9
       9
       +
           hash = "sha256-yjaX4lqUj9aZPkRuiJC3yBwXvfvd+Okr87Ia2IQvxfM=";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
       -
         cargoHash = "sha256-YRNIFNiFPK7/RgdUSDA+UPJ9wooyqi32+pzshW+ajSU=";

     

       12
       12
       +
         cargoHash = "sha256-6ogeqVN2V38N7mNBjimjNv/KK2JtV4aa5AorRfYMBx8=";

     

       13
       13
        
       

     

       14
       14
        
         # some necessary files are absent in the crate version

     

       15
       15
        
         doCheck = false;

+5 -5

pkgs/development/web/bun/default.nix

···

       12
       12
        
       }:

     

       13
       13
        
       

     

       14
       14
        
       stdenvNoCC.mkDerivation rec {

     

       15
       15
       -
         version = "1.0.17";

     

       15
       15
       +
         version = "1.0.18";

     

       16
       16
        
         pname = "bun";

     

       17
       17
        
       

     

       18
       18
        
         src = passthru.sources.${stdenvNoCC.hostPlatform.system} or (throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}");

     
···

       51
       51
        
           sources = {

     

       52
       52
        
             "aarch64-darwin" = fetchurl {

     

       53
       53
        
               url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-aarch64.zip";

     

       54
       54
       -
               hash = "sha256-0zZJ3GYYwJOv3/CmvUHYI1GdJXf3/7ujGpEf+dn/tlI=";

     

       54
       54
       +
               hash = "sha256-z3C6V8jG/et+CizWHHx6zN56JBe4QBhEKbDQgx67dmc=";

     

       55
       55
        
             };

     

       56
       56
        
             "aarch64-linux" = fetchurl {

     

       57
       57
        
               url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-aarch64.zip";

     

       58
       58
       -
               hash = "sha256-lscEZki4sMHFAeZJwBTksdBUXOmZ6EEu1YFoedBr5bs=";

     

       58
       58
       +
               hash = "sha256-xnFN1Kiaerot6ieMqf5fvyq826vE4KpM57r/7wz4C7o=";

     

       59
       59
        
             };

     

       60
       60
        
             "x86_64-darwin" = fetchurl {

     

       61
       61
        
               url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-x64.zip";

     

       62
       62
       -
               hash = "sha256-wY0d8JiBtfSZ8xQQjhwdSs4PPtjZp7JnxQf9cSp2T3Q=";

     

       62
       62
       +
               hash = "sha256-cNfTiMSdeCINchtRtAA1Lv4vVmrxwhLQNUe+96UFYp4=";

     

       63
       63
        
             };

     

       64
       64
        
             "x86_64-linux" = fetchurl {

     

       65
       65
        
               url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-x64.zip";

     

       66
       66
       -
               hash = "sha256-JvzOC/2JxA7K7J0+2l+Bq0FVSrt7llZNE/wkM58nMXY=";

     

       66
       66
       +
               hash = "sha256-qwqgaU3zYiuer4tI4JiSsZd94IO6xn+dSjJZkM70WP4=";

     

       67
       67
        
             };

     

       68
       68
        
           };

     

       69
       69
        
           updateScript = writeShellScript "update-bun" ''

+11 -2

pkgs/games/vvvvvv/default.nix

···

       26
       26
        
           rev = version;

     

       27
       27
        
           sha256 = "sha256-sLNO4vkmlirsqJmCV9YWpyNnIiigU1KMls7rOgWgSmQ=";

     

       28
       28
        
         };

     

       29
       29
       -
         sourceRoot = "${src.name}/desktop_version";

     

       29
       29
       +
       

     

       30
       30
       +
         patches = [

     

       31
       31
       +
           ./utf8cpp.patch

     

       32
       32
       +
         ];

     

       33
       33
       +
       

     

       30
       34
        
         dataZip = fetchurl {

     

       31
       35
        
           url = "https://thelettervsixtim.es/makeandplay/data.zip";

     

       32
       36
        
           name = "data.zip";

     
···

       51
       55
        
         # Help CMake find SDL_mixer.h

     

       52
       56
        
         env.NIX_CFLAGS_COMPILE = "-I${lib.getDev SDL2_mixer}/include/SDL2";

     

       53
       57
        
       

     

       54
       54
       -
         cmakeFlags = [ "-DBUNDLE_DEPENDENCIES=OFF" ] ++ lib.optional makeAndPlay "-DMAKEANDPLAY=ON";

     

       58
       58
       +
         cmakeDir = "../desktop_version";

     

       59
       59
       +
       

     

       60
       60
       +
         cmakeFlags = [

     

       61
       61
       +
           "-DBUNDLE_DEPENDENCIES=OFF"

     

       62
       62
       +
           "-DCMAKE_CXX_FLAGS='-I${lib.getDev utf8cpp}/include/utf8cpp'"

     

       63
       63
       +
         ] ++ lib.optional makeAndPlay "-DMAKEANDPLAY=ON";

     

       55
       64
        
       

     

       56
       65
        
         desktopItems = [

     

       57
       66
        
           (makeDesktopItem {

+13

pkgs/games/vvvvvv/utf8cpp.patch

···

       1
       1
       +
       diff --git a/desktop_version/CMakeLists.txt b/desktop_version/CMakeLists.txt

     

       2
       2
       +
       index 7405c122..68ba40e3 100644

     

       3
       3
       +
       --- a/desktop_version/CMakeLists.txt

     

       4
       4
       +
       +++ b/desktop_version/CMakeLists.txt

     

       5
       5
       +
       @@ -296,7 +296,7 @@ if(BUNDLE_DEPENDENCIES)

     

       6
       6
       +
        else()

     

       7
       7
       +
        	find_package(utf8cpp CONFIG)

     

       8
       8
       +
        

     

       9
       9
       +
       -	target_link_libraries(VVVVVV physfs tinyxml2 utf8cpp lodepng-static)

     

       10
       10
       +
       +	target_link_libraries(VVVVVV physfs tinyxml2 utf8cpp::utf8cpp lodepng-static)

     

       11
       11
       +
        endif()

     

       12
       12
       +
        

     

       13
       13
       +
        # SDL2 Dependency (Detection pulled from FAudio)

+4 -4

pkgs/servers/lidarr/default.nix

···

       8
       8
        
           x86_64-darwin = "x64";

     

       9
       9
        
         }."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}");

     

       10
       10
        
         hash = {

     

       11
       11
       -
           x64-linux_hash = "sha256-qiI6+uiDBwY+UkqWyYqySfdOilJ87GyAojY6a5NrHNY=";

     

       12
       12
       -
           arm64-linux_hash = "sha256-CXbZjVIF8JL+bOzUvnaDzpDn+DK9D1g6HnmdvEDR/S8=";

     

       13
       13
       -
           x64-osx_hash = "sha256-t58xYrootKjavdyZp37KByyQa0CwSkl+DLxZuGYV9qs=";

     

       11
       11
       +
           x64-linux_hash = "sha256-TqwVWV3kfBTqGYf6PT9H0E9YiG/AfLWEViKocVrhZuU=";

     

       12
       12
       +
           arm64-linux_hash = "sha256-aCaUZgnk4rnhEV3hDVZx1Bfz+PteefGeGvEdoKXGxxg=";

     

       13
       13
       +
           x64-osx_hash = "sha256-4O3H2gsH2Q3V9xY1fIMzkaU0qSEg3CF89chnrMdCmdk=";

     

       14
       14
        
         }."${arch}-${os}_hash";

     

       15
       15
        
       in stdenv.mkDerivation rec {

     

       16
       16
        
         pname = "lidarr";

     

       17
       17
       -
         version = "1.4.5.3639";

     

       17
       17
       +
         version = "2.0.7.3849";

     

       18
       18
        
       

     

       19
       19
        
         src = fetchurl {

     

       20
       20
        
           url = "https://github.com/lidarr/Lidarr/releases/download/v${version}/Lidarr.master.${version}.${os}-core-${arch}.tar.gz";

+1 -1

pkgs/servers/lidarr/update.sh

···

       25
       25
        
           sed -i "s/version = \"[0-9.]*\";/version = \"$1\";/g" "$dirname/default.nix"

     

       26
       26
        
       }

     

       27
       27
        
       

     

       28
       28
       -
       currentVersion=$(cd $dirname && nix eval --raw -f ../../.. radarr.version)

     

       28
       28
       +
       currentVersion=$(cd $dirname && nix eval --raw -f ../../.. lidarr.version)

     

       29
       29
        
       

     

       30
       30
        
       latestTag=$(curl https://api.github.com/repos/Lidarr/Lidarr/releases/latest | jq -r ".tag_name")

     

       31
       31
        
       latestVersion="$(expr $latestTag : 'v\(.*\)')"

+3 -3

pkgs/servers/mautrix-whatsapp/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "mautrix-whatsapp";

     

       5
       5
       -
         version = "0.10.4";

     

       5
       5
       +
         version = "0.10.5";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "mautrix";

     

       9
       9
        
           repo = "whatsapp";

     

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

     

       11
       11
       -
           hash = "sha256-uouxOXvVbUNRHM83JearPhMTZQtMPEBfWvsVb7QJSO8=";

     

       11
       11
       +
           hash = "sha256-bn9nUTtpaEkzF2SEdCcKG27WQDL7xsgfgA/72wElQqA=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         buildInputs = [ olm ];

     

       15
       15
        
       

     

       16
       16
       -
         vendorHash = "sha256-dgaI/gpngCcVRVK8SK6ac1hmc7/aYLJCnW2CCYRDXy0=";

     

       16
       16
       +
         vendorHash = "sha256-PDUSjza+0SDanQwKYQRuLzsiA/sHjRnG0xpzlzhkm+U=";

     

       17
       17
        
       

     

       18
       18
        
         doCheck = false;

     

       19
       19

+4 -3

pkgs/servers/misc/navidrome/default.nix

···

       1
       1
        
       { buildGoModule

     

       2
       2
       +
       , buildPackages

     

       2
       3
        
       , fetchFromGitHub

     

       3
       4
        
       , fetchNpmDeps

     

       4
       5
        
       , lib

     
···

       17
       18
        
       

     

       18
       19
        
       buildGoModule rec {

     

       19
       20
        
         pname = "navidrome";

     

       20
       20
       -
         version = "0.50.1";

     

       21
       21
       +
         version = "0.50.2";

     

       21
       22
        
       

     

       22
       23
        
         src = fetchFromGitHub {

     

       23
       24
        
           owner = "navidrome";

     

       24
       25
        
           repo = "navidrome";

     

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

     

       26
       26
       -
           hash = "sha256-mbjc5fznJZmZrY1Rd+57ABN55Hyzg1XqZR/qwtesRIg=";

     

       27
       27
       +
           hash = "sha256-SZ9wVOHtmkrWfYGA0hNCXag2Yp17glOQpBsEQRK6Npg=";

     

       27
       28
        
         };

     

       28
       29
        
       

     

       29
       30
        
         vendorHash = "sha256-PKj2zJhGR1yETLZ4as35cuwil3vfyFKfkKF/32YdAt8=";

     
···

       37
       38
        
         };

     

       38
       39
        
       

     

       39
       40
        
         nativeBuildInputs = [

     

       40
       40
       -
           makeWrapper

     

       41
       41
       +
           buildPackages.makeWrapper

     

       41
       42
        
           nodejs

     

       42
       43
        
           npmHooks.npmConfigHook

     

       43
       44
        
           pkg-config

+10 -8

pkgs/servers/mqtt/mosquitto/default.nix

···

       12
       12
        
       , openssl

     

       13
       13
        
       , withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd

     

       14
       14
        
       , systemd

     

       15
       15
       +
       , uthash

     

       15
       16
        
       , fetchpatch

     

       16
       17
        
       , nixosTests

     

       17
       18
        
       }:

     
···

       52
       53
        
             substituteInPlace man/$f.xsl \

     

       53
       54
        
               --replace http://docbook.sourceforge.net/release/xsl/current ${docbook_xsl}/share/xml/docbook-xsl

     

       54
       55
        
           done

     

       55
       55
       -
       

     

       56
       56
       -
           # the manpages are not generated when using cmake

     

       57
       57
       -
           pushd man

     

       58
       58
       -
           make

     

       59
       59
       -
           popd

     

       60
       56
        
         '';

     

       61
       57
        
       

     

       62
       58
        
         outputs = [ "out" "dev" "lib" ];

     
···

       70
       66
        
           libuv

     

       71
       67
        
           libwebsockets'

     

       72
       68
        
           openssl

     

       69
       69
       +
           uthash

     

       73
       70
        
         ] ++ lib.optional withSystemd systemd;

     

       74
       71
        
       

     

       75
       72
        
         cmakeFlags = [

     

       76
       76
       -
           "-DWITH_THREADING=ON"

     

       77
       77
       -
           "-DWITH_WEBSOCKETS=ON"

     

       78
       78
       -
         ] ++ lib.optional withSystemd "-DWITH_SYSTEMD=ON";

     

       73
       73
       +
           (lib.cmakeBool "WITH_BUNDLED_DEPS" false)

     

       74
       74
       +
           (lib.cmakeBool "WITH_WEBSOCKETS" true)

     

       75
       75
       +
           (lib.cmakeBool "WITH_SYSTEMD" withSystemd)

     

       76
       76
       +
         ];

     

       77
       77
       +
       

     

       78
       78
       +
         postFixup = ''

     

       79
       79
       +
           sed -i "s|^prefix=.*|prefix=$lib|g" $dev/lib/pkgconfig/*.pc

     

       80
       80
       +
         '';

     

       79
       81
        
       

     

       80
       82
        
         passthru.tests = {

     

       81
       83
        
           inherit (nixosTests) mosquitto;

+3 -3

pkgs/servers/oxigraph/default.nix

···

       8
       8
        
       

     

       9
       9
        
       rustPlatform.buildRustPackage rec {

     

       10
       10
        
         pname = "oxigraph";

     

       11
       11
       -
         version = "0.3.21";

     

       11
       11
       +
         version = "0.3.22";

     

       12
       12
        
       

     

       13
       13
        
         src = fetchFromGitHub {

     

       14
       14
        
           owner = pname;

     

       15
       15
        
           repo = pname;

     

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

     

       17
       17
       -
           sha256 = "sha256-SjAsSWpjNK4XxbYEw6A8n+hchVyzJd0bx1rAqchmw4w=";

     

       17
       17
       +
           sha256 = "sha256-zwUiUDWdrmLF+Qj9Jy6JGXHaBskRnm+pMKW2GKGGeN8=";

     

       18
       18
        
           fetchSubmodules = true;

     

       19
       19
        
         };

     

       20
       20
        
       

     

       21
       21
       -
         cargoHash = "sha256-fDU7RF9TArSQFb6DP/Ltu9Fls2rzhXeBI/jVh5QuKUI=";

     

       21
       21
       +
         cargoHash = "sha256-O9/YvvFOaZ1F7HYO/AplWLz1vw0hysJEvGketk8zb9w=";

     

       22
       22
        
       

     

       23
       23
        
         nativeBuildInputs = [

     

       24
       24
        
           rustPlatform.bindgenHook

+4 -4

pkgs/servers/web-apps/matomo/default.nix

···

       3
       3
        
       let

     

       4
       4
        
         versions = {

     

       5
       5
        
           matomo = {

     

       6
       6
       -
             version = "4.15.1";

     

       7
       7
       -
             hash = "sha256-XnfiprGLqFQqPk30gcAVLdBZ3pYMSdBPfnicm7V1PSc=";

     

       6
       6
       +
             version = "4.16.0";

     

       7
       7
       +
             hash = "sha256-OFZT4195WTWw2XNAyGiNixW6hSNKC3IyBpa5kM9PCVk=";

     

       8
       8
        
           };

     

       9
       9
        
           matomo-beta = {

     

       10
       10
        
             version = "5.0.0";

     

       11
       11
        
             # `beta` examples: "b1", "rc1", null

     

       12
       12
        
             # when updating: use null if stable version is >= latest beta or release candidate

     

       13
       13
       -
             beta = "rc3";

     

       14
       14
       -
             hash = "sha256-Q5GB4i0ew6+tr8Bsm9PYkzJ8U6DmVPwG2QCi8CTge5E=";

     

       13
       13
       +
             beta = "rc9";

     

       14
       14
       +
             hash = "sha256-OXxJCEXcrl6UXYh+jbNqLQGYphrSjxaOAZg3AZVPAqs=";

     

       15
       15
        
           };

     

       16
       16
        
         };

     

       17
       17
        
         common = pname: { version, hash, beta ? null }:

+2 -2

pkgs/tools/archivers/peazip/default.nix

···

       16
       16
        
       

     

       17
       17
        
       stdenv.mkDerivation rec {

     

       18
       18
        
         pname = "peazip";

     

       19
       19
       -
         version = "9.4.0";

     

       19
       19
       +
         version = "9.6.0";

     

       20
       20
        
       

     

       21
       21
        
         src = fetchFromGitHub {

     

       22
       22
        
           owner = "peazip";

     

       23
       23
        
           repo = pname;

     

       24
       24
        
           rev = version;

     

       25
       25
       -
           hash = "sha256-to5VhuTomw33WRWrtSIMF/SD+KVXsUKmSrJ84BNatqw=";

     

       25
       25
       +
           hash = "sha256-75EkVRx6bX1ZZzeNSR7IvKNjTA5NvzFzUJdORiAVHBo=";

     

       26
       26
        
         };

     

       27
       27
        
         sourceRoot = "${src.name}/peazip-sources";

     

       28
       28

+6 -6

pkgs/tools/audio/soco-cli/default.nix pkgs/by-name/so/soco-cli/package.nix

···

       5
       5
        
       

     

       6
       6
        
       python3.pkgs.buildPythonApplication rec {

     

       7
       7
        
         pname = "soco-cli";

     

       8
       8
       -
         version = "0.4.55";

     

       8
       8
       +
         version = "0.4.73";

     

       9
       9
        
         format = "setuptools";

     

       10
       10
        
       

     

       11
       11
        
         disabled = python3.pythonOlder "3.6";

     

       12
       12
        
       

     

       13
       13
       -
         src = fetchFromGitHub rec {

     

       13
       13
       +
         src = fetchFromGitHub {

     

       14
       14
        
           owner = "avantrec";

     

       15
       15
        
           repo = pname;

     

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

     

       17
       17
       -
           sha256 = "sha256-zdu1eVtVBTYa47KjGc5fqKN6olxp98RoLGT2sNCfG9E=";

     

       17
       17
       +
           hash = "sha256-WxBwHjh5tCXclQXqrHrpvZdcQU93RObteAfZyyVvKf0=";

     

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
        
         propagatedBuildInputs = with python3.pkgs; [

     
···

       32
       32
        
           "soco_cli"

     

       33
       33
        
         ];

     

       34
       34
        
       

     

       35
       35
       -
         meta = with lib; {

     

       35
       35
       +
         meta = {

     

       36
       36
        
           description = "Command-line interface to control Sonos sound systems";

     

       37
       37
        
           homepage = "https://github.com/avantrec/soco-cli";

     

       38
       38
       -
           license = with licenses; [ asl20 ];

     

       39
       39
       -
           maintainers = with maintainers; [ fab ];

     

       38
       38
       +
           license = with lib.licenses; [ asl20 ];

     

       40
       39
        
           mainProgram = "sonos";

     

       40
       40
       +
           maintainers = with lib.maintainers; [ fab ];

     

       41
       41
        
         };

     

       42
       42
        
       }

+2 -2

pkgs/tools/filesystems/mount-zip/default.nix

···

       3
       3
        
       

     

       4
       4
        
       stdenv.mkDerivation (finalAttrs: {

     

       5
       5
        
         pname = "mount-zip";

     

       6
       6
       -
         version = "1.0.11";

     

       6
       6
       +
         version = "1.0.12";

     

       7
       7
        
       

     

       8
       8
        
         src = fetchFromGitHub {

     

       9
       9
        
           owner = "google";

     

       10
       10
        
           repo = "mount-zip";

     

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

     

       12
       12
       -
           hash = "sha256-67GaZdmDuUc8ixeRP86xA/+n1PRqwwIEe7JK9OZGUC8=";

     

       12
       12
       +
           hash = "sha256-bsuGEgCrU7Gxd9oAiI39AYT9aiXufrI9CniTCfa6LCY=";

     

       13
       13
        
         };

     

       14
       14
        
       

     

       15
       15
        
         nativeBuildInputs = [ boost gcc icu pandoc pkg-config ];

+3 -3

pkgs/tools/misc/mutagen-compose/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "mutagen-compose";

     

       5
       5
       -
         version = "0.17.2";

     

       5
       5
       +
         version = "0.17.4";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "mutagen-io";

     

       9
       9
        
           repo = pname;

     

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

     

       11
       11
       -
           hash = "sha256-FEUVRDGVYYpgNSOSSR9hyUyz9mP8B8qWy3MnTtuE3fQ=";

     

       11
       11
       +
           hash = "sha256-arvDV1AlhrXfndoXGd7jn6O9ZAc1+7hq30QpYPLhpJw=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         vendorHash = "sha256-u4vRQjqBSsugEcBzteV7yOTizbXGpCH+M/zAvdWusK0=";

     

       14
       14
       +
         vendorHash = "sha256-wqenEPTRsZvQscXv+/eVEFVk8Fd1/Aj3QcBSZzpkmGA=";

     

       15
       15
        
       

     

       16
       16
        
         doCheck = false;

     

       17
       17

+3 -3

pkgs/tools/nix/nixdoc/default.nix

···

       2
       2
        
       

     

       3
       3
        
       rustPlatform.buildRustPackage rec {

     

       4
       4
        
         pname = "nixdoc";

     

       5
       5
       -
         version = "2.6.0";

     

       5
       5
       +
         version = "2.7.0";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "nix-community";

     

       9
       9
        
           repo = "nixdoc";

     

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

     

       11
       11
       -
           sha256 = "sha256-g1PBPpvK3kg0bJEDXsifVgcl3+v54q08Ae3nZ4cJ+Xs=";

     

       11
       11
       +
           sha256 = "sha256-0cyKI8KHFsMXYca3hzbqxmBpxGdhl4/i183kfUQr8pg=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         cargoHash = "sha256-E5SJfwGfy1DcLC0cF/5FTbVEJs/WYb2KO+OdOo2fgQk=";

     

       14
       14
       +
         cargoHash = "sha256-9dqjNExxLDgVsu14yDQOJP1qxKy2ACiUH+pbX77iT70=";

     

       15
       15
        
       

     

       16
       16
        
         buildInputs = lib.optionals stdenv.isDarwin [ darwin.Security ];

     

       17
       17

+3 -3

pkgs/tools/package-management/apx/default.nix

···

       6
       6
        
       

     

       7
       7
        
       buildGoModule rec {

     

       8
       8
        
         pname = "apx";

     

       9
       9
       -
         version = "2.0.0";

     

       9
       9
       +
         version = "2.1.0";

     

       10
       10
        
       

     

       11
       11
        
         src = fetchFromGitHub {

     

       12
       12
        
           owner = "Vanilla-OS";

     

       13
       13
        
           repo = pname;

     

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

     

       15
       15
       -
           hash = "sha256-3CelqEntpfld0n+Ewg7NCkowVjgCf5b6StfSkYbgV5k=";

     

       15
       15
       +
           hash = "sha256-spxZgc1krs8AhOhAZmqGj/yiXzMUefcFFKg/xFpdWj8=";

     

       16
       16
        
         };

     

       17
       17
        
       

     

       18
       18
        
         vendorHash = null;

     
···

       21
       21
        
       

     

       22
       22
        
         postPatch = ''

     

       23
       23
        
           substituteInPlace config/apx.json \

     

       24
       24
       -
             --replace "/usr/share/apx/distrobox" "${distrobox}/bin/distrobox" \

     

       24
       24
       +
             --replace "/usr/share/apx/distrobox/distrobox" "${distrobox}/bin/distrobox" \

     

       25
       25
        
             --replace "/usr/share/apx" "$out/bin/apx"

     

       26
       26
        
           substituteInPlace settings/config.go \

     

       27
       27
        
             --replace "/usr/share/apx/" "$out/share/apx/"

+3 -3

pkgs/tools/security/nmap-formatter/default.nix

···

       5
       5
        
       

     

       6
       6
        
       buildGoModule rec {

     

       7
       7
        
         pname = "nmap-formatter";

     

       8
       8
       -
         version = "2.1.4";

     

       8
       8
       +
         version = "2.1.6";

     

       9
       9
        
       

     

       10
       10
        
         src = fetchFromGitHub {

     

       11
       11
        
           owner = "vdjagilev";

     

       12
       12
        
           repo = pname;

     

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

     

       14
       14
       -
           hash = "sha256-M0IV7pgJyCxwfWRnJeMevFFsvaXTRfjXoGRsMngt7Pk=";

     

       14
       14
       +
           hash = "sha256-40ix4D/f63Q5cqVmBvpSmbK2KNXiYLdv/xXBNPJXfac=";

     

       15
       15
        
         };

     

       16
       16
        
       

     

       17
       17
       -
         vendorHash = "sha256-Wx07tSHr5LKPdO3BQ3tGMxzxYP9jBnH3JQ8/yrvwX1U=";

     

       17
       17
       +
         vendorHash = "sha256-OUhvQwC7EJF7CIM7NHCs0TqRTZHTiDupkfYREPaxpXo=";

     

       18
       18
        
       

     

       19
       19
        
         meta = with lib; {

     

       20
       20
        
           description = "Tool that allows you to convert nmap output";

+6 -2

pkgs/top-level/all-packages.nix

···

       25142
       25142
        
       

     

       25143
       25143
        
         socket_wrapper = callPackage ../development/libraries/socket_wrapper { };

     

       25144
       25144
        
       

     

       25145
       25145
       -
         soco-cli = callPackage ../tools/audio/soco-cli { };

     

       25146
       25146
       -
       

     

       25147
       25145
        
         sofia_sip = callPackage ../development/libraries/sofia-sip {

     

       25148
       25146
        
           inherit (darwin.apple_sdk.frameworks) SystemConfiguration;

     

       25149
       25147
        
         };

     
···

       36038
       36036
        
         };

     

       36039
       36037
        
       

     

       36040
       36038
        
         tut = callPackage ../applications/misc/tut { };

     

       36039
       36039
       +
       

     

       36040
       36040
       +
         tuxclocker = libsForQt5.callPackage ../applications/misc/tuxclocker {

     

       36041
       36041
       +
           tuxclocker-plugins = tuxclocker-plugins-with-unfree;

     

       36042
       36042
       +
         };

     

       36043
       36043
       +
       

     

       36044
       36044
       +
         tuxclocker-without-unfree = libsForQt5.callPackage ../applications/misc/tuxclocker { };

     

       36041
       36045
        
       

     

       36042
       36046
        
         tuxedo-rs = callPackage ../os-specific/linux/tuxedo-rs { };

     

       36043
       36047

+2

pkgs/top-level/python-packages.nix

···

       6810
       6810
        
           inherit (self) buildPythonPackage pythonOlder pythonAtLeast pyface pygments numpy packaging vtk traitsui envisage apptools pyqt5;

     

       6811
       6811
        
         };

     

       6812
       6812
        
       

     

       6813
       6813
       +
         mayim = callPackage ../development/python-modules/mayim { };

     

       6814
       6814
       +
       

     

       6813
       6815
        
         mbddns = callPackage ../development/python-modules/mbddns { };

     

       6814
       6816
        
       

     

       6815
       6817
        
         mbstrdecoder = callPackage ../development/python-modules/mbstrdecoder { };