mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-09-21 04:49:01 +02:00
Merge master into haskell-updates
This commit is contained in:
github-actions[bot]
GitHub
commit
6284678c06
|
|
@ -380,6 +380,12 @@
|
|||
githubId = 209175;
|
||||
name = "Alesya Huzik";
|
||||
};
|
||||
aidalgol = {
|
||||
email = "aidalgol+nixpkgs@fastmail.net";
|
||||
github = "aidalgol";
|
||||
githubId = 2313201;
|
||||
name = "Aidan Gauland";
|
||||
};
|
||||
aij = {
|
||||
email = "aij+git@mrph.org";
|
||||
github = "aij";
|
||||
|
|
@ -14354,4 +14360,10 @@
|
|||
github = "kuwii";
|
||||
githubId = 10705175;
|
||||
};
|
||||
melias122 = {
|
||||
name = "Martin Elias";
|
||||
email = "martin+nixpkgs@elias.sx";
|
||||
github = "melias122";
|
||||
githubId = 1027766;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1921,10 +1921,51 @@
|
|||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
ORY Kratos was updated to version 0.8.3-alpha.1.pre.0, which
|
||||
ORY Kratos was updated to version 0.9.0-alpha.3, which
|
||||
introduces some breaking changes:
|
||||
</para>
|
||||
<itemizedlist spacing="compact">
|
||||
<listitem>
|
||||
<para>
|
||||
All endpoints at the Admin API are now exposed at
|
||||
<literal>/admin/</literal>. For example, endpoint
|
||||
<literal>https://kratos:4434/identities</literal> is now
|
||||
exposed at
|
||||
<literal>https://kratos:4434/admin/identities</literal>
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
Configuration key
|
||||
<literal>selfservice.whitelisted_return_urls</literal> has
|
||||
been renamed to <literal>allowed_return_urls</literal>
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
The <literal>password_identifier</literal> form field of
|
||||
the password login strategy has been renamed to
|
||||
<literal>identifier</literal> to make compatibility with
|
||||
passwordless flows possible.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
Instead of having a global
|
||||
<literal>default_schema_url</literal> which developers
|
||||
used to update their schema, you now need to define the
|
||||
<literal>default_schema_id</literal> which must reference
|
||||
schema ID in your config.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
Calling <literal>/self-service/recovery</literal> without
|
||||
flow ID or with an invalid flow ID while authenticated
|
||||
will now respond with an error instead of redirecting to
|
||||
the default page.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
If you are relying on the SQLite images, update your
|
||||
|
|
@ -1961,6 +2002,18 @@
|
|||
Notes for v0.8.2-alpha-1</link>
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
<link xlink:href="https://github.com/ory/kratos/releases/tag/v0.9.0-alpha.1">Release
|
||||
Notes for v0.9.0-alpha-1</link>
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
<link xlink:href="https://github.com/ory/kratos/releases/tag/v0.9.0-alpha.3">Release
|
||||
Notes for v0.9.0-alpha-3</link>
|
||||
</para>
|
||||
</listitem>
|
||||
</itemizedlist>
|
||||
</listitem>
|
||||
</itemizedlist>
|
||||
|
|
@ -2232,6 +2285,14 @@
|
|||
like <literal>firefox</literal>.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
The Nextcloud module now supports to create a Mysql database
|
||||
automatically with
|
||||
<literal>services.nextcloud.database.createLocally</literal>
|
||||
enabled.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
The <literal>spark3</literal> package has been updated from
|
||||
|
|
|
|||
|
|
@ -716,13 +716,21 @@ In addition to numerous new and upgraded packages, this release has the followin
|
|||
|
||||
- `nixos-generate-config` now puts the dhcp configuration in `hardware-configuration.nix` instead of `configuration.nix`.
|
||||
|
||||
- ORY Kratos was updated to version 0.8.3-alpha.1.pre.0, which introduces some breaking changes:
|
||||
- ORY Kratos was updated to version 0.9.0-alpha.3, which introduces some breaking changes:
|
||||
- All endpoints at the Admin API are now exposed at `/admin/`. For example, endpoint `https://kratos:4434/identities` is now exposed at `https://kratos:4434/admin/identities`
|
||||
- Configuration key `selfservice.whitelisted_return_urls` has been renamed to `allowed_return_urls`
|
||||
- The `password_identifier` form field of the password login strategy has been renamed to `identifier` to make compatibility with passwordless flows possible.
|
||||
- Instead of having a global `default_schema_url` which developers used to update their schema, you now need to define the `default_schema_id` which must reference schema ID in your config.
|
||||
- Calling `/self-service/recovery` without flow ID or with an invalid flow ID while authenticated will now respond with an error instead of redirecting to the default page.
|
||||
- If you are relying on the SQLite images, update your Docker Pull commands as follows:
|
||||
- `docker pull oryd/kratos:{version}`
|
||||
- Additionally, all passwords now have to be at least 8 characters long.
|
||||
- For more details, see:
|
||||
- [Release Notes for v0.8.1-alpha-1](https://github.com/ory/kratos/releases/tag/v0.8.1-alpha.1)
|
||||
- [Release Notes for v0.8.2-alpha-1](https://github.com/ory/kratos/releases/tag/v0.8.2-alpha.1)
|
||||
- [Release Notes for v0.9.0-alpha-1](https://github.com/ory/kratos/releases/tag/v0.9.0-alpha.1)
|
||||
- [Release Notes for v0.9.0-alpha-3](https://github.com/ory/kratos/releases/tag/v0.9.0-alpha.3)
|
||||
|
||||
|
||||
- `fetchFromSourcehut` now allows fetching repositories recursively
|
||||
using `fetchgit` or `fetchhg` if the argument `fetchSubmodules`
|
||||
|
|
@ -802,6 +810,9 @@ In addition to numerous new and upgraded packages, this release has the followin
|
|||
|
||||
- The `nss` package was split into `nss_esr` and `nss_latest`, with `nss` being an alias for `nss_esr`. This was done to ease maintenance of `nss` and dependent high-profile packages like `firefox`.
|
||||
|
||||
- The Nextcloud module now supports to create a Mysql database automatically
|
||||
with `services.nextcloud.database.createLocally` enabled.
|
||||
|
||||
- The `spark3` package has been updated from 3.1.2 to 3.2.1 ([#160075](https://github.com/NixOS/nixpkgs/pull/160075)):
|
||||
|
||||
- Testing has been enabled for `aarch64-linux` in addition to `x86_64-linux`.
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{ config, pkgs, lib, ... }:
|
||||
let
|
||||
inherit (lib) mkOption types mkIf;
|
||||
inherit (lib) mapAttrs mkIf mkOption optional optionals types;
|
||||
|
||||
cfg = config.services.kmscon;
|
||||
|
||||
|
|
@ -28,6 +28,19 @@ in {
|
|||
default = false;
|
||||
};
|
||||
|
||||
fonts = mkOption {
|
||||
description = "Fonts used by kmscon, in order of priority.";
|
||||
default = null;
|
||||
example = lib.literalExpression ''[ { name = "Source Code Pro"; package = pkgs.source-code-pro; } ]'';
|
||||
type = with types;
|
||||
let fontType = submodule {
|
||||
options = {
|
||||
name = mkOption { type = str; description = "Font name, as used by fontconfig."; };
|
||||
package = mkOption { type = package; description = "Package providing the font."; };
|
||||
};
|
||||
}; in nullOr (nonEmptyListOf fontType);
|
||||
};
|
||||
|
||||
extraConfig = mkOption {
|
||||
description = "Extra contents of the kmscon.conf file.";
|
||||
type = types.lines;
|
||||
|
|
@ -87,11 +100,17 @@ in {
|
|||
|
||||
systemd.services.systemd-vconsole-setup.enable = false;
|
||||
|
||||
services.kmscon.extraConfig = mkIf cfg.hwRender ''
|
||||
drm
|
||||
hwaccel
|
||||
'';
|
||||
services.kmscon.extraConfig =
|
||||
let
|
||||
render = optionals cfg.hwRender [ "drm" "hwaccel" ];
|
||||
fonts = optional (cfg.fonts != null) "font-name=${lib.concatMapStringsSep ", " (f: f.name) cfg.fonts}";
|
||||
in lib.concatStringsSep "\n" (render ++ fonts);
|
||||
|
||||
hardware.opengl.enable = mkIf cfg.hwRender true;
|
||||
|
||||
fonts = mkIf (cfg.fonts != null) {
|
||||
fontconfig.enable = true;
|
||||
fonts = map (f: f.package) cfg.fonts;
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -251,6 +251,23 @@ in {
|
|||
'';
|
||||
};
|
||||
|
||||
database = {
|
||||
|
||||
createLocally = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description = ''
|
||||
Create the database and database user locally. Only available for
|
||||
mysql database.
|
||||
Note that this option will use the latest version of MariaDB which
|
||||
is not officially supported by Nextcloud. As for now a workaround
|
||||
is used to also support MariaDB version >= 10.6.
|
||||
'';
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
|
||||
config = {
|
||||
dbtype = mkOption {
|
||||
type = types.enum [ "sqlite" "pgsql" "mysql" ];
|
||||
|
|
@ -583,6 +600,12 @@ in {
|
|||
else pkgs.php80;
|
||||
}
|
||||
|
||||
{ assertions = [
|
||||
{ assertion = cfg.database.createLocally -> cfg.config.dbtype == "mysql";
|
||||
message = ''services.nextcloud.config.dbtype must be set to mysql if services.nextcloud.database.createLocally is set to true.'';
|
||||
}
|
||||
]; }
|
||||
|
||||
{ systemd.timers.nextcloud-cron = {
|
||||
wantedBy = [ "timers.target" ];
|
||||
timerConfig.OnBootSec = "5m";
|
||||
|
|
@ -811,6 +834,32 @@ in {
|
|||
|
||||
environment.systemPackages = [ occ ];
|
||||
|
||||
services.mysql = lib.mkIf cfg.database.createLocally {
|
||||
enable = true;
|
||||
package = lib.mkDefault pkgs.mariadb;
|
||||
ensureDatabases = [ cfg.config.dbname ];
|
||||
ensureUsers = [{
|
||||
name = cfg.config.dbuser;
|
||||
ensurePermissions = { "${cfg.config.dbname}.*" = "ALL PRIVILEGES"; };
|
||||
}];
|
||||
# FIXME(@Ma27) Nextcloud isn't compatible with mariadb 10.6,
|
||||
# this is a workaround.
|
||||
# See https://help.nextcloud.com/t/update-to-next-cloud-21-0-2-has-get-an-error/117028/22
|
||||
settings = {
|
||||
mysqld = {
|
||||
innodb_read_only_compressed = 0;
|
||||
};
|
||||
};
|
||||
initialScript = pkgs.writeText "mysql-init" ''
|
||||
CREATE USER '${cfg.config.dbname}'@'localhost' IDENTIFIED BY '${builtins.readFile( cfg.config.dbpassFile )}';
|
||||
CREATE DATABASE IF NOT EXISTS ${cfg.config.dbname};
|
||||
GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, INDEX, ALTER,
|
||||
CREATE TEMPORARY TABLES ON ${cfg.config.dbname}.* TO '${cfg.config.dbuser}'@'localhost'
|
||||
IDENTIFIED BY '${builtins.readFile( cfg.config.dbpassFile )}';
|
||||
FLUSH privileges;
|
||||
'';
|
||||
};
|
||||
|
||||
services.nginx.enable = mkDefault true;
|
||||
|
||||
services.nginx.virtualHosts.${cfg.hostName} = {
|
||||
|
|
|
|||
|
|
@ -26,6 +26,7 @@ in {
|
|||
redis = false;
|
||||
memcached = true;
|
||||
};
|
||||
database.createLocally = true;
|
||||
config = {
|
||||
dbtype = "mysql";
|
||||
dbname = "nextcloud";
|
||||
|
|
@ -38,28 +39,6 @@ in {
|
|||
};
|
||||
};
|
||||
|
||||
services.mysql = {
|
||||
enable = true;
|
||||
settings.mysqld = {
|
||||
bind-address = "127.0.0.1";
|
||||
|
||||
# FIXME(@Ma27) Nextcloud isn't compatible with mariadb 10.6,
|
||||
# this is a workaround.
|
||||
# See https://help.nextcloud.com/t/update-to-next-cloud-21-0-2-has-get-an-error/117028/22
|
||||
innodb_read_only_compressed = 0;
|
||||
};
|
||||
package = pkgs.mariadb;
|
||||
|
||||
initialScript = pkgs.writeText "mysql-init" ''
|
||||
CREATE USER 'nextcloud'@'localhost' IDENTIFIED BY 'hunter2';
|
||||
CREATE DATABASE IF NOT EXISTS nextcloud;
|
||||
GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, INDEX, ALTER,
|
||||
CREATE TEMPORARY TABLES ON nextcloud.* TO 'nextcloud'@'localhost'
|
||||
IDENTIFIED BY 'hunter2';
|
||||
FLUSH privileges;
|
||||
'';
|
||||
};
|
||||
|
||||
systemd.services.nextcloud-setup= {
|
||||
requires = ["mysql.service"];
|
||||
after = ["mysql.service"];
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ import ../make-test-python.nix ({ lib, pkgs, ... }: {
|
|||
maintainers = [ n0emis ];
|
||||
};
|
||||
|
||||
machine = { ... }: {
|
||||
nodes.machine = { ... }: {
|
||||
services.netbox = {
|
||||
enable = true;
|
||||
secretKeyFile = pkgs.writeText "secret" ''
|
||||
|
|
|
|||
|
|
@ -1,7 +1,8 @@
|
|||
{ lib, stdenv, fetchurl, pkg-config
|
||||
, ncurses, db , popt, libtool
|
||||
, libiconv, CoreServices
|
||||
# Sound sub-systems
|
||||
, alsaSupport ? true, alsa-lib
|
||||
, alsaSupport ? (!stdenv.isDarwin), alsa-lib
|
||||
, pulseSupport ? true, libpulseaudio, autoreconfHook
|
||||
, jackSupport ? true, libjack2
|
||||
, ossSupport ? true
|
||||
|
|
@ -64,7 +65,8 @@ in stdenv.mkDerivation rec {
|
|||
++ opt wavpackSupport wavpack
|
||||
# Misc
|
||||
++ opt curlSupport curl
|
||||
++ opt samplerateSupport libsamplerate;
|
||||
++ opt samplerateSupport libsamplerate
|
||||
++ lib.optionals stdenv.isDarwin [ libiconv CoreServices ];
|
||||
|
||||
configureFlags = [
|
||||
# Sound sub-systems
|
||||
|
|
@ -97,6 +99,6 @@ in stdenv.mkDerivation rec {
|
|||
homepage = "http://moc.daper.net/";
|
||||
license = licenses.gpl2;
|
||||
maintainers = with maintainers; [ aethelz pSub jagajaga ];
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -72,6 +72,7 @@ mkDerivation rec {
|
|||
] ++ lib.optionals withGstreamer (with gst_all_1; [
|
||||
glib-networking
|
||||
gstreamer
|
||||
gst-libav
|
||||
gst-plugins-base
|
||||
gst-plugins-good
|
||||
gst-plugins-bad
|
||||
|
|
|
|||
|
|
@ -0,0 +1,30 @@
|
|||
{ trivialBuild
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
trivialBuild {
|
||||
pname = "header-file-mode";
|
||||
version = "unstable-2022-04-19";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "0x4b";
|
||||
repo = "header-file-mode";
|
||||
rev = "fdf1930730e1b0c3f82490099a1325805491eff5";
|
||||
sha256 = "sha256-FJgRI6RLQk9osh7d+YRfrV5CoGCDx2cZvsjAWlm969c=";
|
||||
};
|
||||
|
||||
postUnpack = ''
|
||||
sourceRoot="$sourceRoot/lisp"
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = ''
|
||||
A major mode that, when associated with the .h file extension, will put
|
||||
those file into the major mode of their corresponding implementation file.
|
||||
'';
|
||||
license = lib.licenses.gpl3Plus;
|
||||
platforms = lib.platforms.all;
|
||||
maintainers = with lib.maintainers; [ aidalgol ];
|
||||
};
|
||||
}
|
||||
|
|
@ -178,6 +178,8 @@
|
|||
|
||||
git-undo = callPackage ./git-undo { };
|
||||
|
||||
header-file-mode = callPackage ./header-file-mode { };
|
||||
|
||||
helm-words = callPackage ./helm-words { };
|
||||
|
||||
isearch-plus = callPackage ./isearch-plus { };
|
||||
|
|
|
|||
132
pkgs/applications/misc/1password-gui/beta.nix
Normal file
132
pkgs/applications/misc/1password-gui/beta.nix
Normal file
|
|
@ -0,0 +1,132 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, makeWrapper
|
||||
, alsa-lib
|
||||
, at-spi2-atk
|
||||
, at-spi2-core
|
||||
, atk
|
||||
, cairo
|
||||
, cups
|
||||
, dbus
|
||||
, expat
|
||||
, gdk-pixbuf
|
||||
, glib
|
||||
, gtk3
|
||||
, libX11
|
||||
, libXcomposite
|
||||
, libXdamage
|
||||
, libXext
|
||||
, libXfixes
|
||||
, libXrandr
|
||||
, libdrm
|
||||
, libxcb
|
||||
, libxkbcommon
|
||||
, libxshmfence
|
||||
, mesa
|
||||
, nspr
|
||||
, nss
|
||||
, pango
|
||||
, systemd
|
||||
, udev
|
||||
, xdg-utils
|
||||
|
||||
# The 1Password polkit file requires a list of users for whom polkit
|
||||
# integrations should be enabled. This should be a list of strings that
|
||||
# correspond to usernames.
|
||||
, polkitPolicyOwners ? []
|
||||
}:
|
||||
let
|
||||
# Convert the polkitPolicyOwners variable to a polkit-compatible string for the polkit file.
|
||||
policyOwners = lib.concatStringsSep " " (map (user: "unix-user:${user}") polkitPolicyOwners);
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "1password";
|
||||
version = "8.7.0-49.BETA";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://downloads.1password.com/linux/tar/beta/x86_64/1password-${version}.x64.tar.gz";
|
||||
sha256 = "sha256-cYT9Pi2WEjZQ5P7Dr84l65AHyD8tZrYC+m4hFxSsNd4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
dontConfigure = true;
|
||||
dontBuild = true;
|
||||
dontPatchELF = true;
|
||||
|
||||
installPhase =
|
||||
let rpath = lib.makeLibraryPath [
|
||||
alsa-lib
|
||||
at-spi2-atk
|
||||
at-spi2-core
|
||||
atk
|
||||
cairo
|
||||
cups
|
||||
dbus
|
||||
expat
|
||||
gdk-pixbuf
|
||||
glib
|
||||
gtk3
|
||||
libX11
|
||||
libXcomposite
|
||||
libXdamage
|
||||
libXext
|
||||
libXfixes
|
||||
libXrandr
|
||||
libdrm
|
||||
libxcb
|
||||
libxkbcommon
|
||||
libxshmfence
|
||||
mesa
|
||||
nspr
|
||||
nss
|
||||
pango
|
||||
systemd
|
||||
] + ":${stdenv.cc.cc.lib}/lib64";
|
||||
in ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/bin $out/share/1password
|
||||
cp -a * $out/share/1password
|
||||
|
||||
# Desktop file
|
||||
install -Dt $out/share/applications resources/${pname}.desktop
|
||||
substituteInPlace $out/share/applications/${pname}.desktop \
|
||||
--replace 'Exec=/opt/1Password/${pname}' 'Exec=${pname}'
|
||||
|
||||
'' + (lib.optionalString (polkitPolicyOwners != [ ])
|
||||
''
|
||||
# Polkit file
|
||||
mkdir -p $out/share/polkit-1/actions
|
||||
substitute com.1password.1Password.policy.tpl $out/share/polkit-1/actions/com.1password.1Password.policy --replace "\''${POLICY_OWNERS}" "${policyOwners}"
|
||||
'') + ''
|
||||
|
||||
# Icons
|
||||
cp -a resources/icons $out/share
|
||||
|
||||
interp="$(cat $NIX_CC/nix-support/dynamic-linker)"
|
||||
patchelf --set-interpreter $interp $out/share/1password/{1password,1Password-BrowserSupport,1Password-KeyringHelper}
|
||||
patchelf --set-rpath ${rpath}:$out/share/1password $out/share/1password/{1password,1Password-BrowserSupport,1Password-KeyringHelper}
|
||||
for file in $(find $out -type f -name \*.so\* ); do
|
||||
patchelf --set-rpath ${rpath}:$out/share/1password $file
|
||||
done
|
||||
|
||||
# Electron is trying to open udev via dlopen()
|
||||
# and for some reason that doesn't seem to be impacted from the rpath.
|
||||
# Adding udev to LD_LIBRARY_PATH fixes that.
|
||||
makeWrapper $out/share/1password/1password $out/bin/1password \
|
||||
--prefix PATH : ${lib.makeBinPath [ xdg-utils ]} \
|
||||
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ udev ]}
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Multi-platform password manager";
|
||||
homepage = "https://1password.com/";
|
||||
license = licenses.unfree;
|
||||
maintainers = with maintainers; [ timstott savannidgerinel maxeaubrey sebtm ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
}
|
||||
|
|
@ -128,7 +128,7 @@ in stdenv.mkDerivation rec {
|
|||
description = "Multi-platform password manager";
|
||||
homepage = "https://1password.com/";
|
||||
license = licenses.unfree;
|
||||
maintainers = with maintainers; [ timstott savannidgerinel maxeaubrey ];
|
||||
maintainers = with maintainers; [ timstott savannidgerinel maxeaubrey sebtm ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,11 +6,11 @@ with python3.pkgs;
|
|||
|
||||
buildPythonApplication rec {
|
||||
pname = "ablog";
|
||||
version = "0.10.23";
|
||||
version = "0.10.24";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-fqqB17dNzcDZmFw3nj85T5zvMzY6SN/JxbB3IASOas8=";
|
||||
sha256 = "sha256-bLpINvEH7B/duSRrfzvq25se0mvbbcxaEcAs8xMw6Kc=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -9,17 +9,17 @@
|
|||
|
||||
rustPlatform.buildRustPackage {
|
||||
pname = "faircamp";
|
||||
version = "unstable-2022-01-19";
|
||||
version = "unstable-2022-03-20";
|
||||
|
||||
# TODO when switching to a stable release, use fetchFromGitea and add a
|
||||
# version test. Meanwhile, fetchgit is used to make unstableGitUpdater work.
|
||||
src = fetchgit {
|
||||
url = "https://codeberg.org/simonrepp/faircamp.git";
|
||||
rev = "f8ffc7a35a12251b83966b35c63f72b4912f75a9";
|
||||
sha256 = "sha256-9t42+813IPLUChbLkcwzoCr7FXSL1g+ZG6I3d+7pmec=";
|
||||
rev = "863cecb468a58a774bd2d1d93f99f3c8ecd8205c";
|
||||
sha256 = "sha256-JodIo601BYesbiHarnBk4/GuFR/bpCswxQbaysRP+CI=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-24ALBede3W8rjlBRdtL0aazRyK1RmNLdHF/bt5i4S5Y=";
|
||||
cargoHash = "sha256-XqsUUc+s01t4KHtktbNhm52r0NeLbcBg5DVw3Xn0oZk=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "kratos";
|
||||
version = "0.8.3-alpha.1.pre.0";
|
||||
version = "0.9.0-alpha.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ory";
|
||||
repo = "kratos";
|
||||
rev = "v${version}";
|
||||
sha256 = "1225paf0x6lb6cb3q5f4lyz0r426ifx4x8145q7nsc6v64srck2y";
|
||||
sha256 = "1x6g5mbbz1nkqi814dcyvdn8dyizpilzsb9cqijw0kpw4y3px757";
|
||||
};
|
||||
|
||||
vendorSha256 = "10zhxbccjsp6hbmk2lnvbag6c92hz703mcaigaj4wvlf7glpldm6";
|
||||
vendorSha256 = "1v29g302zqh7sc5s53dyz1mki0iijnr6nfj4fajayz2n7bfw3kh1";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "skate";
|
||||
version = "0.1.4";
|
||||
version = "0.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "charmbracelet";
|
||||
repo = "skate";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-vZps/VXNK+17quPyE1b56YXE2GsW3oB4vPi7sA8EPGE=";
|
||||
sha256 = "sha256-glqBiwW87BwGRZGDSvvE/WeK4BKqXGmC6Q9qBk+ROuc=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-7cf/ldBli/q7aNiCO7qIw8o09hVpwDxF2h/UelP86V4=";
|
||||
vendorSha256 = "sha256-VQvumXQx5Q0gt51NI65kjSnzGRyScpli36vfCygtAjE=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
{ lib, buildGoModule, fetchFromGitHub, installShellFiles }:
|
||||
let
|
||||
# look for GO_LDFLAGS getting set in the Makefile
|
||||
version = "1.0.2";
|
||||
sha256 = "sha256-FcwbZAAPsZ1WkLOwXHNRAI1SrEv7JLSkIReCe/FNckQ=";
|
||||
vendorSha256 = "sha256-qDP2b0EAJzqpmAU1/Te9/tD8hm6zCF8B33yr0Z55WFU=";
|
||||
pkgsVersion = "v1.0.0-7-ge6eb485";
|
||||
version = "1.0.3";
|
||||
sha256 = "sha256-unGr+T2uYg7/4pAXf8vp9Hpi6IrCsLCqGbyBC7QXGX8=";
|
||||
vendorSha256 = "sha256-9NYr5Ok9oQ1ajYFiTeU9ztmX/55UROBjNawLGjm4HYU=";
|
||||
pkgsVersion = "v1.0.0-8-g76f8c5b";
|
||||
extrasVersion = "v1.0.0-2-gc5d3ab0";
|
||||
in
|
||||
buildGoModule rec {
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ let
|
|||
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "signal-desktop";
|
||||
version = "5.38.0"; # Please backport all updates to the stable channel.
|
||||
version = "5.39.0"; # Please backport all updates to the stable channel.
|
||||
# All releases have a limited lifetime and "expire" 90 days after the release.
|
||||
# When releases "expire" the application becomes unusable until an update is
|
||||
# applied. The expiration date for the current release can be extracted with:
|
||||
|
|
@ -34,7 +34,7 @@ in stdenv.mkDerivation rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
|
||||
sha256 = "sha256-PmeJ6ZNjQjxuPl1UqunQT0q6uUZxt5gDFJS/WCcHE68=";
|
||||
sha256 = "sha256-Dy5orMKZvvnHZu/2U5YIJdDR4eDM3SBjXVGHuBv0kgc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
638
pkgs/applications/networking/n8n/node-packages.nix
generated
638
pkgs/applications/networking/n8n/node-packages.nix
generated
File diff suppressed because it is too large
Load diff
|
|
@ -16,13 +16,13 @@
|
|||
|
||||
buildPythonApplication rec {
|
||||
pname = "protonvpn-gui";
|
||||
version = "1.7.0";
|
||||
version = "1.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ProtonVPN";
|
||||
repo = "linux-app";
|
||||
rev = version;
|
||||
sha256 = "sha256-uzooFQBq2mhqTBr/cgea5cVQ889P70sgSk2vjXBQEfw=";
|
||||
rev = "refs/tags/${version}";
|
||||
sha256 = "sha256-Od12qHiyXHu2JnjYV7amZz5xxL+eiWUVbcG5Tbcrr28=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -4,13 +4,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "verilator";
|
||||
version = "4.218";
|
||||
version = "4.220";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-FukC60z7Y3bb3I/dgzqCh6kFP6DDBOGi0M8IIZ50P3g=";
|
||||
sha256 = "sha256-Y0j6j8kPCONlegFoWl46LXtfoiLhzMsHCVv+kLe7UyE=";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
|
|
|||
|
|
@ -85,6 +85,11 @@ stdenv.mkDerivation rec {
|
|||
|
||||
patchShebangs build/unix/
|
||||
ln -s ${lib.getDev stdenv.cc.libc}/include/AvailabilityMacros.h cint/cint/include/
|
||||
|
||||
# __malloc_hook is deprecated
|
||||
substituteInPlace misc/memstat/src/TMemStatHook.cxx \
|
||||
--replace "defined(R__GNU) && (defined(R__LINUX) || defined(__APPLE__))" \
|
||||
"defined(R__GNU) && (defined(__APPLE__))"
|
||||
''
|
||||
# Fix CINTSYSDIR for "build" version of rootcint
|
||||
# This is probably a bug that breaks out-of-source builds
|
||||
|
|
|
|||
19
pkgs/applications/video/mpv/scripts/autocrop.nix
Normal file
19
pkgs/applications/video/mpv/scripts/autocrop.nix
Normal file
|
|
@ -0,0 +1,19 @@
|
|||
{ stdenvNoCC, mpv-unwrapped, lib }:
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "mpv-autocrop";
|
||||
version = mpv-unwrapped.version;
|
||||
src = "${mpv-unwrapped.src.outPath}/TOOLS/lua/autocrop.lua";
|
||||
dontBuild = true;
|
||||
dontUnpack = true;
|
||||
installPhase = ''
|
||||
install -Dm644 ${src} $out/share/mpv/scripts/autocrop.lua
|
||||
'';
|
||||
passthru.scriptName = "autocrop.lua";
|
||||
|
||||
meta = {
|
||||
description = "This script uses the lavfi cropdetect filter to automatically insert a crop filter with appropriate parameters for the currently playing video.";
|
||||
homepage = "https://github.com/mpv-player/mpv/blob/master/TOOLS/lua/autocrop.lua";
|
||||
license = lib.licenses.gpl2Plus;
|
||||
};
|
||||
}
|
||||
19
pkgs/applications/video/mpv/scripts/autodeint.nix
Normal file
19
pkgs/applications/video/mpv/scripts/autodeint.nix
Normal file
|
|
@ -0,0 +1,19 @@
|
|||
{ stdenvNoCC, mpv-unwrapped, lib }:
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "mpv-autodeint";
|
||||
version = mpv-unwrapped.version;
|
||||
src = "${mpv-unwrapped.src.outPath}/TOOLS/lua/autodeint.lua";
|
||||
dontBuild = true;
|
||||
dontUnpack = true;
|
||||
installPhase = ''
|
||||
install -Dm644 ${src} $out/share/mpv/scripts/autodeint.lua
|
||||
'';
|
||||
passthru.scriptName = "autodeint.lua";
|
||||
|
||||
meta = {
|
||||
description = "This script uses the lavfi idet filter to automatically insert the appropriate deinterlacing filter based on a short section of the currently playing video.";
|
||||
homepage = "https://github.com/mpv-player/mpv/blob/master/TOOLS/lua/autodeint.lua";
|
||||
license = lib.licenses.gpl2Plus;
|
||||
};
|
||||
}
|
||||
|
|
@ -2,19 +2,19 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cloud-hypervisor";
|
||||
version = "22.1";
|
||||
version = "23.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cloud-hypervisor";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-KWCGcGB4HCpV7uSM4otQhSGEzQ+1jQip2fiAysNN54k=";
|
||||
sha256 = "0gq23zhpl1rw8i3yv0f058lycsr078yfy8vkb5w382pifgrww1zh";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ openssl ] ++ lib.optional stdenv.isAarch64 dtc;
|
||||
|
||||
cargoSha256 = "sha256-R70H1R9jFnQyOLI4UNuRzpOAAnGSBGpiHFKbxP2472o=";
|
||||
cargoSha256 = "0r3r6r5scbw23ipz24glcyvaxx9sffy8kp27fpqvwdha915c1zkp";
|
||||
|
||||
OPENSSL_NO_VENDOR = true;
|
||||
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "imgcrypt";
|
||||
version = "1.1.1";
|
||||
version = "1.1.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "containerd";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "177fs3p2xzwjsffcxqqllx6wi6ghfyqbvfgn95v3q7a2993yqk4k";
|
||||
sha256 = "sha256-a5IQahhonaXA74gY+zR6BbV9MdyEu70j0E6YlNmN3DA=";
|
||||
};
|
||||
|
||||
ldflags = [
|
||||
|
|
|
|||
|
|
@ -1,14 +1,14 @@
|
|||
{ lib, stdenv, fetchurl, cmake, pkg-config, python3, libX11, libXext, libXinerama, libXrandr, libXft, libXrender, freetype, asciidoc
|
||||
{ lib, stdenv, fetchurl, cmake, pkg-config, python3, libX11, libXext, libXinerama, libXrandr, libXft, libXrender, libXdmcp, libXfixes, freetype, asciidoc
|
||||
, xdotool, xorgserver, xsetroot, xterm, runtimeShell
|
||||
, nixosTests }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "herbstluftwm";
|
||||
version = "0.9.3";
|
||||
version = "0.9.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://herbstluftwm.org/tarballs/herbstluftwm-${version}.tar.gz";
|
||||
sha256 = "01f1bv9axjhw1l2gwhdwahljssj0h8q7a1bqwbpnwvln0ayv39qb";
|
||||
sha256 = "1k03rdr6irsgnjl4w0vac0kk9nsz46qhy74iflmaycxgfv8fxy7f";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
|
|
@ -37,6 +37,8 @@ stdenv.mkDerivation rec {
|
|||
libXrandr
|
||||
libXft
|
||||
libXrender
|
||||
libXdmcp
|
||||
libXfixes
|
||||
freetype
|
||||
];
|
||||
|
||||
|
|
@ -75,7 +77,10 @@ stdenv.mkDerivation rec {
|
|||
|
||||
pytestFlagsArray = [ "../tests" ];
|
||||
disabledTests = [
|
||||
"test_title_different_letters_are_drawn"
|
||||
"test_title_different_letters_are_drawn" # font problems
|
||||
"test_completable_commands" # font problems
|
||||
"test_autostart" # $PATH problems
|
||||
"test_wmexec_to_other" # timeouts in sandbox
|
||||
];
|
||||
|
||||
passthru = {
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-shell-extension-impatience";
|
||||
version = "unstable-2019-09-23";
|
||||
version = "unstable-2022-03-26";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "timbertson";
|
||||
repo = "gnome-shell-impatience";
|
||||
rev = "43e4e0a1e0eeb334a2da5224ce3ab4fdddf4f1b2";
|
||||
sha256 = "0kvdhlz41fjyqdgcfw6mrr9nali6wg2qwji3dvykzfi0aypljzpx";
|
||||
rev = "cf7c0bb8776af9a16e4ae114df0cc65869fb669d";
|
||||
sha256 = "sha256-z/pZxSEFELtg7kueS2i6gN1+VbN0m4mxc34pOCMak5g=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
|||
|
|
@ -29,8 +29,8 @@
|
|||
# See `update.nix` file for a description on how this file works
|
||||
, sourcesPath ? ./. + "/graalvm${javaVersion}-ce-sources.json"
|
||||
# Use musl instead of glibc to allow true static builds in GraalVM's
|
||||
# Native Image (i.e.: `--static --libc=musl`). This will cause glibc builds
|
||||
# to fail, so it should be used with care
|
||||
# Native Image (i.e.: `--static --libc=musl`). This will cause glibc static
|
||||
# builds to fail, so it should be used with care
|
||||
, useMusl ? false
|
||||
}:
|
||||
|
||||
|
|
@ -85,7 +85,7 @@ let
|
|||
] ++ lib.optionals useMusl [
|
||||
(lib.getDev musl)
|
||||
# GraalVM 21.3.0+ expects musl-gcc as <system>-musl-gcc
|
||||
(writeShellScriptBin "${stdenv.system}-musl-gcc" ''${lib.getDev musl}/bin/musl-gcc "$@"'')
|
||||
(writeShellScriptBin "${stdenv.hostPlatform.system}-musl-gcc" ''${lib.getDev musl}/bin/musl-gcc "$@"'')
|
||||
]);
|
||||
|
||||
withNativeImageSvm = builtins.elem "native-image-installable-svm" platform.products;
|
||||
|
|
@ -169,8 +169,6 @@ let
|
|||
outputs = [ "out" "lib" ];
|
||||
|
||||
installPhase = ''
|
||||
# ensure that $lib/lib exists to avoid breaking builds
|
||||
mkdir -p $lib/lib
|
||||
# jni.h expects jni_md.h to be in the header search path.
|
||||
ln -s $out/include/linux/*_md.h $out/include/
|
||||
|
||||
|
|
@ -181,25 +179,26 @@ let
|
|||
if [ -z "\''${JAVA_HOME-}" ]; then export JAVA_HOME=$out; fi
|
||||
EOF
|
||||
${
|
||||
lib.optionalString (stdenv.isLinux) ''
|
||||
# provide libraries needed for static compilation
|
||||
${
|
||||
if useMusl then
|
||||
"for f in ${musl.stdenv.cc.cc}/lib/* ${musl}/lib/* ${zlib.static}/lib/*; do"
|
||||
else
|
||||
"for f in ${glibc}/lib/* ${glibc.static}/lib/* ${zlib.static}/lib/*; do"
|
||||
}
|
||||
ln -s $f $out/lib/svm/clibraries/${platform.arch}/$(basename $f)
|
||||
done
|
||||
lib.optionalString (stdenv.isLinux) ''
|
||||
# provide libraries needed for static compilation
|
||||
${
|
||||
if useMusl then
|
||||
''for f in "${musl.stdenv.cc.cc}/lib/"* "${musl}/lib/"* "${zlib.static}/lib/"*; do''
|
||||
else
|
||||
''for f in "${glibc}/lib/"* "${glibc.static}/lib/"* "${zlib.static}/lib/"*; do''
|
||||
}
|
||||
ln -s "$f" "$out/lib/svm/clibraries/${platform.arch}/$(basename $f)"
|
||||
done
|
||||
|
||||
# add those libraries to $lib output too, so we can use them with
|
||||
# `native-image -H:CLibraryPath=''${lib.getLib graalvmXX-ce}/lib ...` and reduce
|
||||
# closure size by not depending on GraalVM $out (that is much bigger)
|
||||
mkdir -p $lib/lib
|
||||
for f in ${glibc}/lib/*; do
|
||||
ln -s $f $lib/lib/$(basename $f)
|
||||
done
|
||||
''
|
||||
# add those libraries to $lib output too, so we can use them with
|
||||
# `native-image -H:CLibraryPath=''${lib.getLib graalvmXX-ce}/lib ...` and reduce
|
||||
# closure size by not depending on GraalVM $out (that is much bigger)
|
||||
# we always use glibc here, since musl is only supported for static compilation
|
||||
mkdir -p "$lib/lib"
|
||||
for f in "${glibc}/lib/"*; do
|
||||
ln -s "$f" "$lib/lib/$(basename $f)"
|
||||
done
|
||||
''
|
||||
}
|
||||
'';
|
||||
|
||||
|
|
@ -210,17 +209,11 @@ let
|
|||
autoPatchelfIgnoreMissingDeps = withRubySvm && stdenv.isDarwin;
|
||||
|
||||
preFixup = lib.optionalString (stdenv.isLinux) ''
|
||||
# We cannot use -exec since wrapProgram is a function but not a
|
||||
# command.
|
||||
#
|
||||
# jspawnhelper is executed from JVM, so it doesn't need to wrap it,
|
||||
# and it breaks building OpenJDK (#114495).
|
||||
for bin in $( find "$out" -executable -type f -not -path '*/languages/ruby/lib/gems/*' -not -name jspawnhelper ); do
|
||||
if patchelf --print-interpreter "$bin" &> /dev/null || head -n 1 "$bin" | grep '^#!' -q; then
|
||||
wrapProgram "$bin" \
|
||||
--prefix LD_LIBRARY_PATH : "${runtimeLibraryPath}" \
|
||||
--prefix PATH : "${runtimeDependencies}"
|
||||
fi
|
||||
# Find all executables in any directory that contains '/bin/'
|
||||
for bin in $(find "$out" -executable -type f -wholename '*/bin/*'); do
|
||||
wrapProgram "$bin" \
|
||||
--prefix LD_LIBRARY_PATH : "${runtimeLibraryPath}" \
|
||||
--prefix PATH : "${runtimeDependencies}"
|
||||
done
|
||||
|
||||
find "$out" -name libfontmanager.so -exec \
|
||||
|
|
|
|||
|
|
@ -1,4 +1,10 @@
|
|||
{ lib, stdenv, fetchFromGitHub, fetchpatch }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, testVersion
|
||||
, uasm
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "uasm";
|
||||
|
|
@ -14,9 +20,23 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "sha256-CIbHPKJa60SyJeFgF1Tux7RfJZBChhUVXR7HGa+gCtQ=";
|
||||
};
|
||||
|
||||
patches = lib.optionals stdenv.isDarwin [
|
||||
(fetchpatch {
|
||||
name = "fix-v2_55-compilation-on-macos.patch";
|
||||
url = "https://github.com/Terraspace/UASM/commit/b50c430cc3083c7f32e288a9f64fe1cafb03091d.patch";
|
||||
sha256 = "sha256-FGFB282LSEKtGD1cIRH+Qi5bye5Gx4xb0Ty4J03xjCU";
|
||||
})
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
makefile = "gccLinux64.mak";
|
||||
makefile =
|
||||
if stdenv.isDarwin then
|
||||
"ClangOSX64.mak"
|
||||
else
|
||||
"gccLinux64.mak";
|
||||
|
||||
makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
|
@ -27,10 +47,16 @@ stdenv.mkDerivation rec {
|
|||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru.tests.version = testVersion {
|
||||
package = uasm;
|
||||
command = "uasm -h";
|
||||
version = "v${version}";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "http://www.terraspace.co.uk/uasm.html";
|
||||
description = "A free MASM-compatible assembler based on JWasm";
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ thiagokokada ];
|
||||
license = licenses.watcom;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -8,13 +8,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gensio";
|
||||
version = "2.3.6";
|
||||
version = "2.3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cminyard";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-aPTwN5DuUFPqLDwq73KvmBR8tEN5bIX6/JOZMfOAoow=";
|
||||
sha256 = "sha256-g1o/udsIFLJ+gunvI2QtsnksPaa946jWKkcdmdGmQ/k=";
|
||||
};
|
||||
|
||||
passthru = {
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
From 57bed86429db9d871f1442c94f14e94e38972ca3 Mon Sep 17 00:00:00 2001
|
||||
From d68fcb793d70032e978ecf8e0577eea955a741cf Mon Sep 17 00:00:00 2001
|
||||
From: worldofpeace <worldofpeace@protonmail.ch>
|
||||
Date: Thu, 16 May 2019 21:15:15 -0400
|
||||
Date: Sun, 10 Apr 2022 12:02:10 +0800
|
||||
Subject: [PATCH] meson: add options for tests installation dirs
|
||||
|
||||
---
|
||||
meson_options.txt | 6 ++++++
|
||||
tests/meson.build | 23 ++++++++++++++++-------
|
||||
2 files changed, 22 insertions(+), 7 deletions(-)
|
||||
tests/meson.build | 13 +++++++++++--
|
||||
2 files changed, 17 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/meson_options.txt b/meson_options.txt
|
||||
index b9a2fb5..4b8629f 100644
|
||||
|
|
@ -23,7 +23,7 @@ index b9a2fb5..4b8629f 100644
|
|||
+ value: '',
|
||||
+ description: 'Installation directory for binary files in tests')
|
||||
diff --git a/tests/meson.build b/tests/meson.build
|
||||
index 77281f5..7522456 100644
|
||||
index 2b925e7..3276849 100644
|
||||
--- a/tests/meson.build
|
||||
+++ b/tests/meson.build
|
||||
@@ -21,8 +21,17 @@ unit_tests = [
|
||||
|
|
@ -32,66 +32,20 @@ index 77281f5..7522456 100644
|
|||
|
||||
-installed_test_datadir = join_paths(get_option('prefix'), get_option('datadir'), 'installed-tests', graphene_api_path)
|
||||
-installed_test_bindir = join_paths(get_option('prefix'), get_option('libexecdir'), 'installed-tests', graphene_api_path)
|
||||
+test_suffix = join_paths('installed-tests', graphene_api_path)
|
||||
+installed_test_suffix = join_paths('installed-tests', graphene_api_path)
|
||||
+
|
||||
+test_datadir = join_paths(get_option('installed_test_datadir'), test_suffix)
|
||||
+if test_datadir == ''
|
||||
+ test_datadir = join_paths(get_option('prefix'), get_option('datadir'), test_suffix)
|
||||
+installed_test_datadir = join_paths(get_option('installed_test_datadir'), installed_test_suffix)
|
||||
+if installed_test_datadir == ''
|
||||
+ installed_test_datadir = join_paths(get_option('prefix'), get_option('datadir'), installed_test_suffix)
|
||||
+endif
|
||||
+
|
||||
+test_bindir = join_paths(get_option('installed_test_bindir'), test_suffix)
|
||||
+if test_bindir == ''
|
||||
+ test_bindir = join_paths(get_option('prefix'), get_option('libexecdir'), test_suffix)
|
||||
+installed_test_bindir = join_paths(get_option('installed_test_bindir'), installed_test_suffix)
|
||||
+if installed_test_bindir == ''
|
||||
+ installed_test_bindir = join_paths(get_option('prefix'), get_option('libexecdir'), installed_test_suffix)
|
||||
+endif
|
||||
|
||||
# Make tests conditional on having mutest-1 installed system-wide, or
|
||||
# available as a subproject
|
||||
@@ -40,13 +49,13 @@ if mutest_dep.found()
|
||||
output: wrapper,
|
||||
command: [
|
||||
gen_installed_test,
|
||||
- '--testdir=@0@'.format(installed_test_bindir),
|
||||
+ '--testdir=@0@'.format(test_bindir),
|
||||
'--testname=@0@'.format(unit),
|
||||
'--outdir=@OUTDIR@',
|
||||
'--outfile=@0@'.format(wrapper),
|
||||
],
|
||||
install: get_option('installed_tests'),
|
||||
- install_dir: installed_test_datadir,
|
||||
+ install_dir: test_datadir,
|
||||
)
|
||||
|
||||
test(unit,
|
||||
@@ -55,7 +64,7 @@ if mutest_dep.found()
|
||||
include_directories: graphene_inc,
|
||||
c_args: common_cflags,
|
||||
install: get_option('installed_tests'),
|
||||
- install_dir: installed_test_bindir,
|
||||
+ install_dir: test_bindir,
|
||||
),
|
||||
env: ['MUTEST_OUTPUT=tap'],
|
||||
protocol: 'tap',
|
||||
@@ -66,17 +75,18 @@ endif
|
||||
if build_gir and host_system == 'linux' and not meson.is_cross_build()
|
||||
foreach unit: ['introspection.py']
|
||||
wrapper = '@0@.test'.format(unit)
|
||||
+ install_data(unit, install_dir: test_bindir)
|
||||
custom_target(wrapper,
|
||||
output: wrapper,
|
||||
command: [
|
||||
gen_installed_test,
|
||||
- '--testdir=@0@'.format(installed_test_bindir),
|
||||
+ '--testdir=@0@'.format(test_bindir),
|
||||
'--testname=@0@'.format(unit),
|
||||
'--outdir=@OUTDIR@',
|
||||
'--outfile=@0@'.format(wrapper),
|
||||
],
|
||||
install: get_option('installed_tests'),
|
||||
- install_dir: installed_test_datadir,
|
||||
+ install_dir: test_datadir,
|
||||
)
|
||||
|
||||
test(unit,
|
||||
--
|
||||
2.31.1
|
||||
2.35.1
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,7 @@
|
|||
{ lib, stdenv
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, nix-update-script
|
||||
, pkg-config
|
||||
, meson
|
||||
|
|
@ -17,7 +19,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "graphene";
|
||||
version = "1.10.6";
|
||||
version = "1.10.8";
|
||||
|
||||
outputs = [ "out" ]
|
||||
++ lib.optionals (stdenv.buildPlatform == stdenv.hostPlatform) [ "devdoc" "installedTests" ];
|
||||
|
|
@ -26,12 +28,21 @@ stdenv.mkDerivation rec {
|
|||
owner = "ebassi";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "v6YH3fRMTzhp7wmU8in9ukcavzHmOAW54EK9ZwQyFxc=";
|
||||
sha256 = "P6JQhSktzvyMHatP/iojNGXPmcsxsFxdYerXzS23ojI=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Add option for changing installation path of installed tests.
|
||||
./0001-meson-add-options-for-tests-installation-dirs.patch
|
||||
|
||||
# Disable flaky simd_operators_reciprocal test
|
||||
# https://github.com/ebassi/graphene/issues/246
|
||||
(fetchpatch {
|
||||
url = "https://github.com/ebassi/graphene/commit/4fbdd07ea3bcd0964cca3966010bf71cb6fa8209.patch";
|
||||
sha256 = "uFkkH0u4HuQ/ua1mfO7sJZ7MPrQdV/JON7mTYB4DW80=";
|
||||
includes = [ "tests/simd.c" ];
|
||||
revert = true;
|
||||
})
|
||||
];
|
||||
|
||||
depsBuildBuild = [
|
||||
|
|
|
|||
22
pkgs/development/libraries/libdvbcsa/default.nix
Normal file
22
pkgs/development/libraries/libdvbcsa/default.nix
Normal file
|
|
@ -0,0 +1,22 @@
|
|||
{lib, stdenv, fetchurl}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libdvbcsa";
|
||||
version = "1.1.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://get.videolan.org/libdvbcsa/${version}/${pname}-${version}.tar.gz";
|
||||
sha256 = "4db78af5cdb2641dfb1136fe3531960a477c9e3e3b6ba19a2754d046af3f456d";
|
||||
};
|
||||
|
||||
doCheck = true;
|
||||
|
||||
meta = {
|
||||
description = "A free implementation of the DVB Common Scrambling Algorithm with encryption and decryption capabilities";
|
||||
homepage = "http://www.videolan.org/developers/libdvbcsa.html";
|
||||
platforms = lib.platforms.unix;
|
||||
license = lib.licenses.gpl1;
|
||||
maintainers = with lib.maintainers; [ melias122 ];
|
||||
};
|
||||
|
||||
}
|
||||
|
|
@ -23,6 +23,11 @@ stdenv.mkDerivation rec {
|
|||
buildInputs = [ fftwSinglePrec libsamplerate qtbase ]
|
||||
++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.SystemConfiguration;
|
||||
|
||||
NIX_CFLAGS_COMPILE =
|
||||
lib.optionals (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "11") [
|
||||
"-std=c++11"
|
||||
];
|
||||
|
||||
dontWrapQtApps = true;
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -5,7 +5,11 @@ final: prev: let
|
|||
|
||||
### CuDNN
|
||||
|
||||
buildCuDnnPackage = args: callPackage ./generic.nix {} args;
|
||||
buildCuDnnPackage = args:
|
||||
let
|
||||
useCudatoolkitRunfile = lib.versionOlder cudaVersion "11.3.999";
|
||||
in
|
||||
callPackage ./generic.nix { inherit useCudatoolkitRunfile; } args;
|
||||
|
||||
toUnderscore = str: lib.replaceStrings ["."] ["_"] str;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,8 +1,14 @@
|
|||
{ stdenv
|
||||
, lib
|
||||
, cudatoolkit
|
||||
, zlib
|
||||
, useCudatoolkitRunfile ? false
|
||||
, cudaVersion
|
||||
, cudaMajorVersion
|
||||
, cudatoolkit # if cuda>=11: only used for .cc
|
||||
, libcublas ? null # cuda <11 doesn't ship redist packages
|
||||
, autoPatchelfHook
|
||||
, autoAddOpenGLRunpathHook
|
||||
, fetchurl
|
||||
, addOpenGLRunpath
|
||||
, # The distributed version of CUDNN includes both dynamically liked .so files,
|
||||
# as well as statically linked .a files. However, CUDNN is quite large
|
||||
# (multiple gigabytes), so you can save some space in your nix store by
|
||||
|
|
@ -17,44 +23,53 @@
|
|||
, url
|
||||
, hash ? null
|
||||
, sha256 ? null
|
||||
, supportedCudaVersions ? []
|
||||
, supportedCudaVersions ? [ ]
|
||||
}:
|
||||
|
||||
assert (hash != null) || (sha256 != null);
|
||||
|
||||
assert useCudatoolkitRunfile || (libcublas != null);
|
||||
|
||||
let
|
||||
inherit (cudatoolkit) cc;
|
||||
|
||||
majorMinorPatch = version: lib.concatStringsSep "." (lib.take 3 (lib.splitVersion version));
|
||||
version = majorMinorPatch fullVersion;
|
||||
in stdenv.mkDerivation {
|
||||
name = "cudatoolkit-${cudatoolkit.majorVersion}-cudnn-${version}";
|
||||
|
||||
cudatoolkit_root =
|
||||
if useCudatoolkitRunfile
|
||||
then cudatoolkit
|
||||
else libcublas;
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
pname = "cudatoolkit-${cudaMajorVersion}-cudnn";
|
||||
inherit version;
|
||||
# It's often the case that the src depends on the version of cudatoolkit it's
|
||||
# being linked against, so we pass in `cudatoolkit` as an argument to `mkSrc`.
|
||||
|
||||
src = fetchurl {
|
||||
inherit url hash sha256;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ addOpenGLRunpath ];
|
||||
# Check and normalize Runpath against DT_NEEDED using autoPatchelf.
|
||||
# Prepend /run/opengl-driver/lib using addOpenGLRunpath for dlopen("libcudacuda.so")
|
||||
nativeBuildInputs = [
|
||||
autoPatchelfHook
|
||||
autoAddOpenGLRunpathHook
|
||||
];
|
||||
|
||||
# Some cuDNN libraries depend on things in cudatoolkit, eg.
|
||||
# libcudnn_ops_infer.so.8 tries to load libcublas.so.11. So we need to patch
|
||||
# cudatoolkit into RPATH. See also https://github.com/NixOS/nixpkgs/blob/88a2ad974692a5c3638fcdc2c772e5770f3f7b21/pkgs/development/python-modules/jaxlib/bin.nix#L78-L98.
|
||||
# Used by autoPatchelfHook
|
||||
buildInputs = [
|
||||
cc.cc.lib # libstdc++
|
||||
zlib
|
||||
cudatoolkit_root
|
||||
];
|
||||
|
||||
# We used to patch Runpath here, but now we use autoPatchelfHook
|
||||
#
|
||||
# Note also that version <=8.3.0 contained a subdirectory "lib64/" but in
|
||||
# version 8.3.2 it seems to have been renamed to simply "lib/".
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
function fixRunPath {
|
||||
p=$(patchelf --print-rpath $1)
|
||||
patchelf --set-rpath "''${p:+$p:}${lib.makeLibraryPath [ stdenv.cc.cc cudatoolkit.lib ]}:${cudatoolkit}/lib:\$ORIGIN/" $1
|
||||
}
|
||||
|
||||
for sofile in {lib,lib64}/lib*.so; do
|
||||
fixRunPath $sofile
|
||||
done
|
||||
|
||||
mkdir -p $out
|
||||
cp -a include $out/include
|
||||
[ -d "lib/" ] && cp -a lib $out/lib
|
||||
|
|
@ -66,20 +81,20 @@ in stdenv.mkDerivation {
|
|||
runHook postInstall
|
||||
'';
|
||||
|
||||
# Set RUNPATH so that libcuda in /run/opengl-driver(-32)/lib can be found.
|
||||
# See the explanation in addOpenGLRunpath.
|
||||
postFixup = ''
|
||||
for lib in $out/lib/lib*.so; do
|
||||
addOpenGLRunpath $lib
|
||||
done
|
||||
# Without --add-needed autoPatchelf forgets $ORIGIN on cuda>=8.0.5.
|
||||
postFixup = lib.optionalString (lib.versionAtLeast fullVersion "8.0.5") ''
|
||||
patchelf $out/lib/libcudnn.so --add-needed libcudnn_cnn_infer.so
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [
|
||||
cudatoolkit
|
||||
];
|
||||
|
||||
passthru = {
|
||||
inherit cudatoolkit;
|
||||
inherit useCudatoolkitRunfile;
|
||||
|
||||
cudatoolkit = lib.warn ''
|
||||
cudnn.cudatoolkit passthru attribute is deprecated;
|
||||
if your derivation uses cudnn directly, it should probably consume cudaPackages instead
|
||||
''
|
||||
cudatoolkit;
|
||||
|
||||
majorVersion = lib.versions.major version;
|
||||
};
|
||||
|
||||
|
|
@ -89,9 +104,10 @@ in stdenv.mkDerivation {
|
|||
# official version constraints (as recorded in default.nix). In some cases
|
||||
# you _may_ be able to smudge version constraints, just know that you're
|
||||
# embarking into unknown and unsupported territory when doing so.
|
||||
broken = !(elem cudatoolkit.majorMinorVersion supportedCudaVersions);
|
||||
broken = !(elem cudaVersion supportedCudaVersions);
|
||||
description = "NVIDIA CUDA Deep Neural Network library (cuDNN)";
|
||||
homepage = "https://developer.nvidia.com/cudnn";
|
||||
# TODO: consider marking unfreRedistributable when not using runfile
|
||||
license = licenses.unfree;
|
||||
platforms = [ "x86_64-linux" ];
|
||||
maintainers = with maintainers; [ mdaiter samuela ];
|
||||
|
|
|
|||
|
|
@ -59,6 +59,8 @@ stdenv.mkDerivation rec {
|
|||
--replace '@PREFIX@' $out/lib/
|
||||
substituteInPlace ./test/unit/tctildr-dl.c \
|
||||
--replace '@PREFIX@' $out/lib
|
||||
substituteInPlace ./configure.ac \
|
||||
--replace 'm4_esyscmd_s([git describe --tags --always --dirty])' '${version}'
|
||||
'';
|
||||
|
||||
configureFlags = lib.optionals (stdenv.buildPlatform == stdenv.hostPlatform) [
|
||||
|
|
|
|||
22
pkgs/development/ocaml-modules/rebez/default.nix
Normal file
22
pkgs/development/ocaml-modules/rebez/default.nix
Normal file
|
|
@ -0,0 +1,22 @@
|
|||
{ buildDunePackage, fetchFromGitHub, lib, reason }:
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "rebez";
|
||||
version = "unstable-2019-06-20";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jchavarri";
|
||||
repo = "rebez";
|
||||
rev = "03fa3b707abb28fdd710eb9e57ba40d9cd6ae163";
|
||||
sha256 = "sha256-khZSwtwW+mP/EvAvIZMQyOb6FgNR+gmzpBZoD9ZPkpY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ reason ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Cubic bezier implementation in Reason / OCaml";
|
||||
homepage = "https://github.com/jchavarri/rebez/";
|
||||
maintainers = with maintainers; [ superherointj ];
|
||||
license = licenses.mit;
|
||||
};
|
||||
}
|
||||
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiodiscover";
|
||||
version = "1.4.8";
|
||||
version = "1.4.9";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
|||
owner = "bdraco";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-ts3PnL1ePWJHHaLuC0eQKqBOt+HeEeAayeVBAIhnUWs=";
|
||||
sha256 = "sha256-KfNf09L8WF8Op+uVLRttROIgXpY79v0HfMv8b2qMSxE=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -8,14 +8,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiotractive";
|
||||
version = "0.5.3";
|
||||
version = "0.5.4";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zhulik";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1rkylzbxxy3p744q1iqcvpnkn12ra6ja16vhqzidn702n4h5377j";
|
||||
sha256 = "sha256-pcGUl8mq1O1QY5EPkNhWRLCKDn2FWAF9XymXkUXWEUk=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -20,14 +20,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "asdf";
|
||||
version = "2.11.0";
|
||||
version = "2.11.1";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-FEWXGSkneduhO9+YlzrZvpJHUsI7TeagVLwBdMEIRvw=";
|
||||
hash = "sha256-1uDRoS9nyZCLPdbiAQBADoiwqaVBzj1NMpZXdJQYoxQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -12,14 +12,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "awscrt";
|
||||
version = "0.13.8";
|
||||
version = "0.13.9";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-n1ckAHU31Lo/CdhKxa4sOWuNLg565BB0XKcmpZovCMs=";
|
||||
hash = "sha256-9XUzHfezr+bhQt6OKYiVEaCHqqWE6J7Y4Rj3MmaMAXA=";
|
||||
};
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "azure-keyvault-keys";
|
||||
version = "4.5.0";
|
||||
version = "4.5.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
|
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
|||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
extension = "zip";
|
||||
hash = "sha256-x1AhiARXZXcky3A+DJXoCrvkqsonlkgdrdr6es/VY3s=";
|
||||
hash = "sha256-2ojnH+ySoU+1jOyIaKv366BAGI3Nzjac4QUK3RllhvY=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,17 +1,28 @@
|
|||
{ lib, buildPythonPackage, fetchPypi }:
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "bitstruct";
|
||||
version = "8.13.0";
|
||||
version = "8.14.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-e4fZ5B/1UqjK4G6iNow3crbzECvatLZeeTvnWQ1p8Ds=";
|
||||
hash = "sha256-IwwZHHXxUm9pIs2wjqtvUsBVRS4iOb9WOPAunP04LJE=";
|
||||
};
|
||||
|
||||
pythonImportsCheck = [
|
||||
"bitstruct"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/eerimoq/bitstruct";
|
||||
description = "Python bit pack/unpack package";
|
||||
homepage = "https://github.com/eerimoq/bitstruct";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ jakewaksbaum ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -19,14 +19,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "commoncode";
|
||||
version = "30.0.0";
|
||||
version = "30.1.1";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-6SeU4u6pfDuGCgCYAO5fdbWBxW9XN3WvM8j6DwUlFwM=";
|
||||
sha256 = "sha256-KymdX+5CAYSRpOwpqQ1DMCFWqkeMAmOHjVnBZTji76I=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -7,6 +7,7 @@
|
|||
, pytest-asyncio
|
||||
, aiosqlite
|
||||
, databases
|
||||
, fetchpatch
|
||||
, flask
|
||||
, httpx
|
||||
, passlib
|
||||
|
|
@ -19,7 +20,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "fastapi";
|
||||
version = "0.75.1";
|
||||
version = "0.75.2";
|
||||
format = "flit";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
|
@ -28,7 +29,7 @@ buildPythonPackage rec {
|
|||
owner = "tiangolo";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-tSZ5isMzDhDsuVNQdoYXG0IYkgCvdVdARtFXELNjTtk=";
|
||||
hash = "sha256-B4q3Q256Sj4jTQt1TDm3fiEaQKdVxddCF9+KsxkkTWo=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -50,6 +51,16 @@ buildPythonPackage rec {
|
|||
trio
|
||||
];
|
||||
|
||||
patches = [
|
||||
# Bump starlette, https://github.com/tiangolo/fastapi/pull/4483
|
||||
(fetchpatch {
|
||||
name = "support-later-starlette.patch";
|
||||
# PR contains multiple commits
|
||||
url = "https://patch-diff.githubusercontent.com/raw/tiangolo/fastapi/pull/4483.patch";
|
||||
sha256 = "sha256-ZWaqAd/QYEYRL1hSQdXdFPgWgdmOill2GtmEn33vz2U=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace "starlette ==" "starlette >="
|
||||
|
|
@ -70,10 +81,13 @@ buildPythonPackage rec {
|
|||
|
||||
disabledTests = [
|
||||
"test_get_custom_response"
|
||||
|
||||
# Failed: DID NOT RAISE <class 'starlette.websockets.WebSocketDisconnect'>
|
||||
"test_websocket_invalid_data"
|
||||
"test_websocket_no_credentials"
|
||||
# TypeError: __init__() missing 1...starlette-releated
|
||||
"test_head"
|
||||
"test_options"
|
||||
"test_trace"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "fastcore";
|
||||
version = "1.4.1";
|
||||
version = "1.4.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -16,8 +16,8 @@ buildPythonPackage rec {
|
|||
src = fetchFromGitHub {
|
||||
owner = "fastai";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-qZsCsMwZxJsnznQ/C1SUPexkquv0tIyCkNYL5f2k0FU=";
|
||||
rev = "refs/tags/${version}";
|
||||
sha256 = "sha256-0q+qFrfMsXkwgu08igt2kHZ9c3/aqz/inCpJXkPZsdg=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
|
||||
let
|
||||
pname = "findpython";
|
||||
version = "0.1.5";
|
||||
version = "0.1.6";
|
||||
in
|
||||
buildPythonPackage {
|
||||
inherit pname version;
|
||||
|
|
@ -25,7 +25,7 @@ buildPythonPackage {
|
|||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-AjTmTKIhWhl39O18S2XRVxeDiIzCpKH2qdjkY2h+i8M=";
|
||||
hash = "sha256-n9YYXNy5a6pxCTCER++0k7LH8aj1aeEorxTXJrKmnhg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "glfw";
|
||||
version = "2.5.1";
|
||||
version = "2.5.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "FlorianRhiem";
|
||||
repo = "pyGLFW";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-XR6TqIrbCR93Qe9cRMgJ0aT/6ZZFj+6Mz+9GhiMD8lM=";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-LaK/lYCUN7PDy8QsaGCnQPM1nvQNeBRTdEEkKtaMUHA=";
|
||||
};
|
||||
|
||||
# Patch path to GLFW shared object
|
||||
|
|
|
|||
|
|
@ -13,14 +13,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-bigtable";
|
||||
version = "2.8.0";
|
||||
version = "2.8.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-FLnEEsbTie1Z/9Y8nLzvLFbxiexUL4GFa8jCcEAYK1s=";
|
||||
hash = "sha256-Gy/CS06uGQyQoPLjm8ChR6MkO6CYkpC/n5wM/VncDDs=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -19,17 +19,21 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "graphene-django";
|
||||
version = "unstable-2021-06-11";
|
||||
version = "unstable-2022-03-03";
|
||||
format = "setuptools";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "graphql-python";
|
||||
repo = pname;
|
||||
rev = "e7f7d8da07ba1020f9916153f17e97b0ec037712";
|
||||
sha256 = "0b33q1im90ahp3gzy9wx5amfzy6q57ydjpy5rn988gh81hbyqaxv";
|
||||
rev = "f6ec0689c18929344c79ae363d2e3d5628fa4a2d";
|
||||
hash = "sha256-KTZ5jcoeHYXnlaF47t8jIi6+7NyMyA4hDPv+il3bt+U=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./graphene-3_2_0.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace '"pytest-runner"' ""
|
||||
|
|
|
|||
|
|
@ -0,0 +1,150 @@
|
|||
diff --git a/graphene_django/filter/tests/test_fields.py b/graphene_django/filter/tests/test_fields.py
|
||||
index 7d440f4..0aec6e4 100644
|
||||
--- a/graphene_django/filter/tests/test_fields.py
|
||||
+++ b/graphene_django/filter/tests/test_fields.py
|
||||
@@ -1005,7 +1005,7 @@ def test_integer_field_filter_type():
|
||||
|
||||
schema = Schema(query=Query)
|
||||
|
||||
- assert str(schema) == dedent(
|
||||
+ assert str(schema).rstrip() + "\n" == dedent(
|
||||
"""\
|
||||
type Query {
|
||||
pets(offset: Int = null, before: String = null, after: String = null, first: Int = null, last: Int = null, age: Int = null): PetTypeConnection
|
||||
@@ -1074,7 +1074,7 @@ def test_other_filter_types():
|
||||
|
||||
schema = Schema(query=Query)
|
||||
|
||||
- assert str(schema) == dedent(
|
||||
+ assert str(schema).rstrip() + "\n" == dedent(
|
||||
"""\
|
||||
type Query {
|
||||
pets(offset: Int = null, before: String = null, after: String = null, first: Int = null, last: Int = null, age: Int = null, age_Isnull: Boolean = null, age_Lt: Int = null): PetTypeConnection
|
||||
diff --git a/graphene_django/tests/test_command.py b/graphene_django/tests/test_command.py
|
||||
index 70116b8..a4ab4db 100644
|
||||
--- a/graphene_django/tests/test_command.py
|
||||
+++ b/graphene_django/tests/test_command.py
|
||||
@@ -49,7 +49,7 @@ def test_generate_graphql_file_on_call_graphql_schema():
|
||||
assert handle.write.called_once()
|
||||
|
||||
schema_output = handle.write.call_args[0][0]
|
||||
- assert schema_output == dedent(
|
||||
+ assert schema_output.rstrip() + "\n" == dedent(
|
||||
"""\
|
||||
type Query {
|
||||
hi: String
|
||||
diff --git a/graphene_django/tests/test_types.py b/graphene_django/tests/test_types.py
|
||||
index bde72c7..0b64440 100644
|
||||
--- a/graphene_django/tests/test_types.py
|
||||
+++ b/graphene_django/tests/test_types.py
|
||||
@@ -247,7 +247,7 @@ def test_schema_representation():
|
||||
}
|
||||
"""
|
||||
)
|
||||
- assert str(schema) == expected
|
||||
+ assert str(schema).rstrip() + "\n" == expected
|
||||
|
||||
|
||||
def with_local_registry(func):
|
||||
@@ -515,7 +515,7 @@ class TestDjangoObjectType:
|
||||
|
||||
schema = Schema(query=Query)
|
||||
|
||||
- assert str(schema) == dedent(
|
||||
+ assert str(schema).rstrip() + "\n" == dedent(
|
||||
"""\
|
||||
type Query {
|
||||
pet: Pet
|
||||
@@ -541,7 +541,7 @@ class TestDjangoObjectType:
|
||||
|
||||
schema = Schema(query=Query)
|
||||
|
||||
- assert str(schema) == dedent(
|
||||
+ assert str(schema).rstrip() + "\n" == dedent(
|
||||
"""\
|
||||
type Query {
|
||||
pet: Pet
|
||||
@@ -576,7 +576,7 @@ class TestDjangoObjectType:
|
||||
|
||||
schema = Schema(query=Query)
|
||||
|
||||
- assert str(schema) == dedent(
|
||||
+ assert str(schema).rstrip() + "\n" == dedent(
|
||||
"""\
|
||||
type Query {
|
||||
pet: Pet
|
||||
@@ -603,7 +603,7 @@ class TestDjangoObjectType:
|
||||
|
||||
schema = Schema(query=Query)
|
||||
|
||||
- assert str(schema) == dedent(
|
||||
+ assert str(schema).rstrip() + "\n" == dedent(
|
||||
"""\
|
||||
type Query {
|
||||
pet: PetModelKind
|
||||
@@ -642,7 +642,7 @@ class TestDjangoObjectType:
|
||||
|
||||
schema = Schema(query=Query)
|
||||
|
||||
- assert str(schema) == dedent(
|
||||
+ assert str(schema).rstrip() + "\n" == dedent(
|
||||
"""\
|
||||
type Query {
|
||||
pet: PetModelKind
|
||||
diff --git a/graphene_django/tests/test_views.py b/graphene_django/tests/test_views.py
|
||||
index 945fa87..e2e8b46 100644
|
||||
--- a/graphene_django/tests/test_views.py
|
||||
+++ b/graphene_django/tests/test_views.py
|
||||
@@ -109,12 +109,10 @@ def test_reports_validation_errors(client):
|
||||
{
|
||||
"message": "Cannot query field 'unknownOne' on type 'QueryRoot'.",
|
||||
"locations": [{"line": 1, "column": 9}],
|
||||
- "path": None,
|
||||
},
|
||||
{
|
||||
"message": "Cannot query field 'unknownTwo' on type 'QueryRoot'.",
|
||||
"locations": [{"line": 1, "column": 21}],
|
||||
- "path": None,
|
||||
},
|
||||
]
|
||||
}
|
||||
@@ -135,8 +133,6 @@ def test_errors_when_missing_operation_name(client):
|
||||
"errors": [
|
||||
{
|
||||
"message": "Must provide operation name if query contains multiple operations.",
|
||||
- "locations": None,
|
||||
- "path": None,
|
||||
}
|
||||
]
|
||||
}
|
||||
@@ -476,8 +472,7 @@ def test_handles_syntax_errors_caught_by_graphql(client):
|
||||
"errors": [
|
||||
{
|
||||
"locations": [{"column": 1, "line": 1}],
|
||||
- "message": "Syntax Error: Unexpected Name 'syntaxerror'.",
|
||||
- "path": None,
|
||||
+ "message": "Syntax Error: Unexpected Name 'syntaxerror'."
|
||||
}
|
||||
]
|
||||
}
|
||||
diff --git a/graphene_django/views.py b/graphene_django/views.py
|
||||
index c23b020..f533f70 100644
|
||||
--- a/graphene_django/views.py
|
||||
+++ b/graphene_django/views.py
|
||||
@@ -11,7 +11,6 @@ from django.views.decorators.csrf import ensure_csrf_cookie
|
||||
from django.views.generic import View
|
||||
from graphql import OperationType, get_operation_ast, parse, validate
|
||||
from graphql.error import GraphQLError
|
||||
-from graphql.error import format_error as format_graphql_error
|
||||
from graphql.execution import ExecutionResult
|
||||
|
||||
from graphene import Schema
|
||||
@@ -387,7 +386,7 @@ class GraphQLView(View):
|
||||
@staticmethod
|
||||
def format_error(error):
|
||||
if isinstance(error, GraphQLError):
|
||||
- return format_graphql_error(error)
|
||||
+ return error.formatted
|
||||
|
||||
return {"message": str(error)}
|
||||
|
||||
|
|
@ -1,6 +1,7 @@
|
|||
{ lib
|
||||
, aniso8601
|
||||
, buildPythonPackage
|
||||
, fetchpatch
|
||||
, fetchFromGitHub
|
||||
, graphql-core
|
||||
, graphql-relay
|
||||
|
|
@ -29,6 +30,20 @@ buildPythonPackage rec {
|
|||
sha256 = "0qgp3nl6afyz6y27bw175hyqppx75pp1vqwl7nvlpwvgwyyc2mnl";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix graphql-core 3.2.0 support
|
||||
(fetchpatch {
|
||||
# https://github.com/graphql-python/graphene/pull/1378
|
||||
url = "https://github.com/graphql-python/graphene/commit/989970f89341ebb949962d13dcabca8a6ccddad4.patch";
|
||||
hash = "sha256-qRxWTqv5XQN7uFjL2uv9NjTvSLi76/MyFSa4jpkb8to=";
|
||||
})
|
||||
(fetchpatch {
|
||||
# https://github.com/graphql-python/graphene/pull/1417
|
||||
url = "https://github.com/graphql-python/graphene/commit/4e0e18d1682b7759bdf16499c573f675c7fb51cb.patch";
|
||||
hash = "sha256-icdTGDabJouQ3hVpcMkkeabNwdoDxdVVAboTOWFbO94=";
|
||||
})
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
aniso8601
|
||||
graphql-core
|
||||
|
|
@ -53,6 +68,8 @@ buildPythonPackage rec {
|
|||
# Expects different Exeception classes, but receives none of them
|
||||
# https://github.com/graphql-python/graphene/issues/1346
|
||||
"test_unexpected_error"
|
||||
# https://github.com/graphql-python/graphene/pull/1417#issuecomment-1102492138
|
||||
"test_example_end_to_end"
|
||||
] ++ lib.optionals (pythonAtLeast "3.10") [
|
||||
"test_objecttype_as_container_extra_args"
|
||||
"test_objecttype_as_container_invalid_kwargs"
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ buildPythonPackage rec {
|
|||
owner = "matthiask";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-1JSdi1PFM+N+UuEPfgWkOZw8S2PZ4ntadU0wnVJNnjw=";
|
||||
hash = "sha256-1JSdi1PFM+N+UuEPfgWkOZw8S2PZ4ntadU0wnVJNnjw=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -31,7 +31,9 @@ buildPythonPackage rec {
|
|||
];
|
||||
|
||||
disabledTests = [
|
||||
# Tests are sensitive to output
|
||||
"test_billion_laughs"
|
||||
"test_10_broken_html"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, hypothesis
|
||||
, poetry-core
|
||||
, pytestCheckHook
|
||||
, pytz
|
||||
, pythonOlder
|
||||
|
|
@ -10,7 +11,7 @@
|
|||
buildPythonPackage rec {
|
||||
pname = "iso8601";
|
||||
version = "1.0.2";
|
||||
format = "setuptools";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
|
|
@ -19,6 +20,10 @@ buildPythonPackage rec {
|
|||
sha256 = "sha256-J/UDIg5oRdnblU+yErlbA2LYt+bBsjJqhwYcPek1lLE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
hypothesis
|
||||
pytestCheckHook
|
||||
|
|
|
|||
|
|
@ -2,14 +2,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "kiss-headers";
|
||||
version = "2.3.0";
|
||||
version = "2.3.1";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Ousret";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-/eTRyxFyAKQMzE/JjdoEN3w0lRiaIJcsJHTWV8M0CYQ=";
|
||||
rev = "refs/tags/${version}";
|
||||
sha256 = "sha256-xPjw/uJTmvmQZDrI3i1KTUeAZuDF1mc13hvFBl8Erh0=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ requests ];
|
||||
|
|
|
|||
|
|
@ -43,6 +43,12 @@ buildPythonPackage rec {
|
|||
requests-mock
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
# https://github.com/hacf-fr/meteofrance-api/pull/378
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace 'pytz = ">=2020.4,<2022.0"' 'pytz = ">=2020.4,<2023.0"'
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [
|
||||
"meteofrance_api"
|
||||
];
|
||||
|
|
|
|||
|
|
@ -8,19 +8,18 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "mypy-boto3-s3";
|
||||
version = "1.21.27.post1";
|
||||
version = "1.21.34";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-LPc7ejocoSEtVaSW2Iye9EQiMrY4YU91bYSa4F3NRlg=";
|
||||
hash = "sha256-gXvMC+GZknL+jYG9ZQD1/dqRhMwXrZvXG8CvCFYxdco=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
boto3
|
||||
] ++ lib.optionals (pythonOlder "3.9") [
|
||||
typing-extensions
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "ocrmypdf";
|
||||
version = "13.4.2";
|
||||
version = "13.4.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jbarlow83";
|
||||
|
|
@ -39,7 +39,7 @@ buildPythonPackage rec {
|
|||
extraPostFetch = ''
|
||||
rm "$out/.git_archival.txt"
|
||||
'';
|
||||
sha256 = "sha256-P829Tv2848iMEFzweydGSkFEnkfX8Rvyqd6Yqu+2VXY=";
|
||||
hash = "sha256-kriT3NV9Lj44WjOeK6+pILjfRMt9QMcKU57si394xxI=";
|
||||
};
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
|
|
|||
|
|
@ -70,8 +70,8 @@ buildPythonPackage rec {
|
|||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace 'SQLAlchemy = ">=1.3.18,<=1.4.29"' 'SQLAlchemy = ">=1.3.18"' \
|
||||
--replace 'databases = ">=0.3.2,!=0.5.0,!=0.5.1,!=0.5.2,!=0.5.3,<0.5.5"' 'databases = ">=0.5.5"'
|
||||
--replace 'SQLAlchemy = ">=1.3.18,<=1.4.31"' 'SQLAlchemy = ">=1.3.18"' \
|
||||
--replace 'databases = ">=0.3.2,!=0.5.0,!=0.5.1,!=0.5.2,!=0.5.3,<=0.5.5"' 'databases = ">=0.5.5"'
|
||||
'';
|
||||
|
||||
disabledTests = [
|
||||
|
|
@ -84,8 +84,8 @@ buildPythonPackage rec {
|
|||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/collerek/ormar";
|
||||
description = "Async ORM with fastapi in mind and pydantic validation";
|
||||
homepage = "https://github.com/collerek/ormar";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ andreasfelix ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "panel";
|
||||
version = "0.12.7";
|
||||
version = "0.13.0";
|
||||
|
||||
format = "wheel";
|
||||
|
||||
|
|
@ -23,7 +23,7 @@ buildPythonPackage rec {
|
|||
# tries to fetch even more artifacts
|
||||
src = fetchPypi {
|
||||
inherit pname version format;
|
||||
hash = "sha256-VcoMGYT48WduyuyTB/4KJybT/pBKV0hB1pSpZGagAeA=";
|
||||
hash = "sha256-Iv1Lb45n2XUHSluZzdF2Bf/hXZmgs++9/av26rHgePc=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -7,14 +7,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pex";
|
||||
version = "2.1.79";
|
||||
version = "2.1.80";
|
||||
format = "flit";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-XIqof/RZL1dmfPU6NVtkf18zrkG5RPOesGfsDDrPhQ8=";
|
||||
hash = "sha256-m9HMvLoFpg5aUoNknLdF7X++XEk9j70+qaid627uYvs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -8,14 +8,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pg8000";
|
||||
version = "1.25.0";
|
||||
version = "1.26.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-i8/HmxxqoFj1OEwtXjF/u+yOmQ33RJbVHYmx78/d9Ng=";
|
||||
sha256 = "sha256-niXqE6W3/Mg7AmBR18bk3NUiHpUOvlOT3nFaP+oVJ9M=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,30 +1,36 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, vcversioner
|
||||
, mock
|
||||
, pytestCheckHook
|
||||
, pytest-asyncio
|
||||
, pytest-trio
|
||||
, twisted
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, twisted
|
||||
, typing-extensions
|
||||
, vcversioner
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyee";
|
||||
version = "9.0.4";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-J3DEkoq8ch9GtwXmpysMWUgMSmnJqDygsAu5lPHqSzI=";
|
||||
hash = "sha256-J3DEkoq8ch9GtwXmpysMWUgMSmnJqDygsAu5lPHqSzI=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
vcversioner
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
typing-extensions
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
mock
|
||||
pytest-asyncio
|
||||
|
|
@ -33,7 +39,9 @@ buildPythonPackage rec {
|
|||
twisted
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "pyee" ];
|
||||
pythonImportsCheck = [
|
||||
"pyee"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A port of Node.js's EventEmitter to Python";
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pykeyatome";
|
||||
version = "1.4.1";
|
||||
version = "1.5.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -21,8 +21,8 @@ buildPythonPackage rec {
|
|||
src = fetchFromGitHub {
|
||||
owner = "jugla";
|
||||
repo = "pyKeyAtome";
|
||||
rev = "V${version}";
|
||||
sha256 = "sha256-Gv418i2JLoovwagkZpv8PIJPW3I/0pRmXR/PJOJ2NBc=";
|
||||
rev = "refs/tags/V${version}";
|
||||
sha256 = "sha256-LIPNCItD+qmk9NKAYbhEQC/A05Le9CNXECg7X2SlfdI=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -10,13 +10,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pynetbox";
|
||||
version = "6.6.1";
|
||||
version = "6.6.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "netbox-community";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-8oqbnCAMq29QIp9ETbMa3Ve8tTuJzQ0D8KlOYnLdUgQ=";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-W5ukrhqJTgOXM9MnbZWvNy9TCoEUGrFYfD+zGGNU07w=";
|
||||
};
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
{ lib
|
||||
, appdirs
|
||||
, buildPythonPackage
|
||||
, certifi
|
||||
, fetchFromGitHub
|
||||
, importlib-metadata
|
||||
, poetry-core
|
||||
|
|
@ -16,7 +17,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyppeteer";
|
||||
version = "0.2.6";
|
||||
version = "1.0.2";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
|
@ -25,7 +26,7 @@ buildPythonPackage rec {
|
|||
owner = pname;
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-mMFQp8GMjKUc3yyB4c8Tgxut7LkMFa2cySO3iSA/aI4=";
|
||||
sha256 = "sha256-izMaWtJdkLHMQbyq7o7n46xB8dOHXZ5uO0UXt+twjL4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -34,6 +35,7 @@ buildPythonPackage rec {
|
|||
|
||||
propagatedBuildInputs = [
|
||||
appdirs
|
||||
certifi
|
||||
importlib-metadata
|
||||
pyee
|
||||
tqdm
|
||||
|
|
@ -49,6 +51,7 @@ buildPythonPackage rec {
|
|||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace 'pyee = "^8.1.0"' 'pyee = "*"' \
|
||||
--replace 'websockets = "^9.1"' 'websockets = "*"'
|
||||
'';
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,9 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, setuptools-scm
|
||||
, pytest
|
||||
, jinja2
|
||||
, matplotlib
|
||||
, nose
|
||||
, pillow
|
||||
|
|
@ -17,11 +19,18 @@ buildPythonPackage rec {
|
|||
sha256 = "sha256-iE4HjS1TgK9WQzhOIzw1jpZZgl+y2X/9r48YXENMjYk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools-scm
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
pytest
|
||||
];
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION=version;
|
||||
|
||||
propagatedBuildInputs = [
|
||||
jinja2
|
||||
matplotlib
|
||||
nose
|
||||
pillow
|
||||
|
|
@ -31,12 +40,18 @@ buildPythonPackage rec {
|
|||
pytestCheckHook
|
||||
];
|
||||
|
||||
# Broken since b6e98f18950c2b5dbdc725c1181df2ad1be19fee
|
||||
|
||||
disabledTests = [
|
||||
# Broken since b6e98f18950c2b5dbdc725c1181df2ad1be19fee
|
||||
"test_hash_fails"
|
||||
"test_hash_missing"
|
||||
];
|
||||
|
||||
disabledTestPaths = [
|
||||
# Following are broken since at least a1548780dbc79d76360580691dc1bb4af4e837f6
|
||||
"tests/subtests/test_subtest.py"
|
||||
];
|
||||
|
||||
preCheck = ''
|
||||
export HOME=$(mktemp -d)
|
||||
mkdir -p $HOME/.config/matplotlib
|
||||
|
|
|
|||
|
|
@ -10,11 +10,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pywayland";
|
||||
version = "0.4.11";
|
||||
version = "0.4.12";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "coUNrPcHLBDamgKiZ08ysg2maQ2wLRSijfNRblKMIZk=";
|
||||
sha256 = "sha256-IAwBzV+wvQYgoJK1+GjAHm2aXWE2iVaMV2cduMtCkx8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
|
|
|||
|
|
@ -7,6 +7,7 @@
|
|||
, libxkbcommon
|
||||
, libinput
|
||||
, pixman
|
||||
, pythonOlder
|
||||
, udev
|
||||
, wlroots
|
||||
, wayland
|
||||
|
|
@ -18,11 +19,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pywlroots";
|
||||
version = "0.15.12";
|
||||
version = "0.15.13";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-4uS47SJelkeBkqBcA6xzcTQqAXXSgcVJIZErVdR9ELY=";
|
||||
sha256 = "teZ8udox+4NefgA73gD5d6hPur/zjCapoMYPW36ax0s=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
|
|
|||
|
|
@ -16,11 +16,11 @@ buildPythonPackage rec {
|
|||
version = "8.2.20220204150214";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-PlPb/nE3eWueUTWSDpa7JxPe2ee+KFna5VTR3IsClwQ=";
|
||||
hash = "sha256-PlPb/nE3eWueUTWSDpa7JxPe2ee+KFna5VTR3IsClwQ=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -37,9 +37,11 @@ buildPythonPackage rec {
|
|||
];
|
||||
|
||||
disabledTests = [
|
||||
# setup for these tests requires network access
|
||||
# Setup for these tests requires network access
|
||||
"test_secondaryFiles"
|
||||
"test_outputBinding"
|
||||
# Test requires network
|
||||
"test_yaml_tab_error"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
|
|
|
|||
|
|
@ -7,14 +7,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "stripe";
|
||||
version = "2.72.0";
|
||||
version = "2.73.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-nKjoejNzV9IAjSdP9WNi8hnnNnEDC+KmNnSN7rE3d/s=";
|
||||
hash = "sha256-Z5JG1mPaX7OElL48OoIljUdqu4TKrmfwrh85Z81i0zo=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -48,7 +48,8 @@ in buildPythonPackage {
|
|||
inherit (packages) version;
|
||||
format = "wheel";
|
||||
|
||||
disabled = pythonAtLeast "3.10";
|
||||
# See https://github.com/tensorflow/tensorflow/issues/55581#issuecomment-1101890383
|
||||
disabled = pythonAtLeast "3.10" && !cudaSupport;
|
||||
|
||||
src = let
|
||||
pyVerNoDot = lib.strings.stringAsChars (x: if x == "." then "" else x) python.pythonVersion;
|
||||
|
|
@ -97,11 +98,11 @@ in buildPythonPackage {
|
|||
(
|
||||
cd unpacked/tensorflow*
|
||||
# Adjust dependency requirements:
|
||||
# - Relax gast version requirement that doesn't match what we have packaged
|
||||
# - Relax tensorflow-estimator version requirement that doesn't match what we have packaged
|
||||
# - The purpose of python3Packages.libclang is not clear at the moment and we don't have it packaged yet
|
||||
# - keras and tensorlow-io-gcs-filesystem will be considered as optional for now.
|
||||
sed -i *.dist-info/METADATA \
|
||||
-e "s/Requires-Dist: gast.*/Requires-Dist: gast/" \
|
||||
-e "s/Requires-Dist: tf-estimator-nightly.*/Requires-Dist: tensorflow-estimator/" \
|
||||
-e "/Requires-Dist: libclang/d" \
|
||||
-e "/Requires-Dist: keras/d" \
|
||||
-e "/Requires-Dist: tensorflow-io-gcs-filesystem/d"
|
||||
|
|
@ -177,7 +178,6 @@ in buildPythonPackage {
|
|||
|
||||
pythonImportsCheck = [
|
||||
"tensorflow"
|
||||
"tensorflow.keras"
|
||||
"tensorflow.python"
|
||||
"tensorflow.python.framework"
|
||||
];
|
||||
|
|
|
|||
|
|
@ -1,39 +1,51 @@
|
|||
{
|
||||
version = "2.7.0";
|
||||
version = "2.8.0";
|
||||
linux_py_37_cpu = {
|
||||
url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow_cpu-2.7.0-cp37-cp37m-manylinux2010_x86_64.whl";
|
||||
sha256 = "1irw4ri1fbxbj251cnjbr12gxsyj2k30asxjfxjpxhc9b0cchhx0";
|
||||
url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow_cpu-2.8.0-cp37-cp37m-manylinux2010_x86_64.whl";
|
||||
sha256 = "1nza8i0nvqgrcwj2yy74a3wgpgf52svf0yrz9xd6l18gsifkmkx0";
|
||||
};
|
||||
linux_py_38_cpu = {
|
||||
url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow_cpu-2.7.0-cp38-cp38-manylinux2010_x86_64.whl";
|
||||
sha256 = "11a1rimr998lvvjdg03rqr8h2h7x6bbd4gyv74biwgaxmjczvjdj";
|
||||
url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow_cpu-2.8.0-cp38-cp38-manylinux2010_x86_64.whl";
|
||||
sha256 = "1li2gllznd5w3hh2w9ibh5lkvvssnwh5vhk7i873dxjjdl1w8sqy";
|
||||
};
|
||||
linux_py_39_cpu = {
|
||||
url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow_cpu-2.7.0-cp39-cp39-manylinux2010_x86_64.whl";
|
||||
sha256 = "0x1zzmgq7hl2k98p8870h0yhaik39nc1ckvxirjx8simpj8ghsbp";
|
||||
url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow_cpu-2.8.0-cp39-cp39-manylinux2010_x86_64.whl";
|
||||
sha256 = "03swmyak1hb0k6b2fi9a8g76fi57jz30ym015a576iwp42pqcgkq";
|
||||
};
|
||||
linux_py_310_cpu = {
|
||||
url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow_cpu-2.8.0-cp310-cp310-manylinux2010_x86_64.whl";
|
||||
sha256 = "";
|
||||
};
|
||||
linux_py_37_gpu = {
|
||||
url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-2.7.0-cp37-cp37m-manylinux2010_x86_64.whl";
|
||||
sha256 = "1x5yyxzkly9gdyhcfq4x7w7sqqxh6cw5qnfwbvzj5349xwrm63wi";
|
||||
url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-2.8.0-cp37-cp37m-manylinux2010_x86_64.whl";
|
||||
sha256 = "06q3vjrlqfkqa5r18hla3d8ms1sqa897g7fpnqizgh4k8skhm9fq";
|
||||
};
|
||||
linux_py_38_gpu = {
|
||||
url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-2.7.0-cp38-cp38-manylinux2010_x86_64.whl";
|
||||
sha256 = "0prxa8yc6lbq62vnh8cw6dhcrnkdjih62kbg6pbw4gmgcbf6v6fg";
|
||||
url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-2.8.0-cp38-cp38-manylinux2010_x86_64.whl";
|
||||
sha256 = "0099aa5g19zi74n6bamhmmcgp096m41fhr61swkwnh92myz1ylgb";
|
||||
};
|
||||
linux_py_39_gpu = {
|
||||
url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-2.7.0-cp39-cp39-manylinux2010_x86_64.whl";
|
||||
sha256 = "0jjv8vm20d0airml68bxhassp4yg09rcz2a39aa511cz8mavj0l6";
|
||||
url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-2.8.0-cp39-cp39-manylinux2010_x86_64.whl";
|
||||
sha256 = "0zw20yvlqga7znr13pa10qxww42mj64209syiicgvhs74ji1zdca";
|
||||
};
|
||||
linux_py_310_gpu = {
|
||||
url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-2.8.0-cp310-cp310-manylinux2010_x86_64.whl";
|
||||
sha256 = "06kwjlhzl46jhjcg836crys2aw39x0g8s1s9qfscm1kbwzbww1hq";
|
||||
};
|
||||
mac_py_37_cpu = {
|
||||
url = "https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-2.7.0-cp37-cp37m-macosx_10_11_x86_64.whl";
|
||||
sha256 = "1gr95ck0h4wzhdacjfhkzxdw4zglm85fc54swqhyzzv1f5n9vw8j";
|
||||
url = "https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-2.8.0-cp37-cp37m-macosx_10_14_x86_64.whl";
|
||||
sha256 = "1z5w6wx3h45fz0ji9kn2m2kf963bqbvmqc7cyjv4ixymd0rp4jps";
|
||||
};
|
||||
mac_py_38_cpu = {
|
||||
url = "https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-2.7.0-cp38-cp38-macosx_10_11_x86_64.whl";
|
||||
sha256 = "1h3qlvlrwyvxynh5flvyqk7grbvyqc21ljqhlvds436hpn2kqrgb";
|
||||
url = "https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-2.8.0-cp38-cp38-macosx_10_14_x86_64.whl";
|
||||
sha256 = "1h5v8flhc5zb038ld0av7638cyqqkrib379lrlzvf8dw7q8ry3yx";
|
||||
};
|
||||
mac_py_39_cpu = {
|
||||
url = "https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-2.7.0-cp39-cp39-macosx_10_11_x86_64.whl";
|
||||
sha256 = "0pyj1p2yik6ysdqn8n6cz1nqni0s9xx51ifmvdx4dl3hrzp86jz2";
|
||||
url = "https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-2.8.0-cp39-cp39-macosx_10_14_x86_64.whl";
|
||||
sha256 = "0qsmlrf8h2gxkimniyrz9bniaqpdsd92pficmsrq30k8rkz2bwjj";
|
||||
};
|
||||
mac_py_310_cpu = {
|
||||
url = "https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-2.8.0-cp310-cp310-macosx_10_14_x86_64.whl";
|
||||
sha256 = "0lnwbvil6c6ai10lcaj9ay9pya207s9g204273msjalm1hpbmhvq";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
#!/usr/bin/env bash
|
||||
|
||||
version="2.7.0"
|
||||
version="2.8.0"
|
||||
|
||||
bucket="https://storage.googleapis.com/tensorflow"
|
||||
|
||||
|
|
@ -11,12 +11,15 @@ url_and_key_list=(
|
|||
"linux_py_37_cpu $bucket/linux/cpu/tensorflow_cpu-${version}-cp37-cp37m-manylinux2010_x86_64.whl"
|
||||
"linux_py_38_cpu $bucket/linux/cpu/tensorflow_cpu-${version}-cp38-cp38-manylinux2010_x86_64.whl"
|
||||
"linux_py_39_cpu $bucket/linux/cpu/tensorflow_cpu-${version}-cp39-cp39-manylinux2010_x86_64.whl"
|
||||
"linux_py_310_cpu $bucket/linux/cpu/tensorflow_cpu-${version}-cp310-cp310-manylinux2010_x86_64.whl"
|
||||
"linux_py_37_gpu $bucket/linux/gpu/tensorflow_gpu-${version}-cp37-cp37m-manylinux2010_x86_64.whl"
|
||||
"linux_py_38_gpu $bucket/linux/gpu/tensorflow_gpu-${version}-cp38-cp38-manylinux2010_x86_64.whl"
|
||||
"linux_py_39_gpu $bucket/linux/gpu/tensorflow_gpu-${version}-cp39-cp39-manylinux2010_x86_64.whl"
|
||||
"mac_py_37_cpu $bucket/mac/cpu/tensorflow-${version}-cp37-cp37m-macosx_10_11_x86_64.whl"
|
||||
"mac_py_38_cpu $bucket/mac/cpu/tensorflow-${version}-cp38-cp38-macosx_10_11_x86_64.whl"
|
||||
"mac_py_39_cpu $bucket/mac/cpu/tensorflow-${version}-cp39-cp39-macosx_10_11_x86_64.whl"
|
||||
"linux_py_310_gpu $bucket/linux/gpu/tensorflow_gpu-${version}-cp310-cp310-manylinux2010_x86_64.whl"
|
||||
"mac_py_37_cpu $bucket/mac/cpu/tensorflow-${version}-cp37-cp37m-macosx_10_14_x86_64.whl"
|
||||
"mac_py_38_cpu $bucket/mac/cpu/tensorflow-${version}-cp38-cp38-macosx_10_14_x86_64.whl"
|
||||
"mac_py_39_cpu $bucket/mac/cpu/tensorflow-${version}-cp39-cp39-macosx_10_14_x86_64.whl"
|
||||
"mac_py_310_cpu $bucket/mac/cpu/tensorflow-${version}-cp310-cp310-macosx_10_14_x86_64.whl"
|
||||
)
|
||||
|
||||
hashfile=binary-hashes.nix
|
||||
|
|
|
|||
|
|
@ -1,31 +1,41 @@
|
|||
{ lib, buildPythonPackage, fetchPypi, nose
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, lxml
|
||||
, requests
|
||||
, pyparsing
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "twill";
|
||||
version = "3.0.1";
|
||||
version = "3.0.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "57cde4c3a2265f1a14d80007aa4f66c2135d509555499e9b156d2b4cf5048c2c";
|
||||
hash = "sha256-dWtrdkiR1+IBfeF9jwbOjKE2UMXDJji0iOb+USbY7zk=";
|
||||
};
|
||||
|
||||
checkInputs = [ nose ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
lxml
|
||||
requests
|
||||
pyparsing
|
||||
];
|
||||
|
||||
doCheck = false; # pypi package comes without tests, other homepage does not provide all verisons
|
||||
pythonImportsCheck = [
|
||||
"twill"
|
||||
];
|
||||
|
||||
# pypi package comes without tests, other homepage does not provide all verisons
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://twill-tools.github.io/twill/";
|
||||
description = "A simple scripting language for Web browsing";
|
||||
license = licenses.mit;
|
||||
homepage = "https://twill-tools.github.io/twill/";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ mic92 ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,31 +1,24 @@
|
|||
{ lib, stdenv, python, buildPythonPackage, pythonOlder, fetchPypi, isPy3k, incremental, ipaddress, twisted
|
||||
, automat, zope_interface, idna, pyopenssl, service-identity, pytest, mock, lsof
|
||||
, GeoIP}:
|
||||
, automat, zope_interface, idna, pyopenssl, service-identity, pytestCheckHook, mock, lsof
|
||||
, GeoIP }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "txtorcon";
|
||||
version = "22.0.0";
|
||||
|
||||
checkInputs = [ pytest mock lsof GeoIP ];
|
||||
propagatedBuildInputs = [
|
||||
incremental twisted automat zope_interface
|
||||
# extra dependencies required by twisted[tls]
|
||||
idna pyopenssl service-identity
|
||||
] ++ lib.optionals (!isPy3k) [ ipaddress ];
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-iaG2XjKks2nWfmwWY4f7xGjMXQUidEjSOaXn6XGKoFM=";
|
||||
};
|
||||
|
||||
# Based on what txtorcon tox.ini will automatically test, allow back as far
|
||||
# as Python 3.5.
|
||||
disabled = pythonOlder "3.5";
|
||||
propagatedBuildInputs = [
|
||||
incremental twisted automat zope_interface
|
||||
] ++ twisted.extras.tls
|
||||
++ lib.optionals (!isPy3k) [ ipaddress ];
|
||||
|
||||
checkInputs = [ pytestCheckHook mock lsof GeoIP ];
|
||||
|
||||
doCheck = !(stdenv.isDarwin && stdenv.isAarch64);
|
||||
checkPhase = ''
|
||||
${python.interpreter} -m twisted.trial -j $NIX_BUILD_CORES ./test
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Twisted-based Tor controller client, with state-tracking and configuration abstractions";
|
||||
|
|
|
|||
|
|
@ -29,6 +29,11 @@ buildPythonPackage rec {
|
|||
"webssh"
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# Test fails with AttributeError (possibly related to paramiko update)
|
||||
"test_app_with_bad_host_key"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Web based SSH client";
|
||||
homepage = "https://github.com/huashengdun/webssh/";
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@
|
|||
, ifaddr
|
||||
, jsonschema
|
||||
, pyee
|
||||
, pythonOlder
|
||||
, tornado
|
||||
, zeroconf
|
||||
}:
|
||||
|
|
@ -11,12 +12,15 @@
|
|||
buildPythonPackage rec {
|
||||
pname = "webthing";
|
||||
version = "0.15.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "WebThingsIO";
|
||||
repo = "webthing-python";
|
||||
rev = "v${version}";
|
||||
sha256 = "06264rwchy4qmbn7lv7m00qg864y7aw3rngcqqcr9nvaqz4rb0fg";
|
||||
hash = "sha256-z4GVycdq25QZxuzZPLg6nhj0MAD1bHrsqph4yHgmRhg=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -27,9 +31,12 @@ buildPythonPackage rec {
|
|||
zeroconf
|
||||
];
|
||||
|
||||
# no tests are present
|
||||
# No tests are present
|
||||
doCheck = false;
|
||||
pythonImportsCheck = [ "webthing" ];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"webthing"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python implementation of a Web Thing server";
|
||||
|
|
|
|||
|
|
@ -32,13 +32,13 @@ with py.pkgs;
|
|||
|
||||
buildPythonApplication rec {
|
||||
pname = "checkov";
|
||||
version = "2.0.1067";
|
||||
version = "2.0.1068";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bridgecrewio";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-WK6fot5YAC5l/0EiJuIQ5Xvz5NiEWnU+BfzsKv+caJ8=";
|
||||
hash = "sha256-/WJiGWBGcVDoiX+FnEbIFaMRxQSnJTqLqHbKlEoCqWU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with py.pkgs; [
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ lib, stdenv, fetchFromGitHub, cmake, flex, bison }:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "minizinc";
|
||||
version = "2.6.1";
|
||||
version = "2.6.2";
|
||||
|
||||
nativeBuildInputs = [ cmake flex bison ];
|
||||
|
||||
|
|
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
|
|||
owner = "MiniZinc";
|
||||
repo = "libminizinc";
|
||||
rev = version;
|
||||
sha256 = "sha256-JCR2wvtMNyHBIIqrH5eBc0CIOVyo8mnPUZXtwjJt3sw=";
|
||||
sha256 = "sha256-0yOZZJMDMmIBCJ2ZU3AfGvFSANqHNFN+UHYMI0nogOQ=";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -110,7 +110,7 @@ stdenv.mkDerivation {
|
|||
texinfo
|
||||
]
|
||||
++ lib.optionals targetPlatform.isiOS [ autoreconfHook ]
|
||||
++ lib.optionals targetPlatform.isDarwin [ autoconf269 automake gettext libtool ]
|
||||
++ lib.optionals buildPlatform.isDarwin [ autoconf269 automake gettext libtool ]
|
||||
++ lib.optionals targetPlatform.isVc4 [ flex ]
|
||||
;
|
||||
|
||||
|
|
@ -118,7 +118,7 @@ stdenv.mkDerivation {
|
|||
|
||||
inherit noSysDirs;
|
||||
|
||||
preConfigure = (lib.optionalString targetPlatform.isDarwin ''
|
||||
preConfigure = (lib.optionalString buildPlatform.isDarwin ''
|
||||
for i in */configure.ac; do
|
||||
pushd "$(dirname "$i")"
|
||||
echo "Running autoreconf in $PWD"
|
||||
|
|
|
|||
|
|
@ -2,18 +2,18 @@
|
|||
|
||||
buildGraalvmNativeImage rec {
|
||||
pname = "clojure-lsp";
|
||||
version = "2022.03.31-20.00.20";
|
||||
version = "2022.04.18-00.59.32";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-UQA/BXf6hTTxZ504e1faPdS8mKYS8WrY5L/zgaGCxpU=";
|
||||
sha256 = "sha256-14EsJIKYl8TWbDqM9PyVrbs/4EssqXp0EK70RrFz+RE=";
|
||||
};
|
||||
|
||||
jar = fetchurl {
|
||||
url = "https://github.com/clojure-lsp/clojure-lsp/releases/download/${version}/clojure-lsp-standalone.jar";
|
||||
sha256 = "e66689326c39ae74f0e8d9f5a8229c7ebebe010849870a47faf88e81cbaa37e0";
|
||||
sha256 = "d78094b015bd9e671eea2eb89ca0bb3ec58d39802ad1bfdf875b50e1cdd4995e";
|
||||
};
|
||||
|
||||
extraNativeImageBuildArgs = [
|
||||
|
|
|
|||
|
|
@ -1,18 +1,24 @@
|
|||
{ lib, buildGoPackage, fetchFromGitHub }:
|
||||
buildGoPackage {
|
||||
pname = "pigeon";
|
||||
version = "20190810-f3db42a662";
|
||||
{ lib, buildGoModule, fetchFromGitHub }:
|
||||
|
||||
goPackagePath = "github.com/mna/pigeon";
|
||||
goDeps = ./deps.nix;
|
||||
buildGoModule rec {
|
||||
pname = "pigeon";
|
||||
version = "1.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mna";
|
||||
repo = "pigeon";
|
||||
rev = "f3db42a662eded7550fc7cd11605d05311dfa30f";
|
||||
sha256 = "1n0zqidwbqqfslrirpbqw14ylgiry6ggcp9ll4h8rf1chqwk6dhv";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-0Cp/OnFvVZj9UZgl3F5MCzemBaHI4smGWU46VQnhLOg=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-07zoQL4mLPSERBkZ3sz35Av7zdZsjTyGR8zbA86EEjU=";
|
||||
|
||||
proxyVendor = true;
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
doCheck = false;
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/mna/pigeon";
|
||||
description = "A PEG parser generator for Go";
|
||||
|
|
|
|||
66
pkgs/development/tools/pigeon/deps.nix
generated
66
pkgs/development/tools/pigeon/deps.nix
generated
|
|
@ -1,66 +0,0 @@
|
|||
# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix)
|
||||
[
|
||||
{
|
||||
goPackagePath = "golang.org/x/crypto";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://go.googlesource.com/crypto";
|
||||
rev = "c2843e01d9a2";
|
||||
sha256 = "01xgxbj5r79nmisdvpq48zfy8pzaaj90bn6ngd4nf33j9ar1dp8r";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "golang.org/x/net";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://go.googlesource.com/net";
|
||||
rev = "3b0461eec859";
|
||||
sha256 = "0l00c8l0a8xnv6qdpwfzxxsr58jggacgzdrwiprrfx2xqm37b6d5";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "golang.org/x/sync";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://go.googlesource.com/sync";
|
||||
rev = "112230192c58";
|
||||
sha256 = "05i2k43j2d0llq768hg5pf3hb2yhfzp9la1w5wp0rsnnzblr0lfn";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "golang.org/x/sys";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://go.googlesource.com/sys";
|
||||
rev = "d0b11bdaac8a";
|
||||
sha256 = "18yfsmw622l7gc5sqriv5qmck6903vvhivpzp8i3xfy3z33dybdl";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "golang.org/x/text";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://go.googlesource.com/text";
|
||||
rev = "v0.3.0";
|
||||
sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "golang.org/x/tools";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://go.googlesource.com/tools";
|
||||
rev = "b29f5f60c37a";
|
||||
sha256 = "118rvb59hc1fykbmif4008rbxw1p0dblc8dxkq96yaapd6p0vbpn";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "golang.org/x/xerrors";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://go.googlesource.com/xerrors";
|
||||
rev = "a985d3407aa7";
|
||||
sha256 = "00wzr5w8aadipgc3rkk8f11i41znskfj9ix5nhhaxyg7isrslgcj";
|
||||
};
|
||||
}
|
||||
]
|
||||
|
|
@ -2,29 +2,42 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "flyctl";
|
||||
version = "0.0.316";
|
||||
version = "0.0.320";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "superfly";
|
||||
repo = "flyctl";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-ZIVb4k/KCiHXoEv45lQ2bYAHOXIADCDZOQPeIoMJ8RM=";
|
||||
sha256 = "sha256-hljQzMdA+dfZDQMqehkdZ1giv56IRygby4UF57Cogq8=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-8+EYVaWOppzv4bV/rBWyTTdAFSx7QI0a3+oplBglxyQ=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
ldflags = [
|
||||
"-s" "-w"
|
||||
"-X github.com/superfly/flyctl/flyctl.Commit=${src.rev}"
|
||||
"-X github.com/superfly/flyctl/flyctl.BuildDate=1970-01-01T00:00:00+0000"
|
||||
"-X github.com/superfly/flyctl/flyctl.Environment=production"
|
||||
"-X github.com/superfly/flyctl/flyctl.Version=${version}"
|
||||
];
|
||||
|
||||
preBuild = ''
|
||||
go generate ./...
|
||||
'';
|
||||
|
||||
subPackages = [ "." ];
|
||||
preCheck = ''
|
||||
HOME=$(mktemp -d)
|
||||
'';
|
||||
|
||||
vendorSha256 = "sha256-D3eYFEib+PoAOfrkDKXEzq9Ivh6ukZcT+eA10z5LHGE=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
ldflags = [ "-s" "-w" "-X github.com/superfly/flyctl/flyctl.Version=${version}" "-X github.com/superfly/flyctl/flyctl.Commit=${src.rev}" "-X github.com/superfly/flyctl/flyctl.BuildDate=1970-01-01T00:00:00+0000" "-X github.com/superfly/flyctl/flyctl.Environment=production" ];
|
||||
postCheck = ''
|
||||
go test ./... -ldflags="-X 'github.com/superfly/flyctl/internal/buildinfo.buildDate=1970-01-01T00:00:00+0000'"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Command line tools for fly.io services";
|
||||
downloadPage = "https://github.com/superfly/flyctl";
|
||||
homepage = "https://fly.io/";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ aaronjanse jsierles ];
|
||||
|
|
|
|||
|
|
@ -52,6 +52,7 @@ stdenv.mkDerivation rec {
|
|||
eigen
|
||||
] ++ lib.optionals (enableGPU && enableCuda) [
|
||||
cudaPackages.cudnn
|
||||
cudaPackages.cudatoolkit
|
||||
mesa.drivers
|
||||
] ++ lib.optionals (enableGPU && !enableCuda) [
|
||||
opencl-headers
|
||||
|
|
|
|||
26
pkgs/games/lgames/ltris/default.nix
Normal file
26
pkgs/games/lgames/ltris/default.nix
Normal file
|
|
@ -0,0 +1,26 @@
|
|||
{ lib, stdenv, fetchurl, SDL, SDL_mixer }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ltris";
|
||||
version = "1.2.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/lgames/${pname}-${version}.tar.gz";
|
||||
hash = "sha256-1ut7MBAjJ4YE2SkqkvL9L1ED7kEqdaEm0lUOLsI2j4M=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
SDL
|
||||
SDL_mixer
|
||||
];
|
||||
|
||||
hardeningDisable = [ "format" ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://lgames.sourceforge.io/LTris/";
|
||||
description = "Tetris clone from the LGames series";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ AndersonTorres ciil ];
|
||||
inherit (SDL.meta) platforms;
|
||||
};
|
||||
}
|
||||
|
|
@ -1,22 +0,0 @@
|
|||
{ lib, stdenv, fetchurl, SDL, SDL_mixer }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ltris";
|
||||
version = "1.0.19";
|
||||
buildInputs = [ SDL SDL_mixer ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/lgames/${pname}-${version}.tar.gz";
|
||||
sha256 = "1895wv1fqklrj4apkz47rnkcfhfav7zjknskw6p0886j35vrwslg";
|
||||
};
|
||||
|
||||
patchPhase = "patch -p0 < ${./gcc5_compliance.diff}";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Tetris clone from the LGames series";
|
||||
homepage = "http://lgames.sourceforge.net/LBreakout2/";
|
||||
license = licenses.gpl2;
|
||||
maintainers = [ maintainers.ciil ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
@ -1,299 +0,0 @@
|
|||
Index: ChangeLog
|
||||
===================================================================
|
||||
--- ChangeLog (revision 163)
|
||||
+++ ChangeLog (revision 164)
|
||||
@@ -1,3 +1,5 @@
|
||||
+- removed all inline keywords to work with GCC 5 (2015/05/16 MS)
|
||||
+
|
||||
1.0.19:
|
||||
- removed link to lib math as not needed (2013/10/29 MS)
|
||||
- reset key states when unpausing to prevent unwanted movement (2013/10/29 MS)
|
||||
Index: src/bowl.c
|
||||
===================================================================
|
||||
--- src/bowl.c (revision 163)
|
||||
+++ src/bowl.c (revision 164)
|
||||
@@ -333,7 +333,7 @@
|
||||
Set a tile contents and pixel contents.
|
||||
====================================================================
|
||||
*/
|
||||
-inline void bowl_set_tile( Bowl *bowl, int x, int y, int tile_id )
|
||||
+void bowl_set_tile( Bowl *bowl, int x, int y, int tile_id )
|
||||
{
|
||||
int i, j = y * bowl->block_size;
|
||||
bowl->contents[x][y] = tile_id;
|
||||
Index: src/sdl.c
|
||||
===================================================================
|
||||
--- src/sdl.c (revision 163)
|
||||
+++ src/sdl.c (revision 164)
|
||||
@@ -244,7 +244,7 @@
|
||||
#endif
|
||||
|
||||
/* return full path of bitmap */
|
||||
-inline void get_full_bmp_path( char *full_path, char *file_name )
|
||||
+void get_full_bmp_path( char *full_path, char *file_name )
|
||||
{
|
||||
sprintf(full_path, "%s/gfx/%s", SRC_DIR, file_name );
|
||||
}
|
||||
@@ -330,7 +330,7 @@
|
||||
/*
|
||||
lock surface
|
||||
*/
|
||||
-inline void lock_surf(SDL_Surface *sur)
|
||||
+void lock_surf(SDL_Surface *sur)
|
||||
{
|
||||
if (SDL_MUSTLOCK(sur))
|
||||
SDL_LockSurface(sur);
|
||||
@@ -339,7 +339,7 @@
|
||||
/*
|
||||
unlock surface
|
||||
*/
|
||||
-inline void unlock_surf(SDL_Surface *sur)
|
||||
+void unlock_surf(SDL_Surface *sur)
|
||||
{
|
||||
if (SDL_MUSTLOCK(sur))
|
||||
SDL_UnlockSurface(sur);
|
||||
@@ -666,7 +666,7 @@
|
||||
/*
|
||||
lock font surface
|
||||
*/
|
||||
-inline void lock_font(Font *fnt)
|
||||
+void lock_font(Font *fnt)
|
||||
{
|
||||
if (SDL_MUSTLOCK(fnt->pic))
|
||||
SDL_LockSurface(fnt->pic);
|
||||
@@ -675,7 +675,7 @@
|
||||
/*
|
||||
unlock font surface
|
||||
*/
|
||||
-inline void unlock_font(Font *fnt)
|
||||
+void unlock_font(Font *fnt)
|
||||
{
|
||||
if (SDL_MUSTLOCK(fnt->pic))
|
||||
SDL_UnlockSurface(fnt->pic);
|
||||
@@ -905,7 +905,7 @@
|
||||
/*
|
||||
update rectangle (0,0,0,0)->fullscreen
|
||||
*/
|
||||
-inline void refresh_screen(int x, int y, int w, int h)
|
||||
+void refresh_screen(int x, int y, int w, int h)
|
||||
{
|
||||
SDL_UpdateRect(sdl.screen, x, y, w, h);
|
||||
}
|
||||
@@ -1055,7 +1055,7 @@
|
||||
/*
|
||||
lock surface
|
||||
*/
|
||||
-inline void lock_screen()
|
||||
+void lock_screen()
|
||||
{
|
||||
if (SDL_MUSTLOCK(sdl.screen))
|
||||
SDL_LockSurface(sdl.screen);
|
||||
@@ -1064,7 +1064,7 @@
|
||||
/*
|
||||
unlock surface
|
||||
*/
|
||||
-inline void unlock_screen()
|
||||
+void unlock_screen()
|
||||
{
|
||||
if (SDL_MUSTLOCK(sdl.screen))
|
||||
SDL_UnlockSurface(sdl.screen);
|
||||
@@ -1073,7 +1073,7 @@
|
||||
/*
|
||||
flip hardware screens (double buffer)
|
||||
*/
|
||||
-inline void flip_screen()
|
||||
+void flip_screen()
|
||||
{
|
||||
SDL_Flip(sdl.screen);
|
||||
}
|
||||
@@ -1132,7 +1132,7 @@
|
||||
/*
|
||||
get milliseconds since last call
|
||||
*/
|
||||
-inline int get_time()
|
||||
+int get_time()
|
||||
{
|
||||
int ms;
|
||||
cur_time = SDL_GetTicks();
|
||||
@@ -1148,7 +1148,7 @@
|
||||
/*
|
||||
reset timer
|
||||
*/
|
||||
-inline void reset_timer()
|
||||
+void reset_timer()
|
||||
{
|
||||
last_time = SDL_GetTicks();
|
||||
}
|
||||
Index: src/sdl.h
|
||||
===================================================================
|
||||
--- src/sdl.h (revision 163)
|
||||
+++ src/sdl.h (revision 164)
|
||||
@@ -41,8 +41,8 @@
|
||||
SDL_Surface* load_surf(char *fname, int f);
|
||||
SDL_Surface* create_surf(int w, int h, int f);
|
||||
void free_surf( SDL_Surface **surf );
|
||||
-inline void lock_surf(SDL_Surface *sur);
|
||||
-inline void unlock_surf(SDL_Surface *sur);
|
||||
+void lock_surf(SDL_Surface *sur);
|
||||
+void unlock_surf(SDL_Surface *sur);
|
||||
void blit_surf(void);
|
||||
void alpha_blit_surf(int alpha);
|
||||
void fill_surf(int c);
|
||||
@@ -86,8 +86,8 @@
|
||||
Font* load_fixed_font(char *fname, int off, int len, int w);
|
||||
void free_font(Font **sfnt);
|
||||
int write_text(Font *sfnt, SDL_Surface *dest, int x, int y, char *str, int alpha);
|
||||
-inline void lock_font(Font *sfnt);
|
||||
-inline void unlock_font(Font *sfnt);
|
||||
+void lock_font(Font *sfnt);
|
||||
+void unlock_font(Font *sfnt);
|
||||
SDL_Rect last_write_rect(Font *fnt);
|
||||
int text_width(Font *fnt, char *str);
|
||||
|
||||
@@ -132,14 +132,14 @@
|
||||
char** get_mode_names( int *count );
|
||||
int set_video_mode( Video_Mode mode );
|
||||
void hardware_cap();
|
||||
-inline void refresh_screen( int x, int y, int w, int h );
|
||||
+void refresh_screen( int x, int y, int w, int h );
|
||||
void refresh_rects();
|
||||
void add_refresh_rect(int x, int y, int w, int h);
|
||||
int wait_for_key();
|
||||
void wait_for_click();
|
||||
-inline void lock_screen();
|
||||
-inline void unlock_screen();
|
||||
-inline void flip_screen();
|
||||
+void lock_screen();
|
||||
+void unlock_screen();
|
||||
+void flip_screen();
|
||||
void fade_screen( int type, int ms );
|
||||
void take_screenshot( int i );
|
||||
|
||||
@@ -148,8 +148,8 @@
|
||||
SDL_Cursor* create_cursor( int width, int height, int hot_x, int hot_y, char *source );
|
||||
|
||||
/* timer */
|
||||
-inline int get_time();
|
||||
-inline void reset_timer();
|
||||
+int get_time();
|
||||
+void reset_timer();
|
||||
|
||||
#ifdef __cplusplus
|
||||
};
|
||||
Index: src/tools.c
|
||||
===================================================================
|
||||
--- src/tools.c (revision 163)
|
||||
+++ src/tools.c (revision 164)
|
||||
@@ -23,7 +23,7 @@
|
||||
#include "ltris.h"
|
||||
|
||||
/* compares to strings and returns true if their first strlen(str1) chars are equal */
|
||||
-inline int strequal( char *str1, char *str2 )
|
||||
+int strequal( char *str1, char *str2 )
|
||||
{
|
||||
if ( strlen( str1 ) != strlen( str2 ) ) return 0;
|
||||
return ( !strncmp( str1, str2, strlen( str1 ) ) );
|
||||
@@ -30,7 +30,7 @@
|
||||
}
|
||||
|
||||
/* set delay to ms milliseconds */
|
||||
-inline void delay_set( Delay *delay, int ms )
|
||||
+void delay_set( Delay *delay, int ms )
|
||||
{
|
||||
delay->limit = ms;
|
||||
delay->cur = 0;
|
||||
@@ -37,13 +37,13 @@
|
||||
}
|
||||
|
||||
/* reset delay ( cur = 0 )*/
|
||||
-inline void delay_reset( Delay *delay )
|
||||
+void delay_reset( Delay *delay )
|
||||
{
|
||||
delay->cur = 0;
|
||||
}
|
||||
|
||||
/* check if times out and reset */
|
||||
-inline int delay_timed_out( Delay *delay, int ms )
|
||||
+int delay_timed_out( Delay *delay, int ms )
|
||||
{
|
||||
delay->cur += ms;
|
||||
if ( delay->cur >= delay->limit ) {
|
||||
@@ -56,12 +56,12 @@
|
||||
}
|
||||
|
||||
/* set timer so that we have a time out next call of delay_timed_out() */
|
||||
-inline void delay_force_time_out( Delay *delay )
|
||||
+void delay_force_time_out( Delay *delay )
|
||||
{
|
||||
delay->cur = delay->limit;
|
||||
}
|
||||
|
||||
-inline void goto_tile( int *x, int *y, int d )
|
||||
+void goto_tile( int *x, int *y, int d )
|
||||
{
|
||||
/* 0 -up, clockwise, 5 - left up */
|
||||
switch ( d ) {
|
||||
@@ -326,24 +326,24 @@
|
||||
the target value until reached when counter_update() is called.
|
||||
====================================================================
|
||||
*/
|
||||
-inline void counter_set( Counter *counter, double value )
|
||||
+void counter_set( Counter *counter, double value )
|
||||
{
|
||||
counter->value = value;
|
||||
counter->approach = value;
|
||||
}
|
||||
-inline void counter_add( Counter *counter, double add )
|
||||
+void counter_add( Counter *counter, double add )
|
||||
{
|
||||
counter->value += add;
|
||||
}
|
||||
-inline double counter_get_approach( Counter counter )
|
||||
+double counter_get_approach( Counter counter )
|
||||
{
|
||||
return counter.approach;
|
||||
}
|
||||
-inline double counter_get( Counter counter )
|
||||
+double counter_get( Counter counter )
|
||||
{
|
||||
return counter.value;
|
||||
}
|
||||
-inline void counter_update( Counter *counter, int ms )
|
||||
+void counter_update( Counter *counter, int ms )
|
||||
{
|
||||
double change;
|
||||
if ( counter->approach == counter->value ) return;
|
||||
Index: src/tools.h
|
||||
===================================================================
|
||||
--- src/tools.h (revision 163)
|
||||
+++ src/tools.h (revision 164)
|
||||
@@ -33,7 +33,7 @@
|
||||
#define VEC_DIST( vec1, vec2 ) ( sqrt( ( vec1.x - vec2.x ) * ( vec1.x - vec2.x ) + ( vec1.y - vec2.y ) * ( vec1.y - vec2.y ) ) )
|
||||
|
||||
/* compares to strings and returns true if their first strlen(str1) chars are equal */
|
||||
-inline int strequal( char *str1, char *str2 );
|
||||
+int strequal( char *str1, char *str2 );
|
||||
|
||||
/* delete lines */
|
||||
void delete_lines( char **lines, int line_number );
|
||||
@@ -45,16 +45,16 @@
|
||||
} Delay;
|
||||
|
||||
/* set delay to ms milliseconds */
|
||||
-inline void delay_set( Delay *delay, int ms );
|
||||
+void delay_set( Delay *delay, int ms );
|
||||
|
||||
/* reset delay ( cur = 0 )*/
|
||||
-inline void delay_reset( Delay *delay );
|
||||
+void delay_reset( Delay *delay );
|
||||
|
||||
/* check if time's out ( add ms milliseconds )and reset */
|
||||
-inline int delay_timed_out( Delay *delay, int ms );
|
||||
+int delay_timed_out( Delay *delay, int ms );
|
||||
|
||||
/* set timer so that we have a time out next call of delay_timed_out() */
|
||||
-inline void delay_force_time_out( Delay *delay );
|
||||
+void delay_force_time_out( Delay *delay );
|
||||
|
||||
/* return distance betwteen to map positions */
|
||||
int get_dist( int x1, int y1, int x2, int y2 );
|
||||
|
|
@ -1,15 +1,16 @@
|
|||
{ lib, stdenv, fetchurl, fetchpatch
|
||||
, buildPackages, bison, flex, pkg-config
|
||||
, db, iptables, libelf, libmnl
|
||||
, gitUpdater
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "iproute2";
|
||||
version = "5.14.0";
|
||||
version = "5.17.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/utils/net/${pname}/${pname}-${version}.tar.xz";
|
||||
sha256 = "1m4ifnxq7lxnm95l5354z8dk3xj6w9isxmbz53266drgln2sf3r1";
|
||||
sha256 = "bjhPG0LHXhqdqsV4Zto33P+QkJC6huslpudk2niTZg4=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
@ -48,6 +49,13 @@ stdenv.mkDerivation rec {
|
|||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
passthru.updateScript = gitUpdater {
|
||||
inherit pname version;
|
||||
# No nicer place to find latest release.
|
||||
url = "https://git.kernel.org/pub/scm/network/iproute2/iproute2.git";
|
||||
rev-prefix = "v";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://wiki.linuxfoundation.org/networking/iproute2";
|
||||
description = "A collection of utilities for controlling TCP/IP networking and traffic control in Linux";
|
||||
|
|
|
|||
|
|
@ -3,11 +3,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "confluent-platform";
|
||||
version = "7.0.1";
|
||||
version = "7.1.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://packages.confluent.io/archive/${lib.versions.majorMinor version}/confluent-${version}.tar.gz";
|
||||
sha256 = "Q0/A/3M2tn530/+o1RpcgNsPKFQq6YJQnhgysRlpVfU=";
|
||||
sha256 = "sha256-uoJQQZxUGniMLJk/BwwiNnpgYFcqJ+27GFQLEpsFxCw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -11,11 +11,11 @@ in
|
|||
with python3.pkgs;
|
||||
buildPythonApplication rec {
|
||||
pname = "matrix-synapse";
|
||||
version = "1.56.0";
|
||||
version = "1.57.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-MWMCGgsWJqIO4xefIHxp/mtR7yxLrJOfTsb2hxlGeiY=";
|
||||
sha256 = "sha256-pZhm3jfpqOcLT+M4eeD8FyHtwj5EOAFESFu+4ZMoz0s=";
|
||||
};
|
||||
|
||||
buildInputs = [ openssl ];
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "radicale";
|
||||
version = "3.1.5";
|
||||
version = "3.1.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Kozea";
|
||||
repo = "Radicale";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-PGPUV0oOWmzc7Lih6D0sCwIuUB8FOyOrYUEIvMpr4HE=";
|
||||
hash = "sha256-qu3s/rx5649l7oeiumPtQ9zS9jorMwWMPfO7YdOeGfQ=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
@ -20,7 +20,6 @@ python3.pkgs.buildPythonApplication rec {
|
|||
passlib
|
||||
vobject
|
||||
python-dateutil
|
||||
setuptools
|
||||
];
|
||||
|
||||
checkInputs = with python3.pkgs; [
|
||||
|
|
|
|||
|
|
@ -10,15 +10,6 @@ let
|
|||
py = python3.override {
|
||||
packageOverrides = self: super: {
|
||||
django = super.django_3;
|
||||
graphql-core = super.graphql-core.overridePythonAttrs (old: rec {
|
||||
version = "3.1.7";
|
||||
src = fetchFromGitHub {
|
||||
owner = "graphql-python";
|
||||
repo = old.pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1mwwh55qd5bcpvgy6pyliwn8jkmj4yk4d2pqb6mdkgqhdic2081l";
|
||||
};
|
||||
});
|
||||
jsonschema = super.jsonschema.overridePythonAttrs (old: rec {
|
||||
version = "3.2.0";
|
||||
src = self.fetchPypi {
|
||||
|
|
@ -28,14 +19,26 @@ let
|
|||
};
|
||||
});
|
||||
lxml = super.lxml.overridePythonAttrs (old: rec {
|
||||
pname = "lxml";
|
||||
version = "4.6.5";
|
||||
|
||||
src = self.fetchPypi {
|
||||
inherit pname version;
|
||||
pname = old.pname;
|
||||
inherit version;
|
||||
sha256 = "6e84edecc3a82f90d44ddee2ee2a2630d4994b8471816e226d2b771cda7ac4ca";
|
||||
};
|
||||
});
|
||||
werkzeug = super.werkzeug.overridePythonAttrs (old: rec {
|
||||
version = "2.0.3";
|
||||
src = self.fetchPypi {
|
||||
pname = "Werkzeug";
|
||||
inherit version;
|
||||
sha256 = "sha256-uGP4/wV8UiFktgZ8niiwQRYbS+W6TQ2s7qpQoWOCLTw=";
|
||||
};
|
||||
});
|
||||
sentry-sdk = super.sentry-sdk.overridePythonAttrs (old: rec {
|
||||
disabledTestPaths = old.disabledTestPaths ++ [
|
||||
"tests/integrations/flask/test_flask.py"
|
||||
];
|
||||
});
|
||||
};
|
||||
};
|
||||
|
||||
|
|
@ -43,13 +46,13 @@ let
|
|||
in
|
||||
py.pkgs.buildPythonApplication rec {
|
||||
pname = "netbox";
|
||||
version = "3.1.10";
|
||||
version = "3.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "netbox-community";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-qREq4FJHHTA9Vm6f9kSfiYqur2omFmdsoZ4OdaPFcpU=";
|
||||
sha256 = "sha256-iA0KIgaHQh0OsN/tXmTATIlvnf0aLRdjeQ6VkiR9VJ4=";
|
||||
};
|
||||
|
||||
format = "other";
|
||||
|
|
@ -57,6 +60,7 @@ py.pkgs.buildPythonApplication rec {
|
|||
patches = [
|
||||
# Allow setting the STATIC_ROOT from within the configuration and setting a custom redis URL
|
||||
./config.patch
|
||||
./graphql-3_2_0.patch
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with py.pkgs; [
|
||||
|
|
@ -75,6 +79,7 @@ py.pkgs.buildPythonApplication rec {
|
|||
django-timezone-field
|
||||
djangorestframework
|
||||
drf-yasg
|
||||
swagger-spec-validator # from drf-yasg[validation]
|
||||
graphene-django
|
||||
jinja2
|
||||
markdown
|
||||
|
|
|
|||
21
pkgs/servers/web-apps/netbox/graphql-3_2_0.patch
Normal file
21
pkgs/servers/web-apps/netbox/graphql-3_2_0.patch
Normal file
|
|
@ -0,0 +1,21 @@
|
|||
diff --git a/netbox/netbox/graphql/scalars.py b/netbox/netbox/graphql/scalars.py
|
||||
index 7d14189dd..0a18e79d2 100644
|
||||
--- a/netbox/netbox/graphql/scalars.py
|
||||
+++ b/netbox/netbox/graphql/scalars.py
|
||||
@@ -1,6 +1,6 @@
|
||||
from graphene import Scalar
|
||||
from graphql.language import ast
|
||||
-from graphql.type.scalars import MAX_INT, MIN_INT
|
||||
+from graphql.type.scalars import GRAPHQL_MAX_INT, GRAPHQL_MIN_INT
|
||||
|
||||
|
||||
class BigInt(Scalar):
|
||||
@@ -10,7 +10,7 @@ class BigInt(Scalar):
|
||||
@staticmethod
|
||||
def to_float(value):
|
||||
num = int(value)
|
||||
- if num > MAX_INT or num < MIN_INT:
|
||||
+ if num > GRAPHQL_MAX_INT or num < GRAPHQL_MIN_INT:
|
||||
return float(num)
|
||||
return num
|
||||
|
||||
|
|
@ -5,15 +5,15 @@
|
|||
, git, nix, nixfmt, jq, coreutils, gnused, curl, cacert }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "2022-04-14";
|
||||
version = "2022-04-18";
|
||||
pname = "oh-my-zsh";
|
||||
rev = "eb00b95d26e8f264af80f508d50ac32e50619027";
|
||||
rev = "ed411d3ff196e32844409ebe0f8b3e21b0b1c9f6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
inherit rev;
|
||||
owner = "ohmyzsh";
|
||||
repo = "ohmyzsh";
|
||||
sha256 = "kEyvSBVgHuTaBQu2X9OJ+eu2serHq9IyfJHxTmpv2BU=";
|
||||
sha256 = "j38odMVj/NT9qGf06RLREmEXQRsvR2UGSlzRxtn+C8E=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue