colin/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-11-09 00:16:09 +00:00 committed by GitHub
commit 8deed80953
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
196 changed files with 4339 additions and 3751 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.github/dependabot.yml vendored Normal file
View File

@ -0,0 +1,6 @@
version: 2
updates:
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "weekly"

6
doc/builders/images/portableservice.section.md
View File

@ -15,7 +15,7 @@ This allows using Nix to build images which can be run on many recent Linux dist
The primary tool for interacting with Portable Services is `portablectl`,
and they are managed by the `systemd-portabled` system service.
:::{.note}
::: {.note}
Portable services are supported starting with systemd 239 (released on 2018-06-22).
:::
@ -37,7 +37,7 @@ dependencies of the two derivations in the `units` list.
`units` must be a list of derivations, and their names must be prefixed with the service name (`"demo"` in this case).
Otherwise `systemd-portabled` will ignore them.
:::{.Note}
::: {.note}
The `.raw` file extension of the image is required by the portable services specification.
:::
@ -76,6 +76,6 @@ portablectl attach demo_1.0.raw
systemctl enable --now demo.socket
systemctl enable --now demo.service
```
:::{.Note}
::: {.note}
See the [man page](https://www.freedesktop.org/software/systemd/man/portablectl.html) of `portablectl` for more info on its usage.
:::

2
doc/contributing/coding-conventions.chapter.md
View File

@ -489,7 +489,7 @@ Preferred source hash type is sha256. There are several ways to get it.
in the package expression, attempt build and extract correct hash from error messages.
:::{.warning}
::: {.warning}
You must use one of these four fake hashes and not some arbitrarily-chosen hash.
See [](#sec-source-hashes-security).

2
doc/stdenv/stdenv.chapter.md
View File

@ -887,7 +887,7 @@ Packages may expect or require other utilities to be available at runtime.
Use `--prefix` to explicitly set dependencies in `PATH`.
:::{note}
::: {.note}
`--prefix` essentially hard-codes dependencies into the wrapper.
They cannot be overridden without rebuilding the package.
:::

3
flake.nix
View File

@ -11,8 +11,7 @@
lib = import ./lib;
forAllSystems = f: lib.genAttrs lib.systems.flakeExposed (system: f system);
forAllSystems = lib.genAttrs lib.systems.flakeExposed;
in
{
lib = lib.extend (final: prev: {

1
lib/types.nix
View File

@ -478,6 +478,7 @@ rec {
path = mkOptionType {
name = "path";
descriptionClass = "noun";
check = x: isCoercibleToString x && builtins.substring 0 1 (toString x) == "/";
merge = mergeEqualOption;
};

10
maintainers/scripts/pluginupdate.py
View File

@ -342,6 +342,7 @@ class Editor:
self.default_out = default_out or root.joinpath("generated.nix")
self.deprecated = deprecated or root.joinpath("deprecated.json")
self.cache_file = cache_file or f"{name}-plugin-cache.json"
self.nixpkgs_repo = None
def get_current_plugins(self) -> List[Plugin]:
"""To fill the cache"""
@ -670,16 +671,15 @@ def update_plugins(editor: Editor, args):
autocommit = not args.no_commit
nixpkgs_repo = None
if autocommit:
nixpkgs_repo = git.Repo(editor.root, search_parent_directories=True)
commit(nixpkgs_repo, f"{editor.attr_path}: update", [args.outfile])
editor.nixpkgs_repo = git.Repo(editor.root, search_parent_directories=True)
commit(editor.nixpkgs_repo, f"{editor.attr_path}: update", [args.outfile])
if redirects:
update()
if autocommit:
commit(
nixpkgs_repo,
editor.nixpkgs_repo,
f"{editor.attr_path}: resolve github repository redirects",
[args.outfile, args.input_file, editor.deprecated],
)
@ -692,7 +692,7 @@ def update_plugins(editor: Editor, args):
plugin, _ = prefetch_plugin(pdesc, )
if autocommit:
commit(
nixpkgs_repo,
editor.nixpkgs_repo,
"{drv_name}: init at {version}".format(
drv_name=editor.get_drv_name(plugin.normalized_name),
version=plugin.version

32
nixos/doc/manual/from_md/release-notes/rl-2211.section.xml
View File

@ -889,6 +889,14 @@
support for 1.22 and older has been dropped.
</para>
</listitem>
<listitem>
<para>
The <literal>zrepl</literal> package has been updated from
0.5.0 to 0.6.0. See the
<link xlink:href="https://zrepl.github.io/changelog.html">changelog</link>
for details.
</para>
</listitem>
<listitem>
<para>
<literal>k3s</literal> no longer supports docker as runtime
@ -936,6 +944,22 @@
<literal>mariadb</literal> if possible.
</para>
</listitem>
<listitem>
<para>
<literal>signald</literal> has been bumped to
<literal>0.23.0</literal>. For the upgrade, a migration
process is necessary. It can be done by running a command like
this before starting <literal>signald.service</literal>:
</para>
<programlisting>
signald -d /var/lib/signald/db \
--database sqlite:/var/lib/signald/db \
--migrate-data
</programlisting>
<para>
For further information, please read the upstream changelogs.
</para>
</listitem>
<listitem>
<para>
<literal>stylua</literal> no longer accepts
@ -1328,6 +1352,14 @@
the npm install step prunes dev dependencies.
</para>
</listitem>
<listitem>
<para>
boot.kernel.sysctl is defined as a freeformType and adds a
custom merge option for <quote>net.core.rmem_max</quote>
(taking the highest value defined to avoid conflicts between 2
services trying to set that value)
</para>
</listitem>
</itemizedlist>
</section>
</section>

15
nixos/doc/manual/release-notes/rl-2211.section.md
View File

@ -273,6 +273,8 @@ Available as [services.patroni](options.html#opt-services.patroni.enable).
- The default `kops` version is now 1.25.1 and support for 1.22 and older has been dropped.
- The `zrepl` package has been updated from 0.5.0 to 0.6.0. See the [changelog](https://zrepl.github.io/changelog.html) for details.
- `k3s` no longer supports docker as runtime due to upstream dropping support.
- `cassandra_2_1` and `cassandra_2_2` have been removed. Please update to `cassandra_3_11` or `cassandra_3_0`. See the [changelog](https://github.com/apache/cassandra/blob/cassandra-3.11.14/NEWS.txt) for more information about the upgrade process.
@ -284,6 +286,17 @@ Available as [services.patroni](options.html#opt-services.patroni.enable).
- `percona-server56` has been removed. Please migrate to `mysql` or `mariadb` if possible.
- `signald` has been bumped to `0.23.0`. For the upgrade, a migration process is necessary. It can be
done by running a command like this before starting `signald.service`:
```
signald -d /var/lib/signald/db \
--database sqlite:/var/lib/signald/db \
--migrate-data
```
For further information, please read the upstream changelogs.
- `stylua` no longer accepts `lua52Support` and `luauSupport` overrides, use `features` instead, which defaults to `[ "lua54" "luau" ]`.
- `pkgs.fetchNextcloudApp` has been rewritten to circumvent impurities in e.g. tarballs from GitHub and to make it easier to
@ -393,4 +406,6 @@ Available as [services.patroni](options.html#opt-services.patroni.enable).
- The `nodePackages` package set now defaults to the LTS release in the `nodejs` package again, instead of being pinned to `nodejs-14_x`. Several updates to node2nix have been made for compatibility with newer Node.js and npm versions and a new `postRebuild` hook has been added for packages to perform extra build steps before the npm install step prunes dev dependencies.
- boot.kernel.sysctl is defined as a freeformType and adds a custom merge option for "net.core.rmem_max" (taking the highest value defined to avoid conflicts between 2 services trying to set that value)
<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->

16
nixos/modules/config/sysctl.nix
View File

@ -21,11 +21,24 @@ in
options = {
boot.kernel.sysctl = mkOption {
type = types.submodule {
freeformType = types.attrsOf sysctlOption;
options."net.core.rmem_max" = mkOption {
type = types.nullOr types.ints.unsigned // {
merge = loc: defs:
foldl
(a: b: if b.value == null then null else lib.max a b.value)
0
(filterOverrides defs);
};
default = null;
description = lib.mdDoc "The maximum socket receive buffer size. In case of conflicting values, the highest will be used.";
};
};
default = {};
example = literalExpression ''
{ "net.ipv4.tcp_syncookies" = false; "vm.swappiness" = 60; }
'';
type = types.attrsOf sysctlOption;
description = lib.mdDoc ''
Runtime parameters of the Linux kernel, as set by
{manpage}`sysctl(8)`. Note that sysctl
@ -35,6 +48,7 @@ in
parameter may be a string, integer, boolean, or null
(signifying the option will not appear at all).
'';
};
};

2
nixos/modules/services/monitoring/prometheus/default.nix
View File

@ -1822,7 +1822,7 @@ in
RestrictRealtime = true;
RestrictSUIDSGID = true;
SystemCallArchitectures = "native";
SystemCallFilter = [ "@system-service" "~@privileged" "~@resources" ];
SystemCallFilter = [ "@system-service" "~@privileged" ];
};
};
# prometheus-config-reload will activate after prometheus. However, what we

2
nixos/modules/services/networking/blocky.nix
View File

@ -10,7 +10,7 @@ let
in
{
options.services.blocky = {
enable = mkEnableOption (lib.mdDoc "Fast and lightweight DNS proxy as ad-blocker for local network with many features");
enable = mkEnableOption (lib.mdDoc "blocky, a fast and lightweight DNS proxy as ad-blocker for local network with many features");
settings = mkOption {
type = format.type;

2
nixos/modules/services/torrent/transmission.nix
View File

@ -431,7 +431,7 @@ in
# https://trac.transmissionbt.com/browser/trunk/libtransmission/tr-udp.c?rev=11956.
# at least up to the values hardcoded here:
(mkIf cfg.settings.utp-enabled {
"net.core.rmem_max" = mkDefault "4194304"; # 4MB
"net.core.rmem_max" = mkDefault 4194304; # 4MB
"net.core.wmem_max" = mkDefault "1048576"; # 1MB
})
(mkIf cfg.performanceNetParameters {

57
nixos/modules/services/web-apps/invoiceplane.nix
View File

@ -184,6 +184,26 @@ let
'';
};
cron = {
enable = mkOption {
type = types.bool;
default = false;
description = lib.mdDoc ''
Enable cron service which periodically runs Invoiceplane tasks.
Requires key taken from the administration page. Refer to
<https://wiki.invoiceplane.com/en/1.0/modules/recurring-invoices>
on how to configure it.
'';
};
key = mkOption {
type = types.str;
description = lib.mdDoc "Cron key taken from the administration page.";
};
};
};
};
@ -224,8 +244,11 @@ in
}
{ assertion = cfg.database.createLocally -> cfg.database.passwordFile == null;
message = ''services.invoiceplane.sites."${hostName}".database.passwordFile cannot be specified if services.invoiceplane.sites."${hostName}".database.createLocally is set to true.'';
}]
) eachSite);
}
{ assertion = cfg.cron.enable -> cfg.cron.key != null;
message = ''services.invoiceplane.sites."${hostName}".cron.key must be set in order to use cron service.'';
}
]) eachSite);
services.mysql = mkIf (any (v: v.database.createLocally) (attrValues eachSite)) {
enable = true;
@ -255,6 +278,7 @@ in
}
{
systemd.tmpfiles.rules = flatten (mapAttrsToList (hostName: cfg: [
"d ${cfg.stateDir} 0750 ${user} ${webserver.group} - -"
"f ${cfg.stateDir}/ipconfig.php 0750 ${user} ${webserver.group} - -"
@ -284,6 +308,34 @@ in
group = webserver.group;
isSystemUser = true;
};
}
{
# Cron service implementation
systemd.timers = mapAttrs' (hostName: cfg: (
nameValuePair "invoiceplane-cron-${hostName}" (mkIf cfg.cron.enable {
wantedBy = [ "timers.target" ];
timerConfig = {
OnBootSec = "5m";
OnUnitActiveSec = "5m";
Unit = "invoiceplane-cron-${hostName}.service";
};
})
)) eachSite;
systemd.services =
(mapAttrs' (hostName: cfg: (
nameValuePair "invoiceplane-cron-${hostName}" (mkIf cfg.cron.enable {
serviceConfig = {
Type = "oneshot";
User = user;
ExecStart = "${pkgs.curl}/bin/curl --header 'Host: ${hostName}' http://localhost/index.php/invoices/cron/recur/${cfg.cron.key}";
};
})
)) eachSite);
}
(mkIf (cfg.webserver == "caddy") {
@ -302,6 +354,5 @@ in
};
})
]);
}

4
nixos/modules/services/web-apps/nextcloud.nix
View File

@ -823,9 +823,9 @@ in {
${if c.dbhost != null then "--database-host" else null} = ''"${c.dbhost}"'';
${if c.dbport != null then "--database-port" else null} = ''"${toString c.dbport}"'';
${if c.dbuser != null then "--database-user" else null} = ''"${c.dbuser}"'';
"--database-pass" = "\$${dbpass.arg}";
"--database-pass" = "\"\$${dbpass.arg}\"";
"--admin-user" = ''"${c.adminuser}"'';
"--admin-pass" = "\$${adminpass.arg}";
"--admin-pass" = "\"\$${adminpass.arg}\"";
"--data-dir" = ''"${datadir}/data"'';
});
in ''

4
nixos/tests/zrepl.nix
View File

@ -58,8 +58,8 @@ import ./make-test-python.nix (
out = host.succeed("curl -f localhost:9811/metrics")
assert (
"zrepl_version_daemon" in out
), "zrepl version metric was not found in Prometheus output"
"zrepl_start_time" in out
), "zrepl start time metric was not found in Prometheus output"
assert (
"zrepl_zfs_snapshot_duration_count{filesystem=\"test\"}" in out

9
pkgs/applications/audio/ashuffle/default.nix
View File

@ -6,23 +6,26 @@
, meson
, ninja
, libmpdclient
, libyamlcpp
}:
stdenv.mkDerivation rec {
pname = "ashuffle";
version = "3.12.5";
version = "3.13.4";
src = fetchFromGitHub {
owner = "joshkunz";
repo = "ashuffle";
rev = "v${version}";
sha256 = "sha256-dPgv6EzRxRdHkGvys601Bkg9Srd8oEjoE9jbAin74Vk=";
sha256 = "sha256-J6NN0Rsc9Zw9gagksDlwpwEErs+4XmrGF9YHKlAE1FA=";
fetchSubmodules = true;
};
dontUseCmakeConfigure = true;
nativeBuildInputs = [ cmake pkg-config meson ninja ];
buildInputs = [ libmpdclient ];
buildInputs = [ libmpdclient libyamlcpp ];
mesonFlags = [ "-Dunsupported_use_system_yamlcpp=true" ];
meta = with lib; {
homepage = "https://github.com/joshkunz/ashuffle";

6
pkgs/applications/audio/plexamp/default.nix
View File

@ -2,12 +2,12 @@
let
pname = "plexamp";
version = "4.4.0";
version = "4.5.2";
src = fetchurl {
url = "https://plexamp.plex.tv/plexamp.plex.tv/desktop/Plexamp-${version}.AppImage";
name="${pname}-${version}.AppImage";
sha512 = "VYdeZUgVWDce9XGyf5AnwPV/Ja6p2i3IRAcnSj7J7KqTUdgoNsPl4gqs4HcdrSCEX8PfloimJihoBuEKtgXcNA==";
sha512 = "/0CW5S5n4xh9FF/Sfxl3H0bNCpbUfz4ik4ptVTIwvEcXw2NoKS5dLxFSTn9lfVZAV+UfzSqcrWH5HknN+o5wQw==";
};
appimageContents = appimageTools.extractType2 {
@ -33,7 +33,7 @@ in appimageTools.wrapType2 {
meta = with lib; {
description = "A beautiful Plex music player for audiophiles, curators, and hipsters";
homepage = "https://plexamp.com/";
changelog = "https://forums.plex.tv/t/plexamp-release-notes/221280/46";
changelog = "https://forums.plex.tv/t/plexamp-release-notes/221280/47";
license = licenses.unfree;
maintainers = with maintainers; [ killercup synthetica ];
platforms = [ "x86_64-linux" ];

4
pkgs/applications/blockchains/elements/default.nix
View File

@ -25,13 +25,13 @@
with lib;
stdenv.mkDerivation rec {
pname = if withGui then "elements" else "elementsd";
version = "22.0";
version = "22.0.2";
src = fetchFromGitHub {
owner = "ElementsProject";
repo = "elements";
rev = "elements-${version}";
sha256 = "sha256-n98bz1W9hoJ5JDH34LG7R6igEIY1j4mRbO2PKnV8R2U=";
sha256 = "sha256-20Tem6CD7XAt1EDfkl46Nxhb+Vq3sCk/UqnLCAm85FU=";
};
nativeBuildInputs =

20
pkgs/applications/editors/vim/plugins/update.py
View File

@ -21,10 +21,13 @@ import inspect
import os
import sys
import logging
import subprocess
import textwrap
from typing import List, Tuple
from pathlib import Path
import git
log = logging.getLogger()
sh = logging.StreamHandler()
@ -76,8 +79,11 @@ def isNeovimPlugin(plug: pluginupdate.Plugin) -> bool:
class VimEditor(pluginupdate.Editor):
nvim_treesitter_updated = False
def generate_nix(self, plugins: List[Tuple[PluginDesc, pluginupdate.Plugin]], outfile: str):
sorted_plugins = sorted(plugins, key=lambda v: v[0].name.lower())
nvim_treesitter_rev = pluginupdate.run_nix_expr("(import <localpkgs> { }).vimPlugins.nvim-treesitter.src.rev")
with open(outfile, "w+") as f:
f.write(HEADER)
@ -91,6 +97,8 @@ class VimEditor(pluginupdate.Editor):
for pdesc, plugin in sorted_plugins:
content = self.plugin2nix(pdesc, plugin)
f.write(content)
if plugin.name == "nvim-treesitter" and plugin.commit != nvim_treesitter_rev:
self.nvim_treesitter_updated = True
f.write("\n}\n")
print(f"updated {outfile}")
@ -123,6 +131,18 @@ def main():
args = parser.parse_args()
pluginupdate.update_plugins(editor, args)
if editor.nvim_treesitter_updated:
print("updating nvim-treesitter grammars")
nvim_treesitter_dir = ROOT.joinpath("nvim-treesitter")
subprocess.check_call([nvim_treesitter_dir.joinpath("update.py")])
if editor.nixpkgs_repo:
msg = "vimPlugins.nvim-treesitter: update grammars"
print(f"committing to nixpkgs: {msg}")
index = editor.nixpkgs_repo.index
index.add([str(nvim_treesitter_dir.joinpath("generated.nix"))])
index.commit(msg)
if __name__ == "__main__":
main()

4
pkgs/applications/graphics/ImageMagick/default.nix
View File

@ -46,13 +46,13 @@ in
stdenv.mkDerivation rec {
pname = "imagemagick";
version = "7.1.0-51";
version = "7.1.0-52";
src = fetchFromGitHub {
owner = "ImageMagick";
repo = "ImageMagick";
rev = version;
hash = "sha256-u2QUtCQ4LzS60iVOOKWx/itmC9uMxPhNvsNANPHrvpE=";
hash = "sha256-GV71O4cHUKJ7+6u4T+vdaFz5q2SpZVDCfEAbfz0s6f4=";
};
outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big

27
pkgs/applications/misc/emoji-picker/default.nix Normal file
View File

@ -0,0 +1,27 @@
{ buildGoModule
, fetchFromGitHub
, lib
}:
buildGoModule rec {
pname = "emoji-picker";
version = "0.2.0";
src = fetchFromGitHub {
owner = "bcongdon";
repo = "ep";
rev = version;
hash = "sha256-ElUsmuJ43kOsu4cGvNytM+xHTfuzMo0jcG8Z1cIeHJs=";
};
patches = [./xsys.patch];
vendorHash = "sha256-Xeh5JKIBiyOXRGVx9udoUNs+Wv49BMyFvmnAbDfG3rA=";
meta = with lib; {
description = "A CLI Emoji Picker";
homepage = "https://github.com/bcongdon/ep";
license = licenses.mit;
maintainers = with maintainers; [ urandom ];
mainProgram = "ep";
};
}

63
pkgs/applications/misc/emoji-picker/xsys.patch Normal file
View File

@ -0,0 +1,63 @@
diff --git a/go.mod b/go.mod
index ce4c67d..fcd88f6 100644
--- a/go.mod
+++ b/go.mod
@@ -1,12 +1,22 @@
module github.com/bcongdon/ep
-go 1.12
+go 1.17
require (
github.com/atotto/clipboard v0.1.2
github.com/bcongdon/emoji-ordering v0.0.0-20201127221446-8e57a6480ccf
github.com/gdamore/tcell/v2 v2.0.1-0.20201017141208-acf90d56d591
github.com/rivo/tview v0.0.0-20201118063654-f007e9ad3893
- github.com/stretchr/testify v1.6.1 // indirect
golang.org/x/crypto v0.0.0-20201124201722-c8d3bf9c5392
)
+
+require (
+ github.com/gdamore/encoding v1.0.0 // indirect
+ github.com/lucasb-eyer/go-colorful v1.0.3 // indirect
+ github.com/mattn/go-runewidth v0.0.9 // indirect
+ github.com/rivo/uniseg v0.2.0 // indirect
+ github.com/stretchr/testify v1.6.1 // indirect
+ golang.org/x/sys v0.1.0 // indirect
+ golang.org/x/term v0.0.0-20201117132131-f5c789dd3221 // indirect
+ golang.org/x/text v0.3.3 // indirect
+)
diff --git a/go.sum b/go.sum
index 3479558..cf61f93 100644
--- a/go.sum
+++ b/go.sum
@@ -10,7 +10,6 @@ github.com/gdamore/tcell/v2 v2.0.1-0.20201017141208-acf90d56d591 h1:0WWUDZ1oxq7N
github.com/gdamore/tcell/v2 v2.0.1-0.20201017141208-acf90d56d591/go.mod h1:vSVL/GV5mCSlPC6thFP5kfOFdM9MGZcalipmpTxTgQA=
github.com/lucasb-eyer/go-colorful v1.0.3 h1:QIbQXiugsb+q10B+MI+7DI1oQLdmnep86tWFlaaUAac=
github.com/lucasb-eyer/go-colorful v1.0.3/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0=
-github.com/mattn/go-runewidth v0.0.7 h1:Ei8KR0497xHyKJPAv59M1dkC+rOZCMBJ+t3fZ+twI54=
github.com/mattn/go-runewidth v0.0.7/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
github.com/mattn/go-runewidth v0.0.9 h1:Lm995f3rfxdpd6TSmuVCHVb/QhupuXlYr8sCI/QdE+0=
github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
@@ -28,19 +27,17 @@ golang.org/x/crypto v0.0.0-20201124201722-c8d3bf9c5392 h1:xYJJ3S178yv++9zXV/hnr2
golang.org/x/crypto v0.0.0-20201124201722-c8d3bf9c5392/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190626150813-e07cf5db2756 h1:9nuHUbU8dRnRRfj9KjWUVrJeoexdbeMjttk6Oh1rD10=
golang.org/x/sys v0.0.0-20190626150813-e07cf5db2756/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20201017003518-b09fb700fbb7 h1:XtNJkfEjb4zR3q20BBBcYUykVOEMgZeIUOpBPfNYgxg=
golang.org/x/sys v0.0.0-20201017003518-b09fb700fbb7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.1.0 h1:kunALQeHf1/185U1i0GOB/fy1IPRDDpuoOOqRReG57U=
+golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/term v0.0.0-20201117132131-f5c789dd3221 h1:/ZHdbVpdR/jk3g30/d4yUL0JU9kksj8+F/bnQUVLGDM=
golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
-golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.3 h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k=
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

104
pkgs/applications/misc/endeavour/default.nix
View File

@ -1,104 +0,0 @@
{ lib
, stdenv
, fetchFromGitLab
, fetchpatch
, meson
, ninja
, pkg-config
, wrapGAppsHook4
, gettext
, gnome
, glib
, gtk4
, wayland
, libadwaita
, libpeas
, gnome-online-accounts
, gsettings-desktop-schemas
, libportal-gtk4
, evolution-data-server-gtk4
, libical
, librest
, json-glib
, itstool
, gitUpdater
}:
stdenv.mkDerivation rec {
pname = "endeavour";
version = "42.0";
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
owner = "World";
repo = "Endeavour";
rev = "v${version}";
sha256 = "U91WAoyIeQ0WbFbOCrbFJjbWe2eT7b/VL2M1hNXxyzQ=";
};
patches = [
# fix build race bug https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=257667
(fetchpatch {
url = "https://cgit.freebsd.org/ports/plain/deskutils/gnome-todo/files/patch-src_meson.build?id=a4faaf6cf7835014b5f69a337b544ea4ee7f9655";
sha256 = "sha256-dio4Mg+5OGrnjtRAf4LwowO0sG50HRmlNR16cbDvEUY=";
extraPrefix = "";
name = "gnome-todo_meson-build.patch";
})
# build: Fix building with -Werror=format-security
# https://gitlab.gnome.org/World/Endeavour/-/merge_requests/132
(fetchpatch {
url = "https://gitlab.gnome.org/World/Endeavour/-/commit/3bad03e90fcc28f6e3f87f2c90df5984dbeb0791.patch";
sha256 = "sha256-HRkNfhn+EH0Fc+KBDdX1Q+T9QWSctTOn1cvecP2N0zo=";
})
# build: Use GNOME module post_install()
# https://gitlab.gnome.org/World/Endeavour/-/merge_requests/135
(fetchpatch {
url = "https://gitlab.gnome.org/World/Endeavour/-/commit/a8daa1d8acd0a5da7aef54d6e16d8a585c71e555.patch";
sha256 = "sha256-zUTQ36eUMOY9ODAgwSKUhSlB9Cj0Yu/60KjFFW5fx2I=";
})
];
nativeBuildInputs = [
meson
ninja
pkg-config
gettext
wrapGAppsHook4
itstool
];
buildInputs = [
glib
gtk4
wayland # required by gtk header
libadwaita
libpeas
gnome-online-accounts
gsettings-desktop-schemas
gnome.adwaita-icon-theme
# Plug-ins
libportal-gtk4 # background
evolution-data-server-gtk4 # eds
libical
librest # todoist
json-glib # todoist
];
passthru = {
updateScript = gitUpdater {
inherit pname version;
rev-prefix = "v";
};
};
meta = with lib; {
description = "Personal task manager for GNOME";
homepage = "https://gitlab.gnome.org/World/Endeavour";
license = licenses.gpl3Plus;
maintainers = teams.gnome.members;
platforms = platforms.linux;
};
}

57
pkgs/applications/networking/browsers/dillong/default.nix Normal file
View File

@ -0,0 +1,57 @@
{ lib
, stdenv
, fetchFromGitHub
, autoreconfHook
, pkg-config
, which
, fltk
, mbedtls
}:
stdenv.mkDerivation {
pname = "dillong";
version = "unstable-2021-12-13";
src = fetchFromGitHub {
owner = "w00fpack";
repo = "dilloNG";
rev = "2804e6e9074b840de3084abb80473983f8e49f5b";
hash = "sha256-JSBd8Lgw3I20Es/jQHBtybnLd0iAcs16TqOrOxGPGiU=";
};
nativeBuildInputs = [
autoreconfHook
pkg-config
which
];
buildInputs = [
fltk
mbedtls
];
# The start_page and home settings refer to /usr.
# We can't change /usr to $out because dillorc is copied to the home directory
# on first launch, so the paths would quickly become outdated.
# So we just comment them out, and let dillong use the defaults.
postPatch = ''
substituteInPlace dillorc \
--replace "start_page=" "#start_page=" \
--replace "home=" "#home="
'';
configureFlags = [ "--enable-ssl=yes" ];
# Workaround build failure on -fno-common toolchains:
# ld: main.o:/build/dillo-3.0.5/dpid/dpid.h:64: multiple definition of `sock_set';
# dpid.o:/build/dillo-3.0.5/dpid/dpid.h:64: first defined here
NIX_CFLAGS_COMPILE = "-fcommon";
meta = with lib; {
description = "Fork of Dillo, a lightweight web browser";
homepage = "https://github.com/w00fpack/dilloNG";
license = licenses.gpl3Plus;
platforms = platforms.linux;
maintainers = with maintainers; [ fgaz ];
};
}

9
pkgs/applications/networking/browsers/firefox/common.nix
View File

@ -22,6 +22,7 @@
, pkgs
, stdenv
, fetchpatch
, patchelf
# build time
, autoconf
@ -101,7 +102,7 @@
# WARNING: NEVER set any of the options below to `true` by default.
# Set to `!privacySupport` or `false`.
, crashreporterSupport ? !privacySupport
, crashreporterSupport ? !privacySupport, curl
, geolocationSupport ? !privacySupport
, googleAPISupport ? geolocationSupport
, mlsAPISupport ? geolocationSupport
@ -263,7 +264,7 @@ buildStdenv.mkDerivation ({
which
wrapGAppsHook
]
++ lib.optionals crashreporterSupport [ dump_syms ]
++ lib.optionals crashreporterSupport [ dump_syms patchelf ]
++ lib.optionals pgoSupport [ xvfb-run ]
++ extraNativeBuildInputs;
@ -534,6 +535,10 @@ buildStdenv.mkDerivation ({
}
'';
postFixup = lib.optionalString crashreporterSupport ''
patchelf --add-rpath "${lib.makeLibraryPath [ curl ]}" $out/lib/${binaryName}/crashreporter
'';
doInstallCheck = true;
installCheckPhase = ''
# Some basic testing

55
pkgs/applications/networking/browsers/litebrowser/default.nix Normal file
View File

@ -0,0 +1,55 @@
{ lib
, stdenv
, fetchFromGitHub
, cmake
, pkg-config
, gtk3
, gtkmm3
, curl
, poco
, gumbo # litehtml dependency
}:
stdenv.mkDerivation {
pname = "litebrowser";
version = "unstable-2022-10-31";
src = fetchFromGitHub {
owner = "litehtml";
repo = "litebrowser-linux";
rev = "4654f8fb2d5e2deba7ac6223b6639341bd3b7eba";
hash = "sha256-SvW1AOxLBLKqa+/2u2Zn+/t33ZzQHmqlcLRl6z0rK9U=";
fetchSubmodules = true; # litehtml submodule
};
nativeBuildInputs = [
cmake
pkg-config
];
buildInputs = [
gtk3
gtkmm3
curl
poco
gumbo
];
cmakeFlags = [
"-DEXTERNAL_GUMBO=ON"
];
installPhase = ''
runHook preInstall
install -Dm755 litebrowser $out/bin/litebrowser
runHook postInstall
'';
meta = with lib; {
description = "A simple browser based on the litehtml engine";
homepage = "https://github.com/litehtml/litebrowser-linux";
license = licenses.bsd3;
platforms = platforms.unix;
maintainers = with maintainers; [ fgaz ];
};
}

6
pkgs/applications/networking/cluster/clusterctl/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "clusterctl";
version = "1.2.4";
version = "1.2.5";
src = fetchFromGitHub {
owner = "kubernetes-sigs";
repo = "cluster-api";
rev = "v${version}";
sha256 = "sha256-NBLkdPtALhlXfbqLB0n5T2RNMSQusYZgr4VkGH7EFIs=";
sha256 = "sha256-Cmff3tIy60BDO3q5hzPqSLwjc6LzUSpoorJD/yxha9c=";
};
vendorSha256 = "sha256-jPIrUW4el8sAO+4j20qMYVXqvov6Ac0cENd7gOrYj+U=";
vendorSha256 = "sha256-jvadtm8NprVwNf4+GaaANK1u4Y4ccbsTCZxQk21GW7c=";
subPackages = [ "cmd/clusterctl" ];

30
pkgs/applications/networking/cluster/inframap/default.nix Normal file
View File

@ -0,0 +1,30 @@
{ buildGoModule
, fetchFromGitHub
, lib
}:
buildGoModule rec {
pname = "inframap";
version = "0.6.7";
src = fetchFromGitHub {
owner = "cycloidio";
repo = pname;
rev = "v${version}";
hash = "sha256-Ol2FkCP7Wq7FcwOaDw9d20v4jkNIfewdMErz/kJR0/g=";
};
ldflags = [
"-s"
"-w"
"-X github.com/cycloidio/inframap/cmd.Version=${version}"
];
vendorHash = "sha256-fD/u0gYfbhyYWjXtBDtL7zWRu7b7mzpLPEjB+ictP6o=";
meta = with lib; {
description = "Read your tfstate or HCL to generate a graph specific for each provider, showing only the resources that are most important/relevant.";
homepage = "https://github.com/cycloidio/inframap";
license = licenses.mit;
maintainers = with maintainers; [ urandom ];
};
}

68
pkgs/applications/networking/cluster/terraform-providers/providers.json
View File

@ -84,13 +84,13 @@
"version": "4.1.0"
},
"auth0": {
"hash": "sha256-kyQBl/gdTj1Dlu4/FFowAQbBDTYMjp0JGQ09eBqwHEc=",
"hash": "sha256-l41GOH5J0ZF+Vp/Vabhm30ZLG6/XJrI7QeCdl2WvNso=",
"owner": "auth0",
"provider-source-address": "registry.terraform.io/auth0/auth0",
"repo": "terraform-provider-auth0",
"rev": "v0.39.0",
"vendorHash": "sha256-Cusw/qNi+xFblwjvh1xkN28z28TNz3gvTyIRaX/QvH4=",
"version": "0.39.0"
"rev": "v0.40.0",
"vendorHash": "sha256-0BE+NZe4DgAU0lNuwsHiGogMJKhM2fy9CriMtKzmJcI=",
"version": "0.40.0"
},
"avi": {
"hash": "sha256-0FcdVd7EGVHZ0iRonoGfjwYgXpJtUhqX5i925Ejhv54=",
@ -148,13 +148,13 @@
"version": "1.0.0"
},
"baiducloud": {
"hash": "sha256-NKeCPoyeWGWyWScCqCsm4s0U9zCojJ6+OOr+nDdIFqM=",
"hash": "sha256-kG0tE929wtiuSIwT0r6t/odirvZpdnTgcPGFHXmLYYQ=",
"owner": "baidubce",
"provider-source-address": "registry.terraform.io/baidubce/baiducloud",
"repo": "terraform-provider-baiducloud",
"rev": "v1.17.0",
"rev": "v1.17.1",
"vendorHash": null,
"version": "1.17.0"
"version": "1.17.1"
},
"bigip": {
"hash": "sha256-uSe+J4AlW8Dt96BVF1ZI/yrgWUbZsl64b/D+k5ysHC0=",
@ -451,24 +451,24 @@
"version": "3.18.0"
},
"google": {
"hash": "sha256-MvLzXucKSqyTO9bjbXtBzh3XsOizw0waMGDFhrYtoWM=",
"hash": "sha256-guE04J0RCFOHPXGtEpxGZu8s6fnfoh0WLRRZ5GW/gLk=",
"owner": "hashicorp",
"provider-source-address": "registry.terraform.io/hashicorp/google",
"proxyVendor": true,
"repo": "terraform-provider-google",
"rev": "v4.42.1",
"rev": "v4.43.0",
"vendorHash": "sha256-Hzl95NLEZlvTBpCGJYzF5rtHWfYe26TwW0pbtqWmxOo=",
"version": "4.42.1"
"version": "4.43.0"
},
"google-beta": {
"hash": "sha256-dtj1LWIXvjInGtbXy5FBdNmQzp+PRKXpnYzsSL/fIaE=",
"hash": "sha256-HB37OQKULhqiMHOE3gs24sjuPsjMessO98z3+5TNNnM=",
"owner": "hashicorp",
"provider-source-address": "registry.terraform.io/hashicorp/google-beta",
"proxyVendor": true,
"repo": "terraform-provider-google-beta",
"rev": "v4.42.1",
"rev": "v4.43.0",
"vendorHash": "sha256-Hzl95NLEZlvTBpCGJYzF5rtHWfYe26TwW0pbtqWmxOo=",
"version": "4.42.1"
"version": "4.43.0"
},
"googleworkspace": {
"hash": "sha256-dedYnsKHizxJZibuvJOMbJoux0W6zgKaK5fxIofKqCY=",
@ -489,13 +489,13 @@
"version": "1.30.0"
},
"gridscale": {
"hash": "sha256-0XKSGfvJ61iD6zZ3Re3tB6Orb2Dklu5tbD8hBGyzlgo=",
"hash": "sha256-k87g+MwzKl++VfKerzRllHsKN8Y8AyEFm1yWV5xrgwI=",
"owner": "gridscale",
"provider-source-address": "registry.terraform.io/gridscale/gridscale",
"repo": "terraform-provider-gridscale",
"rev": "v1.16.1",
"rev": "v1.16.2",
"vendorHash": null,
"version": "1.16.1"
"version": "1.16.2"
},
"hcloud": {
"hash": "sha256-DWDM3yWKkRV9FJMzKK7JJQdI0WvFILF/bsZFv2CjrvM=",
@ -544,13 +544,13 @@
"version": "1.0.4"
},
"http": {
"hash": "sha256-04OMH0+fT4QOV34YdE67avnbC3GoK7xyMGxpILNM7Jk=",
"hash": "sha256-cxAii7doJ9mv1LQWjoPqMgOuu0COIL91llhsm/2MOms=",
"owner": "hashicorp",
"provider-source-address": "registry.terraform.io/hashicorp/http",
"repo": "terraform-provider-http",
"rev": "v3.2.0",
"vendorHash": "sha256-diQ5bYFywVZXziRKiKdIU4grg93vF68bkbMrRpM/vQc=",
"version": "3.2.0"
"rev": "v3.2.1",
"vendorHash": "sha256-rxh8Me+eOKPCbfHFT3tRsbM7JU67dBqv2JOiWArI/2Y=",
"version": "3.2.1"
},
"huaweicloud": {
"hash": "sha256-cr7xV7Z4UU+kRykVSOKeuXDiHQPL4CsCJVXf2uTZOms=",
@ -761,13 +761,13 @@
"version": "1.8.0"
},
"mongodbatlas": {
"hash": "sha256-NVbUKSG5rGUtRlaJVND3nW+0Svc2d8R8uvxGKcQktco=",
"hash": "sha256-xyKBhIsTawksKruRPXBJ3pEo+ssK7Gol3xCCdNPOes8=",
"owner": "mongodb",
"provider-source-address": "registry.terraform.io/mongodb/mongodbatlas",
"repo": "terraform-provider-mongodbatlas",
"rev": "v1.4.6",
"vendorHash": "sha256-OwyzkTgOcn9brsQS1bfOEaXYk9nNLyHsEwli+5PAIPE=",
"version": "1.4.6"
"rev": "v1.5.0",
"vendorHash": "sha256-zaILkt1uuw21r/ZHeSUWcfgPP2gCNRJYfn4DHUtVC2Q=",
"version": "1.5.0"
},
"namecheap": {
"hash": "sha256-cms8YUL+SjTeYyIOQibksi8ZHEBYq2JlgTEpOO1uMZE=",
@ -1005,13 +1005,13 @@
"version": "0.4.3"
},
"scaleway": {
"hash": "sha256-mo8zq/EdT6RrOxBAnWu1rhQpZ26DZcU7I/dMCUIHxBE=",
"hash": "sha256-HQljeUvK010LSWObuZmTkkB6ByrtgBRAeZPYv3d/KSs=",
"owner": "scaleway",
"provider-source-address": "registry.terraform.io/scaleway/scaleway",
"repo": "terraform-provider-scaleway",
"rev": "v2.5.0",
"vendorHash": "sha256-CycLXG84Sfi1aciXn2darHIGfE6DpCYOHc7Op/0R26I=",
"version": "2.5.0"
"rev": "v2.6.0",
"vendorHash": "sha256-XlEvaXd+mAvbFeQmTOE+bFsYok/Ke1mVwIUY3VY8zDI=",
"version": "2.6.0"
},
"secret": {
"hash": "sha256-MmAnA/4SAPqLY/gYcJSTnEttQTsDd2kEdkQjQj6Bb+A=",
@ -1068,13 +1068,13 @@
"version": "0.15.1"
},
"snowflake": {
"hash": "sha256-Hoaqj3hksiWm60cSr8OPqAvS29SMVLtwkSWXZvpBePA=",
"hash": "sha256-ED8Sjtimt+9Lg62ZZARtvNNIHePcfLCyxrjQCCpxU9U=",
"owner": "Snowflake-Labs",
"provider-source-address": "registry.terraform.io/Snowflake-Labs/snowflake",
"repo": "terraform-provider-snowflake",
"rev": "v0.50.0",
"rev": "v0.51.0",
"vendorHash": "sha256-n6ov9eTlNF/jNDTDOZuuqyFfuv8lDZHKP/5jhFauwY8=",
"version": "0.50.0"
"version": "0.51.0"
},
"sops": {
"hash": "sha256-6FuThi6iuuUGcMhswAk3Z6Lxth/2nuI57A02Xu2s+/U=",
@ -1195,13 +1195,13 @@
"version": "1.9.1"
},
"ucloud": {
"hash": "sha256-O/M864JY7nW+PZ53z26QvOAar5DeqBGk+dfzarfUy+g=",
"hash": "sha256-x3+OuRzZdS429v0JNyZkM3v1etUgURSyi9qkt7RhqlI=",
"owner": "ucloud",
"provider-source-address": "registry.terraform.io/ucloud/ucloud",
"repo": "terraform-provider-ucloud",
"rev": "v1.32.4",
"rev": "v1.32.5",
"vendorHash": null,
"version": "1.32.4"
"version": "1.32.5"
},
"utils": {
"hash": "sha256-6o55uGTaqf3rbqoIGiYi5F4zOkK7D0YP+LdaMmBtw24=",

6
pkgs/applications/networking/cluster/werf/default.nix
View File

@ -10,16 +10,16 @@
buildGoModule rec {
pname = "werf";
version = "1.2.184";
version = "1.2.187";
src = fetchFromGitHub {
owner = "werf";
repo = "werf";
rev = "v${version}";
hash = "sha256-u3Mf7a+IGLWYvAt/Db/BwvtGc66SnYz5Qx2BkCCLKPg=";
hash = "sha256-rezLmdAR6OCDVsi/rguc3iLjkeQ7Jrny4MlnCFYD5+4=";
};
vendorHash = "sha256-T9xGLQcnO9xyRVNX3xCwsOOXWvBbhhw9dH8gW7aBUjE=";
vendorHash = "sha256-GjcmpHyjhjCWE5gQR/oTHfhHYg5WRu8uhgAuWhdxlYk=";
proxyVendor = true;

4
pkgs/applications/networking/instant-messengers/discord/default.nix
View File

@ -2,7 +2,7 @@
let
versions = if stdenv.isLinux then {
stable = "0.0.21";
ptb = "0.0.34";
ptb = "0.0.35";
canary = "0.0.143";
} else {
stable = "0.0.264";
@ -18,7 +18,7 @@ let
};
ptb = fetchurl {
url = "https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz";
sha256 = "CD6dLoBnlvhpwEFfLI9OqjhviZPj3xNDyPK9qBJUqck=";
sha256 = "bnp5wfcR21s7LMPxFgj5G3UsxPWlFj4t6CbeosiufHY=";
};
canary = fetchurl {
url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz";

4
pkgs/applications/networking/instant-messengers/gajim/default.nix
View File

@ -22,11 +22,11 @@
python3.pkgs.buildPythonApplication rec {
pname = "gajim";
version = "1.5.2";
version = "1.5.3";
src = fetchurl {
url = "https://gajim.org/downloads/${lib.versions.majorMinor version}/gajim-${version}.tar.gz";
sha256 = "sha256-kXpGaGp9OWdDa1q3hx7nrD1ZeKH5CKlTgZbyuNZ05/8=";
sha256 = "sha256-JSV4592s7oKJzxBghtlrvXqCoO6iCRoYNu/eaqPfuLA=";
};
buildInputs = [

4
pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
View File

@ -74,7 +74,7 @@ let
in
env.mkDerivation rec {
pname = "telegram-desktop";
version = "4.3.0";
version = "4.3.1";
# Note: Update via pkgs/applications/networking/instant-messengers/telegram/tdesktop/update.py
# Telegram-Desktop with submodules
@ -83,7 +83,7 @@ env.mkDerivation rec {
repo = "tdesktop";
rev = "v${version}";
fetchSubmodules = true;
sha256 = "1ji9351vcvydkcrdwqx22j1nhl9vysd6ajvghaqxdirvqypiygj0";
sha256 = "0j05hcl5nkvcl74jl8d0inkh6ha9xh299z87br1vr1mblflh087m";
};
postPatch = ''

70
pkgs/applications/office/endeavour/default.nix Normal file
View File

@ -0,0 +1,70 @@
{ lib
, stdenv
, fetchFromGitLab
, meson
, ninja
, pkg-config
, wrapGAppsHook4
, gettext
, gnome
, glib
, gtk4
, wayland
, libadwaita
, libpeas
, gnome-online-accounts
, gsettings-desktop-schemas
, evolution-data-server-gtk4
, libical
, itstool
, gitUpdater
}:
stdenv.mkDerivation rec {
pname = "endeavour";
version = "43.0";
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
owner = "World";
repo = "Endeavour";
rev = version;
sha256 = "sha256-1mCTw+nJ1w7RdCXfPCO31t1aYOq9Bki3EaXsHiiveD0=";
};
nativeBuildInputs = [
meson
ninja
pkg-config
gettext
wrapGAppsHook4
itstool
];
buildInputs = [
glib
gtk4
wayland # required by gtk header
libadwaita
libpeas
gnome-online-accounts
gsettings-desktop-schemas
gnome.adwaita-icon-theme
# Plug-ins
evolution-data-server-gtk4 # eds
libical
];
passthru = {
updateScript = gitUpdater { };
};
meta = with lib; {
description = "Personal task manager for GNOME";
homepage = "https://gitlab.gnome.org/World/Endeavour";
license = licenses.gpl3Plus;
maintainers = teams.gnome.members;
platforms = platforms.linux;
};
}

4
pkgs/applications/office/portfolio/default.nix
View File

@ -26,11 +26,11 @@ let
in
stdenv.mkDerivation rec {
pname = "PortfolioPerformance";
version = "0.59.2";
version = "0.59.3";
src = fetchurl {
url = "https://github.com/buchen/portfolio/releases/download/${version}/PortfolioPerformance-${version}-linux.gtk.x86_64.tar.gz";
sha256 = "sha256-qfetuy1Pa4kWu4ykuELVIE0iC9eAr6qAwVZkEbqqFi0=";
sha256 = "sha256-HYzDenWicKbYTEWGaTtoEoruLrqPCxx64eLJBEHC+A0=";
};
nativeBuildInputs = [

6
pkgs/applications/science/astronomy/calcmysky/default.nix
View File

@ -10,18 +10,20 @@
stdenv.mkDerivation rec {
pname = "calcmysky";
version = "0.1.0";
version = "0.2.1";
src = fetchFromGitHub {
owner = "10110111";
repo = "CalcMySky";
rev = "v${version}";
hash = "sha256-0tHxHek4wqJKLl54zF7wDYN+UPL2y35/YAb6Dtg4k48=";
hash = "sha256-7Yj6OlZ7weenekXYGhK5EWcME20oCHiLPOxz5KEuKy4=";
};
nativeBuildInputs = [ cmake wrapQtAppsHook ];
buildInputs = [ glm eigen qtbase ];
cmakeFlags = [ "-DQT_VERSION=6" ];
doCheck = true;
meta = with lib;{

22
pkgs/applications/science/astronomy/stellarium/default.nix
View File

@ -3,13 +3,15 @@
, fetchFromGitHub
, cmake
, perl
, wrapGAppsHook
, wrapQtAppsHook
, qtbase
, qtcharts
, qtlocation
, qtpositioning
, qtmultimedia
, qtscript
, qtserialport
, qttranslations
, qtwayland
, qtwebengine
, calcmysky
, qxlsx
@ -19,28 +21,30 @@
stdenv.mkDerivation rec {
pname = "stellarium";
version = "1.0";
version = "1.1";
src = fetchFromGitHub {
owner = "Stellarium";
repo = "stellarium";
rev = "v${version}";
sha256 = "sha256-6EAykJ0yWeU1EBR5+7JjWGUVBE1DKW+W8yJOt0smkaE=";
sha256 = "sha256-ellfBZWOkvlRauuwug96C7P/WjQ6dXiDnT0b3KH5zRM=";
};
nativeBuildInputs = [
cmake
perl
wrapGAppsHook
wrapQtAppsHook
];
buildInputs = [
qtbase
qtcharts
qtlocation
qtpositioning
qtmultimedia
qtscript
qtserialport
qttranslations
qtwayland
qtwebengine
calcmysky
qxlsx
@ -54,6 +58,12 @@ stdenv.mkDerivation rec {
'SET(CMAKE_INSTALL_PREFIX "${placeholder "out"}/Applications/Stellarium.app/Contents")'
'';
dontWrapGApps = true;
preFixup = ''
qtWrapperArgs+=("''${gappsWrapperArgs[@]}")
'';
meta = with lib; {
description = "Free open-source planetarium";
homepage = "https://stellarium.org/";

22
pkgs/applications/science/logic/surelog/default.nix
View File

@ -7,20 +7,33 @@
, libuuid
, openjdk11
, gperftools
, flatbuffers
, fetchpatch
}:
stdenv.mkDerivation rec {
pname = "surelog";
version = "1.40";
version = "1.45";
src = fetchFromGitHub {
owner = "chipsalliance";
repo = pname;
rev = "v${version}";
hash = "sha256-5nhJilFIJJDCnJUEUgyPNtWSQUgWcvM6LDFgFatAl/k=";
hash = "sha256-/SSKcEIhmWDOKN4v3djWTwZ5/nQvR8ibflzSVFDt/rM=";
fetchSubmodules = true;
};
# This prevents race conditions in unit tests that surface since we run
# ctest in parallel.
# This patch can be removed with the next version of surelog
patches = [
(fetchpatch {
url = "https://github.com/chipsalliance/Surelog/commit/9a54efbd156becf65311a4272104810f36041fa6.patch";
sha256 = "sha256-rU1Z/0wlVTgnPLqTN/87n+gI1iJ+6k/+sunVVd0ulhQ=";
name = "parallel-test-running.patch";
})
];
nativeBuildInputs = [
cmake
pkg-config
@ -34,6 +47,11 @@ stdenv.mkDerivation rec {
buildInputs = [
libuuid
gperftools
flatbuffers
];
cmakeFlags = [
"-DSURELOG_USE_HOST_FLATBUFFERS=On"
];
doCheck = true;

30
pkgs/applications/science/logic/uhdm/default.nix
View File

@ -3,26 +3,46 @@
, fetchFromGitHub
, cmake
, python3
, gtest
, fetchpatch
}:
stdenv.mkDerivation rec {
pname = "UHDM";
version = "0.9.1.40";
version = "1.45";
src = fetchFromGitHub {
owner = "chipsalliance";
repo = pname;
rev = "v${version}";
hash = "sha256-CliKU2WM8B9012aDcS/mTyIf+JcsVsc4uRRi9+FRWbM=";
hash = "sha256-mxQRmI8yUUrSUYa4kUT9URgfqYvuz3V9e1IGjtiHyhc=";
fetchSubmodules = true;
};
# Add ability to use local googletest provided from nix instead of
# the version from the submodule in third_party/. The third_party/ version
# is slightly older and does not work with our hydra Darwin builds that needs
# to set a particular temp directory.
# This patch allows to choose UHDM_USE_HOST_GTEST=On in the cflags.
patches = [
(fetchpatch {
url = "https://github.com/chipsalliance/UHDM/commit/ad60fdb65a7c49fdc8ee3fffdca791f9364af4f5.patch";
sha256 = "sha256-IkwnepWWmBychJ0mu+kaddUEc9jkldIRq+GyJkhrO8A=";
name = "allow-local-gtest.patch";
})
];
nativeBuildInputs = [
cmake
];
buildInputs = [
(python3.withPackages (p: with p; [ orderedmultidict ]))
gtest
];
cmakeFlags = [
"-DUHDM_USE_HOST_GTEST=On"
];
doCheck = true;
@ -33,12 +53,6 @@ stdenv.mkDerivation rec {
rm -rf $out/lib/uhdm
'';
prePatch = ''
substituteInPlace CMakeLists.txt --replace \
'capnp compile' \
'capnp compile --src-prefix=''${GENDIR}/..'
'';
meta = {
description = "Universal Hardware Data Model";
homepage = "https://github.com/chipsalliance/UHDM";

64
pkgs/applications/science/misc/toil/default.nix
View File

@ -1,33 +1,51 @@
{ lib
, fetchFromGitHub
, python3
, rsync
}:
python3.pkgs.buildPythonApplication rec {
pname = "toil";
version = "5.6.0";
version = "5.7.1";
format = "setuptools";
src = python3.pkgs.fetchPypi {
inherit pname version;
sha256 = "sha256-m6tzrRCCLULO+wB8htUlt0KESLm/vdIeTzBrihnAo/I=";
src = fetchFromGitHub {
owner = "DataBiosphere";
repo = pname;
rev = "refs/tags/releases/${version}";
hash = "sha256-m+XvNyzd0ly2YqKhgxezgGaCXLs3CmupJMnp5RIZqNI=";
};
postPatch = ''
substituteInPlace requirements.txt \
--replace "docker>=3.7.2, <6" "docker"
'';
propagatedBuildInputs = with python3.pkgs; [
addict
dill
docker
pytz
pyyaml
enlighten
psutil
py-tes
pypubsub
python-dateutil
dill
pytz
pyyaml
requests
typing-extensions
];
checkInputs = with python3.pkgs; [
checkInputs = [
rsync
] ++ (with python3.pkgs; [
boto
botocore
flask
mypy-boto3-s3
pytestCheckHook
];
stubserver
]);
pytestFlagsArray = [
"src/toil/test"
@ -37,6 +55,34 @@ python3.pkgs.buildPythonApplication rec {
"toil"
];
disabledTestPaths = [
# Tests are reaching their timeout
"src/toil/test/docs/scriptsTest.py"
"src/toil/test/jobStores/jobStoreTest.py"
"src/toil/test/provisioners/aws/awsProvisionerTest.py"
"src/toil/test/src"
"src/toil/test/wdl"
"src/toil/test/utils/utilsTest.py"
];
disabledTests = [
# Tests fail starting with 5.7.1
"testServices"
"testConcurrencyWithDisk"
"testJobConcurrency"
"testNestedResourcesDoNotBlock"
"test_omp_threads"
"testFileSingle"
"testFileSingle10000"
"testFileSingleCheckpoints"
"testFileSingleNonCaching"
"testFetchJobStoreFiles"
"testFetchJobStoreFilesWSymlinks"
"testJobStoreContents"
"test_cwl_on_arm"
"test_cwl_toil_kill"
];
meta = with lib; {
description = "Workflow engine written in pure Python";
homepage = "https://toil.ucsc-cgl.org/";

6
pkgs/applications/version-management/git-and-tools/gh/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "gh";
version = "2.19.0";
version = "2.20.0";
src = fetchFromGitHub {
owner = "cli";
repo = "cli";
rev = "v${version}";
sha256 = "sha256-SqKjN9Met+NsfaQO3PGTPua/ZVaorYbSJHWeXgEm524=";
sha256 = "sha256-g83JuV+RPtuQJoxcMgMlZbHftqohA9frIk/y89/PucY=";
};
vendorSha256 = "sha256-VWeUVdrAzbS7OmHHZIPlyq6WVj4I39n7ozS7n3ReqJk=";
vendorSha256 = "sha256-FSniCYr3emV9W/BuEkWe0a4aZ5RCoZJc7+K+f2q49ys=";
nativeBuildInputs = [ installShellFiles ];

4
pkgs/applications/version-management/git-and-tools/git-machete/default.nix
View File

@ -12,13 +12,13 @@
buildPythonApplication rec {
pname = "git-machete";
version = "3.12.5";
version = "3.13.0";
src = fetchFromGitHub {
owner = "virtuslab";
repo = pname;
rev = "v${version}";
sha256 = "sha256-EC4uI9q/iwX9U/xvyCZ3HAmfGEbKoADLKMx5f30Q9Ys=";
sha256 = "sha256-Ku142NjiDTxiZ50Sm6vZs5ZHJ25oALnLQw8ThWqQ2rE=";
};
nativeBuildInputs = [ installShellFiles ];

4
pkgs/applications/version-management/git-and-tools/lefthook/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "lefthook";
version = "1.1.4";
version = "1.2.0";
src = fetchFromGitHub {
rev = "v${version}";
owner = "evilmartians";
repo = "lefthook";
sha256 = "sha256-e3kNr9FMcqznKLFXA8gNTBjaMyXhrWzIxMmX7r6aaWA=";
sha256 = "sha256-mkGyY50WBmVbZ9FEfZRWoGLeZy0HkBzYACbF2u8EN1o=";
};
vendorSha256 = "sha256-NTZz0EDIjGdh8dD9jxbNVdWb7NFJsdtnMp7H6Ni0EbQ=";

4
pkgs/applications/version-management/vcsh/default.nix
View File

@ -8,11 +8,11 @@
stdenv.mkDerivation rec {
pname = "vcsh";
version = "2.0.4";
version = "2.0.5";
src = fetchurl {
url = "https://github.com/RichiH/vcsh/releases/download/v${version}/${pname}-${version}.tar.xz";
sha256 = "sha256-W/Ql2J9HTDQPu0el34mHVzqe85KGWLPph2sHyuEzPPI=";
sha256 = "0bf3gacbyxw75ksd8y6528kgk7mqx6grz40gfiffxa2ghsz1xl01";
};
nativeBuildInputs = [

52
pkgs/applications/video/xvidcap/default.nix
View File

@ -1,52 +0,0 @@
{ lib
, stdenv
, fetchurl
, perlPackages
, pkg-config
, gtk2
, scrollkeeper
, libglade
, libXmu
, libX11
, libXext
, gettext
, lame
, libXfixes
, libXdamage
}:
stdenv.mkDerivation rec {
pname = "xvidcap";
version = "1.1.7";
src = fetchurl {
url = "mirror://sourceforge/xvidcap/xvidcap-${version}.tar.gz";
sha256 = "0p8rhpyhxgy37crf1xk1046z4p663jg7ww776jw92pld3s024ihm";
};
patches = [ ./xlib.patch ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [
gtk2
scrollkeeper
libglade
libXmu
gettext
lame
libXdamage
libXfixes
libXext
libX11
] ++ (with perlPackages; [ perl XMLParser ]);
# !!! don't know why this is necessary
NIX_LDFLAGS = "-lXext -lX11 -lz -lgcc_s";
meta = with lib; {
description = "Screencast video catpuring tool";
homepage = "http://xvidcap.sourceforge.net/";
license = licenses.gpl2;
platforms = platforms.linux;
};
}

15
pkgs/applications/video/xvidcap/xlib.patch
View File

@ -1,15 +0,0 @@
diff --git a/src/app_data.c b/src/app_data.c
index 5a44363..482b115 100644
--- a/src/app_data.c
+++ b/src/app_data.c
@@ -52,9 +52,9 @@
#include <pthread.h>
#include <signal.h>
+#include <X11/Xlib.h>
#ifdef HAVE_LIBXFIXES
#include <X11/X.h>
-#include <X11/Xlib.h>
#include <X11/Xlibint.h>
#include <X11/Xproto.h>
#include <X11/Xutil.h>

6
pkgs/applications/virtualization/gvisor/default.nix
View File

@ -9,7 +9,7 @@
buildGoModule rec {
pname = "gvisor";
version = "20220919.0";
version = "20221102.1";
# gvisor provides a synthetic go branch (https://github.com/google/gvisor/tree/go)
# that can be used to build gvisor without bazel.
@ -18,8 +18,8 @@ buildGoModule rec {
src = fetchFromGitHub {
owner = "google";
repo = "gvisor";
rev = "4e7fd140e8d0056f8f031950fcace8ff4d48a526";
sha256 = "sha256-II0lnthabkyCgPum7EBdyOYwB0rWjA2Jd9DVGLJQy6Q=";
rev = "bf8eeee3a9eb966bc72c773da060a3c8bb73b8ff";
sha256 = "sha256-rADQsJ+AnBVlfQURGJl1xR6Ad5NyRWSrBSpOFMRld+o=";
};
vendorSha256 = "sha256-iGLWxx/Kn1QaJTNOZcc+mwoF3ecEDOkaqmA0DH4pdgU=";

6
pkgs/applications/virtualization/nixpacks/default.nix
View File

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "nixpacks";
version = "0.12.2";
version = "0.12.3";
src = fetchFromGitHub {
owner = "railwayapp";
repo = pname;
rev = "v${version}";
sha256 = "sha256-l6QIP/GIm7QMWLjYQJ3yuT7mWriowcND32EUuiNfvNA=";
sha256 = "sha256-Hy2QRGuXSidUrJ7kb1AhkaLeaevhhleGE8QvnNZf/L0=";
};
cargoSha256 = "sha256-t2kxpiSSYzg4MfjCyxkKNfPLTwGB8KgzQonFkLPCpvM=";
cargoSha256 = "sha256-5EJGUi74hrd3vifJ3r2vO0Qq2YEt0stXSi+RAGTme2I=";
# skip test due FHS dependency
doCheck = false;

130
pkgs/applications/virtualization/open-vm-tools/default.nix
View File

@ -1,8 +1,41 @@
{ stdenv, lib, fetchFromGitHub, makeWrapper, autoreconfHook
, bash, fuse3, libmspack, openssl, pam, xercesc, icu, libdnet, procps, libtirpc, rpcsvc-proto
, libX11, libXext, libXinerama, libXi, libXrender, libXrandr, libXtst, libxcrypt
, pkg-config, glib, gdk-pixbuf-xlib, gtk3, gtkmm3, iproute2, dbus, systemd, which
, libdrm, udev, util-linux
{ stdenv
, lib
, fetchFromGitHub
, makeWrapper
, autoreconfHook
, bash
, fuse3
, libmspack
, openssl
, pam
, xercesc
, icu
, libdnet
, procps
, libtirpc
, rpcsvc-proto
, libX11
, libXext
, libXinerama
, libXi
, libXrender
, libXrandr
, libXtst
, libxcrypt
, libxml2
, pkg-config
, glib
, gdk-pixbuf-xlib
, gtk3
, gtkmm3
, iproute2
, dbus
, systemd
, which
, libdrm
, udev
, util-linux
, xmlsec
, withX ? true
}:
@ -11,9 +44,9 @@ stdenv.mkDerivation rec {
version = "12.1.0";
src = fetchFromGitHub {
owner = "vmware";
repo = "open-vm-tools";
rev = "stable-${version}";
owner = "vmware";
repo = "open-vm-tools";
rev = "stable-${version}";
hash = "sha256-PgrLu0Bm9Vom5WNl43312QFWKojdXDAGn3Nvj4hzPrQ=";
};
@ -21,46 +54,77 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" ];
nativeBuildInputs = [ autoreconfHook makeWrapper pkg-config ];
buildInputs = [ fuse3 glib icu libdnet libdrm libmspack libtirpc libxcrypt openssl pam procps rpcsvc-proto udev xercesc ]
++ lib.optionals withX [ gdk-pixbuf-xlib gtk3 gtkmm3 libX11 libXext libXinerama libXi libXrender libXrandr libXtst ];
nativeBuildInputs = [
autoreconfHook
makeWrapper
pkg-config
];
buildInputs = [
fuse3
glib
icu
libdnet
libdrm
libmspack
libtirpc
libxcrypt
libxml2
openssl
pam
procps
rpcsvc-proto
udev
xercesc
xmlsec
] ++ lib.optionals withX [
gdk-pixbuf-xlib
gtk3
gtkmm3
libX11
libXext
libXinerama
libXi
libXrender
libXrandr
libXtst
];
postPatch = ''
sed -i 's,etc/vmware-tools,''${prefix}/etc/vmware-tools,' Makefile.am
sed -i 's,^confdir = ,confdir = ''${prefix},' scripts/Makefile.am
sed -i 's,usr/bin,''${prefix}/usr/bin,' scripts/Makefile.am
sed -i 's,etc/vmware-tools,''${prefix}/etc/vmware-tools,' services/vmtoolsd/Makefile.am
sed -i 's,$(PAM_PREFIX),''${prefix}/$(PAM_PREFIX),' services/vmtoolsd/Makefile.am
sed -i Makefile.am \
-e 's,etc/vmware-tools,''${prefix}/etc/vmware-tools,'
sed -i scripts/Makefile.am \
-e 's,^confdir = ,confdir = ''${prefix},' \
-e 's,usr/bin,''${prefix}/usr/bin,'
sed -i services/vmtoolsd/Makefile.am \
-e 's,etc/vmware-tools,''${prefix}/etc/vmware-tools,' \
-e 's,$(PAM_PREFIX),''${prefix}/$(PAM_PREFIX),'
sed -i vgauth/service/Makefile.am \
-e 's,/etc/vmware-tools/vgauth/schemas,''${prefix}/etc/vmware-tools/vgauth/schemas,' \
-e 's,$(DESTDIR)/etc/vmware-tools/vgauth.conf,''${prefix}/etc/vmware-tools/vgauth.conf,'
# Avoid a glibc >= 2.25 deprecation warning that gets fatal via -Werror.
sed 1i'#include <sys/sysmacros.h>' -i lib/wiper/wiperPosix.c
# don't abort on any warning
sed -i 's,CFLAGS="$CFLAGS -Werror",,' configure.ac
# Make reboot work, shutdown is not in /sbin on NixOS
sed -i 's,/sbin/shutdown,shutdown,' lib/system/systemLinux.c
# Make reboot work, shutdown is not in /sbin on NixOS
sed -i 's,/sbin/shutdown,shutdown,' lib/system/systemLinux.c
# Fix paths to fuse3 (we do not use fuse2 so that is not modified)
sed -i 's,/bin/fusermount3,${fuse3}/bin/fusermount3,' vmhgfs-fuse/config.c
# Fix paths to fuse3 (we do not use fuse2 so that is not modified)
sed -i 's,/bin/fusermount3,${fuse3}/bin/fusermount3,' vmhgfs-fuse/config.c
substituteInPlace services/plugins/vix/foundryToolsDaemon.c \
--replace "/usr/bin/vmhgfs-fuse" "${placeholder "out"}/bin/vmhgfs-fuse" \
--replace "/bin/mount" "${util-linux}/bin/mount"
substituteInPlace services/plugins/vix/foundryToolsDaemon.c \
--replace "/usr/bin/vmhgfs-fuse" "${placeholder "out"}/bin/vmhgfs-fuse" \
--replace "/bin/mount" "${util-linux}/bin/mount"
'';
configureFlags = [
"--without-kernel-modules"
"--without-xmlsecurity"
"--with-udev-rules-dir=${placeholder "out"}/lib/udev/rules.d"
"--with-fuse=fuse3"
] ++ lib.optional (!withX) "--without-x";
enableParallelBuilding = true;
NIX_CFLAGS_COMPILE = builtins.toString [
# fix build with gcc9
"-Wno-error=address-of-packed-member"
"-Wno-error=format-overflow"
];
preConfigure = ''
mkdir -p ${placeholder "out"}/lib/udev/rules.d
'';
@ -79,7 +143,7 @@ stdenv.mkDerivation rec {
better management of, and seamless user interactions with, guests.
'';
license = licenses.gpl2;
platforms = [ "x86_64-linux" "i686-linux" "aarch64-linux" ];
platforms = [ "x86_64-linux" "i686-linux" "aarch64-linux" ];
maintainers = with maintainers; [ joamaki ];
};
}

3
pkgs/desktops/gnome-2/default.nix
View File

@ -55,9 +55,6 @@ lib.makeScope pkgs.newScope (self: with self; {
#### DESKTOP
# Removed from recent GNOME releases, but still required
scrollkeeper = callPackage ./desktop/scrollkeeper { };
gtksourceview = callPackage ./desktop/gtksourceview {
autoreconfHook = pkgs.autoreconfHook269;
};

22
pkgs/desktops/gnome-2/desktop/scrollkeeper/default.nix
View File

@ -1,22 +0,0 @@
{ lib, stdenv, fetchurl, pkg-config, perlPackages, libxml2, libxslt, docbook_xml_dtd_42, automake, gettext }:
stdenv.mkDerivation rec {
pname = "scrollkeeper";
version = "0.3.14";
src = fetchurl {
url = "mirror://gnome/sources/scrollkeeper/${lib.versions.majorMinor version}/scrollkeeper-${version}.tar.bz2";
sha256 = "08n1xgj1f53zahwm0wpn3jid3rfbhi3iwby0ilaaldnid5qriqgc";
};
# The fuloong2f is not supported by scrollkeeper-0.3.14 config.guess
preConfigure = "
substituteInPlace extract/dtds/Makefile.am --replace /usr/bin/xmlcatalog xmlcatalog
cp ${automake}/share/automake*/config.{sub,guess} .
";
nativeBuildInputs = [ pkg-config ];
buildInputs = [ libxml2 libxslt gettext ]
++ (with perlPackages; [ perl XMLParser ]);
configureFlags = [ "--with-xml-catalog=${docbook_xml_dtd_42}/xml/dtd/docbook/catalog.xml" ];
}

222
pkgs/desktops/xfce/default.nix
View File

@ -1,166 +1,198 @@
{ config, lib, pkgs }:
{ config
, lib
, pkgs
, splicePackages
, newScope
, pkgsBuildBuild
, pkgsBuildHost
, pkgsBuildTarget
, pkgsHostHost
, pkgsTargetTarget
}:
lib.makeScope pkgs.newScope (self: with self; {
#### NixOS support
genericUpdater = pkgs.genericUpdater;
mkXfceDerivation = callPackage ./mkXfceDerivation.nix { };
automakeAddFlags = pkgs.makeSetupHook { } ./automakeAddFlags.sh;
#### CORE
exo = callPackage ./core/exo { };
garcon = callPackage ./core/garcon { };
libxfce4ui = callPackage ./core/libxfce4ui { };
libxfce4util = callPackage ./core/libxfce4util { };
thunar = callPackage ./core/thunar {
thunarPlugins = [];
let
otherSplices = {
selfBuildBuild = pkgsBuildBuild.xfce;
selfBuildHost = pkgsBuildHost.xfce;
selfBuildTarget = pkgsBuildTarget.xfce;
selfHostHost = pkgsHostHost.xfce;
selfTargetTarget = pkgsTargetTarget.xfce or { };
};
keep = _self: { };
extra = _spliced0: { };
thunar-volman = callPackage ./core/thunar-volman { };
in
lib.makeScopeWithSplicing
splicePackages
newScope
otherSplices
keep
extra
(self:
let
inherit (self) callPackage;
in
{
#### NixOS support
thunar-archive-plugin = callPackage ./thunar-plugins/archive { };
genericUpdater = pkgs.genericUpdater;
thunar-dropbox-plugin = callPackage ./thunar-plugins/dropbox { };
mkXfceDerivation = callPackage ./mkXfceDerivation.nix { };
thunar-media-tags-plugin = callPackage ./thunar-plugins/media-tags { };
automakeAddFlags = pkgs.makeSetupHook { } ./automakeAddFlags.sh;
tumbler = callPackage ./core/tumbler { };
#### CORE
xfce4-panel = callPackage ./core/xfce4-panel { };
exo = callPackage ./core/exo { };
xfce4-session = callPackage ./core/xfce4-session { };
garcon = callPackage ./core/garcon { };
xfce4-settings = callPackage ./core/xfce4-settings { };
libxfce4ui = callPackage ./core/libxfce4ui { };
xfce4-power-manager = callPackage ./core/xfce4-power-manager { };
libxfce4util = callPackage ./core/libxfce4util { };
xfconf = callPackage ./core/xfconf { };
thunar = callPackage ./core/thunar {
thunarPlugins = [ ];
};
xfdesktop = callPackage ./core/xfdesktop { };
thunar-volman = callPackage ./core/thunar-volman { };
xfwm4 = callPackage ./core/xfwm4 { };
thunar-archive-plugin = callPackage ./thunar-plugins/archive { };
xfce4-appfinder = callPackage ./core/xfce4-appfinder { };
thunar-dropbox-plugin = callPackage ./thunar-plugins/dropbox { };
xfce4-dev-tools = callPackage ./core/xfce4-dev-tools {
mkXfceDerivation = mkXfceDerivation.override {
xfce4-dev-tools = null;
};
};
thunar-media-tags-plugin = callPackage ./thunar-plugins/media-tags { };
#### APPLICATIONS
tumbler = callPackage ./core/tumbler { };
catfish = callPackage ./applications/catfish { };
xfce4-panel = callPackage ./core/xfce4-panel { };
gigolo = callPackage ./applications/gigolo { };
xfce4-session = callPackage ./core/xfce4-session { };
mousepad = callPackage ./applications/mousepad { };
xfce4-settings = callPackage ./core/xfce4-settings { };
orage = callPackage ./applications/orage { };
xfce4-power-manager = callPackage ./core/xfce4-power-manager { };
parole = callPackage ./applications/parole { };
xfconf = callPackage ./core/xfconf { };
ristretto = callPackage ./applications/ristretto { };
xfdesktop = callPackage ./core/xfdesktop { };
xfce4-taskmanager = callPackage ./applications/xfce4-taskmanager { };
xfwm4 = callPackage ./core/xfwm4 { };
xfce4-dict = callPackage ./applications/xfce4-dict { };
xfce4-appfinder = callPackage ./core/xfce4-appfinder { };
xfce4-terminal = callPackage ./applications/xfce4-terminal { };
xfce4-dev-tools = callPackage ./core/xfce4-dev-tools {
mkXfceDerivation = self.mkXfceDerivation.override {
xfce4-dev-tools = null;
};
};
xfce4-screensaver = callPackage ./applications/xfce4-screensaver { };
#### APPLICATIONS
xfce4-screenshooter = callPackage ./applications/xfce4-screenshooter {
inherit (pkgs.gnome) libsoup;
};
catfish = callPackage ./applications/catfish { };
xfdashboard = callPackage ./applications/xfdashboard {};
gigolo = callPackage ./applications/gigolo { };
xfce4-volumed-pulse = callPackage ./applications/xfce4-volumed-pulse { };
mousepad = callPackage ./applications/mousepad { };
xfce4-notifyd = callPackage ./applications/xfce4-notifyd { };
orage = callPackage ./applications/orage { };
xfburn = callPackage ./applications/xfburn { };
parole = callPackage ./applications/parole { };
xfce4-panel-profiles = callPackage ./applications/xfce4-panel-profiles { };
ristretto = callPackage ./applications/ristretto { };
#### ART
xfce4-taskmanager = callPackage ./applications/xfce4-taskmanager { };
xfce4-icon-theme = callPackage ./art/xfce4-icon-theme { };
xfce4-dict = callPackage ./applications/xfce4-dict { };
xfwm4-themes = callPackage ./art/xfwm4-themes { };
xfce4-terminal = callPackage ./applications/xfce4-terminal { };
#### PANEL PLUGINS
xfce4-screensaver = callPackage ./applications/xfce4-screensaver { };
xfce4-battery-plugin = callPackage ./panel-plugins/xfce4-battery-plugin { };
xfce4-screenshooter = callPackage ./applications/xfce4-screenshooter {
inherit (pkgs.gnome) libsoup;
};
xfce4-clipman-plugin = callPackage ./panel-plugins/xfce4-clipman-plugin { };
xfdashboard = callPackage ./applications/xfdashboard { };
xfce4-cpufreq-plugin = callPackage ./panel-plugins/xfce4-cpufreq-plugin { };
xfce4-volumed-pulse = callPackage ./applications/xfce4-volumed-pulse { };
xfce4-cpugraph-plugin = callPackage ./panel-plugins/xfce4-cpugraph-plugin { };
xfce4-notifyd = callPackage ./applications/xfce4-notifyd { };
xfce4-datetime-plugin = callPackage ./panel-plugins/xfce4-datetime-plugin { };
xfburn = callPackage ./applications/xfburn { };
xfce4-dockbarx-plugin = callPackage ./panel-plugins/xfce4-dockbarx-plugin { };
xfce4-panel-profiles = callPackage ./applications/xfce4-panel-profiles { };
xfce4-embed-plugin = callPackage ./panel-plugins/xfce4-embed-plugin { };
#### ART
xfce4-eyes-plugin = callPackage ./panel-plugins/xfce4-eyes-plugin { };
xfce4-icon-theme = callPackage ./art/xfce4-icon-theme { };
xfce4-fsguard-plugin = callPackage ./panel-plugins/xfce4-fsguard-plugin { };
xfwm4-themes = callPackage ./art/xfwm4-themes { };
xfce4-genmon-plugin = callPackage ./panel-plugins/xfce4-genmon-plugin { };
#### PANEL PLUGINS
xfce4-hardware-monitor-plugin = callPackage ./panel-plugins/xfce4-hardware-monitor-plugin { };
xfce4-battery-plugin = callPackage ./panel-plugins/xfce4-battery-plugin { };
xfce4-i3-workspaces-plugin = callPackage ./panel-plugins/xfce4-i3-workspaces-plugin { };
xfce4-clipman-plugin = callPackage ./panel-plugins/xfce4-clipman-plugin { };
xfce4-namebar-plugin = callPackage ./panel-plugins/xfce4-namebar-plugin { };
xfce4-cpufreq-plugin = callPackage ./panel-plugins/xfce4-cpufreq-plugin { };
xfce4-netload-plugin = callPackage ./panel-plugins/xfce4-netload-plugin { };
xfce4-cpugraph-plugin = callPackage ./panel-plugins/xfce4-cpugraph-plugin { };
xfce4-notes-plugin = callPackage ./panel-plugins/xfce4-notes-plugin { };
xfce4-datetime-plugin = callPackage ./panel-plugins/xfce4-datetime-plugin { };
xfce4-mailwatch-plugin = callPackage ./panel-plugins/xfce4-mailwatch-plugin { };
xfce4-dockbarx-plugin = callPackage ./panel-plugins/xfce4-dockbarx-plugin { };
xfce4-mpc-plugin = callPackage ./panel-plugins/xfce4-mpc-plugin { };
xfce4-embed-plugin = callPackage ./panel-plugins/xfce4-embed-plugin { };
xfce4-sensors-plugin = callPackage ./panel-plugins/xfce4-sensors-plugin { };
xfce4-eyes-plugin = callPackage ./panel-plugins/xfce4-eyes-plugin { };
xfce4-systemload-plugin = callPackage ./panel-plugins/xfce4-systemload-plugin { };
xfce4-fsguard-plugin = callPackage ./panel-plugins/xfce4-fsguard-plugin { };
xfce4-time-out-plugin = callPackage ./panel-plugins/xfce4-time-out-plugin { };
xfce4-genmon-plugin = callPackage ./panel-plugins/xfce4-genmon-plugin { };
xfce4-timer-plugin = callPackage ./panel-plugins/xfce4-timer-plugin { };
xfce4-hardware-monitor-plugin = callPackage ./panel-plugins/xfce4-hardware-monitor-plugin { };
xfce4-verve-plugin = callPackage ./panel-plugins/xfce4-verve-plugin { };
xfce4-i3-workspaces-plugin = callPackage ./panel-plugins/xfce4-i3-workspaces-plugin { };
xfce4-xkb-plugin = callPackage ./panel-plugins/xfce4-xkb-plugin { };
xfce4-namebar-plugin = callPackage ./panel-plugins/xfce4-namebar-plugin { };
xfce4-weather-plugin = callPackage ./panel-plugins/xfce4-weather-plugin { };
xfce4-netload-plugin = callPackage ./panel-plugins/xfce4-netload-plugin { };
xfce4-whiskermenu-plugin = callPackage ./panel-plugins/xfce4-whiskermenu-plugin { };
xfce4-notes-plugin = callPackage ./panel-plugins/xfce4-notes-plugin { };
xfce4-windowck-plugin = callPackage ./panel-plugins/xfce4-windowck-plugin { };
xfce4-mailwatch-plugin = callPackage ./panel-plugins/xfce4-mailwatch-plugin { };
xfce4-pulseaudio-plugin = callPackage ./panel-plugins/xfce4-pulseaudio-plugin { };
xfce4-mpc-plugin = callPackage ./panel-plugins/xfce4-mpc-plugin { };
} // lib.optionalAttrs config.allowAliases {
#### ALIASES
xfce4-sensors-plugin = callPackage ./panel-plugins/xfce4-sensors-plugin { };
xinitrc = xfce4-session.xinitrc; # added 2019-11-04
xfce4-systemload-plugin = callPackage ./panel-plugins/xfce4-systemload-plugin { };
thunar-bare = thunar.override { thunarPlugins = []; }; # added 2019-11-04
xfce4-time-out-plugin = callPackage ./panel-plugins/xfce4-time-out-plugin { };
}) // lib.optionalAttrs config.allowAliases {
xfce4-timer-plugin = callPackage ./panel-plugins/xfce4-timer-plugin { };
xfce4-verve-plugin = callPackage ./panel-plugins/xfce4-verve-plugin { };
xfce4-xkb-plugin = callPackage ./panel-plugins/xfce4-xkb-plugin { };
xfce4-weather-plugin = callPackage ./panel-plugins/xfce4-weather-plugin { };
xfce4-whiskermenu-plugin = callPackage ./panel-plugins/xfce4-whiskermenu-plugin { };
xfce4-windowck-plugin = callPackage ./panel-plugins/xfce4-windowck-plugin { };
xfce4-pulseaudio-plugin = callPackage ./panel-plugins/xfce4-pulseaudio-plugin { };
} // lib.optionalAttrs config.allowAliases {
#### ALIASES
xinitrc = self.xfce4-session.xinitrc; # added 2019-11-04
thunar-bare = self.thunar.override { thunarPlugins = [ ]; }; # added 2019-11-04
}) // lib.optionalAttrs config.allowAliases {
#### Legacy aliases. They need to be outside the scope or they will shadow the attributes from parent scope.
terminal = throw "xfce.terminal has been removed, use xfce.xfce4-terminal instead"; # added 2022-05-24

4
pkgs/development/compilers/closure/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "closure-compiler";
version = "20221004";
version = "20221102";
src = fetchurl {
url = "mirror://maven/com/google/javascript/closure-compiler/v${version}/closure-compiler-v${version}.jar";
sha256 = "sha256-r2m5nfNWg5aGJBRLVZwmgilpgc4epLWY4qx34pRIi6Q=";
sha256 = "sha256-xaVAmt2GVywRVB7n6mqKqsYlfEAjRZEnfspf9c1Qluc=";
};
dontUnpack = true;

12
pkgs/development/compilers/yosys/plugins/symbiflow.nix
View File

@ -9,16 +9,17 @@
, yosys-symbiflow
, uhdm
, surelog
, flatbuffers
}: let
src = fetchFromGitHub {
owner = "chipsalliance";
repo = "yosys-f4pga-plugins";
rev = "27208ce08200a5e89e3bd4f466bc68824df38c32";
hash = "sha256-S7txjzlIp+idWIfp/DDOznluA3aMFfosMUt5dvi+g44=";
rev = "e23ff6db487da9ceea576c53ac33853566c3a84e";
hash = "sha256-HJ4br6lQwRrcnkLgV3aecr3T3zcPzA11MfxhRjwIb0I=";
};
version = "2022.09.27";
version = "2022.11.07";
# Supported symbiflow plugins.
#
@ -60,6 +61,7 @@ in lib.genAttrs plugins (plugin: stdenv.mkDerivation (rec {
patches = lib.optional ( plugin == "ql-qlf" ) ./symbiflow-pmgen.patch;
preBuild = ''
export LDFLAGS="-L${flatbuffers}/lib"
mkdir -p ql-qlf-plugin/pmgen
''
+ lib.optionalString ( plugin == "ql-qlf" ) ''
@ -68,8 +70,8 @@ in lib.genAttrs plugins (plugin: stdenv.mkDerivation (rec {
# Providing a symlink avoids the need for patching the test makefile
postUnpack = ''
mkdir -p source/third_party/googletest/googletest/build/
ln -s ${static_gtest}/lib source/third_party/googletest/googletest/build/lib
mkdir -p source/third_party/googletest/build/
ln -s ${static_gtest}/lib source/third_party/googletest/build/lib
'';
makeFlags = [

6
pkgs/development/embedded/arduino/arduino-cli/default.nix
View File

@ -4,18 +4,18 @@ let
pkg = buildGoModule rec {
pname = "arduino-cli";
version = "0.27.1";
version = "0.28.0";
src = fetchFromGitHub {
owner = "arduino";
repo = pname;
rev = version;
sha256 = "sha256-lwLzMUMHwheZHrjPttdk6TFsjt8SymHkBMtXTbr/nYE=";
sha256 = "sha256-i6osx4j1YVAYaVVdEQ4ImfaIvXw5jPYmgpEYz6XGkY8=";
};
subPackages = [ "." ];
vendorSha256 = "sha256-kEM6eCWTI+XKs58cVhNfjJsIwC3r1ATy1sFbjtorgGY=";
vendorSha256 = "sha256-NIqsYAnW9elprKWjqmNIsF452thuWT1i8YNPUuuwjVs=";
doCheck = false;

7
pkgs/development/embedded/platformio/chrootenv.nix
View File

@ -3,11 +3,8 @@
let
pio-pkgs = pkgs:
let
python = pkgs.python3.override {
packageOverrides = self: super: {
platformio = self.callPackage ./core.nix { inherit version src; };
};
};
python = pkgs.python3;
platformio = python.pkgs.callPackage ./core.nix { inherit version src; };
in
(with pkgs; [
zlib

2
pkgs/development/embedded/platformio/core.nix
View File

@ -22,6 +22,7 @@ with python3.pkgs; buildPythonApplication rec {
substituteInPlace setup.py \
--replace 'uvicorn==%s" % ("0.17.*"' 'uvicorn==%s" % ("0.18.*"' \
--replace 'aiofiles==0.8.*' 'aiofiles==22.1.*' \
--replace 'wsproto==' 'wsproto>='
'';
@ -147,6 +148,5 @@ with python3.pkgs; buildPythonApplication rec {
homepage = "https://platformio.org";
license = licenses.asl20;
maintainers = with maintainers; [ mog makefu ];
broken = stdenv.isAarch64;
};
}

4
pkgs/development/interpreters/erlang/R25.nix
View File

@ -1,6 +1,6 @@
{ mkDerivation }:
mkDerivation {
version = "25.1";
sha256 = "1wrdcc576ad4fibm95c3mfni8sg1h536b4affdj05qg5cyjjwwis";
version = "25.1.2";
sha256 = "0fn6zyqrgyiznyghkhygak524f3clc3kz91rarq8cqn3r920dmg9";
}

4
pkgs/development/interpreters/janet/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "janet";
version = "1.24.1";
version = "1.25.1";
src = fetchFromGitHub {
owner = "janet-lang";
repo = pname;
rev = "v${version}";
sha256 = "sha256-uGbaoWJAWbSQ7QkocU7gFZUiWb0GD8mtuO7V0sUXTv0=";
sha256 = "sha256-TWKiSE8mqXz5i4vd32WylTsyxMXXKGmVl3U2q2sMwDQ=";
};
postPatch = ''

4
pkgs/development/interpreters/luau/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "luau";
version = "0.551";
version = "0.552";
src = fetchFromGitHub {
owner = "Roblox";
repo = "luau";
rev = version;
sha256 = "sha256-1IQeTq5eLn0jYtdc6SM0TuVJ3TUWUWtjQjAviba5ibw=";
sha256 = "sha256-dxxzM9VKN4yDkVpU3uQNgiFbBXBa+ALWSG/Ut6JKOEY=";
};
nativeBuildInputs = [ cmake ];

4
pkgs/development/libraries/aws-c-mqtt/default.nix
View File

@ -13,13 +13,13 @@
stdenv.mkDerivation rec {
pname = "aws-c-mqtt";
version = "0.7.12";
version = "0.7.13";
src = fetchFromGitHub {
owner = "awslabs";
repo = "aws-c-mqtt";
rev = "v${version}";
sha256 = "sha256-0u3t0m5GQ7wxxLI8rY7j9AMliPzrAR9J/c/7DcT43WU=";
sha256 = "sha256-m0PJTJ+yZdJ4zU25g6H80jURPPU7wHuePcgfN6y8SKU=";
};
nativeBuildInputs = [

4
pkgs/development/libraries/aws-c-sdkutils/default.nix
View File

@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "aws-c-sdkutils";
version = "0.1.4";
version = "0.1.6";
src = fetchFromGitHub {
owner = "awslabs";
repo = "aws-c-sdkutils";
rev = "v${version}";
sha256 = "sha256-B7BTafeN60csYhhscuHsynI183AvCqLljQgm8NgE6xo=";
sha256 = "sha256-KfQKOQrSgTy9Z+iUGnLblRArkq3xnFEnSq6HajcbysQ=";
};
nativeBuildInputs = [

5
pkgs/development/libraries/c-ares/default.nix
View File

@ -33,6 +33,11 @@ stdenv.mkDerivation rec {
nativeBuildInputs = lib.optionals withCMake [ cmake ];
cmakeFlags = [] ++ lib.optionals stdenv.hostPlatform.isStatic [
"-DCARES_SHARED=OFF"
"-DCARES_STATIC=ON"
];
enableParallelBuilding = true;
passthru.tests = {

4
pkgs/development/libraries/folly/default.nix
View File

@ -22,13 +22,13 @@
stdenv.mkDerivation rec {
pname = "folly";
version = "2022.09.05.00";
version = "2022.11.07.00";
src = fetchFromGitHub {
owner = "facebook";
repo = "folly";
rev = "v${version}";
sha256 = "sha256-V+CmsHPq+nIJrn7jPnwRls3ICW6JSqwOeDUQMvSyyrQ=";
sha256 = "sha256-RzVJuhyLZe5KGnNYUxkiAeYdQf4Amm8cAlV/12kmTj4=";
};
nativeBuildInputs = [

6
pkgs/development/libraries/kpmcore/default.nix
View File

@ -13,6 +13,10 @@ stdenv.mkDerivation rec {
hash = "sha256-Ws20hKX2iDdke5yBBKXukVUD4OnLf1OmwlhW+jUXL24=";
};
patches = [
./nixostrustedprefix.patch
];
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [
@ -29,6 +33,8 @@ stdenv.mkDerivation rec {
preConfigure = ''
substituteInPlace src/util/CMakeLists.txt \
--replace \$\{POLKITQT-1_POLICY_FILES_INSTALL_DIR\} $out/share/polkit-1/actions
substituteInPlace src/backend/corebackend.cpp \
--replace /usr/share/polkit-1/actions/org.kde.kpmcore.externalcommand.policy $out/share/polkit-1/actions/org.kde.kpmcore.externalcommand.policy
'';
meta = with lib; {

13
pkgs/development/libraries/kpmcore/nixostrustedprefix.patch Normal file
View File

@ -0,0 +1,13 @@
diff --git a/src/util/externalcommandhelper.cpp b/src/util/externalcommandhelper.cpp
index a879c8d..3d7863b 100644
--- a/src/util/externalcommandhelper.cpp
+++ b/src/util/externalcommandhelper.cpp
@@ -387,7 +387,7 @@ QVariantMap ExternalCommandHelper::RunCommand(const QString& command, const QStr
if (dirname == QStringLiteral("bin") || dirname == QStringLiteral("sbin")) {
prefix.cdUp();
}
- if (trustedPrefixes.find(prefix.path()) == trustedPrefixes.end()) { // TODO: C++20: replace with contains
+ if (!prefix.path().startsWith(QStringLiteral("/nix/store")) && !prefix.path().startsWith(QStringLiteral("/run/current-system/sw"))) { // TODO: C++20: replace with contains
qInfo() << prefix.path() << "prefix is not one of the trusted command prefixes";
reply[QStringLiteral("success")] = false;
return reply;

6
pkgs/development/libraries/libiio/default.nix
View File

@ -6,7 +6,7 @@
, libxml2
, python
, libusb1
, avahi
, avahiSupport ? true, avahi
, libaio
, runtimeShell
, lib
@ -43,8 +43,8 @@ stdenv.mkDerivation rec {
python
libxml2
libusb1
avahi
] ++ lib.optional python.isPy3k python.pkgs.setuptools
++ lib.optional avahiSupport avahi
++ lib.optional stdenv.isLinux libaio
++ lib.optionals stdenv.isDarwin [ CFNetwork CoreServices ];
@ -55,6 +55,8 @@ stdenv.mkDerivation rec {
# the linux-like directory structure is used for proper output splitting
"-DOSX_PACKAGE=off"
"-DOSX_FRAMEWORK=off"
] ++ lib.optionals (!avahiSupport) [
"-DHAVE_DNS_SD=OFF"
];
postPatch = ''

38
pkgs/development/libraries/litehtml/default.nix Normal file
View File

@ -0,0 +1,38 @@
{ lib
, stdenv
, fetchFromGitHub
, cmake
, gumbo
}:
stdenv.mkDerivation rec {
pname = "litehtml";
version = "0.6";
src = fetchFromGitHub {
owner = "litehtml";
repo = "litehtml";
rev = "v${version}";
hash = "sha256-9571d3k8RkzEpMWPuIejZ7njLmYstSwFUaSqT3sk6uQ=";
};
nativeBuildInputs = [
cmake
];
buildInputs = [
gumbo
];
cmakeFlags = [
"-DEXTERNAL_GUMBO=ON"
];
meta = with lib; {
description = "Fast and lightweight HTML/CSS rendering engine";
homepage = "http://www.litehtml.com/";
license = licenses.bsd3;
platforms = platforms.all;
maintainers = with maintainers; [ fgaz ];
};
}

19
pkgs/development/libraries/nanodbc/default.nix
View File

@ -1,16 +1,20 @@
{ lib, stdenv, fetchFromGitHub, cmake, unixODBC }:
{ lib, stdenv, fetchFromGitHub, catch2, cmake, unixODBC }:
stdenv.mkDerivation rec {
pname = "nanodbc";
version = "2.13.0";
version = "2.14.0";
src = fetchFromGitHub {
owner = "nanodbc";
repo = "nanodbc";
rev = "v${version}";
sha256 = "1q80p7yv9mcl4hyvnvcjdr70y8nc940ypf368lp97vpqn5yckkgm";
hash = "sha256-dVUOwA7LfLqcQq2nc6OAha0krmgTy5RUHupBVrNdo4g=";
};
postPatch = ''
cp ${catch2}/include/catch2/catch.hpp test/catch/catch.hpp
'';
nativeBuildInputs = [ cmake ];
buildInputs = [ unixODBC ];
@ -20,15 +24,6 @@ stdenv.mkDerivation rec {
else
[ "-DBUILD_SHARED_LIBS=ON" ];
# fix compilation on macOS
# https://github.com/nanodbc/nanodbc/issues/274
# remove after the next version update
postUnpack = if stdenv.isDarwin then ''
mv $sourceRoot/VERSION $sourceRoot/VERSION.txt
substituteInPlace $sourceRoot/CMakeLists.txt \
--replace 'file(STRINGS VERSION' 'file(STRINGS VERSION.txt'
'' else "";
meta = with lib; {
homepage = "https://github.com/nanodbc/nanodbc";
changelog = "https://github.com/nanodbc/nanodbc/raw/v${version}/CHANGELOG.md";

20
pkgs/development/libraries/pixman/default.nix
View File

@ -1,4 +1,18 @@
{ lib, stdenv, fetchurl, pkg-config, libpng, glib /*just passthru*/ }:
{ lib
, stdenv
, fetchurl
, pkg-config
, libpng
, glib /*just passthru*/
# for passthru.tests
, cairo
, qemu
, scribus
, tigervnc
, wlroots
, xwayland
}:
stdenv.mkDerivation rec {
pname = "pixman";
@ -26,6 +40,10 @@ stdenv.mkDerivation rec {
postInstall = glib.flattenInclude;
passthru.tests = {
inherit cairo qemu scribus tigervnc wlroots xwayland;
};
meta = with lib; {
homepage = "http://pixman.org";
description = "A low-level library for pixel manipulation";

6
pkgs/development/libraries/qt-6/default.nix
View File

@ -17,6 +17,9 @@
, writeText
, gstreamer
, gst-plugins-base
, gst-plugins-good
, gst-libav
, gst-vaapi
, gtk3
, dconf
, buildPackages
@ -51,6 +54,7 @@ let
inherit bison cups harfbuzz libGL dconf gtk3 developerBuild cmake;
patches = [
./patches/qtbase-qmake-pkg-config.patch
./patches/qtbase-tzdir.patch
];
};
@ -66,7 +70,7 @@ let
qtlanguageserver = callPackage ./modules/qtlanguageserver.nix { };
qtlottie = callPackage ./modules/qtlottie.nix { };
qtmultimedia = callPackage ./modules/qtmultimedia.nix {
inherit gstreamer gst-plugins-base;
inherit gstreamer gst-plugins-base gst-plugins-good gst-libav gst-vaapi;
};
qtnetworkauth = callPackage ./modules/qtnetworkauth.nix { };
qtpositioning = callPackage ./modules/qtpositioning.nix { };

6
pkgs/development/libraries/qt-6/modules/qtmultimedia.nix
View File

@ -9,6 +9,9 @@
, alsa-lib
, gstreamer
, gst-plugins-base
, gst-plugins-good
, gst-libav
, gst-vaapi
, libpulseaudio
, wayland
, elfutils
@ -20,5 +23,6 @@ qtModule {
pname = "qtmultimedia";
qtInputs = [ qtbase qtdeclarative qtsvg qtshadertools ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ gstreamer gst-plugins-base libpulseaudio elfutils libunwind alsa-lib wayland orc ];
buildInputs = [ libpulseaudio elfutils libunwind alsa-lib wayland orc ];
propagatedBuildInputs = [ gstreamer gst-plugins-base gst-plugins-good gst-libav gst-vaapi ];
}

1
pkgs/development/libraries/qt-6/modules/qtwebengine.nix
View File

@ -239,7 +239,6 @@ qtModule {
'';
meta = with lib; {
broken = (stdenv.isLinux && stdenv.isAarch64);
description = "A web engine based on the Chromium web browser";
platforms = platforms.linux;
# This build takes a long time; particularly on slow architectures

48
pkgs/development/libraries/qt-6/patches/qtbase-tzdir.patch Normal file
View File

@ -0,0 +1,48 @@
diff --git a/src/corelib/time/qtimezoneprivate_tz.cpp b/src/corelib/time/qtimezoneprivate_tz.cpp
index 627a4a81..a5f50acc 100644
--- a/src/corelib/time/qtimezoneprivate_tz.cpp
+++ b/src/corelib/time/qtimezoneprivate_tz.cpp
@@ -51,7 +51,11 @@ typedef QHash<QByteArray, QTzTimeZone> QTzTimeZoneHash;
// Parse zone.tab table, assume lists all installed zones, if not will need to read directories
static QTzTimeZoneHash loadTzTimeZones()
{
- QString path = QStringLiteral("/usr/share/zoneinfo/zone.tab");
+ // Try TZDIR first, in case we're running on NixOS.
+ QString path = QFile::decodeName(qgetenv("TZDIR")) + QStringLiteral("/zone.tab");
+ // Fallback to traditional paths in case we are not on NixOS.
+ if (!QFile::exists(path))
+ path = QStringLiteral("/usr/share/zoneinfo/zone.tab");
if (!QFile::exists(path))
path = QStringLiteral("/usr/lib/zoneinfo/zone.tab");
@@ -727,18 +731,21 @@ QTzTimeZoneCacheEntry QTzTimeZoneCache::findEntry(const QByteArray &ianaId)
if (!tzif.open(QIODevice::ReadOnly))
return ret;
} else {
- // Open named tz, try modern path first, if fails try legacy path
- tzif.setFileName("/usr/share/zoneinfo/"_L1 + QString::fromLocal8Bit(ianaId));
+ // Try TZDIR first, in case we're running on NixOS
+ tzif.setFileName(QFile::decodeName(qgetenv("TZDIR")) + QStringLiteral("/") + QString::fromLocal8Bit(ianaId));
if (!tzif.open(QIODevice::ReadOnly)) {
- tzif.setFileName("/usr/lib/zoneinfo/"_L1 + QString::fromLocal8Bit(ianaId));
+ tzif.setFileName(QLatin1String("/usr/share/zoneinfo/") + QString::fromLocal8Bit(ianaId));
if (!tzif.open(QIODevice::ReadOnly)) {
- // ianaId may be a POSIX rule, taken from $TZ or /etc/TZ
- auto check = validatePosixRule(ianaId);
- if (check.isValid) {
- ret.m_hasDst = check.hasDst;
- ret.m_posixRule = ianaId;
+ tzif.setFileName("/usr/lib/zoneinfo/"_L1 + QString::fromLocal8Bit(ianaId));
+ if (!tzif.open(QIODevice::ReadOnly)) {
+ // ianaId may be a POSIX rule, taken from $TZ or /etc/TZ
+ auto check = validatePosixRule(ianaId);
+ if (check.isValid) {
+ ret.m_hasDst = check.hasDst;
+ ret.m_posixRule = ianaId;
+ }
+ return ret;
}
- return ret;
}
}
}

20
pkgs/development/libraries/unicorn/default.nix
View File

@ -4,28 +4,44 @@
, pkg-config
, cmake
, IOKit
, cctools
}:
stdenv.mkDerivation rec {
pname = "unicorn";
version = "2.0.0-rc7";
version = "2.0.1";
src = fetchFromGitHub {
owner = "unicorn-engine";
repo = pname;
rev = version;
hash = "sha256-qlxtFCJBmouPuUEu8RduZM+rbOr52sGjdb8ZRHWmJ/w=";
hash = "sha256-D8kwrHo58zksVjB13VtzoVqmz++FRfJ4zI2CT+YeBVE=";
};
patches = [
# Fix compilation on aarch64-darwin
# See https://github.com/unicorn-engine/unicorn/issues/1730
./tests_unit_endian_aarch64.patch
];
nativeBuildInputs = [
cmake
pkg-config
] ++ lib.optionals stdenv.isDarwin [
cctools
];
buildInputs = lib.optionals stdenv.isDarwin [
IOKit
];
cmakeFlags = lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [
# Some x86 tests are interrupted by signal 10
"-DCMAKE_CTEST_ARGUMENTS=--exclude-regex;test_x86"
];
doCheck = true;
meta = with lib; {
description = "Lightweight multi-platform CPU emulator library";
homepage = "https://www.unicorn-engine.org";

20
pkgs/development/libraries/unicorn/tests_unit_endian_aarch64.patch Normal file
View File

@ -0,0 +1,20 @@
diff --git a/tests/unit/endian.h b/tests/unit/endian.h
index 5bc86308..b455899e 100644
--- a/tests/unit/endian.h
+++ b/tests/unit/endian.h
@@ -54,6 +54,7 @@
|| defined(_POWER) || defined(__powerpc__) \
|| defined(__ppc__) || defined(__hpux) || defined(__hppa) \
|| defined(_MIPSEB) || defined(_POWER) \
+ || defined(__ARMEB__) || defined(__AARCH64EB__) \
|| defined(__s390__)
# define BOOST_BIG_ENDIAN
# define BOOST_BYTE_ORDER 4321
@@ -63,6 +64,7 @@
|| defined(_M_ALPHA) || defined(__amd64) \
|| defined(__amd64__) || defined(_M_AMD64) \
|| defined(__x86_64) || defined(__x86_64__) \
+ || defined(__ARMEL__) || defined(__AARCH64EL__) \
|| defined(_M_X64) || defined(__bfin__)
# define BOOST_LITTLE_ENDIAN

115
pkgs/development/libraries/wxwidgets/wxGTK28.nix
View File

@ -1,115 +0,0 @@
{ lib
, stdenv
, fetchurl
, cairo
, gtk2
, libGL
, libGLU
, libSM
, libX11
, libXinerama
, libXxf86vm
, pkg-config
, xorgproto
, compat24 ? false
, compat26 ? true
, unicode ? true
, withMesa ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms
}:
stdenv.mkDerivation rec {
pname = "wxGTK";
version = "2.8.12.1";
src = fetchurl {
url = "mirror://sourceforge/wxpython/wxPython-src-${version}.tar.bz2";
hash = "sha256-Hz8VPZ8VBMbOLSxLI+lAuPWLgfTLo1zaGluzEUIkPNA=";
};
nativeBuildInputs = [
pkg-config
];
buildInputs = [
cairo
gtk2
libSM
libX11
libXinerama
libXxf86vm
xorgproto
]
++ lib.optional withMesa libGLU;
configureFlags = [
"--enable-gtk2"
"--disable-precomp-headers"
"--enable-mediactrl"
"--enable-graphics_ctx"
(if compat24 then "--enable-compat24" else "--disable-compat24")
(if compat26 then "--enable-compat26" else "--disable-compat26")
]
++ lib.optional unicode "--enable-unicode"
++ lib.optional withMesa "--with-opengl";
hardeningDisable = [ "format" ];
# These variables are used by configure to find some dependencies.
SEARCH_INCLUDE =
"${libXinerama.dev}/include ${libSM.dev}/include ${libXxf86vm.dev}/include";
SEARCH_LIB =
"${libXinerama.out}/lib ${libSM.out}/lib ${libXxf86vm.out}/lib "
+ lib.optionalString withMesa "${libGLU.out}/lib ${libGL.out}/lib ";
# Work around a bug in configure.
NIX_CFLAGS_COMPILE = "-DHAVE_X11_XLIB_H=1 -lX11 -lcairo -Wno-narrowing";
preConfigure = ''
substituteInPlace configure --replace \
'SEARCH_INCLUDE=' 'DUMMY_SEARCH_INCLUDE='
substituteInPlace configure --replace \
'SEARCH_LIB=' 'DUMMY_SEARCH_LIB='
substituteInPlace configure --replace \
/usr /no-such-path
'';
postBuild = ''
pushd contrib/src
make
popd
'';
postInstall = ''
pushd contrib/src
make install
popd
pushd $out/include
ln -s wx-*/* .
popd
'';
enableParallelBuilding = true;
meta = with lib; {
homepage = "https://www.wxwidgets.org/";
description = "A Cross-Platform C++ GUI Library";
longDescription = ''
wxWidgets gives you a single, easy-to-use API for writing GUI applications
on multiple platforms that still utilize the native platform's controls
and utilities. Link with the appropriate library for your platform and
compiler, and your application will adopt the look and feel appropriate to
that platform. On top of great GUI functionality, wxWidgets gives you:
online help, network programming, streams, clipboard and drag and drop,
multithreading, image loading and saving in a variety of popular formats,
database support, HTML viewing and printing, and much more.
'';
license = licenses.wxWindows;
maintainers = with maintainers; [ ];
platforms = platforms.linux;
};
passthru = {
inherit compat24 compat26 unicode;
gtk = gtk2;
};
}

127
pkgs/development/libraries/wxwidgets/wxGTK29.nix
View File

@ -1,127 +0,0 @@
{ lib
, stdenv
, fetchFromGitHub
, autoconf
, gtk2
, libGL
, libGLU
, libSM
, libXinerama
, libXxf86vm
, pkg-config
, xorgproto
, compat24 ? false
, compat26 ? true
, unicode ? true
, withMesa ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms
, AGL
, Carbon
, Cocoa
, Kernel
, QuickTime
, setfile
}:
stdenv.mkDerivation rec {
pname = "wxGTK";
version = "2.9.5";
src = fetchFromGitHub {
owner = "wxWidgets";
repo = "wxWidgets";
rev = "v${version}";
hash = "sha256-izefAPU4lORZxQja7/InHyElJ1++2lDloR+xPudsRNE=";
};
patches = [
# https://github.com/wxWidgets/wxWidgets/issues/17942
./patches/0001-fix-assertion-using-hide-in-destroy.patch
];
nativeBuildInputs = [
autoconf
pkg-config
];
buildInputs = [
gtk2
libSM
libXinerama
libXxf86vm
xorgproto
]
++ lib.optional withMesa libGLU
++ lib.optionals stdenv.isDarwin [
Carbon
Cocoa
Kernel
QuickTime
setfile
];
propagatedBuildInputs = lib.optional stdenv.isDarwin AGL;
configureFlags = [
"--disable-precomp-headers"
"--enable-gtk2"
(if compat24 then "--enable-compat24" else "--disable-compat24")
(if compat26 then "--enable-compat26" else "--disable-compat26")
]
++ lib.optional unicode "--enable-unicode"
++ lib.optional withMesa "--with-opengl"
++ lib.optionals stdenv.isDarwin [ # allow building on 64-bit
"--enable-universal-binaries"
"--with-cocoa"
"--with-macosx-version-min=10.7"
];
SEARCH_LIB = "${libGLU.out}/lib ${libGL.out}/lib ";
preConfigure = ''
./autogen.sh
substituteInPlace configure --replace \
'SEARCH_INCLUDE=' 'DUMMY_SEARCH_INCLUDE='
substituteInPlace configure --replace \
'SEARCH_LIB=' 'DUMMY_SEARCH_LIB='
substituteInPlace configure --replace \
/usr /no-such-path
'' + lib.optionalString stdenv.isDarwin ''
substituteInPlace configure --replace \
'ac_cv_prog_SETFILE="/Developer/Tools/SetFile"' \
'ac_cv_prog_SETFILE="${setfile}/bin/SetFile"'
substituteInPlace configure --replace \
"-framework System" "-lSystem"
'';
postInstall = ''
pushd $out/include
ln -s wx-*/* .
popd
'';
enableParallelBuilding = true;
meta = with lib; {
homepage = "https://www.wxwidgets.org/";
description = "A Cross-Platform C++ GUI Library";
longDescription = ''
wxWidgets gives you a single, easy-to-use API for writing GUI applications
on multiple platforms that still utilize the native platform's controls
and utilities. Link with the appropriate library for your platform and
compiler, and your application will adopt the look and feel appropriate to
that platform. On top of great GUI functionality, wxWidgets gives you:
online help, network programming, streams, clipboard and drag and drop,
multithreading, image loading and saving in a variety of popular formats,
database support, HTML viewing and printing, and much more.
'';
license = licenses.wxWindows;
maintainers = with maintainers; [ ];
platforms = platforms.darwin ++ platforms.linux;
badPlatforms = [ "x86_64-darwin" ];
};
passthru = {
inherit compat24 compat26 unicode;
gtk = gtk2;
};
}

22
pkgs/development/libraries/xmlsec/default.nix
View File

@ -22,15 +22,20 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkg-config ];
buildInputs = [ libxml2 gnutls libxslt libgcrypt libtool openssl nss ];
buildInputs = [ libxml2 gnutls libgcrypt libtool openssl nss ];
propagatedBuildInputs = [
# required by xmlsec/transforms.h
libxslt
];
enableParallelBuilding = true;
doCheck = true;
checkInputs = [ nss.tools ];
preCheck = ''
substituteInPlace tests/testrun.sh \
--replace 'timestamp=`date +%Y%m%d_%H%M%S`' 'timestamp=19700101_000000' \
--replace 'TMPFOLDER=/tmp' '$(mktemp -d)'
substituteInPlace tests/testrun.sh \
--replace 'timestamp=`date +%Y%m%d_%H%M%S`' 'timestamp=19700101_000000' \
--replace 'TMPFOLDER=/tmp' '$(mktemp -d)'
'';
# enable deprecated soap headers required by lasso
@ -67,13 +72,14 @@ stdenv.mkDerivation rec {
touch $out
'';
meta = {
meta = with lib; {
description = "XML Security Library in C based on libxml2";
homepage = "http://www.aleksey.com/xmlsec";
homepage = "https://www.aleksey.com/xmlsec/";
downloadPage = "https://www.aleksey.com/xmlsec/download.html";
license = lib.licenses.mit;
license = licenses.mit;
mainProgram = "xmlsec1";
platforms = with lib.platforms; linux ++ darwin;
maintainers = with maintainers; [ ];
platforms = with platforms; linux ++ darwin;
};
}
)

1
pkgs/development/node-packages/main-programs.nix
View File

@ -57,6 +57,7 @@
kaput-cli = "kaput";
leetcode-cli = "leetcode";
less = "lessc";
localtunnel = "lt";
lua-fmt = "luafmt";
markdownlint-cli = "markdownlint";
near-cli = "near";

2
pkgs/development/node-packages/node-packages.json
View File

@ -124,6 +124,7 @@
, "@electron-forge/cli"
, "eas-cli"
, "elm-oracle"
, "elm-test"
, "emoj"
, "emojione"
, {"epgstation": "../../applications/video/epgstation"}
@ -208,6 +209,7 @@
, "less-plugin-clean-css"
, "live-server"
, "livedown"
, "localtunnel"
, "lodash"
, "lua-fmt"
, "lv_font_conv"

4279
pkgs/development/node-packages/node-packages.nix generated
View File

File diff suppressed because it is too large Load Diff

4
pkgs/development/python-modules/aiohomekit/default.nix
View File

@ -18,7 +18,7 @@
buildPythonPackage rec {
pname = "aiohomekit";
version = "2.2.17";
version = "2.2.18";
format = "pyproject";
disabled = pythonOlder "3.9";
@ -27,7 +27,7 @@ buildPythonPackage rec {
owner = "Jc2k";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-eqLWHa7qUZ6UzNr9onwF2xmntKwdbNMWt2KvwG3kQjc=";
hash = "sha256-yE3+1dhgqgqmoBhBVsivXvn7MTKaY8FYiyqBRkg3h1U=";
};
nativeBuildInputs = [

4
pkgs/development/python-modules/aiopyarr/default.nix
View File

@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "aiopyarr";
version = "22.10.0";
version = "22.11.0";
format = "setuptools";
disabled = pythonOlder "3.9";
@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "tkdrob";
repo = pname;
rev = version;
hash = "sha256-FpBKhxFFMG5WgQ3TCAcg1P+cGVGU7LiJ+Zr4kL2Nl88=";
hash = "sha256-8/ixL4ByaBYoPbB4g+Rgx+5OM6vjrFTUEPR42wBKyyg=";
};
propagatedBuildInputs = [

24
pkgs/development/python-modules/ansible-doctor/default.nix
View File

@ -12,12 +12,13 @@
, poetry-core
, python-json-logger
, pythonOlder
, pythonRelaxDepsHook
, ruamel-yaml
}:
buildPythonPackage rec {
pname = "ansible-doctor";
version = "1.4.5";
version = "1.4.6";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -26,11 +27,19 @@ buildPythonPackage rec {
owner = "thegeeklab";
repo = "ansible-doctor";
rev = "refs/tags/v${version}";
hash = "sha256-Bqe5dqD9VEgkkIGtpkLnCf3KTziCYb5HQdMJaskALWE=";
hash = "sha256-76IYH9IWeHU+PAtpLFGT5f8oG2roY3raW0NC3KUnFls=";
};
pythonRelaxDeps = true;
postPatch = ''
substituteInPlace pyproject.toml \
--replace 'version = "0.0.0"' 'version = "${version}"'
'';
nativeBuildInputs = [
poetry-core
pythonRelaxDepsHook
];
propagatedBuildInputs = [
@ -50,17 +59,6 @@ buildPythonPackage rec {
rm $out/lib/python*/site-packages/LICENSE
'';
postPatch = ''
substituteInPlace pyproject.toml \
--replace 'version = "0.0.0"' 'version = "${version}"' \
--replace 'Jinja2 = "3.1.2"' 'Jinja2 = "*"' \
--replace 'anyconfig = "0.13.0"' 'anyconfig = "*"' \
--replace 'environs = "9.5.0"' 'environs = "*"' \
--replace 'jsonschema = "4.15.0"' 'jsonschema = "*"' \
--replace '"ruamel.yaml" = "0.17.21"' '"ruamel.yaml" = "*"' \
--replace 'python-json-logger = "2.0.4"' 'python-json-logger = "*"'
'';
# Module has no tests
doCheck = false;

7
pkgs/development/python-modules/apprise/default.nix
View File

@ -14,7 +14,6 @@
, pyyaml
, requests
, requests-oauthlib
, six
, slixmpp
}:
@ -42,7 +41,6 @@ buildPythonPackage rec {
pyyaml
requests
requests-oauthlib
six
];
checkInputs = [
@ -58,6 +56,11 @@ buildPythonPackage rec {
"test_plugin_mqtt_general"
];
disabledTestPaths = [
# AttributeError: module 'apprise.plugins' has no attribute 'NotifyBulkSMS'
"test/test_plugin_bulksms.py"
];
postInstall = ''
installManPage packaging/man/apprise.1
'';

6
pkgs/development/python-modules/asteval/default.nix
View File

@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "asteval";
version = "0.9.27";
version = "0.9.28";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -16,8 +16,8 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "newville";
repo = pname;
rev = version;
hash = "sha256-FxWs4l9bqZoqdyhpVRys8Mo9Wdtn1fm5XonisPscWEs=";
rev = "refs/tags/${version}";
hash = "sha256-J35AqVSFpIsw0XThbLCJjS9NFRFeyYV/YrwdfcOrFhk=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;

4
pkgs/development/python-modules/async-upnp-client/default.nix
View File

@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "async-upnp-client";
version = "0.32.1";
version = "0.32.2";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "StevenLooman";
repo = "async_upnp_client";
rev = version;
sha256 = "sha256-T/8AZU95eHl/AIVkG9tYhN19B8PLvTWRTBRJjbvfI+8=";
sha256 = "sha256-KnbHQ/xHPNYQWk/EpdP6a0bEHvCXK/HrFGyGaeS79rc=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/awkward/default.nix
View File

@ -13,14 +13,14 @@
buildPythonPackage rec {
pname = "awkward";
version = "1.10.1";
version = "1.10.2";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-xjlO0l+xSghtY2IdnYT9wij11CpkWG8hVzGzb94XA0s=";
hash = "sha256-MDvAkZ8JMts+eKklTBf83rEl5L5lzYlLQN+8O/3fwFQ=";
};
nativeBuildInputs = [

4
pkgs/development/python-modules/azure-identity/default.nix
View File

@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "azure-identity";
version = "1.11.0";
version = "1.12.0";
format = "setuptools";
disabled = pythonOlder "3.6";
@ -23,7 +23,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
extension = "zip";
hash = "sha256-w/yACvWLhX5/rw4xA3bl7xD12tUJCRTMQv+m19I7Zyk=";
hash = "sha256-f5sa59l+p68/ON0JMF4Zq4Gh4Wq2bqGGtledhcHKI0c=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/bleak-retry-connector/default.nix
View File

@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "bleak-retry-connector";
version = "2.8.2";
version = "2.8.3";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "Bluetooth-Devices";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-u/7gEY1HsOc2JqGmq/kS46wcA0p8B7D08vrOHWIuFyY=";
hash = "sha256-XBIBI/39l0JOJOX5GChTJ+Snwb9jjfofmM4cAdsV8lg=";
};
postPatch = ''

4
pkgs/development/python-modules/bleak/default.nix
View File

@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "bleak";
version = "0.19.1";
version = "0.19.4";
format = "pyproject";
disabled = pythonOlder "3.8";
@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "hbldh";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-WNFAN8xE0ULo4fQnPFJJsc/HtrVo1ClxsvxrrhJjvI0=";
hash = "sha256-Sdgsf1gFA0UcyFuaScwqmvHV2E6Crb6vSQgUbBox5hw=";
};
nativeBuildInputs = [

4
pkgs/development/python-modules/bthome-ble/default.nix
View File

@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "bthome-ble";
version = "2.2.0";
version = "2.2.1";
format = "pyproject";
disabled = pythonOlder "3.9";
@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "Bluetooth-Devices";
repo = pname;
rev = "v${version}";
hash = "sha256-jjFYJ6EF4G43EOKCdkE1KQqaV2aGD+HMh1tOxHWUn8k=";
hash = "sha256-IaDnQCZJZipiPW6lOLrdxw7QfPx/zlwaizkBxv8I2V8=";
};
nativeBuildInputs = [

45
pkgs/development/python-modules/datasette-publish-fly/default.nix Normal file
View File

@ -0,0 +1,45 @@
{ lib
, buildPythonPackage
, cogapp
, datasette
, fetchFromGitHub
, pytest-mock
, pytestCheckHook
, pythonOlder
}:
buildPythonPackage rec {
pname = "datasette-publish-fly";
version = "1.2";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "simonw";
repo = pname;
rev = version;
hash = "sha256-0frP/RkpZX6LCR8cOlzcBG3pbcOh0KPuELlYUXS3dRE=";
};
propagatedBuildInputs = [
datasette
];
checkInputs = [
cogapp
pytest-mock
pytestCheckHook
];
pythonImportsCheck = [
"datasette_publish_fly"
];
meta = with lib; {
description = "Datasette plugin for publishing data using Fly";
homepage = "https://datasette.io/plugins/datasette-publish-fly";
license = licenses.asl20;
maintainers = with maintainers; [ fab ];
};
}

4
pkgs/development/python-modules/deep-translator/default.nix
View File

@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "deep-translator";
version = "1.9.0";
version = "1.9.1";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-wPpVVopbvuw7wreZ4f0HLz9/NJgyYYIFttw4rhJC1xo=";
sha256 = "sha256-goLc/4BbVKUkH+csggKm6EKHmRVbv4i0Aq7N+/5WnmU=";
};
propagatedBuildInputs = [

39
pkgs/development/python-modules/dm-sonnet/default.nix
View File

@ -1,40 +1,45 @@
{ lib
, fetchFromGitHub
, buildPythonPackage
, numpy
, tabulate
, six
, dm-tree
, absl-py
, wrapt
, buildPythonPackage
, dm-tree
, docutils
, etils
, fetchFromGitHub
, numpy
, pythonOlder
, tabulate
, tensorflow
, tensorflow-datasets }:
, tensorflow-datasets
, wrapt
}:
buildPythonPackage rec {
pname = "dm-sonnet";
version = "2.0.0";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "deepmind";
repo = "sonnet";
rev = "v${version}";
sha256 = "sha256-YSMeH5ZTfP1OdLBepsxXAVczBG/ghSjCWjoz/I+TFl8=";
hash = "sha256-YSMeH5ZTfP1OdLBepsxXAVczBG/ghSjCWjoz/I+TFl8=";
};
buildInputs = [
absl-py
propagatedBuildInputs = [
dm-tree
etils
numpy
six
tabulate
wrapt
];
] ++ etils.optional-dependencies.epath;
propagatedBuildInputs = [
tabulate
tensorflow
];
passthru.optional-dependencies = {
tensorflow = [
tensorflow
];
};
checkInputs = [
docutils

13
pkgs/development/python-modules/docker/default.nix
View File

@ -14,13 +14,14 @@
buildPythonPackage rec {
pname = "docker";
version = "6.0.0";
version = "6.0.1";
format = "pyproject";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-GeMwRwr0AWfSk7A1JXjB+iLXSzTT7fXU/5DrwgO7svE=";
hash = "sha256-iWxCguXHr1xF6LaDsLDDOTKXT+blD8aQagqDYWqz2pc=";
};
nativeBuildInputs = [
@ -47,10 +48,16 @@ buildPythonPackage rec {
];
# Deselect socket tests on Darwin because it hits the path length limit for a Unix domain socket
disabledTests = lib.optionals stdenv.isDarwin [ "api_test" "stream_response" "socket_file" ];
disabledTests = lib.optionals stdenv.isDarwin [
"api_test" "stream_response" "socket_file"
];
dontUseSetuptoolsCheck = true;
pythonImportsCheck = [
"docker"
];
meta = with lib; {
description = "An API client for docker written in Python";
homepage = "https://github.com/docker/docker-py";

4
pkgs/development/python-modules/google-cloud-bigtable/default.nix
View File

@ -13,14 +13,14 @@
buildPythonPackage rec {
pname = "google-cloud-bigtable";
version = "2.11.3";
version = "2.13.2";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-noAGxYaQW9XBlHcHN25V/b2ScpnvjSnKdWVkAY0KbiY=";
hash = "sha256-a0R8CefN6gtIYqtNdCW9QKJulsbDnH6dFuUfTp8jUnA=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/google-cloud-spanner/default.nix
View File

@ -15,14 +15,14 @@
buildPythonPackage rec {
pname = "google-cloud-spanner";
version = "3.22.2";
version = "3.23.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-l8HB0gfWM0ABHiIE5Ej6PMvZ7MRRAumUOj5lmSoTbmI=";
hash = "sha256-1RHzpCRYU2dUxZLa+zzopHd+xfnq7eWF6HDIkVk+2NY=";
};
propagatedBuildInputs = [

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