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

Merge branch 'master' into haskell-updates

Browse Source
This commit is contained in:
maralorn 2023-06-28 19:07:41 +02:00
commit 26b42078cf
No known key found for this signature in database
165 changed files with 8339 additions and 5271 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.github/CODEOWNERS vendored
View File

@ -293,9 +293,9 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt
/pkgs/development/compilers/dotnet @IvarWithoutBones
# Node.js
/pkgs/build-support/node/build-npm-package @winterqt
/pkgs/build-support/node/fetch-npm-deps @winterqt
/doc/languages-frameworks/javascript.section.md @winterqt
/pkgs/build-support/node/build-npm-package @lilyinstarlight @winterqt
/pkgs/build-support/node/fetch-npm-deps @lilyinstarlight @winterqt
/doc/languages-frameworks/javascript.section.md @lilyinstarlight @winterqt
# OCaml
/pkgs/build-support/ocaml @ulrikstrid

12
maintainers/maintainer-list.nix
View File

@ -2524,7 +2524,7 @@
};
cafkafk = {
email = "christina@cafkafk.com";
matrix = "@cafkafk:matrix.cafkafk.com";
matrix = "@cafkafk:m.cafkafk.com";
name = "Christina Sørensen";
github = "cafkafk";
githubId = 89321978;
@ -4366,12 +4366,12 @@
};
dsuetin = {
name = "Danil Suetin";
email = "suetin085@gmail.com";
email = "suetin085+nixpkgs@protonmail.com";
matrix = "@dani0854:matrix.org";
github = "dani0854";
githubId = 32674935;
keys = [{
fingerprint = "6CC2 D713 6703 0D86 CA29 C71F 23B5 AA6F A374 F2FE";
fingerprint = "E033 FE26 0E62 224B B35C 75C9 DE8B 9CED 0696 C600";
}];
};
dsymbol = {
@ -13189,6 +13189,12 @@
githubId = 406946;
name = "Valentin Lorentz";
};
proofconstruction = {
email = "source@proof.construction";
github = "proofconstruction";
githubId = 74747193;
name = "Alexander Groleau";
};
proofofkeags = {
email = "keagan.mcclelland@gmail.com";
github = "ProofOfKeags";

4
nixos/doc/manual/configuration/renaming-interfaces.section.md
View File

@ -37,7 +37,7 @@ even if networkd is disabled.
Alternatively, we can use a plain old udev rule:
```nix
services.udev.initrdRules = ''
boot.initrd.services.udev.rules = ''
SUBSYSTEM=="net", ACTION=="add", DRIVERS=="?*", \
ATTR{address}=="52:54:00:12:01:01", KERNEL=="eth*", NAME="wan"
'';
@ -45,7 +45,7 @@ services.udev.initrdRules = ''
::: {.warning}
The rule must be installed in the initrd using
`services.udev.initrdRules`, not the usual `services.udev.extraRules`
`boot.initrd.services.udev.rules`, not the usual `services.udev.extraRules`
option. This is to avoid race conditions with other programs controlling
the interface.
:::

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

@ -78,6 +78,10 @@
- `services.nginx` gained a `defaultListen` option at server-level with support for PROXY protocol listeners, also `proxyProtocol` is now exposed in `services.nginx.virtualHosts.<name>.listen` option. It is now possible to run PROXY listeners and non-PROXY listeners at a server-level, see [#213510](https://github.com/NixOS/nixpkgs/pull/213510/) for more details.
- `services.prometheus.exporters` has a new exporter to monitor electrical power consumption based on PowercapRAPL sensor called [Scaphandre](https://github.com/hubblo-org/scaphandre), see [#239803](https://github.com/NixOS/nixpkgs/pull/239803) for more details.
- The module `services.calibre-server` has new options to configure the `host`, `port`, `auth.enable`, `auth.mode` and `auth.userDb` path, see [#216497](https://github.com/NixOS/nixpkgs/pull/216497/) for more details.
## Nixpkgs internals {#sec-release-23.11-nixpkgs-internals}
- The `qemu-vm.nix` module by default now identifies block devices via

2
nixos/modules/config/fonts/fontdir.nix
View File

@ -8,7 +8,7 @@ let
x11Fonts = pkgs.runCommand "X11-fonts" { preferLocalBuild = true; } ''
mkdir -p "$out/share/X11/fonts"
font_regexp='.*\.\(ttf\|ttc\|otf\|pcf\|pfa\|pfb\|bdf\)\(\.gz\)?'
font_regexp='.*\.\(ttf\|ttc\|otb\|otf\|pcf\|pfa\|pfb\|bdf\)\(\.gz\)?'
find ${toString config.fonts.fonts} -regex "$font_regexp" \
-exec ln -sf -t "$out/share/X11/fonts" '{}' \;
cd "$out/share/X11/fonts"

1
nixos/modules/hardware/video/displaylink.nix
View File

@ -26,6 +26,7 @@ in
Identifier "DisplayLink"
MatchDriver "evdi"
Driver "modesetting"
Option "TearFree" "true"
Option "AccelMethod" "none"
EndSection
'';

98
nixos/modules/services/misc/calibre-server.nix
View File

@ -6,6 +6,17 @@ let
cfg = config.services.calibre-server;
documentationLink = "https://manual.calibre-ebook.com";
generatedDocumentationLink = documentationLink + "/generated/en/calibre-server.html";
execFlags = (concatStringsSep " "
(mapAttrsToList (k: v: "${k} ${toString v}") (filterAttrs (name: value: value != null) {
"--listen-on" = cfg.host;
"--port" = cfg.port;
"--auth-mode" = cfg.auth.mode;
"--userdb" = cfg.auth.userDb;
}) ++ [(optionalString (cfg.auth.enable == true) "--enable-auth")])
);
in
{
@ -18,52 +29,100 @@ in
)
];
###### interface
options = {
services.calibre-server = {
enable = mkEnableOption (lib.mdDoc "calibre-server");
package = lib.mkPackageOptionMD pkgs "calibre" { };
libraries = mkOption {
description = lib.mdDoc ''
The directories of the libraries to serve. They must be readable for the user under which the server runs.
'';
type = types.listOf types.path;
default = [ "/var/lib/calibre-server" ];
description = lib.mdDoc ''
Make sure each library path is initialized before service startup.
The directories of the libraries to serve. They must be readable for the user under which the server runs.
See the [calibredb documentation](${documentationLink}/generated/en/calibredb.html#add) for details.
'';
};
user = mkOption {
description = lib.mdDoc "The user under which calibre-server runs.";
type = types.str;
default = "calibre-server";
description = lib.mdDoc "The user under which calibre-server runs.";
};
group = mkOption {
description = lib.mdDoc "The group under which calibre-server runs.";
type = types.str;
default = "calibre-server";
description = lib.mdDoc "The group under which calibre-server runs.";
};
host = mkOption {
type = types.str;
default = "0.0.0.0";
example = "::1";
description = lib.mdDoc ''
The interface on which to listen for connections.
See the [calibre-server documentation](${generatedDocumentationLink}#cmdoption-calibre-server-listen-on) for details.
'';
};
port = mkOption {
default = 8080;
type = types.port;
description = lib.mdDoc ''
The port on which to listen for connections.
See the [calibre-server documentation](${generatedDocumentationLink}#cmdoption-calibre-server-port) for details.
'';
};
auth = {
enable = mkOption {
type = types.bool;
default = false;
description = lib.mdDoc ''
Password based authentication to access the server.
See the [calibre-server documentation](${generatedDocumentationLink}#cmdoption-calibre-server-enable-auth) for details.
'';
};
mode = mkOption {
type = types.enum [ "auto" "basic" "digest" ];
default = "auto";
description = lib.mdDoc ''
Choose the type of authentication used.
Set the HTTP authentication mode used by the server.
See the [calibre-server documentation](${generatedDocumentationLink}#cmdoption-calibre-server-auth-mode) for details.
'';
};
userDb = mkOption {
default = null;
type = types.nullOr types.path;
description = lib.mdDoc ''
Choose users database file to use for authentication.
Make sure users database file is initialized before service startup.
See the [calibre-server documentation](${documentationLink}/server.html#managing-user-accounts-from-the-command-line-only) for details.
'';
};
};
};
};
###### implementation
config = mkIf cfg.enable {
systemd.services.calibre-server = {
description = "Calibre Server";
after = [ "network.target" ];
wantedBy = [ "multi-user.target" ];
serviceConfig = {
User = cfg.user;
Restart = "always";
ExecStart = "${pkgs.calibre}/bin/calibre-server ${lib.concatStringsSep " " cfg.libraries}";
};
description = "Calibre Server";
after = [ "network.target" ];
wantedBy = [ "multi-user.target" ];
serviceConfig = {
User = cfg.user;
Restart = "always";
ExecStart = "${cfg.package}/bin/calibre-server ${lib.concatStringsSep " " cfg.libraries} ${execFlags}";
};
};
environment.systemPackages = [ pkgs.calibre ];
users.users = optionalAttrs (cfg.user == "calibre-server") {
@ -83,4 +142,5 @@ in
};
meta.maintainers = with lib.maintainers; [ gaelreyrol ];
}

5
nixos/modules/services/misc/paperless.nix
View File

@ -86,12 +86,11 @@ let
SupplementaryGroups = optional enableRedis redisServer.user;
SystemCallArchitectures = "native";
SystemCallFilter = [ "@system-service" "~@privileged @setuid @keyring" ];
# Does not work well with the temporary root
#UMask = "0066";
UMask = "0066";
};
in
{
meta.maintainers = with maintainers; [ erikarvstedt Flakebi ];
meta.maintainers = with maintainers; [ erikarvstedt Flakebi leona ];
imports = [
(mkRenamedOptionModule [ "services" "paperless-ng" ] [ "services" "paperless" ])

2
nixos/modules/services/monitoring/grafana.nix
View File

@ -1126,7 +1126,7 @@ in
It will notify, via the UI, when a new version is available.
The check itself will not prompt any auto-updates of the Grafana software, nor will it send any sensitive information.
'';
default = true;
default = false;
type = types.bool;
};

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

@ -65,6 +65,7 @@ let
"redis"
"rspamd"
"rtl_433"
"scaphandre"
"script"
"shelly"
"snmp"
@ -301,6 +302,21 @@ in
Please specify either 'services.prometheus.exporters.sql.configuration' or
'services.prometheus.exporters.sql.configFile'
'';
} {
assertion = cfg.scaphandre.enable -> (pkgs.stdenv.hostPlatform.isx86_64 == true);
message = ''
Only x86_64 host platform architecture is not supported.
'';
} {
assertion = cfg.scaphandre.enable -> ((lib.kernel.whenHelpers pkgs.linux.version).whenOlder "5.11" true).condition == false;
message = ''
A kernel version newer than '5.11' is required. ${pkgs.linux.version}
'';
} {
assertion = cfg.scaphandre.enable -> (builtins.elem "intel_rapl_common" config.boot.kernelModules);
message = ''
Please enable 'intel_rapl_common' in 'boot.kernelModules'.
'';
} ] ++ (flip map (attrNames exporterOpts) (exporter: {
assertion = cfg.${exporter}.firewallFilter != null -> cfg.${exporter}.openFirewall;
message = ''

33
nixos/modules/services/monitoring/prometheus/exporters/scaphandre.nix Normal file
View File

@ -0,0 +1,33 @@
{ config
, lib
, pkgs
, options
}:
let
logPrefix = "services.prometheus.exporter.scaphandre";
cfg = config.services.prometheus.exporters.scaphandre;
in {
port = 8080;
extraOpts = {
telemetryPath = lib.mkOption {
type = lib.types.str;
default = "/metrics";
description = lib.mdDoc ''
Path under which to expose metrics.
'';
};
};
serviceOpts = {
serviceConfig = {
ExecStart = ''
${pkgs.scaphandre}/bin/scaphandre prometheus \
--address ${cfg.listenAddress} \
--port ${toString cfg.port} \
--suffix ${cfg.telemetryPath} \
${lib.concatStringsSep " \\\n " cfg.extraFlags}
'';
};
};
}

1
nixos/tests/all-tests.nix
View File

@ -151,6 +151,7 @@ in {
cage = handleTest ./cage.nix {};
cagebreak = handleTest ./cagebreak.nix {};
calibre-web = handleTest ./calibre-web.nix {};
calibre-server = handleTest ./calibre-server.nix {};
cassandra_3_0 = handleTest ./cassandra.nix { testPackage = pkgs.cassandra_3_0; };
cassandra_3_11 = handleTest ./cassandra.nix { testPackage = pkgs.cassandra_3_11; };
cassandra_4 = handleTest ./cassandra.nix { testPackage = pkgs.cassandra_4; };

104
nixos/tests/calibre-server.nix Normal file
View File

@ -0,0 +1,104 @@
{ system ? builtins.currentSystem
, config ? { }
, pkgs ? import ../.. { inherit system config; }
}:
let
inherit (import ../lib/testing-python.nix { inherit system pkgs; }) makeTest;
inherit (pkgs.lib) concatStringsSep maintainers mapAttrs mkMerge
removeSuffix splitString;
tests = {
default = {
calibreConfig = {};
calibreScript = ''
wait_for_unit("calibre-server.service")
'';
};
customLibrary = {
calibreConfig = {
libraries = [ "/var/lib/calibre-data" ];
};
calibreScript = ''
succeed("ls -la /var/lib/calibre-data")
wait_for_unit("calibre-server.service")
'';
};
multipleLibraries = {
calibreConfig = {
libraries = [ "/var/lib/calibre-data" "/var/lib/calibre-server" ];
};
calibreScript = ''
succeed("ls -la /var/lib/calibre-data")
succeed("ls -la /var/lib/calibre-server")
wait_for_unit("calibre-server.service")
'';
};
hostAndPort = {
calibreConfig = {
host = "127.0.0.1";
port = 8888;
};
calibreScript = ''
wait_for_unit("calibre-server.service")
wait_for_open_port(8888)
succeed("curl --fail http://127.0.0.1:8888")
'';
};
basicAuth = {
calibreConfig = {
host = "127.0.0.1";
port = 8888;
auth = {
enable = true;
mode = "basic";
};
};
calibreScript = ''
wait_for_unit("calibre-server.service")
wait_for_open_port(8888)
fail("curl --fail http://127.0.0.1:8888")
'';
};
};
in
mapAttrs
(test: testConfig: (makeTest (
let
nodeName = testConfig.nodeName or test;
calibreConfig = {
enable = true;
libraries = [ "/var/lib/calibre-server" ];
} // testConfig.calibreConfig or {};
librariesInitScript = path: ''
${nodeName}.execute("touch /tmp/test.epub")
${nodeName}.execute("zip -r /tmp/test.zip /tmp/test.epub")
${nodeName}.execute("mkdir -p ${path}")
${nodeName}.execute("calibredb add -d --with-library ${path} /tmp/test.zip")
'';
in
{
name = "calibre-server-${test}";
nodes.${nodeName} = mkMerge [{
environment.systemPackages = [ pkgs.zip ];
services.calibre-server = calibreConfig;
} testConfig.calibreProvider or { }];
testScript = ''
${nodeName}.start()
${concatStringsSep "\n" (map librariesInitScript calibreConfig.libraries)}
${concatStringsSep "\n" (map (line:
if (builtins.substring 0 1 line == " " || builtins.substring 0 1 line == ")")
then line
else "${nodeName}.${line}"
) (splitString "\n" (removeSuffix "\n" testConfig.calibreScript)))}
${nodeName}.shutdown()
'';
meta = with maintainers; {
maintainers = [ gaelreyrol ];
};
}
)))
tests

16
nixos/tests/prometheus-exporters.nix
View File

@ -1085,6 +1085,22 @@ let
'';
};
scaphandre = {
exporterConfig = {
enable = true;
};
metricProvider = {
boot.kernelModules = [ "intel_rapl_common" ];
};
exporterTest = ''
wait_for_unit("prometheus-scaphandre-exporter.service")
wait_for_open_port(8080)
wait_until_succeeds(
"curl -sSf 'localhost:8080/metrics'"
)
'';
};
shelly = {
exporterConfig = {
enable = true;

1
nixos/tests/tmate-ssh-server.nix
View File

@ -24,6 +24,7 @@ in
services.tmate-ssh-server = {
enable = true;
port = 2223;
openFirewall = true;
};
};
client = { ... }: {

59
pkgs/applications/audio/waylyrics/default.nix Normal file
View File

@ -0,0 +1,59 @@
{ lib, fetchFromGitHub, rustPlatform, gtk4, pkg-config, openssl, dbus, wrapGAppsHook4, glib, makeDesktopItem, copyDesktopItems }:
rustPlatform.buildRustPackage rec {
pname = "waylyrics";
version = "unstable-2023-05-14";
src = fetchFromGitHub {
owner = "poly000";
repo = pname;
rev = "7e8bd99e1748a5448c1a5c49f0664bd96fbf965e";
hash = "sha256-vSYtLsLvRHCCHxomPSHifXFZKjkFrlskNp7IlFflrUU=";
};
cargoHash = "sha256-dpJa0T6xapCBPM5fWbSDEhBlZ55c3Sr5oTnu58B/voM=";
nativeBuildInputs = [ pkg-config wrapGAppsHook4 copyDesktopItems ];
buildInputs = [ gtk4 openssl dbus glib ];
RUSTC_BOOTSTRAP = 1;
doCheck = false; # No tests defined in the project.
WAYLYRICS_DEFAULT_CONFIG = "${placeholder "out"}/share/waylyrics/config.toml";
WAYLYRICS_THEME_PRESETS_DIR = "${placeholder "out"}/share/waylyrics/themes";
desktopItems = [
(makeDesktopItem {
name = "io.poly000.waylyrics";
exec = "waylyrics";
comment = "Simple on screen lyrics for MPRIS-friendly players";
type = "Application";
icon = "io.poly000.waylyrics";
desktopName = "Waylyrics";
terminal = false;
categories = [ "Audio" "AudioVideo" ];
})
];
postInstall = ''
$out/bin/gen_config_example
mkdir -p $out/share/waylyrics
install -Dm644 config.toml $WAYLYRICS_DEFAULT_CONFIG
cp -vr themes $out/share/waylyrics/
rm $out/bin/gen_config_example # Unnecessary for end users
# Install schema
install -Dm644 io.poly000.waylyrics.gschema.xml -t $out/share/gsettings-schemas/$name/glib-2.0/schemas
glib-compile-schemas $out/share/gsettings-schemas/$name/glib-2.0/schemas/
# Install icons
cp -vr res/icons $out/share/
'';
meta = with lib; {
description = "On screen lyrics for Wayland with NetEase Music source";
homepage = "https://github.com/poly000/waylyrics";
license = licenses.mit;
maintainers = [ maintainers.shadowrz ];
platforms = platforms.linux;
};
}

22
pkgs/applications/blockchains/bisq-desktop/default.nix
View File

@ -16,7 +16,7 @@
}:
let
bisq-launcher = writeScript "bisq-launcher" ''
bisq-launcher = args: writeScript "bisq-launcher" ''
#! ${bash}/bin/bash
# This is just a comment to convince Nix that Tor is a
@ -24,7 +24,7 @@ let
# whereas Nix only scans for hashes in uncompressed text.
# ${bisq-tor}
JAVA_TOOL_OPTIONS="-XX:+UseG1GC -XX:MaxHeapFreeRatio=10 -XX:MinHeapFreeRatio=5 -XX:+UseStringDeduplication" bisq-desktop-wrapped "$@"
JAVA_TOOL_OPTIONS="-XX:+UseG1GC -XX:MaxHeapFreeRatio=10 -XX:MinHeapFreeRatio=5 -XX:+UseStringDeduplication ${args}" bisq-desktop-wrapped "$@"
'';
bisq-tor = writeScript "bisq-tor" ''
@ -35,11 +35,11 @@ let
in
stdenv.mkDerivation rec {
pname = "bisq-desktop";
version = "1.9.9";
version = "1.9.10";
src = fetchurl {
url = "https://github.com/bisq-network/bisq/releases/download/v${version}/Bisq-64bit-${version}.deb";
sha256 = "0jisxzajsc4wfvxabvfzd0x9y1fxzg39fkhap1781q7wyi4ry9kd";
sha256 = "1p6hwamc3vzhfg4dgrmh0vf8cxi9s46a14pjnjdyg9zgn4dyr1nm";
};
nativeBuildInputs = [
@ -61,6 +61,15 @@ stdenv.mkDerivation rec {
genericName = "Decentralized bitcoin exchange";
categories = [ "Network" "P2P" ];
})
(makeDesktopItem {
name = "Bisq-hidpi";
exec = "bisq-desktop-hidpi";
icon = "bisq";
desktopName = "Bisq ${version} (HiDPI)";
genericName = "Decentralized bitcoin exchange";
categories = [ "Network" "P2P" ];
})
];
unpackPhase = ''
@ -87,7 +96,10 @@ stdenv.mkDerivation rec {
makeWrapper ${openjdk11}/bin/java $out/bin/bisq-desktop-wrapped \
--add-flags "-jar $out/lib/desktop-${version}-all.jar bisq.desktop.app.BisqAppMain"
makeWrapper ${bisq-launcher} $out/bin/bisq-desktop \
makeWrapper ${bisq-launcher ""} $out/bin/bisq-desktop \
--prefix PATH : $out/bin
makeWrapper ${bisq-launcher "-Dglass.gtk.uiScale=2.0"} $out/bin/bisq-desktop-hidpi \
--prefix PATH : $out/bin
for n in 16 24 32 48 64 96 128 256; do

24
pkgs/applications/blockchains/dcrctl/default.nix Normal file
View File

@ -0,0 +1,24 @@
{ lib, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "dcrctl";
version = "1.8.0";
src = fetchFromGitHub {
owner = "decred";
repo = "dcrctl";
rev = "release-v${version}";
hash = "sha256-Nm1r3hHTlW5ob2CLKUgMjVsdzR2gxlFuT6Q3j0pPDSg=";
};
vendorHash = "sha256-Ry3wR2u+vr97icP9jwAVWcFO98JVDo9TrDg9D8hfv5I=";
ldflags = [ "-s" "-w" ];
meta = {
homepage = "https://decred.org";
description = "A secure Decred wallet daemon written in Go (golang)";
license = with lib.licenses; [ isc ];
maintainers = with lib.maintainers; [ aaronjheng ];
};
}

8
pkgs/applications/blockchains/lightning-pool/default.nix
View File

@ -5,19 +5,21 @@
buildGoModule rec {
pname = "lightning-pool";
version = "0.5.3-alpha";
version = "0.6.4-beta";
src = fetchFromGitHub {
owner = "lightninglabs";
repo = "pool";
rev = "v${version}";
sha256 = "1nc3hksk9qcxrsyqpz9vcfc8x093rc8yx8ppfk177j9fhdnn8bk7";
hash = "sha256-lSc/zOZ5VpmaZ7jrlGvSaczrgOtAMS9tDUxcMoFdBmQ=";
};
vendorSha256 = "09yxaa74814l1rp0arqhqpplr2j0p8dj81zqcbxlwp5ckjv9r2za";
vendorHash = "sha256-DD27zUW524qe9yLaVPEzw/c4sSzlH89HMw0PdtNYEhg=";
subPackages = [ "cmd/pool" "cmd/poold" ];
ldflags = [ "-s" "-w" ];
meta = with lib; {
description = "Lightning Pool Client";
homepage = "https://github.com/lightninglabs/pool";

6
pkgs/applications/blockchains/lndconnect/default.nix
View File

@ -1,4 +1,4 @@
{ lib, buildGoModule, fetchFromGitHub, lndconnect }:
{ lib, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "lndconnect";
version = "0.2.1";
@ -7,10 +7,10 @@ buildGoModule rec {
owner = "LN-Zap";
repo = pname;
rev = "v${version}";
sha256 = "sha256-cuZkVeFUQq7+kQo/YjXCMPANUL5QooAWgegcoWo3M0c=";
hash = "sha256-cuZkVeFUQq7+kQo/YjXCMPANUL5QooAWgegcoWo3M0c=";
};
vendorSha256 = "sha256-iE0nht3PH2R9pTyyrySk759untC7snGt3wTXk4/pjrU=";
vendorHash = "sha256-iE0nht3PH2R9pTyyrySk759untC7snGt3wTXk4/pjrU=";
ldflags = [ "-s" "-w" ];

4
pkgs/applications/editors/vscode/extensions/default.nix
View File

@ -667,8 +667,8 @@ let
mktplcRef = {
name = "ruff";
publisher = "charliermarsh";
version = "2023.26.0";
sha256 = "sha256-5JaOo0BqTWo3NAdzS9DSClTwB9YiBhICEPOqWmBv270=";
version = "2023.30.0";
sha256 = "sha256-E/zgKNxKH05qzLkoyq66qBDbkNJ7liBvU+ZSxw825c0=";
};
meta = {
license = lib.licenses.mit;

4
pkgs/applications/emulators/mame/default.nix
View File

@ -38,14 +38,14 @@ let
in
stdenv.mkDerivation rec {
pname = "mame";
version = "0.255";
version = "0.256";
srcVersion = builtins.replaceStrings [ "." ] [ "" ] version;
src = fetchFromGitHub {
owner = "mamedev";
repo = "mame";
rev = "mame${srcVersion}";
hash = "sha256-pdPKxEHxynBIB2lUG6yjKNcY8MlOlk4pfr7WwqaA9Dk=";
hash = "sha256-rQ1GQks3Nni6ALxfiJzdkKUgbZrXaLu9vJtEDPjgP3Q=";
};
outputs = [ "out" "tools" ];

49
pkgs/applications/file-managers/projectable/default.nix Normal file
View File

@ -0,0 +1,49 @@
{ lib
, rustPlatform
, fetchFromGitHub
, pkg-config
, libgit2_1_5
, openssl
, zlib
, stdenv
, darwin
}:
rustPlatform.buildRustPackage rec {
pname = "projectable";
version = "1.2.0";
src = fetchFromGitHub {
owner = "dzfrias";
repo = "projectable";
rev = version;
hash = "sha256-mN8kqh17qGJWOwrdH9fCPApFQBbgCs6FaVg38SNJGP0=";
};
cargoHash = "sha256-SQ117gFkqex3GFl7RnorSfPo7e0Eefg1l3L0Vyi/tpU=";
nativeBuildInputs = [
pkg-config
];
buildInputs = [
libgit2_1_5
openssl
zlib
] ++ lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.CoreServices
];
env = {
OPENSSL_NO_VENDOR = true;
};
meta = with lib; {
description = "A TUI file manager built for projects";
homepage = "https://github.com/dzfrias/projectable";
changelog = "https://github.com/dzfrias/projectable/releases/tag/${src.rev}";
license = licenses.mit;
maintainers = with maintainers; [ figsoda ];
mainProgram = "prj";
};
}

6
pkgs/applications/graphics/deskew/default.nix
View File

@ -18,6 +18,12 @@ stdenv.mkDerivation rec {
buildPhase = ''
runHook preBuild
patchShebangs ./Scripts
# Deskew insists on using dlopen to load libtiff, we insist it links against it.
sed -i -e 's/{$DEFINE DYNAMIC_DLL_LOADING}//' Imaging/LibTiff/LibTiffDynLib.pas
sed -i -e 's/if LibTiffDynLib\.LoadTiffLibrary then//' Imaging/LibTiff/ImagingTiffLib.pas
# Make sure libtiff is in the RPATH, so that Nix can find and track the runtime dependency
export NIX_LDFLAGS="$NIX_LDFLAGS -rpath ${lib.getLib libtiff}/lib"
pushd Scripts && ./compile.sh && popd
runHook postBuild
'';

2
pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix
View File

@ -26,7 +26,7 @@ buildNpmPackage {
meta = with lib; {
description = "The official web interface for ASF";
license = licenses.apsl20;
license = licenses.asl20;
homepage = "https://github.com/JustArchiNET/ASF-ui";
inherit (ArchiSteamFarm.meta) maintainers platforms;
};

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

@ -20,13 +20,13 @@
stdenv.mkDerivation rec {
pname = "cherrytree";
version = "0.99.55";
version = "0.99.56";
src = fetchFromGitHub {
owner = "giuspen";
repo = "cherrytree";
rev = version;
hash = "sha256-1ytph2HTwIqVTD6+a5P1gvFG+2xsfZWRkmn7RpwuwKY=";
hash = "sha256-kDbUn81YfSMAX7FKcw+nDSrsNvrhOX0+NmgZUYNqCqQ=";
};
nativeBuildInputs = [

14
pkgs/applications/misc/goldendict/default.nix
View File

@ -1,6 +1,7 @@
{ lib, stdenv, mkDerivation, fetchFromGitHub, pkg-config
{ lib, stdenv, fetchFromGitHub, pkg-config
, libXtst, libvorbis, hunspell, lzo, xz, bzip2, libiconv
, qtbase, qtsvg, qtwebkit, qtx11extras, qttools, qmake
, wrapQtAppsHook
, withCC ? true, opencc
, withEpwing ? true, libeb
, withExtraTiff ? true, libtiff
@ -8,20 +9,19 @@
, withMultimedia ? true
, withZim ? true, zstd }:
mkDerivation rec {
stdenv.mkDerivation rec {
pname = "goldendict";
version = "2022-05-10";
version = "1.5.0";
src = fetchFromGitHub {
owner = "goldendict";
repo = pname;
rev = "f810c6bd724e61977b4e94ca2d8abfa5bd766379";
sha256 = "sha256-gNM+iahoGQy8TlNFLQx5ksITzQznv7MWMX/88QCTnL0";
rev = "v${version}";
hash = "sha256-80o8y+mbzpyMQYUGHYs/zgQT23nLVCs7Jcr8FbbXn8M=";
};
patches = [
./0001-dont-check-for-updates.patch
] ++ lib.optionals stdenv.isDarwin [
./0001-dont-use-maclibs.patch
];
@ -31,7 +31,7 @@ mkDerivation rec {
--replace "opencc.2" "opencc"
'';
nativeBuildInputs = [ pkg-config qmake ];
nativeBuildInputs = [ pkg-config qmake wrapQtAppsHook ];
buildInputs = [
qtbase qtsvg qtwebkit qttools
libvorbis hunspell xz lzo

6
pkgs/applications/misc/joplin-desktop/default.nix
View File

@ -2,7 +2,7 @@
let
pname = "joplin-desktop";
version = "2.10.19";
version = "2.11.11";
name = "${pname}-${version}";
inherit (stdenv.hostPlatform) system;
@ -16,8 +16,8 @@ let
src = fetchurl {
url = "https://github.com/laurent22/joplin/releases/download/v${version}/Joplin-${version}.${suffix}";
sha256 = {
x86_64-linux = "sha256-+QvaEB+4eA3grnqbLfFMEtNyizlvovtV/BvTa9gSZGU=";
x86_64-darwin = "sha256-BK951HLf+L1x9TDlqW11mNnnrnHfZ4qbKk25OIVXnuM=";
x86_64-linux = "sha256-r64+y+LfMrJnUdabVdak5+LQB50YLOuMXftlZ4s3C/w=";
x86_64-darwin = "sha256-/dvaYHa7PT6FA63kmtjrErJZI9O+hIlKvHnf5RnfeZg=";
}.${system} or throwSystem;
};

6
pkgs/applications/misc/leetcode-cli/default.nix
View File

@ -11,14 +11,14 @@
rustPlatform.buildRustPackage rec {
pname = "leetcode-cli";
version = "0.3.11";
version = "0.4.1";
src = fetchCrate {
inherit pname version;
sha256 = "sha256-DHtIhiRPRGuO6Rf1d9f8r0bMOHqAaJleUvYNyPiX6mc=";
sha256 = "sha256-8v10Oe3J0S9xp4b2UDOnv+W0UDgveK+mAyV3I/zZUGw=";
};
cargoSha256 = "sha256-Suk/nQ+JcoD9HO9x1lYp+p4qx0DZ9dt0p5jPz0ZQB+k=";
cargoHash = "sha256-MdHk8i/murKcWi9gydyPyq/6r1SovKP04PMJyXXrCiQ=";
nativeBuildInputs = [
pkg-config

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

@ -10,11 +10,11 @@
stdenv.mkDerivation rec {
pname = "logseq";
version = "0.9.9";
version = "0.9.10";
src = fetchurl {
url = "https://github.com/logseq/logseq/releases/download/${version}/logseq-linux-x64-${version}.AppImage";
hash = "sha256-DwxRhC8HKJnu1F9mfU3+UdpTjtKLhxs4LJY9A0cZvBo=";
hash = "sha256-en8ws0qdMY5j1o8oTkKcIHHQV+kCuQZzQbdFU97qAQE=";
name = "${pname}-${version}.AppImage";
};

18
pkgs/applications/networking/browsers/chromium/upstream-info.json
View File

@ -19,9 +19,9 @@
}
},
"beta": {
"version": "115.0.5790.32",
"sha256": "1zy4f57j047aw164s4x0904yazq6nvyy2wjjk9amiav9qyrfxzr6",
"sha256bin64": "0qgciqrjnsb9vxnvvcaqn728x9l0s72v78a6f7zffjxps87rbaz5",
"version": "115.0.5790.40",
"sha256": "1ab034zrgyz0gwi0caz6y1nyr0p5yhbly50chnhvsr3k6gmidl58",
"sha256bin64": "02vzlz5z87n9lwdhxnzdzr5w85l3b828j0y1z6fzq7br90yr0pcw",
"deps": {
"gn": {
"version": "2023-05-19",
@ -32,15 +32,15 @@
}
},
"dev": {
"version": "116.0.5829.0",
"sha256": "0ip0wha705nr7yr4fn25psb6r41a703b9n87v6q8k8vzax5492y6",
"sha256bin64": "1fa2l7n8vdcnf6p0m7qqh05fimbwdh7p8a142l0vi8l9kx4n9z54",
"version": "116.0.5845.4",
"sha256": "0p3v4dzyrj1fn97s2grkc2x8lgfm14rgwalrnb3gx9syi8gdwkpw",
"sha256bin64": "1wim32q9sq501wrnz1xx4s1r0gywz4pgf3r9d0zga3g86jp385ax",
"deps": {
"gn": {
"version": "2023-06-08",
"version": "2023-06-09",
"url": "https://gn.googlesource.com/gn",
"rev": "1cd35c1b722472e714c30d12031af81443bb20ae",
"sha256": "09y8jkxzkz87zp2js1j7yvqnck9n0182lm7c3x330d8agwrmdkrj"
"rev": "4bd1a77e67958fb7f6739bd4542641646f264e5d",
"sha256": "14h9jqspb86sl5lhh6q0kk2rwa9zcak63f8drp7kb3r4dx08vzsw"
}
}
},

4
pkgs/applications/networking/browsers/opera/default.nix
View File

@ -51,11 +51,11 @@ let
in
stdenv.mkDerivation rec {
pname = "opera";
version = "99.0.4788.77";
version = "100.0.4815.21";
src = fetchurl {
url = "${mirror}/${version}/linux/${pname}-stable_${version}_amd64.deb";
hash = "sha256-VdhUyXKqQaIpvwE4izQXIVdyDHfW7FQLfiiUBop70rI=";
hash = "sha256-bDCj4ZtULO1JkuAsqy2ppcWOshgGRG03qlb3KV3CtSE=";
};
unpackPhase = "dpkg-deb -x $src .";

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

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "glooctl";
version = "1.14.8";
version = "1.14.9";
src = fetchFromGitHub {
owner = "solo-io";
repo = "gloo";
rev = "v${version}";
hash = "sha256-OnoOZw85RffGiAPiAM8WLg2TjW1REgirvfAjFYt8/yY=";
hash = "sha256-PJvr62slTW3IoauLtRH88BDMpf3qGOWADjj4L4wQBLo=";
};
subPackages = [ "projects/gloo/cli/cmd" ];

4
pkgs/applications/networking/cluster/helm-dashboard/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "helm-dashboard";
version = "1.3.2";
version = "1.3.3";
src = fetchFromGitHub {
owner = "komodorio";
repo = pname;
rev = "v${version}";
sha256 = "sha256-ukapQRTn19sNTnJ0PHc8sp8x+k1qFb3ioHZHvVtToVU=";
sha256 = "sha256-hjIo2AEXNcFK0z4op59NnC2R8GspF5t808DZ72AxgMw=";
};
vendorHash = "sha256-ROffm1SGYnhUcp46nzQ951eaeQdO1pb+f8AInm0eSq0=";

6
pkgs/applications/networking/cluster/k8sgpt/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "k8sgpt";
version = "0.3.6";
version = "0.3.8";
src = fetchFromGitHub {
owner = "k8sgpt-ai";
repo = "k8sgpt";
rev = "v${version}";
hash = "sha256-GAEAl59bzCffsh0XYa61R/AwwoGyFfG0M1m1U2aQiis=";
hash = "sha256-61u6iGz1cloIKJ2UyyQGPOZJvnAax05sI4XA9NCpJso=";
};
vendorHash = "sha256-g0Lgu0aC25+/MYoRKMqTN8Iu8j/KA4G1DBjbhOfPpjg=";
vendorHash = "sha256-vmTfiUuuHHRzCwgWWzE80bq3VceRSHqpEYV7Zo7SJAI=";
CGO_ENABLED = 0;

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

@ -2,11 +2,11 @@
let
pname = "openlens";
version = "6.5.2-309";
version = "6.5.2-356";
src = fetchurl {
url = "https://github.com/MuhammedKalkan/OpenLens/releases/download/v${version}/OpenLens-${version}.x86_64.AppImage";
sha256 = "sha256-APJYN5GBBw6FhF7NkRXip4coLY5Hxi+aE6r5IxzODFM=";
sha256 = "sha256-ZOLfnAKZMqO/MkpjX2SQhtBIeWRGTkPBWdAw67a3l9Q=";
};
appimageContents = appimageTools.extractType2 {

6
pkgs/applications/networking/cluster/rke/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "rke";
version = "1.4.5";
version = "1.4.6";
src = fetchFromGitHub {
owner = "rancher";
repo = pname;
rev = "v${version}";
hash = "sha256-ldN0Fqh0V6JziTy5ml/i/un4/1o8MSeIAvrH5EyOeiw=";
hash = "sha256-P/VvRoTcJuuRuoTT0zhebibBQrM6sz9Vv+qPrWY+B9Y=";
};
vendorHash = "sha256-wuEsG2VKU4F/phSqpzUN3wChD93V4AE7poVLJu6kpF0=";
vendorHash = "sha256-MFXNwEEXtsEwB0Hcx8gn/Pz9dZM1zUUKhNYp5BlRUEk=";
subPackages = [ "." ];

20
pkgs/applications/networking/cluster/terraform-providers/providers.json
View File

@ -182,13 +182,13 @@
"vendorHash": "sha256-jOscYbwZ8m4smGiAy2vNhPMTAUnINkpuVRQ8E6LpWVw="
},
"buildkite": {
"hash": "sha256-QXhuT/EOqaxBCFGh49JIkrX8SoiSIZEyNzR5RDJldyo=",
"hash": "sha256-yxL08Eysj/w9uLmuqDKx1ZcYQZSy91pDgR84BdpsF88=",
"homepage": "https://registry.terraform.io/providers/buildkite/buildkite",
"owner": "buildkite",
"repo": "terraform-provider-buildkite",
"rev": "v0.19.1",
"rev": "v0.19.2",
"spdx": "MIT",
"vendorHash": "sha256-cWENIMdkg7+h0sIci+W6A9pxhfQ5/wvWbKx5D4S5Nw0="
"vendorHash": "sha256-AJcPxiuglHpsHUIa5sJMtY7MRN5JrW/tfkz3+5Bv9AU="
},
"checkly": {
"hash": "sha256-ZJQdH1ot/ygnM4Q2rihzHFH67ge6zfVrPASgV0lUs34=",
@ -218,13 +218,13 @@
"vendorHash": "sha256-qIgr+ynaNSfNx1iW5RJrNHvEnlr46dBzIi+5IXYn+3Q="
},
"cloudflare": {
"hash": "sha256-bunkrh9m7w47704G8Pq6S7bmhhcVIVP1yk+/AGG28Wg=",
"hash": "sha256-/sTKLSoExqssC2pi3LHva8uRolZl+kBDmm8bNNW5+Es=",
"homepage": "https://registry.terraform.io/providers/cloudflare/cloudflare",
"owner": "cloudflare",
"repo": "terraform-provider-cloudflare",
"rev": "v4.8.0",
"rev": "v4.9.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-xqVaZj0NEtcT64TThkFh2AJ03wiXCAhgYSddaUBlGAc="
"vendorHash": "sha256-bY5CXHEEYmJ3IoA+byc8sQMNVpUq+6efY/WolIRXdxU="
},
"cloudfoundry": {
"hash": "sha256-SFA0rG80BWaJHwvAWEugdVd3nR+YGflyYONOuoS++P8=",
@ -445,22 +445,22 @@
"vendorHash": "sha256-XgGNz+yP+spRA2+qFxwiZFcBRv2GQWhiYY9zoC8rZPc="
},
"google": {
"hash": "sha256-a0ReG2hwsPG6h93df+yRrhFSNXv0EOsxoSU7B+S90jA=",
"hash": "sha256-euQ320XxCby8dhDFuxqR0EGw963WIcGtGK+MpNW0eM0=",
"homepage": "https://registry.terraform.io/providers/hashicorp/google",
"owner": "hashicorp",
"proxyVendor": true,
"repo": "terraform-provider-google",
"rev": "v4.70.0",
"rev": "v4.71.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-0ZCyJiFzfWvmV+dNNUWKopdEHreXyjRFpaCA8BWil3k="
},
"google-beta": {
"hash": "sha256-p8RnKNSa5qugzNUlYmoMy+m/Gy0m3yO+GLfDwALduvM=",
"hash": "sha256-DFghnLTeQzDw3QQdGQXWBsgBjsBQxph7Kgsc/TQTvLg=",
"homepage": "https://registry.terraform.io/providers/hashicorp/google-beta",
"owner": "hashicorp",
"proxyVendor": true,
"repo": "terraform-provider-google-beta",
"rev": "v4.70.0",
"rev": "v4.71.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-0ZCyJiFzfWvmV+dNNUWKopdEHreXyjRFpaCA8BWil3k="
},

6
pkgs/applications/networking/cluster/zarf/default.nix
View File

@ -5,16 +5,16 @@
buildGoModule rec {
pname = "zarf";
version = "0.27.1";
version = "0.28.0";
src = fetchFromGitHub {
owner = "defenseunicorns";
repo = "zarf";
rev = "v${version}";
hash = "sha256-R9naPTipxok29wRwVNEV66tKDykGyVQPXoWs80+MyGc=";
hash = "sha256-TE7XP+qZkFxmms1iWDH8ziO8Rvkuo8cz8NdnMC/VU4s=";
};
vendorHash = "sha256-6hd1OEmEQ6bYdYa1UCSXfNDFM1aAiBF6tvPmAMulRyc=";
vendorHash = "sha256-5HIRwOTZwElU2Ej8EhwmTtqtL6r+Hc7Vp8XjqCulo34=";
proxyVendor = true;
preBuild = ''

6
pkgs/applications/networking/seaweedfs/default.nix
View File

@ -7,16 +7,16 @@
buildGoModule rec {
pname = "seaweedfs";
version = "3.52";
version = "3.53";
src = fetchFromGitHub {
owner = "seaweedfs";
repo = "seaweedfs";
rev = version;
hash = "sha256-20z9gS4AWs0WiZir7fO/E1ou7H+sbySc1AX2IaPNng0=";
hash = "sha256-VfKzptMxT2ra1uVzbL52EWjEGHTxmnh5xZGiQpRivTU=";
};
vendorHash = "sha256-sBvXNnZUblplDDHRy4agKSyafm2dBtS2PSMVO3MfckY=";
vendorHash = "sha256-kL6huukrM4YeU7uvj7abXOEAvRhm1Nfp4JODW4BTy0A=";
subPackages = [ "weed" ];

2
pkgs/applications/office/paperless-ngx/default.nix
View File

@ -289,6 +289,6 @@ python.pkgs.buildPythonApplication rec {
changelog = "https://github.com/paperless-ngx/paperless-ngx/releases/tag/v${version}";
license = licenses.gpl3Only;
platforms = platforms.linux;
maintainers = with maintainers; [ lukegb gador erikarvstedt ];
maintainers = with maintainers; [ lukegb gador erikarvstedt leona ];
};
}

4
pkgs/applications/science/logic/cryptominisat/default.nix
View File

@ -8,13 +8,13 @@
stdenv.mkDerivation rec {
pname = "cryptominisat";
version = "5.11.4";
version = "5.11.11";
src = fetchFromGitHub {
owner = "msoos";
repo = "cryptominisat";
rev = version;
hash = "sha256-7JNfFKSYWgyyNnWNzXGLqWRwSW+5r6PBMelKeAmx8sc=";
hash = "sha256-TYuOgOOs1EsdNz7ctZMsArTlw3QzHjiPZVozuniiPcI=";
};
buildInputs = [ python3 boost ];

16
pkgs/applications/science/machine-learning/streamlit/default.nix
View File

@ -17,6 +17,7 @@
, rich
, semver
, setuptools
, tenacity
, toml
, tornado
, tzlocal
@ -26,12 +27,12 @@
buildPythonApplication rec {
pname = "streamlit";
version = "1.21.0";
format = "wheel"; # source currently requires pipenv
version = "1.24.0";
format = "setuptools";
src = fetchPypi {
inherit pname version format;
hash = "sha256-BYYlmJUqkSbhZlLKpbyI7u6nsnc68lLi2szxyEzqrvQ=";
hash = "sha256-NSX6zpTHh5JzPFbWOja0iEUVDjume7UKGa20xZdagiU=";
};
propagatedBuildInputs = [
@ -51,6 +52,7 @@ buildPythonApplication rec {
rich
semver
setuptools
tenacity
toml
tornado
tzlocal
@ -58,12 +60,20 @@ buildPythonApplication rec {
watchdog
];
# pypi package does not include the tests, but cannot be built with fetchFromGitHub
doCheck = false;
pythonImportsCheck = [
"streamlit"
];
postInstall = ''
rm $out/bin/streamlit.cmd # remove windows helper
'';
meta = with lib; {
homepage = "https://streamlit.io/";
changelog = "https://github.com/streamlit/streamlit/releases/tag/${version}";
description = "The fastest way to build custom ML tools";
maintainers = with maintainers; [ yrashk ];
license = licenses.asl20;

12
pkgs/applications/science/math/geogebra/default.nix
View File

@ -1,7 +1,7 @@
{ lib, stdenv, fetchurl, jre, makeDesktopItem, makeWrapper, unzip, language ? "en_US" }:
let
pname = "geogebra";
version = "5-0-745-0";
version = "5-0-785-0";
srcIcon = fetchurl {
url = "http://static.geogebra.org/images/geogebra-logo.svg";
@ -45,9 +45,9 @@ let
src = fetchurl {
urls = [
"https://download.geogebra.org/installers/5.0/GeoGebra-Linux-Portable-${version}.tar.bz2"
"https://web.archive.org/web/20221126102702/https://download.geogebra.org/installers/5.0/GeoGebra-Linux-Portable-${version}.tar.bz2"
"https://web.archive.org/web/20230627211902/https://download.geogebra.org/installers/5.0/GeoGebra-Linux-Portable-${version}.tar.bz2"
];
hash = "sha256-DhZ9inK/6Cc/vunYNHhyP4tI/9/toUOgV4lZWmFIj3c=";
hash = "sha256-cL4ERKZpE9Y6IdOjvYiX3nIIW3E2qoqkpMyTszvFseM=";
};
nativeBuildInputs = [ makeWrapper ];
@ -75,10 +75,10 @@ let
src = fetchurl {
urls = [
"https://download.geogebra.org/installers/5.0/GeoGebra-MacOS-Installer-withJava-${version}.zip"
"https://web.archive.org/web/20221126102602/https://download.geogebra.org/installers/5.0/GeoGebra-MacOS-Installer-withJava-${version}.zip"
"https://download.geogebra.org/installers/5.0/GeoGebra-MacOS-Installer-withJava-${version}-x64.zip"
"https://web.archive.org/web/20230627211427/https://download.geogebra.org/installers/5.0/GeoGebra-MacOS-Installer-withJava-${version}-x64.zip"
];
hash = "sha256-La7NzEoao4ExUw3mBGstvSHm94/JM5LHlhOE9ewJePY=";
hash = "sha256-KHjNH8c3/aMJ5CcwCwW9z0QRxJwqYU5I610zpMMruBQ=";
};
dontUnpack = true;

10
pkgs/applications/science/math/geogebra/geogebra6.nix
View File

@ -1,7 +1,7 @@
{ lib, stdenv, unzip, fetchurl, electron, makeWrapper, geogebra }:
let
pname = "geogebra";
version = "6-0-745-0";
version = "6-0-785-0";
srcIcon = geogebra.srcIcon;
desktopItem = geogebra.desktopItem;
@ -30,9 +30,9 @@ let
src = fetchurl {
urls = [
"https://download.geogebra.org/installers/6.0/GeoGebra-Linux64-Portable-${version}.zip"
"https://web.archive.org/web/20221126110648/https://download.geogebra.org/installers/6.0/GeoGebra-Linux64-Portable-${version}.zip"
"https://web.archive.org/web/20230627211859/https://download.geogebra.org/installers/6.0/GeoGebra-Linux64-Portable-${version}.zip"
];
hash = "sha256-UksHZt7bEs/aRzFiJrT1Quz/SFSvA88sdhoi1IEVdBc=";
hash = "sha256-Yv8pTCKkyM7XMUNV2Pcn/YxWo1MbOTNMQBFuJFhB/uE=";
};
dontConfigure = true;
@ -65,9 +65,9 @@ let
src = fetchurl {
urls = [
"https://download.geogebra.org/installers/6.0/GeoGebra-Classic-6-MacOS-Portable-${version}.zip"
"https://web.archive.org/web/20221126111123/https://download.geogebra.org/installers/6.0/GeoGebra-Classic-6-MacOS-Portable-${version}.zip"
"https://web.archive.org/web/20230627214413/https://download.geogebra.org/installers/6.0/GeoGebra-Classic-6-MacOS-Portable-${version}.zip"
];
hash = "sha256-Qn2MD3W5icX45Tfs19oRV8J3lYmL8T+hp7A+crRb9tQ=";
hash = "sha256-HtIhhq8E1Q5B6xZ7q6Ok95Rt53VWLoGf8PbY+UEOSKg=";
};
dontUnpack = true;

4
pkgs/applications/science/misc/snakemake/default.nix
View File

@ -5,14 +5,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "snakemake";
version = "7.25.3";
version = "7.29.0";
format = "setuptools";
src = fetchFromGitHub {
owner = "snakemake";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-KrstajTocVX5Tw7aiPoJ9vxJ0nKF+jqJcYJKrJvBt0Q=";
hash = "sha256-Y/z7asYSRgDyDWmvfmX4y6fOMSpp0X9uhDx327YF2TI=";
};
propagatedBuildInputs = with python3.pkgs; [

27
pkgs/applications/version-management/git-graph/default.nix Normal file
View File

@ -0,0 +1,27 @@
{ lib
, rustPlatform
, fetchFromGitHub
, stdenv
}:
rustPlatform.buildRustPackage rec {
pname = "git-graph";
version = "unstable-2023-01-14";
src = fetchFromGitHub {
owner = "mlange-42";
repo = pname;
rev = "9bd54eb0aed6f108364bce9ad0bdff12077038fc";
hash = "sha256-tMM/mpt9yzZYSpnOGBuGLM0XTJiiyChfUrERMuyn3mQ=";
};
cargoHash = "sha256-ZLF/l2HnIbmkayWXhjYr01M6lGaGiK2UYyp654ncxgo=";
meta = with lib; {
description = "Command line tool to show clear git graphs arranged for your branching model";
homepage = "https://github.com/mlange-42/git-graph";
license = licenses.mit;
broken = stdenv.isDarwin;
maintainers = with maintainers; [ cafkafk ];
};
}

4
pkgs/applications/version-management/git-quick-stats/default.nix
View File

@ -11,13 +11,13 @@
stdenv.mkDerivation rec {
pname = "git-quick-stats";
version = "2.4.0";
version = "2.5.0";
src = fetchFromGitHub {
repo = "git-quick-stats";
owner = "arzzen";
rev = version;
sha256 = "sha256-QmHb5MWZpbZjc93XgdPFabgzT7S522ZN27p6tdL46Y0=";
sha256 = "sha256-zUw0rjsYdH4mlqKXADvfqWCBM8tCL6BmVHq27JZLpd0=";
};
nativeBuildInputs = [ makeWrapper ];

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

@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
pname = "got";
version = "0.89";
version = "0.90";
src = fetchurl {
url = "https://gameoftrees.org/releases/portable/got-portable-${version}.tar.gz";
hash = "sha256-J0BJMsB3E0ABJMFeMYQXOFQRt6H+fuU05I8rnk8JbYw=";
hash = "sha256-2jU/Q6W5G1Y/HZvksr21D93//HCwpLd3+l3RFGKb94M=";
};
nativeBuildInputs = [ pkg-config bison ]

10
pkgs/applications/video/mkvtoolnix/default.nix
View File

@ -1,7 +1,6 @@
{ lib
, stdenv
, fetchFromGitLab
, fetchpatch
, pkg-config
, autoreconfHook
, rake
@ -56,15 +55,6 @@ stdenv.mkDerivation rec {
sha256 = "t+kfFS5c8w+c9wxNh59nceFesfdMy8qvHlUqDbZAxkk=";
};
patches = [
# Fix compatiblity with fmt 10.0. Remove with the next release
(fetchpatch {
url = "https://gitlab.com/mbunkus/mkvtoolnix/-/commit/24716ce95bf5b10d685611de23489045cf2ca5cc.patch";
hash = "sha256-vOm3FmXL3mHzs3RHCJ9gbTLSe3xhSXo8IfgA+s0cFjY=";
includes = [ "src/common/codec.h" ];
})
];
nativeBuildInputs = [
autoreconfHook
docbook_xsl

4
pkgs/applications/video/obs-studio/plugins/obs-gradient-source.nix
View File

@ -7,13 +7,13 @@
stdenv.mkDerivation rec {
pname = "obs-gradient-source";
version = "0.3.1";
version = "0.3.2";
src = fetchFromGitHub {
owner = "exeldro";
repo = "obs-gradient-source";
rev = version;
sha256 = "sha256-4u7RzF2b7EWwsfEtRvGDifue34jJM4MaYpwumu0MFpQ=";
sha256 = "sha256-5pll84UZYOTESrid2UuC1aWlaLrWf1LpXqlV09XKLug=";
};
nativeBuildInputs = [ cmake ];

4
pkgs/applications/video/obs-studio/plugins/obs-vertical-canvas.nix
View File

@ -9,13 +9,13 @@
stdenv.mkDerivation rec {
pname = "obs-vertical-canvas";
version = "1.2.2";
version = "1.2.4";
src = fetchFromGitHub {
owner = "Aitum";
repo = "obs-vertical-canvas";
rev = version;
sha256 = "sha256-9NXIJPF6ubd9M3t5pmSQvADoLmm+XolRhIvhbqw9R04=";
sha256 = "sha256-a9r01adzeC8KSr+ATgRQLoJ+dlAj6NWFZ5cRYlS7FeM=";
};
nativeBuildInputs = [ cmake ];

2
pkgs/build-support/node/fetch-npm-deps/default.nix
View File

@ -115,7 +115,7 @@
meta = with lib; {
description = "Prefetch dependencies from npm (for use with `fetchNpmDeps`)";
maintainers = with maintainers; [ winter ];
maintainers = with maintainers; [ lilyinstarlight winter ];
license = licenses.mit;
};
};

4
pkgs/data/fonts/ibm-plex/default.nix
View File

@ -2,11 +2,11 @@
stdenvNoCC.mkDerivation rec {
pname = "ibm-plex";
version = "6.3.0";
version = "6.2.0";
src = fetchzip {
url = "https://github.com/IBM/plex/releases/download/v${version}/OpenType.zip";
hash = "sha256-VwJyZMH10FXDxc7T7m8sl7raUlrarSM0Snjruo1ICHU=";
hash = "sha256-RvD/aeZrvltJiuAHqYMNaRsjLgTdcC1/5zqlcd4qKAA=";
};
installPhase = ''

4
pkgs/data/fonts/sarasa-gothic/default.nix
View File

@ -2,13 +2,13 @@
stdenvNoCC.mkDerivation rec {
pname = "sarasa-gothic";
version = "0.41.2";
version = "0.41.3";
src = fetchurl {
# Use the 'ttc' files here for a smaller closure size.
# (Using 'ttf' files gives a closure size about 15x larger, as of November 2021.)
url = "https://github.com/be5invis/Sarasa-Gothic/releases/download/v${version}/sarasa-gothic-ttc-${version}.7z";
hash = "sha256-AkfjtXeZkwzXLu81hS43vYPEMKl3TV1TnQ4ryUSnblc=";
hash = "sha256-/VC9zhWC3jJuIXQ2fel6moLzrdsguPaylgfkY9FoClQ=";
};
sourceRoot = ".";

58
pkgs/development/compilers/ligo/2706.diff Normal file
View File

@ -0,0 +1,58 @@
--- a/src/passes/02-parsing/cameligo/dune
+++ b/src/passes/02-parsing/cameligo/dune
@@ -20,7 +20,9 @@
(action
(with-stdout-to
%{targets}
- (run menhir-recover --external-tokens Lexing_cameligo.Token Parser.cmly))))
+ (run menhir-recover
+ --external-tokens Lexing_cameligo.Token.MenhirInterpreter
+ Parser.cmly))))
;; Build of the CameLIGO parser as a library
diff --git a/src/passes/02-parsing/jsligo/dune b/src/passes/02-parsing/jsligo/dune
index d691ab0af0fe6ae87119405c19e49e2b5c2d1a23..3b13a06e69737037df0df12aa087506f402d8430 100644
--- a/src/passes/02-parsing/jsligo/dune
+++ b/src/passes/02-parsing/jsligo/dune
@@ -20,7 +20,9 @@
(action
(with-stdout-to
%{targets}
- (run menhir-recover --external-tokens Lexing_jsligo.Token Parser.cmly))))
+ (run menhir-recover
+ --external-tokens Lexing_jsligo.Token.MenhirInterpreter
+ Parser.cmly))))
;; Build of the JsLIGO parser as a library
diff --git a/src/passes/02-parsing/pascaligo/dune b/src/passes/02-parsing/pascaligo/dune
index 0516a8b790d2eb3ebdb833051bd66241ca44832c..e650decc7ba9907551e1016fee1a53b806fb593e 100644
--- a/src/passes/02-parsing/pascaligo/dune
+++ b/src/passes/02-parsing/pascaligo/dune
@@ -20,7 +20,9 @@
(action
(with-stdout-to
%{targets}
- (run menhir-recover --external-tokens Lexing_pascaligo.Token Parser.cmly))))
+ (run menhir-recover
+ --external-tokens Lexing_pascaligo.Token.MenhirInterpreter
+ Parser.cmly))))
;; Build of the PascaLIGO parser as a library
diff --git a/src/passes/02-parsing/pyligo/dune b/src/passes/02-parsing/pyligo/dune
index abb0165f6f185d21ea4a52a152cef188ae9dde4b..5930d86ab721e9dd683e5c4f2873b196ac5859b4 100644
--- a/src/passes/02-parsing/pyligo/dune
+++ b/src/passes/02-parsing/pyligo/dune
@@ -20,7 +20,9 @@
(action
(with-stdout-to
%{targets}
- (run menhir-recover --external-tokens Lexing_pyligo.Token Parser.cmly))))
+ (run menhir-recover
+ --external-tokens Lexing_pyligo.Token.MenhirInterpreter
+ Parser.cmly))))
;; Build of the PyLIGO parser as a library

3
pkgs/development/compilers/ligo/default.nix
View File

@ -24,6 +24,9 @@ ocamlPackages.buildDunePackage rec {
fetchSubmodules = true;
};
# https://gitlab.com/ligolang/ligo/-/merge_requests/2706.diff
patches = [ ./2706.diff ];
postPatch = ''
substituteInPlace "vendors/tezos-ligo/src/lib_hacl/hacl.ml" \
--replace \

3
pkgs/development/compilers/nim/default.nix
View File

@ -103,6 +103,9 @@ in {
./nixbuild.patch
# Load libraries at runtime by absolute path
./extra-mangling.patch
# Mangle store paths of modules to prevent runtime dependence.
] ++ lib.optional (!stdenv.hostPlatform.isWindows) ./toLocation.patch;
configurePhase = ''

48
pkgs/development/compilers/nim/extra-mangling.patch Normal file
View File

@ -0,0 +1,48 @@
diff --git a/compiler/modulepaths.nim b/compiler/modulepaths.nim
index e80ea3fa6..8ecf27a85 100644
--- a/compiler/modulepaths.nim
+++ b/compiler/modulepaths.nim
@@ -70,6 +70,13 @@ proc checkModuleName*(conf: ConfigRef; n: PNode; doLocalError=true): FileIndex =
else:
result = fileInfoIdx(conf, fullPath)
+proc rot13(result: var string) =
+ for i, c in result:
+ case c
+ of 'a'..'m', 'A'..'M': result[i] = char(c.uint8 + 13)
+ of 'n'..'z', 'N'..'Z': result[i] = char(c.uint8 - 13)
+ else: discard
+
proc mangleModuleName*(conf: ConfigRef; path: AbsoluteFile): string =
## Mangle a relative module path to avoid path and symbol collisions.
##
@@ -78,9 +85,11 @@ proc mangleModuleName*(conf: ConfigRef; path: AbsoluteFile): string =
##
## Example:
## `foo-#head/../bar` becomes `@foo-@hhead@s..@sbar`
- "@m" & relativeTo(path, conf.projectPath).string.multiReplace(
+ result = "@m" & relativeTo(path, conf.projectPath).string.multiReplace(
{$os.DirSep: "@s", $os.AltSep: "@s", "#": "@h", "@": "@@", ":": "@c"})
+ rot13(result)
proc demangleModuleName*(path: string): string =
## Demangle a relative module path.
result = path.multiReplace({"@@": "@", "@h": "#", "@s": "/", "@m": "", "@c": ":"})
+ rot13(result)
diff --git a/compiler/msgs.nim b/compiler/msgs.nim
index 3f386cc61..054f7f647 100644
--- a/compiler/msgs.nim
+++ b/compiler/msgs.nim
@@ -659,8 +659,10 @@ proc uniqueModuleName*(conf: ConfigRef; fid: FileIndex): string =
for i in 0..<trunc:
let c = rel[i]
case c
- of 'a'..'z':
- result.add c
+ of 'a'..'m':
+ result.add char(c.uint8 + 13)
+ of 'n'..'z':
+ result.add char(c.uint8 - 13)
of {os.DirSep, os.AltSep}:
result.add 'Z' # because it looks a bit like '/'
of '.':

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

@ -2,20 +2,20 @@
buildNpmPackage rec {
pname = "typescript";
version = "5.1.3";
version = "5.1.5";
src = fetchFromGitHub {
owner = "microsoft";
repo = "TypeScript";
rev = "v${version}";
hash = "sha256-c+ZI58Zk6TXwJoWUAXeIMToT+e7Ozdn7hxiDpPjeQJg=";
hash = "sha256-HdDzkDhlaTDUNmAsWlLUHuGAIgXGcgZW4dZAweaXrL0=";
};
npmDepsHash = "sha256-RHiUhhkzkr2Ra3wc1d13gE2WIZL49w7IEFEAZuBDTDI=";
meta = with lib; {
description = "A superset of JavaScript that compiles to clean JavaScript output";
homepage = "https://github.com/microsoft/TypeScript";
homepage = "https://www.typescriptlang.org/";
changelog = "https://github.com/microsoft/TypeScript/releases/tag/v${version}";
license = licenses.asl20;
maintainers = [ maintainers.marsam ];

16
pkgs/development/haskell-modules/with-packages-wrapper.nix
View File

@ -55,6 +55,12 @@ let
libDir = if isHaLVM then "$out/lib/HaLVM-${ghc.version}"
else "$out/lib/${ghc.targetPrefix}${ghc.haskellCompilerName}"
+ lib.optionalString (ghc ? hadrian) "/lib";
# Boot libraries for GHC are present in a separate directory.
bootLibDir = let arch = if stdenv.targetPlatform.isAarch64
then "aarch64"
else "x86_64";
platform = if stdenv.targetPlatform.isDarwin then "osx" else "linux";
in "${ghc}/lib/${ghc.haskellCompilerName}/lib/${arch}-${platform}-${ghc.haskellCompilerName}";
docDir = "$out/share/doc/ghc/html";
packageCfgDir = "${libDir}/package.conf.d";
paths = lib.concatLists (
@ -131,11 +137,17 @@ symlinkJoin {
'' + (lib.optionalString (stdenv.targetPlatform.isDarwin && !isGhcjs && !stdenv.targetPlatform.isiOS) ''
# Work around a linker limit in macOS Sierra (see generic-builder.nix):
local packageConfDir="${packageCfgDir}";
local dynamicLinksDir="$out/lib/links"
local dynamicLinksDir="$out/lib/links";
mkdir -p $dynamicLinksDir
# Clean up the old links that may have been (transitively) included by
# symlinkJoin:
rm -f $dynamicLinksDir/*
# Boot libraries are located differently than other libraries since GHC 9.6, so handle them separately.
if [[ -x "${bootLibDir}" ]]; then
ln -s "${bootLibDir}"/*.dylib $dynamicLinksDir
fi
for d in $(grep -Poz "dynamic-library-dirs:\s*\K .+\n" $packageConfDir/*|awk '{print $2}'|sort -u); do
ln -s $d/*.dylib $dynamicLinksDir
done
@ -146,7 +158,7 @@ symlinkJoin {
# $dynamicLinksDir
cp $f $f-tmp
rm $f
sed "N;s,dynamic-library-dirs:\s*.*,dynamic-library-dirs: $dynamicLinksDir," $f-tmp > $f
sed "N;s,dynamic-library-dirs:\s*.*\n,dynamic-library-dirs: $dynamicLinksDir\n," $f-tmp > $f
rm $f-tmp
done
'') + ''

4
pkgs/development/libraries/sentry-native/default.nix
View File

@ -9,13 +9,13 @@
stdenv.mkDerivation rec {
pname = "sentry-native";
version = "0.6.3";
version = "0.6.4";
src = fetchFromGitHub {
owner = "getsentry";
repo = "sentry-native";
rev = version;
hash = "sha256-GefuMsMFmNyAn+xmnRqUjyWFHqiF/kIzqBCF6mk3vx0=";
hash = "sha256-AMGp2tfYMocIdnqHXqxPBoNH+6E8MtCuNTYlt9CigcY=";
};
nativeBuildInputs = [

48
pkgs/development/libraries/sexp/default.nix Normal file
View File

@ -0,0 +1,48 @@
{ lib
, stdenv
, bzip2
, cmake
, fetchFromGitHub
, gtest
, pkg-config
, zlib
}:
stdenv.mkDerivation (finalAttrs: {
pname = "sexp";
version = "0.8.6";
src = fetchFromGitHub {
owner = "rnpgp";
repo = "sexp";
rev = "v${finalAttrs.version}";
hash = "sha256-NpDSoBxEM8g/SugLmT8E5+YZPDFIGHa4eXLjdzQxaiw=";
};
buildInputs = [ zlib bzip2 ];
cmakeFlags = [
"-DCMAKE_INSTALL_PREFIX=${placeholder "out"}"
"-DBUILD_SHARED_LIBS=on"
"-DWITH_SEXP_TESTS=on"
"-DDOWNLOAD_GTEST=off"
"-DWITH_SEXP_CLI=on"
"-DWITH_SANITIZERS=off"
];
nativeBuildInputs = [ cmake gtest pkg-config ];
outputs = [ "out" "lib" "dev" ];
preConfigure = ''
echo "v${finalAttrs.version}" > version.txt
'';
meta = with lib; {
homepage = "https://github.com/rnpgp/sexp";
description = "S-expressions parser and generator C++ library, fully compliant to [https://people.csail.mit.edu/rivest/Sexp.txt]";
license = licenses.mit;
platforms = platforms.all;
maintainers = with maintainers; [ ribose-jeffreylau ];
};
})

3
pkgs/development/libraries/whereami/default.nix
View File

@ -1,6 +1,7 @@
{ lib
, stdenv
, fetchFromGitHub
, fixDarwinDylibNames
}:
let
libExt = stdenv.hostPlatform.extensions.sharedLibrary;
@ -16,6 +17,8 @@ stdenv.mkDerivation rec {
sha256 = "XhRqW0wdXzlmyBf1cjqtQvztuyV4buxVl19Q0uyEOhk=";
};
nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
makeFlags = [
"-C_gnu-make"
"build-library"

2
pkgs/development/nim-packages/tkrzw/default.nix
View File

@ -14,7 +14,7 @@ buildNimPackage rec {
meta = with lib;
src.meta // {
description = "Nim wrappers over some of the Tkrzw C++ library";
license = lib.licenses.apsl20;
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ ehmry ];
};
}

11293
pkgs/development/node-packages/node-packages.nix generated
View File

File diff suppressed because it is too large Load Diff

7
pkgs/development/ocaml-modules/awa/default.nix
View File

@ -8,14 +8,13 @@
buildDunePackage rec {
pname = "awa";
version = "0.2.0";
version = "0.3.0";
minimalOCamlVersion = "4.08";
duneVersion = "3";
minimalOCamlVersion = "4.10";
src = fetchurl {
url = "https://github.com/mirage/awa-ssh/releases/download/v${version}/awa-${version}.tbz";
hash = "sha256-hsmTuoubBdsEyGe8zmfG7JihY0LFM4lErpPKUVobIX8=";
hash = "sha256-BtbReSnnAN+u1Vy63afO1yheoDqsIRU2rig0y1QDtuw=";
};
propagatedBuildInputs = [

21
pkgs/development/ocaml-modules/awa/lwt.nix
View File

@ -1,21 +0,0 @@
{ buildDunePackage, awa
, cstruct, mtime, lwt, cstruct-unix, mirage-crypto-rng
}:
buildDunePackage {
pname = "awa-lwt";
inherit (awa) version src;
duneVersion = "3";
propagatedBuildInputs = [
awa cstruct mtime lwt mirage-crypto-rng
];
doCheck = true;
nativeCheckInputs = [ awa ];
checkInputs = [ cstruct-unix ];
meta = awa.meta // { mainProgram = "awa_lwt_server"; };
}

4
pkgs/development/ocaml-modules/carton/lwt.nix
View File

@ -21,7 +21,9 @@ buildDunePackage {
bigstringaf
];
doCheck = true;
# Tests fail with git 2.41
# see https://github.com/mirage/ocaml-git/issues/617
doCheck = false;
nativeCheckInputs = [
git-binary
];

4
pkgs/development/ocaml-modules/menhir/lib.nix
View File

@ -2,14 +2,14 @@
buildDunePackage rec {
pname = "menhirLib";
version = "20220210";
version = "20230608";
src = fetchFromGitLab {
domain = "gitlab.inria.fr";
owner = "fpottier";
repo = "menhir";
rev = version;
sha256 = "sha256:0f31isr3cyiishflz6qr4xc3gp9xwf32r3vxdvm5wnr2my1fnn1n";
sha256 = "sha256-dUPoIUVr3gqvE5bniyQh/b37tNfRsZN8X3e99GFkyLY=";
};
meta = with lib; {

2
pkgs/development/php-packages/datadog_trace/default.nix
View File

@ -16,7 +16,7 @@ buildPecl rec {
meta = with lib; {
description = "Datadog Tracing PHP Client";
homepage = "https://github.com/DataDog/dd-trace-php";
license = licenses.apsl20;
license = with licenses; [ asl20 /* or */ bsd3 ];
maintainers = teams.php.members;
};
}

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

@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "ailment";
version = "9.2.56";
version = "9.2.57";
format = "pyproject";
disabled = pythonOlder "3.8";
@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "angr";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-J2O/g9q7xeEiP/XMMiOrTbA1IHBaxRFT3WASI+StG9E=";
hash = "sha256-W9JvxUkQeHOKCvGeOLWHjyN53NEsiQ+3wDvi0z0VrO0=";
};
nativeBuildInputs = [

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

@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "aioairzone-cloud";
version = "0.1.9";
version = "0.2.0";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "Noltari";
repo = "aioairzone-cloud";
rev = "refs/tags/${version}";
hash = "sha256-E6lwh+AQ+SZm0ODFdApwyq5OB2qO9KBdFo9vVgpiy3M=";
hash = "sha256-mfygibuKSkBrVZ+zILCAYnfzEvrzD7ZXbUtTSZ54rVk=";
};
nativeBuildInputs = [

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

@ -32,7 +32,7 @@
buildPythonPackage rec {
pname = "angr";
version = "9.2.56";
version = "9.2.57";
format = "pyproject";
disabled = pythonOlder "3.8";
@ -41,7 +41,7 @@ buildPythonPackage rec {
owner = pname;
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-LjXQG5L8VwrxC5WJupBS9eqKnQ7t8gi7ug9uTG2v8W4=";
hash = "sha256-s3wlTsm97hn2RNsB22eBzbPqQCl19QDeAa5E39qikL4=";
};
propagatedBuildInputs = [

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

@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "archinfo";
version = "9.2.56";
version = "9.2.57";
format = "pyproject";
disabled = pythonOlder "3.8";
@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "angr";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-t2zhQz+IaWm4Y5BDkKwNk9ptAyA7Prs5m7v8HJ8Aob4=";
hash = "sha256-6w8xl0lqu8JUfPpMhx57WA5kzX+bgW05i2nAGwQBkcQ=";
};
nativeBuildInputs = [

62
pkgs/development/python-modules/biopandas/default.nix Normal file
View File

@ -0,0 +1,62 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, looseversion
, mmtf-python
, nose
, numpy
, pandas
, pythonRelaxDepsHook
}:
buildPythonPackage rec {
pname = "biopandas";
version = "0.4.1";
format = "setuptools";
src = fetchFromGitHub {
owner = "BioPandas";
repo = "biopandas";
rev = "refs/tags/v${version}";
hash = "sha256-PRdemBo+bB2xJWmF2NylFTfNwEEo67i6XSaeDAFmQ/c=";
};
nativeBuildInputs = [
pythonRelaxDepsHook
];
pythonRelaxDeps = [
"looseversion"
];
propagatedBuildInputs = [
numpy
pandas
mmtf-python
looseversion
];
nativeCheckInputs = [
nose
];
checkPhase = ''
runHook preCheck
nosetests
runHook postCheck
'';
pythonImportsCheck = [
"biopandas"
];
meta = {
description = "Working with molecular structures in pandas DataFrames";
homepage = "https://github.com/BioPandas/biopandas";
changelog = "https://github.com/BioPandas/biopandas/releases/tag/${src.rev}";
license = lib.licenses.bsd3;
maintainers = with lib.maintainers; [ natsukium ];
};
}

42
pkgs/development/python-modules/clarifai-grpc/default.nix Normal file
View File

@ -0,0 +1,42 @@
{ lib
, buildPythonPackage
, fetchPypi
, pythonOlder
, googleapis-common-protos
, grpcio
, protobuf
, requests
}:
buildPythonPackage rec {
pname = "clarifai-grpc";
version = "9.5.0";
format = "setuptools";
disabled = pythonOlder "3.8";
src = fetchPypi {
inherit pname version;
hash = "sha256-amMUgRXtvcrALfWwat7W0W60FJQnEeMvHhyxxBCMqUg=";
};
propagatedBuildInputs = [
googleapis-common-protos
grpcio
protobuf
requests
];
# almost all tests require network access
doCheck = false;
pythonImportsCheck = [ "clarifai_grpc" ];
meta = with lib; {
description = "Clarifai gRPC API Client";
homepage = "https://github.com/Clarifai/clarifai-python-grpc";
changelog = "https://github.com/Clarifai/clarifai-python-grpc/releases/tag/${version}";
license = licenses.asl20;
maintainers = with maintainers; [ natsukium ];
};
}

40
pkgs/development/python-modules/clarifai/default.nix Normal file
View File

@ -0,0 +1,40 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, pythonOlder
, clarifai-grpc
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "clarifai";
version = "9.5.2";
format = "setuptools";
disabled = pythonOlder "3.8";
src = fetchFromGitHub {
owner = "Clarifai";
repo = "clarifai-python-utils";
rev = "refs/tags/${version}";
hash = "sha256-29by0YAQ7qc0gL/3lAFOk4FLDB5Qv4X9QDyK49gfyAo=";
};
propagatedBuildInputs = [
clarifai-grpc
];
nativeCheckInputs = [
pytestCheckHook
];
pythonImportsCheck = [ "clarifai" ];
meta = with lib; {
description = "Clarifai Python Utilities";
homepage = "https://github.com/Clarifai/clarifai-python-utils";
changelog = "https://github.com/Clarifai/clarifai-python-utils/releases/tag/${src.rev}";
license = licenses.asl20;
maintainers = with maintainers; [ natsukium ];
};
}

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

@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "claripy";
version = "9.2.56";
version = "9.2.57";
format = "pyproject";
disabled = pythonOlder "3.8";
@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "angr";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-QhbXcvO3HR9ffrI7KwSIQeVPfs6RIWoHllCaS6hC3JI=";
hash = "sha256-Wm+rRhrylnIat2L3MvvjKBayYlzi28rcQ+1KR/Zam/U=";
};
nativeBuildInputs = [

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

@ -16,7 +16,7 @@
let
# The binaries are following the argr projects release cycle
version = "9.2.56";
version = "9.2.57";
# Binary files from https://github.com/angr/binaries (only used for testing and only here)
binaries = fetchFromGitHub {
@ -38,7 +38,7 @@ buildPythonPackage rec {
owner = "angr";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-c4uuM7ZZPfykGkYrpuE2JJqe5/pTZuR+IvPC+HA7laA=";
hash = "sha256-xROJl7Mpdpcz1Mio7ChHR/9hHTgp+SQkawGkl6F+NDM=";
};
nativeBuildInputs = [

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

@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "deezer-python";
version = "5.12.0";
version = "6.0.0";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "browniebroke";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-fJRGtes5EdGHiTJ5SDOyZT9NEnghbu+7I9OD2h4JOjw=";
hash = "sha256-gIjb8+UEMf/wQSJOassMc9MBysTtieExFTIiSq1m/3Y=";
};
nativeBuildInputs = [

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

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "discord.py";
version = "2.2.3";
version = "2.3.1";
format = "setuptools";
disabled = pythonOlder "3.8";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "Rapptz";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-Rh3gijm67LVyOaliP7w3YwKviKydnxXvu4snNrM5H1c=";
hash = "sha256-vbbTnmzYI6cbF7GWjPVGqy7KKDGpWQ+4q96/kGFjQ8Y=";
};
propagatedBuildInputs = [

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

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "glances-api";
version = "0.4.2";
version = "0.4.3";
format = "pyproject";
disabled = pythonOlder "3.8";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "home-assistant-ecosystem";
repo = "python-glances-api";
rev = "refs/tags/${version}";
hash = "sha256-fcQgwOYGhpwxSXfa1PYFOe2UDTEu+2YGIQmuSa5J0g4=";
hash = "sha256-VfiAJuSmzFVgDTThtsTy7/caRmJKZuD5YwHjMspeB0A=";
};
nativeBuildInputs = [

4
pkgs/development/python-modules/google-i18n-address/default.nix
View File

@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "google-i18n-address";
version = "3.0.0";
version = "3.1.0";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "mirumee";
repo = "google-i18n-address";
rev = "refs/tags/${version}";
hash = "sha256-eh0NcGJfIjCmgTyfSOlDNLrCvMnZKzkJkQb3txVmFAo=";
hash = "sha256-dW/1wwnFDjYpym1ZaSZ7mOLpkHxsvuAHC8zBRekxWaw=";
};
nativeBuildInputs = [

4
pkgs/development/python-modules/huawei-lte-api/default.nix
View File

@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "huawei-lte-api";
version = "1.7";
version = "1.7.3";
format = "setuptools";
disabled = pythonOlder "3.6";
@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "Salamek";
repo = "huawei-lte-api";
rev = "refs/tags/${version}";
hash = "sha256-/2puuWdmVvq90/UAEKPMD6wjkdxzzCdukSH4VQia4qA=";
hash = "sha256-a01oNfUivbCzTd5auu+EXj+yvcC1vKyktIFK+zPQGy4=";
};
propagatedBuildInputs = [

13
pkgs/development/python-modules/langchain/default.nix
View File

@ -17,6 +17,7 @@
, bash
# optional dependencies
, anthropic
, clarifai
, cohere
, openai
, nlpcloud
@ -35,6 +36,7 @@
, faiss
, spacy
, nltk
, wikipedia
, beautifulsoup4
, tiktoken
, jinja2
@ -77,7 +79,7 @@
buildPythonPackage rec {
pname = "langchain";
version = "0.0.216";
version = "0.0.218";
format = "pyproject";
disabled = pythonOlder "3.8";
@ -86,7 +88,7 @@ buildPythonPackage rec {
owner = "hwchase17";
repo = "langchain";
rev = "refs/tags/v${version}";
hash = "sha256-g01EMquASxXl9drLhKtTwG9+gSa17aBq0c8UXcErCjI=";
hash = "sha256-8ru3Rp1bRLVivfXAFNfZYfV3DgHuHNEuCrKoqL1O0zo=";
};
postPatch = ''
@ -123,6 +125,7 @@ buildPythonPackage rec {
passthru.optional-dependencies = {
llms = [
anthropic
clarifai
cohere
openai
nlpcloud
@ -140,6 +143,9 @@ buildPythonPackage rec {
text_helpers = [
chardet
];
clarifai = [
clarifai
];
cohere = [
cohere
];
@ -157,6 +163,7 @@ buildPythonPackage rec {
];
all = [
anthropic
clarifai
cohere
openai
nlpcloud
@ -171,7 +178,7 @@ buildPythonPackage rec {
transformers
spacy
nltk
# wikipedia
wikipedia
beautifulsoup4
tiktoken
torch

64
pkgs/development/python-modules/mashumaro/default.nix Normal file
View File

@ -0,0 +1,64 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, pythonOlder
, setuptools
, typing-extensions
, orjson
, msgpack
, pyyaml
, tomli-w
, tomli
, pytestCheckHook
, ciso8601
, pendulum
, pytest-mock
}:
buildPythonPackage rec {
pname = "mashumaro";
version = "3.8.1";
format = "pyproject";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "Fatal1ty";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-WDKohmcdVlQR/6AMSISN0y6UQx4tmOf1fANCPLRYiqI=";
};
nativeBuildInputs = [
setuptools
];
propagatedBuildInputs = [
typing-extensions
];
passthru.optional-dependencies = {
orjson = [ orjson ];
msgpack = [ msgpack ];
yaml = [ pyyaml ];
toml = [ tomli-w ] ++ lib.optionals (pythonOlder "3.11") [ tomli ];
};
nativeCheckInputs = [
ciso8601
pendulum
pytest-mock
pytestCheckHook
] ++ lib.flatten (lib.attrValues passthru.optional-dependencies);
pythonImportsCheck = [
"mashumaro"
];
meta = with lib; {
description = "Fast and well tested serialization library on top of dataclasses";
homepage = "https://github.com/Fatal1ty/mashumaro";
changelog = "https://github.com/Fatal1ty/mashumaro/releases/tag/v${version}";
license = licenses.asl20;
maintainers = with maintainers; [ tjni ];
};
}

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

@ -20,7 +20,7 @@
buildPythonPackage rec {
pname = "meshtastic";
version = "2.1.8";
version = "2.1.9";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -29,7 +29,7 @@ buildPythonPackage rec {
owner = "meshtastic";
repo = "Meshtastic-python";
rev = "refs/tags/${version}";
hash = "sha256-ZIUR9YMoXhbpIDWXxKr6TyNkANuRiJvhkJILx7mWSrw=";
hash = "sha256-fqBg0IHwREkDOEPIxMVBCcGH8dSyKIkOeYga3Jc+qQs=";
};
propagatedBuildInputs = [

44
pkgs/development/python-modules/mmtf-python/default.nix Normal file
View File

@ -0,0 +1,44 @@
{ lib
, buildPythonPackage
, fetchPypi
, msgpack
, numpy
, unittestCheckHook
}:
buildPythonPackage rec {
pname = "mmtf-python";
version = "1.1.3";
format = "setuptools";
src = fetchPypi {
inherit pname version;
hash = "sha256-EqAv4bcTHworjORbRvHgzdKLmBj+RJlVTCaISYfqDDI=";
};
propagatedBuildInputs = [
msgpack
numpy
];
nativeCheckInputs = [
unittestCheckHook
];
unittestFlagsArray = [
"-s mmtf/tests"
"-p \"*_tests.py\""
];
pythonImportsCheck = [
"mmtf"
];
meta = {
description = "The python implementation of the MMTF API, decoder and encoder";
homepage = "https://github.com/rcsb/mmtf-python";
changelog = "https://github.com/rcsb/mmtf-python/releases/tag/v${version}";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ natsukium ];
};
}

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

@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "oci";
version = "2.104.3";
version = "2.105.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "oracle";
repo = "oci-python-sdk";
rev = "refs/tags/v${version}";
hash = "sha256-1C5+h1w6ACYmzDjgeS7Xvy/xBQnrpEmLJAhNq9bVs4k=";
hash = "sha256-EiyvAVFEC/hVPTagV4CsyrMRyc89cEzG2NIS2nJg+NU=";
};
pythonRelaxDeps = [

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

@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "openhomedevice";
version = "2.1";
version = "2.2";
format = "setuptools";
disabled = pythonOlder "3.5";
@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "bazwilliams";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-KNQelldqHx4m8IfgGUwWw/+AVzBotIa7cJGy1SfbRy0=";
hash = "sha256-GGp7nKFH01m1KW6yMkKlAdd26bDi8JDWva6OQ0CWMIw=";
};
propagatedBuildInputs = [

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

@ -24,7 +24,7 @@
buildPythonPackage rec {
pname = "pyatv";
version = "0.13.1";
version = "0.13.2";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -33,7 +33,7 @@ buildPythonPackage rec {
owner = "postlund";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-2hRpjv9Yf4vpkZCYh2W0Lt6AlaO/RfpW3tNiovkwOnU=";
hash = "sha256-7jXxnZLruwNzYVOn3c+YlF2olwezwjpwXInDem44/vE=";
};
postPatch = ''

47
pkgs/development/python-modules/pygbm/default.nix
View File

@ -1,47 +0,0 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, scipy
, numpy
, numba
, scikit-learn
, pytest
, pythonOlder
}:
buildPythonPackage rec {
pname = "pygbm";
version = "0.1.0";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "ogrisel";
repo = pname;
rev = "v${version}";
sha256 = "1qg2md86d0z5aa6jn8kj3rxsippsqsccx1dbraspdsdkycncvww3";
};
propagatedBuildInputs = [
scipy
numpy
numba
scikit-learn
];
nativeCheckInputs = [
pytest
];
checkPhase = ''
# numerical rounding error in test
pytest -k "not test_derivatives"
'';
meta = with lib; {
description = "Experimental Gradient Boosting Machines in Python";
homepage = "https://github.com/ogrisel/pygbm";
license = licenses.mit;
maintainers = [ maintainers.costrouc ];
broken = true;
};
}

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

@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "pyoverkiz";
version = "1.8.0";
version = "1.9.0";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -24,7 +24,7 @@ buildPythonPackage rec {
owner = "iMicknl";
repo = "python-overkiz-api";
rev = "refs/tags/v${version}";
hash = "sha256-Mo28QpPJqfzzb/bq4W+OUcyptWCaLJSon99VdJ9Ss80=";
hash = "sha256-Xvwu4Npt9mCmeiQAqj8+s3bHnLBs1o595zdfkjnyaUc=";
};
postPatch = ''

2
pkgs/development/python-modules/pyprecice/default.nix
View File

@ -5,6 +5,7 @@
, mpi4py
, numpy
, precice
, pkgconfig
, pythonOlder
}:
@ -24,6 +25,7 @@ buildPythonPackage rec {
nativeBuildInputs = [
cython
pkgconfig
];
propagatedBuildInputs = [

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

@ -17,11 +17,11 @@
disabledIf (pythonAtLeast "3.11") (
stdenv.mkDerivation rec {
pname = "pyside2";
version = "5.15.5";
version = "5.15.10";
src = fetchurl {
url = "https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-${version}-src/pyside-setup-opensource-src-${version}.tar.xz";
sha256 = "0cwvw6695215498rsbm2xzkwaxdr3w7zfvy4kc62c01k6pxs881r";
sha256 = "sha256-KvaR02E6Qfg6YEObRlaPwsaW2/rkL3zXsHFS0RXq0zo=";
};
patches = [

32
pkgs/development/python-modules/pytest-ordering/default.nix
View File

@ -1,32 +0,0 @@
{ lib, fetchFromGitHub, buildPythonPackage
, pytest }:
buildPythonPackage rec {
pname = "pytest-ordering";
version = "unstable-2019-06-19";
# Pypi lacks tests/
# Resolves PytestUnknownMarkWarning from pytest
src = fetchFromGitHub {
owner = "ftobia";
repo = pname;
rev = "492697ee26633cc31d329c1ceaa468375ee8ee9c";
sha256 = "1xim0kj5g37p1skgvp8gdylpx949krmx60w3pw6j1m1h7sakmddn";
};
nativeCheckInputs = [
pytest
];
checkPhase = ''
pytest tests
'';
meta = with lib; {
homepage = "https://github.com/ftobia/pytest-ordering";
description = "Pytest plugin to run your tests in a specific order";
license = licenses.mit;
broken = true; # See https://github.com/NixOS/nixpkgs/pull/122264
maintainers = with maintainers; [ eadwu ];
};
}

52
pkgs/development/python-modules/pytest-sanic/default.nix
View File

@ -1,52 +0,0 @@
{ lib
, aiohttp
, async_generator
, buildPythonPackage
, fetchFromGitHub
, httpx
, pytest
, pytestCheckHook
, sanic
, websockets
}:
buildPythonPackage rec {
pname = "pytest-sanic";
version = "1.9.1";
src = fetchFromGitHub {
owner = "yunstanford";
repo = pname;
rev = "v${version}";
hash = "sha256-82Xq/jyxTXyZVHqn7G+S9K++InDdORCO9oFqgaIgY7s=";
};
buildInputs = [
pytest
];
propagatedBuildInputs = [
aiohttp
async_generator
httpx
pytest
websockets
];
nativeCheckInputs = [
sanic
pytestCheckHook
];
pythonImportsCheck = [
"pytest_sanic"
];
meta = with lib; {
description = "A pytest plugin for Sanic";
homepage = "https://github.com/yunstanford/pytest-sanic/";
license = licenses.asl20;
maintainers = with maintainers; [ costrouc ];
broken = true; # 2021-11-04
};
}

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

@ -13,14 +13,14 @@
buildPythonPackage rec {
pname = "pyvex";
version = "9.2.56";
version = "9.2.57";
format = "pyproject";
disabled = pythonOlder "3.8";
src = fetchPypi {
inherit pname version;
hash = "sha256-8F33AoKh79tgly4gbvoUswjv49KzNYDh/xsh4viIcWM=";
hash = "sha256-UM4/ZDV6S/YVhrViUgv4w6U37ktgwxn/wuCK+weBtBs=";
};
nativeBuildInputs = [

2
pkgs/development/python-modules/readability-lxml/default.nix
View File

@ -35,7 +35,7 @@ buildPythonPackage rec {
broken = stdenv.isDarwin;
description = "Fast python port of arc90's readability tool";
homepage = "https://github.com/buriy/python-readability";
license = licenses.apsl20;
license = licenses.asl20;
maintainers = with maintainers; [ siraben ];
};
}

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