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

Merge master into haskell-updates

Browse Source
This commit is contained in:
github-actions[bot]
2022-04-28 00:15:25 +00:00
committed by GitHub
parent 1a2aa2b0dd df13cab16c
commit 2ae92e3309
212 changed files with 2724 additions and 1755 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/default.nix
+2 -1
View File
@@ -94,7 +94,8 @@ let
concatImapStringsSep makeSearchPath makeSearchPathOutput
makeLibraryPath makeBinPath optionalString
hasInfix hasPrefix hasSuffix stringToCharacters stringAsChars escape
escapeShellArg escapeShellArgs escapeRegex escapeXML replaceChars lowerChars
escapeShellArg escapeShellArgs isValidPosixName toShellVar toShellVars
escapeRegex escapeXML replaceChars lowerChars
upperChars toLower toUpper addContextFrom splitString
removePrefix removeSuffix versionOlder versionAtLeast
getName getVersion
lib/strings.nix
+60
View File
@@ -17,6 +17,7 @@ rec {
head
isInt
isList
isAttrs
isString
match
parseDrvName
@@ -324,6 +325,65 @@ rec {
*/
escapeShellArgs = concatMapStringsSep " " escapeShellArg;
/* Test whether the given name is a valid POSIX shell variable name.
Type: string -> bool
Example:
isValidPosixName "foo_bar000"
=> true
isValidPosixName "0-bad.jpg"
=> false
*/
isValidPosixName = name: match "[a-zA-Z_][a-zA-Z0-9_]*" name != null;
/* Translate a Nix value into a shell variable declaration, with proper escaping.
Supported value types are strings (mapped to regular variables), lists of strings
(mapped to Bash-style arrays) and attribute sets of strings (mapped to Bash-style
associative arrays). Note that "strings" include string-coercible values like paths.
Strings are translated into POSIX sh-compatible code; lists and attribute sets
assume a shell that understands Bash syntax (e.g. Bash or ZSH).
Type: string -> (string | listOf string | attrsOf string) -> string
Example:
''
${toShellVar "foo" "some string"}
[[ "$foo" == "some string" ]]
''
*/
toShellVar = name: value:
lib.throwIfNot (isValidPosixName name) "toShellVar: ${name} is not a valid shell variable name" (
if isAttrs value then
"declare -A ${name}=(${
concatStringsSep " " (lib.mapAttrsToList (n: v:
"[${escapeShellArg n}]=${escapeShellArg v}"
) value)
})"
else if isList value then
"declare -a ${name}=(${escapeShellArgs value})"
else
"${name}=${escapeShellArg value}"
);
/* Translate an attribute set into corresponding shell variable declarations
using `toShellVar`.
Type: attrsOf (string | listOf string | attrsOf string) -> string
Example:
let
foo = "value";
bar = foo;
in ''
${toShellVars { inherit foo bar; }}
[[ "$foo" == "$bar" ]]
''
*/
toShellVars = vars: concatStringsSep "\n" (lib.mapAttrsToList toShellVar vars);
/* Turn a string into a Nix expression representing that string
Type: string -> string
lib/tests/misc.nix
+20
View File
@@ -251,6 +251,26 @@ runTests {
expected = ""test" 'test' < & >";
};
testToShellVars = {
expr = ''
${toShellVars {
STRing01 = "just a 'string'";
_array_ = [ "with" "more strings" ];
assoc."with some" = ''
strings
possibly newlines
'';
}}
'';
expected = ''
STRing01='just a '\'''string'\''''
declare -a _array_=('with' 'more strings')
declare -A assoc=(['with some']='strings
possibly newlines
')
'';
};
# LISTS
testFilter = {
maintainers/maintainer-list.nix
+8 -6
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";
@@ -6834,12 +6835,6 @@
githubId = 99639;
name = "Pawel Kruszewski";
};
ktosiek = {
email = "tomasz.kontusz@gmail.com";
github = "ktosiek";
githubId = 278013;
name = "Tomasz Kontusz";
};
kubukoz = {
email = "kubukoz@gmail.com";
github = "kubukoz";
@@ -13575,6 +13570,13 @@
github = "wunderbrick";
githubId = 52174714;
};
wyndon = {
email = "72203260+wyndon@users.noreply.github.com";
matrix = "@wyndon:envs.net";
github = "wyndon";
githubId = 72203260;
name = "wyndon";
};
wyvie = {
email = "elijahrum@gmail.com";
github = "wyvie";
nixos/doc/manual/administration/declarative-containers.section.md
+1 -1
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
nixos/doc/manual/administration/imperative-containers.section.md
+2 -2
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
nixos/doc/manual/from_md/administration/declarative-containers.section.xml
+2 -2
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>
nixos/doc/manual/from_md/administration/imperative-containers.section.xml
+3 -2
View File
@@ -14,8 +14,9 @@
</programlisting>
<para>
This creates the container’s 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 container’s 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
nixos/doc/manual/from_md/release-notes/rl-2205.section.xml
+22
View File
@@ -471,6 +471,28 @@
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
nixos/doc/manual/release-notes/rl-2205.section.md
+10
View File
@@ -151,6 +151,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.
nixos/modules/hardware/raid/hpsa.nix
+4 -1
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";
};
nixos/modules/installer/sd-card/sd-image-aarch64.nix
+9
View File
@@ -39,6 +39,12 @@
# Supported in newer board revisions
arm_boost=1
[cm4]
# Enable host mode on the 2711 built-in XHCI USB controller.
# This line should be removed if the legacy DWC2 controller is required
# (e.g. for USB device mode) or if USB support is not required.
otg_mode=1
[all]
# Boot in 64-bit mode.
arm_64bit=1
@@ -65,6 +71,9 @@
cp ${pkgs.ubootRaspberryPi4_64bit}/u-boot.bin firmware/u-boot-rpi4.bin
cp ${pkgs.raspberrypi-armstubs}/armstub8-gic.bin firmware/armstub8-gic.bin
cp ${pkgs.raspberrypifw}/share/raspberrypi/boot/bcm2711-rpi-4-b.dtb firmware/
cp ${pkgs.raspberrypifw}/share/raspberrypi/boot/bcm2711-rpi-400.dtb firmware/
cp ${pkgs.raspberrypifw}/share/raspberrypi/boot/bcm2711-rpi-cm4.dtb firmware/
cp ${pkgs.raspberrypifw}/share/raspberrypi/boot/bcm2711-rpi-cm4s.dtb firmware/
'';
populateRootCommands = ''
mkdir -p ./files/boot
nixos/modules/profiles/all-hardware.nix
+3
View File
@@ -40,6 +40,9 @@ in
# SD cards.
"sdhci_pci"
# NVMe drives
"nvme"
# Firewire support. Not tested.
"ohci1394" "sbp2"
nixos/modules/services/continuous-integration/gitlab-runner.nix
+9 -2
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";
nixos/modules/services/networking/supplicant.nix
+1 -1
View File
@@ -43,7 +43,7 @@ let
path = [ pkgs.coreutils ];
preStart = ''
${optionalString (suppl.configFile.path!=null) ''
${optionalString (suppl.configFile.path!=null && suppl.configFile.writable) ''
(umask 077 && touch -a "${suppl.configFile.path}")
''}
${optionalString suppl.userControlled.enable ''
nixos/modules/services/x11/desktop-managers/enlightenment.nix
+1
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 ];
nixos/modules/services/x11/desktop-managers/lxqt.nix
+3
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 ];
};
}
nixos/modules/virtualisation/nixos-containers.nix
+26 -11
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"
nixos/tests/containers-ephemeral.nix
+3 -3
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")
'';
})
nixos/tests/containers-imperative.nix
+6 -6
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")
'';
})
nixos/tests/containers-tmpfs.nix
+5 -5
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"))
'';
pkgs/applications/audio/amberol/default.nix
+3 -3
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 = ''
pkgs/applications/audio/jamesdsp/default.nix
+5
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 = [
pkgs/applications/audio/viper4linux-gui/default.nix
+82
View File
@@ -0,0 +1,82 @@
{ lib
, stdenv
, fetchFromGitHub
, copyDesktopItems
, pkg-config
, qtbase
, qtsvg
, qtmultimedia
, qmake
, gst_all_1
, libpulseaudio
, makeDesktopItem
, viper4linux
, wrapQtAppsHook
}:
let
gstPluginPath = lib.makeSearchPathOutput "lib" "lib/gstreamer-1.0" (with gst_all_1; [ gstreamer gst-plugins-viperfx gst-plugins-base gst-plugins-good ]);
in
stdenv.mkDerivation rec {
pname = "viper4linux-gui";
version = "unstable-2022-04-23";
src = fetchFromGitHub {
owner = "Audio4Linux";
repo = "Viper4Linux-GUI";
rev = "2d0c84d7dda76c59e31c850e38120002eb779b7a";
sha256 = "sha256-5YlLCF598i/sldczPEgCB+1KJDA7jqM964QDSNjgTKM=";
};
desktopItems = [
(makeDesktopItem {
name = pname;
exec = "viper-gui";
icon = "viper";
desktopName = "viper4linux";
genericName = "Equalizer";
comment = meta.description;
categories = [ "AudioVideo" "Audio" ];
startupNotify = false;
})
];
nativeBuildInputs = [
qmake
pkg-config
wrapQtAppsHook
copyDesktopItems
];
buildInputs = [
qtbase
qtmultimedia
qtsvg
gst_all_1.gstreamer
gst_all_1.gst-plugins-bad
gst_all_1.gst-plugins-viperfx
libpulseaudio
viper4linux
];
qmakeFlags = [ "V4L_Frontend.pro" ];
qtWrapperArgs = [
"--prefix PATH : ${lib.makeBinPath [ viper4linux gst_all_1.gstreamer ]}"
"--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : ${gstPluginPath}"
];
installPhase = ''
runHook preInstalli
install -D V4L_Frontend $out/bin/viper-gui
install -D icons/viper.png $out/share/icons/viper.png
runHook postInstall
'';
meta = with lib; {
description = "Official UI for Viper4Linux2";
homepage = "https://github.com/Audio4Linux/Viper4Linux-GUI";
license = licenses.gpl3Plus;
platforms = [ "x86_64-linux" ];
maintainers = with maintainers; [ rewine ];
};
}
pkgs/applications/audio/viper4linux/default.nix
+61
View File
@@ -0,0 +1,61 @@
{ lib
, stdenv
, fetchFromGitHub
, pkg-config
, gst_all_1
, libviperfx
, makeWrapper
}:
let
gstPluginPath = lib.makeSearchPathOutput "lib" "lib/gstreamer-1.0" (with gst_all_1; [ gstreamer gst-plugins-viperfx gst-plugins-base gst-plugins-good ]);
in
stdenv.mkDerivation rec {
pname = "viper4linux";
version = "unstable-2022-03-13";
src = fetchFromGitHub {
owner = "Audio4Linux";
repo = "Viper4Linux";
rev = "5da25644824f88cf0db24378d2c84770ba4f6816";
sha256 = "sha256-CJNVr/1ehJzX45mxunXcRAypBBGEBdswOzAVG2H+ayg=";
};
nativeBuildInputs = [ makeWrapper ];
buildInputs = [
gst_all_1.gstreamer
gst_all_1.gst-plugins-base
gst_all_1.gst-plugins-good
gst_all_1.gst-plugins-viperfx
libviperfx
];
dontBuild = true;
postPatch = ''
substituteInPlace viper --replace "/etc/viper4linux" "$out/etc/viper4linux"
'';
installPhase = ''
runHook preInstall
install -D viper -t $out/bin
mkdir -p $out/etc/viper4linux
cp -r viper4linux/* $out/etc/viper4linux
runHook postInstall
'';
postFixup = ''
wrapProgram "$out/bin/viper" \
--prefix PATH : $out/bin:${lib.makeBinPath [ gst_all_1.gstreamer ]} \
--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : ${gstPluginPath} \
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libviperfx ]}
'';
meta = with lib; {
description = "An Adaptive Digital Sound Processor";
homepage = "https://github.com/Audio4Linux/Viper4Linux";
license = licenses.gpl3Plus;
platforms = [ "x86_64-linux" ];
maintainers = with maintainers; [ rewine ];
};
}
pkgs/applications/blockchains/bitcoin/default.nix
+2 -2
View File
@@ -25,7 +25,7 @@
with lib;
let
version = "22.0";
version = "23.0";
majorVersion = versions.major version;
desktop = fetchurl {
url = "https://raw.githubusercontent.com/bitcoin-core/packaging/${majorVersion}.x/debian/bitcoin-qt.desktop";
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
"https://bitcoincore.org/bin/bitcoin-core-${version}/bitcoin-${version}.tar.gz"
"https://bitcoin.org/bin/bitcoin-core-${version}/bitcoin-${version}.tar.gz"
];
sha256 = "d0e9d089b57048b1555efa7cd5a63a7ed042482045f6f33402b1df425bf9613b";
sha256 = "26748bf49d6d6b4014d0fedccac46bf2bcca42e9d34b3acfd9e3467c415acc05";
};
nativeBuildInputs =
pkgs/applications/blockchains/clightning/default.nix
+2 -2
View File
@@ -21,11 +21,11 @@ let
in
stdenv.mkDerivation rec {
pname = "clightning";
version = "0.10.2";
version = "0.11.0.1";
src = fetchurl {
url = "https://github.com/ElementsProject/lightning/releases/download/v${version}/clightning-v${version}.zip";
sha256 = "3c9dcb686217b2efe0e988e90b95777c4591e3335e259e01a94af87e0bf01809";
sha256 = "e2ad6eead19a0cd8869e291c27d318cf553bb015339c1f0e8d8b30e7bc0910d8";
};
# when building on darwin we need dawin.cctools to provide the correct libtool
pkgs/applications/editors/okteta/default.nix
+2
View File
@@ -26,6 +26,8 @@ mkDerivation rec {
kcrash
];
outputs = [ "out" "dev" ];
meta = with lib; {
license = licenses.gpl2;
description = "A hex editor";
pkgs/applications/graphics/digikam/default.nix
+14 -3
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;
pkgs/applications/kde/default.nix
+3 -1
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 {};
pkgs/applications/networking/browsers/falkon/default.nix → pkgs/applications/kde/falkon.nix
+4 -13
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;
pkgs/applications/kde/fetch.sh
+1 -1
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' )
pkgs/applications/kde/kaddressbook.nix
+4
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"
'';
}
pkgs/applications/kde/kalarm.nix
+2 -2
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
pkgs/applications/kde/kalarmcal.nix
-19
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" ];
}
pkgs/applications/office/kalendar/default.nix → pkgs/applications/kde/kalendar.nix
+1 -10
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;
pkgs/applications/kde/kdegraphics-thumbnailers.nix
+2 -2
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 ];
}
pkgs/applications/kde/kdepim-addons.nix
+2 -2
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
];
}
pkgs/applications/kde/kdepim-runtime/default.nix
+2 -2
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
pkgs/applications/kde/picmi.nix
+1 -11
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
];
pkgs/applications/kde/pimcommon.nix
+2 -2
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" ];
}
pkgs/applications/graphics/skanpage/default.nix → pkgs/applications/kde/skanpage.nix
+2 -6
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; {
pkgs/applications/kde/srcs.nix
+937 -921
View File
File diff suppressed because it is too large Load Diff
pkgs/applications/kde/yakuake.nix
+2
View File
@@ -23,6 +23,8 @@ mkDerivation {
extra-cmake-modules kdoctools
];
outputs = [ "out" "dev" ];
meta = {
homepage = "https://yakuake.kde.org";
description = "Quad-style terminal emulator for KDE";
pkgs/applications/logging/sosreport/default.nix
+51
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 ];
};
}
pkgs/applications/misc/1password/default.nix
+5 -5
View File
@@ -12,12 +12,12 @@ let
if extension == "zip" then fetchzip args else fetchurl args;
pname = "1password-cli";
version = "2.0.2";
version = "2.1.0";
sources = rec {
aarch64-linux = fetch "linux_arm64" "sha256-DhKxY4Ry1IpT16UC3HbbUSKWzhGm/0R7rYrvqupg/Zo=" "zip";
i686-linux = fetch "linux_386" "sha256-ANoOYjG4+mci6TdF4HC9fP8e5eAckrbZITRuA1fqtCA=" "zip";
x86_64-linux = fetch "linux_amd64" "sha256-uPudElKu30smsupSIvGAmrF/f9TXoTzyUfSrUAvTDWw=" "zip";
aarch64-darwin = fetch "apple_universal" "sha256-P5qsy4kiE/DMJnJr3EUHMcb0KoUZyO2BQ5PIosPbnI8=" "pkg";
aarch64-linux = fetch "linux_arm64" "sha256-DTYWqhawyAQBIxMUksZheyN8WSVPyhCghZC8orxKsBk=" "zip";
i686-linux = fetch "linux_386" "sha256-JBjiKxbJnFILSOVnOUIcY3GpbOT2UOJlasTSPRyYz4I=" "zip";
x86_64-linux = fetch "linux_amd64" "sha256-PfVOvUF8Rls29VzfIj1U6/VFv1H6lj2K3Dz6DWmh2fs=" "zip";
aarch64-darwin = fetch "apple_universal" "sha256-Cn3/+Dvk5hW9rvxu4I9ghHSS1yWSAeQq3gx+6dvFiIk=" "pkg";
x86_64-darwin = aarch64-darwin;
};
platforms = builtins.attrNames sources;
pkgs/applications/misc/megacmd/default.nix
+2 -2
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;
};
pkgs/applications/misc/nnn/default.nix
+2 -2
View File
@@ -20,13 +20,13 @@ assert withNerdIcons -> withIcons == false;
stdenv.mkDerivation rec {
pname = "nnn";
version = "4.4";
version = "4.5";
src = fetchFromGitHub {
owner = "jarun";
repo = pname;
rev = "v${version}";
sha256 = "sha256-g9GaCc/IWKtih0/A2AZEPImjj7ymJIdYwC5I/6GUh5c=";
sha256 = "sha256-uToAgWpGaTPTMYJh1D0xgvE23GSIshv1OBlWxXI07Mk=";
};
configFile = lib.optionalString (conf != null) (builtins.toFile "nnn.h" conf);
pkgs/applications/misc/obsidian/default.nix
+3 -3
View File
@@ -12,20 +12,20 @@
let
inherit (stdenv.hostPlatform) system;
pname = "obsidian";
version = "0.14.2";
version = "0.14.6";
appname = "Obsidian";
meta = with lib; {
description = "A powerful knowledge base that works on top of a local folder of plain text Markdown files";
homepage = "https://obsidian.md";
downloadPage = "https://github.com/obsidianmd/obsidian-releases/releases";
license = licenses.obsidian;
maintainers = with maintainers; [ conradmearns zaninime opeik ];
maintainers = with maintainers; [ atila conradmearns zaninime opeik ];
};
filename = if stdenv.isDarwin then "Obsidian-${version}-universal.dmg" else "obsidian-${version}.tar.gz";
src = fetchurl {
url = "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/${filename}";
sha256 = if stdenv.isDarwin then "128kgqkf54ljkglwqa6i0qnfqhhmsv7hwbaqnml95n5dzyxrbm4s" else "00gip6pvkbywywlx71j87sxyh8yhkd36i1ydncbpnhsplr6smsq3";
sha256 = if stdenv.isDarwin then "1zzccwlim3gi6f5czzyddqjzy1xsk6ayx1hljhw6bmnid72km3q2" else "sha256-KieAE13SIYHDoXTqzk1QY+TPjwF9LRzlfm1yFg9hsTc=";
};
icon = fetchurl {
pkgs/applications/misc/organicmaps/default.nix
+7 -12
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; {
pkgs/applications/misc/sigal/default.nix
+17 -13
View File
@@ -1,17 +1,19 @@
{ lib, python3Packages, ffmpeg }:
{ lib
, python3
, ffmpeg
}:
python3Packages.buildPythonApplication rec {
version = "2.2";
pname = "sigal";
python3.pkgs.buildPythonApplication rec {
pname = "sigal";
version = "2.3";
format = "setuptools";
src = python3Packages.fetchPypi {
src = python3.pkgs.fetchPypi {
inherit version pname;
sha256 = "sha256-49XsNdZuicsiYJZuF1UdqMA4q33Ly/Ug/Hc4ybJKmPo=";
hash = "sha256-4Zsb/OBtU/jV0gThEYe8bcrb+6hW+hnzQS19q1H409Q=";
};
disabled = !(python3Packages.pythonAtLeast "3.6");
propagatedBuildInputs = with python3Packages; [
propagatedBuildInputs = with python3.pkgs; [
# install_requires
jinja2
markdown
@@ -29,16 +31,18 @@ python3Packages.buildPythonApplication rec {
checkInputs = [
ffmpeg
] ++ (with python3Packages; [
] ++ (with python3.pkgs; [
pytestCheckHook
]);
makeWrapperArgs = [ "--prefix PATH : ${ffmpeg}/bin" ];
makeWrapperArgs = [
"--prefix PATH : ${lib.makeBinPath [ ffmpeg ]}"
];
meta = with lib; {
description = "Yet another simple static gallery generator";
homepage = "http://sigal.saimon.org/en/latest/index.html";
license = licenses.mit;
homepage = "http://sigal.saimon.org/";
license = licenses.mit;
maintainers = with maintainers; [ domenkozar matthiasbeyer ];
};
}
pkgs/applications/misc/solaar/default.nix
+3 -2
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
pkgs/applications/networking/browsers/chromium/common.nix
+1
View File
@@ -191,6 +191,7 @@ let
--replace "/usr/bin/env -S make -f" "/usr/bin/make -f"
fi
chmod -x third_party/webgpu-cts/src/tools/run_deno
${lib.optionalString (chromiumVersionAtLeast "102") "chmod -x third_party/dawn/third_party/webgpu-cts/tools/run_deno"}
# We want to be able to specify where the sandbox is via CHROME_DEVEL_SANDBOX
substituteInPlace sandbox/linux/suid/client/setuid_sandbox_host.cc \
pkgs/applications/networking/browsers/chromium/upstream-info.json
+13 -13
View File
@@ -1,21 +1,21 @@
{
"stable": {
"version": "100.0.4896.127",
"sha256": "0kgq38dy9mjyc44556i9gxhlsgd7dfvv1xi1ibk92b4p7i2y6427",
"sha256bin64": "0mm6lix14bf4ca440dyccnq54z0qvn5c886ghfyzy2q0bqzbq4nh",
"version": "101.0.4951.41",
"sha256": "0dzsbr309n70jg7fpq2qfnrgcm4553akvdmnzhss1fc85s467609",
"sha256bin64": "12nzzsp4040mwc7jah5w0p58ckv8s16wv6ylf6vlmfby06a4xlkq",
"deps": {
"gn": {
"version": "2022-01-21",
"version": "2022-03-14",
"url": "https://gn.googlesource.com/gn",
"rev": "0725d7827575b239594fbc8fd5192873a1d62f44",
"sha256": "1dzdvcn2r5c9giknvasf3y5y4901kav7igivjvrpww66ywsj8fzr"
"rev": "bd99dbf98cbdefe18a4128189665c5761263bcfb",
"sha256": "0nql15ckjqkm001xajq3qyn4h4q80i7x6dm9zinxxr1a8q5lppx3"
}
},
"chromedriver": {
"version": "100.0.4896.60",
"sha256_linux": "0q9ddwhccd0jmzi8jksxlfjavmm913c9bmb4lz1ahxplsnxd8z31",
"sha256_darwin": "0q0ikhf5pkbrqln91fklbbfmqi33nfcjdg5dm7zb66b4alxwwas9",
"sha256_darwin_aarch64": "1vf3s0gq61riqsv85pr6xj0c2afdnv1b2w4gp2bwlfq4ffkfq38y"
"version": "101.0.4951.15",
"sha256_linux": "1i8ay83gh1q6nd0v14qv7gjar9h4fccb50a8b6fg671pg0l6vn24",
"sha256_darwin": "0ldxy1dxb99xps0h1d1264njc55q4bd000bdnaaks9kyx2djn54b",
"sha256_darwin_aarch64": "14awsldpqz2y187jwbcli8v7f1r6gsybk8yx8jqg26y8iyg3lrx9"
}
},
"beta": {
@@ -32,9 +32,9 @@
}
},
"dev": {
"version": "102.0.5005.12",
"sha256": "11n03hz3g8h7srywxrjwrdrxybdjvmdjrnigjlrwjkydprg1l7ab",
"sha256bin64": "0hc56a98ikkbgdw36dpz9k6r15jmjmnm7faml8z59vixxlvkrw7y",
"version": "102.0.5005.22",
"sha256": "12s4w8qs71a7r13mm28w6kld2q21srwalsy2yfcys4kjmfp4gqfa",
"sha256bin64": "07jj7nvgalzvxacx6srccc82ggckzj4x10w1k2zskcyxpblnd7fc",
"deps": {
"gn": {
"version": "2022-04-14",
pkgs/applications/networking/cluster/fluxcd/default.nix
+4 -4
View File
@@ -1,9 +1,9 @@
{ lib, buildGoModule, fetchFromGitHub, fetchzip, installShellFiles }:
let
version = "0.29.3";
sha256 = "02qdczd8x6dl6gsyjyrmga9i67shm54xixckxvva1lhl33zz5wwm";
manifestsSha256 = "0ar73dwz5j19qwcp85cd87gx0kwm7ys4xcyk91gj88s5i3djd9sl";
version = "0.29.4";
sha256 = "110wbz5dyzrzndr937in663cs9hwfs3glgm63f0md9gjj67mz0kk";
manifestsSha256 = "14vrkadv2gsz360s0naqr002sw8n5kvgskc13yx936mcz2vs465y";
manifests = fetchzip {
url =
@@ -23,7 +23,7 @@ in buildGoModule rec {
inherit sha256;
};
vendorSha256 = "sha256-VWTtHquq/8/nKBGLuIdg2xkpGz1ofhPlQf3NTaQaHBI=";
vendorSha256 = "sha256-/8gRyaXTCWe+F4X3z5iT8QhE3LdiNEYKHjtoYKJB/HU=";
postUnpack = ''
cp -r ${manifests} source/cmd/flux/manifests
pkgs/applications/networking/cluster/kompose/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, buildGoModule, fetchFromGitHub, installShellFiles, testVersion, kompose }:
{ lib, buildGoModule, fetchFromGitHub, installShellFiles, testers, kompose }:
buildGoModule rec {
pname = "kompose";
@@ -26,7 +26,7 @@ buildGoModule rec {
done
'';
passthru.tests.version = testVersion {
passthru.tests.version = testers.testVersion {
package = kompose;
command = "kompose version";
};
pkgs/applications/networking/cluster/nerdctl/default.nix
+3 -3
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 ];
pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix
+2 -2
View File
@@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
pname = "evolution-ews";
version = "3.44.0";
version = "3.44.1";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "q4Cg6eLOdn+56EruBl0Ote9QLNebLiykUeyoQpIpeoA=";
sha256 = "LJNidefwnQtOtWgMVb/4Xw2A0lU4R2Gm0Z3XfOaU/oM=";
};
nativeBuildInputs = [ cmake gettext intltool pkg-config ];
pkgs/applications/office/calligra/default.nix
+16
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 ];
pkgs/applications/science/misc/colmap/default.nix
+22 -6
View File
@@ -1,10 +1,14 @@
{ mkDerivation, lib, fetchFromGitHub, cmake, boost17x, ceres-solver, eigen,
freeimage, glog, libGLU, glew, qtbase,
cudaSupport ? false, cudatoolkit ? null }:
cudaSupport ? false, cudaPackages }:
assert !cudaSupport || cudatoolkit != null;
assert cudaSupport -> cudaPackages != { };
let boost_static = boost17x.override { enableStatic = true; };
let
boost_static = boost17x.override { enableStatic = true; };
# TODO: migrate to redist packages
inherit (cudaPackages) cudatoolkit;
in
mkDerivation rec {
version = "3.7";
@@ -13,15 +17,27 @@ mkDerivation rec {
owner = "colmap";
repo = "colmap";
rev = version;
sha256 = "sha256-uVAw6qwhpgIpHkXgxttKupU9zU+vD0Za0maw2Iv4x+I=";
hash = "sha256-uVAw6qwhpgIpHkXgxttKupU9zU+vD0Za0maw2Iv4x+I=";
};
# TODO: rm once the gcc11 issue is closed, https://github.com/colmap/colmap/issues/1418#issuecomment-1049305256
cmakeFlags = lib.optionals cudaSupport [
"-DCUDA_ENABLED=ON"
"-DCUDA_NVCC_FLAGS=--std=c++14"
];
buildInputs = [
boost_static ceres-solver eigen
freeimage glog libGLU glew qtbase
] ++ lib.optional cudaSupport cudatoolkit;
] ++ lib.optionals cudaSupport [
cudatoolkit
];
nativeBuildInputs = [ cmake ];
nativeBuildInputs = [
cmake
] ++ lib.optionals cudaSupport [
cudaPackages.autoAddOpenGLRunpathHook
];
meta = with lib; {
description = "COLMAP - Structure-From-Motion and Multi-View Stereo pipeline";
pkgs/applications/version-management/git-and-tools/git-cliff/default.nix
+3 -3
View File
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "git-cliff";
version = "0.6.1";
version = "0.7.0";
src = fetchFromGitHub {
owner = "orhun";
repo = "git-cliff";
rev = "v${version}";
sha256 = "sha256-CJ/2Cv/XoLq9U7u5mexH8iCCHbGtV6xohP3FapqO3+g=";
sha256 = "sha256-wVHL2+didmiN7UlEeIuSr+8LhkFKCOD3of4rKVg1i1o=";
};
cargoSha256 = "sha256-pYStKDgvvV/Z96TAonpDW7DIs1YSO6gAoiUCieVa9QY=";
cargoSha256 = "sha256-5jhloUnaGXXDu2LCO86SMJo8ETIxLAivv3hx9gEqtJ4=";
# attempts to run the program on .git in src which is not deterministic
doCheck = false;
pkgs/applications/version-management/git-repo/default.nix
+2 -2
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'
pkgs/applications/video/davinci-resolve/default.nix
+2 -2
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
];
pkgs/applications/virtualization/containerd/default.nix
+2 -2
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;
pkgs/applications/virtualization/crun/default.nix
+2 -2
View File
@@ -38,13 +38,13 @@ let
in
stdenv.mkDerivation rec {
pname = "crun";
version = "1.4.4";
version = "1.4.5";
src = fetchFromGitHub {
owner = "containers";
repo = pname;
rev = version;
sha256 = "sha256-ITUj905ZSdCH0mcw8tubyVKqI6p/oNcC4OW7/NbkR5o=";
sha256 = "sha256-YXbyGUY/E8odjljDok+yYyU8yZSyUFc22zumrUuuXXQ=";
fetchSubmodules = true;
};
pkgs/applications/virtualization/lima/default.nix
+8 -3
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
pkgs/data/icons/luna-icons/default.nix
+5 -2
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";
pkgs/desktops/gnome/apps/ghex/default.nix
+2 -2
View File
@@ -20,13 +20,13 @@
stdenv.mkDerivation rec {
pname = "ghex";
version = "42.1";
version = "42.2";
outputs = [ "out" "dev" "devdoc" ];
src = fetchurl {
url = "mirror://gnome/sources/ghex/${lib.versions.major version}/${pname}-${version}.tar.xz";
sha256 = "8QMj08MvvRqDFU+/0qJ+yj7pDZwbJSNfGxX+3l+xE6M=";
sha256 = "Rd6Oa4ofMd5amRC+GMB/CaMo2HU434BAOuxa+IF8ljE=";
};
nativeBuildInputs = [
pkgs/desktops/gnome/apps/gnome-calendar/default.nix
+2 -2
View File
@@ -22,11 +22,11 @@
stdenv.mkDerivation rec {
pname = "gnome-calendar";
version = "42.0";
version = "42.1";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
sha256 = "tj9z9VAy/BOQRC+UzfazyrnJHHdN3S5cYez+ydLF6ao=";
sha256 = "0SKBy78a+GxyN1/mrZNG7Q4sLziKHq6FjOzmQGCm66g=";
};
nativeBuildInputs = [
pkgs/desktops/gnome/core/gnome-remote-desktop/default.nix
+2 -2
View File
@@ -28,11 +28,11 @@
stdenv.mkDerivation rec {
pname = "gnome-remote-desktop";
version = "42.1";
version = "42.1.1";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
hash = "sha256-ATHuOY32n2tOZ9YU1pElatZJgihCRXQU64iaI7/rmfo=";
hash = "sha256-pEZqYsL+7GLn9XLwkpxY24iyXWCVuv5LFZHpnPqaDuY=";
};
nativeBuildInputs = [
pkgs/desktops/gnome/core/gnome-software/default.nix
+2 -2
View File
@@ -42,11 +42,11 @@ in
stdenv.mkDerivation rec {
pname = "gnome-software";
version = "42.0";
version = "42.1";
src = fetchurl {
url = "mirror://gnome/sources/gnome-software/${lib.versions.major version}/${pname}-${version}.tar.xz";
sha256 = "QsaF4u95li6zCo6VjHA8mh899zFQQiOgYos7Yk733B4=";
sha256 = "MtAFaYoAuK5er5Hk5/hlnvQwCnmPyuaiK3TC1/z2pIY=";
};
patches = [
pkgs/desktops/gnome/core/zenity/default.nix
+2 -2
View File
@@ -15,11 +15,11 @@
stdenv.mkDerivation rec {
pname = "zenity";
version = "3.42.0";
version = "3.42.1";
src = fetchurl {
url = "mirror://gnome/sources/zenity/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "wkx/5rtDFjztit8jLVg7LgE9O6bCjetfz4B5hePete8=";
sha256 = "oI4MjmJmFe4sI/90Yo66b4tIaHXdVDccp+LXYFtyqHw=";
};
nativeBuildInputs = [
pkgs/desktops/lxqt/default.nix
+2 -5
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
pkgs/desktops/lxqt/libfm-qt/default.nix
+2 -2
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 = [
pkgs/desktops/lxqt/liblxqt/default.nix
+2 -2
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 = [
pkgs/desktops/lxqt/libqtxdg/default.nix
+2 -2
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 = [
pkgs/desktops/lxqt/lximage-qt/default.nix
+2 -2
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 = [
pkgs/desktops/lxqt/lxqt-about/default.nix
+2 -2
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 = [
pkgs/desktops/lxqt/lxqt-admin/default.nix
+2 -2
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 = [
pkgs/desktops/lxqt/lxqt-archiver/default.nix
+2 -2
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 = [
pkgs/desktops/lxqt/lxqt-build-tools/default.nix
+2 -2
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 = ''
pkgs/desktops/lxqt/lxqt-config/default.nix
+2 -2
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 = [
pkgs/desktops/lxqt/lxqt-globalkeys/default.nix
+2 -2
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 = [
pkgs/desktops/lxqt/lxqt-notificationd/default.nix
+2 -2
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 = [
pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix
+2 -2
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 = [
pkgs/desktops/lxqt/lxqt-panel/default.nix
+3 -2
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
];
pkgs/desktops/lxqt/lxqt-policykit/default.nix
+2 -2
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 = [
pkgs/desktops/lxqt/lxqt-powermanagement/default.nix
+2 -2
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 = [
pkgs/desktops/lxqt/lxqt-qtplugin/default.nix
+2 -2
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 = [
pkgs/desktops/lxqt/lxqt-runner/default.nix
+2 -2
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 = [
pkgs/desktops/lxqt/lxqt-session/default.nix
+2 -2
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 = [
pkgs/desktops/lxqt/lxqt-sudo/default.nix
+2 -2
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 = [
pkgs/desktops/lxqt/lxqt-themes/default.nix
+2 -2
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 = [
pkgs/desktops/lxqt/pavucontrol-qt/default.nix
+2 -2
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 = [
pkgs/desktops/lxqt/pcmanfm-qt/default.nix
+2 -2
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 = [
pkgs/desktops/lxqt/qps/default.nix
+2 -2
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 = [
pkgs/desktops/lxqt/qterminal/default.nix
+2 -2
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 = [
pkgs/desktops/lxqt/qtermwidget/default.nix
+2 -2
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 = [
pkgs/desktops/lxqt/screengrab/default.nix
+2 -2
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 = [
pkgs/desktops/lxqt/xdg-desktop-portal-lxqt/default.nix
+41
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 ];
};
}

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