Merge master into haskell-updates

This commit is contained in:
github-actions[bot] 2021-07-24 00:05:04 +00:00 committed by GitHub
commit 05b69d83da
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
171 changed files with 2976 additions and 1578 deletions

View file

@ -7,33 +7,38 @@ assignees: ''
--- ---
**Describe the bug** ### Describe the bug
A clear and concise description of what the bug is. A clear and concise description of what the bug is.
**To Reproduce** ### Steps To Reproduce
Steps to reproduce the behavior: Steps to reproduce the behavior:
1. ... 1. ...
2. ... 2. ...
3. ... 3. ...
**Expected behavior** ### Expected behavior
A clear and concise description of what you expected to happen. A clear and concise description of what you expected to happen.
**Screenshots** ### Screenshots
If applicable, add screenshots to help explain your problem. If applicable, add screenshots to help explain your problem.
**Additional context** ### Additional context
Add any other context about the problem here. Add any other context about the problem here.
**Notify maintainers** ### Notify maintainers
<!-- <!--
Please @ people who are in the `meta.maintainers` list of the offending package or module. Please @ people who are in the `meta.maintainers` list of the offending package or module.
If in doubt, check `git blame` for whoever last touched something. If in doubt, check `git blame` for whoever last touched something.
--> -->
**Metadata** ### Metadata
Please run `nix-shell -p nix-info --run "nix-info -m"` and paste the result. Please run `nix-shell -p nix-info --run "nix-info -m"` and paste the result.
```console
[user@system:~]$ nix-shell -p nix-info --run "nix-info -m"
output here
```
Maintainer information: Maintainer information:
```yaml ```yaml
# a list of nixpkgs attributes affected by the problem # a list of nixpkgs attributes affected by the problem

View file

@ -287,6 +287,13 @@ rec {
merge = mergeEqualOption; merge = mergeEqualOption;
}; };
nonEmptyStr = mkOptionType {
name = "nonEmptyStr";
description = "non-empty string";
check = x: str.check x && builtins.match "[ \t\n]*" x == null;
inherit (str) merge;
};
strMatching = pattern: mkOptionType { strMatching = pattern: mkOptionType {
name = "strMatching ${escapeNixString pattern}"; name = "strMatching ${escapeNixString pattern}";
description = "string matching the pattern ${pattern}"; description = "string matching the pattern ${pattern}";

View file

@ -5791,6 +5791,12 @@
githubId = 278013; githubId = 278013;
name = "Tomasz Kontusz"; name = "Tomasz Kontusz";
}; };
kurnevsky = {
email = "kurnevsky@gmail.com";
github = "kurnevsky";
githubId = 2943605;
name = "Evgeny Kurnevsky";
};
kuznero = { kuznero = {
email = "roman@kuznero.com"; email = "roman@kuznero.com";
github = "kuznero"; github = "kuznero";
@ -5918,6 +5924,12 @@
githubId = 1104419; githubId = 1104419;
name = "Lucas Hoffmann"; name = "Lucas Hoffmann";
}; };
lde = {
email = "lilian.deloche@puck.fr";
github = "lde";
githubId = 1447020;
name = "Lilian Deloche";
};
ldelelis = { ldelelis = {
email = "ldelelis@est.frba.utn.edu.ar"; email = "ldelelis@est.frba.utn.edu.ar";
github = "ldelelis"; github = "ldelelis";
@ -10128,6 +10140,12 @@
githubId = 1829294; githubId = 1829294;
name = "Steve Chávez"; name = "Steve Chávez";
}; };
stevebob = {
email = "stephen@sherra.tt";
github = "stevebob";
githubId = 417118;
name = "Stephen Sherratt";
};
steveej = { steveej = {
email = "mail@stefanjunker.de"; email = "mail@stefanjunker.de";
github = "steveej"; github = "steveej";

View file

@ -617,6 +617,77 @@
be removed in 22.05. be removed in 22.05.
</para> </para>
</listitem> </listitem>
<listitem>
<para>
The order of NSS (host) modules has been brought in line with
upstream recommendations:
</para>
<itemizedlist spacing="compact">
<listitem>
<para>
The <literal>myhostname</literal> module is placed before
the <literal>resolve</literal> (optional) and
<literal>dns</literal> entries, but after
<literal>file</literal> (to allow overriding via
<literal>/etc/hosts</literal> /
<literal>networking.extraHosts</literal>, and prevent ISPs
with catchall-DNS resolvers from hijacking
<literal>.localhost</literal> domains)
</para>
</listitem>
<listitem>
<para>
The <literal>mymachines</literal> module, which provides
hostname resolution for local containers (registered with
<literal>systemd-machined</literal>) is placed to the
front, to make sure its mappings are preferred over other
resolvers.
</para>
</listitem>
<listitem>
<para>
If systemd-networkd is enabled, the
<literal>resolve</literal> module is placed before
<literal>files</literal> and
<literal>myhostname</literal>, as it provides the same
logic internally, with caching.
</para>
</listitem>
<listitem>
<para>
The <literal>mdns(_minimal)</literal> module has been
updated to the new priorities.
</para>
</listitem>
</itemizedlist>
<para>
If you use your own NSS host modules, make sure to update your
priorities according to these rules:
</para>
<itemizedlist spacing="compact">
<listitem>
<para>
NSS modules which should be queried before
<literal>resolved</literal> DNS resolution should use
mkBefore.
</para>
</listitem>
<listitem>
<para>
NSS modules which should be queried after
<literal>resolved</literal>, <literal>files</literal> and
<literal>myhostname</literal>, but before
<literal>dns</literal> should use the default priority
</para>
</listitem>
<listitem>
<para>
NSS modules which should come after <literal>dns</literal>
should use mkAfter.
</para>
</listitem>
</itemizedlist>
</listitem>
</itemizedlist> </itemizedlist>
</section> </section>
</section> </section>

View file

@ -155,3 +155,27 @@ pt-services.clipcat.enable).
- The wordpress module provides a new interface which allows to use different webservers with the new option [`services.wordpress.webserver`](options.html#opt-services.wordpress.webserver). Currently `httpd` and `nginx` are supported. The definitions of wordpress sites should now be set in [`services.wordpress.sites`](options.html#opt-services.wordpress.sites). - The wordpress module provides a new interface which allows to use different webservers with the new option [`services.wordpress.webserver`](options.html#opt-services.wordpress.webserver). Currently `httpd` and `nginx` are supported. The definitions of wordpress sites should now be set in [`services.wordpress.sites`](options.html#opt-services.wordpress.sites).
Sites definitions that use the old interface are automatically migrated in the new option. This backward compatibility will be removed in 22.05. Sites definitions that use the old interface are automatically migrated in the new option. This backward compatibility will be removed in 22.05.
- The order of NSS (host) modules has been brought in line with upstream
recommendations:
- The `myhostname` module is placed before the `resolve` (optional) and `dns`
entries, but after `file` (to allow overriding via `/etc/hosts` /
`networking.extraHosts`, and prevent ISPs with catchall-DNS resolvers from
hijacking `.localhost` domains)
- The `mymachines` module, which provides hostname resolution for local
containers (registered with `systemd-machined`) is placed to the front, to
make sure its mappings are preferred over other resolvers.
- If systemd-networkd is enabled, the `resolve` module is placed before
`files` and `myhostname`, as it provides the same logic internally, with
caching.
- The `mdns(_minimal)` module has been updated to the new priorities.
If you use your own NSS host modules, make sure to update your priorities
according to these rules:
- NSS modules which should be queried before `resolved` DNS resolution should
use mkBefore.
- NSS modules which should be queried after `resolved`, `files` and
`myhostname`, but before `dns` should use the default priority
- NSS modules which should come after `dns` should use mkAfter.

View file

@ -124,8 +124,8 @@ with lib;
group = mkBefore [ "files" ]; group = mkBefore [ "files" ];
shadow = mkBefore [ "files" ]; shadow = mkBefore [ "files" ];
hosts = mkMerge [ hosts = mkMerge [
(mkBefore [ "files" ]) (mkOrder 998 [ "files" ])
(mkAfter [ "dns" ]) (mkOrder 1499 [ "dns" ])
]; ];
services = mkBefore [ "files" ]; services = mkBefore [ "files" ];
}; };

View file

@ -127,6 +127,15 @@ let
''; '';
}; };
options = mkOption {
default = [ "defaults" ];
example = [ "nofail" ];
type = types.listOf types.nonEmptyStr;
description = ''
Options used to mount the swap.
'';
};
deviceName = mkOption { deviceName = mkOption {
type = types.str; type = types.str;
internal = true; internal = true;
@ -215,7 +224,7 @@ in
fi fi
''} ''}
${optionalString sw.randomEncryption.enable '' ${optionalString sw.randomEncryption.enable ''
cryptsetup plainOpen -c ${sw.randomEncryption.cipher} -d ${sw.randomEncryption.source} ${sw.device} ${sw.deviceName} cryptsetup plainOpen -c ${sw.randomEncryption.cipher} -d ${sw.randomEncryption.source} ${optionalString (sw.discardPolicy != null) "--allow-discards"} ${sw.device} ${sw.deviceName}
mkswap ${sw.realDevice} mkswap ${sw.realDevice}
''} ''}
''; '';

View file

@ -9,7 +9,7 @@ with lib;
hardware.sensor.iio = { hardware.sensor.iio = {
enable = mkOption { enable = mkOption {
description = '' description = ''
Enable this option to support IIO sensors. Enable this option to support IIO sensors with iio-sensor-proxy.
IIO sensors are used for orientation and ambient light IIO sensors are used for orientation and ambient light
sensors on some mobile devices. sensors on some mobile devices.

View file

@ -2,7 +2,13 @@
with lib; with lib;
let let
cfg = config.services.klipper; cfg = config.services.klipper;
format = pkgs.formats.ini { mkKeyValue = generators.mkKeyValueDefault {} ":"; }; format = pkgs.formats.ini {
# https://github.com/NixOS/nixpkgs/pull/121613#issuecomment-885241996
listToValue = l:
if builtins.length l == 1 then generators.mkValueStringDefault {} (head l)
else lib.concatMapStrings (s: "\n ${generators.mkValueStringDefault {} s}") l;
mkKeyValue = generators.mkKeyValueDefault {} ":";
};
in in
{ {
##### interface ##### interface

View file

@ -240,8 +240,8 @@ in
system.nssModules = optional cfg.nssmdns pkgs.nssmdns; system.nssModules = optional cfg.nssmdns pkgs.nssmdns;
system.nssDatabases.hosts = optionals cfg.nssmdns (mkMerge [ system.nssDatabases.hosts = optionals cfg.nssmdns (mkMerge [
(mkOrder 900 [ "mdns_minimal [NOTFOUND=return]" ]) # must be before resolve (mkBefore [ "mdns_minimal [NOTFOUND=return]" ]) # before resolve
(mkOrder 1501 [ "mdns" ]) # 1501 to ensure it's after dns (mkAfter [ "mdns" ]) # after dns
]); ]);
environment.systemPackages = [ pkgs.avahi ]; environment.systemPackages = [ pkgs.avahi ];

View file

@ -699,7 +699,6 @@ in {
}; };
extraConfig = '' extraConfig = ''
index index.php index.html /index.php$request_uri; index index.php index.html /index.php$request_uri;
expires 1m;
add_header X-Content-Type-Options nosniff; add_header X-Content-Type-Options nosniff;
add_header X-XSS-Protection "1; mode=block"; add_header X-XSS-Protection "1; mode=block";
add_header X-Robots-Tag none; add_header X-Robots-Tag none;

View file

@ -140,7 +140,8 @@ in
# add resolve to nss hosts database if enabled and nscd enabled # add resolve to nss hosts database if enabled and nscd enabled
# system.nssModules is configured in nixos/modules/system/boot/systemd.nix # system.nssModules is configured in nixos/modules/system/boot/systemd.nix
system.nssDatabases.hosts = optional config.services.nscd.enable "resolve [!UNAVAIL=return]"; # added with order 501 to allow modules to go before with mkBefore
system.nssDatabases.hosts = (mkOrder 501 ["resolve [!UNAVAIL=return]"]);
systemd.additionalUpstreamSystemUnits = [ systemd.additionalUpstreamSystemUnits = [
"systemd-resolved.service" "systemd-resolved.service"

View file

@ -925,9 +925,8 @@ in
system.nssModules = [ systemd.out ]; system.nssModules = [ systemd.out ];
system.nssDatabases = { system.nssDatabases = {
hosts = (mkMerge [ hosts = (mkMerge [
[ "mymachines" ] (mkOrder 400 ["mymachines"]) # 400 to ensure it comes before resolve (which is mkBefore'd)
(mkOrder 1600 [ "myhostname" ] # 1600 to ensure it's always the last (mkOrder 999 ["myhostname"]) # after files (which is 998), but before regular nss modules
)
]); ]);
passwd = (mkMerge [ passwd = (mkMerge [
(mkAfter [ "systemd" ]) (mkAfter [ "systemd" ])

View file

@ -255,7 +255,7 @@ in
# https://wiki.archlinux.org/index.php/fstab#Filepath_spaces # https://wiki.archlinux.org/index.php/fstab#Filepath_spaces
escape = string: builtins.replaceStrings [ " " "\t" ] [ "\\040" "\\011" ] string; escape = string: builtins.replaceStrings [ " " "\t" ] [ "\\040" "\\011" ] string;
swapOptions = sw: concatStringsSep "," ( swapOptions = sw: concatStringsSep "," (
[ "defaults" ] sw.options
++ optional (sw.priority != null) "pri=${toString sw.priority}" ++ optional (sw.priority != null) "pri=${toString sw.priority}"
++ optional (sw.discardPolicy != null) "discard${optionalString (sw.discardPolicy != "both") "=${toString sw.discardPolicy}"}" ++ optional (sw.discardPolicy != null) "discard${optionalString (sw.discardPolicy != "both") "=${toString sw.discardPolicy}"}"
); );

View file

@ -440,6 +440,7 @@ in
txredisapi = handleTest ./txredisapi.nix {}; txredisapi = handleTest ./txredisapi.nix {};
tuptime = handleTest ./tuptime.nix {}; tuptime = handleTest ./tuptime.nix {};
turbovnc-headless-server = handleTest ./turbovnc-headless-server.nix {}; turbovnc-headless-server = handleTest ./turbovnc-headless-server.nix {};
tuxguitar = handleTest ./tuxguitar.nix {};
ucarp = handleTest ./ucarp.nix {}; ucarp = handleTest ./ucarp.nix {};
ucg = handleTest ./ucg.nix {}; ucg = handleTest ./ucg.nix {};
udisks2 = handleTest ./udisks2.nix {}; udisks2 = handleTest ./udisks2.nix {};

View file

@ -239,7 +239,8 @@ mapAttrs (channel: chromiumPkg: makeTest rec {
with test_new_win("gpu_info", "chrome://gpu", "chrome://gpu"): with test_new_win("gpu_info", "chrome://gpu", "chrome://gpu"):
pass # To check the text rendering (catches regressions like #131074):
machine.wait_for_text("Graphics Feature Status")
machine.shutdown() machine.shutdown()

View file

@ -40,7 +40,7 @@ import ./make-test-python.nix ({ pkgs, ... }: {
assert task_name == "Test Task" assert task_name == "Test Task"
machine.succeed("curl -sSfI http://localhost/api/tasks 2>&1 | grep '401 Unauthorized'") machine.succeed("curl -sSI http://localhost/api/tasks 2>&1 | grep '401 Unauthorized'")
machine.shutdown() machine.shutdown()
''; '';

24
nixos/tests/tuxguitar.nix Normal file
View file

@ -0,0 +1,24 @@
import ./make-test-python.nix ({ pkgs, ... }: {
name = "tuxguitar";
meta = with pkgs.lib.maintainers; {
maintainers = [ asbachb ];
};
machine = { config, pkgs, ... }: {
imports = [
./common/x11.nix
];
services.xserver.enable = true;
environment.systemPackages = [ pkgs.tuxguitar ];
};
testScript = ''
machine.wait_for_x()
machine.succeed("tuxguitar &")
machine.wait_for_window("TuxGuitar - Untitled.tg")
machine.sleep(1)
machine.screenshot("tuxguitar")
'';
})

View file

@ -0,0 +1,39 @@
{ lib, stdenv, fetchFromGitHub, pkg-config, deadbeef, gtk3, perl
, libdbusmenu-glib }:
stdenv.mkDerivation rec {
pname = "deadbeef-statusnotifier-plugin";
version = "1.6";
src = fetchFromGitHub {
owner = "vovochka404";
repo = "deadbeef-statusnotifier-plugin";
rev = "v${version}";
sha256 = "sha256-6WEbY59vPNrL3W5GUwFQJimmSS+td8Ob+G46fPAxfV4=";
};
nativeBuildInputs = [ pkg-config ];
buildInputs = [ deadbeef gtk3 libdbusmenu-glib ];
buildFlags = [ "gtk3" ];
postPatch = ''
substituteInPlace tools/glib-mkenums \
--replace /usr/bin/perl "${perl}/bin/perl"
'';
installPhase = ''
runHook preInstall
mkdir -p $out/lib/deadbeef
cp build/sni_gtk3.so $out/lib/deadbeef
runHook postInstall
'';
meta = with lib; {
description = "DeaDBeeF StatusNotifier Plugin";
homepage = "https://github.com/vovochka404/deadbeef-statusnotifier-plugin";
license = licenses.gpl3Plus;
maintainers = [ maintainers.kurnevsky ];
platforms = platforms.linux;
};
}

View file

@ -9,17 +9,17 @@ let
in buildGoModule rec { in buildGoModule rec {
pname = "go-ethereum"; pname = "go-ethereum";
version = "1.10.5"; version = "1.10.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ethereum"; owner = "ethereum";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256:1226picbgnph71fk2y0n1hyfrh6m8sh54kgn3pmikydnw176k9j1"; sha256 = "sha256-4lapkoxSKdXlD6rmUxnlSKrfH+DeV6/wV05CqJjuzjA=";
}; };
runVend = true; runVend = true;
vendorSha256 = "sha256:1nf2gamamlgr2sl5ibib5wai1pipj66xhbhnb4s4480j5pbv9a76"; vendorSha256 = "sha256-5qi01y0SIEI0WRYu2I2RN94QFS8rrlioFvnRqqp6wtk=";
doCheck = false; doCheck = false;

View file

@ -2885,10 +2885,10 @@
elpaBuild { elpaBuild {
pname = "pyim"; pname = "pyim";
ename = "pyim"; ename = "pyim";
version = "3.9.2"; version = "3.9.3";
src = fetchurl { src = fetchurl {
url = "https://elpa.gnu.org/packages/pyim-3.9.2.tar"; url = "https://elpa.gnu.org/packages/pyim-3.9.3.tar";
sha256 = "18m5wni1zns8fad2ll9flbfgxfy14gi03apnycajdbqxsqfp65j9"; sha256 = "0rjaimvbh0fadbqiq4ggyxr0y4pfzld76wb64v7l5874qczn8dfr";
}; };
packageRequires = [ async emacs xr ]; packageRequires = [ async emacs xr ];
meta = { meta = {

View file

@ -4,10 +4,10 @@
elpaBuild { elpaBuild {
pname = "org"; pname = "org";
ename = "org"; ename = "org";
version = "20210712"; version = "20210719";
src = fetchurl { src = fetchurl {
url = "https://orgmode.org/elpa/org-20210712.tar"; url = "https://orgmode.org/elpa/org-20210719.tar";
sha256 = "0xdxzfk7hvsmlyivn61ivci6hy2alxg2ysdm5xad4xxz337jrj7x"; sha256 = "1aravj0krdi8bnfinfj1d92vq3g06djxcnpipibkrw9ggk0d01d6";
}; };
packageRequires = []; packageRequires = [];
meta = { meta = {
@ -19,10 +19,10 @@
elpaBuild { elpaBuild {
pname = "org-plus-contrib"; pname = "org-plus-contrib";
ename = "org-plus-contrib"; ename = "org-plus-contrib";
version = "20210712"; version = "20210719";
src = fetchurl { src = fetchurl {
url = "https://orgmode.org/elpa/org-plus-contrib-20210712.tar"; url = "https://orgmode.org/elpa/org-plus-contrib-20210719.tar";
sha256 = "1cdpwsfjmjplyik1r9kl4lvd5lm52zrixlfg2ml1mhh28s680k0q"; sha256 = "1knjkf365cnjd8sdhaisjx0n6n0l2zfpql1b2gzw0gj62kbpl476";
}; };
packageRequires = []; packageRequires = [];
meta = { meta = {

View file

@ -1,16 +1,16 @@
{ lib, stdenv, fetchurl, swt, jdk, makeWrapper, alsa-lib, jack2, fluidsynth, libpulseaudio }: { lib, stdenv, fetchurl, swt, jre, makeWrapper, alsa-lib, jack2, fluidsynth, libpulseaudio }:
let metadata = assert stdenv.hostPlatform.system == "i686-linux" || stdenv.hostPlatform.system == "x86_64-linux"; let metadata = assert stdenv.hostPlatform.system == "i686-linux" || stdenv.hostPlatform.system == "x86_64-linux";
if stdenv.hostPlatform.system == "i686-linux" then if stdenv.hostPlatform.system == "i686-linux" then
{ arch = "x86"; sha256 = "27675c358db237df74d20e8676000c25a87b9de0bb0a6d1c325e8d6db807d296"; } { arch = "x86"; sha256 = "afa4b1116aee18e3ddd93132467809d0bcf03715cf9ad55b895f021a13e1cb8a"; }
else else
{ arch = "x86_64"; sha256 = "298555a249adb3ad72f3aef72a124e30bfa01cd069c7b5d152a738140e7903a2"; }; { arch = "x86_64"; sha256 = "55ab653c601727a2077080e7ea4d76fe7a897379934ed9a5b544e20d490f53f9"; };
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
version = "1.5.2"; version = "1.5.4";
pname = "tuxguitar"; pname = "tuxguitar";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/tuxguitar/${pname}-${version}-linux-${metadata.arch}.tar.gz"; url = "mirror://sourceforge/${pname}/${pname}-${version}-linux-${metadata.arch}.tar.gz";
sha256 = metadata.sha256; sha256 = metadata.sha256;
}; };
@ -26,7 +26,7 @@ in stdenv.mkDerivation rec {
ln -s $out/share $out/bin/share ln -s $out/share $out/bin/share
wrapProgram $out/bin/tuxguitar \ wrapProgram $out/bin/tuxguitar \
--set JAVA "${jdk}/bin/java" \ --set JAVA "${jre}/bin/java" \
--prefix LD_LIBRARY_PATH : "$out/lib/:${lib.makeLibraryPath [ swt alsa-lib jack2 fluidsynth libpulseaudio ]}" \ --prefix LD_LIBRARY_PATH : "$out/lib/:${lib.makeLibraryPath [ swt alsa-lib jack2 fluidsynth libpulseaudio ]}" \
--prefix CLASSPATH : "${swt}/jars/swt.jar:$out/lib/tuxguitar.jar:$out/lib/itext.jar" --prefix CLASSPATH : "${swt}/jars/swt.jar:$out/lib/tuxguitar.jar:$out/lib/itext.jar"
''; '';

View file

@ -11,13 +11,13 @@ assert x11Support -> xorg != null;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "bemenu"; pname = "bemenu";
version = "0.6.2"; version = "0.6.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Cloudef"; owner = "Cloudef";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "sha256-2xmi/Mh5iU50yc2R1x1yzP8Xaz+mUgLnH73tAeLwxI8="; sha256 = "sha256-U4IMfDvQ0rfEJhE3Uext2c/Cs0mjy1tw+k8uk441Ag8=";
}; };
nativeBuildInputs = [ pkg-config pcre ]; nativeBuildInputs = [ pkg-config pcre ];

View file

@ -8,13 +8,13 @@
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
pname = "bottles"; pname = "bottles";
version = "3.1.6"; version = "2021.7.14-treviso";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "bottlesdevs"; owner = "bottlesdevs";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "1izks01010akjf83xvi70dr4yzgk6yr84kd0slzz22yq204pdh5m"; sha256 = "0xhfk1ll8vacgrr0kkhynq4bryjhfjs29j824bark5mj9b6lkbix";
}; };
postPatch = '' postPatch = ''
@ -44,6 +44,8 @@ python3Packages.buildPythonApplication rec {
]; ];
propagatedBuildInputs = with python3Packages; [ propagatedBuildInputs = with python3Packages; [
pyyaml
requests
pycairo pycairo
pygobject3 pygobject3
lxml lxml

View file

@ -0,0 +1,45 @@
{ lib, stdenv, fetchFromGitHub, addOpenGLRunpath, cudatoolkit }:
stdenv.mkDerivation rec {
pname = "gpu-burn";
version = "unstable-2021-04-29";
src = fetchFromGitHub {
owner = "wilicc";
repo = "gpu-burn";
rev = "1e9a84f4bec3b0835c00daace45d79ed6c488edb";
sha256 = "sha256-x+kta81Z08PsBgbf+fzRTXhNXUPBd5w8bST/T5nNiQA=";
};
postPatch = ''
substituteInPlace gpu_burn-drv.cpp \
--replace "const char *kernelFile = \"compare.ptx\";" \
"const char *kernelFile = \"$out/share/compare.ptx\";"
'';
buildInputs = [ cudatoolkit ];
nativeBuildInputs = [ addOpenGLRunpath ];
makeFlags = [ "CUDAPATH=${cudatoolkit}" ];
LDFLAGS = "-L${cudatoolkit}/lib/stubs";
installPhase = ''
mkdir -p $out/{bin,share}
cp gpu_burn $out/bin/
cp compare.ptx $out/share/
'';
postFixup = ''
addOpenGLRunpath $out/bin/gpu_burn
'';
meta = with lib; {
homepage = "http://wili.cc/blog/gpu-burn.html";
description = "Multi-GPU CUDA stress test";
platforms = platforms.linux;
maintainers = with maintainers; [ elohmeier ];
license = licenses.bsd2;
};
}

View file

@ -12,18 +12,27 @@ let
sha256 = "ebbb777cbf9312359b897bf81ba00dae0f5cb69fba2a18265dcc18a6f5ef7519"; sha256 = "ebbb777cbf9312359b897bf81ba00dae0f5cb69fba2a18265dcc18a6f5ef7519";
}; };
}); });
flask_migrate = super.flask_migrate.overridePythonAttrs (oldAttrs: rec {
version = "2.7.0";
src = oldAttrs.src.override {
inherit version;
sha256 = "ae2f05671588762dd83a21d8b18c51fe355e86783e24594995ff8d7380dffe38";
};
});
werkzeug = self.callPackage ../../../development/python-modules/werkzeug/1.nix { };
flask = self.callPackage ../../../development/python-modules/flask/1.nix { };
}; };
}; };
in in
python3'.pkgs.buildPythonPackage rec { python3'.pkgs.buildPythonPackage rec {
pname = "privacyIDEA"; pname = "privacyIDEA";
version = "3.6"; version = "3.6.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = pname; owner = pname;
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-yywkQ3TdBzRMbJGY0Seaprztgt0JrCAbgqosMQ5fcQM="; sha256 = "sha256-NRfTEZ/6K6xLP+wcT6o54wqk/EyWTiiC9W1KDgaAEbg=";
fetchSubmodules = true; fetchSubmodules = true;
}; };

View file

@ -84,7 +84,7 @@ mkChromiumDerivation (base: rec {
else "https://www.chromium.org/"; else "https://www.chromium.org/";
maintainers = with maintainers; if ungoogled maintainers = with maintainers; if ungoogled
then [ squalus primeos ] then [ squalus primeos ]
else [ primeos thefloweringash bendlas ]; else [ primeos thefloweringash ];
license = if enableWideVine then licenses.unfree else licenses.bsd3; license = if enableWideVine then licenses.unfree else licenses.bsd3;
platforms = platforms.linux; platforms = platforms.linux;
mainProgram = "chromium"; mainProgram = "chromium";

View file

@ -7,10 +7,10 @@ in
rec { rec {
firefox = common rec { firefox = common rec {
pname = "firefox"; pname = "firefox";
ffversion = "90.0.1"; ffversion = "90.0.2";
src = fetchurl { src = fetchurl {
url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz";
sha512 = "9f87c3f3dad33e42a7a9d2161d7f23ff2e7184b2274f9081511c7982957ae9954784bd844a2348ff4744231415aac195d1f12971392db90be0375b4738acb590"; sha512 = "4fda0b1e666fb0b1d846708fad2b48a5b53d48e7fc2a5da1f234b5b839c55265b41f6509e6b506d5e8a7455f816dfa5ab538589bc9e83b7e3846f0f72210513e";
}; };
meta = { meta = {

View file

@ -2,18 +2,18 @@
buildGoModule rec { buildGoModule rec {
pname = "argocd"; pname = "argocd";
version = "2.0.4"; version = "2.0.5";
commit = "0842d448107eb1397b251e63ec4d4bc1b4efdd6e"; commit = "4c94d886f56bcb2f9d5b3251fdc049c2d1354b88";
tag = "v${version}"; tag = "v${version}";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "argoproj"; owner = "argoproj";
repo = "argo-cd"; repo = "argo-cd";
rev = tag; rev = tag;
sha256 = "sha256-SKSAJtp20f6A+CvrsBEmbcNJAKI5b4Wm4K0cr/lGo64="; sha256 = "sha256-8YymSR15e+6gGGqr5CH4ERHN8RO3wd9NJkM9K7InlFU=";
}; };
vendorSha256 = "sha256-RbEqivzTpXVQp4zl0zZWAh6qCr2KZSJ6Bj2pZaClQaQ="; vendorSha256 = "sha256-9dVkGl0gjjMehG2nt1eNpNT5fD9GbJ1mNMzYS8FTm08=";
nativeBuildInputs = [ packr makeWrapper installShellFiles ]; nativeBuildInputs = [ packr makeWrapper installShellFiles ];

View file

@ -44,12 +44,21 @@ with lib;
# Those pieces of software we entirely ignore upstream's handling of, and just # Those pieces of software we entirely ignore upstream's handling of, and just
# make sure they're in the path if desired. # make sure they're in the path if desired.
let let
k3sVersion = "1.21.2+k3s1"; # k3s git tag k3sVersion = "1.21.3+k3s1"; # k3s git tag
k3sCommit = "5a67e8dc473f8945e8e181f6f0b0dbbc387f6fca"; # k3s git commit at the above version k3sCommit = "1d1f220fbee9cdeb5416b76b707dde8c231121f2"; # k3s git commit at the above version
traefikChartVersion = "9.18.2"; # taken from ./scripts/download at TRAEFIK_VERSION traefikChartVersion = "9.18.2"; # taken from ./scripts/download at TRAEFIK_VERSION
k3sRootVersion = "0.8.1"; # taken from ./scripts/download at ROOT_VERSION k3sRootVersion = "0.9.1"; # taken from ./scripts/download at ROOT_VERSION
k3sCNIVersion = "0.8.6-k3s1"; # taken from ./scripts/version.sh at VERSION_CNIPLUGINS k3sCNIVersion = "0.8.6-k3s1"; # taken from ./scripts/version.sh at VERSION_CNIPLUGINS
baseMeta = {
description = "A lightweight Kubernetes distribution";
license = licenses.asl20;
homepage = "https://k3s.io";
maintainers = with maintainers; [ euank superherointj ];
platforms = platforms.linux;
};
# bundled into the k3s binary # bundled into the k3s binary
traefikChart = fetchurl { traefikChart = fetchurl {
url = "https://helm.traefik.io/traefik/traefik-${traefikChartVersion}.tgz"; url = "https://helm.traefik.io/traefik/traefik-${traefikChartVersion}.tgz";
@ -67,7 +76,7 @@ let
k3sRoot = fetchzip { k3sRoot = fetchzip {
# Note: marked as apache 2.0 license # Note: marked as apache 2.0 license
url = "https://github.com/k3s-io/k3s-root/releases/download/v${k3sRootVersion}/k3s-root-amd64.tar"; url = "https://github.com/k3s-io/k3s-root/releases/download/v${k3sRootVersion}/k3s-root-amd64.tar";
sha256 = "sha256-r3Nkzl9ccry7cgD3YWlHvEWOsWnnFGIkyRH9sx12gks="; sha256 = "sha256-qI84KYJKY/T6pqWZW9lOTq5NzZiu//v1zrMzUCiRTGQ=";
stripRoot = false; stripRoot = false;
}; };
k3sPlugins = buildGoPackage rec { k3sPlugins = buildGoPackage rec {
@ -84,12 +93,8 @@ let
sha256 = "sha256-uAy17eRRAXPCcnh481KxFMvFQecnnBs24jn5YnVNfY4="; sha256 = "sha256-uAy17eRRAXPCcnh481KxFMvFQecnnBs24jn5YnVNfY4=";
}; };
meta = { meta = baseMeta // {
description = "CNI plugins, as patched by rancher for k3s"; description = "CNI plugins, as patched by rancher for k3s";
license = licenses.asl20;
homepage = "https://k3s.io";
maintainers = [ maintainers.euank ];
platforms = platforms.linux;
}; };
}; };
# Grab this separately from a build because it's used by both stages of the # Grab this separately from a build because it's used by both stages of the
@ -97,7 +102,7 @@ let
k3sRepo = fetchgit { k3sRepo = fetchgit {
url = "https://github.com/k3s-io/k3s"; url = "https://github.com/k3s-io/k3s";
rev = "v${k3sVersion}"; rev = "v${k3sVersion}";
sha256 = "sha256-ZRkdHQ4RJ6XqE+DKE6wwpxetuKDG3k/4HaHyFxHev1U="; sha256 = "sha256-K4HVXFp5cpByEO4dUwmpzOuhsGh1k7X6k5aShCorTjg=";
}; };
# Stage 1 of the k3s build: # Stage 1 of the k3s build:
# Let's talk about how k3s is structured. # Let's talk about how k3s is structured.
@ -161,12 +166,8 @@ let
popd popd
''; '';
meta = { meta = baseMeta // {
description = "The various binaries that get packaged into the final k3s binary"; description = "The various binaries that get packaged into the final k3s binary";
license = licenses.asl20;
homepage = "https://k3s.io";
maintainers = [ maintainers.euank ];
platforms = platforms.linux;
}; };
}; };
k3sBin = buildGoPackage rec { k3sBin = buildGoPackage rec {
@ -228,12 +229,8 @@ let
popd popd
''; '';
meta = { meta = baseMeta // {
description = "The k3s go binary which is used by the final wrapped output below"; description = "The k3s go binary which is used by the final wrapped output below";
license = licenses.asl20;
homepage = "https://k3s.io";
maintainers = [ maintainers.euank ];
platforms = platforms.linux;
}; };
}; };
in in
@ -241,7 +238,7 @@ stdenv.mkDerivation rec {
pname = "k3s"; pname = "k3s";
version = k3sVersion; version = k3sVersion;
# Important utilities used by the kubelet, see # Important utilities used by the kubelet, see
# https://github.com/kubernetes/kubernetes/issues/26093#issuecomment-237202494 # https://github.com/kubernetes/kubernetes/issues/26093#issuecomment-237202494
# Note the list in that issue is stale and some aren't relevant for k3s. # Note the list in that issue is stale and some aren't relevant for k3s.
k3sRuntimeDeps = [ k3sRuntimeDeps = [
@ -279,11 +276,10 @@ stdenv.mkDerivation rec {
runHook postInstall runHook postInstall
''; '';
meta = { doInstallCheck = true;
description = "A lightweight Kubernetes distribution"; installCheckPhase = ''
license = licenses.asl20; $out/bin/k3s --version | grep v${k3sVersion} > /dev/null
homepage = "https://k3s.io"; '';
maintainers = [ maintainers.euank ];
platforms = platforms.linux; meta = baseMeta;
};
} }

View file

@ -50,8 +50,12 @@ let
x86_64-linux-version = "4.17.0"; x86_64-linux-version = "4.17.0";
x86_64-linux-sha256 = "07ccms58pq27ilkyhcf6cgwb7qrddwil5kgy8yv95ljikqzi5rxi"; x86_64-linux-sha256 = "07ccms58pq27ilkyhcf6cgwb7qrddwil5kgy8yv95ljikqzi5rxi";
aarch64-darwin-version = "4.17.0";
aarch64-darwin-sha256 = "1a5crmnbz8ng3z2pk5zw17dds9d5fyir4rkvv611fn858kq5fv46";
version = { version = {
x86_64-darwin = x86_64-darwin-version; x86_64-darwin = x86_64-darwin-version;
aarch64-darwin = aarch64-darwin-version;
x86_64-linux = x86_64-linux-version; x86_64-linux = x86_64-linux-version;
}.${system} or throwSystem; }.${system} or throwSystem;
@ -64,6 +68,10 @@ let
url = "${base}/releases/macos/${version}/prod/x64/Slack-${version}-macOS.dmg"; url = "${base}/releases/macos/${version}/prod/x64/Slack-${version}-macOS.dmg";
sha256 = x86_64-darwin-sha256; sha256 = x86_64-darwin-sha256;
}; };
aarch64-darwin = fetchurl {
url = "${base}/releases/macos/${version}/prod/arm64/Slack-${version}-macOS.dmg";
sha256 = aarch64-darwin-sha256;
};
x86_64-linux = fetchurl { x86_64-linux = fetchurl {
url = "${base}/linux_releases/slack-desktop-${version}-amd64.deb"; url = "${base}/linux_releases/slack-desktop-${version}-amd64.deb";
sha256 = x86_64-linux-sha256; sha256 = x86_64-linux-sha256;
@ -75,7 +83,7 @@ let
homepage = "https://slack.com"; homepage = "https://slack.com";
license = licenses.unfree; license = licenses.unfree;
maintainers = with maintainers; [ mmahut ]; maintainers = with maintainers; [ mmahut ];
platforms = [ "x86_64-darwin" "x86_64-linux" ]; platforms = [ "x86_64-darwin" "x86_64-linux" "aarch64-darwin"];
}; };
linux = stdenv.mkDerivation rec { linux = stdenv.mkDerivation rec {

View file

@ -1,11 +1,11 @@
{ mkDerivation, lib, fetchFromGitHub, callPackage, fetchpatch { mkDerivation, lib, fetchFromGitHub, callPackage, fetchpatch
, pkg-config, cmake, ninja, python3, wrapGAppsHook, wrapQtAppsHook, removeReferencesTo , pkg-config, cmake, ninja, python3, wrapGAppsHook, wrapQtAppsHook
, qtbase, qtimageformats, gtk3, libsForQt5, lz4, xxHash , qtbase, qtimageformats, gtk3, libsForQt5, lz4, xxHash
, ffmpeg, openalSoft, minizip, libopus, alsa-lib, libpulseaudio, range-v3 , ffmpeg, openalSoft, minizip, libopus, alsa-lib, libpulseaudio, range-v3
, tl-expected, hunspell, glibmm, webkitgtk, jemalloc , tl-expected, hunspell, glibmm, webkitgtk, jemalloc
, libtgvoip, rnnoise, abseil-cpp, extra-cmake-modules , rnnoise, extra-cmake-modules
# Transitive dependencies: # Transitive dependencies:
, pcre, xorg, util-linux, libselinux, libsepol, epoxy , pcre, xorg, util-linuxMinimal, libselinux, libsepol, epoxy
, at-spi2-core, libXtst, libthai, libdatrie , at-spi2-core, libXtst, libthai, libdatrie
, xdg-utils, libsysprof-capture, libpsl, brotli , xdg-utils, libsysprof-capture, libpsl, brotli
}: }:
@ -46,22 +46,33 @@ in mkDerivation rec {
postPatch = '' postPatch = ''
substituteInPlace Telegram/CMakeLists.txt \ substituteInPlace Telegram/CMakeLists.txt \
--replace '"''${TDESKTOP_LAUNCHER_BASENAME}.appdata.xml"' '"''${TDESKTOP_LAUNCHER_BASENAME}.metainfo.xml"' --replace '"''${TDESKTOP_LAUNCHER_BASENAME}.appdata.xml"' '"''${TDESKTOP_LAUNCHER_BASENAME}.metainfo.xml"'
substituteInPlace Telegram/ThirdParty/libtgvoip/os/linux/AudioInputALSA.cpp \
--replace '"libasound.so.2"' '"${alsa-lib}/lib/libasound.so.2"'
substituteInPlace Telegram/ThirdParty/libtgvoip/os/linux/AudioOutputALSA.cpp \
--replace '"libasound.so.2"' '"${alsa-lib}/lib/libasound.so.2"'
substituteInPlace Telegram/ThirdParty/libtgvoip/os/linux/AudioPulse.cpp \
--replace '"libpulse.so.0"' '"${libpulseaudio}/lib/libpulse.so.0"'
''; '';
# We want to run wrapProgram manually (with additional parameters) # We want to run wrapProgram manually (with additional parameters)
dontWrapGApps = true; dontWrapGApps = true;
dontWrapQtApps = true; dontWrapQtApps = true;
nativeBuildInputs = [ pkg-config cmake ninja python3 wrapGAppsHook wrapQtAppsHook removeReferencesTo ]; nativeBuildInputs = [
pkg-config cmake ninja python3 wrapGAppsHook wrapQtAppsHook
extra-cmake-modules
];
buildInputs = [ buildInputs = [
qtbase qtimageformats gtk3 libsForQt5.kwayland libsForQt5.libdbusmenu lz4 xxHash qtbase qtimageformats gtk3 libsForQt5.kwayland libsForQt5.libdbusmenu lz4 xxHash
ffmpeg openalSoft minizip libopus alsa-lib libpulseaudio range-v3 ffmpeg openalSoft minizip libopus alsa-lib libpulseaudio range-v3
tl-expected hunspell glibmm webkitgtk jemalloc tl-expected hunspell glibmm webkitgtk jemalloc
libtgvoip rnnoise abseil-cpp extra-cmake-modules rnnoise
tg_owt tg_owt
# Transitive dependencies: # Transitive dependencies:
pcre xorg.libpthreadstubs xorg.libXdmcp util-linux libselinux libsepol epoxy util-linuxMinimal # Required for libmount thus not nativeBuildInputs.
pcre xorg.libpthreadstubs xorg.libXdmcp libselinux libsepol epoxy
at-spi2-core libXtst libthai libdatrie libsysprof-capture libpsl brotli at-spi2-core libXtst libthai libdatrie libsysprof-capture libpsl brotli
]; ];
@ -70,19 +81,17 @@ in mkDerivation rec {
# We're allowed to used the API ID of the Snap package: # We're allowed to used the API ID of the Snap package:
"-DTDESKTOP_API_ID=611335" "-DTDESKTOP_API_ID=611335"
"-DTDESKTOP_API_HASH=d524b414d21f4d37f08684c1df41ac9c" "-DTDESKTOP_API_HASH=d524b414d21f4d37f08684c1df41ac9c"
#"-DDESKTOP_APP_SPECIAL_TARGET=\"\"" # TODO: Error when set to "": Bad special target '""' # See: https://github.com/NixOS/nixpkgs/pull/130827#issuecomment-885212649
"-DTDESKTOP_LAUNCHER_BASENAME=telegramdesktop" # Note: This is the default "-DDESKTOP_APP_USE_PACKAGED_FONTS=OFF"
]; ];
# Note: The following packages could be packaged system-wide, but it's # Note: The following packages could be packaged system-wide, but it's
# probably best to use the bundled ones from tdesktop (Arch does this too): # probably best to use the bundled ones from tdesktop (Arch does this too):
# rlottie: # rlottie:
# - CMake flag: "-DTDESKTOP_USE_PACKAGED_TGVOIP=ON"
# - Sources (problem: there are no stable releases!): # - Sources (problem: there are no stable releases!):
# - desktop-app (tdesktop): https://github.com/desktop-app/rlottie # - desktop-app (tdesktop): https://github.com/desktop-app/rlottie
# - upstream: https://github.com/Samsung/rlottie # - upstream: https://github.com/Samsung/rlottie
# libtgvoip: # libtgvoip:
# - CMake flag: "-DDESKTOP_APP_USE_PACKAGED_RLOTTIE=ON"
# - Sources (problem: the stable releases might be too old!): # - Sources (problem: the stable releases might be too old!):
# - tdesktop: https://github.com/telegramdesktop/libtgvoip # - tdesktop: https://github.com/telegramdesktop/libtgvoip
# - upstream: https://github.com/grishka/libtgvoip # - upstream: https://github.com/grishka/libtgvoip
@ -113,10 +122,10 @@ in mkDerivation rec {
Desktop client for the Telegram messenger, based on the Telegram API and Desktop client for the Telegram messenger, based on the Telegram API and
the MTProto secure protocol. the MTProto secure protocol.
''; '';
license = licenses.gpl3; license = licenses.gpl3Only;
platforms = platforms.linux; platforms = platforms.linux;
homepage = "https://desktop.telegram.org/"; homepage = "https://desktop.telegram.org/";
changelog = "https://github.com/telegramdesktop/tdesktop/releases/tag/v{version}"; changelog = "https://github.com/telegramdesktop/tdesktop/releases/tag/v${version}";
maintainers = with maintainers; [ primeos abbradar ]; maintainers = with maintainers; [ primeos abbradar oxalica ];
}; };
} }

View file

@ -1,9 +1,9 @@
{ lib, stdenv, fetchFromGitHub, fetchpatch { lib, stdenv, fetchFromGitHub, fetchpatch
, pkg-config, cmake, ninja, yasm , pkg-config, cmake, ninja, yasm
, libjpeg, openssl, libopus, ffmpeg, alsa-lib, libpulseaudio, protobuf , libjpeg, openssl, libopus, ffmpeg, alsa-lib, libpulseaudio, protobuf
, xorg, libXtst, libXcomposite, libXdamage, libXext, libXrender, libXrandr , openh264, usrsctp, libevent, libvpx
, glib, abseil-cpp, pcre, util-linuxMinimal, libselinux, libsepol, pipewire , glib, abseil-cpp, pcre, util-linuxMinimal, libselinux, libsepol, pipewire
, libXi , xorg, libX11, libXtst, libXcomposite, libXdamage, libXext, libXrender, libXrandr, libXi
}: }:
stdenv.mkDerivation { stdenv.mkDerivation {
@ -24,15 +24,23 @@ stdenv.mkDerivation {
buildInputs = [ buildInputs = [
libjpeg openssl libopus ffmpeg alsa-lib libpulseaudio protobuf libjpeg openssl libopus ffmpeg alsa-lib libpulseaudio protobuf
xorg.libX11 libXtst libXcomposite libXdamage libXext libXrender libXrandr openh264 usrsctp libevent libvpx
libX11 libXtst libXcomposite libXdamage libXext libXrender libXrandr libXi
glib abseil-cpp pcre util-linuxMinimal libselinux libsepol pipewire glib abseil-cpp pcre util-linuxMinimal libselinux libsepol pipewire
libXi
]; ];
cmakeFlags = [ cmakeFlags = [
# Building as a shared library isn't officially supported and currently broken: # Building as a shared library isn't officially supported and may break at any time.
"-DBUILD_SHARED_LIBS=OFF" "-DBUILD_SHARED_LIBS=OFF"
]; ];
meta.license = lib.licenses.bsd3; propagatedBuildInputs = [
# Required for linking downstream binaries.
abseil-cpp openh264 usrsctp libevent libvpx
];
meta = with lib; {
license = licenses.bsd3;
maintainers = with maintainers; [ oxalica ];
};
} }

View file

@ -71,7 +71,3 @@ if __name__ == "__main__":
tg_owt_hash = nix_prefetch_git('https://github.com/desktop-app/tg_owt.git', tg_owt_ref) tg_owt_hash = nix_prefetch_git('https://github.com/desktop-app/tg_owt.git', tg_owt_ref)
update_file('tg_owt.nix', tg_owt_version, tg_owt_hash, tg_owt_ref) update_file('tg_owt.nix', tg_owt_version, tg_owt_hash, tg_owt_ref)
tg_owt_ref = github_api_request('repos/desktop-app/tg_owt/commits/master')['sha'] tg_owt_ref = github_api_request('repos/desktop-app/tg_owt/commits/master')['sha']
libtgvoip_ref = github_api_request(f'repos/telegramdesktop/tdesktop/contents/Telegram/ThirdParty/libtgvoip?ref={tdesktop_tag}')['sha']
libtgvoip_version = get_commit_date('telegramdesktop/libtgvoip', libtgvoip_ref)
libtgvoip_hash = nix_prefetch_url(f'https://github.com/telegramdesktop/libtgvoip/archive/{libtgvoip_ref}.tar.gz', unpack=True)
update_file('../../../../../development/libraries/libtgvoip/default.nix', libtgvoip_version, libtgvoip_hash, libtgvoip_ref)

View file

@ -2,13 +2,13 @@
buildGoModule rec { buildGoModule rec {
pname = "ipfs"; pname = "ipfs";
version = "0.9.0"; version = "0.9.1";
rev = "v${version}"; rev = "v${version}";
# go-ipfs makes changes to it's source tarball that don't match the git source. # go-ipfs makes changes to it's source tarball that don't match the git source.
src = fetchurl { src = fetchurl {
url = "https://github.com/ipfs/go-ipfs/releases/download/${rev}/go-ipfs-source.tar.gz"; url = "https://github.com/ipfs/go-ipfs/releases/download/${rev}/go-ipfs-source.tar.gz";
sha256 = "sha256:1fyffnw1d860w7gwm6ijbgrh68297z5bmvww8yqfshm3xgvcs6bf"; sha256 = "sha256-RliyIEtNgwzbLVwl6T38VIbhc12CZMBc3LZ6T/llaHc=";
}; };
# tarball contains multiple files/directories # tarball contains multiple files/directories
@ -29,10 +29,13 @@ buildGoModule rec {
postInstall = '' postInstall = ''
install --mode=444 -D misc/systemd/ipfs.service $out/etc/systemd/system/ipfs.service install --mode=444 -D misc/systemd/ipfs.service $out/etc/systemd/system/ipfs.service
install --mode=444 -D misc/systemd/ipfs-hardened.service $out/etc/systemd/system/ipfs-hardened.service
install --mode=444 -D misc/systemd/ipfs-api.socket $out/etc/systemd/system/ipfs-api.socket install --mode=444 -D misc/systemd/ipfs-api.socket $out/etc/systemd/system/ipfs-api.socket
install --mode=444 -D misc/systemd/ipfs-gateway.socket $out/etc/systemd/system/ipfs-gateway.socket install --mode=444 -D misc/systemd/ipfs-gateway.socket $out/etc/systemd/system/ipfs-gateway.socket
substituteInPlace $out/etc/systemd/system/ipfs.service \ substituteInPlace $out/etc/systemd/system/ipfs.service \
--replace /usr/bin/ipfs $out/bin/ipfs --replace /usr/bin/ipfs $out/bin/ipfs
substituteInPlace $out/etc/systemd/system/ipfs-hardened.service \
--replace /usr/bin/ipfs $out/bin/ipfs
''; '';
meta = with lib; { meta = with lib; {

View file

@ -161,11 +161,11 @@
md5name = "e61677e8799ce6e55b25afc11aa5339113f6a49cff031f336e32fa58635b1a4a-libetonyek-0.1.9.tar.xz"; md5name = "e61677e8799ce6e55b25afc11aa5339113f6a49cff031f336e32fa58635b1a4a-libetonyek-0.1.9.tar.xz";
} }
{ {
name = "expat-2.2.8.tar.bz2"; name = "expat-2.4.1.tar.bz2";
url = "https://dev-www.libreoffice.org/src/expat-2.2.8.tar.bz2"; url = "https://dev-www.libreoffice.org/src/expat-2.4.1.tar.bz2";
sha256 = "9a130948b05a82da34e4171d5f5ae5d321d9630277af02c8fa51e431f6475102"; sha256 = "2f9b6a580b94577b150a7d5617ad4643a4301a6616ff459307df3e225bcfbf40";
md5 = ""; md5 = "";
md5name = "9a130948b05a82da34e4171d5f5ae5d321d9630277af02c8fa51e431f6475102-expat-2.2.8.tar.bz2"; md5name = "2f9b6a580b94577b150a7d5617ad4643a4301a6616ff459307df3e225bcfbf40-expat-2.4.1.tar.bz2";
} }
{ {
name = "Firebird-3.0.0.32483-0.tar.bz2"; name = "Firebird-3.0.0.32483-0.tar.bz2";
@ -567,11 +567,11 @@
md5name = "2d84360b03042178def1d9ff538acacaed2b3a27411db7b2874f1612ed71abc8-xmlsec1-1.2.30.tar.gz"; md5name = "2d84360b03042178def1d9ff538acacaed2b3a27411db7b2874f1612ed71abc8-xmlsec1-1.2.30.tar.gz";
} }
{ {
name = "libxml2-2.9.10.tar.gz"; name = "libxml2-2.9.12.tar.gz";
url = "https://dev-www.libreoffice.org/src/libxml2-2.9.10.tar.gz"; url = "https://dev-www.libreoffice.org/src/libxml2-2.9.12.tar.gz";
sha256 = "aafee193ffb8fe0c82d4afef6ef91972cbaf5feea100edc2f262750611b4be1f"; sha256 = "c8d6681e38c56f172892c85ddc0852e1fd4b53b4209e7f4ebf17f7e2eae71d92";
md5 = ""; md5 = "";
md5name = "aafee193ffb8fe0c82d4afef6ef91972cbaf5feea100edc2f262750611b4be1f-libxml2-2.9.10.tar.gz"; md5name = "c8d6681e38c56f172892c85ddc0852e1fd4b53b4209e7f4ebf17f7e2eae71d92-libxml2-2.9.12.tar.gz";
} }
{ {
name = "libxslt-1.1.34.tar.gz"; name = "libxslt-1.1.34.tar.gz";

View file

@ -8,7 +8,7 @@ rec {
major = "7"; major = "7";
minor = "1"; minor = "1";
patch = "4"; patch = "5";
tweak = "2"; tweak = "2";
subdir = "${major}.${minor}.${patch}"; subdir = "${major}.${minor}.${patch}";
@ -17,13 +17,13 @@ rec {
src = fetchurl { src = fetchurl {
url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz"; url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz";
sha256 = "1jsskhnlyra7q6d12kkc8dxq5fgrnd8grl32bdck7j9hkwv6d13m"; sha256 = "1kl54ddpvmrcs4r1vd4dfzg5a8im0kijhaqdg37zvgb5fqv31bxf";
}; };
# FIXME rename # FIXME rename
translations = fetchSrc { translations = fetchSrc {
name = "translations"; name = "translations";
sha256 = "0cslzhp5ic1w7hnl6wbyxrxhczdmap1g1hh1nj9sgpw9iqdryqj7"; sha256 = "0nf5s012l7mkpd1srvijl9q6x8f7svm6i84bj75dwyvipkg40rxq";
}; };
# the "dictionaries" archive is not used for LO build because we already build hunspellDicts packages from # the "dictionaries" archive is not used for LO build because we already build hunspellDicts packages from
@ -31,6 +31,6 @@ rec {
help = fetchSrc { help = fetchSrc {
name = "help"; name = "help";
sha256 = "091yhm1qkxgvv130a1yzmmikchvxvp8109mcdrlpybp4gc276l8q"; sha256 = "1m1hxbhrkaynpcps77rym1d0kwl380jv1p7b6ibfl4by0ii2j16a";
}; };
} }

View file

@ -0,0 +1,26 @@
{ lib, fetchFromGitHub, python3Packages }:
python3Packages.buildPythonPackage rec {
pname = "nengo-gui";
version = "0.4.8";
src = fetchFromGitHub {
owner = "nengo";
repo = "nengo-gui";
rev = "v${version}";
sha256 = "1awb0h2l6yifb77zah7a4qzxqvkk4ac5fynangalidr10sk9rzk3";
};
propagatedBuildInputs = with python3Packages; [ nengo ];
# checks req missing:
# pyimgur
doCheck = false;
meta = with lib; {
description = "Nengo interactive visualizer";
homepage = "https://nengo.ai/";
license = licenses.unfreeRedistributable;
maintainers = with maintainers; [ arjix ];
};
}

View file

@ -2,6 +2,7 @@
, lib , lib
, fetchzip , fetchzip
, fetchurl , fetchurl
, fetchpatch
, runCommandNoCC , runCommandNoCC
, fcft , fcft
, freetype , freetype
@ -98,6 +99,15 @@ stdenv.mkDerivation rec {
sha256 = "1k0alz991cslls4926c5gq02pdq0vfw9jfpprh2a1vb59xgikv7h"; sha256 = "1k0alz991cslls4926c5gq02pdq0vfw9jfpprh2a1vb59xgikv7h";
}; };
patches = [
# Fixes PGO builds with clang
(fetchpatch {
url = "https://codeberg.org/dnkl/foot/commit/2acd4b34c57659d86dca76c58e4363de9b0a1f17.patch";
sha256 = "13xi9ppaqx2p88cxbh6801ry9ral70ylh40agn6ij7pklybs4d7s";
includes = [ "pgo/pgo.c" ];
})
];
depsBuildBuild = [ depsBuildBuild = [
pkg-config pkg-config
]; ];

View file

@ -18,10 +18,7 @@ stdenv.mkDerivation rec {
version = "2.15.1"; version = "2.15.1";
src = fetchurl { src = fetchurl {
urls = url = "https://www.fossil-scm.org/index.html/uv/fossil-src-${version}.tar.gz";
[
"https://www.fossil-scm.org/index.html/uv/fossil-src-${version}.tar.gz"
];
name = "${pname}-${version}.tar.gz"; name = "${pname}-${version}.tar.gz";
sha256 = "sha256-gNJ5I8ZjsqLHEPiujNVJhi4E+MBChXBidMNK48jKF9E="; sha256 = "sha256-gNJ5I8ZjsqLHEPiujNVJhi4E+MBChXBidMNK48jKF9E=";
}; };

View file

@ -1,6 +1,9 @@
{ lib, buildPythonApplication, fetchPypi { lib, buildPythonApplication, fetchPypi
, installShellFiles, pbr , installShellFiles, pbr
, flake8, mock, pycodestyle, pylint, tox }: , flake8, mock, pycodestyle, pylint, tox
, nix-update-script
, testVersion, git-machete
}:
buildPythonApplication rec { buildPythonApplication rec {
pname = "git-machete"; pname = "git-machete";
@ -23,6 +26,18 @@ buildPythonApplication rec {
installShellCompletion --zsh --name _git-machete completion/git-machete.completion.zsh installShellCompletion --zsh --name _git-machete completion/git-machete.completion.zsh
''; '';
passthru = {
updateScript = nix-update-script {
attrPath = pname;
};
tests = {
version = testVersion {
package = git-machete;
};
};
};
meta = with lib; { meta = with lib; {
homepage = "https://github.com/VirtusLab/git-machete"; homepage = "https://github.com/VirtusLab/git-machete";
description = "Git repository organizer and rebase/merge workflow automation tool"; description = "Git repository organizer and rebase/merge workflow automation tool";

View file

@ -28,11 +28,14 @@ stdenv.mkDerivation rec {
gnused gnused
]; ];
fixupPhase = '' postFixup = ''
patchShebangs $out/bin wrap_path="${wrapperPath}":$out/bin
wrapProgram $out/bin/git-sync \ wrapProgram $out/bin/git-sync \
--prefix PATH : "${wrapperPath}" --prefix PATH : $wrap_path
wrapProgram $out/bin/git-sync-on-inotify \
--prefix PATH : $wrap_path
''; '';
meta = { meta = {

View file

@ -25,7 +25,6 @@ stdenv.mkDerivation {
name = "tempora-lgc"; name = "tempora-lgc";
inherit nativeBuildInputs; inherit nativeBuildInputs;
inherit srcs; inherit srcs;
phases = "installPhase";
installPhase = '' installPhase = ''
mkdir -p "$out/share/fonts/opentype/public" mkdir -p "$out/share/fonts/opentype/public"
cp ${toString srcs} "$out/share/fonts/opentype/public" cp ${toString srcs} "$out/share/fonts/opentype/public"

View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "matcha-gtk-theme"; pname = "matcha-gtk-theme";
version = "2021-07-08"; version = "2021-07-20";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "vinceliuice"; owner = "vinceliuice";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "sha256-iTwPN31JvpFlCBWikOeSTda2wBEtg6ygy8o6ovqHPCw="; sha256 = "0shdkwpqj3fw5qr99ww4z5dyrpa2pq79s0i02p9j3v6w6aca2gic";
}; };
buildInputs = [ gdk-pixbuf librsvg ]; buildInputs = [ gdk-pixbuf librsvg ];

View file

@ -7,7 +7,6 @@
, elementary-gtk-theme , elementary-gtk-theme
, elementary-icon-theme , elementary-icon-theme
, fetchFromGitHub , fetchFromGitHub
, fetchpatch
, flatpak , flatpak
, gettext , gettext
, glib , glib
@ -15,6 +14,7 @@
, gtk3 , gtk3
, json-glib , json-glib
, libgee , libgee
, libhandy
, libsoup , libsoup
, libxml2 , libxml2
, meson , meson
@ -25,30 +25,20 @@
, python3 , python3
, vala , vala
, polkit , polkit
, libhandy_0
, wrapGAppsHook , wrapGAppsHook
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "appcenter"; pname = "appcenter";
version = "3.5.1"; version = "3.6.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "elementary"; owner = "elementary";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "MsaXdmL+M+NYAJrrwluleeNxqQg0soFbO/G/FqibBFI="; sha256 = "0kwqgilhyrj2nbvw5y34nzch5h9jnrg1a1n333qdsx4ax6yrxh4j";
}; };
patches = [
# Allow build with appstream 0.14.x
# https://github.com/elementary/appcenter/pull/1493
(fetchpatch {
url = "https://github.com/elementary/appcenter/commit/5807dd13fe3c715f26225aed8d7a0abdea0c2a64.patch";
sha256 = "BvEahG9lU9ZdgooFDFhm5evRvnKVcmcHLdmZPb85gbo=";
})
];
passthru = { passthru = {
updateScript = nix-update-script { updateScript = nix-update-script {
attrPath = "pantheon.${pname}"; attrPath = "pantheon.${pname}";
@ -78,7 +68,7 @@ stdenv.mkDerivation rec {
gtk3 gtk3
json-glib json-glib
libgee libgee
libhandy_0 # doesn't support libhandy-1 yet libhandy
libsoup libsoup
libxml2 libxml2
packagekit packagekit

View file

@ -3,6 +3,6 @@
# How to obtain `sha256`: # How to obtain `sha256`:
# nix-prefetch-url --unpack https://github.com/erlang/otp/archive/OTP-${version}.tar.gz # nix-prefetch-url --unpack https://github.com/erlang/otp/archive/OTP-${version}.tar.gz
mkDerivation { mkDerivation {
version = "24.0.3"; version = "24.0.4";
sha256 = "KVMISrWNBkk+w37gB4M5TQkgm4odZ+GqLvKN4stzOUI="; sha256 = "OeXXNaVJh5el+V+5ukcNOAgDmkJuGy1lYLpUTd1yxHM=";
} }

View file

@ -1,16 +1,14 @@
{ lib, mkDerivation, fetchFromGitHub, ghc, glibcLocales }: { lib, mkDerivation, fetchFromGitHub, ghc, glibcLocales }:
mkDerivation rec { mkDerivation rec {
# Version 0.2 is meant to be used with the Agda 2.6.1 compiler.
pname = "cubical"; pname = "cubical";
version = "0.2"; version = "0.3pred5030a9";
src = fetchFromGitHub { src = fetchFromGitHub {
repo = pname; repo = pname;
owner = "agda"; owner = "agda";
rev = "v${version}"; rev = "d5030a9c89070255fc575add4e9f37b97e6a0c0c";
sha256 = "07qlp2f189jvzbn3aqvpqk2zxpkmkxhhkjsn62iq436kxqj3z6c2"; sha256 = "18achbxap4ikydigmz3m3xjfn3i9dw4rn8yih82vrlc01j02nqpi";
}; };
LC_ALL = "en_US.UTF-8"; LC_ALL = "en_US.UTF-8";

View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "armadillo"; pname = "armadillo";
version = "10.5.3"; version = "10.6.1";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz"; url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz";
sha256 = "sha256-5sUdjVKm94ucZFn2mGE1CT4O5wWmdDBxEPYXXyzV7jc="; sha256 = "sha256-HQbDI31lx7xGHqEvT9/YtaabapZbSQCucJYM6SCIF58=";
}; };
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];

View file

@ -6,11 +6,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "fcft"; pname = "fcft";
version = "2.4.3"; version = "2.4.4";
src = fetchzip { src = fetchzip {
url = "https://codeberg.org/dnkl/fcft/archive/${version}.tar.gz"; url = "https://codeberg.org/dnkl/fcft/archive/${version}.tar.gz";
sha256 = "0hxvd6xbvgq1rk8851gswffmvh3fv41lyvz4fhwzln7m12759yw8"; sha256 = "0ycc2xy9jhxcxwbfk9d4jdxgf2zsc664phbf859kshb822m3jf57";
}; };
depsBuildBuild = [ pkg-config ]; depsBuildBuild = [ pkg-config ];

View file

@ -6,13 +6,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "intel-media-driver"; pname = "intel-media-driver";
version = "21.2.3"; version = "21.3.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "intel"; owner = "intel";
repo = "media-driver"; repo = "media-driver";
rev = "intel-media-${version}"; rev = "intel-media-${version}";
sha256 = "0nldd1yfyvwnpkh0v3ni09z2zwmj84px0pcd1w50brvny36r814c"; sha256 = "1byliq1c80xfklm3d2d910j1i7s7pfi3i3c6baigag1kzgc0apd0";
}; };
cmakeFlags = [ cmakeFlags = [

View file

@ -21,6 +21,7 @@ stdenv.mkDerivation {
src = fetchurl { src = fetchurl {
inherit (s) url sha256; inherit (s) url sha256;
}; };
enableParallelBuilding = true;
meta = { meta = {
inherit (s) version; inherit (s) version;
description = "Import library for some old mac text documents"; description = "Import library for some old mac text documents";

View file

@ -1,48 +0,0 @@
{ stdenv, lib, fetchFromGitHub, fetchpatch
, pkg-config, autoreconfHook
, openssl, libopus, alsa-lib, libpulseaudio
}:
with lib;
stdenv.mkDerivation rec {
pname = "libtgvoip";
version = "unstable-2021-07-13";
src = fetchFromGitHub {
owner = "telegramdesktop";
repo = "libtgvoip";
rev = "f321e7c8cc086bac6ae06fa0934aac7d9833a310";
sha256 = "1gk5nsqhbnn1cdh83b70qr3d3v2c1bncylvgn77vvj8vnyjlmnfq";
};
# To fix the build without external webrtc:
patches = [
(fetchpatch {
# Use methods from updated webrtc.
url = "https://github.com/telegramdesktop/libtgvoip/commit/13a5fcb16b04472d808ce122abd695dbf5d206cd.patch";
sha256 = "0wapqvml3yyv5dlp2q8iih5rfvfnkngll69krhnw5xsdjy22sp7r";
revert = true;
})
(fetchpatch {
# Allow working with external webrtc.
url = "https://github.com/telegramdesktop/libtgvoip/commit/6e82b6e45664c1f80b9039256c99bebc76d34672.patch";
sha256 = "0m87ixja70vnm80a9z4gxk0yl7n64y59smczxb88lxnj6kdgih7x";
revert = true;
})
];
outputs = [ "out" "dev" ];
nativeBuildInputs = [ pkg-config autoreconfHook ];
buildInputs = [ openssl libopus alsa-lib libpulseaudio ];
enableParallelBuilding = true;
meta = {
description = "VoIP library for Telegram clients";
license = licenses.unlicense;
platforms = platforms.linux;
homepage = "https://github.com/telegramdesktop/libtgvoip";
maintainers = with maintainers; [ ilya-fedin ];
};
}

View file

@ -48,7 +48,7 @@ let
self = stdenv.mkDerivation rec { self = stdenv.mkDerivation rec {
pname = "pipewire"; pname = "pipewire";
version = "0.3.31"; version = "0.3.32";
outputs = [ outputs = [
"out" "out"
@ -66,7 +66,7 @@ let
owner = "pipewire"; owner = "pipewire";
repo = "pipewire"; repo = "pipewire";
rev = version; rev = version;
sha256 = "1dirz69ami7bcgy6hhh0ffi9gzwcy9idg94nvknwvwkjw4zm8m79"; sha256 = "0f5hkypiy1qjqj3frzz128668hzbi0fqmj0j21z7rp51y62dapnp";
}; };
patches = [ patches = [

View file

@ -19,10 +19,11 @@ rustPlatform.buildRustPackage rec {
''; '';
postInstall = '' postInstall = ''
mkdir $out/lib/tezos-rust-libs
cp -r rustc-bls12-381/include $out/include cp -r rustc-bls12-381/include $out/include
cp $out/lib/librustc_bls12_381.a $out/lib/tezos-rust-libs cp -r librustzcash/include $out
cp $out/lib/librustzcash.a $out/lib/tezos-rust-libs cp -r $out/lib $out/tmp
mkdir $out/lib/tezos-rust-libs
mv $out/tmp/ $out/lib/tezos-rust-libs/
''; '';
doCheck = true; doCheck = true;

View file

@ -63,7 +63,7 @@ assert enableGeoLocation -> geoclue2 != null;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "webkitgtk"; pname = "webkitgtk";
version = "2.32.1"; version = "2.32.3";
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
@ -71,7 +71,7 @@ stdenv.mkDerivation rec {
src = fetchurl { src = fetchurl {
url = "https://webkitgtk.org/releases/${pname}-${version}.tar.xz"; url = "https://webkitgtk.org/releases/${pname}-${version}.tar.xz";
sha256 = "05v9hgpkc6mi2klrd8nqql1n8xzq8rgdz3hvyy369xkhgwqifq8k"; sha256 = "sha256-wfSW9axlTv5M72L71PL77u8mWgfF50GeXSkAv+6lLLw=";
}; };
patches = lib.optionals stdenv.isLinux [ patches = lib.optionals stdenv.isLinux [

View file

@ -3,21 +3,20 @@
, xcodeWrapper ? xcodeenv.composeXcodeWrapper xcodeWrapperArgs , xcodeWrapper ? xcodeenv.composeXcodeWrapper xcodeWrapperArgs
, androidPkgs ? androidenv.composeAndroidPackages { , androidPkgs ? androidenv.composeAndroidPackages {
includeNDK = true; includeNDK = true;
ndkVersion = "21.3.6528147"; # WARNING: 22.0.7026061 is broken. ndkVersion = "22.1.7171670";
} }: } }:
buildGoModule { buildGoModule {
pname = "gomobile"; pname = "gomobile";
version = "unstable-2020-06-22"; version = "unstable-2021-06-14";
vendorSha256 = "1n1338vqkc1n8cy94501n7jn3qbr28q9d9zxnq2b4rxsqjfc9l94"; vendorSha256 = "1irgkgv72rakg7snk1bnp10ibr64ykz9l40s59l4fnl63zsh12a0";
src = fetchgit { src = fetchgit {
# WARNING: Next commit removes support for ARM 32 bit builds for iOS rev = "7c8f154d100840bc5828285bb390bbae1cb5a98c";
rev = "33b80540585f2b31e503da24d6b2a02de3c53ff5";
name = "gomobile"; name = "gomobile";
url = "https://go.googlesource.com/mobile"; url = "https://go.googlesource.com/mobile";
sha256 = "0c9map2vrv34wmaycsv71k4day3b0z5p16yzxmlp8amvqb38zwlm"; sha256 = "1w9mra1mqf60iafp0ywvja5196fjsjyfhvz4yizqq4qkyll5qmj1";
}; };
subPackages = [ "bind" "cmd/gobind" "cmd/gomobile" ]; subPackages = [ "bind" "cmd/gobind" "cmd/gomobile" ];
@ -25,8 +24,6 @@ buildGoModule {
# Fails with: go: cannot find GOROOT directory # Fails with: go: cannot find GOROOT directory
doCheck = false; doCheck = false;
patches = [ ./resolve-nix-android-sdk.patch ];
nativeBuildInputs = [ makeWrapper ] nativeBuildInputs = [ makeWrapper ]
++ lib.optionals stdenv.isDarwin [ xcodeWrapper ]; ++ lib.optionals stdenv.isDarwin [ xcodeWrapper ];
@ -48,8 +45,8 @@ buildGoModule {
wrapProgram $out/bin/gomobile \ wrapProgram $out/bin/gomobile \
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ zlib ]}" \ --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ zlib ]}" \
--prefix PATH : "${androidPkgs.androidsdk}/bin" \ --prefix PATH : "${androidPkgs.androidsdk}/bin" \
--set ANDROID_HOME "${androidPkgs.androidsdk}/libexec/android-sdk" \ --set ANDROID_NDK_HOME "${androidPkgs.androidsdk}/libexec/android-sdk/ndk-bundle" \
--set GOPATH $out --set ANDROID_HOME "${androidPkgs.androidsdk}/libexec/android-sdk"
''; '';
meta = with lib; { meta = with lib; {

View file

@ -1,15 +0,0 @@
diff --git a/cmd/gomobile/bind_androidapp.go b/cmd/gomobile/bind_androidapp.go
index 3b01adc..76216fa 100644
--- a/cmd/gomobile/bind_androidapp.go
+++ b/cmd/gomobile/bind_androidapp.go
@@ -372,6 +372,10 @@ func androidAPIPath() (string, error) {
var apiVer int
for _, fi := range fis {
name := fi.Name()
+ // Resolve symlinked directories (this is how the Nix Android SDK package is built)
+ if fi2, err := os.Stat(filepath.Join(sdkDir.Name(), name)); err == nil {
+ fi = fi2
+ }
if !fi.IsDir() || !strings.HasPrefix(name, "android-") {
continue
}

View file

@ -0,0 +1,26 @@
{ lib, fetchFromGitHub, buildDunePackage, core, core_kernel, pkg-config, sqlite
}:
buildDunePackage rec {
pname = "hack_parallel";
version = "1.0.1";
useDune2 = true;
minimumOcamlVersion = "4.04.1";
src = fetchFromGitHub {
owner = "rvantonder";
repo = "hack_parallel";
rev = version;
sha256 = "0qjlkw35r4q2cm0n2x0i73zvx1xgrp6axaia2nm8zxpm49mid629";
};
nativeBuildInputs = [ pkg-config ];
buildInputs = [ core core_kernel sqlite ];
meta = {
description =
"Core parallel and shared memory library used by Hack, Flow, and Pyre";
license = lib.licenses.mit;
homepage = "https://github.com/rvantonder/hack_parallel";
};
}

View file

@ -1,25 +1,21 @@
{ stdenv, lib, fetchzip, ocaml, findlib, ocamlbuild }: { lib, fetchFromGitHub, buildDunePackage }:
stdenv.mkDerivation { buildDunePackage rec {
name = "ocaml${ocaml.version}-mparser-1.2.3"; pname = "mparser";
src = fetchzip { version = "1.3";
url = "https://github.com/cakeplus/mparser/archive/1.2.3.tar.gz"; useDune2 = true;
sha256 = "1f8vpagmv0jdm50pxs2xwh2xcmvgaprx4kw871hlml9ahsflxgnw";
src = fetchFromGitHub {
owner = "murmour";
repo = "mparser";
rev = version;
sha256 = "16j19v16r42gcsii6a337zrs5cxnf12ig0vaysxyr7sq5lplqhkx";
}; };
buildInputs = [ ocaml findlib ocamlbuild ];
configurePhase = "ocaml setup.ml -configure";
buildPhase = "ocaml setup.ml -build";
installPhase = "ocaml setup.ml -install";
createFindlibDestdir = true;
meta = { meta = {
description = "A simple monadic parser combinator OCaml library"; description = "A simple monadic parser combinator OCaml library";
license = lib.licenses.lgpl21Plus; license = lib.licenses.lgpl21Plus;
homepage = "https://github.com/cakeplus/mparser"; homepage = "https://github.com/murmour/mparser";
maintainers = [ lib.maintainers.vbgl ]; maintainers = [ lib.maintainers.vbgl ];
inherit (ocaml.meta) platforms;
}; };
} }

View file

@ -0,0 +1,12 @@
{ fetchFromGitHub, buildDunePackage, ocaml_pcre, mparser }:
buildDunePackage rec {
pname = "mparser-pcre";
useDune2 = true;
inherit (mparser) src version;
propagatedBuildInputs = [ ocaml_pcre mparser ];
meta = mparser.meta // { description = "PCRE-based regular expressions"; };
}

View file

@ -2,15 +2,16 @@
buildDunePackage rec { buildDunePackage rec {
pname = "parany"; pname = "parany";
version = "8.0.0"; version = "12.0.3";
useDune2 = true; useDune2 = true;
minimumOCamlVersion = "4.03.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "UnixJunkie"; owner = "UnixJunkie";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "19yz1yqyqx6gawy93jlh3x6vji2p9qsy6nsbj65q5pii8p1fjlsm"; sha256 = "1j962ak68kvv62bczjqxwlwvdgcvjfcs36qwq12nnm0pwlzkhg33";
}; };
propagatedBuildInputs = [ ocamlnet cpu ]; propagatedBuildInputs = [ ocamlnet cpu ];

View file

@ -0,0 +1,33 @@
{ lib
, buildDunePackage
, tezos-stdlib
, tezos-crypto
, tezos-micheline
, ptime
, ezjsonm
, ipaddr
, qcheck-alcotest
, crowbar
}:
buildDunePackage {
pname = "tezos-base";
inherit (tezos-stdlib) version src useDune2 preBuild doCheck;
propagatedBuildInputs = [
tezos-crypto
tezos-micheline
ptime
ezjsonm
ipaddr
];
checkInputs = [
qcheck-alcotest
crowbar
];
meta = tezos-stdlib.meta // {
description = "Tezos: meta-package and pervasive type definitions for Tezos";
};
}

View file

@ -0,0 +1,25 @@
{ lib
, buildDunePackage
, tezos-stdlib
, tezos-stdlib-unix
, alcotest
, alcotest-lwt
}:
buildDunePackage {
pname = "tezos-clic";
inherit (tezos-stdlib) version src useDune2 preBuild doCheck;
propagatedBuildInputs = [
tezos-stdlib-unix
];
checkInputs = [
alcotest
alcotest-lwt
];
meta = tezos-stdlib.meta // {
description = "Tezos: library of auto-documented command-line-parsing combinators";
};
}

View file

@ -0,0 +1,38 @@
{ lib
, buildDunePackage
, tezos-stdlib
, tezos-clic
, tezos-rpc
, bls12-381
, hacl-star
, secp256k1-internal
, uecc
, ringo
, ff
, alcotest
, alcotest-lwt
}:
buildDunePackage {
pname = "tezos-crypto";
inherit (tezos-stdlib) version src useDune2 preBuild doCheck;
propagatedBuildInputs = [
tezos-clic
tezos-rpc
bls12-381
hacl-star
secp256k1-internal
uecc
ringo
];
checkInputs = [
alcotest
alcotest-lwt
];
meta = tezos-stdlib.meta // {
description = "Tezos: library with all the cryptographic primitives used by Tezos";
};
}

View file

@ -0,0 +1,30 @@
{ lib
, buildDunePackage
, tezos-stdlib
, data-encoding
, lwt
, lwt-canceler
, alcotest
, alcotest-lwt
}:
buildDunePackage {
pname = "tezos-error-monad";
inherit (tezos-stdlib) version src useDune2 preBuild doCheck;
propagatedBuildInputs = [
tezos-stdlib
data-encoding
lwt
lwt-canceler
];
checkInputs = [
alcotest
alcotest-lwt
];
meta = tezos-stdlib.meta // {
description = "Tezos: error monad";
};
}

View file

@ -0,0 +1,22 @@
{ lib
, buildDunePackage
, tezos-stdlib
, tezos-lwt-result-stdlib
, lwt_log
, alcotest
, alcotest-lwt
}:
buildDunePackage {
pname = "tezos-event-logging";
inherit (tezos-stdlib) version src useDune2 preBuild doCheck;
propagatedBuildInputs = [
tezos-lwt-result-stdlib
lwt_log
];
meta = tezos-stdlib.meta // {
description = "Tezos: event logging library";
};
}

View file

@ -0,0 +1,51 @@
{ lib
, fetchFromGitLab
, pkg-config
, buildDunePackage
, lmdb
, rresult
, cstruct
, alcotest
}:
buildDunePackage rec {
pname = "tezos-lmdb";
version = "7.4";
src = fetchFromGitLab {
owner = "tezos";
repo = "tezos";
rev = "v${version}";
sha256 = "18q02j74aa8mxv233kvyb62xbhjngzpgppp6kgr4m53d7a78wgsm";
};
useDune2 = true;
preBuild = ''
rm dune
rm -rf src
rm -rf docs
ls vendors | grep -v ocaml-lmdb |xargs rm -rf
'';
buildInputs = [
pkg-config
];
propagatedBuildInputs = [
rresult
lmdb
];
checkInputs = [
cstruct
alcotest
];
doCheck = false;
meta = {
description = "Legacy Tezos OCaml binding to LMDB (Consider ocaml-lmdb instead)";
license = lib.licenses.isc;
maintainers = [ lib.maintainers.ulrikstrid ];
};
}

View file

@ -0,0 +1,32 @@
{ lib
, buildDunePackage
, ocaml
, tezos-stdlib
, tezos-error-monad
, alcotest
, alcotest-lwt
, crowbar
}:
if lib.versionAtLeast ocaml.version "4.12" then
throw "tezos-lwt-result-stdlib-${tezos-stdlib.version} is not available for OCaml > 4.10"
else
buildDunePackage {
pname = "tezos-lwt-result-stdlib";
inherit (tezos-stdlib) version src useDune2 preBuild doCheck;
propagatedBuildInputs = [
tezos-error-monad
];
checkInputs = [
alcotest
alcotest-lwt
crowbar
];
meta = tezos-stdlib.meta // {
description = "Tezos: error-aware stdlib replacement";
};
}

View file

@ -0,0 +1,28 @@
{ lib
, buildDunePackage
, tezos-stdlib
, tezos-error-monad
, uutf
, alcotest
, alcotest-lwt
, ppx_inline_test
}:
buildDunePackage {
pname = "tezos-micheline";
inherit (tezos-stdlib) version src useDune2 preBuild doCheck;
propagatedBuildInputs = [
tezos-error-monad
uutf
];
checkInputs = [
alcotest
alcotest-lwt
];
meta = tezos-stdlib.meta // {
description = "Tezos: internal AST and parser for the Michelson language";
};
}

View file

@ -0,0 +1,18 @@
{ lib
, buildDunePackage
, tezos-stdlib
, tezos-base
}:
buildDunePackage {
pname = "tezos-p2p-services";
inherit (tezos-stdlib) version src useDune2 preBuild doCheck;
propagatedBuildInputs = [
tezos-base
];
meta = tezos-stdlib.meta // {
description = "Tezos: descriptions of RPCs exported by `tezos-p2p`";
};
}

View file

@ -0,0 +1,25 @@
{ lib
, buildDunePackage
, tezos-stdlib
, tezos-p2p-services
, alcotest-lwt
, lwt-watcher
}:
buildDunePackage {
pname = "tezos-p2p";
inherit (tezos-stdlib) version src useDune2 preBuild doCheck;
propagatedBuildInputs = [
tezos-p2p-services
lwt-watcher
];
checkInputs = [
alcotest-lwt
];
meta = tezos-stdlib.meta // {
description = "Tezos: library for a pool of P2P connections";
};
}

View file

@ -0,0 +1,19 @@
{ lib
, buildDunePackage
, tezos-stdlib
, tezos-protocol-008-PtEdo2Zk
, qcheck-alcotest
}:
buildDunePackage {
pname = "tezos-protocol-008-PtEdo2Zk-parameters";
inherit (tezos-stdlib) version src useDune2 preBuild doCheck;
propagatedBuildInputs = [
tezos-protocol-008-PtEdo2Zk
];
meta = tezos-stdlib.meta // {
description = "Tezos/Protocol: parameters";
};
}

View file

@ -0,0 +1,23 @@
{ lib
, buildDunePackage
, tezos-stdlib
, tezos-protocol-compiler
}:
buildDunePackage {
pname = "tezos-protocol-008-PtEdo2Zk";
inherit (tezos-stdlib) version src useDune2 doCheck;
preBuild = ''
rm -rf vendors
substituteInPlace src/proto_008_PtEdo2Zk/lib_protocol/dune.inc --replace "-nostdlib" ""
'';
propagatedBuildInputs = [
tezos-protocol-compiler
];
meta = tezos-stdlib.meta // {
description = "Tezos/Protocol: economic-protocol definition";
};
}

View file

@ -0,0 +1,29 @@
{ lib
, buildDunePackage
, ocaml
, tezos-stdlib
, tezos-protocol-environment
, ocp-ocamlres
, pprint
}:
if lib.versionAtLeast ocaml.version "4.12" then
throw "tezos-protocol-compiler-${tezos-stdlib.version} is not available for OCaml > 4.10"
else
buildDunePackage {
pname = "tezos-protocol-compiler";
inherit (tezos-stdlib) version src useDune2 preBuild doCheck;
minimalOCamlVersion = "4.09";
propagatedBuildInputs = [
tezos-protocol-environment
ocp-ocamlres
pprint
];
meta = tezos-stdlib.meta // {
description = "Tezos: economic-protocol compiler";
};
}

View file

@ -0,0 +1,18 @@
{ lib
, buildDunePackage
, tezos-stdlib
, tezos-protocol-compiler
}:
buildDunePackage {
pname = "tezos-protocol-demo-noops";
inherit (tezos-stdlib) version src useDune2 preBuild doCheck;
propagatedBuildInputs = [
tezos-protocol-compiler
];
meta = tezos-stdlib.meta // {
description = "Tezos/Protocol: demo_noops economic-protocol definition";
};
}

View file

@ -0,0 +1,15 @@
{ lib
, buildDunePackage
, tezos-stdlib
}:
buildDunePackage {
pname = "tezos-protocol-environment-packer";
inherit (tezos-stdlib) version src useDune2 preBuild doCheck;
minimalOCamlVersion = "4.03";
meta = tezos-stdlib.meta // {
description = "Tezos: sigs/structs packer for economic protocol environment";
};
}

View file

@ -0,0 +1,30 @@
{ lib
, buildDunePackage
, ocaml
, tezos-stdlib
, tezos-protocol-environment-packer
, zarith
}:
buildDunePackage {
pname = "tezos-protocol-environment-sigs";
inherit (tezos-stdlib) version src useDune2 preBuild doCheck;
propagatedBuildInputs = [
tezos-protocol-environment-packer
];
checkInputs = [
tezos-stdlib
];
postPatch = ''
cp -f ${zarith}/lib/ocaml/${ocaml.version}/site-lib/zarith/z.mli ./src/lib_protocol_environment/sigs/v1/z.mli
sed -i 's/out_channel/Stdlib.out_channel/g' ./src/lib_protocol_environment/sigs/v1/z.mli
sed -i 's/Buffer/Stdlib.Buffer/g' ./src/lib_protocol_environment/sigs/v1/z.mli
'';
meta = tezos-stdlib.meta // {
description = "Tezos: restricted typing environment for the economic protocols";
};
}

View file

@ -0,0 +1,20 @@
{ lib
, buildDunePackage
, tezos-stdlib
, tezos-crypto
, tezos-protocol-environment-packer
}:
buildDunePackage {
pname = "tezos-protocol-environment-structs";
inherit (tezos-stdlib) version src useDune2 preBuild doCheck;
propagatedBuildInputs = [
tezos-crypto
tezos-protocol-environment-packer
];
meta = tezos-stdlib.meta // {
description = "Tezos: restricted typing environment for the economic protocols";
};
}

View file

@ -0,0 +1,33 @@
{ lib
, buildDunePackage
, tezos-stdlib
, tezos-base
, tezos-sapling
, tezos-protocol-environment-sigs
, tezos-protocol-environment-structs
, zarith
, alcotest-lwt
, crowbar
}:
buildDunePackage {
pname = "tezos-protocol-environment";
inherit (tezos-stdlib) version src useDune2 doCheck preBuild;
propagatedBuildInputs = [
tezos-sapling
tezos-base
tezos-protocol-environment-sigs
tezos-protocol-environment-structs
zarith # this might break, since they actually want 1.11
];
checkInputs = [
alcotest-lwt
crowbar
];
meta = tezos-stdlib.meta // {
description = "Tezos: custom economic-protocols environment implementation for `tezos-client` and testing";
};
}

View file

@ -0,0 +1,27 @@
{ lib
, buildDunePackage
, tezos-stdlib
, tezos-base
, tezos-test-services
, lwt-watcher
, alcotest-lwt
}:
buildDunePackage {
pname = "tezos-requester";
inherit (tezos-stdlib) version src useDune2 preBuild doCheck;
propagatedBuildInputs = [
tezos-base
lwt-watcher
];
checkInputs = [
alcotest-lwt
tezos-test-services
];
meta = tezos-stdlib.meta // {
description = "Tezos: generic resource fetching service";
};
}

View file

@ -0,0 +1,22 @@
{ lib
, buildDunePackage
, tezos-stdlib
, tezos-error-monad
, resto
, resto-directory
}:
buildDunePackage {
pname = "tezos-rpc";
inherit (tezos-stdlib) version src useDune2 preBuild doCheck;
propagatedBuildInputs = [
tezos-error-monad
resto
resto-directory
];
meta = tezos-stdlib.meta // {
description = "Tezos: library of auto-documented RPCs (service and hierarchy descriptions)";
};
}

View file

@ -0,0 +1,31 @@
{ lib
, buildDunePackage
, ocaml
, tezos-stdlib
, tezos-crypto
, tezos-rust-libs
, alcotest-lwt
}:
buildDunePackage {
pname = "tezos-sapling";
inherit (tezos-stdlib) version src useDune2 preBuild;
propagatedBuildInputs = [
tezos-crypto
tezos-rust-libs
];
checkInputs = [
alcotest-lwt
];
doCheck = false;
# This is a hack to work around the hack used in the dune files
OPAM_SWITCH_PREFIX = "${tezos-rust-libs}";
meta = tezos-stdlib.meta // {
description = "Tezos/Protocol: economic-protocol definition";
};
}

View file

@ -0,0 +1,22 @@
{ lib
, buildDunePackage
, tezos-stdlib
, tezos-workers
, tezos-p2p-services
, tezos-version
}:
buildDunePackage {
pname = "tezos-shell-services";
inherit (tezos-stdlib) version src useDune2 preBuild doCheck;
propagatedBuildInputs = [
tezos-workers
tezos-p2p-services
tezos-version
];
meta = tezos-stdlib.meta // {
description = "Tezos: descriptions of RPCs exported by `tezos-shell`";
};
}

View file

@ -0,0 +1,30 @@
{ lib
, buildDunePackage
, tezos-stdlib
, tezos-event-logging
, lwt
, ptime
, mtime
, ipaddr
, re
, alcotest
, alcotest-lwt
}:
buildDunePackage {
pname = "tezos-stdlib-unix";
inherit (tezos-stdlib) version src useDune2 preBuild doCheck;
propagatedBuildInputs = [
tezos-event-logging
lwt
ptime
mtime
ipaddr
re
];
meta = tezos-stdlib.meta // {
description = "Tezos: yet-another local-extension of the OCaml standard library (unix-specific fragment)";
};
}

View file

@ -0,0 +1,53 @@
{ lib
, fetchFromGitLab
, buildDunePackage
, hex
, lwt
, zarith
, alcotest
, alcotest-lwt
, crowbar
, bigstring
, lwt_log
}:
buildDunePackage rec {
pname = "tezos-stdlib";
version = "8.3";
src = fetchFromGitLab {
owner = "tezos";
repo = "tezos";
rev = "v${version}";
sha256 = "12cv2cssnw60jbpnh6xjysxgsgcj7d72454k4zs2b8fjx7mkgksk";
};
minimalOCamlVersion = "4.0.8";
useDune2 = true;
preBuild = ''
rm -rf vendors
'';
propagatedBuildInputs = [
hex
lwt
zarith
];
checkInputs = [
alcotest
alcotest-lwt
crowbar
bigstring
lwt_log
];
doCheck = true;
meta = {
description = "Tezos: yet-another local-extension of the OCaml standard library";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.ulrikstrid ];
};
}

View file

@ -0,0 +1,20 @@
{ lib
, buildDunePackage
, tezos-stdlib
, tezos-base
, alcotest-lwt
}:
buildDunePackage {
pname = "tezos-test-services";
inherit (tezos-stdlib) version src useDune2 preBuild doCheck;
propagatedBuildInputs = [
tezos-base
alcotest-lwt
];
meta = tezos-stdlib.meta // {
description = "Tezos: Alcotest-based test services";
};
}

View file

@ -0,0 +1,18 @@
{ lib
, buildDunePackage
, tezos-stdlib
, tezos-base
}:
buildDunePackage {
pname = "tezos-version";
inherit (tezos-stdlib) version src useDune2 preBuild doCheck;
propagatedBuildInputs = [
tezos-base
];
meta = tezos-stdlib.meta // {
description = "Tezos: version information generated from Git";
};
}

View file

@ -0,0 +1,18 @@
{ lib
, buildDunePackage
, tezos-stdlib
, tezos-base
}:
buildDunePackage {
pname = "tezos-workers";
inherit (tezos-stdlib) version src useDune2 preBuild doCheck;
propagatedBuildInputs = [
tezos-base
];
meta = tezos-stdlib.meta // {
description = "Tezos: worker library";
};
}

View file

@ -7,14 +7,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "ailment"; pname = "ailment";
version = "9.0.9031"; version = "9.0.9166";
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "angr"; owner = "angr";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-xyNTcGTGH8030CJif6an+kDZIfOUVDMiRhFamVajAzk="; sha256 = "09qbqn57h92f81xv35f645ai7nkkqf7cidkg3qrwfpxcwc2g9kdz";
}; };
propagatedBuildInputs = [ pyvex ]; propagatedBuildInputs = [ pyvex ];

View file

@ -8,14 +8,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "aioesphomeapi"; pname = "aioesphomeapi";
version = "4.1.0"; version = "5.0.1";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "0210l2d5g76pllr2vh990k9shfv3zrknx5d2dmgqb5y90142cp76"; sha256 = "sha256-2IxXhAysQiqqEd4Mfjgc5vX0+D60rof2nPJDXy9tRVs=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

View file

@ -1,5 +1,6 @@
{ lib { lib
, buildPythonPackage , buildPythonPackage
, commentjson
, cryptography , cryptography
, fetchFromGitHub , fetchFromGitHub
, poetry-core , poetry-core
@ -11,14 +12,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "aiohomekit"; pname = "aiohomekit";
version = "0.4.2"; version = "0.5.1";
format = "pyproject"; format = "pyproject";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Jc2k"; owner = "Jc2k";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "12v9szalh3yzfqgmspk4ch8l38kzmhwzjn9jvsq632n4zhjd7qg4"; sha256 = "sha256-Fo9KWBcN6Y/fa7vkWugSer5L7+hOWz99+hw6Hz1LAMM=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -26,6 +27,7 @@ buildPythonPackage rec {
]; ];
propagatedBuildInputs = [ propagatedBuildInputs = [
commentjson
cryptography cryptography
zeroconf zeroconf
]; ];

View file

@ -13,7 +13,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "aionotion"; pname = "aionotion";
version = "3.0.1"; version = "3.0.2";
format = "pyproject"; format = "pyproject";
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.6";
@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "bachya"; owner = "bachya";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "1ydrazg7gcwf53006n1fvxh9zm77by6zi36haq1bmy5skqccyiki"; sha256 = "1328g2245h9gcrnzrbcxaxw78723d0skznrrj8k77fbijxdc4kwv";
}; };
nativeBuildInputs = [ poetry-core ]; nativeBuildInputs = [ poetry-core ];

View file

@ -12,14 +12,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "aiorecollect"; pname = "aiorecollect";
version = "1.0.5"; version = "1.0.6";
format = "pyproject"; format = "pyproject";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "bachya"; owner = "bachya";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "0h76l0pahnmls0radknzm8dw79qx9dv0xhxqnn6011j9fwyviyqm"; sha256 = "0vm19rcy14fdsfddjskxh0nlph10jrj3qh6xqwv73wgcmbdpr91i";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View file

@ -43,14 +43,14 @@ in
buildPythonPackage rec { buildPythonPackage rec {
pname = "angr"; pname = "angr";
version = "9.0.9031"; version = "9.0.9166";
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = pname; owner = pname;
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-qWAz9SHfQU0cdk4yVekJn5OIDPJPbi63CDdlHDq1Opw="; sha256 = "1h1jb57zp8wy24xy60j76sl4hrzhhwfsvfx26zhbnhqzmwghpd5x";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

View file

@ -9,14 +9,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "angrop"; pname = "angrop";
version = "9.0.9031"; version = "9.0.9166";
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "angr"; owner = "angr";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-3q/3iFR0FFOcvgmNVXtgi1Spu5xfXNJFy+QoIh8amOY="; sha256 = "1myrzp5axg0dj7kxqc2mz3kfqlds3vzvavcncrj5y9xpx8m7l71m";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

View file

@ -7,13 +7,13 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "archinfo"; pname = "archinfo";
version = "9.0.9031"; version = "9.0.9166";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "angr"; owner = "angr";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-pzBMyw5FwQV1FyhvOxUq39s96p0KKSrkEvJzhJQdS4E="; sha256 = "0y77lyz019rm9zgxpam6dbb006c7j66hwy985h3fg6nbz74pcml5";
}; };
checkInputs = [ checkInputs = [

View file

@ -13,14 +13,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "async-upnp-client"; pname = "async-upnp-client";
version = "0.19.0"; version = "0.19.1";
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "StevenLooman"; owner = "StevenLooman";
repo = "async_upnp_client"; repo = "async_upnp_client";
rev = version; rev = version;
sha256 = "0xj3j54nasl59gs1k84h3fixjsaqn7whg33h6wi99l5yfbwfqv8p"; sha256 = "sha256-qxEn9UrQuwRaP7sZlu3854gDI7Gqku055DF8KvsU6p4=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

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