JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into haskell-updates

Browse Source
This commit is contained in:
Malte Brandy 2021-05-13 14:15:19 +02:00
commit 814c7e8ce3
No known key found for this signature in database
GPG Key ID: 226A2D41EF5378C9
95 changed files with 1297 additions and 396 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.github/labeler.yml vendored
View File

@ -36,11 +36,11 @@
"6.topic: GNOME":
- doc/languages-frameworks/gnome.section.md
- nixos/modules/services/desktops/gnome3/**/*
- nixos/modules/services/x11/desktop-managers/gnome3.nix
- nixos/tests/gnome3-xorg.nix
- nixos/tests/gnome3.nix
- pkgs/desktops/gnome-3/**/*
- nixos/modules/services/desktops/gnome/**/*
- nixos/modules/services/x11/desktop-managers/gnome.nix
- nixos/tests/gnome-xorg.nix
- nixos/tests/gnome.nix
- pkgs/desktops/gnome/**/*
"6.topic: golang":
- doc/languages-frameworks/go.section.md

12
maintainers/maintainer-list.nix
View File

@ -1322,6 +1322,12 @@
github = "bmilanov";
githubId = 30090366;
};
bmwalters = {
name = "Bradley Walters";
email = "oss@walters.app";
github = "bmwalters";
githubId = 4380777;
};
bobakker = {
email = "bobakk3r@gmail.com";
github = "bobakker";
@ -6380,6 +6386,12 @@
fingerprint = "D709 03C8 0BE9 ACDC 14F0 3BFB 77BF E531 397E DE94";
}];
};
mdsp = {
github = "Mdsp9070";
githubId = 44469426;
name = "Matheus de Souza Pessanha";
email = "matheus_pessanha2001@outlook.com";
};
meatcar = {
email = "nixpkgs@denys.me";
github = "meatcar";

23
nixos/modules/services/video/mirakurun.nix
View File

@ -8,6 +8,18 @@ let
username = config.users.users.mirakurun.name;
groupname = config.users.users.mirakurun.group;
settingsFmt = pkgs.formats.yaml {};
polkitRule = pkgs.writeTextDir "share/polkit-1/rules.d/10-mirakurun.rules" ''
polkit.addRule(function (action, subject) {
if (
(action.id == "org.debian.pcsc-lite.access_pcsc" ||
action.id == "org.debian.pcsc-lite.access_card") &&
subject.user == "${username}"
) {
return polkit.Result.YES;
}
});
'';
in
{
options = {
@ -48,6 +60,15 @@ in
'';
};
allowSmartCardAccess = mkOption {
type = types.bool;
default = true;
description = ''
Install polkit rules to allow Mirakurun to access smart card readers
which is commonly used along with tuner devices.
'';
};
serverSettings = mkOption {
type = settingsFmt.type;
default = {};
@ -110,7 +131,7 @@ in
};
config = mkIf cfg.enable {
environment.systemPackages = [ mirakurun ];
environment.systemPackages = [ mirakurun ] ++ optional cfg.allowSmartCardAccess polkitRule;
environment.etc = {
"mirakurun/server.yml".source = settingsFmt.generate "server.yml" cfg.serverSettings;
"mirakurun/tuners.yml" = mkIf (cfg.tunerSettings != null) {

40
pkgs/applications/editors/emacs-modes/sunrise-commander/default.nix
View File

@ -1,30 +1,42 @@
{ lib, stdenv, fetchgit, emacs }:
{ lib
, stdenv
, fetchFromGitHub
, emacs
}:
stdenv.mkDerivation {
name = "sunrise-commander-6r435";
stdenv.mkDerivation rec {
pname = "sunrise-commander";
version = "0.0.0-unstable=2021-04-23";
src = fetchgit {
url = "https://github.com/escherdragon/sunrise-commander.git";
rev = "7a44ca7abd9fe79f87934c78d00dc2a91419a4f1";
sha256 = "2909beccc9daaa79e70876ac6547088c2459b624c364dda1886fe4d7adc7708b";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "db880fbea03d2db00db1398c91918c3c6f0392e3";
hash = "sha256-IGHCKYQaGUapaA9vxq0xO58KCpBPOiQpHqrEaHK0usE=";
};
buildInputs = [ emacs ];
buildInputs = [
emacs
];
buildPhase = ''
emacs -L . --batch -f batch-byte-compile *.el
runHook preBuild
emacs -q --no-splash --directory=. --batch --file=batch-byte-compile *.el
runHook postBuild
'';
installPhase = ''
runHook preInstall
mkdir -p $out/share/emacs/site-lisp
install *.el* $out/share/emacs/site-lisp
runHook postInstall
'';
meta = {
meta = with lib; {
homepage = "https://github.com/sunrise-commander/sunrise-commander/";
description = "Two-pane file manager for Emacs based on Dired and inspired by MC";
homepage = "http://www.emacswiki.org/emacs/Sunrise_Commander";
license = lib.licenses.gpl3Plus;
platforms = lib.platforms.all;
license = licenses.gpl3Plus;
maintainers = [ maintainers.AndersonTorres ];
platforms = platforms.all;
};
}

2
pkgs/applications/editors/supertux-editor/default.nix
View File

@ -34,7 +34,7 @@ stdenv.mkDerivation {
description = "Level editor for SuperTux";
homepage = "https://github.com/SuperTux/supertux-editor";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ mathnerd314 ];
platforms = platforms.linux;
broken = true;
};
}

10
pkgs/applications/editors/vscode/vscode.nix
View File

@ -13,10 +13,10 @@ let
archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz";
sha256 = {
x86_64-linux = "0v1g7j5q2j86c3r7jib8xs1sf2h3xvwv1s0xsqbig480fchlshjg";
x86_64-darwin = "109529acrvyassq00mbhnwbxq7rfq9n69rgcw4n0rysgp8n58386";
aarch64-linux = "0p6pz9apbfmr4pf7fikp2rmvk5gr87md1zrhr6hhd1qwgpc9kl07";
armv7l-linux = "1qrp75nbzgqp7mv42m6wbj000l33rhfv7cnxdv6lp6cy05381aq6";
x86_64-linux = "0l4lx5h2daw9c5vl4kz6sq2i58b45xy4948x4q0wnwbqdqlqc9s4";
x86_64-darwin = "0qqgs7vns52bz9xkys822sjjkvyq4l20iipz6sx5kinxg6h04jyy";
aarch64-linux = "1gnh5kk4r0kfik9yfvvcbavhws4n8kn89kyl2qzpa2ryy52kk81j";
armv7l-linux = "0zz5fn9nxq58i3svhgc25s6fdz7i3rxc0naflyx1jzmpzipp4v6n";
}.${system};
in
callPackage ./generic.nix rec {
@ -25,7 +25,7 @@ in
# Please backport all compatible updates to the stable release.
# This is important for the extension ecosystem.
version = "1.56.0";
version = "1.56.1";
pname = "vscode";
executableName = "code" + lib.optionalString isInsiders "-insiders";

10
pkgs/applications/editors/vscode/vscodium.nix
View File

@ -13,10 +13,10 @@ let
archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz";
sha256 = {
x86_64-linux = "01bg6bjjbbdywd7r13safa5nxx1y9a8zia7q6z5anc60hfylvhd2";
x86_64-darwin = "0xkzxlp45f9vl9yrrk8fynwpsv85yjmsp6ylm2fbmfddf9bqkjsb";
aarch64-linux = "028g359jrbs1hbxwq4gqq1s08vv38i3x52vjalqrpc6b0wc5cc2w";
armv7l-linux = "06w5h7q799b9kwagi6w3320yjdp66cwr6d0dd7sl4sirqnrap0i4";
x86_64-linux = "1p68fvlr2fwrwr61gfrna3hjzgyazacr373hldbc4fxca3fdij76";
x86_64-darwin = "0wyihr2yfzjaypsa682zdklfxn3m7zca81brkzdvrndw24hdcl8m";
aarch64-linux = "0iw471n1fl8m2x06n2rdbkiwzhlc7lhk99vyql3z4fi0zyjy3pbn";
armv7l-linux = "0dx1icp245cfx3hkkpzzgfg9y8sv45llx35s03w1zzga2h2vhm3a";
}.${system};
sourceRoot = {
@ -33,7 +33,7 @@ in
# Please backport all compatible updates to the stable release.
# This is important for the extension ecosystem.
version = "1.56.0";
version = "1.56.1";
pname = "vscodium";
executableName = "codium";

2
pkgs/applications/misc/1password/default.nix
View File

@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
unpackPhase = lib.optionalString stdenv.isDarwin ''
xar -xf $src
zcat Payload | cpio -i
zcat op.pkg/Payload | cpio -i
'';
installPhase = ''

2
pkgs/applications/misc/jekyll/default.nix
View File

@ -49,7 +49,7 @@ in bundlerApp {
homepage = "https://jekyllrb.com/";
#changelog = "https://raw.githubusercontent.com/jekyll/jekyll/v${version}/History.markdown";
license = licenses.mit;
maintainers = with maintainers; [ primeos pesterhazy ];
maintainers = with maintainers; [ pesterhazy ];
platforms = platforms.unix;
};
}

30
pkgs/applications/networking/browsers/chromium/common.nix
View File

@ -7,7 +7,7 @@
, xdg-utils, yasm, nasm, minizip, libwebp
, libusb1, pciutils, nss, re2
, python2Packages, python3Packages, perl, pkg-config
, python2, python3, perl, pkg-config
, nspr, systemd, libkrb5
, util-linux, alsaLib
, bison, gperf
@ -43,16 +43,12 @@ with lib;
let
jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
# TODO: Python 3 support is incomplete and "python3 ../../build/util/python2_action.py"
# currently doesn't work due to mixed Python 2/3 dependencies:
pythonPackages = if chromiumVersionAtLeast "93"
then python3Packages
else python2Packages;
forcePython3Patch = (githubPatch
# Reland #8 of "Force Python 3 to be used in build."":
"a2d3c362802d9e6b62f895fcda75a3695b77b1b8"
"1r9spr2wmjk9x9l3m1gzn6692mlvbxdz0r5hlr5rfwiwr900rxi2"
);
python2WithPackages = python2.withPackages(ps: with ps; [
ply jinja2 setuptools
]);
python3WithPackages = python3.withPackages(ps: with ps; [
ply jinja2 setuptools
]);
# The additional attributes for creating derivations based on the chromium
# source tree.
@ -138,10 +134,12 @@ let
};
nativeBuildInputs = [
ninja pkg-config
python2WithPackages perl nodejs
gnutar which
llvmPackages.lldClang.bintools
ninja which pythonPackages.python perl pkg-config
pythonPackages.ply pythonPackages.jinja2 nodejs
gnutar pythonPackages.setuptools
] ++ lib.optionals (chromiumVersionAtLeast "92") [
python3WithPackages
];
buildInputs = defaultDependencies ++ [
@ -174,8 +172,6 @@ let
postPatch = lib.optionalString (chromiumVersionAtLeast "91") ''
# Required for patchShebangs (unsupported):
chmod -x third_party/webgpu-cts/src/tools/deno
'' + optionalString (chromiumVersionAtLeast "92") ''
patch -p1 --reverse < ${forcePython3Patch}
'' + ''
# remove unused third-party
for lib in ${toString gnSystemLibraries}; do
@ -313,7 +309,7 @@ let
# This is to ensure expansion of $out.
libExecPath="${libExecPath}"
python build/linux/unbundle/replace_gn_files.py --system-libraries ${toString gnSystemLibraries}
${python2}/bin/python2 build/linux/unbundle/replace_gn_files.py --system-libraries ${toString gnSystemLibraries}
${gnChromium}/bin/gn gen --args=${escapeShellArg gnFlags} out/Release | tee gn-gen-outputs.txt
# Fail if `gn gen` contains a WARNING.

18
pkgs/applications/networking/browsers/chromium/upstream-info.json
View File

@ -18,9 +18,9 @@
}
},
"beta": {
"version": "91.0.4472.38",
"sha256": "13kikqyxs7p25j7mxnr42614y92vmwsjqfd51dwdjh7wc2hb644a",
"sha256bin64": "1kjawp7q6r1r50h69jwrw84gqrya1jc8bq6x7bdplxlzgvy9qs3z",
"version": "91.0.4472.57",
"sha256": "1kbd5zyi5ndbln5pibdg3yhv65m84arfwfv4v00js3cbr13pyjzv",
"sha256bin64": "1bk30b9kn5bxp4yywdiy3dqd6km5q3rrf2z82kd1qyr9cc45hz8s",
"deps": {
"gn": {
"version": "2021-04-06",
@ -31,15 +31,15 @@
}
},
"dev": {
"version": "92.0.4496.0",
"sha256": "1kk1bybl6nx3z80agyljsvdb7yi3nna14aag71xhv4n6pygqfgdi",
"sha256bin64": "0b12ab20g5vay9x8j1zpj9zapdmm3him7rrm15jvsdakn60czdpr",
"version": "92.0.4503.0",
"sha256": "1fp4xz6x80m3ipcy4myzazyy1yj95qamyl6wf38mk2i6302gi2gb",
"sha256bin64": "0fwq8rn3v1dijj9xh6z7jw3xx2ihq0qcyh3bbcdd066w5ny6padm",
"deps": {
"gn": {
"version": "2021-04-29",
"version": "2021-05-07",
"url": "https://gn.googlesource.com/gn",
"rev": "6771ce569fb4803dad7a427aa2e2c23e960b917e",
"sha256": "0lv1zs38qr862hwxrd3g6wz3l6v8j6p7b60nxyc5fhiglqxqz0im"
"rev": "39a87c0b36310bdf06b692c098f199a0d97fc810",
"sha256": "0x63jr5hssm9dl6la4q5ahy669k4gxvbapqxi5w32vv107jrj8v4"
}
}
},

28
pkgs/applications/networking/cluster/k3s/default.nix
View File

@ -44,14 +44,16 @@ with lib;
# Those pieces of software we entirely ignore upstream's handling of, and just
# make sure they're in the path if desired.
let
k3sVersion = "1.20.6+k3s1"; # k3s git tag
traefikChartVersion = "1.81.0"; # taken from ./scripts/download at the above k3s tag
k3sRootVersion = "0.8.1"; # taken from ./scripts/download at the above k3s tag
k3sCNIVersion = "0.8.6-k3s1"; # taken from ./scripts/version.sh at the above k3s tag
k3sVersion = "1.21.0+k3s1"; # k3s git tag
k3sCommit = "2705431d9645d128441c578309574cd262285ae6"; # k3s git commit at the above version
traefikChartVersion = "9.18.2"; # taken from ./scripts/download at TRAEFIK_VERSION
k3sRootVersion = "0.8.1"; # taken from ./scripts/download at ROOT_VERSION
k3sCNIVersion = "0.8.6-k3s1"; # taken from ./scripts/version.sh at VERSION_CNIPLUGINS
# bundled into the k3s binary
traefikChart = fetchurl {
url = "https://kubernetes-charts.storage.googleapis.com/traefik-${traefikChartVersion}.tgz";
sha256 = "1aqpzgjlvqhil0g3angz94zd4xbl4iq0qmpjcy5aq1xv9qciwdi9";
url = "https://helm.traefik.io/traefik/traefik-${traefikChartVersion}.tgz";
sha256 = "sha256-9d7p0ngyMN27u4OPgz7yI14Zj9y36t9o/HMX5wyDpUI=";
};
# so, k3s is a complicated thing to package
# This derivation attempts to avoid including any random binaries from the
@ -95,8 +97,7 @@ let
k3sRepo = fetchgit {
url = "https://github.com/k3s-io/k3s";
rev = "v${k3sVersion}";
leaveDotGit = true; # ./scripts/version.sh depends on git
sha256 = "sha256-IIZotJKQ/+WNmfcEJU5wFtZBufWjUp4MeVCRk4tSjyQ=";
sha256 = "sha256-xsXxf2ZYrkpOHlSFqTsHwWF3kChUjxWRjyDR3Dhg2ho=";
};
# Stage 1 of the k3s build:
# Let's talk about how k3s is structured.
@ -134,9 +135,13 @@ let
# those.
patches = [ ./patches/0002-Add-nixpkgs-patches.patch ];
nativeBuildInputs = [ git pkg-config ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ libseccomp ];
# Versioning info for build script
DRONE_TAG = "v${version}";
DRONE_COMMIT = k3sCommit;
buildPhase = ''
pushd go/src/${goPackagePath}
@ -175,7 +180,7 @@ let
# See the above comment in k3sBuildStage1
patches = [ ./patches/0002-Add-nixpkgs-patches.patch ];
nativeBuildInputs = [ git pkg-config zstd ];
nativeBuildInputs = [ pkg-config zstd ];
# These dependencies are embedded as compressed files in k3s at runtime.
# Propagate them to avoid broken runtime references to libraries.
propagatedBuildInputs = [ k3sPlugins k3sBuildStage1 runc ];
@ -186,6 +191,9 @@ let
else if stdenv.hostPlatform.system == "aarch64-linux" then "-arm64"
else throw "k3s isn't being built for ${stdenv.hostPlatform.system} yet.";
DRONE_TAG = "v${version}";
DRONE_COMMIT = k3sCommit;
# In order to build the thick k3s binary (which is what
# ./scripts/package-cli does), we need to get all the binaries that script
# expects in place.

8
pkgs/applications/networking/cluster/octant/default.nix
View File

@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
pname = "octant";
version = "0.19.0";
version = "0.20.0";
src =
let
@ -18,9 +18,9 @@ stdenv.mkDerivation rec {
};
in
fetchsrc version {
x86_64-linux = "sha256-TKvUBof4TLcHr9hg6AOLjVd1NcAX9HHVuuABdFKRNQA=";
aarch64-linux = "sha256-BJb7h6kJZ3QhdlEqNHkiFp91uYLXzYHvKftxEAhjY38=";
x86_64-darwin = "sha256-Ig98IqLmlN9D4iXrP9SXYwTrQOvbtQ/tQW+uEmntm+I=";
x86_64-linux = "sha256-VFlZP5d6/YhzVIhveqMc4HfapBt0K/XjtqjCQNc514A=";
aarch64-linux = "sha256-RfdMfimmoHG4ixBtUVJ/V+mDhQ9aD+yeohkeUMUP8Zg=";
x86_64-darwin = "sha256-2Qgl3RdA4mMRTqR7o3Q86Zip5wtgvFp1vZn689FUtSI=";
};
dontConfigure = true;

6
pkgs/applications/networking/cluster/octant/desktop.nix
View File

@ -2,7 +2,7 @@
let
pname = "octant-desktop";
version = "0.19.0";
version = "0.20.0";
name = "${pname}-${version}";
inherit (stdenv.hostPlatform) system;
@ -15,8 +15,8 @@ let
src = fetchurl {
url = "https://github.com/vmware-tanzu/octant/releases/download/v${version}/Octant-${version}.${suffix}";
sha256 = {
x86_64-linux = "sha256-1XFb0zuyOy8XEUd9hoexItjq4assuWlWIzqw7pZxHx0=";
x86_64-darwin = "sha256-e3v5BFX7wnx4sAQrOq+dBIDVPJYzQZKKvKjSX+dis2U=";
x86_64-linux = "sha256-mPD5qa/IYsakjcoPnWVpkmhgkhnRK0qTGQ6hanzDt/Y=";
x86_64-darwin = "sha256-nxpwBRUeLSPqNEFjF8hKzRhA2ahqh/KyAitnSxYdyJ8=";
}.${system};
};

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

@ -76,28 +76,31 @@
"version": "3.27.0"
},
"azuread": {
"owner": "terraform-providers",
"owner": "hashicorp",
"provider-source-address": "registry.terraform.io/hashicorp/azuread",
"repo": "terraform-provider-azuread",
"rev": "v0.10.0",
"sha256": "0i9xrsqgh1024189hihm2nqrcy2pcyf1bwxnamwmwph5cas6hfb3",
"version": "0.10.0"
"rev": "v1.4.0",
"sha256": "13y0h8af37gfsjhccbfsnj6kqcn61lr1znmsxipjr5h9ka5lc209",
"vendorSha256": null,
"version": "1.4.0"
},
"azurerm": {
"owner": "terraform-providers",
"provider-source-address": "registry.terraform.io/hashicorp/azurerm",
"repo": "terraform-provider-azurerm",
"rev": "v2.13.0",
"sha256": "0aj19vy1flpb2233rxaypjcfimjr1wfqri1m3p15dy1r108q84r7",
"version": "2.13.0"
"rev": "v2.58.0",
"sha256": "1zy3q5d63pz2rdczcs9xnxzasb2jbzhyg8nbk2r252mdnhx6h9vh",
"vendorSha256": null,
"version": "2.58.0"
},
"azurestack": {
"owner": "terraform-providers",
"owner": "hashicorp",
"provider-source-address": "registry.terraform.io/hashicorp/azurestack",
"repo": "terraform-provider-azurestack",
"rev": "v0.9.0",
"sha256": "1msm7jwzry0vmas3l68h6p0migrsm6d18zpxcncv197m8xbvg324",
"version": "0.9.0"
"rev": "v0.10.0",
"sha256": "0lcwrp6n3l1nink06wq2nrirs6k3wwjmya1w06x14pvqqdj1d5c8",
"vendorSha256": null,
"version": "0.10.0"
},
"baiducloud": {
"owner": "terraform-providers",
@ -495,6 +498,7 @@
},
"keycloak": {
"owner": "mrparkers",
"provider-source-address": "registry.terraform.io/mrparkers/keycloak",
"repo": "terraform-provider-keycloak",
"rev": "v3.0.0",
"sha256": "1q9vzmj9c7mznv6al58d3rs5kk1fh28k1qccx46hcbk82z52da3a",

5
pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
View File

@ -25,7 +25,7 @@ let
else "");
in stdenv.mkDerivation rec {
pname = "signal-desktop";
version = "5.0.0"; # Please backport all updates to the stable channel.
version = "5.1.0"; # Please backport all updates to the stable channel.
# All releases have a limited lifetime and "expire" 90 days after the release.
# When releases "expire" the application becomes unusable until an update is
# applied. The expiration date for the current release can be extracted with:
@ -35,7 +35,7 @@ in stdenv.mkDerivation rec {
src = fetchurl {
url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
sha256 = "17hxg61m9kk1kph6ifqy6507kzx5hi6yafr2mj8n0a6c39vc8f9g";
sha256 = "1cirnnxy63jfkl98472k25bn1yp5apa7b5s74r42sxhlwzwkplw1";
};
nativeBuildInputs = [
@ -79,6 +79,7 @@ in stdenv.mkDerivation rec {
pango
systemd
xorg.libxcb
xorg.libxshmfence
];
runtimeDependencies = [

8
pkgs/applications/networking/instant-messengers/wire-desktop/default.nix
View File

@ -22,13 +22,13 @@ let
pname = "wire-desktop";
version = {
x86_64-darwin = "3.24.4059";
x86_64-linux = "3.24.2939";
x86_64-darwin = "3.25.4095";
x86_64-linux = "3.25.2940";
}.${system} or throwSystem;
sha256 = {
x86_64-darwin = "1zjv3d8jp0wldrzl02q9kir7q3y5bcb6hsfli6wip8bmaq78dksy";
x86_64-linux = "1k9n58pr5fnqv9vacay5vrbs4pvq2p36c0dpg9rjdcnb2fwaqg5p";
x86_64-darwin = "01gbmbxs3w7lwsy5wjpr7fgqkb20rj5fv1r3dsmjkfwy45pd835j";
x86_64-linux = "1vb2fy8hijjp0193d32d8hw7h00w6wympf3zc96skk8hz3ks6xz8";
}.${system} or throwSystem;
meta = with lib; {

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

@ -4,13 +4,13 @@ with pythonPackages;
buildPythonApplication rec {
pname = "watson";
version = "2.0.0";
version = "2.0.1";
src = fetchFromGitHub {
owner = "TailorDev";
repo = "Watson";
rev = version;
sha256 = "1yxqjirv7cpg4hqj4l3a53p3p3kl82bcx6drgvl9v849vcc3l7s0";
sha256 = "0radf5afyphmzphfqb4kkixahds2559nr3yaqvni4xrisdaiaymz";
};
postInstall = ''

41
pkgs/applications/terminal-emulators/eterm/default.nix
View File

@ -1,24 +1,41 @@
{ lib, stdenv, fetchurl
, libX11, libXext, libXaw
, pkg-config, imlib2, libast }:
{ lib
, stdenv
, fetchFromGitHub
, autoreconfHook
, imlib2
, libX11
, libXaw
, libXext
, libast
, pkg-config
}:
stdenv.mkDerivation rec {
pname = "eterm";
version = "0.9.6";
srcName = "Eterm-${version}";
version = "0.9.6-unstable=2020-03-03";
src = fetchurl {
url = "http://www.eterm.org/download/${srcName}.tar.gz";
sha256 = "0g71szjklkiczxwzbjjfm59y6v9w4hp8mg7cy99z1g7qcjm0gfbj";
src = fetchFromGitHub {
owner = "mej";
repo = pname;
rev = "e8fb85b56da21113aaf0f5f7987ae647c4413b6c";
sha256 = "sha256-pfXYrd6BamBTcnarvXj+C6D1WyGtj87GrW+Dl6AeiDE=";
};
nativeBuildInputs = [ pkg-config ];
buildInputs = [ libX11 libXext libXaw imlib2 ];
propagatedBuildInputs = [ libast ];
nativeBuildInputs = [
autoreconfHook
pkg-config
];
buildInputs = [
imlib2
libX11
libXaw
libXext
libast
];
meta = with lib; {
description = "Terminal emulator";
homepage = "http://www.eterm.org";
description = "Terminal emulator";
license = licenses.bsd2;
maintainers = [ maintainers.AndersonTorres ];
platforms = platforms.linux;

6
pkgs/applications/window-managers/i3/status-rust.nix
View File

@ -12,16 +12,16 @@
rustPlatform.buildRustPackage rec {
pname = "i3status-rust";
version = "0.20.0";
version = "0.20.1";
src = fetchFromGitHub {
owner = "greshake";
repo = pname;
rev = "v${version}";
sha256 = "sha256-rio+3S3bA8KfosKAE9Txzftr/q2PVyd8Z9crz1O/ysc=";
sha256 = "00gzm3g297s9bfp13vnb623p7dfac3g6cdhz2b3lc6l0kmnnqs1s";
};
cargoSha256 = "sha256-17bIeK/mPE+rAO/c65IWvMGqAU6sOClJQC8z+O36cmU=";
cargoSha256 = "1dpklyv1b9h4n4k3ar5qbzivds8r4mml76986ic8zj71fy5fxn08";
nativeBuildInputs = [ pkg-config makeWrapper ];

6
pkgs/applications/window-managers/icewm/default.nix
View File

@ -39,13 +39,13 @@
stdenv.mkDerivation rec {
pname = "icewm";
version = "2.2.0";
version = "2.3.4";
src = fetchFromGitHub {
owner = "bbidulock";
owner = "ice-wm";
repo = pname;
rev = version;
hash = "sha256-STM8t311lf0xIqs2Onmwg48xgE7V9VZrUfJrUzYRxL4=";
hash = "sha256-UyLefj0eY/m3Of51NdhMNMq3z+kaLK28zDe63hbDK5A=";
};
nativeBuildInputs = [

15
pkgs/applications/window-managers/taffybar/default.nix
View File

@ -1,7 +1,7 @@
{ lib, stdenv, haskellPackages, makeWrapper, packages ? (x: []) }:
{ lib, stdenv, ghcWithPackages, taffybar, makeWrapper, packages ? (x: []) }:
let
taffybarEnv = haskellPackages.ghc.withPackages (self: [
taffybarEnv = ghcWithPackages (self: [
self.taffybar
] ++ packages self);
in stdenv.mkDerivation {
@ -15,5 +15,14 @@ in stdenv.mkDerivation {
--set NIX_GHC "${taffybarEnv}/bin/ghc"
'';
inherit (haskellPackages.taffybar) meta;
# Trivial derivation
preferLocalBuild = true;
allowSubstitutes = false;
# For hacking purposes
passthru.env = taffybarEnv;
buildInputs = [ taffybarEnv ];
shellHook = "eval $(egrep ^export ${taffybarEnv}/bin/ghc)";
inherit (taffybar) meta;
}

2
pkgs/development/beam-modules/default.nix
View File

@ -35,6 +35,8 @@ let
fetchMixDeps = callPackage ./fetch-mix-deps.nix { };
mixRelease = callPackage ./mix-release.nix { };
erlang-ls = callPackage ./erlang-ls { };
# BEAM-based languages.
elixir = elixir_1_11;

34
pkgs/development/beam-modules/erlang-ls/default.nix Normal file
View File

@ -0,0 +1,34 @@
{ fetchFromGitHub, fetchHex, stdenv, rebar3WithPlugins, lib }:
let
version = "0.15.0";
owner = "erlang-ls";
repo = "erlang_ls";
deps = import ./rebar-deps.nix { inherit fetchHex fetchFromGitHub; };
in stdenv.mkDerivation {
inherit version;
pname = "erlang-ls";
buildInputs = [ (rebar3WithPlugins { }) ];
src = fetchFromGitHub {
inherit owner repo;
sha256 = "1s6zk8r5plm7ajifz17mvfrnk5mzbhj7alayink9phqbmzrypnfg";
rev = version;
};
buildPhase = ''
mkdir _checkouts
${toString (lib.mapAttrsToList (k: v: ''
cp -R ${v} _checkouts/${k}
'') deps)}
make
'';
installPhase = ''
mkdir -p $out/bin
cp _build/default/bin/erlang_ls $out/bin/
cp _build/dap/bin/els_dap $out/bin/
'';
meta = with lib; {
homepage = "https://github.com/erlang-ls/erlang_ls";
description = "The Erlang Language Server";
platforms = platforms.unix;
license = licenses.asl20;
};
}

90
pkgs/development/beam-modules/erlang-ls/rebar-deps.nix Normal file
View File

@ -0,0 +1,90 @@
# Generated by rebar3_nix
{ fetchHex, fetchFromGitHub }:
{
getopt = fetchHex {
pkg = "getopt";
version = "1.0.1";
sha256 = "sha256-U+Grg7nOtlyWctPno1uAkum9ybPugHIUcaFhwQxZlZw=";
};
zipper = fetchHex {
pkg = "zipper";
version = "1.0.1";
sha256 = "sha256-ah/T4fDMHR31ZCyaDOIXgDZBGwpclkKFHR2idr1zfC0=";
};
quickrand = fetchHex {
pkg = "quickrand";
version = "2.0.1";
sha256 = "sha256-FNtn1K72uIFYEOyfPM714yS3O1bK42h/mddSuFvdTJY=";
};
providers = fetchHex {
pkg = "providers";
version = "1.8.1";
sha256 = "sha256-5FdFrenEdqmkaeoIQOQYqxk2DcRPAaIzME4RikRIa6A=";
};
katana_code = fetchHex {
pkg = "katana_code";
version = "0.2.1";
sha256 = "sha256-hEitP1bZgU+YoovmUPcZG91QZXXjRcwW1YZmCxD26ZI=";
};
bucs = fetchHex {
pkg = "bucs";
version = "1.0.16";
sha256 = "sha256-/2pccqUArXrsHuO6FkrjxFDq3uiYsNFR4frKGKyNDWI=";
};
yamerl = fetchHex {
pkg = "yamerl";
version = "0.8.1";
sha256 = "sha256-lssw+dZDRP7Q74qS6fFvIH3mwE3/9PNmdSynn1vOsj8=";
};
uuid = fetchHex {
pkg = "uuid_erl";
version = "2.0.1";
sha256 = "sha256-q1fKzNUfFwAR5fREzoZfhLQWBeSDqe/MRowa+uyHVTs=";
};
tdiff = fetchHex {
pkg = "tdiff";
version = "0.1.2";
sha256 = "sha256-4MLhaPmSUqWIl2jVyPHmUQoYRZLUz6BrIneKGNM9eHU=";
};
redbug = fetchHex {
pkg = "redbug";
version = "2.0.6";
sha256 = "sha256-qtlJhnH0q5HqylCZ/oWmFhgVimNuYoaJLE989K8XHQQ=";
};
rebar3_format = fetchHex {
pkg = "rebar3_format";
version = "0.8.2";
sha256 = "sha256-yo/ydjjCFpWT0USdrL6IlWNBk+0zNOkGtU/JfwgfUhM=";
};
ranch = fetchHex {
pkg = "ranch";
version = "1.7.1";
sha256 = "sha256-RR2FJ3h99xbZncNhYvygWTSRXbC2FBu9rC6o08evx9c=";
};
jsx = fetchHex {
pkg = "jsx";
version = "3.0.0";
sha256 = "sha256-N77KBDX1yoovRfdqRiEedkGPvvgMNvA2HCSfx1BZ3G0=";
};
erlfmt = fetchFromGitHub {
owner = "whatsapp";
repo = "erlfmt";
rev = "2e93fc4a646111357642b0179a2a63151868d890";
sha256 = "0n7kygycn05aqdp5dyj192mja89l4nxv2wg16qg2c0bmw9s7j2mr";
};
ephemeral = fetchHex {
pkg = "ephemeral";
version = "2.0.4";
sha256 = "sha256-Syk9gPdfnEV1/0ucjoiaVoAvQLAYv1fnTxlkTv7myFA=";
};
elvis_core = fetchHex {
pkg = "elvis_core";
version = "1.1.1";
sha256 = "sha256-ORyVuqSfJxjX+0mLzwgEbd/CAs8Kq2Oy5DknFIXJ3EI=";
};
docsh = fetchHex {
pkg = "docsh";
version = "0.7.2";
sha256 = "sha256-Tn20YbsHVA0rw9NmuFE/AZdxLQSVu4V0TzZ9OBUHYTQ=";
};
}

2
pkgs/development/compilers/swi-prolog/default.nix
View File

@ -53,7 +53,7 @@ stdenv.mkDerivation {
# Add the packInstall path to the swipl pack search path
postPatch = ''
echo "user:file_search_path(pack, '$out/lib/swipl/pack')." >> /build/$sourceRoot/boot/init.pl
echo "user:file_search_path(pack, '$out/lib/swipl/pack')." >> boot/init.pl
'';
nativeBuildInputs = [ cmake pkg-config ];

14
pkgs/development/haskell-modules/configuration-common.nix
View File

@ -1292,6 +1292,20 @@ self: super: {
# Created upstream PR @ https://github.com/ghcjs/jsaddle/pull/119
jsaddle-webkit2gtk = appendPatch super.jsaddle-webkit2gtk ./patches/jsaddle-webkit2gtk.patch;
# 2021-05-12: gi-gdkpixbuf_2_0_26 fix
# https://github.com/taffybar/gtk-sni-tray/pull/25
gtk-sni-tray = appendPatch super.gtk-sni-tray (pkgs.fetchpatch {
url = "https://github.com/taffybar/gtk-sni-tray/pull/25/commits/4afd84654cb3f2bd2bb7d39451706c5914fd3cdf.patch";
sha256 = "1xjxlh58vnykqsjq4qw8mliq3gk17mwxi4h9z8dvjyav8zqg05rn";
});
# 2021-05-12: gi-gdkpixbuf_2_0_26 fix
# https://github.com/taffybar/taffybar/pull/507
taffybar = appendPatch super.taffybar (pkgs.fetchpatch {
url = "https://github.com/taffybar/taffybar/pull/507/commits/14a650d0954000cbd2cb1018a2f3bcd40ecb564f.patch";
sha256 = "01rm8zida5858j5r0mw7bpmv24b03mb3rw34lbkaw3i7g62bx3a0";
});
# Missing -Iinclude parameter to doc-tests (pull has been accepted, so should be resolved when 0.5.3 released)
# https://github.com/lehins/massiv/pull/104
massiv = dontCheck super.massiv;

1
pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
View File

@ -1699,7 +1699,6 @@ broken-packages:
- gtk2hs-rpn
- gtk3-mac-integration
- gtkglext
- gtk-sni-tray
- gtksourceview2
- gtksourceview3
- gtk-toy

4
pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
View File

@ -244,6 +244,10 @@ package-maintainers:
- hinit
bdesham:
- pinboard-notes-backup
rvl:
- taffybar
- arbtt
- lentil
unsupported-platforms:
Allure: [ x86_64-darwin ]

1
pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml
View File

@ -2886,7 +2886,6 @@ dont-distribute-packages:
- systemstats
- t3-client
- ta
- taffybar
- tagged-list
- tagged-th
- tagsoup-navigate

7
pkgs/development/haskell-modules/hackage-packages.nix generated
View File

@ -32088,7 +32088,7 @@ self: {
];
description = "Automatic Rule-Based Time Tracker";
license = lib.licenses.gpl2Only;
maintainers = with lib.maintainers; [ maralorn ];
maintainers = with lib.maintainers; [ maralorn rvl ];
}) {};
"arcgrid" = callPackage
@ -111902,8 +111902,6 @@ self: {
platforms = [
"aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux"
];
hydraPlatforms = lib.platforms.none;
broken = true;
}) {inherit (pkgs) gtk3;};
"gtk-strut" = callPackage
@ -160562,6 +160560,7 @@ self: {
];
description = "frugal issue tracker";
license = lib.licenses.gpl3Only;
maintainers = with lib.maintainers; [ rvl ];
}) {};
"lenz" = callPackage
@ -252909,7 +252908,7 @@ self: {
platforms = [
"aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux"
];
hydraPlatforms = lib.platforms.none;
maintainers = with lib.maintainers; [ rvl ];
}) {inherit (pkgs) gtk3;};
"tag-bits" = callPackage

16
pkgs/development/libraries/libfive/default.nix
View File

@ -10,6 +10,7 @@
, libpng
, boost
, guile
, stdenv
}:
mkDerivation {
@ -26,8 +27,19 @@ mkDerivation {
nativeBuildInputs = [ wrapQtAppsHook cmake ninja pkg-config ];
buildInputs = [ eigen zlib libpng boost guile ];
# Link "Studio" binary to "libfive-studio" to be more obvious:
postFixup = ''
postInstall = if stdenv.isDarwin then ''
# No rules to install the mac app, so do it manually.
mkdir -p $out/Applications
cp -r studio/Studio.app $out/Applications/Studio.app
install_name_tool \
-change libfive.dylib $out/lib/libfive.dylib \
-change libfive-guile.dylib $out/lib/libfive-guile.dylib \
$out/Applications/Studio.app/Contents/MacOS/Studio
wrapQtApp $out/Applications/Studio.app/Contents/MacOS/Studio
'' else ''
# Link "Studio" binary to "libfive-studio" to be more obvious:
ln -s "$out/bin/Studio" "$out/bin/libfive-studio"
'';

40
pkgs/development/libraries/libnixxml/default.nix
View File

@ -1,4 +1,4 @@
{ fetchFromGitHub, lib, stdenv, autoreconfHook, pkg-config, libxml2, gd, glib, getopt, libxslt, nix }:
{ fetchFromGitHub, lib, stdenv, autoreconfHook, pkg-config, libxml2, gd, glib, getopt, libxslt, nix, bash}:
stdenv.mkDerivation {
pname = "libnixxml";
@ -11,17 +11,45 @@ stdenv.mkDerivation {
sha256 = "sha256-HKQnCkO1TDs1e0MDil0Roq4YRembqRHQvb7lK3GAftQ=";
};
preConfigure = ''
./bootstrap
prePatch = ''
# Remove broken test
substituteInPlace tests/draw/Makefile.am \
--replace "draw-wrong.sh" ""
rm tests/draw/draw-wrong.sh
# Fix bash path
substituteInPlace scripts/nixexpr2xml.in \
--replace "/bin/bash" "${bash}/bin/bash"
'';
preAutoreconf = ''
# Copied from bootstrap script
ln -s README.md README
mkdir -p config
'';
configureFlags = [ "--with-gd" "--with-glib" ];
CFLAGS = "-Wall";
nativeBuildInputs = [ autoreconfHook pkg-config ];
buildInputs = [ libxml2 gd.dev glib getopt libxslt nix ];
strictDeps = true;
nativeBuildInputs = [
autoreconfHook
pkg-config
getopt
libxslt
];
buildInputs = [
bash
libxml2
gd.dev
glib
nix
];
checkInputs = [
nix
];
doCheck = false;
doCheck = true;
meta = with lib; {
description = "XML-based Nix-friendly data integration library";

7
pkgs/development/libraries/librealsense/default.nix
View File

@ -7,7 +7,7 @@ assert enablePython -> pythonPackages != null;
stdenv.mkDerivation rec {
pname = "librealsense";
version = "2.43.0";
version = "2.45.0";
outputs = [ "out" "dev" ];
@ -15,17 +15,18 @@ stdenv.mkDerivation rec {
owner = "IntelRealSense";
repo = pname;
rev = "v${version}";
sha256 = "sha256-N7EvpcJjtK3INHK7PgoiEVIMq9zGcHKMeI+/dwZ3bNs=";
sha256 = "0aqf48zl7825v7x8c3x5w4d17m4qq377f1mn6xyqzf9b0dnk4i1j";
};
buildInputs = [
libusb1
gcc.cc.lib
] ++ lib.optional cudaSupport cudatoolkit
++ lib.optional enablePython pythonPackages.python;
++ lib.optionals enablePython (with pythonPackages; [python pybind11 ]);
patches = lib.optionals enablePython [
./py_sitepackage_dir.patch
./py_pybind11_no_external_download.patch
];
nativeBuildInputs = [

39
pkgs/development/libraries/librealsense/py_pybind11_no_external_download.patch Normal file
View File

@ -0,0 +1,39 @@
From 01e51b9c90ba51b2d0ca797dde676812cf3db415 Mon Sep 17 00:00:00 2001
From: "Robert T. McGibbon" <rmcgibbo@gmail.com>
Date: Mon, 10 May 2021 17:26:04 -0400
Subject: [PATCH 1/1] V1
---
wrappers/python/CMakeLists.txt | 15 +--------------
1 file changed, 1 insertion(+), 14 deletions(-)
diff --git a/wrappers/python/CMakeLists.txt b/wrappers/python/CMakeLists.txt
index aa83e4c77..4ec92ccfa 100644
--- a/wrappers/python/CMakeLists.txt
+++ b/wrappers/python/CMakeLists.txt
@@ -8,21 +8,8 @@ if (NOT BUILD_PYTHON_BINDINGS)
endif()
set(DEPENDENCIES realsense2)
-# In order for the external project clone to occur during cmake configure step(rather than during compilation, as would normally happen),
-# we copy the external project declaration to the build folder and then execute it
-configure_file(${CMAKE_SOURCE_DIR}/third-party/pybind11/CMakeLists.txt ${CMAKE_BINARY_DIR}/external-projects/pybind11/CMakeLists.txt)
-execute_process(COMMAND "${CMAKE_COMMAND}" -G "${CMAKE_GENERATOR}" .
- WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/external-projects/pybind11"
-)
-execute_process(COMMAND "${CMAKE_COMMAND}" --build .
- WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/external-projects/pybind11"
-)
-# Add pybind11 makefile
-add_subdirectory("${CMAKE_BINARY_DIR}/third-party/pybind11"
- "${CMAKE_BINARY_DIR}/third-party/pybind11"
- EXCLUDE_FROM_ALL
-)
+find_package(pybind11 REQUIRED)
set(PYBIND11_CPP_STANDARD -std=c++11)
# Force Pybind11 not to share pyrealsense2 resources with other pybind modules.
--
2.29.3

65
pkgs/development/libraries/tbb/default.nix
View File

@ -1,22 +1,44 @@
{ lib, stdenv, fetchFromGitHub, fixDarwinDylibNames, compiler ? if stdenv.cc.isClang then "clang" else null, stdver ? null }:
{ lib
, stdenv
, fetchurl
, fetchFromGitHub
, fixDarwinDylibNames
}:
with lib; stdenv.mkDerivation rec {
stdenv.mkDerivation rec {
pname = "tbb";
version = "2020_U3";
version = "2020.3";
src = fetchFromGitHub {
owner = "01org";
repo = "tbb";
rev = version;
sha256 = "sha256-prO2O5hd+Wz5iA0vfrqmyHFr0Ptzk64so5KpSpvuKmU=";
owner = "oneapi-src";
repo = "oneTBB";
rev = "v${version}";
sha256 = "prO2O5hd+Wz5iA0vfrqmyHFr0Ptzk64so5KpSpvuKmU=";
};
nativeBuildInputs = optional stdenv.isDarwin fixDarwinDylibNames;
patches = [
# Fixes build with Musl.
(fetchurl {
url = "https://github.com/openembedded/meta-openembedded/raw/39185eb1d1615e919e3ae14ae63b8ed7d3e5d83f/meta-oe/recipes-support/tbb/tbb/GLIBC-PREREQ-is-not-defined-on-musl.patch";
sha256 = "gUfXQ9OZQ82qD6brgauBCsKdjLvyHafMc18B+KxZoYs=";
})
makeFlags = optional (compiler != null) "compiler=${compiler}"
++ optional (stdver != null) "stdver=${stdver}";
# Fixes build with Musl.
(fetchurl {
url = "https://github.com/openembedded/meta-openembedded/raw/39185eb1d1615e919e3ae14ae63b8ed7d3e5d83f/meta-oe/recipes-support/tbb/tbb/0001-mallinfo-is-glibc-specific-API-mark-it-so.patch";
sha256 = "fhorfqO1hHKZ61uq+yTR7eQ8KYdyLwpM3K7WpwJpV74=";
})
];
patches = lib.optional stdenv.hostPlatform.isMusl ./glibc-struct-mallinfo.patch;
nativeBuildInputs = lib.optionals stdenv.isDarwin [
fixDarwinDylibNames
];
makeFlags = lib.optionals stdenv.cc.isClang [
"compiler=clang"
];
enableParallelBuilding = true;
installPhase = ''
runHook preInstall
@ -29,9 +51,24 @@ with lib; stdenv.mkDerivation rec {
runHook postInstall
'';
enableParallelBuilding = true;
postInstall = let
pcTemplate = fetchurl {
url = "https://github.com/oneapi-src/oneTBB/raw/master/integration/pkg-config/tbb.pc.in";
sha256 = "2pCad9txSpNbzac0vp/VY3x7HNySaYkbH3Rx8LK53pI=";
};
in ''
# Generate pkg-config file based on upstream template.
# It should not be necessary with tbb after 2021.2.
mkdir -p "$out/lib/pkgconfig"
substitute "${pcTemplate}" "$out/lib/pkgconfig/tbb.pc" \
--subst-var-by CMAKE_INSTALL_PREFIX "$out" \
--subst-var-by CMAKE_INSTALL_LIBDIR "lib" \
--subst-var-by CMAKE_INSTALL_INCLUDEDIR "include" \
--subst-var-by TBB_VERSION "${version}" \
--subst-var-by TBB_LIB_NAME "tbb"
'';
meta = {
meta = with lib; {
description = "Intel Thread Building Blocks C++ Library";
homepage = "http://threadingbuildingblocks.org/";
license = licenses.asl20;
@ -43,7 +80,7 @@ with lib; stdenv.mkDerivation rec {
represents a higher-level, task-based parallelism that abstracts platform
details and threading mechanisms for scalability and performance.
'';
platforms = with platforms; linux ++ darwin;
platforms = platforms.unix;
maintainers = with maintainers; [ thoughtpolice dizfer ];
};
}

43
pkgs/development/libraries/tbb/glibc-struct-mallinfo.patch
View File

@ -1,43 +0,0 @@
From b577153a10c98f4e13405dc93ea2ab1a7b990e07 Mon Sep 17 00:00:00 2001
From: David Huffman <storedbox+alpine@outlook.com>
Date: Wed, 6 Jan 2016 07:09:30 -0500
Subject: [PATCH] hard-code glibc's definition of struct mallinfo
---
src/tbbmalloc/proxy.h | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
diff --git a/src/tbbmalloc/proxy.h b/src/tbbmalloc/proxy.h
index 781cadc..e1ea1ae 100644
--- a/src/tbbmalloc/proxy.h
+++ b/src/tbbmalloc/proxy.h
@@ -32,6 +32,26 @@
#include <stddef.h>
+// The following definition was taken from /usr/include/malloc.h as provided by
+// the glibc-devel-2.19-17.4.x86_64 package on openSUSE Leap 42.1; it is
+// made available under the GNU Lesser General Public License v2.1 or later.
+// See <https://www.gnu.org/licenses>.
+//
+// Copyright (C) 1996-2014 Free Software Foundation, Inc.
+struct mallinfo
+{
+ int arena; /* non-mmapped space allocated from system */
+ int ordblks; /* number of free chunks */
+ int smblks; /* number of fastbin blocks */
+ int hblks; /* number of mmapped regions */
+ int hblkhd; /* space in mmapped regions */
+ int usmblks; /* maximum total allocated space */
+ int fsmblks; /* space available in freed fastbin blocks */
+ int uordblks; /* total allocated space */
+ int fordblks; /* total free space */
+ int keepcost; /* top-most, releasable (via malloc_trim) space */
+};
+
extern "C" {
void * scalable_malloc(size_t size);
void * scalable_calloc(size_t nobj, size_t size);
--
2.6.2

3
pkgs/development/node-packages/default.nix
View File

@ -60,8 +60,9 @@ let
};
});
bitwarden-cli = pkgs.lib.overrideDerivation super."@bitwarden/cli" (drv: {
bitwarden-cli = super."@bitwarden/cli".override (drv: {
name = "bitwarden-cli-${drv.version}";
meta.mainProgram = "bw";
});
fast-cli = super."fast-cli-1.x".override {

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

@ -2,13 +2,13 @@
buildPythonPackage rec {
pname = "aioesphomeapi";
version = "2.6.6";
version = "2.7.0";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
sha256 = "sha256-LdBUtU5rNoixh7DPIFkHxLMvBeI6MZH57sO0IjuOQAw=";
sha256 = "sha256-PCoSJnt8EptVq5u0+NgEBwY6zLkD87XqVRBDdqBziM8=";
};
propagatedBuildInputs = [ attrs protobuf zeroconf ];

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

@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "aiohue";
version = "2.3.0";
version = "2.3.1";
src = fetchPypi {
inherit pname version;
sha256 = "1xinllv2cvxl9fxi15nayzw9lfzijb3m7i49gkkr46qr8xvsavyk";
sha256 = "1qxvqqsflcn263yg7r8vvfc2c2fl3rh4dkzwzh926ijnbc2sk4nm";
};
propagatedBuildInputs = [

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

@ -15,14 +15,14 @@
buildPythonPackage rec {
pname = "denonavr";
version = "0.10.7";
version = "0.10.8";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "scarface-4711";
repo = pname;
rev = version;
sha256 = "sha256-IGfU9nnlfZf8U6pCzG7cegmqxmDNONom0U14PZHHaYY=";
sha256 = "02q76mbmg2rkm4shy2apwbw9pvicy9j5v4zgpjwzxif9yf7m8aqk";
};
propagatedBuildInputs = [

60
pkgs/development/python-modules/dependency-injector/default.nix
View File

@ -1,27 +1,53 @@
{ lib, buildPythonPackage, fetchPypi, isPy3k, six, unittest2, pyyaml, flask }:
let
testPath =
if isPy3k
then "test_*_py3.py"
else "test_*_py2_py3.py";
in
{ lib
, aiohttp
, buildPythonPackage
, fastapi
, fetchFromGitHub
, flask
, httpx
, mypy-boto3-s3
, numpy
, scipy
, pydantic
, pytestCheckHook
, pyyaml
, six
}:
buildPythonPackage rec {
pname = "dependency-injector";
version = "4.31.1";
version = "4.32.2";
src = fetchPypi {
inherit pname version;
sha256 = "b6b28b9571f44d575367c6005ba8aaa9fd2b70310e1c15410925d6f1ee2769ad";
src = fetchFromGitHub {
owner = "ets-labs";
repo = "python-dependency-injector";
rev = version;
sha256 = "1gkkka0hl2hl4axf3gfm58mzv92bg0frr5jikw8g32hd4q4aagcg";
};
propagatedBuildInputs = [ six ];
checkInputs = [ unittest2 pyyaml flask ];
propagatedBuildInputs = [
six
];
checkPhase = ''
unit2 discover -s tests/unit -p "${testPath}"
'';
checkInputs = [
aiohttp
fastapi
flask
httpx
mypy-boto3-s3
numpy
pydantic
scipy
pytestCheckHook
pyyaml
];
disabledTestPaths = [
# There is no unique identifier to disable the one failing test
"tests/unit/ext/test_aiohttp_py35.py"
];
pythonImportsCheck = [ "dependency_injector" ];
meta = with lib; {
description = "Dependency injection microframework for Python";

37
pkgs/development/python-modules/django-pipeline/default.nix
View File

@ -1,37 +0,0 @@
{ lib, buildPythonPackage, fetchFromGitHub, isPy3k
, django, futures ? null, mock ? null, jinja2, jsmin, slimit }:
buildPythonPackage rec {
pname = "django-pipeline";
version = "1.6.14";
# no tests on PyPI
src = fetchFromGitHub {
owner = "jazzband";
repo = pname;
rev = version;
sha256 = "1xf732bd17mgha75jfhlnms46ib2pffhpfa0ca7bmng9jhbvsl9j";
};
postPatch = ''
substituteInPlace tests/tests/test_compiler.py \
--replace "/usr/bin/env" ""
'';
propagatedBuildInputs = [ django ] ++ lib.optional (!isPy3k) futures;
checkInputs = [ jinja2 jsmin slimit ] ++ lib.optional (!isPy3k) mock;
checkPhase = ''
export PYTHONPATH=.:$PYTHONPATH
export DJANGO_SETTINGS_MODULE=tests.settings
${django}/bin/django-admin.py test tests
'';
meta = with lib; {
description = "Pipeline is an asset packaging library for Django";
homepage = "https://github.com/cyberdelia/django-pipeline";
license = licenses.mit;
broken = true;
};
}

46
pkgs/development/python-modules/fpyutils/default.nix Normal file
View File

@ -0,0 +1,46 @@
{ lib
, atomicwrites
, buildPythonPackage
, fetchFromGitHub
, pytestCheckHook
, pythonOlder
, requests
}:
buildPythonPackage rec {
pname = "fpyutils";
version = "2.0.0";
disabled = pythonOlder "3.5";
src = fetchFromGitHub {
owner = "frnmst";
repo = pname;
rev = version;
sha256 = "1n15fvd6191ixxsza49fdd8j43hs0agagg8k9v6rc7by1ffqnl2b";
};
propagatedBuildInputs = [
atomicwrites
requests
];
checkInputs = [
pytestCheckHook
];
pytestFlagsArray = [ "fpyutils/tests/*.py" ];
disabledTests = [
# Don't run test which requires bash
"test_execute_command_live_output"
];
pythonImportsCheck = [ "fpyutils" ];
meta = with lib; {
description = "Collection of useful non-standard Python functions";
homepage = "https://github.com/frnmst/fpyutils";
license = with licenses; [ gpl3Plus ];
maintainers = with maintainers; [ fab ];
};
}

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

@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "imap-tools";
version = "0.40.0";
version = "0.41.0";
disabled = isPy27;
@ -15,7 +15,7 @@ buildPythonPackage rec {
owner = "ikvk";
repo = "imap_tools";
rev = "v${version}";
sha256 = "sha256-7qLiVN3pBkbZQlA12ZOkgpiV/JybrPTmEIeJjy4ZS3A=";
sha256 = "sha256-gtfVZTHeiYamKkcu9n/CJ4O4X1YneY2QB3XZnvtNL3U=";
};
checkInputs = [

43
pkgs/development/python-modules/md-toc/default.nix Normal file
View File

@ -0,0 +1,43 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, fpyutils
, pytestCheckHook
, pythonOlder
}:
buildPythonPackage rec {
pname = "md-toc";
version = "7.2.0";
disabled = pythonOlder "3.5";
src = fetchFromGitHub {
owner = "frnmst";
repo = pname;
rev = version;
sha256 = "1v74iddfk5d6170frg89vzrkz9xrycl1f50g59imc7x7g50i6c2x";
};
propagatedBuildInputs = [
fpyutils
];
checkInputs = [
pytestCheckHook
];
postPatch = ''
substituteInPlace setup.py --replace "fpyutils>=1.2,<1.3" "fpyutils>=1.2"
'';
pytestFlagsArray = [ "md_toc/tests/*.py" ];
pythonImportsCheck = [ "md_toc" ];
meta = with lib; {
description = "Table of contents generator for Markdown";
homepage = "https://docs.franco.net.eu.org/md-toc/";
license = with licenses; [ gpl3Plus ];
maintainers = with maintainers; [ fab ];
};
}

49
pkgs/development/python-modules/mdformat/default.nix Normal file
View File

@ -0,0 +1,49 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, importlib-metadata
, markdown-it-py
, poetry-core
, pytestCheckHook
, pythonOlder
, typing-extensions
}:
buildPythonPackage rec {
pname = "mdformat";
version = "0.7.6";
format = "pyproject";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "executablebooks";
repo = pname;
rev = version;
sha256 = "0mnbi3vp7zgllpcpf6vrjw9y6jas95shphn99ayr8b8wgxsaqkif";
};
nativeBuildInputs = [
poetry-core
];
propagatedBuildInputs = [
markdown-it-py
] ++ lib.optionals (pythonOlder "3.10") [
importlib-metadata
] ++ lib.optionals (pythonOlder "3.7") [
typing-extensions
];
checkInputs = [
pytestCheckHook
];
pythonImportsCheck = [ "mdformat" ];
meta = with lib; {
description = "CommonMark compliant Markdown formatter";
homepage = "https://mdformat.rtfd.io/";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};
}

49
pkgs/development/python-modules/mypy-boto3-builder/default.nix Normal file
View File

@ -0,0 +1,49 @@
{ lib
, black
, boto3
, buildPythonPackage
, fetchFromGitHub
, jinja2
, md-toc
, isort
, mdformat
, pyparsing
, pytestCheckHook
, pythonOlder
}:
buildPythonPackage rec {
pname = "mypy-boto3-builder";
version = "4.12.0";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "vemel";
repo = "mypy_boto3_builder";
rev = version;
sha256 = "09kbmrpnph5kbxlqqavpxg3l85dmk3vzmwawa4s09y9gknxxkcv9";
};
propagatedBuildInputs = [
black
boto3
isort
jinja2
md-toc
mdformat
pyparsing
];
checkInputs = [
pytestCheckHook
];
pythonImportsCheck = [ "mypy_boto3_builder" ];
meta = with lib; {
description = "Type annotations builder for boto3";
homepage = "https://vemel.github.io/mypy_boto3_builder/";
license = with licenses; [ bsd3 ];
maintainers = with maintainers; [ fab ];
};
}

35
pkgs/development/python-modules/mypy-boto3-s3/default.nix Normal file
View File

@ -0,0 +1,35 @@
{ lib
, boto3
, buildPythonPackage
, fetchPypi
, pythonOlder
, typing-extensions
}:
buildPythonPackage rec {
pname = "mypy-boto3-s3";
version = "1.17.71";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
sha256 = "0zgx3f41j80xy203jwms7j72svxy10ry5v9w3ql817ai4lcrspnn";
};
propagatedBuildInputs = [
boto3
] ++ lib.optionals (pythonOlder "3.8") [
typing-extensions
];
# Project has no tests
doCheck = false;
pythonImportsCheck = [ "mypy_boto3_s3" ];
meta = with lib; {
description = "Type annotations for boto3";
homepage = "https://vemel.github.io/boto3_stubs_docs/mypy_boto3_s3/";
license = with licenses; [ bsd3 ];
maintainers = with maintainers; [ fab ];
};
}

8
pkgs/development/python-modules/prettytable/default.nix
View File

@ -4,6 +4,8 @@
, glibcLocales
, setuptools_scm
, wcwidth
, importlib-metadata
, pythonOlder
}:
buildPythonPackage rec {
@ -18,7 +20,11 @@ buildPythonPackage rec {
nativeBuildInputs = [ setuptools_scm ];
buildInputs = [ glibcLocales ];
propagatedBuildInputs = [ wcwidth ];
propagatedBuildInputs = [
wcwidth
] ++ lib.optionals (pythonOlder "3.8") [
importlib-metadata
];
preCheck = ''
export LANG="en_US.UTF-8"

25
pkgs/development/python-modules/py-dmidecode/default.nix Normal file
View File

@ -0,0 +1,25 @@
{ lib, buildPythonPackage, fetchPypi, dmidecode }:
buildPythonPackage rec {
pname = "py-dmidecode";
version = "0.1.0";
src = fetchPypi {
inherit pname version;
sha256 = "1bv1vmhj8h520kj6slwpz16xfmgp117yjjkfyihkl5ix6mn5zkpa";
};
propagatedBuildInputs = [ dmidecode ];
# Project has no tests.
doCheck = false;
pythonImportsCheck = [ "dmidecode" ];
meta = with lib; {
homepage = "https://github.com/zaibon/py-dmidecode/";
description = "Python library that parses the output of dmidecode";
license = licenses.asl20;
maintainers = with maintainers; [ davidtwco ];
platforms = platforms.linux;
};
}

12
pkgs/development/python-modules/pytorch/binary-hashes.nix
View File

@ -1,17 +1,17 @@
version: {
x86_64-linux-37 = {
name = "torch-${version}-cp37-cp37m-linux_x86_64.whl";
url = "https://download.pytorch.org/whl/cu102/torch-${version}%2Bcu102-cp37-cp37m-linux_x86_64.whl";
hash = "sha256-79JK2gGlV5Lhbim7GgPCjk++brwpUQE7g7vsrBu06eE=";
url = "https://download.pytorch.org/whl/cu111/torch-${version}%2Bcu111-cp37-cp37m-linux_x86_64.whl";
hash = "sha256-lxj066PiB+S88GqQnXKgd9RCiKkMk3mctx/eBieZjAk=";
};
x86_64-linux-38 = {
name = "torch-${version}-cp38-cp38-linux_x86_64.whl";
url = "https://download.pytorch.org/whl/cu102/torch-${version}%2Bcu102-cp38-cp38-linux_x86_64.whl";
hash = "sha256-16h90SdxAgFxmPpgUPA3rBGxs9dtFaCeAgeSpKmtnmQ=";
url = "https://download.pytorch.org/whl/cu111/torch-${version}%2Bcu111-cp38-cp38-linux_x86_64.whl";
hash = "sha256-qvTQMLz4CQPgalzUyYwz6rm+ExyWlIzI+FSMQhxM4eM=";
};
x86_64-linux-39 = {
name = "torch-${version}-cp39-cp39-linux_x86_64.whl";
url = "https://download.pytorch.org/whl/cu102/torch-${version}%2Bcu102-cp39-cp39-linux_x86_64.whl";
hash = "sha256-E3RLWpGYbRuKsz0pQv7npmC7WTbdvlYFaxXQYBKT2/8=";
url = "https://download.pytorch.org/whl/cu111/torch-${version}%2Bcu111-cp39-cp39-linux_x86_64.whl";
hash = "sha256-z0pzEiljU+E2x2SuOEAg86dmVY1iFZSDOCfoOAFhLQo=";
};
}

3
pkgs/development/python-modules/requests-http-signature/default.nix
View File

@ -2,6 +2,7 @@
, buildPythonPackage
, fetchFromGitHub
, requests
, cryptography
, python
}:
@ -17,7 +18,7 @@ buildPythonPackage rec {
sha256 = "0y96wsbci296m1rcxx0ybx8r44rdvyb59p1jl27p7rgz7isr3kx1";
};
propagatedBuildInputs = [ requests ];
propagatedBuildInputs = [ requests cryptography ];
checkPhase = ''
${python.interpreter} test/test.py

3
pkgs/development/tools/build-managers/conan/default.nix
View File

@ -35,6 +35,9 @@ let newPython = python3.override {
inherit version;
sha256 = "8d59a976fb773f3e6a39c85636357c4f0e242707394cadadd9814f5cbaa20e96";
};
disabledTests = [
"test_ec_verify_should_return_false_if_signature_invalid"
];
});
};
};

28
pkgs/development/tools/earthly/default.nix Normal file
View File

@ -0,0 +1,28 @@
{ lib, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "earthly";
version = "0.5.11";
src = fetchFromGitHub {
owner = "earthly";
repo = "earthly";
rev = "v${version}";
sha256 = "1d9p2f79f2k7nnka9qja3dlqvvl240l09frkb17ff2f5kyi1qabv";
};
vendorSha256 = "1wfm55idlxf6cbm6b5z3fip0j94nwr7m0zxx6a2nsr03d4x0ad0k";
postInstall = ''
mv $out/bin/debugger $out/bin/earthly-debugger
mv $out/bin/shellrepeater $out/bin/earthly-shellrepeater
'';
meta = with lib; {
description = "Build automation for the container era";
homepage = "https://earthly.dev/";
changelog = "https://github.com/earthly/earthly/releases/tag/v${version}";
license = licenses.mpl20;
maintainers = with maintainers; [ mdsp ];
};
}

4
pkgs/development/tools/go-toml/default.nix
View File

@ -2,13 +2,13 @@
buildGoPackage rec {
pname = "go-toml";
version = "1.9.0";
version = "1.9.1";
src = fetchFromGitHub {
owner = "pelletier";
repo = pname;
rev = "v${version}";
sha256 = "sha256-m8VgjfNDxSX6fRG2/gEJlVc9hCnua+o79ttrd8P20kU=";
sha256 = "sha256-O3gfQon8ktObLVED4A5sCSOw8K1NIXP3a5AsLq3Svb4=";
};
goPackagePath = "github.com/pelletier/go-toml";

6
pkgs/development/tools/misc/terraform-ls/default.nix
View File

@ -2,15 +2,15 @@
buildGoModule rec {
pname = "terraform-ls";
version = "0.16.0";
version = "0.16.2";
src = fetchFromGitHub {
owner = "hashicorp";
repo = pname;
rev = "v${version}";
sha256 = "sha256-8Bo6ZSpecdMX/Hoj0N1/iptfqybPUoQ0T9IQima+Bbo=";
sha256 = "sha256-5+h1fyTCp1jUZeKRCeDhfqAA11SMyR5nw2Y2x6JyIwY=";
};
vendorSha256 = "sha256-oP7ZekG7YdRhUvt48wxalt8y8QmVFkAw9GRIKBmi9sg=";
vendorSha256 = "sha256-m5ddUwuTX0mSihkoGIMQKidptwUL8Bao5HgHJBWX0os=";
# tests fail in sandbox mode because of trying to download stuff from releases.hashicorp.com
doCheck = false;

14
pkgs/development/tools/sqsh/default.nix
View File

@ -14,9 +14,6 @@ in stdenv.mkDerivation rec {
preConfigure = ''
export SYBASE=${freetds}
substituteInPlace src/cmd_connect.c \
--replace CS_TDS_80 CS_TDS_73
'' + lib.optionalString stdenv.isDarwin ''
substituteInPlace configure --replace "libct.so" "libct.dylib"
'';
@ -27,6 +24,17 @@ in stdenv.mkDerivation rec {
nativeBuildInputs = [ autoreconfHook ];
patches = [
(fetchurl {
# https://cvsweb.openbsd.org/cgi-bin/cvsweb/ports/databases/sqsh/patches/patch-src_cmd_connect_c
name = "patch-src_cmd_connect_c.patch";
url = "https://cvsweb.openbsd.org/cgi-bin/cvsweb/~checkout~/ports/databases/sqsh/patches/patch-src_cmd_connect_c?rev=1.2&content-type=text/plain";
sha256 = "1dz97knr2h0a0ca1vq2mx6h8s3ns9jb1a0qraa4wkfmcdi3aqw0j";
})
];
patchFlags = [ "-p0" ];
meta = with lib; {
description = "Command line tool for querying Sybase/MSSQL databases";
longDescription = ''

11
pkgs/development/web/deno/default.nix
View File

@ -16,19 +16,21 @@
rustPlatform.buildRustPackage rec {
pname = "deno";
version = "1.9.2";
version = "1.10.1";
src = fetchFromGitHub {
owner = "denoland";
repo = pname;
rev = "v${version}";
sha256 = "sha256-FKhSFqFZhqzrXrJcBc0YBNHoUq0/1+ULZ9sE+LyNQTI=";
sha256 = "sha256-aNStR86biNHwyg3dSI+CGib3XFhL5ZJ55d29E2K9qd0=";
};
cargoSha256 = "sha256-Pp322D7YtdpeNnKWcE78tvLh5nFNcrh9oGYX2eCiPzI=";
cargoSha256 = "sha256-JXjiI+fTB0YlnhKO6QfGl4YOEQNfpuWsza2TsM9fwIk=";
# Install completions post-install
nativeBuildInputs = [ installShellFiles ];
buildAndTestSubdir = "cli";
buildInputs = lib.optionals stdenv.isDarwin [ libiconv libobjc Security CoreServices Metal Foundation ];
# The rusty_v8 package will try to download a `librusty_v8.a` release at build time to our read-only filesystem
@ -51,9 +53,6 @@ rustPlatform.buildRustPackage rec {
doCheck = false;
postInstall = ''
# remove test plugin and test server
rm -r $out/lib $out/bin/test_server $out/bin/denort
installShellCompletion --cmd deno \
--bash <($out/bin/deno completions bash) \
--fish <($out/bin/deno completions fish) \

10
pkgs/development/web/deno/librusty_v8.nix
View File

@ -11,11 +11,11 @@ let
};
in
fetch_librusty_v8 {
version = "0.22.1";
version = "0.22.2";
shas = {
x86_64-linux = "sha256-rHI5qzwmDvlIdjUCZwvl6/s2Oe6d3/V7TJwfP1AFjik=";
aarch64-linux = "sha256-7VhrOkzWayZFTsq0II5uh+TxXaIDSkc0E19ZwT3Hl6c=";
x86_64-darwin = "sha256-zXXL2YqgjFmuDHGReIGWVxfSS3PMND0J0qlHRV/rKs8=";
aarch64-darwin = "sha256-X/CCJn5yWJH2x6lCGAFllrQUj7XLA3TICRP3aiWytjk=";
x86_64-linux = "sha256-bLGSt9a+drzXMy64iiERFHfdDsIR2YqwwNlkpzIM07Q=";
aarch64-linux = "sha256-MtCB7XaFho+a64fidPO88URIq7X9HvGqN5a9hzuCX4s=";
x86_64-darwin = "sha256-aLeZ0cIdmQHDxSGPx6IBwweZWwDI/m/1kFQTC7dQ3bs=";
aarch64-darwin = "sha256-SZGx/kRvp88mfMqDX+d4GNDs4t+P383kjnNPqwkqkHI=";
};
}

4
pkgs/games/0verkill/default.nix
View File

@ -1,5 +1,5 @@
{ lib
, stdenv
, gccStdenv
, fetchFromGitHub
, autoreconfHook
, xorgproto
@ -7,7 +7,7 @@
, libXpm
}:
stdenv.mkDerivation rec {
gccStdenv.mkDerivation rec {
pname = "0verkill";
version = "unstable-2011-01-13";

45
pkgs/games/steam-tui/default.nix Normal file
View File

@ -0,0 +1,45 @@
{ lib
, rustPlatform
, steamcmd
, fetchFromGitHub
, steam-run-native
, runtimeShell
, withWine ? false
, wine
}:
rustPlatform.buildRustPackage rec {
pname = "steam-tui";
version = "0.1.0";
src = fetchFromGitHub {
owner = "dmadisetti";
repo = pname;
rev = version;
sha256 = "sha256-UTXYlPecv0MVonr9zZwfwopfC/Fdch/ZSCxqgUsem40=";
};
cargoSha256 = "sha256-VYBzwDLSV4N4qt2dNgIS399T2HIbPTdQ2rDIeheLlfo=";
buildInputs = [ steamcmd steam-run-native ]
++ lib.optional withWine wine;
preFixup = ''
mv $out/bin/steam-tui $out/bin/.steam-tui-unwrapped
cat > $out/bin/steam-tui <<EOF
#!${runtimeShell}
export PATH=${steamcmd}/bin:\$PATH
exec ${steam-run-native}/bin/steam-run $out/bin/.steam-tui-unwrapped '\$@'
EOF
chmod +x $out/bin/steam-tui
'';
meta = with lib; {
description = "Rust TUI client for steamcmd";
homepage = "https://github.com/dmadisetti/steam-tui";
license = licenses.mit;
maintainers = with maintainers; [ legendofmiracles ];
# steam only supports that platform
platforms = [ "x86_64-linux" ];
};
}

12
pkgs/misc/sndio/default.nix
View File

@ -2,16 +2,18 @@
stdenv.mkDerivation rec {
pname = "sndio";
version = "1.7.0";
enableParallelBuilding = true;
nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
buildInputs = lib.optional stdenv.hostPlatform.isLinux alsaLib;
version = "1.8.0";
src = fetchurl {
url = "http://www.sndio.org/sndio-${version}.tar.gz";
sha256 = "0ljmac0lnjn61admgbcwjfcr5fwccrsblx9rj9bys8wlhz8f796x";
sha256 = "027hlqji0h2cm96rb8qvkdmwxl56l59bgn828nvmwak2c2i5k703";
};
nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
buildInputs = lib.optional stdenv.hostPlatform.isLinux alsaLib;
enableParallelBuilding = true;
meta = with lib; {
homepage = "http://www.sndio.org";
description = "Small audio and MIDI framework part of the OpenBSD project";

4
pkgs/os-specific/linux/kernel/linux-lqx.nix
View File

@ -1,7 +1,7 @@
{ lib, fetchFromGitHub, buildLinux, linux_zen, ... } @ args:
let
version = "5.11.19";
version = "5.11.20";
suffix = "lqx1";
in
@ -14,7 +14,7 @@ buildLinux (args // {
owner = "zen-kernel";
repo = "zen-kernel";
rev = "v${version}-${suffix}";
sha256 = "17gdlkixsy68j6c7lpkkk242x71rqj78hpqg3kp01fckj633za5n";
sha256 = "0pdn3p9v3jasgf4xffirijlx20qp9gglzlksk2gmyzg9lmf5dygi";
};
extraMeta = {

4
pkgs/servers/dns/knot-dns/default.nix
View File

@ -7,11 +7,11 @@ let inherit (lib) optional optionals; in
stdenv.mkDerivation rec {
pname = "knot-dns";
version = "3.0.5";
version = "3.0.6";
src = fetchurl {
url = "https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz";
sha256 = "695e7d7a0abefc5a8fd01f3b3080f030f33b0948215f84cd4892c6d904390802";
sha256 = "63756ac5a00c3e4a066ed231a287faef5963a9183d77326e30bf0644cdf74f86";
};
outputs = [ "bin" "out" "dev" ];

6
pkgs/servers/ftp/vsftpd/default.nix
View File

@ -24,7 +24,11 @@ stdenv.mkDerivation rec {
'';
NIX_LDFLAGS = "-lcrypt -lssl -lcrypto -lpam -lcap";
NIX_CFLAGS_COMPILE = "-Wno-error=enum-conversion";
# On gcc9, this would produce
# error: '-Werror=enum-conversion': no option -Wenum-conversion
NIX_CFLAGS_COMPILE = lib.optionalString (lib.versionAtLeast stdenv.cc.version "10")
"-Wno-error=enum-conversion";
enableParallelBuilding = true;

4
pkgs/servers/gemini/agate/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, rustPlatform, Security }:
{ lib, stdenv, fetchFromGitHub, rustPlatform, libiconv, Security }:
rustPlatform.buildRustPackage rec {
pname = "agate";
@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
cargoSha256 = "sha256-EOxklOiazxhhIIv6c+N4uuItY/oFMAG0r/ATZ3Anlko=";
buildInputs = lib.optionals stdenv.isDarwin [ Security ];
buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ];
checkFlags = [
# Username and Password use the same ports and causes collision

12
pkgs/servers/gonic/default.nix
View File

@ -20,9 +20,19 @@ buildGoModule rec {
};
nativeBuildInputs = [ pkg-config ];
buildInputs = [ taglib alsaLib ] ++ lib.optionals transcodingSupport [ ffmpeg ];
buildInputs = [ taglib alsaLib ];
vendorSha256 = "0inxlqxnkglz4j14jav8080718a80nqdcl866lkql8r6zcxb4fm9";
# TODO(Profpatsch): write a test for transcoding support,
# since it is prone to break
postPatch = lib.optionalString transcodingSupport ''
substituteInPlace \
server/encode/encode.go \
--replace \
'"ffmpeg"' \
'"${lib.getBin ffmpeg}/bin/ffmpeg"'
'';
meta = {
homepage = "https://github.com/sentriz/gonic";
description = "Music streaming server / subsonic server API implementation";

2
pkgs/servers/home-assistant/component-packages.nix
View File

@ -2,7 +2,7 @@
# Do not edit!
{
version = "2021.5.2";
version = "2021.5.3";
components = {
"abode" = ps: with ps; [ abodepy ];
"accuweather" = ps: with ps; [ accuweather ];

4
pkgs/servers/home-assistant/default.nix
View File

@ -114,7 +114,7 @@ let
extraBuildInputs = extraPackages py.pkgs;
# Don't forget to run parse-requirements.py after updating
hassVersion = "2021.5.2";
hassVersion = "2021.5.3";
in with py.pkgs; buildPythonApplication rec {
pname = "homeassistant";
@ -133,7 +133,7 @@ in with py.pkgs; buildPythonApplication rec {
owner = "home-assistant";
repo = "core";
rev = version;
sha256 = "1v1ah0kdkhx0pkma2qnk56iv00r2lb4i3sfpwlcr64gfkpzpakv8";
sha256 = "1zc21d70n24sk8y42xq3gzisj44kn6w6fhgqrcani470hhph24ba";
};
# leave this in, so users don't have to constantly update their downstream patch handling

10
pkgs/servers/http/apache-modules/mod_python/default.nix
View File

@ -1,10 +1,11 @@
{ lib, stdenv, fetchurl, apacheHttpd, python2 }:
{ lib, stdenv, fetchurl, apacheHttpd, python2, libintl }:
stdenv.mkDerivation rec {
name = "mod_python-3.5.0";
pname = "mod_python";
version = "3.5.0";
src = fetchurl {
url = "http://dist.modpython.org/dist/${name}.tgz";
url = "http://dist.modpython.org/dist/${pname}-${version}.tgz";
sha256 = "146apll3yfqk05s8fkf4acmxzqncl08bgn4rv0c1rd4qxmc91w0f";
};
@ -24,7 +25,8 @@ stdenv.mkDerivation rec {
passthru = { inherit apacheHttpd; };
buildInputs = [ apacheHttpd python2 ];
buildInputs = [ apacheHttpd python2 ]
++ lib.optional stdenv.isDarwin libintl;
meta = {
homepage = "http://modpython.org/";

2
pkgs/servers/mail/exim/default.nix
View File

@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
s:^# \(LOOKUP_MYSQL_PC=libmysqlclient\)$:\1:
s:^\(LOOKUP_LIBS\)=\(.*\):\1=\2 -lmysqlclient -L${libmysqlclient}/lib/mysql -lssl -ldl -lm -lpthread -lz:
s:^# \(LOOKUP_LIBS\)=.*:\1=-lmysqlclient -L${libmysqlclient}/lib/mysql -lssl -ldl -lm -lpthread -lz:
s:^# \(LOOKUP_INCLUDE\)=.*:\1=-I${libmysqlclient}/include/mysql/:
s:^# \(LOOKUP_INCLUDE\)=.*:\1=-I${libmysqlclient.dev}/include/mysql/:
''}
${lib.optionalString enableAuthDovecot ''
s:^# \(AUTH_DOVECOT\)=.*:\1=yes:

6
pkgs/servers/tailscale/default.nix
View File

@ -2,20 +2,20 @@
buildGoModule rec {
pname = "tailscale";
version = "1.8.0";
version = "1.8.3";
src = fetchFromGitHub {
owner = "tailscale";
repo = "tailscale";
rev = "v${version}";
sha256 = "urgXbfXEVu5ES140pIAZnQTjU3xWkkk9MPDmlRXa544=";
sha256 = "0q0nk0ychb00xhycq3kda57dzrswl8yhci7fzv8yiqzrv3ygpvyd";
};
nativeBuildInputs = [ makeWrapper ];
CGO_ENABLED = 0;
vendorSha256 = "NBdPGCmUyGKNr76CKwkXmqSVo502ZVrsbboNc+xnB04=";
vendorSha256 = "0cppblz1mnyb3c8xcry5mnf566s6l9409vf9572n1rs1bg91dvgn";
doCheck = false;

4
pkgs/tools/admin/exoscale-cli/default.nix
View File

@ -2,13 +2,13 @@
buildGoPackage rec {
pname = "exoscale-cli";
version = "1.28.0";
version = "1.29.0";
src = fetchFromGitHub {
owner = "exoscale";
repo = "cli";
rev = "v${version}";
sha256 = "sha256-YbWh4ZIlcxAD/8F/fsYIWjv5hKaHNNi+sNrD7Ax/xDw=";
sha256 = "sha256-yTsmgRs3H5do1lG28RU/OY5QJFcwvkrsV/HGuVzD+3M=";
};
goPackagePath = "github.com/exoscale/cli";

6
pkgs/tools/admin/trivy/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "trivy";
version = "0.17.2";
version = "0.18.0";
src = fetchFromGitHub {
owner = "aquasecurity";
repo = pname;
rev = "v${version}";
sha256 = "sha256-Ub3rIiOJUh3vNCC+82rCSzKSovMnRW2jo8HbI02ouws=";
sha256 = "sha256-D4oqLyH5JU8AycRZuA0isQmE3UP/0WmBmKW3xvSzk2M=";
};
vendorSha256 = "sha256-xL0wqKFMQksaLkTAxV72SWh0PPTbOqWcd6deJ9RVeEA=";
vendorSha256 = "sha256-R50alGFyb2ZR7PT1jIsYWMIO45CPet+A5wq+clC1NIY=";
excludedPackages = "misc";

4
pkgs/tools/audio/abcmidi/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "abcMIDI";
version = "2021.05.09";
version = "2021.05.10";
src = fetchzip {
url = "https://ifdo.ca/~seymour/runabc/${pname}-${version}.zip";
sha256 = "sha256-LgtS7IOGkw0K70UAP2a57ghIiJujVnQO5+j4ZanPZp4=";
sha256 = "sha256-ID27OdtuSYtD8bOPb6b0vUDdRqJvRX5TsjRBILTom4o=";
};
meta = with lib; {

18
pkgs/tools/backup/gamerbackup/default.nix
View File

@ -1,24 +1,30 @@
{ lib, buildGoModule, fetchFromGitHub, lepton }:
{ lib, makeWrapper, buildGoModule, fetchFromGitHub, lepton }:
buildGoModule {
pname = "gb-backup";
version = "unstable-2021-03-06";
version = "unstable-2021-04-07";
src = fetchFromGitHub {
owner = "leijurv";
repo = "gb";
rev = "5a94e60148628fc7796d15c53d0ed87184322053";
sha256 = "07skhwnxvm6yngb2665gkh5qbiyp7hb7av8dkckzypmd4k8z93cm";
rev = "904813bf0bbce048af5795618d58c0b1953f9ff8";
sha256 = "111jrcv4x38sc19xha5q3pd2297s13qh1maa7sa1k09hgypvgsxf";
};
vendorSha256 = "0m2aa6p04b4fs7zncar1mlykc94pp527phv71cdsbx58jgsm1jnx";
buildInputs = [ lepton ];
nativeBuildInputs = [ makeWrapper ];
checkInputs = [ lepton ];
postFixup = ''
wrapProgram $out/bin/gb --prefix PATH : ${lib.makeBinPath [ lepton ]}
'';
meta = with lib; {
description = "Gamer Backup, a super opinionated cloud backup system";
license = licenses.agpl3Only;
maintainers = with maintainers; [ babbaj ];
platforms = platforms.linux;
platforms = platforms.unix;
};
}

10
pkgs/tools/filesystems/squashfs-tools-ng/default.nix
View File

@ -1,18 +1,20 @@
{ stdenv, lib, fetchurl, doxygen, graphviz, perl, pkg-config
, lz4, lzo, xz, zlib, zstd
, bzip2, lz4, lzo, xz, zlib, zstd
}:
stdenv.mkDerivation rec {
pname = "squashfs-tools-ng";
version = "1.1.0";
version = "1.1.1";
src = fetchurl {
url = "https://infraroot.at/pub/squashfs/squashfs-tools-ng-${version}.tar.xz";
sha256 = "1swsw5j8rrjxdxsfyd446f6g8f0k3mwg15baivi953i69c9981qi";
sha256 = "07c8vpzgwvqr9ycww1769ya40cf077c6igdg1b4akwszz2nw0bxq";
};
nativeBuildInputs = [ doxygen graphviz pkg-config perl ];
buildInputs = [ zlib xz lz4 lzo zstd ];
buildInputs = [ bzip2 zlib xz lz4 lzo zstd ];
enableParallelBuilding = true;
meta = with lib; {
homepage = "https://github.com/AgentD/squashfs-tools-ng";

3
pkgs/tools/graphics/vips/default.nix
View File

@ -15,6 +15,7 @@
, libheif
, librsvg
, ApplicationServices
, Foundation
, python27
, libpng
, fetchFromGitHub
@ -68,7 +69,7 @@ stdenv.mkDerivation rec {
python27
libpng
expat
] ++ lib.optional stdenv.isDarwin ApplicationServices;
] ++ lib.optionals stdenv.isDarwin [ApplicationServices Foundation];
# Required by .pc file
propagatedBuildInputs = [

6
pkgs/tools/misc/atuin/default.nix
View File

@ -1,6 +1,10 @@
{ lib
, stdenv
, fetchFromGitHub
, rustPlatform
, libiconv
, Security
, SystemConfiguration
}:
rustPlatform.buildRustPackage rec {
@ -16,6 +20,8 @@ rustPlatform.buildRustPackage rec {
cargoSha256 = "0vy6q3hjp374lyg00zxim8aplh83iq3f4rrmpz5vnpwbag1fdql3";
buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security SystemConfiguration ];
meta = with lib; {
description = "Replacement for a shell history which records additional commands context with optional encrypted synchronization between machines";
homepage = "https://github.com/ellie/atuin";

5
pkgs/tools/misc/castty/default.nix
View File

@ -13,7 +13,10 @@ stdenv.mkDerivation {
buildInputs = [ libsoundio lame ];
makeFlags = [ "PREFIX=$(out)" ];
makeFlags = [
"CC=${stdenv.cc.targetPrefix}cc"
"PREFIX=$(out)"
];
meta = with lib; {
description = "CLI tool to record audio-enabled screencasts of your terminal, for the web";

9
pkgs/tools/misc/chafa/default.nix
View File

@ -1,5 +1,7 @@
{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, pkg-config, which, libxslt, libxml2, docbook_xml_dtd_412, docbook_xsl, glib, imagemagick, darwin }:
{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, pkg-config, which
, libxslt, libxml2, docbook_xml_dtd_412, docbook_xsl, glib, imagemagick
, Foundation
}:
stdenv.mkDerivation rec {
version = "1.6.0";
@ -23,7 +25,8 @@ stdenv.mkDerivation rec {
docbook_xsl
];
buildInputs = [ glib imagemagick ] ++ lib.optional stdenv.isDarwin [ darwin.apple_sdk.frameworks.ApplicationServices ];
buildInputs = [ glib imagemagick ]
++ lib.optional stdenv.isDarwin Foundation;
patches = [ ./xmlcatalog_patch.patch ];

35
pkgs/tools/misc/minipro/default.nix Normal file
View File

@ -0,0 +1,35 @@
{ lib
, stdenv
, fetchFromGitLab
, pkg-config
, libusb1
}:
stdenv.mkDerivation rec {
pname = "minipro";
version = "0.5";
src = fetchFromGitLab {
owner = "DavidGriffith";
repo = "minipro";
rev = version;
sha256 = "sha256-Hyj2LyY7W8opjigH+QLHHbDyelC0LMgGgdN+u3nNoJc=";
};
nativeBuildInputs = [ pkg-config ];
buildInputs = [ libusb1 ];
makeFlags = [
"PREFIX=$(out)"
"UDEV_DIR=$(out)/lib/udev"
"COMPLETIONS_DIR=$(out)/share/bash-completion/completions"
"PKG_CONFIG=${pkg-config}/bin/${pkg-config.targetPrefix}pkg-config"
"CC=${stdenv.cc.targetPrefix}cc"
];
meta = with lib; {
homepage = "https://gitlab.com/DavidGriffith/minipro";
description = "An open source program for controlling the MiniPRO TL866xx series of chip programmers";
license = licenses.gpl3Plus;
maintainers = [ maintainers.bmwalters ];
};
}

6
pkgs/tools/networking/anevicon/default.nix
View File

@ -3,6 +3,7 @@
, fetchFromGitHub
, fetchpatch
, rustPlatform
, libiconv
, Security
}:
@ -19,7 +20,7 @@ rustPlatform.buildRustPackage rec {
cargoSha256 = "1g15v13ysx09fy0b8qddw5fwql2pvwzc2g2h1ndhzpxvfy7fzpr1";
buildInputs = lib.optionals stdenv.isDarwin [ Security ];
buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ];
cargoPatches = [
# Add Cargo.lock file, https://github.com/rozgo/anevicon/pull/1
@ -30,6 +31,9 @@ rustPlatform.buildRustPackage rec {
})
];
# Tries to send large UDP packets that Darwin rejects.
doCheck = !stdenv.isDarwin;
meta = with lib; {
description = "UDP-based load generator";
homepage = "https://github.com/rozgo/anevicon";

6
pkgs/tools/networking/croc/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "croc";
version = "9.1.2";
version = "9.1.3";
src = fetchFromGitHub {
owner = "schollz";
repo = pname;
rev = "v${version}";
sha256 = "sha256-7v8vz0n35ATWdmMcM2U7z1sONbmsaWQahHsramivm88=";
sha256 = "rVR2KfrK7M74kZUm5q23Lbj7hTLCN+p12RBaf3JAEXM=";
};
vendorSha256 = "sha256-IAyiD4v2UEGlWj8oZ0E3YhqyThJTjwjWjOzQKuj6Q9s=";
vendorSha256 = "sha256-f0KiXHspGX96k5ViCwI62Qs+rHowpqm+gLy7/iqdnE4=";
doCheck = false;

4
pkgs/tools/networking/networkmanager/applet/default.nix
View File

@ -25,11 +25,11 @@
stdenv.mkDerivation rec {
pname = "network-manager-applet";
version = "1.20.0";
version = "1.22.0";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0lsjkbv66hn7acl2pg9h6hz4b700zzv4cjwrwjvy7043blw0bcla";
sha256 = "sha256-xw2AtI1AqcuZ7JZ8xDifZ+fwMBUopp1IFXIEEzGmRr4=";
};
mesonFlags = [

28
pkgs/tools/networking/p2p/libtorrent-jesec/default.nix Normal file
View File

@ -0,0 +1,28 @@
{ lib, stdenv, fetchFromGitHub, cmake, gtest, openssl, zlib }:
stdenv.mkDerivation rec {
pname = "libtorrent-jesec";
version = "0.13.8-r1";
src = fetchFromGitHub {
owner = "jesec";
repo = "libtorrent";
rev = "v${version}";
sha256 = "sha256-Eh5pMkSe9uO0dPRWDg2BbbRxxuvX9FM2/OReq/61ojc=";
};
nativeBuildInputs = [ cmake ];
buildInputs = [ openssl zlib ];
# https://github.com/jesec/libtorrent/issues/1
doCheck = false;
checkInputs = [ gtest ];
meta = with lib; {
description = "A BitTorrent library written in C++ for *nix, with focus on high performance and good code (jesec's fork)";
homepage = "https://github.com/jesec/libtorrent";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ winterqt ];
platforms = platforms.linux;
};
}

57
pkgs/tools/networking/p2p/rtorrent-jesec/default.nix Normal file
View File

@ -0,0 +1,57 @@
{ lib
, stdenv
, fetchFromGitHub
, cmake
, gtest
, libtorrent-jesec
, curl
, ncurses
, xmlrpc_c
, nlohmann_json
, xmlRpcSupport ? true
, jsonRpcSupport ? true
}:
let
inherit (lib) optional;
in
stdenv.mkDerivation rec {
pname = "rtorrent-jesec";
version = "0.9.8-r13";
src = fetchFromGitHub {
owner = "jesec";
repo = "rtorrent";
rev = "v${version}";
sha256 = "1srn1ms7dvsn994zvb8i4m6gc144ygc7wc2a23bma79cqpl7drlw";
};
nativeBuildInputs = [ cmake ];
buildInputs = [ libtorrent-jesec curl ncurses ]
++ optional xmlRpcSupport xmlrpc_c
++ optional jsonRpcSupport nlohmann_json;
cmakeFlags = [ "-DUSE_RUNTIME_CA_DETECTION=NO" ]
++ optional (!xmlRpcSupport) "-DUSE_XMLRPC=NO"
++ optional (!jsonRpcSupport) "-DUSE_JSONRPC=NO";
doCheck = true;
checkInputs = [ gtest ];
prePatch = ''
substituteInPlace src/main.cc \
--replace "/etc/rtorrent/rtorrent.rc" "${placeholder "out"}/etc/rtorrent/rtorrent.rc"
'';
postFixup = ''
mkdir -p $out/etc/rtorrent
cp $src/doc/rtorrent.rc $out/etc/rtorrent/rtorrent.rc
'';
meta = with lib; {
description = "An ncurses client for libtorrent, ideal for use with screen, tmux, or dtach (jesec's fork)";
homepage = "https://github.com/jesec/rtorrent";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ winterqt ];
platforms = platforms.linux;
};
}

56
pkgs/tools/package-management/auditwheel/default.nix Normal file
View File

@ -0,0 +1,56 @@
{ lib
, bzip2
, patchelf
, python3
, gnutar
, unzip
}:
python3.pkgs.buildPythonApplication rec {
pname = "auditwheel";
version = "4.0.0";
disabled = python3.pkgs.pythonOlder "3.6";
src = python3.pkgs.fetchPypi {
inherit pname version;
sha256 = "03a079fe273f42336acdb5953ff5ce7578f93ca6a832b16c835fe337a1e2bd4a";
};
nativeBuildInputs = with python3.pkgs; [
pbr
];
propagatedBuildInputs = with python3.pkgs; [
pyelftools
setuptools
];
# integration tests require docker and networking
disabledTestPaths = [ "tests/integration" ];
checkInputs = with python3.pkgs; [
pretend
pytestCheckHook
];
# ensure that there are no undeclared deps
postCheck = ''
PATH= PYTHONPATH= $out/bin/auditwheel --version > /dev/null
'';
makeWrapperArgs = [
"--prefix" "PATH" ":" (lib.makeBinPath [ bzip2 gnutar patchelf unzip ])
];
meta = with lib; {
description = "Auditing and relabeling cross-distribution Linux wheels";
homepage = "https://github.com/pypa/auditwheel";
license = with licenses; [
mit # auditwheel and nibabel
bsd2 # from https://github.com/matthew-brett/delocate
bsd3 # from https://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-projects/pax-utils/lddtree.py
];
maintainers = with maintainers; [ davhau ];
};
}

36
pkgs/tools/security/gencfsm/default.nix
View File

@ -1,21 +1,39 @@
{ lib, stdenv, fetchurl, autoconf, automake, intltool, libtool, pkg-config, encfs
, glib , libgee, gtk3, libgnome-keyring, vala, wrapGAppsHook, xorg, gobject-introspection
{ lib, stdenv, fetchurl, autoconf, automake, intltool, libtool, pkg-config
, encfs, libsecret , glib , libgee, gtk3, vala, wrapGAppsHook, xorg
, gobject-introspection
}:
stdenv.mkDerivation rec {
version = "1.8.19";
version = "1.9";
pname = "gnome-encfs-manager";
src = fetchurl {
url = "https://launchpad.net/gencfsm/trunk/1.8/+download/gnome-encfs-manager_${version}.tar.xz";
sha256 = "1h6x8dyp1fvxvr8fwki98ppf4sa20qf7g59jc9797b2vrgm60h1i";
url = with lib.versions;
"https://launchpad.net/gencfsm/trunk/${major version}.${minor version}/+download/gnome-encfs-manager_${version}.tar.xz";
sha256 = "RXVwg/xhfAQv3pWp3UylOhMKDh9ZACTuKM4lPrn1dk8=";
};
nativeBuildInputs = [ pkg-config ];
buildInputs = [ autoconf automake intltool libtool vala glib encfs
gtk3 libgnome-keyring libgee xorg.libSM xorg.libICE
wrapGAppsHook gobject-introspection ];
nativeBuildInputs = [
autoconf
automake
intltool
libtool
pkg-config
vala
wrapGAppsHook
];
buildInputs = [
glib
encfs
gtk3
libgee
xorg.libSM
xorg.libICE
gobject-introspection
libsecret
];
# Fix hardcoded paths to /bin/mkdir
patches = [ ./makefile-mkdir.patch ];
preConfigure = ''

6
pkgs/tools/text/dcs/default.nix
View File

@ -1,8 +1,7 @@
{ lib
, buildGoModule
, fetchFromGitHub
, python3Packages
, perl
, yuicompressor
, zopfli
, stdenv
}:
@ -23,8 +22,7 @@ buildGoModule {
doCheck = false;
nativeBuildInputs = [
python3Packages.slimit
(perl.withPackages (p: [ p.CSSMinifier ]))
yuicompressor
zopfli
];

14
pkgs/tools/text/poedit/default.nix
View File

@ -1,14 +1,16 @@
{ lib, stdenv, fetchurl, autoconf, automake, libtool, gettext, pkg-config, wxGTK30-gtk3,
{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, gettext, pkg-config, wxGTK30-gtk3,
boost, icu, lucenepp, asciidoc, libxslt, xmlto, gtk3, gtkspell3, pugixml,
nlohmann_json, hicolor-icon-theme, wrapGAppsHook }:
stdenv.mkDerivation rec {
pname = "poedit";
version = "2.4.2";
version = "2.4.3";
src = fetchurl {
url = "https://github.com/vslavik/poedit/archive/v${version}-oss.tar.gz";
sha256 = "1kry3xphrdccx8znfm9pw5872c5w0ri7cknlad4qcps54b25nnzk";
src = fetchFromGitHub {
owner = "vslavik";
repo = "poedit";
rev = "v${version}-oss";
sha256 = "02xf2w3d2lnr3vqmil9vvg9pir7d21x4zrj9xwpgb7dhs0gimj0x";
};
nativeBuildInputs = [ autoconf automake asciidoc wrapGAppsHook
@ -41,6 +43,6 @@ stdenv.mkDerivation rec {
homepage = "https://www.poedit.net/";
license = licenses.mit;
platforms = platforms.unix;
maintainers = with maintainers; [ ];
maintainers = with maintainers; [ dasj19 ];
};
}

83
pkgs/tools/typesetting/skribilo/default.nix
View File

@ -1,64 +1,75 @@
{ lib, stdenv
{ lib
, stdenv
, fetchurl
, pkg-config
, gettext
, guile
, guile-reader
, guile-lib
, ploticus
, imagemagick
, ghostscript
, transfig
, enableEmacs ? false, emacs ? null
, enableLout ? true, lout ? null
, enableTex ? true, tex ? null
, guile
, guile-lib
, guile-reader
, imagemagick
, makeWrapper
, pkg-config
, ploticus
, transfig
, enableEmacs ? false, emacs
, enableLout ? true, lout
, enableTex ? true, tex
}:
let
inherit (lib) optional;
in stdenv.mkDerivation rec{
pname = "skribilo";
version = "0.9.5";
inherit (lib) optional;
in stdenv.mkDerivation {
inherit pname version;
src = fetchurl {
url = "http://download.savannah.nongnu.org/releases/skribilo/${pname}-${version}.tar.gz";
sha256 = "sha256-AIJqIcRjT7C0EO6J60gGjERdgAglh0ZU49U9XKPwvwk=";
};
nativeBuildInputs = [ pkg-config makeWrapper ];
buildInputs = [ gettext guile ploticus imagemagick ghostscript transfig ]
nativeBuildInputs = [
pkg-config
makeWrapper
];
buildInputs = [
gettext
ghostscript
guile
guile-lib
guile-reader
imagemagick
ploticus
transfig
]
++ optional enableEmacs emacs
++ optional enableLout lout
++ optional enableTex tex;
propagatedBuildInputs = [ guile-reader guile-lib ];
postInstall =
let
guileVersion = lib.versions.majorMinor guile.version;
in
''
wrapProgram $out/bin/skribilo \
--prefix GUILE_LOAD_PATH : "$out/share/guile/site/${guileVersion}:$GUILE_LOAD_PATH" \
--prefix GUILE_LOAD_COMPILED_PATH : "$out/lib/guile/${guileVersion}/site-ccache:$GUILE_LOAD_COMPILED_PATH"
'';
postInstall = ''
wrapProgram $out/bin/skribilo \
--prefix GUILE_LOAD_PATH : "$out/share/guile/site:${guile-lib}/share/guile/site:${guile-reader}/share/guile/site" \
--prefix GUILE_LOAD_COMPILED_PATH : "$out/share/guile/site:${guile-lib}/share/guile/site:${guile-reader}/share/guile/site"
'';
meta = with lib;{
meta = with lib; {
homepage = "https://www.nongnu.org/skribilo/";
description = "The Ultimate Document Programming Framework";
longDescription = ''
Skribilo is a free document production tool that takes a
structured document representation as its input and renders that
document in a variety of output formats: HTML and Info for
on-line browsing, and Lout and LaTeX for high-quality hard
copies.
Skribilo is a free document production tool that takes a structured
document representation as its input and renders that document in a
variety of output formats: HTML and Info for on-line browsing, and Lout
and LaTeX for high-quality hard copies.
The input document can use Skribilo's markup language to provide
information about the document's structure, which is similar to
HTML or LaTeX and does not require expertise. Alternatively, it
can use a simpler, "markup-less" format that borrows from Emacs'
outline mode and from other conventions used in emails, Usenet
and text.
information about the document's structure, which is similar to HTML or
LaTeX and does not require expertise. Alternatively, it can use a simpler,
"markup-less" format that borrows from Emacs' outline mode and from other
conventions used in emails, Usenet and text.
'';
homepage = "https://www.nongnu.org/skribilo/";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ AndersonTorres ];
platforms = platforms.unix;

29
pkgs/top-level/all-packages.nix
View File

@ -156,7 +156,9 @@ in
antsimulator = callPackage ../games/antsimulator { };
atuin = callPackage ../tools/misc/atuin { };
atuin = callPackage ../tools/misc/atuin {
inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration;
};
fiche = callPackage ../servers/fiche { };
@ -804,6 +806,8 @@ in
albert = libsForQt5.callPackage ../applications/misc/albert {};
auditwheel = callPackage ../tools/package-management/auditwheel { };
gobgp = callPackage ../tools/networking/gobgp { };
metapixel = callPackage ../tools/graphics/metapixel { };
@ -2417,6 +2421,8 @@ in
dyndnsc = callPackage ../applications/networking/dyndns/dyndnsc { };
earthly = callPackage ../development/tools/earthly { };
earlybird = callPackage ../tools/security/earlybird { };
earlyoom = callPackage ../os-specific/linux/earlyoom { };
@ -3654,7 +3660,9 @@ in
cfssl = callPackage ../tools/security/cfssl { };
chafa = callPackage ../tools/misc/chafa { };
chafa = callPackage ../tools/misc/chafa {
inherit (darwin.apple_sdk.frameworks) Foundation;
};
checkbashisms = callPackage ../development/tools/misc/checkbashisms { };
@ -6203,6 +6211,8 @@ in
minidlna = callPackage ../tools/networking/minidlna { };
minipro = callPackage ../tools/misc/minipro { };
minisign = callPackage ../tools/security/minisign { };
ministat = callPackage ../tools/misc/ministat { };
@ -6456,6 +6466,8 @@ in
libtorrent = callPackage ../tools/networking/p2p/libtorrent { };
libtorrent-jesec = callPackage ../tools/networking/p2p/libtorrent-jesec { };
libmpack = callPackage ../development/libraries/libmpack { };
libiberty = callPackage ../development/libraries/libiberty { };
@ -8174,6 +8186,8 @@ in
rtorrent = callPackage ../tools/networking/p2p/rtorrent { };
rtorrent-jesec = callPackage ../tools/networking/p2p/rtorrent-jesec { };
rubber = callPackage ../tools/typesetting/rubber { };
rubocop = callPackage ../development/tools/rubocop { };
@ -11868,6 +11882,7 @@ in
erlang_nox = beam_nox.interpreters.erlang;
inherit (beam.packages.erlang)
erlang-ls
rebar rebar3 rebar3WithPlugins
fetchHex beamPackages
relxExe;
@ -25108,6 +25123,8 @@ in
ptex = callPackage ../development/libraries/ptex {};
pyright = nodePackages.pyright;
qbec = callPackage ../applications/networking/cluster/qbec { };
qemacs = callPackage ../applications/editors/qemacs { };
@ -26349,7 +26366,9 @@ in
# customConfig = builtins.readFile ./tabbed.config.h;
};
taffybar = callPackage ../applications/window-managers/taffybar {};
taffybar = callPackage ../applications/window-managers/taffybar {
inherit (haskellPackages) ghcWithPackages taffybar;
};
tagainijisho = callPackage ../applications/office/tagainijisho {};
@ -28441,6 +28460,8 @@ in
nativeOnly = true;
}).run;
steam-tui = callPackage ../games/steam-tui { };
steamcmd = steamPackages.steamcmd;
protontricks = python3Packages.callPackage ../tools/package-management/protontricks {
@ -30852,7 +30873,7 @@ in
vimb = wrapFirefox vimb-unwrapped { };
vips = callPackage ../tools/graphics/vips {
inherit (darwin.apple_sdk.frameworks) ApplicationServices;
inherit (darwin.apple_sdk.frameworks) ApplicationServices Foundation;
};
nip2 = callPackage ../tools/graphics/nip2 { };

14
pkgs/top-level/python-packages.nix
View File

@ -1928,8 +1928,6 @@ in {
django-picklefield = callPackage ../development/python-modules/django-picklefield { };
django_pipeline = callPackage ../development/python-modules/django-pipeline { };
django_polymorphic = callPackage ../development/python-modules/django-polymorphic { };
django-postgresql-netfields = callPackage ../development/python-modules/django-postgresql-netfields { };
@ -2567,6 +2565,8 @@ in {
fpylll = callPackage ../development/python-modules/fpylll { };
fpyutils = callPackage ../development/python-modules/fpyutils { };
freebox-api = callPackage ../development/python-modules/freebox-api { };
freetype-py = callPackage ../development/python-modules/freetype-py { };
@ -4123,8 +4123,12 @@ in {
mcstatus = callPackage ../development/python-modules/mcstatus { };
md-toc = callPackage ../development/python-modules/md-toc { };
md2gemini = callPackage ../development/python-modules/md2gemini { };
mdformat = callPackage ../development/python-modules/mdformat { };
mdit-py-plugins = callPackage ../development/python-modules/mdit-py-plugins { };
MDP = callPackage ../development/python-modules/mdp { };
@ -4369,6 +4373,10 @@ in {
mypy = callPackage ../development/python-modules/mypy { };
mypy-boto3-builder = callPackage ../development/python-modules/mypy-boto3-builder { };
mypy-boto3-s3 = callPackage ../development/python-modules/mypy-boto3-s3 { };
mypy-extensions = callPackage ../development/python-modules/mypy/extensions.nix { };
mypy-protobuf = callPackage ../development/python-modules/mypy-protobuf { };
@ -5300,6 +5308,8 @@ in {
py-air-control-exporter = callPackage ../development/python-modules/py-air-control-exporter { };
py-dmidecode = callPackage ../development/python-modules/py-dmidecode { };
py2bit = callPackage ../development/python-modules/py2bit { };
py3buddy = toPythonModule (callPackage ../development/python-modules/py3buddy { });