Project import generated by Copybara.
GitOrigin-RevId: e019872af81e4013fd518fcacfba74b1de21a50e
This commit is contained in:
Default email
parent
4260e04572
commit
408a0d163f
165 changed files with 5096 additions and 3738 deletions
|
|
@ -224,6 +224,12 @@
|
|||
githubId = 1773511;
|
||||
name = "Adrien Devresse";
|
||||
};
|
||||
addict3d = {
|
||||
email = "nickbathum@gmail.com";
|
||||
github = "addict3d";
|
||||
githubId = 49227;
|
||||
name = "Nick Bathum";
|
||||
};
|
||||
adisbladis = {
|
||||
email = "adisbladis@gmail.com";
|
||||
github = "adisbladis";
|
||||
|
|
|
|||
|
|
@ -669,6 +669,12 @@ environment.systemPackages = [
|
|||
Environment variables can be set using <option>environment.variables</option>.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
<option>services.minio.dataDir</option> changed type to a list of paths, required for specifiyng multiple data directories for using with erasure coding.
|
||||
Currently, the service doesn't enforce nor checks the correct number of paths to correspond to minio requirements.
|
||||
</para>
|
||||
</listitem>
|
||||
</itemizedlist>
|
||||
</section>
|
||||
|
||||
|
|
|
|||
|
|
@ -126,11 +126,37 @@ let
|
|||
}
|
||||
'';
|
||||
|
||||
singleMDDoc = name: value: ''
|
||||
## ${lib.escape [ "<" ">" ] name}
|
||||
${value.description}
|
||||
|
||||
${lib.optionalString (value ? type) ''
|
||||
*_Type_*:
|
||||
${value.type}
|
||||
''}
|
||||
|
||||
${lib.optionalString (value ? default) ''
|
||||
*_Default_*
|
||||
```
|
||||
${builtins.toJSON value.default}
|
||||
```
|
||||
''}
|
||||
|
||||
${lib.optionalString (value ? example) ''
|
||||
*_Example_*
|
||||
```
|
||||
${builtins.toJSON value.example}
|
||||
```
|
||||
''}
|
||||
'';
|
||||
|
||||
in {
|
||||
inherit optionsNix;
|
||||
|
||||
optionsAsciiDoc = lib.concatStringsSep "\n" (lib.mapAttrsToList singleAsciiDoc optionsNix);
|
||||
|
||||
optionsMDDoc = lib.concatStringsSep "\n" (lib.mapAttrsToList singleMDDoc optionsNix);
|
||||
|
||||
optionsJSON = pkgs.runCommand "options.json"
|
||||
{ meta.description = "List of NixOS options in JSON format";
|
||||
buildInputs = [ pkgs.brotli ];
|
||||
|
|
|
|||
|
|
@ -163,6 +163,7 @@ in
|
|||
users.users.scanner = {
|
||||
uid = config.ids.uids.scanner;
|
||||
group = "scanner";
|
||||
extraGroups = [ "lp" ] ++ optionals config.services.avahi.enable [ "avahi" ];
|
||||
};
|
||||
})
|
||||
];
|
||||
|
|
|
|||
|
|
@ -263,7 +263,8 @@ in {
|
|||
# settings_local.json is loaded.
|
||||
os.environ["SECRET_KEY"] = ""
|
||||
|
||||
from mailman_web.settings import *
|
||||
from mailman_web.settings.base import *
|
||||
from mailman_web.settings.mailman import *
|
||||
|
||||
import json
|
||||
|
||||
|
|
|
|||
|
|
@ -102,7 +102,7 @@ in
|
|||
ProtectKernelModules = true;
|
||||
ProtectKernelLogs = true;
|
||||
ProtectControlGroups = true;
|
||||
RestrictAddressFamilies = [ "AF_NETLINK" "AF_INET6" ];
|
||||
RestrictAddressFamilies = [ "AF_NETLINK" "AF_INET6" "AF_INET" ];
|
||||
RestrictNamespaces = true;
|
||||
RestrictRealtime = true;
|
||||
RestrictSUIDSGID = true;
|
||||
|
|
|
|||
|
|
@ -5,17 +5,16 @@ with lib;
|
|||
let
|
||||
cfg = config.services.getty;
|
||||
|
||||
loginArgs = [
|
||||
baseArgs = [
|
||||
"--login-program" "${pkgs.shadow}/bin/login"
|
||||
] ++ optionals (cfg.autologinUser != null) [
|
||||
"--autologin" cfg.autologinUser
|
||||
] ++ optionals (cfg.loginOptions != null) [
|
||||
"--login-options" cfg.loginOptions
|
||||
];
|
||||
] ++ cfg.extraArgs;
|
||||
|
||||
gettyCmd = extraArgs:
|
||||
"@${pkgs.util-linux}/sbin/agetty agetty ${escapeShellArgs loginArgs} "
|
||||
+ extraArgs;
|
||||
gettyCmd = args:
|
||||
"@${pkgs.util-linux}/sbin/agetty agetty ${escapeShellArgs baseArgs} ${args}";
|
||||
|
||||
in
|
||||
|
||||
|
|
@ -54,7 +53,16 @@ in
|
|||
will not be invoked with a <option>--login-options</option>
|
||||
option.
|
||||
'';
|
||||
example = "-h darkstar -- \u";
|
||||
example = "-h darkstar -- \\u";
|
||||
};
|
||||
|
||||
extraArgs = mkOption {
|
||||
type = types.listOf types.str;
|
||||
default = [ ];
|
||||
description = ''
|
||||
Additional arguments passed to agetty.
|
||||
'';
|
||||
example = [ "--nohostname" ];
|
||||
};
|
||||
|
||||
greetingLine = mkOption {
|
||||
|
|
|
|||
|
|
@ -18,9 +18,9 @@ in
|
|||
};
|
||||
|
||||
dataDir = mkOption {
|
||||
default = "/var/lib/minio/data";
|
||||
type = types.path;
|
||||
description = "The data directory, for storing the objects.";
|
||||
default = [ "/var/lib/minio/data" ];
|
||||
type = types.listOf types.path;
|
||||
description = "The list of data directories for storing the objects. Use one path for regular operation and the minimum of 4 endpoints for Erasure Code mode.";
|
||||
};
|
||||
|
||||
configDir = mkOption {
|
||||
|
|
@ -74,15 +74,14 @@ in
|
|||
config = mkIf cfg.enable {
|
||||
systemd.tmpfiles.rules = [
|
||||
"d '${cfg.configDir}' - minio minio - -"
|
||||
"d '${cfg.dataDir}' - minio minio - -"
|
||||
];
|
||||
] ++ (map (x: "d '" + x + "' - minio minio - - ") cfg.dataDir);
|
||||
|
||||
systemd.services.minio = {
|
||||
description = "Minio Object Storage";
|
||||
after = [ "network.target" ];
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
serviceConfig = {
|
||||
ExecStart = "${cfg.package}/bin/minio server --json --address ${cfg.listenAddress} --config-dir=${cfg.configDir} ${cfg.dataDir}";
|
||||
ExecStart = "${cfg.package}/bin/minio server --json --address ${cfg.listenAddress} --config-dir=${cfg.configDir} ${toString cfg.dataDir}";
|
||||
Type = "simple";
|
||||
User = "minio";
|
||||
Group = "minio";
|
||||
|
|
|
|||
|
|
@ -15,6 +15,7 @@ in
|
|||
./cwm.nix
|
||||
./clfswm.nix
|
||||
./dwm.nix
|
||||
./e16.nix
|
||||
./evilwm.nix
|
||||
./exwm.nix
|
||||
./fluxbox.nix
|
||||
|
|
|
|||
26
third_party/nixpkgs/nixos/modules/services/x11/window-managers/e16.nix
vendored
Normal file
26
third_party/nixpkgs/nixos/modules/services/x11/window-managers/e16.nix
vendored
Normal file
|
|
@ -0,0 +1,26 @@
|
|||
{ config , lib , pkgs , ... }:
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
cfg = config.services.xserver.windowManager.e16;
|
||||
in
|
||||
{
|
||||
###### interface
|
||||
options = {
|
||||
services.xserver.windowManager.e16.enable = mkEnableOption "e16";
|
||||
};
|
||||
|
||||
###### implementation
|
||||
config = mkIf cfg.enable {
|
||||
services.xserver.windowManager.session = singleton {
|
||||
name = "E16";
|
||||
start = ''
|
||||
${pkgs.e16}/bin/e16 &
|
||||
waitPID=$!
|
||||
'';
|
||||
};
|
||||
|
||||
environment.systemPackages = [ pkgs.e16 ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
{ system ? builtins.currentSystem
|
||||
, config ? { }
|
||||
, pkgs ? import ../.. { inherit system config; }
|
||||
}:
|
||||
}@args:
|
||||
|
||||
with pkgs.lib;
|
||||
|
||||
|
|
@ -22,7 +22,7 @@ let
|
|||
assert "Linux" in machine.succeed("uname -s")
|
||||
assert "${linuxPackages.kernel.modDirVersion}" in machine.succeed("uname -a")
|
||||
'';
|
||||
}));
|
||||
}) args);
|
||||
in
|
||||
with pkgs; {
|
||||
linux_4_4 = makeKernelTest "4.4" linuxPackages_4_4;
|
||||
|
|
|
|||
70
third_party/nixpkgs/pkgs/applications/audio/CHOWTapeModel/default.nix
vendored
Normal file
70
third_party/nixpkgs/pkgs/applications/audio/CHOWTapeModel/default.nix
vendored
Normal file
|
|
@ -0,0 +1,70 @@
|
|||
{ alsaLib
|
||||
, curl
|
||||
, fetchFromGitHub
|
||||
, freeglut
|
||||
, freetype
|
||||
, libGL
|
||||
, libXcursor
|
||||
, libXext
|
||||
, libXinerama
|
||||
, libXrandr
|
||||
, libjack2
|
||||
, pkg-config
|
||||
, python3
|
||||
, stdenv
|
||||
, lib
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "CHOWTapeModel";
|
||||
version = "unstable-2020-12-12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jatinchowdhury18";
|
||||
repo = "AnalogTapeModel";
|
||||
rev = "a7cf10c3f790d306ce5743bb731e4bc2c1230d70";
|
||||
sha256 = "09nq8x2dwabncbp039dqm1brzcz55zg9kpxd4p5348xlaz5m4661";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
alsaLib
|
||||
curl
|
||||
freeglut
|
||||
freetype
|
||||
libGL
|
||||
libXcursor
|
||||
libXext
|
||||
libXinerama
|
||||
libXrandr
|
||||
libjack2
|
||||
python3
|
||||
];
|
||||
|
||||
buildPhase = ''
|
||||
cd Plugin/
|
||||
./build_linux.sh
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/lib/lv2 $out/lib/vst3 $out/bin $out/share/doc/CHOWTapeModel/
|
||||
cd Builds/LinuxMakefile/build/
|
||||
cp CHOWTapeModel.a $out/lib
|
||||
cp -r CHOWTapeModel.lv2 $out/lib/lv2
|
||||
cp -r CHOWTapeModel.vst3 $out/lib/vst3
|
||||
cp CHOWTapeModel $out/bin
|
||||
cp ../../../../Manual/ChowTapeManual.pdf $out/share/doc/CHOWTapeModel/
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/jatinchowdhury18/AnalogTapeModel";
|
||||
description = "Physical modelling signal processing for analog tape recording. LV2, VST3 and standalone";
|
||||
license = with licenses; [ gpl3Only ];
|
||||
maintainers = with maintainers; [ magnetophon ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bchoppr";
|
||||
version = "1.10.4";
|
||||
version = "1.10.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sjaehn";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-/csds8QOgn5IogyMg/5PMKdlCISakS3GDkyj2tTt0BY=";
|
||||
sha256 = "sha256-iCDAIV2p1OkZxOMo8A6zBrOGd49FXAGqLZWk0Kbvgec=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "BSEQuencer";
|
||||
version = "1.8.6";
|
||||
version = "1.8.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sjaehn";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-PZ2Ft7y2mbb5Wpa7mWPys2BVpcQC3WE5rKu2sRqkf8w=";
|
||||
sha256 = "sha256-OArIMf0XP9CKDdb3H4s8jMzVRjoLFQDPmTS9rS2KW3w=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "BShapr";
|
||||
version = "0.10";
|
||||
version = "0.12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sjaehn";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-oEBsaIcw/Ltxr2CUPGBjwcxOPhNQoYPZDkfQE7QA940=";
|
||||
sha256 = "sha256-2DySlD5ZTxeQ2U++Dr67bek5oVbAiOHCxM6S5rTTZN0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "BSlizr";
|
||||
version = "1.2.10";
|
||||
version = "1.2.12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sjaehn";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-tEGJrVg8dN9Torybx02qIpXsGOuCgn/Wb+jemfCjiK4=";
|
||||
sha256 = "sha256-vPkcgG+pAfjsPRMyxdMRUxWGch+RG+pdaAcekP5pKEA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
|
|
|||
|
|
@ -1,26 +1,23 @@
|
|||
{ stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, alsaLib
|
||||
, curl
|
||||
, fetchFromGitHub
|
||||
, fftwFloat
|
||||
, freetype
|
||||
, glib
|
||||
, lib
|
||||
, libGL
|
||||
, libX11
|
||||
, libXcursor
|
||||
, libXext
|
||||
, libXinerama
|
||||
, libXrandr
|
||||
, libXrender
|
||||
, libgcc
|
||||
, libglvnd
|
||||
, libsecret
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
}:
|
||||
|
||||
let rpathLibs = [
|
||||
fftwFloat
|
||||
];
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "distrho-ports";
|
||||
version = "2021-03-15";
|
||||
|
|
@ -34,24 +31,26 @@ stdenv.mkDerivation rec {
|
|||
|
||||
nativeBuildInputs = [ pkg-config meson ninja ];
|
||||
|
||||
buildInputs = [
|
||||
buildInputs = rpathLibs ++ [
|
||||
alsaLib
|
||||
curl
|
||||
fftwFloat
|
||||
freetype
|
||||
glib
|
||||
libGL
|
||||
libX11
|
||||
libXcursor
|
||||
libXext
|
||||
libXinerama
|
||||
libXrandr
|
||||
libXrender
|
||||
libgcc
|
||||
libglvnd
|
||||
libsecret
|
||||
];
|
||||
|
||||
postFixup = ''
|
||||
for file in \
|
||||
$out/lib/lv2/vitalium.lv2/vitalium.so \
|
||||
$out/lib/vst/vitalium.so \
|
||||
$out/lib/vst3/vitalium.vst3/Contents/x86_64-linux/vitalium.so
|
||||
do
|
||||
patchelf --set-rpath "${lib.makeLibraryPath rpathLibs}:$(patchelf --print-rpath $file)" $file
|
||||
done
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "http://distrho.sourceforge.net/ports";
|
||||
description = "Linux audio plugins and LV2 ports";
|
||||
|
|
|
|||
|
|
@ -1,24 +1,23 @@
|
|||
{ lib, stdenv, fetchFromGitLab, cmake, pkg-config, redkite, libsndfile, rapidjson
|
||||
{ lib, stdenv, fetchFromGitLab, cmake, pkg-config, libsndfile, rapidjson
|
||||
, libjack2, lv2, libX11, cairo }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "geonkick";
|
||||
version = "2.6.1";
|
||||
version = "2.8.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "iurie-sw";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1l647j11pb9lkknnh4q99mmfcvr644b02lfcdjh98z60vqm1s54c";
|
||||
sha256 = "0dpwdjyy6phhr1jm1cabj2gc3rfsdan513mijbgnpzkq9w9jfb60";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
|
||||
buildInputs = [ redkite libsndfile rapidjson libjack2 lv2 libX11 cairo ];
|
||||
buildInputs = [ libsndfile rapidjson libjack2 lv2 libX11 cairo ];
|
||||
|
||||
# https://github.com/iurie-sw/geonkick/issues/120
|
||||
cmakeFlags = [
|
||||
"-DGKICK_REDKITE_SDK_PATH=${redkite}"
|
||||
"-DCMAKE_INSTALL_LIBDIR=lib"
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,46 +1,39 @@
|
|||
{ newScope, python }:
|
||||
{ lib, newScope, python }:
|
||||
|
||||
# Create a custom scope so we are consistent in which python version is used
|
||||
lib.makeScope newScope (self: with self; {
|
||||
inherit python;
|
||||
pythonPackages = python.pkgs;
|
||||
|
||||
let
|
||||
callPackage = newScope self;
|
||||
mopidy = callPackage ./mopidy.nix { };
|
||||
|
||||
self = {
|
||||
mopidy-iris = callPackage ./iris.nix { };
|
||||
|
||||
inherit python;
|
||||
pythonPackages = python.pkgs;
|
||||
mopidy-local = callPackage ./local.nix { };
|
||||
|
||||
mopidy = callPackage ./mopidy.nix { };
|
||||
mopidy-moped = callPackage ./moped.nix { };
|
||||
|
||||
mopidy-iris = callPackage ./iris.nix { };
|
||||
mopidy-mopify = callPackage ./mopify.nix { };
|
||||
|
||||
mopidy-local = callPackage ./local.nix { };
|
||||
mopidy-mpd = callPackage ./mpd.nix { };
|
||||
|
||||
mopidy-moped = callPackage ./moped.nix { };
|
||||
mopidy-mpris = callPackage ./mpris.nix { };
|
||||
|
||||
mopidy-mopify = callPackage ./mopify.nix { };
|
||||
mopidy-musicbox-webclient = callPackage ./musicbox-webclient.nix { };
|
||||
|
||||
mopidy-mpd = callPackage ./mpd.nix { };
|
||||
mopidy-scrobbler = callPackage ./scrobbler.nix { };
|
||||
|
||||
mopidy-mpris = callPackage ./mpris.nix { };
|
||||
mopidy-somafm = callPackage ./somafm.nix { };
|
||||
|
||||
mopidy-musicbox-webclient = callPackage ./musicbox-webclient.nix { };
|
||||
mopidy-soundcloud = callPackage ./soundcloud.nix { };
|
||||
|
||||
mopidy-scrobbler = callPackage ./scrobbler.nix { };
|
||||
mopidy-spotify = callPackage ./spotify.nix { };
|
||||
|
||||
mopidy-somafm = callPackage ./somafm.nix { };
|
||||
mopidy-spotify-tunigo = callPackage ./spotify-tunigo.nix { };
|
||||
|
||||
mopidy-soundcloud = callPackage ./soundcloud.nix { };
|
||||
mopidy-tunein = callPackage ./tunein.nix { };
|
||||
|
||||
mopidy-spotify = callPackage ./spotify.nix { };
|
||||
mopidy-youtube = callPackage ./youtube.nix { };
|
||||
|
||||
mopidy-spotify-tunigo = callPackage ./spotify-tunigo.nix { };
|
||||
|
||||
mopidy-tunein = callPackage ./tunein.nix { };
|
||||
|
||||
mopidy-youtube = callPackage ./youtube.nix { };
|
||||
|
||||
mopidy-subidy = callPackage ./subidy.nix { };
|
||||
};
|
||||
|
||||
in self
|
||||
mopidy-subidy = callPackage ./subidy.nix { };
|
||||
})
|
||||
|
|
|
|||
|
|
@ -1,19 +0,0 @@
|
|||
Bump security-framework from 2.1.1 to 2.1.2
|
||||
|
||||
security-framework=2.1.1 doesn't build on Darwin 10.12.
|
||||
https://github.com/kornelski/rust-security-framework/issues/124
|
||||
|
||||
--- c/Cargo.lock
|
||||
+++ i/Cargo.lock
|
||||
@@ -3138,9 +3138,9 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
|
||||
|
||||
[[package]]
|
||||
name = "security-framework"
|
||||
-version = "2.1.1"
|
||||
+version = "2.1.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "2dfd318104249865096c8da1dfabf09ddbb6d0330ea176812a62ec75e40c4166"
|
||||
+checksum = "d493c5f39e02dfb062cd8f33301f90f9b13b650e8c1b1d0fd75c19dd64bff69d"
|
||||
dependencies = [
|
||||
"bitflags 1.2.1",
|
||||
"core-foundation",
|
||||
|
|
@ -14,23 +14,21 @@ let
|
|||
in
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "ncspot";
|
||||
version = "0.5.0";
|
||||
version = "0.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hrkfdn";
|
||||
repo = "ncspot";
|
||||
rev = "v${version}";
|
||||
sha256 = "1h1il2mzngxmcsl169431lwzl0skv420arg9i06856r5wil37jf7";
|
||||
sha256 = "0j4ax3yh0l8v5bd5i3ijd8ys27dcrh7byigjip52mw1qlqfnh8wk";
|
||||
};
|
||||
|
||||
cargoSha256 = "13yn7l4hhl48lbpj0zsbraqzkkz6knc373j6rcf8d1p4z76yili4";
|
||||
cargoSha256 = "022q6rlac97dr6l7rd9xalgx0w257r364i1pij080qx8rk97msb9";
|
||||
|
||||
cargoBuildFlags = [ "--no-default-features" "--features" "${lib.concatStringsSep "," features}" ];
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
cargoPatches = [ ./bump-security-framework-crate.patch ];
|
||||
|
||||
buildInputs = [ ncurses openssl ]
|
||||
++ lib.optional stdenv.isDarwin libiconv
|
||||
++ lib.optional withALSA alsaLib
|
||||
|
|
|
|||
|
|
@ -3,12 +3,12 @@
|
|||
, libGLU, lv2, gtk2, cairo, pango, fftwFloat, zita-convolver }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "20200714";
|
||||
version = "20210114";
|
||||
pname = "x42-plugins";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://gareus.org/misc/x42-plugins/${pname}-${version}.tar.xz";
|
||||
sha256 = "1av05ykph8x67018hm9zfgh1vk0zi39mvrsxkj6bm4hkarxf0vvl";
|
||||
sha256 = "sha256-xUiA/k5ZbI/SkY8a20FsyRwqPxxMteiFdEhFF/8e2OA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
|
|
|||
|
|
@ -10,14 +10,14 @@
|
|||
|
||||
pythonPackages.buildPythonPackage rec {
|
||||
pname = "hydrus";
|
||||
version = "431";
|
||||
version = "434";
|
||||
format = "other";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hydrusnetwork";
|
||||
repo = "hydrus";
|
||||
rev = "v${version}";
|
||||
sha256 = "0mfql27n725k6ynvhkgzmxxpfbjlzil2fjpy082gz257kb0880zy";
|
||||
sha256 = "sha256-7Allc9zawja8DO2idv+MAYZ/cBRTCMd0mbgBLfEVii8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -75,11 +75,11 @@ pythonPackages.buildPythonPackage rec {
|
|||
-e TestServer \
|
||||
'';
|
||||
|
||||
extraOutputsToLink = [ "doc" ];
|
||||
outputs = [ "out" "doc" ];
|
||||
|
||||
postPatch = ''
|
||||
sed 's;os\.path\.join(\sHC\.BIN_DIR,.*;"${miniupnpc_2}/bin/upnpc";' \
|
||||
-i ./hydrus/core/HydrusNATPunch.py
|
||||
-i ./hydrus/core/networking/HydrusNATPunch.py
|
||||
|
||||
sed 's;os\.path\.join(\sHC\.BIN_DIR,.*;"${swftools}/bin/swfrender";' \
|
||||
-i ./hydrus/core/HydrusFlashHandling.py
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "lightburn";
|
||||
version = "0.9.22";
|
||||
version = "0.9.23";
|
||||
|
||||
nativeBuildInputs = [
|
||||
p7zip
|
||||
|
|
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/LightBurnSoftware/deployment/releases/download/${version}/LightBurn-Linux64-v${version}.7z";
|
||||
sha256 = "sha256-DOiO36suytukkviqYyLL47DFVzsJt2ZfSnnni95CLaA=";
|
||||
sha256 = "sha256-OiW9UBophyEF3J0FOSMkbwDJ6d8SEDNrr+H0B4Ndo/Y=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{ stdenv
|
||||
, lib
|
||||
, fetchgit
|
||||
, fetchFromSourcehut
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
|
|
@ -26,12 +26,13 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "megapixels";
|
||||
version = "0.15.0";
|
||||
version = "0.16.0";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://git.sr.ht/~martijnbraam/megapixels";
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~martijnbraam";
|
||||
repo = "megapixels";
|
||||
rev = version;
|
||||
sha256 = "1y8irwi8lbjs948j90gpic96dx5wjmwacd41hb3d9vzhkyni2dvb";
|
||||
sha256 = "0z7sx76x18yqf7carq6mg9lib0zbz0yrd1dsg9qd6hbf5niqis37";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ meson ninja pkg-config wrapGAppsHook ];
|
||||
|
|
@ -49,6 +50,7 @@ stdenv.mkDerivation rec {
|
|||
meta = with lib; {
|
||||
description = "GTK3 camera application using raw v4l2 and media-requests";
|
||||
homepage = "https://sr.ht/~martijnbraam/Megapixels";
|
||||
changelog = "https://git.sr.ht/~martijnbraam/megapixels/refs/${version}";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ OPNA2608 ];
|
||||
platforms = platforms.linux;
|
||||
|
|
|
|||
27
third_party/nixpkgs/pkgs/applications/graphics/round/default.nix
vendored
Normal file
27
third_party/nixpkgs/pkgs/applications/graphics/round/default.nix
vendored
Normal file
|
|
@ -0,0 +1,27 @@
|
|||
{ lib
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "round";
|
||||
version = "0.0.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mingrammer";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "09brjr3h4qnhlidxlki1by5anahxy16ai078zm4k7ryl579amzdw";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Round image corners from CLI";
|
||||
homepage = "https://github.com/mingrammer/round";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ addict3d ];
|
||||
};
|
||||
}
|
||||
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "clight";
|
||||
version = "4.2";
|
||||
version = "4.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "FedeDP";
|
||||
repo = "Clight";
|
||||
rev = version;
|
||||
sha256 = "sha256-NmfnE6ZWgG9erBmrFFIhutnB1t2Ix/6jo+EeXYVtehg=";
|
||||
sha256 = "sha256-fvi0JGNNDoxE0iH//HneYwQBBP4mY75AeViLHKQUI30=";
|
||||
};
|
||||
|
||||
# dbus-1.pc has datadir=/etc
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "logseq";
|
||||
version = "0.0.15";
|
||||
version = "0.0.16";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/logseq/logseq/releases/download/${version}/logseq-linux-x64-${version}.AppImage";
|
||||
sha256 = "4mnS2ikDPmIyT4P8zXssk6AVx50C24bsP4WpD5xJbD8=";
|
||||
sha256 = "dmgwFHJRy5qE71naRJKX0HCrVG0qQBOIM9TvCh4j/lY=";
|
||||
name = "${pname}-${version}.AppImage";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -17,11 +17,13 @@
|
|||
, dbus-python
|
||||
, distro
|
||||
, evdev
|
||||
, lxml
|
||||
, pillow
|
||||
, pygobject3
|
||||
, pyyaml
|
||||
, requests
|
||||
, keyring
|
||||
, python_magic
|
||||
|
||||
# commands that lutris needs
|
||||
, xrandr
|
||||
|
|
@ -71,13 +73,13 @@ let
|
|||
|
||||
in buildPythonApplication rec {
|
||||
pname = "lutris-original";
|
||||
version = "0.5.7.1";
|
||||
version = "0.5.8.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lutris";
|
||||
repo = "lutris";
|
||||
rev = "v${version}";
|
||||
sha256 = "12ispwkbbm5aq263n3bdjmjfkpwplizacnqs2c0wnag4zj4kpm29";
|
||||
sha256 = "sha256-NnWIP9oEndk/hDo5Z33pkmZ61pxT/ScmZ4YpS2ajK/8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ wrapGAppsHook ];
|
||||
|
|
@ -94,7 +96,16 @@ in buildPythonApplication rec {
|
|||
] ++ gstDeps;
|
||||
|
||||
propagatedBuildInputs = [
|
||||
evdev distro pyyaml pygobject3 requests pillow dbus-python keyring
|
||||
evdev
|
||||
distro
|
||||
lxml
|
||||
pyyaml
|
||||
pygobject3
|
||||
requests
|
||||
pillow
|
||||
dbus-python
|
||||
keyring
|
||||
python_magic
|
||||
];
|
||||
|
||||
# avoid double wrapping
|
||||
|
|
@ -112,7 +123,7 @@ in buildPythonApplication rec {
|
|||
meta = with lib; {
|
||||
homepage = "https://lutris.net";
|
||||
description = "Open Source gaming platform for GNU/Linux";
|
||||
license = licenses.gpl3;
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ chiiruno ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,20 +1,22 @@
|
|||
{ fetchFromGitHub, fzf, lib, makeWrapper, rustPlatform, wget }:
|
||||
{ stdenv, fetchFromGitHub, fzf, lib, makeWrapper, rustPlatform, wget, libiconv }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "navi";
|
||||
version = "2.14.0";
|
||||
version = "2.15.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "denisidoro";
|
||||
repo = "navi";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-4XR+HazX65jiMvZpLNMNOc8gVVAxMx3bNcVNT6UPJ3o=";
|
||||
sha256 = "sha256-qcfSGV/+FkyWGAApekRZHWGmeB9gIURt11DKn7lEh+o=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-ZBs9/yoY3na21rQd5zJzFujZZSq2BDoENKYAWI1fnTg=";
|
||||
cargoSha256 = "sha256-HpGzDZMIzO0lpussmm+kJNOU7zghcYrQWZo3WZ5FOmA=";
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/navi \
|
||||
--prefix PATH : "$out/bin" \
|
||||
|
|
|
|||
|
|
@ -2,24 +2,21 @@
|
|||
, lib
|
||||
, fetchurl
|
||||
, makeWrapper
|
||||
, electron_9
|
||||
, electron
|
||||
, common-updater-scripts
|
||||
, writeShellScript
|
||||
, jq
|
||||
, makeDesktopItem
|
||||
}:
|
||||
|
||||
let
|
||||
electron = electron_9;
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
|
||||
pname = "stretchly";
|
||||
version = "1.2.0";
|
||||
version = "1.5.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/hovancik/stretchly/releases/download/v${version}/stretchly-${version}.tar.xz";
|
||||
sha256 = "07v9yk9qgya9ladfgbfkwwnbzvczs1cv6yn3zrg9rviyv8zlqjls";
|
||||
sha256 = "19czwmwqsn82zdzln9zqqyl9sb3dm95gp58dqn1459gyinkzpvda";
|
||||
};
|
||||
|
||||
icon = fetchurl {
|
||||
|
|
|
|||
|
|
@ -2,12 +2,12 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "unipicker";
|
||||
version = "unstable-2018-07-10";
|
||||
version = "2.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jeremija";
|
||||
repo = pname;
|
||||
rev = "767571c87cdb1e654408d19fc4db98e5e6725c04";
|
||||
rev = "v${version}";
|
||||
sha256 = "1k4v53pm3xivwg9vq2kndpcmah0yn4679r5jzxvg38bbkfdk86c1";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -89,6 +89,5 @@ mkChromiumDerivation (base: rec {
|
|||
then ["aarch64-linux" "x86_64-linux"]
|
||||
else [];
|
||||
timeout = 172800; # 48 hours (increased from the Hydra default of 10h)
|
||||
broken = elem channel [ "dev" ];
|
||||
};
|
||||
})
|
||||
|
|
|
|||
|
|
@ -160,8 +160,15 @@ let
|
|||
url = "https://raw.githubusercontent.com/archlinux/svntogit-packages/61b0ab526d2aa3c62fa20bb756461ca9a482f6c6/trunk/chromium-fix-libva-redef.patch";
|
||||
sha256 = "1qj4sn1ngz0p1l1w3346kanr1sqlr3xdzk1f1i86lqa45mhv77ny";
|
||||
}) ++ optional (chromiumVersionAtLeast "90")
|
||||
./fix-missing-atspi2-dependency.patch
|
||||
;
|
||||
./patches/fix-missing-atspi2-dependency.patch
|
||||
++ optionals (chromiumVersionAtLeast "91") [
|
||||
./patches/closure_compiler-Use-the-Java-binary-from-the-system.patch
|
||||
(githubPatch
|
||||
# Revert "Reland #7 of "Force Python 3 to be used in build.""
|
||||
"38b6a9a8e5901766613879b6976f207aa163588a"
|
||||
"1lvxbd7rl6hz5j6kh6q83yb6vd9g7anlqbai8g1w1bp6wdpgwvp9"
|
||||
)
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
# remove unused third-party
|
||||
|
|
|
|||
|
|
@ -0,0 +1,31 @@
|
|||
From e031b8be0fb2a22f953c034cdf08ca9befe130d2 Mon Sep 17 00:00:00 2001
|
||||
From: Michael Weiss <dev.primeos@gmail.com>
|
||||
Date: Sun, 11 Apr 2021 18:05:12 +0200
|
||||
Subject: [PATCH] closure_compiler: Use the Java binary from the system
|
||||
|
||||
The bundled Java binary (third_party/jdk/current/bin/java) is missing in
|
||||
the tarball and we want to use the one from the system anyway.
|
||||
This reverts part of [0].
|
||||
|
||||
[0]: https://chromium-review.googlesource.com/c/chromium/src/+/2778794
|
||||
---
|
||||
third_party/closure_compiler/compiler.py | 3 +--
|
||||
1 file changed, 1 insertion(+), 2 deletions(-)
|
||||
|
||||
diff --git a/third_party/closure_compiler/compiler.py b/third_party/closure_compiler/compiler.py
|
||||
index 75690ceb9749..7b9c76f74290 100755
|
||||
--- a/third_party/closure_compiler/compiler.py
|
||||
+++ b/third_party/closure_compiler/compiler.py
|
||||
@@ -13,8 +13,7 @@ import subprocess
|
||||
|
||||
|
||||
_CURRENT_DIR = os.path.join(os.path.dirname(__file__))
|
||||
-_JAVA_PATH = os.path.join(_CURRENT_DIR, "..", "jdk", "current", "bin", "java")
|
||||
-assert os.path.isfile(_JAVA_PATH), "java only allowed in android builds"
|
||||
+_JAVA_PATH = "java"
|
||||
|
||||
class Compiler(object):
|
||||
"""Runs the Closure compiler on given source files to typecheck them
|
||||
--
|
||||
2.20.1
|
||||
|
||||
|
|
@ -18,9 +18,9 @@
|
|||
}
|
||||
},
|
||||
"beta": {
|
||||
"version": "90.0.4430.61",
|
||||
"sha256": "01vssy3q64pv9rw4cdxv5rdg7yrxmhyc03a5r75fhxc95fj66iac",
|
||||
"sha256bin64": "07l8dzyv0hav1gls3xw91q9ay2l8xxmsf7yagg940cya9ncl0lhi",
|
||||
"version": "90.0.4430.70",
|
||||
"sha256": "0jnyqnqwdccv3i55grd12wr2w5ffxyzmj2l3c1i24xawf2zdzyym",
|
||||
"sha256bin64": "1lv9gz6llphyvlvn92yw1cyhj4i6jzhy1l7hk01418prmhb4nfws",
|
||||
"deps": {
|
||||
"gn": {
|
||||
"version": "2021-02-09",
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "helm-secrets";
|
||||
version = "3.5.0";
|
||||
version = "3.6.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jkroepke";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-EXCr0QjupsBBKTm6Opw5bcNwAD4FGGyOiqaa8L91/OI=";
|
||||
hash = "sha256-RACETma0AaqaAfe0HWC541/i+knr+emMUauFWnkEuMI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -11,9 +11,9 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "minikube";
|
||||
version = "1.18.1";
|
||||
version = "1.19.0";
|
||||
|
||||
vendorSha256 = "sha256-rw1tqz+Y5iSXWIxXV4433Hwgyfz8jYMzKWurCi2hmhM=";
|
||||
vendorSha256 = "sha256-WGW2uz3YJIUjLsYQ6rXNvgJGLrZSIkEEk07llLzMVXA=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
@ -21,7 +21,7 @@ buildGoModule rec {
|
|||
owner = "kubernetes";
|
||||
repo = "minikube";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-8QI/Kn5LHSD3at7icmEDhjuYP811A4l+2KrRmKTwi8w=";
|
||||
sha256 = "sha256-F+nPSWX9gs/hvOR6g8MW4b+JW+w3ScDaaF/FLHbLspY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ go-bindata installShellFiles pkg-config which ];
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "tektoncd-cli";
|
||||
version = "0.17.1";
|
||||
version = "0.17.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tektoncd";
|
||||
repo = "cli";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-xwUTSJ0rlNzQqGQp6jL03L4SuHUvvD3aWXxa1Xp0UyM=";
|
||||
sha256 = "sha256-7VG9OFt1yVt4st8EM1aiRqLCHwjSqib28GoamoJHHnM=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "terragrunt";
|
||||
version = "0.28.19";
|
||||
version = "0.28.20";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gruntwork-io";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-REcVc4u7pDTDHvoI1Fw36Mioyg1D4U29Hq0ih8Bt95s=";
|
||||
sha256 = "sha256-Hg4eeLFNm2cXUjp3T2VK6q+mgawqkHju9P3Vq9wnB9c=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-kcRM76xfajtQist1aJTmaRludxRlfvHQ9ucB3LOgnBk=";
|
||||
|
|
|
|||
|
|
@ -17,8 +17,9 @@
|
|||
, webkitgtk
|
||||
, python3
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "feeds";
|
||||
pname = "gnome-feeds";
|
||||
version = "0.16.1";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
|
|
@ -25,7 +25,7 @@ let
|
|||
else "");
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "signal-desktop";
|
||||
version = "1.40.1"; # Please backport all updates to the stable channel.
|
||||
version = "5.0.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:
|
||||
|
|
@ -35,7 +35,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 = "0k57r1x64w38n0295qdrf3p19d3z8m530h46ps0j2x0krhah47w7";
|
||||
sha256 = "17hxg61m9kk1kph6ifqy6507kzx5hi6yafr2mj8n0a6c39vc8f9g";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -96,6 +96,8 @@ in stdenv.mkDerivation rec {
|
|||
dontAutoPatchelf = true;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/lib
|
||||
|
||||
mv usr/share $out/share
|
||||
|
|
@ -109,6 +111,8 @@ in stdenv.mkDerivation rec {
|
|||
# Symlink to bin
|
||||
mkdir -p $out/bin
|
||||
ln -s $out/lib/Signal/signal-desktop $out/bin/signal-desktop
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
preFixup = ''
|
||||
|
|
@ -136,7 +140,7 @@ in stdenv.mkDerivation rec {
|
|||
'';
|
||||
homepage = "https://signal.org/";
|
||||
changelog = "https://github.com/signalapp/Signal-Desktop/releases/tag/v${version}";
|
||||
license = lib.licenses.gpl3;
|
||||
license = lib.licenses.agpl3Only;
|
||||
maintainers = with lib.maintainers; [ ixmatus primeos equirosa ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -15,11 +15,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "teams";
|
||||
version = "1.4.00.4855";
|
||||
version = "1.4.00.7556";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://packages.microsoft.com/repos/ms-teams/pool/main/t/teams/teams_${version}_amd64.deb";
|
||||
sha256 = "1g0lsydz4l536qf890drdz6g86xb0sm3326hz3ymj9pi8vvbs7d9";
|
||||
sha256 = "0yak3jxh0gdn57wjss0s7sdjssf1b70j0klrcpv66bizqvw1xl7b";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ dpkg autoPatchelfHook wrapGAppsHook ];
|
||||
|
|
|
|||
|
|
@ -23,6 +23,7 @@ stdenv.mkDerivation rec {
|
|||
"--enable-fastjet=${fastjet}"
|
||||
"--enable-lhapdf=${lhapdf}"
|
||||
"--enable-rivet=${rivet}"
|
||||
"--enable-pythia"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -2,22 +2,16 @@
|
|||
, rustPlatform
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
|
||||
, pkg-config
|
||||
, fontconfig
|
||||
, python3
|
||||
, openssl
|
||||
, perl
|
||||
|
||||
# Apple frameworks
|
||||
, CoreGraphics
|
||||
, Cocoa
|
||||
, Foundation
|
||||
|
||||
, dbus
|
||||
, libX11
|
||||
, xcbutil
|
||||
, libxcb
|
||||
, xcbutilimage
|
||||
, xcbutilkeysyms
|
||||
, xcbutilwm # contains xcb-ewmh among others
|
||||
, libxkbcommon
|
||||
|
|
@ -28,6 +22,11 @@
|
|||
, libGL
|
||||
, freetype
|
||||
, zlib
|
||||
# Apple frameworks
|
||||
, CoreGraphics
|
||||
, Cocoa
|
||||
, Foundation
|
||||
, libiconv
|
||||
}:
|
||||
let
|
||||
runtimeDeps = [
|
||||
|
|
@ -38,6 +37,7 @@ let
|
|||
libX11
|
||||
xcbutil
|
||||
libxcb
|
||||
xcbutilimage
|
||||
xcbutilkeysyms
|
||||
xcbutilwm
|
||||
libxkbcommon
|
||||
|
|
@ -47,51 +47,48 @@ let
|
|||
wayland
|
||||
libGLU
|
||||
libGL
|
||||
openssl
|
||||
] ++ lib.optionals (stdenv.isDarwin) [
|
||||
Foundation
|
||||
CoreGraphics
|
||||
Cocoa
|
||||
libiconv
|
||||
];
|
||||
pname = "wezterm";
|
||||
in
|
||||
|
||||
rustPlatform.buildRustPackage {
|
||||
inherit pname;
|
||||
version = "unstable-2020-11-22";
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "wezterm";
|
||||
version = "20210407-nightly";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wez";
|
||||
repo = pname;
|
||||
rev = "3bd8d8c84591f4d015ff9a47ddb478e55c231fda";
|
||||
sha256 = "13xf3685kir4p159hsxrqkj9p2lwgfp0n13h9zadslrd44l8b8j8";
|
||||
rev = "d2419fb99e567e3b260980694cc840a1a3b86922";
|
||||
sha256 = "4tVjrdDlrDPKzcbTYK9vRlzfC9tfvkD+D0aN19A8RWE=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
cargoSha256 = "1ghjpyd3f5dqi6bblr6d2lihdschpyj5djfd1600hvb41x75lmhx";
|
||||
|
||||
cargoSha256 = "sha256-UaXeeuRuQk+CWF936mEAaWTjZuTSRPmxbQ/9E2oZIqg=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
python3
|
||||
openssl.dev
|
||||
perl
|
||||
];
|
||||
|
||||
buildInputs = runtimeDeps;
|
||||
|
||||
installPhase = "" + lib.optionalString stdenv.isLinux ''
|
||||
preFixup = lib.optionalString stdenv.isLinux ''
|
||||
for artifact in wezterm wezterm-gui wezterm-mux-server strip-ansi-escapes; do
|
||||
patchelf --set-rpath "${lib.makeLibraryPath runtimeDeps}" $releaseDir/$artifact
|
||||
install -D $releaseDir/$artifact -t $out/bin
|
||||
patchelf --set-rpath "${lib.makeLibraryPath runtimeDeps}" $out/bin/$artifact
|
||||
done
|
||||
'' + lib.optionalString stdenv.isDarwin ''
|
||||
mkdir -p "$out/Applications"
|
||||
OUT_APP="$out/Applications/WezTerm.app"
|
||||
cp -r assets/macos/WezTerm.app "$OUT_APP"
|
||||
rm $OUT_APP/*.dylib
|
||||
cp -r assets/shell-integration/* "$OUT_APP"
|
||||
cp $releaseDir/wezterm "$OUT_APP"
|
||||
cp $releaseDir/wezterm-mux-server "$OUT_APP"
|
||||
cp $releaseDir/wezterm-gui "$OUT_APP"
|
||||
cp $releaseDir/strip-ansi-escapes "$OUT_APP"
|
||||
mkdir -p "$out/Applications"
|
||||
OUT_APP="$out/Applications/WezTerm.app"
|
||||
cp -r assets/macos/WezTerm.app "$OUT_APP"
|
||||
rm $OUT_APP/*.dylib
|
||||
cp -r assets/shell-integration/* "$OUT_APP"
|
||||
ln -s $out/bin/{wezterm,wezterm-mux-server,wezterm-gui,strip-ansi-escapes} "$OUT_APP"
|
||||
'';
|
||||
|
||||
# prevent further changes to the RPATH
|
||||
|
|
@ -101,7 +98,7 @@ rustPlatform.buildRustPackage {
|
|||
description = "A GPU-accelerated cross-platform terminal emulator and multiplexer written by @wez and implemented in Rust";
|
||||
homepage = "https://wezfurlong.org/wezterm";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ steveej ];
|
||||
maintainers = with maintainers; [ steveej SuperSandro2000 ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -28,14 +28,23 @@ stdenv.mkDerivation {
|
|||
done
|
||||
'';
|
||||
|
||||
buildInputs = [ nano ];
|
||||
configureFlags = [
|
||||
"--with-editor=${nano}/bin/nano"
|
||||
|
||||
# Required for cross-compilation.
|
||||
"cvs_cv_func_printf_ptr=yes"
|
||||
];
|
||||
|
||||
makeFlags = [
|
||||
"AR=${stdenv.cc.targetPrefix}ar"
|
||||
];
|
||||
|
||||
doCheck = false; # fails 1 of 1 tests
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "http://cvs.nongnu.org";
|
||||
description = "Concurrent Versions System - a source control system";
|
||||
license = licenses.gpl2; # library is GPLv2, main is GPLv1
|
||||
license = licenses.gpl2Plus; # library is GPLv2, main is GPLv1
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,13 +8,13 @@ in
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "git-cinnabar";
|
||||
version = "0.5.6";
|
||||
version = "0.5.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "glandium";
|
||||
repo = "git-cinnabar";
|
||||
rev = version;
|
||||
sha256 = "1wbp4xqpkaqhhkjw8rbbsagwiciqffacqqbm4j49q41mlk371ai3";
|
||||
sha256 = "04dsjlsw98avrckldx7rc70b2zsbajzkyqqph4c7d9xd5djh3yaj";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -13,11 +13,11 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gitkraken";
|
||||
version = "7.5.4";
|
||||
version = "7.5.5";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://release.axocdn.com/linux/GitKraken-v${version}.tar.gz";
|
||||
sha256 = "1laqki01zcmsl9s18dnwg3x3jbbs0xcipiyj2qlsb1sx9y4x05wm";
|
||||
sha256 = "0l40ap0ck2ywjarmn7lmpw4qbsdkx717d9kmx67p4qlmbwpimqhg";
|
||||
};
|
||||
|
||||
dontBuild = true;
|
||||
|
|
|
|||
|
|
@ -15,11 +15,11 @@ with lib;
|
|||
|
||||
buildGoPackage rec {
|
||||
pname = "singularity";
|
||||
version = "3.7.2";
|
||||
version = "3.7.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/hpcng/singularity/releases/download/v${version}/singularity-${version}.tar.gz";
|
||||
sha256 = "sha256-NpFiIuJvuTRATwdm4P82jtrDbX/DHKVx9fYJRmYJBms=";
|
||||
sha256 = "sha256-ZmfriHXStm1zUE9AyVa0KxNRdE9IjRZCBDdiFdiF2lw=";
|
||||
};
|
||||
|
||||
goPackagePath = "github.com/sylabs/singularity";
|
||||
|
|
|
|||
62
third_party/nixpkgs/pkgs/applications/window-managers/e16/default.nix
vendored
Normal file
62
third_party/nixpkgs/pkgs/applications/window-managers/e16/default.nix
vendored
Normal file
|
|
@ -0,0 +1,62 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, pkg-config
|
||||
, freetype
|
||||
, imlib2
|
||||
, libSM
|
||||
, libXcomposite
|
||||
, libXdamage
|
||||
, libXext
|
||||
, libXfixes
|
||||
, libXft
|
||||
, libXinerama
|
||||
, libXrandr
|
||||
, libpulseaudio
|
||||
, libsndfile
|
||||
, pango
|
||||
, perl
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "e16";
|
||||
version = "1.0.23";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/enlightenment/e16-${version}.tar.xz";
|
||||
sha256 = "028rn1plggacsvdd035qnnph4xw8nya34mmjvvl7d4gqj9pj293f";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
freetype
|
||||
imlib2
|
||||
libSM
|
||||
libXcomposite
|
||||
libXdamage
|
||||
libXext
|
||||
libXfixes
|
||||
libXft
|
||||
libXinerama
|
||||
libXrandr
|
||||
libpulseaudio
|
||||
libsndfile
|
||||
pango
|
||||
perl
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace scripts/e_gen_menu --replace "/usr/local:" "/run/current-system/sw:/usr/local:"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://www.enlightenment.org/e16";
|
||||
description = "Enlightenment DR16 window manager";
|
||||
license = licenses.bsd2;
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ maintainers.romildo ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,14 +1,14 @@
|
|||
{ lib, stdenv, substituteAll, fetchpatch, fetchFromGitHub, glib, glib-networking, libgtop, gnome3 }:
|
||||
{ lib, stdenv, substituteAll, fetchFromGitHub, glib, glib-networking, libgtop, gnome3 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-shell-system-monitor";
|
||||
version = "2020-04-27-unstable";
|
||||
version = "unstable-2021-04-08";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "paradoxxxzero";
|
||||
repo = "gnome-shell-system-monitor-applet";
|
||||
rev = "7f8f0a7b255473941f14d1dcaa35ebf39d3bccd0";
|
||||
sha256 = "tUUvBY0UEUE+T79zVZEAICpKoriFZuuZzi9ArdHdXks=";
|
||||
rev = "942603da39de12f50b1f86efbde92d7526d1290e";
|
||||
sha256 = "0lzb7064bigw2xsqkzr8qfhp9wfmxyi3823j2782v99jpcz423aw";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
|||
|
|
@ -12,16 +12,21 @@ in mkCoqDerivation {
|
|||
owner = "LPCIC";
|
||||
inherit version;
|
||||
defaultVersion = lib.switch coq.coq-version [
|
||||
{ case = "8.13"; out = "1.9.4"; }
|
||||
{ case = "8.12"; out = "1.8.0"; }
|
||||
{ case = "8.11"; out = "1.6.1_8.11"; }
|
||||
{ case = "8.13"; out = "1.9.5"; }
|
||||
{ case = "8.12"; out = "1.8.2_8.12"; }
|
||||
{ case = "8.11"; out = "1.6.2_8.11"; }
|
||||
] null;
|
||||
release."1.9.5".sha256 = "0gjdwmb6bvb5gh0a6ra48bz5fb3pr5kpxijb7a8mfydvar5i9qr6";
|
||||
release."1.9.4".sha256 = "0nii7238mya74f9g6147qmpg6gv6ic9b54x5v85nb6q60d9jh0jq";
|
||||
release."1.9.3".sha256 = "198irm800fx3n8n56vx1c6f626cizp1d7jfkrc6ba4iqhb62ma0z";
|
||||
release."1.9.2".sha256 = "1rr2fr8vjkc0is7vh1461aidz2iwkigdkp6bqss4hhv0c3ijnn07";
|
||||
release."1.8.2_8.12".sha256 = "1n6jwcdazvjgj8vsv2r9zgwpw5yqr5a1ndc2pwhmhqfl04b5dk4y";
|
||||
release."1.8.2_8.12".version = "1.8.2";
|
||||
release."1.8.1".sha256 = "1fbbdccdmr8g4wwpihzp4r2xacynjznf817lhijw6kqfav75zd0r";
|
||||
release."1.8.0".sha256 = "13ywjg94zkbki22hx7s4gfm9rr87r4ghsgan23xyl3l9z8q0idd1";
|
||||
release."1.7.0".sha256 = "1ws5cqr0xawv69prgygbl3q6dgglbaw0vc397h9flh90kxaqgyh8";
|
||||
release."1.6.2_8.11".sha256 = "06xrx0ljilwp63ik2sxxr7h617dgbch042xfcnfpy5x96br147rn";
|
||||
release."1.6.2_8.11".version = "1.6.2";
|
||||
release."1.6.1_8.11".sha256 = "0yyyh35i1nb3pg4hw7cak15kj4y6y9l84nwar9k1ifdsagh5zq53";
|
||||
release."1.6.1_8.11".version = "1.6.1";
|
||||
release."1.6.0_8.11".sha256 = "0ahxjnzmd7kl3gl38kyjqzkfgllncr2ybnw8bvgrc6iddgga7bpq";
|
||||
|
|
|
|||
|
|
@ -4,13 +4,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "civetweb";
|
||||
version = "1.13";
|
||||
version = "1.14";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "/q7Q1lavIR3i126uI4NsKByHJ6Tp+DSN60R4YxR506U=";
|
||||
sha256 = "sha256-6qBsM9zkN838cMtpE3+c7qcrFpZCS/Av7Ch7EWmlnD4=";
|
||||
};
|
||||
|
||||
makeFlags = [
|
||||
|
|
|
|||
23
third_party/nixpkgs/pkgs/development/libraries/openimagedenoise/1_2_x.nix
vendored
Normal file
23
third_party/nixpkgs/pkgs/development/libraries/openimagedenoise/1_2_x.nix
vendored
Normal file
|
|
@ -0,0 +1,23 @@
|
|||
{ lib, stdenv, fetchzip, cmake, tbb, python3, ispc }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "openimagedenoise";
|
||||
version = "1.2.2";
|
||||
|
||||
# The release tarballs include pretrained weights, which would otherwise need to be fetched with git-lfs
|
||||
src = fetchzip {
|
||||
url = "https://github.com/OpenImageDenoise/oidn/releases/download/v${version}/oidn-${version}.src.tar.gz";
|
||||
sha256 = "0wyaarjxkzlvljmpnr7qm06ma2wl1aik3z664gwpzhizswygk6yp";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake python3 ispc ];
|
||||
buildInputs = [ tbb ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://openimagedenoise.github.io";
|
||||
description = "High-Performance Denoising Library for Ray Tracing";
|
||||
license = licenses.asl20;
|
||||
maintainers = [ maintainers.leshainc ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
@ -1,16 +1,16 @@
|
|||
{ lib, stdenv, fetchzip, cmake, tbb, python, ispc }:
|
||||
{ lib, stdenv, fetchzip, cmake, tbb, python3, ispc }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "openimagedenoise";
|
||||
version = "1.2.2";
|
||||
version = "1.3.0";
|
||||
|
||||
# The release tarballs include pretrained weights, which would otherwise need to be fetched with git-lfs
|
||||
src = fetchzip {
|
||||
url = "https://github.com/OpenImageDenoise/oidn/releases/download/v${version}/oidn-${version}.src.tar.gz";
|
||||
sha256 = "0wyaarjxkzlvljmpnr7qm06ma2wl1aik3z664gwpzhizswygk6yp";
|
||||
sha256 = "sha256-ls0F2D5pC+wqhQn1Zh8m8Q/KoK7rAkhKatTY9k+letQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake python ispc ];
|
||||
nativeBuildInputs = [ cmake python3 ispc ];
|
||||
buildInputs = [ tbb ];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -1,20 +0,0 @@
|
|||
{ lib, stdenv, fetchurl }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "proj-5.2.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.osgeo.org/proj/proj-5.2.0.tar.gz";
|
||||
sha256 = "0q3ydh2j8qhwlxmnac72pg69rw2znbi5b6k5wama8qmwzycr94gg";
|
||||
};
|
||||
|
||||
doCheck = stdenv.is64bit;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Cartographic Projections Library";
|
||||
homepage = "https://proj4.org";
|
||||
license = licenses.mit;
|
||||
platforms = platforms.linux ++ platforms.darwin;
|
||||
maintainers = with maintainers; [ vbgl ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,21 +1,21 @@
|
|||
{ lib, stdenv, fetchFromGitHub, pkg-config, sqlite, autoreconfHook }:
|
||||
{ lib, stdenv, fetchFromGitHub, pkg-config, sqlite, autoreconfHook, libtiff, curl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "proj";
|
||||
version = "6.3.1";
|
||||
version = "7.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "OSGeo";
|
||||
repo = "PROJ";
|
||||
rev = version;
|
||||
sha256 = "1ildcp57qsa01kvv2qxd05nqw5mg0wfkksiv9l138dbhp0s7rkxp";
|
||||
sha256 = "0mymvfvs8xggl4axvlj7kc1ksd9g94kaz6w1vdv0x2y5mqk93gx9";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev"];
|
||||
|
||||
nativeBuildInputs = [ pkg-config autoreconfHook ];
|
||||
|
||||
buildInputs = [ sqlite ];
|
||||
buildInputs = [ sqlite libtiff curl ];
|
||||
|
||||
doCheck = stdenv.is64bit;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,25 +0,0 @@
|
|||
{ lib, stdenv, fetchFromGitHub, cmake, cairo }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "redkite";
|
||||
version = "1.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "iurie-sw";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-bf8kz9RyhDDuUHKiKvLiQLBIEXbIyoy3yuKfSpSYYv0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
buildInputs = [ cairo ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://gitlab.com/iurie-sw/redkite";
|
||||
description = "A small GUI toolkit";
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ maintainers.magnetophon ];
|
||||
};
|
||||
}
|
||||
|
|
@ -29,6 +29,7 @@
|
|||
, "coc-diagnostic"
|
||||
, "coc-emmet"
|
||||
, "coc-eslint"
|
||||
, "coc-explorer"
|
||||
, "coc-git"
|
||||
, "coc-go"
|
||||
, "coc-highlight"
|
||||
|
|
@ -141,6 +142,7 @@
|
|||
, "karma"
|
||||
, "lcov-result-merger"
|
||||
, "leetcode-cli"
|
||||
, "vsc-leetcode-cli"
|
||||
, "lerna"
|
||||
, "less"
|
||||
, "less-plugin-clean-css"
|
||||
|
|
|
|||
4543
third_party/nixpkgs/pkgs/development/node-packages/node-packages.nix
generated
vendored
4543
third_party/nixpkgs/pkgs/development/node-packages/node-packages.nix
generated
vendored
File diff suppressed because it is too large
Load diff
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
buildDunePackage rec {
|
||||
pname = "rpclib";
|
||||
version = "8.0.0";
|
||||
version = "8.1.0";
|
||||
|
||||
useDune2 = true;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/mirage/ocaml-rpc/releases/download/v${version}/rpclib-v${version}.tbz";
|
||||
sha256 = "1kqbixk4d9y15ns566fiyzid5jszkamm1kv7iks71invv33v7krz";
|
||||
sha256 = "0fbajg8wq8hjhkvvfnq68br0m0pa8zf2qzadhfgi2nnr9713rada";
|
||||
};
|
||||
|
||||
buildInputs = [ cmdliner yojson ];
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiohomekit";
|
||||
version = "0.2.60";
|
||||
version = "0.2.61";
|
||||
format = "pyproject";
|
||||
disabled = pythonAtLeast "3.9";
|
||||
|
||||
|
|
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
|||
owner = "Jc2k";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "03llk5i22hq163x568kz0qar5h0sda8f8cxbmgya6z2dcxv0a83p";
|
||||
sha256 = "047ql5a4i4354jgr8xr2waim8j522z58vbfi7aa62jqc9l8jzxzk";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ poetry ];
|
||||
|
|
|
|||
35
third_party/nixpkgs/pkgs/development/python-modules/amiibo-py/default.nix
vendored
Normal file
35
third_party/nixpkgs/pkgs/development/python-modules/amiibo-py/default.nix
vendored
Normal file
|
|
@ -0,0 +1,35 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pythonOlder
|
||||
, aiohttp
|
||||
, requests
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "amiibo-py";
|
||||
version = "unstable-2021-01-16";
|
||||
disabled = pythonOlder "3.5.3"; # Older versions are not supported upstream
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "XiehCanCode";
|
||||
repo = "amiibo.py";
|
||||
rev = "4766037530f41ad11368240e994888d196783b83";
|
||||
sha256 = "0ln8ykaws8c5fvzlzccn60mpbdbvxlhkp3nsvs2xqdbsqp270yv2";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
aiohttp
|
||||
requests
|
||||
];
|
||||
|
||||
doCheck = false; # No tests are available upstream
|
||||
pythonImportsCheck = [ "amiibo" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "API Wrapper for amiiboapi.com";
|
||||
homepage = "https://github.com/XiehCanCode/amiibo.py";
|
||||
license = licenses.mit;
|
||||
maintainers = [ maintainers.ivar ];
|
||||
};
|
||||
}
|
||||
|
|
@ -8,14 +8,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "asyncio-throttle";
|
||||
version = "1.0.1";
|
||||
version = "1.0.2";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hallazzang";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0raqnrnp42cn1c7whbm7ajbgaczx33k6hbxsj30nh998pqxhh4sj";
|
||||
sha256 = "1hsjcymdcm0hf4l68scf9n8j7ba89azgh96xhxrnyvwxfs5acnmv";
|
||||
};
|
||||
|
||||
checkInputs = [
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pythonAtLeast
|
||||
, numpy
|
||||
, matplotlib
|
||||
, pillow
|
||||
|
|
@ -43,6 +44,7 @@ buildPythonPackage rec {
|
|||
http://matplotlib.github.com/basemap/users/examples.html for examples of what it can do.
|
||||
'';
|
||||
license = with licenses; [ mit gpl2 ];
|
||||
broken = pythonAtLeast "3.9";
|
||||
};
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -13,11 +13,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "boto3";
|
||||
version = "1.17.46"; # N.B: if you change this, change botocore and awscli to a matching version
|
||||
version = "1.17.49"; # N.B: if you change this, change botocore and awscli to a matching version
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-Xe4Vv5YepYTWgfrkLFADTIOXF+dFTD2pDLV6bFLpdTI=";
|
||||
sha256 = "sha256-pIITXDD6B+r0NwMU3Q+0kRciKiZtBCOyB1rtODXtHwQ=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ];
|
||||
|
|
|
|||
|
|
@ -13,11 +13,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "botocore";
|
||||
version = "1.20.46"; # N.B: if you change this, change boto3 and awscli to a matching version
|
||||
version = "1.20.49"; # N.B: if you change this, change boto3 and awscli to a matching version
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-ULvD6TQcfaqCGduYw48mASoVHKiPomAUjlvzrcvLlUE=";
|
||||
sha256 = "sha256-9/ED+gZRxp3TYMfQ7Nh0hUMD3lzAhp4MvCgYpSuqzGk=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,10 +1,9 @@
|
|||
{ buildPythonPackage, lib, fetchPypi
|
||||
, pytest_4, filelock, mock, pep8
|
||||
, cython, isPy27
|
||||
{ buildPythonPackage, lib, fetchPypi, fetchpatch
|
||||
, pytestCheckHook, filelock, mock, pep8
|
||||
, cython
|
||||
, six, pyshp, shapely, geos, numpy
|
||||
, gdal, pillow, matplotlib, pyepsg, pykdtree, scipy, owslib, fiona
|
||||
, xvfb_run
|
||||
, proj_5 # see https://github.com/SciTools/cartopy/pull/1252 for status on proj 6 support
|
||||
, proj
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
|
|
@ -17,28 +16,16 @@ buildPythonPackage rec {
|
|||
sha256 = "0d24fk0cbp29gmkysrwq05vry13swmwi3vx3cpcy04c0ixz33ykz";
|
||||
};
|
||||
|
||||
checkInputs = [ filelock mock pytest_4 pep8 ];
|
||||
|
||||
# several tests require network connectivity: we disable them.
|
||||
# also py2.7's tk is over-eager in trying to open an x display,
|
||||
# so give it xvfb
|
||||
checkPhase = let
|
||||
maybeXvfbRun = lib.optionalString isPy27 "${xvfb_run}/bin/xvfb-run";
|
||||
in ''
|
||||
export HOME=$(mktemp -d)
|
||||
${maybeXvfbRun} pytest --pyargs cartopy \
|
||||
-m "not network and not natural_earth" \
|
||||
-k "not test_nightshade_image and not background_img"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
cython
|
||||
geos # for geos-config
|
||||
proj_5
|
||||
patches = [
|
||||
# Fix numpy-1.20 compatibility. Will be part of 0.19.
|
||||
(fetchpatch {
|
||||
url = "https://github.com/SciTools/cartopy/commit/e663bbbef07989a5f8484a8f36ea9c07e61d14ce.patch";
|
||||
sha256 = "061kbjgzkc3apaz6sxy00pkgy3n9dxcgps5wzj4rglb5iy86n2kq";
|
||||
})
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
geos proj_5
|
||||
geos proj
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -49,12 +36,28 @@ buildPythonPackage rec {
|
|||
gdal pillow matplotlib pyepsg pykdtree scipy fiona owslib
|
||||
];
|
||||
|
||||
checkInputs = [ pytestCheckHook filelock mock pep8 ];
|
||||
|
||||
pytestFlagsArray = [
|
||||
"--pyargs" "cartopy"
|
||||
"-m" "'not network and not natural_earth'"
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
"test_nightshade_image"
|
||||
"background_img"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cython
|
||||
geos # for geos-config
|
||||
proj
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Process geospatial data to create maps and perform analyses";
|
||||
license = licenses.lgpl3;
|
||||
homepage = "https://scitools.org.uk/cartopy/docs/latest/";
|
||||
maintainers = with maintainers; [ mredaelli ];
|
||||
# following tests fail: test_eccentric_globe and test_ellipse_globe
|
||||
broken = true;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,11 +6,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "colorlog";
|
||||
version = "4.8.0";
|
||||
version = "5.0.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-WbUxYMYJAsQFzewo04NW4J1AaGZZBIiT4CbsvViVFrE=";
|
||||
sha256 = "sha256-8XwBOgaWKwL0RJ7gfP2+ayh98p78LJoVFbSjdvTliOo=";
|
||||
};
|
||||
|
||||
checkInputs = [ pytestCheckHook ];
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, pythonOlder
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
|
|
@ -8,19 +9,21 @@
|
|||
, osqp
|
||||
, scipy
|
||||
, scs
|
||||
, useOpenmp ? true
|
||||
# Check inputs
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "cvxpy";
|
||||
version = "1.1.11";
|
||||
version = "1.1.12";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.5";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-W4qly+g07Q1iYJ76/tGZNkBPa+oavhTDUYRQ3cZ+s1I=";
|
||||
hash = "sha256-tJnr+uT8ZF6VI2IVc//LHFtoVKG1wM4dZqippFhgWAc=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -32,12 +35,20 @@ buildPythonPackage rec {
|
|||
scs
|
||||
];
|
||||
|
||||
# Required flags from https://github.com/cvxgrp/cvxpy/releases/tag/v1.1.11
|
||||
preBuild = lib.optional useOpenmp ''
|
||||
export CFLAGS="-fopenmp"
|
||||
export LDFLAGS="-lgomp"
|
||||
'';
|
||||
|
||||
checkInputs = [ pytestCheckHook ];
|
||||
pytestFlagsArray = [ "./cvxpy" ];
|
||||
# Disable the slowest benchmarking tests, cuts test time in half
|
||||
disabledTests = [
|
||||
"test_tv_inpainting"
|
||||
"test_diffcp_sdp_example"
|
||||
] ++ lib.optionals stdenv.isAarch64 [
|
||||
"test_ecos_bb_mi_lp_2" # https://github.com/cvxgrp/cvxpy/issues/1241#issuecomment-780912155
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -17,11 +17,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "datadog";
|
||||
version = "0.40.0";
|
||||
version = "0.40.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "4bbd66a02bbcf9cd03ba05194d605a64c9efb7aed90d5e69c6ec42655c3c01a4";
|
||||
sha256 = "sha256-Q4wd3lRi5oxceSt7Sh2HoN3ZcK89sxs88VmA7tDEQxE=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
@ -43,12 +43,11 @@ buildPythonPackage rec {
|
|||
];
|
||||
|
||||
disabledTestPaths = [
|
||||
"tests/unit/dogstatsd/test_statsd.py" # does not work in sandbox
|
||||
"tests/performance"
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
"test_default_settings_set"
|
||||
"test_threadstats_thread_safety"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "datadog" ];
|
||||
|
|
|
|||
12
third_party/nixpkgs/pkgs/development/python-modules/diagrams/build_poetry.patch
vendored
Normal file
12
third_party/nixpkgs/pkgs/development/python-modules/diagrams/build_poetry.patch
vendored
Normal file
|
|
@ -0,0 +1,12 @@
|
|||
diff --git a/pyproject.toml b/pyproject.toml
|
||||
index 2c93a39..6c800e2 100644
|
||||
--- a/pyproject.toml
|
||||
+++ b/pyproject.toml
|
||||
@@ -24,3 +24,7 @@ isort = "^4.3"
|
||||
|
||||
[tool.black]
|
||||
line-length = 120
|
||||
+
|
||||
+[build-system]
|
||||
+requires = ["poetry_core>=1.0.0"]
|
||||
+build-backend = "poetry.core.masonry.api"
|
||||
49
third_party/nixpkgs/pkgs/development/python-modules/diagrams/default.nix
vendored
Normal file
49
third_party/nixpkgs/pkgs/development/python-modules/diagrams/default.nix
vendored
Normal file
|
|
@ -0,0 +1,49 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, pythonOlder
|
||||
, fetchFromGitHub
|
||||
, black
|
||||
, jinja2
|
||||
, poetry-core
|
||||
, round
|
||||
, graphviz
|
||||
, inkscape
|
||||
, imagemagick
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "diagrams";
|
||||
version = "0.19.1";
|
||||
format = "pyproject";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mingrammer";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0qvk0cp3026n5jmwp9z7m70b6pws0h6a7slxr23glg18baxr44d4";
|
||||
};
|
||||
|
||||
preConfigure = ''
|
||||
patchShebangs autogen.sh
|
||||
./autogen.sh
|
||||
'';
|
||||
|
||||
patches = [ ./build_poetry.patch ];
|
||||
|
||||
checkInputs = [ pytestCheckHook ];
|
||||
|
||||
# Despite living in 'tool.poetry.dependencies',
|
||||
# these are only used at build time to process the image resource files
|
||||
nativeBuildInputs = [ black inkscape imagemagick jinja2 poetry-core round ];
|
||||
|
||||
propagatedBuildInputs = [ graphviz ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Diagram as Code";
|
||||
homepage = "https://diagrams.mingrammer.com/";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ addict3d ];
|
||||
};
|
||||
}
|
||||
|
|
@ -12,11 +12,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "hcloud";
|
||||
version = "1.11.0";
|
||||
version = "1.12.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1yq7g9hk6b95nqd0f7kvh9r8ij8k9hs6gmjif83qip98xvkdwf0b";
|
||||
sha256 = "1fka4m3kbz52pksrjw3v42k611x5kl06dxrc7p5rb64jg6gayjfl";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ future requests python-dateutil ];
|
||||
|
|
|
|||
|
|
@ -13,14 +13,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "ircrobots";
|
||||
version = "0.3.7";
|
||||
version = "0.3.8";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jesopo";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0cm4hcmprca24d979ydbzwn9mfxw16jki6ld7yykxryf0983nqc7";
|
||||
sha256 = "06q86dqllxvi3nssfplmjk9yxaybighwh87lrxfpfhl8yy4z68jz";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -10,14 +10,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "ircstates";
|
||||
version = "0.11.7";
|
||||
version = "0.11.8";
|
||||
disabled = pythonOlder "3.6"; # f-strings
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jesopo";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "00dyd6mry10na98x1gs92xnfpjf1wd9zpblx1wcx8ggv5rqvgqrm";
|
||||
sha256 = "0scxqcgby4vzh2q937r0wy2mb46aghjf47q3z6fp6di1b6hlj7zh";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ buildPythonPackage rec {
|
|||
meta = with lib; {
|
||||
description = "Extract, clean, transform, hyphenate and metadata for ISBNs";
|
||||
homepage = "https://github.com/xlcnd/isbnlib";
|
||||
license = licenses.lgpl3Only;
|
||||
license = licenses.lgpl3Plus;
|
||||
maintainers = with maintainers; [ dotlambda ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,28 +1,24 @@
|
|||
{ lib, buildPythonPackage, fetchFromGitHub, pdfminer, chardet, pytest }:
|
||||
{ lib, buildPythonPackage, fetchFromGitHub, pdfminer, chardet, pytestCheckHook }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pdfx";
|
||||
version = "1.3.1";
|
||||
version = "1.4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "metachris";
|
||||
repo = "pdfx";
|
||||
rev = "v${version}";
|
||||
sha256 = "1183k4h5qdf8y0imbir9ja3yzzsvdmqgbv3bi6dnkgr1wy2xfr0v";
|
||||
sha256 = "sha256-POpP6XwcqwvImrtIiDjpnHoNE0MKapuPjxojo+ocBK0=";
|
||||
};
|
||||
|
||||
# Remove after https://github.com/metachris/pdfx/pull/28
|
||||
prePatch = ''
|
||||
sed -i -e "s|pdfminer2|pdfminer.six|" setup.py
|
||||
postPatch = ''
|
||||
substituteInPlace requirements.txt \
|
||||
--replace "chardet==4.0.0" "chardet"
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [ pdfminer chardet ];
|
||||
|
||||
checkInputs = [ pytest ];
|
||||
|
||||
checkPhase = ''
|
||||
py.test
|
||||
'';
|
||||
checkInputs = [ pytestCheckHook ];
|
||||
|
||||
meta = with lib; {
|
||||
inherit (src.meta) homepage;
|
||||
|
|
|
|||
|
|
@ -7,11 +7,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyeconet";
|
||||
version = "0.1.13";
|
||||
version = "0.1.14";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0pxwsmxzbmrab6p6qr867pc43ky2yjv2snra534wrdrknpj40h4s";
|
||||
sha256 = "sha256-x0mkC2k65VrDhv7UavgDUuRWIQoAJMDtA7jNXNUJuVg=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pylatexenc";
|
||||
version = "2.8";
|
||||
version = "2.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "phfaist";
|
||||
repo = "pylatexenc";
|
||||
rev = "v${version}";
|
||||
sha256 = "0m9vrbh1gmbgq6dqm7xzklar3accadw0pn896rqsdi5jbgd3w0mh";
|
||||
hash = "sha256-3Ho04qrmCtmmrR+BUJNbtdCZcK7lXhUGJjm4yfCTUkM=";
|
||||
};
|
||||
|
||||
pythonImportsCheck = [ "pylatexenc" ];
|
||||
|
|
|
|||
|
|
@ -1,62 +1,56 @@
|
|||
diff -Nur a/pyproj/datadir.py b/pyproj/datadir.py
|
||||
--- a/pyproj/datadir.py 2020-03-24 12:53:39.417440608 +0100
|
||||
+++ b/pyproj/datadir.py 2020-03-24 12:56:19.870089479 +0100
|
||||
@@ -66,9 +66,7 @@
|
||||
--- a/pyproj/datadir.py 2021-04-10 18:26:52.829018483 +0100
|
||||
+++ b/pyproj/datadir.py 2021-04-10 18:44:59.155190614 +0100
|
||||
@@ -70,7 +70,7 @@
|
||||
if _VALIDATED_PROJ_DATA is not None:
|
||||
return _VALIDATED_PROJ_DATA
|
||||
global _USER_PROJ_DATA
|
||||
- internal_datadir = os.path.join(
|
||||
- os.path.dirname(os.path.abspath(__file__)), "proj_dir", "share", "proj"
|
||||
- )
|
||||
+ internal_datadir = "@proj@/share/proj"
|
||||
- internal_datadir = Path(__file__).absolute().parent / "proj_dir" / "share" / "proj"
|
||||
+ internal_datadir = Path("@proj@/share/proj")
|
||||
proj_lib_dirs = os.environ.get("PROJ_LIB", "")
|
||||
prefix_datadir = os.path.join(sys.prefix, "share", "proj")
|
||||
prefix_datadir = Path(sys.prefix, "share", "proj")
|
||||
|
||||
diff -Nur a/setup.py b/setup.py
|
||||
--- a/setup.py 2020-03-24 12:53:39.415440624 +0100
|
||||
+++ b/setup.py 2020-03-24 12:52:05.311232522 +0100
|
||||
--- a/setup.py 2021-04-10 18:26:52.817018512 +0100
|
||||
+++ b/setup.py 2021-04-10 18:46:01.652324424 +0100
|
||||
@@ -11,7 +11,7 @@
|
||||
PROJ_MIN_VERSION = parse_version("6.2.0")
|
||||
CURRENT_FILE_PATH = os.path.dirname(os.path.abspath(__file__))
|
||||
BASE_INTERNAL_PROJ_DIR = "proj_dir"
|
||||
-INTERNAL_PROJ_DIR = os.path.join(CURRENT_FILE_PATH, "pyproj", BASE_INTERNAL_PROJ_DIR)
|
||||
+INTERNAL_PROJ_DIR = "@proj@"
|
||||
PROJ_MIN_VERSION = parse_version("7.2.0")
|
||||
CURRENT_FILE_PATH = Path(__file__).absolute().parent
|
||||
BASE_INTERNAL_PROJ_DIR = Path("proj_dir")
|
||||
-INTERNAL_PROJ_DIR = CURRENT_FILE_PATH / "pyproj" / BASE_INTERNAL_PROJ_DIR
|
||||
+INTERNAL_PROJ_DIR = Path("@proj@")
|
||||
|
||||
|
||||
def check_proj_version(proj_dir):
|
||||
@@ -146,7 +146,7 @@
|
||||
def get_proj_version(proj_dir: Path) -> str:
|
||||
@@ -150,7 +150,7 @@
|
||||
# By default we'll try to get options PROJ_DIR or the local version of proj
|
||||
proj_dir = get_proj_dir()
|
||||
library_dirs = get_proj_libdirs(proj_dir)
|
||||
- include_dirs = get_proj_incdirs(proj_dir)
|
||||
+ include_dirs = get_proj_incdirs("@projdev@")
|
||||
+ include_dirs = get_proj_incdirs(Path("@projdev@"))
|
||||
|
||||
# setup extension options
|
||||
ext_options = {
|
||||
proj_version = get_proj_version(proj_dir)
|
||||
check_proj_version(proj_version)
|
||||
diff -Nur a/test/conftest.py b/test/conftest.py
|
||||
--- a/test/conftest.py 2020-03-24 12:53:39.417440608 +0100
|
||||
+++ b/test/conftest.py 2020-03-24 23:16:47.373972786 +0100
|
||||
@@ -1,6 +1,7 @@
|
||||
import os
|
||||
import shutil
|
||||
import tempfile
|
||||
--- a/test/conftest.py 2021-04-10 18:26:52.831018478 +0100
|
||||
+++ b/test/conftest.py 2021-04-10 18:37:01.605682432 +0100
|
||||
@@ -2,6 +2,7 @@
|
||||
from contextlib import contextmanager
|
||||
from distutils.version import LooseVersion
|
||||
from pathlib import Path
|
||||
+import stat
|
||||
|
||||
import pytest
|
||||
import pyproj
|
||||
from pyproj.datadir import get_data_dir, get_user_data_dir, set_data_dir
|
||||
diff -Nur a/test/test_cli.py b/test/test_cli.py
|
||||
--- a/test/test_cli.py 2021-04-10 18:26:52.831018478 +0100
|
||||
+++ b/test/test_cli.py 2021-04-10 22:17:04.665088162 +0100
|
||||
@@ -14,7 +14,7 @@
|
||||
from test.conftest import grids_available, proj_env, tmp_chdir
|
||||
|
||||
PYPROJ_CLI_ENDPONTS = pytest.mark.parametrize(
|
||||
- "input_command", [["pyproj"], [sys.executable, "-m", "pyproj"]]
|
||||
+ "input_command", [[sys.executable, "-m", "pyproj"]]
|
||||
)
|
||||
|
||||
|
||||
@@ -17,6 +18,15 @@
|
||||
with tempfile.TemporaryDirectory() as tmpdir:
|
||||
tmp_data_dir = os.path.join(tmpdir, "proj")
|
||||
shutil.copytree(data_dir, tmp_data_dir)
|
||||
+
|
||||
+ # Data copied from the nix store is readonly (causes cleanup problem).
|
||||
+ # Make it writable.
|
||||
+ for r, d, files in os.walk(tmp_data_dir):
|
||||
+ os.chmod(r, os.stat(r).st_mode | stat.S_IWUSR)
|
||||
+ for f in files:
|
||||
+ fpath = os.path.join(r, f)
|
||||
+ os.chmod(fpath, os.stat(fpath).st_mode | stat.S_IWUSR)
|
||||
+
|
||||
try:
|
||||
os.remove(os.path.join(str(tmp_data_dir), "ntv2_0.gsb"))
|
||||
except OSError:
|
||||
|
|
|
|||
|
|
@ -1,60 +1,94 @@
|
|||
{ lib, buildPythonPackage, fetchFromGitHub, python, pkgs, pythonOlder, isPy27, substituteAll
|
||||
, aenum
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, python
|
||||
, proj
|
||||
, pythonOlder
|
||||
, substituteAll
|
||||
, cython
|
||||
, pytestCheckHook
|
||||
, mock
|
||||
, certifi
|
||||
, numpy
|
||||
, shapely
|
||||
, pandas
|
||||
, xarray
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyproj";
|
||||
version = "2.6.0";
|
||||
disabled = isPy27;
|
||||
version = "3.0.1";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pyproj4";
|
||||
repo = "pyproj";
|
||||
rev = "v${version}rel";
|
||||
sha256 = "0fyggkbr3kp8mlq4c0r8sl5ah58bdg2mj4kzql9p3qyrkcdlgixh";
|
||||
rev = version;
|
||||
sha256 = "1q1i1235cp3k32dpb11r7krx5rpqwszb89mrx85rflc1z5acaj58";
|
||||
};
|
||||
|
||||
# force pyproj to use ${pkgs.proj}
|
||||
# force pyproj to use ${proj}
|
||||
patches = [
|
||||
(substituteAll {
|
||||
src = ./001.proj.patch;
|
||||
proj = pkgs.proj;
|
||||
projdev = pkgs.proj.dev;
|
||||
proj = proj;
|
||||
projdev = proj.dev;
|
||||
})
|
||||
];
|
||||
|
||||
buildInputs = [ cython pkgs.proj ];
|
||||
nativeBuildInputs = [ cython ];
|
||||
buildInputs = [ proj ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
numpy shapely
|
||||
] ++ lib.optional (pythonOlder "3.6") aenum;
|
||||
certifi
|
||||
];
|
||||
|
||||
checkInputs = [ pytestCheckHook mock ];
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
mock
|
||||
numpy
|
||||
shapely
|
||||
pandas
|
||||
xarray
|
||||
];
|
||||
|
||||
# prevent importing local directory
|
||||
preCheck = "cd test";
|
||||
pytestFlagsArray = [
|
||||
"--ignore=test_doctest_wrapper.py"
|
||||
"--ignore=test_datadir.py"
|
||||
preCheck = ''
|
||||
# We need to build extensions locally to run tests
|
||||
${python.interpreter} setup.py build_ext --inplace
|
||||
cd test
|
||||
'';
|
||||
|
||||
disabledTestPaths = [
|
||||
"test_doctest_wrapper.py"
|
||||
"test_datadir.py"
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
"alternative_grid_name"
|
||||
"transform_wgs84_to_alaska"
|
||||
"transformer_group__unavailable"
|
||||
"transform_group__missing_best"
|
||||
"datum"
|
||||
"repr"
|
||||
# The following tests try to access network and end up with a URLError
|
||||
"test__load_grid_geojson_old_file"
|
||||
"test_get_transform_grid_list"
|
||||
"test_get_transform_grid_list__area_of_use"
|
||||
"test_get_transform_grid_list__bbox__antimeridian"
|
||||
"test_get_transform_grid_list__bbox__out_of_bounds"
|
||||
"test_get_transform_grid_list__contains"
|
||||
"test_get_transform_grid_list__file"
|
||||
"test_get_transform_grid_list__source_id"
|
||||
"test_sync__area_of_use__list"
|
||||
"test_sync__bbox__list"
|
||||
"test_sync__bbox__list__exclude_world_coverage"
|
||||
"test_sync__download_grids"
|
||||
"test_sync__file__list"
|
||||
"test_sync__source_id__list"
|
||||
"test_sync_download"
|
||||
"test_sync_download__directory"
|
||||
"test_sync_download__system_directory"
|
||||
"test_transformer_group__download_grids"
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Python interface to PROJ.4 library";
|
||||
homepage = "https://github.com/jswhit/pyproj";
|
||||
homepage = "https://github.com/pyproj4/pyproj";
|
||||
license = with lib.licenses; [ isc ];
|
||||
maintainers = with lib.maintainers; [ lsix ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,24 +8,26 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyupgrade";
|
||||
version = "2.10.0";
|
||||
version = "2.12.0";
|
||||
disabled = isPy27;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "asottile";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-XYeqyyfwtS7dHLxeVvmcifW6UCOlnSMxqF1vxezBjT8=";
|
||||
sha256 = "sha256-pAZszyv7jXEwtQYzEk5Zq2ULP0K2vX0y6IvR6wYsJ9c=";
|
||||
};
|
||||
|
||||
checkInputs = [ pytestCheckHook ];
|
||||
checkInputs = [ pytestCheckHook ];
|
||||
|
||||
propagatedBuildInputs = [ tokenize-rt ];
|
||||
|
||||
pythonImportsCheck = [ "pyupgrade" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A tool to automatically upgrade syntax for newer versions of the language";
|
||||
homepage = "https://github.com/asottile/pyupgrade";
|
||||
license = licenses.mit;
|
||||
description = "Tool to automatically upgrade syntax for newer versions of the language";
|
||||
homepage = "https://github.com/asottile/pyupgrade";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ lovesegfault ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "qiskit-aer";
|
||||
version = "0.7.6";
|
||||
version = "0.8.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
|
@ -36,7 +36,7 @@ buildPythonPackage rec {
|
|||
owner = "Qiskit";
|
||||
repo = "qiskit-aer";
|
||||
rev = version;
|
||||
sha256 = "0595as4rxjrd5dqx54ywz3rjsjk0z7r41bq0z9r8y1h7zgvvlrmn";
|
||||
hash = "sha256-CWF3ehLs0HBXnYH11r+2CQwIcxddAfQm3ulAf1agl/o=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -61,6 +61,7 @@ buildPythonPackage rec {
|
|||
pybind11
|
||||
];
|
||||
|
||||
# tries to install pypi cmake package, not needed
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py --replace "'cmake!=3.17,!=3.17.0'," ""
|
||||
'';
|
||||
|
|
@ -83,6 +84,17 @@ buildPythonPackage rec {
|
|||
disabledTests = [
|
||||
"test_paulis_1_and_2_qubits"
|
||||
"test_3d_oscillator"
|
||||
"_057"
|
||||
"_136"
|
||||
"_137"
|
||||
"_139"
|
||||
"_138"
|
||||
"_140"
|
||||
"_141"
|
||||
"_143"
|
||||
"_144"
|
||||
"test_sparse_output_probabilities"
|
||||
"test_reset_2_qubit"
|
||||
];
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "qiskit-aqua";
|
||||
version = "0.8.2";
|
||||
version = "0.9.0";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
|
|
@ -43,7 +43,7 @@ buildPythonPackage rec {
|
|||
owner = "Qiskit";
|
||||
repo = "qiskit-aqua";
|
||||
rev = version;
|
||||
sha256 = "sha256-ybf8bXqsVk6quYi0vrfo/Mplk7Nr7tQS7cevXxI9khw=";
|
||||
hash = "sha256-knue9uJih72UQHsvfXZ9AA94mol4ERa9Lo/GMcp+2hA=";
|
||||
};
|
||||
|
||||
# Optional packages: pyscf (see below NOTE) & pytorch. Can install via pip/nix if needed.
|
||||
|
|
@ -74,7 +74,13 @@ buildPythonPackage rec {
|
|||
# We disable appropriate tests below to allow building without pyscf installed
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py --replace "docplex==2.15.194" "docplex"
|
||||
# Because this is a legacy/final release, the maintainers restricted the maximum
|
||||
# versions of all dependencies to the latest current version. That will not
|
||||
# work with nixpkgs' rolling release/update system.
|
||||
# Unlock all versions for compatibility
|
||||
substituteInPlace setup.py --replace "<=" ">="
|
||||
sed -i 's/\(\w\+-*\w*\).*/\1/' requirements.txt
|
||||
substituteInPlace requirements.txt --replace "dataclasses" ""
|
||||
|
||||
# Add ImportWarning when running qiskit.chemistry (pyscf is a chemistry package) that pyscf is not included
|
||||
echo -e "\nimport warnings\ntry: import pyscf;\nexcept ImportError:\n " \
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "qiskit-ignis";
|
||||
version = "0.5.2";
|
||||
version = "0.6.0";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
|
|
@ -32,7 +32,7 @@ buildPythonPackage rec {
|
|||
owner = "Qiskit";
|
||||
repo = "qiskit-ignis";
|
||||
rev = version;
|
||||
sha256 = "sha256-Kl3tnoamZrCxwoDdu8betG6Lf3CC3D8R2TYiq8Zl3Aw=";
|
||||
hash = "sha256-L5fwCMsN03ojiDvKIyqsGfUnwej1P7bpyHlL6mu7nh0=";
|
||||
};
|
||||
|
||||
# hacky, fix https://github.com/Qiskit/qiskit-ignis/issues/532.
|
||||
|
|
|
|||
|
|
@ -29,8 +29,8 @@
|
|||
, withCrosstalkPass ? false
|
||||
, z3
|
||||
# Classical function -> Quantum Circuit compiler
|
||||
, withClassicalFunctionCompiler ? false
|
||||
, tweedledum ? null
|
||||
, withClassicalFunctionCompiler ? true
|
||||
, tweedledum
|
||||
# test requirements
|
||||
, ddt
|
||||
, hypothesis
|
||||
|
|
@ -56,7 +56,7 @@ in
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "qiskit-terra";
|
||||
version = "0.16.4";
|
||||
version = "0.17.0";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
|
|
@ -64,7 +64,7 @@ buildPythonPackage rec {
|
|||
owner = "Qiskit";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-/rWlPfpAHoMedKG42jfUYt0Ezq7i+9dkyPllavkg4cc=";
|
||||
hash = "sha256-LbNbaHAWAVG5YLc9juuwcOlrREBW6OjEl7VPtACfl3I=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cython ];
|
||||
|
|
@ -100,15 +100,17 @@ buildPythonPackage rec {
|
|||
"qiskit.transpiler.passes.routing.cython.stochastic_swap.swap_trial"
|
||||
];
|
||||
|
||||
pytestFlagsArray = [
|
||||
"--ignore=test/randomized/test_transpiler_equivalence.py" # collection requires qiskit-aer, which would cause circular dependency
|
||||
] ++ lib.optionals (!withClassicalFunctionCompiler ) [
|
||||
"--ignore=test/python/classical_function_compiler/"
|
||||
disabledTestPaths = [
|
||||
"test/randomized/test_transpiler_equivalence.py" # collection requires qiskit-aer, which would cause circular dependency
|
||||
] ++ lib.optionals (!withClassicalFunctionCompiler) [
|
||||
"test/python/classical_function_compiler/"
|
||||
];
|
||||
disabledTests = [
|
||||
# Flaky tests
|
||||
"test_cx_equivalence"
|
||||
"test_pulse_limits"
|
||||
] ++ lib.optionals (!withClassicalFunctionCompiler) [
|
||||
"TestPhaseOracle"
|
||||
]
|
||||
# Disabling slow tests for build constraints
|
||||
++ [
|
||||
|
|
@ -130,6 +132,14 @@ buildPythonPackage rec {
|
|||
"test_block_collection_reduces_1q_gate"
|
||||
"test_multi_controlled_rotation_gate_matrices"
|
||||
"test_block_collection_runs_for_non_cx_bases"
|
||||
"test_with_two_qubit_reduction"
|
||||
"test_basic_aer_qasm"
|
||||
"test_hhl"
|
||||
"test_H2_hamiltonian"
|
||||
"test_max_evals_grouped_2"
|
||||
"test_qaoa_qc_mixer_4"
|
||||
"test_abelian_grouper_random_2"
|
||||
"test_pauli_two_design"
|
||||
];
|
||||
|
||||
# Moves tests to $PACKAGEDIR/test. They can't be run from /build because of finding
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
buildPythonPackage rec {
|
||||
pname = "qiskit";
|
||||
# NOTE: This version denotes a specific set of subpackages. See https://qiskit.org/documentation/release_notes.html#version-history
|
||||
version = "0.24.1";
|
||||
version = "0.25.0";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
|
|
@ -23,7 +23,7 @@ buildPythonPackage rec {
|
|||
owner = "qiskit";
|
||||
repo = "qiskit";
|
||||
rev = version;
|
||||
sha256 = "0qfz69n8sl7sk4hzygni9qars9q1cyz0n3bv1lca00ia5qsc72d2";
|
||||
hash = "sha256-pJM6d3AyFs9AexvQXG+8QQ4zwpFisJC16iBFR9gNSk0=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -9,13 +9,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "quandl";
|
||||
version = "3.5.0";
|
||||
version = "3.6.1";
|
||||
disabled = !isPy3k;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit version;
|
||||
pname = "Quandl";
|
||||
sha256 = "0zpw0nwqr4g56l9z4my0fahfgpcmfx74acbmv6nfx1dmq5ggraf3";
|
||||
sha256 = "0jr69fqxhzdmkfh3fxz0yp2kks2hkmixrscjjf59q2l7irglwhc4";
|
||||
};
|
||||
|
||||
checkInputs = [
|
||||
|
|
@ -51,6 +51,7 @@ buildPythonPackage rec {
|
|||
meta = with lib; {
|
||||
description = "Quandl Python client library";
|
||||
homepage = "https://github.com/quandl/quandl-python";
|
||||
changelog = "https://github.com/quandl/quandl-python/blob/master/CHANGELOG.md";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ ilya-kolpakov ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -15,11 +15,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "sagemaker";
|
||||
version = "2.33.0";
|
||||
version = "2.34.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-0l8xwZ10zQb+LnV/hjYoSSgN/TGpVdzdXeSfnEyf0J0=";
|
||||
sha256 = "sha256-j0YlFh5SG1PlBN5vWZ9bLuOKcO03pDwoOB44CMyvXPk=";
|
||||
};
|
||||
|
||||
pythonImportsCheck = [
|
||||
|
|
|
|||
|
|
@ -1,22 +1,31 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, fetchFromGitHub
|
||||
, pytestCheckHook
|
||||
, requests
|
||||
, requests-mock
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "swisshydrodata";
|
||||
version = "0.0.3";
|
||||
version = "0.1.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1adpy6k2bknffzl5rckqpvaqyrvc00d6a4a4541438dqasx61npl";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Bouni";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1rdgfc6zg5j3fvrpbqs9vc3n5m66r5yljawyl7nmrqd5lwq1lqak";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ requests ];
|
||||
propagatedBuildInputs = [
|
||||
requests
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
requests-mock
|
||||
];
|
||||
|
||||
# Tests are not releases at the moment
|
||||
doCheck = false;
|
||||
pythonImportsCheck = [ "swisshydrodata" ];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
37
third_party/nixpkgs/pkgs/development/python-modules/tweedledum/default.nix
vendored
Normal file
37
third_party/nixpkgs/pkgs/development/python-modules/tweedledum/default.nix
vendored
Normal file
|
|
@ -0,0 +1,37 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, ninja
|
||||
, scikit-build
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "tweedledum";
|
||||
version = "1.0.0";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub{
|
||||
owner = "boschmitt";
|
||||
repo = "tweedledum";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-59lJzdw9HLJ9ADxp/a3KW4v5aU/dYm27NSYoz9D49i4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ninja scikit-build ];
|
||||
dontUseCmakeConfigure = true;
|
||||
|
||||
pythonImportsCheck = [ "tweedledum" ];
|
||||
|
||||
# TODO: use pytest, but had issues with finding the correct directories
|
||||
checkPhase = ''
|
||||
python -m unittest discover -s ./python/test -t .
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A library for synthesizing and manipulating quantum circuits";
|
||||
homepage = "https://github.com/boschmitt/tweedledum";
|
||||
license = licenses.mit ;
|
||||
maintainers = with maintainers; [ drewrisinger ];
|
||||
};
|
||||
}
|
||||
|
|
@ -41,6 +41,6 @@ buildPythonPackage rec {
|
|||
description = "Twilio API client and TwiML generator";
|
||||
homepage = "https://github.com/twilio/twilio-python/";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ flokli ];
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,11 +8,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "urwid_readline";
|
||||
version = "0.12";
|
||||
version = "0.13";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "f7384e03017c3fb07bfba0d829d70287793326d9f6dac145dd09e0d693d7bf9c";
|
||||
sha256 = "sha256-AYAgy8hku17Ye+F9wmsGnq4nVcsp86nFaarDve0e+vQ=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
41
third_party/nixpkgs/pkgs/development/python-modules/yara-python/default.nix
vendored
Normal file
41
third_party/nixpkgs/pkgs/development/python-modules/yara-python/default.nix
vendored
Normal file
|
|
@ -0,0 +1,41 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pytestCheckHook
|
||||
, yara
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "yara-python";
|
||||
version = "4.0.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "VirusTotal";
|
||||
repo = "yara-python";
|
||||
rev = "v${version}";
|
||||
sha256 = "1qd0aw5p48ay77hgj0hgzpvbmq1933mknk134aqdb32036rlc5sq";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
yara
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
setupPyBuildFlags = [
|
||||
"--dynamic-linking"
|
||||
];
|
||||
|
||||
pytestFlagsArray = [ "tests.py" ];
|
||||
|
||||
pythonImportsCheck = [ "yara" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python interface for YARA";
|
||||
homepage = "https://github.com/VirusTotal/yara-python";
|
||||
license = with licenses; [ asl20 ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,39 +1,39 @@
|
|||
{ lib
|
||||
, fetchgit
|
||||
, buildPythonPackage
|
||||
, pythonOlder
|
||||
, enum-compat
|
||||
, fetchFromGitLab
|
||||
, future
|
||||
, ifaddr
|
||||
, mock
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "yeelight";
|
||||
version = "0.5.4";
|
||||
version = "0.6.0";
|
||||
disabled = pythonOlder "3.4";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://gitlab.com/stavros/python-yeelight.git";
|
||||
rev = "119faeff0d4f9de8c7f6d0580bdecc1c79bcdaea"; # v0.5.4 wasn't tagged
|
||||
sha256 = "0j2c5pzd3kny7ghr9q7xn9vs8dffvyzz5igaavvvd04w7aph29sy";
|
||||
src = fetchFromGitLab {
|
||||
owner = "stavros";
|
||||
repo = "python-yeelight";
|
||||
rev = "v${version}";
|
||||
sha256 = "0yycc2pdqaa9y46jycvm0p6braps7ljg2vvljngdqj2l1a2jmv7x";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
future
|
||||
ifaddr
|
||||
] ++ lib.optional (pythonOlder "3.4") enum-compat;
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
] ++ lib.optional (pythonOlder "3.3") mock;
|
||||
];
|
||||
|
||||
pytestFlagsArray = [ "yeelight/tests.py" ];
|
||||
|
||||
pythonImportsCheck = [ "yeelight" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A Python library for controlling YeeLight RGB bulbs";
|
||||
description = "Python library for controlling YeeLight RGB bulbs";
|
||||
homepage = "https://gitlab.com/stavros/python-yeelight/";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ nyanloutre ];
|
||||
|
|
|
|||
|
|
@ -5,6 +5,9 @@
|
|||
, requests
|
||||
, matrix-client
|
||||
, distro
|
||||
, cryptography
|
||||
, pyopenssl
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
|
|
@ -26,12 +29,22 @@ buildPythonPackage rec {
|
|||
requests
|
||||
matrix-client
|
||||
distro
|
||||
|
||||
# from requests[security]
|
||||
cryptography
|
||||
pyopenssl
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
preCheck = ''
|
||||
export COLUMNS=80
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [ "zulip" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Bindings for the Zulip message API";
|
||||
homepage = "https://github.com/zulip/python-zulip-api";
|
||||
|
|
|
|||
|
|
@ -74,6 +74,7 @@ source 'https://rubygems.org' do
|
|||
gem 'jekyll'
|
||||
gem 'jmespath'
|
||||
gem 'jwt'
|
||||
gem 'kramdown-rfc2629'
|
||||
gem 'libv8'
|
||||
gem 'libxml-ruby'
|
||||
gem 'magic'
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue