Merge master into haskell-updates

This commit is contained in:
github-actions[bot] 2021-07-28 00:06:03 +00:00 committed by GitHub
commit 62c8cb1826
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
147 changed files with 1049 additions and 585 deletions

View file

@ -537,7 +537,13 @@ Note that because the checksum is computed after applying these effects, using o
Tests are important to ensure quality and make reviews and automatic updates easy. Tests are important to ensure quality and make reviews and automatic updates easy.
Nix package tests are a lightweight alternative to [NixOS module tests](https://nixos.org/manual/nixos/stable/#sec-nixos-tests). They can be used to create simple integration tests for packages while the module tests are used to test services or programs with a graphical user interface on a NixOS VM. Unittests that are included in the source code of a package should be executed in the `checkPhase`. The following types of tests exists:
* [NixOS **module tests**](https://nixos.org/manual/nixos/stable/#sec-nixos-tests), which spawn one or more NixOS VMs. They exercise both NixOS modules and the packaged programs used within them. For example, a NixOS module test can start a web server VM running the `nginx` module, and a client VM running `curl` or a graphical `firefox`, and test that they can talk to each other and display the correct content.
* Nix **package tests** are a lightweight alternative to NixOS module tests. They should be used to create simple integration tests for packages, but cannot test NixOS services, and some programs with graphical user interfaces may also be difficult to test with them.
* The **`checkPhase` of a package**, which should execute the unit tests that are included in the source code of a package.
Here in the nixpkgs manual we describe mostly _package tests_; for _module tests_ head over to the corresponding [section in the NixOS manual](https://nixos.org/manual/nixos/stable/#sec-nixos-tests).
### Writing package tests {#ssec-package-tests-writing} ### Writing package tests {#ssec-package-tests-writing}
@ -602,3 +608,23 @@ Here are examples of package tests:
- [Spacy annotation test](https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/python-modules/spacy/annotation-test/default.nix) - [Spacy annotation test](https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/python-modules/spacy/annotation-test/default.nix)
- [Libtorch test](https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/libraries/science/math/libtorch/test/default.nix) - [Libtorch test](https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/libraries/science/math/libtorch/test/default.nix)
- [Multiple tests for nanopb](https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/libraries/nanopb/default.nix) - [Multiple tests for nanopb](https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/libraries/nanopb/default.nix)
### Linking NixOS module tests to a package {#ssec-nixos-tests-linking}
Like [package tests](#ssec-package-tests-writing) as shown above, [NixOS module tests](https://nixos.org/manual/nixos/stable/#sec-nixos-tests) can also be linked to a package, so that the tests can be easily run when changing the related package.
For example, assuming we're packaging `nginx`, we can link its module test via `passthru.tests`:
```nix
{ stdenv, lib, nixosTests }:
stdenv.mkDerivation {
...
passthru.tests = {
nginx = nixosTests.nginx;
};
...
}
```

View file

@ -5,7 +5,7 @@ let
inherit (builtins) head tail length; inherit (builtins) head tail length;
inherit (lib.trivial) and; inherit (lib.trivial) and;
inherit (lib.strings) concatStringsSep sanitizeDerivationName; inherit (lib.strings) concatStringsSep sanitizeDerivationName;
inherit (lib.lists) fold concatMap concatLists; inherit (lib.lists) fold foldr concatMap concatLists;
in in
rec { rec {
@ -152,8 +152,8 @@ rec {
=> { a = [ 2 3 ]; } => { a = [ 2 3 ]; }
*/ */
foldAttrs = op: nul: list_of_attrs: foldAttrs = op: nul: list_of_attrs:
fold (n: a: foldr (n: a:
fold (name: o: foldr (name: o:
o // { ${name} = op n.${name} (a.${name} or nul); } o // { ${name} = op n.${name} (a.${name} or nul); }
) a (attrNames n) ) a (attrNames n)
) {} list_of_attrs; ) {} list_of_attrs;
@ -455,7 +455,7 @@ rec {
=> true => true
*/ */
matchAttrs = pattern: attrs: assert isAttrs pattern; matchAttrs = pattern: attrs: assert isAttrs pattern;
fold and true (attrValues (zipAttrsWithNames (attrNames pattern) (n: values: foldr and true (attrValues (zipAttrsWithNames (attrNames pattern) (n: values:
let pat = head values; val = head (tail values); in let pat = head values; val = head (tail values); in
if length values == 1 then false if length values == 1 then false
else if isAttrs pat then isAttrs val && matchAttrs pat val else if isAttrs pat then isAttrs val && matchAttrs pat val

View file

@ -77,11 +77,11 @@ rec {
# Output : are reqs satisfied? It's asserted. # Output : are reqs satisfied? It's asserted.
checkReqs = attrSet: argList: condList: checkReqs = attrSet: argList: condList:
( (
fold lib.and true foldr lib.and true
(map (x: let name = (head x); in (map (x: let name = (head x); in
((checkFlag attrSet name) -> ((checkFlag attrSet name) ->
(fold lib.and true (foldr lib.and true
(map (y: let val=(getValue attrSet argList y); in (map (y: let val=(getValue attrSet argList y); in
(val!=null) && (val!=false)) (val!=null) && (val!=false))
(tail x))))) condList)); (tail x))))) condList));
@ -177,7 +177,7 @@ rec {
# merge attributes with custom function handling the case that the attribute # merge attributes with custom function handling the case that the attribute
# exists in both sets # exists in both sets
mergeAttrsWithFunc = f: set1: set2: mergeAttrsWithFunc = f: set1: set2:
fold (n: set: if set ? ${n} foldr (n: set: if set ? ${n}
then setAttr set n (f set.${n} set2.${n}) then setAttr set n (f set.${n} set2.${n})
else set ) else set )
(set2 // set1) (attrNames set2); (set2 // set1) (attrNames set2);
@ -196,7 +196,7 @@ rec {
mergeAttrsNoOverride = { mergeLists ? ["buildInputs" "propagatedBuildInputs"], mergeAttrsNoOverride = { mergeLists ? ["buildInputs" "propagatedBuildInputs"],
overrideSnd ? [ "buildPhase" ] overrideSnd ? [ "buildPhase" ]
}: attrs1: attrs2: }: attrs1: attrs2:
fold (n: set: foldr (n: set:
setAttr set n ( if set ? ${n} setAttr set n ( if set ? ${n}
then # merge then # merge
if elem n mergeLists # attribute contains list, merge them by concatenating if elem n mergeLists # attribute contains list, merge them by concatenating
@ -224,7 +224,7 @@ rec {
mergeAttrBy2 = { mergeAttrBy = lib.mergeAttrs; } mergeAttrBy2 = { mergeAttrBy = lib.mergeAttrs; }
// (maybeAttr "mergeAttrBy" {} x) // (maybeAttr "mergeAttrBy" {} x)
// (maybeAttr "mergeAttrBy" {} y); in // (maybeAttr "mergeAttrBy" {} y); in
fold lib.mergeAttrs {} [ foldr lib.mergeAttrs {} [
x y x y
(mapAttrs ( a: v: # merge special names using given functions (mapAttrs ( a: v: # merge special names using given functions
if x ? ${a} if x ? ${a}

View file

@ -308,7 +308,7 @@ rec {
info = msg: builtins.trace "INFO: ${msg}"; info = msg: builtins.trace "INFO: ${msg}";
showWarnings = warnings: res: lib.fold (w: x: warn w x) res warnings; showWarnings = warnings: res: lib.foldr (w: x: warn w x) res warnings;
## Function annotations ## Function annotations

View file

@ -4939,6 +4939,12 @@
fingerprint = "7EB1 C02A B62B B464 6D7C E4AE D1D0 9DE1 69EA 19A0"; fingerprint = "7EB1 C02A B62B B464 6D7C E4AE D1D0 9DE1 69EA 19A0";
}]; }];
}; };
jgart = {
email = "jgart@dismail.de";
github = "jgarte";
githubId = 47760695;
name = "Jorge Gomez";
};
jgeerds = { jgeerds = {
email = "jascha@geerds.org"; email = "jascha@geerds.org";
github = "jgeerds"; github = "jgeerds";

View file

@ -12,7 +12,7 @@ let
# E.g. if some `options` came from modules in ${pkgs.customModules}/nix, # E.g. if some `options` came from modules in ${pkgs.customModules}/nix,
# you'd need to include `extraSources = [ pkgs.customModules ]` # you'd need to include `extraSources = [ pkgs.customModules ]`
prefixesToStrip = map (p: "${toString p}/") ([ ../../.. ] ++ extraSources); prefixesToStrip = map (p: "${toString p}/") ([ ../../.. ] ++ extraSources);
stripAnyPrefixes = lib.flip (lib.fold lib.removePrefix) prefixesToStrip; stripAnyPrefixes = lib.flip (lib.foldr lib.removePrefix) prefixesToStrip;
optionsDoc = buildPackages.nixosOptionsDoc { optionsDoc = buildPackages.nixosOptionsDoc {
inherit options revision; inherit options revision;

View file

@ -0,0 +1,6 @@
# Linking NixOS tests to packages {#sec-linking-nixos-tests-to-packages}
You can link NixOS module tests to the packages that they exercised,
so that the tests can be run automatically during code review when the package gets changed.
This is
[described in the nixpkgs manual](https://nixos.org/manual/nixpkgs/stable/#ssec-nixos-tests-linking).

View file

@ -16,4 +16,5 @@ xlink:href="https://github.com/NixOS/nixpkgs/tree/master/nixos/tests">nixos/test
<xi:include href="../from_md/development/writing-nixos-tests.section.xml" /> <xi:include href="../from_md/development/writing-nixos-tests.section.xml" />
<xi:include href="../from_md/development/running-nixos-tests.section.xml" /> <xi:include href="../from_md/development/running-nixos-tests.section.xml" />
<xi:include href="../from_md/development/running-nixos-tests-interactively.section.xml" /> <xi:include href="../from_md/development/running-nixos-tests-interactively.section.xml" />
<xi:include href="../from_md/development/linking-nixos-tests-to-packages.section.xml" />
</chapter> </chapter>

View file

@ -0,0 +1,10 @@
<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-linking-nixos-tests-to-packages">
<title>Linking NixOS tests to packages</title>
<para>
You can link NixOS module tests to the packages that they exercised,
so that the tests can be run automatically during code review when
the package gets changed. This is
<link xlink:href="https://nixos.org/manual/nixpkgs/stable/#ssec-nixos-tests-linking">described
in the nixpkgs manual</link>.
</para>
</section>

View file

@ -396,7 +396,7 @@ let
}; };
}; };
idsAreUnique = set: idAttr: !(fold (name: args@{ dup, acc }: idsAreUnique = set: idAttr: !(foldr (name: args@{ dup, acc }:
let let
id = builtins.toString (builtins.getAttr idAttr (builtins.getAttr name set)); id = builtins.toString (builtins.getAttr idAttr (builtins.getAttr name set));
exists = builtins.hasAttr id acc; exists = builtins.hasAttr id acc;

View file

@ -35,6 +35,14 @@ in {
''; '';
}; };
hardware.wirelessRegulatoryDatabase = mkOption {
default = false;
type = types.bool;
description = ''
Load the wireless regulatory database at boot.
'';
};
}; };
@ -58,6 +66,7 @@ in {
++ optionals (versionOlder config.boot.kernelPackages.kernel.version "4.13") [ ++ optionals (versionOlder config.boot.kernelPackages.kernel.version "4.13") [
rtl8723bs-firmware rtl8723bs-firmware
]; ];
hardware.wirelessRegulatoryDatabase = true;
}) })
(mkIf cfg.enableAllFirmware { (mkIf cfg.enableAllFirmware {
assertions = [{ assertions = [{
@ -75,5 +84,8 @@ in {
b43FirmwareCutter b43FirmwareCutter
] ++ optional (pkgs.stdenv.hostPlatform.isi686 || pkgs.stdenv.hostPlatform.isx86_64) facetimehd-firmware; ] ++ optional (pkgs.stdenv.hostPlatform.isi686 || pkgs.stdenv.hostPlatform.isx86_64) facetimehd-firmware;
}) })
(mkIf cfg.wirelessRegulatoryDatabase {
hardware.firmware = [ pkgs.wireless-regdb ];
})
]; ];
} }

View file

@ -39,7 +39,7 @@ let
if c x then true if c x then true
else lib.traceSeqN 1 x false; else lib.traceSeqN 1 x false;
in traceXIfNot isConfig; in traceXIfNot isConfig;
merge = args: fold (def: mergeConfig def.value) {}; merge = args: foldr (def: mergeConfig def.value) {};
}; };
overlayType = mkOptionType { overlayType = mkOptionType {

View file

@ -279,7 +279,7 @@ let
src_plan = plan; src_plan = plan;
tsformat = timestampFormat; tsformat = timestampFormat;
zend_delay = toString sendDelay; zend_delay = toString sendDelay;
} // fold (a: b: a // b) {} ( } // foldr (a: b: a // b) {} (
map mkDestAttrs (builtins.attrValues destinations) map mkDestAttrs (builtins.attrValues destinations)
); );

View file

@ -194,7 +194,7 @@ let
# We need to handle the last column specially here, because it's # We need to handle the last column specially here, because it's
# open-ended (command + args). # open-ended (command + args).
lines = [ labels labelDefaults ] ++ (map (l: init l ++ [""]) masterCf); lines = [ labels labelDefaults ] ++ (map (l: init l ++ [""]) masterCf);
in fold foldLine (genList (const 0) (length labels)) lines; in foldr foldLine (genList (const 0) (length labels)) lines;
# Pad a string with spaces from the right (opposite of fixedWidthString). # Pad a string with spaces from the right (opposite of fixedWidthString).
pad = width: str: let pad = width: str: let
@ -203,7 +203,7 @@ let
in str + optionalString (padWidth > 0) padding; in str + optionalString (padWidth > 0) padding;
# It's + 2 here, because that's the amount of spacing between columns. # It's + 2 here, because that's the amount of spacing between columns.
fullWidth = fold (width: acc: acc + width + 2) 0 maxWidths; fullWidth = foldr (width: acc: acc + width + 2) 0 maxWidths;
formatLine = line: concatStringsSep " " (zipListsWith pad maxWidths line); formatLine = line: concatStringsSep " " (zipListsWith pad maxWidths line);

View file

@ -79,7 +79,7 @@ in
systemd.services = systemd.services =
lib.fold ( s : acc : acc // lib.foldr ( s : acc : acc //
{ {
"autossh-${s.name}" = "autossh-${s.name}" =
let let

View file

@ -6,7 +6,6 @@ let
cfg = config.networking.networkmanager; cfg = config.networking.networkmanager;
basePackages = with pkgs; [ basePackages = with pkgs; [
crda
modemmanager modemmanager
networkmanager networkmanager
networkmanager-fortisslvpn networkmanager-fortisslvpn
@ -404,6 +403,8 @@ in {
} }
]; ];
hardware.wirelessRegulatoryDatabase = true;
environment.etc = with pkgs; { environment.etc = with pkgs; {
"NetworkManager/NetworkManager.conf".source = configFile; "NetworkManager/NetworkManager.conf".source = configFile;

View file

@ -160,7 +160,7 @@ in
users.groups.nylon.gid = config.ids.gids.nylon; users.groups.nylon.gid = config.ids.gids.nylon;
systemd.services = fold (a: b: a // b) {} nylonUnits; systemd.services = foldr (a: b: a // b) {} nylonUnits;
}; };
} }

View file

@ -87,7 +87,7 @@ with lib;
}; };
config = mkIf (cfg != []) { config = mkIf (cfg != []) {
systemd.services = fold (a: b: a // b) {} ( systemd.services = foldr (a: b: a // b) {} (
mapAttrsToList (name: qtcfg: { mapAttrsToList (name: qtcfg: {
"quicktun-${name}" = { "quicktun-${name}" = {
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];

View file

@ -351,7 +351,7 @@ in
config = mkIf (cfg.networks != { }) { config = mkIf (cfg.networks != { }) {
environment.etc = fold (a: b: a // b) { } environment.etc = foldr (a: b: a // b) { }
(flip mapAttrsToList cfg.networks (network: data: (flip mapAttrsToList cfg.networks (network: data:
flip mapAttrs' data.hosts (host: text: nameValuePair flip mapAttrs' data.hosts (host: text: nameValuePair
("tinc/${network}/hosts/${host}") ("tinc/${network}/hosts/${host}")

View file

@ -19,7 +19,7 @@ let
${ethtool} -s ${interface} ${methodParameter {inherit method password;}} ${ethtool} -s ${interface} ${methodParameter {inherit method password;}}
''; '';
concatStrings = fold (x: y: x + y) ""; concatStrings = foldr (x: y: x + y) "";
lines = concatStrings (map (l: line l) interfaces); lines = concatStrings (map (l: line l) interfaces);
in in

View file

@ -241,7 +241,8 @@ in {
environment.systemPackages = [ package ]; environment.systemPackages = [ package ];
services.dbus.packages = [ package ]; services.dbus.packages = [ package ];
services.udev.packages = [ pkgs.crda ];
hardware.wirelessRegulatoryDatabase = true;
# FIXME: start a separate wpa_supplicant instance per interface. # FIXME: start a separate wpa_supplicant instance per interface.
systemd.services.wpa_supplicant = let systemd.services.wpa_supplicant = let

View file

@ -125,7 +125,7 @@ let
else showWarnings config.warnings baseSystem; else showWarnings config.warnings baseSystem;
# Replace runtime dependencies # Replace runtime dependencies
system = fold ({ oldDependency, newDependency }: drv: system = foldr ({ oldDependency, newDependency }: drv:
pkgs.replaceDependency { inherit oldDependency newDependency drv; } pkgs.replaceDependency { inherit oldDependency newDependency drv; }
) baseSystemAssertWarn config.system.replaceRuntimeDependencies; ) baseSystemAssertWarn config.system.replaceRuntimeDependencies;

View file

@ -75,7 +75,7 @@ let
else "${convertedFont}"); else "${convertedFont}");
}); });
bootDeviceCounters = fold (device: attr: attr // { ${device} = (attr.${device} or 0) + 1; }) {} bootDeviceCounters = foldr (device: attr: attr // { ${device} = (attr.${device} or 0) + 1; }) {}
(concatMap (args: args.devices) cfg.mirroredBoots); (concatMap (args: args.devices) cfg.mirroredBoots);
convertedFont = (pkgs.runCommand "grub-font-converted.pf2" {} convertedFont = (pkgs.runCommand "grub-font-converted.pf2" {}

View file

@ -8,7 +8,7 @@ let
keyedEncDevs = filter (dev: dev.encrypted.keyFile != null) encDevs; keyedEncDevs = filter (dev: dev.encrypted.keyFile != null) encDevs;
keylessEncDevs = filter (dev: dev.encrypted.keyFile == null) encDevs; keylessEncDevs = filter (dev: dev.encrypted.keyFile == null) encDevs;
anyEncrypted = anyEncrypted =
fold (j: v: v || j.encrypted.enable) false encDevs; foldr (j: v: v || j.encrypted.enable) false encDevs;
encryptedFSOptions = { encryptedFSOptions = {

View file

@ -333,15 +333,15 @@ in
set -eu set -eu
# if the pstore module is builtin it will have mounted the persistent store automatically. it may also be already mounted for other reasons. # if the pstore module is builtin it will have mounted the persistent store automatically. it may also be already mounted for other reasons.
${pkgs.util-linux}/bin/mountpoint -q /sys/fs/pstore || ${pkgs.util-linux}/bin/mount -t pstore -o nosuid,noexec,nodev pstore /sys/fs/pstore ${pkgs.util-linux}/bin/mountpoint -q /sys/fs/pstore || ${pkgs.util-linux}/bin/mount -t pstore -o nosuid,noexec,nodev pstore /sys/fs/pstore
# wait up to five seconds (arbitrary, happened within one in testing) for the backend to be registered and the files to appear. a systemd path unit cannot detect this happening; and succeeding after a restart would not start dependent units. # wait up to 1.5 seconds for the backend to be registered and the files to appear. a systemd path unit cannot detect this happening; and succeeding after a restart would not start dependent units.
TRIES=50 TRIES=15
while [ "$(cat /sys/module/pstore/parameters/backend)" = "(null)" ]; do while [ "$(cat /sys/module/pstore/parameters/backend)" = "(null)" ]; do
if (( $TRIES )); then if (( $TRIES )); then
sleep 0.1 sleep 0.1
TRIES=$((TRIES-1)) TRIES=$((TRIES-1))
else else
echo "Persistent Storage backend was not registered in time." >&2 echo "Persistent Storage backend was not registered in time." >&2
exit 1 break
fi fi
done done
''; '';

View file

@ -6,13 +6,13 @@
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
pname = "chia"; pname = "chia";
version = "1.2.2"; version = "1.2.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Chia-Network"; owner = "Chia-Network";
repo = "chia-blockchain"; repo = "chia-blockchain";
rev = version; rev = version;
sha256 = "sha256-ZYncyaX9gqBhDKiC87A2xI7VeU0zGsmm3Sx45lwgnrg="; sha256 = "sha256-yS0/Fy2dj8VIbwv2J9sehP0VN0f/YDxu1k9WkaeEz8M=";
}; };
patches = [ patches = [

View file

@ -2,13 +2,13 @@
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
pname = "lndmanage"; pname = "lndmanage";
version = "0.11.0"; version = "0.12.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "bitromortac"; owner = "bitromortac";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "19sqf7cjslwpfzcdbyq182dx7gnn9hii77sahbnh88v69qxgwzvb"; sha256 = "1p73wdxv3fca2ga4nqpjk5lig7bj2v230lh8niw490p5y7hhnggl";
}; };
propagatedBuildInputs = with python3Packages; [ propagatedBuildInputs = with python3Packages; [

View file

@ -1,6 +1,7 @@
{ lib { lib
, mkDerivation , mkDerivation
, fetchurl , fetchurl
, fetchFromGitHub
, poppler_utils , poppler_utils
, pkg-config , pkg-config
, libpng , libpng
@ -94,7 +95,15 @@ mkDerivation rec {
python python
regex regex
sip sip
zeroconf (zeroconf.overrideAttrs (oldAttrs: rec {
version = "0.31.0";
src = fetchFromGitHub {
owner = "jstasiak";
repo = "python-zeroconf";
rev = version;
sha256 = "158dqay74zvnz6kmpvip4ml0kw59nf2aaajwgaamx0zc8ci1p5pj";
};
}))
# the following are distributed with calibre, but we use upstream instead # the following are distributed with calibre, but we use upstream instead
odfpy odfpy
] ++ lib.optional (unrarSupport) unrardll ] ++ lib.optional (unrarSupport) unrardll

View file

@ -0,0 +1,41 @@
{ mkDerivation, lib, fetchFromGitLab, fetchpatch, qtsvg, qtbase, libcsys, libcprime, cmake, ninja, }:
mkDerivation rec {
pname = "coreaction";
version = "4.2.0";
src = fetchFromGitLab {
owner = "cubocore/coreapps";
repo = pname;
rev = "v${version}";
sha256 = "sha256-5qEZNLvbgLoAOXij0wXoVw2iyvytsYZikSJDm6F6ddc=";
};
patches = [
## Fix Plugin Error: "The shared library was not found." "libbatery.so"
(fetchpatch {
url = "https://gitlab.com/cubocore/coreapps/coreaction/-/commit/1d1307363614a117978723eaad2332e6e8c05b28.patch";
sha256 = "039x19rsm23l9vxd5mnbl6gvc3is0igahf47kv54v6apz2q72l3f";
})
];
nativeBuildInputs = [
cmake
ninja
];
buildInputs = [
qtsvg
qtbase
libcsys
libcprime
];
meta = with lib; {
description = "A side bar for showing widgets from the C Suite";
homepage = "https://gitlab.com/cubocore/coreapps/coreaction";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ dan4ik605743 ];
platforms = platforms.linux;
};
}

View file

@ -21,13 +21,13 @@
stdenv.mkDerivation rec{ stdenv.mkDerivation rec{
pname = "corectrl"; pname = "corectrl";
version = "1.1.3"; version = "1.1.4";
src = fetchFromGitLab { src = fetchFromGitLab {
owner = "corectrl"; owner = "corectrl";
repo = "corectrl"; repo = "corectrl";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-xRyc7FYzG8MnhQ8DjIUHYLeUZCZQdi4j1v1fG7F0+G8="; sha256 = "sha256-o8u9WnkK/6VZ+wlJ9I5Ti6ADjV9VXraRGpSWkDQv5JQ=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View file

@ -0,0 +1,33 @@
{ mkDerivation, lib, fetchFromGitLab, qtbase, libarchive, libarchive-qt, libcprime, cmake, ninja }:
mkDerivation rec {
pname = "coregarage";
version = "4.2.0";
src = fetchFromGitLab {
owner = "cubocore/coreapps";
repo = pname;
rev = "v${version}";
sha256 = "sha256-2pOQwSj+QKwpHVJp7VCyq6QpVW5wLUf/BE7ReXrJ78s=";
};
nativeBuildInputs = [
cmake
ninja
];
buildInputs = [
qtbase
libcprime
libarchive
libarchive-qt
];
meta = with lib; {
description = "A settings manager for the C Suite";
homepage = "https://gitlab.com/cubocore/coreapps/coregarage";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ dan4ik605743 ];
platforms = platforms.linux;
};
}

View file

@ -43,6 +43,20 @@ let
mv ./all/electrum/tests $out mv ./all/electrum/tests $out
''; '';
}; };
py = python3.override {
packageOverrides = self: super: {
aiorpcx = super.aiorpcx.overridePythonAttrs (oldAttrs: rec {
version = "0.18.7";
src = oldAttrs.src.override {
inherit version;
sha256 = "1rswrspv27x33xa5bnhrkjqzhv0sknv5kd7pl1vidw9d2z4rx2l0";
};
});
};
};
in in
python3.pkgs.buildPythonApplication { python3.pkgs.buildPythonApplication {
@ -66,7 +80,7 @@ python3.pkgs.buildPythonApplication {
nativeBuildInputs = lib.optionals enableQt [ wrapQtAppsHook ]; nativeBuildInputs = lib.optionals enableQt [ wrapQtAppsHook ];
propagatedBuildInputs = with python3.pkgs; [ propagatedBuildInputs = with py.pkgs; [
aiohttp aiohttp
aiohttp-socks aiohttp-socks
aiorpcx aiorpcx
@ -87,7 +101,10 @@ python3.pkgs.buildPythonApplication {
ckcc-protocol ckcc-protocol
keepkey keepkey
trezor trezor
] ++ lib.optionals enableQt [ pyqt5 qdarkstyle ]; ] ++ lib.optionals enableQt [
pyqt5
qdarkstyle
];
preBuild = '' preBuild = ''
sed -i 's,usr_share = .*,usr_share = "'$out'/share",g' setup.py sed -i 's,usr_share = .*,usr_share = "'$out'/share",g' setup.py

View file

@ -2,11 +2,11 @@
buildPythonApplication rec { buildPythonApplication rec {
pname = "gallery_dl"; pname = "gallery_dl";
version = "1.18.1"; version = "1.18.2";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "1e231ed7122a753430d92f8c6240a99defa2b307d57f1a4cc3e48910269331a9"; sha256 = "786772ce774929ef1ba64d8394dbab329a72447fd8b930968bc1fb0aacdba567";
}; };
propagatedBuildInputs = [ requests ]; propagatedBuildInputs = [ requests ];

View file

@ -75,15 +75,16 @@ let
in attrs: concatStringsSep " " (attrValues (mapAttrs toFlag attrs)); in attrs: concatStringsSep " " (attrValues (mapAttrs toFlag attrs));
# https://source.chromium.org/chromium/chromium/src/+/master:build/linux/unbundle/replace_gn_files.py # https://source.chromium.org/chromium/chromium/src/+/master:build/linux/unbundle/replace_gn_files.py
gnSystemLibraries = [ gnSystemLibraries = lib.optionals (!chromiumVersionAtLeast "93") [
"ffmpeg" "ffmpeg"
"snappy"
] ++ [
"flac" "flac"
"libjpeg" "libjpeg"
"libpng" "libpng"
"libwebp" "libwebp"
"libxslt" "libxslt"
"opus" "opus"
"snappy"
"zlib" "zlib"
]; ];

View file

@ -31,9 +31,9 @@
} }
}, },
"dev": { "dev": {
"version": "93.0.4577.8", "version": "93.0.4577.15",
"sha256": "1x6i5bmcnj8bkpcb9gcyd1m9nzpq206yyprxrnpak117k7abr2b1", "sha256": "07gbpa1z6cnbmv8008y92ldg53w48rjx0slvgsrw4gk9cnvmnpz0",
"sha256bin64": "0qjfb9jxr2gmwb1dsvl6yzz06vsjny2l3icrsdcm0pl6r6davk2w", "sha256bin64": "0sb3m2mbq6g3mnps7g6xziziwv6sng34410ww5jyx82mw0q0sxig",
"deps": { "deps": {
"gn": { "gn": {
"version": "2021-07-08", "version": "2021-07-08",

View file

@ -4,6 +4,7 @@
, autoPatchelfHook , autoPatchelfHook
, wrapGAppsHook , wrapGAppsHook
, gnome2 , gnome2
, gtk2
, nss , nss
, xdg-utils , xdg-utils
, xorg , xorg
@ -77,7 +78,7 @@ stdenv.mkDerivation rec {
gdk-pixbuf gdk-pixbuf
glib glib
gnome2.GConf gnome2.GConf
gnome2.gtk gtk2
gtk3 gtk3
libX11 libX11
libXScrnSaver libXScrnSaver

View file

@ -2,13 +2,13 @@
buildGoModule rec { buildGoModule rec {
pname = "cloudflared"; pname = "cloudflared";
version = "2021.7.0"; version = "2021.7.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "cloudflare"; owner = "cloudflare";
repo = "cloudflared"; repo = "cloudflared";
rev = version; rev = version;
sha256 = "sha256-FQejuKBDUCCcEq9ZmSMigdvqowTurCYEhOiXQN7exIE="; sha256 = "sha256-p9FNH5obQfEQZRoOr35ORH+6dwbcNgSXjARF9WA7t9E=";
}; };
vendorSha256 = null; vendorSha256 = null;

View file

@ -1,5 +1,14 @@
{ fetchFromGitHub, lib, stdenv, gnome, cmake, pkg-config, { fetchFromGitHub
libappindicator-gtk3, gst_all_1, pcre }: , lib
, stdenv
, gtkmm3
, webkitgtk
, cmake
, pkg-config
, libappindicator-gtk3
, gst_all_1
, pcre
}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "whatsapp-for-linux"; pname = "whatsapp-for-linux";
@ -18,8 +27,8 @@ stdenv.mkDerivation rec {
]; ];
buildInputs = [ buildInputs = [
gnome.gtkmm gtkmm3
gnome.webkitgtk webkitgtk
libappindicator-gtk3 libappindicator-gtk3
gst_all_1.gst-plugins-base gst_all_1.gst-plugins-base
gst_all_1.gst-plugins-good gst_all_1.gst-plugins-good

View file

@ -2,16 +2,16 @@
buildGoModule rec { buildGoModule rec {
pname = "juju"; pname = "juju";
version = "2.9.7"; version = "2.9.9";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "juju"; owner = "juju";
repo = "juju"; repo = "juju";
rev = "juju-${version}"; rev = "juju-${version}";
sha256 = "sha256-jGrN0tsLO8gmkyZ1zNYzZd29mCQgLP7lSF0LkOygbyc="; sha256 = "sha256-36/fatztop2eB1z9DfnseQXw0Di3Wss72IfgdnKpsNU=";
}; };
vendorSha256 = "sha256-0JNoOSNxJrJkph8OGzgQ7sdslnGC36e3Ap0uMpqriX0="; vendorSha256 = "sha256-MH9lZNc9KevovZJCN2nClmqJbRSwYoQ4Jb0CXqBBUd0=";
# Disable tests because it attempts to use a mongodb instance # Disable tests because it attempts to use a mongodb instance
doCheck = false; doCheck = false;

View file

@ -42,11 +42,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "evolution"; pname = "evolution";
version = "3.40.1"; version = "3.40.3";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/evolution/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; url = "mirror://gnome/sources/evolution/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "07n4sbgsh0y9hrn52ymvy45ah65ll55gglgvqqi3h9nhkyy64y9g"; sha256 = "/SkjomENe/6212+FMLpAJkBOIf0nOrKKLFtQCJIeDVw=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "notmuch-bower"; pname = "notmuch-bower";
version = "0.12"; version = "0.13";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "wangp"; owner = "wangp";
repo = "bower"; repo = "bower";
rev = version; rev = version;
sha256 = "0hvvlbvad6h73iiyn9xshlj073p2ddchgh0pyizh9gi8niir4fn5"; sha256 = "0r5s16pc3ym5nd33lv9ljv1p1gpb7yysrdni4g7w7yvjrnwk35l6";
}; };
nativeBuildInputs = [ gawk mercury pandoc ]; nativeBuildInputs = [ gawk mercury pandoc ];
@ -18,10 +18,12 @@ stdenv.mkDerivation rec {
makeFlags = [ "PARALLEL=-j$(NIX_BUILD_CORES)" "bower" "man" ]; makeFlags = [ "PARALLEL=-j$(NIX_BUILD_CORES)" "bower" "man" ];
installPhase = '' installPhase = ''
runHook preInstall
mkdir -p $out/bin mkdir -p $out/bin
mv bower $out/bin/ mv bower $out/bin/
mkdir -p $out/share/man/man1 mkdir -p $out/share/man/man1
mv bower.1 $out/share/man/man1/ mv bower.1 $out/share/man/man1/
runHook postInstall
''; '';
enableParallelBuilding = true; enableParallelBuilding = true;
@ -29,8 +31,8 @@ stdenv.mkDerivation rec {
meta = with lib; { meta = with lib; {
homepage = "https://github.com/wangp/bower"; homepage = "https://github.com/wangp/bower";
description = "A curses terminal client for the Notmuch email system"; description = "A curses terminal client for the Notmuch email system";
maintainers = with maintainers; [ erictapen ]; maintainers = with maintainers; [ jgart ];
license = licenses.gpl3; license = licenses.gpl3Plus;
platforms = platforms.linux; platforms = platforms.linux;
}; };
} }

View file

@ -8,8 +8,6 @@ in stdenv.mkDerivation {
inherit (mumble) src; inherit (mumble) src;
phases = [ "unpackPhase" "installPhase" "fixupPhase" ];
installPhase = '' installPhase = ''
mkdir -p $out/lib mkdir -p $out/lib
ln -s ${mumble}/lib/libmumble.so.1 $out/lib/ ln -s ${mumble}/lib/libmumble.so.1 $out/lib/

View file

@ -15,13 +15,13 @@
# ^1 https://github.com/NixOS/nixpkgs/issues/69338 # ^1 https://github.com/NixOS/nixpkgs/issues/69338
{ {
# Build dependencies # Build dependencies
appimageTools, autoPatchelfHook, fetchzip, lib, stdenv, appimageTools, autoPatchelfHook, fetchzip, lib, stdenv
# Runtime dependencies; # Runtime dependencies;
# A few additional ones (e.g. Node) are already shipped together with the # A few additional ones (e.g. Node) are already shipped together with the
# AppImage, so we don't have to duplicate them here. # AppImage, so we don't have to duplicate them here.
alsa-lib, dbus-glib, fuse, gnome, gtk3, libdbusmenu-gtk2, libXdamage, nss, udev , alsa-lib, dbus-glib, fuse, gnome, gsettings-desktop-schemas, gtk3, libdbusmenu-gtk2, libXdamage, nss, udev
}: }:
let let
@ -94,7 +94,7 @@ in stdenv.mkDerivation {
# This is required for the file picker dialog - otherwise pcloud just # This is required for the file picker dialog - otherwise pcloud just
# crashes # crashes
export XDG_DATA_DIRS="${gnome.gsettings-desktop-schemas}/share/gsettings-schemas/${gnome.gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS" export XDG_DATA_DIRS="${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS"
exec "$out/app/pcloud" exec "$out/app/pcloud"
EOF EOF

View file

@ -1,5 +1,5 @@
{ lib, stdenv, requireFile, makeWrapper, autoPatchelfHook, wrapGAppsHook, which, more { lib, stdenv, requireFile, makeWrapper, autoPatchelfHook, wrapGAppsHook, which, more
, file, atk, alsa-lib, cairo, fontconfig, gdk-pixbuf, glib, gnome, gtk2-x11, gtk3 , file, atk, alsa-lib, cairo, fontconfig, gdk-pixbuf, glib, webkitgtk, gtk2-x11, gtk3
, heimdal, krb5, libsoup, libvorbis, speex, openssl, zlib, xorg, pango, gtk2 , heimdal, krb5, libsoup, libvorbis, speex, openssl, zlib, xorg, pango, gtk2
, gnome2, mesa, nss, nspr, gtk_engines, freetype, dconf, libpng12, libxml2 , gnome2, mesa, nss, nspr, gtk_engines, freetype, dconf, libpng12, libxml2
, libjpeg, libredirect, tzdata, cacert, systemd, libcxxabi, libcxx, e2fsprogs, symlinkJoin , libjpeg, libredirect, tzdata, cacert, systemd, libcxxabi, libcxx, e2fsprogs, symlinkJoin
@ -70,7 +70,7 @@ stdenv.mkDerivation rec {
freetype freetype
gdk-pixbuf gdk-pixbuf
gnome2.gtkglext gnome2.gtkglext
gnome.webkitgtk webkitgtk
gtk2 gtk2
gtk2-x11 gtk2-x11
gtk3 gtk3

View file

@ -11,7 +11,8 @@ let
name = perl.name + "-wrapper-for-gnucash"; name = perl.name + "-wrapper-for-gnucash";
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];
buildInputs = [ perl ] ++ (with perlPackages; [ FinanceQuote DateManip ]); buildInputs = [ perl ] ++ (with perlPackages; [ FinanceQuote DateManip ]);
phases = [ "installPhase" ]; dontUnpack = true;
installPhase = '' installPhase = ''
mkdir -p $out/bin mkdir -p $out/bin
for script in ${perl}/bin/*; do for script in ${perl}/bin/*; do
@ -40,10 +41,10 @@ stdenv.mkDerivation rec {
}) })
]; ];
nativeBuildInputs = [ pkg-config makeWrapper cmake gtest ]; nativeBuildInputs = [ pkg-config makeWrapper cmake gtest swig ];
buildInputs = [ buildInputs = [
boost icu libxml2 libxslt gettext swig isocodes gtk3 glibcLocales boost icu libxml2 libxslt gettext isocodes gtk3 glibcLocales
webkitgtk dconf libofx aqbanking gwenhywfar libdbi webkitgtk dconf libofx aqbanking gwenhywfar libdbi
libdbiDrivers guile libdbiDrivers guile
perlWrapper perl perlWrapper perl

View file

@ -24,11 +24,11 @@ let
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "PortfolioPerformance"; pname = "PortfolioPerformance";
version = "0.53.1"; version = "0.54.1";
src = fetchurl { src = fetchurl {
url = "https://github.com/buchen/portfolio/releases/download/${version}/PortfolioPerformance-${version}-linux.gtk.x86_64.tar.gz"; url = "https://github.com/buchen/portfolio/releases/download/${version}/PortfolioPerformance-${version}-linux.gtk.x86_64.tar.gz";
sha256 = "0hddq1nijxhr6kgf7gydw0nh07lh86fs8srkhm29ik4hmv8ch19p"; sha256 = "16sv938sdbs01byqwngrfqmzb81zfhvk72ar53l68cg8qjvzs5ml";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View file

@ -1,9 +0,0 @@
# builder for mrbayes - note: only builds on Unix
source $stdenv/setup
tar xvfz $src
cd mrbayes-*
make
mkdir -p $out/bin
cp -v mb $out/bin

View file

@ -1,18 +1,18 @@
{lib, stdenv, fetchurl, readline}: { lib, stdenv, fetchFromGitHub, readline }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
# FIXME: replace Makefile so we can build MPI & MAC support pname = "mrbayes";
version = "3.2.7a";
name = "mrbayes-3.1.2"; src = fetchFromGitHub {
src = fetchurl { owner = "NBISweden";
url = "mirror://sourceforge/mrbayes/${name}.tar.gz"; repo = "MrBayes";
sha256 = "1x7j8ca5wjrqrxmcpvd375ydm3s2pbkzykv8xfhg1jc037g560n6"; rev = "v${version}";
sha256 = "sha256-pkkxZ6YHRn/I1SJpT9A+EK4S5hWGmFdcDBJS0zh5mLA=";
}; };
builder = ./builder.sh;
buildInputs = [readline];
meta = with lib; { meta = with lib; {
description = "Bayesian Inference of Phylogeny"; description = "Bayesian Inference of Phylogeny";
longDescription = '' longDescription = ''
Bayesian inference of phylogeny is based upon a Bayesian inference of phylogeny is based upon a
quantity called the posterior probability distribution of trees, which is quantity called the posterior probability distribution of trees, which is
@ -22,8 +22,9 @@ stdenv.mkDerivation rec {
MrBayes uses a simulation technique called Markov chain Monte Carlo (or MrBayes uses a simulation technique called Markov chain Monte Carlo (or
MCMC) to approximate the posterior probabilities of trees. MCMC) to approximate the posterior probabilities of trees.
''; '';
license = licenses.gpl2; maintainers = with maintainers; [ ];
homepage = "http://mrbayes.csit.fsu.edu/"; license = licenses.gpl2Plus;
homepage = "https://nbisweden.github.io/MrBayes/";
platforms = platforms.linux; platforms = platforms.linux;
}; };
} }

View file

@ -22,9 +22,9 @@ stdenv.mkDerivation rec {
sha256 = "09lzwa183nblr6l8ib35g2xrjf9wm9yhk3szfvyzkwivdv69c9r2"; sha256 = "09lzwa183nblr6l8ib35g2xrjf9wm9yhk3szfvyzkwivdv69c9r2";
}; };
nativeBuildInputs = [ pkg-config ] ++ [ python wrapPython ]; nativeBuildInputs = [ pkg-config asciidoc ] ++ [ python wrapPython ];
buildInputs = [ buildInputs = [
openssl zlib asciidoc libxml2 libxslt docbook_xsl luajit openssl zlib libxml2 libxslt docbook_xsl luajit
]; ];
pythonPath = [ pygments markdown ]; pythonPath = [ pygments markdown ];
@ -48,10 +48,15 @@ stdenv.mkDerivation rec {
preBuild = '' preBuild = ''
mkdir -p git mkdir -p git
tar --strip-components=1 -xf "$gitSrc" -C git tar --strip-components=1 -xf "$gitSrc" -C git
makeFlagsArray+=(prefix="$out" CGIT_SCRIPT_PATH="$out/cgit/")
''; '';
makeFlags = [
"prefix=$(out)"
"CGIT_SCRIPT_PATH=$out/cgit/"
"CC=${stdenv.cc.targetPrefix}cc"
"AR=${stdenv.cc.targetPrefix}ar"
];
# Install manpage. # Install manpage.
postInstall = '' postInstall = ''
# xmllint fails: # xmllint fails:

View file

@ -4,13 +4,13 @@
with lib; with lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "ccextractor"; pname = "ccextractor";
version = "0.90"; version = "0.91";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "CCExtractor"; owner = "CCExtractor";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-NVFCwUZZVt8GrWXWyvoF8UrUZ/ix+GWubKtc3218k7o="; sha256 = "sha256-VqJQaYzH8psQJfnDariV4q7SkDiXRz9byR51C8DzVEs=";
}; };
sourceRoot = "source/src"; sourceRoot = "source/src";

View file

@ -38,7 +38,6 @@ let
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];
buildInputs = [ dpkg ]; buildInputs = [ dpkg ];
phases = [ "unpackPhase" "installPhase" ];
unpackPhase = "dpkg-deb -x ${src} ./"; unpackPhase = "dpkg-deb -x ${src} ./";
installPhase = '' installPhase = ''

View file

@ -8,6 +8,7 @@
, libmtp, unzip, taglib, libkate, libtiger, libv4l, samba, libssh2, liboggz , libmtp, unzip, taglib, libkate, libtiger, libv4l, samba, libssh2, liboggz
, libass, libva, libdvbpsi, libdc1394, libraw1394, libopus , libass, libva, libdvbpsi, libdc1394, libraw1394, libopus
, libvdpau, libsamplerate, live555, fluidsynth, wayland, wayland-protocols , libvdpau, libsamplerate, live555, fluidsynth, wayland, wayland-protocols
, ncurses
, onlyLibVLC ? false , onlyLibVLC ? false
, withQt5 ? true, qtbase, qtsvg, qtx11extras, wrapQtAppsHook , withQt5 ? true, qtbase, qtsvg, qtx11extras, wrapQtAppsHook
, jackSupport ? false , jackSupport ? false
@ -42,7 +43,7 @@ stdenv.mkDerivation rec {
libkate libtiger libv4l samba libssh2 liboggz libass libdvbpsi libva libkate libtiger libv4l samba libssh2 liboggz libass libdvbpsi libva
xorg.xlibsWrapper xorg.libXv xorg.libXvMC xorg.libXpm xorg.xcbutilkeysyms xorg.xlibsWrapper xorg.libXv xorg.libXvMC xorg.libXpm xorg.xcbutilkeysyms
libdc1394 libraw1394 libopus libebml libmatroska libvdpau libsamplerate libdc1394 libraw1394 libopus libebml libmatroska libvdpau libsamplerate
fluidsynth wayland wayland-protocols fluidsynth wayland wayland-protocols ncurses
] ++ optional (!stdenv.hostPlatform.isAarch64) live555 ] ++ optional (!stdenv.hostPlatform.isAarch64) live555
++ optionals withQt5 [ qtbase qtsvg qtx11extras ] ++ optionals withQt5 [ qtbase qtsvg qtx11extras ]
++ optionals skins2Support (with xorg; [ libXpm freetype libXext libXinerama ]) ++ optionals skins2Support (with xorg; [ libXpm freetype libXext libXinerama ])

View file

@ -1,30 +0,0 @@
source $stdenv/setup
unpackPhase
cd $sourceRoot
make 8086tiny
if [ $bios ]; then
cd bios_source
nasm -f bin bios.asm -o bios
cd ..
fi
mkdir -p $out/bin $out/share/$name $out/share/doc/$name/images
install -m 755 8086tiny $out/bin
install -m 644 fd.img $out/share/$name/8086tiny-floppy.img
install -m 644 bios_source/bios.asm $out/share/$name/8086tiny-bios-src.asm
install -m 644 docs/8086tiny.css $out/share/doc/$name
install -m 644 docs/doc.html $out/share/doc/$name
for i in docs/images/*.gif
do
install -m 644 $i $out/share/doc/$name/images
done
if [ $bios ]; then
install -m 644 bios_source/bios $out/share/$name/8086tiny-bios
else
install -m 644 bios $out/share/$name/8086tiny-bios
fi

View file

@ -1,43 +0,0 @@
{ lib, stdenv, fetchFromGitHub
, localBios ? true, nasm ? null
, sdlSupport ? true, SDL ? null }:
assert sdlSupport -> (SDL != null);
stdenv.mkDerivation rec {
pname = "8086tiny";
version = "1.25";
src = fetchFromGitHub {
owner = "adriancable";
repo = pname;
rev = "c79ca2a34d96931d55ef724c815b289d0767ae3a";
sha256 = "00aydg8f28sgy8l3rd2a7jvp56lx3b63hhak43p7g7vjdikv495w";
};
buildInputs = with lib;
optionals localBios [ nasm ]
++ optionals sdlSupport [ SDL ];
bios = localBios;
builder = ./builder.sh;
meta = with lib; {
description = "An open-source small 8086 emulator";
longDescription = ''
8086tiny is a tiny, open-source (MIT), portable (little-endian hosts)
Intel PC emulator, powerful enough to run DOS, Windows 3.0, Excel, MS
Flight Simulator, AutoCAD, Lotus 1-2-3, and similar applications. 8086tiny
emulates a "late 80's era" PC XT-type machine.
8086tiny is based on an IOCCC 2013 winning entry. In fact that is the
"unobfuscated" version :)
'';
homepage = "https://github.com/adriancable/8086tiny";
license = licenses.mit;
maintainers = [ maintainers.AndersonTorres ];
platforms = platforms.linux;
};
}

View file

@ -0,0 +1,68 @@
{ lib
, stdenv
, fetchFromGitHub
, localBios ? true
, nasm
, sdlSupport ? true
, SDL
}:
stdenv.mkDerivation rec {
pname = "8086tiny";
version = "1.25";
src = fetchFromGitHub {
owner = "adriancable";
repo = pname;
rev = "c79ca2a34d96931d55ef724c815b289d0767ae3a";
sha256 = "00aydg8f28sgy8l3rd2a7jvp56lx3b63hhak43p7g7vjdikv495w";
};
buildInputs = lib.optional localBios nasm
++ lib.optional sdlSupport SDL;
makeFlags = [ "8086tiny" ];
postBuild = lib.optionalString localBios ''
(
cd bios_source
nasm -f bin bios.asm -o bios
)
'';
installPhase = ''
mkdir -p $out/bin $out/share/8086tiny $out/share/doc/8086tiny/images
install -m 755 8086tiny $out/bin
install -m 644 fd.img $out/share/8086tiny/8086tiny-floppy.img
install -m 644 bios_source/bios.asm $out/share/8086tiny/8086tiny-bios-src.asm
install -m 644 docs/8086tiny.css $out/share/doc/8086tiny
install -m 644 docs/doc.html $out/share/doc/$name
for i in docs/images/\*.gif; do
install -m 644 $i $out/share/doc/8086tiny/images
done
${if localBios then
"install -m 644 bios_source/bios $out/share/8086tiny/8086tiny-bios"
else
"install -m 644 bios $out/share/8086tiny/8086tiny-bios"}
'';
meta = with lib; {
description = "An open-source small 8086 emulator";
longDescription = ''
8086tiny is a tiny, open-source (MIT), portable (little-endian hosts)
Intel PC emulator, powerful enough to run DOS, Windows 3.0, Excel, MS
Flight Simulator, AutoCAD, Lotus 1-2-3, and similar applications. 8086tiny
emulates a "late 80's era" PC XT-type machine.
8086tiny is based on an IOCCC 2013 winning entry. In fact that is the
"unobfuscated" version :)
'';
homepage = "https://github.com/adriancable/8086tiny";
license = licenses.mit;
maintainers = [ maintainers.AndersonTorres ];
platforms = platforms.linux;
};
}

View file

@ -1,20 +1,22 @@
{lib, stdenv, fetchurl, pkg-config, xorgproto}: { lib, stdenv, fetchurl, pkg-config, xorgproto }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "rgb"; pname = "rgb";
version = "1.0.6"; version = "1.0.6";
src = fetchurl { src = fetchurl {
url = "http://xorg.freedesktop.org/archive/individual/app/rgb-${version}.tar.bz2"; url = "https://xorg.freedesktop.org/archive/individual/app/rgb-${version}.tar.bz2";
sha256 = "1c76zcjs39ljil6f6jpx1x17c8fnvwazz7zvl3vbjfcrlmm7rjmv"; sha256 = "1c76zcjs39ljil6f6jpx1x17c8fnvwazz7zvl3vbjfcrlmm7rjmv";
}; };
nativeBuildInputs = [pkg-config]; nativeBuildInputs = [ pkg-config ];
buildInputs = [xorgproto]; buildInputs = [ xorgproto ];
meta = {
meta = with lib; {
description = "X11 colorname to RGB mapping database"; description = "X11 colorname to RGB mapping database";
license = lib.licenses.mit; license = licenses.mit;
maintainers = [lib.maintainers.raskin]; maintainers = [ maintainers.raskin ];
platforms = lib.platforms.linux; platforms = platforms.linux;
homepage = "http://xorg.freedesktop.org/"; homepage = "https://xorg.freedesktop.org/";
}; };
} }

View file

@ -66,7 +66,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
# TODO: review if we really need this all # TODO: review if we really need this all
(python3.withPackages (pp: with pp; [ dbus-python setproctitle pygobject3 pycairo xapp pillow pytz tinycss2 pam pexpect distro ])) (python3.withPackages (pp: with pp; [ dbus-python setproctitle pygobject3 pycairo xapp pillow pytz tinycss2 python-pam pexpect distro ]))
atk atk
cacert cacert
cinnamon-control-center cinnamon-control-center

View file

@ -34,13 +34,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "yosys"; pname = "yosys";
version = "0.9+4052"; version = "0.9+4221";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "YosysHQ"; owner = "YosysHQ";
repo = "yosys"; repo = "yosys";
rev = "687f381b6985d9dda7e11535628e2fafff267af5"; rev = "9600f20be887b707f6d5d3f74dec58b336e2464e";
sha256 = "15lcj798ckh9zwvdqb5gnvicilsxjyxv01gcviijg310hq62n7vf"; sha256 = "0xbvbnhc6qvcq1c8zxfyf4ws959c824z660nrghfxyzkrjl8wi1h";
}; };
enableParallelBuilding = true; enableParallelBuilding = true;

View file

@ -1,7 +1,7 @@
{ fetchFromGitHub, lib, mkDerivation, standard-library }: { fetchFromGitHub, lib, mkDerivation, standard-library }:
mkDerivation rec { mkDerivation rec {
version = "0.3"; version = "0.4";
pname = "functional-linear-algebra"; pname = "functional-linear-algebra";
buildInputs = [ standard-library ]; buildInputs = [ standard-library ];
@ -10,7 +10,7 @@ mkDerivation rec {
repo = "functional-linear-algebra"; repo = "functional-linear-algebra";
owner = "ryanorendorff"; owner = "ryanorendorff";
rev = "v${version}"; rev = "v${version}";
sha256 = "032gl35x1qzaigc3hbg9dc40zr0nyjld175cb9m8b15rlz9xzjn2"; sha256 = "05jk3792k9xf8iiwzm2hwlvd25f2pqqr3gppmqjf8xb9199i8fk0";
}; };
preConfigure = '' preConfigure = ''
@ -18,8 +18,6 @@ mkDerivation rec {
''; '';
meta = with lib; { meta = with lib; {
# Remove if a version compatible with agda 2.6.2 is made
broken = true;
homepage = "https://github.com/ryanorendorff/functional-linear-algebra"; homepage = "https://github.com/ryanorendorff/functional-linear-algebra";
description = '' description = ''
Formalizing linear algebra in Agda by representing matrices as functions Formalizing linear algebra in Agda by representing matrices as functions

View file

@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoreconfHook ]; nativeBuildInputs = [ autoreconfHook ];
meta = { meta = with lib; {
description = "Syslog event logger library"; description = "Syslog event logger library";
longDescription = '' longDescription = ''
The EventLog library aims to be a replacement of the simple syslog() API The EventLog library aims to be a replacement of the simple syslog() API
@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
combination of description and tag/value pairs. combination of description and tag/value pairs.
''; '';
homepage = "https://www.balabit.com/support/community/products/"; homepage = "https://www.balabit.com/support/community/products/";
license = lib.licenses.bsd3; license = licenses.bsd3;
platforms = lib.platforms.unix; platforms = platforms.unix;
}; };
} }

View file

@ -0,0 +1,31 @@
{ mkDerivation, lib, fetchFromGitLab, udisks2, qtbase, cmake, ninja, }:
mkDerivation rec {
pname = "libcsys";
version = "4.2.0";
src = fetchFromGitLab {
owner = "cubocore";
repo = pname;
rev = "v${version}";
sha256 = "sha256-9LH95uJJIn4FHfnikGi5UCI6nUNW+1cSZnJ/KpZDI5Y=";
};
nativeBuildInputs = [
cmake
ninja
];
buildInputs = [
qtbase
udisks2
];
meta = with lib; {
description = "Library for managing drive and getting system resource information in real time";
homepage = "https://gitlab.com/cubocore/libcsys";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ dan4ik605743 ];
platforms = platforms.linux;
};
}

View file

@ -1,5 +1,5 @@
{ lib, stdenv { lib, stdenv
, fetchurl, autoreconfHook, gettext , fetchurl, autoreconfHook, gettext, netbsd
}: }:
# Note: this package is used for bootstrapping fetchurl, and thus # Note: this package is used for bootstrapping fetchurl, and thus
@ -33,7 +33,8 @@ stdenv.mkDerivation rec {
# on Darwin, so disable NLS for now. # on Darwin, so disable NLS for now.
++ lib.optional stdenv.hostPlatform.isDarwin "--disable-nls"; ++ lib.optional stdenv.hostPlatform.isDarwin "--disable-nls";
nativeBuildInputs = [ gettext ] nativeBuildInputs =
if stdenv.hostPlatform.isNetBSD then [ netbsd.gencat ] else [ gettext ]
# Need to regenerate configure script with newer version in order to pass # Need to regenerate configure script with newer version in order to pass
# "mr_cv_target_elf=yes", but `autoreconfHook` brings in `makeWrapper` # "mr_cv_target_elf=yes", but `autoreconfHook` brings in `makeWrapper`
# which doesn't work with the bootstrapTools bash, so can only do this # which doesn't work with the bootstrapTools bash, so can only do this

View file

@ -21,13 +21,13 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ python ]; nativeBuildInputs = [ python ];
buildInputs = buildInputs = [
[ boost cairo freetype gdal harfbuzz icu libjpeg libpng libtiff boost cairo freetype gdal harfbuzz icu libjpeg libpng libtiff
libwebp proj python sqlite zlib libwebp proj python sqlite zlib
# optional inputs # optional inputs
postgresql postgresql
]; ];
propagatedBuildInputs = [ libxml2 ]; propagatedBuildInputs = [ libxml2 ];

View file

@ -1,8 +1,12 @@
{ lib, stdenv, fetchFromGitHub, autoreconfHook }: { lib
, stdenv
, fetchFromGitHub
, autoreconfHook
}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "wolfssl"; pname = "wolfssl";
version = "4.8.0"; version = "4.8.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "wolfSSL"; owner = "wolfSSL";
@ -11,12 +15,25 @@ stdenv.mkDerivation rec {
sha256 = "1w9gs9cq2yhj5s3diz3x1l15pgrc1pbm00jccizvcjyibmwyyf2h"; sha256 = "1w9gs9cq2yhj5s3diz3x1l15pgrc1pbm00jccizvcjyibmwyyf2h";
}; };
# almost same as Debian but for now using --enable-all --enable-reproducible-build instead of --enable-distro to ensure options.h gets installed # Almost same as Debian but for now using --enable-all --enable-reproducible-build instead of --enable-distro to ensure options.h gets installed
configureFlags = [ "--enable-all" "--enable-reproducible-build" "--enable-pkcs11" "--enable-tls13" "--enable-base64encode" ]; configureFlags = [
"--enable-all"
"--enable-base64encode"
"--enable-pkcs11"
"--enable-reproducible-build"
"--enable-tls13"
];
outputs = [ "out" "dev" "doc" "lib" ]; outputs = [
"dev"
"doc"
"lib"
"out"
];
nativeBuildInputs = [ autoreconfHook ]; nativeBuildInputs = [
autoreconfHook
];
postInstall = '' postInstall = ''
# fix recursive cycle: # fix recursive cycle:
@ -28,9 +45,9 @@ stdenv.mkDerivation rec {
meta = with lib; { meta = with lib; {
description = "A small, fast, portable implementation of TLS/SSL for embedded devices"; description = "A small, fast, portable implementation of TLS/SSL for embedded devices";
homepage = "https://www.wolfssl.com/"; homepage = "https://www.wolfssl.com/";
platforms = platforms.all; platforms = platforms.all;
license = licenses.gpl2Plus; license = licenses.gpl2Plus;
maintainers = with maintainers; [ mcmtroffaes ]; maintainers = with maintainers; [ fab mcmtroffaes ];
}; };
} }

View file

@ -1,21 +1,21 @@
{ lib, buildDunePackage, ocaml, fetchurl, fmt, alcotest }: { lib, buildDunePackage, ocaml, fetchurl, fmt, alcotest, crowbar, astring }:
buildDunePackage rec { buildDunePackage rec {
pname = "pecu"; pname = "pecu";
version = "0.5"; version = "0.6";
useDune2 = true; useDune2 = true;
minimumOCamlVersion = "4.03"; minimumOCamlVersion = "4.03";
src = fetchurl { src = fetchurl {
url = "https://github.com/mirage/pecu/releases/download/v0.5/pecu-v0.5.tbz"; url = "https://github.com/mirage/pecu/releases/download/v${version}/pecu-v${version}.tbz";
sha256 = "713753cd6ba3f4609a26d94576484e83ffef7de5f2208a2993576a1b22f0e0e7"; sha256 = "a9d2b7da444c83b20f879f6c3b7fc911d08ac1e6245ad7105437504f9394e5c7";
}; };
# fmt availability # crowbar availability
doCheck = lib.versionAtLeast ocaml.version "4.05"; doCheck = lib.versionAtLeast ocaml.version "4.08";
checkInputs = [ fmt alcotest ]; checkInputs = [ fmt alcotest crowbar astring ];
meta = with lib; { meta = with lib; {
description = "Encoder/Decoder of Quoted-Printable (RFC2045 & RFC2047)"; description = "Encoder/Decoder of Quoted-Printable (RFC2045 & RFC2047)";

View file

@ -1,21 +1,26 @@
{ lib { lib
, buildPythonPackage , buildPythonPackage
, pythonOlder , fetchFromGitHub
, fetchPypi , mock
, protobuf , protobuf
, pytest-asyncio
, pytestCheckHook
, pythonOlder
, zeroconf , zeroconf
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "aioesphomeapi"; pname = "aioesphomeapi";
version = "5.0.1"; version = "5.1.1";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
src = fetchPypi { src = fetchFromGitHub {
inherit pname version; owner = "esphome";
sha256 = "sha256-2IxXhAysQiqqEd4Mfjgc5vX0+D60rof2nPJDXy9tRVs="; repo = pname;
rev = "v${version}";
sha256 = "09hhkwkphyqa31yd1mmpz8xmyz6hav8vwf36v8xc4v6g1xm9l6f5";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [
@ -23,8 +28,11 @@ buildPythonPackage rec {
zeroconf zeroconf
]; ];
# no tests implemented checkInputs = [
doCheck = false; mock
pytest-asyncio
pytestCheckHook
];
pythonImportsCheck = [ pythonImportsCheck = [
"aioesphomeapi" "aioesphomeapi"

View file

@ -7,12 +7,12 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "aiorpcx"; pname = "aiorpcx";
version = "0.18.7"; version = "0.22.1";
src = fetchPypi { src = fetchPypi {
inherit version; inherit version;
pname = "aiorpcX"; pname = "aiorpcX";
sha256 = "808a9ec9172df11677a0f7b459b69d1a6cf8b19c19da55541fa31fb1afce5ce7"; sha256 = "0lx54bcinp44fmr8q4bbffsqbkg8kdcwykf9i5jj0bj3sfzgf9k0";
}; };
propagatedBuildInputs = [ attrs ]; propagatedBuildInputs = [ attrs ];

View file

@ -3,23 +3,28 @@
, fetchPypi , fetchPypi
, pythonOlder , pythonOlder
, winacl , winacl
, prompt_toolkit
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "aiowinreg"; pname = "aiowinreg";
version = "0.0.5"; version = "0.0.6";
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.6";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "096663ec3db35fdc7ccc1c2d0d64a11cf64f4baa48955088e42b6a649ce418a5"; sha256 = "0h0r9xrz1n8y75f2p21f7phqrlpsymyiipmgzr0lj591irzjmjjy";
}; };
propagatedBuildInputs = [ winacl ]; propagatedBuildInputs = [
prompt_toolkit
winacl
];
# Project doesn't have tests # Project doesn't have tests
doCheck = false; doCheck = false;
pythonImportsCheck = [ "aiowinreg" ]; pythonImportsCheck = [ "aiowinreg" ];
meta = with lib; { meta = with lib; {

View file

@ -4,26 +4,30 @@
, fetchFromGitHub , fetchFromGitHub
, mock , mock
, pytestCheckHook , pytestCheckHook
, pythonOlder
, requests , requests
, responses , responses
, urllib3 , urllib3
, typing-extensions
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "amcrest"; pname = "amcrest";
version = "1.7.2"; version = "1.8.0";
disabled = pythonOlder "3.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "tchellomello"; owner = "tchellomello";
repo = "python-amcrest"; repo = "python-amcrest";
rev = version; rev = version;
sha256 = "06gbrshf6vqvq3k813d1w37k2kmps0g6msa4lp2f9xvzw3iczshy"; sha256 = "180c0g840vh8dg4f08j0r29pdnhisav93d3axfvicd8fsb2cn36g";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [
argcomplete argcomplete
requests requests
urllib3 urllib3
typing-extensions
]; ];
checkInputs = [ checkInputs = [

View file

@ -19,7 +19,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "anyio"; pname = "anyio";
version = "3.2.1"; version = "3.3.0";
format = "pyproject"; format = "pyproject";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
@ -27,7 +27,7 @@ buildPythonPackage rec {
owner = "agronholm"; owner = "agronholm";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "0fiqzsgr9c0yicsh1pwhyc6z4qyr2ng42dakyy4a81w9cff38had"; sha256 = "sha256-bMnAijFLXZSgTWsalT/J4sJ0Jrc1kFaQHJArwXnQFaQ=";
}; };
preBuild = '' preBuild = ''
@ -57,8 +57,13 @@ buildPythonPackage rec {
mock mock
]; ];
disabledTests = [
# block devices access
"test_is_block_device"
];
disabledTestPaths = [ disabledTestPaths = [
# lots of DNS lookups # lots of DNS lookups
"tests/test_sockets.py" "tests/test_sockets.py"
] ++ lib.optionals stdenv.isDarwin [ ] ++ lib.optionals stdenv.isDarwin [
# darwin sandboxing limitations # darwin sandboxing limitations

View file

@ -8,7 +8,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "async-dns"; pname = "async-dns";
version = "1.1.10"; version = "2.0.0";
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.6";
format = "pyproject"; format = "pyproject";
@ -16,7 +16,7 @@ buildPythonPackage rec {
owner = "gera2ld"; owner = "gera2ld";
repo = "async_dns"; repo = "async_dns";
rev = "v${version}"; rev = "v${version}";
sha256 = "1yxmdlf2n66kp2mprsd4bvfsf63l4c4cfkjm2rm063pmlifz2fvj"; sha256 = "0vn7hxvpzikd7q61a27fwzal4lwsra2063awyr6fjpy6lh3cjdwf";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -26,7 +26,7 @@ buildPythonPackage rec {
checkPhase = '' checkPhase = ''
export HOME=$TMPDIR export HOME=$TMPDIR
# Test needs network access # Test needs network access
rm tests/test_resolver.py rm -r tests/resolver
${python.interpreter} -m unittest ${python.interpreter} -m unittest
''; '';

View file

@ -13,12 +13,12 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "blspy"; pname = "blspy";
version = "1.0.2"; version = "1.0.5";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-N1mk83uZrzSty2DyXfKiVp85z/jmztiUSRXKfNBRJV4="; hash = "sha256-uDXzAdGzfyRbsMVllLNd3DK8F/GfovdX293z5Mel6eg=";
}; };
patches = [ patches = [

View file

@ -23,7 +23,7 @@ index faecc61..3272116 100644
-if (DEFINED ENV{RELIC_MAIN}) -if (DEFINED ENV{RELIC_MAIN})
- set(RELIC_GIT_TAG "origin/main") - set(RELIC_GIT_TAG "origin/main")
-else () -else ()
- set(RELIC_GIT_TAG "1885ae3b681c423c72b65ce1fe70910142cf941c") - set(RELIC_GIT_TAG "b7b2266a0e4ee6f628f61d3ab638f524a18b52f1")
-endif () -endif ()
- -
-message(STATUS "Relic will be built from: ${RELIC_GIT_TAG}") -message(STATUS "Relic will be built from: ${RELIC_GIT_TAG}")

View file

@ -1,9 +1,10 @@
{ stdenv, lib, buildPythonPackage, fetchPypi, makeWrapper, isPy3k, { stdenv, lib, buildPythonPackage, fetchPypi, makeWrapper, isPy3k
python, twisted, jinja2, zope_interface, sqlalchemy, , python, twisted, jinja2, zope_interface, sqlalchemy
sqlalchemy_migrate, python-dateutil, txaio, autobahn, pyjwt, pyyaml, unidiff, treq, , sqlalchemy_migrate, python-dateutil, txaio, autobahn, pyjwt, pyyaml, unidiff, treq
txrequests, pypugjs, boto3, moto, mock, python-lz4, setuptoolsTrial, , txrequests, pypugjs, boto3, moto, mock, lz4, setuptoolsTrial
isort, pylint, flake8, buildbot-worker, buildbot-pkg, buildbot-plugins, , isort, pylint, flake8, buildbot-worker, buildbot-pkg, buildbot-plugins
parameterized, git, openssh, glibcLocales, ldap3, nixosTests }: , parameterized, git, openssh, glibcLocales, ldap3, nixosTests
}:
let let
withPlugins = plugins: buildPythonPackage { withPlugins = plugins: buildPythonPackage {
@ -56,7 +57,7 @@ let
boto3 boto3
moto moto
mock mock
python-lz4 lz4
setuptoolsTrial setuptoolsTrial
isort isort
pylint pylint

View file

@ -13,12 +13,12 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "chiapos"; pname = "chiapos";
version = "1.0.3"; version = "1.0.4";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "sha256-2Ye0gaOsv/Hg1363E6+NmezsK9EcLEZVKKUHikM2hr0="; sha256 = "sha256-flI1vwtD0H28UDMcEEELECewkXZ6vf/XEYMqRKy5R6w=";
}; };
patches = [ patches = [

View file

@ -3,7 +3,7 @@ index 9b4a2f5..86f849c 100644
--- a/CMakeLists.txt --- a/CMakeLists.txt
+++ b/CMakeLists.txt +++ b/CMakeLists.txt
@@ -18,22 +18,19 @@ include(FetchContent) @@ -18,22 +18,19 @@ include(FetchContent)
else()
FetchContent_Declare( FetchContent_Declare(
pybind11-src pybind11-src
- GIT_REPOSITORY https://github.com/pybind/pybind11.git - GIT_REPOSITORY https://github.com/pybind/pybind11.git
@ -11,6 +11,7 @@ index 9b4a2f5..86f849c 100644
+ SOURCE_DIR @pybind11_src@ + SOURCE_DIR @pybind11_src@
) )
FetchContent_MakeAvailable(pybind11-src) FetchContent_MakeAvailable(pybind11-src)
endif()
FetchContent_Declare( FetchContent_Declare(
cxxopts cxxopts

View file

@ -1,28 +1,18 @@
{ lib { lib
, fetchFromGitHub , fetchFromGitHub
, fetchpatch
, buildPythonPackage , buildPythonPackage
, astunparse , astunparse
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "gast"; pname = "gast";
version = "0.5.0"; version = "0.5.1";
# TODO: remove this patch on the next release, this fixes a bug with parsing
# assignment expressions e.g., `x := 1`.
patches = [
(fetchpatch {
url = "https://github.com/serge-sans-paille/gast/commit/3cc9b4d05a80e4bb42882de00df314aaa1e6e591.patch";
sha256 = "0ylpn0x0a4y6139vd048blsh77yd08npjcn4b5ydf89xnji5mlm1";
})
];
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "serge-sans-paille"; owner = "serge-sans-paille";
repo = "gast"; repo = "gast";
rev = version; rev = version;
sha256 = "0qsg36knv0k2ppzbr5m4w6spxxw7a77lw88y8vjx7m176bajnsbw"; sha256 = "1gph45frnj47lfr6idiyxrb3gk7vzc9rni9cijmcyz10dyx5kgwa";
}; };
checkInputs = [ astunparse ]; checkInputs = [ astunparse ];

View file

@ -2,17 +2,19 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "inotify-simple"; pname = "inotify-simple";
version = "1.2.1"; version = "1.3.5";
src = fetchPypi { src = fetchPypi {
pname = "inotify_simple"; pname = "inotify_simple";
inherit version; inherit version;
sha256 = "132craajflksgxxwjawj73nn1ssv8jn58j3k5vvyiq03avbz4sfv"; sha256 = "0a61bh087cq5wfrvz680hg5pmykb9gmy26kwyn6ims2akkjgyh44";
}; };
# The package has no tests # The package has no tests
doCheck = false; doCheck = false;
pythonImportsCheck = [ "inotify_simple" ];
meta = with lib; { meta = with lib; {
description = "A simple Python wrapper around inotify"; description = "A simple Python wrapper around inotify";
homepage = "https://github.com/chrisjbillington/inotify_simple"; homepage = "https://github.com/chrisjbillington/inotify_simple";

View file

@ -5,7 +5,7 @@
, stdenv , stdenv
, numpydoc , numpydoc
, pytestCheckHook , pytestCheckHook
, python-lz4 , lz4
, setuptools , setuptools
, sphinx , sphinx
}: }:
@ -22,7 +22,7 @@ buildPythonPackage rec {
}; };
checkInputs = [ sphinx numpydoc pytestCheckHook ]; checkInputs = [ sphinx numpydoc pytestCheckHook ];
propagatedBuildInputs = [ python-lz4 setuptools ]; propagatedBuildInputs = [ lz4 setuptools ];
pytestFlagsArray = [ "joblib/test" ]; pytestFlagsArray = [ "joblib/test" ];
disabledTests = [ disabledTests = [

View file

@ -1,25 +1,40 @@
{ lib { lib
, buildPythonPackage , buildPythonPackage
, fetchPypi , fetchPypi
, pytestCheckHook
, requests , requests
, pytest, pytest-runner, responses , responses
, urllib3
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "matrix_client"; pname = "matrix_client";
version = "0.3.2"; version = "0.4.0";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "1mgjd0ymf9mvqjkvgx3xjhxap7rzdmpa21wfy0cxbw2xcswcrqyw"; sha256 = "0mii7ib3bah5ppqs7i8sjv5l0zbl57011908m4l0jbyby90ayy06";
}; };
checkInputs = [ pytest pytest-runner responses ]; propagatedBuildInputs = [
requests
urllib3
];
propagatedBuildInputs = [ requests ]; checkInputs = [
pytestCheckHook
responses
];
postPatch = ''
substituteInPlace setup.py --replace \
"pytest-runner~=5.1" ""
'';
pythonImportsCheck = [ "matrix_client" ];
meta = with lib; { meta = with lib; {
description = "Matrix Client-Server SDK"; description = "Python Matrix Client-Server SDK";
homepage = "https://github.com/matrix-org/matrix-python-sdk"; homepage = "https://github.com/matrix-org/matrix-python-sdk";
license = licenses.asl20; license = licenses.asl20;
maintainers = with maintainers; [ olejorgenb ]; maintainers = with maintainers; [ olejorgenb ];

View file

@ -9,14 +9,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "nexia"; pname = "nexia";
version = "0.9.10"; version = "0.9.11";
disabled = pythonOlder "3.5"; disabled = pythonOlder "3.5";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "bdraco"; owner = "bdraco";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "0k97i243ap1sap5smvfmpsjqzkx5adjvi14awv82pcp52ckzkbi9"; sha256 = "0ql08nfvh6rjhjdh78gzih7az95m0fc9wxc22yqmlc9grifnp9i5";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

View file

@ -9,7 +9,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "pglast"; pname = "pglast";
version = "3.0"; version = "3.3";
# PyPI tarball does not include all the required files # PyPI tarball does not include all the required files
src = fetchFromGitHub { src = fetchFromGitHub {
@ -17,7 +17,7 @@ buildPythonPackage rec {
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
fetchSubmodules = true; fetchSubmodules = true;
sha256 = "0yi24wj19rzw5dvppm8g3hnfskyzbrqw14q8x9f2q5zi8g6xnnrd"; sha256 = "0l7nvbs1x1qil6mc0rxk7925i5xr3nbqnv0vakx3yv911kj3yhgv";
}; };
disabled = !isPy3k; disabled = !isPy3k;

View file

@ -14,12 +14,12 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "prawcore"; pname = "prawcore";
version = "2.2.0"; version = "2.3.0";
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.6";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "bde42fad459c4dcfe0f22a18921ef4981ee7cd286ea1de3eb697ba91838c9123"; sha256 = "0vgmhjddqxnz5vy70dyqvakak51fg1nk6j3xavkc83d8nzacrwfs";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

View file

@ -7,7 +7,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "pyrituals"; pname = "pyrituals";
version = "0.0.5"; version = "0.0.6";
format = "pyproject"; format = "pyproject";
disabled = pythonOlder "3.8"; disabled = pythonOlder "3.8";
@ -15,7 +15,7 @@ buildPythonPackage rec {
owner = "milanmeu"; owner = "milanmeu";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "sha256-iWJhjAUXkoH3MMJ5PFj2rjIy2e0nn57cRoEF6KMfrQg="; sha256 = "0ynjz7khp67bwxjp580w3zijxr9yn44nmnbvkxjxq9scyb2mjf6g";
}; };
propagatedBuildInputs = [ aiohttp ]; propagatedBuildInputs = [ aiohttp ];

View file

@ -1,26 +1,29 @@
{ lib { lib
, buildPythonPackage , buildPythonPackage
, fetchFromGitHub
, isPyPy , isPyPy
, python , python
, pkgs
, pillow , pillow
, pycairo , pycairo
, pkg-config
, boost
, cairo
, harfbuzz
, icu
, libjpeg
, libpng
, libtiff
, libwebp
, mapnik
, proj
, zlib
}: }:
let buildPythonPackage rec {
boost = pkgs.boost.override {
enablePython = true;
inherit python;
};
mapnik = pkgs.mapnik.override {
inherit python boost;
};
in buildPythonPackage rec {
pname = "python-mapnik"; pname = "python-mapnik";
version = "unstable-2020-02-24"; version = "unstable-2020-02-24";
src = pkgs.fetchFromGitHub { src = fetchFromGitHub {
owner = "mapnik"; owner = "mapnik";
repo = "python-mapnik"; repo = "python-mapnik";
rev = "7da019cf9eb12af8f8aa88b7d75789dfcd1e901b"; rev = "7da019cf9eb12af8f8aa88b7d75789dfcd1e901b";
@ -29,10 +32,8 @@ in buildPythonPackage rec {
disabled = isPyPy; disabled = isPyPy;
doCheck = false; # doesn't find needed test data files doCheck = false; # doesn't find needed test data files
preBuild = let preBuild = ''
pythonVersion = with lib.versions; "${major python.version}${minor python.version}"; export BOOST_PYTHON_LIB="boost_python${"${lib.versions.major python.version}${lib.versions.minor python.version}"}"
in ''
export BOOST_PYTHON_LIB="boost_python${pythonVersion}"
export BOOST_THREAD_LIB="boost_thread" export BOOST_THREAD_LIB="boost_thread"
export BOOST_SYSTEM_LIB="boost_system" export BOOST_SYSTEM_LIB="boost_system"
export PYCAIRO=true export PYCAIRO=true
@ -40,7 +41,7 @@ in buildPythonPackage rec {
nativeBuildInputs = [ nativeBuildInputs = [
mapnik # for mapnik_config mapnik # for mapnik_config
pkgs.pkgconfig pkg-config
]; ];
patches = [ patches = [
@ -50,7 +51,6 @@ in buildPythonPackage rec {
buildInputs = [ buildInputs = [
mapnik mapnik
boost boost
] ++ (with pkgs; [
cairo cairo
harfbuzz harfbuzz
icu icu
@ -60,15 +60,16 @@ in buildPythonPackage rec {
libwebp libwebp
proj proj
zlib zlib
]); ];
propagatedBuildInputs = [ pillow pycairo ]; propagatedBuildInputs = [ pillow pycairo ];
pythonImportsCheck = [ "mapnik" ] ; pythonImportsCheck = [ "mapnik" ];
meta = with lib; { meta = with lib; {
description = "Python bindings for Mapnik"; description = "Python bindings for Mapnik";
maintainers = with maintainers; [ ];
homepage = "https://mapnik.org"; homepage = "https://mapnik.org";
license = licenses.lgpl21; license = licenses.lgpl21;
}; };
} }

View file

@ -13,7 +13,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "pytile"; pname = "pytile";
version = "5.2.2"; version = "5.2.3";
format = "pyproject"; format = "pyproject";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "bachya"; owner = "bachya";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "sha256-oVtTR5zucYvnaPO0i4sEBBU4nafq7GUfx3kPdSvptDo="; sha256 = "01gxq6dbqjmsqndjcbqv79wd2wgs7krm0rn47k883gh2xg9sn606";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View file

@ -1,21 +1,21 @@
{ buildPythonPackage { lib
, buildPythonPackage
, fetchFromGitHub , fetchFromGitHub
, isPy27 , pythonOlder
, lib
, pytestCheckHook , pytestCheckHook
, tokenize-rt , tokenize-rt
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "pyupgrade"; pname = "pyupgrade";
version = "2.21.0"; version = "2.23.0";
disabled = isPy27; disabled = pythonOlder "3.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "asottile"; owner = "asottile";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-W0zaziTkXReEuLhcd6jEHH/dS1YSZNiWDro+tTH7Ftg="; sha256 = "0w1r9s3kr539vwfb7ld7jmr8q4jkr7jsnk51x50wji7jzs627a8i";
}; };
checkInputs = [ pytestCheckHook ]; checkInputs = [ pytestCheckHook ];

View file

@ -19,14 +19,14 @@ let
in in
buildPythonPackage rec { buildPythonPackage rec {
pname = "ttp"; pname = "ttp";
version = "0.7.1"; version = "0.7.2";
format = "setuptools"; format = "setuptools";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "dmulyalin"; owner = "dmulyalin";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "1fmg5gz297bpr550s4vfq6vs7j042bp1mrdmqz1b7nz29c2khbz6"; sha256 = "sha256-dYjE+EMfCVHLRAqT1KM7o8VEopJ/TwAEMphYXuj38Wk=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

View file

@ -0,0 +1,27 @@
{ lib, buildPythonPackage, fetchFromGitHub, requests, mock, httpretty, pytestCheckHook }:
buildPythonPackage rec {
pname = "youtube-transcript-api";
version = "0.4.1";
# PyPI tarball is missing some test files
src = fetchFromGitHub {
owner = "jdepoix";
repo = "youtube-transcript-api";
rev = "v${version}";
sha256 = "1gpk13j1n2bifwsg951gmrfnq8kfxjr15rq46dxn1bhyk9hr1zql";
};
propagatedBuildInputs = [ requests ];
checkInputs = [ mock httpretty pytestCheckHook ];
pythonImportsCheck = [ "youtube_transcript_api" ];
meta = with lib; {
description = "Python API which allows you to get the transcripts/subtitles for a given YouTube video";
homepage = "https://github.com/jdepoix/youtube-transcript-api";
license = licenses.mit;
maintainers = [ maintainers.marsam ];
};
}

View file

@ -17,7 +17,7 @@ let
inherit sha256; inherit sha256;
}; };
phases = "installPhase"; dontUnpack = true;
installPhase = '' installPhase = ''
install -Dm755 $src $out/bin/amm install -Dm755 $src $out/bin/amm

View file

@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
sha256 = "1r4z0z2c1drjd4ynpf36dklxs3hq1wdnzh63mk2yk4mmk75xg4mk"; sha256 = "1r4z0z2c1drjd4ynpf36dklxs3hq1wdnzh63mk2yk4mmk75xg4mk";
}; };
phases = [ "installPhase" ]; dontUnpack = true;
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];

View file

@ -2,16 +2,16 @@
buildGoModule rec { buildGoModule rec {
pname = "cloud-nuke"; pname = "cloud-nuke";
version = "0.3.0"; version = "0.4.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "gruntwork-io"; owner = "gruntwork-io";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-rxWTh+iltD1kcntlu9sovwG/mQPmukYbw8V2FAFi1KE="; sha256 = "sha256-eua+/bfKuIG1TuoC0tA4+O0H2D+u8AbcJIFLDIbzVYg=";
}; };
vendorSha256 = "sha256-mfNbcnJ62v6tdEhOtA0P9lDoD5HmLBAtNcrv1H3/mSE="; vendorSha256 = "sha256-+rr9TDRIYta0ejOE48O+nZDluvqvSTuGBpRBPZifazA=";
buildFlagsArray = [ "-ldflags=-s -w -X main.VERSION=${version}" ]; buildFlagsArray = [ "-ldflags=-s -w -X main.VERSION=${version}" ];

View file

@ -21,7 +21,7 @@ python3.pkgs.buildPythonApplication rec {
click click
colorama colorama
configparser configparser
diff_cover diff-cover
jinja2 jinja2
oyaml oyaml
pathspec pathspec

View file

@ -105,23 +105,23 @@ rec {
headers = "0c7qms8vbirblg6z86s19p5l472p3h8lw1rj7ckgnwna4b68vn33"; headers = "0c7qms8vbirblg6z86s19p5l472p3h8lw1rj7ckgnwna4b68vn33";
}; };
electron_12 = mkElectron "12.0.14" { electron_12 = mkElectron "12.0.15" {
x86_64-linux = "a75886b5aad27c64232ec0ec47d8c3c1d696ab968007cd8bfa5db87b33e8a5e7"; x86_64-linux = "0ba1803ba64f2c155dcfc5452a4b7c034390aaea6197395b6195693b5d0bf605";
x86_64-darwin = "03b30610f23be9ef835a78e9d4babc52ff32e29ff33c51218b1b8970c3bd6062"; x86_64-darwin = "7da73a8e3eb82a035f0d720709dbbb44cac0166d52ad4858fca9f3d96e6a32ed";
i686-linux = "0bb86208173da28250f261b162657c3614b859fb561df54cbd25b566d619c75c"; i686-linux = "597f5710e6e55e4fb75c769af6e3c7db1924f6795f417e3ff6b37c4da2ae39fc";
armv7l-linux = "bd743c6eec434aedb80e7e5eef58dfe9f133bc48015d263dc12a119dd1276e32"; armv7l-linux = "01138b036812e5461a5871c2f8912baf0adf316df6597eb5c4fd3df8d41fb95e";
aarch64-linux = "1f287496cc61c67db25339f8f79d09ace952edeaca47ea664766425ceaebc2a3"; aarch64-linux = "fe24cf90e3768cafa9939a0107261a97b4f132f9dec24bf0d1d15b591cdad2d6";
aarch64-darwin = "50171b32c927ab5b658da5b4459eca5ddb5df89cc655ae753cc6d02b4ed9b30d"; aarch64-darwin = "c48323f1fd6cd4ebc67a248a83bd7c460a640bf32613d4fecf6be705f3d6803c";
headers = "1znhnily1gl2f58f0ny1fa3yilmm4xn5fcdvqkjh4czv5c12rrbg"; headers = "1gbnjgf1pfbca2czn8j74rafiwmgc64nxi6drzm1b7qy2f6lxrl0";
}; };
electron_13 = mkElectron "13.1.6" { electron_13 = mkElectron "13.1.7" {
x86_64-linux = "6f28af0a3ccb20b0d2e4f26ea4698d5b89b81e860cbd40a446c2a8223fdf0101"; x86_64-linux = "0bb38a5e45609a8c46dd6173447a45477651f3c2ea58f724807d79c8e4a8876e";
x86_64-darwin = "e2bde9b3b2ee092b80d18439780c4ecb4620da1ead9fcae00cc603f3a56fda3e"; x86_64-darwin = "be8d05a7f853b9e7020c095c3d8075269832ccf821ca9785135884e6bc893df8";
i686-linux = "7c266148fba83c3eb912c5ccd7cd7c24829bc93b380378cba0480b02c38f5d42"; i686-linux = "2a1c84ca8fd2a5b10b918bda11c5e546f4b77f85484a32af24ed44d6f877587d";
armv7l-linux = "8d54ec6babc06b118038d2d4f49cab84ec6d5617c645266b88dd829c02354e77"; armv7l-linux = "3d4ed4cbd2ea9dd01d5ad09ed5b408762c69b5827be6fdae2e19681f2a159509";
aarch64-linux = "d24ba0e3f8624ec611fb2e9165c08b227ba799196b0f2787cad8c60f1cc23b5b"; aarch64-linux = "68e174bee2a686926ec2da193831aefc16ff8ec43b46e423044918e6d25d5925";
aarch64-darwin = "0fa29c1ba89ab906c5ba20216c505b6d8d3fbccdc58cd397146783bddeff1dd4"; aarch64-darwin = "95489cc66c5638d95cde80189a5ae3477ce09c6cfa4c421b1e8bceea94f4dfba";
headers = "122ppxayj1fijzfdpnh3wqyi636dq53j8imyf46ik8fkvgmrw2mz"; headers = "0zsnkgixch0c6ihg4drdx9a7gsl35wwfsphgiz80mhbw84slvq0n";
}; };
} }

View file

@ -2,13 +2,13 @@
buildGoModule rec { buildGoModule rec {
pname = "esbuild"; pname = "esbuild";
version = "0.12.15"; version = "0.12.16";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "evanw"; owner = "evanw";
repo = "esbuild"; repo = "esbuild";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-Ikt8kBkwI9AQrWp9j4Zaf+BqGVcyhyagBDjTGZm/dzQ="; sha256 = "sha256-rDPjxr6gaaH55l72dMaZsGCxayM8Nodjn3fppydpjZk=";
}; };
vendorSha256 = "sha256-2ABWPqhK2Cf4ipQH7XvRrd+ZscJhYPc3SV2cGT0apdg="; vendorSha256 = "sha256-2ABWPqhK2Cf4ipQH7XvRrd+ZscJhYPc3SV2cGT0apdg=";

View file

@ -2,18 +2,18 @@
buildGoModule rec { buildGoModule rec {
pname = "frugal"; pname = "frugal";
version = "3.14.6"; version = "3.14.7";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Workiva"; owner = "Workiva";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-MtQz/9+e2l4FQ1E299KtRzFpX67FynHdsvcMA4CqKUo="; sha256 = "sha256-mCfM2G+FhKDwPg0NqLIAe8F5MRZVJ0tcIY9FBuLpRpE=";
}; };
subPackages = [ "." ]; subPackages = [ "." ];
vendorSha256 = "sha256-Y7lh+U4FKiht2PgACWSXwGTx+y8aJi22KEhqxHPooCw="; vendorSha256 = "sha256-onbvW3vjuAL+grLfvJR14jxVpoue+YZAeFMOS8ktS1A=";
meta = with lib; { meta = with lib; {
description = "Thrift improved"; description = "Thrift improved";

View file

@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
gemset = ./gemset.nix; gemset = ./gemset.nix;
}; };
phases = [ "installPhase" ]; dontUnpack = true;
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];
buildInputs = [ env ]; buildInputs = [ env ];

View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, pkg-config, glib, python3, libsigrok, check }: { lib, stdenv, fetchurl, pkg-config, glib, python3, check }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "libsigrokdecode"; pname = "libsigrokdecode";
@ -10,7 +10,9 @@ stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];
buildInputs = [ glib python3 libsigrok check ]; buildInputs = [ glib python3 ];
checkInputs = [ check ];
doCheck = true;
meta = with lib; { meta = with lib; {
description = "Protocol decoding library for the sigrok signal analysis software suite"; description = "Protocol decoding library for the sigrok signal analysis software suite";

View file

@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];
buildInputs = [ jdk deps ]; buildInputs = [ jdk deps ];
phases = [ "installPhase" ]; dontUnpack = true;
extraJavaOpts = "-XX:+UseG1GC -XX:+UseStringDeduplication -Xss4m -Xms100m"; extraJavaOpts = "-XX:+UseG1GC -XX:+UseStringDeduplication -Xss4m -Xms100m";

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