JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into staging-next

Browse Source 
Conflicts:
	pkgs/development/python-modules/bambi/default.nix
	pkgs/development/python-modules/jaxopt/default.nix
This commit is contained in:
Alyssa Ross 2023-10-12 09:08:12 +00:00
commit 1bb67a90ba
No known key found for this signature in database
GPG Key ID: F9DBED4859B271C0
130 changed files with 1257 additions and 4562 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
maintainers/maintainer-list.nix
View File

@ -6464,6 +6464,10 @@
githubId = 1447245;
name = "Robin Gloster";
};
gm6k = {
email = "nix@quidecco.pl";
name = "Isidor Zeuner";
};
gmemstr = {
email = "git@gmem.ca";
github = "gmemstr";

6
nixos/doc/manual/configuration/x-windows.chapter.md
View File

@ -45,8 +45,8 @@ services.xserver.displayManager.gdm.enable = true;
You can set the keyboard layout (and optionally the layout variant):
```nix
services.xserver.layout = "de";
services.xserver.xkbVariant = "neo";
services.xserver.xkb.layout = "de";
services.xserver.xkb.variant = "neo";
```
The X server is started automatically at boot time. If you don't want
@ -266,7 +266,7 @@ Once the configuration is applied, and you did a logout/login cycle, the
layout should be ready to use. You can try it by e.g. running
`setxkbmap us-greek` and then type `<alt>+a` (it may not get applied in
your terminal straight away). To change the default, the usual
`services.xserver.layout` option can still be used.
`services.xserver.xkb.layout` option can still be used.
A layout can have several other components besides `xkb_symbols`, for
example we will define new keycodes for some multimedia key and bind

8
nixos/doc/manual/development/option-declarations.section.md
View File

@ -90,7 +90,7 @@ lib.mkOption {
```
:::
### `mkPackageOption`, `mkPackageOptionMD` {#sec-option-declarations-util-mkPackageOption}
### `mkPackageOption` {#sec-option-declarations-util-mkPackageOption}
Usage:
@ -121,15 +121,13 @@ valid attribute path in pkgs (if name is a list).
If you wish to explicitly provide no default, pass `null` as `default`.
During the transition to CommonMark documentation `mkPackageOption` creates an option with a DocBook description attribute, once the transition is completed it will create a CommonMark description instead. `mkPackageOptionMD` always creates an option with a CommonMark description attribute and will be removed some time after the transition is completed.
[]{#ex-options-declarations-util-mkPackageOption}
Examples:
::: {#ex-options-declarations-util-mkPackageOption-hello .example}
### Simple `mkPackageOption` usage
```nix
lib.mkPackageOptionMD pkgs "hello" { }
lib.mkPackageOption pkgs "hello" { }
# is like
lib.mkOption {
type = lib.types.package;
@ -143,7 +141,7 @@ lib.mkOption {
::: {#ex-options-declarations-util-mkPackageOption-ghc .example}
### `mkPackageOption` with explicit default and example
```nix
lib.mkPackageOptionMD pkgs "GHC" {
lib.mkPackageOption pkgs "GHC" {
default = [ "ghc" ];
example = "pkgs.haskell.packages.ghc92.ghc.withPackages (hkgs: [ hkgs.primes ])";
}

3
nixos/doc/manual/release-notes/rl-2311.section.md
View File

@ -273,6 +273,8 @@
order, or relying on `mkBefore` and `mkAfter`, but may impact users calling
`mkOrder n` with n ≤ 400.
- X keyboard extension (XKB) options have been reorganized into a single attribute set, `services.xserver.xkb`. Specifically, `services.xserver.layout` is now `services.xserver.xkb.layout`, `services.xserver.xkbModel` is now `services.xserver.xkb.model`, `services.xserver.xkbOptions` is now `services.xserver.xkb.options`, `services.xserver.xkbVariant` is now `services.xserver.xkb.variant`, and `services.xserver.xkbDir` is now `services.xserver.xkb.dir`.
- `networking.networkmanager.firewallBackend` was removed as NixOS is now using iptables-nftables-compat even when using iptables, therefore Networkmanager now uses the nftables backend unconditionally.
- [`lib.lists.foldl'`](https://nixos.org/manual/nixpkgs/stable#function-library-lib.lists.foldl-prime) now always evaluates the initial accumulator argument first.
@ -448,4 +450,3 @@ The module update takes care of the new config syntax and the data itself (user
- The `electron` packages now places its application files in `$out/libexec/electron` instead of `$out/lib/electron`. Packages using electron-builder will fail to build and need to be adjusted by changing `lib` to `libexec`.
- `teleport` has been upgraded from major version 12 to major version 14. Please see upstream [upgrade instructions](https://goteleport.com/docs/management/operations/upgrading/) and release notes for versions [13](https://goteleport.com/docs/changelog/#1300-050823) and [14](https://goteleport.com/docs/changelog/#1400-092023). Note that Teleport does not officially support upgrades across more than one major version at a time. If you're running Teleport server components, it is recommended to first upgrade to an intermediate 13.x version by setting `services.teleport.package = pkgs.teleport_13`. Afterwards, this option can be removed to upgrade to the default version (14).

4
nixos/modules/config/console.nix
View File

@ -127,8 +127,8 @@ in
${optionalString (config.environment.sessionVariables ? XKB_CONFIG_ROOT)
"-I${config.environment.sessionVariables.XKB_CONFIG_ROOT}"
} \
-model '${xkbModel}' -layout '${layout}' \
-option '${xkbOptions}' -variant '${xkbVariant}' > "$out"
-model '${xkb.model}' -layout '${xkb.layout}' \
-option '${xkb.options}' -variant '${xkb.variant}' > "$out"
'');
}

43
nixos/modules/config/gnu.nix
View File

@ -1,43 +0,0 @@
{ config, lib, pkgs, ... }:
{
options = {
gnu = lib.mkOption {
type = lib.types.bool;
default = false;
description = lib.mdDoc ''
When enabled, GNU software is chosen by default whenever a there is
a choice between GNU and non-GNU software (e.g., GNU lsh
vs. OpenSSH).
'';
};
};
config = lib.mkIf config.gnu {
environment.systemPackages = with pkgs;
# TODO: Adjust `requiredPackages' from `system-path.nix'.
# TODO: Add Inetutils once it has the new `ifconfig'.
[ parted
#fdisk # XXX: GNU fdisk currently fails to build and it's redundant
# with the `parted' command.
nano zile
texinfo # for the stand-alone Info reader
]
++ lib.optional (!stdenv.isAarch32) grub2;
# GNU GRUB, where available.
boot.loader.grub.enable = !pkgs.stdenv.isAarch32;
# GNU lsh.
services.openssh.enable = false;
services.lshd.enable = true;
programs.ssh.startAgent = false;
services.xserver.startGnuPGAgent = true;
# TODO: GNU dico.
# TODO: GNU Inetutils' inetd.
# TODO: GNU Pies.
};
}

6
nixos/modules/installer/tools/tools.nix
View File

@ -163,15 +163,15 @@ in
# console = {
# font = "Lat2-Terminus16";
# keyMap = "us";
# useXkbConfig = true; # use xkbOptions in tty.
# useXkbConfig = true; # use xkb.options in tty.
# };
$xserverConfig
$desktopConfiguration
# Configure keymap in X11
# services.xserver.layout = "us";
# services.xserver.xkbOptions = "eurosign:e,caps:escape";
# services.xserver.xkb.layout = "us";
# services.xserver.xkb.options = "eurosign:e,caps:escape";
# Enable CUPS to print documents.
# services.printing.enable = true;

1
nixos/modules/module-list.nix
View File

@ -6,7 +6,6 @@
./config/fonts/fontdir.nix
./config/fonts/ghostscript.nix
./config/fonts/packages.nix
./config/gnu.nix
./config/gtk/gtk-icon-cache.nix
./config/i18n.nix
./config/iproute2.nix

1
nixos/modules/services/monitoring/prometheus/exporters.nix
View File

@ -37,6 +37,7 @@ let
"fritzbox"
"graphite"
"idrac"
"imap-mailstat"
"influxdb"
"ipmi"
"json"

71
nixos/modules/services/monitoring/prometheus/exporters/imap-mailstat.nix Normal file
View File

@ -0,0 +1,71 @@
{ config, lib, pkgs, options }:
with lib;
let
cfg = config.services.prometheus.exporters.imap-mailstat;
valueToString = value:
if (builtins.typeOf value == "string") then "\"${value}\""
else (
if (builtins.typeOf value == "int") then "${toString value}"
else (
if (builtins.typeOf value == "bool") then (if value then "true" else "false")
else "XXX ${toString value}"
)
);
createConfigFile = accounts:
# unfortunately on toTOML yet
# https://github.com/NixOS/nix/issues/3929
pkgs.writeText "imap-mailstat-exporter.conf" ''
${concatStrings (attrValues (mapAttrs (name: config: "[[Accounts]]\nname = \"${name}\"\n${concatStrings (attrValues (mapAttrs (k: v: "${k} = ${valueToString v}\n") config))}") accounts))}
'';
mkOpt = type: description: mkOption {
type = types.nullOr type;
default = null;
description = lib.mdDoc description;
};
accountOptions.options = {
mailaddress = mkOpt types.str "Your email address (at the moment used as login name)";
username = mkOpt types.str "If empty string mailaddress value is used";
password = mkOpt types.str "";
serveraddress = mkOpt types.str "mailserver name or address";
serverport = mkOpt types.int "imap port number (at the moment only tls connection is supported)";
starttls = mkOpt types.bool "set to true for using STARTTLS to start a TLS connection";
};
in
{
port = 8081;
extraOpts = {
oldestUnseenDate = mkOption {
type = types.bool;
default = false;
description = lib.mdDoc ''
Enable metric with timestamp of oldest unseen mail
'';
};
accounts = mkOption {
type = types.attrsOf (types.submodule accountOptions);
default = {};
description = lib.mdDoc ''
Accounts to monitor
'';
};
configurationFile = mkOption {
type = types.path;
example = "/path/to/config-file";
description = lib.mdDoc ''
File containing the configuration
'';
};
};
serviceOpts = {
serviceConfig = {
ExecStart = ''
${pkgs.prometheus-imap-mailstat-exporter}/bin/imap-mailstat-exporter \
-config ${createConfigFile cfg.accounts} \
${optionalString cfg.oldestUnseenDate "-oldestunseendate"} \
${concatStringsSep " \\\n " cfg.extraFlags}
'';
};
};
}

2
nixos/modules/services/x11/desktop-managers/enlightenment.nix
View File

@ -90,7 +90,7 @@ in
};
};
environment.etc."X11/xkb".source = xcfg.xkbDir;
environment.etc."X11/xkb".source = xcfg.xkb.dir;
fonts.packages = [ pkgs.dejavu_fonts pkgs.ubuntu_font_family ];

2
nixos/modules/services/x11/desktop-managers/plasma5.nix
View File

@ -309,7 +309,7 @@ in
"/share"
];
environment.etc."X11/xkb".source = xcfg.xkbDir;
environment.etc."X11/xkb".source = xcfg.xkb.dir;
environment.sessionVariables = {
PLASMA_USE_QT_SCALING = mkIf cfg.useQtScaling "1";

8
nixos/modules/services/x11/display-managers/sddm.nix
View File

@ -204,10 +204,10 @@ in
left-handed = xcfg.libinput.mouse.leftHanded;
};
keyboard = {
keymap_model = xcfg.xkbModel;
keymap_layout = xcfg.layout;
keymap_variant = xcfg.xkbVariant;
keymap_options = xcfg.xkbOptions;
keymap_model = xcfg.xkb.model;
keymap_layout = xcfg.xkb.layout;
keymap_variant = xcfg.xkb.variant;
keymap_options = xcfg.xkb.options;
};
}; in "${pkgs.weston}/bin/weston --shell=fullscreen-shell.so -c ${westonIni}";
description = lib.mdDoc "Command used to start the selected compositor";

4
nixos/modules/services/x11/extra-layouts.nix
View File

@ -121,11 +121,11 @@ in
environment.sessionVariables = {
# runtime override supported by multiple libraries e. g. libxkbcommon
# https://xkbcommon.org/doc/current/group__include-path.html
XKB_CONFIG_ROOT = config.services.xserver.xkbDir;
XKB_CONFIG_ROOT = config.services.xserver.xkb.dir;
};
services.xserver = {
xkbDir = "${xkb_patched}/etc/X11/xkb";
xkb.dir = "${xkb_patched}/etc/X11/xkb";
exportConfiguration = config.services.xserver.displayManager.startx.enable
|| config.services.xserver.displayManager.sx.enable;
};

124
nixos/modules/services/x11/xserver.nix
View File

@ -175,6 +175,31 @@ in
"Use services.xserver.fontPath instead of useXFS")
(mkRemovedOptionModule [ "services" "xserver" "useGlamor" ]
"Option services.xserver.useGlamor was removed because it is unnecessary. Drivers that uses Glamor will use it automatically.")
(lib.mkRenamedOptionModuleWith {
sinceRelease = 2311;
from = [ "services" "xserver" "layout" ];
to = [ "services" "xserver" "xkb" "layout" ];
})
(lib.mkRenamedOptionModuleWith {
sinceRelease = 2311;
from = [ "services" "xserver" "xkbModel" ];
to = [ "services" "xserver" "xkb" "model" ];
})
(lib.mkRenamedOptionModuleWith {
sinceRelease = 2311;
from = [ "services" "xserver" "xkbOptions" ];
to = [ "services" "xserver" "xkb" "options" ];
})
(lib.mkRenamedOptionModuleWith {
sinceRelease = 2311;
from = [ "services" "xserver" "xkbVariant" ];
to = [ "services" "xserver" "xkb" "variant" ];
})
(lib.mkRenamedOptionModuleWith {
sinceRelease = 2311;
from = [ "services" "xserver" "xkbDir" ];
to = [ "services" "xserver" "xkb" "dir" ];
})
];
@ -339,48 +364,55 @@ in
'';
};
layout = mkOption {
type = types.str;
default = "us";
description = lib.mdDoc ''
Keyboard layout, or multiple keyboard layouts separated by commas.
'';
};
xkb = mkOption {
description = "X keyboard extension (XKB) configuration";
type = types.submodule {
options = {
layout = mkOption {
type = types.str;
default = "us";
description = lib.mdDoc ''
Keyboard layout, or multiple keyboard layouts separated by commas.
'';
};
xkbModel = mkOption {
type = types.str;
default = "pc104";
example = "presario";
description = lib.mdDoc ''
Keyboard model.
'';
};
model = mkOption {
type = types.str;
default = "pc104";
example = "presario";
description = lib.mdDoc ''
Keyboard model.
'';
};
xkbOptions = mkOption {
type = types.commas;
default = "terminate:ctrl_alt_bksp";
example = "grp:caps_toggle,grp_led:scroll";
description = lib.mdDoc ''
X keyboard options; layout switching goes here.
'';
};
options = mkOption {
type = types.commas;
default = "terminate:ctrl_alt_bksp";
example = "grp:caps_toggle,grp_led:scroll";
description = lib.mdDoc ''
X keyboard options; layout switching goes here.
'';
};
xkbVariant = mkOption {
type = types.str;
default = "";
example = "colemak";
description = lib.mdDoc ''
X keyboard variant.
'';
};
variant = mkOption {
type = types.str;
default = "";
example = "colemak";
description = lib.mdDoc ''
X keyboard variant.
'';
};
xkbDir = mkOption {
type = types.path;
default = "${pkgs.xkeyboard_config}/etc/X11/xkb";
defaultText = literalExpression ''"''${pkgs.xkeyboard_config}/etc/X11/xkb"'';
description = lib.mdDoc ''
Path used for -xkbdir xserver parameter.
'';
dir = mkOption {
type = types.path;
default = "${pkgs.xkeyboard_config}/etc/X11/xkb";
defaultText = literalExpression ''"''${pkgs.xkeyboard_config}/etc/X11/xkb"'';
description = lib.mdDoc ''
Path used for -xkbdir xserver parameter.
'';
};
};
};
};
config = mkOption {
@ -667,7 +699,7 @@ in
{
"X11/xorg.conf".source = "${configFile}";
# -xkbdir command line option does not seems to be passed to xkbcomp.
"X11/xkb".source = "${cfg.xkbDir}";
"X11/xkb".source = "${cfg.xkb.dir}";
})
# localectl looks into 00-keyboard.conf
//{
@ -675,10 +707,10 @@ in
Section "InputClass"
Identifier "Keyboard catchall"
MatchIsKeyboard "on"
Option "XkbModel" "${cfg.xkbModel}"
Option "XkbLayout" "${cfg.layout}"
Option "XkbOptions" "${cfg.xkbOptions}"
Option "XkbVariant" "${cfg.xkbVariant}"
Option "XkbModel" "${cfg.xkb.model}"
Option "XkbLayout" "${cfg.xkb.layout}"
Option "XkbOptions" "${cfg.xkb.options}"
Option "XkbVariant" "${cfg.xkb.variant}"
EndSection
'';
}
@ -759,7 +791,7 @@ in
services.xserver.displayManager.xserverArgs =
[ "-config ${configFile}"
"-xkbdir" "${cfg.xkbDir}"
"-xkbdir" "${cfg.xkb.dir}"
] ++ optional (cfg.display != null) ":${toString cfg.display}"
++ optional (cfg.tty != null) "vt${toString cfg.tty}"
++ optional (cfg.dpi != null) "-dpi ${toString cfg.dpi}"
@ -777,14 +809,14 @@ in
];
system.checks = singleton (pkgs.runCommand "xkb-validated" {
inherit (cfg) xkbModel layout xkbVariant xkbOptions;
inherit (cfg.xkb) model layout variant options;
nativeBuildInputs = with pkgs.buildPackages; [ xkbvalidate ];
preferLocalBuild = true;
} ''
${optionalString (config.environment.sessionVariables ? XKB_CONFIG_ROOT)
"export XKB_CONFIG_ROOT=${config.environment.sessionVariables.XKB_CONFIG_ROOT}"
}
xkbvalidate "$xkbModel" "$layout" "$xkbVariant" "$xkbOptions"
xkbvalidate "$model" "$layout" "$variant" "$options"
touch "$out"
'');

28
nixos/tests/keymap.nix
View File

@ -31,7 +31,7 @@ let
nodes.machine.console.keyMap = mkOverride 900 layout;
nodes.machine.services.xserver.desktopManager.xterm.enable = false;
nodes.machine.services.xserver.layout = mkOverride 900 layout;
nodes.machine.services.xserver.xkb.layout = mkOverride 900 layout;
nodes.machine.imports = [ ./common/x11.nix extraConfig ];
testScript = ''
@ -116,7 +116,7 @@ in pkgs.lib.mapAttrs mkKeyboardTest {
};
extraConfig.console.keyMap = "fr";
extraConfig.services.xserver.layout = "fr";
extraConfig.services.xserver.xkb.layout = "fr";
};
bone = {
@ -130,8 +130,8 @@ in pkgs.lib.mapAttrs mkKeyboardTest {
};
extraConfig.console.keyMap = "bone";
extraConfig.services.xserver.layout = "de";
extraConfig.services.xserver.xkbVariant = "bone";
extraConfig.services.xserver.xkb.layout = "de";
extraConfig.services.xserver.xkb.variant = "bone";
};
colemak = {
@ -141,8 +141,8 @@ in pkgs.lib.mapAttrs mkKeyboardTest {
};
extraConfig.console.keyMap = "colemak";
extraConfig.services.xserver.layout = "us";
extraConfig.services.xserver.xkbVariant = "colemak";
extraConfig.services.xserver.xkb.layout = "us";
extraConfig.services.xserver.xkb.variant = "colemak";
};
dvorak = {
@ -154,8 +154,8 @@ in pkgs.lib.mapAttrs mkKeyboardTest {
};
extraConfig.console.keyMap = "dvorak";
extraConfig.services.xserver.layout = "us";
extraConfig.services.xserver.xkbVariant = "dvorak";
extraConfig.services.xserver.xkb.layout = "us";
extraConfig.services.xserver.xkb.variant = "dvorak";
};
dvorak-programmer = {
@ -170,8 +170,8 @@ in pkgs.lib.mapAttrs mkKeyboardTest {
};
extraConfig.console.keyMap = "dvorak-programmer";
extraConfig.services.xserver.layout = "us";
extraConfig.services.xserver.xkbVariant = "dvp";
extraConfig.services.xserver.xkb.layout = "us";
extraConfig.services.xserver.xkb.variant = "dvp";
};
neo = {
@ -185,8 +185,8 @@ in pkgs.lib.mapAttrs mkKeyboardTest {
};
extraConfig.console.keyMap = "neo";
extraConfig.services.xserver.layout = "de";
extraConfig.services.xserver.xkbVariant = "neo";
extraConfig.services.xserver.xkb.layout = "de";
extraConfig.services.xserver.xkb.variant = "neo";
};
qwertz = {
@ -199,7 +199,7 @@ in pkgs.lib.mapAttrs mkKeyboardTest {
};
extraConfig.console.keyMap = "de";
extraConfig.services.xserver.layout = "de";
extraConfig.services.xserver.xkb.layout = "de";
};
custom = {
@ -212,7 +212,7 @@ in pkgs.lib.mapAttrs mkKeyboardTest {
};
extraConfig.console.useXkbConfig = true;
extraConfig.services.xserver.layout = "us-greek";
extraConfig.services.xserver.xkb.layout = "us-greek";
extraConfig.services.xserver.extraLayouts.us-greek =
{ description = "US layout with alt-gr greek";
languages = [ "eng" ];

3
nixos/tests/sabnzbd.nix
View File

@ -18,5 +18,8 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
machine.wait_until_succeeds(
"curl --fail -L http://localhost:8080/"
)
_, out = machine.execute("grep SABCTools /var/lib/sabnzbd/logs/sabnzbd.log")
machine.log(out)
machine.fail("grep 'SABCTools disabled: no correct version found!' /var/lib/sabnzbd/logs/sabnzbd.log")
'';
})

4
pkgs/applications/audio/monkeys-audio/default.nix
View File

@ -5,13 +5,13 @@
}:
stdenv.mkDerivation (finalAttrs: {
version = "10.22";
version = "10.24";
pname = "monkeys-audio";
src = fetchzip {
url = "https://monkeysaudio.com/files/MAC_${
builtins.concatStringsSep "" (lib.strings.splitString "." finalAttrs.version)}_SDK.zip";
sha256 = "sha256-JmDH9IudtuJdu1kSDI1RNaYiIgmPgH4RT2Myz9ihQH4=";
sha256 = "sha256-18rHv9sbxpuMfMrqoSSeEncDmQlWpdA/xNPoYJoIgJ0=";
stripRoot = false;
};
nativeBuildInputs = [

4
pkgs/applications/audio/mympd/default.nix
View File

@ -16,13 +16,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "mympd";
version = "12.0.2";
version = "12.0.4";
src = fetchFromGitHub {
owner = "jcorporation";
repo = "myMPD";
rev = "v${finalAttrs.version}";
sha256 = "sha256-7jE3erxrCPN2deI7EV0gDH1gy2XdwC1YdU2mo2xMI6Q=";
sha256 = "sha256-pOs3VfgpDUD8KiBmJ37qpGLguxOXm5cr+jlTEeRZ4Bk=";
};
nativeBuildInputs = [

6
pkgs/applications/misc/calibre/default.nix
View File

@ -32,11 +32,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "calibre";
version = "6.26.0";
version = "6.28.1";
src = fetchurl {
url = "https://download.calibre-ebook.com/${finalAttrs.version}/calibre-${finalAttrs.version}.tar.xz";
hash = "sha256-7UUnDtTRf162xKMUuZoKh+y47oeUtrOsFHUTAvtOryM=";
hash = "sha256-ZoJN8weAXUQkxalRtVtEaychc30+l2kfzG9Tm5jZh9g=";
};
patches = [
@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: {
(fetchpatch {
name = "0007-Hardening-Qt-code.patch";
url = "https://raw.githubusercontent.com/debian-calibre/calibre/debian/${finalAttrs.version}+ds-1/debian/patches/hardening/0007-Hardening-Qt-code.patch";
hash = "sha256-2V8H6ElvzS5yw1di+XZvMssuokUT5zP3aTzpDpMsMac=";
hash = "sha256-eTzwo8aAIJnZTIZ/8DqCQi3ZbKxycEdiv+UxRuxo12g=";
})
]
++ lib.optional (!unrarSupport) ./dont_build_unrar_plugin.patch;

12
pkgs/applications/misc/calibre/dont_build_unrar_plugin.patch
View File

@ -1,12 +1,12 @@
diff --git a/src/calibre/ebooks/metadata/archive.py b/src/calibre/ebooks/metadata/archive.py
index 938ab24..1e095f8 100644
index 50b4750124..858e39eece 100644
--- a/src/calibre/ebooks/metadata/archive.py
+++ b/src/calibre/ebooks/metadata/archive.py
@@ -44,7 +44,7 @@
@@ -99,7 +99,7 @@ class ArchiveExtract(FileTypePlugin):
description = _('Extract common e-book formats from archive files '
'(ZIP/RAR). Also try to autodetect if they are actually '
'CBZ/CBR files.')
- file_types = {'zip', 'rar'}
+ file_types = {'zip'}
'(ZIP/RAR/7z). Also try to autodetect if they are actually '
'CBZ/CBR/CB7 files.')
- file_types = {'zip', 'rar', '7z'}
+ file_types = {'zip', '7z'}
supported_platforms = ['windows', 'osx', 'linux']
on_import = True

74
pkgs/applications/misc/join-desktop/default.nix
View File

@ -1,74 +0,0 @@
{ lib
, stdenv
, fetchurl
, alsa-lib
, autoPatchelfHook
, dpkg
, gtk3
, makeWrapper
, mesa
, nss
, systemd
, xorg
}:
stdenv.mkDerivation rec {
pname = "join-desktop";
version = "1.1.2";
src = fetchurl {
url = "https://github.com/joaomgcd/JoinDesktop/releases/download/v${version}/com.joaomgcd.join_${version}_amd64.deb";
sha256 = "sha256-k1LX/HC3tfL4Raipo7wp/LnfrPa38x8NBeKRyHJ72CU=";
};
nativeBuildInputs = [
autoPatchelfHook
dpkg
makeWrapper
];
buildInputs = [
alsa-lib
gtk3
mesa
nss
xorg.libXScrnSaver
xorg.libXtst
];
unpackPhase = "dpkg-deb -x $src .";
runtimeDependencies = [
(lib.getLib systemd)
# TODO: check if they are required
# libnotify
# libappindicator
];
installPhase = ''
runHook preInstall
mkdir -p $out/bin $out/share/join-desktop
mv usr/share/* $out/share
mv opt/Join\ Desktop/* $out/share/join-desktop
ln -s $out/share/join-desktop/com.joaomgcd.join $out/bin/
substituteInPlace $out/share/applications/com.joaomgcd.join.desktop \
--replace "/opt/Join Desktop/com.joaomgcd.join" "com.joaomgcd.join"
runHook postInstall
'';
meta = with lib; {
homepage = "https://github.com/joaomgcd/JoinDesktop/";
description = "Desktop app for Join";
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
# on https://joaoapps.com/join/desktop/ "Join Desktop is an open source app" but no license
license = licenses.free;
platforms = [ "x86_64-linux" ];
maintainers = with maintainers; [ SuperSandro2000 ];
};
}

4
pkgs/applications/misc/logseq/default.nix
View File

@ -14,11 +14,11 @@ stdenv.mkDerivation (finalAttrs: let
in {
pname = "logseq";
version = "0.9.18";
version = "0.9.19";
src = fetchurl {
url = "https://github.com/logseq/logseq/releases/download/${version}/logseq-linux-x64-${version}.AppImage";
hash = "sha256-+2BnVW0qWSJ/PIY3zl1c9qzcP9DZVp6E9B7AI6LqibE=";
hash = "sha256-Y3AeeJc+PYJdckpOma5ZDbVtBbjBTfNNDqTip4l02/E=";
name = "${pname}-${version}.AppImage";
};

4
pkgs/applications/misc/mkgmap/default.nix
View File

@ -15,12 +15,12 @@ let
in
stdenv.mkDerivation rec {
pname = "mkgmap";
version = "4912";
version = "4914";
src = fetchsvn {
url = "https://svn.mkgmap.org.uk/mkgmap/mkgmap/trunk";
rev = version;
sha256 = "sha256-4A6N0bhRLKgpLXUSN1iAmIC4YX+BaiUow2YQqnxguRM=";
sha256 = "sha256-aA5jGW6GTo2OvFZ/uPA4KpS+SjNB/tRGwgj1oM7zywU=";
};
patches = [

0
pkgs/applications/misc/mupdf/darwin.patch → pkgs/applications/misc/mupdf/1.17/darwin.patch
View File

0
pkgs/applications/misc/mupdf/1.17.nix → pkgs/applications/misc/mupdf/1.17/default.nix
View File

0
pkgs/applications/misc/mupdf/mupdf-1.14-shared_libs.patch → pkgs/applications/misc/mupdf/1.17/mupdf-1.14-shared_libs.patch
View File

794
pkgs/applications/misc/pot/Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

9
pkgs/applications/misc/pot/default.nix
View File

@ -23,13 +23,13 @@
stdenv.mkDerivation rec {
pname = "pot";
version = "2.4.2";
version = "2.6.2";
src = fetchFromGitHub {
owner = "pot-app";
repo = "pot-desktop";
rev = version;
hash = "sha256-n12uO5QbD/HgD5Rq5d+TQ8j8Gn5hl6wTi27TqFmunIM=";
hash = "sha256-0NnZe1o8HsB1GR6wp8Da/CTLhcve/sGIumD2qb9DC3s=";
};
sourceRoot = "${src.name}/src-tauri";
@ -66,15 +66,14 @@ stdenv.mkDerivation rec {
dontFixup = true;
outputHashMode = "recursive";
outputHash = "sha256-/5bB4czTPS3ZM9f7NBIHbwd95BqY2dRwKaBOWVsef04=";
outputHash = "sha256-m83cDKtFfwA3Xv8EqXNyF37ss+8qFDdFhu/1X1g7n/0=";
};
cargoDeps = rustPlatform.importCargoLock {
lockFile = ./Cargo.lock;
outputHashes = {
# All other crates in the same workspace reuse this hash.
"tauri-plugin-autostart-0.0.0" = "sha256-7Qi07yRb+ww569+sEXFIwAtS8jbUNQx6LsrUnMl5YOo=";
"reqwest_dav-0.1.3" = "sha256-nWOH1SOoNA2o2lmGAIEJj3OLOlP39FjlXqK8LPZ95hI=";
"tauri-plugin-autostart-0.0.0" = "sha256-hvR9tUp7yFhSP2bqE0mGwT8NHL7fGOYQ3Gz2wYi0bXI=";
};
};

4
pkgs/applications/networking/cluster/hubble/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "hubble";
version = "0.12.0";
version = "0.12.1";
src = fetchFromGitHub {
owner = "cilium";
repo = pname;
rev = "v${version}";
sha256 = "sha256-QtslAJC9qPR1jnyK4SLPVv8YTxOUvrzrSA1TzEwajS8=";
sha256 = "sha256-YJrL4fLJnTkfzZQp4MzPZL8ZZOGhFbHUzOpvaA5JrOA=";
};
vendorHash = null;

4
pkgs/applications/networking/cluster/timoni/default.nix
View File

@ -6,13 +6,13 @@
buildGo121Module rec {
pname = "timoni";
version = "0.14.1";
version = "0.14.2";
src = fetchFromGitHub {
owner = "stefanprodan";
repo = "timoni";
rev = "v${version}";
hash = "sha256-DzJNNikvODP3v1jgQLbFcXEhcFfTeIYR6qHhUzEP/Ns=";
hash = "sha256-45OIj57gb8njYoks7SgIlcMjz07ShEz2G/EECaTRTQg=";
};
vendorHash = "sha256-lRZFRnft8vEntVxiLOBcR00FP8AXexLyo3h2LCNWN00=";

8
pkgs/applications/office/appflowy/default.nix
View File

@ -8,15 +8,16 @@
, gtk3
, xdg-user-dirs
, keybinder3
, libnotify
}:
stdenv.mkDerivation rec {
pname = "appflowy";
version = "0.3.2";
version = "0.3.5";
src = fetchzip {
url = "https://github.com/AppFlowy-IO/appflowy/releases/download/${version}/AppFlowy_x86_64-unknown-linux-gnu_ubuntu-20.04.tar.gz";
hash = "sha256-UmBXAfRIr9zOScqibKPHeKzr+UTx3gbGEm0tl7qn+oE=";
url = "https://github.com/AppFlowy-IO/appflowy/releases/download/${version}/AppFlowy-${version}-linux-x86_64.tar.gz";
hash = "sha256-NKoRsT8UQ1IHS95KATHNzbAYWCi6zwwmRZvR+U7MVhk=";
stripRoot = false;
};
@ -29,6 +30,7 @@ stdenv.mkDerivation rec {
buildInputs = [
gtk3
keybinder3
libnotify
];
dontBuild = true;

4
pkgs/applications/radio/multimon-ng/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "multimon-ng";
version = "1.2.0";
version = "1.3.0";
src = fetchFromGitHub {
owner = "EliasOenal";
repo = "multimon-ng";
rev = version;
sha256 = "sha256-Qk9zg3aSrEfC16wQqL/EMG6MPobX8dnJ1OLH8EMap0I=";
sha256 = "sha256-IJnvOVajkcjaa0DDo8hbkkVvBnDqPKQUN8wJHlafo70=";
};
buildInputs = lib.optionals stdenv.isLinux [ libpulseaudio libX11 ];

10
pkgs/applications/science/molecular-dynamics/gromacs/default.nix
View File

@ -27,6 +27,10 @@ in stdenv.mkDerivation rec {
sha256 = "sha256-vOFIByfksruQBBO3XZmjJm81B4d9pPWy1JHfeY+fza4=";
};
patches = [ ./pkgconfig.patch ];
outputs = [ "out" "dev" "man" ];
nativeBuildInputs = [ cmake ];
buildInputs = [
@ -64,10 +68,8 @@ in stdenv.mkDerivation rec {
]
) ++ lib.optional enableCuda "-DGMX_GPU=CUDA";
postFixup = ''
substituteInPlace "$out"/lib/pkgconfig/*.pc \
--replace '=''${prefix}//' '=/' \
--replace "$out/$out/" "$out/"
postInstall = ''
moveToOutput share/cmake $dev
'';
meta = with lib; {

24
pkgs/applications/science/molecular-dynamics/gromacs/pkgconfig.patch Normal file
View File

@ -0,0 +1,24 @@
diff --git a/src/external/muparser/muparser.pc.in b/src/external/muparser/muparser.pc.in
index 646787cb53..9b97ad57f7 100644
--- a/src/external/muparser/muparser.pc.in
+++ b/src/external/muparser/muparser.pc.in
@@ -1,7 +1,5 @@
-prefix=@CMAKE_INSTALL_PREFIX@
-exec_prefix=${prefix}
-libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
-includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@
+libdir=@CMAKE_INSTALL_FULL_LIBDIR@
+includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
Name: @PACKAGE_NAME@
Description: Mathematical expressions parser library
diff --git a/src/gromacs/libgromacs.pc.cmakein b/src/gromacs/libgromacs.pc.cmakein
index ec1ed6684e..ca1105474a 100644
--- a/src/gromacs/libgromacs.pc.cmakein
+++ b/src/gromacs/libgromacs.pc.cmakein
@@ -1,4 +1,4 @@
-libdir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@
+libdir=@CMAKE_INSTALL_FULL_LIBDIR@
Name: libgromacs@GMX_LIBS_SUFFIX@
Description: Gromacs library

4
pkgs/applications/version-management/gerrit/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "gerrit";
version = "3.8.0";
version = "3.8.2";
src = fetchurl {
url = "https://gerrit-releases.storage.googleapis.com/gerrit-${version}.war";
sha256 = "sha256-wial+K5eUZSJ+asFBLrFoJQOLWLHkl5ot4b4CIsg7Tc=";
hash = "sha256-irzzG8qLJaBdRULGRyoYkn0tc4Yfcg/xe2SLriD8mtM=";
};
buildCommand = ''

6
pkgs/applications/version-management/git-mit/default.nix
View File

@ -10,7 +10,7 @@
}:
let
version = "5.12.157";
version = "5.12.158";
in
rustPlatform.buildRustPackage {
pname = "git-mit";
@ -20,10 +20,10 @@ rustPlatform.buildRustPackage {
owner = "PurpleBooth";
repo = "git-mit";
rev = "v${version}";
hash = "sha256-Okb+HOCgtGLKSbhmhwA63BxS43ulZlSkHDOPsYzO2ZE=";
hash = "sha256-vMrIkM8ShfaSrIEFiY6Jiwo8/6LMrjlqpD1B8DNtWcI=";
};
cargoHash = "sha256-I3sP6nhjMBXnANRrPT3+3HlY62TvfX6lFea7tHefOV8=";
cargoHash = "sha256-kdXnj1O9AWFwFWQwZ6QPe5ePlxjr/F68vJEpAZgph6I=";
nativeBuildInputs = [ pkg-config ];

41
pkgs/build-support/kernel/make-initrd-ng/Cargo.lock generated
View File

@ -2,12 +2,6 @@
# It is not intended for manual editing.
version = 3
[[package]]
name = "cfg-if"
version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
[[package]]
name = "eyre"
version = "0.6.8"
@ -20,9 +14,9 @@ dependencies = [
[[package]]
name = "goblin"
version = "0.5.3"
version = "0.5.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "91766b1121940d622933a13e20665857648681816089c9bc2075c4b75a6e4f6b"
checksum = "a7666983ed0dd8d21a6f6576ee00053ca0926fb281a5522577a4dbd0f1b54143"
dependencies = [
"log",
"plain",
@ -37,12 +31,9 @@ checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683"
[[package]]
name = "log"
version = "0.4.17"
version = "0.4.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e"
dependencies = [
"cfg-if",
]
checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f"
[[package]]
name = "make-initrd-ng"
@ -54,9 +45,9 @@ dependencies = [
[[package]]
name = "once_cell"
version = "1.17.1"
version = "1.18.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3"
checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
[[package]]
name = "plain"
@ -66,18 +57,18 @@ checksum = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6"
[[package]]
name = "proc-macro2"
version = "1.0.42"
version = "1.0.69"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c278e965f1d8cf32d6e0e96de3d3e79712178ae67986d9cf9151f51e95aac89b"
checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da"
dependencies = [
"unicode-ident",
]
[[package]]
name = "quote"
version = "1.0.20"
version = "1.0.33"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3bcdf212e9776fbcb2d23ab029360416bb1706b1aea2d1a5ba002727cbcab804"
checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
dependencies = [
"proc-macro2",
]
@ -93,9 +84,9 @@ dependencies = [
[[package]]
name = "scroll_derive"
version = "0.11.0"
version = "0.11.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bdbda6ac5cd1321e724fa9cee216f3a61885889b896f073b8f82322789c5250e"
checksum = "1db149f81d46d2deba7cd3c50772474707729550221e69588478ebf9ada425ae"
dependencies = [
"proc-macro2",
"quote",
@ -104,9 +95,9 @@ dependencies = [
[[package]]
name = "syn"
version = "1.0.98"
version = "2.0.38"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c50aef8a904de4c23c788f104b7dddc7d6f79c647c7c8ce4cc8f73eb0ca773dd"
checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b"
dependencies = [
"proc-macro2",
"quote",
@ -115,6 +106,6 @@ dependencies = [
[[package]]
name = "unicode-ident"
version = "1.0.2"
version = "1.0.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "15c61ba63f9235225a22310255a29b806b907c9b8c964bcbd0a2c70f3f2deea7"
checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"

0
pkgs/misc/base16-shell-preview/default.nix → pkgs/by-name/ba/base16-shell-preview/package.nix
View File

26
pkgs/tools/misc/bat/default.nix → pkgs/by-name/ba/bat/package.nix
View File

@ -4,27 +4,27 @@
, fetchFromGitHub
, pkg-config
, less
, Security
, libiconv
, installShellFiles
, makeWrapper
, darwin
}:
rustPlatform.buildRustPackage rec {
pname = "bat";
version = "0.23.0";
version = "0.24.0";
src = fetchFromGitHub {
owner = "sharkdp";
repo = "bat";
rev = "v${version}";
hash = "sha256-cGHxB3Wp8yEcJBMtSOec6l7iBsMLhUtJ7nh5fijnWZs=";
hash = "sha256-1RjlJEmY/jMf0IYQbrWrT1CHFyiqgarOl72u9xjjQiQ=";
};
cargoHash = "sha256-wZNdYGCLKD80gV1QUTgKsFSNYkbDubknPB3e6dsyEgs=";
cargoHash = "sha256-b7wNWdKQ4QLeCf7bNZRfzT9hD/D/oDglU7Xyb65IrGY=";
nativeBuildInputs = [ pkg-config installShellFiles makeWrapper ];
buildInputs = lib.optionals stdenv.isDarwin [ Security libiconv ];
buildInputs = lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security ];
postInstall = ''
installManPage $releaseDir/build/bat-*/out/assets/manual/bat.1
@ -38,7 +38,21 @@ rustPlatform.buildRustPackage rec {
--prefix PATH : "${lib.makeBinPath [ less ]}"
'';
checkFlags = [ "--skip=pager_more" "--skip=pager_most" ];
# Skip test cases which depends on `more`
checkFlags = [
"--skip=alias_pager_disable_long_overrides_short"
"--skip=config_read_arguments_from_file"
"--skip=env_var_bat_paging"
"--skip=pager_arg_override_env_noconfig"
"--skip=pager_arg_override_env_withconfig"
"--skip=pager_basic"
"--skip=pager_basic_arg"
"--skip=pager_env_bat_pager_override_config"
"--skip=pager_env_pager_nooverride_config"
"--skip=pager_more"
"--skip=pager_most"
"--skip=pager_overwrite"
];
doInstallCheck = true;
installCheckPhase = ''

0
pkgs/applications/emulators/dosbox-staging/default.nix → pkgs/by-name/do/dosbox-staging/package.nix
View File

3
pkgs/by-name/ga/gash-utils/package.nix
View File

@ -32,7 +32,8 @@ stdenv.mkDerivation (finalAttrs: {
postInstall = ''
for f in $out/bin/*; do
wrapProgram $f \
--prefix GUILE_LOAD_PATH : "${gash}/${guile.siteDir}"
--prefix GUILE_LOAD_PATH : "$out/${guile.siteDir}:$GUILE_LOAD_PATH" \
--prefix GUILE_LOAD_COMPILED_PATH : "$out/${guile.siteCcacheDir}:$GUILE_LOAD_COMPILED_PATH"
done
'';

31
pkgs/applications/terminal-emulators/germinal/default.nix → pkgs/by-name/ge/germinal/package.nix
View File

@ -1,29 +1,35 @@
{ lib, stdenv
{ lib
, stdenv
, fetchFromGitHub
, autoreconfHook
, pkg-config
, appstream-glib
, autoreconfHook
, dbus
, pango
, pcre2
, pkg-config
, tmux
, vte
, wrapGAppsHook
, nixosTests
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "germinal";
version = "26";
src = fetchFromGitHub {
owner = "Keruspe";
repo = "Germinal";
rev = "v${version}";
sha256 = "sha256-HUi+skF4bJj5CY2cNTOC4tl7jhvpXYKqBx2rqKzjlo0=";
rev = "v${finalAttrs.version}";
hash = "sha256-HUi+skF4bJj5CY2cNTOC4tl7jhvpXYKqBx2rqKzjlo0=";
};
nativeBuildInputs = [ autoreconfHook pkg-config wrapGAppsHook ];
nativeBuildInputs = [
autoreconfHook
pkg-config
wrapGAppsHook
];
buildInputs = [
appstream-glib
dbus
@ -48,11 +54,12 @@ stdenv.mkDerivation rec {
passthru.tests.test = nixosTests.terminal-emulators.germinal;
meta = with lib; {
meta = {
description = "A minimal terminal emulator";
homepage = "https://github.com/Keruspe/Germinal";
license = with licenses; gpl3Plus;
platforms = with platforms; unix;
maintainers = with maintainers; [ AndersonTorres ];
license = lib.licenses.gpl3Plus;
mainProgram = "germinal";
maintainers = with lib.maintainers; [ AndersonTorres ];
platforms = lib.platforms.unix;
};
}
})

27
pkgs/applications/misc/haunt/default.nix → pkgs/by-name/ha/haunt/package.nix
View File

@ -3,6 +3,7 @@
, fetchurl
, fetchpatch
, autoreconfHook
, callPackage
, guile
, guile-commonmark
, guile-reader
@ -10,12 +11,12 @@
, pkg-config
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "haunt";
version = "0.2.6";
src = fetchurl {
url = "https://files.dthompson.us/${pname}/${pname}-${version}.tar.gz";
url = "https://files.dthompson.us/haunt/haunt-${finalAttrs.version}.tar.gz";
hash = "sha256-vPKLQ9hDJdimEAXwIBGgRRlefM8/77xFQoI+0J/lkNs=";
};
@ -40,6 +41,7 @@ stdenv.mkDerivation rec {
makeWrapper
pkg-config
];
buildInputs = [
guile
guile-commonmark
@ -55,14 +57,13 @@ stdenv.mkDerivation rec {
--prefix GUILE_LOAD_COMPILED_PATH : "$out/${guile.siteCcacheDir}:$GUILE_LOAD_COMPILED_PATH"
'';
doInstallCheck = true;
installCheckPhase = ''
runHook preInstallCheck
$out/bin/haunt --version
runHook postInstallCheck
'';
passthru = {
tests = {
expectVersion = callPackage ./tests/001-test-version.nix { };
};
};
meta = with lib; {
meta = {
homepage = "https://dthompson.us/projects/haunt.html";
description = "Guile-based static site generator";
longDescription = ''
@ -81,8 +82,8 @@ stdenv.mkDerivation rec {
feeds, authors should feel empowered to tweak, replace, or create builders
to do things that aren't provided out-of-the-box.
'';
license = licenses.gpl3Plus;
maintainers = with maintainers; [ AndersonTorres AluisioASG ];
platforms = guile.meta.platforms;
license = lib.licenses.gpl3Plus;
maintainers = with lib.maintainers; [ AndersonTorres AluisioASG ];
inherit (guile.meta) platforms;
};
}
})

21
pkgs/by-name/ha/haunt/tests/001-test-version.nix Normal file
View File

@ -0,0 +1,21 @@
{ lib
, stdenv
, haunt
}:
stdenv.mkDerivation {
pname = "haunt-test-version";
inherit (haunt) version;
nativeBuildInputs = [ haunt ];
dontInstall = true;
buildCommand = ''
haunt --version
touch $out
'';
meta.timeout = 10;
}

26
pkgs/applications/terminal-emulators/havoc/default.nix → pkgs/by-name/ha/havoc/package.nix
View File

@ -3,19 +3,19 @@
, fetchFromGitHub
, libxkbcommon
, pkg-config
, wayland
, wayland-protocols
, wayland-scanner
, wayland
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "havoc";
version = "0.5.0";
src = fetchFromGitHub {
owner = "ii8";
repo = pname;
rev = version;
repo = "havoc";
rev = finalAttrs.version;
hash = "sha256-jvGm2gFdMS61otETF7gOEpYn6IuLfqI95IpEVfIv+C4=";
};
@ -38,19 +38,19 @@ stdenv.mkDerivation rec {
installFlags = [ "PREFIX=$$out" ];
postInstall = ''
install -D -m 644 havoc.cfg -t $out/etc/${pname}/
install -D -m 644 README.md -t $out/share/doc/${pname}-${version}/
install -Dm 644 havoc.cfg -t $out/etc/havoc/
install -Dm 644 README.md -t $out/share/doc/havoc-${finalAttrs.version}/
'';
enableParallelBuilding = true;
meta = with lib; {
meta = {
homepage = "https://github.com/ii8/havoc";
description = "A minimal terminal emulator for Wayland";
license = with licenses; [ mit publicDomain ];
platforms = with platforms; unix;
maintainers = with maintainers; [ AndersonTorres ];
# fatal error: 'sys/epoll.h' file not found
broken = stdenv.isDarwin;
license = with lib.licenses; [ mit publicDomain ];
mainProgram = "havoc";
maintainers = with lib.maintainers; [ AndersonTorres ];
inherit (wayland.meta) platforms;
broken = stdenv.isDarwin; # fatal error: 'sys/epoll.h' file not found
};
}
})

13
pkgs/applications/terminal-emulators/kermit-terminal/default.nix → pkgs/by-name/ke/kermit-terminal/package.nix
View File

@ -15,11 +15,13 @@ stdenv.mkDerivation (finalAttrs: {
src = fetchFromGitHub {
owner = "orhun";
repo = finalAttrs.pname;
repo = "kermit";
rev = finalAttrs.version;
hash = "sha256-XPHF33Nu+H8OcQFwsuUOhDBDWKm8sh5B36sfROeSWPg=";
};
outputs = [ "out" "man" ];
nativeBuildInputs = [
cmake
pkg-config
@ -33,12 +35,13 @@ stdenv.mkDerivation (finalAttrs: {
passthru.tests.test = nixosTests.terminal-emulators.kermit;
meta = with lib; {
meta = {
homepage = "https://github.com/orhun/kermit";
description = "A VTE-based, simple and froggy terminal emulator";
changelog = "https://github.com/orhun/kermit/releases/tag/${finalAttrs.version}";
license = licenses.gpl3Only;
maintainers = with maintainers; [ AndersonTorres ];
platforms = with platforms; unix;
license = lib.licenses.gpl3Only;
mainProgram = "kermit";
maintainers = with lib.maintainers; [ AndersonTorres ];
platforms = lib.platforms.unix;
};
})

28
pkgs/by-name/mi/minetest-mapserver/package.nix Normal file
View File

@ -0,0 +1,28 @@
{ buildGoModule
, fetchFromGitHub
, lib
}:
buildGoModule rec {
pname = "minetest-mapserver";
version = "4.7.0";
src = fetchFromGitHub {
owner = pname;
repo = "mapserver";
rev = "v${version}";
hash = "sha256-qThdNXb17mh3Ph57d3oUl/KhP64AKPZJOCVsvr2SDWk=";
};
vendorHash = "sha256-VSyzdiPNcHDH/ebM2A0pTAyiMblMaJGEIULsIzupmaw=";
meta = with lib; {
description = "Realtime mapserver for minetest";
mainProgram = "mapserver";
homepage = "https://github.com/${pname}/mapserver/blob/master/readme.md";
changelog = "https://github.com/${pname}/mapserver/releases/tag/v${version}";
license = with licenses; [ mit cc-by-sa-30 ];
platforms = platforms.all;
maintainers = with maintainers; [ gm6k ];
};
}

0
pkgs/development/interpreters/nickel/Cargo.lock → pkgs/by-name/ni/nickel/Cargo.lock generated
View File

2
pkgs/development/interpreters/nickel/default.nix → pkgs/by-name/ni/nickel/package.nix
View File

@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
src = fetchFromGitHub {
owner = "tweag";
repo = pname;
repo = "nickel";
rev = "refs/tags/${version}";
hash = "sha256-g7pRTwa2sniIOmgdYCxfYxGRtxnQP8zaVWuPjzEZTSg=";
};

0
pkgs/development/tools/language-servers/nls/default.nix → pkgs/by-name/nl/nls/package.nix
View File

26
pkgs/applications/graphics/nsxiv/default.nix → pkgs/by-name/ns/nsxiv/package.nix
View File

@ -10,18 +10,20 @@
, conf ? null
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "nsxiv";
version = "31";
version = "32";
src = fetchFromGitea {
domain = "codeberg.org";
owner = "nsxiv";
repo = "nsxiv";
rev = "v${version}";
hash = "sha256-X1ZMr5OADs9GIe/kp/kEqKMMHZMymd58m9+f0SPzn7s=";
rev = "v${finalAttrs.version}";
hash = "sha256-UWaet7hVtgfuWTiNY4VcsMWTfS6L9r5w1fb/0dWz8SI=";
};
outputs = [ "out" "man" "doc" ];
buildInputs = [
giflib
imlib2
@ -30,11 +32,11 @@ stdenv.mkDerivation rec {
libwebp
] ++ lib.optional stdenv.isDarwin libinotify-kqueue;
preBuild = lib.optionalString (conf!=null) ''
postPatch = lib.optionalString (conf != null) ''
cp ${(builtins.toFile "config.def.h" conf)} config.def.h
'';
NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-linotify";
env.NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-linotify";
makeFlags = [ "CC:=$(CC)" ];
@ -42,7 +44,7 @@ stdenv.mkDerivation rec {
installTargets = [ "install-all" ];
meta = with lib; {
meta = {
homepage = "https://nsxiv.codeberg.page/";
description = "New Suckless X Image Viewer";
longDescription = ''
@ -59,9 +61,9 @@ stdenv.mkDerivation rec {
- Display image information in status bar
- Display image name/path in X title
'';
license = licenses.gpl2Plus;
maintainers = with maintainers; [ AndersonTorres sikmir ];
platforms = platforms.unix;
changelog = "https://codeberg.org/nsxiv/nsxiv/src/tag/${src.rev}/etc/CHANGELOG.md";
changelog = "https://codeberg.org/nsxiv/nsxiv/src/tag/${finalAttrs.src.rev}/etc/CHANGELOG.md";
license = lib.licenses.gpl2Plus;
maintainers = with lib.maintainers; [ AndersonTorres sikmir ];
platforms = lib.platforms.unix;
};
}
})

0
pkgs/tools/text/pru/Gemfile → pkgs/by-name/pr/pru/Gemfile
View File

0
pkgs/tools/text/pru/Gemfile.lock → pkgs/by-name/pr/pru/Gemfile.lock
View File

0
pkgs/tools/text/pru/gemset.nix → pkgs/by-name/pr/pru/gemset.nix
View File

0
pkgs/tools/text/pru/default.nix → pkgs/by-name/pr/pru/package.nix
View File

0
pkgs/tools/text/pyp/default.nix → pkgs/by-name/py/pyp/package.nix
View File

10
pkgs/tools/text/robodoc/default.nix → pkgs/by-name/ro/robodoc/package.nix
View File

@ -4,15 +4,15 @@
, autoreconfHook
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "robodoc";
version = "4.99.44";
src = fetchFromGitHub {
owner = "gumpu";
repo = "ROBODoc";
rev = "v${version}";
sha256 = "l3prSdaGhOvXmZfCPbsZJNocO7y20zJjLQpajRTJOqE=";
rev = "v${finalAttrs.version}";
hash = "sha256-l3prSdaGhOvXmZfCPbsZJNocO7y20zJjLQpajRTJOqE=";
};
postConfigure = lib.optionalString stdenv.isDarwin ''
@ -48,6 +48,6 @@ stdenv.mkDerivation rec {
'';
license = with licenses; gpl3Plus;
maintainers = with maintainers; [ AndersonTorres ];
platforms = with platforms; all;
platforms = platforms.all;
};
}
})

0
pkgs/tools/text/rs/default.nix → pkgs/by-name/rs/rs/package.nix
View File

0
pkgs/tools/text/rst2html5/default.nix → pkgs/by-name/rs/rst2html5/package.nix
View File

22
pkgs/misc/scimark/default.nix → pkgs/by-name/sc/scimark/package.nix
View File

@ -4,12 +4,12 @@
, unzip
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "scimark";
version = "4c";
src = fetchurl {
url = "https://math.nist.gov/scimark2/${pname}${version}.zip";
url = "https://math.nist.gov/scimark2/scimark${finalAttrs.version}.zip";
hash = "sha256-kcg5vKYp0B7+bC/CmFMO/tMwxf9q6nvuFv0vRSy3MbE=";
};
@ -20,17 +20,21 @@ stdenv.mkDerivation rec {
dontConfigure = true;
installPhase = ''
install -d $out/bin/
install scimark4 $out/bin/
runHook preInstall
install -Dm755 scimark4 -t $out/bin/
runHook postInstall
'';
meta = with lib; {
meta = {
homepage = "https://math.nist.gov/scimark2/index.html";
description = "Scientific and numerical computing benchmark (ANSI C version)";
license = licenses.publicDomain;
maintainers = with maintainers; [ AndersonTorres ];
downloadPage = "https://math.nist.gov/scimark2/download_c.html";
license = lib.licenses.publicDomain;
mainProgram = "scimark4";
platforms = platforms.all;
maintainers = with lib.maintainers; [ AndersonTorres ];
platforms = lib.platforms.all;
};
}
})
# TODO [ AndersonTorres ]: Java version

13
pkgs/misc/sound-of-sorting/default.nix → pkgs/by-name/so/sound-of-sorting/package.nix
View File

@ -7,9 +7,9 @@
, darwin
}:
stdenv.mkDerivation {
stdenv.mkDerivation (finalAttrs: {
pname = "sound-of-sorting";
version = "unstable-2022-10-12";
version = "0.6.5-unstable-2022-10-12";
src = fetchFromGitHub {
owner = "bingmann";
@ -26,13 +26,16 @@ stdenv.mkDerivation {
wxGTK32
SDL2
]
++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Cocoa ;
++ lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.Cocoa
];
meta = {
description = "Audibilization and Visualization of Sorting Algorithms";
homepage = "https://panthema.net/2013/sound-of-sorting/";
license = lib.licenses.gpl3Plus;
mainProgram = "sound-of-sorting";
maintainers = with lib.maintainers; [ AndersonTorres ];
platforms = lib.platforms.unix;
inherit (SDL2.meta) platforms;
};
}
})

44
pkgs/applications/terminal-emulators/tilda/default.nix → pkgs/by-name/ti/tilda/package.nix
View File

@ -1,40 +1,47 @@
{ lib, stdenv
{ lib
, stdenv
, fetchFromGitHub
, autoreconfHook
, pkg-config
, expat
, gettext
, gtk
, gtk3
, libconfuse
, pcre2
, vte
, makeWrapper
, pcre2
, pkg-config
, vte
, nixosTests
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "tilda";
version = "1.5.4";
src = fetchFromGitHub {
owner = "lanoxx";
repo = "tilda";
rev = "${pname}-${version}";
sha256 = "sha256-uDx28jmjNUyzJbgTJiHbjI9U5mYb9bnfl/9AjbxNUWA=";
rev = "tilda-${finalAttrs.version}";
hash = "sha256-uDx28jmjNUyzJbgTJiHbjI9U5mYb9bnfl/9AjbxNUWA=";
};
nativeBuildInputs = [ autoreconfHook makeWrapper pkg-config ];
nativeBuildInputs = [
autoreconfHook
makeWrapper
pkg-config
];
buildInputs = [
gettext
gtk
gtk3
libconfuse
pcre2
vte
];
LD_LIBRARY_PATH = "${expat.out}/lib"; # ugly hack for xgettext to work during build
# ugly hack for xgettext to work during build
env.LD_LIBRARY_PATH = "${lib.getLib expat}/lib";
# The config locking scheme relies on the binary being called "tilda",
# The config locking scheme relies on the binary being called "tilda"
# (`pgrep -C tilda`), so a simple `wrapProgram` won't suffice:
postInstall = ''
mkdir $out/bin/wrapped
@ -45,12 +52,11 @@ stdenv.mkDerivation rec {
passthru.tests.test = nixosTests.terminal-emulators.tilda;
meta = with lib; {
description = "A Gtk based drop down terminal for Linux and Unix";
meta = {
homepage = "https://github.com/lanoxx/tilda/";
license = licenses.gpl3Plus;
maintainers = [ maintainers.AndersonTorres ];
platforms = platforms.linux;
description = "A Gtk based drop down terminal for Linux and Unix";
license = lib.licenses.gpl3Plus;
maintainers = [ lib.maintainers.AndersonTorres ];
platforms = lib.platforms.linux;
};
}
})

0
pkgs/tools/text/txr/default.nix → pkgs/by-name/tx/txr/package.nix
View File

29
pkgs/os-specific/linux/uclibc-ng/default.nix → pkgs/by-name/uc/uclibc-ng/package.nix
View File

@ -56,12 +56,12 @@ let
UCLIBC_HAS_FPU n
'';
in
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "uclibc-ng";
version = "1.0.44";
src = fetchurl {
url = "https://downloads.uclibc-ng.org/releases/${version}/uClibc-ng-${version}.tar.xz";
url = "https://downloads.uclibc-ng.org/releases/${finalAttrs.version}/uClibc-ng-${finalAttrs.version}.tar.xz";
sha256 = "sha256-ffnZh5VYJzgvHCQA2lE0Vr7Ltvhovf03c3Jl8cvuyZQ=";
};
@ -108,7 +108,13 @@ stdenv.mkDerivation rec {
runHook postInstall
'';
meta = with lib; {
passthru = {
# Derivations may check for the existance of this attribute, to know what to
# link to.
libiconv = libiconvReal;
};
meta = {
homepage = "https://uclibc-ng.org";
description = "Embedded C library";
longDescription = ''
@ -126,16 +132,9 @@ stdenv.mkDerivation rec {
processors. Alpha, FR-V, HPPA, IA64, LM32, NIOS2, Tile and Sparc64 are
experimental and need more testing.
'';
license = licenses.lgpl2Plus;
maintainers = with maintainers; [ rasendubi AndersonTorres ];
platforms = platforms.linux;
badPlatforms = platforms.aarch64;
license = lib.licenses.lgpl2Plus;
maintainers = with lib.maintainers; [ rasendubi AndersonTorres ];
platforms = lib.platforms.linux;
badPlatforms = lib.platforms.aarch64;
};
passthru = {
# Derivations may check for the existance of this attribute, to know what to
# link to.
libiconv = libiconvReal;
};
}
})

0
pkgs/misc/screensavers/xscreensaver/default.nix → pkgs/by-name/xs/xscreensaver/package.nix
View File

6
pkgs/development/compilers/erg/default.nix
View File

@ -9,16 +9,16 @@
rustPlatform.buildRustPackage rec {
pname = "erg";
version = "0.6.21";
version = "0.6.22";
src = fetchFromGitHub {
owner = "erg-lang";
repo = "erg";
rev = "v${version}";
hash = "sha256-NS9LpnCAYmninAcliwdEXPSYqqQZ8impaaK2eceoi3k=";
hash = "sha256-dUGwSNN6eAMXIaIn3/xQxZAcyH1tTOrj4oRMkkI1KXU=";
};
cargoHash = "sha256-JJPbArXb3Hmf7bDRlYM0ZOnaolYnDtc41EFazFtApWc=";
cargoHash = "sha256-TLEFy4r+CA8XcPYw5cX7qCIRrj/8q9Z1YOnkAKpjwug=";
nativeBuildInputs = [
makeWrapper

4
pkgs/development/libraries/gvm-libs/default.nix
View File

@ -23,13 +23,13 @@
stdenv.mkDerivation rec {
pname = "gvm-libs";
version = "22.7.1";
version = "22.7.2";
src = fetchFromGitHub {
owner = "greenbone";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-TSi537RLZGwnyC1nL/Ge3lTlV2FmH1nmAzFSHmaTv04=";
hash = "sha256-vcCugIohuZg+GhUA7ZgkyhMxN0KSvCFVO/HLOnrNxxA=";
};
nativeBuildInputs = [

2
pkgs/development/libraries/libfabric/default.nix
View File

@ -23,6 +23,8 @@ stdenv.mkDerivation rec {
sha256 = "sha256-7VOhdZOPBe1qh8OK8OTNKA5I4A5whl6aOubAzsUDSRw=";
};
outputs = [ "out" "dev" "man" ];
nativeBuildInputs = [ pkg-config autoreconfHook ];
buildInputs = lib.optionals enableOpx [ libuuid numactl ] ++ lib.optionals enablePsm2 [ libpsm2 ];

4
pkgs/development/libraries/mongocxx/default.nix
View File

@ -9,13 +9,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "mongocxx";
version = "3.8.0";
version = "3.8.1";
src = fetchFromGitHub {
owner = "mongodb";
repo = "mongo-cxx-driver";
rev = "refs/tags/r${finalAttrs.version}";
hash = "sha256-7pMVBWMIGV6k04/0rKULwNcl0NMO4hqMnOzWv+0/DrA=";
hash = "sha256-fBZg69jsvXzhllpcPBGXkjYyvUQImnGNkb2Ek5Oi0p4=";
};
postPatch = ''

2
pkgs/development/libraries/mpich/default.nix
View File

@ -18,6 +18,8 @@ stdenv.mkDerivation rec {
sha256 = "sha256-NJLpitq2K1l+8NKS+yRZthI7yABwqKoKML5pYgdaEvA=";
};
outputs = [ "out" "doc" "man" ];
configureFlags = [
"--enable-shared"
"--enable-sharedlib"

2
pkgs/development/libraries/mvapich/default.nix
View File

@ -21,6 +21,8 @@ stdenv.mkDerivation rec {
sha256 = "sha256-w5pEkvS+UN9hAHhXSLoolOI85FCpQSgYHVFtpXV3Ua4=";
};
outputs = [ "out" "doc" "man" ];
nativeBuildInputs = [ pkg-config bison makeWrapper gfortran ];
propagatedBuildInputs = [ numactl rdma-core zlib opensm ];
buildInputs = with lib; [

10
pkgs/development/libraries/openmpi/default.nix
View File

@ -43,6 +43,8 @@ in stdenv.mkDerivation rec {
find -name "Makefile.in" -exec sed -i "s/\`date\`/$ts/" \{} \;
'';
outputs = [ "out" "man" ];
buildInputs = [ zlib ]
++ lib.optionals stdenv.isLinux [ libnl numactl pmix ucx ]
++ lib.optionals cudaSupport [ cudatoolkit ]
@ -56,8 +58,8 @@ in stdenv.mkDerivation rec {
configureFlags = lib.optional (!cudaSupport) "--disable-mca-dso"
++ lib.optional (!fortranSupport) "--disable-mpi-fortran"
++ lib.optionals stdenv.isLinux [
"--with-libnl=${libnl.dev}"
"--with-pmix=${pmix}"
"--with-libnl=${lib.getDev libnl}"
"--with-pmix=${lib.getDev pmix}"
"--with-pmix-libdir=${pmix}/lib"
"--enable-mpi-cxx"
] ++ lib.optional enableSGE "--with-sge"
@ -66,13 +68,13 @@ in stdenv.mkDerivation rec {
# https://github.com/openucx/ucx
# https://www.open-mpi.org/faq/?category=buildcuda
++ lib.optionals cudaSupport [ "--with-cuda=${cudatoolkit_joined}" "--enable-dlopen" ]
++ lib.optionals fabricSupport [ "--with-psm2=${libpsm2}" "--with-libfabric=${libfabric}" ]
++ lib.optionals fabricSupport [ "--with-psm2=${lib.getDev libpsm2}" "--with-libfabric=${lib.getDev libfabric}" ]
;
enableParallelBuilding = true;
postInstall = ''
rm -f $out/lib/*.la
find $out/lib/ -name "*.la" -exec rm -f \{} \;
'';
postFixup = ''

8
pkgs/development/libraries/pmix/default.nix
View File

@ -23,15 +23,19 @@ stdenv.mkDerivation rec {
buildInputs = [ libevent hwloc munge zlib ];
configureFlags = [
"--with-libevent=${libevent.dev}"
"--with-libevent=${lib.getDev libevent}"
"--with-munge=${munge}"
"--with-hwloc=${hwloc.dev}"
"--with-hwloc=${lib.getDev hwloc}"
];
preConfigure = ''
./autogen.pl
'';
postInstall = ''
find $out/lib/ -name "*.la" -exec rm -f \{} \;
'';
enableParallelBuilding = true;
meta = with lib; {

8
pkgs/development/libraries/ucc/default.nix
View File

@ -18,6 +18,8 @@ stdenv.mkDerivation rec {
sha256 = "sha256-7Mo9zU0sogGyDdWIfTgUPoR5Z8D722asC2y7sHnKbzs=";
};
outputs = [ "out" "dev" ];
enableParallelBuilding = true;
postPatch = ''
@ -42,6 +44,12 @@ stdenv.mkDerivation rec {
++ lib.optional enableAvx "--with-avx"
++ lib.optional enableCuda "--with-cuda=${cudatoolkit}";
postInstall = ''
find $out/lib/ -name "*.la" -exec rm -f \{} \;
moveToOutput bin/ucc_info $dev
'';
meta = with lib; {
description = "Collective communication operations API";
license = licenses.bsd3;

10
pkgs/development/libraries/ucx/default.nix
View File

@ -33,6 +33,8 @@ stdenv.mkDerivation rec {
sha256 = "sha256-VxIxrk9qKM6Ncfczl4p2EhXiLNgPaYTmjhqi6/w2ZNY=";
};
outputs = [ "out" "doc" "dev" ];
nativeBuildInputs = [ autoreconfHook doxygen pkg-config ];
buildInputs = [
@ -54,6 +56,14 @@ stdenv.mkDerivation rec {
] ++ lib.optional enableCuda "--with-cuda=${cudatoolkit'}"
++ lib.optional enableRocm "--with-rocm=${rocm}";
postInstall = ''
find $out/lib/ -name "*.la" -exec rm -f \{} \;
moveToOutput bin/ucx_info $dev
moveToOutput share/ucx/examples $doc
'';
enableParallelBuilding = true;
meta = with lib; {

19
pkgs/development/python-modules/aioambient/default.nix
View File

@ -3,7 +3,6 @@
, aresponses
, buildPythonPackage
, fetchFromGitHub
, fetchpatch
, poetry-core
, pytest-aiohttp
, pytest-asyncio
@ -16,7 +15,7 @@
buildPythonPackage rec {
pname = "aioambient";
version = "2023.08.0";
version = "2023.10.1";
format = "pyproject";
disabled = pythonOlder "3.9";
@ -25,23 +24,9 @@ buildPythonPackage rec {
owner = "bachya";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-Y8I4iPvxcK98Olb3JURNK37MKggdhcweKvNBa0ZtG6I=";
hash = "sha256-Q7jb0tJsbVM2vEqKgjXOWJN2OwR9qLchU/4ShOUGPT4=";
};
patches = [
# This patch removes references to setuptools and wheel that are no longer
# necessary and changes poetry to poetry-core, so that we don't need to add
# unnecessary nativeBuildInputs.
#
# https://github.com/bachya/aioambient/pull/295
#
(fetchpatch {
name = "clean-up-build-dependencies.patch";
url = "https://github.com/bachya/aioambient/commit/fa21a2e82678a231a73c8a1153032980926f4c35.patch";
hash = "sha256-RLRbHmaR2A8MNc96WHx0L8ccyygoBUaOulAuRJkFuUM=";
})
];
postPatch = ''
substituteInPlace pyproject.toml \
--replace 'websockets = ">=11.0.1"' 'websockets = "*"'

4
pkgs/development/python-modules/aioqsw/default.nix
View File

@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "aioqsw";
version = "0.3.4";
version = "0.3.5";
format = "pyproject";
disabled = pythonOlder "3.11";
@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "Noltari";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-YGVQsw7UhRWXtfn2MQa3GHNlgXR4LJlFnaeLCGjmWfQ=";
hash = "sha256-kSwTHwVSMGyXA0SF74f9gyBN82XhdjdN6DWrQV0PiaU=";
};
nativeBuildInputs = [

4
pkgs/development/python-modules/aliyun-python-sdk-sts/default.nix
View File

@ -7,14 +7,14 @@
buildPythonPackage rec {
pname = "aliyun-python-sdk-sts";
version = "3.1.1";
version = "3.1.2";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-1pCgIw2Glc5Fyp/eoJJXew80SJz7VDcg9vvUpeZpBYk=";
hash = "sha256-GLzieAX0j/aEKeKj37PtBQJy3c2zWgy1no7/lXiYSU0=";
};
propagatedBuildInputs = [

15
pkgs/development/python-modules/bambi/default.nix
View File

@ -18,13 +18,13 @@
buildPythonPackage rec {
pname = "bambi";
version = "0.12.0";
format = "pyproject";
pyproject = true;
disabled = pythonOlder "3.8";
disabled = pythonOlder "3.9";
src = fetchFromGitHub {
owner = "bambinos";
repo = pname;
repo = "bambi";
rev = "refs/tags/${version}";
hash = "sha256-36D8u813v2vWQdNqBWfM8YVnAJuLGvn5vqdHs94odmU=";
};
@ -55,16 +55,18 @@ buildPythonPackage rec {
disabledTests = [
# Tests require network access
"test_alias_equal_to_name"
"test_custom_prior"
"test_data_is_copied"
"test_distributional_model"
"test_extra_namespace"
"test_gamma_with_splines"
"test_non_distributional_model_with_categories"
"test_non_distributional_model"
"test_normal_with_splines"
"test_predict_offset"
# Assertion issue
"test_custom_likelihood_function"
"test_predict_new_groups"
"test_predict_new_groups_fail"
"test_set_alias_warnings"
];
pythonImportsCheck = [
@ -74,6 +76,7 @@ buildPythonPackage rec {
meta = with lib; {
homepage = "https://bambinos.github.io/bambi";
description = "High-level Bayesian model-building interface";
changelog = "https://github.com/bambinos/bambi/releases/tag/${version}";
license = licenses.mit;
maintainers = with maintainers; [ bcdarwin ];
};

9
pkgs/development/python-modules/bip_utils/default.nix → pkgs/development/python-modules/bip-utils/default.nix
View File

@ -10,11 +10,12 @@
, py-sr25519-bindings
, cbor2
, pycryptodome
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "bip-utils";
version = "2.7.0";
version = "2.7.1";
format = "setuptools";
disabled = pythonOlder "3.6";
@ -23,7 +24,7 @@ buildPythonPackage rec {
owner = "ebellocchia";
repo = "bip_utils";
rev = "refs/tags/v${version}";
hash = "sha256-m7/CC5/T6qR2Ot4y5WQlzOAR0czz6XHCjJskES+2nns=";
hash = "sha256-QrCkLiGBdZTQCnbWSTN0PeoAsQfg2CoSGdZcbhqTvOk=";
};
postPatch = ''
@ -42,6 +43,10 @@ buildPythonPackage rec {
pycryptodome
];
nativeCheckInputs = [
pytestCheckHook
];
pythonImportsCheck = [
"bip_utils"
];

22
pkgs/development/python-modules/blackjax/default.nix
View File

@ -2,8 +2,8 @@
, buildPythonPackage
, pythonOlder
, fetchFromGitHub
, fetchpatch
, pytestCheckHook
, setuptools-scm
, fastprogress
, jax
, jaxlib
@ -14,24 +14,21 @@
buildPythonPackage rec {
pname = "blackjax";
version = "0.9.6";
disabled = pythonOlder "3.7";
version = "1.0.0";
pyproject = true;
disabled = pythonOlder "3.8";
src = fetchFromGitHub {
owner = "blackjax-devs";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-EieDu9SJxi2cp1bHlxX4vvFZeDGMGIm24GoR8nSyjvE=";
hash = "sha256-hqOKSHyZ/BmOu6MJLeecD3H1BbLbZqywmlBzn3xjQRk=";
};
patches = [
# remove in next release
(fetchpatch {
name = "fix-lbfgs-args";
url = "https://github.com/blackjax-devs/blackjax/commit/1aaa6f64bbcb0557b658604b2daba826e260cbc6.patch";
hash = "sha256-XyjorXPH5Ap35Tv1/lTeTWamjplJF29SsvOq59ypftE=";
})
];
nativeBuildInputs = [ setuptools-scm ];
env.SETUPTOOLS_SCM_PRETEND_VERSION = version;
propagatedBuildInputs = [
fastprogress
@ -56,6 +53,7 @@ buildPythonPackage rec {
meta = with lib; {
homepage = "https://blackjax-devs.github.io/blackjax";
description = "Sampling library designed for ease of use, speed and modularity";
changelog = "https://github.com/blackjax-devs/blackjax/releases/tag/${version}";
license = licenses.asl20;
maintainers = with maintainers; [ bcdarwin ];
};

5
pkgs/development/python-modules/chex/default.nix
View File

@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "chex";
version = "0.1.82";
version = "0.1.83";
format = "setuptools";
disabled = pythonOlder "3.9";
@ -24,7 +24,7 @@ buildPythonPackage rec {
owner = "deepmind";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-xBq22AaR2Tp1NSPefEyvCDeUYqRZlAf5LVHWo0luiXk=";
hash = "sha256-iEachJf5NjOnkMWdP0aVQHWNPgUUBkMnzHKq3GP7t4w=";
};
propagatedBuildInputs = [
@ -49,6 +49,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Chex is a library of utilities for helping to write reliable JAX code.";
homepage = "https://github.com/deepmind/chex";
changelog = "https://github.com/google-deepmind/chex/releases/tag/v${version}";
license = licenses.asl20;
maintainers = with maintainers; [ ndl ];
};

4
pkgs/development/python-modules/in-n-out/default.nix
View File

@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "in-n-out";
version = "0.1.8";
version = "0.1.9";
format = "pyproject";
disabled = pythonOlder "3.8";
@ -21,7 +21,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "in_n_out";
inherit version;
hash = "sha256-gWKvh4fmgutLNtBH+RQZnYDxEk46QUIM1T3mgOfQolQ=";
hash = "sha256-if65ROQg+vQtPCVCFFaBtNVxRDVZMsK4WWlfzcT5oto=";
};
nativeBuildInputs = [

7
pkgs/development/python-modules/jaxopt/default.nix
View File

@ -16,16 +16,16 @@
buildPythonPackage rec {
pname = "jaxopt";
version = "0.8";
version = "0.8.1";
format = "setuptools";
disabled = pythonOlder "3.7";
disabled = pythonOlder "3.8";
src = fetchFromGitHub {
owner = "google";
repo = pname;
rev = "refs/tags/jaxopt-v${version}";
hash = "sha256-y3F2uXe1/TYy42WJl5Toj+CjY2FqYVK8D33apRdNvf4=";
hash = "sha256-5+GfRFzXyc1Ukp86NeK0qstTq9fkx+eDb4iXvxzRoKs=";
};
propagatedBuildInputs = [
@ -60,6 +60,7 @@ buildPythonPackage rec {
meta = with lib; {
homepage = "https://jaxopt.github.io";
description = "Hardware accelerated, batchable and differentiable optimizers in JAX";
changelog = "https://github.com/google/jaxopt/releases/tag/jaxopt-v${version}";
license = licenses.asl20;
maintainers = with maintainers; [ bcdarwin ];
};

4
pkgs/development/python-modules/meshtastic/default.nix
View File

@ -20,7 +20,7 @@
buildPythonPackage rec {
pname = "meshtastic";
version = "2.2.9";
version = "2.2.10";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -29,7 +29,7 @@ buildPythonPackage rec {
owner = "meshtastic";
repo = "Meshtastic-python";
rev = "refs/tags/${version}";
hash = "sha256-VHL5wxq9Ckczur5jmmsYzOnQhLwCXftR8rmBGQ80gOo=";
hash = "sha256-AaEAI61MQCi1bUEc0xVNmDaVjXCPMvDIstIR/FuQ8aU=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/zha-quirks/default.nix
View File

@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "zha-quirks";
version = "0.0.104";
version = "0.0.105";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "zigpy";
repo = "zha-device-handlers";
rev = "refs/tags/${version}";
hash = "sha256-oPg+eQ89GhNX5ADTK9JvgXuBhH7HZs3Ktuami2v2a38=";
hash = "sha256-k4azIBjlS/J448ncu6cgB6oJtpS0Qb2Bnm11vq7RFEI=";
};
propagatedBuildInputs = [

5
pkgs/development/rocm-modules/5/clr/default.nix
View File

@ -147,10 +147,13 @@ in stdenv.mkDerivation (finalAttrs: {
};
impureTests = {
clr-icd = callPackage ./test.nix {
rocm-smi = callPackage ./test-rocm-smi.nix {
inherit rocm-smi;
clr = finalAttrs.finalPackage;
};
opencl-example = callPackage ./test-opencl-example.nix {
clr = finalAttrs.finalPackage;
};
};
};

75
pkgs/development/rocm-modules/5/clr/test-opencl-example.nix Normal file
View File

@ -0,0 +1,75 @@
{ lib
, stdenv
, makeImpureTest
, fetchFromGitHub
, clr
, cmake
, pkg-config
, glew
, freeglut
, opencl-headers
, ocl-icd
}:
let
examples = stdenv.mkDerivation {
pname = "amd-app-samples";
version = "2018-06-10";
src = fetchFromGitHub {
owner = "OpenCL";
repo = "AMD_APP_samples";
rev = "54da6ca465634e78fc51fc25edf5840467ee2411";
hash = "sha256-qARQpUiYsamHbko/I1gPZE9pUGJ+3396Vk2n7ERSftA=";
};
nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ glew freeglut opencl-headers ocl-icd ];
installPhase = ''
runHook preInstall
mkdir -p $out/bin
# Example path is bin/x86_64/Release/cl/Reduction/Reduction
cp -r bin/*/*/*/*/* $out/bin/
runHook postInstall
'';
cmakeFlags = [ "-DBUILD_CPP_CL=OFF" ];
meta = with lib; {
description = "Samples from the AMD APP SDK (with OpenCRun support) ";
homepage = "https://github.com/OpenCL/AMD_APP_samples";
license = licenses.bsd2;
platforms = platforms.linux;
maintainers = lib.teams.rocm.members;
};
};
in
makeImpureTest {
name = "opencl-example";
testedPackage = "rocmPackages_5.clr";
sandboxPaths = [ "/sys" "/dev/dri" "/dev/kfd" ];
nativeBuildInputs = [ examples ];
OCL_ICD_VENDORS = "${clr.icd}/etc/OpenCL/vendors";
testScript = ''
# Examples load resources from current directory
cd ${examples}/bin
echo OCL_ICD_VENDORS=$OCL_ICD_VENDORS
pwd
HelloWorld | grep HelloWorld
'';
meta = with lib; {
maintainers = teams.rocm.members;
};
}

4
pkgs/development/rocm-modules/5/clr/test.nix → pkgs/development/rocm-modules/5/clr/test-rocm-smi.nix
View File

@ -6,8 +6,8 @@
}:
makeImpureTest {
name = "clr-icd";
testedPackage = "rocmPackages.clr";
name = "rocm-smi";
testedPackage = "rocmPackages_5.clr";
nativeBuildInputs = [ clinfo rocm-smi ];
OCL_ICD_VENDORS = "${clr.icd}/etc/OpenCL/vendors";

4
pkgs/development/tools/analysis/checkov/default.nix
View File

@ -22,14 +22,14 @@ with py.pkgs;
buildPythonApplication rec {
pname = "checkov";
version = "2.5.6";
version = "2.5.7";
format = "setuptools";
src = fetchFromGitHub {
owner = "bridgecrewio";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-X+JEhoFKT+nxgxABojC8jZiGp8bubJWi0qWNfU9kwDc=";
hash = "sha256-w9clUN/g7pKxqQNw6RwG66UOoUCaNm2tCC6+/ofs8HM=";
};
patches = [

3536
pkgs/development/tools/language-servers/nls/Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

4
pkgs/development/tools/misc/go-md2man/default.nix
View File

@ -2,7 +2,7 @@
buildGoModule rec {
pname = "go-md2man";
version = "2.0.2";
version = "2.0.3";
vendorHash = null;
@ -10,7 +10,7 @@ buildGoModule rec {
rev = "v${version}";
owner = "cpuguy83";
repo = "go-md2man";
sha256 = "sha256-C+MaDtvfPYABSC2qoMfZVHe2xX/WtDjp6v/ayFCIGac=";
sha256 = "sha256-bgAuN+pF9JekCQ/Eg4ph3WDv3RP8MB/10GDp1JMp9Kg=";
};
meta = with lib; {

4
pkgs/development/tools/misc/n98-magerun2/default.nix
View File

@ -9,11 +9,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "n98-magerun2";
version = "7.1.0";
version = "7.2.0";
src = fetchurl {
url = "https://github.com/netz98/n98-magerun2/releases/download/${finalAttrs.version}/n98-magerun2.phar";
hash = "sha256-DE5q1zoWZ4gJSs5JM5cr157oh5ufD1gaNt9X9vtuW/c=";
hash = "sha256-w+58TTyoS44Ouaz6KFIJLhSl/UeF1I7cSznlZH6fLXw=";
};
dontUnpack = true;

6
pkgs/development/tools/oh-my-posh/default.nix
View File

@ -6,16 +6,16 @@
buildGoModule rec {
pname = "oh-my-posh";
version = "18.10.3";
version = "18.11.0";
src = fetchFromGitHub {
owner = "jandedobbeleer";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-gNSG4jGGkvLyitqO4o44tv/nRGzOcX5haLUFdj/PqBM=";
hash = "sha256-sUP2xBrh7JpAaHhiMm6AilgEUNIfK1U2hbloUJYHn6c=";
};
vendorHash = "sha256-ia5uglahH4btHYqeG3yyStOoM1ALxm/lQ+pyc0oxIwE=";
vendorHash = "sha256-i5K7f70MevNJcRsP2P9rsMZRpKPVWsTx9M4t2AoEJew=";
sourceRoot = "${src.name}/src";

6
pkgs/development/tools/rust/cargo-expand/default.nix
View File

@ -5,16 +5,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-expand";
version = "1.0.72";
version = "1.0.73";
src = fetchFromGitHub {
owner = "dtolnay";
repo = pname;
rev = version;
sha256 = "sha256-W9mrqF5zQWvCEsgm3fNPG0p/ZHgL1agTAfYW1t9tajo=";
sha256 = "sha256-GCHZcNpy4V6WF8AchWIuqIiTY36AsgvA6QjJTCeZP1U=";
};
cargoHash = "sha256-4gV69Ld60hBErfVXgrKfoeI6QrnYrg6w5hHqRufUlG8=";
cargoHash = "sha256-+itB3byWmzzNsoxc+pqSRGTyUkFk+KM2ImjeBwTEb/E=";
meta = with lib; {
description = "A utility and Cargo subcommand designed to let people expand macros in their Rust source code";

6
pkgs/development/tools/rust/leptosfmt/default.nix
View File

@ -5,16 +5,16 @@
rustPlatform.buildRustPackage rec {
pname = "leptosfmt";
version = "0.1.16";
version = "0.1.17";
src = fetchFromGitHub {
owner = "bram209";
repo = "leptosfmt";
rev = version;
hash = "sha256-VzKwBqVoGa3bF6NK7mGOBEzUk9H+ZVQ/NdE/hhCEhUg=";
hash = "sha256-LZOB0HF6Chs1BxRPqQnMQrjk2CbFR2UoVQl+W32R9yI=";
};
cargoHash = "sha256-OHAK1UX2mSBASUHT4qhGmWUdCrvP18RmXMCSnGSUBAA=";
cargoHash = "sha256-9io8cSKwBONw8epPw5foa+/ur4VvvjQrOcj5Hse3oJ4=";
meta = with lib; {
description = "A formatter for the leptos view! macro";

4
pkgs/os-specific/darwin/sketchybar/default.nix
View File

@ -21,13 +21,13 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "sketchybar";
version = "2.16.3";
version = "2.17.0";
src = fetchFromGitHub {
owner = "FelixKratz";
repo = "SketchyBar";
rev = "v${finalAttrs.version}";
hash = "sha256-PCAGIcO7lvIAEFXlJn/e9zG5kxvDABshxFbu/bXWX7o=";
hash = "sha256-FntWC180wpUyxP5iYdo/p2LbP0dbv1y6CXersfBT5b4=";
};
buildInputs = [

6
pkgs/os-specific/linux/dcgm/default.nix
View File

@ -1,8 +1,6 @@
{ lib
, callPackage
, gcc11Stdenv
, fetchFromGitHub
, addOpenGLRunpath
, catch2
, cmake
, cudaPackages_10_2
@ -87,13 +85,13 @@ let
# C.f. https://github.com/NVIDIA/DCGM/blob/7e1012302679e4bb7496483b32dcffb56e528c92/dcgmbuild/build.sh#L22
in gcc11Stdenv.mkDerivation rec {
pname = "dcgm";
version = "3.1.8";
version = "3.2.5"; # N.B: If you change this, be sure prometheus-dcgm-exporter supports this version.
src = fetchFromGitHub {
owner = "NVIDIA";
repo = "DCGM";
rev = "refs/tags/v${version}";
hash = "sha256-OXqXkP2ZUNPzafGIgJ0MKa39xB84keVFFYl+JsHgnks=";
hash = "sha256-iMyYOr3dSpdRV2S/TlB/tEOAWYhK09373ZRbd5vzogQ=";
};
# Add our paths to the CUDA paths so FindCuda.cmake can find them.

6
pkgs/os-specific/linux/nvidia-x11/default.nix
View File

@ -65,11 +65,11 @@ rec {
# Vulkan developer beta driver
# See here for more information: https://developer.nvidia.com/vulkan-driver
vulkan_beta = generic rec {
version = "535.43.11";
version = "535.43.13";
persistencedVersion = "535.98";
settingsVersion = "535.98";
sha256_64bit = "sha256-cL/gnPNqjsj8ZYJP4WmybS2Fnh6EHsUbi4nGlt6Bt00=";
openSha256 = "sha256-QzNRwXk6c5iTJD0YGKAlW1swF/PBW/7LFnkllkBEhUU=";
sha256_64bit = "sha256-qrzoZWoUSTh4UQ8e/amOhwPrspZOI1kwdPHLn4ySc/Q=";
openSha256 = "sha256-aVUdHNoFaUY7MiwEFxwsj8XS1+onckT3V7RiVMEkQP8=";
settingsSha256 = "sha256-jCRfeB1w6/dA27gaz6t5/Qo7On0zbAPIi74LYLel34s=";
persistencedSha256 = "sha256-WviDU6B50YG8dO64CGvU3xK8WFUX8nvvVYm/fuGyroM=";
url = "https://developer.nvidia.com/downloads/vulkan-beta-${lib.concatStrings (lib.splitString "." version)}-linux";

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