Merge master into staging-next

This commit is contained in:
github-actions[bot] 2022-04-27 18:01:19 +00:00 committed by GitHub
commit 565df1946d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
119 changed files with 1645 additions and 1350 deletions

View File

@ -2272,6 +2272,7 @@
fingerprint = "539F 0655 4D35 38A5 429A E253 13E7 9449 C052 5215";
}];
name = "ckie";
matrix = "@ckie:ckie.dev";
};
clkamp = {
email = "c@lkamp.de";

View File

@ -40,7 +40,7 @@ section for details on container networking.)
To disable the container, just remove it from `configuration.nix` and
run `nixos-rebuild
switch`. Note that this will not delete the root directory of the
container in `/var/lib/containers`. Containers can be destroyed using
container in `/var/lib/nixos-containers`. Containers can be destroyed using
the imperative method: `nixos-container destroy foo`.
Declarative containers can be started and stopped using the

View File

@ -10,8 +10,8 @@ You create a container with identifier `foo` as follows:
# nixos-container create foo
```
This creates the container's root directory in `/var/lib/containers/foo`
and a small configuration file in `/etc/containers/foo.conf`. It also
This creates the container's root directory in `/var/lib/nixos-containers/foo`
and a small configuration file in `/etc/nixos-containers/foo.conf`. It also
builds the container's initial system configuration and stores it in
`/nix/var/nix/profiles/per-container/foo/system`. You can modify the
initial configuration of the container on the command line. For

View File

@ -48,8 +48,8 @@ containers.database = {
<literal>configuration.nix</literal> and run
<literal>nixos-rebuild switch</literal>. Note that this will not
delete the root directory of the container in
<literal>/var/lib/containers</literal>. Containers can be destroyed
using the imperative method:
<literal>/var/lib/nixos-containers</literal>. Containers can be
destroyed using the imperative method:
<literal>nixos-container destroy foo</literal>.
</para>
<para>

View File

@ -14,8 +14,9 @@
</programlisting>
<para>
This creates the containers root directory in
<literal>/var/lib/containers/foo</literal> and a small configuration
file in <literal>/etc/containers/foo.conf</literal>. It also builds
<literal>/var/lib/nixos-containers/foo</literal> and a small
configuration file in
<literal>/etc/nixos-containers/foo.conf</literal>. It also builds
the containers initial system configuration and stores it in
<literal>/nix/var/nix/profiles/per-container/foo/system</literal>.
You can modify the initial configuration of the container on the

View File

@ -475,6 +475,28 @@ Existing 3rd party modules that provided similar functionality, like <literal>pu
new versions will release.
</para>
</listitem>
<listitem>
<para>
The configuration and state directories used by
<literal>nixos-containers</literal> have been moved from
<literal>/etc/containers</literal> and
<literal>/var/lib/containers</literal> to
<literal>/etc/nixos-containers</literal> and
<literal>/var/lib/nixos-containers</literal>.
</para>
<para>
If you are changing <literal>system.stateVersion</literal> to
<literal>&quot;22.05&quot;</literal> manually on an existing
system you are responsible for migrating these directories
yourself.
</para>
<para>
This is to improve compatibility with
<literal>libcontainer</literal> based software such as Podman
and Skopeo which assumes they have ownership over
<literal>/etc/containers</literal>.
</para>
</listitem>
<listitem>
<para>
<literal>security.klogd</literal> was removed. Logging of

View File

@ -154,6 +154,16 @@ In addition to numerous new and upgraded packages, this release has the followin
org-contrib, refer to the ones in `pkgs.emacsPackages.elpaPackages` and
`pkgs.emacsPackages.nongnuPackages` where the new versions will release.
- The configuration and state directories used by `nixos-containers` have been
moved from `/etc/containers` and `/var/lib/containers` to
`/etc/nixos-containers` and `/var/lib/nixos-containers`.
If you are changing `system.stateVersion` to `"22.05"` manually on an existing
system you are responsible for migrating these directories yourself.
This is to improve compatibility with `libcontainer` based software such as Podman and Skopeo
which assumes they have ownership over `/etc/containers`.
- `security.klogd` was removed. Logging of kernel messages is handled
by systemd since Linux 3.5.

View File

@ -8,7 +8,10 @@ let
version = "2.40-13.0";
src = pkgs.fetchurl {
url = "https://downloads.linux.hpe.com/SDR/downloads/MCP/Ubuntu/pool/non-free/${pname}-${version}_amd64.deb";
urls = [
"https://downloads.linux.hpe.com/SDR/downloads/MCP/Ubuntu/pool/non-free/${pname}-${version}_amd64.deb"
"http://apt.netangels.net/pool/main/h/hpssacli/${pname}-${version}_amd64.deb"
];
sha256 = "11w7fwk93lmfw0yya4jpjwdmgjimqxx6412sqa166g1pz4jil4sw";
};

View File

@ -36,12 +36,12 @@ let
# register new services
${concatStringsSep "\n" (mapAttrsToList (name: service: ''
if echo "$NEW_SERVICES" | grep -xq ${name}; then
if echo "$NEW_SERVICES" | grep -xq "${name}"; then
bash -c ${escapeShellArg (concatStringsSep " \\\n " ([
"set -a && source ${service.registrationConfigFile} &&"
"gitlab-runner register"
"--non-interactive"
"--name ${name}"
(if service.description != null then "--description \"${service.description}\"" else "--name '${name}'")
"--executor ${service.executor}"
"--limit ${toString service.limit}"
"--request-concurrency ${toString service.requestConcurrency}"
@ -365,6 +365,13 @@ in
with <literal>RUNNER_ENV</literal> variable set.
'';
};
description = mkOption {
type = types.nullOr types.str;
default = null;
description = ''
Name/description of the runner.
'';
};
executor = mkOption {
type = types.str;
default = "docker";

View File

@ -92,6 +92,7 @@ in
services.udisks2.enable = true;
services.upower.enable = config.powerManagement.enable;
services.xserver.libinput.enable = mkDefault true;
services.dbus.packages = [ e.efl ];

View File

@ -62,6 +62,9 @@ in
services.gvfs.enable = true;
services.upower.enable = config.powerManagement.enable;
xdg.portal.enable = true;
xdg.portal.extraPortals = [ pkgs.lxqt.xdg-desktop-portal-lxqt ];
};
}

View File

@ -4,6 +4,11 @@ with lib;
let
configurationPrefix = optionalString (versionAtLeast config.system.stateVersion "22.05") "nixos-";
configurationDirectoryName = "${configurationPrefix}containers";
configurationDirectory = "/etc/${configurationDirectoryName}";
stateDirectory = "/var/lib/${configurationPrefix}containers";
# The container's init script, a small wrapper around the regular
# NixOS stage-2 init script.
containerInit = (cfg:
@ -77,7 +82,7 @@ let
startScript = cfg:
''
mkdir -p -m 0755 "$root/etc" "$root/var/lib"
mkdir -p -m 0700 "$root/var/lib/private" "$root/root" /run/containers
mkdir -p -m 0700 "$root/var/lib/private" "$root/root" /run/nixos-containers
if ! [ -e "$root/etc/os-release" ]; then
touch "$root/etc/os-release"
fi
@ -249,11 +254,11 @@ let
SyslogIdentifier = "container %i";
EnvironmentFile = "-/etc/containers/%i.conf";
EnvironmentFile = "-${configurationDirectory}/%i.conf";
Type = "notify";
RuntimeDirectory = lib.optional cfg.ephemeral "containers/%i";
RuntimeDirectory = lib.optional cfg.ephemeral "${configurationDirectoryName}/%i";
# Note that on reboot, systemd-nspawn returns 133, so this
# unit will be restarted. On poweroff, it returns 0, so the
@ -737,15 +742,21 @@ in
config = mkIf (config.boot.enableContainers) (let
warnings = flatten [
(optional (config.virtualisation.containers.enable && versionOlder config.system.stateVersion "22.05") ''
Enabling both boot.enableContainers & virtualisation.containers on system.stateVersion < 22.05 is unsupported.
'')
];
unit = {
description = "Container '%i'";
unitConfig.RequiresMountsFor = "/var/lib/containers/%i";
unitConfig.RequiresMountsFor = "${stateDirectory}/%i";
path = [ pkgs.iproute2 ];
environment = {
root = "/var/lib/containers/%i";
root = "${stateDirectory}/%i";
INSTANCE = "%i";
};
@ -782,8 +793,8 @@ in
script = startScript containerConfig;
postStart = postStartScript containerConfig;
serviceConfig = serviceDirectives containerConfig;
unitConfig.RequiresMountsFor = lib.optional (!containerConfig.ephemeral) "/var/lib/containers/%i";
environment.root = if containerConfig.ephemeral then "/run/containers/%i" else "/var/lib/containers/%i";
unitConfig.RequiresMountsFor = lib.optional (!containerConfig.ephemeral) "${stateDirectory}/%i";
environment.root = if containerConfig.ephemeral then "/run/nixos-containers/%i" else "${stateDirectory}/%i";
} // (
if containerConfig.autoStart then
{
@ -792,7 +803,7 @@ in
after = [ "network.target" ];
restartTriggers = [
containerConfig.path
config.environment.etc."containers/${name}.conf".source
config.environment.etc."${configurationDirectoryName}/${name}.conf".source
];
restartIfChanged = true;
}
@ -800,12 +811,12 @@ in
)) config.containers)
));
# Generate a configuration file in /etc/containers for each
# Generate a configuration file in /etc/nixos-containers for each
# container so that container@.target can get the container
# configuration.
environment.etc =
let mkPortStr = p: p.protocol + ":" + (toString p.hostPort) + ":" + (if p.containerPort == null then toString p.hostPort else toString p.containerPort);
in mapAttrs' (name: cfg: nameValuePair "containers/${name}.conf"
in mapAttrs' (name: cfg: nameValuePair "${configurationDirectoryName}/${name}.conf"
{ text =
''
SYSTEM_PATH=${cfg.path}
@ -854,7 +865,11 @@ in
ENV{INTERFACE}=="v[eb]-*", ENV{NM_UNMANAGED}="1"
'';
environment.systemPackages = [ pkgs.nixos-container ];
environment.systemPackages = [
(pkgs.nixos-container.override {
inherit stateDirectory configurationDirectory;
})
];
boot.kernelModules = [
"bridge"

View File

@ -33,10 +33,10 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
machine.succeed("nixos-container start webserver")
with subtest("Container got its own root folder"):
machine.succeed("ls /run/containers/webserver")
machine.succeed("ls /run/nixos-containers/webserver")
with subtest("Container persistent directory is not created"):
machine.fail("ls /var/lib/containers/webserver")
machine.fail("ls /var/lib/nixos-containers/webserver")
# Since "start" returns after the container has reached
# multi-user.target, we should now be able to access it.
@ -49,6 +49,6 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
machine.fail(f"curl --fail --connect-timeout 2 http://{ip}/ > /dev/null")
with subtest("Container's root folder was removed"):
machine.fail("ls /run/containers/webserver")
machine.fail("ls /run/nixos-containers/webserver")
'';
})

View File

@ -69,8 +69,8 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
with subtest(f"Put the root of {id2} into a bind mount"):
machine.succeed(
f"mv /var/lib/containers/{id2} /id2-bindmount",
f"mount --bind /id2-bindmount /var/lib/containers/{id1}",
f"mv /var/lib/nixos-containers/{id2} /id2-bindmount",
f"mount --bind /id2-bindmount /var/lib/nixos-containers/{id1}",
)
ip1 = machine.succeed(f"nixos-container show-ip {id1}").rstrip()
@ -88,7 +88,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
"Create a directory with a dummy file and bind-mount it into both containers."
):
for id in id1, id2:
important_path = f"/var/lib/containers/{id}/very/important/data"
important_path = f"/var/lib/nixos-containers/{id}/very/important/data"
machine.succeed(
f"mkdir -p {important_path}",
f"mount --bind /nested-bindmount {important_path}",
@ -154,13 +154,13 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
machine.succeed("grep -qF 'important data' /nested-bindmount/dummy")
with subtest("Ensure that the container path is gone"):
print(machine.succeed("ls -lsa /var/lib/containers"))
machine.succeed(f"test ! -e /var/lib/containers/{id1}")
print(machine.succeed("ls -lsa /var/lib/nixos-containers"))
machine.succeed(f"test ! -e /var/lib/nixos-containers/{id1}")
with subtest("Ensure that a failed container creation doesn'leave any state"):
machine.fail(
"nixos-container create b0rk --config-file ${brokenCfg}"
)
machine.succeed("test ! -e /var/lib/containers/b0rk")
machine.succeed("test ! -e /var/lib/nixos-containers/b0rk")
'';
})

View File

@ -62,7 +62,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
machine.succeed(
tmpfs_cmd("touch /root/test.file"),
tmpfs_cmd("ls -l /root | grep -q test.file"),
"test -e /var/lib/containers/tmpfs/root/test.file",
"test -e /var/lib/nixos-containers/tmpfs/root/test.file",
)
with subtest(
@ -73,7 +73,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
tmpfs_cmd("touch /some/random/path/test.file"),
tmpfs_cmd("test -e /some/random/path/test.file"),
)
machine.fail("test -e /var/lib/containers/tmpfs/some/random/path/test.file")
machine.fail("test -e /var/lib/nixos-containers/tmpfs/some/random/path/test.file")
with subtest(
"files created in the hosts container dir in a path where a tmpfs "
@ -81,9 +81,9 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
+ "the do not exist in the tmpfs"
):
machine.succeed(
"touch /var/lib/containers/tmpfs/var/test.file",
"test -e /var/lib/containers/tmpfs/var/test.file",
"ls -l /var/lib/containers/tmpfs/var/ | grep -q test.file 2>/dev/null",
"touch /var/lib/nixos-containers/tmpfs/var/test.file",
"test -e /var/lib/nixos-containers/tmpfs/var/test.file",
"ls -l /var/lib/nixos-containers/tmpfs/var/ | grep -q test.file 2>/dev/null",
)
machine.fail(tmpfs_cmd("ls -l /var | grep -q test.file"))
'';

View File

@ -18,20 +18,20 @@
stdenv.mkDerivation rec {
pname = "amberol";
version = "0.3.0";
version = "0.4.3";
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
owner = "World";
repo = pname;
rev = version;
sha256 = "sha256-+9lrSkjk7V+ZnIhmhw7lEiEywDp5adoAW+5PEAlhpSI=";
sha256 = "sha256-4yW7rVlP9Zskyt4l/VQoX+9q3TUdEuLZrNQuQvziIf4=";
};
cargoDeps = rustPlatform.fetchCargoTarball {
inherit src;
name = "${pname}-${version}";
sha256 = "sha256-ZJiD6RshEjZ7h+/KYcY+ZjL5fHRb5+RKgIdgbD6LdkA=";
sha256 = "sha256-1ahEWLBmkT+B8qD0Qd1skXqk1wvP6yuFNAQBRdispC4=";
};
postPatch = ''

View File

@ -40,6 +40,11 @@ in
url = "https://github.com/Audio4Linux/JDSP4Linux/commit/003c9e9fc426f83e269aed6e05be3ed55273931a.patch";
hash = "sha256-crll/a7C9pUq9eL5diq8/YgC5bNC6SrdijZEBxZpJ8E=";
})
# compatibility fix for PipeWire 0.3.44+, remove on version bump
(fetchpatch {
url = "https://github.com/Audio4Linux/JDSP4Linux/commit/e04c55735cc20fc3c3ce042c5681ec80f7df3c96.patch";
hash = "sha256-o6AUtQzugykALSdkM3i3lYqRmzJX3FzmALSi0TrWuRA=";
})
];
nativeBuildInputs = [

View File

@ -1,4 +1,4 @@
{ mkDerivation, lib, fetchurl, cmake, doxygen, extra-cmake-modules, wrapGAppsHook
{ mkDerivation, lib, fetchurl, fetchpatch, cmake, doxygen, extra-cmake-modules, wrapGAppsHook
# For `digitaglinktree`
, perl, sqlite
@ -43,6 +43,7 @@
, pcre
, threadweaver
, x265
, jasper
# For panorama and focus stacking
, enblend-enfuse
@ -55,13 +56,21 @@
mkDerivation rec {
pname = "digikam";
version = "7.4.0";
version = "7.6.0";
src = fetchurl {
url = "mirror://kde/stable/${pname}/${version}/digiKam-${version}.tar.xz";
sha256 = "sha256-0Iq2bacyu0SbwQEG7BHdne+ls1Yt7TdBsEHbuqcVUEo=";
sha256 = "sha256-2OHucyHT/DE5FvUVdW4wKaxBh9xFO2kzhI1N5TFLZkE=";
};
patches = [
(fetchpatch {
name = "akonadi-22.04.patch";
url = "https://github.com/archlinux/svntogit-packages/raw/1b3c76a4482055524120f598325d90545ff9c020/trunk/akonadi-22.04.patch";
sha256 = "sha256-ittgkl2t/nAD0ci2fNYoAd4E2M6Gg0vqqjxqZugBuko=";
})
];
nativeBuildInputs = [ cmake doxygen extra-cmake-modules kdoctools wrapGAppsHook ];
buildInputs = [
@ -86,6 +95,7 @@ mkDerivation rec {
opencv
pcre
x265
jasper
qtbase
qtxmlpatterns
@ -115,6 +125,7 @@ mkDerivation rec {
"-DENABLE_MEDIAPLAYER=1"
"-DENABLE_QWEBENGINE=on"
"-DENABLE_APPSTYLES=on"
"-DCMAKE_CXX_FLAGS=-I${libksane}/include/KF5" # fix `#include <ksane_version.h>`
];
dontWrapGApps = true;

View File

@ -86,6 +86,7 @@ let
dragon = callPackage ./dragon.nix {};
elisa = callPackage ./elisa.nix {};
eventviews = callPackage ./eventviews.nix {};
falkon = callPackage ./falkon.nix {};
ffmpegthumbs = callPackage ./ffmpegthumbs.nix { };
filelight = callPackage ./filelight.nix {};
granatier = callPackage ./granatier.nix {};
@ -97,7 +98,7 @@ let
kaccounts-providers = callPackage ./kaccounts-providers.nix {};
kaddressbook = callPackage ./kaddressbook.nix {};
kalarm = callPackage ./kalarm.nix {};
kalarmcal = callPackage ./kalarmcal.nix {};
kalendar = callPackage ./kalendar.nix {};
kalzium = callPackage ./kalzium.nix {};
kamoso = callPackage ./kamoso.nix {};
kapman = callPackage ./kapman.nix {};
@ -219,6 +220,7 @@ let
print-manager = callPackage ./print-manager.nix {};
rocs = callPackage ./rocs.nix {};
skanlite = callPackage ./skanlite.nix {};
skanpage = callPackage ./skanpage.nix {};
spectacle = callPackage ./spectacle.nix {};
yakuake = callPackage ./yakuake.nix {};
zanshin = callPackage ./zanshin.nix {};

View File

@ -1,21 +1,13 @@
{ stdenv, mkDerivation, lib, fetchFromGitHub, fetchpatch
, cmake, extra-cmake-modules, pkg-config, qmake
, cmake, extra-cmake-modules, pkg-config
, libpthreadstubs, libxcb, libXdmcp
, qtsvg, qttools, qtwebengine, qtx11extras
, qtwayland, wrapQtAppsHook
, kwallet
, kwallet, kpurpose, karchive, kio
}:
mkDerivation rec {
pname = "falkon";
version = "3.2.0";
src = fetchFromGitHub {
owner = "KDE";
repo = "falkon";
rev = "v${version}";
sha256 = "sha256-esi9YWd1PtQpDBhI1NtWEjZIoMoNUpAF+kQad67mLzE=";
};
preConfigure = ''
export NONBLOCK_JS_DIALOGS=true
@ -27,21 +19,20 @@ mkDerivation rec {
buildInputs = [
libpthreadstubs libxcb libXdmcp
qtsvg qttools qtwebengine qtx11extras
kwallet
kwallet kpurpose karchive kio
] ++ lib.optionals stdenv.isLinux [ qtwayland ];
nativeBuildInputs = [
cmake
extra-cmake-modules
pkg-config
qmake
qttools
wrapQtAppsHook
];
meta = with lib; {
description = "QtWebEngine based cross-platform web browser";
homepage = "https://community.kde.org/Incubator/Projects/Falkon";
homepage = "https://www.falkon.org";
license = licenses.gpl3;
maintainers = with maintainers; [ peterhoeg ];
platforms = platforms.unix;

View File

@ -1 +1 @@
WGET_ARGS=( https://download.kde.org/stable/release-service/21.12.3/src -A '*.tar.xz' )
WGET_ARGS=( https://download.kde.org/stable/release-service/22.04.0/src -A '*.tar.xz' )

View File

@ -21,4 +21,8 @@ mkDerivation {
kdbusaddons ki18n kontactinterface kparts kpimtextedit
kxmlgui libkdepim libkleo mailcommon pimcommon prison qgpgme qtbase
];
postInstall = ''
# added as an include directory by cmake files and fails to compile if it's missing
mkdir -p "$out/include/KF5"
'';
}

View File

@ -7,7 +7,7 @@
kio, knotifications, knotifyconfig, kservice, kwidgetsaddons,
kwindowsystem, kxmlgui, phonon,
kimap, akonadi, akonadi-contacts, akonadi-mime, kalarmcal, kcalendarcore, kcalutils,
kimap, akonadi, akonadi-contacts, akonadi-mime, kcalendarcore, kcalutils,
kholidays, kidentitymanagement, libkdepim, mailcommon, kmailtransport, kmime,
pimcommon, kpimtextedit, messagelib,
@ -31,7 +31,7 @@ mkDerivation {
kio knotifications knotifyconfig kservice kwidgetsaddons kwindowsystem
kxmlgui phonon
kimap akonadi akonadi-contacts akonadi-mime kalarmcal kcalendarcore
kimap akonadi akonadi-contacts akonadi-mime kcalendarcore
kcalutils kholidays kidentitymanagement libkdepim mailcommon kmailtransport
kmime pimcommon kpimtextedit messagelib

View File

@ -1,19 +0,0 @@
{
mkDerivation, lib, kdepimTeam,
extra-cmake-modules, kdoctools,
akonadi, kcalendarcore, kholidays, kidentitymanagement,
kpimtextedit, kcalutils
}:
mkDerivation {
pname = "kalarmcal";
meta = {
license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
maintainers = kdepimTeam;
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
propagatedBuildInputs = [
akonadi kcalendarcore kholidays kidentitymanagement kpimtextedit kcalutils
];
outputs = [ "out" "dev" ];
}

View File

@ -39,15 +39,6 @@
mkDerivation rec {
pname = "kalendar";
version = "1.0.0";
src = fetchFromGitLab {
domain = "invent.kde.org";
owner = "pim";
repo = pname;
rev = "v${version}";
sha256 = "sha256-kjtLVU+8wbIa7R6J1XOjuvS3AnJNngxNBCx24Dy1QzM=";
};
nativeBuildInputs = [
cmake
@ -95,7 +86,7 @@ mkDerivation rec {
meta = with lib; {
description = "A calendar application using Akonadi to sync with external services (Nextcloud, GMail, ...)";
homepage = "https://invent.kde.org/pim/kalendar/";
homepage = "https://apps.kde.org/kalendar/";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ chuangzhu ];
platforms = platforms.linux;

View File

@ -1,6 +1,6 @@
{
mkDerivation, lib, fetchpatch,
extra-cmake-modules, karchive, kio, libkexiv2, libkdcraw
extra-cmake-modules, karchive, kio, libkexiv2, libkdcraw, kdegraphics-mobipocket
}:
mkDerivation {
@ -10,5 +10,5 @@ mkDerivation {
maintainers = [ lib.maintainers.ttuegel ];
};
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ karchive kio libkexiv2 libkdcraw ];
buildInputs = [ karchive kio libkexiv2 libkdcraw kdegraphics-mobipocket ];
}

View File

@ -5,7 +5,7 @@
incidenceeditor, kcalendarcore, kcalutils, kconfig, kdbusaddons, kdeclarative,
kholidays, ki18n, kmime, ktexteditor, ktnef, libgravatar,
libksieve, mailcommon, mailimporter, messagelib, poppler, prison, kpkpass,
kitinerary, kontactinterface
kitinerary, kontactinterface, kaddressbook, discount
}:
mkDerivation {
@ -20,6 +20,6 @@ mkDerivation {
incidenceeditor kcalendarcore kcalutils kconfig kdbusaddons kdeclarative
kholidays ki18n kmime ktexteditor ktnef libgravatar
libksieve mailcommon mailimporter messagelib poppler prison kpkpass
kitinerary kontactinterface
kitinerary kontactinterface kaddressbook discount
];
}

View File

@ -3,7 +3,7 @@
extra-cmake-modules, kdoctools,
shared-mime-info,
akonadi, akonadi-calendar, akonadi-contacts, akonadi-mime, akonadi-notes,
kalarmcal, kcalutils, kcontacts, kdav, kidentitymanagement,
kholidays, kcalutils, kcontacts, kdav, kidentitymanagement,
kimap, kldap, kmailtransport, kmbox, kmime, knotifications, knotifyconfig,
pimcommon, libkgapi, libsecret,
qca-qt5, qtkeychain, qtnetworkauth, qtspeech, qtwebengine, qtxmlpatterns,
@ -18,7 +18,7 @@ mkDerivation {
nativeBuildInputs = [ extra-cmake-modules kdoctools shared-mime-info ];
buildInputs = [
akonadi akonadi-calendar akonadi-contacts akonadi-mime akonadi-notes
kalarmcal kcalutils kcontacts kdav kidentitymanagement kimap
kholidays kcalutils kcontacts kdav kidentitymanagement kimap
kldap kmailtransport kmbox kmime knotifications knotifyconfig qtwebengine
pimcommon libkgapi libsecret
qca-qt5 qtkeychain qtnetworkauth qtspeech qtxmlpatterns

View File

@ -1,4 +1,4 @@
{ mkDerivation, lib, fetchpatch
{ mkDerivation, lib
, libkdegames, extra-cmake-modules
, kdeclarative, knewstuff
}:
@ -16,16 +16,6 @@ mkDerivation {
platforms = platforms.linux;
};
patches = [
# fix compile error due to usage of deprecated things
# probably can be removed with the next kde bump
(fetchpatch {
url = "https://invent.kde.org/games/picmi/-/commit/99639fb499fe35eb463621efca1c0e4ff2a52bad.patch";
revert = true;
sha256 = "sha256-rRhTvUB1Hpc3bLv9b5yIf/G7uJy2/OgBfXToZwV4jrg=";
})
];
nativeBuildInputs = [
extra-cmake-modules
];

View File

@ -16,11 +16,11 @@ mkDerivation {
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
akonadi-mime grantlee karchive kcmutils kcodecs kcompletion kconfigwidgets
kdbusaddons kiconthemes kio kitemmodels kjobwidgets knewstuff kldap kpimtextedit
kdbusaddons kiconthemes kio kitemmodels kjobwidgets knewstuff kldap
kpurpose kwallet kwindowsystem libkdepim qtwebengine
];
propagatedBuildInputs = [
akonadi akonadi-contacts akonadi-search kconfig kcontacts kimap
akonadi akonadi-contacts akonadi-search kconfig kcontacts kimap kpimtextedit
];
outputs = [ "out" "dev" ];
}

View File

@ -6,16 +6,11 @@
, ktextwidgets
, libksane
, qtquickcontrols2
, kpurpose
}:
mkDerivation rec {
pname = "skanpage";
version = "1.0.0";
src = fetchurl {
url = "mirror://kde/stable/skanpage/${version}/${pname}-${version}.tar.xz";
hash = "sha256-kPVAG64oPkKF3ztHB4V7M2xc1AcvwiHnYpMMLMQNYGA=";
};
nativeBuildInputs = [ extra-cmake-modules ];
@ -24,6 +19,7 @@ mkDerivation rec {
ktextwidgets
libksane
qtquickcontrols2
kpurpose
];
meta = with lib; {

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,51 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, fetchpatch
, gettext
, pexpect
}:
buildPythonPackage rec {
pname = "sosreport";
version = "4.3";
src = fetchFromGitHub {
owner = "sosreport";
repo = "sos";
rev = version;
sha256 = "sha256-fLEYRRQap7xqSyUU9MAV8cxxYKydHjn8J147VTXSf78=";
};
patches = [
(fetchpatch {
# fix sos --help
url = "https://github.com/sosreport/sos/commit/ac4eb48fa35c13b99ada41540831412480babf8d.patch";
sha256 = "sha256-6ZRoDDZN2KkHTXOKuHTAquB/HTIUppodmx83WxxYFP0=";
})
];
nativeBuildInputs = [
gettext
];
propagatedBuildInputs = [
pexpect
];
# requires avocado-framework 94.0, latest version as of writing is 96.0
doCheck = false;
preCheck = ''
export PYTHONPATH=$PWD/tests:$PYTHONPATH
'';
pythonImportsCheck = [ "sos" ];
meta = with lib; {
description = "Unified tool for collecting system logs and other debug information";
homepage = "https://github.com/sosreport/sos";
license = licenses.gpl2Only;
maintainers = with maintainers; [ SuperSandro2000 ];
};
}

View File

@ -23,13 +23,13 @@
stdenv.mkDerivation rec {
pname = "megacmd";
version = "1.5.0";
version = "1.5.0c";
src = fetchFromGitHub {
owner = "meganz";
repo = "MEGAcmd";
rev = "${version}_Linux";
sha256 = "Y/FkbN9mTuBpcKCSQg0M+3/IPzJ58X4iZhX2kMVDv7A=";
sha256 = "sha256-JHuGkf6TBOZMvoP7Izm5/T9AWxyjaqrxR99x4bm7tVE=";
fetchSubmodules = true;
};

View File

@ -20,13 +20,13 @@
mkDerivation rec {
pname = "organicmaps";
version = "2022.03.23-4-android";
version = "2022.04.27-2";
src = fetchFromGitHub {
owner = "organicmaps";
repo = "organicmaps";
rev = version;
sha256 = "sha256-4VBsHq8z/odD7Nrk9e0sYMEBBLeTAHsWsdgPIN1KVZo=";
rev = "${version}-android";
sha256 = "sha256-HsskddXne5xClBZoT3aXP+51VRQQJhlUPda/M20SrH0=";
fetchSubmodules = true;
};
@ -35,7 +35,7 @@ mkDerivation rec {
echo "exit 0" > tools/unix/check_cert.sh
# crude fix for https://github.com/organicmaps/organicmaps/issues/1862
echo "echo ${lib.replaceStrings ["." "-" "android"] ["" "" ""] version}" > tools/unix/version.sh
echo "echo ${lib.replaceStrings ["." "-"] ["" ""] version}" > tools/unix/version.sh
'';
nativeBuildInputs = [
@ -64,19 +64,14 @@ mkDerivation rec {
bash ./configure.sh
'';
# Tell the program that the read-only and the read-write data locations
# are different, and create the read-write one.
# https://github.com/organicmaps/organicmaps/issues/2387
postInstall = ''
install -Dm755 OMaps $out/bin/OMaps
# Tell the program that the read-only and the read-write data locations
# are different, and create the read-write one.
wrapProgram $out/bin/OMaps \
--add-flags "-resources_path $out/share/organicmaps/data" \
--add-flags '-data_path "''${XDG_DATA_HOME:-''${HOME}/.local/share}/OMaps"' \
--run 'mkdir -p "''${XDG_DATA_HOME:-''${HOME}/.local/share}/OMaps"'
mkdir -p $out/share/organicmaps
cp -r ../data $out/share/organicmaps/data
install -Dm644 ../qt/res/logo.png $out/share/icons/hicolor/96x96/apps/organicmaps.png
install -Dm644 ../qt/res/OrganicMaps.desktop $out/share/applications/OrganicMaps.desktop
'';
meta = with lib; {

View File

@ -13,19 +13,20 @@
# logitech-udev-rules instead of adding this to services.udev.packages on NixOS
python3Packages.buildPythonApplication rec {
pname = "solaar";
version = "1.1.1";
version = "1.1.3";
src = fetchFromGitHub {
owner = "pwr-Solaar";
repo = "Solaar";
rev = version;
sha256 = "1yqxk6nfxc1xhk59qbz9m3wqkxv446g17pazvanpavriiysjzbrs";
hash = "sha256-6z22MnhUL9Da3G7UDmZsBAi2gHLNpiFEwe+pAtnP91s=";
};
nativeBuildInputs = [ wrapGAppsHook gdk-pixbuf ];
buildInputs = [ libappindicator librsvg ];
propagatedBuildInputs = with python3Packages; [
evdev
gobject-introspection
gtk3
psutil

View File

@ -10,16 +10,16 @@
buildGoModule rec {
pname = "nerdctl";
version = "0.18.0";
version = "0.19.0";
src = fetchFromGitHub {
owner = "containerd";
repo = pname;
rev = "v${version}";
sha256 = "sha256-gkfy/tKzh6EO+nyjuiU3InSErKvGcJp/X7oqYk0Msr0=";
sha256 = "sha256-FuWfHd4LfFHX5oRopDIDTi90cARi8cYjJBK0BgeCD/U=";
};
vendorSha256 = "sha256-hjhZYNpqt9yFNrDVpFlguESUAAqU+AhpUQTCvyMadPk=";
vendorSha256 = "sha256-mHitGjOfSRlqORWFtB16buSSJrCf7Li9+oHX4rcO4ek=";
nativeBuildInputs = [ makeWrapper installShellFiles ];

View File

@ -30,7 +30,23 @@ mkDerivation rec {
sha256 = "11dzrp9q05dmvnwp4vk4ihcibqcf4xyr0ijscpi716cyy730flma";
excludes = [ "CMakeLists.txt" ];
})
# Fixes for building calligra with modern poppler[-qt5]
(fetchpatch {
name = "poppler-22.03.0.patch";
url = "https://github.com/archlinux/svntogit-packages/raw/8f328bef497a9e3bc628e4e294c1a70b0c8b0eab/trunk/poppler-22.03.0.patch";
sha256 = "sha256-bOTnQcavXF49LIshNgzhXhyoEjzLmQJC/U7hO5P0bfY=";
})
# Fixes for building calligra with gcc11/c++17
(fetchpatch {
name = "build_c++17_poppler.patch";
url = "https://github.com/archlinux/svntogit-packages/raw/bbbe35f97eb1033798f1cf95d427890168598199/trunk/068cd9ae.patch";
sha256 = "sha256-d9/ILwSeW+ov11DF191hzIaUafO/rjQrAeONwqDSKbA=";
})
];
postPatch = ''
substituteInPlace CMakeLists.txt \
--replace 'CMAKE_CXX_STANDARD 11' 'CMAKE_CXX_STANDARD 17'
'';
nativeBuildInputs = [ extra-cmake-modules kdoctools ];

View File

@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "git-repo";
version = "2.24";
version = "2.24.1";
src = fetchFromGitHub {
owner = "android";
repo = "tools_repo";
rev = "v${version}";
sha256 = "sha256-p5zAehhqOUlKay3/Oy8hbBo5nQRIyE7o4bnaX/TabYc=";
sha256 = "sha256-mYCKmvI15a0ohQwxPIG8IuzNt4QvEs6Q35oMO+e5hbg=";
};
# Fix 'NameError: name 'ssl' is not defined'

View File

@ -16,7 +16,7 @@
, xkeyboard_config
, glib
, libarchive
, python
, python2
}:
let
@ -155,7 +155,7 @@ buildFHSUserEnv {
glib
libarchive
xdg-utils # xdg-open needed to open URLs
python
python2
# currently they want python 3.6 which is EOL
#python3
];

View File

@ -10,13 +10,13 @@
buildGoModule rec {
pname = "containerd";
version = "1.6.2";
version = "1.6.3";
src = fetchFromGitHub {
owner = "containerd";
repo = "containerd";
rev = "v${version}";
sha256 = "sha256-l/9jOvZ4nn/wy+XPRoT1lojfGvPEXhPz2FJjLpZ/EE8=";
sha256 = "sha256-mVnZsvhpKx/5dHMF0Z8BfuUSqwoIhOtPkA/1BSrVVqA=";
};
vendorSha256 = null;

View File

@ -8,19 +8,24 @@
buildGoModule rec {
pname = "lima";
version = "0.9.2";
version = "0.10.0";
src = fetchFromGitHub {
owner = "lima-vm";
repo = pname;
rev = "v${version}";
sha256 = "sha256-GS/mzBoVL78U7vMxkbnQfb89U640w8YdA8YhPH4Iwrc=";
sha256 = "sha256-xlpNJjSBw1iL8CjbWE6v4u7Vq5PjkGv0tQKU5eRN13w=";
};
vendorSha256 = "sha256-funVyM0RhDzGQPyzsABzXu3ETPYJwRosqkQreGBADZc=";
vendorSha256 = "sha256-uTkCi969RQ4K0ZJ2vOgqv3OJgzVVRX7b2sXNfmR6qoA=";
nativeBuildInputs = [ makeWrapper installShellFiles ];
# clean fails with read only vendor dir
postPatch = ''
substituteInPlace Makefile --replace 'binaries: clean' 'binaries:'
'';
buildPhase = ''
runHook preBuild
make "VERSION=v${version}" binaries

View File

@ -5,17 +5,18 @@
, breeze-icons
, hicolor-icon-theme
, pantheon
, gitUpdater
}:
stdenv.mkDerivation rec {
pname = "luna-icons";
version = "1.9.1";
version = "2.0";
src = fetchFromGitHub {
owner = "darkomarko42";
repo = pname;
rev = version;
sha256 = "sha256-ZUSG9lui07ICG/4M6LBEAhJo9KuKd+wMb2VoKu5Ifmg=";
sha256 = "sha256-aNN7ZoD4hZTw39Rwef4HRHzNzCM6O8Ev+37jZOfzN7s=";
};
nativeBuildInputs = [
@ -43,6 +44,8 @@ stdenv.mkDerivation rec {
runHook postInstall
'';
passthru.updateScript = gitUpdater {inherit pname version; };
meta = with lib; {
description = "Icon pack based on marwaita and papirus icons";
homepage = "https://github.com/darkomarko42/Luna-Icons";

View File

@ -49,6 +49,7 @@ let
screengrab = callPackage ./screengrab {};
qlipper = callPackage ./qlipper {};
lxqt-archiver = callPackage ./lxqt-archiver {};
xdg-desktop-portal-lxqt = callPackage ./xdg-desktop-portal-lxqt {};
preRequisitePackages = [
libsForQt5.kwindowsystem # provides some QT5 plugins needed by lxqt-panel
@ -92,7 +93,6 @@ let
optionalPackages = [
### LXQt project
qterminal
compton-conf
obconf-qt
lximage-qt
lxqt-archiver
@ -101,11 +101,8 @@ let
qps
screengrab
### Qlipper
qlipper
### Default icon theme
libsForQt5.oxygen-icons5
libsForQt5.breeze-icons
### Screen saver
pkgs.xscreensaver

View File

@ -16,13 +16,13 @@
mkDerivation rec {
pname = "libfm-qt";
version = "1.0.0";
version = "1.1.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = "libfm-qt";
rev = version;
sha256 = "1kk2cv9cp2gdj2pzdgm72c009iyl3mhrvsiz05kdxd4v1kn38ci1";
sha256 = "kF3u1Eh45l/HvL5R0PazIfGIdOVYyB2VAI33NwRfLJk=";
};
nativeBuildInputs = [

View File

@ -15,13 +15,13 @@
mkDerivation rec {
pname = "liblxqt";
version = "1.0.0";
version = "1.1.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
sha256 = "08cqvq99pvz8lz13273hlpv8160r6zyz4f7h4kl1g8xdga7m45gr";
sha256 = "vfqEB9Vh/BL47dlEvnyWwDBO0pRIUS1IuixW8A0PRds=";
};
nativeBuildInputs = [

View File

@ -10,13 +10,13 @@
mkDerivation rec {
pname = "libqtxdg";
version = "3.8.0";
version = "3.9.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
sha256 = "14jrzwdmhgn6bcggmhxx5rdapjzm93cfkjjls3nii1glnkwzncxz";
sha256 = "llE4OxI4I/n0P8Pv5tKT3tXM7IfD3VMQSxdaLkBJ4Gk=";
};
nativeBuildInputs = [

View File

@ -16,13 +16,13 @@
mkDerivation rec {
pname = "lximage-qt";
version = "1.0.0";
version = "1.1.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
sha256 = "1bf0smkawyibrabw7zcynwr2afpsv7pnnyxn4nqgh6mxnp7al157";
sha256 = "QvQ0LBGP9XD7vwuUD+A1x8oGDvqTeCkYyd2XyjU0fUo=";
};
nativeBuildInputs = [

View File

@ -14,13 +14,13 @@
mkDerivation rec {
pname = "lxqt-about";
version = "1.0.0";
version = "1.1.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
sha256 = "1fr2mx19ks4crh7cjc080vkrzldzgmghxvrzjqq7lspkzd5a0pjb";
sha256 = "GTnjmMVbkO5CeNLxNisD6XncqX32otaATZSka4YVNHo=";
};
nativeBuildInputs = [

View File

@ -15,13 +15,13 @@
mkDerivation rec {
pname = "lxqt-admin";
version = "1.0.0";
version = "1.1.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
sha256 = "06l7vs8aqx37bhrxf9xa16g7rdmia8j73q78qfj6syw57f3ssjr9";
sha256 = "A5dpw/vG92tC4W1q1wpDyMdRn1ScEH7m287MCEGOp9w=";
};
nativeBuildInputs = [

View File

@ -14,13 +14,13 @@
mkDerivation rec {
pname = "lxqt-archiver";
version = "0.5.0";
version = "0.6.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = "lxqt-archiver";
rev = version;
sha256 = "033lq7n34a5qk2zv8kr1633p5x2cjimv4w4n86w33xmcwya4yiji";
sha256 = "ay0nWCe/uMsJFFtBAQnsuxR6I/8q3xv6zK/qYr3BQyw=";
};
nativeBuildInputs = [

View File

@ -13,13 +13,13 @@
mkDerivation rec {
pname = "lxqt-build-tools";
version = "0.10.0";
version = "0.11.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
sha256 = "1hb04zgpalxv6da3myf1dxsbjix15dczzfq8a24g5dg2zfhwpx21";
sha256 = "vzppKTDwADBG5pOaluT858cWCKFFRaSbHz2Qhe6799E=";
};
postPatch = ''

View File

@ -20,13 +20,13 @@
mkDerivation rec {
pname = "lxqt-config";
version = "1.0.0";
version = "1.1.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
sha256 = "0yllqjmj4xbqi5681ffjxmlwlf9k9bpy3hgs7li6lnn90yy46qmr";
sha256 = "ncoJLpKzE1tqOV+KuUiGLDWiDvzJg0le4m4BMKFw6Mg=";
};
nativeBuildInputs = [

View File

@ -15,13 +15,13 @@
mkDerivation rec {
pname = "lxqt-globalkeys";
version = "1.0.1";
version = "1.1.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
sha256 = "ccvDcEstSUVvJ7gf0bsCxCPPMRXSkZh+tKOKWNnzMt4=";
sha256 = "6io6gH+n7dodTDQjvCqxjvaafQ4E9H7kx+s2QiAm3mY=";
};
nativeBuildInputs = [

View File

@ -15,13 +15,13 @@
mkDerivation rec {
pname = "lxqt-notificationd";
version = "1.0.0";
version = "1.1.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
sha256 = "06gb8k1p24gm5axy42npq7n4lmsxb03a9kvzqby44qmgwh8pn069";
sha256 = "YXwWqab6OW1KE7Zct92xdK/f/QaDVqEMVM+Cb9kNe7E=";
};
nativeBuildInputs = [

View File

@ -15,13 +15,13 @@
mkDerivation rec {
pname = "lxqt-openssh-askpass";
version = "1.0.0";
version = "1.1.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
sha256 = "0fp5jq3j34p81y200jbyp7wcz04r7jk07bfwrigjwcyj2xknkrgw";
sha256 = "s1ywmlcHsbeaRi5zrhFMPS0SJ1s8IYnDXWkFvB1kaI4=";
};
nativeBuildInputs = [

View File

@ -30,13 +30,13 @@
mkDerivation rec {
pname = "lxqt-panel";
version = "1.0.0";
version = "1.1.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
sha256 = "0i63jyjg31336davjdak7z3as34gazx1lri65fk2f07kka9dx1jl";
sha256 = "w5/uS8kRb5yFUXd1NImWMXxx40YtzxMZMS87e9syb6A=";
};
nativeBuildInputs = [
@ -67,6 +67,7 @@ mkDerivation rec {
qtx11extras
solid
xorg.libXdmcp
xorg.libXtst
xorg.libpthreadstubs
];

View File

@ -19,13 +19,13 @@
mkDerivation rec {
pname = "lxqt-policykit";
version = "1.0.0";
version = "1.1.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
sha256 = "0hmxzkkggnpci305xax9663cbjqdh6n0j0dawwcpwj4ks8mp7xh7";
sha256 = "Fs3N9r8RkawbXnX8jv8Fx63ijwAfy+OfrCpjeHDjKio=";
};
nativeBuildInputs = [

View File

@ -18,13 +18,13 @@
mkDerivation rec {
pname = "lxqt-powermanagement";
version = "1.0.0";
version = "1.1.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
sha256 = "0dwz8z3463dz49d5k5bh7splb1zdi617xc4xzlqxxrxbf3n8x4ix";
sha256 = "+FpJD5PEH2/HOSWDQEwMX2sV2JJH0kjcoohBolhSP1A=";
};
nativeBuildInputs = [

View File

@ -15,13 +15,13 @@
mkDerivation rec {
pname = "lxqt-qtplugin";
version = "1.0.0";
version = "1.1.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
sha256 = "1vr2hlv1q9xwkh9bapy29g9fi90d33xw7pr9zc1bfma6j152qs36";
sha256 = "mTA+3sXFWFYUEQhZOnAy6D/tYVAU+9AXbuLmLi7axlc=";
};
nativeBuildInputs = [

View File

@ -20,13 +20,13 @@
mkDerivation rec {
pname = "lxqt-runner";
version = "1.0.0";
version = "1.1.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
sha256 = "06b7l2jkh0h4ikddh82nxkz7qhg5ap7l016klg3jl2x659z59hpj";
sha256 = "hnuzoHKXqM6xEzN0jvHVjVWUXRxuwdhD3BiBfFMmZSk=";
};
nativeBuildInputs = [

View File

@ -19,13 +19,13 @@
mkDerivation rec {
pname = "lxqt-session";
version = "1.0.1";
version = "1.1.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
sha256 = "6/HTCngjz0GpNAYf66CUiCZtEs5EsBbjDjcObIe3qSk=";
sha256 = "urm4Ehd26fmssJwu/V9Uu/lZ0J8yDOtAA0DIihTPxng=";
};
nativeBuildInputs = [

View File

@ -16,13 +16,13 @@
mkDerivation rec {
pname = "lxqt-sudo";
version = "1.0.0";
version = "1.1.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
sha256 = "1y2vq3n5sv6cxqpnz79kl3dybfbw65z93cahdz8m6gplzpp24gn4";
sha256 = "Oa4OYIDXQUIQ96pEY7rGBq+spwVSU+kgDS7250tYNuc=";
};
nativeBuildInputs = [

View File

@ -8,13 +8,13 @@
mkDerivation rec {
pname = "lxqt-themes";
version = "1.0.0";
version = "1.1.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
sha256 = "1viaqmcq4axwsq5vrr08j95swapbqnwmv064kaijm1jj9csadsvv";
sha256 = "OEl6ZfMKdqjONRA1LPZ69KyFjp1c21Uib/riYDWSRWE=";
};
nativeBuildInputs = [

View File

@ -13,13 +13,13 @@
mkDerivation rec {
pname = "pavucontrol-qt";
version = "1.0.0";
version = "1.1.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
sha256 = "1n8h8flcm0na7n295lkjv49brj6razwml21wwrinwllw7s948qp0";
sha256 = "zHV9tR5gDjKDbfhnhVnCnw7whJDugMAGARA3UNs/6aA=";
};
nativeBuildInputs = [

View File

@ -15,13 +15,13 @@
mkDerivation rec {
pname = "pcmanfm-qt";
version = "1.0.0";
version = "1.1.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
sha256 = "1g7pl9ygk4k72rsrcsfjnr7h2yzp3pfmlc5wq6bhyq9rqpr5yv7l";
sha256 = "AgNupKdjSigrgY2U9bnkQCV0BrRCw2X9WR4jUH6YmEU=";
};
nativeBuildInputs = [

View File

@ -14,13 +14,13 @@
mkDerivation rec {
pname = "qps";
version = "2.4.0";
version = "2.5.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
sha256 = "11mbzn4syfghb3zvdrw2011njagcw206ng6c8l9z9h3zlhmhcd57";
sha256 = "hkcl9bBQP994TGr4CQQlRZR88IZiRdcbUNOXXf4kXdg=";
};
nativeBuildInputs = [

View File

@ -13,13 +13,13 @@
mkDerivation rec {
pname = "qterminal";
version = "1.0.0";
version = "1.1.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
sha256 = "12p3fnbkpj6z0iplg75304l8kvnn145iq6bpw30n9bwflxrd6yhd";
sha256 = "x+rgDrijDsMMdpU7afkn0dsSQbuBbEI9agoaLVsR/q8=";
};
nativeBuildInputs = [

View File

@ -10,13 +10,13 @@
mkDerivation rec {
pname = "qtermwidget";
version = "1.0.0";
version = "1.1.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
sha256 = "0i1w5wgac7r4p0jjrrswlvvwivkwrp1b88xh5ijjw6k9irjc7zf6";
sha256 = "tb1Vlkv8HsNlFCFOYfPnJlhdJmhyDmLE9SaTXZT0gGs=";
};
nativeBuildInputs = [

View File

@ -17,13 +17,13 @@
mkDerivation rec {
pname = "screengrab";
version = "2.3.0";
version = "2.4.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
sha256 = "1ca5yyvcahabyrdjcsznz9j66yrdlvnfa3650iwlz6922c3dkn2k";
sha256 = "EWmEbXY2EEUW2Hq7JwLW/KDgQ8KHs4DZzuGgFjNthPQ=";
};
nativeBuildInputs = [

View File

@ -0,0 +1,41 @@
{ lib
, mkDerivation
, fetchFromGitHub
, cmake
, kwindowsystem
, libfm-qt
, qtx11extras
, lxqtUpdateScript
}:
mkDerivation rec {
pname = "xdg-desktop-portal-lxqt";
version = "0.2.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
sha256 = "15wld2p07sbf2i2qv86ljm479q0nr9r65wavmabmn3fkzkz5vlgf";
};
nativeBuildInputs = [
cmake
];
buildInputs = [
kwindowsystem
libfm-qt
qtx11extras
];
passthru.updateScript = lxqtUpdateScript { inherit pname version src; };
meta = with lib; {
homepage = "https://github.com/lxqt/xdg-desktop-portal-lxqt";
description = "Backend implementation for xdg-desktop-portal that is using Qt/KF5/libfm-qt";
license = licenses.lgpl21Plus;
platforms = platforms.linux;
maintainers = with maintainers; [ romildo ];
};
}

View File

@ -3,9 +3,9 @@
mkXfceDerivation {
category = "apps";
pname = "xfce4-terminal";
version = "1.0.1";
version = "1.0.2";
sha256 = "sha256-+tuJGA/g0ddDop5mTbRZGVGUKKZ87fmdVMOaaBhMpFQ=";
sha256 = "sha256-d69SjV7dkiYmc0R5OyU5DV5RM3h51an4idWV872QoE4=";
nativeBuildInputs = [ libxslt docbook_xml_dtd_45 docbook_xsl ];

View File

@ -1,7 +1,7 @@
{ fetchFromGitHub, fetchgit, fetchHex, rebar3Relx, buildRebar3, rebar3-proper
, stdenv, writeScript, lib }:
let
version = "0.24.0";
version = "0.29.0";
owner = "erlang-ls";
repo = "erlang_ls";
deps = import ./rebar-deps.nix {
@ -19,7 +19,7 @@ rebar3Relx {
inherit version;
src = fetchFromGitHub {
inherit owner repo;
sha256 = "sha256-fKe6vsY40lexnkUP4PEsc53WFaUAw5LGLEC/zJauogg=";
sha256 = "sha256-BWI7H5HU5ZgXrMWFOZ7WpTfS6syrFpEVRInZW6hC5iE=";
rev = version;
};
releaseType = "escript";

View File

@ -66,11 +66,12 @@ let
};
yamerl = builder {
name = "yamerl";
version = "0.8.1";
src = fetchHex {
pkg = "yamerl";
version = "0.8.1";
sha256 = "sha256-lssw+dZDRP7Q74qS6fFvIH3mwE3/9PNmdSynn1vOsj8=";
version = "git";
src = fetchFromGitHub {
owner = "erlang-ls";
repo = "yamerl";
rev = "9a9f7a2e84554992f2e8e08a8060bfe97776a5b7";
sha256 = "1gb44v27paxwxm443m5f554wiziqi2kd300hgjjdg6fyvy3mvhss";
};
beamDeps = [ ];
};
@ -130,8 +131,8 @@ let
src = fetchFromGitHub {
owner = "josefs";
repo = "gradualizer";
rev = "e93db1c6725760def005c69d72f53b1a889b4c2f";
sha256 = "0i1mh0dw2qknrjwpbxhgpwspqv12bznylv17sznid3kbb31pslay";
rev = "6e89b4e1cd489637a848cc5ca55058c8a241bf7d";
sha256 = "1ix0xgd0267ibx6y68fx4pq8q3j0y7rjs7j3cv3v2gdiy190psy9";
};
beamDeps = [ ];
};

View File

@ -6,7 +6,12 @@ mkCoqDerivation {
pname = "coqtail-math";
owner = "coq-community";
inherit version;
defaultVersion = if versions.range "8.11" "8.13" coq.coq-version then "20201124" else null;
defaultVersion = with versions; switch coq.coq-version [
{ case = range "8.11" "8.15"; out = "8.14"; }
{ case = range "8.11" "8.13"; out = "20201124"; }
] null;
release."8.14".sha256 = "sha256:1k8f8idjnx0mf4z479vcx55iz42rjxrbplbznv80m2famxakq03c";
release."20201124".rev = "5c22c3d7dcd8cf4c47cf84a281780f5915488e9e";
release."20201124".sha256 = "sha256-wd+Lh7dpAD4zfpyKuztDmSFEZo5ZiFrR8ti2jUCVvoQ=";

View File

@ -1,13 +1,13 @@
{ lib, stdenv, fetchFromGitHub, cmake }:
stdenv.mkDerivation rec {
pname = "entt";
version = "3.9.0";
version = "3.10.0";
src = fetchFromGitHub {
owner = "skypjack";
repo = "entt";
rev = "v${version}";
sha256 = "sha256-7UeL8D+A0pH3TKNO5B8A1nhD7uDWeirHnHaI/YKVwyo=";
sha256 = "sha256-/4lc+/YiLPxrn+7Z67sEapYY0ocLWHPC8yeYD2VI+64=";
};
nativeBuildInputs = [ cmake ];

View File

@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
buildInputs = [ libxslt librsvg ];
enableParallelBuilding = true;
doCheck = true;
doCheck = !stdenv.hostPlatform.isPower64;
passthru = {
updateScript = gnome.updateScript {

View File

@ -9,14 +9,14 @@
stdenv.mkDerivation rec {
pname = "libslirp";
version = "4.6.1";
version = "4.7.0";
src = fetchFromGitLab {
domain = "gitlab.freedesktop.org";
owner = "slirp";
repo = pname;
rev = "v${version}";
sha256 = "sha256-AM6NxO4hjFiUAzRYbXV3fe18xwCBmzdM63n93UOxjKw=";
sha256 = "sha256-avUbgXPPV3IhUwZyARxCvctbVlLqDKWmMhAjdVBA3jY=";
};
nativeBuildInputs = [ meson ninja pkg-config ];

View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, cutee }:
{ lib, stdenv, fetchurl, fetchpatch, cutee }:
stdenv.mkDerivation rec {
pname = "mimetic";
@ -11,7 +11,13 @@ stdenv.mkDerivation rec {
buildInputs = [ cutee ];
patches = lib.optional stdenv.isAarch64 ./narrowing.patch;
patches = [
# Fix build with gcc11
(fetchpatch {
url = "https://github.com/tat/mimetic/commit/bf84940f9021950c80846e6b1a5f8b0b55991b00.patch";
sha256 = "sha256-1JW9zPg67BgNsdIjK/jp9j7QMg50eRMz5FsDsbbzBlI=";
})
] ++ lib.optional stdenv.isAarch64 ./narrowing.patch;
meta = with lib; {
description = "MIME handling library";

View File

@ -69,7 +69,7 @@ stdenv.mkDerivation rec {
propagatedBuildInputs = [ libpng libtiff lcms2 ];
doCheck = (testsSupport && !stdenv.isAarch64); # tests fail on aarch64-linux
doCheck = (testsSupport && !stdenv.isAarch64 && !stdenv.hostPlatform.isPower64); # tests fail on aarch64-linux and powerpc64
checkPhase = ''
substituteInPlace ../tools/ctest_scripts/travis-ci.cmake \
--replace "JPYLYZER_EXECUTABLE=" "JPYLYZER_EXECUTABLE=\"${jpylyzer}/bin/jpylyzer\" # "

View File

@ -1,20 +0,0 @@
diff --git a/poppler/JPEG2000Stream.cc b/poppler/JPEG2000Stream.cc
--- a/poppler/JPEG2000Stream.cc
+++ b/poppler/JPEG2000Stream.cc
@@ -201,7 +201,7 @@ void JPXStream::init()
if (getDict()) smaskInData = getDict()->lookup("SMaskInData");
int bufSize = BUFFER_INITIAL_SIZE;
- if (oLen.isInt()) bufSize = oLen.getInt();
+ if (oLen.isInt() && oLen.getInt() > 0) bufSize = oLen.getInt();
if (cspace.isArray() && cspace.arrayGetLength() > 0) {
@@ -365,7 +365,7 @@ void JPXStream::init()
}
int bufSize = BUFFER_INITIAL_SIZE;
- if (oLen.isInt()) bufSize = oLen.getInt();
+ if (oLen.isInt() && oLen.getInt() > 0) bufSize = oLen.getInt();
if (cspace.isArray() && cspace.arrayGetLength() > 0) {

View File

@ -1,94 +0,0 @@
{ stdenv
, lib
, fetchurl
, fetchpatch
, cairo
, cmake
, curl
, fontconfig
, freetype
, lcms
, libiconv
, libintl
, libjpeg
, ninja
, openjpeg
, pkg-config
, zlib
, withData ? true, poppler_data
, qt5Support ? false, qtbase ? null
, introspectionSupport ? false, gobject-introspection ? null
, utils ? false
, minimal ? false, suffix ? "glib"
}:
let
version = "0.61.1";
mkFlag = optset: flag: "-DENABLE_${flag}=${if optset then "on" else "off"}";
in
stdenv.mkDerivation rec {
pname = "poppler-${suffix}";
inherit version;
src = fetchurl {
url = "https://poppler.freedesktop.org/poppler-${version}.tar.xz";
sha256 = "1afdrxxkaivvviazxkg5blsf2x24sjkfj92ib0d3q5pm8dihjrhj";
};
outputs = [ "out" "dev" ];
patches = [
# Fix internal crash: a negative number that should not be
(fetchpatch {
name = "CVE-2018-13988";
url = "https://cgit.freedesktop.org/poppler/poppler/patch/?id=004e3c10df0abda214f0c293f9e269fdd979c5ee";
sha256 = "1l8713s57xc6g81bldw934rsfm140fqc7ggd50ha5mxdl1b3app2";
})
# Fix internal crash: a negative number that should not be (not the above!)
./0.61-CVE-2019-9959.patch
];
nativeBuildInputs = [
cmake
ninja
pkg-config
];
buildInputs = [
libiconv
libintl
]
++ lib.optional withData poppler_data;
# TODO: reduce propagation to necessary libs
propagatedBuildInputs = with lib;
[ zlib freetype fontconfig libjpeg openjpeg ]
++ optionals (!minimal) [ cairo lcms curl ]
++ optional qt5Support qtbase
++ optional introspectionSupport gobject-introspection;
# Not sure when and how to pass it. It seems an upstream bug anyway.
CXXFLAGS = lib.optionalString stdenv.cc.isClang "-std=c++11";
cmakeFlags = [
(mkFlag true "XPDF_HEADERS")
(mkFlag (!minimal) "GLIB")
(mkFlag (!minimal) "CPP")
(mkFlag (!minimal) "LIBCURL")
(mkFlag utils "UTILS")
(mkFlag qt5Support "QT5")
];
dontWrapQtApps = true;
meta = with lib; {
homepage = "https://poppler.freedesktop.org/";
description = "A PDF rendering library";
longDescription = ''
Poppler is a PDF rendering library based on the xpdf-3.0 code base.
'';
license = licenses.gpl2Plus;
platforms = platforms.all;
maintainers = with maintainers; [ ttuegel ];
};
}

View File

@ -89,9 +89,6 @@ let
pkgs.lib.makeBinPath [ pkgs.nodejs ]
}
'';
# See: https://github.com/NixOS/nixpkgs/issues/142196
# [...]/@hyperspace/cli/node_modules/.bin/node-gyp-build: /usr/bin/env: bad interpreter: No such file or directory
meta.broken = true;
};
mdctl-cli = super."@medable/mdctl-cli".override {
@ -366,7 +363,7 @@ let
src = fetchurl {
url = "https://registry.npmjs.org/prisma/-/prisma-${version}.tgz";
sha512 = "sha512-ltCMZAx1i0i9xuPM692Srj8McC665h6E5RqJom999sjtVSccHSD8Z+HSdBN2183h9PJKvC5dapkn78dd0NWMBg==";
sha512 = "sha512-oO1auBnBtieGdiN+57IgsA9Vr7Sy4HkILi1KSaUG4mpKfEbnkTGnLOxAqjLed+K2nsG/GtE1tJBtB7JxN1a78Q==";
};
postInstall = with pkgs; ''
wrapProgram "$out/bin/prisma" \

View File

@ -7672,13 +7672,13 @@ let
sha512 = "DiIjtous4XPuR2deTctD3/RVZy/vRzVYBgYYvHV313MmTfkbVP60qLH5txrT3/bYNvnb0poNDelLS6U0kqlvHA==";
};
};
"@prisma/engines-3.12.0-37.22b822189f46ef0dc5c5b503368d1bee01213980" = {
"@prisma/engines-3.13.0-17.efdf9b1183dddfd4258cd181a72125755215ab7b" = {
name = "_at_prisma_slash_engines";
packageName = "@prisma/engines";
version = "3.12.0-37.22b822189f46ef0dc5c5b503368d1bee01213980";
version = "3.13.0-17.efdf9b1183dddfd4258cd181a72125755215ab7b";
src = fetchurl {
url = "https://registry.npmjs.org/@prisma/engines/-/engines-3.12.0-37.22b822189f46ef0dc5c5b503368d1bee01213980.tgz";
sha512 = "zULjkN8yhzS7B3yeEz4aIym4E2w1ChrV12i14pht3ePFufvsAvBSoZ+tuXMvfSoNTgBS5E4bolRzLbMmbwkkMQ==";
url = "https://registry.npmjs.org/@prisma/engines/-/engines-3.13.0-17.efdf9b1183dddfd4258cd181a72125755215ab7b.tgz";
sha512 = "Ip9CcCeUocH61eXu4BUGpvl5KleQyhcUVLpWCv+0ZmDv44bFaDpREqjGHHdRupvPN/ugB6gTlD9b9ewdj02yVA==";
};
};
"@prisma/prisma-fmt-wasm-3.12.0-37.22b822189f46ef0dc5c5b503368d1bee01213980" = {
@ -67291,6 +67291,15 @@ let
sha512 = "hPlt7ZACERQGf03M253ytLY3dHbGNGrAq9qIHWUY9XHYl1z7wYngSr3OQ5xmui8o2AaxsONxIzjafLUiWBo1Fg==";
};
};
"ts-pattern-4.0.2" = {
name = "ts-pattern";
packageName = "ts-pattern";
version = "4.0.2";
src = fetchurl {
url = "https://registry.npmjs.org/ts-pattern/-/ts-pattern-4.0.2.tgz";
sha512 = "eHqR/7A6fcw05vCOfnL6RwgGJbVi9G/YHTdYdjYmElhDdJ1SMn7pWs+6+YuxygaFwQS/g+cIDlu+UD8IVpur1A==";
};
};
"ts-pnp-1.2.0" = {
name = "ts-pnp";
packageName = "ts-pnp";
@ -119159,13 +119168,14 @@ in
prisma = nodeEnv.buildNodePackage {
name = "prisma";
packageName = "prisma";
version = "3.12.0";
version = "3.13.0";
src = fetchurl {
url = "https://registry.npmjs.org/prisma/-/prisma-3.12.0.tgz";
sha512 = "ltCMZAx1i0i9xuPM692Srj8McC665h6E5RqJom999sjtVSccHSD8Z+HSdBN2183h9PJKvC5dapkn78dd0NWMBg==";
url = "https://registry.npmjs.org/prisma/-/prisma-3.13.0.tgz";
sha512 = "oO1auBnBtieGdiN+57IgsA9Vr7Sy4HkILi1KSaUG4mpKfEbnkTGnLOxAqjLed+K2nsG/GtE1tJBtB7JxN1a78Q==";
};
dependencies = [
sources."@prisma/engines-3.12.0-37.22b822189f46ef0dc5c5b503368d1bee01213980"
sources."@prisma/engines-3.13.0-17.efdf9b1183dddfd4258cd181a72125755215ab7b"
sources."ts-pattern-4.0.2"
];
buildInputs = globalBuildInputs;
meta = {

View File

@ -10,13 +10,14 @@
buildPythonPackage rec {
pname = "beautifulsoup4";
version = "4.10.0";
version = "4.11.1";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-wjrSPFIdgYlVpBUaZ9gVgDGdS/VI09SfQiOuBB/5iJE=";
hash = "sha256-rZqlW2XvKAjrQF9Gz3Tff8twRNXLwmSH+W6y7y5DZpM=";
};
propagatedBuildInputs = [
@ -29,7 +30,9 @@ buildPythonPackage rec {
pytestCheckHook
];
pythonImportsCheck = [ "bs4" ];
pythonImportsCheck = [
"bs4"
];
meta = with lib; {
homepage = "http://crummy.com/software/BeautifulSoup/bs4/";

View File

@ -15,14 +15,14 @@
buildPythonPackage rec {
pname = "fastavro";
version = "1.4.10";
version = "1.4.11";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = version;
sha256 = "sha256-JTNRm/nCQckAZrVTgcJVP3bLE53QPtccdoDcGLbP6BE=";
rev = "refs/tags/${version}";
sha256 = "sha256-PK8+NFJurJ0nD5coEFj8lXWg4VMcpX0954qDb1GW6Gk=";
};
preBuild = ''

View File

@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "hg-evolve";
version = "10.5.0";
version = "10.5.1";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-p2zPUCc+KrsNxPChdW3ZgkOo+HJB7IcYtqh5Uh0Qnaw=";
sha256 = "sha256-JGk9PdCDXiDkP8Arw2pfpU+sEj/sCHwwHHWVwF3Ofzw=";
};
checkInputs = [

View File

@ -10,14 +10,14 @@
buildPythonPackage rec {
pname = "jc";
version = "1.18.6";
version = "1.18.7";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "kellyjonbrazil";
repo = pname;
rev = "v${version}";
sha256 = "sha256-yk6Rg9DwilG8OWmT7SF80eYRsRwDwJp+mx2Yv2Gg+ak=";
sha256 = "sha256-1fnkeyfvFHy9/COpFtPdvj8ptUIVxfoBrOFw9Ikf47w=";
};
propagatedBuildInputs = [ ruamel-yaml xmltodict pygments ];

View File

@ -15,14 +15,14 @@
buildPythonPackage rec {
pname = "limnoria";
version = "2022.3.17";
version = "2022.4.22";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
hash = "sha256-sSZFbEDlkc+F0PIwvseVEBoQQZVTFypW2nvLmPDD4u0=";
hash = "sha256-NKRxt25uvMBvSpY8vk4Vr56NmnW2VTpOLBHUzM2j/yc=";
};
propagatedBuildInputs = [

View File

@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "mwdblib";
version = "4.1.0";
version = "4.2.1";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "CERT-Polska";
repo = pname;
rev = "v${version}";
sha256 = "sha256-afqE6zL1uwsLNAuy5XY7OduP1e3W2ueteOOVaFJg3b0=";
hash = "sha256-Wkqvi/buYKDoGi+4C9zkxWEiGynk9Ds8gLsdoaZCdKg=";
};
propagatedBuildInputs = [

View File

@ -0,0 +1,32 @@
{ lib, python, buildPythonPackage, fetchPypi, numpy, treelog, stringly, coverage }:
buildPythonPackage rec {
pname = "nutils";
version = "7.0";
src = fetchPypi {
inherit pname version;
sha256 = "1sw310l2yb8wbcv2qhik8s928zjh2syzz2qxisglbzski9qdw2x6";
};
pythonImportChecks = [ "nutils" ];
propagatedBuildInputs = [
numpy
treelog
stringly
];
checkInputs = [ coverage ];
checkPhase = ''
${python.interpreter} -m unittest
'';
meta = with lib; {
description = "Numerical Utilities for Finite Element Analysis";
homepage = "https://www.nutils.org/";
license = licenses.mit;
maintainers = [ maintainers.Scriptkiddi ];
};
}

View File

@ -19,14 +19,14 @@
buildPythonPackage rec {
pname = "plugwise";
version = "0.17.7";
version = "0.17.8";
format = "setuptools";
src = fetchFromGitHub {
owner = pname;
repo = "python-plugwise";
rev = "refs/tags/v${version}";
sha256 = "sha256-PZoxI7s3LTb60oXFfsOi5mCaLOKzq6ed2yFKap0Q1Ng=";
sha256 = "sha256-ZNlkdubB6E5ak+EaXsEBGa1xpm5ms4Rp3DG/M4/+WOg=";
};
postPatch = ''

View File

@ -14,16 +14,16 @@
buildPythonPackage rec {
pname = "pyopenuv";
version = "2021.11.0";
version = "2022.04.0";
format = "pyproject";
disabled = pythonOlder "3.6";
disabled = pythonOlder "3.8";
src = fetchFromGitHub {
owner = "bachya";
repo = pname;
rev = version;
sha256 = "sha256-J0YIq00/GcWEL23UHmN98Jp/imOAz8NLzhMdk8WFozk=";
rev = "refs/tags/${version}";
hash = "sha256-qPk3XA6ciID6h12102AGLxfaTmE63BzKPLvwFn6F1tM=";
};
nativeBuildInputs = [

View File

@ -3,6 +3,7 @@
, buildPythonPackage
, fetchFromGitHub
, importlib-metadata
, pydantic
, poetry-core
, pytest-asyncio
, pytest-mock
@ -13,7 +14,7 @@
buildPythonPackage rec {
pname = "python-kasa";
version = "0.4.3";
version = "0.5.0";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -22,7 +23,7 @@ buildPythonPackage rec {
owner = pname;
repo = pname;
rev = "refs/tags/${version}";
sha256 = "sha256-r1PoOxFPA4zYFEpw+BakzDAJ13IMfcZpTJWkRt/q4go=";
sha256 = "sha256-9zCUYB+TYgDMoTHpR0u42Usq2EKp8vtzlTgU82eXxl8=";
};
nativeBuildInputs = [
@ -32,6 +33,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [
asyncclick
importlib-metadata
pydantic
];
checkInputs = [

View File

@ -0,0 +1,28 @@
{ lib , python, buildPythonPackage , fetchPypi, typing-extensions }:
buildPythonPackage rec {
pname = "stringly";
version = "1.0b2";
src = fetchPypi {
inherit pname version;
sha256 = "09fi9dgf27v4qi0mwwms7hpwim9qpyalckd66p7nlmfp6c8bzppq";
};
pythonImportsCheck = [ "stringly" ];
propagatedBuildInputs = [
typing-extensions
];
checkPhase = ''
${python.interpreter} -m unittest
'';
meta = with lib; {
description = "Stringly: Human Readable Object Serialization";
homepage = "https://github.com/evalf/stringly";
license = licenses.mit;
maintainers = [ maintainers.Scriptkiddi ];
};
}

View File

@ -0,0 +1,28 @@
{ lib , python, buildPythonPackage , fetchPypi, typing-extensions }:
buildPythonPackage rec {
pname = "treelog";
version = "1.0";
src = fetchPypi {
inherit pname version;
sha256 = "0hnivz4p4llky6djxgcsr9r3j4vr46mkjvp0ksybhpx0fsnhdi81";
};
pythonImportsCheck = [ "treelog" ];
propagatedBuildInputs = [
typing-extensions
];
checkPhase = ''
${python.interpreter} -m unittest
'';
meta = with lib; {
description = "Logging framework that organizes messages in a tree structure";
homepage = "https://github.com/evalf/treelog";
license = licenses.mit;
maintainers = [ maintainers.Scriptkiddi ];
};
}

View File

@ -1,7 +1,7 @@
GEM
remote: https://rubygems.org/
specs:
brakeman (5.1.1)
brakeman (5.2.2)
PLATFORMS
ruby
@ -10,4 +10,4 @@ DEPENDENCIES
brakeman
BUNDLED WITH
2.2.24
2.3.9

View File

@ -4,9 +4,9 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0y71fqqd0azy5rn78fwiz9px0mql23zrl0ij0dzdkx22l4cscpb0";
sha256 = "1bk1xz5w29cq84svnrlgcrwvy1lpkwqrv6cmkkivs3yrym09av14";
type = "gem";
};
version = "5.1.1";
version = "5.2.2";
};
}

View File

@ -1,18 +1,21 @@
{ lib, python}:
{ lib, python }:
python.pkgs.buildPythonApplication rec {
pname = "alibuild";
version = "1.5.5";
version = "1.11.2";
src = python.pkgs.fetchPypi {
inherit pname version;
sha256 = "1sh02avpab4qlyin3p928xw91l4fgs8x5x2rzl623ayqsnfjv19j";
hash = "sha256-wq2H2inUf2CjPD45krCNdjw2s4FXsEDlfOHqW8VaVKg=";
};
doCheck = false;
propagatedBuildInputs = [
python.pkgs.requests
python.pkgs.pyyaml
propagatedBuildInputs = with python.pkgs; [
requests
pyyaml
boto3
jinja2
distro
];
meta = with lib; {

View File

@ -13,19 +13,19 @@
# function correctly.
rustPlatform.buildRustPackage rec {
pname = "prisma-engines";
version = "3.12.0";
version = "3.13.0";
src = fetchFromGitHub {
owner = "prisma";
repo = "prisma-engines";
rev = version;
sha256 = "sha256-lIHE63XIPutvTS2cid0+tuo+JMSKMGuSUcnFv1mCRrM=";
sha256 = "sha256-+Ug4tOaqUaqcEoMv20CKE8JrjIdW34VSn20gXZYX92k=";
};
# Use system openssl.
OPENSSL_NO_VENDOR = 1;
cargoSha256 = "sha256-SkI+GLHknC+CGhGo7KiZahBxMp/JCIukTe2C0mMTdjY=";
cargoSha256 = "sha256-V2G++BYLRGVM4leB2jkM+HcFiCIdf2wA3dfYdtlq7XI=";
nativeBuildInputs = [ pkg-config ];
@ -62,3 +62,15 @@ rustPlatform.buildRustPackage rec {
maintainers = with maintainers; [ pamplemousse pimeys superherointj ];
};
}
### Troubleshooting
# Here's an example application using Prisma with Nix: https://github.com/pimeys/nix-prisma-example
# At example's `flake.nix` shellHook, notice the requirement of defining environment variables for prisma, it's values will show on `prisma --version`.
# Read the example's README: https://github.com/pimeys/nix-prisma-example/blob/main/README.md
# Prisma requires 2 packages, `prisma-engines` and `nodePackages.prisma`, to be at *exact* same versions.
# Certify at `package.json` that dependencies "@prisma/client" and "prisma" are equal, meaning no caret (`^`) in version.
# Configure NPM to use exact version: `npm config set save-exact=true`
# Delete `package-lock.json`, delete `node_modules` directory and run `npm install`.
# Run prisma client from `node_modules/.bin/prisma`.
# Run `./node_modules/.bin/prisma --version` and check if both prisma packages versions are equal, current platform is `linux-nixos`, and other keys equal to the prisma environment variables you defined for prisma.
# Test prisma with `generate`, `db push`, etc. It should work. If not, open an issue.

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