commit cdcb87ac73414397538bc786d1df1ebc7b79131c · pyrox.dev/nixpkgs

+14 -15

nixos/modules/programs/direnv.nix

···

       119
       119
        
       

     

       120
       120
        
             zsh.interactiveShellInit = lib.mkIf cfg.enableZshIntegration ''

     

       121
       121
        
               if ${lib.boolToString cfg.loadInNixShell} || printenv PATH | grep -vqc '/nix/store'; then

     

       122
       122
       -
                eval "$(${lib.getExe cfg.finalPackage} hook zsh)"

     

       122
       122
       +
                 eval "$(${lib.getExe cfg.finalPackage} hook zsh)"

     

       123
       123
        
               fi

     

       124
       124
        
             '';

     

       125
       125
        
       

     
···

       127
       127
        
             #$IN_NIX_SHELL for "nix-shell"

     

       128
       128
        
             bash.interactiveShellInit = lib.mkIf cfg.enableBashIntegration ''

     

       129
       129
        
               if ${lib.boolToString cfg.loadInNixShell} || [ -z "$IN_NIX_SHELL$NIX_GCROOT$(printenv PATH | grep '/nix/store')" ] ; then

     

       130
       130
       -
                eval "$(${lib.getExe cfg.finalPackage} hook bash)"

     

       130
       130
       +
                 eval "$(${lib.getExe cfg.finalPackage} hook bash)"

     

       131
       131
        
               fi

     

       132
       132
        
             '';

     

       133
       133
        
       

     

       134
       134
        
             fish.interactiveShellInit = lib.mkIf cfg.enableFishIntegration ''

     

       135
       135
       -
               if ${lib.boolToString cfg.loadInNixShell};

     

       136
       136
       -
               or printenv PATH | grep -vqc '/nix/store';

     

       137
       137
       -
                ${lib.getExe cfg.finalPackage} hook fish | source

     

       135
       135
       +
               if ${lib.boolToString cfg.loadInNixShell}; or printenv PATH | grep -vqc '/nix/store';

     

       136
       136
       +
                 ${lib.getExe cfg.finalPackage} hook fish | source

     

       138
       137
        
               end

     

       139
       138
        
             '';

     

       140
       139
        
       

     
···

       169
       168
        
                   source ${cfg.nix-direnv.package}/share/nix-direnv/direnvrc

     

       170
       169
        
                 ''}

     

       171
       170
        
       

     

       172
       172
       -
                  #Load direnvrcExtra

     

       173
       173
       -
                  ${cfg.direnvrcExtra}

     

       171
       171
       +
                 #Load direnvrcExtra

     

       172
       172
       +
                 ${cfg.direnvrcExtra}

     

       174
       173
        
       

     

       175
       175
       -
                  #Load user-configuration if present (~/.direnvrc or ~/.config/direnv/direnvrc)

     

       176
       176
       -
                  direnv_config_dir_home="''${DIRENV_CONFIG_HOME:-''${XDG_CONFIG_HOME:-$HOME/.config}/direnv}"

     

       177
       177
       -
                  if [[ -f $direnv_config_dir_home/direnvrc ]]; then

     

       178
       178
       -
                    source "$direnv_config_dir_home/direnvrc" >&2

     

       179
       179
       -
                  elif [[ -f $HOME/.direnvrc ]]; then

     

       180
       180
       -
                    source "$HOME/.direnvrc" >&2

     

       181
       181
       -
                  fi

     

       174
       174
       +
                 #Load user-configuration if present (~/.direnvrc or ~/.config/direnv/direnvrc)

     

       175
       175
       +
                 direnv_config_dir_home="''${DIRENV_CONFIG_HOME:-''${XDG_CONFIG_HOME:-$HOME/.config}/direnv}"

     

       176
       176
       +
                 if [[ -f $direnv_config_dir_home/direnvrc ]]; then

     

       177
       177
       +
                   source "$direnv_config_dir_home/direnvrc" >&2

     

       178
       178
       +
                 elif [[ -f $HOME/.direnvrc ]]; then

     

       179
       179
       +
                   source "$HOME/.direnvrc" >&2

     

       180
       180
       +
                 fi

     

       182
       181
        
       

     

       183
       183
       -
                  unset direnv_config_dir_home

     

       182
       182
       +
                 unset direnv_config_dir_home

     

       184
       183
        
               '';

     

       185
       184
        
       

     

       186
       185
        
               "direnv/lib/zz-user.sh".text = ''

+1 -1

nixos/modules/services/web-apps/mealie.nix

···

       76
       76
        
               API_PORT = toString cfg.port;

     

       77
       77
        
               BASE_URL = "http://localhost:${toString cfg.port}";

     

       78
       78
        
               DATA_DIR = "/var/lib/mealie";

     

       79
       79
       -
               NLTK_DATA = pkgs.nltk-data.averaged_perceptron_tagger_eng;

     

       79
       79
       +
               NLTK_DATA = pkgs.nltk-data.averaged-perceptron-tagger-eng;

     

       80
       80
        
             } // (builtins.mapAttrs (_: val: toString val) cfg.settings);

     

       81
       81
        
       

     

       82
       82
        
             serviceConfig = {

+2 -2

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

···

       194
       194
        
         mkTerraform = attrs: pluggable (generic attrs);

     

       195
       195
        
       

     

       196
       196
        
         terraform_1 = mkTerraform {

     

       197
       197
       -
           version = "1.12.0";

     

       198
       198
       -
           hash = "sha256-+EjsKl13kx3uJ50TrZIJLrvf4RBWDJsp1PD1dwtP6XA=";

     

       197
       197
       +
           version = "1.12.1";

     

       198
       198
       +
           hash = "sha256-ikpSkcP4zt91Lf9gziytlZ4P27A0IP2qL+H2Lp9Cspg=";

     

       199
       199
        
           vendorHash = "sha256-zWNLIurNP5e/AWr84kQCb2+gZIn6EAsuvr0ZnfSq7Zw=";

     

       200
       200
        
           patches = [ ./provider-path-0_15.patch ];

     

       201
       201
        
           passthru = {

+1 -1

pkgs/build-support/bintools-wrapper/default.nix

···

       492
       492
        
               darwinMinVersionVariable

     

       493
       493
        
               ;

     

       494
       494
        
           }

     

       495
       495
       -
           // lib.optionalAttrs (apple-sdk != null && stdenvNoCC.targetPlatform.isDarwin) {

     

       495
       495
       +
           // lib.optionalAttrs (stdenvNoCC.targetPlatform.isDarwin && apple-sdk != null) {

     

       496
       496
        
             # Wrapped compilers should do something useful even when no SDK is provided at `DEVELOPER_DIR`.

     

       497
       497
        
             fallback_sdk = apple-sdk.__spliced.buildTarget or apple-sdk;

     

       498
       498
        
           };

+1 -1

pkgs/build-support/cc-wrapper/default.nix

···

       888
       888
        
             # These will become empty strings when not targeting Darwin.

     

       889
       889
        
             inherit (targetPlatform) darwinMinVersion darwinMinVersionVariable;

     

       890
       890
        
           }

     

       891
       891
       -
           // lib.optionalAttrs (apple-sdk != null && stdenvNoCC.targetPlatform.isDarwin) {

     

       891
       891
       +
           // lib.optionalAttrs (stdenvNoCC.targetPlatform.isDarwin && apple-sdk != null) {

     

       892
       892
        
             # Wrapped compilers should do something useful even when no SDK is provided at `DEVELOPER_DIR`.

     

       893
       893
        
             fallback_sdk = apple-sdk.__spliced.buildTarget or apple-sdk;

     

       894
       894
        
           };

+11 -7

pkgs/build-support/trivial-builders/default.nix

···

       1022
       1022
        
             postPatch ? "",

     

       1023
       1023
        
             ...

     

       1024
       1024
        
           }@args:

     

       1025
       1025
       +
           assert lib.assertMsg (

     

       1026
       1026
       +
             !args ? meta

     

       1027
       1027
       +
           ) "applyPatches will not merge 'meta', change it in 'src' instead";

     

       1028
       1028
       +
           assert lib.assertMsg (

     

       1029
       1029
       +
             !args ? passthru

     

       1030
       1030
       +
           ) "applyPatches will not merge 'passthru', change it in 'src' instead";

     

       1025
       1031
        
           if patches == [ ] && prePatch == "" && postPatch == "" then

     

       1026
       1032
        
             src # nothing to do, so use original src to avoid additional drv

     

       1027
       1033
        
           else

     
···

       1051
       1057
        
                 phases = "unpackPhase patchPhase installPhase";

     

       1052
       1058
        
                 installPhase = "cp -R ./ $out";

     

       1053
       1059
        
               }

     

       1054
       1054
       -
               # Carry and merge information from the underlying `src` if present.

     

       1055
       1055
       -
               // (optionalAttrs (src ? meta || args ? meta) {

     

       1056
       1056
       -
                 meta = src.meta or { } // args.meta or { };

     

       1060
       1060
       +
               # Carry (and merge) information from the underlying `src` if present.

     

       1061
       1061
       +
               // (optionalAttrs (src ? meta) {

     

       1062
       1062
       +
                 inherit (src) meta;

     

       1057
       1063
        
               })

     

       1058
       1058
       -
               // (optionalAttrs (extraPassthru != { } || src ? passthru || args ? passthru) {

     

       1059
       1059
       -
                 passthru = extraPassthru // src.passthru or { } // args.passthru or { };

     

       1064
       1064
       +
               // (optionalAttrs (extraPassthru != { } || src ? passthru) {

     

       1065
       1065
       +
                 passthru = extraPassthru // src.passthru or { };

     

       1060
       1066
        
               })

     

       1061
       1067
        
               # Forward any additional arguments to the derviation

     

       1062
       1068
        
               // (removeAttrs args [

     

       1063
       1069
        
                 "src"

     

       1064
       1070
        
                 "name"

     

       1065
       1065
       -
                 "meta"

     

       1066
       1066
       -
                 "passthru"

     

       1067
       1071
        
                 "patches"

     

       1068
       1072
        
                 "prePatch"

     

       1069
       1073
        
                 "postPatch"

+2 -2

pkgs/by-name/ar/arkade/package.nix

···

       7
       7
        
       

     

       8
       8
        
       buildGoModule rec {

     

       9
       9
        
         pname = "arkade";

     

       10
       10
       -
         version = "0.11.38";

     

       10
       10
       +
         version = "0.11.39";

     

       11
       11
        
       

     

       12
       12
        
         src = fetchFromGitHub {

     

       13
       13
        
           owner = "alexellis";

     

       14
       14
        
           repo = "arkade";

     

       15
       15
        
           rev = version;

     

       16
       16
       -
           hash = "sha256-V6ms3Av0/g2S7Q2NLltz7CnnvE1m+cemmwoHKL1e0tM=";

     

       16
       16
       +
           hash = "sha256-ILiiK8WWuSB1QKTo89/JJ5ADCBKbRXVn9fNVL3c7y0s=";

     

       17
       17
        
         };

     

       18
       18
        
       

     

       19
       19
        
         env.CGO_ENABLED = 0;

+13 -10

pkgs/by-name/bi/bind/package.nix

···

       27
       27
        
       

     

       28
       28
        
       stdenv.mkDerivation (finalAttrs: {

     

       29
       29
        
         pname = "bind";

     

       30
       30
       -
         version = "9.20.8";

     

       30
       30
       +
         version = "9.20.9";

     

       31
       31
        
       

     

       32
       32
        
         src = fetchurl {

     

       33
       33
        
           url = "https://downloads.isc.org/isc/bind9/${finalAttrs.version}/${finalAttrs.pname}-${finalAttrs.version}.tar.xz";

     

       34
       34
       -
           hash = "sha256-MATZnEdr6rSamGwtSfkC4s13ZsmrGLJh6LNTyr86BLU=";

     

       34
       34
       +
           hash = "sha256-PSaQDtnJqFkHP/6puX4pLBJI2tGCebF7BfyyPDCR+G0=";

     

       35
       35
        
         };

     

       36
       36
        
       

     

       37
       37
        
         outputs = [

     
···

       136
       136
        
         '';

     

       137
       137
        
       

     

       138
       138
        
         passthru = {

     

       139
       139
       -
           tests = {

     

       140
       140
       -
             withCheck = finalAttrs.finalPackage.overrideAttrs { doCheck = true; };

     

       141
       141
       -
             inherit (nixosTests) bind;

     

       142
       142
       -
             prometheus-exporter = nixosTests.prometheus-exporters.bind;

     

       143
       143
       -
             kubernetes-dns-single-node = nixosTests.kubernetes.dns-single-node;

     

       144
       144
       -
             kubernetes-dns-multi-node = nixosTests.kubernetes.dns-multi-node;

     

       145
       145
       -
           };

     

       139
       139
       +
           tests =

     

       140
       140
       +
             {

     

       141
       141
       +
               withCheck = finalAttrs.finalPackage.overrideAttrs { doCheck = true; };

     

       142
       142
       +
               inherit (nixosTests) bind;

     

       143
       143
       +
               prometheus-exporter = nixosTests.prometheus-exporters.bind;

     

       144
       144
       +
             }

     

       145
       145
       +
             // lib.optionalAttrs (stdenv.hostPlatform.system == "x86_64-linux") {

     

       146
       146
       +
               kubernetes-dns-single-node = nixosTests.kubernetes.dns-single-node;

     

       147
       147
       +
               kubernetes-dns-multi-node = nixosTests.kubernetes.dns-multi-node;

     

       148
       148
       +
             };

     

       146
       149
        
       

     

       147
       150
        
           updateScript = gitUpdater {

     

       148
       151
        
             # No nicer place to find latest stable release.

     
···

       160
       163
        
           changelog = "https://downloads.isc.org/isc/bind9/cur/${lib.versions.majorMinor finalAttrs.version}/doc/arm/html/notes.html#notes-for-bind-${

     

       161
       164
        
             lib.replaceStrings [ "." ] [ "-" ] finalAttrs.version

     

       162
       165
        
           }";

     

       163
       163
       -
           maintainers = with maintainers; [ globin ];

     

       166
       166
       +
           maintainers = with maintainers; [ ];

     

       164
       167
        
           platforms = platforms.unix;

     

       165
       168
        
       

     

       166
       169
        
           outputsToInstall = [

+2 -2

pkgs/by-name/bp/bpfilter/package.nix

···

       20
       20
        
       

     

       21
       21
        
       stdenv.mkDerivation (finalAttrs: {

     

       22
       22
        
         pname = "bpfilter";

     

       23
       23
       -
         version = "0.3.0";

     

       23
       23
       +
         version = "0.4.0";

     

       24
       24
        
       

     

       25
       25
        
         src = fetchFromGitHub {

     

       26
       26
        
           owner = "facebook";

     

       27
       27
        
           repo = "bpfilter";

     

       28
       28
        
           tag = "v${finalAttrs.version}";

     

       29
       29
       -
           hash = "sha256-k8zl6WQ5htxu2nsubOoqMg69E/z+4TQTtywIfZG/G7U=";

     

       29
       29
       +
           hash = "sha256-Z0L4sY944cj/rqfOwwjNWOU0tZDAsZ1ocf4/djHad2Q=";

     

       30
       30
        
         };

     

       31
       31
        
       

     

       32
       32
        
         nativeBuildInputs = [

-6

pkgs/by-name/ci/circt/package.nix

···

       104
       104
        
         doCheck = true;

     

       105
       105
        
         checkTarget = "check-circt check-circt-integration";

     

       106
       106
        
       

     

       107
       107
       -
         preCheck = lib.optionalString stdenv.hostPlatform.isDarwin ''

     

       108
       108
       -
           echo moving libarc-jit-env.dylib to '$lib' before check because archilator links to the output path

     

       109
       109
       -
           mkdir -pv $lib/lib

     

       110
       110
       -
           cp -v ./lib/libarc-jit-env.dylib $lib/lib

     

       111
       111
       -
         '';

     

       112
       112
       -
       

     

       113
       107
        
         outputs = [

     

       114
       108
        
           "out"

     

       115
       109
        
           "lib"

+105

pkgs/by-name/cp/cppfront/package.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         stdenv,

     

       3
       3
       +
         lib,

     

       4
       4
       +
         fetchFromGitHub,

     

       5
       5
       +
         installShellFiles,

     

       6
       6
       +
         nix-update-script,

     

       7
       7
       +
         versionCheckHook,

     

       8
       8
       +
       }:

     

       9
       9
       +
       

     

       10
       10
       +
       stdenv.mkDerivation (finalAttrs: {

     

       11
       11
       +
         pname = "cppfront";

     

       12
       12
       +
         version = "0.8.1";

     

       13
       13
       +
       

     

       14
       14
       +
         src = fetchFromGitHub {

     

       15
       15
       +
           owner = "hsutter";

     

       16
       16
       +
           repo = "cppfront";

     

       17
       17
       +
           tag = "v${finalAttrs.version}";

     

       18
       18
       +
           hash = "sha256-QYjon2EpNexYa2fl09AePkpq0LkRVBOQM++eldcVMvI=";

     

       19
       19
       +
         };

     

       20
       20
       +
       

     

       21
       21
       +
         nativeBuildInputs = [

     

       22
       22
       +
           installShellFiles

     

       23
       23
       +
         ];

     

       24
       24
       +
       

     

       25
       25
       +
         # Remove with next release

     

       26
       26
       +
         postPatch = ''

     

       27
       27
       +
           substituteInPlace source/version.info \

     

       28
       28
       +
             --replace-fail "0.8.0" "0.8.1"

     

       29
       29
       +
         '';

     

       30
       30
       +
       

     

       31
       31
       +
         dontConfigure = true;

     

       32
       32
       +
       

     

       33
       33
       +
         buildPhase = ''

     

       34
       34
       +
           runHook preBuild

     

       35
       35
       +
       

     

       36
       36
       +
           $CXX source/cppfront.cpp -std=c++20 -o cppfront

     

       37
       37
       +
       

     

       38
       38
       +
           runHook postBuild

     

       39
       39
       +
         '';

     

       40
       40
       +
       

     

       41
       41
       +
         installPhase = ''

     

       42
       42
       +
           runHook preInstall

     

       43
       43
       +
       

     

       44
       44
       +
           installBin cppfront

     

       45
       45
       +
           cp -r include $out/include

     

       46
       46
       +
       

     

       47
       47
       +
           runHook postInstall

     

       48
       48
       +
         '';

     

       49
       49
       +
       

     

       50
       50
       +
         nativeInstallCheckInputs = [

     

       51
       51
       +
           versionCheckHook

     

       52
       52
       +
         ];

     

       53
       53
       +
         versionCheckProgramArg = "-version";

     

       54
       54
       +
         doInstallCheck = true;

     

       55
       55
       +
       

     

       56
       56
       +
         passthru = {

     

       57
       57
       +
           updateScript = nix-update-script { };

     

       58
       58
       +
       

     

       59
       59
       +
           tests.hello-world = stdenv.mkDerivation (finalAttrs': {

     

       60
       60
       +
             pname = "${finalAttrs.pname}-hello-world-test";

     

       61
       61
       +
             inherit (finalAttrs) version src;

     

       62
       62
       +
       

     

       63
       63
       +
             sourceRoot = "${finalAttrs'.src.name}/regression-tests";

     

       64
       64
       +
       

     

       65
       65
       +
             nativeBuildInputs = [

     

       66
       66
       +
               finalAttrs.finalPackage

     

       67
       67
       +
               installShellFiles

     

       68
       68
       +
             ];

     

       69
       69
       +
       

     

       70
       70
       +
             postBuild = ''

     

       71
       71
       +
               cppfront pure2-hello.cpp2

     

       72
       72
       +
               $CXX -std=c++20 -o pure2-hello{,.cpp}

     

       73
       73
       +
             '';

     

       74
       74
       +
       

     

       75
       75
       +
             postInstall = ''

     

       76
       76
       +
               installBin pure2-hello

     

       77
       77
       +
             '';

     

       78
       78
       +
       

     

       79
       79
       +
             doInstallCheck = true;

     

       80
       80
       +
             postInstallCheck = ''

     

       81
       81
       +
               $out/bin/pure2-hello | grep '^Hello \[world\]$' > /dev/null

     

       82
       82
       +
             '';

     

       83
       83
       +
       

     

       84
       84
       +
             meta = {

     

       85
       85
       +
               inherit (finalAttrs.meta) maintainers platforms;

     

       86
       86
       +
               mainProgram = "pure2-hello";

     

       87
       87
       +
             };

     

       88
       88
       +
           });

     

       89
       89
       +
         };

     

       90
       90
       +
       

     

       91
       91
       +
         meta = {

     

       92
       92
       +
           description = "Experimental compiler from a potential C++ 'syntax 2' (Cpp2) to today's 'syntax 1' (Cpp1)";

     

       93
       93
       +
           homepage = "https://hsutter.github.io/cppfront/";

     

       94
       94
       +
           changelog = "https://github.com/hsutter/cppfront/releases/tag/${finalAttrs.src.tag}";

     

       95
       95
       +
           mainProgram = "cppfront";

     

       96
       96
       +
           license = with lib.licenses; [

     

       97
       97
       +
             asl20

     

       98
       98
       +
             llvm-exception

     

       99
       99
       +
           ];

     

       100
       100
       +
           maintainers = with lib.maintainers; [

     

       101
       101
       +
             marcin-serwin

     

       102
       102
       +
           ];

     

       103
       103
       +
           platforms = lib.platforms.all;

     

       104
       104
       +
         };

     

       105
       105
       +
       })

+2 -2

pkgs/by-name/cr/crystal-dock/package.nix

···

       8
       8
        
       }:

     

       9
       9
        
       stdenv.mkDerivation (finalAttrs: {

     

       10
       10
        
         pname = "crystal-dock";

     

       11
       11
       -
         version = "2.12";

     

       11
       11
       +
         version = "2.14";

     

       12
       12
        
       

     

       13
       13
        
         src = fetchFromGitHub {

     

       14
       14
        
           owner = "dangvd";

     

       15
       15
        
           repo = "crystal-dock";

     

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

     

       17
       17
       -
           hash = "sha256-8QxewksN4iWFpIChRm0+QnU5MFuup0dO/QNxPBLlmPU=";

     

       17
       17
       +
           hash = "sha256-szW3zIgwy0a9NmEax6xemeCdjs3//r7BRfUDeLv+VxE=";

     

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
        
         nativeBuildInputs = [

+69

pkgs/by-name/fl/fluxcd-operator-mcp/package.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         lib,

     

       3
       3
       +
         buildGoModule,

     

       4
       4
       +
         fetchFromGitHub,

     

       5
       5
       +
         installShellFiles,

     

       6
       6
       +
         versionCheckHook,

     

       7
       7
       +
         nix-update-script,

     

       8
       8
       +
         stdenv,

     

       9
       9
       +
       }:

     

       10
       10
       +
       buildGoModule (finalAttrs: {

     

       11
       11
       +
         pname = "fluxcd-operator-mcp";

     

       12
       12
       +
         version = "0.20.0";

     

       13
       13
       +
       

     

       14
       14
       +
         src = fetchFromGitHub {

     

       15
       15
       +
           owner = "controlplaneio-fluxcd";

     

       16
       16
       +
           repo = "fluxcd-operator";

     

       17
       17
       +
           tag = "v${finalAttrs.version}";

     

       18
       18
       +
           hash = "sha256-GGHufHUqTylgynK19aaj4KAawlzzuz3iSEHa+vVVPMM=";

     

       19
       19
       +
         };

     

       20
       20
       +
       

     

       21
       21
       +
         vendorHash = "sha256-5uT/pcfXrinyJ1hXmQ+vmWNuyO33c6d5PAjm6kwOZmY=";

     

       22
       22
       +
       

     

       23
       23
       +
         ldflags = [

     

       24
       24
       +
           "-s"

     

       25
       25
       +
           "-w"

     

       26
       26
       +
           "-X main.VERSION=${finalAttrs.version}"

     

       27
       27
       +
         ];

     

       28
       28
       +
       

     

       29
       29
       +
         subPackages = [ "cmd/mcp" ];

     

       30
       30
       +
       

     

       31
       31
       +
         nativeBuildInputs = [ installShellFiles ];

     

       32
       32
       +
       

     

       33
       33
       +
         nativeInstallCheckInputs = [ versionCheckHook ];

     

       34
       34
       +
         versionCheckProgram = "${placeholder "out"}/bin/flux-operator-mcp";

     

       35
       35
       +
         versionCheckProgramArg = "--version";

     

       36
       36
       +
         doInstallCheck = true;

     

       37
       37
       +
       

     

       38
       38
       +
         env.CGO_ENABLED = 0;

     

       39
       39
       +
       

     

       40
       40
       +
         postInstall =

     

       41
       41
       +
           ''

     

       42
       42
       +
             mv $out/bin/mcp $out/bin/flux-operator-mcp

     

       43
       43
       +
           ''

     

       44
       44
       +
           + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''

     

       45
       45
       +
             for shell in bash fish zsh; do

     

       46
       46
       +
               installShellCompletion --cmd flux-operator-mcp \

     

       47
       47
       +
                 --$shell <($out/bin/flux-operator-mcp completion $shell)

     

       48
       48
       +
             done

     

       49
       49
       +
           '';

     

       50
       50
       +
       

     

       51
       51
       +
         passthru.updateScript = nix-update-script { };

     

       52
       52
       +
       

     

       53
       53
       +
         meta = {

     

       54
       54
       +
           description = "Kubernetes controller for managing the lifecycle of Flux CD";

     

       55
       55
       +
           homepage = "https://fluxcd.control-plane.io/mcp/";

     

       56
       56
       +
           downloadPage = "https://github.com/controlplaneio-fluxcd/flux-operator";

     

       57
       57
       +
           longDescription = ''

     

       58
       58
       +
             The Flux Operator is a Kubernetes CRD controller that manages the lifecycle of CNCF Flux CD

     

       59
       59
       +
             and the ControlPlane enterprise distribution. The operator extends Flux with self-service

     

       60
       60
       +
             capabilities and preview environments for GitLab and GitHub pull requests testing.

     

       61
       61
       +
           '';

     

       62
       62
       +
           changelog = "https://github.com/controlplaneio-fluxcd/flux-operator/releases/tag/v${finalAttrs.version}";

     

       63
       63
       +
           license = lib.licenses.agpl3Only;

     

       64
       64
       +
           maintainers = with lib.maintainers; [

     

       65
       65
       +
             mattfield

     

       66
       66
       +
           ];

     

       67
       67
       +
           mainProgram = "flux-operator-mcp";

     

       68
       68
       +
         };

     

       69
       69
       +
       })

-149

pkgs/by-name/fr/freecad/0003-Gui-take-in-account-module-path-argument.patch

···

       1
       1
       -
       From 23ddb6ff148ec5c27da050ba0eb7a2e449b8450b Mon Sep 17 00:00:00 2001

     

       2
       2
       -
       From: Yury Shvedov <yury.shvedov@kaspersky.com>

     

       3
       3
       -
       Date: Mon, 4 Nov 2024 14:22:22 +0300

     

       4
       4
       -
       Subject: [PATCH] Gui: take in account module-path argument

     

       5
       5
       -
       

     

       6
       6
       -
       Use paths passed with `--module-path` argument to search for preference

     

       7
       7
       -
       packs

     

       8
       8
       -
       

     

       9
       9
       -
       Change-Id: If168dbd99a826757290ee6b918f5b712305fe2bb

     

       10
       10
       -
       ---

     

       11
       11
       -
        src/Gui/DlgPreferencePackManagementImp.cpp | 16 +++++----

     

       12
       12
       -
        src/Gui/PreferencePackManager.cpp          | 39 +++++++++++++++++-----

     

       13
       13
       -
        src/Gui/PreferencePackManager.h            |  5 +++

     

       14
       14
       -
        3 files changed, 44 insertions(+), 16 deletions(-)

     

       15
       15
       -
       

     

       16
       16
       -
       diff --git a/src/Gui/DlgPreferencePackManagementImp.cpp b/src/Gui/DlgPreferencePackManagementImp.cpp

     

       17
       17
       -
       index a1a0dad41a..50f3982f21 100644

     

       18
       18
       -
       --- a/src/Gui/DlgPreferencePackManagementImp.cpp

     

       19
       19
       -
       +++ b/src/Gui/DlgPreferencePackManagementImp.cpp

     

       20
       20
       -
       @@ -54,7 +54,7 @@ void DlgPreferencePackManagementImp::showEvent(QShowEvent* event)

     

       21
       21
       -
            // but can only disable individual installed packs (though we can completely uninstall the pack's

     

       22
       22
       -
            // containing Addon by redirecting to the Addon Manager).

     

       23
       23
       -
            auto savedPreferencePacksDirectory = fs::path(App::Application::getUserAppDataDir()) / "SavedPreferencePacks";

     

       24
       24
       -
       -    auto modDirectory = fs::path(App::Application::getUserAppDataDir()) / "Mod";

     

       25
       25
       -
       +    auto modDirectories = Application::Instance->prefPackManager()->modPaths();

     

       26
       26
       -
            auto resourcePath = fs::path(App::Application::getResourceDir()) / "Gui" / "PreferencePacks";

     

       27
       27
       -
        

     

       28
       28
       -
            // The displayed tree has two levels: at the toplevel is either "User-Saved Packs" or the name

     

       29
       29
       -
       @@ -66,12 +66,14 @@ void DlgPreferencePackManagementImp::showEvent(QShowEvent* event)

     

       30
       30
       -
            auto builtinPacks = getPacksFromDirectory(resourcePath);

     

       31
       31
       -
        

     

       32
       32
       -
            std::map<std::string, std::vector<std::string>> installedPacks;

     

       33
       33
       -
       -    if (fs::exists(modDirectory) && fs::is_directory(modDirectory)) {

     

       34
       34
       -
       -        for (const auto& mod : fs::directory_iterator(modDirectory)) {

     

       35
       35
       -
       -            auto packs = getPacksFromDirectory(mod);

     

       36
       36
       -
       -            if (!packs.empty()) {

     

       37
       37
       -
       -                auto modName = mod.path().filename().string();

     

       38
       38
       -
       -                installedPacks.emplace(modName, packs);

     

       39
       39
       -
       +    for (const auto& modDirectory : modDirectories) {

     

       40
       40
       -
       +        if (fs::exists(modDirectory) && fs::is_directory(modDirectory)) {

     

       41
       41
       -
       +            for (const auto& mod : fs::directory_iterator(modDirectory)) {

     

       42
       42
       -
       +                auto packs = getPacksFromDirectory(mod);

     

       43
       43
       -
       +                if (!packs.empty()) {

     

       44
       44
       -
       +                    auto modName = mod.path().filename().string();

     

       45
       45
       -
       +                    installedPacks.emplace(modName, packs);

     

       46
       46
       -
       +                }

     

       47
       47
       -
                    }

     

       48
       48
       -
                }

     

       49
       49
       -
            }

     

       50
       50
       -
       diff --git a/src/Gui/PreferencePackManager.cpp b/src/Gui/PreferencePackManager.cpp

     

       51
       51
       -
       index dfc54240c0..83e32fa05e 100644

     

       52
       52
       -
       --- a/src/Gui/PreferencePackManager.cpp

     

       53
       53
       -
       +++ b/src/Gui/PreferencePackManager.cpp

     

       54
       54
       -
       @@ -30,6 +30,7 @@

     

       55
       55
       -
        #endif

     

       56
       56
       -
        

     

       57
       57
       -
        #include <boost/filesystem.hpp>

     

       58
       58
       -
       +#include <boost/algorithm/string.hpp>

     

       59
       59
       -
        #include <QDir>

     

       60
       60
       -
        

     

       61
       61
       -
        #include "PreferencePackManager.h"

     

       62
       62
       -
       @@ -134,12 +135,11 @@ void PreferencePack::applyConfigChanges() const

     

       63
       63
       -
        }

     

       64
       64
       -
        

     

       65
       65
       -
        PreferencePackManager::PreferencePackManager()

     

       66
       66
       -
       +    : _preferencePackPaths(modPaths())

     

       67
       67
       -
        {

     

       68
       68
       -
       -    auto modPath = fs::path(App::Application::getUserAppDataDir()) / "Mod";

     

       69
       69
       -
            auto savedPath = fs::path(App::Application::getUserAppDataDir()) / "SavedPreferencePacks";

     

       70
       70
       -
            auto resourcePath = fs::path(App::Application::getResourceDir()) / "Gui" / "PreferencePacks";

     

       71
       71
       -
       -    _preferencePackPaths.push_back(resourcePath);

     

       72
       72
       -
       -    _preferencePackPaths.push_back(modPath);

     

       73
       73
       -
       +    _preferencePackPaths.insert(_preferencePackPaths.begin(), resourcePath);

     

       74
       74
       -
            _preferencePackPaths.push_back(savedPath);

     

       75
       75
       -
            rescan();

     

       76
       76
       -
        

     

       77
       77
       -
       @@ -232,6 +232,26 @@ void Gui::PreferencePackManager::importConfig(const std::string& packName,

     

       78
       78
       -
            rescan();

     

       79
       79
       -
        }

     

       80
       80
       -
        

     

       81
       81
       -
       +// TODO(Shvedov): Is this suitable place for this method? It is more generic,

     

       82
       82
       -
       +// and maybe more suitable place at Application?

     

       83
       83
       -
       +std::vector<boost::filesystem::path> Gui::PreferencePackManager::modPaths() const

     

       84
       84
       -
       +{

     

       85
       85
       -
       +    auto userModPath = fs::path(App::Application::getUserAppDataDir()) / "Mod";

     

       86
       86
       -
       +

     

       87
       87
       -
       +    auto& config = App::Application::Config();

     

       88
       88
       -
       +    auto additionalModules = config.find("AdditionalModulePaths");

     

       89
       89
       -
       +    std::vector<boost::filesystem::path> result;

     

       90
       90
       -
       +

     

       91
       91
       -
       +    if (additionalModules != config.end()) {

     

       92
       92
       -
       +        boost::split(result,

     

       93
       93
       -
       +                     additionalModules->second,

     

       94
       94
       -
       +                     boost::is_any_of(";"),

     

       95
       95
       -
       +                     boost::token_compress_on);

     

       96
       96
       -
       +    }

     

       97
       97
       -
       +    result.emplace_back(userModPath);

     

       98
       98
       -
       +    return result;

     

       99
       99
       -
       +}

     

       100
       100
       -
       +

     

       101
       101
       -
        void Gui::PreferencePackManager::FindPreferencePacksInPackage(const fs::path &mod)

     

       102
       102
       -
        {

     

       103
       103
       -
            try {

     

       104
       104
       -
       @@ -528,7 +548,6 @@ std::vector<PreferencePackManager::TemplateFile> PreferencePackManager::template

     

       105
       105
       -
            // (alternate spellings are provided for packages using CamelCase and snake_case, and both major English dialects)

     

       106
       106
       -
        

     

       107
       107
       -
            auto resourcePath = fs::path(App::Application::getResourceDir()) / "Gui";

     

       108
       108
       -
       -    auto modPath = fs::path(App::Application::getUserAppDataDir()) / "Mod";

     

       109
       109
       -
        

     

       110
       110
       -
            std::string group = "Built-In";

     

       111
       111
       -
            if (fs::exists(resourcePath) && fs::is_directory(resourcePath)) {

     

       112
       112
       -
       @@ -536,11 +555,13 @@ std::vector<PreferencePackManager::TemplateFile> PreferencePackManager::template

     

       113
       113
       -
                std::copy(localFiles.begin(), localFiles.end(), std::back_inserter(_templateFiles));

     

       114
       114
       -
            }

     

       115
       115
       -
        

     

       116
       116
       -
       -    if (fs::exists(modPath) && fs::is_directory(modPath)) {

     

       117
       117
       -
       -        for (const auto& mod : fs::directory_iterator(modPath)) {

     

       118
       118
       -
       -            group = mod.path().filename().string();

     

       119
       119
       -
       -            const auto localFiles = scanForTemplateFiles(group, mod);

     

       120
       120
       -
       -            std::copy(localFiles.begin(), localFiles.end(), std::back_inserter(_templateFiles));

     

       121
       121
       -
       +    for (const auto& modPath : modPaths()) {

     

       122
       122
       -
       +        if (fs::exists(modPath) && fs::is_directory(modPath)) {

     

       123
       123
       -
       +            for (const auto& mod : fs::directory_iterator(modPath)) {

     

       124
       124
       -
       +                group = mod.path().filename().string();

     

       125
       125
       -
       +                const auto localFiles = scanForTemplateFiles(group, mod);

     

       126
       126
       -
       +                std::copy(localFiles.begin(), localFiles.end(), std::back_inserter(_templateFiles));

     

       127
       127
       -
       +            }

     

       128
       128
       -
                }

     

       129
       129
       -
            }

     

       130
       130
       -
        

     

       131
       131
       -
       diff --git a/src/Gui/PreferencePackManager.h b/src/Gui/PreferencePackManager.h

     

       132
       132
       -
       index 301e160df2..e5776e47a0 100644

     

       133
       133
       -
       --- a/src/Gui/PreferencePackManager.h

     

       134
       134
       -
       +++ b/src/Gui/PreferencePackManager.h

     

       135
       135
       -
       @@ -191,6 +191,11 @@ namespace Gui {

     

       136
       136
       -
                 */

     

       137
       137
       -
                void importConfig(const std::string &packName, const boost::filesystem::path &path);

     

       138
       138
       -
        

     

       139
       139
       -
       +        /**

     

       140
       140
       -
       +         * Get a list of all mod directories.

     

       141
       141
       -
       +         */

     

       142
       142
       -
       +        std::vector<boost::filesystem::path> modPaths() const;

     

       143
       143
       -
       +

     

       144
       144
       -
            private:

     

       145
       145
       -
        

     

       146
       146
       -
                void FindPreferencePacksInPackage(const boost::filesystem::path& mod);

     

       147
       147
       -
       -- 

     

       148
       148
       -
       2.44.1

     

       149
       149
       -

+24 -9

pkgs/by-name/fr/freecad/package.nix

···

       6
       6
        
         doxygen,

     

       7
       7
        
         eigen,

     

       8
       8
        
         fetchFromGitHub,

     

       9
       9
       +
         fetchpatch,

     

       9
       10
        
         fmt,

     

       10
       11
        
         gfortran,

     

       11
       12
        
         gts,

     

       12
       13
        
         hdf5,

     

       13
       13
       -
         libf2c,

     

       14
       14
        
         libGLU,

     

       15
       15
        
         libredwg,

     

       16
       16
        
         libsForQt5,

     
···

       37
       37
        
         qtVersion ? 5,

     

       38
       38
        
         qt5,

     

       39
       39
        
         qt6,

     

       40
       40
       +
         nix-update-script,

     

       40
       41
        
       }:

     

       41
       42
        
       let

     

       42
       43
        
         inherit (python311Packages)

     
···

       64
       65
        
       freecad-utils.makeCustomizable (

     

       65
       66
        
         stdenv.mkDerivation (finalAttrs: {

     

       66
       67
        
           pname = "freecad";

     

       67
       67
       -
           version = "1.0.0";

     

       68
       68
       +
           version = "1.0.1";

     

       68
       69
        
       

     

       69
       70
        
           src = fetchFromGitHub {

     

       70
       71
        
             owner = "FreeCAD";

     

       71
       72
        
             repo = "FreeCAD";

     

       72
       73
        
             rev = finalAttrs.version;

     

       73
       73
       -
             hash = "sha256-u7RYSImUMAgKaAQSAGCFha++RufpZ/QuHAirbSFOUCI=";

     

       74
       74
       +
             hash = "sha256-VFTNawXxu2ofjj2Frg4OfVhiMKFywBhm7lZunP85ZEQ=";

     

       74
       75
        
             fetchSubmodules = true;

     

       75
       76
        
           };

     

       76
       77
        
       

     
···

       80
       81
        
               ninja

     

       81
       82
        
               pkg-config

     

       82
       83
        
               gfortran

     

       84
       84
       +
               swig

     

       85
       85
       +
               doxygen

     

       83
       86
        
               wrapGAppsHook3

     

       84
       87
        
             ]

     

       85
       88
        
             ++ lib.optionals (qtVersion == 5) [

     
···

       92
       95
        
             [

     

       93
       96
        
               boost

     

       94
       97
        
               coin3d

     

       95
       95
       -
               doxygen

     

       96
       98
        
               eigen

     

       97
       99
        
               fmt

     

       98
       100
        
               gitpython # for addon manager

     
···

       100
       102
        
               hdf5

     

       101
       103
        
               libGLU

     

       102
       104
        
               libXmu

     

       103
       103
       -
               libf2c

     

       104
       105
        
               matplotlib

     

       105
       106
        
               medfile

     

       106
       107
        
               mpi

     
···

       114
       115
        
               python

     

       115
       116
        
               pyyaml # (at least for) PyrateWorkbench

     

       116
       117
        
               scipy

     

       117
       117
       -
               swig

     

       118
       118
        
               vtk

     

       119
       119
        
               xercesc

     

       120
       120
        
               yaml-cpp

     
···

       152
       152
        
           patches = [

     

       153
       153
        
             ./0001-NIXOS-don-t-ignore-PYTHONPATH.patch

     

       154
       154
        
             ./0002-FreeCad-OndselSolver-pkgconfig.patch

     

       155
       155
       -
             ./0003-Gui-take-in-account-module-path-argument.patch

     

       155
       155
       +
             (fetchpatch {

     

       156
       156
       +
               url = "https://github.com/FreeCAD/FreeCAD/commit/8e04c0a3dd9435df0c2dec813b17d02f7b723b19.patch?full_index=1";

     

       157
       157
       +
               hash = "sha256-H6WbJFTY5/IqEdoi5N+7D4A6pVAmZR4D+SqDglwS18c=";

     

       158
       158
       +
             })

     

       156
       159
        
           ];

     

       157
       160
        
       

     

       158
       161
        
           cmakeFlags =

     
···

       206
       209
        
       

     

       207
       210
        
           postFixup = ''

     

       208
       211
        
             mv $out/share/doc $out

     

       212
       212
       +
             ln -s $out/doc $out/share/doc

     

       209
       213
        
             ln -s $out/bin/FreeCAD $out/bin/freecad

     

       210
       214
        
             ln -s $out/bin/FreeCADCmd $out/bin/freecadcmd

     

       211
       215
        
           '';

     

       212
       216
        
       

     

       213
       213
       -
           passthru.tests = callPackage ./tests { };

     

       217
       217
       +
           passthru = {

     

       218
       218
       +
             tests = callPackage ./tests { };

     

       219
       219
       +
             updateScript = nix-update-script {

     

       220
       220
       +
               extraArgs = [

     

       221
       221
       +
                 "--version-regex"

     

       222
       222
       +
                 "([0-9.]+)"

     

       223
       223
       +
               ];

     

       224
       224
       +
             };

     

       225
       225
       +
           };

     

       214
       226
        
       

     

       215
       227
        
           meta = {

     

       216
       228
        
             homepage = "https://www.freecad.org";

     
···

       232
       244
        
               right at home with FreeCAD.

     

       233
       245
        
             '';

     

       234
       246
        
             license = lib.licenses.lgpl2Plus;

     

       235
       235
       -
             maintainers = with lib.maintainers; [ srounce ];

     

       247
       247
       +
             maintainers = with lib.maintainers; [

     

       248
       248
       +
               srounce

     

       249
       249
       +
               grimmauld

     

       250
       250
       +
             ];

     

       236
       251
        
             platforms = lib.platforms.linux;

     

       237
       252
        
           };

     

       238
       253
        
         })

+17 -1

pkgs/by-name/gi/git-cola/package.nix

···

       7
       7
        
         git,

     

       8
       8
        
         qt5,

     

       9
       9
        
         versionCheckHook,

     

       10
       10
       +
         copyDesktopItems,

     

       11
       11
       +
         imagemagick,

     

       10
       12
        
         nix-update-script,

     

       11
       13
        
       }:

     

       12
       14
        
       

     
···

       38
       40
        
           gettext

     

       39
       41
        
           qt5.wrapQtAppsHook

     

       40
       42
        
           python3Packages.setuptools-scm

     

       41
       41
       -
         ];

     

       43
       43
       +
           imagemagick

     

       44
       44
       +
         ] ++ lib.optionals stdenv.hostPlatform.isLinux [ copyDesktopItems ];

     

       42
       45
        
       

     

       43
       46
        
         nativeCheckInputs = [

     

       44
       47
        
           git

     
···

       55
       58
        
       

     

       56
       59
        
         preFixup = ''

     

       57
       60
        
           makeWrapperArgs+=("''${qtWrapperArgs[@]}")

     

       61
       61
       +
         '';

     

       62
       62
       +
       

     

       63
       63
       +
         desktopItems = [

     

       64
       64
       +
           "share/applications/git-cola-folder-handler.desktop"

     

       65
       65
       +
           "share/applications/git-cola.desktop"

     

       66
       66
       +
           "share/applications/git-dag.desktop"

     

       67
       67
       +
         ];

     

       68
       68
       +
       

     

       69
       69
       +
         postInstall = ''

     

       70
       70
       +
           for i in 16 24 48 64 96 128 256 512; do

     

       71
       71
       +
             mkdir -p $out/share/icons/hicolor/''${i}x''${i}/apps

     

       72
       72
       +
             magick cola/icons/git-cola.svg -background none -resize ''${i}x''${i} $out/share/icons/hicolor/''${i}x''${i}/apps/${pname}.png

     

       73
       73
       +
           done

     

       58
       74
        
         '';

     

       59
       75
        
       

     

       60
       76
        
         passthru.updateScript = nix-update-script { };

+1 -1

pkgs/by-name/me/mealie/package.nix

···

       109
       109
        
       

     

       110
       110
        
         # Needed for tests

     

       111
       111
        
         preCheck = ''

     

       112
       112
       -
           export NLTK_DATA=${nltk-data.averaged_perceptron_tagger_eng}

     

       112
       112
       +
           export NLTK_DATA=${nltk-data.averaged-perceptron-tagger-eng}

     

       113
       113
        
         '';

     

       114
       114
        
       

     

       115
       115
        
         disabledTestPaths = [

+2 -2

pkgs/by-name/me/media-downloader/package.nix

···

       16
       16
        
       

     

       17
       17
        
       stdenv.mkDerivation (finalAttrs: {

     

       18
       18
        
         pname = "media-downloader";

     

       19
       19
       -
         version = "5.3.2";

     

       19
       19
       +
         version = "5.3.3";

     

       20
       20
        
       

     

       21
       21
        
         src = fetchFromGitHub {

     

       22
       22
        
           owner = "mhogomchungu";

     

       23
       23
        
           repo = "media-downloader";

     

       24
       24
        
           rev = finalAttrs.version;

     

       25
       25
       -
           hash = "sha256-rNcEPE1BoCltpV5A3ugc7NI2ASfLXuPC9NNbc4Gn8BA=";

     

       25
       25
       +
           hash = "sha256-vVTTICGtuSUWz10iEEsMUSLwlZmOjW+ffpZ3T7Hy+WU=";

     

       26
       26
        
         };

     

       27
       27
        
       

     

       28
       28
        
         nativeBuildInputs = [

+3

pkgs/by-name/ne/neo4j/package.nix

···

       7
       7
        
         openjdk17,

     

       8
       8
        
         which,

     

       9
       9
        
         gawk,

     

       10
       10
       +
         bashNonInteractive,

     

       10
       11
        
       }:

     

       11
       12
        
       

     

       12
       13
        
       stdenv.mkDerivation rec {

     
···

       19
       20
        
         };

     

       20
       21
        
       

     

       21
       22
        
         nativeBuildInputs = [ makeWrapper ];

     

       23
       23
       +
         buildInputs = [ bashNonInteractive ];

     

       24
       24
       +
         strictDeps = true;

     

       22
       25
        
       

     

       23
       26
        
         installPhase = ''

     

       24
       27
        
           mkdir -p "$out/share/neo4j"

+3 -3

pkgs/by-name/nf/nfpm/package.nix

···

       9
       9
        
       

     

       10
       10
        
       buildGoModule rec {

     

       11
       11
        
         pname = "nfpm";

     

       12
       12
       -
         version = "2.42.0";

     

       12
       12
       +
         version = "2.42.1";

     

       13
       13
        
       

     

       14
       14
        
         src = fetchFromGitHub {

     

       15
       15
        
           owner = "goreleaser";

     

       16
       16
        
           repo = pname;

     

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

     

       18
       18
       -
           hash = "sha256-63vhxsoGK8YNs0wobFyViOHO9K3hSHgWJU/wbvUxJFw=";

     

       18
       18
       +
           hash = "sha256-uHtrxBlSlVBmpVqE645nRNQ3mL07Uj9YrmG/jAfuyyg=";

     

       19
       19
        
         };

     

       20
       20
        
       

     

       21
       21
       -
         vendorHash = "sha256-VA6/n89OIX+Au1JmCwWezh80xEtydUgBWYSlwpyXZtA=";

     

       21
       21
       +
         vendorHash = "sha256-pxOxiYYvzIAmXo4rRLpngG4ILUhc1f1DJqwNxXlCXtM=";

     

       22
       22
        
       

     

       23
       23
        
         ldflags = [

     

       24
       24
        
           "-s"

+2 -2

pkgs/by-name/pa/paperless-ngx/package.nix

···

       313
       313
        
             tesseract5

     

       314
       314
        
             ;

     

       315
       315
        
           nltkData = with nltk-data; [

     

       316
       316
       -
             punkt_tab

     

       317
       317
       -
             snowball_data

     

       316
       316
       +
             punkt-tab

     

       317
       317
       +
             snowball-data

     

       318
       318
        
             stopwords

     

       319
       319
        
           ];

     

       320
       320
        
           tests = { inherit (nixosTests) paperless; };

+2 -2

pkgs/by-name/qm/qmmp/package.nix

···

       54
       54
        
       

     

       55
       55
        
       stdenv.mkDerivation rec {

     

       56
       56
        
         pname = "qmmp";

     

       57
       57
       -
         version = "2.2.5";

     

       57
       57
       +
         version = "2.2.6";

     

       58
       58
        
       

     

       59
       59
        
         src = fetchurl {

     

       60
       60
        
           url = "https://qmmp.ylsoftware.com/files/qmmp/2.2/${pname}-${version}.tar.bz2";

     

       61
       61
       -
           hash = "sha256-WCEfMnrDhau8fXXmpdjdZLzbXMDxEZMp8pJ9FjEJfhg=";

     

       61
       61
       +
           hash = "sha256-Jw7Kb9co2aC8fxnpTg4OH2o8RNreZI3/pYoNu3OWy0s=";

     

       62
       62
        
         };

     

       63
       63
        
       

     

       64
       64
        
         nativeBuildInputs = [

+3 -3

pkgs/by-name/rc/rcp/package.nix

···

       7
       7
        
       

     

       8
       8
        
       rustPlatform.buildRustPackage rec {

     

       9
       9
        
         pname = "rcp";

     

       10
       10
       -
         version = "0.16.0";

     

       10
       10
       +
         version = "0.17.0";

     

       11
       11
        
       

     

       12
       12
        
         src = fetchFromGitHub {

     

       13
       13
        
           owner = "wykurz";

     

       14
       14
        
           repo = "rcp";

     

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

     

       16
       16
       -
           hash = "sha256-mMSO5twpuxiA6pMG/bNMn3WJjs3ZwuoOk62M0WIrRBk=";

     

       16
       16
       +
           hash = "sha256-mFFMxGu/r8xtfMkpDW2Rk/oTWQcS9oK6ngoRKCc+STo=";

     

       17
       17
        
         };

     

       18
       18
        
       

     

       19
       19
        
         useFetchCargoVendor = true;

     

       20
       20
       -
         cargoHash = "sha256-uVBWPxGxNgiahywA78QjN8msNx3gZ6vOyX7AkOdK2EM=";

     

       20
       20
       +
         cargoHash = "sha256-2S3bygSu9ouT/RYCmafFGvFHHFJXVryb5E3PMmcZs0U=";

     

       21
       21
        
       

     

       22
       22
        
         RUSTFLAGS = "--cfg tokio_unstable";

     

       23
       23

+32

pkgs/by-name/sb/sbarlua/package.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         lib,

     

       3
       3
       +
         fetchFromGitHub,

     

       4
       4
       +
         gcc,

     

       5
       5
       +
         lua54Packages,

     

       6
       6
       +
         readline,

     

       7
       7
       +
       }:

     

       8
       8
       +
       lua54Packages.buildLuaPackage {

     

       9
       9
       +
         pname = "sbarLua";

     

       10
       10
       +
         version = "0-unstable-2024-08-12";

     

       11
       11
       +
       

     

       12
       12
       +
         src = fetchFromGitHub {

     

       13
       13
       +
           owner = "FelixKratz";

     

       14
       14
       +
           repo = "SbarLua";

     

       15
       15
       +
           rev = "437bd2031da38ccda75827cb7548e7baa4aa9978";

     

       16
       16
       +
           hash = "sha256-F0UfNxHM389GhiPQ6/GFbeKQq5EvpiqQdvyf7ygzkPg=";

     

       17
       17
       +
         };

     

       18
       18
       +
       

     

       19
       19
       +
         nativeBuildInputs = [ gcc ];

     

       20
       20
       +
       

     

       21
       21
       +
         buildInputs = [ readline ];

     

       22
       22
       +
       

     

       23
       23
       +
         makeFlags = [ "INSTALL_DIR=$(out)/lib/lua/${lua54Packages.lua.luaversion}" ];

     

       24
       24
       +
       

     

       25
       25
       +
         meta = {

     

       26
       26
       +
           description = "Lua API for SketchyBar";

     

       27
       27
       +
           homepage = "https://github.com/FelixKratz/SbarLua/";

     

       28
       28
       +
           license = lib.licenses.gpl3;

     

       29
       29
       +
           maintainers = [ lib.maintainers.khaneliman ];

     

       30
       30
       +
           platforms = lib.platforms.darwin;

     

       31
       31
       +
         };

     

       32
       32
       +
       }

+2 -2

pkgs/by-name/sc/sc-im/package.nix

···

       17
       17
        
       

     

       18
       18
        
       stdenv.mkDerivation rec {

     

       19
       19
        
         pname = "sc-im";

     

       20
       20
       -
         version = "0.8.4";

     

       20
       20
       +
         version = "0.8.5";

     

       21
       21
        
       

     

       22
       22
        
         src = fetchFromGitHub {

     

       23
       23
        
           owner = "andmarti1424";

     

       24
       24
        
           repo = "sc-im";

     

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

     

       26
       26
       -
           sha256 = "sha256-nNOifSYbmJjuw6c8TerIQRlhCwbs7GnzD2J7O3vs0gI=";

     

       26
       26
       +
           sha256 = "sha256-V2XwzZwn+plMxQuTCYxbeTaqdud69z77oMDDDi+7Jw0=";

     

       27
       27
        
         };

     

       28
       28
        
       

     

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

+1 -1

pkgs/by-name/un/unstructured-api/package.nix

···

       152
       152
        
       

     

       153
       153
        
           paths = [

     

       154
       154
        
             nltk-data.punkt

     

       155
       155
       -
             nltk-data.averaged_perceptron_tagger

     

       155
       155
       +
             nltk-data.averaged-perceptron-tagger

     

       156
       156
        
           ];

     

       157
       157
        
         };

     

       158
       158
        
       in

+2 -2

pkgs/by-name/vp/vpl-gpu-rt/package.nix

···

       10
       10
        
       

     

       11
       11
        
       stdenv.mkDerivation rec {

     

       12
       12
        
         pname = "vpl-gpu-rt";

     

       13
       13
       -
         version = "25.2.1";

     

       13
       13
       +
         version = "25.2.2";

     

       14
       14
        
       

     

       15
       15
        
         outputs = [

     

       16
       16
        
           "out"

     
···

       21
       21
        
           owner = "intel";

     

       22
       22
        
           repo = "vpl-gpu-rt";

     

       23
       23
        
           rev = "intel-onevpl-${version}";

     

       24
       24
       -
           hash = "sha256-K6w5A0LbQDTKM5y5AzZ/Hr/FwQLZqHov0tiJHbzUE4w=";

     

       24
       24
       +
           hash = "sha256-RUzDNJ22oJhOKM0q+wzMpNmqtNGxNsVai0Homj5XuBs=";

     

       25
       25
        
         };

     

       26
       26
        
       

     

       27
       27
        
         nativeBuildInputs = [

+1 -1

pkgs/development/python-modules/aider-chat/default.nix

···

       125
       125
        
         aider-nltk-data = symlinkJoin {

     

       126
       126
        
           name = "aider-nltk-data";

     

       127
       127
        
           paths = [

     

       128
       128
       -
             nltk-data.punkt_tab

     

       128
       128
       +
             nltk-data.punkt-tab

     

       129
       129
        
             nltk-data.stopwords

     

       130
       130
        
           ];

     

       131
       131
        
         };

+1 -1

pkgs/development/python-modules/ingredient-parser-nlp/default.nix

···

       44
       44
        
       

     

       45
       45
        
         # Needed for tests

     

       46
       46
        
         preCheck = ''

     

       47
       47
       -
           export NLTK_DATA=${nltk-data.averaged_perceptron_tagger_eng}

     

       47
       47
       +
           export NLTK_DATA=${nltk-data.averaged-perceptron-tagger-eng}

     

       48
       48
        
         '';

     

       49
       49
        
       

     

       50
       50
        
         meta = {

+1 -1

pkgs/development/python-modules/type-infer/default.nix

···

       24
       24
        
           name = "nltk-test-data";

     

       25
       25
        
           paths = [

     

       26
       26
        
             nltk-data.punkt

     

       27
       27
       -
             nltk-data.punkt_tab

     

       27
       27
       +
             nltk-data.punkt-tab

     

       28
       28
        
             nltk-data.stopwords

     

       29
       29
        
           ];

     

       30
       30
        
         };

+3 -3

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

···

       187
       187
        
             };

     

       188
       188
        
       

     

       189
       189
        
             nixComponents_git = nixDependencies.callPackage ./modular/packages.nix rec {

     

       190
       190
       -
               version = "2.29pre20250409_${lib.substring 0 8 src.rev}";

     

       190
       190
       +
               version = "2.30pre20250521_${lib.substring 0 8 src.rev}";

     

       191
       191
        
               inherit (self.nix_2_24.meta) maintainers teams;

     

       192
       192
        
               otherSplices = generateSplicesForNixComponents "nixComponents_git";

     

       193
       193
        
               src = fetchFromGitHub {

     

       194
       194
        
                 owner = "NixOS";

     

       195
       195
        
                 repo = "nix";

     

       196
       196
       -
                 rev = "e76bbe413e86e3208bb9824e339d59af25327101";

     

       197
       197
       -
                 hash = "sha256-Aqnj5+sA7B4ZRympuyfWPPK83iomKHEHMYhlwslI8iA=";

     

       196
       196
       +
                 rev = "76a4d4c2913a1654dddd195b034ff7e66cb3e96f";

     

       197
       197
       +
                 hash = "sha256-OA22Ig72oV6reHN8HMlimmnrsxpNzqyzi4h6YBVzzEA=";

     

       198
       198
        
               };

     

       199
       199
        
             };

     

       200
       200

+1

pkgs/tools/package-management/nix/dependencies.nix

···

       72
       72
        
           aws-sdk-cpp =

     

       73
       73
        
             (regular.aws-sdk-cpp.override {

     

       74
       74
        
               apis = [

     

       75
       75
       +
                 "identity-management"

     

       75
       76
        
                 "s3"

     

       76
       77
        
                 "transfer"

     

       77
       78
        
               ];

+211 -36

pkgs/tools/text/nltk-data/default.nix

···

       10
       10
        
           version = "0-unstable-2024-07-29";

     

       11
       11
        
           nativeBuildInputs = [ unzip ];

     

       12
       12
        
           dontBuild = true;

     

       13
       13
       +
           dontFixup = true;

     

       13
       14
        
           meta = with lib; {

     

       14
       15
        
             description = "NLTK Data";

     

       15
       16
        
             homepage = "https://github.com/nltk/nltk_data";

     

       16
       17
        
             license = licenses.asl20;

     

       17
       18
        
             platforms = platforms.all;

     

       18
       18
       -
             maintainers = with maintainers; [ happysalada ];

     

       19
       19
       +
             maintainers = with maintainers; [

     

       20
       20
       +
               bengsparks

     

       21
       21
       +
               happysalada

     

       22
       22
       +
             ];

     

       19
       23
        
           };

     

       20
       24
        
         };

     

       21
       25
        
         makeNltkDataPackage =

     
···

       50
       54
        
               '';

     

       51
       55
        
             }

     

       52
       56
        
           );

     

       57
       57
       +
       

     

       58
       58
       +
         makeChunker =

     

       59
       59
       +
           pname:

     

       60
       60
       +
           makeNltkDataPackage {

     

       61
       61
       +
             inherit pname;

     

       62
       62
       +
             location = "chunkers";

     

       63
       63
       +
             hash = "sha256-kemjqaCM9hlKAdMw8oVJnp62EAC9rMQ50dKg7wlAwEc=";

     

       64
       64
       +
           };

     

       65
       65
       +
       

     

       66
       66
       +
         makeCorpus =

     

       67
       67
       +
           pname:

     

       68
       68
       +
           makeNltkDataPackage {

     

       69
       69
       +
             inherit pname;

     

       70
       70
       +
             location = "corpora";

     

       71
       71
       +
             hash = "sha256-8lMjW5YI8h6dHJ/83HVY2OYGDyKPpgkUAKPISiAKqqk=";

     

       72
       72
       +
           };

     

       73
       73
       +
       

     

       74
       74
       +
         makeGrammar =

     

       75
       75
       +
           pname:

     

       76
       76
       +
           makeNltkDataPackage {

     

       77
       77
       +
             inherit pname;

     

       78
       78
       +
             location = "grammars";

     

       79
       79
       +
             hash = "sha256-pyLEcX3Azv8j1kCGvVYonuiNgVJxtWt7veU0S/yNbIM=";

     

       80
       80
       +
           };

     

       81
       81
       +
       

     

       82
       82
       +
         makeHelp =

     

       83
       83
       +
           pname:

     

       84
       84
       +
           makeNltkDataPackage {

     

       85
       85
       +
             inherit pname;

     

       86
       86
       +
             location = "help";

     

       87
       87
       +
             hash = "sha256-97mYLNES5WujLF5gD8Ul4cJ6LqSzz+jDzclUsdBeHNE=";

     

       88
       88
       +
           };

     

       89
       89
       +
       

     

       90
       90
       +
         makeMisc =

     

       91
       91
       +
           pname:

     

       92
       92
       +
           makeNltkDataPackage {

     

       93
       93
       +
             inherit pname;

     

       94
       94
       +
             location = "misc";

     

       95
       95
       +
             hash = "sha256-XtizfEsc8TYWqvvC/eSFdha2ClC5/ZiJM8nue0vXLb4=";

     

       96
       96
       +
           };

     

       97
       97
       +
       

     

       98
       98
       +
         makeModel =

     

       99
       99
       +
           pname:

     

       100
       100
       +
           makeNltkDataPackage {

     

       101
       101
       +
             inherit pname;

     

       102
       102
       +
             location = "models";

     

       103
       103
       +
             hash = "sha256-iq3weEgCci6rgLW2j28F2eRLprJtInGXKe/awJPSVG4=";

     

       104
       104
       +
           };

     

       105
       105
       +
       

     

       106
       106
       +
         makeTagger =

     

       107
       107
       +
           pname:

     

       108
       108
       +
           makeNltkDataPackage {

     

       109
       109
       +
             inherit pname;

     

       110
       110
       +
             location = "taggers";

     

       111
       111
       +
             hash = "sha256-tl3Cn2okhBkUtTXvAmFRx72Brez6iTGRdmFTwFmpk3M=";

     

       112
       112
       +
           };

     

       113
       113
       +
       

     

       114
       114
       +
         makeTokenizer =

     

       115
       115
       +
           pname:

     

       116
       116
       +
           makeNltkDataPackage {

     

       117
       117
       +
             inherit pname;

     

       118
       118
       +
             location = "tokenizers";

     

       119
       119
       +
             hash = "sha256-OzMkruoYbFKqzuimOXIpE5lhHz8tmSqOFoLT+fjdTVg=";

     

       120
       120
       +
           };

     

       121
       121
       +
       

     

       122
       122
       +
         makeStemmer =

     

       123
       123
       +
           pname:

     

       124
       124
       +
           makeNltkDataPackage {

     

       125
       125
       +
             inherit pname;

     

       126
       126
       +
             location = "stemmers";

     

       127
       127
       +
             hash = "sha256-mNefwOPVJGz9kXV3LV4DuV7FJpNir/Nwg4ujd0CogEk=";

     

       128
       128
       +
           };

     

       53
       129
        
       in

     

       54
       130
        
       lib.makeScope newScope (self: {

     

       55
       55
       -
         punkt = makeNltkDataPackage {

     

       56
       56
       -
           pname = "punkt";

     

       57
       57
       -
           location = "tokenizers";

     

       58
       58
       -
           hash = "sha256-OzMkruoYbFKqzuimOXIpE5lhHz8tmSqOFoLT+fjdTVg=";

     

       59
       59
       -
         };

     

       60
       60
       -
         punkt_tab = makeNltkDataPackage {

     

       61
       61
       -
           pname = "punkt_tab";

     

       62
       62
       -
           location = "tokenizers";

     

       63
       63
       -
           hash = "sha256-OzMkruoYbFKqzuimOXIpE5lhHz8tmSqOFoLT+fjdTVg=";

     

       64
       64
       -
         };

     

       65
       65
       -
         averaged_perceptron_tagger = makeNltkDataPackage {

     

       66
       66
       -
           pname = "averaged_perceptron_tagger";

     

       67
       67
       -
           location = "taggers";

     

       68
       68
       -
           hash = "sha256-tl3Cn2okhBkUtTXvAmFRx72Brez6iTGRdmFTwFmpk3M=";

     

       69
       69
       -
         };

     

       70
       70
       -
         averaged_perceptron_tagger_eng = makeNltkDataPackage {

     

       71
       71
       -
           pname = "averaged_perceptron_tagger_eng";

     

       72
       72
       -
           location = "taggers";

     

       73
       73
       -
           hash = "sha256-tl3Cn2okhBkUtTXvAmFRx72Brez6iTGRdmFTwFmpk3M=";

     

       74
       74
       -
         };

     

       75
       75
       -
         snowball_data = makeNltkDataPackage {

     

       76
       76
       -
           pname = "snowball_data";

     

       77
       77
       -
           location = "stemmers";

     

       78
       78
       -
           hash = "sha256-mNefwOPVJGz9kXV3LV4DuV7FJpNir/Nwg4ujd0CogEk=";

     

       79
       79
       -
         };

     

       80
       80
       -
         stopwords = makeNltkDataPackage {

     

       81
       81
       -
           pname = "stopwords";

     

       82
       82
       -
           location = "corpora";

     

       83
       83
       -
           hash = "sha256-8lMjW5YI8h6dHJ/83HVY2OYGDyKPpgkUAKPISiAKqqk=";

     

       84
       84
       -
         };

     

       85
       85
       -
         wordnet = makeNltkDataPackage {

     

       86
       86
       -
           pname = "wordnet";

     

       87
       87
       -
           location = "corpora";

     

       88
       88
       -
           hash = "sha256-8lMjW5YI8h6dHJ/83HVY2OYGDyKPpgkUAKPISiAKqqk=";

     

       89
       89
       -
         };

     

       131
       131
       +
         ## Chunkers

     

       132
       132
       +
         maxent-ne-chunker = makeChunker "maxent_ne_chunker";

     

       133
       133
       +
         maxent-ne-chunker-tab = makeChunker "maxent_ne_chunker_tab";

     

       134
       134
       +
       

     

       135
       135
       +
         ## Corpora

     

       136
       136
       +
         abc = makeCorpus "abc";

     

       137
       137
       +
         alpino = makeCorpus "alpino";

     

       138
       138
       +
         bcp47 = makeCorpus "bcp47";

     

       139
       139
       +
         biocreative-ppi = makeCorpus "biocreative_ppi";

     

       140
       140
       +
         brown = makeCorpus "brown";

     

       141
       141
       +
         brown-tei = makeCorpus "brown_tei";

     

       142
       142
       +
         cess-cat = makeCorpus "cess_cat";

     

       143
       143
       +
         cess-esp = makeCorpus "cess_esp";

     

       144
       144
       +
         chat80 = makeCorpus "chat80";

     

       145
       145
       +
         city-database = makeCorpus "city_database";

     

       146
       146
       +
         cmudict = makeCorpus "cmudict";

     

       147
       147
       +
         comparative-sentences = makeCorpus "comparative_sentences";

     

       148
       148
       +
         comtrans = makeCorpus "comtrans";

     

       149
       149
       +
         conll2000 = makeCorpus "conll2000";

     

       150
       150
       +
         conll2002 = makeCorpus "conll2002";

     

       151
       151
       +
         conll2007 = makeCorpus "conll2007";

     

       152
       152
       +
         crubadan = makeCorpus "crubadan";

     

       153
       153
       +
         dependency-treebank = makeCorpus "dependency_treebank";

     

       154
       154
       +
         dolch = makeCorpus "dolch";

     

       155
       155
       +
         europarl-raw = makeCorpus "europarl_raw";

     

       156
       156
       +
         extended-omw = makeCorpus "extended_omw";

     

       157
       157
       +
         floresta = makeCorpus "floresta";

     

       158
       158
       +
         framenet-v15 = makeCorpus "framenet_v15";

     

       159
       159
       +
         framenet-v17 = makeCorpus "framenet_v17";

     

       160
       160
       +
         gazetteers = makeCorpus "gazetteers";

     

       161
       161
       +
         genesis = makeCorpus "genesis";

     

       162
       162
       +
         gutenberg = makeCorpus "gutenberg";

     

       163
       163
       +
         ieer = makeCorpus "ieer";

     

       164
       164
       +
         inaugural = makeCorpus "inaugural";

     

       165
       165
       +
         indian = makeCorpus "indian";

     

       166
       166
       +
         jeita = makeCorpus "jeita";

     

       167
       167
       +
         kimmo = makeCorpus "kimmo";

     

       168
       168
       +
         knbc = makeCorpus "knbc";

     

       169
       169
       +
         lin-thesaurus = makeCorpus "lin_thesaurus";

     

       170
       170
       +
         mac-morpho = makeCorpus "mac_morpho";

     

       171
       171
       +
         machado = makeCorpus "machado";

     

       172
       172
       +
         masc-tagged = makeCorpus "masc_tagged";

     

       173
       173
       +
         movie-reviews = makeCorpus "movie_reviews";

     

       174
       174
       +
         mte-teip5 = makeCorpus "mte_teip5";

     

       175
       175
       +
         names = makeCorpus "names";

     

       176
       176
       +
         nombank-1-0 = makeCorpus "nombank.1.0";

     

       177
       177
       +
         nonbreaking-prefixes = makeCorpus "nonbreaking_prefixes";

     

       178
       178
       +
         nps-chat = makeCorpus "nps_chat";

     

       179
       179
       +
         omw = makeCorpus "omw";

     

       180
       180
       +
         omw-1-4 = makeCorpus "omw-1.4";

     

       181
       181
       +
         opinion-lexicon = makeCorpus "opinion_lexicon";

     

       182
       182
       +
         panlex-swadesh = makeCorpus "panlex_swadesh";

     

       183
       183
       +
         paradigms = makeCorpus "paradigms";

     

       184
       184
       +
         pe08 = makeCorpus "pe08";

     

       185
       185
       +
         pil = makeCorpus "pil";

     

       186
       186
       +
         pl196x = makeCorpus "pl196x";

     

       187
       187
       +
         ppattach = makeCorpus "ppattach";

     

       188
       188
       +
         problem-reports = makeCorpus "problem_reports";

     

       189
       189
       +
         product-reviews-1 = makeCorpus "product_reviews_1";

     

       190
       190
       +
         product-reviews-2 = makeCorpus "product_reviews_2";

     

       191
       191
       +
         propbank = makeCorpus "propbank";

     

       192
       192
       +
         pros-cons = makeCorpus "pros_cons";

     

       193
       193
       +
         ptb = makeCorpus "ptb";

     

       194
       194
       +
         qc = makeCorpus "qc";

     

       195
       195
       +
         reuters = makeCorpus "reuters";

     

       196
       196
       +
         rte = makeCorpus "rte";

     

       197
       197
       +
         semcor = makeCorpus "semcor";

     

       198
       198
       +
         senseval = makeCorpus "senseval";

     

       199
       199
       +
         sentence-polarity = makeCorpus "sentence_polarity";

     

       200
       200
       +
         sentiwordnet = makeCorpus "sentiwordnet";

     

       201
       201
       +
         shakespeare = makeCorpus "shakespeare";

     

       202
       202
       +
         sinica-treebank = makeCorpus "sinica_treebank";

     

       203
       203
       +
         smultron = makeCorpus "smultron";

     

       204
       204
       +
         state-union = makeCorpus "state_union";

     

       205
       205
       +
         stopwords = makeCorpus "stopwords";

     

       206
       206
       +
         subjectivity = makeCorpus "subjectivity";

     

       207
       207
       +
         swadesh = makeCorpus "swadesh";

     

       208
       208
       +
         switchboard = makeCorpus "switchboard";

     

       209
       209
       +
         timit = makeCorpus "timit";

     

       210
       210
       +
         toolbox = makeCorpus "toolbox";

     

       211
       211
       +
         treebank = makeCorpus "treebank";

     

       212
       212
       +
         twitter-samples = makeCorpus "twitter_samples";

     

       213
       213
       +
         udhr = makeCorpus "udhr";

     

       214
       214
       +
         udhr2 = makeCorpus "udhr2";

     

       215
       215
       +
         unicode-samples = makeCorpus "unicode_samples";

     

       216
       216
       +
         universal-treebanks-v20 = makeCorpus "universal_treebanks_v20";

     

       217
       217
       +
         verbnet = makeCorpus "verbnet";

     

       218
       218
       +
         verbnet3 = makeCorpus "verbnet3";

     

       219
       219
       +
         webtext = makeCorpus "webtext";

     

       220
       220
       +
         wordnet = makeCorpus "wordnet";

     

       221
       221
       +
         wordnet-ic = makeCorpus "wordnet_ic";

     

       222
       222
       +
         wordnet2021 = makeCorpus "wordnet2021";

     

       223
       223
       +
         wordnet2022 = makeCorpus "wordnet2022";

     

       224
       224
       +
         wordnet31 = makeCorpus "wordnet31";

     

       225
       225
       +
         words = makeCorpus "words";

     

       226
       226
       +
         ycoe = makeCorpus "ycoe";

     

       227
       227
       +
       

     

       228
       228
       +
         ## Grammars

     

       229
       229
       +
         basque-grammars = makeGrammar "basque_grammars";

     

       230
       230
       +
         book-grammars = makeGrammar "book_grammars";

     

       231
       231
       +
         large-grammars = makeGrammar "large_grammars";

     

       232
       232
       +
         sample-grammars = makeGrammar "sample_grammars";

     

       233
       233
       +
         spanish-grammars = makeGrammar "spanish_grammars";

     

       234
       234
       +
       

     

       235
       235
       +
         ## Help

     

       236
       236
       +
         tagsets-json = makeHelp "tagsets_json";

     

       237
       237
       +
       

     

       238
       238
       +
         ## Misc

     

       239
       239
       +
         mwa-ppdb = makeMisc "mwa_ppdb";

     

       240
       240
       +
         perluniprops = makeMisc "perluniprops";

     

       241
       241
       +
       

     

       242
       242
       +
         ## Models

     

       243
       243
       +
         bllip-wsj-no-aux = makeModel "bllip_wsj_no_aux";

     

       244
       244
       +
         moses-sample = makeModel "moses_sample";

     

       245
       245
       +
         wmt15-eval = makeModel "wmt15_eval";

     

       246
       246
       +
         word2vec-sample = makeModel "word2vec_sample";

     

       247
       247
       +
       

     

       248
       248
       +
         ## Taggers

     

       249
       249
       +
         averaged-perceptron-tagger = makeTagger "averaged_perceptron_tagger";

     

       250
       250
       +
         averaged-perceptron-tagger-eng = makeTagger "averaged_perceptron_tagger_eng";

     

       251
       251
       +
         averaged-perceptron-tagger-ru = makeTagger "averaged_perceptron_tagger_ru";

     

       252
       252
       +
         averaged-perceptron-tagger-rus = makeTagger "averaged_perceptron_tagger_rus";

     

       253
       253
       +
         maxent-treebank-pos-tagger = makeTagger "maxent_treebank_pos_tagger";

     

       254
       254
       +
         maxent-treebank-pos-tagger-tab = makeTagger "maxent_treebank_pos_tagger_tab";

     

       255
       255
       +
         universal-tagset = makeTagger "universal_tagset";

     

       256
       256
       +
       

     

       257
       257
       +
         ## Tokenizers

     

       258
       258
       +
         punkt = makeTokenizer "punkt";

     

       259
       259
       +
         punkt-tab = makeTokenizer "punkt_tab";

     

       260
       260
       +
       

     

       261
       261
       +
         ## Stemmers

     

       262
       262
       +
         porter-test = makeStemmer "porter_test";

     

       263
       263
       +
         rslp = makeStemmer "rslp";

     

       264
       264
       +
         snowball-data = makeStemmer "snowball_data";

     

       90
       265
        
       })

+4

pkgs/top-level/aliases.nix

···

       1353
       1353
        
         # When the nixops_unstable alias is removed, nixops_unstable_minimal can be renamed to nixops_unstable.

     

       1354
       1354
        
       

     

       1355
       1355
        
         nixosTest = testers.nixosTest; # Added 2022-05-05

     

       1356
       1356
       +
         nltk-data.averaged_perceptron_tagger = nltk-data.averaged-perceptron-tagger; # Added 2025-05-21

     

       1357
       1357
       +
         nltk-data.averaged_perceptron_tagger_eng = nltk-data.averaged-perceptron-tagger-eng; # Added 2025-05-21

     

       1358
       1358
       +
         nltk-data.punkt_tab = nltk-data.punkt-tab; # Added 2025-05-21

     

       1359
       1359
       +
         nltk-data.snowball_data = nltk-data.snowball-data; # Added 2025-05-21

     

       1356
       1360
        
         nmap-unfree = throw "'nmap-unfree' has been renamed to/replaced by 'nmap'"; # Converted to throw 2024-10-17

     

       1357
       1361
        
         noah = throw "'noah' has been removed because it was broken and its upstream archived"; # Added 2025-05-10

     

       1358
       1362
        
         nodejs_18 = throw "Node.js 18.x has reached End-Of-Life and has been removed"; # Added 2025-04-23

+1 -1

pkgs/top-level/all-packages.nix

···

       2343
       2343
        
       

     

       2344
       2344
        
         mpd-sima = python3Packages.callPackage ../tools/audio/mpd-sima { };

     

       2345
       2345
        
       

     

       2346
       2346
       -
         nltk-data = callPackage ../tools/text/nltk-data { };

     

       2346
       2346
       +
         nltk-data = lib.recurseIntoAttrs (callPackage ../tools/text/nltk-data { });

     

       2347
       2347
        
       

     

       2348
       2348
        
         seabios-coreboot = seabios.override { ___build-type = "coreboot"; };

     

       2349
       2349
        
         seabios-csm = seabios.override { ___build-type = "csm"; };