b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge master into haskell-updates

Browse source
This commit is contained in:
github-actions[bot] 2022-10-05 00:21:02 +00:00 committed by GitHub
parent 94643424ba bcf1085724
commit 7137087254
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
176 changed files with 1986 additions and 1426 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.github/ISSUE_TEMPLATE/missing_documentation.md vendored
View file

@ -15,7 +15,7 @@ assignees: ''
<!-- make sure this issue is not redundant or obsolete -->
- [ ] checked [latest Nixpkgs manual] \([source][nixpkgs-source]) and [latest NixOS manual]] \([source][nixos-source])
- [ ] checked [latest Nixpkgs manual] \([source][nixpkgs-source]) and [latest NixOS manual] \([source][nixos-source])
- [ ] checked [open documentation issues] for possible duplicates
- [ ] checked [open documentation pull requests] for possible solutions

7
maintainers/maintainer-list.nix
View file

@ -12863,13 +12863,6 @@
githubId = 2666479;
name = "Y Nguyen";
};
superherointj = {
name = "Sérgio G.";
email = "5861043+superherointj@users.noreply.github.com";
matrix = "@superherointj:matrix.org";
github = "superherointj";
githubId = 5861043;
};
SuperSandro2000 = {
email = "sandro.jaeckel@gmail.com";
matrix = "@sandro:supersandro.de";

9
maintainers/team-list.nix
View file

@ -384,6 +384,15 @@ with lib.maintainers; {
shortName = "Lumiguide employees";
};
lua = {
githubTeams = [
"lua"
];
scope = "Maintain the lua ecosystem.";
shortName = "lua";
enableFeatureFreezePing = true;
};
lumina = {
members = [
romildo

1
nixos/doc/manual/default.nix
View file

@ -63,6 +63,7 @@ let
};
documentType = "none";
variablelistId = "test-options-list";
optionIdPrefix = "test-opt-";
};
sources = lib.sourceFilesBySuffices ./. [".xml"];

4
nixos/doc/manual/development/running-nixos-tests-interactively.section.md
View file

@ -39,11 +39,11 @@ directory.
## Interactive-only test configuration {#sec-nixos-test-interactive-configuration}
The `.driverInteractive` attribute combines the regular test configuration with
definitions from the [`interactive` submodule](#opt-interactive). This gives you
definitions from the [`interactive` submodule](#test-opt-interactive). This gives you
a more usable, graphical, but slightly different configuration.
You can add your own interactive-only test configuration by adding extra
configuration to the [`interactive` submodule](#opt-interactive).
configuration to the [`interactive` submodule](#test-opt-interactive).
To interactively run only the regular configuration, build the `<test>.driver` attribute
instead, and call it with the flag `result/bin/nixos-test-driver --interactive`.

12
nixos/doc/manual/development/writing-nixos-tests.section.md
View file

@ -22,12 +22,12 @@ A NixOS test is a module that has the following structure:
```
We refer to the whole test above as a test module, whereas the values
in [`nodes.<name>`](#opt-nodes) are NixOS modules themselves.
in [`nodes.<name>`](#test-opt-nodes) are NixOS modules themselves.
The option [`testScript`](#opt-testScript) is a piece of Python code that executes the
The option [`testScript`](#test-opt-testScript) is a piece of Python code that executes the
test (described below). During the test, it will start one or more
virtual machines, the configuration of which is described by
the option [`nodes`](#opt-nodes).
the option [`nodes`](#test-opt-nodes).
An example of a single-node test is
[`login.nix`](https://github.com/NixOS/nixpkgs/blob/master/nixos/tests/login.nix).
@ -171,7 +171,7 @@ The following methods are available on machine objects:
least one will be returned.
::: {.note}
This requires [`enableOCR`](#opt-enableOCR) to be set to `true`.
This requires [`enableOCR`](#test-opt-enableOCR) to be set to `true`.
:::
`get_screen_text`
@ -180,7 +180,7 @@ The following methods are available on machine objects:
machine\'s screen using optical character recognition.
::: {.note}
This requires [`enableOCR`](#opt-enableOCR) to be set to `true`.
This requires [`enableOCR`](#test-opt-enableOCR) to be set to `true`.
:::
`send_monitor_command`
@ -291,7 +291,7 @@ The following methods are available on machine objects:
`get_screen_text` and `get_screen_text_variants`).
::: {.note}
This requires [`enableOCR`](#opt-enableOCR) to be set to `true`.
This requires [`enableOCR`](#test-opt-enableOCR) to be set to `true`.
:::
`wait_for_console_text`

4
nixos/doc/manual/from_md/development/running-nixos-tests-interactively.section.xml
View file

@ -44,14 +44,14 @@ $ ./result/bin/nixos-test-driver --keep-vm-state
<para>
The <literal>.driverInteractive</literal> attribute combines the
regular test configuration with definitions from the
<link linkend="opt-interactive"><literal>interactive</literal>
<link linkend="test-opt-interactive"><literal>interactive</literal>
submodule</link>. This gives you a more usable, graphical, but
slightly different configuration.
</para>
<para>
You can add your own interactive-only test configuration by adding
extra configuration to the
<link linkend="opt-interactive"><literal>interactive</literal>
<link linkend="test-opt-interactive"><literal>interactive</literal>
submodule</link>.
</para>
<para>

12
nixos/doc/manual/from_md/development/writing-nixos-tests.section.xml
View file

@ -24,16 +24,16 @@
<para>
We refer to the whole test above as a test module, whereas the
values in
<link linkend="opt-nodes"><literal>nodes.&lt;name&gt;</literal></link>
<link linkend="test-opt-nodes"><literal>nodes.&lt;name&gt;</literal></link>
are NixOS modules themselves.
</para>
<para>
The option
<link linkend="opt-testScript"><literal>testScript</literal></link>
<link linkend="test-opt-testScript"><literal>testScript</literal></link>
is a piece of Python code that executes the test (described below).
During the test, it will start one or more virtual machines, the
configuration of which is described by the option
<link linkend="opt-nodes"><literal>nodes</literal></link>.
<link linkend="test-opt-nodes"><literal>nodes</literal></link>.
</para>
<para>
An example of a single-node test is
@ -263,7 +263,7 @@ start_all()
<note>
<para>
This requires
<link linkend="opt-enableOCR"><literal>enableOCR</literal></link>
<link linkend="test-opt-enableOCR"><literal>enableOCR</literal></link>
to be set to <literal>true</literal>.
</para>
</note>
@ -281,7 +281,7 @@ start_all()
<note>
<para>
This requires
<link linkend="opt-enableOCR"><literal>enableOCR</literal></link>
<link linkend="test-opt-enableOCR"><literal>enableOCR</literal></link>
to be set to <literal>true</literal>.
</para>
</note>
@ -522,7 +522,7 @@ start_all()
<note>
<para>
This requires
<link linkend="opt-enableOCR"><literal>enableOCR</literal></link>
<link linkend="test-opt-enableOCR"><literal>enableOCR</literal></link>
to be set to <literal>true</literal>.
</para>
</note>

3
nixos/lib/make-options-doc/default.nix
View file

@ -26,6 +26,8 @@
# If you include more than one option list into a document, you need to
# provide different ids.
, variablelistId ? "configuration-variable-list"
# Strig to prefix to the option XML/HTML id attributes.
, optionIdPrefix ? "opt-"
, revision ? "" # Specify revision for the options
# a set of options the docs we are generating will be merged into, as if by recursiveUpdate.
# used to split the options doc build into a static part (nixos/modules) and a dynamic part
@ -183,6 +185,7 @@ in rec {
--stringparam documentType '${documentType}' \
--stringparam revision '${revision}' \
--stringparam variablelistId '${variablelistId}' \
--stringparam optionIdPrefix '${optionIdPrefix}' \
-o intermediate.xml ${./options-to-docbook.xsl} sorted.xml
${pkgs.libxslt.bin}/bin/xsltproc \
-o "$out" ${./postprocess-option-descriptions.xsl} intermediate.xml

3
nixos/lib/make-options-doc/options-to-docbook.xsl
View file

@ -15,6 +15,7 @@
<xsl:param name="documentType" />
<xsl:param name="program" />
<xsl:param name="variablelistId" />
<xsl:param name="optionIdPrefix" />
<xsl:template match="/expr/list">
@ -36,7 +37,7 @@
<xsl:attribute name="id" namespace="http://www.w3.org/XML/1998/namespace"><xsl:value-of select="$variablelistId"/></xsl:attribute>
<xsl:for-each select="attrs">
<xsl:variable name="id" select="
concat('opt-',
concat($optionIdPrefix,
translate(
attr[@name = 'name']/string/@value,
'*&lt; >[]:',

2
nixos/lib/qemu-common.nix
View file

@ -19,7 +19,7 @@ rec {
];
qemuSerialDevice =
if pkgs.stdenv.hostPlatform.isx86 || pkgs.stdenv.hostPlatform.isRiscV then "ttyS0"
if with pkgs.stdenv.hostPlatform; isx86 || isMips64 || isRiscV then "ttyS0"
else if (with pkgs.stdenv.hostPlatform; isAarch || isPower) then "ttyAMA0"
else throw "Unknown QEMU serial device for system '${pkgs.stdenv.hostPlatform.system}'";

6
nixos/lib/testing/driver.nix
View file

@ -120,7 +120,7 @@ in
};
qemu.package = mkOption {
description = mdDoc "Which qemu package to use for the virtualisation of [{option}`nodes`](#opt-nodes).";
description = mdDoc "Which qemu package to use for the virtualisation of [{option}`nodes`](#test-opt-nodes).";
type = types.package;
default = hostPkgs.qemu_test;
defaultText = "hostPkgs.qemu_test";
@ -152,7 +152,7 @@ in
description = mdDoc ''
Extra arguments to pass to the test driver.
They become part of [{option}`driver`](#opt-driver) via `wrapProgram`.
They become part of [{option}`driver`](#test-opt-driver) via `wrapProgram`.
'';
type = types.listOf types.str;
default = [];
@ -172,7 +172,7 @@ in
description = mdDoc ''
Disable type checking. This must not be enabled for new NixOS tests.
This may speed up your iteration cycle, unless you're working on the [{option}`testScript`](#opt-testScript).
This may speed up your iteration cycle, unless you're working on the [{option}`testScript`](#test-opt-testScript).
'';
};
};

4
nixos/lib/testing/meta.nix
View file

@ -24,14 +24,14 @@ in
type = types.nullOr types.int;
default = null; # NOTE: null values are filtered out by `meta`.
description = mdDoc ''
The [{option}`test`](#opt-test)'s [`meta.timeout`](https://nixos.org/manual/nixpkgs/stable/#var-meta-timeout) in seconds.
The [{option}`test`](#test-opt-test)'s [`meta.timeout`](https://nixos.org/manual/nixpkgs/stable/#var-meta-timeout) in seconds.
'';
};
broken = lib.mkOption {
type = types.bool;
default = false;
description = mdDoc ''
Sets the [`meta.broken`](https://nixos.org/manual/nixpkgs/stable/#var-meta-broken) attribute on the [{option}`test`](#opt-test) derivation.
Sets the [`meta.broken`](https://nixos.org/manual/nixpkgs/stable/#var-meta-broken) attribute on the [{option}`test`](#test-opt-test) derivation.
'';
};
};

2
nixos/lib/testing/name.nix
View file

@ -7,7 +7,7 @@ in
description = mdDoc ''
The name of the test.
This is used in the derivation names of the [{option}`driver`](#opt-driver) and [{option}`test`](#opt-test) runner.
This is used in the derivation names of the [{option}`driver`](#test-opt-driver) and [{option}`test`](#test-opt-test) runner.
'';
type = types.str;
};

8
nixos/lib/testing/nodes.nix
View file

@ -44,7 +44,7 @@ in
description = mdDoc ''
An attribute set of NixOS configuration modules.
The configurations are augmented by the [`defaults`](#opt-defaults) option.
The configurations are augmented by the [`defaults`](#test-opt-defaults) option.
They are assigned network addresses according to the `nixos/lib/testing/network.nix` module.
@ -54,7 +54,7 @@ in
defaults = mkOption {
description = mdDoc ''
NixOS configuration that is applied to all [{option}`nodes`](#opt-nodes).
NixOS configuration that is applied to all [{option}`nodes`](#test-opt-nodes).
'';
type = types.deferredModule;
default = { };
@ -62,7 +62,7 @@ in
extraBaseModules = mkOption {
description = mdDoc ''
NixOS configuration that, like [{option}`defaults`](#opt-defaults), is applied to all [{option}`nodes`](#opt-nodes) and can not be undone with [`specialisation.<name>.inheritParentConfig`](https://search.nixos.org/options?show=specialisation.%3Cname%3E.inheritParentConfig&from=0&size=50&sort=relevance&type=packages&query=specialisation).
NixOS configuration that, like [{option}`defaults`](#test-opt-defaults), is applied to all [{option}`nodes`](#test-opt-nodes) and can not be undone with [`specialisation.<name>.inheritParentConfig`](https://search.nixos.org/options?show=specialisation.%3Cname%3E.inheritParentConfig&from=0&size=50&sort=relevance&type=packages&query=specialisation).
'';
type = types.deferredModule;
default = { };
@ -82,7 +82,7 @@ in
type = types.bool;
default = false;
description = mdDoc ''
Enable to configure all [{option}`nodes`](#opt-nodes) to run with a minimal kernel.
Enable to configure all [{option}`nodes`](#test-opt-nodes) to run with a minimal kernel.
'';
};

2
nixos/modules/hardware/ckb-next.nix
View file

@ -48,6 +48,6 @@ in
};
meta = {
maintainers = with lib.maintainers; [ superherointj ];
maintainers = with lib.maintainers; [ ];
};
}

25
nixos/tests/k3s/multi-node.nix
View file

@ -1,4 +1,4 @@
import ../make-test-python.nix ({ pkgs, ... }:
import ../make-test-python.nix ({ pkgs, lib, ... }:
let
imageEnv = pkgs.buildEnv {
name = "k3s-pause-image-env";
@ -54,7 +54,15 @@ import ../make-test-python.nix ({ pkgs, ... }:
role = "server";
package = pkgs.k3s;
clusterInit = true;
extraFlags = "--no-deploy coredns,servicelb,traefik,local-storage,metrics-server --pause-image test.local/pause:local --node-ip 192.168.1.1";
extraFlags = ''
--disable coredns \
--disable local-storage \
--disable metrics-server \
--disable servicelb \
--disable traefik \
--node-ip 192.168.1.1 \
--pause-image test.local/pause:local
'';
};
networking.firewall.allowedTCPPorts = [ 2379 2380 6443 ];
networking.firewall.allowedUDPPorts = [ 8472 ];
@ -76,7 +84,15 @@ import ../make-test-python.nix ({ pkgs, ... }:
enable = true;
serverAddr = "https://192.168.1.1:6443";
clusterInit = false;
extraFlags = "--no-deploy coredns,servicelb,traefik,local-storage,metrics-server --pause-image test.local/pause:local --node-ip 192.168.1.3";
extraFlags = ''
--disable coredns \
--disable local-storage \
--disable metrics-server \
--disable servicelb \
--disable traefik \
--node-ip 192.168.1.3 \
--pause-image test.local/pause:local
'';
};
networking.firewall.allowedTCPPorts = [ 2379 2380 6443 ];
networking.firewall.allowedUDPPorts = [ 8472 ];
@ -123,7 +139,8 @@ import ../make-test-python.nix ({ pkgs, ... }:
server.wait_until_succeeds("k3s kubectl get node agent")
for m in machines:
m.succeed("k3s check-config")
'' # Fix-Me: Tests fail for 'aarch64-linux' as: "CONFIG_CGROUP_FREEZER: missing (fail)"
+ lib.optionalString (!pkgs.stdenv.isAarch64) ''m.succeed("k3s check-config")'' + ''
m.succeed(
"${pauseImage} | k3s ctr image import -"
)

15
nixos/tests/k3s/single-node.nix
View file

@ -1,4 +1,4 @@
import ../make-test-python.nix ({ pkgs, ... }:
import ../make-test-python.nix ({ pkgs, lib, ... }:
let
imageEnv = pkgs.buildEnv {
name = "k3s-pause-image-env";
@ -40,7 +40,15 @@ import ../make-test-python.nix ({ pkgs, ... }:
services.k3s.role = "server";
services.k3s.package = pkgs.k3s;
# Slightly reduce resource usage
services.k3s.extraFlags = "--no-deploy coredns,servicelb,traefik,local-storage,metrics-server --pause-image test.local/pause:local";
services.k3s.extraFlags = ''
--disable coredns \
--disable local-storage \
--disable metrics-server \
--disable servicelb \
--disable traefik \
--pause-image \
test.local/pause:local
'';
users.users = {
noprivs = {
@ -57,7 +65,8 @@ import ../make-test-python.nix ({ pkgs, ... }:
machine.wait_for_unit("k3s")
machine.succeed("k3s kubectl cluster-info")
machine.fail("sudo -u noprivs k3s kubectl cluster-info")
machine.succeed("k3s check-config")
'' # Fix-Me: Tests fail for 'aarch64-linux' as: "CONFIG_CGROUP_FREEZER: missing (fail)"
+ lib.optionalString (!pkgs.stdenv.isAarch64) ''machine.succeed("k3s check-config")'' + ''
machine.succeed(
"${pauseImage} | k3s ctr image import -"

4
pkgs/applications/audio/ft2-clone/default.nix
View file

@ -13,13 +13,13 @@
stdenv.mkDerivation rec {
pname = "ft2-clone";
version = "1.58";
version = "1.59";
src = fetchFromGitHub {
owner = "8bitbubsy";
repo = "ft2-clone";
rev = "v${version}";
sha256 = "sha256-FHhASs1PKTz6G1sAKNUeft0BHbWgl44l7eiOnyQXZb8=";
sha256 = "sha256-TQJCkvPV6vbhURLcuH41i8obHnfHkrCTJG0+IuSVDos=";
};
# Adapt the linux-only CMakeLists to darwin (more reliable than make-macos.sh)

2
pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix
View file

@ -96,7 +96,7 @@ self: let
./build.sh -j$NIX_BUILD_CORES
'';
postInstall = ''
postInstall = (old.postInstall or "") + "\n" + ''
./install.sh --prefix=$out
'';

10
pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix
View file

@ -186,7 +186,7 @@ let
cd -
'';
postInstall = ''
postInstall = (old.postInstall or "") + "\n" + ''
install -m=755 -D source/sqlite/emacsql-sqlite \
$out/share/emacs/site-lisp/elpa/emacsql-sqlite-${old.version}/sqlite/emacsql-sqlite
'';
@ -301,7 +301,7 @@ let
make
popd
'';
postInstall = ''
postInstall = (attrs.postInstall or "") + "\n" + ''
outd=$(echo $out/share/emacs/site-lisp/elpa/libgit-**)
mkdir $outd/build
install -m444 -t $outd/build ./source/src/libegit2.so
@ -426,7 +426,7 @@ let
cd -
'';
postInstall = ''
postInstall = (old.postInstall or "") + "\n" + ''
mkdir -p $out/bin
install -m755 -Dt $out/bin ./source/server/telega-server
'';
@ -456,7 +456,7 @@ let
pkgs.libtool
(pkgs.zeromq.override { enableDrafts = true; })
];
postInstall = ''
postInstall = (old.postInstall or "") + "\n" + ''
mv $EZMQ_LIBDIR/emacs-zmq.* $out/share/emacs/site-lisp/elpa/zmq-*
rm -r $out/share/emacs/site-lisp/elpa/zmq-*/src
rm $out/share/emacs/site-lisp/elpa/zmq-*/Makefile
@ -533,7 +533,7 @@ let
];
# we need the proper out directory to exist, so we do this in the
# postInstall instead of postBuild
postInstall = ''
postInstall = (old.postInstall or "") + "\n" + ''
pushd source/build >/dev/null
make
install -m444 -t $out/share/emacs/site-lisp/elpa/vterm-** ../*.so

20
pkgs/applications/editors/neovim/neovim-remote.nix
View file

@ -2,6 +2,7 @@
, fetchFromGitHub
, python3
, neovim
, fetchpatch
}:
with python3.pkgs; buildPythonApplication rec {
@ -15,6 +16,14 @@ with python3.pkgs; buildPythonApplication rec {
sha256 = "0lbz4w8hgxsw4k1pxafrl3rhydrvi5jc6vnsmkvnhh6l6rxlmvmq";
};
patches = [
# Fix a compatibility issue with neovim 0.8.0
(fetchpatch {
url = "https://github.com/mhinz/neovim-remote/commit/56d2a4097f4b639a16902390d9bdd8d1350f948c.patch";
hash = "sha256-/PjE+9yfHtOUEp3xBaobzRM8Eo2wqOhnF1Es7SIdxvM=";
})
];
propagatedBuildInputs = [
pynvim
psutil
@ -26,15 +35,12 @@ with python3.pkgs; buildPythonApplication rec {
pytestCheckHook
];
disabledTests = [
# these tests get stuck and never return
"test_escape_filenames_properly"
"test_escape_single_quotes_in_filenames"
"test_escape_double_quotes_in_filenames"
];
doCheck = !stdenv.isDarwin;
preCheck = ''
export HOME="$(mktemp -d)"
'';
meta = with lib; {
description = "A tool that helps controlling nvim processes from a terminal";
homepage = "https://github.com/mhinz/neovim-remote/";

30
pkgs/applications/editors/vscode/extensions/default.nix
View file

@ -326,7 +326,7 @@ let
downloadPage = "https://marketplace.visualstudio.com/items?itemName=attilabuti.brainfuck-syntax";
homepage = "https://github.com/attilabuti/brainfuck-syntax";
license = licenses.mit;
maintainers = with maintainers; [ superherointj ];
maintainers = with maintainers; [ ];
};
};
@ -410,7 +410,7 @@ let
downloadPage = "https://marketplace.visualstudio.com/items?itemName=badochov.ocaml-formatter";
homepage = "https://github.com/badochov/ocamlformatter-vscode";
license = licenses.mit;
maintainers = with maintainers; [ superherointj ];
maintainers = with maintainers; [ ];
};
};
@ -585,7 +585,7 @@ let
downloadPage = "https://marketplace.visualstudio.com/items?itemName=christian-kohler.path-intellisense";
homepage = "https://github.com/ChristianKohler/PathIntellisense";
license = licenses.mit;
maintainers = with maintainers; [ imgabe superherointj ];
maintainers = with maintainers; [ imgabe ];
};
};
@ -943,7 +943,7 @@ let
downloadPage = "https://marketplace.visualstudio.com/items?itemName=esbenp.prettier-vscode";
homepage = "https://github.com/prettier/prettier-vscode";
license = licenses.mit;
maintainers = with maintainers; [ datafoo superherointj ];
maintainers = with maintainers; [ datafoo ];
};
};
@ -1134,7 +1134,7 @@ let
downloadPage = "https://marketplace.visualstudio.com/items?itemName=gencer.html-slim-scss-css-class-completion";
homepage = "https://github.com/gencer/SCSS-Everywhere";
license = licenses.mit;
maintainers = with maintainers; [ superherointj ];
maintainers = with maintainers; [ ];
};
};
@ -1150,7 +1150,7 @@ let
downloadPage = "https://marketplace.visualstudio.com/items?itemName=gitlab.gitlab-workflow";
homepage = "https://gitlab.com/gitlab-org/gitlab-vscode-extension#readme";
license = licenses.mit;
maintainers = with maintainers; [ superherointj ];
maintainers = with maintainers; [ ];
};
};
@ -1400,7 +1400,7 @@ let
downloadPage = "https://marketplace.visualstudio.com/items?itemName=IronGeek.vscode-env";
homepage = "https://github.com/IronGeek/vscode-env.git";
license = licenses.mit;
maintainers = with maintainers; [ superherointj ];
maintainers = with maintainers; [ ];
};
};
@ -1468,7 +1468,7 @@ let
downloadPage = "https://marketplace.visualstudio.com/items?itemName=jnoortheen.nix-ide";
homepage = "https://github.com/jnoortheen/vscode-nix-ide";
license = licenses.mit;
maintainers = with maintainers; [ superherointj SuperSandro2000 ];
maintainers = with maintainers; [ SuperSandro2000 ];
};
};
@ -1963,7 +1963,7 @@ let
downloadPage = "https://marketplace.visualstudio.com/items?itemName=phoenixframework.phoenix";
homepage = "https://github.com/phoenixframework/vscode-phoenix";
license = licenses.mit;
maintainers = with maintainers; [ superherointj ];
maintainers = with maintainers; [ ];
};
};
@ -2027,7 +2027,7 @@ let
downloadPage = "https://marketplace.visualstudio.com/items?itemName=ocamllabs.ocaml-platform";
homepage = "https://github.com/ocamllabs/vscode-ocaml-platform";
license = licenses.isc;
maintainers = with maintainers; [ ratsclub superherointj ];
maintainers = with maintainers; [ ratsclub ];
};
mktplcRef = {
name = "ocaml-platform";
@ -2090,7 +2090,7 @@ let
downloadPage = "https://marketplace.visualstudio.com/items?itemName=Prisma.prisma";
homepage = "https://github.com/prisma/language-tools";
license = licenses.asl20;
maintainers = with maintainers; [ superherointj ];
maintainers = with maintainers; [ ];
};
};
@ -2332,7 +2332,7 @@ let
downloadPage = "https://marketplace.visualstudio.com/items?itemName=stefanjarina.vscode-eex-snippets";
homepage = "https://github.com/stefanjarina/vscode-eex-snippets";
license = licenses.mit;
maintainers = with maintainers; [ superherointj ];
maintainers = with maintainers; [ ];
};
};
@ -2374,8 +2374,8 @@ let
mktplcRef = {
name = "code-spell-checker";
publisher = "streetsidesoftware";
version = "2.3.1";
sha256 = "0pm9i3zw4aa4qrcqnzb9bz166rl7p6nwb81m9rqzisdc85mx4s3x";
version = "2.10.1";
sha256 = "sha256-FeYkSML6QYtuIHIbAovOqlPwkKfNkHr7IdMCWwkynQ0=";
};
meta = with lib; {
changelog = "https://marketplace.visualstudio.com/items/streetsidesoftware.code-spell-checker/changelog";
@ -2469,7 +2469,7 @@ let
downloadPage = "https://marketplace.visualstudio.com/items?itemName=theangryepicbanana.language-pascal";
homepage = "https://github.com/ALANVF/vscode-pascal-magic";
license = licenses.mit;
maintainers = with maintainers; [ superherointj ];
maintainers = with maintainers; [ ];
};
};

50
pkgs/applications/graphics/artem/default.nix Normal file
View file

@ -0,0 +1,50 @@
{ lib
, rustPlatform
, fetchFromGitHub
, installShellFiles
, pkg-config
, openssl
}:
rustPlatform.buildRustPackage rec {
pname = "artem";
version = "1.1.5";
src = fetchFromGitHub {
owner = "finefindus";
repo = pname;
rev = "v${version}";
sha256 = "1jax39gizlcbqnkjckxwm5h0wdk5dk8dasaj9wxv7yidbcbgj4zh";
};
cargoSha256 = "sha256-n2NOWrgcMVHpNCHL7r8+Kl1e01XYadaNM7UdE8fQo1U=";
nativeBuildInputs = [ installShellFiles pkg-config ];
buildInputs = [ openssl ];
OPENSSL_NO_VENDOR = 1;
checkFlags = [
# require internet access
"--skip=arguments::input::url_input"
"--skip=full_file_compare_url"
# flaky
"--skip=full_file_compare_html"
];
postInstall = ''
installManPage $releaseDir/build/artem-*/out/artem.1
installShellCompletion $releaseDir/build/artem-*/out/artem.{bash,fish} \
--zsh $releaseDir/build/artem-*/out/_artem
'';
meta = with lib; {
description = "A small CLI program to convert images to ASCII art";
homepage = "https://github.com/finefindus/artem";
changelog = "https://github.com/finefindus/artem/blob/v${version}/CHANGELOG.md";
license = licenses.mpl20;
maintainers = with maintainers; [ figsoda ];
};
}

8
pkgs/applications/misc/electrum/default.nix
View file

@ -89,7 +89,13 @@ python3.pkgs.buildPythonApplication {
qdarkstyle
];
preBuild = ''
postPatch = ''
# make compatible with protobuf4 by easing dependencies ...
substituteInPlace ./contrib/requirements/requirements.txt \
--replace "protobuf>=3.12,<4" "protobuf>=3.12"
# ... and regenerating the paymentrequest_pb2.py file
protoc --python_out=. electrum/paymentrequest.proto
substituteInPlace ./electrum/ecc_fast.py \
--replace ${libsecp256k1_name} ${secp256k1}/lib/libsecp256k1${stdenv.hostPlatform.extensions.sharedLibrary}
'' + (if enableQt then ''

6
pkgs/applications/misc/gum/default.nix
View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "gum";
version = "0.6.0";
version = "0.7.0";
src = fetchFromGitHub {
owner = "charmbracelet";
repo = pname;
rev = "v${version}";
sha256 = "sha256-pEULArQDwKZzpD0GVH21L1v9xVZiBz91kL/jPJjJav4=";
sha256 = "sha256-T8dIk99qUMyeZvfM+rLA13HAmITQ8SMsQ9uIXtMM+MM=";
};
vendorSha256 = "sha256-vvNoO5eABGVwvAzK33uPelmo3BKxfqiYgEXZI7kgeSo=";
vendorSha256 = "sha256-sht9e4pam4aJCylUZPeVGwk9TYttumJSniNVxI0LfNM=";
nativeBuildInputs = [
installShellFiles

2
pkgs/applications/misc/keylight-controller-mschneider82/default.nix
View file

@ -41,7 +41,7 @@ buildGoModule rec {
'';
license = licenses.mit;
homepage = "https://github.com/mschneider82/keylight-control";
maintainers = with maintainers; [ superherointj ];
maintainers = with maintainers; [ ];
};
}

13
pkgs/applications/misc/qcad/application-dir.patch
View file

@ -33,16 +33,3 @@ index c6c31cbf5..c51b59ce6 100644
}
int RSettings::getSnapRange() {
diff --git a/qcad.desktop b/qcad.desktop
index 93c5e9720..2d0e6bf32 100644
--- a/qcad.desktop
+++ b/qcad.desktop
@@ -48,7 +48,7 @@ Comment[sv]=2D CAD-system
Comment[sl]=Sistem 2D CAD
Comment[uk]=2D САПР
Comment[tr]=2D CAD Sistemi
-Exec=qcad %F
+Exec=qcad-bin %F
X-MultipleArgs=true
Icon=qcad_icon
Terminal=false

786
pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
View file

File diff suppressed because it is too large Load diff

786
pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
View file

File diff suppressed because it is too large Load diff

2
pkgs/applications/networking/cluster/cmctl/default.nix
View file

@ -48,6 +48,6 @@ buildGoModule rec {
downloadPage = "https://github.com/cert-manager/cert-manager";
license = licenses.asl20;
homepage = "https://cert-manager.io/";
maintainers = with maintainers; [ joshvanl superherointj ];
maintainers = with maintainers; [ joshvanl ];
};
}

2
pkgs/applications/networking/cluster/fluxcd/default.nix
View file

@ -65,7 +65,7 @@ in buildGoModule rec {
'';
homepage = "https://fluxcd.io";
license = licenses.asl20;
maintainers = with maintainers; [ bryanasdev000 jlesquembre superherointj ];
maintainers = with maintainers; [ bryanasdev000 jlesquembre ];
mainProgram = "flux";
};
}

2
pkgs/applications/networking/cluster/istioctl/default.nix
View file

@ -42,7 +42,7 @@ buildGoModule rec {
description = "Istio configuration command line utility for service operators to debug and diagnose their Istio mesh";
homepage = "https://istio.io/latest/docs/reference/commands/istioctl";
license = licenses.asl20;
maintainers = with maintainers; [ superherointj bryanasdev000 veehaitch ];
maintainers = with maintainers; [ bryanasdev000 veehaitch ];
platforms = platforms.unix;
};
}

10
pkgs/applications/networking/cluster/k3s/default.nix
View file

@ -47,10 +47,10 @@ with lib;
# Those pieces of software we entirely ignore upstream's handling of, and just
# make sure they're in the path if desired.
let
k3sVersion = "1.25.0+k3s1"; # k3s git tag
k3sCommit = "26e9405767263a2915723cb72b1ffd7f50687a8f"; # k3s git commit at the above version
k3sRepoSha256 = "0rk0svqx26rn6qlvvyj5rsqb87195h1qcf84qmmvf874qwszwpgh";
k3sVendorSha256 = "sha256-YX/yLOLtDxGhRB4tic6oTli/qeeSnpP+f+S+sVXXDSs=";
k3sVersion = "1.25.2+k3s1"; # k3s git tag
k3sCommit = "53c268d8eb90ceea5e1c7865f89db5c7fb8763bc"; # k3s git commit at the above version
k3sRepoSha256 = "1w040bsrf981k19rwaaxjsv52pgzc0k77x083fkhysmrca565z0y";
k3sVendorSha256 = "sha256-8Xti08sjFk1WKimH/GEb99oqBdFO79WVCvYyXIWMpgo=";
# taken from ./manifests/traefik.yaml, extracted from '.spec.chart' https://github.com/k3s-io/k3s/blob/v1.23.3%2Bk3s1/scripts/download#L9
# The 'patch' and 'minor' versions are currently hardcoded as single digits only, so ignore the trailing two digits. Weird, I know.
@ -77,7 +77,7 @@ let
description = "A lightweight Kubernetes distribution";
license = licenses.asl20;
homepage = "https://k3s.io";
maintainers = with maintainers; [ euank mic92 superherointj ];
maintainers = with maintainers; [ euank mic92 ];
platforms = platforms.linux;
};

14
pkgs/applications/networking/cluster/k3s/update.sh
View file

@ -7,8 +7,8 @@ WORKDIR=$(mktemp -d)
trap "rm -rf ${WORKDIR}" EXIT
NIXPKGS_ROOT="$(git rev-parse --show-toplevel)"/
NIXPKGS_K3S_FOLDER=$(cd $(dirname ${BASH_SOURCE[0]}); pwd -P)/
cd ${NIXPKGS_K3S_FOLDER}
NIXPKGS_K3S_PATH=$(cd $(dirname ${BASH_SOURCE[0]}); pwd -P)/
cd ${NIXPKGS_K3S_PATH}
LATEST_TAG_RAWFILE=${WORKDIR}/latest_tag.json
curl --silent ${GITHUB_TOKEN:+"-u \":$GITHUB_TOKEN\""} \
@ -60,7 +60,7 @@ CRI_CTL_VERSION=$(grep github.com/kubernetes-sigs/cri-tools ${FILE_GO_MOD} \
| head -n1 | awk '{print $4}' | sed -e 's/"//g' -e 's/^v//')
setKV () {
sed -i "s|$1 = \".*\"|$1 = \"${2:-}\"|" ${NIXPKGS_K3S_FOLDER}default.nix
sed -i "s|$1 = \".*\"|$1 = \"${2:-}\"|" ${NIXPKGS_K3S_PATH}default.nix
}
setKV k3sVersion ${K3S_VERSION}
@ -91,3 +91,11 @@ else
echo "Update failed. K3S_VENDOR_SHA256 is empty."
exit 1
fi
# `git` flag here is to be used by local maintainers to speed up the bump process
if [ $# -eq 1 ] && [ "$1" = "git" ]; then
OLD_VERSION="$(nix-instantiate --eval -E "with import $NIXPKGS_ROOT. {}; k3s.version or (builtins.parseDrvName k3s.name).version" | tr -d '"')"
git switch -c "package-k3s-${K3S_VERSION}"
git add "$NIXPKGS_K3S_PATH"/default.nix
git commit -m "k3s: ${OLD_VERSION} -> ${K3S_VERSION}"
fi

4
pkgs/applications/networking/cluster/k3sup/default.nix
View file

@ -9,13 +9,13 @@
buildGoModule rec {
pname = "k3sup";
version = "0.12.3";
version = "0.12.7";
src = fetchFromGitHub {
owner = "alexellis";
repo = "k3sup";
rev = version;
sha256 = "sha256-2S/VnxVb056aPxFd5LxtUdaNlosHLlu7Tl/RQbY/zpA=";
sha256 = "sha256-EOGYOxRhpPHOSo9ccCSvat9kq2SlujPqno8v7/zmuto=";
};
nativeBuildInputs = [ makeWrapper installShellFiles ];

2
pkgs/applications/networking/cluster/linkerd/generic.nix
View file

@ -53,6 +53,6 @@ buildGoModule rec {
downloadPage = "https://github.com/linkerd/linkerd2/";
homepage = "https://linkerd.io/";
license = licenses.asl20;
maintainers = with maintainers; [ bryanasdev000 Gonzih superherointj ];
maintainers = with maintainers; [ bryanasdev000 Gonzih ];
};
}

6
pkgs/applications/networking/cluster/pinniped/default.nix
View file

@ -2,18 +2,18 @@
buildGoModule rec{
pname = "pinniped";
version = "0.19.0";
version = "0.20.0";
src = fetchFromGitHub {
owner = "vmware-tanzu";
repo = "pinniped";
rev = "v${version}";
sha256 = "sha256-VGvT0jj2f4+jiaPQkebL0GE+W4U8+RfSEsGr2sNBu2Q=";
sha256 = "sha256-JKZij9f6zlBzbYolxz03R5j95zKELVmEhX+QRTxF/cc=";
};
subPackages = "cmd/pinniped";
vendorSha256 = "sha256-7jQRUYJiRdYuAy3x+VPK4Nh5GF6ME7juloagm85oOVg=";
vendorSha256 = "sha256-szv/B7LG/In0j6MT6KCnuUfaCnK7RsJOLeuOtJ/ig9w=";
ldflags = [ "-s" "-w" ];

4
pkgs/applications/science/chemistry/avogadro2/default.nix
View file

@ -12,13 +12,13 @@ let
in stdenv.mkDerivation rec {
pname = "avogadro2";
version = "1.95.1";
version = "1.97.0";
src = fetchFromGitHub {
owner = "OpenChemistry";
repo = "avogadroapp";
rev = version;
sha256 = "9GnsxQsMuik6CPDmJbJPF0/+LXbZHf/JLevpSsMEoP0=";
hash = "sha256-gZpMgFSPz70QNfd8gH5Jb9RTxQfQalWx33LkgXLEqOQ=";
};
postUnpack = ''

4
pkgs/applications/science/chemistry/cp2k/default.nix
View file

@ -11,13 +11,13 @@ let
in stdenv.mkDerivation rec {
pname = "cp2k";
version = "9.1.0";
version = "2022.2";
src = fetchFromGitHub {
owner = "cp2k";
repo = "cp2k";
rev = "v${version}";
hash = "sha256-P9RwZmrE1E0UTQVasQxWAqa3LBLyJNGeJo8T6u5WWcw=";
hash = "sha256-zDIsgPcLnA0ATJEN1vQClpkToqvIyW7KuXhyGiXJXDw=";
fetchSubmodules = true;
};

2
pkgs/applications/science/physics/crystfel/default.nix
View file

@ -166,7 +166,7 @@ stdenv.mkDerivation rec {
url = "https://www.desy.de/~twhite/${pname}/${pname}-${version}.tar.gz";
sha256 = "0i9d5ggalic7alj97dxjdys7010kxhm2cb4lwakvigl023j8ms79";
};
nativeBuildInputs = [ meson pkg-config ninja flex bison doxygen opencl-headers ]
nativeBuildInputs = [ meson pkg-config ninja flex bison doxygen opencl-headers makeWrapper ]
++ lib.optionals withGui [ wrapGAppsHook ];
buildInputs = [
hdf5

36
pkgs/applications/terminal-emulators/kitty/default.nix
View file

@ -4,6 +4,7 @@
, libxkbcommon, libXi, libXext, wayland-protocols, wayland
, lcms2
, librsync
, openssl
, installShellFiles
, dbus
, darwin
@ -27,14 +28,14 @@
with python3Packages;
buildPythonApplication rec {
pname = "kitty";
version = "0.25.2";
version = "0.26.2";
format = "other";
src = fetchFromGitHub {
owner = "kovidgoyal";
repo = "kitty";
rev = "v${version}";
sha256 = "sha256-o/vVz1lPfsgkzbYjYhIrScCAROmVdiPsNwjW/m5n7Us=";
sha256 = "sha256-IqXRkKzOfqWolH/534nmM2R/69olhFOk6wbbF4ifRd0=";
};
buildInputs = [
@ -42,6 +43,7 @@ buildPythonApplication rec {
ncurses
lcms2
librsync
openssl.dev
] ++ lib.optionals stdenv.isDarwin [
Cocoa
CoreGraphics
@ -77,6 +79,9 @@ buildPythonApplication rec {
outputs = [ "out" "terminfo" "shell_integration" ];
patches = [
# Gets `test_ssh_env_vars` to pass when `bzip2` is in the output of `env`.
./fix-test_ssh_env_vars.patch
# Needed on darwin
# Gets `test_ssh_shell_integration` to pass for `zsh` when `compinit` complains about
@ -98,14 +103,18 @@ buildPythonApplication rec {
--update-check-interval=0 \
--shell-integration=enabled\ no-rc
'';
darwinOptions = ''
--disable-link-time-optimization \
${commonOptions}
'';
in ''
runHook preBuild
${if stdenv.isDarwin then ''
${python.interpreter} setup.py kitty.app \
--disable-link-time-optimization \
${commonOptions}
make man
${python.interpreter} setup.py build ${darwinOptions}
make docs
${python.interpreter} setup.py kitty.app ${darwinOptions}
'' else ''
${python.interpreter} setup.py build-launcher
${python.interpreter} setup.py linux-package \
--egl-library='${lib.getLib libGL}/lib/libEGL.so.1' \
--startup-notification-library='${libstartup_notification}/lib/libstartup-notification-1.so' \
@ -126,7 +135,7 @@ buildPythonApplication rec {
];
# skip failing tests due to darwin sandbox
preCheck = if stdenv.isDarwin then ''
preCheck = lib.optionalString stdenv.isDarwin ''
substituteInPlace kitty_tests/file_transmission.py \
--replace test_file_get dont_test_file_get \
--replace test_path_mapping_receive dont_test_path_mapping_receive
@ -138,15 +147,9 @@ buildPythonApplication rec {
--replace test_ssh_connection_data dont_test_ssh_connection_data
substituteInPlace kitty_tests/fonts.py \
--replace 'class Rendering(BaseTest)' 'class Rendering'
'' else "";
'';
checkPhase =
let buildBinPath =
if stdenv.isDarwin
then "kitty.app/Contents/MacOS"
else "linux-package/bin";
in
''
checkPhase = ''
runHook preCheck
# Fontconfig error: Cannot load default config file: No such file: (null)
@ -155,7 +158,8 @@ buildPythonApplication rec {
# Required for `test_ssh_shell_integration` to pass.
export TERM=kitty
env PATH="${buildBinPath}:$PATH" ${python.interpreter} test.py
make test
runHook postCheck
'';
installPhase = ''

13
pkgs/applications/terminal-emulators/kitty/fix-test_ssh_env_vars.patch Normal file
View file

@ -0,0 +1,13 @@
diff --git a/kitty_tests/ssh.py b/kitty_tests/ssh.py
index 7b3bdbeb..710aeceb 100644
--- a/kitty_tests/ssh.py
+++ b/kitty_tests/ssh.py
@@ -272,8 +272,6 @@ def check_bootstrap(self, sh, home_dir, login_shell='', SHELL_INTEGRATION_VALUE=
def check_untar_or_fail():
q = pty.screen_contents()
- if 'bzip2' in q:
- raise ValueError('Untarring failed with screen contents:\n' + q)
return 'UNTAR_DONE' in q
pty.wait_till(check_untar_or_fail)
self.assertTrue(os.path.exists(os.path.join(home_dir, '.terminfo/kitty.terminfo')))

4
pkgs/applications/version-management/git-and-tools/gh/default.nix
View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "gh";
version = "2.16.1";
version = "2.17.0";
src = fetchFromGitHub {
owner = "cli";
repo = "cli";
rev = "v${version}";
sha256 = "sha256-I8/vO7SfZr4JVbFNBgIaP7CwHn7q6CMIZMjLBsTLY2Q=";
sha256 = "sha256-2GDhDmk7AVb2DGxibIQM0b7hj2iGvjeLJ4+vAZggxtk=";
};
vendorSha256 = "sha256-TVMFOit2pi+ZVcppzs0iKNXluDW9ZQDH2d7cPSzg+ak=";

28
pkgs/applications/video/kooha/default.nix
View file

@ -4,8 +4,8 @@
, appstream-glib
, desktop-file-utils
, glib
, gobject-introspection
, gst_all_1
, pipewire
, gtk4
, libadwaita
, libpulseaudio
@ -13,27 +13,26 @@
, meson
, ninja
, pkg-config
, python3
, rustPlatform
, wayland
, wrapGAppsHook
, wrapGAppsHook4
}:
stdenv.mkDerivation rec {
pname = "kooha";
version = "2.0.1";
version = "2.2.2";
src = fetchFromGitHub {
owner = "SeaDve";
repo = "Kooha";
rev = "v${version}";
sha256 = "05ynpwjdpl7zp9f17zhhvb59rbz3gd7hc0amla1g85ldgfxbgl00";
hash = "sha256-HgouIMbwpmR/K1hPU7QDzeEtyi5hC66huvInkJFLS2w=";
};
cargoDeps = rustPlatform.fetchCargoTarball {
inherit src;
name = "${pname}-${version}";
hash = "sha256:16zf6vb001z7xdv2g4kpmb2vqsmaql2cpsx1rl9zrfhpl2z6frs9";
hash = "sha256-rdxD9pys11QcUtufcZ/zCrviytyc8hIXJfsXg2JoaKE=";
};
nativeBuildInputs = [
@ -41,18 +40,15 @@ stdenv.mkDerivation rec {
desktop-file-utils
meson
ninja
python3
pkg-config
rustPlatform.cargoSetupHook
rustPlatform.rust.cargo
rustPlatform.rust.rustc
wayland
wrapGAppsHook
wrapGAppsHook4
];
buildInputs = [
glib
gobject-introspection
gst_all_1.gstreamer
gst_all_1.gst-plugins-base
gst_all_1.gst-plugins-ugly
@ -60,18 +56,10 @@ stdenv.mkDerivation rec {
libadwaita
libpulseaudio
librsvg
wayland
pipewire
];
propagatedBuildInputs = [ python3.pkgs.pygobject3 ];
strictDeps = false;
# Fixes https://github.com/NixOS/nixpkgs/issues/31168
postPatch = ''
patchShebangs build-aux/meson_post_install.py
substituteInPlace meson.build --replace '>= 1.0.0-alpha.1' '>= 1.0.0'
'';
installCheckPhase = ''
$out/bin/kooha --help
'';

9
pkgs/applications/video/streamlink/default.nix
View file

@ -6,11 +6,12 @@
python3Packages.buildPythonApplication rec {
pname = "streamlink";
version = "3.2.0";
version = "5.0.1";
format = "pyproject";
src = python3Packages.fetchPypi {
inherit pname version;
sha256 = "sha256-l3DS2DhExTeKc+FBMNy3YKvIVlZsqgpB/FuXoN7V2SY=";
hash = "sha256-PKRioPBhTV6i3ckQgcKuhQFmpBvUQE4o3FLej8qx4mM=";
};
checkInputs = with python3Packages; [
@ -20,6 +21,10 @@ python3Packages.buildPythonApplication rec {
freezegun
];
nativeBuildInputs = with python3Packages; [
versioningit
];
propagatedBuildInputs = (with python3Packages; [
isodate
lxml

6
pkgs/applications/virtualization/pods/default.nix
View file

@ -15,19 +15,19 @@
stdenv.mkDerivation rec {
pname = "pods";
version = "1.0.0-beta.4";
version = "1.0.0-beta.5";
src = fetchFromGitHub {
owner = "marhkb";
repo = pname;
rev = "v${version}";
sha256 = "1j5rz43860n17qcxmc5dj8sll3y593jj9zz1sfvnx4g0694sp0cl";
sha256 = "sha256-Bp/ILQY5Xa8wrq7v9O9QohWzlevdN3MwMjjnlimt6HM=";
};
cargoDeps = rustPlatform.fetchCargoTarball {
inherit src;
name = "${pname}-${version}";
sha256 = "sha256-tj0ROO8HmFWyQLYDrdywOneHz6X43dRZJFTB+aw+m7o=";
sha256 = "sha256-iToznqaNXArVrSdDXGPJol3OeFdM3J8VgYSs+mjM0SE=";
};
nativeBuildInputs = [

35
pkgs/applications/virtualization/qemu/canokey-qemu.nix Normal file
View file

@ -0,0 +1,35 @@
{
lib,
stdenv,
fetchFromGitHub,
cmake,
}:
stdenv.mkDerivation rec {
pname = "canokey-qemu";
version = "unstable-2022-06-23";
rev = "b70af31229f1858089c3366f71b8d771de4a1e84";
src = fetchFromGitHub {
owner = "canokeys";
repo = "canokey-qemu";
inherit rev;
fetchSubmodules = true;
hash = "sha256-VJb59K/skx+DhoJs5qGUu070hAjQZC2Z6hAMXuX0bMw=";
};
postPatch = ''
substituteInPlace canokey-core/CMakeLists.txt \
--replace "COMMAND git describe --always --tags --long --abbrev=8 --dirty >>" "COMMAND echo '$rev' >>"
'';
outputs = [ "out" "dev" ];
nativeBuildInputs = [ cmake ];
meta = with lib; {
homepage = "https://github.com/canokeys/canokey-qemu";
description = "CanoKey QEMU Virt Card";
license = licenses.asl20;
maintainers = with maintainers; [ oxalica ];
};
}

7
pkgs/applications/virtualization/qemu/default.nix
View file

@ -26,6 +26,7 @@
, smbdSupport ? false, samba
, tpmSupport ? true
, uringSupport ? stdenv.isLinux, liburing
, canokeySupport ? false, canokey-qemu
, hostCpuOnly ? false
, hostCpuTargets ? (if hostCpuOnly
then (lib.optional stdenv.isx86_64 "i386-softmmu"
@ -79,7 +80,8 @@ stdenv.mkDerivation rec {
++ lib.optionals virglSupport [ virglrenderer ]
++ lib.optionals libiscsiSupport [ libiscsi ]
++ lib.optionals smbdSupport [ samba ]
++ lib.optionals uringSupport [ liburing ];
++ lib.optionals uringSupport [ liburing ]
++ lib.optionals canokeySupport [ canokey-qemu ];
dontUseMesonConfigure = true; # meson's configurePhase isn't compatible with qemu build
@ -161,7 +163,8 @@ stdenv.mkDerivation rec {
++ lib.optional tpmSupport "--enable-tpm"
++ lib.optional libiscsiSupport "--enable-libiscsi"
++ lib.optional smbdSupport "--smbd=${samba}/bin/smbd"
++ lib.optional uringSupport "--enable-linux-io-uring";
++ lib.optional uringSupport "--enable-linux-io-uring"
++ lib.optional canokeySupport "--enable-canokey";
dontWrapGApps = true;

19
pkgs/common-updater/directory-listing-updater.nix Normal file
View file

@ -0,0 +1,19 @@
{ lib
, genericUpdater
, common-updater-scripts
}:
{ pname ? null
, version ? null
, attrPath ? null
, ignoredVersions ? ""
, rev-prefix ? ""
, odd-unstable ? false
, patchlevel-unstable ? false
, url ? null
}:
genericUpdater {
inherit pname version attrPath ignoredVersions rev-prefix odd-unstable patchlevel-unstable;
versionLister = "${common-updater-scripts}/bin/list-directory-versions ${lib.optionalString (url != null) "--url=${lib.escapeShellArg url}"}";
}

2
pkgs/common-updater/generic-updater.nix
View file

@ -62,7 +62,7 @@ let
return 1
}
tags=$($version_lister --pname=$pname --attr-path=$attr_path --file="${fileForGitCommands}") || exit 1
tags=$(sh -c "$version_lister --pname=$pname --attr-path=$attr_path --file=\"${fileForGitCommands}\"") || exit 1
# print available tags
for tag in $tags; do

2
pkgs/common-updater/http-two-levels-updater.nix
View file

@ -15,5 +15,5 @@
genericUpdater {
inherit pname version attrPath ignoredVersions rev-prefix odd-unstable patchlevel-unstable;
versionLister = "${common-updater-scripts}/bin/list-archive-two-levels-versions ${lib.optionalString (url != null) "--url=${url}"}";
versionLister = "${common-updater-scripts}/bin/list-archive-two-levels-versions ${lib.optionalString (url != null) "--url=${lib.escapeShellArg url}"}";
}

32
pkgs/common-updater/scripts.nix
View file

@ -1,9 +1,28 @@
{ lib, stdenv, makeWrapper, coreutils, gnused, gnugrep, diffutils, nix, git, jq }:
{ lib
, stdenv
, makeWrapper
, coreutils
, diffutils
, git
, gnugrep
, gnused
, jq
, nix
, python3Packages
}:
stdenv.mkDerivation {
name = "common-updater-scripts";
nativeBuildInputs = [ makeWrapper ];
nativeBuildInputs = [
makeWrapper
python3Packages.wrapPython
];
pythonPath = [
python3Packages.beautifulsoup4
python3Packages.requests
];
dontUnpack = true;
@ -11,8 +30,15 @@ stdenv.mkDerivation {
mkdir -p $out/bin
cp ${./scripts}/* $out/bin
# wrap non python scripts
for f in $out/bin/*; do
wrapProgram $f --prefix PATH : ${lib.makeBinPath [ coreutils gnused gnugrep nix diffutils git jq ]}
if ! (head -n1 "$f" | grep -q '#!.*/env.*\(python\|pypy\)'); then
wrapProgram $f --prefix PATH : ${lib.makeBinPath [ coreutils diffutils git gnugrep gnused jq nix ]}
fi
done
# wrap python scripts
makeWrapperArgs+=( --prefix PATH : "${lib.makeBinPath [ nix ]}" )
wrapPythonPrograms
'';
}

4
pkgs/common-updater/scripts/list-archive-two-levels-versions
View file

@ -4,7 +4,7 @@
pname="" # package name
attr_path="" # package attribute path
url="" # directory list url
url="" # directory listing url
file="" # file for writing debugging information
while (( $# > 0 )); do
@ -31,7 +31,7 @@ while (( $# > 0 )); do
done
if [[ -z "$pname" ]]; then
pname="$UPDATE_NIX_NAME"
pname="$UPDATE_NIX_PNAME"
fi
if [[ -z "$attr_path" ]]; then

65
pkgs/common-updater/scripts/list-directory-versions Executable file
View file

@ -0,0 +1,65 @@
#!/usr/bin/env python
import argparse
import requests
import os
import subprocess
import json
import re
from bs4 import BeautifulSoup
parser = argparse.ArgumentParser(
description="Get all available versions listed for a package in a site."
)
parser.add_argument(
"--pname",
default=os.environ.get("UPDATE_NIX_PNAME"),
required="UPDATE_NIX_PNAME" not in os.environ,
help="name of the package",
)
parser.add_argument(
"--attr-path",
default=os.environ.get("UPDATE_NIX_ATTR_PATH"),
help="attribute path of the package",
)
parser.add_argument("--url", help="url of the page that lists the package versions")
parser.add_argument("--file", help="file name for writing debugging information")
if __name__ == "__main__":
args = parser.parse_args()
pname = args.pname
attr_path = args.attr_path or pname
url = args.url or json.loads(
subprocess.check_output(
[
"nix-instantiate",
"--json",
"--eval",
"-E",
f"with import ./. {{}}; dirOf (lib.head {attr_path}.src.urls)",
],
text=True,
)
)
# print a debugging message
if args.file:
with open(args.file, "a") as f:
f.write(f"# Listing versions for {pname} from {url}\n")
page = requests.get(url)
soup = BeautifulSoup(page.content, "html.parser")
links = soup.find_all("a")
for link in links:
link_url = link.get("href", None)
if link_url is not None:
match = re.fullmatch(
rf"{args.pname}-([\d.]+?(-[\d\w.-]+?)?)(\.tar)?(\.[^.]*)", link_url
)
if match:
print(match.group(1))

2
pkgs/common-updater/scripts/list-git-tags
View file

@ -31,7 +31,7 @@ while (( $# > 0 )); do
done
if [[ -z "$pname" ]]; then
pname="$UPDATE_NIX_NAME"
pname="$UPDATE_NIX_PNAME"
fi
if [[ -z "$attr_path" ]]; then

4
pkgs/data/icons/nordzy-icon-theme/default.nix
View file

@ -8,13 +8,13 @@
stdenvNoCC.mkDerivation rec {
pname = "nordzy-icon-theme";
version = "1.6";
version = "1.7";
src = fetchFromGitHub {
owner = "alvatip";
repo = "Nordzy-icon";
rev = version;
sha256 = "sha256-syiJL5i7JJXiSedUtaaoCnAv/6NgRtB3um7A5Sp+Pek=";
sha256 = "sha256-pyWEHP7tqg7Cca38a7cGTCx/PCQ+OqG2koxQB6PSzkA=";
};
# In the post patch phase we should first make sure to patch shebangs.

6
pkgs/desktops/enlightenment/enlightenment/default.nix
View file

@ -14,10 +14,10 @@
, pam
, xkeyboard_config
, udisks2
, waylandSupport ? false, wayland-protocols, xwayland
, bluetoothSupport ? true, bluez5
, pulseSupport ? !stdenv.isDarwin, libpulseaudio
, directoryListingUpdater
}:
stdenv.mkDerivation rec {
@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
version = "0.25.4";
src = fetchurl {
url = "http://download.enlightenment.org/rel/apps/${pname}/${pname}-${version}.tar.xz";
url = "https://download.enlightenment.org/rel/apps/${pname}/${pname}-${version}.tar.xz";
sha256 = "sha256-VttdIGuCG5qIMdJucT5BCscLIlWm9D/N98Ae794jt6I=";
};
@ -71,6 +71,8 @@ stdenv.mkDerivation rec {
passthru.providedSessions = [ "enlightenment" ];
passthru.updateScript = directoryListingUpdater { };
meta = with lib; {
description = "The Compositing Window Manager and Desktop Shell";
homepage = "https://www.enlightenment.org";

4
pkgs/development/compilers/kotlin/default.nix
View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "kotlin";
version = "1.7.10";
version = "1.7.20";
src = fetchurl {
url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip";
hash = "sha256-doP1RR7zCOt3Omhu53eadqle2LFDxprCR5N2GdfKOgk=";
hash = "sha256-XjyND5ZUEP8S6Q1vjcXfL8Cf1ZWmhNUUYWhRzn6Urn0=";
};
propagatedBuildInputs = [ jre ] ;

2
pkgs/development/interpreters/dart/default.nix
View file

@ -61,7 +61,7 @@ stdenv.mkDerivation {
meta = with lib; {
homepage = "https://www.dartlang.org/";
maintainers = with maintainers; [ grburst flexagoon ];
maintainers = with maintainers; [ grburst ];
description = "Scalable programming language, with robust libraries and runtimes, for building web, server, and mobile apps";
longDescription = ''
Dart is a class-based, single inheritance, object-oriented language

2
pkgs/development/libraries/arguments/default.nix
View file

@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
pname = "arguments";
name = "${pname}-2015-11-30";
version = "unstable-2015-11-30";
owner = "BIC-MNI";

4
pkgs/development/libraries/libplctag/default.nix
View file

@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "libplctag";
version = "2.5.1";
version = "2.5.2";
src = fetchFromGitHub {
owner = "libplctag";
repo = "libplctag";
rev = "v${version}";
sha256 = "sha256-ZD7mf6O1iBGmZ2bRWfnM0WPuP1itIi9TxZ5rK4uvBTw=";
sha256 = "sha256-HBhVPHkr21iT78lE0FRydZAY7kkH1s/EWP7lsWFC0xA=";
};
nativeBuildInputs = [ cmake ];

1
pkgs/development/libraries/libvirt/default.nix
View file

@ -125,6 +125,7 @@ stdenv.mkDerivation rec {
patches = [
./0001-meson-patch-in-an-install-prefix-for-building-on-nix.patch
] ++ lib.optionals enableZfs [
(substituteAll {
src = ./0002-substitute-zfs-and-zpool-commands.patch;
zfs = "${zfs}/bin/zfs";

4
pkgs/development/libraries/libvori/default.nix
View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "libvori";
version = "210412";
version = "220621";
src = fetchurl {
url = "https://brehm-research.de/files/${pname}-${version}.tar.gz";
sha256 = "1b4hpwibf3k7gl6n984l3wdi0zyl2fmpz84m9g2di4yhm6p8c61k";
hash = "sha256-HPqYxWSBS92s8cDn8RWCE311hmj2MH5us5LHIxeYTBQ=";
};
nativeBuildInputs = [ cmake ];

34
pkgs/development/libraries/onnxruntime/default.nix
View file

@ -15,11 +15,18 @@
, boost
, oneDNN
, gtest
, pythonSupport ? true
, pythonSupport ? false
, nsync
, flatbuffers
}:
# Python Support
#
# When enabling Python support a wheel is made and stored in a `dist` output.
# This wheel is then installed in a separate derivation.
assert pythonSupport -> lib.versionOlder protobuf.version "3.20";
let
# prefetch abseil
# Note: keep URL in sync with `cmake/external/abseil-cpp.cmake`
@ -58,26 +65,26 @@ stdenv.mkDerivation rec {
setuptools
wheel
pip
pythonOutputDistHook
]);
buildInputs = [
libpng
zlib
protobuf
howard-hinnant-date
nlohmann_json
boost
oneDNN
] ++ lib.optionals pythonSupport ([
flatbuffers
protobuf
] ++ lib.optionals pythonSupport [
nsync
] ++ (with python3Packages; [
numpy
pybind11
]));
python3Packages.numpy
python3Packages.pybind11
];
# TODO: build server, and move .so's to lib output
outputs = [ "out" "dev" ] ++ lib.optionals pythonSupport [ "python" ];
# Python's wheel is stored in a separate dist output
outputs = [ "out" "dev" ] ++ lib.optionals pythonSupport [ "dist" ];
enableParallelBuilding = true;
@ -116,10 +123,15 @@ stdenv.mkDerivation rec {
../include/onnxruntime/core/framework/provider_options.h \
../include/onnxruntime/core/providers/cpu/cpu_provider_factory.h \
../include/onnxruntime/core/session/onnxruntime_*.h
'' + lib.optionalString pythonSupport ''
pip install dist/*.whl --no-index --no-warn-script-location --prefix="$python" --no-cache --no-deps
'';
passthru = {
inherit protobuf;
tests = lib.optionalAttrs pythonSupport {
python = python3Packages.onnxruntime;
};
};
meta = with lib; {
description = "Cross-platform, high performance scoring engine for ML models";
longDescription = ''

20
pkgs/development/libraries/pipewire/wireplumber.nix
View file

@ -1,7 +1,6 @@
{ lib
, stdenv
, fetchFromGitLab
, fetchpatch
, nix-update-script
, # base build deps
meson
@ -27,7 +26,7 @@ let
in
stdenv.mkDerivation rec {
pname = "wireplumber";
version = "0.4.11";
version = "0.4.12";
outputs = [ "out" "dev" ] ++ lib.optional enableDocs "doc";
@ -36,24 +35,9 @@ stdenv.mkDerivation rec {
owner = "pipewire";
repo = "wireplumber";
rev = version;
sha256 = "sha256-3NrzOsL0MekxMMXCFubEkazzSWFNsjUsX8n2ECcr7yY=";
sha256 = "sha256-2qM6sX807v/3DZXTuBvUSGV8+cPB87rWYb+HTDCm3kw=";
};
patches = [
# fix sound not working in VMs
# FIXME: drop in next release
(fetchpatch {
url = "https://gitlab.freedesktop.org/pipewire/wireplumber/-/commit/c16e637c329bc9dda8544b18f5bd47a8d63ee253.patch";
sha256 = "sha256-xhhAlhOovwIjwAxXxvHRTG4GzpIPYvKQE2F4ZP1Udq8=";
})
# fix bluetooth rescan loops
# FIXME: drop in next release
(fetchpatch {
url = "https://gitlab.freedesktop.org/pipewire/wireplumber/-/merge_requests/398.patch";
sha256 = "sha256-rEp/3fjBRbkFuw4rBW6h8O5hcy/oBP3DW7bPu5rVfNY=";
})
];
nativeBuildInputs = [
meson
pkg-config

4
pkgs/development/libraries/science/chemistry/avogadrolibs/default.nix
View file

@ -21,13 +21,13 @@ let
in stdenv.mkDerivation rec {
pname = "avogadrolibs";
version = "1.95.1";
version = "1.97.0";
src = fetchFromGitHub {
owner = "OpenChemistry";
repo = pname;
rev = version;
sha256 = "0zzVg8xNqFwDrK8gRkDm3tRgBt7fD4K3Uy/ajUBc+eQ=";
hash = "sha256-ZGFyUlFyI403aw/6GVze/gronT67XlEOKuw5sfHeVy8=";
};
postUnpack = ''

8
pkgs/development/libraries/telepathy/farstream/default.nix
View file

@ -1,21 +1,21 @@
{ lib, stdenv, fetchurl, pkg-config, telepathy-glib, farstream, dbus-glib }:
stdenv.mkDerivation rec {
name = "${pname}-0.6.2";
pname = "telepathy-farstream";
version = "0.6.2";
src = fetchurl {
url = "https://telepathy.freedesktop.org/releases/${pname}/${name}.tar.gz";
url = "https://telepathy.freedesktop.org/releases/${pname}/${pname}-${version}.tar.gz";
sha256 = "02ky12bb92prr5f6xmvmfq4yz2lj33li6nj4829a98hk5pr9k83g";
};
propagatedBuildInputs = [ dbus-glib telepathy-glib farstream ];
nativeBuildInputs = [ pkg-config ];
propagatedBuildInputs = [ dbus-glib telepathy-glib farstream ];
meta = with lib; {
description = "GObject-based C library that uses Telepathy GLib, Farstream and GStreamer to handle the media streaming part of channels of type Call";
homepage = "https://telepathy.freedesktop.org/wiki/Components/Telepathy-Farstream/";
platforms = platforms.linux;
license = licenses.lgpl21;
license = licenses.lgpl21Only;
};
}

4
pkgs/development/libraries/ucx/default.nix
View file

@ -13,13 +13,13 @@ let
in stdenv.mkDerivation rec {
pname = "ucx";
version = "1.13.0";
version = "1.13.1";
src = fetchFromGitHub {
owner = "openucx";
repo = "ucx";
rev = "v${version}";
sha256 = "sha256-DWiOmqxBAAH8DE7H0teoKyp+m3wYEo652ac7ey43Erg=";
sha256 = "sha256-NhtN8xrHc6UnUrMbq9LHpb25JO+/LDGcLLGebCfGnv4=";
};
patches = [

14
pkgs/development/misc/resholve/resholve.nix
View file

@ -19,24 +19,16 @@ python27Packages.buildPythonApplication {
propagatedBuildInputs = [
oildev
/*
Disable configargparse's tests on aarch64-darwin.
Several of py27 scandir's tests fail on aarch64-darwin. Chain:
configargparse -> pytest-check-hook -> pytest -> pathlib2 -> scandir
TODO: drop if https://github.com/NixOS/nixpkgs/issues/156807 resolves?
*/
(python27Packages.configargparse.overridePythonAttrs (old: {
doCheck = stdenv.hostPlatform.system != "aarch64-darwin";
}))
python27Packages.configargparse
];
patchPhase = ''
postPatch = ''
for file in setup.cfg _resholve/version.py; do
substituteInPlace $file --subst-var-by version ${version}
done
'';
postInstall = ''
postInstall = ''
installManPage resholve.1
'';

2
pkgs/development/ocaml-modules/brisk-reconciler/default.nix
View file

@ -27,7 +27,7 @@ buildDunePackage rec {
* stateful functions: Functions that maintain state over time. Imagine that you can take any variable in your function and manage its value over the function's invocation. Now, imagine that any function invocation really creates its own "instance" of the function which will track this state separately from other invocations of this function.
'';
homepage = "https://github.com/briskml/brisk-reconciler";
maintainers = with maintainers; [ superherointj ];
maintainers = with maintainers; [ ];
license = licenses.mit;
};
}

2
pkgs/development/ocaml-modules/flex/default.nix
View file

@ -16,7 +16,7 @@ buildDunePackage rec {
meta = with lib; {
description = "Native Reason implementation of CSS Flexbox layout. An Yoga project port";
homepage = "https://github.com/jordwalke/flex";
maintainers = with maintainers; [ superherointj ];
maintainers = with maintainers; [ ];
license = licenses.mit;
};
}

2
pkgs/development/ocaml-modules/rebez/default.nix
View file

@ -17,7 +17,7 @@ buildDunePackage rec {
description = "Cubic bezier implementation in Reason / OCaml";
homepage = "https://github.com/jchavarri/rebez/";
license = licenses.mit;
maintainers = with maintainers; [ superherointj ];
maintainers = with maintainers; [ ];
mainProgram = "RebezApp.exe";
};
}

2
pkgs/development/ocaml-modules/reperf/default.nix
View file

@ -35,7 +35,7 @@ buildDunePackage rec {
Outputs a JSON performance report, and compare it with previous iterations - and fail if a regression is detected.
'';
homepage = "https://github.com/bryphe/reperf";
maintainers = with maintainers; [ superherointj ];
maintainers = with maintainers; [ ];
license = licenses.mit;
};
}

2
pkgs/development/ocaml-modules/telegraml/default.nix
View file

@ -29,6 +29,6 @@ buildDunePackage rec {
description = "An OCaml library implementing the Telegram bot API";
homepage = "https://github.com/nv-vn/TelegraML/";
license = licenses.mit;
maintainers = with maintainers; [ superherointj ];
maintainers = with maintainers; [ ];
};
}

2
pkgs/development/ocaml-modules/tsdl-image/default.nix
View file

@ -32,6 +32,6 @@ buildDunePackage rec {
description = "OCaml SDL2_image bindings to go with Tsdl";
homepage = "https://github.com/sanette/tsdl-image";
license = licenses.bsd3;
maintainers = with maintainers; [ superherointj ];
maintainers = with maintainers; [ ];
};
}

2
pkgs/development/ocaml-modules/tsdl-mixer/default.nix
View file

@ -32,6 +32,6 @@ buildDunePackage rec {
description = "SDL2_mixer bindings to go with Tsdl";
homepage = "https://github.com/sanette/tsdl-mixer";
license = licenses.bsd3;
maintainers = with maintainers; [ superherointj ];
maintainers = with maintainers; [ ];
};
}

2
pkgs/development/ocaml-modules/tsdl-ttf/default.nix
View file

@ -32,6 +32,6 @@ buildDunePackage rec {
description = "SDL2_ttf bindings for Ocaml with Tsdl";
homepage = "https://github.com/sanette/tsdl-ttf";
license = licenses.bsd3;
maintainers = with maintainers; [ superherointj ];
maintainers = with maintainers; [ ];
};
}

35
pkgs/development/python-modules/atomman/default.nix
View file

@ -4,7 +4,6 @@
, cython
, datamodeldict
, fetchFromGitHub
, fetchpatch
, matplotlib
, numericalunits
, numpy
@ -18,47 +17,27 @@
, pythonAtLeast
, requests
, scipy
, setuptools
, toolz
, xmltodict
}:
buildPythonPackage rec {
version = "1.4.5";
version = "1.4.6";
pname = "atomman";
format = "setuptools";
format = "pyproject";
disabled = pythonOlder "3.6";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "usnistgov";
repo = "atomman";
rev = "v${version}";
hash = "sha256-wXz/uHjXKHVKJu/HoFF2mADSBLp6UGF9ivOp2ZOz/Ys=";
hash = "sha256-tcsxtFbBdMC6+ixzqhnR+5UNwcQmnPQSvuyNA2IYelI=";
};
patches = [
# Fix several tests that are failing on master.
# https://github.com/usnistgov/atomman/pull/9
(fetchpatch {
name = "fix-tests-1.patch";
url = "https://github.com/usnistgov/atomman/commit/d255977a5e0ce4584e2c886f6c55ccb9f5932731.patch";
hash = "sha256-lBFOgcozY85JfQVsVjd51Jf9mrokwQuYdxa8l7VzkqU=";
})
(fetchpatch {
name = "fix-tests-2.patch";
url = "https://github.com/usnistgov/atomman/commit/de4177f28ad7c48d482cb606f323128e2fcb86aa.patch";
hash = "sha256-+YpwdKCT/OTue3b2GOk9Jagg26r1PTTV2Zg+GGBd8sM=";
})
(fetchpatch {
name = "fix-tests-3.patch";
url = "https://github.com/usnistgov/atomman/commit/10b168493ee883348699f1e42680423cec84bed5.patch";
hash = "sha256-b4f3POjiceq3xApfjnKAs9dEf1trCiTIyu7hMPL0ZTw=";
})
(fetchpatch {
name = "fix-tests-4.patch";
url = "https://github.com/usnistgov/atomman/commit/057d24c70427bab3c7c530251ceb5f4e27eb5c56.patch";
hash = "sha256-FTg/GNRZ5xigGW8SpUTIw2/GEzOxwb1rsv2wGebmZOk=";
})
nativeBuildInputs = [
setuptools
];
propagatedBuildInputs = [

2
pkgs/development/python-modules/cinemagoer/default.nix
View file

@ -29,6 +29,6 @@ buildPythonPackage rec {
downloadPage = "https://github.com/cinemagoer/cinemagoer/";
homepage = "https://cinemagoer.github.io/";
license = licenses.gpl2Only;
maintainers = with maintainers; [ superherointj ];
maintainers = with maintainers; [ ];
};
}

22
pkgs/development/python-modules/django-reversion/default.nix
View file

@ -2,23 +2,31 @@
, buildPythonPackage
, fetchPypi
, django
, pythonOlder
}:
buildPythonPackage rec {
pname = "django-reversion";
version = "5.0.2";
version = "5.0.3";
format = "setuptools";
src = fetchPypi {
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-JDoS7k4EwWEcDwdvv8MHTxrUCvxFrcZN5bokFMxOryk=";
hash = "sha256-rLYA+EghRzEqJ71Y5jdmqgODMQGB5IXm6qL0LSZQLJs=";
};
# tests assume the availability of a mysql/postgresql database
propagatedBuildInputs = [
django
];
# Tests assume the availability of a mysql/postgresql database
doCheck = false;
propagatedBuildInputs = [ django ];
pythonImportsCheck = [ "reversion" ];
pythonImportsCheck = [
"reversion"
];
meta = with lib; {
description = "An extension to the Django web framework that provides comprehensive version control facilities";

22
pkgs/development/python-modules/dlib/default.nix
View file

@ -4,7 +4,17 @@
}:
buildPythonPackage {
inherit (dlib) name src nativeBuildInputs buildInputs meta;
inherit (dlib) pname version src nativeBuildInputs buildInputs meta;
patches = [ ./build-cores.patch ];
checkInputs = [ pytest more-itertools ];
postPatch = ''
substituteInPlace setup.py \
--replace "more-itertools<6.0.0" "more-itertools" \
--replace "pytest==3.8" "pytest"
'';
# although AVX can be enabled, we never test with it. Some Hydra machines
# fail because of this, however their build results are probably used on hardware
@ -18,15 +28,5 @@ buildPythonPackage {
"--set USE_AVX_INSTRUCTIONS=${if avxSupport then "yes" else "no"}"
];
patches = [ ./build-cores.patch ];
postPatch = ''
substituteInPlace setup.py \
--replace "more-itertools<6.0.0" "more-itertools" \
--replace "pytest==3.8" "pytest"
'';
checkInputs = [ pytest more-itertools ];
dontUseCmakeConfigure = true;
}

4
pkgs/development/python-modules/ducc0/default.nix
View file

@ -2,7 +2,7 @@
buildPythonPackage rec {
pname = "ducc0";
version = "0.25.0";
version = "0.26.0";
disabled = pythonOlder "3.7";
@ -11,7 +11,7 @@ buildPythonPackage rec {
owner = "mtr";
repo = "ducc";
rev = "ducc0_${lib.replaceStrings ["."] ["_"] version}";
sha256 = "h+x6dakjyTyqOT9nzzZiCmjw5duZBGu+zpnQJnTnN1M=";
sha256 = "p5TW8utFDlN80zD6hvWPcmM2DfKqvEuOzRUtTvLwNT0=";
};
buildInputs = [ pybind11 ];

2
pkgs/development/python-modules/glad/default.nix
View file

@ -13,6 +13,6 @@ buildPythonPackage rec {
description = "Multi-Language Vulkan/GL/GLES/EGL/GLX/WGL Loader-Generator based on the official specs";
homepage = "https://github.com/Dav1dde/glad";
license = licenses.mit;
maintainers = with maintainers; [ superherointj ];
maintainers = with maintainers; [ ];
};
}

6
pkgs/development/python-modules/google-cloud-appengine-logging/default.nix
View file

@ -12,14 +12,14 @@
buildPythonPackage rec {
pname = "google-cloud-appengine-logging";
version = "1.1.4";
version = "1.1.5";
format = "setuptools";
disabled = pythonOlder "3.6";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-im0A14OQghyYqgtkD767qG+niKQX4jpb0pm2yNBwBCQ=";
hash = "sha256-/zKQX6olZS0yl1yAu7Hguj87GUCiPfuf9oamobFHxjw=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/google-cloud-automl/default.nix
View file

@ -15,14 +15,14 @@
buildPythonPackage rec {
pname = "google-cloud-automl";
version = "2.8.1";
version = "2.8.2";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-FlR7jpj/NKJgGLjTvfGr/YusKi+FQ43dyhd6GhTjNE0=";
hash = "sha256-hMVsjdjA/BkEuGDQK1x2zqWZSjIR7KroX4kcyJnIq4Q=";
};
propagatedBuildInputs = [

8
pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix
View file

@ -7,15 +7,19 @@
, proto-plus
, pytest-asyncio
, pytestCheckHook
, pythonOlder
}:
buildPythonPackage rec {
pname = "google-cloud-bigquery-logging";
version = "1.0.5";
version = "1.0.6";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-mKsRLljxWe6CYaWy08Gk5XvkygzoVWmu7wOIOGivmZM=";
hash = "sha256-n32dnkSujb8npafG4OQZpKqyfdPsIt9hZVpvtjhI6U0=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/google-cloud-container/default.nix
View file

@ -13,14 +13,14 @@
buildPythonPackage rec {
pname = "google-cloud-container";
version = "2.12.0";
version = "2.12.1";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-8zf8PYSOI0KE1P4wAjcehuEzPKZ7RdQlxdUGWYygzIM=";
hash = "sha256-FwwI5rlVspPjfgFSaed+bqQSHuq6OFgLrQN/JL+bffM=";
};
propagatedBuildInputs = [

6
pkgs/development/python-modules/google-cloud-datacatalog/default.nix
View file

@ -13,14 +13,14 @@
buildPythonPackage rec {
pname = "google-cloud-datacatalog";
version = "3.9.1";
version = "3.9.2";
format = "setuptools";
disabled = pythonOlder "3.6";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-8TwAwl9/gq47lW+MXi5x2RlqaAs6dnQiuAZkb4oPD84=";
hash = "sha256-pRFMFet7p5qvNOfti5bmehyTGNaXlxpXxZ/kOxdiiZU=";
};
propagatedBuildInputs = [

21
pkgs/development/python-modules/google-cloud-iot/default.nix
View file

@ -7,21 +7,34 @@
, proto-plus
, pytestCheckHook
, pytest-asyncio
, pythonOlder
, mock
}:
buildPythonPackage rec {
pname = "google-cloud-iot";
version = "2.6.2";
version = "2.6.3";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-BCNpEZdpBRkRa6p8OwDoE6F70ljbSg6doG83hCnQbwM=";
hash = "sha256-UB1kxnKobjR1xpezanpgrVg7bU7sA5r2sn7fRbwSrdY=";
};
propagatedBuildInputs = [ grpc-google-iam-v1 google-api-core libcst proto-plus ];
propagatedBuildInputs = [
grpc-google-iam-v1
google-api-core
libcst
proto-plus
];
checkInputs = [ mock pytestCheckHook pytest-asyncio ];
checkInputs = [
mock
pytestCheckHook
pytest-asyncio
];
disabledTests = [
# requires credentials

4
pkgs/development/python-modules/google-cloud-monitoring/default.nix
View file

@ -14,14 +14,14 @@
buildPythonPackage rec {
pname = "google-cloud-monitoring";
version = "2.11.1";
version = "2.11.2";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-PXZGPMer/Y4zmx2Us8EfrLYLnF1tgF63ZDHmBmPPM0w=";
hash = "sha256-KOvXJUsLAj7Afc1dLE3iMLhZU/piUveIwtvjMN+H/Rw=";
};
propagatedBuildInputs = [

35
pkgs/development/python-modules/google-cloud-os-config/default.nix
View file

@ -1,19 +1,42 @@
{ lib, buildPythonPackage, fetchPypi, google-api-core, libcst, mock, proto-plus, pytestCheckHook, pytest-asyncio }:
{ lib
, buildPythonPackage
, fetchPypi
, google-api-core
, libcst
, mock
, proto-plus
, pytestCheckHook
, pytest-asyncio
, pythonOlder
}:
buildPythonPackage rec {
pname = "google-cloud-os-config";
version = "1.12.2";
version = "1.12.3";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-pr/JPao4GS5XrmeRLk3f1bCaDqlqXodWsn+cTEoR+NM=";
hash = "sha256-zSVAVh0WiI5I0P5Jy1wAld4IftWm2hurICYK+Hy5fK0=";
};
propagatedBuildInputs = [ google-api-core libcst proto-plus ];
propagatedBuildInputs = [
google-api-core
libcst
proto-plus
];
checkInputs = [ mock pytestCheckHook pytest-asyncio ];
checkInputs = [
mock
pytestCheckHook
pytest-asyncio
];
pythonImportsCheck = [ "google.cloud.osconfig" ];
pythonImportsCheck = [
"google.cloud.osconfig"
];
disabledTests = [
"test_patch_deployment"

6
pkgs/development/python-modules/google-cloud-redis/default.nix
View file

@ -12,14 +12,14 @@
buildPythonPackage rec {
pname = "google-cloud-redis";
version = "2.9.1";
version = "2.9.2";
format = "setuptools";
disabled = pythonOlder "3.6";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-tVBbsZod71v3hvkuWI4xIJYsx2xT7m7c4B9in/P2ww0=";
hash = "sha256-nltk97HZEpWOQIgL77crnaXR9Qu/mTOIc8v0vty6mtI=";
};
propagatedBuildInputs = [

6
pkgs/development/python-modules/google-cloud-secret-manager/default.nix
View file

@ -13,14 +13,14 @@
buildPythonPackage rec {
pname = "google-cloud-secret-manager";
version = "2.12.4";
version = "2.12.5";
format = "setuptools";
disabled = pythonOlder "3.6";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-nbM+uZr7a3RXvtLI7n5XZZD9r9ZVoh5iCSoZAnDIuQQ=";
hash = "sha256-zfDMYUE05rju6Wb6ghEyvv4Mc3m1ehqhWyPWJngFWQ4=";
};
propagatedBuildInputs = [

6
pkgs/development/python-modules/google-cloud-speech/default.nix
View file

@ -13,14 +13,14 @@
buildPythonPackage rec {
pname = "google-cloud-speech";
version = "2.15.1";
version = "2.16.0";
format = "setuptools";
disabled = pythonOlder "3.6";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-kTNDOgqSNdl2GytcrkZg8APCEFZ4ofUcEBIlvIXv/M8=";
hash = "sha256-pq8Pkx2XoVAE1RJl2cOra/T4QtKwYHWU/ZzNUjjC3oA=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/google-cloud-tasks/default.nix
View file

@ -13,14 +13,14 @@
buildPythonPackage rec {
pname = "google-cloud-tasks";
version = "2.10.2";
version = "2.10.3";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-9vAUmK1GG06fNK+d3WMRht2/7Ftaz56ec9xwP5eXxDU=";
hash = "sha256-iICX2Na3FQgOMzx5R66sKgTPrVeZEk5ofPBPKQWRRv0=";
};
propagatedBuildInputs = [

20
pkgs/development/python-modules/google-cloud-texttospeech/default.nix
View file

@ -7,20 +7,32 @@
, mock
, proto-plus
, pytest-asyncio
, pythonOlder
}:
buildPythonPackage rec {
pname = "google-cloud-texttospeech";
version = "2.12.1";
version = "2.12.2";
format = "setuptools";
disabled = pythonOlder "3.8";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-JWwYnz12E56GrUSDoatB8pbS+S9C3ZSPsxDW25GfDhA=";
hash = "sha256-z/rOMqQ+UkJl8zw55JP54+s+Qk+gHxmuBDjZaz3Qacs=";
};
propagatedBuildInputs = [ libcst google-api-core proto-plus ];
propagatedBuildInputs = [
libcst
google-api-core
proto-plus
];
checkInputs = [ mock pytest-asyncio pytestCheckHook ];
checkInputs = [
mock
pytest-asyncio
pytestCheckHook
];
disabledTests = [
# Disable tests that require credentials

21
pkgs/development/python-modules/google-cloud-trace/default.nix
View file

@ -8,20 +8,33 @@
, proto-plus
, pytestCheckHook
, pytest-asyncio
, pythonOlder
}:
buildPythonPackage rec {
pname = "google-cloud-trace";
version = "1.7.1";
version = "1.7.2";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-zd/N/eVhacopDiYiVbcVNaBOvpMfO426ktuQYhForkQ=";
hash = "sha256-m0dwEm0uQSh4wS+j01BIbRtznyOanv+Joo7LbLplXUQ=";
};
propagatedBuildInputs = [ google-api-core google-cloud-core proto-plus ];
propagatedBuildInputs = [
google-api-core
google-cloud-core
proto-plus
];
checkInputs = [ google-cloud-testutils mock pytestCheckHook pytest-asyncio ];
checkInputs = [
google-cloud-testutils
mock
pytestCheckHook
pytest-asyncio
];
disabledTests = [
# require credentials

4
pkgs/development/python-modules/google-cloud-translate/default.nix
View file

@ -14,14 +14,14 @@
buildPythonPackage rec {
pname = "google-cloud-translate";
version = "3.8.2";
version = "3.8.3";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-wxKWoRQ8DW94De9Z0sOYjm+oTXuEcW5Vw3Iu4YITBQ0=";
hash = "sha256-vaz2UAm3kRliZdog/OxEDYvtYnB8tK7JH+4P7ZgTSpc=";
};
propagatedBuildInputs = [

20
pkgs/development/python-modules/google-cloud-videointelligence/default.nix
View file

@ -7,20 +7,32 @@
, proto-plus
, pytestCheckHook
, pytest-asyncio
, pythonOlder
}:
buildPythonPackage rec {
pname = "google-cloud-videointelligence";
version = "2.8.1";
version = "2.8.2";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-I86T4Zw7y4pn5ixy+RM6LBMTEGuv7LR2uE2mwoEeCh0=";
hash = "sha256-NqElDocBlpARYFTK4k47kCsC/7D1048rNYrrARHeWmg=";
};
propagatedBuildInputs = [ google-api-core proto-plus ];
propagatedBuildInputs = [
google-api-core
proto-plus
];
checkInputs = [ google-cloud-testutils mock pytestCheckHook pytest-asyncio ];
checkInputs = [
google-cloud-testutils
mock
pytestCheckHook
pytest-asyncio
];
disabledTests = [
# require credentials

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