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

Merge master into haskell-updates

Browse Source
This commit is contained in:
github-actions[bot] 2022-07-24 00:17:07 +00:00 committed by GitHub
commit 9ef31d6f7b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
107 changed files with 1092 additions and 575 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
maintainers/maintainer-list.nix
View File

@ -4366,6 +4366,12 @@
githubId = 405105;
name = "Dustin Frisch";
};
foo-dogsquared = {
email = "foo.dogsquared@gmail.com";
github = "foo-dogsquared";
githubId = 34962634;
name = "Gabriel Arazas";
};
forkk = {
email = "forkk@forkk.net";
github = "Forkk";

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

@ -267,6 +267,13 @@
been removed due to lack of upstream maintenance.
</para>
</listitem>
<listitem>
<para>
The <literal>meta.mainProgram</literal> attribute of packages
in <literal>wineWowPackages</literal> now defaults to
<literal>&quot;wine64&quot;</literal>.
</para>
</listitem>
<listitem>
<para>
(Neo)Vim can not be configured with

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

@ -104,6 +104,8 @@ In addition to numerous new and upgraded packages, this release has the followin
`python3.pkgs.influxgraph` packages, have been removed due to lack of upstream
maintenance.
- The `meta.mainProgram` attribute of packages in `wineWowPackages` now defaults to `"wine64"`.
- (Neo)Vim can not be configured with `configure.pathogen` anymore to reduce maintainance burden.
Use `configure.packages` instead.

1
nixos/modules/services/continuous-integration/jenkins/job-builder.nix
View File

@ -243,6 +243,7 @@ in {
done
'' + (if cfg.accessUser != "" then reloadScript else "");
serviceConfig = {
Type = "oneshot";
User = jenkinsCfg.user;
RuntimeDirectory = "jenkins-job-builder";
};

14
nixos/modules/services/networking/syncthing.nix
View File

@ -30,15 +30,22 @@ let
updateConfig = pkgs.writers.writeDash "merge-syncthing-config" ''
set -efu
# be careful not to leak secrets in the filesystem or in process listings
umask 0077
# get the api key by parsing the config.xml
while
! api_key=$(${pkgs.libxml2}/bin/xmllint \
! ${pkgs.libxml2}/bin/xmllint \
--xpath 'string(configuration/gui/apikey)' \
${cfg.configDir}/config.xml)
${cfg.configDir}/config.xml \
>"$RUNTIME_DIRECTORY/api_key"
do sleep 1; done
(printf "X-API-Key: "; cat "$RUNTIME_DIRECTORY/api_key") >"$RUNTIME_DIRECTORY/headers"
curl() {
${pkgs.curl}/bin/curl -sSLk -H "X-API-Key: $api_key" \
${pkgs.curl}/bin/curl -sSLk -H "@$RUNTIME_DIRECTORY/headers" \
--retry 1000 --retry-delay 1 --retry-all-errors \
"$@"
}
@ -576,6 +583,7 @@ in {
serviceConfig = {
User = cfg.user;
RemainAfterExit = true;
RuntimeDirectory = "syncthing-init";
Type = "oneshot";
ExecStart = updateConfig;
};

6
nixos/tests/jenkins.nix
View File

@ -81,7 +81,7 @@ import ./make-test-python.nix ({ pkgs, ...} : {
in ''
start_all()
master.wait_for_unit("jenkins")
master.wait_for_unit("default.target")
assert "Authentication required" in master.succeed("curl http://localhost:8080")
@ -96,8 +96,6 @@ import ./make-test-python.nix ({ pkgs, ...} : {
with subtest("jobs are declarative"):
# Check that jobs are created on disk.
master.wait_for_unit("jenkins-job-builder")
master.wait_until_fails("systemctl is-active jenkins-job-builder")
master.wait_until_succeeds("test -f /var/lib/jenkins/jobs/job-1/config.xml")
master.wait_until_succeeds("test -f /var/lib/jenkins/jobs/folder-1/config.xml")
master.wait_until_succeeds("test -f /var/lib/jenkins/jobs/folder-1/jobs/job-2/config.xml")
@ -115,8 +113,6 @@ import ./make-test-python.nix ({ pkgs, ...} : {
)
# Check that jobs are removed from disk.
master.wait_for_unit("jenkins-job-builder")
master.wait_until_fails("systemctl is-active jenkins-job-builder")
master.wait_until_fails("test -f /var/lib/jenkins/jobs/job-1/config.xml")
master.wait_until_fails("test -f /var/lib/jenkins/jobs/folder-1/config.xml")
master.wait_until_fails("test -f /var/lib/jenkins/jobs/folder-1/jobs/job-2/config.xml")

4
nixos/tests/podgrab.nix
View File

@ -22,11 +22,11 @@ import ./make-test-python.nix ({ pkgs, ... }: {
start_all()
default.wait_for_unit("podgrab")
default.wait_for_open_port(defaultPort)
default.wait_for_open_port(${toString defaultPort})
default.succeed("curl --fail http://localhost:${toString defaultPort}")
customized.wait_for_unit("podgrab")
customized.wait_for_open_port(customPort)
customized.wait_for_open_port(${toString customPort})
customized.succeed("curl --fail http://localhost:${toString customPort}")
'';

4
pkgs/applications/audio/bambootracker/default.nix
View File

@ -12,14 +12,14 @@
mkDerivation rec {
pname = "bambootracker";
version = "0.5.0";
version = "0.5.1";
src = fetchFromGitHub {
owner = "BambooTracker";
repo = "BambooTracker";
rev = "v${version}";
fetchSubmodules = true;
sha256 = "1mpbvhsmrn0wdmxfp3n5dwv4474qlhy47r3vwc2jwdslq6vgl1fa";
sha256 = "sha256-AEELUJYiapF/sBWRXXuBXUHwnKp0szdIOCNVMYufv94=";
};
nativeBuildInputs = [ qmake qttools pkg-config ];

4
pkgs/applications/audio/carla/default.nix
View File

@ -15,13 +15,13 @@ assert withGtk3 -> gtk3 != null;
stdenv.mkDerivation rec {
pname = "carla";
version = "2.4.3";
version = "2.5.0";
src = fetchFromGitHub {
owner = "falkTX";
repo = pname;
rev = "v${version}";
sha256 = "sha256-FAQTIM5NpcOhLNMf62qiKaxg6QtK5uIJF/XT6KJVnUc=";
sha256 = "sha256-KcwEuiy58wjTr+RWPmpMaPgM0olzxiWp9MMYiKwmIcI=";
};
nativeBuildInputs = [

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

@ -13,13 +13,13 @@
stdenv.mkDerivation rec {
pname = "ft2-clone";
version = "1.55";
version = "1.56";
src = fetchFromGitHub {
owner = "8bitbubsy";
repo = "ft2-clone";
rev = "v${version}";
sha256 = "sha256-qk6SHL9K4+9Em1jjrPOm14msOoqRiAahlRoiRiAMLC0=";
sha256 = "sha256-kSnsep6abE07Q1EpGEeX8e/2APc60TxR2MhLZxqW9WY=";
};
# Adapt the linux-only CMakeLists to darwin (more reliable than make-macos.sh)

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

@ -4,11 +4,11 @@ cups, vivaldi-ffmpeg-codecs, libpulseaudio, at-spi2-core, libxkbcommon, mesa }:
stdenv.mkDerivation rec {
pname = "exodus";
version = "22.6.17";
version = "22.7.15";
src = fetchurl {
url = "https://downloads.exodus.io/releases/${pname}-linux-x64-${version}.zip";
sha256 = "1gllmrmc1gylw54yrgy1ggpn3kvkyxf7ydjvd5n5kvd8d9xh78ng";
sha256 = "sha256-tQwxzhy+d2hA7VvZB9qSF7uaYIffAyX9ovZYQ8HDEB8=";
};
sourceRoot = ".";

4
pkgs/applications/editors/vscode/extensions/default.nix
View File

@ -1955,8 +1955,8 @@ let
mktplcRef = {
name = "prisma";
publisher = "Prisma";
version = "3.14.0";
sha256 = "09dlm2awd2h0xmx1vcx95kdvz3xf4f5pd7zcdg3mb0g2az4nfld7";
version = "4.1.0";
sha256 = "sha256-YpdxRoeIesx4R2RIpJ8YmmHEmR3lezdN1efhhg14MzI=";
};
meta = with lib; {
changelog = "https://marketplace.visualstudio.com/items/Prisma.prisma/changelog";

4
pkgs/applications/emulators/wine/base.nix
View File

@ -6,7 +6,7 @@
patches,
vkd3dArches,
moltenvk,
buildScript ? null, configureFlags ? []
buildScript ? null, configureFlags ? [], mainProgram ? "wine"
}:
with import ./util.nix { inherit lib; };
@ -198,6 +198,6 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) {
description = if supportFlags.waylandSupport then "An Open Source implementation of the Windows API on top of OpenGL and Unix (with experimental Wayland support)" else "An Open Source implementation of the Windows API on top of X, OpenGL, and Unix";
platforms = if supportFlags.waylandSupport then (lib.remove "x86_64-darwin" prevPlatforms) else prevPlatforms;
maintainers = with lib.maintainers; [ avnik raskin bendlas jmc-figueira ];
mainProgram = "wine";
inherit mainProgram;
};
})

2
pkgs/applications/emulators/wine/packages.nix
View File

@ -28,6 +28,7 @@ in with src; {
monos = [ mono ];
configureFlags = [ "--enable-win64" ];
platforms = [ "x86_64-linux" "x86_64-darwin" ];
mainProgram = "wine64";
};
wineWow = callPackage ./base.nix {
pname = "wine-wow";
@ -40,5 +41,6 @@ in with src; {
monos = [ mono ];
buildScript = ./builder-wow.sh;
platforms = [ "x86_64-linux" ];
mainProgram = "wine64";
};
}

1
pkgs/applications/kde/default.nix
View File

@ -145,6 +145,7 @@ let
kio-extras = callPackage ./kio-extras.nix {};
kio-gdrive = callPackage ./kio-gdrive.nix {};
kipi-plugins = callPackage ./kipi-plugins.nix {};
kirigami-gallery = callPackage ./kirigami-gallery.nix {};
kitinerary = callPackage ./kitinerary.nix {};
kldap = callPackage ./kldap.nix {};
kleopatra = callPackage ./kleopatra.nix {};

31
pkgs/applications/kde/kirigami-gallery.nix Normal file
View File

@ -0,0 +1,31 @@
{ mkDerivation
, lib
, kirigami2
, extra-cmake-modules
, kitemmodels
, qtgraphicaleffects
, qtquickcontrols2
, qttools
, qtbase
}:
mkDerivation rec {
pname = "kirigami-gallery";
nativeBuildInputs = [ extra-cmake-modules qttools ];
buildInputs = [
qtgraphicaleffects
qtquickcontrols2
kirigami2
kitemmodels
];
meta = with lib; {
homepage = "https://apps.kde.org/kirigami2.gallery/";
description = "View examples of Kirigami components";
license = licenses.lgpl2;
maintainers = with maintainers; [ shadowrz ];
broken = versionOlder qtbase.version "5.15";
};
}

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

@ -12,12 +12,12 @@ let
if extension == "zip" then fetchzip args else fetchurl args;
pname = "1password-cli";
version = "2.5.1";
version = "2.6.0";
sources = rec {
aarch64-linux = fetch "linux_arm64" "sha256-HZ6AVheJrw9ZR9HGWbB6/kCzbrfYcwApa2z18tDBo1k=" "zip";
i686-linux = fetch "linux_386" "sha256-aG6oW0epF+P9pSWMlTStSbBynBDkGX1B+0NHUnwLRhs=" "zip";
x86_64-linux = fetch "linux_amd64" "sha256-7GkBVcvXM/WZiXEiIbYh9lS0f4BS4Hc4RCVjr8FoW8A=" "zip";
aarch64-darwin = fetch "apple_universal" "sha256-XebD33fX15RsFUdbV+DvMRIi1MSyMfIRC3JOwcmi8kk=" "pkg";
aarch64-linux = fetch "linux_arm64" "sha256-2V3/F7/HEOvk2T1dv4rnS0xu6Z5EqGSV/9erED7ZS1w=" "zip";
i686-linux = fetch "linux_386" "sha256-z4pKZY5DQ2oDHHuet1S/p7GM+rXS8/8xmTrN+rqCUBo=" "zip";
x86_64-linux = fetch "linux_amd64" "sha256-1/DgwHMkUenj+2ZyADeBK1HJ3M/b2PoAey36eAqAUSQ=" "zip";
aarch64-darwin = fetch "apple_universal" "sha256-YPidRXNzNNuDoM2Gd5dEsCDxwosBJFKSzjoP0SPkQZs=" "pkg";
x86_64-darwin = aarch64-darwin;
};
platforms = builtins.attrNames sources;

89
pkgs/applications/misc/gnome-frog/default.nix Normal file
View File

@ -0,0 +1,89 @@
{ stdenv
, lib
, fetchFromGitHub
, python3Packages
, wrapGAppsHook4
, gtk4
, meson
, ninja
, pkg-config
, appstream-glib
, desktop-file-utils
, glib
, gobject-introspection
, libnotify
, libadwaita
, libportal
, gettext
, librsvg
, tesseract5
, zbar
}:
python3Packages.buildPythonApplication rec {
pname = "gnome-frog";
version = "1.1.3";
src = fetchFromGitHub {
owner = "TenderOwl";
repo = "Frog";
rev = version;
sha256 = "sha256-yOjfiGJUU25zb/4WprPU59yDAMpttS3jREp1kB5mXUE=";
};
format = "other";
patches = [ ./update-compatible-with-non-flatpak-env.patch ];
postPatch = ''
chmod +x ./build-aux/meson/postinstall.py
patchShebangs ./build-aux/meson/postinstall.py
substituteInPlace ./build-aux/meson/postinstall.py \
--replace "gtk-update-icon-cache" "gtk4-update-icon-cache"
substituteInPlace ./frog/language_manager.py --subst-var out
'';
nativeBuildInputs = [
appstream-glib
desktop-file-utils
gettext
meson
ninja
pkg-config
glib
wrapGAppsHook4
];
buildInputs = [
librsvg
gobject-introspection
libnotify
libadwaita
libportal
zbar
tesseract5
];
propagatedBuildInputs = with python3Packages; [
pygobject3
pillow
pytesseract
pyzbar
];
# This is to prevent double-wrapping the package. We'll let
# Python do it by adding certain arguments inside of the
# wrapper instead.
dontWrapGApps = true;
preFixup = ''
makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
'';
meta = with lib; {
homepage = "https://getfrog.app/";
description =
"Intuitive text extraction tool (OCR) for GNOME desktop";
license = licenses.mit;
maintainers = with maintainers; [ foo-dogsquared ];
platforms = platforms.linux;
};
}

33
pkgs/applications/misc/gnome-frog/update-compatible-with-non-flatpak-env.patch Normal file
View File

@ -0,0 +1,33 @@
diff --git a/frog/config.py b/frog/config.py
index 9837755..b73e4e3 100644
--- a/frog/config.py
+++ b/frog/config.py
@@ -30,10 +30,14 @@ import os
APP_ID = "com.github.tenderowl.frog"
RESOURCE_PREFIX = "/com/github/tenderowl/frog"
+# This is based from the XDG Base Directory specification.
+if not os.getenv('XDG_DATA_HOME'):
+ os.environ['XDG_DATA_HOME'] = os.path.expanduser("~/.local/share")
+
if not os.path.exists(os.path.join(os.environ['XDG_DATA_HOME'], 'tessdata')):
os.mkdir(os.path.join(os.environ['XDG_DATA_HOME'], 'tessdata'))
tessdata_url = "https://github.com/tesseract-ocr/tessdata/raw/main/"
tessdata_best_url = "https://github.com/tesseract-ocr/tessdata_best/raw/main/"
tessdata_dir = os.path.join(os.environ['XDG_DATA_HOME'], 'tessdata')
-tessdata_config = f'--tessdata-dir {tessdata_dir} –psm 6'
+tessdata_config = f'–-psm 6 --tessdata-dir {tessdata_dir}'
diff --git a/frog/language_manager.py b/frog/language_manager.py
index 5752be6..4f6a908 100644
--- a/frog/language_manager.py
+++ b/frog/language_manager.py
@@ -156,7 +156,7 @@ class LanguageManager(GObject.GObject):
os.mkdir(tessdata_dir)
dest_path = os.path.join(tessdata_dir, 'eng.traineddata')
- source_path = pathlib.Path('/app/share/appdata/eng.traineddata')
+ source_path = pathlib.Path('@out@/share/appdata/eng.traineddata')
if os.path.exists(dest_path):
return

4
pkgs/applications/misc/organicmaps/default.nix
View File

@ -19,13 +19,13 @@
mkDerivation rec {
pname = "organicmaps";
version = "2022.06.18-2";
version = "2022.06.29-3";
src = fetchFromGitHub {
owner = "organicmaps";
repo = "organicmaps";
rev = "${version}-android";
sha256 = "sha256-FlytRGiqGr9L5ZwL1slbPjagJKsleOXM8+loPmtfccI=";
sha256 = "sha256-/K3bxnb6y+9nEuGvoIpPl218xmNqjOWgpV8hQ/W12ZA=";
fetchSubmodules = true;
};

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

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "waypoint";
version = "0.8.2";
version = "0.9.0";
src = fetchFromGitHub {
owner = "hashicorp";
repo = pname;
rev = "v${version}";
sha256 = "sha256-Pq1gGXROPHHMaOoQwx6cObvMF+SoilOROR4bwI0Y/GM=";
sha256 = "sha256-R+X0fp4AdC3u+/rX2Vb0P3MTBRi94wfT9YvW2pxwr5Y=";
};
vendorSha256 = "sha256-Q8ookgQwecRuSrnQiIREBMDxK9NAWfHu+sIQeMO/T4w=";
vendorSha256 = "sha256-bDsmou4zmRz8DyENdteJ3MzhTpCgri4ISIgxi7fhQdc=";
nativeBuildInputs = [ go-bindata installShellFiles ];

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

@ -5,21 +5,22 @@
, installShellFiles
, btrfs-progs
, glibc
, gitUpdater
, testers
, werf
}:
buildGoModule rec {
pname = "werf";
version = "1.2.128";
version = "1.2.138";
src = fetchFromGitHub {
owner = "werf";
repo = "werf";
rev = "v${version}";
sha256 = "sha256-H1GzIxj6ZrlcNM4Y0oKYoVBsMFj4wYP9XYicAmIpaik=";
sha256 = "sha256-gRMPTw/PzAE/kij4dq9ph/1Iz/a+fEsT5HSogC5EDFE=";
};
vendorSha256 = "sha256-78V+cw0A3Q3Gagl4KrserFXvV17MSqhpaFG38VKwhKg=";
vendorSha256 = "sha256-6/XiTgAQ3M3ge/b7uEFD0K+3kd7I2yqZJjgPVXP+uQ0=";
proxyVendor = true;
@ -58,10 +59,10 @@ buildGoModule rec {
--zsh <($out/bin/werf completion --shell=zsh)
'';
passthru.updateScript = gitUpdater {
inherit pname version;
ignoredVersions = "1\.[3-9].*";
rev-prefix = "v";
passthru.tests.version = testers.testVersion {
package = werf;
command = "werf version";
version = "v${version}";
};
meta = with lib; {

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

@ -33,13 +33,13 @@
mkDerivation rec {
pname = "nheko";
version = "0.9.3";
version = "0.10.0";
src = fetchFromGitHub {
owner = "Nheko-Reborn";
repo = "nheko";
rev = "v${version}";
sha256 = "sha256-h1Yahz7Rt7+r55RFTSVj6E14nWnjCs0CecljceaWgaQ=";
sha256 = "sha256-JNAI1+GmRgee7bqeJi8JadV3W7vXMpEvvKqqinb97Ng=";
};
nativeBuildInputs = [

4
pkgs/applications/networking/irc/irssi/default.nix
View File

@ -16,13 +16,13 @@
stdenv.mkDerivation rec {
pname = "irssi";
version = "1.4.1";
version = "1.4.2";
src = fetchFromGitHub {
owner = "irssi";
repo = "irssi";
rev = version;
hash = "sha256-HLcIhAZoJfCHoSNQCpoytBR0zmiZd919FcKWCl35G0A=";
hash = "sha256-dQZ/CeBfcfWGjKPF3fR62JDqyEXGv5hd9VT4OEbgJhQ=";
};
nativeBuildInputs = [

17
pkgs/applications/office/fava/default.nix
View File

@ -1,26 +1,15 @@
{ lib, python3, fetchpatch }:
{ lib, python3 }:
python3.pkgs.buildPythonApplication rec {
pname = "fava";
version = "1.21";
version = "1.22.1";
format = "pyproject";
src = python3.pkgs.fetchPypi {
inherit pname version;
sha256 = "sha256-0aFCKEjmXn6yddgNMi9t4rzqHcN7VBLoz3LEg9apmNY=";
sha256 = "sha256-gte1N43b9AokmEqONdvEcaGXDPIeGflsk+wuxDtTeR4=";
};
patches = [
(fetchpatch {
# Update werkzeug compatibility
url = "https://github.com/beancount/fava/commit/5a99417a42e1d739b1e57fae2d01ff1d146dcbc2.patch";
hash = "sha256-Y6IcxZAcFJEYgT8/xBIABdkP+pUdQX1EgSS5uNdSJUE=";
excludes = [
".pre-commit-config.yaml"
];
})
];
nativeBuildInputs = with python3.pkgs; [ setuptools-scm ];
propagatedBuildInputs = with python3.pkgs; [

9
pkgs/applications/virtualization/crosvm/default.nix
View File

@ -1,5 +1,6 @@
{ stdenv, lib, rustPlatform, fetchgit
, pkg-config, wayland-scanner, libcap, minijail, wayland, wayland-protocols
, pkg-config, wayland-scanner
, libcap, libdrm, libepoxy, minijail, virglrenderer, wayland, wayland-protocols
, linux
}:
@ -30,7 +31,9 @@ in
nativeBuildInputs = [ pkg-config wayland-scanner ];
buildInputs = [ libcap minijail wayland wayland-protocols ];
buildInputs = [
libcap libdrm libepoxy minijail virglrenderer wayland wayland-protocols
];
postPatch = ''
cp ${./Cargo.lock} Cargo.lock
@ -42,6 +45,8 @@ in
export DEFAULT_SECCOMP_POLICY_DIR=$out/share/policy
'';
buildFeatures = [ "default" "virgl_renderer" "virgl_renderer_next" ];
postInstall = ''
mkdir -p $out/share/policy/
cp seccomp/${arch}/* $out/share/policy/

4
pkgs/data/themes/orchis-theme/default.nix
View File

@ -21,13 +21,13 @@ assert lib.assertMsg (unknownTweaks == [ ]) ''
stdenvNoCC.mkDerivation
rec {
pname = "orchis-theme";
version = "2022-05-29";
version = "2022-07-20";
src = fetchFromGitHub {
repo = "Orchis-theme";
owner = "vinceliuice";
rev = version;
sha256 = "sha256-F4kqQ1B8JNo2TAdGFondAtQu5C/6os9SQ8NS2gfRCQM=";
sha256 = "sha256-0T9D42XwyvIb5XeXdqXbyahVHNcSeT469lSgWSisNvA=";
};
nativeBuildInputs = [ gtk3 sassc ];

2
pkgs/desktops/lxqt/pcmanfm-qt/default.nix
View File

@ -3,6 +3,7 @@
, fetchFromGitHub
, cmake
, pkg-config
, libexif
, lxqt
, qtbase
, qttools
@ -32,6 +33,7 @@ mkDerivation rec {
];
buildInputs = [
libexif
qtbase
qttools
qtx11extras

8
pkgs/desktops/mate/default.nix
View File

@ -1,9 +1,7 @@
{ pkgs, newScope }:
{ pkgs, lib }:
let
callPackage = newScope self;
self = rec {
packages = self: with self; {
# Update script tailored to mate packages from git repository
mateUpdateScript = { pname, version, odd-unstable ? true, rev-prefix ? "v", url ? null }:
@ -101,4 +99,4 @@ let
};
in self
in lib.makeScope pkgs.newScope packages

13
pkgs/development/interpreters/duktape/default.nix
View File

@ -8,20 +8,16 @@ stdenv.mkDerivation rec {
sha256 = "sha256-kPjS+otVZ8aJmDDd7ywD88J5YLEayiIvoXqnrGE8KJA=";
};
# https://github.com/svaarala/duktape/issues/2464
LDFLAGS = [ "-lm" ];
nativeBuildInputs = [ validatePkgConfig ];
postPatch = ''
substituteInPlace Makefile.sharedlibrary \
--replace 'gcc' '${stdenv.cc.targetPrefix}cc' \
--replace 'g++' '${stdenv.cc.targetPrefix}c++'
substituteInPlace Makefile.cmdline \
--replace 'gcc' '${stdenv.cc.targetPrefix}cc' \
--replace 'g++' '${stdenv.cc.targetPrefix}c++'
'';
buildPhase = ''
make -f Makefile.sharedlibrary
make -f Makefile.cmdline
'';
installPhase = ''
install -d $out/bin
install -m755 duk $out/bin/
@ -30,6 +26,7 @@ stdenv.mkDerivation rec {
make -f Makefile.sharedlibrary install INSTALL_PREFIX=$out
substituteAll ${./duktape.pc.in} $out/lib/pkgconfig/duktape.pc
'';
enableParallelBuilding = true;
meta = with lib; {

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

@ -14,13 +14,13 @@
stdenv.mkDerivation rec {
pname = "mtxclient";
version = "0.7.0";
version = "0.8.0";
src = fetchFromGitHub {
owner = "Nheko-Reborn";
repo = "mtxclient";
rev = "v${version}";
sha256 = "sha256-iGw+qdw7heL5q7G0dwtl4PX2UA0Kka0FUmH610dM/00=";
sha256 = "sha256-SQoPeUdDNQU4qYDd8udQnIJ6PrZFtEOmf9uqnw1+fz4=";
};
postPatch = ''

5
pkgs/development/libraries/ncnn/default.nix
View File

@ -11,18 +11,17 @@
stdenv.mkDerivation rec {
pname = "ncnn";
version = "20220216";
version = "20220721";
src = fetchFromGitHub {
owner = "Tencent";
repo = pname;
rev = version;
sha256 = "sha256-QHLD5NQZA7WR4mRQ0NIaXuAu59IV4SjXHOOlar5aOew=";
sha256 = "sha256-35OwvYYZtfugvujWl6bL8p8HU+z1kQsvnJ+aQOgO8V8=";
};
patches = [
./cmakelists.patch
./gpu-include.patch
];
cmakeFlags = [

13
pkgs/development/libraries/ncnn/gpu-include.patch
View File

@ -1,13 +0,0 @@
diff --git a/src/gpu.cpp b/src/gpu.cpp
index 51cd7f95..bf7ed828 100644
--- a/src/gpu.cpp
+++ b/src/gpu.cpp
@@ -21,7 +21,7 @@
#include <vulkan/vulkan.h>
#include "glslang/SPIRV/GlslangToSpv.h"
-#include "glslang/glslang/Public/ShaderLang.h"
+#include "glslang/Public/ShaderLang.h"
#include "command.h"
#include "layer.h"

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

@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "adafruit-platformdetect";
version = "3.25.0";
version = "3.26.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -15,7 +15,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "Adafruit-PlatformDetect";
inherit version;
hash = "sha256-8K8OKHxuPG5bibb49Epgv9lMuZ7Ipk9753sI22e6j24=";
hash = "sha256-lkzTJfjJNKsMmLet9VXv5Ao8+Dks4P0+0nRpWHHs3G0=";
};
nativeBuildInputs = [

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

@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "aioshelly";
version = "2.0.0";
version = "2.0.1";
format = "setuptools";
disabled = pythonOlder "3.9";
@ -16,8 +16,8 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "home-assistant-libs";
repo = pname;
rev = version;
hash = "sha256-1bIlK/5UoGq6xTjcpkAkHPBlM+ifZhnbWzGbPRdFGkU=";
rev = "refs/tags/${version}";
hash = "sha256-BUKuZza9Jer334LUmU5zmfjg1ISuxg7HETEbUMB80KY=";
};
propagatedBuildInputs = [

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

@ -37,8 +37,8 @@
, sqlalchemy
, tenacity
, typing-extensions
, scikit-learn
}:
, testcontainers
, scikit-learn }:
buildPythonPackage rec {
pname = "apache-beam";
@ -107,6 +107,7 @@ buildPythonPackage rec {
scikit-learn
sqlalchemy
tenacity
testcontainers
];
# Make sure we're running the tests for the actually installed
@ -122,8 +123,6 @@ buildPythonPackage rec {
# container_init: Callable[[], Union[PostgresContainer, MySqlContainer]],
# E NameError: name 'MySqlContainer' is not defined
#
# Test relies on the testcontainers package, which is not currently (as of
# 2022-04-08) available in nixpkgs.
"apache_beam/io/external/xlang_jdbcio_it_test.py"
# These tests depend on the availability of specific servers backends.

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

@ -16,7 +16,7 @@
buildPythonPackage rec {
pname = "asf-search";
version = "5.0.1";
version = "5.0.2";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -25,7 +25,7 @@ buildPythonPackage rec {
owner = "asfadmin";
repo = "Discovery-asf_search";
rev = "refs/tags/v${version}";
hash = "sha256-v8++qPeAPc/0nYEYK4GltDflF/unPbX0EvKkjZFuOQY=";
hash = "sha256-Jynks+c8OV0t1GoKAk4vP9jYQ0PclJHl3x8q78au5gk=";
};
propagatedBuildInputs = [

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

@ -19,7 +19,7 @@
buildPythonPackage rec {
pname = "cyclonedx-python-lib";
version = "2.6.0";
version = "2.7.0";
format = "pyproject";
disabled = pythonOlder "3.9";
@ -28,7 +28,7 @@ buildPythonPackage rec {
owner = "CycloneDX";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-UM5z8FEu+Pua/LToraGh8N6V3ujUnu4F6lJec+4cUg4=";
hash = "sha256-Imn9wl5I7dzkUnVBzK2vhWOrf89FycVW4GvEYFeSujU=";
};
nativeBuildInputs = [

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

@ -16,7 +16,7 @@
buildPythonPackage rec {
pname = "dvc-objects";
version = "0.1.1";
version = "0.1.4";
format = "pyproject";
disabled = pythonOlder "3.8";
@ -25,7 +25,7 @@ buildPythonPackage rec {
owner = "iterative";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-s399GZ/ZuGQcV03NMJMUczEI00m8/xuuFJfzcjuV7T0=";
hash = "sha256-fFpRrFRa1VcVdc/uIJZ+DR74ivttRKkXgibXV3q72qY=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;

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

@ -7,12 +7,12 @@
buildPythonPackage rec {
pname = "fastprogress";
version = "1.0.2";
version = "1.0.3";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-lga6RCUFo6RFgdY97dzlv/HfF6y9w3JS98PxvlLB0kM=";
sha256 = "sha256-ehfStDiJD4OMBI7vzjLE3tRxl+zI6gQs7MM9PeuAIvU=";
};
propagatedBuildInputs = [ numpy ];

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

@ -2,13 +2,13 @@
buildPythonPackage rec {
pname = "glfw";
version = "2.5.3";
version = "2.5.4";
src = fetchFromGitHub {
owner = "FlorianRhiem";
repo = "pyGLFW";
rev = "refs/tags/v${version}";
sha256 = "sha256-LaK/lYCUN7PDy8QsaGCnQPM1nvQNeBRTdEEkKtaMUHA=";
sha256 = "sha256-4Ym3Vmkf+HwORbhR72Ws/cqLkNMPCY8FL35O2hSalGQ=";
};
# Patch path to GLFW shared object

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

@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "hahomematic";
version = "2022.7.11";
version = "2022.7.12";
format = "pyproject";
disabled = pythonOlder "3.9";
@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "danielperna84";
repo = pname;
rev = "refs/tags/${version}";
sha256 = "sha256-BR92UGcmNWwQWZFK40rnkYvNbRoL2AYod4oozYXLSuM=";
sha256 = "sha256-9ErXsJUFM0Us9ChkYvpa2bNEy3CBJwfYAz4vnk2wu4Q=";
};
propagatedBuildInputs = [

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

@ -17,7 +17,7 @@
buildPythonPackage rec {
pname = "homematicip";
version = "1.0.5";
version = "1.0.6";
format = "setuptools";
disabled = pythonOlder "3.6";
@ -26,7 +26,7 @@ buildPythonPackage rec {
owner = "hahn-th";
repo = "homematicip-rest-api";
rev = "refs/tags/${version}";
hash = "sha256-pfVjnRO6iKEgLDQz4JMARzab21XLbbUDUMyMWatGlJ8=";
hash = "sha256-z27VGApm5VsDm6VG0DaDOmhFrvRhLLINHtSM/cIiXyY=";
};
propagatedBuildInputs = [

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

@ -4,11 +4,11 @@
buildPythonPackage rec {
pname = "icecream";
version = "2.1.2";
version = "2.1.3";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-CTALLRxnhxJBDL1HyVGY6xtYD2bzEaVUzNa551js4O4=";
sha256 = "sha256-CqSnwzdOw2FTodCPgeMIDoPYrB7v2X0vT+lUTo+bSd4=";
};
propagatedBuildInputs = [ asttokens colorama executing pygments ];

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

@ -6,14 +6,14 @@
buildPythonPackage rec {
pname = "mailchecker";
version = "4.1.17";
version = "4.1.18";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-NfgLI490/9YoHIXTVD890RTe+qP9rrwAFv8Xkc1IY5s=";
hash = "sha256-zBikruHBTXKK4Yk7euTp0lTcdCG5AQ/kMZrECAvQ7Zw=";
};
# Module has no tests

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

@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "motionblinds";
version = "0.6.10";
version = "0.6.11";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -16,7 +16,7 @@ buildPythonPackage rec {
owner = "starkillerOG";
repo = "motion-blinds";
rev = "refs/tags/${version}";
sha256 = "sha256-WCwj/2iUXOhmww4hiI5KPA7VyoVEYDeEMmnZM+DGHmc=";
sha256 = "sha256-LHZp5IXZqPYNwPlOQySwxon3uZX15caZvMeMY6QQIqk=";
};
propagatedBuildInputs = [

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

@ -10,14 +10,14 @@
buildPythonPackage rec {
pname = "pip-api";
version = "0.0.29";
version = "0.0.30";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-9wFYTrHD4BAhyEb4nWKauTc7ZiTwYmdXd0rVT8TClXE=";
hash = "sha256-oF3yx6qbcVc3S89Cc1RCAaDHuuYKnGW8+E85We84lvM=";
};
propagatedBuildInputs = [

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

@ -9,14 +9,14 @@
buildPythonPackage rec {
pname = "plaid-python";
version = "9.7.0";
version = "9.8.0";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
hash = "sha256-yNjrWjlTF7cfEpFbPP6b/L6foNuhNa6JFNv6ImbAZ5k=";
hash = "sha256-iILDOpajLdTi+yPBNIr2+Sb1qBl0KCoSow2XBmDpFSI=";
};
propagatedBuildInputs = [

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

@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "plexapi";
version = "4.11.2";
version = "4.12.0";
format = "setuptools";
disabled = pythonOlder "3.6";
@ -17,8 +17,8 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "pkkid";
repo = "python-plexapi";
rev = version;
sha256 = "sha256-N4ic1DDMAHnHYYoD59ZHFqlgLlvFZV8Nn7V47NDXE5U=";
rev = "refs/tags/${version}";
sha256 = "sha256-GtFAHNqneoWPCUegFDIpmeyuCsjwAx9o6t0ptGNLBeQ=";
};
propagatedBuildInputs = [

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

@ -21,7 +21,7 @@
buildPythonPackage rec {
pname = "plugwise";
version = "0.20.1";
version = "0.21.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -30,7 +30,7 @@ buildPythonPackage rec {
owner = pname;
repo = "python-plugwise";
rev = "refs/tags/v${version}";
sha256 = "sha256-Sk7L0JPwn7IXVl5GeERxrG/vrHXeNwUjW1mgm4g40Ng=";
sha256 = "sha256-pw1apxqjKKv05Qw2VFN0cKit/3fas7PUb1wS/XsJruY=";
};
propagatedBuildInputs = [

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

@ -6,12 +6,12 @@
buildPythonPackage rec {
pname = "pydal";
version = "20220720.1";
version = "20220721.1";
format = "setuptools";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-cKw3thTqQWsTRqJQD9SyaBVBLM9YIqE/y/gIh4FL1bc=";
sha256 = "sha256-dOSTpK9HZFZL5/QWK/HTzPAgpsCSyj9r5a57cQpmlhY=";
};
postPatch = ''

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

@ -16,7 +16,7 @@
buildPythonPackage rec {
pname = "pyinsteon";
version = "1.1.3";
version = "1.2.0";
format = "setuptools";
disabled = pythonOlder "3.6";
@ -25,7 +25,7 @@ buildPythonPackage rec {
owner = pname;
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-CYXsYOqh41qRob2DRxTB6zcc/jcdT9/vWJTRk2LJgWo=";
hash = "sha256-PMjvic+K/m7beavlZvGhJcizSNCzLPZYLm3P2V9EPLs=";
};
propagatedBuildInputs = [

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

@ -11,15 +11,15 @@
buildPythonPackage rec {
pname = "pylink-square";
version = "0.13.0";
version = "0.14.1";
format = "setuptools";
src = fetchFromGitHub {
owner = "square";
repo = "pylink";
rev = "v${version}";
hash = "sha256-SH2oxOlsX5dE8wMXpWPA/rEVrJwxJzizsOiYbwaGjLw=";
rev = "refs/tags/v${version}";
hash = "sha256-eCVNDPXtZAuzGb4ZOnjEmE1pKPOl52xRfZy+ppfxS3g=";
};
propagatedBuildInputs = [ psutil six future ];

6
pkgs/development/python-modules/pysigma-backend-splunk/default.nix
View File

@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "pysigma-backend-splunk";
version = "0.3.4";
version = "0.3.5";
format = "pyproject";
disabled = pythonOlder "3.8";
@ -18,8 +18,8 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "SigmaHQ";
repo = "pySigma-backend-splunk";
rev = "v${version}";
hash = "sha256-zsX2lycqJKRASXio8s3Cvkt1yfnBm5cwQOFAFA891GI=";
rev = "refs/tags/v${version}";
hash = "sha256-W6wnxQPrtMDG5jctB7CMXr4kPIhZievFTBJCeSeDCWw=";
};
nativeBuildInputs = [

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

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "pysigma";
version = "0.6.6";
version = "0.6.8";
format = "pyproject";
disabled = pythonOlder "3.8";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "SigmaHQ";
repo = "pySigma";
rev = "refs/tags/v${version}";
hash = "sha256-9t582CuDq7JeCcaPqWZGMUVLx8e78PygfNPp/s7rMA8=";
hash = "sha256-Jq37/9w1GHr+GZ8Fvftmfz2XkL3zUpTjbDlokrUoLtw=";
};
nativeBuildInputs = [

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

@ -46,7 +46,7 @@
buildPythonPackage rec {
pname = "sentry-sdk";
version = "1.7.2";
version = "1.8.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -55,7 +55,7 @@ buildPythonPackage rec {
owner = "getsentry";
repo = "sentry-python";
rev = version;
hash = "sha256-0VQ1P3xWC1keoXaPfIzh+uGXvRAK3nOrc6fLKIhfiHk=";
hash = "sha256-PtGQJUZ6/u2exmg6P5VV2RoBKyuV3G2YuAWgA06oQKo=";
};
propagatedBuildInputs = [

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

@ -12,13 +12,13 @@
buildPythonPackage rec {
pname = "srsly";
version = "2.4.3";
version = "2.4.4";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
hash = "sha256-2+kfbdSuqegZSTYoNW3HFb2cYGSGKXu3yldI5uADhBw=";
hash = "sha256-6KBlgWJ7ZxLxnGAkG3wUwrspzobvBPeRN5p58bJJoSg=";
};
nativeBuildInputs = [ cython ];

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

@ -5,7 +5,7 @@
buildPythonPackage rec {
pname = "tatsu";
version = "5.8.1";
version = "5.8.2";
# upstream only supports 3.10+
disabled = pythonOlder "3.10";
@ -13,7 +13,7 @@ buildPythonPackage rec {
owner = "neogeny";
repo = "TatSu";
rev = "refs/tags/v${version}";
sha256 = "sha256-2zEpP1WATqzAo0HsBGdjjk/RoliyIim1OltPoJTlxIU=";
sha256 = "sha256-eJJ438zjXRZ7dk36RPkFvhcIA5RYo5MsjptZIpjCrVI=";
};
nativeBuildInputs = [ pytest-runner ];

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

@ -3,8 +3,7 @@
, buildPythonPackage
, deprecation
, docker
, wrapt
}:
, wrapt }:
buildPythonPackage rec {
pname = "testcontainers";
@ -31,7 +30,9 @@ buildPythonPackage rec {
];
meta = with lib; {
description = "Allows using docker containers for functional and integration testing";
description = ''
Allows using docker containers for functional and integration testing
'';
homepage = "https://github.com/testcontainers/testcontainers-python";
license = licenses.asl20;
maintainers = with maintainers; [ onny ];

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

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "twilio";
version = "7.11.0";
version = "7.12.0";
format = "setuptools";
disabled = pythonOlder "3.6";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "twilio";
repo = "twilio-python";
rev = "refs/tags/${version}";
hash = "sha256-JeguDPbsG3aeXDqqojfJHGpDVniY+IvWMD2GCgCUvuQ=";
hash = "sha256-/ni7QwBJTLc9hZPFg6wPskwuqmyKS4MHr+r7d/i87Mc=";
};
propagatedBuildInputs = [

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

@ -5,12 +5,12 @@
buildPythonPackage rec {
pname = "types-pytz";
version = "2022.1.1";
version = "2022.1.2";
format = "setuptools";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-TnrdcIhtwu5u51NcgYSibusKyduvrpliy4gtdLn2czA=";
sha256 = "sha256-GoslwiXF5r2EaKqetF3dOzN/ZxbUByrQqk7x5BR47rw=";
};
# Modules doesn't have tests

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

@ -6,12 +6,12 @@
buildPythonPackage rec {
pname = "types-requests";
version = "2.28.2";
version = "2.28.3";
format = "setuptools";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-OY+IzZMCx5bLY9ECGvKh+3rlB3QaPVCO344HRtjBagQ=";
sha256 = "sha256-+56mkxF2aWf56RhhIR7HRJ9khAJbdm6nCWicDbsp17o=";
};
propagatedBuildInputs = [

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

@ -5,12 +5,12 @@
buildPythonPackage rec {
pname = "types-setuptools";
version = "63.2.0";
version = "63.2.1";
format = "setuptools";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-/JpsR3ajmND1eyWcqJN0g0IXTFKjXVk9CLVvUqqZwaQ=";
sha256 = "sha256-KVekCt38pccSX9jThqnv2lN5CYxuZqCOAiV/0c6kITE=";
};
# Module doesn't have tests

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

@ -8,11 +8,11 @@
buildPythonPackage rec {
pname = "zcs";
version = "0.1.17";
version = "0.1.18";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-ZoQgAaJy3kKHLljyKA0Oo/D1kefE8X9FlsGDSNt1nPw=";
sha256 = "sha256-cIg0LFQFVo91Ywvulxtx0/PPyQnRflJFnIi0gaUGGq4=";
};
patches = [

6
pkgs/development/tools/biodiff/default.nix
View File

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "biodiff";
version = "1.0.1";
version = "1.0.3";
src = fetchFromGitHub {
owner = "8051Enthusiast";
repo = "biodiff";
rev = "v${version}";
sha256 = "sha256-M1hwuIe5+quxcvFAacBkxQMiQyN6lhtWA6hEi5Buoho=";
sha256 = "sha256-ZIZ6XpRuqhacpvi1kf7zvMszzbF8IvWrMlxAZnJJSxE=";
};
cargoSha256 = "sha256-NIt4D2/T7Zl7rgksbQeVo6cNBt6cZkUGTJGztnp6SB0=";
cargoSha256 = "sha256-/LrrHK9j6xg3J56ubM9RdkJeMn4nvpddUGMtHu2s6OE=";
meta = with lib; {
description = "Hex diff viewer using alignment algorithms from biology";

4
pkgs/development/tools/build-managers/bear/default.nix
View File

@ -17,13 +17,13 @@
stdenv.mkDerivation rec {
pname = "bear";
version = "3.0.19";
version = "3.0.20";
src = fetchFromGitHub {
owner = "rizsotto";
repo = pname;
rev = version;
sha256 = "sha256-Jj38dmzr8NDDMercfWyJrMFxGBSExCGPeG2IVEtnSxY=";
sha256 = "sha256-8hA0Y/AGczFwggxkTG7PQKOVnr2Oizx4OH38nS5jCU0=";
};
nativeBuildInputs = [ cmake pkg-config ];

2
pkgs/development/tools/millet/default.nix
View File

@ -8,7 +8,7 @@ rustPlatform.buildRustPackage rec {
owner = "azdavis";
repo = pname;
rev = "v${version}";
sha256 = "sha256-+4lMRd4pzbkRDct5kz17MB9drN6sEtYLk29d6TlubLk=";
sha256 = "sha256-nFFgVvctkGCU0BOh8JWftw2pt0KP5bYh+uhm/LhdspQ=";
};
cargoSha256 = "sha256-MoXKNUgNeg2AG7G78wnZvLXADhCsK/WB5WiT5lTSmIQ=";

2
pkgs/development/tools/roswell/default.nix
View File

@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
description = "Roswell is a Lisp implementation installer/manager, launcher, and much more";
license = licenses.mit;
maintainers = with maintainers; [ hiro98 ];
platforms = platforms.linux;
platforms = platforms.unix;
homepage = "https://github.com/roswell/roswell";
mainProgram = "ros";
};

6
pkgs/development/tools/rust/cargo-make/default.nix
View File

@ -13,11 +13,11 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-make";
version = "0.35.13";
version = "0.35.15";
src = fetchCrate {
inherit pname version;
sha256 = "sha256-rkE/GLFZP1C5C4s6ghbfsJY92Wu3ku27VRorU/ZGelA=";
sha256 = "sha256-fHW3ypi/BlfDybhnHOmPoBlyMdf3ZK7pOnH35cvhhRU=";
};
nativeBuildInputs = [ pkg-config ];
@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec {
buildInputs = [ openssl ]
++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration libiconv ];
cargoSha256 = "sha256-GSHbs8GUHqFrBN1Op6Uh4fPzXEjSkX+a6beBQxS19K8=";
cargoSha256 = "sha256-Az7A0VMlWv34uUeM0TH7tT5FPja/j0x6aoF7qDw8JCs=";
# Some tests fail because they need network access.
# However, Travis ensures a proper build.

684
pkgs/development/tools/uniffi-bindgen/Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

9
pkgs/development/tools/uniffi-bindgen/default.nix
View File

@ -11,17 +11,16 @@
rustPlatform.buildRustPackage rec {
pname = "uniffi-bindgen";
version = "0.17.0";
version = "0.19.3";
src = fetchFromGitHub {
owner = "mozilla";
repo = "uniffi-rs";
rev = "v${version}";
hash = "sha256-EGyJrW0U/dnKT7OWgd8LehCyvj6mxud3QWbBVyhoK4Y=";
hash = "sha256-A6Zd1jfhoR4yW2lT5qYE3vJTpiJc94pK/XQmfE2QLFc=";
};
cargoLock.lockFileContents = builtins.readFile ./Cargo.lock;
cargoHash = "sha256-Fw+yCAI32NdFKJGPuNU6t0FiEfohoVD3VQfInNJuooI=";
cargoLock.lockFile = ./Cargo.lock;
cargoBuildFlags = [ "-p uniffi_bindgen" ];
cargoTestFlags = [ "-p uniffi_bindgen" ];
@ -36,6 +35,8 @@ rustPlatform.buildRustPackage rec {
--suffix PATH : ${lib.strings.makeBinPath [ rustfmt ktlint yapf rubocop ] }
'';
passthru.updateScript = ./update.sh;
meta = with lib; {
description = "Toolkit for building cross-platform software components in Rust";
homepage = "https://mozilla.github.io/uniffi-rs/";

35
pkgs/development/tools/uniffi-bindgen/update.sh Executable file
View File

@ -0,0 +1,35 @@
#!/usr/bin/env nix-shell
#! nix-shell -p nix cargo rsync nix-update
#! nix-shell -i bash
set -euo pipefail
if [[ -z "${UPDATE_NIX_ATTR_PATH+x}" ]]; then
echo "Error: run the following command from nixpkgs root:" >&2
echo " nix-shell maintainers/scripts/update.nix --argstr package uniffi-bindgen" >&2
exit 1
fi
targetLockfile="$(dirname "$0")/Cargo.lock"
# Update version and hash
nix-update "$UPDATE_NIX_ATTR_PATH"
# Update lockfile through `cargo update`
src=$(nix-build -A "${UPDATE_NIX_ATTR_PATH}.src" --no-out-link)
tmp=$(mktemp -d)
cleanup() {
echo "Removing $tmp" >&2
rm -rf "$tmp"
}
trap cleanup EXIT
rsync -a --chmod=ugo=rwX "$src/" "$tmp"
pushd "$tmp"
cargo update
cp "Cargo.lock" "$targetLockfile"
popd

5
pkgs/development/web/grails/default.nix
View File

@ -11,11 +11,11 @@ let
in
stdenv.mkDerivation rec {
pname = "grails";
version = "5.1.7";
version = "5.1.9";
src = fetchurl {
url = "https://github.com/grails/grails-core/releases/download/v${version}/grails-${version}.zip";
sha256 = "sha256-Sk+VvuEyzZ9sSeI9fOuHgmgSu89WjriiK/6UU/eWqag=";
sha256 = "sha256-gOC1jwFoasxTAhXoX/Mbl5uL1p6NjXcjpz7td8DZUlk=";
};
nativeBuildInputs = [ unzip ];
@ -46,6 +46,7 @@ stdenv.mkDerivation rec {
'';
homepage = "https://grails.org/";
license = licenses.asl20;
sourceProvenance = with sourceTypes; [ binaryBytecode ];
platforms = platforms.linux;
maintainers = [ maintainers.bjornfor ];
};

8
pkgs/games/anki/bin.nix
View File

@ -3,22 +3,22 @@
let
pname = "anki-bin";
# Update hashes for both Linux and Darwin!
version = "2.1.52";
version = "2.1.54";
sources = {
linux = fetchurl {
url = "https://github.com/ankitects/anki/releases/download/${version}/anki-${version}-linux-qt6.tar.zst";
sha256 = "sha256-+eRflNMxutoSY9yQfnhIjfLg9b9CNv+7UuYyg4jgfK4=";
sha256 = "sha256-NFhgVd4ctEsh7iaSZ9v0OMszd81H41eq+y+FRIhcCtE=";
};
# For some reason anki distributes completely separate dmg-files for the aarch64 version and the x86_64 version
darwin-x86_64 = fetchurl {
url = "https://github.com/ankitects/anki/releases/download/${version}/anki-${version}-mac-intel-qt6.dmg";
sha256 = "sha256-keQxaf0KOQjCb22dQD/1VytW2fk35OPUJyJ42kaoAr8=";
sha256 = "sha256-kus59Z9Oe4sbAlF4szeg751hlSEUR0ijKz4rjfHEWgA=";
};
darwin-aarch64 = fetchurl {
url = "https://github.com/ankitects/anki/releases/download/${version}/anki-${version}-mac-apple-qt6.dmg";
sha256 = "sha256-mYPSOjXh18nWpZjXLAjEodoxopr6rxadESMAf/t9SlI=";
sha256 = "sha256-ROIpGB3W21ttWj+cRkf0rpLFrO4LR6+ZyGRsalz5J+E=";
};
};

4
pkgs/games/osu-lazer/default.nix
View File

@ -14,13 +14,13 @@
buildDotnetModule rec {
pname = "osu-lazer";
version = "2022.719.0";
version = "2022.723.0";
src = fetchFromGitHub {
owner = "ppy";
repo = "osu";
rev = version;
sha256 = "sha256-SSKiXIj02VCTHDLgQMV0vZyKUoUv2c4KOfEJJ2NOLjY=";
sha256 = "sha256-j3NxT/WCOCSB62JUO8hYCRUoF+GL1QAdaUaynY7aGj8=";
};
projectFile = "osu.Desktop/osu.Desktop.csproj";

12
pkgs/games/osu-lazer/deps.nix generated
View File

@ -142,14 +142,14 @@
(fetchNuGet { pname = "NuGet.Protocol"; version = "5.11.0"; sha256 = "041pva6ykc5h6az7bb87mkg32c95cvxlixgspnd34zbdldr4ypdb"; })
(fetchNuGet { pname = "NuGet.Versioning"; version = "5.11.0"; sha256 = "041351n1rbyqpfxqyxbvjgfrcbbawymbq96givz5pvdbabvyf5vq"; })
(fetchNuGet { pname = "NUnit"; version = "3.13.3"; sha256 = "0wdzfkygqnr73s6lpxg5b1pwaqz9f414fxpvpdmf72bvh4jaqzv6"; })
(fetchNuGet { pname = "OpenTabletDriver"; version = "0.6.0.2"; sha256 = "0blwfs1cacxq0vs6fy7zjnsny8qdsr5jlxix3icmphyqgz0g4g39"; })
(fetchNuGet { pname = "OpenTabletDriver.Configurations"; version = "0.6.0.2"; sha256 = "18q6gjayqrwk6n1kf359z94z8zyb3yz4hr1dpgglk51sq6wi2z84"; })
(fetchNuGet { pname = "OpenTabletDriver.Native"; version = "0.6.0.2"; sha256 = "12hf4v8j8asc9wlywpykajb8yrzx10w6h11qbykckmrfxvz8pc0a"; })
(fetchNuGet { pname = "OpenTabletDriver.Plugin"; version = "0.6.0.2"; sha256 = "0z2n5jysw06zp2cxmfqddbg3g88jdm1irr2hv04q8valq0plaq5c"; })
(fetchNuGet { pname = "OpenTabletDriver"; version = "0.6.0.4"; sha256 = "1fk0029b1183pxd6qvzkmy8byx5dhjka3f8x20sd7drbzvqpn6am"; })
(fetchNuGet { pname = "OpenTabletDriver.Configurations"; version = "0.6.0.4"; sha256 = "0ahxg4mckzljav5y9g7c1795wgyx2banysg5l7ix3xrl4xmjfmp3"; })
(fetchNuGet { pname = "OpenTabletDriver.Native"; version = "0.6.0.4"; sha256 = "1zz9afqbaif6sl7gzayl0ww9jhysi4q06jicmx4g35yk82w07vzn"; })
(fetchNuGet { pname = "OpenTabletDriver.Plugin"; version = "0.6.0.4"; sha256 = "0lim2aqw42c1cc73fbbw0h41wcwaxa5d89srzalgg8dpi3bds1mp"; })
(fetchNuGet { pname = "ppy.LocalisationAnalyser"; version = "2022.607.0"; sha256 = "07rf10lpnly9d8wf7mwys3jsr4kh0rkf86rjck1hmb73b8524jq9"; })
(fetchNuGet { pname = "ppy.osu.Framework"; version = "2022.719.0"; sha256 = "1rm72pm1m1nrfla2m3943nm85aj2i32rx4ikggm97fm74018cjsx"; })
(fetchNuGet { pname = "ppy.osu.Framework"; version = "2022.722.0"; sha256 = "1ps8cfny35hyairw32bjz3cvkdhqch27yfzz83zbv6rdbk687zjq"; })
(fetchNuGet { pname = "ppy.osu.Framework.NativeLibs"; version = "2022.525.0"; sha256 = "1zsqj3xng06bb46vg79xx35n2dsh3crqg951r1ga2gxqzgzy4nk0"; })
(fetchNuGet { pname = "ppy.osu.Game.Resources"; version = "2022.716.0"; sha256 = "03g70lsxad0xrrii4d1qh8xb1q4983hn7raydwihvm15pqwv9741"; })
(fetchNuGet { pname = "ppy.osu.Game.Resources"; version = "2022.722.0"; sha256 = "0ilzm9cfvhzxwlv1irzcsbwnm3p5qjbc3hzh5ss992s0y5v6xray"; })
(fetchNuGet { pname = "ppy.osuTK.NS20"; version = "1.0.192"; sha256 = "0k6nlsxdl6qa5kbn66nbxh5x43hkgpnz8h3zjlbr5siqdjcrvcvg"; })
(fetchNuGet { pname = "ppy.SDL2-CS"; version = "1.0.563-alpha"; sha256 = "09bk81nibfwicjmy8bg4h14myp3x0a7yz4axwdfnk33pj5dsn953"; })
(fetchNuGet { pname = "Realm"; version = "10.14.0"; sha256 = "0pbnqp2z27lm6i8j8pbb2500gyyv8gb73kskv49ympvpa09mzcrv"; })

7
pkgs/games/polymc/default.nix
View File

@ -16,21 +16,22 @@
, openal
, msaClientID ? ""
, jdks ? [ jdk jdk8 ]
, extra-cmake-modules
}:
stdenv.mkDerivation rec {
pname = "polymc";
version = "1.3.2";
version = "1.4.0";
src = fetchFromGitHub {
owner = "PolyMC";
repo = "PolyMC";
rev = version;
sha256 = "sha256-hqsyS82UzgCUZ9HjoPKjOLE49fwLntRAh3mVrTsmi3o=";
sha256 = "sha256-gaPqCAC/tE6nUONgWSrVm3oBzSnOhZ5xiAJ+QyX+8rA=";
fetchSubmodules = true;
};
nativeBuildInputs = [ cmake file jdk wrapQtAppsHook ];
nativeBuildInputs = [ extra-cmake-modules cmake file jdk wrapQtAppsHook ];
buildInputs = [ qtbase zlib quazip ];
cmakeFlags = lib.optionals (msaClientID != "") [ "-DLauncher_MSA_CLIENT_ID=${msaClientID}" ];

23
pkgs/misc/autotiling-rs/default.nix Normal file
View File

@ -0,0 +1,23 @@
{ lib, fetchFromGitHub, rustPlatform }:
rustPlatform.buildRustPackage rec {
pname = "autotiling-rs";
version = "0.1.3";
src = fetchFromGitHub {
owner = "ammgws";
repo = pname;
rev = "v${version}";
sha256 = "sha256-LQbmF2M6pWa0QEbKF770x8TFLMGrJeq5HnXHvLrDDPA=";
};
cargoHash = "sha256-wot5GKBA2TBrA/jnWD0eypPRqUodmk/TJlYJMl3/gm4=";
meta = with lib; {
description = "Autotiling for sway (and possibly i3)";
homepage = "https://github.com/ammgws/autotiling-rs";
license = licenses.mit;
platforms = platforms.linux;
maintainers = with maintainers; [ dit7ya ];
};
}

1
pkgs/os-specific/linux/can-isotp/default.nix
View File

@ -24,6 +24,7 @@ stdenv.mkDerivation {
nativeBuildInputs = kernel.moduleBuildDependencies;
meta = with lib; {
broken = kernel.kernelAtLeast "5.16";
description = "Kernel module for ISO-TP (ISO 15765-2)";
homepage = "https://github.com/hartkopp/can-isotp";
license = licenses.gpl2;

8
pkgs/os-specific/linux/kernel/zen-kernels.nix
View File

@ -4,16 +4,16 @@ let
# comments with variant added for update script
# ./update-zen.py zen
zenVariant = {
version = "5.18.12"; #zen
version = "5.18.13"; #zen
suffix = "zen1"; #zen
sha256 = "1h0qnwq967ncqv40msa94jlwqf9rw2kgrr4gwx6n8i6wn0dmxpbq"; #zen
sha256 = "0m5wwiaasv49f50qxv7kydmxzfry2w6gl6489hba4i4xl7h8k8nj"; #zen
isLqx = false;
};
# ./update-zen.py lqx
lqxVariant = {
version = "5.18.12"; #lqx
version = "5.18.13"; #lqx
suffix = "lqx1"; #lqx
sha256 = "0bxmscx7m9fp73brj6x3d2vk5fnys7a502vllsf8dg74k0g83781"; #lqx
sha256 = "12fzls0rmq2zlfdlx81f44hylmfk0j2nsxbg9s3iyakyhkwynvvk"; #lqx
isLqx = true;
};
zenKernelsFor = { version, suffix, sha256, isLqx }: buildLinux (args // {

1
pkgs/os-specific/linux/mwprocapture/default.nix
View File

@ -55,6 +55,7 @@ stdenv.mkDerivation rec {
'';
meta = {
broken = kernel.kernelAtLeast "5.16";
homepage = "http://www.magewell.com/";
description = "Linux driver for the Magewell Pro Capture family";
license = licenses.unfreeRedistributable;

13
pkgs/os-specific/linux/upower/default.nix
View File

@ -27,7 +27,7 @@
stdenv.mkDerivation rec {
pname = "upower";
version = "0.99.19";
version = "1.90.0";
outputs = [ "out" "dev" ]
++ lib.optionals withDocs [ "devdoc" ];
@ -37,18 +37,9 @@ stdenv.mkDerivation rec {
owner = "upower";
repo = "upower";
rev = "v${version}";
sha256 = "gpLsBh4jgiDO8bxic2BTFhjIwc2q/tuAIxykTHqK6UM=";
hash = "sha256-+C/4dDg6WTLpBgkpNyxjthSdqYdaTLC8vG6jG1LNJ7w=";
};
patches = [
# Fix test
# https://gitlab.freedesktop.org/upower/upower/-/merge_requests/150
(fetchpatch {
url = "https://gitlab.freedesktop.org/upower/upower/-/commit/a78ee6039054770b466749f8ec4bfbe4c278d697.patch";
sha256 = "aUPXnr/2PlOZNb7mQl43hmKe01DtuBUrGnqvwBFRf7Q=";
})
];
strictDeps = true;
depsBuildBuild = [

4
pkgs/servers/dcnnt/default.nix
View File

@ -2,11 +2,11 @@
buildPythonApplication rec {
pname = "dcnnt";
version = "0.7.0";
version = "0.7.1";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-LP3tOInpqVpO/BWla7/gZCGUUZ/1J8dHegGa0hRiRDQ=";
sha256 = "sha256-vKCQgg0m58hoN79WcZ4mM6bjCJOPxhAT4ifZ3b/5bkA=";
};
propagatedBuildInputs = [

8
pkgs/servers/monitoring/grafana/default.nix
View File

@ -2,7 +2,7 @@
buildGoModule rec {
pname = "grafana";
version = "9.0.3";
version = "9.0.4";
excludedPackages = [ "alert_webhook_listener" "clean-swagger" "release_publisher" "slow_proxy" "slow_proxy_mac" "macaron" "devenv" ];
@ -10,15 +10,15 @@ buildGoModule rec {
rev = "v${version}";
owner = "grafana";
repo = "grafana";
sha256 = "sha256-oFVAiQt+ZxLB1On1wKM2R2qTEl5zBbWpkvBOLQ081+A=";
sha256 = "sha256-V28wUkgWLUTRBNbx5xAdLUcFGU2DQ5Az5SSIJPv393U=";
};
srcStatic = fetchurl {
url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz";
sha256 = "sha256-l2XTC0OxIeUD4sjM4w9WsT9s5akGjWpFmnZnmI/vSEA=";
sha256 = "sha256-UU/THOSYJfbgx/Mn3rMZiODeHX4I6l/7Kpg5mBq5FUI=";
};
vendorSha256 = "sha256-ncMIu6J7D3xflZSxf8txpaQd0YW62CtzcO5w/PUE1UU=";
vendorSha256 = "sha256-6Z1qvn5HTybKAjsst8kSGYCbEIBsPyhNswVGGiMD9B8=";
nativeBuildInputs = [ wire ];

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

@ -145,6 +145,12 @@ let
]
++ concatAttrVals features_ nativeFeatureDependencies;
postPatch = lib.optionalString (stdenv.isDarwin && lib.versionOlder stdenv.targetPlatform.darwinSdkVersion "12.0") ''
substituteInPlace src/output/plugins/OSXOutputPlugin.cxx \
--replace kAudioObjectPropertyElement{Main,Master} \
--replace kAudioHardwareServiceDeviceProperty_Virtual{Main,Master}Volume
'';
# Otherwise, the meson log says:
#
# Program zip found: NO

18
pkgs/servers/rainloop/default.nix
View File

@ -1,10 +1,10 @@
{ lib, stdenv, fetchurl, unzip, pkgs, dataPath ? "/var/lib/rainloop" }: let
{ lib, stdenv, fetchurl, unzip, writeText, dos2unix, dataPath ? "/var/lib/rainloop" }: let
common = { edition, sha256 }:
stdenv.mkDerivation (rec {
pname = "rainloop${lib.optionalString (edition != "") "-${edition}"}";
version = "1.16.0";
nativeBuildInputs = [ unzip ];
nativeBuildInputs = [ unzip dos2unix ];
unpackPhase = ''
mkdir rainloop
@ -16,7 +16,19 @@
sha256 = sha256;
};
includeScript = pkgs.writeText "include.php" ''
prePatch = ''
dos2unix ./rainloop/rainloop/v/1.16.0/app/libraries/MailSo/Base/HtmlUtils.php
'';
patches = [
./fix-cve-2022-29360.patch
];
postPatch = ''
unix2dos ./rainloop/rainloop/v/1.16.0/app/libraries/MailSo/Base/HtmlUtils.php
'';
includeScript = writeText "include.php" ''
<?php
/**

23
pkgs/servers/rainloop/fix-cve-2022-29360.patch Normal file
View File

@ -0,0 +1,23 @@
Fetched from https://blog.sonarsource.com/rainloop-emails-at-risk-due-to-code-flaw/
--- a/rainloop/rainloop/v/1.16.0/app/libraries/MailSo/Base/HtmlUtils.php
+++ b/rainloop/rainloop/v/1.16.0/app/libraries/MailSo/Base/HtmlUtils.php
@@ -239,7 +239,8 @@ class HtmlUtils
$oWrapHtml->setAttribute($sKey, $sValue);
}
- $oWrapDom = $oDom->createElement('div', '___xxx___');
+ $rand_str = base64_encode(random_bytes(32));
+ $oWrapDom = $oDom->createElement('div', $rand_str);
$oWrapDom->setAttribute('data-x-div-type', 'body');
foreach ($aBodylAttrs as $sKey => $sValue)
{
@@ -250,7 +251,7 @@ class HtmlUtils
$sWrp = $oDom->saveHTML($oWrapHtml);
- $sResult = \str_replace('___xxx___', $sResult, $sWrp);
+ $sResult = \str_replace($rand_str, $sResult, $sWrp);
}
$sResult = \str_replace(\MailSo\Base\HtmlUtils::$KOS, ':', $sResult);

4
pkgs/servers/sql/postgresql/ext/postgis.nix
View File

@ -15,13 +15,13 @@
}:
stdenv.mkDerivation rec {
pname = "postgis";
version = "3.2.1";
version = "3.2.2";
outputs = [ "out" "doc" ];
src = fetchurl {
url = "https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz";
sha256 = "sha256-+6to3ebKOTSyS6CMirDP8llPV/k96rQaFcgq4btpiT4=";
sha256 = "sha256-GM89AT9FsaqO1Z14vHB+nhJeJQ2PBhU5aum/4918PXw=";
};
buildInputs = [ libxml2 postgresql geos proj gdal json_c protobufc ]

6
pkgs/servers/x11/xorg/xwayland.nix
View File

@ -42,12 +42,12 @@
, defaultFontPath ? "" }:
stdenv.mkDerivation rec {
pname = "xwayland";
version = "22.1.1";
version = "22.1.3";
src = fetchurl {
url = "mirror://xorg/individual/xserver/${pname}-${version}.tar.xz";
sha256 = "sha256-9dDgujfhm7h8YvYdpZcL0gSTnyEgYglkvtTMhJW6plc=";
sha256 = "sha256-pxLre84yzZNN82gUtd0EaqZwiZwW/pjyr7ADV4+GocU=";
};
depsBuildBuild = [

2
pkgs/shells/fish/default.nix
View File

@ -287,7 +287,7 @@ let
homepage = "https://fishshell.com/";
license = licenses.gpl2;
platforms = platforms.unix;
maintainers = with maintainers; [ cole-h ];
maintainers = with maintainers; [ cole-h winter srapenne ];
};
passthru = {

13
pkgs/shells/xonsh/default.nix
View File

@ -8,14 +8,14 @@
python3Packages.buildPythonApplication rec {
pname = "xonsh";
version = "0.11.0";
version = "0.13.0";
# fetch from github because the pypi package ships incomplete tests
src = fetchFromGitHub {
owner = "xonsh";
repo = "xonsh";
rev = version;
sha256 = "sha256-jfxQMEVABTOhx679V0iGVX9RisuY42lSdztYXMLwdcw=";
sha256 = "sha256-8X/+mQrwJ0yaUHRKdoY3G0P8kq22hYfRK+7WRl/zamc=";
};
LC_ALL = "en_US.UTF-8";
@ -40,7 +40,7 @@ python3Packages.buildPythonApplication rec {
];
postInstall = ''
wrapProgram $out/bin/xon.sh \
wrapProgram $out/bin/xonsh \
$makeWrapperArgs
'';
@ -49,6 +49,8 @@ python3Packages.buildPythonApplication rec {
"test_colorize_file"
"test_loading_correctly"
"test_no_command_path_completion"
"test_bsd_man_page_completions"
"test_xonsh_activator"
# fails on non-interactive shells
"test_capture_always"
"test_casting"
@ -56,9 +58,14 @@ python3Packages.buildPythonApplication rec {
"test_dirty_working_directory"
"test_man_completion"
"test_vc_get_branch"
"test_bash_and_is_alias_is_only_functional_alias"
];
disabledTestPaths = [
# fails on sandbox
"tests/completers/test_command_completers.py"
"tests/test_ptk_highlight.py"
"tests/test_ptk_shell.py"
# fails on non-interactive shells
"tests/prompt/test_gitstatus.py"
"tests/completers/test_bash_completer.py"

22
pkgs/tools/admin/certigo/default.nix
View File

@ -1,31 +1,17 @@
{ lib, stdenv, buildGoModule, fetchFromGitHub, fetchpatch }:
{ lib, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "certigo";
version = "1.15.1";
version = "1.16.0";
src = fetchFromGitHub {
owner = "square";
repo = pname;
rev = "v${version}";
sha256 = "sha256-XGR6xIXdFLnJTFd+mJneRb/WkLmi0Jscta9Bj3paM1M=";
sha256 = "sha256-+j1NeQJPDwQxXVYnHNmL49Li2IMH+9ehS0HSM3kqyxU=";
};
patches = [
(fetchpatch {
name = "backport_TestConnect-Apple-Fixes.patch";
url = "https://github.com/square/certigo/commit/5332ac7ca20bdea63657cc8319e8b8fda4326938.patch";
sha256 = "sha256-mSNuiui2dxkXnCrXJ/asIzC8F1mtPecOVOIu6mE5jq4=";
})
(fetchpatch {
name = "backport_TestConnect-Expected-CipherSuite-Fixes.patch";
url = "https://github.com/square/certigo/commit/7ef0417bde4aafc69cbb72f0dd6d3577a56054a1.patch";
sha256 = "sha256-TUQ8B23HKheaPUjj4NkvjmZBAAhDNTyo2c8jf4qukds=";
})
];
vendorSha256 = "sha256-qS/tIi6umSuQcl43SI4LyL0k5eWfRWs7kVybRPGKcbs=";
vendorSha256 = "sha256-G9YpMF4qyL8eJPnai81ihVTDK9E4meKxdpk+rjISnIM=";
meta = with lib; {
description = "A utility to examine and validate certificates in a variety of formats";

53
pkgs/tools/archivers/7zz/default.nix
View File

@ -2,9 +2,9 @@
, lib
, fetchurl
# Only used for x86/x86_64
# Only used for Linux's x86/x86_64
, uasm
, useUasm ? stdenv.hostPlatform.isx86
, useUasm ? (stdenv.isLinux && stdenv.hostPlatform.isx86)
# RAR code is under non-free unRAR license
# see the meta.license section below for more details
@ -16,23 +16,23 @@
}:
let
inherit (stdenv.hostPlatform) system;
platformSuffix = {
aarch64-linux = "_arm64";
i686-linux = "_x86";
x86_64-linux = "_x64";
}.${system} or
(builtins.trace "`platformSuffix` not available for `${system}.` Making a generic `7zz` build." "");
makefile = {
aarch64-darwin = "../../cmpl_mac_arm64.mak";
x86_64-darwin = "../../cmpl_mac_x64.mak";
aarch64-linux = "../../cmpl_gcc_arm64.mak";
i686-linux = "../../cmpl_gcc_x86.mak";
x86_64-linux = "../../cmpl_gcc_x64.mak";
}.${stdenv.hostPlatform.system} or "../../cmpl_gcc.mak"; # generic build
in
stdenv.mkDerivation rec {
pname = "7zz";
version = "22.00";
version = "22.01";
src = fetchurl {
url = "https://7-zip.org/a/7z${lib.replaceStrings [ "." ] [ "" ] version}-src.tar.xz";
hash = {
free = "sha256-QzGZgPxHobGwstFfVRtb4V+hqMM7dMIy2/EZcJ2aZe8=";
unfree = "sha256-QJafYB6Gr/Saqgug31zm/Tl89+JoOoS1kbAIHkYe9nU=";
free = "sha256-mp3cFXOEiVptkUdD1+X8XxwoJhBGs+Ns5qk3HBByfLg=";
unfree = "sha256-OTCYcwxwBCOSr4CJF+dllF3CQ33ueq48/MSWbrkg+8U=";
}.${if enableUnfree then "unfree" else "free"};
downloadToTemp = (!enableUnfree);
# remove the unRAR related code from the src drv
@ -51,27 +51,40 @@ stdenv.mkDerivation rec {
'';
};
sourceRoot = "CPP/7zip/Bundles/Alone2";
sourceRoot = ".";
patches = [ ./fix-build-on-darwin.patch ];
patchFlags = [ "-p0" ];
NIX_CFLAGS_COMPILE = lib.optionals stdenv.isDarwin [
"-Wno-deprecated-copy-dtor"
];
inherit makefile;
makeFlags =
[
"CC=${stdenv.cc.targetPrefix}cc"
"CXX=${stdenv.cc.targetPrefix}c++"
] ++
lib.optionals useUasm [ "MY_ASM=uasm" ] ++
]
++ lib.optionals useUasm [ "MY_ASM=uasm" ]
# We need at minimum 10.13 here because of utimensat, however since
# we need a bump anyway, let's set the same minimum version as the one in
# aarch64-darwin so we don't need additional changes for it
++ lib.optionals stdenv.isDarwin [ "MACOSX_DEPLOYMENT_TARGET=10.16" ]
# it's the compression code with the restriction, see DOC/License.txt
lib.optionals (!enableUnfree) [ "DISABLE_RAR_COMPRESS=true" ];
makefile = "../../cmpl_gcc${platformSuffix}.mak";
++ lib.optionals (!enableUnfree) [ "DISABLE_RAR_COMPRESS=true" ];
nativeBuildInputs = lib.optionals useUasm [ uasm ];
enableParallelBuilding = true;
preBuild = "cd CPP/7zip/Bundles/Alone2";
installPhase = ''
runHook preInstall
install -Dm555 -t $out/bin b/g${platformSuffix}/7zz
install -Dm555 -t $out/bin b/*/7zz
install -Dm444 -t $out/share/doc/${pname} ../../../../DOC/*.txt
runHook postInstall
@ -96,7 +109,7 @@ stdenv.mkDerivation rec {
# the unRAR compression code is disabled by default
lib.optionals enableUnfree [ unfree ];
maintainers = with maintainers; [ anna328p peterhoeg jk ];
platforms = platforms.linux;
platforms = platforms.unix;
mainProgram = "7zz";
};
}

24
pkgs/tools/archivers/7zz/fix-build-on-darwin.patch Normal file
View File

@ -0,0 +1,24 @@
diff -Naur CPP/7zip/Common/FileStreams.cpp CPP/7zip/Common/FileStreams.cpp
--- CPP/7zip/Common/FileStreams.cpp
+++ CPP/7zip/Common/FileStreams.cpp
@@ -12,7 +12,7 @@
#include <pwd.h>
// for major()/minor():
-#if defined(__FreeBSD__) || defined(BSD)
+#if defined(__FreeBSD__) || defined(BSD) || defined(__APPLE__)
#include <sys/types.h>
#else
#include <sys/sysmacros.h>
diff -Naur CPP/7zip/UI/Common/UpdateCallback.cpp CPP/7zip/UI/Common/UpdateCallback.cpp
--- CPP/7zip/UI/Common/UpdateCallback.cpp
+++ CPP/7zip/UI/Common/UpdateCallback.cpp
@@ -9,7 +9,7 @@
// #include <pwd.h>
// for major()/minor():
-#if defined(__FreeBSD__) || defined(BSD)
+#if defined(__FreeBSD__) || defined(BSD) || defined(__APPLE__)
#include <sys/types.h>
#else
#include <sys/sysmacros.h>

7
pkgs/tools/archivers/7zz/update.sh
View File

@ -1,13 +1,14 @@
#! /usr/bin/env nix-shell
#! nix-shell -i bash -p coreutils gnused curl jq
#! nix-shell -i bash -p coreutils gnused curl jq nix-prefetch
set -euo pipefail
cd "$(dirname "${BASH_SOURCE[0]}")"
DRV_DIR="$PWD"
OLD_VERSION="$(sed -nE 's/\s*version = "(.*)".*/\1/p' ./default.nix)"
NEW_VERSION="$(curl "https://sourceforge.net/projects/sevenzip/best_release.json" | jq '.platform_releases.linux.filename' -r | cut -d/ -f3)"
# The best_release.json is not always up-to-date
# In those cases you can force the version by calling `./update.sh <newer_version>`
NEW_VERSION="${1:-$(curl 'https://sourceforge.net/projects/sevenzip/best_release.json' | jq '.platform_releases.linux.filename' -r | cut -d/ -f3)}"
echo "comparing versions $OLD_VERSION => $NEW_VERSION"
if [[ "$OLD_VERSION" == "$NEW_VERSION" ]]; then

38
pkgs/tools/games/gamemode/default.nix
View File

@ -10,38 +10,30 @@
, inih
, systemd
, appstream
, makeWrapper
, findutils
, gawk
, procps
}:
stdenv.mkDerivation rec {
pname = "gamemode";
version = "1.6.1";
version = "1.7";
src = fetchFromGitHub {
owner = "FeralInteractive";
repo = pname;
rev = version;
sha256 = "sha256-P00OnZiPZyxBu9zuG+3JNorXHBhJZy+cKPjX+duZrJ0=";
sha256 = "sha256-DIFcmWFkoZOklo1keYcCl6n2GJgzWKC8usHFcJmfarU=";
};
outputs = [ "out" "dev" "lib" "man" "static" ];
patches = [
# Run executables from PATH instead of /usr/bin
# See https://github.com/FeralInteractive/gamemode/pull/323
(fetchpatch {
url = "https://github.com/FeralInteractive/gamemode/commit/be44b7091baa33be6dda60392e4c06c2f398ee72.patch";
sha256 = "TlDUETs4+N3pvrVd0FQGlGmC+6ByhJ2E7gKXa7suBtE=";
})
# Fix loading shipped config when using a prefix other than /usr
# See https://github.com/FeralInteractive/gamemode/pull/324
(fetchpatch {
url = "https://github.com/FeralInteractive/gamemode/commit/b29aa903ce5acc9141cfd3960c98ccb047eca872.patch";
sha256 = "LwBzBJQ7dfm2mFVSOSPjJP+skgV5N6h77i66L1Sq+ZM=";
})
# Add @libraryPath@ template variable to fix loading the PRELOAD library
./preload-nix-workaround.patch
# Do not install systemd sysusers configuration
./no-install-systemd-sysusers.patch
];
postPatch = ''
@ -55,6 +47,7 @@ stdenv.mkDerivation rec {
'';
nativeBuildInputs = [
makeWrapper
meson
ninja
pkg-config
@ -85,13 +78,20 @@ stdenv.mkDerivation rec {
moveToOutput lib/*.a "$static"
'';
# Add $lib/lib to gamemoded & gamemode-simulate-game's rpath since
# they use dlopen to load libgamemode. Can't use makeWrapper since
# it would break the security wrapper in the NixOS module.
postFixup = ''
# Add $lib/lib to gamemoded & gamemode-simulate-game's rpath since
# they use dlopen to load libgamemode. Can't use makeWrapper since
# it would break the security wrapper in the NixOS module.
for bin in "$out/bin/gamemoded" "$out/bin/gamemode-simulate-game"; do
patchelf --set-rpath "$lib/lib:$(patchelf --print-rpath "$bin")" "$bin"
done
wrapProgram "$out/bin/gamemodelist" \
--prefix PATH : ${lib.makeBinPath [
findutils
gawk
procps
]}
'';
meta = with lib; {

16
pkgs/tools/games/gamemode/no-install-systemd-sysusers.patch Normal file
View File

@ -0,0 +1,16 @@
diff --git i/data/meson.build w/data/meson.build
index 6fb82d8..2e9e170 100644
--- i/data/meson.build
+++ w/data/meson.build
@@ -21,11 +21,6 @@ if sd_bus_provider == 'systemd'
configuration: data_conf,
install_dir: path_systemd_unit_dir,
)
- # Install the sysusers.d file
- install_data(
- files('gamemode.conf'),
- install_dir: path_systemd_sysusers_dir,
- )
endif
# Install the D-BUS service file

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

@ -9,16 +9,16 @@
rustPlatform.buildRustPackage rec {
pname = "dotter";
version = "0.12.11";
version = "0.12.13";
src = fetchFromGitHub {
owner = "SuperCuber";
repo = "dotter";
rev = "v${version}";
hash = "sha256-7K0p20FqaYFzOmUAeq1ousAPCeqE4AZoARF3UY4p4bY=";
hash = "sha256-j3Dj43AbD0V5pZ6mM1uvPsqWAVJrmWyWvwC5NK1cRRY=";
};
cargoHash = "sha256-BN6cdRmhvMjYQlaEa840+syuVKKUQ59TPMKicm40MTk=";
cargoHash = "sha256-HPs55JBbYObunU0cSm/7lsu/DOk4ne9Ea9MCRJ427zo=";
buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ];

38
pkgs/tools/misc/slop/default.nix
View File

@ -1,6 +1,17 @@
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config
, glew, glm, libGLU, libGL, libX11, libXext, libXrender, icu
, cppcheck
{ lib
, stdenv
, fetchFromGitHub
, cmake
, pkg-config
, glew
, glm
, libGLU
, libGL
, libX11
, libXext
, libXrender
, icu
, libSM
}:
stdenv.mkDerivation rec {
@ -14,17 +25,28 @@ stdenv.mkDerivation rec {
sha256 = "sha256-LdBQxw8K8WWSfm4E2QpK4GYTuYvI+FX5gLOouVFSU/U=";
};
nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ glew glm libGLU libGL libX11 libXext libXrender icu ]
++ lib.optional doCheck cppcheck;
nativeBuildInputs = [
cmake
pkg-config
];
doCheck = false;
buildInputs = [
glew
glm
libGLU
libGL
libX11
libXext
libXrender
icu
libSM
];
meta = with lib; {
inherit (src.meta) homepage;
description = "Queries a selection from the user and prints to stdout";
platforms = lib.platforms.linux;
license = lib.licenses.gpl3Plus;
license = licenses.gpl3Plus;
maintainers = with maintainers; [ ];
};
}

2
pkgs/tools/misc/thefuck/default.nix
View File

@ -18,7 +18,7 @@ buildPythonApplication rec {
checkInputs = [ go mock pytestCheckHook pytest-mock ];
disabledTests = lib.optional stdenv.isDarwin [
disabledTests = lib.optionals stdenv.isDarwin [
"test_settings_defaults"
"test_from_file"
"test_from_env"

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