mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-06-13 21:25:30 +03:00
Merge master into staging-next
This commit is contained in:
nixpkgs-ci[bot]
GitHub
commit
61b02cb4be
79 changed files with 390 additions and 229 deletions
2
.github/labeler.yml
vendored
2
.github/labeler.yml
vendored
|
|
@ -162,7 +162,7 @@
|
|||
- any-glob-to-any-file:
|
||||
- doc/languages-frameworks/gnome.section.md
|
||||
- nixos/modules/services/desktops/gnome/**/*
|
||||
- nixos/modules/services/x11/desktop-managers/gnome.nix
|
||||
- nixos/modules/services/desktop-managers/gnome.nix
|
||||
- nixos/tests/gnome-xorg.nix
|
||||
- nixos/tests/gnome.nix
|
||||
- pkgs/desktops/gnome/**/*
|
||||
|
|
|
|||
|
|
@ -26716,6 +26716,12 @@
|
|||
githubId = 9132420;
|
||||
keys = [ { fingerprint = "F943 A0BC 720C 5BEF 73CD E02D B398 93FA 5F65 CAE1"; } ];
|
||||
};
|
||||
womeier = {
|
||||
name = "Wolfgang Meier";
|
||||
email = "womeier@posteo.de";
|
||||
github = "womeier";
|
||||
githubId = 55190123;
|
||||
};
|
||||
womfoo = {
|
||||
email = "kranium@gikos.net";
|
||||
github = "womfoo";
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ Thus you should pick one or more of the following lines:
|
|||
{
|
||||
services.xserver.desktopManager.plasma5.enable = true;
|
||||
services.xserver.desktopManager.xfce.enable = true;
|
||||
services.xserver.desktopManager.gnome.enable = true;
|
||||
services.desktopManager.gnome.enable = true;
|
||||
services.xserver.desktopManager.mate.enable = true;
|
||||
services.xserver.windowManager.xmonad.enable = true;
|
||||
services.xserver.windowManager.twm.enable = true;
|
||||
|
|
@ -46,7 +46,7 @@ alternative one by picking one of the following lines:
|
|||
```nix
|
||||
{
|
||||
services.displayManager.sddm.enable = true;
|
||||
services.xserver.displayManager.gdm.enable = true;
|
||||
services.displayManager.gdm.enable = true;
|
||||
}
|
||||
```
|
||||
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ Alongside many enhancements to NixOS modules and general system improvements, th
|
|||
- GNOME has been updated to version 48.
|
||||
|
||||
- `decibels` music player is now installed by default. You can disable it using [](#opt-environment.gnome.excludePackages).
|
||||
- `gnome-shell-extensions` extension collection (which included GNOME Classic extensions, Apps Menu, and User Themes, among others) are no longer installed by default. You can install them again with [](#opt-services.xserver.desktopManager.gnome.sessionPath).
|
||||
- `gnome-shell-extensions` extension collection (which included GNOME Classic extensions, Apps Menu, and User Themes, among others) are no longer installed by default. You can install them again with {option}`services.xserver.desktopManager.gnome.sessionPath`.
|
||||
- Option [](#opt-services.gnome.core-developer-tools.enable) now also installs `sysprof` and `d-spy`.
|
||||
- Option `services.gnome.core-utilities.enable` has been renamed to [](#opt-services.gnome.core-apps.enable).
|
||||
- `cantarell-fonts`, `source-code-pro` and `source-sans` fonts are no longer installed by default. They have been replaced by `adwaita-fonts`.
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
isoImage.edition = lib.mkDefault "gnome";
|
||||
|
||||
services.xserver.desktopManager.gnome = {
|
||||
services.desktopManager.gnome = {
|
||||
# Add Firefox and other tools useful for installation to the launcher
|
||||
favoriteAppsOverride = ''
|
||||
[org.gnome.shell]
|
||||
|
|
@ -35,7 +35,7 @@
|
|||
QT_QPA_PLATFORM = "$([[ $XDG_SESSION_TYPE = \"wayland\" ]] && echo \"wayland\")";
|
||||
};
|
||||
|
||||
services.xserver.displayManager.gdm = {
|
||||
services.displayManager.gdm = {
|
||||
enable = true;
|
||||
# autoSuspend makes the machine automatically suspend after inactivity.
|
||||
# It's possible someone could/try to ssh'd into the machine and obviously
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
isoImage.edition = lib.mkDefault "gnome";
|
||||
|
||||
services.xserver.desktopManager.gnome = {
|
||||
services.desktopManager.gnome = {
|
||||
# Add Firefox and other tools useful for installation to the launcher
|
||||
favoriteAppsOverride = ''
|
||||
[org.gnome.shell]
|
||||
|
|
@ -16,7 +16,7 @@
|
|||
enable = true;
|
||||
};
|
||||
|
||||
services.xserver.displayManager.gdm = {
|
||||
services.displayManager.gdm = {
|
||||
enable = true;
|
||||
# autoSuspend makes the machine automatically suspend after inactivity.
|
||||
# It's possible someone could/try to ssh'd into the machine and obviously
|
||||
|
|
|
|||
|
|
@ -589,6 +589,7 @@
|
|||
./services/development/zammad.nix
|
||||
./services/display-managers/cosmic-greeter.nix
|
||||
./services/display-managers/default.nix
|
||||
./services/display-managers/gdm.nix
|
||||
./services/display-managers/greetd.nix
|
||||
./services/display-managers/ly.nix
|
||||
./services/display-managers/sddm.nix
|
||||
|
|
@ -1706,7 +1707,6 @@
|
|||
./services/x11/colord.nix
|
||||
./services/x11/desktop-managers/default.nix
|
||||
./services/x11/display-managers/default.nix
|
||||
./services/x11/display-managers/gdm.nix
|
||||
./services/x11/display-managers/lightdm.nix
|
||||
./services/x11/display-managers/slim.nix
|
||||
./services/x11/display-managers/startx.nix
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@
|
|||
services.dbus.packages = [ pkgs.gpaste ];
|
||||
systemd.packages = [ pkgs.gpaste ];
|
||||
# gnome-control-center crashes in Keyboard Shortcuts pane without the GSettings schemas.
|
||||
services.xserver.desktopManager.gnome.sessionPath = [ pkgs.gpaste ];
|
||||
services.desktopManager.gnome.sessionPath = [ pkgs.gpaste ];
|
||||
# gpaste-reloaded applet doesn't work without the typelib
|
||||
services.xserver.desktopManager.cinnamon.sessionPath = [ pkgs.gpaste ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ in
|
|||
nautilus-open-any-terminal
|
||||
];
|
||||
|
||||
environment.sessionVariables = lib.mkIf (!config.services.xserver.desktopManager.gnome.enable) {
|
||||
environment.sessionVariables = lib.mkIf (!config.services.desktopManager.gnome.enable) {
|
||||
NAUTILUS_4_EXTENSION_DIR = "${pkgs.nautilus-python}/lib/nautilus/extensions-4";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@
|
|||
|
||||
# Support GNOME desktop environment if it's enabled on the system.
|
||||
gnomeXdgDesktopPortalSupport =
|
||||
prev.gnomeXdgDesktopPortalSupport or config.services.xserver.desktopManager.gnome.enable;
|
||||
prev.gnomeXdgDesktopPortalSupport or config.services.desktopManager.gnome.enable;
|
||||
|
||||
# Support Hyprland desktop for Wayland if it's enabled on the system.
|
||||
hyprlandXdgDesktopPortalSupport =
|
||||
|
|
|
|||
|
|
@ -10,8 +10,8 @@ To enable the GNOME desktop use:
|
|||
|
||||
```nix
|
||||
{
|
||||
services.xserver.desktopManager.gnome.enable = true;
|
||||
services.xserver.displayManager.gdm.enable = true;
|
||||
services.desktopManager.gnome.enable = true;
|
||||
services.displayManager.gdm.enable = true;
|
||||
}
|
||||
```
|
||||
|
||||
|
|
@ -76,17 +76,17 @@ GNOME Flashback provides a desktop environment based on the classic GNOME 2 arch
|
|||
|
||||
```nix
|
||||
{
|
||||
services.xserver.desktopManager.gnome.flashback.enableMetacity = true;
|
||||
services.desktopManager.gnome.flashback.enableMetacity = true;
|
||||
}
|
||||
```
|
||||
|
||||
It is also possible to create custom sessions that replace Metacity with a different window manager using [](#opt-services.xserver.desktopManager.gnome.flashback.customSessions).
|
||||
It is also possible to create custom sessions that replace Metacity with a different window manager using [](#opt-services.desktopManager.gnome.flashback.customSessions).
|
||||
|
||||
The following example uses `xmonad` window manager:
|
||||
|
||||
```nix
|
||||
{
|
||||
services.xserver.desktopManager.gnome.flashback.customSessions = [
|
||||
services.desktopManager.gnome.flashback.customSessions = [
|
||||
{
|
||||
wmName = "xmonad";
|
||||
wmLabel = "XMonad";
|
||||
|
|
@ -143,10 +143,10 @@ Overrides really only change the default values for GSettings keys so if you or
|
|||
:::
|
||||
|
||||
You can override the default GSettings values using the
|
||||
[](#opt-services.xserver.desktopManager.gnome.extraGSettingsOverrides) option.
|
||||
[](#opt-services.desktopManager.gnome.extraGSettingsOverrides) option.
|
||||
|
||||
Take note that whatever packages you want to override GSettings for, you need to add them to
|
||||
[](#opt-services.xserver.desktopManager.gnome.extraGSettingsOverridePackages).
|
||||
[](#opt-services.desktopManager.gnome.extraGSettingsOverridePackages).
|
||||
|
||||
You can use `dconf-editor` tool to explore which GSettings you can set.
|
||||
|
||||
|
|
@ -154,7 +154,7 @@ You can use `dconf-editor` tool to explore which GSettings you can set.
|
|||
|
||||
```nix
|
||||
{
|
||||
services.xserver.desktopManager.gnome = {
|
||||
services.desktopManager.gnome = {
|
||||
extraGSettingsOverrides = ''
|
||||
# Change default background
|
||||
[org.gnome.desktop.background]
|
||||
|
|
@ -15,7 +15,7 @@ let
|
|||
literalExpression
|
||||
;
|
||||
|
||||
cfg = config.services.xserver.desktopManager.gnome;
|
||||
cfg = config.services.desktopManager.gnome;
|
||||
serviceCfg = config.services.gnome;
|
||||
|
||||
# Prioritize nautilus by default when opening directories
|
||||
|
|
@ -78,13 +78,45 @@ let
|
|||
in
|
||||
|
||||
{
|
||||
|
||||
meta = {
|
||||
doc = ./gnome.md;
|
||||
maintainers = lib.teams.gnome.members;
|
||||
};
|
||||
|
||||
imports = [
|
||||
(lib.mkRenamedOptionModule
|
||||
[ "services" "xserver" "desktopManager" "gnome" "enable" ]
|
||||
[ "services" "desktopManager" "gnome" "enable" ]
|
||||
)
|
||||
(lib.mkRenamedOptionModule
|
||||
[ "services" "xserver" "desktopManager" "gnome" "extraGSettingsOverrides" ]
|
||||
[ "services" "desktopManager" "gnome" "extraGSettingsOverrides" ]
|
||||
)
|
||||
(lib.mkRenamedOptionModule
|
||||
[ "services" "xserver" "desktopManager" "gnome" "extraGSettingsOverridePackages" ]
|
||||
[ "services" "desktopManager" "gnome" "extraGSettingsOverridePackages" ]
|
||||
)
|
||||
(lib.mkRenamedOptionModule
|
||||
[ "services" "xserver" "desktopManager" "gnome" "debug" ]
|
||||
[ "services" "desktopManager" "gnome" "debug" ]
|
||||
)
|
||||
(lib.mkRenamedOptionModule
|
||||
[ "services" "xserver" "desktopManager" "gnome" "sessionPath" ]
|
||||
[ "services" "desktopManager" "gnome" "sessionPath" ]
|
||||
)
|
||||
# flashback options
|
||||
(lib.mkRenamedOptionModule
|
||||
[ "services" "xserver" "desktopManager" "gnome" "flashback" "customSessions" ]
|
||||
[ "services" "desktopManager" "gnome" "flashback" "customSessions" ]
|
||||
)
|
||||
(lib.mkRenamedOptionModule
|
||||
[ "services" "xserver" "desktopManager" "gnome" "flashback" "enableMetacity" ]
|
||||
[ "services" "desktopManager" "gnome" "flashback" "enableMetacity" ]
|
||||
)
|
||||
(lib.mkRenamedOptionModule
|
||||
[ "services" "xserver" "desktopManager" "gnome" "flashback" "panelModulePackages" ]
|
||||
[ "services" "desktopManager" "gnome" "flashback" "panelModulePackages" ]
|
||||
)
|
||||
(lib.mkRenamedOptionModule
|
||||
[ "services" "gnome" "core-utilities" "enable" ]
|
||||
[ "services" "gnome" "core-apps" "enable" ]
|
||||
|
|
@ -101,7 +133,7 @@ in
|
|||
games.enable = mkEnableOption "GNOME games";
|
||||
};
|
||||
|
||||
services.xserver.desktopManager.gnome = {
|
||||
services.desktopManager.gnome = {
|
||||
enable = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
|
|
@ -213,8 +245,8 @@ in
|
|||
system.nixos-generate-config.desktopConfiguration = [
|
||||
''
|
||||
# Enable the GNOME Desktop Environment.
|
||||
services.xserver.displayManager.gdm.enable = true;
|
||||
services.xserver.desktopManager.gnome.enable = true;
|
||||
services.displayManager.gdm.enable = true;
|
||||
services.desktopManager.gnome.enable = true;
|
||||
''
|
||||
];
|
||||
|
||||
|
|
@ -333,7 +365,7 @@ in
|
|||
})
|
||||
|
||||
(lib.mkIf serviceCfg.core-shell.enable {
|
||||
services.xserver.desktopManager.gnome.sessionPath = [
|
||||
services.desktopManager.gnome.sessionPath = [
|
||||
pkgs.gnome-shell
|
||||
];
|
||||
|
||||
|
|
@ -257,7 +257,7 @@ in
|
|||
dmConf = config.services.xserver.displayManager;
|
||||
noDmUsed =
|
||||
!(
|
||||
dmConf.gdm.enable || cfg.sddm.enable || dmConf.xpra.enable || dmConf.lightdm.enable || cfg.ly.enable
|
||||
cfg.gdm.enable || cfg.sddm.enable || dmConf.xpra.enable || dmConf.lightdm.enable || cfg.ly.enable
|
||||
);
|
||||
in
|
||||
lib.mkIf noDmUsed (lib.mkDefault false);
|
||||
|
|
|
|||
|
|
@ -7,19 +7,20 @@
|
|||
|
||||
let
|
||||
|
||||
cfg = config.services.xserver.displayManager;
|
||||
cfg = config.services.displayManager.gdm;
|
||||
gdm = pkgs.gdm;
|
||||
xdmcfg = config.services.xserver.displayManager;
|
||||
pamLogin = config.security.pam.services.login;
|
||||
settingsFormat = pkgs.formats.ini { };
|
||||
configFile = settingsFormat.generate "custom.conf" cfg.gdm.settings;
|
||||
configFile = settingsFormat.generate "custom.conf" cfg.settings;
|
||||
|
||||
xSessionWrapper =
|
||||
if (cfg.setupCommands == "") then
|
||||
if (xdmcfg.setupCommands == "") then
|
||||
null
|
||||
else
|
||||
pkgs.writeScript "gdm-x-session-wrapper" ''
|
||||
#!${pkgs.bash}/bin/bash
|
||||
${cfg.setupCommands}
|
||||
${xdmcfg.setupCommands}
|
||||
exec "$@"
|
||||
'';
|
||||
|
||||
|
|
@ -41,7 +42,7 @@ let
|
|||
|
||||
defaultSessionName = config.services.displayManager.defaultSession;
|
||||
|
||||
setSessionScript = pkgs.callPackage ./account-service-util.nix { };
|
||||
setSessionScript = pkgs.callPackage ../x11/display-managers/account-service-util.nix { };
|
||||
in
|
||||
|
||||
{
|
||||
|
|
@ -72,6 +73,35 @@ in
|
|||
"gdm"
|
||||
"nvidiaWayland"
|
||||
] "We defer to GDM whether Wayland should be enabled.")
|
||||
|
||||
(lib.mkRenamedOptionModule
|
||||
[ "services" "xserver" "displayManager" "gdm" "enable" ]
|
||||
[ "services" "displayManager" "gdm" "enable" ]
|
||||
)
|
||||
(lib.mkRenamedOptionModule
|
||||
[ "services" "xserver" "displayManager" "gdm" "debug" ]
|
||||
[ "services" "displayManager" "gdm" "debug" ]
|
||||
)
|
||||
(lib.mkRenamedOptionModule
|
||||
[ "services" "xserver" "displayManager" "gdm" "banner" ]
|
||||
[ "services" "displayManager" "gdm" "banner" ]
|
||||
)
|
||||
(lib.mkRenamedOptionModule
|
||||
[ "services" "xserver" "displayManager" "gdm" "settings" ]
|
||||
[ "services" "displayManager" "gdm" "settings" ]
|
||||
)
|
||||
(lib.mkRenamedOptionModule
|
||||
[ "services" "xserver" "displayManager" "gdm" "wayland" ]
|
||||
[ "services" "displayManager" "gdm" "wayland" ]
|
||||
)
|
||||
(lib.mkRenamedOptionModule
|
||||
[ "services" "xserver" "displayManager" "gdm" "autoSuspend" ]
|
||||
[ "services" "displayManager" "gdm" "autoSuspend" ]
|
||||
)
|
||||
(lib.mkRenamedOptionModule
|
||||
[ "services" "xserver" "displayManager" "gdm" "autoLogin" "delay" ]
|
||||
[ "services" "displayManager" "gdm" "autoLogin" "delay" ]
|
||||
)
|
||||
];
|
||||
|
||||
meta = {
|
||||
|
|
@ -82,7 +112,7 @@ in
|
|||
|
||||
options = {
|
||||
|
||||
services.xserver.displayManager.gdm = {
|
||||
services.displayManager.gdm = {
|
||||
|
||||
enable = lib.mkEnableOption "GDM, the GNOME Display Manager";
|
||||
|
||||
|
|
@ -145,7 +175,7 @@ in
|
|||
|
||||
###### implementation
|
||||
|
||||
config = lib.mkIf cfg.gdm.enable {
|
||||
config = lib.mkIf cfg.enable {
|
||||
|
||||
services.xserver.displayManager.lightdm.enable = false;
|
||||
|
||||
|
|
@ -170,7 +200,7 @@ in
|
|||
|
||||
environment =
|
||||
{
|
||||
GDM_X_SERVER_EXTRA_ARGS = toString (lib.filter (arg: arg != "-terminate") cfg.xserverArgs);
|
||||
GDM_X_SERVER_EXTRA_ARGS = toString (lib.filter (arg: arg != "-terminate") xdmcfg.xserverArgs);
|
||||
XDG_DATA_DIRS = lib.makeSearchPath "share" [
|
||||
gdm # for gnome-login.session
|
||||
config.services.displayManager.sessionData.desktops
|
||||
|
|
@ -274,7 +304,7 @@ in
|
|||
systemd.user.services.dbus.wantedBy = [ "default.target" ];
|
||||
|
||||
programs.dconf.profiles.gdm.databases =
|
||||
lib.optionals (!cfg.gdm.autoSuspend) [
|
||||
lib.optionals (!cfg.autoSuspend) [
|
||||
{
|
||||
settings."org/gnome/settings-daemon/plugins/power" = {
|
||||
sleep-inactive-ac-type = "nothing";
|
||||
|
|
@ -284,11 +314,11 @@ in
|
|||
};
|
||||
}
|
||||
]
|
||||
++ lib.optionals (cfg.gdm.banner != null) [
|
||||
++ lib.optionals (cfg.banner != null) [
|
||||
{
|
||||
settings."org/gnome/login-screen" = {
|
||||
banner-message-enable = true;
|
||||
banner-message-text = cfg.gdm.banner;
|
||||
banner-message-text = cfg.banner;
|
||||
};
|
||||
}
|
||||
]
|
||||
|
|
@ -297,21 +327,21 @@ in
|
|||
# Use AutomaticLogin if delay is zero, because it's immediate.
|
||||
# Otherwise with TimedLogin with zero seconds the prompt is still
|
||||
# presented and there's a little delay.
|
||||
services.xserver.displayManager.gdm.settings = {
|
||||
services.displayManager.gdm.settings = {
|
||||
daemon = lib.mkMerge [
|
||||
{ WaylandEnable = cfg.gdm.wayland; }
|
||||
{ WaylandEnable = cfg.wayland; }
|
||||
# nested if else didn't work
|
||||
(lib.mkIf (config.services.displayManager.autoLogin.enable && cfg.gdm.autoLogin.delay != 0) {
|
||||
(lib.mkIf (config.services.displayManager.autoLogin.enable && cfg.autoLogin.delay != 0) {
|
||||
TimedLoginEnable = true;
|
||||
TimedLogin = config.services.displayManager.autoLogin.user;
|
||||
TimedLoginDelay = cfg.gdm.autoLogin.delay;
|
||||
TimedLoginDelay = cfg.autoLogin.delay;
|
||||
})
|
||||
(lib.mkIf (config.services.displayManager.autoLogin.enable && cfg.gdm.autoLogin.delay == 0) {
|
||||
(lib.mkIf (config.services.displayManager.autoLogin.enable && cfg.autoLogin.delay == 0) {
|
||||
AutomaticLoginEnable = true;
|
||||
AutomaticLogin = config.services.displayManager.autoLogin.user;
|
||||
})
|
||||
];
|
||||
debug = lib.mkIf cfg.gdm.debug {
|
||||
debug = lib.mkIf cfg.debug {
|
||||
Enable = true;
|
||||
};
|
||||
};
|
||||
|
|
@ -31,7 +31,6 @@ in
|
|||
./lumina.nix
|
||||
./lxqt.nix
|
||||
./enlightenment.nix
|
||||
./gnome.nix
|
||||
./retroarch.nix
|
||||
./kodi.nix
|
||||
./mate.nix
|
||||
|
|
@ -43,6 +42,7 @@ in
|
|||
./deepin.nix
|
||||
../../desktop-managers/lomiri.nix
|
||||
../../desktop-managers/cosmic.nix
|
||||
../../desktop-managers/gnome.nix
|
||||
];
|
||||
|
||||
options = {
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ with lib;
|
|||
services.xserver.videoDrivers = [ ];
|
||||
|
||||
# Enable GDM. Any display manager will do as long as it supports XDMCP.
|
||||
services.xserver.displayManager.gdm.enable = true;
|
||||
services.displayManager.gdm.enable = true;
|
||||
|
||||
systemd.sockets.terminal-server = {
|
||||
description = "Terminal Server Socket";
|
||||
|
|
|
|||
|
|
@ -761,7 +761,7 @@ in
|
|||
dmConf = cfg.displayManager;
|
||||
default =
|
||||
!(
|
||||
dmConf.gdm.enable
|
||||
config.services.displayManager.gdm.enable
|
||||
|| config.services.displayManager.sddm.enable
|
||||
|| dmConf.xpra.enable
|
||||
|| dmConf.sx.enable
|
||||
|
|
|
|||
|
|
@ -100,6 +100,9 @@ let
|
|||
"ReceiveQueues"
|
||||
"TransmitQueues"
|
||||
"TransmitQueueLength"
|
||||
"RxFlowControl"
|
||||
"TxFlowControl"
|
||||
"AutoNegotiationFlowControl"
|
||||
])
|
||||
(assertValueOneOf "MACAddressPolicy" [
|
||||
"persistent"
|
||||
|
|
@ -137,6 +140,9 @@ let
|
|||
(assertValueOneOf "GenericSegmentationOffload" boolValues)
|
||||
(assertValueOneOf "GenericReceiveOffload" boolValues)
|
||||
(assertValueOneOf "LargeReceiveOffload" boolValues)
|
||||
(assertValueOneOf "RxFlowControl" boolValues)
|
||||
(assertValueOneOf "TxFlowControl" boolValues)
|
||||
(assertValueOneOf "AutoNegotiationFlowControl" boolValues)
|
||||
(assertInt "RxChannels")
|
||||
(assertRange "RxChannels" 1 4294967295)
|
||||
(assertInt "TxChannels")
|
||||
|
|
|
|||
|
|
@ -610,8 +610,8 @@ rec {
|
|||
{ ... }:
|
||||
{
|
||||
services.xserver.enable = true;
|
||||
services.xserver.displayManager.gdm.enable = true;
|
||||
services.xserver.desktopManager.gnome.enable = true;
|
||||
services.displayManager.gdm.enable = true;
|
||||
services.desktopManager.gnome.enable = true;
|
||||
}
|
||||
);
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ pkgs, ... }:
|
||||
{ lib, pkgs, ... }:
|
||||
let
|
||||
certs = pkgs.runCommand "cryptpadSelfSignedCerts" { buildInputs = [ pkgs.openssl ]; } ''
|
||||
mkdir -p $out
|
||||
|
|
@ -12,6 +12,48 @@ let
|
|||
test_write_data = pkgs.writeText "cryptpadTestData" ''
|
||||
{"command":"WRITE_BLOCK","content":{"publicKey":"O2onvM62pC1io6jQKm8Nc2UyFXcd4kOmOsBIoYtZ2ik=","signature":"aXcM9SMO59lwA7q7HbYB+AnzymmxSyy/KhkG/cXIBVzl8v+kkPWXmFuWhcuKfRF8yt3Zc3ktIsHoFyuyDSAwAA==","ciphertext":"AFwCIfBHKdFzDKjMg4cu66qlJLpP+6Yxogbl3o9neiQou5P8h8yJB8qgnQ=="},"publicKey":"O2onvM62pC1io6jQKm8Nc2UyFXcd4kOmOsBIoYtZ2ik=","nonce":"bitSbJMNSzOsg98nEzN80a231PCkBQeH"}
|
||||
'';
|
||||
seleniumScript =
|
||||
pkgs.writers.writePython3Bin "selenium-script"
|
||||
{
|
||||
libraries = with pkgs.python3Packages; [ selenium ];
|
||||
}
|
||||
''
|
||||
from sys import stderr
|
||||
from time import time
|
||||
from selenium import webdriver
|
||||
from selenium.webdriver.common.by import By
|
||||
from selenium.webdriver.firefox.options import Options
|
||||
from selenium.webdriver.support.ui import WebDriverWait
|
||||
from selenium.webdriver.support import expected_conditions as EC
|
||||
|
||||
options = Options()
|
||||
options.add_argument("--headless")
|
||||
service = webdriver.FirefoxService(executable_path="${lib.getExe pkgs.geckodriver}") # noqa: E501
|
||||
|
||||
driver = webdriver.Firefox(options=options, service=service)
|
||||
driver.implicitly_wait(10)
|
||||
driver.get("https://cryptpad.localhost")
|
||||
|
||||
WebDriverWait(driver, 10).until(
|
||||
EC.text_to_be_present_in_element(
|
||||
(By.TAG_NAME, "body"), "CryptPad")
|
||||
)
|
||||
|
||||
driver.find_element(By.PARTIAL_LINK_TEXT, "Sheet").click()
|
||||
|
||||
# Title changes once the sheet is rendered, which can take
|
||||
# a lot of time on first run (browser generates keypair etc)
|
||||
start = time()
|
||||
WebDriverWait(driver, 60).until(
|
||||
EC.title_contains('Sheet')
|
||||
)
|
||||
print(f"Sheets done loading in {time() - start}", file=stderr)
|
||||
|
||||
# check screen looks sane...
|
||||
# driver.print_page() and dump pdf somewhere through pdftotext? OCR?
|
||||
|
||||
driver.close()
|
||||
'';
|
||||
in
|
||||
{
|
||||
name = "cryptpad";
|
||||
|
|
@ -20,6 +62,9 @@ in
|
|||
};
|
||||
|
||||
nodes.machine = {
|
||||
environment.systemPackages = [
|
||||
pkgs.firefox-unwrapped
|
||||
];
|
||||
services.cryptpad = {
|
||||
enable = true;
|
||||
configureNginx = true;
|
||||
|
|
@ -62,6 +107,9 @@ in
|
|||
# test some API (e.g. check cryptpad main process)
|
||||
machine.succeed("curl --fail -d @${test_write_data} -H 'Content-Type: application/json' https://cryptpad.localhost/api/auth")
|
||||
|
||||
# page loads
|
||||
machine.succeed("${lib.getExe seleniumScript}")
|
||||
|
||||
# test telemetry has been disabled
|
||||
machine.fail("journalctl -u cryptpad | grep TELEMETRY");
|
||||
|
||||
|
|
|
|||
|
|
@ -34,8 +34,8 @@
|
|||
};
|
||||
|
||||
# Configure Gnome
|
||||
services.xserver.desktopManager.gnome.enable = true;
|
||||
services.xserver.desktopManager.gnome.debug = true;
|
||||
services.desktopManager.gnome.enable = true;
|
||||
services.desktopManager.gnome.debug = true;
|
||||
|
||||
systemd.user.services = {
|
||||
"org.gnome.Shell@wayland" = {
|
||||
|
|
|
|||
|
|
@ -14,9 +14,9 @@
|
|||
|
||||
services.xserver.enable = true;
|
||||
|
||||
services.xserver.displayManager = {
|
||||
gdm.enable = true;
|
||||
gdm.debug = true;
|
||||
services.displayManager.gdm = {
|
||||
enable = true;
|
||||
debug = true;
|
||||
};
|
||||
|
||||
services.displayManager.autoLogin = {
|
||||
|
|
@ -24,9 +24,9 @@
|
|||
user = user.name;
|
||||
};
|
||||
|
||||
services.xserver.desktopManager.gnome.enable = true;
|
||||
services.xserver.desktopManager.gnome.debug = true;
|
||||
services.xserver.desktopManager.gnome.flashback.enableMetacity = true;
|
||||
services.desktopManager.gnome.enable = true;
|
||||
services.desktopManager.gnome.debug = true;
|
||||
services.desktopManager.gnome.flashback.enableMetacity = true;
|
||||
services.displayManager.defaultSession = "gnome-flashback-metacity";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -16,9 +16,9 @@
|
|||
|
||||
services.xserver.enable = true;
|
||||
|
||||
services.xserver.displayManager = {
|
||||
gdm.enable = true;
|
||||
gdm.debug = true;
|
||||
services.displayManager.gdm = {
|
||||
enable = true;
|
||||
debug = true;
|
||||
};
|
||||
|
||||
services.displayManager.autoLogin = {
|
||||
|
|
@ -26,8 +26,8 @@
|
|||
user = user.name;
|
||||
};
|
||||
|
||||
services.xserver.desktopManager.gnome.enable = true;
|
||||
services.xserver.desktopManager.gnome.debug = true;
|
||||
services.desktopManager.gnome.enable = true;
|
||||
services.desktopManager.gnome.debug = true;
|
||||
services.displayManager.defaultSession = "gnome-xorg";
|
||||
|
||||
systemd.user.services = {
|
||||
|
|
|
|||
|
|
@ -11,9 +11,9 @@
|
|||
|
||||
services.xserver.enable = true;
|
||||
|
||||
services.xserver.displayManager = {
|
||||
gdm.enable = true;
|
||||
gdm.debug = true;
|
||||
services.displayManager.gdm = {
|
||||
enable = true;
|
||||
debug = true;
|
||||
};
|
||||
|
||||
services.displayManager.autoLogin = {
|
||||
|
|
@ -21,8 +21,8 @@
|
|||
user = "alice";
|
||||
};
|
||||
|
||||
services.xserver.desktopManager.gnome.enable = true;
|
||||
services.xserver.desktopManager.gnome.debug = true;
|
||||
services.desktopManager.gnome.enable = true;
|
||||
services.desktopManager.gnome.debug = true;
|
||||
|
||||
systemd.user.services = {
|
||||
"org.gnome.Shell@wayland" = {
|
||||
|
|
|
|||
|
|
@ -15,8 +15,8 @@
|
|||
system.nixos-generate-config.desktopConfiguration = [
|
||||
''
|
||||
# DESKTOP
|
||||
services.xserver.displayManager.gdm.enable = true;
|
||||
services.xserver.desktopManager.gnome.enable = true;
|
||||
services.displayManager.gdm.enable = true;
|
||||
services.desktopManager.gnome.enable = true;
|
||||
''
|
||||
];
|
||||
};
|
||||
|
|
@ -40,7 +40,7 @@
|
|||
|
||||
# Test if the Perl variable $desktopConfiguration is spliced correctly
|
||||
machine.succeed(
|
||||
"grep 'services\\.xserver\\.desktopManager\\.gnome\\.enable = true;' /etc/nixos/configuration.nix"
|
||||
"grep 'services\\.desktopManager\\.gnome\\.enable = true;' /etc/nixos/configuration.nix"
|
||||
)
|
||||
|
||||
machine.succeed("rm -rf /etc/nixos")
|
||||
|
|
|
|||
|
|
@ -4669,8 +4669,8 @@ let
|
|||
mktplcRef = {
|
||||
name = "svelte-vscode";
|
||||
publisher = "svelte";
|
||||
version = "109.8.0";
|
||||
hash = "sha256-T0pNjjeKKX/T1Oc+zvOHu74H4r4F9Ogk5gDV7z0+D9I=";
|
||||
version = "109.8.1";
|
||||
hash = "sha256-ILZ7YA7LngwpU3U+qsgHPd+oxyqLNGRiKUCFC/OMBAo=";
|
||||
};
|
||||
meta = {
|
||||
changelog = "https://github.com/sveltejs/language-tools/releases";
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
}:
|
||||
mkLibretroCore {
|
||||
core = "pcsx-rearmed";
|
||||
version = "0-unstable-2025-04-13";
|
||||
version = "0-unstable-2025-05-23";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libretro";
|
||||
repo = "pcsx_rearmed";
|
||||
rev = "febf2246848efb8937ab24c562bba20107bb46f0";
|
||||
hash = "sha256-1mnPYr5A6KmZXXbvkE9XkZiCjx/y0Y9/Ed34LQHDbvE=";
|
||||
rev = "6365a756c02d25c76bf90c78e42316b46f876c49";
|
||||
hash = "sha256-7bL+3+AfbN9FBhMaF8FzZhGZ0OgKGCT+M/5KVYd9Tt0=";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
}:
|
||||
mkLibretroCore {
|
||||
core = "stella";
|
||||
version = "0-unstable-2025-05-17";
|
||||
version = "0-unstable-2025-05-21";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "stella-emu";
|
||||
repo = "stella";
|
||||
rev = "8421af89314bbdcf118d4b3884a9f566e4b1020e";
|
||||
hash = "sha256-uffcz8TXb0vEivOEcnL288YT8rspSOGcNdXtGijXX1g=";
|
||||
rev = "3d3f223a17fe065c7dee1ff440f0309eb8583009";
|
||||
hash = "sha256-RR6/zRqFUctWc+Rrbm+4Twk6GZwpPgYHgFP65sL6UN8=";
|
||||
};
|
||||
|
||||
makefile = "Makefile";
|
||||
|
|
|
|||
|
|
@ -9,13 +9,13 @@
|
|||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "5.5.3";
|
||||
version = "5.6.0";
|
||||
pname = "keystore-explorer";
|
||||
src = fetchzip {
|
||||
url = "https://github.com/kaikramer/keystore-explorer/releases/download/v${version}/kse-${
|
||||
lib.replaceStrings [ "." ] [ "" ] version
|
||||
}.zip";
|
||||
sha256 = "sha256-oShVfmien4HMpAfSa9rPr18wLu7RN8ZWEZEUtiBHyBs=";
|
||||
sha256 = "sha256-+ZgALJaZodLmAtdCIE1SG6D0lzlETg4mMPXheXmGhPc=";
|
||||
};
|
||||
|
||||
# glib is necessary so file dialogs don't hang.
|
||||
|
|
|
|||
|
|
@ -909,7 +909,7 @@ rec {
|
|||
nativeBuildInputs = [
|
||||
buildPackages.perl
|
||||
buildPackages.dpkg
|
||||
pkgs.nixfmt-rfc-style
|
||||
buildPackages.nixfmt-rfc-style
|
||||
];
|
||||
}
|
||||
''
|
||||
|
|
|
|||
8
pkgs/by-name/am/amp-cli/package-lock.json
generated
8
pkgs/by-name/am/amp-cli/package-lock.json
generated
|
|
@ -5,7 +5,7 @@
|
|||
"packages": {
|
||||
"": {
|
||||
"dependencies": {
|
||||
"@sourcegraph/amp": "^0.0.1748347293-g7a57b5"
|
||||
"@sourcegraph/amp": "^0.0.1748404992-ga3f78f"
|
||||
}
|
||||
},
|
||||
"node_modules/@colors/colors": {
|
||||
|
|
@ -29,9 +29,9 @@
|
|||
}
|
||||
},
|
||||
"node_modules/@sourcegraph/amp": {
|
||||
"version": "0.0.1748347293-g7a57b5",
|
||||
"resolved": "https://registry.npmjs.org/@sourcegraph/amp/-/amp-0.0.1748347293-g7a57b5.tgz",
|
||||
"integrity": "sha512-gftyQ7jHEo1AmyP8khbTYfkGWlAzfk6TyVw11WdO3bsjVT16yWnp0nWqW1W1X0BCbDiKdyRNasR1JadZH4+gGQ==",
|
||||
"version": "0.0.1748404992-ga3f78f",
|
||||
"resolved": "https://registry.npmjs.org/@sourcegraph/amp/-/amp-0.0.1748404992-ga3f78f.tgz",
|
||||
"integrity": "sha512-+BvCW8zrbO7ENRzMg0LdAeKigjzL+ASIDBjJ/m2uL2CVT8WPk1h34FTNCbvnO6kssimEtdP8FcxR/2O4AHwUbA==",
|
||||
"dependencies": {
|
||||
"@types/runes": "^0.4.3",
|
||||
"@vscode/ripgrep": "1.15.11",
|
||||
|
|
|
|||
|
|
@ -8,11 +8,11 @@
|
|||
|
||||
buildNpmPackage rec {
|
||||
pname = "amp-cli";
|
||||
version = "0.0.1748347293-g7a57b5";
|
||||
version = "0.0.1748404992-ga3f78f";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://registry.npmjs.org/@sourcegraph/amp/-/amp-${version}.tgz";
|
||||
hash = "sha256-15R7RojQgF9B5voQfsB0aLNIBR2M7qqLNpMa950pAKM=";
|
||||
hash = "sha256-axd5VP7afa4ptAl/y8CEVguqoRKVRhWfRDSI0sgyXqA=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
@ -44,7 +44,7 @@ buildNpmPackage rec {
|
|||
chmod +x bin/amp-wrapper.js
|
||||
'';
|
||||
|
||||
npmDepsHash = "sha256-4CSXRNCKgRunMZvFM2w6wrAcTb03iPjPprTm67fHZ9Q=";
|
||||
npmDepsHash = "sha256-05+hBr+eX3I92U9TsqPQrYcJCmKXTvz3n6ZTxR1XvC8=";
|
||||
|
||||
propagatedBuildInputs = [
|
||||
ripgrep
|
||||
|
|
@ -71,7 +71,7 @@ buildNpmPackage rec {
|
|||
passthru.updateScript = ./update.sh;
|
||||
|
||||
meta = {
|
||||
description = "Amp is an AI coding agent, in research preview from Sourcegraph. This is the CLI for Amp.";
|
||||
description = "CLI for Amp, an agentic coding agent in research preview from Sourcegraph";
|
||||
homepage = "https://ampcode.com/";
|
||||
downloadPage = "https://www.npmjs.com/package/@sourcegraph/amp";
|
||||
license = lib.licenses.unfree;
|
||||
|
|
|
|||
|
|
@ -6,17 +6,17 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-careful";
|
||||
version = "0.4.5";
|
||||
version = "0.4.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "RalfJung";
|
||||
repo = "cargo-careful";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-dalsBILFZzVHBIhGGIOUMSCWuM7xE46w91MbzCYa1Io=";
|
||||
hash = "sha256-aKmaNDk9yZ/1MS3vQ9c1rCySfxiNv8PRwnIjT5bdhMg=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-Es5BT0jfyJXuw7TTtGRhI4PeplZgTYm6JhSxQiZ+6NE=";
|
||||
cargoHash = "sha256-KtTTpYwhNYvghb8k2NXyCRV5NGn07d7iaW+5uTI6qJ4=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Tool to execute Rust code carefully, with extra checking along the way";
|
||||
|
|
|
|||
|
|
@ -9,17 +9,17 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-edit";
|
||||
version = "0.13.4";
|
||||
version = "0.13.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "killercup";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-gs7+OuW0av7p45+wgXVVS17YKTwIqDFQWc3kKE7y/Yw=";
|
||||
hash = "sha256-z+LTgCeTUr3D0LEbw0yHlk1di2W95XewbYlgusD2TLg=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-JafagbF+JCp3ATtGjlExLDUehYqO9DhI39uD4fLafsQ=";
|
||||
cargoHash = "sha256-/+DDA64kemZKzKdaKnXK+R4e8FV59qT5HCGcwyOz7R8=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
cargo-shear,
|
||||
}:
|
||||
let
|
||||
version = "1.2.7";
|
||||
version = "1.3.0";
|
||||
in
|
||||
rustPlatform.buildRustPackage {
|
||||
pname = "cargo-shear";
|
||||
|
|
@ -16,11 +16,11 @@ rustPlatform.buildRustPackage {
|
|||
owner = "Boshen";
|
||||
repo = "cargo-shear";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-IOTlDLHSFH93tgCaF8ZOboIRkGImcT+oDfbmKKjNDlM=";
|
||||
hash = "sha256-OOjN6JI5RWo2J2awX3ts4wlVptQ1mhQEk8acNOVjFz0=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-6Pu7qFOT9fPjtgjNqZ4mF37xNLuCIl1U3a23vGpRs4k=";
|
||||
cargoHash = "sha256-ha/soHq6lEZUQ/gfk4zQkRBGN3S6npJ2CHI2oyjDsXA=";
|
||||
|
||||
# https://github.com/Boshen/cargo-shear/blob/a0535415a3ea94c86642f39f343f91af5cdc3829/src/lib.rs#L20-L23
|
||||
SHEAR_VERSION = version;
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "cdncheck";
|
||||
version = "1.1.19";
|
||||
version = "1.1.20";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "projectdiscovery";
|
||||
repo = "cdncheck";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-Zp3ObJkK60g4VgH8e1aghHjCbueu/9FNru9RUx6uIuE=";
|
||||
hash = "sha256-qL2SNVHsAH+Z0A5Vv+kBa1O9VgdR7eZ29Z19s5GuTXA=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-/1REkZ5+sz/H4T4lXhloz7fu5cLv1GoaD3dlttN+Qd4=";
|
||||
|
|
|
|||
|
|
@ -120,6 +120,8 @@ buildNpmPackage {
|
|||
# Move to install directory manually.
|
||||
npm run install:components
|
||||
mv www/components "$out_cryptpad/www/"
|
||||
# and fix absolute symlink to /build...
|
||||
ln -Tfs ../../src/tweetnacl "$out_cryptpad/www/components/tweetnacl"
|
||||
|
||||
# install OnlyOffice (install-onlyoffice.sh without network)
|
||||
mkdir -p "$out_cryptpad/www/common/onlyoffice/dist"
|
||||
|
|
|
|||
|
|
@ -6,15 +6,15 @@
|
|||
|
||||
buildDotnetGlobalTool {
|
||||
pname = "dotnet-repl";
|
||||
version = "0.3.239";
|
||||
version = "0.3.247";
|
||||
|
||||
dotnet-sdk = dotnetCorePackages.sdk_9_0;
|
||||
dotnet-runtime = dotnetCorePackages.runtime_9_0;
|
||||
|
||||
nugetHash = "sha256-wn4i0zC56gxnjsgjdiMxLinmUsSROhmimu0lmBZo1hA=";
|
||||
nugetHash = "sha256-nD5GqLG+3VAWMy/8E9XviwJq2wKBg+BISlcB4xWtrx4=";
|
||||
|
||||
meta = {
|
||||
description = "A polyglot REPL built on .NET Interactive";
|
||||
description = "Polyglot REPL built on .NET Interactive";
|
||||
homepage = "https://github.com/jonsequitur/dotnet-repl";
|
||||
license = lib.licenses.mit;
|
||||
mainProgram = "dotnet-repl";
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
}:
|
||||
let
|
||||
pname = "e1s";
|
||||
version = "1.0.47";
|
||||
version = "1.0.48";
|
||||
in
|
||||
buildGoModule {
|
||||
inherit pname version;
|
||||
|
|
@ -14,7 +14,7 @@ buildGoModule {
|
|||
owner = "keidarcy";
|
||||
repo = "e1s";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-5lb2j3cfQ2W+r+3UOdxXt15PQNWIMRM+pwChdzL+HUQ=";
|
||||
hash = "sha256-pURUTWlj0iOfHpc4BheprfgAuK05sZDGLbCF/T3LN9w=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-1lise/u40Q8W9STsuyrWIbhf2HY+SFCytUL1PTSWvfY=";
|
||||
|
|
|
|||
|
|
@ -7,16 +7,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "fabric-ai";
|
||||
version = "1.4.187";
|
||||
version = "1.4.195";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "danielmiessler";
|
||||
repo = "fabric";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-5vUtw8ttNB2gjVgASfgWke5tCZGzEiSvk+c4K9555ck=";
|
||||
hash = "sha256-83LlJ697CyW8Hmp6cB3RqeVk1OGuF6TUHcfKLqjgLPk=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-ZrIzCKhEa00KOS8tauYEGLR4o7gGVVZ9pdfEQbAGDkI=";
|
||||
vendorHash = "sha256-xfNvmhHNYpanhZKT9o8kImzw4gzigpgc8ri9O1iOqwc=";
|
||||
|
||||
# Fabric introduced plugin tests that fail in the nix build sandbox.
|
||||
doCheck = false;
|
||||
|
|
|
|||
|
|
@ -115,7 +115,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
})
|
||||
|
||||
# The following patches implement certain environment variables in GDM which are set by
|
||||
# the gdm configuration module (nixos/modules/services/x11/display-managers/gdm.nix).
|
||||
# the gdm configuration module (gdm.nix).
|
||||
|
||||
./gdm-x-session_extra_args.patch
|
||||
|
||||
|
|
|
|||
|
|
@ -171,11 +171,11 @@ let
|
|||
|
||||
linux = stdenv.mkDerivation (finalAttrs: {
|
||||
inherit pname meta passthru;
|
||||
version = "136.0.7103.113";
|
||||
version = "137.0.7151.55";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${finalAttrs.version}-1_amd64.deb";
|
||||
hash = "sha256-BnKKu7X34g+zg4rDqjVXT3Kx2E8Gn5ELqs3LQS3GCkg=";
|
||||
hash = "sha256-Q4zf60OQN/2NRozssVrnmbYWGRm05Mt2/6LozfENzgM=";
|
||||
};
|
||||
|
||||
# With strictDeps on, some shebangs were not being patched correctly
|
||||
|
|
@ -276,11 +276,11 @@ let
|
|||
|
||||
darwin = stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
inherit pname meta passthru;
|
||||
version = "137.0.7151.41";
|
||||
version = "137.0.7151.56";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://dl.google.com/release2/chrome/acracoudzvaateoc4hi5umv6pobq_137.0.7151.41/GoogleChrome-137.0.7151.41.dmg";
|
||||
hash = "sha256-egOl4mjsIxjWxYTLI38U2LqrIs85+cmZG9oEXe/bF7Q=";
|
||||
url = "http://dl.google.com/release2/chrome/acps6il5fco5kfidgoaidec3sdha_137.0.7151.56/GoogleChrome-137.0.7151.56.dmg";
|
||||
hash = "sha256-nFk2qg8+9gipnG+4u1sRO4Uq5Iv4TVvxaTETHzF+huw=";
|
||||
};
|
||||
|
||||
dontPatch = true;
|
||||
|
|
|
|||
|
|
@ -8,16 +8,16 @@
|
|||
|
||||
buildNpmPackage rec {
|
||||
pname = "lint-staged";
|
||||
version = "16.0.0";
|
||||
version = "16.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "okonet";
|
||||
repo = "lint-staged";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-vMk8KrWkrMETEGUev0C5ZaMFZH95/VaASr9v5nI2JGo=";
|
||||
hash = "sha256-dR0z/60CHDqCl9pEc9KQww1S5aSZ4XGsfNqxBSZe0Ig=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-lj1+a/+X/0Qj41S+C50Z5cQfu/5KUgXgls+tYbN16OU=";
|
||||
npmDepsHash = "sha256-MznWvv61Z+8t+Nicj6yWlQqUHVx7AAtkDXu2L2E5dw8=";
|
||||
|
||||
dontNpmBuild = true;
|
||||
|
||||
|
|
|
|||
|
|
@ -18,13 +18,13 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "mympd";
|
||||
version = "21.0.0";
|
||||
version = "21.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jcorporation";
|
||||
repo = "myMPD";
|
||||
rev = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-K86kOCJ9Fnf/ZvS11Tyf81mdKA9R5pgBz1XzDY4N/8E=";
|
||||
sha256 = "sha256-A4wjnITpI9Cy5kIVljXvmnunsqJXFSi4CqBmlqVcqZM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -74,7 +74,7 @@ stdenv.mkDerivation rec {
|
|||
libcryptui
|
||||
];
|
||||
|
||||
services.xserver.desktopManager.gnome.extraGSettingsOverridePackages = with pkgs; [
|
||||
services.desktopManager.gnome.extraGSettingsOverridePackages = with pkgs; [
|
||||
nemo
|
||||
gcr
|
||||
libcryptui
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
}:
|
||||
buildGoModule rec {
|
||||
pname = "nom";
|
||||
version = "2.8.0";
|
||||
version = "2.8.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "guyfedwards";
|
||||
repo = "nom";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-2YXecurdmlho5LvkkMc97GiyrSy/kTZINTPtC+J+eL0=";
|
||||
hash = "sha256-PqoTpy+Pz5OS+7pzzdxNKeqIZRipOvHKMs9o67XzdqY=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-d5KTDZKfuzv84oMgmsjJoXGO5XYLVKxOB5XehqgRvYw=";
|
||||
|
|
|
|||
|
|
@ -9,16 +9,16 @@
|
|||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "openstack-rs";
|
||||
version = "0.12.0";
|
||||
version = "0.12.1";
|
||||
src = fetchFromGitHub {
|
||||
owner = "gtema";
|
||||
repo = "openstack";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-n3tVkEDn5giAYxcFWI/sc0yCjK1A80L7+dp44QXoCc4=";
|
||||
hash = "sha256-jJNEZF0aGD4pdKWdWOa64nIr/CKJlBL7Vo9MFiQ54xo=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-lu3OeBP2fHGX1SV1LnDv/RCAVhoEVZIRiMoXWJ3H4IQ=";
|
||||
cargoHash = "sha256-edKIJM4FQ/SmR7IU/7WxNm+hHouXMWUV8n3rbKzvV0A=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
|
|
|||
|
|
@ -7,13 +7,13 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "polarity";
|
||||
version = "latest-unstable-2025-05-14";
|
||||
version = "latest-unstable-2025-05-19";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "polarity-lang";
|
||||
repo = "polarity";
|
||||
rev = "6c0370011b827886e87b7afec644788a1a54f6f7";
|
||||
hash = "sha256-RKuL0gn734eqNQHIsSA0kLF1qUNtyEUpYf8Zv359GAs=";
|
||||
rev = "b715e6529210242d79f304d34170eba8473174b2";
|
||||
hash = "sha256-/yq6fqjkZoEw4MhsOWlRdQciA/Wqds9TgCczcVQV8Rw=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
|
|
|
|||
|
|
@ -18,13 +18,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "prrte";
|
||||
version = "3.0.10";
|
||||
version = "3.0.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "openpmix";
|
||||
repo = "prrte";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Pnm0t7dJhT0MEYEKBHh6l16V5b/zOSxsd5OWda5SIzI=";
|
||||
hash = "sha256-4JEh4N/38k0Xgp0CqnFipaEZlJBQr8nyxoncyz0/7yo=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -14,14 +14,14 @@
|
|||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "seagoat";
|
||||
version = "0.54.17";
|
||||
version = "0.54.18";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kantord";
|
||||
repo = "SeaGOAT";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-8pLBZXj9p+nO+deozo57H/FlxDKd9KSQHZ8qkGsNzhA=";
|
||||
hash = "sha256-vRaC6YrqejtRs8NHoTj6DB0CAYMSygRMDOTaJyk1BZc=";
|
||||
};
|
||||
|
||||
build-system = [ python3Packages.poetry-core ];
|
||||
|
|
|
|||
|
|
@ -19,13 +19,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "skopeo";
|
||||
version = "1.18.0";
|
||||
version = "1.19.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
rev = "v${version}";
|
||||
owner = "containers";
|
||||
repo = "skopeo";
|
||||
hash = "sha256-Ws01dYx2Jq/zB8rWiWSnV4ZgcxyBWHWvE3DfG7gvFOc=";
|
||||
hash = "sha256-Xi3M8M8UukxwWXNTnbFLA8RIWa6CHs84PjrOvtJEl78=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
|
|
|
|||
|
|
@ -11,11 +11,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "strace";
|
||||
version = "6.14";
|
||||
version = "6.15";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://strace.io/files/${version}/${pname}-${version}.tar.xz";
|
||||
hash = "sha256-JE87XCCjKFTKm3yno+4JHdPUvSCTOhcezujbSGx308k=";
|
||||
hash = "sha256-hVLfqwirwioPIEjJj9lUH9TXG2iCUHlSeA2rfHxRL1E=";
|
||||
};
|
||||
|
||||
separateDebugInfo = true;
|
||||
|
|
|
|||
|
|
@ -10,13 +10,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "tbls";
|
||||
version = "1.85.3";
|
||||
version = "1.85.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "k1LoW";
|
||||
repo = "tbls";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-07Xx/BoBXCQuZHveH00Wn65POnTpfDx8rfIcbqSoQLg=";
|
||||
hash = "sha256-K+GIETe/SpBCgJS7KD8Rw8z1zrmnXdYjjTyl36pUzmg=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Sqr5UiT4NNiFKNEqZRDbS92AYa9SKWqYTYl4Ljx/raY=";
|
||||
|
|
|
|||
|
|
@ -6,20 +6,20 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "wasm-tools";
|
||||
version = "1.230.0";
|
||||
version = "1.231.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bytecodealliance";
|
||||
repo = "wasm-tools";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-xtGPZXb/tgReshmpW5zzG0EOVYPMoXU+avnO5uLKJnI=";
|
||||
hash = "sha256-6SpkiaCBzCSHC+KesExNP7V7g8qYF2UR5UAxilxUK9c=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
# Disable cargo-auditable until https://github.com/rust-secure-code/cargo-auditable/issues/124 is solved.
|
||||
auditable = false;
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-P+5g1ynZVFIU2bgait+2rwJoVYClF7lyq4j2roV/w2o=";
|
||||
cargoHash = "sha256-zyYyIjzMxe74h94Sm3iMBWW7sy94dVrcVr5/0aDrtJU=";
|
||||
cargoBuildFlags = [
|
||||
"--package"
|
||||
"wasm-tools"
|
||||
|
|
|
|||
|
|
@ -11,13 +11,13 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "wgpu-native";
|
||||
version = "24.0.3.1";
|
||||
version = "25.0.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gfx-rs";
|
||||
repo = "wgpu-native";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-0GPwTm23i/UMoGQ71qybQS9sHN7XTtiPAZWG229Tn2k=";
|
||||
hash = "sha256-w0qzJxdJioiQAmsh56vLaR34TjaUK/qqHhWcvO93IQ8=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
|
@ -27,7 +27,7 @@ rustPlatform.buildRustPackage rec {
|
|||
];
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-sYwDbSglOS8h8XG5sC6yX5JfRmmmc8v8mxPBicoKxEU=";
|
||||
cargoHash = "sha256-iOnz//eHQ6WRPWOGcKOXyuwZS9WcbJWslRAz8yDamn8=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
rustPlatform.bindgenHook
|
||||
|
|
|
|||
|
|
@ -20,11 +20,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "x42-plugins";
|
||||
version = "20240611";
|
||||
version = "20250512";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://gareus.org/misc/x42-plugins/${pname}-${version}.tar.xz";
|
||||
hash = "sha256-lO6Y1zEGGhv6HIrHmq9b0LA37K3ZzBtC/ERzBsGUZiw=";
|
||||
hash = "sha256-HBENTb1BGxBDIOWtswCe6t0mEzVNZf65NhLjsfE4KYk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@ let
|
|||
|
||||
hash =
|
||||
{
|
||||
x86_64-linux = "sha256-u2T2pKO+rOs29Un8dKc+sUqBJiruu6GS6wzrJhKKW9Y=";
|
||||
x86_64-linux = "sha256-Ma2WWknZ0rF9NZNqOaPyQ2eil34HWmgSIHMnfaSaFjs=";
|
||||
}
|
||||
.${system} or throwSystem;
|
||||
|
||||
|
|
@ -48,7 +48,7 @@ let
|
|||
in
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "xpipe";
|
||||
version = "14.2";
|
||||
version = "16.4.1";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/xpipe-io/xpipe/releases/download/${version}/xpipe-portable-linux-${arch}.tar.gz";
|
||||
|
|
@ -90,7 +90,7 @@ stdenvNoCC.mkDerivation rec {
|
|||
categories = [ "Network" ];
|
||||
comment = "Your entire server infrastructure at your fingertips";
|
||||
desktopName = displayname;
|
||||
exec = "/opt/${pname}/cli/bin/xpipe open %U";
|
||||
exec = "/opt/${pname}/bin/xpipe open %U";
|
||||
genericName = "Shell connection hub";
|
||||
icon = "/opt/${pname}/logo.png";
|
||||
name = displayname;
|
||||
|
|
@ -104,22 +104,19 @@ stdenvNoCC.mkDerivation rec {
|
|||
cp -r ./ $out/opt/$pkg
|
||||
|
||||
mkdir -p "$out/bin"
|
||||
ln -s "$out/opt/$pkg/cli/bin/xpipe" "$out/bin/$pkg"
|
||||
ln -s "$out/opt/$pkg/bin/xpipe" "$out/bin/$pkg"
|
||||
|
||||
mkdir -p "$out/share/applications"
|
||||
cp -r "${desktopItem}/share/applications/" "$out/share/"
|
||||
|
||||
mkdir -p "$out/etc/bash_completion.d"
|
||||
ln -s "$out/opt/$pkg/cli/xpipe_completion" "$out/etc/bash_completion.d/$pkg"
|
||||
|
||||
substituteInPlace "$out/share/applications/${displayname}.desktop" --replace "Exec=" "Exec=$out"
|
||||
substituteInPlace "$out/share/applications/${displayname}.desktop" --replace "Icon=" "Icon=$out"
|
||||
|
||||
mv "$out/opt/$pkg/app/bin/xpiped" "$out/opt/$pkg/app/bin/xpiped_raw"
|
||||
mv "$out/opt/$pkg/app/lib/app/xpiped.cfg" "$out/opt/$pkg/app/lib/app/xpiped_raw.cfg"
|
||||
mv "$out/opt/$pkg/app/scripts/xpiped_debug.sh" "$out/opt/$pkg/app/scripts/xpiped_debug_raw.sh"
|
||||
mv "$out/opt/$pkg/bin/xpiped" "$out/opt/$pkg/bin/xpiped_raw"
|
||||
mv "$out/opt/$pkg/lib/app/xpiped.cfg" "$out/opt/$pkg/lib/app/xpiped_raw.cfg"
|
||||
mv "$out/opt/$pkg/scripts/xpiped_debug.sh" "$out/opt/$pkg/scripts/xpiped_debug_raw.sh"
|
||||
|
||||
makeShellWrapper "$out/opt/$pkg/app/bin/xpiped_raw" "$out/opt/$pkg/app/bin/xpiped" \
|
||||
makeShellWrapper "$out/opt/$pkg/bin/xpiped_raw" "$out/opt/$pkg/bin/xpiped" \
|
||||
--prefix LD_LIBRARY_PATH : "${
|
||||
lib.makeLibraryPath [
|
||||
fontconfig
|
||||
|
|
@ -129,7 +126,8 @@ stdenvNoCC.mkDerivation rec {
|
|||
socat
|
||||
]
|
||||
}"
|
||||
makeShellWrapper "$out/opt/$pkg/app/scripts/xpiped_debug_raw.sh" "$out/opt/$pkg/app/scripts/xpiped_debug.sh" \
|
||||
|
||||
makeShellWrapper "$out/opt/$pkg/scripts/xpiped_debug_raw.sh" "$out/opt/$pkg/scripts/xpiped_debug.sh" \
|
||||
--prefix LD_LIBRARY_PATH : "${
|
||||
lib.makeLibraryPath [
|
||||
fontconfig
|
||||
|
|
|
|||
|
|
@ -99,7 +99,7 @@ let
|
|||
in
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "zed-editor";
|
||||
version = "0.187.6";
|
||||
version = "0.187.9";
|
||||
|
||||
outputs =
|
||||
[ "out" ]
|
||||
|
|
@ -111,7 +111,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
|||
owner = "zed-industries";
|
||||
repo = "zed";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-aib6RJPkNQQmK+zVfNvf/LwfKuloj6xHN4tT8p0yPZo=";
|
||||
hash = "sha256-BWn36z6EoyYRGtYZjWmTbu77M2wYNNBQ76u6MhKlkY4=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
@ -138,7 +138,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
|||
'';
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-fIOgakr2Wni8BJB7VD63worcHEwnL0WKI88kjJ4YTMg=";
|
||||
cargoHash = "sha256-kXE+brvG8Z70Bla5SXGwRVX+fP8PtIPOkYXLhyJa4l8=";
|
||||
|
||||
nativeBuildInputs =
|
||||
[
|
||||
|
|
|
|||
37
pkgs/development/coq-modules/parseque/default.nix
Normal file
37
pkgs/development/coq-modules/parseque/default.nix
Normal file
|
|
@ -0,0 +1,37 @@
|
|||
{
|
||||
lib,
|
||||
mkCoqDerivation,
|
||||
which,
|
||||
coq,
|
||||
version ? null,
|
||||
}:
|
||||
|
||||
with lib;
|
||||
mkCoqDerivation {
|
||||
pname = "parseque";
|
||||
repo = "parseque";
|
||||
owner = "rocq-community";
|
||||
|
||||
inherit version;
|
||||
defaultVersion =
|
||||
with versions;
|
||||
switch
|
||||
[ coq.coq-version ]
|
||||
[
|
||||
{
|
||||
cases = [ (range "8.16" "8.20") ];
|
||||
out = "0.2.2";
|
||||
}
|
||||
]
|
||||
null;
|
||||
|
||||
release."0.2.2".sha256 = "sha256-O50Rs7Yf1H4wgwb7ltRxW+7IF0b04zpfs+mR83rxT+E=";
|
||||
|
||||
releaseRev = v: "v${v}";
|
||||
|
||||
meta = {
|
||||
description = "Total parser combinators in Rocq";
|
||||
maintainers = with maintainers; [ womeier ];
|
||||
license = licenses.mit;
|
||||
};
|
||||
}
|
||||
|
|
@ -14,7 +14,7 @@
|
|||
}:
|
||||
|
||||
buildDunePackage rec {
|
||||
version = "3.15";
|
||||
version = "3.16";
|
||||
pname = "containers";
|
||||
|
||||
minimalOCamlVersion = "4.08";
|
||||
|
|
@ -23,7 +23,7 @@ buildDunePackage rec {
|
|||
owner = "c-cube";
|
||||
repo = "ocaml-containers";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-PMtyJOuw+9u6rF5EGif/66ZSbkTu1Msgke9JVpDWC1c=";
|
||||
hash = "sha256-WaHAZRLjaEJUba/I2r3Yof/iUqA3PFUuVbzm88izG1k=";
|
||||
};
|
||||
|
||||
buildInputs = [ dune-configurator ];
|
||||
|
|
|
|||
|
|
@ -9,14 +9,14 @@
|
|||
|
||||
buildOctavePackage rec {
|
||||
pname = "mapping";
|
||||
version = "1.4.2";
|
||||
version = "1.4.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-mrUQWqC15Ul5AHDvhMlNStqIMG2Zxa+hB2vDyeizLaI=";
|
||||
sha256 = "sha256-IYiyRjnHCHhAFy5gR/dcuKWY11gSCubggQzmMAqGmhs=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
propagatedBuildInputs = [
|
||||
gdal
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -11,19 +11,20 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "azure-mgmt-apimanagement";
|
||||
version = "4.0.1";
|
||||
version = "5.0.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-XPUJzALti7QXTmgtuwVDhCA2luWz7zfykWEsJmpHzA4=";
|
||||
pname = "azure_mgmt_apimanagement";
|
||||
inherit version;
|
||||
hash = "sha256-Crf+F+cP4xVM2ED/R9GdekYQIXAD6qfCGs81EableZk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools ];
|
||||
build-system = [ setuptools ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dependencies = [
|
||||
azure-common
|
||||
azure-mgmt-core
|
||||
isodate
|
||||
|
|
|
|||
|
|
@ -6,22 +6,26 @@
|
|||
azure-common,
|
||||
azure-mgmt-core,
|
||||
isodate,
|
||||
setuptools,
|
||||
typing-extensions,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "azure-mgmt-appcontainers";
|
||||
version = "3.1.0";
|
||||
format = "setuptools";
|
||||
version = "3.2.0";
|
||||
pyroject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-PHlDnxK8788UCvjG572LUWJOlx/ZH1rOmKzAc8Lm+uw=";
|
||||
pname = "azure_mgmt_appcontainers";
|
||||
inherit version;
|
||||
hash = "sha256-bp7WPCwssPZD+tZ52BMIxKomFWztQfwDPl9MBJghjz4=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [
|
||||
azure-common
|
||||
azure-mgmt-core
|
||||
isodate
|
||||
|
|
|
|||
|
|
@ -4,50 +4,39 @@
|
|||
buildPythonPackage,
|
||||
click,
|
||||
fetchFromGitHub,
|
||||
future,
|
||||
importlib-metadata,
|
||||
ldfparser,
|
||||
lxml,
|
||||
openpyxl,
|
||||
pytest-cov-stub,
|
||||
pytest-timeout,
|
||||
pytestCheckHook,
|
||||
pythonOlder,
|
||||
pyyaml,
|
||||
setuptools,
|
||||
six,
|
||||
versioneer,
|
||||
xlrd,
|
||||
xlwt,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "canmatrix";
|
||||
version = "1.0";
|
||||
version = "1.2";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
disabled = pythonOlder "3.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ebroecker";
|
||||
repo = "canmatrix";
|
||||
tag = version;
|
||||
hash = "sha256-UUJnLVt+uOj8Eav162btprkUeTemItGrSnBBB9UhJJI=";
|
||||
hash = "sha256-PfegsFha7ernSqnMeaDoLf1jLx1CiOoiYi34dESEgBY=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
# Remove vendorized versioneer.py
|
||||
rm versioneer.py
|
||||
'';
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
nativeBuildInputs = [ versioneer ];
|
||||
|
||||
dependencies = [
|
||||
attrs
|
||||
click
|
||||
future
|
||||
six
|
||||
] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ];
|
||||
];
|
||||
|
||||
optional-dependencies = {
|
||||
arxml = [ lxml ];
|
||||
|
|
@ -64,12 +53,15 @@ buildPythonPackage rec {
|
|||
};
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytest-cov-stub
|
||||
pytest-timeout
|
||||
pytestCheckHook
|
||||
] ++ lib.flatten (builtins.attrValues optional-dependencies);
|
||||
|
||||
pytestFlagsArray = [
|
||||
# long_envvar_name_imports requires stable key value pair ordering
|
||||
"-s src/canmatrix"
|
||||
"tests/"
|
||||
];
|
||||
|
||||
disabledTests = [ "long_envvar_name_imports" ];
|
||||
|
|
|
|||
|
|
@ -21,14 +21,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "databricks-sdk";
|
||||
version = "0.53.0";
|
||||
version = "0.55.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "databricks";
|
||||
repo = "databricks-sdk-py";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-QuPoez1F9v87LGM0Ov6Wg2f5pLAr0uDqZ0b08Xda5+k=";
|
||||
hash = "sha256-H/LtuqVRW3Ii/z/AU4d/PLxywG41G4aZH3xz+nOM0FY=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
|
@ -82,7 +82,7 @@ buildPythonPackage rec {
|
|||
meta = {
|
||||
description = "Databricks SDK for Python";
|
||||
homepage = "https://github.com/databricks/databricks-sdk-py";
|
||||
changelog = "https://github.com/databricks/databricks-sdk-py/blob/v${version}/CHANGELOG.md";
|
||||
changelog = "https://github.com/databricks/databricks-sdk-py/blob/${src.tag}/CHANGELOG.md";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ GaetanLepage ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
}:
|
||||
|
||||
let
|
||||
version = "2.0.0";
|
||||
version = "2.2.0";
|
||||
tag = "v${version}";
|
||||
in
|
||||
buildPythonPackage {
|
||||
|
|
@ -25,7 +25,7 @@ buildPythonPackage {
|
|||
owner = "elevenlabs";
|
||||
repo = "elevenlabs-python";
|
||||
inherit tag;
|
||||
hash = "sha256-QiV/B0ikXxEGs9UQUeqkPqdgxPwQi6UQ+tj6KT30Rv8=";
|
||||
hash = "sha256-XZld32WJlZKnVQAUQV9FfJZgNOlW4JKVCqVdb8xCO7I=";
|
||||
};
|
||||
|
||||
build-system = [ poetry-core ];
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-container";
|
||||
version = "2.56.1";
|
||||
version = "2.57.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -23,7 +23,7 @@ buildPythonPackage rec {
|
|||
src = fetchPypi {
|
||||
pname = "google_cloud_container";
|
||||
inherit version;
|
||||
hash = "sha256-QADuXKwndJvGDEWTftNIGRX7vwmJJdkoUjcC1w8vT6E=";
|
||||
hash = "sha256-+n5vWT9YNIuYvW3Vk0TJpgOOn7psC5hY4j2dJ4NG8Sk=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
|
|
|||
|
|
@ -12,14 +12,15 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-dns";
|
||||
version = "0.35.0";
|
||||
version = "0.35.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-CsRNqesPoLEilRPNiIB0q9AhGZLEBCMAr9HBbUFHRVM=";
|
||||
pname = "google_cloud_dns";
|
||||
inherit version;
|
||||
hash = "sha256-lU9EYV16tv/NBjJOL552D5awffH83bAkuaEJ0LMwqR8=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
|
|
|||
|
|
@ -8,14 +8,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "json-repair";
|
||||
version = "0.44.1";
|
||||
version = "0.46.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mangiucugna";
|
||||
repo = "json_repair";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-S3hSbvNyvCx4qia9PRgUy+UugURjtA4hV5kuJIuLafw=";
|
||||
hash = "sha256-MfjWZYDYiFBTy0Tsm0OKY/89ziSTXNB5m99VkpS0Mco=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
|
@ -24,7 +24,6 @@ buildPythonPackage rec {
|
|||
|
||||
disabledTestPaths = [
|
||||
"tests/test_performance.py"
|
||||
"tests/test_coverage.py"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "json_repair" ];
|
||||
|
|
|
|||
|
|
@ -2,15 +2,15 @@
|
|||
lib,
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
hatchling,
|
||||
llama-index-core,
|
||||
ollama,
|
||||
poetry-core,
|
||||
pythonOlder,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "llama-index-llms-ollama";
|
||||
version = "0.5.4";
|
||||
version = "0.5.6";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -18,10 +18,10 @@ buildPythonPackage rec {
|
|||
src = fetchPypi {
|
||||
pname = "llama_index_llms_ollama";
|
||||
inherit version;
|
||||
hash = "sha256-5efnpOZUeMdikG0I9ZRkfYFI/9wyrpCNVrc8DfjqBPI=";
|
||||
hash = "sha256-RDiMv6riuVcvbqZzTAcBXHcoI/vm0ssmx9/jT65R3cU=";
|
||||
};
|
||||
|
||||
build-system = [ poetry-core ];
|
||||
build-system = [ hatchling ];
|
||||
|
||||
dependencies = [
|
||||
llama-index-core
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "losant-rest";
|
||||
version = "1.20.1";
|
||||
version = "1.22.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
|||
owner = "Losant";
|
||||
repo = "losant-rest-python";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-1CxcA9/FvKP3P0Q02by0hBHQTAcbfLCp3AualHhZyvY=";
|
||||
hash = "sha256-8h8EGG13C3zSB/KBdk6Oa5dKHTIftO7mCYay/wAe9Y4=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
|
|
|||
|
|
@ -45,14 +45,14 @@
|
|||
|
||||
mkDerivationWith buildPythonPackage rec {
|
||||
pname = "napari";
|
||||
version = "0.6.0";
|
||||
version = "0.6.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "napari";
|
||||
repo = "napari";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-OGEnB+GVqBwtYQegPuR7MOYFxmc4aNHCQt2+OKHLZ5M=";
|
||||
hash = "sha256-qgyhoxXROlm+DASJV2QOA1IqpHxPhsIEv+TGU2mhiuc=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -31,20 +31,20 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "nutpie";
|
||||
version = "0.14.3";
|
||||
version = "0.15.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pymc-devs";
|
||||
repo = "nutpie";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-l2TEGa9VVJmU4mKZwfUdhiloW6Bh41OqIQzTRvYK3eg=";
|
||||
hash = "sha256-451dkBysxPAhG71Z4Wnx8pQ0jV3vqmJYiNzWP9ylMM0=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit src;
|
||||
name = "${pname}-${version}";
|
||||
hash = "sha256-hPKT+YM9s7XZhI3sfnLBfokbGQhwDa9y5Fgg1TItO4M=";
|
||||
hash = "sha256-k17M2YhhNQWfxJCI0LX7FuwSgbpv2WtJw8X2+PF/g4M=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
|
@ -82,6 +82,10 @@ buildPythonPackage rec {
|
|||
writableTmpDirAsHomeHook
|
||||
];
|
||||
|
||||
pytestFlagsArray = [
|
||||
"-v"
|
||||
];
|
||||
|
||||
disabledTests = lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [
|
||||
# flaky (assert np.float64(0.0017554642626285276) > 0.01)
|
||||
"test_normalizing_flow"
|
||||
|
|
|
|||
|
|
@ -22,14 +22,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pymc";
|
||||
version = "5.22.0";
|
||||
version = "5.23.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pymc-devs";
|
||||
repo = "pymc";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-NQYvtt/cjssJ7Lv3RyDeBMQByKMmt1p0X9F+LqhtTV4=";
|
||||
hash = "sha256-Hlj5kOSMz8uoqeBkLiq9kT6CZrb2XJW9mas45G2EZB4=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "python-bsblan";
|
||||
version = "1.2.1";
|
||||
version = "1.2.2";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.12";
|
||||
|
|
@ -29,7 +29,7 @@ buildPythonPackage rec {
|
|||
owner = "liudger";
|
||||
repo = "python-bsblan";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-b+/Cy8F2xUsYOr8PGQxkdXD07pAECNmbeWbuysSAT2I=";
|
||||
hash = "sha256-qzQP77bfV21g7DIdZfJCyv9FN/U6aQk9wWV9xPZFolk=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -21,14 +21,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "vispy";
|
||||
version = "0.14.3";
|
||||
version = "0.15.2";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-77u4R6kIuvfnFpq5vylhOKOTZPNn5ssKjsA61xaZ0x0=";
|
||||
hash = "sha256-1S0QwGl/SJkFVc6iorrT+fWncjkYVv2jZOpLvGn9B1w=";
|
||||
};
|
||||
|
||||
patches = lib.optionals (!stdenv.hostPlatform.isDarwin) [
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
}:
|
||||
buildPythonPackage rec {
|
||||
pname = "yara-x";
|
||||
version = "0.14.0";
|
||||
version = "0.15.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
|
@ -18,14 +18,14 @@ buildPythonPackage rec {
|
|||
owner = "VirusTotal";
|
||||
repo = "yara-x";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-C8wBGmilouNcNN3HkwvSTWcZY1fe0jVc2TeWDN4w5xA=";
|
||||
hash = "sha256-fbuh/SMfOygnuvG9zTZqem4oLaS+5uXScXPhU3aVDjM=";
|
||||
};
|
||||
|
||||
buildAndTestSubdir = "py";
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit pname src version;
|
||||
hash = "sha256-afCBuWr12trjEIDvE0qnGFxTXU7LKZCzZB8RqgqperY=";
|
||||
hash = "sha256-+dPIujaxDJ7JrtNvX4VjGHFmgtCb1BJpFQL4c3E1/GY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -13,13 +13,13 @@
|
|||
|
||||
postgresqlBuildExtension (finalAttrs: {
|
||||
pname = "timescaledb${lib.optionalString (!enableUnfree) "-apache"}";
|
||||
version = "2.20.0";
|
||||
version = "2.20.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "timescale";
|
||||
repo = "timescaledb";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-CdunXknZoOnxYK3i37TMSR+ma2JAXLsRVSVaa0giJMA=";
|
||||
hash = "sha256-eB88YPoK3uUhvbKP1mob5L+pyemxvGVuGGcJAXDDets=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
|
|
|||
|
|
@ -187,6 +187,7 @@ let
|
|||
paco = callPackage ../development/coq-modules/paco { };
|
||||
paramcoq = callPackage ../development/coq-modules/paramcoq { };
|
||||
parsec = callPackage ../development/coq-modules/parsec { };
|
||||
parseque = callPackage ../development/coq-modules/parseque { };
|
||||
pocklington = callPackage ../development/coq-modules/pocklington { };
|
||||
QuickChick = callPackage ../development/coq-modules/QuickChick { };
|
||||
reglang = callPackage ../development/coq-modules/reglang { };
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue