commit 6d43ecacaa3379b1c44cc8e3547b659db4c4c512 · pyrox.dev/nixpkgs

+1 -1

doc/stdenv/stdenv.chapter.md

···

       400
       400
        
       

     

       401
       401
        
       ##### `propagatedNativeBuildInputs` {#var-stdenv-propagatedNativeBuildInputs}

     

       402
       402
        
       

     

       403
       403
       -
       The propagated equivalent of `nativeBuildInputs`. This would be called `depsBuildHostPropagated` but for historical continuity. For example, if package `Y` has `propagatedNativeBuildInputs = [X]`, and package `Z` has `buildInputs = [Y]`, then package `Z` will be built as if it included package `X` in its `nativeBuildInputs`. If instead, package `Z` has `nativeBuildInputs = [Y]`, then `Z` will be built as if it included `X` in the `depsBuildBuild` of package `Z`, because of the sum of the two `-1` host offsets.

     

       403
       403
       +
       The propagated equivalent of `nativeBuildInputs`. This would be called `depsBuildHostPropagated` but for historical continuity. For example, if package `Y` has `propagatedNativeBuildInputs = [X]`, and package `Z` has `buildInputs = [Y]`, then package `Z` will be built as if it included package `X` in its `nativeBuildInputs`. Note that if instead, package `Z` has `nativeBuildInputs = [Y]`, then `X` will not be included at all.

     

       404
       404
        
       

     

       405
       405
        
       ##### `depsBuildTargetPropagated` {#var-stdenv-depsBuildTargetPropagated}

     

       406
       406

+2 -2

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

···

       27
       27
        
       - `services.dex` now restarts upon changes to the `.environmentFile` or entries in `.settings.staticClients[].secretFile` when the entry is a `path` type.

     

       28
       28
        
       

     

       29
       29
        
       - `nixos-rebuild-ng`, a full rewrite of `nixos-rebuild` in Python, is available for testing. You can enable it by setting [system.rebuild.enableNg](options.html#opt-system.rebuild.enableNg) in your configuration (this will replace the old `nixos-rebuild`), or by adding `nixos-rebuild-ng` to your `environment.systemPackages` (in this case, it will live side-by-side with `nixos-rebuild` as `nixos-rebuild-ng`). It is expected that the next major version of NixOS (25.11) will enable `system.rebuild.enableNg` by default.

     

       30
       30
       +
       

     

       30
       31
        
       - A `nixos-rebuild build-image` sub-command has been added.

     

       32
       32
       +
         It allows users to build platform-specific (disk) images from their NixOS configurations. `nixos-rebuild build-image` works similar to the popular [nix-community/nixos-generators](https://github.com/nix-community/nixos-generators) project. See new [section on image building in the nixpkgs manual](https://nixos.org/manual/nixpkgs/unstable/#sec-image-nixos-rebuild-build-image). It is also available for `nixos-rebuild-ng`.

     

       31
       33
        
       

     

       32
       34
        
       - `nixos-option` has been rewritten to a Nix expression called by a simple bash script. This lowers our maintenance threshold, makes eval errors less verbose, adds support for flake-based configurations, descending into `attrsOf` and `listOf` submodule options, and `--show-trace`.

     

       33
       33
       -
       

     

       34
       34
       -
         It allows users to build platform-specific (disk) images from their NixOS configurations. `nixos-rebuild build-image` works similar to the popular [nix-community/nixos-generators](https://github.com/nix-community/nixos-generators) project. See new [section on image building in the nixpkgs manual](https://nixos.org/manual/nixpkgs/unstable/#sec-image-nixos-rebuild-build-image).

     

       35
       35
        
       

     

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

     

       37
       37

+137 -4

nixos/modules/programs/pay-respects.nix

···

       7
       7
        
       let

     

       8
       8
        
         inherit (lib)

     

       9
       9
        
           getExe

     

       10
       10
       +
           isBool

     

       11
       11
       +
           literalExpression

     

       10
       12
        
           maintainers

     

       11
       13
        
           mkEnableOption

     

       12
       14
        
           mkIf

     

       15
       15
       +
           mkMerge

     

       13
       16
        
           mkOption

     

       17
       17
       +
           mkPackageOption

     

       14
       18
        
           optionalString

     

       19
       19
       +
           replaceChars

     

       20
       20
       +
           substring

     

       21
       21
       +
           toLower

     

       15
       22
        
           types

     

       16
       23
        
           ;

     

       17
       17
       -
         inherit (types) str;

     

       24
       24
       +
         inherit (types)

     

       25
       25
       +
           bool

     

       26
       26
       +
           either

     

       27
       27
       +
           listOf

     

       28
       28
       +
           str

     

       29
       29
       +
           submodule

     

       30
       30
       +
           ;

     

       31
       31
       +
       

     

       18
       32
        
         cfg = config.programs.pay-respects;

     

       19
       33
        
       

     

       34
       34
       +
         settingsFormat = pkgs.formats.toml { };

     

       35
       35
       +
         inherit (settingsFormat) generate type;

     

       36
       36
       +
       

     

       37
       37
       +
         finalPackage =

     

       38
       38
       +
           if cfg.aiIntegration != true then

     

       39
       39
       +
             (pkgs.runCommand "pay-respects-wrapper"

     

       40
       40
       +
               {

     

       41
       41
       +
                 nativeBuildInputs = [ pkgs.makeBinaryWrapper ];

     

       42
       42
       +
                 inherit (cfg.package) meta;

     

       43
       43
       +
               }

     

       44
       44
       +
               ''

     

       45
       45
       +
                 mkdir -p $out/bin

     

       46
       46
       +
                 makeWrapper ${getExe cfg.package} $out/bin/${cfg.package.meta.mainProgram} \

     

       47
       47
       +
                   ${optionalString (cfg.aiIntegration == false) "--set _PR_AI_DISABLE true"}

     

       48
       48
       +
                   ${optionalString (cfg.aiIntegration != false) ''

     

       49
       49
       +
                     --set _PR_AI_URL ${cfg.aiIntegration.url} \

     

       50
       50
       +
                     --set _PR_AI_MODEL ${cfg.aiIntegration.model} \

     

       51
       51
       +
                     --set _PR_AI_LOCALE ${cfg.aiIntegration.locale}

     

       52
       52
       +
                   ''}

     

       53
       53
       +
               ''

     

       54
       54
       +
             )

     

       55
       55
       +
           else

     

       56
       56
       +
             cfg.package;

     

       57
       57
       +
       

     

       20
       58
        
         initScript =

     

       21
       59
        
           shell:

     

       22
       60
        
           if (shell != "fish") then

     

       23
       61
        
             ''

     

       24
       24
       -
               eval $(${getExe pkgs.pay-respects} ${shell} --alias ${cfg.alias})

     

       62
       62
       +
               eval $(${getExe finalPackage} ${shell} --alias ${cfg.alias})

     

       25
       63
        
             ''

     

       26
       64
        
           else

     

       27
       65
        
             ''

     

       28
       28
       -
               ${getExe pkgs.pay-respects} ${shell} --alias ${cfg.alias} | source

     

       66
       66
       +
               ${getExe finalPackage} ${shell} --alias ${cfg.alias} | source

     

       29
       67
        
             '';

     

       30
       68
        
       in

     

       31
       69
        
       {

     
···

       33
       71
        
           programs.pay-respects = {

     

       34
       72
        
             enable = mkEnableOption "pay-respects, an app which corrects your previous console command";

     

       35
       73
        
       

     

       74
       74
       +
             package = mkPackageOption pkgs "pay-respects" { };

     

       75
       75
       +
       

     

       36
       76
        
             alias = mkOption {

     

       37
       77
        
               default = "f";

     

       38
       78
        
               type = str;

     
···

       41
       81
        
                 The default value is `f`, but you can use anything else as well.

     

       42
       82
        
               '';

     

       43
       83
        
             };

     

       84
       84
       +
             runtimeRules = mkOption {

     

       85
       85
       +
               type = listOf type;

     

       86
       86
       +
               default = [ ];

     

       87
       87
       +
               example = literalExpression ''

     

       88
       88
       +
                 [

     

       89
       89
       +
                   {

     

       90
       90
       +
                     command = "xl";

     

       91
       91
       +
                     match_err = [

     

       92
       92
       +
                       {

     

       93
       93
       +
                         pattern = [

     

       94
       94
       +
                           "Permission denied"

     

       95
       95
       +
                         ];

     

       96
       96
       +
                         suggest = [

     

       97
       97
       +
                           '''

     

       98
       98
       +
                             #[executable(sudo), !cmd_contains(sudo), err_contains(libxl: error:)]

     

       99
       99
       +
                             sudo {{command}}

     

       100
       100
       +
                           '''

     

       101
       101
       +
                         ];

     

       102
       102
       +
                       }

     

       103
       103
       +
                     ];

     

       104
       104
       +
                   }

     

       105
       105
       +
                 ];

     

       106
       106
       +
               '';

     

       107
       107
       +
               description = ''

     

       108
       108
       +
                 List of rules to be added to `/etc/xdg/pay-respects/rules`.

     

       109
       109
       +
                 `pay-respects` will read the contents of these generated rules to recommend command corrections.

     

       110
       110
       +
                 Each rule module should start with the `command` attribute that specifies the command name. See the [upstream documentation](https://codeberg.org/iff/pay-respects/src/branch/main/rules.md) for more information.

     

       111
       111
       +
               '';

     

       112
       112
       +
             };

     

       113
       113
       +
             aiIntegration = mkOption {

     

       114
       114
       +
               default = false;

     

       115
       115
       +
               example = {

     

       116
       116
       +
                 url = "http://127.0.0.1:11434/v1/chat/completions";

     

       117
       117
       +
                 model = "llama3";

     

       118
       118
       +
                 locale = "nl-be";

     

       119
       119
       +
               };

     

       120
       120
       +
               description = ''

     

       121
       121
       +
                 Whether to enable `pay-respects`' LLM integration. When there is no rule for a given error, `pay-respects` can query an OpenAI-compatible API endpoint for command corrections.

     

       122
       122
       +
       

     

       123
       123
       +
                 - If this is set to `false`, all LLM-related features are disabled.

     

       124
       124
       +
                 - If this is set to `true`, the default OpenAI endpoint will be used, using upstream's API key. This default API key may be rate-limited.

     

       125
       125
       +
                 - You can also set a custom API endpoint, large language model and locale for command corrections. Simply access the `aiIntegration.url`, `aiIntegration.model` and `aiIntegration.locale` options, as described in the example.

     

       126
       126
       +
                   - Take a look at the [services.ollama](#opt-services.ollama.enable) NixOS module if you wish to host a local large language model for `pay-respects`.

     

       127
       127
       +
       

     

       128
       128
       +
                 For all of these methods, you can set a custom secret API key by using the `_PR_AI_API_KEY` environment variable.

     

       129
       129
       +
               '';

     

       130
       130
       +
               type = either bool (submodule {

     

       131
       131
       +
                 options = {

     

       132
       132
       +
                   url = mkOption {

     

       133
       133
       +
                     default = "";

     

       134
       134
       +
                     example = "https://api.openai.com/v1/chat/completions";

     

       135
       135
       +
                     type = str;

     

       136
       136
       +
                     description = "The OpenAI-compatible API endpoint that `pay-respects` will query for command corrections.";

     

       137
       137
       +
                   };

     

       138
       138
       +
                   model = mkOption {

     

       139
       139
       +
                     default = "";

     

       140
       140
       +
                     example = "llama3";

     

       141
       141
       +
                     type = str;

     

       142
       142
       +
                     description = "The model used by `pay-respects` to generate command corrections.";

     

       143
       143
       +
                   };

     

       144
       144
       +
                   locale = mkOption {

     

       145
       145
       +
                     default = toLower (replaceChars [ "_" ] [ "-" ] (substring 0 5 config.i18n.defaultLocale));

     

       146
       146
       +
                     example = "nl-be";

     

       147
       147
       +
                     type = str;

     

       148
       148
       +
                     description = ''

     

       149
       149
       +
                       The locale to be used for LLM responses.

     

       150
       150
       +
                       The accepted format is a lowercase [`ISO 639-1` language code](https://en.wikipedia.org/wiki/List_of_ISO_639_language_codes), followed by a dash '-', followed by a lowercase [`ISO 3166-1 alpha-2` country code](https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2).

     

       151
       151
       +
                     '';

     

       152
       152
       +
                   };

     

       153
       153
       +
                 };

     

       154
       154
       +
               });

     

       155
       155
       +
             };

     

       44
       156
        
           };

     

       45
       157
        
         };

     

       46
       158
        
       

     

       47
       159
        
         config = mkIf cfg.enable {

     

       48
       48
       -
           environment.systemPackages = [ pkgs.pay-respects ];

     

       160
       160
       +
           assertions =

     

       161
       161
       +
             map

     

       162
       162
       +
               (attr: {

     

       163
       163
       +
                 assertion = (!isBool cfg.aiIntegration) -> (cfg.aiIntegration.${attr} != "");

     

       164
       164
       +
                 message = ''

     

       165
       165
       +
                   programs.pay-respects.aiIntegration is configured as a submodule, but you have not configured a value for programs.pay-respects.aiIntegration.${attr}!

     

       166
       166
       +
                 '';

     

       167
       167
       +
               })

     

       168
       168
       +
               [

     

       169
       169
       +
                 "url"

     

       170
       170
       +
                 "model"

     

       171
       171
       +
               ];

     

       172
       172
       +
           environment = mkMerge (

     

       173
       173
       +
             [

     

       174
       174
       +
               {

     

       175
       175
       +
                 systemPackages = [ finalPackage ];

     

       176
       176
       +
               }

     

       177
       177
       +
             ]

     

       178
       178
       +
             ++ map (rule: {

     

       179
       179
       +
               etc."xdg/pay-respects/rules/${rule.command}.toml".source = generate "${rule.command}.toml" rule;

     

       180
       180
       +
             }) cfg.runtimeRules

     

       181
       181
       +
           );

     

       49
       182
        
       

     

       50
       183
        
           programs = {

     

       51
       184
        
             bash.interactiveShellInit = initScript "bash";

+1 -1

nixos/modules/services/backup/borgbackup.md

···

       23
       23
        
       A very basic configuration for backing up to a locally accessible directory is:

     

       24
       24
        
       ```nix

     

       25
       25
        
       {

     

       26
       26
       -
           opt.services.borgbackup.jobs = {

     

       26
       26
       +
           services.borgbackup.jobs = {

     

       27
       27
        
             rootBackup = {

     

       28
       28
        
               paths = "/";

     

       29
       29
        
               exclude = [ "/nix" "/path/to/local/repo" ];

-2

nixos/modules/services/home-automation/wyoming/faster-whisper.nix

···

       10
       10
        
         cfg = config.services.wyoming.faster-whisper;

     

       11
       11
        
       

     

       12
       12
        
         inherit (lib)

     

       13
       13
       -
           escapeShellArgs

     

       14
       13
        
           mkOption

     

       15
       14
        
           mkEnableOption

     

       16
       15
        
           mkPackageOption

     
···

       240
       239
        
                       description = ''

     

       241
       240
        
                         Extra arguments to pass to the server commandline.

     

       242
       241
        
                       '';

     

       243
       243
       -
                       apply = escapeShellArgs;

     

       244
       242
        
                     };

     

       245
       243
        
                   };

     

       246
       244
        
                 }

+1 -1

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

···

       43
       43
        
             default = true;

     

       44
       44
        
             description = ''

     

       45
       45
        
               Whether to create a local database automatically.

     

       46
       46
       -
               This will override every database setting in {option}`services.engelsystem.config`.

     

       46
       46
       +
               This will override every database setting in {option}`services.engelsystem.settings`.

     

       47
       47
        
             '';

     

       48
       48
        
           };

     

       49
       49

+1 -1

nixos/tests/davis.nix

···

       48
       48
        
                     "curl -c /tmp/cookies -sSfL --resolve davis.example.com:80:127.0.0.1 http://davis.example.com/login | grep '_csrf_token' | sed -E 's,.*value=\"(.*)\".*,\\1,g'"

     

       49
       49
        
                 )

     

       50
       50
        
                 r = machine.succeed(

     

       51
       51
       -
                     f"curl -b /tmp/cookies --resolve davis.example.com:80:127.0.0.1 http://davis.example.com/login -X POST -F username=admin -F password=nixos -F _csrf_token={csrf_token.strip()} -D headers"

     

       51
       51
       +
                     f"curl -b /tmp/cookies --resolve davis.example.com:80:127.0.0.1 http://davis.example.com/login -X POST -F _username=admin -F _password=nixos -F _csrf_token={csrf_token.strip()} -D headers"

     

       52
       52
        
                 )

     

       53
       53
        
                 print(r)

     

       54
       54
        
                 machine.succeed(

+12

pkgs/applications/editors/vim/plugins/generated.nix

···

       10771
       10771
        
           meta.homepage = "https://github.com/olivercederborg/poimandres.nvim/";

     

       10772
       10772
        
         };

     

       10773
       10773
        
       

     

       10774
       10774
       +
         pomo-nvim = buildVimPlugin {

     

       10775
       10775
       +
           pname = "pomo.nvim";

     

       10776
       10776
       +
           version = "2024-07-30";

     

       10777
       10777
       +
           src = fetchFromGitHub {

     

       10778
       10778
       +
             owner = "epwalsh";

     

       10779
       10779
       +
             repo = "pomo.nvim";

     

       10780
       10780
       +
             rev = "aa8decc421d89be0f10b1fc6a602cdd269f350ff";

     

       10781
       10781
       +
             sha256 = "1drld6dmibkg4b35n181v98gwfi8yhshx1gfkg82k72a5apr77dl";

     

       10782
       10782
       +
           };

     

       10783
       10783
       +
           meta.homepage = "https://github.com/epwalsh/pomo.nvim/";

     

       10784
       10784
       +
         };

     

       10785
       10785
       +
       

     

       10774
       10786
        
         pony-vim-syntax = buildVimPlugin {

     

       10775
       10787
        
           pname = "pony-vim-syntax";

     

       10776
       10788
        
           version = "2017-09-26";

+1

pkgs/applications/editors/vim/plugins/vim-plugin-names

···

       892
       892
        
       https://github.com/nvim-treesitter/playground/,,

     

       893
       893
        
       https://github.com/nvim-lua/plenary.nvim/,,

     

       894
       894
        
       https://github.com/olivercederborg/poimandres.nvim/,HEAD,

     

       895
       895
       +
       https://github.com/epwalsh/pomo.nvim/,HEAD,

     

       895
       896
        
       https://github.com/dleonard0/pony-vim-syntax/,,

     

       896
       897
        
       https://github.com/RishabhRD/popfix/,,

     

       897
       898
        
       https://github.com/nvim-lua/popup.nvim/,,

+2 -2

pkgs/applications/misc/xygrib/default.nix

+3 -3

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

···

       9
       9
        
       

     

       10
       10
        
       buildGoModule rec {

     

       11
       11
        
         pname = "helmfile";

     

       12
       12
       -
         version = "0.169.2";

     

       12
       12
       +
         version = "0.170.0";

     

       13
       13
        
       

     

       14
       14
        
         src = fetchFromGitHub {

     

       15
       15
        
           owner = "helmfile";

     

       16
       16
        
           repo = "helmfile";

     

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

     

       18
       18
       -
           hash = "sha256-OoCLFhGeciCUC7Tb6+Md8tmamc/j0AeSlu5Krmkhxyc=";

     

       18
       18
       +
           hash = "sha256-HlSpY7+Qct2vxtAejrwmmWhnWq+jVycjuxQ42KScpSs=";

     

       19
       19
        
         };

     

       20
       20
        
       

     

       21
       21
       -
         vendorHash = "sha256-VBgWnDi0jaZ+91kkYeX9QyNBrP9W+mSMjexwzZiKZWs=";

     

       21
       21
       +
         vendorHash = "sha256-BmEtzUUORY/ck158+1ItVeiG9mzXdikjjUX7XwQ7xoo=";

     

       22
       22
        
       

     

       23
       23
        
         proxyVendor = true; # darwin/linux hash mismatch

     

       24
       24

+3 -2

pkgs/applications/radio/uhd/default.nix

···

       8
       8
        
         cmake,

     

       9
       9
        
         pkg-config,

     

       10
       10
        
         # See https://files.ettus.com/manual_archive/v3.15.0.0/html/page_build_guide.html for dependencies explanations

     

       11
       11
       -
         boost,

     

       11
       11
       +
         # Pin Boost 1.86 due to use of boost::asio::io_service.

     

       12
       12
       +
         boost186,

     

       12
       13
        
         ncurses,

     

       13
       14
        
         enableCApi ? true,

     

       14
       15
        
         enablePythonApi ? true,

     
···

       164
       165
        
         buildInputs =

     

       165
       166
        
           finalAttrs.pythonPath

     

       166
       167
        
           ++ [

     

       167
       167
       -
             boost

     

       168
       168
       +
             boost186

     

       168
       169
        
             libusb1

     

       169
       170
        
           ]

     

       170
       171
        
           ++ optionals (enableExamples) [

+2 -2

pkgs/applications/video/kodi/addons/visualization-projectm/default.nix

···

       3
       3
        
       buildKodiBinaryAddon rec {

     

       4
       4
        
         pname = "visualization-projectm";

     

       5
       5
        
         namespace = "visualization.projectm";

     

       6
       6
       -
         version = "21.0.1";

     

       6
       6
       +
         version = "21.0.2";

     

       7
       7
        
       

     

       8
       8
        
         src = fetchFromGitHub {

     

       9
       9
        
           owner = "xbmc";

     

       10
       10
        
           repo = namespace;

     

       11
       11
        
           rev = "${version}-${rel}";

     

       12
       12
       -
           hash = "sha256-wjSQmOtQb4KjY3iH3Xh7AdQwE6ked+cpW6/gdNYS+NA=";

     

       12
       12
       +
           hash = "sha256-M+sHws9wp0sp1PnYXCLMZ9w48tJkG159XkyNvzHJNYo=";

     

       13
       13
        
         };

     

       14
       14
        
       

     

       15
       15
        
         extraBuildInputs = [ pkg-config libGL projectm ];

+2 -2

pkgs/applications/video/mpv/scripts/modernz.nix

···

       7
       7
        
       }:

     

       8
       8
        
       buildLua (finalAttrs: {

     

       9
       9
        
         pname = "modernx";

     

       10
       10
       -
         version = "0.2.3";

     

       10
       10
       +
         version = "0.2.4";

     

       11
       11
        
       

     

       12
       12
        
         scriptPath = "modernz.lua";

     

       13
       13
        
         src = fetchFromGitHub {

     

       14
       14
        
           owner = "Samillion";

     

       15
       15
        
           repo = "ModernZ";

     

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

     

       17
       17
       -
           hash = "sha256-yjxMBGXpu7Uyt0S9AW8ewGRNzbdu2S8N0st7VSKlqcc=";

     

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

     

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
        
         postInstall = ''

+4 -9

pkgs/by-name/ae/aerc/package.nix

···

       14
       14
        
       

     

       15
       15
        
       buildGoModule rec {

     

       16
       16
        
         pname = "aerc";

     

       17
       17
       -
         version = "0.18.2";

     

       17
       17
       +
         version = "0.19.0";

     

       18
       18
        
       

     

       19
       19
        
         src = fetchFromSourcehut {

     

       20
       20
        
           owner = "~rjarry";

     

       21
       21
        
           repo = "aerc";

     

       22
       22
        
           rev = version;

     

       23
       23
       -
           hash = "sha256-J4W7ynJ5DpE97sILENNt6eya04aiq9DWBhlytsVmZHg=";

     

       23
       23
       +
           hash = "sha256-YlpR85jB6Il3UW4MTaf8pkilRVjkO0q/D/Yu+OiBX6Y=";

     

       24
       24
        
         };

     

       25
       25
        
       

     

       26
       26
        
         proxyVendor = true;

     

       27
       27
       -
         vendorHash = "sha256-STQzc25gRozNHKjjYb8J8CL5WMhnx+nTJOGbuFmUYSU=";

     

       27
       27
       +
         vendorHash = "sha256-WowRlAzyrfZi27JzskIDberiYt9PQkuS6H3hKqUP9qo=";

     

       28
       28
        
       

     

       29
       29
        
         nativeBuildInputs = [

     

       30
       30
        
           scdoc

     
···

       33
       33
        
       

     

       34
       34
        
         patches = [

     

       35
       35
        
           ./runtime-libexec.patch

     

       36
       36
       -
       

     

       37
       37
       -
           # patch to fix a encoding problem with gpg signed messages

     

       38
       38
       -
           (fetchpatch {

     

       39
       39
       -
             url = "https://git.sr.ht/~rjarry/aerc/commit/7346d20.patch";

     

       40
       40
       -
             hash = "sha256-OCm8BcovYN2IDSgslZklQxkGVkSYQ8HLCrf2+DRB2mM=";

     

       41
       41
       -
           })

     

       42
       36
        
         ];

     

       43
       37
        
       

     

       44
       38
        
         postPatch = ''

     

       45
       39
        
           substituteAllInPlace config/aerc.conf

     

       46
       40
        
           substituteAllInPlace config/config.go

     

       47
       41
        
           substituteAllInPlace doc/aerc-config.5.scd

     

       42
       42
       +
           substituteAllInPlace doc/aerc-templates.7.scd

     

       48
       43
        
       

     

       49
       44
        
           # Prevent buildGoModule from trying to build this

     

       50
       45
        
           rm contrib/linters.go

+64 -15

pkgs/by-name/ae/aerc/runtime-libexec.patch

···

       1
       1
        
       diff --git a/config/aerc.conf b/config/aerc.conf

     

       2
       2
       -
       index 7d33b43..4315f0e 100644

     

       2
       2
       +
       index fbc1f3ba..9eea2b81 100644

     

       3
       3
        
       --- a/config/aerc.conf

     

       4
       4
        
       +++ b/config/aerc.conf

     

       5
       5
       -
       @@ -202,8 +202,7 @@

     

       5
       5
       +
       @@ -301,8 +301,7 @@

     

       6
       6
        
        #

     

       7
       7
        
        #   ${XDG_CONFIG_HOME:-~/.config}/aerc/stylesets

     

       8
       8
        
        #   ${XDG_DATA_HOME:-~/.local/share}/aerc/stylesets

     
···

       12
       12
        
        #

     

       13
       13
        
        #stylesets-dirs=

     

       14
       14
        
        

     

       15
       15
       -
       @@ -547,8 +546,7 @@ message/rfc822=colorize

     

       15
       15
       +
       @@ -741,8 +740,8 @@

     

       16
       16
       +
        #   ${XDG_DATA_HOME:-~/.local/share}/aerc/filters

     

       17
       17
       +
        #   $PREFIX/libexec/aerc/filters

     

       18
       18
       +
        #   $PREFIX/share/aerc/filters

     

       19
       19
       +
       -#   /usr/libexec/aerc/filters

     

       20
       20
       +
       -#   /usr/share/aerc/filters

     

       21
       21
       +
       +#   @out@/libexec/aerc/filters

     

       22
       22
       +
       +#   @out@/share/aerc/filters

     

       23
       23
       +
        #

     

       24
       24
       +
        # If you want to run a program in your default $PATH which has the same name

     

       25
       25
       +
        # as a builtin filter (e.g. /usr/bin/colorize), use its absolute path.

     

       26
       26
       +
       @@ -845,8 +844,7 @@ text/html=! html

     

       16
       27
        
        #

     

       17
       28
        
        #   ${XDG_CONFIG_HOME:-~/.config}/aerc/templates

     

       18
       29
        
        #   ${XDG_DATA_HOME:-~/.local/share}/aerc/templates

     
···

       23
       34
        
        #template-dirs=

     

       24
       35
        
        

     

       25
       36
        
       diff --git a/config/config.go b/config/config.go

     

       26
       26
       -
       index d70bcfe..c19e59a 100644

     

       37
       37
       +
       index 14c4b233..9f305ffd 100644

     

       27
       38
        
       --- a/config/config.go

     

       28
       39
        
       +++ b/config/config.go

     

       29
       29
       -
       @@ -54,10 +54,8 @@ func buildDefaultDirs() []string {

     

       40
       40
       +
       @@ -46,10 +46,8 @@ func buildDefaultDirs() []string {

     

       30
       41
        
        	}

     

       31
       42
        
        

     

       32
       43
        
        	// Add fixed fallback locations

     
···

       40
       51
        
        	return defaultDirs

     

       41
       52
        
        }

     

       42
       53
        
       diff --git a/doc/aerc-config.5.scd b/doc/aerc-config.5.scd

     

       43
       43
       -
       index 9e1f8a3..694abbc 100644

     

       54
       54
       +
       index 1e3daaa9..cd118be0 100644

     

       44
       55
        
       --- a/doc/aerc-config.5.scd

     

       45
       56
        
       +++ b/doc/aerc-config.5.scd

     

       46
       46
       -
       @@ -300,8 +300,7 @@ These options are configured in the *[ui]* section of _aerc.conf_.

     

       57
       57
       +
       @@ -13,7 +13,7 @@ _aerc_, which defaults to _~/.config/aerc_. Alternate files can be specified via

     

       58
       58
       +
        command line arguments, see *aerc*(1).

     

       59
       59
       +
        

     

       60
       60
       +
        Examples of these config files are typically included with your installation of

     

       61
       61
       +
       -aerc and are usually installed in _/usr/share/aerc_.

     

       62
       62
       +
       +aerc and are usually installed in _@out@/share/aerc_.

     

       63
       63
       +
        

     

       64
       64
       +
        Each file uses the ini format, and consists of sections with keys and values.

     

       65
       65
       +
        A line beginning with _#_ is considered a comment and ignored, as are empty

     

       66
       66
       +
       @@ -386,8 +386,7 @@ These options are configured in the *[ui]* section of _aerc.conf_.

     

       47
       67
        
        	```

     

       48
       68
        
        	${XDG_CONFIG_HOME:-~/.config}/aerc/stylesets

     

       49
       69
        
        	${XDG_DATA_HOME:-~/.local/share}/aerc/stylesets

     
···

       53
       73
        
        	```

     

       54
       74
        
        

     

       55
       75
        
        *styleset-name* = _<string>_

     

       56
       56
       -
       @@ -900,8 +899,7 @@ These options are configured in the *[templates]* section of _aerc.conf_.

     

       76
       76
       +
       @@ -1019,7 +1018,7 @@ will be set to the terminal TTY. The filter is expected to implement its own

     

       77
       77
       +
        paging.

     

       78
       78
       +
        

     

       79
       79
       +
        aerc ships with some default filters installed in the libexec directory (usually

     

       80
       80
       +
       -_/usr/libexec/aerc/filters_). Note that these may have additional dependencies

     

       81
       81
       +
       +_@out@/libexec/aerc/filters_). Note that these may have additional dependencies

     

       82
       82
       +
        that aerc does not have alone.

     

       83
       83
       +
        

     

       84
       84
       +
        The filter commands are invoked with _sh -c command_. The following folders are

     

       85
       85
       +
       @@ -1031,8 +1030,8 @@ ${XDG_CONFIG_HOME:-~/.config}/aerc/filters

     

       86
       86
       +
        ${XDG_DATA_HOME:-~/.local/share}/aerc/filters

     

       87
       87
       +
        $PREFIX/libexec/aerc/filters

     

       88
       88
       +
        $PREFIX/share/aerc/filters

     

       89
       89
       +
       -/usr/libexec/aerc/filters

     

       90
       90
       +
       -/usr/share/aerc/filters

     

       91
       91
       +
       +@out@/libexec/aerc/filters

     

       92
       92
       +
       +@out@/share/aerc/filters

     

       93
       93
       +
        ```

     

       94
       94
       +
        

     

       95
       95
       +
        If you want to run a program in your default *$PATH* which has the same

     

       96
       96
       +
       @@ -1370,7 +1369,7 @@ of the template name. The available symbols and functions are described in

     

       97
       97
       +
        *aerc-templates*(7).

     

       98
       98
       +
        

     

       99
       99
       +
        aerc ships with some default templates installed in the share directory (usually

     

       100
       100
       +
       -_/usr/share/aerc/templates_).

     

       101
       101
       +
       +_@out@/share/aerc/templates_).

     

       102
       102
       +
        

     

       103
       103
       +
        These options are configured in the *[templates]* section of _aerc.conf_.

     

       104
       104
       +
        

     

       105
       105
       +
       @@ -1382,8 +1381,7 @@ These options are configured in the *[templates]* section of _aerc.conf_.

     

       57
       106
        
        	```

     

       58
       107
        
        	${XDG_CONFIG_HOME:-~/.config}/aerc/templates

     

       59
       108
        
        	${XDG_DATA_HOME:-~/.local/share}/aerc/templates

     
···

       64
       113
        
        

     

       65
       114
        
        *new-message* = _<template_name>_

     

       66
       115
        
       diff --git a/doc/aerc-templates.7.scd b/doc/aerc-templates.7.scd

     

       67
       67
       -
       index ae9bc6d..5f42b14 100644

     

       116
       116
       +
       index a6deb584..4f91869c 100644

     

       68
       117
        
       --- a/doc/aerc-templates.7.scd

     

       69
       118
        
       +++ b/doc/aerc-templates.7.scd

     

       70
       70
       -
       @@ -319,7 +319,7 @@ aerc provides the following additional functions:

     

       71
       71
       -
        	Execute external command, provide the second argument to its stdin.

     

       119
       119
       +
       @@ -398,7 +398,7 @@ aerc provides the following additional functions:

     

       120
       120
       +
        	Attaches a file to the message being composed.

     

       72
       121
        
        

     

       73
       122
        
        	```

     

       74
       74
       -
       -	{{exec `/usr/libexec/aerc/filters/html` .OriginalText}}

     

       75
       75
       -
       +	{{exec `@out@/libexec/aerc/filters/html` .OriginalText}}

     

       123
       123
       +
       -	{{.Attach '/usr/libexec/aerc/filters/html'}}

     

       124
       124
       +
       +	{{.Attach '@out@/libexec/aerc/filters/html'}}

     

       76
       125
        
        	```

     

       77
       126
        
        

     

       78
       78
       -
        *.Local*

     

       79
       79
       -
       @@ -425,7 +425,7 @@ aerc provides the following additional functions:

     

       127
       127
       +
        *exec*

     

       128
       128
       +
       @@ -581,7 +581,7 @@ aerc provides the following additional functions:

     

       80
       129
        
        

     

       81
       130
        
        	```

     

       82
       131
        
        	{{if eq .OriginalMIMEType "text/html"}}

+10 -7

pkgs/by-name/as/ast-grep/package.nix

···

       6
       6
        
         installShellFiles,

     

       7
       7
        
         buildPackages,

     

       8
       8
        
         versionCheckHook,

     

       9
       9
       +
         nix-update-script,

     

       9
       10
        
         enableLegacySg ? false,

     

       10
       11
        
       }:

     

       11
       12
        
       

     

       12
       13
        
       rustPlatform.buildRustPackage rec {

     

       13
       14
        
         pname = "ast-grep";

     

       14
       14
       -
         version = "0.33.0";

     

       15
       15
       +
         version = "0.33.1";

     

       15
       16
        
       

     

       16
       17
        
         src = fetchFromGitHub {

     

       17
       18
        
           owner = "ast-grep";

     

       18
       19
        
           repo = "ast-grep";

     

       19
       19
       -
           rev = version;

     

       20
       20
       -
           hash = "sha256-oqG76KzyN5TnE27yxrHeEYjLwrnDMvwbOzOnN6TWvxc=";

     

       20
       20
       +
           tag = version;

     

       21
       21
       +
           hash = "sha256-p7SJhkCoo4jBDyr+Z2+qxjUwWXWpVMuXd2/DDOM7Z/Q=";

     

       21
       22
        
         };

     

       22
       23
        
       

     

       23
       23
       -
         cargoHash = "sha256-O3FKn90QVDk1TXJtjmaiDuXr+pwIjsAmadi+aypXeLA=";

     

       24
       24
       +
         cargoHash = "sha256-aCBEL+Jx4Kk7PWsxIgpdRdI7AnUAUEtRU4+JMxQ4Swk=";

     

       24
       25
        
       

     

       25
       26
        
         nativeBuildInputs = [ installShellFiles ];

     

       26
       27
        
       

     
···

       72
       73
        
         versionCheckProgramArg = [ "--version" ];

     

       73
       74
        
         doInstallCheck = true;

     

       74
       75
        
       

     

       75
       75
       -
         meta = with lib; {

     

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

     

       77
       77
       +
       

     

       78
       78
       +
         meta = {

     

       76
       79
        
           mainProgram = "ast-grep";

     

       77
       80
        
           description = "Fast and polyglot tool for code searching, linting, rewriting at large scale";

     

       78
       81
        
           homepage = "https://ast-grep.github.io/";

     

       79
       82
        
           changelog = "https://github.com/ast-grep/ast-grep/blob/${src.rev}/CHANGELOG.md";

     

       80
       80
       -
           license = licenses.mit;

     

       81
       81
       -
           maintainers = with maintainers; [

     

       83
       83
       +
           license = lib.licenses.mit;

     

       84
       84
       +
           maintainers = with lib.maintainers; [

     

       82
       85
        
             xiaoxiangmoe

     

       83
       86
        
             montchr

     

       84
       87
        
             lord-valen

+3 -3

pkgs/by-name/bl/blocky/package.nix

···

       7
       7
        
       

     

       8
       8
        
       buildGoModule rec {

     

       9
       9
        
         pname = "blocky";

     

       10
       10
       -
         version = "0.24";

     

       10
       10
       +
         version = "0.25";

     

       11
       11
        
       

     

       12
       12
        
         src = fetchFromGitHub {

     

       13
       13
        
           owner = "0xERR0R";

     

       14
       14
        
           repo = pname;

     

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

     

       16
       16
       -
           hash = "sha256-K+Zdb6l2WUhxVm/gi9U2vVR69bxr2ntLyIrkwTuc0Do=";

     

       16
       16
       +
           hash = "sha256-yd9qncTuzf7p1hIYHzzXyxAx1C1QiuQAIYSKcjCiF0E=";

     

       17
       17
        
         };

     

       18
       18
        
       

     

       19
       19
        
         # needs network connection and fails at

     

       20
       20
        
         # https://github.com/0xERR0R/blocky/blob/development/resolver/upstream_resolver_test.go

     

       21
       21
        
         doCheck = false;

     

       22
       22
        
       

     

       23
       23
       -
         vendorHash = "sha256-I4UXTynulsRuu9U8tsLbPQO1MMPfUC5dAZE420sW1sU=";

     

       23
       23
       +
         vendorHash = "sha256-Ck80ym64RIubtMHKkXsbN1kFrB6F9G++0U98jPvyoHw=";

     

       24
       24
        
       

     

       25
       25
        
         ldflags = [

     

       26
       26
        
           "-s"

+3 -3

pkgs/by-name/br/broot/package.nix

···

       15
       15
        
       

     

       16
       16
        
       rustPlatform.buildRustPackage rec {

     

       17
       17
        
         pname = "broot";

     

       18
       18
       -
         version = "1.44.5";

     

       18
       18
       +
         version = "1.44.6";

     

       19
       19
        
       

     

       20
       20
        
         src = fetchFromGitHub {

     

       21
       21
        
           owner = "Canop";

     

       22
       22
        
           repo = pname;

     

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

     

       24
       24
       -
           hash = "sha256-lLhf83srTHs7jIMiNshcGwue60F5zgbsJOO+w+3S9PU=";

     

       24
       24
       +
           hash = "sha256-cvrWcfQj5Pc2tyaQjhhTK9Ko240Bz6dbUe+OFLTz/+M=";

     

       25
       25
        
         };

     

       26
       26
        
       

     

       27
       27
       -
         cargoHash = "sha256-nQFC9sZoGuAjKT8agDHVtYNOgKMMHzwQ0GY4uoaJHTU=";

     

       27
       27
       +
         cargoHash = "sha256-EhcaIkaFPisRKagN8xDMmGrcH9vfMZcj/w53sDQcOp8=";

     

       28
       28
        
       

     

       29
       29
        
         nativeBuildInputs = [

     

       30
       30
        
           installShellFiles

+5 -6

pkgs/by-name/co/cosmic-panel/package.nix

···

       4
       4
        
         fetchFromGitHub,

     

       5
       5
        
         just,

     

       6
       6
        
         pkg-config,

     

       7
       7
       -
         rust,

     

       8
       7
        
         rustPlatform,

     

       9
       8
        
         libglvnd,

     

       10
       9
        
         libxkbcommon,

     

       11
       10
        
         wayland,

     

       12
       11
        
       }:

     

       13
       12
        
       

     

       14
       14
       -
       rustPlatform.buildRustPackage {

     

       13
       13
       +
       rustPlatform.buildRustPackage rec {

     

       15
       14
        
         pname = "cosmic-panel";

     

       16
       16
       -
         version = "unstable-2023-11-13";

     

       15
       15
       +
         version = "1.0.0-alpha.5.1";

     

       17
       16
        
       

     

       18
       17
        
         src = fetchFromGitHub {

     

       19
       18
        
           owner = "pop-os";

     

       20
       19
        
           repo = "cosmic-panel";

     

       21
       21
       -
           rev = "f07cccbd2dc15ede5aeb7646c61c6f62cb32db0c";

     

       22
       22
       -
           hash = "sha256-uUq+xElZMcG5SWzha9/8COaenycII5aiXmm7sXGgjXE=";

     

       20
       20
       +
           tag = "epoch-${version}";

     

       21
       21
       +
           hash = "sha256-nO7Y1SpwvfHhL0OSy7Ti+e8NPzfknW2SGs7IYoF1Jow=";

     

       23
       22
        
         };

     

       24
       23
        
       

     

       25
       24
        
         useFetchCargoVendor = true;

     

       26
       26
       -
         cargoHash = "sha256-1XtW72KPdRM5gHIM3Fw2PZCobBXYDMAqjZ//Ebr51tc=";

     

       25
       25
       +
         cargoHash = "sha256-EIp9s42deMaB7BDe7RAqj2+CnTXjHCtZjS5Iq8l46A4=";

     

       27
       26
        
       

     

       28
       27
        
         nativeBuildInputs = [

     

       29
       28
        
           just

+4 -4

pkgs/by-name/da/davis/package.nix

···

       7
       7
        
       

     

       8
       8
        
       php.buildComposerProject (finalAttrs: {

     

       9
       9
        
         pname = "davis";

     

       10
       10
       -
         version = "4.4.4";

     

       10
       10
       +
         version = "5.0.2";

     

       11
       11
        
       

     

       12
       12
        
         src = fetchFromGitHub {

     

       13
       13
        
           owner = "tchapi";

     

       14
       14
        
           repo = "davis";

     

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

     

       16
       16
       -
           hash = "sha256-nQkyNs718Zrc2BiTNXSXPY23aiviJKoBJeuoSm5ISOI=";

     

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

     

       16
       16
       +
           hash = "sha256-Zl+6nrgspyg6P9gqYwah81Z6Mtni6nUlCp4gTjJWn9M=";

     

       17
       17
        
         };

     

       18
       18
        
       

     

       19
       19
       -
         vendorHash = "sha256-zZlDonCwb9tJyckounv96eF4cx6Z/LBoAdB/r600HM4=";

     

       19
       19
       +
         vendorHash = "sha256-ZV5GNNtex+yKaMP5KaQkx5EaJRAJSwJjIZOCcXlnVW4=";

     

       20
       20
        
       

     

       21
       21
        
         postInstall = ''

     

       22
       22
        
           # Only include the files needed for runtime in the derivation

+2 -2

pkgs/by-name/de/der-ascii/package.nix

···

       6
       6
        
       

     

       7
       7
        
       buildGoModule rec {

     

       8
       8
        
         pname = "der-ascii";

     

       9
       9
       -
         version = "0.3.0";

     

       9
       9
       +
         version = "0.5.0";

     

       10
       10
        
       

     

       11
       11
        
         src = fetchFromGitHub {

     

       12
       12
        
           owner = "google";

     

       13
       13
        
           repo = pname;

     

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

     

       15
       15
       -
           sha256 = "sha256-LgxGSZQNxwx08mK9G8mSuBFTOd3pC1mvz3Wz7Y+6XR4=";

     

       15
       15
       +
           sha256 = "sha256-yUHVPBUW1Csn3W5K9S2TWOq4aovzpaBK8BC0t8zkj3g=";

     

       16
       16
        
         };

     

       17
       17
        
         vendorHash = null;

     

       18
       18

+3 -3

pkgs/by-name/dn/dnscontrol/package.nix

···

       9
       9
        
       

     

       10
       10
        
       buildGoModule rec {

     

       11
       11
        
         pname = "dnscontrol";

     

       12
       12
       -
         version = "4.15.3";

     

       12
       12
       +
         version = "4.15.4";

     

       13
       13
        
       

     

       14
       14
        
         src = fetchFromGitHub {

     

       15
       15
        
           owner = "StackExchange";

     

       16
       16
        
           repo = "dnscontrol";

     

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

     

       18
       18
       -
           hash = "sha256-0vg3y/bUp5BTFhJbIdohvuj1DNu9bykDwMM3bWnKvNU=";

     

       18
       18
       +
           hash = "sha256-Jwv8gIcQD62OV8i5DvIcurcsc6Wkis+kl95lnj8NXds=";

     

       19
       19
        
         };

     

       20
       20
        
       

     

       21
       21
       -
         vendorHash = "sha256-JMi4FDgZT94KyqDR57xgp1vnP7Htdn/bksntbQdGyZ0=";

     

       21
       21
       +
         vendorHash = "sha256-x/FxspmR89Q2yZI0sP1D9OVUFEjMlpT/0IPusy5zHuo=";

     

       22
       22
        
       

     

       23
       23
        
         nativeBuildInputs = [ installShellFiles ];

     

       24
       24

+3 -3

pkgs/by-name/en/enpass/data.json

···

       1
       1
        
       {

     

       2
       2
        
         "amd64": {

     

       3
       3
       -
           "path": "pool/main/e/enpass/enpass_6.10.1.1661_amd64.deb",

     

       4
       4
       -
           "sha256": "52e9a6819b186b83eb8d8b9e2d5d4f62dedbb24382819738c18cb28976e8b07b",

     

       5
       5
       -
           "version": "6.10.1.1661"

     

       3
       3
       +
           "path": "pool/main/e/enpass/enpass_6.11.6.1833_amd64.deb",

     

       4
       4
       +
           "sha256": "91a7f4ac1bee55106edc6f3e8236b8ef8ed985926482b058899e0c73075f0d56",

     

       5
       5
       +
           "version": "6.11.6.1833"

     

       6
       6
        
         },

     

       7
       7
        
         "i386": {

     

       8
       8
        
           "path": "pool/main/e/enpass/enpass_5.6.9_i386.deb",

+2 -2

pkgs/by-name/ep/epubcheck/package.nix

···

       8
       8
        
       

     

       9
       9
        
       stdenv.mkDerivation rec {

     

       10
       10
        
         pname = "epubcheck";

     

       11
       11
       -
         version = "5.1.0";

     

       11
       11
       +
         version = "5.2.0";

     

       12
       12
        
       

     

       13
       13
        
         src = fetchzip {

     

       14
       14
        
           url = "https://github.com/w3c/epubcheck/releases/download/v${version}/epubcheck-${version}.zip";

     

       15
       15
       -
           sha256 = "sha256-gskQ02lGka3nBHSDXO3TpKSQzaoaJUQY9AvWG7L+1YM=";

     

       15
       15
       +
           sha256 = "sha256-7Vfbs0lqrm/YDSfvMxaQu9IsYx1PugpbsDYLU2fIC6U=";

     

       16
       16
        
         };

     

       17
       17
        
       

     

       18
       18
        
         nativeBuildInputs = [ makeWrapper ];

+6 -3

pkgs/by-name/es/espflash/package.nix

···

       15
       15
        
       

     

       16
       16
        
       rustPlatform.buildRustPackage rec {

     

       17
       17
        
         pname = "espflash";

     

       18
       18
       -
         version = "3.2.0";

     

       18
       18
       +
         version = "3.3.0";

     

       19
       19
        
       

     

       20
       20
        
         src = fetchFromGitHub {

     

       21
       21
        
           owner = "esp-rs";

     

       22
       22
        
           repo = "espflash";

     

       23
       23
        
           tag = "v${version}";

     

       24
       24
       -
           hash = "sha256-X9VTwXk/6zAkQb5P9Wz8Pt4oIt2xXfff9dhGb8wauG4=";

     

       24
       24
       +
           hash = "sha256-8qFq+OyidW8Bwla6alk/9pXLe3zayHkz5LsqI3jwgY0=";

     

       25
       25
        
         };

     

       26
       26
        
       

     

       27
       27
        
         nativeBuildInputs = [

     
···

       43
       43
        
             SystemConfiguration

     

       44
       44
        
           ];

     

       45
       45
        
       

     

       46
       46
       -
         cargoHash = "sha256-3xUDsznzIRlfGwVuIH1+Ub5tE/ST981KZS/2TAKaBAE=";

     

       46
       46
       +
         cargoHash = "sha256-04bBLTpsQNDP0ExvAOjwp3beOktC8rQqFtfEu6d+DWY=";

     

       47
       47
       +
         checkFlags = [

     

       48
       48
       +
           "--skip cli::monitor::external_processors"

     

       49
       49
       +
         ];

     

       47
       50
        
       

     

       48
       51
        
         postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''

     

       49
       52
        
           installShellCompletion --cmd espflash \

-37

pkgs/by-name/ew/eww/lockfile.patch

···

       1
       1
       -
       diff --git a/Cargo.lock b/Cargo.lock

     

       2
       2
       -
       index 5d94bd4..acd2c8d 100644

     

       3
       3
       -
       --- a/Cargo.lock

     

       4
       4
       -
       +++ b/Cargo.lock

     

       5
       5
       -
       @@ -1676,7 +1676,7 @@ dependencies = [

     

       6
       6
       -
         "libm",

     

       7
       7
       -
         "log",

     

       8
       8
       -
         "regex",

     

       9
       9
       -
       - "time 0.3.34",

     

       10
       10
       -
       + "time 0.3.36",

     

       11
       11
       -
         "urlencoding",

     

       12
       12
       -
        ]

     

       13
       13
       -
        

     

       14
       14
       -
       @@ -2893,9 +2893,9 @@ dependencies = [

     

       15
       15
       -
        

     

       16
       16
       -
        [[package]]

     

       17
       17
       -
        name = "time"

     

       18
       18
       -
       -version = "0.3.34"

     

       19
       19
       -
       +version = "0.3.36"

     

       20
       20
       -
        source = "registry+https://github.com/rust-lang/crates.io-index"

     

       21
       21
       -
       -checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749"

     

       22
       22
       -
       +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885"

     

       23
       23
       -
        dependencies = [

     

       24
       24
       -
         "deranged",

     

       25
       25
       -
         "itoa",

     

       26
       26
       -
       @@ -2914,9 +2914,9 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"

     

       27
       27
       -
        

     

       28
       28
       -
        [[package]]

     

       29
       29
       -
        name = "time-macros"

     

       30
       30
       -
       -version = "0.2.17"

     

       31
       31
       -
       +version = "0.2.18"

     

       32
       32
       -
        source = "registry+https://github.com/rust-lang/crates.io-index"

     

       33
       33
       -
       -checksum = "7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774"

     

       34
       34
       -
       +checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf"

     

       35
       35
       -
        dependencies = [

     

       36
       36
       -
         "num-conv",

     

       37
       37
       -
         "time-core",

+4 -9

pkgs/by-name/ew/eww/package.nix

···

       15
       15
        
       

     

       16
       16
        
       rustPlatform.buildRustPackage rec {

     

       17
       17
        
         pname = "eww";

     

       18
       18
       -
         version = "0.6.0-unstable-2024-07-05";

     

       18
       18
       +
         version = "0.6.0-unstable-2025-01-14";

     

       19
       19
        
       

     

       20
       20
        
         src = fetchFromGitHub {

     

       21
       21
        
           owner = "elkowar";

     

       22
       22
        
           repo = "eww";

     

       23
       23
       -
           # FIXME: change to a release tag once a new release is available

     

       24
       24
       -
           # https://github.com/elkowar/eww/pull/1084

     

       25
       25
       -
           # using the revision to fix string truncation issue in eww config

     

       26
       26
       -
           rev = "4d55e9ad63d1fae887726dffcd25a32def23d34f";

     

       27
       27
       -
           hash = "sha256-LTSFlW/46hl1u9SzqnvbtNxswCW05bhwOY6CzVEJC5o=";

     

       23
       23
       +
           rev = "593a4f4666f0bc42790d6d033e64a2b38449090f";

     

       24
       24
       +
           hash = "sha256-DbXsiqMyZKNSFmL5aEJwJr+cPnz8qaWe5lNDoovOX/g=";

     

       28
       25
        
         };

     

       29
       26
        
       

     

       30
       30
       -
         # needed to fix build errors with rust 1.80 due to outdated time crate

     

       31
       31
       -
         cargoPatches = [ ./lockfile.patch ];

     

       32
       32
       -
         cargoHash = "sha256-55lmQl5pJwrEj5RlSG8b0PqtZVrASxTmX4Qdk090DZo=";

     

       27
       27
       +
         cargoHash = "sha256-hS8uNqT37z/89Q5pqfWKm/wijgMyrU8uDT5exn0NZNU=";

     

       33
       28
        
       

     

       34
       29
        
         nativeBuildInputs = [

     

       35
       30
        
           installShellFiles

+2 -2

pkgs/by-name/fa/famistudio/package.nix

···

       28
       28
        
       in

     

       29
       29
        
       buildDotnetModule (finalAttrs: {

     

       30
       30
        
         pname = "famistudio";

     

       31
       31
       -
         version = "4.3.1";

     

       31
       31
       +
         version = "4.3.2";

     

       32
       32
        
       

     

       33
       33
        
         src = fetchFromGitHub {

     

       34
       34
        
           owner = "BleuBleu";

     

       35
       35
        
           repo = "FamiStudio";

     

       36
       36
        
           tag = finalAttrs.version;

     

       37
       37
       -
           hash = "sha256-ISOMsnsvsO3wOp9J/CilCr4wBgkHc29od2a2sBssN7k=";

     

       37
       37
       +
           hash = "sha256-on1x7wrcol8rlGWZs+/DndxjhqotDiTXXEbCZx7a3Bw=";

     

       38
       38
        
         };

     

       39
       39
        
       

     

       40
       40
        
         postPatch =

+1

pkgs/by-name/fo/forgejo-runner/package.nix

···

       57
       57
        
           changelog = "https://code.forgejo.org/forgejo/runner/src/tag/${src.rev}/RELEASE-NOTES.md";

     

       58
       58
        
           license = licenses.mit;

     

       59
       59
        
           maintainers = with maintainers; [

     

       60
       60
       +
             adamcstephens

     

       60
       61
        
             kranzes

     

       61
       62
        
             emilylange

     

       62
       63
        
             christoph-heiss

+4 -4

pkgs/by-name/fo/forgejo/package.nix

···

       1
       1
        
       import ./generic.nix {

     

       2
       2
       -
         version = "9.0.3";

     

       3
       3
       -
         hash = "sha256-Ig4iz/ZoRj4lyod73GWY2oRV3E3tx3S4rNqQtsTonzQ=";

     

       4
       4
       -
         npmDepsHash = "sha256-yDNlD1l5xuLkkp6LbOlWj9OYHO+WtiAeiu9oIoQLFL8=";

     

       5
       5
       -
         vendorHash = "sha256-JLruZi8mXR1f+o9Olhbz44ieEXVGinUNmVi24VEYj28=";

     

       2
       2
       +
         version = "10.0.0";

     

       3
       3
       +
         hash = "sha256-FcXL+lF2B+EUUEbdD31b1pV7GWbYxk6ewljAXuiV8QY=";

     

       4
       4
       +
         npmDepsHash = "sha256-YQDTw5CccnR7zJpvvEcmHZ2pLLNGYEg/mvncNYzcYY8=";

     

       5
       5
       +
         vendorHash = "sha256-fqHwqpIetX2jTAWAonRWqF1tArL7Ik/XXURY51jGOn0=";

     

       6
       6
        
         lts = false;

     

       7
       7
        
         nixUpdateExtraArgs = [

     

       8
       8
        
           "--override-filename"

+3 -5

pkgs/by-name/gc/gcli/package.nix

···

       3
       3
        
         fetchFromGitHub,

     

       4
       4
        
         stdenv,

     

       5
       5
        
         curl,

     

       6
       6
       -
         autoreconfHook,

     

       7
       6
        
         pkg-config,

     

       8
       7
        
         byacc,

     

       9
       8
        
         flex,

     
···

       11
       10
        
       

     

       12
       11
        
       stdenv.mkDerivation rec {

     

       13
       12
        
         pname = "gcli";

     

       14
       14
       -
         version = "2.2.0";

     

       13
       13
       +
         version = "2.6.0";

     

       15
       14
        
       

     

       16
       15
        
         src = fetchFromGitHub {

     

       17
       16
        
           owner = "herrhotzenplotz";

     

       18
       17
        
           repo = "gcli";

     

       19
       19
       -
           rev = version;

     

       20
       20
       -
           hash = "sha256-extVTaTWVFXSTiXlZ/MtiiFdc/KZEDkc+A7xxylJaM4=";

     

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

     

       19
       19
       +
           hash = "sha256-60B1XRoeSjSEo5nxrCJL9lizq7ELGe8+hdmC4lkMhis=";

     

       21
       20
        
         };

     

       22
       21
        
       

     

       23
       22
        
         nativeBuildInputs = [

     

       24
       24
       -
           autoreconfHook

     

       25
       23
        
           pkg-config

     

       26
       24
        
           byacc

     

       27
       25
        
           flex

+3 -3

pkgs/by-name/gh/gh-poi/package.nix

···

       6
       6
        
       

     

       7
       7
        
       buildGoModule rec {

     

       8
       8
        
         pname = "gh-poi";

     

       9
       9
       -
         version = "0.12.0";

     

       9
       9
       +
         version = "0.13.0";

     

       10
       10
        
       

     

       11
       11
        
         src = fetchFromGitHub {

     

       12
       12
        
           owner = "seachicken";

     

       13
       13
        
           repo = "gh-poi";

     

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

     

       15
       15
       -
           hash = "sha256-GRTBYwphw5rpwFzLrBRpzz6z6udNCdPn3vanfMvBtGI=";

     

       15
       15
       +
           hash = "sha256-foUv6+QIfPlYwgTwxFvEgGeOw/mpC80+ntHo29LQbB8=";

     

       16
       16
        
         };

     

       17
       17
        
       

     

       18
       18
        
         ldflags = [

     
···

       23
       23
        
         vendorHash = "sha256-D/YZLwwGJWCekq9mpfCECzJyJ/xSlg7fC6leJh+e8i0=";

     

       24
       24
        
       

     

       25
       25
        
         # Skip checks because some of test suites require fixture.

     

       26
       26
       -
         # See: https://github.com/seachicken/gh-poi/blob/v0.12.0/.github/workflows/contract-test.yml#L28-L29

     

       26
       26
       +
         # See: https://github.com/seachicken/gh-poi/blob/v0.13.0/.github/workflows/contract-test.yml#L28-L29

     

       27
       27
        
         doCheck = false;

     

       28
       28
        
       

     

       29
       29
        
         meta = with lib; {

+5 -5

pkgs/by-name/go/google-chrome/package.nix

···

       166
       166
        
       

     

       167
       167
        
         linux = stdenv.mkDerivation (finalAttrs: {

     

       168
       168
        
           inherit pname meta passthru;

     

       169
       169
       -
           version = "131.0.6778.264";

     

       169
       169
       +
           version = "132.0.6834.83";

     

       170
       170
        
       

     

       171
       171
        
           src = fetchurl {

     

       172
       172
        
             url = "https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${finalAttrs.version}-1_amd64.deb";

     

       173
       173
       -
             hash = "sha256-zfPXkfjnvVGO09X4eqTii7rPwieMEsQMy9p9tXb5fDU=";

     

       173
       173
       +
             hash = "sha256-qufv7m7iQ8yX6WeNajTbPELCmRhr4GGBa8Wzy+iMFhg=";

     

       174
       174
        
           };

     

       175
       175
        
       

     

       176
       176
        
           # With strictDeps on, some shebangs were not being patched correctly

     
···

       266
       266
        
       

     

       267
       267
        
         darwin = stdenvNoCC.mkDerivation (finalAttrs: {

     

       268
       268
        
           inherit pname meta passthru;

     

       269
       269
       -
           version = "131.0.6778.265";

     

       269
       269
       +
           version = "132.0.6834.84";

     

       270
       270
        
       

     

       271
       271
        
           src = fetchurl {

     

       272
       272
       -
             url = "http://dl.google.com/release2/chrome/accjagybvz5mf6voljw3khsklaaa_131.0.6778.265/GoogleChrome-131.0.6778.265.dmg";

     

       273
       273
       -
             hash = "sha256-mHfBmBJVlUYQf8UnCBBTbgizTuV/IucXg2H+i4zhnPU=";

     

       272
       272
       +
             url = "http://dl.google.com/release2/chrome/acpvuq6jnnfhesngduj6lnfmy3zq_132.0.6834.84/GoogleChrome-132.0.6834.84.dmg";

     

       273
       273
       +
             hash = "sha256-SX8IUdTnIJHwfF9ZwIHZwGZUncJ/NLQpuEL/X8p1KJo=";

     

       274
       274
        
           };

     

       275
       275
        
       

     

       276
       276
        
           dontPatch = true;

+4

pkgs/by-name/gp/gpick/package.nix

···

       32
       32
        
             hash = "sha256-DnRU90VPyFhLYTk4GPJoiVYadJgtYgjMS4MLgmpYLP0=";

     

       33
       33
        
           })

     

       34
       34
        
         ];

     

       35
       35
       +
         # https://github.com/thezbyg/gpick/pull/227

     

       36
       36
       +
         postPatch = ''

     

       37
       37
       +
           sed '1i#include <boost/version.hpp>' -i source/dynv/Types.cpp

     

       38
       38
       +
         '';

     

       35
       39
        
       

     

       36
       40
        
         nativeBuildInputs = [

     

       37
       41
        
           cmake

+3 -3

pkgs/by-name/in/ingress2gateway/package.nix

···

       6
       6
        
       

     

       7
       7
        
       buildGoModule rec {

     

       8
       8
        
         pname = "ingress2gateway";

     

       9
       9
       -
         version = "0.3.0";

     

       9
       9
       +
         version = "0.4.0";

     

       10
       10
        
       

     

       11
       11
        
         src = fetchFromGitHub {

     

       12
       12
        
           owner = "kubernetes-sigs";

     

       13
       13
        
           repo = pname;

     

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

     

       15
       15
       -
           hash = "sha256-xAoJREGktbSNGYdrmPuYG2G+xaQ+kReSSA1JBgWaPVY=";

     

       15
       15
       +
           hash = "sha256-0w2ZM1g2rr46bN8BNgrkmb3tOQw0FZTMLp/koW01c5I=";

     

       16
       16
        
         };

     

       17
       17
        
       

     

       18
       18
       -
         vendorHash = "sha256-T6I8uYUaubcc1dfDu6PbQ9bDDLqGuLGXWnCZhdvkycE=";

     

       18
       18
       +
         vendorHash = "sha256-7b247/9/9kdNIYuaLvKIv3RK/nzQzruMKZeheTag2sA=";

     

       19
       19
        
       

     

       20
       20
        
         ldflags = [

     

       21
       21
        
           "-s"

+2 -2

pkgs/by-name/ko/komga/package.nix

···

       9
       9
        
       

     

       10
       10
        
       stdenvNoCC.mkDerivation rec {

     

       11
       11
        
         pname = "komga";

     

       12
       12
       -
         version = "1.16.0";

     

       12
       12
       +
         version = "1.18.0";

     

       13
       13
        
       

     

       14
       14
        
         src = fetchurl {

     

       15
       15
        
           url = "https://github.com/gotson/${pname}/releases/download/${version}/${pname}-${version}.jar";

     

       16
       16
       -
           sha256 = "sha256-6q7ZtTdbH2nIPIm6gNQZz2QxHlbWULsflhWJ0aDMFH4=";

     

       16
       16
       +
           sha256 = "sha256-I0xJfX0f1srIjiitBt5EN6j/pOCvfGUIwxCt5sT2UuY=";

     

       17
       17
        
         };

     

       18
       18
        
       

     

       19
       19
        
         nativeBuildInputs = [

+6 -4

pkgs/by-name/li/libabw/package.nix

···

       27
       27
        
           sed -i 's,^CPPFLAGS.*,\0 -DBOOST_ERROR_CODE_HEADER_ONLY -DBOOST_SYSTEM_NO_DEPRECATED,' src/lib/Makefile.in

     

       28
       28
        
         '';

     

       29
       29
        
       

     

       30
       30
       -
         nativeBuildInputs = [ pkg-config ];

     

       31
       31
       -
         buildInputs = [

     

       32
       32
       -
           boost

     

       30
       30
       +
         nativeBuildInputs = [

     

       33
       31
        
           doxygen

     

       34
       32
        
           gperf

     

       33
       33
       +
           perl

     

       34
       34
       +
           pkg-config

     

       35
       35
       +
         ];

     

       36
       36
       +
         buildInputs = [

     

       37
       37
       +
           boost

     

       35
       38
        
           librevenge

     

       36
       39
        
           libxml2

     

       37
       37
       -
           perl

     

       38
       40
        
           zlib

     

       39
       41
        
         ];

     

       40
       42

-2

pkgs/by-name/li/libraw/package.nix

···

       7
       7
        
         pkg-config,

     

       8
       8
        
       

     

       9
       9
        
         # for passthru.tests

     

       10
       10
       -
         deepin,

     

       11
       10
        
         freeimage,

     

       12
       11
        
         hdrmerge,

     

       13
       12
        
         imagemagick,

     
···

       43
       42
        
       

     

       44
       43
        
         passthru.tests = {

     

       45
       44
        
           inherit imagemagick hdrmerge freeimage;

     

       46
       46
       -
           inherit (deepin) deepin-image-viewer;

     

       47
       45
        
           inherit (python3.pkgs) rawkit;

     

       48
       46
        
         };

     

       49
       47

+3 -3

pkgs/by-name/li/live-server/package.nix

···

       10
       10
        
       

     

       11
       11
        
       rustPlatform.buildRustPackage rec {

     

       12
       12
        
         pname = "live-server";

     

       13
       13
       -
         version = "0.9.0";

     

       13
       13
       +
         version = "0.9.1";

     

       14
       14
        
       

     

       15
       15
        
         src = fetchFromGitHub {

     

       16
       16
        
           owner = "lomirus";

     

       17
       17
        
           repo = "live-server";

     

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

     

       19
       19
       -
           hash = "sha256-0XZ7ABR2xSVbixXbjdKiUTcQ7TqAZGyVpWqzMx5kR2g=";

     

       19
       19
       +
           hash = "sha256-9NULpK48svCMTx1OeivS+LHVGUGFObg4pBr/V0yIuwM=";

     

       20
       20
        
         };

     

       21
       21
        
       

     

       22
       22
       -
         cargoHash = "sha256-lMRj+8D5jigCNXld4QfXy3QpRQo4ecCByqoDGC8no1w=";

     

       22
       22
       +
         cargoHash = "sha256-QB03sXAGNHu+Yc/UYcmOqYBS/LNbKSoT9PZa11prNtA=";

     

       23
       23
        
       

     

       24
       24
        
         nativeBuildInputs = [ pkg-config ];

     

       25
       25

+2 -2

pkgs/by-name/lx/lxgw-wenkai/package.nix

···

       6
       6
        
       

     

       7
       7
        
       stdenvNoCC.mkDerivation rec {

     

       8
       8
        
         pname = "lxgw-wenkai";

     

       9
       9
       -
         version = "1.501";

     

       9
       9
       +
         version = "1.510";

     

       10
       10
        
       

     

       11
       11
        
         src = fetchurl {

     

       12
       12
        
           url = "https://github.com/lxgw/LxgwWenKai/releases/download/v${version}/${pname}-v${version}.tar.gz";

     

       13
       13
       -
           hash = "sha256-7BBg6TGJzTVgBHPyzTYGFjXmidvAzOVCWAU11LylmBI=";

     

       13
       13
       +
           hash = "sha256-RZ+vcFDKMW63oYz4meNvNSIyEdY9I5sKhqOAPKlPP4Q=";

     

       14
       14
        
         };

     

       15
       15
        
       

     

       16
       16
        
         installPhase = ''

+2 -2

pkgs/by-name/ma/matcha-rss-digest/package.nix

···

       6
       6
        
       

     

       7
       7
        
       buildGoModule rec {

     

       8
       8
        
         pname = "matcha-rss-digest";

     

       9
       9
       -
         version = "0.7.0";

     

       9
       9
       +
         version = "0.7.1";

     

       10
       10
        
       

     

       11
       11
        
         src = fetchFromGitHub {

     

       12
       12
        
           owner = "piqoni";

     

       13
       13
        
           repo = "matcha";

     

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

     

       15
       15
       -
           hash = "sha256-eexDPewRbAxrMVE7m4WHxeBgRl8xKVdtIpCbYPfp24w=";

     

       15
       15
       +
           hash = "sha256-Zs6Och5CsqN2mpnCLgV1VkH4+CV1fklfP20A22rE5y0=";

     

       16
       16
        
         };

     

       17
       17
        
       

     

       18
       18
        
         vendorHash = "sha256-CURFy92K4aNF9xC8ik6RDadRAvlw8p3Xc+gWE2un6cc=";

+3

pkgs/by-name/ow/owntracks-recorder/package.nix

···

       48
       48
        
       

     

       49
       49
        
           substituteInPlace config.mk \

     

       50
       50
        
             --replace "INSTALLDIR = /usr/local" "INSTALLDIR = $out" \

     

       51
       51
       +
             --replace "DOCROOT = /var/spool/owntracks/recorder/htdocs" "DOCROOT = $out/htdocs" \

     

       51
       52
        
             --replace "WITH_LUA ?= no" "WITH_LUA ?= yes" \

     

       52
       53
        
             --replace "WITH_ENCRYPT ?= no" "WITH_ENCRYPT ?= yes"

     

       53
       54
        
       

     
···

       61
       62
        
       

     

       62
       63
        
           install -m 0755 ot-recorder $out/bin

     

       63
       64
        
           install -m 0755 ocat $out/bin

     

       65
       65
       +
       

     

       66
       66
       +
           cp -r docroot $out/htdocs

     

       64
       67
        
       

     

       65
       68
        
           runHook postInstall

     

       66
       69
        
         '';

+6 -6

pkgs/by-name/qq/qq/sources.nix

···

       1
       1
        
       # Generated by ./update.sh - do not update manually!

     

       2
       2
       -
       # Last updated: 2024-12-30

     

       2
       2
       +
       # Last updated: 2025-01-18

     

       3
       3
        
       {

     

       4
       4
       -
         version = "3.2.15-2024.12.24";

     

       5
       5
       -
         amd64_url = "https://dldir1.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.15_241224_amd64_01.deb";

     

       6
       6
       -
         arm64_url = "https://dldir1.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.15_241224_arm64_01.deb";

     

       7
       7
       -
         arm64_hash = "sha256-2+IT7XsK5ziyG9/rihfDhTADwzJ8QDMBz0NyMjZHmzE=";

     

       8
       8
       -
         amd64_hash = "sha256-iBiyFK8sKmWUxntZREwdxWCXSSLB8jxiL4eqo2Qy0is=";

     

       4
       4
       +
         version = "3.2.15-2025.1.10";

     

       5
       5
       +
         amd64_url = "https://dldir1.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.15_250110_amd64_01.deb";

     

       6
       6
       +
         arm64_url = "https://dldir1.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.15_250110_arm64_01.deb";

     

       7
       7
       +
         arm64_hash = "sha256-F2R5j0x2BnD9/kIsiUe+IbZpAKDOQdjxwOENzzb4RJo=";

     

       8
       8
       +
         amd64_hash = "sha256-hDfaxxXchdZons8Tb5I7bsd7xEjiKpQrJjxyFnz3Y94=";

     

       9
       9
        
       }

+2 -2

pkgs/by-name/qt/qtractor/package.nix

···

       30
       30
        
       

     

       31
       31
        
       stdenv.mkDerivation rec {

     

       32
       32
        
         pname = "qtractor";

     

       33
       33
       -
         version = "1.5.1";

     

       33
       33
       +
         version = "1.5.2";

     

       34
       34
        
       

     

       35
       35
        
         src = fetchurl {

     

       36
       36
        
           url = "mirror://sourceforge/qtractor/qtractor-${version}.tar.gz";

     

       37
       37
       -
           hash = "sha256-jBJ8qruWBeukuW7zzi9rRayJL+FC1e3f+O3cb6QfdiE=";

     

       37
       37
       +
           hash = "sha256-Z32fOS8Um7x2iFy+2SlmsU8mrDLwboNSI4dm0RligBo=";

     

       38
       38
        
         };

     

       39
       39
        
       

     

       40
       40
        
         nativeBuildInputs = [

+3

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

···

       23
       23
        
           autoconf

     

       24
       24
        
           automake

     

       25
       25
        
           libtool

     

       26
       26
       +
         ];

     

       27
       27
       +
       

     

       28
       28
       +
         buildInputs = [

     

       26
       29
        
           tre

     

       27
       30
        
         ];

     

       28
       31

+1

pkgs/by-name/sw/switch-to-configuration-ng/.envrc

···

       1
       1
       +
       use nix ../../../.. -A switch-to-configuration-ng

+9

pkgs/by-name/sw/switch-to-configuration-ng/README.md

···

       1
       1
        
       # switch-to-configuration-ng

     

       2
       2
        
       

     

       3
       3
        
       This program is a reimplementation of [switch-to-configuration](/nixos/modules/system/activation/switch-to-configuration.pl) in Rust. The goal is to be compatible in as many ways as possible to the original implementation, at least as long as the original is still in nixpkgs. Any behavioral modifications to this program should also be implemented in the original, and vice versa.

     

       4
       4
       +
       

     

       5
       5
       +
       ## Build in a devshell

     

       6
       6
       +
       

     

       7
       7
       +
       ```

     

       8
       8
       +
       cd ./pkgs/by-name/sw/switch-to-configuration-ng

     

       9
       9
       +
       nix-shell ../../../.. -A switch-to-configuration-ng

     

       10
       10
       +
       cd ./src

     

       11
       11
       +
       cargo build

     

       12
       12
       +
       ```

+4 -8

pkgs/by-name/ta/taskchampion-sync-server/package.nix

···

       5
       5
        
       }:

     

       6
       6
        
       rustPlatform.buildRustPackage rec {

     

       7
       7
        
         pname = "taskchampion-sync-server";

     

       8
       8
       -
         version = "0.4.1-unstable-2024-08-20";

     

       8
       8
       +
         version = "0.5.0";

     

       9
       9
        
         src = fetchFromGitHub {

     

       10
       10
        
           owner = "GothenburgBitFactory";

     

       11
       11
        
           repo = "taskchampion-sync-server";

     

       12
       12
       -
           rev = "af918bdf0dea7f7b6e920680c947fc37b37ffffb";

     

       13
       13
       -
           fetchSubmodules = false;

     

       14
       14
       -
           hash = "sha256-BTGD7hZysmOlsT2W+gqj8+Sj6iBN9Jwiyzq5D03PDzM=";

     

       12
       12
       +
           tag = "v${version}";

     

       13
       13
       +
           hash = "sha256-uOlubcQ5LAECvQEqgUR/5aLuDGQrdHy+K6vSapACmoo=";

     

       15
       14
        
         };

     

       16
       15
        
       

     

       17
       17
       -
         cargoHash = "sha256-/HfkE+R8JoNGkCCNQpE/JjGSqPHvjCPnTjOFPCFfJ7A=";

     

       18
       18
       -
       

     

       19
       19
       -
         # cargo tests fail when checkType="release" (default)

     

       20
       20
       -
         checkType = "debug";

     

       16
       16
       +
         cargoHash = "sha256-Erhr5NduvQyUJSSurKqcZXJe4ExP68t8ysn7hZLAgP4=";

     

       21
       17
        
       

     

       22
       18
        
         meta = {

     

       23
       19
        
           description = "Sync server for Taskwarrior 3";

+3 -3

pkgs/by-name/tt/ttdl/package.nix

···

       6
       6
        
       

     

       7
       7
        
       rustPlatform.buildRustPackage rec {

     

       8
       8
        
         pname = "ttdl";

     

       9
       9
       -
         version = "4.7.0";

     

       9
       9
       +
         version = "4.8.0";

     

       10
       10
        
       

     

       11
       11
        
         src = fetchFromGitHub {

     

       12
       12
        
           owner = "VladimirMarkelov";

     

       13
       13
        
           repo = "ttdl";

     

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

     

       15
       15
       -
           sha256 = "sha256-ugg6ZrrEAsfgeXBBKrU30orVkcWJV4MgZIVshAv8ys8=";

     

       15
       15
       +
           sha256 = "sha256-RHmKCayouxtlbp/dpZlC9d9OuUXHDLVWucnuIP3rEhA=";

     

       16
       16
        
         };

     

       17
       17
        
       

     

       18
       18
       -
         cargoHash = "sha256-jjkHnxK15WSlhgPpqpU7KNM2KcEi81TrcvIi9gq4YHU=";

     

       18
       18
       +
         cargoHash = "sha256-DR0dAaSLQtWcCcCYXPb4vMDzjct0oNk7GMT5BbZuMlE=";

     

       19
       19
        
       

     

       20
       20
        
         meta = with lib; {

     

       21
       21
        
           description = "CLI tool to manage todo lists in todo.txt format";

+3 -3

pkgs/by-name/wa/warp/package.nix

···

       24
       24
        
       

     

       25
       25
        
       stdenv.mkDerivation rec {

     

       26
       26
        
         pname = "warp";

     

       27
       27
       -
         version = "0.8.0";

     

       27
       27
       +
         version = "0.8.1";

     

       28
       28
        
       

     

       29
       29
        
         src = fetchFromGitLab {

     

       30
       30
        
           domain = "gitlab.gnome.org";

     

       31
       31
        
           owner = "World";

     

       32
       32
        
           repo = "warp";

     

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

     

       34
       34
       -
           hash = "sha256-BUCkENpL1soiYrM1vPNQAZGUbRj1KxWbbgXR0575zGU=";

     

       34
       34
       +
           hash = "sha256-RmihaFv+U11CAa5ax53WzpwYJ2PFOrhYt4w2iboW4m8=";

     

       35
       35
        
         };

     

       36
       36
        
       

     

       37
       37
        
         postPatch = ''

     
···

       41
       41
        
         cargoDeps = rustPlatform.fetchCargoVendor {

     

       42
       42
        
           inherit src;

     

       43
       43
        
           name = "${pname}-${version}";

     

       44
       44
       -
           hash = "sha256-afRGCd30qJMqQeEOLDBRdVNJLMfa8/F9BO4Ib/OTtvI=";

     

       44
       44
       +
           hash = "sha256-w3gQhyRpma+aJY7IC9Vb3FdIECHZBJoSjiPmKpJ2nM8=";

     

       45
       45
        
         };

     

       46
       46
        
       

     

       47
       47
        
         nativeBuildInputs = [

+9 -7

pkgs/by-name/wa/waypipe/package.nix

···

       6
       6
        
         ninja,

     

       7
       7
        
         pkg-config,

     

       8
       8
        
         scdoc,

     

       9
       9
       -
         mesa,

     

       9
       9
       +
         libgbm,

     

       10
       10
        
         lz4,

     

       11
       11
        
         zstd,

     

       12
       12
        
         ffmpeg,

     

       13
       13
       -
         libva,

     

       14
       13
        
         cargo,

     

       15
       14
        
         rustc,

     

       16
       16
       -
         git,

     

       17
       15
        
         vulkan-headers,

     

       18
       16
        
         vulkan-loader,

     

       19
       17
        
         shaderc,

     

       20
       20
       -
         vulkan-tools,

     

       21
       18
        
         llvmPackages,

     

       22
       19
        
         autoPatchelfHook,

     

       23
       23
       -
         wayland,

     

       24
       20
        
         wayland-scanner,

     

       25
       21
        
         rust-bindgen,

     

       26
       26
       -
         egl-wayland,

     

       27
       22
        
       }:

     

       28
       23
        
       llvmPackages.stdenv.mkDerivation rec {

     

       29
       24
        
         pname = "waypipe";

     
···

       55
       50
        
           rustc

     

       56
       51
        
           wayland-scanner

     

       57
       52
        
           rustPlatform.cargoSetupHook

     

       53
       53
       +
           autoPatchelfHook

     

       58
       54
        
           rust-bindgen

     

       59
       55
        
         ];

     

       60
       56
        
       

     

       61
       57
        
         buildInputs = [

     

       62
       62
       -
           mesa

     

       58
       58
       +
           libgbm

     

       63
       59
        
           lz4

     

       64
       60
        
           zstd

     

       65
       61
        
           ffmpeg

     

       66
       62
        
           vulkan-headers

     

       63
       63
       +
           vulkan-loader

     

       64
       64
       +
         ];

     

       65
       65
       +
       

     

       66
       66
       +
         runtimeDependencies = [

     

       67
       67
       +
           libgbm

     

       68
       68
       +
           ffmpeg.lib

     

       67
       69
        
           vulkan-loader

     

       68
       70
        
         ];

     

       69
       71

+20 -9

pkgs/by-name/yt/ytdl-sub/package.nix

···

       1
       1
        
       {

     

       2
       2
        
         python3Packages,

     

       3
       3
       -
         fetchPypi,

     

       3
       3
       +
         fetchFromGitHub,

     

       4
       4
        
         ffmpeg,

     

       5
       5
        
         lib,

     

       6
       6
       +
         versionCheckHook,

     

       7
       7
       +
         nix-update-script,

     

       6
       8
        
       }:

     

       7
       9
        
       python3Packages.buildPythonApplication rec {

     

       8
       10
        
         pname = "ytdl-sub";

     

       9
       9
       -
         version = "2024.12.27";

     

       11
       11
       +
         version = "2025.01.15";

     

       10
       12
        
         pyproject = true;

     

       11
       13
        
       

     

       12
       12
       -
         src = fetchPypi {

     

       13
       13
       -
           inherit version;

     

       14
       14
       -
           pname = "ytdl_sub";

     

       15
       15
       -
           hash = "sha256-7XZlKGzDLG/MVw198Ii+l29F+Lt53MY5QtHU8k9xJWA=";

     

       14
       14
       +
         src = fetchFromGitHub {

     

       15
       15
       +
           owner = "jmbannon";

     

       16
       16
       +
           repo = "ytdl-sub";

     

       17
       17
       +
           tag = version;

     

       18
       18
       +
           hash = "sha256-UjCs71nXi77yvB9BhYxT+2G9I+qHEB5Jnhe+GJuppdY=";

     

       16
       19
        
         };

     

       17
       20
        
       

     

       18
       18
       -
         pythonRelaxDeps = [

     

       19
       19
       -
           "yt-dlp"

     

       20
       20
       -
         ];

     

       21
       21
       +
         postPatch = ''

     

       22
       22
       +
           echo '__pypi_version__ = "${version}"; __local_version__ = "${version}"' > src/ytdl_sub/__init__.py

     

       23
       23
       +
         '';

     

       24
       24
       +
       

     

       25
       25
       +
         pythonRelaxDeps = [ "yt-dlp" ];

     

       21
       26
        
       

     

       22
       27
        
         build-system = with python3Packages; [

     

       23
       28
        
           setuptools

     
···

       37
       42
        
           "--set YTDL_SUB_FFPROBE_PATH ${lib.getExe' ffmpeg "ffprobe"}"

     

       38
       43
        
         ];

     

       39
       44
        
       

     

       45
       45
       +
         nativeCheckInputs = [ versionCheckHook ];

     

       46
       46
       +
         versionCheckProgramArg = "--version";

     

       47
       47
       +
       

     

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

     

       49
       49
       +
       

     

       40
       50
        
         meta = {

     

       41
       51
        
           homepage = "https://github.com/jmbannon/ytdl-sub";

     

       42
       52
        
           description = "Lightweight tool to automate downloading and metadata generation with yt-dlp";

     
···

       47
       57
        
           license = lib.licenses.gpl3Only;

     

       48
       58
        
           maintainers = with lib.maintainers; [

     

       49
       59
        
             loc

     

       60
       60
       +
             defelo

     

       50
       61
        
           ];

     

       51
       62
        
           mainProgram = "ytdl-sub";

     

       52
       63
        
         };

+3 -3

pkgs/by-name/zw/zwave-js-ui/package.nix

···

       7
       7
        
       

     

       8
       8
        
       buildNpmPackage rec {

     

       9
       9
        
         pname = "zwave-js-ui";

     

       10
       10
       -
         version = "9.27.8";

     

       10
       10
       +
         version = "9.29.1";

     

       11
       11
        
       

     

       12
       12
        
         src = fetchFromGitHub {

     

       13
       13
        
           owner = "zwave-js";

     

       14
       14
        
           repo = "zwave-js-ui";

     

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

     

       16
       16
       -
           hash = "sha256-6Twyzt2BMozph39GMG3JghA54LYi40c1+WfSbAAO2oM=";

     

       16
       16
       +
           hash = "sha256-uP0WUPhPvjy6CfK0MjLzQGjtRAlDKONXQH8WtW1vJDw=";

     

       17
       17
        
         };

     

       18
       18
       -
         npmDepsHash = "sha256-2cDuRCxyn/wNgZks2Qg+iwqRX8CVRz8qVYh4ZlCR55I=";

     

       18
       18
       +
         npmDepsHash = "sha256-wRU5CTiwgPvy6exU3/iiuH0fkns+fX7/o0kc0c6VpeU=";

     

       19
       19
        
       

     

       20
       20
        
         passthru.tests.zwave-js-ui = nixosTests.zwave-js-ui;

     

       21
       21

-62

pkgs/desktops/deepin/apps/deepin-album/default.nix

···

       1
       1
       -
       {

     

       2
       2
       -
         stdenv,

     

       3
       3
       -
         lib,

     

       4
       4
       -
         fetchFromGitHub,

     

       5
       5
       -
         cmake,

     

       6
       6
       -
         pkg-config,

     

       7
       7
       -
         libsForQt5,

     

       8
       8
       -
         dtkwidget,

     

       9
       9
       -
         dtkdeclarative,

     

       10
       10
       -
         qt5integration,

     

       11
       11
       -
         qt5platform-plugins,

     

       12
       12
       -
         udisks2-qt5,

     

       13
       13
       -
         gio-qt,

     

       14
       14
       -
         freeimage,

     

       15
       15
       -
         ffmpeg_6,

     

       16
       16
       -
         ffmpegthumbnailer,

     

       17
       17
       -
       }:

     

       18
       18
       -
       

     

       19
       19
       -
       stdenv.mkDerivation rec {

     

       20
       20
       -
         pname = "deepin-album";

     

       21
       21
       -
         version = "6.0.4";

     

       22
       22
       -
       

     

       23
       23
       -
         src = fetchFromGitHub {

     

       24
       24
       -
           owner = "linuxdeepin";

     

       25
       25
       -
           repo = pname;

     

       26
       26
       -
           rev = version;

     

       27
       27
       -
           hash = "sha256-kTcVmROsqLH8GwJzAf3zMq/wGYWNvhFBiHODaROt7Do=";

     

       28
       28
       -
         };

     

       29
       29
       -
       

     

       30
       30
       -
         nativeBuildInputs = [

     

       31
       31
       -
           cmake

     

       32
       32
       -
           pkg-config

     

       33
       33
       -
           libsForQt5.qttools

     

       34
       34
       -
           libsForQt5.wrapQtAppsHook

     

       35
       35
       -
         ];

     

       36
       36
       -
       

     

       37
       37
       -
         buildInputs = [

     

       38
       38
       -
           dtkwidget

     

       39
       39
       -
           dtkdeclarative

     

       40
       40
       -
           qt5integration

     

       41
       41
       -
           qt5platform-plugins

     

       42
       42
       -
           libsForQt5.qtbase

     

       43
       43
       -
           libsForQt5.qtsvg

     

       44
       44
       -
           udisks2-qt5

     

       45
       45
       -
           gio-qt

     

       46
       46
       -
           freeimage

     

       47
       47
       -
           ffmpeg_6

     

       48
       48
       -
           ffmpegthumbnailer

     

       49
       49
       -
         ];

     

       50
       50
       -
       

     

       51
       51
       -
         strictDeps = true;

     

       52
       52
       -
       

     

       53
       53
       -
         cmakeFlags = [ "-DVERSION=${version}" ];

     

       54
       54
       -
       

     

       55
       55
       -
         meta = with lib; {

     

       56
       56
       -
           description = "Fashion photo manager for viewing and organizing pictures";

     

       57
       57
       -
           homepage = "https://github.com/linuxdeepin/deepin-album";

     

       58
       58
       -
           license = licenses.gpl3Plus;

     

       59
       59
       -
           platforms = platforms.linux;

     

       60
       60
       -
           maintainers = teams.deepin.members;

     

       61
       61
       -
         };

     

       62
       62
       -
       }

-111

pkgs/desktops/deepin/apps/deepin-camera/default.nix

···

       1
       1
       -
       {

     

       2
       2
       -
         stdenv,

     

       3
       3
       -
         lib,

     

       4
       4
       -
         fetchFromGitHub,

     

       5
       5
       -
         cmake,

     

       6
       6
       -
         pkg-config,

     

       7
       7
       -
         libsForQt5,

     

       8
       8
       -
         dtkwidget,

     

       9
       9
       -
         wayland,

     

       10
       10
       -
         dwayland,

     

       11
       11
       -
         qt5integration,

     

       12
       12
       -
         qt5platform-plugins,

     

       13
       13
       -
         image-editor,

     

       14
       14
       -
         ffmpeg_6,

     

       15
       15
       -
         ffmpegthumbnailer,

     

       16
       16
       -
         libusb1,

     

       17
       17
       -
         libpciaccess,

     

       18
       18
       -
         portaudio,

     

       19
       19
       -
         libv4l,

     

       20
       20
       -
         gst_all_1,

     

       21
       21
       -
         systemd,

     

       22
       22
       -
       }:

     

       23
       23
       -
       

     

       24
       24
       -
       stdenv.mkDerivation rec {

     

       25
       25
       -
         pname = "deepin-camera";

     

       26
       26
       -
         version = "6.0.5";

     

       27
       27
       -
       

     

       28
       28
       -
         src = fetchFromGitHub {

     

       29
       29
       -
           owner = "linuxdeepin";

     

       30
       30
       -
           repo = pname;

     

       31
       31
       -
           rev = version;

     

       32
       32
       -
           hash = "sha256-3q8yV8GpCPKW780YpCn+xLeFBGJFoAMmKSFCAH9OXoE=";

     

       33
       33
       -
         };

     

       34
       34
       -
       

     

       35
       35
       -
         # QLibrary and dlopen work with LD_LIBRARY_PATH

     

       36
       36
       -
         patches = [ ./dont_use_libPath.diff ];

     

       37
       37
       -
       

     

       38
       38
       -
         postPatch = ''

     

       39
       39
       -
           substituteInPlace src/CMakeLists.txt \

     

       40
       40
       -
             --replace "/usr/share/libimagevisualresult" "${image-editor}/share/libimagevisualresult" \

     

       41
       41
       -
             --replace "/usr/include/libusb-1.0" "${lib.getDev libusb1}/include/libusb-1.0"

     

       42
       42
       -
           substituteInPlace src/com.deepin.Camera.service \

     

       43
       43
       -
             --replace "/usr/bin/qdbus" "${lib.getBin libsForQt5.qttools}/bin/qdbus" \

     

       44
       44
       -
             --replace "/usr/share" "$out/share"

     

       45
       45
       -
         '';

     

       46
       46
       -
       

     

       47
       47
       -
         nativeBuildInputs = [

     

       48
       48
       -
           cmake

     

       49
       49
       -
           pkg-config

     

       50
       50
       -
           libsForQt5.qttools

     

       51
       51
       -
           libsForQt5.wrapQtAppsHook

     

       52
       52
       -
         ];

     

       53
       53
       -
       

     

       54
       54
       -
         buildInputs =

     

       55
       55
       -
           [

     

       56
       56
       -
             dtkwidget

     

       57
       57
       -
             wayland

     

       58
       58
       -
             dwayland

     

       59
       59
       -
             qt5integration

     

       60
       60
       -
             qt5platform-plugins

     

       61
       61
       -
             image-editor

     

       62
       62
       -
             libsForQt5.qtbase

     

       63
       63
       -
             libsForQt5.qtmultimedia

     

       64
       64
       -
             ffmpeg_6

     

       65
       65
       -
             ffmpegthumbnailer

     

       66
       66
       -
             libusb1

     

       67
       67
       -
             libpciaccess

     

       68
       68
       -
             portaudio

     

       69
       69
       -
             libv4l

     

       70
       70
       -
           ]

     

       71
       71
       -
           ++ (with gst_all_1; [

     

       72
       72
       -
             gstreamer

     

       73
       73
       -
             gst-plugins-base

     

       74
       74
       -
           ]);

     

       75
       75
       -
       

     

       76
       76
       -
         cmakeFlags = [ "-DVERSION=${version}" ];

     

       77
       77
       -
       

     

       78
       78
       -
         strictDeps = true;

     

       79
       79
       -
       

     

       80
       80
       -
         env.NIX_CFLAGS_COMPILE = toString [

     

       81
       81
       -
           "-I${gst_all_1.gstreamer.dev}/include/gstreamer-1.0"

     

       82
       82
       -
           "-I${gst_all_1.gst-plugins-base.dev}/include/gstreamer-1.0"

     

       83
       83
       -
         ];

     

       84
       84
       -
       

     

       85
       85
       -
         qtWrapperArgs = [

     

       86
       86
       -
           "--prefix LD_LIBRARY_PATH : ${

     

       87
       87
       -
             lib.makeLibraryPath [

     

       88
       88
       -
               ffmpeg_6

     

       89
       89
       -
               ffmpegthumbnailer

     

       90
       90
       -
               gst_all_1.gstreamer

     

       91
       91
       -
               gst_all_1.gst-plugins-base

     

       92
       92
       -
               libusb1

     

       93
       93
       -
               libv4l

     

       94
       94
       -
               portaudio

     

       95
       95
       -
               systemd

     

       96
       96
       -
             ]

     

       97
       97
       -
           }"

     

       98
       98
       -
         ];

     

       99
       99
       -
       

     

       100
       100
       -
         preFixup = ''

     

       101
       101
       -
           qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0")

     

       102
       102
       -
         '';

     

       103
       103
       -
       

     

       104
       104
       -
         meta = {

     

       105
       105
       -
           description = "Tool to view camera, take photo and video";

     

       106
       106
       -
           homepage = "https://github.com/linuxdeepin/deepin-camera";

     

       107
       107
       -
           license = lib.licenses.gpl3Plus;

     

       108
       108
       -
           platforms = lib.platforms.linux;

     

       109
       109
       -
           maintainers = lib.teams.deepin.members;

     

       110
       110
       -
         };

     

       111
       111
       -
       }

-24

pkgs/desktops/deepin/apps/deepin-camera/dont_use_libPath.diff

···

       1
       1
       -
       diff --git a/src/src/gstvideowriter.cpp b/src/src/gstvideowriter.cpp

     

       2
       2
       -
       index c96c8b0..fcc11da 100644

     

       3
       3
       -
       --- a/src/src/gstvideowriter.cpp

     

       4
       4
       -
       +++ b/src/src/gstvideowriter.cpp

     

       5
       5
       -
       @@ -282,6 +282,7 @@ void GstVideoWriter::loadAppSrcCaps()

     

       6
       6
       -
        

     

       7
       7
       -
        QString GstVideoWriter::libPath(const QString &strlib)

     

       8
       8
       -
        {

     

       9
       9
       -
       +    return strlib;

     

       10
       10
       -
            QDir  dir;

     

       11
       11
       -
            QString path  = QLibraryInfo::location(QLibraryInfo::LibrariesPath);

     

       12
       12
       -
            dir.setPath(path);

     

       13
       13
       -
       diff --git a/src/src/mainwindow.cpp b/src/src/mainwindow.cpp

     

       14
       14
       -
       index d3c6c24..6d313a6 100644

     

       15
       15
       -
       --- a/src/src/mainwindow.cpp

     

       16
       16
       -
       +++ b/src/src/mainwindow.cpp

     

       17
       17
       -
       @@ -784,6 +784,7 @@ void CMainWindow::slotPopupSettingsDialog()

     

       18
       18
       -
        

     

       19
       19
       -
        QString CMainWindow::libPath(const QString &strlib)

     

       20
       20
       -
        {

     

       21
       21
       -
       +    return strlib;

     

       22
       22
       -
            QDir  dir;

     

       23
       23
       -
            QString path  = QLibraryInfo::location(QLibraryInfo::LibrariesPath);

     

       24
       24
       -
            dir.setPath(path);

-63

pkgs/desktops/deepin/apps/deepin-image-viewer/default.nix

···

       1
       1
       -
       {

     

       2
       2
       -
         stdenv,

     

       3
       3
       -
         lib,

     

       4
       4
       -
         fetchFromGitHub,

     

       5
       5
       -
         fetchpatch,

     

       6
       6
       -
         cmake,

     

       7
       7
       -
         pkg-config,

     

       8
       8
       -
         libsForQt5,

     

       9
       9
       -
         qt5platform-plugins,

     

       10
       10
       -
         dtkwidget,

     

       11
       11
       -
         dtkdeclarative,

     

       12
       12
       -
         deepin-ocr-plugin-manager,

     

       13
       13
       -
         libraw,

     

       14
       14
       -
         freeimage,

     

       15
       15
       -
       }:

     

       16
       16
       -
       

     

       17
       17
       -
       stdenv.mkDerivation rec {

     

       18
       18
       -
         pname = "deepin-image-viewer";

     

       19
       19
       -
         version = "6.0.2";

     

       20
       20
       -
       

     

       21
       21
       -
         src = fetchFromGitHub {

     

       22
       22
       -
           owner = "linuxdeepin";

     

       23
       23
       -
           repo = pname;

     

       24
       24
       -
           rev = version;

     

       25
       25
       -
           hash = "sha256-YT3wK+ELXjgtsXbkiCjQF0zczQi89tF1kyIQtl9/mMA=";

     

       26
       26
       -
         };

     

       27
       27
       -
       

     

       28
       28
       -
         patches = [

     

       29
       29
       -
           (fetchpatch {

     

       30
       30
       -
             name = "fix-build-with-libraw-0_21.patch";

     

       31
       31
       -
             url = "https://raw.githubusercontent.com/archlinux/svntogit-community/2ff11979704dd7156a7e7c3bae9b30f08894063d/trunk/libraw-0.21.patch";

     

       32
       32
       -
             hash = "sha256-I/w4uiANT8Z8ud/F9WCd3iRHOfplu3fpqnu8ZIs4C+w=";

     

       33
       33
       -
           })

     

       34
       34
       -
         ];

     

       35
       35
       -
       

     

       36
       36
       -
         nativeBuildInputs = [

     

       37
       37
       -
           cmake

     

       38
       38
       -
           pkg-config

     

       39
       39
       -
           libsForQt5.qttools

     

       40
       40
       -
           libsForQt5.wrapQtAppsHook

     

       41
       41
       -
         ];

     

       42
       42
       -
       

     

       43
       43
       -
         buildInputs = [

     

       44
       44
       -
           qt5platform-plugins

     

       45
       45
       -
           dtkwidget

     

       46
       46
       -
           dtkdeclarative

     

       47
       47
       -
           deepin-ocr-plugin-manager

     

       48
       48
       -
           libraw

     

       49
       49
       -
           freeimage

     

       50
       50
       -
         ];

     

       51
       51
       -
       

     

       52
       52
       -
         strictDeps = true;

     

       53
       53
       -
       

     

       54
       54
       -
         cmakeFlags = [ "-DVERSION=${version}" ];

     

       55
       55
       -
       

     

       56
       56
       -
         meta = with lib; {

     

       57
       57
       -
           description = "Image viewing tool with fashion interface and smooth performance";

     

       58
       58
       -
           homepage = "https://github.com/linuxdeepin/deepin-image-viewer";

     

       59
       59
       -
           license = licenses.gpl3Plus;

     

       60
       60
       -
           platforms = platforms.linux;

     

       61
       61
       -
           maintainers = teams.deepin.members;

     

       62
       62
       -
         };

     

       63
       63
       -
       }

-126

pkgs/desktops/deepin/apps/deepin-movie-reborn/default.nix

···

       1
       1
       -
       {

     

       2
       2
       -
         stdenv,

     

       3
       3
       -
         lib,

     

       4
       4
       -
         fetchFromGitHub,

     

       5
       5
       -
         cmake,

     

       6
       6
       -
         pkg-config,

     

       7
       7
       -
         libsForQt5,

     

       8
       8
       -
         dtkwidget,

     

       9
       9
       -
         qt5integration,

     

       10
       10
       -
         qt5platform-plugins,

     

       11
       11
       -
         gsettings-qt,

     

       12
       12
       -
         elfutils,

     

       13
       13
       -
         ffmpeg_6,

     

       14
       14
       -
         ffmpegthumbnailer,

     

       15
       15
       -
         mpv,

     

       16
       16
       -
         xorg,

     

       17
       17
       -
         pcre,

     

       18
       18
       -
         libdvdread,

     

       19
       19
       -
         libdvdnav,

     

       20
       20
       -
         libunwind,

     

       21
       21
       -
         libva,

     

       22
       22
       -
         zstd,

     

       23
       23
       -
         glib,

     

       24
       24
       -
         gst_all_1,

     

       25
       25
       -
         gtest,

     

       26
       26
       -
         libpulseaudio,

     

       27
       27
       -
       }:

     

       28
       28
       -
       

     

       29
       29
       -
       stdenv.mkDerivation rec {

     

       30
       30
       -
         pname = "deepin-movie-reborn";

     

       31
       31
       -
         version = "6.0.10";

     

       32
       32
       -
       

     

       33
       33
       -
         src = fetchFromGitHub {

     

       34
       34
       -
           owner = "linuxdeepin";

     

       35
       35
       -
           repo = pname;

     

       36
       36
       -
           rev = version;

     

       37
       37
       -
           hash = "sha256-1UbrNufetedla8TMFPze1hP/R2cZN7SEYEtrK4/5/RQ=";

     

       38
       38
       -
         };

     

       39
       39
       -
       

     

       40
       40
       -
         patches = [ ./dont_use_libPath.diff ];

     

       41
       41
       -
       

     

       42
       42
       -
         outputs = [

     

       43
       43
       -
           "out"

     

       44
       44
       -
           "dev"

     

       45
       45
       -
         ];

     

       46
       46
       -
       

     

       47
       47
       -
         nativeBuildInputs = [

     

       48
       48
       -
           cmake

     

       49
       49
       -
           pkg-config

     

       50
       50
       -
           libsForQt5.qttools

     

       51
       51
       -
           libsForQt5.wrapQtAppsHook

     

       52
       52
       -
         ];

     

       53
       53
       -
       

     

       54
       54
       -
         buildInputs =

     

       55
       55
       -
           [

     

       56
       56
       -
             dtkwidget

     

       57
       57
       -
             qt5integration

     

       58
       58
       -
             qt5platform-plugins

     

       59
       59
       -
             libsForQt5.qtx11extras

     

       60
       60
       -
             libsForQt5.qtmultimedia

     

       61
       61
       -
             libsForQt5.qtdbusextended

     

       62
       62
       -
             libsForQt5.qtmpris

     

       63
       63
       -
             gsettings-qt

     

       64
       64
       -
             elfutils

     

       65
       65
       -
             ffmpeg_6

     

       66
       66
       -
             ffmpegthumbnailer

     

       67
       67
       -
             xorg.libXtst

     

       68
       68
       -
             xorg.libXdmcp

     

       69
       69
       -
             xorg.xcbproto

     

       70
       70
       -
             pcre.dev

     

       71
       71
       -
             libdvdread

     

       72
       72
       -
             libdvdnav

     

       73
       73
       -
             libunwind

     

       74
       74
       -
             libva

     

       75
       75
       -
             zstd

     

       76
       76
       -
             mpv

     

       77
       77
       -
             gtest

     

       78
       78
       -
             libpulseaudio

     

       79
       79
       -
           ]

     

       80
       80
       -
           ++ (with gst_all_1; [

     

       81
       81
       -
             gstreamer

     

       82
       82
       -
             gst-plugins-base

     

       83
       83
       -
           ]);

     

       84
       84
       -
       

     

       85
       85
       -
         propagatedBuildInputs = [

     

       86
       86
       -
           libsForQt5.qtmultimedia

     

       87
       87
       -
           libsForQt5.qtx11extras

     

       88
       88
       -
           ffmpegthumbnailer

     

       89
       89
       -
         ];

     

       90
       90
       -
       

     

       91
       91
       -
         env.NIX_CFLAGS_COMPILE = toString [

     

       92
       92
       -
           "-I${gst_all_1.gstreamer.dev}/include/gstreamer-1.0"

     

       93
       93
       -
           "-I${gst_all_1.gst-plugins-base.dev}/include/gstreamer-1.0"

     

       94
       94
       -
         ];

     

       95
       95
       -
       

     

       96
       96
       -
         cmakeFlags = [ "-DVERSION=${version}" ];

     

       97
       97
       -
       

     

       98
       98
       -
         strictDeps = true;

     

       99
       99
       -
       

     

       100
       100
       -
         qtWrapperArgs = [

     

       101
       101
       -
           "--prefix LD_LIBRARY_PATH : ${

     

       102
       102
       -
             lib.makeLibraryPath [

     

       103
       103
       -
               mpv

     

       104
       104
       -
               ffmpeg_6

     

       105
       105
       -
               ffmpegthumbnailer

     

       106
       106
       -
               gst_all_1.gstreamer

     

       107
       107
       -
               gst_all_1.gst-plugins-base

     

       108
       108
       -
             ]

     

       109
       109
       -
           }"

     

       110
       110
       -
         ];

     

       111
       111
       -
       

     

       112
       112
       -
         preFixup = ''

     

       113
       113
       -
           glib-compile-schemas ${glib.makeSchemaPath "$out" "${pname}-${version}"}

     

       114
       114
       -
           qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0")

     

       115
       115
       -
         '';

     

       116
       116
       -
       

     

       117
       117
       -
         meta = with lib; {

     

       118
       118
       -
           description = "Full-featured video player supporting playing local and streaming media in multiple video formats";

     

       119
       119
       -
           mainProgram = "deepin-movie";

     

       120
       120
       -
           homepage = "https://github.com/linuxdeepin/deepin-movie-reborn";

     

       121
       121
       -
           license = licenses.gpl3Plus;

     

       122
       122
       -
           platforms = platforms.linux;

     

       123
       123
       -
           maintainers = teams.deepin.members;

     

       124
       124
       -
           broken = true; # Crash when playing any video

     

       125
       125
       -
         };

     

       126
       126
       -
       }

-108

pkgs/desktops/deepin/apps/deepin-movie-reborn/dont_use_libPath.diff

···

       1
       1
       -
       diff --git a/src/backends/mpv/mpv_proxy.h b/src/backends/mpv/mpv_proxy.h

     

       2
       2
       -
       index 1256a06..d76d1c0 100644

     

       3
       3
       -
       --- a/src/backends/mpv/mpv_proxy.h

     

       4
       4
       -
       +++ b/src/backends/mpv/mpv_proxy.h

     

       5
       5
       -
       @@ -38,6 +38,7 @@ typedef void (*mpv_terminateDestroy)(mpv_handle *ctx);

     

       6
       6
       -
        

     

       7
       7
       -
        static QString libPath(const QString &sLib)

     

       8
       8
       -
        {

     

       9
       9
       -
       +    return sLib;

     

       10
       10
       -
            QDir dir;

     

       11
       11
       -
            QString path  = QLibraryInfo::location(QLibraryInfo::LibrariesPath);

     

       12
       12
       -
            dir.setPath(path);

     

       13
       13
       -
       diff --git a/src/common/hwdec_probe.cpp b/src/common/hwdec_probe.cpp

     

       14
       14
       -
       index d70ed0c..ac2516d 100644

     

       15
       15
       -
       --- a/src/common/hwdec_probe.cpp

     

       16
       16
       -
       +++ b/src/common/hwdec_probe.cpp

     

       17
       17
       -
       @@ -83,6 +83,7 @@ bool HwdecProbe::isFileCanHwdec(const QUrl& url, QList<QString>& hwList)

     

       18
       18
       -
        

     

       19
       19
       -
        static QString libPath(const QString &sLib)

     

       20
       20
       -
        {

     

       21
       21
       -
       +    return sLib;

     

       22
       22
       -
            QDir dir;

     

       23
       23
       -
            QString path  = QLibraryInfo::location(QLibraryInfo::LibrariesPath);

     

       24
       24
       -
            dir.setPath(path);

     

       25
       25
       -
       diff --git a/src/common/platform/platform_thumbnail_worker.cpp b/src/common/platform/platform_thumbnail_worker.cpp

     

       26
       26
       -
       index 17b2bdd..82db2b9 100644

     

       27
       27
       -
       --- a/src/common/platform/platform_thumbnail_worker.cpp

     

       28
       28
       -
       +++ b/src/common/platform/platform_thumbnail_worker.cpp

     

       29
       29
       -
       @@ -88,6 +88,7 @@ Platform_ThumbnailWorker::Platform_ThumbnailWorker()

     

       30
       30
       -
        

     

       31
       31
       -
        QString Platform_ThumbnailWorker::libPath(const QString &strlib)

     

       32
       32
       -
        {

     

       33
       33
       -
       +    return strlib;

     

       34
       34
       -
            QDir  dir;

     

       35
       35
       -
            QString lib_path  = QLibraryInfo::location(QLibraryInfo::LibrariesPath);

     

       36
       36
       -
            dir.setPath(lib_path);

     

       37
       37
       -
       diff --git a/src/common/thumbnail_worker.cpp b/src/common/thumbnail_worker.cpp

     

       38
       38
       -
       index 2ba2888..c34841e 100644

     

       39
       39
       -
       --- a/src/common/thumbnail_worker.cpp

     

       40
       40
       -
       +++ b/src/common/thumbnail_worker.cpp

     

       41
       41
       -
       @@ -88,6 +88,7 @@ ThumbnailWorker::ThumbnailWorker()

     

       42
       42
       -
        

     

       43
       43
       -
        QString ThumbnailWorker::libPath(const QString &strlib)

     

       44
       44
       -
        {

     

       45
       45
       -
       +    return strlib;

     

       46
       46
       -
            QDir  dir;

     

       47
       47
       -
            QString lib_path  = QLibraryInfo::location(QLibraryInfo::LibrariesPath);

     

       48
       48
       -
            dir.setPath(lib_path);

     

       49
       49
       -
       diff --git a/src/libdmr/compositing_manager.cpp b/src/libdmr/compositing_manager.cpp

     

       50
       50
       -
       index 9b117fc..28a11ec 100644

     

       51
       51
       -
       --- a/src/libdmr/compositing_manager.cpp

     

       52
       52
       -
       +++ b/src/libdmr/compositing_manager.cpp

     

       53
       53
       -
       @@ -237,6 +237,7 @@ bool CompositingManager::isCanHwdec()

     

       54
       54
       -
        

     

       55
       55
       -
        QString  CompositingManager::libPath(const QString &sLib)

     

       56
       56
       -
        {

     

       57
       57
       -
       +    return sLib;

     

       58
       58
       -
            QDir dir;

     

       59
       59
       -
            QString path  = QLibraryInfo::location(QLibraryInfo::LibrariesPath);

     

       60
       60
       -
            dir.setPath(path);

     

       61
       61
       -
       diff --git a/src/libdmr/filefilter.cpp b/src/libdmr/filefilter.cpp

     

       62
       62
       -
       index 6691df0..b620a62 100644

     

       63
       63
       -
       --- a/src/libdmr/filefilter.cpp

     

       64
       64
       -
       +++ b/src/libdmr/filefilter.cpp

     

       65
       65
       -
       @@ -72,6 +72,7 @@ FileFilter::FileFilter()

     

       66
       66
       -
        

     

       67
       67
       -
        QString FileFilter::libPath(const QString &strlib)

     

       68
       68
       -
        {

     

       69
       69
       -
       +    return strlib;

     

       70
       70
       -
            QDir  dir;

     

       71
       71
       -
            QString path  = QLibraryInfo::location(QLibraryInfo::LibrariesPath);

     

       72
       72
       -
            dir.setPath(path);

     

       73
       73
       -
       diff --git a/src/libdmr/playlist_model.cpp b/src/libdmr/playlist_model.cpp

     

       74
       74
       -
       index 18a8095..9ea4abf 100644

     

       75
       75
       -
       --- a/src/libdmr/playlist_model.cpp

     

       76
       76
       -
       +++ b/src/libdmr/playlist_model.cpp

     

       77
       77
       -
       @@ -449,6 +449,7 @@ PlaylistModel::PlaylistModel(PlayerEngine *e)

     

       78
       78
       -
        

     

       79
       79
       -
        QString PlaylistModel::libPath(const QString &strlib)

     

       80
       80
       -
        {

     

       81
       81
       -
       +    return strlib;

     

       82
       82
       -
            QDir  dir;

     

       83
       83
       -
            QString path  = QLibraryInfo::location(QLibraryInfo::LibrariesPath);

     

       84
       84
       -
            dir.setPath(path);

     

       85
       85
       -
       diff --git a/src/widgets/platform/platform_toolbox_proxy.cpp b/src/widgets/platform/platform_toolbox_proxy.cpp

     

       86
       86
       -
       index 570acac..9da0f97 100644

     

       87
       87
       -
       --- a/src/widgets/platform/platform_toolbox_proxy.cpp

     

       88
       88
       -
       +++ b/src/widgets/platform/platform_toolbox_proxy.cpp

     

       89
       89
       -
       @@ -709,6 +709,7 @@ private:

     

       90
       90
       -
        

     

       91
       91
       -
        static QString libPath(const QString &strlib)

     

       92
       92
       -
        {

     

       93
       93
       -
       +    return strlib;

     

       94
       94
       -
            QDir  dir;

     

       95
       95
       -
            QString path  = QLibraryInfo::location(QLibraryInfo::LibrariesPath);

     

       96
       96
       -
            dir.setPath(path);

     

       97
       97
       -
       diff --git a/src/widgets/toolbox_proxy.cpp b/src/widgets/toolbox_proxy.cpp

     

       98
       98
       -
       index 05cbc2c..54731bf 100644

     

       99
       99
       -
       --- a/src/widgets/toolbox_proxy.cpp

     

       100
       100
       -
       +++ b/src/widgets/toolbox_proxy.cpp

     

       101
       101
       -
       @@ -760,6 +760,7 @@ private:

     

       102
       102
       -
        

     

       103
       103
       -
        static QString libPath(const QString &strlib)

     

       104
       104
       -
        {

     

       105
       105
       -
       +    return strlib;

     

       106
       106
       -
            QDir  dir;

     

       107
       107
       -
            QString path  = QLibraryInfo::location(QLibraryInfo::LibrariesPath);

     

       108
       108
       -
            dir.setPath(path);

-105

pkgs/desktops/deepin/apps/deepin-screen-recorder/default.nix

···

       1
       1
       -
       {

     

       2
       2
       -
         stdenv,

     

       3
       3
       -
         lib,

     

       4
       4
       -
         fetchFromGitHub,

     

       5
       5
       -
         pkg-config,

     

       6
       6
       -
         libsForQt5,

     

       7
       7
       -
         dtkwidget,

     

       8
       8
       -
         qt5integration,

     

       9
       9
       -
         dde-qt-dbus-factory,

     

       10
       10
       -
         image-editor,

     

       11
       11
       -
         gsettings-qt,

     

       12
       12
       -
         xorg,

     

       13
       13
       -
         libusb1,

     

       14
       14
       -
         libv4l,

     

       15
       15
       -
         ffmpeg,

     

       16
       16
       -
         ffmpegthumbnailer,

     

       17
       17
       -
         portaudio,

     

       18
       18
       -
         dwayland,

     

       19
       19
       -
         udev,

     

       20
       20
       -
         gst_all_1,

     

       21
       21
       -
       }:

     

       22
       22
       -
       

     

       23
       23
       -
       stdenv.mkDerivation rec {

     

       24
       24
       -
         pname = "deepin-screen-recorder";

     

       25
       25
       -
         version = "6.0.6";

     

       26
       26
       -
       

     

       27
       27
       -
         src = fetchFromGitHub {

     

       28
       28
       -
           owner = "linuxdeepin";

     

       29
       29
       -
           repo = pname;

     

       30
       30
       -
           rev = version;

     

       31
       31
       -
           hash = "sha256-nE+axTUxWCcgrxQ5y2cjkVswW2rwv/We0m7XgB4shko=";

     

       32
       32
       -
         };

     

       33
       33
       -
       

     

       34
       34
       -
         patches = [ ./dont_use_libPath.diff ];

     

       35
       35
       -
       

     

       36
       36
       -
         # disable dock plugins, it's part of dde-shell now

     

       37
       37
       -
         postPatch = ''

     

       38
       38
       -
           substituteInPlace screen_shot_recorder.pro \

     

       39
       39
       -
             --replace-fail " src/dde-dock-plugins" ""

     

       40
       40
       -
           (

     

       41
       41
       -
             shopt -s globstar

     

       42
       42
       -
             substituteInPlace **/*.pro **/*.service **/*.desktop \

     

       43
       43
       -
               --replace-quiet "/usr/" "$out/"

     

       44
       44
       -
           )

     

       45
       45
       -
         '';

     

       46
       46
       -
       

     

       47
       47
       -
         nativeBuildInputs = [

     

       48
       48
       -
           libsForQt5.qmake

     

       49
       49
       -
           pkg-config

     

       50
       50
       -
           libsForQt5.qttools

     

       51
       51
       -
           libsForQt5.wrapQtAppsHook

     

       52
       52
       -
         ];

     

       53
       53
       -
       

     

       54
       54
       -
         buildInputs =

     

       55
       55
       -
           [

     

       56
       56
       -
             dtkwidget

     

       57
       57
       -
             dde-qt-dbus-factory

     

       58
       58
       -
             qt5integration

     

       59
       59
       -
             libsForQt5.qtbase

     

       60
       60
       -
             libsForQt5.qtmultimedia

     

       61
       61
       -
             libsForQt5.qtx11extras

     

       62
       62
       -
             image-editor

     

       63
       63
       -
             gsettings-qt

     

       64
       64
       -
             xorg.libXdmcp

     

       65
       65
       -
             xorg.libXtst

     

       66
       66
       -
             xorg.libXcursor

     

       67
       67
       -
             libusb1

     

       68
       68
       -
             libv4l

     

       69
       69
       -
             ffmpeg

     

       70
       70
       -
             ffmpegthumbnailer

     

       71
       71
       -
             portaudio

     

       72
       72
       -
             dwayland

     

       73
       73
       -
             udev

     

       74
       74
       -
           ]

     

       75
       75
       -
           ++ (with gst_all_1; [

     

       76
       76
       -
             gstreamer

     

       77
       77
       -
             gst-plugins-base

     

       78
       78
       -
             gst-plugins-good

     

       79
       79
       -
           ]);

     

       80
       80
       -
       

     

       81
       81
       -
         qtWrapperArgs = [

     

       82
       82
       -
           "--prefix LD_LIBRARY_PATH : ${

     

       83
       83
       -
             lib.makeLibraryPath [

     

       84
       84
       -
               udev

     

       85
       85
       -
               gst_all_1.gstreamer

     

       86
       86
       -
               libv4l

     

       87
       87
       -
               ffmpeg

     

       88
       88
       -
               ffmpegthumbnailer

     

       89
       89
       -
             ]

     

       90
       90
       -
           }"

     

       91
       91
       -
         ];

     

       92
       92
       -
       

     

       93
       93
       -
         preFixup = ''

     

       94
       94
       -
           qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0")

     

       95
       95
       -
         '';

     

       96
       96
       -
       

     

       97
       97
       -
         meta = {

     

       98
       98
       -
           description = "Screen recorder application for dde";

     

       99
       99
       -
           homepage = "https://github.com/linuxdeepin/deepin-screen-recorder";

     

       100
       100
       -
           license = lib.licenses.gpl3Plus;

     

       101
       101
       -
           platforms = lib.platforms.linux;

     

       102
       102
       -
           maintainers = lib.teams.deepin.members;

     

       103
       103
       -
           broken = true;

     

       104
       104
       -
         };

     

       105
       105
       -
       }

-36

pkgs/desktops/deepin/apps/deepin-screen-recorder/dont_use_libPath.diff

···

       1
       1
       -
       diff --git a/src/gstrecord/gstinterface.cpp b/src/gstrecord/gstinterface.cpp

     

       2
       2
       -
       index 165a7ce..e1574a5 100644

     

       3
       3
       -
       --- a/src/gstrecord/gstinterface.cpp

     

       4
       4
       -
       +++ b/src/gstrecord/gstinterface.cpp

     

       5
       5
       -
       @@ -49,6 +49,7 @@ gstInterface::gstInterface()

     

       6
       6
       -
        }

     

       7
       7
       -
        QString gstInterface::libPath(const QString &sLib)

     

       8
       8
       -
        {

     

       9
       9
       -
       +    return sLib;

     

       10
       10
       -
            qInfo() << "gstreamer lib name is " << sLib;

     

       11
       11
       -
            QDir dir;

     

       12
       12
       -
            QString path  = QLibraryInfo::location(QLibraryInfo::LibrariesPath);

     

       13
       13
       -
       diff --git a/src/main_window.cpp b/src/main_window.cpp

     

       14
       14
       -
       index e0f6bc5..757abad 100755

     

       15
       15
       -
       --- a/src/main_window.cpp

     

       16
       16
       -
       +++ b/src/main_window.cpp

     

       17
       17
       -
       @@ -559,6 +559,7 @@ void MainWindow::initDynamicLibPath()

     

       18
       18
       -
        }

     

       19
       19
       -
        QString MainWindow::libPath(const QString &strlib)

     

       20
       20
       -
        {

     

       21
       21
       -
       +    return strlib;

     

       22
       22
       -
            QDir  dir;

     

       23
       23
       -
            QString path  = QLibraryInfo::location(QLibraryInfo::LibrariesPath);

     

       24
       24
       -
            dir.setPath(path);

     

       25
       25
       -
       diff --git a/src/waylandrecord/avlibinterface.cpp b/src/waylandrecord/avlibinterface.cpp

     

       26
       26
       -
       index b4145fa..97a3f5c 100644

     

       27
       27
       -
       --- a/src/waylandrecord/avlibinterface.cpp

     

       28
       28
       -
       +++ b/src/waylandrecord/avlibinterface.cpp

     

       29
       29
       -
       @@ -105,6 +105,7 @@ avlibInterface::avlibInterface()

     

       30
       30
       -
        

     

       31
       31
       -
        QString avlibInterface::libPath(const QString &sLib)

     

       32
       32
       -
        {

     

       33
       33
       -
       +    return sLib;

     

       34
       34
       -
            QDir dir;

     

       35
       35
       -
            QString path  = QLibraryInfo::location(QLibraryInfo::LibrariesPath);

     

       36
       36
       -
            dir.setPath(path);

-89

pkgs/desktops/deepin/apps/deepin-voice-note/default.nix

···

       1
       1
       -
       {

     

       2
       2
       -
         stdenv,

     

       3
       3
       -
         lib,

     

       4
       4
       -
         fetchFromGitHub,

     

       5
       5
       -
         cmake,

     

       6
       6
       -
         pkg-config,

     

       7
       7
       -
         libsForQt5,

     

       8
       8
       -
         dtkwidget,

     

       9
       9
       -
         qt5integration,

     

       10
       10
       -
         qt5platform-plugins,

     

       11
       11
       -
         dde-qt-dbus-factory,

     

       12
       12
       -
         deepin-movie-reborn,

     

       13
       13
       -
         libvlc,

     

       14
       14
       -
         gst_all_1,

     

       15
       15
       -
         gtest,

     

       16
       16
       -
       }:

     

       17
       17
       -
       

     

       18
       18
       -
       stdenv.mkDerivation rec {

     

       19
       19
       -
         pname = "deepin-voice-note";

     

       20
       20
       -
         version = "6.0.18";

     

       21
       21
       -
       

     

       22
       22
       -
         src = fetchFromGitHub {

     

       23
       23
       -
           owner = "linuxdeepin";

     

       24
       24
       -
           repo = pname;

     

       25
       25
       -
           rev = version;

     

       26
       26
       -
           hash = "sha256-GbSYXwJoNfbg+31454GjMbXRqrtk2bSZJCk18ILfAn4=";

     

       27
       27
       -
         };

     

       28
       28
       -
       

     

       29
       29
       -
         patches = [ ./use_v23_dbus_interface.diff ];

     

       30
       30
       -
       

     

       31
       31
       -
         postPatch = ''

     

       32
       32
       -
           substituteInPlace CMakeLists.txt \

     

       33
       33
       -
             --replace "/usr" "$out"

     

       34
       34
       -
           substituteInPlace src/common/audiowatcher.cpp \

     

       35
       35
       -
             --replace "/usr/share" "$out/share"

     

       36
       36
       -
         '';

     

       37
       37
       -
       

     

       38
       38
       -
         nativeBuildInputs = [

     

       39
       39
       -
           cmake

     

       40
       40
       -
           pkg-config

     

       41
       41
       -
           libsForQt5.qttools

     

       42
       42
       -
           libsForQt5.wrapQtAppsHook

     

       43
       43
       -
         ];

     

       44
       44
       -
       

     

       45
       45
       -
         buildInputs =

     

       46
       46
       -
           [

     

       47
       47
       -
             libsForQt5.qtbase

     

       48
       48
       -
             libsForQt5.qtsvg

     

       49
       49
       -
             dtkwidget

     

       50
       50
       -
             qt5integration

     

       51
       51
       -
             qt5platform-plugins

     

       52
       52
       -
             dde-qt-dbus-factory

     

       53
       53
       -
             deepin-movie-reborn

     

       54
       54
       -
             libsForQt5.qtmultimedia

     

       55
       55
       -
             libsForQt5.qtwebengine

     

       56
       56
       -
             libvlc

     

       57
       57
       -
             gtest

     

       58
       58
       -
           ]

     

       59
       59
       -
           ++ (with gst_all_1; [

     

       60
       60
       -
             gstreamer

     

       61
       61
       -
             gst-plugins-base

     

       62
       62
       -
           ]);

     

       63
       63
       -
       

     

       64
       64
       -
         strictDeps = true;

     

       65
       65
       -
       

     

       66
       66
       -
         cmakeFlags = [ "-DVERSION=${version}" ];

     

       67
       67
       -
       

     

       68
       68
       -
         qtWrapperArgs = [

     

       69
       69
       -
           "--prefix LD_LIBRARY_PATH : ${

     

       70
       70
       -
             lib.makeLibraryPath [

     

       71
       71
       -
               gst_all_1.gstreamer

     

       72
       72
       -
               gst_all_1.gst-plugins-base

     

       73
       73
       -
             ]

     

       74
       74
       -
           }"

     

       75
       75
       -
         ];

     

       76
       76
       -
       

     

       77
       77
       -
         preFixup = ''

     

       78
       78
       -
           qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0")

     

       79
       79
       -
         '';

     

       80
       80
       -
       

     

       81
       81
       -
         meta = {

     

       82
       82
       -
           description = "Simple memo software with texts and voice recordings";

     

       83
       83
       -
           mainProgram = "deepin-voice-note";

     

       84
       84
       -
           homepage = "https://github.com/linuxdeepin/deepin-voice-note";

     

       85
       85
       -
           license = lib.licenses.gpl3Plus;

     

       86
       86
       -
           platforms = lib.platforms.linux;

     

       87
       87
       -
           maintainers = lib.teams.deepin.members;

     

       88
       88
       -
         };

     

       89
       89
       -
       }

-13

pkgs/desktops/deepin/apps/deepin-voice-note/use_v23_dbus_interface.diff

···

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

     

       2
       2
       -
       index e7bfb81..f56f11a 100644

     

       3
       3
       -
       --- a/CMakeLists.txt

     

       4
       4
       -
       +++ b/CMakeLists.txt

     

       5
       5
       -
       @@ -103,7 +103,7 @@ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}  -fstack-protector-all")

     

       6
       6
       -
        execute_process(COMMAND cat /etc/os-version OUTPUT_VARIABLE OS_INFO_STR)

     

       7
       7
       -
        string(REGEX MATCHALL "MajorVersion=[0-9]+" MAJOR_STR "${OS_INFO_STR}")

     

       8
       8
       -
        string(REGEX MATCH "[0-9]+" MAJOR_VERSION "${MAJOR_STR}")

     

       9
       9
       -
       -if (MAJOR_VERSION MATCHES "23")

     

       10
       10
       -
       +if (TRUE)

     

       11
       11
       -
            message("--------------------- OS_BUILD_V23 on")

     

       12
       12
       -
            add_definitions(-DOS_BUILD_V23)

     

       13
       13
       -
        endif()

+8 -8

pkgs/desktops/deepin/default.nix

···

       21
       21
        
             qt5platform-plugins = callPackage ./library/qt5platform-plugins { };

     

       22
       22
        
             qt5integration = callPackage ./library/qt5integration { };

     

       23
       23
        
             deepin-wayland-protocols = callPackage ./library/deepin-wayland-protocols { };

     

       24
       24
       -
             deepin-ocr-plugin-manager = callPackage ./library/deepin-ocr-plugin-manager { };

     

       25
       24
        
             dwayland = callPackage ./library/dwayland { };

     

       26
       25
        
             dde-qt-dbus-factory = callPackage ./library/dde-qt-dbus-factory { };

     

       27
       26
        
             disomaster = callPackage ./library/disomaster { };

     

       28
       27
        
             docparser = callPackage ./library/docparser { };

     

       29
       28
        
             gio-qt = callPackage ./library/gio-qt { };

     

       30
       30
       -
             image-editor = callPackage ./library/image-editor { };

     

       31
       29
        
             udisks2-qt5 = callPackage ./library/udisks2-qt5 { };

     

       32
       30
        
             util-dfm = callPackage ./library/util-dfm { };

     

       33
       31
        
             dtk6core = callPackage ./library/dtk6core { };

     
···

       66
       64
        
             dde-api-proxy = callPackage ./core/dde-api-proxy { };

     

       67
       65
        
       

     

       68
       66
        
             #### Dtk Application

     

       69
       69
       -
             deepin-album = callPackage ./apps/deepin-album { };

     

       70
       67
        
             deepin-calculator = callPackage ./apps/deepin-calculator { };

     

       71
       71
       -
             deepin-camera = callPackage ./apps/deepin-camera { };

     

       72
       68
        
             deepin-compressor = callPackage ./apps/deepin-compressor { };

     

       73
       69
        
             deepin-draw = callPackage ./apps/deepin-draw { };

     

       74
       70
        
             deepin-editor = callPackage ./apps/deepin-editor { };

     

       75
       75
       -
             deepin-image-viewer = callPackage ./apps/deepin-image-viewer { };

     

       76
       76
       -
             deepin-movie-reborn = callPackage ./apps/deepin-movie-reborn { };

     

       77
       71
        
             deepin-music = callPackage ./apps/deepin-music { };

     

       78
       72
        
             deepin-picker = callPackage ./apps/deepin-picker { };

     

       79
       79
       -
             deepin-screen-recorder = callPackage ./apps/deepin-screen-recorder { };

     

       80
       73
        
             deepin-shortcut-viewer = callPackage ./apps/deepin-shortcut-viewer { };

     

       81
       74
        
             deepin-system-monitor = callPackage ./apps/deepin-system-monitor { };

     

       82
       75
        
             deepin-terminal = callPackage ./apps/deepin-terminal { };

     

       83
       76
        
             deepin-reader = callPackage ./apps/deepin-reader { };

     

       84
       84
       -
             deepin-voice-note = callPackage ./apps/deepin-voice-note { };

     

       85
       77
        
             deepin-screensaver = callPackage ./apps/deepin-screensaver { };

     

       86
       78
        
       

     

       87
       79
        
             #### Go Packages

     
···

       116
       108
        
             go-lib = throw "Then 'deepin.go-lib' package was removed, use 'go mod' to manage it"; # added 2024-05-31

     

       117
       109
        
             go-gir-generator = throw "Then 'deepin.go-gir-generator' package was removed, use 'go mod' to manage it"; # added 2024-05-31

     

       118
       110
        
             go-dbus-factory = throw "Then 'deepin.go-dbus-factory' package was removed, use 'go mod' to manage it"; # added 2024-05-31

     

       111
       111
       +
             deepin-movie-reborn = throw "'deepin.deepin-movie-reborn' has been removed as it was broken and unmaintained in nixpkgs, Please use 'vlc' instead"; # added 2025-01-16;

     

       112
       112
       +
             deepin-album = throw "'deepin.deepin-album' has been removed as it was broken and unmaintained in nixpkgs, Please use 'kdePackages.gwenview' instead"; # added 2025-01-16

     

       113
       113
       +
             deepin-voice-note = throw "'deepin.deepin-voice-note' has been removed as it depending on deepin-movie-reborn which was broken"; # added 2025-01-16

     

       114
       114
       +
             deepin-screen-recorder = throw "'deepin.deepin-screen-recorder' has been removed as it was broken and unmaintained in nixpkgs, Please use 'flameshot' or 'simplescreenrecorder' instead"; # added 2025-01-16

     

       115
       115
       +
             deepin-ocr-plugin-manager = throw "'deepin.deepin-ocr-plugin-manager' has been removed as it was outdated"; # added 2025-01-16

     

       116
       116
       +
             deepin-camera = throw "'deepin.deepin-camera' has been removed as it was unmaintained in nixpkgs, Please use 'snapshot' instead"; # added 2025-01-16

     

       117
       117
       +
             deepin-image-viewer = throw "'deepin.deepin-image-viewer' has been removed as it was broken and unmaintained in nixpkgs, Please use 'kdePackages.gwenview' instead"; # added 2025-01-16

     

       118
       118
       +
             image-editor = throw "'deepin.image-editor' has been removed as it was unmaintained in nixpkgs"; # added 2025-01-16

     

       119
       119
        
           };

     

       120
       120
        
       in

     

       121
       121
        
       lib.makeScope pkgs.newScope packages

-59

pkgs/desktops/deepin/library/deepin-ocr-plugin-manager/default.nix

···

       1
       1
       -
       {

     

       2
       2
       -
         stdenv,

     

       3
       3
       -
         lib,

     

       4
       4
       -
         fetchFromGitHub,

     

       5
       5
       -
         pkg-config,

     

       6
       6
       -
         cmake,

     

       7
       7
       -
         libsForQt5,

     

       8
       8
       -
         ncnn,

     

       9
       9
       -
         opencv,

     

       10
       10
       -
         vulkan-headers,

     

       11
       11
       -
       }:

     

       12
       12
       -
       

     

       13
       13
       -
       stdenv.mkDerivation rec {

     

       14
       14
       -
         pname = "deepin-ocr-plugin-manager";

     

       15
       15
       -
         version = "unstable-2023-07-10";

     

       16
       16
       -
       

     

       17
       17
       -
         src = fetchFromGitHub {

     

       18
       18
       -
           owner = "linuxdeepin";

     

       19
       19
       -
           repo = pname;

     

       20
       20
       -
           rev = "9b5c9e57c83b5adde383ed404b73f9dcbf5e6a48";

     

       21
       21
       -
           hash = "sha256-U5lxAKTaQvvlqbqRezPIcBGg+DpF1hZ204Y1+8dt14U=";

     

       22
       22
       -
         };

     

       23
       23
       -
       

     

       24
       24
       -
         # don't use vendored opencv

     

       25
       25
       -
         postPatch = ''

     

       26
       26
       -
           substituteInPlace src/CMakeLists.txt \

     

       27
       27
       -
             --replace "opencv_mobile" "opencv4"

     

       28
       28
       -
           substituteInPlace src/paddleocr-ncnn/paddleocr.cpp \

     

       29
       29
       -
             --replace "/usr" "$out"

     

       30
       30
       -
         '';

     

       31
       31
       -
       

     

       32
       32
       -
         nativeBuildInputs = [

     

       33
       33
       -
           cmake

     

       34
       34
       -
           libsForQt5.qttools

     

       35
       35
       -
           pkg-config

     

       36
       36
       -
           libsForQt5.wrapQtAppsHook

     

       37
       37
       -
         ];

     

       38
       38
       -
       

     

       39
       39
       -
         buildInputs = [

     

       40
       40
       -
           ncnn

     

       41
       41
       -
           opencv

     

       42
       42
       -
           vulkan-headers

     

       43
       43
       -
         ];

     

       44
       44
       -
       

     

       45
       45
       -
         strictDeps = true;

     

       46
       46
       -
       

     

       47
       47
       -
         cmakeFlags = [

     

       48
       48
       -
           "-DCMAKE_INSTALL_LIBDIR=lib"

     

       49
       49
       -
           "-DCMAKE_INSTALL_INCLUDEDIR=include"

     

       50
       50
       -
         ];

     

       51
       51
       -
       

     

       52
       52
       -
         meta = with lib; {

     

       53
       53
       -
           description = "Plugin manager of optical character recognition for DDE";

     

       54
       54
       -
           homepage = "https://github.com/linuxdeepin/deepin-ocr-plugin-manager";

     

       55
       55
       -
           license = licenses.gpl3Plus;

     

       56
       56
       -
           platforms = platforms.linux;

     

       57
       57
       -
           maintainers = teams.deepin.members;

     

       58
       58
       -
         };

     

       59
       59
       -
       }

-57

pkgs/desktops/deepin/library/image-editor/default.nix

···

       1
       1
       -
       {

     

       2
       2
       -
         stdenv,

     

       3
       3
       -
         lib,

     

       4
       4
       -
         fetchFromGitHub,

     

       5
       5
       -
         dtkwidget,

     

       6
       6
       -
         cmake,

     

       7
       7
       -
         libsForQt5,

     

       8
       8
       -
         pkg-config,

     

       9
       9
       -
         opencv,

     

       10
       10
       -
         freeimage,

     

       11
       11
       -
         libmediainfo,

     

       12
       12
       -
         ffmpegthumbnailer,

     

       13
       13
       -
         pcre,

     

       14
       14
       -
       }:

     

       15
       15
       -
       

     

       16
       16
       -
       stdenv.mkDerivation rec {

     

       17
       17
       -
         pname = "image-editor";

     

       18
       18
       -
         version = "1.0.41";

     

       19
       19
       -
       

     

       20
       20
       -
         src = fetchFromGitHub {

     

       21
       21
       -
           owner = "linuxdeepin";

     

       22
       22
       -
           repo = pname;

     

       23
       23
       -
           rev = version;

     

       24
       24
       -
           hash = "sha256-9V9B0YSUTWv/4IbTRtKJSVrZx6j8jqJxIIR9TwUZ0U0=";

     

       25
       25
       -
         };

     

       26
       26
       -
       

     

       27
       27
       -
         postPatch = ''

     

       28
       28
       -
           substituteInPlace libimageviewer/CMakeLists.txt --replace '/usr' '$out'

     

       29
       29
       -
           substituteInPlace libimagevisualresult/CMakeLists.txt --replace '/usr' '$out'

     

       30
       30
       -
         '';

     

       31
       31
       -
       

     

       32
       32
       -
         nativeBuildInputs = [

     

       33
       33
       -
           cmake

     

       34
       34
       -
           pkg-config

     

       35
       35
       -
           libsForQt5.qttools

     

       36
       36
       -
           libsForQt5.wrapQtAppsHook

     

       37
       37
       -
         ];

     

       38
       38
       -
       

     

       39
       39
       -
         buildInputs = [

     

       40
       40
       -
           dtkwidget

     

       41
       41
       -
           opencv

     

       42
       42
       -
           freeimage

     

       43
       43
       -
           libmediainfo

     

       44
       44
       -
           ffmpegthumbnailer

     

       45
       45
       -
           pcre

     

       46
       46
       -
         ];

     

       47
       47
       -
       

     

       48
       48
       -
         cmakeFlags = [ "-DCMAKE_INSTALL_LIBDIR=lib" ];

     

       49
       49
       -
       

     

       50
       50
       -
         meta = with lib; {

     

       51
       51
       -
           description = "Image editor lib for dtk";

     

       52
       52
       -
           homepage = "https://github.com/linuxdeepin/image-editor";

     

       53
       53
       -
           license = licenses.gpl3Plus;

     

       54
       54
       -
           platforms = platforms.linux;

     

       55
       55
       -
           maintainers = teams.deepin.members;

     

       56
       56
       -
         };

     

       57
       57
       -
       }

+2

pkgs/development/coq-modules/CoLoR/default.nix

···

       47
       47
        
         release."1.4.0".rev = "168c6b86c7d3f87ee51791f795a8828b1521589a";

     

       48
       48
        
         release."1.4.0".sha256 = "1d2whsgs3kcg5wgampd6yaqagcpmzhgb6a0hp6qn4lbimck5dfmm";

     

       49
       49
        
       

     

       50
       50
       +
         mlPlugin = true;  /* uses coq-bignums.plugin */

     

       51
       51
       +
       

     

       50
       52
        
         propagatedBuildInputs = [ bignums ];

     

       51
       53
        
         enableParallelBuilding = false;

     

       52
       54

+2

pkgs/development/coq-modules/coqprime/default.nix

···

       46
       46
        
         release."8.7.2".sha256 = "15zlcrx06qqxjy3nhh22wzy0rb4npc8l4nx2bbsfsvrisbq1qb7k";

     

       47
       47
        
         releaseRev = v: "v${v}";

     

       48
       48
        
       

     

       49
       49
       +
         mlPlugin = true;  /* uses coq-bignums.plugin */

     

       50
       50
       +
       

     

       49
       51
        
         propagatedBuildInputs = [ bignums ];

     

       50
       52
        
       

     

       51
       53
        
         meta = with lib; {

+10 -2

pkgs/development/coq-modules/corn/default.nix

···

       4
       4
        
         coq,

     

       5
       5
        
         bignums,

     

       6
       6
        
         math-classes,

     

       7
       7
       +
         coq-elpi,

     

       7
       8
        
         version ? null,

     

       8
       9
        
       }:

     

       9
       10
        
       

     

       10
       10
       -
       mkCoqDerivation rec {

     

       11
       11
       +
       (mkCoqDerivation rec {

     

       11
       12
        
         pname = "corn";

     

       12
       13
        
         inherit version;

     

       13
       14
        
         defaultVersion =

     
···

       46
       47
        
         configureScript = "./configure.sh";

     

       47
       48
        
         dontAddPrefix = true;

     

       48
       49
        
       

     

       50
       50
       +
         mlPlugin = true;  /* uses coq-bignums.plugin */

     

       51
       51
       +
       

     

       49
       52
        
         propagatedBuildInputs = [

     

       50
       53
        
           bignums

     

       51
       54
        
           math-classes

     
···

       57
       60
        
           description = "Coq library for constructive analysis";

     

       58
       61
        
           maintainers = [ maintainers.vbgl ];

     

       59
       62
        
         };

     

       60
       60
       -
       }

     

       63
       63
       +
       }).overrideAttrs

     

       64
       64
       +
         (o: {

     

       65
       65
       +
           propagatedBuildInputs =

     

       66
       66
       +
             o.propagatedBuildInputs

     

       67
       67
       +
             ++ lib.optional (lib.versions.isGt "8.19.0" o.version || o.version == "dev") coq-elpi;

     

       68
       68
       +
         })

+1 -1

pkgs/development/coq-modules/itauto/default.nix

···

       75
       75
        
         (

     

       76
       76
        
           o:

     

       77
       77
        
           lib.optionalAttrs (o.version == "dev" || lib.versionAtLeast o.version "8.16") {

     

       78
       78
       -
             propagatedBuildInputs = [ coq.ocamlPackages.findlib ];

     

       78
       78
       +
             propagatedBuildInputs = o.propagatedBuildInputs ++ [ coq.ocamlPackages.findlib ];

     

       79
       79
        
           }

     

       80
       80
        
           // lib.optionalAttrs (o.version == "dev" || lib.versionAtLeast o.version "8.18") {

     

       81
       81
        
             nativeBuildInputs = with coq.ocamlPackages; [

+2

pkgs/development/coq-modules/math-classes/default.nix

···

       37
       37
        
         release."8.18.0".sha256 = "sha256-0WwPss8+Vr37zX616xeuS4TvtImtSbToFQkQostIjO8=";

     

       38
       38
        
         release."8.19.0".sha256 = "sha256-rsV96W9MPFi/DKsepNPm1QnC2DMemio+uALIgzVYw0w=";

     

       39
       39
        
       

     

       40
       40
       +
         mlPlugin = true;  /* uses coq-bignums.plugin */

     

       41
       41
       +
       

     

       40
       42
        
         propagatedBuildInputs = [ bignums ];

     

       41
       43
        
       

     

       42
       44
        
         meta = {

+6 -3

pkgs/development/interpreters/octave/build-env.nix

···

       1
       1
        
       { lib, stdenv, octave, buildEnv

     

       2
       2
       -
       , makeWrapper, texinfo

     

       2
       2
       +
       , makeWrapper

     

       3
       3
       +
       , locale, texinfo, glibcLocalesUtf8

     

       3
       4
        
       , wrapOctave

     

       4
       5
        
       , computeRequiredOctavePackages

     

       5
       6
        
       , extraLibs ? []

     
···

       20
       21
        
         extraOutputsToInstall = [ "out" ] ++ extraOutputsToInstall;

     

       21
       22
        
       

     

       22
       23
        
         nativeBuildInputs = [ makeWrapper ];

     

       23
       23
       -
         buildInputs = [ texinfo wrapOctave ];

     

       24
       24
       +
         buildInputs = [ locale texinfo wrapOctave ];

     

       24
       25
        
       

     

       25
       26
        
         # During "build" we must first unlink the /share symlink to octave's /share

     

       26
       27
        
         # Then, we can re-symlink the all of octave/share, except for /share/octave

     
···

       33
       34
        
                cd "${octave}/bin"

     

       34
       35
        
                for prg in *; do

     

       35
       36
        
                    if [ -x $prg ]; then

     

       36
       36
       -
                       makeWrapper "${octave}/bin/$prg" "$out/bin/$prg" --set OCTAVE_SITE_INITFILE "$out/share/octave/site/m/startup/octaverc"

     

       37
       37
       +
                       makeWrapper "${octave}/bin/$prg" "$out/bin/$prg" \

     

       38
       38
       +
                                   --set OCTAVE_SITE_INITFILE "$out/share/octave/site/m/startup/octaverc" \

     

       39
       39
       +
                                   --set LOCALE_ARCHIVE "${glibcLocalesUtf8}/lib/locale/locale-archive"

     

       37
       40
        
                    fi

     

       38
       41
        
                done

     

       39
       42
        
                cd $out

+3 -3

pkgs/development/octave-modules/netcdf/default.nix

···

       6
       6
        
       

     

       7
       7
        
       buildOctavePackage rec {

     

       8
       8
        
         pname = "netcdf";

     

       9
       9
       -
         version = "1.0.17";

     

       9
       9
       +
         version = "1.0.18";

     

       10
       10
        
       

     

       11
       11
        
         src = fetchurl {

     

       12
       12
        
           url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";

     

       13
       13
       -
           sha256 = "sha256-uuFD8VNeWbyHFyWMDMzWDd2n+dG9EFmc/JnZU2tx+Uk=";

     

       13
       13
       +
           sha256 = "sha256-ydgcKFh4uWuSlr7zw+k1JFUSzGm9tiWmOHV1IWvlgwk=";

     

       14
       14
        
         };

     

       15
       15
        
       

     

       16
       16
       -
         buildInputs = [

     

       16
       16
       +
         propagatedBuildInputs = [

     

       17
       17
        
           netcdf

     

       18
       18
        
         ];

     

       19
       19

+2 -2

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

···

       31
       31
        
       

     

       32
       32
        
       buildPythonPackage rec {

     

       33
       33
        
         pname = "accelerate";

     

       34
       34
       -
         version = "1.2.1";

     

       34
       34
       +
         version = "1.3.0";

     

       35
       35
        
         pyproject = true;

     

       36
       36
        
       

     

       37
       37
        
         src = fetchFromGitHub {

     

       38
       38
        
           owner = "huggingface";

     

       39
       39
        
           repo = "accelerate";

     

       40
       40
        
           tag = "v${version}";

     

       41
       41
       -
           hash = "sha256-KnFf6ge0vUR/C7Rh/c6ZttCGKo9OUIWCUYxk5O+OW7c=";

     

       41
       41
       +
           hash = "sha256-HcbvQL8nASsZcfjAoPbQKNoEkSLp5Vmus2MEa3Dv6Po=";

     

       42
       42
        
         };

     

       43
       43
        
       

     

       44
       44
        
         buildInputs = [ llvmPackages.openmp ];

+2 -2

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

···

       9
       9
        
       

     

       10
       10
        
       buildPythonPackage rec {

     

       11
       11
        
         pname = "aioairzone";

     

       12
       12
       -
         version = "0.9.7";

     

       12
       12
       +
         version = "0.9.8";

     

       13
       13
        
         pyproject = true;

     

       14
       14
        
       

     

       15
       15
        
         disabled = pythonOlder "3.11";

     
···

       18
       18
        
           owner = "Noltari";

     

       19
       19
        
           repo = "aioairzone";

     

       20
       20
        
           tag = version;

     

       21
       21
       -
           hash = "sha256-ZD/lJwYiggE7fUVGjimgGQ+H8zCtOZrZRElc0crrKhw=";

     

       21
       21
       +
           hash = "sha256-wqJpdD4zd5hToZJaacjhoHEC+rSyLjPs7vwwAN92xHM=";

     

       22
       22
        
         };

     

       23
       23
        
       

     

       24
       24
        
         build-system = [ setuptools ];

+2 -2

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

···

       19
       19
        
       

     

       20
       20
        
       buildPythonPackage rec {

     

       21
       21
        
         pname = "aiohomeconnect";

     

       22
       22
       -
         version = "0.11.0";

     

       22
       22
       +
         version = "0.11.2";

     

       23
       23
        
         pyproject = true;

     

       24
       24
        
       

     

       25
       25
        
         disabled = pythonOlder "3.11";

     
···

       28
       28
        
           owner = "MartinHjelmare";

     

       29
       29
        
           repo = "aiohomeconnect";

     

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

     

       31
       31
       -
           hash = "sha256-fg3WusrONJtPO/IpHlXzO17C2OuQe28kprXrBG9PqMY=";

     

       31
       31
       +
           hash = "sha256-YnQypKeVYoHD445fv9n643qIqjTCInCfbTHPUrMePJI=";

     

       32
       32
        
         };

     

       33
       33
        
       

     

       34
       34
        
         pythonRelaxDeps = [ "httpx" ];

+3 -3

pkgs/development/python-modules/asf-search/default.nix

···

       20
       20
        
       

     

       21
       21
        
       buildPythonPackage rec {

     

       22
       22
        
         pname = "asf-search";

     

       23
       23
       -
         version = "8.0.1";

     

       23
       23
       +
         version = "8.1.1";

     

       24
       24
        
         pyproject = true;

     

       25
       25
        
       

     

       26
       26
       -
         disabled = pythonOlder "3.8";

     

       26
       26
       +
         disabled = pythonOlder "3.9";

     

       27
       27
        
       

     

       28
       28
        
         src = fetchFromGitHub {

     

       29
       29
        
           owner = "asfadmin";

     

       30
       30
        
           repo = "Discovery-asf_search";

     

       31
       31
        
           tag = "v${version}";

     

       32
       32
       -
           hash = "sha256-mOhY64Csxdc/DYS1OlbstxYEodtpXTVyPwd4B1jrDK8=";

     

       32
       32
       +
           hash = "sha256-9NyBDpCIsRBPN2965SR106h6hxwML7kXv6sY3YlPseA=";

     

       33
       33
        
         };

     

       34
       34
        
       

     

       35
       35
        
         pythonRelaxDeps = [ "tenacity" ];

+3 -3

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

···

       12
       12
        
       

     

       13
       13
        
       buildPythonPackage rec {

     

       14
       14
        
         pname = "autopep8";

     

       15
       15
       -
         version = "2.3.1";

     

       15
       15
       +
         version = "2.3.2";

     

       16
       16
        
         pyproject = true;

     

       17
       17
        
       

     

       18
       18
       -
         disabled = pythonOlder "3.7";

     

       18
       18
       +
         disabled = pythonOlder "3.9";

     

       19
       19
        
       

     

       20
       20
        
         src = fetchFromGitHub {

     

       21
       21
        
           owner = "hhatto";

     

       22
       22
        
           repo = "autopep8";

     

       23
       23
        
           tag = "v${version}";

     

       24
       24
       -
           hash = "sha256-znZw9SnnVMN8XZjko11J5GK/LAk+gmRkTgPEO9+ntJ8=";

     

       24
       24
       +
           hash = "sha256-9OJ5XbzpHMHsFjf5oVyHjn5zqmAxRuSItWP4sQx8jD4=";

     

       25
       25
        
         };

     

       26
       26
        
       

     

       27
       27
        
         build-system = [ setuptools ];

+6

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

···

       5
       5
        
         fetchFromGitHub,

     

       6
       6
        
         hatchling,

     

       7
       7
        
         pytestCheckHook,

     

       8
       8
       +
         pythonAtLeast,

     

       8
       9
        
         typing-extensions,

     

       9
       10
        
       }:

     

       10
       11
        
       

     
···

       28
       29
        
         ];

     

       29
       30
        
       

     

       30
       31
        
         pythonImportsCheck = [ "beartype" ];

     

       32
       32
       +
       

     

       33
       33
       +
         # this test is not run upstream, and broke in 3.13 (_nparams removed)

     

       34
       34
       +
         disabledTests = lib.optionals (pythonAtLeast "3.13") [

     

       35
       35
       +
           "test_door_is_subhint"

     

       36
       36
       +
         ];

     

       31
       37
        
       

     

       32
       38
        
         meta = {

     

       33
       39
        
           description = "Fast runtime type checking for Python";

+2 -2

pkgs/development/python-modules/boto3-stubs/default.nix

···

       359
       359
        
       

     

       360
       360
        
       buildPythonPackage rec {

     

       361
       361
        
         pname = "boto3-stubs";

     

       362
       362
       -
         version = "1.36.0";

     

       362
       362
       +
         version = "1.36.2";

     

       363
       363
        
         pyproject = true;

     

       364
       364
        
       

     

       365
       365
        
         disabled = pythonOlder "3.7";

     
···

       367
       367
        
         src = fetchPypi {

     

       368
       368
        
           pname = "boto3_stubs";

     

       369
       369
        
           inherit version;

     

       370
       370
       -
           hash = "sha256-L3Zss6EAAMCEZPSJTM5gf2VwRhnJaXGXD9SaaB0IdbM=";

     

       370
       370
       +
           hash = "sha256-9AHlhcx99N37PgL7lcXs+G59QVYcPvuAK6RgjhrUtmA=";

     

       371
       371
        
         };

     

       372
       372
        
       

     

       373
       373
        
         build-system = [ setuptools ];

+2 -2

pkgs/development/python-modules/botocore-stubs/default.nix

···

       10
       10
        
       

     

       11
       11
        
       buildPythonPackage rec {

     

       12
       12
        
         pname = "botocore-stubs";

     

       13
       13
       -
         version = "1.36.0";

     

       13
       13
       +
         version = "1.36.2";

     

       14
       14
        
         pyproject = true;

     

       15
       15
        
       

     

       16
       16
        
         disabled = pythonOlder "3.7";

     
···

       18
       18
        
         src = fetchPypi {

     

       19
       19
        
           pname = "botocore_stubs";

     

       20
       20
        
           inherit version;

     

       21
       21
       -
           hash = "sha256-cfDQdIZk25v4TMo0Zq7SQnzEao3eN1OVMIsPJxoecZs=";

     

       21
       21
       +
           hash = "sha256-yWCewYS9RFEhq1UpZCv3c9Qgzcckfy0HqAghr+mj9nA=";

     

       22
       22
        
         };

     

       23
       23
        
       

     

       24
       24
        
         nativeBuildInputs = [ setuptools ];

+2 -2

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

···

       19
       19
        
       

     

       20
       20
        
       buildPythonPackage rec {

     

       21
       21
        
         pname = "cyclopts";

     

       22
       22
       -
         version = "3.2.0";

     

       22
       22
       +
         version = "3.2.1";

     

       23
       23
        
         pyproject = true;

     

       24
       24
        
       

     

       25
       25
        
         disabled = pythonOlder "3.8";

     
···

       28
       28
        
           owner = "BrianPugh";

     

       29
       29
        
           repo = "cyclopts";

     

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

     

       31
       31
       -
           hash = "sha256-U2H/SyVqoNlKAiim6FieEQw0SKK/b9diP9AjXb8PZjg=";

     

       31
       31
       +
           hash = "sha256-dHmoO9agZBhDviowtvuAox8hJsHcxgQTRxpaYmy50Dk=";

     

       32
       32
        
         };

     

       33
       33
        
       

     

       34
       34
        
         build-system = [

+18 -10

pkgs/development/python-modules/django-environ/default.nix

···

       1
       1
        
       {

     

       2
       2
        
         lib,

     

       3
       3
        
         buildPythonPackage,

     

       4
       4
       -
         fetchPypi,

     

       5
       4
        
         django,

     

       6
       6
       -
         six,

     

       5
       5
       +
         fetchPypi,

     

       6
       6
       +
         pythonOlder,

     

       7
       7
       +
         setuptools,

     

       7
       8
        
       }:

     

       8
       9
        
       

     

       9
       10
        
       buildPythonPackage rec {

     

       10
       11
        
         pname = "django-environ";

     

       11
       11
       -
         version = "0.11.2";

     

       12
       12
       -
         format = "setuptools";

     

       12
       12
       +
         version = "0.12.0";

     

       13
       13
       +
         pyproject = true;

     

       14
       14
       +
       

     

       15
       15
       +
         disabled = pythonOlder "3.9";

     

       13
       16
        
       

     

       14
       17
        
         src = fetchPypi {

     

       15
       15
       -
           inherit pname version;

     

       16
       16
       -
           hash = "sha256-8yqHqgiZiUwn1OF3b6a0d+gWTtf2s+QQpiptcsqvZL4=";

     

       18
       18
       +
           pname = "django_environ";

     

       19
       19
       +
           inherit version;

     

       20
       20
       +
           hash = "sha256-In3IkUU91b3nacNEnPSnS28u6PerI2HJOgcGj0F5BBo=";

     

       17
       21
        
         };

     

       18
       22
        
       

     

       23
       23
       +
         build-system = [ setuptools ];

     

       24
       24
       +
       

     

       25
       25
       +
         buildInputs = [ django ];

     

       26
       26
       +
       

     

       19
       27
        
         # The testsuite fails to modify the base environment

     

       20
       28
        
         doCheck = false;

     

       21
       21
       -
         propagatedBuildInputs = [

     

       22
       22
       -
           django

     

       23
       23
       -
           six

     

       24
       24
       -
         ];

     

       29
       29
       +
       

     

       30
       30
       +
         pythonImportsCheck = [ "environ" ];

     

       25
       31
        
       

     

       26
       32
        
         meta = with lib; {

     

       27
       33
        
           description = "Utilize environment variables to configure your Django application";

     

       28
       34
        
           homepage = "https://github.com/joke2k/django-environ/";

     

       35
       35
       +
           changelog = "https://github.com/joke2k/django-environ/releases/tag/v${version}";

     

       29
       36
        
           license = licenses.mit;

     

       37
       37
       +
           maintainers = with maintainers; [ ];

     

       30
       38
        
         };

     

       31
       39
        
       }

+13 -10

pkgs/development/python-modules/django-htmx/default.nix

···

       1
       1
        
       {

     

       2
       2
        
         lib,

     

       3
       3
       -
         buildPythonPackage,

     

       4
       4
       -
         fetchFromGitHub,

     

       5
       5
       -
         setuptools,

     

       6
       3
        
         asgiref,

     

       4
       4
       +
         buildPythonPackage,

     

       7
       5
        
         django,

     

       8
       8
       -
         pytestCheckHook,

     

       6
       6
       +
         fetchFromGitHub,

     

       9
       7
        
         pytest-django,

     

       8
       8
       +
         pytestCheckHook,

     

       9
       9
       +
         pythonOlder,

     

       10
       10
       +
         setuptools,

     

       10
       11
        
       }:

     

       11
       12
        
       

     

       12
       13
        
       buildPythonPackage rec {

     

       13
       14
        
         pname = "django-htmx";

     

       14
       14
       -
         version = "1.19.0";

     

       15
       15
       +
         version = "1.21.0";

     

       15
       16
        
         pyproject = true;

     

       16
       17
        
       

     

       18
       18
       +
         disabled = pythonOlder "3.9";

     

       19
       19
       +
       

     

       17
       20
        
         src = fetchFromGitHub {

     

       18
       21
        
           owner = "adamchainz";

     

       19
       22
        
           repo = "django-htmx";

     

       20
       23
        
           rev = version;

     

       21
       21
       -
           hash = "sha256-nSutErUkFafKjBswhC+Lrn39MgCbCrzttAx1a+qt1so=";

     

       24
       24
       +
           hash = "sha256-2zmCJ+oHvw21lvCgAFja2LRPA6LNWep4uRor0z1Ft6g=";

     

       22
       25
        
         };

     

       23
       26
        
       

     

       24
       27
        
         build-system = [ setuptools ];

     

       25
       28
        
       

     

       26
       26
       -
         dependencies = [

     

       27
       27
       -
           asgiref

     

       28
       28
       -
           django

     

       29
       29
       -
         ];

     

       29
       29
       +
         buildInputs = [ django ];

     

       30
       30
       +
       

     

       31
       31
       +
         dependencies = [ asgiref ];

     

       30
       32
        
       

     

       31
       33
        
         nativeCheckInputs = [

     

       32
       34
        
           pytestCheckHook

     
···

       38
       40
        
         meta = {

     

       39
       41
        
           description = "Extensions for using Django with htmx";

     

       40
       42
        
           homepage = "https://github.com/adamchainz/django-htmx";

     

       43
       43
       +
           changelog = "https://github.com/adamchainz/django-htmx/blob/${version}/docs/changelog.rst";

     

       41
       44
        
           license = lib.licenses.mit;

     

       42
       45
        
           maintainers = with lib.maintainers; [ minijackson ];

     

       43
       46
        
         };

+2 -2

pkgs/development/python-modules/django-import-export/default.nix

···

       14
       14
        
       

     

       15
       15
        
       buildPythonPackage rec {

     

       16
       16
        
         pname = "django-import-export";

     

       17
       17
       -
         version = "4.3.3";

     

       17
       17
       +
         version = "4.3.4";

     

       18
       18
        
         pyproject = true;

     

       19
       19
        
       

     

       20
       20
        
         src = fetchFromGitHub {

     

       21
       21
        
           owner = "django-import-export";

     

       22
       22
        
           repo = "django-import-export";

     

       23
       23
        
           tag = version;

     

       24
       24
       -
           hash = "sha256-1vb8a0ntp5ikWrJ3aI4KsGlraXRoFa7o+sP2sJpFbVc=";

     

       24
       24
       +
           hash = "sha256-o21xT+gu1vuar/QJbXhg2hpHkrBCVOMhGAFngi32d10=";

     

       25
       25
        
         };

     

       26
       26
        
       

     

       27
       27
        
         pythonRelaxDeps = [ "tablib" ];

+16 -11

pkgs/development/python-modules/django-taggit/default.nix

···

       1
       1
        
       {

     

       2
       2
        
         lib,

     

       3
       3
        
         buildPythonPackage,

     

       4
       4
       -
         pythonOlder,

     

       5
       5
       -
         fetchPypi,

     

       6
       4
        
         django,

     

       7
       5
        
         djangorestframework,

     

       6
       6
       +
         fetchFromGitHub,

     

       8
       7
        
         python,

     

       8
       8
       +
         pythonOlder,

     

       9
       9
       +
         setuptools,

     

       9
       10
        
       }:

     

       10
       11
        
       

     

       11
       12
        
       buildPythonPackage rec {

     

       12
       13
        
         pname = "django-taggit";

     

       13
       13
       -
         version = "5.0.1";

     

       14
       14
       -
         format = "setuptools";

     

       14
       14
       +
         version = "6.1.0";

     

       15
       15
       +
         pyproject = true;

     

       15
       16
        
       

     

       16
       17
        
         disabled = pythonOlder "3.7";

     

       17
       18
        
       

     

       18
       18
       -
         src = fetchPypi {

     

       19
       19
       -
           inherit pname version;

     

       20
       20
       -
           hash = "sha256-7c19seDzXDBOCCovYx3awuFu9SlgKVJOt5KvdDDKtMw=";

     

       19
       19
       +
         src = fetchFromGitHub {

     

       20
       20
       +
           owner = "jazzband";

     

       21
       21
       +
           repo = "django-taggit";

     

       22
       22
       +
           tag = version;

     

       23
       23
       +
           hash = "sha256-QLJhO517VONuf+8rrpZ6SXMP/WWymOIKfd4eyviwCsU=";

     

       21
       24
        
         };

     

       22
       25
        
       

     

       23
       23
       -
         propagatedBuildInputs = [ django ];

     

       26
       26
       +
         build-system = [ setuptools ];

     

       24
       27
        
       

     

       25
       25
       -
         pythonImportsCheck = [ "taggit" ];

     

       28
       28
       +
         buildInputs = [ django ];

     

       26
       29
        
       

     

       27
       30
        
         nativeCheckInputs = [ djangorestframework ];

     

       28
       31
        
       

     

       32
       32
       +
         pythonImportsCheck = [ "taggit" ];

     

       33
       33
       +
       

     

       29
       34
        
         checkPhase = ''

     

       30
       35
        
           # prove we're running tests against installed package, not build dir

     

       31
       36
        
           rm -r taggit

     

       32
       37
        
           # Replace directory of locale

     

       33
       33
       -
           substituteInPlace ./tests/test_utils.py \

     

       34
       34
       -
             --replace 'os.path.dirname(__file__), ".."' "\"$out/lib/python${lib.versions.majorMinor python.version}/site-packages/\""

     

       38
       38
       +
           substituteInPlace tests/test_utils.py \

     

       39
       39
       +
             --replace-fail 'os.path.dirname(__file__), ".."' "\"$out/lib/python${lib.versions.majorMinor python.version}/site-packages/\""

     

       35
       40
        
           ${python.interpreter} -m django test --settings=tests.settings

     

       36
       41
        
         '';

     

       37
       42

+2 -2

pkgs/development/python-modules/fedora-messaging/default.nix

···

       20
       20
        
       

     

       21
       21
        
       buildPythonPackage rec {

     

       22
       22
        
         pname = "fedora-messaging";

     

       23
       23
       -
         version = "3.6.0";

     

       23
       23
       +
         version = "3.7.0";

     

       24
       24
        
         pyproject = true;

     

       25
       25
        
       

     

       26
       26
        
         src = fetchFromGitHub {

     

       27
       27
        
           owner = "fedora-infra";

     

       28
       28
        
           repo = "fedora-messaging";

     

       29
       29
        
           tag = "v${version}";

     

       30
       30
       -
           hash = "sha256-t5jwEgKLSB8APie+TD3WpgPYcAAPzEQLA+jXGlWVuNU=";

     

       30
       30
       +
           hash = "sha256-MBvFrOUrcPhsFR9yD7yqRM4Yf2StcNvL3sqFIn6XbMc=";

     

       31
       31
        
         };

     

       32
       32
        
       

     

       33
       33
        
         build-system = [ poetry-core ];

+12 -7

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

···

       10
       10
        
       

     

       11
       11
        
       buildPythonPackage rec {

     

       12
       12
        
         pname = "fireflyalgorithm";

     

       13
       13
       -
         version = "0.4.5";

     

       13
       13
       +
         version = "0.4.6";

     

       14
       14
        
         pyproject = true;

     

       15
       15
        
       

     

       16
       16
        
         disabled = pythonOlder "3.9";

     
···

       19
       19
        
           owner = "firefly-cpp";

     

       20
       20
        
           repo = "FireflyAlgorithm";

     

       21
       21
        
           tag = version;

     

       22
       22
       -
           hash = "sha256-dJnjeJN9NI8G/haYeOiMtAl56cExqMk0iTWpaybl4nE=";

     

       22
       22
       +
           hash = "sha256-NMmwjKtIk8KR0YXXSXkJhiQsbjMusaLnstUWx0izCNA=";

     

       23
       23
        
         };

     

       24
       24
        
       

     

       25
       25
       -
         nativeBuildInputs = [ poetry-core ];

     

       25
       25
       +
         postPatch = ''

     

       26
       26
       +
           substituteInPlace pyproject.toml \

     

       27
       27
       +
             --replace-fail 'numpy = "^1.26.1"' ""

     

       28
       28
       +
         '';

     

       29
       29
       +
       

     

       30
       30
       +
         build-system = [ poetry-core ];

     

       26
       31
        
       

     

       27
       27
       -
         propagatedBuildInputs = [ numpy ];

     

       32
       32
       +
         dependencies = [ numpy ];

     

       28
       33
        
       

     

       29
       34
        
         nativeCheckInputs = [ pytestCheckHook ];

     

       30
       35
        
       

     

       31
       36
        
         pythonImportsCheck = [ "fireflyalgorithm" ];

     

       32
       37
        
       

     

       33
       33
       -
         meta = with lib; {

     

       38
       38
       +
         meta = {

     

       34
       39
        
           description = "Implementation of the stochastic nature-inspired algorithm for optimization";

     

       35
       40
        
           mainProgram = "firefly-algorithm";

     

       36
       41
        
           homepage = "https://github.com/firefly-cpp/FireflyAlgorithm";

     

       37
       42
        
           changelog = "https://github.com/firefly-cpp/FireflyAlgorithm/blob/${version}/CHANGELOG.md";

     

       38
       38
       -
           license = licenses.mit;

     

       39
       39
       -
           maintainers = with maintainers; [ firefly-cpp ];

     

       43
       43
       +
           license = lib.licenses.mit;

     

       44
       44
       +
           maintainers = with lib.maintainers; [ firefly-cpp ];

     

       40
       45
        
         };

     

       41
       46
        
       }

+11 -7

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

···

       1
       1
        
       {

     

       2
       2
        
         lib,

     

       3
       3
        
         buildPythonPackage,

     

       4
       4
       -
         isPy27,

     

       4
       4
       +
         pythonOlder,

     

       5
       5
        
         fetchPypi,

     

       6
       6
        
         setuptools-scm,

     

       7
       7
        
         six,

     

       8
       8
        
         dnspython,

     

       9
       9
       +
         legacy-cgi,

     

       9
       10
        
         pycountry,

     

       10
       11
        
         pytestCheckHook,

     

       11
       12
        
       }:

     
···

       13
       14
        
       buildPythonPackage rec {

     

       14
       15
        
         pname = "formencode";

     

       15
       16
        
         version = "2.1.0";

     

       16
       16
       -
         format = "setuptools";

     

       17
       17
       +
         pyproject = true;

     

       17
       18
        
       

     

       18
       18
       -
         disabled = isPy27;

     

       19
       19
       +
         disabled = pythonOlder "3.7";

     

       19
       20
        
       

     

       20
       21
        
         src = fetchPypi {

     

       21
       22
        
           pname = "FormEncode";

     
···

       27
       28
        
           sed -i '/setuptools_scm_git_archive/d' setup.py

     

       28
       29
        
         '';

     

       29
       30
        
       

     

       30
       30
       -
         nativeBuildInputs = [ setuptools-scm ];

     

       31
       31
       +
         build-system = [ setuptools-scm ];

     

       31
       32
        
       

     

       32
       32
       -
         propagatedBuildInputs = [ six ];

     

       33
       33
       +
         dependencies = [

     

       34
       34
       +
           six

     

       35
       35
       +
           legacy-cgi

     

       36
       36
       +
         ];

     

       33
       37
        
       

     

       34
       38
        
         nativeCheckInputs = [

     

       35
       39
        
           dnspython

     
···

       43
       47
        
           "test_unicode_ascii_subgroup"

     

       44
       48
        
         ];

     

       45
       49
        
       

     

       46
       46
       -
         meta = with lib; {

     

       50
       50
       +
         meta = {

     

       47
       51
        
           description = "FormEncode validates and converts nested structures";

     

       48
       52
        
           homepage = "http://formencode.org";

     

       49
       49
       -
           license = licenses.mit;

     

       53
       53
       +
           license = lib.licenses.mit;

     

       50
       54
        
           maintainers = [ ];

     

       51
       55
        
         };

     

       52
       56
        
       }

+2 -2

pkgs/development/python-modules/globus-sdk/default.nix

···

       15
       15
        
       

     

       16
       16
        
       buildPythonPackage rec {

     

       17
       17
        
         pname = "globus-sdk";

     

       18
       18
       -
         version = "3.49.0";

     

       18
       18
       +
         version = "3.50.0";

     

       19
       19
        
         pyproject = true;

     

       20
       20
        
       

     

       21
       21
        
         disabled = pythonOlder "3.7";

     
···

       24
       24
        
           owner = "globus";

     

       25
       25
        
           repo = "globus-sdk-python";

     

       26
       26
        
           tag = version;

     

       27
       27
       -
           hash = "sha256-gqY26EoVUgpNQ83Egmnb/mBnLcB6MmFNs4W7ZsZziK0=";

     

       27
       27
       +
           hash = "sha256-gjctcpaV9L8x4ubS4Ox6kyNG7/kl7tZt9c9/7SWVXkg=";

     

       28
       28
        
         };

     

       29
       29
        
       

     

       30
       30
        
         build-system = [ setuptools ];

+2 -2

pkgs/development/python-modules/gotenberg-client/default.nix

···

       9
       9
        
       }:

     

       10
       10
        
       buildPythonPackage rec {

     

       11
       11
        
         pname = "gotenberg-client";

     

       12
       12
       -
         version = "0.8.2";

     

       12
       12
       +
         version = "0.9.0";

     

       13
       13
        
         pyproject = true;

     

       14
       14
        
       

     

       15
       15
        
         disabled = pythonOlder "3.9";

     
···

       18
       18
        
           owner = "stumpylog";

     

       19
       19
        
           repo = "gotenberg-client";

     

       20
       20
        
           tag = version;

     

       21
       21
       -
           hash = "sha256-EMukzSY8nfm1L1metGhiEc9VqnI/vaLz7ITgbZi0fBw=";

     

       21
       21
       +
           hash = "sha256-4tIkwfqFKERVQMB9nGwGfdMtxCWm3q4hrSWnEqA0qd8=";

     

       22
       22
        
         };

     

       23
       23
        
       

     

       24
       24
        
         nativeBuildInputs = [ hatchling ];

+2 -2

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

···

       14
       14
        
       

     

       15
       15
        
       buildPythonPackage rec {

     

       16
       16
        
         pname = "griffe";

     

       17
       17
       -
         version = "1.5.4";

     

       17
       17
       +
         version = "1.5.5";

     

       18
       18
        
         pyproject = true;

     

       19
       19
        
       

     

       20
       20
        
         disabled = pythonOlder "3.8";

     
···

       23
       23
        
           owner = "mkdocstrings";

     

       24
       24
        
           repo = "griffe";

     

       25
       25
        
           tag = version;

     

       26
       26
       -
           hash = "sha256-F1/SjWy32d/CU86ZR/PK0QPiRMEbUNNeomZOBP/3K/k=";

     

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

     

       27
       27
        
         };

     

       28
       28
        
       

     

       29
       29
        
         build-system = [ pdm-backend ];

+3 -3

pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix

···

       14
       14
        
       

     

       15
       15
        
       buildPythonPackage rec {

     

       16
       16
        
         pname = "ibm-cloud-sdk-core";

     

       17
       17
       -
         version = "3.22.0";

     

       17
       17
       +
         version = "3.22.1";

     

       18
       18
        
         pyproject = true;

     

       19
       19
        
       

     

       20
       20
       -
         disabled = pythonOlder "3.8";

     

       20
       20
       +
         disabled = pythonOlder "3.9";

     

       21
       21
        
       

     

       22
       22
        
         src = fetchFromGitHub {

     

       23
       23
        
           owner = "IBM";

     

       24
       24
        
           repo = "python-sdk-core";

     

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

     

       26
       26
       -
           hash = "sha256-gNEd79kOtDlFJg3Ji9kO6VGGsy/VGxd6GzC/cuen9M0=";

     

       26
       26
       +
           hash = "sha256-wXffw+/esHvWxrNdlnYLTPflgOaRyIdf0hxI4M12Xdc=";

     

       27
       27
        
         };

     

       28
       28
        
       

     

       29
       29
        
         pythonRelaxDeps = [ "requests" ];

+8 -19

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

···

       2
       2
        
         lib,

     

       3
       3
        
         buildPythonPackage,

     

       4
       4
        
         fetchFromGitHub,

     

       5
       5
       -
         fetchpatch2,

     

       6
       5
        
         pythonOlder,

     

       7
       6
        
         pytestCheckHook,

     

       8
       7
        
         poetry-core,

     

       9
       9
       -
         httplib2,

     

       10
       8
        
         icalendar,

     

       9
       9
       +
         pook,

     

       11
       10
        
         python-dateutil,

     

       12
       11
        
         pytz,

     

       12
       12
       +
         urllib3,

     

       13
       13
        
       }:

     

       14
       14
        
       

     

       15
       15
        
       buildPythonPackage rec {

     

       16
       16
        
         pname = "icalevents";

     

       17
       17
       -
         version = "0.1.29";

     

       17
       17
       +
         version = "0.2.0";

     

       18
       18
        
         pyproject = true;

     

       19
       19
        
       

     

       20
       20
        
         disabled = pythonOlder "3.9";

     
···

       23
       23
        
           owner = "jazzband";

     

       24
       24
        
           repo = "icalevents";

     

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

     

       26
       26
       -
           hash = "sha256-Bp+Wz88q65Gem8LyRz0A4xE5hIgOD+iZ7E1UlnfFiD4=";

     

       26
       26
       +
           hash = "sha256-xIio+zJtIa0mM7aHFHm1QW36hww82h4A1YWaWUCxx14=";

     

       27
       27
        
         };

     

       28
       28
        
       

     

       29
       29
       -
         patches = [

     

       30
       30
       -
           (fetchpatch2 {

     

       31
       31
       -
             name = "icalendar-v6-compat.patch";

     

       32
       32
       -
             url = "https://github.com/jazzband/icalevents/commit/fa925430bd63e46b0941b84a1ae2c9a063f2f720.patch";

     

       33
       33
       -
             hash = "sha256-MeRC3iJ5raKvl9udzv/44Vs34LxSzq1S6VVKAVFSpiY=";

     

       34
       34
       -
           })

     

       35
       35
       -
         ];

     

       36
       36
       -
       

     

       37
       29
        
         build-system = [

     

       38
       30
        
           poetry-core

     

       39
       31
        
         ];

     

       40
       32
        
       

     

       41
       33
        
         dependencies = [

     

       42
       42
       -
           httplib2

     

       43
       34
        
           icalendar

     

       44
       35
        
           python-dateutil

     

       45
       36
        
           pytz

     

       37
       37
       +
           urllib3

     

       46
       38
        
         ];

     

       47
       39
        
       

     

       48
       48
       -
         pythonRelaxDeps = [

     

       49
       49
       -
           "httplib2"

     

       50
       50
       -
           "icalendar"

     

       51
       51
       -
           "pytz"

     

       40
       40
       +
         nativeCheckInputs = [

     

       41
       41
       +
           pook

     

       42
       42
       +
           pytestCheckHook

     

       52
       43
        
         ];

     

       53
       53
       -
       

     

       54
       54
       -
         nativeCheckInputs = [ pytestCheckHook ];

     

       55
       44
        
       

     

       56
       45
        
         disabledTests = [

     

       57
       46
        
           # Makes HTTP calls

+4 -5

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

···

       23
       23
        
       

     

       24
       24
        
       buildPythonPackage rec {

     

       25
       25
        
         pname = "libcst";

     

       26
       26
       -
         version = "1.5.1";

     

       26
       26
       +
         version = "1.6.0";

     

       27
       27
        
         pyproject = true;

     

       28
       28
        
       

     

       29
       29
        
         disabled = pythonOlder "3.9";

     
···

       32
       32
        
           owner = "Instagram";

     

       33
       33
        
           repo = "LibCST";

     

       34
       34
        
           tag = "v${version}";

     

       35
       35
       -
           hash = "sha256-fveY4ah94pv9ImI36MNrrxTpZv/DtLb45pXm67L8/GA=";

     

       35
       35
       +
           hash = "sha256-OuokZvdaCTgZI1VoXInqs6YNLsVUohaat5IjYYvUeVE=";

     

       36
       36
        
         };

     

       37
       37
        
       

     

       38
       38
        
         cargoDeps = rustPlatform.fetchCargoTarball {

     

       39
       39
       -
           inherit src;

     

       39
       39
       +
           inherit pname version src;

     

       40
       40
        
           sourceRoot = "${src.name}/${cargoRoot}";

     

       41
       41
       -
           name = "${pname}-${version}";

     

       42
       42
       -
           hash = "sha256-TcWGW1RF2se89BtvQHO+4BwnRMZ8ygqO3du9Q/gZi/Q=";

     

       41
       41
       +
           hash = "sha256-+sCBkCR2CxgG/NuWch8sZTCitKynZmF221mR16TbQKI=";

     

       43
       42
        
         };

     

       44
       43
        
       

     

       45
       44
        
         cargoRoot = "native";

+3 -3

pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix

···

       13
       13
        
       

     

       14
       14
        
       buildPythonPackage rec {

     

       15
       15
        
         pname = "marshmallow-sqlalchemy";

     

       16
       16
       -
         version = "1.1.0";

     

       16
       16
       +
         version = "1.3.0";

     

       17
       17
        
         pyproject = true;

     

       18
       18
        
       

     

       19
       19
       -
         disabled = pythonOlder "3.8";

     

       19
       19
       +
         disabled = pythonOlder "3.9";

     

       20
       20
        
       

     

       21
       21
        
         src = fetchPypi {

     

       22
       22
        
           pname = "marshmallow_sqlalchemy";

     

       23
       23
        
           inherit version;

     

       24
       24
       -
           hash = "sha256-KrCS2iadr6igXVGlhAmvcajSGDlYukcUMSfdI54DWdg=";

     

       24
       24
       +
           hash = "sha256-Xd9YPddf31qzHfdph82iupGUKZa6XVd+ktZ0j6k6X1I=";

     

       25
       25
        
         };

     

       26
       26
        
       

     

       27
       27
        
         build-system = [ flit-core ];

+109

pkgs/development/python-modules/mlxtend/0001-fix-test-replace-np.float_-to-np.float64.patch

···

       1
       1
       +
       From 360cb75317aecaf6b9abcf24f0577afef75c464e Mon Sep 17 00:00:00 2001

     

       2
       2
       +
       From: wxt <3264117476@qq.com>

     

       3
       3
       +
       Date: Mon, 6 Jan 2025 20:41:27 +0800

     

       4
       4
       +
       Subject: [PATCH] fix(test): replace np.float_ to np.float64

     

       5
       5
       +
       

     

       6
       6
       +
       ---

     

       7
       7
       +
        mlxtend/_base/_regressor.py                     | 2 +-

     

       8
       8
       +
        mlxtend/_base/tests/test_classifier.py          | 2 +-

     

       9
       9
       +
        mlxtend/_base/tests/test_cluster.py             | 2 +-

     

       10
       10
       +
        mlxtend/classifier/multilayerperceptron.py      | 2 +-

     

       11
       11
       +
        mlxtend/classifier/softmax_regression.py        | 2 +-

     

       12
       12
       +
        mlxtend/math/linalg.py                          | 2 +-

     

       13
       13
       +
        mlxtend/plotting/tests/test_decision_regions.py | 2 +-

     

       14
       14
       +
        7 files changed, 7 insertions(+), 7 deletions(-)

     

       15
       15
       +
       

     

       16
       16
       +
       diff --git a/mlxtend/_base/_regressor.py b/mlxtend/_base/_regressor.py

     

       17
       17
       +
       index e3d0a1d..1d3a5d6 100644

     

       18
       18
       +
       --- a/mlxtend/_base/_regressor.py

     

       19
       19
       +
       +++ b/mlxtend/_base/_regressor.py

     

       20
       20
       +
       @@ -16,7 +16,7 @@ class _Regressor(object):

     

       21
       21
       +
                pass

     

       22
       22
       +
        

     

       23
       23
       +
            def _check_target_array(self, y, allowed=None):

     

       24
       24
       +
       -        if not isinstance(y[0], (float, np.float_)):

     

       25
       25
       +
       +        if not isinstance(y[0], (float, np.float64)):

     

       26
       26
       +
                    raise AttributeError("y must be a float array.\nFound %s" % y.dtype)

     

       27
       27
       +
        

     

       28
       28
       +
            def fit(self, X, y, init_params=True):

     

       29
       29
       +
       diff --git a/mlxtend/_base/tests/test_classifier.py b/mlxtend/_base/tests/test_classifier.py

     

       30
       30
       +
       index f77f74d..1bbac6d 100644

     

       31
       31
       +
       --- a/mlxtend/_base/tests/test_classifier.py

     

       32
       32
       +
       +++ b/mlxtend/_base/tests/test_classifier.py

     

       33
       33
       +
       @@ -51,7 +51,7 @@ def test_check_labels_not_ok_1():

     

       34
       34
       +
        

     

       35
       35
       +
        

     

       36
       36
       +
        def test_check_labels_integer_notok():

     

       37
       37
       +
       -    y = np.array([1.0, 2.0], dtype=np.float_)

     

       38
       38
       +
       +    y = np.array([1.0, 2.0], dtype=np.float64)

     

       39
       39
       +
            cl = BlankClassifier(print_progress=0, random_seed=1)

     

       40
       40
       +
            with pytest.raises(AttributeError) as excinfo:

     

       41
       41
       +
                cl._check_target_array(y)

     

       42
       42
       +
       diff --git a/mlxtend/_base/tests/test_cluster.py b/mlxtend/_base/tests/test_cluster.py

     

       43
       43
       +
       index 6da1a9d..54c2526 100644

     

       44
       44
       +
       --- a/mlxtend/_base/tests/test_cluster.py

     

       45
       45
       +
       +++ b/mlxtend/_base/tests/test_cluster.py

     

       46
       46
       +
       @@ -51,7 +51,7 @@ def test_check_labels_not_ok_1():

     

       47
       47
       +
        

     

       48
       48
       +
        

     

       49
       49
       +
        def test_check_labels_integer_notok():

     

       50
       50
       +
       -    y = np.array([1.0, 2.0], dtype=np.float_)

     

       51
       51
       +
       +    y = np.array([1.0, 2.0], dtype=np.float64)

     

       52
       52
       +
            cl = BlankClassifier(print_progress=0, random_seed=1)

     

       53
       53
       +
            with pytest.raises(AttributeError) as excinfo:

     

       54
       54
       +
                cl._check_target_array(y)

     

       55
       55
       +
       diff --git a/mlxtend/classifier/multilayerperceptron.py b/mlxtend/classifier/multilayerperceptron.py

     

       56
       56
       +
       index 770dab9..05416c3 100644

     

       57
       57
       +
       --- a/mlxtend/classifier/multilayerperceptron.py

     

       58
       58
       +
       +++ b/mlxtend/classifier/multilayerperceptron.py

     

       59
       59
       +
       @@ -143,7 +143,7 @@ class MultiLayerPerceptron(

     

       60
       60
       +
                        prev_grad_b_out = np.zeros(shape=self.b_["out"].shape)

     

       61
       61
       +
                        prev_grad_w_out = np.zeros(shape=self.w_["out"].shape)

     

       62
       62
       +
        

     

       63
       63
       +
       -        y_enc = self._one_hot(y=y, n_labels=self.n_classes, dtype=np.float_)

     

       64
       64
       +
       +        y_enc = self._one_hot(y=y, n_labels=self.n_classes, dtype=np.float64)

     

       65
       65
       +
        

     

       66
       66
       +
                self.init_time_ = time()

     

       67
       67
       +
        

     

       68
       68
       +
       diff --git a/mlxtend/classifier/softmax_regression.py b/mlxtend/classifier/softmax_regression.py

     

       69
       69
       +
       index 56444e5..173154e 100644

     

       70
       70
       +
       --- a/mlxtend/classifier/softmax_regression.py

     

       71
       71
       +
       +++ b/mlxtend/classifier/softmax_regression.py

     

       72
       72
       +
       @@ -141,7 +141,7 @@ class SoftmaxRegression(_BaseModel, _IterativeModel, _Classifier, _MultiClass):

     

       73
       73
       +
                    )

     

       74
       74
       +
                    self.cost_ = []

     

       75
       75
       +
        

     

       76
       76
       +
       -        y_enc = self._one_hot(y=y, n_labels=self.n_classes, dtype=np.float_)

     

       77
       77
       +
       +        y_enc = self._one_hot(y=y, n_labels=self.n_classes, dtype=np.float64)

     

       78
       78
       +
        

     

       79
       79
       +
                self.init_time_ = time()

     

       80
       80
       +
                rgen = np.random.RandomState(self.random_seed)

     

       81
       81
       +
       diff --git a/mlxtend/math/linalg.py b/mlxtend/math/linalg.py

     

       82
       82
       +
       index 02600f1..ece4c3c 100644

     

       83
       83
       +
       --- a/mlxtend/math/linalg.py

     

       84
       84
       +
       +++ b/mlxtend/math/linalg.py

     

       85
       85
       +
       @@ -45,7 +45,7 @@ def vectorspace_orthonormalization(ary, eps=1e-13):  # method='gram-schmidt',

     

       86
       86
       +
            #   2c) Normalize if linearly independent,

     

       87
       87
       +
            #       and set to zero otherwise

     

       88
       88
       +
        

     

       89
       89
       +
       -    arr = ary.astype(np.float_).copy()

     

       90
       90
       +
       +    arr = ary.astype(np.float64).copy()

     

       91
       91
       +
        

     

       92
       92
       +
            for i in range(arr.shape[1]):

     

       93
       93
       +
                for j in range(i):

     

       94
       94
       +
       diff --git a/mlxtend/plotting/tests/test_decision_regions.py b/mlxtend/plotting/tests/test_decision_regions.py

     

       95
       95
       +
       index fba2255..aad63ff 100644

     

       96
       96
       +
       --- a/mlxtend/plotting/tests/test_decision_regions.py

     

       97
       97
       +
       +++ b/mlxtend/plotting/tests/test_decision_regions.py

     

       98
       98
       +
       @@ -94,7 +94,7 @@ def test_y_int_ary():

     

       99
       99
       +
                "Try passing the array as y.astype(np.int_)",

     

       100
       100
       +
                plot_decision_regions,

     

       101
       101
       +
                X[:, :2],

     

       102
       102
       +
       -        y.astype(np.float_),

     

       103
       103
       +
       +        y.astype(np.float64),

     

       104
       104
       +
                sr,

     

       105
       105
       +
            )

     

       106
       106
       +
        

     

       107
       107
       +
       -- 

     

       108
       108
       +
       2.47.0

     

       109
       109
       +

+14 -1

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

···

       7
       7
        
         pytestCheckHook,

     

       8
       8
        
         scipy,

     

       9
       9
        
         numpy,

     

       10
       10
       +
         numpy_1,

     

       10
       11
        
         scikit-learn,

     

       11
       12
        
         pandas,

     

       12
       13
        
         matplotlib,

     
···

       22
       23
        
       

     

       23
       24
        
         src = fetchFromGitHub {

     

       24
       25
        
           owner = "rasbt";

     

       25
       25
       -
           repo = pname;

     

       26
       26
       +
           repo = "mlxtend";

     

       26
       27
        
           tag = "v${version}";

     

       27
       28
        
           hash = "sha256-c6I0dwu4y/Td2G6m2WP/52W4noQUmQMDvpzXA9RZauo=";

     

       28
       29
        
         };

     
···

       36
       37
        
           pandas

     

       37
       38
        
           matplotlib

     

       38
       39
        
           joblib

     

       40
       40
       +
         ];

     

       41
       41
       +
       

     

       42
       42
       +
         patches = [

     

       43
       43
       +
           # https://github.com/rasbt/mlxtend/pull/1119

     

       44
       44
       +
           ./0001-fix-test-replace-np.float_-to-np.float64.patch

     

       39
       45
        
         ];

     

       40
       46
        
       

     

       41
       47
        
         nativeCheckInputs = [ pytestCheckHook ];

     

       42
       48
        
       

     

       43
       49
        
         pytestFlagsArray = [ "-sv" ];

     

       50
       50
       +
       

     

       51
       51
       +
         disabledTests = [

     

       52
       52
       +
           # Type changed in numpy2 test should be updated

     

       53
       53
       +
           "test_invalid_labels_1"

     

       54
       54
       +
           "test_default"

     

       55
       55
       +
           "test_nullability"

     

       56
       56
       +
         ];

     

       44
       57
        
       

     

       45
       58
        
         disabledTestPaths = [

     

       46
       59
        
           "mlxtend/evaluate/f_test.py" # need clean

+8 -8

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

···

       390
       390
        
             "sha256-UkuWWk99OTXMMhYMuAby9rbJjlhYBI0WwA9clnz4U9A=";

     

       391
       391
        
       

     

       392
       392
        
         mypy-boto3-detective =

     

       393
       393
       -
           buildMypyBoto3Package "detective" "1.36.0"

     

       394
       394
       -
             "sha256-qumyLsWuOFuwiBK1XN558ag8LlEA5jfHofy5dKK+Gbw=";

     

       393
       393
       +
           buildMypyBoto3Package "detective" "1.36.2"

     

       394
       394
       +
             "sha256-91C7CVfMmGvvfm4GdnDuWzSXi1sDsL5qj8YLC17loiI=";

     

       395
       395
        
       

     

       396
       396
        
         mypy-boto3-devicefarm =

     

       397
       397
        
           buildMypyBoto3Package "devicefarm" "1.36.0"

     
···

       446
       446
        
             "sha256-YrzTW5fEsZPDu4p84jhY4avS/wM01XybrvGCOtF48cQ=";

     

       447
       447
        
       

     

       448
       448
        
         mypy-boto3-ec2 =

     

       449
       449
       -
           buildMypyBoto3Package "ec2" "1.36.0"

     

       450
       450
       -
             "sha256-/dFXF0dKEF0wPQoh04dY9X0x8JqaxgFLtOYJocBwshA=";

     

       449
       449
       +
           buildMypyBoto3Package "ec2" "1.36.2"

     

       450
       450
       +
             "sha256-IwQg73lI34QtCjedW3ctRC0tzNAOXvgJl2s09GV6Zg0=";

     

       451
       451
        
       

     

       452
       452
        
         mypy-boto3-ec2-instance-connect =

     

       453
       453
        
           buildMypyBoto3Package "ec2-instance-connect" "1.36.0"

     
···

       462
       462
        
             "sha256-ezh5me1scgEEH0I/19CSVDstsLkwYgdVhwPuVivbKWk=";

     

       463
       463
        
       

     

       464
       464
        
         mypy-boto3-ecs =

     

       465
       465
       -
           buildMypyBoto3Package "ecs" "1.36.0"

     

       466
       466
       -
             "sha256-uO/y0aDNH4aayyvRDFH/WedHTku0A8QRvrzCe34P6gY=";

     

       465
       465
       +
           buildMypyBoto3Package "ecs" "1.36.1"

     

       466
       466
       +
             "sha256-bpE0iwtVksX2ByM7DSV+Y81ev8Ml896Wc9FciZEmjdA=";

     

       467
       467
        
       

     

       468
       468
        
         mypy-boto3-efs =

     

       469
       469
        
           buildMypyBoto3Package "efs" "1.36.0"

     
···

       1174
       1174
        
             "sha256-oLFs4pHfXJbG5cenQi83ur7ZaMfPLYzqp4AvvAadg+k=";

     

       1175
       1175
        
       

     

       1176
       1176
        
         mypy-boto3-sagemaker =

     

       1177
       1177
       -
           buildMypyBoto3Package "sagemaker" "1.36.0"

     

       1178
       1178
       -
             "sha256-FogxXsF3rVx33QF9Mo6RJhjsbgrEVLR037Js+SIYczI=";

     

       1177
       1177
       +
           buildMypyBoto3Package "sagemaker" "1.36.2"

     

       1178
       1178
       +
             "sha256-M4H/GVm8hLISSyKR6VtpUzTBOtRiaIr5DY5ZkM9mhk4=";

     

       1179
       1179
        
       

     

       1180
       1180
        
         mypy-boto3-sagemaker-a2i-runtime =

     

       1181
       1181
        
           buildMypyBoto3Package "sagemaker-a2i-runtime" "1.36.0"

+2 -2

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

···

       16
       16
        
       

     

       17
       17
        
       buildPythonPackage rec {

     

       18
       18
        
         pname = "niaarm";

     

       19
       19
       -
         version = "0.3.12";

     

       19
       19
       +
         version = "0.3.13";

     

       20
       20
        
         format = "pyproject";

     

       21
       21
        
       

     

       22
       22
        
         disabled = pythonOlder "3.9";

     
···

       25
       25
        
           owner = "firefly-cpp";

     

       26
       26
        
           repo = "NiaARM";

     

       27
       27
        
           tag = version;

     

       28
       28
       -
           hash = "sha256-rYFfLtPJgIdSjRIzDIQeHwoQm9NrI6nM3/BF7wAMr1Y=";

     

       28
       28
       +
           hash = "sha256-nDgGX5KbthOBXX5jg99fGT28ZuBx0Hxb+aHak3Uvjoc=";

     

       29
       29
        
         };

     

       30
       30
        
       

     

       31
       31
        
         pythonRelaxDeps = [

+2 -2

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

···

       13
       13
        
       

     

       14
       14
        
       buildPythonPackage rec {

     

       15
       15
        
         pname = "nitransforms";

     

       16
       16
       -
         version = "24.1.0";

     

       16
       16
       +
         version = "24.1.1";

     

       17
       17
        
         pyproject = true;

     

       18
       18
        
       

     

       19
       19
        
         disabled = pythonOlder "3.8";

     

       20
       20
        
       

     

       21
       21
        
         src = fetchPypi {

     

       22
       22
        
           inherit pname version;

     

       23
       23
       -
           hash = "sha256-QOOc3A/oADnjOtxgLqArwXIikwNDApVY4yHAYt9ENRU=";

     

       23
       23
       +
           hash = "sha256-U2lWxYDuA+PpMEMgjanq/JILWTTH5+DEx9dZ/KCWNjM=";

     

       24
       24
        
         };

     

       25
       25
        
       

     

       26
       26
        
         build-system = [

+2 -2

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

···

       11
       11
        
       

     

       12
       12
        
       buildPythonPackage rec {

     

       13
       13
        
         pname = "publicsuffixlist";

     

       14
       14
       -
         version = "1.0.2.20250111";

     

       14
       14
       +
         version = "1.0.2.20250117";

     

       15
       15
        
         pyproject = true;

     

       16
       16
        
       

     

       17
       17
        
         disabled = pythonOlder "3.7";

     

       18
       18
        
       

     

       19
       19
        
         src = fetchPypi {

     

       20
       20
        
           inherit pname version;

     

       21
       21
       -
           hash = "sha256-ul/bjvMgjBzNVyWV4o11CzMD6LT55+baTzITVt8H7wc=";

     

       21
       21
       +
           hash = "sha256-7jkUrZDmx9umNrUlzzXDdJWsDtfHKg/u8dfDNtVgiCU=";

     

       22
       22
        
         };

     

       23
       23
        
       

     

       24
       24
        
         build-system = [ setuptools ];

+2 -2

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

···

       33
       33
        
       in

     

       34
       34
        
       buildPythonPackage rec {

     

       35
       35
        
         pname = "pwntools";

     

       36
       36
       -
         version = "4.13.1";

     

       36
       36
       +
         version = "4.14.0";

     

       37
       37
        
         pyproject = true;

     

       38
       38
        
       

     

       39
       39
        
         src = fetchPypi {

     

       40
       40
        
           inherit pname version;

     

       41
       41
       -
           hash = "sha256-szInJftQMdwwll44VQc2CNmr900qv5enLGfUSq3843w=";

     

       41
       41
       +
           hash = "sha256-g7MkfeCD3/r6w79A9NFFVzLxbiXOMQX9CbVawPDRLoM=";

     

       42
       42
        
         };

     

       43
       43
        
       

     

       44
       44
        
         postPatch = ''

+2 -2

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

···

       14
       14
        
       

     

       15
       15
        
       buildPythonPackage rec {

     

       16
       16
        
         pname = "pycaption";

     

       17
       17
       -
         version = "2.2.15";

     

       17
       17
       +
         version = "2.2.16";

     

       18
       18
        
       

     

       19
       19
        
         disabled = pythonOlder "3.8";

     

       20
       20
        
       

     
···

       24
       24
        
           owner = "pbs";

     

       25
       25
        
           repo = "pycaption";

     

       26
       26
        
           tag = version;

     

       27
       27
       -
           hash = "sha256-07Llsp2Cvvo9WueeTBJnAos3uynhYL0gT5U21EI9dHY=";

     

       27
       27
       +
           hash = "sha256-w617mOxvL1alj7jauH4TVsYO0wxMHIFjevdhb4+542s=";

     

       28
       28
        
         };

     

       29
       29
        
       

     

       30
       30
        
         build-system = [ setuptools ];

+2 -2

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

···

       13
       13
        
       

     

       14
       14
        
       buildPythonPackage rec {

     

       15
       15
        
         pname = "pycron";

     

       16
       16
       -
         version = "3.1.1";

     

       16
       16
       +
         version = "3.1.2";

     

       17
       17
        
         pyproject = true;

     

       18
       18
        
       

     

       19
       19
        
         src = fetchFromGitHub {

     

       20
       20
        
           owner = "kipe";

     

       21
       21
        
           repo = "pycron";

     

       22
       22
        
           tag = version;

     

       23
       23
       -
           hash = "sha256-t53u18lCk6tF4Hr/BrEM2gWG+QOFIEkjyEKNXIr3ibs=";

     

       23
       23
       +
           hash = "sha256-WnaQfS3VzF9fZHX9eNRjih/U7SgWeWVynLdwPZgF950=";

     

       24
       24
        
         };

     

       25
       25
        
       

     

       26
       26
        
         build-system = [ poetry-core ];

+2 -2

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

···

       18
       18
        
       

     

       19
       19
        
       buildPythonPackage rec {

     

       20
       20
        
         pname = "pyscard";

     

       21
       21
       -
         version = "2.2.0";

     

       21
       21
       +
         version = "2.2.1";

     

       22
       22
        
         pyproject = true;

     

       23
       23
        
       

     

       24
       24
        
         src = fetchFromGitHub {

     

       25
       25
        
           owner = "LudovicRousseau";

     

       26
       26
        
           repo = "pyscard";

     

       27
       27
        
           tag = version;

     

       28
       28
       -
           hash = "sha256-yZeP4Tcxnwb2My+XOsMtj+H8mNIf6JYf5tpOVUYjev0=";

     

       28
       28
       +
           hash = "sha256-RXCz6Npb/MrykHxtUsYlghCPeTwjDC6s9258iLA7OKs=";

     

       29
       29
        
         };

     

       30
       30
        
       

     

       31
       31
        
         build-system = [ setuptools ];

+2 -2

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

···

       20
       20
        
       

     

       21
       21
        
       buildPythonPackage rec {

     

       22
       22
        
         pname = "python-engineio";

     

       23
       23
       -
         version = "4.11.1";

     

       23
       23
       +
         version = "4.11.2";

     

       24
       24
        
         pyproject = true;

     

       25
       25
        
       

     

       26
       26
        
         disabled = pythonOlder "3.8";

     
···

       29
       29
        
           owner = "miguelgrinberg";

     

       30
       30
        
           repo = "python-engineio";

     

       31
       31
        
           tag = "v${version}";

     

       32
       32
       -
           hash = "sha256-6gSpnBXznpWDtGEdV6PDtQvRodAz4jqOY+zGT2+NUj0=";

     

       32
       32
       +
           hash = "sha256-3yCT9u3Bz5QPaDtPe1Ezio+O+wWjQ+4pLh55sYAfnNc=";

     

       33
       33
        
         };

     

       34
       34
        
       

     

       35
       35
        
         build-system = [ setuptools ];

+2 -2

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

···

       9
       9
        
       

     

       10
       10
        
       buildPythonPackage rec {

     

       11
       11
        
         pname = "python-gnupg";

     

       12
       12
       -
         version = "0.5.3";

     

       12
       12
       +
         version = "0.5.4";

     

       13
       13
        
       

     

       14
       14
        
         format = "pyproject";

     

       15
       15
        
       

     

       16
       16
        
         src = fetchPypi {

     

       17
       17
        
           inherit pname version;

     

       18
       18
       -
           hash = "sha256-KQ2N25zWPfls/pKEubJl8Z/W4UXlWC3Fj9cnHwJtCkc=";

     

       18
       18
       +
           hash = "sha256-8v21+ylhXHfCdD4cs9kxQ1Om6HsQw30jjZGuHG/q4IY=";

     

       19
       19
        
         };

     

       20
       20
        
       

     

       21
       21
        
         postPatch = ''

+4 -4

pkgs/development/python-modules/python-otbr-api/default.nix

···

       14
       14
        
       

     

       15
       15
        
       buildPythonPackage rec {

     

       16
       16
        
         pname = "python-otbr-api";

     

       17
       17
       -
         version = "2.6.0";

     

       17
       17
       +
         version = "2.7.0";

     

       18
       18
        
         pyproject = true;

     

       19
       19
        
       

     

       20
       20
        
         disabled = pythonOlder "3.9";

     
···

       23
       23
        
           owner = "home-assistant-libs";

     

       24
       24
        
           repo = "python-otbr-api";

     

       25
       25
        
           tag = version;

     

       26
       26
       -
           hash = "sha256-RMj4NdEbMIxh2PDzbhUWgmcdzRXY8RxcQNN/bbGOW5Q=";

     

       26
       26
       +
           hash = "sha256-irQ4QvpGIAYYKq0UqLuo7Nrnde905+GJFd4HkxsCDmQ=";

     

       27
       27
        
         };

     

       28
       28
        
       

     

       29
       29
       -
         nativeBuildInputs = [ setuptools ];

     

       29
       29
       +
         build-system = [ setuptools ];

     

       30
       30
        
       

     

       31
       31
       -
         propagatedBuildInputs = [

     

       31
       31
       +
         dependencies = [

     

       32
       32
        
           aiohttp

     

       33
       33
        
           bitstruct

     

       34
       34
        
           cryptography

+18 -21

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

···

       7
       7
        
         numpy,

     

       8
       8
        
         scikit-learn,

     

       9
       9
        
         scipy,

     

       10
       10
       +
         setuptools,

     

       10
       11
        
         tabulate,

     

       11
       12
        
         torch,

     

       12
       13
        
         tqdm,

     

       13
       14
        
         flaky,

     

       15
       15
       +
         llvmPackages,

     

       14
       16
        
         pandas,

     

       17
       17
       +
         pytest-cov-stub,

     

       15
       18
        
         pytestCheckHook,

     

       16
       19
        
         safetensors,

     

       17
       20
        
         pythonAtLeast,

     
···

       19
       22
        
       

     

       20
       23
        
       buildPythonPackage rec {

     

       21
       24
        
         pname = "skorch";

     

       22
       22
       -
         version = "1.0.0";

     

       23
       23
       -
         format = "setuptools";

     

       25
       25
       +
         version = "1.1.0";

     

       26
       26
       +
         pyproject = true;

     

       24
       27
        
       

     

       25
       28
        
         src = fetchPypi {

     

       26
       29
        
           inherit pname version;

     

       27
       27
       -
           hash = "sha256-JcplwaeYlGRAJXRNac1Ya/hgWoHE+NWjZhCU9eaSyRQ=";

     

       30
       30
       +
           hash = "sha256-AguMhI/MO4DNexe5azVEXOw7laTRBN0ecFW81qqh0rY=";

     

       28
       31
        
         };

     

       29
       32
        
       

     

       30
       30
       -
         disabled = pythonOlder "3.8";

     

       33
       33
       +
         # AttributeError: 'NoneType' object has no attribute 'span' with Python 3.13

     

       34
       34
       +
         # https://github.com/skorch-dev/skorch/issues/1080

     

       35
       35
       +
         disabled = pythonOlder "3.9" || pythonAtLeast "3.13";

     

       31
       36
        
       

     

       32
       32
       -
         propagatedBuildInputs = [

     

       37
       37
       +
         build-system = [ setuptools ];

     

       38
       38
       +
       

     

       39
       39
       +
         dependencies = [

     

       33
       40
        
           numpy

     

       34
       41
        
           scikit-learn

     

       35
       42
        
           scipy

     

       36
       43
        
           tabulate

     

       37
       37
       -
           torch

     

       44
       44
       +
           torch # implicit dependency

     

       38
       45
        
           tqdm

     

       39
       46
        
         ];

     

       40
       47
        
       

     

       41
       48
        
         nativeCheckInputs = [

     

       42
       49
        
           flaky

     

       43
       50
        
           pandas

     

       51
       51
       +
           pytest-cov-stub

     

       44
       52
        
           pytestCheckHook

     

       45
       53
        
           safetensors

     

       46
       54
        
         ];

     

       47
       55
        
       

     

       48
       48
       -
         # patch out pytest-cov dep/invocation

     

       49
       49
       -
         postPatch = ''

     

       50
       50
       -
           substituteInPlace setup.cfg  \

     

       51
       51
       -
             --replace "--cov=skorch" ""  \

     

       52
       52
       -
             --replace "--cov-report=term-missing" ""  \

     

       53
       53
       -
             --replace "--cov-config .coveragerc" ""

     

       54
       54
       -
         '';

     

       56
       56
       +
         checkInputs = lib.optionals stdenv.cc.isClang [ llvmPackages.openmp ];

     

       55
       57
        
       

     

       56
       58
        
         disabledTests =

     

       57
       59
        
           [

     
···

       63
       65
        
           ++ lib.optionals stdenv.hostPlatform.isDarwin [

     

       64
       66
        
             # there is a problem with the compiler selection

     

       65
       67
        
             "test_fit_and_predict_with_compile"

     

       66
       66
       -
           ]

     

       67
       67
       -
           ++ lib.optionals (pythonAtLeast "3.11") [

     

       68
       68
       -
             # Python 3.11+ not yet supported for torch.compile

     

       69
       69
       -
             # https://github.com/pytorch/pytorch/blob/v2.0.1/torch/_dynamo/eval_frame.py#L376-L377

     

       70
       70
       -
             "test_fit_and_predict_with_compile"

     

       71
       68
        
           ];

     

       72
       69
        
       

     

       73
       70
        
         disabledTestPaths =

     
···

       83
       80
        
       

     

       84
       81
        
         pythonImportsCheck = [ "skorch" ];

     

       85
       82
        
       

     

       86
       86
       -
         meta = with lib; {

     

       83
       83
       +
         meta = {

     

       87
       84
        
           description = "Scikit-learn compatible neural net library using Pytorch";

     

       88
       85
        
           homepage = "https://skorch.readthedocs.io";

     

       89
       86
        
           changelog = "https://github.com/skorch-dev/skorch/blob/master/CHANGES.md";

     

       90
       90
       -
           license = licenses.bsd3;

     

       91
       91
       -
           maintainers = with maintainers; [ bcdarwin ];

     

       87
       87
       +
           license = lib.licenses.bsd3;

     

       88
       88
       +
           maintainers = with lib.maintainers; [ bcdarwin ];

     

       92
       89
        
         };

     

       93
       90
        
       }

+2 -2

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

···

       28
       28
        
       

     

       29
       29
        
       buildPythonPackage rec {

     

       30
       30
        
         pname = "softlayer";

     

       31
       31
       -
         version = "6.2.5";

     

       31
       31
       +
         version = "6.2.6";

     

       32
       32
        
         pyproject = true;

     

       33
       33
        
       

     

       34
       34
        
         src = fetchFromGitHub {

     

       35
       35
        
           owner = "softlayer";

     

       36
       36
        
           repo = "softlayer-python";

     

       37
       37
        
           tag = "v${version}";

     

       38
       38
       -
           hash = "sha256-wDLMVonPUexoaZ60kRBILmr5l46yajzACozCp6uETGY=";

     

       38
       38
       +
           hash = "sha256-qBhnHFFlP4pqlN/SETXEqYyre/ap60wHe9eCfyiB+kA=";

     

       39
       39
        
         };

     

       40
       40
        
       

     

       41
       41
        
         build-system = [

+7 -5

pkgs/development/python-modules/sphinx-codeautolink/default.nix

···

       17
       17
        
       

     

       18
       18
        
       buildPythonPackage rec {

     

       19
       19
        
         pname = "sphinx-codeautolink";

     

       20
       20
       -
         version = "0.15.2";

     

       21
       21
       -
         format = "pyproject";

     

       20
       20
       +
         version = "0.16.2";

     

       21
       21
       +
         pyproject = true;

     

       22
       22
        
       

     

       23
       23
        
         outputs = [

     

       24
       24
        
           "out"

     
···

       29
       29
        
           owner = "felix-hilden";

     

       30
       30
        
           repo = "sphinx-codeautolink";

     

       31
       31
        
           tag = "v${version}";

     

       32
       32
       -
           hash = "sha256-h1lteF5a3ga1VlhXCz2biydli3sg3ktPbz0O5n0eeFI=";

     

       32
       32
       +
           hash = "sha256-pHo7uA7TXmNdSU8CFRO0heI5rYBw+JeQ2NijmirhhHk=";

     

       33
       33
        
         };

     

       34
       34
        
       

     

       35
       35
       +
         build-system = [ setuptools ];

     

       36
       36
       +
       

     

       35
       37
        
         nativeBuildInputs = [

     

       36
       36
       -
           setuptools

     

       37
       38
        
           sphinxHook

     

       38
       39
        
           sphinx-rtd-theme

     

       39
       40
        
           matplotlib

     
···

       42
       43
        
       

     

       43
       44
        
         sphinxRoot = "docs/src";

     

       44
       45
        
       

     

       45
       45
       -
         propagatedBuildInputs = [

     

       46
       46
       +
         dependencies = [

     

       46
       47
        
           sphinx

     

       47
       48
        
           beautifulsoup4

     

       48
       49
        
         ];

     
···

       54
       55
        
         meta = with lib; {

     

       55
       56
        
           description = "Sphinx extension that makes code examples clickable";

     

       56
       57
        
           homepage = "https://github.com/felix-hilden/sphinx-codeautolink";

     

       58
       58
       +
           changelog = "https://github.com/felix-hilden/sphinx-codeautolink/releases/tag/v${version}";

     

       57
       59
        
           license = licenses.mit;

     

       58
       60
        
           maintainers = with maintainers; [ kaction ];

     

       59
       61
        
         };

+2 -2

pkgs/development/python-modules/tencentcloud-sdk-python/default.nix

···

       10
       10
        
       

     

       11
       11
        
       buildPythonPackage rec {

     

       12
       12
        
         pname = "tencentcloud-sdk-python";

     

       13
       13
       -
         version = "3.0.1304";

     

       13
       13
       +
         version = "3.0.1305";

     

       14
       14
        
         pyproject = true;

     

       15
       15
        
       

     

       16
       16
        
         disabled = pythonOlder "3.9";

     
···

       19
       19
        
           owner = "TencentCloud";

     

       20
       20
        
           repo = "tencentcloud-sdk-python";

     

       21
       21
        
           tag = version;

     

       22
       22
       -
           hash = "sha256-51tRvvavAYGa6XTyB6bL9a7TOZsv6DvVrFgrma5aJq8=";

     

       22
       22
       +
           hash = "sha256-uvGhUwiG3AsKpJrm6vYuhzv7rn9Sq1564IXY4fCa8H8=";

     

       23
       23
        
         };

     

       24
       24
        
       

     

       25
       25
        
         build-system = [ setuptools ];

+3 -3

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

···

       11
       11
        
       

     

       12
       12
        
       buildPythonPackage rec {

     

       13
       13
        
         pname = "zenoh";

     

       14
       14
       -
         version = "1.1.0";

     

       14
       14
       +
         version = "1.1.1";

     

       15
       15
        
         pyproject = true;

     

       16
       16
        
       

     

       17
       17
        
         src = fetchFromGitHub {

     

       18
       18
        
           owner = "eclipse-zenoh";

     

       19
       19
        
           repo = "zenoh-python";

     

       20
       20
        
           rev = version;

     

       21
       21
       -
           hash = "sha256-DO5AZDS7XvExxATtbkFOLG66zQOZu4gE6VWOG7C3qGA=";

     

       21
       21
       +
           hash = "sha256-pLdAlQBq/d9fohkPgGV/bR7rOl4RreenbHXYdde8q/0=";

     

       22
       22
        
         };

     

       23
       23
        
       

     

       24
       24
        
         cargoDeps = rustPlatform.fetchCargoVendor {

     

       25
       25
        
           inherit src pname version;

     

       26
       26
       -
           hash = "sha256-GolnCEsqCGxjrKl2qXVRi9+d8hwXNsRVdfI7Cf60/jg=";

     

       26
       26
       +
           hash = "sha256-R6Vux4cNL9/Fxi7UvItZT8E539cz5cAupT9X0UkdwR4=";

     

       27
       27
        
         };

     

       28
       28
        
       

     

       29
       29
        
         build-system = [

+2 -2

pkgs/kde/third-party/karousel/default.nix

···

       10
       10
        
       

     

       11
       11
        
       stdenv.mkDerivation (finalAttrs: {

     

       12
       12
        
         pname = "karousel";

     

       13
       13
       -
         version = "0.10";

     

       13
       13
       +
         version = "0.11";

     

       14
       14
        
       

     

       15
       15
        
         src = fetchFromGitHub {

     

       16
       16
        
           owner = "peterfajdiga";

     

       17
       17
        
           repo = "karousel";

     

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

     

       19
       19
       -
           hash = "sha256-lI3VaCd4eYhWbnYLEIeFiB88SWjd/DF8CUGFmxEXDXo=";

     

       19
       19
       +
           hash = "sha256-KAbOOOF8rMA6lwgn0gUQleh5EF7ISIvvi3OubuM/50w=";

     

       20
       20
        
         };

     

       21
       21
        
       

     

       22
       22
        
         postPatch = ''

+13 -7

pkgs/servers/sql/postgresql/generic.nix

···

       244
       244
        
             # flags will remove unused sections from all shared libraries and binaries - including

     

       245
       245
        
             # those paths. This avoids a lot of circular dependency problems with different outputs,

     

       246
       246
        
             # and allows splitting them cleanly.

     

       247
       247
       -
             env.CFLAGS =

     

       248
       248
       -
               "-fdata-sections -ffunction-sections"

     

       249
       249
       -
               + (if stdenv'.cc.isClang then " -flto" else " -fmerge-constants -Wl,--gc-sections");

     

       247
       247
       +
             env = {

     

       248
       248
       +
               CFLAGS =

     

       249
       249
       +
                 "-fdata-sections -ffunction-sections"

     

       250
       250
       +
                 + (if stdenv'.cc.isClang then " -flto" else " -fmerge-constants -Wl,--gc-sections");

     

       251
       251
       +
             } // lib.optionalAttrs pythonSupport { PYTHON = "${python3}/bin/python"; };

     

       250
       252
        
       

     

       251
       253
        
             configureFlags =

     

       252
       254
        
               let

     
···

       375
       377
        
                   --replace-fail '-bundle_loader $(bindir)/postgres' "-bundle_loader $out/bin/postgres"

     

       376
       378
        
               '';

     

       377
       379
        
       

     

       378
       378
       -
             postFixup = lib.optionalString stdenv'.hostPlatform.isGnu ''

     

       379
       379
       -
               # initdb needs access to "locale" command from glibc.

     

       380
       380
       -
               wrapProgram $out/bin/initdb --prefix PATH ":" ${glibc.bin}/bin

     

       381
       381
       -
             '';

     

       380
       380
       +
             postFixup =

     

       381
       381
       +
               lib.optionalString stdenv'.hostPlatform.isGnu ''

     

       382
       382
       +
                 # initdb needs access to "locale" command from glibc.

     

       383
       383
       +
                 wrapProgram $out/bin/initdb --prefix PATH ":" ${glibc.bin}/bin

     

       384
       384
       +
               ''

     

       385
       385
       +
               + lib.optionalString pythonSupport ''

     

       386
       386
       +
                 wrapProgram "$out/bin/postgres" --set PYTHONPATH "${python3}/${python3.sitePackages}"

     

       387
       387
       +
               '';

     

       382
       388
        
       

     

       383
       389
        
             # Running tests as "install check" to work around SIP issue on macOS:

     

       384
       390
        
             # https://www.postgresql.org/message-id/flat/4D8E1BC5-BBCF-4B19-8226-359201EA8305%40gmail.com

+2 -2

pkgs/tools/misc/esphome/default.nix

···

       22
       22
        
       in

     

       23
       23
        
       python.pkgs.buildPythonApplication rec {

     

       24
       24
        
         pname = "esphome";

     

       25
       25
       -
         version = "2024.12.2";

     

       25
       25
       +
         version = "2024.12.4";

     

       26
       26
        
         pyproject = true;

     

       27
       27
        
       

     

       28
       28
        
         src = fetchFromGitHub {

     

       29
       29
        
           owner = pname;

     

       30
       30
        
           repo = pname;

     

       31
       31
        
           tag = version;

     

       32
       32
       -
           hash = "sha256-VW9p3VNVJOw5vkjCU4fujG0ie4N2D2QLidBANPV512U=";

     

       32
       32
       +
           hash = "sha256-Ff3NuLHKRLoBbjqb92vvDcSbSJnjCwm5FmSDwnEI0p4=";

     

       33
       33
        
         };

     

       34
       34
        
       

     

       35
       35
        
         build-systems = with python.pkgs; [

-1

pkgs/top-level/release-cuda.nix

···

       89
       89
        
             cholmod-extra = linux;

     

       90
       90
        
             colmap = linux;

     

       91
       91
        
             ctranslate2 = linux;

     

       92
       92
       -
             deepin.image-editor = linux;

     

       93
       92
        
             ffmpeg-full = linux;

     

       94
       93
        
             gimp = linux;

     

       95
       94
        
             gpu-screen-recorder = linux;