diff --git a/ci/eval/compare/utils.nix b/ci/eval/compare/utils.nix index 8d707fbedbdd..6e75b2a62790 100644 --- a/ci/eval/compare/utils.nix +++ b/ci/eval/compare/utils.nix @@ -212,13 +212,25 @@ rec { else if rebuildCount <= 500 then [ "101-500" ] else if rebuildCount <= 1000 then - [ "501-1000" ] + [ + "501-1000" + "501+" + ] else if rebuildCount <= 2500 then - [ "1001-2500" ] + [ + "1001-2500" + "501+" + ] else if rebuildCount <= 5000 then - [ "2501-5000" ] + [ + "2501-5000" + "501+" + ] else - [ "5001+" ]; + [ + "5001+" + "501+" + ]; in lib.forEach numbers (number: "10.rebuild-${kernel}: ${number}") ) rebuildCountByKernel diff --git a/doc/doc-support/package.nix b/doc/doc-support/package.nix index bc5566f3cbd3..f316656a585c 100644 --- a/doc/doc-support/package.nix +++ b/doc/doc-support/package.nix @@ -110,7 +110,7 @@ stdenvNoCC.mkDerivation ( shell = let devmode' = devmode.override { - buildArgs = "./."; + buildArgs = toString ../.; open = "/share/doc/nixpkgs/manual.html"; }; nixos-render-docs-redirects' = writeShellScriptBin "redirects" "${lib.getExe nixos-render-docs-redirects} --file ${toString ../redirects.json} $@"; diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index a26e5c1c7106..984e63fd1115 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2243,11 +2243,6 @@ github = "auchter"; githubId = 1190483; }; - aucub = { - name = "aucub"; - github = "aucub"; - githubId = 78630225; - }; augustebaum = { email = "auguste.apple@gmail.com"; github = "augustebaum"; @@ -6178,6 +6173,13 @@ githubId = 20759788; name = "JP Lippold"; }; + DrakeTDL = { + name = "Drake"; + email = "draketdl@mailbox.org"; + matrix = "@draketdl:matrix.org"; + github = "DrakeTDL"; + githubId = 22124013; + }; dramaturg = { email = "seb@ds.ag"; github = "dramaturg"; @@ -13187,6 +13189,12 @@ githubId = 74221543; name = "Moritz Goltdammer"; }; + linuxmobile = { + email = "bdiez19@gmail.com"; + github = "linuxmobile"; + githubId = 10554636; + name = "Braian A. Diez"; + }; lionello = { email = "lio@lunesu.com"; github = "lionello"; diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md index 0cde4be043a5..8e649bcc7561 100644 --- a/nixos/doc/manual/release-notes/rl-2505.section.md +++ b/nixos/doc/manual/release-notes/rl-2505.section.md @@ -118,6 +118,8 @@ - [Zipline](https://zipline.diced.sh/), a ShareX/file upload server that is easy to use, packed with features, and with an easy setup. Available as [services.zipline](#opt-services.zipline.enable). +- [Stash](https://github.com/stashapp/stash), An organizer for your adult videos/images, written in Go. Available as [services.stash](#opt-services.stash.enable). + - [Fider](https://fider.io/), an open platform to collect and prioritize feedback. Available as [services.fider](#opt-services.fider.enable). - [mqtt-exporter](https://github.com/kpetremann/mqtt-exporter/), a Prometheus exporter for exposing messages from MQTT. Available as [services.prometheus.exporters.mqtt](#opt-services.prometheus.exporters.mqtt.enable). @@ -175,6 +177,9 @@ to review the new defaults and description of [](#opt-services.nextcloud.poolSettings). +- The `services.locate` module does no longer support findutil's `locate` due to its inferior performance compared to `mlocate` and `plocate`. The new default is `plocate`. + As the `service.locate.localuser` option only applied when using findutil's `locate`, it has also been removed. + - `kmonad` is now hardened by default using common `systemd` settings. If KMonad is used to execute shell commands, hardening may make some of them fail. In that case, you can disable hardening using {option}`services.kmonad.keyboards..enableHardening` option. @@ -229,6 +234,8 @@ - `racket_7_9` has been removed, as it is insecure. It is recommended to use Racket 8 instead. +- `services.mongodb.initialRootPassword` has been replaced with the more secure option [`services.mongodb.initialRootPasswordFile`](#opt-services.mongodb.initialRootPasswordFile) + - `rofi` has been updated from 1.7.5 to 1.7.6 which introduces some breaking changes to binary plugins, and also contains a lot of new features and bug fixes. This is highlighted because the patch version bump does not indicate the volume of changes by itself. See the [upstream release notes](https://github.com/davatorium/rofi/releases/tag/1.7.6) for the full list of changes. - `ente-auth` now uses the name `enteauth` for its binary. The previous name was `ente_auth`. @@ -389,6 +396,8 @@ - GOverlay has been updated to 1.2, please check the [upstream changelog](https://github.com/benjamimgois/goverlay/releases) for more details. +- [`services.mongodb`](#opt-services.mongodb.enable) is now compatible with the `mongodb-ce` binary package. To make use of it, set [`services.mongodb.package`](#opt-services.mongodb.package) to `pkgs.mongodb-ce`. + - [`services.jupyter`](#opt-services.jupyter.enable) is now compatible with `Jupyter Notebook 7`. See [the migration guide](https://jupyter-notebook.readthedocs.io/en/latest/migrate_to_notebook7.html) for details. - `networking.wireguard` now has an optional networkd backend. It is enabled by default when `networking.useNetworkd` is enabled, and it can be enabled alongside scripted networking with `networking.wireguard.useNetworkd`. Some `networking.wireguard` options have slightly different behavior with the networkd and script-based backends, documented in each option. @@ -401,6 +410,8 @@ - `bind.cacheNetworks` now only controls access for recursive queries, where it previously controlled access for all queries. +- [`services.mongodb.enableAuth`](#opt-services.mongodb.enableAuth) now uses the newer [mongosh](https://github.com/mongodb-js/mongosh) shell instead of the legacy shell to configure the initial superuser. You can configure the mongosh package to use through the [`services.mongodb.mongoshPackage`](#opt-services.mongodb.mongoshPackage) option. + - The paperless module now has an option for regular automatic export of documents data using the integrated document exporter. diff --git a/nixos/doc/manual/shell.nix b/nixos/doc/manual/shell.nix index 4f6ab400f22c..6e9d253e4718 100644 --- a/nixos/doc/manual/shell.nix +++ b/nixos/doc/manual/shell.nix @@ -7,7 +7,7 @@ let common = import ./common.nix; inherit (common) outputPath indexPath; devmode = pkgs.devmode.override { - buildArgs = "../../release.nix -A manualHTML.${builtins.currentSystem}"; + buildArgs = ''${toString ../../release.nix} -A manualHTML.${builtins.currentSystem}''; open = "/${outputPath}/${indexPath}"; }; nixos-render-docs-redirects = pkgs.writeShellScriptBin "redirects" "${pkgs.lib.getExe pkgs.nixos-render-docs-redirects} --file ${toString ./redirects.json} $@"; diff --git a/nixos/modules/misc/locate.nix b/nixos/modules/misc/locate.nix index 5b57463bff6e..092852330437 100644 --- a/nixos/modules/misc/locate.nix +++ b/nixos/modules/misc/locate.nix @@ -9,14 +9,15 @@ let cfg = config.services.locate; isMLocate = lib.hasPrefix "mlocate" cfg.package.name; isPLocate = lib.hasPrefix "plocate" cfg.package.name; - isMorPLocate = isMLocate || isPLocate; - isFindutils = lib.hasPrefix "findutils" cfg.package.name; in { imports = [ (lib.mkRenamedOptionModule [ "services" "locate" "period" ] [ "services" "locate" "interval" ]) (lib.mkRenamedOptionModule [ "services" "locate" "locate" ] [ "services" "locate" "package" ]) (lib.mkRemovedOptionModule [ "services" "locate" "includeStore" ] "Use services.locate.prunePaths") + (lib.mkRemovedOptionModule [ "services" "locate" "localuser" ] + "The services.locate.localuser option has been removed because support for findutils locate has been removed." + ) ]; options.services.locate = { @@ -29,7 +30,7 @@ in ''; }; - package = lib.mkPackageOption pkgs [ "findutils" "locate" ] { + package = lib.mkPackageOption pkgs [ "plocate" ] { example = "mlocate"; }; @@ -65,15 +66,6 @@ in ''; }; - localuser = lib.mkOption { - type = lib.types.nullOr lib.types.str; - default = "nobody"; - description = '' - The user to search non-network directories as, using - {command}`su`. - ''; - }; - pruneFS = lib.mkOption { type = lib.types.listOf lib.types.str; default = [ @@ -180,7 +172,7 @@ in pruneNames = lib.mkOption { type = lib.types.listOf lib.types.str; - default = lib.optionals (!isFindutils) [ + default = [ ".bzr" ".cache" ".git" @@ -229,7 +221,7 @@ in source = "${cfg.package}/bin/plocate"; }; in - lib.mkIf isMorPLocate { + { locate = lib.mkMerge [ common mlocate @@ -253,59 +245,31 @@ in ''; systemPackages = [ cfg.package ]; - - variables = lib.mkIf isFindutils { - LOCATE_PATH = cfg.output; - }; }; - warnings = - lib.optional (isMorPLocate && cfg.localuser != null) - "mlocate and plocate do not support the services.locate.localuser option. updatedb will run as root. Silence this warning by setting services.locate.localuser = null." - ++ lib.optional ( - isFindutils && cfg.pruneNames != [ ] - ) "findutils locate does not support pruning by directory component" - ++ lib.optional ( - isFindutils && cfg.pruneBindMounts - ) "findutils locate does not support skipping bind mounts"; - systemd.services.update-locatedb = { description = "Update Locate Database"; - path = lib.mkIf (!isMorPLocate) [ pkgs.su ]; # mlocate's updatedb takes flags via a configuration file or # on the command line, but not by environment variable. script = - if isMorPLocate then - let - toFlags = - x: lib.optional (cfg.${x} != [ ]) "--${lib.toLower x} '${lib.concatStringsSep " " cfg.${x}}'"; - args = lib.concatLists ( - map toFlags [ - "pruneFS" - "pruneNames" - "prunePaths" - ] - ); - in - '' - exec ${cfg.package}/bin/updatedb \ - --output ${toString cfg.output} ${lib.concatStringsSep " " args} \ - --prune-bind-mounts ${if cfg.pruneBindMounts then "yes" else "no"} \ - ${lib.concatStringsSep " " cfg.extraFlags} - '' - else - '' - exec ${cfg.package}/bin/updatedb \ - ${lib.optionalString (cfg.localuser != null && !isMorPLocate) "--localuser=${cfg.localuser}"} \ - --output=${toString cfg.output} ${lib.concatStringsSep " " cfg.extraFlags} - ''; - environment = lib.optionalAttrs (!isMorPLocate) { - PRUNEFS = lib.concatStringsSep " " cfg.pruneFS; - PRUNEPATHS = lib.concatStringsSep " " cfg.prunePaths; - PRUNENAMES = lib.concatStringsSep " " cfg.pruneNames; - PRUNE_BIND_MOUNTS = if cfg.pruneBindMounts then "yes" else "no"; - }; + let + toFlags = + x: lib.optional (cfg.${x} != [ ]) "--${lib.toLower x} '${lib.concatStringsSep " " cfg.${x}}'"; + args = lib.concatLists ( + map toFlags [ + "pruneFS" + "pruneNames" + "prunePaths" + ] + ); + in + '' + exec ${cfg.package}/bin/updatedb \ + --output ${toString cfg.output} ${lib.concatStringsSep " " args} \ + --prune-bind-mounts ${if cfg.pruneBindMounts then "yes" else "no"} \ + ${lib.concatStringsSep " " cfg.extraFlags} + ''; serviceConfig = { CapabilityBoundingSet = "CAP_DAC_READ_SEARCH CAP_CHOWN"; Nice = 19; diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 4b8b3caecba6..26a2d23291bf 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -1577,6 +1577,7 @@ ./services/web-apps/snipe-it.nix ./services/web-apps/sogo.nix ./services/web-apps/stirling-pdf.nix + ./services/web-apps/stash.nix ./services/web-apps/trilium.nix ./services/web-apps/tt-rss.nix ./services/web-apps/vikunja.nix diff --git a/nixos/modules/programs/pay-respects.nix b/nixos/modules/programs/pay-respects.nix index fe4a2610903b..c44fec300851 100644 --- a/nixos/modules/programs/pay-respects.nix +++ b/nixos/modules/programs/pay-respects.nix @@ -8,11 +8,11 @@ let inherit (lib) getExe isBool + listToAttrs literalExpression maintainers mkEnableOption mkIf - mkMerge mkOption mkPackageOption optionalString @@ -169,16 +169,19 @@ in "url" "model" ]; - environment = mkMerge ( - [ - { - systemPackages = [ finalPackage ]; - } - ] - ++ map (rule: { - etc."xdg/pay-respects/rules/${rule.command}.toml".source = generate "${rule.command}.toml" rule; - }) cfg.runtimeRules - ); + + environment = { + etc = listToAttrs ( + map (rule: { + name = "xdg/pay-respects/rules/${rule.command}.toml"; + value = { + source = generate "${rule.command}.toml" rule; + }; + }) cfg.runtimeRules + ); + + systemPackages = [ finalPackage ]; + }; programs = { bash.interactiveShellInit = initScript "bash"; diff --git a/nixos/modules/services/databases/foundationdb.md b/nixos/modules/services/databases/foundationdb.md index 3cf17f1e6362..5e31497ae3cd 100644 --- a/nixos/modules/services/databases/foundationdb.md +++ b/nixos/modules/services/databases/foundationdb.md @@ -18,7 +18,7 @@ To enable FoundationDB, add the following to your ```nix { services.foundationdb.enable = true; - services.foundationdb.package = pkgs.foundationdb73; # FoundationDB 7.r3.x + services.foundationdb.package = pkgs.foundationdb73; # FoundationDB 7.3.x } ``` diff --git a/nixos/modules/services/databases/mongodb.nix b/nixos/modules/services/databases/mongodb.nix index 90b749574bf5..129b679d73f8 100644 --- a/nixos/modules/services/databases/mongodb.nix +++ b/nixos/modules/services/databases/mongodb.nix @@ -10,6 +10,8 @@ let mongodb = cfg.package; + mongoshExe = lib.getExe cfg.mongoshPackage; + mongoCnf = cfg: pkgs.writeText "mongodb.conf" '' @@ -25,6 +27,13 @@ let in { + imports = [ + (lib.mkRemovedOptionModule [ + "services" + "mongodb" + "initialRootPassword" + ] "Use services.mongodb.initialRootPasswordFile to securely provide the initial root password.") + ]; ###### interface @@ -34,7 +43,11 @@ in enable = lib.mkEnableOption "the MongoDB server"; - package = lib.mkPackageOption pkgs "mongodb" { }; + package = lib.mkPackageOption pkgs "mongodb" { + example = "pkgs.mongodb-ce"; + }; + + mongoshPackage = lib.mkPackageOption pkgs "mongosh" { }; user = lib.mkOption { type = lib.types.str; @@ -60,10 +73,10 @@ in description = "Enable client authentication. Creates a default superuser with username root!"; }; - initialRootPassword = lib.mkOption { - type = lib.types.nullOr lib.types.str; + initialRootPasswordFile = lib.mkOption { + type = lib.types.nullOr lib.types.path; default = null; - description = "Password for the root user if auth is enabled."; + description = "Path to the file containing the password for the root user if auth is enabled."; }; dbpath = lib.mkOption { @@ -112,8 +125,8 @@ in config = lib.mkIf config.services.mongodb.enable { assertions = [ { - assertion = !cfg.enableAuth || cfg.initialRootPassword != null; - message = "`enableAuth` requires `initialRootPassword` to be set."; + assertion = !cfg.enableAuth || cfg.initialRootPasswordFile != null; + message = "`enableAuth` requires `initialRootPasswordFile` to be set."; } ]; @@ -125,8 +138,6 @@ in }; users.groups.mongodb = lib.mkIf (cfg.user == "mongodb") { }; - environment.systemPackages = [ mongodb ]; - systemd.services.mongodb = { description = "MongoDB server"; @@ -164,14 +175,15 @@ in if ! test -e "${cfg.dbpath}/.auth_setup_complete"; then systemd-run --unit=mongodb-for-setup --uid=${cfg.user} ${mongodb}/bin/mongod --config ${mongoCnf cfg_} # wait for mongodb - while ! ${mongodb}/bin/mongo --eval "db.version()" > /dev/null 2>&1; do sleep 0.1; done + while ! ${mongoshExe} --eval "db.version()" > /dev/null 2>&1; do sleep 0.1; done - ${mongodb}/bin/mongo <) { id name } }` on localhost:9999/graphql + { + __typename = "SavedFilter"; + savedFilterId = 1; + } + # basic custom filter + { + __typename = "CustomFilter"; + title = "Random Scenes"; + mode = "SCENES"; + sortBy = "random"; + direction = "DESC"; + } + presets.recentlyAddedImages + ] + ''; + apply = type: if builtins.isFunction type then (type uiPresets) else type; + }; + blobs_path = mkOption { + type = types.path; + default = "${cfg.dataDir}/blobs"; + description = "Path to blobs"; + }; + cache = mkOption { + type = types.path; + default = "${cfg.dataDir}/cache"; + description = "Path to cache"; + }; + database = mkOption { + type = types.path; + default = "${cfg.dataDir}/go.sqlite"; + description = "Path to the SQLite database"; + }; + generated = mkOption { + type = types.path; + default = "${cfg.dataDir}/generated"; + description = "Path to generated files"; + }; + plugins_path = mkOption { + type = types.path; + default = "${cfg.dataDir}/plugins"; + description = "Path to scrapers"; + }; + scrapers_path = mkOption { + type = types.path; + default = "${cfg.dataDir}/scrapers"; + description = "Path to scrapers"; + }; + + blobs_storage = mkOption { + type = types.enum [ + "FILESYSTEM" + "DATABASE" + ]; + default = "FILESYSTEM"; + description = "Where to store blobs"; + }; + calculate_md5 = mkOption { + type = types.bool; + default = false; + description = "Whether to calculate MD5 checksums for scene video files"; + }; + create_image_clip_from_videos = mkOption { + type = types.bool; + default = false; + description = "Create Image Clips from Video extensions when Videos are disabled in Library"; + }; + dangerous_allow_public_without_auth = mkOption { + type = types.bool; + default = false; + description = "Learn more at https://docs.stashapp.cc/networking/authentication-required-when-accessing-stash-from-the-internet/"; + }; + gallery_cover_regex = mkOption { + type = types.str; + default = "(poster|cover|folder|board)\.[^\.]+$"; + description = "Regex used to identify images as gallery covers"; + }; + no_proxy = mkOption { + type = types.str; + default = "localhost,127.0.0.1,192.168.0.0/16,10.0.0.0/8,172.16.0.0/12"; + description = "A list of domains for which the proxy must not be used"; + }; + nobrowser = mkOption { + type = types.bool; + default = true; + description = "If we should not auto-open a browser window on startup"; + }; + notifications_enabled = mkOption { + type = types.bool; + default = true; + description = "If we should send notifications to the desktop"; + }; + parallel_tasks = mkOption { + type = types.int; + default = 1; + description = "Number of parallel tasks to start during scan/generate"; + }; + preview_audio = mkOption { + type = types.bool; + default = true; + description = "Include audio stream in previews"; + }; + preview_exclude_end = mkOption { + type = types.int; + default = 0; + description = "Duration of start of video to exclude when generating previews"; + }; + preview_exclude_start = mkOption { + type = types.int; + default = 0; + description = "Duration of end of video to exclude when generating previews"; + }; + preview_segment_duration = mkOption { + type = types.float; + default = 0.75; + description = "Preview segment duration, in seconds"; + }; + preview_segments = mkOption { + type = types.int; + default = 12; + description = "Number of segments in a preview file"; + }; + security_tripwire_accessed_from_public_internet = mkOption { + type = types.nullOr types.str; + default = ""; + description = "Learn more at https://docs.stashapp.cc/networking/authentication-required-when-accessing-stash-from-the-internet/"; + }; + sequential_scanning = mkOption { + type = types.bool; + default = false; + description = "Modifies behaviour of the scanning functionality to generate support files (previews/sprites/phash) at the same time as fingerprinting/screenshotting"; + }; + show_one_time_moved_notification = mkOption { + type = types.bool; + default = true; + description = "Whether a small notification to inform the user that Stash will no longer show a terminal window, and instead will be available in the tray"; + }; + sound_on_preview = mkOption { + type = types.bool; + default = false; + description = "Enable sound on mouseover previews"; + }; + theme_color = mkOption { + type = types.str; + default = "#202b33"; + description = "Sets the `theme-color` property in the UI"; + }; + video_file_naming_algorithm = mkOption { + type = types.enum [ + "OSHASH" + "MD5" + ]; + default = "OSHASH"; + description = "Hash algorithm to use for generated file naming"; + }; + write_image_thumbnails = mkOption { + type = types.bool; + default = true; + description = "Write image thumbnails to disk when generating on the fly"; + }; + }; + }; + + pluginType = + kind: + mkOption { + type = types.listOf types.package; + default = [ ]; + description = '' + The ${kind} Stash should be started with. + ''; + apply = + srcs: + optionalString (srcs != [ ]) ( + pkgs.runCommand "stash-${kind}" + { + inherit srcs; + nativeBuildInputs = [ pkgs.yq-go ]; + preferLocalBuild = true; + } + '' + find $srcs -mindepth 1 -name '*.yml' | while read plugin_file; do + grep -q "^#pkgignore" "$plugin_file" && continue + + plugin_dir=$(dirname $plugin_file) + out_path=$out/$(basename $plugin_dir) + mkdir -p $out_path + ls $plugin_dir | xargs -I{} ln -sf "$plugin_dir/{}" $out_path + + env \ + plugin_id=$(basename $plugin_file .yml) \ + plugin_name="$(yq '.name' $plugin_file)" \ + plugin_description="$(yq '.description' $plugin_file)" \ + plugin_version="$(yq '.version' $plugin_file)" \ + plugin_files="$(find -L $out_path -mindepth 1 -type f -printf "%P\n")" \ + yq -n ' + .id = strenv(plugin_id) | + .name = strenv(plugin_name) | + ( + strenv(plugin_description) as $desc | + with(select($desc == "null"); .metadata = {}) | + with(select($desc != "null"); .metadata.description = $desc) + ) | + ( + strenv(plugin_version) as $ver | + with(select($ver == "null"); .version = "Unknown") | + with(select($ver != "null"); .version = $ver) + ) | + .date = (now | format_datetime("2006-01-02 15:04:05")) | + .files = (strenv(plugin_files) | split("\n")) + ' > $out_path/manifest + done + '' + ); + }; +in +{ + meta = { + buildDocsInSandbox = false; + maintainers = with lib.maintainers; [ DrakeTDL ]; + }; + + options = { + services.stash = { + enable = mkEnableOption "stash"; + + package = mkPackageOption pkgs "stash" { }; + + user = mkOption { + type = types.str; + default = "stash"; + description = "User under which Stash runs."; + }; + + group = mkOption { + type = types.str; + default = "stash"; + description = "Group under which Stash runs."; + }; + + dataDir = mkOption { + type = types.path; + default = "/var/lib/stash"; + description = "The directory where Stash stores its files."; + }; + + openFirewall = mkOption { + type = types.bool; + default = false; + description = "Open ports in the firewall for the Stash web interface."; + }; + + username = mkOption { + type = types.nullOr types.nonEmptyStr; + default = null; + example = "admin"; + description = '' + Username for login. + + ::: {.warning} + This option takes precedence over {option}`services.stash.settings.username` + :: + + ''; + }; + + passwordFile = mkOption { + type = types.nullOr types.path; + default = null; + example = "/path/to/password/file"; + description = '' + Path to file containing password for login. + + ::: {.warning} + This option takes precedence over {option}`services.stash.settings.password` + :: + + ''; + }; + + jwtSecretKeyFile = mkOption { + type = types.path; + description = "Path to file containing a secret used to sign JWT tokens."; + }; + sessionStoreKeyFile = mkOption { + type = types.path; + description = "Path to file containing a secret for session store."; + }; + + mutableSettings = mkOption { + description = '' + Whether the Stash config.yml is writeable by Stash. + + If `false`, Any config changes done from within Stash UI will be temporary and reset to those defined in {option}`services.stash.settings` upon `Stash.service` restart. + If `true`, the {option}`services.stash.settings` will only be used to initialize the Stash configuration if it does not exist, and are subsequently ignored. + ''; + type = types.bool; + default = true; + }; + mutablePlugins = mkEnableOption "Whether plugins/themes can be installed, updated, uninstalled manually."; + mutableScrapers = mkEnableOption "Whether scrapers can be installed, updated, uninstalled manually."; + plugins = pluginType "plugins"; + scrapers = pluginType "scrapers"; + + settings = mkOption { + type = settingsType; + description = "Stash configuration"; + }; + }; + }; + + config = mkIf cfg.enable { + assertions = [ + { + assertion = + !lib.xor (cfg.username != null || cfg.settings.username or null != null) ( + cfg.passwordFile != null || cfg.settings.password or null != null + ); + message = "You must set either both username and password, or neither."; + } + ]; + + services.stash.settings = { + username = mkIf (cfg.username != null) cfg.username; + plugins_path = mkIf (!cfg.mutablePlugins) cfg.plugins; + scrapers_path = mkIf (!cfg.mutableScrapers) cfg.scrapers; + }; + + networking.firewall.allowedTCPPorts = mkIf cfg.openFirewall [ cfg.settings.port ]; + + users.users.${cfg.user} = { + inherit (cfg) group; + isSystemUser = true; + home = cfg.dataDir; + }; + users.groups.${cfg.group} = { }; + + systemd = { + tmpfiles.settings."10-stash-datadir".${cfg.dataDir}."d" = { + inherit (cfg) user group; + mode = "0755"; + }; + services.stash = { + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + path = with pkgs; [ + ffmpeg-full + python3 + ruby + ]; + environment.STASH_CONFIG_FILE = "${cfg.dataDir}/config.yml"; + serviceConfig = { + DynamicUser = false; + User = cfg.user; + Group = cfg.group; + Restart = "on-failure"; + WorkingDirectory = cfg.dataDir; + StateDirectory = mkIf (cfg.dataDir == "/var/lib/stash") (baseNameOf cfg.dataDir); + ExecStartPre = pkgs.writers.writeBash "stash-setup.bash" ( + '' + install -d ${cfg.settings.generated} + if [[ ! -z "${toString cfg.mutableSettings}" || ! -f ${cfg.dataDir}/config.yml ]]; then + env \ + password=$(< ${cfg.passwordFile}) \ + jwtSecretKeyFile=$(< ${cfg.jwtSecretKeyFile}) \ + sessionStoreKeyFile=$(< ${cfg.sessionStoreKeyFile}) \ + ${lib.getExe pkgs.yq-go} ' + .jwt_secret_key = strenv(jwtSecretKeyFile) | + .session_store_key = strenv(sessionStoreKeyFile) | + ( + strenv(password) as $password | + with(select($password != ""); .password = $password) + ) + ' ${settingsFile} > ${cfg.dataDir}/config.yml + fi + '' + + optionalString cfg.mutablePlugins '' + install -d ${cfg.settings.plugins_path} + ls ${cfg.plugins} | xargs -I{} ln -sf '${cfg.plugins}/{}' ${cfg.settings.plugins_path} + '' + + optionalString cfg.mutableScrapers '' + install -d ${cfg.settings.scrapers_path} + ls ${cfg.scrapers} | xargs -I{} ln -sf '${cfg.scrapers}/{}' ${cfg.settings.scrapers_path} + '' + ); + ExecStart = getExe cfg.package; + + ProtectHome = "tmpfs"; + BindReadOnlyPaths = mkIf (cfg.settings != { }) (map (stash: "${stash.path}") cfg.settings.stash); + + # hardening + + DevicePolicy = "auto"; # needed for hardware acceleration + PrivateDevices = false; # needed for hardware acceleration + AmbientCapabilities = [ "" ]; + CapabilityBoundingSet = [ "" ]; + ProtectSystem = "full"; + LockPersonality = true; + NoNewPrivileges = true; + PrivateTmp = true; + PrivateUsers = true; + ProtectClock = true; + ProtectControlGroups = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProcSubset = "pid"; + ProtectProc = "invisible"; + RemoveIPC = true; + RestrictAddressFamilies = [ + "AF_UNIX" + "AF_INET" + "AF_INET6" + ]; + RestrictNamespaces = true; + RestrictRealtime = true; + RestrictSUIDSGID = true; + MemoryDenyWriteExecute = true; + SystemCallArchitectures = "native"; + SystemCallFilter = [ + "~@cpu-emulation" + "~@debug" + "~@mount" + "~@obsolete" + "~@privileged" + ]; + }; + }; + }; + }; +} diff --git a/nixos/modules/virtualisation/incus.nix b/nixos/modules/virtualisation/incus.nix index 1a29e6ee104e..065cd1213b9a 100644 --- a/nixos/modules/virtualisation/incus.nix +++ b/nixos/modules/virtualisation/incus.nix @@ -38,6 +38,7 @@ let libnvidia-container libxfs lvm2 + lxcfs minio minio-client nftables @@ -121,6 +122,7 @@ let environment = lib.mkMerge [ { INCUS_EDK2_PATH = ovmf; + INCUS_LXC_HOOK = "${cfg.lxcPackage}/share/lxc/hooks"; INCUS_LXC_TEMPLATE_CONFIG = "${pkgs.lxcfs}/share/lxc/config"; INCUS_USBIDS_PATH = "${pkgs.hwdata}/share/hwdata/usb.ids"; PATH = lib.mkForce serverBinPath; @@ -401,6 +403,7 @@ in "incus.socket" ]; requires = [ "incus.socket" ]; + wantedBy = config.systemd.services.incus.wantedBy; serviceConfig = { ExecStart = "${incus-startup} start"; diff --git a/nixos/modules/virtualisation/libvirtd.nix b/nixos/modules/virtualisation/libvirtd.nix index 03691d12e63a..05c916751303 100644 --- a/nixos/modules/virtualisation/libvirtd.nix +++ b/nixos/modules/virtualisation/libvirtd.nix @@ -515,6 +515,8 @@ in systemd.services.libvirt-guests = { wantedBy = [ "multi-user.target" ]; + requires = [ "libvirtd.service" ]; + after = [ "libvirtd.service" ]; path = with pkgs; [ coreutils gawk cfg.package ]; restartIfChanged = false; diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index dd117cca93b8..93115adf7efe 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -622,7 +622,11 @@ in { monado = handleTest ./monado.nix {}; monetdb = handleTest ./monetdb.nix {}; monica = handleTest ./web-apps/monica.nix {}; - mongodb = handleTest ./mongodb.nix {}; + mongodb = runTest ./mongodb.nix; + mongodb-ce = runTest ({ config, ... }: { + imports = [ ./mongodb.nix ]; + defaults.services.mongodb.package = config.node.pkgs.mongodb-ce; + }); moodle = handleTest ./moodle.nix {}; moonraker = handleTest ./moonraker.nix {}; mopidy = handleTest ./mopidy.nix {}; @@ -978,6 +982,7 @@ in { stalwart-mail = handleTest ./stalwart-mail.nix {}; stargazer = runTest ./web-servers/stargazer.nix; starship = handleTest ./starship.nix {}; + stash = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./stash.nix {}; static-web-server = handleTest ./web-servers/static-web-server.nix {}; step-ca = handleTestOn ["x86_64-linux"] ./step-ca.nix {}; stratis = handleTest ./stratis {}; diff --git a/nixos/tests/incus/incus-tests.nix b/nixos/tests/incus/incus-tests.nix index ee20139c21d8..1b9b590863e3 100644 --- a/nixos/tests/incus/incus-tests.nix +++ b/nixos/tests/incus/incus-tests.nix @@ -190,7 +190,7 @@ import ../make-test-python.nix ( def cleanup(): # avoid conflict between preseed and cleanup operations - machine.wait_for_unit("incus-preseed.service") + machine.execute("systemctl kill incus-preseed.service") instances = json.loads(machine.succeed("incus list --format json --all-projects")) with subtest("Stopping all running instances"): @@ -228,39 +228,41 @@ import ../make-test-python.nix ( alias = "nixos/container/${variant}" variant = "${variant}" - with subtest("Container image can be imported"): + with subtest("container image can be imported"): machine.succeed(f"incus image import {metadata} {rootfs} --alias {alias}") - with subtest("Container can be launched and managed"): + with subtest("container can be launched and managed"): machine.succeed(f"incus launch {alias} container-{variant}1") wait_for_instance(f"container-{variant}1") - with subtest("Container mounts lxcfs overlays"): + with subtest("container mounts lxcfs overlays"): machine.succeed(f"incus exec container-{variant}1 mount | grep 'lxcfs on /proc/cpuinfo type fuse.lxcfs'") machine.succeed(f"incus exec container-{variant}1 mount | grep 'lxcfs on /proc/meminfo type fuse.lxcfs'") - with subtest("resource limits"): - with subtest("Container CPU limits can be managed"): - set_config(f"container-{variant}1", "limits.cpu 1", restart=True) - wait_incus_exec_success(f"container-{variant}1", "nproc | grep '^1$'", timeout=15) - - with subtest("Container CPU limits can be hotplug changed"): - set_config(f"container-{variant}1", "limits.cpu 2") - wait_incus_exec_success(f"container-{variant}1", "nproc | grep '^2$'", timeout=15) - - with subtest("Container memory limits can be managed"): - set_config(f"container-{variant}1", "limits.memory 128MB", restart=True) - wait_incus_exec_success(f"container-{variant}1", "grep 'MemTotal:[[:space:]]*125000 kB' /proc/meminfo", timeout=15) - - with subtest("Container memory limits can be hotplug changed"): - set_config(f"container-{variant}1", "limits.memory 256MB") - wait_incus_exec_success(f"container-{variant}1", "grep 'MemTotal:[[:space:]]*250000 kB' /proc/meminfo", timeout=15) + with subtest("container CPU limits can be managed"): + set_config(f"container-{variant}1", "limits.cpu 1", restart=True) + wait_incus_exec_success(f"container-{variant}1", "nproc | grep '^1$'", timeout=90) - with subtest("virtual tpm can be configured"): + with subtest("container CPU limits can be hotplug changed"): + set_config(f"container-{variant}1", "limits.cpu 2") + wait_incus_exec_success(f"container-{variant}1", "nproc | grep '^2$'", timeout=90) + + + with subtest("container memory limits can be managed"): + set_config(f"container-{variant}1", "limits.memory 128MB", restart=True) + wait_incus_exec_success(f"container-{variant}1", "grep 'MemTotal:[[:space:]]*125000 kB' /proc/meminfo", timeout=90) + + + with subtest("container memory limits can be hotplug changed"): + set_config(f"container-{variant}1", "limits.memory 256MB") + wait_incus_exec_success(f"container-{variant}1", "grep 'MemTotal:[[:space:]]*250000 kB' /proc/meminfo", timeout=90) + + + with subtest("container software tpm can be configured"): machine.succeed(f"incus config device add container-{variant}1 vtpm tpm path=/dev/tpm0 pathrm=/dev/tpmrm0") machine.succeed(f"incus exec container-{variant}1 -- test -e /dev/tpm0") machine.succeed(f"incus exec container-{variant}1 -- test -e /dev/tpmrm0") @@ -268,7 +270,7 @@ import ../make-test-python.nix ( machine.fail(f"incus exec container-{variant}1 -- test -e /dev/tpm0") - with subtest("lxc-generator"): + with subtest("container lxc-generator compatibility"): with subtest("lxc-container generator configures plain container"): # default container is plain machine.succeed(f"incus exec container-{variant}1 test -- -e /run/systemd/system/service.d/zzz-lxc-service.conf") @@ -293,14 +295,36 @@ import ../make-test-python.nix ( check_sysctl(f"container-{variant}2") + with subtest("container supports per-instance lxcfs"): + machine.succeed(f"incus stop container-{variant}1") + machine.fail(f"pgrep -a lxcfs | grep 'incus/devices/container-{variant}1/lxcfs'") - with subtest("Instance remains running when softDaemonRestart is enabled and service is stopped"): + machine.succeed("incus config set instances.lxcfs.per_instance=true") + + machine.succeed(f"incus start container-{variant}1") + wait_for_instance(f"container-{variant}1") + machine.succeed(f"pgrep -a lxcfs | grep 'incus/devices/container-{variant}1/lxcfs'") + + + with subtest("container can successfully restart"): + machine.succeed(f"incus restart container-{variant}1") + wait_for_instance(f"container-{variant}1") + + + with subtest("container remains running when softDaemonRestart is enabled and service is stopped"): pid = machine.succeed(f"incus info container-{variant}1 | grep 'PID'").split(":")[1].strip() machine.succeed(f"ps {pid}") machine.succeed("systemctl stop incus") machine.succeed(f"ps {pid}") machine.succeed("systemctl start incus") + with subtest("containers stop with incus-startup.service"): + pid = machine.succeed(f"incus info container-{variant}1 | grep 'PID'").split(":")[1].strip() + machine.succeed(f"ps {pid}") + machine.succeed("systemctl stop incus-startup.service") + machine.wait_until_fails(f"ps {pid}", timeout=120) + machine.succeed("systemctl start incus-startup.service") + cleanup() '' @@ -325,7 +349,7 @@ import ../make-test-python.nix ( machine.succeed(f"incus create {alias} vm-{variant}1 --vm --config limits.memory=512MB --config security.secureboot=false") - with subtest("virtual tpm can be configured"): + with subtest("virtual-machine software tpm can be configured"): machine.succeed(f"incus config device add vm-{variant}1 vtpm tpm path=/dev/tpm0") @@ -334,25 +358,30 @@ import ../make-test-python.nix ( wait_for_instance(f"vm-{variant}1") - with subtest("incus-agent is started"): + with subtest("virtual-machine incus-agent is started"): machine.succeed(f"incus exec vm-{variant}1 systemctl is-active incus-agent") - with subtest("incus-agent has a valid path"): + with subtest("virtual-machine incus-agent has a valid path"): machine.succeed(f"incus exec vm-{variant}1 -- bash -c 'true'") - with subtest("Container CPU limits can be managed"): + with subtest("virtual-machine CPU limits can be managed"): set_config(f"vm-{variant}1", "limits.cpu 1", restart=True) wait_incus_exec_success(f"vm-{variant}1", "nproc | grep '^1$'", timeout=90) - with subtest("Container CPU limits can be hotplug changed"): + with subtest("virtual-machine CPU limits can be hotplug changed"): set_config(f"vm-{variant}1", "limits.cpu 2") - wait_incus_exec_success(f"vm-{variant}1", "nproc | grep '^2$'", timeout=15) + wait_incus_exec_success(f"vm-{variant}1", "nproc | grep '^2$'", timeout=90) - with subtest("Instance remains running when softDaemonRestart is enabled and service is stopped"): + with subtest("virtual-machine can successfully restart"): + machine.succeed(f"incus restart vm-{variant}1") + wait_for_instance(f"vm-{variant}1") + + + with subtest("virtual-machine remains running when softDaemonRestart is enabled and service is stopped"): pid = machine.succeed(f"incus info vm-{variant}1 | grep 'PID'").split(":")[1].strip() machine.succeed(f"ps {pid}") machine.succeed("systemctl stop incus") @@ -360,13 +389,21 @@ import ../make-test-python.nix ( machine.succeed("systemctl start incus") + with subtest("virtual-machines stop with incus-startup.service"): + pid = machine.succeed(f"incus info vm-{variant}1 | grep 'PID'").split(":")[1].strip() + machine.succeed(f"ps {pid}") + machine.succeed("systemctl stop incus-startup.service") + machine.wait_until_fails(f"ps {pid}", timeout=120) + machine.succeed("systemctl start incus-startup.service") + + cleanup() '' ) "" initVariants) + # python '' - with subtest("Can launch CSM virtual machine"): + with subtest("virtual-machine can launch CSM (BIOS)"): machine.succeed("incus init csm --vm --empty -c security.csm=true -c security.secureboot=false") machine.succeed("incus start csm") diff --git a/nixos/tests/mongodb.nix b/nixos/tests/mongodb.nix index a42ba0abf423..2b4b0fbe6a50 100644 --- a/nixos/tests/mongodb.nix +++ b/nixos/tests/mongodb.nix @@ -1,59 +1,37 @@ -# This test start mongodb, runs a query using mongo shell +# This test starts mongodb and runs a query using mongo shell +{ config, lib, ... }: +let + # required for test execution on darwin + pkgs = config.node.pkgs; + testQuery = pkgs.writeScript "nixtest.js" '' + db.greetings.insertOne({ "greeting": "hello" }); + print(db.greetings.findOne().greeting); + ''; + mongoshExe = lib.getExe pkgs.mongosh; +in +{ + name = "mongodb"; + meta.maintainers = with pkgs.lib.maintainers; [ + bluescreen303 + offline + phile314 + niklaskorz + ]; -import ./make-test-python.nix ( - { pkgs, ... }: - let - testQuery = pkgs.writeScript "nixtest.js" '' - db.greetings.insert({ "greeting": "hello" }); - print(db.greetings.findOne().greeting); - ''; + nodes.mongodb = { + services.mongodb.enable = true; + }; - runMongoDBTest = pkg: '' - node.execute("(rm -rf data || true) && mkdir data") - node.execute( - "${pkg}/bin/mongod --fork --logpath logs --dbpath data" - ) - node.wait_for_open_port(27017) + testScript = '' + start_all() - assert "hello" in node.succeed( - "${pkg}/bin/mongo ${testQuery}" - ) + with subtest("start mongodb"): + mongodb.wait_for_unit("mongodb.service") + mongodb.wait_for_open_port(27017) - node.execute( - "${pkg}/bin/mongod --shutdown --dbpath data" - ) - node.wait_for_closed_port(27017) - ''; - - in - { - name = "mongodb"; - meta = with pkgs.lib.maintainers; { - maintainers = [ - bluescreen303 - offline - phile314 - ]; - }; - - nodes = { - node = - { ... }: - { - environment.systemPackages = with pkgs; [ - # remember to update mongodb.passthru.tests if you change this - mongodb-7_0 - ]; - }; - }; - - testScript = - '' - node.start() - '' - + runMongoDBTest pkgs.mongodb-7_0 - + '' - node.shutdown() - ''; - } -) + with subtest("insert and find a document"): + result = mongodb.succeed("${mongoshExe} ${testQuery}") + print("Test output:", result) + assert result.strip() == "hello" + ''; +} diff --git a/nixos/tests/public-inbox.nix b/nixos/tests/public-inbox.nix index 9da906e57ae2..698dbf2eb799 100644 --- a/nixos/tests/public-inbox.nix +++ b/nixos/tests/public-inbox.nix @@ -10,11 +10,9 @@ import ./make-test-python.nix ( install -D -t $out key.pem cert.pem ''; - # Git repositories paths in Gitolite. - # Here only their baseNameOf is used for configuring public-inbox inboxes. gitRepositories = [ - "user/repo1" - "user/repo2" + "repo1" + "repo2" ]; in { @@ -81,7 +79,7 @@ import ./make-test-python.nix ( }; inboxes = lib.recursiveUpdate - (lib.genAttrs (map baseNameOf gitRepositories) (repo: { + (lib.genAttrs gitRepositories (repo: { address = [ # Routed to the "public-inbox:" transport in services.postfix.transport "${repo}@${domain}" @@ -106,7 +104,7 @@ import ./make-test-python.nix ( settings.coderepo = lib.listToAttrs ( map ( repositoryName: - lib.nameValuePair (baseNameOf repositoryName) { + lib.nameValuePair repositoryName { dir = "/var/lib/public-inbox/repositories/${repositoryName}.git"; cgitUrl = "https://git.${domain}/${repositoryName}.git"; } @@ -183,6 +181,12 @@ import ./make-test-python.nix ( testScript = '' start_all() + # The threshold and/or hardening may have to be changed with new features/checks + with subtest("systemd hardening thresholds"): + print(machine.succeed("systemd-analyze security public-inbox-httpd.service --threshold=5 --no-pager")) + print(machine.succeed("systemd-analyze security public-inbox-imapd.service --threshold=5 --no-pager")) + print(machine.succeed("systemd-analyze security public-inbox-nntpd.service --threshold=4 --no-pager")) + machine.wait_for_unit("multi-user.target") machine.wait_for_unit("public-inbox-init.service") diff --git a/nixos/tests/stash.nix b/nixos/tests/stash.nix new file mode 100644 index 000000000000..838a5e8a43c6 --- /dev/null +++ b/nixos/tests/stash.nix @@ -0,0 +1,80 @@ +import ./make-test-python.nix ( + let + host = "127.0.0.1"; + port = 1234; + dataDir = "/stash"; + in + { pkgs, ... }: + { + name = "stash"; + meta.maintainers = pkgs.stash.meta.maintainers; + + nodes.machine = { + services.stash = { + inherit dataDir; + enable = true; + + username = "test"; + passwordFile = pkgs.writeText "stash-password" "MyPassword"; + + jwtSecretKeyFile = pkgs.writeText "jwt_secret_key" "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"; + sessionStoreKeyFile = pkgs.writeText "session_store_key" "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"; + + plugins = + let + src = pkgs.fetchFromGitHub { + owner = "stashapp"; + repo = "CommunityScripts"; + rev = "9b6fac4934c2fac2ef0859ea68ebee5111fc5be5"; + hash = "sha256-PO3J15vaA7SD4r/LyHlXjnpaeYAN9Q++O94bIWdz7OA="; + }; + in + [ + (pkgs.runCommand "stashNotes" { inherit src; } '' + mkdir -p $out/plugins + cp -r $src/plugins/stashNotes $out/plugins/stashNotes + '') + (pkgs.runCommand "Theme-Plex" { inherit src; } '' + mkdir -p $out/plugins + cp -r $src/themes/Theme-Plex $out/plugins/Theme-Plex + '') + ]; + + mutableScrapers = true; + scrapers = + let + src = pkgs.fetchFromGitHub { + owner = "stashapp"; + repo = "CommunityScrapers"; + rev = "2ece82d17ddb0952c16842b0775274bcda598d81"; + hash = "sha256-AEmnvM8Nikhue9LNF9dkbleYgabCvjKHtzFpMse4otM="; + }; + in + [ + (pkgs.runCommand "FTV" { inherit src; } '' + mkdir -p $out/scrapers/FTV + cp -r $src/scrapers/FTV.yml $out/scrapers/FTV + '') + ]; + + settings = { + inherit host port; + + stash = [ { path = "/srv"; } ]; + }; + }; + }; + + testScript = '' + machine.wait_for_unit("stash.service") + machine.wait_for_open_port(${toString port}, "${host}") + machine.succeed("curl --fail http://${host}:${toString port}/") + + with subtest("Test plugins/scrapers"): + with subtest("mutable plugins directory should not exist"): + machine.fail("test -d ${dataDir}/plugins") + with subtest("mutable scrapers directory should exist and scraper FTV should be linked"): + machine.succeed("test -L ${dataDir}/scrapers/FTV") + ''; + } +) diff --git a/nixos/tests/swayfx.nix b/nixos/tests/swayfx.nix index fe1caf8fffa8..ba8408e20460 100644 --- a/nixos/tests/swayfx.nix +++ b/nixos/tests/swayfx.nix @@ -12,80 +12,78 @@ import ./make-test-python.nix ( # Found 1 error in 1 file (checked 1 source file) skipTypeCheck = true; - nodes.machine = - { config, ... }: - { - # Automatically login on tty1 as a normal user: - imports = [ ./common/user-account.nix ]; - services.getty.autologinUser = "alice"; + nodes.machine = { + # Automatically login on tty1 as a normal user: + imports = [ ./common/user-account.nix ]; + services.getty.autologinUser = "alice"; - environment = { - # For glinfo and wayland-info: - systemPackages = with pkgs; [ - mesa-demos - wayland-utils - alacritty - ]; - # Use a fixed SWAYSOCK path (for swaymsg): - variables = { - "SWAYSOCK" = "/tmp/sway-ipc.sock"; - # TODO: Investigate if we can get hardware acceleration to work (via - # virtio-gpu and Virgil). We currently have to use the Pixman software - # renderer since the GLES2 renderer doesn't work inside the VM (even - # with WLR_RENDERER_ALLOW_SOFTWARE): - # "WLR_RENDERER_ALLOW_SOFTWARE" = "1"; - "WLR_RENDERER" = "pixman"; - }; - # For convenience: - shellAliases = { - test-x11 = "glinfo | tee /tmp/test-x11.out && touch /tmp/test-x11-exit-ok"; - test-wayland = "wayland-info | tee /tmp/test-wayland.out && touch /tmp/test-wayland-exit-ok"; - }; - - # To help with OCR: - etc."xdg/foot/foot.ini".text = lib.generators.toINI { } { - main = { - font = "inconsolata:size=14"; - }; - colors = rec { - foreground = "000000"; - background = "ffffff"; - regular2 = foreground; - }; - }; - - etc."gpg-agent.conf".text = '' - pinentry-timeout 86400 - ''; + environment = { + # For glinfo and wayland-info: + systemPackages = with pkgs; [ + mesa-demos + wayland-utils + alacritty + ]; + # Use a fixed SWAYSOCK path (for swaymsg): + variables = { + "SWAYSOCK" = "/tmp/sway-ipc.sock"; + # TODO: Investigate if we can get hardware acceleration to work (via + # virtio-gpu and Virgil). We currently have to use the Pixman software + # renderer since the GLES2 renderer doesn't work inside the VM (even + # with WLR_RENDERER_ALLOW_SOFTWARE): + # "WLR_RENDERER_ALLOW_SOFTWARE" = "1"; + "WLR_RENDERER" = "pixman"; + }; + # For convenience: + shellAliases = { + test-x11 = "glinfo | tee /tmp/test-x11.out && touch /tmp/test-x11-exit-ok"; + test-wayland = "wayland-info | tee /tmp/test-wayland.out && touch /tmp/test-wayland-exit-ok"; }; - fonts.packages = [ pkgs.inconsolata ]; + # To help with OCR: + etc."xdg/foot/foot.ini".text = lib.generators.toINI { } { + main = { + font = "inconsolata:size=14"; + }; + colors = rec { + foreground = "000000"; + background = "ffffff"; + regular2 = foreground; + }; + }; - # Automatically configure and start Sway when logging in on tty1: - programs.bash.loginShellInit = '' - if [ "$(tty)" = "/dev/tty1" ]; then - set -e - - mkdir -p ~/.config/sway - sed s/Mod4/Mod1/ /etc/sway/config > ~/.config/sway/config - - sway --validate - sway && touch /tmp/sway-exit-ok - fi + etc."gpg-agent.conf".text = '' + pinentry-timeout 86400 ''; - - programs.sway = { - enable = true; - package = pkgs.swayfx.override { isNixOS = true; }; - }; - - # To test pinentry via gpg-agent: - programs.gnupg.agent.enable = true; - - # Need to switch to a different GPU driver than the default one (-vga std) so that Sway can launch: - virtualisation.qemu.options = [ "-vga none -device virtio-gpu-pci" ]; }; + fonts.packages = [ pkgs.inconsolata ]; + + # Automatically configure and start Sway when logging in on tty1: + programs.bash.loginShellInit = '' + if [ "$(tty)" = "/dev/tty1" ]; then + set -e + + mkdir -p ~/.config/sway + sed s/Mod4/Mod1/ /etc/sway/config > ~/.config/sway/config + + sway --validate + sway && touch /tmp/sway-exit-ok + fi + ''; + + programs.sway = { + enable = true; + package = pkgs.swayfx.override { isNixOS = true; }; + }; + + # To test pinentry via gpg-agent: + programs.gnupg.agent.enable = true; + + # Need to switch to a different GPU driver than the default one (-vga std) so that Sway can launch: + virtualisation.qemu.options = [ "-vga none -device virtio-gpu-pci" ]; + }; + testScript = { nodes, ... }: '' @@ -194,7 +192,7 @@ import ./make-test-python.nix ( swaymsg("exec swaylock") machine.wait_until_succeeds("pgrep -x swaylock") machine.sleep(3) - machine.send_chars("${nodes.machine.config.users.users.alice.password}") + machine.send_chars("${nodes.machine.users.users.alice.password}") machine.send_key("ret") machine.wait_until_fails("pgrep -x swaylock") diff --git a/pkgs/applications/audio/airwave/default.nix b/pkgs/applications/audio/airwave/default.nix index c7422a2baac8..9789485488be 100644 --- a/pkgs/applications/audio/airwave/default.nix +++ b/pkgs/applications/audio/airwave/default.nix @@ -12,6 +12,7 @@ file, libX11, qt5, + vst2-sdk, }: let @@ -24,18 +25,6 @@ let sha256 = "1ban59skw422mak3cp57lj27hgq5d3a4f6y79ysjnamf8rpz9x4s"; }; - vst-sdk = stdenv.mkDerivation rec { - name = "vstsdk369_01_03_2018_build_132"; - src = requireFile { - name = "${name}.zip"; - url = "http://www.steinberg.net/en/company/developers.html"; - sha256 = "0r29fv6yhm2m5yznn8m4my7fq01w1lpphax4sshagy6b1dgjlv3w"; - }; - nativeBuildInputs = [ unzip ]; - installPhase = "cp -r . $out"; - meta.license = lib.licenses.unfree; - }; - wine-wow64 = wine.override { wineRelease = "stable"; wineBuild = "wineWow"; @@ -84,7 +73,7 @@ multiStdenv.mkDerivation { # Cf. https://github.com/phantom-code/airwave/issues/57 hardeningDisable = [ "format" ]; - cmakeFlags = [ "-DVSTSDK_PATH=${vst-sdk}/VST2_SDK" ]; + cmakeFlags = [ "-DVSTSDK_PATH=${vst2-sdk}" ]; postInstall = '' mv $out/bin $out/libexec @@ -94,7 +83,7 @@ multiStdenv.mkDerivation { wrapProgram $out/libexec/airwave-host-64.exe --set WINELOADER ${wine-xembed}/bin/wine64 ''; - meta = with lib; { + meta = { description = "WINE-based VST bridge for Linux VST hosts"; longDescription = '' Airwave is a wine based VST bridge, that allows for the use of @@ -105,9 +94,9 @@ multiStdenv.mkDerivation { window. ''; homepage = "https://github.com/phantom-code/airwave"; - license = licenses.mit; + license = lib.licenses.mit; platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ michalrus ]; + maintainers = with lib.maintainers; [ michalrus ]; hydraPlatforms = [ ]; }; } diff --git a/pkgs/applications/audio/ardour/default.nix b/pkgs/applications/audio/ardour/default.nix index f923356b5604..b24da8fb3297 100644 --- a/pkgs/applications/audio/ardour/default.nix +++ b/pkgs/applications/audio/ardour/default.nix @@ -160,7 +160,7 @@ stdenv.mkDerivation rec { ] ++ lib.optionals videoSupport [ harvid xjadeo ]; wafConfigureFlags = [ - "--cxx11" + "--cxx17" "--docs" "--freedesktop" "--no-phone-home" diff --git a/pkgs/applications/audio/mopidy/mopidy.nix b/pkgs/applications/audio/mopidy/mopidy.nix index 4771ade230c9..8918d44d3c04 100644 --- a/pkgs/applications/audio/mopidy/mopidy.nix +++ b/pkgs/applications/audio/mopidy/mopidy.nix @@ -30,7 +30,22 @@ pythonPackages.buildPythonApplication rec { gst-plugins-base gst-plugins-good gst-plugins-ugly - gst-plugins-rs + # Required patches for the Spotify plugin (https://github.com/mopidy/mopidy-spotify/releases/tag/v5.0.0a3) + (gst-plugins-rs.overrideAttrs ( + newAttrs: oldAttrs: { + cargoDeps = oldAttrs.cargoDeps.overrideAttrs (oldAttrs': { + vendorStaging = oldAttrs'.vendorStaging.overrideAttrs { + inherit (newAttrs) patches; + outputHash = "sha256-CegT8h+CJ6axipAD6E9drtrPJ9izRy/UCW14rbva5XA="; + }; + }); + + # https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs/-/merge_requests/1801/ + patches = oldAttrs.patches or [ ] ++ [ + ./spotify-access-token-auth.patch + ]; + } + )) pipewire ]; diff --git a/pkgs/applications/audio/mopidy/spotify-access-token-auth.patch b/pkgs/applications/audio/mopidy/spotify-access-token-auth.patch new file mode 100644 index 000000000000..495ffa519304 --- /dev/null +++ b/pkgs/applications/audio/mopidy/spotify-access-token-auth.patch @@ -0,0 +1,2231 @@ +From a9a05b3b62ba22d841d1e19e23d7fc0bee95ba05 Mon Sep 17 00:00:00 2001 +From: kingosticks +Date: Tue, 22 Oct 2024 23:45:17 +0100 +Subject: [PATCH 1/2] net/quinn: Fix test panic due to unset default crypto + provider + +If another dep in the workspace pulls in a different rustls crypto +provider then we need to explicitly specify our default provider. + +Part-of: +(cherry picked from commit a81b7f380fc11fb58994dc9c7a50dafa58314ccf) +--- + net/quinn/tests/quinnquic.rs | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/net/quinn/tests/quinnquic.rs b/net/quinn/tests/quinnquic.rs +index 911ce520..0e071f37 100644 +--- a/net/quinn/tests/quinnquic.rs ++++ b/net/quinn/tests/quinnquic.rs +@@ -18,6 +18,9 @@ fn init() { + INIT.call_once(|| { + gst::init().unwrap(); + gstquinn::plugin_register_static().expect("QUIC source sink send receive tests"); ++ rustls::crypto::ring::default_provider() ++ .install_default() ++ .expect("Failed to install ring crypto provider"); + }); + } + +-- +2.47.0 + + +From ff8190b271d5ae15fb5e91e5440a0766cb968ac7 Mon Sep 17 00:00:00 2001 +From: Guillaume Desmottes +Date: Wed, 15 Dec 2021 17:15:20 +0100 +Subject: [PATCH 2/2] spotify: replace username/password auth with access + token. + +Part-of: +--- + Cargo.lock | 1064 +++++++++++++++++----- + audio/spotify/Cargo.toml | 6 +- + audio/spotify/README.md | 25 +- + audio/spotify/src/common.rs | 141 ++- + audio/spotify/src/spotifyaudiosrc/imp.rs | 19 +- + docs/plugins/gst_plugins_cache.json | 12 + + 6 files changed, 954 insertions(+), 313 deletions(-) + +diff --git a/Cargo.lock b/Cargo.lock +index 99cec70b..9a81bdb1 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -19,45 +19,13 @@ checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" + + [[package]] + name = "aes" +-version = "0.6.0" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "884391ef1066acaa41e766ba8f596341b96e93ce34f9a43e7d24bf0a0eaf0561" +-dependencies = [ +- "aes-soft", +- "aesni", +- "cipher", +-] +- +-[[package]] +-name = "aes-ctr" +-version = "0.6.0" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "7729c3cde54d67063be556aeac75a81330d802f0259500ca40cb52967f975763" +-dependencies = [ +- "aes-soft", +- "aesni", +- "cipher", +- "ctr", +-] +- +-[[package]] +-name = "aes-soft" +-version = "0.6.4" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "be14c7498ea50828a38d0e24a765ed2effe92a705885b57d029cd67d45744072" +-dependencies = [ +- "cipher", +- "opaque-debug", +-] +- +-[[package]] +-name = "aesni" +-version = "0.10.0" ++version = "0.8.4" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "ea2e11f5e94c2f7d386164cc2aa1f97823fed6f259e486940a71c174dd01b0ce" ++checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0" + dependencies = [ ++ "cfg-if", + "cipher", +- "opaque-debug", ++ "cpufeatures", + ] + + [[package]] +@@ -70,7 +38,7 @@ dependencies = [ + "getrandom", + "once_cell", + "version_check", +- "zerocopy 0.7.35", ++ "zerocopy", + ] + + [[package]] +@@ -160,9 +128,9 @@ dependencies = [ + + [[package]] + name = "anyhow" +-version = "1.0.92" ++version = "1.0.95" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "74f37166d7d48a0284b99dd824694c26119c700b53bf0d1540cdb147dbdaaf13" ++checksum = "34ac096ce696dc2fcabef30516bb13c0a68a11d30131d3df6f04711467681b04" + + [[package]] + name = "arbitrary" +@@ -367,6 +335,31 @@ dependencies = [ + "zeroize", + ] + ++[[package]] ++name = "aws-lc-rs" ++version = "1.12.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f409eb70b561706bf8abba8ca9c112729c481595893fd06a2dd9af8ed8441148" ++dependencies = [ ++ "aws-lc-sys", ++ "paste", ++ "zeroize", ++] ++ ++[[package]] ++name = "aws-lc-sys" ++version = "0.24.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "923ded50f602b3007e5e63e3f094c479d9c8a9b42d7f4034e4afe456aa48bfd2" ++dependencies = [ ++ "bindgen", ++ "cc", ++ "cmake", ++ "dunce", ++ "fs_extra", ++ "paste", ++] ++ + [[package]] + name = "aws-runtime" + version = "1.2.0" +@@ -458,7 +451,7 @@ dependencies = [ + "bytes", + "fastrand", + "hex", +- "hmac 0.12.1", ++ "hmac", + "http 0.2.12", + "http-body 0.4.6", + "lru", +@@ -600,7 +593,7 @@ dependencies = [ + "crypto-bigint 0.5.5", + "form_urlencoded", + "hex", +- "hmac 0.12.1", ++ "hmac", + "http 0.2.12", + "http 1.1.0", + "once_cell", +@@ -866,6 +859,29 @@ dependencies = [ + "serde", + ] + ++[[package]] ++name = "bindgen" ++version = "0.69.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "271383c67ccabffb7381723dea0672a673f292304fcb45c01cc648c7a8d58088" ++dependencies = [ ++ "bitflags 2.6.0", ++ "cexpr", ++ "clang-sys", ++ "itertools 0.12.1", ++ "lazy_static", ++ "lazycell", ++ "log", ++ "prettyplease", ++ "proc-macro2", ++ "quote", ++ "regex", ++ "rustc-hash 1.1.0", ++ "shlex", ++ "syn 2.0.86", ++ "which", ++] ++ + [[package]] + name = "bitflags" + version = "1.3.2" +@@ -884,15 +900,6 @@ version = "2.3.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "7c12d1856e42f0d817a835fe55853957c85c8c8a470114029143d3f12671446e" + +-[[package]] +-name = "block-buffer" +-version = "0.9.0" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" +-dependencies = [ +- "generic-array", +-] +- + [[package]] + name = "block-buffer" + version = "0.10.4" +@@ -1040,6 +1047,15 @@ dependencies = [ + "thiserror", + ] + ++[[package]] ++name = "cexpr" ++version = "0.6.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" ++dependencies = [ ++ "nom", ++] ++ + [[package]] + name = "cfg-expr" + version = "0.15.8" +@@ -1089,11 +1105,23 @@ dependencies = [ + + [[package]] + name = "cipher" +-version = "0.2.5" ++version = "0.4.4" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "12f8e7987cbd042a63249497f41aed09f8e65add917ea6566effbc56578d6801" ++checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" + dependencies = [ +- "generic-array", ++ "crypto-common", ++ "inout", ++] ++ ++[[package]] ++name = "clang-sys" ++version = "1.8.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4" ++dependencies = [ ++ "glob", ++ "libc", ++ "libloading", + ] + + [[package]] +@@ -1142,6 +1170,15 @@ version = "0.4.3" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "4bfbf56724aa9eca8afa4fcfadeb479e722935bb2a0900c2d37e0cc477af0688" + ++[[package]] ++name = "cmake" ++version = "0.1.52" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c682c223677e0e5b6b7f63a64b9351844c3f1b1678a68b7ee617e30fb082620e" ++dependencies = [ ++ "cc", ++] ++ + [[package]] + name = "color-name" + version = "1.1.0" +@@ -1231,6 +1268,16 @@ dependencies = [ + "libc", + ] + ++[[package]] ++name = "core-foundation" ++version = "0.10.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b55271e5c8c478ad3f38ad24ef34923091e0548492a266d19b3c0b4d82574c63" ++dependencies = [ ++ "core-foundation-sys", ++ "libc", ++] ++ + [[package]] + name = "core-foundation-sys" + version = "0.8.7" +@@ -1330,16 +1377,6 @@ dependencies = [ + "typenum", + ] + +-[[package]] +-name = "crypto-mac" +-version = "0.11.0" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "25fab6889090c8133f3deb8f73ba3c65a7f456f66436fc012a1b1e272b1e103e" +-dependencies = [ +- "generic-array", +- "subtle", +-] +- + [[package]] + name = "csound" + version = "0.1.8" +@@ -1364,9 +1401,9 @@ dependencies = [ + + [[package]] + name = "ctr" +-version = "0.6.0" ++version = "0.9.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "fb4a30d54f7443bf3d6191dcd486aca19e67cb3c49fa7a06a319966346707e7f" ++checksum = "0369ee1ad671834580515889b80f2ea915f23b8be8d0daa4bbaf2ac5c7590835" + dependencies = [ + "cipher", + ] +@@ -1497,6 +1534,17 @@ dependencies = [ + "zeroize", + ] + ++[[package]] ++name = "der" ++version = "0.7.9" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f55bf8e7b65898637379c1b74eb1551107c8294ed26d855ceb9fd1a09cfc9bc0" ++dependencies = [ ++ "const-oid", ++ "pem-rfc7468", ++ "zeroize", ++] ++ + [[package]] + name = "deranged" + version = "0.3.11" +@@ -1508,27 +1556,50 @@ dependencies = [ + ] + + [[package]] +-name = "diff" +-version = "0.1.13" ++name = "derive_builder" ++version = "0.20.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8" ++checksum = "507dfb09ea8b7fa618fcf76e953f4f5e192547945816d5358edffe39f6f94947" ++dependencies = [ ++ "derive_builder_macro", ++] + + [[package]] +-name = "digest" +-version = "0.9.0" ++name = "derive_builder_core" ++version = "0.20.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" ++checksum = "2d5bcf7b024d6835cfb3d473887cd966994907effbe9227e8c8219824d06c4e8" + dependencies = [ +- "generic-array", ++ "darling", ++ "proc-macro2", ++ "quote", ++ "syn 2.0.86", ++] ++ ++[[package]] ++name = "derive_builder_macro" ++version = "0.20.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ab63b0e2bf4d5928aff72e83a7dace85d7bba5fe12dcc3c5a572d78caffd3f3c" ++dependencies = [ ++ "derive_builder_core", ++ "syn 2.0.86", + ] + ++[[package]] ++name = "diff" ++version = "0.1.13" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8" ++ + [[package]] + name = "digest" + version = "0.10.7" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" + dependencies = [ +- "block-buffer 0.10.4", ++ "block-buffer", ++ "const-oid", + "crypto-common", + "subtle", + ] +@@ -1545,6 +1616,12 @@ dependencies = [ + "rgb", + ] + ++[[package]] ++name = "dunce" ++version = "1.0.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813" ++ + [[package]] + name = "ebml-iterable" + version = "0.6.2" +@@ -1592,10 +1669,10 @@ version = "0.14.8" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "413301934810f597c1d19ca71c8710e99a3f1ba28a0d2ebc01551a2daeea3c5c" + dependencies = [ +- "der", ++ "der 0.6.1", + "elliptic-curve", + "rfc6979", +- "signature", ++ "signature 1.6.4", + ] + + [[package]] +@@ -1604,7 +1681,7 @@ version = "1.5.3" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "91cff35c70bba8a626e3185d8cd48cc11b5437e1a5bcd15b9b5fa3c64b6dfee7" + dependencies = [ +- "signature", ++ "signature 1.6.4", + ] + + [[package]] +@@ -1621,12 +1698,12 @@ checksum = "e7bb888ab5300a19b8e5bceef25ac745ad065f3c9f7efc6de1b91958110891d3" + dependencies = [ + "base16ct", + "crypto-bigint 0.4.9", +- "der", +- "digest 0.10.7", ++ "der 0.6.1", ++ "digest", + "ff", + "generic-array", + "group", +- "pkcs8", ++ "pkcs8 0.9.0", + "rand_core", + "sec1", + "subtle", +@@ -1834,6 +1911,12 @@ dependencies = [ + "autocfg", + ] + ++[[package]] ++name = "fs_extra" ++version = "1.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c" ++ + [[package]] + name = "fst" + version = "0.4.7" +@@ -1911,6 +1994,12 @@ version = "0.3.31" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988" + ++[[package]] ++name = "futures-timer" ++version = "3.0.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f288b0a4f20f9a56b5d1da57e2227c661b7b16168e2f72365f57b63326e29b24" ++ + [[package]] + name = "futures-util" + version = "0.3.31" +@@ -2175,6 +2264,24 @@ dependencies = [ + "system-deps 7.0.3", + ] + ++[[package]] ++name = "governor" ++version = "0.6.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "68a7f542ee6b35af73b06abc0dad1c1bae89964e4e253bc4b587b91c9637867b" ++dependencies = [ ++ "cfg-if", ++ "futures", ++ "futures-timer", ++ "no-std-compat", ++ "nonzero_ext", ++ "parking_lot", ++ "portable-atomic", ++ "rand", ++ "smallvec", ++ "spinning_top", ++] ++ + [[package]] + name = "graphene-rs" + version = "0.20.5" +@@ -3725,21 +3832,20 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" + + [[package]] + name = "hmac" +-version = "0.11.0" ++version = "0.12.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "2a2a2320eb7ec0ebe8da8f744d7812d9fc4cb4d09344ac01898dbcb6a20ae69b" ++checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" + dependencies = [ +- "crypto-mac", +- "digest 0.9.0", ++ "digest", + ] + + [[package]] +-name = "hmac" +-version = "0.12.1" ++name = "home" ++version = "0.5.11" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" ++checksum = "589533453244b0995c858700322199b2becb13b627df2851f64a2775d024abcf" + dependencies = [ +- "digest 0.10.7", ++ "windows-sys 0.59.0", + ] + + [[package]] +@@ -3885,18 +3991,24 @@ dependencies = [ + ] + + [[package]] +-name = "hyper-proxy" +-version = "0.9.1" ++name = "hyper-proxy2" ++version = "0.1.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "ca815a891b24fdfb243fa3239c86154392b0953ee584aa1a2a1f66d20cbe75cc" ++checksum = "9043b7b23fb0bc4a1c7014c27b50a4fc42cc76206f71d34fc0dfe5b28ddc3faf" + dependencies = [ + "bytes", +- "futures", +- "headers 0.3.9", +- "http 0.2.12", +- "hyper 0.14.31", ++ "futures-util", ++ "headers 0.4.0", ++ "http 1.1.0", ++ "hyper 1.5.0", ++ "hyper-rustls 0.26.0", ++ "hyper-util", ++ "pin-project-lite", ++ "rustls-native-certs 0.7.3", + "tokio", ++ "tokio-rustls 0.25.0", + "tower-service", ++ "webpki", + ] + + [[package]] +@@ -3910,11 +4022,30 @@ dependencies = [ + "hyper 0.14.31", + "log", + "rustls 0.21.12", +- "rustls-native-certs", ++ "rustls-native-certs 0.6.3", + "tokio", + "tokio-rustls 0.24.1", + ] + ++[[package]] ++name = "hyper-rustls" ++version = "0.26.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a0bea761b46ae2b24eb4aef630d8d1c398157b6fc29e6350ecf090a0b70c952c" ++dependencies = [ ++ "futures-util", ++ "http 1.1.0", ++ "hyper 1.5.0", ++ "hyper-util", ++ "log", ++ "rustls 0.22.4", ++ "rustls-native-certs 0.7.3", ++ "rustls-pki-types", ++ "tokio", ++ "tokio-rustls 0.25.0", ++ "tower-service", ++] ++ + [[package]] + name = "hyper-rustls" + version = "0.27.3" +@@ -3925,7 +4056,9 @@ dependencies = [ + "http 1.1.0", + "hyper 1.5.0", + "hyper-util", ++ "log", + "rustls 0.23.16", ++ "rustls-native-certs 0.8.1", + "rustls-pki-types", + "tokio", + "tokio-rustls 0.26.0", +@@ -4014,7 +4147,7 @@ dependencies = [ + "iana-time-zone-haiku", + "js-sys", + "wasm-bindgen", +- "windows-core", ++ "windows-core 0.52.0", + ] + + [[package]] +@@ -4104,6 +4237,15 @@ dependencies = [ + "serde", + ] + ++[[package]] ++name = "inout" ++version = "0.1.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" ++dependencies = [ ++ "generic-array", ++] ++ + [[package]] + name = "interpolate_name" + version = "0.2.4" +@@ -4214,6 +4356,15 @@ name = "lazy_static" + version = "1.5.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" ++dependencies = [ ++ "spin", ++] ++ ++[[package]] ++name = "lazycell" ++version = "1.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" + + [[package]] + name = "lewton" +@@ -4222,7 +4373,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "777b48df9aaab155475a83a7df3070395ea1ac6902f5cd062b8f2b028075c030" + dependencies = [ + "byteorder", +- "ogg", + "tinyvec", + ] + +@@ -4261,86 +4411,119 @@ checksum = "8355be11b20d696c8f18f6cc018c4e372165b1fa8126cef092399c9951984ffa" + + [[package]] + name = "librespot-audio" +-version = "0.4.2" ++version = "0.5.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "c176a31355e1ea8e0b9c4ced19df4947bfe4770661c25c142b6fba2365940d9d" ++checksum = "5fbda070a5598b32718e497f585f46891f7113e64aff20a13c0f2ba8fe7ccad9" + dependencies = [ +- "aes-ctr", +- "byteorder", ++ "aes", + "bytes", ++ "ctr", + "futures-util", ++ "http-body-util", ++ "hyper 1.5.0", ++ "hyper-util", + "librespot-core", + "log", ++ "parking_lot", + "tempfile", ++ "thiserror", + "tokio", + ] + + [[package]] + name = "librespot-core" +-version = "0.4.2" ++version = "0.5.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "046349f25888e644bf02d9c5de0164b2a493d29aa4ce18e1ad0b756da9b55d6d" ++checksum = "505a5ddd966231755994b60435607a1e8ae1d41c7f1169b078e0511bfb82d931" + dependencies = [ + "aes", +- "base64 0.13.1", ++ "base64 0.22.1", + "byteorder", + "bytes", ++ "data-encoding", + "form_urlencoded", + "futures-core", + "futures-util", +- "hmac 0.11.0", +- "http 0.2.12", ++ "governor", ++ "hmac", ++ "http 1.1.0", ++ "http-body-util", + "httparse", +- "hyper 0.14.31", +- "hyper-proxy", ++ "hyper 1.5.0", ++ "hyper-proxy2", ++ "hyper-rustls 0.27.3", ++ "hyper-util", ++ "librespot-oauth", + "librespot-protocol", + "log", ++ "nonzero_ext", + "num-bigint", ++ "num-derive", + "num-integer", + "num-traits", + "once_cell", ++ "parking_lot", + "pbkdf2", ++ "pin-project-lite", + "priority-queue", + "protobuf", ++ "quick-xml 0.36.2", + "rand", ++ "rsa", + "serde", + "serde_json", +- "sha-1", ++ "sha1", + "shannon", ++ "sysinfo", + "thiserror", ++ "time", + "tokio", + "tokio-stream", ++ "tokio-tungstenite 0.24.0", + "tokio-util", + "url", + "uuid", +- "vergen", ++ "vergen-gitcl", + ] + + [[package]] + name = "librespot-metadata" +-version = "0.4.2" ++version = "0.5.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "6b80361fcbcb5092056fd47c08c34d5d51b08385d8efb6941c0d3e46d032c21c" ++checksum = "6a10ab5a390f65281e763cd09c617b173f0e665994eae3d242526924625fdc66" + dependencies = [ + "async-trait", +- "byteorder", ++ "bytes", + "librespot-core", + "librespot-protocol", + "log", + "protobuf", ++ "serde", ++ "serde_json", ++ "thiserror", ++ "uuid", + ] + + [[package]] +-name = "librespot-playback" +-version = "0.4.2" ++name = "librespot-oauth" ++version = "0.5.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "5190a0b9bcc7f70ee4196a6b4a1c731d405ca130d4a6fcd4c561cfdde8b7cfb7" ++checksum = "57bda94233b358fb41c04ed15507c61136c80efe876c6e05a10ddb9a182b144e" + dependencies = [ +- "byteorder", +- "futures-executor", +- "futures-util", +- "lewton", +- "librespot-audio", ++ "log", ++ "oauth2", ++ "thiserror", ++ "url", ++] ++ ++[[package]] ++name = "librespot-playback" ++version = "0.5.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5b1bcfe1d72c5ac14c798c7e3e1c20e1fb6af2b9c254794545cfcb1f2a4627e2" ++dependencies = [ ++ "futures-util", ++ "librespot-audio", + "librespot-core", + "librespot-metadata", + "log", +@@ -4349,20 +4532,20 @@ dependencies = [ + "rand", + "rand_distr", + "shell-words", ++ "symphonia", + "thiserror", + "tokio", +- "zerocopy 0.6.6", ++ "zerocopy", + ] + + [[package]] + name = "librespot-protocol" +-version = "0.4.2" ++version = "0.5.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "5d6d3ac6196ac0ea67bbe039f56d6730a5d8b31502ef9bce0f504ed729dcb39f" ++checksum = "0d6f343f573e0469d3ff8a02b99bbd9789faa01e2ff167332542ac840a8b31e7" + dependencies = [ +- "glob", + "protobuf", +- "protobuf-codegen-pure", ++ "protobuf-codegen", + ] + + [[package]] +@@ -4496,7 +4679,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf" + dependencies = [ + "cfg-if", +- "digest 0.10.7", ++ "digest", + ] + + [[package]] +@@ -4624,7 +4807,7 @@ dependencies = [ + "openssl-probe", + "openssl-sys", + "schannel", +- "security-framework", ++ "security-framework 2.11.1", + "security-framework-sys", + "tempfile", + ] +@@ -4657,6 +4840,12 @@ dependencies = [ + "rustfft", + ] + ++[[package]] ++name = "no-std-compat" ++version = "0.4.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b93853da6d84c2e3c7d730d6473e8817692dd89be387eb01b94d7f108ecb5b8c" ++ + [[package]] + name = "nom" + version = "7.1.3" +@@ -4667,12 +4856,27 @@ dependencies = [ + "minimal-lexical", + ] + ++[[package]] ++name = "nonzero_ext" ++version = "0.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "38bf9645c8b145698bb0b18a4637dcacbc421ea49bef2317e4fd8065a387cf21" ++ + [[package]] + name = "noop_proc_macro" + version = "0.3.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "0676bb32a98c1a483ce53e500a81ad9c3d5b3f7c920c28c24e9cb0980d0b5bc8" + ++[[package]] ++name = "ntapi" ++version = "0.4.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e8a3895c6391c39d7fe7ebc444a87eb2991b2a0bc718fdabd071eec617fc68e4" ++dependencies = [ ++ "winapi", ++] ++ + [[package]] + name = "nu-ansi-term" + version = "0.46.0" +@@ -4694,6 +4898,23 @@ dependencies = [ + "rand", + ] + ++[[package]] ++name = "num-bigint-dig" ++version = "0.8.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "dc84195820f291c7697304f3cbdadd1cb7199c0efc917ff5eafd71225c136151" ++dependencies = [ ++ "byteorder", ++ "lazy_static", ++ "libm", ++ "num-integer", ++ "num-iter", ++ "num-traits", ++ "rand", ++ "smallvec", ++ "zeroize", ++] ++ + [[package]] + name = "num-complex" + version = "0.4.6" +@@ -4729,6 +4950,17 @@ dependencies = [ + "num-traits", + ] + ++[[package]] ++name = "num-iter" ++version = "0.1.45" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf" ++dependencies = [ ++ "autocfg", ++ "num-integer", ++ "num-traits", ++] ++ + [[package]] + name = "num-rational" + version = "0.4.2" +@@ -4761,6 +4993,35 @@ dependencies = [ + "libc", + ] + ++[[package]] ++name = "num_threads" ++version = "0.1.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5c7398b9c8b70908f6371f47ed36737907c87c52af34c268fed0bf0ceb92ead9" ++dependencies = [ ++ "libc", ++] ++ ++[[package]] ++name = "oauth2" ++version = "4.4.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c38841cdd844847e3e7c8d29cef9dcfed8877f8f56f9071f77843ecf3baf937f" ++dependencies = [ ++ "base64 0.13.1", ++ "chrono", ++ "getrandom", ++ "http 0.2.12", ++ "rand", ++ "reqwest 0.11.27", ++ "serde", ++ "serde_json", ++ "serde_path_to_error", ++ "sha2", ++ "thiserror", ++ "url", ++] ++ + [[package]] + name = "object" + version = "0.36.5" +@@ -4772,9 +5033,9 @@ dependencies = [ + + [[package]] + name = "ogg" +-version = "0.8.0" ++version = "0.9.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "6951b4e8bf21c8193da321bcce9c9dd2e13c858fe078bf9054a288b419ae5d6e" ++checksum = "5477016638150530ba21dec7caac835b29ef69b20865751d2973fce6be386cf1" + dependencies = [ + "byteorder", + ] +@@ -4785,12 +5046,6 @@ version = "1.20.2" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" + +-[[package]] +-name = "opaque-debug" +-version = "0.3.1" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381" +- + [[package]] + name = "openssl" + version = "0.10.68" +@@ -5002,12 +5257,12 @@ dependencies = [ + + [[package]] + name = "pbkdf2" +-version = "0.8.0" ++version = "0.12.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "d95f5254224e617595d2cc3cc73ff0a5eaf2637519e25f03388154e9378b6ffa" ++checksum = "f8ed6a7761f76e3b9f92dfb0a60a6a6477c61024b775147ff0973a02653abaf2" + dependencies = [ +- "crypto-mac", +- "hmac 0.11.0", ++ "digest", ++ "hmac", + ] + + [[package]] +@@ -5020,6 +5275,15 @@ dependencies = [ + "serde", + ] + ++[[package]] ++name = "pem-rfc7468" ++version = "0.7.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "88b39c9bfcfc231068454382784bb460aae594343fb030d46e9f50a645418412" ++dependencies = [ ++ "base64ct", ++] ++ + [[package]] + name = "percent-encoding" + version = "2.3.1" +@@ -5068,14 +5332,35 @@ version = "0.1.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + ++[[package]] ++name = "pkcs1" ++version = "0.7.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c8ffb9f10fa047879315e6625af03c164b16962a5368d724ed16323b68ace47f" ++dependencies = [ ++ "der 0.7.9", ++ "pkcs8 0.10.2", ++ "spki 0.7.3", ++] ++ + [[package]] + name = "pkcs8" + version = "0.9.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "9eca2c590a5f85da82668fa685c09ce2888b9430e83299debf1f34b65fd4a4ba" + dependencies = [ +- "der", +- "spki", ++ "der 0.6.1", ++ "spki 0.6.0", ++] ++ ++[[package]] ++name = "pkcs8" ++version = "0.10.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7" ++dependencies = [ ++ "der 0.7.9", ++ "spki 0.7.3", + ] + + [[package]] +@@ -5118,6 +5403,12 @@ dependencies = [ + "windows-sys 0.59.0", + ] + ++[[package]] ++name = "portable-atomic" ++version = "1.10.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "280dc24453071f1b63954171985a0b0d30058d287960968b9b2aca264c8d4ee6" ++ + [[package]] + name = "powerfmt" + version = "0.2.0" +@@ -5130,7 +5421,7 @@ version = "0.2.20" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" + dependencies = [ +- "zerocopy 0.7.35", ++ "zerocopy", + ] + + [[package]] +@@ -5164,12 +5455,13 @@ dependencies = [ + + [[package]] + name = "priority-queue" +-version = "1.4.0" ++version = "2.1.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "a0bda9164fe05bc9225752d54aae413343c36f684380005398a6a8fde95fe785" ++checksum = "714c75db297bc88a63783ffc6ab9f830698a6705aa0201416931759ef4c8183d" + dependencies = [ + "autocfg", +- "indexmap 1.9.3", ++ "equivalent", ++ "indexmap 2.6.0", + ] + + [[package]] +@@ -5288,27 +5580,53 @@ dependencies = [ + + [[package]] + name = "protobuf" +-version = "2.28.0" ++version = "3.7.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "106dd99e98437432fed6519dedecfade6a06a73bb7b2a1e019fdd2bee5778d94" ++checksum = "a3a7c64d9bf75b1b8d981124c14c179074e8caa7dfe7b6a12e6222ddcd0c8f72" ++dependencies = [ ++ "once_cell", ++ "protobuf-support", ++ "thiserror", ++] + + [[package]] + name = "protobuf-codegen" +-version = "2.28.0" ++version = "3.7.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "033460afb75cf755fcfc16dfaed20b86468082a2ea24e05ac35ab4a099a017d6" ++checksum = "e26b833f144769a30e04b1db0146b2aaa53fd2fd83acf10a6b5f996606c18144" + dependencies = [ ++ "anyhow", ++ "once_cell", + "protobuf", ++ "protobuf-parse", ++ "regex", ++ "tempfile", ++ "thiserror", + ] + + [[package]] +-name = "protobuf-codegen-pure" +-version = "2.28.0" ++name = "protobuf-parse" ++version = "3.7.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "95a29399fc94bcd3eeaa951c715f7bea69409b2445356b00519740bcd6ddd865" ++checksum = "322330e133eab455718444b4e033ebfac7c6528972c784fcde28d2cc783c6257" + dependencies = [ ++ "anyhow", ++ "indexmap 2.6.0", ++ "log", + "protobuf", +- "protobuf-codegen", ++ "protobuf-support", ++ "tempfile", ++ "thiserror", ++ "which", ++] ++ ++[[package]] ++name = "protobuf-support" ++version = "3.7.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b088fd20b938a875ea00843b6faf48579462630015c3788d397ad6a786663252" ++dependencies = [ ++ "thiserror", + ] + + [[package]] +@@ -5357,7 +5675,7 @@ dependencies = [ + "pin-project-lite", + "quinn-proto", + "quinn-udp", +- "rustc-hash", ++ "rustc-hash 2.0.0", + "rustls 0.23.16", + "socket2", + "thiserror", +@@ -5374,7 +5692,7 @@ dependencies = [ + "bytes", + "rand", + "ring", +- "rustc-hash", ++ "rustc-hash 2.0.0", + "rustls 0.23.16", + "slab", + "thiserror", +@@ -5603,6 +5921,7 @@ dependencies = [ + "http 0.2.12", + "http-body 0.4.6", + "hyper 0.14.31", ++ "hyper-rustls 0.24.2", + "hyper-tls 0.5.0", + "ipnet", + "js-sys", +@@ -5612,6 +5931,7 @@ dependencies = [ + "once_cell", + "percent-encoding", + "pin-project-lite", ++ "rustls 0.21.12", + "rustls-pemfile 1.0.4", + "serde", + "serde_json", +@@ -5620,11 +5940,13 @@ dependencies = [ + "system-configuration 0.5.1", + "tokio", + "tokio-native-tls", ++ "tokio-rustls 0.24.1", + "tower-service", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", ++ "webpki-roots", + "winreg", + ] + +@@ -5682,7 +6004,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "7743f17af12fa0b03b803ba12cd6a8d9483a587e89c69445e3909655c0b9fabb" + dependencies = [ + "crypto-bigint 0.4.9", +- "hmac 0.12.1", ++ "hmac", + "zeroize", + ] + +@@ -5710,6 +6032,26 @@ dependencies = [ + "windows-sys 0.52.0", + ] + ++[[package]] ++name = "rsa" ++version = "0.9.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "47c75d7c5c6b673e58bf54d8544a9f432e3a925b0e80f7cd3602ab5c50c55519" ++dependencies = [ ++ "const-oid", ++ "digest", ++ "num-bigint-dig", ++ "num-integer", ++ "num-traits", ++ "pkcs1", ++ "pkcs8 0.10.2", ++ "rand_core", ++ "signature 2.2.0", ++ "spki 0.7.3", ++ "subtle", ++ "zeroize", ++] ++ + [[package]] + name = "rtcp-types" + version = "0.1.0" +@@ -5759,6 +6101,12 @@ version = "0.1.24" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" + ++[[package]] ++name = "rustc-hash" ++version = "1.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" ++ + [[package]] + name = "rustc-hash" + version = "2.0.0" +@@ -5823,12 +6171,28 @@ dependencies = [ + "sct", + ] + ++[[package]] ++name = "rustls" ++version = "0.22.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "bf4ef73721ac7bcd79b2b315da7779d8fc09718c6b3d2d1b2d94850eb8c18432" ++dependencies = [ ++ "log", ++ "ring", ++ "rustls-pki-types", ++ "rustls-webpki 0.102.8", ++ "subtle", ++ "zeroize", ++] ++ + [[package]] + name = "rustls" + version = "0.23.16" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "eee87ff5d9b36712a58574e12e9f0ea80f915a5b0ac518d322b24a465617925e" + dependencies = [ ++ "aws-lc-rs", ++ "log", + "once_cell", + "ring", + "rustls-pki-types", +@@ -5846,7 +6210,32 @@ dependencies = [ + "openssl-probe", + "rustls-pemfile 1.0.4", + "schannel", +- "security-framework", ++ "security-framework 2.11.1", ++] ++ ++[[package]] ++name = "rustls-native-certs" ++version = "0.7.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e5bfb394eeed242e909609f56089eecfe5fda225042e8b171791b9c95f5931e5" ++dependencies = [ ++ "openssl-probe", ++ "rustls-pemfile 2.2.0", ++ "rustls-pki-types", ++ "schannel", ++ "security-framework 2.11.1", ++] ++ ++[[package]] ++name = "rustls-native-certs" ++version = "0.8.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7fcff2dd52b58a8d98a70243663a0d234c4e2b79235637849d15913394a247d3" ++dependencies = [ ++ "openssl-probe", ++ "rustls-pki-types", ++ "schannel", ++ "security-framework 3.1.0", + ] + + [[package]] +@@ -5889,11 +6278,18 @@ version = "0.102.8" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9" + dependencies = [ ++ "aws-lc-rs", + "ring", + "rustls-pki-types", + "untrusted", + ] + ++[[package]] ++name = "rustversion" ++version = "1.0.19" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f7c45b9784283f1b2e7fb61b42047c2fd678ef0960d4f6f1eba131594cc369d4" ++ + [[package]] + name = "ryu" + version = "1.0.18" +@@ -5972,9 +6368,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "3be24c1842290c45df0a7bf069e0c268a747ad05a192f2fd7dcfdbc1cba40928" + dependencies = [ + "base16ct", +- "der", ++ "der 0.6.1", + "generic-array", +- "pkcs8", ++ "pkcs8 0.9.0", + "subtle", + "zeroize", + ] +@@ -5986,7 +6382,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" + dependencies = [ + "bitflags 2.6.0", +- "core-foundation", ++ "core-foundation 0.9.4", ++ "core-foundation-sys", ++ "libc", ++ "security-framework-sys", ++] ++ ++[[package]] ++name = "security-framework" ++version = "3.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "81d3f8c9bfcc3cbb6b0179eb57042d75b1582bdc65c3cb95f3fa999509c03cbc" ++dependencies = [ ++ "bitflags 2.6.0", ++ "core-foundation 0.10.0", + "core-foundation-sys", + "libc", + "security-framework-sys", +@@ -5994,9 +6403,9 @@ dependencies = [ + + [[package]] + name = "security-framework-sys" +-version = "2.12.0" ++version = "2.13.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "ea4a292869320c0272d7bc55a5a6aafaff59b4f63404a003887b679a2e05b4b6" ++checksum = "1863fd3768cd83c56a7f60faa4dc0d403f1b6df0a38c3c25f44b7894e45370d5" + dependencies = [ + "core-foundation-sys", + "libc", +@@ -6135,19 +6544,6 @@ dependencies = [ + "syn 2.0.86", + ] + +-[[package]] +-name = "sha-1" +-version = "0.9.8" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "99cd6713db3cf16b6c84e06321e049a9b9f699826e16096d23bbcc44d15d51a6" +-dependencies = [ +- "block-buffer 0.9.0", +- "cfg-if", +- "cpufeatures", +- "digest 0.9.0", +- "opaque-debug", +-] +- + [[package]] + name = "sha1" + version = "0.10.6" +@@ -6156,7 +6552,7 @@ checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" + dependencies = [ + "cfg-if", + "cpufeatures", +- "digest 0.10.7", ++ "digest", + ] + + [[package]] +@@ -6167,7 +6563,7 @@ checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" + dependencies = [ + "cfg-if", + "cpufeatures", +- "digest 0.10.7", ++ "digest", + ] + + [[package]] +@@ -6225,7 +6621,17 @@ version = "1.6.4" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c" + dependencies = [ +- "digest 0.10.7", ++ "digest", ++ "rand_core", ++] ++ ++[[package]] ++name = "signature" ++version = "2.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de" ++dependencies = [ ++ "digest", + "rand_core", + ] + +@@ -6296,6 +6702,15 @@ dependencies = [ + "lock_api", + ] + ++[[package]] ++name = "spinning_top" ++version = "0.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d96d2d1d716fb500937168cc09353ffdc7a012be8475ac7308e1bdf0e3923300" ++dependencies = [ ++ "lock_api", ++] ++ + [[package]] + name = "spki" + version = "0.6.0" +@@ -6303,7 +6718,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "67cf02bbac7a337dc36e4f5a693db6c21e7863f45070f7064577eb4367a3212b" + dependencies = [ + "base64ct", +- "der", ++ "der 0.6.1", ++] ++ ++[[package]] ++name = "spki" ++version = "0.7.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d" ++dependencies = [ ++ "base64ct", ++ "der 0.7.9", + ] + + [[package]] +@@ -6345,6 +6770,90 @@ version = "2.6.1" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" + ++[[package]] ++name = "symphonia" ++version = "0.5.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "815c942ae7ee74737bb00f965fa5b5a2ac2ce7b6c01c0cc169bbeaf7abd5f5a9" ++dependencies = [ ++ "lazy_static", ++ "symphonia-bundle-mp3", ++ "symphonia-codec-vorbis", ++ "symphonia-core", ++ "symphonia-format-ogg", ++ "symphonia-metadata", ++] ++ ++[[package]] ++name = "symphonia-bundle-mp3" ++version = "0.5.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c01c2aae70f0f1fb096b6f0ff112a930b1fb3626178fba3ae68b09dce71706d4" ++dependencies = [ ++ "lazy_static", ++ "log", ++ "symphonia-core", ++ "symphonia-metadata", ++] ++ ++[[package]] ++name = "symphonia-codec-vorbis" ++version = "0.5.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5a98765fb46a0a6732b007f7e2870c2129b6f78d87db7987e6533c8f164a9f30" ++dependencies = [ ++ "log", ++ "symphonia-core", ++ "symphonia-utils-xiph", ++] ++ ++[[package]] ++name = "symphonia-core" ++version = "0.5.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "798306779e3dc7d5231bd5691f5a813496dc79d3f56bf82e25789f2094e022c3" ++dependencies = [ ++ "arrayvec", ++ "bitflags 1.3.2", ++ "bytemuck", ++ "lazy_static", ++ "log", ++] ++ ++[[package]] ++name = "symphonia-format-ogg" ++version = "0.5.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ada3505789516bcf00fc1157c67729eded428b455c27ca370e41f4d785bfa931" ++dependencies = [ ++ "log", ++ "symphonia-core", ++ "symphonia-metadata", ++ "symphonia-utils-xiph", ++] ++ ++[[package]] ++name = "symphonia-metadata" ++version = "0.5.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "bc622b9841a10089c5b18e99eb904f4341615d5aa55bbf4eedde1be721a4023c" ++dependencies = [ ++ "encoding_rs", ++ "lazy_static", ++ "log", ++ "symphonia-core", ++] ++ ++[[package]] ++name = "symphonia-utils-xiph" ++version = "0.5.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "484472580fa49991afda5f6550ece662237b00c6f562c7d9638d1b086ed010fe" ++dependencies = [ ++ "symphonia-core", ++ "symphonia-metadata", ++] ++ + [[package]] + name = "syn" + version = "1.0.109" +@@ -6382,6 +6891,19 @@ dependencies = [ + "futures-core", + ] + ++[[package]] ++name = "sysinfo" ++version = "0.31.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "355dbe4f8799b304b05e1b0f05fc59b2a18d36645cf169607da45bde2f69a1be" ++dependencies = [ ++ "core-foundation-sys", ++ "libc", ++ "memchr", ++ "ntapi", ++ "windows", ++] ++ + [[package]] + name = "system-configuration" + version = "0.5.1" +@@ -6389,7 +6911,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" + dependencies = [ + "bitflags 1.3.2", +- "core-foundation", ++ "core-foundation 0.9.4", + "system-configuration-sys 0.5.0", + ] + +@@ -6400,7 +6922,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "3c879d448e9d986b661742763247d3693ed13609438cf3d006f51f5368a5ba6b" + dependencies = [ + "bitflags 2.6.0", +- "core-foundation", ++ "core-foundation 0.9.4", + "system-configuration-sys 0.6.0", + ] + +@@ -6563,7 +7085,9 @@ checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" + dependencies = [ + "deranged", + "itoa", ++ "libc", + "num-conv", ++ "num_threads", + "powerfmt", + "serde", + "time-core", +@@ -6650,6 +7174,17 @@ dependencies = [ + "tokio", + ] + ++[[package]] ++name = "tokio-rustls" ++version = "0.25.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f" ++dependencies = [ ++ "rustls 0.22.4", ++ "rustls-pki-types", ++ "tokio", ++] ++ + [[package]] + name = "tokio-rustls" + version = "0.26.0" +@@ -6698,6 +7233,22 @@ dependencies = [ + "tungstenite 0.21.0", + ] + ++[[package]] ++name = "tokio-tungstenite" ++version = "0.24.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "edc5f74e248dc973e0dbb7b74c7e0d6fcc301c694ff50049504004ef4d0cdcd9" ++dependencies = [ ++ "futures-util", ++ "log", ++ "rustls 0.23.16", ++ "rustls-native-certs 0.8.1", ++ "rustls-pki-types", ++ "tokio", ++ "tokio-rustls 0.26.0", ++ "tungstenite 0.24.0", ++] ++ + [[package]] + name = "tokio-util" + version = "0.7.12" +@@ -6882,6 +7433,8 @@ dependencies = [ + "log", + "native-tls", + "rand", ++ "rustls 0.23.16", ++ "rustls-pki-types", + "sha1", + "thiserror", + "url", +@@ -6948,6 +7501,7 @@ dependencies = [ + "form_urlencoded", + "idna 0.5.0", + "percent-encoding", ++ "serde", + ] + + [[package]] +@@ -6984,6 +7538,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "f8c5f0a0af699448548ad1a2fbf920fb4bee257eae39953ba95cb84891a0446a" + dependencies = [ + "getrandom", ++ "rand", + ] + + [[package]] +@@ -7017,13 +7572,40 @@ checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" + + [[package]] + name = "vergen" +-version = "3.2.0" ++version = "9.0.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "e7141e445af09c8919f1d5f8a20dae0b20c3b57a45dee0d5823c6ed5d237f15a" ++checksum = "31f25fc8f8f05df455c7941e87f093ad22522a9ff33d7a027774815acf6f0639" + dependencies = [ +- "bitflags 1.3.2", +- "chrono", +- "rustc_version", ++ "anyhow", ++ "derive_builder", ++ "rustversion", ++ "time", ++ "vergen-lib", ++] ++ ++[[package]] ++name = "vergen-gitcl" ++version = "1.0.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0227006d09f98ab00ea69e9a5e055e676a813cfbed4232986176c86a6080b997" ++dependencies = [ ++ "anyhow", ++ "derive_builder", ++ "rustversion", ++ "time", ++ "vergen", ++ "vergen-lib", ++] ++ ++[[package]] ++name = "vergen-lib" ++version = "0.1.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c0c767e6751c09fc85cde58722cf2f1007e80e4c8d5a4321fc90d83dc54ca147" ++dependencies = [ ++ "anyhow", ++ "derive_builder", ++ "rustversion", + ] + + [[package]] +@@ -7190,12 +7772,40 @@ dependencies = [ + "ebml-iterable", + ] + ++[[package]] ++name = "webpki" ++version = "0.22.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ed63aea5ce73d0ff405984102c42de94fc55a6b75765d621c65262469b3c9b53" ++dependencies = [ ++ "ring", ++ "untrusted", ++] ++ ++[[package]] ++name = "webpki-roots" ++version = "0.25.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1" ++ + [[package]] + name = "weezl" + version = "0.1.8" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082" + ++[[package]] ++name = "which" ++version = "4.4.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7" ++dependencies = [ ++ "either", ++ "home", ++ "once_cell", ++ "rustix", ++] ++ + [[package]] + name = "winapi" + version = "0.3.9" +@@ -7227,6 +7837,16 @@ version = "0.4.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + ++[[package]] ++name = "windows" ++version = "0.57.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "12342cb4d8e3b046f3d80effd474a7a02447231330ef77d71daa6fbc40681143" ++dependencies = [ ++ "windows-core 0.57.0", ++ "windows-targets 0.52.6", ++] ++ + [[package]] + name = "windows-core" + version = "0.52.0" +@@ -7236,17 +7856,60 @@ dependencies = [ + "windows-targets 0.52.6", + ] + ++[[package]] ++name = "windows-core" ++version = "0.57.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d2ed2439a290666cd67ecce2b0ffaad89c2a56b976b736e6ece670297897832d" ++dependencies = [ ++ "windows-implement", ++ "windows-interface", ++ "windows-result 0.1.2", ++ "windows-targets 0.52.6", ++] ++ ++[[package]] ++name = "windows-implement" ++version = "0.57.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9107ddc059d5b6fbfbffdfa7a7fe3e22a226def0b2608f72e9d552763d3e1ad7" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn 2.0.86", ++] ++ ++[[package]] ++name = "windows-interface" ++version = "0.57.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "29bee4b38ea3cde66011baa44dba677c432a78593e202392d1e9070cf2a7fca7" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn 2.0.86", ++] ++ + [[package]] + name = "windows-registry" + version = "0.2.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "e400001bb720a623c1c69032f8e3e4cf09984deec740f007dd2b03ec864804b0" + dependencies = [ +- "windows-result", ++ "windows-result 0.2.0", + "windows-strings", + "windows-targets 0.52.6", + ] + ++[[package]] ++name = "windows-result" ++version = "0.1.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5e383302e8ec8515204254685643de10811af0ed97ea37210dc26fb0032647f8" ++dependencies = [ ++ "windows-targets 0.52.6", ++] ++ + [[package]] + name = "windows-result" + version = "0.2.0" +@@ -7262,7 +7925,7 @@ version = "0.1.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10" + dependencies = [ +- "windows-result", ++ "windows-result 0.2.0", + "windows-targets 0.52.6", + ] + +@@ -7480,16 +8143,6 @@ dependencies = [ + "time", + ] + +-[[package]] +-name = "zerocopy" +-version = "0.6.6" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "854e949ac82d619ee9a14c66a1b674ac730422372ccb759ce0c39cabcf2bf8e6" +-dependencies = [ +- "byteorder", +- "zerocopy-derive 0.6.6", +-] +- + [[package]] + name = "zerocopy" + version = "0.7.35" +@@ -7497,18 +8150,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" + dependencies = [ + "byteorder", +- "zerocopy-derive 0.7.35", +-] +- +-[[package]] +-name = "zerocopy-derive" +-version = "0.6.6" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "125139de3f6b9d625c39e2efdd73d41bdac468ccd556556440e322be0e1bbd91" +-dependencies = [ +- "proc-macro2", +- "quote", +- "syn 2.0.86", ++ "zerocopy-derive", + ] + + [[package]] +diff --git a/audio/spotify/Cargo.toml b/audio/spotify/Cargo.toml +index 593115bf..1c635312 100644 +--- a/audio/spotify/Cargo.toml ++++ b/audio/spotify/Cargo.toml +@@ -11,9 +11,9 @@ rust-version.workspace = true + [dependencies] + gst.workspace = true + gst-base.workspace = true +-librespot-core = "0.4" +-librespot-playback = "0.4" +-tokio = { version = "1", features = ["rt-multi-thread"] } ++librespot-core = "0.5" ++librespot-playback = { version = "0.5", features = ['passthrough-decoder'] } ++tokio = { version = "1.0", features = ["rt-multi-thread"] } + futures = "0.3" + anyhow = "1.0" + url = "2.3" +diff --git a/audio/spotify/README.md b/audio/spotify/README.md +index 98237747..2e364926 100644 +--- a/audio/spotify/README.md ++++ b/audio/spotify/README.md +@@ -9,23 +9,36 @@ to respect their legal/licensing restrictions. + ## Spotify Credentials + + This plugin requires a [Spotify Premium](https://www.spotify.com/premium/) account. +-If your account is linked with Facebook, you'll need to setup +-a [device username and password](https://www.spotify.com/us/account/set-device-password/). + +-Those username and password are then set using the `username` and `password` properties. ++Provide a Spotify access token with 'streaming' scope using the `access-token` property. Such a token can be obtained by completing ++[Spotify's OAuth flow](https://developer.spotify.com/documentation/web-api/concepts/authorization) or using the facility on their ++[Web SDK getting started guide](https://developer.spotify.com/documentation/web-playback-sdk/tutorials/getting-started). ++A token can also be obtained using [librespot-oauth](https://github.com/librespot-org/librespot/blob/dev/oauth/examples/oauth.rs): + +-You may also want to cache credentials and downloaded files, see the `cache-` properties on the element. ++```console ++cargo install librespot-oauth --example oauth && oauth ++``` ++ ++Note, Spotify access tokens are only valid for 1 hour and must be [refreshed](https://developer.spotify.com/documentation/web-api/tutorials/refreshing-tokens) ++for usage beyond that. ++ ++It is therefore advisable to also use the `cache-credentials` property. On first usage, your access token is exchanged for a reusable credentials blob and ++stored at the location specified by this property. Once obtained, that credentials blob is used for login and any provided `access-token` is ignored. ++Unlike Spotify access tokens, the user's credentials blob does not expire. Avoiding handling token refresh greatly simplifies plugin usage. ++If you do not set `cache-credentials`, you must manage refreshing your Spotify access token so it's valid for login when the element starts. ++ ++You may also want to cache downloaded files, see the `cache-files` property. + + ## spotifyaudiosrc + + The `spotifyaudiosrc` element can be used to play a song from Spotify using its [Spotify URI](https://community.spotify.com/t5/FAQs/What-s-a-Spotify-URI/ta-p/919201). + + ``` +-gst-launch-1.0 spotifyaudiosrc username=$USERNAME password=$PASSWORD track=spotify:track:3i3P1mGpV9eRlfKccjDjwi ! oggdemux ! vorbisdec ! audioconvert ! autoaudiosink ++gst-launch-1.0 spotifyaudiosrc access-token=$ACCESS_TOKEN track=spotify:track:3i3P1mGpV9eRlfKccjDjwi ! oggdemux ! vorbisdec ! audioconvert ! autoaudiosink + ``` + + The element also implements an URI handler which accepts credentials and cache settings as URI parameters: + + ```console +-gst-launch-1.0 playbin3 uri=spotify:track:3i3P1mGpV9eRlfKccjDjwi?username=$USERNAME\&password=$PASSWORD\&cache-credentials=cache\&cache-files=cache ++gst-launch-1.0 playbin3 uri=spotify:track:3i3P1mGpV9eRlfKccjDjwi?access-token=$ACCESS_TOKEN\&cache-credentials=cache\&cache-files=cache + ``` +\ No newline at end of file +diff --git a/audio/spotify/src/common.rs b/audio/spotify/src/common.rs +index ed77dcc6..a5764ef8 100644 +--- a/audio/spotify/src/common.rs ++++ b/audio/spotify/src/common.rs +@@ -18,8 +18,7 @@ use librespot_core::{ + + #[derive(Default, Debug, Clone)] + pub struct Settings { +- username: String, +- password: String, ++ access_token: String, + cache_credentials: String, + cache_files: String, + cache_max_size: u64, +@@ -28,52 +27,46 @@ pub struct Settings { + + impl Settings { + pub fn properties() -> Vec { +- vec![glib::ParamSpecString::builder("username") +- .nick("Username") +- .blurb("Spotify username, Facebook accounts need a device username from https://www.spotify.com/us/account/set-device-password/") +- .default_value(Some("")) +- .mutable_ready() +- .build(), +- glib::ParamSpecString::builder("password") +- .nick("Password") +- .blurb("Spotify password, Facebook accounts need a device password from https://www.spotify.com/us/account/set-device-password/") +- .default_value(Some("")) +- .mutable_ready() +- .build(), +- glib::ParamSpecString::builder("cache-credentials") +- .nick("Credentials cache") +- .blurb("Directory where to cache Spotify credentials") +- .default_value(Some("")) +- .mutable_ready() +- .build(), +- glib::ParamSpecString::builder("cache-files") +- .nick("Files cache") +- .blurb("Directory where to cache downloaded files from Spotify") +- .default_value(Some("")) +- .mutable_ready() +- .build(), +- glib::ParamSpecUInt64::builder("cache-max-size") +- .nick("Cache max size") +- .blurb("The max allowed size of the cache, in bytes, or 0 to disable the cache limit") +- .default_value(0) +- .mutable_ready() +- .build(), +- glib::ParamSpecString::builder("track") +- .nick("Spotify URI") +- .blurb("Spotify track URI, in the form 'spotify:track:$SPOTIFY_ID'") +- .default_value(Some("")) +- .mutable_ready() +- .build(), +- ] ++ vec![ ++ glib::ParamSpecString::builder("access-token") ++ .nick("Access token") ++ .blurb("Spotify access token, requires 'streaming' scope") ++ .default_value(Some("")) ++ .mutable_ready() ++ .build(), ++ glib::ParamSpecString::builder("cache-credentials") ++ .nick("Credentials cache") ++ .blurb("Directory where to cache Spotify credentials") ++ .default_value(Some("")) ++ .mutable_ready() ++ .build(), ++ glib::ParamSpecString::builder("cache-files") ++ .nick("Files cache") ++ .blurb("Directory where to cache downloaded files from Spotify") ++ .default_value(Some("")) ++ .mutable_ready() ++ .build(), ++ glib::ParamSpecUInt64::builder("cache-max-size") ++ .nick("Cache max size") ++ .blurb( ++ "The max allowed size of the cache, in bytes, or 0 to disable the cache limit", ++ ) ++ .default_value(0) ++ .mutable_ready() ++ .build(), ++ glib::ParamSpecString::builder("track") ++ .nick("Spotify URI") ++ .blurb("Spotify track URI, in the form 'spotify:track:$SPOTIFY_ID'") ++ .default_value(Some("")) ++ .mutable_ready() ++ .build(), ++ ] + } + + pub fn set_property(&mut self, value: &glib::Value, pspec: &glib::ParamSpec) { + match pspec.name() { +- "username" => { +- self.username = value.get().expect("type checked upstream"); +- } +- "password" => { +- self.password = value.get().expect("type checked upstream"); ++ "access-token" => { ++ self.access_token = value.get().expect("type checked upstream"); + } + "cache-credentials" => { + self.cache_credentials = value.get().expect("type checked upstream"); +@@ -93,8 +86,7 @@ impl Settings { + + pub fn property(&self, pspec: &glib::ParamSpec) -> glib::Value { + match pspec.name() { +- "username" => self.username.to_value(), +- "password" => self.password.to_value(), ++ "access-token" => self.access_token.to_value(), + "cache-credentials" => self.cache_credentials.to_value(), + "cache-files" => self.cache_files.to_value(), + "cache-max-size" => self.cache_max_size.to_value(), +@@ -132,32 +124,20 @@ impl Settings { + let cache = Cache::new(credentials_cache, None, files_cache, max_size)?; + + if let Some(cached_cred) = cache.credentials() { +- if !self.username.is_empty() && self.username != cached_cred.username { +- gst::debug!( +- cat, +- obj = &src, +- "ignore cached credentials for user {} which mismatch user {}", +- cached_cred.username, +- self.username +- ); +- } else { +- gst::debug!( +- cat, +- obj = &src, +- "reuse cached credentials for user {}", +- cached_cred.username +- ); +- if let Ok((session, _credentials)) = Session::connect( +- SessionConfig::default(), +- cached_cred, +- Some(cache.clone()), +- true, +- ) +- .await +- { +- return Ok(session); +- } +- } ++ let cached_username = cached_cred ++ .username ++ .as_ref() ++ .map_or("UNKNOWN", |s| s.as_str()); ++ gst::debug!( ++ cat, ++ obj = &src, ++ "reuse cached credentials for user {}", ++ cached_username ++ ); ++ ++ let session = Session::new(SessionConfig::default(), Some(cache)); ++ session.connect(cached_cred, true).await?; ++ return Ok(session); + } + + gst::debug!( +@@ -166,17 +146,14 @@ impl Settings { + "credentials not in cache or cached credentials invalid", + ); + +- if self.username.is_empty() { +- bail!("username is not set and credentials are not in cache"); +- } +- if self.password.is_empty() { +- bail!("password is not set and credentials are not in cache"); ++ if self.access_token.is_empty() { ++ bail!("access-token is not set and credentials are not in cache"); + } + +- let cred = Credentials::with_password(&self.username, &self.password); ++ let cred = Credentials::with_access_token(&self.access_token); + +- let (session, _credentials) = +- Session::connect(SessionConfig::default(), cred, Some(cache), true).await?; ++ let session = Session::new(SessionConfig::default(), Some(cache)); ++ session.connect(cred, true).await?; + + Ok(session) + } +@@ -185,9 +162,7 @@ impl Settings { + if self.track.is_empty() { + bail!("track is not set"); + } +- let track = SpotifyId::from_uri(&self.track).map_err(|_| { +- anyhow::anyhow!("failed to create Spotify URI from track {}", self.track) +- })?; ++ let track = SpotifyId::from_uri(&self.track)?; + + Ok(track) + } +diff --git a/audio/spotify/src/spotifyaudiosrc/imp.rs b/audio/spotify/src/spotifyaudiosrc/imp.rs +index 6f429682..932f5a9f 100644 +--- a/audio/spotify/src/spotifyaudiosrc/imp.rs ++++ b/audio/spotify/src/spotifyaudiosrc/imp.rs +@@ -52,7 +52,7 @@ enum Message { + } + + struct State { +- player: Player, ++ player: Arc, + + /// receiver sending buffer to streaming thread + receiver: mpsc::Receiver, +@@ -321,11 +321,10 @@ struct BufferSink { + + impl Sink for BufferSink { + fn write(&mut self, packet: AudioPacket, _converter: &mut Converter) -> SinkResult<()> { +- let oggdata = match packet { +- AudioPacket::OggData(data) => data, +- AudioPacket::Samples(_) => unimplemented!(), ++ let buffer = match packet { ++ AudioPacket::Samples(_) => unreachable!(), ++ AudioPacket::Raw(ogg) => gst::Buffer::from_slice(ogg), + }; +- let buffer = gst::Buffer::from_slice(oggdata); + + // ignore if sending fails as that means the source element is being shutdown + let _ = self.sender.send(Message::Buffer(buffer)); +@@ -360,7 +359,7 @@ impl URIHandlerImpl for SpotifyAudioSrc { + // allow to configure auth and cache settings from the URI + for (key, value) in url.query_pairs() { + match key.as_ref() { +- "username" | "password" | "cache-credentials" | "cache-files" => { ++ "access-token" | "cache-credentials" | "cache-files" => { + self.obj().set_property(&key, value.as_ref()); + } + _ => { +@@ -435,10 +434,10 @@ impl SpotifyAudioSrc { + let (sender, receiver) = mpsc::sync_channel(2); + let sender_clone = sender.clone(); + +- let (mut player, mut player_event_channel) = +- Player::new(player_config, session, Box::new(NoOpVolume), || { +- Box::new(BufferSink { sender }) +- }); ++ let player = Player::new(player_config, session, Box::new(NoOpVolume), || { ++ Box::new(BufferSink { sender }) ++ }); ++ let mut player_event_channel = player.get_player_event_channel(); + + player.load(track, true, 0); + +diff --git a/docs/plugins/gst_plugins_cache.json b/docs/plugins/gst_plugins_cache.json +index ac1f6425..bcc97f78 100644 +--- a/docs/plugins/gst_plugins_cache.json ++++ b/docs/plugins/gst_plugins_cache.json +@@ -11245,6 +11245,18 @@ + } + }, + "properties": { ++ "access-token": { ++ "blurb": "Spotify access token, requires 'streaming' scope", ++ "conditionally-available": false, ++ "construct": false, ++ "construct-only": false, ++ "controllable": false, ++ "default": "", ++ "mutable": "ready", ++ "readable": true, ++ "type": "gchararray", ++ "writable": true ++ }, + "bitrate": { + "blurb": "Spotify audio bitrate in kbit/s", + "conditionally-available": false, +-- +2.47.0 + diff --git a/pkgs/applications/audio/mopidy/spotify.nix b/pkgs/applications/audio/mopidy/spotify.nix index d719a03c7cff..876f6c2d67c7 100644 --- a/pkgs/applications/audio/mopidy/spotify.nix +++ b/pkgs/applications/audio/mopidy/spotify.nix @@ -8,14 +8,14 @@ pythonPackages.buildPythonApplication rec { pname = "mopidy-spotify"; - version = "5.0.0a2"; + version = "5.0.0a3"; pyproject = true; src = fetchFromGitHub { owner = "mopidy"; repo = "mopidy-spotify"; rev = "refs/tags/v${version}"; - hash = "sha256-QeABG9rQKJ8sIoK38R74N0s5rRG+zws7AZR0xPysdcY="; + hash = "sha256-pM+kqeWYiPXv9DZDBTgwiEwC6Sbqv6uz5vJ5odcixOw="; }; build-system = [ pythonPackages.setuptools ]; diff --git a/pkgs/applications/audio/reaper/default.nix b/pkgs/applications/audio/reaper/default.nix index 047ad7d2c7cb..22019815da3a 100644 --- a/pkgs/applications/audio/reaper/default.nix +++ b/pkgs/applications/audio/reaper/default.nix @@ -85,6 +85,7 @@ stdenv.mkDerivation rec { ++ lib.optional pulseaudioSupport libpulseaudio; dontBuild = true; + dontStrip = true; installPhase = if stdenv.hostPlatform.isDarwin then diff --git a/pkgs/applications/audio/seq66/default.nix b/pkgs/applications/audio/seq66/default.nix index d29fb195caa4..e5a3d4459cc1 100644 --- a/pkgs/applications/audio/seq66/default.nix +++ b/pkgs/applications/audio/seq66/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "seq66"; - version = "0.99.16"; + version = "0.99.17"; src = fetchFromGitHub { owner = "ahlstromcj"; repo = "seq66"; rev = version; - hash = "sha256-HXmpAgztIr6fUdksBPyLli/eMoD3Xlfs+UhHvfrZe0U="; + hash = "sha256-xGJL6fAk4wTOPI7k3mA0DbVh51dru4gxaJlad00hBiM="; }; nativeBuildInputs = [ autoreconfHook pkg-config qttools which wrapQtAppsHook ]; diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix index 0682e0edac14..cf1c84b3fd8b 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix @@ -31,13 +31,13 @@ let in melpaBuild { pname = "lsp-bridge"; - version = "0-unstable-2025-01-11"; + version = "0-unstable-2025-01-22"; src = fetchFromGitHub { owner = "manateelazycat"; repo = "lsp-bridge"; - rev = "6fd5eb21a174e6a04247a2f370b544dcd6cb2420"; - hash = "sha256-+E1l0Ea0Db5ksX9tDW+cvNUMjT4be5i9qcI/rIvFKbY="; + rev = "c87e6ac6d452b3bd94583a5c5edb16f37edadb94"; + hash = "sha256-+6qU8KGdti/pji1d+024bnT7+oFP5Ve3jToURautKzE="; }; patches = [ diff --git a/pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix index 9fcd587ae0fc..b94df5bb8dfd 100644 --- a/pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix +++ b/pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix @@ -10,18 +10,18 @@ vimUtils, }: let - version = "0.0.14"; + version = "0.0.15"; src = fetchFromGitHub { owner = "yetone"; repo = "avante.nvim"; tag = "v${version}"; - hash = "sha256-0dkPejvupXhVZY/5qT45f4LZ4MIVcz8uZam+9TmB+Yo="; + hash = "sha256-REFF+4U0AjNwiK1ecbDPwF7C1jKRzITV29aolx+HI24="; }; avante-nvim-lib = rustPlatform.buildRustPackage { pname = "avante-nvim-lib"; inherit version src; - cargoHash = "sha256-80++U7CIu6QtH1jQCHCEpv2tnYOuoWSczZIUmKyrqJE="; + cargoHash = "sha256-7W7uuyzqTTlvZAkeRYRIfkxYVbOv5h7elH8noZe1VMQ="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/applications/editors/vim/plugins/non-generated/cord-nvim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/cord-nvim/default.nix index b60067186f3d..f2ebf27db899 100644 --- a/pkgs/applications/editors/vim/plugins/non-generated/cord-nvim/default.nix +++ b/pkgs/applications/editors/vim/plugins/non-generated/cord-nvim/default.nix @@ -7,19 +7,19 @@ vimUtils, }: let - version = "0-unstable-2024-12-17"; + version = "1.0.0"; src = fetchFromGitHub { owner = "vyfor"; repo = "cord.nvim"; - rev = "c82ab475e7bb198d6fac20833a3468de1a1d14d0"; - hash = "sha256-GVy8q9Fxb3mzx6mUQyIMumjnwZ7W08dPz1O3ckzVvdE="; + tag = "v${version}"; + hash = "sha256-rA3R9SO3QRLGBVHlT5NZLtQw+EmkkmSDO/K6DdNtfBI="; }; extension = if stdenv.hostPlatform.isDarwin then "dylib" else "so"; cord-nvim-rust = rustPlatform.buildRustPackage { pname = "cord.nvim-rust"; inherit version src; - cargoHash = "sha256-unE600Uo8fXaFV0UWRhBenhQaXftDH7K+HyQ/9xo7JY="; + cargoHash = "sha256-wYXJ4+8b3PtHzL2jdplNHrjIBzbAzA7jdvLZ7Vz+Yz8="; installPhase = let @@ -56,7 +56,6 @@ vimUtils.buildVimPlugin { passthru = { updateScript = nix-update-script { - extraArgs = [ "--version=branch" ]; attrPath = "vimPlugins.cord-nvim.cord-nvim-rust"; }; diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 3a7d09a05c2b..3a4a86852d42 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -3907,8 +3907,6 @@ let }; }; - nvarner.typst-lsp = callPackage ./nvarner.typst-lsp { }; - ocamllabs.ocaml-platform = buildVscodeMarketplaceExtension { meta = { changelog = "https://marketplace.visualstudio.com/items/ocamllabs.ocaml-platform/changelog"; diff --git a/pkgs/applications/editors/vscode/extensions/nvarner.typst-lsp/default.nix b/pkgs/applications/editors/vscode/extensions/nvarner.typst-lsp/default.nix deleted file mode 100644 index 13fdcef74019..000000000000 --- a/pkgs/applications/editors/vscode/extensions/nvarner.typst-lsp/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ - jq, - lib, - moreutils, - typst-lsp, - vscode-utils, -}: - -vscode-utils.buildVscodeMarketplaceExtension { - mktplcRef = { - name = "typst-lsp"; - publisher = "nvarner"; - # Please update the corresponding binary (typst-lsp) when updating - # this extension. - version = "0.13.0"; - hash = "sha256-xiFUJymZOTEqlGvCHvLiI0pVg7NLgIXhZ7x8yx+a5mY="; - }; - - nativeBuildInputs = [ - jq - moreutils - ]; - - buildInputs = [ typst-lsp ]; - - postInstall = '' - cd "$out/$installPrefix" - jq '.contributes.configuration.properties."typst-lsp.serverPath".default = "${lib.getExe typst-lsp}"' package.json | sponge package.json - ''; - - meta = { - changelog = "https://marketplace.visualstudio.com/items/nvarner.typst-lsp/changelog"; - description = "VSCode extension for providing a language server for Typst"; - downloadPage = "https://marketplace.visualstudio.com/items?itemName=nvarner.typst-lsp"; - homepage = "https://github.com/nvarner/typst-lsp"; - license = lib.licenses.mit; - maintainers = [ lib.maintainers.drupol ]; - }; -} diff --git a/pkgs/applications/editors/vscode/extensions/timonwong.shellcheck/default.nix b/pkgs/applications/editors/vscode/extensions/timonwong.shellcheck/default.nix index a2761b16a7b6..4b3fae6e9d53 100644 --- a/pkgs/applications/editors/vscode/extensions/timonwong.shellcheck/default.nix +++ b/pkgs/applications/editors/vscode/extensions/timonwong.shellcheck/default.nix @@ -10,8 +10,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "shellcheck"; publisher = "timonwong"; - version = "0.37.4"; - sha256 = "sha256-+DFoHjb5sl9s5Vqw7onsv+MKjS4+loGVnZsF9/e+7dQ="; + version = "0.37.6"; + sha256 = "sha256-xfVKI+xxA/8YUcCWpskxZLbBLPsYCF46iKJkrV2zODs="; }; nativeBuildInputs = [ jq diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix index fdc8c05b090b..c9c690403163 100644 --- a/pkgs/applications/editors/vscode/vscodium.nix +++ b/pkgs/applications/editors/vscode/vscodium.nix @@ -26,11 +26,11 @@ let sha256 = { - x86_64-linux = "04q9jm91idlbqsyfjr194i3xayyind67hyk59x4wrmg25sdqa0km"; - x86_64-darwin = "0a31fjsdx671crd9hs1c9vpqbnskgh57pq4j810v722rmfawn7g0"; - aarch64-linux = "0i3kx0xsb920f2xnf1xxhf4415xnyljfmah222ikhf6q1lp8dkqd"; - aarch64-darwin = "068h94fxdafgm7l0z9dvhlmmixp7w8nmll4rzm06i8s3243fzb84"; - armv7l-linux = "1bqnrgd1ykn67gvscsbkv82bydpmfjq1pn0951iiv2sy4m1g9flr"; + x86_64-linux = "1l8w890xb3hszz1xf17xh1h8w0n2vcxc2jg3w1yzlx06rdb8bdy5"; + x86_64-darwin = "1pb8i73bnpgcxzjdbcnb0cgjzr07a8pkb204m1w0zgl4ffjfhak0"; + aarch64-linux = "0qkjrnhafbdam068gz8fzwpjb6cc3r70m9n11rkcw50i3m4gljrh"; + aarch64-darwin = "0y3wwzpqwx6hk3rpnjjj8w3la6hw0g1y1fxw73paj9zcsmmz9l0a"; + armv7l-linux = "053zkdjdvgmibqdd8jwr7msf9awdblqcxkim0wq1zxjxq5xnzz8j"; } .${system} or throwSystem; @@ -41,7 +41,7 @@ callPackage ./generic.nix rec { # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.96.2.24355"; + version = "1.96.4.25017"; pname = "vscodium"; executableName = "codium"; diff --git a/pkgs/applications/emulators/libretro/cores/bsnes.nix b/pkgs/applications/emulators/libretro/cores/bsnes.nix index eecae32a0d18..fbe23e9e5da5 100644 --- a/pkgs/applications/emulators/libretro/cores/bsnes.nix +++ b/pkgs/applications/emulators/libretro/cores/bsnes.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "bsnes"; - version = "0-unstable-2025-01-10"; + version = "0-unstable-2025-01-17"; src = fetchFromGitHub { owner = "libretro"; repo = "bsnes-libretro"; - rev = "1e0054da1c158857dc444b9b52273ddd18858d49"; - hash = "sha256-zm4X5RTaAm2njtvCBWBT1vhtf/YQvoBaaBSMzz9D2aQ="; + rev = "05e820a436d2e2cbbb1b871400f84a96e76e2359"; + hash = "sha256-jq1W1OrltfTc4WEnEDZSNQUPSWfnUtzrOtiA4fzlIpk="; }; makefile = "Makefile"; diff --git a/pkgs/applications/emulators/libretro/cores/gambatte.nix b/pkgs/applications/emulators/libretro/cores/gambatte.nix index 6488f61c6895..9442d5d2c4a3 100644 --- a/pkgs/applications/emulators/libretro/cores/gambatte.nix +++ b/pkgs/applications/emulators/libretro/cores/gambatte.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "gambatte"; - version = "0-unstable-2025-01-10"; + version = "0-unstable-2025-01-24"; src = fetchFromGitHub { owner = "libretro"; repo = "gambatte-libretro"; - rev = "36a0da43fe6a82aba6acc5336574dbd749b18fa8"; - hash = "sha256-3PM7PK1ouMObNZEIIIBG8gxIydYFKP9RRGlWBr5PIGU="; + rev = "cd1e180b1edf6e6853cf4d501adac0538076de34"; + hash = "sha256-NwxditChigU8dUhmv6pnoreG1kp7cZlLBTAexNqbiAo="; }; meta = { diff --git a/pkgs/applications/emulators/libretro/cores/genesis-plus-gx.nix b/pkgs/applications/emulators/libretro/cores/genesis-plus-gx.nix index 212b3c55587b..7372326c2696 100644 --- a/pkgs/applications/emulators/libretro/cores/genesis-plus-gx.nix +++ b/pkgs/applications/emulators/libretro/cores/genesis-plus-gx.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "genesis-plus-gx"; - version = "0-unstable-2025-01-10"; + version = "0-unstable-2025-01-17"; src = fetchFromGitHub { owner = "libretro"; repo = "Genesis-Plus-GX"; - rev = "bf492bf3532b9d30e7a023e4329e202b15169e1c"; - hash = "sha256-QxplBzath9xN0AaFOT8K0dVEnMnTaZpLfdsX81fmP9g="; + rev = "8ea39eefc76bd97331c0da9efbac6ff343704a95"; + hash = "sha256-BZHZ5aixtivkxI+1Fpo/ziykIQFM27UtF4hLGOrQ4cQ="; }; meta = { diff --git a/pkgs/applications/emulators/libretro/cores/gpsp.nix b/pkgs/applications/emulators/libretro/cores/gpsp.nix index eb93437d04cd..2b86c4bd0e2a 100644 --- a/pkgs/applications/emulators/libretro/cores/gpsp.nix +++ b/pkgs/applications/emulators/libretro/cores/gpsp.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "gpsp"; - version = "0-unstable-2024-12-26"; + version = "0-unstable-2025-01-20"; src = fetchFromGitHub { owner = "libretro"; repo = "gpsp"; - rev = "66ced08c693094f2eaefed5e11bd596c41028959"; - hash = "sha256-gXk9T62wns7QixY98RSjfM/OW6SfH8N3NcjZ328WSAM="; + rev = "b0d5d27ae51c23f514974ddffa5760f1e1d05d9b"; + hash = "sha256-e2U1xEshoPJlaVUEbqNZIayNaSdDC65hE1VrvxvQSx0="; }; makefile = "Makefile"; diff --git a/pkgs/applications/emulators/libretro/cores/mame2003-plus.nix b/pkgs/applications/emulators/libretro/cores/mame2003-plus.nix index 2139a23b668d..d401bf34b326 100644 --- a/pkgs/applications/emulators/libretro/cores/mame2003-plus.nix +++ b/pkgs/applications/emulators/libretro/cores/mame2003-plus.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "mame2003-plus"; - version = "0-unstable-2025-01-13"; + version = "0-unstable-2025-01-24"; src = fetchFromGitHub { owner = "libretro"; repo = "mame2003-plus-libretro"; - rev = "0fcccae96eb722d58be329977eb49173c5c97981"; - hash = "sha256-Dt9MVWSe9ykNUasEgANsKYuXdqD3cGuM5jQCyD1iSY0="; + rev = "cea00d3aa54e61c929e8e205454793f45472c46d"; + hash = "sha256-v/L9qEhsymWfpep3YKwLiS2OBC3OBCIVpXOZatLGpN4="; }; makefile = "Makefile"; diff --git a/pkgs/applications/emulators/libretro/cores/nestopia.nix b/pkgs/applications/emulators/libretro/cores/nestopia.nix index abb82b387614..91b6b2a1fb56 100644 --- a/pkgs/applications/emulators/libretro/cores/nestopia.nix +++ b/pkgs/applications/emulators/libretro/cores/nestopia.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "nestopia"; - version = "0-unstable-2025-01-05"; + version = "0-unstable-2025-01-19"; src = fetchFromGitHub { owner = "libretro"; repo = "nestopia"; - rev = "9762adc00668f3a2e1016f3ad07ff9cbf9d67459"; - hash = "sha256-CLEwhQ91dxoTLyhlQwssoCL/dEqY6SetwWLogfJi8RU="; + rev = "5b56b6b98ed5f0d7871be4c957fc9d39a608a7c0"; + hash = "sha256-SBVvfrIaXFx984PG4pG1CE0xsTVypOfn/kCvWSgtZSA="; }; makefile = "Makefile"; diff --git a/pkgs/applications/emulators/libretro/cores/puae.nix b/pkgs/applications/emulators/libretro/cores/puae.nix index aabeb76ee711..6512b5bd64ee 100644 --- a/pkgs/applications/emulators/libretro/cores/puae.nix +++ b/pkgs/applications/emulators/libretro/cores/puae.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "puae"; - version = "0-unstable-2025-01-11"; + version = "0-unstable-2025-01-24"; src = fetchFromGitHub { owner = "libretro"; repo = "libretro-uae"; - rev = "67785f95db6e96dc081a2207751ab98b06b422ab"; - hash = "sha256-jJ1yki9uPutIdAI6TBKPWjiZc7W5K9n7P/oYA/UWJf4="; + rev = "9b05ecda81e14c0c5b2c5f6af8a65d034afd54a1"; + hash = "sha256-jBY+Xn9aR/lTyxFZlydWJA5+bpkaCcyCAiYG3fcmGmc="; }; makefile = "Makefile"; diff --git a/pkgs/applications/emulators/libretro/cores/swanstation.nix b/pkgs/applications/emulators/libretro/cores/swanstation.nix index 092060008072..3e8041379e41 100644 --- a/pkgs/applications/emulators/libretro/cores/swanstation.nix +++ b/pkgs/applications/emulators/libretro/cores/swanstation.nix @@ -6,13 +6,13 @@ }: mkLibretroCore { core = "swanstation"; - version = "0-unstable-2024-07-24"; + version = "0-unstable-2025-01-17"; src = fetchFromGitHub { owner = "libretro"; repo = "swanstation"; - rev = "37cd87e14ca09ac1b558e5b2c7db4ad256865bbb"; - hash = "sha256-dNIxlTPoY4S6VMtTN22ti3DE4aU/8XN/XhAo3DMNR/E="; + rev = "10af0c78ba0e3516e70f4ed7c6020827bdb2647e"; + hash = "sha256-xxyWvsDF3FXTaP7GOGr9Zym0DgNZKJ4x9BDUgDzcHYA="; }; extraNativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/gis/qgis/unwrapped-ltr.nix b/pkgs/applications/gis/qgis/unwrapped-ltr.nix index d0490702c2e3..7080b25e8b77 100644 --- a/pkgs/applications/gis/qgis/unwrapped-ltr.nix +++ b/pkgs/applications/gis/qgis/unwrapped-ltr.nix @@ -82,14 +82,14 @@ let ]; in mkDerivation rec { - version = "3.34.14"; + version = "3.34.15"; pname = "qgis-ltr-unwrapped"; src = fetchFromGitHub { owner = "qgis"; repo = "QGIS"; rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}"; - hash = "sha256-4nptnzAvLOC8R1sqfdHJ4YYtotwcOARbu9fe4YKwIVM="; + hash = "sha256-TFnlQIizI+8CZgNpwkuipSCNT3OYIaOeoz6kIGcSYL4="; }; passthru = { diff --git a/pkgs/applications/gis/qgis/unwrapped.nix b/pkgs/applications/gis/qgis/unwrapped.nix index 50b8edba1ce1..36516f29bafc 100644 --- a/pkgs/applications/gis/qgis/unwrapped.nix +++ b/pkgs/applications/gis/qgis/unwrapped.nix @@ -80,14 +80,14 @@ let urllib3 ]; in mkDerivation rec { - version = "3.40.2"; + version = "3.40.3"; pname = "qgis-unwrapped"; src = fetchFromGitHub { owner = "qgis"; repo = "QGIS"; rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}"; - hash = "sha256-8bcCpNgw4FV++qye8G3QXA3k0QCgqByODzPUTw0VX/E="; + hash = "sha256-AUDohf71NIuEjFrzRQ8QsdvmEjYsZK9aI4j0msVJgcQ="; }; passthru = { diff --git a/pkgs/applications/graphics/f3d/default.nix b/pkgs/applications/graphics/f3d/default.nix index 924ff6866d92..4d1cb07a6e5a 100644 --- a/pkgs/applications/graphics/f3d/default.nix +++ b/pkgs/applications/graphics/f3d/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { pname = "f3d"; - version = "2.5.1"; + version = "3.0.0"; outputs = [ "out" ] ++ lib.optionals withManual [ "man" ]; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { owner = "f3d-app"; repo = "f3d"; tag = "v${version}"; - hash = "sha256-S3eigdW6rkDRSm4uCCTFHx5fhJGNVWpAAAKboougr08="; + hash = "sha256-mnDmo5qzdnElhvZwBmHL3xC2o8iLuvYyfZXHoaAUG08="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/graphics/krita/generic.nix b/pkgs/applications/graphics/krita/generic.nix index 1a1ba8e115fd..989bdb6fb02e 100644 --- a/pkgs/applications/graphics/krita/generic.nix +++ b/pkgs/applications/graphics/krita/generic.nix @@ -30,7 +30,7 @@ libkdcraw, lcms2, gsl, - openexr, + openexr_3, giflib, libjxl, mlt, @@ -105,7 +105,7 @@ mkDerivation rec { fribidi lcms2 gsl - openexr + openexr_3 lager libaom libheif @@ -132,9 +132,7 @@ mkDerivation rec { python3Packages.pyqt5 ]; - env.NIX_CFLAGS_COMPILE = toString ( - [ "-I${ilmbase.dev}/include/OpenEXR" ] ++ lib.optional stdenv.cc.isGNU "-Wno-deprecated-copy" - ); + env.NIX_CFLAGS_COMPILE = toString (lib.optional stdenv.cc.isGNU "-Wno-deprecated-copy"); # Krita runs custom python scripts in CMake with custom PYTHONPATH which krita determined in their CMake script. # Patch the PYTHONPATH so python scripts can import sip successfully. diff --git a/pkgs/applications/graphics/paraview/default.nix b/pkgs/applications/graphics/paraview/default.nix index 4ff64094af80..b41e63e2c2df 100644 --- a/pkgs/applications/graphics/paraview/default.nix +++ b/pkgs/applications/graphics/paraview/default.nix @@ -26,13 +26,13 @@ }: let - version = "5.13.0"; + version = "5.13.2"; docFiles = [ (fetchurl { url = "https://www.paraview.org/paraview-downloads/download.php?submit=Download&version=v${lib.versions.majorMinor version}&type=data&os=Sources&downloadFile=ParaViewTutorial-${version}.pdf"; name = "Tutorial.pdf"; - hash = "sha256-hoCa/aTy2mmsPHP3Zm0hLZlZKbtUMpjUlc2rFKKChco="; + hash = "sha256-jJ6YUT2rgVExfKv900LbSO+MDQ4u73K7cBScHxWoP+g="; }) (fetchurl { url = "https://www.paraview.org/paraview-downloads/download.php?submit=Download&version=v${lib.versions.majorMinor version}&type=data&os=Sources&downloadFile=ParaViewGettingStarted-${version}.pdf"; @@ -42,7 +42,7 @@ let (fetchurl { url = "https://www.paraview.org/paraview-downloads/download.php?submit=Download&version=v${lib.versions.majorMinor version}&type=data&os=Sources&downloadFile=ParaViewCatalystGuide-${version}.pdf"; name = "CatalystGuide.pdf"; - hash = "sha256-t1lJ1Wiswhdxovt2O4sXTXfFxshDiZZVdnkXt/+BQn8="; + hash = "sha256-Pl7X5cBj3OralkOw5A29CtXnA+agYr6kWHf/+KZNHow="; }) ]; @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { owner = "paraview"; repo = "paraview"; rev = "v${version}"; - hash = "sha256-JRSuvBON2n0UnbrFia4Qmf6eYb1Mc+Z7dIcXSeUhpIc="; + hash = "sha256-29PLXVpvj8RLkSDWQgj5QjBZ6l1/0NoVx/qcJXOSssU="; fetchSubmodules = true; }; diff --git a/pkgs/applications/graphics/pineapple-pictures/default.nix b/pkgs/applications/graphics/pineapple-pictures/default.nix index 8f90d85dd7d1..86f8a6300d9e 100644 --- a/pkgs/applications/graphics/pineapple-pictures/default.nix +++ b/pkgs/applications/graphics/pineapple-pictures/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "pineapple-pictures"; - version = "0.9.0"; + version = "0.9.1"; src = fetchFromGitHub { owner = "BLumia"; repo = "pineapple-pictures"; rev = finalAttrs.version; - hash = "sha256-NXg+lCkm4i4ONkIp3F7Z1yHHO9daXucC+X1SuNxPJgQ="; + hash = "sha256-FgOmdqhsHyIQvwoNhD3pCoWYr4tW+vni0/rlICGu6rc="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/kde/angelfish.nix b/pkgs/applications/kde/angelfish.nix index 22b24f112ce9..43f1241c66ad 100644 --- a/pkgs/applications/kde/angelfish.nix +++ b/pkgs/applications/kde/angelfish.nix @@ -24,9 +24,6 @@ rustPlatform, rustc, srcs, - - # provided as callPackage input to enable easier overrides through overlays - cargoSha256 ? "sha256-PSrTo7nGgH0KxA82RlBEwtOu80WMCBeaCxHj3n7SgEE=", }: mkDerivation rec { @@ -40,11 +37,11 @@ mkDerivation rec { }) ]; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { # include version in the name so we invalidate the FOD name = "${pname}-${srcs.angelfish.version}"; inherit (srcs.angelfish) src; - sha256 = cargoSha256; + hash = "sha256-M3CtP7eWqOxMvnak6K3QvB/diu4jAfMmlsa6ySFIHCU="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/kde/kio-extras.nix b/pkgs/applications/kde/kio-extras.nix index 21738a1ac142..91d80677bb16 100644 --- a/pkgs/applications/kde/kio-extras.nix +++ b/pkgs/applications/kde/kio-extras.nix @@ -24,9 +24,8 @@ syntax-highlighting, libmtp, libssh, - openexr, + openexr_3, libtirpc, - ilmbase, phonon, qtsvg, samba, @@ -72,7 +71,7 @@ mkDerivation { syntax-highlighting libmtp libssh - openexr + openexr_3 libtirpc phonon qtsvg @@ -90,5 +89,4 @@ mkDerivation { --replace Exec=$out Exec=${kio} ''; - CXXFLAGS = [ "-I${ilmbase.dev}/include/OpenEXR" ]; } diff --git a/pkgs/applications/misc/googleearth-pro/default.nix b/pkgs/applications/misc/googleearth-pro/default.nix index 237345d6a388..2b835255412d 100644 --- a/pkgs/applications/misc/googleearth-pro/default.nix +++ b/pkgs/applications/misc/googleearth-pro/default.nix @@ -9,6 +9,8 @@ libGLU, libSM, + libXcomposite, + libXi, libXrender, libX11, @@ -38,11 +40,11 @@ let in mkDerivation rec { pname = "googleearth-pro"; - version = "7.3.6.9796"; + version = "7.3.6.10201"; src = fetchurl { url = "https://dl.google.com/linux/earth/deb/pool/main/g/google-earth-pro-stable/google-earth-pro-stable_${version}-r0_${arch}.deb"; - sha256 = "sha256-Wv2jPGN7LC5T32WdX3W1BfGYrcXTNWTI1Wv+PmD0gNM="; + sha256 = "sha256-LqkXOSfE52+7x+Y0DBjYzvVKO0meytLNHuS/ia88FbI="; }; nativeBuildInputs = [ @@ -63,6 +65,8 @@ mkDerivation rec { libGLU libSM libX11 + libXcomposite + libXi libXrender libproxy libxcb diff --git a/pkgs/applications/misc/klayout/default.nix b/pkgs/applications/misc/klayout/default.nix index 4f5203876269..14cfbaab1619 100644 --- a/pkgs/applications/misc/klayout/default.nix +++ b/pkgs/applications/misc/klayout/default.nix @@ -5,13 +5,13 @@ mkDerivation rec { pname = "klayout"; - version = "0.29.10"; + version = "0.29.11"; src = fetchFromGitHub { owner = "KLayout"; repo = "klayout"; rev = "v${version}"; - hash = "sha256-3YRWGIfBGgN3vlBlFoVbMWgkhoxs7OQli1qtKUXf0KA="; + hash = "sha256-MIXuqDnK8kXjQOSTALVPQHIE1eMk1Dl1M+/GMbw92bg="; }; postPatch = '' diff --git a/pkgs/applications/networking/browsers/firefox/packages/firefox-beta.nix b/pkgs/applications/networking/browsers/firefox/packages/firefox-beta.nix index 84bda1f9346b..dc2aad33c03a 100644 --- a/pkgs/applications/networking/browsers/firefox/packages/firefox-beta.nix +++ b/pkgs/applications/networking/browsers/firefox/packages/firefox-beta.nix @@ -9,11 +9,11 @@ buildMozillaMach rec { pname = "firefox-beta"; - version = "135.0b3"; + version = "135.0b9"; applicationName = "Mozilla Firefox Beta"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "2d6f04b929257532ac3883f6c16f063718c66acaf0c131d1f449f4a0de947d061ca772a3388f02b9122649ba27474500db287a9b4b7a0cc53a1639805c7f3064"; + sha512 = "3007c2a8743e4444226e66f0c11f53f01255c09702deda7de83bbe134a19c324b8b49de78d3211b20bb82c7b2040127145d2e39ed8aa81c653ac4397c46476f6"; }; meta = { diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index a91aa8851efd..171b67b75de9 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -24,7 +24,7 @@ let vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi"; in stdenv.mkDerivation rec { pname = "vivaldi"; - version = "7.0.3495.29"; + version = "7.1.3570.39"; suffix = { aarch64-linux = "arm64"; @@ -34,8 +34,8 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}-1_${suffix}.deb"; hash = { - aarch64-linux = "sha256-GdywFoaxx2VSpOJ0FJIhFcIRDJEhozCWvYvdatmEi5o="; - x86_64-linux = "sha256-PNSGx2oCIbB3vaNFS+7coM9Xw+2qDELJBXX8zA1UC3Q="; + aarch64-linux = "sha256-rhIz+vX/W39sN/j37nhaq+iEbIc/rfgMprqmX+DM2D8="; + x86_64-linux = "sha256-d6NQRueNE9P2/IOLwBIm4evrqO0D+RNKUUC156PEgcc="; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 875dd13d8c74..364ac42cbf90 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -126,11 +126,11 @@ "vendorHash": "sha256-P7ykNhpFoPTINX3eo61/x/9Ts2Z9dscY/P5fQNRsmVo=" }, "azuread": { - "hash": "sha256-m4ZzZFlcMBAfGN7tHjeYACMwxaG6rpUO4MPVMqjD7Hk=", + "hash": "sha256-UV6jgVS8tzWiEBC/C/U7/2bGZ1sqk2MnS8xNRBuL+C8=", "homepage": "https://registry.terraform.io/providers/hashicorp/azuread", "owner": "hashicorp", "repo": "terraform-provider-azuread", - "rev": "v3.0.2", + "rev": "v3.1.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -180,13 +180,13 @@ "vendorHash": "sha256-iNY6Jz/SKOLynx33smDFbg371Wa31CouNtrOuV7lkcw=" }, "bitwarden": { - "hash": "sha256-zvl9B1RhViJ83/7i9ab1KvQc9Yfpzq3c1JIz+bzwVmM=", + "hash": "sha256-A8x17x4BrtLXvJa/px/ktuhCyXxMZHhyCARxGiDMGTw=", "homepage": "https://registry.terraform.io/providers/maxlaverse/bitwarden", "owner": "maxlaverse", "repo": "terraform-provider-bitwarden", - "rev": "v0.12.1", + "rev": "v0.13.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-9k3+Qyural6S9xbqZ/NHXPFoo9cgLklIScTEBLuB0kA=" + "vendorHash": "sha256-whXQejYaYH4bMpIKVphfdfcB/V9ZW+O7CHjcGCnWFco=" }, "brightbox": { "hash": "sha256-pwFbCP+qDL/4IUfbPRCkddkbsEEeAu7Wp12/mDL0ABA=", @@ -354,11 +354,11 @@ "vendorHash": "sha256-quoFrJbB1vjz+MdV+jnr7FPACHuUe5Gx9POLubD2IaM=" }, "digitalocean": { - "hash": "sha256-mPNc65zah7HO3Knd44qxbwGgPp4LyxG76abBOV/1D3I=", + "hash": "sha256-JRBur7pH1niPZLN+5do6GiuoiSP18QsDZqWjlc9riek=", "homepage": "https://registry.terraform.io/providers/digitalocean/digitalocean", "owner": "digitalocean", "repo": "terraform-provider-digitalocean", - "rev": "v2.46.1", + "rev": "v2.47.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -480,20 +480,20 @@ "vendorHash": "sha256-EiTWJ4bw8IwsRTD9Lt28Up2DXH0oVneO2IaO8VqWtkw=" }, "gitea": { - "hash": "sha256-cIbDYFc6q6GMoQH9bqEA/LqC3MczAM7mewhYRRYQcy0=", + "hash": "sha256-pbh3ADR77iVwHQ3e7krSUU+rNfhdA8zYnxLbTdnRfaU=", "homepage": "https://registry.terraform.io/providers/go-gitea/gitea", "owner": "go-gitea", "repo": "terraform-provider-gitea", - "rev": "v0.5.1", + "rev": "v0.6.0", "spdx": "MIT", - "vendorHash": "sha256-7gA6KoP7NwjwItigBUeCg9AYQ/MggkOHOe/bH7Tf/xA=" + "vendorHash": "sha256-d8XoZzo2XS/wAPvdODAfK31qT1c+EoTbWlzzgYPiwq4=" }, "github": { - "hash": "sha256-curdrL2vQ0bnD3ci3ZH1GYNz9JO8ycKaZstK+v//b28=", + "hash": "sha256-RD2yGXClIYBa+Gs0IunPXKm0f0d1iFCVZSKUzXhlJyc=", "homepage": "https://registry.terraform.io/providers/integrations/github", "owner": "integrations", "repo": "terraform-provider-github", - "rev": "v6.4.0", + "rev": "v6.5.0", "spdx": "MIT", "vendorHash": null }, @@ -750,20 +750,20 @@ "vendorHash": "sha256-Q9LdhokZol1jhSfQVIRvPe1XrE8nVvc22aWHt7wkcHY=" }, "linode": { - "hash": "sha256-lM0haU3tLbKaW+EJNMZp9ms/nTH3xEdhBAiIjFSUZ7s=", + "hash": "sha256-qyHRGkhwq9YS/mYLFMXEkEdNtH3yfCrXIP4q/QdOzcY=", "homepage": "https://registry.terraform.io/providers/linode/linode", "owner": "linode", "repo": "terraform-provider-linode", - "rev": "v2.31.1", + "rev": "v2.32.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-WCD51W44xN+Qgojbcjrj3f9bUsVLN4itsY7ZBEen0YQ=" + "vendorHash": "sha256-1wwePyqy6ZLc3ZN0M2zZ6sxhVGZl7gWATv1xvcHBqB4=" }, "linuxbox": { - "hash": "sha256-+8Wyrb/AjzpfhDK42ze0HBIAdGvtJUFEIpYZs7uOym4=", + "hash": "sha256-svQRz1/PdVLpHoxOam1sfRTwHqgqs4ohJQs3IPMMAM4=", "homepage": "https://registry.terraform.io/providers/numtide/linuxbox", "owner": "numtide", "repo": "terraform-provider-linuxbox", - "rev": "v0.5.6", + "rev": "v0.5.8", "spdx": "BSD-3-Clause", "vendorHash": "sha256-GxMCY/udIy3c7zLeNeghXtfCUw4+Ll83L/40N4/yVh8=" }, @@ -985,11 +985,11 @@ "vendorHash": null }, "pagerduty": { - "hash": "sha256-C0Ded8XrPh+yeN+0SvrOPaKONTWvvj4J15xsaXgsri4=", + "hash": "sha256-r0F+WSEY7j2AesQ0sDixOe9uKD0hOIdSzDYEhC8yEDA=", "homepage": "https://registry.terraform.io/providers/PagerDuty/pagerduty", "owner": "PagerDuty", "repo": "terraform-provider-pagerduty", - "rev": "v3.18.3", + "rev": "v3.19.2", "spdx": "MPL-2.0", "vendorHash": null }, @@ -1111,13 +1111,13 @@ "vendorHash": null }, "selectel": { - "hash": "sha256-Wd9HX3Tvoi84t3NulTQlOWWvbsMPNC0mn1yEDmlmnb8=", + "hash": "sha256-bXPH/1fEuGehOOSTXsR/yi0BiR8zneIc2KUqOEoG5Qw=", "homepage": "https://registry.terraform.io/providers/selectel/selectel", "owner": "selectel", "repo": "terraform-provider-selectel", - "rev": "v6.0.1", + "rev": "v6.1.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-JytWDb7d2RW/fp5rptAzmfTTuytZ+lp6cB05ol9mhhM=" + "vendorHash": "sha256-LRs2zI5L5qdWiM8VexQPkP8SjrO/sVEj/MOX+n4NKSc=" }, "sentry": { "hash": "sha256-2JfzteVripOz96bAtQXC32wi8dWUQw8bry0HllNRQRA=", @@ -1138,13 +1138,13 @@ "vendorHash": "sha256-MIO0VHofPtKPtynbvjvEukMNr5NXHgk7BqwIhbc9+u0=" }, "signalfx": { - "hash": "sha256-qZHbeQDbyahUuYLhWFqBogG+w2pI1XAUdPvcNTngQUw=", + "hash": "sha256-C8LyILuqT15NqqzBrj09N+Nx9KMhE/oBPfXtc8gPfns=", "homepage": "https://registry.terraform.io/providers/splunk-terraform/signalfx", "owner": "splunk-terraform", "repo": "terraform-provider-signalfx", - "rev": "v9.5.0", + "rev": "v9.6.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-EnEfch59DIBzK8fmhZ1mvTSxPSjtxMTAOUMeocHgA8I=" + "vendorHash": "sha256-ijq03YXHiSKOgjG9gbyNHPUsYlYHi9nY4pmhMxM5CrI=" }, "skytap": { "hash": "sha256-JII4czazo6Di2sad1uFHMKDO2gWgZlQE8l/+IRYHQHU=", @@ -1183,11 +1183,11 @@ "vendorHash": "sha256-YFV+qXD78eajSeagJPgPu+qIktx1Vh/ZT0fUPOBuZyo=" }, "spacelift": { - "hash": "sha256-RWrhVeXPEgFYFGh34vFargTrZH+3CxY36+i0lmFSjXg=", + "hash": "sha256-qa+mBk57B2lauJI8k6t4BLksyKVM9tXKQOzo0ky/gAQ=", "homepage": "https://registry.terraform.io/providers/spacelift-io/spacelift", "owner": "spacelift-io", "repo": "terraform-provider-spacelift", - "rev": "v1.19.0", + "rev": "v1.19.1", "spdx": "MIT", "vendorHash": "sha256-c3R/7k7y7XS2Qli00nSj7gh/3Mj88PY4WybBTq/+pPs=" }, @@ -1355,13 +1355,13 @@ "vendorHash": "sha256-Dxd/2TjxPoa+JcHlmmcoPx2wegZJzhbI1abNmF4wDik=" }, "vault": { - "hash": "sha256-vMt7FyNY+Tv7C+YT4h6BOn4EDU5ypOHQvtW0VtQiifg=", + "hash": "sha256-6xS+d1oDaRz6UVyK9Z3h4LPo2jZ0iVwzfVw1e6PHnDc=", "homepage": "https://registry.terraform.io/providers/hashicorp/vault", "owner": "hashicorp", "repo": "terraform-provider-vault", - "rev": "v4.5.0", + "rev": "v4.6.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-tg1LBq8K8loMkPUXPMEi9Y4Epg0ZfpaYADfWLaZ2k3U=" + "vendorHash": "sha256-H53MSJVW5hmG16VmTrHsSnphsgp8DG9B/Ur3SGDhSxE=" }, "vcd": { "hash": "sha256-W+ffIT70IaePg3xfOaQgCjPTWTN3iSAYwkf+s+zkB84=", @@ -1373,13 +1373,13 @@ "vendorHash": "sha256-eCIJ2w8DjmUCGp0VbliLaQ6C29mJhl6Spya06Xyiqd4=" }, "venafi": { - "hash": "sha256-9Nn2dFF9W8STQoRXFNiXYCrHEWiirNvOAAS1f1brutw=", + "hash": "sha256-/fRqTu/M3OHR5v7pWAE04ijq70F7MxRILP1Ab2hw7gs=", "homepage": "https://registry.terraform.io/providers/Venafi/venafi", "owner": "Venafi", "repo": "terraform-provider-venafi", - "rev": "v0.21.1", + "rev": "v0.21.2", "spdx": "MPL-2.0", - "vendorHash": "sha256-xZTd/L5ZRTRuDsdyNZEZPmlOu9nUIAE5W1UG94aOS/o=" + "vendorHash": "sha256-kZ0JLjAYu3b01zHfp+VWTZ8sUCivfaS1Ld2/SDMOrks=" }, "vinyldns": { "hash": "sha256-ow+o9fRw/t2i4N65zuVFbfPb68ZUcJfNB5ARYqRTsIs=", @@ -1418,13 +1418,13 @@ "vendorHash": null }, "vsphere": { - "hash": "sha256-7tLqWVJL5G+OMtGVNkpfJZ6xfZ8hJy6gsitUVd0NHGc=", + "hash": "sha256-8xJOuafposGNtFw6ZMfrmoGOp67rubOdrLDR9DFRxdg=", "homepage": "https://registry.terraform.io/providers/hashicorp/vsphere", "owner": "hashicorp", "repo": "terraform-provider-vsphere", - "rev": "v2.10.0", + "rev": "v2.11.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-kjS1YYMoE5IBeKWXnxzO3nFp6NpBEwUCaTzO0VSBDLA=" + "vendorHash": "sha256-nQM1RcdgndUwHJWAspu/INFSXBoXJgAFBZR1x2txCkE=" }, "vultr": { "hash": "sha256-vgeTK5fGHYzHCBdxq1JN9agK6+jYGkCkFnAWrkIz/gM=", diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index 2c832676bb4f..948adfaa93c6 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -9,32 +9,32 @@ let versions = if stdenv.hostPlatform.isLinux then { - stable = "0.0.80"; - ptb = "0.0.126"; - canary = "0.0.569"; + stable = "0.0.81"; + ptb = "0.0.127"; + canary = "0.0.574"; development = "0.0.67"; } else { - stable = "0.0.332"; - ptb = "0.0.156"; - canary = "0.0.681"; - development = "0.0.76"; + stable = "0.0.333"; + ptb = "0.0.157"; + canary = "0.0.686"; + development = "0.0.78"; }; version = versions.${branch}; srcs = rec { x86_64-linux = { stable = fetchurl { url = "https://stable.dl2.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz"; - hash = "sha256-oamuF2LcdBC2HUzB08lTlxvrXjE6YFBXwLJDrmYKRXM="; + hash = "sha256-V3xaBbCZX1TUaXxLbMOhJ8VFKMZBfCR/w5ajrAvu2kQ="; }; ptb = fetchurl { url = "https://ptb.dl2.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz"; - hash = "sha256-4OvGEeOP4i4j7WwMjnnSvaNQ2e5RZ0EMF797xoIsWMY="; + hash = "sha256-mgR2MDQ3ZtgBltQPOxT6773aNUx5hH2P6LvFJFEuUts="; }; canary = fetchurl { url = "https://canary.dl2.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz"; - hash = "sha256-akbcAPuxF1pl4u2Cw/I7rlv8WVDsIZDPPpGRUt1qQvA="; + hash = "sha256-pZdHl7U3aNmxe6PtaK7JbQ7XdAPtlTAUuGcBRFkQI3s="; }; development = fetchurl { url = "https://development.dl2.discordapp.net/apps/linux/${version}/discord-development-${version}.tar.gz"; @@ -44,19 +44,19 @@ let x86_64-darwin = { stable = fetchurl { url = "https://stable.dl2.discordapp.net/apps/osx/${version}/Discord.dmg"; - hash = "sha256-ZIAFYbC4rRjb9Lz3E50TfR0Lgdmg0MZllxy+vk36Eg8="; + hash = "sha256-ebPbTIiaZ2hMoJdVCax0hT2bLUFLj5fuIf2e74qLHns="; }; ptb = fetchurl { url = "https://ptb.dl2.discordapp.net/apps/osx/${version}/DiscordPTB.dmg"; - hash = "sha256-Uluw2l/yAFzy4uMzp9ugFri8Psl7hy50H7QHag+St10="; + hash = "sha256-bZ9LVthjBib/yRfDTIXBNKDulWhW35HOdSDyEyjyLyA="; }; canary = fetchurl { url = "https://canary.dl2.discordapp.net/apps/osx/${version}/DiscordCanary.dmg"; - hash = "sha256-OmN8g5Skg/KmdO8sv8iOhbZOFU/XUyUqvSthEam6RNE="; + hash = "sha256-F3vLcLjNhYRGnOyuNziwtbBNxiUKgw6wZaa1LbVF5PU="; }; development = fetchurl { url = "https://development.dl2.discordapp.net/apps/osx/${version}/DiscordDevelopment.dmg"; - hash = "sha256-GyHOJcxWoKdFJ5/oca5JFwu5OdGGykR4OXGMaa3XfiY="; + hash = "sha256-SkPMUbRiY5C4sHHcnpneibG8kazHfJ3ohT1h0jbx4F8="; }; }; aarch64-darwin = x86_64-darwin; diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/unwrapped.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/unwrapped.nix index 1ae7ee66ead9..ae2d44e75ea8 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/unwrapped.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/unwrapped.nix @@ -46,14 +46,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "telegram-desktop-unwrapped"; - version = "5.10.3"; + version = "5.10.5"; src = fetchFromGitHub { owner = "telegramdesktop"; repo = "tdesktop"; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-AsxCDh/pneRHVuGtlqFYD6c9pezmKo/wrMU4RPtWlXA="; + hash = "sha256-0BfKWwb+mnlaMD55KKvEMRIFvqBDQCs272lemvXBnjw="; }; postPatch = lib.optionalString stdenv.hostPlatform.isLinux '' diff --git a/pkgs/applications/networking/protonvpn-cli/default.nix b/pkgs/applications/networking/protonvpn-cli/default.nix index a06d76503eb0..1d77b76825ea 100644 --- a/pkgs/applications/networking/protonvpn-cli/default.nix +++ b/pkgs/applications/networking/protonvpn-cli/default.nix @@ -6,6 +6,9 @@ protonvpn-nm-lib, pythondialog, dialog, + wrapGAppsNoGuiHook, + gobject-introspection, + glib, }: buildPythonApplication rec { @@ -22,12 +25,27 @@ buildPythonApplication rec { sha256 = "sha256-KhfogC23i7THe6YZJ6Sy1+q83vZupHsS69NurHCeo8I="; }; + nativeBuildInputs = [ + wrapGAppsNoGuiHook + gobject-introspection + ]; + + buildInputs = [ + glib + ]; + propagatedBuildInputs = [ protonvpn-nm-lib pythondialog dialog ]; + dontWrapGApps = true; + + makeWrapperArgs = [ + "\${gappsWrapperArgs[@]}" + ]; + # Project has a dummy test doCheck = false; diff --git a/pkgs/applications/office/skrooge/default.nix b/pkgs/applications/office/skrooge/default.nix index 48caac5889eb..e2f42460d99b 100644 --- a/pkgs/applications/office/skrooge/default.nix +++ b/pkgs/applications/office/skrooge/default.nix @@ -31,11 +31,11 @@ mkDerivation rec { pname = "skrooge"; - version = "2.33.0"; + version = "25.1.0"; src = fetchurl { url = "mirror://kde/stable/skrooge/skrooge-${version}.tar.xz"; - hash = "sha256-9K4/r3I9VNdUKHi4FCo0SxR+QzewvEKGOQevRM/r9GU="; + hash = "sha256-t8A9egotR2XoMBo5uoH2RBPEo3H6nPSJS5Oi4MkSVww="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/radio/qlog/default.nix b/pkgs/applications/radio/qlog/default.nix index 40720def672c..e2131ebf31d3 100644 --- a/pkgs/applications/radio/qlog/default.nix +++ b/pkgs/applications/radio/qlog/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "qlog"; - version = "0.40.1"; + version = "0.41.1"; src = fetchFromGitHub { owner = "foldynl"; repo = "QLog"; rev = "v${version}"; - hash = "sha256-6mAFOf/5LsmgMBxzkBlN1MOz4NVS9hi9YWOgeJ2tHSs="; + hash = "sha256-6+/GtAf/MGPcL6hh7aFeoCPVo6jhX3BQGBTHVHx1jDU="; fetchSubmodules = true; }; diff --git a/pkgs/applications/science/biology/blast/bin.nix b/pkgs/applications/science/biology/blast/bin.nix index 54d3cd783891..8f3a6f6be0b3 100644 --- a/pkgs/applications/science/biology/blast/bin.nix +++ b/pkgs/applications/science/biology/blast/bin.nix @@ -11,25 +11,29 @@ glib, libxml2, coreutils, + sqlite, }: let pname = "blast-bin"; - version = "2.14.1"; + version = "2.16.0"; srcs = rec { x86_64-linux = fetchurl { url = "https://ftp.ncbi.nlm.nih.gov/blast/executables/blast+/${version}/ncbi-blast-${version}+-x64-linux.tar.gz"; - hash = "sha256-OO8MNOk6k0J9FlAGyCOhP+hirEIT6lL+rIInB8dQWEU="; + hash = "sha256-sLEwmMkB0jsyStFwDnRxu3QIp/f1F9dNX6rXEb526PQ="; }; aarch64-linux = fetchurl { url = "https://ftp.ncbi.nlm.nih.gov/blast/executables/blast+/${version}/ncbi-blast-${version}+-aarch64-linux.tar.gz"; - hash = "sha256-JlOyoxZQBbvUcHIMv5muTuGQgrh2uom3rzDurhHQ+FM="; + hash = "sha256-1EeiMu08R9Glq8qRky4OTT5lQPLJcM7iaqUrmUOS4MI="; }; x86_64-darwin = fetchurl { url = "https://ftp.ncbi.nlm.nih.gov/blast/executables/blast+/${version}/ncbi-blast-${version}+-x64-macosx.tar.gz"; - hash = "sha256-eMfuwMCD6VlDgeshLslDhYBBp0YOpL+6q/zSchR0bAs="; + hash = "sha256-fu4edyD12q8G452ckrEl2Qct5+uB9JnABd7bCLkyMkw="; + }; + aarch64-darwin = fetchurl { + url = "https://ftp.ncbi.nlm.nih.gov/blast/executables/blast+/${version}/ncbi-blast-${version}+-aarch64-macosx.tar.gz"; + hash = "sha256-6NpPNLBCHaBRscLZ5fjh5Dv3bjjPk2Gh2+L7xEtiJNs="; }; - aarch64-darwin = x86_64-darwin; }; src = srcs.${stdenv.hostPlatform.system}; in @@ -48,6 +52,7 @@ stdenv.mkDerivation { bzip2 glib libxml2 + sqlite ]; installPhase = '' diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index da6b2f40e62a..848a69a3f2cc 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -60,6 +60,7 @@ let "8.19.2".sha256 = "sha256-q+i07JsMZp83Gqav6v1jxsgPLN7sPvp5/oszVnavmz0="; "8.20.0".sha256 = "sha256-WFpZlA6CzFVAruPhWcHQI7VOBVhrGLdFzWrHW0DTSl0="; "8.20.1".sha256 = "sha256-nRaLODPG4E3gUDzGrCK40vhl4+VhPyd+/fXFK/HC3Ig="; + "9.0+rc1".sha256 = "sha256-TLq925HFdizxyHjKRMeHBH9rLRpLNUiVIfA1JSMgYXA="; }; releaseRev = v: "V${v}"; fetched = import ../../../../build-support/coq/meta-fetch/default.nix diff --git a/pkgs/applications/terminal-emulators/kitty/default.nix b/pkgs/applications/terminal-emulators/kitty/default.nix index d596b8f936e2..d57582482670 100644 --- a/pkgs/applications/terminal-emulators/kitty/default.nix +++ b/pkgs/applications/terminal-emulators/kitty/default.nix @@ -1,104 +1,147 @@ -{ lib, stdenv, fetchFromGitHub, python3Packages, libunistring -, harfbuzz, fontconfig, pkg-config, ncurses, imagemagick -, libstartup_notification, libGL, libX11, libXrandr, libXinerama, libXcursor -, libxkbcommon, libXi, libXext, wayland-protocols, wayland, xxHash -, nerd-fonts -, lcms2 -, librsync -, openssl -, installShellFiles -, dbus -, sudo -, Libsystem -, Cocoa -, Kernel -, UniformTypeIdentifiers -, UserNotifications -, libcanberra -, libicns -, wayland-scanner -, libpng -, python3 -, zlib -, simde -, bashInteractive -, zsh -, fish -, nixosTests -, go_1_23 -, buildGo123Module -, nix-update-script -, makeBinaryWrapper -, autoSignDarwinBinariesHook +{ + lib, + stdenv, + fetchFromGitHub, + python3Packages, + libunistring, + harfbuzz, + fontconfig, + pkg-config, + ncurses, + imagemagick, + libstartup_notification, + libGL, + libX11, + libXrandr, + libXinerama, + libXcursor, + libxkbcommon, + libXi, + libXext, + wayland-protocols, + wayland, + xxHash, + nerd-fonts, + lcms2, + librsync, + openssl, + installShellFiles, + dbus, + sudo, + Libsystem, + Cocoa, + Kernel, + UniformTypeIdentifiers, + UserNotifications, + libcanberra, + libicns, + wayland-scanner, + libpng, + python3, + zlib, + simde, + bashInteractive, + zsh, + fish, + nixosTests, + go_1_23, + buildGo123Module, + nix-update-script, + makeBinaryWrapper, + autoSignDarwinBinariesHook, }: with python3Packages; buildPythonApplication rec { pname = "kitty"; - version = "0.38.1"; + version = "0.39.0"; format = "other"; src = fetchFromGitHub { owner = "kovidgoyal"; repo = "kitty"; tag = "v${version}"; - hash = "sha256-0M4Bvhh3j9vPedE/d+8zaiZdET4mXcrSNUgLllhaPJw="; + hash = "sha256-4JlsIwQzCxs1i8Pvsj9KcJZpXbVkSzWtW7klatA0FOM"; }; - goModules = (buildGo123Module { - pname = "kitty-go-modules"; - inherit src version; - vendorHash = "sha256-K12P81jE7oOU7qX2yQ+VtVHX/igKG0nPMSBkZ7wsR0o="; - }).goModules; + goModules = + (buildGo123Module { + pname = "kitty-go-modules"; + inherit src version; + vendorHash = "sha256-Yahn+nlarPy4Yf1QmDminnHDqbe0+iJ6IsUKF0tioK4="; + }).goModules; - buildInputs = [ - harfbuzz - ncurses - simde - lcms2 - librsync - matplotlib - openssl.dev - xxHash - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Cocoa - Kernel - UniformTypeIdentifiers - UserNotifications - libpng - python3 - zlib - ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ - Libsystem - ] ++ lib.optionals stdenv.hostPlatform.isLinux [ - fontconfig libunistring libcanberra libX11 - libXrandr libXinerama libXcursor libxkbcommon libXi libXext - wayland-protocols wayland dbus libGL - ]; + buildInputs = + [ + harfbuzz + ncurses + simde + lcms2 + librsync + matplotlib + openssl.dev + xxHash + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + Cocoa + Kernel + UniformTypeIdentifiers + UserNotifications + libpng + python3 + zlib + ] + ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ + Libsystem + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + fontconfig + libunistring + libcanberra + libX11 + libXrandr + libXinerama + libXcursor + libxkbcommon + libXi + libXext + wayland-protocols + wayland + dbus + libGL + ]; - nativeBuildInputs = [ - installShellFiles - ncurses - pkg-config - sphinx - furo - sphinx-copybutton - sphinxext-opengraph - sphinx-inline-tabs - go_1_23 - fontconfig - makeBinaryWrapper - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - imagemagick - libicns # For the png2icns tool. - autoSignDarwinBinariesHook - ] ++ lib.optionals stdenv.hostPlatform.isLinux [ - wayland-scanner - ]; + nativeBuildInputs = + [ + installShellFiles + ncurses + pkg-config + sphinx + furo + sphinx-copybutton + sphinxext-opengraph + sphinx-inline-tabs + go_1_23 + fontconfig + makeBinaryWrapper + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + imagemagick + libicns # For the png2icns tool. + autoSignDarwinBinariesHook + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + wayland-scanner + ]; depsBuildBuild = [ pkg-config ]; - outputs = [ "out" "terminfo" "shell_integration" "kitten" ]; + outputs = [ + "out" + "terminfo" + "shell_integration" + "kitten" + ]; patches = [ # Gets `test_ssh_env_vars` to pass when `bzip2` is in the output of `env`. @@ -130,49 +173,58 @@ buildPythonApplication rec { cp -r --reflink=auto $goModules vendor ''; - buildPhase = let - commonOptions = '' - --update-check-interval=0 \ - --shell-integration=enabled\ no-rc + buildPhase = + let + commonOptions = '' + --update-check-interval=0 \ + --shell-integration=enabled\ no-rc + ''; + darwinOptions = '' + --disable-link-time-optimization \ + ${commonOptions} + ''; + in + '' + runHook preBuild + + # Add the font by hand because fontconfig does not finds it in darwin + mkdir ./fonts/ + cp "${nerd-fonts.symbols-only}/share/fonts/truetype/NerdFonts/Symbols/SymbolsNerdFontMono-Regular.ttf" ./fonts/ + + ${ + if stdenv.hostPlatform.isDarwin then + '' + ${python.pythonOnBuildForHost.interpreter} setup.py build ${darwinOptions} + make docs + ${python.pythonOnBuildForHost.interpreter} setup.py kitty.app ${darwinOptions} + '' + else + '' + ${python.pythonOnBuildForHost.interpreter} setup.py linux-package \ + --egl-library='${lib.getLib libGL}/lib/libEGL.so.1' \ + --startup-notification-library='${libstartup_notification}/lib/libstartup-notification-1.so' \ + --canberra-library='${libcanberra}/lib/libcanberra.so' \ + --fontconfig-library='${fontconfig.lib}/lib/libfontconfig.so' \ + ${commonOptions} + ${python.pythonOnBuildForHost.interpreter} setup.py build-launcher + '' + } + runHook postBuild ''; - darwinOptions = '' - --disable-link-time-optimization \ - ${commonOptions} - ''; - in '' - runHook preBuild - # Add the font by hand because fontconfig does not finds it in darwin - mkdir ./fonts/ - cp "${nerd-fonts.symbols-only}/share/fonts/truetype/NerdFonts/Symbols/SymbolsNerdFontMono-Regular.ttf" ./fonts/ + nativeCheckInputs = + [ + pillow - ${if stdenv.hostPlatform.isDarwin then '' - ${python.pythonOnBuildForHost.interpreter} setup.py build ${darwinOptions} - make docs - ${python.pythonOnBuildForHost.interpreter} setup.py kitty.app ${darwinOptions} - '' else '' - ${python.pythonOnBuildForHost.interpreter} setup.py linux-package \ - --egl-library='${lib.getLib libGL}/lib/libEGL.so.1' \ - --startup-notification-library='${libstartup_notification}/lib/libstartup-notification-1.so' \ - --canberra-library='${libcanberra}/lib/libcanberra.so' \ - --fontconfig-library='${fontconfig.lib}/lib/libfontconfig.so' \ - ${commonOptions} - ${python.pythonOnBuildForHost.interpreter} setup.py build-launcher - ''} - runHook postBuild - ''; - - nativeCheckInputs = [ - pillow - - # Shells needed for shell integration tests - bashInteractive - zsh - fish - ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ - # integration tests need sudo - sudo - ]; + # Shells needed for shell integration tests + bashInteractive + zsh + fish + ] + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ + # integration tests need sudo + sudo + ]; # skip failing tests due to darwin sandbox preCheck = lib.optionalString stdenv.hostPlatform.isDarwin '' @@ -186,49 +238,61 @@ buildPythonApplication rec { ''; checkPhase = '' - runHook preCheck + runHook preCheck - # Fontconfig error: Cannot load default config file: No such file: (null) - export FONTCONFIG_FILE=${fontconfig.out}/etc/fonts/fonts.conf + # Fontconfig error: Cannot load default config file: No such file: (null) + export FONTCONFIG_FILE=${fontconfig.out}/etc/fonts/fonts.conf - # Required for `test_ssh_shell_integration` to pass. - export TERM=kitty + # Required for `test_ssh_shell_integration` to pass. + export TERM=kitty - make test - runHook postCheck - ''; + make test + runHook postCheck + ''; installPhase = '' runHook preInstall mkdir -p "$out" mkdir -p "$kitten/bin" - ${if stdenv.hostPlatform.isDarwin then '' - mkdir "$out/bin" - ln -s ../Applications/kitty.app/Contents/MacOS/kitty "$out/bin/kitty" - ln -s ../Applications/kitty.app/Contents/MacOS/kitten "$out/bin/kitten" - cp ./kitty.app/Contents/MacOS/kitten "$kitten/bin/kitten" - mkdir "$out/Applications" - cp -r kitty.app "$out/Applications/kitty.app" + ${ + if stdenv.hostPlatform.isDarwin then + '' + mkdir "$out/bin" + ln -s ../Applications/kitty.app/Contents/MacOS/kitty "$out/bin/kitty" + ln -s ../Applications/kitty.app/Contents/MacOS/kitten "$out/bin/kitten" + cp ./kitty.app/Contents/MacOS/kitten "$kitten/bin/kitten" + mkdir "$out/Applications" + cp -r kitty.app "$out/Applications/kitty.app" - installManPage 'docs/_build/man/kitty.1' - '' else '' - cp -r linux-package/{bin,share,lib} "$out" - cp linux-package/bin/kitten "$kitten/bin/kitten" - ''} + installManPage 'docs/_build/man/kitty.1' + '' + else + '' + cp -r linux-package/{bin,share,lib} "$out" + cp linux-package/bin/kitten "$kitten/bin/kitten" + '' + } # dereference the `kitty` symlink to make sure the actual executable # is wrapped on macOS as well (and not just the symlink) - wrapProgram $(realpath "$out/bin/kitty") --prefix PATH : "$out/bin:${lib.makeBinPath [ imagemagick ncurses.dev ]}" + wrapProgram $(realpath "$out/bin/kitty") --prefix PATH : "$out/bin:${ + lib.makeBinPath [ + imagemagick + ncurses.dev + ] + }" installShellCompletion --cmd kitty \ --bash <("$out/bin/kitty" +complete setup bash) \ --fish <("$out/bin/kitty" +complete setup fish2) \ --zsh <("$out/bin/kitty" +complete setup zsh) - terminfo_src=${if stdenv.hostPlatform.isDarwin then - ''"$out/Applications/kitty.app/Contents/Resources/terminfo"'' + terminfo_src=${ + if stdenv.hostPlatform.isDarwin then + ''"$out/Applications/kitty.app/Contents/Resources/terminfo"'' else - "$out/share/terminfo"} + "$out/share/terminfo" + } mkdir -p $terminfo/share mv "$terminfo_src" $terminfo/share/terminfo @@ -245,12 +309,12 @@ buildPythonApplication rec { tests = lib.optionalAttrs stdenv.hostPlatform.isLinux { default = nixosTests.terminal-emulators.kitty; }; - updateScript = nix-update-script {}; + updateScript = nix-update-script { }; }; meta = with lib; { homepage = "https://github.com/kovidgoyal/kitty"; - description = "Modern, hackable, featureful, OpenGL based terminal emulator"; + description = "The fast, feature-rich, GPU based terminal emulator"; license = licenses.gpl3Only; changelog = [ "https://sw.kovidgoyal.net/kitty/changelog/" @@ -258,6 +322,11 @@ buildPythonApplication rec { ]; platforms = platforms.darwin ++ platforms.linux; mainProgram = "kitty"; - maintainers = with maintainers; [ tex rvolosatovs Luflosi kashw2 ]; + maintainers = with maintainers; [ + tex + rvolosatovs + Luflosi + kashw2 + ]; }; } diff --git a/pkgs/applications/version-management/git-stack/default.nix b/pkgs/applications/version-management/git-stack/default.nix index e3a61ad02fe4..5a11cc9953a6 100644 --- a/pkgs/applications/version-management/git-stack/default.nix +++ b/pkgs/applications/version-management/git-stack/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "git-stack"; - version = "0.10.17"; + version = "0.10.18"; src = fetchFromGitHub { owner = "gitext-rs"; repo = "git-stack"; rev = "v${version}"; - hash = "sha256-foItJSZ6jsLuWkO/c1Ejb45dSdzZ/ripieyVIYsEyy0="; + hash = "sha256-iFoxYq4NHC/K0ruPDXHfayZDglebBJE00V57HUH9Y84="; }; - cargoHash = "sha256-MEhUmy4ijR/zHm/qMt4PqNGYnCfIgjNaL9SlMmXCMmc="; + cargoHash = "sha256-kX0eOqp3emGEYZPIzkP62WpfH8mTxMi7zB+nwtpSFuk="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security diff --git a/pkgs/applications/version-management/pass-git-helper/default.nix b/pkgs/applications/version-management/pass-git-helper/default.nix index 9d4ab973c19d..ab7fe589fdf9 100644 --- a/pkgs/applications/version-management/pass-git-helper/default.nix +++ b/pkgs/applications/version-management/pass-git-helper/default.nix @@ -11,14 +11,14 @@ buildPythonApplication rec { pname = "pass-git-helper"; - version = "3.0.0"; + version = "3.1.0"; pyproject = true; src = fetchFromGitHub { owner = "languitar"; repo = "pass-git-helper"; tag = "v${version}"; - sha256 = "sha256-DLH3l4wYfBlrc49swLgyHeZXebJ5JSzU7cHjD7Hmw0g="; + sha256 = "sha256-HcafOaunDsyUm5KPcDNo/hENFMZseWSD8GYilKYOPco="; }; build-system = [ setuptools ]; diff --git a/pkgs/applications/video/kodi/addons/inputstream-adaptive/default.nix b/pkgs/applications/video/kodi/addons/inputstream-adaptive/default.nix index 73e258f42a1b..1806e8732199 100644 --- a/pkgs/applications/video/kodi/addons/inputstream-adaptive/default.nix +++ b/pkgs/applications/video/kodi/addons/inputstream-adaptive/default.nix @@ -16,20 +16,20 @@ let bento4 = fetchFromGitHub { owner = "xbmc"; repo = "Bento4"; - rev = "1.6.0-641-${rel}"; - sha256 = "sha256-vsFMDzH8JJecYw0qWKGCxnd/m5wn62mCKE2g2HwQhwI="; + tag = "1.6.0-641-3-${rel}"; + hash = "sha256-ycWQvXgr1DQ3Wng73S8i6y6XmcUD/iN8OKfO1czgsnY="; }; in buildKodiBinaryAddon rec { pname = "inputstream-adaptive"; namespace = "inputstream.adaptive"; - version = "21.4.6"; + version = "21.5.9"; src = fetchFromGitHub { owner = "xbmc"; repo = "inputstream.adaptive"; - rev = "${version}-${rel}"; - sha256 = "sha256-ub4ep89datfr8aZLZAfoz7zhOizGFpzgp2PVON6Ptj8="; + tag = "${version}-${rel}"; + hash = "sha256-OArvp/MgJGsRs3Z59JfgOkfwyhQ3ArC1yf37z7Y7khg="; }; extraCMakeFlags = [ diff --git a/pkgs/applications/video/mpv/scripts/twitch-chat.nix b/pkgs/applications/video/mpv/scripts/twitch-chat.nix new file mode 100644 index 000000000000..2bce83b95bcf --- /dev/null +++ b/pkgs/applications/video/mpv/scripts/twitch-chat.nix @@ -0,0 +1,42 @@ +{ + buildLua, + curl, + fetchFromGitHub, + lib, + nix-update-script, +}: +buildLua (finalAttrs: { + pname = "twitch-chat"; + version = "0-unstable-2024-06-23"; + + src = fetchFromGitHub { + owner = "CrendKing"; + repo = "mpv-twitch-chat"; + rev = "bb0c2e84675f4f1e0c221c8e1d3516b60242b985"; + hash = "sha256-WyNPUiAs5U/vrjNbAgyqkfoxh9rabLmuZ1zG5uZYxaw="; + }; + + installPhase = '' + runHook preInstall + install -D main.lua $out/share/mpv/scripts/twitch-chat.lua + runHook postInstall + ''; + + passthru.extraWrapperArgs = [ + "--prefix" + "PATH" + ":" + (lib.makeBinPath [ curl ]) + ]; + + passthru.updateScript = nix-update-script { + extraArgs = [ "--version=branch" ]; + }; + + meta = { + description = "Show Twitch chat messages as subtitles when watching Twitch VOD with mpv."; + homepage = "https://github.com/CrendKing/mpv-twitch-chat"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.naho ]; + }; +}) diff --git a/pkgs/applications/video/obs-studio/plugins/obs-freeze-filter.nix b/pkgs/applications/video/obs-studio/plugins/obs-freeze-filter.nix index 1cc6d312ec38..af2afe2cbdc6 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-freeze-filter.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-freeze-filter.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "obs-freeze-filter"; - version = "0.3.3"; + version = "0.3.4"; src = fetchFromGitHub { owner = "exeldro"; repo = "obs-freeze-filter"; rev = finalAttrs.version; - hash = "sha256-CaHBTfdk8VFjmiclG61elj35glQafgz5B4ENo+7J35o="; + hash = "sha256-fVrfGqwce4oFYdWGElXMsXHO1AzQ/mhfBmZL1mPdT3I="; fetchSubmodules = true; }; diff --git a/pkgs/applications/window-managers/phosh/default.nix b/pkgs/applications/window-managers/phosh/default.nix index 5f3820737308..46afbec02e20 100644 --- a/pkgs/applications/window-managers/phosh/default.nix +++ b/pkgs/applications/window-managers/phosh/default.nix @@ -42,12 +42,12 @@ stdenv.mkDerivation (finalAttrs: { pname = "phosh"; - version = "0.44.0"; + version = "0.44.1"; src = fetchurl { # Release tarball which includes subprojects gvc and libcall-ui url = with finalAttrs; "https://sources.phosh.mobi/releases/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-b4yrSC0TzTuh5kl93DeJNh06ZKjvNhTSjhDzmsEuK2g="; + hash = "sha256-rczGr7YSmVFu13oa3iSTmSQ4jsjl7lv38zQtD7WmDis="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ab/abi-dumper/package.nix b/pkgs/by-name/ab/abi-dumper/package.nix index 27321eb12325..a681a48d28c2 100644 --- a/pkgs/by-name/ab/abi-dumper/package.nix +++ b/pkgs/by-name/ab/abi-dumper/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "abi-dumper"; - version = "1.2"; + version = "1.4"; src = fetchFromGitHub { owner = "lvc"; repo = "abi-dumper"; rev = version; - sha256 = "1i00rfnddrrb9lb1l6ib19g3a76pyasl9lb7rqz2p998gav1gjp2"; + sha256 = "sha256-BefDMeKHx4MNU6SyX5UpQnwdI+zqap7zunsgdWG/2xc="; }; patchPhase = '' diff --git a/pkgs/by-name/ab/abracadabra/package.nix b/pkgs/by-name/ab/abracadabra/package.nix index e597a3807d03..e85628db8764 100644 --- a/pkgs/by-name/ab/abracadabra/package.nix +++ b/pkgs/by-name/ab/abracadabra/package.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "abracadabra"; - version = "2.9.1"; + version = "2.9.2"; src = fetchFromGitHub { owner = "KejPi"; repo = "AbracaDABra"; rev = "v${version}"; - hash = "sha256-T2l5wjE62xBb55IzKzInf/K4VPOuZ68vp5VxS0vIn+I="; + hash = "sha256-3sjN62SWl5Xpb2cP108IFqCuJAo8JLOCLxJENCrq8wI="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ac/activemq/package.nix b/pkgs/by-name/ac/activemq/package.nix index c691f398bb9c..cbab20e336f7 100644 --- a/pkgs/by-name/ac/activemq/package.nix +++ b/pkgs/by-name/ac/activemq/package.nix @@ -5,7 +5,7 @@ }: let - version = "6.1.4"; + version = "6.1.5"; in stdenvNoCC.mkDerivation { pname = "activemq"; @@ -13,7 +13,7 @@ stdenvNoCC.mkDerivation { src = fetchurl { url = "https://archive.apache.org/dist/activemq/${version}/apache-activemq-${version}-bin.tar.gz"; - hash = "sha256-8b0no0XUNOw3U2ULWtNW9R7DAWXtAajvh0nGuTkVNfM="; + hash = "sha256-JrLLSm6+Be1vSBTTryRcZfbiGK0PrmJ/pM2uYnGuN9E="; }; installPhase = '' diff --git a/pkgs/by-name/ad/adr-tools/package.nix b/pkgs/by-name/ad/adr-tools/package.nix new file mode 100644 index 000000000000..7092ce9353ea --- /dev/null +++ b/pkgs/by-name/ad/adr-tools/package.nix @@ -0,0 +1,118 @@ +{ + lib, + stdenv, + fetchFromGitHub, + installShellFiles, + makeWrapper, + nix-update-script, + + bash, + bashInteractive, + coreutils, + findutils, + gawk, + getopt, + gnugrep, + gnused, + + # tests + adr-tools, + runCommand, +}: + +stdenv.mkDerivation rec { + pname = "adr-tools"; + version = "3.0.0"; + + src = fetchFromGitHub { + owner = "npryce"; + repo = "adr-tools"; + tag = version; + hash = "sha256-JEwLn+SY6XcaQ9VhN8ARQaZc1zolgAJKfIqPggzV+sU="; + }; + + nativeBuildInputs = [ + installShellFiles + makeWrapper + ]; + + buildInputs = [ + # need an interactive interpreter for compgen + bashInteractive + ]; + + checkInputs = [ getopt ]; + + dontConfigure = true; + dontBuild = true; + doCheck = true; + + # patch makefile and shebangs so checks can run + patchPhase = '' + substituteInPlace Makefile --replace-fail '/bin:/usr/bin' '$${HOST_PATH}' + patchShebangs src/ + patchShebangs approve + ''; + + checkPhase = '' + make check + ''; + + installPhase = '' + mkdir -p $out/bin/ $out/libexec + cp src/* $out/libexec + + makeWrapper $out/libexec/adr $out/bin/adr --prefix PATH : ${ + lib.makeBinPath [ + coreutils + findutils + gawk + getopt + gnugrep + gnused + ] + } + # avoid having two bash dependencies in output + substituteInPlace $out/bin/adr --replace-fail "${lib.getExe bash}" "${lib.getExe bashInteractive}" + + installShellCompletion --bash autocomplete/adr + ''; + + passthru = { + tests.default = runCommand "adr-tools-test" { } '' + set -euo pipefail + export PATH=$PATH:${ + lib.makeBinPath [ + adr-tools + gnugrep + ] + } + + mkdir $out + cd $out + + adr init + test -e doc/adr/0001-record-architecture-decisions.md + + EDITOR= adr new blah + test -e doc/adr/0002-blah.md + + adr generate toc | grep 0002-blah.md + adr list | grep 0002-blah.md + + adr link 2 Amends 1 "TESTED AMEND" + grep 'TESTED AMEND' doc/adr/0001-record-architecture-decisions.md | grep 0002-blah.md + ''; + + updateScript = nix-update-script { }; + }; + + meta = { + description = "Command-line tools for working with Architecture Decision Records"; + homepage = "https://github.com/npryce/adr-tools"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ adamcstephens ]; + mainProgram = "adr"; + platforms = lib.platforms.all; + }; +} diff --git a/pkgs/by-name/ae/aerc/package.nix b/pkgs/by-name/ae/aerc/package.nix index 7229e439666b..469f2d6369c5 100644 --- a/pkgs/by-name/ae/aerc/package.nix +++ b/pkgs/by-name/ae/aerc/package.nix @@ -14,13 +14,13 @@ buildGoModule rec { pname = "aerc"; - version = "0.19.0"; + version = "0.20.0"; src = fetchFromSourcehut { owner = "~rjarry"; repo = "aerc"; rev = version; - hash = "sha256-YlpR85jB6Il3UW4MTaf8pkilRVjkO0q/D/Yu+OiBX6Y="; + hash = "sha256-0ZSmmmj5PpSORL0s0SSNoZGzct9Ps8j0ILAUCpJOOBw="; }; proxyVendor = true; diff --git a/pkgs/by-name/ai/airwin2rack/juce-clap-juce-extensions-src-juce-cmakelists.patch b/pkgs/by-name/ai/airwin2rack/juce-clap-juce-extensions-src-juce-cmakelists.patch new file mode 100644 index 000000000000..a773abcdb4d8 --- /dev/null +++ b/pkgs/by-name/ai/airwin2rack/juce-clap-juce-extensions-src-juce-cmakelists.patch @@ -0,0 +1,36 @@ +diff --git a/src-juce/CMakeLists.txt b/src-juce/CMakeLists.txt +index 1f41088..10bdbb4 100644 +--- a/src-juce/CMakeLists.txt ++++ b/src-juce/CMakeLists.txt +@@ -1,28 +1,8 @@ + # vi:set sw=2 et: + project(airwin-consolidated VERSION ${CMAKE_PROJECT_VERSION}) + +-include ("../cmake/CPM.cmake") +- +- +-if (DEFINED AWCO_ONJUCE7) +- set(AWCO_JUCETAG 7.0.12) +-else() +- set(AWCO_JUCETAG 8.0.4) +-endif() +- +-message(STATUS "Getting JUCE TAG ${AWCO_JUCETAG}") +-CPMAddPackage( +- NAME JUCE +- GITHUB_REPOSITORY juce-framework/JUCE +- GIT_TAG ${AWCO_JUCETAG} # specify the tag to a version of your choice +-) +- +-CPMAddPackage( +- NAME clap-juce-extensions +- GITHUB_REPOSITORY free-audio/clap-juce-extensions +- GIT_TAG main +- SUBMODULE_RECURSIVE ON +-) ++add_subdirectory(juce) ++add_subdirectory(clap-juce-extensions) + + if (NOT DEFINED AWCO_ARM64EC) + list(APPEND AWCO_FORMATS VST3) + diff --git a/pkgs/by-name/ai/airwin2rack/package.nix b/pkgs/by-name/ai/airwin2rack/package.nix new file mode 100644 index 000000000000..e36aed4a6046 --- /dev/null +++ b/pkgs/by-name/ai/airwin2rack/package.nix @@ -0,0 +1,228 @@ +{ + stdenv, + fetchFromGitHub, + lib, + makeDesktopItem, + copyDesktopItems, + srcOnly, + cmake, + pkg-config, + alsa-lib, + xorg, + freetype, + libGLU, + libjack2, + juce, + webkitgtk_4_0, + libsysprof-capture, + pcre2, + util-linux, + libselinux, + libsepol, + libthai, + libxkbcommon, + libdatrie, + libepoxy, + libsoup_2_4, + lerc, + sqlite, + glib, + gtk3-x11, + curl, + vcv-rack, + jansson, + glew, + glfw, + libarchive, + speexdsp, + libpulseaudio, + libsamplerate, + rtmidi, + zstd, + jq, + enableVCVRack ? false, +}: +let + clapJuceExtensions = fetchFromGitHub { + owner = "free-audio"; + repo = "clap-juce-extensions"; + rev = "4f33b4930b6af806018c009f0f24b3a50808af99"; + hash = "sha256-M+T7ll3Ap6VIP5ub+kfEKwT2RW2IxxY4wUPRQKFIotk="; + fetchSubmodules = true; + }; + + vcvRackSdk = srcOnly vcv-rack; + pname = "airwin2rack"; + version = "2.13.0"; +in +stdenv.mkDerivation { + inherit pname; + inherit version; + + src = fetchFromGitHub { + owner = "baconpaul"; + repo = "airwin2rack"; + tag = "DAWPlugin"; + hash = "sha256-xjE9M5fMeOOYncq7xe+v++XvfUL6QZc2tF0jnYWSwKQ="; + fetchSubmodules = true; + }; + + desktopItems = [ + (makeDesktopItem { + type = "Application"; + name = "Airwin2rack"; + desktopName = "Airwindows Consolidated"; + comment = "Various Airwindows Plugins Consolidated (Standalone)"; + exec = "Airwindows Consolidated"; + categories = [ + "Audio" + "AudioVideo" + ]; + }) + ]; + + strictDeps = true; + + nativeBuildInputs = + [ + cmake + pkg-config + copyDesktopItems + ] + ++ lib.optionals enableVCVRack [ + jq + zstd + ]; + + buildInputs = + [ + alsa-lib + xorg.libX11 + xorg.libXcomposite + xorg.libXcursor + xorg.libXext + xorg.libXinerama + xorg.libXrandr + xorg.libXrender + xorg.libXtst + xorg.libXdmcp + libGLU + libjack2 + freetype + webkitgtk_4_0 + glib + gtk3-x11 + curl + libsysprof-capture + pcre2 + util-linux + libselinux + libsepol + libthai + libxkbcommon + libdatrie + libepoxy + libsoup_2_4 + lerc + sqlite + ] + ++ lib.optionals enableVCVRack [ + vcv-rack + jansson + glew + glfw + libarchive + speexdsp + libpulseaudio + libsamplerate + rtmidi + zstd + ]; + + cmakeFlags = + [ + (lib.cmakeBool "BUILD_JUCE_PLUGIN" true) + (lib.cmakeBool "USE_JUCE_PROGRAMS" true) + ] + ++ lib.optionals enableVCVRack [ + (lib.cmakeBool "BUILD_RACK_PLUGIN" true) + (lib.cmakeFeature "RACK_SDK_DIR" "${vcvRackSdk}") + ]; + + cmakeBuildType = "Release"; + + patches = [ + ./juce-clap-juce-extensions-src-juce-cmakelists.patch + ]; + + prePatch = '' + ln -s ${juce.src} src-juce/juce + ln -s ${clapJuceExtensions} src-juce/clap-juce-extensions + ''; + + preConfigure = lib.optionalString enableVCVRack ''export RACK_DIR=${vcvRackSdk}''; + + buildPhase = '' + runHook preBuild + cmake --build . --target awcons-products ${lib.optionalString enableVCVRack "build_plugin"} --parallel $NIX_BUILD_CORES + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/lib/vst3 $out/lib/lv2 $out/lib/clap $out/bin + + cp -r "awcons-products/Airwindows Consolidated.vst3" $out/lib/vst3 + cp -r "awcons-products/Airwindows Consolidated.lv2" $out/lib/lv2 + install -Dm644 "awcons-products/Airwindows Consolidated.clap" -t $out/lib/clap + + install -Dm755 "awcons-products/Airwindows Consolidated" $out/bin/Airwindows\ Consolidated + + ${lib.optionalString enableVCVRack '' + mkdir ../${pname} + strip -s plugin.so + mv plugin.so ../${pname} + cd .. + mv LICENSE.md ${pname} + mv README.md ${pname} + mv plugin.json ${pname} + mv res ${pname} + tar -c ${pname} | zstd -19 -o "${pname}-${version}-lin-x64.vcvplugin" + # got the directory from arch wiki + install -Dm755 "${pname}-${version}-lin-x64.vcvplugin" $out/usr/lib/vcvrack/plugins + ''} + + runHook postInstall + ''; + + NIX_LDFLAGS = ( + toString [ + "-lX11" + "-lXext" + "-lXcomposite" + "-lXcursor" + "-lXinerama" + "-lXrandr" + "-lXrender" + "-lXtst" + "-lXdmcp" + ] + ); + + meta = { + description = "JUCE Plugin Version of Airwindows Consolidated"; + homepage = "https://airwindows.com/"; + platforms = [ "x86_64-linux" ]; + license = + with lib.licenses; + [ mit ] + ++ lib.optional enableVCVRack [ + gpl3Plus + cc-by-nc-40 + unfreeRedistributable + ]; + mainProgram = "Airwindows Consolidated"; + maintainers = [ lib.maintainers.l1npengtul ]; + }; +} diff --git a/pkgs/by-name/ai/airwindows/cmakelists-and-helper.patch b/pkgs/by-name/ai/airwindows/cmakelists-and-helper.patch new file mode 100644 index 000000000000..09bc63beebd5 --- /dev/null +++ b/pkgs/by-name/ai/airwindows/cmakelists-and-helper.patch @@ -0,0 +1,31 @@ +diff --git a/plugins/LinuxVST/CMakeLists.txt b/plugins/LinuxVST/CMakeLists.txt +index f43ea128..b87a5c03 100755 +--- a/plugins/LinuxVST/CMakeLists.txt ++++ b/plugins/LinuxVST/CMakeLists.txt +@@ -2,11 +2,24 @@ cmake_minimum_required(VERSION 3.9) + project(airwindows_ports) + + set(CMAKE_CXX_STANDARD 14) +-add_compile_options(-O2 -D__cdecl=) ++add_compile_options(-D__cdecl=) ++ ++set(VST2_SDK_PATH "${PROJECT_SOURCE_DIR}/include/vstsdk" CACHE STRING "VST2 SDK Path") ++ ++set(VSTSDK_ROOT ++ "${VST2_SDK_PATH}" ++ "${VST2_SDK_PATH}/pluginterfaces/vst2.x/" ++ "${VST2_SDK_PATH}/public.sdk/source/vst2.x/" ++) ++ ++set(VSTSDK_SOURCES ++ "${VST2_SDK_PATH}/public.sdk/source/vst2.x/audioeffectx.cpp" ++ "${VST2_SDK_PATH}/public.sdk/source/vst2.x/audioeffect.cpp" ++ "${VST2_SDK_PATH}/public.sdk/source/vst2.x/vstplugmain.cpp" ++) + + include(Helpers.cmake) + +-add_subdirectory(include/vstsdk) + add_airwindows_plugin(Acceleration) + add_airwindows_plugin(Acceleration2) + add_airwindows_plugin(ADClip7) diff --git a/pkgs/by-name/ai/airwindows/package.nix b/pkgs/by-name/ai/airwindows/package.nix new file mode 100644 index 000000000000..c2c5b1c41886 --- /dev/null +++ b/pkgs/by-name/ai/airwindows/package.nix @@ -0,0 +1,69 @@ +{ + stdenv, + fetchFromGitHub, + fetchzip, + lib, + cmake, + nix-update-script, + vst2-sdk, +}: +stdenv.mkDerivation { + pname = "airwindows"; + version = "0-unstable-2025-01-06"; + + src = fetchFromGitHub { + owner = "airwindows"; + repo = "airwindows"; + rev = "0ca33035253b9fc0c6c876592d9e5ff3a654cd10"; + hash = "sha256-+AyB6y179BRWTvflA9Ld5utpF2scSJDszkGa8BCvPdM="; + }; + + # we patch helpers because honestly im spooked out by where those variables + # came from. + prePatch = '' + mkdir -p plugins/LinuxVST/include + ln -s ${vst2-sdk} plugins/LinuxVST/include/vstsdk + ''; + + patches = [ + ./cmakelists-and-helper.patch + ]; + + # we are building for linux, so we go to linux + preConfigure = '' + cd plugins/LinuxVST + ''; + + cmakeBuildType = "Release"; + + cmakeFlags = [ ]; + + nativeBuildInputs = [ + cmake + ]; + + buildInputs = [ + vst2-sdk + ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/lib/vst/airwindows + find "$PWD" -type f -name "*.so" -exec install -Dm755 {} $out/lib/vst/airwindows \; + + runHook postInstall + ''; + + passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; }; + + meta = { + description = "All Airwindows VST Plugins"; + homepage = "https://airwindows.com/"; + platforms = lib.platforms.linux; + license = [ + lib.licenses.mit + ]; + maintainers = [ lib.maintainers.l1npengtul ]; + }; +} diff --git a/pkgs/by-name/al/alacritty-theme/package.nix b/pkgs/by-name/al/alacritty-theme/package.nix index a5e7d6f44c0c..48c698be1196 100644 --- a/pkgs/by-name/al/alacritty-theme/package.nix +++ b/pkgs/by-name/al/alacritty-theme/package.nix @@ -8,13 +8,13 @@ stdenvNoCC.mkDerivation (self: { pname = "alacritty-theme"; - version = "0-unstable-2025-01-03"; + version = "0-unstable-2025-01-21"; src = fetchFromGitHub { owner = "alacritty"; repo = "alacritty-theme"; - rev = "aff9d111d43e1ad5c22d4e27fc1c98176e849fb9"; - hash = "sha256-GxCdyBihypHKkPlCVGiTAD4dP3ggkSyQSNS5AKUhSVo="; + rev = "69d07c3bc280add63906a1cebf6be326687bc9eb"; + hash = "sha256-G8sUu8GD44uqUyQ7sZrgrGxC4IOfhSn++WIc+U67zL0="; sparseCheckout = [ "themes" ]; }; diff --git a/pkgs/by-name/al/alpaca-proxy/package.nix b/pkgs/by-name/al/alpaca-proxy/package.nix index e86402560863..2c69ba00cd05 100644 --- a/pkgs/by-name/al/alpaca-proxy/package.nix +++ b/pkgs/by-name/al/alpaca-proxy/package.nix @@ -5,16 +5,16 @@ }: buildGoModule rec { pname = "alpaca-proxy"; - version = "2.0.9"; + version = "2.0.10"; src = fetchFromGitHub { owner = "samuong"; repo = "alpaca"; rev = "v${version}"; - hash = "sha256-Rf8//4FeruVZZ//uba80z20XGUxycwF91Aa09fosRXI="; + hash = "sha256-1CMuZl1bVlofogPwA2wRuQPlXNE2EM1B8rDDDaJGq64="; }; - vendorHash = "sha256-JEiHgyPJvWmtPf8R4aX/qlevfZRdKajre324UsgRm5Y="; + vendorHash = "sha256-N9qpyCQg6H1v/JGJ2wCxDX+ZTM9x6/BM6wQ26xC+dlE="; ldflags = [ "-s" diff --git a/pkgs/by-name/ar/armadillo/package.nix b/pkgs/by-name/ar/armadillo/package.nix index 351b252c1494..da683dc7bfbb 100644 --- a/pkgs/by-name/ar/armadillo/package.nix +++ b/pkgs/by-name/ar/armadillo/package.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "armadillo"; - version = "14.2.1"; + version = "14.2.2"; src = fetchurl { url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz"; - hash = "sha256-JJWBXPnRMPcP/7ahJzPQ3K+Gy6rFHotLgq0lGD7aHdU="; + hash = "sha256-MFTI5j2zq98aXI+f235rStgz+bz7WDJMD/ht4HhMcOA="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/au/audiobookshelf/source.json b/pkgs/by-name/au/audiobookshelf/source.json index ac2ed8e3a0b8..9f5c5da60969 100644 --- a/pkgs/by-name/au/audiobookshelf/source.json +++ b/pkgs/by-name/au/audiobookshelf/source.json @@ -1,9 +1,9 @@ { "owner": "advplyr", "repo": "audiobookshelf", - "rev": "de8b0abc3af740148bddde462fe809f03159d678", - "hash": "sha256-lLCG6xw1qWbIOxHbD8ONH7iYzayJ8OhMy+WgaXExcFQ=", - "version": "2.17.7", - "depsHash": "sha256-1uDCbgZNmx8e+LrsOHTfM29SZhS1TLDHmTg48XMbwkg=", - "clientDepsHash": "sha256-cDT45OtLbFDF0TXO4zVVj9+UOJhkb9TjCajtSWq4H8U=" + "rev": "66b90e0841f2b08a4a401fad202605c8fbaf3c48", + "hash": "sha256-SAce3URkZxPa5URyaO7G9xty4JCG0/tJym5fXLnwv74=", + "version": "2.18.1", + "depsHash": "sha256-1d3V8MzIaJdYpY5BdoAX96HTGfjBBNz/JLkG7jl0TRY=", + "clientDepsHash": "sha256-hClfu993JpHWOqPMgmKdMIneAFDYAi6pCPlf8GmXzow=" } diff --git a/pkgs/by-name/aw/awscli2/package.nix b/pkgs/by-name/aw/awscli2/package.nix index b7a7936e5932..aa3a114c9d32 100644 --- a/pkgs/by-name/aw/awscli2/package.nix +++ b/pkgs/by-name/aw/awscli2/package.nix @@ -62,14 +62,14 @@ let in py.pkgs.buildPythonApplication rec { pname = "awscli2"; - version = "2.23.2"; # N.B: if you change this, check if overrides are still up-to-date + version = "2.23.5"; # N.B: if you change this, check if overrides are still up-to-date pyproject = true; src = fetchFromGitHub { owner = "aws"; repo = "aws-cli"; tag = version; - hash = "sha256-1cMZJFhty0YF27EndWc/yVLK1RVA8oI+tkyjePJ0wKI="; + hash = "sha256-uDKiTw1UCcbfitoJzSPzVT1qM4Gm4bQaryRz7VTeEzg="; }; postPatch = '' diff --git a/pkgs/by-name/ay/ayugram-desktop/package.nix b/pkgs/by-name/ay/ayugram-desktop/package.nix index 7cad7d59e3de..d1e5a0799e2f 100644 --- a/pkgs/by-name/ay/ayugram-desktop/package.nix +++ b/pkgs/by-name/ay/ayugram-desktop/package.nix @@ -53,7 +53,7 @@ telegram-desktop.override { ''; homepage = "https://github.com/AyuGram/AyuGramDesktop"; changelog = "https://github.com/AyuGram/AyuGramDesktop/releases/tag/v${finalAttrs.version}"; - maintainers = with lib.maintainers; [ aucub ]; + maintainers = with lib.maintainers; [ ]; }; } ); diff --git a/pkgs/by-name/ba/bazecor/package.nix b/pkgs/by-name/ba/bazecor/package.nix index bce13edccf9b..7d573d478c1f 100644 --- a/pkgs/by-name/ba/bazecor/package.nix +++ b/pkgs/by-name/ba/bazecor/package.nix @@ -6,12 +6,12 @@ }: let pname = "bazecor"; - version = "1.6.1"; + version = "1.6.2"; src = appimageTools.extract { inherit pname version; src = fetchurl { url = "https://github.com/Dygmalab/Bazecor/releases/download/v${version}/Bazecor-${version}-x64.AppImage"; - hash = "sha256-Qf9FqHgTSCD2rYp8PC/gYHyiYcfFTJJmG4oRK/bch8Y="; + hash = "sha256-FfowCbnhGI0sglFvxf7ActUJC9Lsj97Ui08nObBnjoE="; }; # Workaround for https://github.com/Dygmalab/Bazecor/issues/370 diff --git a/pkgs/by-name/be/bespokesynth/package.nix b/pkgs/by-name/be/bespokesynth/package.nix index 29ff82de7e2f..112c83287565 100644 --- a/pkgs/by-name/be/bespokesynth/package.nix +++ b/pkgs/by-name/be/bespokesynth/package.nix @@ -23,6 +23,7 @@ libXScrnSaver, libGL, libxcb, + vst2-sdk, xcbutil, libxkbcommon, xcbutilkeysyms, @@ -40,20 +41,6 @@ enableVST2 ? false, }: -let - # equal to vst-sdk in ../oxefmsynth/default.nix - vst-sdk = stdenv.mkDerivation rec { - name = "vstsdk3610_11_06_2018_build_37"; - src = fetchzip { - url = "https://web.archive.org/web/20181016150224if_/https://download.steinberg.net/sdk_downloads/${name}.zip"; - sha256 = "0da16iwac590wphz2sm5afrfj42jrsnkr1bxcy93lj7a369ildkj"; - }; - installPhase = '' - cp -r . $out - ''; - }; - -in stdenv.mkDerivation (finalAttrs: { pname = "bespokesynth"; version = "1.3.0"; @@ -88,7 +75,7 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeBool "BESPOKE_SYSTEM_JSONCPP" true) ] ++ lib.optionals enableVST2 [ - (lib.cmakeFeature "BESPOKE_VST2_SDK_LOCATION" "${vst-sdk}/VST2_SDK") + (lib.cmakeFeature "BESPOKE_VST2_SDK_LOCATION" "${vst2-sdk}") ]; strictDeps = true; @@ -185,12 +172,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Software modular synth with controllers support, scripting and VST"; homepage = "https://www.bespokesynth.com/"; - license = - with lib.licenses; - [ - gpl3Plus - ] - ++ lib.optional enableVST2 unfree; + license = [ lib.licenses.gpl3Plus ]; maintainers = with lib.maintainers; [ astro tobiasBora diff --git a/pkgs/by-name/be/betterdisplay/package.nix b/pkgs/by-name/be/betterdisplay/package.nix index 937988cd135f..b9c24e497657 100644 --- a/pkgs/by-name/be/betterdisplay/package.nix +++ b/pkgs/by-name/be/betterdisplay/package.nix @@ -11,11 +11,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "betterdisplay"; - version = "3.3.0"; + version = "3.3.2"; src = fetchurl { url = "https://github.com/waydabber/BetterDisplay/releases/download/v${finalAttrs.version}/BetterDisplay-v${finalAttrs.version}.dmg"; - hash = "sha256-A0kh3XNdl5kJ32Kxwb0PAgxfGJR+EZEoaP+gspRJEcU="; + hash = "sha256-4hS+F9cPgQ6HEzX7RkikANyJqc2bMAhKCYlL1lmka54="; }; dontPatch = true; diff --git a/pkgs/by-name/bi/bitcomet/package.nix b/pkgs/by-name/bi/bitcomet/package.nix index b7f0ebdc64d6..4c5c9f69a8cd 100644 --- a/pkgs/by-name/bi/bitcomet/package.nix +++ b/pkgs/by-name/bi/bitcomet/package.nix @@ -38,6 +38,6 @@ appimageTools.wrapType2 { sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.unfree; platforms = [ "x86_64-linux" ]; - maintainers = with lib.maintainers; [ aucub ]; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/by-name/bi/bitrise/package.nix b/pkgs/by-name/bi/bitrise/package.nix index 9d323e69c059..cc65a5bf4b58 100644 --- a/pkgs/by-name/bi/bitrise/package.nix +++ b/pkgs/by-name/bi/bitrise/package.nix @@ -6,13 +6,13 @@ }: buildGoModule rec { pname = "bitrise"; - version = "2.25.0"; + version = "2.26.1"; src = fetchFromGitHub { owner = "bitrise-io"; repo = "bitrise"; rev = version; - hash = "sha256-ejAwUHBx+HwYEQxT+lrXxoiD6hkIIRhBPTPBlqugOrM="; + hash = "sha256-gL9YvddHIU+ZHC5/4NH7xsBLM+p9f5Uc6JzxUAIAVSo="; }; # many tests rely on writable $HOME/.bitrise and require network access diff --git a/pkgs/by-name/bi/bitwarden-desktop/package.nix b/pkgs/by-name/bi/bitwarden-desktop/package.nix index 4bb110d0b884..40912b780968 100644 --- a/pkgs/by-name/bi/bitwarden-desktop/package.nix +++ b/pkgs/by-name/bi/bitwarden-desktop/package.nix @@ -3,13 +3,10 @@ buildNpmPackage, cargo, copyDesktopItems, - electron_32, + electron_33, fetchFromGitHub, - glib, gnome-keyring, - gtk3, jq, - libsecret, makeDesktopItem, makeWrapper, napi-rs-cli, @@ -26,7 +23,7 @@ let description = "Secure and free password manager for all of your devices"; icon = "bitwarden"; - electron = electron_32; + electron = electron_33; bitwardenDesktopNativeArch = { @@ -39,13 +36,13 @@ let in buildNpmPackage rec { pname = "bitwarden-desktop"; - version = "2024.12.1"; + version = "2025.1.1"; src = fetchFromGitHub { owner = "bitwarden"; repo = "clients"; rev = "desktop-v${version}"; - hash = "sha256-nmQUfVhSJrnYWbxjNk0r6vEtPqA8kksEX5gUmpeKe6M="; + hash = "sha256-0NXrTBkCyo9Hw+fyFTfXfa1efBlaM6xWd9Uvsbathpw="; }; patches = [ @@ -70,7 +67,7 @@ buildNpmPackage rec { "--legacy-peer-deps" ]; npmWorkspace = "apps/desktop"; - npmDepsHash = "sha256-5rOA7xtw2jqjoLxEl4lsLWpv32/TYmEaK+UN7R8EoJc="; + npmDepsHash = "sha256-DDsPkvLGOhjmdYEOmhZfe4XHGFyowvWO24YcCA5griM="; cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src; @@ -82,7 +79,7 @@ buildNpmPackage rec { ) patches; patchFlags = [ "-p4" ]; sourceRoot = "${src.name}/${cargoRoot}"; - hash = "sha256-Fh6pbmFof/qIhVETtBA1fGlC45fuu1n7g9hosvmfHZc="; + hash = "sha256-IL8+n+rhRbvRO1jxJSy9PjUMb/tI4S/gzpUNOojBPWk="; }; cargoRoot = "apps/desktop/desktop_native"; @@ -100,12 +97,6 @@ buildNpmPackage rec { rustPlatform.cargoSetupHook ]; - buildInputs = [ - glib - gtk3 - libsecret - ]; - preBuild = '' if [[ $(jq --raw-output '.devDependencies.electron' < package.json | grep -E --only-matching '^[0-9]+') != ${lib.escapeShellArg (lib.versions.major electron.version)} ]]; then echo 'ERROR: electron version mismatch' diff --git a/pkgs/by-name/bl/blade-formatter/package.nix b/pkgs/by-name/bl/blade-formatter/package.nix index 1cca13bb5a3a..b9ffc420275d 100644 --- a/pkgs/by-name/bl/blade-formatter/package.nix +++ b/pkgs/by-name/bl/blade-formatter/package.nix @@ -16,18 +16,18 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "blade-formatter"; - version = "1.42.0"; + version = "1.42.1"; src = fetchFromGitHub { owner = "shufo"; repo = "blade-formatter"; rev = "v${finalAttrs.version}"; - hash = "sha256-aH826UKTJPB/pbR/pEFV/RVXwKw+kG9xpj4pLnfqmU4="; + hash = "sha256-tzga32YPRB3ONsguw+Ap6T98YhKk60bnqeV/OYhuvc4="; }; yarnOfflineCache = fetchYarnDeps { yarnLock = finalAttrs.src + "/yarn.lock"; - hash = "sha256-Iu0J7GHPoU2jwVkX+DY9qWgzgx9JvsBogEJDOS7z1WQ="; + hash = "sha256-ShmvKilQhJN8PNntVbLEKp/cxgmXHIYKOgVrpbrE+3M="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/bl/bloomeetunes/package.nix b/pkgs/by-name/bl/bloomeetunes/package.nix index 20f6ff95a303..0623529bd1a4 100644 --- a/pkgs/by-name/bl/bloomeetunes/package.nix +++ b/pkgs/by-name/bl/bloomeetunes/package.nix @@ -55,7 +55,7 @@ flutter324.buildFlutterApplication rec { homepage = "https://github.com/HemantKArya/BloomeeTunes"; mainProgram = "bloomee"; license = with lib.licenses; [ gpl2Plus ]; - maintainers = with lib.maintainers; [ aucub ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.linux; }; } diff --git a/pkgs/by-name/bm/bms-to-osu/deps.json b/pkgs/by-name/bm/bms-to-osu/deps.json new file mode 100644 index 000000000000..567b37a938f6 --- /dev/null +++ b/pkgs/by-name/bm/bms-to-osu/deps.json @@ -0,0 +1,82 @@ +[ + { + "pname": "CommandLineParser", + "version": "2.9.1", + "hash": "sha256-ApU9y1yX60daSjPk3KYDBeJ7XZByKW8hse9NRZGcjeo=" + }, + { + "pname": "Microsoft.Extensions.Configuration.Abstractions", + "version": "6.0.0", + "hash": "sha256-Evg+Ynj2QUa6Gz+zqF+bUyfGD0HI5A2fHmxZEXbn3HA=" + }, + { + "pname": "Microsoft.Extensions.DependencyInjection", + "version": "6.0.0", + "hash": "sha256-gZuMaunMJVyvvepuzNodGPRc6eqKH//bks3957dYkPI=" + }, + { + "pname": "Microsoft.Extensions.DependencyInjection.Abstractions", + "version": "6.0.0", + "hash": "sha256-SZke0jNKIqJvvukdta+MgIlGsrP2EdPkkS8lfLg7Ju4=" + }, + { + "pname": "Microsoft.Extensions.Logging", + "version": "6.0.0", + "hash": "sha256-8WsZKRGfXW5MsXkMmNVf6slrkw+cR005czkOP2KUqTk=" + }, + { + "pname": "Microsoft.Extensions.Logging.Abstractions", + "version": "6.0.0", + "hash": "sha256-QNqcQ3x+MOK7lXbWkCzSOWa/2QyYNbdM/OEEbWN15Sw=" + }, + { + "pname": "Microsoft.Extensions.Options", + "version": "6.0.0", + "hash": "sha256-DxnEgGiCXpkrxFkxXtOXqwaiAtoIjA8VSSWCcsW0FwE=" + }, + { + "pname": "Microsoft.Extensions.Primitives", + "version": "6.0.0", + "hash": "sha256-AgvysszpQ11AiTBJFkvSy8JnwIWTj15Pfek7T7ThUc4=" + }, + { + "pname": "NLog", + "version": "5.2.5", + "hash": "sha256-QCYHzZ45Gf30NzJaVmGR8kKhIkfrVVjl+J+dliJe3gk=" + }, + { + "pname": "NLog.Extensions.Logging", + "version": "5.3.5", + "hash": "sha256-UjmnTnE3XwMRvyHUywwaOwWeRLWMICNF63sXKoLC7ks=" + }, + { + "pname": "NStack.Core", + "version": "0.17.1", + "hash": "sha256-sVuArQwL2dzytCei2fhCNg1Bcm4vntPb+PpXStk3rqM=" + }, + { + "pname": "System.Diagnostics.DiagnosticSource", + "version": "6.0.0", + "hash": "sha256-RY9uWSPdK2fgSwlj1OHBGBVo3ZvGQgBJNzAsS5OGMWc=" + }, + { + "pname": "System.Runtime.CompilerServices.Unsafe", + "version": "6.0.0", + "hash": "sha256-bEG1PnDp7uKYz/OgLOWs3RWwQSVYm+AnPwVmAmcgp2I=" + }, + { + "pname": "System.Text.Encoding.CodePages", + "version": "6.0.0", + "hash": "sha256-nGc2A6XYnwqGcq8rfgTRjGr+voISxNe/76k2K36coj4=" + }, + { + "pname": "System.ValueTuple", + "version": "4.5.0", + "hash": "sha256-niH6l2fU52vAzuBlwdQMw0OEoRS/7E1w5smBFoqSaAI=" + }, + { + "pname": "Terminal.Gui", + "version": "1.7.2", + "hash": "sha256-qt42B0L8Na3kRCKkzmPru8IoLcjyn6nosEJL7nb67aA=" + } +] diff --git a/pkgs/by-name/bm/bms-to-osu/package.nix b/pkgs/by-name/bm/bms-to-osu/package.nix new file mode 100644 index 000000000000..adfa44349422 --- /dev/null +++ b/pkgs/by-name/bm/bms-to-osu/package.nix @@ -0,0 +1,43 @@ +{ + lib, + fetchFromGitHub, + buildDotnetModule, + ncurses, + ffmpeg, +}: + +let + pname = "bms-to-osu"; + version = "2.5-unstable-2025-01-14"; # 2.5 crashes at runtime due to missing kernel32.dll +in +buildDotnetModule { + inherit pname version; + + src = fetchFromGitHub { + owner = "QingQiz"; + repo = "BmsToOsu"; + rev = "e6b9dbf44ccdda7db15bf28e32d1fc1e5431319f"; # tag = "v${version}"; + hash = "sha256-JaehaKjV2fGyH6hAKwoo0t2B+hRWOjpQoIJpZq8J8C8="; + }; + + makeWrapperArgs = [ + "--suffix" + "PATH" + ":" + "${ffmpeg}/bin" + ]; + + nugetDeps = ./deps.json; + projectFile = "BmsToOsu.sln"; + executables = [ "BmsToOsu" ]; + runtimeDeps = [ ncurses ]; + + meta = { + description = "Convert BMS files to osu! beatmap files"; + license = lib.licenses.agpl3Only; + maintainers = with lib.maintainers; [ ulysseszhan ]; + homepage = "https://github.com/QingQiz/BmsToOsu"; + platforms = lib.platforms.unix; + mainProgram = "BmsToOsu"; + }; +} diff --git a/pkgs/by-name/bn/bngblaster/package.nix b/pkgs/by-name/bn/bngblaster/package.nix index 79b4cbb77105..e737a3374f5f 100644 --- a/pkgs/by-name/bn/bngblaster/package.nix +++ b/pkgs/by-name/bn/bngblaster/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "bngblaster"; - version = "0.9.14"; + version = "0.9.15"; src = fetchFromGitHub { owner = "rtbrick"; repo = "bngblaster"; rev = finalAttrs.version; - hash = "sha256-vToKrP/T3qVb9UylNyZRvP+kWoizIjjXTbVlNebKG/M="; + hash = "sha256-HqwyqUkLYoXTjx01pB8sL3hBXwLqe441M+LTqBhaZ58="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/bo/bootstrap-studio/package.nix b/pkgs/by-name/bo/bootstrap-studio/package.nix index 4ffaa8eae5f6..0abce66cdede 100644 --- a/pkgs/by-name/bo/bootstrap-studio/package.nix +++ b/pkgs/by-name/bo/bootstrap-studio/package.nix @@ -2,10 +2,10 @@ let pname = "bootstrap-studio"; - version = "7.0.2"; + version = "7.0.3"; src = fetchurl { url = "https://releases.bootstrapstudio.io/${version}/Bootstrap%20Studio.AppImage"; - sha256 = "sha256-HnDBSAhENeJMvFXMwmHTeGMoLkr8/0eQDKaX0U8tJcA="; + sha256 = "sha256-QfIZ2Gn1XT27Y6B0452MMWiHnJfPEWy79VY5vZxtlyE="; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; in diff --git a/pkgs/by-name/bo/boxbuddy/package.nix b/pkgs/by-name/bo/boxbuddy/package.nix index f1fc14620fcd..e144f761d624 100644 --- a/pkgs/by-name/bo/boxbuddy/package.nix +++ b/pkgs/by-name/bo/boxbuddy/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "boxbuddy"; - version = "2.5.2"; + version = "2.5.3"; src = fetchFromGitHub { owner = "Dvlv"; repo = "BoxBuddyRS"; rev = version; - hash = "sha256-wtAc5h3bm/X1aCPGjl30NaM7XR602q5NdlamUQvADDo="; + hash = "sha256-9BGgm4yRjCarJIGP/G9gPj/qsYWb96XGJmpgLj3XCdM="; }; - cargoHash = "sha256-oyxO92wXVN7kbIcTy5OAaqK/ySnetpkFwcop34ERpxs="; + cargoHash = "sha256-/0tk3unjiXwBqQEMTYMu1kasb34i0nbp99PHmtpdxAA="; # The software assumes it is installed either in flatpak or in the home directory # so the xdg data path needs to be patched here diff --git a/pkgs/by-name/bp/bpftrace/package.nix b/pkgs/by-name/bp/bpftrace/package.nix index 9fa9faa0a658..4e648e80b5cb 100644 --- a/pkgs/by-name/bp/bpftrace/package.nix +++ b/pkgs/by-name/bp/bpftrace/package.nix @@ -58,10 +58,6 @@ stdenv.mkDerivation rec { "-DSYSTEM_INCLUDE_PATHS=${glibc.dev}/include" ]; - postPatch = '' - substituteInPlace CMakeLists.txt --replace "set(MAX_LLVM_MAJOR 18)" "set(MAX_LLVM_MAJOR 19)" - ''; - # Pull BPF scripts into $PATH (next to their bcc program equivalents), but do # not move them to keep `${pkgs.bpftrace}/share/bpftrace/tools/...` working. postInstall = '' diff --git a/pkgs/by-name/bu/buildpack/package.nix b/pkgs/by-name/bu/buildpack/package.nix index d90f88b6e69b..5fe645989999 100644 --- a/pkgs/by-name/bu/buildpack/package.nix +++ b/pkgs/by-name/bu/buildpack/package.nix @@ -7,7 +7,7 @@ let pname = "pack"; - version = "0.36.2"; + version = "0.36.4"; in buildGoModule { inherit pname version; @@ -16,10 +16,10 @@ buildGoModule { owner = "buildpacks"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-pITQAGt0aMhEfoauPWxAqnr8JxGi4DcqcmgqtooLkd4="; + hash = "sha256-6cWmBNlmPnNszmv6zaHlyd8GqncMtttKOMfQxxJGJ18="; }; - vendorHash = "sha256-51Qqq2Jpd1XxUoMN+6j4/VZ4fLCm4I9JwBeTcdSHgQw="; + vendorHash = "sha256-9fO/jwTpVvCdHIy1GrE2YZr7jN7Oyw64EbS2w08VOVI="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/bu/butterfly/package.nix b/pkgs/by-name/bu/butterfly/package.nix index 4fa0dff346ff..b8a87e17654c 100644 --- a/pkgs/by-name/bu/butterfly/package.nix +++ b/pkgs/by-name/bu/butterfly/package.nix @@ -48,7 +48,7 @@ flutter327.buildFlutterApplication rec { cc-by-sa-40 asl20 ]; - maintainers = with lib.maintainers; [ aucub ]; + maintainers = with lib.maintainers; [ ]; platforms = [ "aarch64-linux" "x86_64-linux" diff --git a/pkgs/by-name/ca/capnproto-rust/package.nix b/pkgs/by-name/ca/capnproto-rust/package.nix index 087dcf2745ac..2adba43fe8b2 100644 --- a/pkgs/by-name/ca/capnproto-rust/package.nix +++ b/pkgs/by-name/ca/capnproto-rust/package.nix @@ -3,19 +3,20 @@ fetchCrate, rustPlatform, capnproto, + nix-update-script, }: rustPlatform.buildRustPackage rec { pname = "capnproto-rust"; - version = "0.17.2"; + version = "0.20.1"; src = fetchCrate { crateName = "capnpc"; inherit version; - hash = "sha256-WVjXVLVoTCAtA8a6+zaX4itAaPCWb2c0trtSsxBopO4="; + hash = "sha256-iLjvKxVfkAVoM4AYgr31Ud1mk3MyMPReDXv1IbKEvcE="; }; - cargoHash = "sha256-h9YArxHnY14T8eQCS4JVItjaCjv+2dorcOVBir7r6SY="; + cargoHash = "sha256-KNUXIKzTlbEW7WUwqVOXjN5/6BDGEbOjbKELo0KtWDc="; postInstall = '' mkdir -p $out/include/capnp @@ -26,6 +27,8 @@ rustPlatform.buildRustPackage rec { capnproto ]; + passthru.updateScript = nix-update-script { }; + meta = with lib; { description = "Cap'n Proto codegen plugin for Rust"; homepage = "https://github.com/capnproto/capnproto-rust"; diff --git a/pkgs/by-name/ca/cargo-binstall/package.nix b/pkgs/by-name/ca/cargo-binstall/package.nix index ac353879f7ec..20cdbf61b9ea 100644 --- a/pkgs/by-name/ca/cargo-binstall/package.nix +++ b/pkgs/by-name/ca/cargo-binstall/package.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-binstall"; - version = "1.10.19"; + version = "1.10.22"; src = fetchFromGitHub { owner = "cargo-bins"; repo = "cargo-binstall"; rev = "v${version}"; - hash = "sha256-dKQRXEZfvONaWocvoaEQtENAyNvIUaqomckaSj7bUtM="; + hash = "sha256-b2Cn5FWXmI5ij98A8Y0KUm8LGB73Ho2UzhrOd+7eCEg="; }; - cargoHash = "sha256-gN6aNPV6K8BUTUvTTKtTu54JFLwL1XSA0rA4EyKdovc="; + cargoHash = "sha256-LbfgOfd6ubAWP6l5gi5Xd737LxgymlDS2+qdhr+FJPE="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ca/cargo-deb/package.nix b/pkgs/by-name/ca/cargo-deb/package.nix index 0b2902163bd5..38fbc19a9d2b 100644 --- a/pkgs/by-name/ca/cargo-deb/package.nix +++ b/pkgs/by-name/ca/cargo-deb/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-deb"; - version = "2.10.0"; + version = "2.11.0"; src = fetchFromGitHub { owner = "kornelski"; repo = pname; rev = "v${version}"; - hash = "sha256-J3ChNrZUctDcs1bOCoDLTQtqTT9rWi24XK2fki8PYLw="; + hash = "sha256-Nr6Hl8kjLHVrxqj5Xm147gb13xF2dQ5C+KuPD+PQglU="; }; - cargoHash = "sha256-CjlMadj4/QhbSlCoZs3JRaplbY4XlcBFKR4ZXJLK+Uo="; + cargoHash = "sha256-hQQ03tdEyxEBqdxGmz6y70jSGpW7CAn7Pm2pTS5jwOM="; nativeBuildInputs = [ makeWrapper diff --git a/pkgs/by-name/ca/cargo-kcov/package.nix b/pkgs/by-name/ca/cargo-kcov/package.nix deleted file mode 100644 index aa2adfe12dfe..000000000000 --- a/pkgs/by-name/ca/cargo-kcov/package.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ - lib, - rustPlatform, - fetchFromGitHub, - makeWrapper, - kcov, -}: - -rustPlatform.buildRustPackage rec { - pname = "cargo-kcov"; - version = "0.5.2"; - - src = fetchFromGitHub { - owner = "kennytm"; - repo = pname; - rev = "v${version}"; - sha256 = "0hqplgj3i8js42v2kj44khk543a93sk3n6wlfpv3c84pdqlm29br"; - }; - - cargoHash = "sha256-cgnTf4KKthO1HvjFCjoZw7eCTqsbobHW5Kjx/6V3r1Q="; - doCheck = false; - - nativeBuildInputs = [ makeWrapper ]; - - postInstall = '' - wrapProgram $out/bin/cargo-kcov \ - --prefix PATH : ${lib.makeBinPath [ kcov ]} - ''; - - meta = with lib; { - description = "Cargo subcommand to run kcov to get coverage report on Linux"; - mainProgram = "cargo-kcov"; - homepage = "https://github.com/kennytm/cargo-kcov"; - license = with licenses; [ mit ]; - maintainers = with maintainers; [ - saschagrunert - matthiasbeyer - ]; - }; -} diff --git a/pkgs/by-name/ca/cargo-modules/package.nix b/pkgs/by-name/ca/cargo-modules/package.nix index 2084275ec1ba..0737be7896de 100644 --- a/pkgs/by-name/ca/cargo-modules/package.nix +++ b/pkgs/by-name/ca/cargo-modules/package.nix @@ -6,16 +6,16 @@ }: rustPlatform.buildRustPackage rec { pname = "cargo-modules"; - version = "0.21.1"; + version = "0.21.2"; src = fetchFromGitHub { owner = "regexident"; repo = "cargo-modules"; tag = "v${version}"; - hash = "sha256-QVG/N+t6fify6I9uvLAqWLagmEnhd5i5Iz9HWdysmzk="; + hash = "sha256-mrl1I1dmf2WqtUbBsUq3kgqPwc4S/EaYRc/B9hpEo90="; }; - cargoHash = "sha256-9SzM9jkAcnRctNedImoH+32hVAtPAkXLzxgmOo3Dcxc="; + cargoHash = "sha256-6vmd7yQcDf1keu6uPKJFRMpt3ZgRe1M3AfUZjf1KBIk="; checkFlags = [ "--skip=cfg_test::with_tests::smoke" diff --git a/pkgs/by-name/ca/cargo-profiler/package.nix b/pkgs/by-name/ca/cargo-profiler/package.nix index adceadd6ccc2..0874582ea0ab 100644 --- a/pkgs/by-name/ca/cargo-profiler/package.nix +++ b/pkgs/by-name/ca/cargo-profiler/package.nix @@ -13,7 +13,7 @@ let version = "0.2.0"; rev = "0a8ab772fd5c0f1579e4847c5d05aa443ffa2bc8"; hash = "sha256-ZRAbvSMrPtgaWy9RwlykQ3iiPxHCMh/tS5p67/4XqqA="; - cargoHash = "sha256-qt3S6ZcLEP9ZQoP5+kSQdmBlxdMgGUqLszdU7JkFNVI="; + cargoHash = "sha256-GrHH98jcJaEkCzHe1hoVAeZvTvE0kXdp0bPTIiiOYss="; inherit (rustPlatform) buildRustPackage; in @@ -25,6 +25,7 @@ buildRustPackage rec { repo = pname; }; + useFetchCargoVendor = true; inherit cargoHash; meta = with lib; { diff --git a/pkgs/by-name/ca/cargo-public-api/package.nix b/pkgs/by-name/ca/cargo-public-api/package.nix index 8142273039bb..53ca357bbd6e 100644 --- a/pkgs/by-name/ca/cargo-public-api/package.nix +++ b/pkgs/by-name/ca/cargo-public-api/package.nix @@ -11,14 +11,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-public-api"; - version = "0.42.0"; + version = "0.43.0"; src = fetchCrate { inherit pname version; - hash = "sha256-vQhKvL9vRUq7WqtJ25v12DuCzO90bgXLmwu2Mm1jbig="; + hash = "sha256-oAtAfoWJ4YZ9YcU7DQtj6QqF1DSEMOUjauQxqo1a6GA="; }; - cargoHash = "sha256-Gm72Hr+bVmNwdFAIsAatTcF9Il6JG2i6dQPu1ZQy46o="; + cargoHash = "sha256-+mrPrYk/qj4UtbUgFIFS0XUp25uLs8fNhvSzx1nu1ng="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/ca/cargo-tauri/package.nix b/pkgs/by-name/ca/cargo-tauri/package.nix index b824763c4bf7..6bd040f99a0f 100644 --- a/pkgs/by-name/ca/cargo-tauri/package.nix +++ b/pkgs/by-name/ca/cargo-tauri/package.nix @@ -13,17 +13,17 @@ rustPlatform.buildRustPackage rec { pname = "tauri"; - version = "2.2.2"; + version = "2.2.3"; src = fetchFromGitHub { owner = "tauri-apps"; repo = "tauri"; tag = "tauri-v${version}"; - hash = "sha256-agmY/39tkz71kCSksIyrbxDrvnOJpBSYCdygjd4rOBY="; + hash = "sha256-VZPMy1UMvELcJxu5DHz4YSVe4wVrxrJjeiJK3ySczCA="; }; useFetchCargoVendor = true; - cargoHash = "sha256-i4ACVFWVEs866kJHNE49fnFj87GZbJIg5p1J3eVLRwE="; + cargoHash = "sha256-LcwOKUFiHoZ4WmTlwqsA2A9BZkBLPEINjZSyk6skvbA="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/ca/cargo-tauri/test-app.nix b/pkgs/by-name/ca/cargo-tauri/test-app.nix index 811e051f3202..8f039fffd9ea 100644 --- a/pkgs/by-name/ca/cargo-tauri/test-app.nix +++ b/pkgs/by-name/ca/cargo-tauri/test-app.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { src ; - hash = "sha256-vTjJz2t7ZrMQqOPjcWAoAl2tfKqJ0zgipegSpEvwJ9k="; + hash = "sha256-deLcw84MsSqoVTUgqEJrcZhzFxACw56WIgsC8iYR4zk="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ch/chawan/package.nix b/pkgs/by-name/ch/chawan/package.nix index ce320d7d167e..6463f47f429a 100644 --- a/pkgs/by-name/ch/chawan/package.nix +++ b/pkgs/by-name/ch/chawan/package.nix @@ -16,22 +16,24 @@ stdenv.mkDerivation { pname = "chawan"; - version = "0-unstable-2024-12-27"; + version = "0-unstable-2025-01-06"; src = fetchFromSourcehut { owner = "~bptato"; repo = "chawan"; - rev = "93033c2c382aaff01b1aba6f5db7652c35708bf3"; - hash = "sha256-MEOIu1CI/VTvd2cixa57Tv1xtBMXiMdD37ZYjAlg5S4="; + rev = "30a933adb2bade2ceee08a9b36371cecf554d648"; + hash = "sha256-EepSEN66GTdWfCSiR/p69pN5bvTEiUFOMErCxedrq+g="; fetchSubmodules = true; }; - patches = [ - # Include chawan's man pages in mancha's search path - (replaceVars ./mancha-augment-path.diff { - out = placeholder "out"; - }) - ]; + patches = [ ./mancha-augment-path.diff ]; + + # Include chawan's man pages in mancha's search path + postPatch = '' + # As we need the $out reference, we can't use `replaceVars` here. + substituteInPlace adapter/protocol/man.nim \ + --replace-fail '@out@' "$out" + ''; env.NIX_CFLAGS_COMPILE = toString ( lib.optional stdenv.cc.isClang "-Wno-error=implicit-function-declaration" diff --git a/pkgs/by-name/ch/chirp/package.nix b/pkgs/by-name/ch/chirp/package.nix index 11f8d65e671d..5d4fa5cd1766 100644 --- a/pkgs/by-name/ch/chirp/package.nix +++ b/pkgs/by-name/ch/chirp/package.nix @@ -11,14 +11,14 @@ python3Packages.buildPythonApplication { pname = "chirp"; - version = "0.4.0-unstable-2025-01-12"; + version = "0.4.0-unstable-2025-01-22"; pyproject = true; src = fetchFromGitHub { owner = "kk7ds"; repo = "chirp"; - rev = "fc94f14823f3257961c4d0e144083fe6f397ad55"; - hash = "sha256-J1Hhz6M1VhfIttz9lJnPNQsOJbzKBrb6Yz154oh3moo="; + rev = "470a8a0a5c5a878a72233339998f2e527dd32ff2"; + hash = "sha256-H5N4YahSoMeKC+j6D6xj0MrZFUqcupvuqnahKhrq+sU="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ci/cilium-cli/package.nix b/pkgs/by-name/ci/cilium-cli/package.nix index cd0054e9d4f5..c6dabec52841 100644 --- a/pkgs/by-name/ci/cilium-cli/package.nix +++ b/pkgs/by-name/ci/cilium-cli/package.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "cilium-cli"; - version = "0.16.22"; + version = "0.16.23"; src = fetchFromGitHub { owner = "cilium"; repo = "cilium-cli"; tag = "v${version}"; - hash = "sha256-P4S+4N9f/m28lNwx7xzYcq99nvXelSvzX01QXDhfGM4="; + hash = "sha256-8GD3VjYInPaxOFoPeJGWIDfOIUQ7+g3GgfVq/IS18Bw="; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/ci/circt/package.nix b/pkgs/by-name/ci/circt/package.nix index 83b1fb8451f1..c9d6c4999651 100644 --- a/pkgs/by-name/ci/circt/package.nix +++ b/pkgs/by-name/ci/circt/package.nix @@ -19,12 +19,12 @@ let in stdenv.mkDerivation rec { pname = "circt"; - version = "1.102.0"; + version = "1.103.0"; src = fetchFromGitHub { owner = "llvm"; repo = "circt"; rev = "firtool-${version}"; - hash = "sha256-hnmQR9Buu+2z1UkeStVFazbl/czUhV8E7sZrkcPGKFo="; + hash = "sha256-MpNsGioHd7VstuHlzI7SUvrvGcSpViULzAyL0CzMFgw="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/ci/circup/package.nix b/pkgs/by-name/ci/circup/package.nix index f212569df456..c7464f2ee953 100644 --- a/pkgs/by-name/ci/circup/package.nix +++ b/pkgs/by-name/ci/circup/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "circup"; - version = "2.1.0"; + version = "2.1.1"; pyproject = true; src = fetchFromGitHub { owner = "adafruit"; repo = "circup"; tag = version; - hash = "sha256-4jmqS/XMB8t7aMfHriipi+VnCbZqrqjt21K5ktes2ec="; + hash = "sha256-G2c2Psd5cyjKkpqYQOLVWSeLIWdoxYm45KLT0q7cTzQ="; }; pythonRelaxDeps = [ "semver" ]; diff --git a/pkgs/by-name/cl/clapboard/package.nix b/pkgs/by-name/cl/clapboard/package.nix index 7b8948a6bdc8..4af853976162 100644 --- a/pkgs/by-name/cl/clapboard/package.nix +++ b/pkgs/by-name/cl/clapboard/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "clapboard"; - version = "1.0.0"; + version = "1.0.3"; src = fetchFromGitHub { owner = "bjesus"; repo = "clapboard"; rev = "v${version}"; - hash = "sha256-dXlUOIYgptYqUIIC7batc0TVQeP89i8vizwYSIUlzGA="; + hash = "sha256-TM07BcluIh+MEcVg1ApZu85rj36ZBUfn125A0eALNMo="; }; - cargoHash = "sha256-Ll2fpH0v3ZWizrl6Mip0gaPCHlQAdddh9F9bNXveb/0="; + cargoHash = "sha256-Oz/UWN/Ck4uxGQjnaE9KB70AElCjqjJaZLGU71nh6N8="; meta = with lib; { description = "Wayland clipboard manager that will make you clap"; diff --git a/pkgs/by-name/cl/clash-rs/package.nix b/pkgs/by-name/cl/clash-rs/package.nix index 5f7d49f4544b..cd0ad8ef9511 100644 --- a/pkgs/by-name/cl/clash-rs/package.nix +++ b/pkgs/by-name/cl/clash-rs/package.nix @@ -51,7 +51,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/Watfaq/clash-rs"; mainProgram = "clash"; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ aucub ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.linux ++ lib.platforms.darwin; }; } diff --git a/pkgs/by-name/cl/clog-cli/package.nix b/pkgs/by-name/cl/clog-cli/package.nix index 06c498f6762d..3bec43a212ef 100644 --- a/pkgs/by-name/cl/clog-cli/package.nix +++ b/pkgs/by-name/cl/clog-cli/package.nix @@ -6,16 +6,19 @@ rustPlatform.buildRustPackage rec { pname = "clog-cli"; - version = "0.9.3"; + version = "0.10.0"; src = fetchFromGitHub { owner = "clog-tool"; repo = "clog-cli"; - rev = "v${version}"; - sha256 = "1wxglc4n1dar5qphhj5pab7ps34cjr7jy611fwn72lz0f6c7jp3z"; + # Tag seems to be missing: + # https://github.com/clog-tool/clog-cli/issues/128 + rev = "7066cba2bcbaea0f62ea22c320d48dac20f36a38"; + sha256 = "sha256-d1csT7iHf48kLkn6/cGhoIoEN/kiYc6vlUwHDNmbnMI="; }; - cargoHash = "sha256-yjBgccrkG2D8ZW3Uju4XUhz9Kar50jkJZ75MWhn9j3U="; + useFetchCargoVendor = true; + cargoHash = "sha256-b8/n3y6fTqP5+rZySEDEb8Z5DPHQ2jUasp5SvaJJlGo="; meta = { description = "Generate changelogs from local git metadata"; @@ -24,7 +27,5 @@ rustPlatform.buildRustPackage rec { platforms = lib.platforms.unix; maintainers = [ lib.maintainers.nthorne ]; mainProgram = "clog"; - # error: could not compile `rustc-serialize` - broken = true; # Added 2024-03-16 }; } diff --git a/pkgs/by-name/cl/clorinde/package.nix b/pkgs/by-name/cl/clorinde/package.nix new file mode 100644 index 000000000000..7cd746071be6 --- /dev/null +++ b/pkgs/by-name/cl/clorinde/package.nix @@ -0,0 +1,49 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + versionCheckHook, + nix-update-script, +}: + +rustPlatform.buildRustPackage rec { + pname = "clorinde"; + version = "0.11.2"; + + src = fetchFromGitHub { + owner = "halcyonnouveau"; + repo = "clorinde"; + tag = "clorinde-v${version}"; + hash = "sha256-Nqf0NNjE3gu+75tjMKAY3Wn75PiPwpnXgXtzdhqx7u8="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-ssyx72o/eTcFClLyl4QJ71okqKU2k6SZVH0eGEFzIjs="; + + cargoBuildFlags = [ "--package=clorinde" ]; + + cargoTestFlags = cargoBuildFlags; + + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "--version"; + doInstallCheck = true; + + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version-regex" + "clorinde-v(.*)" + ]; + }; + + meta = { + description = "Generate type-checked Rust from your PostgreSQL"; + homepage = "https://github.com/halcyonnouveau/clorinde"; + changelog = "https://github.com/halcyonnouveau/clorinde/blob/${src.rev}/CHANGELOG.md"; + license = with lib.licenses; [ + mit + asl20 + ]; + maintainers = with lib.maintainers; [ defelo ]; + mainProgram = "clorinde"; + }; +} diff --git a/pkgs/by-name/cl/cloud-nuke/package.nix b/pkgs/by-name/cl/cloud-nuke/package.nix index 560b04ae9a81..bfda4b7531cf 100644 --- a/pkgs/by-name/cl/cloud-nuke/package.nix +++ b/pkgs/by-name/cl/cloud-nuke/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "cloud-nuke"; - version = "0.38.0"; + version = "0.38.1"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; tag = "v${version}"; - hash = "sha256-bQPfKIpOh3eq+7cGU7pB+y2a9wsOXNBdmqYbZ0kC6k8="; + hash = "sha256-i+mhxcY7201YADNb+OHLoh4zLIBLwkWVBZ6RnYPOJaM="; }; - vendorHash = "sha256-8PXmTI6xthWvAOkyOsxqr+ea0cscDMg3yp4DELDQvZA="; + vendorHash = "sha256-OrTRHje3ks3eGsJNusWJTpL740OWj5jy1es52DfNDbI="; nativeBuildInputs = [ makeBinaryWrapper diff --git a/pkgs/by-name/cn/cnijfilter_4_00/package.nix b/pkgs/by-name/cn/cnijfilter_4_00/package.nix index 4ae5a908bf87..16ff7195b2fd 100644 --- a/pkgs/by-name/cn/cnijfilter_4_00/package.nix +++ b/pkgs/by-name/cn/cnijfilter_4_00/package.nix @@ -1,5 +1,5 @@ { - stdenv, + gcc13Stdenv, lib, fetchzip, autoconf, @@ -21,6 +21,7 @@ */ let + stdenv = gcc13Stdenv; arch = if stdenv.hostPlatform.system == "x86_64-linux" then "64" diff --git a/pkgs/by-name/co/codeql/package.nix b/pkgs/by-name/co/codeql/package.nix index 4bc7fe2500e6..59d1a4828d79 100644 --- a/pkgs/by-name/co/codeql/package.nix +++ b/pkgs/by-name/co/codeql/package.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { pname = "codeql"; - version = "2.20.1"; + version = "2.20.2"; dontConfigure = true; dontBuild = true; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { src = fetchzip { url = "https://github.com/github/codeql-cli-binaries/releases/download/v${version}/codeql.zip"; - hash = "sha256-9BNp4PxRL9YbzQ/AeW6EFk6xv1XmwDwxZgu3DL79H8w="; + hash = "sha256-t2CT2bseVlVVt5h5j9r9usdr7za2ki+qYSsm5wG7kk8="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/co/codespell/package.nix b/pkgs/by-name/co/codespell/package.nix index d46e98116855..6f92315c87c9 100644 --- a/pkgs/by-name/co/codespell/package.nix +++ b/pkgs/by-name/co/codespell/package.nix @@ -7,14 +7,14 @@ python3.pkgs.buildPythonApplication rec { pname = "codespell"; - version = "2.3.0"; + version = "2.4.0"; format = "pyproject"; src = fetchFromGitHub { owner = "codespell-project"; repo = "codespell"; - rev = "v${version}"; - sha256 = "sha256-X3Pueu0E7Q57sbKSXqCZki4/PUb1WyWk/Zmj+lhVTM8="; + tag = "v${version}"; + sha256 = "sha256-TZH3+ZzsThh0GDtiSU1ZEStmCHmEuNDrk/Vyc8E2ESI="; }; nativeBuildInputs = with python3.pkgs; [ diff --git a/pkgs/by-name/co/commonsDaemon/package.nix b/pkgs/by-name/co/commonsDaemon/package.nix index a5a8c84c66d7..37208c10c6b2 100644 --- a/pkgs/by-name/co/commonsDaemon/package.nix +++ b/pkgs/by-name/co/commonsDaemon/package.nix @@ -5,12 +5,12 @@ }: stdenv.mkDerivation rec { - version = "1.4.0"; + version = "1.4.1"; pname = "commons-daemon"; src = fetchurl { url = "mirror://apache/commons/daemon/binaries/commons-daemon-${version}-bin.tar.gz"; - sha256 = "sha256-Cnsd15yREDtkoNFRAsIpACnChncVNgddTJ1CEvhKn48="; + sha256 = "sha256-pfKrZ3duDz5wKTn3+SM+ye3UNN129VWCPOeI7JSuYts="; }; installPhase = '' diff --git a/pkgs/by-name/co/coursier/package.nix b/pkgs/by-name/co/coursier/package.nix index 74fbec4ad226..51ce6aa5c88f 100644 --- a/pkgs/by-name/co/coursier/package.nix +++ b/pkgs/by-name/co/coursier/package.nix @@ -20,11 +20,11 @@ let in stdenv.mkDerivation rec { pname = "coursier"; - version = "2.1.22"; + version = "2.1.24"; src = fetchurl { url = "https://github.com/coursier/coursier/releases/download/v${version}/coursier"; - hash = "sha256-0ugWgvG3AHt7h8F8W8kCksyx93YO51i5StqGAEZXGmg="; + hash = "sha256-eql18SRpcm1ruHhSEHr+C41vPIKxKknvQ8xmR8TgV8o="; }; dontUnpack = true; diff --git a/pkgs/by-name/co/cozette/package.nix b/pkgs/by-name/co/cozette/package.nix index 38ac3c054cf5..a6d296ead85d 100644 --- a/pkgs/by-name/co/cozette/package.nix +++ b/pkgs/by-name/co/cozette/package.nix @@ -6,13 +6,13 @@ stdenvNoCC.mkDerivation rec { pname = "cozette"; - version = "1.25.2"; + version = "1.26.0"; src = fetchzip { url = "https://github.com/slavfox/Cozette/releases/download/v.${version}/CozetteFonts-v-${ builtins.replaceStrings [ "." ] [ "-" ] version }.zip"; - hash = "sha256-LtZHbsma9EuegS349gQo4W+ZT8x+Vb3CD/5vRKjwkzc="; + hash = "sha256-FOgRz9amVmJSBYPa0HEwzXWsdcc53td9g3tY3sQbs9c="; }; installPhase = '' diff --git a/pkgs/by-name/cp/cproto/package.nix b/pkgs/by-name/cp/cproto/package.nix index eb473627c45d..e1a0bc65d2a4 100644 --- a/pkgs/by-name/cp/cproto/package.nix +++ b/pkgs/by-name/cp/cproto/package.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { pname = "cproto"; - version = "4.7w"; + version = "4.7x"; src = fetchurl { urls = [ @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { # No version listings and apparently no versioned tarball over http(s). "ftp://ftp.invisible-island.net/cproto/cproto-${version}.tgz" ]; - sha256 = "sha256-ix1GjM2aKFnzmcdf773KDf3KTcMYkf7bxArFwybSe20="; + sha256 = "sha256-+yS3JU2KURiRPTt6VDMZdeYFU6/HC4jk58KZggNHjP4="; }; # patch made by Joe Khoobyar copied from gentoo bugs diff --git a/pkgs/by-name/da/dafny/deps.json b/pkgs/by-name/da/dafny/deps.json index bea763e1a178..fe629403b62f 100644 --- a/pkgs/by-name/da/dafny/deps.json +++ b/pkgs/by-name/da/dafny/deps.json @@ -1,73 +1,73 @@ [ { "pname": "Boogie", - "version": "3.1.3", - "hash": "sha256-0XQcD1ImPNPXQ43fTkahC3qr2zUvHNdmgw0tmYE+7Hc=" + "version": "3.2.5", + "hash": "sha256-/ZbKajyZuBV3zyh7JfwBfrcxaRpIkUfWGOjxB1qExX8=" }, { "pname": "Boogie.AbstractInterpretation", - "version": "3.2.3", - "hash": "sha256-SwJ5D3tOU+qcyQdNITIM15ujMEC++aXHOsUSovWbsC4=" + "version": "3.4.3", + "hash": "sha256-s3cykv7AMeC+UhmYzGdM75/3/7CxX4h292DGTE9Yd4U=" }, { "pname": "Boogie.BaseTypes", - "version": "3.2.3", - "hash": "sha256-cIUdpGGjMKn70Z0nD8rvva8UbFSoLDUrBprC+TMG/EA=" + "version": "3.4.3", + "hash": "sha256-vSjGt+GKK2oGNY9ZJTvDT8A/H+eCbm1D+CppoKIWW88=" }, { "pname": "Boogie.CodeContractsExtender", - "version": "3.2.3", - "hash": "sha256-L+phJ66oHNINliPkabU3vO4Vl9Lkv+nug+DWC8VmFlc=" + "version": "3.4.3", + "hash": "sha256-mb8RXgKJCutupsg/oFxMENlltn5nmjt7bXAodN6t9dA=" }, { "pname": "Boogie.Concurrency", - "version": "3.2.3", - "hash": "sha256-w+5B+uyfKCf8j8hP0G/SSPUd2lT2T8A4Lkg0tsxniBg=" + "version": "3.4.3", + "hash": "sha256-piDvI01lZb23LkL/NX+NDnGVnHn1q4B/YoS7FrcQZ+M=" }, { "pname": "Boogie.Core", - "version": "3.2.3", - "hash": "sha256-qqoeLAdpRRaTISdgxyE3iFqhrmezxISaE5bm02rXVyE=" + "version": "3.4.3", + "hash": "sha256-EUckeyktsBHLVCQlf9CQtx3vmgts2zpVcS0NiVw6WlY=" }, { "pname": "Boogie.ExecutionEngine", - "version": "3.2.3", - "hash": "sha256-8EKwiBnoMFGxeK2+IuG5p6BtnPlR0CCekXi4PBFLEbU=" + "version": "3.4.3", + "hash": "sha256-+57PiqmW9CJuHYoAt6hMuWOveZpZTztwUrzzQsajo2A=" }, { "pname": "Boogie.Graph", - "version": "3.2.3", - "hash": "sha256-7XjrCHSnvEL7eMmma2vKA7r8YGJe8Oo4E8U9Wja/al0=" + "version": "3.4.3", + "hash": "sha256-eWn8EWUlWZQ2U06anUBaPfdBNzqK5xP7xdntSB7F3mw=" }, { "pname": "Boogie.Houdini", - "version": "3.2.3", - "hash": "sha256-g7i0yF/89IWXElTi0onOgvPaesqlPGl3qINMCePHGA8=" + "version": "3.4.3", + "hash": "sha256-BJLTqC2ih5XHLCmzf/4TKUZCpUCf6PmBTujIIRykLcc=" }, { "pname": "Boogie.Model", - "version": "3.2.3", - "hash": "sha256-gRMZQQFMjQEQasg3A3iZ9/0KUWCxAoUPiHPZHbWXUs4=" + "version": "3.4.3", + "hash": "sha256-3CrdoCM85IkZ7E8gTdmUspmUFbYpBu1PmbF4a2U7I8E=" }, { "pname": "Boogie.Provers.LeanAuto", - "version": "3.2.3", - "hash": "sha256-kMLvTTnvKWjggSby7D4jkaRmdvvOum0ZlfM6yU2760Q=" + "version": "3.4.3", + "hash": "sha256-GJY7XUBFhL6N7U8QJmvCc7G8k3pV8LfyMhDev37GmFc=" }, { "pname": "Boogie.Provers.SMTLib", - "version": "3.2.3", - "hash": "sha256-SCfEJCRueTE66ZZbHX8FHpD50SrBDQne8725uiKjbvM=" + "version": "3.4.3", + "hash": "sha256-llI/WhQsM8KygDB/OYY5yc8U9SN3rd3NCkWFsB3yCDM=" }, { "pname": "Boogie.VCExpr", - "version": "3.2.3", - "hash": "sha256-U6Rc5P0dUtNZ1IGDBU4hggwreVxSZqu6cZSKcWLpq/o=" + "version": "3.4.3", + "hash": "sha256-muY74ki4Cq8JoA4tGUxxWPNAlGhAq4dtGTSoCxNQZm0=" }, { "pname": "Boogie.VCGeneration", - "version": "3.2.3", - "hash": "sha256-snbFiueD508B1GLqIC8cQdT9jW2jkRyhmYxPTlfnyrQ=" + "version": "3.4.3", + "hash": "sha256-ngZtONjWgr0BbQcGNl5uynY5Ac6JRDZujgUNQJgvhJg=" }, { "pname": "CocoR", @@ -739,11 +739,6 @@ "version": "4.3.0", "hash": "sha256-wLDHmozr84v1W2zYCWYxxj0FR0JDYHSVRaRuDm0bd/o=" }, - { - "pname": "System.Runtime.Handles", - "version": "4.0.1", - "hash": "sha256-j2QgVO9ZOjv7D1het98CoFpjoYgxjupuIhuBUmLLH7w=" - }, { "pname": "System.Runtime.Handles", "version": "4.3.0", diff --git a/pkgs/by-name/da/dafny/package.nix b/pkgs/by-name/da/dafny/package.nix index 6ff063fdc4b5..1b5cdecb3404 100644 --- a/pkgs/by-name/da/dafny/package.nix +++ b/pkgs/by-name/da/dafny/package.nix @@ -38,19 +38,18 @@ let in buildDotnetModule rec { pname = "Dafny"; - version = "4.8.0"; + version = "4.9.1"; src = fetchFromGitHub { owner = "dafny-lang"; repo = "dafny"; - rev = "v${version}"; - hash = "sha256-x/fX4o+R72Pl02u1Zsr80Rh/4Wb/aKw90fhAGmsfFUI="; + tag = "v${version}"; + hash = "sha256-fCBaOF1mDrqJaUiATZAhzLjlK3NGVFnxdOwgHbOkkgY="; }; postPatch = let - # This file wasn't updated between 4.6.0 and 4.7.0. - runtimeJarVersion = "4.6.0"; + runtimeJarVersion = "4.9.1"; in '' cp ${writeScript "fake-gradlew-for-dafny" '' diff --git a/pkgs/by-name/da/darktable/package.nix b/pkgs/by-name/da/darktable/package.nix index df3bb7986b35..523f2aaa1541 100644 --- a/pkgs/by-name/da/darktable/package.nix +++ b/pkgs/by-name/da/darktable/package.nix @@ -103,7 +103,6 @@ stdenv.mkDerivation rec { [ SDL2 adwaita-icon-theme - alsa-lib cairo curl exiv2 @@ -141,7 +140,6 @@ stdenv.mkDerivation rec { libwebp libxslt lua - util-linux openexr_3 openjpeg osm-gps-map @@ -151,6 +149,7 @@ stdenv.mkDerivation rec { sqlite ] ++ lib.optionals stdenv.hostPlatform.isLinux [ + alsa-lib colord colord-gtk libselinux @@ -160,6 +159,7 @@ stdenv.mkDerivation rec { libxkbcommon libXtst ocl-icd + util-linux ] ++ lib.optional stdenv.hostPlatform.isDarwin gtk-mac-integration ++ lib.optional stdenv.cc.isClang llvmPackages.openmp; diff --git a/pkgs/by-name/da/dataexplorer/package.nix b/pkgs/by-name/da/dataexplorer/package.nix index 10e77127efca..eaaf050368cc 100644 --- a/pkgs/by-name/da/dataexplorer/package.nix +++ b/pkgs/by-name/da/dataexplorer/package.nix @@ -14,11 +14,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "dataexplorer"; - version = "3.9.0"; + version = "3.9.3"; src = fetchurl { url = "mirror://savannah/dataexplorer/dataexplorer-${finalAttrs.version}-src.tar.gz"; - hash = "sha256-MQAnLCkcs3r8/2j4zYaMC/JM8nBCEvqHKk8lv+7b9KE="; + hash = "sha256-NfbhamhRx78MW5H4BpKMDfrV2d082UkaIBFfbemOSOY="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/db/dbvisualizer/package.nix b/pkgs/by-name/db/dbvisualizer/package.nix index 66afb65afc29..3722b2454239 100644 --- a/pkgs/by-name/db/dbvisualizer/package.nix +++ b/pkgs/by-name/db/dbvisualizer/package.nix @@ -13,7 +13,7 @@ let in stdenv.mkDerivation (finalAttrs: { inherit pname; - version = "24.3.2"; + version = "24.3.3"; src = let @@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: { in fetchurl { url = "https://www.dbvis.com/product_download/dbvis-${finalAttrs.version}/media/dbvis_linux_${underscoreVersion}.tar.gz"; - hash = "sha256-oZxOGudRGFfbVz7n5eeKxr/7lxUhYAHjD0wsHw6G8OI="; + hash = "sha256-RDmakZJ7mjTzx4QaKwT6H25dDvQANbLhd2+f8EYbmDA="; }; strictDeps = true; diff --git a/pkgs/by-name/de/deltachat-desktop/package.nix b/pkgs/by-name/de/deltachat-desktop/package.nix index 311acdceb04f..7b118f2c0cc8 100644 --- a/pkgs/by-name/de/deltachat-desktop/package.nix +++ b/pkgs/by-name/de/deltachat-desktop/package.nix @@ -19,17 +19,17 @@ let deltachat-rpc-server' = deltachat-rpc-server.overrideAttrs rec { - version = "1.152.1"; + version = "1.154.3"; src = fetchFromGitHub { owner = "deltachat"; repo = "deltachat-core-rust"; tag = "v${version}"; - hash = "sha256-ty2pZWMZ5ZFwwpLm22ChxVAf2cqmIimk8BWvMBqzmks="; + hash = "sha256-SjNFgvg6sHW40v13OuR3BL3+JdDxntDCKtbe/C/04as="; }; cargoDeps = rustPlatform.fetchCargoVendor { pname = "deltachat-core-rust"; inherit version src; - hash = "sha256-wbk4/yhhIRPD3x8ghAwJ0lQy0k8GQopTBBT1a021FRo="; + hash = "sha256-kbSRGuyCJlTxzKr/C+MLczqT7WNTqZ2/Z42psbBFW+w="; }; }; electron = electron_32; @@ -37,18 +37,18 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "deltachat-desktop"; - version = "1.50.1"; + version = "1.52.0"; src = fetchFromGitHub { owner = "deltachat"; repo = "deltachat-desktop"; tag = "v${finalAttrs.version}"; - hash = "sha256-G/qBGyx+vxkJvwmBYG5kpx01OO0C9dPji0Cafna9pyw="; + hash = "sha256-yKIGgeUjfpw0MMCnrD2TYrACfb/V6681IukZZY8feZc="; }; pnpmDeps = pnpm.fetchDeps { inherit (finalAttrs) pname version src; - hash = "sha256-UwfblmCkJOuy2Et5Rjm8ONWLbDmLppazqIk2+rV2RJU="; + hash = "sha256-YgHJN0LNgXoDCLqOw891CD23kpQ0wCnKFp5WccTHHw8="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/de/deskflow/package.nix b/pkgs/by-name/de/deskflow/package.nix index 116a3fff8845..1bba705488ba 100644 --- a/pkgs/by-name/de/deskflow/package.nix +++ b/pkgs/by-name/de/deskflow/package.nix @@ -110,7 +110,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/deskflow/deskflow"; description = "Share one mouse and keyboard between multiple computers on Windows, macOS and Linux"; mainProgram = "deskflow"; - maintainers = with lib.maintainers; [ aucub ]; + maintainers = with lib.maintainers; [ ]; license = with lib; [ licenses.gpl2Plus licenses.openssl diff --git a/pkgs/by-name/de/devtoolbox/package.nix b/pkgs/by-name/de/devtoolbox/package.nix index 703bd5187054..3c15b6f969d2 100644 --- a/pkgs/by-name/de/devtoolbox/package.nix +++ b/pkgs/by-name/de/devtoolbox/package.nix @@ -122,10 +122,7 @@ python3Packages.buildPythonApplication rec { unlicense ]; mainProgram = "devtoolbox"; - maintainers = with lib.maintainers; [ - aleksana - aucub - ]; + maintainers = with lib.maintainers; [ aleksana ]; platforms = lib.platforms.linux; }; } diff --git a/pkgs/by-name/di/diskonaut/package.nix b/pkgs/by-name/di/diskonaut/package.nix deleted file mode 100644 index 36ddb1488f97..000000000000 --- a/pkgs/by-name/di/diskonaut/package.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ - lib, - stdenv, - rustPlatform, - fetchFromGitHub, -}: - -rustPlatform.buildRustPackage rec { - pname = "diskonaut"; - version = "0.11.0"; - - src = fetchFromGitHub { - owner = "imsnif"; - repo = "diskonaut"; - rev = version; - sha256 = "1pmbag3r2ka30zmy2rs9jps2qxj2zh0gy4a774v9yhf0b6qjid54"; - }; - - cargoHash = "sha256-S/ne3iTEnlA3AqcPg3geLzV4bYVuYPjMCITSVJFnWYI="; - - # 1 passed; 44 failed https://hydra.nixos.org/build/148943783/nixlog/1 - doCheck = !stdenv.hostPlatform.isDarwin; - - meta = with lib; { - description = "Terminal disk space navigator"; - homepage = "https://github.com/imsnif/diskonaut"; - license = licenses.mit; - maintainers = with maintainers; [ - evanjs - figsoda - ]; - mainProgram = "diskonaut"; - }; -} diff --git a/pkgs/by-name/do/dotslash/package.nix b/pkgs/by-name/do/dotslash/package.nix index 8fe0c96c8187..6766fe0e961c 100644 --- a/pkgs/by-name/do/dotslash/package.nix +++ b/pkgs/by-name/do/dotslash/package.nix @@ -9,14 +9,14 @@ rustPlatform.buildRustPackage rec { pname = "dotslash"; - version = "0.4.3"; + version = "0.5.0"; src = fetchCrate { inherit pname version; - hash = "sha256-EcYDMuAVSCzpHgekSQsQfv/PNDj0jB7Ht9LRgm+tgd0="; + hash = "sha256-QrqcUc0RJXrahWHGgJbJwD3wufa2829NNHqiZx9V+sU="; }; - cargoHash = "sha256-w2P1J2TDtGqrJYQWTrkaF41iTRDttB1pdfF11sCbHCA="; + cargoHash = "sha256-he8W+gnajScRgWy7cveqZ9vod3n4zBFSDPw8pUUHObY="; doCheck = false; # http tests passthru = { diff --git a/pkgs/by-name/do/dovecot_fts_xapian/package.nix b/pkgs/by-name/do/dovecot_fts_xapian/package.nix index 5739d5fff009..1b4424ac2b6e 100644 --- a/pkgs/by-name/do/dovecot_fts_xapian/package.nix +++ b/pkgs/by-name/do/dovecot_fts_xapian/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "dovecot-fts-xapian"; - version = "1.8"; + version = "1.8.4"; src = fetchFromGitHub { owner = "grosjo"; repo = "fts-xapian"; rev = version; - hash = "sha256-WKUHy9/PpaDSgZYyydCm5odo3kAb2M/50oVdLjGRQ6I="; + hash = "sha256-BJ8G515j4QxQCiQoVd/w+JGZSZpHKAu20Y63m/dHjm8="; }; buildInputs = [ diff --git a/pkgs/by-name/do/downonspot/Cargo.lock.patch b/pkgs/by-name/do/downonspot/Cargo.lock.patch deleted file mode 100644 index 692c03967b88..000000000000 --- a/pkgs/by-name/do/downonspot/Cargo.lock.patch +++ /dev/null @@ -1,97 +0,0 @@ -diff --git a/Cargo.lock b/Cargo.lock -index cccafd9..75d2a85 100644 ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -1655,7 +1655,8 @@ dependencies = [ - [[package]] - name = "librespot" - version = "0.4.2" --source = "git+ssh://git@github.com/oSumAtrIX/free-librespot.git#f28fa264528dc85f8f325c18e8461b0f2b43dca1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ea4c9952ef48968f8184a4a87f8576982426ebe623342d5a28f7d9c4978e4a44" - dependencies = [ - "base64 0.13.1", - "env_logger", -@@ -1681,7 +1682,8 @@ dependencies = [ - [[package]] - name = "librespot-audio" - version = "0.4.2" --source = "git+ssh://git@github.com/oSumAtrIX/free-librespot.git#f28fa264528dc85f8f325c18e8461b0f2b43dca1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c176a31355e1ea8e0b9c4ced19df4947bfe4770661c25c142b6fba2365940d9d" - dependencies = [ - "aes-ctr", - "byteorder", -@@ -1696,7 +1698,8 @@ dependencies = [ - [[package]] - name = "librespot-connect" - version = "0.4.2" --source = "git+ssh://git@github.com/oSumAtrIX/free-librespot.git#f28fa264528dc85f8f325c18e8461b0f2b43dca1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4ffafb6a443e9445ccb3d5d591573b5b1da3c89a9b8846c63ba2c3710210d3ec" - dependencies = [ - "form_urlencoded", - "futures-util", -@@ -1716,7 +1719,8 @@ dependencies = [ - [[package]] - name = "librespot-core" - version = "0.4.2" --source = "git+ssh://git@github.com/oSumAtrIX/free-librespot.git#f28fa264528dc85f8f325c18e8461b0f2b43dca1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "046349f25888e644bf02d9c5de0164b2a493d29aa4ce18e1ad0b756da9b55d6d" - dependencies = [ - "aes", - "base64 0.13.1", -@@ -1756,7 +1760,8 @@ dependencies = [ - [[package]] - name = "librespot-discovery" - version = "0.4.2" --source = "git+ssh://git@github.com/oSumAtrIX/free-librespot.git#f28fa264528dc85f8f325c18e8461b0f2b43dca1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2aa877d18f6150364012cb4be5682d62d7c712c88bae2d0d01720fd7c15e2f06" - dependencies = [ - "aes-ctr", - "base64 0.13.1", -@@ -1777,7 +1782,8 @@ dependencies = [ - [[package]] - name = "librespot-metadata" - version = "0.4.2" --source = "git+ssh://git@github.com/oSumAtrIX/free-librespot.git#f28fa264528dc85f8f325c18e8461b0f2b43dca1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "6b80361fcbcb5092056fd47c08c34d5d51b08385d8efb6941c0d3e46d032c21c" - dependencies = [ - "async-trait", - "byteorder", -@@ -1790,7 +1796,8 @@ dependencies = [ - [[package]] - name = "librespot-playback" - version = "0.4.2" --source = "git+ssh://git@github.com/oSumAtrIX/free-librespot.git#f28fa264528dc85f8f325c18e8461b0f2b43dca1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5190a0b9bcc7f70ee4196a6b4a1c731d405ca130d4a6fcd4c561cfdde8b7cfb7" - dependencies = [ - "byteorder", - "cpal", -@@ -1815,7 +1822,8 @@ dependencies = [ - [[package]] - name = "librespot-protocol" - version = "0.4.2" --source = "git+ssh://git@github.com/oSumAtrIX/free-librespot.git#f28fa264528dc85f8f325c18e8461b0f2b43dca1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5d6d3ac6196ac0ea67bbe039f56d6730a5d8b31502ef9bce0f504ed729dcb39f" - dependencies = [ - "glob", - "protobuf 2.28.0", -diff --git a/Cargo.toml b/Cargo.toml -index c7e2fe2..28e895a 100644 ---- a/Cargo.toml -+++ b/Cargo.toml -@@ -30,7 +30,7 @@ reqwest = "0" - colored = "2" - lame = "0" - aspotify = "0" --librespot = { git = "ssh://git@github.com/oSumAtrIX/free-librespot.git" } -+librespot = "0.4.2" - async-std = { version = "1", features = ["attributes", "tokio1"] } - serde_json = "1" - async-stream = "0" diff --git a/pkgs/by-name/do/downonspot/package.nix b/pkgs/by-name/do/downonspot/package.nix deleted file mode 100644 index 6d9e05f8efe8..000000000000 --- a/pkgs/by-name/do/downonspot/package.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ - lib, - fetchFromGitHub, - rustPlatform, - pkg-config, - makeWrapper, - alsa-lib, - lame, - openssl, -}: - -rustPlatform.buildRustPackage rec { - pname = "downonspot"; - version = "0.6.0"; - - src = fetchFromGitHub { - owner = "oSumAtrIX"; - repo = "DownOnSpot"; - tag = "v${version}"; - hash = "sha256-h/BKVFzvPq9FhX4wZzlIzoegK8nPEt+mR7oKpRC5eV0="; - }; - - # Use official public librespot version - cargoPatches = [ ./Cargo.lock.patch ]; - - cargoHash = "sha256-2oPpi9MgQpvvjMJ5G+OkL8Gyemx82IHLjuAz+S8tI3E="; - - nativeBuildInputs = [ - pkg-config - makeWrapper - ]; - - buildInputs = [ - openssl - alsa-lib - lame - ]; - - meta = with lib; { - description = "Spotify downloader written in rust"; - homepage = "https://github.com/oSumAtrIX/DownOnSpot"; - license = licenses.gpl3Only; - platforms = platforms.linux; - maintainers = with maintainers; [ onny ]; - mainProgram = "down_on_spot"; - }; -} diff --git a/pkgs/by-name/dw/dwfv/package.nix b/pkgs/by-name/dw/dwfv/package.nix deleted file mode 100644 index fd1dee205734..000000000000 --- a/pkgs/by-name/dw/dwfv/package.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ - lib, - rustPlatform, - fetchCrate, -}: - -rustPlatform.buildRustPackage rec { - pname = "dwfv"; - version = "0.4.1"; - - src = fetchCrate { - inherit version pname; - hash = "sha256-JzOD0QQfDfIkJQATxGpyJBrFg5l6lkkAXY2qv9bir3c="; - }; - - cargoHash = "sha256-nmnpHz9sCRlxOngcSrW+oktYIKM/A295/a03fUf3ofw="; - - meta = with lib; { - description = "Simple digital waveform viewer with vi-like key bindings"; - mainProgram = "dwfv"; - homepage = "https://github.com/psurply/dwfv"; - license = licenses.mit; - maintainers = with maintainers; [ newam ]; - }; -} diff --git a/pkgs/by-name/dy/dynamodb-local/package.nix b/pkgs/by-name/dy/dynamodb-local/package.nix index c7e92369be6e..6abdc22cae50 100644 --- a/pkgs/by-name/dy/dynamodb-local/package.nix +++ b/pkgs/by-name/dy/dynamodb-local/package.nix @@ -27,11 +27,11 @@ let in stdenvNoCC.mkDerivation (finalAttrs: { pname = "dynamodb-local"; - version = "2.5.3"; + version = "2.5.4"; src = fetchurl { - url = "https://d1ni2b6xgvw0s0.cloudfront.net/v2.x/dynamodb_local_2024-11-06.tar.gz"; - hash = "sha256-h1yyfceEPQ0kJj8OFSEoD5v98Ovw5p+9G0ywDnyGWOA="; + url = "https://d1ni2b6xgvw0s0.cloudfront.net/v2.x/dynamodb_local_2024-12-23.tar.gz"; + hash = "sha256-YLFWH6YUFkLb062at1pjFclId/b0LmBVESWxHqimLJc="; }; sourceRoot = "."; diff --git a/pkgs/by-name/ei/eigenmath/package.nix b/pkgs/by-name/ei/eigenmath/package.nix index d649a87dc080..ca38f2c07b96 100644 --- a/pkgs/by-name/ei/eigenmath/package.nix +++ b/pkgs/by-name/ei/eigenmath/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "eigenmath"; - version = "337-unstable-2024-12-20"; + version = "337-unstable-2025-01-25"; src = fetchFromGitHub { owner = "georgeweigt"; repo = pname; - rev = "571412786696680e1e04909e90e77d9d39b10b2a"; - hash = "sha256-7/5UsU5TSW++MROWuUTsAptkv7gcqhvcqaRHYzXswB8="; + rev = "ae71bdf698283760ad3ac74ce57158f25c8d9198"; + hash = "sha256-vmbujai7xW4U6fmsp4Gv63Tl3AcxOUsUA2rPTfFL3ZQ="; }; checkPhase = diff --git a/pkgs/by-name/en/enzyme/package.nix b/pkgs/by-name/en/enzyme/package.nix index 6f68f9d28823..c9401596663a 100644 --- a/pkgs/by-name/en/enzyme/package.nix +++ b/pkgs/by-name/en/enzyme/package.nix @@ -20,15 +20,22 @@ llvmPackages.stdenv.mkDerivation rec { patchShebangs enzyme ''; - nativeBuildInputs = [ + llvm = llvmPackages.llvm; + clang = llvmPackages.clang-unwrapped; + + buildInputs = [ cmake git - llvmPackages.llvm + llvm + clang ]; cmakeDir = "../enzyme"; - cmakeFlags = [ "-DLLVM_DIR=${llvmPackages.llvm.dev}" ]; + cmakeFlags = [ + "-DLLVM_DIR=${llvm.dev}" + "-DClang_DIR=${clang.dev}" + ]; enableParallelBuilding = true; diff --git a/pkgs/by-name/ep/epilys-bb/package.nix b/pkgs/by-name/ep/epilys-bb/package.nix index c30a2865f693..3fb42e80a170 100644 --- a/pkgs/by-name/ep/epilys-bb/package.nix +++ b/pkgs/by-name/ep/epilys-bb/package.nix @@ -6,16 +6,17 @@ rustPlatform.buildRustPackage rec { pname = "epilys-bb"; - version = "unstable-2020-12-04"; + version = "0.4.4"; src = fetchFromGitHub { owner = "epilys"; repo = "bb"; - rev = "c903d4c2975509299fd3d2600a0c4c2102f445d0"; - hash = "sha256-KOXK+1arUWtu/QU7dwXhojIM0faMtwNN3AqVbofq1lY="; + rev = "v${version}"; + hash = "sha256-szeEBiolg2rVD2XZoNrncUYnA8KPhWwhQPYsjuxp904="; }; - cargoHash = "sha256-+aCMwKOg+3HDntG14gjJLec8XD51wuTyYyzLjuW6lbY="; + useFetchCargoVendor = true; + cargoHash = "sha256-xUNvVG5jdAXsro2P8je3LFxqMycJEB4j7w3abf6jilw="; meta = with lib; { description = "Clean, simple, and fast process viewer"; diff --git a/pkgs/by-name/ep/epson-escpr2/package.nix b/pkgs/by-name/ep/epson-escpr2/package.nix index 88dffb9df345..13bcd4818c8f 100644 --- a/pkgs/by-name/ep/epson-escpr2/package.nix +++ b/pkgs/by-name/ep/epson-escpr2/package.nix @@ -10,14 +10,14 @@ stdenv.mkDerivation rec { pname = "epson-inkjet-printer-escpr2"; - version = "1.2.24"; + version = "1.2.25"; src = fetchurl { # To find the most recent version go to # https://support.epson.net/linux/Printer/LSB_distribution_pages/en/escpr2.php # and retreive the download link for source package for x86 CPU - url = "https://download3.ebz.epson.net/dsc/f/03/00/16/58/53/436aba09336f96ed31378f90848be6588a177439/epson-inkjet-printer-escpr2-1.2.24-1.src.rpm"; - sha256 = "sha256-SI5vXdpxRu6/QdAMdgNpqgcTqyHntiS0zo38XPd4Xtg="; + url = "https://download3.ebz.epson.net/dsc/f/03/00/16/60/34/8e2b40dc2a02ae67c82b2c55786159f07edf3f5a/epson-inkjet-printer-escpr2-1.2.25-1.src.rpm"; + sha256 = "sha256-rhNv6Ak83KG5SmdVUyu/2UXTB0BTj4yDyKRO++9q8WY="; }; unpackPhase = '' @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { # Fixes "implicit declaration of function" errors # source of patch: https://aur.archlinux.org/packages/epson-inkjet-printer-escpr2 (fetchurl { - url = "https://aur.archlinux.org/cgit/aur.git/plain/bug_x86_64.patch?h=epson-inkjet-printer-escpr2"; + url = "https://aur.archlinux.org/cgit/aur.git/plain/bug_x86_64.patch?h=epson-inkjet-printer-escpr2&id=575d1b959063044f233cca099caceec8e6d5c02f"; sha256 = "sha256-G6/3oj25FUT+xv9aJ7qP5PBZWLfy+V8MCHUYucDhtzM="; }) ]; diff --git a/pkgs/by-name/ep/epsonscan2/package.nix b/pkgs/by-name/ep/epsonscan2/package.nix index e606db517226..358012828acc 100644 --- a/pkgs/by-name/ep/epsonscan2/package.nix +++ b/pkgs/by-name/ep/epsonscan2/package.nix @@ -2,7 +2,7 @@ lib, stdenv, autoPatchelfHook, - boost, + boost186, cmake, copyDesktopItems, imagemagick, @@ -25,13 +25,17 @@ let pname = "epsonscan2"; description = "Epson Scan 2 scanner driver for many modern Epson scanners and multifunction printers"; - version = "6.7.70.0"; + # Epson updates projects without changing their version numbers. + # There can be multiple different packages identified by the same + #version, so we also tag them with the month and year shown in + # the Epson download page. + version = "6.7.70.0-01-2025"; system = stdenv.hostPlatform.system; src = fetchzip { - url = "https://download3.ebz.epson.net/dsc/f/03/00/16/14/37/7577ee65efdad48ee2d2f38d9eda75418e490552/epsonscan2-6.7.70.0-1.src.tar.gz"; - hash = "sha256-y7XGxrOpVou/ZSfUffV3qv+SsFFpTiU7pWvtfsiLZWc="; + url = "https://download3.ebz.epson.net/dsc/f/03/00/16/60/70/c7fc14e41ec84255008c6125b63bcac40f55e11c/epsonscan2-6.7.70.0-1.src.tar.gz"; + hash = "sha256-WvNBy5hAxNJfwgjBR5VGaXuyTCK2YEiD3i7SMDl3U/U="; }; bundle = { @@ -65,10 +69,8 @@ stdenv.mkDerivation { ]; postPatch = '' - rm CMakeCache.txt - substituteInPlace src/Controller/Src/Scanner/Engine.cpp \ - --replace-fail '@KILLALL@' ${killall}/bin/killall + --replace-fail '@KILLALL@' ${lib.getExe killall} substituteInPlace src/Controller/Src/Filter/GetOrientation.cpp \ --replace-fail '@OCR_ENGINE_GETROTATE@' $out/libexec/epsonscan2-ocr/ocr-engine-getrotate @@ -88,7 +90,7 @@ stdenv.mkDerivation { buildInputs = [ - boost + boost186 # uses Boost.Optional but epsonscan2 is pre-C++11. libjpeg libpng libtiff @@ -135,7 +137,7 @@ stdenv.mkDerivation { desktopItems = lib.optionals withGui [ (makeDesktopItem { - name = pname; + name = "epsonscan2"; exec = "epsonscan2"; icon = "epsonscan2"; desktopName = "Epson Scan 2"; @@ -152,22 +154,27 @@ stdenv.mkDerivation { inherit description; mainProgram = "epsonscan2"; longDescription = '' - Epson Scan 2 scanner driver including optional non-free plugins such as OCR and network - scanning. + The Epson Scan 2 scanner driver, including optional non-free plugins such + as OCR and network scanning. To use the SANE backend: - - hardware.sane.extraBackends = [ pkgs.epsonscan2 ]; - + ```nix + { + hardware.sane.extraBackends = [ pkgs.epsonscan2 ]; + } + ``` - Overrides can be used to customise this package. For example, to enable non-free plugins and - disable the Epson GUI: - - pkgs.epsonscan2.override { withNonFreePlugins = true; withGui = false; } - + Overrides can be used to customise this package. For example, to enable + non-free plugins and disable the Epson GUI: + ```nix + pkgs.epsonscan2.override { + withNonFreePlugins = true; + withGui = false; + } + ``` ''; homepage = "https://support.epson.net/linux/en/epsonscan2.php"; - platforms = [ "x86_64-linux" ]; + platforms = lib.systems.inspect.patternLogicalAnd lib.systems.inspect.patterns.isLinux lib.systems.inspect.patterns.isx86_64; sourceProvenance = with lib.sourceTypes; [ fromSource ] ++ lib.optionals withNonFreePlugins [ binaryNativeCode ]; diff --git a/pkgs/by-name/ep/epubcheck/package.nix b/pkgs/by-name/ep/epubcheck/package.nix index 1619d621f0e0..fe5240ae668c 100644 --- a/pkgs/by-name/ep/epubcheck/package.nix +++ b/pkgs/by-name/ep/epubcheck/package.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "epubcheck"; - version = "5.2.0"; + version = "5.2.1"; src = fetchzip { url = "https://github.com/w3c/epubcheck/releases/download/v${version}/epubcheck-${version}.zip"; - sha256 = "sha256-7Vfbs0lqrm/YDSfvMxaQu9IsYx1PugpbsDYLU2fIC6U="; + sha256 = "sha256-BL+DNd6QeAx4MATaXVX/4mtalY7jzAdYeUsPktPp4UA="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/fa/fastd/package.nix b/pkgs/by-name/fa/fastd/package.nix index d49bdb7e5da3..bb883d23549e 100644 --- a/pkgs/by-name/fa/fastd/package.nix +++ b/pkgs/by-name/fa/fastd/package.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "fastd"; - version = "22"; + version = "23"; src = fetchFromGitHub { - owner = "Neoraider"; + owner = "neocturne"; repo = "fastd"; rev = "v${version}"; - sha256 = "0qni32j7d3za9f87m68wq8zgalvfxdrx1zxi6l4x7vvmpcw5nhpq"; + sha256 = "sha256-Sz6VEjKziL/w2a4VWFfMPDYvm7UZh5A/NmzP10rJ2r8="; }; nativeBuildInputs = [ @@ -59,7 +59,10 @@ stdenv.mkDerivation rec { bsd3 ]; platforms = platforms.linux; - maintainers = with maintainers; [ fpletz ]; + maintainers = with maintainers; [ + fpletz + herbetom + ]; mainProgram = "fastd"; }; } diff --git a/pkgs/by-name/fa/fastfetch/package.nix b/pkgs/by-name/fa/fastfetch/package.nix index 39d4044ebc44..e5bd1138f0fc 100644 --- a/pkgs/by-name/fa/fastfetch/package.nix +++ b/pkgs/by-name/fa/fastfetch/package.nix @@ -45,13 +45,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "fastfetch"; - version = "2.34.1"; + version = "2.35.0"; src = fetchFromGitHub { owner = "fastfetch-cli"; repo = "fastfetch"; tag = finalAttrs.version; - hash = "sha256-kCSRS2GD58HS9Qdrv7ju8b7IGznBsP1IIAvvzkWPaLk="; + hash = "sha256-ChuK5DHRj1qJIjRo3oB5gdCxox2mDffCVM0wRGc5t1o="; }; outputs = [ diff --git a/pkgs/by-name/fc/fcitx5-pinyin-moegirl/package.nix b/pkgs/by-name/fc/fcitx5-pinyin-moegirl/package.nix index f3c53462b941..7549010606c2 100644 --- a/pkgs/by-name/fc/fcitx5-pinyin-moegirl/package.nix +++ b/pkgs/by-name/fc/fcitx5-pinyin-moegirl/package.nix @@ -6,11 +6,11 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "fcitx5-pinyin-moegirl"; - version = "20250111"; + version = "20250113"; src = fetchurl { url = "https://github.com/outloudvi/mw2fcitx/releases/download/${finalAttrs.version}/moegirl.dict"; - hash = "sha256-ooYpkrqeOc5OrjeGTbobfv4b8x5uV/ot3QaU3d5MRLQ="; + hash = "sha256-Z6MqYZMpvTGcz61NnzZQy63GXfcaTWE8dezPoYht6q0="; }; dontUnpack = true; diff --git a/pkgs/by-name/fe/feather/package.nix b/pkgs/by-name/fe/feather/package.nix index ae567d8ffa18..ce2be604fff4 100644 --- a/pkgs/by-name/fe/feather/package.nix +++ b/pkgs/by-name/fe/feather/package.nix @@ -1,6 +1,6 @@ { bc-ur, - boost, + boost186, cmake, fetchFromGitHub, hidapi, @@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ bc-ur - boost + boost186 hidapi libsodium libusb1 diff --git a/pkgs/by-name/fe/felix-fm/package.nix b/pkgs/by-name/fe/felix-fm/package.nix index 664464e8e836..2ce2186d4e74 100644 --- a/pkgs/by-name/fe/felix-fm/package.nix +++ b/pkgs/by-name/fe/felix-fm/package.nix @@ -13,16 +13,16 @@ rustPlatform.buildRustPackage rec { pname = "felix"; - version = "2.14.0"; + version = "2.16.0"; src = fetchFromGitHub { owner = "kyoheiu"; repo = "felix"; tag = "v${version}"; - hash = "sha256-PcC0lZ41qTVE4V3VdwBq83qYfEJO3RJouuS2+bpcBfo="; + hash = "sha256-h/sytTRufqFgnhbg67qtTx6XhnC/UzgT4zFq4bJYhQM="; }; - cargoHash = "sha256-4tvk7H2CrTx9m1f0PLnNv+LWg6oIGTUfirRhIaz2lHo="; + cargoHash = "sha256-CmIzarcjwhFkgzccLS2eIEc4J89TlazUzNQfqzmY16I="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/fl/flclash/package.nix b/pkgs/by-name/fl/flclash/package.nix index 3a8e6ce27861..235b7add65a0 100644 --- a/pkgs/by-name/fl/flclash/package.nix +++ b/pkgs/by-name/fl/flclash/package.nix @@ -48,7 +48,7 @@ let description = "Multi-platform proxy client based on ClashMeta, simple and easy to use, open-source and ad-free"; homepage = "https://github.com/chen08209/FlClash"; license = with lib.licenses; [ gpl3Plus ]; - maintainers = with lib.maintainers; [ aucub ]; + maintainers = with lib.maintainers; [ ]; }; }; in @@ -101,7 +101,7 @@ flutter324.buildFlutterApplication { homepage = "https://github.com/chen08209/FlClash"; mainProgram = "FlClash"; license = with lib.licenses; [ gpl3Plus ]; - maintainers = with lib.maintainers; [ aucub ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.linux; }; } diff --git a/pkgs/by-name/fl/flood/package.nix b/pkgs/by-name/fl/flood/package.nix index 26fd8b7a29e1..5a7977b97a60 100644 --- a/pkgs/by-name/fl/flood/package.nix +++ b/pkgs/by-name/fl/flood/package.nix @@ -8,20 +8,20 @@ buildNpmPackage rec { pname = "flood"; - version = "4.8.5"; + version = "4.9.0"; src = fetchFromGitHub { owner = "jesec"; repo = pname; rev = "v${version}"; - hash = "sha256-lm+vPo7V99OSUAVEvdiTNMlD/+iHGPIyPLc1WzO1aTU="; + hash = "sha256-R8OWr9jsD6KZ3P827plCTSLcVrrFEdutmlZNwqXJNfU="; }; npmConfigHook = pnpm_9.configHook; npmDeps = pnpmDeps; pnpmDeps = pnpm_9.fetchDeps { inherit pname version src; - hash = "sha256-NuU9O3bEboxmuEuk1WSUeZRNgVK5cwFiUAN3+7vACGw="; + hash = "sha256-6YW2m7siLzHiAFEpidQS5okhjsY9qNm+Ro8mHex1/No="; }; passthru = { diff --git a/pkgs/by-name/fl/flyctl/package.nix b/pkgs/by-name/fl/flyctl/package.nix index 0c90386fc63d..9dfdfa9628b8 100644 --- a/pkgs/by-name/fl/flyctl/package.nix +++ b/pkgs/by-name/fl/flyctl/package.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "flyctl"; - version = "0.3.61"; + version = "0.3.68"; src = fetchFromGitHub { owner = "superfly"; repo = "flyctl"; rev = "v${version}"; - hash = "sha256-YGUjEK8Yvb1S879MNQ/gJYNG4DjFMTL2VHE/m5KLoE0="; + hash = "sha256-6/84MC7wmMCfCtuV0HJ/zMG96RO55LQxudejI5exVAM="; }; - vendorHash = "sha256-SqG5JJ2l71+fQirsg51hjr5sFHQzzH3U+acJMaN5W0c="; + vendorHash = "sha256-aKDziIx0xyWOczc9G0YQ7mdWdc5cWHjpjTDyJMsFriM="; subPackages = [ "." ]; diff --git a/pkgs/by-name/fo/font-manager/package.nix b/pkgs/by-name/fo/font-manager/package.nix index c86340595dc4..243c36a26c87 100644 --- a/pkgs/by-name/fo/font-manager/package.nix +++ b/pkgs/by-name/fo/font-manager/package.nix @@ -29,13 +29,13 @@ stdenv.mkDerivation rec { pname = "font-manager"; - version = "0.9.0"; + version = "0.9.2"; src = fetchFromGitHub { owner = "FontManager"; repo = "font-manager"; rev = version; - hash = "sha256-nUFxjqUiL8zLfPJrLM1aQ/SZ2x6CYFKFJI1W/eXlrV8="; + hash = "sha256-x7ZRC/xwF6Y2BhbtApVZ4hPZGNGaJiilqpxLyax9r2g="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/fo/fornalder/package.nix b/pkgs/by-name/fo/fornalder/package.nix deleted file mode 100644 index 84b88da240fe..000000000000 --- a/pkgs/by-name/fo/fornalder/package.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ - lib, - rustPlatform, - fetchFromGitHub, - makeWrapper, - gnuplot, -}: - -rustPlatform.buildRustPackage rec { - pname = "fornalder"; - version = "unstable-2022-12-25"; - - src = fetchFromGitHub { - owner = "hpjansson"; - repo = pname; - rev = "3248128fe320d88183d17a65e936092e07d6529b"; - sha256 = "sha256-IPSxVWJs4EhyBdA1NXpD8v3fusewt1ELpn/kbZt7c5Q="; - }; - - cargoHash = "sha256-eK+oQbOQj8pKiOTXzIgRjzVB7Js8MMa9V6cF9D98Ftc="; - - nativeBuildInputs = [ makeWrapper ]; - - postInstall = '' - wrapProgram $out/bin/fornalder \ - --suffix PATH : ${lib.makeBinPath [ gnuplot ]} - ''; - - meta = with lib; { - description = "Visualize long-term trends in collections of Git repositories"; - homepage = "https://github.com/hpjansson/fornalder"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ - astro - figsoda - ]; - mainProgram = "fornalder"; - }; -} diff --git a/pkgs/by-name/fo/fortune/package.nix b/pkgs/by-name/fo/fortune/package.nix index bb0233f4b615..33e607f389a7 100644 --- a/pkgs/by-name/fo/fortune/package.nix +++ b/pkgs/by-name/fo/fortune/package.nix @@ -6,6 +6,7 @@ recode, perl, rinutils, + fortune, withOffensive ? false, }: @@ -20,11 +21,16 @@ stdenv.mkDerivation rec { sha256 = "sha256-Hzh4dyVOleq2H5NyV7QmCfKbmU7wVxUxZVu/w6KsdKw="; }; - nativeBuildInputs = [ - cmake - perl - rinutils - ]; + nativeBuildInputs = + [ + cmake + perl + rinutils + ] + ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ + # "strfile" must be in PATH for cross-compiling builds. + fortune + ]; buildInputs = [ recode ]; diff --git a/pkgs/by-name/fr/framesh/package.nix b/pkgs/by-name/fr/framesh/package.nix index 5cc572eeac82..262f705820d6 100644 --- a/pkgs/by-name/fr/framesh/package.nix +++ b/pkgs/by-name/fr/framesh/package.nix @@ -7,10 +7,10 @@ let pname = "framesh"; - version = "0.6.9"; + version = "0.6.10"; src = fetchurl { url = "https://github.com/floating/frame/releases/download/v${version}/Frame-${version}.AppImage"; - hash = "sha256-SsQIAg5DttvNJk1z+GJq4+e0Qa/j+VEKPV2bPA6+V8A="; + hash = "sha256-h2Y0G7luakd5UVu7bVt9r6xhvyOh80gYMTswmEIcnnk="; }; appimageContents = appimageTools.extractType2 { diff --git a/pkgs/by-name/fu/fum/package.nix b/pkgs/by-name/fu/fum/package.nix new file mode 100644 index 000000000000..88766c821601 --- /dev/null +++ b/pkgs/by-name/fu/fum/package.nix @@ -0,0 +1,46 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + autoPatchelfHook, + stdenv, + openssl, + dbus, + pkg-config, + libgcc, +}: +rustPlatform.buildRustPackage rec { + pname = "fum"; + version = "0.4.3"; + + src = fetchFromGitHub { + owner = "qxb3"; + repo = "fum"; + tag = "v${version}"; + hash = "sha256-VRcQWwO80xFn5A21yjRsGqnnWkhWfsJxxEiw78NWJPM="; + }; + + cargoHash = "sha256-GW3/SqQlEUTMtvOgnMGhcREOHz/V2qtjtCAzFFKMNb4="; + + nativeBuildInputs = [ + autoPatchelfHook + pkg-config + ]; + + buildInputs = [ + openssl + dbus + libgcc + ]; + + doCheck = false; + + meta = { + description = "Fully ricable tui-based music client"; + homepage = "https://github.com/qxb3/fum"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ linuxmobile ]; + platforms = lib.platforms.linux; + mainProgram = "fum"; + }; +} diff --git a/pkgs/by-name/fz/fzf-make/package.nix b/pkgs/by-name/fz/fzf-make/package.nix index a99524b5a2d4..bfcfa8b139d3 100644 --- a/pkgs/by-name/fz/fzf-make/package.nix +++ b/pkgs/by-name/fz/fzf-make/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "fzf-make"; - version = "0.55.0"; + version = "0.56.0"; src = fetchFromGitHub { owner = "kyu08"; repo = "fzf-make"; rev = "v${version}"; - hash = "sha256-YPflHIHOnl6j2J60g1K2HjjUVf21P4Tofi65K3FUZxs="; + hash = "sha256-OioPl2uJVepMsR1PYHpASj3yQ10bCaGFxI1wQR61EsA="; }; - cargoHash = "sha256-oXxCPuUtzUNYrlqUdksGodITnWt7pGrA8UsNYSzOJVA="; + cargoHash = "sha256-Y1kFbJi+AB4uROieZERafU82RWm2AGQseDUuVzJn3NA="; useFetchCargoVendor = true; diff --git a/pkgs/by-name/ga/garnet/package.nix b/pkgs/by-name/ga/garnet/package.nix index eabcb0cf0363..ac5750b524c5 100644 --- a/pkgs/by-name/ga/garnet/package.nix +++ b/pkgs/by-name/ga/garnet/package.nix @@ -8,13 +8,13 @@ buildDotnetModule rec { pname = "garnet"; - version = "1.0.50"; + version = "1.0.53"; src = fetchFromGitHub { owner = "microsoft"; repo = "garnet"; tag = "v${version}"; - hash = "sha256-jmEPgGO9kQvzyGktFfsyEZdHlgJOZokzE3d5Xneu6/E="; + hash = "sha256-04USuwfoACJdEQ98DCzUKBVAyoGhTn1dHgVHw38xaWY="; }; projectFile = "main/GarnetServer/GarnetServer.csproj"; diff --git a/pkgs/by-name/ga/gat/package.nix b/pkgs/by-name/ga/gat/package.nix index bef50038d1ef..c13f6bf7543b 100644 --- a/pkgs/by-name/ga/gat/package.nix +++ b/pkgs/by-name/ga/gat/package.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "gat"; - version = "0.19.3"; + version = "0.20.0"; src = fetchFromGitHub { owner = "koki-develop"; repo = "gat"; tag = "v${version}"; - hash = "sha256-MBRKp1S/6dizZR0zDyaNGqKsHI+vK6oTNkPuxwbf7os="; + hash = "sha256-xO0MUbryuglbRIbBEbKJGYPPaJD8j4hNpIR+Kqc302s="; }; - vendorHash = "sha256-ns1jFmBvIfclb3SBtdg05qNBy18p6VjtEKrahtxJUM4="; + vendorHash = "sha256-z2Hbn1debyJn/nTKVC2y3vd6V7XQyHFPNA6hCVuYzgU="; env.CGO_ENABLED = 0; diff --git a/pkgs/by-name/gh/gh-markdown-preview/package.nix b/pkgs/by-name/gh/gh-markdown-preview/package.nix index 4b67ddbc19a6..65191d3e44c6 100644 --- a/pkgs/by-name/gh/gh-markdown-preview/package.nix +++ b/pkgs/by-name/gh/gh-markdown-preview/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "gh-markdown-preview"; - version = "1.9.0"; + version = "1.10.0"; src = fetchFromGitHub { owner = "yusukebe"; repo = "gh-markdown-preview"; rev = "v${version}"; - hash = "sha256-qvR23dXj+ERf5yhVbsJ3XcdePaAwuDvdya1zr5wtNsQ="; + hash = "sha256-5jxGFZqYkhFQ4Rx4jbI+fes9ezsuXa+VZowk5Jzhi3I="; }; vendorHash = "sha256-O6Q9h5zcYAoKLjuzGu7f7UZY0Y5rL2INqFyJT2QZJ/E="; diff --git a/pkgs/by-name/gi/git-codeowners/package.nix b/pkgs/by-name/gi/git-codeowners/package.nix deleted file mode 100644 index b206a4312c80..000000000000 --- a/pkgs/by-name/gi/git-codeowners/package.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ - lib, - rustPlatform, - fetchFromGitHub, -}: -rustPlatform.buildRustPackage rec { - pname = "git-codeowners"; - version = "0.1.2"; - - src = fetchFromGitHub { - owner = "softprops"; - repo = "git-codeowners"; - rev = "v${version}"; - hash = "sha256-eF6X+fLkQ8lZIk4WPzlW7l05P90gB5nxD5Ss32Im+C8="; - }; - - cargoHash = "sha256-TayvqcVNCFHF5UpR1pPVRe076Pa8LS4duhnZLzYxkQM="; - - meta = with lib; { - homepage = "https://github.com/softprops/git-codeowners"; - description = "Git extension to work with CODEOWNERS files"; - license = licenses.mit; - maintainers = with maintainers; [ zimbatm ]; - mainProgram = "git-codeowners"; - }; -} diff --git a/pkgs/by-name/gi/git-repo/package.nix b/pkgs/by-name/gi/git-repo/package.nix index 551363bbf231..fe59c3f0d8a5 100644 --- a/pkgs/by-name/gi/git-repo/package.nix +++ b/pkgs/by-name/gi/git-repo/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "git-repo"; - version = "2.50.1"; + version = "2.51"; src = fetchFromGitHub { owner = "android"; repo = "tools_repo"; rev = "v${version}"; - hash = "sha256-HJdXdFaC8yFef2gMJpSfZ2TDxEZkZLWZcum41dfG/DQ="; + hash = "sha256-A0mLb3QYI3Eapv5xBMPHcoiaR9np8dx5EAQKXIlhYBg="; }; # Fix 'NameError: name 'ssl' is not defined' diff --git a/pkgs/applications/version-management/git-workspace/default.nix b/pkgs/by-name/gi/git-workspace/package.nix similarity index 74% rename from pkgs/applications/version-management/git-workspace/default.nix rename to pkgs/by-name/gi/git-workspace/package.nix index 36ca542517f9..1d8ef47ff0d0 100644 --- a/pkgs/applications/version-management/git-workspace/default.nix +++ b/pkgs/by-name/gi/git-workspace/package.nix @@ -1,14 +1,10 @@ -{ lib -, stdenv -, fetchFromGitHub -, rustPlatform -, libiconv -, Security -, pkg-config -, openssl -, nix-update-script -, testers -, git-workspace +{ + lib, + fetchFromGitHub, + rustPlatform, + pkg-config, + openssl, + nix-update-script, }: rustPlatform.buildRustPackage rec { @@ -26,8 +22,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv Security ]; + buildInputs = [ openssl ]; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/gi/gitify/package.nix b/pkgs/by-name/gi/gitify/package.nix index 3d807ba7b9ad..ffcabfe0433e 100644 --- a/pkgs/by-name/gi/gitify/package.nix +++ b/pkgs/by-name/gi/gitify/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "gitify"; - version = "5.17.0"; + version = "5.18.0"; src = fetchFromGitHub { owner = "gitify-app"; repo = "gitify"; tag = "v${finalAttrs.version}"; - hash = "sha256-l89CXfARLBNS6MMq54gM63y5FqeHdMXDBt52znir+/A="; + hash = "sha256-INeOQY39IepcqigThymEcBjkrQkIC/9Py+g32/VBpmg="; }; nativeBuildInputs = [ @@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = pnpm_9.fetchDeps { inherit (finalAttrs) pname version src; - hash = "sha256-I78AvOBdDd59eVJJ51xxNwVvMnNvLdJJpFEtE/I1H8U="; + hash = "sha256-86RiBzZwoyDX5l9wV3JiUo4efkol3sKH3tlu61D7D+0="; }; env.ELECTRON_SKIP_BINARY_DOWNLOAD = 1; diff --git a/pkgs/by-name/gi/gitlab-ci-local/package.nix b/pkgs/by-name/gi/gitlab-ci-local/package.nix index abf3cb057eba..8f07cd318871 100644 --- a/pkgs/by-name/gi/gitlab-ci-local/package.nix +++ b/pkgs/by-name/gi/gitlab-ci-local/package.nix @@ -9,16 +9,16 @@ buildNpmPackage rec { pname = "gitlab-ci-local"; - version = "4.56.2"; + version = "4.57.0"; src = fetchFromGitHub { owner = "firecow"; repo = "gitlab-ci-local"; rev = version; - hash = "sha256-rmJM+RRZY0pG0B7HYGU7L2iXdQyTTRhKsPjfh53a5m4="; + hash = "sha256-xr8loGmua8NiXA+YMzuVPUupnjqNsOxcWdyhxTZ7GhE="; }; - npmDepsHash = "sha256-EbgU147by5IwTmSEeC0FvzUqV0XYbMeT6K998UcR3Hg="; + npmDepsHash = "sha256-M/kRs8yaOypbSr3MhUr2UJ5G+lz5OMdBCIs4yyrLX6I="; postPatch = '' # remove cleanup which runs git commands diff --git a/pkgs/by-name/gi/gitlab-ci-ls/package.nix b/pkgs/by-name/gi/gitlab-ci-ls/package.nix index 11eaa3d06239..768bb4911a1c 100644 --- a/pkgs/by-name/gi/gitlab-ci-ls/package.nix +++ b/pkgs/by-name/gi/gitlab-ci-ls/package.nix @@ -10,15 +10,15 @@ rustPlatform.buildRustPackage rec { pname = "gitlab-ci-ls"; - version = "1.0.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "alesbrelih"; repo = "gitlab-ci-ls"; rev = "${version}"; - hash = "sha256-HpFdebG4pRa+g2ycOOfnWgN/+DcYdPHAN/RHBHN6S8A="; + hash = "sha256-G0MKq2qGxcMpNOQDHo9LtewDEExYIA8/kTUkiZdnygg="; }; - cargoHash = "sha256-CS3MkCumqHmTcRf/YJr/M8s7BoGos/ixXm97BCCXBvw="; + cargoHash = "sha256-YzSBCc+1Vsg4daTjGlskER3P9UjNobwT6KYFoQjLTWs="; nativeBuildInputs = [ pkg-config ]; buildInputs = diff --git a/pkgs/by-name/gi/gitleaks/package.nix b/pkgs/by-name/gi/gitleaks/package.nix index 1849d92aef0e..df35284fc381 100644 --- a/pkgs/by-name/gi/gitleaks/package.nix +++ b/pkgs/by-name/gi/gitleaks/package.nix @@ -10,13 +10,13 @@ buildGoModule rec { pname = "gitleaks"; - version = "8.23.1"; + version = "8.23.2"; src = fetchFromGitHub { owner = "zricethezav"; repo = "gitleaks"; tag = "v${version}"; - hash = "sha256-gz/2DwkvSY6vOKW1ttJcLjjtii0jWIdQC1/xzU5vCRA="; + hash = "sha256-lwjGoDMNRgYDHI+8IjOD8sWJMUgv/Bg3pUzrUrcYiR4="; }; vendorHash = "sha256-hq3v//fhCUOvKPBZ/+YrLIc4nDLxR9Yc+MeIXY7TArA="; diff --git a/pkgs/by-name/gl/glaze/package.nix b/pkgs/by-name/gl/glaze/package.nix index d441faa36428..610a0c27a887 100644 --- a/pkgs/by-name/gl/glaze/package.nix +++ b/pkgs/by-name/gl/glaze/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (final: { pname = "glaze"; - version = "4.3.0"; + version = "4.3.1"; src = fetchFromGitHub { owner = "stephenberry"; repo = "glaze"; rev = "v${final.version}"; - hash = "sha256-iFFc2FjcvlQqvjXvFZ+J3RTEIritSM6AZXQlLE5YF9A="; + hash = "sha256-AIPsujIJl0LXK6p+GttyjDsXJ0595jl/2Y3adzv2TvE="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/gm/gmic/package.nix b/pkgs/by-name/gm/gmic/package.nix index 89f3e13b3919..481699eb5b2d 100644 --- a/pkgs/by-name/gm/gmic/package.nix +++ b/pkgs/by-name/gm/gmic/package.nix @@ -3,6 +3,7 @@ stdenv, fetchFromGitHub, fetchurl, + buildPackages, cimg, cmake, common-updater-scripts, @@ -96,6 +97,11 @@ stdenv.mkDerivation (finalAttrs: { + lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace CMakeLists.txt \ --replace "LD_LIBRARY_PATH" "DYLD_LIBRARY_PATH" + '' + + lib.optionalString (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + substituteInPlace CMakeLists.txt --replace-fail \ + 'LD_LIBRARY_PATH=''${GMIC_BINARIES_PATH} ''${GMIC_BINARIES_PATH}/gmic' \ + '${lib.getExe buildPackages.gmic}' ''; passthru = { diff --git a/pkgs/by-name/gn/gnustep-back/package.nix b/pkgs/by-name/gn/gnustep-back/package.nix new file mode 100644 index 000000000000..3ba7512c4b67 --- /dev/null +++ b/pkgs/by-name/gn/gnustep-back/package.nix @@ -0,0 +1,51 @@ +{ + lib, + clangStdenv, + fetchzip, + cairo, + fontconfig, + freetype, + gnustep-gui, + libXft, + libXmu, + pkg-config, + wrapGNUstepAppsHook, +}: + +clangStdenv.mkDerivation (finalAttrs: { + pname = "gnustep-back"; + version = "0.31.0"; + + src = fetchzip { + url = "ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-back-${finalAttrs.version}.tar.gz"; + sha256 = "sha256-CjcoXlKiPVPJMOdrBKjxiNauTZvLcId5Lb8DzbgBbBg="; + }; + + nativeBuildInputs = [ + pkg-config + wrapGNUstepAppsHook + ]; + + buildInputs = [ + cairo + fontconfig + freetype + libXft + libXmu + ]; + + propagatedBuildInputs = [ gnustep-gui ]; + + meta = { + description = "Generic backend for GNUstep"; + mainProgram = "gpbs"; + homepage = "https://gnustep.github.io/"; + license = lib.licenses.lgpl2Plus; + maintainers = with lib.maintainers; [ + ashalkhakov + dblsaiko + matthewbauer + ]; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/desktops/gnustep/base/fixup-paths.patch b/pkgs/by-name/gn/gnustep-base/fixup-paths.patch similarity index 100% rename from pkgs/desktops/gnustep/base/fixup-paths.patch rename to pkgs/by-name/gn/gnustep-base/fixup-paths.patch diff --git a/pkgs/desktops/gnustep/base/default.nix b/pkgs/by-name/gn/gnustep-base/package.nix similarity index 92% rename from pkgs/desktops/gnustep/base/default.nix rename to pkgs/by-name/gn/gnustep-base/package.nix index bab6487cc988..e46150706bf0 100644 --- a/pkgs/desktops/gnustep/base/default.nix +++ b/pkgs/by-name/gn/gnustep-base/package.nix @@ -1,70 +1,78 @@ { lib, - stdenv, + clangStdenv, + fetchpatch, + fetchzip, aspell, audiofile, - make, - wrapGNUstepAppsHook, - cups, - fetchzip, - fetchpatch, - gmp, - gnutls, - libffi, binutils-unwrapped, - libjpeg, - libtiff, - libpng, + cups, giflib, + gmp, + gnustep-libobjc, + gnustep-make, + gnutls, + icu, + libffi, + libgcrypt, + libiberty, + libiconv, + libjpeg, + libpng, + libtiff, libxml2, libxslt, - libiconv, - libobjc, - libgcrypt, - icu, pkg-config, portaudio, - libiberty, + wrapGNUstepAppsHook, }: -stdenv.mkDerivation (finalAttrs: { +clangStdenv.mkDerivation (finalAttrs: { pname = "gnustep-base"; version = "1.29.0"; + src = fetchzip { url = "ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-base-${finalAttrs.version}.tar.gz"; hash = "sha256-4fjdsLBsYEDxLOFrq17dKii2sLKvOaFCu0cw3qQtM5U="; }; + outputs = [ "out" "dev" "lib" ]; + nativeBuildInputs = [ pkg-config - make wrapGNUstepAppsHook ]; + + propagatedNativeBuildInputs = [ + gnustep-make + ]; + propagatedBuildInputs = [ aspell audiofile - cups - gmp - gnutls - libffi binutils-unwrapped - libjpeg - libtiff - libpng + cups giflib + gmp + gnustep-libobjc + gnutls + icu + libffi + libgcrypt + libiberty + libiconv + libjpeg + libpng + libtiff libxml2 libxslt - libiconv - libobjc - libgcrypt - icu portaudio - libiberty ]; + patches = [ ./fixup-paths.patch # https://github.com/gnustep/libs-base/issues/212 / https://www.sogo.nu/bugs/view.php?id=5416#c15585 @@ -95,8 +103,8 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.lgpl2Plus; maintainers = with lib.maintainers; [ ashalkhakov - matthewbauer dblsaiko + matthewbauer ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/desktops/gnustep/gui/fixup-all.patch b/pkgs/by-name/gn/gnustep-gui/fixup-all.patch similarity index 100% rename from pkgs/desktops/gnustep/gui/fixup-all.patch rename to pkgs/by-name/gn/gnustep-gui/fixup-all.patch diff --git a/pkgs/desktops/gnustep/gui/default.nix b/pkgs/by-name/gn/gnustep-gui/package.nix similarity index 82% rename from pkgs/desktops/gnustep/gui/default.nix rename to pkgs/by-name/gn/gnustep-gui/package.nix index 34694caf310a..560daf72581f 100644 --- a/pkgs/desktops/gnustep/gui/default.nix +++ b/pkgs/by-name/gn/gnustep-gui/package.nix @@ -1,13 +1,12 @@ { lib, - stdenv, - make, - wrapGNUstepAppsHook, + clangStdenv, fetchzip, - base, + gnustep-base, + wrapGNUstepAppsHook, }: -stdenv.mkDerivation (finalAttrs: { +clangStdenv.mkDerivation (finalAttrs: { version = "0.31.1"; pname = "gnustep-gui"; @@ -16,15 +15,14 @@ stdenv.mkDerivation (finalAttrs: { sha256 = "sha256-+4XEJ6PKpantbIbyNroFMaNBTFffkuW/ajSocGQO9Mo="; }; - nativeBuildInputs = [ - make - wrapGNUstepAppsHook - ]; - buildInputs = [ base ]; + nativeBuildInputs = [ wrapGNUstepAppsHook ]; + + propagatedBuildInputs = [ gnustep-base ]; patches = [ ./fixup-all.patch ]; + meta = { changelog = "https://github.com/gnustep/libs-gui/releases/tag/gui-${ builtins.replaceStrings [ "." ] [ "_" ] finalAttrs.version @@ -34,8 +32,8 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.lgpl2Plus; maintainers = with lib.maintainers; [ ashalkhakov - matthewbauer dblsaiko + matthewbauer ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/desktops/gnustep/libobjc2/default.nix b/pkgs/by-name/gn/gnustep-libobjc/package.nix similarity index 83% rename from pkgs/desktops/gnustep/libobjc2/default.nix rename to pkgs/by-name/gn/gnustep-libobjc/package.nix index 06e0b45095c0..330e31bf7bb6 100644 --- a/pkgs/desktops/gnustep/libobjc2/default.nix +++ b/pkgs/by-name/gn/gnustep-libobjc/package.nix @@ -1,13 +1,13 @@ { lib, - stdenv, + clangStdenv, fetchFromGitHub, cmake, robin-map, }: -stdenv.mkDerivation (finalAttrs: { - pname = "libobjc2"; +clangStdenv.mkDerivation (finalAttrs: { + pname = "gnustep-libobjc"; version = "2.2.1"; src = fetchFromGitHub { @@ -19,19 +19,20 @@ stdenv.mkDerivation (finalAttrs: { }; nativeBuildInputs = [ cmake ]; + buildInputs = [ robin-map ]; cmakeFlags = [ "-DCMAKE_INSTALL_LIBDIR=lib" ]; meta = with lib; { - broken = stdenv.hostPlatform.isDarwin; + broken = clangStdenv.hostPlatform.isDarwin; description = "Objective-C runtime for use with GNUstep"; homepage = "https://gnustep.github.io/"; license = licenses.mit; maintainers = with lib.maintainers; [ ashalkhakov - matthewbauer dblsaiko + matthewbauer ]; platforms = platforms.unix; }; diff --git a/pkgs/desktops/gnustep/make/GNUstep.conf b/pkgs/by-name/gn/gnustep-make/GNUstep.conf similarity index 100% rename from pkgs/desktops/gnustep/make/GNUstep.conf rename to pkgs/by-name/gn/gnustep-make/GNUstep.conf diff --git a/pkgs/desktops/gnustep/make/fixup-paths.patch b/pkgs/by-name/gn/gnustep-make/fixup-paths.patch similarity index 100% rename from pkgs/desktops/gnustep/make/fixup-paths.patch rename to pkgs/by-name/gn/gnustep-make/fixup-paths.patch diff --git a/pkgs/desktops/gnustep/make/default.nix b/pkgs/by-name/gn/gnustep-make/package.nix similarity index 81% rename from pkgs/desktops/gnustep/make/default.nix rename to pkgs/by-name/gn/gnustep-make/package.nix index d29cc55c56a5..66fe1c42b1b3 100644 --- a/pkgs/desktops/gnustep/make/default.nix +++ b/pkgs/by-name/gn/gnustep-make/package.nix @@ -1,12 +1,12 @@ { lib, - stdenv, + clangStdenv, fetchurl, + gnustep-libobjc, which, - libobjc, }: -stdenv.mkDerivation (finalAttrs: { +clangStdenv.mkDerivation (finalAttrs: { pname = "gnustep-make"; version = "2.9.2"; @@ -18,14 +18,17 @@ stdenv.mkDerivation (finalAttrs: { configureFlags = [ "--with-layout=fhs-system" "--disable-install-p" - "--with-config-file=${placeholder "out"}/etc/GNUstep/GNUstep.conf" ]; + preConfigure = '' + configureFlags="$configureFlags --with-config-file=$out/etc/GNUstep/GNUstep.conf" + ''; + makeFlags = [ "GNUSTEP_INSTALLATION_DOMAIN=SYSTEM" ]; - buildInputs = [ libobjc ]; + buildInputs = [ gnustep-libobjc ]; propagatedBuildInputs = [ which ]; @@ -41,8 +44,8 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.lgpl2Plus; maintainers = with lib.maintainers; [ ashalkhakov - matthewbauer dblsaiko + matthewbauer ]; platforms = lib.platforms.unix; }; diff --git a/pkgs/desktops/gnustep/make/setup-hook.sh b/pkgs/by-name/gn/gnustep-make/setup-hook.sh similarity index 100% rename from pkgs/desktops/gnustep/make/setup-hook.sh rename to pkgs/by-name/gn/gnustep-make/setup-hook.sh diff --git a/pkgs/desktops/gnustep/systempreferences/default.nix b/pkgs/by-name/gn/gnustep-systempreferences/package.nix similarity index 78% rename from pkgs/desktops/gnustep/systempreferences/default.nix rename to pkgs/by-name/gn/gnustep-systempreferences/package.nix index d9262af36191..55341d4f8ab2 100644 --- a/pkgs/desktops/gnustep/systempreferences/default.nix +++ b/pkgs/by-name/gn/gnustep-systempreferences/package.nix @@ -1,15 +1,12 @@ { lib, - stdenv, + clangStdenv, fetchurl, - make, + gnustep-back, wrapGNUstepAppsHook, - back, - base, - gui, }: -stdenv.mkDerivation (finalAttrs: { +clangStdenv.mkDerivation (finalAttrs: { pname = "system-preferences"; version = "1.2.0"; @@ -18,15 +15,9 @@ stdenv.mkDerivation (finalAttrs: { sha256 = "1fg7c3ihfgvl6n21rd17fs9ivx3l8ps874m80vz86n1callgs339"; }; - nativeBuildInputs = [ - make - wrapGNUstepAppsHook - ]; - buildInputs = [ - back - base - gui - ]; + nativeBuildInputs = [ wrapGNUstepAppsHook ]; + + buildInputs = [ gnustep-back ]; meta = { description = "Settings manager for the GNUstep environment and its applications"; @@ -35,8 +26,8 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "SystemPreferences"; maintainers = with lib.maintainers; [ ashalkhakov - matthewbauer dblsaiko + matthewbauer ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/by-name/go/golds/package.nix b/pkgs/by-name/go/golds/package.nix index de811d147b9c..a4e9026238e6 100644 --- a/pkgs/by-name/go/golds/package.nix +++ b/pkgs/by-name/go/golds/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "golds"; - version = "0.7.4"; + version = "0.7.5"; src = fetchFromGitHub { owner = "go101"; repo = "golds"; tag = "v${version}"; - hash = "sha256-kVXr/5qJCTjpfRpz2mDIsMRirp5dT5aGo/BlLR9Qp0M="; + hash = "sha256-maYkVZlr8VW3nsNLVD+ib8TfltBkDrgWiC7VyeEJIy4="; }; # nixpkgs is not using the go distpack archive and missing a VERSION file in the source diff --git a/pkgs/by-name/go/gopeed/package.nix b/pkgs/by-name/go/gopeed/package.nix index c21588bd29fd..bb4ee81811bc 100644 --- a/pkgs/by-name/go/gopeed/package.nix +++ b/pkgs/by-name/go/gopeed/package.nix @@ -60,6 +60,6 @@ stdenv.mkDerivation rec { platforms = [ "x86_64-linux" ]; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = with lib.licenses; [ gpl3Plus ]; - maintainers = with lib.maintainers; [ aucub ]; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/desktops/gnustep/gorm/default.nix b/pkgs/by-name/go/gorm/package.nix similarity index 77% rename from pkgs/desktops/gnustep/gorm/default.nix rename to pkgs/by-name/go/gorm/package.nix index 59c9c729f8be..1e883cebca0e 100644 --- a/pkgs/desktops/gnustep/gorm/default.nix +++ b/pkgs/by-name/go/gorm/package.nix @@ -1,15 +1,12 @@ { lib, - stdenv, + clangStdenv, fetchzip, - base, - back, - make, + gnustep-back, wrapGNUstepAppsHook, - gui, }: -stdenv.mkDerivation (finalAttrs: { +clangStdenv.mkDerivation (finalAttrs: { pname = "gorm"; version = "1.4.0"; @@ -18,15 +15,9 @@ stdenv.mkDerivation (finalAttrs: { sha256 = "sha256-B7NNRA3qA2PFbb03m58EBBONuIciLf6eU+YSR0qvaCo="; }; - nativeBuildInputs = [ - make - wrapGNUstepAppsHook - ]; - buildInputs = [ - base - back - gui - ]; + nativeBuildInputs = [ wrapGNUstepAppsHook ]; + + buildInputs = [ gnustep-back ]; meta = { description = "Graphical Object Relationship Modeller is an easy-to-use interface designer for GNUstep"; @@ -35,8 +26,8 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "Gorm"; maintainers = with lib.maintainers; [ ashalkhakov - matthewbauer dblsaiko + matthewbauer ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/by-name/go/got/package.nix b/pkgs/by-name/go/got/package.nix index 3259ce5711e6..4bed26de212a 100644 --- a/pkgs/by-name/go/got/package.nix +++ b/pkgs/by-name/go/got/package.nix @@ -1,44 +1,56 @@ -{ lib -, stdenv -, fetchurl -, pkg-config -, libressl -, libbsd -, libevent -, libuuid -, libossp_uuid -, libmd -, zlib -, ncurses -, bison -, autoPatchelfHook -, testers -, signify -, overrideSDK -, withSsh ? true, openssh -# Default editor to use when neither VISUAL nor EDITOR are defined -, defaultEditor ? null +{ + lib, + stdenv, + fetchurl, + pkg-config, + libressl, + libbsd, + libevent, + libuuid, + libossp_uuid, + libmd, + zlib, + ncurses, + bison, + autoPatchelfHook, + testers, + signify, + apple-sdk_15, + nix-update-script, + withSsh ? true, + openssh, + # Default editor to use when neither VISUAL nor EDITOR are defined + defaultEditor ? null, }: -let - stdenv' = if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64 - then overrideSDK stdenv "11.0" - else stdenv; -in -stdenv'.mkDerivation (finalAttrs: { +stdenv.mkDerivation (finalAttrs: { pname = "got"; - version = "0.106"; + version = "0.108"; src = fetchurl { url = "https://gameoftrees.org/releases/portable/got-portable-${finalAttrs.version}.tar.gz"; - hash = "sha256-MHnXQsElBH3jOd2SPXXQuWCZWjpLVn7QjvNtESvbB8w="; + hash = "sha256-bI0yCt01h65HwG2jLUH+5Ah+1mGTG6ZNxt53v0Mr0+I="; }; - nativeBuildInputs = [ pkg-config bison ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; + nativeBuildInputs = [ + pkg-config + bison + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; - buildInputs = [ libressl libbsd libevent libuuid libmd zlib ncurses ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ libossp_uuid ]; + buildInputs = + [ + libressl + libbsd + libevent + libuuid + libmd + zlib + ncurses + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + libossp_uuid + apple-sdk_15 + ]; preConfigure = lib.optionalString stdenv.hostPlatform.isDarwin '' # The configure script assumes dependencies on Darwin are installed via @@ -48,25 +60,35 @@ stdenv'.mkDerivation (finalAttrs: { ''; env.NIX_CFLAGS_COMPILE = toString ( - lib.optionals (defaultEditor != null) [ - ''-DGOT_DEFAULT_EDITOR="${lib.getExe defaultEditor}"'' - ] ++ lib.optionals withSsh [ - ''-DGOT_DIAL_PATH_SSH="${lib.getExe openssh}"'' - ''-DGOT_TAG_PATH_SSH_KEYGEN="${lib.getExe' openssh "ssh-keygen"}"'' - ] ++ lib.optionals stdenv.hostPlatform.isLinux [ - ''-DGOT_TAG_PATH_SIGNIFY="${lib.getExe signify}"'' - ] ++ lib.optionals stdenv.cc.isClang [ - "-Wno-error=implicit-function-declaration" - "-Wno-error=int-conversion" - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - # error: conflicting types for 'strmode' - "-DHAVE_STRMODE=1" - # Undefined symbols for architecture arm64: "_bsd_getopt" - "-include getopt.h" - ]); + lib.optionals (defaultEditor != null) [ + ''-DGOT_DEFAULT_EDITOR="${lib.getExe defaultEditor}"'' + ] + ++ lib.optionals withSsh [ + ''-DGOT_DIAL_PATH_SSH="${lib.getExe openssh}"'' + ''-DGOT_TAG_PATH_SSH_KEYGEN="${lib.getExe' openssh "ssh-keygen"}"'' + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + ''-DGOT_TAG_PATH_SIGNIFY="${lib.getExe signify}"'' + ] + ++ lib.optionals stdenv.cc.isClang [ + "-Wno-error=implicit-function-declaration" + "-Wno-error=int-conversion" + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + # error: conflicting types for 'strmode' + "-DHAVE_STRMODE=1" + # Undefined symbols for architecture arm64: "_bsd_getopt" + "-include getopt.h" + ] + ); - passthru.tests.version = testers.testVersion { - package = finalAttrs.finalPackage; + passthru = { + updateScript = nix-update-script { + extraArgs = [ "--url=https://github.com/ThomasAdam/got-portable" ]; + }; + tests.version = testers.testVersion { + package = finalAttrs.finalPackage; + }; }; meta = { @@ -83,7 +105,10 @@ stdenv'.mkDerivation (finalAttrs: { ''; homepage = "https://gameoftrees.org"; license = lib.licenses.isc; - maintainers = with lib.maintainers; [ abbe afh ]; + maintainers = with lib.maintainers; [ + abbe + afh + ]; mainProgram = "got"; platforms = with lib.platforms; darwin ++ linux; }; diff --git a/pkgs/by-name/go/gotify-desktop/package.nix b/pkgs/by-name/go/gotify-desktop/package.nix index 9abc5bc183f7..5706c3af83a3 100644 --- a/pkgs/by-name/go/gotify-desktop/package.nix +++ b/pkgs/by-name/go/gotify-desktop/package.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "gotify-desktop"; - version = "1.3.7"; + version = "1.4.0"; src = fetchFromGitHub { owner = "desbma"; repo = pname; rev = version; - sha256 = "sha256-ISK1sI7NkXJBtuCkl5g8ffrGv5dYgzmpsmPTZmDAaMI="; + sha256 = "sha256-P6zZAd3381/JamrEdbZRVFouhDsPNy1cNAjy4K3jGro="; }; - cargoHash = "sha256-QK2rzC9l+CiDv1+0NzR2x5B/5BYiY8KkLC2jxBdjXMU="; + cargoHash = "sha256-YdvPcg16C7WNHaKdLMXGZoouGFOJ5Z927SMxHL/pwmY="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/gr/grafana-image-renderer/package.nix b/pkgs/by-name/gr/grafana-image-renderer/package.nix index 03baafa0a975..b611f476d891 100644 --- a/pkgs/by-name/gr/grafana-image-renderer/package.nix +++ b/pkgs/by-name/gr/grafana-image-renderer/package.nix @@ -14,13 +14,13 @@ mkYarnPackage rec { pname = "grafana-image-renderer"; - version = "3.11.6"; + version = "3.12.0"; src = fetchFromGitHub { owner = "grafana"; repo = "grafana-image-renderer"; rev = "v${version}"; - hash = "sha256-jHACiSTZHNHj61kN8zEjGb3NpkhRJrJ7Mp0pNmJXDXY="; + hash = "sha256-iTWkr7mruGda7CVz0L6puHeObnogXHfqjF9KAY+ExJg="; }; offlineCache = fetchYarnDeps { diff --git a/pkgs/by-name/gr/grml-zsh-config/package.nix b/pkgs/by-name/gr/grml-zsh-config/package.nix index fb15cd901012..59aa31f556bf 100644 --- a/pkgs/by-name/gr/grml-zsh-config/package.nix +++ b/pkgs/by-name/gr/grml-zsh-config/package.nix @@ -1,13 +1,13 @@ { stdenv, fetchFromGitHub, lib, zsh, coreutils, inetutils, procps, txt2tags }: stdenv.mkDerivation rec { pname = "grml-zsh-config"; - version = "0.19.11"; + version = "0.19.12"; src = fetchFromGitHub { owner = "grml"; repo = "grml-etc-core"; rev = "v${version}"; - sha256 = "sha256-plVyzuVFw7wxFlhfCCjZe2QqkytTgUvsxrIdB7nv66g="; + sha256 = "sha256-s8U5CypuCd7lJ3pPhpVgbFfw6s0tTQwtHo2hOhxOECw="; }; strictDeps = true; diff --git a/pkgs/by-name/gr/grpc_cli/package.nix b/pkgs/by-name/gr/grpc_cli/package.nix index 9682fadc552d..639282db9958 100644 --- a/pkgs/by-name/gr/grpc_cli/package.nix +++ b/pkgs/by-name/gr/grpc_cli/package.nix @@ -11,12 +11,12 @@ stdenv.mkDerivation rec { pname = "grpc_cli"; - version = "1.69.0"; + version = "1.70.0"; src = fetchFromGitHub { owner = "grpc"; repo = "grpc"; rev = "v${version}"; - hash = "sha256-rRiPUcr6of/sjqB+qr7eOkKVFGTnu8UjluULmcn8df4="; + hash = "sha256-kJhGAhqu25Q2g6BWkVGp6nGYrWdBnMhoMu6e7ifNbgk="; fetchSubmodules = true; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/gu/gui-for-clash/package.nix b/pkgs/by-name/gu/gui-for-clash/package.nix index 402e3ba6cb4e..7df13f5584cc 100644 --- a/pkgs/by-name/gu/gui-for-clash/package.nix +++ b/pkgs/by-name/gu/gui-for-clash/package.nix @@ -60,7 +60,7 @@ let meta = { description = "GUI program developed by vue3"; license = with lib.licenses; [ gpl3Plus ]; - maintainers = with lib.maintainers; [ aucub ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.linux; }; }); @@ -68,11 +68,13 @@ in buildGoModule { inherit pname version src; - patches = [ - (replaceVars ./bridge.patch { - basepath = placeholder "out"; - }) - ]; + patches = [ ./bridge.patch ]; + + postPatch = '' + # As we need the $out reference, we can't use `replaceVars` here. + substituteInPlace bridge/bridge.go \ + --replace-fail '@basepath@' "$out" + ''; vendorHash = "sha256-OrysyJF+lUMf+0vWmOZHjxUdE6fQCKArmpV4alXxtYs="; @@ -130,7 +132,7 @@ buildGoModule { homepage = "https://github.com/GUI-for-Cores/GUI.for.Clash"; mainProgram = "GUI.for.Clash"; license = with lib.licenses; [ gpl3Plus ]; - maintainers = with lib.maintainers; [ aucub ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.linux; }; } diff --git a/pkgs/by-name/gu/gui-for-singbox/package.nix b/pkgs/by-name/gu/gui-for-singbox/package.nix index 08620f978925..1ba42e4decf9 100644 --- a/pkgs/by-name/gu/gui-for-singbox/package.nix +++ b/pkgs/by-name/gu/gui-for-singbox/package.nix @@ -60,7 +60,7 @@ let meta = { description = "GUI program developed by vue3"; license = with lib.licenses; [ gpl3Plus ]; - maintainers = with lib.maintainers; [ aucub ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.linux; }; }); @@ -68,11 +68,13 @@ in buildGoModule { inherit pname version src; - patches = [ - (replaceVars ./bridge.patch { - basepath = placeholder "out"; - }) - ]; + patches = [ ./bridge.patch ]; + + postPatch = '' + # As we need the $out reference, we can't use `replaceVars` here. + substituteInPlace bridge/bridge.go \ + --replace-fail '@basepath@' "$out" + ''; vendorHash = "sha256-OrysyJF+lUMf+0vWmOZHjxUdE6fQCKArmpV4alXxtYs="; @@ -130,7 +132,7 @@ buildGoModule { homepage = "https://github.com/GUI-for-Cores/GUI.for.SingBox"; mainProgram = "GUI.for.SingBox"; license = with lib.licenses; [ gpl3Plus ]; - maintainers = with lib.maintainers; [ aucub ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.linux; }; } diff --git a/pkgs/by-name/gu/guile-zlib/package.nix b/pkgs/by-name/gu/guile-zlib/package.nix index 41b0736528a5..4854622debfb 100644 --- a/pkgs/by-name/gu/guile-zlib/package.nix +++ b/pkgs/by-name/gu/guile-zlib/package.nix @@ -10,14 +10,14 @@ stdenv.mkDerivation rec { pname = "guile-zlib"; - version = "0.2.1"; + version = "0.2.2"; src = fetchFromGitea { domain = "notabug.org"; owner = "guile-zlib"; repo = "guile-zlib"; rev = "v${version}"; - hash = "sha256-WwvrLZIrv8oSDXckdoG0RaPUQbqr02tdGrcdLYea7ic="; + hash = "sha256-aaZhwHimQq408DNtHy442kh/EYdRdxP0Z1tQGDKmkmc="; }; strictDeps = true; diff --git a/pkgs/desktops/gnustep/gworkspace/default.nix b/pkgs/by-name/gw/gworkspace/package.nix similarity index 79% rename from pkgs/desktops/gnustep/gworkspace/default.nix rename to pkgs/by-name/gw/gworkspace/package.nix index 92f60105d1c8..0f12f00838b6 100644 --- a/pkgs/desktops/gnustep/gworkspace/default.nix +++ b/pkgs/by-name/gw/gworkspace/package.nix @@ -1,16 +1,13 @@ { lib, - stdenv, - back, - base, - gui, - make, - wrapGNUstepAppsHook, + clangStdenv, fetchurl, - system_preferences, + gnustep-back, + gnustep-systempreferences, + wrapGNUstepAppsHook, }: -stdenv.mkDerivation (finalAttrs: { +clangStdenv.mkDerivation (finalAttrs: { pname = "gworkspace"; version = "1.0.0"; @@ -22,16 +19,13 @@ stdenv.mkDerivation (finalAttrs: { # additional dependencies: # - PDFKit framework from http://gap.nongnu.org/ # - TODO: to --enable-gwmetadata, need libDBKit as well as sqlite! - nativeBuildInputs = [ - make - wrapGNUstepAppsHook - ]; + nativeBuildInputs = [ wrapGNUstepAppsHook ]; + buildInputs = [ - back - base - gui - system_preferences + gnustep-back + gnustep-systempreferences ]; + configureFlags = [ "--with-inotify" ]; meta = { @@ -41,8 +35,8 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "GWorkspace"; maintainers = with lib.maintainers; [ ashalkhakov - matthewbauer dblsaiko + matthewbauer ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/by-name/ha/hacksaw/package.nix b/pkgs/by-name/ha/hacksaw/package.nix deleted file mode 100644 index ddf703433b11..000000000000 --- a/pkgs/by-name/ha/hacksaw/package.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ - lib, - fetchCrate, - rustPlatform, - pkg-config, - libXrandr, - libX11, - python3, -}: - -rustPlatform.buildRustPackage rec { - pname = "hacksaw"; - version = "1.0.4"; - - nativeBuildInputs = [ - pkg-config - python3 - ]; - - buildInputs = [ - libXrandr - libX11 - ]; - - src = fetchCrate { - inherit pname version; - hash = "sha256-HRYTiccXU8DboAwZAr2gfzXUs8igSiFDpOEGtHpI0dA="; - }; - - cargoHash = "sha256-CDDJmWnAcXJ4wPfSPvu2DfthaFwZGZk1XXMNTA1g0+c="; - - meta = with lib; { - description = "Lightweight selection tool for usage in screenshot scripts etc"; - homepage = "https://github.com/neXromancers/hacksaw"; - license = with licenses; [ mpl20 ]; - maintainers = with maintainers; [ TethysSvensson ]; - platforms = platforms.linux; - mainProgram = "hacksaw"; - }; -} diff --git a/pkgs/by-name/ha/halo/package.nix b/pkgs/by-name/ha/halo/package.nix index 70a185ecea1e..7a1241b80885 100644 --- a/pkgs/by-name/ha/halo/package.nix +++ b/pkgs/by-name/ha/halo/package.nix @@ -8,10 +8,10 @@ }: stdenv.mkDerivation rec { pname = "halo"; - version = "2.20.13"; + version = "2.20.14"; src = fetchurl { url = "https://github.com/halo-dev/halo/releases/download/v${version}/halo-${version}.jar"; - hash = "sha256-BcI5LHAKDpd68w/D7TKOS3ChthsiWislm3yKyd0cSkM="; + hash = "sha256-42prPQTrjTgfHiwcpIKHpuiQLw4xhZ3wK1PkVLaC4OQ="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ha/handheld-daemon-ui/package.nix b/pkgs/by-name/ha/handheld-daemon-ui/package.nix index 2454a82642bb..84ef6b091681 100644 --- a/pkgs/by-name/ha/handheld-daemon-ui/package.nix +++ b/pkgs/by-name/ha/handheld-daemon-ui/package.nix @@ -5,11 +5,11 @@ }: let pname = "handheld-daemon-ui"; - version = "3.3.5"; + version = "3.3.6"; src = fetchurl { url = "https://github.com/hhd-dev/hhd-ui/releases/download/v${version}/hhd-ui.Appimage"; - hash = "sha256-g8LB24WxpbsGDFHRI0c80m9XXZghKYiRyuRRoYvb34g="; + hash = "sha256-M9YTP4Q27bqeTD5JhO58ltPDxgMuGAftOXYAGHQNmhc="; }; extractedFiles = appimageTools.extractType2 { inherit pname version src; }; in diff --git a/pkgs/by-name/ha/handlr-regex/package.nix b/pkgs/by-name/ha/handlr-regex/package.nix index c29ea891ff5f..3c2f8709a0e1 100644 --- a/pkgs/by-name/ha/handlr-regex/package.nix +++ b/pkgs/by-name/ha/handlr-regex/package.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "handlr-regex"; - version = "0.12.0"; + version = "0.12.1"; src = fetchFromGitHub { owner = "Anomalocaridid"; repo = pname; rev = "v${version}"; - hash = "sha256-xjrETTBHqekdPn2NwpGVoRoU8mf0F4jZN2yt0k8ypRA="; + hash = "sha256-ZQAUqR0u+2kBLGyeT7qTcfwF87LY2qRClZ0T3WH78+w="; }; - cargoHash = "sha256-V/daNs2vk2N6N5eUq1haxxuNyGMBLLBSmBx0JozaN5A="; + cargoHash = "sha256-upsRGSUitLBf+yR4crIwKI6D7gasLx8O3cG4rqj8BWY="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/ha/harlequin/package.nix b/pkgs/by-name/ha/harlequin/package.nix index 5d1f79fd4144..c4bbad05fdcf 100644 --- a/pkgs/by-name/ha/harlequin/package.nix +++ b/pkgs/by-name/ha/harlequin/package.nix @@ -5,19 +5,20 @@ fetchFromGitHub, nix-update-script, glibcLocales, + versionCheckHook, withPostgresAdapter ? true, withBigQueryAdapter ? true, }: python3Packages.buildPythonApplication rec { pname = "harlequin"; - version = "1.25.2-unstable-2024-12-30"; + version = "2.0.0"; pyproject = true; src = fetchFromGitHub { owner = "tconbeer"; repo = "harlequin"; - rev = "7ef5327157c7617c1032c9128b487b32d1c91fea"; - hash = "sha256-QoIjEfQgN6YWDDor4PxfeFkkFGAidUC0ZvHy+PqgnWs="; + tag = "v${version}"; + hash = "sha256-IUzN+rWL69TUUS9npcmfSAPqy/8SYNusNAN/muCMqNI="; }; pythonRelaxDeps = [ @@ -65,15 +66,11 @@ python3Packages.buildPythonApplication rec { export HOME=$(mktemp -d) ''; - nativeCheckInputs = - [ - # FIX: restore on next release - # versionCheckHook - ] - ++ (with python3Packages; [ - pytest-asyncio - pytestCheckHook - ]); + nativeCheckInputs = with python3Packages; [ + pytest-asyncio + pytestCheckHook + versionCheckHook + ]; disabledTests = [ diff --git a/pkgs/by-name/ha/harmony-music/package.nix b/pkgs/by-name/ha/harmony-music/package.nix index b1545076e659..313215df9726 100644 --- a/pkgs/by-name/ha/harmony-music/package.nix +++ b/pkgs/by-name/ha/harmony-music/package.nix @@ -75,7 +75,7 @@ flutter324.buildFlutterApplication rec { homepage = "https://github.com/anandnet/Harmony-Music"; mainProgram = "harmonymusic"; license = with lib.licenses; [ gpl3Plus ]; - maintainers = with lib.maintainers; [ aucub ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.linux; }; } diff --git a/pkgs/by-name/hc/hcdiag/package.nix b/pkgs/by-name/hc/hcdiag/package.nix index ba8545996246..d431440c135a 100644 --- a/pkgs/by-name/hc/hcdiag/package.nix +++ b/pkgs/by-name/hc/hcdiag/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "hcdiag"; - version = "0.5.5"; + version = "0.5.6"; src = fetchFromGitHub { owner = "hashicorp"; repo = "hcdiag"; tag = "v${version}"; - hash = "sha256-ZzSGBw7DRh/VSDtXoMgJpGWVmJUF2G2yZaae+fKklMc="; + hash = "sha256-MY1qaVm1PRB3A+MPz4rVUS+Kn4O4p9yzn/3DHKvhZkk="; }; - vendorHash = "sha256-MJg6mqG1bn941LqIr0TQhcgWBCwUtfujdpqf4rgCrWM="; + vendorHash = "sha256-09I5Hsw7EhZZAvG7TnJNID/lVv0FVM3ejsmzy3GK48g="; nativeInstallCheckHooks = [ versionCheckHook diff --git a/pkgs/by-name/he/helm-ls/package.nix b/pkgs/by-name/he/helm-ls/package.nix index 5c92a637c99d..3ffedc478a9c 100644 --- a/pkgs/by-name/he/helm-ls/package.nix +++ b/pkgs/by-name/he/helm-ls/package.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "helm-ls"; - version = "0.1.1"; + version = "0.2.0"; src = fetchFromGitHub { owner = "mrjosh"; repo = "helm-ls"; rev = "v${version}"; - hash = "sha256-pf/gC0jIrJUfU//uj+CGkUsNDVFeS6Wm4kx3Di9wpVI="; + hash = "sha256-k/JJoLRykIY/ZmjqG+ZzXuMPQRcoumqisPKrD9PPyd0="; }; vendorHash = "sha256-VAxmMDZIbbcGHoRL06oqWkDnWZBuweKyoCLSqItWHyg="; diff --git a/pkgs/by-name/hh/hheretic/package.nix b/pkgs/by-name/hh/hheretic/package.nix index 86f9b33e8e10..c2d7a7909ff1 100644 --- a/pkgs/by-name/hh/hheretic/package.nix +++ b/pkgs/by-name/hh/hheretic/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "hheretic"; - version = "0.2.3"; + version = "0.2.4"; src = fetchFromGitHub { owner = "sezero"; repo = "hheretic"; rev = "hheretic-${finalAttrs.version}"; - hash = "sha256-e9N869W8STZdLUBSscxEnF2Z+SrdVv8ARDL8AMe1SJ8="; + hash = "sha256-49eQeh0suU+7QLB25cvrqirZRaBgZp438H6NW0pWsPI="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/hi/hiddify-app/package.nix b/pkgs/by-name/hi/hiddify-app/package.nix index 88ce64869f5c..8bf513af5713 100644 --- a/pkgs/by-name/hi/hiddify-app/package.nix +++ b/pkgs/by-name/hi/hiddify-app/package.nix @@ -65,7 +65,7 @@ let mainProgram = "HiddifyCli"; license = lib.licenses.cc-by-nc-sa-40; platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ aucub ]; + maintainers = with lib.maintainers; [ ]; }; }; in @@ -148,6 +148,6 @@ flutter324.buildFlutterApplication { mainProgram = "hiddify"; license = lib.licenses.cc-by-nc-sa-40; platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ aucub ]; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/by-name/hy/hyprlock/package.nix b/pkgs/by-name/hy/hyprlock/package.nix index d55803b46007..e93cdcaceca0 100644 --- a/pkgs/by-name/hy/hyprlock/package.nix +++ b/pkgs/by-name/hy/hyprlock/package.nix @@ -28,13 +28,13 @@ gcc14Stdenv.mkDerivation (finalAttrs: { pname = "hyprlock"; - version = "0.6.1"; + version = "0.6.2"; src = fetchFromGitHub { owner = "hyprwm"; repo = "hyprlock"; rev = "v${finalAttrs.version}"; - hash = "sha256-lT6f/5NB73xj9cVesi2SNsL5jVciwZJp8QRohiv+3Hk="; + hash = "sha256-PotjNmR69yAEZP/Dn4lB0p7sHBjAPclNDbc5WkBZx4s="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/hy/hyprpaper/package.nix b/pkgs/by-name/hy/hyprpaper/package.nix index 3ce41db29987..bbf718c12f11 100644 --- a/pkgs/by-name/hy/hyprpaper/package.nix +++ b/pkgs/by-name/hy/hyprpaper/package.nix @@ -2,7 +2,6 @@ lib, gcc14Stdenv, fetchFromGitHub, - fetchpatch2, cmake, cairo, expat, @@ -33,24 +32,15 @@ gcc14Stdenv.mkDerivation (finalAttrs: { pname = "hyprpaper"; - version = "0.7.3"; + version = "0.7.4"; src = fetchFromGitHub { owner = "hyprwm"; repo = "hyprpaper"; rev = "v${finalAttrs.version}"; - hash = "sha256-IRZ5NrKFwBVueYrZYUQfpTwp2rZHgAkPwgvdnfVBF8E="; + hash = "sha256-pmkJCzjflvsOytiu2mgn2wfSeyL6mTfoi214T4A2OZQ="; }; - patches = [ - # FIXME: remove in next release - (fetchpatch2 { - name = "fix-hypr-wayland-scanner-0.4.4-build.patch"; - url = "https://github.com/hyprwm/hyprpaper/commit/505e447b6c48e6b49f3aecf5da276f3cc5780054.patch?full_index=1"; - hash = "sha256-Vk2P2O4XQiCYqV0KbK/ADe8KPmaTs3Mg7JRJ3cGW9lM="; - }) - ]; - nativeBuildInputs = [ cmake pkg-config diff --git a/pkgs/by-name/im/immich/package.nix b/pkgs/by-name/im/immich/package.nix index 759925c0e451..06839ba36e60 100644 --- a/pkgs/by-name/im/immich/package.nix +++ b/pkgs/by-name/im/immich/package.nix @@ -1,6 +1,5 @@ { lib, - stdenvNoCC, buildNpmPackage, fetchFromGitHub, fetchpatch2, @@ -129,21 +128,6 @@ let ''; }; - node-addon-api = stdenvNoCC.mkDerivation rec { - pname = "node-addon-api"; - version = "8.3.0"; - src = fetchFromGitHub { - owner = "nodejs"; - repo = "node-addon-api"; - tag = "v${version}"; - hash = "sha256-7KkJkMNX352XnWTOC6mJB+IcFrda20UENcNwoXWDm+s="; - }; - installPhase = '' - mkdir $out - cp -r *.c *.h *.gyp *.gypi index.js package-support.json package.json tools $out/ - ''; - }; - vips' = vips.overrideAttrs (prev: { mesonFlags = prev.mesonFlags ++ [ "-Dtiff=disabled" ]; }); @@ -180,27 +164,9 @@ buildNpmPackage' { # Required because vips tries to write to the cache dir makeCacheWritable = true; - # we manually build sharp from source later on - # FIXME figure out why otherwise it fails with - # error: 'NewOrCopy' is not a member of 'Napi::Buffer' - env.SHARP_IGNORE_GLOBAL_LIBVIPS = 1; + env.SHARP_FORCE_GLOBAL_LIBVIPS = 1; preBuild = '' - unset SHARP_IGNORE_GLOBAL_LIBVIPS - export SHARP_FORCE_GLOBAL_LIBVIPS=1 - - pushd node_modules/sharp - - mkdir node_modules - ln -s ${node-addon-api} node_modules/node-addon-api - - node install/check - - rm -r node_modules - - popd - rm -r node_modules/@img/sharp* - # If exiftool-vendored.pl isn't found, exiftool is searched for on the PATH rm -r node_modules/exiftool-vendored.* ''; diff --git a/pkgs/by-name/im/immich/sources.json b/pkgs/by-name/im/immich/sources.json index 27ea111b151d..6935c5e9fa5c 100644 --- a/pkgs/by-name/im/immich/sources.json +++ b/pkgs/by-name/im/immich/sources.json @@ -1,26 +1,26 @@ { - "version": "1.124.2", - "hash": "sha256-EIp1KH2sNvEiB3wl6m0IiAUyDwBETgKlSXCrIsw73Oo=", + "version": "1.125.2", + "hash": "sha256-vtEUMERvCibOKYlHtu8eTQX6LLAMF5riBs2feX8HCAU=", "components": { "cli": { - "npmDepsHash": "sha256-k3sA4OcjlvzMMI2GsUYks2fIj7LG89H3OX4vTZOCIOo=", - "version": "2.2.40" + "npmDepsHash": "sha256-wHxNmmZVWuOYueEgkSGokwVZ20DklrjTyLYyamLzPvk=", + "version": "2.2.43" }, "server": { - "npmDepsHash": "sha256-O0XqMOUYy7VdumDDbSenMy22lgZLCDy/GpaSVNs+k4I=", - "version": "1.124.2" + "npmDepsHash": "sha256-0zcEiQM2KDrpLVv/uybcis9ohtyB5LcbZhvlXSMVRg0=", + "version": "1.125.2" }, "web": { - "npmDepsHash": "sha256-f3p0HT7l3hXFEo+8AvKEn8QvH6KOTMGZOvaOAPxv3Kc=", - "version": "1.124.2" + "npmDepsHash": "sha256-dTkRTxFhIeXhIkc87pERTCXtEoipiDA6C5RdlQ6Dvo8=", + "version": "1.125.2" }, "open-api/typescript-sdk": { - "npmDepsHash": "sha256-uk4Gfs10TIsbD4VdHt7a9Fub8PcT6R8ksfvnOLFs/Zo=", - "version": "1.124.2" + "npmDepsHash": "sha256-uBzPhxITGzEnKrcATzTQeIwjKpAE8Y0xoJdC5dm6cZo=", + "version": "1.125.2" }, "geonames": { - "timestamp": "20250108222614", - "hash": "sha256-gCi0iFQplv4XizDi9DYEVekFFe46DM4X2YiPSe7ugR4=" + "timestamp": "20250124195258", + "hash": "sha256-2m+0M6200SixTFVZ1V7ZFw8D4E9VYhbmOto0RqWQPsQ=" } } } diff --git a/pkgs/by-name/in/incus/1531.diff b/pkgs/by-name/in/incus/1531.diff deleted file mode 100644 index fbcdcad438f0..000000000000 --- a/pkgs/by-name/in/incus/1531.diff +++ /dev/null @@ -1,271 +0,0 @@ -diff --git a/internal/server/instance/drivers/driver_qemu.go b/internal/server/instance/drivers/driver_qemu.go -index 1c773213468..fb43917ca96 100644 ---- a/internal/server/instance/drivers/driver_qemu.go -+++ b/internal/server/instance/drivers/driver_qemu.go -@@ -2393,7 +2393,7 @@ func (d *qemu) deviceAttachPath(deviceName string, configCopy map[string]string, - - d.logger.Debug("Using PCI bus device to hotplug virtiofs into", logger.Ctx{"device": deviceName, "port": pciDeviceName}) - -- qemuDev := map[string]string{ -+ qemuDev := map[string]any{ - "driver": "vhost-user-fs-pci", - "bus": pciDeviceName, - "addr": "00.0", -@@ -2535,7 +2535,7 @@ func (d *qemu) deviceAttachNIC(deviceName string, configCopy map[string]string, - return err - } - -- qemuDev := make(map[string]string) -+ qemuDev := make(map[string]any) - - // PCIe and PCI require a port device name to hotplug the NIC into. - if slices.Contains([]string{"pcie", "pci"}, qemuBus) { -@@ -2633,7 +2633,7 @@ func (d *qemu) deviceAttachPCI(deviceName string, configCopy map[string]string, - return err - } - -- qemuDev := make(map[string]string) -+ qemuDev := make(map[string]any) - escapedDeviceName := linux.PathNameEncode(devName) - - d.logger.Debug("Using PCI bus device to hotplug NIC into", logger.Ctx{"device": deviceName, "port": pciDeviceName}) -@@ -3589,7 +3589,7 @@ func (d *qemu) generateQemuConfigFile(cpuInfo *cpuTopology, mountInfo *storagePo - break - } - -- qemuDev := make(map[string]string) -+ qemuDev := make(map[string]any) - if slices.Contains([]string{"nvme", "virtio-blk"}, busName) { - // Allocate a PCI(e) port and write it to the config file so QMP can "hotplug" the - // drive into it later. -@@ -3600,7 +3600,7 @@ func (d *qemu) generateQemuConfigFile(cpuInfo *cpuTopology, mountInfo *storagePo - qemuDev["addr"] = devAddr - - if multi { -- qemuDev["multifunction"] = "on" -+ qemuDev["multifunction"] = true - } - } - -@@ -3624,7 +3624,7 @@ func (d *qemu) generateQemuConfigFile(cpuInfo *cpuTopology, mountInfo *storagePo - - // Add network device. - if len(runConf.NetworkInterface) > 0 { -- qemuDev := make(map[string]string) -+ qemuDev := make(map[string]any) - if slices.Contains([]string{"pcie", "pci"}, bus.name) { - // Allocate a PCI(e) port and write it to the config file so QMP can "hotplug" the - // NIC into it later. -@@ -3635,7 +3635,7 @@ func (d *qemu) generateQemuConfigFile(cpuInfo *cpuTopology, mountInfo *storagePo - qemuDev["addr"] = devAddr - - if multi { -- qemuDev["multifunction"] = "on" -+ qemuDev["multifunction"] = true - } - } - -@@ -3860,7 +3860,7 @@ func (d *qemu) addFileDescriptor(fdFiles *[]*os.File, file *os.File) int { - } - - // addRootDriveConfig adds the qemu config required for adding the root drive. --func (d *qemu) addRootDriveConfig(qemuDev map[string]string, mountInfo *storagePools.MountInfo, bootIndexes map[string]int, rootDriveConf deviceConfig.MountEntryItem) (monitorHook, error) { -+func (d *qemu) addRootDriveConfig(qemuDev map[string]any, mountInfo *storagePools.MountInfo, bootIndexes map[string]int, rootDriveConf deviceConfig.MountEntryItem) (monitorHook, error) { - if rootDriveConf.TargetPath != "/" { - return nil, fmt.Errorf("Non-root drive config supplied") - } -@@ -3992,7 +3992,7 @@ func (d *qemu) addDriveDirConfig(cfg *[]cfgSection, bus *qemuBus, fdFiles *[]*os - } - - // addDriveConfig adds the qemu config required for adding a supplementary drive. --func (d *qemu) addDriveConfig(qemuDev map[string]string, bootIndexes map[string]int, driveConf deviceConfig.MountEntryItem) (monitorHook, error) { -+func (d *qemu) addDriveConfig(qemuDev map[string]any, bootIndexes map[string]int, driveConf deviceConfig.MountEntryItem) (monitorHook, error) { - aioMode := "native" // Use native kernel async IO and O_DIRECT by default. - cacheMode := "none" // Bypass host cache, use O_DIRECT semantics by default. - media := "disk" -@@ -4248,7 +4248,7 @@ func (d *qemu) addDriveConfig(qemuDev map[string]string, bootIndexes map[string] - } - - if qemuDev == nil { -- qemuDev = map[string]string{} -+ qemuDev = map[string]any{} - } - - qemuDev["id"] = fmt.Sprintf("%s%s", qemuDeviceIDPrefix, escapedDeviceName) -@@ -4256,8 +4256,8 @@ func (d *qemu) addDriveConfig(qemuDev map[string]string, bootIndexes map[string] - qemuDev["serial"] = fmt.Sprintf("%s%s", qemuBlockDevIDPrefix, escapedDeviceName) - - if bus == "virtio-scsi" { -- qemuDev["channel"] = "0" -- qemuDev["lun"] = "1" -+ qemuDev["channel"] = 0 -+ qemuDev["lun"] = 1 - qemuDev["bus"] = "qemu_scsi.0" - - if media == "disk" { -@@ -4282,7 +4282,7 @@ func (d *qemu) addDriveConfig(qemuDev map[string]string, bootIndexes map[string] - } - - if bootIndexes != nil { -- qemuDev["bootindex"] = strconv.Itoa(bootIndexes[driveConf.DevName]) -+ qemuDev["bootindex"] = bootIndexes[driveConf.DevName] - } - - monHook := func(m *qmp.Monitor) error { -@@ -4336,7 +4336,7 @@ func (d *qemu) addDriveConfig(qemuDev map[string]string, bootIndexes map[string] - } - - if driveConf.Limits != nil { -- err = m.SetBlockThrottle(qemuDev["id"], int(driveConf.Limits.ReadBytes), int(driveConf.Limits.WriteBytes), int(driveConf.Limits.ReadIOps), int(driveConf.Limits.WriteIOps)) -+ err = m.SetBlockThrottle(qemuDev["id"].(string), int(driveConf.Limits.ReadBytes), int(driveConf.Limits.WriteBytes), int(driveConf.Limits.ReadIOps), int(driveConf.Limits.WriteIOps)) - if err != nil { - return fmt.Errorf("Failed applying limits for disk device %q: %w", driveConf.DevName, err) - } -@@ -4351,7 +4351,7 @@ func (d *qemu) addDriveConfig(qemuDev map[string]string, bootIndexes map[string] - - // addNetDevConfig adds the qemu config required for adding a network device. - // The qemuDev map is expected to be preconfigured with the settings for an existing port to use for the device. --func (d *qemu) addNetDevConfig(busName string, qemuDev map[string]string, bootIndexes map[string]int, nicConfig []deviceConfig.RunConfigItem) (monitorHook, error) { -+func (d *qemu) addNetDevConfig(busName string, qemuDev map[string]any, bootIndexes map[string]int, nicConfig []deviceConfig.RunConfigItem) (monitorHook, error) { - reverter := revert.New() - defer reverter.Fail() - -@@ -4382,7 +4382,7 @@ func (d *qemu) addNetDevConfig(busName string, qemuDev map[string]string, bootIn - if len(bootIndexes) > 0 { - bootIndex, found := bootIndexes[devName] - if found { -- qemuDev["bootindex"] = strconv.Itoa(bootIndex) -+ qemuDev["bootindex"] = bootIndex - } - } - -@@ -4400,9 +4400,9 @@ func (d *qemu) addNetDevConfig(busName string, qemuDev map[string]string, bootIn - // Number of vectors is number of vCPUs * 2 (RX/TX) + 2 (config/control MSI-X). - vectors := 2*queueCount + 2 - if vectors > 0 { -- qemuDev["mq"] = "on" -+ qemuDev["mq"] = true - if slices.Contains([]string{"pcie", "pci"}, busName) { -- qemuDev["vectors"] = strconv.Itoa(vectors) -+ qemuDev["vectors"] = vectors - } - } - -@@ -4591,9 +4591,9 @@ func (d *qemu) addNetDevConfig(busName string, qemuDev map[string]string, bootIn - } - - qemuDev["netdev"] = qemuNetDev["id"].(string) -- qemuDev["page-per-vq"] = "on" -- qemuDev["iommu_platform"] = "on" -- qemuDev["disable-legacy"] = "on" -+ qemuDev["page-per-vq"] = true -+ qemuDev["iommu_platform"] = true -+ qemuDev["disable-legacy"] = true - - err = m.AddNIC(qemuNetDev, qemuDev) - if err != nil { -@@ -4819,7 +4819,7 @@ func (d *qemu) addGPUDevConfig(cfg *[]cfgSection, bus *qemuBus, gpuConfig []devi - } - - func (d *qemu) addUSBDeviceConfig(usbDev deviceConfig.USBDeviceItem) (monitorHook, error) { -- device := map[string]string{ -+ qemuDev := map[string]any{ - "id": fmt.Sprintf("%s%s", qemuDeviceIDPrefix, usbDev.DeviceName), - "driver": "usb-host", - "bus": "qemu_usb.0", -@@ -4836,18 +4836,18 @@ func (d *qemu) addUSBDeviceConfig(usbDev deviceConfig.USBDeviceItem) (monitorHoo - - defer func() { _ = f.Close() }() - -- info, err := m.SendFileWithFDSet(device["id"], f, false) -+ info, err := m.SendFileWithFDSet(qemuDev["id"].(string), f, false) - if err != nil { - return fmt.Errorf("Failed to send file descriptor: %w", err) - } - - revert.Add(func() { -- _ = m.RemoveFDFromFDSet(device["id"]) -+ _ = m.RemoveFDFromFDSet(qemuDev["id"].(string)) - }) - -- device["hostdevice"] = fmt.Sprintf("/dev/fdset/%d", info.ID) -+ qemuDev["hostdevice"] = fmt.Sprintf("/dev/fdset/%d", info.ID) - -- err = m.AddDevice(device) -+ err = m.AddDevice(qemuDev) - if err != nil { - return fmt.Errorf("Failed to add device: %w", err) - } -@@ -9188,19 +9188,19 @@ func (d *qemu) setCPUs(monitor *qmp.Monitor, count int) error { - - devID := fmt.Sprintf("cpu%d%d%d", cpu.Props.SocketID, cpu.Props.CoreID, cpu.Props.ThreadID) - -- dev := map[string]string{ -+ qemuDev := map[string]any{ - "id": devID, - "driver": cpu.Type, -- "core-id": fmt.Sprintf("%d", cpu.Props.CoreID), -+ "core-id": cpu.Props.CoreID, - } - - // No such thing as sockets and threads on s390x. - if d.architecture != osarch.ARCH_64BIT_S390_BIG_ENDIAN { -- dev["socket-id"] = fmt.Sprintf("%d", cpu.Props.SocketID) -- dev["thread-id"] = fmt.Sprintf("%d", cpu.Props.ThreadID) -+ qemuDev["socket-id"] = cpu.Props.SocketID -+ qemuDev["thread-id"] = cpu.Props.ThreadID - } - -- err := monitor.AddDevice(dev) -+ err := monitor.AddDevice(qemuDev) - if err != nil { - return fmt.Errorf("Failed to add device: %w", err) - } -@@ -9229,12 +9229,12 @@ func (d *qemu) setCPUs(monitor *qmp.Monitor, count int) error { - } - - revert.Add(func() { -- err := monitor.AddDevice(map[string]string{ -+ err := monitor.AddDevice(map[string]any{ - "id": devID, - "driver": cpu.Type, -- "socket-id": fmt.Sprintf("%d", cpu.Props.SocketID), -- "core-id": fmt.Sprintf("%d", cpu.Props.CoreID), -- "thread-id": fmt.Sprintf("%d", cpu.Props.ThreadID), -+ "socket-id": cpu.Props.SocketID, -+ "core-id": cpu.Props.CoreID, -+ "thread-id": cpu.Props.ThreadID, - }) - d.logger.Warn("Failed to add CPU device", logger.Ctx{"err": err}) - }) -diff --git a/internal/server/instance/drivers/qmp/commands.go b/internal/server/instance/drivers/qmp/commands.go -index 3e9752780c5..d81da8ff4f4 100644 ---- a/internal/server/instance/drivers/qmp/commands.go -+++ b/internal/server/instance/drivers/qmp/commands.go -@@ -538,7 +538,7 @@ func (m *Monitor) SetMemoryBalloonSizeBytes(sizeBytes int64) error { - } - - // AddBlockDevice adds a block device. --func (m *Monitor) AddBlockDevice(blockDev map[string]any, device map[string]string) error { -+func (m *Monitor) AddBlockDevice(blockDev map[string]any, device map[string]any) error { - revert := revert.New() - defer revert.Fail() - -@@ -624,7 +624,7 @@ func (m *Monitor) RemoveCharDevice(deviceID string) error { - } - - // AddDevice adds a new device. --func (m *Monitor) AddDevice(device map[string]string) error { -+func (m *Monitor) AddDevice(device map[string]any) error { - if device != nil { - err := m.Run("device_add", device, nil) - if err != nil { -@@ -656,7 +656,7 @@ func (m *Monitor) RemoveDevice(deviceID string) error { - } - - // AddNIC adds a NIC device. --func (m *Monitor) AddNIC(netDev map[string]any, device map[string]string) error { -+func (m *Monitor) AddNIC(netDev map[string]any, device map[string]any) error { - revert := revert.New() - defer revert.Fail() - diff --git a/pkgs/by-name/in/incus/generic.nix b/pkgs/by-name/in/incus/generic.nix index fda8a541bc25..0954032da23c 100644 --- a/pkgs/by-name/in/incus/generic.nix +++ b/pkgs/by-name/in/incus/generic.nix @@ -2,7 +2,7 @@ hash, lts ? false, patches ? [ ], - updateScriptArgs ? "", + nixUpdateExtraArgs ? [ ], vendorHash, version, }: @@ -12,7 +12,6 @@ lib, buildGoModule, fetchFromGitHub, - writeScript, acl, cowsql, libcap, @@ -21,6 +20,7 @@ sqlite, udev, installShellFiles, + nix-update-script, nixosTests, }: @@ -128,9 +128,9 @@ buildGoModule rec { ui = callPackage ./ui.nix { }; - updateScript = writeScript "ovs-update.py" '' - ${./update.py} ${updateScriptArgs} - ''; + updateScript = nix-update-script { + extraArgs = nixUpdateExtraArgs; + }; }; meta = { diff --git a/pkgs/by-name/in/incus/lts.nix b/pkgs/by-name/in/incus/lts.nix index 94b30f5d39b9..a6cbeffb08d4 100644 --- a/pkgs/by-name/in/incus/lts.nix +++ b/pkgs/by-name/in/incus/lts.nix @@ -8,5 +8,8 @@ import ./generic.nix { ./0c37b7e3ec65b4d0e166e2127d9f1835320165b8.patch ]; lts = true; - updateScriptArgs = "--lts --regex '6.0.*'"; + nixUpdateExtraArgs = [ + "--version-regex=^v(6\\.0\\.[0-9]+)$" + "--override-filename=pkgs/by-name/in/incus/lts.nix" + ]; } diff --git a/pkgs/by-name/in/incus/package.nix b/pkgs/by-name/in/incus/package.nix index a0e1c4c3e0c5..56dc51e57065 100644 --- a/pkgs/by-name/in/incus/package.nix +++ b/pkgs/by-name/in/incus/package.nix @@ -1,9 +1,9 @@ import ./generic.nix { - hash = "sha256-Ir+cT+2xA+L4kBXhwA0XXE/D8zjMPGYiwW0VrEdobZ4="; - version = "6.8.0"; - vendorHash = "sha256-CDLq41AB2Y9nYlTuXZaAOgwXIin9CbqSXCFoigsc14A="; - patches = [ - # qemu 9.2 support - ./1531.diff + hash = "sha256-bi++GJLLYlX8JZwmxx4S2EGALuwVOGW4G7u2Nv6s26k="; + version = "6.9.0"; + vendorHash = "sha256-aYQOKO5RMPqChV6hXPBfSLKdfCuS+BFVmpakJX7swKg="; + patches = [ ]; + nixUpdateExtraArgs = [ + "--override-filename=pkgs/by-name/in/incus/package.nix" ]; } diff --git a/pkgs/by-name/in/incus/update.py b/pkgs/by-name/in/incus/update.py deleted file mode 100755 index e0a23f2fd65f..000000000000 --- a/pkgs/by-name/in/incus/update.py +++ /dev/null @@ -1,86 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i python -p python3 python3Packages.looseversion common-updater-scripts nurl - -import argparse -import json -import os -import re -from looseversion import LooseVersion -from subprocess import run - -parser = argparse.ArgumentParser() -parser.add_argument("--lts", action="store_true") -parser.add_argument("--regex") -args = parser.parse_args() - -nixpkgs_path = os.environ["PWD"] - -attr = "incus" -file = "pkgs/by-name/in/incus/package.nix" -if args.lts: - attr = "incus-lts" - file = "pkgs/by-name/in/incus/lts.nix" - -tags = ( - run(["list-git-tags", "--url=https://github.com/lxc/incus"], capture_output=True) - .stdout.decode("utf-8") - .splitlines() -) -tags = [t.lstrip("v") for t in tags] - -latest_version = "0" -for tag in tags: - if args.regex is not None and not re.match(args.regex, tag): - continue - - if LooseVersion(tag) > LooseVersion(latest_version): - latest_version = tag - -current_version = ( - run( - ["nix", "eval", "--raw", "-f", "default.nix", f"{attr}.version"], - capture_output=True, - ) - .stdout.decode("utf-8") - .strip() -) - -if LooseVersion(latest_version) <= LooseVersion(current_version): - print("No update available") - exit(0) - -print(f"Found new version {latest_version} > {current_version}") - -run(["update-source-version", attr, latest_version, f"--file={file}"]) - -file_content: str - -with open(file, "r+") as f: - file_content = f.read() - file_content = re.sub( - 'vendorHash = "sha256-.*"', - 'vendorHash = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA="', - file_content, - ) - f.seek(0) - f.write(file_content) - -print("Generating new vendorHash") - -latest_vendor_hash = ( - run( - ["nurl", "--expr", f"(import {nixpkgs_path} {{}}).{attr}.goModules"], - capture_output=True, - ) - .stdout.decode("utf-8") - .strip() -) - -file_content = file_content.replace( - "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=", latest_vendor_hash -) - -with open(file, "w") as f: - f.write(file_content) - -print("Done") diff --git a/pkgs/by-name/ip/ipatool/package.nix b/pkgs/by-name/ip/ipatool/package.nix index ea9bf1fdd9ea..b3803294619b 100644 --- a/pkgs/by-name/ip/ipatool/package.nix +++ b/pkgs/by-name/ip/ipatool/package.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "ipatool"; - version = "2.1.4"; + version = "2.1.5"; src = fetchFromGitHub { owner = "majd"; repo = "ipatool"; rev = "v${version}"; - hash = "sha256-e+gkr8i6dVfxyBM5Vi2YpW4eQ4LE2vhgQadLAFeHK4Q="; + hash = "sha256-HniMGlT4RaX7OGcQ6z8Ms6O78dWN4iK+ODzmYfxFNPw="; }; - vendorHash = "sha256-aVMWXlHMGdbApKLhuZZpaAYY5QpMMgXc/6f9r79/dTw="; + vendorHash = "sha256-/uB4mviMaPyYX59XrRqigOI0YK3necdRC2ZPErai1NU="; ldflags = [ "-s" diff --git a/pkgs/by-name/ip/iplookup-gtk/package.nix b/pkgs/by-name/ip/iplookup-gtk/package.nix index 3d2486fe5b98..2efdca4256c5 100644 --- a/pkgs/by-name/ip/iplookup-gtk/package.nix +++ b/pkgs/by-name/ip/iplookup-gtk/package.nix @@ -13,14 +13,14 @@ python3Packages.buildPythonPackage rec { pname = "iplookup-gtk"; - version = "0.3.4"; + version = "0.4.0"; pyproject = false; # Built with meson src = fetchFromGitHub { owner = "Bytezz"; repo = "IPLookup-gtk"; - rev = "v${version}"; - hash = "sha256-NqFE6vRdLpnlCzGAUE4iOfLmTnUgX3CHtoXfsbT3zm4="; + tag = "v${version}"; + hash = "sha256-pO05WDNb9AMKXm8OqzOnk77T5sLBdURV90FgQKL9oAw="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ir/iroh/package.nix b/pkgs/by-name/ir/iroh/package.nix index eb17a3e5de5e..835e9d91ddde 100644 --- a/pkgs/by-name/ir/iroh/package.nix +++ b/pkgs/by-name/ir/iroh/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "iroh"; - version = "0.30.0"; + version = "0.31.0"; src = fetchFromGitHub { owner = "n0-computer"; repo = pname; rev = "v${version}"; - hash = "sha256-9aRb1kMIo/DZOt1pYzXa8dfb3BlhVJ0kvS036jqGcHw="; + hash = "sha256-f6lDPjRUa64MnkFYcLCveaIYBTLFXjwQ1AFYbGQgFwQ="; }; - cargoHash = "sha256-QHysE7TBd619iVUEWmk7OhT4Y6SHmTXUnBkokmbaKRE="; + cargoHash = "sha256-fOGvnofeA+BdSxN1zZgrT1s1/pJjqH4btIO63vsYn00="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk.frameworks; [ diff --git a/pkgs/by-name/ja/jackass/package.nix b/pkgs/by-name/ja/jackass/package.nix index 6f31b8bcfb8c..b46723c16776 100644 --- a/pkgs/by-name/ja/jackass/package.nix +++ b/pkgs/by-name/ja/jackass/package.nix @@ -4,26 +4,11 @@ fetchFromGitHub, fetchzip, pkg-config, + vst2-sdk, wine64, enableJackAssWine64 ? false, }: -let - # equal to vst-sdk in ../oxefmsynth/default.nix - vst-sdk = stdenv.mkDerivation (finalAttrs: { - name = "vstsdk3610_11_06_2018_build_37"; - src = fetchzip { - url = "https://web.archive.org/web/20181016150224if_/https://download.steinberg.net/sdk_downloads/${finalAttrs.name}.zip"; - hash = "sha256-cjYakxnqSDqSZ32FPK3OUhDpslOlavHh5SAVpng0QTU="; - }; - installPhase = '' - runHook preInstall - cp -r . $out - runHook postInstall - ''; - }); - -in stdenv.mkDerivation (finalAttrs: { pname = "jackass"; version = "1.1"; @@ -36,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: { }; postPatch = '' - cp -r ${vst-sdk}/VST2_SDK/{public.sdk,pluginterfaces} vstsdk2.4 + cp -r ${vst2-sdk}/{public.sdk,pluginterfaces} vstsdk2.4 ''; nativeBuildInputs = [ pkg-config ] ++ lib.optionals enableJackAssWine64 [ wine64 ]; @@ -59,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: { enableParallelBuilding = true; - meta = with lib; { + meta = { description = "JackAss is a VST plugin that provides JACK-MIDI support for VST hosts"; longDescription = '' Simply load the plugin in your favourite host to get a JACK-MIDI port. @@ -67,11 +52,8 @@ stdenv.mkDerivation (finalAttrs: { applications. Set enableJackAssWine64 to true to enable this output. ''; homepage = "https://github.com/falkTX/JackAss"; - maintainers = with maintainers; [ PowerUser64 ]; - license = with licenses; [ - mit - unfree - ]; - platforms = platforms.linux; + maintainers = with lib.maintainers; [ PowerUser64 ]; + license = [ lib.licenses.mit ]; + platforms = lib.platforms.linux; }; }) diff --git a/pkgs/by-name/ja/jazz2/package.nix b/pkgs/by-name/ja/jazz2/package.nix index 46fc1886e095..75b64b0001ca 100644 --- a/pkgs/by-name/ja/jazz2/package.nix +++ b/pkgs/by-name/ja/jazz2/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "jazz2"; - version = "3.0.0"; + version = "3.1.0"; src = fetchFromGitHub { owner = "deathkiller"; repo = "jazz2-native"; rev = finalAttrs.version; - hash = "sha256-t1bXREL/WWnYnSfCyAY5tus/Bq5V4HVHg9s7oltGoIg="; + hash = "sha256-bPVCowop8bocUEXTQI5X4+6FgddKVOMfaXTrbvjrnjI="; }; patches = [ ./nocontent.patch ]; diff --git a/pkgs/by-name/je/jellyfin-ffmpeg/package.nix b/pkgs/by-name/je/jellyfin-ffmpeg/package.nix index bde21bdc48a8..b208b5255ee3 100644 --- a/pkgs/by-name/je/jellyfin-ffmpeg/package.nix +++ b/pkgs/by-name/je/jellyfin-ffmpeg/package.nix @@ -5,7 +5,7 @@ }: let - version = "7.0.2-8"; + version = "7.0.2-9"; in (ffmpeg_7-full.override { @@ -14,7 +14,7 @@ in owner = "jellyfin"; repo = "jellyfin-ffmpeg"; rev = "v${version}"; - hash = "sha256-gpbMVVMV1ywbSb6A3IGFS/vnBk9EXTNzaW1r8Ygo1RY="; + hash = "sha256-zaBu/hhFIMjneb7yUzToaJJAaSptxLld8zOvfGckHLY="; }; }).overrideAttrs (old: { pname = "jellyfin-ffmpeg"; diff --git a/pkgs/by-name/jh/jhentai/package.nix b/pkgs/by-name/jh/jhentai/package.nix index b52c2720baa5..f3243b9b4f68 100644 --- a/pkgs/by-name/jh/jhentai/package.nix +++ b/pkgs/by-name/jh/jhentai/package.nix @@ -63,7 +63,7 @@ flutter.buildFlutterApplication rec { homepage = "https://github.com/jiangtian616/JHenTai"; mainProgram = "jhentai"; license = with lib.licenses; [ asl20 ]; - maintainers = with lib.maintainers; [ aucub ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.linux; }; } diff --git a/pkgs/by-name/jj/jjui/package.nix b/pkgs/by-name/jj/jjui/package.nix index 625fad1d092c..cbb542a8fdb1 100644 --- a/pkgs/by-name/jj/jjui/package.nix +++ b/pkgs/by-name/jj/jjui/package.nix @@ -6,13 +6,13 @@ }: buildGoModule rec { pname = "jjui"; - version = "0.1"; + version = "0.2"; src = fetchFromGitHub { owner = "idursun"; repo = "jjui"; - rev = "v${version}"; - hash = "sha256-MdSzY2JWL34qB13mX4FWG/4wzl30FmATYQ09N1v5Isc="; + tag = "v${version}"; + hash = "sha256-V2HwVpZ7K7mYoZECOc+dfXuvBlRsN5OgRHasdpX+kFw="; }; vendorHash = "sha256-pzbOFXSlEebc4fCyNyQSdeVqar+HfEjsSyJo+mHkQeg="; diff --git a/pkgs/by-name/js/json-sort-cli/package.nix b/pkgs/by-name/js/json-sort-cli/package.nix new file mode 100644 index 000000000000..fdca8261575f --- /dev/null +++ b/pkgs/by-name/js/json-sort-cli/package.nix @@ -0,0 +1,40 @@ +{ + lib, + buildNpmPackage, + fetchFromGitHub, + nodejs, + nix-update-script, +}: + +buildNpmPackage rec { + pname = "json-sort-cli"; + version = "2.0.2"; + + src = fetchFromGitHub { + owner = "tillig"; + repo = "json-sort-cli"; + tag = "v${version}"; + hash = "sha256-h7RlAFSb2pFolkd+0M5tddPxM5RgZJtNLLAoTuYNdIQ="; + }; + + npmDepsHash = "sha256-g+6yLvEnZ2Zi7+4M+KDVSL2Qf3COWGgiBtpYrwG4HRM="; + dontNpmBuild = true; + + doCheck = true; + checkPhase = '' + runHook preCheck + npm run test + runHook postCheck + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "CLI interface to json-stable-stringify."; + homepage = "https://github.com/tillig/json-sort-cli"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ hasnep ]; + inherit (nodejs.meta) platforms; + mainProgram = "json-sort"; + }; +} diff --git a/pkgs/by-name/js/jsvc/package.nix b/pkgs/by-name/js/jsvc/package.nix index 5bc6ae6335b9..38cdcb1833f7 100644 --- a/pkgs/by-name/js/jsvc/package.nix +++ b/pkgs/by-name/js/jsvc/package.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { pname = "jsvc"; - version = "1.4.0"; + version = "1.4.1"; src = fetchurl { url = "https://downloads.apache.org//commons/daemon/source/commons-daemon-${version}-src.tar.gz"; - sha256 = "sha256-AFnx6AqmOfAsfh/4ALV9xiA2pbP0sX1h5dPj/9JCj+4="; + sha256 = "sha256-yPsiNFbqbfDGHzxlr7So8sZt395BABYEJ7jOmLEhUTE="; }; buildInputs = [ commonsDaemon ]; diff --git a/pkgs/by-name/ju/just/package.nix b/pkgs/by-name/ju/just/package.nix index 287ebd2909a4..589d7a0a7f8b 100644 --- a/pkgs/by-name/ju/just/package.nix +++ b/pkgs/by-name/ju/just/package.nix @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { pname = "just"; - version = "1.38.0"; + version = "1.39.0"; outputs = [ "out" @@ -33,10 +33,10 @@ rustPlatform.buildRustPackage rec { owner = "casey"; repo = pname; tag = version; - hash = "sha256-jIc8+SFAcH2TsY12+txwlMoJmpDdDpC0H+UrjYH61Lk="; + hash = "sha256-K2MUS6wo0qxJnnIWDdmxHRNwyzx1z7yscVwMzXKAwQA="; }; - cargoHash = "sha256-JHLkjMy5b1spJrAqFCCzqgnlYTAKA1Z9Tx4w1WWuiAI="; + cargoHash = "sha256-omojDIFfkK1fAxFMe+3B7k6Wfk4/Eaqdv0NcCd8b1ks="; nativeBuildInputs = lib.optionals (installShellCompletions || installManPages) [ installShellFiles ] diff --git a/pkgs/by-name/ka/karp/package.nix b/pkgs/by-name/ka/karp/package.nix index 0ff3390dd3ea..b8db0482e50c 100644 --- a/pkgs/by-name/ka/karp/package.nix +++ b/pkgs/by-name/ka/karp/package.nix @@ -8,18 +8,19 @@ ghostscript, qpdf, ninja, + unstableGitUpdater, }: stdenv.mkDerivation { pname = "karp"; - version = "0-unstable-2024-11-20"; + version = "0-unstable-2025-01-24"; src = fetchFromGitLab { domain = "invent.kde.org"; owner = "graphics"; repo = "karp"; - rev = "f26d6c43adc2feb2b0569df126f3a7be5d95ac2e"; - hash = "sha256-w1wrPaqQ6NBtbY5OEtxGlc72mXuLrlefq6A02U9wWHc="; + rev = "44b2e88b3c1ac5f1b37ec4080d068bf83c8328ca"; + hash = "sha256-w9Mtw7T4LOYML0A64ctE4g6m9IaNRHidt23ZsqwUwac="; }; nativeBuildInputs = [ @@ -45,12 +46,16 @@ stdenv.mkDerivation { kdePackages.kcoreaddons kdePackages.kconfig kdePackages.ki18n + kdePackages.kcrash qt6.qtdeclarative qt6.qtwayland qt6.qtsvg + qpdf qt6.qtwebengine ]; + passthru.updateScript = unstableGitUpdater { }; + meta = { homepage = "https://apps.kde.org/karp/"; platforms = lib.platforms.unix; diff --git a/pkgs/by-name/ka/kazumi/package.nix b/pkgs/by-name/ka/kazumi/package.nix index 1cc0d4e664c4..754717e56b92 100644 --- a/pkgs/by-name/ka/kazumi/package.nix +++ b/pkgs/by-name/ka/kazumi/package.nix @@ -114,7 +114,7 @@ flutter327.buildFlutterApplication rec { homepage = "https://github.com/Predidit/Kazumi"; mainProgram = "kazumi"; license = with lib.licenses; [ gpl3Plus ]; - maintainers = with lib.maintainers; [ aucub ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.linux; }; } diff --git a/pkgs/by-name/kd/kdlfmt/package.nix b/pkgs/by-name/kd/kdlfmt/package.nix index 74f650074bdf..ce5a99532b7c 100644 --- a/pkgs/by-name/kd/kdlfmt/package.nix +++ b/pkgs/by-name/kd/kdlfmt/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "kdlfmt"; - version = "0.0.10"; + version = "0.0.11"; src = fetchFromGitHub { owner = "hougesen"; repo = "kdlfmt"; rev = "v${version}"; - hash = "sha256-XqcexHeXXVfNoIu0h0Ooxlkm/FaDh/ctkH3cod1mlwY="; + hash = "sha256-OldgEAGvwXBnLIEVI/jGXV9lFp/Ua+n8cQqSWETn3T4="; }; - cargoHash = "sha256-ZlaILIVG3gLVFGqv1cozDtbHcL+dxUJXq/DvuJ077O8="; + cargoHash = "sha256-Pxs/ITGSU3WErcUgjnehCzuqkeC6M7x2mM/sU00djUw="; meta = { description = "Formatter for kdl documents"; diff --git a/pkgs/tools/X11/kdocker/default.nix b/pkgs/by-name/kd/kdocker/package.nix similarity index 52% rename from pkgs/tools/X11/kdocker/default.nix rename to pkgs/by-name/kd/kdocker/package.nix index 01c3b246f91f..b02db7ebe101 100644 --- a/pkgs/tools/X11/kdocker/default.nix +++ b/pkgs/by-name/kd/kdocker/package.nix @@ -2,49 +2,36 @@ stdenv, lib, fetchFromGitHub, - qmake, - wrapQtAppsHook, + cmake, libX11, - libXmu, - libXpm, - qtbase, - qtx11extras, + libxcb, + perl, # For pod2man + qt6, }: stdenv.mkDerivation (finalAttrs: { pname = "kdocker"; - version = "5.4"; + version = "6.2"; src = fetchFromGitHub { owner = "user-none"; repo = "KDocker"; rev = "${finalAttrs.version}"; - hash = "sha256-CTz2M9nv5Rf1amnSpLiIUZLH9Q3te6ZyFNUzSGHdYJc="; + hash = "sha256-ckTi/w2Yynsl3aJzV9Uxfc7WxJtcCt44glJyqEEZrig="; }; nativeBuildInputs = [ - qmake - wrapQtAppsHook + cmake + perl + qt6.wrapQtAppsHook ]; buildInputs = [ libX11 - libXmu - libXpm - qtbase - qtx11extras + libxcb + qt6.qtbase ]; - prePatch = '' - for h in Xatom Xlib Xmu; do - sed -i "s|#include <$h|#include $out/COMMIT diff --git a/pkgs/by-name/lo/loc/package.nix b/pkgs/by-name/lo/loc/package.nix deleted file mode 100644 index 634841f0838f..000000000000 --- a/pkgs/by-name/lo/loc/package.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ - lib, - fetchFromGitHub, - rustPlatform, -}: - -rustPlatform.buildRustPackage rec { - version = "0.4.1"; - pname = "loc"; - - src = fetchFromGitHub { - owner = "cgag"; - repo = "loc"; - rev = "v${version}"; - sha256 = "0086asrx48qlmc484pjz5r5znli85q6qgpfbd81gjlzylj7f57gg"; - }; - - cargoHash = "sha256-/YnU7vLz37Y9gggGx+vKWvtxBH0fjBwXGc+UWyOG2OE="; - - meta = { - homepage = "https://github.com/cgag/loc"; - changelog = "https://github.com/cgag/loc/blob/v${version}/CHANGELOG.md"; - description = "Count lines of code quickly"; - mainProgram = "loc"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ sigmanificient ]; - platforms = lib.platforms.unix; - }; -} diff --git a/pkgs/by-name/lo/lock/package.nix b/pkgs/by-name/lo/lock/package.nix index 1c979db91ee6..2f998f4cdbe2 100644 --- a/pkgs/by-name/lo/lock/package.nix +++ b/pkgs/by-name/lo/lock/package.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "lock"; - version = "1.3.8"; + version = "1.3.9"; src = fetchFromGitHub { owner = "konstantintutsch"; repo = "Lock"; tag = "v${finalAttrs.version}"; - hash = "sha256-6nZwxNwCxMCx+6lE7roteCIZp5b7MIDosB0/TseBXeg="; + hash = "sha256-aRXwRJ4FTdIef1UHBJ9877d86uxm5GHML//IqOGEGXs="; }; strictDeps = true; diff --git a/pkgs/by-name/lo/lockbook-desktop/package.nix b/pkgs/by-name/lo/lockbook-desktop/package.nix index 5d511b16e05b..febc2b7c2f80 100644 --- a/pkgs/by-name/lo/lockbook-desktop/package.nix +++ b/pkgs/by-name/lo/lockbook-desktop/package.nix @@ -18,17 +18,17 @@ let in rustPlatform.buildRustPackage rec { pname = "lockbook-desktop"; - version = "0.9.16"; + version = "0.9.17"; src = fetchFromGitHub { owner = "lockbook"; repo = "lockbook"; tag = version; - hash = "sha256-FHD84IJ2ahxB8L75xep+TSb8e+DtUsjEyHc6P/SFi9c="; + hash = "sha256-AwzescNVsHt1bJFX+TjHtIAxZGzbpGxxb2xSx0mAVQ8="; }; useFetchCargoVendor = true; - cargoHash = "sha256-z00WBA/51zmqFCBX1hD3dLKvuvxQvuyvtBGrxxAr7FE="; + cargoHash = "sha256-oWcGN3WtMCC9LPmVmljXQPQap9JskSTuUTV7XFYiOGI="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/lo/lockbook/package.nix b/pkgs/by-name/lo/lockbook/package.nix index 9fd699e5a9c1..bc8210af67e4 100644 --- a/pkgs/by-name/lo/lockbook/package.nix +++ b/pkgs/by-name/lo/lockbook/package.nix @@ -7,17 +7,17 @@ }: rustPlatform.buildRustPackage rec { pname = "lockbook"; - version = "0.9.16"; + version = "0.9.17"; src = fetchFromGitHub { owner = "lockbook"; repo = "lockbook"; tag = version; - hash = "sha256-FHD84IJ2ahxB8L75xep+TSb8e+DtUsjEyHc6P/SFi9c="; + hash = "sha256-AwzescNVsHt1bJFX+TjHtIAxZGzbpGxxb2xSx0mAVQ8="; }; useFetchCargoVendor = true; - cargoHash = "sha256-z00WBA/51zmqFCBX1hD3dLKvuvxQvuyvtBGrxxAr7FE="; + cargoHash = "sha256-oWcGN3WtMCC9LPmVmljXQPQap9JskSTuUTV7XFYiOGI="; doCheck = false; # there are no cli tests cargoBuildFlags = [ diff --git a/pkgs/by-name/lo/loop/package.nix b/pkgs/by-name/lo/loop/package.nix deleted file mode 100644 index 805069f33e09..000000000000 --- a/pkgs/by-name/lo/loop/package.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ - lib, - fetchFromGitHub, - rustPlatform, -}: - -rustPlatform.buildRustPackage { - pname = "loop"; - version = "unstable-2020-07-08"; - - src = fetchFromGitHub { - owner = "Miserlou"; - repo = "Loop"; - rev = "944df766ddecd7a0d67d91cc2dfda8c197179fb0"; - sha256 = "0v61kahwk1kdy8pb40rjnzcxby42nh02nyg9jqqpx3vgdrpxlnix"; - }; - - cargoHash = "sha256-sceS/2qxiV16VP8E3M39MYnGiCbq0rrnehsV/SuHZl4="; - - meta = with lib; { - description = "UNIX's missing `loop` command"; - homepage = "https://github.com/Miserlou/Loop"; - maintainers = with maintainers; [ koral ]; - license = licenses.mit; - mainProgram = "loop"; - }; -} diff --git a/pkgs/by-name/lu/lucenepp/package.nix b/pkgs/by-name/lu/lucenepp/package.nix index 89e719e2295d..c2cf950e4750 100644 --- a/pkgs/by-name/lu/lucenepp/package.nix +++ b/pkgs/by-name/lu/lucenepp/package.nix @@ -27,7 +27,10 @@ stdenv.mkDerivation rec { zlib ]; - cmakeFlags = [ "-DCMAKE_INSTALL_LIBDIR=lib" ]; + cmakeFlags = [ + (lib.cmakeFeature "CMAKE_INSTALL_LIBDIR" "lib") + (lib.cmakeBool "ENABLE_TEST" doCheck) + ]; patches = [ (fetchpatch { diff --git a/pkgs/by-name/lx/lxgw-neoxihei/package.nix b/pkgs/by-name/lx/lxgw-neoxihei/package.nix index c4011b066d0c..faccb2953d7e 100644 --- a/pkgs/by-name/lx/lxgw-neoxihei/package.nix +++ b/pkgs/by-name/lx/lxgw-neoxihei/package.nix @@ -6,11 +6,11 @@ stdenvNoCC.mkDerivation rec { pname = "lxgw-neoxihei"; - version = "1.211"; + version = "1.212"; src = fetchurl { url = "https://github.com/lxgw/LxgwNeoXiHei/releases/download/v${version}/LXGWNeoXiHei.ttf"; - hash = "sha256-w3Rk0NDYXPzzg1JGsC6zIvr0SiM3ZzHHW9NwHNAhnaM="; + hash = "sha256-g64kMY/9kHSlUH2rvDxKy4nmS+TH//SNJfCnQXHC4Q8="; }; dontUnpack = true; diff --git a/pkgs/by-name/ma/manga-tui/package.nix b/pkgs/by-name/ma/manga-tui/package.nix index 81fddfde4874..1db78d9952e3 100644 --- a/pkgs/by-name/ma/manga-tui/package.nix +++ b/pkgs/by-name/ma/manga-tui/package.nix @@ -3,7 +3,7 @@ rustPlatform, fetchFromGitHub, pkg-config, - fetchpatch, + dbus, openssl, sqlite, stdenv, @@ -11,7 +11,7 @@ nix-update-script, }: let - version = "0.4.0"; + version = "0.5.0"; in rustPlatform.buildRustPackage { pname = "manga-tui"; @@ -21,19 +21,10 @@ rustPlatform.buildRustPackage { owner = "josueBarretogit"; repo = "manga-tui"; rev = "v${version}"; - hash = "sha256-Se0f5jfYBmvemrYRKduDr1yT3fB2wfQP1fDpa/qrYlI="; + hash = "sha256-kmJrr1Gi1z9v2gkFmvcCAtBST+AkofVJSxyvAFnUZKQ="; }; - patches = [ - # apply patches to fix failing tests - (fetchpatch { - url = "https://github.com/josueBarretogit/manga-tui/commit/131a5208e6a3d74a9ad852baab75334e4a1ebf34.patch"; - hash = "sha256-RIliZcaRVUOb33Cl+uBkMH4b34S1JpvnPGv+QCFQZ58="; - }) - ./0001-fix-remove-flaky-test.patch - ]; - - cargoHash = "sha256-IufJPCvUEWR5p4PrFlaiQPW9wyIFj/Pd/JHki69L6Es="; + cargoHash = "sha256-3/dTaZ7meIPjtvxPm+nkhsqJVgi4fN6WgCGsIBTZtf8="; nativeBuildInputs = [ pkg-config ]; @@ -41,6 +32,7 @@ rustPlatform.buildRustPackage { [ openssl sqlite + dbus ] ++ lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk.frameworks; diff --git a/pkgs/by-name/ma/mangayomi/package.nix b/pkgs/by-name/ma/mangayomi/package.nix index 5c94734957f0..daf5e4585f1f 100644 --- a/pkgs/by-name/ma/mangayomi/package.nix +++ b/pkgs/by-name/ma/mangayomi/package.nix @@ -25,7 +25,8 @@ let sourceRoot = "${src.name}/rust"; - cargoHash = "sha256-6Iraw5gtlVW3iSrT2zQh6JLubVTZy/y8/5quXKee2Ko="; + useFetchCargoVendor = true; + cargoHash = "sha256-Qzq1FyWtUy1533/S1KS8XEou5nAnq0O0Vxxlt+Iv8OQ="; passthru.libraryPath = "lib/librust_lib_mangayomi.so"; }; @@ -109,7 +110,7 @@ flutter324.buildFlutterApplication { homepage = "https://github.com/kodjodevf/mangayomi"; mainProgram = "mangayomi"; license = with lib.licenses; [ asl20 ]; - maintainers = with lib.maintainers; [ aucub ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.linux; }; } diff --git a/pkgs/by-name/ma/marble-shell-theme/package.nix b/pkgs/by-name/ma/marble-shell-theme/package.nix index 35374f8c1ee3..b23c2201c639 100644 --- a/pkgs/by-name/ma/marble-shell-theme/package.nix +++ b/pkgs/by-name/ma/marble-shell-theme/package.nix @@ -43,6 +43,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { platforms = lib.platforms.linux; homepage = "https://github.com/imarkoff/Marble-shell-theme"; changelog = "https://github.com/imarkoff/Marble-shell-theme/releases/tag/${finalAttrs.version}"; - maintainers = with lib.maintainers; [ aucub ]; + maintainers = with lib.maintainers; [ ]; }; }) diff --git a/pkgs/by-name/ma/markdownlint-cli/package.nix b/pkgs/by-name/ma/markdownlint-cli/package.nix index 32eba5e1aa76..a0e65f253922 100644 --- a/pkgs/by-name/ma/markdownlint-cli/package.nix +++ b/pkgs/by-name/ma/markdownlint-cli/package.nix @@ -6,16 +6,16 @@ buildNpmPackage rec { pname = "markdownlint-cli"; - version = "0.43.0"; + version = "0.44.0"; src = fetchFromGitHub { owner = "igorshubovych"; repo = "markdownlint-cli"; rev = "v${version}"; - hash = "sha256-x9ind66qFS7k6rBDOiJ6amtVf7LTXmXsNKlnJmF6cJY="; + hash = "sha256-1CQVj2iFywimK9sBJ60u9xH5qm/stEOA0yAHcUSAdY8="; }; - npmDepsHash = "sha256-oAUhSdbEMv96dS0lhZMSNXs9sQbu06Lwf45GVj0m+2U="; + npmDepsHash = "sha256-iRK+8wyqHmP6vluDVBs3L4IpnZVvVfEfKDit+9YFU4g="; dontNpmBuild = true; diff --git a/pkgs/by-name/ma/marktext/package.nix b/pkgs/by-name/ma/marktext/package.nix index 0ab0eb5ba935..1a095a3520eb 100644 --- a/pkgs/by-name/ma/marktext/package.nix +++ b/pkgs/by-name/ma/marktext/package.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "marktext"; - version = "0.17.1-unstable-2024-06-10"; + version = "0.17.0-unstable-2024-06-10"; src = fetchFromGitHub { owner = "marktext"; repo = "marktext"; - rev = "cd8452979bf2441f8064968ab1f9ae28302c9d75"; - hash = "sha256-6oD9Bp0XonhNHWA8JajyWdNkAXpX4GoKPpdLzpvr+jM="; + rev = "11c8cc1e1929a7975df39fa5f4503130fef53547"; + hash = "sha256-5PIOTg4/RBave/b3CArQSLvmA64ME9++3O1JT4lgKm0="; postFetch = '' cd $out patch -p1 < ${./0001-update-electron.patch} diff --git a/pkgs/by-name/ma/marp-cli/package.nix b/pkgs/by-name/ma/marp-cli/package.nix index 66f9c1398058..38197137af5f 100644 --- a/pkgs/by-name/ma/marp-cli/package.nix +++ b/pkgs/by-name/ma/marp-cli/package.nix @@ -7,16 +7,16 @@ buildNpmPackage rec { pname = "marp-cli"; - version = "4.0.4"; + version = "4.1.0"; src = fetchFromGitHub { owner = "marp-team"; repo = pname; rev = "v${version}"; - hash = "sha256-gi9jkWuL63RRKR/X8yI3VBLdMaxWfYVDh0gAtuVHVv4="; + hash = "sha256-WuyDxfyWZNBBivlmztTnYNkL7P+P0yZpcLDu8nTDhhk="; }; - npmDepsHash = "sha256-ZThE92ZcIJToPuTU/7+uOeixLLx+C4jXMzmemSFjPh8="; + npmDepsHash = "sha256-JhsQz3A/RPEuGTbZeYaCEzBawSoD8p2u9agHBr4+hZU="; npmPackFlags = [ "--ignore-scripts" ]; makeCacheWritable = true; diff --git a/pkgs/by-name/ma/matomo/package.nix b/pkgs/by-name/ma/matomo/package.nix index 7954fe5009f2..ba607cbd1c1f 100644 --- a/pkgs/by-name/ma/matomo/package.nix +++ b/pkgs/by-name/ma/matomo/package.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "matomo"; - version = "5.2.1"; + version = "5.2.2"; src = fetchurl { url = "https://builds.matomo.org/matomo-${finalAttrs.version}.tar.gz"; - hash = "sha256-5glMwwIG0Uo8bu904u40FUa+yaUlrQe1nUCkv9/ATks="; + hash = "sha256-ZEwz/KKZZwTFsKfwR0iKZM1ta4CUXJsWgBXika+pjb0="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/ma/mattermost/package.nix b/pkgs/by-name/ma/mattermost/package.nix index 4cea5382b88e..534fa7759184 100644 --- a/pkgs/by-name/ma/mattermost/package.nix +++ b/pkgs/by-name/ma/mattermost/package.nix @@ -19,8 +19,8 @@ # # Ensure you also check ../mattermostLatest/package.nix. regex = "^v(9\\.11\\.[0-9]+)$"; - version = "9.11.7"; - srcHash = "sha256-KeGpYy3jr7/B2mtBk9em2MXJBJR2+Wajmvtz/yT4SG8="; + version = "9.11.8"; + srcHash = "sha256-mTEAsY3Dw5n6sqLWyNfS4EGgZuUOol27UwqsZ2kEXZY="; vendorHash = "sha256-alLPBfnA1o6bUUgPRqvYW/98UKR9wltmFTzKIGtVEm4="; npmDepsHash = "sha256-ysz38ywGxJ5DXrrcDmcmezKbc5Y7aug9jOWUzHRAs/0="; }, @@ -42,10 +42,17 @@ let wrapMattermost = server: stdenvNoCC.mkDerivation { - pname = "${server.pname}-wrapped"; - inherit (server) version; inherit server; - inherit (server) webapp; + + # src and npmDeps must be provided for the update script! + inherit (server) + pname + version + src + npmDeps + webapp + meta + ; dontUnpack = true; @@ -59,12 +66,7 @@ let done ''; - passthru = finalPassthru // { - inherit server; - inherit (server) webapp; - }; - - inherit (server) meta; + passthru = finalPassthru; }; finalPassthru = let diff --git a/pkgs/by-name/mc/mcontrolcenter/package.nix b/pkgs/by-name/mc/mcontrolcenter/package.nix index 60a927bbf096..13fa0a150ea9 100644 --- a/pkgs/by-name/mc/mcontrolcenter/package.nix +++ b/pkgs/by-name/mc/mcontrolcenter/package.nix @@ -1,7 +1,7 @@ { lib, stdenv, - libsForQt5, + qt6, makeDesktopItem, copyDesktopItems, fetchFromGitHub, @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "mcontrolcenter"; - version = "0.4.1"; + version = "0.5.0"; src = fetchFromGitHub { owner = "dmitry-s93"; repo = "MControlCenter"; rev = finalAttrs.version; - hash = "sha256-SV78OVRGzy2zFLT3xqeUtbjlh81Z97PVao18P3h/8dI="; + hash = "sha256-Gl+YnbUbwtwF2WHT39bIKh48qSIMe3fpzxgdvifR4DQ="; }; postPatch = '' @@ -39,14 +39,14 @@ stdenv.mkDerivation (finalAttrs: { ]; nativeBuildInputs = [ - libsForQt5.wrapQtAppsHook - libsForQt5.qttools + qt6.wrapQtAppsHook + qt6.qttools copyDesktopItems cmake ]; buildInputs = [ - libsForQt5.qtbase + qt6.qtbase kmod ]; diff --git a/pkgs/by-name/me/memorado/package.nix b/pkgs/by-name/me/memorado/package.nix index a750bc7f5aae..14f6c1e8fdcd 100644 --- a/pkgs/by-name/me/memorado/package.nix +++ b/pkgs/by-name/me/memorado/package.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "memorado"; - version = "0.4"; + version = "0.5"; src = fetchFromGitHub { owner = "wbernard"; repo = "Memorado"; tag = version; - hash = "sha256-yWu2+VAa5FkpLs/KLI0lcNzFLGN/kiq6frtW8SHN+W4="; + hash = "sha256-HNZdWRATjSfMk0e99CERPuR891549+wS/WeA7XGFxto="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/mi/micronaut/package.nix b/pkgs/by-name/mi/micronaut/package.nix index 74392e4a4db2..bc360daf08fc 100644 --- a/pkgs/by-name/mi/micronaut/package.nix +++ b/pkgs/by-name/mi/micronaut/package.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "micronaut"; - version = "4.7.3"; + version = "4.7.4"; src = fetchzip { url = "https://github.com/micronaut-projects/micronaut-starter/releases/download/v${version}/micronaut-cli-${version}.zip"; - sha256 = "sha256-rCGJnZ+WD0chYVa6XqkhHJqJUQKw2K+AebzYSftAsOk="; + sha256 = "sha256-R/7ozlbx7WAX7rLdhgckJGt9troBj+0rFcFDBz6eZiM="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/mi/mihomo-party/package.nix b/pkgs/by-name/mi/mihomo-party/package.nix index 8c46298a4005..99f22ca8d42b 100644 --- a/pkgs/by-name/mi/mihomo-party/package.nix +++ b/pkgs/by-name/mi/mihomo-party/package.nix @@ -92,6 +92,6 @@ stdenv.mkDerivation { ]; license = lib.licenses.gpl3Plus; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - maintainers = with lib.maintainers; [ aucub ]; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/by-name/mi/minisign/package.nix b/pkgs/by-name/mi/minisign/package.nix index 8a5eeca9974e..ebecb13ca6be 100644 --- a/pkgs/by-name/mi/minisign/package.nix +++ b/pkgs/by-name/mi/minisign/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "minisign"; - version = "0.11"; + version = "0.12"; src = fetchFromGitHub { repo = "minisign"; owner = "jedisct1"; rev = version; - sha256 = "sha256-sczGs6du797WUkfr3JiTI/bUHp7vKEeZtJdCryFcYu8="; + sha256 = "sha256-qhAzhht9p4bsa2ntJwhcNurm8QgYYiKi3dA3ifpT8aw="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/mi/mise/package.nix b/pkgs/by-name/mi/mise/package.nix index b3882597b015..93de6a156b3b 100644 --- a/pkgs/by-name/mi/mise/package.nix +++ b/pkgs/by-name/mi/mise/package.nix @@ -16,6 +16,8 @@ usage, mise, testers, + runCommand, + jq, }: rustPlatform.buildRustPackage rec { @@ -89,7 +91,30 @@ rustPlatform.buildRustPackage rec { passthru = { updateScript = nix-update-script { }; - tests.version = testers.testVersion { package = mise; }; + tests = { + version = testers.testVersion { package = mise; }; + usageCompat = + # should not crash + runCommand "mise-usage-compatibility" + { + nativeBuildInputs = [ + mise + usage + jq + ]; + } + '' + export HOME=$(mktemp -d) + + spec="$(mise usage)" + for shl in bash fish zsh; do + echo "testing $shl" + usage complete-word --shell $shl --spec "$spec" + done + + touch $out + ''; + }; }; meta = { diff --git a/pkgs/development/libraries/mongoc/default.nix b/pkgs/by-name/mo/mongoc/package.nix similarity index 73% rename from pkgs/development/libraries/mongoc/default.nix rename to pkgs/by-name/mo/mongoc/package.nix index 538e5201fd13..6f23158bd851 100644 --- a/pkgs/development/libraries/mongoc/default.nix +++ b/pkgs/by-name/mo/mongoc/package.nix @@ -10,18 +10,17 @@ icu, cyrus_sasl, snappy, - darwin, }: stdenv.mkDerivation rec { pname = "mongoc"; - version = "1.29.1"; + version = "1.29.2"; src = fetchFromGitHub { owner = "mongodb"; repo = "mongo-c-driver"; tag = version; - hash = "sha256-81UgJ5GboznaK9omhr3ZMOeOQbIru33Ic42tQAazSzw="; + hash = "sha256-nhAbe85onBgWDu20yxR9xapOpca28ayP7peXf4H6i+Y="; }; nativeBuildInputs = [ @@ -29,18 +28,14 @@ stdenv.mkDerivation rec { pkg-config ]; - buildInputs = - [ - openssl - zlib - zstd - icu - cyrus_sasl - snappy - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk_11_0.frameworks.Security - ]; + buildInputs = [ + openssl + zlib + zstd + icu + cyrus_sasl + snappy + ]; cmakeFlags = [ "-DBUILD_VERSION=${version}" diff --git a/pkgs/by-name/mo/mongodb-ce/package.nix b/pkgs/by-name/mo/mongodb-ce/package.nix index 81fc56bf02d5..2fd6497c3ed0 100644 --- a/pkgs/by-name/mo/mongodb-ce/package.nix +++ b/pkgs/by-name/mo/mongodb-ce/package.nix @@ -5,13 +5,13 @@ autoPatchelfHook, curl, openssl, - testers, - mongodb-ce, + versionCheckHook, writeShellApplication, jq, nix-update, gitMinimal, pup, + nixosTests, }: let @@ -63,6 +63,11 @@ stdenv.mkDerivation (finalAttrs: { runHook postInstall ''; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgram = "${placeholder "out"}/bin/mongod"; + versionCheckProgramArg = [ "--version" ]; + doInstallCheck = true; + passthru = { updateScript = @@ -102,9 +107,8 @@ stdenv.mkDerivation (finalAttrs: { command = lib.getExe script; }; - tests.version = testers.testVersion { - package = mongodb-ce; - command = "mongod --version"; + tests = { + inherit (nixosTests) mongodb-ce; }; }; diff --git a/pkgs/by-name/mo/monitorcontrol/package.nix b/pkgs/by-name/mo/monitorcontrol/package.nix index 92932d8e059a..197dba9c9389 100644 --- a/pkgs/by-name/mo/monitorcontrol/package.nix +++ b/pkgs/by-name/mo/monitorcontrol/package.nix @@ -2,7 +2,7 @@ lib, fetchurl, stdenv, - _7zz, + undmg, }: # This cannot be built from source due to the problematic nature of XCode - so @@ -10,18 +10,23 @@ stdenv.mkDerivation rec { pname = "MonitorControl"; - version = "4.2.0"; + version = "4.3.3"; src = fetchurl { url = "https://github.com/MonitorControl/${pname}/releases/download/v${version}/MonitorControl.${version}.dmg"; - sha256 = "Q96uK6wVe1D2uLvWL+pFR6LcmrU7cgmr2Y5tPvvTDgI="; + hash = "sha256-myx3adoU3FYYrs6LFRSiXtwSsoaujjQ/PYgAF/Xuk2g="; }; - # MonitorControl.${version}.dmg is APFS formatted, unpack with 7zz - nativeBuildInputs = [ _7zz ]; + nativeBuildInputs = [ undmg ]; sourceRoot = "MonitorControl.app"; + unpackCmd = '' + runHook preUnpack + undmg $src + runHook postUnpack + ''; + installPhase = '' mkdir -p "$out/Applications/MonitorControl.app" cp -R . "$out/Applications/MonitorControl.app" diff --git a/pkgs/by-name/mo/mountpoint-s3/package.nix b/pkgs/by-name/mo/mountpoint-s3/package.nix index 09021f766264..744a01c3345e 100644 --- a/pkgs/by-name/mo/mountpoint-s3/package.nix +++ b/pkgs/by-name/mo/mountpoint-s3/package.nix @@ -9,17 +9,17 @@ rustPlatform.buildRustPackage rec { pname = "mountpoint-s3"; - version = "1.13.0"; + version = "1.14.0"; src = fetchFromGitHub { owner = "awslabs"; repo = "mountpoint-s3"; rev = "v${version}"; - hash = "sha256-L0xVrADLWVH6r600XvxI5I+IghBSmpC6F93cIH/ejh8="; + hash = "sha256-QpJYpHow9/vEPrq82XtbDosGz8lqVB0cOPQmY7Dx78Q="; fetchSubmodules = true; }; - cargoHash = "sha256-Uj6/ZDRaYq99gTwHqAX2c21LecC3LLkJXgCDQ+xEytE="; + cargoHash = "sha256-lyxuYrmmB1hQCR3fKEMXI69xYcubisRi/bc6M7hQl70="; # thread 'main' panicked at cargo-auditable/src/collect_audit_data.rs:77:9: # cargo metadata failure: error: none of the selected packages contains these features: libfuse3 diff --git a/pkgs/by-name/mo/mov-cli/package.nix b/pkgs/by-name/mo/mov-cli/package.nix index 3637bd41eb92..0e0c0004ebe3 100644 --- a/pkgs/by-name/mo/mov-cli/package.nix +++ b/pkgs/by-name/mo/mov-cli/package.nix @@ -9,7 +9,7 @@ let pname = "mov-cli"; - version = "4.4.15"; + version = "4.4.16"; in python3.pkgs.buildPythonPackage { inherit pname version; @@ -19,7 +19,7 @@ python3.pkgs.buildPythonPackage { owner = "mov-cli"; repo = "mov-cli"; tag = version; - hash = "sha256-mHtKQtLhHYwd2GEA0rCZQ4C/DEgsc6Rk7ZLpXFyW5d8="; + hash = "sha256-hOnbBXzg9S0pqEcdXVrdG+P9tLqE8NC++ppOwqd+y+M="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/by-name/mq/mq-cli/package.nix b/pkgs/by-name/mq/mq-cli/package.nix deleted file mode 100644 index 1e3867616505..000000000000 --- a/pkgs/by-name/mq/mq-cli/package.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ - fetchFromGitHub, - lib, - rustPlatform, -}: - -rustPlatform.buildRustPackage rec { - pname = "mq-cli"; - version = "1.0.0"; - - src = fetchFromGitHub { - owner = "aprilabank"; - repo = "mq-cli"; - rev = "v${version}"; - sha256 = "02z85waj5jc312biv2qhbgplsggxgjmfmyv9v8b1ky0iq1mpxjw7"; - }; - - cargoHash = "sha256-kZox1QhMPFC5l8mJNxh6C3tiNYMgfmLyWLhkdigEs6Y="; - - meta = with lib; { - description = "CLI tool to manage POSIX message queues"; - homepage = "https://github.com/aprilabank/mq-cli"; - license = licenses.mit; - maintainers = with maintainers; [ tazjin ]; - platforms = platforms.linux; - mainProgram = "mq"; - }; -} diff --git a/pkgs/by-name/mu/museum/package.nix b/pkgs/by-name/mu/museum/package.nix index 994826d6d854..e1ef604a18b2 100644 --- a/pkgs/by-name/mu/museum/package.nix +++ b/pkgs/by-name/mu/museum/package.nix @@ -4,18 +4,19 @@ pkg-config, libsodium, buildGoModule, + nix-update-script, }: buildGoModule rec { pname = "museum"; - version = "0.9.53"; + version = "0.9.81"; src = fetchFromGitHub { owner = "ente-io"; repo = "ente"; sparseCheckout = [ "server" ]; rev = "photos-v${version}"; - hash = "sha256-aczWqK6Zymvl46fHN6QXT0f5V2lpC+8kpSbEoTiP+7k="; + hash = "sha256-4vX3UWbYYCjNxtSNUAE9hg9NokeJFPTjLvHYTkQlB0w="; }; vendorHash = "sha256-Vz9AodHoClSmo51ExdOS4bWH13i1Sug++LQMIsZY2xY="; @@ -40,6 +41,13 @@ buildGoModule rec { $out/share/museum ''; + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version-regex" + "photos-v(.*)" + ]; + }; + meta = { description = "API server for ente.io"; homepage = "https://github.com/ente-io/ente/tree/main/server"; diff --git a/pkgs/by-name/n8/n8n/package.nix b/pkgs/by-name/n8/n8n/package.nix index dce70e681e97..132e119bd41a 100644 --- a/pkgs/by-name/n8/n8n/package.nix +++ b/pkgs/by-name/n8/n8n/package.nix @@ -7,6 +7,7 @@ pnpm_9, python3, node-gyp, + cctools, xcbuild, libkrb5, libmongocrypt, @@ -30,12 +31,17 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-Am9R2rfQiw1IPd22/UraqzEqvVeB5XuSrrLSYXWsWfU="; }; - nativeBuildInputs = [ - pnpm_9.configHook - python3 # required to build sqlite3 bindings - node-gyp # required to build sqlite3 bindings - makeWrapper - ] ++ lib.optional stdenv.hostPlatform.isDarwin [ xcbuild ]; + nativeBuildInputs = + [ + pnpm_9.configHook + python3 # required to build sqlite3 bindings + node-gyp # required to build sqlite3 bindings + makeWrapper + ] + ++ lib.optional stdenv.hostPlatform.isDarwin [ + cctools + xcbuild + ]; buildInputs = [ nodejs diff --git a/pkgs/by-name/na/nak/package.nix b/pkgs/by-name/na/nak/package.nix index 3fc481977f0d..9954474da0d2 100644 --- a/pkgs/by-name/na/nak/package.nix +++ b/pkgs/by-name/na/nak/package.nix @@ -7,16 +7,16 @@ }: buildGo123Module rec { pname = "nak"; - version = "0.9.1"; + version = "0.10.1"; src = fetchFromGitHub { owner = "fiatjaf"; repo = "nak"; tag = "v${version}"; - hash = "sha256-qfTqzsjRQXrLsL6+qXu2AacDmWbEMH6M1kgSPV3Eodg="; + hash = "sha256-nIqmQVLGe6iqgnz0QuCgLTPT0TsL5QUMqxBQGXq13QE="; }; - vendorHash = "sha256-zM9VFLD1CNI9UPvB+ow8KBUDCyoARUqLjumhvWfJvVA="; + vendorHash = "sha256-Gt/HG3iRoz9nDBX8C8XUZ0FTic1cl2c5cVkxUG9ngwY="; ldflags = [ "-s" diff --git a/pkgs/by-name/na/nats-server/package.nix b/pkgs/by-name/na/nats-server/package.nix index cb2fffddda50..d15df89ddf7f 100644 --- a/pkgs/by-name/na/nats-server/package.nix +++ b/pkgs/by-name/na/nats-server/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "nats-server"; - version = "2.10.24"; + version = "2.10.25"; src = fetchFromGitHub { owner = "nats-io"; repo = pname; rev = "v${version}"; - hash = "sha256-/iKgRnoAjZX6hiUpPOXpCjY2FsX7JMpNSSCtWgcFLWQ="; + hash = "sha256-cpAUyTnGEPPPA2RRJ+jYQgUSZuI8YJQ3s4uhHvoYDCg="; }; - vendorHash = "sha256-aopqwxIfLFBdy4MFjyQCUKRUORosm4oHcScET9BW3D4="; + vendorHash = "sha256-8wExTV9seztPnpgyckDZnGc5iF3oY453YX7aoRcZHaI="; doCheck = false; diff --git a/pkgs/by-name/na/navicat-premium/package.nix b/pkgs/by-name/na/navicat-premium/package.nix index 470866aa9e52..1b774964ea09 100644 --- a/pkgs/by-name/na/navicat-premium/package.nix +++ b/pkgs/by-name/na/navicat-premium/package.nix @@ -40,7 +40,7 @@ appimageTools.wrapType2 { description = "Database development tool that allows you to simultaneously connect to many databases"; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.unfree; - maintainers = with lib.maintainers; [ aucub ]; + maintainers = with lib.maintainers; [ ]; platforms = [ "x86_64-linux" "aarch64-linux" diff --git a/pkgs/by-name/nb/nbxplorer/package.nix b/pkgs/by-name/nb/nbxplorer/package.nix index b91f3e1c1c8f..f99be6963a6a 100644 --- a/pkgs/by-name/nb/nbxplorer/package.nix +++ b/pkgs/by-name/nb/nbxplorer/package.nix @@ -7,13 +7,13 @@ buildDotnetModule rec { pname = "nbxplorer"; - version = "2.5.16"; + version = "2.5.17"; src = fetchFromGitHub { owner = "dgarage"; repo = "NBXplorer"; rev = "v${version}"; - sha256 = "sha256-4hhnw7NNqJ4Q3UPqDlw5X/R0yGlte7YwWd9lpX0n8Fo="; + sha256 = "sha256-8tcE60SVhQ2CgoQu24hNL2rrv9JG+2+DuSJWtmycYA0="; }; projectFile = "NBXplorer/NBXplorer.csproj"; diff --git a/pkgs/by-name/ne/nerd-font-patcher/package.nix b/pkgs/by-name/ne/nerd-font-patcher/package.nix index 83ada71e8e35..0cc66507523e 100644 --- a/pkgs/by-name/ne/nerd-font-patcher/package.nix +++ b/pkgs/by-name/ne/nerd-font-patcher/package.nix @@ -6,11 +6,11 @@ python3Packages.buildPythonApplication rec { pname = "nerd-font-patcher"; - version = "3.2.1"; + version = "3.3.0"; src = fetchzip { url = "https://github.com/ryanoasis/nerd-fonts/releases/download/v${version}/FontPatcher.zip"; - sha256 = "sha256-3s0vcRiNA/pQrViYMwU2nnkLUNUcqXja/jTWO49x3BU="; + sha256 = "sha256-/LbO8+ZPLFIUjtZHeyh6bQuplqRfR6SZRu9qPfVZ0Mw="; stripRoot = false; }; diff --git a/pkgs/by-name/ne/netsniff-ng/package.nix b/pkgs/by-name/ne/netsniff-ng/package.nix index 98fbc042a64c..8489627e329c 100644 --- a/pkgs/by-name/ne/netsniff-ng/package.nix +++ b/pkgs/by-name/ne/netsniff-ng/package.nix @@ -16,19 +16,18 @@ liburcu, ncurses, pkg-config, - gnumake42, zlib, }: stdenv.mkDerivation rec { pname = "netsniff-ng"; - version = "0.6.8"; + version = "0.6.9"; src = fetchFromGitHub { - repo = pname; - owner = pname; + repo = "netsniff-ng"; + owner = "netsniff-ng"; rev = "v${version}"; - sha256 = "10ih8amaqspy0zwg7hqvypa1v7ixpjl0n608cyfgyfzffp73lbqf"; + hash = "sha256-P1xZqhZ/HJV3fAvh4xhhApZ0+FLDFqvYrZlbvb+FV7I="; }; nativeBuildInputs = [ @@ -36,7 +35,6 @@ stdenv.mkDerivation rec { flex makeWrapper pkg-config - gnumake42 # fails with make 4.4 ]; buildInputs = [ diff --git a/pkgs/by-name/ne/neverest/package.nix b/pkgs/by-name/ne/neverest/package.nix index 10d472e8e968..8a54783f91f6 100644 --- a/pkgs/by-name/ne/neverest/package.nix +++ b/pkgs/by-name/ne/neverest/package.nix @@ -1,7 +1,7 @@ { lib, rustPlatform, - fetchFromSourcehut, + fetchFromGitHub, stdenv, pkg-config, darwin, @@ -22,14 +22,15 @@ rustPlatform.buildRustPackage rec { pname = "neverest"; version = "1.0.0-beta"; - src = fetchFromSourcehut { - owner = "~soywod"; - repo = "neverest-cli"; + src = fetchFromGitHub { + owner = "pimalaya"; + repo = "neverest"; rev = "v${version}"; hash = "sha256-3PSJyhxrOCiuHUeVHO77+NecnI5fN5EZfPhYizuYvtE="; }; - cargoHash = "sha256-i5or8oBtjGqOfTfwB7dYXn/OPgr5WEWNEvC0WdCCG+c="; + useFetchCargoVendor = true; + cargoHash = "sha256-K+LKRokfE8i4Huti0aQm4UrpConTcxVwJ2DyeOLjNKA="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ne/nexusmods-app/deps.json b/pkgs/by-name/ne/nexusmods-app/deps.json index 0f6d10c751cc..b83c979c76d3 100644 --- a/pkgs/by-name/ne/nexusmods-app/deps.json +++ b/pkgs/by-name/ne/nexusmods-app/deps.json @@ -161,18 +161,18 @@ }, { "pname": "Bannerlord.LauncherManager", - "version": "1.0.138", - "hash": "sha256-U954PUK8oq1mFBqNjONMXi1DYSudT7gjpueWYBIXDdo=" + "version": "1.0.140", + "hash": "sha256-zqfi52ATMfzBkYhsSS4I8xNIyy+SQc4fOOEfJIVEfoE=" }, { "pname": "Bannerlord.LauncherManager.Localization", - "version": "1.0.138", - "hash": "sha256-i7OhCR6pceJU7xyaY1pi67PLSnyDX5YDCIrbHw1Jcuc=" + "version": "1.0.140", + "hash": "sha256-WMvQCbIykmF0V7yHf/yMsiov7cbwfujBUhYrWqmPbX8=" }, { "pname": "Bannerlord.LauncherManager.Models", - "version": "1.0.138", - "hash": "sha256-mo7Xmj7Ntxgy2/aMzywuyCJ9w/Y1FzbhKOf7fR6ebjw=" + "version": "1.0.140", + "hash": "sha256-1E5s8PPehDmxQB1ln5oA2l3j3Q1PVqgj3HqMTE3uWA8=" }, { "pname": "Bannerlord.ModuleManager", @@ -181,8 +181,8 @@ }, { "pname": "Bannerlord.ModuleManager", - "version": "6.0.242", - "hash": "sha256-nHBchr6mLQNOWEyfPGi4nzspaIviQY4j+fGJkUTN0Bs=" + "version": "6.0.246", + "hash": "sha256-YXBoSra3bsLB86GLUfFcsVja6QKLqgZBFPQi71y2s1k=" }, { "pname": "Bannerlord.ModuleManager.Models", @@ -191,8 +191,8 @@ }, { "pname": "Bannerlord.ModuleManager.Models", - "version": "6.0.242", - "hash": "sha256-iRTxQ7VhrYziaAy3jzD7qEXzq6bOM8eIrB6kyZMurkY=" + "version": "6.0.246", + "hash": "sha256-i8sTl8pldn9VzluxtSZ0EctC9P4j5ymZ01s9oWnMFI4=" }, { "pname": "BenchmarkDotNet", @@ -356,58 +356,58 @@ }, { "pname": "GameFinder", - "version": "4.3.3", - "hash": "sha256-uJzGa5CAa+6oHuG5gU0TN68biDb7ZQYGgqeW1nGLHQc=" + "version": "4.4.0", + "hash": "sha256-MaVW4qgbZgsoyIq8cLQLNJnZe2M7wsKAIE+ICxRNyzg=" }, { "pname": "GameFinder.Common", - "version": "4.3.3", - "hash": "sha256-0mITSz+9TyknYO8zzvLNB70jWPe5v2Q3sKHPupvGGBk=" + "version": "4.4.0", + "hash": "sha256-7tk84DGPBM2M8KvuTnDm4hLVmLUMd8GSLDFhsjl7Ra0=" }, { "pname": "GameFinder.Launcher.Heroic", - "version": "4.3.3", - "hash": "sha256-3DuhHRGbWeh4Smj0TXitzUsTPbCwHmtZsk3e+CVZHHA=" + "version": "4.4.0", + "hash": "sha256-/fp62b11/TXEMsrZzafHbbZYmU9pGgr7qVE2iUCVJik=" }, { "pname": "GameFinder.RegistryUtils", - "version": "4.3.3", - "hash": "sha256-bd6qpOthn4ljNpwQi7pdVe5P1EN8DnXbyKyR4PnSxJk=" + "version": "4.4.0", + "hash": "sha256-6Yk3A88xSWO7wr+1bJQtH6D2DRzQ0AOb8HkmSb34MPk=" }, { "pname": "GameFinder.StoreHandlers.EADesktop", - "version": "4.3.3", - "hash": "sha256-jvh672wPSH0T4W6dJHdvMGJi93LWDJBefcVFrkxT6hI=" + "version": "4.4.0", + "hash": "sha256-k2tUCIxnKEdIZtaqATpJLoHh6p0mgLIB1UzBWoEcDec=" }, { "pname": "GameFinder.StoreHandlers.EGS", - "version": "4.3.3", - "hash": "sha256-IKDDTnCor3G7HdsVjo0wYNJQjBoQjQ+a+MgjnGVOaek=" + "version": "4.4.0", + "hash": "sha256-7zxg064pFoHOYOa2kibtC1kpYgXRpbFh1Z9EatEcSNE=" }, { "pname": "GameFinder.StoreHandlers.GOG", - "version": "4.3.3", - "hash": "sha256-76+W+wi33ms0Xm5OCXQBmHCAilWRaA/OMd343vkkhc0=" + "version": "4.4.0", + "hash": "sha256-8LWj1MaEKhukBXs0ZIt5pt5z1H1i3VuoJONqqH6gNvY=" }, { "pname": "GameFinder.StoreHandlers.Origin", - "version": "4.3.3", - "hash": "sha256-Ss48fc+19RqhjkEP0tld5Eui65XwECFeAMu+126JCo4=" + "version": "4.4.0", + "hash": "sha256-TP9KYLDIZxFn3+N58zwjBPrL5COl2HxEpfr550OsUrM=" }, { "pname": "GameFinder.StoreHandlers.Steam", - "version": "4.3.3", - "hash": "sha256-EQxtM7k459MfHL0Z2Li45jWji6CgGvpJbJbJv8zXVc4=" + "version": "4.4.0", + "hash": "sha256-D6ABxneqdc+467RvYMs8qULyYHNTs7I0GsmXBIpiZMM=" }, { "pname": "GameFinder.StoreHandlers.Xbox", - "version": "4.3.3", - "hash": "sha256-uzIPKS3O/uxqXZMysZfgRlQaDUSUhj1y9hCKAwwhK0g=" + "version": "4.4.0", + "hash": "sha256-xLZJ4J79ptEjPduwdY8E288UJRQ92JnHSjkJc6Ubt+4=" }, { "pname": "GameFinder.Wine", - "version": "4.3.3", - "hash": "sha256-aEFkI7UVHsipCxdvHq3P+mrThgYdrFhpK6EbyFYqU6Y=" + "version": "4.4.0", + "hash": "sha256-lmGF+gzipCBIu/c4wR2Qgqq6/5Dd4ZhqlxUuCRX7pmY=" }, { "pname": "Gee.External.Capstone", @@ -1006,8 +1006,8 @@ }, { "pname": "Microsoft.CodeCoverage", - "version": "17.11.1", - "hash": "sha256-1dLlK3NGh88PuFYZiYpT+izA96etxhU3BSgixDgdtGA=" + "version": "17.12.0", + "hash": "sha256-lGjifppD0OBMBp28pjUfPipaeXg739n8cPhtHWoo5RE=" }, { "pname": "Microsoft.Composition", @@ -1436,8 +1436,8 @@ }, { "pname": "Microsoft.NET.Test.Sdk", - "version": "17.11.1", - "hash": "sha256-0JUEucQ2lzaPgkrjm/NFLBTbqU1dfhvhN3Tl3moE6mI=" + "version": "17.12.0", + "hash": "sha256-DKFEbhh2wPzahNeHdEoFig8tZh/LEVrFc5+zpT43Btg=" }, { "pname": "Microsoft.NETCore.Platforms", @@ -1481,13 +1481,13 @@ }, { "pname": "Microsoft.TestPlatform.ObjectModel", - "version": "17.11.1", - "hash": "sha256-5vX+vCzFY3S7xfMVIv8OlMMFtdedW9UIJzc0WEc+vm4=" + "version": "17.12.0", + "hash": "sha256-3XBHBSuCxggAIlHXmKNQNlPqMqwFlM952Av6RrLw1/w=" }, { "pname": "Microsoft.TestPlatform.TestHost", - "version": "17.11.1", - "hash": "sha256-wSkY0H1fQAq0H3LcKT4u7Y5RzhAAPa6yueVN84g8HxU=" + "version": "17.12.0", + "hash": "sha256-rf8Sh0fQq44Sneuvs64unkkIHg8kOjDGWE35j9iLx5I=" }, { "pname": "Microsoft.VisualStudio.Composition", @@ -1799,11 +1799,26 @@ "version": "9.4.1", "hash": "sha256-YfGVVfl/Yon9WgJCZscXZMbZoCNg+OvGFvdPSxe+Q1I=" }, + { + "pname": "protobuf-net", + "version": "3.2.45", + "hash": "sha256-rWitxe3uP3SOyoG1fwM5n00RpR5IL1V6u1zXMI0p0JA=" + }, + { + "pname": "protobuf-net.Core", + "version": "3.2.45", + "hash": "sha256-bsMGUmd0yno8g0H0637jJboKJwyyHLHoHg45+bt9pLQ=" + }, { "pname": "QoiSharp", "version": "1.0.0", "hash": "sha256-iN/yCXVN0M5+T/Ye9KJ+EGoLsaBxFU/uCIXvX17EhkM=" }, + { + "pname": "QRCoder", + "version": "1.6.0", + "hash": "sha256-2Ev/6d7PH6K4dVYQQHlZ+ZggkCnDtrlaGygs65mDo28=" + }, { "pname": "R3", "version": "1.0.0", @@ -2184,6 +2199,11 @@ "version": "15.2.22", "hash": "sha256-4QO7NAcOqTDxwsheB2wyXRdH626JylEbahQaKWKZpIc=" }, + { + "pname": "SteamKit2", + "version": "3.0.0", + "hash": "sha256-bRRdX8WFo9k+QCZWh0KHb3TULpJxpR4Hg9FDXKBW6d4=" + }, { "pname": "StrawberryShake.Core", "version": "14.1.0", diff --git a/pkgs/by-name/ne/nexusmods-app/package.nix b/pkgs/by-name/ne/nexusmods-app/package.nix index 63a4081260e1..30eba95da65e 100644 --- a/pkgs/by-name/ne/nexusmods-app/package.nix +++ b/pkgs/by-name/ne/nexusmods-app/package.nix @@ -25,12 +25,12 @@ let in buildDotnetModule (finalAttrs: { inherit pname; - version = "0.7.1"; + version = "0.7.2"; src = fetchgit { url = "https://github.com/Nexus-Mods/NexusMods.App.git"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-TcT+siZMJlOYRtiQV+RAPPfM47wewfsz7WiPFaxCUkc="; + hash = "sha256-Kss1K1ZqXLZ/WbbyY3ZQRe8Kvmjdu3tRGfcagE7Q42Q="; fetchSubmodules = true; fetchLFS = true; }; @@ -97,7 +97,7 @@ buildDotnetModule (finalAttrs: { size=''${i}x''${i} dir=$out/share/icons/hicolor/$size/apps mkdir -p $dir - convert -background none -resize $size $icon $dir/com.nexusmods.app.png + magick -background none $icon -resize $size $dir/com.nexusmods.app.png done ''; @@ -135,6 +135,9 @@ buildDotnetModule (finalAttrs: { "NexusMods.UI.Tests.ImageCacheTests.Test_LoadAndCache_RemoteImage" "NexusMods.UI.Tests.ImageCacheTests.Test_LoadAndCache_ImageStoredFile" + # Fails in ofborg with VerifyException tests/Games/NexusMods.Games.StardewValley.Tests + "NexusMods.Games.StardewValley.Tests.StardewValleyInstallersTests.CanInstallMod" + # Fails with: Expected a to be thrown, but no exception was thrown. "NexusMods.Networking.ModUpdates.Tests.PerFeedCacheUpdaterTests.Constructor_WithItemsFromDifferentGames_ShouldThrowArgumentException_InDebug" ] diff --git a/pkgs/by-name/ng/ngn-k/package.nix b/pkgs/by-name/ng/ngn-k/package.nix index 76ff50b64b9e..4268f816f087 100644 --- a/pkgs/by-name/ng/ngn-k/package.nix +++ b/pkgs/by-name/ng/ngn-k/package.nix @@ -3,48 +3,38 @@ , stdenvNoLibs , fetchFromGitea , runtimeShell -, doCheck ? withLibc && stdenv.hostPlatform == stdenv.buildPlatform -, withLibc ? true }: -let - # k itself can be compiled with -ffreestanding, but tests require a libc; - # if we want to build k-libc we need a libc obviously - useStdenv = if withLibc || doCheck then stdenv else stdenvNoLibs; -in - -useStdenv.mkDerivation { +stdenv.mkDerivation { pname = "ngn-k"; - version = "unstable-2022-11-28"; + version = "0-unstable-2025-01-04"; src = fetchFromGitea { domain = "codeberg.org"; owner = "ngn"; repo = "k"; - rev = "e5138f182a8ced07dd240e3fe58274130842a85d"; - sha256 = "1pn416znrdndb8iccprzx4zicmsx8c6i9dm3wq5z3jg8nan53p69"; + rev = "feb51a61443dac03213c4e97edd8df679a4a3aaa"; + sha256 = "14v2bwbgaxi1rsq5xabp5dmv0bl0vga3lhzwdxyvsyl9q7qybf55"; }; patches = [ ./repl-license-path.patch + ./repl-argv-1.patch ]; postPatch = '' - patchShebangs --build a19/a.sh a20/a.sh a21/a.sh dy/a.sh e/a.sh - # don't use hardcoded /bin/sh - for f in repl.k repl-bg.k m.c;do - substituteInPlace "$f" --replace "/bin/sh" "${runtimeShell}" + for f in repl.k m.c;do + substituteInPlace "$f" --replace-fail "/bin/sh" "${runtimeShell}" done ''; makeFlags = [ "-e" ]; buildFlags = [ - (if withLibc then "k-libc" else "k") + "k" "libk.so" ]; checkTarget = "t"; - inherit doCheck; outputs = [ "out" "dev" "lib" ]; @@ -56,7 +46,7 @@ useStdenv.mkDerivation { install -Dm755 libk.so "$lib/lib/libk.so" install -Dm644 k.h "$dev/include/k.h" install -Dm644 LICENSE -t "$out/share/ngn-k" - substituteInPlace "$out/bin/k-repl" --replace "#!k" "#!$out/bin/k" + substituteInPlace "$out/bin/k-repl" --replace-fail "#!k" "#!$out/bin/k" runHook postInstall ''; diff --git a/pkgs/by-name/ng/ngn-k/repl-argv-1.patch b/pkgs/by-name/ng/ngn-k/repl-argv-1.patch new file mode 100644 index 000000000000..0e54a0845e4a --- /dev/null +++ b/pkgs/by-name/ng/ngn-k/repl-argv-1.patch @@ -0,0 +1,13 @@ +diff --git a/repl.k b/repl.k +index dc89832c..33780850 100755 +--- a/repl.k ++++ b/repl.k +@@ -28,7 +28,7 @@ joinpath:{$[x~,".";y;"/"~*|x;x,y;x,"/",y]} + line0:{c:{0x07~*-2#*x}{(l;r):x;(1:1;r,,(-2_l))}/(x;());"\n"/(*|c),,*c} + line1:{$[#x;;:0];x:-1_x;$[(3>#x)&("\\"=*x)&~^(!cmds)?x 1;cmds[x 1]x 1;.[`1:(fmt;fmtx)[" "~*x]@.:;,x;{`0:`err[]}]];`1:prompt;1} + line:line1@line0@ +-$["repl.k"~basename`argv 1;{cmds::@[cmds;x[1]1;:;{y;`0:x}2_x]}'{(&x~\:80#"-")_x:(1+*&x~\:,"/")_-1_x}@0:`argv 1;]; ++$["k-repl"~basename`argv 1;{cmds::@[cmds;x[1]1;:;{y;`0:x}2_x]}'{(&x~\:80#"-")_x:(1+*&x~\:,"/")_-1_x}@0:`argv 1;]; + run:{`1:banner,prompt;{line@1:`}::/`;} + \d . + diff --git a/pkgs/by-name/ng/ngn-k/repl-license-path.patch b/pkgs/by-name/ng/ngn-k/repl-license-path.patch index 17b998db187e..d3cd8c781b6b 100644 --- a/pkgs/by-name/ng/ngn-k/repl-license-path.patch +++ b/pkgs/by-name/ng/ngn-k/repl-license-path.patch @@ -1,13 +1,13 @@ diff --git a/repl.k b/repl.k -index 4c023467..10414162 100755 +index dc89832c..7a6e0dcf 100755 --- a/repl.k +++ b/repl.k -@@ -2,7 +2,7 @@ - `1:"ngn/k, (c) 2019-2022 ngn, GNU AGPLv3. type \\ for more info\n" - \d repl - `1:prompt:," " /use 0x0720 for emacs integration +@@ -21,7 +21,7 @@ tbl:{[w;u;x]h:`k'!x;d:`k''.x;W:(#'h)|/'#''d + r,par'dd[w-2]'sem/'+@[W;&~^`i`d?_@'.x;-:]$'d} + cell:{$[|/`i`d=@y;-x;x]$z} + par:{opn,x,cls} -cmds:(,"a")!{`1:1:joinpath[dirname`argv 0]"LICENSE";} +cmds:(,"a")!{`1:1:joinpath[dirname`argv 0]"../share/ngn-k/LICENSE";} + basename:{*|"/"\x} dirname:{$[#x:"/"/-1_"/"\x;x;,"."]} joinpath:{$[x~,".";y;"/"~*|x;x,y;x,"/",y]} - fmt:{$[x~(::);"";(`A~@x)&1<#x;"(",("\n "/`k'x),")\n";`k[x],"\n"]} diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py index abb136321a3f..2b9975e48e98 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py @@ -502,6 +502,9 @@ def execute(argv: list[str]) -> None: specialisation=args.specialisation, install_bootloader=args.install_bootloader, ) + print_result("Done. The new configuration is", path_to_config) + case Action.BUILD: + print_result("Done. The new configuration is", path_to_config) case Action.BUILD_VM | Action.BUILD_VM_WITH_BOOTLOADER: # If you get `not-found`, please open an issue vm_path = next(path_to_config.glob("bin/run-*-vm"), "not-found") diff --git a/pkgs/by-name/ni/nixpkgs-hammering/package.nix b/pkgs/by-name/ni/nixpkgs-hammering/package.nix index 088ae8425db7..575d213de0c9 100644 --- a/pkgs/by-name/ni/nixpkgs-hammering/package.nix +++ b/pkgs/by-name/ni/nixpkgs-hammering/package.nix @@ -30,7 +30,8 @@ let pname = "nixpkgs-hammering-rust-checks"; inherit version src meta; sourceRoot = "${src.name}/rust-checks"; - cargoHash = "sha256-QrtAalZClNc0ZN6iNqN9rFRQ7w68lEZPV5e25uXYToA="; + useFetchCargoVendor = true; + cargoHash = "sha256-cE1fzdxGa0WG2WCPs8UFnE2vzaKfU7r6LS+9HLCVJ1U="; }; in diff --git a/pkgs/by-name/nn/nng/package.nix b/pkgs/by-name/nn/nng/package.nix index a10611f3a89a..2dcac6e869b7 100644 --- a/pkgs/by-name/nn/nng/package.nix +++ b/pkgs/by-name/nn/nng/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "nng"; - version = "1.9.0"; + version = "1.10"; src = fetchFromGitHub { owner = "nanomsg"; repo = "nng"; rev = "v${version}"; - hash = "sha256-N1ZMILrFhdkwU4PK/zlSCgGjOm0748fgvZRrk7I9YVg="; + hash = "sha256-HQQx65itnDPX/luN2JtU03R7o+jzmGXJPOh4ffodxzA="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/no/nom/package.nix b/pkgs/by-name/no/nom/package.nix index 3f39e81559d8..88c029ef65a7 100644 --- a/pkgs/by-name/no/nom/package.nix +++ b/pkgs/by-name/no/nom/package.nix @@ -5,13 +5,13 @@ }: buildGoModule rec { pname = "nom"; - version = "2.7.2"; + version = "2.7.3"; src = fetchFromGitHub { owner = "guyfedwards"; repo = "nom"; - rev = "v${version}"; - hash = "sha256-2S/oMhjqNzwQAA747lOfvH7RQ2tRtfhxG9ErfwVuUg8="; + tag = "v${version}"; + hash = "sha256-kCvNUvU3fR3v/uRPl3y9HlNXMartNb23kfj1YYY2BWg="; }; vendorHash = "sha256-d5KTDZKfuzv84oMgmsjJoXGO5XYLVKxOB5XehqgRvYw="; diff --git a/pkgs/by-name/nu/nu_scripts/package.nix b/pkgs/by-name/nu/nu_scripts/package.nix index 62ca93d7140d..a74b4d42a03e 100644 --- a/pkgs/by-name/nu/nu_scripts/package.nix +++ b/pkgs/by-name/nu/nu_scripts/package.nix @@ -6,13 +6,13 @@ stdenvNoCC.mkDerivation rec { pname = "nu_scripts"; - version = "0-unstable-2025-01-06"; + version = "0-unstable-2025-01-17"; src = fetchFromGitHub { owner = "nushell"; repo = pname; - rev = "a9b829115ff3c77981616ae777379fc0bd4dc998"; - hash = "sha256-fIayTOyJCqOkFUkmghBQJfCp8s8oNrdUi+/BuOjcbTU="; + rev = "fd686c0b0c10e284b1da72d6c3c42ab28c7504a7"; + hash = "sha256-nO7Dyg1ZxjSInkWW+kHa32H0P1CQ6vc6ODLLTj2abcI="; }; installPhase = '' diff --git a/pkgs/by-name/nu/nuclear/package.nix b/pkgs/by-name/nu/nuclear/package.nix index 956185245843..268955c6a10d 100644 --- a/pkgs/by-name/nu/nuclear/package.nix +++ b/pkgs/by-name/nu/nuclear/package.nix @@ -5,7 +5,7 @@ }: let pname = "nuclear"; - version = "0.6.41"; + version = "0.6.42"; src = fetchurl { # Nuclear currenntly only publishes AppImage releases for x86_64, which is hardcoded in @@ -13,7 +13,7 @@ let # provide more arches, we should use stdenv.hostPlatform to determine the arch and choose # source URL accordingly. url = "https://github.com/nukeop/nuclear/releases/download/v${version}/${pname}-v${version}-x86_64.AppImage"; - hash = "sha256-hPnFz3cQMQj8EzwqC8bNYf2MidBbLUa8U3I+vQbWpcE="; + hash = "sha256-95Q8TEn2gvJu75vgDdzSYH/1ci3BlidQ5nKA53fas6U="; }; appimageContents = appimageTools.extract { inherit pname version src; }; diff --git a/pkgs/by-name/nv/nvc/package.nix b/pkgs/by-name/nv/nvc/package.nix index 41d042750c3c..c662a67cf228 100644 --- a/pkgs/by-name/nv/nvc/package.nix +++ b/pkgs/by-name/nv/nvc/package.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "nvc"; - version = "1.15.0"; + version = "1.15.1"; src = fetchFromGitHub { owner = "nickg"; repo = "nvc"; rev = "r${version}"; - hash = "sha256-EpDJhgj1oYz+050qPwrToQAJNMtkSb423+Bh09qlka0="; + hash = "sha256-E/Q2f5b6Y0ZGEyq18I09SXHK0PJrBMiuCwpStyd/E8M="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/nw/nwg-dock/package.nix b/pkgs/by-name/nw/nwg-dock/package.nix index 5b2ecdb95d51..c3cc4c19ea72 100644 --- a/pkgs/by-name/nw/nwg-dock/package.nix +++ b/pkgs/by-name/nw/nwg-dock/package.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "nwg-dock"; - version = "0.4.2"; + version = "0.4.3"; src = fetchFromGitHub { owner = "nwg-piotr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-9s0kweFBxzNYZOqIGG/hPF1DsECm7N0dhgRlc7DGUOc="; + sha256 = "sha256-Ymk4lpX8RAxWot7U+cFtu1eJd6VHP+JS1I2vF0V1T70="; }; vendorHash = "sha256-iR+ytThRwmCvFEMcpSELPRwiramN5jPXAjaJtda4pOw="; diff --git a/pkgs/by-name/ob/obs-cmd/package.nix b/pkgs/by-name/ob/obs-cmd/package.nix index 01cb27a34680..091090bc7084 100644 --- a/pkgs/by-name/ob/obs-cmd/package.nix +++ b/pkgs/by-name/ob/obs-cmd/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "obs-cmd"; - version = "0.18.1"; + version = "0.18.2"; src = fetchFromGitHub { owner = "grigio"; repo = "obs-cmd"; rev = "v${version}"; - hash = "sha256-+unUjGPDUSVGXyf91+mnPrLAslTpDxsCCmSnT34s7S0="; + hash = "sha256-plNLVBSTen11q945qtDBJaNTWKGICbuWokyvRzhu0Wg="; }; - cargoHash = "sha256-zEd8LUNZOspcrA90qJur6V2Dt/+9XJWvwBBjjFAPAg8="; + cargoHash = "sha256-xBzOMH6r8SkDsD8+3ZsrUK2sD3pHFt71fGK09kVeRc0="; meta = with lib; { description = "Minimal CLI to control OBS Studio via obs-websocket"; diff --git a/pkgs/by-name/od/odin/package.nix b/pkgs/by-name/od/odin/package.nix index 6aa3f7ed1606..d6669f2e0a32 100644 --- a/pkgs/by-name/od/odin/package.nix +++ b/pkgs/by-name/od/odin/package.nix @@ -91,7 +91,6 @@ stdenv.mkDerivation { mainProgram = "odin"; maintainers = with lib.maintainers; [ astavie - znaniye ]; platforms = lib.platforms.unix; broken = stdenv.hostPlatform.isMusl; diff --git a/pkgs/by-name/ol/ols/package.nix b/pkgs/by-name/ol/ols/package.nix index 39f11a15c51d..d2a8a23e91e0 100644 --- a/pkgs/by-name/ol/ols/package.nix +++ b/pkgs/by-name/ol/ols/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation { pname = "ols"; - version = "0-unstable-2024-12-28"; + version = "0-unstable-2025-01-04"; src = fetchFromGitHub { owner = "DanielGavin"; repo = "ols"; - rev = "fded19fc8ede748d31b67686941fbe33a8f77214"; - hash = "sha256-KuzYkCwcQ11vLaQ3Au+2sEADe4knWu/HAls7Qe0cr2A="; + rev = "3589fe03d7124c9058dc69bcc21aa85910367cfe"; + hash = "sha256-eF66PXABJaOsBPqHKyRkbif4fbaPbiOPyIVXPfwj/o4="; }; postPatch = '' @@ -52,7 +52,6 @@ stdenv.mkDerivation { license = lib.licenses.mit; maintainers = with lib.maintainers; [ astavie - znaniye ]; mainProgram = "ols"; }; diff --git a/pkgs/by-name/on/oneanime/package.nix b/pkgs/by-name/on/oneanime/package.nix index 58d682d2bf87..46e6ead2cdee 100644 --- a/pkgs/by-name/on/oneanime/package.nix +++ b/pkgs/by-name/on/oneanime/package.nix @@ -50,7 +50,7 @@ let meta = { homepage = "https://github.com/Predidit/open_chinese_convert_bridge"; license = with lib.licenses; [ gpl3Plus ]; - maintainers = with lib.maintainers; [ aucub ]; + maintainers = with lib.maintainers; [ ]; }; }; in @@ -164,7 +164,7 @@ flutter327.buildFlutterApplication rec { homepage = "https://github.com/Predidit/oneAnime"; mainProgram = "oneanime"; license = with lib.licenses; [ gpl3Plus ]; - maintainers = with lib.maintainers; [ aucub ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.linux; }; } diff --git a/pkgs/by-name/op/open-webui/package.nix b/pkgs/by-name/op/open-webui/package.nix index 6b58757fc0fd..cde4b0d81e04 100644 --- a/pkgs/by-name/op/open-webui/package.nix +++ b/pkgs/by-name/op/open-webui/package.nix @@ -7,19 +7,19 @@ }: let pname = "open-webui"; - version = "0.5.6"; + version = "0.5.7"; src = fetchFromGitHub { owner = "open-webui"; repo = "open-webui"; tag = "v${version}"; - hash = "sha256-9HRUFG8knKJx5Fr0uxLPMwhhbNnQ7CSywla8LGZu8l4="; + hash = "sha256-spdwd3ffibmHb9LDgK1EkpUAK6OsD9d6gocrbEx/CrE="; }; frontend = buildNpmPackage { inherit pname version src; - npmDepsHash = "sha256-copQjrFgVJ6gZ8BwPiIsHEKSZDEiuVU3qygmPFv5Y1A="; + npmDepsHash = "sha256-9wu5SWtom/pZrFRP8rrsZMoGEnN4MVAlkyeydr0Fslo="; # Disabling `pyodide:fetch` as it downloads packages during `buildPhase` # Until this is solved, running python packages from the browser will not work. diff --git a/pkgs/by-name/op/openasar/package.nix b/pkgs/by-name/op/openasar/package.nix index f12a4c8c47ef..d37f6feb246a 100644 --- a/pkgs/by-name/op/openasar/package.nix +++ b/pkgs/by-name/op/openasar/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "openasar"; - version = "0-unstable-2025-01-10"; + version = "0-unstable-2025-01-20"; src = fetchFromGitHub { owner = "GooseMod"; repo = "OpenAsar"; - rev = "4ed9e52d42501927b60354fcc456da50ed41cde2"; - hash = "sha256-3b31iEmNUlBLc47Cw7EtMMgc+oPr1V6oqNTKRemXJfA="; + rev = "e88eebf440866a06f3eca3b4fe2a8cc07818ee61"; + hash = "sha256-SejlIm9AIK09grP8j5h0O8DxIv85zGssr170xskGx2I="; }; postPatch = '' diff --git a/pkgs/by-name/op/openlibm/package.nix b/pkgs/by-name/op/openlibm/package.nix index 620e50db522e..d2f81c4c9c4f 100644 --- a/pkgs/by-name/op/openlibm/package.nix +++ b/pkgs/by-name/op/openlibm/package.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "openlibm"; - version = "0.8.4"; + version = "0.8.5"; src = fetchFromGitHub { owner = "JuliaLang"; repo = "openlibm"; rev = "v${version}"; - sha256 = "sha256-JhyF93XU2Yd6Ia+JtYvF7Dr+d90r6xMZj/fWDwCNeWY="; + sha256 = "sha256-z2PMovHk9M4Wb5K4EWOrp0b+3RLRHDVUKDzIxHsKrXg="; }; makeFlags = [ diff --git a/pkgs/by-name/op/opensoundmeter/package.nix b/pkgs/by-name/op/opensoundmeter/package.nix index 211c01f3e120..8adcbdf70fbe 100644 --- a/pkgs/by-name/op/opensoundmeter/package.nix +++ b/pkgs/by-name/op/opensoundmeter/package.nix @@ -16,13 +16,13 @@ let in stdenv.mkDerivation rec { pname = "opensoundmeter"; - version = "1.4"; + version = "1.4.1"; src = fetchFromGitHub { owner = "psmokotnin"; repo = "osm"; rev = "v${version}"; - hash = "sha256-yFA1bwCv6E7za54FQREuT3nMZhY0lmHSsDz4PIAjarg="; + hash = "sha256-X/edRuYtZsvbs7Bl/JpJJPIGeQDEDH+FTQCX1Zy1osE="; }; patches = [ ./build.patch ]; diff --git a/pkgs/by-name/op/operator-sdk/package.nix b/pkgs/by-name/op/operator-sdk/package.nix index be5f7a14e060..713d10af36c4 100644 --- a/pkgs/by-name/op/operator-sdk/package.nix +++ b/pkgs/by-name/op/operator-sdk/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "operator-sdk"; - version = "1.39.0"; + version = "1.39.1"; src = fetchFromGitHub { owner = "operator-framework"; repo = pname; tag = "v${version}"; - hash = "sha256-D3LAKrMlqfRqSLuQv6qh5dyQVzIAXCPwTpb1mDkjLF4="; + hash = "sha256-+lgpwpLkqpAZ0aScM62gk4l/h44auB7ixhW3ZoT7m64="; }; vendorHash = "sha256-3CtVl3HWUcbXp/U/pTqoCol4kmJqtLsTlcAijGHENtI="; diff --git a/pkgs/by-name/os/ossia-score/package.nix b/pkgs/by-name/os/ossia-score/package.nix index c8bedeac4db3..59591c867175 100644 --- a/pkgs/by-name/os/ossia-score/package.nix +++ b/pkgs/by-name/os/ossia-score/package.nix @@ -44,13 +44,13 @@ clangStdenv.mkDerivation (finalAttrs: { pname = "ossia-score"; - version = "3.4.0"; + version = "3.4.1"; src = fetchFromGitHub { owner = "ossia"; repo = "score"; rev = "v${finalAttrs.version}"; - hash = "sha256-UuU9WP8AIwNSipt9gikb5YY2mQpIbSENPv1vyIOLfVo="; + hash = "sha256-PpIGlw3MmJYiLaKX+oHM7QUjlk6Bw/W2GwdkLgPK1Hg="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/os/osu-lazer-bin/package.nix b/pkgs/by-name/os/osu-lazer-bin/package.nix index 7aa20b00f053..caacc0422f04 100644 --- a/pkgs/by-name/os/osu-lazer-bin/package.nix +++ b/pkgs/by-name/os/osu-lazer-bin/package.nix @@ -10,23 +10,23 @@ let pname = "osu-lazer-bin"; - version = "2025.118.2"; + version = "2025.118.3"; src = { aarch64-darwin = fetchzip { url = "https://github.com/ppy/osu/releases/download/${version}/osu.app.Apple.Silicon.zip"; - hash = "sha256-cUyndZAKc2Dd3YHb+rdq5QRE7ei9MxrLaal7yvjVsKE="; + hash = "sha256-+Z/lF7RjJGkzlauQlMCMOjvXArWjEg0mGu7HTe2S7Xs="; stripRoot = false; }; x86_64-darwin = fetchzip { url = "https://github.com/ppy/osu/releases/download/${version}/osu.app.Intel.zip"; - hash = "sha256-tTuiFEUv5ZVXxiN4ZN26p4ysJWeU2ccQsN06/zR2780="; + hash = "sha256-/kF09xFrH0zlN2kpzxIwvMC+W6pR0Lc8hlxOmwYn2mI="; stripRoot = false; }; x86_64-linux = fetchurl { url = "https://github.com/ppy/osu/releases/download/${version}/osu.AppImage"; - hash = "sha256-E2WWjLFEAqDqFso8eO+coZ2cuQEhUS0nBZY45jInEFA="; + hash = "sha256-bnffUtzs5IsWKhAGeGTt+UHMmlTWbbT79Ac4fKhXK9s="; }; } .${stdenvNoCC.system} or (throw "osu-lazer-bin: ${stdenvNoCC.system} is unsupported."); diff --git a/pkgs/by-name/os/osu-lazer/package.nix b/pkgs/by-name/os/osu-lazer/package.nix index cc33bb1aae9a..79b2132a6c7f 100644 --- a/pkgs/by-name/os/osu-lazer/package.nix +++ b/pkgs/by-name/os/osu-lazer/package.nix @@ -21,13 +21,13 @@ buildDotnetModule rec { pname = "osu-lazer"; - version = "2025.118.2"; + version = "2025.118.3"; src = fetchFromGitHub { owner = "ppy"; repo = "osu"; tag = version; - hash = "sha256-pQEMd+y+uS+Xl8lBuk7KwX7AcPs0MCXwkY5oPBPWmEE="; + hash = "sha256-sObk/T5QywneLVvBIekR0vJ1VbXbHKr9ByiKPF1MwBY="; }; projectFile = "osu.Desktop/osu.Desktop.csproj"; diff --git a/pkgs/by-name/ow/owl-compositor/package.nix b/pkgs/by-name/ow/owl-compositor/package.nix index 15ba9de7d753..320eccc35680 100644 --- a/pkgs/by-name/ow/owl-compositor/package.nix +++ b/pkgs/by-name/ow/owl-compositor/package.nix @@ -1,7 +1,8 @@ { lib , clangStdenv , fetchFromGitHub -, gnustep +, gnustep-back +, wrapGNUstepAppsHook , libxkbcommon , makeWrapper , wayland @@ -41,8 +42,7 @@ stdenv.mkDerivation { darwin.DarwinTools darwin.bootstrap_cmds ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ - gnustep.make - gnustep.wrapGNUstepAppsHook + wrapGNUstepAppsHook ]; buildInputs = [ @@ -51,9 +51,7 @@ stdenv.mkDerivation { ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ - gnustep.back - gnustep.base - gnustep.gui + gnustep-back ]; preConfigure = '' diff --git a/pkgs/by-name/ox/oxefmsynth/package.nix b/pkgs/by-name/ox/oxefmsynth/package.nix index b569dccb8723..d64e51bb9232 100644 --- a/pkgs/by-name/ox/oxefmsynth/package.nix +++ b/pkgs/by-name/ox/oxefmsynth/package.nix @@ -4,20 +4,8 @@ fetchFromGitHub, fetchzip, libX11, + vst2-sdk, }: - -let - - vst-sdk = stdenv.mkDerivation rec { - name = "vstsdk3610_11_06_2018_build_37"; - src = fetchzip { - url = "https://web.archive.org/web/20181016150224if_/https://download.steinberg.net/sdk_downloads/${name}.zip"; - sha256 = "0da16iwac590wphz2sm5afrfj42jrsnkr1bxcy93lj7a369ildkj"; - }; - installPhase = "cp -r . $out"; - }; - -in stdenv.mkDerivation rec { pname = "oxefmsynth"; version = "1.3.5"; @@ -31,7 +19,7 @@ stdenv.mkDerivation rec { env.NIX_CFLAGS_COMPILE = toString [ "-Wno-narrowing" ]; - buildFlags = [ "VSTSDK_PATH=${vst-sdk}/VST2_SDK" ]; + buildFlags = [ "VSTSDK_PATH=${vst2-sdk}" ]; buildInputs = [ libX11 ]; @@ -40,11 +28,11 @@ stdenv.mkDerivation rec { install -Dm644 oxevst64.so -t $out/lib/lxvst ''; - meta = with lib; { + meta = { homepage = "https://github.com/oxesoft/oxefmsynth"; description = "Open source VST 2.4 instrument plugin"; - maintainers = [ maintainers.hirenashah ]; + maintainers = [ lib.maintainers.hirenashah ]; platforms = [ "x86_64-linux" ]; - license = licenses.gpl3Only; + license = lib.licenses.gpl3Only; }; } diff --git a/pkgs/by-name/ox/oxlint/package.nix b/pkgs/by-name/ox/oxlint/package.nix index a4a9daa5d8f7..40b2afe10ec6 100644 --- a/pkgs/by-name/ox/oxlint/package.nix +++ b/pkgs/by-name/ox/oxlint/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "oxlint"; - version = "0.15.3"; + version = "0.15.6"; src = fetchFromGitHub { owner = "web-infra-dev"; repo = "oxc"; rev = "oxlint_v${version}"; - hash = "sha256-cH3Sosfmx0eOWWOjglcB3puiK0XKbO0wua45/YMZe+0="; + hash = "sha256-2916XMkNvHmnY1wYHPSsRdCcgBHi4Akv1+A6WNlg6J4="; }; - cargoHash = "sha256-Yfk5DGOo3GLHzqJYCFrlLB7soHFI+zBRR93daVOgrmk="; + cargoHash = "sha256-niLqpSwoaZStK9xnQCoDdqE/NVeWysiJn1Mdaj8Yl6Y="; buildInputs = [ rust-jemalloc-sys diff --git a/pkgs/by-name/pa/pack/package.nix b/pkgs/by-name/pa/pack/package.nix index a1255102d26e..12f481c93a45 100644 --- a/pkgs/by-name/pa/pack/package.nix +++ b/pkgs/by-name/pa/pack/package.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "pack"; - version = "0.36.2"; + version = "0.36.4"; src = fetchFromGitHub { owner = "buildpacks"; repo = "pack"; rev = "v${version}"; - hash = "sha256-pITQAGt0aMhEfoauPWxAqnr8JxGi4DcqcmgqtooLkd4="; + hash = "sha256-6cWmBNlmPnNszmv6zaHlyd8GqncMtttKOMfQxxJGJ18="; }; - vendorHash = "sha256-51Qqq2Jpd1XxUoMN+6j4/VZ4fLCm4I9JwBeTcdSHgQw="; + vendorHash = "sha256-9fO/jwTpVvCdHIy1GrE2YZr7jN7Oyw64EbS2w08VOVI="; subPackages = [ "cmd/pack" ]; diff --git a/pkgs/by-name/pa/packwiz/package.nix b/pkgs/by-name/pa/packwiz/package.nix index a37e5656abeb..3bfc70e66caf 100644 --- a/pkgs/by-name/pa/packwiz/package.nix +++ b/pkgs/by-name/pa/packwiz/package.nix @@ -8,13 +8,13 @@ buildGoModule { pname = "packwiz"; - version = "0-unstable-2024-10-15"; + version = "0-unstable-2025-01-19"; src = fetchFromGitHub { owner = "packwiz"; repo = "packwiz"; - rev = "0626c00149a8d9a5e9f76e5640e7b8b95c064350"; - sha256 = "sha256-eAGfLUcyjDR2oJjLK3+DiuICTqoOcIwO5wL350w6vGw="; + rev = "241f24b550f6fe838913a56bdd58bac2fc53254a"; + sha256 = "sha256-VmNsWzsFVNRciNIPUXUVos4cBdpawgN1/nPwMjNpx+0="; }; passthru.updateScript = unstableGitUpdater { }; diff --git a/pkgs/by-name/pa/panopticon/package.nix b/pkgs/by-name/pa/panopticon/package.nix deleted file mode 100644 index 9ed89a80d126..000000000000 --- a/pkgs/by-name/pa/panopticon/package.nix +++ /dev/null @@ -1,63 +0,0 @@ -{ - lib, - fetchFromGitHub, - rustPlatform, - qt5, - git, - cmake, - pkg-config, - makeWrapper, -}: - -rustPlatform.buildRustPackage rec { - pname = "panopticon"; - version = "unstable-20171202"; - - src = fetchFromGitHub { - owner = "das-labor"; - repo = pname; - rev = "33ffec0d6d379d51b38d6ea00d040f54b1356ae4"; - sha256 = "1zv87nqhrzsxx0m891df4vagzssj3kblfv9yp7j96dw0vn9950qa"; - }; - - nativeBuildInputs = [ - cmake - pkg-config - makeWrapper - ]; - propagatedBuildInputs = with qt5; [ - qt5.qtbase - qtdeclarative - qtsvg - qtquickcontrols2 - qtgraphicaleffects - git - ]; - - dontWrapQtApps = true; - - cargoHash = "sha256-VQG7WTubznDi7trrnZIPB5SLfvYUzWxHh+z9wOdYDG4="; - doCheck = false; - - postInstall = '' - mkdir -p $out/share/${pname} $out/bin - cp -R qml $out/share/${pname} - mv $out/bin/${pname} $out/share/${pname} - chmod +x $out/share/${pname} - makeWrapper $out/share/${pname}/${pname} $out/bin/${pname} - ''; - - meta = with lib; { - description = "Libre cross-platform disassembler"; - longDescription = '' - Panopticon is a cross platform disassembler for reverse - engineering written in Rust. It can disassemble AMD64, - x86, AVR and MOS 6502 instruction sets and open ELF files. - Panopticon comes with Qt GUI for browsing and annotating - control flow graphs. - ''; - license = with licenses; [ gpl3 ]; - maintainers = with maintainers; [ leenaars ]; - broken = true; # Added 2024-03-16 - }; -} diff --git a/pkgs/by-name/pc/pcloud/package.nix b/pkgs/by-name/pc/pcloud/package.nix index c075971d15dc..d185ade66a48 100644 --- a/pkgs/by-name/pc/pcloud/package.nix +++ b/pkgs/by-name/pc/pcloud/package.nix @@ -18,6 +18,7 @@ # Build dependencies appimageTools, autoPatchelfHook, + patchelfUnstable, fetchzip, lib, stdenv, @@ -38,13 +39,13 @@ let pname = "pcloud"; - version = "1.14.8"; - code = "XZxqNX5Z7nKd4XMTlkbMbnuRDuhyfL1g5efk"; + version = "1.14.9"; + code = "XZjcLF5ZnbPpMxAlI5FuU39vntbjAhMhVEVV"; # Archive link's codes: https://www.pcloud.com/release-notes/linux.html src = fetchzip { url = "https://api.pcloud.com/getpubzip?code=${code}&filename=pcloud-${version}.zip"; - hash = "sha256-+uWvaNA9mCF9vkBbNnsak+h11mcl9QBamBhMzt68Rfc="; + hash = "sha256-9YgXF2oAbIN8k33wveCPnc4fU3mYv1RB2/jeHmbockY="; }; appimageContents = appimageTools.extractType2 { @@ -63,6 +64,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ autoPatchelfHook + patchelfUnstable ]; buildInputs = [ diff --git a/pkgs/by-name/pd/pdfium-binaries/package.nix b/pkgs/by-name/pd/pdfium-binaries/package.nix index 61e5f218becf..4ae0b7cac35b 100644 --- a/pkgs/by-name/pd/pdfium-binaries/package.nix +++ b/pkgs/by-name/pd/pdfium-binaries/package.nix @@ -4,7 +4,7 @@ stdenv, }: let - version = "6941"; + version = "6968"; src = let inherit (stdenv.hostPlatform) system; @@ -16,10 +16,10 @@ let aarch64-darwin = "mac-arm64"; }; hash = selectSystem { - x86_64-linux = "sha256-9dD4/OjWvUkm7HAOS/jBrtDXiB4LSfEH5j8S6iMI2Go="; - aarch64-linux = "sha256-VpeRfZ1aFVjJlnUO0C+FNwkaXDdHvZSya7MDj90YPmo="; - x86_64-darwin = "sha256-qsFSzksWJXN1F9AmWBQm8hXRyIEs3d9WaeD/7ZjQN7M="; - aarch64-darwin = "sha256-zYhz63VLHJu9vszY2PxWHwAmSgMnvD2baDsK+TsvvyQ="; + x86_64-linux = "sha256-jITBi7w8jhZVkwimFp4nmWpQahPWXAGIJj/zHe5TVCU="; + aarch64-linux = "sha256-rDyLhRuRzw/R9Z1ZuSadXKJ+74U+RVJIC9NSCddd5lg="; + x86_64-darwin = "sha256-ofqKS54ZKcXLVGEs2mhFGC4W7+d87JfhCS+HqcJkzTg="; + aarch64-darwin = "sha256-g8iHsGVp/wCu4FU9ds6RBzabuMIONPA1H/M14BNjPu8="; }; in fetchzip { @@ -48,7 +48,7 @@ stdenv.mkDerivation { homepage = "https://github.com/bblanchon/pdfium-binaries"; license = with lib.licenses; [ asl20 ]; sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; - maintainers = with lib.maintainers; [ aucub ]; + maintainers = with lib.maintainers; [ ]; platforms = [ "aarch64-linux" "aarch64-darwin" diff --git a/pkgs/by-name/pg/pgmoneta/package.nix b/pkgs/by-name/pg/pgmoneta/package.nix index 7be0af081ae8..079d9ee5f87e 100644 --- a/pkgs/by-name/pg/pgmoneta/package.nix +++ b/pkgs/by-name/pg/pgmoneta/package.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "pgmoneta"; - version = "0.15.0"; + version = "0.15.1"; src = fetchFromGitHub { owner = "pgmoneta"; repo = "pgmoneta"; rev = version; - hash = "sha256-3NESUksk3UgiDK6PUx99+eZ1XSrob5TgDgCebQ9EPhU="; + hash = "sha256-LkmTBg1Oed/epMSXbQrzLxhB/UL4GciM+iD+6FkNHyE="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/phoc/default.nix b/pkgs/by-name/ph/phoc/package.nix similarity index 69% rename from pkgs/applications/misc/phoc/default.nix rename to pkgs/by-name/ph/phoc/package.nix index 19dc0653c753..084542190c57 100644 --- a/pkgs/applications/misc/phoc/default.nix +++ b/pkgs/by-name/ph/phoc/package.nix @@ -1,34 +1,35 @@ -{ lib -, stdenv -, stdenvNoCC -, fetchFromGitLab -, meson -, ninja -, pkg-config -, python3 -, wayland-scanner -, wrapGAppsHook3 -, libinput -, gobject-introspection -, mutter -, gnome-desktop -, glib -, gtk3 -, json-glib -, wayland -, libdrm -, libxkbcommon -, wlroots -, xorg -, directoryListingUpdater -, nixosTests -, testers -, gmobile +{ + lib, + stdenv, + stdenvNoCC, + fetchFromGitLab, + meson, + ninja, + pkg-config, + python3, + wayland-scanner, + wrapGAppsHook3, + libinput, + gobject-introspection, + mutter, + gnome-desktop, + glib, + gtk3, + json-glib, + wayland, + libdrm, + libxkbcommon, + wlroots_0_17, + xorg, + directoryListingUpdater, + nixosTests, + testers, + gmobile, }: stdenv.mkDerivation (finalAttrs: { pname = "phoc"; - version = "0.44.0"; + version = "0.44.1"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; @@ -36,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "Phosh"; repo = "phoc"; rev = "v${finalAttrs.version}"; - hash = "sha256-KaCQtORMJUM7/BLD+Jnbunhd/9/3NYWYx/XMYMo27hI="; + hash = "sha256-Whke7wTRp5NaRauiiQZLjs0pSD1uAyr0aAhlK5e1+Hw="; }; nativeBuildInputs = [ @@ -65,12 +66,12 @@ stdenv.mkDerivation (finalAttrs: { gmobile ]; - mesonFlags = ["-Dembed-wlroots=disabled"]; + mesonFlags = [ "-Dembed-wlroots=disabled" ]; # Patch wlroots to remove a check which crashes Phosh. # This patch can be found within the phoc source tree. - wlroots = wlroots.overrideAttrs (old: { - patches = (old.patches or []) ++ [ + wlroots = wlroots_0_17.overrideAttrs (old: { + patches = (old.patches or [ ]) ++ [ (stdenvNoCC.mkDerivation { name = "0001-Revert-layer-shell-error-on-0-dimension-without-anch.patch"; inherit (finalAttrs) src; @@ -94,7 +95,10 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "phoc"; homepage = "https://gitlab.gnome.org/World/Phosh/phoc"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ masipcat zhaofengli ]; + maintainers = with maintainers; [ + masipcat + zhaofengli + ]; platforms = platforms.linux; }; }) diff --git a/pkgs/by-name/pi/pik/package.nix b/pkgs/by-name/pi/pik/package.nix index d9badfa3d18c..e5282b696f43 100644 --- a/pkgs/by-name/pi/pik/package.nix +++ b/pkgs/by-name/pi/pik/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "pik"; - version = "0.14.0"; + version = "0.15.0"; src = fetchFromGitHub { owner = "jacek-kurlit"; repo = "pik"; rev = version; - hash = "sha256-6nIJ2uayWTwcrGJd7nJQFZ84+QE3R6k/2y9mxdILCEU="; + hash = "sha256-iXLAV4VWJczdxrfevxaRxYTAL+d/VRQ61zc0B4UNbPM="; }; - cargoHash = "sha256-geOAhnAg1JefM06rG4nc5aUY7It7c7U5aELpFiFOW4w="; + cargoHash = "sha256-n1lFgaoHboq5UKJKa3IGD1jET4EZ1GcAflNVgoRTP70="; passthru.tests.version = testers.testVersion { package = pik; }; diff --git a/pkgs/by-name/pi/piknik/package.nix b/pkgs/by-name/pi/piknik/package.nix index d10c7d4df743..16d25c09f0f9 100644 --- a/pkgs/by-name/pi/piknik/package.nix +++ b/pkgs/by-name/pi/piknik/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "piknik"; - version = "0.10.1"; + version = "0.10.2"; src = fetchFromGitHub { owner = "jedisct1"; repo = "piknik"; rev = version; - hash = "sha256-3yvr2H1a9YtgOEEBwn1HlGXIWFzRwQPBw9+KQxW3/jo="; + hash = "sha256-Kdqh3sQuO0iT0RW2hU+nrmBltxCFiqOSL00cbDHZJjc="; }; - vendorHash = null; + vendorHash = "sha256-t7w8uKYda6gT08ymAJqS38JgY70kuKNkQvjHFK91j8s="; ldflags = [ "-s" diff --git a/pkgs/by-name/pi/pikopixel/package.nix b/pkgs/by-name/pi/pikopixel/package.nix index c65353143368..f2b00cb90fca 100644 --- a/pkgs/by-name/pi/pikopixel/package.nix +++ b/pkgs/by-name/pi/pikopixel/package.nix @@ -1,7 +1,8 @@ { lib , clangStdenv , fetchurl -, gnustep +, gnustep-back +, wrapGNUstepAppsHook }: clangStdenv.mkDerivation rec { @@ -16,14 +17,11 @@ clangStdenv.mkDerivation rec { sourceRoot = "PikoPixel.Sources.${version}/PikoPixel"; nativeBuildInputs = [ - gnustep.make - gnustep.wrapGNUstepAppsHook + wrapGNUstepAppsHook ]; buildInputs = [ - gnustep.base - gnustep.gui - gnustep.back + gnustep-back ]; # Fix the Exec and Icon paths in the .desktop file, and save the file in the diff --git a/pkgs/by-name/pi/pilipalax/package.nix b/pkgs/by-name/pi/pilipalax/package.nix index 5a7faed80834..8d9dca783f05 100644 --- a/pkgs/by-name/pi/pilipalax/package.nix +++ b/pkgs/by-name/pi/pilipalax/package.nix @@ -64,7 +64,7 @@ flutter324.buildFlutterApplication rec { homepage = "https://github.com/orz12/PiliPalaX"; mainProgram = "pilipala"; license = with lib.licenses; [ gpl3Plus ]; - maintainers = with lib.maintainers; [ aucub ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.linux; }; } diff --git a/pkgs/by-name/pi/pinact/package.nix b/pkgs/by-name/pi/pinact/package.nix index f09487dcc088..f3eae241bfc9 100644 --- a/pkgs/by-name/pi/pinact/package.nix +++ b/pkgs/by-name/pi/pinact/package.nix @@ -8,19 +8,19 @@ let pname = "pinact"; - version = "1.1.2"; + version = "1.2.0"; src = fetchFromGitHub { owner = "suzuki-shunsuke"; repo = "pinact"; tag = "v${version}"; - hash = "sha256-QBWxs0YRTWItJ1aTG33Z6vK8/vaZBTuZAVPYqD6dIvE="; + hash = "sha256-OmWt4EyUHZyQDIj1Uro+bnC29MNi6wlXO2ksRP84F2U="; }; mainProgram = "pinact"; in buildGoModule { inherit pname version src; - vendorHash = "sha256-Y44nJv0eWM0xO+lB56OBcEe/CCipPj8Ptg7WuJ2Vszo="; + vendorHash = "sha256-sZv91EYksNmMhWbT/5PUQTM2gND/8b4ORVfMNtlAI2A="; env.CGO_ENABLED = 0; diff --git a/pkgs/by-name/pi/pio/package.nix b/pkgs/by-name/pi/pio/package.nix deleted file mode 100644 index 69e9c2ff06f6..000000000000 --- a/pkgs/by-name/pi/pio/package.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ - lib, - rustPlatform, - fetchFromGitHub, - stdenv, - darwin, -}: - -rustPlatform.buildRustPackage rec { - pname = "pio"; - version = "0.4.0"; - - src = fetchFromGitHub { - owner = "siiptuo"; - repo = "pio"; - rev = version; - hash = "sha256-iR6G+G1UOT1ThLI3yhz3na1HmN6z2qUiI6NSKT0krtY="; - }; - - cargoHash = "sha256-jVOpk+Z3yEEoDexvxT9I0aVHJKVq47y8km/9ltoqrDA="; - - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Accelerate - ]; - - meta = with lib; { - description = "Utility to compress image files while maintaining quality"; - homepage = "https://github.com/siiptuo/pio"; - changelog = "https://github.com/siiptuo/pio/blob/${version}/CHANGELOG.md"; - license = licenses.agpl3Plus; - maintainers = with maintainers; [ liassica ]; - mainProgram = "pio"; - }; -} diff --git a/pkgs/by-name/pi/pixelfed/package.nix b/pkgs/by-name/pi/pixelfed/package.nix index 368501aa237d..5e648c685be7 100644 --- a/pkgs/by-name/pi/pixelfed/package.nix +++ b/pkgs/by-name/pi/pixelfed/package.nix @@ -9,16 +9,16 @@ php.buildComposerProject (finalAttrs: { pname = "pixelfed"; - version = "0.12.3"; + version = "0.12.4"; src = fetchFromGitHub { owner = "pixelfed"; repo = "pixelfed"; rev = "v${finalAttrs.version}"; - hash = "sha256-CKjqnxp7p2z/13zfp4HQ1OAmaoUtqBKS6HFm6TV8Jwg="; + hash = "sha256-HEo0BOC/AEWhCApibxo2TBQF4kbLrbPEXqDygVQlVic="; }; - vendorHash = "sha256-zjIjGkR9MCnjRho/ViqZ5EbS9MJ7OQ1kkg93jBssuZU="; + vendorHash = "sha256-QkkSnQb9haH8SiXyLSS58VXSD4op7Hr4Z6vUAAYLIic="; postInstall = '' mv "$out/share/php/${finalAttrs.pname}"/* $out diff --git a/pkgs/by-name/pk/pkgsite/package.nix b/pkgs/by-name/pk/pkgsite/package.nix index ddc1bb4e0df0..1c3de33192a4 100644 --- a/pkgs/by-name/pk/pkgsite/package.nix +++ b/pkgs/by-name/pk/pkgsite/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "pkgsite"; - version = "0-unstable-2025-01-08"; + version = "0-unstable-2025-01-21"; src = fetchFromGitHub { owner = "golang"; repo = "pkgsite"; - rev = "840de57bb85975c3c0bcb24ba00fee86ef8c0748"; - hash = "sha256-TNnZG9Q3RmB5TfHDqPCHfChsdkZ6FOErbzo47cRXhTw="; + rev = "ce52a304a0f4dccd8ae7abfdd3712c9dae7b4f34"; + hash = "sha256-6fZr9mi6SGIe7AUNv6cS6R+kBNjFbPfdamnpGclimWQ="; }; vendorHash = "sha256-Z+Ji3RO2zn5vn9DXOAxyeI4OZXGOfyVdfdIsNyJHZpE="; diff --git a/pkgs/by-name/po/podman-tui/package.nix b/pkgs/by-name/po/podman-tui/package.nix index cba37b04c3be..08e5780f2e52 100644 --- a/pkgs/by-name/po/podman-tui/package.nix +++ b/pkgs/by-name/po/podman-tui/package.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "podman-tui"; - version = "1.3.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "containers"; repo = "podman-tui"; rev = "v${version}"; - hash = "sha256-3AgPt7dRZaHrM4/y35Z5elBFq1b2ZhvwBd4CKNBbgTk="; + hash = "sha256-IO2y+im6QQ6krgYBiFxv9FSU4X6Y+s8/y5/piE1HDSo="; }; vendorHash = null; diff --git a/pkgs/by-name/po/popeye/package.nix b/pkgs/by-name/po/popeye/package.nix index f2663236f0a8..803a820f79bb 100644 --- a/pkgs/by-name/po/popeye/package.nix +++ b/pkgs/by-name/po/popeye/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "popeye"; - version = "0.21.6"; + version = "0.21.7"; src = fetchFromGitHub { rev = "v${version}"; owner = "derailed"; repo = "popeye"; - sha256 = "sha256-CX30/AzHFtHhctvLIgRNDBvrXuNUXfz2xLoBY5zIWPo="; + sha256 = "sha256-8X/L9je5TaxSx/RtPQlO/6CKd+zUIxFBfTDrNZAA2fU="; }; ldflags = [ @@ -23,7 +23,7 @@ buildGoModule rec { "-X github.com/derailed/popeye/cmd.commit=${version}" ]; - vendorHash = "sha256-YvIINp81XPMbSLCDhK9i+I4hfVXPWH19EeVXYhEXbs8="; + vendorHash = "sha256-JX9afHS76kUkOdIZZP44UjcZt69YqzW/S1JKhGxLVOw="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/po/portmod/package.nix b/pkgs/by-name/po/portmod/package.nix index a0e7d38d178c..035eaee1ed18 100644 --- a/pkgs/by-name/po/portmod/package.nix +++ b/pkgs/by-name/po/portmod/package.nix @@ -25,7 +25,8 @@ let inherit src version; pname = "portmod-rust"; - cargoHash = "sha256-sAjgGVVjgXaWbmN/eGEvatYjkHeFTZNX1GXFcJqs3GI="; + useFetchCargoVendor = true; + cargoHash = "sha256-a6brse/qXzO7H46zUrOJzyOicKPiKGISp2VhdxAVUUI="; nativeBuildInputs = [ python3Packages.python diff --git a/pkgs/by-name/po/positron-bin/package.nix b/pkgs/by-name/po/positron-bin/package.nix index 2e8143793bfc..c600d2525aeb 100644 --- a/pkgs/by-name/po/positron-bin/package.nix +++ b/pkgs/by-name/po/positron-bin/package.nix @@ -15,6 +15,7 @@ musl, nss, patchelf, + openssl, stdenv, xorg, }: @@ -48,6 +49,7 @@ stdenv.mkDerivation { musl nss stdenv.cc.cc + openssl xorg.libX11 xorg.libXcomposite xorg.libXdamage diff --git a/pkgs/by-name/po/powershell/package.nix b/pkgs/by-name/po/powershell/package.nix index a5c63c6a4a86..8d1366db9651 100644 --- a/pkgs/by-name/po/powershell/package.nix +++ b/pkgs/by-name/po/powershell/package.nix @@ -32,7 +32,7 @@ let in stdenv.mkDerivation rec { pname = "powershell"; - version = "7.4.6"; + version = "7.5.0"; src = passthru.sources.${stdenv.hostPlatform.system} @@ -96,19 +96,19 @@ stdenv.mkDerivation rec { sources = { aarch64-darwin = fetchurl { url = "https://github.com/PowerShell/PowerShell/releases/download/v${version}/powershell-${version}-osx-arm64.tar.gz"; - hash = "sha256-pILWaHh++Yw38KWnaWEH3/2z3DQMW+PRwVPsnSOQcqg="; + hash = "sha256-EHv+NRyyMdIv+qwUpgJc/s7ONzW9ff8RZwWJ/V1+49U="; }; aarch64-linux = fetchurl { url = "https://github.com/PowerShell/PowerShell/releases/download/v${version}/powershell-${version}-linux-arm64.tar.gz"; - hash = "sha256-wBWbA+hfRK4edpeBigEVWNpsgT0KroSL9awTv0NdhiQ="; + hash = "sha256-o7ah0UiXl0rqcy2ClwyG3Rf/xXpfxPS/q/4t0nL/bEA="; }; x86_64-darwin = fetchurl { url = "https://github.com/PowerShell/PowerShell/releases/download/v${version}/powershell-${version}-osx-x64.tar.gz"; - hash = "sha256-ehja7RBbfPyAv4zAB2L+eZAQXdI/lRzDLOt0RlFlDj0="; + hash = "sha256-9LxQACnZggsVxn+IXGWrvuCqlE8wV+XZng+GWMYA/Zs="; }; x86_64-linux = fetchurl { url = "https://github.com/PowerShell/PowerShell/releases/download/v${version}/powershell-${version}-linux-x64.tar.gz"; - hash = "sha256-b2AVIDxHgGxcxETBnY7QGWleYQ+9lIFUJkv5yo4VdWE="; + hash = "sha256-frsASKOACd5aWdYgoQ8z17pJIKziN5sQSmf6+3nihBs="; }; }; tests.version = testers.testVersion { diff --git a/pkgs/by-name/pr/process-viewer/package.nix b/pkgs/by-name/pr/process-viewer/package.nix index 646245950944..4dce0784aca0 100644 --- a/pkgs/by-name/pr/process-viewer/package.nix +++ b/pkgs/by-name/pr/process-viewer/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-mEmtLCtHlrCurjKKJ3vEtEkLBik4LwuUED5UeQ1QLws="; }; - cargoHash = "sha256-lgVByl+mpCDbhwlC1Eiw9ZkHIDYJsOR06Ds790pXOMc="; + useFetchCargoVendor = true; + cargoHash = "sha256-vmNqay/tYGASSez+VqyCQVMW+JGqfBvjwSKx0AG/LeY="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/desktops/gnustep/projectcenter/default.nix b/pkgs/by-name/pr/projectcenter/package.nix similarity index 85% rename from pkgs/desktops/gnustep/projectcenter/default.nix rename to pkgs/by-name/pr/projectcenter/package.nix index b93b5f073b6a..b4b54d6b1d44 100644 --- a/pkgs/desktops/gnustep/projectcenter/default.nix +++ b/pkgs/by-name/pr/projectcenter/package.nix @@ -1,18 +1,15 @@ { lib, - stdenv, + clangStdenv, fetchFromGitHub, - make, - wrapGNUstepAppsHook, - base, - back, - gui, - gorm, - gnumake, gdb, + gnumake, + gnustep-back, + gorm, + wrapGNUstepAppsHook, }: -stdenv.mkDerivation (finalAttrs: { +clangStdenv.mkDerivation (finalAttrs: { pname = "projectcenter"; version = "0.7.0"; @@ -23,20 +20,15 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-uXT2UUvMZNc6Fqi2BUXQimbZk8b3IqXzB+A2btBOmms="; }; - nativeBuildInputs = [ - make - wrapGNUstepAppsHook - ]; + nativeBuildInputs = [ wrapGNUstepAppsHook ]; # NOTE: need a patch for ProjectCenter to help it locate some necessary tools: # 1. Framework/PCProjectLauncher.m, locate gdb (say among NIX_GNUSTEP_SYSTEM_TOOLS) # 2. Framework/PCProjectBuilder.m, locate gmake (similar) propagatedBuildInputs = [ - base - back - gui - gnumake gdb + gnumake + gnustep-back gorm ]; @@ -47,8 +39,8 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "ProjectCenter"; maintainers = with lib.maintainers; [ ashalkhakov - matthewbauer dblsaiko + matthewbauer ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/by-name/pr/proton-caller/package.nix b/pkgs/by-name/pr/proton-caller/package.nix index 354181609e1a..d34045ad47da 100644 --- a/pkgs/by-name/pr/proton-caller/package.nix +++ b/pkgs/by-name/pr/proton-caller/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-srzahBMihkEP9/+7oRij5POHkCcH6QBh4kGz42Pz0nM="; }; - cargoHash = "sha256-LBXCcFqqscCGgtTzt/gr7Lz0ExT9kAWrXPuPuKzKt0E="; + useFetchCargoVendor = true; + cargoHash = "sha256-AZp6Mbm9Fg+EVr31oJe6/Z8LIwapYhos8JpZzPMiwz0="; meta = with lib; { description = "Run Windows programs with Proton"; diff --git a/pkgs/by-name/pu/pulsar/package.nix b/pkgs/by-name/pu/pulsar/package.nix index 865b2ccdab80..5f61834ddac1 100644 --- a/pkgs/by-name/pu/pulsar/package.nix +++ b/pkgs/by-name/pu/pulsar/package.nix @@ -36,14 +36,14 @@ let pname = "pulsar"; - version = "1.124.0"; + version = "1.125.0"; sourcesPath = { x86_64-linux.tarname = "Linux.${pname}-${version}.tar.gz"; - x86_64-linux.hash = "sha256-AUJczZp4kbT/eq8iUNiuPts1cfgNnw/ZkzItY74T1Zw="; + x86_64-linux.hash = "sha256-oig6VZa9JglmuKz0pysDk51RWnha61a1xUnPlqKxp/8="; aarch64-linux.tarname = "ARM.Linux.${pname}-${version}-arm64.tar.gz"; - aarch64-linux.hash = "sha256-DmbtgogNckeOCj5PibRmTBWgohQ9s06DkCuudR5nCos="; + aarch64-linux.hash = "sha256-PztDuFrwbp8it3OQEZs8GkxIVRZagp8hicvOUllSqa4="; } .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); diff --git a/pkgs/by-name/qr/qrcp/package.nix b/pkgs/by-name/qr/qrcp/package.nix index 1e965ad41bdd..7b4bee0d3be1 100644 --- a/pkgs/by-name/qr/qrcp/package.nix +++ b/pkgs/by-name/qr/qrcp/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "qrcp"; - version = "0.11.3"; + version = "0.11.4"; src = fetchFromGitHub { owner = "claudiodangelis"; repo = "qrcp"; - rev = version; - hash = "sha256-MmWBcDtZUDX5IV7XXifBp7KfeRh+0qU4vdfCoMv/UNk="; + tag = "v${version}"; + hash = "sha256-Ueow5lFnLLeJxk1+hcH4bhwrNu17pgJ50CXd2Adswvg="; }; - vendorHash = "sha256-lqGPPyoSO12MyeYIuYcqDVHukj7oR3zmHgsS6SxY3yo="; + vendorHash = "sha256-0x35Ds3v5youpSBapgkP8R7YW3FuninFM5pyd2PJRP4="; subPackages = [ "." ]; diff --git a/pkgs/by-name/qu/quartus-prime-lite/package.nix b/pkgs/by-name/qu/quartus-prime-lite/package.nix index 75ddc5450147..94c3b8c74b04 100644 --- a/pkgs/by-name/qu/quartus-prime-lite/package.nix +++ b/pkgs/by-name/qu/quartus-prime-lite/package.nix @@ -54,6 +54,7 @@ buildFHSEnv rec { xorg.libSM xorg.libXau xorg.libXdmcp + xorg.libXScrnSaver libudev0-shim bzip2 brotli diff --git a/pkgs/by-name/ra/rargs/package.nix b/pkgs/by-name/ra/rargs/package.nix deleted file mode 100644 index 1b465e5071b5..000000000000 --- a/pkgs/by-name/ra/rargs/package.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ - lib, - rustPlatform, - fetchFromGitHub, -}: - -rustPlatform.buildRustPackage rec { - pname = "rargs"; - version = "0.3.0"; - - src = fetchFromGitHub { - owner = "lotabout"; - repo = pname; - rev = "v${version}"; - sha256 = "188gj05rbivci1z4z29vwdwxlj2w01v5i4avwrxjnj1dd6mmlbxd"; - }; - - cargoHash = "sha256-cPfuABjn62Wuxtk8nQlGcLpiPe7/kqNr4IZ7+W8jzaM="; - - doCheck = false; # `rargs`'s test depends on the deprecated `assert_cli` crate, which in turn is not in Nixpkgs - - meta = with lib; { - description = "xargs + awk with pattern matching support"; - homepage = "https://github.com/lolabout/rargs"; - license = with licenses; [ mit ]; - maintainers = with maintainers; [ pblkt ]; - mainProgram = "rargs"; - }; -} diff --git a/pkgs/by-name/ra/rasm/package.nix b/pkgs/by-name/ra/rasm/package.nix index 1d40233a15d9..77081f621490 100644 --- a/pkgs/by-name/ra/rasm/package.nix +++ b/pkgs/by-name/ra/rasm/package.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "rasm"; - version = "2.3.0"; + version = "2.3.2"; src = fetchFromGitHub { owner = "EdouardBERGE"; repo = "rasm"; rev = "v${version}"; - hash = "sha256-xDiGVPXi12P2YzSESO4I4WGeQgWU9UPhJbenoN8sADc="; + hash = "sha256-vuOI29VMTBWIyP7jRIwYbXKWf9ijg8HqLhMEj1R9iQQ="; }; # by default the EXEC variable contains `rasm.exe` diff --git a/pkgs/by-name/re/refine/package.nix b/pkgs/by-name/re/refine/package.nix index 3edc02195dc3..bfad38b7fcd8 100644 --- a/pkgs/by-name/re/refine/package.nix +++ b/pkgs/by-name/re/refine/package.nix @@ -95,9 +95,6 @@ python3Packages.buildPythonApplication rec { mainProgram = "refine"; platforms = lib.platforms.linux; license = with lib.licenses; [ gpl3Plus ]; - maintainers = with lib.maintainers; [ - getchoo - aucub - ]; + maintainers = with lib.maintainers; [ getchoo ]; }; } diff --git a/pkgs/by-name/re/reindeer/package.nix b/pkgs/by-name/re/reindeer/package.nix index b115c57a6a75..b5bd2b651403 100644 --- a/pkgs/by-name/re/reindeer/package.nix +++ b/pkgs/by-name/re/reindeer/package.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "reindeer"; - version = "2025.01.06.00"; + version = "2025.01.20.00"; src = fetchFromGitHub { owner = "facebookincubator"; repo = "reindeer"; tag = "v${version}"; - hash = "sha256-3Wa10eLlvOXw8DZAwQiCTGFOcUEsHvYhl6OTEYsCdZ8="; + hash = "sha256-dmx9FPgyVz5s32peKTg4xA72JD7X2R9ks8HSna3msmA="; }; - cargoHash = "sha256-UI70YLTR/+fKh+4wD2hZJyuzN4ZNUCkrhyf9CRepetA="; + cargoHash = "sha256-cZ4Xs2EdajbGLE5c+KzUGH94dJvHpHRDyCISFm/B7qc="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/re/remnote/package.nix b/pkgs/by-name/re/remnote/package.nix index 761efd08df0a..55a1608067d2 100644 --- a/pkgs/by-name/re/remnote/package.nix +++ b/pkgs/by-name/re/remnote/package.nix @@ -6,10 +6,10 @@ }: let pname = "remnote"; - version = "1.18.28"; + version = "1.18.39"; src = fetchurl { url = "https://download2.remnote.io/remnote-desktop2/RemNote-${version}.AppImage"; - hash = "sha256-ixKZwwqk93pc8N+DJe2H7oyjf0+u7kQRDRFOm2VbJZs="; + hash = "sha256-YDRXXS0nNiPdchcCUiKD0pE4duE0LFzdZ5GkYcddsD8="; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; in diff --git a/pkgs/by-name/re/renode-unstable/package.nix b/pkgs/by-name/re/renode-unstable/package.nix index 9aeeecaa1c4b..a1b0b6a9896c 100644 --- a/pkgs/by-name/re/renode-unstable/package.nix +++ b/pkgs/by-name/re/renode-unstable/package.nix @@ -7,11 +7,11 @@ renode.overrideAttrs ( finalAttrs: _: { pname = "renode-unstable"; - version = "1.15.3+20250109git606a24e00"; + version = "1.15.3+20250121git0a17b4a64"; src = fetchurl { url = "https://builds.renode.io/renode-${finalAttrs.version}.linux-dotnet.tar.gz"; - hash = "sha256-ZA52irUSACBBLkJ1o75SHVFIxlaNQV25VTcUfjv6bPk="; + hash = "sha256-8RQaupK2mk79JQK4wLknuE9KLPF7tkrIjptwLr9VH1c="; }; passthru.updateScript = diff --git a/pkgs/by-name/re/retrospy/package.nix b/pkgs/by-name/re/retrospy/package.nix index 68bedc968f87..8f0f3b81fd4e 100644 --- a/pkgs/by-name/re/retrospy/package.nix +++ b/pkgs/by-name/re/retrospy/package.nix @@ -8,13 +8,13 @@ runCommandLocal, }: let - version = "6.6"; + version = "6.7"; src = fetchFromGitHub { owner = "retrospy"; repo = "RetroSpy"; rev = "v${version}"; - hash = "sha256-vYhFpmP9CmZz/lqNwNAvpf7pQnhKR/pdetPJqorUtMY="; + hash = "sha256-L16LezV9z7pCRcXKv+KfGTCbCQfBd3y3dUidNeJUznQ="; }; executables = [ @@ -76,5 +76,6 @@ buildDotnetModule { license = lib.licenses.gpl3; maintainers = [ lib.maintainers.naxdy ]; platforms = lib.platforms.linux; + mainProgram = "RetroSpy"; }; } diff --git a/pkgs/by-name/rg/rgbds/package.nix b/pkgs/by-name/rg/rgbds/package.nix index 6b0aec7123ef..f1cae1551f33 100644 --- a/pkgs/by-name/rg/rgbds/package.nix +++ b/pkgs/by-name/rg/rgbds/package.nix @@ -10,12 +10,12 @@ stdenv.mkDerivation rec { pname = "rgbds"; - version = "0.8.0"; + version = "0.9.0"; src = fetchFromGitHub { owner = "gbdev"; repo = "rgbds"; rev = "v${version}"; - hash = "sha256-rSPYnbZjCoAKJBNCJCKsLBenolOzS78Zm850BJ8mKhA="; + hash = "sha256-njJ7g7hgaiahpeeDHrv9nYvWZp51Fl10CsV36ldBpf0="; }; nativeBuildInputs = [ bison diff --git a/pkgs/by-name/ri/riemann/package.nix b/pkgs/by-name/ri/riemann/package.nix index 915f8319dd0f..fc3b0d07ff3c 100644 --- a/pkgs/by-name/ri/riemann/package.nix +++ b/pkgs/by-name/ri/riemann/package.nix @@ -35,6 +35,6 @@ stdenv.mkDerivation rec { sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.epl10; platforms = platforms.all; - maintainers = [ ]; + maintainers = with maintainers; [ crimeminister ]; }; } diff --git a/pkgs/by-name/rn/rnix-hashes/package.nix b/pkgs/by-name/rn/rnix-hashes/package.nix deleted file mode 100644 index 12144247e290..000000000000 --- a/pkgs/by-name/rn/rnix-hashes/package.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ - lib, - rustPlatform, - fetchFromGitHub, - fetchpatch, -}: - -rustPlatform.buildRustPackage rec { - pname = "rnix-hashes"; - version = "0.2.0"; - - src = fetchFromGitHub { - owner = "numtide"; - repo = pname; - rev = "v${version}"; - sha256 = "SzHyG5cEjaaPjTkn8puht6snjHMl8DtorOGDjxakJfA="; - }; - - patches = [ - # fix test failure - (fetchpatch { - url = "https://github.com/numtide/rnix-hashes/commit/62ab96cfd1efeade7d98efd9829eae8677bac9cc.patch"; - sha256 = "sha256-oE2fBt20FmO2cEUGivu2mKo3z6rbhVLXSF8SRvhibFs="; - }) - ]; - - cargoHash = "sha256-p6W9NtOKzVViyFq5SQvnIsik7S3mqUqxI/05OiC+P+Q="; - - meta = with lib; { - description = "Nix Hash Converter"; - mainProgram = "rnix-hashes"; - homepage = "https://github.com/numtide/rnix-hashes"; - license = licenses.asl20; - maintainers = with maintainers; [ - rizary - SuperSandro2000 - ]; - }; -} diff --git a/pkgs/by-name/rn/rnr/package.nix b/pkgs/by-name/rn/rnr/package.nix index cc9d7683f96b..8950e2667224 100644 --- a/pkgs/by-name/rn/rnr/package.nix +++ b/pkgs/by-name/rn/rnr/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "rnr"; - version = "0.4.2"; + version = "0.5.0"; src = fetchFromGitHub { owner = "ismaelgv"; repo = pname; rev = "v${version}"; - sha256 = "sha256-g/PnvOZzlWzEHf3vvYANeJ2ogQ/6duNzhlKpKMBoBFU="; + sha256 = "sha256-uuM8zh0wFSsySedXmdm8WGGR4HmUc5TCZ6socdztrZI="; }; - cargoHash = "sha256-+oDRNBQ03MknhcTpZFKt0ipJY43LPOKbGF014rrs6dw="; + cargoHash = "sha256-R+4BvRCWYWVV2oT9+vifWvnoWEglfVMeFCPM0AjMQPE="; meta = with lib; { description = "Command-line tool to batch rename files and directories"; diff --git a/pkgs/by-name/ro/roddhjav-apparmor-rules/package.nix b/pkgs/by-name/ro/roddhjav-apparmor-rules/package.nix index a44b23c8407f..e25a4fd87a55 100644 --- a/pkgs/by-name/ro/roddhjav-apparmor-rules/package.nix +++ b/pkgs/by-name/ro/roddhjav-apparmor-rules/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation { pname = "roddhjav-apparmor-rules"; - version = "0-unstable-2025-01-12"; + version = "0-unstable-2025-01-25"; src = fetchFromGitHub { owner = "roddhjav"; repo = "apparmor.d"; - rev = "f1182b27bb64a3bf44e92a4bafb58178ebfbf5ac"; - hash = "sha256-3Ofv7Eam2/CXRNM84E0H97RrLWQEzDeSM6wYykzlLAM="; + rev = "de690ab878200fe0727571aeb97ff06d08323a64"; + hash = "sha256-nV8RgielAjYqOGZ/5SpGOupsb770jnrehTn0S1R3hQ4="; }; dontConfigure = true; diff --git a/pkgs/by-name/ro/roslyn-ls/cachedirectory.patch b/pkgs/by-name/ro/roslyn-ls/cachedirectory.patch new file mode 100644 index 000000000000..23aec8aa8af1 --- /dev/null +++ b/pkgs/by-name/ro/roslyn-ls/cachedirectory.patch @@ -0,0 +1,13 @@ +diff --git a/src/LanguageServer/Microsoft.CodeAnalysis.LanguageServer/Program.cs b/src/LanguageServer/Microsoft.CodeAnalysis.LanguageServer/Program.cs +index 5c80f55e9dd..17373f36ebf 100644 +--- a/src/LanguageServer/Microsoft.CodeAnalysis.LanguageServer/Program.cs ++++ b/src/LanguageServer/Microsoft.CodeAnalysis.LanguageServer/Program.cs +@@ -97,7 +97,7 @@ static async Task RunAsync(ServerConfiguration serverConfiguration, Cancellation + var assemblyLoader = new CustomExportAssemblyLoader(extensionManager, loggerFactory); + var typeRefResolver = new ExtensionTypeRefResolver(assemblyLoader, loggerFactory); + +- var cacheDirectory = Path.Combine(Path.GetDirectoryName(typeof(Program).Assembly.Location)!, "cache"); ++ var cacheDirectory = Path.Combine(Environment.GetEnvironmentVariable("XDG_CACHE_HOME") ?? Path.Combine(Environment.GetEnvironmentVariable("HOME")!, ".cache"), "roslyn"); + + using var exportProvider = await ExportProviderBuilder.CreateExportProviderAsync(extensionManager, assemblyLoader, serverConfiguration.DevKitDependencyPath, cacheDirectory, loggerFactory); + diff --git a/pkgs/by-name/ro/roslyn-ls/package.nix b/pkgs/by-name/ro/roslyn-ls/package.nix index 52fe26f065cd..6e01757f5149 100644 --- a/pkgs/by-name/ro/roslyn-ls/package.nix +++ b/pkgs/by-name/ro/roslyn-ls/package.nix @@ -50,9 +50,14 @@ buildDotnetModule rec { nativeBuildInputs = [ jq ]; - # until upstream updates net6.0 here: - # https://github.com/dotnet/roslyn/blob/6cc106c0eaa9b0ae070dba3138a23aeab9b50c13/eng/targets/TargetFrameworks.props#L20 - patches = [ ./force-sdk_8_0.patch ]; + patches = [ + # until upstream updates net6.0 here: + # https://github.com/dotnet/roslyn/blob/6cc106c0eaa9b0ae070dba3138a23aeab9b50c13/eng/targets/TargetFrameworks.props#L20 + ./force-sdk_8_0.patch + # until made configurable/and or different location + # https://github.com/dotnet/roslyn/issues/76892 + ./cachedirectory.patch + ]; postPatch = '' # Upstream uses rollForward = latestPatch, which pins to an *exact* .NET SDK version. diff --git a/pkgs/by-name/ro/routinator/package.nix b/pkgs/by-name/ro/routinator/package.nix index 63b88774c790..b887bc6b4bc5 100644 --- a/pkgs/by-name/ro/routinator/package.nix +++ b/pkgs/by-name/ro/routinator/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "routinator"; - version = "0.14.0"; + version = "0.14.1"; src = fetchFromGitHub { owner = "NLnetLabs"; repo = pname; rev = "v${version}"; - hash = "sha256-SUcAhXIPgYGFkUIgSrUJrxwWQvkkmWG/d12hv8+PQI0="; + hash = "sha256-6wYNuGSB55ozzPEbptfEEp/euzh/IRfNrdREWF0xGTU="; }; - cargoHash = "sha256-1JxAbQPCQqDVry3wGIdY4q18rzCXlJ7Dnc8LIvhkW1g="; + cargoHash = "sha256-2fyfiwShxsz61nFTNfzjrbClnzIgjQP+kGHgZSB534I="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk.frameworks; diff --git a/pkgs/by-name/rp/rpl/package.nix b/pkgs/by-name/rp/rpl/package.nix index 099d34f37cb2..1185ec4c2f2a 100644 --- a/pkgs/by-name/rp/rpl/package.nix +++ b/pkgs/by-name/rp/rpl/package.nix @@ -6,13 +6,13 @@ python3Packages.buildPythonApplication rec { pname = "rpl"; - version = "1.16"; + version = "1.16.1"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-uBpzKYfdGu2j1ZEaw4TN1fH+W9VLrJf7a87vzZBBU3Y="; + hash = "sha256-VTm4KU59Yk501tUdVn4z3bFx9Ot00CDL9HGlf44/t44="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/rq/rqlite/package.nix b/pkgs/by-name/rq/rqlite/package.nix index 1c564dfc3732..c3f5a37c4819 100644 --- a/pkgs/by-name/rq/rqlite/package.nix +++ b/pkgs/by-name/rq/rqlite/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "rqlite"; - version = "8.36.5"; + version = "8.36.8"; src = fetchFromGitHub { owner = "rqlite"; repo = pname; rev = "v${version}"; - sha256 = "sha256-T5pyec+sS3hBlQTUevIP3v8vlxZEFMSFN7doJliTUCg="; + sha256 = "sha256-fyhBKSPE9vAMe1g7IOjrk8u3+KhMgtVrwKRZA+DsGik="; }; vendorHash = "sha256-+otWcVUAqO2e9v+4T5QTw2DOVfDUGu6hP/1/6LO21nY="; diff --git a/pkgs/by-name/rs/rs-git-fsmonitor/package.nix b/pkgs/by-name/rs/rs-git-fsmonitor/package.nix deleted file mode 100644 index 77ebac70578a..000000000000 --- a/pkgs/by-name/rs/rs-git-fsmonitor/package.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ - lib, - fetchFromGitHub, - rustPlatform, - makeWrapper, - watchman, -}: - -rustPlatform.buildRustPackage rec { - pname = "rs-git-fsmonitor"; - version = "0.1.3"; - - src = fetchFromGitHub { - owner = "jgavris"; - repo = pname; - rev = "v${version}"; - sha256 = "021vdk5i7yyrnh4apn0gnsh6ycnx15wm3g2jrfsg7fycnq8167wc"; - }; - - cargoHash = "sha256-Vi8PUy6Qgp03SghtCneDxwE8vbt7uGClfOCayDq0pUM="; - - nativeBuildInputs = [ makeWrapper ]; - - fixupPhase = '' - wrapProgram $out/bin/rs-git-fsmonitor --prefix PATH ":" "${lib.makeBinPath [ watchman ]}" ; - ''; - - meta = with lib; { - description = "Fast git core.fsmonitor hook written in Rust"; - homepage = "https://github.com/jgavris/rs-git-fsmonitor"; - license = licenses.mit; - maintainers = [ ]; - mainProgram = "rs-git-fsmonitor"; - }; -} diff --git a/pkgs/by-name/rw/rwpspread/package.nix b/pkgs/by-name/rw/rwpspread/package.nix index 84bd7da27912..797d19957ed2 100644 --- a/pkgs/by-name/rw/rwpspread/package.nix +++ b/pkgs/by-name/rw/rwpspread/package.nix @@ -9,15 +9,15 @@ rustPlatform.buildRustPackage rec { pname = "rwpspread"; - version = "0.3.1"; + version = "0.4.0"; src = fetchFromGitHub { owner = "0xk1f0"; repo = "rwpspread"; rev = "v${version}"; - hash = "sha256-ivxu1UsQLUm017A5Za82+l1bQoYA/TF/I1BwUQD3dWo="; + hash = "sha256-1i1675OiyleCXcc/uN95kyY7m5ht/rS3UKY7EmuSsrk="; }; - cargoHash = "sha256-pIsSH8cQYyG7v7z4O2R80kA4QHvKyTajBfqmRXjuQW8="; + cargoHash = "sha256-5e/Fj/8wfWrl0b4WRDmX/BOBfeCrlN+mq3c0Qz7MQPE="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/sa/saber/package.nix b/pkgs/by-name/sa/saber/package.nix index 9bbd7e2c4c97..15f533a890b7 100644 --- a/pkgs/by-name/sa/saber/package.nix +++ b/pkgs/by-name/sa/saber/package.nix @@ -55,7 +55,7 @@ flutter327.buildFlutterApplication rec { homepage = "https://github.com/saber-notes/saber"; mainProgram = "saber"; license = with lib.licenses; [ gpl3Plus ]; - maintainers = with lib.maintainers; [ aucub ]; + maintainers = with lib.maintainers; [ ]; platforms = [ "aarch64-linux" "x86_64-linux" diff --git a/pkgs/by-name/sa/saucectl/package.nix b/pkgs/by-name/sa/saucectl/package.nix index 90316753a265..27551c557dff 100644 --- a/pkgs/by-name/sa/saucectl/package.nix +++ b/pkgs/by-name/sa/saucectl/package.nix @@ -5,7 +5,7 @@ }: let pname = "saucectl"; - version = "0.190.1"; + version = "0.191.0"; in buildGoModule { inherit pname version; @@ -14,7 +14,7 @@ buildGoModule { owner = "saucelabs"; repo = "saucectl"; tag = "v${version}"; - hash = "sha256-I1W7hAirtyLppJfM1gdzho3VU9rgFDt6j1dexGIHkXg="; + hash = "sha256-cOgjNoJwcNu04YNqjeVaGIVauApYhFjLTa34HXV78sg="; }; ldflags = [ diff --git a/pkgs/by-name/sb/sbt-extras/package.nix b/pkgs/by-name/sb/sbt-extras/package.nix index 5869d095fb37..a3e052c16e93 100644 --- a/pkgs/by-name/sb/sbt-extras/package.nix +++ b/pkgs/by-name/sb/sbt-extras/package.nix @@ -18,14 +18,14 @@ stdenv.mkDerivation rec { pname = "sbt-extras"; - rev = "408f74841b90169a7f674955389212e2d02f7f4d"; - version = "2024-09-28"; + rev = "e16dab993203b611b9592ddae7b8822a68ae16ec"; + version = "2024-11-06"; src = fetchFromGitHub { owner = "paulp"; repo = "sbt-extras"; inherit rev; - sha256 = "2iXNs2Ks54Gj6T6PR5AtWrmR9uUxgFScAfek2v+qdTo="; + sha256 = "Z9bN+gmWiomWnp94pMXf5+Bksl6OejIPbYUGfVrDxJQ="; }; dontBuild = true; diff --git a/pkgs/by-name/se/serial-unit-testing/package.nix b/pkgs/by-name/se/serial-unit-testing/package.nix deleted file mode 100644 index 9971033ea0b6..000000000000 --- a/pkgs/by-name/se/serial-unit-testing/package.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ - lib, - rustPlatform, - fetchFromGitHub, - pkg-config, - udev, -}: - -rustPlatform.buildRustPackage rec { - pname = "serial-unit-testing"; - version = "0.2.4"; - - src = fetchFromGitHub { - owner = "markatk"; - repo = "serial-unit-testing"; - rev = "v${version}"; - hash = "sha256-SLwTwEQdwbus9RFskFjU8m4fS9Pnp8HsgnKkBvTqmSI="; - }; - - cargoHash = "sha256-PoV2v0p0L3CTtC9VMAx2Z/ZsSAIFi2gh2TtOp64S6ZQ="; - - nativeBuildInputs = [ - pkg-config - ]; - - buildInputs = [ - udev - ]; - - # tests require a serial port - doCheck = false; - - meta = with lib; { - description = "Automate testing of serial communication with any serial port device"; - homepage = "https://github.com/markatk/serial-unit-testing"; - changelog = "https://github.com/markatk/serial-unit-testing/blob/v${version}/CHANGELOG.md"; - license = licenses.mit; - maintainers = with maintainers; [ rudolfvesely ]; - mainProgram = "sut"; - }; -} diff --git a/pkgs/by-name/sh/shader-slang/package.nix b/pkgs/by-name/sh/shader-slang/package.nix index a37c211cb91e..c4287d676979 100644 --- a/pkgs/by-name/sh/shader-slang/package.nix +++ b/pkgs/by-name/sh/shader-slang/package.nix @@ -28,13 +28,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "shader-slang"; - version = "2025.3"; + version = "2025.3.1"; src = fetchFromGitHub { owner = "shader-slang"; repo = "slang"; tag = "v${finalAttrs.version}"; - hash = "sha256-kEW36pAo10xm3qY47hXTAjiXF74qa5rfDlQ6/gcGHqs="; + hash = "sha256-YOZukHgXTgKyTp2b3Z0hwkipCwAkNoFlgVZfDlq1lz8="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/sh/shaka-packager/package.nix b/pkgs/by-name/sh/shaka-packager/package.nix index ec32bda90ddc..f893540846c5 100644 --- a/pkgs/by-name/sh/shaka-packager/package.nix +++ b/pkgs/by-name/sh/shaka-packager/package.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "shaka-packager"; - version = "3.4.1"; + version = "3.4.2"; src = fetchFromGitHub { owner = "shaka-project"; repo = "shaka-packager"; tag = "v${finalAttrs.version}"; - hash = "sha256-xXKgL8sUP+meFXV9S/i7dao7BIkIx+e/ujjpew7xGL0="; + hash = "sha256-Syty10LHGIlP5Jw+UneQMN+wBz/ggvV0xV8+3ThU8SM="; }; patches = [ diff --git a/pkgs/by-name/sh/shavee/package.nix b/pkgs/by-name/sh/shavee/package.nix index a34066fb8800..d914497ce3c2 100644 --- a/pkgs/by-name/sh/shavee/package.nix +++ b/pkgs/by-name/sh/shavee/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-41wJ3QBZdmCl7v/6JetXhzH2zF7tsKYMKZY1cKhByX8="; }; - cargoHash = "sha256-tnIqhZpqdy8pV4L6KF5v19ufpWRpMX5gTPlWWbwB3RU="; + useFetchCargoVendor = true; + cargoHash = "sha256-IGMEl/iK25WMkkLgbT7pCfppAf3GCvyBk1NrqMDtbUA="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/sh/shell-hist/package.nix b/pkgs/by-name/sh/shell-hist/package.nix deleted file mode 100644 index f906d7a9b810..000000000000 --- a/pkgs/by-name/sh/shell-hist/package.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ - lib, - fetchFromGitHub, - rustPlatform, -}: - -rustPlatform.buildRustPackage { - pname = "shell-hist"; - version = "0.1.0"; - - src = fetchFromGitHub { - owner = "jamesmunns"; - repo = "shell-hist"; - rev = "158de8c3908b49530ecd76bf6e65c210f351ef82"; - sha256 = "0kc128xnnp1d56if70vfv0w3qnwhljhbnvzwwb7hfm3x2m0vqrqf"; - }; - - cargoHash = "sha256-V/smviEa7b+2vyY2dn9MpbITnXw0HpOtPF/RPYB2TKw="; - - meta = with lib; { - description = "Inspect your shell history"; - homepage = "https://github.com/jamesmunns/shell-hist"; - license = with licenses; [ - mit # or - asl20 - ]; - maintainers = [ maintainers.spacekookie ]; - mainProgram = "shell-hist"; - }; -} diff --git a/pkgs/by-name/sh/showmethekey/package.nix b/pkgs/by-name/sh/showmethekey/package.nix index 1af1969bb012..3281b3b5a123 100644 --- a/pkgs/by-name/sh/showmethekey/package.nix +++ b/pkgs/by-name/sh/showmethekey/package.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "showmethekey"; - version = "1.18.0"; + version = "1.18.1"; src = fetchFromGitHub { owner = "AlynxZhou"; repo = "showmethekey"; tag = "v${version}"; - hash = "sha256-D8eh0Wun3bm5k2kuCgaEAR33O6i4aowifd1b0tSWV64="; + hash = "sha256-/pfXAn6dWFIHsP1VBj+Cf989RuVzv4IbSClbJEvGstI="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/sh/shticker-book-unwritten/unwrapped.nix b/pkgs/by-name/sh/shticker-book-unwritten/unwrapped.nix index 527564a0d219..b82c88c2af5e 100644 --- a/pkgs/by-name/sh/shticker-book-unwritten/unwrapped.nix +++ b/pkgs/by-name/sh/shticker-book-unwritten/unwrapped.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-jI2uL8tMUmjZ5jPkCV2jb98qtKwi9Ti4NVCPfuO3iB4="; }; - cargoHash = "sha256-Tney9SG9MZh7AUIT1h/dlgJyRrSPX7mUhfsKD1Rfsfc="; + useFetchCargoVendor = true; + cargoHash = "sha256-0eumZoAL8/nkeFS+sReCAYKHiXiqZHfdC/9Ao5U6/SQ="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/si/simple-live-app/package.nix b/pkgs/by-name/si/simple-live-app/package.nix index 9186f1f6a5d6..390c98dc1ce6 100644 --- a/pkgs/by-name/si/simple-live-app/package.nix +++ b/pkgs/by-name/si/simple-live-app/package.nix @@ -119,7 +119,7 @@ flutter324.buildFlutterApplication rec { homepage = "https://github.com/xiaoyaocz/dart_simple_live"; mainProgram = "simple_live_app"; license = with lib.licenses; [ gpl3Plus ]; - maintainers = with lib.maintainers; [ aucub ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.linux; }; } diff --git a/pkgs/by-name/sk/skim/package.nix b/pkgs/by-name/sk/skim/package.nix index 8a2468a6b8c2..00ef53d2315d 100644 --- a/pkgs/by-name/sk/skim/package.nix +++ b/pkgs/by-name/sk/skim/package.nix @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec { pname = "skim"; - version = "0.15.7"; + version = "0.16.0"; outputs = [ "out" @@ -24,14 +24,14 @@ rustPlatform.buildRustPackage rec { owner = "skim-rs"; repo = "skim"; tag = "v${version}"; - hash = "sha256-vUKHyrvCGtRKziUqgIbgVP7YdH+UW3PFBECV/mo5RxY="; + hash = "sha256-6enC7LjhYuHQ2XyjcsuEDM0r3qMWE9MUuDvYGMswmOc="; }; postPatch = '' sed -i -e "s|expand(':h:h')|'$out'|" plugin/skim.vim ''; - cargoHash = "sha256-/tfbhNlpx96jlzUYwbucXi+pk1IE2jqxgWYjNU+4mHg="; + cargoHash = "sha256-3IAft5ZP9da62SIBg2SmikirCAUgicmFUmkcI6yeWV8="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/sl/slurm/package.nix b/pkgs/by-name/sl/slurm/package.nix index 7ef1c4b6aa8c..97b3a45c535c 100644 --- a/pkgs/by-name/sl/slurm/package.nix +++ b/pkgs/by-name/sl/slurm/package.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { pname = "slurm"; - version = "24.11.0.1"; + version = "24.11.1.1"; # N.B. We use github release tags instead of https://www.schedmd.com/downloads.php # because the latter does not keep older releases. @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { repo = "slurm"; # The release tags use - instead of . rev = "${pname}-${builtins.replaceStrings [ "." ] [ "-" ] version}"; - hash = "sha256-waUCyzLCK3NRp8DfkvzWjGjzlB1MIZ7N9X+nfjrdAFY="; + hash = "sha256-0Vev64P0nx0M/fW4XOX/bR92RJNBuQyWggaNeoE6SN0="; }; outputs = [ diff --git a/pkgs/by-name/sl/sly/package.nix b/pkgs/by-name/sl/sly/package.nix index 82fd9823285f..e71d3e3cc21d 100644 --- a/pkgs/by-name/sl/sly/package.nix +++ b/pkgs/by-name/sl/sly/package.nix @@ -28,7 +28,7 @@ flutter.buildFlutterApplication { homepage = "https://github.com/kra-mo/sly"; mainProgram = "sly"; license = with lib.licenses; [ gpl3Plus ]; - maintainers = with lib.maintainers; [ aucub ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.linux; }; } diff --git a/pkgs/by-name/sn/snapraid/package.nix b/pkgs/by-name/sn/snapraid/package.nix index 0eae0f1a899d..dc9e35aca1ff 100644 --- a/pkgs/by-name/sn/snapraid/package.nix +++ b/pkgs/by-name/sn/snapraid/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "snapraid"; - version = "12.3"; + version = "12.4"; src = fetchFromGitHub { owner = "amadvance"; repo = "snapraid"; rev = "v${version}"; - hash = "sha256-pkLooA3JZV/rPlE5+JeJN1QW2xAdNu7c/iFFtT4M4vc="; + hash = "sha256-7guTRH9AZCsQYyWLpws19/sEe9GVFop21GYPzXCK6Fg="; }; VERSION = version; diff --git a/pkgs/by-name/so/socalabs-sid/package.nix b/pkgs/by-name/so/socalabs-sid/package.nix new file mode 100644 index 000000000000..516bf9c903aa --- /dev/null +++ b/pkgs/by-name/so/socalabs-sid/package.nix @@ -0,0 +1,171 @@ +{ + stdenv, + fetchFromGitHub, + lib, + cmake, + pkg-config, + alsa-lib, + copyDesktopItems, + makeDesktopItem, + xorg, + freetype, + expat, + libGL, + libjack2, + curl, + webkitgtk_4_0, + libsysprof-capture, + pcre2, + util-linux, + libselinux, + libsepol, + libthai, + libxkbcommon, + libdatrie, + libepoxy, + libsoup_2_4, + lerc, + sqlite, + ninja, + # Disable VST building by default, since NixOS doesn't have a VST license + enableVST2 ? false, +}: +stdenv.mkDerivation { + pname = "socalabs-sid"; + version = "1.1.0"; + + src = + (fetchFromGitHub { + owner = "FigBug"; + repo = "SID"; + rev = "bb826fdea39da0804c53d81d35bea29aeff4436d"; + hash = "sha256-6IStysItOS7EltTCqdyo9vrsnSA1YYoN4y8Bjv1fhNk="; + fetchSubmodules = true; + }).overrideAttrs + (_: { + GIT_CONFIG_COUNT = 1; + GIT_CONFIG_KEY_0 = "url.https://github.com/.insteadOf"; + GIT_CONFIG_VALUE_0 = "git@github.com:"; + }); + + desktopItems = [ + (makeDesktopItem { + type = "Application"; + name = "socalabs-sid"; + desktopName = "Socalabs SID"; + comment = "Socalabs Commodore 64 SID Emulation Plugin (Standalone)"; + icon = "SID"; + exec = "SID"; + categories = [ + "Audio" + "AudioVideo" + ]; + }) + ]; + + nativeBuildInputs = [ + cmake + pkg-config + copyDesktopItems + ninja + ]; + + buildInputs = [ + alsa-lib + xorg.libX11 + xorg.libXcomposite + xorg.libXcursor + xorg.libXinerama + xorg.libXrandr + xorg.libXtst + xorg.libXdmcp + xorg.xvfb + libGL + libjack2 + libsysprof-capture + libselinux + libsepol + libthai + libxkbcommon + libdatrie + libepoxy + libsoup_2_4 + lerc + freetype + curl + webkitgtk_4_0 + pcre2 + util-linux + sqlite + expat + ]; + + cmakeFlags = [ + (lib.cmakeBool "JUCE_COPY_PLUGIN_AFTER_BUILD" false) + "--preset ninja-gcc" + ]; + + patchPhase = '' + substituteInPlace CMakeLists.txt \ + --replace-fail 'FORMATS Standalone VST VST3 AU LV2' 'FORMATS Standalone ${lib.optionalString enableVST2 "VST"} VST3 LV2' + + # we need to patch JUCE itself to enable jack MIDI support + # please https://github.com/juce-framework/JUCE/issues/952 + # TODO: remove when juce updates :D + substituteInPlace modules/juce/modules/juce_audio_devices/native/juce_Midi_linux.cpp \ + --replace-fail "port = client.createPort (portName, forInput, false);" "port = client.createPort (portName, forInput, true);" + ''; + + cmakeBuildType = "Release"; + + strictDeps = true; + + preBuild = '' + # build takes 10 years without this set + HOME=(mktemp -d) + + cd ../Builds/ninja-gcc + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/lib/vst3 $out/lib/lv2 $out/bin + + ${lib.optionalString enableVST2 '' + mkdir -p $out/lib/vst + cp -r SID_artefacts/Release/VST/libSID.so $out/lib/vst + ''} + + cp -r SID_artefacts/Release/LV2/SID.lv2 $out/lib/lv2 + cp -r SID_artefacts/Release/VST3/SID.vst3 $out/lib/vst3 + + install -Dm755 SID_artefacts/Release/Standalone/SID $out/bin + + install -Dm444 $src/plugin/Resources/icon.png $out/share/pixmaps/SID.png + + runHook postInstall + ''; + + NIX_LDFLAGS = ( + toString [ + "-lX11" + "-lXext" + "-lXcomposite" + "-lXcursor" + "-lXinerama" + "-lXrandr" + "-lXtst" + "-lXdmcp" + ] + ); + + meta = { + description = "Socalabs Commodore 64 SID Emulation Plugin"; + homepage = "https://socalabs.com/synths/commodore-64-sid/"; + mainProgram = "SID"; + platforms = lib.platforms.linux; + license = [ lib.licenses.gpl3 ] ++ lib.optional enableVST2 lib.licenses.unfree; + maintainers = [ lib.maintainers.l1npengtul ]; + }; +} diff --git a/pkgs/by-name/so/sogo/package.nix b/pkgs/by-name/so/sogo/package.nix index 4cd51f1307a0..d4d663c5e9ba 100644 --- a/pkgs/by-name/so/sogo/package.nix +++ b/pkgs/by-name/so/sogo/package.nix @@ -1,9 +1,12 @@ -{ gnustep, lib, fetchFromGitHub, makeWrapper, python3, lndir, libxcrypt +{ lib, clangStdenv, fetchFromGitHub, makeWrapper, python3, lndir, libxcrypt , openssl, openldap, sope, libmemcached, curl, libsodium, libytnef, libzip, pkg-config, nixosTests , oath-toolkit +, gnustep-make +, gnustep-base , enableActiveSync ? false , libwbxml }: -gnustep.stdenv.mkDerivation rec { + +clangStdenv.mkDerivation rec { pname = "sogo"; version = "5.11.2"; @@ -15,8 +18,8 @@ gnustep.stdenv.mkDerivation rec { hash = "sha256-c+547x7ugYoLMgGVLcMmmb9rzquRJOv8n+Js2CuE7I0="; }; - nativeBuildInputs = [ gnustep.make makeWrapper python3 pkg-config ]; - buildInputs = [ gnustep.base sope openssl libmemcached curl libsodium libytnef libzip openldap oath-toolkit libxcrypt ] + nativeBuildInputs = [ makeWrapper python3 pkg-config ]; + buildInputs = [ gnustep-base sope openssl libmemcached curl libsodium libytnef libzip openldap oath-toolkit libxcrypt ] ++ lib.optional enableActiveSync libwbxml; patches = lib.optional enableActiveSync ./enable-activesync.patch; @@ -33,7 +36,7 @@ gnustep.stdenv.mkDerivation rec { # Move all GNUStep makefiles to a common directory mkdir -p makefiles - cp -r {${gnustep.make},${sope}}/share/GNUstep/Makefiles/* makefiles + cp -r {${gnustep-make},${sope}}/share/GNUstep/Makefiles/* makefiles # Modify the search path for GNUStep makefiles find . -type f -name GNUmakefile -exec sed -i "s:\\$.GNUSTEP_MAKEFILES.:$PWD/makefiles:g" {} + @@ -50,11 +53,11 @@ gnustep.stdenv.mkDerivation rec { preFixup = '' # Create gnustep.conf mkdir -p $out/share/GNUstep - cp ${gnustep.make}/etc/GNUstep/GNUstep.conf $out/share/GNUstep/ - sed -i "s:${gnustep.make}:$out:g" $out/share/GNUstep/GNUstep.conf + cp ${gnustep-make}/etc/GNUstep/GNUstep.conf $out/share/GNUstep/ + sed -i "s:${gnustep-make}:$out:g" $out/share/GNUstep/GNUstep.conf # Link in GNUstep base - ${lndir}/bin/lndir ${lib.getLib gnustep.base}/lib/GNUstep/ $out/lib/GNUstep/ + ${lndir}/bin/lndir ${lib.getLib gnustep-base}/lib/GNUstep/ $out/lib/GNUstep/ # Link in sope ${lndir}/bin/lndir ${sope}/ $out/ @@ -80,4 +83,3 @@ gnustep.stdenv.mkDerivation rec { maintainers = with maintainers; [ jceb ]; }; } - diff --git a/pkgs/by-name/so/sonusmix/package.nix b/pkgs/by-name/so/sonusmix/package.nix index ea9b7de49519..fc51a8069a3e 100644 --- a/pkgs/by-name/so/sonusmix/package.nix +++ b/pkgs/by-name/so/sonusmix/package.nix @@ -48,7 +48,7 @@ rustPlatform.buildRustPackage rec { description = "Next-gen Pipewire audio routing tool"; homepage = "https://codeberg.org/sonusmix/sonusmix"; license = lib.licenses.mpl20; - maintainers = with lib.maintainers; [ aucub ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.linux; }; } diff --git a/pkgs/by-name/so/sope/package.nix b/pkgs/by-name/so/sope/package.nix index 67fcb756e9bc..a6391e279f24 100644 --- a/pkgs/by-name/so/sope/package.nix +++ b/pkgs/by-name/so/sope/package.nix @@ -1,7 +1,10 @@ -{ gnustep, lib, fetchFromGitHub, fetchpatch, libxml2, openssl -, openldap, mariadb, libmysqlclient, postgresql }: +{ lib, clangStdenv, fetchFromGitHub, fetchpatch, libxml2, openssl +, openldap, mariadb, libmysqlclient, postgresql +, gnustep-make +, gnustep-base +}: -gnustep.stdenv.mkDerivation rec { +clangStdenv.mkDerivation rec { pname = "sope"; version = "5.11.2"; @@ -12,8 +15,7 @@ gnustep.stdenv.mkDerivation rec { hash = "sha256-6vec2ZgpK5jcKr3c2SLn6fLAun56MDjupWtR6dMdjag="; }; - nativeBuildInputs = [ gnustep.make ]; - buildInputs = [ gnustep.base libxml2 openssl ] + buildInputs = [ gnustep-base libxml2 openssl ] ++ lib.optional (openldap != null) openldap ++ lib.optionals (mariadb != null) [ libmysqlclient mariadb ] ++ lib.optional (postgresql != null) postgresql; @@ -24,7 +26,7 @@ gnustep.stdenv.mkDerivation rec { # installed to in the install phase. We move them over after the installation. preConfigure = '' mkdir -p /build/Makefiles - ln -s ${gnustep.make}/share/GNUstep/Makefiles/* /build/Makefiles + ln -s ${gnustep-make}/share/GNUstep/Makefiles/* /build/Makefiles cat < /build/GNUstep.conf GNUSTEP_MAKEFILES=/build/Makefiles EOF diff --git a/pkgs/by-name/so/sops/package.nix b/pkgs/by-name/so/sops/package.nix index aab8f59de88a..0b34ee99df23 100644 --- a/pkgs/by-name/so/sops/package.nix +++ b/pkgs/by-name/so/sops/package.nix @@ -3,21 +3,22 @@ buildGo122Module, fetchFromGitHub, installShellFiles, + versionCheckHook, nix-update-script, }: buildGo122Module rec { pname = "sops"; - version = "3.9.3"; + version = "3.9.4"; src = fetchFromGitHub { owner = "getsops"; repo = pname; tag = "v${version}"; - hash = "sha256-U8ZJktOSj0JJ70CbXDS3FpNmk07cKnco5w2rt4BnQBU="; + hash = "sha256-w2RMK1Fl/k8QXV68j0Kc6shtx4vQa07RCnpgHLM8c8Q="; }; - vendorHash = "sha256-+UxngJgKG+gAjnXXEcdXPXQqRcMfRDn4wPeR1IhltC0="; + vendorHash = "sha256-wxmSj3QaFChGE+/2my7Oe2mhprwi404izUxteecyggY="; postPatch = '' substituteInPlace go.mod \ @@ -32,8 +33,6 @@ buildGo122Module rec { "-X github.com/getsops/sops/v3/version.Version=${version}" ]; - passthru.updateScript = nix-update-script { }; - nativeBuildInputs = [ installShellFiles ]; postInstall = '' @@ -41,15 +40,21 @@ buildGo122Module rec { installShellCompletion --cmd sops --zsh ${./zsh_autocomplete} ''; - meta = with lib; { + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "--version"; + doInstallCheck = true; + + passthru.updateScript = nix-update-script { }; + + meta = { homepage = "https://getsops.io/"; description = "Simple and flexible tool for managing secrets"; changelog = "https://github.com/getsops/sops/blob/v${version}/CHANGELOG.rst"; mainProgram = "sops"; - maintainers = with maintainers; [ + maintainers = with lib.maintainers; [ Scrumplex mic92 ]; - license = licenses.mpl20; + license = lib.licenses.mpl20; }; } diff --git a/pkgs/by-name/so/soteria/package.nix b/pkgs/by-name/so/soteria/package.nix index 667531fe2209..1b32e51d4595 100644 --- a/pkgs/by-name/so/soteria/package.nix +++ b/pkgs/by-name/so/soteria/package.nix @@ -12,7 +12,7 @@ polkit, }: let - version = "0.1.0"; + version = "0.1.1"; in rustPlatform.buildRustPackage { pname = "soteria"; @@ -22,10 +22,10 @@ rustPlatform.buildRustPackage { owner = "imvaskel"; repo = "soteria"; tag = "v${version}"; - hash = "sha256-lhS+37DqSgZrgrYgKGUpKMC22Qjdq9LPNS5k/dqvkRY="; + hash = "sha256-CinJEzH4GsCAzU8FiInulPHLm73KI4nLlAcskkjgeJM="; }; - cargoHash = "sha256-NMSGSqdCu/kW6vv8+C7UC6oitZqlTklO1sRKDcc1T9o="; + cargoHash = "sha256-vv7gK0ZfwO2AHXXQcXfkne9wZl+8JH9h8vELdRjg8WM="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/sp/spacer/package.nix b/pkgs/by-name/sp/spacer/package.nix index c0b96db011ce..a2be66b89b88 100644 --- a/pkgs/by-name/sp/spacer/package.nix +++ b/pkgs/by-name/sp/spacer/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "spacer"; - version = "0.3.0"; + version = "0.3.1"; src = fetchFromGitHub { owner = "samwho"; repo = "spacer"; rev = "v${version}"; - hash = "sha256-gxqUMtONjYPjSmxyguE9/GBC91PUK1rdFGsISGaSe44="; + hash = "sha256-gEJUHNtoLurBMhSMoJUiJMm6xLjUJNjTejPwkgltf2U="; }; - cargoHash = "sha256-pMYqIl0Td2awAxe3BRglBcOychwTmFZ+pZV0QOT0CL4="; + cargoHash = "sha256-/laEbJ1kev7CpDZ4ygrZr1jMI9n6QtVPOwf22NFOZGU="; meta = with lib; { description = "CLI tool to insert spacers when command output stops"; diff --git a/pkgs/by-name/sq/sqld/package.nix b/pkgs/by-name/sq/sqld/package.nix index 79c52798c6b8..e67a95377c82 100644 --- a/pkgs/by-name/sq/sqld/package.nix +++ b/pkgs/by-name/sq/sqld/package.nix @@ -28,8 +28,6 @@ rustPlatform.buildRustPackage rec { "sqld" ]; - cargoHash = ""; - cargoLock = { lockFile = ./Cargo.lock; outputHashes = { diff --git a/pkgs/by-name/sq/squid/package.nix b/pkgs/by-name/sq/squid/package.nix index d38921626061..73322d9a5797 100644 --- a/pkgs/by-name/sq/squid/package.nix +++ b/pkgs/by-name/sq/squid/package.nix @@ -15,6 +15,7 @@ systemd, cppunit, esi ? false, + ipv6 ? true, }: stdenv.mkDerivation (finalAttrs: { @@ -47,7 +48,6 @@ stdenv.mkDerivation (finalAttrs: { configureFlags = [ - "--enable-ipv6" "--disable-strict-error-checking" "--disable-arch-native" "--with-openssl" @@ -58,6 +58,7 @@ stdenv.mkDerivation (finalAttrs: { "--enable-x-accelerator-vary" "--enable-htcp" ] + ++ (if ipv6 then [ "--enable-ipv6" ] else [ "--disable-ipv6" ]) ++ lib.optional (!esi) "--disable-esi" ++ lib.optional ( stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isMusl diff --git a/pkgs/by-name/sr/srsran/package.nix b/pkgs/by-name/sr/srsran/package.nix index f20c76ae2f6c..3b32a70f7a6a 100644 --- a/pkgs/by-name/sr/srsran/package.nix +++ b/pkgs/by-name/sr/srsran/package.nix @@ -14,6 +14,10 @@ soapysdr-with-plugins, libbladeRF, zeromq, + enableAvx ? stdenv.hostPlatform.avxSupport, + enableAvx2 ? stdenv.hostPlatform.avx2Support, + enableFma ? stdenv.hostPlatform.fmaSupport, + enableAvx512 ? stdenv.hostPlatform.avx512Support, }: stdenv.mkDerivation rec { @@ -27,6 +31,11 @@ stdenv.mkDerivation rec { sha256 = "sha256-3cQMZ75I4cyHpik2d/eBuzw7M4OgbKqroCddycw4uW8="; }; + outputs = [ + "out" + "dev" + ]; + nativeBuildInputs = [ cmake pkg-config @@ -45,7 +54,17 @@ stdenv.mkDerivation rec { zeromq ]; - cmakeFlags = [ "-DENABLE_WERROR=OFF" ]; + cmakeFlags = [ + "-DENABLE_WERROR=OFF" + (lib.cmakeBool "ENABLE_AVX" enableAvx) + (lib.cmakeBool "ENABLE_AVX2" enableAvx2) + (lib.cmakeBool "ENABLE_FMA" enableFma) + (lib.cmakeBool "ENABLE_AVX512" enableAvx512) + ]; + + postInstall = lib.optionalString (!stdenv.hostPlatform.isStatic) '' + rm $out/lib/*.a + ''; meta = with lib; { homepage = "https://www.srslte.com/"; diff --git a/pkgs/by-name/ss/ssh-openpgp-auth/daemon.nix b/pkgs/by-name/ss/ssh-openpgp-auth/daemon.nix index a3e0cf324ef5..e7471ef70fb4 100644 --- a/pkgs/by-name/ss/ssh-openpgp-auth/daemon.nix +++ b/pkgs/by-name/ss/ssh-openpgp-auth/daemon.nix @@ -8,6 +8,6 @@ callPackage ./generic.nix { pname = "sshd-openpgp-auth"; version = "0.3.0"; srcHash = "sha256-IV0Nhdqyn12HDOp1jaKz3sKTI3ktFd5b6qybCLWt27I="; - cargoHash = "sha256-/+lZkVMeFUMRD7NQ/MHDU5f3rkKDx1kDv5tjA41RExc="; + cargoHash = "sha256-WyYzDzC83iL1c8gCj+mYDq3/gsFxmxEWKwLhWLEygkI="; metaDescription = "Command-line tool for creating and managing OpenPGP based trust anchors for SSH host keys"; } diff --git a/pkgs/by-name/ss/ssh-openpgp-auth/generic.nix b/pkgs/by-name/ss/ssh-openpgp-auth/generic.nix index f60424416f08..6de2efdc2821 100644 --- a/pkgs/by-name/ss/ssh-openpgp-auth/generic.nix +++ b/pkgs/by-name/ss/ssh-openpgp-auth/generic.nix @@ -34,6 +34,7 @@ rustPlatform.buildRustPackage { hash = srcHash; }; buildAndTestSubdir = pname; + useFetchCargoVendor = true; inherit cargoHash; nativeBuildInputs = [ diff --git a/pkgs/by-name/ss/ssh-openpgp-auth/package.nix b/pkgs/by-name/ss/ssh-openpgp-auth/package.nix index a0850d3dd99b..73f88ceeee1c 100644 --- a/pkgs/by-name/ss/ssh-openpgp-auth/package.nix +++ b/pkgs/by-name/ss/ssh-openpgp-auth/package.nix @@ -4,6 +4,6 @@ callPackage ./generic.nix { pname = "ssh-openpgp-auth"; version = "0.2.2"; srcHash = "sha256-5ew6jT6Zr54QYaWFQIGYXd8sqC3yHHZjPfoaCossm8o="; - cargoHash = "sha256-/k/XAp7PHIJaJWf4Oa1JC1mMSR5pyeM4SSPCcr77cAg="; + cargoHash = "sha256-PHJiyq7zovn7EA7jDLJQxjxu2ErPHqBMwAlJpb5UVQY="; metaDescription = "Command-line tool that provides client-side functionality to transparently verify the identity of remote SSH hosts"; } diff --git a/pkgs/by-name/st/stackql/package.nix b/pkgs/by-name/st/stackql/package.nix index 4d1391a9ede6..c9d91cc3ba0f 100644 --- a/pkgs/by-name/st/stackql/package.nix +++ b/pkgs/by-name/st/stackql/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "stackql"; - version = "0.6.32"; + version = "0.6.50"; src = fetchFromGitHub { owner = "stackql"; repo = "stackql"; rev = "v${version}"; - hash = "sha256-7XpCbcOJ5t/ipBPgMVeP5ery/MFL90GuojMePJIczrs="; + hash = "sha256-7MVpfXYMkVXlao3rA9Sp5DWwr5SBkS9fPG4JcCc9GVw="; }; vendorHash = "sha256-eGpmA1MYiIn1LSbieMFvF7OYEtLBoN62X7CQMa35HT4="; diff --git a/pkgs/by-name/st/stalwart-cli/package.nix b/pkgs/by-name/st/stalwart-cli/package.nix new file mode 100644 index 000000000000..1569f36a82aa --- /dev/null +++ b/pkgs/by-name/st/stalwart-cli/package.nix @@ -0,0 +1,30 @@ +{ + lib, + rustPlatform, + versionCheckHook, + stalwart-mail, +}: + +rustPlatform.buildRustPackage rec { + pname = "stalwart-cli"; + version = stalwart-mail.version; + src = stalwart-mail.src; + + buildAndTestSubdir = "crates/cli"; + cargoHash = "sha256-9gqk26qCic1N8LHXLX3fWyk/oQr3QifbmPzAEWL6ZHo="; + + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = [ "--version" ]; + + meta = { + description = "Stalwart Mail Server CLI"; + homepage = "https://github.com/stalwartlabs/mail-server"; + changelog = "https://github.com/stalwartlabs/mail-server/blob/v${version}/CHANGELOG.md"; + license = lib.licenses.agpl3Only; + mainProgram = "stalwart-cli"; + maintainers = with lib.maintainers; [ + giomf + ]; + }; +} diff --git a/pkgs/by-name/st/stash/package.nix b/pkgs/by-name/st/stash/package.nix index 46c3df1a33d3..5088847950dd 100644 --- a/pkgs/by-name/st/stash/package.nix +++ b/pkgs/by-name/st/stash/package.nix @@ -1,50 +1,137 @@ { + buildGoModule, + fetchFromGitHub, + fetchYarnDeps, lib, + nixosTests, + nodejs, + stash, stdenv, - fetchurl, + testers, + yarnBuildHook, + yarnConfigHook, }: let - - version = "0.25.1"; - - sources = { - x86_64-linux = { - url = "https://github.com/stashapp/stash/releases/download/v${version}/stash-linux"; - hash = "sha256-Rb4x6iKx6T9NPuWWDbNaz+35XPzLqZzSm0psv+k2Gw4="; - }; - aarch64-linux = { - url = "https://github.com/stashapp/stash/releases/download/v${version}/stash-linux-arm64v8"; - hash = "sha256-6qPyIYKFkhmBNO47w9E91FSKlByepBOnl0MNJighGSc="; - }; - x86_64-darwin = { - url = "https://github.com/stashapp/stash/releases/download/v${version}/stash-macos"; - hash = "sha256-W8+rgqWUDTOB8ykGO2GL9tKEjaDXdx9LpFg0TAtJsxM="; - }; - }; -in -stdenv.mkDerivation (finalAttrs: { - inherit version; + inherit (lib.importJSON ./version.json) + gitHash + srcHash + vendorHash + version + yarnHash + ; pname = "stash"; - src = fetchurl { inherit (sources.${stdenv.system}) url hash; }; + src = fetchFromGitHub { + owner = "stashapp"; + repo = "stash"; + tag = "v${version}"; + hash = srcHash; + }; - dontUnpack = true; + frontend = stdenv.mkDerivation (final: { + inherit version; + pname = "${pname}-ui"; + src = "${src}/ui/v2.5"; - installPhase = '' - runHook preInstall + yarnOfflineCache = fetchYarnDeps { + yarnLock = "${final.src}/yarn.lock"; + hash = yarnHash; + }; - install -Dm755 $src $out/bin/stash + nativeBuildInputs = [ + yarnConfigHook + yarnBuildHook + # Needed for executing package.json scripts + nodejs + ]; - runHook postInstall + postPatch = '' + substituteInPlace codegen.ts \ + --replace-fail "../../graphql/" "${src}/graphql/" + ''; + + buildPhase = '' + runHook preBuild + + export HOME=$(mktemp -d) + export VITE_APP_DATE='1970-01-01 00:00:00' + export VITE_APP_GITHASH=${gitHash} + export VITE_APP_STASH_VERSION=v${version} + export VITE_APP_NOLEGACY=true + + yarn --offline run gqlgen + yarn --offline build + + mv build $out + + runHook postBuild + ''; + + dontInstall = true; + dontFixup = true; + }); +in +buildGoModule { + inherit + pname + src + version + vendorHash + ; + + ldflags = [ + "-s" + "-w" + "-X 'github.com/stashapp/stash/internal/build.buildstamp=1970-01-01 00:00:00'" + "-X 'github.com/stashapp/stash/internal/build.githash=${gitHash}'" + "-X 'github.com/stashapp/stash/internal/build.version=v${version}'" + "-X 'github.com/stashapp/stash/internal/build.officialBuild=false'" + ]; + tags = [ + "sqlite_stat4" + "sqlite_math_functions" + ]; + + subPackages = [ "cmd/stash" ]; + + preBuild = '' + cp -a ${frontend} ui/v2.5/build + # `go mod tidy` requires internet access and does nothing + echo "skip_mod_tidy: true" >> gqlgen.yml + # remove `-trimpath` fron `GOFLAGS` because `gqlgen` does not work with it + GOFLAGS="''${GOFLAGS/-trimpath/}" go generate ./cmd/stash ''; - meta = with lib; { - description = "Stash is a self-hosted porn app"; - homepage = "https://github.com/stashapp/stash"; - license = licenses.agpl3Only; - maintainers = with maintainers; [ Golo300 ]; - platforms = builtins.attrNames sources; - mainProgram = "stash"; + strictDeps = true; + + passthru = { + inherit frontend; + updateScript = ./update.py; + tests = { + inherit (nixosTests) stash; + version = testers.testVersion { + package = stash; + version = "v${version} (${gitHash}) - Unofficial Build - 1970-01-01 00:00:00"; + }; + }; }; -}) + + meta = { + mainProgram = "stash"; + description = "Organizer for your adult videos/images"; + license = lib.licenses.agpl3Only; + homepage = "https://stashapp.cc/"; + changelog = "https://github.com/stashapp/stash/blob/v${version}/ui/v2.5/src/docs/en/Changelog/v${lib.versions.major version}${lib.versions.minor version}0.md"; + maintainers = with lib.maintainers; [ + Golo300 + DrakeTDL + ]; + platforms = [ + "x86_64-linux" + "aarch64-linux" + "x86_64-darwin" + "aarch64-darwin" + ]; + }; +} diff --git a/pkgs/by-name/st/stash/update.py b/pkgs/by-name/st/stash/update.py new file mode 100755 index 000000000000..85747eb654b2 --- /dev/null +++ b/pkgs/by-name/st/stash/update.py @@ -0,0 +1,82 @@ +#! /usr/bin/env nix-shell +#! nix-shell -i python3 -p python3 prefetch-yarn-deps nix-prefetch-git nix-prefetch + +from pathlib import Path +from shutil import copyfile +from urllib.request import Request, urlopen +import json +import os +import subprocess + + +def run_external(args: list[str]): + proc = subprocess.run( + args, + check=True, + stdout=subprocess.PIPE, + ) + + return proc.stdout.strip().decode("utf8") + +def get_latest_release_tag(): + req = Request("https://api.github.com/repos/stashapp/stash/tags?per_page=1") + + if "GITHUB_TOKEN" in os.environ: + req.add_header("authorization", f"Bearer {os.environ['GITHUB_TOKEN']}") + + with urlopen(req) as resp: + return json.loads(resp.read())[0] + +def prefetch_github(rev: str): + print(f"Prefetching stashapp/stash({rev})") + + proc = run_external(["nix-prefetch-git", "--no-deepClone", "--rev", rev, f"https://github.com/stashapp/stash"]) + + return json.loads(proc) + +def prefetch_yarn(lock_file: str): + print(f"Prefetching yarn deps") + + hash = run_external(["prefetch-yarn-deps", lock_file]) + + return run_external(["nix", "hash", "convert", "--hash-algo", "sha256", hash]) + +def prefetch_go_modules(src: str, version: str): + print(f"Prefetching go modules") + expr = fr""" + {{ sha256 }}: (buildGoModule {{ + pname = "stash"; + src = {src}; + version = "{version}"; + vendorHash = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA="; + }}).goModules.overrideAttrs (_: {{ modSha256 = sha256; }}) + """ + return run_external([ + "nix-prefetch", + "--option", + "extra-experimental-features", + "flakes", + expr + ]) + + +def save_version_json(version: dict[str, str]): + print("Writing version.json") + with open(Path(__file__).parent / "version.json", 'w') as f: + json.dump(version, f, indent=2) + f.write("\n") + +if __name__ == "__main__": + release = get_latest_release_tag() + + src = prefetch_github(release['name']) + + yarn_hash = prefetch_yarn(f"{src['path']}/ui/v2.5/yarn.lock") + + save_version_json({ + "version": release["name"][1:], + "gitHash": release["commit"]["sha"][:8], + "srcHash": src["hash"], + "yarnHash": yarn_hash, + "vendorHash": prefetch_go_modules(src["path"], release["name"][1:]) + }) diff --git a/pkgs/by-name/st/stash/version.json b/pkgs/by-name/st/stash/version.json new file mode 100644 index 000000000000..73be8439fba4 --- /dev/null +++ b/pkgs/by-name/st/stash/version.json @@ -0,0 +1,7 @@ +{ + "version": "0.27.2", + "gitHash": "76648fee", + "srcHash": "sha256-SMZBDKqgVdXf2abaSf/FuG2Vodav7SBu6onjHFZIZIM=", + "yarnHash": "sha256-ufGYQfEbcXO3XhpDQ3UTofS5B31L427KWy5NPbWhBJo=", + "vendorHash": "sha256-ZtKKs0JCEe4OpPulO74qYTYrZu2Ds3prWp5N8UP6z0g=" +} diff --git a/pkgs/by-name/st/steampipe/package.nix b/pkgs/by-name/st/steampipe/package.nix index 343aa4662c57..c47d8e7580f4 100644 --- a/pkgs/by-name/st/steampipe/package.nix +++ b/pkgs/by-name/st/steampipe/package.nix @@ -11,7 +11,7 @@ buildGoModule rec { pname = "steampipe"; - version = "1.0.1"; + version = "1.0.2"; env.CGO_ENABLED = 0; @@ -19,10 +19,10 @@ buildGoModule rec { owner = "turbot"; repo = "steampipe"; tag = "v${version}"; - hash = "sha256-9Tlc6BlfSQyAmmk/G6TdWB0kWpbwzGWOPNNNgI3tYPM="; + hash = "sha256-qQAPOvBELJWnDLsxaqbLooPNwXFe+NoR2F9kT5rjv64="; }; - vendorHash = "sha256-+y9OX/ywS/0AXCnVHf4VisTegFamt3sT/m43yVhbCNc="; + vendorHash = "sha256-/8MDRlPR53MTMtW/VF6XsJ2NdV4NLDF8aukx7Rm/D7A="; proxyVendor = true; postPatch = '' diff --git a/pkgs/by-name/st/stenc/package.nix b/pkgs/by-name/st/stenc/package.nix index 58c82ca15e54..4eef321366a4 100644 --- a/pkgs/by-name/st/stenc/package.nix +++ b/pkgs/by-name/st/stenc/package.nix @@ -2,7 +2,7 @@ lib, stdenv, fetchFromGitHub, - gitUpdater, + nix-update-script, autoreconfHook, pkg-config, pandoc, @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { installShellCompletion --bash bash-completion/stenc ''; - passthru.updateScript = gitUpdater { }; + passthru.updateScript = nix-update-script { }; meta = { description = "SCSI Tape Encryption Manager"; diff --git a/pkgs/by-name/st/strace/package.nix b/pkgs/by-name/st/strace/package.nix index 6e4978a6577f..f692bdd0adef 100644 --- a/pkgs/by-name/st/strace/package.nix +++ b/pkgs/by-name/st/strace/package.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "strace"; - version = "6.12"; + version = "6.13"; src = fetchurl { url = "https://strace.io/files/${version}/${pname}-${version}.tar.xz"; - hash = "sha256-xH2pO+RbYFX03HQdfyDvr1DKEBYKWxAMEJspT9nAvf4="; + hash = "sha256-4gna8O4DjKWtzEwnfpJztNUfRqL/htpXXTZ0KsNQihc="; }; separateDebugInfo = true; diff --git a/pkgs/by-name/st/stress-ng/package.nix b/pkgs/by-name/st/stress-ng/package.nix index fa9724ef7bc9..65a1e6a8dbb4 100644 --- a/pkgs/by-name/st/stress-ng/package.nix +++ b/pkgs/by-name/st/stress-ng/package.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "stress-ng"; - version = "0.18.07"; + version = "0.18.09"; src = fetchFromGitHub { owner = "ColinIanKing"; repo = pname; rev = "V${version}"; - hash = "sha256-yfAqI2bhZtPM+8rkQXjYKJJewIJZ4kizhi3qZtp1k9k="; + hash = "sha256-Xx9IdAc2jIGGmOTzqqOzSV7ck7JjeEdXUhbSnh77oV8="; }; postPatch = '' diff --git a/pkgs/by-name/st/stylance-cli/package.nix b/pkgs/by-name/st/stylance-cli/package.nix index c6d6d82c827d..d0584a092852 100644 --- a/pkgs/by-name/st/stylance-cli/package.nix +++ b/pkgs/by-name/st/stylance-cli/package.nix @@ -5,14 +5,14 @@ }: rustPlatform.buildRustPackage rec { pname = "stylance-cli"; - version = "0.5.3"; + version = "0.5.4"; src = fetchCrate { inherit pname version; - hash = "sha256-YN7Y8dxwpZel1SeEgyckh4ZPuRqcAsNvc/fGRgvzeDw="; + hash = "sha256-Xh0xqD0B4uKu5uoEWNe0pf+ExhaqPBgsR1OEfKe0TvA="; }; - cargoHash = "sha256-VKfQzsTTKIbh+X0suXyUXDsd8sDSRsc5SnO8qxcxGPQ="; + cargoHash = "sha256-am2vQ+PeJPU2ojeZm/AzXJxjP3aUkXnlmgcG9i8sv9g="; meta = with lib; { description = "Library and cli tool for working with scoped CSS in rust"; diff --git a/pkgs/by-name/st/stylelint/package.nix b/pkgs/by-name/st/stylelint/package.nix index 038d3502543c..6db87bd47e08 100644 --- a/pkgs/by-name/st/stylelint/package.nix +++ b/pkgs/by-name/st/stylelint/package.nix @@ -5,7 +5,7 @@ }: let - version = "16.13.0"; + version = "16.14.0"; in buildNpmPackage { pname = "stylelint"; @@ -15,10 +15,10 @@ buildNpmPackage { owner = "stylelint"; repo = "stylelint"; rev = version; - hash = "sha256-9OMhOkI8SYetzr4yCuEvFEwHGi/sqOjA0CfUVTc7EIE="; + hash = "sha256-AAlo8fGUH+jvUsB66cztLDyKA7j25ZWH0BIM7iiyp+c="; }; - npmDepsHash = "sha256-mGuoNhCoOJnKQxdySMTVCi/dRwgIiSlg/LkqeS01gnk="; + npmDepsHash = "sha256-FT6UctAsUP9KTSWENutibhyXjZHOT7t93z90XCAIuv4="; dontNpmBuild = true; diff --git a/pkgs/by-name/su/subxt/package.nix b/pkgs/by-name/su/subxt/package.nix index 80bcc27a890e..725ed7810647 100644 --- a/pkgs/by-name/su/subxt/package.nix +++ b/pkgs/by-name/su/subxt/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "subxt"; - version = "0.38.0"; + version = "0.38.1"; src = fetchFromGitHub { owner = "paritytech"; repo = "subxt"; rev = "v${version}"; - hash = "sha256-mUW1foT3JkpsnieJutL+GZZXiTcRUklnjfoaWcH8ccE="; + hash = "sha256-ce6fxyKPWyuRAnS88laW+sFP8InZghlYNhg5ToD9t00="; }; - cargoHash = "sha256-+psdikles6ICg2eSBGxJoiG5EZG8voR2fs6PGnOWvDc="; + cargoHash = "sha256-SW35Neh8mFgnPanhuTb260QOCSOAnQjx12Ts3qhQY3Y="; # Only build the command line client cargoBuildFlags = [ "--bin" "subxt" ]; diff --git a/pkgs/by-name/su/sunshine/package.nix b/pkgs/by-name/su/sunshine/package.nix index d1cfd6bbd85e..87f47b53f2d5 100644 --- a/pkgs/by-name/su/sunshine/package.nix +++ b/pkgs/by-name/su/sunshine/package.nix @@ -140,6 +140,7 @@ stdenv'.mkDerivation rec { ] ++ lib.optionals cudaSupport [ cudaPackages.cudatoolkit + cudaPackages.cuda_cudart ] ++ lib.optionals stdenv.hostPlatform.isx86_64 [ intel-media-sdk diff --git a/pkgs/by-name/su/supabase-cli/package.nix b/pkgs/by-name/su/supabase-cli/package.nix index 4b2d44aafbbc..cd80718efd06 100644 --- a/pkgs/by-name/su/supabase-cli/package.nix +++ b/pkgs/by-name/su/supabase-cli/package.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "supabase-cli"; - version = "2.6.1"; + version = "2.9.4"; src = fetchFromGitHub { owner = "supabase"; repo = "cli"; rev = "v${version}"; - hash = "sha256-kMVVb5f8SEo/fc+PmRh1QskIxzbG+Y9gOufVvq5mN30="; + hash = "sha256-qUx6KMJVknMzLzmOTXM6sqTqIK9EyT46nehzcSleGiU="; }; - vendorHash = "sha256-H4o38npYbF77NSO7EALjoH3EXdUCjIPDboWEhWE4hXo="; + vendorHash = "sha256-k/w+4ledwTXxUQttjqtnTGVpNVOcEXuDe4gF4wViyB4="; ldflags = [ "-s" diff --git a/pkgs/by-name/sw/swayfx-unwrapped/package.nix b/pkgs/by-name/sw/swayfx-unwrapped/package.nix index f771a0101e24..9e621c41ccaf 100644 --- a/pkgs/by-name/sw/swayfx-unwrapped/package.nix +++ b/pkgs/by-name/sw/swayfx-unwrapped/package.nix @@ -33,6 +33,7 @@ enableXWayland ? true, systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd, trayEnabled ? systemdSupport, + fetchpatch2, }: stdenv.mkDerivation (finalAttrs: { @@ -57,6 +58,12 @@ stdenv.mkDerivation (finalAttrs: { [ ./load-configuration-from-etc.patch + (fetchpatch2 { + # fix missing switch statement for newer libinput + url = "https://github.com/swaywm/sway/pull/8470.patch?full_index=1"; + hash = "sha256-UTZ2DNEsGi5RYrgZThHkYz3AnnIl/KxieinA1WUZRq4="; + }) + (substituteAll { src = ./fix-paths.patch; inherit swaybg; diff --git a/pkgs/by-name/sy/sysdig-cli-scanner/sysdig-cli-scanner.versions.nix b/pkgs/by-name/sy/sysdig-cli-scanner/sysdig-cli-scanner.versions.nix index 3fc80e70cc46..18c2494b8965 100644 --- a/pkgs/by-name/sy/sysdig-cli-scanner/sysdig-cli-scanner.versions.nix +++ b/pkgs/by-name/sy/sysdig-cli-scanner/sysdig-cli-scanner.versions.nix @@ -1,23 +1,23 @@ { - version = "v1.19.0"; + version = "1.19.2"; x86_64-linux = { - url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/v1.19.0/linux/amd64/sysdig-cli-scanner"; - hash = "sha256-TYjf9Axt8IRaTCQ4oA8jdKGLotRPZPJfSDsTXB0nyuU="; + url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.19.2/linux/amd64/sysdig-cli-scanner"; + hash = "sha256-H8qYf6s2OTHjHwhZlqXkrYxdCWuuqPhKXRDkpCYGfhM="; }; aarch64-linux = { - url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/v1.19.0/linux/arm64/sysdig-cli-scanner"; - hash = "sha256-dSGHZxERmjk1bOXtvLPyJ3KQYhC8XtfSpDqmESv1Cj0="; + url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.19.2/linux/arm64/sysdig-cli-scanner"; + hash = "sha256-uC1U9Zbt8mSSiEWKWWMJawdYQwIW6N7rxnmduO1E5DA="; }; x86_64-darwin = { - url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/v1.19.0/darwin/amd64/sysdig-cli-scanner"; - hash = "sha256-rJcudXL2BY/r4W0QdZAjl/1c8NPz08qB7kEvbsq5nog="; + url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.19.2/darwin/amd64/sysdig-cli-scanner"; + hash = "sha256-byLOKPD4DuSd5LYTPr81XBHUW5cM+ngxTxon1A2rfPQ="; }; aarch64-darwin = { - url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/v1.19.0/darwin/arm64/sysdig-cli-scanner"; - hash = "sha256-1NLzebkzfP/KakW9p2466BVkSee4x6tZRP2d0eTALIo="; + url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.19.2/darwin/arm64/sysdig-cli-scanner"; + hash = "sha256-rKlsodq5YJT4k69iDLvkELYUV7kQ24cgDh5sGrsT9ns="; }; } diff --git a/pkgs/by-name/sy/syshud/package.nix b/pkgs/by-name/sy/syshud/package.nix index 8702978a8602..ea7423fcf116 100644 --- a/pkgs/by-name/sy/syshud/package.nix +++ b/pkgs/by-name/sy/syshud/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "syshud"; - version = "0-unstable-2024-11-25"; + version = "0-unstable-2025-01-13"; src = fetchFromGitHub { owner = "System64fumo"; repo = "syshud"; - rev = "922d3fbc811644cb14d0f11cff91f8e8f97eca56"; - hash = "sha256-ubsmkC/mjDe/6AH/2Y6e9CmhBX3CxtOW2xOhvPJiAqg="; + rev = "ca5c05145d440c7e96a3521af327da91bb1ac539"; + hash = "sha256-mglmmIZz1bbRT15/Xr1vrYBy+PVgIaKpjRfAAFT5OcQ="; }; postPatch = '' diff --git a/pkgs/by-name/ta/tanka/package.nix b/pkgs/by-name/ta/tanka/package.nix index 79f2acbc612e..774866a05fb6 100644 --- a/pkgs/by-name/ta/tanka/package.nix +++ b/pkgs/by-name/ta/tanka/package.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "tanka"; - version = "0.31.1"; + version = "0.31.2"; src = fetchFromGitHub { owner = "grafana"; repo = pname; rev = "v${version}"; - sha256 = "sha256-q/tIG+RS/guRcKLo1iXmXi8IcgXS2pfJNFEvn/jxFks="; + sha256 = "sha256-bgVFUBSb/vs+oEVUeF/PniqEkUAl3qRiuFWR4U+iHXo="; }; - vendorHash = "sha256-/8tPq/piCrguFoRigzGoAUSBJ2C1AY0ghyHosPE5n68="; + vendorHash = "sha256-C1GpLDb4YWL0dXG/mUR+UVy17rnh0zgaICAU0C1bfq0="; doCheck = false; # Required for versions >= 0.28 as they introduce a gowork.sum file. This is only used for tests so we can safely disable GOWORK diff --git a/pkgs/by-name/tb/tbtools/package.nix b/pkgs/by-name/tb/tbtools/package.nix new file mode 100644 index 000000000000..eddbecc3313b --- /dev/null +++ b/pkgs/by-name/tb/tbtools/package.nix @@ -0,0 +1,46 @@ +{ + fetchFromGitHub, + lib, + nix-update-script, + pkg-config, + rustPlatform, + stdenv, + systemd, +}: + +rustPlatform.buildRustPackage rec { + pname = "tbtools"; + version = "0.5.0"; + + src = fetchFromGitHub { + owner = "intel"; + repo = "tbtools"; + tag = "v${version}"; + hash = "sha256-zq8q3JaoqWAQUat2gIW0Wimi/tZiC6XDphUVjH0viU4="; + }; + + cargoHash = "sha256-8uzbWJl3Bpvo/rlZnd7DzCNhL088v5pksY7K6yncC1s="; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + systemd + ]; + + passthru = { + updateScript = nix-update-script { }; + }; + + meta = { + description = "Thunderbolt/USB4 debugging tools"; + homepage = "https://github.com/intel/tbtools"; + license = lib.licenses.mit; + mainProgram = "tblist"; + maintainers = with lib.maintainers; [ + felixsinger + ]; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/by-name/td/tdl/package.nix b/pkgs/by-name/td/tdl/package.nix index 3eca5012ea1f..a721c86d3498 100644 --- a/pkgs/by-name/td/tdl/package.nix +++ b/pkgs/by-name/td/tdl/package.nix @@ -5,16 +5,16 @@ }: buildGoModule rec { pname = "tdl"; - version = "0.18.3"; + version = "0.18.4"; src = fetchFromGitHub { owner = "iyear"; repo = "tdl"; rev = "v${version}"; - hash = "sha256-/aZ85FLGlNVfHG/LyfbvxBdZlne/s3ktw7RNmKeNSeI="; + hash = "sha256-30OClBZUjoLvZ0ZhSZx+AaS7fhjo8X392t4FQpxoG9Q="; }; - vendorHash = "sha256-o1GVra4kbjkLtFkoqK+8We/Ov+JHsEI+4jJYX5tPimM="; + vendorHash = "sha256-QBqUa/PnT/Xma3SHq6YRGtVNKstTax1GVRsCDU12ETA="; ldflags = [ "-s" diff --git a/pkgs/by-name/te/television/package.nix b/pkgs/by-name/te/television/package.nix index 3c9af991b718..687a0fa9775c 100644 --- a/pkgs/by-name/te/television/package.nix +++ b/pkgs/by-name/te/television/package.nix @@ -8,16 +8,16 @@ }: rustPlatform.buildRustPackage rec { pname = "television"; - version = "0.9.3"; + version = "0.9.4"; src = fetchFromGitHub { owner = "alexpasmantier"; repo = "television"; tag = version; - hash = "sha256-0VnDgDLsPmNaY1sjw891hm65TsE3HH9KBkkgp0TFQKg="; + hash = "sha256-S0at9qiPaHtFSag/DjJxczcjuQwPIWQBqxrRwrWIPk0="; }; - cargoHash = "sha256-WtB1rmgOfAnZ9OGJ8M5s5NqMm24s8gcPzlu14f2mTrE="; + cargoHash = "sha256-eWy1MnduirMyPeOhNYelDV+4J4+9Qf9jSaW772p7t1k="; passthru = { tests.version = testers.testVersion { diff --git a/pkgs/by-name/te/temporal-cli/package.nix b/pkgs/by-name/te/temporal-cli/package.nix index 8b45d33de589..eef36abd994a 100644 --- a/pkgs/by-name/te/temporal-cli/package.nix +++ b/pkgs/by-name/te/temporal-cli/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "temporal-cli"; - version = "1.1.2"; + version = "1.2.0"; src = fetchFromGitHub { owner = "temporalio"; repo = "cli"; rev = "v${version}"; - hash = "sha256-7wURMdi357w5S4s909PTUZanRzFyWM588DMY7iYWP88="; + hash = "sha256-79ANKgtKOxLmgp0qqybYJ78yWTjaOOdnEaPs0qCHje4="; }; - vendorHash = "sha256-umGwew8RwewlYJQD1psYSd9bu67cPEiHBJkQRJGjyGY="; + vendorHash = "sha256-u4kLRdKMd27Jglk1+6SARjNm3WwFswGrnwxbyWmvsao="; overrideModAttrs = old: { # https://gitlab.com/cznic/libc/-/merge_requests/10 diff --git a/pkgs/by-name/te/terraform-ls/package.nix b/pkgs/by-name/te/terraform-ls/package.nix index ca0531e334f1..9449895a8cb8 100644 --- a/pkgs/by-name/te/terraform-ls/package.nix +++ b/pkgs/by-name/te/terraform-ls/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "terraform-ls"; - version = "0.36.3"; + version = "0.36.4"; src = fetchFromGitHub { owner = "hashicorp"; repo = pname; rev = "v${version}"; - hash = "sha256-bn4eDAR3fYioT2kB7Hp0zP1190FMFAJ1L5lYFUUwhWk="; + hash = "sha256-20spDPVJC48r6Qy6KS8Yp6lUE22DuoOM17WPS3+KN9E="; }; - vendorHash = "sha256-Qx18IisnEt0xr6Mb0nxjRp+ORu5xbmSJKrRCgRJFlbc="; + vendorHash = "sha256-+nE36oxW60OKTAEMetuZQhOCJraMTvU5f362k5aYVpc="; ldflags = [ "-s" diff --git a/pkgs/by-name/te/testkube/package.nix b/pkgs/by-name/te/testkube/package.nix index d23c403e4977..1fa9d7d3df9e 100644 --- a/pkgs/by-name/te/testkube/package.nix +++ b/pkgs/by-name/te/testkube/package.nix @@ -5,16 +5,16 @@ }: buildGoModule rec { pname = "testkube"; - version = "2.1.84"; + version = "2.1.88"; src = fetchFromGitHub { owner = "kubeshop"; repo = "testkube"; rev = "v${version}"; - hash = "sha256-1w+n/CXFWVLROSlI/bo5g9MMb1UNsqFDz8mL+5Xxg/s="; + hash = "sha256-HHGY6tCB9e7RRnv9oK33Ys7kWpeDNHZkBk5RMKI1vLA="; }; - vendorHash = "sha256-GCXbp8cJUji7vAEVpTP9T/mRIwfu5+TqEKtoOQWlxrY="; + vendorHash = "sha256-Dqqelz1pgLbJX2IuYfQ1HoUYkPQhzJ5A+1+XLCzFdxo="; ldflags = [ "-X main.version=${version}" diff --git a/pkgs/by-name/ti/ticktick/package.nix b/pkgs/by-name/ti/ticktick/package.nix index d54dcdb2e53e..188aee8e1783 100644 --- a/pkgs/by-name/ti/ticktick/package.nix +++ b/pkgs/by-name/ti/ticktick/package.nix @@ -16,11 +16,11 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "ticktick"; - version = "6.0.20"; + version = "6.0.21"; src = fetchurl { url = "https://d2atcrkye2ik4e.cloudfront.net/download/linux/linux_deb_x64/ticktick-${finalAttrs.version}-amd64.deb"; - hash = "sha256-aKUK0/9Y/ac9ISYJnWDUdwmvN8UYKzTY0f94nd8ofGw="; + hash = "sha256-e5N20FL2c6XdkDax0SMGigLuatXKZxb9c53sqQ5XVtM="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ti/tideways-cli/package.nix b/pkgs/by-name/ti/tideways-cli/package.nix index 074a12d49d00..697dc5e2f83c 100644 --- a/pkgs/by-name/ti/tideways-cli/package.nix +++ b/pkgs/by-name/ti/tideways-cli/package.nix @@ -11,7 +11,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "tideways-cli"; - version = "1.2.4"; + version = "1.2.6"; nativeBuildInputs = [ installShellFiles ]; @@ -38,19 +38,19 @@ stdenvNoCC.mkDerivation (finalAttrs: { sources = { "x86_64-linux" = fetchurl { url = "https://s3-eu-west-1.amazonaws.com/tideways/cli/${finalAttrs.version}/tideways-cli_linux_amd64-${finalAttrs.version}.tar.gz"; - hash = "sha256-PoZHmr4kq6A6aTVlo9kbjnRSkLBJ9q/GneHGWoEvraQ="; + hash = "sha256-sKa+MgbzdudDCMYOHjzBebhQsxQ79qWDx855uWbbo3Y="; }; "aarch64-linux" = fetchurl { url = "https://s3-eu-west-1.amazonaws.com/tideways/cli/${finalAttrs.version}/tideways-cli_linux_arm64-${finalAttrs.version}.tar.gz"; - hash = "sha256-8r3s9izpi8fR+lSDQ6ZAxGWK2XQxrtp7WgRykRC+pD4="; + hash = "sha256-BDtut3oJI9dmIL77R4BhGVnEJrMj0TVdNUNkO7kie10="; }; "x86_64-darwin" = fetchurl { url = "https://s3-eu-west-1.amazonaws.com/tideways/cli/${finalAttrs.version}/tideways-cli_macos_amd64-${finalAttrs.version}.tar.gz"; - hash = "sha256-D40PF6zgf79NO1K35koZ2gpUeJllF9CpW9DoCQ1uJIU="; + hash = "sha256-AoGlyUcL0LW5QWJYQt9keqdR14HtLEX3CODgX0sFsVw="; }; "aarch64-darwin" = fetchurl { url = "https://s3-eu-west-1.amazonaws.com/tideways/cli/${finalAttrs.version}/tideways-cli_macos_arm64-${finalAttrs.version}.tar.gz"; - hash = "sha256-QGkRu0IRUpydLIy0DgtRhLiH0mLZ0UTRCJo1WZeICQQ="; + hash = "sha256-3WtyT8NqJM+2gdmpxmA0ZoQcIna4Ma4bz1eyTbUSXJ0="; }; }; diff --git a/pkgs/by-name/tl/tlsx/package.nix b/pkgs/by-name/tl/tlsx/package.nix index 7c8ecbf072a1..42062b8cd3b8 100644 --- a/pkgs/by-name/tl/tlsx/package.nix +++ b/pkgs/by-name/tl/tlsx/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "tlsx"; - version = "1.1.8"; + version = "1.1.9"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "tlsx"; tag = "v${version}"; - hash = "sha256-AQiwHNHfwOJYIEsFm2YiksdTUxp5vkCL80rpvxHY2rA="; + hash = "sha256-u83hPmmiXH7SGCyINkHFrjNDLanwJLf0o9ZyceQeSg0="; }; - vendorHash = "sha256-KNyB+xK7TUf7XoVX/4xBTnG2lMMPVV5AOoUNi4aA/cM="; + vendorHash = "sha256-NF05vVLBRlWQpmTfrNEjnvH7kZMhgY73xmSgTZ8FGmo="; ldflags = [ "-s" diff --git a/pkgs/by-name/to/toast/package.nix b/pkgs/by-name/to/toast/package.nix index 783098ee8be8..155bee53f2f9 100644 --- a/pkgs/by-name/to/toast/package.nix +++ b/pkgs/by-name/to/toast/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "toast"; - version = "0.47.6"; + version = "0.47.7"; src = fetchFromGitHub { owner = "stepchowfun"; repo = pname; rev = "v${version}"; - sha256 = "sha256-+qntd687LF4tJwHZglZ6mppHq3dOZ+l431oKBBNDI0k="; + sha256 = "sha256-vp70jv4F0VKd/OZHVRDcIJlKLwK9w+cV28lh0C7ESqg="; }; - cargoHash = "sha256-A2sJ0o0RDztk3NjxG0CD8wNA4tmOizY4Tvff6ADzYQ8="; + cargoHash = "sha256-ezYwdUnM0xjDtmQEyTJEAoE/VjVEOOEgxvjrmusrJSY="; checkFlags = [ "--skip=format::tests::code_str_display" ]; # fails diff --git a/pkgs/by-name/to/todiff/package.nix b/pkgs/by-name/to/todiff/package.nix deleted file mode 100644 index 08af4224fd1e..000000000000 --- a/pkgs/by-name/to/todiff/package.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ - lib, - rustPlatform, - fetchFromGitHub, -}: - -rustPlatform.buildRustPackage rec { - pname = "todiff"; - version = "0.6.1"; - - src = fetchFromGitHub { - owner = "Ekleog"; - repo = "todiff"; - rev = version; - hash = "sha256-leXAmurYjsM/DLe44kLvLwWAs183K96DsRMtrKZFG/g="; - }; - - cargoHash = "sha256-+YAi41A5lOhhz4O6lQ4u567OZj0Lhyyo2UvxPNgONm8="; - - checkFeatures = [ "integration_tests" ]; - - meta = with lib; { - description = "Human-readable diff for todo.txt files"; - homepage = "https://github.com/Ekleog/todiff"; - maintainers = with maintainers; [ ekleog ]; - license = licenses.mit; - }; -} diff --git a/pkgs/by-name/to/todoist/package.nix b/pkgs/by-name/to/todoist/package.nix index 5f2ab9b20a88..e65deb19f956 100644 --- a/pkgs/by-name/to/todoist/package.nix +++ b/pkgs/by-name/to/todoist/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "todoist"; - version = "0.20.0"; + version = "0.22.0"; src = fetchFromGitHub { owner = "sachaos"; repo = "todoist"; rev = "v${version}"; - sha256 = "sha256-mdh+DOqlxcAqWIxEiKXmtvlsaaRCnRWEvrn56IFhBwk="; + sha256 = "sha256-+UECYUozca7PKKiTrmPAobSF0y6xnWYCGaChk9bwANg="; }; vendorHash = "sha256-fWFFWFVnLtZivlqMRIi6TjvticiKlyXF2Bx9Munos8M="; diff --git a/pkgs/by-name/tr/traefik/package.nix b/pkgs/by-name/tr/traefik/package.nix index 9828e173c0aa..efa31c0d2b81 100644 --- a/pkgs/by-name/tr/traefik/package.nix +++ b/pkgs/by-name/tr/traefik/package.nix @@ -7,21 +7,23 @@ buildGo123Module rec { pname = "traefik"; - version = "3.2.2"; + version = "3.3.2"; # Archive with static assets for webui src = fetchzip { url = "https://github.com/traefik/traefik/releases/download/v${version}/traefik-v${version}.src.tar.gz"; - hash = "sha256-DTgpoJvk/rxzMAIBgKJPT70WW8W/aBhOEoyw3cK+JrM="; + hash = "sha256-7qS+rOBYDyYI8t0rVNmM0sJjGSdtIVelaIJuW1jaL+g="; stripRoot = false; }; - vendorHash = "sha256-+sL0GJhWMlFdNEsRdgRJ42aGedOfn76gg70wH6/a+qQ="; + vendorHash = "sha256-9WuhQjl+lWRZBvEP8qjBQUbEQC1SG9J+3xNpmIieOo8="; subPackages = [ "cmd/traefik" ]; + env.CGO_ENABLED = 0; + preBuild = '' - GOOS= GOARCH= CGO_ENABLED=0 go generate + GOOS= GOARCH= go generate CODENAME=$(grep -Po "CODENAME \?=\s\K.+$" Makefile) diff --git a/pkgs/by-name/tr/troubadix/package.nix b/pkgs/by-name/tr/troubadix/package.nix index 699f0cbe3142..196591366b29 100644 --- a/pkgs/by-name/tr/troubadix/package.nix +++ b/pkgs/by-name/tr/troubadix/package.nix @@ -7,14 +7,14 @@ python3.pkgs.buildPythonApplication rec { pname = "troubadix"; - version = "25.1.0"; + version = "25.1.4"; pyproject = true; src = fetchFromGitHub { owner = "greenbone"; repo = "troubadix"; tag = "v${version}"; - hash = "sha256-cb9U1xxN5pUVRiB8JKCWd4XtnkH72XH7QnvFATXaPgY="; + hash = "sha256-AMvYjspaLxqxq/6Nb5KMMfwWMhXfeB8NHWeveGNsWQY="; }; pythonRelaxDeps = [ diff --git a/pkgs/by-name/ts/ts_query_ls/package.nix b/pkgs/by-name/ts/ts_query_ls/package.nix index fa0f34de3448..0846fe493bd8 100644 --- a/pkgs/by-name/ts/ts_query_ls/package.nix +++ b/pkgs/by-name/ts/ts_query_ls/package.nix @@ -6,7 +6,7 @@ }: let pname = "ts_query_ls"; - version = "1.4.1"; + version = "1.4.2"; in rustPlatform.buildRustPackage { inherit pname version; @@ -15,13 +15,13 @@ rustPlatform.buildRustPackage { owner = "ribru17"; repo = "ts_query_ls"; rev = "v${version}"; - hash = "sha256-BPPM21hRRWlCequoHiME+9FAp4JunfdEv6VF5b2gQKs="; + hash = "sha256-h5ZxtFz70HXqAh9c+A350TKQTMv+PsV7tPzmJisLQ/I="; }; nativeBuildInputs = [ cmake ]; useFetchCargoVendor = true; - cargoHash = "sha256-N7glMlrKotsHXvABYO2J0fNgpbxhsyU/5RWC9GVOwdA="; + cargoHash = "sha256-/Xd++vGhv6SLpjqqjTEWwAJBAu34mTTOiJ+zdwgBs2k="; meta = { description = "LSP implementation for Tree-sitter's query files"; diff --git a/pkgs/by-name/tu/tutanota-desktop/package.nix b/pkgs/by-name/tu/tutanota-desktop/package.nix index 070be4a4aefe..235b2dd424c2 100644 --- a/pkgs/by-name/tu/tutanota-desktop/package.nix +++ b/pkgs/by-name/tu/tutanota-desktop/package.nix @@ -7,11 +7,11 @@ appimageTools.wrapType2 rec { pname = "tutanota-desktop"; - version = "259.241223.2"; + version = "259.250108.1"; src = fetchurl { url = "https://github.com/tutao/tutanota/releases/download/tutanota-desktop-release-${version}/tutanota-desktop-linux.AppImage"; - hash = "sha256-VeAXOCdvy9liCJBNMdPc6iIeuOutqQ9sShc4XytApH4="; + hash = "sha256-VXHhN+6k1Jd/4tPxxLwXNYYPjpl+yBn8gRDLlfvCS4g="; }; extraPkgs = pkgs: [ pkgs.libsecret ]; diff --git a/pkgs/by-name/tw/twilio-cli/package.nix b/pkgs/by-name/tw/twilio-cli/package.nix index 4af5c7ef5ca1..ed4c6ced0cf3 100644 --- a/pkgs/by-name/tw/twilio-cli/package.nix +++ b/pkgs/by-name/tw/twilio-cli/package.nix @@ -8,11 +8,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "twilio-cli"; - version = "5.22.8"; + version = "5.22.9"; src = fetchzip { url = "https://twilio-cli-prod.s3.amazonaws.com/twilio-v${finalAttrs.version}/twilio-v${finalAttrs.version}.tar.gz"; - hash = "sha256-1vDSFi6VL7s7IAMlTMj+7GrvY8evrnFPXaznSM27c6E="; + hash = "sha256-drQUlu5xc9HUlVP/OHDDWNEaSxT/90yhiKYh9bq2G4E="; }; buildInputs = [ nodejs-slim ]; diff --git a/pkgs/by-name/ty/typst-lsp/Cargo.lock b/pkgs/by-name/ty/typst-lsp/Cargo.lock deleted file mode 100644 index 2fd85ca28a54..000000000000 --- a/pkgs/by-name/ty/typst-lsp/Cargo.lock +++ /dev/null @@ -1,4339 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "addr2line" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" -dependencies = [ - "gimli", -] - -[[package]] -name = "adler" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" - -[[package]] -name = "ahash" -version = "0.8.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" -dependencies = [ - "cfg-if", - "once_cell", - "version_check", - "zerocopy", -] - -[[package]] -name = "aho-corasick" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" -dependencies = [ - "memchr", -] - -[[package]] -name = "allocator-api2" -version = "0.2.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f" - -[[package]] -name = "android-tzdata" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" - -[[package]] -name = "android_system_properties" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" -dependencies = [ - "libc", -] - -[[package]] -name = "anyhow" -version = "1.0.86" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" - -[[package]] -name = "approx" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cab112f0a86d568ea0e627cc1d6be74a1e9cd55214684db5561995f6dad897c6" -dependencies = [ - "num-traits", -] - -[[package]] -name = "arrayref" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d151e35f61089500b617991b791fc8bfd237ae50cd5950803758a179b41e67a" - -[[package]] -name = "arrayvec" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" - -[[package]] -name = "async-channel" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35" -dependencies = [ - "concurrent-queue", - "event-listener", - "futures-core", -] - -[[package]] -name = "async-compression" -version = "0.4.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fec134f64e2bc57411226dfc4e52dec859ddfc7e711fc5e07b612584f000e4aa" -dependencies = [ - "flate2", - "futures-core", - "memchr", - "pin-project-lite", - "tokio", -] - -[[package]] -name = "async-trait" -version = "0.1.81" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "auto_impl" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c87f3f15e7794432337fc718554eaa4dc8f04c9677a950ffe366f20a162ae42" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "autocfg" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" - -[[package]] -name = "az" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b7e4c2464d97fe331d41de9d5db0def0a96f4d823b8b32a2efd503578988973" - -[[package]] -name = "backtrace" -version = "0.3.73" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a" -dependencies = [ - "addr2line", - "cc", - "cfg-if", - "libc", - "miniz_oxide", - "object", - "rustc-demangle", -] - -[[package]] -name = "base64" -version = "0.21.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" - -[[package]] -name = "base64" -version = "0.22.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" - -[[package]] -name = "biblatex" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27fe7285040d0227cd8b5395e1c4783f44f0b673eca5a657f4432ae401f2b7b8" -dependencies = [ - "numerals", - "paste", - "strum", - "unicode-normalization", - "unscanny", -] - -[[package]] -name = "bincode" -version = "1.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" -dependencies = [ - "serde", -] - -[[package]] -name = "bit-set" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1" -dependencies = [ - "bit-vec", -] - -[[package]] -name = "bit-vec" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" - -[[package]] -name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - -[[package]] -name = "bitflags" -version = "2.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" -dependencies = [ - "serde", -] - -[[package]] -name = "bpaf" -version = "0.9.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3280efcf6d66bc77c2cf9b67dc8acee47a217d9be67dd590b3230dffe663724d" -dependencies = [ - "owo-colors", - "supports-color", -] - -[[package]] -name = "bstr" -version = "1.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40723b8fb387abc38f4f4a37c09073622e41dd12327033091ef8950659e6dc0c" -dependencies = [ - "memchr", - "serde", -] - -[[package]] -name = "bumpalo" -version = "3.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" - -[[package]] -name = "by_address" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64fa3c856b712db6612c019f14756e64e4bcea13337a6b33b696333a9eaa2d06" - -[[package]] -name = "bytemuck" -version = "1.16.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "102087e286b4677862ea56cf8fc58bb2cdfa8725c40ffb80fe3a008eb7f2fc83" - -[[package]] -name = "byteorder" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" - -[[package]] -name = "bytes" -version = "1.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50" - -[[package]] -name = "camino" -version = "1.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0ec6b951b160caa93cc0c7b209e5a3bff7aae9062213451ac99493cd844c239" -dependencies = [ - "serde", -] - -[[package]] -name = "cargo-platform" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24b1f0365a6c6bb4020cd05806fd0d33c44d38046b8bd7f0e40814b9763cabfc" -dependencies = [ - "serde", -] - -[[package]] -name = "cargo_metadata" -version = "0.18.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d886547e41f740c616ae73108f6eb70afe6d940c7bc697cb30f13daec073037" -dependencies = [ - "camino", - "cargo-platform", - "semver", - "serde", - "serde_json", - "thiserror", -] - -[[package]] -name = "castaway" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2698f953def977c68f935bb0dfa959375ad4638570e969e2f1e9f433cbf1af6" - -[[package]] -name = "cc" -version = "1.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26a5c3fd7bfa1ce3897a3a3501d362b2d87b7f2583ebcb4a949ec25911025cbc" - -[[package]] -name = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - -[[package]] -name = "chinese-number" -version = "0.7.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49fccaef6346f6d6a741908d3b79fe97c2debe2fbb5eb3a7d00ff5981b52bb6c" -dependencies = [ - "chinese-variant", - "enum-ordinalize", - "num-bigint", - "num-traits", -] - -[[package]] -name = "chinese-variant" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7588475145507237ded760e52bf2f1085495245502033756d28ea72ade0e498b" - -[[package]] -name = "chrono" -version = "0.4.38" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" -dependencies = [ - "android-tzdata", - "iana-time-zone", - "num-traits", - "windows-targets 0.52.6", -] - -[[package]] -name = "ciborium" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42e69ffd6f0917f5c029256a24d0161db17cea3997d185db0d35926308770f0e" -dependencies = [ - "ciborium-io", - "ciborium-ll", - "serde", -] - -[[package]] -name = "ciborium-io" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05afea1e0a06c9be33d539b876f1ce3692f4afea2cb41f740e7743225ed1c757" - -[[package]] -name = "ciborium-ll" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57663b653d948a338bfb3eeba9bb2fd5fcfaecb9e199e87e1eda4d9e8b240fd9" -dependencies = [ - "ciborium-io", - "half", -] - -[[package]] -name = "citationberg" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d259fe9fd78ffa05a119581d20fddb50bfba428311057b12741ffb9015123d0b" -dependencies = [ - "quick-xml 0.31.0", - "serde", -] - -[[package]] -name = "cobs" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67ba02a97a2bd10f4b59b25c7973101c79642302776489e030cd13cdab09ed15" - -[[package]] -name = "color_quant" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" - -[[package]] -name = "comemo" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf5705468fa80602ee6a5f9318306e6c428bffd53e43209a78bc05e6e667c6f4" -dependencies = [ - "comemo-macros 0.3.1", - "siphasher 1.0.1", -] - -[[package]] -name = "comemo" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df6916408a724339aa77b18214233355f3eb04c42eb895e5f8909215bd8a7a91" -dependencies = [ - "comemo-macros 0.4.0", - "once_cell", - "parking_lot", - "siphasher 1.0.1", -] - -[[package]] -name = "comemo-macros" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54af6ac68ada2d161fa9cc1ab52676228e340866d094d6542107e74b82acc095" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "comemo-macros" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8936e42f9b4f5bdfaf23700609ac1f11cb03ad4c1ec128a4ee4fd0903e228db" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "concurrent-queue" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973" -dependencies = [ - "crossbeam-utils", -] - -[[package]] -name = "core-foundation" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "core-foundation-sys" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" - -[[package]] -name = "core_maths" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3b02505ccb8c50b0aa21ace0fc08c3e53adebd4e58caa18a36152803c7709a3" -dependencies = [ - "libm", -] - -[[package]] -name = "crc32fast" -version = "1.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "crossbeam-channel" -version = "0.5.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2" -dependencies = [ - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-deque" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" -dependencies = [ - "crossbeam-epoch", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-epoch" -version = "0.9.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" -dependencies = [ - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-utils" -version = "0.8.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" - -[[package]] -name = "crunchy" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" - -[[package]] -name = "csv" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac574ff4d437a7b5ad237ef331c17ccca63c46479e5b5453eb8e10bb99a759fe" -dependencies = [ - "csv-core", - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "csv-core" -version = "0.1.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5efa2b3d7902f4b634a20cae3c9c4e6209dc4779feb6863329607560143efa70" -dependencies = [ - "memchr", -] - -[[package]] -name = "curl" -version = "0.4.46" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e2161dd6eba090ff1594084e95fd67aeccf04382ffea77999ea94ed42ec67b6" -dependencies = [ - "curl-sys", - "libc", - "openssl-probe", - "openssl-sys", - "schannel", - "socket2", - "windows-sys 0.52.0", -] - -[[package]] -name = "curl-sys" -version = "0.4.74+curl-8.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8af10b986114528fcdc4b63b6f5f021b7057618411046a4de2ba0f0149a097bf" -dependencies = [ - "cc", - "libc", - "libz-sys", - "openssl-sys", - "pkg-config", - "vcpkg", - "windows-sys 0.52.0", -] - -[[package]] -name = "dashmap" -version = "5.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" -dependencies = [ - "cfg-if", - "hashbrown", - "lock_api", - "once_cell", - "parking_lot_core", -] - -[[package]] -name = "data-url" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c297a1c74b71ae29df00c3e22dd9534821d60eb9af5a0192823fa2acea70c2a" - -[[package]] -name = "deranged" -version = "0.3.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" -dependencies = [ - "powerfmt", -] - -[[package]] -name = "dirs" -version = "5.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225" -dependencies = [ - "dirs-sys", -] - -[[package]] -name = "dirs-sys" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c" -dependencies = [ - "libc", - "option-ext", - "redox_users", - "windows-sys 0.48.0", -] - -[[package]] -name = "displaydoc" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "downcast-rs" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2" - -[[package]] -name = "ecow" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d1990d053cf6edf3f030682dba3b0eb65ef01fabb2686072765d8a17d6728e8" -dependencies = [ - "serde", -] - -[[package]] -name = "ecow" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54bfbb1708988623190a6c4dbedaeaf0f53c20c6395abd6a01feb327b3146f4b" -dependencies = [ - "serde", -] - -[[package]] -name = "either" -version = "1.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" - -[[package]] -name = "elsa" -version = "1.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d98e71ae4df57d214182a2e5cb90230c0192c6ddfcaa05c36453d46a54713e10" -dependencies = [ - "stable_deref_trait", -] - -[[package]] -name = "embedded-io" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef1a6892d9eef45c8fa6b9e0086428a2cca8491aca8f787c534a3d6d0bcb3ced" - -[[package]] -name = "encoding_rs" -version = "0.8.34" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "enum-ordinalize" -version = "4.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fea0dcfa4e54eeb516fe454635a95753ddd39acda650ce703031c6973e315dd5" -dependencies = [ - "enum-ordinalize-derive", -] - -[[package]] -name = "enum-ordinalize-derive" -version = "4.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d28318a75d4aead5c4db25382e8ef717932d0346600cacae6357eb5941bc5ff" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "equivalent" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" - -[[package]] -name = "errno" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" -dependencies = [ - "libc", - "windows-sys 0.52.0", -] - -[[package]] -name = "event-listener" -version = "2.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" - -[[package]] -name = "fancy-regex" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b95f7c0680e4142284cf8b22c14a476e87d61b004a3a0861872b32ef7ead40a2" -dependencies = [ - "bit-set", - "regex", -] - -[[package]] -name = "fast-srgb8" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd2e7510819d6fbf51a5545c8f922716ecfb14df168a3242f7d33e0239efe6a1" - -[[package]] -name = "fastrand" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" -dependencies = [ - "instant", -] - -[[package]] -name = "fastrand" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" - -[[package]] -name = "fdeflate" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f9bfee30e4dedf0ab8b422f03af778d9612b63f502710fc500a334ebe2de645" -dependencies = [ - "simd-adler32", -] - -[[package]] -name = "filetime" -version = "0.2.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd" -dependencies = [ - "cfg-if", - "libc", - "redox_syscall 0.4.1", - "windows-sys 0.52.0", -] - -[[package]] -name = "flate2" -version = "1.0.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f211bbe8e69bbd0cfdea405084f128ae8b4aaa6b0b522fc8f2b009084797920" -dependencies = [ - "crc32fast", - "miniz_oxide", -] - -[[package]] -name = "float-cmp" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98de4bbd547a563b716d8dfa9aad1cb19bfab00f4fa09a6a4ed21dbcf44ce9c4" - -[[package]] -name = "fnv" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" - -[[package]] -name = "fontconfig-parser" -version = "0.5.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1fcfcd44ca6e90c921fee9fa665d530b21ef1327a4c1a6c5250ea44b776ada7" -dependencies = [ - "roxmltree 0.20.0", -] - -[[package]] -name = "fontdb" -version = "0.16.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0299020c3ef3f60f526a4f64ab4a3d4ce116b1acbf24cdd22da0068e5d81dc3" -dependencies = [ - "fontconfig-parser", - "log", - "memmap2", - "slotmap", - "tinyvec", - "ttf-parser", -] - -[[package]] -name = "foreign-types" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" -dependencies = [ - "foreign-types-shared", -] - -[[package]] -name = "foreign-types-shared" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" - -[[package]] -name = "form_urlencoded" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" -dependencies = [ - "percent-encoding", -] - -[[package]] -name = "futures" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" -dependencies = [ - "futures-channel", - "futures-core", - "futures-executor", - "futures-io", - "futures-sink", - "futures-task", - "futures-util", -] - -[[package]] -name = "futures-channel" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" -dependencies = [ - "futures-core", - "futures-sink", -] - -[[package]] -name = "futures-core" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" - -[[package]] -name = "futures-executor" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" -dependencies = [ - "futures-core", - "futures-task", - "futures-util", -] - -[[package]] -name = "futures-io" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" - -[[package]] -name = "futures-lite" -version = "1.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" -dependencies = [ - "fastrand 1.9.0", - "futures-core", - "futures-io", - "memchr", - "parking", - "pin-project-lite", - "waker-fn", -] - -[[package]] -name = "futures-macro" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "futures-sink" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" - -[[package]] -name = "futures-task" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" - -[[package]] -name = "futures-util" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" -dependencies = [ - "futures-channel", - "futures-core", - "futures-io", - "futures-macro", - "futures-sink", - "futures-task", - "memchr", - "pin-project-lite", - "pin-utils", - "slab", -] - -[[package]] -name = "getrandom" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" -dependencies = [ - "cfg-if", - "libc", - "wasi", -] - -[[package]] -name = "gif" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80792593675e051cf94a4b111980da2ba60d4a83e43e0048c5693baab3977045" -dependencies = [ - "color_quant", - "weezl", -] - -[[package]] -name = "gif" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fb2d69b19215e18bb912fa30f7ce15846e301408695e44e0ef719f1da9e19f2" -dependencies = [ - "color_quant", - "weezl", -] - -[[package]] -name = "gimli" -version = "0.29.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" - -[[package]] -name = "glob" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" - -[[package]] -name = "globmatch" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3755076379cc2b2bbf53855fe718e1eed3093cfb769ebf5d290f617fa9cc09a0" -dependencies = [ - "globset", - "log", - "walkdir", -] - -[[package]] -name = "globset" -version = "0.4.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57da3b9b5b85bd66f31093f8c408b90a74431672542466497dcbdfdc02034be1" -dependencies = [ - "aho-corasick", - "bstr", - "log", - "regex-automata", - "regex-syntax", -] - -[[package]] -name = "h2" -version = "0.3.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8" -dependencies = [ - "bytes", - "fnv", - "futures-core", - "futures-sink", - "futures-util", - "http", - "indexmap", - "slab", - "tokio", - "tokio-util", - "tracing", -] - -[[package]] -name = "half" -version = "2.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888" -dependencies = [ - "cfg-if", - "crunchy", -] - -[[package]] -name = "hashbrown" -version = "0.14.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" -dependencies = [ - "ahash", - "allocator-api2", -] - -[[package]] -name = "hayagriva" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d0d20c98b77b86ce737876b2a1653e2e6abbeee84afbb39d72111091191c97a" -dependencies = [ - "biblatex", - "ciborium", - "citationberg", - "indexmap", - "numerals", - "paste", - "serde", - "serde_yaml", - "thiserror", - "unic-langid", - "unicode-segmentation", - "unscanny", - "url", -] - -[[package]] -name = "heck" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" - -[[package]] -name = "heck" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" - -[[package]] -name = "hermit-abi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" - -[[package]] -name = "http" -version = "0.2.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" -dependencies = [ - "bytes", - "fnv", - "itoa", -] - -[[package]] -name = "http-body" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" -dependencies = [ - "bytes", - "http", - "pin-project-lite", -] - -[[package]] -name = "httparse" -version = "1.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9" - -[[package]] -name = "httpdate" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" - -[[package]] -name = "hyper" -version = "0.14.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a152ddd61dfaec7273fe8419ab357f33aee0d914c5f4efbf0d96fa749eea5ec9" -dependencies = [ - "bytes", - "futures-channel", - "futures-core", - "futures-util", - "h2", - "http", - "http-body", - "httparse", - "httpdate", - "itoa", - "pin-project-lite", - "socket2", - "tokio", - "tower-service", - "tracing", - "want", -] - -[[package]] -name = "hyper-rustls" -version = "0.24.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" -dependencies = [ - "futures-util", - "http", - "hyper", - "rustls", - "tokio", - "tokio-rustls", -] - -[[package]] -name = "hyper-tls" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" -dependencies = [ - "bytes", - "hyper", - "native-tls", - "tokio", - "tokio-native-tls", -] - -[[package]] -name = "hypher" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b24ad5637230df201ab1034d593f1d09bf7f2a9274f2e8897638078579f4265" - -[[package]] -name = "iana-time-zone" -version = "0.1.60" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" -dependencies = [ - "android_system_properties", - "core-foundation-sys", - "iana-time-zone-haiku", - "js-sys", - "wasm-bindgen", - "windows-core", -] - -[[package]] -name = "iana-time-zone-haiku" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" -dependencies = [ - "cc", -] - -[[package]] -name = "icu_collections" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526" -dependencies = [ - "displaydoc", - "serde", - "yoke", - "zerofrom", - "zerovec", -] - -[[package]] -name = "icu_locid" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637" -dependencies = [ - "displaydoc", - "litemap", - "tinystr", - "writeable", - "zerovec", -] - -[[package]] -name = "icu_locid_transform" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e" -dependencies = [ - "displaydoc", - "icu_locid", - "icu_locid_transform_data", - "icu_provider", - "tinystr", - "zerovec", -] - -[[package]] -name = "icu_locid_transform_data" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e" - -[[package]] -name = "icu_properties" -version = "1.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93d6020766cfc6302c15dbbc9c8778c37e62c14427cb7f6e601d849e092aeef5" -dependencies = [ - "displaydoc", - "icu_collections", - "icu_locid_transform", - "icu_properties_data", - "icu_provider", - "serde", - "tinystr", - "zerovec", -] - -[[package]] -name = "icu_properties_data" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569" - -[[package]] -name = "icu_provider" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9" -dependencies = [ - "displaydoc", - "icu_locid", - "icu_provider_macros", - "postcard", - "serde", - "stable_deref_trait", - "tinystr", - "writeable", - "yoke", - "zerofrom", - "zerovec", -] - -[[package]] -name = "icu_provider_adapters" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6324dfd08348a8e0374a447ebd334044d766b1839bb8d5ccf2482a99a77c0bc" -dependencies = [ - "icu_locid", - "icu_locid_transform", - "icu_provider", - "tinystr", - "zerovec", -] - -[[package]] -name = "icu_provider_blob" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c24b98d1365f55d78186c205817631a4acf08d7a45bdf5dc9dcf9c5d54dccf51" -dependencies = [ - "icu_provider", - "postcard", - "serde", - "writeable", - "zerotrie", - "zerovec", -] - -[[package]] -name = "icu_provider_macros" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "icu_segmenter" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a717725612346ffc2d7b42c94b820db6908048f39434504cb130e8b46256b0de" -dependencies = [ - "core_maths", - "displaydoc", - "icu_collections", - "icu_locid", - "icu_provider", - "icu_segmenter_data", - "serde", - "utf8_iter", - "zerovec", -] - -[[package]] -name = "icu_segmenter_data" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f739ee737260d955e330bc83fdeaaf1631f7fb7ed218761d3c04bb13bb7d79df" - -[[package]] -name = "idna" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" -dependencies = [ - "unicode-bidi", - "unicode-normalization", -] - -[[package]] -name = "if_chain" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb56e1aa765b4b4f3aadfab769793b7087bb03a4ea4920644a6d238e2df5b9ed" - -[[package]] -name = "image" -version = "0.24.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5690139d2f55868e080017335e4b94cb7414274c74f1669c84fb5feba2c9f69d" -dependencies = [ - "bytemuck", - "byteorder", - "color_quant", - "gif 0.13.1", - "jpeg-decoder", - "num-traits", - "png", -] - -[[package]] -name = "imagesize" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "029d73f573d8e8d63e6d5020011d3255b28c3ba85d6cf870a07184ed23de9284" - -[[package]] -name = "indexmap" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3fc2e30ba82dd1b3911c8de1ffc143c74a914a14e99514d7637e3099df5ea0" -dependencies = [ - "equivalent", - "hashbrown", - "serde", -] - -[[package]] -name = "indexmap-nostd" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e04e2fd2b8188ea827b32ef11de88377086d690286ab35747ef7f9bf3ccb590" - -[[package]] -name = "instant" -version = "0.1.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "integer-encoding" -version = "3.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bb03732005da905c88227371639bf1ad885cc712789c011c31c5fb3ab3ccf02" - -[[package]] -name = "internment" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04e8e537b529b8674e97e9fb82c10ff168a290ac3867a0295f112061ffbca1ef" -dependencies = [ - "hashbrown", - "parking_lot", -] - -[[package]] -name = "ipnet" -version = "2.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" - -[[package]] -name = "is_ci" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7655c9839580ee829dfacba1d1278c2b7883e50a277ff7541299489d6bdfdc45" - -[[package]] -name = "isahc" -version = "1.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "334e04b4d781f436dc315cb1e7515bd96826426345d498149e4bde36b67f8ee9" -dependencies = [ - "async-channel", - "castaway", - "crossbeam-utils", - "curl", - "curl-sys", - "event-listener", - "futures-lite", - "http", - "log", - "once_cell", - "polling", - "slab", - "sluice", - "tracing", - "tracing-futures", - "url", - "waker-fn", -] - -[[package]] -name = "itertools" -version = "0.10.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" -dependencies = [ - "either", -] - -[[package]] -name = "itertools" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" -dependencies = [ - "either", -] - -[[package]] -name = "itoa" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" - -[[package]] -name = "jpeg-decoder" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0" - -[[package]] -name = "js-sys" -version = "0.3.69" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" -dependencies = [ - "wasm-bindgen", -] - -[[package]] -name = "kamadak-exif" -version = "0.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef4fc70d0ab7e5b6bafa30216a6b48705ea964cdfc29c050f2412295eba58077" -dependencies = [ - "mutate_once", -] - -[[package]] -name = "kurbo" -version = "0.9.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd85a5776cd9500c2e2059c8c76c3b01528566b7fcbaf8098b55a33fc298849b" -dependencies = [ - "arrayvec", -] - -[[package]] -name = "lazy_static" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" - -[[package]] -name = "libc" -version = "0.2.155" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" - -[[package]] -name = "libm" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" - -[[package]] -name = "libredox" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" -dependencies = [ - "bitflags 2.6.0", - "libc", -] - -[[package]] -name = "libz-sys" -version = "1.1.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c15da26e5af7e25c90b37a2d75cdbf940cf4a55316de9d84c679c9b8bfabf82e" -dependencies = [ - "cc", - "libc", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "linked-hash-map" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" - -[[package]] -name = "linux-raw-sys" -version = "0.4.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" - -[[package]] -name = "lipsum" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "636860251af8963cc40f6b4baadee105f02e21b28131d76eba8e40ce84ab8064" -dependencies = [ - "rand", - "rand_chacha", -] - -[[package]] -name = "litemap" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "643cb0b8d4fcc284004d5fd0d67ccf61dfffadb7f75e1e71bc420f4688a3a704" -dependencies = [ - "serde", -] - -[[package]] -name = "lock_api" -version = "0.4.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" -dependencies = [ - "autocfg", - "scopeguard", -] - -[[package]] -name = "log" -version = "0.4.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" - -[[package]] -name = "lsp-types" -version = "0.94.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c66bfd44a06ae10647fe3f8214762e9369fd4248df1350924b4ef9e770a85ea1" -dependencies = [ - "bitflags 1.3.2", - "serde", - "serde_json", - "serde_repr", - "url", -] - -[[package]] -name = "memchr" -version = "2.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" - -[[package]] -name = "memmap2" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe751422e4a8caa417e13c3ea66452215d7d63e19e604f4980461212f3ae1322" -dependencies = [ - "libc", -] - -[[package]] -name = "mime" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" - -[[package]] -name = "miniz_oxide" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" -dependencies = [ - "adler", - "simd-adler32", -] - -[[package]] -name = "mio" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4569e456d394deccd22ce1c1913e6ea0e54519f577285001215d33557431afe4" -dependencies = [ - "hermit-abi", - "libc", - "wasi", - "windows-sys 0.52.0", -] - -[[package]] -name = "mutate_once" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16cf681a23b4d0a43fc35024c176437f9dcd818db34e0f42ab456a0ee5ad497b" - -[[package]] -name = "native-tls" -version = "0.2.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8614eb2c83d59d1c8cc974dd3f920198647674a0a035e1af1fa58707e317466" -dependencies = [ - "libc", - "log", - "openssl", - "openssl-probe", - "openssl-sys", - "schannel", - "security-framework", - "security-framework-sys", - "tempfile", -] - -[[package]] -name = "num-bigint" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" -dependencies = [ - "num-integer", - "num-traits", -] - -[[package]] -name = "num-conv" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" - -[[package]] -name = "num-integer" -version = "0.1.46" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" -dependencies = [ - "num-traits", -] - -[[package]] -name = "num-traits" -version = "0.2.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" -dependencies = [ - "autocfg", -] - -[[package]] -name = "num_cpus" -version = "1.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" -dependencies = [ - "hermit-abi", - "libc", -] - -[[package]] -name = "numerals" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e25be21376a772d15f97ae789845340a9651d3c4246ff5ebb6a2b35f9c37bd31" - -[[package]] -name = "object" -version = "0.36.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27b64972346851a39438c60b341ebc01bba47464ae329e55cf343eb93964efd9" -dependencies = [ - "memchr", -] - -[[package]] -name = "once_cell" -version = "1.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" - -[[package]] -name = "openssl" -version = "0.10.66" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9529f4786b70a3e8c61e11179af17ab6188ad8d0ded78c5529441ed39d4bd9c1" -dependencies = [ - "bitflags 2.6.0", - "cfg-if", - "foreign-types", - "libc", - "once_cell", - "openssl-macros", - "openssl-sys", -] - -[[package]] -name = "openssl-macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "openssl-probe" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" - -[[package]] -name = "openssl-sys" -version = "0.9.103" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f9e8deee91df40a943c71b917e5874b951d32a802526c85721ce3b776c929d6" -dependencies = [ - "cc", - "libc", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "opentelemetry" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e32339a5dc40459130b3bd269e9892439f55b33e772d2a9d402a789baaf4e8a" -dependencies = [ - "futures-core", - "futures-sink", - "indexmap", - "js-sys", - "once_cell", - "pin-project-lite", - "thiserror", - "urlencoding", -] - -[[package]] -name = "opentelemetry-http" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f51189ce8be654f9b5f7e70e49967ed894e84a06fc35c6c042e64ac1fc5399e" -dependencies = [ - "async-trait", - "bytes", - "http", - "isahc", - "opentelemetry", -] - -[[package]] -name = "opentelemetry-jaeger" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e617c66fd588e40e0dbbd66932fdc87393095b125d4459b1a3a10feb1712f8a1" -dependencies = [ - "async-trait", - "futures-core", - "futures-util", - "http", - "isahc", - "opentelemetry", - "opentelemetry-http", - "opentelemetry-semantic-conventions", - "opentelemetry_sdk", - "thrift", - "tokio", -] - -[[package]] -name = "opentelemetry-semantic-conventions" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5774f1ef1f982ef2a447f6ee04ec383981a3ab99c8e77a1a7b30182e65bbc84" -dependencies = [ - "opentelemetry", -] - -[[package]] -name = "opentelemetry_sdk" -version = "0.21.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f16aec8a98a457a52664d69e0091bac3a0abd18ead9b641cb00202ba4e0efe4" -dependencies = [ - "async-trait", - "crossbeam-channel", - "futures-channel", - "futures-executor", - "futures-util", - "glob", - "once_cell", - "opentelemetry", - "ordered-float 4.2.2", - "percent-encoding", - "rand", - "thiserror", - "tokio", - "tokio-stream", -] - -[[package]] -name = "option-ext" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" - -[[package]] -name = "ordered-float" -version = "2.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68f19d67e5a2795c94e73e0bb1cc1a7edeb2e28efd39e2e1c9b7a40c1108b11c" -dependencies = [ - "num-traits", -] - -[[package]] -name = "ordered-float" -version = "4.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a91171844676f8c7990ce64959210cd2eaef32c2612c50f9fae9f8aaa6065a6" -dependencies = [ - "num-traits", -] - -[[package]] -name = "owo-colors" -version = "4.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "caff54706df99d2a78a5a4e3455ff45448d81ef1bb63c22cd14052ca0e993a3f" - -[[package]] -name = "palette" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cbf71184cc5ecc2e4e1baccdb21026c20e5fc3dcf63028a086131b3ab00b6e6" -dependencies = [ - "approx", - "fast-srgb8", - "libm", - "palette_derive", -] - -[[package]] -name = "palette_derive" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5030daf005bface118c096f510ffb781fc28f9ab6a32ab224d8631be6851d30" -dependencies = [ - "by_address", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "parking" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" - -[[package]] -name = "parking_lot" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" -dependencies = [ - "lock_api", - "parking_lot_core", -] - -[[package]] -name = "parking_lot_core" -version = "0.9.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" -dependencies = [ - "cfg-if", - "libc", - "redox_syscall 0.5.3", - "smallvec", - "windows-targets 0.52.6", -] - -[[package]] -name = "paste" -version = "1.0.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" - -[[package]] -name = "pdf-writer" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24e9127455063c816e661caac9ecd9043ad2871f55be93014e6838a8ced2332b" -dependencies = [ - "bitflags 1.3.2", - "itoa", - "memchr", - "ryu", -] - -[[package]] -name = "percent-encoding" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" - -[[package]] -name = "phf" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" -dependencies = [ - "phf_macros", - "phf_shared", -] - -[[package]] -name = "phf_generator" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0" -dependencies = [ - "phf_shared", - "rand", -] - -[[package]] -name = "phf_macros" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3444646e286606587e49f3bcf1679b8cef1dc2c5ecc29ddacaffc305180d464b" -dependencies = [ - "phf_generator", - "phf_shared", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "phf_shared" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" -dependencies = [ - "siphasher 0.3.11", -] - -[[package]] -name = "pico-args" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5be167a7af36ee22fe3115051bc51f6e6c7054c9348e28deb4f49bd6f705a315" - -[[package]] -name = "pin-project" -version = "1.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" -dependencies = [ - "pin-project-internal", -] - -[[package]] -name = "pin-project-internal" -version = "1.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "pin-project-lite" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" - -[[package]] -name = "pin-utils" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" - -[[package]] -name = "pkg-config" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" - -[[package]] -name = "plist" -version = "1.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42cf17e9a1800f5f396bc67d193dc9411b59012a5876445ef450d449881e1016" -dependencies = [ - "base64 0.22.1", - "indexmap", - "quick-xml 0.32.0", - "serde", - "time", -] - -[[package]] -name = "png" -version = "0.17.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06e4b0d3d1312775e782c86c91a111aa1f910cbb65e1337f9975b5f9a554b5e1" -dependencies = [ - "bitflags 1.3.2", - "crc32fast", - "fdeflate", - "flate2", - "miniz_oxide", -] - -[[package]] -name = "polling" -version = "2.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce" -dependencies = [ - "autocfg", - "bitflags 1.3.2", - "cfg-if", - "concurrent-queue", - "libc", - "log", - "pin-project-lite", - "windows-sys 0.48.0", -] - -[[package]] -name = "portable-atomic" -version = "1.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da544ee218f0d287a911e9c99a39a8c9bc8fcad3cb8db5959940044ecfc67265" - -[[package]] -name = "postcard" -version = "1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a55c51ee6c0db07e68448e336cf8ea4131a620edefebf9893e759b2d793420f8" -dependencies = [ - "cobs", - "embedded-io", - "serde", -] - -[[package]] -name = "powerfmt" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" - -[[package]] -name = "ppv-lite86" -version = "0.2.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" -dependencies = [ - "zerocopy", -] - -[[package]] -name = "proc-macro2" -version = "1.0.86" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "psm" -version = "0.1.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5787f7cda34e3033a72192c018bc5883100330f362ef279a8cbccfce8bb4e874" -dependencies = [ - "cc", -] - -[[package]] -name = "qcms" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edecfcd5d755a5e5d98e24cf43113e7cdaec5a070edd0f6b250c03a573da30fa" - -[[package]] -name = "quick-xml" -version = "0.31.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33" -dependencies = [ - "memchr", - "serde", -] - -[[package]] -name = "quick-xml" -version = "0.32.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d3a6e5838b60e0e8fa7a43f22ade549a37d61f8bdbe636d0d7816191de969c2" -dependencies = [ - "memchr", -] - -[[package]] -name = "quote" -version = "1.0.36" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "rand" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" -dependencies = [ - "libc", - "rand_chacha", - "rand_core", -] - -[[package]] -name = "rand_chacha" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" -dependencies = [ - "ppv-lite86", - "rand_core", -] - -[[package]] -name = "rand_core" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" -dependencies = [ - "getrandom", -] - -[[package]] -name = "rayon" -version = "1.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" -dependencies = [ - "either", - "rayon-core", -] - -[[package]] -name = "rayon-core" -version = "1.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" -dependencies = [ - "crossbeam-deque", - "crossbeam-utils", -] - -[[package]] -name = "redox_syscall" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" -dependencies = [ - "bitflags 1.3.2", -] - -[[package]] -name = "redox_syscall" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" -dependencies = [ - "bitflags 1.3.2", -] - -[[package]] -name = "redox_syscall" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4" -dependencies = [ - "bitflags 2.6.0", -] - -[[package]] -name = "redox_users" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891" -dependencies = [ - "getrandom", - "libredox", - "thiserror", -] - -[[package]] -name = "regex" -version = "1.10.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" -dependencies = [ - "aho-corasick", - "memchr", - "regex-automata", - "regex-syntax", -] - -[[package]] -name = "regex-automata" -version = "0.4.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax", -] - -[[package]] -name = "regex-syntax" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" - -[[package]] -name = "reqwest" -version = "0.11.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62" -dependencies = [ - "base64 0.21.7", - "bytes", - "encoding_rs", - "futures-core", - "futures-util", - "h2", - "http", - "http-body", - "hyper", - "hyper-rustls", - "hyper-tls", - "ipnet", - "js-sys", - "log", - "mime", - "native-tls", - "once_cell", - "percent-encoding", - "pin-project-lite", - "rustls", - "rustls-pemfile", - "serde", - "serde_json", - "serde_urlencoded", - "sync_wrapper", - "system-configuration", - "tokio", - "tokio-native-tls", - "tokio-rustls", - "tokio-util", - "tower-service", - "url", - "wasm-bindgen", - "wasm-bindgen-futures", - "wasm-streams", - "web-sys", - "webpki-roots", - "winreg", -] - -[[package]] -name = "resvg" -version = "0.38.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c34501046959e06470ba62a2dc7f31c15f94ac250d842a45f9e012f4ee40c1e" -dependencies = [ - "gif 0.12.0", - "jpeg-decoder", - "log", - "pico-args", - "png", - "rgb", - "svgtypes", - "tiny-skia", - "usvg", -] - -[[package]] -name = "rgb" -version = "0.8.47" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e12bc8d2f72df26a5d3178022df33720fbede0d31d82c7291662eff89836994d" -dependencies = [ - "bytemuck", -] - -[[package]] -name = "ring" -version = "0.17.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" -dependencies = [ - "cc", - "cfg-if", - "getrandom", - "libc", - "spin", - "untrusted", - "windows-sys 0.52.0", -] - -[[package]] -name = "roxmltree" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cd14fd5e3b777a7422cca79358c57a8f6e3a703d9ac187448d0daf220c2407f" - -[[package]] -name = "roxmltree" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c20b6793b5c2fa6553b250154b78d6d0db37e72700ae35fad9387a46f487c97" - -[[package]] -name = "rustc-demangle" -version = "0.1.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" - -[[package]] -name = "rustix" -version = "0.38.34" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" -dependencies = [ - "bitflags 2.6.0", - "errno", - "libc", - "linux-raw-sys", - "windows-sys 0.52.0", -] - -[[package]] -name = "rustls" -version = "0.21.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e" -dependencies = [ - "log", - "ring", - "rustls-webpki", - "sct", -] - -[[package]] -name = "rustls-pemfile" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" -dependencies = [ - "base64 0.21.7", -] - -[[package]] -name = "rustls-webpki" -version = "0.101.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" -dependencies = [ - "ring", - "untrusted", -] - -[[package]] -name = "rustversion" -version = "1.0.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" - -[[package]] -name = "rustybuzz" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0ae5692c5beaad6a9e22830deeed7874eae8a4e3ba4076fb48e12c56856222c" -dependencies = [ - "bitflags 2.6.0", - "bytemuck", - "smallvec", - "ttf-parser", - "unicode-bidi-mirroring", - "unicode-ccc", - "unicode-properties", - "unicode-script", -] - -[[package]] -name = "ryu" -version = "1.0.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" - -[[package]] -name = "same-file" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "schannel" -version = "0.1.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" -dependencies = [ - "windows-sys 0.52.0", -] - -[[package]] -name = "scopeguard" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" - -[[package]] -name = "sct" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" -dependencies = [ - "ring", - "untrusted", -] - -[[package]] -name = "security-framework" -version = "2.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" -dependencies = [ - "bitflags 2.6.0", - "core-foundation", - "core-foundation-sys", - "libc", - "security-framework-sys", -] - -[[package]] -name = "security-framework-sys" -version = "2.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75da29fe9b9b08fe9d6b22b5b4bcbc75d8db3aa31e639aa56bb62e9d46bfceaf" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "semver" -version = "1.0.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" -dependencies = [ - "serde", -] - -[[package]] -name = "serde" -version = "1.0.204" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde_derive" -version = "1.0.204" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "serde_json" -version = "1.0.122" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "784b6203951c57ff748476b126ccb5e8e2959a5c19e5c617ab1956be3dbc68da" -dependencies = [ - "itoa", - "memchr", - "ryu", - "serde", -] - -[[package]] -name = "serde_repr" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "serde_spanned" -version = "0.6.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d" -dependencies = [ - "serde", -] - -[[package]] -name = "serde_urlencoded" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" -dependencies = [ - "form_urlencoded", - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "serde_yaml" -version = "0.9.34+deprecated" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47" -dependencies = [ - "indexmap", - "itoa", - "ryu", - "serde", - "unsafe-libyaml", -] - -[[package]] -name = "sharded-slab" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" -dependencies = [ - "lazy_static", -] - -[[package]] -name = "simd-adler32" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" - -[[package]] -name = "simplecss" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a11be7c62927d9427e9f40f3444d5499d868648e2edbc4e2116de69e7ec0e89d" -dependencies = [ - "log", -] - -[[package]] -name = "siphasher" -version = "0.3.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" - -[[package]] -name = "siphasher" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d" - -[[package]] -name = "slab" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" -dependencies = [ - "autocfg", -] - -[[package]] -name = "slotmap" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbff4acf519f630b3a3ddcfaea6c06b42174d9a44bc70c620e9ed1649d58b82a" -dependencies = [ - "version_check", -] - -[[package]] -name = "sluice" -version = "0.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d7400c0eff44aa2fcb5e31a5f24ba9716ed90138769e4977a2ba6014ae63eb5" -dependencies = [ - "async-channel", - "futures-core", - "futures-io", -] - -[[package]] -name = "smallvec" -version = "1.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" - -[[package]] -name = "socket2" -version = "0.5.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" -dependencies = [ - "libc", - "windows-sys 0.52.0", -] - -[[package]] -name = "spin" -version = "0.9.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" - -[[package]] -name = "stable_deref_trait" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" - -[[package]] -name = "stacker" -version = "0.1.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c886bd4480155fd3ef527d45e9ac8dd7118a898a46530b7b94c3e21866259fce" -dependencies = [ - "cc", - "cfg-if", - "libc", - "psm", - "winapi", -] - -[[package]] -name = "strict-num" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6637bab7722d379c8b41ba849228d680cc12d0a45ba1fa2b48f2a30577a06731" -dependencies = [ - "float-cmp", -] - -[[package]] -name = "strum" -version = "0.26.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06" -dependencies = [ - "strum_macros", -] - -[[package]] -name = "strum_macros" -version = "0.26.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be" -dependencies = [ - "heck 0.5.0", - "proc-macro2", - "quote", - "rustversion", - "syn", -] - -[[package]] -name = "subsetter" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09eab8a83bff89ba2200bd4c59be45c7c787f988431b936099a5a266c957f2f9" - -[[package]] -name = "supports-color" -version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9829b314621dfc575df4e409e79f9d6a66a3bd707ab73f23cb4aa3a854ac854f" -dependencies = [ - "is_ci", -] - -[[package]] -name = "svg2pdf" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba36b330062be8497fd96597227a757b621b86c4d24d164b06e4522b52b3693e" -dependencies = [ - "image", - "miniz_oxide", - "once_cell", - "pdf-writer", - "resvg", - "tiny-skia", - "usvg", -] - -[[package]] -name = "svgtypes" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e44e288cd960318917cbd540340968b90becc8bc81f171345d706e7a89d9d70" -dependencies = [ - "kurbo", - "siphasher 0.3.11", -] - -[[package]] -name = "syn" -version = "2.0.72" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "sync_wrapper" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" - -[[package]] -name = "synstructure" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "syntect" -version = "5.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "874dcfa363995604333cf947ae9f751ca3af4522c60886774c4963943b4746b1" -dependencies = [ - "bincode", - "bitflags 1.3.2", - "fancy-regex", - "flate2", - "fnv", - "once_cell", - "plist", - "regex-syntax", - "serde", - "serde_derive", - "serde_json", - "thiserror", - "walkdir", - "yaml-rust", -] - -[[package]] -name = "system-configuration" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" -dependencies = [ - "bitflags 1.3.2", - "core-foundation", - "system-configuration-sys", -] - -[[package]] -name = "system-configuration-sys" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "temp-dir" -version = "0.1.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f227968ec00f0e5322f9b8173c7a0cbcff6181a0a5b28e9892491c286277231" - -[[package]] -name = "tempfile" -version = "3.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64" -dependencies = [ - "cfg-if", - "fastrand 2.1.0", - "once_cell", - "rustix", - "windows-sys 0.59.0", -] - -[[package]] -name = "thiserror" -version = "1.0.63" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.63" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "thread_local" -version = "1.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c" -dependencies = [ - "cfg-if", - "once_cell", -] - -[[package]] -name = "threadpool" -version = "1.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d050e60b33d41c19108b32cea32164033a9013fe3b46cbd4457559bfbf77afaa" -dependencies = [ - "num_cpus", -] - -[[package]] -name = "thrift" -version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e54bc85fc7faa8bc175c4bab5b92ba8d9a3ce893d0e9f42cc455c8ab16a9e09" -dependencies = [ - "byteorder", - "integer-encoding", - "log", - "ordered-float 2.10.1", - "threadpool", -] - -[[package]] -name = "time" -version = "0.3.36" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" -dependencies = [ - "deranged", - "itoa", - "num-conv", - "powerfmt", - "serde", - "time-core", - "time-macros", -] - -[[package]] -name = "time-core" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" - -[[package]] -name = "time-macros" -version = "0.2.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" -dependencies = [ - "num-conv", - "time-core", -] - -[[package]] -name = "tiny-skia" -version = "0.11.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83d13394d44dae3207b52a326c0c85a8bf87f1541f23b0d143811088497b09ab" -dependencies = [ - "arrayref", - "arrayvec", - "bytemuck", - "cfg-if", - "log", - "png", - "tiny-skia-path", -] - -[[package]] -name = "tiny-skia-path" -version = "0.11.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c9e7fc0c2e86a30b117d0462aa261b72b7a99b7ebd7deb3a14ceda95c5bdc93" -dependencies = [ - "arrayref", - "bytemuck", - "strict-num", -] - -[[package]] -name = "tinystr" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f" -dependencies = [ - "displaydoc", - "serde", - "zerovec", -] - -[[package]] -name = "tinyvec" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938" -dependencies = [ - "tinyvec_macros", -] - -[[package]] -name = "tinyvec_macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" - -[[package]] -name = "tokio" -version = "1.39.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "daa4fb1bc778bd6f04cbfc4bb2d06a7396a8f299dc33ea1900cedaa316f467b1" -dependencies = [ - "backtrace", - "bytes", - "libc", - "mio", - "pin-project-lite", - "socket2", - "tokio-macros", - "windows-sys 0.52.0", -] - -[[package]] -name = "tokio-macros" -version = "2.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "tokio-native-tls" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2" -dependencies = [ - "native-tls", - "tokio", -] - -[[package]] -name = "tokio-rustls" -version = "0.24.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" -dependencies = [ - "rustls", - "tokio", -] - -[[package]] -name = "tokio-stream" -version = "0.1.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af" -dependencies = [ - "futures-core", - "pin-project-lite", - "tokio", -] - -[[package]] -name = "tokio-tar" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d5714c010ca3e5c27114c1cdeb9d14641ace49874aa5626d7149e47aedace75" -dependencies = [ - "filetime", - "futures-core", - "libc", - "redox_syscall 0.3.5", - "tokio", - "tokio-stream", - "xattr", -] - -[[package]] -name = "tokio-util" -version = "0.7.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" -dependencies = [ - "bytes", - "futures-core", - "futures-sink", - "pin-project-lite", - "tokio", -] - -[[package]] -name = "toml" -version = "0.7.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257" -dependencies = [ - "serde", - "serde_spanned", - "toml_datetime", - "toml_edit 0.19.15", -] - -[[package]] -name = "toml" -version = "0.8.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e" -dependencies = [ - "serde", - "serde_spanned", - "toml_datetime", - "toml_edit 0.22.20", -] - -[[package]] -name = "toml_datetime" -version = "0.6.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" -dependencies = [ - "serde", -] - -[[package]] -name = "toml_edit" -version = "0.19.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" -dependencies = [ - "indexmap", - "serde", - "serde_spanned", - "toml_datetime", - "winnow 0.5.40", -] - -[[package]] -name = "toml_edit" -version = "0.22.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d" -dependencies = [ - "indexmap", - "serde", - "serde_spanned", - "toml_datetime", - "winnow 0.6.18", -] - -[[package]] -name = "tower" -version = "0.4.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" -dependencies = [ - "futures-core", - "futures-util", - "pin-project", - "pin-project-lite", - "tower-layer", - "tower-service", -] - -[[package]] -name = "tower-layer" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" - -[[package]] -name = "tower-lsp" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4ba052b54a6627628d9b3c34c176e7eda8359b7da9acd497b9f20998d118508" -dependencies = [ - "async-trait", - "auto_impl", - "bytes", - "dashmap", - "futures", - "httparse", - "lsp-types", - "memchr", - "serde", - "serde_json", - "tokio", - "tokio-util", - "tower", - "tower-lsp-macros", - "tracing", -] - -[[package]] -name = "tower-lsp-macros" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84fd902d4e0b9a4b27f2f440108dc034e1758628a9b702f8ec61ad66355422fa" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "tower-service" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" - -[[package]] -name = "tracing" -version = "0.1.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" -dependencies = [ - "log", - "pin-project-lite", - "tracing-attributes", - "tracing-core", -] - -[[package]] -name = "tracing-attributes" -version = "0.1.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "tracing-core" -version = "0.1.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" -dependencies = [ - "once_cell", - "valuable", -] - -[[package]] -name = "tracing-futures" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2" -dependencies = [ - "pin-project", - "tracing", -] - -[[package]] -name = "tracing-log" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3" -dependencies = [ - "log", - "once_cell", - "tracing-core", -] - -[[package]] -name = "tracing-opentelemetry" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c67ac25c5407e7b961fafc6f7e9aa5958fd297aada2d20fa2ae1737357e55596" -dependencies = [ - "js-sys", - "once_cell", - "opentelemetry", - "opentelemetry_sdk", - "smallvec", - "tracing", - "tracing-core", - "tracing-log", - "tracing-subscriber", - "web-time", -] - -[[package]] -name = "tracing-subscriber" -version = "0.3.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" -dependencies = [ - "sharded-slab", - "thread_local", - "tracing-core", -] - -[[package]] -name = "try-lock" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" - -[[package]] -name = "ttf-parser" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17f77d76d837a7830fe1d4f12b7b4ba4192c1888001c7164257e4bc6d21d96b4" - -[[package]] -name = "two-face" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37bed2135b2459c7eefba72c906d374697eb15949c205f2f124e3636a46b5eeb" -dependencies = [ - "once_cell", - "serde", - "syntect", -] - -[[package]] -name = "typed-arena" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6af6ae20167a9ece4bcb41af5b80f8a1f1df981f6391189ce00fd257af04126a" - -[[package]] -name = "typst" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12492297d20937494f0143ae50ef339e5fd3d927b4096af1c52fe73fb9c5fa9a" -dependencies = [ - "az", - "bitflags 2.6.0", - "chinese-number", - "ciborium", - "comemo 0.4.0", - "csv", - "ecow 0.2.2", - "fontdb", - "hayagriva", - "hypher", - "icu_properties", - "icu_provider", - "icu_provider_adapters", - "icu_provider_blob", - "icu_segmenter", - "if_chain", - "image", - "indexmap", - "kamadak-exif", - "kurbo", - "lipsum", - "log", - "once_cell", - "palette", - "phf", - "png", - "portable-atomic", - "qcms", - "rayon", - "regex", - "roxmltree 0.19.0", - "rustybuzz", - "serde", - "serde_json", - "serde_yaml", - "siphasher 1.0.1", - "smallvec", - "stacker", - "syntect", - "time", - "toml 0.8.19", - "ttf-parser", - "two-face", - "typed-arena", - "typst-assets", - "typst-macros", - "typst-syntax 0.11.1", - "typst-timing", - "unicode-bidi", - "unicode-math-class", - "unicode-script", - "unicode-segmentation", - "usvg", - "wasmi", -] - -[[package]] -name = "typst-assets" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b3061f8d268e8eec7481c9ab24540455cb4912983c49aae38fa6e8bf8ef4d9c" - -[[package]] -name = "typst-ide" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3921e77003924e164f75a166a8d78a8f708479f43fa7e7cc7152f6bdf9558016" -dependencies = [ - "comemo 0.4.0", - "ecow 0.2.2", - "if_chain", - "log", - "serde", - "typst", - "unscanny", -] - -[[package]] -name = "typst-lsp" -version = "0.13.0" -dependencies = [ - "anyhow", - "async-compression", - "async-trait", - "bpaf", - "cargo_metadata", - "chrono", - "comemo 0.4.0", - "dirs", - "elsa", - "fontdb", - "futures", - "if_chain", - "indexmap", - "internment", - "itertools 0.12.1", - "lazy_static", - "once_cell", - "opentelemetry", - "opentelemetry-jaeger", - "parking_lot", - "percent-encoding", - "regex", - "reqwest", - "same-file", - "serde", - "serde_json", - "siphasher 1.0.1", - "strum", - "temp-dir", - "thiserror", - "tokio", - "tokio-tar", - "tokio-util", - "tower-lsp", - "tracing", - "tracing-opentelemetry", - "tracing-subscriber", - "typst", - "typst-ide", - "typst-pdf", - "typstfmt_lib", - "walkdir", -] - -[[package]] -name = "typst-macros" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5a0fdfd46b4920b0f8e4215e5b8438c737e8bc3498a681ea59b0130228363fc" -dependencies = [ - "heck 0.4.1", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "typst-pdf" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54f743b64330e576d31b2108626490ae1fbd7fb4bb28307536ceff3227a4e0d5" -dependencies = [ - "base64 0.22.1", - "bytemuck", - "comemo 0.4.0", - "ecow 0.2.2", - "image", - "miniz_oxide", - "once_cell", - "pdf-writer", - "subsetter", - "svg2pdf", - "ttf-parser", - "typst", - "typst-assets", - "typst-macros", - "typst-timing", - "unicode-properties", - "unscanny", - "xmp-writer", -] - -[[package]] -name = "typst-syntax" -version = "0.7.0" -source = "git+https://github.com/typst/typst.git?tag=v0.7.0#da8367e189b02918a8fe1a98fd3059fd11a82cd9" -dependencies = [ - "comemo 0.3.1", - "ecow 0.1.2", - "once_cell", - "serde", - "tracing", - "unicode-ident", - "unicode-math-class", - "unicode-segmentation", - "unscanny", -] - -[[package]] -name = "typst-syntax" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3db69f2f41613b1ff6edbec44fd7dc524137f099ee36c46f560cedeaadb40c4" -dependencies = [ - "comemo 0.4.0", - "ecow 0.2.2", - "once_cell", - "serde", - "unicode-ident", - "unicode-math-class", - "unicode-script", - "unicode-segmentation", - "unscanny", -] - -[[package]] -name = "typst-timing" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b58e17192bcacb2a39aace6d3eece70f008b2949ce384ac501a58357fafee67" -dependencies = [ - "parking_lot", - "serde", - "serde_json", - "typst-syntax 0.11.1", -] - -[[package]] -name = "typstfmt_lib" -version = "0.2.7" -source = "git+https://github.com/astrale-sharp/typstfmt?tag=0.2.7#46b4ec34b4726c3c6541012f433c68c22d9e509c" -dependencies = [ - "globmatch", - "itertools 0.10.5", - "regex", - "serde", - "toml 0.7.8", - "tracing", - "typst-syntax 0.7.0", - "unicode-segmentation", -] - -[[package]] -name = "unic-langid" -version = "0.9.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23dd9d1e72a73b25e07123a80776aae3e7b0ec461ef94f9151eed6ec88005a44" -dependencies = [ - "unic-langid-impl", -] - -[[package]] -name = "unic-langid-impl" -version = "0.9.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a5422c1f65949306c99240b81de9f3f15929f5a8bfe05bb44b034cc8bf593e5" -dependencies = [ - "serde", - "tinystr", -] - -[[package]] -name = "unicode-bidi" -version = "0.3.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" - -[[package]] -name = "unicode-bidi-mirroring" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56d12260fb92d52f9008be7e4bca09f584780eb2266dc8fecc6a192bec561694" - -[[package]] -name = "unicode-ccc" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc2520efa644f8268dce4dcd3050eaa7fc044fca03961e9998ac7e2e92b77cf1" - -[[package]] -name = "unicode-ident" -version = "1.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" - -[[package]] -name = "unicode-math-class" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d246cf599d5fae3c8d56e04b20eb519adb89a8af8d0b0fbcded369aa3647d65" - -[[package]] -name = "unicode-normalization" -version = "0.1.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" -dependencies = [ - "tinyvec", -] - -[[package]] -name = "unicode-properties" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4259d9d4425d9f0661581b804cb85fe66a4c631cadd8f490d1c13a35d5d9291" - -[[package]] -name = "unicode-script" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad8d71f5726e5f285a935e9fe8edfd53f0491eb6e9a5774097fdabee7cd8c9cd" - -[[package]] -name = "unicode-segmentation" -version = "1.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" - -[[package]] -name = "unicode-vo" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1d386ff53b415b7fe27b50bb44679e2cc4660272694b7b6f3326d8480823a94" - -[[package]] -name = "unsafe-libyaml" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861" - -[[package]] -name = "unscanny" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9df2af067a7953e9c3831320f35c1cc0600c30d44d9f7a12b01db1cd88d6b47" - -[[package]] -name = "untrusted" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" - -[[package]] -name = "url" -version = "2.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" -dependencies = [ - "form_urlencoded", - "idna", - "percent-encoding", - "serde", -] - -[[package]] -name = "urlencoding" -version = "2.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" - -[[package]] -name = "usvg" -version = "0.38.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "377f62b4a3c173de8654c1aa80ab1dac1154e6f13a779a9943e53780120d1625" -dependencies = [ - "base64 0.21.7", - "log", - "pico-args", - "usvg-parser", - "usvg-text-layout", - "usvg-tree", - "xmlwriter", -] - -[[package]] -name = "usvg-parser" -version = "0.38.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "351a05e6f2023d6b4e946f734240a3927aefdcf930d7d42587a2c8a8869814b0" -dependencies = [ - "data-url", - "flate2", - "imagesize", - "kurbo", - "log", - "roxmltree 0.19.0", - "simplecss", - "siphasher 0.3.11", - "svgtypes", - "usvg-tree", -] - -[[package]] -name = "usvg-text-layout" -version = "0.38.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c41888b9d5cf431fe852eaf9d047bbde83251b98f1749c2f08b1071e6db46e2" -dependencies = [ - "fontdb", - "kurbo", - "log", - "rustybuzz", - "unicode-bidi", - "unicode-script", - "unicode-vo", - "usvg-tree", -] - -[[package]] -name = "usvg-tree" -version = "0.38.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18863e0404ed153d6e56362c5b1146db9f4f262a3244e3cf2dbe7d8a85909f05" -dependencies = [ - "strict-num", - "svgtypes", - "tiny-skia-path", -] - -[[package]] -name = "utf8_iter" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" - -[[package]] -name = "valuable" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" - -[[package]] -name = "vcpkg" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" - -[[package]] -name = "version_check" -version = "0.9.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" - -[[package]] -name = "waker-fn" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "317211a0dc0ceedd78fb2ca9a44aed3d7b9b26f81870d485c07122b4350673b7" - -[[package]] -name = "walkdir" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" -dependencies = [ - "same-file", - "winapi-util", -] - -[[package]] -name = "want" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" -dependencies = [ - "try-lock", -] - -[[package]] -name = "wasi" -version = "0.11.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" - -[[package]] -name = "wasm-bindgen" -version = "0.2.92" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" -dependencies = [ - "cfg-if", - "wasm-bindgen-macro", -] - -[[package]] -name = "wasm-bindgen-backend" -version = "0.2.92" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" -dependencies = [ - "bumpalo", - "log", - "once_cell", - "proc-macro2", - "quote", - "syn", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-futures" -version = "0.4.42" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0" -dependencies = [ - "cfg-if", - "js-sys", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "wasm-bindgen-macro" -version = "0.2.92" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" -dependencies = [ - "quote", - "wasm-bindgen-macro-support", -] - -[[package]] -name = "wasm-bindgen-macro-support" -version = "0.2.92" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" -dependencies = [ - "proc-macro2", - "quote", - "syn", - "wasm-bindgen-backend", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-shared" -version = "0.2.92" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" - -[[package]] -name = "wasm-streams" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b65dc4c90b63b118468cf747d8bf3566c1913ef60be765b5730ead9e0a3ba129" -dependencies = [ - "futures-util", - "js-sys", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", -] - -[[package]] -name = "wasmi" -version = "0.31.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77a8281d1d660cdf54c76a3efa9ddd0c270cada1383a995db3ccb43d166456c7" -dependencies = [ - "smallvec", - "spin", - "wasmi_arena", - "wasmi_core", - "wasmparser-nostd", -] - -[[package]] -name = "wasmi_arena" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "104a7f73be44570cac297b3035d76b169d6599637631cf37a1703326a0727073" - -[[package]] -name = "wasmi_core" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcf1a7db34bff95b85c261002720c00c3a6168256dcb93041d3fa2054d19856a" -dependencies = [ - "downcast-rs", - "libm", - "num-traits", - "paste", -] - -[[package]] -name = "wasmparser-nostd" -version = "0.100.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5a015fe95f3504a94bb1462c717aae75253e39b9dd6c3fb1062c934535c64aa" -dependencies = [ - "indexmap-nostd", -] - -[[package]] -name = "web-sys" -version = "0.3.69" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" -dependencies = [ - "js-sys", - "wasm-bindgen", -] - -[[package]] -name = "web-time" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa30049b1c872b72c89866d458eae9f20380ab280ffd1b1e18df2d3e2d98cfe0" -dependencies = [ - "js-sys", - "wasm-bindgen", -] - -[[package]] -name = "webpki-roots" -version = "0.25.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1" - -[[package]] -name = "weezl" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082" - -[[package]] -name = "winapi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", -] - -[[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - -[[package]] -name = "winapi-util" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" -dependencies = [ - "windows-sys 0.59.0", -] - -[[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - -[[package]] -name = "windows-core" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" -dependencies = [ - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-sys" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" -dependencies = [ - "windows-targets 0.48.5", -] - -[[package]] -name = "windows-sys" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" -dependencies = [ - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-sys" -version = "0.59.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" -dependencies = [ - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-targets" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" -dependencies = [ - "windows_aarch64_gnullvm 0.48.5", - "windows_aarch64_msvc 0.48.5", - "windows_i686_gnu 0.48.5", - "windows_i686_msvc 0.48.5", - "windows_x86_64_gnu 0.48.5", - "windows_x86_64_gnullvm 0.48.5", - "windows_x86_64_msvc 0.48.5", -] - -[[package]] -name = "windows-targets" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" -dependencies = [ - "windows_aarch64_gnullvm 0.52.6", - "windows_aarch64_msvc 0.52.6", - "windows_i686_gnu 0.52.6", - "windows_i686_gnullvm", - "windows_i686_msvc 0.52.6", - "windows_x86_64_gnu 0.52.6", - "windows_x86_64_gnullvm 0.52.6", - "windows_x86_64_msvc 0.52.6", -] - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" - -[[package]] -name = "windows_i686_gnu" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" - -[[package]] -name = "windows_i686_gnu" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" - -[[package]] -name = "windows_i686_gnullvm" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" - -[[package]] -name = "windows_i686_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" - -[[package]] -name = "windows_i686_msvc" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" - -[[package]] -name = "winnow" -version = "0.5.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" -dependencies = [ - "memchr", -] - -[[package]] -name = "winnow" -version = "0.6.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f" -dependencies = [ - "memchr", -] - -[[package]] -name = "winreg" -version = "0.50.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" -dependencies = [ - "cfg-if", - "windows-sys 0.48.0", -] - -[[package]] -name = "writeable" -version = "0.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51" - -[[package]] -name = "xattr" -version = "1.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f" -dependencies = [ - "libc", - "linux-raw-sys", - "rustix", -] - -[[package]] -name = "xmlwriter" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec7a2a501ed189703dba8b08142f057e887dfc4b2cc4db2d343ac6376ba3e0b9" - -[[package]] -name = "xmp-writer" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4543ba138f64a94b19e1e9c66c165bca7e03d470e1c066cb76ea279d9d0e1989" - -[[package]] -name = "yaml-rust" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85" -dependencies = [ - "linked-hash-map", -] - -[[package]] -name = "yoke" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c5b1314b079b0930c31e3af543d8ee1757b1951ae1e1565ec704403a7240ca5" -dependencies = [ - "serde", - "stable_deref_trait", - "yoke-derive", - "zerofrom", -] - -[[package]] -name = "yoke-derive" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28cc31741b18cb6f1d5ff12f5b7523e3d6eb0852bbbad19d73905511d9849b95" -dependencies = [ - "proc-macro2", - "quote", - "syn", - "synstructure", -] - -[[package]] -name = "zerocopy" -version = "0.7.35" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" -dependencies = [ - "byteorder", - "zerocopy-derive", -] - -[[package]] -name = "zerocopy-derive" -version = "0.7.35" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "zerofrom" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91ec111ce797d0e0784a1116d0ddcdbea84322cd79e5d5ad173daeba4f93ab55" -dependencies = [ - "zerofrom-derive", -] - -[[package]] -name = "zerofrom-derive" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ea7b4a3637ea8669cedf0f1fd5c286a17f3de97b8dd5a70a6c167a1730e63a5" -dependencies = [ - "proc-macro2", - "quote", - "syn", - "synstructure", -] - -[[package]] -name = "zerotrie" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb594dd55d87335c5f60177cee24f19457a5ec10a065e0a3014722ad252d0a1f" -dependencies = [ - "displaydoc", - "litemap", - "serde", - "zerovec", -] - -[[package]] -name = "zerovec" -version = "0.10.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079" -dependencies = [ - "serde", - "yoke", - "zerofrom", - "zerovec-derive", -] - -[[package]] -name = "zerovec-derive" -version = "0.10.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] diff --git a/pkgs/by-name/ty/typst-lsp/package.nix b/pkgs/by-name/ty/typst-lsp/package.nix deleted file mode 100644 index d5b9693428da..000000000000 --- a/pkgs/by-name/ty/typst-lsp/package.nix +++ /dev/null @@ -1,84 +0,0 @@ -{ - lib, - rustPlatform, - fetchFromGitHub, - stdenv, - darwin, - nix-update-script, - vscode-extensions, - testers, - typst-lsp, -}: - -rustPlatform.buildRustPackage rec { - pname = "typst-lsp"; - # Please update the corresponding vscode extension when updating - # this derivation. - version = "0.13.0"; - - src = fetchFromGitHub { - owner = "nvarner"; - repo = "typst-lsp"; - tag = "v${version}"; - hash = "sha256-OubKtSHw9L4GzVzZY0AVdHY7LzKg/XQIhUfUc2OYAG0="; - }; - - cargoLock = { - lockFile = ./Cargo.lock; - outputHashes = { - "typst-syntax-0.7.0" = "sha256-yrtOmlFAKOqAmhCP7n0HQCOQpU3DWyms5foCdUb9QTg="; - "typstfmt_lib-0.2.7" = "sha256-LBYsTCjZ+U+lgd7Z3H1sBcWwseoHsuepPd66bWgfvhI="; - }; - }; - - # In order to make typst-lsp build with rust >= 1.80, we use the patched Cargo.lock from - # https://github.com/nvarner/typst-lsp/pull/515 - # TODO remove once the PR will have been merged upstream - postPatch = '' - rm Cargo.lock - ln -s ${./Cargo.lock} Cargo.lock - ''; - - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.SystemConfiguration - ]; - - checkFlags = - [ - # requires internet access - "--skip=workspace::package::external::remote_repo::test::full_download" - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - # both tests fail on darwin with 'Attempted to create a NULL object.' - "--skip=workspace::fs::local::test::read" - "--skip=workspace::package::external::manager::test::local_package" - ]; - - # workspace::package::external::manager::test::local_package tries to access the data directory - preCheck = '' - export HOME=$(mktemp -d) - ''; - - passthru = { - updateScript = nix-update-script { }; - tests = { - vscode-extension = vscode-extensions.nvarner.typst-lsp; - version = testers.testVersion { package = typst-lsp; }; - }; - }; - - meta = { - description = "Brand-new language server for Typst"; - homepage = "https://github.com/nvarner/typst-lsp"; - mainProgram = "typst-lsp"; - changelog = "https://github.com/nvarner/typst-lsp/releases/tag/v${version}"; - license = with lib.licenses; [ - asl20 - mit - ]; - maintainers = with lib.maintainers; [ - figsoda - GaetanLepage - ]; - }; -} diff --git a/pkgs/by-name/ui/uiua/package.nix b/pkgs/by-name/ui/uiua/package.nix index 87a0bbccf4b1..f9d5b3513ba3 100644 --- a/pkgs/by-name/ui/uiua/package.nix +++ b/pkgs/by-name/ui/uiua/package.nix @@ -36,6 +36,7 @@ lib.fix ( rustPlatform.buildRustPackage rec { pname = "uiua"; inherit (versionInfo) version cargoHash; + useFetchCargoVendor = true; src = fetchFromGitHub { owner = "uiua-lang"; diff --git a/pkgs/by-name/ui/uiua/stable.nix b/pkgs/by-name/ui/uiua/stable.nix index 54fa065f5a1e..59cb86f7329d 100644 --- a/pkgs/by-name/ui/uiua/stable.nix +++ b/pkgs/by-name/ui/uiua/stable.nix @@ -2,6 +2,6 @@ rec { version = "0.14.1"; tag = version; hash = "sha256-+FiJYxB2Lb1B7l9QEuB/XzdEYgJZmYAQpKimRIhWwhc="; - cargoHash = "sha256-0ZK87aX3akEPEXIsFrbOvTfhW24TZCuCcSVp+j8ylyg="; + cargoHash = "sha256-bDj7pvZORP1cc2PXd1W9TWptWCvIKW9TXzaQAmni6hg="; updateScript = ./update-stable.sh; } diff --git a/pkgs/by-name/ui/uiua/unstable.nix b/pkgs/by-name/ui/uiua/unstable.nix index 0f9b6f39cbc1..2ea907bcfaaf 100644 --- a/pkgs/by-name/ui/uiua/unstable.nix +++ b/pkgs/by-name/ui/uiua/unstable.nix @@ -2,6 +2,6 @@ rec { version = "0.14.1"; tag = version; hash = "sha256-+FiJYxB2Lb1B7l9QEuB/XzdEYgJZmYAQpKimRIhWwhc="; - cargoHash = "sha256-0ZK87aX3akEPEXIsFrbOvTfhW24TZCuCcSVp+j8ylyg="; + cargoHash = "sha256-bDj7pvZORP1cc2PXd1W9TWptWCvIKW9TXzaQAmni6hg="; updateScript = ./update-unstable.sh; } diff --git a/pkgs/by-name/ul/ultrastardx/package.nix b/pkgs/by-name/ul/ultrastardx/package.nix index 4bf46c62e557..483b9e95785f 100644 --- a/pkgs/by-name/ul/ultrastardx/package.nix +++ b/pkgs/by-name/ul/ultrastardx/package.nix @@ -47,13 +47,13 @@ let in stdenv.mkDerivation rec { pname = "ultrastardx"; - version = "2024.10.0"; + version = "2025.1.0"; src = fetchFromGitHub { owner = "UltraStar-Deluxe"; repo = "USDX"; rev = "v${version}"; - hash = "sha256-X5LixPRAI7A8Ns3D2A24T05w0iHag1EJVqt0aW1ZBps="; + hash = "sha256-8/qFzPP3Gw9YAGsnyI+wJUP3Jo8UoZkihRgYg4P5MVo="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/um/umu-launcher/package.nix b/pkgs/by-name/um/umu-launcher/package.nix index b51066e18a8a..ec120b8a23d2 100644 --- a/pkgs/by-name/um/umu-launcher/package.nix +++ b/pkgs/by-name/um/umu-launcher/package.nix @@ -2,13 +2,21 @@ buildFHSEnv, lib, umu-launcher-unwrapped, + extraPkgs ? pkgs: [ ], + extraLibraries ? pkgs: [ ], }: buildFHSEnv { pname = "umu-launcher"; inherit (umu-launcher-unwrapped) version meta; - # Use umu-launcher-unwrapped from the package args, to simplify overriding - targetPkgs = _: [ umu-launcher-unwrapped ]; + targetPkgs = + pkgs: + [ + # Use umu-launcher-unwrapped from the package args, to support overriding + umu-launcher-unwrapped + ] + ++ extraPkgs pkgs; + multiPkgs = extraLibraries; executableName = umu-launcher-unwrapped.meta.mainProgram; runScript = lib.getExe umu-launcher-unwrapped; diff --git a/pkgs/by-name/un/unpoller/package.nix b/pkgs/by-name/un/unpoller/package.nix index 36ee19619366..d4d38fca860e 100644 --- a/pkgs/by-name/un/unpoller/package.nix +++ b/pkgs/by-name/un/unpoller/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "unpoller"; - version = "2.14.0"; + version = "2.14.1"; src = fetchFromGitHub { owner = "unpoller"; repo = "unpoller"; rev = "v${version}"; - hash = "sha256-2yDrnBi5ZaFfgpqZS1PZM3Fp3zqb5oMuMbsoAeZan8o="; + hash = "sha256-x3Uboa6bs59LafEF9/aYmudo9JIh3KIMNdLJRimcmxY="; }; vendorHash = "sha256-ZylkCictJNJ/QrWEbBIXDEKElpZRw2Yrj/IHMx0lqg0="; diff --git a/pkgs/by-name/uq/uq/package.nix b/pkgs/by-name/uq/uq/package.nix deleted file mode 100644 index 794105920955..000000000000 --- a/pkgs/by-name/uq/uq/package.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ - lib, - fetchFromGitHub, - rustPlatform, -}: - -rustPlatform.buildRustPackage rec { - pname = "uq"; - version = "unstable-2018-05-27"; - - src = fetchFromGitHub { - owner = "lostutils"; - repo = "uq"; - rev = "118bc2f3b1cf292afdffbc1cb4415d150b323165"; - sha256 = "1qqqmdk0v1d3ckasmmw5lbrkvhkv0nws4bzi9cfi1ndhrbvbkbxb"; - }; - - cargoHash = "sha256-hBV+mqN4rnHGKAVRtlk2VFml/T9YQxzGTvGK2jcCwNw="; - - meta = with lib; { - description = "Simple, user-friendly alternative to sort | uniq"; - homepage = "https://github.com/lostutils/uq"; - license = licenses.mit; - maintainers = with maintainers; [ - doronbehar - matthiasbeyer - ]; - mainProgram = "uq"; - }; -} diff --git a/pkgs/by-name/ur/urlhunter/package.nix b/pkgs/by-name/ur/urlhunter/package.nix index 315ce0d16343..9347fa3dfabd 100644 --- a/pkgs/by-name/ur/urlhunter/package.nix +++ b/pkgs/by-name/ur/urlhunter/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "urlhunter"; - version = "0.1.2"; + version = "0.2.0"; src = fetchFromGitHub { owner = "utkusen"; repo = pname; rev = "v${version}"; - sha256 = "sha256-lX5zh+fYVSyWPUOnfRNMGZPsiuxjKBSpluPUMN9mZ+k="; + sha256 = "sha256-QRQLN8NFIIvlK+sHNj0MMs7tlBODMKHdWJFh/LwnysI="; }; - vendorHash = "sha256-JDDxarFROBhdi76mY6udn++lReKLdju/JBpj3JhGdQA="; + vendorHash = "sha256-tlFCovCzqgaLcxcGmWXLYUjaAvFG0o11ei8uMzWJs6Q="; meta = with lib; { description = "Recon tool that allows searching shortened URLs"; diff --git a/pkgs/by-name/v2/v2rayn/package.nix b/pkgs/by-name/v2/v2rayn/package.nix index 3391c8a1504c..589973911190 100644 --- a/pkgs/by-name/v2/v2rayn/package.nix +++ b/pkgs/by-name/v2/v2rayn/package.nix @@ -101,7 +101,7 @@ buildDotnetModule rec { homepage = "https://github.com/2dust/v2rayN"; mainProgram = "v2rayN"; license = with lib.licenses; [ gpl3Plus ]; - maintainers = with lib.maintainers; [ aucub ]; + maintainers = with lib.maintainers; [ ]; platforms = [ "x86_64-linux" "aarch64-linux" diff --git a/pkgs/by-name/ve/vencord/package.nix b/pkgs/by-name/ve/vencord/package.nix index 08f504b91a86..f83d9c3c9397 100644 --- a/pkgs/by-name/ve/vencord/package.nix +++ b/pkgs/by-name/ve/vencord/package.nix @@ -14,19 +14,19 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "vencord"; - version = "1.10.9"; + version = "1.11.2"; src = fetchFromGitHub { owner = "Vendicated"; repo = "Vencord"; rev = "v${finalAttrs.version}"; - hash = "sha256-sU2eJUUw7crvzMGGBQP6rbxISkL+S5nmT3QspyYXlRQ="; + hash = "sha256-18CzWAcBotIdzXFPIptBo20KZxXDVhM7AwwlCnPz+Wk="; }; pnpmDeps = pnpm_9.fetchDeps { inherit (finalAttrs) pname src; - hash = "sha256-vVzERis1W3QZB/i6SQR9dQR56yDWadKWvFr+nLTQY9Y="; + hash = "sha256-ZUwtNtOmxjhOBpYB7vuytunGBRSuVxdlQsceRmeyhhI="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ve/venera/package.nix b/pkgs/by-name/ve/venera/package.nix index 5cf07681d79b..ef39fa6c8c32 100644 --- a/pkgs/by-name/ve/venera/package.nix +++ b/pkgs/by-name/ve/venera/package.nix @@ -91,7 +91,7 @@ flutter327.buildFlutterApplication rec { homepage = "https://github.com/venera-app/venera"; mainProgram = "venera"; license = with lib.licenses; [ gpl3Plus ]; - maintainers = with lib.maintainers; [ aucub ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.linux; }; } diff --git a/pkgs/by-name/ve/ventoy/package.nix b/pkgs/by-name/ve/ventoy/package.nix index 85af9e0bcbf8..82b06dc9dd8b 100644 --- a/pkgs/by-name/ve/ventoy/package.nix +++ b/pkgs/by-name/ve/ventoy/package.nix @@ -56,11 +56,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "ventoy"; - version = "1.0.99"; + version = "1.1.00"; src = fetchurl { url = "https://github.com/ventoy/Ventoy/releases/download/v${finalAttrs.version}/ventoy-${finalAttrs.version}-linux.tar.gz"; - hash = "sha256-RnzdGIp/c5vHBq28HWlfYf/e/JWRatsBWUfYCCnwCj0="; + hash = "sha256-J6Krr/pTHGcwWRkJdUVdt6YVg/IhUo4G2h7jjR6lcC8="; }; patches = [ diff --git a/pkgs/by-name/vi/vintagestory/package.nix b/pkgs/by-name/vi/vintagestory/package.nix index 361550405f88..b2700373da8a 100644 --- a/pkgs/by-name/vi/vintagestory/package.nix +++ b/pkgs/by-name/vi/vintagestory/package.nix @@ -21,11 +21,11 @@ stdenv.mkDerivation rec { pname = "vintagestory"; - version = "1.19.8"; + version = "1.20.3"; src = fetchurl { url = "https://cdn.vintagestory.at/gamefiles/stable/vs_client_linux-x64_${version}.tar.gz"; - hash = "sha256-R6J+ACYDQpOzJZFBizsQGOexR7lMyeoZqz9TnWxfwyM="; + hash = "sha256-+nEyFlLfTAOmd8HrngZOD1rReaXCXX/ficE/PCLcewg="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/vs/vst2-sdk/package.nix b/pkgs/by-name/vs/vst2-sdk/package.nix new file mode 100644 index 000000000000..bf16ba8025f7 --- /dev/null +++ b/pkgs/by-name/vs/vst2-sdk/package.nix @@ -0,0 +1,26 @@ +{ + lib, + fetchzip, +}: +fetchzip rec { + name = "vst2-sdk-${version}"; # cannot be `pname`, as `fetchzip` expects `name` + version = "2018-06-11"; + url = "https://web.archive.org/web/20181016150224if_/https://download.steinberg.net/sdk_downloads/vstsdk3610_11_06_2018_build_37.zip"; + hash = "sha256-TyPy8FsXWB8LRz0yr38t3d5xxAxGufAn0dsyrg1JXBA="; + + # Only keep the VST2_SDK directory + stripRoot = false; + postFetch = '' + mv $out/VST_SDK/VST2_SDK/* $out/ + rm -rf $out/VST_SDK + ''; + + meta = { + description = "The VST2 source development kit"; + longDescription = '' + VST2 is proprietary, and deprecated by Steinberg. + As such, it should only be used for legacy reasons. + ''; + license = [ lib.licenses.unfree ]; + }; +} diff --git a/pkgs/by-name/wa/wastebin/package.nix b/pkgs/by-name/wa/wastebin/package.nix index 3a292eb208b7..f079c511be25 100644 --- a/pkgs/by-name/wa/wastebin/package.nix +++ b/pkgs/by-name/wa/wastebin/package.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "wastebin"; - version = "2.6.0"; + version = "2.7.0"; src = fetchFromGitHub { owner = "matze"; repo = "wastebin"; rev = version; - hash = "sha256-iiGg5En7p+7142qURsdOj7nYwS/ushbxfa5QlT/pHDc="; + hash = "sha256-OMczHUAhEIdstX4h5Luhx4Ud7oNNM579pP59hj0fnc0="; }; - cargoHash = "sha256-yfjAtORymdSn0pLwnGPvjLH3/R4juY08+NanTdm4420="; + cargoHash = "sha256-bC0dxwJ2AtUA3dhDneV9Oc4wcKxoKvPH/mOegwGjveE="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/wa/waveterm/package.nix b/pkgs/by-name/wa/waveterm/package.nix index f5d131b67dfb..9bda318b58fd 100644 --- a/pkgs/by-name/wa/waveterm/package.nix +++ b/pkgs/by-name/wa/waveterm/package.nix @@ -48,7 +48,7 @@ let "x86_64-linux" "x86_64-darwin" ]; - maintainers = with lib.maintainers; [ aucub ]; + maintainers = with lib.maintainers; [ ]; }; linux = stdenv.mkDerivation { diff --git a/pkgs/by-name/wa/wayidle/package.nix b/pkgs/by-name/wa/wayidle/package.nix index ebe51dd5e100..f8084a5dfbb0 100644 --- a/pkgs/by-name/wa/wayidle/package.nix +++ b/pkgs/by-name/wa/wayidle/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "wayidle"; - version = "0.2.0"; + version = "1.0.0"; src = fetchFromSourcehut { owner = "~whynothugo"; repo = "wayidle"; rev = "v${version}"; - hash = "sha256-7hFk/YGOQ5+gQy6pT5DRgMLThQ1vFAvUvdHekTyzIRU="; + hash = "sha256-DgsktRIGWswSBYeij5OL4nJwWaURv+v+qzOdZnLKG/E="; }; - cargoHash = "sha256-PohfLmUoK+2a7Glnje4Rbym2rvzydUJAYW+edOj7qeo="; + cargoHash = "sha256-fJXI2y+kUIAwW6QrMf/T/2N6v/OY9BD3g9oXwB7U4so="; meta = with lib; { description = "Execute a program when a Wayland compositor reports being N seconds idle"; diff --git a/pkgs/by-name/we/webex/package.nix b/pkgs/by-name/we/webex/package.nix index 0604bf8f4755..278cb1551dc4 100644 --- a/pkgs/by-name/we/webex/package.nix +++ b/pkgs/by-name/we/webex/package.nix @@ -57,11 +57,11 @@ stdenv.mkDerivation rec { pname = "webex"; - version = "44.8.0.30404"; + version = "44.10.2.31237"; src = fetchurl { - url = "https://binaries.webex.com/WebexDesktop-Ubuntu-Gold/20240806164911/Webex_ubuntu.7z"; - sha256 = "770067b495fcc3b376d77de65371f4196d0f1a0d718b84928d24aa6ea752d29b"; + url = "https://binaries.webex.com/WebexDesktop-Ubuntu-Gold/20241119143249/Webex_ubuntu.7z"; + sha256 = "27eb0d86fec8e6316a16913e44caed2d452b0397f188479b2e1c3d80f2d4d84e"; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/we/wev/package.nix b/pkgs/by-name/we/wev/package.nix index b758b17d0744..b9fa24cfc8c9 100644 --- a/pkgs/by-name/we/wev/package.nix +++ b/pkgs/by-name/we/wev/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "wev"; - version = "1.0.0"; + version = "1.0.0-unstable-2022-09-14"; src = fetchFromSourcehut { owner = "~sircmpwn"; repo = pname; - rev = version; - sha256 = "0l71v3fzgiiv6xkk365q1l08qvaymxd4kpaya6r2g8yzkr7i2hms"; + rev = "83de8e931ab04ce3322a58b359d8effa7901b21c"; + sha256 = "sha256-lNFgjRXO/ZbcXJF06DykPoJJ6/a8ZfVA6g95i+rNdWs="; }; strictDeps = true; diff --git a/pkgs/by-name/wg/wg-bond/package.nix b/pkgs/by-name/wg/wg-bond/package.nix deleted file mode 100644 index ab5c3eb32739..000000000000 --- a/pkgs/by-name/wg/wg-bond/package.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ - lib, - rustPlatform, - fetchFromGitLab, - wireguard-tools, - makeWrapper, -}: -rustPlatform.buildRustPackage rec { - pname = "wg-bond"; - version = "0.2.0"; - - src = fetchFromGitLab { - owner = "cab404"; - repo = "wg-bond"; - rev = "v${version}"; - hash = "sha256:04k0maxy39k7qzcsqsv1byddsmjszmnyjffrf22nzbvml83p3l0y"; - }; - - cargoHash = "sha256-Itw3fnKfUW+67KKB2Y7tutGBTm3E8mGNhBL4MOGEn9o="; - - nativeBuildInputs = [ makeWrapper ]; - postInstall = '' - wrapProgram $out/bin/wg-bond --set PATH ${lib.makeBinPath [ wireguard-tools ]} - ''; - - meta = with lib; { - description = "Wireguard configuration manager"; - homepage = "https://gitlab.com/cab404/wg-bond"; - changelog = "https://gitlab.com/cab404/wg-bond/-/releases#v${version}"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ cab404 ]; - mainProgram = "wg-bond"; - }; -} diff --git a/pkgs/by-name/wg/wgautomesh/package.nix b/pkgs/by-name/wg/wgautomesh/package.nix index f3b80cfd5b23..a017c7790a28 100644 --- a/pkgs/by-name/wg/wgautomesh/package.nix +++ b/pkgs/by-name/wg/wgautomesh/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-1xphnyuRMZEeq907nyhAW7iERYJLS1kxH0wRBsfYL40="; }; - cargoHash = "sha256-HZ1VImsfxRd0sFN/vKAKgwIV2eio2GiEz+6c1+dCmdk="; + useFetchCargoVendor = true; + cargoHash = "sha256-Lshj8L880gGLi5xY1H/7twrL3YHolqloOfXeckGw/VE="; meta = with lib; { description = "Simple utility to help connect wireguard nodes together in a full mesh topology"; diff --git a/pkgs/tools/audio/openai-whisper-cpp/download-models.patch b/pkgs/by-name/wh/whisper-cpp/download-models.patch similarity index 100% rename from pkgs/tools/audio/openai-whisper-cpp/download-models.patch rename to pkgs/by-name/wh/whisper-cpp/download-models.patch diff --git a/pkgs/by-name/wh/whisper-cpp/package.nix b/pkgs/by-name/wh/whisper-cpp/package.nix new file mode 100644 index 000000000000..e8ddeb672a19 --- /dev/null +++ b/pkgs/by-name/wh/whisper-cpp/package.nix @@ -0,0 +1,199 @@ +{ + lib, + stdenv, + cmake, + apple-sdk_11, + ninja, + fetchFromGitHub, + SDL2, + wget, + which, + autoAddDriverRunpath, + makeWrapper, + + metalSupport ? stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64, + coreMLSupport ? stdenv.hostPlatform.isDarwin && false, # FIXME currently broken + + config, + cudaSupport ? config.cudaSupport, + cudaPackages ? { }, + + rocmSupport ? config.rocmSupport, + rocmPackages ? { }, + rocmGpuTargets ? builtins.concatStringsSep ";" rocmPackages.clr.gpuTargets, + + vulkanSupport ? false, + shaderc, + vulkan-headers, + vulkan-loader, + + withSDL ? true, +}: + +assert metalSupport -> stdenv.hostPlatform.isDarwin; +assert coreMLSupport -> stdenv.hostPlatform.isDarwin; + +let + # It's necessary to consistently use backendStdenv when building with CUDA support, + # otherwise we get libstdc++ errors downstream. + # cuda imposes an upper bound on the gcc version, e.g. the latest gcc compatible with cudaPackages_11 is gcc11 + effectiveStdenv = if cudaSupport then cudaPackages.backendStdenv else stdenv; + inherit (lib) + cmakeBool + cmakeFeature + optional + optionals + optionalString + forEach + ; + + darwinBuildInputs = [ apple-sdk_11 ]; + + cudaBuildInputs = with cudaPackages; [ + cuda_cccl # + + # A temporary hack for reducing the closure size, remove once cudaPackages + # have stopped using lndir: https://github.com/NixOS/nixpkgs/issues/271792 + cuda_cudart + libcublas + ]; + + rocmBuildInputs = with rocmPackages; [ + clr + hipblas + rocblas + ]; + + vulkanBuildInputs = [ + shaderc + vulkan-headers + vulkan-loader + ]; + +in +effectiveStdenv.mkDerivation (finalAttrs: { + pname = "whisper-cpp"; + version = "1.7.2"; + + src = fetchFromGitHub { + owner = "ggerganov"; + repo = "whisper.cpp"; + rev = "refs/tags/v${finalAttrs.version}"; + hash = "sha256-y30ZccpF3SCdRGa+P3ddF1tT1KnvlI4Fexx81wZxfTk="; + }; + + # The upstream download script tries to download the models to the + # directory of the script, which is not writable due to being + # inside the nix store. This patch changes the script to download + # the models to the current directory of where it is being run from. + patches = [ ./download-models.patch ]; + + postPatch = '' + for target in examples/{bench,command,main,quantize,server,stream,talk}/CMakeLists.txt; do + if ! grep -q -F 'install('; then + echo 'install(TARGETS ''${TARGET} RUNTIME)' >> $target + fi + done + ''; + + nativeBuildInputs = + [ + cmake + ninja + which + makeWrapper + ] + ++ lib.optionals cudaSupport [ + cudaPackages.cuda_nvcc + autoAddDriverRunpath + ]; + + buildInputs = + optional withSDL SDL2 + ++ optionals effectiveStdenv.hostPlatform.isDarwin darwinBuildInputs + ++ optionals cudaSupport cudaBuildInputs + ++ optionals rocmSupport rocmBuildInputs + ++ optionals vulkanSupport vulkanBuildInputs; + + cmakeFlags = + [ + (cmakeBool "WHISPER_BUILD_EXAMPLES" true) + (cmakeBool "GGML_CUDA" cudaSupport) + (cmakeBool "GGML_HIPBLAS" rocmSupport) + (cmakeBool "GGML_VULKAN" vulkanSupport) + (cmakeBool "WHISPER_SDL2" withSDL) + (cmakeBool "GGML_LTO" true) + (cmakeBool "GGML_NATIVE" false) + (cmakeBool "BUILD_SHARED_LIBS" (!effectiveStdenv.hostPlatform.isStatic)) + ] + ++ optionals (effectiveStdenv.hostPlatform.isx86 && !effectiveStdenv.hostPlatform.isStatic) [ + (cmakeBool "GGML_BACKEND_DL" true) + (cmakeBool "GGML_CPU_ALL_VARIANTS" true) + ] + ++ optionals cudaSupport [ + (cmakeFeature "CMAKE_CUDA_ARCHITECTURES" cudaPackages.flags.cmakeCudaArchitecturesString) + ] + ++ optionals rocmSupport [ + (cmakeFeature "CMAKE_C_COMPILER" "hipcc") + (cmakeFeature "CMAKE_CXX_COMPILER" "hipcc") + + # Build all targets supported by rocBLAS. When updating search for TARGET_LIST_ROCM + # in https://github.com/ROCmSoftwarePlatform/rocBLAS/blob/develop/CMakeLists.txt + # and select the line that matches the current nixpkgs version of rocBLAS. + "-DAMDGPU_TARGETS=${rocmGpuTargets}" + ] + ++ optionals coreMLSupport [ + (cmakeBool "WHISPER_COREML" true) + (cmakeBool "WHISPER_COREML_ALLOW_FALLBACK" true) + ] + ++ optionals metalSupport [ + (cmakeFeature "CMAKE_C_FLAGS" "-D__ARM_FEATURE_DOTPROD=1") + (cmakeBool "GGML_METAL" true) + (cmakeBool "GGML_METAL_EMBED_LIBRARY" true) + ]; + + postInstall = '' + # Add "whisper-cpp" prefix before every command + mv -v $out/bin/{main,whisper-cpp} + + for file in $out/bin/*; do + if [[ -x "$file" && -f "$file" && "$(basename $file)" != "whisper-cpp" ]]; then + mv -v "$file" "$out/bin/whisper-cpp-$(basename $file)" + fi + done + + install -v -D -m755 $src/models/download-ggml-model.sh $out/bin/whisper-cpp-download-ggml-model + + wrapProgram $out/bin/whisper-cpp-download-ggml-model \ + --prefix PATH : ${lib.makeBinPath [ wget ]} + ''; + + requiredSystemFeatures = optionals rocmSupport [ "big-parallel" ]; # rocmSupport multiplies build time by the number of GPU targets, which takes arround 30 minutes on a 16-cores system to build + + doInstallCheck = true; + + installCheckPhase = '' + runHook preInstallCheck + $out/bin/whisper-cpp --help >/dev/null + runHook postInstallCheck + ''; + + meta = { + description = "Port of OpenAI's Whisper model in C/C++"; + longDescription = '' + To download the models as described in the project's readme, you may + use the `whisper-cpp-download-ggml-model` binary from this package. + ''; + homepage = "https://github.com/ggerganov/whisper.cpp"; + license = lib.licenses.mit; + mainProgram = "whisper-cpp"; + platforms = lib.platforms.all; + broken = coreMLSupport; + badPlatforms = optionals cudaSupport lib.platforms.darwin; + maintainers = with lib.maintainers; [ + dit7ya + hughobrien + aviallon + ]; + }; +}) diff --git a/pkgs/by-name/wh/whistle/package.nix b/pkgs/by-name/wh/whistle/package.nix index 3a0be68e35e7..a122d87afe63 100644 --- a/pkgs/by-name/wh/whistle/package.nix +++ b/pkgs/by-name/wh/whistle/package.nix @@ -2,16 +2,16 @@ buildNpmPackage rec { pname = "whistle"; - version = "2.9.92"; + version = "2.9.93"; src = fetchFromGitHub { owner = "avwo"; repo = "whistle"; rev = "v${version}"; - hash = "sha256-pIOVVCoyC6j8QeNDlls9EpDwKUpBLbFuxL2bMpSog5A="; + hash = "sha256-vax2KuYnjPJRewgJBcB8pmu5kedje8HUOmKSv47g1DQ="; }; - npmDepsHash = "sha256-z4w5JQdGuWu7z3rWYLO83uCrrSjt2wKbhRUGgrduoOc="; + npmDepsHash = "sha256-vEeQedclubf1GzoQOimQXeV/tzI4r8gThv0k5E+LxUc="; dontNpmBuild = true; diff --git a/pkgs/by-name/wi/windterm/package.nix b/pkgs/by-name/wi/windterm/package.nix index ad142c977a3f..9d267c70b08a 100644 --- a/pkgs/by-name/wi/windterm/package.nix +++ b/pkgs/by-name/wi/windterm/package.nix @@ -98,7 +98,7 @@ stdenv.mkDerivation rec { mainProgram = "windterm"; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.unfree; - maintainers = with lib.maintainers; [ aucub ]; + maintainers = with lib.maintainers; [ ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/by-name/wi/wit-bindgen/package.nix b/pkgs/by-name/wi/wit-bindgen/package.nix index 8dac08abc2fd..f0a5ddf9e0b3 100644 --- a/pkgs/by-name/wi/wit-bindgen/package.nix +++ b/pkgs/by-name/wi/wit-bindgen/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "wit-bindgen"; - version = "0.37.0"; + version = "0.38.0"; src = fetchFromGitHub { owner = "bytecodealliance"; repo = "wit-bindgen"; rev = "v${version}"; - hash = "sha256-T+9T8hyp2YCZnklh6SP5LtdYIo3kMK6z/LCfbrN77rw="; + hash = "sha256-8+IacmhXBonc71+KkYct0tZKTCdMyMURVJd4t3bhfAo="; }; - cargoHash = "sha256-+CXwJNSg7wJF471SnxR5Ob/yhQaFxUR3xfAtlgO3nJY="; + cargoHash = "sha256-AoJWsTyNbgWxFzcLwHt3tmyfn6zfU242hV5KJ+njL+Q="; # Some tests fail because they need network access to install the `wasm32-unknown-unknown` target. # However, GitHub Actions ensures a proper build. diff --git a/pkgs/by-name/wo/workshop-runner/package.nix b/pkgs/by-name/wo/workshop-runner/package.nix index 82f2eccb5053..579301859eaa 100644 --- a/pkgs/by-name/wo/workshop-runner/package.nix +++ b/pkgs/by-name/wo/workshop-runner/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "workshop-runner"; - version = "0.1.5"; + version = "0.2.2"; src = fetchFromGitHub { owner = "mainmatter"; repo = "rust-workshop-runner"; rev = "v${version}"; - hash = "sha256-2lt4RloIRnFvWZ+HeZx7M2cg/wHb1/j0qDmhUhOoF+M="; + hash = "sha256-8Qq3kXFR4z9k7I6b9hN1JKOGNkzydo/wA99/X17iSkk="; }; - cargoHash = "sha256-VoIAwPrkhrRl48czXtKWmLTktsZ/U4TVV924wx0DL+A="; + cargoHash = "sha256-pvcIN2nxLTt4nDEviJBdlX69xPtLZMyH2nVveOpD1R0="; meta = { description = "CLI tool to drive test-driven Rust workshops"; diff --git a/pkgs/by-name/wr/wrapGNUstepAppsHook/package.nix b/pkgs/by-name/wr/wrapGNUstepAppsHook/package.nix new file mode 100644 index 000000000000..1485f8a8ae1b --- /dev/null +++ b/pkgs/by-name/wr/wrapGNUstepAppsHook/package.nix @@ -0,0 +1,9 @@ +{ + makeBinaryWrapper, + makeSetupHook, +}: + +makeSetupHook { + name = "wrapGNUstepAppsHook"; + propagatedBuildInputs = [ makeBinaryWrapper ]; +} ./wrapGNUstepAppsHook.sh diff --git a/pkgs/desktops/gnustep/wrapGNUstepAppsHook.sh b/pkgs/by-name/wr/wrapGNUstepAppsHook/wrapGNUstepAppsHook.sh similarity index 100% rename from pkgs/desktops/gnustep/wrapGNUstepAppsHook.sh rename to pkgs/by-name/wr/wrapGNUstepAppsHook/wrapGNUstepAppsHook.sh diff --git a/pkgs/by-name/wx/wxsqlite3/package.nix b/pkgs/by-name/wx/wxsqlite3/package.nix index 9945303ccf6e..3aa0538d1f63 100644 --- a/pkgs/by-name/wx/wxsqlite3/package.nix +++ b/pkgs/by-name/wx/wxsqlite3/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "wxsqlite3"; - version = "4.10.1"; + version = "4.10.2"; src = fetchFromGitHub { owner = "utelle"; repo = "wxsqlite3"; rev = "v${version}"; - hash = "sha256-pCmhDmJLR+2GZJEyF7zW4BtSz7mTJ/WZXQB+KXaqIkA="; + hash = "sha256-i9f6rzydsdh5wIkSUp1ZSzH1z08B9S8kpWLdElaAv9M="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/xt/xtermcontrol/package.nix b/pkgs/by-name/xt/xtermcontrol/package.nix index eb0cfbf74329..ad7fdf0ba1d8 100644 --- a/pkgs/by-name/xt/xtermcontrol/package.nix +++ b/pkgs/by-name/xt/xtermcontrol/package.nix @@ -5,12 +5,12 @@ }: stdenv.mkDerivation rec { - version = "3.8"; + version = "3.10"; pname = "xtermcontrol"; src = fetchurl { url = "https://thrysoee.dk/xtermcontrol/xtermcontrol-${version}.tar.gz"; - sha256 = "sha256-Vh6GNiDkjNhaD9U/3fG2LpMLN39L3jRUgG/FQeG1z40="; + sha256 = "sha256-Prl7HZ2KrhutT+LEHKOj27ENLWfmykWZqh9jGkBQPe4="; }; meta = { diff --git a/pkgs/by-name/xx/xxv/package.nix b/pkgs/by-name/xx/xxv/package.nix deleted file mode 100644 index c5a5515f9613..000000000000 --- a/pkgs/by-name/xx/xxv/package.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - rustPlatform, - ncurses ? null, - darwin ? null, -}: - -let - useNcurses = !stdenv.hostPlatform.isWindows; -in - -assert useNcurses -> ncurses != null; - -rustPlatform.buildRustPackage rec { - pname = "xxv"; - version = "0.1.2"; - - src = fetchFromGitHub { - owner = "chrisvest"; - repo = pname; - rev = version; - sha256 = "0ppfsgdigza2jppbkg4qanjhlkpnq7p115c4471vc6vpikpfrlk3"; - }; - - cargoHash = "sha256-S8IKBXREJ+0z4Qz9i3RH52btg1Mpk6GjKIJf4ivdt14="; - - buildInputs = - lib.optionals useNcurses [ ncurses ] - ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ Security ]); - - # I'm picking pancurses for Windows simply because that's the example given in Cursive's - # documentation for picking an alternative backend. We could just as easily pick crossterm. - buildNoDefaultFeatures = !useNcurses; - buildFeatures = lib.optional (!useNcurses) "pancurses-backend"; - - meta = with lib; { - description = "Visual hex viewer for the terminal"; - longDescription = '' - XXV is a terminal hex viewer with a text user interface, written in 100% safe Rust. - ''; - homepage = "https://chrisvest.github.io/xxv/"; - license = with licenses; [ gpl3 ]; - maintainers = [ ]; - mainProgram = "xxv"; - }; -} diff --git a/pkgs/by-name/yo/your_spotify/package.nix b/pkgs/by-name/yo/your_spotify/package.nix index df08fa497883..9ab6e61af77b 100644 --- a/pkgs/by-name/yo/your_spotify/package.nix +++ b/pkgs/by-name/yo/your_spotify/package.nix @@ -14,18 +14,18 @@ stdenv.mkDerivation (finalAttrs: { pname = "your_spotify_server"; - version = "1.11.0"; + version = "1.12.0"; src = fetchFromGitHub { owner = "Yooooomi"; repo = "your_spotify"; tag = finalAttrs.version; - hash = "sha256-BytHkvm0gfMnsKe2gDTARWYIHBpfAfIisf2p4bmrpMA="; + hash = "sha256-QmDjBZEKI5wQ2fcbfVLI6aD9+73ROeKnXWYUz2eSimc="; }; offlineCache = fetchYarnDeps { yarnLock = finalAttrs.src + "/yarn.lock"; - hash = "sha256-D7rL3hxidLaChCwn5umQAnWr4cTVQ1iwDs5+gIDgBGI="; + hash = "sha256-LlSYrDIUkvIlcR4emvLBNtaqzEVISirekv9G+AX6XbM="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/yo/yourkit-java/package.nix b/pkgs/by-name/yo/yourkit-java/package.nix index 6d3e410b65c5..e99578addef2 100644 --- a/pkgs/by-name/yo/yourkit-java/package.nix +++ b/pkgs/by-name/yo/yourkit-java/package.nix @@ -9,7 +9,7 @@ let vPath = v: lib.elemAt (lib.splitString "-" v) 0; - version = "2024.9-b161"; + version = "2024.9-b163"; arches = { aarch64-linux = "arm64"; @@ -20,8 +20,8 @@ let arches.${stdenvNoCC.targetPlatform.system} or (throw "Unsupported system"); hashes = { - arm64 = "sha256-fUXZau0tK6CDfrVHZeHFpnoZQyNRVyuBYwY8ChjLqjc="; - x64 = "sha256-3AJ0PFEbDaY+x7XgcV+YWyl7wVyefjHYd9DB57I5FKc="; + arm64 = "sha256-H24OOHCQC8X1QlJ1wclzriN2uPU+IHh25vTkDriKi9E="; + x64 = "sha256-nm3C76sGJmtujHuo3/OAPwOfknTzfaUUKyB2I25hBNc="; }; desktopItem = makeDesktopItem { diff --git a/pkgs/by-name/yt/yt-dlp/package.nix b/pkgs/by-name/yt/yt-dlp/package.nix index fa3143f31591..3bcc39c4e495 100644 --- a/pkgs/by-name/yt/yt-dlp/package.nix +++ b/pkgs/by-name/yt/yt-dlp/package.nix @@ -17,13 +17,13 @@ python3Packages.buildPythonApplication rec { # The websites yt-dlp deals with are a very moving target. That means that # downloads break constantly. Because of that, updates should always be backported # to the latest stable release. - version = "2025.1.15"; + version = "2025.1.26"; pyproject = true; src = fetchPypi { inherit version; pname = "yt_dlp"; - hash = "sha256-6OxRXUm7YnBJFdE6Iu5v4DpWWNZR5OZFdOOhfuAfbjs="; + hash = "sha256-HJc4JmkhrUPFaK0BrDNi+3x69Uknb77JK9cvFA2hYkA="; }; build-system = with python3Packages; [ diff --git a/pkgs/by-name/zl/zluda/package.nix b/pkgs/by-name/zl/zluda/package.nix index 731bc55d885f..a77718981c3b 100644 --- a/pkgs/by-name/zl/zluda/package.nix +++ b/pkgs/by-name/zl/zluda/package.nix @@ -49,7 +49,6 @@ rustPlatform.buildRustPackage rec { clang ]; - cargoHash = "sha256-gZdLThmaeWVJXoeG7fuusfacgH2RNTHrqm8W0kqkqOY="; cargoLock.lockFile = ./Cargo.lock; # xtask doesn't support passing --target, but nix hooks expect the folder structure from when it's set diff --git a/pkgs/by-name/zo/zoekt/package.nix b/pkgs/by-name/zo/zoekt/package.nix index 09244585a55a..4bd747c77dc0 100644 --- a/pkgs/by-name/zo/zoekt/package.nix +++ b/pkgs/by-name/zo/zoekt/package.nix @@ -7,16 +7,16 @@ buildGoModule { pname = "zoekt"; - version = "3.7.2-2-unstable-2025-01-08"; + version = "3.7.2-2-unstable-2025-01-21"; src = fetchFromGitHub { owner = "sourcegraph"; repo = "zoekt"; - rev = "b51a2335d51b865e1ffe84aa549e85570da61463"; - hash = "sha256-D8jQ/u5kKRbOihbsX4U7RsoRoyqcJCqrELFt4YTgyj4="; + rev = "e7f0a1a349e11e1e834de840312e23716aeb0b95"; + hash = "sha256-uH9v/Fxkfue2AWppDRpMJ0ROXOYo59GV2aAAKfYDU3M="; }; - vendorHash = "sha256-laiBp+nMWEGofu7zOgfM2b8MIC+Dfw7eCLgb/5zf9oo="; + vendorHash = "sha256-7bpoUxhoVc74bN9/B6TWyufSvDRD90KpIXUMKK+3BcU="; nativeCheckInputs = [ git diff --git a/pkgs/by-name/zs/zsh-prezto/package.nix b/pkgs/by-name/zs/zsh-prezto/package.nix index 34a8f6edd259..4a6a88edad40 100644 --- a/pkgs/by-name/zs/zsh-prezto/package.nix +++ b/pkgs/by-name/zs/zsh-prezto/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "zsh-prezto"; - version = "0-unstable-2024-12-12"; + version = "0-unstable-2025-01-10"; src = fetchFromGitHub { owner = "sorin-ionescu"; repo = "prezto"; - rev = "9626ce2beb8e20afb8f63020d974ff8a213bc773"; - sha256 = "TkmzNyPKv/K9sW0CCiR8hnXXM0d6En49HcdPsa011Xw="; + rev = "6e564503f1c5e6ddba2bcf5d9065e5872ca207d2"; + sha256 = "hYuYjSQtt00pU3eqrzN8Crk40NEtCCj1G6XUL89F4xU="; fetchSubmodules = true; }; diff --git a/pkgs/desktops/gnustep/back/default.nix b/pkgs/desktops/gnustep/back/default.nix deleted file mode 100644 index e4ec5d03010a..000000000000 --- a/pkgs/desktops/gnustep/back/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ lib -, stdenv -, make -, wrapGNUstepAppsHook -, cairo -, fetchzip -, base -, gui -, fontconfig -, freetype -, pkg-config -, libXft -, libXmu -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "gnustep-back"; - version = "0.31.0"; - - src = fetchzip { - url = "ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-back-${finalAttrs.version}.tar.gz"; - sha256 = "sha256-CjcoXlKiPVPJMOdrBKjxiNauTZvLcId5Lb8DzbgBbBg="; - }; - - nativeBuildInputs = [ make pkg-config wrapGNUstepAppsHook ]; - buildInputs = [ cairo base gui fontconfig freetype libXft libXmu ]; - - meta = { - description = "Generic backend for GNUstep"; - mainProgram = "gpbs"; - homepage = "https://gnustep.github.io/"; - license = lib.licenses.lgpl2Plus; - maintainers = with lib.maintainers; [ ashalkhakov matthewbauer dblsaiko ]; - platforms = lib.platforms.linux; - }; -}) diff --git a/pkgs/desktops/gnustep/default.nix b/pkgs/desktops/gnustep/default.nix deleted file mode 100644 index 53040ace672d..000000000000 --- a/pkgs/desktops/gnustep/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ newScope -, llvmPackages -}: - -let - callPackage = newScope self; - - self = { - stdenv = llvmPackages.stdenv; - - wrapGNUstepAppsHook = callPackage ./wrapGNUstepAppsHook.nix {}; - - make = callPackage ./make {}; - - libobjc = callPackage ./libobjc2 {}; - base = callPackage ./base {}; - back = callPackage ./back {}; - gui = callPackage ./gui {}; - - gorm = callPackage ./gorm {}; - projectcenter = callPackage ./projectcenter {}; - system_preferences = callPackage ./systempreferences {}; - gworkspace = callPackage ./gworkspace {}; - }; - -in self diff --git a/pkgs/desktops/gnustep/wrapGNUstepAppsHook.nix b/pkgs/desktops/gnustep/wrapGNUstepAppsHook.nix deleted file mode 100644 index 8a2339ddeb52..000000000000 --- a/pkgs/desktops/gnustep/wrapGNUstepAppsHook.nix +++ /dev/null @@ -1,8 +0,0 @@ -{makeBinaryWrapper, makeSetupHook}: - -makeSetupHook - { - name = "wrapGNUstepAppsHook"; - propagatedBuildInputs = [makeBinaryWrapper]; - } - ./wrapGNUstepAppsHook.sh diff --git a/pkgs/development/compilers/graalvm/community-edition/graalvm-ce/hashes.nix b/pkgs/development/compilers/graalvm/community-edition/graalvm-ce/hashes.nix index ddceaa2b6dbc..e61db8f1138a 100644 --- a/pkgs/development/compilers/graalvm/community-edition/graalvm-ce/hashes.nix +++ b/pkgs/development/compilers/graalvm/community-edition/graalvm-ce/hashes.nix @@ -1,22 +1,22 @@ # Generated by update.sh script { - "version" = "23.0.1"; + "version" = "23.0.2"; "hashes" = { "aarch64-linux" = { - sha256 = "0q2y6dh09k9rnr8bfhshgzpjag9i34y703nmmmgvx29a2swnsias"; - url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-23.0.1/graalvm-community-jdk-23.0.1_linux-aarch64_bin.tar.gz"; + sha256 = "06ccc80fc1h9n3ws2v1ayyyz1fv31wv96snvlpjvybwjn66fxl3h"; + url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-23.0.2/graalvm-community-jdk-23.0.2_linux-aarch64_bin.tar.gz"; }; "x86_64-linux" = { - sha256 = "0l996ahsyynj76qn7q3baxzzawdjqdy4vwmmav08j5jb0rs0lsp2"; - url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-23.0.1/graalvm-community-jdk-23.0.1_linux-x64_bin.tar.gz"; + sha256 = "1pfnn5jz0yn47la6yd5zkbzy2nji5h2g053wjhv92x9v2n43xxhc"; + url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-23.0.2/graalvm-community-jdk-23.0.2_linux-x64_bin.tar.gz"; }; "x86_64-darwin" = { - sha256 = "045j0vcppq8znkdw4bzy483hcby54llh2ip1pj5r0s1a4clnq86q"; - url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-23.0.1/graalvm-community-jdk-23.0.1_macos-x64_bin.tar.gz"; + sha256 = "0g7gg46nvyslrn7w658sqpa0ifa4w3jr1ry93z6cynqwq1dangpc"; + url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-23.0.2/graalvm-community-jdk-23.0.2_macos-x64_bin.tar.gz"; }; "aarch64-darwin" = { - sha256 = "13zlaplrxq8bk61q1qmdflnzw7c2h8cy6rzyrmby8xb7sgryqhni"; - url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-23.0.1/graalvm-community-jdk-23.0.1_macos-aarch64_bin.tar.gz"; + sha256 = "050l8nyvwrnhig5n7j1530acqd9d03jv56gyqirnprj5qhrcx9x5"; + url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-23.0.2/graalvm-community-jdk-23.0.2_macos-aarch64_bin.tar.gz"; }; }; } diff --git a/pkgs/development/compilers/julia/default.nix b/pkgs/development/compilers/julia/default.nix index bab7cab1f300..68bd8497aad6 100644 --- a/pkgs/development/compilers/julia/default.nix +++ b/pkgs/development/compilers/julia/default.nix @@ -40,12 +40,12 @@ in { }); julia_111-bin = wrapJulia (callPackage (import ./generic-bin.nix { - version = "1.11.2"; + version = "1.11.3"; sha256 = { - x86_64-linux = "8a372ad262d4d4d55a1044f4fe3bce7c9a4a3ce8c513d2470e58e8071eecd476"; - aarch64-linux = "0346e6d65852a3b73ced2c80c40f5a8cf38e7048d001cd57d3d1dd9efb2f6641"; - x86_64-darwin = "0b52ba3d7f283e43ba853bc3d0f401decf993d8d53da752bd644a9f934679184"; - aarch64-darwin = "bcfe9c788f3dcf613a4753a4d9771d8381d00caf0e8af64d8aa87af10068b754"; + x86_64-linux = "7d48da416c8cb45582a1285d60127ee31ef7092ded3ec594a9f2cf58431c07fd"; + aarch64-linux = "0c1f2f60c3ecc37ae0c559db325dc64858fb11d6729b25d63f23e5285f7906ef"; + x86_64-darwin = "5220aade1b43db722fb4e287f1c5d25aa492267b86a846db1546504836cca1be"; + aarch64-darwin = "554fb0ddb4d94d623c83ca5e9d309fe1a7a0924445cb18ec3b863fb3367b0ba8"; }; }) { }); @@ -69,8 +69,8 @@ in { }); julia_111 = wrapJulia (callPackage (import ./generic.nix { - version = "1.11.2"; - hash = "sha256-pzZblplE8n3w2FY3FsqXaeB/P3e5+fu0i80RTd91LKQ="; + version = "1.11.3"; + hash = "sha256-Ansli0e04agdHs3TVa3v/bbAGBya2YjnF/XkdaEqHeg="; patches = [ ./patches/1.11/0002-skip-failing-and-flaky-tests.patch ]; diff --git a/pkgs/development/compilers/julia/generic.nix b/pkgs/development/compilers/julia/generic.nix index 16f7bbce0759..c04f28979a0a 100644 --- a/pkgs/development/compilers/julia/generic.nix +++ b/pkgs/development/compilers/julia/generic.nix @@ -91,6 +91,13 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + env = lib.optionalAttrs (lib.versionOlder version "1.11") { + NIX_CFLAGS_COMPILE = toString [ + "-Wno-error=implicit-function-declaration" + "-Wno-error=incompatible-pointer-types" + ]; + }; + meta = with lib; { description = "High-level performance-oriented dynamical language for technical computing"; mainProgram = "julia"; diff --git a/pkgs/development/compilers/smlnj/default.nix b/pkgs/development/compilers/smlnj/default.nix index c7322d9ef99e..cbd4168b6024 100644 --- a/pkgs/development/compilers/smlnj/default.nix +++ b/pkgs/development/compilers/smlnj/default.nix @@ -5,113 +5,48 @@ Libsystem, }: let - version = "110.99.6.1"; - baseurl = "http://smlnj.cs.uchicago.edu/dist/working/${version}"; + version = "110.99.7.1"; + baseurl = "https://smlnj.cs.uchicago.edu/dist/working/${version}"; arch = if stdenv.hostPlatform.is64bit then "64" else "32"; - boot32 = { - url = "${baseurl}/boot.x86-unix.tgz"; - hash = "sha256-2yBY0wGZ8B1jYC5os9SfH6eKJoWlQ4rAclBC3Pnacoc="; - }; - boot64 = { - url = "${baseurl}/boot.amd64-unix.tgz"; - hash = "sha256-kUabK03MdSYVRWhWKl3kS32SExUYpM3MtLU0mCxhiaQ="; - }; + hashes = builtins.fromJSON (builtins.readFile ./hashes.json); - bootBinary = if stdenv.hostPlatform.is64bit then boot64 else boot32; + fetchSource = + name: + fetchurl { + url = "${baseurl}/${name}"; + hash = hashes.${name}; + }; - sources = map fetchurl [ - bootBinary - { - url = "${baseurl}/config.tgz"; - hash = "sha256-9BJPpa/xouqi3j39WsfzlRys4z1yxTdbYttHF5VwCVw="; - } - { - url = "${baseurl}/cm.tgz"; - hash = "sha256-A3crC5EWX4kEB6olwdaObglQgkBBNqcBSCi/pQR5Wdw="; - } - { - url = "${baseurl}/compiler.tgz"; - hash = "sha256-cTgkc5opaEXskdzt5yYsdjyF5m9846t2SyEiwY6W3HU="; - } - { - url = "${baseurl}/runtime.tgz"; - hash = "sha256-JiNzfuZnp1eWQPNZBb9SPmQXtwgknpoGl+38iqUU3W4="; - } - { - url = "${baseurl}/system.tgz"; - hash = "sha256-HUn8YCxlLe6+e5H9oMJjIoG23GBF3thMlHEkSGLZTus="; - } - { - url = "${baseurl}/MLRISC.tgz"; - hash = "sha256-MPNpYhrbsIbVEOzJ7GIEQCm/7F/Jnxj0UXS7FeTp+7o="; - } - { - url = "${baseurl}/smlnj-lib.tgz"; - hash = "sha256-1tp5waPl7MCWS4kIUFm/woQeeRfCjkpgSxHpGb+ymTM="; - } - { - url = "${baseurl}/old-basis.tgz"; - hash = "sha256-I6DJRfIx+09ynFKXZ63dDWRpv0pEljWciAarK/EhQ/s="; - } - { - url = "${baseurl}/ckit.tgz"; - hash = "sha256-vi6dSZISL+KWkpp/jxLPCNBno+qTYThvbExZ5R5L7Wc="; - } - { - url = "${baseurl}/nlffi.tgz"; - hash = "sha256-WfYmX7dhrBqtE4juDVNyjuFtsJ1H+B7rJY2BXJYtKNM="; - } - { - url = "${baseurl}/cml.tgz"; - hash = "sha256-5rZzp5IUj/xZX0fyeoNMohyTz1ifdY6Anu/Hg0spDQw="; - } - { - url = "${baseurl}/eXene.tgz"; - hash = "sha256-c5QnjAQTtlBgYE6DGFMNDbu9ILSEVZgzs/u0bIowfHc="; - } - { - url = "${baseurl}/ml-lpt.tgz"; - hash = "sha256-aRYFTEEl4td7LQ0LhsXGLtJ/ptwCDV1m9GeDtM7+vlo="; - } - { - url = "${baseurl}/ml-lex.tgz"; - hash = "sha256-ZwO3xQUDaD2f7Tsro6kkahT7vSN1JvQbLkwY/m7xSIs="; - } - { - url = "${baseurl}/ml-yacc.tgz"; - hash = "sha256-DBR4xmKiSA5on7+YDz7Zr8qBA6aD1fS64+g69ukSprc="; - } - { - url = "${baseurl}/ml-burg.tgz"; - hash = "sha256-4ruWhGjxny97eUD9Gk4FakqEZzNHwJp7uSa97ET20p0="; - } - { - url = "${baseurl}/pgraph.tgz"; - hash = "sha256-kDyaAMB6Pt3CdAna+V8aLfTx8Tj6a5vPfuSxtpga08w="; - } - { - url = "${baseurl}/trace-debug-profile.tgz"; - hash = "sha256-AD9KWsskRkjTFYiRCIm0qj02sIBHG6HtBM5wKMBqeXY="; - } - { - url = "${baseurl}/heap2asm.tgz"; - hash = "sha256-OHNPMErNoLpYuatgbgYlU/mMB4JXQ4aA50WZ2BHtt3I="; - } - { - url = "${baseurl}/smlnj-c.tgz"; - hash = "sha256-Vure6h0TKqne5+5MJBX9cRkBgmrJ/kKVLUzrIIiH7lE="; - } - { - url = "${baseurl}/doc.tgz"; - hash = "sha256-PliWxCffISPrAO7Zan33recFLRmGoqZLKHOzSEP0PEk="; - } - { - url = "${baseurl}/asdl.tgz"; - hash = "sha256-O6/g20/hsMTG3CvMA59btjG+4UdUbGhMHkizESKJDEA="; - } + bootSource = if stdenv.hostPlatform.is64bit then "boot.amd64-unix.tgz" else "boot.x86-unix.tgz"; + + sources = map fetchSource [ + bootSource + "config.tgz" + "cm.tgz" + "compiler.tgz" + "runtime.tgz" + "system.tgz" + "MLRISC.tgz" + "smlnj-lib.tgz" + "old-basis.tgz" + "ckit.tgz" + "nlffi.tgz" + "cml.tgz" + "eXene.tgz" + "ml-lpt.tgz" + "ml-lex.tgz" + "ml-yacc.tgz" + "ml-burg.tgz" + "pgraph.tgz" + "trace-debug-profile.tgz" + "heap2asm.tgz" + "smlnj-c.tgz" + "doc.tgz" + "asdl.tgz" ]; + in stdenv.mkDerivation { pname = "smlnj"; @@ -152,6 +87,8 @@ stdenv.mkDerivation { done ''; + passthru.updateScript = ./update.sh; + meta = { description = "Standard ML of New Jersey, a compiler"; homepage = "http://smlnj.org"; @@ -160,13 +97,12 @@ stdenv.mkDerivation { "x86_64-linux" "i686-linux" "x86_64-darwin" + "aarch64-darwin" ]; maintainers = with lib.maintainers; [ skyesoss thoughtpolice ]; mainProgram = "sml"; - # never built on x86_64-darwin since first introduction in nixpkgs - broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64; }; } diff --git a/pkgs/development/compilers/smlnj/hashes.json b/pkgs/development/compilers/smlnj/hashes.json new file mode 100644 index 000000000000..9e8d2844abf6 --- /dev/null +++ b/pkgs/development/compilers/smlnj/hashes.json @@ -0,0 +1,27 @@ +{ + "boot.amd64-unix.tgz": "sha256-qgcD8MrTXg9xa0EsIxJyKXYO4FpEVa4/YCG0zuhH11Q=", + "boot.x86-unix.tgz": "sha256-VUJMOa8pBeDFOLivGaPC0BbtAsgJXjcjpzJgwpgOh1o=", + "config.tgz": "sha256-frBrrZNeG8DAOimVjUKR2j9iXhxrFA6LcDbNbyZEEoE=", + "cm.tgz": "sha256-+BLucH3PHt4JJpjofoVptIiTdrxplygq81kpy3VOBmo=", + "compiler.tgz": "sha256-9dPAnqpeadTMqIJKfnoa0WvceATt+VLcKgg0auHjIWM=", + "runtime.tgz": "sha256-XbmBENbIDng/KEW0Sq/45uFZ4/pp2avGJHa+XNotwIU=", + "system.tgz": "sha256-IoYZiOd+ZoE7zlJWzHNP3kIZ9/zvvdNBcTj+W1feRio=", + "MLRISC.tgz": "sha256-Jt0g+Rblt/eClAekeZkfPmssFB8FVqkdjzAs9q/VfGs=", + "smlnj-lib.tgz": "sha256-TgxzbqbtGlUQYhCmSUwYba5UM//9IKQr6QVEufOxcBM=", + "old-basis.tgz": "sha256-dcERPGMHcdASg2CQ9H91mLIeJoHW2l41wZjmt4eAMBI=", + "ckit.tgz": "sha256-ZylxTkbF4e/7bIvaAkWKbdtDfDNWS9HWtqkTZZ40qfo=", + "nlffi.tgz": "sha256-Z/O5JZeZKiDa5ZHRhLoK321VXk0hpHZg+9D396ClwOA=", + "cml.tgz": "sha256-eShOhvwea5TovWDtpXvJeUWuJlBTV0dIOIrMEkVhuPw=", + "eXene.tgz": "sha256-JXNvSTofM2tv3GunE9E3OVSfeQan8aTcfhzyouf93BU=", + "ml-lpt.tgz": "sha256-5yJupxZA0m3RzgS9G/P49ZrtN9ZfZSE9Min8GdagnLY=", + "ml-lex.tgz": "sha256-eJIT4fvCkweJSeZgM+HPd/AQxUx/hfXRj1Ltv//RS8o=", + "ml-yacc.tgz": "sha256-/RccvPDAB3VOAHWtQTPz31nFPAIUhcU9NmF+pOVjo2g=", + "ml-burg.tgz": "sha256-0Z5dPZV66Rvwa1RWLpjhsRznxmPnsexrLVdGVYspsSA=", + "pgraph.tgz": "sha256-BgrF76d98d4xl+a29iZyI1bQKx6jmyC+Ach1Fik0i+4=", + "trace-debug-profile.tgz": "sha256-17CWvN1TgZhR4mWzrB9b7lovlcludkT1dLaLPiyR6SI=", + "heap2asm.tgz": "sha256-qOLbT71ijcUPt0Rx20Iq+qqYU49dIt3mfzc6f5+y+GM=", + "smlnj-c.tgz": "sha256-V6AXfoGGO39XYBDWLDUf7vN2jcG6UUvFteOMF8v6m6Q=", + "doc.tgz": "sha256-y8fCPt4PaHsTf3uViMC6YrOapVE0fwJWbSQ8FmELPy0=", + "asdl.tgz": "sha256-cDPssSS2GRYrkUGqTCdHUJO+KD6vPy6HpP4NUU1h8Lc=", + "version": "110.99.7.1" +} diff --git a/pkgs/development/compilers/smlnj/update.sh b/pkgs/development/compilers/smlnj/update.sh new file mode 100755 index 000000000000..a5c9cd96d055 --- /dev/null +++ b/pkgs/development/compilers/smlnj/update.sh @@ -0,0 +1,60 @@ +#!/usr/bin/env nix-shell +#!nix-shell -I nixpkgs=./. -i bash -p bash curl nix-prefetch jq +# shellcheck shell=bash + +set -euo pipefail + +dir="$(dirname "$0")" +url="https://smlnj.cs.uchicago.edu/dist/working/" +hashfile="$dir/hashes.json" +nixfile="$dir/default.nix" + +version="$(curl --silent "$url" \ + | sed -n 's:.*\([0-9]\{3\}\.[0-9.-]\+\).*:\1:p' \ + | head -n1)" + +echo "Latest SML/NJ release: $version" + +if [[ -e "$hashfile" ]]; then + old_version="$(jq -r .version "$hashfile")" + if [[ $old_version = "$version" ]]; then + echo "Package is already up-to-date, skipping" + exit 0 + fi + echo "Upgrading from $old_version to $version" +else + echo "Generating hashes for $version" +fi + +files=( + boot.amd64-unix.tgz boot.x86-unix.tgz + config.tgz cm.tgz compiler.tgz runtime.tgz system.tgz MLRISC.tgz + smlnj-lib.tgz old-basis.tgz ckit.tgz nlffi.tgz cml.tgz eXene.tgz ml-lpt.tgz + ml-lex.tgz ml-yacc.tgz ml-burg.tgz pgraph.tgz trace-debug-profile.tgz + heap2asm.tgz smlnj-c.tgz doc.tgz asdl.tgz +) + +tmpdir="$(mktemp --directory)" +trap 'rm -rf -- "$tmpdir"' EXIT + +declare -a pids=() + +for file in "${files[@]}"; do + nix-prefetch --silent fetchurl --url "$url/$version/$file" > "$tmpdir/$file" & + pids+=($!) +done + +for pid in "${pids[@]}"; do + wait "$pid" +done + +printf '{\n' > "$hashfile" +for file in "${files[@]}"; do + printf ' "%s": "%s",\n' "$file" "$(cat "$tmpdir/$file")" >> "$hashfile" +done +printf ' "version": "%s"\n' "$version" >> "$hashfile" +printf '}\n' >> "$hashfile" + +sed --in-place 's:version = "[0-9.]\+";:version = "'"$version"'";:' "$nixfile" + +echo "Done" diff --git a/pkgs/development/compilers/yosys/default.nix b/pkgs/development/compilers/yosys/default.nix index 93de98015198..ee9167016d20 100644 --- a/pkgs/development/compilers/yosys/default.nix +++ b/pkgs/development/compilers/yosys/default.nix @@ -81,13 +81,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "yosys"; - version = "0.48"; + version = "0.49"; src = fetchFromGitHub { owner = "YosysHQ"; repo = "yosys"; tag = "v${finalAttrs.version}"; - hash = "sha256-LzBx1bxpiPOiRTPgBcjNnuQemZG5xfvtA/NgqUib/6g="; + hash = "sha256-He7lkNVj/J0OYNGypBvFFsSBLeZvT8iqG06okIfzkMo="; fetchSubmodules = true; leaveDotGit = true; postFetch = '' diff --git a/pkgs/development/coq-modules/Cheerios/default.nix b/pkgs/development/coq-modules/Cheerios/default.nix index 8bdcbab8370a..92a1525463b6 100644 --- a/pkgs/development/coq-modules/Cheerios/default.nix +++ b/pkgs/development/coq-modules/Cheerios/default.nix @@ -14,7 +14,7 @@ mkCoqDerivation { with lib.versions; lib.switch coq.version [ { - case = range "8.14" "8.20"; + case = range "8.14" "9.0"; out = "20230107"; } { diff --git a/pkgs/development/coq-modules/CoLoR/default.nix b/pkgs/development/coq-modules/CoLoR/default.nix index 3677f65625bb..7fadc2f74649 100644 --- a/pkgs/development/coq-modules/CoLoR/default.nix +++ b/pkgs/development/coq-modules/CoLoR/default.nix @@ -14,7 +14,7 @@ mkCoqDerivation { with lib.versions; lib.switch coq.version [ { - case = range "8.14" "8.20"; + case = range "8.14" "9.0"; out = "1.8.5"; } { diff --git a/pkgs/development/coq-modules/ElmExtraction/default.nix b/pkgs/development/coq-modules/ElmExtraction/default.nix index 0a7a22c812a2..cfba9df2a660 100644 --- a/pkgs/development/coq-modules/ElmExtraction/default.nix +++ b/pkgs/development/coq-modules/ElmExtraction/default.nix @@ -25,7 +25,7 @@ mkCoqDerivation { [ { cases = [ - (range "8.17" "8.20") + (range "8.17" "9.0") (range "1.3.1" "1.3.2") ]; out = "0.1.0"; diff --git a/pkgs/development/coq-modules/ExtLib/default.nix b/pkgs/development/coq-modules/ExtLib/default.nix index 4eb989a50ef4..90fd3a261639 100644 --- a/pkgs/development/coq-modules/ExtLib/default.nix +++ b/pkgs/development/coq-modules/ExtLib/default.nix @@ -4,7 +4,7 @@ mkCoqDerivation rec { pname = "coq-ext-lib"; inherit version; defaultVersion = with lib.versions; lib.switch coq.coq-version [ - { case = range "8.14" "8.20"; out = "0.13.0"; } + { case = range "8.14" "9.0"; out = "0.13.0"; } { case = range "8.11" "8.19"; out = "0.12.0"; } { case = range "8.8" "8.16"; out = "0.11.6"; } { case = range "8.8" "8.14"; out = "0.11.4"; } diff --git a/pkgs/development/coq-modules/ITree/default.nix b/pkgs/development/coq-modules/ITree/default.nix index 218d7e2f3be8..981afa1180bd 100644 --- a/pkgs/development/coq-modules/ITree/default.nix +++ b/pkgs/development/coq-modules/ITree/default.nix @@ -14,7 +14,7 @@ mkCoqDerivation rec { defaultVersion = with lib.versions; lib.switch coq.version [ - { case = range "8.13" "8.20"; out = "5.2.0+20241009"; } + { case = range "8.13" "9.0"; out = "5.2.0+20241009"; } { case = range "8.10" "8.16"; out = "4.0.0"; } ] null; release."5.2.0+20241009".sha256 = "sha256-eg47YgnIonCq7XOUgh9uzoKsuFCvsOSTZhgFLNNcPD0="; diff --git a/pkgs/development/coq-modules/InfSeqExt/default.nix b/pkgs/development/coq-modules/InfSeqExt/default.nix index 479205b0245a..42b6aa0b6f42 100644 --- a/pkgs/development/coq-modules/InfSeqExt/default.nix +++ b/pkgs/development/coq-modules/InfSeqExt/default.nix @@ -14,7 +14,7 @@ mkCoqDerivation { with lib.versions; lib.switch coq.version [ { - case = range "8.9" "8.20"; + case = range "8.9" "9.0"; out = "20230107"; } { diff --git a/pkgs/development/coq-modules/MenhirLib/default.nix b/pkgs/development/coq-modules/MenhirLib/default.nix index ecdbab974a5f..4e3f0ec0b4cb 100644 --- a/pkgs/development/coq-modules/MenhirLib/default.nix +++ b/pkgs/development/coq-modules/MenhirLib/default.nix @@ -16,7 +16,7 @@ let with lib.versions; lib.switch coq.coq-version [ { - case = range "8.12" "8.20"; + case = range "8.12" "9.0"; out = "20240715"; } { @@ -35,11 +35,11 @@ let }; propagatedBuildInputs = [ stdlib ]; preBuild = "cd coq-menhirlib/src"; - meta = with lib; { + meta = { homepage = "https://gitlab.inria.fr/fpottier/menhir/-/tree/master/coq-menhirlib"; description = "A support library for verified Coq parsers produced by Menhir"; - license = licenses.lgpl3Plus; - maintainers = with maintainers; [ ]; + license = lib.licenses.lgpl3Plus; + maintainers = with lib.maintainers; [ damhiya ]; }; }; in diff --git a/pkgs/development/coq-modules/QuickChick/default.nix b/pkgs/development/coq-modules/QuickChick/default.nix index 0f70982dfaf1..a18acb3120e3 100644 --- a/pkgs/development/coq-modules/QuickChick/default.nix +++ b/pkgs/development/coq-modules/QuickChick/default.nix @@ -21,7 +21,7 @@ in [ { cases = [ - (lib.versions.range "8.15" "8.20") + (lib.versions.range "8.15" "9.0") lib.pred.true ]; out = "2.0.4"; diff --git a/pkgs/development/coq-modules/StructTact/default.nix b/pkgs/development/coq-modules/StructTact/default.nix index 63a450726e4c..594eb183b7b0 100644 --- a/pkgs/development/coq-modules/StructTact/default.nix +++ b/pkgs/development/coq-modules/StructTact/default.nix @@ -14,7 +14,7 @@ mkCoqDerivation { with lib.versions; lib.switch coq.coq-version [ { - case = range "8.9" "8.20"; + case = range "8.9" "9.0"; out = "20230107"; } { diff --git a/pkgs/development/coq-modules/autosubst/default.nix b/pkgs/development/coq-modules/autosubst/default.nix index e5fd36cd7f05..ce28e4a0d911 100644 --- a/pkgs/development/coq-modules/autosubst/default.nix +++ b/pkgs/development/coq-modules/autosubst/default.nix @@ -20,7 +20,7 @@ mkCoqDerivation { with lib.versions; lib.switch coq.coq-version [ { - case = range "8.14" "8.20"; + case = range "8.14" "9.0"; out = "1.9"; } { diff --git a/pkgs/development/coq-modules/bignums/default.nix b/pkgs/development/coq-modules/bignums/default.nix index acd6b8e04303..9dd77a802105 100644 --- a/pkgs/development/coq-modules/bignums/default.nix +++ b/pkgs/development/coq-modules/bignums/default.nix @@ -13,6 +13,10 @@ mkCoqDerivation { defaultVersion = with lib.versions; lib.switch coq.coq-version [ + { + case = range "9.0" "9.0"; + out = "9.0.0+rocq${coq.coq-version}"; + } { case = range "8.13" "8.20"; out = "9.0.0+coq${coq.coq-version}"; @@ -23,6 +27,7 @@ mkCoqDerivation { } ] null; + release."9.0.0+rocq9.0".sha256 = "sha256-ctnwpyNVhryEUA5YEsAImrcJsNMhtBgDSOz+z5Z4R78="; release."9.0.0+coq8.20".sha256 = "sha256-pkvyDaMXRalc6Uu1eBTuiqTpRauRrzu946c6TavyTKY="; release."9.0.0+coq8.19".sha256 = "sha256-02uL+qWbUveHe67zKfc8w3U0iN3X2DKBsvP3pKpW8KQ="; release."9.0.0+coq8.18".sha256 = "sha256-vLeJ0GNKl4M84Uj2tAwlrxJOSR6VZoJQvdlDhxJRge8="; diff --git a/pkgs/development/coq-modules/ceres/default.nix b/pkgs/development/coq-modules/ceres/default.nix index b141d2b48e2a..3bf17cb6cf4d 100644 --- a/pkgs/development/coq-modules/ceres/default.nix +++ b/pkgs/development/coq-modules/ceres/default.nix @@ -17,7 +17,7 @@ mkCoqDerivation { with lib.versions; lib.switch coq.version [ { - case = range "8.14" "8.20"; + case = range "8.14" "9.0"; out = "0.4.1"; } { diff --git a/pkgs/development/coq-modules/coq-elpi/default.nix b/pkgs/development/coq-modules/coq-elpi/default.nix index 18e83c48b1a4..927f9d282131 100644 --- a/pkgs/development/coq-modules/coq-elpi/default.nix +++ b/pkgs/development/coq-modules/coq-elpi/default.nix @@ -21,6 +21,7 @@ default-elpi-version = if elpi-version != null then elpi-version else ( { case = "8.18"; out = "1.18.1"; } { case = "8.19"; out = "1.18.1"; } { case = "8.20"; out = "1.19.2"; } + { case = "9.0"; out = "2.0.7"; } ] { } ); elpi = coq.ocamlPackages.elpi.override { version = default-elpi-version; }; @@ -34,6 +35,7 @@ derivation = mkCoqDerivation { owner = "LPCIC"; inherit version; defaultVersion = lib.switch coq.coq-version [ + { case = "9.0"; out = "2.4.0"; } { case = "8.20"; out = "2.2.0"; } { case = "8.19"; out = "2.0.1"; } { case = "8.18"; out = "2.0.0"; } @@ -45,6 +47,7 @@ derivation = mkCoqDerivation { { case = "8.12"; out = "1.8.3_8.12"; } { case = "8.11"; out = "1.6.3_8.11"; } ] null; + release."2.4.0".sha256 = "sha256-W2+vVGExLLux8e0nSZESSoMVvrLxhL6dmXkb+JuKiqc="; release."2.2.0".sha256 = "sha256-rADEoqTXM7/TyYkUKsmCFfj6fjpWdnZEOK++5oLfC/I="; release."2.0.1".sha256 = "sha256-cuoPsEJ+JRLVc9Golt2rJj4P7lKltTrrmQijjoViooc="; release."2.0.0".sha256 = "sha256-A/cH324M21k3SZ7+YWXtaYEbu6dZQq3K0cb1RMKjbsM="; diff --git a/pkgs/development/coq-modules/coq-record-update/default.nix b/pkgs/development/coq-modules/coq-record-update/default.nix index ff71c5ecdc43..d4c901ef044f 100644 --- a/pkgs/development/coq-modules/coq-record-update/default.nix +++ b/pkgs/development/coq-modules/coq-record-update/default.nix @@ -13,7 +13,7 @@ mkCoqDerivation rec { with lib.versions; lib.switch coq.coq-version [ { - case = range "8.10" "8.20"; + case = range "8.10" "9.0"; out = "0.3.4"; } ] null; diff --git a/pkgs/development/coq-modules/coqide/default.nix b/pkgs/development/coq-modules/coqide/default.nix index 8ae04078b771..8bab88333e40 100644 --- a/pkgs/development/coq-modules/coqide/default.nix +++ b/pkgs/development/coq-modules/coqide/default.nix @@ -17,7 +17,7 @@ mkCoqDerivation rec { inherit (coq) src; release."${coq.version}" = { }; - defaultVersion = if lib.versions.isGe "8.14" coq.version then coq.version else null; + defaultVersion = if lib.versions.range "8.14" "8.20" coq.version then coq.version else null; preConfigure = '' patchShebangs dev/tools/ diff --git a/pkgs/development/coq-modules/deriving/default.nix b/pkgs/development/coq-modules/deriving/default.nix index 909cb7f42154..259cf724c316 100644 --- a/pkgs/development/coq-modules/deriving/default.nix +++ b/pkgs/development/coq-modules/deriving/default.nix @@ -18,7 +18,7 @@ mkCoqDerivation { [ { cases = [ - (range "8.17" "8.20") + (range "8.17" "9.0") (isGe "2.0.0") ]; out = "0.2.1"; diff --git a/pkgs/development/coq-modules/extructures/default.nix b/pkgs/development/coq-modules/extructures/default.nix index 2f5b3f330089..2b5f43f31698 100644 --- a/pkgs/development/coq-modules/extructures/default.nix +++ b/pkgs/development/coq-modules/extructures/default.nix @@ -19,7 +19,7 @@ [ { cases = [ - (range "8.17" "8.20") + (range "8.17" "9.0") (isGe "2.0.0") ]; out = "0.5.0"; diff --git a/pkgs/development/coq-modules/gaia/default.nix b/pkgs/development/coq-modules/gaia/default.nix index 2e17861ea3bf..05079005b6c0 100644 --- a/pkgs/development/coq-modules/gaia/default.nix +++ b/pkgs/development/coq-modules/gaia/default.nix @@ -26,7 +26,7 @@ mkCoqDerivation { [ { cases = [ - (range "8.16" "8.20") + (range "8.16" "9.0") (range "2.0" "2.3") ]; out = "2.2"; diff --git a/pkgs/development/coq-modules/hierarchy-builder/default.nix b/pkgs/development/coq-modules/hierarchy-builder/default.nix index bff7825637c7..270c9a26d337 100644 --- a/pkgs/development/coq-modules/hierarchy-builder/default.nix +++ b/pkgs/development/coq-modules/hierarchy-builder/default.nix @@ -5,6 +5,7 @@ let hb = mkCoqDerivation { owner = "math-comp"; inherit version; defaultVersion = with lib.versions; lib.switch coq.coq-version [ + { case = range "9.0" "9.0"; out = "1.8.1"; } { case = range "8.19" "8.20"; out = "1.8.0"; } { case = range "8.18" "8.20"; out = "1.7.1"; } { case = range "8.16" "8.18"; out = "1.6.0"; } @@ -14,6 +15,7 @@ let hb = mkCoqDerivation { { case = range "8.12" "8.13"; out = "1.1.0"; } { case = isEq "8.11"; out = "0.10.0"; } ] null; + release."1.8.1".sha256 = "sha256-Z0WAHDyycqgL+Le/zNfEAoLWzFb7WIL+3G3vEBExlb4="; release."1.8.0".sha256 = "sha256-4s/4ZZKj5tiTtSHGIM8Op/Pak4Vp52WVOpd4l9m19fY="; release."1.7.1".sha256 = "sha256-MCmOzMh/SBTFAoPbbIQ7aqd3hMcSMpAKpiZI7dbRaGs="; release."1.7.0".sha256 = "sha256-WqSeuJhmqicJgXw/xGjGvbRzfyOK7rmkVRb6tPDTAZg="; diff --git a/pkgs/development/coq-modules/iris/default.nix b/pkgs/development/coq-modules/iris/default.nix index 14410a8cecd0..adcc9c3e5c72 100644 --- a/pkgs/development/coq-modules/iris/default.nix +++ b/pkgs/development/coq-modules/iris/default.nix @@ -15,7 +15,7 @@ mkCoqDerivation rec { with lib.versions; lib.switch coq.coq-version [ { - case = range "8.19" "8.20"; + case = range "8.19" "9.0"; out = "4.3.0"; } { diff --git a/pkgs/development/coq-modules/json/default.nix b/pkgs/development/coq-modules/json/default.nix index 3b8ccef3bb95..52fd5871f9d1 100644 --- a/pkgs/development/coq-modules/json/default.nix +++ b/pkgs/development/coq-modules/json/default.nix @@ -19,7 +19,7 @@ in lib.switch coq.coq-version [ { - case = range "8.14" "8.20"; + case = range "8.14" "9.0"; out = "0.2.0"; } { diff --git a/pkgs/development/coq-modules/mathcomp-algebra-tactics/default.nix b/pkgs/development/coq-modules/mathcomp-algebra-tactics/default.nix index 3996db951b29..212d1cb03568 100644 --- a/pkgs/development/coq-modules/mathcomp-algebra-tactics/default.nix +++ b/pkgs/development/coq-modules/mathcomp-algebra-tactics/default.nix @@ -24,10 +24,10 @@ mkCoqDerivation { [ { cases = [ - (range "8.16" "8.20") + (range "8.16" "9.0") (isGe "2.0") ]; - out = "1.2.3"; + out = "1.2.4"; } { cases = [ @@ -57,6 +57,7 @@ mkCoqDerivation { release."1.1.1".sha256 = "sha256-5wItMeeTRoJlRBH3zBNc2VUZn6pkDde60YAvXTx+J3U="; release."1.2.2".sha256 = "sha256-EU9RJGV3BvnmsX+mGH+6+MDXiGHgDI7aP5sIYiMUXTs="; release."1.2.3".sha256 = "sha256-6uc1VEfDv+fExEfBR2c0/Q/KjrkX0TbEMCLgeYcpkls="; + release."1.2.4".sha256 = "sha256-BRxt0LGPz2u3kJRjcderaZqCfs8M8qKAAwNSWmIck7Q="; propagatedBuildInputs = [ mathcomp-algebra diff --git a/pkgs/development/coq-modules/mathcomp-bigenough/default.nix b/pkgs/development/coq-modules/mathcomp-bigenough/default.nix index 4a79a3d95d90..86516fd9082d 100644 --- a/pkgs/development/coq-modules/mathcomp-bigenough/default.nix +++ b/pkgs/development/coq-modules/mathcomp-bigenough/default.nix @@ -18,14 +18,15 @@ mkCoqDerivation { release = { "1.0.0".sha256 = "10g0gp3hk7wri7lijkrqna263346wwf6a3hbd4qr9gn8hmsx70wg"; "1.0.1".sha256 = "sha256:02f4dv4rz72liciwxb2k7acwx6lgqz4381mqyq5854p3nbyn06aw"; + "1.0.2".sha256 = "sha256-fJ/5xr91VtvpIoaFwb3PlnKl6UHG6GEeBRVGZrVLMU0="; }; inherit version; defaultVersion = with lib.versions; lib.switch coq.version [ { - case = range "8.10" "8.20"; - out = "1.0.1"; + case = range "8.10" "9.0"; + out = "1.0.2"; } { case = range "8.5" "8.14"; diff --git a/pkgs/development/coq-modules/mathcomp-finmap/default.nix b/pkgs/development/coq-modules/mathcomp-finmap/default.nix index f0fb42ddae8a..fe408966797b 100644 --- a/pkgs/development/coq-modules/mathcomp-finmap/default.nix +++ b/pkgs/development/coq-modules/mathcomp-finmap/default.nix @@ -22,7 +22,7 @@ mkCoqDerivation { [ { cases = [ - (range "8.16" "8.20") + (range "8.16" "9.0") (isGe "2.0") ]; out = "2.1.0"; diff --git a/pkgs/development/coq-modules/mathcomp-real-closed/default.nix b/pkgs/development/coq-modules/mathcomp-real-closed/default.nix index 91a303219b19..7654c47abf08 100644 --- a/pkgs/development/coq-modules/mathcomp-real-closed/default.nix +++ b/pkgs/development/coq-modules/mathcomp-real-closed/default.nix @@ -37,14 +37,14 @@ mkCoqDerivation { [ { cases = [ - (isGe "8.17") + (range "8.17" "9.0") (isGe "2.1.0") ]; out = "2.0.2"; } { cases = [ - (isGe "8.17") + (range "8.17" "8.20") (isGe "2.0.0") ]; out = "2.0.1"; diff --git a/pkgs/development/coq-modules/mathcomp-tarjan/default.nix b/pkgs/development/coq-modules/mathcomp-tarjan/default.nix index 945c63657d97..9246a0b0682e 100644 --- a/pkgs/development/coq-modules/mathcomp-tarjan/default.nix +++ b/pkgs/development/coq-modules/mathcomp-tarjan/default.nix @@ -24,7 +24,7 @@ mkCoqDerivation { [ { cases = [ - (range "8.16" "8.20") + (range "8.16" "9.0") (isGe "2.0.0") ]; out = "1.0.2"; diff --git a/pkgs/development/coq-modules/mathcomp-word/default.nix b/pkgs/development/coq-modules/mathcomp-word/default.nix index 8e6825979be1..84a3345e7066 100644 --- a/pkgs/development/coq-modules/mathcomp-word/default.nix +++ b/pkgs/development/coq-modules/mathcomp-word/default.nix @@ -61,7 +61,7 @@ mkCoqDerivation { [ { cases = [ - (range "8.16" "8.20") + (range "8.16" "9.0") (isGe "2.0") ]; out = "3.2"; diff --git a/pkgs/development/coq-modules/mathcomp-zify/default.nix b/pkgs/development/coq-modules/mathcomp-zify/default.nix index d6be076ba470..ec0c7cdcaa95 100644 --- a/pkgs/development/coq-modules/mathcomp-zify/default.nix +++ b/pkgs/development/coq-modules/mathcomp-zify/default.nix @@ -25,7 +25,7 @@ mkCoqDerivation rec { [ { cases = [ - (range "8.16" "8.20") + (range "8.16" "9.0") (isGe "2.0.0") ]; out = "1.5.0+2.0+8.16"; diff --git a/pkgs/development/coq-modules/mathcomp/default.nix b/pkgs/development/coq-modules/mathcomp/default.nix index 48d36b2dbb8c..c4442ba1283c 100644 --- a/pkgs/development/coq-modules/mathcomp/default.nix +++ b/pkgs/development/coq-modules/mathcomp/default.nix @@ -20,7 +20,7 @@ let withDoc = single && (args.withDoc or false); defaultVersion = let inherit (lib.versions) range; in lib.switch coq.coq-version [ - { case = range "8.19" "8.20"; out = "2.3.0"; } + { case = range "8.19" "9.0"; out = "2.3.0"; } { case = range "8.17" "8.20"; out = "2.2.0"; } { case = range "8.17" "8.18"; out = "2.1.0"; } { case = range "8.17" "8.18"; out = "2.0.0"; } diff --git a/pkgs/development/coq-modules/paco/default.nix b/pkgs/development/coq-modules/paco/default.nix index d4e95619c4ad..97b5061c8e58 100644 --- a/pkgs/development/coq-modules/paco/default.nix +++ b/pkgs/development/coq-modules/paco/default.nix @@ -13,7 +13,7 @@ mkCoqDerivation { defaultVersion = with lib.versions; lib.switch coq.coq-version [ - { case = range "8.13" "8.20"; out = "4.2.2"; } + { case = range "8.13" "9.0"; out = "4.2.2"; } { case = range "8.12" "8.17"; out = "4.1.2"; } { case = range "8.9" "8.13"; out = "4.1.1"; } { case = range "8.6" "8.13"; out = "4.0.2"; } diff --git a/pkgs/development/coq-modules/parsec/default.nix b/pkgs/development/coq-modules/parsec/default.nix index 4f8eeebc15da..b797fc71e7d6 100644 --- a/pkgs/development/coq-modules/parsec/default.nix +++ b/pkgs/development/coq-modules/parsec/default.nix @@ -24,7 +24,7 @@ mkCoqDerivation { with lib.versions; lib.switch coq.version [ { - case = range "8.14" "8.20"; + case = range "8.14" "9.0"; out = "0.2.0"; } { diff --git a/pkgs/development/coq-modules/reglang/default.nix b/pkgs/development/coq-modules/reglang/default.nix index 3e95e1b893b1..cd0513a6e02a 100644 --- a/pkgs/development/coq-modules/reglang/default.nix +++ b/pkgs/development/coq-modules/reglang/default.nix @@ -24,7 +24,7 @@ mkCoqDerivation { [ { cases = [ - (range "8.16" "8.20") + (range "8.16" "9.0") (isGe "2.0.0") ]; out = "1.2.1"; diff --git a/pkgs/development/coq-modules/simple-io/default.nix b/pkgs/development/coq-modules/simple-io/default.nix index 6345818db5d0..bb4443433e12 100644 --- a/pkgs/development/coq-modules/simple-io/default.nix +++ b/pkgs/development/coq-modules/simple-io/default.nix @@ -16,7 +16,7 @@ with lib.versions; lib.switch coq.coq-version [ { - case = range "8.17" "8.20"; + case = range "8.17" "9.0"; out = "1.10.0"; } { diff --git a/pkgs/development/coq-modules/stdlib/default.nix b/pkgs/development/coq-modules/stdlib/default.nix index a443daef68f1..cac0c4b53405 100644 --- a/pkgs/development/coq-modules/stdlib/default.nix +++ b/pkgs/development/coq-modules/stdlib/default.nix @@ -14,17 +14,13 @@ inherit version; defaultVersion = with lib.versions; - lib.switch - [ coq.version ] - [ - { - cases = [ (isLt "8.21") ]; - out = "8.20"; - } - ] - null; - releaseRev = v: "v${v}"; + lib.switch coq.version [ + { case = isEq "9.0"; out = "9.0+rc1"; } + { case = isLt "8.21"; out = "8.20"; } + ] null; + releaseRev = v: "V${v}"; + release."9.0+rc1".sha256 = "sha256-raHwniQdpAX1HGlMofM8zVeXcmlUs+VJZZg5VF43k/M="; release."8.20".sha256 = "sha256-AcoS4edUYCfJME1wx8UbuSQRF3jmxhArcZyPIoXcfu0="; useDune = true; diff --git a/pkgs/development/coq-modules/stdpp/default.nix b/pkgs/development/coq-modules/stdpp/default.nix index 750388750b6b..13a24d1600f7 100644 --- a/pkgs/development/coq-modules/stdpp/default.nix +++ b/pkgs/development/coq-modules/stdpp/default.nix @@ -15,7 +15,7 @@ mkCoqDerivation rec { with lib.versions; lib.switch coq.coq-version [ { - case = range "8.19" "8.20"; + case = range "8.19" "9.0"; out = "1.11.0"; } { diff --git a/pkgs/development/interpreters/clojure/default.nix b/pkgs/development/interpreters/clojure/default.nix index b6d40a68f682..1cd33002ab99 100644 --- a/pkgs/development/interpreters/clojure/default.nix +++ b/pkgs/development/interpreters/clojure/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation (finalAttrs: { pname = "clojure"; - version = "1.12.0.1488"; + version = "1.12.0.1495"; src = fetchurl { # https://github.com/clojure/brew-install/releases url = "https://github.com/clojure/brew-install/releases/download/${finalAttrs.version}/clojure-tools-${finalAttrs.version}.tar.gz"; - hash = "sha256-vBm+ABC+8EIcJv077HvDvKCMGSgo1ZoVGEVCLcRCB0I="; + hash = "sha256-GMwT+Hx07E8Xe9g8RBbZ7Cu5FChg2wYFWvdZjhuClJw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/interpreters/erlang/27.nix b/pkgs/development/interpreters/erlang/27.nix index 9085ecf4017c..132c3fd2712f 100644 --- a/pkgs/development/interpreters/erlang/27.nix +++ b/pkgs/development/interpreters/erlang/27.nix @@ -1,6 +1,6 @@ { mkDerivation }: mkDerivation { - version = "27.2"; - sha256 = "sha256-8kRneNkDErUX/AiWy8WDCpFxxS1w4DfM+5V6Hz8D8wM="; + version = "27.2.1"; + sha256 = "sha256-39X4aGuYe7aJaQiRBjla7GInKoTHXmRIeRq8Ejqk6jM="; } diff --git a/pkgs/development/interpreters/php/8.3.nix b/pkgs/development/interpreters/php/8.3.nix index aa87f534dc70..7b4b5c6d438b 100644 --- a/pkgs/development/interpreters/php/8.3.nix +++ b/pkgs/development/interpreters/php/8.3.nix @@ -4,8 +4,8 @@ let base = callPackage ./generic.nix ( _args // { - version = "8.3.15"; - hash = "sha256-sWdaT/cwtYEbjmp2h0iMQug14Vapl3aqPm8Ber2jvpg="; + version = "8.3.16"; + hash = "sha256-6SCCGMvcuBaDS2xe2N3FdI+xL/d3z54OA7tIlidmCLY="; } ); in diff --git a/pkgs/development/interpreters/rakudo/zef.nix b/pkgs/development/interpreters/rakudo/zef.nix index 927c59d9bb23..a16b8b590333 100644 --- a/pkgs/development/interpreters/rakudo/zef.nix +++ b/pkgs/development/interpreters/rakudo/zef.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "zef"; - version = "0.22.6"; + version = "0.22.7"; src = fetchFromGitHub { owner = "ugexe"; repo = "zef"; rev = "v${finalAttrs.version}"; - hash = "sha256-lq3jSoV1/zD7TMOtvfZZTVJ5cjsaod5Tzvb+GyiMJs4="; + hash = "sha256-nRiOLy4LuxIXrqwn84OtUUelLcqbxgXSuVRaVsAtcIQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/interpreters/wasmtime/default.nix b/pkgs/development/interpreters/wasmtime/default.nix index a5c67947b08d..a17780d33a9e 100644 --- a/pkgs/development/interpreters/wasmtime/default.nix +++ b/pkgs/development/interpreters/wasmtime/default.nix @@ -2,19 +2,19 @@ rustPlatform.buildRustPackage rec { pname = "wasmtime"; - version = "28.0.1"; + version = "29.0.1"; src = fetchFromGitHub { owner = "bytecodealliance"; repo = pname; rev = "v${version}"; - hash = "sha256-bZh9zwP1Sux4aRDD/l3L5gu4iXwMbjJ+6+yJ42lNYtY="; + hash = "sha256-BYTPBerWCDGqcN3TpMLhtL92f413IjCgGDQqQUu5D7Y="; fetchSubmodules = true; }; # Disable cargo-auditable until https://github.com/rust-secure-code/cargo-auditable/issues/124 is solved. auditable = false; - cargoHash = "sha256-h5vSdKETereFCS06HYqQPSExBWPGxJHnWCj8SJNeqE4="; + cargoHash = "sha256-CXMKg6xwzhrTEHu923LQAnQpo1YOQ0fceBpmVz6wM0U="; cargoBuildFlags = [ "--package" "wasmtime-cli" "--package" "wasmtime-c-api" ]; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/gensio/default.nix b/pkgs/development/libraries/gensio/default.nix index ec864c12225b..8906945434e7 100644 --- a/pkgs/development/libraries/gensio/default.nix +++ b/pkgs/development/libraries/gensio/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "gensio"; - version = "2.8.10"; + version = "2.8.11"; src = fetchFromGitHub { owner = "cminyard"; repo = pname; rev = "v${version}"; - sha256 = "sha256-NQvp2/HMw+9rkHHiqOgX/4Xjhq5TZhIF2CWXev6GwFY="; + sha256 = "sha256-0WHMAp8EuPk+O8Tt5fSJUIN3HHyRsHQDTXiCY7sIBLw="; }; passthru = { diff --git a/pkgs/development/libraries/getdns/default.nix b/pkgs/development/libraries/getdns/default.nix index 3be26afe3e52..dda34ffa5a27 100644 --- a/pkgs/development/libraries/getdns/default.nix +++ b/pkgs/development/libraries/getdns/default.nix @@ -97,12 +97,14 @@ rec { yq ]; - buildInputs = [ - getdns - libyaml - openssl - systemd - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.Security ]; + buildInputs = + [ + getdns + libyaml + openssl + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ systemd ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.Security ]; postInstall = '' rm -r $out/share/doc diff --git a/pkgs/development/libraries/libphonenumber/default.nix b/pkgs/development/libraries/libphonenumber/default.nix index e1c79044bb5c..662a53dd18cd 100644 --- a/pkgs/development/libraries/libphonenumber/default.nix +++ b/pkgs/development/libraries/libphonenumber/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "libphonenumber"; - version = "8.13.52"; + version = "8.13.53"; src = fetchFromGitHub { owner = "google"; repo = "libphonenumber"; rev = "v${finalAttrs.version}"; - hash = "sha256-MQWsCxVy1MZU2ifWrGZUQRiNFgknwA/Z2LChjhnpJnE="; + hash = "sha256-JYz/R8vS9sJ8cv/GRPwrA31Hb1ofZvW3OQBNp5lDlg8="; }; patches = [ diff --git a/pkgs/development/libraries/qtkeychain/default.nix b/pkgs/development/libraries/qtkeychain/default.nix index d865b183f9ca..5ad105a64bac 100644 --- a/pkgs/development/libraries/qtkeychain/default.nix +++ b/pkgs/development/libraries/qtkeychain/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "qtkeychain"; - version = "0.14.3"; + version = "0.15.0"; src = fetchFromGitHub { owner = "frankosterfeld"; repo = "qtkeychain"; rev = version; - sha256 = "sha256-+1WX3ARH+jWeDiaJnX+ZlRMj+l3qvgBwcGKjB9QEJNI="; + sha256 = "sha256-/gdozAJbjaaCcttQED2PixaFNRDZOXbBIoV9QLexNUg="; }; dontWrapQtApps = true; diff --git a/pkgs/development/libraries/qxmpp/default.nix b/pkgs/development/libraries/qxmpp/default.nix index 7f4804c194ee..deab5402b73d 100644 --- a/pkgs/development/libraries/qxmpp/default.nix +++ b/pkgs/development/libraries/qxmpp/default.nix @@ -12,13 +12,13 @@ mkDerivation rec { pname = "qxmpp"; - version = "1.9.2"; + version = "1.9.3"; src = fetchFromGitHub { owner = "qxmpp-project"; repo = pname; rev = "v${version}"; - sha256 = "sha256-xqQUDFZgnBpUIv8kYvsNrJrIF259p3CccNn7u4vpxmY="; + sha256 = "sha256-gKA2hSkgeBe9vnhHQ3MxcQC+401gGoxSM7ETmRhvcbs="; }; nativeBuildInputs = [ diff --git a/pkgs/development/ocaml-modules/mccs/default.nix b/pkgs/development/ocaml-modules/mccs/default.nix index d939538fa660..ecbac7c2da27 100644 --- a/pkgs/development/ocaml-modules/mccs/default.nix +++ b/pkgs/development/ocaml-modules/mccs/default.nix @@ -7,13 +7,13 @@ buildDunePackage rec { pname = "mccs"; - version = "1.1+18"; + version = "1.1+19"; src = fetchFromGitHub { owner = "AltGr"; repo = "ocaml-mccs"; rev = version; - hash = "sha256-Swfqq7O5KASf1nkK/lgIO9byWDUv1FiWh8cNULF7wfI="; + hash = "sha256-xvcqPXyzVGXXFYRVdFPaCfieFEguWffWVB04ImEuPvQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/aioacaia/default.nix b/pkgs/development/python-modules/aioacaia/default.nix index 52fff8c8a6eb..74401c40d943 100644 --- a/pkgs/development/python-modules/aioacaia/default.nix +++ b/pkgs/development/python-modules/aioacaia/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "aioacaia"; - version = "0.1.13"; + version = "0.1.14"; pyproject = true; disabled = pythonOlder "3.12"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "zweckj"; repo = "aioacaia"; tag = "v${version}"; - hash = "sha256-c+xtVUSyH9dBz97eI+8YYG/yW08kZFLNXnHudxYchCE="; + hash = "sha256-246/chGOaBlhEsoRcplWhRWvmaYgk6stRVqU+Crh+Kw="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/aiolifx-themes/default.nix b/pkgs/development/python-modules/aiolifx-themes/default.nix index a4584ba311c8..093e9c9d295d 100644 --- a/pkgs/development/python-modules/aiolifx-themes/default.nix +++ b/pkgs/development/python-modules/aiolifx-themes/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "aiolifx-themes"; - version = "0.6.0"; + version = "0.6.5"; pyproject = true; disabled = pythonOlder "3.9"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "Djelibeybi"; repo = "aiolifx-themes"; tag = "v${version}"; - hash = "sha256-Y6LVSk0Ut5G0aGzV+hAfGmdM8h8a+4NYycQqBKoElXU="; + hash = "sha256-mqxqlfpxfR5IH3MbYsLhBE36qkM7MgnyXdR0dlMr+t8="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/aiowithings/default.nix b/pkgs/development/python-modules/aiowithings/default.nix index 54d6e4d50aef..bb181edc80fb 100644 --- a/pkgs/development/python-modules/aiowithings/default.nix +++ b/pkgs/development/python-modules/aiowithings/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "aiowithings"; - version = "3.1.4"; + version = "3.1.5"; pyproject = true; disabled = pythonOlder "3.11"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "joostlek"; repo = "python-withings"; tag = "v${version}"; - hash = "sha256-0UWwiLSTXcNDS30NWsKI1f/kTczdYXwRZr+JREU0NCM="; + hash = "sha256-bIeT+2iOXFf52ds5qLioUfUOpZ/vApdC+EiWjiXYwpg="; }; postPatch = '' diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix index 4f7f2ce33dce..92e73ce6b242 100644 --- a/pkgs/development/python-modules/boto3-stubs/default.nix +++ b/pkgs/development/python-modules/boto3-stubs/default.nix @@ -359,7 +359,7 @@ buildPythonPackage rec { pname = "boto3-stubs"; - version = "1.36.3"; + version = "1.36.6"; pyproject = true; disabled = pythonOlder "3.7"; @@ -367,7 +367,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "boto3_stubs"; inherit version; - hash = "sha256-9KCsaCAuaZSG9/tyg5he3RcJMAYzuin+tMec5IjOWf4="; + hash = "sha256-9ewaWm7LkpEpA2MRY0gvbOhPCS1bw27Aj3cHAL78zHs="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/botocore-stubs/default.nix b/pkgs/development/python-modules/botocore-stubs/default.nix index 20249bb5af1a..4bb19c57001f 100644 --- a/pkgs/development/python-modules/botocore-stubs/default.nix +++ b/pkgs/development/python-modules/botocore-stubs/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "botocore-stubs"; - version = "1.36.3"; + version = "1.36.6"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "botocore_stubs"; inherit version; - hash = "sha256-MENwcLod9vBUmx3tcjrKdNBoUGEMffAC1kPgqp9MRSA="; + hash = "sha256-9HwwA2pePIQu9zR66yBnqVKVmnucMsfcDtJwQKIxNQ0="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/coffea/default.nix b/pkgs/development/python-modules/coffea/default.nix index d4d1a9f2a17f..5e61b17c5c2d 100644 --- a/pkgs/development/python-modules/coffea/default.nix +++ b/pkgs/development/python-modules/coffea/default.nix @@ -42,14 +42,14 @@ buildPythonPackage rec { pname = "coffea"; - version = "2025.1.0"; + version = "2025.1.1"; pyproject = true; src = fetchFromGitHub { owner = "CoffeaTeam"; repo = "coffea"; tag = "v${version}"; - hash = "sha256-l/HjTX3zm1jquAhuvNNI+oaC7TbaICNnmfqXxBNlaic="; + hash = "sha256-AGYi1w4e8XJOWRbuPX5eB/rTY5dCPji49zD0VQ4FvAs="; }; build-system = [ diff --git a/pkgs/development/python-modules/commitizen/default.nix b/pkgs/development/python-modules/commitizen/default.nix index 867b03e2c1b4..5779a1218a57 100644 --- a/pkgs/development/python-modules/commitizen/default.nix +++ b/pkgs/development/python-modules/commitizen/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { pname = "commitizen"; - version = "4.1.0"; + version = "4.1.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -40,7 +40,7 @@ buildPythonPackage rec { owner = "commitizen-tools"; repo = "commitizen"; tag = "v${version}"; - hash = "sha256-f3uusTNGMK6a3Plh6FHBeM8vEXDZW31o9E0i+sWsBgE="; + hash = "sha256-ms1G7wKJMBjmfcD3VNZizswLilBdy4wv5fgnzzirgMs="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/cymem/default.nix b/pkgs/development/python-modules/cymem/default.nix index c5b35087b0e3..ee5bc22c3178 100644 --- a/pkgs/development/python-modules/cymem/default.nix +++ b/pkgs/development/python-modules/cymem/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "cymem"; - version = "2.0.10"; + version = "2.0.11"; pyproject = true; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "explosion"; repo = "cymem"; tag = "release-v${version}"; - hash = "sha256-lMbovEIYdXYQvLeVaCm8KfYaQ2TFSAi6picu7Ju9peg="; + hash = "sha256-4srwdQS06KeBAIaJm6XxmsHEZto0eiXBznrCHgT/BAc="; }; build-system = [ diff --git a/pkgs/development/python-modules/dash-bootstrap-components/default.nix b/pkgs/development/python-modules/dash-bootstrap-components/default.nix index ce39e11af1f5..fa6b4b5c35f9 100644 --- a/pkgs/development/python-modules/dash-bootstrap-components/default.nix +++ b/pkgs/development/python-modules/dash-bootstrap-components/default.nix @@ -3,13 +3,13 @@ buildPythonPackage, fetchPypi, dash, - setuptools, + hatchling, pythonOlder, }: buildPythonPackage rec { pname = "dash-bootstrap-components"; - version = "1.6.0"; + version = "1.7.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -17,10 +17,10 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "dash_bootstrap_components"; - hash = "sha256-lgoeyTl1dHkvSagkECT6POzeD1kwyXGj/IHwFsvrEJU="; + hash = "sha256-MNSDQNbciYMdbAbkAM1CNvDVNjViwFsqki8hVFaVoII="; }; - build-system = [ setuptools ]; + build-system = [ hatchling ]; dependencies = [ dash ]; diff --git a/pkgs/development/python-modules/deepl/default.nix b/pkgs/development/python-modules/deepl/default.nix index 8586079f16de..a5b691df269c 100644 --- a/pkgs/development/python-modules/deepl/default.nix +++ b/pkgs/development/python-modules/deepl/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "deepl"; - version = "1.20.0"; + version = "1.21.0"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-Lq5G2PAnmwC85GhuwBi7V1egrQzANmFu8ArRL5dYlVs="; + hash = "sha256-+udougyvv8x94/zsWOLq/UXQyRffk4X5veISaWjDWp4="; }; nativeBuildInputs = [ poetry-core ]; diff --git a/pkgs/development/python-modules/eigenpy/default.nix b/pkgs/development/python-modules/eigenpy/default.nix index d31743f129f3..adcd97c49bfe 100644 --- a/pkgs/development/python-modules/eigenpy/default.nix +++ b/pkgs/development/python-modules/eigenpy/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "eigenpy"; - version = "3.10.1"; + version = "3.10.2"; pyproject = false; # Built with cmake src = fetchFromGitHub { owner = "stack-of-tasks"; repo = "eigenpy"; tag = "v${version}"; - hash = "sha256-9hKYCCKgPn1IJDezX/ARJHr5+0ridmGd1b3k/ZaVRG0="; + hash = "sha256-MronJ6yJc+bPIVAgZyFF/VtTig3OWPhpUw9oNB9Ez+o="; }; outputs = [ diff --git a/pkgs/development/python-modules/gattlib/default.nix b/pkgs/development/python-modules/gattlib/default.nix index 370b773c8934..bb961a993a13 100644 --- a/pkgs/development/python-modules/gattlib/default.nix +++ b/pkgs/development/python-modules/gattlib/default.nix @@ -2,36 +2,35 @@ lib, buildPythonPackage, fetchFromGitHub, + fetchpatch, substituteAll, - - # build pkg-config, glibc, python, - - # runtime + setuptools, bluez, boost, glib, - }: -let +buildPythonPackage rec { pname = "gattlib"; - version = "unstable-2021-06-16"; -in -buildPythonPackage { - inherit pname version; - format = "setuptools"; + version = "20210616"; + pyproject = true; src = fetchFromGitHub { owner = "oscaracena"; repo = "pygattlib"; - rev = "7bdb229124fe7d9f4a2cc090277b0fdef82e2a56"; - hash = "sha256-PS5DIH1JuH2HweyebLLM+UNFGY/XsjKIrsD9x7g7yMI="; + rev = "v.${version}"; + hash = "sha256-n3D9CWKvgw4FYmbvsfhaHN963HARBG0p4CcZBC8Gkb0="; }; patches = [ + # Fix build for Python 3.13 + (fetchpatch { + url = "https://github.com/oscaracena/pygattlib/commit/73a73b71cfc139e1e0a08816fb976ff330c77ea5.patch"; + hash = "sha256-/Y/CZNdN/jcxWroqRfdCH2rPUxZUbug668MIAow0scs="; + }) (substituteAll { src = ./setup.patch; boost_version = @@ -42,6 +41,8 @@ buildPythonPackage { }) ]; + build-system = [ setuptools ]; + nativeBuildInputs = [ pkg-config glibc diff --git a/pkgs/development/python-modules/google-cloud-bigtable/default.nix b/pkgs/development/python-modules/google-cloud-bigtable/default.nix index b145d4ba8a82..70ea471ddf48 100644 --- a/pkgs/development/python-modules/google-cloud-bigtable/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigtable/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "google-cloud-bigtable"; - version = "2.28.0"; + version = "2.28.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_bigtable"; inherit version; - hash = "sha256-BztPc0MxvbUXkNWg0LWL95kC/919USJ6vyiBgw+sgk0="; + hash = "sha256-FH3TTVNeZiZKbRbkOxQK4x2tNhcd2RxWN9n9mhYHaqA="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/htmldate/default.nix b/pkgs/development/python-modules/htmldate/default.nix index cdf4f8dfa04d..5a0f68e129be 100644 --- a/pkgs/development/python-modules/htmldate/default.nix +++ b/pkgs/development/python-modules/htmldate/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "htmldate"; - version = "1.9.2"; + version = "1.9.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "adbar"; repo = "htmldate"; tag = "v${version}"; - hash = "sha256-lTBLk8SlS2R4n5HORyt5mechKKEWRtMggOxUZ6kgQIc="; + hash = "sha256-9uFf/sx0AZdlvizU65H87hbtwDKf8Ykm67bKM9Oq//s="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/josepy/default.nix b/pkgs/development/python-modules/josepy/default.nix index b1aa721e1305..ce6ab9354822 100644 --- a/pkgs/development/python-modules/josepy/default.nix +++ b/pkgs/development/python-modules/josepy/default.nix @@ -2,35 +2,24 @@ lib, buildPythonPackage, cryptography, - fetchPypi, - fetchpatch, + fetchFromGitHub, poetry-core, pyopenssl, pytestCheckHook, - pythonOlder, }: buildPythonPackage rec { pname = "josepy"; - version = "1.14.0"; + version = "1.15.0"; pyproject = true; - disabled = pythonOlder "3.7"; - - src = fetchPypi { - inherit pname version; - hash = "sha256-MIs7+c6CWtTUu6djcs8ZtdwcLOlqnSmPlkKXXmS9E90="; + src = fetchFromGitHub { + owner = "certbot"; + repo = "josepy"; + tag = "v${version}"; + hash = "sha256-fK4JHDP9eKZf2WO+CqRdEjGwJg/WNLvoxiVrb5xQxRc="; }; - patches = [ - # don't fail tests on openssl deprecation warning, upstream is working on proper fix - # FIXME: remove for next update - (fetchpatch { - url = "https://github.com/certbot/josepy/commit/350410fc1d38c4ac8422816b6865ac8cd9c60fc7.diff"; - hash = "sha256-QGbzonXb5BtTTWDeDqnZhbS6gHce99vIOm/H8QYeGXY="; - }) - ]; - nativeBuildInputs = [ poetry-core ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/libretranslate/default.nix b/pkgs/development/python-modules/libretranslate/default.nix index 11ba515da2e9..738208e38d8e 100644 --- a/pkgs/development/python-modules/libretranslate/default.nix +++ b/pkgs/development/python-modules/libretranslate/default.nix @@ -30,14 +30,14 @@ buildPythonPackage rec { pname = "libretranslate"; - version = "1.6.2"; + version = "1.6.4"; pyproject = true; src = fetchFromGitHub { owner = "LibreTranslate"; repo = "LibreTranslate"; tag = "v${version}"; - hash = "sha256-u0m9dTxwSGU50YplV24daSO+WY/At648OpIEZYMmqqo="; + hash = "sha256-HEN+3hwfgPmXS5POK6jHGLWF5Tp4rCPKVbA9nWN3Q9I="; }; build-system = [ diff --git a/pkgs/development/python-modules/llm-ollama/default.nix b/pkgs/development/python-modules/llm-ollama/default.nix index fc6ffa59fdbf..e3012f0f74eb 100644 --- a/pkgs/development/python-modules/llm-ollama/default.nix +++ b/pkgs/development/python-modules/llm-ollama/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "llm-ollama"; - version = "0.8.1"; + version = "0.8.2"; pyproject = true; src = fetchFromGitHub { owner = "taketwo"; repo = "llm-ollama"; tag = version; - hash = "sha256-9AgHX2FJRXSKZOLt7JR/9Fg4i2HGNQY2vSsJa4+2BGQ="; + hash = "sha256-/WAugfkI4izIQ7PoKM9epd/4vFxYPvsiwDbEqqTdMq4="; }; build-system = [ diff --git a/pkgs/development/python-modules/model-checker/default.nix b/pkgs/development/python-modules/model-checker/default.nix index 188f5867fb10..08ec5b909432 100644 --- a/pkgs/development/python-modules/model-checker/default.nix +++ b/pkgs/development/python-modules/model-checker/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "model-checker"; - version = "0.7.3"; + version = "0.7.17"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "model_checker"; inherit version; - hash = "sha256-ZADgS+Mtpko+UvPBOo7cv9QVz1MdzFqeB4MRwZK9kkg="; + hash = "sha256-u9WHYglZG+SytH2qiUJV7YI+zCZ6UIdORXgSgcYgFYc="; }; # z3 does not provide a dist-info, so python-runtime-deps-check will fail diff --git a/pkgs/development/python-modules/murmurhash/default.nix b/pkgs/development/python-modules/murmurhash/default.nix index de051620c6f7..dc3aa8a32468 100644 --- a/pkgs/development/python-modules/murmurhash/default.nix +++ b/pkgs/development/python-modules/murmurhash/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "murmurhash"; - version = "1.0.11"; + version = "1.0.12"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-h/9oolXlTnZI0HKf9BMPQ/fzjwMoijduVnk04W25N2c="; + hash = "sha256-Rnt+4xwfefRtAENqGVf8UqDlgBNp3S8w63ZV84BzW18="; }; postPatch = '' diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index 2178ab3ac7d9..36c2a05eeb59 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -250,8 +250,8 @@ rec { "sha256-FCOuT2svx3aUPC0OEJE7yKDPjdATV3w1ILmZGgAOaXs="; mypy-boto3-cloudtrail = - buildMypyBoto3Package "cloudtrail" "1.36.0" - "sha256-ZPxfq5J7Vm/dGMAdyKiQskaJ3DyQcg/6DjsjxLqJx4Y="; + buildMypyBoto3Package "cloudtrail" "1.36.6" + "sha256-vL2HIQS5Z2yQjSJMoFAfu44ijka8zUCEypeyA/Hi0Fc="; mypy-boto3-cloudtrail-data = buildMypyBoto3Package "cloudtrail-data" "1.36.0" @@ -446,8 +446,8 @@ rec { "sha256-YrzTW5fEsZPDu4p84jhY4avS/wM01XybrvGCOtF48cQ="; mypy-boto3-ec2 = - buildMypyBoto3Package "ec2" "1.36.2" - "sha256-IwQg73lI34QtCjedW3ctRC0tzNAOXvgJl2s09GV6Zg0="; + buildMypyBoto3Package "ec2" "1.36.5" + "sha256-BKeub+Y+DKAAMTtps97o9nMVHpcPA+QF10sRAIH5VE8="; mypy-boto3-ec2-instance-connect = buildMypyBoto3Package "ec2-instance-connect" "1.36.0" @@ -470,8 +470,8 @@ rec { "sha256-5xK6JX8tM+3EDHC5Ma4G6fGYSf/9Q1V7O2YS+E20HOo="; mypy-boto3-eks = - buildMypyBoto3Package "eks" "1.36.0" - "sha256-G4kIlOE/2SYhP0JzX0jmu3al7UbU0wwTx/lVAP19JQ0="; + buildMypyBoto3Package "eks" "1.36.6" + "sha256-XmOg80pQ9TTSBbpIEABm/fST0yGyLYZCm4XO+1CwLcw="; mypy-boto3-elastic-inference = buildMypyBoto3Package "elastic-inference" "1.36.0" @@ -574,8 +574,8 @@ rec { "sha256-1Xjn3SfQQOXthfqH1dwHkldEIgSmUGEnn8N83H7ALXQ="; mypy-boto3-glue = - buildMypyBoto3Package "glue" "1.36.0" - "sha256-qaBq4p1EWHOjW5L4s/Nz3tprCyln9xuvp7/Nj+n4pcU="; + buildMypyBoto3Package "glue" "1.36.4" + "sha256-b4YwzN4ovNNGyg/GDDOjlKo6anyHjdDrIuJVy0ZO1fQ="; mypy-boto3-grafana = buildMypyBoto3Package "grafana" "1.36.0" @@ -602,8 +602,8 @@ rec { "sha256-EofHk2ODs/ARQ8wYlKtIEkSyreK0oNnY2XaAqXJ+jJw="; mypy-boto3-healthlake = - buildMypyBoto3Package "healthlake" "1.36.0" - "sha256-hhnoxBkT9GNYe5TPlRcsC7CHhq3Zqw6f3jL1LguwmQM="; + buildMypyBoto3Package "healthlake" "1.36.6" + "sha256-5qJo7cHwuGBFz8B9x8C9JZUc5hb+UbmKV2SZHEZ3WzE="; mypy-boto3-iam = buildMypyBoto3Package "iam" "1.36.0" @@ -866,8 +866,8 @@ rec { "sha256-d4AwaMKqhplnUnpLQv+zukeKX7+TlhGt5YwTZFCPlKo="; mypy-boto3-medialive = - buildMypyBoto3Package "medialive" "1.36.0" - "sha256-94Jmz9TmRnGZOJXqChyRlKE74iVt2Cjiu8jsQQo0sB0="; + buildMypyBoto3Package "medialive" "1.36.4" + "sha256-ehAZOo4ekOoPdKXhUOXv7YK67bJhd4haHM3GjuTQiBs="; mypy-boto3-mediapackage = buildMypyBoto3Package "mediapackage" "1.36.0" @@ -1294,8 +1294,8 @@ rec { "sha256-p/kB20Mw0WpJyhE8MVQRkQbj2zT7J/6+vuEpl4aBUUM="; mypy-boto3-ssm = - buildMypyBoto3Package "ssm" "1.36.0" - "sha256-u7mpzg4xjK0qU/ggAQK0/cVHx/M5EhRt+CaYya5AGB8="; + buildMypyBoto3Package "ssm" "1.36.6" + "sha256-7cgZt1Jqs1sQVkhgODnRWLABRq9XQ/x3hNsyJwc+GXM="; mypy-boto3-ssm-contacts = buildMypyBoto3Package "ssm-contacts" "1.36.0" @@ -1318,8 +1318,8 @@ rec { "sha256-SdY+ZIHzE7P2riMhr9MbiPISKx8eK0uXH8R8eSFY7Yo="; mypy-boto3-sso-oidc = - buildMypyBoto3Package "sso-oidc" "1.36.0" - "sha256-4YCnPVxaK/HwAQnfhgK8nHYqSo2YJez5jpWlByhtKz4="; + buildMypyBoto3Package "sso-oidc" "1.36.6" + "sha256-beQp4GmS7la2xDmHNnhuyAFeoZ4UIJ7xTS/qEedAfnQ="; mypy-boto3-stepfunctions = buildMypyBoto3Package "stepfunctions" "1.36.0" @@ -1370,8 +1370,8 @@ rec { "sha256-LOMhyKiJ5K1AHzGmcV+GXLUsKyc8mX6zYguh3UZgzNM="; mypy-boto3-transfer = - buildMypyBoto3Package "transfer" "1.36.0" - "sha256-UNXQ8UPxPBEChjLf54CWE9rDFMi/BiOXdbou/pOsHdg="; + buildMypyBoto3Package "transfer" "1.36.6" + "sha256-i+bqPZy3UkWbXBA6nW0HxaXq+v6Nky0yS1khYfF/H4o="; mypy-boto3-translate = buildMypyBoto3Package "translate" "1.36.0" diff --git a/pkgs/development/python-modules/netbox-interface-synchronization/default.nix b/pkgs/development/python-modules/netbox-interface-synchronization/default.nix index cb3e55c503f6..2159ad89f4cc 100644 --- a/pkgs/development/python-modules/netbox-interface-synchronization/default.nix +++ b/pkgs/development/python-modules/netbox-interface-synchronization/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - attrs, django, netaddr, netbox, @@ -10,20 +9,19 @@ }: buildPythonPackage rec { pname = "netbox-interface-synchronization"; - version = "4.1.4"; + version = "4.1.5"; pyproject = true; src = fetchFromGitHub { owner = "NetTech2001"; repo = "netbox-interface-synchronization"; tag = version; - hash = "sha256-ikorJa5kCaVfxXsr8PSzuBME3PUc+UM+VDcq82WtDVs="; + hash = "sha256-Elk2/Ddm6kOfT4/ISEIXjACypmDxf8dAoZiWGSylHz4="; }; build-system = [ setuptools ]; dependencies = [ - attrs django netaddr ]; diff --git a/pkgs/development/python-modules/nh3/default.nix b/pkgs/development/python-modules/nh3/default.nix index 0a30e71eb1c4..d1437292d7bb 100644 --- a/pkgs/development/python-modules/nh3/default.nix +++ b/pkgs/development/python-modules/nh3/default.nix @@ -23,10 +23,10 @@ buildPythonPackage { format = "pyproject"; disabled = pythonOlder "3.8"; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-NmSOmM3OHiBx1xwlV2QyliQxDMNFApOlEehxfwyEU0I="; + hash = "sha256-cYdwN/PpG1ae6lBRk5usXSwBjH37BpQEp5JLLQ2NRNU="; }; nativeBuildInputs = with rustPlatform; [ diff --git a/pkgs/development/python-modules/ntc-templates/default.nix b/pkgs/development/python-modules/ntc-templates/default.nix index 668e0af41753..4b14fcaf3780 100644 --- a/pkgs/development/python-modules/ntc-templates/default.nix +++ b/pkgs/development/python-modules/ntc-templates/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "ntc-templates"; - version = "7.5.0"; + version = "7.6.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "networktocode"; repo = "ntc-templates"; tag = "v${version}"; - hash = "sha256-VRkWjhl/7qDwXTWQ5ZhIS7JMuxJWlWkqwjoSo1DXOQE="; + hash = "sha256-N25XKFlTcxOczjOBsTvyYLYSLJLTFnn2hG5KnsHVKOc="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/powerfox/default.nix b/pkgs/development/python-modules/powerfox/default.nix index 17de893e5d45..919fec57f72e 100644 --- a/pkgs/development/python-modules/powerfox/default.nix +++ b/pkgs/development/python-modules/powerfox/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "powerfox"; - version = "1.2.0"; + version = "1.2.1"; pyproject = true; disabled = pythonOlder "3.11"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "klaasnicolaas"; repo = "python-powerfox"; tag = "v${version}"; - hash = "sha256-VSkOCJu3HXBHkvYtSe/kYFOhJ9kMrcf/ijMqvUB9aRU="; + hash = "sha256-eBadw++8mB/RUejIbMAnfBRmM+YC7oeeBWRaHCCyizo="; }; patches = [ diff --git a/pkgs/development/python-modules/publicsuffixlist/default.nix b/pkgs/development/python-modules/publicsuffixlist/default.nix index e677da9a20ed..5b05258f3acf 100644 --- a/pkgs/development/python-modules/publicsuffixlist/default.nix +++ b/pkgs/development/python-modules/publicsuffixlist/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "publicsuffixlist"; - version = "1.0.2.20250122"; + version = "1.0.2.20250124"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-FQXZsqPxWyF5II+tzOzWT/gED+GfZgiVefBPG/6wwT4="; + hash = "sha256-bl/ziwDSG6VmLqNo6TEhv7G+//veKNDa6nFSs4MMV5g="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pydata-google-auth/default.nix b/pkgs/development/python-modules/pydata-google-auth/default.nix index 2aa3c872f349..c0348b08ed43 100644 --- a/pkgs/development/python-modules/pydata-google-auth/default.nix +++ b/pkgs/development/python-modules/pydata-google-auth/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pydata-google-auth"; - version = "1.9.0"; + version = "1.9.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { repo = "pydata-google-auth"; owner = "pydata"; tag = version; - hash = "sha256-Vel8xSDX0djNwlICXE/ON3G4m0dWmynl8fHfDhaZhbI="; + hash = "sha256-NxEpwCkjNWao2bnKOsDgw93N+cVqwM12VfoEu8CyWUU="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pyecharts/default.nix b/pkgs/development/python-modules/pyecharts/default.nix index 58b3b078acaa..38750eccb96b 100644 --- a/pkgs/development/python-modules/pyecharts/default.nix +++ b/pkgs/development/python-modules/pyecharts/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "pyecharts"; - version = "2.0.7"; + version = "2.0.8"; pyproject = true; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "pyecharts"; repo = "pyecharts"; tag = "v${version}"; - hash = "sha256-5DM5uBVa4pRLmNKCuGJu5z5wUsLBEqqKjWIP/3Mhg18="; + hash = "sha256-Aax/HpYJRrfituiAIT7Y6F9v9tX9EmVXtr+4R98tces="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pyerfa/default.nix b/pkgs/development/python-modules/pyerfa/default.nix index e5bd3e20e5be..d8afee56061f 100644 --- a/pkgs/development/python-modules/pyerfa/default.nix +++ b/pkgs/development/python-modules/pyerfa/default.nix @@ -24,6 +24,7 @@ buildPythonPackage rec { build-system = [ jinja2 + numpy packaging setuptools setuptools-scm diff --git a/pkgs/development/python-modules/pynitrokey/default.nix b/pkgs/development/python-modules/pynitrokey/default.nix index b1b996ae607a..cfc3d2e4d3d1 100644 --- a/pkgs/development/python-modules/pynitrokey/default.nix +++ b/pkgs/development/python-modules/pynitrokey/default.nix @@ -30,7 +30,7 @@ let pname = "pynitrokey"; - version = "0.7.1"; + version = "0.7.3"; mainProgram = "nitropy"; in @@ -40,7 +40,7 @@ buildPythonPackage { src = fetchPypi { inherit pname version; - hash = "sha256-1hACUig5vH2Ra/ASYesHb8jRkcUpeXGe5O89/lTSrjk="; + hash = "sha256-+sza4ZOJbElIdQLZFpoW0zs6KUYapRiC3gTxcj6Oqsg="; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/python-modules/pynvml/0001-locate-libnvidia-ml.so.1-on-NixOS.patch b/pkgs/development/python-modules/pynvml/0001-locate-libnvidia-ml.so.1-on-NixOS.patch deleted file mode 100644 index 48727de2516a..000000000000 --- a/pkgs/development/python-modules/pynvml/0001-locate-libnvidia-ml.so.1-on-NixOS.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/pynvml/nvml.py b/pynvml/nvml.py -index 56d908f..1de0b97 100644 ---- a/pynvml/nvml.py -+++ b/pynvml/nvml.py -@@ -1475,7 +1475,11 @@ def _LoadNvmlLibrary(): - nvmlLib = CDLL(os.path.join(os.getenv("ProgramFiles", "C:/Program Files"), "NVIDIA Corporation/NVSMI/nvml.dll")) - else: - # assume linux -- nvmlLib = CDLL("libnvidia-ml.so.1") -+ try: -+ nvmlLib = CDLL("libnvidia-ml.so.1") -+ except OSError: -+ # assume NixOS -+ nvmlLib = CDLL("@driverLink@/lib/libnvidia-ml.so.1") - except OSError as ose: - _nvmlCheckReturn(NVML_ERROR_LIBRARY_NOT_FOUND) - if (nvmlLib == None): diff --git a/pkgs/development/python-modules/pynvml/default.nix b/pkgs/development/python-modules/pynvml/default.nix index ea8c12ad5528..7de3a041ef1e 100644 --- a/pkgs/development/python-modules/pynvml/default.nix +++ b/pkgs/development/python-modules/pynvml/default.nix @@ -3,63 +3,48 @@ buildPythonPackage, cudaPackages, fetchFromGitHub, - substituteAll, - addDriverRunpath, setuptools, pytestCheckHook, - versioneer, + nvidia-ml-py, pynvml, }: buildPythonPackage rec { pname = "pynvml"; - version = "11.5.3"; + version = "12.0.0"; pyproject = true; src = fetchFromGitHub { owner = "gpuopenanalytics"; repo = "pynvml"; tag = version; - hash = "sha256-8NkYBRpcW3dvxVc6z17TMRPqA0YK/J/CdjuqgdcTdy8="; + hash = "sha256-bfES6QqL9DO7rmQ3btXxVzW0KlL0eHyUvYJVeijymBk="; }; - patches = [ - (substituteAll { - src = ./0001-locate-libnvidia-ml.so.1-on-NixOS.patch; - inherit (addDriverRunpath) driverLink; - }) - ]; - - # unvendor versioneer - postPatch = '' - rm versioneer.py - ''; - build-system = [ setuptools - versioneer ]; + dependencies = [ nvidia-ml-py ]; + pythonImportsCheck = [ - "pynvml" - "pynvml.smi" + "pynvml_utils" ]; nativeCheckInputs = [ pytestCheckHook ]; - # OSError: /run/opengl-driver/lib/libnvidia-ml.so.1: cannot open shared object file: No such file or directory doCheck = false; passthru.tests.tester-nvmlInit = cudaPackages.writeGpuTestPython { libraries = [ pynvml ]; } '' - import pynvml - from pynvml.smi import nvidia_smi # noqa: F401 - - print(f"{pynvml.nvmlInit()=}") + from pynvml_utils import nvidia_smi # noqa: F401 + nvsmi = nvidia_smi.getInstance() + print(nvsmi.DeviceQuery('memory.free, memory.total')) ''; meta = { - description = "Python bindings for the NVIDIA Management Library"; + description = "Unofficial Python bindings for the NVIDIA Management Library"; homepage = "https://github.com/gpuopenanalytics/pynvml"; + changelog = "https://github.com/gpuopenanalytics/pynvml?tab=readme-ov-file#release-notes"; license = lib.licenses.bsd3; maintainers = [ lib.maintainers.bcdarwin ]; }; diff --git a/pkgs/development/python-modules/pyopencl/default.nix b/pkgs/development/python-modules/pyopencl/default.nix index 1ca5e1bfca12..e15dde02e599 100644 --- a/pkgs/development/python-modules/pyopencl/default.nix +++ b/pkgs/development/python-modules/pyopencl/default.nix @@ -31,7 +31,7 @@ let in buildPythonPackage rec { pname = "pyopencl"; - version = "2024.3"; + version = "2025.1"; pyproject = true; src = fetchFromGitHub { @@ -39,7 +39,7 @@ buildPythonPackage rec { repo = "pyopencl"; tag = "v${version}"; fetchSubmodules = true; - hash = "sha256-HE7dARgKnZxqjAXX4iI1ml0N2BalyTo+ZAzjC2ThEN8="; + hash = "sha256-wAZBDPMJbTmujP1j7LjK28ZozZaUwKPDPZLZbFFTeAs="; }; build-system = [ @@ -91,7 +91,10 @@ buildPythonPackage rec { changelog = "https://github.com/inducer/pyopencl/releases/tag/v${version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ GaetanLepage ]; - # ld: symbol(s) not found for architecture arm64 broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64; + badPlatforms = [ + # ld: symbol(s) not found for architecture arm64/x86_64 + lib.systems.inspect.patterns.isDarwin + ]; }; } diff --git a/pkgs/development/python-modules/pysubs2/default.nix b/pkgs/development/python-modules/pysubs2/default.nix index e03a87fffda0..03f7077afd42 100644 --- a/pkgs/development/python-modules/pysubs2/default.nix +++ b/pkgs/development/python-modules/pysubs2/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pysubs2"; - version = "1.7.3"; + version = "1.8.0"; format = "pyproject"; src = fetchFromGitHub { owner = "tkarabela"; repo = pname; rev = version; - hash = "sha256-PrpN+w/gCi7S9OmD6kbbvL9VlZEfy1DbehFTwjxsibA="; + hash = "sha256-fKSb7MfBHGft8Tp6excjfkVXKnHRER11X0QxbR1zD4I="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/reolink-aio/default.nix b/pkgs/development/python-modules/reolink-aio/default.nix index c6bbb2f910c9..1b26f1ac1f6b 100644 --- a/pkgs/development/python-modules/reolink-aio/default.nix +++ b/pkgs/development/python-modules/reolink-aio/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "reolink-aio"; - version = "0.11.6"; + version = "0.11.7"; pyproject = true; disabled = pythonOlder "3.11"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "starkillerOG"; repo = "reolink_aio"; tag = version; - hash = "sha256-QZPv3bdmk3RVLfINegSbSl8SLrjTKYkdJBiK2jRmYlU="; + hash = "sha256-Om43i4dAFubpWczdx9hiJblBOUeHBZLikic1f0qniL0="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/scalene/default.nix b/pkgs/development/python-modules/scalene/default.nix index b2fc07bbcebd..b03c0f041e2f 100644 --- a/pkgs/development/python-modules/scalene/default.nix +++ b/pkgs/development/python-modules/scalene/default.nix @@ -11,7 +11,6 @@ nvidia-ml-py, psutil, pydantic, - pynvml, pytestCheckHook, pythonOlder, rich, @@ -75,7 +74,6 @@ buildPythonPackage rec { numpy psutil pydantic - pynvml rich ] ++ lib.optionals stdenv.hostPlatform.isLinux [ nvidia-ml-py ]; diff --git a/pkgs/development/python-modules/schwifty/default.nix b/pkgs/development/python-modules/schwifty/default.nix index d94adfdc7ba7..815e8903b73c 100644 --- a/pkgs/development/python-modules/schwifty/default.nix +++ b/pkgs/development/python-modules/schwifty/default.nix @@ -23,14 +23,14 @@ buildPythonPackage rec { pname = "schwifty"; - version = "2024.11.0"; + version = "2025.1.0"; pyproject = true; disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-0KrtAxaEA7Qz3lFdZj3wlRaUGucBUoUNo6/jwkIlX2o="; + hash = "sha256-9JLzy+o76x/gvxGokHXm5BOl9QDuGv2ymhJKmomxoso="; }; build-system = [ diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix index 1440af16b2c0..9fd7a701a09d 100644 --- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix +++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "tencentcloud-sdk-python"; - version = "3.0.1308"; + version = "3.0.1310"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "TencentCloud"; repo = "tencentcloud-sdk-python"; tag = version; - hash = "sha256-gT0ociYhvrjS+JOOOSBFeL3VE5gUZFcjpSa0kT/hVD0="; + hash = "sha256-m7Kg3aWgvSHLiDPC52lVen+6dRfVDMPdv1IItd/aBjM="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/transformers/default.nix b/pkgs/development/python-modules/transformers/default.nix index 7c0234ae049f..718bf06ea14d 100644 --- a/pkgs/development/python-modules/transformers/default.nix +++ b/pkgs/development/python-modules/transformers/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + fetchpatch, # build-system setuptools, @@ -68,6 +69,15 @@ buildPythonPackage rec { hash = "sha256-doYvjwajwXqqaKZ363p2SE//9eupfkwrG66j0iUAnU0="; }; + patches = [ + # Remove on the next major version bump + (fetchpatch { + url = "https://github.com/huggingface/transformers/commit/db864b5526d56fd99143619abff969bfcb5596d5.patch?full_index=1"; + name = "dont-import-torch-distributed-if-not-available.patch"; + hash = "sha256-XOraJmSt9Rp/oNiil6vDUBqZhd8MDbA0nz1Tx16Mk14="; + }) + ]; + build-system = [ setuptools ]; dependencies = [ diff --git a/pkgs/development/python-modules/txtai/default.nix b/pkgs/development/python-modules/txtai/default.nix index 67b0d6544539..76314fbe393a 100644 --- a/pkgs/development/python-modules/txtai/default.nix +++ b/pkgs/development/python-modules/txtai/default.nix @@ -87,7 +87,7 @@ pytestCheckHook, }: let - version = "8.1.0"; + version = "8.2.0"; ann = [ annoy hnswlib @@ -227,7 +227,7 @@ buildPythonPackage { owner = "neuml"; repo = "txtai"; tag = "v${version}"; - hash = "sha256-12EeYzZEHUS5HVxpKlTnV6mwnnOw1pQVG0f0ID/Ugik="; + hash = "sha256-fMzCYw9eqlpGI5FKoyYyxT17EhUFmFP9lrCn/LFC6ks="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/uiprotect/default.nix b/pkgs/development/python-modules/uiprotect/default.nix index 8f29d718b83b..fc45776a64e1 100644 --- a/pkgs/development/python-modules/uiprotect/default.nix +++ b/pkgs/development/python-modules/uiprotect/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { pname = "uiprotect"; - version = "7.4.1"; + version = "7.5.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -49,7 +49,7 @@ buildPythonPackage rec { owner = "uilibs"; repo = "uiprotect"; tag = "v${version}"; - hash = "sha256-y4rJoT70WiVS9Gs/U6FPOaGGubPI43x9tA2vcdiDBlw="; + hash = "sha256-tOozcXDXQI3l5dMQ8WqBrC7wLVbl5iomsuy/hYL3emE="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/vcard/default.nix b/pkgs/development/python-modules/vcard/default.nix index 11d8c496a706..16568030e235 100644 --- a/pkgs/development/python-modules/vcard/default.nix +++ b/pkgs/development/python-modules/vcard/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { version = "0.16.1"; pyproject = true; - disabled = pythonOlder "3.8" || pythonAtLeast "3.12"; + disabled = pythonOlder "3.8" || pythonAtLeast "3.13"; src = fetchFromGitLab { owner = "engmark"; diff --git a/pkgs/development/python-modules/vllm/default.nix b/pkgs/development/python-modules/vllm/default.nix index 0d554e5a5491..4231983b0c5b 100644 --- a/pkgs/development/python-modules/vllm/default.nix +++ b/pkgs/development/python-modules/vllm/default.nix @@ -25,7 +25,6 @@ uvicorn, pydantic, aioprometheus, - pynvml, openai, pyzmq, tiktoken, @@ -149,7 +148,6 @@ buildPythonPackage rec { ++ aioprometheus.optional-dependencies.starlette ++ lib.optionals cudaSupport [ cupy - pynvml ]; dontUseCmakeConfigure = true; diff --git a/pkgs/development/python-modules/webauthn/default.nix b/pkgs/development/python-modules/webauthn/default.nix index 79a57455f714..6e08d70c787d 100644 --- a/pkgs/development/python-modules/webauthn/default.nix +++ b/pkgs/development/python-modules/webauthn/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "webauthn"; - version = "2.4.0"; + version = "2.5.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "duo-labs"; repo = "py_webauthn"; tag = "v${version}"; - hash = "sha256-5WSNrUm+V7KHoWYy2NCpb/C9x5+vIb7ddEpAcv2UQZo="; + hash = "sha256-XIL2rejPp/5zaPFuWHgn696sugNB3E/BRc7DuP0oI4Q="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/webexpythonsdk/default.nix b/pkgs/development/python-modules/webexpythonsdk/default.nix index 745b9cc95f46..15fe08f89031 100644 --- a/pkgs/development/python-modules/webexpythonsdk/default.nix +++ b/pkgs/development/python-modules/webexpythonsdk/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "webexpythonsdk"; - version = "2.0.3"; + version = "2.0.4"; pyproject = true; disabled = pythonOlder "3.12"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "WebexCommunity"; repo = "WebexPythonSDK"; tag = "v${version}"; - hash = "sha256-E66LwqzNWYAxnB8y5t8JHH4oVVXvheO7tteHWqrRRt8="; + hash = "sha256-8U3aAS+9dU5Zg4fS2t6zLvTEJ/6aIV/YEWte06GvKTo="; }; build-system = [ diff --git a/pkgs/development/python-modules/wsdiscovery/default.nix b/pkgs/development/python-modules/wsdiscovery/default.nix index 9d5d1e884cb4..7af12d7689fe 100644 --- a/pkgs/development/python-modules/wsdiscovery/default.nix +++ b/pkgs/development/python-modules/wsdiscovery/default.nix @@ -7,23 +7,26 @@ netifaces, pytestCheckHook, pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "wsdiscovery"; - version = "2.0.0"; - format = "setuptools"; + version = "2.1.2"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "andreikop"; repo = "python-ws-discovery"; - rev = version; + rev = "v${version}"; hash = "sha256-6LGZogNRCnmCrRXvHq9jmHwqW13KQPpaGaao/52JPtk="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ click netifaces ]; @@ -38,7 +41,7 @@ buildPythonPackage rec { meta = with lib; { description = "WS-Discovery implementation for Python"; homepage = "https://github.com/andreikop/python-ws-discovery"; - license = with licenses; [ lgpl3Plus ]; + license = licenses.lgpl3Plus; maintainers = with maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/yte/default.nix b/pkgs/development/python-modules/yte/default.nix index b92d0610bc06..059b35d7f3f0 100644 --- a/pkgs/development/python-modules/yte/default.nix +++ b/pkgs/development/python-modules/yte/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "yte"; - version = "1.5.5"; + version = "1.5.6"; pyproject = true; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "koesterlab"; repo = "yte"; tag = "v${version}"; - hash = "sha256-vHrYWdyWBqonCBWg1X+lTVlOHS30/yYqZ9sVK3/2n5o="; + hash = "sha256-1HiAtyVT/ihr/CdZUtgN1WA+3cLHXLcSbwN/JXP/FgQ="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/rocm-modules/6/llvm/stage-2/1000-libcxx-failing-tests.list b/pkgs/development/rocm-modules/6/llvm/stage-2/1000-libcxx-failing-tests.list index d5e1f675079f..a70c98d4e473 100644 --- a/pkgs/development/rocm-modules/6/llvm/stage-2/1000-libcxx-failing-tests.list +++ b/pkgs/development/rocm-modules/6/llvm/stage-2/1000-libcxx-failing-tests.list @@ -173,3 +173,4 @@ ../libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.array/sized_delete_array14.pass.cpp ../libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.single/sized_delete14.pass.cpp ../libcxx/test/libcxx/selftest/sh.cpp/empty.sh.cpp +../libcxx/test/libcxx/transitive_includes.sh.cpp diff --git a/pkgs/development/tools/analysis/hopper/default.nix b/pkgs/development/tools/analysis/hopper/default.nix index a3ceed9c43e0..6ea31a57c9e2 100644 --- a/pkgs/development/tools/analysis/hopper/default.nix +++ b/pkgs/development/tools/analysis/hopper/default.nix @@ -3,7 +3,7 @@ , lib , autoPatchelfHook , wrapQtAppsHook -, gnustep +, gnustep-libobjc , libbsd , libffi_3_3 , ncurses6 @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - gnustep.libobjc + gnustep-libobjc libbsd libffi_3_3 ncurses6 diff --git a/pkgs/development/tools/misc/fswatch/default.nix b/pkgs/development/tools/misc/fswatch/default.nix index bce63deb9f03..814838532766 100644 --- a/pkgs/development/tools/misc/fswatch/default.nix +++ b/pkgs/development/tools/misc/fswatch/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "fswatch"; - version = "1.17.1"; + version = "1.18.0"; src = fetchFromGitHub { owner = "emcrisostomo"; repo = "fswatch"; rev = version; - sha256 = "sha256-gVYDvda+6ZJkShJXUxUEVxq4enkRrhdvlTTxYWq4Aho="; + sha256 = "sha256-n9EDEF5swC7UyvC0cd+U/u4Wd050Jf9h2AVtEVbUICA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/misc/gede/default.nix b/pkgs/development/tools/misc/gede/default.nix index 1feff837877a..dbe1c51b7b1c 100644 --- a/pkgs/development/tools/misc/gede/default.nix +++ b/pkgs/development/tools/misc/gede/default.nix @@ -1,31 +1,35 @@ { mkDerivation, lib, - fetchurl, + fetchFromGitHub, makeWrapper, python3, + qtbase, qmake, + qtserialport, ctags, gdb, }: mkDerivation rec { pname = "gede"; - version = "2.18.3"; + version = "v2.22.1"; - src = fetchurl { - url = "http://gede.dexar.se/uploads/source/${pname}-${version}.tar.xz"; - sha256 = "sha256-RUl60iPa4XSlUilpYKaYQbRmLqthKHAvYonnhufjPsE="; + src = fetchFromGitHub { + owner = "jhn98032"; + repo = "gede"; + rev = version; + hash = "sha256-6YSrqLDuV4G/uvtYy4vzbwqrMFftMvZdp3kr3R436rs="; }; nativeBuildInputs = [ - qmake + ctags makeWrapper python3 + qmake + qtserialport ]; - buildInputs = [ ctags ]; - strictDeps = true; dontUseQmakeConfigure = true; @@ -35,6 +39,7 @@ mkDerivation rec { installPhase = '' python build.py install --verbose --prefix="$out" wrapProgram $out/bin/gede \ + --prefix QT_PLUGIN_PATH : ${qtbase}/${qtbase.qtPluginPrefix} \ --prefix PATH : ${ lib.makeBinPath [ ctags diff --git a/pkgs/development/tools/rust/cargo-edit/default.nix b/pkgs/development/tools/rust/cargo-edit/default.nix index 7b52294da6e7..619707c703fa 100644 --- a/pkgs/development/tools/rust/cargo-edit/default.nix +++ b/pkgs/development/tools/rust/cargo-edit/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-edit"; - version = "0.13.0"; + version = "0.13.1"; src = fetchFromGitHub { owner = "killercup"; repo = pname; rev = "v${version}"; - hash = "sha256-Y5tnY8EZJcVhYyVTpvcT6DFbPSmmw3+knzkMVvQxQbI="; + hash = "sha256-u5tpJEOyVGCmNYeXY4TdPTy6kZr/7nAMpCqhoeWVjfQ="; }; - cargoHash = "sha256-X8wQvLSvZ7rrDfX423SDB5QDDMoeDDFvJZKO92CLycg="; + cargoHash = "sha256-RvBID/jZvSBu2PyKj532anKA/DWnpuwlyPIX3+lCVgw="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/tools/sentry-cli/default.nix b/pkgs/development/tools/sentry-cli/default.nix index 81bfa72a3f71..5bb71e237970 100644 --- a/pkgs/development/tools/sentry-cli/default.nix +++ b/pkgs/development/tools/sentry-cli/default.nix @@ -11,13 +11,13 @@ }: rustPlatform.buildRustPackage rec { pname = "sentry-cli"; - version = "2.39.1"; + version = "2.40.0"; src = fetchFromGitHub { owner = "getsentry"; repo = "sentry-cli"; rev = version; - sha256 = "sha256-mVe1X2bXRJGHXkHEQ37AhtgcHoxwsjIJKtIFeqB05vs="; + sha256 = "sha256-e4e7Vj+WPRG2kH4Avanj6STYmwY7N39XI6SZV99CGE0="; }; doCheck = false; @@ -27,7 +27,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices Security SystemConfiguration ]; nativeBuildInputs = [ installShellFiles pkg-config ]; - cargoHash = "sha256-Mp92cEvgOj0JH7+5+hl8wN+a7zPf8heV6whaqvIcBTU="; + cargoHash = "sha256-kpGe6IjoVmmwSXaNDgi4PMjL0Hc6520xPcGr2CViZqo="; postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd sentry-cli \ diff --git a/pkgs/games/doom-ports/slade/default.nix b/pkgs/games/doom-ports/slade/default.nix index a388922e168a..0c27d2c48223 100644 --- a/pkgs/games/doom-ports/slade/default.nix +++ b/pkgs/games/doom-ports/slade/default.nix @@ -52,6 +52,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DwxWidgets_LIBRARIES=${wxGTK}/lib" + (lib.cmakeFeature "CL_WX_CONFIG" (lib.getExe' (lib.getDev wxGTK) "wx-config")) ]; env.NIX_CFLAGS_COMPILE = "-Wno-narrowing"; diff --git a/pkgs/games/freeciv/default.nix b/pkgs/games/freeciv/default.nix index 110dd68ace55..c0f7767bd5c1 100644 --- a/pkgs/games/freeciv/default.nix +++ b/pkgs/games/freeciv/default.nix @@ -34,13 +34,13 @@ stdenv.mkDerivation rec { pname = "freeciv"; - version = "3.1.3"; + version = "3.1.4"; src = fetchFromGitHub { owner = "freeciv"; repo = "freeciv"; rev = "R${lib.replaceStrings [ "." ] [ "_" ] version}"; - hash = "sha256-z4BmkAjKgK0rf4fCMpAhI++HCKFrvpwKmcUvdPSF6Zw="; + hash = "sha256-lT3sXD5lFjG/63eBXEG+rU9idem/8kXfUXj6iB3AGOg="; }; postPatch = '' diff --git a/pkgs/games/quakespasm/vulkan.nix b/pkgs/games/quakespasm/vulkan.nix index 137bf667f2f4..b0772c0ad4d4 100644 --- a/pkgs/games/quakespasm/vulkan.nix +++ b/pkgs/games/quakespasm/vulkan.nix @@ -17,16 +17,17 @@ stdenv, vulkan-headers, vulkan-loader, + copyDesktopItems, + makeDesktopItem, }: - -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "vkquake"; version = "1.31.3"; src = fetchFromGitHub { owner = "Novum"; repo = "vkQuake"; - rev = version; + tag = finalAttrs.version; sha256 = "sha256-VqTfcwt6/VTotD2Y7x7WiVwISRGOLfmMWh6EO5DSMX4="; }; @@ -36,6 +37,7 @@ stdenv.mkDerivation rec { meson ninja pkg-config + copyDesktopItems ]; buildInputs = @@ -64,18 +66,36 @@ stdenv.mkDerivation rec { }; installPhase = '' + runHook preInstall + mkdir -p "$out/bin" cp vkquake "$out/bin" + + install -D ../Misc/vkQuake_256.png "$out/share/icons/hicolor/256x256/apps/vkquake.png" + + runHook postInstall ''; + desktopItems = [ + (makeDesktopItem { + exec = finalAttrs.meta.mainProgram; + name = "vkquake"; + icon = "vkquake"; + comment = finalAttrs.meta.description; + desktopName = "vkQuake"; + categories = [ "Game" ]; + }) + ]; + postFixup = lib.optionalString (!stdenv.hostPlatform.isDarwin) '' patchelf $out/bin/vkquake \ --add-rpath ${lib.makeLibraryPath [ vulkan-loader ]} ''; - meta = with lib; { + meta = { description = "Vulkan Quake port based on QuakeSpasm"; - homepage = src.meta.homepage; + homepage = "https://github.com/Novum/vkQuake"; + changelog = "https://github.com/Novum/vkQuake/releases"; longDescription = '' vkQuake is a Quake 1 port using Vulkan instead of OpenGL for rendering. It is based on the popular QuakeSpasm port and runs all mods compatible with it @@ -85,11 +105,11 @@ stdenv.mkDerivation rec { specialization constants, CPU/GPU parallelism and memory pooling. ''; - platforms = with platforms; linux ++ darwin; - maintainers = with maintainers; [ + platforms = with lib.platforms; linux ++ darwin; + maintainers = with lib.maintainers; [ PopeRigby ylh ]; mainProgram = "vkquake"; }; -} +}) diff --git a/pkgs/kde/gear/akonadi-search/default.nix b/pkgs/kde/gear/akonadi-search/default.nix index 6cde22a9b0e6..999d3f2b084d 100644 --- a/pkgs/kde/gear/akonadi-search/default.nix +++ b/pkgs/kde/gear/akonadi-search/default.nix @@ -6,8 +6,6 @@ rustPlatform, cargo, rustc, - # provided as callPackage input to enable easier overrides through overlays - cargoHash ? "sha256-ePvYL1ps2w7qscYNIgvjn6t/ir0izbS+MlP/jow4VrE=", }: mkKdeDerivation rec { pname = "akonadi-search"; @@ -15,12 +13,12 @@ mkKdeDerivation rec { cargoRoot = "agent/rs/htmlparser"; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { # include version in the name so we invalidate the FOD name = "${pname}-${version}"; src = sources.${pname}; sourceRoot = "${pname}-${version}/${cargoRoot}"; - hash = cargoHash; + hash = "sha256-fx8q7b0KGEevn0DlMAGgAvQMXqZmBF8aINDwpaGyq7I="; }; extraNativeBuildInputs = [ diff --git a/pkgs/kde/gear/angelfish/default.nix b/pkgs/kde/gear/angelfish/default.nix index 991196cb0cb1..3d6a8ae1ae44 100644 --- a/pkgs/kde/gear/angelfish/default.nix +++ b/pkgs/kde/gear/angelfish/default.nix @@ -7,8 +7,6 @@ rustPlatform, cargo, rustc, - # provided as callPackage input to enable easier overrides through overlays - cargoHash ? "sha256-Q8cKnW4IpcpNrECXtgkPX8TdYqC5Fo4oXm1lB8RULRo=", qcoro, }: mkKdeDerivation rec { @@ -19,7 +17,7 @@ mkKdeDerivation rec { # include version in the name so we invalidate the FOD name = "${pname}-${version}"; src = sources.${pname}; - hash = cargoHash; + hash = "sha256-offD53HaPG0GQk+aPjRzhhc8d8wfHYmdaJ0X8NtluMU="; }; extraNativeBuildInputs = [ diff --git a/pkgs/kde/gear/kdepim-addons/default.nix b/pkgs/kde/gear/kdepim-addons/default.nix index 0d3e6c0f5cfe..0a32d7d8fb56 100644 --- a/pkgs/kde/gear/kdepim-addons/default.nix +++ b/pkgs/kde/gear/kdepim-addons/default.nix @@ -7,8 +7,6 @@ discount, corrosion, alpaka, - # provided as callPackage input to enable easier overrides through overlays - cargoHash ? "sha256-LVPdcuKNPgT1kw9zOS04nd+5wuejDLyyhrK8EQfgY6A=", }: mkKdeDerivation rec { pname = "kdepim-addons"; @@ -17,12 +15,12 @@ mkKdeDerivation rec { cargoRoot = "plugins/webengineurlinterceptor/adblock"; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { # include version in the name so we invalidate the FOD name = "${pname}-${version}"; src = sources.${pname}; sourceRoot = "${pname}-${version}/${cargoRoot}"; - hash = cargoHash; + hash = "sha256-v1TJ8xu4zXXig+ESYT0ZL6l1gOTbqyVA1P/6T/YnW0k="; }; extraNativeBuildInputs = [ diff --git a/pkgs/kde/gear/kio-extras/default.nix b/pkgs/kde/gear/kio-extras/default.nix index 2260feeac62c..0e3702ce7360 100644 --- a/pkgs/kde/gear/kio-extras/default.nix +++ b/pkgs/kde/gear/kio-extras/default.nix @@ -9,7 +9,7 @@ libimobiledevice, gperf, libtirpc, - openexr, + openexr_3, taglib, shared-mime-info, libappimage, @@ -34,7 +34,7 @@ mkKdeDerivation { libimobiledevice gperf libtirpc - openexr + openexr_3 taglib libappimage xorg.libXcursor diff --git a/pkgs/kde/misc/kio-extras-kf5/default.nix b/pkgs/kde/misc/kio-extras-kf5/default.nix index 886ae1a62777..add6b08de399 100644 --- a/pkgs/kde/misc/kio-extras-kf5/default.nix +++ b/pkgs/kde/misc/kio-extras-kf5/default.nix @@ -10,7 +10,7 @@ libimobiledevice, gperf, libtirpc, - openexr, + openexr_3, taglib, libappimage, }: @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { libimobiledevice gperf libtirpc - openexr + openexr_3 taglib libappimage ]; diff --git a/pkgs/misc/cups/drivers/cnijfilter_2_80/default.nix b/pkgs/misc/cups/drivers/cnijfilter_2_80/default.nix index 85b02e6620df..7b32751b4e0f 100644 --- a/pkgs/misc/cups/drivers/cnijfilter_2_80/default.nix +++ b/pkgs/misc/cups/drivers/cnijfilter_2_80/default.nix @@ -1,5 +1,5 @@ { - stdenv, + gcc13Stdenv, lib, fetchzip, autoconf, @@ -17,7 +17,7 @@ file included in the tarball */ -stdenv.mkDerivation { +gcc13Stdenv.mkDerivation { pname = "cnijfilter"; /* diff --git a/pkgs/misc/t-rec/default.nix b/pkgs/misc/t-rec/default.nix index fd33e41c1ea7..309f0e64a5ec 100644 --- a/pkgs/misc/t-rec/default.nix +++ b/pkgs/misc/t-rec/default.nix @@ -18,13 +18,13 @@ let in rustPlatform.buildRustPackage rec { pname = "t-rec"; - version = "0.7.7"; + version = "0.7.8"; src = fetchFromGitHub { owner = "sassman"; repo = "t-rec-rs"; rev = "v${version}"; - sha256 = "sha256-lOsagLiaGRvJKtBJAfDgmtZvPSF2EAdGrVXSPQCj7zs="; + sha256 = "sha256-111zbUDmp/Yyvx0uXMzqEnk/Jr2hfxtNNX6f0Ti3Brg="; }; nativeBuildInputs = [ makeWrapper ]; @@ -39,7 +39,7 @@ rustPlatform.buildRustPackage rec { wrapProgram "$out/bin/t-rec" --prefix PATH : "${binPath}" ''; - cargoHash = "sha256-orgSmGtZwTqlWSpUjU17QRgDlbheo2DbS1YI7l4MhmM="; + cargoHash = "sha256-fjq4Bys7KnSu6kV74CZJ95oov4HXY59VltjcAuXGMPg="; meta = with lib; { description = "Blazingly fast terminal recorder that generates animated gif images for the web written in rust"; diff --git a/pkgs/os-specific/linux/broadcom-sta/default.nix b/pkgs/os-specific/linux/broadcom-sta/default.nix index 9d310b02e179..6748c98d9617 100644 --- a/pkgs/os-specific/linux/broadcom-sta/default.nix +++ b/pkgs/os-specific/linux/broadcom-sta/default.nix @@ -21,8 +21,8 @@ let rpmFusionPatches = fetchFromGitHub { owner = "rpmfusion"; repo = "wl-kmod"; - rev = "a04330284bfc38fd91eade6f8b28fa63cfcdc95e"; - hash = "sha256-c72Pr/v+nxZPLEeNKbWnSpbH3gqYZaTgzMO9PlYQkf0="; + rev = "cb67598cbf5d8c5260b750d6f7e5c6a6599b7b85"; + hash = "sha256-g/j/LIZHG2Jl6UwnDNAlZpsuvjCyVzv4Qweog/tviqE="; }; patchset = [ "wl-kmod-001_wext_workaround.patch" @@ -52,6 +52,7 @@ let "wl-kmod-025_kernel_6.5_adaptation.patch" "wl-kmod-026_kernel_6.10_fix_empty_body_in_if_warning.patch" "wl-kmod-027_wpa_supplicant-2.11_add_max_scan_ie_len.patch" + "wl-kmod-028_kernel_6.12_adaptation.patch" ]; in stdenv.mkDerivation { @@ -68,10 +69,10 @@ stdenv.mkDerivation { nativeBuildInputs = kernel.moduleBuildDependencies; patches = map (patch: "${rpmFusionPatches}/${patch}") patchset ++ [ - # Fix for Kernel 6.12 and later (5f60d5f6bbc1) + # Fix for Kernel 6.13 (fetchpatch2 { - url = "https://gist.githubusercontent.com/joanbm/20db669eed4d8367a457780747be8cb9/raw/5536ba1354b6b97013530e7345d3bf29e92225b1/broadcom-wl-fix-linux-6.12.patch"; - hash = "sha256-Y5VgWp0m5tNp8lxDhIg7IodbqyUsJVHHiVIFgP9ioHE="; + url = "https://gist.githubusercontent.com/joanbm/72189c81ff67b39d36a660cf00483ccb/raw/17cae74c8d3ebb90e5bfcb84dc176c32f2519078/broadcom-wl-fix-linux-6.13.patch"; + hash = "sha256-b4XE3Dys0d7finPmNhTtvQqxXBSX1CXEj2Krq7qGHAw="; }) ]; @@ -99,7 +100,7 @@ stdenv.mkDerivation { description = "Kernel module driver for some Broadcom's wireless cards"; homepage = "http://www.broadcom.com/support/802.11/linux_sta.php"; license = lib.licenses.unfreeRedistributable; - maintainers = [ ]; + maintainers = [ lib.maintainers.j0hax ]; platforms = lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh index 864b20c25221..c4766a7e685d 100755 --- a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh +++ b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh @@ -949,7 +949,13 @@ if [[ "$action" = switch || "$action" = boot || "$action" = test || "$action" = if ! targetHostSudoCmd "${cmd[@]}" "$action"; then log "warning: error(s) occurred while switching to the new configuration" exit 1 + else + echo -n "Done. The new configuration is " >&2 + echo "$pathToConfig" fi +elif [[ "$action" = build ]]; then + echo -n "Done. The new configuration is " >&2 + echo "$pathToConfig" fi diff --git a/pkgs/os-specific/linux/nvidia-x11/TTM-fbdev-emulation-for-Linux-6.13.patch b/pkgs/os-specific/linux/nvidia-x11/TTM-fbdev-emulation-for-Linux-6.13.patch new file mode 100644 index 000000000000..3376f8341b9f --- /dev/null +++ b/pkgs/os-specific/linux/nvidia-x11/TTM-fbdev-emulation-for-Linux-6.13.patch @@ -0,0 +1,156 @@ +From 88b8ae7642ef21e685d51148e8f57c3dfa1323ac Mon Sep 17 00:00:00 2001 +From: Bingwu Zhang +Date: Sat, 7 Dec 2024 23:56:43 +0800 +Subject: [PATCH 10/10] FROM AOSC: TTM fbdev emulation for Linux 6.13+ + +Link: https://github.com/torvalds/linux/commit/1000634477d8d178179b1ad45d92e925fabe3deb +Link: https://github.com/NVIDIA/open-gpu-kernel-modules/issues/749 +Signed-off-by: xtex +Signed-off-by: Eric Naim +--- + kernel-open/nvidia-drm/nvidia-drm-drv.c | 72 +++++++++++++++++++ + kernel-open/nvidia-drm/nvidia-drm-linux.c | 4 ++ + .../nvidia-drm/nvidia-drm-os-interface.h | 5 ++ + 3 files changed, 81 insertions(+) + +diff --git a/kernel-open/nvidia-drm/nvidia-drm-drv.c b/kernel-open/nvidia-drm/nvidia-drm-drv.c +index 2e4f6404..ab85152f 100644 +--- a/kernel-open/nvidia-drm/nvidia-drm-drv.c ++++ b/kernel-open/nvidia-drm/nvidia-drm-drv.c +@@ -1951,7 +1951,60 @@ void nv_drm_update_drm_driver_features(void) + #endif /* NV_DRM_ATOMIC_MODESET_AVAILABLE */ + } + ++#if !defined(NV_DRM_FBDEV_TTM_AVAILABLE) && \ ++ !defined(NV_DRM_FBDEV_GENERIC_AVAILABLE) ++// AOSC OS: Workaround for Linux 6.13+ + ++static const struct drm_fb_helper_funcs nv_drm_fbdev_helper_funcs = { ++ .fb_probe = drm_fbdev_ttm_driver_fbdev_probe, ++}; ++ ++static void nv_drm_fbdev_client_unregister(struct drm_client_dev *client) ++{ ++ struct drm_fb_helper *fb_helper = drm_fb_helper_from_client(client); ++ if (fb_helper->info) { ++ drm_fb_helper_unregister_info(fb_helper); ++ } else { ++ drm_client_release(&fb_helper->client); ++ drm_fb_helper_unprepare(fb_helper); ++ kfree(fb_helper); ++ } ++} ++static int nv_drm_fbdev_client_restore(struct drm_client_dev *client) ++{ ++ drm_fb_helper_lastclose(client->dev); ++ return 0; ++} ++static int nv_drm_fbdev_client_hotplug(struct drm_client_dev *client) ++{ ++ struct drm_fb_helper *fb_helper = drm_fb_helper_from_client(client); ++ struct drm_device *dev = client->dev; ++ int ret; ++ if (dev->fb_helper) ++ return drm_fb_helper_hotplug_event(dev->fb_helper); ++ ret = drm_fb_helper_init(dev, fb_helper); ++ if (ret) ++ goto err_drm_err; ++ if (!drm_drv_uses_atomic_modeset(dev)) ++ drm_helper_disable_unused_functions(dev); ++ ret = drm_fb_helper_initial_config(fb_helper); ++ if (ret) ++ goto err_drm_fb_helper_fini; ++ return 0; ++err_drm_fb_helper_fini: ++ drm_fb_helper_fini(fb_helper); ++err_drm_err: ++ drm_err(dev, "AOSC OS: NV-DRM: fbdev: Failed to setup emulation (ret=%d)\n", ret); ++ return ret; ++} ++ ++static const struct drm_client_funcs nv_drm_fbdev_client_funcs = { ++ .owner = THIS_MODULE, ++ .unregister = nv_drm_fbdev_client_unregister, ++ .restore = nv_drm_fbdev_client_restore, ++ .hotplug = nv_drm_fbdev_client_hotplug, ++}; ++#endif + + /* + * Helper function for allocate/register DRM device for given NVIDIA GPU ID. +@@ -1961,6 +2014,7 @@ void nv_drm_register_drm_device(const nv_gpu_info_t *gpu_info) + struct nv_drm_device *nv_dev = NULL; + struct drm_device *dev = NULL; + struct device *device = gpu_info->os_device_ptr; ++ struct drm_fb_helper *fb_helper = NULL; + bool bus_is_pci; + + DRM_DEBUG( +@@ -2039,6 +2093,20 @@ void nv_drm_register_drm_device(const nv_gpu_info_t *gpu_info) + drm_fbdev_ttm_setup(dev, 32); + #elif defined(NV_DRM_FBDEV_GENERIC_AVAILABLE) + drm_fbdev_generic_setup(dev, 32); ++ #else ++ // AOSC OS: Workaround for Linux 6.13+ ++ int drm_client_ret; ++ fb_helper = kzalloc(sizeof(*fb_helper), GFP_KERNEL); ++ if (!fb_helper) ++ return; ++ drm_fb_helper_prepare(dev, fb_helper, 32, &nv_drm_fbdev_helper_funcs); ++ drm_client_ret = drm_client_init(dev, &fb_helper->client, "fbdev", ++ &nv_drm_fbdev_client_funcs); ++ if (drm_client_ret) { ++ drm_err(dev, "AOSC OS: NV-DRM: Failed to register DRM client: %d\n", drm_client_ret); ++ goto failed_drm_client_init; ++ } ++ drm_client_register(&fb_helper->client); + #endif + } + #endif /* defined(NV_DRM_FBDEV_AVAILABLE) */ +@@ -2050,6 +2118,10 @@ void nv_drm_register_drm_device(const nv_gpu_info_t *gpu_info) + + return; /* Success */ + ++failed_drm_client_init: ++ drm_fb_helper_unprepare(fb_helper); ++ kfree(fb_helper); ++ + failed_drm_register: + + nv_drm_dev_free(dev); +diff --git a/kernel-open/nvidia-drm/nvidia-drm-linux.c b/kernel-open/nvidia-drm/nvidia-drm-linux.c +index 83d40983..ac4fe967 100644 +--- a/kernel-open/nvidia-drm/nvidia-drm-linux.c ++++ b/kernel-open/nvidia-drm/nvidia-drm-linux.c +@@ -39,8 +39,12 @@ MODULE_PARM_DESC( + fbdev, + "Create a framebuffer device (1 = enable (default), 0 = disable) (EXPERIMENTAL)"); + module_param_named(fbdev, nv_drm_fbdev_module_param, bool, 0400); ++#else ++#error "nvidia-drm fbdev should always be available." + #endif + ++#else ++#error "nvidia-drm is not available" + #endif /* NV_DRM_AVAILABLE */ + + /************************************************************************* +diff --git a/kernel-open/nvidia-drm/nvidia-drm-os-interface.h b/kernel-open/nvidia-drm/nvidia-drm-os-interface.h +index 71ca5f22..8195af32 100644 +--- a/kernel-open/nvidia-drm/nvidia-drm-os-interface.h ++++ b/kernel-open/nvidia-drm/nvidia-drm-os-interface.h +@@ -78,6 +78,11 @@ typedef struct nv_timer nv_drm_timer; + #define NV_DRM_FBDEV_TTM_AVAILABLE + #endif + ++// AOSC OS: Always enable DRM fbdev ++// FIXME: Add config test for drm helper functions. ++// The implementation uses drm_client_register, which is added in v5.2-rc1. ++#define NV_DRM_FBDEV_AVAILABLE ++ + struct page; + + /* Set to true when the atomic modeset feature is enabled. */ +-- +2.47.1 + diff --git a/pkgs/os-specific/linux/nvidia-x11/Use-linux-aperture.c-for-removing-conflict.patch b/pkgs/os-specific/linux/nvidia-x11/Use-linux-aperture.c-for-removing-conflict.patch new file mode 100644 index 000000000000..ecff6a2bb0ce --- /dev/null +++ b/pkgs/os-specific/linux/nvidia-x11/Use-linux-aperture.c-for-removing-conflict.patch @@ -0,0 +1,146 @@ +From 11501d99348a04c608a19330d984188f4766e603 Mon Sep 17 00:00:00 2001 +From: Bingwu Zhang +Date: Sat, 7 Dec 2024 23:01:26 +0800 +Subject: [PATCH 09/10] FROM AOSC: Use linux/aperture.c for removing + conflicting PCI devices on Linux 6.13.0-rc1+ + +Link: https://github.com/torvalds/linux/commit/689274a56c0c088796d359f6c6267323931a2429 +Link: https://github.com/torvalds/linux/commit/7283f862bd991c8657e9bf1c02db772fcf018f13 +Link: https://github.com/NVIDIA/open-gpu-kernel-modules/issues/749 +Signed-off-by: Eric Naim +--- + kernel-open/conftest.sh | 19 +++++++++++++++++++ + kernel-open/header-presence-tests.mk | 1 + + kernel-open/nvidia-drm/nvidia-drm-drv.c | 15 +++++++++++++++ + .../nvidia-drm/nvidia-drm-os-interface.h | 10 ++++++++++ + kernel-open/nvidia-drm/nvidia-drm-sources.mk | 1 + + 5 files changed, 46 insertions(+) + +diff --git a/kernel-open/conftest.sh b/kernel-open/conftest.sh +index fdceda72..5a0f39e0 100755 +--- a/kernel-open/conftest.sh ++++ b/kernel-open/conftest.sh +@@ -6615,6 +6615,8 @@ compile_test() { + # Added by commit 2916059147ea ("drm/aperture: Add infrastructure + # for aperture ownership") in v5.14. + # ++ # Removed by commit 689274a56c0c ("drm: Remove DRM aperture helpers") in v6.13. ++ # + CODE=" + #if defined(NV_DRM_DRM_APERTURE_H_PRESENT) + #include +@@ -6626,6 +6628,23 @@ compile_test() { + compile_check_conftest "$CODE" "NV_DRM_APERTURE_REMOVE_CONFLICTING_PCI_FRAMEBUFFERS_PRESENT" "" "functions" + ;; + ++ aperture_remove_conflicting_pci_devices) ++ # ++ # Determine whether aperture_remove_conflicting_pci_devices is present. ++ # ++ # Added by commit 7283f862bd99 ("drm: Implement DRM aperture helpers under video/") in v6.0. ++ # ++ CODE=" ++ #if defined(NV_LINUX_APERTURE_H_PRESENT) ++ #include ++ #endif ++ void conftest_aperture_remove_conflicting_pci_devices(void) { ++ aperture_remove_conflicting_pci_devices(); ++ }" ++ ++ compile_check_conftest "$CODE" "NV_APERTURE_REMOVE_CONFLICTING_PCI_DEVICES_PRESENT" "" "functions" ++ ;; ++ + drm_aperture_remove_conflicting_pci_framebuffers_has_driver_arg) + # + # Determine whether drm_aperture_remove_conflicting_pci_framebuffers +diff --git a/kernel-open/header-presence-tests.mk b/kernel-open/header-presence-tests.mk +index 9d5217a9..b0268541 100644 +--- a/kernel-open/header-presence-tests.mk ++++ b/kernel-open/header-presence-tests.mk +@@ -34,6 +34,7 @@ NV_HEADER_PRESENCE_TESTS = \ + generated/autoconf.h \ + generated/compile.h \ + generated/utsrelease.h \ ++ linux/aperture.h \ + linux/efi.h \ + linux/kconfig.h \ + linux/platform/tegra/mc_utils.h \ +diff --git a/kernel-open/nvidia-drm/nvidia-drm-drv.c b/kernel-open/nvidia-drm/nvidia-drm-drv.c +index 8f905f82..2e4f6404 100644 +--- a/kernel-open/nvidia-drm/nvidia-drm-drv.c ++++ b/kernel-open/nvidia-drm/nvidia-drm-drv.c +@@ -65,7 +65,16 @@ + #endif + + #if defined(NV_DRM_FBDEV_AVAILABLE) ++// Commit 7283f862bd99 ("drm: Implement DRM aperture helpers under video/") ++// moved implementation of drm_aperture_... to linux/aperture.c. ++// Commit 689274a56c0c ("drm: Remove DRM aperture helpers") ++// removed drm/drm_aperture.h. ++#if defined(NV_DRM_APERTURE_REMOVE_CONFLICTING_PCI_FRAMEBUFFERS_PRESENT) + #include ++#endif ++#if defined(NV_APERTURE_REMOVE_CONFLICTING_PCI_DEVICES_PRESENT) ++#include ++#endif + #include + #endif + +@@ -2013,10 +2022,16 @@ void nv_drm_register_drm_device(const nv_gpu_info_t *gpu_info) + if (bus_is_pci) { + struct pci_dev *pdev = to_pci_dev(device); + ++#if defined(NV_DRM_APERTURE_REMOVE_CONFLICTING_PCI_FRAMEBUFFERS_PRESENT) ++ printk(KERN_INFO "%s: using drm_aperture for old kernels\n", nv_drm_driver.name); + #if defined(NV_DRM_APERTURE_REMOVE_CONFLICTING_PCI_FRAMEBUFFERS_HAS_DRIVER_ARG) + drm_aperture_remove_conflicting_pci_framebuffers(pdev, &nv_drm_driver); + #else + drm_aperture_remove_conflicting_pci_framebuffers(pdev, nv_drm_driver.name); ++#endif ++#elif defined(NV_APERTURE_REMOVE_CONFLICTING_PCI_DEVICES_PRESENT) ++ printk(KERN_INFO "%s: using linux/aperture workaround for Linux 6.13+\n", nv_drm_driver.name); ++ aperture_remove_conflicting_pci_devices(pdev, nv_drm_driver.name); + #endif + nvKms->framebufferConsoleDisabled(nv_dev->pDevice); + } +diff --git a/kernel-open/nvidia-drm/nvidia-drm-os-interface.h b/kernel-open/nvidia-drm/nvidia-drm-os-interface.h +index a6b0f947..71ca5f22 100644 +--- a/kernel-open/nvidia-drm/nvidia-drm-os-interface.h ++++ b/kernel-open/nvidia-drm/nvidia-drm-os-interface.h +@@ -63,11 +63,21 @@ typedef struct nv_timer nv_drm_timer; + #define NV_DRM_FBDEV_GENERIC_AVAILABLE + #endif + ++#if defined(NV_DRM_FBDEV_GENERIC_SETUP_PRESENT) && defined(NV_APERTURE_REMOVE_CONFLICTING_PCI_DEVICES_PRESENT) ++#define NV_DRM_FBDEV_AVAILABLE ++#define NV_DRM_FBDEV_GENERIC_AVAILABLE ++#endif ++ + #if defined(NV_DRM_FBDEV_TTM_SETUP_PRESENT) && defined(NV_DRM_APERTURE_REMOVE_CONFLICTING_PCI_FRAMEBUFFERS_PRESENT) + #define NV_DRM_FBDEV_AVAILABLE + #define NV_DRM_FBDEV_TTM_AVAILABLE + #endif + ++#if defined(NV_DRM_FBDEV_TTM_SETUP_PRESENT) && defined(NV_APERTURE_REMOVE_CONFLICTING_PCI_DEVICES_PRESENT) ++#define NV_DRM_FBDEV_AVAILABLE ++#define NV_DRM_FBDEV_TTM_AVAILABLE ++#endif ++ + struct page; + + /* Set to true when the atomic modeset feature is enabled. */ +diff --git a/kernel-open/nvidia-drm/nvidia-drm-sources.mk b/kernel-open/nvidia-drm/nvidia-drm-sources.mk +index 9aaebd04..a4dcad6d 100644 +--- a/kernel-open/nvidia-drm/nvidia-drm-sources.mk ++++ b/kernel-open/nvidia-drm/nvidia-drm-sources.mk +@@ -66,6 +66,7 @@ NV_CONFTEST_FUNCTION_COMPILE_TESTS += dma_fence_set_error + NV_CONFTEST_FUNCTION_COMPILE_TESTS += fence_set_error + NV_CONFTEST_FUNCTION_COMPILE_TESTS += sync_file_get_fence + NV_CONFTEST_FUNCTION_COMPILE_TESTS += drm_aperture_remove_conflicting_pci_framebuffers ++NV_CONFTEST_FUNCTION_COMPILE_TESTS += aperture_remove_conflicting_pci_devices + NV_CONFTEST_FUNCTION_COMPILE_TESTS += drm_fbdev_generic_setup + NV_CONFTEST_FUNCTION_COMPILE_TESTS += drm_fbdev_ttm_setup + NV_CONFTEST_FUNCTION_COMPILE_TESTS += drm_connector_attach_hdr_output_metadata_property +-- +2.47.1 + diff --git a/pkgs/os-specific/linux/nvidia-x11/crypto-Add-fix-for-6.13-Module-compilation.patch b/pkgs/os-specific/linux/nvidia-x11/crypto-Add-fix-for-6.13-Module-compilation.patch new file mode 100644 index 000000000000..1fc6063740b7 --- /dev/null +++ b/pkgs/os-specific/linux/nvidia-x11/crypto-Add-fix-for-6.13-Module-compilation.patch @@ -0,0 +1,251 @@ +diff --git a/kernel-open/conftest.sh b/kernel-open/conftest.sh +index fdceda72..3bfe39aa 100755 +--- a/kernel-open/conftest.sh ++++ b/kernel-open/conftest.sh +@@ -6721,6 +6721,47 @@ compile_test() { + compile_check_conftest "$CODE" "NV_CRYPTO_PRESENT" "" "symbols" + ;; + ++ crypto_akcipher_verify) ++ # ++ # Determine whether the crypto_akcipher_verify API is still present. ++ # It was removed by commit 6b34562 ('crypto: akcipher - Drop sign/verify operations') ++ # in v6.13-rc1 (2024-10-04). ++ # ++ # This test is dependent on the crypto conftest to determine whether crypto should be ++ # enabled at all. That means that if the kernel is old enough such that crypto_akcipher_verify ++ # ++ # The test merely checks for the presence of the API, as it assumes that if the API ++ # is no longer present, the new API to replace it (crypto_sig_verify) must be present. ++ # If the kernel version is too old to have crypto_akcipher_verify, it will fail the crypto ++ # conftest above and all crypto code will be compiled out. ++ # ++ CODE=" ++ #include ++ #include ++ void conftest_crypto_akcipher_verify(void) { ++ (void)crypto_akcipher_verify; ++ }" ++ ++ compile_check_conftest "$CODE" "NV_CRYPTO_AKCIPHER_VERIFY_PRESENT" "" "symbols" ++ ;; ++ ++ ecc_digits_from_bytes) ++ # ++ # Determine whether ecc_digits_from_bytes is present. ++ # It was added in commit c6ab5c915da4 ('crypto: ecc - Prevent ecc_digits_from_bytes from ++ # reading too many bytes') in v6.10. ++ # ++ # This functionality is needed when crypto_akcipher_verify is not present. ++ # ++ CODE=" ++ #include ++ void conftest_ecc_digits_from_bytes(void) { ++ (void)ecc_digits_from_bytes; ++ }" ++ ++ compile_check_conftest "$CODE" "NV_ECC_DIGITS_FROM_BYTES_PRESENT" "" "symbols" ++ ;; ++ + mempolicy_has_unified_nodes) + # + # Determine if the 'mempolicy' structure has +diff --git a/kernel-open/nvidia/internal_crypt_lib.h b/kernel-open/nvidia/internal_crypt_lib.h +index 2eac7d5e..917acb26 100644 +--- a/kernel-open/nvidia/internal_crypt_lib.h ++++ b/kernel-open/nvidia/internal_crypt_lib.h +@@ -64,7 +64,9 @@ + * old or even just user disabled. If we should use LKCA, include headers, else + * define stubs to return errors. + */ +-#if defined(NV_CRYPTO_PRESENT) && defined (NV_CONFIG_CRYPTO_PRESENT) ++#if defined(NV_CRYPTO_PRESENT) && defined (NV_CONFIG_CRYPTO_PRESENT) && \ ++ (defined(NV_CRYPTO_AKCIPHER_VERIFY_PRESENT) || \ ++ (defined(NV_CRYPTO_SIG_H_PRESENT) && defined(NV_ECC_DIGITS_FROM_BYTES_PRESENT))) + #define USE_LKCA 1 + #endif + +diff --git a/kernel-open/nvidia/libspdm_ecc.c b/kernel-open/nvidia/libspdm_ecc.c +index 1f8f0100..a9eb4db5 100644 +--- a/kernel-open/nvidia/libspdm_ecc.c ++++ b/kernel-open/nvidia/libspdm_ecc.c +@@ -30,14 +30,26 @@ MODULE_SOFTDEP("pre: ecdh_generic,ecdsa_generic"); + #include + #include + #include ++#ifndef NV_CRYPTO_AKCIPHER_VERIFY_PRESENT ++#include ++ ++struct signature ++{ ++ u64 r[ECC_MAX_DIGITS]; ++ u64 s[ECC_MAX_DIGITS]; ++}; ++#endif // NV_CRYPTO_AKCIPHER_VERIFY_PRESENT ++ ++#define ECDSA_PUBKEY_HEADER_XY_PRESENT (0x4) + + struct ecc_ctx { + unsigned int curve_id; + u64 priv_key[ECC_MAX_DIGITS]; // In big endian + + struct { +- // ecdsa wants byte preceding pub_key to be set to '4' +- u64 pub_key_prefix; ++ // ecdsa pubkey has header indicating length of pubkey ++ u8 padding[7]; ++ u8 pub_key_prefix; + u64 pub_key[2 * ECC_MAX_DIGITS]; + }; + +@@ -221,25 +233,84 @@ bool lkca_ec_compute_key(void *ec_context, const uint8_t *peer_public, + #endif + } + +-bool lkca_ecdsa_verify(void *ec_context, size_t hash_nid, +- const uint8_t *message_hash, size_t hash_size, +- const uint8_t *signature, size_t sig_size) ++#ifndef NV_CRYPTO_AKCIPHER_VERIFY_PRESENT ++static bool lkca_ecdsa_verify_crypto_sig(void *ec_context, size_t hash_nid, ++ const uint8_t *message_hash, size_t hash_size, ++ const uint8_t *signature, size_t sig_size) + { + #ifndef USE_LKCA + return false; + #else + struct ecc_ctx *ctx = ec_context; ++ u8 *pub_key; ++ int err; ++ DECLARE_CRYPTO_WAIT(wait); ++ struct crypto_sig * tfm = NULL; ++ struct signature sig; ++ ++ if (sig_size != ctx->size || !ctx->pub_key_set) ++ { ++ return false; ++ } ++ ++ tfm = crypto_alloc_sig(ctx->name, CRYPTO_ALG_TYPE_SIG, 0); ++ if (IS_ERR(tfm)) { ++ pr_info("crypto_alloc_sig failed in lkca_ecdsa_verify\n"); ++ return false; ++ } ++ ++ // modify header of pubkey to indicate size ++ pub_key = (u8 *) &(ctx->pub_key_prefix); ++ *pub_key = ECDSA_PUBKEY_HEADER_XY_PRESENT; ++ err = crypto_sig_set_pubkey(tfm, pub_key, ctx->size + 1); ++ if (err != 0) ++ { ++ pr_info("crypto_sig_set_pubkey failed in lkca_ecdsa_verify: %d", -err); ++ goto failTfm; ++ } ++ ++ // ++ // Compared to the way we receive the signature, we need to: ++ // - swap order of all digits ++ // - swap endianness for each digit ++ // ++ memset(&sig, 0, sizeof(sig)); ++ ecc_digits_from_bytes(signature, ctx->size/2, sig.r, ECC_MAX_DIGITS); ++ ecc_digits_from_bytes(signature + ctx->size/2, ctx->size/2, sig.s, ECC_MAX_DIGITS); ++ ++ err = crypto_sig_verify(tfm, (void *)&sig, sizeof(sig), message_hash, hash_size); ++ if (err != 0) ++ { ++ pr_info("crypto_sig_verify failed in lkca_ecdsa_verify %d\n", -err); ++ } ++ ++failTfm: ++ crypto_free_sig(tfm); ++ ++ return err == 0; ++#endif // USE_LKCA ++} ++ ++#else // NV_CRYPTO_AKCIPHER_VERIFY_PRESENT ++static bool lkca_ecdsa_verify_akcipher(void *ec_context, size_t hash_nid, ++ const uint8_t *message_hash, size_t hash_size, ++ const uint8_t *signature, size_t sig_size) ++{ ++#ifndef USE_LKCA ++ return false; ++#else // USE_LKCA ++ struct ecc_ctx *ctx = ec_context; ++ u8 *pub_key; ++ int err; ++ DECLARE_CRYPTO_WAIT(wait); + + // Roundabout way + u64 ber_max_len = 3 + 2 * (4 + (ECC_MAX_BYTES)); + u64 ber_len = 0; + u8 *ber = NULL; +- u8 *pub_key; + struct akcipher_request *req = NULL; + struct crypto_akcipher *tfm = NULL; + struct scatterlist sg; +- DECLARE_CRYPTO_WAIT(wait); +- int err; + + if (sig_size != ctx->size) { + return false; +@@ -251,21 +322,21 @@ bool lkca_ecdsa_verify(void *ec_context, size_t hash_nid, + + tfm = crypto_alloc_akcipher(ctx->name, CRYPTO_ALG_TYPE_AKCIPHER, 0); + if (IS_ERR(tfm)) { +- pr_info("ALLOC FAILED\n"); ++ pr_info("crypto_alloc_akcipher failed in lkca_ecdsa_verify\n"); + return false; + } + +- pub_key = (u8 *) ctx->pub_key; +- pub_key--; // Go back into byte of pub_key_prefix +- *pub_key = 4; // And set it to 4 to placate kernel ++ // modify header of pubkey to indicate size ++ pub_key = (u8 *) &(ctx->pub_key_prefix); ++ *pub_key = ECDSA_PUBKEY_HEADER_XY_PRESENT; + if ((err = crypto_akcipher_set_pub_key(tfm, pub_key, ctx->size + 1)) != 0) { +- pr_info("SET PUB KEY FAILED: %d\n", -err); ++ pr_info("crypto_akcipher_set_pub_key failed in lkca_ecdsa_verify: %d\n", -err); + goto failTfm; + } + + req = akcipher_request_alloc(tfm, GFP_KERNEL); + if (IS_ERR(req)) { +- pr_info("REQUEST ALLOC FAILED\n"); ++ pr_info("akcipher_request_alloc failed in lkca_ecdsa_verify\n"); + goto failTfm; + } + +@@ -310,9 +381,8 @@ bool lkca_ecdsa_verify(void *ec_context, size_t hash_nid, + CRYPTO_TFM_REQ_MAY_SLEEP, crypto_req_done, &wait); + akcipher_request_set_crypt(req, &sg, NULL, ber_len, hash_size); + err = crypto_wait_req(crypto_akcipher_verify(req), &wait); +- + if (err != 0){ +- pr_info("Verify FAILED %d\n", -err); ++ pr_info("crypto_akcipher_verify failed in lkca_ecdsa_verify %d\n", -err); + } + + kfree(ber); +@@ -322,5 +392,19 @@ failTfm: + crypto_free_akcipher(tfm); + + return err == 0; +-#endif ++#endif // USE_LKCA ++} ++#endif // NV_CRYPTO_AKCIPHER_VERIFY_PRESENT ++ ++bool lkca_ecdsa_verify(void *ec_context, size_t hash_nid, ++ const uint8_t *message_hash, size_t hash_size, ++ const uint8_t *signature, size_t sig_size) ++{ ++#ifndef NV_CRYPTO_AKCIPHER_VERIFY_PRESENT ++ return lkca_ecdsa_verify_crypto_sig(ec_context, hash_nid, message_hash, hash_size, ++ signature, sig_size); ++#else // NV_CRYPTO_AKCIPHER_VERIFY_PRESENT ++ return lkca_ecdsa_verify_akcipher(ec_context, hash_nid, message_hash, hash_size, ++ signature, sig_size); ++#endif // NV_CRYPTO_AKCIPHER_VERIFY_PRESENT + } diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index 9b59c05cb106..a97f70a0bd29 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -70,6 +70,10 @@ rec { openSha256 = "sha256-hjpwTR4I0MM5dEjQn7MKM3RY1a4Mt6a61Ii9KW2KbiY="; settingsSha256 = "sha256-Wk6IlVvs23cB4s0aMeZzSvbOQqB1RnxGMv3HkKBoIgY="; persistencedSha256 = "sha256-yQFrVk4i2dwReN0XoplkJ++iA1WFhnIkP7ns4ORmkFA="; + patchesOpen = [ + ./nvidia-nv-Convert-symbol-namespace-to-string-literal.patch + ./crypto-Add-fix-for-6.13-Module-compilation.patch + ]; }; latest = selectHighestVersion production (generic { @@ -79,6 +83,15 @@ rec { openSha256 = "sha256-Fxo0t61KQDs71YA8u7arY+503wkAc1foaa51vi2Pl5I="; settingsSha256 = "sha256-VUetj3LlOSz/LB+DDfMCN34uA4bNTTpjDrb6C6Iwukk="; persistencedSha256 = "sha256-wnDjC099D8d9NJSp9D0CbsL+vfHXyJFYYgU3CwcqKww="; + patches = [ + ./fix-for-linux-6.13.patch + ]; + patchesOpen = [ + ./nvidia-nv-Convert-symbol-namespace-to-string-literal.patch + ./crypto-Add-fix-for-6.13-Module-compilation.patch + ./Use-linux-aperture.c-for-removing-conflict.patch + ./TTM-fbdev-emulation-for-Linux-6.13.patch + ]; }); beta = selectHighestVersion latest (generic { diff --git a/pkgs/os-specific/linux/nvidia-x11/fix-for-linux-6.13.patch b/pkgs/os-specific/linux/nvidia-x11/fix-for-linux-6.13.patch new file mode 100644 index 000000000000..2d3d88065af6 --- /dev/null +++ b/pkgs/os-specific/linux/nvidia-x11/fix-for-linux-6.13.patch @@ -0,0 +1,48 @@ +diff --git a/kernel/nvidia-modeset/nvidia-modeset.Kbuild b/kernel/nvidia-modeset/nvidia-modeset.Kbuild +index a7d84e0..d417c28 100644 +--- a/kernel/nvidia-modeset/nvidia-modeset.Kbuild ++++ b/kernel/nvidia-modeset/nvidia-modeset.Kbuild +@@ -40,13 +40,15 @@ NV_KERNEL_MODULE_TARGETS += $(NVIDIA_MODESET_KO) + NVIDIA_MODESET_BINARY_OBJECT := $(src)/nvidia-modeset/nv-modeset-kernel.o_binary + NVIDIA_MODESET_BINARY_OBJECT_O := nvidia-modeset/nv-modeset-kernel.o + +-quiet_cmd_symlink = SYMLINK $@ +-cmd_symlink = ln -sf $< $@ ++# Rel. commit 80f289101690 "kbuild: change working directory to external module directory with M=" (Masahiro Yamada, 10 Nov 2024) ++# Ensure `$<` is absolute, since the link target is resolved relative to its path, not from where `ln` is run from. ++quiet_cmd_symlinkabs = SYMLINK $@ ++ cmd_symlinkabs = ln -sf $(abspath $<) $@ + + targets += $(NVIDIA_MODESET_BINARY_OBJECT_O) + + $(obj)/$(NVIDIA_MODESET_BINARY_OBJECT_O): $(NVIDIA_MODESET_BINARY_OBJECT) FORCE +- $(call if_changed,symlink) ++ $(call if_changed,symlinkabs) + + nvidia-modeset-y += $(NVIDIA_MODESET_BINARY_OBJECT_O) + +diff --git a/kernel/nvidia/nvidia.Kbuild b/kernel/nvidia/nvidia.Kbuild +index 31a6f92..62689f6 100644 +--- a/kernel/nvidia/nvidia.Kbuild ++++ b/kernel/nvidia/nvidia.Kbuild +@@ -40,13 +40,15 @@ NVIDIA_KO = nvidia/nvidia.ko + NVIDIA_BINARY_OBJECT := $(src)/nvidia/nv-kernel.o_binary + NVIDIA_BINARY_OBJECT_O := nvidia/nv-kernel.o + +-quiet_cmd_symlink = SYMLINK $@ +- cmd_symlink = ln -sf $< $@ ++# Rel. commit 80f289101690 "kbuild: change working directory to external module directory with M=" (Masahiro Yamada, 10 Nov 2024) ++# Ensure `$<` is absolute, since the link target is resolved relative to its path, not from where `ln` is run from. ++quiet_cmd_symlinkabs = SYMLINK $@ ++ cmd_symlinkabs = ln -sf $(abspath $<) $@ + + targets += $(NVIDIA_BINARY_OBJECT_O) + + $(obj)/$(NVIDIA_BINARY_OBJECT_O): $(NVIDIA_BINARY_OBJECT) FORCE +- $(call if_changed,symlink) ++ $(call if_changed,symlinkabs) + + nvidia-y += $(NVIDIA_BINARY_OBJECT_O) + +-- +2.47.0 diff --git a/pkgs/os-specific/linux/nvidia-x11/generic.nix b/pkgs/os-specific/linux/nvidia-x11/generic.nix index 1c11334d002c..edb99de0e407 100644 --- a/pkgs/os-specific/linux/nvidia-x11/generic.nix +++ b/pkgs/os-specific/linux/nvidia-x11/generic.nix @@ -187,17 +187,7 @@ let else throw "nvidia-x11 does not support platform ${stdenv.hostPlatform.system}"; - patches = - if libsOnly then - null - else - ( - patches - ++ (builtins.map (rewritePatch { - from = "kernel-open"; - to = "kernel"; - }) patchesOpen) - ); + patches = if libsOnly then null else patches; inherit prePatch postPatch patchFlags; inherit preInstall postInstall; inherit version useGLVND useProfiles; diff --git a/pkgs/os-specific/linux/nvidia-x11/nvidia-nv-Convert-symbol-namespace-to-string-literal.patch b/pkgs/os-specific/linux/nvidia-x11/nvidia-nv-Convert-symbol-namespace-to-string-literal.patch new file mode 100644 index 000000000000..98d17e8834e8 --- /dev/null +++ b/pkgs/os-specific/linux/nvidia-x11/nvidia-nv-Convert-symbol-namespace-to-string-literal.patch @@ -0,0 +1,40 @@ +From 35a25dda24d8f02ca89d53e5975fa7705058c39e Mon Sep 17 00:00:00 2001 +From: Eric Naim +Date: Mon, 9 Dec 2024 19:45:50 +0800 +Subject: [PATCH 07/10] nvidia/nv: Convert symbol namespace to string literal + +Commit https://github.com/torvalds/linux/commit/cdd30ebb1b9f36159d66f088b61aee264e649d7a ("module: Convert symbol namespace to string literal") +breaks importing symbol namespaces. Apply this change only for 6.13 and higher. + +Signed-off-by: Eric Naim +--- + kernel-open/nvidia/nv.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/kernel-open/nvidia/nv.c b/kernel-open/nvidia/nv.c +index 83705a05..1e7de9ea 100644 +--- a/kernel-open/nvidia/nv.c ++++ b/kernel-open/nvidia/nv.c +@@ -22,6 +22,7 @@ + */ + + #include // for MODULE_FIRMWARE ++#include + + // must precede "nv.h" and "nv-firmware.h" includes + #define NV_FIRMWARE_FOR_NAME(name) "nvidia/" NV_VERSION_STRING "/" name ".bin" +@@ -127,7 +128,11 @@ MODULE_ALIAS_CHARDEV_MAJOR(NV_MAJOR_DEVICE_NUMBER); + * DMA_BUF namespace is added by commit id 16b0314aa746 + * ("dma-buf: move dma-buf symbols into the DMA_BUF module namespace") in 5.16 + */ ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 13, 0) ++MODULE_IMPORT_NS("DMA_BUF"); ++#else + MODULE_IMPORT_NS(DMA_BUF); ++#endif + #endif // defined(MODULE_IMPORT_NS) + + const NvBool nv_is_rm_firmware_supported_os = NV_TRUE; +-- +2.47.1 + diff --git a/pkgs/os-specific/linux/trace-cmd/kernelshark.nix b/pkgs/os-specific/linux/trace-cmd/kernelshark.nix index f9e00616f0b1..0f2c1f462051 100644 --- a/pkgs/os-specific/linux/trace-cmd/kernelshark.nix +++ b/pkgs/os-specific/linux/trace-cmd/kernelshark.nix @@ -22,20 +22,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "kernelshark"; - version = "2.3.1"; + version = "2.3.2"; src = fetchzip { url = "https://git.kernel.org/pub/scm/utils/trace-cmd/kernel-shark.git/snapshot/kernelshark-v${finalAttrs.version}.tar.gz"; - hash = "sha256-KV8ahV2koX7OL1C42H5If14e7m54jv0DlZ1dNsVRUWE="; + hash = "sha256-+Vi1Tj42bAxJKgGqVXbCYywqQAdz5y+Zv2hQH8iaJkM="; }; - patches = [ - (fetchpatch { - url = "https://git.kernel.org/pub/scm/utils/trace-cmd/kernel-shark.git/patch/?id=9e33324644fff49b7aa15d34f836e72af8b32c78"; - hash = "sha256-2XtEQ4WscLlUiEQYG2HiHuysMzVzlG05PVreLRVM8Lc="; - }) - ]; - outputs = [ "out" ]; nativeBuildInputs = [ diff --git a/pkgs/servers/foundationdb/cmake.nix b/pkgs/servers/foundationdb/cmake.nix index 2d88687b00cc..b1d925c6a8bf 100644 --- a/pkgs/servers/foundationdb/cmake.nix +++ b/pkgs/servers/foundationdb/cmake.nix @@ -135,6 +135,8 @@ let license = licenses.asl20; platforms = [ "x86_64-linux" ] ++ lib.optionals (!(avxEnabled version)) [ "aarch64-linux" ]; + # Fails when cross-compiling with "/bin/sh: gcc-ar: not found" + broken = stdenv.buildPlatform != stdenv.hostPlatform; maintainers = with maintainers; [ thoughtpolice lostnet ]; }; }; diff --git a/pkgs/servers/foundationdb/default.nix b/pkgs/servers/foundationdb/default.nix index 5a48c9337243..591e45485aea 100644 --- a/pkgs/servers/foundationdb/default.nix +++ b/pkgs/servers/foundationdb/default.nix @@ -11,7 +11,7 @@ openjdk, mono, openssl, - boost, + boost186, pkg-config, msgpack-cxx, toml11, @@ -26,7 +26,7 @@ in foundationdb73 = cmakeBuild { version = "7.3.42"; hash = "sha256-jQcm+HLai5da2pZZ7iLdN6fpQZxf5+/kkfv9OSXQ57c="; - inherit boost; + boost = boost186; ssl = openssl; patches = [ @@ -38,6 +38,12 @@ in url = "https://github.com/apple/foundationdb/commit/c35a23d3f6b65698c3b888d76de2d93a725bff9c.patch"; hash = "sha256-bneRoZvCzJp0Hp/G0SzAyUyuDrWErSpzv+ickZQJR5w="; }) + # Add a dependency that prevents bindingtester to run before the python bindings are generated + # https://github.com/apple/foundationdb/pull/11859 + (fetchpatch { + url = "https://github.com/apple/foundationdb/commit/8d04c97a74c6b83dd8aa6ff5af67587044c2a572.patch"; + hash = "sha256-ZLIcmcfirm1+96DtTIr53HfM5z38uTLZrRNHAmZL6rc="; + }) ]; }; } diff --git a/pkgs/servers/headscale/default.nix b/pkgs/servers/headscale/default.nix index 8cc608dc228c..98c16ec36983 100644 --- a/pkgs/servers/headscale/default.nix +++ b/pkgs/servers/headscale/default.nix @@ -8,13 +8,13 @@ }: buildGoModule rec { pname = "headscale"; - version = "0.24.0"; + version = "0.24.1"; src = fetchFromGitHub { owner = "juanfont"; repo = "headscale"; rev = "v${version}"; - hash = "sha256-s9zzhN8NTC6YxOO6fyO+A0jleeY8bhN1wcbf4pvGkpI="; + hash = "sha256-s6s+0RHgAPxmSidfAoAne1d7DRwbC3d9udki3TlPmlY="; }; vendorHash = "sha256-SBfeixT8DQOrK2SWmHHSOBtzRdSZs+pwomHpw6Jd+qc="; diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index d15140be9882..6b10ba816b03 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "2025.1.3"; + version = "2025.1.4"; components = { "3_day_blinds" = ps: with ps; [ diff --git a/pkgs/servers/home-assistant/custom-components/philips_airpurifier_coap/package.nix b/pkgs/servers/home-assistant/custom-components/philips_airpurifier_coap/package.nix index f2cb6dd23e29..ec5eaf815b7c 100644 --- a/pkgs/servers/home-assistant/custom-components/philips_airpurifier_coap/package.nix +++ b/pkgs/servers/home-assistant/custom-components/philips_airpurifier_coap/package.nix @@ -10,13 +10,13 @@ buildHomeAssistantComponent rec { owner = "kongo09"; domain = "philips_airpurifier_coap"; - version = "0.28.0"; + version = "0.34.0"; src = fetchFromGitHub { inherit owner; repo = "philips-airpurifier-coap"; rev = "v${version}"; - hash = "sha256-yoaph/R3c4j+sXEC02Hv+ixtuif70/y6Gag5NBpKFLs="; + hash = "sha256-jQXQdcgW8IDmjaHjmeyXHcNTXYmknNDw7Flegy6wj2A="; }; dependencies = [ diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 549d16479aef..7ccf9f601a40 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -289,7 +289,7 @@ let extraBuildInputs = extraPackages python.pkgs; # Don't forget to run update-component-packages.py after updating - hassVersion = "2025.1.3"; + hassVersion = "2025.1.4"; in python.pkgs.buildPythonApplication rec { @@ -310,13 +310,13 @@ python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = "refs/tags/${version}"; - hash = "sha256-JQAMh+ydcWSyKqbSt9/exf1/d3+2Oo2jfXw+5WsFYbc="; + hash = "sha256-QqWF/uvFQbf0tdJMzFV3hAt9Je5sFR5z+aAPtCxycbM="; }; # Secondary source is pypi sdist for translations sdist = fetchPypi { inherit pname version; - hash = "sha256-PTfdEQh8B91upX15PbcwalhpoEooEKxhYxmabyWBGrk="; + hash = "sha256-yzX4Wgo468On/WuK32Xdl0O3en/WFRdykvfvHNEU1S0="; }; build-system = with python.pkgs; [ diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix index c3aa598f5f0a..033672d7666e 100644 --- a/pkgs/servers/home-assistant/frontend.nix +++ b/pkgs/servers/home-assistant/frontend.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { # the frontend version corresponding to a specific home-assistant version can be found here # https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json pname = "home-assistant-frontend"; - version = "20250109.0"; + version = "20250109.2"; format = "wheel"; src = fetchPypi { @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "home_assistant_frontend"; dist = "py3"; python = "py3"; - hash = "sha256-kZmBZyiCUxODRcg8GnRUMWk+T+Lry1gdgY2yzQznFPI="; + hash = "sha256-jE8+QzYUftQFuGgJuvFYIzZ9DsEFoNpPS94Wjmk73Ss="; }; # there is nothing to strip in this package diff --git a/pkgs/servers/home-assistant/stubs.nix b/pkgs/servers/home-assistant/stubs.nix index dc5b7981c4ce..f375854db3bc 100644 --- a/pkgs/servers/home-assistant/stubs.nix +++ b/pkgs/servers/home-assistant/stubs.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "homeassistant-stubs"; - version = "2025.1.3"; + version = "2025.1.4"; pyproject = true; disabled = python.version != home-assistant.python.version; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "KapJI"; repo = "homeassistant-stubs"; rev = "refs/tags/${version}"; - hash = "sha256-4cCwhumj6VFSvuWtCqpQ4AzbgK4LmWSM9GCqkI4kZpg="; + hash = "sha256-ysebkp0wrCGHRuHZMY6P4ftcth3gsHwtRcSGUN/7noI="; }; build-system = [ diff --git a/pkgs/servers/monitoring/grafana/plugins/marcusolsson-dynamictext-panel/default.nix b/pkgs/servers/monitoring/grafana/plugins/marcusolsson-dynamictext-panel/default.nix index 55b5f39d90ad..cc962a99ce63 100644 --- a/pkgs/servers/monitoring/grafana/plugins/marcusolsson-dynamictext-panel/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/marcusolsson-dynamictext-panel/default.nix @@ -2,8 +2,8 @@ grafanaPlugin rec { pname = "marcusolsson-dynamictext-panel"; - version = "5.4.0"; - zipHash = "sha256-IgPON60oRqO52W64UvHuwYoa6UG2NfDWIA4S2HfkGQs="; + version = "5.6.0"; + zipHash = "sha256-UDJG6KAaothSv26SHKo1HNQwVHg5slI01rmDnGgGBWs="; meta = with lib; { description = "Dynamic, data-driven text panel for Grafana"; license = licenses.asl20; diff --git a/pkgs/servers/monitoring/prometheus/domain-exporter.nix b/pkgs/servers/monitoring/prometheus/domain-exporter.nix index e09cfa5cb775..f3aa4243e89e 100644 --- a/pkgs/servers/monitoring/prometheus/domain-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/domain-exporter.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "domain-exporter"; - version = "1.23.0"; + version = "1.24.0"; src = fetchFromGitHub { owner = "caarlos0"; repo = "domain_exporter"; rev = "v${version}"; - hash = "sha256-5GyDQkd8zXZ9TtauWfW9uW8xkgtEICFm6f4Q/jVqOBc="; + hash = "sha256-ExMCdrel9uRCn31cKsZkrb3yojvO0UvJYytAn1eptyo="; }; - vendorHash = "sha256-EPpzrig40WXt5mo/vPTFjh+gYdFOlMknjNJHNChlQwk="; + vendorHash = "sha256-NfwxwfUpVNSARcVqOQgM++PkyLmTvXuN9nYBEPX2peY="; doCheck = false; # needs internet connection diff --git a/pkgs/servers/spicedb/default.nix b/pkgs/servers/spicedb/default.nix index 2eed999ae2e5..bf5fc3e7f766 100644 --- a/pkgs/servers/spicedb/default.nix +++ b/pkgs/servers/spicedb/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "spicedb"; - version = "1.39.1"; + version = "1.40.0"; src = fetchFromGitHub { owner = "authzed"; repo = "spicedb"; rev = "v${version}"; - hash = "sha256-+fU0JpaTAzEyI5+fzbOBarWUfdSz8XMSxN23LSIzcnA="; + hash = "sha256-4JT/ZCKvFbyRBV5guNJvjiOi21+HgicnavYGYI9NkBg="; }; - vendorHash = "sha256-sbbuTZsdhsIrLRpy1w41jxJaZkCFJTBYRb+7KvFxo3U="; + vendorHash = "sha256-wH3jXkK+UFH8abihjcow2J1R24aikIScOCt/upPlf1g="; ldflags = [ "-X 'github.com/jzelinskie/cobrautil/v2.Version=${src.rev}'" diff --git a/pkgs/servers/sql/postgresql/ext/postgis.nix b/pkgs/servers/sql/postgresql/ext/postgis.nix index 133e25553d50..e50dbab2996f 100644 --- a/pkgs/servers/sql/postgresql/ext/postgis.nix +++ b/pkgs/servers/sql/postgresql/ext/postgis.nix @@ -35,7 +35,7 @@ let in buildPostgresqlExtension (finalAttrs: { pname = "postgis"; - version = "3.5.0"; + version = "3.5.2"; outputs = [ "out" @@ -46,7 +46,7 @@ buildPostgresqlExtension (finalAttrs: { owner = "postgis"; repo = "postgis"; rev = "${finalAttrs.version}"; - hash = "sha256-wh7Lav2vnKzGWuSvvMFvAaGV7ynD+KgPsFUgujdtzlA="; + hash = "sha256-1kOLtG6AMavbWQ1lHG2ABuvIcyTYhgcbjuVmqMR4X+g="; }; buildInputs = diff --git a/pkgs/servers/sql/postgresql/ext/timescaledb.nix b/pkgs/servers/sql/postgresql/ext/timescaledb.nix index c539ff19ba94..03631de86122 100644 --- a/pkgs/servers/sql/postgresql/ext/timescaledb.nix +++ b/pkgs/servers/sql/postgresql/ext/timescaledb.nix @@ -13,7 +13,7 @@ buildPostgresqlExtension rec { pname = "timescaledb${lib.optionalString (!enableUnfree) "-apache"}"; - version = "2.17.2"; + version = "2.18.0"; nativeBuildInputs = [ cmake ]; buildInputs = [ @@ -25,7 +25,7 @@ buildPostgresqlExtension rec { owner = "timescale"; repo = "timescaledb"; rev = version; - hash = "sha256-gPsAebMUBuAwP6Hoi9/vrc2IFsmTbL0wQH1g6/2k2d4="; + hash = "sha256-wDjzahlhUlBDXppk9HLNUOc7mlVqv56M2VGE/C04gUo="; }; cmakeFlags = diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix index f1c275ca322e..156a927527bf 100644 --- a/pkgs/tools/X11/xpra/default.nix +++ b/pkgs/tools/X11/xpra/default.nix @@ -9,6 +9,7 @@ atk, cairo, cudatoolkit, + cudaPackages, ffmpeg, gdk-pixbuf, getopt, @@ -40,7 +41,7 @@ xorgserver, xxHash, clang, -}: +}@args: let inherit (python3.pkgs) cython buildPythonApplication; @@ -73,11 +74,18 @@ let cp ${nv-codec-headers-10}/include/ffnvcodec/nvEncodeAPI.h $out/include substituteAll ${./nvenc.pc} $out/lib/pkgconfig/nvenc.pc ''; + + nvjpegHeaders = runCommand "nvjpeg-headers" { } '' + mkdir -p $out/include $out/lib/pkgconfig + substituteAll ${cudaPackages.libnvjpeg.dev}/share/pkgconfig/nvjpeg.pc $out/lib/pkgconfig/nvjpeg.pc + ''; in buildPythonApplication rec { pname = "xpra"; version = "6.2.2"; + stdenv = if withNvenc then cudaPackages.backendStdenv else args.stdenv; + src = fetchFromGitHub { owner = "Xpra-org"; repo = "xpra"; @@ -148,7 +156,10 @@ buildPythonApplication rec { x265 xxHash ] - ++ lib.optional withNvenc nvencHeaders; + ++ lib.optional withNvenc [ + nvencHeaders + nvjpegHeaders + ]; propagatedBuildInputs = with python3.pkgs; @@ -185,15 +196,20 @@ buildPythonApplication rec { # error: 'import_cairo' defined but not used env.NIX_CFLAGS_COMPILE = "-Wno-error=unused-function"; - setupPyBuildFlags = [ - "--with-Xdummy" - "--without-Xdummy_wrapper" - "--without-strict" - "--with-gtk3" - # Override these, setup.py checks for headers in /usr/* paths - "--with-pam" - "--with-vsock" - ] ++ lib.optional withNvenc "--with-nvenc"; + setupPyBuildFlags = + [ + "--with-Xdummy" + "--without-Xdummy_wrapper" + "--without-strict" + "--with-gtk3" + # Override these, setup.py checks for headers in /usr/* paths + "--with-pam" + "--with-vsock" + ] + ++ lib.optional withNvenc [ + "--with-nvenc" + "--with-nvjpeg_encoder" + ]; dontWrapGApps = true; diff --git a/pkgs/tools/archivers/unar/default.nix b/pkgs/tools/archivers/unar/default.nix index 445683555dc7..2f15a6abd764 100644 --- a/pkgs/tools/archivers/unar/default.nix +++ b/pkgs/tools/archivers/unar/default.nix @@ -2,7 +2,7 @@ , stdenv , fetchFromGitHub , installShellFiles -, gnustep +, gnustep-base , bzip2 , zlib , icu @@ -54,11 +54,10 @@ stdenv.mkDerivation rec { ''); buildInputs = [ bzip2 icu openssl wavpack zlib ] ++ - lib.optionals stdenv.hostPlatform.isLinux [ gnustep.base ] ++ + lib.optionals stdenv.hostPlatform.isLinux [ gnustep-base ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Foundation AppKit ]; nativeBuildInputs = [ installShellFiles ] ++ - lib.optionals stdenv.hostPlatform.isLinux [ gnustep.make ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcbuildHook ]; xcbuildFlags = lib.optionals stdenv.hostPlatform.isDarwin [ diff --git a/pkgs/tools/audio/openai-whisper-cpp/default.nix b/pkgs/tools/audio/openai-whisper-cpp/default.nix deleted file mode 100644 index e65d909b41f8..000000000000 --- a/pkgs/tools/audio/openai-whisper-cpp/default.nix +++ /dev/null @@ -1,113 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, SDL2 -, makeWrapper -, wget -, which -, Accelerate -, CoreGraphics -, CoreML -, CoreVideo -, MetalKit - -, config -, autoAddDriverRunpath -, cudaSupport ? config.cudaSupport -, cudaPackages ? {} -}: - -let - # It's necessary to consistently use backendStdenv when building with CUDA support, - # otherwise we get libstdc++ errors downstream. - # cuda imposes an upper bound on the gcc version, e.g. the latest gcc compatible with cudaPackages_11 is gcc11 - effectiveStdenv = if cudaSupport then cudaPackages.backendStdenv else stdenv; -in -effectiveStdenv.mkDerivation (finalAttrs: { - pname = "whisper-cpp"; - version = "1.7.2"; - - src = fetchFromGitHub { - owner = "ggerganov"; - repo = "whisper.cpp"; - rev = "refs/tags/v${finalAttrs.version}" ; - hash = "sha256-y30ZccpF3SCdRGa+P3ddF1tT1KnvlI4Fexx81wZxfTk="; - }; - - # The upstream download script tries to download the models to the - # directory of the script, which is not writable due to being - # inside the nix store. This patch changes the script to download - # the models to the current directory of where it is being run from. - patches = [ ./download-models.patch ]; - - nativeBuildInputs = [ - which - makeWrapper - ] ++ lib.optionals cudaSupport [ - cudaPackages.cuda_nvcc - autoAddDriverRunpath - ]; - - buildInputs = [ - SDL2 - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Accelerate - CoreGraphics - CoreML - CoreVideo - MetalKit - ] ++ lib.optionals cudaSupport ( with cudaPackages; [ - cuda_cccl # provides nv/target - cuda_cudart - libcublas - ]); - - postPatch = let - cudaOldStr = "-lcuda "; - cudaNewStr = "-lcuda -L${cudaPackages.cuda_cudart}/lib/stubs "; - in lib.optionalString cudaSupport '' - substituteInPlace Makefile \ - --replace-fail '${cudaOldStr}' '${cudaNewStr}' - ''; - - env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { - WHISPER_COREML = "1"; - WHISPER_COREML_ALLOW_FALLBACK = "1"; - WHISPER_METAL_EMBED_LIBRARY = "1"; - } // lib.optionalAttrs cudaSupport { - GGML_CUDA = "1"; - }; - - installPhase = '' - runHook preInstall - - mkdir -p $out/bin - - cp ./main $out/bin/whisper-cpp - - for file in *; do - if [[ -x "$file" && -f "$file" && "$file" != "main" ]]; then - cp "$file" "$out/bin/whisper-cpp-$file" - fi - done - - cp models/download-ggml-model.sh $out/bin/whisper-cpp-download-ggml-model - - wrapProgram $out/bin/whisper-cpp-download-ggml-model \ - --prefix PATH : ${lib.makeBinPath [wget]} - - runHook postInstall - ''; - - meta = with lib; { - description = "Port of OpenAI's Whisper model in C/C++"; - longDescription = '' - To download the models as described in the project's readme, you may - use the `whisper-cpp-download-ggml-model` binary from this package. - ''; - homepage = "https://github.com/ggerganov/whisper.cpp"; - license = licenses.mit; - platforms = platforms.all; - maintainers = with maintainers; [ dit7ya hughobrien ]; - }; -}) diff --git a/pkgs/tools/filesystems/ceph/default.nix b/pkgs/tools/filesystems/ceph/default.nix index 911fbba3e2a2..c7c84a716dd6 100644 --- a/pkgs/tools/filesystems/ceph/default.nix +++ b/pkgs/tools/filesystems/ceph/default.nix @@ -26,7 +26,7 @@ # Runtime dependencies arrow-cpp, babeltrace, - boost, + boost186, bzip2, cryptsetup, cunit, @@ -289,7 +289,7 @@ let }; }; - boost' = boost.override { + boost' = boost186.override { enablePython = true; inherit python; }; diff --git a/pkgs/tools/filesystems/ssdfs-utils/default.nix b/pkgs/tools/filesystems/ssdfs-utils/default.nix index b176a4530e30..5e0261b24775 100644 --- a/pkgs/tools/filesystems/ssdfs-utils/default.nix +++ b/pkgs/tools/filesystems/ssdfs-utils/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation { # as ssdfs-utils, not ssdfs-tools. pname = "ssdfs-utils"; # The version is taken from `configure.ac`, there are no tags. - version = "4.46"; + version = "4.49"; src = fetchFromGitHub { owner = "dubeyko"; repo = "ssdfs-tools"; - rev = "7528ee1d923115c1536d97b119fd2a0ee978b59e"; - hash = "sha256-SL5BY+vLxRWRHkIp0hTQsi3w/fXRGe4OHpaapZFZBZo="; + rev = "cd080289b2183125a7adeba3d3b01481913cf810"; + hash = "sha256-ydt3xom9Tzf+kImPgg25y4Ht52WYwFSy8bAiy6AoiY4="; }; strictDeps = true; diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix index 618eb1587fda..2bb6a8659051 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix @@ -30,13 +30,13 @@ stdenv.mkDerivation rec { pname = "fcitx5-configtool"; - version = "5.1.7"; + version = "5.1.8"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - hash = "sha256-6Slh1uZglRNBLQ1ziKf2xaP+NK6Abug/6TZcYy2HFPQ="; + hash = "sha256-4CvRQU6tcr3l14KzCGIhMvtYuT8DbSywxz6knbl+HgA="; }; cmakeFlags = [ diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-table-extra.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-table-extra.nix index 4d8845c0c2d3..6989bab1100e 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-table-extra.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-table-extra.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "fcitx5-table-extra"; - version = "5.1.6"; + version = "5.1.7"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - hash = "sha256-no8TDbK88SnuLAz72QK2q2XM5bLdkGd8lkWFwreajO8="; + hash = "sha256-3Er01Qj3XEIO36xTQrBISzxMaIO4j8uqPe7+w9uk3UM="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-table-other.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-table-other.nix index 8a584ec67202..bbfb6d53800d 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-table-other.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-table-other.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "fcitx5-table-other"; - version = "5.1.3"; + version = "5.1.4"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - hash = "sha256-hIUzVc3Bs1zGvM/+R72NigU997Wmm++ZDxnzP+YpX1w="; + hash = "sha256-Yt6lAievCj9FC4eO6EIqUxiSaBPMvjSEb1PNyXPa82Q="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/misc/rmlint/default.nix b/pkgs/tools/misc/rmlint/default.nix index a32223f9df2f..4a06287dc93e 100644 --- a/pkgs/tools/misc/rmlint/default.nix +++ b/pkgs/tools/misc/rmlint/default.nix @@ -4,6 +4,7 @@ cairo, elfutils, fetchFromGitHub, + fetchpatch, glib, gobject-introspection, gtksourceview3, @@ -36,6 +37,11 @@ stdenv.mkDerivation rec { patches = [ # pass through NIX_* environment variables to scons. ./scons-nix-env.patch + # fixes https://github.com/sahib/rmlint/issues/664 + (fetchpatch { + url = "https://github.com/sahib/rmlint/commit/f0ca57ec907f7199e3670038d60b4702d1e1d8e2.patch"; + hash = "sha256-715X+R2BcQIaUV76hoO+EXPfNheOfw4OIHsqSoruIUI="; + }) ]; nativeBuildInputs = diff --git a/pkgs/tools/networking/openvpn/openvpn-auth-ldap.nix b/pkgs/tools/networking/openvpn/openvpn-auth-ldap.nix index 385281b010ab..e046e861e8ef 100644 --- a/pkgs/tools/networking/openvpn/openvpn-auth-ldap.nix +++ b/pkgs/tools/networking/openvpn/openvpn-auth-ldap.nix @@ -4,7 +4,7 @@ fetchFromGitHub, fetchpatch2, autoreconfHook, - gnustep, + gnustep-base, re2c, openldap, openssl, @@ -40,9 +40,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook - gnustep.base - gnustep.libobjc - gnustep.make re2c ]; @@ -50,6 +47,7 @@ stdenv.mkDerivation rec { openldap openssl openvpn + gnustep-base ]; configureFlags = [ diff --git a/pkgs/tools/package-management/apk-tools/default.nix b/pkgs/tools/package-management/apk-tools/default.nix index f2314f601a8b..a05efc5e6f6d 100644 --- a/pkgs/tools/package-management/apk-tools/default.nix +++ b/pkgs/tools/package-management/apk-tools/default.nix @@ -4,14 +4,14 @@ stdenv.mkDerivation rec { pname = "apk-tools"; - version = "2.14.7"; + version = "2.14.9"; src = fetchFromGitLab { domain = "gitlab.alpinelinux.org"; owner = "alpine"; repo = "apk-tools"; rev = "v${version}"; - sha256 = "sha256-4MA+wP8G1Qbv8mbzx1R0eFG7gbwUAfSAFJZ6ulrBHUY="; + sha256 = "sha256-EYTchTfkMqREBQ1kAeQDP6LUhEfJKeEs1DjlE8RsvMg="; }; nativeBuildInputs = [ pkg-config scdoc ] diff --git a/pkgs/tools/security/ghidra/extensions/lightkeeper/default.nix b/pkgs/tools/security/ghidra/extensions/lightkeeper/default.nix index 7e7e15ebf3aa..b54dab0070bf 100644 --- a/pkgs/tools/security/ghidra/extensions/lightkeeper/default.nix +++ b/pkgs/tools/security/ghidra/extensions/lightkeeper/default.nix @@ -5,13 +5,13 @@ }: buildGhidraExtension rec { pname = "lightkeeper"; - version = "1.2.0"; + version = "1.2.2"; src = fetchFromGitHub { owner = "WorksButNotTested"; repo = "lightkeeper"; rev = version; - hash = "sha256-4lj60OyVcam4JHyfIa+4auzITuEYqjz9wOQko/u+2dI="; + hash = "sha256-9BkI3sY/x0SwODwq646WBqU05wnfu/bU4lUfyRQV7UA="; }; preConfigure = '' cd lightkeeper diff --git a/pkgs/tools/security/vaultwarden/default.nix b/pkgs/tools/security/vaultwarden/default.nix index a7fe7db23777..80c11dc3a5d3 100644 --- a/pkgs/tools/security/vaultwarden/default.nix +++ b/pkgs/tools/security/vaultwarden/default.nix @@ -22,17 +22,17 @@ in rustPlatform.buildRustPackage rec { pname = "vaultwarden"; - version = "1.32.7"; + version = "1.33.0"; src = fetchFromGitHub { owner = "dani-garcia"; repo = "vaultwarden"; rev = version; - hash = "sha256-mxZQ1San8zlyvZoBRF9Eb7/mbs374MOgC4baOCFyPoc="; + hash = "sha256-2lZfPPHHAoY12cXpkeJnvMab+C3T5O7KdmVpKqRQkgQ="; }; useFetchCargoVendor = true; - cargoHash = "sha256-OKfu+G+bS72HJDDLhRp9PMji/baBsh7JaYEZgQYdjTw="; + cargoHash = "sha256-f+884HV9oopvr/2UfWk0sw2DW2cU3c16F+5vGc6+IL0="; # used for "Server Installed" version in admin panel env.VW_VERSION = version; diff --git a/pkgs/tools/security/vaultwarden/webvault.nix b/pkgs/tools/security/vaultwarden/webvault.nix index d960e3c34a3b..9779d63b25b8 100644 --- a/pkgs/tools/security/vaultwarden/webvault.nix +++ b/pkgs/tools/security/vaultwarden/webvault.nix @@ -9,7 +9,7 @@ }: let - version = "2024.6.2c"; + version = "2025.1.1"; suffix = lib.head (lib.match "[0-9.]*([a-z]*)" version); @@ -17,7 +17,7 @@ let owner = "dani-garcia"; repo = "bw_web_builds"; rev = "v${version}"; - hash = "sha256-Gd8yQx9j6ieUvaM6IPSELNRy83y0cBkBwLYMqk8OIjU="; + hash = "sha256-wQGpl7N0D83FrrV4T+LFe9h3n5Q/MqLbGGO2F5R9k2g="; }; in @@ -29,10 +29,10 @@ buildNpmPackage rec { owner = "bitwarden"; repo = "clients"; rev = "web-v${lib.removeSuffix suffix version}"; - hash = "sha256-HMQ0oQ04WkLlUgsYt6ZpcziDq05mnSA0+VnJCpteceg="; + hash = "sha256-Bq133V8CsDMnLeaKrW5JmLTGRaZVLRbp+tTgG725tqE="; }; - npmDepsHash = "sha256-zMzQEM5mV14gewzYhy1F2bNEugXjZSOviYwYVV2Cb8c="; + npmDepsHash = "sha256-bWcp3VJI2bObLH/XBx3cdxXQY9Cw+IFpeNA2TXVTtFg="; postPatch = '' ln -s ${bw_web_builds}/{patches,resources} .. @@ -41,12 +41,20 @@ buildNpmPackage rec { ''; nativeBuildInputs = [ - (python3.withPackages (ps: [ ps.setuptools ])) + python3 ]; makeCacheWritable = true; - ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; + env = { + ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; + npm_config_build_from_source = "true"; + }; + + npmRebuildFlags = [ + # FIXME one of the esbuild versions fails to download @esbuild/linux-x64 + "--ignore-scripts" + ]; npmBuildScript = "dist:oss:selfhost"; diff --git a/pkgs/tools/system/netdata/default.nix b/pkgs/tools/system/netdata/default.nix index b4639c43c40f..00e2d44083cb 100644 --- a/pkgs/tools/system/netdata/default.nix +++ b/pkgs/tools/system/netdata/default.nix @@ -48,6 +48,7 @@ withSsl ? true, withSystemdJournal ? (stdenv.hostPlatform.isLinux), zlib, + withNdsudo ? false, }: let stdenv' = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv; @@ -181,6 +182,12 @@ stdenv'.mkDerivation (finalAttrs: { rm -rf $out/share/netdata/web/index.html cp $out/share/netdata/web/v1/index.html $out/share/netdata/web/index.html ''} + ${lib.optionalString withNdsudo '' + mv $out/libexec/netdata/plugins.d/ndsudo \ + $out/libexec/netdata/plugins.d/ndsudo.org + + ln -s /var/lib/netdata/ndsudo/ndsudo $out/libexec/netdata/plugins.d/ndsudo + ''} ''; preConfigure = '' @@ -270,7 +277,7 @@ stdenv'.mkDerivation (finalAttrs: { license = lib.licenses.gpl3Only; }; }).goModules; - inherit withIpmi withNetworkViewer; + inherit withIpmi withNetworkViewer withNdsudo; tests.netdata = nixosTests.netdata; }; @@ -281,6 +288,8 @@ stdenv'.mkDerivation (finalAttrs: { changelog = "https://github.com/netdata/netdata/releases/tag/v${version}"; license = [ licenses.gpl3Plus ] ++ lib.optionals (withCloudUi) [ licenses.ncul1 ]; platforms = platforms.unix; - maintainers = [ ]; + maintainers = with maintainers; [ + mkg20001 + ]; }; }) diff --git a/pkgs/tools/system/netdata/ndsudo-fix-path.patch b/pkgs/tools/system/netdata/ndsudo-fix-path.patch index 0ec9a63231f0..be70032fff04 100644 --- a/pkgs/tools/system/netdata/ndsudo-fix-path.patch +++ b/pkgs/tools/system/netdata/ndsudo-fix-path.patch @@ -5,13 +5,14 @@ diff --git a/src/collectors/plugins.d/ndsudo.c b/src/collectors/plugins.d/ndsudo index d53ca9f28..b42a121bf 100644 --- a/src/collectors/plugins.d/ndsudo.c +++ b/src/collectors/plugins.d/ndsudo.c -@@ -357,9 +357,6 @@ int main(int argc, char *argv[]) { +@@ -357,9 +357,9 @@ int main(int argc, char *argv[]) { return 3; } - char new_path[] = "PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin"; -- putenv(new_path); -- ++ char new_path[] = "PATH=/var/lib/netdata/ndsudo/runtime-dependencies"; + putenv(new_path); + setuid(0); setgid(0); setegid(0); diff --git a/pkgs/tools/video/yaydl/default.nix b/pkgs/tools/video/yaydl/default.nix index 1befd6715f16..b07988a7de47 100644 --- a/pkgs/tools/video/yaydl/default.nix +++ b/pkgs/tools/video/yaydl/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "yaydl"; - version = "0.17.1"; + version = "0.17.2"; src = fetchFromGitHub { owner = "dertuxmalwieder"; repo = pname; rev = "release-${version}"; - sha256 = "sha256-mMV7fnl3tEM22LCTLXoXG9RQhPSQ7DXanSURdoa0+EI="; + sha256 = "sha256-r+UkwEtuGL6los9ohv86KA/3qsaEkpnI4yV/UnYelgk="; }; - cargoHash = "sha256-HsRg8SO9c9Fomeb5B+kOW3VDNIG4W+dagEwAoWqONyA="; + cargoHash = "sha256-nEZBrtfUFybXIp7PBbR6X32GfIkjNylqpxaPOqNy+ww="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 79dc5dd6a318..a0db6ec6d3fb 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -200,6 +200,7 @@ mapAliases { canonicalize-jars-hook = stripJavaArchivesHook; # Added 2024-03-17 cargo-deps = throw "cargo-deps has been removed as the repository is deleted"; # Added 2024-04-09 cargo-espflash = espflash; + cargo-kcov = throw "'cargo-kcov' has been removed due to lack of upstream maintenance"; # Added 2025-01-25 cawbird = throw "cawbird has been abandoned upstream and is broken anyways due to Twitter closing its API"; certmgr-selfsigned = certmgr; # Added 2023-11-30 cgal_4 = throw "cgal_4 has been removed as it is obsolete use cgal instead"; # Added 2024-12-30 @@ -301,6 +302,7 @@ mapAliases { dgsh = throw "'dgsh' has been removed, as it was broken and unmaintained"; # added 2024-05-09 dibbler = throw "dibbler was removed because it is not maintained anymore"; # Added 2024-05-14 dillong = throw "'dillong' has been removed, as upstream is abandoned since 2021-12-13. Use either 'dillo' or 'dillo-plus'. The latter integrates features from dillong."; # Added 2024-10-07 + diskonaut = throw "'diskonaut' was removed due to lack of upstream maintenance"; # Added 2025-01-25 dnnl = throw "'dnnl' has been renamed to/replaced by 'oneDNN'"; # Converted to throw 2024-10-17 dnscrypt-wrapper = throw "dnscrypt-wrapper was removed because it has been effectively unmaintained since 2018. Use DNSCcrypt support in dnsdist instead"; # Added 2024-09-14 docear = throw "Docear was removed because it was unmaintained upstream. JabRef, Zotero, or Mendeley are potential replacements."; # Added 2024-11-02 @@ -315,11 +317,13 @@ mapAliases { dotnet-sdk_2 = throw "'dotnet-sdk_2' has been renamed to/replaced by 'dotnetCorePackages.sdk_2_1'"; # Converted to throw 2024-10-17 dotnet-sdk_3 = throw "'dotnet-sdk_3' has been renamed to/replaced by 'dotnetCorePackages.sdk_3_1'"; # Converted to throw 2024-10-17 dotnet-sdk_5 = throw "'dotnet-sdk_5' has been renamed to/replaced by 'dotnetCorePackages.sdk_5_0'"; # Converted to throw 2024-10-17 + downonspot = throw "'downonspot' was removed because upstream has been taken down by a cease and desist"; # Added 2025-01-25 dstat = throw "'dstat' has been removed because it has been unmaintained since 2020. Use 'dool' instead."; # Added 2025-01-21 drush = throw "drush as a standalone package has been removed because it's no longer supported as a standalone tool"; dtv-scan-tables_linuxtv = dtv-scan-tables; # Added 2023-03-03 dtv-scan-tables_tvheadend = dtv-scan-tables; # Added 2023-03-03 du-dust = dust; # Added 2024-01-19 + dwfv = throw "'dwfv' has been removed due to lack of upstream maintenance"; dylibbundler = throw "'dylibbundler' has been renamed to/replaced by 'macdylibbundler'"; # Converted to throw 2024-10-17 ### E ### @@ -408,6 +412,7 @@ mapAliases { fmt_8 = throw "fmt_8 has been removed as it is obsolete and was no longer used in the tree"; # Added 2024-11-12 foldingathome = throw "'foldingathome' has been renamed to/replaced by 'fahclient'"; # Converted to throw 2024-10-17 forgejo-actions-runner = forgejo-runner; # Added 2024-04-04 + fornalder = throw "'fornalder' has been removed as it is unmaintained upstream"; # Added 2025-01-25 foundationdb71 = throw "foundationdb71 has been removed; please upgrade to foundationdb73"; # Added 2024-12-28 fractal-next = fractal; # added 2023-11-25 @@ -452,6 +457,7 @@ mapAliases { gfortran7 = throw "gfortran7 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-11-20 gfortran8 = throw "gfortran8 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-11-20 ghostwriter = libsForQt5.kdeGear.ghostwriter; # Added 2023-03-18 + git-codeowners = throw "'git-codeowners' has been removed due to lack of upstream maintenance"; # Added 2025-01-25 gmp5 = throw "'gmp5' has been removed as it is unmaintained. Consider using 'gmp' instead"; # Added 2024-10-28 gmpc = throw "'gmpc' has been removed due to lack of maintenance upstream. Consider using 'plattenalbum' instead"; # Added 2024-09-14 gmtk = throw "'gmtk' has been removed due to lack of maintenance upstream"; # Added 2024-09-14 @@ -522,6 +528,7 @@ mapAliases { gnuradio3_8 = throw "gnuradio3_8 has been removed because it was too old and incompatible with a not EOL swig"; # Added 2024-11-18 gnuradio3_8Minimal = throw "gnuradio3_8Minimal has been removed because it was too old and incompatible with a not EOL swig"; # Added 2024-11-18 gnuradio3_8Packages = throw "gnuradio3_8Minimal has been removed because it was too old and incompatible with a not EOL swig"; # Added 2024-11-18 + gnustep = throw "The gnustep scope has been replaced with top-level packages: gnustep-back, -base, -gui, -libobjc, -make, -systempreferences; gorm, gworkspace, projectcenter."; # Added 2025-01-25 gn1924 = throw "gn1924 has been removed because it was broken and no longer used by envoy."; # Added 2024-11-03 gobby5 = throw "'gobby5' has been renamed to/replaced by 'gobby'"; # Converted to throw 2024-10-17 gradle_6 = throw "Gradle 6 has been removed, as it is end-of-life (https://endoflife.date/gradle) and has many vulnerabilities that are not resolved until Gradle 7."; # Added 2024-10-30 @@ -558,6 +565,7 @@ mapAliases { ### H ### + hacksaw = throw "'hacksaw' has been removed due to lack of upstream maintenance"; # Added 2025-01-25 HentaiAtHome = hentai-at-home; # Added 2024-06-12 hll2390dw-cups = throw "The hll2390dw-cups package was dropped since it was unmaintained."; # Added 2024-06-21 hop-cli = throw "hop-cli has been removed as the service has been shut-down"; # Added 2024-08-13 @@ -814,6 +822,8 @@ mapAliases { llvm_9 = throw "llvm_9 has been removed from nixpkgs"; # Added 2024-04-08 lobster-two = throw "'lobster-two' has been renamed to/replaced by 'google-fonts'"; # Converted to throw 2024-10-17 + loc = throw "'loc' has been removed due to lack of upstream maintenance. Consider 'tokei' as an alternative."; # Added 2025-01-25 + loop = throw "'loop' has been removed due to lack of upstream maintenance"; # Added 2025-01-25 lsh = throw "lsh has been removed as it had no maintainer in Nixpkgs and hasn't seen an upstream release in over a decade"; # Added 2024-08-14 luna-icons = throw "luna-icons has been removed as it was removed upstream"; # Added 2024-10-29 lv_img_conv = throw "'lv_img_conv' has been removed from nixpkgs as it is broken"; # Added 2024-06-18 @@ -887,6 +897,7 @@ mapAliases { mpd_clientlib = throw "'mpd_clientlib' has been renamed to/replaced by 'libmpdclient'"; # Converted to throw 2024-10-17 mpdevil = plattenalbum; # Added 2024-05-22 mpg321 = throw "'mpg321' has been removed due to it being unmaintained by upstream. Consider using mpg123 instead."; # Added 2024-05-10 + mq-cli = throw "'mq-cli' has been removed due to lack of upstream maintenance"; # Added 2025-01-25 mrkd = throw "'mrkd' has been removed as it is unmaintained since 2021"; # Added 2024-12-21 msp430NewlibCross = msp430Newlib; # Added 2024-09-06 mupdf_1_17 = throw "'mupdf_1_17' has been removed due to being outdated and insecure. Consider using 'mupdf' instead."; # Added 2024-08-22 @@ -988,6 +999,7 @@ mapAliases { oauth2_proxy = throw "'oauth2_proxy' has been renamed to/replaced by 'oauth2-proxy'"; # Converted to throw 2024-10-17 oil = lib.warnOnInstantiate "Oil has been replaced with the faster native C++ version and renamed to 'oils-for-unix'. See also https://github.com/oils-for-unix/oils/wiki/Oils-Deployments" oils-for-unix; # Added 2024-10-22 onevpl-intel-gpu = lib.warnOnInstantiate "onevpl-intel-gpu has been renamed to vpl-gpu-rt" vpl-gpu-rt; # Added 2024-06-04 + openai-whisper-cpp = whisper-cpp; # Added 2024-12-13 opencv2 = throw "opencv2 has been removed as it is obsolete and was not used by any other package; please migrate to OpenCV 4"; # Added 2024-08-20 opencv3 = throw "opencv3 has been removed as it is obsolete and was not used by any other package; please migrate to OpenCV 4"; # Added 2024-08-20 openafs_1_8 = openafs; # Added 2022-08-22 @@ -1046,6 +1058,7 @@ mapAliases { PageEdit = pageedit; # Added 2024-01-21 p2pvc = throw "p2pvc has been removed as it is unmaintained upstream and depends on OpenCV 2"; # Added 2024-08-20 packet-cli = throw "'packet-cli' has been renamed to/replaced by 'metal-cli'"; # Converted to throw 2024-10-17 + panopticon = throw "'panopticon' has been removed because it is unmaintained upstream"; # Added 2025-01-25 paperoni = throw "paperoni has been removed, because it is unmaintained"; # Added 2024-07-14 paperless = throw "'paperless' has been renamed to/replaced by 'paperless-ngx'"; # Converted to throw 2024-10-17 paperless-ng = paperless-ngx; # Added 2022-04-11 @@ -1070,6 +1083,7 @@ mapAliases { picom-next = picom; # Added 2024-02-13 pict-rs_0_3 = throw "pict-rs_0_3 has been removed, as it was an outdated version and no longer compiled"; # Added 2024-08-20 + pio = throw "pio has been removed due to lack of upstream maintenance"; # Added 2025-01-25 pipewire_0_2 = throw "pipewire_0_2 has been removed as it is outdated and no longer used"; # Added 2024-07-28 pipewire-media-session = throw "pipewire-media-session is no longer maintained and has been removed. Please use Wireplumber instead."; pleroma-otp = throw "'pleroma-otp' has been renamed to/replaced by 'pleroma'"; # Converted to throw 2024-10-17 @@ -1178,6 +1192,7 @@ mapAliases { railway-travel = diebahn; # Added 2024-04-01 rambox-pro = rambox; # Added 2022-12-12 rapidjson-unstable = lib.warnOnInstantiate "'rapidjson-unstable' has been renamed to 'rapidjson'" rapidjson; # Added 2024-07-28 + rargs = throw "'rargs' has been removed due to lack of upstream maintenance"; # Added 2025-01-25 redocly-cli = redocly; # Added 2024-04-14 redpanda = redpanda-client; # Added 2023-10-14 redpanda-server = throw "'redpanda-server' has been removed because it was broken for a long time"; # Added 2024-06-10 @@ -1193,8 +1208,10 @@ mapAliases { rippled = throw "rippled has been removed as it was broken and had not been updated since 2022"; # Added 2024-11-25 rippled-validator-keys-tool = throw "rippled-validator-keys-tool has been removed as it was broken and had not been updated since 2022"; # Added 2024-11-25 rockbox_utility = rockbox-utility; # Added 2022-03-17 + rnix-hashes = throw "'rnix-hashes' has been removed due to lack of upstream maintenance"; # Added 2025-01-25 rpiboot-unstable = throw "'rpiboot-unstable' has been renamed to/replaced by 'rpiboot'"; # Converted to throw 2024-10-17 rr-unstable = rr; # Added 2022-09-17 + rs-git-fsmonitor = throw "'rs-git-fsmonitor' has been removed due to lack of upstream maintenance"; # Added 2025-01-25 rtx = mise; # Added 2024-01-05 runCommandNoCC = runCommand; runCommandNoCCLocal = runCommandLocal; @@ -1227,10 +1244,12 @@ mapAliases { semeru-bin-16 = throw "Semeru 16 has been removed as it has reached its end of life"; # Added 2024-08-01 semeru-jre-bin-16 = throw "Semeru 16 has been removed as it has reached its end of life"; # Added 2024-08-01 sensu = throw "sensu has been removed as the upstream project is deprecated. Consider using `sensu-go`"; # Added 2024-10-28 + serial-unit-testing = throw "'serial-unit-testing' has been removed due to lack of upstream maintenance"; # Added 2025-01-25 session-desktop-appimage = session-desktop; sequoia = sequoia-sq; # Added 2023-06-26 sexp = sexpp; # Added 2023-07-03 inherit (libsForQt5.mauiPackages) shelf; # added 2022-05-17 + shell-hist = throw "'shell-hist' has been removed due to lack of upstream maintenance"; # Added 2025-01-25 shipyard = jumppad; # Added 2023-06-06 siduck76-st = st-snazzy; # Added 2024-12-24 signal-desktop-beta = throw "signal-desktop-beta has been removed to make the signal-desktop package easier to maintain"; @@ -1359,6 +1378,7 @@ mapAliases { tix = tclPackages.tix; # Added 2024-10-02 tkcvs = tkrev; # Added 2022-03-07 tkimg = tclPackages.tkimg; # Added 2024-10-02 + todiff = "'todiff' was removed due to lack of known users"; # Added 2025-01-25 toil = throw "toil was removed as it was broken and requires obsolete versions of libraries"; # Added 2024-09-22 tokodon = plasma5Packages.tokodon; tokyo-night-gtk = tokyonight-gtk-theme; # Added 2024-01-28 @@ -1383,6 +1403,7 @@ mapAliases { tvbrowser-bin = tvbrowser; # Added 2023-03-02 tvheadend = throw "tvheadend has been removed as it nobody was willing to maintain it and it was stuck on an unmaintained version that required FFmpeg 4; please see https://github.com/NixOS/nixpkgs/pull/332259 if you are interested in maintaining a newer version"; # Added 2024-08-21 typst-fmt = typstfmt; # Added 2023-07-15 + typst-lsp = throw "'typst-lsp' has been removed due to lack of upstream maintenance, consider using 'tinymist' instead"; # Added 2025-01-25 typst-preview = throw "The features of 'typst-preview' have been consolidated to 'tinymist', an all-in-one language server for typst"; # Added 2024-07-07 ### U ### @@ -1405,6 +1426,7 @@ mapAliases { unifiStable = throw "'unifiStable' has been removed since UniFi no longer has LTS and stable releases. Use `pkgs.unifi` instead."; # Converted to throw 2024-04-11 unl0kr = throw "'unl0kr' is now included with buffybox. Use `pkgs.buffybox` instead."; # Removed 2024-12-20 untrunc = throw "'untrunc' has been renamed to/replaced by 'untrunc-anthwlock'"; # Converted to throw 2024-10-17 + uq = throw "'uq' has been removed due to lack of upstream maintenance"; # Added 2025-01-25 urxvt_autocomplete_all_the_things = throw "'urxvt_autocomplete_all_the_things' has been renamed to/replaced by 'rxvt-unicode-plugins.autocomplete-all-the-things'"; # Converted to throw 2024-10-17 urxvt_bidi = throw "'urxvt_bidi' has been renamed to/replaced by 'rxvt-unicode-plugins.bidi'"; # Converted to throw 2024-10-17 urxvt_font_size = throw "'urxvt_font_size' has been renamed to/replaced by 'rxvt-unicode-plugins.font-size'"; # Converted to throw 2024-10-17 @@ -1458,6 +1480,7 @@ mapAliases { ''; # Add 2023-07-29 waypoint = throw "waypoint has been removed from nixpkgs as the upstream project was archived"; # Added 2024-04-24 webkitgtk = lib.warnOnInstantiate "Explicitly set the ABI version of 'webkitgtk'" webkitgtk_4_0; + wg-bond = throw "'wg-bond' has been removed due to lack of upstream maintenance"; # Added 2025-01-25 wineWayland = wine-wayland; win-virtio = virtio-win; # Added 2023-10-17 wkhtmltopdf-bin = wkhtmltopdf; # Added 2024-07-17 @@ -1502,6 +1525,7 @@ mapAliases { xulrunner = firefox-unwrapped; # Added 2023-11-03 xvfb_run = throw "'xvfb_run' has been renamed to/replaced by 'xvfb-run'"; # Converted to throw 2024-10-17 xwaylandvideobridge = libsForQt5.xwaylandvideobridge; # Added 2024-09-27 + xxv = throw "'xxv' has been removed due to lack of upstream maintenance"; # Added 2025-01-25 ### Y ### diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7a2782350259..1b283914d6d5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1009,8 +1009,6 @@ with pkgs; kanata-with-cmd = kanata.override { withCmd = true; }; - kdocker = libsForQt5.callPackage ../tools/X11/kdocker { }; - ksnip = libsForQt5.callPackage ../tools/misc/ksnip { }; linux-router-without-wifi = linux-router.override { useWifiDependencies = false; }; @@ -1256,10 +1254,6 @@ with pkgs; pythonPackages = python3Packages; }; - git-workspace = callPackage ../applications/version-management/git-workspace { - inherit (darwin.apple_sdk.frameworks) Security; - }; - gitlint = python3Packages.callPackage ../applications/version-management/gitlint { }; gitmux = callPackage ../applications/version-management/gitmux { buildGoModule = buildGo122Module; }; @@ -4158,8 +4152,6 @@ with pkgs; libirc = libsForQt5.callPackage ../development/libraries/libirc { }; - libmongocrypt = darwin.apple_sdk_11_0.callPackage ../development/libraries/libmongocrypt { }; - libportal-gtk3 = libportal.override { variant = "gtk3"; }; libportal-gtk4 = libportal.override { variant = "gtk4"; }; libportal-qt5 = libportal.override { variant = "qt5"; }; @@ -4669,10 +4661,6 @@ with pkgs; pfstools = libsForQt5.callPackage ../tools/graphics/pfstools { }; - phoc = callPackage ../applications/misc/phoc { - wlroots = wlroots_0_17; - }; - piper-train = callPackage ../tools/audio/piper/train.nix { }; piper-tts = callPackage ../tools/audio/piper { }; @@ -8145,10 +8133,6 @@ with pkgs; openai-whisper = with python3.pkgs; toPythonApplication openai-whisper; - openai-whisper-cpp = darwin.apple_sdk_11_0.callPackage ../tools/audio/openai-whisper-cpp { - inherit (darwin.apple_sdk_11_0.frameworks) Accelerate CoreGraphics CoreML CoreVideo MetalKit; - }; - openocd-rp2040 = openocd.overrideAttrs (old: { pname = "openocd-rp2040"; src = fetchFromGitHub { @@ -8420,6 +8404,10 @@ with pkgs; inherit (llvmPackages) clang-unwrapped; }; + whisper-cpp-vulkan = whisper-cpp.override { + vulkanSupport = true; + }; + watson-ruby = callPackage ../development/tools/misc/watson-ruby { }; xmake = darwin.apple_sdk_11_0.callPackage ../development/tools/build-managers/xmake { @@ -16788,9 +16776,6 @@ with pkgs; gnome-session-ctl = callPackage ../by-name/gn/gnome-session/ctl.nix { }; - # Using 43 to match Mutter used in Pantheon - gnustep = recurseIntoAttrs (callPackage ../desktops/gnustep { }); - lomiri = recurseIntoAttrs (callPackage ../desktops/lomiri { }); lumina = recurseIntoAttrs (callPackage ../desktops/lumina { }); @@ -17153,6 +17138,7 @@ with pkgs; coqPackages_8_18 coq_8_18 coqPackages_8_19 coq_8_19 coqPackages_8_20 coq_8_20 + coqPackages_9_0 coq_9_0 coqPackages coq ; @@ -17678,8 +17664,6 @@ with pkgs; icu = icu71; }; - mongoc = darwin.apple_sdk_11_0.callPackage ../development/libraries/mongoc { }; - mongocxx = callPackage ../development/libraries/mongocxx/default.nix { }; muse = libsForQt5.callPackage ../applications/audio/muse { }; diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix index 87bf3a7b7a7f..8e6ac8cafe4c 100644 --- a/pkgs/top-level/coq-packages.nix +++ b/pkgs/top-level/coq-packages.nix @@ -235,6 +235,7 @@ in rec { coq_8_18 = mkCoq "8.18"; coq_8_19 = mkCoq "8.19"; coq_8_20 = mkCoq "8.20"; + coq_9_0 = mkCoq "9.0"; coqPackages_8_5 = mkCoqPackages coq_8_5; coqPackages_8_6 = mkCoqPackages coq_8_6; @@ -252,6 +253,7 @@ in rec { coqPackages_8_18 = mkCoqPackages coq_8_18; coqPackages_8_19 = mkCoqPackages coq_8_19; coqPackages_8_20 = mkCoqPackages coq_8_20; + coqPackages_9_0 = mkCoqPackages coq_9_0; coqPackages = recurseIntoAttrs coqPackages_8_20; coq = coqPackages.coq; diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index a63c22a7a8c9..966106374799 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -605,7 +605,6 @@ in { configFile = "kernel"; inherit pkgs kernel; }; - zfs = zfs_2_2; can-isotp = callPackage ../os-specific/linux/can-isotp { }; @@ -628,6 +627,7 @@ in { tsme-test = callPackage ../os-specific/linux/tsme-test { }; } // lib.optionalAttrs config.allowAliases { + zfs = throw "linuxPackages.zfs has been removed, use zfs_* instead, or linuxPackages.\${pkgs.zfs.kernelModuleAttribute}"; # added 2025-01-23 zfs_2_1 = throw "zfs_2_1 has been removed"; # added 2024-12-25; ati_drivers_x11 = throw "ati drivers are no longer supported by any kernel >=4.1"; # added 2021-05-18; hid-nintendo = throw "hid-nintendo was added in mainline kernel version 5.16"; # Added 2023-07-30 diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index ac597f982f39..429cde592b68 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -11020,7 +11020,7 @@ with self; { url = "mirror://cpan/authors/id/B/BP/BPS/GnuPG-Interface-1.03.tar.gz"; hash = "sha256-WvVmMPD6wpDXJCGD9kSaoOAoKfRhHcYrxunps4CPGHo="; }; - buildInputs = [ pkgs.which pkgs.gnupg1compat ]; + buildInputs = [ pkgs.which pkgs.gnupg ]; propagatedBuildInputs = [ MooXHandlesVia MooXlate ]; doCheck = false; meta = {