Merge master into haskell-updates
This commit is contained in:
commit
17baaf142f
140 changed files with 1599 additions and 506 deletions
49
doc/languages-frameworks/chicken.section.md
Normal file
49
doc/languages-frameworks/chicken.section.md
Normal file
|
@ -0,0 +1,49 @@
|
|||
# CHICKEN {#sec-chicken}
|
||||
|
||||
[CHICKEN](https://call-cc.org/) is a
|
||||
[R⁵RS](https://schemers.org/Documents/Standards/R5RS/HTML/)-compliant Scheme
|
||||
compiler. It includes an interactive mode and a custom package format, "eggs".
|
||||
|
||||
## Using Eggs
|
||||
|
||||
Eggs described in nixpkgs are available inside the
|
||||
`chickenPackages.chickenEggs` attrset. Including an egg as a build input is
|
||||
done in the typical Nix fashion. For example, to include support for [SRFI
|
||||
189](https://srfi.schemers.org/srfi-189/srfi-189.html) in a derivation, one
|
||||
might write:
|
||||
|
||||
```nix
|
||||
buildInputs = [
|
||||
chicken
|
||||
chickenPackages.chickenEggs.srfi-189
|
||||
];
|
||||
```
|
||||
|
||||
Both `chicken` and its eggs have a setup hook which configures the environment
|
||||
variables `CHICKEN_INCLUDE_PATH` and `CHICKEN_REPOSITORY_PATH`.
|
||||
|
||||
## Updating Eggs
|
||||
|
||||
nixpkgs only knows about a subset of all published eggs. It uses
|
||||
[egg2nix](https://github.com/the-kenny/egg2nix) to generate a
|
||||
package set from a list of eggs to include.
|
||||
|
||||
The package set is regenerated by running the following shell commands:
|
||||
|
||||
```
|
||||
$ nix-shell -p chickenPackages.egg2nix
|
||||
$ cd pkgs/development/compilers/chicken/5/
|
||||
$ egg2nix eggs.scm > eggs.nix
|
||||
```
|
||||
|
||||
## Adding Eggs
|
||||
|
||||
When we run `egg2nix`, we obtain one collection of eggs with
|
||||
mutually-compatible versions. This means that when we add new eggs, we may
|
||||
need to update existing eggs. To keep those separate, follow the procedure for
|
||||
updating eggs before including more eggs.
|
||||
|
||||
To include more eggs, edit `pkgs/development/compilers/chicken/5/eggs.scm`.
|
||||
The first section of this file lists eggs which are required by `egg2nix`
|
||||
itself; all other eggs go into the second section. After editing, follow the
|
||||
procedure for updating eggs.
|
|
@ -9,6 +9,7 @@
|
|||
<xi:include href="android.section.xml" />
|
||||
<xi:include href="beam.section.xml" />
|
||||
<xi:include href="bower.section.xml" />
|
||||
<xi:include href="chicken.section.xml" />
|
||||
<xi:include href="coq.section.xml" />
|
||||
<xi:include href="crystal.section.xml" />
|
||||
<xi:include href="cuda.section.xml" />
|
||||
|
|
|
@ -253,10 +253,7 @@ rec {
|
|||
=> false
|
||||
*/
|
||||
hasInfix = infix: content:
|
||||
let
|
||||
drop = x: substring 1 (stringLength x) x;
|
||||
in hasPrefix infix content
|
||||
|| content != "" && hasInfix infix (drop content);
|
||||
builtins.match ".*${escapeRegex infix}.*" content != null;
|
||||
|
||||
/* Convert a string to a list of characters (i.e. singleton strings).
|
||||
This allows you to, e.g., map a function over each character. However,
|
||||
|
|
|
@ -675,6 +675,12 @@
|
|||
githubId = 858965;
|
||||
name = "Andrew Morsillo";
|
||||
};
|
||||
an-empty-string = {
|
||||
name = "Tris Emmy Wilson";
|
||||
email = "tris@tris.fyi";
|
||||
github = "an-empty-string";
|
||||
githubId = 681716;
|
||||
};
|
||||
andehen = {
|
||||
email = "git@andehen.net";
|
||||
github = "andehen";
|
||||
|
@ -3843,6 +3849,13 @@
|
|||
githubId = 222467;
|
||||
name = "Dmitry Ivanov";
|
||||
};
|
||||
ethindp = {
|
||||
name = "Ethin Probst";
|
||||
email = "harlydavidsen@gmail.com";
|
||||
matrix = "@ethindp:the-gdn.net";
|
||||
github = "ethindp";
|
||||
githubId = 8030501;
|
||||
};
|
||||
Etjean = {
|
||||
email = "et.jean@outlook.fr";
|
||||
github = "Etjean";
|
||||
|
|
|
@ -1,10 +1,11 @@
|
|||
{ config, lib, pkgs, ... }:
|
||||
{ config, options, lib, pkgs, ... }:
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
luks = config.boot.initrd.luks;
|
||||
kernelPackages = config.boot.kernelPackages;
|
||||
defaultPrio = (mkOptionDefault {}).priority;
|
||||
|
||||
commonFunctions = ''
|
||||
die() {
|
||||
|
@ -474,6 +475,16 @@ let
|
|||
preLVM = filterAttrs (n: v: v.preLVM) luks.devices;
|
||||
postLVM = filterAttrs (n: v: !v.preLVM) luks.devices;
|
||||
|
||||
stage1Crypttab = pkgs.writeText "initrd-crypttab" (lib.concatStringsSep "\n" (lib.mapAttrsToList (n: v: let
|
||||
opts = v.crypttabExtraOpts
|
||||
++ optional v.allowDiscards "discard"
|
||||
++ optionals v.bypassWorkqueues [ "no-read-workqueue" "no-write-workqueue" ]
|
||||
++ optional (v.header != null) "header=${v.header}"
|
||||
++ optional (v.keyFileOffset != null) "keyfile-offset=${v.keyFileOffset}"
|
||||
++ optional (v.keyFileSize != null) "keyfile-size=${v.keyFileSize}"
|
||||
;
|
||||
in "${n} ${v.device} ${if v.keyFile == null then "-" else v.keyFile} ${lib.concatStringsSep "," opts}") luks.devices));
|
||||
|
||||
in
|
||||
{
|
||||
imports = [
|
||||
|
@ -802,6 +813,18 @@ in
|
|||
Commands that should be run right after we have mounted our LUKS device.
|
||||
'';
|
||||
};
|
||||
|
||||
crypttabExtraOpts = mkOption {
|
||||
type = with types; listOf singleLineStr;
|
||||
default = [];
|
||||
example = [ "_netdev" ];
|
||||
visible = false;
|
||||
description = ''
|
||||
Only used with systemd stage 1.
|
||||
|
||||
Extra options to append to the last column of the generated crypttab file.
|
||||
'';
|
||||
};
|
||||
};
|
||||
}));
|
||||
};
|
||||
|
@ -853,6 +876,31 @@ in
|
|||
-> versionAtLeast kernelPackages.kernel.version "5.9";
|
||||
message = "boot.initrd.luks.devices.<name>.bypassWorkqueues is not supported for kernels older than 5.9";
|
||||
}
|
||||
|
||||
{ assertion = config.boot.initrd.systemd.enable -> all (dev: !dev.fallbackToPassword) (attrValues luks.devices);
|
||||
message = "boot.initrd.luks.devices.<name>.fallbackToPassword is implied by systemd stage 1.";
|
||||
}
|
||||
{ assertion = config.boot.initrd.systemd.enable -> all (dev: dev.preLVM) (attrValues luks.devices);
|
||||
message = "boot.initrd.luks.devices.<name>.preLVM is not used by systemd stage 1.";
|
||||
}
|
||||
{ assertion = config.boot.initrd.systemd.enable -> options.boot.initrd.luks.reusePassphrases.highestPrio == defaultPrio;
|
||||
message = "boot.initrd.luks.reusePassphrases has no effect with systemd stage 1.";
|
||||
}
|
||||
{ assertion = config.boot.initrd.systemd.enable -> all (dev: dev.preOpenCommands == "" && dev.postOpenCommands == "") (attrValues luks.devices);
|
||||
message = "boot.initrd.luks.devices.<name>.preOpenCommands and postOpenCommands is not supported by systemd stage 1. Please bind a service to cryptsetup.target or cryptsetup-pre.target instead.";
|
||||
}
|
||||
# TODO
|
||||
{ assertion = config.boot.initrd.systemd.enable -> !luks.gpgSupport;
|
||||
message = "systemd stage 1 does not support GPG smartcards yet.";
|
||||
}
|
||||
# TODO
|
||||
{ assertion = config.boot.initrd.systemd.enable -> !luks.fido2Support;
|
||||
message = "systemd stage 1 does not support FIDO2 yet.";
|
||||
}
|
||||
# TODO
|
||||
{ assertion = config.boot.initrd.systemd.enable -> !luks.yubikeySupport;
|
||||
message = "systemd stage 1 does not support Yubikeys yet.";
|
||||
}
|
||||
];
|
||||
|
||||
# actually, sbp2 driver is the one enabling the DMA attack, but this needs to be tested
|
||||
|
@ -867,7 +915,7 @@ in
|
|||
++ (if builtins.elem "xts" luks.cryptoModules then ["ecb"] else []);
|
||||
|
||||
# copy the cryptsetup binary and it's dependencies
|
||||
boot.initrd.extraUtilsCommands = ''
|
||||
boot.initrd.extraUtilsCommands = mkIf (!config.boot.initrd.systemd.enable) ''
|
||||
copy_bin_and_libs ${pkgs.cryptsetup}/bin/cryptsetup
|
||||
copy_bin_and_libs ${askPass}/bin/cryptsetup-askpass
|
||||
sed -i s,/bin/sh,$out/bin/sh, $out/bin/cryptsetup-askpass
|
||||
|
@ -915,7 +963,7 @@ in
|
|||
''}
|
||||
'';
|
||||
|
||||
boot.initrd.extraUtilsCommandsTest = ''
|
||||
boot.initrd.extraUtilsCommandsTest = mkIf (!config.boot.initrd.systemd.enable) ''
|
||||
$out/bin/cryptsetup --version
|
||||
${optionalString luks.yubikeySupport ''
|
||||
$out/bin/ykchalresp -V
|
||||
|
@ -932,9 +980,27 @@ in
|
|||
''}
|
||||
'';
|
||||
|
||||
boot.initrd.preFailCommands = postCommands;
|
||||
boot.initrd.preLVMCommands = commonFunctions + preCommands + concatStrings (mapAttrsToList openCommand preLVM) + postCommands;
|
||||
boot.initrd.postDeviceCommands = commonFunctions + preCommands + concatStrings (mapAttrsToList openCommand postLVM) + postCommands;
|
||||
boot.initrd.systemd = {
|
||||
contents."/etc/crypttab".source = stage1Crypttab;
|
||||
|
||||
extraBin.systemd-cryptsetup = "${config.boot.initrd.systemd.package}/lib/systemd/systemd-cryptsetup";
|
||||
|
||||
additionalUpstreamUnits = [
|
||||
"cryptsetup-pre.target"
|
||||
"cryptsetup.target"
|
||||
"remote-cryptsetup.target"
|
||||
];
|
||||
storePaths = [
|
||||
"${config.boot.initrd.systemd.package}/lib/systemd/systemd-cryptsetup"
|
||||
];
|
||||
|
||||
};
|
||||
# We do this because we need the udev rules from the package
|
||||
boot.initrd.services.lvm.enable = true;
|
||||
|
||||
boot.initrd.preFailCommands = mkIf (!config.boot.initrd.systemd.enable) postCommands;
|
||||
boot.initrd.preLVMCommands = mkIf (!config.boot.initrd.systemd.enable) (commonFunctions + preCommands + concatStrings (mapAttrsToList openCommand preLVM) + postCommands);
|
||||
boot.initrd.postDeviceCommands = mkIf (!config.boot.initrd.systemd.enable) (commonFunctions + preCommands + concatStrings (mapAttrsToList openCommand postLVM) + postCommands);
|
||||
|
||||
environment.systemPackages = [ pkgs.cryptsetup ];
|
||||
};
|
||||
|
|
|
@ -524,6 +524,8 @@ in
|
|||
systemd-confinement = handleTest ./systemd-confinement.nix {};
|
||||
systemd-cryptenroll = handleTest ./systemd-cryptenroll.nix {};
|
||||
systemd-escaping = handleTest ./systemd-escaping.nix {};
|
||||
systemd-initrd-luks-keyfile = handleTest ./systemd-initrd-luks-keyfile.nix {};
|
||||
systemd-initrd-luks-password = handleTest ./systemd-initrd-luks-password.nix {};
|
||||
systemd-initrd-shutdown = handleTest ./systemd-shutdown.nix { systemdStage1 = true; };
|
||||
systemd-initrd-simple = handleTest ./systemd-initrd-simple.nix {};
|
||||
systemd-initrd-swraid = handleTest ./systemd-initrd-swraid.nix {};
|
||||
|
|
|
@ -299,6 +299,13 @@ let
|
|||
virtualisation.qemu.diskInterface =
|
||||
if grubVersion == 1 then "scsi" else "virtio";
|
||||
|
||||
# We don't want to have any networking in the guest whatsoever.
|
||||
# Also, if any vlans are enabled, the guest will reboot
|
||||
# (with a different configuration for legacy reasons),
|
||||
# and spend 5 minutes waiting for the vlan interface to show up
|
||||
# (which will never happen).
|
||||
virtualisation.vlans = [];
|
||||
|
||||
boot.loader.systemd-boot.enable = mkIf (bootLoader == "systemd-boot") true;
|
||||
|
||||
hardware.enableAllFirmware = mkForce false;
|
||||
|
@ -313,6 +320,7 @@ let
|
|||
docbook5
|
||||
docbook_xsl_ns
|
||||
kmod.dev
|
||||
libarchive.dev
|
||||
libxml2.bin
|
||||
libxslt.bin
|
||||
nixos-artwork.wallpapers.simple-dark-gray-bottom
|
||||
|
|
|
@ -31,7 +31,7 @@ import ./make-test-python.nix (
|
|||
|
||||
# Create a fake cache with Nginx service the static files
|
||||
server.succeed(
|
||||
"nix copy --to file:///var/www ${pkgs.hello}"
|
||||
"nix --experimental-features nix-command copy --to file:///var/www ${pkgs.hello}"
|
||||
)
|
||||
server.wait_for_unit("nginx.service")
|
||||
server.wait_for_open_port(80)
|
||||
|
|
53
nixos/tests/systemd-initrd-luks-keyfile.nix
Normal file
53
nixos/tests/systemd-initrd-luks-keyfile.nix
Normal file
|
@ -0,0 +1,53 @@
|
|||
import ./make-test-python.nix ({ lib, pkgs, ... }: let
|
||||
|
||||
keyfile = pkgs.writeText "luks-keyfile" ''
|
||||
MIGHAoGBAJ4rGTSo/ldyjQypd0kuS7k2OSsmQYzMH6TNj3nQ/vIUjDn7fqa3slt2
|
||||
gV6EK3TmTbGc4tzC1v4SWx2m+2Bjdtn4Fs4wiBwn1lbRdC6i5ZYCqasTWIntWn+6
|
||||
FllUkMD5oqjOR/YcboxG8Z3B5sJuvTP9llsF+gnuveWih9dpbBr7AgEC
|
||||
'';
|
||||
|
||||
in {
|
||||
name = "systemd-initrd-luks-keyfile";
|
||||
|
||||
nodes.machine = { pkgs, ... }: {
|
||||
# Use systemd-boot
|
||||
virtualisation = {
|
||||
emptyDiskImages = [ 512 ];
|
||||
useBootLoader = true;
|
||||
useEFIBoot = true;
|
||||
};
|
||||
boot.loader.systemd-boot.enable = true;
|
||||
|
||||
environment.systemPackages = with pkgs; [ cryptsetup ];
|
||||
boot.initrd.systemd = {
|
||||
enable = true;
|
||||
emergencyAccess = true;
|
||||
};
|
||||
|
||||
specialisation.boot-luks.configuration = {
|
||||
boot.initrd.luks.devices = lib.mkVMOverride {
|
||||
cryptroot = {
|
||||
device = "/dev/vdc";
|
||||
keyFile = "/etc/cryptroot.key";
|
||||
};
|
||||
};
|
||||
virtualisation.bootDevice = "/dev/mapper/cryptroot";
|
||||
boot.initrd.systemd.contents."/etc/cryptroot.key".source = keyfile;
|
||||
};
|
||||
};
|
||||
|
||||
testScript = ''
|
||||
# Create encrypted volume
|
||||
machine.wait_for_unit("multi-user.target")
|
||||
machine.succeed("cryptsetup luksFormat -q --iter-time=1 -d ${keyfile} /dev/vdc")
|
||||
|
||||
# Boot from the encrypted disk
|
||||
machine.succeed("bootctl set-default nixos-generation-1-specialisation-boot-luks.conf")
|
||||
machine.succeed("sync")
|
||||
machine.crash()
|
||||
|
||||
# Boot and decrypt the disk
|
||||
machine.wait_for_unit("multi-user.target")
|
||||
assert "/dev/mapper/cryptroot on / type ext4" in machine.succeed("mount")
|
||||
'';
|
||||
})
|
48
nixos/tests/systemd-initrd-luks-password.nix
Normal file
48
nixos/tests/systemd-initrd-luks-password.nix
Normal file
|
@ -0,0 +1,48 @@
|
|||
import ./make-test-python.nix ({ lib, pkgs, ... }: {
|
||||
name = "systemd-initrd-luks-password";
|
||||
|
||||
nodes.machine = { pkgs, ... }: {
|
||||
# Use systemd-boot
|
||||
virtualisation = {
|
||||
emptyDiskImages = [ 512 512 ];
|
||||
useBootLoader = true;
|
||||
useEFIBoot = true;
|
||||
};
|
||||
boot.loader.systemd-boot.enable = true;
|
||||
|
||||
environment.systemPackages = with pkgs; [ cryptsetup ];
|
||||
boot.initrd.systemd = {
|
||||
enable = true;
|
||||
emergencyAccess = true;
|
||||
};
|
||||
|
||||
specialisation.boot-luks.configuration = {
|
||||
boot.initrd.luks.devices = lib.mkVMOverride {
|
||||
# We have two disks and only type one password - key reuse is in place
|
||||
cryptroot.device = "/dev/vdc";
|
||||
cryptroot2.device = "/dev/vdd";
|
||||
};
|
||||
virtualisation.bootDevice = "/dev/mapper/cryptroot";
|
||||
};
|
||||
};
|
||||
|
||||
testScript = ''
|
||||
# Create encrypted volume
|
||||
machine.wait_for_unit("multi-user.target")
|
||||
machine.succeed("echo -n supersecret | cryptsetup luksFormat -q --iter-time=1 /dev/vdc -")
|
||||
machine.succeed("echo -n supersecret | cryptsetup luksFormat -q --iter-time=1 /dev/vdd -")
|
||||
|
||||
# Boot from the encrypted disk
|
||||
machine.succeed("bootctl set-default nixos-generation-1-specialisation-boot-luks.conf")
|
||||
machine.succeed("sync")
|
||||
machine.crash()
|
||||
|
||||
# Boot and decrypt the disk
|
||||
machine.start()
|
||||
machine.wait_for_console_text("Please enter passphrase for disk cryptroot")
|
||||
machine.send_console("supersecret\n")
|
||||
machine.wait_for_unit("multi-user.target")
|
||||
|
||||
assert "/dev/mapper/cryptroot on / type ext4" in machine.succeed("mount")
|
||||
'';
|
||||
})
|
46
pkgs/applications/accessibility/espeakup/default.nix
Normal file
46
pkgs/applications/accessibility/espeakup/default.nix
Normal file
|
@ -0,0 +1,46 @@
|
|||
{ stdenv
|
||||
, lib
|
||||
, meson
|
||||
, ninja
|
||||
, espeak-ng
|
||||
, fetchFromGitHub
|
||||
, pkg-config
|
||||
, ronn
|
||||
, alsa-lib
|
||||
, systemd
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "espeakup";
|
||||
version = "0.90";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linux-speakup";
|
||||
repo = "espeakup";
|
||||
rev = "v${version}";
|
||||
sha256 = "0lmjwafvfxy07zn18v3dzjwwpnid2xffgvy2dzlwkbns8gb60ds2";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
ronn
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
espeak-ng
|
||||
alsa-lib
|
||||
systemd
|
||||
];
|
||||
|
||||
PKG_CONFIG_SYSTEMD_SYSTEMDSYSTEMUNITDIR = "${placeholder "out"}/lib/systemd/system";
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/linux-speakup/espeakup";
|
||||
description = "Lightweight connector for espeak-ng and speakup";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ ethindp ];
|
||||
platforms = with platforms; linux;
|
||||
};
|
||||
}
|
|
@ -21,19 +21,19 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "spot";
|
||||
version = "0.3.1";
|
||||
version = "0.3.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "xou816";
|
||||
repo = "spot";
|
||||
rev = version;
|
||||
hash = "sha256-uZzylK9imEazwC/ogsDO8ZBvByE5/SNSV+mIlp7Z9Ww=";
|
||||
hash = "sha256-0iuLZq9FSxaOchxx6LzGwpY8qnOq2APl/qkBYzEV2uw=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||
inherit src;
|
||||
name = "${pname}-${version}";
|
||||
hash = "sha256-v5xdlsI6OlEpCYOTFePTyI8BkIrAwT6FR2JwiRTGgOA=";
|
||||
hash = "sha256-g46BkrTv6tdrGe/p245O4cBoPjbvyRP7U6hH1Hp4ja0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -2,12 +2,12 @@
|
|||
|
||||
let
|
||||
pname = "ledger-live-desktop";
|
||||
version = "2.40.2";
|
||||
version = "2.40.4";
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/LedgerHQ/${pname}/releases/download/v${version}/${pname}-${version}-linux-x86_64.AppImage";
|
||||
hash = "sha256-2L1iVPLCCIQ6qBqkg+GmiqMmknHmdDLUrysN8vcW2YQ=";
|
||||
hash = "sha256-ktmGXEWoCrhx9hGau2VkQi0GMa53EqHV1wGtUk6kicc=";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extractType2 {
|
||||
|
|
|
@ -1,9 +1,9 @@
|
|||
GEM
|
||||
remote: https://rubygems.org/
|
||||
specs:
|
||||
msgpack (1.4.2)
|
||||
msgpack (1.5.1)
|
||||
multi_json (1.15.0)
|
||||
neovim (0.8.1)
|
||||
neovim (0.9.0)
|
||||
msgpack (~> 1.1)
|
||||
multi_json (~> 1.0)
|
||||
|
||||
|
|
|
@ -4,17 +4,17 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "06iajjyhx0rvpn4yr3h1hc4w4w3k59bdmfhxnjzzh76wsrdxxrc6";
|
||||
sha256 = "sha256-fPWiGi0w4OFlMZOIf3gd21jyeYhg5t/VdLz7kK9fD8Q=";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.4.2";
|
||||
version = "1.5.1";
|
||||
};
|
||||
multi_json = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0pb1g1y3dsiahavspyzkdy39j4q377009f6ix0bh1ag4nqw43l0z";
|
||||
sha256 = "sha256-H9BBOLbkqQAX6NG4BMA5AxOZhm/z+6u3girqNnx4YV0=";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.15.0";
|
||||
|
@ -25,9 +25,9 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0lfrbi4r6lagn2q92lyivk2w22i2spw0jbdzxxlcfj2zhv2wnvvi";
|
||||
sha256 = "sha256-hRI43XGHGeqxMvpFjp0o79GGReiLXTkhwh5LYq6AQL4=";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.8.1";
|
||||
version = "0.9.0";
|
||||
};
|
||||
}
|
||||
|
|
|
@ -154,7 +154,7 @@ in
|
|||
hunspellDictionaries = with lib; filter isDerivation (unique (attrValues hunspellDicts));
|
||||
# These dicts contain identically-named dict files, so we only keep the
|
||||
# -large versions in case of clashes
|
||||
largeDicts = with lib; filter (d: hasInfix "-large-wordlist" d) hunspellDictionaries;
|
||||
largeDicts = with lib; filter (d: hasInfix "-large-wordlist" d.name) hunspellDictionaries;
|
||||
otherDicts = with lib; filter
|
||||
(d: !(hasAttr "dictFileName" d &&
|
||||
elem d.dictFileName (map (d: d.dictFileName) largeDicts)))
|
||||
|
|
|
@ -12,12 +12,12 @@ let
|
|||
if extension == "zip" then fetchzip args else fetchurl args;
|
||||
|
||||
pname = "1password-cli";
|
||||
version = "2.0.0";
|
||||
version = "2.0.2";
|
||||
sources = rec {
|
||||
aarch64-linux = fetch "linux_arm64" "sha256-NhCs68on8LzoeOmM5eP8LwmFaVWz6aghqtHzfUlACiA=" "zip";
|
||||
i686-linux = fetch "linux_386" "sha256-vCxgEBq4YVfljq2zUpvBdZUbIiam4z64P1m9OMWq1f4=" "zip";
|
||||
x86_64-linux = fetch "linux_amd64" "sha256-CDwrJ5ksXf9kwHobw4jvRUi1hLQzq4/yRlk+kHPN7UE=" "zip";
|
||||
aarch64-darwin = fetch "apple_universal" "sha256-DC9hdzRjQ9iNjbe6PfRpMXzDeInq4rYSAa2nDHQMTRo=" "pkg";
|
||||
aarch64-linux = fetch "linux_arm64" "sha256-DhKxY4Ry1IpT16UC3HbbUSKWzhGm/0R7rYrvqupg/Zo=" "zip";
|
||||
i686-linux = fetch "linux_386" "sha256-ANoOYjG4+mci6TdF4HC9fP8e5eAckrbZITRuA1fqtCA=" "zip";
|
||||
x86_64-linux = fetch "linux_amd64" "sha256-uPudElKu30smsupSIvGAmrF/f9TXoTzyUfSrUAvTDWw=" "zip";
|
||||
aarch64-darwin = fetch "apple_universal" "sha256-P5qsy4kiE/DMJnJr3EUHMcb0KoUZyO2BQ5PIosPbnI8=" "pkg";
|
||||
x86_64-darwin = aarch64-darwin;
|
||||
};
|
||||
platforms = builtins.attrNames sources;
|
||||
|
|
|
@ -9,13 +9,13 @@
|
|||
|
||||
buildGoPackage rec {
|
||||
pname = "mob";
|
||||
version = "2.6.0";
|
||||
version = "3.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
rev = "v${version}";
|
||||
owner = "remotemobprogramming";
|
||||
repo = pname;
|
||||
sha256 = "sha256-GJ4V4GQRUoXelk0ksHPoFL4iB1W7pe2UydK2AhYjysg=";
|
||||
sha256 = "sha256-silAgScvhl388Uf6HkWqEkNmr/K6aUt/lj/rxzkk/f0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -19,9 +19,9 @@
|
|||
}
|
||||
},
|
||||
"beta": {
|
||||
"version": "101.0.4951.34",
|
||||
"sha256": "1pqglzc8k31a4x06jn9pd6y8m4nmmb7rv5b3zancmh0d3z0nz3v5",
|
||||
"sha256bin64": "1zhif47j8nqglaj1z3ism3dl6z8n5ilyyr835an32mf6igkfj217",
|
||||
"version": "101.0.4951.41",
|
||||
"sha256": "0dzsbr309n70jg7fpq2qfnrgcm4553akvdmnzhss1fc85s467609",
|
||||
"sha256bin64": "1jbj5cykxamf32c1s4gsid1wxcsdf4hng2d19q9h7b2ashkvvrbi",
|
||||
"deps": {
|
||||
"gn": {
|
||||
"version": "2022-03-14",
|
||||
|
|
|
@ -19,13 +19,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "lagrange";
|
||||
version = "1.12.1";
|
||||
version = "1.12.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "skyjake";
|
||||
repo = "lagrange";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-CpvoovTn++RTQjyeOlHTG+cjn32F+9qP32+YHpoLB8M=";
|
||||
sha256 = "sha256-AVitXfHIJmCBBkhg+DLkHeCSoyH6YMaTMaa4REDXEFg=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "argocd-autopilot";
|
||||
version = "0.3.2";
|
||||
version = "0.3.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "argoproj-labs";
|
||||
repo = "argocd-autopilot";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-9si2zqYhmAqzhdUWMkfQ/yLeyNcZSAWypvZTbDDrPvA=";
|
||||
sha256 = "sha256-YqnmtDVtprQQFbL++X9rUJFGj+fMD+fvDRWsQ+uOxxo=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-UfZCGG24JjPoc5nbX9vPeFCP8YGMNF5oUrdwTC6RpKI=";
|
||||
vendorSha256 = "sha256-r8RTwMzFS/BkxW08+wfAovuFLpIOReDsuHi/Hx9cVPc=";
|
||||
|
||||
proxyVendor = true;
|
||||
|
||||
|
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "cilium-cli";
|
||||
version = "0.10.4";
|
||||
version = "0.11.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cilium";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-1/WXpXZ6f4p4IZ/yropCjH3hHt+t5HGw0aq0HFk04mo=";
|
||||
sha256 = "sha256-8twqA8aUuk5+LzjxMRbRA3m6qiEbk60A0q3nw9uzCvU=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
|
|
|
@ -65,8 +65,8 @@ rec {
|
|||
};
|
||||
|
||||
kops_1_23 = mkKops rec {
|
||||
version = "1.23.0";
|
||||
sha256 = "sha256-tiVNUaW0an6C8M9bxEX5pvB/W5IjZ/S24RdPikzm3bc=";
|
||||
version = "1.23.1";
|
||||
sha256 = "sha256-SiseHs5cMj8DR1f6z9PTbtF/h3Bn9riiLWW5KMYwVUg=";
|
||||
rev = "v${version}";
|
||||
};
|
||||
}
|
||||
|
|
|
@ -5,11 +5,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "alfaview";
|
||||
version = "8.41.0";
|
||||
version = "8.42.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://production-alfaview-assets.alfaview.com/stable/linux/${pname}_${version}.deb";
|
||||
sha256 = "sha256-qW+MB71sylKJQycSX6hiBgxAO4MuhnBaPGFjm+6y4vk=";
|
||||
sha256 = "sha256-O440sk6OJUsO+5TuzLxkUELnCfxKd5byoxSD+Rs4h1c=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
183
pkgs/applications/networking/n8n/node-packages.nix
generated
183
pkgs/applications/networking/n8n/node-packages.nix
generated
|
@ -337,6 +337,15 @@ let
|
|||
sha512 = "/5O7Fq6Vnv8L6ucmPjaWbVG1XkP4FO+w5glqfkIsq3Xw4oyNAdJddbnYodNDAfjVUvo/rrSCTom4kAND7T1o5Q==";
|
||||
};
|
||||
};
|
||||
"@techteamer/ocsp-1.0.0" = {
|
||||
name = "_at_techteamer_slash_ocsp";
|
||||
packageName = "@techteamer/ocsp";
|
||||
version = "1.0.0";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/@techteamer/ocsp/-/ocsp-1.0.0.tgz";
|
||||
sha512 = "lNAOoFHaZN+4huo30ukeqVrUmfC+avoEBYQ11QAnAw1PFhnI5oBCg8O/TNiCoEWix7gNGBIEjrQwtPREqKMPog==";
|
||||
};
|
||||
};
|
||||
"@tokenizer/token-0.1.1" = {
|
||||
name = "_at_tokenizer_slash_token";
|
||||
packageName = "@tokenizer/token";
|
||||
|
@ -850,15 +859,6 @@ let
|
|||
sha512 = "ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ==";
|
||||
};
|
||||
};
|
||||
"asn1.js-4.10.1" = {
|
||||
name = "asn1.js";
|
||||
packageName = "asn1.js";
|
||||
version = "4.10.1";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/asn1.js/-/asn1.js-4.10.1.tgz";
|
||||
sha512 = "p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw==";
|
||||
};
|
||||
};
|
||||
"asn1.js-5.4.1" = {
|
||||
name = "asn1.js";
|
||||
packageName = "asn1.js";
|
||||
|
@ -868,15 +868,6 @@ let
|
|||
sha512 = "+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA==";
|
||||
};
|
||||
};
|
||||
"asn1.js-rfc2560-4.0.6" = {
|
||||
name = "asn1.js-rfc2560";
|
||||
packageName = "asn1.js-rfc2560";
|
||||
version = "4.0.6";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/asn1.js-rfc2560/-/asn1.js-rfc2560-4.0.6.tgz";
|
||||
sha512 = "ysf48ni+f/efNPilq4+ApbifUPcSW/xbDeQAh055I+grr2gXgNRQqHew7kkO70WSMQ2tEOURVwsK+dJqUNjIIg==";
|
||||
};
|
||||
};
|
||||
"asn1.js-rfc2560-5.0.1" = {
|
||||
name = "asn1.js-rfc2560";
|
||||
packageName = "asn1.js-rfc2560";
|
||||
|
@ -886,15 +877,6 @@ let
|
|||
sha512 = "1PrVg6kuBziDN3PGFmRk3QrjpKvP9h/Hv5yMrFZvC1kpzP6dQRzf5BpKstANqHBkaOUmTpakJWhicTATOA/SbA==";
|
||||
};
|
||||
};
|
||||
"asn1.js-rfc5280-2.0.1" = {
|
||||
name = "asn1.js-rfc5280";
|
||||
packageName = "asn1.js-rfc5280";
|
||||
version = "2.0.1";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/asn1.js-rfc5280/-/asn1.js-rfc5280-2.0.1.tgz";
|
||||
sha512 = "1e2ypnvTbYD/GdxWK77tdLBahvo1fZUHlQJqAVUuZWdYj0rdjGcf2CWYUtbsyRYpYUMwMWLZFUtLxog8ZXTrcg==";
|
||||
};
|
||||
};
|
||||
"asn1.js-rfc5280-3.0.0" = {
|
||||
name = "asn1.js-rfc5280";
|
||||
packageName = "asn1.js-rfc5280";
|
||||
|
@ -922,15 +904,6 @@ let
|
|||
sha1 = "f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525";
|
||||
};
|
||||
};
|
||||
"async-1.5.2" = {
|
||||
name = "async";
|
||||
packageName = "async";
|
||||
version = "1.5.2";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/async/-/async-1.5.2.tgz";
|
||||
sha1 = "ec6a61ae56480c0c3cb241c95618e20892f9672a";
|
||||
};
|
||||
};
|
||||
"async-2.6.4" = {
|
||||
name = "async";
|
||||
packageName = "async";
|
||||
|
@ -976,13 +949,13 @@ let
|
|||
sha512 = "z4oo33lmnvvNRqfUe3YjDGGpqu/L2+wXBIhMtwq6oqZ+exOUAkQYM6zd2VWKF7AIlajOF8ZZuPFfryTG9iLC/w==";
|
||||
};
|
||||
};
|
||||
"aws-sdk-2.1116.0" = {
|
||||
"aws-sdk-2.1118.0" = {
|
||||
name = "aws-sdk";
|
||||
packageName = "aws-sdk";
|
||||
version = "2.1116.0";
|
||||
version = "2.1118.0";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1116.0.tgz";
|
||||
sha512 = "36JFrxPPh/fRQWsgGrZZbzTxRu7dq4KyCKKXPxgVMXylEJsG/KEAVMB1f3eq4PiI5eGxYrpt2OkKoMQZQZLjPA==";
|
||||
url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1118.0.tgz";
|
||||
sha512 = "R3g06c4RC0Gz/lwMA7wgC7+FwYf5vaO30sPIigoX5m6Tfb7tdzfCYD7pnpvkPRNUvWJ3f5kQk+pEeW25DstRrQ==";
|
||||
};
|
||||
};
|
||||
"aws-sign2-0.7.0" = {
|
||||
|
@ -1840,13 +1813,13 @@ let
|
|||
sha1 = "e303a882b342cc3ee8ca513a79999734dab3ae2c";
|
||||
};
|
||||
};
|
||||
"core-js-3.22.0" = {
|
||||
"core-js-3.22.1" = {
|
||||
name = "core-js";
|
||||
packageName = "core-js";
|
||||
version = "3.22.0";
|
||||
version = "3.22.1";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/core-js/-/core-js-3.22.0.tgz";
|
||||
sha512 = "8h9jBweRjMiY+ORO7bdWSeWfHhLPO7whobj7Z2Bl0IDo00C228EdGgH7FE4jGumbEjzcFfkfW8bXgdkEDhnwHQ==";
|
||||
url = "https://registry.npmjs.org/core-js/-/core-js-3.22.1.tgz";
|
||||
sha512 = "l6CwCLq7XgITOQGhv1dIUmwCFoqFjyQ6zQHUCQlS0xKmb9d6OHIg8jDiEoswhaettT21BSF5qKr6kbvE+aKwxw==";
|
||||
};
|
||||
};
|
||||
"core-util-is-1.0.2" = {
|
||||
|
@ -2965,13 +2938,13 @@ let
|
|||
sha1 = "34f5049ce1ecdf2b0649af3ef24e45ed35416d91";
|
||||
};
|
||||
};
|
||||
"has-bigints-1.0.1" = {
|
||||
"has-bigints-1.0.2" = {
|
||||
name = "has-bigints";
|
||||
packageName = "has-bigints";
|
||||
version = "1.0.1";
|
||||
version = "1.0.2";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.1.tgz";
|
||||
sha512 = "LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA==";
|
||||
url = "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz";
|
||||
sha512 = "tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==";
|
||||
};
|
||||
};
|
||||
"has-flag-4.0.0" = {
|
||||
|
@ -3127,15 +3100,6 @@ let
|
|||
sha1 = "9aecd925114772f3d95b65a60abb8f7c18fbace1";
|
||||
};
|
||||
};
|
||||
"http-signature-1.3.6" = {
|
||||
name = "http-signature";
|
||||
packageName = "http-signature";
|
||||
version = "1.3.6";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/http-signature/-/http-signature-1.3.6.tgz";
|
||||
sha512 = "3adrsD6zqo4GsTqtO7FyrejHNv+NgiIfAfv68+jVlFmSr9OGy7zrxONceFRLKvnnZA5jbxQBX1u9PpB6Wi32Gw==";
|
||||
};
|
||||
};
|
||||
"https-proxy-agent-5.0.1" = {
|
||||
name = "https-proxy-agent";
|
||||
packageName = "https-proxy-agent";
|
||||
|
@ -3766,15 +3730,6 @@ let
|
|||
sha512 = "P2bSOMAc/ciLz6DzgjVlGJP9+BrJWu5UDGK70C2iweC5QBIeFf0ZXRvGjEj2uYgrY2MkAAhsSWHDWlFtEroZWw==";
|
||||
};
|
||||
};
|
||||
"jsprim-2.0.2" = {
|
||||
name = "jsprim";
|
||||
packageName = "jsprim";
|
||||
version = "2.0.2";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/jsprim/-/jsprim-2.0.2.tgz";
|
||||
sha512 = "gqXddjPqQ6G40VdnI6T6yObEC+pDNvyP95wdQhkWkg7crHH3km5qP1FsOXEkzEQwnz6gz5qGTn1c2Y52wP3OyQ==";
|
||||
};
|
||||
};
|
||||
"jwa-1.4.1" = {
|
||||
name = "jwa";
|
||||
packageName = "jwa";
|
||||
|
@ -4540,13 +4495,13 @@ let
|
|||
sha512 = "FzJhsid5OxdUvL5R4IYA6iflrGdpuwJUwe1SqeP5OQJVHw345PJ+MeJ7I5+viDF2nJ8rZRQ9boFSW+N/YHh+ZQ==";
|
||||
};
|
||||
};
|
||||
"n8n-nodes-base-0.171.0" = {
|
||||
"n8n-nodes-base-0.171.1" = {
|
||||
name = "n8n-nodes-base";
|
||||
packageName = "n8n-nodes-base";
|
||||
version = "0.171.0";
|
||||
version = "0.171.1";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/n8n-nodes-base/-/n8n-nodes-base-0.171.0.tgz";
|
||||
sha512 = "qYOjGs95rNItY+65pXoSJWkXQIKh2CxDTOBmx4LPKrWUJ1oLNQBxhFakmlJOQ37+J4nwkwe/wE5WfwHzs2BfdA==";
|
||||
url = "https://registry.npmjs.org/n8n-nodes-base/-/n8n-nodes-base-0.171.1.tgz";
|
||||
sha512 = "VPdyYKAbBfCITznwVEH8hmrdtp23C1W0Ci8u/963UfQrPh2mYmqbNsnxAGlAOLvdPUap4YFwsoegUjq8/qDvFg==";
|
||||
};
|
||||
};
|
||||
"n8n-workflow-0.96.0" = {
|
||||
|
@ -4657,22 +4612,22 @@ let
|
|||
sha512 = "ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==";
|
||||
};
|
||||
};
|
||||
"node-html-markdown-1.1.3" = {
|
||||
"node-html-markdown-1.2.0" = {
|
||||
name = "node-html-markdown";
|
||||
packageName = "node-html-markdown";
|
||||
version = "1.1.3";
|
||||
version = "1.2.0";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/node-html-markdown/-/node-html-markdown-1.1.3.tgz";
|
||||
sha512 = "iB5Nb8eQjeKHr1k9ot0FkVo5uah6IvYzSbOiNPbmtMt8OWf8os9TCsGEg1Xf51xwYLW461AvKl74HVjiMxvblg==";
|
||||
url = "https://registry.npmjs.org/node-html-markdown/-/node-html-markdown-1.2.0.tgz";
|
||||
sha512 = "mGA53bSqo7j62PjmMuFPdO0efNT9pqiGYhQTNVCWkY7PdduRIECJF7n7NOrr5cb+d/js1GdYRLpoTYDwawRk6A==";
|
||||
};
|
||||
};
|
||||
"node-html-parser-4.1.5" = {
|
||||
"node-html-parser-5.3.3" = {
|
||||
name = "node-html-parser";
|
||||
packageName = "node-html-parser";
|
||||
version = "4.1.5";
|
||||
version = "5.3.3";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/node-html-parser/-/node-html-parser-4.1.5.tgz";
|
||||
sha512 = "NLgqUXtftqnBqIjlRjYSaApaqE7TTxfTiH4VqKCjdUJKFOtUzRwney83EHz2qYc0XoxXAkYdmLjENCuZHvsIFg==";
|
||||
url = "https://registry.npmjs.org/node-html-parser/-/node-html-parser-5.3.3.tgz";
|
||||
sha512 = "ncg1033CaX9UexbyA7e1N0aAoAYRDiV8jkTvzEnfd1GDvzFdrsXLzR4p4ik8mwLgnaKP/jyUFWDy9q3jvRT2Jw==";
|
||||
};
|
||||
};
|
||||
"node-ssh-12.0.4" = {
|
||||
|
@ -4819,15 +4774,6 @@ let
|
|||
sha512 = "VdDoCwvJI4QdC6ndjpqFmoL3/+HxffFBbcJzKi5hwLLqqx3mdbedRpfZDdK0SrOSauj8X4GzBvnDZl4vTN7dOw==";
|
||||
};
|
||||
};
|
||||
"ocsp-1.2.0" = {
|
||||
name = "ocsp";
|
||||
packageName = "ocsp";
|
||||
version = "1.2.0";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/ocsp/-/ocsp-1.2.0.tgz";
|
||||
sha1 = "469a1776b457dee67eb0201408c1946bac4076cc";
|
||||
};
|
||||
};
|
||||
"on-finished-2.3.0" = {
|
||||
name = "on-finished";
|
||||
packageName = "on-finished";
|
||||
|
@ -6205,13 +6151,13 @@ let
|
|||
sha1 = "68fd025eb0490b4f567a027f0bf22480b5f84133";
|
||||
};
|
||||
};
|
||||
"showdown-2.0.3" = {
|
||||
"showdown-2.1.0" = {
|
||||
name = "showdown";
|
||||
packageName = "showdown";
|
||||
version = "2.0.3";
|
||||
version = "2.1.0";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/showdown/-/showdown-2.0.3.tgz";
|
||||
sha512 = "jHytkv5c5YFTAOYIIaTT1zLL/aC+7C1FiP0CIGQozhHnnFSbor1oYkaNqWFL6CpB3zJNPPSxJrAlsHgzN14knQ==";
|
||||
url = "https://registry.npmjs.org/showdown/-/showdown-2.1.0.tgz";
|
||||
sha512 = "/6NVYu4U819R2pUIk79n67SYgJHWCce0a5xTP979WbNp0FL9MN1I1QK662IDU1b6JzKTvmhgI7T7JYIxBi3kMQ==";
|
||||
};
|
||||
};
|
||||
"side-channel-1.0.4" = {
|
||||
|
@ -6232,13 +6178,13 @@ let
|
|||
sha512 = "wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==";
|
||||
};
|
||||
};
|
||||
"simple-git-3.6.0" = {
|
||||
"simple-git-3.7.0" = {
|
||||
name = "simple-git";
|
||||
packageName = "simple-git";
|
||||
version = "3.6.0";
|
||||
version = "3.7.0";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/simple-git/-/simple-git-3.6.0.tgz";
|
||||
sha512 = "2e+4QhOVO59GeLsHgwSMKNrSKCnuACeA/gMNrLCYR8ID9qwm4hViVt4WsODcUGjx//KDv6GMLC6Hs/MeosgXxg==";
|
||||
url = "https://registry.npmjs.org/simple-git/-/simple-git-3.7.0.tgz";
|
||||
sha512 = "O9HlI83ywqkYqnr7Wh3CqKNNrMkfjzpKQSGtJAhk7+H5P+lAxHBTIPgu/eO/0D9pMciepgs433p0d5S+NYv5Jg==";
|
||||
};
|
||||
};
|
||||
"simple-lru-cache-0.0.2" = {
|
||||
|
@ -6277,13 +6223,13 @@ let
|
|||
sha512 = "LAOh4z89bGQvl9pFfNF8V146i7o7/CqFPbqzYgP+yYzDIDeS9HaNFtXABamRW+AQzEVODcvE79ljJ+8a9YSdMg==";
|
||||
};
|
||||
};
|
||||
"snowflake-sdk-1.6.8" = {
|
||||
"snowflake-sdk-1.6.9" = {
|
||||
name = "snowflake-sdk";
|
||||
packageName = "snowflake-sdk";
|
||||
version = "1.6.8";
|
||||
version = "1.6.9";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/snowflake-sdk/-/snowflake-sdk-1.6.8.tgz";
|
||||
sha512 = "ZmzeR2W4mQVri546mUxUW+jBxTn0JRKm06EtndO7MUFLcS8YChf60tXTa+s7A0hO8FxQkSQAFonCmtz4nzPoSA==";
|
||||
url = "https://registry.npmjs.org/snowflake-sdk/-/snowflake-sdk-1.6.9.tgz";
|
||||
sha512 = "Rt16zh5t++mZH+CXUBq3sYUUaEQnEMKT86mFtzfgIUk8MnZFJ4qBOwdheSWYU7OI9QnLqLmy8nZN40o9CFgm5A==";
|
||||
};
|
||||
};
|
||||
"source-map-0.6.1" = {
|
||||
|
@ -7507,10 +7453,10 @@ in
|
|||
n8n = nodeEnv.buildNodePackage {
|
||||
name = "n8n";
|
||||
packageName = "n8n";
|
||||
version = "0.173.0";
|
||||
version = "0.173.1";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/n8n/-/n8n-0.173.0.tgz";
|
||||
sha512 = "V4VPLLYpTWoSs3RE5s6IunrKlEdQEEpwXYYdLqZld4/nTyFrJkFcrTa7LlbmpYUSrLAL7VAPfjJLz/8gUxKTRw==";
|
||||
url = "https://registry.npmjs.org/n8n/-/n8n-0.173.1.tgz";
|
||||
sha512 = "p6sfFQBAvLH4AK9x4E1n00B9F+jVxf/bQiHMzNkGDHvBv+b3OMXnJ1SpLG6hK1vZvXbwvEhZWqH+PrPJHR2eNQ==";
|
||||
};
|
||||
dependencies = [
|
||||
(sources."@azure/abort-controller-1.0.5" // {
|
||||
|
@ -7608,6 +7554,11 @@ in
|
|||
sources."@selderee/plugin-htmlparser2-0.6.0"
|
||||
sources."@servie/events-1.0.0"
|
||||
sources."@sqltools/formatter-1.2.2"
|
||||
(sources."@techteamer/ocsp-1.0.0" // {
|
||||
dependencies = [
|
||||
sources."async-3.2.3"
|
||||
];
|
||||
})
|
||||
sources."@tokenizer/token-0.3.0"
|
||||
sources."@tootallnate/once-1.1.2"
|
||||
sources."@types/bluebird-3.5.36"
|
||||
|
@ -7690,7 +7641,7 @@ in
|
|||
];
|
||||
})
|
||||
sources."avsc-5.7.4"
|
||||
(sources."aws-sdk-2.1116.0" // {
|
||||
(sources."aws-sdk-2.1118.0" // {
|
||||
dependencies = [
|
||||
sources."buffer-4.9.2"
|
||||
sources."events-1.1.1"
|
||||
|
@ -7860,7 +7811,7 @@ in
|
|||
sources."cookie-0.4.1"
|
||||
sources."cookie-parser-1.4.6"
|
||||
sources."cookie-signature-1.0.6"
|
||||
sources."core-js-3.22.0"
|
||||
sources."core-js-3.22.1"
|
||||
sources."core-util-is-1.0.2"
|
||||
sources."crc-32-1.2.2"
|
||||
sources."cron-1.7.2"
|
||||
|
@ -8028,7 +7979,7 @@ in
|
|||
sources."ansi-regex-2.1.1"
|
||||
];
|
||||
})
|
||||
sources."has-bigints-1.0.1"
|
||||
sources."has-bigints-1.0.2"
|
||||
sources."has-flag-4.0.0"
|
||||
sources."has-property-descriptors-1.0.0"
|
||||
sources."has-symbols-1.0.3"
|
||||
|
@ -8244,7 +8195,7 @@ in
|
|||
sources."n8n-core-0.114.0"
|
||||
sources."n8n-design-system-0.17.0"
|
||||
sources."n8n-editor-ui-0.140.0"
|
||||
(sources."n8n-nodes-base-0.171.0" // {
|
||||
(sources."n8n-nodes-base-0.171.1" // {
|
||||
dependencies = [
|
||||
sources."iconv-lite-0.6.3"
|
||||
];
|
||||
|
@ -8274,8 +8225,8 @@ in
|
|||
sources."node-addon-api-4.3.0"
|
||||
sources."node-ensure-0.0.0"
|
||||
sources."node-fetch-2.6.7"
|
||||
sources."node-html-markdown-1.1.3"
|
||||
sources."node-html-parser-4.1.5"
|
||||
sources."node-html-markdown-1.2.0"
|
||||
sources."node-html-parser-5.3.3"
|
||||
sources."node-ssh-12.0.4"
|
||||
sources."nodeify-1.0.1"
|
||||
sources."nodemailer-6.7.3"
|
||||
|
@ -8290,14 +8241,6 @@ in
|
|||
sources."object-keys-1.1.1"
|
||||
sources."object.assign-4.1.2"
|
||||
sources."object.getownpropertydescriptors-2.1.3"
|
||||
(sources."ocsp-1.2.0" // {
|
||||
dependencies = [
|
||||
sources."asn1.js-4.10.1"
|
||||
sources."asn1.js-rfc2560-4.0.6"
|
||||
sources."asn1.js-rfc5280-2.0.1"
|
||||
sources."async-1.5.2"
|
||||
];
|
||||
})
|
||||
sources."on-finished-2.4.1"
|
||||
sources."on-headers-1.0.2"
|
||||
sources."once-1.4.0"
|
||||
|
@ -8508,14 +8451,14 @@ in
|
|||
sources."setprototypeof-1.2.0"
|
||||
sources."sha.js-2.4.11"
|
||||
sources."shell-escape-0.2.0"
|
||||
(sources."showdown-2.0.3" // {
|
||||
(sources."showdown-2.1.0" // {
|
||||
dependencies = [
|
||||
sources."commander-9.2.0"
|
||||
];
|
||||
})
|
||||
sources."side-channel-1.0.4"
|
||||
sources."signal-exit-3.0.7"
|
||||
sources."simple-git-3.6.0"
|
||||
sources."simple-git-3.7.0"
|
||||
sources."simple-lru-cache-0.0.2"
|
||||
sources."simple-swizzle-0.2.2"
|
||||
sources."slash-3.0.0"
|
||||
|
@ -8524,11 +8467,9 @@ in
|
|||
sources."tslib-2.3.1"
|
||||
];
|
||||
})
|
||||
(sources."snowflake-sdk-1.6.8" // {
|
||||
(sources."snowflake-sdk-1.6.9" // {
|
||||
dependencies = [
|
||||
sources."debug-3.2.7"
|
||||
sources."http-signature-1.3.6"
|
||||
sources."jsprim-2.0.2"
|
||||
sources."tmp-0.2.1"
|
||||
sources."uuid-3.4.0"
|
||||
];
|
||||
|
|
|
@ -12,13 +12,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "jesec-rtorrent";
|
||||
version = "0.9.8-r15";
|
||||
version = "0.9.8-r16";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jesec";
|
||||
repo = "rtorrent";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-yYOw8wsiQd478JijLgPtEWsw2/ewd46re+t9D705rmk=";
|
||||
hash = "sha256-i7c1jSawHshj1kaXl8tdpelIKU24okeg9K5/+ht6t2k=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -39,8 +39,8 @@ stdenv.mkDerivation rec {
|
|||
++ lib.optional (!jsonRpcSupport) "-DUSE_JSONRPC=NO"
|
||||
++ lib.optional (!xmlRpcSupport) "-DUSE_XMLRPC=NO";
|
||||
|
||||
|
||||
doCheck = true;
|
||||
|
||||
checkInputs = [
|
||||
gtest
|
||||
];
|
|
@ -9,27 +9,31 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "jesec-libtorrent";
|
||||
version = "0.13.8-r3";
|
||||
version = "0.13.8-r4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jesec";
|
||||
repo = "libtorrent";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-S3DOKzXkvU+ZJxfrxwLXCVBnepzmiZ+3iiQqz084BEk=";
|
||||
hash = "sha256-jC/hgGSi2qy+ToZgdxl1PhASLYbUL0O8trX0th2v5H0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
openssl
|
||||
zlib
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
# Disabled because a test is flaky; see https://github.com/jesec/libtorrent/issues/4.
|
||||
# doCheck = true;
|
||||
|
||||
preCheck = ''
|
||||
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$PWD
|
||||
'';
|
||||
|
||||
checkInputs = [
|
||||
gtest
|
||||
];
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoPackage rec {
|
||||
pname = "git-lfs";
|
||||
version = "3.1.2";
|
||||
version = "3.1.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
rev = "v${version}";
|
||||
owner = "git-lfs";
|
||||
repo = "git-lfs";
|
||||
sha256 = "sha256-IEo8poEYPjAbBGk+SQdJqyhwgMYjNLdibI+AktVIg1g=";
|
||||
sha256 = "sha256-dGqb7gw7l2SPGwhHIFbEq6XqMB9QRw3+3Pfbk2S4kW4=";
|
||||
};
|
||||
|
||||
goPackagePath = "github.com/git-lfs/git-lfs";
|
||||
|
|
|
@ -4,13 +4,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "git-repo";
|
||||
version = "2.23";
|
||||
version = "2.24";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "android";
|
||||
repo = "tools_repo";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-YW6MBX/NGQXuFWvzISWKJZkvxWc0jasxmzy/Zh1TjY0=";
|
||||
sha256 = "sha256-p5zAehhqOUlKay3/Oy8hbBo5nQRIyE7o4bnaX/TabYc=";
|
||||
};
|
||||
|
||||
# Fix 'NameError: name 'ssl' is not defined'
|
||||
|
|
|
@ -12,13 +12,13 @@
|
|||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "ani-cli";
|
||||
version = "2.0";
|
||||
version = "2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pystardust";
|
||||
repo = "ani-cli";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-cDxb/IcpzR5akWnA8RN+fKQn0+QnpBV8tAbUjjPICsA=";
|
||||
sha256 = "sha256-A1c7YdBh2VOhw/xTvhNV50j9n+SELyRTHI5w+AeiWDs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
|
|
@ -2,18 +2,18 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "firectl";
|
||||
version = "0.1.0";
|
||||
|
||||
patches = [ ./gomod.patch ];
|
||||
# The latest upstream 0.1.0 is incompatible with firecracker
|
||||
# v0.1.0. See issue: https://github.com/firecracker-microvm/firectl/issues/82
|
||||
version = "unstable-2022-03-01";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "firecracker-microvm";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1ni3yx4rjhrkqk2038c6hkb2jwsdj2llx233wd5wgpvb6c57652p";
|
||||
rev = "9f1b639a446e8d75f31787a00b9f273c1e68f12c";
|
||||
sha256 = "TjzzHY9VYPpWoPt6nHYUerKX94O03sm524wGM9lGzno=";
|
||||
};
|
||||
|
||||
vendorSha256 = "1xbpck1gvzl75xgrajf5yzl199l4f2f6j3mac5586i7b00b9jxqj";
|
||||
vendorSha256 = "3SVEvvGNx6ienyJZg0EOofHNHCPSpJUGXwHxokdRG1c=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
@ -1,15 +0,0 @@
|
|||
diff --git a/go.mod b/go.mod
|
||||
index 1044001..7bafeda 100644
|
||||
--- a/go.mod
|
||||
+++ b/go.mod
|
||||
@@ -1,7 +1,10 @@
|
||||
module github.com/firecracker-microvm/firectl
|
||||
|
||||
+go 1.14
|
||||
+
|
||||
require (
|
||||
github.com/firecracker-microvm/firecracker-go-sdk v0.15.1
|
||||
+ github.com/go-openapi/strfmt v0.17.1
|
||||
github.com/jessevdk/go-flags v1.4.0
|
||||
github.com/pkg/errors v0.8.0
|
||||
github.com/sirupsen/logrus v1.1.1
|
|
@ -1,6 +1,7 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
|
@ -24,6 +25,13 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "sha256-71IX0fC4xCPP6pK63KtvDMb3KoP1rw/Iz3S7BgiLSpg=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://github.com/mortie/swaylock-effects/commit/dfff235b09b475e79d75a040a0307a359974d360.patch";
|
||||
sha256 = "t8Xz2wRSBlwGtkpWZyIGWX7V/y0P1r/50P8MfauMh4c=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
sed -iE "s/version: '1\.3',/version: '${version}',/" meson.build
|
||||
'';
|
||||
|
|
|
@ -227,6 +227,8 @@ runCommand
|
|||
substitute ${./wrapper.sh} $out/Applications/Emacs.app/Contents/MacOS/Emacs \
|
||||
--subst-var-by bash ${emacs.stdenv.shell} \
|
||||
--subst-var-by wrapperSiteLisp "$deps/share/emacs/site-lisp" \
|
||||
--subst-var-by wrapperSiteLispNative "$deps/share/emacs/native-lisp:" \
|
||||
--subst-var-by autoloadExpression "-l cl-loaddefs -l nix-generated-autoload" \
|
||||
--subst-var-by prog "$emacs/Applications/Emacs.app/Contents/MacOS/Emacs"
|
||||
chmod +x $out/Applications/Emacs.app/Contents/MacOS/Emacs
|
||||
fi
|
||||
|
|
|
@ -12,14 +12,14 @@
|
|||
|
||||
writeShellScript "make-darwin-bundle-${name}" (''
|
||||
function makeDarwinBundlePhase() {
|
||||
mkdir -p "$out/Applications/${name}.app/Contents/MacOS"
|
||||
mkdir -p "$out/Applications/${name}.app/Contents/Resources"
|
||||
mkdir -p "''${!outputBin}/Applications/${name}.app/Contents/MacOS"
|
||||
mkdir -p "''${!outputBin}/Applications/${name}.app/Contents/Resources"
|
||||
|
||||
if [ -n "${icon}" ]; then
|
||||
ln -s "${icon}" "$out/Applications/${name}.app/Contents/Resources"
|
||||
ln -s "${icon}" "''${!outputBin}/Applications/${name}.app/Contents/Resources"
|
||||
fi
|
||||
|
||||
${writeDarwinBundle}/bin/write-darwin-bundle "$out" "${name}" "${exec}"
|
||||
${writeDarwinBundle}/bin/write-darwin-bundle "''${!outputBin}" "${name}" "${exec}"
|
||||
}
|
||||
|
||||
preDistPhases+=" makeDarwinBundlePhase"
|
||||
|
|
|
@ -200,12 +200,12 @@ convertDesktopFile() {
|
|||
local -r iconName=$(getDesktopParam "${file}" "^Icon")
|
||||
local -r squircle=$(getDesktopParam "${file}" "X-macOS-SquircleIcon")
|
||||
|
||||
mkdir -p "$out/Applications/${name}.app/Contents/MacOS"
|
||||
mkdir -p "$out/Applications/${name}.app/Contents/Resources"
|
||||
mkdir -p "${!outputBin}/Applications/${name}.app/Contents/MacOS"
|
||||
mkdir -p "${!outputBin}/Applications/${name}.app/Contents/Resources"
|
||||
|
||||
convertIconTheme "$out/Applications/${name}.app/Contents/Resources" "$sharePath" "$iconName"
|
||||
convertIconTheme "${!outputBin}/Applications/${name}.app/Contents/Resources" "$sharePath" "$iconName"
|
||||
|
||||
write-darwin-bundle "$out" "$name" "$exec" "$iconName" "$squircle"
|
||||
write-darwin-bundle "${!outputBin}" "$name" "$exec" "$iconName" "$squircle"
|
||||
}
|
||||
|
||||
convertDesktopFiles() {
|
||||
|
|
14
pkgs/data/fonts/comic-mono/comic-mono-weight.conf
Normal file
14
pkgs/data/fonts/comic-mono/comic-mono-weight.conf
Normal file
|
@ -0,0 +1,14 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE fontconfig SYSTEM "urn:fontconfig:fonts.dtd">
|
||||
<fontconfig>
|
||||
<!-- Fix missing/incorrect font weight data in Comic Mono. -->
|
||||
|
||||
<match target="scan">
|
||||
<test name="fullname">
|
||||
<string>Comic Mono</string>
|
||||
</test>
|
||||
<edit name="weight">
|
||||
<const>book</const>
|
||||
</edit>
|
||||
</match>
|
||||
</fontconfig>
|
35
pkgs/data/fonts/comic-mono/default.nix
Normal file
35
pkgs/data/fonts/comic-mono/default.nix
Normal file
|
@ -0,0 +1,35 @@
|
|||
{ lib, fetchFromGitHub }:
|
||||
|
||||
let
|
||||
version = "2020-12-28";
|
||||
in fetchFromGitHub {
|
||||
name = "comic-mono-font-${version}";
|
||||
|
||||
owner = "dtinth";
|
||||
repo = "comic-mono-font";
|
||||
rev = "9a96d04cdd2919964169192e7d9de5012ef66de4";
|
||||
|
||||
postFetch = ''
|
||||
mkdir -p $out/share/fonts
|
||||
tar -z -f $downloadedFile --wildcards -x \*.ttf --one-top-level=$out/share/fonts
|
||||
|
||||
mkdir -p $out/etc/fonts/conf.d
|
||||
ln -s ${./comic-mono-weight.conf} $out/etc/fonts/conf.d/30-comic-mono.conf
|
||||
'';
|
||||
|
||||
hash = "sha256-poMU+WfDZcsyWyFiiXKJ284X22CJlxQIzcJtApnIdAY=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "A legible monospace font that looks like Comic Sans";
|
||||
longDescription = ''
|
||||
A legible monospace font... the very typeface you’ve been trained to
|
||||
recognize since childhood. This font is a fork of Shannon Miwa’s Comic
|
||||
Shanns (version 1).
|
||||
'';
|
||||
homepage = "https://dtinth.github.io/comic-mono-font/";
|
||||
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ an-empty-string totoroot ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
|
@ -1,29 +0,0 @@
|
|||
{ lib, stdenv, fetchFromGitHub }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "gnome-breeze";
|
||||
version = "unstable-2016-05-26";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dirruk1";
|
||||
repo = "gnome-breeze";
|
||||
rev = "49a5cd67a270e13a4c04a4b904f126ef728e9221";
|
||||
sha256 = "sha256-lQYVOhFBDOYT+glUHleuymGTfHEE5bIyqUFnS/EDc0I=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/share/themes
|
||||
cp -r Breeze* $out/share/themes
|
||||
'';
|
||||
|
||||
preferLocalBuild = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "A GTK theme built to match KDE's breeze theme";
|
||||
homepage = "https://github.com/dirruk1/gnome-breeze";
|
||||
license = licenses.lgpl2;
|
||||
maintainers = with maintainers; [ bennofs ];
|
||||
platforms = platforms.all;
|
||||
hydraPlatforms = [];
|
||||
};
|
||||
}
|
|
@ -40,11 +40,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "epiphany";
|
||||
version = "42.1";
|
||||
version = "42.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "aKzDxcYpF/G0ORaltGvsE29bMH8DqtpY23QMeLED8Dg=";
|
||||
sha256 = "ksAs+IbRDSzP9d5ljhpCDqsx0gu1DnRtQw6VNbSFGS0=";
|
||||
};
|
||||
|
||||
patches = lib.optionals withPantheon [
|
||||
|
|
|
@ -36,11 +36,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-initial-setup";
|
||||
version = "42.1";
|
||||
version = "42.1.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "hmE2yjKSL3zEJNOtxrHbp86+B6qWoZ+XyAdw4/Lupxs=";
|
||||
sha256 = "kRfuQpH2/oX95/Fh4FBEA8PPquX3GxjwHjAmUZY2UtI=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ pkgs }:
|
||||
{ pkgs, stdenv }:
|
||||
rec {
|
||||
inherit (pkgs) eggDerivation fetchegg;
|
||||
|
||||
|
@ -32,6 +32,22 @@ rec {
|
|||
];
|
||||
};
|
||||
|
||||
r7rs = eggDerivation {
|
||||
name = "r7rs-1.0.5";
|
||||
|
||||
src = fetchegg {
|
||||
name = "r7rs";
|
||||
version = "1.0.5";
|
||||
sha256 = "0zyi1z4m1995hm2wfc5wpi8jjgxcwk03qknq5v2ygff3akxazsf6";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
matchable
|
||||
srfi-1
|
||||
srfi-13
|
||||
];
|
||||
};
|
||||
|
||||
srfi-1 = eggDerivation {
|
||||
name = "srfi-1-0.5.1";
|
||||
|
||||
|
@ -47,12 +63,12 @@ rec {
|
|||
};
|
||||
|
||||
srfi-13 = eggDerivation {
|
||||
name = "srfi-13-0.3";
|
||||
name = "srfi-13-0.3.1";
|
||||
|
||||
src = fetchegg {
|
||||
name = "srfi-13";
|
||||
version = "0.3";
|
||||
sha256 = "0yaw9i6zhpxl1794pirh168clprjgmsb0xlr96drirjzsslgm3zp";
|
||||
version = "0.3.1";
|
||||
sha256 = "12ryxs3w3las0wjdh0yp52g1xmyq1fb48xi3i26l5a9sfx7gbilp";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
@ -74,6 +90,36 @@ rec {
|
|||
];
|
||||
};
|
||||
|
||||
srfi-145 = eggDerivation {
|
||||
name = "srfi-145-0.1";
|
||||
|
||||
src = fetchegg {
|
||||
name = "srfi-145";
|
||||
version = "0.1";
|
||||
sha256 = "1r4278xhpmm8gww64j6akpyv3qjnn14b6nsisyb9qm7yx3pkpim9";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
];
|
||||
};
|
||||
|
||||
srfi-189 = eggDerivation {
|
||||
name = "srfi-189-0.1";
|
||||
|
||||
src = fetchegg {
|
||||
name = "srfi-189";
|
||||
version = "0.1";
|
||||
sha256 = "1nmrywpi9adi5mm1vcbxxsgw0j3v6m7s4j1mii7icj83xn81cgvx";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
r7rs
|
||||
srfi-1
|
||||
srfi-145
|
||||
];
|
||||
};
|
||||
|
||||
srfi-37 = eggDerivation {
|
||||
name = "srfi-37-1.4";
|
||||
|
||||
|
|
|
@ -1,3 +1,6 @@
|
|||
;; Eggs used by egg2nix
|
||||
args
|
||||
matchable
|
||||
|
||||
;; other eggs to include in nixpkgs
|
||||
srfi-189
|
||||
|
|
|
@ -79,6 +79,12 @@ let
|
|||
EOF
|
||||
'';
|
||||
|
||||
# fixupPhase is moving the man to share/man which breaks it because it's a
|
||||
# relative symlink.
|
||||
postFixup = ''
|
||||
ln -nsf ../zulu-${lib.versions.major version}.jdk/Contents/Home/man $out/share/man
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
jre = jdk;
|
||||
home = jdk;
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
{
|
||||
lib, stdenv,
|
||||
cmake,
|
||||
fetchpatch,
|
||||
fetchFromGitHub,
|
||||
boost,
|
||||
xercesc,
|
||||
|
@ -18,6 +19,14 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "15l23spjvak5h3n7aj3ggy0c3cwcg8mvnc9jlbd9yc2ra43bx7bp";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# gcc11 header fix
|
||||
(fetchpatch {
|
||||
url = "https://github.com/asmaloney/libE57Format/commit/13f6a16394ce3eb50ea4cd21f31f77f53294e8d0.patch";
|
||||
sha256 = "sha256-4vVhKrCxnWO106DSAk+xxo4uk6zC89m9VQAPaDJ8Ed4=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
];
|
||||
|
|
|
@ -26,6 +26,7 @@
|
|||
, ninja
|
||||
, perl
|
||||
, perlPackages
|
||||
, polkit
|
||||
, pkg-config
|
||||
, pmutils
|
||||
, python3
|
||||
|
@ -227,6 +228,9 @@ stdenv.mkDerivation rec {
|
|||
--replace "gmake" "make" \
|
||||
--replace "ggrep" "grep"
|
||||
|
||||
substituteInPlace src/util/virpolkit.h \
|
||||
--replace '"/usr/bin/pkttyagent"' '"${polkit.bin}/bin/pkttyagent"'
|
||||
|
||||
patchShebangs .
|
||||
''
|
||||
+ (lib.concatStringsSep "\n" (lib.mapAttrsToList patchBuilder overrides));
|
||||
|
|
|
@ -3,12 +3,12 @@
|
|||
, fetchFromGitLab
|
||||
, fetchpatch
|
||||
, gmp
|
||||
, python2
|
||||
, python3
|
||||
, tune ? false # tune to hardware, impure
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "0.9.1";
|
||||
version = "0.9.2";
|
||||
pname = "zn_poly";
|
||||
|
||||
# sage has picked up the maintenance (bug fixes and building, not development)
|
||||
|
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
|
|||
owner = "sagemath";
|
||||
repo = "zn_poly";
|
||||
rev = version;
|
||||
sha256 = "0ra5vy585bqq7g3317iw6fp44iqgqvds3j0l1va6mswimypq4vxb";
|
||||
hash = "sha256-QBItcrrpOGj22/ShTDdfZjm63bGW2xY4c71R1q8abPE=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
|
|||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
python2 # needed by ./configure to create the makefile
|
||||
python3 # needed by ./configure to create the makefile
|
||||
];
|
||||
|
||||
# name of library file ("libzn_poly.so")
|
||||
|
@ -44,16 +44,6 @@ stdenv.mkDerivation rec {
|
|||
"--disable-tuning"
|
||||
];
|
||||
|
||||
patches = [
|
||||
# fix format-security by not passing variables directly to printf
|
||||
# https://gitlab.com/sagemath/zn_poly/merge_requests/1
|
||||
(fetchpatch {
|
||||
name = "format-security.patch";
|
||||
url = "https://gitlab.com/timokau/zn_poly/commit/1950900a80ec898d342b8bcafa148c8027649766.patch";
|
||||
sha256 = "1gks9chvsfpc6sg5h3nqqfia4cgvph7jmj9dw67k7dk7kv9y0rk1";
|
||||
})
|
||||
];
|
||||
|
||||
# `make install` fails to install some header files and the lib file.
|
||||
installPhase = ''
|
||||
mkdir -p "$out/include/zn_poly"
|
||||
|
|
|
@ -1,18 +1,20 @@
|
|||
{ lib, buildDunePackage, fetchurl
|
||||
, astring, cmdliner, fmt, uuidm, re, stdlib-shims, uutf
|
||||
, astring, cmdliner, fmt, uuidm, re, stdlib-shims, uutf, ocaml-syntax-shims
|
||||
}:
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "alcotest";
|
||||
version = "1.4.0";
|
||||
version = "1.5.0";
|
||||
|
||||
useDune2 = true;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/mirage/alcotest/releases/download/${version}/alcotest-mirage-${version}.tbz";
|
||||
sha256 = "sha256:1h9yp44snb6sgm5g1x3wg4gwjscic7i56jf0j8jr07355pxwrami";
|
||||
url = "https://github.com/mirage/alcotest/releases/download/${version}/alcotest-js-${version}.tbz";
|
||||
sha256 = "sha256-VCgZB+AteJld8kbcLhDtGCgoKUrSBZNHoeOhM1SEj2w=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ ocaml-syntax-shims ];
|
||||
|
||||
propagatedBuildInputs = [ astring cmdliner fmt uuidm re stdlib-shims uutf ];
|
||||
|
||||
doCheck = true;
|
||||
|
|
|
@ -1,8 +1,10 @@
|
|||
{ lib, fetchFromGitHub, buildDunePackage, cppo, logs, ptime, uri }:
|
||||
{ lib, fetchFromGitHub, buildDunePackage
|
||||
, cppo, logs, ptime, uri, bigstringaf
|
||||
, re, cmdliner, alcotest }:
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "caqti";
|
||||
version = "1.7.0";
|
||||
version = "1.8.0";
|
||||
useDune2 = true;
|
||||
|
||||
minimumOCamlVersion = "4.04";
|
||||
|
@ -11,11 +13,14 @@ buildDunePackage rec {
|
|||
owner = "paurkedal";
|
||||
repo = "ocaml-${pname}";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-NGK38so6ZVCRbtV3ww1u31EFAjkHgDdsFfFUwc8ldm4=";
|
||||
sha256 = "sha256-8uKlrq9j1Z3QzkCyoRIn2j6wCdGyo7BY7XlbFHN1xVE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cppo ];
|
||||
propagatedBuildInputs = [ logs ptime uri ];
|
||||
propagatedBuildInputs = [ logs ptime uri bigstringaf ];
|
||||
checkInputs = [ re cmdliner alcotest ];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
meta = {
|
||||
description = "Unified interface to relational database libraries";
|
||||
|
|
41
pkgs/development/ocaml-modules/reperf/default.nix
Normal file
41
pkgs/development/ocaml-modules/reperf/default.nix
Normal file
|
@ -0,0 +1,41 @@
|
|||
{ buildDunePackage, fetchFromGitHub, lib, printbox-text, reason }:
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "reperf";
|
||||
version = "1.5.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bryphe";
|
||||
repo = "reperf";
|
||||
rev = "68ef2f96899c09e6ac7d929b0375f7a806aee067";
|
||||
sha256 = "sha256-ASujTsH4eDAYLNalB9Xt1p3C8x+FI0kMldZBYaXMCWc=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace src/dune --replace "printbox" "printbox-text"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ reason ];
|
||||
|
||||
buildInputs = [
|
||||
printbox-text
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Native Reason + JSOO cross-platform performance benchmarking tools";
|
||||
longDescription = ''
|
||||
Inspired by the core_bench tools from Janestreet.
|
||||
|
||||
reperf helps with:
|
||||
* Timing: time spent in a code block
|
||||
* Call count: frequency of code-path calls
|
||||
* Allocations: code-block impact to garbage collector
|
||||
|
||||
Supports benchmarks, which are test cases that exercise performance scenarios.
|
||||
Outputs a JSON performance report, and compare it with previous iterations - and fail if a regression is detected.
|
||||
'';
|
||||
homepage = "https://github.com/bryphe/reperf";
|
||||
maintainers = with maintainers; [ superherointj ];
|
||||
license = licenses.mit;
|
||||
};
|
||||
}
|
|
@ -20,14 +20,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "apprise";
|
||||
version = "0.9.7";
|
||||
version = "0.9.8";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-BOMeSvwmGiZvA95+e2bceCGXRwowU5+zJAl7Sn4wKqM=";
|
||||
hash = "sha256-PK1WxfJHWHbe/l+/6woBA2Gik+rKF5Uiuf35r4KNzEM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -16,7 +16,7 @@
|
|||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "5.0.0";
|
||||
version = "5.0.1";
|
||||
pname = "approvaltests";
|
||||
format = "setuptools";
|
||||
|
||||
|
@ -26,8 +26,8 @@ buildPythonPackage rec {
|
|||
src = fetchFromGitHub {
|
||||
owner = "approvals";
|
||||
repo = "ApprovalTests.Python";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-ku8J1ccX6LZZitlAOgc3eNCdsFx/FP1nqtdgPJF/jRg=";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-lmH/nw/7woLCDepR/rDQUqwrhuLFY+TO8sdgK1+apgc=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -4,11 +4,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "authheaders";
|
||||
version = "0.14.1";
|
||||
version = "0.15.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "4e601b5b54080019a2f548fadf80ddf9c5538615607c7fb602936404aafe67e2";
|
||||
sha256 = "sha256-90rOvu+CbHtammrMDZpPx7rIboIT2X/jL1GtfjpmuOk=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ authres dnspython dkimpy publicsuffix2 ]
|
||||
|
|
|
@ -5,18 +5,20 @@
|
|||
, msrestazure
|
||||
, azure-common
|
||||
, azure-mgmt-core
|
||||
, azure-mgmt-nspkg
|
||||
, isPy3k
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "azure-mgmt-reservations";
|
||||
version = "1.0.0";
|
||||
version = "2.0.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
extension = "zip";
|
||||
sha256 = "880df54fdf3869ee6b142d4fc7a3fce518c850523c42cc895b7fb8359956554e";
|
||||
hash = "sha256-5vXdXiRubnzPk4uTFeNHR6rwiHSGbeUREX9eW1pqC3E=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -24,8 +26,6 @@ buildPythonPackage rec {
|
|||
msrestazure
|
||||
azure-common
|
||||
azure-mgmt-core
|
||||
] ++ lib.optionals (!isPy3k) [
|
||||
azure-mgmt-nspkg
|
||||
];
|
||||
|
||||
# has no tests
|
||||
|
|
|
@ -8,11 +8,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "azure-mgmt-servicelinker";
|
||||
version = "1.0.0b1";
|
||||
version = "1.0.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "4f70d3bcd98ba539bfef870e3c497ebdc5efed3200c2627a61718baa9ab21a61";
|
||||
sha256 = "sha256-lAjgwEa2TJDEUU8pwfwkU8EyA1bhLkcAv++I6WHb7Xs=";
|
||||
extension = "zip";
|
||||
};
|
||||
|
||||
|
|
|
@ -13,7 +13,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "bimmer-connected";
|
||||
version = "0.8.11";
|
||||
version = "0.8.12";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
@ -22,7 +22,7 @@ buildPythonPackage rec {
|
|||
owner = "bimmerconnected";
|
||||
repo = "bimmer_connected";
|
||||
rev = version;
|
||||
hash = "sha256-Ufx9Tl0PmV3AEig3UvejJBVxhewzPN6IRsji5MzVxG8=";
|
||||
hash = "sha256-0yXEm8cjzw1ClSP8a5TB9RrugzgHSu40tTtyNQU4dfY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -6,14 +6,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "bitstruct";
|
||||
version = "8.14.0";
|
||||
version = "8.14.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-IwwZHHXxUm9pIs2wjqtvUsBVRS4iOb9WOPAunP04LJE=";
|
||||
hash = "sha256-04ExvUR7avW49GTEh4eXyHpdnaHJW5NX4HHEJP3l8FU=";
|
||||
};
|
||||
|
||||
pythonImportsCheck = [
|
||||
|
|
|
@ -27,10 +27,10 @@ buildPythonPackage rec {
|
|||
src = ./dont_fetch_dependencies.patch;
|
||||
pybind11_src = pybind11.src;
|
||||
relic_src = fetchFromGitHub {
|
||||
owner = "relic-toolkit";
|
||||
owner = "Chia-Network";
|
||||
repo = "relic";
|
||||
rev = "1885ae3b681c423c72b65ce1fe70910142cf941c"; # pinned by blspy
|
||||
hash = "sha256-tsSZTcssl8t7Nqdex4BesgQ+ACPgTdtHnJFvS9josN0=";
|
||||
rev = "1d98e5abf3ca5b14fd729bd5bcced88ea70ecfd7"; # pinned by blspy
|
||||
hash = "sha256-IfTD8DvTEXeLUoKe4Ejafb+PEJW5DV/VXRYuutwGQHU=";
|
||||
};
|
||||
sodium_src = fetchFromGitHub {
|
||||
owner = "AmineKhaldi";
|
||||
|
|
71
pkgs/development/python-modules/certomancer/default.nix
Normal file
71
pkgs/development/python-modules/certomancer/default.nix
Normal file
|
@ -0,0 +1,71 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pythonOlder
|
||||
, asn1crypto
|
||||
, click
|
||||
, oscrypto
|
||||
, pyyaml
|
||||
, python-dateutil
|
||||
, tzlocal
|
||||
, pytest-aiohttp
|
||||
, pytz
|
||||
, freezegun
|
||||
, jinja2
|
||||
, pyhanko-certvalidator
|
||||
, requests
|
||||
, requests-mock
|
||||
, werkzeug
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "certomancer";
|
||||
version = "0.8.2";
|
||||
format = "setuptools";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
# Tests are only available on GitHub
|
||||
src = fetchFromGitHub {
|
||||
owner = "MatthiasValvekens";
|
||||
repo = "certomancer";
|
||||
rev = version;
|
||||
sha256 = "sha256-H43NlFNTwZtedHsB7c62MocwQVOi5JjVJxRcZY+Wn7Y=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
asn1crypto
|
||||
click
|
||||
oscrypto
|
||||
pyyaml
|
||||
python-dateutil
|
||||
tzlocal
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace ", 'pytest-runner'" "" \
|
||||
--replace "pyhanko-certvalidator==0.19.2" "pyhanko-certvalidator==0.19.5"
|
||||
'';
|
||||
|
||||
checkInputs = [
|
||||
freezegun
|
||||
jinja2
|
||||
pyhanko-certvalidator
|
||||
pytest-aiohttp
|
||||
pytz
|
||||
requests
|
||||
requests-mock
|
||||
werkzeug
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "certomancer" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Quickly construct, mock & deploy PKI test configurations using simple declarative configuration";
|
||||
homepage = "https://github.com/MatthiasValvekens/certomancer";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ wolfangaukang ];
|
||||
};
|
||||
}
|
|
@ -2,15 +2,15 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "crytic-compile";
|
||||
version = "0.2.2";
|
||||
version = "0.2.3";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "crytic";
|
||||
repo = "crytic-compile";
|
||||
rev = version;
|
||||
sha256 = "sha256-4Lz+jJdKURp+K5XJJb7ksiFbnQwzS71gZWOufBvqz/k=";
|
||||
rev = "refs/tags/${version}";
|
||||
sha256 = "sha256-l8a9QXERpkVrx7zHluMlb3zBvJSODsviNtJPzvL3hDo=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ pysha3 setuptools ];
|
||||
|
|
|
@ -9,14 +9,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "databricks-connect";
|
||||
version = "9.1.13";
|
||||
version = "9.1.14";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-TpE15UOwbuAvp+ffC9JUnR8yQb0DWvBMkSieMhQGjao=";
|
||||
sha256 = "sha256-l+mTqiQPuPJfGbEVSILpCTlxAka0GeCgIXjMG4Vs82o=";
|
||||
};
|
||||
|
||||
sourceRoot = ".";
|
||||
|
|
|
@ -7,14 +7,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "eagle100";
|
||||
version = "0.1.0";
|
||||
version = "0.1.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-i9ZvbjxSENJlQ+9sqWnIl1fL6tVbG3E/IUhe7b59sBk=";
|
||||
hash = "sha256-eyYY1x8IjIfUx5OiaOomiWunsO1++seFwXlI/iKDDLw=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -2,14 +2,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "flask-httpauth";
|
||||
version = "4.5.0";
|
||||
version = "4.6.0";
|
||||
|
||||
disabled = python.pythonOlder "3";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "Flask-HTTPAuth";
|
||||
version = version;
|
||||
sha256 = "0ada63rkcvwkakjyx4ay98fjzwx5h55br12ys40ghkc5lbyl0l1r";
|
||||
sha256 = "sha256-IHbPhuhMaqRC7gM0S/91Hq4TPTWhpIkx5vmfFHFhtVs=";
|
||||
};
|
||||
|
||||
checkInputs = [ pytestCheckHook ];
|
||||
|
|
|
@ -14,7 +14,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "hahomematic";
|
||||
version = "1.1.2";
|
||||
version = "1.1.4";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
@ -23,7 +23,7 @@ buildPythonPackage rec {
|
|||
owner = "danielperna84";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
sha256 = "sha256-yglKgRsjYGzW8PiMWu2YOQRoxei7VFPNrS8VYwDIAA0=";
|
||||
sha256 = "sha256-it3Hku0k+o2v+KeykCO3W5CxOpkWbGXT055Kq6cSDzo=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -2,46 +2,39 @@
|
|||
, buildPythonPackage
|
||||
, pythonOlder
|
||||
, fetchFromGitHub
|
||||
, docopt
|
||||
, poetry-core
|
||||
, requests
|
||||
, beautifulsoup4
|
||||
, mypy
|
||||
, types-requests
|
||||
, colorama
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "hydra-check";
|
||||
version = "1.2.0";
|
||||
disabled = pythonOlder "3.5";
|
||||
version = "1.3.4";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nix-community";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "EegoQ8qTrFGFYbCDsbAOE4Afg9haLjYdC0Cux/yvSk8=";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-voSbpOPJUPjwzdMLVt2TC/FIi6LKk01PLd/GczOAUR8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ poetry-core ];
|
||||
propagatedBuildInputs = [
|
||||
docopt
|
||||
colorama
|
||||
requests
|
||||
beautifulsoup4
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
mypy
|
||||
types-requests
|
||||
];
|
||||
|
||||
checkPhase = ''
|
||||
echo -e "\x1b[32m## run mypy\x1b[0m"
|
||||
mypy hydracheck
|
||||
'';
|
||||
pythonImportsCheck = [ "hydra_check" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "check hydra for the build status of a package";
|
||||
homepage = "https://github.com/nix-community/hydra-check";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ makefu ];
|
||||
maintainers = with maintainers; [ makefu artturin ];
|
||||
};
|
||||
}
|
||||
|
||||
|
|
|
@ -7,14 +7,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "lightwave2";
|
||||
version = "0.8.4";
|
||||
version = "0.8.8";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-WB5U8VjUKx2hCcJX2JeFgEiwzweGzROEK3pox3l/wrE=";
|
||||
sha256 = "sha256-6z4w6GMwShhdF8JUwySOR2RNvCXJ22IzQvoahmSS6Zk=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -6,12 +6,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "policyuniverse";
|
||||
version = "1.5.0.20220420";
|
||||
version = "1.5.0.20220421";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-HWyzwvsn3ikL5cbEPljMHShF2vQEOSP6umk08UZgQsI=";
|
||||
sha256 = "sha256-1rY77cIxqVcde+AYE6qfRgZzB8vb3yiQ3Bj+P0o1zFM=";
|
||||
};
|
||||
|
||||
# Tests are not shipped and there are no GitHub tags
|
||||
|
|
|
@ -0,0 +1,73 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pythonOlder
|
||||
, aiohttp
|
||||
, asn1crypto
|
||||
, cryptography
|
||||
, oscrypto
|
||||
, requests
|
||||
, uritools
|
||||
, openssl
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyhanko-certvalidator";
|
||||
version = "0.19.5";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
# Tests are only available on GitHub
|
||||
src = fetchFromGitHub {
|
||||
owner = "MatthiasValvekens";
|
||||
repo = "certvalidator";
|
||||
rev = version;
|
||||
sha256 = "sha256-UxlBggKgqvbKioG98UaKvhW0YgEa6PqV913nqYvTx1I=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
asn1crypto
|
||||
cryptography
|
||||
oscrypto
|
||||
requests
|
||||
uritools
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
aiohttp
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
disabledTestPaths = [
|
||||
# Test looks for libcrypto.so.1.1
|
||||
"dev/stress_test.py"
|
||||
# Requests
|
||||
"tests/test_crl_client.py"
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# Look for nonexisting certificates
|
||||
"test_basic_certificate_validator_tls"
|
||||
# Failed to fetch OCSP response from http://ocsp.digicert.com
|
||||
"test_fetch_ocsp_aiohttp"
|
||||
"test_fetch_ocsp_requests"
|
||||
"test_fetch_ocsp_err_requests"
|
||||
# Unable to build a validation path for the certificate "%s" - no issuer matching "%s" was found
|
||||
"test_revocation_mode_hard_aiohttp_autofetch"
|
||||
# The path could not be validated because no revocation information could be found for intermediate certificate 1
|
||||
"test_revocation_mode_hard"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"pyhanko_certvalidator"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python library for validating X.509 certificates and paths";
|
||||
homepage = "https://github.com/MatthiasValvekens/certvalidator";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ wolfangaukang ];
|
||||
};
|
||||
}
|
|
@ -0,0 +1,25 @@
|
|||
From 942d4fd37786941bae91b769ef6499a4b4da6843 Mon Sep 17 00:00:00 2001
|
||||
From: "P. R. d. O" <d.ol.rod@tutanota.com>
|
||||
Date: Sat, 9 Apr 2022 12:40:59 -0600
|
||||
Subject: [PATCH] Updating pytest-aiohttp version
|
||||
|
||||
---
|
||||
setup.py | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/setup.py b/setup.py
|
||||
index fe33d9a..694fab4 100644
|
||||
--- a/setup.py
|
||||
+++ b/setup.py
|
||||
@@ -85,7 +85,7 @@ setup(
|
||||
tests_require=[
|
||||
'pytest>=6.1.1', 'requests-mock>=1.8.0',
|
||||
'freezegun>=1.1.0', 'certomancer~=0.8.1',
|
||||
- 'aiohttp~=3.8.0', 'pytest-aiohttp~=0.3.0',
|
||||
+ 'aiohttp~=3.8.0', 'pytest-aiohttp~=1.0.3',
|
||||
'python-pae==0.1.0'
|
||||
],
|
||||
keywords="signature pdf pades digital-signature pkcs11"
|
||||
--
|
||||
2.35.1
|
||||
|
132
pkgs/development/python-modules/pyhanko/default.nix
Normal file
132
pkgs/development/python-modules/pyhanko/default.nix
Normal file
|
@ -0,0 +1,132 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pythonOlder
|
||||
, asn1crypto
|
||||
, click
|
||||
, cryptography
|
||||
, pyhanko-certvalidator
|
||||
, pytz
|
||||
, pyyaml
|
||||
, qrcode
|
||||
, requests
|
||||
, tzlocal
|
||||
, certomancer
|
||||
, freezegun
|
||||
, python-pae
|
||||
, pytest-aiohttp
|
||||
, requests-mock
|
||||
, pytestCheckHook
|
||||
# Flags to add to the library
|
||||
, extraPubkeyAlgsSupport ? false
|
||||
, oscrypto
|
||||
, opentypeSupport ? false
|
||||
, fonttools
|
||||
, uharfbuzz
|
||||
, imageSupport ? false
|
||||
, pillow
|
||||
, python-barcode
|
||||
, pkcs11Support ? false
|
||||
, python-pkcs11
|
||||
, asyncHttpSupport ? false
|
||||
, aiohttp
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyhanko";
|
||||
version = "0.12.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
# Tests are only available on GitHub
|
||||
src = fetchFromGitHub {
|
||||
owner = "MatthiasValvekens";
|
||||
repo = "pyHanko";
|
||||
rev = version;
|
||||
sha256 = "sha256-W60NTKEtCqJ/QdtNiieKUsrl2jIjIH86Wych68R3mBc=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
click
|
||||
pyhanko-certvalidator
|
||||
pytz
|
||||
pyyaml
|
||||
qrcode
|
||||
tzlocal
|
||||
] ++ lib.optionals (extraPubkeyAlgsSupport) [
|
||||
oscrypto
|
||||
] ++ lib.optionals (opentypeSupport) [
|
||||
fonttools
|
||||
uharfbuzz
|
||||
] ++ lib.optionals (imageSupport) [
|
||||
pillow
|
||||
python-barcode
|
||||
] ++ lib.optionals (pkcs11Support) [
|
||||
python-pkcs11
|
||||
] ++ lib.optionals (asyncHttpSupport) [
|
||||
aiohttp
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace ", 'pytest-runner'" "" \
|
||||
--replace "pytest-aiohttp~=0.3.0" "pytest-aiohttp~=1.0.3"
|
||||
'';
|
||||
|
||||
checkInputs = [
|
||||
aiohttp
|
||||
certomancer
|
||||
freezegun
|
||||
python-pae
|
||||
pytest-aiohttp
|
||||
requests-mock
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
disabledTestPaths = lib.optionals (!opentypeSupport) [
|
||||
"pyhanko_tests/test_stamp.py"
|
||||
"pyhanko_tests/test_text.py"
|
||||
] ++ lib.optionals (!imageSupport) [
|
||||
"pyhanko_tests/test_barcode.py"
|
||||
] ++ lib.optionals (!pkcs11Support) [
|
||||
"pyhanko_tests/test_pkcs11.py"
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# Most of the test require working with local certificates,
|
||||
# contacting OSCP or performing requests
|
||||
"test_generic_data_sign_legacy"
|
||||
"test_generic_data_sign"
|
||||
"test_cms_v3_sign"
|
||||
"test_detached_cms_with_self_reported_timestamp"
|
||||
"test_detached_cms_with_tst"
|
||||
"test_detached_cms_with_content_tst"
|
||||
"test_detached_cms_with_wrong_content_tst"
|
||||
"test_detached_with_malformed_content_tst"
|
||||
"test_noop_attribute_prov"
|
||||
"test_detached_cades_cms_with_tst"
|
||||
"test_read_qr_config"
|
||||
"test_no_changes_policy"
|
||||
"test_bogus_metadata_manipulation"
|
||||
"test_tamper_sig_obj"
|
||||
"test_signed_file_diff_proxied_objs"
|
||||
"test_pades_revinfo_live"
|
||||
"test_diff_fallback_ok"
|
||||
"test_no_diff_summary"
|
||||
"test_ocsp_embed"
|
||||
"test_ts_fetch_aiohttp"
|
||||
"test_ts_fetch_requests"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"pyhanko"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Sign and stamp PDF files";
|
||||
homepage = "https://github.com/MatthiasValvekens/pyHanko";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ wolfangaukang ];
|
||||
};
|
||||
}
|
|
@ -8,14 +8,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyplaato";
|
||||
version = "0.0.17";
|
||||
version = "0.0.18";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-fd7gHDah5yoqpH5d3bwEDsIfeflXzXevJLMD7lvz180=";
|
||||
hash = "sha256-HZF3Yxb/dTQSVzTkdAbfeD1Zyf8jFHoF3nt6OcdCnAM=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -12,11 +12,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pytest-mpl";
|
||||
version = "0.14.0";
|
||||
version = "0.15.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-iE4HjS1TgK9WQzhOIzw1jpZZgl+y2X/9r48YXENMjYk=";
|
||||
sha256 = "sha256-p5/UKLVoDYclp2o/MBb2oX1pHzxsQpHjmfwU1kFSKbw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
48
pkgs/development/python-modules/python-barcode/default.nix
Normal file
48
pkgs/development/python-modules/python-barcode/default.nix
Normal file
|
@ -0,0 +1,48 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, pythonOlder
|
||||
, setuptools-scm
|
||||
, imagesSupport ? false
|
||||
, pillow
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "python-barcode";
|
||||
version = "0.13.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-+vukqiTp2Wl3e+UhwpT/GPbCs2rWO1/C8hCNly4jslI=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
setuptools-scm
|
||||
] ++ lib.optionals (imagesSupport) [
|
||||
pillow
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.cfg \
|
||||
--replace "--cov=barcode" "" \
|
||||
--replace "--cov-report=term-missing:skip-covered" "" \
|
||||
--replace "--no-cov-on-fail" ""
|
||||
'';
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "barcode" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Create standard barcodes with Python";
|
||||
homepage = "https://github.com/WhyNotHugo/python-barcode";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ wolfangaukang ];
|
||||
};
|
||||
}
|
39
pkgs/development/python-modules/python-pae/default.nix
Normal file
39
pkgs/development/python-modules/python-pae/default.nix
Normal file
|
@ -0,0 +1,39 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pythonOlder
|
||||
, poetry-core
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "python-pae";
|
||||
version = "0.1.0";
|
||||
format = "pyproject";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
# Tests are on GitHub
|
||||
src = fetchFromGitHub {
|
||||
owner = "MatthiasValvekens";
|
||||
repo = "python-pae";
|
||||
rev = version;
|
||||
sha256 = "sha256-D0X2T0ze79KR6Gno4UWpA/XvlkK6Y/jXUtLbzlOKr3E=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "python_pae" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Pre-authentication encoding (PAE) implementation in Python";
|
||||
homepage = "https://github.com/MatthiasValvekens/python-pae";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ wolfangaukang ];
|
||||
};
|
||||
}
|
24
pkgs/development/python-modules/pyttsx3/default.nix
Normal file
24
pkgs/development/python-modules/pyttsx3/default.nix
Normal file
|
@ -0,0 +1,24 @@
|
|||
{ lib, buildPythonPackage, fetchPypi, espeak-ng }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyttsx3";
|
||||
version = "2.90";
|
||||
format = "wheel";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version format;
|
||||
sha256 = "a585b6d8cffc19bd92db1e0ccbd8aa9c6528dd2baa5a47045d6fed542a44aa19";
|
||||
dist = "py3";
|
||||
python = "py3";
|
||||
};
|
||||
|
||||
# This package has no tests
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Offline text-to-speech synthesis library";
|
||||
homepage = "https://github.com/nateshmbhat/pyttsx3";
|
||||
license = licenses.mpl20;
|
||||
maintainers = [ maintainers.ethindp ];
|
||||
};
|
||||
}
|
|
@ -40,15 +40,15 @@ let
|
|||
in
|
||||
buildPythonPackage rec {
|
||||
pname = "qiskit-ibmq-provider";
|
||||
version = "0.19.0";
|
||||
version = "0.19.1";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Qiskit";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-ODu8OgGpzlMjRX7ebMu4DXKj6jUyohCq4Hb8aV5eWIU=";
|
||||
rev = "refs/tags/${version}";
|
||||
sha256 = "sha256-VdGdaOxCwD2Qa0JCCDVZJtcjhmTssS/KgpcjoaPXYB8=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -55,7 +55,7 @@ in
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "qiskit-terra";
|
||||
version = "0.20.0";
|
||||
version = "0.20.1";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
|
@ -63,7 +63,7 @@ buildPythonPackage rec {
|
|||
owner = "qiskit";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-/t87IgazpJlfd8NT2Pkn5b6/Ut104DcJEFCubQ/bBiw=";
|
||||
sha256 = "sha256-spKLPUlUXBmnIo/rnBPUFf72Vxd53xFhh409KzytpkI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools-rust ] ++ (with rustPlatform; [ rust.rustc rust.cargo cargoSetupHook ]);
|
||||
|
@ -71,7 +71,7 @@ buildPythonPackage rec {
|
|||
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||
inherit src;
|
||||
name = "${pname}-${version}";
|
||||
sha256 = "sha256-tNiBXn32g1PTuTmKNXSac+4PLSc1Ao9n+oAMfvVYR30=";
|
||||
sha256 = "sha256-KNx7c5Jc1AWIpldMQ1AcWYuMb4W+yLY/cgB87hzPuVY=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -28,7 +28,7 @@ in
|
|||
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.36.0";
|
||||
version = "0.36.1";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
|
@ -36,7 +36,7 @@ buildPythonPackage rec {
|
|||
owner = "Qiskit";
|
||||
repo = "qiskit";
|
||||
rev = version;
|
||||
sha256 = "sha256-zTdvROru56/HNpoHKSVe3pQZeDSMFmaTCUAr1FOaE5A=";
|
||||
sha256 = "sha256-cprFWWvYgfoJXvK0Xoi67BwOXQfz7XeHT/JbfErqblk=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -4,7 +4,6 @@
|
|||
, cython
|
||||
, git
|
||||
, pkgconfig
|
||||
, pytest-runner
|
||||
, setuptools-scm
|
||||
, future
|
||||
, numpy
|
||||
|
@ -31,11 +30,15 @@ buildPythonPackage rec {
|
|||
leaveDotGit = true;
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace '"pytest-runner",' ""
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
cython
|
||||
git
|
||||
pkgconfig
|
||||
pytest-runner
|
||||
setuptools-scm
|
||||
];
|
||||
|
||||
|
|
|
@ -7,14 +7,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "stripe";
|
||||
version = "2.73.0";
|
||||
version = "2.74.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-Z5JG1mPaX7OElL48OoIljUdqu4TKrmfwrh85Z81i0zo=";
|
||||
hash = "sha256-+o7StcJBv9peiYTWBnIfnDUqodiG3sVQJBbKBOALktA=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
45
pkgs/development/python-modules/uharfbuzz/default.nix
Normal file
45
pkgs/development/python-modules/uharfbuzz/default.nix
Normal file
|
@ -0,0 +1,45 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pythonOlder
|
||||
, cython
|
||||
, setuptools-scm
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "uharfbuzz";
|
||||
version = "0.24.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.5";
|
||||
|
||||
# Fetching from GitHub as Pypi contains different versions
|
||||
src = fetchFromGitHub {
|
||||
owner = "harfbuzz";
|
||||
repo = "uharfbuzz";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-DyFXbwB28JH2lvmWDezRh49tjCvleviUNSE5LHG3kUg=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
||||
nativeBuildInputs = [
|
||||
cython
|
||||
setuptools-scm
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "uharfbuzz" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Streamlined Cython bindings for the harfbuzz shaping engine";
|
||||
homepage = "https://github.com/harfbuzz/uharfbuzz";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ wolfangaukang ];
|
||||
};
|
||||
}
|
45
pkgs/development/python-modules/wifi/default.nix
Normal file
45
pkgs/development/python-modules/wifi/default.nix
Normal file
|
@ -0,0 +1,45 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pbkdf2
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, substituteAll
|
||||
, wirelesstools
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "wifi";
|
||||
version = "0.3.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rockymeza";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-scg/DvApvyQZtzDgkHFJzf9gCRfJgBvZ64CG/c2Cx8E=";
|
||||
};
|
||||
|
||||
disabled = pythonOlder "2.6";
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace wifi/scan.py \
|
||||
--replace "/sbin/iwlist" "${wirelesstools}/bin/iwlist"
|
||||
'';
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
pbkdf2
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "wifi" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Provides a command line wrapper for iwlist and /etc/network/interfaces";
|
||||
homepage = "https://github.com/rockymeza/wifi";
|
||||
maintainers = with maintainers; [ rhoriguchi ];
|
||||
license = licenses.bsd2;
|
||||
};
|
||||
}
|
|
@ -4,6 +4,7 @@
|
|||
, fetchFromGitHub
|
||||
, html5lib
|
||||
, pillow
|
||||
, pyhanko
|
||||
, pypdf3
|
||||
, pytestCheckHook
|
||||
, python-bidi
|
||||
|
@ -14,22 +15,25 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "xhtml2pdf";
|
||||
version = "0.2.6";
|
||||
version = "0.2.7";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
# Tests are only available on GitHub
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-EyIERvAC98LqPTMCdwWqTkm1RiMhikscL0tnMZUHIT8=";
|
||||
# Currently it is not possible to fetch from version as there is a branch with the same name
|
||||
rev = "afa72cdbbdaf7d459261c1605263101ffcd999af";
|
||||
sha256 = "sha256-plyIM7Ohnp5UBWz/UDTJa1UeWK9yckSZR16wxmLrpnc=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
arabic-reshaper
|
||||
html5lib
|
||||
pillow
|
||||
pyhanko
|
||||
pypdf3
|
||||
python-bidi
|
||||
reportlab
|
||||
|
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "zwave-js-server-python";
|
||||
version = "0.35.2";
|
||||
version = "0.35.3";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
|||
owner = "home-assistant-libs";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-Bte4pAi+atdkMvxYlzdN/UOrHB2WKfl44U9m/vKFMoA=";
|
||||
sha256 = "sha256-vM5GEqq32VdC5UjGVlnrN8/LRcCHHkJFzEbaA2Snte8=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -9,7 +9,7 @@ let
|
|||
common = { scalaVersion, sha256 }:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ammonite";
|
||||
version = "2.5.2";
|
||||
version = "2.5.3";
|
||||
|
||||
src = fetchurl {
|
||||
url =
|
||||
|
@ -83,10 +83,10 @@ let
|
|||
in {
|
||||
ammonite_2_12 = common {
|
||||
scalaVersion = "2.12";
|
||||
sha256 = "sha256-vj0Ze+Tn8jgq1mIVZWq2q768vW6fNXHB28gMcB9bWHU=";
|
||||
sha256 = "sha256-Iov55ohFjcGhur5UEng7aAZJPVua1H/JaKKW6OKS6Zg=";
|
||||
};
|
||||
ammonite_2_13 = common {
|
||||
scalaVersion = "2.13";
|
||||
sha256 = "sha256-ZuPyZFD3/VRP/GegcKqXZm3bveQB/Xr5E39eQktDCJI=";
|
||||
sha256 = "sha256-dzUhKUQDHrYZ4WyCk4z4CTxb6vK05qfApR/WPOwhA5s=";
|
||||
};
|
||||
}
|
||||
|
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "actionlint";
|
||||
version = "1.6.11";
|
||||
version = "1.6.12";
|
||||
|
||||
subPackages = [ "cmd/actionlint" ];
|
||||
|
||||
|
@ -18,7 +18,7 @@ buildGoModule rec {
|
|||
owner = "rhysd";
|
||||
repo = "actionlint";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-BlJxgRDnAlfM/81qAEGEW09luScivYSDf5w2lR8hQUA=";
|
||||
sha256 = "sha256-nFHf+X7Onf06o3G77mrfszfrWGq65y3VJffkuAxXk50=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-nG0u5hZ/YRn+yUoEGTBo6ZdOp0e+sH6Jl9F+QhpfYAU=";
|
||||
|
|
|
@ -32,13 +32,13 @@ with py.pkgs;
|
|||
|
||||
buildPythonApplication rec {
|
||||
pname = "checkov";
|
||||
version = "2.0.1075";
|
||||
version = "2.0.1076";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bridgecrewio";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-5KAmIJngrs4nvjLJsaUrbgZsMFe0eTTDiwquyguvKLI=";
|
||||
hash = "sha256-LDO4f8SHyTtJp9zOF+exCrNAMhNoIERqHRk11BJgrFs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with py.pkgs; [
|
||||
|
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cppcheck";
|
||||
version = "2.7.4";
|
||||
version = "2.7.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "danmar";
|
||||
repo = "cppcheck";
|
||||
rev = version;
|
||||
sha256 = "sha256-bMDH3TRAdDoI1AaHTpIl4P/yk9wsV0ReNh6bMmCsKys=";
|
||||
sha256 = "sha256-GRhQXGldirIhUBI4CucDTTxuZhG0XW0qp1FjYXhVS0o=";
|
||||
};
|
||||
|
||||
buildInputs = [ pcre
|
||||
|
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "flow";
|
||||
version = "0.175.1";
|
||||
version = "0.176.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "facebook";
|
||||
repo = "flow";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-40Kc/Qg0ppTQLU2ySbKXZyhap3hH4BiIMhJeNDU6mKA=";
|
||||
sha256 = "sha256-/4wEafdmrXj4ALUVYx8DM9XyRP/wvbwAl0St1S/+9Ws=";
|
||||
};
|
||||
|
||||
makeFlags = [ "FLOW_RELEASE=1" ];
|
||||
|
|
|
@ -10,16 +10,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "buf";
|
||||
version = "1.3.0";
|
||||
version = "1.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bufbuild";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-rOT7HuvbJFRyBOmCNmx5Vic4zckYgS+1BB0PcpwD9OQ=";
|
||||
sha256 = "sha256-cKb9pZYEsO1thgtl/8XFJHpNrO6P3OR8Lox/Gf9ccYk=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-qIWZYsl1hFV4Ts27WSyjQAQ+jWjtLLG+A+yS0Ms7hfI=";
|
||||
vendorSha256 = "sha256-zXLvKEdiIFnmwWQBgbJHCEBe2i7FobgeUOnA3LvHl8w=";
|
||||
|
||||
patches = [
|
||||
# Skip a test that requires networking to be available to work.
|
||||
|
|
|
@ -19,7 +19,7 @@ tupConfigurePhase() {
|
|||
echo "${tupConfig-}" >> tup.config
|
||||
|
||||
tup init
|
||||
tup generate tupBuild.sh
|
||||
tup generate --verbose tupBuild.sh
|
||||
|
||||
runHook postConfigure
|
||||
}
|
||||
|
@ -33,7 +33,7 @@ tupBuildPhase() {
|
|||
runHook preBuild
|
||||
|
||||
pushd .
|
||||
. tupBuild.sh
|
||||
./tupBuild.sh
|
||||
popd
|
||||
|
||||
runHook postBuild
|
||||
|
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "checkmate";
|
||||
version = "0.5.8";
|
||||
version = "0.5.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "adedayo";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-nzhzeXy70UQ1HP3/PCBnUPhrjg7CnKURMCH0iJ099E0=";
|
||||
sha256 = "sha256-V7b8NEKzS4wDIhFJkAve94Tl3tzYtnbG01GzyRj8yfA=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-uQRAVbLnzY+E3glMJ3AvmbtmwD2LkuqCh2mUpqZbmaA=";
|
||||
|
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "efm-langserver";
|
||||
version = "0.0.42";
|
||||
version = "0.0.44";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mattn";
|
||||
repo = "efm-langserver";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-1IAPtqIozp9Wp3L95mmhFuWvWvCDuTh1VsCVaJSzyfk=";
|
||||
sha256 = "sha256-+yN08MAoFaixvt2EexhRNucG6I4v2FdHf44XlYIwzhA=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-KABezphT5/o3XWSFNe2OvfawFR8uwsGMnjsI9xh378Q=";
|
||||
|
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "circleci-cli";
|
||||
version = "0.1.17110";
|
||||
version = "0.1.17142";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "CircleCI-Public";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-zCX6LWIPiHDOnSBE+BeePjeQ1evTWhLY0Pqk7NmMMlc=";
|
||||
sha256 = "sha256-69GGJfnOHry+N3hKZapKz6eFSerqIHt4wRAhm/q/SOQ=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-7u2y1yBVpXf+D19tslD4s3B1KmABl4OWNzzLaBNL/2U=";
|
||||
|
|
23
pkgs/development/tools/misc/patchelf/0.13.nix
Normal file
23
pkgs/development/tools/misc/patchelf/0.13.nix
Normal file
|
@ -0,0 +1,23 @@
|
|||
{ stdenv, fetchurl, patchelf }:
|
||||
|
||||
# Note: this package is used for bootstrapping fetchurl, and thus
|
||||
# cannot use fetchpatch! All mutable patches (generated by GitHub or
|
||||
# cgit) that are needed here should be included directly in Nixpkgs as
|
||||
# files.
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "patchelf";
|
||||
version = "0.13.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/NixOS/${pname}/releases/download/${version}/${pname}-${version}.tar.bz2";
|
||||
sha256 = "sha256-OeiuzNdJXVTfCU0rSnwIAQ/3d3A2+q8k8o4Hd30VmOI=";
|
||||
};
|
||||
|
||||
setupHook = [ ./setup-hook.sh ];
|
||||
|
||||
# fails 8 out of 24 tests, problems when loading libc.so.6
|
||||
doCheck = stdenv.name == "stdenv-linux";
|
||||
|
||||
inherit (patchelf) meta;
|
||||
}
|
|
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/NixOS/patchelf";
|
||||
license = licenses.gpl3;
|
||||
license = licenses.gpl3Plus;
|
||||
description = "A small utility to modify the dynamic linker and RPATH of ELF executables";
|
||||
maintainers = [ maintainers.eelco ];
|
||||
platforms = platforms.all;
|
||||
|
|
|
@ -1,10 +1,10 @@
|
|||
{ lib, fetchurl, makeDesktopItem, appimageTools, gtk3 }:
|
||||
let
|
||||
name = "saleae-logic-2";
|
||||
version = "2.3.47";
|
||||
version = "2.3.50";
|
||||
src = fetchurl {
|
||||
url = "https://downloads.saleae.com/logic2/Logic-${version}-master.AppImage";
|
||||
sha256 = "sha256-6/FtdupveKnbAK6LizmJ6BokE0kXgUaMz0sOWi+Fq8k=";
|
||||
sha256 = "sha256-jkdFdgiSP2ssrUajl85FA4E21Qi6BUgrjKFdlBYyG7c=";
|
||||
};
|
||||
desktopItem = makeDesktopItem {
|
||||
inherit name;
|
||||
|
|
|
@ -12,13 +12,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mold";
|
||||
version = "1.1.1";
|
||||
version = "1.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rui314";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-+uPVt3w3A25JFyENxqhAcjZMRzSowi2uHwGjkeQP8Og=";
|
||||
sha256 = "sha256-KmFNe22XltSrxlINOH/3w79P1CGHwPkxKVyKMD5OcCc=";
|
||||
};
|
||||
|
||||
buildInputs = [ zlib openssl ];
|
||||
|
|
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue