Merge remote-tracking branch 'origin/staging-next' into staging
This commit is contained in:
Martin Weinelt
commit
60f52f6c83
91 changed files with 7713 additions and 8286 deletions
|
|
@ -70,6 +70,46 @@
|
|||
deprecation</link>.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
The
|
||||
<link linkend="opt-services.snapserver.openFirewall">services.snapserver.openFirewall</link>
|
||||
module option default value has been changed from
|
||||
<literal>true</literal> to <literal>false</literal>. You will
|
||||
need to explicitely set this option to
|
||||
<literal>true</literal>, or configure your firewall.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
The
|
||||
<link linkend="opt-services.avahi.openFirewall">services.avahi.openFirewall</link>
|
||||
module option default value has been changed from
|
||||
<literal>true</literal> to <literal>false</literal>. You will
|
||||
need to explicitely set this option to
|
||||
<literal>true</literal>, or configure your firewall.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
The
|
||||
<link linkend="opt-services.tmate-ssh-server.openFirewall">services.tmate-ssh-server.openFirewall</link>
|
||||
module option default value has been changed from
|
||||
<literal>true</literal> to <literal>false</literal>. You will
|
||||
need to explicitely set this option to
|
||||
<literal>true</literal>, or configure your firewall.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
The
|
||||
<link linkend="opt-services.unifi-video.openFirewall">services.unifi-video.openFirewall</link>
|
||||
module option default value has been changed from
|
||||
<literal>true</literal> to <literal>false</literal>. You will
|
||||
need to explicitely set this option to
|
||||
<literal>true</literal>, or configure your firewall.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
The EC2 image module previously detected and automatically
|
||||
|
|
|
|||
|
|
@ -27,6 +27,14 @@ In addition to numerous new and upgraded packages, this release has the followin
|
|||
|
||||
- `services.sourcehut.dispatch` and the corresponding package (`sourcehut.dispatchsrht`) have been removed due to [upstream deprecation](https://sourcehut.org/blog/2022-08-01-dispatch-deprecation-plans/).
|
||||
|
||||
- The [services.snapserver.openFirewall](#opt-services.snapserver.openFirewall) module option default value has been changed from `true` to `false`. You will need to explicitely set this option to `true`, or configure your firewall.
|
||||
|
||||
- The [services.avahi.openFirewall](#opt-services.avahi.openFirewall) module option default value has been changed from `true` to `false`. You will need to explicitely set this option to `true`, or configure your firewall.
|
||||
|
||||
- The [services.tmate-ssh-server.openFirewall](#opt-services.tmate-ssh-server.openFirewall) module option default value has been changed from `true` to `false`. You will need to explicitely set this option to `true`, or configure your firewall.
|
||||
|
||||
- The [services.unifi-video.openFirewall](#opt-services.unifi-video.openFirewall) module option default value has been changed from `true` to `false`. You will need to explicitely set this option to `true`, or configure your firewall.
|
||||
|
||||
- The EC2 image module previously detected and automatically mounted ext3-formatted instance store devices and partitions in stage-1 (initramfs), storing `/tmp` on the first discovered device. This behaviour, which only catered to very specific use cases and could not be disabled, has been removed. Users relying on this should provide their own implementation, and probably use ext4 and perform the mount in stage-2.
|
||||
|
||||
- The EC2 image module previously detected and activated swap-formatted instance store devices and partitions in stage-1 (initramfs). This behaviour has been removed. Users relying on this should provide their own implementation.
|
||||
|
|
|
|||
|
|
@ -6,6 +6,12 @@
|
|||
with lib;
|
||||
|
||||
let
|
||||
# This is copied into the installer image, so it's important that it is filtered
|
||||
# to avoid including a large .git directory.
|
||||
# We also want the source name to be normalised to "source" to avoid depending on the
|
||||
# location of nixpkgs.
|
||||
# In the future we might want to expose the ISO image from the flake and use
|
||||
# `self.outPath` directly instead.
|
||||
nixpkgs = lib.cleanSource pkgs.path;
|
||||
|
||||
# We need a copy of the Nix expressions for Nixpkgs and NixOS on the
|
||||
|
|
@ -31,7 +37,14 @@ let
|
|||
in
|
||||
|
||||
{
|
||||
nix.registry.nixpkgs.flake.outPath = builtins.path { name = "source"; path = pkgs.path; };
|
||||
# Pin the nixpkgs flake in the installer to our cleaned up nixpkgs source.
|
||||
# FIXME: this might be surprising and is really only needed for offline installations,
|
||||
# see discussion in https://github.com/NixOS/nixpkgs/pull/204178#issuecomment-1336289021
|
||||
nix.registry.nixpkgs.to = {
|
||||
type = "path";
|
||||
path = nixpkgs;
|
||||
};
|
||||
|
||||
# Provide the NixOS/Nixpkgs sources in /etc/nixos. This is required
|
||||
# for nixos-install.
|
||||
boot.postBootCommands = mkAfter
|
||||
|
|
|
|||
|
|
@ -101,9 +101,7 @@ in {
|
|||
|
||||
openFirewall = mkOption {
|
||||
type = types.bool;
|
||||
# Make the behavior consistent with other services. Set the default to
|
||||
# false and remove the accompanying warning after NixOS 22.05 is released.
|
||||
default = true;
|
||||
default = false;
|
||||
description = lib.mdDoc ''
|
||||
Whether to automatically open the specified ports in the firewall.
|
||||
'';
|
||||
|
|
@ -279,12 +277,7 @@ in {
|
|||
# https://github.com/badaix/snapcast/blob/98ac8b2fb7305084376607b59173ce4097c620d8/server/streamreader/stream_manager.cpp#L85
|
||||
filter (w: w != "") (mapAttrsToList (k: v: if v.type == "spotify" then ''
|
||||
services.snapserver.streams.${k}.type = "spotify" is deprecated, use services.snapserver.streams.${k}.type = "librespot" instead.
|
||||
'' else "") cfg.streams)
|
||||
# Remove this warning after NixOS 22.05 is released.
|
||||
++ optional (options.services.snapserver.openFirewall.highestPrio >= (mkOptionDefault null).priority) ''
|
||||
services.snapserver.openFirewall will no longer default to true starting with NixOS 22.11.
|
||||
Enable it explicitly if you need to control Snapserver remotely.
|
||||
'';
|
||||
'' else "") cfg.streams);
|
||||
|
||||
systemd.services.snapserver = {
|
||||
after = [ "network.target" ];
|
||||
|
|
|
|||
|
|
@ -443,7 +443,7 @@ in {
|
|||
virtualHosts = lib.genAttrs cfg.webHosts (webHost: {
|
||||
locations = {
|
||||
${cfg.serve.virtualRoot}.extraConfig = "uwsgi_pass unix:/run/mailman-web.socket;";
|
||||
"${cfg.serve.virtualRoot}/static/".alias = webSettings.STATIC_ROOT + "/";
|
||||
"${removeSuffix "/" cfg.serve.virtualRoot}/static/".alias = webSettings.STATIC_ROOT + "/";
|
||||
};
|
||||
});
|
||||
};
|
||||
|
|
|
|||
|
|
@ -103,7 +103,7 @@ in
|
|||
|
||||
openFirewall = mkOption {
|
||||
type = types.bool;
|
||||
default = true;
|
||||
default = false;
|
||||
description = lib.mdDoc ''
|
||||
Whether to open the firewall for UDP port 5353.
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -44,7 +44,7 @@ in
|
|||
|
||||
openFirewall = mkOption {
|
||||
type = types.bool;
|
||||
default = true;
|
||||
default = false;
|
||||
description = mdDoc "Whether to automatically open the specified ports in the firewall.";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -148,7 +148,7 @@ in
|
|||
|
||||
openFirewall = mkOption {
|
||||
type = types.bool;
|
||||
default = true;
|
||||
default = false;
|
||||
description = lib.mdDoc ''
|
||||
Whether or not to open the required ports on the firewall.
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -1902,6 +1902,20 @@ in
|
|||
};
|
||||
|
||||
systemd.network.wait-online = {
|
||||
enable = mkOption {
|
||||
type = types.bool;
|
||||
default = true;
|
||||
example = false;
|
||||
description = lib.mdDoc ''
|
||||
Whether to enable the systemd-networkd-wait-online service.
|
||||
|
||||
systemd-networkd-wait-online can timeout and fail if there are no network interfaces
|
||||
available for it to manage. When systemd-networkd is enabled but a different service is
|
||||
responsible for managing the system's internet connection (for example, NetworkManager or
|
||||
connman are used to manage WiFi connections), this service is unnecessary and can be
|
||||
disabled.
|
||||
'';
|
||||
};
|
||||
anyInterface = mkOption {
|
||||
description = lib.mdDoc ''
|
||||
Whether to consider the network online when any interface is online, as opposed to all of them.
|
||||
|
|
@ -1983,6 +1997,7 @@ in
|
|||
};
|
||||
|
||||
systemd.services.systemd-networkd-wait-online = {
|
||||
inherit (cfg.wait-online) enable;
|
||||
wantedBy = [ "network-online.target" ];
|
||||
serviceConfig.ExecStart = [
|
||||
""
|
||||
|
|
|
|||
|
|
@ -17,9 +17,6 @@ in
|
|||
listenPort = port;
|
||||
};
|
||||
nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) ["unrar"];
|
||||
# Workaround for https://github.com/morpheus65535/bazarr/issues/1983
|
||||
# ("Crash when running without timezone info").
|
||||
time.timeZone = "UTC";
|
||||
};
|
||||
|
||||
testScript = ''
|
||||
|
|
|
|||
|
|
@ -1,40 +1,34 @@
|
|||
{ rustPlatform
|
||||
, runCommand
|
||||
, lib
|
||||
{ lib
|
||||
, rustPlatform
|
||||
, clangStdenv
|
||||
, fetchFromGitHub
|
||||
, linkFarm
|
||||
, fetchgit
|
||||
, fetchurl
|
||||
, runCommand
|
||||
, gn
|
||||
, ninja
|
||||
, makeWrapper
|
||||
, pkg-config
|
||||
, python2
|
||||
, python3
|
||||
, openssl
|
||||
, removeReferencesTo
|
||||
, xcbuild
|
||||
, SDL2
|
||||
, fontconfig
|
||||
, freetype
|
||||
, ninja
|
||||
, gn
|
||||
, llvmPackages
|
||||
, makeFontsConf
|
||||
, xorg
|
||||
, stdenv
|
||||
, darwin
|
||||
, libglvnd
|
||||
, libxkbcommon
|
||||
, stdenv
|
||||
, enableWayland ? stdenv.isLinux
|
||||
, wayland
|
||||
, xorg
|
||||
, xcbuild
|
||||
, Security
|
||||
, ApplicationServices
|
||||
, AppKit
|
||||
, Carbon
|
||||
, removeReferencesTo
|
||||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
|
||||
rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } rec {
|
||||
pname = "neovide";
|
||||
version = "0.10.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Kethku";
|
||||
owner = "neovide";
|
||||
repo = "neovide";
|
||||
rev = version;
|
||||
sha256 = "sha256-CcBiCcfOJzuq0DnokTUHpMdo7Ry29ugQ+N7Hk0R+cQE=";
|
||||
|
|
@ -52,35 +46,24 @@ rustPlatform.buildRustPackage rec {
|
|||
sha256 = "sha256-w5dw/lGm40gKkHPR1ji/L82Oa808Kuh8qaCeiqBLkLw=";
|
||||
};
|
||||
# The externals for skia are taken from skia/DEPS
|
||||
externals = lib.mapAttrs (n: fetchgit) (lib.importJSON ./skia-externals.json);
|
||||
externals = linkFarm "skia-externals" (lib.mapAttrsToList
|
||||
(name: value: { inherit name; path = fetchgit value; })
|
||||
(lib.importJSON ./skia-externals.json));
|
||||
in
|
||||
runCommand "source" {} (
|
||||
''
|
||||
cp -R ${repo} $out
|
||||
chmod -R +w $out
|
||||
runCommand "source" { } ''
|
||||
cp -R ${repo} $out
|
||||
chmod -R +w $out
|
||||
ln -s ${externals} $out/third_party/externals
|
||||
''
|
||||
;
|
||||
|
||||
mkdir -p $out/third_party/externals
|
||||
cd $out/third_party/externals
|
||||
'' + (builtins.concatStringsSep "\n" (lib.mapAttrsToList (name: value: "cp -ra ${value} ${name}") externals))
|
||||
);
|
||||
|
||||
SKIA_NINJA_COMMAND = "${ninja}/bin/ninja";
|
||||
SKIA_GN_COMMAND = "${gn}/bin/gn";
|
||||
LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib";
|
||||
|
||||
preConfigure = ''
|
||||
unset CC CXX
|
||||
'';
|
||||
|
||||
# test needs a valid fontconfig file
|
||||
FONTCONFIG_FILE = makeFontsConf { fontDirectories = [ ]; };
|
||||
SKIA_NINJA_COMMAND = "${ninja}/bin/ninja";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
makeWrapper
|
||||
python2 # skia-bindings
|
||||
python3 # rust-xcb
|
||||
llvmPackages.clang # skia
|
||||
pkg-config
|
||||
python3 # skia
|
||||
removeReferencesTo
|
||||
] ++ lib.optionals stdenv.isDarwin [ xcbuild ];
|
||||
|
||||
|
|
@ -91,21 +74,12 @@ rustPlatform.buildRustPackage rec {
|
|||
doCheck = false;
|
||||
|
||||
buildInputs = [
|
||||
openssl
|
||||
SDL2
|
||||
(fontconfig.overrideAttrs (old: {
|
||||
propagatedBuildInputs = [
|
||||
# skia is not compatible with freetype 2.11.0
|
||||
(freetype.overrideAttrs (old: rec {
|
||||
version = "2.10.4";
|
||||
src = fetchurl {
|
||||
url = "mirror://savannah/${old.pname}/${old.pname}-${version}.tar.xz";
|
||||
sha256 = "112pyy215chg7f7fmp2l9374chhhpihbh8wgpj5nj6avj3c59a46";
|
||||
};
|
||||
}))
|
||||
];
|
||||
}))
|
||||
] ++ lib.optionals stdenv.isDarwin [ Security ApplicationServices Carbon AppKit ];
|
||||
fontconfig
|
||||
rustPlatform.bindgenHook
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
darwin.apple_sdk.frameworks.AppKit
|
||||
];
|
||||
|
||||
postFixup = let
|
||||
libPath = lib.makeLibraryPath ([
|
||||
|
|
@ -138,10 +112,9 @@ rustPlatform.buildRustPackage rec {
|
|||
|
||||
meta = with lib; {
|
||||
description = "This is a simple graphical user interface for Neovim.";
|
||||
homepage = "https://github.com/Kethku/neovide";
|
||||
homepage = "https://github.com/neovide/neovide";
|
||||
changelog = "https://github.com/neovide/neovide/releases/tag/${version}";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ ck3d ];
|
||||
platforms = platforms.all;
|
||||
mainProgram = "neovide";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -48,13 +48,13 @@
|
|||
|
||||
mkDerivation rec {
|
||||
pname = "freecad";
|
||||
version = "0.20.1";
|
||||
version = "0.20.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "FreeCAD";
|
||||
repo = "FreeCAD";
|
||||
rev = version;
|
||||
hash = "sha256-r2lhFv4ReASteoVxwwiW9TdSckpaju6QE8UegxeY4rE=";
|
||||
hash = "sha256-v8hanhy0UE0o+XqqIH3ZUtVom3q0KGELcfXFRSDr0TA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ rustPlatform.buildRustPackage rec {
|
|||
Security
|
||||
];
|
||||
|
||||
dontUseCargoParallelTests = true;
|
||||
useNextest = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "CLI tool to input and store your ideas without leaving the terminal";
|
||||
|
|
|
|||
|
|
@ -19,13 +19,13 @@
|
|||
|
||||
mkDerivation rec {
|
||||
pname = "organicmaps";
|
||||
version = "2022.11.02-2";
|
||||
version = "2022.11.24-3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "organicmaps";
|
||||
repo = "organicmaps";
|
||||
rev = "${version}-android";
|
||||
sha256 = "sha256-E/lJDw1QMPT0QcaTOxEyJL4hmEFkq21vQkgZbssszJg=";
|
||||
sha256 = "sha256-4RW7/sCtOXxA8n0Jx4ksNGRg7r8ErujmyzbnA1pi6ng=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -40,8 +40,7 @@ rustPlatform.buildRustPackage rec {
|
|||
|
||||
postInstall = "make PREFIX=$out copy-data";
|
||||
|
||||
# Sometimes tests fail when run in parallel
|
||||
dontUseCargoParallelThreads = true;
|
||||
useNextest = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "A graphical client for plain-text protocols written in Rust with GTK. It currently supports the Gemini, Gopher and Finger protocols";
|
||||
|
|
|
|||
|
|
@ -17,6 +17,7 @@
|
|||
, xorg
|
||||
, mesa
|
||||
, libdrm
|
||||
, libappindicator
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
|
@ -55,6 +56,7 @@ stdenv.mkDerivation rec {
|
|||
coreutils
|
||||
openssl
|
||||
(lib.getLib udev)
|
||||
libappindicator
|
||||
];
|
||||
|
||||
unpackPhase = ''
|
||||
|
|
|
|||
51
pkgs/applications/networking/sniffnet/default.nix
Normal file
51
pkgs/applications/networking/sniffnet/default.nix
Normal file
|
|
@ -0,0 +1,51 @@
|
|||
{ lib
|
||||
, rustPlatform
|
||||
, fetchCrate
|
||||
, pkg-config
|
||||
, libpcap
|
||||
, stdenv
|
||||
, fontconfig
|
||||
, libGL
|
||||
, xorg
|
||||
, darwin
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "sniffnet";
|
||||
version = "1.0.1";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-8K774j04BOEuJjnFYjaSctPwBrKYYKqjFS2+PyxJ2FM=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-096i4wDdoJCICd0L2QNY+7cKHQnijK22zj4XaQNuko8=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
buildInputs = [
|
||||
libpcap
|
||||
] ++ lib.optionals stdenv.isLinux [
|
||||
fontconfig
|
||||
libGL
|
||||
xorg.libX11
|
||||
xorg.libXcursor
|
||||
xorg.libXi
|
||||
xorg.libXrandr
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
darwin.apple_sdk.frameworks.AppKit
|
||||
];
|
||||
|
||||
postFixup = lib.optionalString stdenv.isLinux ''
|
||||
patchelf $out/bin/sniffnet \
|
||||
--add-rpath ${lib.makeLibraryPath [ libGL xorg.libX11 ]}
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Cross-platform application to monitor your network traffic with ease";
|
||||
homepage = "https://github.com/gyulyvgc/sniffnet";
|
||||
changelog = "https://github.com/gyulyvgc/sniffnet/blob/main/CHANGELOG.md";
|
||||
license = with licenses; [ mit /* or */ asl20 ];
|
||||
maintainers = with maintainers; [ figsoda ];
|
||||
};
|
||||
}
|
||||
|
|
@ -28,6 +28,7 @@
|
|||
, rdkafka
|
||||
, udev
|
||||
, libevdev
|
||||
, alsa-lib
|
||||
, ...
|
||||
}:
|
||||
|
||||
|
|
@ -35,6 +36,11 @@ let
|
|||
inherit (darwin.apple_sdk.frameworks) CoreFoundation Security;
|
||||
in
|
||||
{
|
||||
alsa-sys = attrs: {
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ alsa-lib ];
|
||||
};
|
||||
|
||||
cairo-rs = attrs: {
|
||||
buildInputs = [ cairo ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,38 +1,15 @@
|
|||
{ lib, fetchurl, unzip }:
|
||||
{ lib, fetchzip }:
|
||||
|
||||
{ crateName ? args.pname
|
||||
, pname ? null
|
||||
, version
|
||||
, sha256
|
||||
, ... } @ args:
|
||||
, ...
|
||||
} @ args:
|
||||
|
||||
assert pname == null || pname == crateName;
|
||||
|
||||
lib.overrideDerivation (fetchurl ({
|
||||
|
||||
fetchzip ({
|
||||
name = "${crateName}-${version}.tar.gz";
|
||||
url = "https://crates.io/api/v1/crates/${crateName}/${version}/download";
|
||||
recursiveHash = true;
|
||||
|
||||
downloadToTemp = true;
|
||||
|
||||
postFetch =
|
||||
''
|
||||
export PATH=${unzip}/bin:$PATH
|
||||
|
||||
unpackDir="$TMPDIR/unpack"
|
||||
mkdir "$unpackDir"
|
||||
cd "$unpackDir"
|
||||
|
||||
renamed="$TMPDIR/${crateName}-${version}.tar.gz"
|
||||
mv "$downloadedFile" "$renamed"
|
||||
unpackFile "$renamed"
|
||||
fn=$(cd "$unpackDir" && echo *)
|
||||
if [ -f "$unpackDir/$fn" ]; then
|
||||
mkdir $out
|
||||
fi
|
||||
mv "$unpackDir/$fn" "$out"
|
||||
'';
|
||||
} // removeAttrs args [ "crateName" "pname" "version" ]))
|
||||
# Hackety-hack: we actually need unzip hooks, too
|
||||
(x: {nativeBuildInputs = x.nativeBuildInputs++ [unzip];})
|
||||
extension = "tar.gz";
|
||||
} // removeAttrs args [ "crateName" "pname" "version" ])
|
||||
|
|
|
|||
|
|
@ -225,7 +225,7 @@ let
|
|||
};
|
||||
|
||||
meta = with lib; {
|
||||
broken = stdenv.isDarwin;
|
||||
broken = stdenv.isDarwin && (isAarch64Darwin -> lib.versionOlder version "1.2.0");
|
||||
description = "A compiled language with Ruby like syntax and type inference";
|
||||
homepage = "https://crystal-lang.org/";
|
||||
license = licenses.asl20;
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
import ./generic.nix {
|
||||
major_version = "5";
|
||||
minor_version = "0";
|
||||
patch_version = "0-beta1";
|
||||
patch_version = "0-beta2";
|
||||
src = fetchTarball {
|
||||
url = "https://caml.inria.fr/pub/distrib/ocaml-5.0/ocaml-5.0.0~beta1.tar.xz";
|
||||
sha256 = "sha256:1kwb53ra5qbwiiyrx5da7l5mqkjf0fr3rqgkrm3wr83l25scimj4";
|
||||
url = "https://caml.inria.fr/pub/distrib/ocaml-5.0/ocaml-5.0.0~beta2.tar.xz";
|
||||
sha256 = "sha256:1r76a3wadidca9306wkkcxdh5l0rk93pc6xmbs46cc1jfm6pgwas";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,66 +1,24 @@
|
|||
diff --git a/Cargo.lock b/Cargo.lock
|
||||
index 4d699f11..1eb894fc 100644
|
||||
index 05e54911..3a567165 100644
|
||||
--- a/Cargo.lock
|
||||
+++ b/Cargo.lock
|
||||
@@ -875,15 +875,6 @@ version = "0.1.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "28988d872ab76095a6e6ac88d99b54fd267702734fd7ffe610ca27f533ddb95a"
|
||||
|
||||
-[[package]]
|
||||
-name = "openssl-src"
|
||||
-version = "300.0.2+3.0.0"
|
||||
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "14a760a11390b1a5daf72074d4f6ff1a6e772534ae191f999f57e9ee8146d1fb"
|
||||
-dependencies = [
|
||||
- "cc",
|
||||
-]
|
||||
-
|
||||
[[package]]
|
||||
name = "openssl-sys"
|
||||
version = "0.9.70"
|
||||
@@ -893,7 +884,6 @@ dependencies = [
|
||||
"autocfg 1.0.1",
|
||||
"cc",
|
||||
"libc",
|
||||
- "openssl-src",
|
||||
"pkg-config",
|
||||
"vcpkg",
|
||||
]
|
||||
@@ -1432,6 +1422,7 @@ dependencies = [
|
||||
"divrem",
|
||||
@@ -1826,6 +1826,7 @@ dependencies = [
|
||||
"futures",
|
||||
"fxhash",
|
||||
"git-version",
|
||||
+ "gmp-mpfr-sys",
|
||||
"hostname",
|
||||
"indexmap",
|
||||
"instructions-template",
|
||||
"hyper",
|
||||
"hyper-tls",
|
||||
diff --git a/Cargo.toml b/Cargo.toml
|
||||
index 8e81a947..d21a8d49 100644
|
||||
index 6e42de23..a50e3d47 100644
|
||||
--- a/Cargo.toml
|
||||
+++ b/Cargo.toml
|
||||
@@ -55,7 +55,7 @@ ring = "0.16.13"
|
||||
ripemd160 = "0.8.0"
|
||||
sha3 = "0.8.2"
|
||||
blake2 = "0.8.1"
|
||||
-openssl = { version = "0.10.29", features = ["vendored"] }
|
||||
+openssl = { version = "0.10.29" }
|
||||
native-tls = "0.2.4"
|
||||
chrono = "0.4.11"
|
||||
select = "0.4.3"
|
||||
@@ -66,10 +66,14 @@ sodiumoxide = "0.2.6"
|
||||
static_assertions = "1.1.0"
|
||||
slice-deque = "0.3.0"
|
||||
@@ -63,6 +63,7 @@ hyper = { version = "0.14", features = ["full"] }
|
||||
hyper-tls = "0.5.0"
|
||||
tokio = { version = "1", features = ["full"] }
|
||||
futures = "0.3"
|
||||
+gmp-mpfr-sys = { version = "1.4.10", features = ["use-system-libs"] }
|
||||
|
||||
+[dependencies.gmp-mpfr-sys]
|
||||
+version = "1.4"
|
||||
+features = ["use-system-libs"]
|
||||
+
|
||||
[dev-dependencies]
|
||||
assert_cmd = "1.0.3"
|
||||
predicates-core = "1.0.2"
|
||||
serial_test = "0.5.1"
|
||||
|
||||
[profile.release]
|
||||
-debug = true
|
||||
\ No newline at end of file
|
||||
+debug = true
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, rustPlatform
|
||||
, rustfmt
|
||||
, gmp
|
||||
|
|
@ -13,30 +12,21 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "scryer-prolog";
|
||||
version = "0.9.0";
|
||||
version = "0.9.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mthom";
|
||||
repo = "scryer-prolog";
|
||||
rev = "v${version}";
|
||||
sha256 = "3NHpEg6QaUaqbBCq8uM5hFcqS24q4XrOnKjMmn8Z1Dg=";
|
||||
sha256 = "bDLVOXX9nv6Guu5czRFkviJf7dBiaqt5O8SLUJlcBZo=";
|
||||
};
|
||||
|
||||
cargoPatches = [
|
||||
# Use system openssl, gmp, mpc and mpfr.
|
||||
./cargo.patch
|
||||
|
||||
./fix-tests.patch
|
||||
|
||||
# Avoid testing failing with "couldn't save history"
|
||||
(fetchpatch {
|
||||
name = "fix-tests-1";
|
||||
url = "https://patch-diff.githubusercontent.com/raw/mthom/scryer-prolog/pull/1342.patch";
|
||||
sha256 = "2N0AOkFuf+H/aUn2QTXgmqjmvShTxHxB6kNuNdNoVRI=";
|
||||
})
|
||||
];
|
||||
|
||||
cargoSha256 = "nqAHVXAmTW9mdE2L2yhpOTz16JbYgQUmCgiFq9pBzUU=";
|
||||
cargoSha256 = "A6HtvxGTjJliDMUSGkQKB13FRyfBU4EPvrlZ97ic0Ic=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config rustfmt];
|
||||
buildInputs = [ openssl gmp libmpc mpfr ];
|
||||
|
|
|
|||
|
|
@ -1,29 +0,0 @@
|
|||
diff --git a/tests/scryer/src_tests.rs b/tests/scryer/src_tests.rs
|
||||
index b0b9efb5..8fddd842 100644
|
||||
--- a/tests/scryer/src_tests.rs
|
||||
+++ b/tests/scryer/src_tests.rs
|
||||
@@ -46,24 +46,6 @@ fn rules() {
|
||||
load_module_test("src/tests/rules.pl", "");
|
||||
}
|
||||
|
||||
-#[serial]
|
||||
-#[test]
|
||||
-fn setup_call_cleanup_load() {
|
||||
- load_module_test(
|
||||
- "src/tests/setup_call_cleanup.pl",
|
||||
- "1+21+31+2>_17737+_177381+_158071+2>41+2>_177381+2>31+2>31+2>4ba"
|
||||
- );
|
||||
-}
|
||||
-
|
||||
-#[test]
|
||||
-fn setup_call_cleanup_process() {
|
||||
- run_top_level_test_with_args(
|
||||
- &["src/tests/setup_call_cleanup.pl", "-f", "-g", "halt"],
|
||||
- "",
|
||||
- "1+21+31+2>_19590+_195911+_176601+2>41+2>_195911+2>31+2>31+2>4ba"
|
||||
- );
|
||||
-}
|
||||
-
|
||||
#[serial]
|
||||
#[test]
|
||||
fn clpz_load() {
|
||||
|
|
@ -28,9 +28,9 @@ stdenv.mkDerivation rec {
|
|||
})
|
||||
];
|
||||
|
||||
# see the comment on stripPrefix
|
||||
configureFlags = []
|
||||
++ lib.optional stripPrefix "--with-jemalloc-prefix="
|
||||
configureFlags =
|
||||
# see the comment on stripPrefix
|
||||
lib.optional stripPrefix "--with-jemalloc-prefix="
|
||||
++ lib.optional disableInitExecTls "--disable-initial-exec-tls"
|
||||
# jemalloc is unable to correctly detect transparent hugepage support on
|
||||
# ARM (https://github.com/jemalloc/jemalloc/issues/526), and the default
|
||||
|
|
@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
|
|||
enableParallelBuilding = true;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "http://jemalloc.net";
|
||||
homepage = "https://jemalloc.net/";
|
||||
description = "General purpose malloc(3) implementation";
|
||||
longDescription = ''
|
||||
malloc(3)-compatible memory allocator that emphasizes fragmentation
|
||||
|
|
|
|||
|
|
@ -38,7 +38,9 @@ stdenv.mkDerivation rec {
|
|||
];
|
||||
|
||||
buildInputs = [
|
||||
cyrus_sasl
|
||||
(cyrus_sasl.override {
|
||||
inherit openssl;
|
||||
})
|
||||
db
|
||||
libsodium
|
||||
libtool
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@ in stdenv.mkDerivation rec {
|
|||
src = ./fix-paths.patch;
|
||||
utillinux = util-linux;
|
||||
})
|
||||
] ++ lib.optionals espeak.mbrolaSupport [
|
||||
] ++ lib.optionals (withEspeak && espeak.mbrolaSupport) [
|
||||
# Replace FHS paths.
|
||||
(substituteAll {
|
||||
src = ./fix-mbrola-paths.patch;
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, pkgsBuildHost
|
||||
, system
|
||||
, ...
|
||||
}:
|
||||
|
||||
let
|
||||
pkgs = import ../../../.. {
|
||||
inherit system;
|
||||
inherit (stdenv.hostPlatform) system;
|
||||
# Allow python27 with known security issues only for resholve,
|
||||
# see issue #201859 for the reasoning
|
||||
# In resholve case this should not be a security issue,
|
||||
|
|
|
|||
|
|
@ -1,6 +1,5 @@
|
|||
[
|
||||
"@angular/cli"
|
||||
, "@ansible/ansible-language-server"
|
||||
, "@antfu/ni"
|
||||
, "@antora/cli"
|
||||
, "@antora/site-generator-default"
|
||||
|
|
|
|||
14776
pkgs/development/node-packages/node-packages.nix
generated
14776
pkgs/development/node-packages/node-packages.nix
generated
File diff suppressed because it is too large
Load diff
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "adlfs";
|
||||
version = "2022.10.0";
|
||||
version = "2022.11.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -20,8 +20,8 @@ buildPythonPackage rec {
|
|||
src = fetchFromGitHub {
|
||||
owner = "fsspec";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-h/xcqb7G4uj4WNVE8is/s2LQ2NfzP1negh15G8B9YCs=";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-S6dJK5ZhDCSwM/14sTrXNJ/+dDe9OeDRemsnuoe4IW0=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -43,6 +43,7 @@ buildPythonPackage rec {
|
|||
meta = with lib; {
|
||||
description = "Filesystem interface to Azure-Datalake Gen1 and Gen2 Storage";
|
||||
homepage = "https://github.com/fsspec/adlfs";
|
||||
changelog = "https://github.com/fsspec/adlfs/blob/${version}/CHANGELOG.md";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "aioesphomeapi";
|
||||
version = "13.0.0";
|
||||
version = "13.0.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
|
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
|||
owner = "esphome";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-u+RaQcEfljgjK+7vMJj60WkvjozzRM5Z1Yaf4NkrF+U=";
|
||||
hash = "sha256-33iaM5+5OV9TAk3SAZWzJfwQbeDSPQiVLBPAAOyyFm0=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
18
pkgs/development/python-modules/ale-py/cmake-pybind11.patch
Normal file
18
pkgs/development/python-modules/ale-py/cmake-pybind11.patch
Normal file
|
|
@ -0,0 +1,18 @@
|
|||
diff --git a/src/python/CMakeLists.txt b/src/python/CMakeLists.txt
|
||||
index 911e280..d484943 100644
|
||||
--- a/src/python/CMakeLists.txt
|
||||
+++ b/src/python/CMakeLists.txt
|
||||
@@ -1,12 +1,6 @@
|
||||
find_package(Python3 COMPONENTS Interpreter Development.Module REQUIRED)
|
||||
|
||||
-include(FetchContent)
|
||||
-FetchContent_Declare(
|
||||
- pybind11
|
||||
- GIT_REPOSITORY https://github.com/pybind/pybind11
|
||||
- GIT_TAG v2.10.0)
|
||||
-FetchContent_MakeAvailable(pybind11)
|
||||
-
|
||||
+find_package(pybind11 REQUIRED)
|
||||
add_library(ale-py MODULE ale_python_interface.cpp)
|
||||
# Depend on the ALE and pybind11 module
|
||||
target_link_libraries(ale-py PUBLIC ale ale-lib)
|
||||
83
pkgs/development/python-modules/ale-py/default.nix
Normal file
83
pkgs/development/python-modules/ale-py/default.nix
Normal file
|
|
@ -0,0 +1,83 @@
|
|||
{ buildPythonPackage
|
||||
, SDL2
|
||||
, cmake
|
||||
, fetchFromGitHub
|
||||
, git
|
||||
, gym
|
||||
, importlib-metadata
|
||||
, importlib-resources
|
||||
, lib
|
||||
, ninja
|
||||
, numpy
|
||||
, pybind11
|
||||
, pytestCheckHook
|
||||
, python
|
||||
, pythonOlder
|
||||
, setuptools
|
||||
, stdenv
|
||||
, typing-extensions
|
||||
, wheel
|
||||
, zlib
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ale-py";
|
||||
version = "0.8.0";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mgbellemare";
|
||||
repo = "Arcade-Learning-Environment";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-OPAtCc2RapK1lALTKHd95bkigxcZ9bcONu32I/91HIg=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# don't download pybind11, use local pybind11
|
||||
./cmake-pybind11.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
setuptools
|
||||
wheel
|
||||
pybind11
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
zlib
|
||||
SDL2
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
typing-extensions
|
||||
importlib-resources
|
||||
numpy
|
||||
] ++ lib.optionals (pythonOlder "3.10") [
|
||||
importlib-metadata
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
gym
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace 'dynamic = ["version"]' 'version = "${version}"'
|
||||
substituteInPlace setup.py \
|
||||
--replace 'subprocess.check_output(["git", "rev-parse", "--short", "HEAD"], cwd=here)' 'b"${src.rev}"'
|
||||
'';
|
||||
|
||||
dontUseCmakeConfigure = true;
|
||||
|
||||
pythonImportsCheck = [ "ale_py" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "a simple framework that allows researchers and hobbyists to develop AI agents for Atari 2600 games";
|
||||
homepage = "https://github.com/mgbellemare/Arcade-Learning-Environment";
|
||||
license = licenses.gpl2;
|
||||
maintainers = with maintainers; [ billhuang ];
|
||||
broken = stdenv.isDarwin; # fails to link with missing library
|
||||
};
|
||||
}
|
||||
|
|
@ -7,14 +7,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "aliyun-python-sdk-cdn";
|
||||
version = "3.7.7";
|
||||
version = "3.7.8";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-Rqz4V6QunddSFeMyROROOL5T4MFPWK1gTorPpNWO8oQ=";
|
||||
hash = "sha256-alZBTwrImneGNXRWCJy/EhDKWT3/sy4j6BB5fOML8ZA=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -31,6 +31,7 @@ buildPythonPackage rec {
|
|||
meta = with lib; {
|
||||
description = "CDN module of Aliyun Python SDK";
|
||||
homepage = "https://github.com/aliyun/aliyun-openapi-python-sdk";
|
||||
changelog = "https://github.com/aliyun/aliyun-openapi-python-sdk/blob/master/aliyun-python-sdk-cdn/ChangeLog.txt";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -7,14 +7,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "aliyun-python-sdk-config";
|
||||
version = "2.2.1";
|
||||
version = "2.2.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-Me5z68cOfLt8PDHaZ1b/F/KG5mtYAW3LXmNd+0epha8=";
|
||||
hash = "sha256-cX3DqY8n0UEq9F1xOQI3IQi2Rc4cutcT0y3xc5G9dcg=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -31,6 +31,7 @@ buildPythonPackage rec {
|
|||
meta = with lib; {
|
||||
description = "Configuration module of Aliyun Python SDK";
|
||||
homepage = "https://github.com/aliyun/aliyun-openapi-python-sdk";
|
||||
changelog = "https://github.com/aliyun/aliyun-openapi-python-sdk/blob/master/aliyun-python-sdk-config/ChangeLog.txt";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -40,6 +40,7 @@ buildPythonPackage rec {
|
|||
meta = with lib; {
|
||||
description = "Core module of Aliyun Python SDK";
|
||||
homepage = "https://github.com/aliyun/aliyun-openapi-python-sdk";
|
||||
changelog = "https://github.com/aliyun/aliyun-openapi-python-sdk/blob/master/aliyun-python-sdk-core/ChangeLog.txt";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -31,6 +31,7 @@ buildPythonPackage rec {
|
|||
meta = with lib; {
|
||||
description = "DBFS module of Aliyun Python SDK";
|
||||
homepage = "https://github.com/aliyun/aliyun-openapi-python-sdk";
|
||||
changelog = "https://github.com/aliyun/aliyun-openapi-python-sdk/blob/master/aliyun-python-sdk-dbfs/ChangeLog.txt";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -7,14 +7,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "aliyun-python-sdk-iot";
|
||||
version = "8.45.0";
|
||||
version = "8.47.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-9vLc+Rp81P28lCs6KM8Dmt97lPlhnWd6hqZZDTdQEGk=";
|
||||
hash = "sha256-4NcobMGamIhBnACEQJ9Kvdvj9k4XjJx/Urx38nslAa8=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -31,6 +31,7 @@ buildPythonPackage rec {
|
|||
meta = with lib; {
|
||||
description = "IoT module of Aliyun Python SDK";
|
||||
homepage = "https://github.com/aliyun/aliyun-openapi-python-sdk";
|
||||
changelog = "https://github.com/aliyun/aliyun-openapi-python-sdk/blob/master/aliyun-python-sdk-iot/ChangeLog.txt";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -31,6 +31,7 @@ buildPythonPackage rec {
|
|||
meta = with lib; {
|
||||
description = "KMS module of Aliyun Python SDK";
|
||||
homepage = "https://github.com/aliyun/aliyun-openapi-python-sdk";
|
||||
changelog = "https://github.com/aliyun/aliyun-openapi-python-sdk/blob/master/aliyun-python-sdk-kms/ChangeLog.txt";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -31,6 +31,7 @@ buildPythonPackage rec {
|
|||
meta = with lib; {
|
||||
description = "STS module of Aliyun Python SDK";
|
||||
homepage = "https://github.com/aliyun/aliyun-openapi-python-sdk";
|
||||
changelog = "https://github.com/aliyun/aliyun-openapi-python-sdk/blob/master/aliyun-python-sdk-sts/ChangeLog.txt";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "boschshcpy";
|
||||
version = "0.2.37";
|
||||
version = "0.2.38";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
|||
owner = "tschamm";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-ax1tdqxY4VPuNdH9lJKh5Izmu03XALJ93x5zmSCbeJk=";
|
||||
sha256 = "sha256-PDS68JJsnKO2MVlNxvhlDEGuK7zlsGhCRVOLZ/TSlTM=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,8 +1,35 @@
|
|||
{ stdenv, lib, buildPythonPackage, fetchPypi, makeWrapper, isPy3k
|
||||
, python, twisted, jinja2, msgpack, zope_interface, sqlalchemy, alembic
|
||||
, python-dateutil, txaio, autobahn, pyjwt, pyyaml, treq, txrequests, pypugjs
|
||||
, boto3, moto, mock, lz4, setuptoolsTrial
|
||||
, buildbot-worker, buildbot-pkg, buildbot-plugins, parameterized, git, openssh
|
||||
{ lib
|
||||
, stdenv
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, makeWrapper
|
||||
, pythonOlder
|
||||
, python
|
||||
, twisted
|
||||
, jinja2
|
||||
, msgpack
|
||||
, zope_interface
|
||||
, sqlalchemy
|
||||
, alembic
|
||||
, python-dateutil
|
||||
, txaio
|
||||
, autobahn
|
||||
, pyjwt
|
||||
, pyyaml
|
||||
, treq
|
||||
, txrequests
|
||||
, pypugjs
|
||||
, boto3
|
||||
, moto
|
||||
, mock
|
||||
, lz4
|
||||
, setuptoolsTrial
|
||||
, buildbot-worker
|
||||
, buildbot-pkg
|
||||
, buildbot-plugins
|
||||
, parameterized
|
||||
, git
|
||||
, openssh
|
||||
, glibcLocales
|
||||
, nixosTests
|
||||
}:
|
||||
|
|
@ -17,7 +44,10 @@ let
|
|||
dontBuild = true;
|
||||
doCheck = false;
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
];
|
||||
|
||||
propagatedBuildInputs = plugins ++ package.propagatedBuildInputs;
|
||||
|
||||
installPhase = ''
|
||||
|
|
@ -33,11 +63,14 @@ let
|
|||
|
||||
package = buildPythonPackage rec {
|
||||
pname = "buildbot";
|
||||
version = "3.6.1";
|
||||
version = "3.7.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-ByJPkI0AHis+Ey1lSuMly4M6W4s/xes4eG0gPPJ3fZA=";
|
||||
hash = "sha256-YMLT1SP6NenJIUVTvr58GVrtNXHw+bhfgMpZu3revG4=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -96,8 +129,6 @@ let
|
|||
rm buildbot/test/integration/test_graphql.py
|
||||
'';
|
||||
|
||||
disabled = !isPy3k;
|
||||
|
||||
passthru = {
|
||||
inherit withPlugins;
|
||||
tests.buildbot = nixosTests.buildbot;
|
||||
|
|
@ -105,11 +136,12 @@ let
|
|||
};
|
||||
|
||||
meta = with lib; {
|
||||
broken = stdenv.isDarwin;
|
||||
homepage = "https://buildbot.net/";
|
||||
description = "An open-source continuous integration framework for automating software build, test, and release processes";
|
||||
homepage = "https://buildbot.net/";
|
||||
changelog = "https://github.com/buildbot/buildbot/releases/tag/v${version}";
|
||||
maintainers = with maintainers; [ ryansydnor lopsided98 ];
|
||||
license = licenses.gpl2;
|
||||
license = licenses.gpl2Only;
|
||||
broken = stdenv.isDarwin;
|
||||
};
|
||||
};
|
||||
in package
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ buildPythonPackage rec {
|
|||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-YmAO8o25uVk1KlyzFg79025KyiopXxWZVpfrvI0H8c4=";
|
||||
sha256 = "sha256-4BXCOLW5e7RuZEzyD+oRmS2I4oT2W3oTcH4ZPxwKKvU=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-MXCLaFXmZCzLp3nuzK2PW4aa1CC5JOXkvvswAbMwkXI=";
|
||||
sha256 = "sha256-t4xHfox6h5PY4+phdCQbClHd77+WfpUWErMZCEcMxu0=";
|
||||
};
|
||||
|
||||
# Remove unneccessary circular dependency on buildbot
|
||||
|
|
@ -34,7 +34,7 @@
|
|||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-U89IyfhgIjrf6XH5pFod89zDE9Ln817AHMBCRTPw4tQ=";
|
||||
sha256 = "sha256-JySn7QO+SgoXjVeV4wYwc9twr0Q2c/wsEspqeq038+k=";
|
||||
};
|
||||
|
||||
buildInputs = [ buildbot-pkg ];
|
||||
|
|
@ -56,7 +56,7 @@
|
|||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-vbf4mMbgCePXlPwQQWeC7knBP1WZhhhEggy1ULNESG8=";
|
||||
sha256 = "sha256-935eeF2kpT68lK/UMg8MZQOYEj7D8FaT9iSs/lNahYA=";
|
||||
};
|
||||
|
||||
buildInputs = [ buildbot-pkg ];
|
||||
|
|
@ -78,7 +78,7 @@
|
|||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-haLbaeE1aKhHRT5UsKABBeNBRRvt7bVKalT3doQU7SI=";
|
||||
sha256 = "sha256-3pHSiVoOZj2iCGfiz+tMWWMPHSBH5Ggp6e3+a8topsg=";
|
||||
};
|
||||
|
||||
buildInputs = [ buildbot-pkg ];
|
||||
|
|
@ -100,7 +100,7 @@
|
|||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-zarpv8kwJMFwfZYA+EqEc7636tKud9wXfAbrlZM4bB4=";
|
||||
sha256 = "sha256-5Qr1FeYIJG/qaFaTB7ScFN9uca+joHKE6FlfKwhubfo=";
|
||||
};
|
||||
|
||||
buildInputs = [ buildbot-pkg ];
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ buildPythonPackage (rec {
|
|||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-13I7sttnxO6vORFZzpOKmXu3PfwOpSGmXqvozrhzIm0=";
|
||||
sha256 = "sha256-Lc+FNrfXLfeEnDqNBs9R96jtoFEOCG2vLRWGKip/+VM=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ buildPythonPackage rec {
|
|||
src = fetchFromGitHub {
|
||||
owner = "poets-ai";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-FZmLriYhsX+zyQKCtCjbOy6MH+AvjzHRNUyaDSXGlLI=";
|
||||
};
|
||||
|
||||
|
|
@ -73,9 +73,9 @@ buildPythonPackage rec {
|
|||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
torch
|
||||
sh
|
||||
tensorflow
|
||||
torch
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
|
|
@ -89,6 +89,7 @@ buildPythonPackage rec {
|
|||
meta = with lib; {
|
||||
description = "Neural Networks framework based on Jax inspired by Keras and Haiku";
|
||||
homepage = "https://github.com/poets-ai/elegy";
|
||||
changelog = "https://github.com/poets-ai/elegy/releases/tag/${version}";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ ndl ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "elmax-api";
|
||||
version = "0.0.2";
|
||||
version = "0.0.3";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -17,8 +17,8 @@ buildPythonPackage rec {
|
|||
src = fetchFromGitHub {
|
||||
owner = "albertogeniola";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-YUnLi8+ibUgWoMFMgZPSPbpr286bnWBefxjOV7JfCuY=";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-ZqPDnIiFzxS6nU19bfEgnqEsuz7oI+Z4ac6br6Gr4Vk=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -37,6 +37,7 @@ buildPythonPackage rec {
|
|||
meta = with lib; {
|
||||
description = "Python library for interacting with the Elmax cloud";
|
||||
homepage = "https://github.com/albertogeniola/elmax-api";
|
||||
changelog = "https://github.com/albertogeniola/elmax-api/releases/tag/v${version}";
|
||||
license = with licenses; [ asl20 ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "fakeredis";
|
||||
version = "2.1.0";
|
||||
version = "2.2.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -25,7 +25,7 @@ buildPythonPackage rec {
|
|||
owner = "dsoftwareinc";
|
||||
repo = "fakeredis-py";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-d+colAAESTt2YME8URX3e/l6GsC1l0vzg3wY/NQPkDk=";
|
||||
hash = "sha256-W24DMVp3E6SYaVTUYCRDm/tLaGcjDqecO3rN1RO/J84=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
, pythonOlder
|
||||
, fetchFromGitHub
|
||||
, opencv4
|
||||
, pytorch
|
||||
, torch
|
||||
, onnx
|
||||
, onnxruntime
|
||||
, pillow
|
||||
|
|
@ -14,6 +14,7 @@
|
|||
buildPythonPackage rec {
|
||||
pname = "invisible-watermark";
|
||||
version = "0.1.5";
|
||||
format = "setuptools";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
|
|
@ -25,7 +26,7 @@ buildPythonPackage rec {
|
|||
|
||||
propagatedBuildInputs = [
|
||||
opencv4
|
||||
pytorch
|
||||
torch
|
||||
onnx
|
||||
onnxruntime
|
||||
pillow
|
||||
|
|
|
|||
|
|
@ -6,29 +6,43 @@
|
|||
, pybind11
|
||||
, pytestCheckHook
|
||||
, setuptools
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "mapbox-earcut";
|
||||
version = "1.0.0";
|
||||
version = "1.0.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "skogler";
|
||||
repo = "mapbox_earcut_python";
|
||||
rev = "v${version}";
|
||||
sha256 = "m4q2qTL55fkdi3hm75C3/XV9SUQkpJS+B5SEgpPEctk=";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-+Vxvo++bkoCsJFmt/u1eaqhgpz8Uddz06iIi66ju+MQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools pybind11 ];
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
pybind11
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [ numpy ];
|
||||
propagatedBuildInputs = [
|
||||
numpy
|
||||
];
|
||||
|
||||
checkInputs = [ pytestCheckHook ];
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "mapbox_earcut" ];
|
||||
pythonImportsCheck = [
|
||||
"mapbox_earcut"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/skogler/mapbox_earcut_python";
|
||||
changelog = "https://github.com/skogler/mapbox_earcut_python/releases/tag/v${version}";
|
||||
license = licenses.isc;
|
||||
description = "Mapbox-earcut fast triangulation of 2D-polygons";
|
||||
longDescription = ''
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "oauthlib";
|
||||
version = "3.2.1";
|
||||
version = "3.2.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
|||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-9Du0REnN7AkvMmejXsWc7Uy+YF8MYeLK+QnYHbrPhPA=";
|
||||
hash = "sha256-KADS1pEaLYi86LEt2VVuz8FVTBANzxC8EeQLgGMxuBU=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyswitchbot";
|
||||
version = "0.20.8";
|
||||
version = "0.22.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
|||
owner = "Danielhiversen";
|
||||
repo = "pySwitchbot";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-fSuWpxao56WSfgW3ZEhcyfWuVG9ebLVfBHK1GN1Nffk=";
|
||||
hash = "sha256-/FECjJ/iVx4CTtOgxpPBF0lZCctghmD4qUrQQYwmAkQ=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "sentry-sdk";
|
||||
version = "1.11.0";
|
||||
version = "1.11.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -49,7 +49,7 @@ buildPythonPackage rec {
|
|||
owner = "getsentry";
|
||||
repo = "sentry-python";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-PObYXwWYQ7cC//W3c+n/qceu2ShjFqMGAaLyNflwcL4=";
|
||||
hash = "sha256-2AAi9BrF15TDiv9v2d/UF9JPgJheet33k+7iHqPlw5g=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "slack-sdk";
|
||||
version = "3.19.4";
|
||||
version = "3.19.5";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
|
@ -30,7 +30,7 @@ buildPythonPackage rec {
|
|||
owner = "slackapi";
|
||||
repo = "python-slack-sdk";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-cSPua601vQRJ431Sh02CLFtNb7pqbrkJ5ned/NjKM4s=";
|
||||
hash = "sha256-/DVcnfHjvmRreHSlZbzxz6pbqytEUdqbaGbQVxIW4Qk=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -15,16 +15,16 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "slowapi";
|
||||
version = "0.1.6";
|
||||
version = "0.1.7";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "laurentS";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-3ZkQnroHMCHuTPH/cvi/iWndvdyQ/ZJQ2Qtu1CZyeGg=";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-IAB7JW8iVb5M610GVK0POXlSiya22KzNgr26BNvPC4Q=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -65,6 +65,7 @@ buildPythonPackage rec {
|
|||
meta = with lib; {
|
||||
description = "Python library for API rate limiting";
|
||||
homepage = "https://github.com/laurentS/slowapi";
|
||||
changelog = "https://github.com/laurentS/slowapi/blob/v${version}/CHANGELOG.md";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -4,19 +4,26 @@
|
|||
, sphinx
|
||||
, pytestCheckHook
|
||||
, beautifulsoup4
|
||||
, setuptools-scm
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "sphinxext-opengraph";
|
||||
version = "0.6.3";
|
||||
version = "0.7.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wpilibsuite";
|
||||
repo = "sphinxext-opengraph";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-YR6TlsmND5IhLdbPbmtVhRN2vSZfx70g2a6Yn6y6L/M=";
|
||||
hash = "sha256-KzbtuDTMXsp9yf3hiiG6VzpUbSEm3bOtujApsG37H14=";
|
||||
};
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools-scm
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
sphinx
|
||||
];
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "teslajsonpy";
|
||||
version = "3.4.0";
|
||||
version = "3.4.1";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -24,7 +24,7 @@ buildPythonPackage rec {
|
|||
owner = "zabuldon";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-R3/Oh1sQCTPooL6+wNz2KD9NlxxshslT4DgSkga0x8k=";
|
||||
hash = "sha256-RPCzxcuD57ma306GLYsxxvvvZ0e8RTd/KxOeMSaQQQQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "ttls";
|
||||
version = "1.4.3";
|
||||
version = "1.5.1";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -18,8 +18,8 @@ buildPythonPackage rec {
|
|||
src = fetchFromGitHub {
|
||||
owner = "jschlyter";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-lBmkfB7HXB+1xLbfOl4wVtsOVfKhztoDBqzV8i6bFAg=";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-Oh70mLwTaJ2+uQDr2t6wAgskW5L06mZxtD/8dE01YA0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -42,6 +42,7 @@ buildPythonPackage rec {
|
|||
meta = with lib; {
|
||||
description = "Module to interact with Twinkly LEDs";
|
||||
homepage = "https://github.com/jschlyter/ttls";
|
||||
changelog = "https://github.com/jschlyter/ttls/blob/v${version}/CHANGES.md";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "ttp-templates";
|
||||
version = "0.3.1";
|
||||
version = "0.3.2";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -16,7 +16,7 @@ buildPythonPackage rec {
|
|||
owner = "dmulyalin";
|
||||
repo = "ttp_templates";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-35Ej76E9qy5EY41Jt2GDCldyXq7IkdqKxVFrBOJh9nE=";
|
||||
hash = "sha256-Bm9//hahM1sP/XDUDR7JcGWz0qF8ovkWZU5x/qj0UZg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -34,6 +34,7 @@ buildPythonPackage rec {
|
|||
meta = with lib; {
|
||||
description = "Template Text Parser Templates collections";
|
||||
homepage = "https://github.com/dmulyalin/ttp_templates";
|
||||
changelog = "https://github.com/dmulyalin/ttp_templates/releases/tag/${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "twilio";
|
||||
version = "7.15.3";
|
||||
version = "7.15.4";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
|
@ -23,7 +23,7 @@ buildPythonPackage rec {
|
|||
owner = "twilio";
|
||||
repo = "twilio-python";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-c1UNqp8eYK9tkogpcDtTOTHa5ME+yOkop2UccXwOAqM=";
|
||||
hash = "sha256-V7JLFesMj0W6k9+svgIBAfemDWiyi7DGdFLBk4/wd+8=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -53,6 +53,7 @@ buildPythonPackage rec {
|
|||
meta = with lib; {
|
||||
description = "Twilio API client and TwiML generator";
|
||||
homepage = "https://github.com/twilio/twilio-python/";
|
||||
changelog = "https://github.com/twilio/twilio-python/blob/${version}/CHANGES.md";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -4,29 +4,31 @@
|
|||
, pythonOlder
|
||||
, pytestCheckHook
|
||||
, python-socks
|
||||
, six
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "websocket-client";
|
||||
version = "1.4.1";
|
||||
disabled = pythonOlder "3.6";
|
||||
version = "1.4.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-+WEetlyCQaZ/s3O+8ECzz4rTd6n2VGoStiC2UR6Oqe8=";
|
||||
hash = "sha256-1uj5DKji3U6AJ8RWGt65RWtUBEMS26ZV58rmUs65rlk=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
python-socks
|
||||
six
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "websocket" ];
|
||||
pythonImportsCheck = [
|
||||
"websocket"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Websocket client for Python";
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "weconnect-mqtt";
|
||||
version = "0.40.3";
|
||||
version = "0.41.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
|||
owner = "tillsteinbach";
|
||||
repo = "WeConnect-mqtt";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-kV4BWQ4XfB2QjXY5b46+pxt3rhyo1glKRYO2mMJNhJM=";
|
||||
hash = "sha256-RYxfz5uBWV1HLbcIK1N/glJv2w0nfPLBPyM2b7HuDIY=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -47,6 +47,7 @@ buildPythonPackage rec {
|
|||
meta = with lib; {
|
||||
description = "Python client that publishes data from Volkswagen WeConnect";
|
||||
homepage = "https://github.com/tillsteinbach/WeConnect-mqtt";
|
||||
changelog = "https://github.com/tillsteinbach/WeConnect-mqtt/releases/tag/v${version}";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "weconnect";
|
||||
version = "0.48.3";
|
||||
version = "0.50.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
|||
owner = "tillsteinbach";
|
||||
repo = "WeConnect-python";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-GXTjG/3Gk58C6TxKrgtblUZI+xf7Te9OA8HnDvNEIvA=";
|
||||
hash = "sha256-KYGNtUJXpY1UrRbUxr71EHxLCR6WixTAk+ybkfqB3Ps=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -48,7 +48,7 @@ buildPythonPackage rec {
|
|||
--replace "setup_requires=SETUP_REQUIRED," "setup_requires=[]," \
|
||||
--replace "tests_require=TEST_REQUIRED," "tests_require=[],"
|
||||
substituteInPlace image_extra_requirements.txt \
|
||||
--replace "pillow~=9.2.0" "pillow"
|
||||
--replace "pillow~=9.3.0" "pillow"
|
||||
substituteInPlace pytest.ini \
|
||||
--replace "--cov=weconnect --cov-config=.coveragerc --cov-report html" "" \
|
||||
--replace "pytest-cov" ""
|
||||
|
|
@ -61,6 +61,7 @@ buildPythonPackage rec {
|
|||
meta = with lib; {
|
||||
description = "Python client for the Volkswagen WeConnect Services";
|
||||
homepage = "https://github.com/tillsteinbach/WeConnect-python";
|
||||
changelog = "https://github.com/tillsteinbach/WeConnect-python/releases/tag/v${version}";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -7,14 +7,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "winacl";
|
||||
version = "0.1.5";
|
||||
version = "0.1.6";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-8/dLFbzn7ARuJ27MA8LSMCykBdEntYQXuOyj/yqjaWE=";
|
||||
hash = "sha256-GAw3Vgej9v8gSIpMaN2pbOptWsqTvC0Kph70yfj2LDQ=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -36,6 +36,7 @@ buildPythonPackage rec {
|
|||
meta = with lib; {
|
||||
description = "Python module for ACL/ACE/Security descriptor manipulation";
|
||||
homepage = "https://github.com/skelsec/winacl";
|
||||
changelog = "https://github.com/skelsec/winacl/releases/tag/${version}";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
|
|
|
|||
43
pkgs/development/tools/ansible-language-server/default.nix
Normal file
43
pkgs/development/tools/ansible-language-server/default.nix
Normal file
|
|
@ -0,0 +1,43 @@
|
|||
{ lib
|
||||
, buildNpmPackage
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "ansible-language-server";
|
||||
version = "1.0.2-next.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ansible";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-E4xWwqXl5n/eChJ8JM32K2gTYE/F8Y76J3Sll++48Uo=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-8FP6hF85w1Zbhiwi2V350ZWFAykAfvsXRGL8bvGk1XE=";
|
||||
npmBuildScript = "compile";
|
||||
|
||||
# We remove the prepare and prepack scripts because they run the
|
||||
# build script, and therefore are redundant.
|
||||
#
|
||||
# Additionally, the prepack script runs npm ci in addition to the
|
||||
# build script. Directly before npm pack is run, we make npm unaware
|
||||
# of the dependency cache, causing the npm ci invocation to fail,
|
||||
# wiping out node_modules, which causes a mysterious error stating that tsc isn't installed.
|
||||
postPatch = ''
|
||||
sed -i '/"prepare"/d' package.json
|
||||
sed -i '/"prepack"/d' package.json
|
||||
'';
|
||||
|
||||
passthru.updateScript = {
|
||||
attrPath = pname;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
changelog = "https://github.com/ansible/ansible-language-server/releases/tag/v${version}";
|
||||
description = "Ansible Language Server";
|
||||
homepage = "https://github.com/ansible/ansible-language-server";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ hexa ];
|
||||
};
|
||||
}
|
||||
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "appthreat-depscan";
|
||||
version = "3.2.3";
|
||||
version = "3.2.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "AppThreat";
|
||||
repo = "dep-scan";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-VWFYgRIpEmOpOonazoRF0wPUfAiOu90gxm22M6Wkvgo=";
|
||||
hash = "sha256-nHKEELQzcMKvxAC+u4lPBglsMwyzRpiQF3O+felHTbk=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
|
|
|
|||
|
|
@ -1,24 +1,31 @@
|
|||
{ lib, buildGoModule, fetchFromGitHub, installShellFiles }:
|
||||
{ lib
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
, installShellFiles
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "metal-cli";
|
||||
version = "0.11.0";
|
||||
version = "0.12.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "equinix";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-tbnG/MF83cAnsG2LOqdQSGF2XT+UWSzIpxVbkolzEQQ=";
|
||||
hash = "sha256-oPMojw6CGncBJ8PZOTrzvQu2gRs1cw1Jwi38eOZggI8=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-drsNZXLNUWICLI8D+IvJE4X8GmWrP9U3dmpf9HnKCWw=";
|
||||
vendorHash = "sha256-drsNZXLNUWICLI8D+IvJE4X8GmWrP9U3dmpf9HnKCWw=";
|
||||
|
||||
ldflags = [
|
||||
"-s" "-w"
|
||||
"-s"
|
||||
"-w"
|
||||
"-X github.com/equinix/metal-cli/cmd.Version=${version}"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
installShellCompletion --cmd metal \
|
||||
|
|
@ -30,6 +37,7 @@ buildGoModule rec {
|
|||
doCheck = false;
|
||||
|
||||
doInstallCheck = true;
|
||||
|
||||
installCheckPhase = ''
|
||||
$out/bin/metal --version | grep ${version}
|
||||
'';
|
||||
|
|
@ -37,6 +45,7 @@ buildGoModule rec {
|
|||
meta = with lib; {
|
||||
description = "Official Equinix Metal CLI";
|
||||
homepage = "https://github.com/equinix/metal-cli/";
|
||||
changelog = "https://github.com/equinix/metal-cli/releases/tag/v${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ Br1ght0ne nshalman ];
|
||||
mainProgram = "metal";
|
||||
|
|
|
|||
|
|
@ -1,30 +1,44 @@
|
|||
{ lib
|
||||
, runCommand
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
, stdenv
|
||||
, runCommand
|
||||
, tree-sitter
|
||||
, coreutils
|
||||
}:
|
||||
|
||||
let
|
||||
# copied from flake.nix
|
||||
# tests require extra setup with nix
|
||||
custom = runCommand "custom" { } ''
|
||||
mkdir -p $out/bin
|
||||
touch $out/bin/{'foo$','foo"`'}
|
||||
chmod +x $out/bin/{'foo$','foo"`'}
|
||||
'';
|
||||
in
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "patsh";
|
||||
version = "0.1.3";
|
||||
version = "0.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nix-community";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-KmQVZwZC7KHlzNnL2IKQ76wHUDNUZKz/aFaY4ujvBo4=";
|
||||
sha256 = "sha256-7HXJspebluQeejKYmVA7sy/F3dtU1gc4eAbKiPexMMA=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-vozQKBxAVELdqTnqBpgHX0Wyk18EZAtpiRsKjwz8xKE=";
|
||||
cargoSha256 = "sha256-R6ScpLYbEJAu7+CyJsMdljtXq7wsMojHK5O1lH+E/E8=";
|
||||
|
||||
# tests fail on darwin due to rpath issues
|
||||
doCheck = !stdenv.isDarwin;
|
||||
checkInputs = [ custom ];
|
||||
|
||||
TREE_SITTER_BASH = runCommand "tree-sitter-bash" { } ''
|
||||
mkdir $out
|
||||
ln -s ${tree-sitter.builtGrammars.tree-sitter-bash}/parser $out/libtree-sitter-bash.a
|
||||
# see comment on `custom`
|
||||
postPatch = ''
|
||||
for file in tests/fixtures/*-expected.sh; do
|
||||
substituteInPlace $file \
|
||||
--subst-var-by cc ${stdenv.cc} \
|
||||
--subst-var-by coreutils ${coreutils} \
|
||||
--subst-var-by custom ${custom}
|
||||
done
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -9,16 +9,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-guppy";
|
||||
version = "unstable-2022-11-07";
|
||||
version = "unstable-2022-12-05";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "guppy-rs";
|
||||
repo = "guppy";
|
||||
rev = "40d66ee25a12657c36b9cef67293fc4c296a144f";
|
||||
sha256 = "sha256-f+xUifb7TlaXONNQfFZpnuYDTxgkelL+Knc+X8vc3Gg=";
|
||||
rev = "4dad33053d3047293da35ade33158b709fe8bb23";
|
||||
sha256 = "sha256-CWyXNBBo+yyF2s6BT6FFu6CI7xId38vsyg0uSezsusc=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-qRFJJX/5hgveGAQtW0HJYAPZjHRlTHalvqSRdEjtYiU=";
|
||||
cargoSha256 = "sha256-jwfZ5FH2qlzmxKT9LTXkmvwL5fhKljUPYwYXXqDRDXc=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
|
|
|||
|
|
@ -2,14 +2,14 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-hakari";
|
||||
version = "0.9.16";
|
||||
version = "0.9.17";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-V4rCtqt3HmvAtanithYAJv9FMt/g2R5JCJUwKITnoV4=";
|
||||
sha256 = "sha256-FgG9sdXZhSlX4p3I9WL5ORN7FCg4Zgt/Y+GRCWhIoP8=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-IGxKIgV7UtPrNAFEzKNJfPiSZ8lW2S2M7AJ7sigCWzQ=";
|
||||
cargoHash = "sha256-pYjjiQUnBfZ9wQgXhm4c+A7zMAF9k/Mzl5ccPX407/A=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Manage workspace-hack packages to speed up builds in large workspaces.";
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-nextest";
|
||||
version = "0.9.44";
|
||||
version = "0.9.45";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nextest-rs";
|
||||
repo = "nextest";
|
||||
rev = "cargo-nextest-${version}";
|
||||
sha256 = "sha256-hEBRwezymduUlPZTAHAmK5Xkc/6nGr/JDL5TDWUiZO0=";
|
||||
sha256 = "sha256-Sb5xJCxUz60TfDMqv7Q7hTRVXvligpWkTG4FRAO/H3c=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-i7XYDy9NVOszanCGDaoPkc6z5DV8vm6TsekqBkV5eRA=";
|
||||
cargoSha256 = "sha256-LzhrPQXr+CfzNoMWrPekDvtoPn0iqLhBV+3NO5AV0Po=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ Security ];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,23 +1,23 @@
|
|||
{ lib, stdenv, fetchFromGitHub, rustPlatform, installShellFiles, AppKit, Security }:
|
||||
{ lib, rustPlatform, fetchCrate, installShellFiles, stdenv, darwin }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "the-way";
|
||||
version = "0.17.1";
|
||||
version = "0.18.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "out-of-cheese-error";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Imo1CUk2H4/K9w/FnIBEkKFXd7OIAuApejcNY+rs7JU=";
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-UgD9ulJtRlNuux80FQhgLYjJ6OsyWXZCBGY9qdmd9Jk=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-z5+71I/q1+vz2CPAU06yjRSjpKyT6npjPi48lu21NZs=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ AppKit Security ];
|
||||
buildInputs = lib.optionals stdenv.isDarwin [
|
||||
darwin.apple_sdk.frameworks.AppKit
|
||||
];
|
||||
|
||||
cargoSha256 = "sha256-3ZiNRXrb3gpXXOxztf0eimJE16PpQTD/OWFmeTDIr2w=";
|
||||
checkFlagsArray = lib.optionals stdenv.isDarwin [ "--skip=copy" ];
|
||||
dontUseCargoParallelTests = true;
|
||||
useNextest = true;
|
||||
|
||||
postInstall = ''
|
||||
$out/bin/the-way config default tmp.toml
|
||||
|
|
@ -30,7 +30,8 @@ rustPlatform.buildRustPackage rec {
|
|||
meta = with lib; {
|
||||
description = "Terminal code snippets manager";
|
||||
homepage = "https://github.com/out-of-cheese-error/the-way";
|
||||
changelog = "https://github.com/out-of-cheese-error/the-way/blob/v${version}/CHANGELOG.md";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ numkem ];
|
||||
maintainers = with maintainers; [ figsoda numkem ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
106
pkgs/misc/cups/drivers/kyodialog/default.nix
Normal file
106
pkgs/misc/cups/drivers/kyodialog/default.nix
Normal file
|
|
@ -0,0 +1,106 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchzip
|
||||
, cups
|
||||
, autoPatchelfHook
|
||||
, python3Packages
|
||||
|
||||
# Sets the default paper format: use "EU" for A4, or "Global" for Letter
|
||||
, region ? "EU"
|
||||
# optional GUI, quite redundant to CUPS admin web GUI
|
||||
, withQtGui ? false
|
||||
, qt5
|
||||
}:
|
||||
|
||||
# Open issues:
|
||||
#
|
||||
# Printing in grayscale mode (e.g. the test page) generates a warning
|
||||
# > [Job 59] Grayscale/monochrome printing requested for this job but Poppler is not able to convert to grayscale/monochrome PostScript.
|
||||
# > [Job 59] Use \"pdftops-renderer\" option (see cups-filters README file) to use Ghostscript or MuPDF for the PDF -> PostScript conversion.
|
||||
#
|
||||
# This is related to https://github.com/OpenPrinting/cups-filters/issues/169.
|
||||
|
||||
assert region == "Global" || region == "EU";
|
||||
|
||||
let
|
||||
kyodialog_version = "9.2";
|
||||
date = "20220928";
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cups-kyodialog";
|
||||
version = "${kyodialog_version}-${date}";
|
||||
|
||||
dontStrip = true;
|
||||
|
||||
src = fetchzip {
|
||||
urls = [
|
||||
"https://www.kyoceradocumentsolutions.us/content/download-center-americas/us/drivers/drivers/KyoceraLinuxPackages_${date}_tar_gz.download.gz"
|
||||
"https://web.archive.org/web/20221122230412/https://www.kyoceradocumentsolutions.us/content/download-center-americas/us/drivers/drivers/KyoceraLinuxPackages_${date}_tar_gz.download.gz"
|
||||
];
|
||||
sha256 = "sha256-WCHuAQO2T6S8JtRsI2Yf/ypeCLMH365Ax/qX+Ah2s3k=";
|
||||
extension = "tar.gz";
|
||||
stripRoot = false;
|
||||
postFetch = ''
|
||||
# delete redundant Linux package dirs to reduce size in the Nix store; only keep Debian
|
||||
rm -r $out/{CentOS,Fedora,OpenSUSE,Redhat,Ubuntu}
|
||||
'';
|
||||
};
|
||||
|
||||
sourceRoot = ".";
|
||||
|
||||
unpackCmd = let
|
||||
platforms = {
|
||||
x86_64-linux = "amd64";
|
||||
i686-linux = "i386";
|
||||
};
|
||||
platform = platforms.${stdenv.hostPlatform.system} or (throw "unsupported system: ${stdenv.hostPlatform.system}");
|
||||
in ''
|
||||
ar p "$src/Debian/${region}/kyodialog_${platform}/kyodialog_${kyodialog_version}-0_${platform}.deb" data.tar.gz | tar -xz
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ autoPatchelfHook python3Packages.wrapPython ]
|
||||
++ lib.optionals withQtGui [ qt5.wrapQtAppsHook ];
|
||||
|
||||
buildInputs = [ cups ] ++ lib.optionals withQtGui [ qt5.qtbase ];
|
||||
|
||||
# For lib/cups/filter/kyofilter_pre_H.
|
||||
# The source already contains a copy of pypdf3, but we use the Nix package
|
||||
propagatedBuildInputs = with python3Packages; [ reportlab pypdf3 setuptools ];
|
||||
|
||||
installPhase = ''
|
||||
# allow cups to find the ppd files
|
||||
mkdir -p $out/share/cups/model
|
||||
mv ./usr/share/kyocera${kyodialog_version}/ppd${kyodialog_version} $out/share/cups/model/Kyocera
|
||||
|
||||
# remove absolute path prefixes to filters in ppd
|
||||
find $out -name "*.ppd" -exec sed -E -i "s:/usr/lib/cups/filter/::g" {} \;
|
||||
|
||||
|
||||
mkdir -p $out/lib/cups/
|
||||
mv ./usr/lib/cups/filter/ $out/lib/cups/
|
||||
# for lib/cups/filter/kyofilter_pre_H
|
||||
wrapPythonProgramsIn $out/lib/cups/filter "$propagatedBuildInputs"
|
||||
|
||||
|
||||
install -Dm444 usr/share/doc/kyodialog/copyright $out/share/doc/${pname}/copyright
|
||||
'' + lib.optionalString withQtGui ''
|
||||
install -D usr/bin/kyoPPDWrite_H $out/bin/kyoPPDWrite_H
|
||||
install -D usr/bin/kyodialog${kyodialog_version} $out/bin/kyodialog
|
||||
|
||||
install -Dm444 usr/share/kyocera${kyodialog_version}/appicon_H.png $out/share/${pname}/icons/appicon_H.png
|
||||
|
||||
install -Dm444 usr/share/applications/kyodialog${kyodialog_version}.desktop $out/share/applications/kyodialog.desktop
|
||||
substituteInPlace $out/share/applications/kyodialog.desktop \
|
||||
--replace Exec=\"/usr/bin/kyodialog${kyodialog_version}\" Exec=\"$out/bin/kyodialog\" \
|
||||
--replace Icon=/usr/share/kyocera/appicon_H.png Icon=$out/share/${pname}/icons/appicon_H.png
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "CUPS drivers for several Kyocera printers";
|
||||
homepage = "https://www.kyoceradocumentsolutions.com";
|
||||
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
||||
license = licenses.unfree;
|
||||
maintainers = [ maintainers.steveej ];
|
||||
platforms = [ "i686-linux" "x86_64-linux" ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,62 +0,0 @@
|
|||
{ stdenv, lib, fetchzip, cups, autoPatchelfHook
|
||||
|
||||
# Can either be "EU" or "Global"; it's unclear what the difference is
|
||||
, region ? "Global", qt4
|
||||
}:
|
||||
|
||||
let
|
||||
platform =
|
||||
if stdenv.hostPlatform.system == "x86_64-linux" then "64bit"
|
||||
else if stdenv.hostPlatform.system == "i686-linux" then "32bit"
|
||||
else throw "Unsupported system: ${stdenv.hostPlatform.system}";
|
||||
debPlatform =
|
||||
if platform == "64bit" then "amd64"
|
||||
else "i386";
|
||||
debRegion = if region == "EU" then "EU." else "";
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cups-kyodialog3";
|
||||
version = "8.1601";
|
||||
|
||||
dontStrip = true;
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://www.kyoceradocumentsolutions.us/content/download-center-americas/us/drivers/drivers/Kyocera_Linux_PPD_Ver_${lib.replaceChars ["."] ["_"] version}_tar_gz.download.gz";
|
||||
sha256 = "11znnlkfssakml7w80gxlz1k59f3nvhph91fkzzadnm9i7a8yjal";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoPatchelfHook ];
|
||||
|
||||
buildInputs = [ cups qt4 ];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out
|
||||
cd $out
|
||||
|
||||
# unpack the debian archive
|
||||
ar p ${src}/KyoceraLinuxPackages/${region}/${platform}/kyodialog3.en${debRegion}_0.5-0_${debPlatform}.deb data.tar.gz | tar -xz
|
||||
rm -Rf KyoceraLinuxPackages
|
||||
|
||||
# strip $out/usr
|
||||
mv usr/* .
|
||||
rmdir usr
|
||||
|
||||
# allow cups to find the ppd files
|
||||
mkdir -p share/cups/model
|
||||
mv share/ppd/kyocera share/cups/model/Kyocera
|
||||
rmdir share/ppd
|
||||
|
||||
# prepend $out to all references in ppd and desktop files
|
||||
find -name "*.ppd" -exec sed -E -i "s:/usr/lib:$out/lib:g" {} \;
|
||||
find -name "*.desktop" -exec sed -E -i "s:/usr/lib:$out/lib:g" {} \;
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "CUPS drivers for several Kyocera printers";
|
||||
homepage = "https://www.kyoceradocumentsolutions.com";
|
||||
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
||||
license = licenses.unfree;
|
||||
maintainers = [ maintainers.steveej ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
@ -4,16 +4,16 @@ let
|
|||
# comments with variant added for update script
|
||||
# ./update-zen.py zen
|
||||
zenVariant = {
|
||||
version = "6.0.10"; #zen
|
||||
suffix = "zen2"; #zen
|
||||
sha256 = "12mpgw1maa5yi35ls4j1m0vmlw4fka69n0pidbxqi3yadbfn2iy5"; #zen
|
||||
version = "6.0.11"; #zen
|
||||
suffix = "zen1"; #zen
|
||||
sha256 = "0b694kbi3xyl23p7xf4w9abnp033gfp2czlpla9a5q7xwmjlc67p"; #zen
|
||||
isLqx = false;
|
||||
};
|
||||
# ./update-zen.py lqx
|
||||
lqxVariant = {
|
||||
version = "6.0.10"; #lqx
|
||||
suffix = "lqx1"; #lqx
|
||||
sha256 = "0hbak9m4j259xrhbv173axbfzr13r47xqsax7s64ga9688bra1m7"; #lqx
|
||||
version = "6.0.11"; #lqx
|
||||
suffix = "lqx2"; #lqx
|
||||
sha256 = "089mhxfdfi6wv0f2jx3j30y71mrkwrw5k8a7hyga1516j17qxva1"; #lqx
|
||||
isLqx = true;
|
||||
};
|
||||
zenKernelsFor = { version, suffix, sha256, isLqx }: buildLinux (args // {
|
||||
|
|
|
|||
|
|
@ -8,13 +8,13 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bazarr";
|
||||
version = "1.1.2";
|
||||
version = "1.1.3";
|
||||
|
||||
sourceRoot = ".";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/morpheus65535/bazarr/releases/download/v${version}/bazarr.zip";
|
||||
sha256 = "sha256-cTSRfnMYAyoOoTy0wx8sxqyS92zP6GZu8aH5hRRTxU4=";
|
||||
sha256 = "sha256-jt6E+VtD7JdPIJdWBkVrQyiNfT7vxSYz4kXrFQAdpXE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ unzip makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -14,16 +14,19 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "coturn";
|
||||
version = "4.6.0";
|
||||
version = "4.6.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "coturn";
|
||||
repo = "coturn";
|
||||
rev = version;
|
||||
sha256 = "sha256-QXApGJme/uteeKS8oiVLPOYUKzxTKdSC4WMlKS0VW5Q=";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-ckqPxG3ieqA0H9g1GfE8hYs6tUsZfzt6/yYR1qlgoxE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
openssl
|
||||
libevent
|
||||
|
|
@ -47,11 +50,12 @@ stdenv.mkDerivation rec {
|
|||
passthru.tests.coturn = nixosTests.coturn;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://coturn.net/";
|
||||
license = with licenses; [ bsd3 ];
|
||||
description = "A TURN server";
|
||||
homepage = "https://coturn.net/";
|
||||
changelog = "https://github.com/coturn/coturn/blob/${version}/ChangeLog";
|
||||
license = with licenses; [ bsd3 ];
|
||||
platforms = platforms.all;
|
||||
broken = stdenv.isDarwin; # 2018-10-21
|
||||
maintainers = with maintainers; [ ralith _0x4A6F ];
|
||||
broken = stdenv.isDarwin; # 2018-10-21
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -9,13 +9,13 @@
|
|||
|
||||
buildDotnetModule rec {
|
||||
pname = "jackett";
|
||||
version = "0.20.2318";
|
||||
version = "0.20.2325";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "H5djOk/kxN0998oM/hQB6VF6s+ONfyAmRrPX4lDDw3Q=";
|
||||
sha256 = "LFdgvLFdVSkSaJKonbFz+Wi6+BWkIcybNLvW0C21FOU=";
|
||||
};
|
||||
|
||||
projectFile = "src/Jackett.Server/Jackett.Server.csproj";
|
||||
|
|
|
|||
|
|
@ -2,17 +2,17 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "blackbox_exporter";
|
||||
version = "0.22.0";
|
||||
version = "0.23.0";
|
||||
rev = "v${version}";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
inherit rev;
|
||||
owner = "prometheus";
|
||||
repo = "blackbox_exporter";
|
||||
sha256 = "sha256-TelyZTzh/+fHe42H3AarZzuU8zY1EflHVo9c4WymMVc=";
|
||||
sha256 = "sha256-im/B5PM7oSE9ejcr558sJKM67UjZUXfm5dci4ZlMycA=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-pzEEi9O/Sgsv1dFm7wQt6PaP/beV5PMrXEZC9N/6lUc=";
|
||||
vendorSha256 = "sha256-f2m/8KvnEX0lZkmQtFOLOMj5gMUIiBKKvC+yq7QY0B4=";
|
||||
|
||||
# dns-lookup is performed for the tests
|
||||
doCheck = false;
|
||||
|
|
|
|||
|
|
@ -1,20 +1,21 @@
|
|||
{ lib
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
, nixosTests
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "unpoller";
|
||||
version = "2.2.0";
|
||||
version = "2.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "unpoller";
|
||||
repo = "unpoller";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-jPatTo+5nQ73AETXI88x/bma0wlY333DNvuyaYQTgz0=";
|
||||
hash = "sha256-0IknWsJ7fWJuvXeiMZscWEv8p90KZQaQC4Q0KV98Z88=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Y4FcBLdVB3AjJOpP2CuoNVAIxaqlZxHI0yKzp7Wqpwc=";
|
||||
vendorHash = "sha256-l2V41Rf8KDoh/fC9NcuGF4ISwCLwpbVuzQZiqiGNbuc=";
|
||||
|
||||
ldflags = [
|
||||
"-w" "-s"
|
||||
|
|
@ -24,11 +25,13 @@ buildGoModule rec {
|
|||
"-X github.com/prometheus/common/version.Version=${version}-0"
|
||||
];
|
||||
|
||||
passthru.tests = { inherit (nixosTests.prometheus-exporters) unpoller; };
|
||||
|
||||
meta = with lib; {
|
||||
description = "Collect ALL UniFi Controller, Site, Device & Client Data - Export to InfluxDB or Prometheus";
|
||||
homepage = "https://github.com/unpoller/unpoller";
|
||||
changelog = "https://github.com/unpoller/unpoller/releases/tag/v${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ ];
|
||||
maintainers = with maintainers; [ Frostman ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,14 +2,14 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "aliyun-cli";
|
||||
version = "3.0.139";
|
||||
version = "3.0.140";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
rev = "v${version}";
|
||||
owner = "aliyun";
|
||||
repo = pname;
|
||||
fetchSubmodules = true;
|
||||
sha256 = "sha256-SNqOxloz4/mIl2VmrcSz+GUYfgDZMnYFV0nkGCjQY0c=";
|
||||
sha256 = "sha256-mkUHYow3UA+lZ7/T18Qao9Ugxh27Mm1AuUDAG3JzUrU=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-aviRsflpS9/o2B7mpYQE7d9ahLclM+jiVz+cJOlegCY=";
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
}:
|
||||
buildGoModule rec {
|
||||
pname = "aws-sso-cli";
|
||||
version = "1.9.5";
|
||||
version = "1.9.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "synfinatic";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-voCFr5rb9VBSG926SeE2cMuk1gJskoaqjvkRY/9TZFU=";
|
||||
sha256 = "sha256-3IqWmd3Qi2eVSR9vmZSTt5GLrlO4akjOGdpzndh6nT8=";
|
||||
};
|
||||
vendorSha256 = "sha256-f0HrQzHK1JDWmRrnqG/N4X8TG0DP/IRWd6b7QR/vyzo=";
|
||||
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "hexyl";
|
||||
version = "0.10.0";
|
||||
version = "0.11.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sharkdp";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-LskDHUm45OlWbzlumaIXPXCZEBA5dXanhzgAvenJgVk=";
|
||||
hash = "sha256-Y/zEJx+tUYCA/Clvwvnsy7L3whIXT7e5bgluhrOOPjM=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-qKk95hGcThu0y3ND9z3mXw1TBaVkwAOrznaqj2k3SEk=";
|
||||
cargoHash = "sha256-NpEwuVz0tFkbUZQ4W+ojeD3omEXZ7YRqDmy/zLe5Z1o=";
|
||||
|
||||
meta = with lib; {
|
||||
changelog = "https://github.com/sharkdp/hexyl/releases/tag/v${version}";
|
||||
|
|
|
|||
|
|
@ -16,18 +16,11 @@ stdenv.mkDerivation rec {
|
|||
|
||||
buildInputs = [
|
||||
openssl
|
||||
];
|
||||
nativeBuildInputs = [
|
||||
which
|
||||
];
|
||||
|
||||
# The mbuffer configure scripts fails to recognize the correct
|
||||
# objdump binary during cross-building for foreign platforms.
|
||||
# The correct objdump is exposed via the environment variable
|
||||
# $OBJDUMP, which should be used in such cases.
|
||||
preConfigure = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
|
||||
substituteInPlace configure \
|
||||
--replace "OBJDUMP=$ac_cv_path_OBJDUMP" 'OBJDUMP=''${OBJDUMP}'
|
||||
'';
|
||||
|
||||
doCheck = true;
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -74,7 +74,7 @@ buildGoModule rec {
|
|||
description = "An application firewall";
|
||||
homepage = "https://github.com/evilsocket/opensnitch/wiki";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ raboof onny ];
|
||||
maintainers = with maintainers; [ onny ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -64,7 +64,7 @@ python3Packages.buildPythonApplication rec {
|
|||
description = "An application firewall";
|
||||
homepage = "https://github.com/evilsocket/opensnitch/wiki";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = [ maintainers.raboof ];
|
||||
maintainers = with maintainers; [ onny ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,24 +1,33 @@
|
|||
{ stdenv, lib, fetchFromGitHub, rustPlatform, CoreServices, SystemConfiguration }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, rustPlatform
|
||||
, CoreServices
|
||||
, SystemConfiguration
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "deploy-rs";
|
||||
version = "unstable-2022-08-05";
|
||||
version = "unstable-2022-11-18";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "serokell";
|
||||
repo = "deploy-rs";
|
||||
rev = "41f15759dd8b638e7b4f299730d94d5aa46ab7eb";
|
||||
sha256 = "sha256-1ZxuK67TL29YLw88vQ18Y2Y6iYg8Jb7I6/HVzmNB6nM=";
|
||||
rev = "2a3c5f70eee04a465aa534d8bd4fcc9bb3c4a8ce";
|
||||
hash = "sha256-0w6iD3GSSQbIeSFVDzAAQZB+hDq670ZTms3d9XI+BtM=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-IXmcpYcWmTGBVNwNCk1TMDOcLxkZytlEIILknUle3Rg=";
|
||||
cargoHash = "sha256-Ki9/mYNLUq74v3u+e3aM139+06CTrvPLJv0O+qHL9dA=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ CoreServices SystemConfiguration ];
|
||||
buildInputs = lib.optionals stdenv.isDarwin [
|
||||
CoreServices
|
||||
SystemConfiguration
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = " A simple multi-profile Nix-flake deploy tool. ";
|
||||
description = "Multi-profile Nix-flake deploy tool";
|
||||
homepage = "https://github.com/serokell/deploy-rs";
|
||||
license = licenses.mpl20;
|
||||
maintainers = [ maintainers.teutat3s ];
|
||||
maintainers = with maintainers; [ teutat3s ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -310,6 +310,7 @@ mapAliases ({
|
|||
cloud-print-connector = throw "Google Cloudprint is officially discontinued since Jan 2021, more info https://support.google.com/chrome/a/answer/9633006";
|
||||
cquery = throw "cquery has been removed because it is abandoned by upstream. Consider switching to clangd or ccls instead"; # Added 2020-06-15
|
||||
cups-googlecloudprint = throw "Google Cloudprint is officially discontinued since Jan 2021, more info https://support.google.com/chrome/a/answer/9633006";
|
||||
cups-kyodialog3 = cups-kyodialog; # Added 2022-11-12
|
||||
cupsBjnp = throw "'cupsBjnp' has been renamed to/replaced by 'cups-bjnp'"; # Converted to throw 2022-02-22
|
||||
cups_filters = throw "'cups_filters' has been renamed to/replaced by 'cups-filters'"; # Converted to throw 2022-02-22
|
||||
curlcpp = throw "curlcpp has been removed, no active maintainers and no usage within nixpkgs"; # Added 2022-05-10
|
||||
|
|
|
|||
|
|
@ -6637,9 +6637,7 @@ with pkgs;
|
|||
|
||||
teamocil = callPackage ../tools/misc/teamocil { };
|
||||
|
||||
the-way = callPackage ../development/tools/the-way {
|
||||
inherit (darwin.apple_sdk.frameworks) AppKit Security;
|
||||
};
|
||||
the-way = callPackage ../development/tools/the-way { };
|
||||
|
||||
timeline = callPackage ../applications/office/timeline { };
|
||||
|
||||
|
|
@ -16470,6 +16468,8 @@ with pkgs;
|
|||
|
||||
ansible-doctor = with python3.pkgs; toPythonApplication ansible-doctor;
|
||||
|
||||
ansible-language-server = callPackage ../development/tools/ansible-language-server { };
|
||||
|
||||
ansible-later = with python3.pkgs; toPythonApplication ansible-later;
|
||||
|
||||
ansible-lint = with python3.pkgs; toPythonApplication ansible-lint;
|
||||
|
|
@ -31950,6 +31950,8 @@ with pkgs;
|
|||
|
||||
slrn = callPackage ../applications/networking/newsreaders/slrn { };
|
||||
|
||||
sniffnet = callPackage ../applications/networking/sniffnet { };
|
||||
|
||||
sniproxy = callPackage ../applications/networking/sniproxy { };
|
||||
|
||||
snixembed = callPackage ../applications/misc/snixembed { };
|
||||
|
|
@ -32786,9 +32788,7 @@ with pkgs;
|
|||
|
||||
gnvim = callPackage ../applications/editors/neovim/gnvim/wrapper.nix { };
|
||||
|
||||
neovide = callPackage ../applications/editors/neovim/neovide {
|
||||
inherit (darwin.apple_sdk.frameworks) Security ApplicationServices Carbon AppKit;
|
||||
};
|
||||
neovide = callPackage ../applications/editors/neovim/neovide { };
|
||||
|
||||
neovim-remote = callPackage ../applications/editors/neovim/neovim-remote.nix { };
|
||||
|
||||
|
|
@ -36482,7 +36482,7 @@ with pkgs;
|
|||
|
||||
cups-kyocera-ecosys-m552x-p502x = callPackage ../misc/cups/drivers/kyocera-ecosys-m552x-p502x {};
|
||||
|
||||
cups-kyodialog3 = callPackage ../misc/cups/drivers/kyodialog3 {};
|
||||
cups-kyodialog = callPackage ../misc/cups/drivers/kyodialog {};
|
||||
|
||||
cups-dymo = callPackage ../misc/cups/drivers/dymo {};
|
||||
|
||||
|
|
|
|||
|
|
@ -372,6 +372,8 @@ self: super: with self; {
|
|||
|
||||
alarmdecoder = callPackage ../development/python-modules/alarmdecoder { };
|
||||
|
||||
ale-py = callPackage ../development/python-modules/ale-py { };
|
||||
|
||||
alectryon = callPackage ../development/python-modules/alectryon { };
|
||||
|
||||
alembic = callPackage ../development/python-modules/alembic { };
|
||||
|
|
|
|||
Loading…
Reference in a new issue