Merge master into staging-next

This commit is contained in:
nixpkgs-ci[bot]
2025-03-23 12:05:41 +00:00
committed by GitHub
108 changed files with 1459 additions and 1164 deletions
+12 -2
View File
@@ -34,7 +34,17 @@ jobs:
with:
# This cache is for the nixpkgs repo checks and should not be trusted or used elsewhere.
name: nixpkgs-ci
authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
- name: Building NixOS manual
run: NIX_PATH=nixpkgs=$(pwd) nix-build --option restrict-eval true nixos/release.nix -A manual.x86_64-linux
run: |
export NIX_PATH=nixpkgs=$(pwd)
nix-build --option restrict-eval true nixos/release.nix -A manual.x86_64-linux -o result-x86_64-linux
nix-build --option restrict-eval true nixos/release.nix -A manual.aarch64-linux -o result-aarch64-linux
- name: Upload NixOS manual
uses: actions/upload-artifact@3850ca5b6c832f17a0f754f6293181ebbf4e161d # v3.2.5
with:
name: nixos-manual-result
path: result-**
if-no-files-found: error
@@ -38,7 +38,7 @@
- The `nixos-generate-config` command now supports a optional `--flake` option, which will generate a flake.nix file alongside the `configuration.nix` and `hardware-configuration.nix`, providing an easy instroduction into flake-based system configurations.
- A `nixos-rebuild build-image` sub-command has been added.
It allows users to build platform-specific (disk) images from their NixOS configurations. `nixos-rebuild build-image` works similar to the popular [nix-community/nixos-generators](https://github.com/nix-community/nixos-generators) project. See new [section on image building in the nixpkgs manual](https://nixos.org/manual/nixpkgs/unstable/#sec-image-nixos-rebuild-build-image). It is also available for `nixos-rebuild-ng`.
It allows users to build platform-specific (disk) images from their NixOS configurations. `nixos-rebuild build-image` works similar to the popular [nix-community/nixos-generators](https://github.com/nix-community/nixos-generators) project. See new [section on image building in the NixOS manual](https://nixos.org/manual/nixos/unstable/#sec-image-nixos-rebuild-build-image). It is also available for `nixos-rebuild-ng`.
- `nixos-option` has been rewritten to a Nix expression called by a simple bash script. This lowers our maintenance threshold, makes eval errors less verbose, adds support for flake-based configurations, descending into `attrsOf` and `listOf` submodule options, and `--show-trace`.
+1
View File
@@ -560,6 +560,7 @@
./services/desktops/system76-scheduler.nix
./services/desktops/telepathy.nix
./services/desktops/tumbler.nix
./services/desktops/wlock.nix
./services/desktops/zeitgeist.nix
./services/development/athens.nix
./services/development/blackfire.nix
+7
View File
@@ -118,8 +118,15 @@ in
Some of these might be able to be configured more ergonomically
using policies.
See [here](https://mozilla.github.io/policy-templates/#preferences) for allowed preferences.
${organisationInfo}
'';
example = lib.literalExpression ''
{
"browser.tabs.tabmanager.enabled" = false;
}
'';
};
preferencesStatus = lib.mkOption {
+31
View File
@@ -0,0 +1,31 @@
{
config,
lib,
pkgs,
...
}:
let
cfg = config.services.wlock;
in
{
options = {
services.wlock = {
enable = lib.mkEnableOption "wlock, a Wayland sessionlocker using the ext-session-lock-v1 protocol";
package = lib.mkPackageOption pkgs "wlock" { };
};
};
config = lib.mkIf cfg.enable {
security.wrappers.wlock = {
owner = "root";
group = "root";
# mirror upstream chmod of 4755
setuid = true;
setgid = false;
source = lib.getExe cfg.package;
};
};
meta.maintainers = [ lib.maintainers.fliegendewurst ];
}
@@ -192,82 +192,52 @@ in
};
};
config =
let
# If homepage-dashboard is enabled, but none of the configuration values have been updated,
# then default to "unmanaged" configuration which is manually updated in
# var/lib/homepage-dashboard. This is to maintain backwards compatibility, and should be
# deprecated in a future release.
managedConfig =
!(
cfg.bookmarks == [ ]
&& cfg.customCSS == ""
&& cfg.customJS == ""
&& cfg.docker == { }
&& cfg.kubernetes == { }
&& cfg.services == [ ]
&& cfg.settings == { }
&& cfg.widgets == [ ]
);
configDir = if managedConfig then "/etc/homepage-dashboard" else "/var/lib/homepage-dashboard";
msg =
"using unmanaged configuration for homepage-dashboard is deprecated and will be removed"
+ " in 24.05. please see the NixOS documentation for `services.homepage-dashboard' and add"
+ " your bookmarks, services, widgets, and other configuration using the options provided.";
in
lib.mkIf cfg.enable {
warnings = lib.optional (!managedConfig) msg;
environment.etc = lib.mkIf managedConfig {
"homepage-dashboard/custom.css".text = cfg.customCSS;
"homepage-dashboard/custom.js".text = cfg.customJS;
"homepage-dashboard/bookmarks.yaml".source = settingsFormat.generate "bookmarks.yaml" cfg.bookmarks;
"homepage-dashboard/docker.yaml".source = settingsFormat.generate "docker.yaml" cfg.docker;
"homepage-dashboard/kubernetes.yaml".source =
settingsFormat.generate "kubernetes.yaml" cfg.kubernetes;
"homepage-dashboard/services.yaml".source = settingsFormat.generate "services.yaml" cfg.services;
"homepage-dashboard/settings.yaml".source = settingsFormat.generate "settings.yaml" cfg.settings;
"homepage-dashboard/widgets.yaml".source = settingsFormat.generate "widgets.yaml" cfg.widgets;
};
systemd.services.homepage-dashboard = {
description = "Homepage Dashboard";
after = [ "network.target" ];
wantedBy = [ "multi-user.target" ];
environment = {
HOMEPAGE_CONFIG_DIR = configDir;
NIXPKGS_HOMEPAGE_CACHE_DIR = "/var/cache/homepage-dashboard";
PORT = toString cfg.listenPort;
LOG_TARGETS = lib.mkIf managedConfig "stdout";
};
serviceConfig = {
Type = "simple";
DynamicUser = true;
EnvironmentFile = lib.mkIf (cfg.environmentFile != null) cfg.environmentFile;
StateDirectory = lib.mkIf (!managedConfig) "homepage-dashboard";
CacheDirectory = "homepage-dashboard";
ExecStart = lib.getExe cfg.package;
Restart = "on-failure";
};
enableStrictShellChecks = true;
preStart = ''
# Related:
# * https://github.com/NixOS/nixpkgs/issues/346016 ("homepage-dashboard: cache dir is not cleared upon version upgrade")
# * https://github.com/gethomepage/homepage/discussions/4560 ("homepage NixOS package does not clear cache on upgrade leaving broken state")
# * https://github.com/vercel/next.js/discussions/58864 ("Feature Request: Allow configuration of cache dir")
rm -rf "''${NIXPKGS_HOMEPAGE_CACHE_DIR:?}"/*
'';
};
networking.firewall = lib.mkIf cfg.openFirewall {
allowedTCPPorts = [ cfg.listenPort ];
};
config = lib.mkIf cfg.enable {
environment.etc = {
"homepage-dashboard/custom.css".text = cfg.customCSS;
"homepage-dashboard/custom.js".text = cfg.customJS;
"homepage-dashboard/bookmarks.yaml".source = settingsFormat.generate "bookmarks.yaml" cfg.bookmarks;
"homepage-dashboard/docker.yaml".source = settingsFormat.generate "docker.yaml" cfg.docker;
"homepage-dashboard/kubernetes.yaml".source =
settingsFormat.generate "kubernetes.yaml" cfg.kubernetes;
"homepage-dashboard/services.yaml".source = settingsFormat.generate "services.yaml" cfg.services;
"homepage-dashboard/settings.yaml".source = settingsFormat.generate "settings.yaml" cfg.settings;
"homepage-dashboard/widgets.yaml".source = settingsFormat.generate "widgets.yaml" cfg.widgets;
};
systemd.services.homepage-dashboard = {
description = "Homepage Dashboard";
after = [ "network.target" ];
wantedBy = [ "multi-user.target" ];
environment = {
HOMEPAGE_CONFIG_DIR = "/etc/homepage-dashboard";
NIXPKGS_HOMEPAGE_CACHE_DIR = "/var/cache/homepage-dashboard";
PORT = toString cfg.listenPort;
LOG_TARGETS = "stdout";
};
serviceConfig = {
Type = "simple";
DynamicUser = true;
EnvironmentFile = lib.mkIf (cfg.environmentFile != null) cfg.environmentFile;
StateDirectory = "homepage-dashboard";
CacheDirectory = "homepage-dashboard";
ExecStart = lib.getExe cfg.package;
Restart = "on-failure";
};
# Related:
# * https://github.com/NixOS/nixpkgs/issues/346016 ("homepage-dashboard: cache dir is not cleared upon version upgrade")
# * https://github.com/gethomepage/homepage/discussions/4560 ("homepage NixOS package does not clear cache on upgrade leaving broken state")
# * https://github.com/vercel/next.js/discussions/58864 ("Feature Request: Allow configuration of cache dir")
preStart = ''
rm -rf "$NIXPKGS_HOMEPAGE_CACHE_DIR"/*
'';
};
networking.firewall = lib.mkIf cfg.openFirewall {
allowedTCPPorts = [ cfg.listenPort ];
};
};
}
@@ -51,6 +51,7 @@ let
cfg.provision.idmAdminPasswordFile
cfg.provision.adminPasswordFile
]
++ optional (cfg.provision.extraJsonFile != null) cfg.provision.extraJsonFile
++ mapAttrsToList (_: x: x.basicSecretFile) cfg.provision.systems.oauth2
);
secretDirectories = unique (
+11 -32
View File
@@ -4,46 +4,25 @@ import ./make-test-python.nix (
name = "homepage-dashboard";
meta.maintainers = with lib.maintainers; [ jnsgruk ];
nodes.unmanaged_conf =
{ pkgs, ... }:
{
services.homepage-dashboard.enable = true;
};
nodes.managed_conf =
{ pkgs, ... }:
{
services.homepage-dashboard = {
enable = true;
settings.title = "test title rodUsEagid"; # something random/unique
};
nodes.machine = _: {
services.homepage-dashboard = {
enable = true;
settings.title = "test title rodUsEagid"; # something random/unique
};
};
testScript = ''
# Ensure the services are started on unmanaged machine
unmanaged_conf.wait_for_unit("homepage-dashboard.service")
unmanaged_conf.wait_for_open_port(8082)
unmanaged_conf.succeed("curl --fail http://localhost:8082/")
# Ensure that /etc/homepage-dashboard doesn't exist, and boilerplate
# configs are copied into place.
unmanaged_conf.fail("test -d /etc/homepage-dashboard")
unmanaged_conf.succeed("test -f /var/lib/private/homepage-dashboard/settings.yaml")
# Ensure the services are started on managed machine
managed_conf.wait_for_unit("homepage-dashboard.service")
managed_conf.wait_for_open_port(8082)
managed_conf.succeed("curl --fail http://localhost:8082/")
machine.wait_for_unit("homepage-dashboard.service")
machine.wait_for_open_port(8082)
machine.succeed("curl --fail http://localhost:8082/")
# Ensure /etc/homepage-dashboard is created and unmanaged conf location isn't.
managed_conf.succeed("test -d /etc/homepage-dashboard")
managed_conf.fail("test -f /var/lib/private/homepage-dashboard/settings.yaml")
# Ensure /etc/homepage-dashboard is created.
machine.succeed("test -d /etc/homepage-dashboard")
# Ensure that we see the custom title *only in the managed config*
page = managed_conf.succeed("curl --fail http://localhost:8082/")
page = machine.succeed("curl --fail http://localhost:8082/")
assert "test title rodUsEagid" in page, "Custom title not found"
page = unmanaged_conf.succeed("curl --fail http://localhost:8082/")
assert "test title rodUsEagid" not in page, "Custom title found where it shouldn't be"
'';
}
)
+4
View File
@@ -306,6 +306,10 @@ import ./make-test-python.nix (
provision.succeed('${specialisations}/credentialProvision/bin/switch-to-configuration test')
provision_login("${provisionIdmAdminPassword}")
# Make sure neither password is logged
provision.fail("journalctl --since -10m --unit kanidm.service --grep '${provisionAdminPassword}'")
provision.fail("journalctl --since -10m --unit kanidm.service --grep '${provisionIdmAdminPassword}'")
# Test provisioned admin pw
out = provision.succeed("KANIDM_PASSWORD=${provisionAdminPassword} kanidm login -D admin")
assert_contains(out, "Login Success for admin")
@@ -43,26 +43,26 @@
"goland": {
"update-channel": "GoLand RELEASE",
"url-template": "https://download.jetbrains.com/go/goland-{version}.tar.gz",
"version": "2024.3.4",
"sha256": "f474f1f19fb04f7de73596c51b49f2675b3fc11df6a7aaba325c3ad98477d1df",
"url": "https://download.jetbrains.com/go/goland-2024.3.4.tar.gz",
"build_number": "243.25659.52"
"version": "2024.3.5",
"sha256": "d59f537fb8d9c741a704605ec00c4b4230211301cd0609c73c66d5edb4eb9340",
"url": "https://download.jetbrains.com/go/goland-2024.3.5.tar.gz",
"build_number": "243.26053.20"
},
"idea-community": {
"update-channel": "IntelliJ IDEA RELEASE",
"url-template": "https://download.jetbrains.com/idea/ideaIC-{version}.tar.gz",
"version": "2024.3.4.1",
"sha256": "3eefea10391fdeaaf19ba6d00ee8c7f174a4feb5261394c4d3454d1cf0f5826b",
"url": "https://download.jetbrains.com/idea/ideaIC-2024.3.4.1.tar.gz",
"build_number": "243.25659.59"
"version": "2024.3.5",
"sha256": "8a287528d830e6cdec2ded13c974c39a35b7555243c22d8b83113c96c26630aa",
"url": "https://download.jetbrains.com/idea/ideaIC-2024.3.5.tar.gz",
"build_number": "243.26053.27"
},
"idea-ultimate": {
"update-channel": "IntelliJ IDEA RELEASE",
"url-template": "https://download.jetbrains.com/idea/ideaIU-{version}.tar.gz",
"version": "2024.3.4.1",
"sha256": "e9b5b868e425aa1255d75f85028e7ba6275bb8aab88781e960c2c7c34f2173e8",
"url": "https://download.jetbrains.com/idea/ideaIU-2024.3.4.1.tar.gz",
"build_number": "243.25659.59"
"version": "2024.3.5",
"sha256": "f8e8e864f4fedddf1d366a7db23fc4132192c3a6029c614a382186ff564a78a1",
"url": "https://download.jetbrains.com/idea/ideaIU-2024.3.5.tar.gz",
"build_number": "243.26053.27"
},
"mps": {
"update-channel": "MPS RELEASE",
@@ -75,27 +75,27 @@
"phpstorm": {
"update-channel": "PhpStorm RELEASE",
"url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}.tar.gz",
"version": "2024.3.4",
"sha256": "9344d68dda2c0062d9f6f03e27e959346f2f2bba2bce9f1c108653090d2dfb85",
"url": "https://download.jetbrains.com/webide/PhpStorm-2024.3.4.tar.gz",
"build_number": "243.25659.45",
"version": "2024.3.5",
"sha256": "e12efb584eb9b632703d1bee9986d95ac09aceaf76ca40e9188d82b713ff0fc1",
"url": "https://download.jetbrains.com/webide/PhpStorm-2024.3.5.tar.gz",
"build_number": "243.26053.13",
"version-major-minor": "2022.3"
},
"pycharm-community": {
"update-channel": "PyCharm RELEASE",
"url-template": "https://download.jetbrains.com/python/pycharm-community-{version}.tar.gz",
"version": "2024.3.4",
"sha256": "c61dd7aa1b5f9c6f7a0943aeec79c56d0aa0f5ed29591b7eb3007169e2545621",
"url": "https://download.jetbrains.com/python/pycharm-community-2024.3.4.tar.gz",
"build_number": "243.25659.43"
"version": "2024.3.5",
"sha256": "e8d5aa2a05d35e3cb3cd186d446242c191d03b3d0556b160b6875a830c91cc2b",
"url": "https://download.jetbrains.com/python/pycharm-community-2024.3.5.tar.gz",
"build_number": "243.26053.29"
},
"pycharm-professional": {
"update-channel": "PyCharm RELEASE",
"url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}.tar.gz",
"version": "2024.3.4",
"sha256": "793bfdcbe38251678bc2fe07a026a594efa5af459137fb70dd786edb340c6430",
"url": "https://download.jetbrains.com/python/pycharm-professional-2024.3.4.tar.gz",
"build_number": "243.25659.43"
"version": "2024.3.5",
"sha256": "dbfbdbd2627bcf5de85673151f3d3b79b12fa373d8c0d7942f40bba3aa397ea3",
"url": "https://download.jetbrains.com/python/pycharm-professional-2024.3.5.tar.gz",
"build_number": "243.26053.29"
},
"rider": {
"update-channel": "Rider RELEASE",
@@ -108,26 +108,26 @@
"ruby-mine": {
"update-channel": "RubyMine RELEASE",
"url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}.tar.gz",
"version": "2024.3.4",
"sha256": "9454aaf0877516b2047bc21517b5459860bdb4cbc797d66612760a336c011ee3",
"url": "https://download.jetbrains.com/ruby/RubyMine-2024.3.4.tar.gz",
"build_number": "243.25659.41"
"version": "2024.3.5",
"sha256": "e5fb7daa24307927cfd329340956b4cae1e0f3bb011841834519c4342428d38b",
"url": "https://download.jetbrains.com/ruby/RubyMine-2024.3.5.tar.gz",
"build_number": "243.26053.19"
},
"rust-rover": {
"update-channel": "RustRover RELEASE",
"url-template": "https://download.jetbrains.com/rustrover/RustRover-{version}.tar.gz",
"version": "2024.3.6",
"sha256": "c4373d591eabcfdca4e8e5f635d9007855ac8a32baf4aac26e189d6415f6df9f",
"url": "https://download.jetbrains.com/rustrover/RustRover-2024.3.6.tar.gz",
"build_number": "243.25659.54"
"version": "2024.3.7",
"sha256": "aec79e12c16082d364617dab83ec63980fddbd66c5734573499b000733c508ad",
"url": "https://download.jetbrains.com/rustrover/RustRover-2024.3.7.tar.gz",
"build_number": "243.26053.17"
},
"webstorm": {
"update-channel": "WebStorm RELEASE",
"url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}.tar.gz",
"version": "2024.3.4",
"sha256": "206a5e6b6fd3e603d62a7bbb26b0bf3b7ff7939b3e0cd136d360cdb80ec455f8",
"url": "https://download.jetbrains.com/webstorm/WebStorm-2024.3.4.tar.gz",
"build_number": "243.25659.40"
"version": "2024.3.5",
"sha256": "da587d7ca3ebb08f067143e4a6b35f1aa133aa10af7fc365496838006fcd1aed",
"url": "https://download.jetbrains.com/webstorm/WebStorm-2024.3.5.tar.gz",
"build_number": "243.26053.12"
},
"writerside": {
"update-channel": "Writerside EAP",
@@ -182,26 +182,26 @@
"goland": {
"update-channel": "GoLand RELEASE",
"url-template": "https://download.jetbrains.com/go/goland-{version}-aarch64.tar.gz",
"version": "2024.3.4",
"sha256": "9e1a8921c92e3cd396d81f9a8011ed279d303565fe69b8c2322dedf9a6164643",
"url": "https://download.jetbrains.com/go/goland-2024.3.4-aarch64.tar.gz",
"build_number": "243.25659.52"
"version": "2024.3.5",
"sha256": "12236e5b82e99ce27925567afe049e3ce298b083b764b75ffb67b5b7b8072e61",
"url": "https://download.jetbrains.com/go/goland-2024.3.5-aarch64.tar.gz",
"build_number": "243.26053.20"
},
"idea-community": {
"update-channel": "IntelliJ IDEA RELEASE",
"url-template": "https://download.jetbrains.com/idea/ideaIC-{version}-aarch64.tar.gz",
"version": "2024.3.4.1",
"sha256": "8b6a175a671295fe5095904e4aab5e9b91ff699cb691c5d6f3faadb8b9fd1037",
"url": "https://download.jetbrains.com/idea/ideaIC-2024.3.4.1-aarch64.tar.gz",
"build_number": "243.25659.59"
"version": "2024.3.5",
"sha256": "43b3ac68c07b611baa12bd70adc188b7be81d79b0b3a232aad582df2ffeb2598",
"url": "https://download.jetbrains.com/idea/ideaIC-2024.3.5-aarch64.tar.gz",
"build_number": "243.26053.27"
},
"idea-ultimate": {
"update-channel": "IntelliJ IDEA RELEASE",
"url-template": "https://download.jetbrains.com/idea/ideaIU-{version}-aarch64.tar.gz",
"version": "2024.3.4.1",
"sha256": "a6245e6e1bef3062be5b06cf61bd2eb489e64c6c26f86040cb9c28e4c65e780b",
"url": "https://download.jetbrains.com/idea/ideaIU-2024.3.4.1-aarch64.tar.gz",
"build_number": "243.25659.59"
"version": "2024.3.5",
"sha256": "0f072350137540672fd4de19768175164a2497290098321dfefaaaff0097f524",
"url": "https://download.jetbrains.com/idea/ideaIU-2024.3.5-aarch64.tar.gz",
"build_number": "243.26053.27"
},
"mps": {
"update-channel": "MPS RELEASE",
@@ -214,27 +214,27 @@
"phpstorm": {
"update-channel": "PhpStorm RELEASE",
"url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}-aarch64.tar.gz",
"version": "2024.3.4",
"sha256": "061dcd7f2972d4d9efc74cce29950929e1fdd02531e1f6365551649c8a254b1a",
"url": "https://download.jetbrains.com/webide/PhpStorm-2024.3.4-aarch64.tar.gz",
"build_number": "243.25659.45",
"version": "2024.3.5",
"sha256": "a55b112177db464081139f6b9aec2a7c22b0f069dd70fdb1bfe56fa1a7f33aa4",
"url": "https://download.jetbrains.com/webide/PhpStorm-2024.3.5-aarch64.tar.gz",
"build_number": "243.26053.13",
"version-major-minor": "2022.3"
},
"pycharm-community": {
"update-channel": "PyCharm RELEASE",
"url-template": "https://download.jetbrains.com/python/pycharm-community-{version}-aarch64.tar.gz",
"version": "2024.3.4",
"sha256": "6cd540a586692f8784e0889ad83ce497eaf3052a3a319b9d53fa9594572409ee",
"url": "https://download.jetbrains.com/python/pycharm-community-2024.3.4-aarch64.tar.gz",
"build_number": "243.25659.43"
"version": "2024.3.5",
"sha256": "08fbe137d0153b92a639351e866c2218744517b6cfcf412abedfe1d6c9ad1bc4",
"url": "https://download.jetbrains.com/python/pycharm-community-2024.3.5-aarch64.tar.gz",
"build_number": "243.26053.29"
},
"pycharm-professional": {
"update-channel": "PyCharm RELEASE",
"url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}-aarch64.tar.gz",
"version": "2024.3.4",
"sha256": "d4755118db79ff68be149619a2e0b8d480dd56694de131228a7d5ebbd0f82240",
"url": "https://download.jetbrains.com/python/pycharm-professional-2024.3.4-aarch64.tar.gz",
"build_number": "243.25659.43"
"version": "2024.3.5",
"sha256": "53ce650a41fefb260a13cb96462857fc5abd98d7a02adf794cde7248e3cefbbb",
"url": "https://download.jetbrains.com/python/pycharm-professional-2024.3.5-aarch64.tar.gz",
"build_number": "243.26053.29"
},
"rider": {
"update-channel": "Rider RELEASE",
@@ -247,26 +247,26 @@
"ruby-mine": {
"update-channel": "RubyMine RELEASE",
"url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}-aarch64.tar.gz",
"version": "2024.3.4",
"sha256": "c63ca3230cecd887e9810500f466c51ee9d7430193f4feda315a6fdfc60c0447",
"url": "https://download.jetbrains.com/ruby/RubyMine-2024.3.4-aarch64.tar.gz",
"build_number": "243.25659.41"
"version": "2024.3.5",
"sha256": "72a331a3c04a3d9f8bf30ad0b5009d4634f0fdcf5becd6a9a5cd00a5728cd9d1",
"url": "https://download.jetbrains.com/ruby/RubyMine-2024.3.5-aarch64.tar.gz",
"build_number": "243.26053.19"
},
"rust-rover": {
"update-channel": "RustRover RELEASE",
"url-template": "https://download.jetbrains.com/rustrover/RustRover-{version}-aarch64.tar.gz",
"version": "2024.3.6",
"sha256": "e6ad574015ffc7f6392434634a5f3172e1ce94d96f10e8e94e9012f2ee770933",
"url": "https://download.jetbrains.com/rustrover/RustRover-2024.3.6-aarch64.tar.gz",
"build_number": "243.25659.54"
"version": "2024.3.7",
"sha256": "537cb7c23cf03a467d311ae00c07b9830f8a7e09807366488d75f84c573ac460",
"url": "https://download.jetbrains.com/rustrover/RustRover-2024.3.7-aarch64.tar.gz",
"build_number": "243.26053.17"
},
"webstorm": {
"update-channel": "WebStorm RELEASE",
"url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}-aarch64.tar.gz",
"version": "2024.3.4",
"sha256": "498efb5b3e79a0f71dc7f44f54a2155a17b5d53d8b7a71ae6aaef87abc59bfce",
"url": "https://download.jetbrains.com/webstorm/WebStorm-2024.3.4-aarch64.tar.gz",
"build_number": "243.25659.40"
"version": "2024.3.5",
"sha256": "fce5d5c2b8c5aacfabac60ff93b93d7c9a3239adcf8347b3deabd472ac1c1288",
"url": "https://download.jetbrains.com/webstorm/WebStorm-2024.3.5-aarch64.tar.gz",
"build_number": "243.26053.12"
},
"writerside": {
"update-channel": "Writerside EAP",
@@ -321,26 +321,26 @@
"goland": {
"update-channel": "GoLand RELEASE",
"url-template": "https://download.jetbrains.com/go/goland-{version}.dmg",
"version": "2024.3.4",
"sha256": "d621d2130f2f4b602c69a1d62c68112fcea189405ce1d7f6cbd75c7584ccf96c",
"url": "https://download.jetbrains.com/go/goland-2024.3.4.dmg",
"build_number": "243.25659.52"
"version": "2024.3.5",
"sha256": "08739696b428ee2964f314884edbabd6614e5b4ce1ec9021e9d336ee947bb944",
"url": "https://download.jetbrains.com/go/goland-2024.3.5.dmg",
"build_number": "243.26053.20"
},
"idea-community": {
"update-channel": "IntelliJ IDEA RELEASE",
"url-template": "https://download.jetbrains.com/idea/ideaIC-{version}.dmg",
"version": "2024.3.4.1",
"sha256": "bf4d88befcd445db19732d9c02d2db864196bbd6554fe4b54f80f8e1936e3993",
"url": "https://download.jetbrains.com/idea/ideaIC-2024.3.4.1.dmg",
"build_number": "243.25659.59"
"version": "2024.3.5",
"sha256": "94640287fb84238d766a52681083807a087ef28b5c9b66d31f4a7ae06f2bcb8a",
"url": "https://download.jetbrains.com/idea/ideaIC-2024.3.5.dmg",
"build_number": "243.26053.27"
},
"idea-ultimate": {
"update-channel": "IntelliJ IDEA RELEASE",
"url-template": "https://download.jetbrains.com/idea/ideaIU-{version}.dmg",
"version": "2024.3.4.1",
"sha256": "f4bf75679314b88aa6fe1c892175178498e3bc13583cb1380fa2cc12fab8acf1",
"url": "https://download.jetbrains.com/idea/ideaIU-2024.3.4.1.dmg",
"build_number": "243.25659.59"
"version": "2024.3.5",
"sha256": "8b50dd9783c6f8dde229606a4e2d1d0e4ce95f0db33502053ed957fd532bcc35",
"url": "https://download.jetbrains.com/idea/ideaIU-2024.3.5.dmg",
"build_number": "243.26053.27"
},
"mps": {
"update-channel": "MPS RELEASE",
@@ -353,27 +353,27 @@
"phpstorm": {
"update-channel": "PhpStorm RELEASE",
"url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}.dmg",
"version": "2024.3.4",
"sha256": "32c0e7faaeb6c90c25192688d9f03c888f7bb957c91796713783b41805c65956",
"url": "https://download.jetbrains.com/webide/PhpStorm-2024.3.4.dmg",
"build_number": "243.25659.45",
"version": "2024.3.5",
"sha256": "edb7d1ff3aa653f6f73ea2e6f907b026de8613cea3bdc2cb90c79257f387c2a6",
"url": "https://download.jetbrains.com/webide/PhpStorm-2024.3.5.dmg",
"build_number": "243.26053.13",
"version-major-minor": "2022.3"
},
"pycharm-community": {
"update-channel": "PyCharm RELEASE",
"url-template": "https://download.jetbrains.com/python/pycharm-community-{version}.dmg",
"version": "2024.3.4",
"sha256": "468914b3f03f8df651a9ac48df163b1fdee2b7f33ab64a71bed899da5427feab",
"url": "https://download.jetbrains.com/python/pycharm-community-2024.3.4.dmg",
"build_number": "243.25659.43"
"version": "2024.3.5",
"sha256": "25d01d39d7e5f1d658548dadee4cd4972f25d60a8c10da3cb482a99c8e3181d3",
"url": "https://download.jetbrains.com/python/pycharm-community-2024.3.5.dmg",
"build_number": "243.26053.29"
},
"pycharm-professional": {
"update-channel": "PyCharm RELEASE",
"url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}.dmg",
"version": "2024.3.4",
"sha256": "7441c8878953c6e46177d9a99d09b328f7c2d493b4f1967ea67276f2f8f9f025",
"url": "https://download.jetbrains.com/python/pycharm-professional-2024.3.4.dmg",
"build_number": "243.25659.43"
"version": "2024.3.5",
"sha256": "d98e90eccec085c467a547a7ee31ab6611479ea991fe7b99e41e81f491cfeeff",
"url": "https://download.jetbrains.com/python/pycharm-professional-2024.3.5.dmg",
"build_number": "243.26053.29"
},
"rider": {
"update-channel": "Rider RELEASE",
@@ -386,26 +386,26 @@
"ruby-mine": {
"update-channel": "RubyMine RELEASE",
"url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}.dmg",
"version": "2024.3.4",
"sha256": "8cb255a6b66f77c5233cb2dd4c47cd4c8564c48cee3b1bb40128677a93cc39c8",
"url": "https://download.jetbrains.com/ruby/RubyMine-2024.3.4.dmg",
"build_number": "243.25659.41"
"version": "2024.3.5",
"sha256": "fb9f10ef6c0e5741bcd35abf148133002d92865899e4a98a276be64ff88b9688",
"url": "https://download.jetbrains.com/ruby/RubyMine-2024.3.5.dmg",
"build_number": "243.26053.19"
},
"rust-rover": {
"update-channel": "RustRover RELEASE",
"url-template": "https://download.jetbrains.com/rustrover/RustRover-{version}.dmg",
"version": "2024.3.6",
"sha256": "ebcec89bbb05a3c6d2626bd5692bd1a45732f28108c9a0eaad0a19bbf463acc6",
"url": "https://download.jetbrains.com/rustrover/RustRover-2024.3.6.dmg",
"build_number": "243.25659.54"
"version": "2024.3.7",
"sha256": "1326cfb150170e69c2fe62c4f7ff131d90117da3ee07b5e6134e46d44822fba0",
"url": "https://download.jetbrains.com/rustrover/RustRover-2024.3.7.dmg",
"build_number": "243.26053.17"
},
"webstorm": {
"update-channel": "WebStorm RELEASE",
"url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}.dmg",
"version": "2024.3.4",
"sha256": "337f80f0a5a9179b64ac4552a89ffc93a1e3f1b5c8a1b94a04a9cad9d0d18808",
"url": "https://download.jetbrains.com/webstorm/WebStorm-2024.3.4.dmg",
"build_number": "243.25659.40"
"version": "2024.3.5",
"sha256": "6d7d3c7883f1344a08d39c4060dcd32c28039d7217549c88d703e65517be7898",
"url": "https://download.jetbrains.com/webstorm/WebStorm-2024.3.5.dmg",
"build_number": "243.26053.12"
},
"writerside": {
"update-channel": "Writerside EAP",
@@ -460,26 +460,26 @@
"goland": {
"update-channel": "GoLand RELEASE",
"url-template": "https://download.jetbrains.com/go/goland-{version}-aarch64.dmg",
"version": "2024.3.4",
"sha256": "4c5e5f50b9209f673ed165c4c1fcb1bc88f4fd3ab2f4ad9740bc8855bb6f4e22",
"url": "https://download.jetbrains.com/go/goland-2024.3.4-aarch64.dmg",
"build_number": "243.25659.52"
"version": "2024.3.5",
"sha256": "7f3503352d47551c68818b288938fdb01ebd35d56153f6ed560058b19397796c",
"url": "https://download.jetbrains.com/go/goland-2024.3.5-aarch64.dmg",
"build_number": "243.26053.20"
},
"idea-community": {
"update-channel": "IntelliJ IDEA RELEASE",
"url-template": "https://download.jetbrains.com/idea/ideaIC-{version}-aarch64.dmg",
"version": "2024.3.4.1",
"sha256": "5b8681be2c39c2bbbff143aea27161a5f69c72daf6e88d6f320867bbf7c51659",
"url": "https://download.jetbrains.com/idea/ideaIC-2024.3.4.1-aarch64.dmg",
"build_number": "243.25659.59"
"version": "2024.3.5",
"sha256": "b96b9fa3de829f0d5e98aa73766b3da4909186a464e3f8e7b8b3c975f1b0978b",
"url": "https://download.jetbrains.com/idea/ideaIC-2024.3.5-aarch64.dmg",
"build_number": "243.26053.27"
},
"idea-ultimate": {
"update-channel": "IntelliJ IDEA RELEASE",
"url-template": "https://download.jetbrains.com/idea/ideaIU-{version}-aarch64.dmg",
"version": "2024.3.4.1",
"sha256": "ac323f3d011e826cc37d88d99585d28092703abfc464cabc3c033bb85ae86c65",
"url": "https://download.jetbrains.com/idea/ideaIU-2024.3.4.1-aarch64.dmg",
"build_number": "243.25659.59"
"version": "2024.3.5",
"sha256": "8cf632fbb89e6dfbd2a536643450e6ae6671001348461260fe0132ed14ef3d0c",
"url": "https://download.jetbrains.com/idea/ideaIU-2024.3.5-aarch64.dmg",
"build_number": "243.26053.27"
},
"mps": {
"update-channel": "MPS RELEASE",
@@ -492,27 +492,27 @@
"phpstorm": {
"update-channel": "PhpStorm RELEASE",
"url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}-aarch64.dmg",
"version": "2024.3.4",
"sha256": "9f5586b202165002f8ecbb6b6ffa332d6116c605eb487e49d50ba4d6b68b8785",
"url": "https://download.jetbrains.com/webide/PhpStorm-2024.3.4-aarch64.dmg",
"build_number": "243.25659.45",
"version": "2024.3.5",
"sha256": "439aea4e8f919701b058f619dc545ac5207bd2b340b9f1925281a7fe0747fbd6",
"url": "https://download.jetbrains.com/webide/PhpStorm-2024.3.5-aarch64.dmg",
"build_number": "243.26053.13",
"version-major-minor": "2022.3"
},
"pycharm-community": {
"update-channel": "PyCharm RELEASE",
"url-template": "https://download.jetbrains.com/python/pycharm-community-{version}-aarch64.dmg",
"version": "2024.3.4",
"sha256": "b8f585ff95cfa31a97db3ba98ff84843455b0a89790ea4abbcc8da05c6fa6f4d",
"url": "https://download.jetbrains.com/python/pycharm-community-2024.3.4-aarch64.dmg",
"build_number": "243.25659.43"
"version": "2024.3.5",
"sha256": "444edd06334a6b35964995b9af8ba998514eb1355f6035b905ec57e1a0ff7320",
"url": "https://download.jetbrains.com/python/pycharm-community-2024.3.5-aarch64.dmg",
"build_number": "243.26053.29"
},
"pycharm-professional": {
"update-channel": "PyCharm RELEASE",
"url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}-aarch64.dmg",
"version": "2024.3.4",
"sha256": "243d94467cfaeccbfcb21976d2bcf262beb31a9d52bb2cf8c6ab998987e4e49c",
"url": "https://download.jetbrains.com/python/pycharm-professional-2024.3.4-aarch64.dmg",
"build_number": "243.25659.43"
"version": "2024.3.5",
"sha256": "d92332e6b120669f7f9aded84b82b6c7a64c2512537faf623122e7f2505bbab1",
"url": "https://download.jetbrains.com/python/pycharm-professional-2024.3.5-aarch64.dmg",
"build_number": "243.26053.29"
},
"rider": {
"update-channel": "Rider RELEASE",
@@ -525,26 +525,26 @@
"ruby-mine": {
"update-channel": "RubyMine RELEASE",
"url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}-aarch64.dmg",
"version": "2024.3.4",
"sha256": "7d93ff5df263a1526c0cb901e6df2abee547f9e9116f355cfc13a93a20b8ea4a",
"url": "https://download.jetbrains.com/ruby/RubyMine-2024.3.4-aarch64.dmg",
"build_number": "243.25659.41"
"version": "2024.3.5",
"sha256": "e7f12eeb72b3421108b8aafb03c4603b74e6ac8922dc192f2a2d5bb5811d4d48",
"url": "https://download.jetbrains.com/ruby/RubyMine-2024.3.5-aarch64.dmg",
"build_number": "243.26053.19"
},
"rust-rover": {
"update-channel": "RustRover RELEASE",
"url-template": "https://download.jetbrains.com/rustrover/RustRover-{version}-aarch64.dmg",
"version": "2024.3.6",
"sha256": "f45da1a104b972697808d93508645269229c52fe7561ef79f2865459c259ebf8",
"url": "https://download.jetbrains.com/rustrover/RustRover-2024.3.6-aarch64.dmg",
"build_number": "243.25659.54"
"version": "2024.3.7",
"sha256": "e7d1f13d54637202dcf7a54a2f273b7d9fdc251ae6573df6316fc23dcc8611f2",
"url": "https://download.jetbrains.com/rustrover/RustRover-2024.3.7-aarch64.dmg",
"build_number": "243.26053.17"
},
"webstorm": {
"update-channel": "WebStorm RELEASE",
"url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}-aarch64.dmg",
"version": "2024.3.4",
"sha256": "7e7745429e3541bd6cfaffda84aba4bcfe252db5cf93c7b2e2c75205217af57a",
"url": "https://download.jetbrains.com/webstorm/WebStorm-2024.3.4-aarch64.dmg",
"build_number": "243.25659.40"
"version": "2024.3.5",
"sha256": "67f1898fcf936f22842a669ebe1cc746d8ae9069086dcf66efa2d86d73e78d5c",
"url": "https://download.jetbrains.com/webstorm/WebStorm-2024.3.5-aarch64.dmg",
"build_number": "243.26053.12"
},
"writerside": {
"update-channel": "Writerside EAP",
File diff suppressed because it is too large Load Diff
@@ -11,7 +11,7 @@ vscode-utils.buildVscodeMarketplaceExtension {
name = "tinymist";
publisher = "myriad-dreamin";
inherit (tinymist) version;
hash = "sha256-OB+e4lerPONs7QDqHJO3pqU1yQ3BvM2k+Tz998ibmHo=";
hash = "sha256-7GoFmflHaHXpw0ijX7YGBKewV+HmRhcm4eTYVgCYLHY=";
};
nativeBuildInputs = [
@@ -65,12 +65,11 @@
withMoonlight ? false,
moonlight,
withTTS ? true,
enableAutoscroll ? false,
}:
assert lib.assertMsg (
!(withMoonlight && withVencord)
) "discord: Moonlight and Vencord can not be enabled at the same time";
let
disableBreakingUpdates =
runCommand "disable-breaking-updates.py"
@@ -86,7 +85,6 @@ let
chmod +x $out/bin/disable-breaking-updates.py
'';
in
stdenv.mkDerivation rec {
inherit
pname
@@ -176,6 +174,7 @@ stdenv.mkDerivation rec {
"''${gappsWrapperArgs[@]}" \
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \
${lib.strings.optionalString withTTS "--add-flags \"--enable-speech-dispatcher\""} \
${lib.strings.optionalString enableAutoscroll "--add-flags \"--enable-blink-features=MiddleClickAutoscroll\""} \
--prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/" \
--prefix LD_LIBRARY_PATH : ${libPath}:$out/opt/${binaryName} \
--run "${lib.getExe disableBreakingUpdates}"
@@ -10,13 +10,13 @@
}:
buildLua {
pname = "videoclip";
version = "0-unstable-2024-08-20";
version = "0-unstable-2025-03-10";
src = fetchFromGitHub {
owner = "Ajatt-Tools";
repo = "videoclip";
rev = "249122d245bc5ec2a0687346af730b1cc2273b21";
hash = "sha256-VSMFddi8Lvmipo8Un79v+LXGNiKeaSxHQ44HddJgTkE=";
rev = "785eb86bc080c445e8feb947d7caa8f3a097bf2b";
hash = "sha256-oanc9MggMjVDrSW42XrQwwWw2YTrifiCVrg/r42oGx8=";
};
patchPhase =
+12
View File
@@ -28,6 +28,18 @@ stdenv.mkDerivation rec {
# patch is in CVS diff format, add 'a/' prefix
extraPrefix = "";
})
# https://sourceforge.net/p/aewan/bugs/14/
(fetchpatch {
url = "https://sourceforge.net/p/aewan/bugs/14/attachment/aewan-1.0.01-fix-incompatible-function-pointer-types.patch";
sha256 = "sha256-NlnsOe/OCMXCrehBq20e0KOMcWt5rUv9fIvu9eoOMqw=";
})
# https://sourceforge.net/p/aewan/bugs/16/
(fetchpatch {
url = "https://sourceforge.net/p/aewan/bugs/16/attachment/implicit-function-declaration.patch";
sha256 = "sha256-RWFJRDaYoiQySkB2L09JHSX90zgIJ9q16IrPhg03Ruc=";
# patch is in CVS diff format, add 'a/' prefix
extraPrefix = "";
})
];
buildInputs = [
+3 -3
View File
@@ -9,20 +9,20 @@
}:
let
version = "2025.1.4";
version = "2025.1.5";
product =
if proEdition then
{
productName = "pro";
productDesktop = "Burp Suite Professional Edition";
hash = "sha256-NpWqrdUaxPvU4O2MplLTRfnqOB2yC/zQJx7o9stjKCU=";
hash = "sha256-QTYeiM2hyZpvSu5oE2wrNrF3qFkp4JJnQftOg3BJqZA=";
}
else
{
productName = "community";
productDesktop = "Burp Suite Community Edition";
hash = "sha256-jLwI9r1l/bf2R7BOImEnbW3iLgsF+/1n0/N55Jx8Lzw=";
hash = "sha256-vIcBRsylS+ftSq5x0HDe6Zb8dtVUtWw6hENBITYmzyQ=";
};
src = fetchurl {
+2 -2
View File
@@ -6,13 +6,13 @@
buildGoModule rec {
pname = "cdncheck";
version = "1.1.9";
version = "1.1.11";
src = fetchFromGitHub {
owner = "projectdiscovery";
repo = "cdncheck";
tag = "v${version}";
hash = "sha256-p03OQAA/6WX2RJfnpFi9PYvVTBwBJX2bWxbDg+anybI=";
hash = "sha256-sCTVDz9dqlTJ7MoJfFYmEnA2KkpWzu6qune90SXmgN4=";
};
vendorHash = "sha256-/1REkZ5+sz/H4T4lXhloz7fu5cLv1GoaD3dlttN+Qd4=";
+2 -2
View File
@@ -10,13 +10,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "cli11";
version = "2.4.2";
version = "2.5.0";
src = fetchFromGitHub {
owner = "CLIUtils";
repo = "CLI11";
rev = "v${finalAttrs.version}";
hash = "sha256-BLjGKN/UQIPVFlZaJ2VxTLFfY6otpJZ6HqfLtt5+r88=";
hash = "sha256-73dfpZDnKl0cADM4LTP3/eDFhwCdiHbEaGRF7ZyWsdQ=";
};
buildInputs = [ catch2 ];
+3 -3
View File
@@ -8,17 +8,17 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "clorinde";
version = "0.13.2";
version = "0.14.0";
src = fetchFromGitHub {
owner = "halcyonnouveau";
repo = "clorinde";
tag = "clorinde-v${finalAttrs.version}";
hash = "sha256-rjpNeRrRiLIWcKvkmnyGF6hhm1CLBEKovvLaMKwtKmk=";
hash = "sha256-C9oxdvZKQTZQYQmMpcyxRH9+o2pv3gVpSEmwxYn2E+g=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-kyRhBDG4QRC6UcDqn+yzCLGuZHbNpKhl9QegTma6qDI=";
cargoHash = "sha256-Arp/5lgccSNblrRrK7oVrsQe3h6sQz3sHITMoN8Ehzc=";
cargoBuildFlags = [ "--package=clorinde" ];
+33 -23
View File
@@ -3,48 +3,50 @@
stdenv,
fetchFromGitHub,
rustPlatform,
libcosmicAppHook,
just,
pkg-config,
udev,
util-linuxMinimal,
dbus,
glib,
libinput,
libxkbcommon,
pulseaudio,
wayland,
udev,
xkeyboard_config,
nix-update-script,
}:
rustPlatform.buildRustPackage rec {
rustPlatform.buildRustPackage (finalAttrs: {
pname = "cosmic-applets";
version = "1.0.0-alpha.1";
version = "1.0.0-alpha.6";
src = fetchFromGitHub {
owner = "pop-os";
repo = "cosmic-applets";
rev = "epoch-${version}";
hash = "sha256-4KaMG7sKaiJDIlP101/6YDHDwKRqJXHdqotNZlPhv8Q=";
tag = "epoch-${finalAttrs.version}";
hash = "sha256-kRj2hEtE8FYky9Fn8hgHBo+UwWjOoS7/ROh9qz/0Vzs=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-f5OV//qzWQqIvq8BNtd2H1dWl7aqR0WJwmdimL4wcKQ=";
cargoHash = "sha256-jADtvhMzWdJydT1T14PSk4ggZpWIcXiOK0TW2llKeos=";
nativeBuildInputs = [
just
pkg-config
util-linuxMinimal
libcosmicAppHook
];
buildInputs = [
dbus
glib
libinput
libxkbcommon
pulseaudio
wayland
udev
];
dontUseJustBuild = true;
dontUseJustCheck = true;
justFlags = [
"--set"
@@ -55,23 +57,31 @@ rustPlatform.buildRustPackage rec {
"${stdenv.hostPlatform.rust.cargoShortTarget}/release"
];
# Force linking to libwayland-client, which is always dlopen()ed.
"CARGO_TARGET_${stdenv.hostPlatform.rust.cargoEnvVarTarget}_RUSTFLAGS" =
map (a: "-C link-arg=${a}")
[
"-Wl,--push-state,--no-as-needed"
"-lwayland-client"
"-Wl,--pop-state"
];
preFixup = ''
libcosmicAppWrapperArgs+=(
--set-default X11_BASE_RULES_XML ${xkeyboard_config}/share/X11/xkb/rules/base.xml
--set-default X11_EXTRA_RULES_XML ${xkeyboard_config}/share/X11/xkb/rules/base.extras.xml
)
'';
meta = with lib; {
passthru.updateScript = nix-update-script {
extraArgs = [
"--version"
"unstable"
"--version-regex"
"epoch-(.*)"
];
};
meta = {
homepage = "https://github.com/pop-os/cosmic-applets";
description = "Applets for the COSMIC Desktop Environment";
license = licenses.gpl3Only;
maintainers = with maintainers; [
license = lib.licenses.gpl3Only;
maintainers = with lib.maintainers; [
qyliss
nyabinary
HeitorAugustoLN
];
platforms = platforms.linux;
platforms = lib.platforms.linux;
};
}
})
+21 -10
View File
@@ -1,32 +1,43 @@
{
lib,
fetchFromGitHub,
stdenv,
fetchFromGitHub,
wayland-scanner,
nix-update-script,
}:
stdenv.mkDerivation {
pname = "cosmic-protocols";
version = "0-unstable-2024-07-31";
version = "0-unstable-2025-03-05";
src = fetchFromGitHub {
owner = "pop-os";
repo = "cosmic-protocols";
rev = "de2fead49d6af3a221db153642e4d7c2235aafc4";
hash = "sha256-qgo8FMKo/uCbhUjfykRRN8KSavbyhZpu82M8npLcIPI=";
rev = "6b05c2a157118979cb472a38455ba78ca9729196";
hash = "sha256-ozyReur1jjMl8fDUrdWbgcKedf+RDH5xCRsmEcnPQ9U=";
};
makeFlags = [ "PREFIX=${placeholder "out"}" ];
nativeBuildInputs = [ wayland-scanner ];
meta = with lib; {
passthru.updateScript = nix-update-script {
extraArgs = [
"--version"
"branch=HEAD"
];
};
meta = {
homepage = "https://github.com/pop-os/cosmic-protocols";
description = "Additional wayland-protocols used by the COSMIC desktop environment";
license = [
licenses.mit
licenses.gpl3Only
license = with lib.licenses; [
mit
gpl3Only
];
maintainers = with maintainers; [ nyabinary ];
platforms = platforms.linux;
maintainers = with lib.maintainers; [
nyabinary
HeitorAugustoLN
];
platforms = lib.platforms.linux;
};
}
@@ -1,64 +1,68 @@
{
lib,
stdenv,
rustPlatform,
fetchFromGitHub,
libcosmicAppHook,
pkg-config,
libxkbcommon,
libinput,
libglvnd,
libgbm,
udev,
wayland,
nix-update-script,
}:
rustPlatform.buildRustPackage rec {
rustPlatform.buildRustPackage (finalAttrs: {
pname = "cosmic-workspaces-epoch";
version = "1.0.0-alpha.5.1";
version = "1.0.0-alpha.6";
src = fetchFromGitHub {
owner = "pop-os";
repo = "cosmic-workspaces-epoch";
rev = "epoch-${version}";
hash = "sha256-lAK7DZWwNMr30u6Uopew9O/6FIG6e2SgcdA+cD/K5Ok=";
tag = "epoch-${finalAttrs.version}";
hash = "sha256-3jivE0EaSddPxMYn9DDaYUMafPf60XeCwVeQegbt++c=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-w1lQdzy2mJ5NfqngvOLqFCxyhWgvIySDDXCCtCCtTjg=";
cargoHash = "sha256-l5y9bOG/h24EfiAFfVKjtzYCzjxU2TI8wh6HBUwoVcE=";
separateDebugInfo = true;
nativeBuildInputs = [ pkg-config ];
nativeBuildInputs = [
pkg-config
libcosmicAppHook
];
buildInputs = [
libxkbcommon
libinput
libglvnd
libgbm
udev
wayland
];
postInstall = ''
mkdir -p $out/share/{applications,icons/hicolor/scalable/apps}
cp data/*.desktop $out/share/applications/
cp data/*.svg $out/share/icons/hicolor/scalable/apps/
'';
dontCargoInstall = true;
# Force linking to libEGL, which is always dlopen()ed, and to
# libwayland-client, which is always dlopen()ed except by the
# obscure winit backend.
RUSTFLAGS = map (a: "-C link-arg=${a}") [
"-Wl,--push-state,--no-as-needed"
"-lEGL"
"-lwayland-client"
"-Wl,--pop-state"
makeFlags = [
"prefix=${placeholder "out"}"
"CARGO_TARGET_DIR=target/${stdenv.hostPlatform.rust.cargoShortTarget}"
];
meta = with lib; {
passthru.updateScript = nix-update-script {
extraArgs = [
"--version"
"unstable"
"--version-regex"
"epoch-(.*)"
];
};
meta = {
homepage = "https://github.com/pop-os/cosmic-workspaces-epoch";
description = "Workspaces Epoch for the COSMIC Desktop Environment";
mainProgram = "cosmic-workspaces";
license = licenses.gpl3Only;
maintainers = with maintainers; [ nyabinary ];
platforms = platforms.linux;
license = lib.licenses.gpl3Only;
maintainers = with lib.maintainers; [
nyabinary
HeitorAugustoLN
];
platforms = lib.platforms.linux;
};
}
})
+2 -2
View File
@@ -37,13 +37,13 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "dxvk";
version = "2.5.3";
version = "2.6";
src = fetchFromGitHub {
owner = "doitsujin";
repo = "dxvk";
rev = "v${finalAttrs.version}";
hash = "sha256-/dXU5x+YdOHF2mpUy5wykibShQuIfo3OHS4DzXUymIs=";
hash = "sha256-1/9XFqVGW5izlP3rggfB+PK3ewFiOQoGcB/Vjn9MYOQ=";
fetchSubmodules = true; # Needed for the DirectX headers and libdisplay-info
};
+3 -3
View File
@@ -12,7 +12,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "ente-web";
version = "0.9.98";
version = "0.9.99";
src = fetchFromGitHub {
owner = "ente-io";
@@ -20,13 +20,13 @@ stdenv.mkDerivation (finalAttrs: {
sparseCheckout = [ "web" ];
tag = "photos-v${finalAttrs.version}";
fetchSubmodules = true;
hash = "sha256-JEVz02FfPRhTolZMXOSmYzvLJTm0ImCuf912MAk2EmM=";
hash = "sha256-/dWnaVll/kaKHTJ5gH18BR6JG5E6pF7/j+SgvE66b7M=";
};
sourceRoot = "${finalAttrs.src.name}/web";
offlineCache = fetchYarnDeps {
yarnLock = "${finalAttrs.src}/web/yarn.lock";
hash = "sha256-GIgvHfQc9qz06267lfiDo/WQhxBgS7vMCocMf6PWCHc=";
hash = "sha256-Wu0/YHqkqzrmA5hpVk0CX/W1wJUh8uZSjABuc+DPxMA=";
};
nativeBuildInputs = [
+2 -2
View File
@@ -7,13 +7,13 @@
stdenv.mkDerivation rec {
pname = "exploitdb";
version = "2025-03-20";
version = "2025-03-22";
src = fetchFromGitLab {
owner = "exploit-database";
repo = "exploitdb";
rev = "refs/tags/${version}";
hash = "sha256-fOzUtl+V029SXky0LzGFJ6yh6Nx5nv9wel5eiaE3l/k=";
hash = "sha256-Ce7mKyJbf0T620wQCX2IVmgdqT7QXq/y2t1HwpSAhF4=";
};
nativeBuildInputs = [ makeWrapper ];
+2 -2
View File
@@ -34,7 +34,7 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "feedbackd";
version = "0.7.0";
version = "0.8.0";
outputs = [
"out"
@@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: {
owner = "Librem5";
repo = "feedbackd";
rev = "v${finalAttrs.version}";
hash = "sha256-qwyq1v+20Gotpk0CbUe6MdDJ5bmKmTHOen+rxWljjeA=";
hash = "sha256-Hn850+bRSNDe8ZgDRu52N7AR/yLNbV6zGROBYtetOZg=";
};
depsBuildBuild = [
+2 -2
View File
@@ -6,10 +6,10 @@
let
pname = "fflogs";
version = "8.16.11";
version = "8.16.19";
src = fetchurl {
url = "https://github.com/RPGLogs/Uploaders-fflogs/releases/download/v${version}/fflogs-v${version}.AppImage";
hash = "sha256-a+d9rLGJZCjrNH+Q7Vi2W26kh5xZJWMRGqB4Heg7qZE=";
hash = "sha256-qP/WpW1AYKrB0Cx/LpUlV1gw06mcFutxfGJybsAw1EQ=";
};
extracted = appimageTools.extractType2 { inherit pname version src; };
in
+2 -2
View File
@@ -28,13 +28,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "fluent-bit";
version = "3.2.8";
version = "3.2.9";
src = fetchFromGitHub {
owner = "fluent";
repo = "fluent-bit";
tag = "v${finalAttrs.version}";
hash = "sha256-E+y8lZ5fgJORFkig6aSVMYGk0US1b4xwjO9qnGu4R/Y=";
hash = "sha256-10L+w9SLfblE9Ok9lvZdU1i63NRtw/pT5ePk+zJwvHQ=";
};
# The source build documentation covers some dependencies and CMake options.
+5 -5
View File
@@ -1,25 +1,25 @@
{
lib,
stdenv,
buildGo123Module,
buildGo124Module,
fetchFromGitHub,
git,
nix-update-script,
installShellFiles,
}:
buildGo123Module rec {
buildGo124Module rec {
pname = "git-spice";
version = "0.10.0";
version = "0.12.0";
src = fetchFromGitHub {
owner = "abhinav";
repo = "git-spice";
tag = "v${version}";
hash = "sha256-1EWuKjvDeOV6W+nntdevUI/SO68ssYgoxJ5QIy5jkFM=";
hash = "sha256-ew0ehaYXJgc1ePdQCxxfahBdTs5zsiHDfB4SdS2WZ8A=";
};
vendorHash = "sha256-F9CyhUtdkwvEsmQ+T5zt2n+TBRhVgyr2CEOvIzcXpug=";
vendorHash = "sha256-jlCNcjACtms9kI4Lo8AtUfxqODyv4U2nJITGpBNxk9I=";
subPackages = [ "." ];
+4 -4
View File
@@ -8,16 +8,16 @@
maven.buildMavenPackage rec {
pname = "gol";
version = "0.2.0";
version = "0.2.1";
src = fetchFromGitHub {
owner = "clarisma";
repo = "gol-tool";
rev = version;
hash = "sha256-F/tMRD+nWn/fRPX7cTan371zlOTxh7oR98wREmokULo=";
tag = version;
hash = "sha256-jAkBFrtdVsK67n8Oo+/MGPL/JKRsu/6tbqy711exlwo=";
};
mvnHash = "sha256-6EX+y7/lGdB5LgW9MIER+KgvtPjvMCDjgq89f1g2GlY=";
mvnHash = "sha256-GCyTk/Lmh41qpCeex/qrN7cgPoNCsmmOKeBYllbtTZk";
mvnParameters = "compile assembly:single -Dmaven.test.skip=true";
nativeBuildInputs = [ makeWrapper ];
@@ -1,15 +1,16 @@
{
buildNpmPackage,
fetchFromGitHub,
nodePackages,
makeBinaryWrapper,
nodejs,
pnpm_10,
python3,
stdenv,
cctools,
IOKit,
darwin,
lib,
nixosTests,
enableLocalIcons ? false,
nix-update-script,
}:
let
dashboardIcons = fetchFromGitHub {
@@ -26,63 +27,68 @@ let
cp ${dashboardIcons}/LICENSE $out/share/homepage/public/icons/
'';
in
buildNpmPackage rec {
stdenv.mkDerivation (finalAttrs: {
pname = "homepage-dashboard";
version = "0.10.9";
version = "1.0.4";
src = fetchFromGitHub {
owner = "gethomepage";
repo = "homepage";
rev = "v${version}";
hash = "sha256-q8+uoikHMQVuTrVSH8tPsoI5655ZStMc/7tmoAfoZIY=";
tag = "v${finalAttrs.version}";
hash = "sha256-SwzgmVy3TBzEH+FJ/kY+iCo+pZhud1IZkfCh2DiSTsk=";
};
npmDepsHash = "sha256-N39gwct2U4UxlIL5ceDzzU7HpA6xh2WksrZNxGz04PU=";
# This patch ensures that the cache implementation respects the env
# variable `NIXPKGS_HOMEPAGE_CACHE_DIR`, which is set by default in the
# wrapper below.
# The patch is automatically generated by the `update.sh` script.
patches = [ ./prerender_cache_path.patch ];
preBuild = ''
mkdir -p config
'';
pnpmDeps = pnpm_10.fetchDeps {
inherit (finalAttrs)
pname
version
src
patches
;
hash = "sha256-GUDSfAbBK+6Bbih5jBrkjiMYLOJM7gMfurXFeez1bSw=";
};
postBuild = ''
# Add a shebang to the server js file, then patch the shebang.
sed -i '1s|^|#!/usr/bin/env node\n|' .next/standalone/server.js
patchShebangs .next/standalone/server.js
'';
nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ cctools ];
nativeBuildInputs = [
makeBinaryWrapper
nodejs
pnpm_10.configHook
] ++ lib.optionals stdenv.hostPlatform.isDarwin [ cctools ];
buildInputs = [
nodePackages.node-gyp-build
] ++ lib.optionals stdenv.hostPlatform.isDarwin [ IOKit ];
] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.IOKit ];
env.PYTHON = "${python3}/bin/python";
buildPhase = ''
runHook preBuild
mkdir -p config
pnpm build
runHook postBuild
'';
installPhase = ''
runHook preInstall
mkdir -p $out/{share,bin}
mkdir -p $out/{bin,share}
cp -r .next/standalone $out/share/homepage/
cp -r public $out/share/homepage/public
chmod +x $out/share/homepage/server.js
mkdir -p $out/share/homepage/.next
cp -r .next/static $out/share/homepage/.next/static
chmod +x $out/share/homepage/server.js
# This patch must be applied here, as it's patching the `dist` directory
# of NextJS. Without this, homepage-dashboard errors when trying to
# write its prerender cache.
#
# This patch ensures that the cache implementation respects the env
# variable `NIXPKGS_HOMEPAGE_CACHE_DIR`, which is set by default in the
# wrapper below.
(cd "$out" && patch -p1 <${./prerender_cache_path.patch})
makeWrapper $out/share/homepage/server.js $out/bin/homepage \
makeWrapper "${lib.getExe nodejs}" $out/bin/homepage \
--set-default PORT 3000 \
--set-default HOMEPAGE_CONFIG_DIR /var/lib/homepage-dashboard \
--set-default NIXPKGS_HOMEPAGE_CACHE_DIR /var/cache/homepage-dashboard
--set-default NIXPKGS_HOMEPAGE_CACHE_DIR /var/cache/homepage-dashboard \
--add-flags "$out/share/homepage/server.js"
${if enableLocalIcons then installLocalIcons else ""}
@@ -95,12 +101,12 @@ buildNpmPackage rec {
tests = {
inherit (nixosTests) homepage-dashboard;
};
updateScript = nix-update-script { };
updateScript = ./update.sh;
};
meta = {
description = "Highly customisable dashboard with Docker and service API integrations";
changelog = "https://github.com/gethomepage/homepage/releases/tag/v${version}";
changelog = "https://github.com/gethomepage/homepage/releases/tag/v${finalAttrs.version}";
mainProgram = "homepage";
homepage = "https://gethomepage.dev";
license = lib.licenses.gpl3;
@@ -108,4 +114,4 @@ buildNpmPackage rec {
platforms = lib.platforms.all;
broken = stdenv.hostPlatform.isDarwin;
};
}
})
@@ -0,0 +1,89 @@
diff --git c/package.json i/package.json
index 44fc1b35..4164abf3 100644
--- c/package.json
+++ i/package.json
@@ -62,5 +62,10 @@
},
"optionalDependencies": {
"osx-temperature-sensor": "^1.0.8"
+ },
+ "pnpm": {
+ "patchedDependencies": {
+ "next": "patches/next.patch"
+ }
}
}
diff --git c/patches/next.patch i/patches/next.patch
new file mode 100644
index 00000000..6280dbfa
--- /dev/null
+++ i/patches/next.patch
@@ -0,0 +1,13 @@
+diff --git a/dist/server/lib/incremental-cache/file-system-cache.js b/dist/server/lib/incremental-cache/file-system-cache.js
+index ac711f168d85032d43cfa2b6872655d571596a7b..ee1f79868d38ae623b0599e8cc3b9e03697833e5 100644
+--- a/dist/server/lib/incremental-cache/file-system-cache.js
++++ b/dist/server/lib/incremental-cache/file-system-cache.js
+@@ -23,7 +23,7 @@ class FileSystemCache {
+ constructor(ctx){
+ this.fs = ctx.fs;
+ this.flushToDisk = ctx.flushToDisk;
+- this.serverDistDir = ctx.serverDistDir;
++ this.serverDistDir = require("path").join((process.env.NIXPKGS_HOMEPAGE_CACHE_DIR || "/var/cache/homepage-dashboard"), "homepage");
+ this.revalidatedTags = ctx.revalidatedTags;
+ this.debug = !!process.env.NEXT_PRIVATE_DEBUG_CACHE;
+ if (ctx.maxMemoryCacheSize) {
diff --git c/pnpm-lock.yaml i/pnpm-lock.yaml
index 6b5c5910..84712cd2 100644
--- c/pnpm-lock.yaml
+++ i/pnpm-lock.yaml
@@ -4,6 +4,11 @@ settings:
autoInstallPeers: true
excludeLinksFromLockfile: false
+patchedDependencies:
+ next:
+ hash: 2cf73b70a6661c14b83ebd01d193260f13fcc654e74e5658ffc191f538863a49
+ path: patches/next.patch
+
importers:
.:
@@ -52,10 +57,10 @@ importers:
version: 1.2.2
next:
specifier: ^15.1.7
- version: 15.1.7(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+ version: 15.1.7(patch_hash=2cf73b70a6661c14b83ebd01d193260f13fcc654e74e5658ffc191f538863a49)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
next-i18next:
specifier: ^12.1.0
- version: 12.1.0(next@15.1.7(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+ version: 12.1.0(next@15.1.7(patch_hash=2cf73b70a6661c14b83ebd01d193260f13fcc654e74e5658ffc191f538863a49)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
ping:
specifier: ^0.4.4
version: 0.4.4
@@ -4688,7 +4693,7 @@ snapshots:
natural-compare@1.4.0: {}
- next-i18next@12.1.0(next@15.1.7(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react-dom@18.3.1(react@18.3.1))(react@18.3.1):
+ next-i18next@12.1.0(next@15.1.7(patch_hash=2cf73b70a6661c14b83ebd01d193260f13fcc654e74e5658ffc191f538863a49)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react-dom@18.3.1(react@18.3.1))(react@18.3.1):
dependencies:
'@babel/runtime': 7.26.9
'@types/hoist-non-react-statics': 3.3.6
@@ -4696,14 +4701,14 @@ snapshots:
hoist-non-react-statics: 3.3.2
i18next: 21.10.0
i18next-fs-backend: 1.2.0
- next: 15.1.7(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+ next: 15.1.7(patch_hash=2cf73b70a6661c14b83ebd01d193260f13fcc654e74e5658ffc191f538863a49)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
react: 18.3.1
react-i18next: 11.18.6(i18next@21.10.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
transitivePeerDependencies:
- react-dom
- react-native
- next@15.1.7(react-dom@18.3.1(react@18.3.1))(react@18.3.1):
+ next@15.1.7(patch_hash=2cf73b70a6661c14b83ebd01d193260f13fcc654e74e5658ffc191f538863a49)(react-dom@18.3.1(react@18.3.1))(react@18.3.1):
dependencies:
'@next/env': 15.1.7
'@swc/counter': 0.1.3
+66
View File
@@ -0,0 +1,66 @@
#!/usr/bin/env nix-shell
#!nix-shell -I nixpkgs=./. -i bash -p curl jq git pnpm_10 sd
# shellcheck shell=bash
set -euo pipefail
nixpkgs="$(pwd)"
cd $(readlink -e $(dirname "${BASH_SOURCE[0]}"))
# Generate the patch file that makes homepage-dashboard aware of the NIXPKGS_HOMEPAGE_CACHE_DIR environment variable.
# Generating the patch this way ensures that both the patch is included, and the lock file is updated.
generate_patch() {
local version; version="$1"
echo "Generating homepage-dashboard patch"
git clone -b "v$version" https://github.com/gethomepage/homepage.git src
pushd src
pnpm install
pnpm patch next
sd \
'this.serverDistDir = ctx.serverDistDir;' \
'this.serverDistDir = require("path").join((process.env.NIXPKGS_HOMEPAGE_CACHE_DIR || "/var/cache/homepage-dashboard"), "homepage");' \
node_modules/.pnpm_patches/next*/dist/server/lib/incremental-cache/file-system-cache.js
pnpm patch-commit node_modules/.pnpm_patches/next*
git add -A .
git diff -p --staged > ../prerender_cache_path.patch
popd
rm -rf src
}
# Update the hash of the homepage-dashboard source code in the Nix expression.
update_homepage_dashboard_source() {
local version; version="$1"
echo "Updating homepage-dashboard source"
old_hash="$(nix eval --json --impure --expr "(import $nixpkgs/default.nix {}).homepage-dashboard.src.outputHash" | jq -r)"
old_version="$(nix eval --json --impure --expr "(import $nixpkgs/default.nix {}).homepage-dashboard.version" | jq -r)"
new_hash="$(nix-build --impure --expr "let src = (import $nixpkgs/default.nix {}).homepage-dashboard.src; in (src.overrideAttrs or (f: src // f src)) (_: { version = \"$version\"; outputHash = \"\"; outputHashAlgo = \"sha256\"; })" 2>&1 | tr -s ' ' | grep -Po "got: \K.+$")" || true
sed -i "s|${old_hash}|${new_hash}|g" package.nix
sed -i "s|${old_version}|${version}|g" package.nix
}
# Update the hash of the homepage-dashboard pnpm dependencies in the Nix expression.
update_pnpm_deps_hash() {
echo "Updating homepage-dashboard pnpm deps hash"
old_hash="$(nix eval --json --impure --expr "(import $nixpkgs/default.nix {}).homepage-dashboard.pnpmDeps.outputHash" | jq -r)"
new_hash="$(nix-build --impure --expr "let src = (import $nixpkgs/default.nix {}).homepage-dashboard.pnpmDeps; in (src.overrideAttrs or (f: src // f src)) (_: { outputHash = \"\"; outputHashAlgo = \"sha256\"; })" 2>&1 | tr -s ' ' | grep -Po "got: \K.+$")" || true
sed -i "s|${old_hash}|${new_hash}|g" package.nix
}
LATEST_TAG="$(curl -s ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} https://api.github.com/repos/gethomepage/homepage/releases/latest | jq -r '.tag_name')"
LATEST_VERSION="$(expr "$LATEST_TAG" : 'v\(.*\)')"
CURRENT_VERSION="$(nix eval --json --impure --expr "(import $nixpkgs/default.nix {}).homepage-dashboard.version" | jq -r)"
if [[ "$CURRENT_VERSION" == "$LATEST_VERSION" ]]; then
echo "homepage-dashboard is up to date: ${CURRENT_VERSION}"
exit 0
fi
update_homepage_dashboard_source "$LATEST_VERSION"
generate_patch "$LATEST_VERSION"
update_pnpm_deps_hash
+3 -3
View File
@@ -11,17 +11,17 @@
rustPlatform.buildRustPackage rec {
pname = "hydra-check";
version = "2.0.3";
version = "2.0.4";
src = fetchFromGitHub {
owner = "nix-community";
repo = "hydra-check";
tag = "v${version}";
hash = "sha256-h8bs6oe8zkzEDCoC9F6IzTaTkNf4eAAjt663V0qn73I=";
hash = "sha256-TdMZC/EE52UiJ+gYQZHV4/ReRzMOdCGH+n7pg1vpCCQ=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-aV4URx9bGAOLWRh/kFDU67GiXk7RdCqfahG+fZPfdUo=";
cargoHash = "sha256-G9M+1OWp2jlDeSDFagH/YOCdxGQbcru1KFyKEUcMe7g=";
nativeBuildInputs = [
pkg-config
@@ -19,7 +19,8 @@ index 40c18777f..40d553b40 100644
#[instrument(
level = "info",
skip(self, eventid),
- skip(self, eventid),
+ skip(self, password, eventid),
fields(uuid = ?eventid)
)]
pub(crate) async fn handle_admin_recover_account(
@@ -19,7 +19,8 @@ index 420e72c6c..5c4353116 100644
#[instrument(
level = "info",
skip(self, eventid),
- skip(self, eventid),
+ skip(self, password, eventid),
fields(uuid = ?eventid)
)]
pub(crate) async fn handle_admin_recover_account(
@@ -19,7 +19,8 @@ index 420e72c6c..5c4353116 100644
#[instrument(
level = "info",
skip(self, eventid),
- skip(self, eventid),
+ skip(self, password, eventid),
fields(uuid = ?eventid)
)]
pub(crate) async fn handle_admin_recover_account(
+3 -3
View File
@@ -9,17 +9,17 @@
buildGoModule rec {
pname = "museum";
version = "0.9.98";
version = "0.9.99";
src = fetchFromGitHub {
owner = "ente-io";
repo = "ente";
sparseCheckout = [ "server" ];
rev = "photos-v${version}";
hash = "sha256-yC0bt7TUO4agvkWtd7Q0DuPlgFngQynSKaCZ4eaBWdE=";
hash = "sha256-+EL81zSOjoBfew8LRl0awWXgc2r8KDBBCYBBtDU1s5g=";
};
vendorHash = "sha256-loq/YPf+oMWJ6FgtZsgJqkUQhCG8wL7F3kDblKbrc/c=";
vendorHash = "sha256-px4pMqeH73Fe06va4+n6hklIUDMbPmAQNKKRIhwv6ec=";
sourceRoot = "${src.name}/server";
+7 -7
View File
@@ -28,13 +28,13 @@ assert withEmojis -> (!withIcons && !withNerdIcons);
stdenv.mkDerivation (finalAttrs: {
pname = "nnn";
version = "5.0";
version = "5.1";
src = fetchFromGitHub {
owner = "jarun";
repo = "nnn";
rev = "v${finalAttrs.version}";
hash = "sha256-HShHSjqD0zeE1/St1Y2dUeHfac6HQnPFfjmFvSuEXUA=";
tag = "v${finalAttrs.version}";
hash = "sha256-+2lFFBtaqRPBkEspCFtKl9fllbSR5MBB+4ks3Xh7vp4=";
};
patches = [
@@ -93,13 +93,13 @@ stdenv.mkDerivation (finalAttrs: {
wrapProgram $out/bin/nnn --prefix PATH : "$binPath"
'';
meta = with lib; {
meta = {
description = "Small ncurses-based file browser forked from noice";
homepage = "https://github.com/jarun/nnn";
changelog = "https://github.com/jarun/nnn/blob/v${finalAttrs.version}/CHANGELOG";
license = licenses.bsd2;
platforms = platforms.all;
maintainers = with maintainers; [ Br1ght0ne ];
license = lib.licenses.bsd2;
platforms = lib.platforms.all;
maintainers = with lib.maintainers; [ Br1ght0ne ];
mainProgram = "nnn";
};
})
+9 -6
View File
@@ -1,10 +1,10 @@
{
lib,
rustPlatform,
fetchFromGitHub,
makeWrapper,
stdenv,
darwin,
callPackage,
# runtime dependencies
nix, # for nix-prefetch-url
@@ -18,12 +18,17 @@ let
nix-prefetch-git
git
];
sources = (lib.importJSON ./sources.json).pins;
in
rustPlatform.buildRustPackage rec {
pname = "npins";
version = src.version;
src = passthru.mkSource sources.npins;
version = "0.3.0";
src = fetchFromGitHub {
owner = "andir";
repo = "npins";
tag = version;
sha256 = "sha256-nTm6IqCHNFQLU7WR7dJRP7ktBctpE/O2LHbUV25roJA=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-HnX7dkWLxa3DARXG8y9OVBRwvwgxwRIs4mWK3VNblG0=";
@@ -51,6 +56,4 @@ rustPlatform.buildRustPackage rec {
license = licenses.eupl12;
maintainers = with maintainers; [ piegames ];
};
passthru.mkSource = callPackage ./source.nix { };
}
-76
View File
@@ -1,76 +0,0 @@
# Not part of the public API for use within nixpkgs only
#
# Usage:
# ```nix
# let
# sources = lib.importJSON ./sources.json;
# in mkMyDerivation rec {
# version = src.version; # This obviously only works for releases
# src = pkgs.npins.mkSource sources.mySource;
# }
# ```
{
fetchgit,
fetchzip,
fetchurl,
}:
let
mkSource =
spec:
assert spec ? type;
let
path =
if spec.type == "Git" then
mkGitSource spec
else if spec.type == "GitRelease" then
mkGitSource spec
else if spec.type == "PyPi" then
mkPyPiSource spec
else if spec.type == "Channel" then
mkChannelSource spec
else
throw "Unknown source type ${spec.type}";
in
spec // { outPath = path; };
mkGitSource =
{
repository,
revision,
url ? null,
hash,
...
}:
assert repository ? type;
# At the moment, either it is a plain git repository (which has an url), or it is a GitHub/GitLab repository
# In the latter case, there we will always be an url to the tarball
if url != null then
(fetchzip {
inherit url;
sha256 = hash;
extension = "tar";
})
else
assert repository.type == "Git";
fetchgit {
url = repository.url;
rev = revision;
};
mkPyPiSource =
{ url, hash, ... }:
fetchurl {
inherit url;
sha256 = hash;
};
mkChannelSource =
{ url, hash, ... }:
fetchzip {
inherit url;
sha256 = hash;
extension = "tar";
};
in
mkSource
-21
View File
@@ -1,21 +0,0 @@
{
"pins": {
"npins": {
"type": "GitRelease",
"repository": {
"type": "GitHub",
"owner": "andir",
"repo": "npins"
},
"pre_releases": false,
"version_upper_bound": null,
"release_prefix": null,
"submodules": false,
"version": "0.3.0",
"revision": "6cc1930e703698487bd703258126435a536ca492",
"url": "https://api.github.com/repos/andir/npins/tarball/0.3.0",
"hash": "1450ddp5gm3n5jvg64v9rc2jvf9za79fv4dmac5m8d47l0iblfcx"
}
},
"version": 5
}
+7 -2
View File
@@ -2,19 +2,24 @@
lib,
stdenv,
fetchFromGitHub,
fixDarwinDylibNames,
}:
stdenv.mkDerivation rec {
pname = "openlibm";
version = "0.8.5";
version = "0.8.6";
src = fetchFromGitHub {
owner = "JuliaLang";
repo = "openlibm";
rev = "v${version}";
sha256 = "sha256-z2PMovHk9M4Wb5K4EWOrp0b+3RLRHDVUKDzIxHsKrXg=";
sha256 = "sha256-HFSRrTdIhbbSyeU/FSo5e2ZI5tff2ZDEFgYcI412ATU=";
};
nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
fixDarwinDylibNames
];
makeFlags = [
"prefix=$(out)"
"CC=${stdenv.cc.targetPrefix}cc"
+42
View File
@@ -0,0 +1,42 @@
{
lib,
rustPlatform,
fetchFromGitHub,
nix-update-script,
}:
rustPlatform.buildRustPackage {
pname = "piday25";
version = "0-unstable-2025-03-13";
src = fetchFromGitHub {
owner = "elkasztano";
repo = "piday25";
rev = "68b417a3016c58a2948cb3b39c9bde985d82bdb8";
hash = "sha256-58ZBRmB990Tp+/nkuRZA+8cjCRFUBzdzu93Sk5uvKOE=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-3uztB5/VevFyEz3S+VlAUPgDrNDJcwaTnHuXXYAX+MY=";
# upstream does not have any tests
doInstallCheck = true;
installCheckPhase = ''
runHook preInstallCheck
$out/bin/piday25 > result
diff -U3 --color=auto <(head -c12 result) <(echo -n 3.1415926535)
runHook postInstallCheck
'';
passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch=main" ]; };
meta = {
description = "Multithreaded implementation of the Chudnovsky algorithm to calculate Pi";
homepage = "https://github.com/elkasztano/piday25";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ defelo ];
mainProgram = "piday25";
};
}
+6 -5
View File
@@ -17,17 +17,17 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "ruff";
version = "0.11.1";
version = "0.11.2";
src = fetchFromGitHub {
owner = "astral-sh";
repo = "ruff";
tag = finalAttrs.version;
hash = "sha256-uouy47Lzrrht3wBUiQePW7x6QJfpIce9ny/p6HNwCNY=";
hash = "sha256-/K6+zze5d0RAE7/Nalnmx9qKHI1rPDeh3OkTatgP5Q4=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-EaMNkliJmeKwxrnlK+aCFGvzbvVIjS0qHc9h9z9m47I=";
cargoHash = "sha256-uDuR7GF3918V6ssx4p64pOzCRlLl2vJR0FEBSUnlFQ8=";
nativeBuildInputs = [ installShellFiles ];
@@ -35,7 +35,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
rust-jemalloc-sys
];
postInstall =
postInstall = lib.optionalString (stdenv.hostPlatform.emulatorAvailable buildPackages) (
let
emulator = stdenv.hostPlatform.emulator buildPackages;
in
@@ -44,7 +44,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
--bash <(${emulator} $out/bin/ruff generate-shell-completion bash) \
--fish <(${emulator} $out/bin/ruff generate-shell-completion fish) \
--zsh <(${emulator} $out/bin/ruff generate-shell-completion zsh)
'';
''
);
# Run cargo tests
checkType = "debug";
+6 -5
View File
@@ -18,17 +18,17 @@ rustPlatform.buildRustPackage (finalAttrs: {
pname = "tinymist";
# Please update the corresponding vscode extension when updating
# this derivation.
version = "0.13.8";
version = "0.13.10";
src = fetchFromGitHub {
owner = "Myriad-Dreamin";
repo = "tinymist";
tag = "v${finalAttrs.version}";
hash = "sha256-dKLHZyFkTo6iCw/s73asJqXoNBpYx7UC/r2qVp5dLjs=";
hash = "sha256-/mlocw9AYoaR3meGYbSJ/qCrusxIIC3Gtmz+doXTDXI=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-XbPqddmVv5zubnbT5IewAcvPJWQMIumWgGI+q/r1Ip4=";
cargoHash = "sha256-L1Krw6dbH3M1SU1ei4GYEJVMkuv2OOk2QrAJpoSHeP4=";
nativeBuildInputs = [
installShellFiles
@@ -65,7 +65,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
"--skip=semantic_tokens_full::tests::test"
];
postInstall =
postInstall = lib.optionalString (stdenv.hostPlatform.emulatorAvailable buildPackages) (
let
emulator = stdenv.hostPlatform.emulator buildPackages;
in
@@ -74,7 +74,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
--bash <(${emulator} $out/bin/tinymist completion bash) \
--fish <(${emulator} $out/bin/tinymist completion fish) \
--zsh <(${emulator} $out/bin/tinymist completion zsh)
'';
''
);
nativeInstallCheckInputs = [
versionCheckHook
+5 -5
View File
@@ -29,16 +29,16 @@ let
."${system}" or (throw "Unsupported system: ${system}");
hash =
{
arm64-linux-hash = "sha256-CRZp8nUs35uM5VFhinR0IQcf/t624kIRvxuXuJ0eaE4=";
arm64-osx-hash = "sha256-nrJxQg0Qzp1cJZttpX+e2CwsniXeDV7ow8JvJX0gi4c=";
x64-linux-hash = "sha256-m3KyHPe+A3iO4MosFNeTYPWzyzXTFRU/0in+Tvxnamw=";
x64-osx-hash = "sha256-zvx3PTcTvIT2l32AheY8SN419ewUdmhyQ1O9GgVs2zI=";
arm64-linux-hash = "sha256-GQSDButJqPmWbxhDIYqIZxhL2Bn4IpFP8Vinv6OsI9Q=";
arm64-osx-hash = "sha256-6e2Pqb/V02I+9ZTxR2er+zMLEBE4ZnJcwkVEgqO04eU=";
x64-linux-hash = "sha256-KZ24XPz1WwL4dK1wFT7x6jH2WU3NgFYLiSx2QfmstkA=";
x64-osx-hash = "sha256-p749/sc7aAzuvwwlCOx+pNh4J7DIJIZlvsFRa/mIlMk=";
}
."${arch}-${os}-hash";
in
stdenv.mkDerivation rec {
pname = "whisparr";
version = "2.0.0.819";
version = "2.0.0.891";
src = fetchurl {
name = "${pname}-${arch}-${os}-${version}.tar.gz";
+1
View File
@@ -50,5 +50,6 @@ stdenv.mkDerivation {
homepage = "https://codeberg.org/sewn/wlock";
platforms = lib.platforms.linux;
maintainers = with lib.maintainers; [ fliegendewurst ];
mainProgram = "wlock";
};
}
+8 -6
View File
@@ -5,22 +5,24 @@
openssh,
nixosTests,
}:
python3.pkgs.buildPythonApplication rec {
pname = "xxh";
version = "0.8.12";
format = "setuptools";
version = "0.8.14";
pyproject = true;
disabled = python3.pkgs.pythonOlder "3.6";
src = fetchFromGitHub {
owner = pname;
repo = pname;
tag = version;
hash = "sha256-3/AU2o72X7FE11NSXC6m9fFhmjzEDZ+OpTXg8yvv62A=";
hash = "sha256-Y1yTn0lZemQgWsW9wlW+aNndyTXGo46PCbCl0TGYspQ=";
};
propagatedBuildInputs = [
build-system = [
python3.pkgs.setuptools
];
dependencies = [
python3.pkgs.pexpect
python3.pkgs.pyyaml
openssh
+2 -2
View File
@@ -9,14 +9,14 @@
python3Packages.buildPythonPackage rec {
pname = "yubikey-manager";
version = "5.5.1";
version = "5.6.1";
pyproject = true;
src = fetchFromGitHub {
owner = "Yubico";
repo = "yubikey-manager";
rev = version;
hash = "sha256-m/B5G83XZROoCNq/ZT0U0MUth2IC99e3LWc8FcOq1ig=";
hash = "sha256-qEEAByg6Smn1Wk8U4VA6MIJDLWBtM+S+qTDIcgPUGA0=";
};
postPatch = ''
@@ -2,6 +2,7 @@
lib,
stdenv,
fetchurl,
fetchpatch,
pkg-config,
gettext,
itstool,
@@ -25,6 +26,15 @@ stdenv.mkDerivation rec {
sha256 = "1GU2ZoKvj+uGGCg8l4notw22/RfKj6lQrG9xAQIxWoE=";
};
patches = [
# Fix an invalid pointer crash with glib 2.83.2
# https://github.com/mate-desktop/mate-sensors-applet/pull/137
(fetchpatch {
url = "https://github.com/mate-desktop/mate-sensors-applet/commit/9b74dc16d852a40d37f7ce6c236406959fd013e5.patch";
hash = "sha256-PjMc2uEFMljaiKOM5lf6MsdWztZkMfb2Vuxs9tgdaos=";
})
];
nativeBuildInputs = [
pkg-config
gettext
@@ -5,13 +5,13 @@
buildDunePackage rec {
pname = "reason";
version = "3.14.0";
version = "3.15.0";
minimalOCamlVersion = "4.11";
src = fetchurl {
url = "https://github.com/reasonml/reason/releases/download/${version}/reason-${version}.tbz";
hash = "sha256-HQm6JKBZR0Wrazi01fgerYVltzy2mtRq8cLCb40yTwA=";
hash = "sha256-7D0gJfQ5Hw0riNIFPmJ6haoa3dnFEyDp5yxpDgX7ZqY=";
};
nativeBuildInputs = [
@@ -16,13 +16,13 @@ lib.throwIfNot (lib.versionAtLeast ocaml.version "4.07")
stdenv.mkDerivation
rec {
pname = "ocaml${ocaml.version}-lem";
version = "2022-12-10";
version = "2025-03-13";
src = fetchFromGitHub {
owner = "rems-project";
repo = "lem";
rev = version;
hash = "sha256-ZQgcuIVRkJS0KtpzjbO4OPHGg6B0TadWA6XpRir30y8=";
hash = "sha256-ZV2OiFonMlNzqtsumMQ8jzY9/ATaZxiNHZ7JzOfGluY=";
};
nativeBuildInputs = [
@@ -26,11 +26,11 @@
buildDunePackage rec {
pname = "mrmime";
version = "0.6.1";
version = "0.7.0";
src = fetchurl {
url = "https://github.com/mirage/mrmime/releases/download/v${version}/mrmime-${version}.tbz";
hash = "sha256-Dzsr7xPzu5RIzIdubF4OAAjHJY7CdBVnHRZxQbcCsBY=";
hash = "sha256-w23xtro9WgyLLwqdwfqLMN/ZDqwpvFcEvurbsqnsJLc=";
};
propagatedBuildInputs = [
@@ -7,7 +7,7 @@
buildDunePackage rec {
pname = "reactiveData";
version = "0.3";
version = "0.3.1";
duneVersion = "3";
minimalOCamlVersion = "4.08";
@@ -15,7 +15,7 @@ buildDunePackage rec {
owner = "ocsigen";
repo = "reactiveData";
rev = version;
sha256 = "sha256-imUphE1vMe3bYqHhgTuGT+B7uLn75acX6fAwBLh1tz4=";
sha256 = "sha256-MO9WMe1k2QcC5RynE6uZHohmu3QlpTHvAkvQNgu3P90=";
};
propagatedBuildInputs = [ react ];
@@ -9,13 +9,13 @@
buildDunePackage rec {
pname = "sqlite3";
version = "5.3.0";
version = "5.3.1";
duneVersion = "3";
minimalOCamlVersion = "4.12";
src = fetchurl {
url = "https://github.com/mmottl/sqlite3-ocaml/releases/download/${version}/sqlite3-${version}.tbz";
hash = "sha256-+XuR3ovI5soNXMNgTxYcEbx26lV+3i7q8XaKCI6ueAo=";
hash = "sha256-Ox8eZS4r6PbJh8nei52ftUyf25SKwIUMi5UEv4L+6mE=";
};
nativeBuildInputs = [ pkg-config ];
@@ -7,7 +7,7 @@
ocamlbuild,
topkg,
cmdliner,
version ? if lib.versionAtLeast ocaml.version "4.14" then "0.9.9" else "0.9.8",
version ? if lib.versionAtLeast ocaml.version "4.14" then "0.9.10" else "0.9.8",
}:
lib.throwIfNot (lib.versionAtLeast ocaml.version "4.08")
@@ -21,7 +21,7 @@ lib.throwIfNot (lib.versionAtLeast ocaml.version "4.08")
url = "https://erratique.ch/software/uuidm/releases/uuidm-${version}.tbz";
hash =
{
"0.9.9" = "sha256-jOgNF05dpoU/XQEefSZhn3zSlQ1BA1b/U4Ib9j2mvFo=";
"0.9.10" = "sha256-kWVZSofWMyky5nAuxoh1xNhwMKZ2qUahL3Dh27J36Vc=";
"0.9.8" = "sha256-/GZbkJVDQu1UY8SliK282kUWAVMfOnpQadUlRT/tJrM=";
}
."${version}";
@@ -14,10 +14,10 @@
stdenv.mkDerivation rec {
pname = "ocaml${ocaml.version}-webbrowser";
version = "0.6.1";
version = "0.6.2";
src = fetchurl {
url = "https://erratique.ch/software/webbrowser/releases/webbrowser-${version}.tbz";
sha256 = "137a948bx7b71zfv4za3hhznrn5lzbbrgzjy0das83zms508isx3";
sha256 = "sha256-4SYAf1Qo7aUiCp5587wO1VvjcQHP3NBXeFfAaHE/s+A=";
};
nativeBuildInputs = [
@@ -20,7 +20,7 @@
buildPythonPackage rec {
pname = "authlib";
version = "1.5.0";
version = "1.5.1";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -29,7 +29,7 @@ buildPythonPackage rec {
owner = "lepture";
repo = "authlib";
tag = "v${version}";
hash = "sha256-RrsQTrOV2v3SzdM7kqdFe1Uj7A+o/Yseq1j7CCG8qtg=";
hash = "sha256-VMihaWqR4FbnTJ50fVf5e5B9GfVwRguq5UAC+D4bpxs=";
};
build-system = [ setuptools ];
@@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "azure-storage-file-share";
version = "12.20.1";
version = "12.21.0";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "azure_storage_file_share";
inherit version;
hash = "sha256-bIn0xLyjYlW8tyuoVwXvzCysrvuTGhTnvm3n2410fFA=";
hash = "sha256-20K/a0OzwMJ8kVIgKVUnffwmpZ9/rSbAWEMaaumVgM4=";
};
build-system = [ setuptools ];
@@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "craft-grammar";
version = "2.0.2";
version = "2.0.3";
pyproject = true;
@@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "canonical";
repo = "craft-grammar";
tag = version;
hash = "sha256-i6dy0YNCsYIW9Uw9RcnTrOXMY6Sgwftrg27WE3tskoA=";
hash = "sha256-d7U4AAUikYcz26ZSXQwkTobSKN1PpaL20enfggHSKRM=";
};
build-system = [ setuptools-scm ];
@@ -19,14 +19,14 @@
buildPythonPackage rec {
pname = "fsspec-xrootd";
version = "0.5.0";
version = "0.5.1";
pyproject = true;
src = fetchFromGitHub {
owner = "CoffeaTeam";
repo = "fsspec-xrootd";
tag = "v${version}";
hash = "sha256-7UUE0NtGSMmqKwD0UHvD5JFBVmajunRxDP39wjs4gUs=";
hash = "sha256-Vpe/Gcm6rmehG05h2H7BDZcBQDyie0Ww9X8LgoTgAkE=";
};
build-system = [
@@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "google-cloud-access-context-manager";
version = "0.2.1";
version = "0.2.2";
pyproject = true;
disabled = pythonOlder "3.7";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "google_cloud_access_context_manager";
inherit version;
hash = "sha256-O/rGqO4ub5UQWo7s9OGJCxp5Y3AuuMZV/s8CVX00joo=";
hash = "sha256-8n+GCH+t4V32gBfHaeG5MNVZCIpTWPBwIg36l5Ss4x0=";
};
build-system = [ setuptools ];
@@ -35,8 +35,8 @@ buildPythonPackage rec {
meta = with lib; {
description = "Protobufs for Google Access Context Manager";
homepage = "https://github.com/googleapis/python-access-context-manager";
changelog = "https://github.com/googleapis/python-access-context-manager/blob/v${version}/CHANGELOG.md";
homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-access-context-manager";
changelog = "https://github.com/googleapis/google-cloud-python/blob/google-cloud-access-context-manager-v${version}/packages/google-cloud-access-context-manager/CHANGELOG.md";
license = licenses.asl20;
maintainers = with maintainers; [ austinbutler ];
};
@@ -20,7 +20,7 @@
buildPythonPackage rec {
pname = "google-cloud-asset";
version = "3.29.1";
version = "3.29.2";
pyproject = true;
disabled = pythonOlder "3.7";
@@ -28,7 +28,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "google_cloud_asset";
inherit version;
hash = "sha256-GdHmAYBXLVgwdSGq5KyqScCxA+cvnpszPcZEId2uCLg=";
hash = "sha256-fFmpPUeKgniruevGhXnJLhzwM4ymO4ERjD8BQ0/HBbs=";
};
build-system = [ setuptools ];
@@ -18,7 +18,7 @@
buildPythonPackage rec {
pname = "google-cloud-automl";
version = "2.16.2";
version = "2.16.3";
pyproject = true;
disabled = pythonOlder "3.7";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "google_cloud_automl";
inherit version;
hash = "sha256-1GSv/T3Jex2zxsK3510LOoduK+a87I6MrawIknuSvbg=";
hash = "sha256-b10WLvYAjZPKBGUal4b63rRJfUqKJL9n3ztVOVFK3y8=";
};
build-system = [ setuptools ];
@@ -16,7 +16,7 @@
buildPythonPackage rec {
pname = "google-cloud-bigquery-datatransfer";
version = "3.19.0";
version = "3.19.1";
pyproject = true;
disabled = pythonOlder "3.7";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "google_cloud_bigquery_datatransfer";
inherit version;
hash = "sha256-qQ330hnnZyC4X+QvlrSF+Z/FGCsaETzP47CgzAHHS+0=";
hash = "sha256-L7em/I7t7htI5zdGwSKDs35b2t/pvIXl1lUSMM6BdRo=";
};
build-system = [ setuptools ];
@@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "google-cloud-compute";
version = "1.26.0";
version = "1.28.0";
pyproject = true;
disabled = pythonOlder "3.7";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "google_cloud_compute";
inherit version;
hash = "sha256-ZbbHkQYKyDy4Uy+TNr1+FFiwahVZY7ViubROM+zNMDA=";
hash = "sha256-0Mc4DDTLvHzERiPDCqpn2lXUz4KeoE5gVz3va8hJ1Hg=";
};
build-system = [ setuptools ];
@@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "google-cloud-container";
version = "2.56.0";
version = "2.56.1";
pyproject = true;
disabled = pythonOlder "3.7";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "google_cloud_container";
inherit version;
hash = "sha256-BD2e/4aDhyY5Cs95YZwAO1sJK7t+s9VCYwbpsrlQDg8=";
hash = "sha256-QADuXKwndJvGDEWTftNIGRX7vwmJJdkoUjcC1w8vT6E=";
};
build-system = [ setuptools ];
@@ -16,7 +16,7 @@
buildPythonPackage rec {
pname = "google-cloud-datacatalog";
version = "3.25.1";
version = "3.26.0";
pyproject = true;
disabled = pythonOlder "3.7";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "google_cloud_datacatalog";
inherit version;
hash = "sha256-LkCi+bzCywtmtEK/aypVeunA6/FC7tDHLVzriPhYdE0=";
hash = "sha256-rE3KvGuBi4YIwxLiICX5b1AO93NAWL6IpapNW5a/FVY=";
};
build-system = [ setuptools ];
@@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "google-cloud-language";
version = "2.17.0";
version = "2.17.1";
pyproject = true;
disabled = pythonOlder "3.7";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "google_cloud_language";
inherit version;
hash = "sha256-jOIWh7py71jOWHB67egWQlj53rR3kfJJzCqdT4yQdhs=";
hash = "sha256-vtaZaZXaIaJwl+XvOG9wEB6xw5beDdtNabhzbB91NXw=";
};
build-system = [ setuptools ];
@@ -16,7 +16,7 @@
buildPythonPackage rec {
pname = "google-cloud-monitoring";
version = "2.27.0";
version = "2.27.1";
pyproject = true;
disabled = pythonOlder "3.7";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "google_cloud_monitoring";
inherit version;
hash = "sha256-9mVSUogS57ap8vt+C3w+eQTMDBNQT0/LQgNXIrXaK8Q=";
hash = "sha256-9HAJAKZYzWybf3FLsp0Af6zvDPDWKNAHVpnDpzvOilU=";
};
build-system = [ setuptools ];
@@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "google-cloud-netapp";
version = "0.3.19";
version = "0.3.20";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "google_cloud_netapp";
inherit version;
hash = "sha256-88A1HJbm3ngNWXS+kJ/nmX5ctwZBqAe9VckC5AMmWuU=";
hash = "sha256-ZPJMw+fOPcKrRpwoZYPSBCUpuejJsDSXLqvbhNvMWfA=";
};
build-system = [ setuptools ];
@@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "google-cloud-org-policy";
version = "1.13.0";
version = "1.13.1";
pyproject = true;
disabled = pythonOlder "3.7";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "google_cloud_org_policy";
inherit version;
hash = "sha256-ajFHKQI6fD/X/gYrasb1qwZNbOzrFyJg8mUaxa9CeM4=";
hash = "sha256-2yPr1sgmxMnQwk6Z1T9i2MFPeAxjb40r4IqNoAd7WZk=";
};
build-system = [ setuptools ];
@@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "google-cloud-os-config";
version = "1.20.0";
version = "1.20.1";
pyproject = true;
disabled = pythonOlder "3.7";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "google_cloud_os_config";
inherit version;
hash = "sha256-GczIpzo161rJ+TxU9LB9wcvtLXfopSRofeO9UyS4tMQ=";
hash = "sha256-15sKmKW9y3/JU7rTLRZJXYqxWdWvqIFmIqpXKo2tE8Q=";
};
build-system = [ setuptools ];
@@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "google-cloud-redis";
version = "2.18.0";
version = "2.18.1";
pyproject = true;
disabled = pythonOlder "3.7";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "google_cloud_redis";
inherit version;
hash = "sha256-vszvtwbVxWXNmaz+6yy3XxNop7x/f42Wtg4CuOwFToo=";
hash = "sha256-o64V2KL/Gmeg2LOXR3XCsGypf4Tz8zyHYoIiGR7+rJw=";
};
build-system = [ setuptools ];
@@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "google-cloud-resource-manager";
version = "1.14.1";
version = "1.14.2";
pyproject = true;
disabled = pythonOlder "3.7";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "google_cloud_resource_manager";
inherit version;
hash = "sha256-QenlRqqgPVFgzfojQdvoHvdZZwbDAKiblMQp8fNBH4c=";
hash = "sha256-li4tkExVDXusSDcmB5BP97syd+O7SjbYDMmjfijm63Q=";
};
build-system = [ setuptools ];
@@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "google-cloud-secret-manager";
version = "2.23.1";
version = "2.23.2";
pyproject = true;
disabled = pythonOlder "3.7";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "google_cloud_secret_manager";
inherit version;
hash = "sha256-TXee1WZrXEpOJOUvgIsuFZtg/Gjtex8jDKSRkYYyoRQ=";
hash = "sha256-h2M3mSqredhkfbFYk3G8tztJhmK1hhlZmfjJRVpZfyk=";
};
build-system = [ setuptools ];
@@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "google-cloud-securitycenter";
version = "1.38.0";
version = "1.38.1";
pyproject = true;
disabled = pythonOlder "3.7";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "google_cloud_securitycenter";
inherit version;
hash = "sha256-1FWz9wDZvehE7bg9oUpUBJXz05Xp18vOOr1IexmwBKY=";
hash = "sha256-XsR+gNtFCWhe0PEmaS8lIgGl0+ri7MR/omK+bch4Too=";
};
build-system = [ setuptools ];
@@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "google-cloud-tasks";
version = "2.19.1";
version = "2.19.2";
pyproject = true;
disabled = pythonOlder "3.7";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "google_cloud_tasks";
inherit version;
hash = "sha256-wvIqfdMVNp3C/3apjR9d/ah3lwraKNgpoUnL57FGPAY=";
hash = "sha256-J2tH6F9IJZI6d41UP8BzXkskvkX3P6fZZK0WVUAtB9w=";
};
build-system = [ setuptools ];
@@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "google-cloud-texttospeech";
version = "2.25.0";
version = "2.25.1";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "google_cloud_texttospeech";
inherit version;
hash = "sha256-d25wtYOFyMNLhCXHrbJ+lGqFg3fCJ7lRUzFddSY8HiM=";
hash = "sha256-N918PwI/WpfbcpiXGNllMOBfricOXR3kHRBLMWp3Cvw=";
};
build-system = [ setuptools ];
@@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "google-cloud-trace";
version = "1.16.0";
version = "1.16.1";
pyproject = true;
disabled = pythonOlder "3.7";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "google_cloud_trace";
inherit version;
hash = "sha256-nSexY3cVcrVh6/dTpeR5H5nSXlTtrUywEheriC899Bo=";
hash = "sha256-FTCLBPEtlY8rODGk92uXxhwMekaAS9xXDRkCSTgCnZo=";
};
build-system = [ setuptools ];
@@ -17,7 +17,7 @@
buildPythonPackage rec {
pname = "google-cloud-translate";
version = "3.20.1";
version = "3.20.2";
pyproject = true;
disabled = pythonOlder "3.7";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "google_cloud_translate";
inherit version;
hash = "sha256-g6KO+XxK8nRKy9/mYkOXKHQaVtiVSFIrT6sAhmPJGQE=";
hash = "sha256-tUOE7lX0vF2WbO4OELCBT/7hN1wfKvcLkiDTvPWNhfg=";
};
build-system = [ setuptools ];
@@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "google-cloud-videointelligence";
version = "2.16.0";
version = "2.16.1";
pyproject = true;
disabled = pythonOlder "3.7";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "google_cloud_videointelligence";
inherit version;
hash = "sha256-eqHNqa9pFHE+MoeH6rOro2G0E0iLCOCqxXqNoi3tH2I=";
hash = "sha256-ajYSBZhvv5b8hKS5o2aTrymRpd5bWX94ncNcGmE7/Lk=";
};
build-system = [ setuptools ];
@@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "google-cloud-websecurityscanner";
version = "1.17.0";
version = "1.17.1";
pyproject = true;
disabled = pythonOlder "3.7";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "google_cloud_websecurityscanner";
inherit version;
hash = "sha256-JqKKtjBeJ/jyGZZ9SGhQ9a89khuZKSJMPhqc5BOnFcg=";
hash = "sha256-nDjk29d1V19fUNei6lJLtmJDwfLcBSnXm4jZQV2s+vI=";
};
build-system = [ setuptools ];
@@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "huawei-lte-api";
version = "1.10";
version = "1.11.0";
pyproject = true;
disabled = pythonOlder "3.7";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "Salamek";
repo = "huawei-lte-api";
tag = version;
hash = "sha256-L6xCX+NHASunB876N1R++xMOx55Z8zc77j5QwKqHsNY=";
hash = "sha256-cSoH3g5olrcv4/IJeRWFR6Yy1ntBuL0zpO1TrnwvIwk=";
};
build-system = [ setuptools ];
@@ -43,7 +43,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "API For huawei LAN/WAN LTE Modems";
homepage = "https://github.com/Salamek/huawei-lte-api";
changelog = "https://github.com/Salamek/huawei-lte-api/releases/tag/${version}";
changelog = "https://github.com/Salamek/huawei-lte-api/releases/tag/${src.tag}";
license = licenses.lgpl3Only;
maintainers = with maintainers; [ dotlambda ];
};
@@ -0,0 +1,37 @@
{
lib,
buildPythonPackage,
fetchFromGitHub,
flit-core,
pygments,
pytestCheckHook,
}:
buildPythonPackage rec {
pname = "ipython-pygments-lexers";
version = "1.1.1";
pyproject = true;
src = fetchFromGitHub {
owner = "ipython";
repo = "ipython-pygments-lexers";
tag = version;
hash = "sha256-p2WrFvCzHOuxPec9Wc1/xT6+fEUdcdDC1HTNmu5dm5Q=";
};
build-system = [ flit-core ];
dependencies = [ pygments ];
nativeCheckInputs = [ pytestCheckHook ];
pythonImportsCheck = [ "ipython_pygments_lexers" ];
meta = {
description = "Pygments lexers for syntax-highlighting IPython code & sessions";
homepage = "https://github.com/ipython/ipython-pygments-lexers";
changelog = "https://github.com/ipython/ipython-pygments-lexers/releases/tag/${src.tag}";
license = lib.licenses.bsd3;
maintainers = with lib.maintainers; [ fab ];
};
}
@@ -18,14 +18,14 @@
buildPythonPackage rec {
pname = "lightning-utilities";
version = "0.14.1";
version = "0.14.2";
pyproject = true;
src = fetchFromGitHub {
owner = "Lightning-AI";
repo = "utilities";
tag = "v${version}";
hash = "sha256-QHE2ksoINQ0sfTSxXxM9ZVEIhEOncaq1i8ZNqznISJw=";
hash = "sha256-erjDDK7XJrq4Ast/RgQhEDQfDplUGMhWt4kakEzi8z8=";
};
postPatch = ''
@@ -17,14 +17,14 @@
buildPythonPackage rec {
pname = "lmfit";
version = "1.3.2";
version = "1.3.3";
pyproject = true;
disabled = pythonOlder "3.8";
src = fetchPypi {
inherit pname version;
hash = "sha256-Mb7q4fAnwbjBTc1/LoSIqAt1+zied/ymd1Sb3C/ll7s=";
hash = "sha256-czIea4gfL2hiNXIaffwCr2uw8DCiXv62Zjj2KxxgU6E=";
};
postPatch = ''
@@ -19,20 +19,20 @@
buildPythonPackage {
pname = "motmetrics";
version = "1.4.0-unstable-20240130";
version = "1.4.0-unstable-2025-01-14";
pyproject = true;
src = fetchFromGitHub {
owner = "cheind";
repo = "py-motmetrics";
# latest release is not compatible with pandas 2.0
rev = "7210fcce0be1b76c96a62f6fe4ddbc90d944eacb";
hash = "sha256-7LKLHXWgW4QpivAgzvWl6qEG0auVvpiZ6bfDViCKsFY=";
# Latest release is not compatible with pandas 2.0
rev = "c199b3e853d589af4b6a7d88f5bcc8b8802fc434";
hash = "sha256-DJ82nioW3jdIVo1B623BE8bBhVa1oMzYIkhhit4Z4dg=";
};
nativeBuildInputs = [ setuptools ];
build-system = [ setuptools ];
propagatedBuildInputs = [
dependencies = [
numpy
pandas
scipy
@@ -44,11 +44,14 @@ buildPythonPackage {
pytest-benchmark
];
pytestFlagsArray = [ "--benchmark-disable" ];
pythonImportsCheck = [ "motmetrics" ];
meta = with lib; {
description = "Bar_chart: Benchmark multiple object trackers (MOT) in Python";
description = "Benchmark multiple object trackers (MOT) in Python";
homepage = "https://github.com/cheind/py-motmetrics";
changelog = "https://github.com/cheind/py-motmetrics/releases/tag/${version}";
license = licenses.mit;
maintainers = [ ];
};
@@ -0,0 +1,51 @@
{
lib,
buildPythonPackage,
pythonAtLeast,
fetchFromGitHub,
setuptools,
python-dateutil,
drf-yasg,
netbox,
}:
buildPythonPackage rec {
pname = "netbox-contract";
version = "2.3.2";
pyproject = true;
disabled = pythonAtLeast "3.13";
src = fetchFromGitHub {
owner = "mlebreuil";
repo = "netbox-contract";
tag = "v${version}";
hash = "sha256-e3N0m+oj2CMUXwI4dF/tXA+Lz+9+ZlbJAy+zHoRDNtw=";
};
build-system = [ setuptools ];
dependencies = [
python-dateutil
drf-yasg
];
# running tests requires initialized django project
nativeCheckInputs = [
netbox
];
preFixup = ''
export PYTHONPATH=${netbox}/opt/netbox/netbox:$PYTHONPATH
'';
pythonImportsCheck = [ "netbox_contract" ];
meta = {
description = "Contract plugin for netbox";
homepage = "https://github.com/mlebreuil/netbox-contract";
changelog = "https://github.com/mlebreuil/netbox-contract/releases/tag/${src.rev}";
license = lib.licenses.mit;
platforms = lib.platforms.linux;
maintainers = with lib.maintainers; [ felbinger ];
};
}
@@ -1,30 +1,36 @@
{
lib,
buildPythonPackage,
fetchPypi,
flit-core,
certifi,
cryptography,
docker,
fetchFromGitHub,
flit-core,
podman,
pycryptodome,
pytestCheckHook,
python-dateutil,
typing-extensions,
urllib3,
}:
let
buildPythonPackage rec {
pname = "nethsm";
version = "1.2.1";
in
buildPythonPackage {
inherit pname version;
version = "1.3.0";
pyproject = true;
src = fetchPypi {
inherit pname version;
hash = "sha256-EPxGJFCGGl3p3yLlM7NH7xtEVS2woRigKJhL57A0gAE=";
src = fetchFromGitHub {
owner = "Nitrokey";
repo = "nethsm-sdk-py";
tag = "v${version}";
hash = "sha256-vH5YjS3VO5krCMVQFcEgDhJeCUzo9EzFnBxq+zPuZ68=";
};
propagatedBuildInputs = [
pythonRelaxDeps = true;
build-system = [ flit-core ];
dependencies = [
certifi
cryptography
python-dateutil
@@ -32,19 +38,30 @@ buildPythonPackage {
urllib3
];
nativeBuildInputs = [
flit-core
nativeCheckInputs = [
docker
podman
pycryptodome
pytestCheckHook
];
pythonRelaxDeps = true;
pythonImportsCheck = [ "nethsm" ];
disabledTestPaths = [
# Tests require a running Docker instance
"tests/test_nethsm_config.py"
"tests/test_nethsm_keys.py"
"tests/test_nethsm_namespaces.py"
"tests/test_nethsm_other.py"
"tests/test_nethsm_system.py"
"tests/test_nethsm_users.py"
];
meta = with lib; {
description = "Client-side Python SDK for NetHSM";
homepage = "https://github.com/Nitrokey/nethsm-sdk-py";
changelog = "https://github.com/Nitrokey/nethsm-sdk-py/releases/tag/v${version}";
license = with licenses; [ asl20 ];
license = licenses.asl20;
maintainers = with maintainers; [ frogamic ];
};
}
@@ -10,16 +10,16 @@
buildPythonPackage rec {
pname = "pyads";
version = "3.4.2";
version = "3.5.0";
pyproject = true;
disabled = pythonOlder "3.7";
disabled = pythonOlder "3.8";
src = fetchFromGitHub {
owner = "stlehmann";
repo = "pyads";
tag = version;
hash = "sha256-OvDh92fwHW+UzEO5iqVOY7d5H0Es6CJK/f/HCyLO9J4=";
hash = "sha256-eQC2ozJ5bKuhyInZDq8ZZNa9OGIN3tRjSHEPoqIU/jc=";
};
build-system = [ setuptools ];
@@ -38,7 +38,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Python wrapper for TwinCAT ADS library";
homepage = "https://github.com/MrLeeh/pyads";
changelog = "https://github.com/stlehmann/pyads/releases/tag/${version}";
changelog = "https://github.com/stlehmann/pyads/releases/tag/${src.tag}";
license = licenses.mit;
maintainers = with maintainers; [ jamiemagee ];
};
@@ -10,14 +10,14 @@
buildPythonPackage rec {
pname = "pyheos";
version = "1.0.3";
version = "1.0.4";
pyproject = true;
src = fetchFromGitHub {
owner = "andrewsayre";
repo = "pyheos";
tag = version;
hash = "sha256-1Jv1889RSjuediG5RGRcNdr1OmlOhpzqodgjnNmE2RY=";
hash = "sha256-sVh0mxhC0v1xtov4UNPMXGgYgMMTLZJaai11AOCMdiU=";
};
build-system = [ setuptools ];
@@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "qtawesome";
version = "1.3.1";
version = "1.4.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "spyder-ide";
repo = pname;
tag = "v${version}";
hash = "sha256-dF77vkrEl671fQvsHAX+JY9OmLA29kgAVswY2b3UyTg=";
hash = "sha256-VjUlP+5QU9ApD09UNvF48b0gepCUpVO6U6zYaKm0KoE=";
};
propagatedBuildInputs = [
@@ -13,14 +13,14 @@
buildPythonPackage rec {
pname = "snakemake-storage-plugin-s3";
version = "0.2.13";
version = "0.3.1";
pyproject = true;
src = fetchFromGitHub {
owner = "snakemake";
repo = pname;
repo = "snakemake-storage-plugin-s3";
tag = "v${version}";
hash = "sha256-tH4KLswRPberlaBlRCEJSPmUfkcwVkB9YbD/3LYJx0s=";
hash = "sha256-WbGlXu6/7e9U2GfVd4IF86bRfulNxjP1Tw5pVHpEj/g=";
};
build-system = [ poetry-core ];
@@ -40,6 +40,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Snakemake storage plugin for S3 API storage (AWS S3, MinIO, etc.)";
homepage = "https://github.com/snakemake/snakemake-storage-plugin-s3";
changelog = "https://github.com/snakemake/snakemake-storage-plugin-s3/releases/tag/${src.tag}";
license = licenses.mit;
maintainers = with maintainers; [ veprbl ];
};
@@ -18,14 +18,14 @@
buildPythonPackage rec {
pname = "spyder-kernels";
version = "3.0.3";
version = "3.1.0a1";
pyproject = true;
src = fetchFromGitHub {
owner = "spyder-ide";
repo = "spyder-kernels";
tag = "v${version}";
hash = "sha256-gsQVzDgEW+TQSitLiYAIEk4Ow1IyIKfp8BcHqNJ2Y+I=";
hash = "sha256-/Dd+yCLctOC7ao26EU6LrhBD1SKGd84XLepMdDJnFow=";
};
build-system = [ setuptools ];
@@ -19,6 +19,7 @@
diff-match-patch,
fzf,
intervaltree,
ipython-pygments-lexers,
jedi,
jellyfish,
keyring,
@@ -55,23 +56,19 @@
buildPythonPackage rec {
pname = "spyder";
version = "6.0.4";
version = "6.1.0a1";
pyproject = true;
src = fetchPypi {
inherit pname version;
hash = "sha256-4AsaO75mAH0rRDnrHGiwwfuQS7A/0/nQ7YPot6y0y+Y=";
hash = "sha256-Yjii1YUmdWdrrSLe3trAoATJXt2bfjc0JX5CBMVIEq8=";
};
patches = [ ./dont-clear-pythonpath.patch ];
nativeBuildInputs = [
pyqtwebengine.wrapQtAppsHook
];
nativeBuildInputs = [ pyqtwebengine.wrapQtAppsHook ];
build-system = [
setuptools
];
build-system = [ setuptools ];
dependencies = [
aiohttp
@@ -83,6 +80,7 @@ buildPythonPackage rec {
diff-match-patch
fzf
intervaltree
ipython-pygments-lexers
jedi
jellyfish
keyring
@@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "svg-py";
version = "1.5.0";
version = "1.6.0";
pyproject = true;
disabled = pythonOlder "3.7";
@@ -19,10 +19,10 @@ buildPythonPackage rec {
owner = "orsinium-labs";
repo = "svg.py";
tag = version;
hash = "sha256-Lxzk3IVCD4PG36Pozz2crccwxCAAAM2QfS4rgwbjs6g=";
hash = "sha256-XuSv4CVcbwWHuHiXxx4PfGJ8Pi+tfufbAdUiTFWNLcc=";
};
nativeBuildInputs = [ flit-core ];
build-system = [ flit-core ];
nativeCheckInputs = [
pytestCheckHook
@@ -39,7 +39,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Type-safe Python library to generate SVG files";
homepage = "https://github.com/orsinium-labs/svg.py";
changelog = "https://github.com/orsinium-labs/svg.py/releases/tag/${version}";
changelog = "https://github.com/orsinium-labs/svg.py/releases/tag/${src.tag}";
license = licenses.mit;
maintainers = with maintainers; [ fab ];
};
@@ -6,12 +6,13 @@
pytestCheckHook,
hypothesis,
levenshtein,
setuptools,
}:
buildPythonPackage rec {
pname = "thefuzz";
version = "0.22.1";
format = "setuptools";
pyproject = true;
disabled = pythonOlder "3.7";
@@ -20,20 +21,27 @@ buildPythonPackage rec {
hash = "sha256-cTgDmn7PVA2jI3kthZLvmQKx1563jBR9TyBmTeefNoA=";
};
propagatedBuildInputs = [ levenshtein ];
# Skip linting
postPatch = ''
substituteInPlace test_thefuzz.py --replace "import pycodestyle" ""
substituteInPlace test_thefuzz.py \
--replace-fail "import pycodestyle" ""
'';
pythonImportsCheck = [ "thefuzz" ];
build-system = [ setuptools ];
dependencies = [ levenshtein ];
nativeCheckInputs = [
hypothesis
pytestCheckHook
];
optional-dependencies = {
speedup = [ ];
};
pythonImportsCheck = [ "thefuzz" ];
disabledTests = [
# Skip linting
"test_pep8_conformance"
@@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "trimesh";
version = "4.6.4";
version = "4.6.5";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "mikedh";
repo = "trimesh";
tag = version;
hash = "sha256-kkIGAeWFrgOIbvBnZFRQue7Fh7REKF/CHgJLBEZliLM=";
hash = "sha256-zPtfJMBblXaapYE8jBf8755T+0LP3W9M7e5JnM2adHU=";
};
build-system = [ setuptools ];

Some files were not shown because too many files have changed in this diff Show More