Merge master into staging-next
This commit is contained in:
commit
a6135f2c14
|
@ -7963,6 +7963,12 @@
|
|||
githubId = 668926;
|
||||
name = "Maximilian Güntner";
|
||||
};
|
||||
mh = {
|
||||
email = "68288772+markus-heinrich@users.noreply.github.com";
|
||||
github = "markus-heinrich";
|
||||
githubId = 68288772;
|
||||
name = "Markus Heinrich";
|
||||
};
|
||||
mhaselsteiner = {
|
||||
email = "magdalena.haselsteiner@gmx.at";
|
||||
github = "mhaselsteiner";
|
||||
|
|
|
@ -1,12 +1,17 @@
|
|||
{ config, lib, options, pkgs, ... }:
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
cfg = config.system.nixos;
|
||||
opt = options.system.nixos;
|
||||
in
|
||||
|
||||
inherit (lib)
|
||||
concatStringsSep mapAttrsToList toLower
|
||||
literalExpression mkRenamedOptionModule mkDefault mkOption trivial types;
|
||||
|
||||
attrsToText = attrs:
|
||||
concatStringsSep "\n" (mapAttrsToList (n: v: ''${n}="${toString v}"'') attrs);
|
||||
|
||||
in
|
||||
{
|
||||
imports = [
|
||||
(mkRenamedOptionModule [ "system" "nixosVersion" ] [ "system" "nixos" "version" ])
|
||||
|
@ -101,22 +106,30 @@ in
|
|||
# Generate /etc/os-release. See
|
||||
# https://www.freedesktop.org/software/systemd/man/os-release.html for the
|
||||
# format.
|
||||
environment.etc.os-release.text =
|
||||
''
|
||||
NAME=NixOS
|
||||
ID=nixos
|
||||
VERSION="${cfg.release} (${cfg.codeName})"
|
||||
VERSION_CODENAME=${toLower cfg.codeName}
|
||||
VERSION_ID="${cfg.release}"
|
||||
BUILD_ID="${cfg.version}"
|
||||
PRETTY_NAME="NixOS ${cfg.release} (${cfg.codeName})"
|
||||
LOGO="nix-snowflake"
|
||||
HOME_URL="https://nixos.org/"
|
||||
DOCUMENTATION_URL="https://nixos.org/learn.html"
|
||||
SUPPORT_URL="https://nixos.org/community.html"
|
||||
BUG_REPORT_URL="https://github.com/NixOS/nixpkgs/issues"
|
||||
'';
|
||||
environment.etc = {
|
||||
"lsb-release".text = attrsToText {
|
||||
LSB_VERSION = "${cfg.release} (${cfg.codeName})";
|
||||
DISTRIB_ID = "nixos";
|
||||
DISTRIB_RELEASE = cfg.release;
|
||||
DISTRIB_CODENAME = toLower cfg.codeName;
|
||||
DISTRIB_DESCRIPTION = "NixOS ${cfg.release} (${cfg.codeName})";
|
||||
};
|
||||
|
||||
"os-release".text = attrsToText {
|
||||
NAME = "NixOS";
|
||||
ID = "nixos";
|
||||
VERSION = "${cfg.release} (${cfg.codeName})";
|
||||
VERSION_CODENAME = toLower cfg.codeName;
|
||||
VERSION_ID = cfg.release;
|
||||
BUILD_ID = cfg.version;
|
||||
PRETTY_NAME = "NixOS ${cfg.release} (${cfg.codeName})";
|
||||
LOGO = "nix-snowflake";
|
||||
HOME_URL = "https://nixos.org/";
|
||||
DOCUMENTATION_URL = "https://nixos.org/learn.html";
|
||||
SUPPORT_URL = "https://nixos.org/community.html";
|
||||
BUG_REPORT_URL = "https://github.com/NixOS/nixpkgs/issues";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
# uses version info nixpkgs, which requires a full nixpkgs path
|
||||
|
|
|
@ -17,8 +17,8 @@ let
|
|||
then value
|
||||
else { executable = value; profile = null; extraArgs = []; };
|
||||
args = lib.escapeShellArgs (
|
||||
(optional (opts.profile != null) "--profile=${toString opts.profile}")
|
||||
++ opts.extraArgs
|
||||
opts.extraArgs
|
||||
++ (optional (opts.profile != null) "--profile=${toString opts.profile}")
|
||||
);
|
||||
in
|
||||
''
|
||||
|
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "logseq";
|
||||
version = "0.6.0";
|
||||
version = "0.6.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/logseq/logseq/releases/download/${version}/logseq-linux-x64-${version}.AppImage";
|
||||
sha256 = "9u2KdrNVAx+sy/8s2VP0DIzSMTvBK56pUGQaj7wulz0=";
|
||||
sha256 = "ccLqOKH10hmROnxlnNxuD5/AqAcFIILIoW/9yZLEep0=";
|
||||
name = "${pname}-${version}.AppImage";
|
||||
};
|
||||
|
||||
|
|
|
@ -4,11 +4,11 @@ let
|
|||
configOverrides = writeText "cinny-config-overrides.json" (builtins.toJSON conf);
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "cinny";
|
||||
version = "1.6.1";
|
||||
version = "1.7.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/ajbura/cinny/releases/download/v${version}/cinny-v${version}.tar.gz";
|
||||
sha256 = "sha256-RJpLK16bedpqo/JJf3atpiuL5spHJNowomcusjZtEWA=";
|
||||
sha256 = "0133dbzxy0n0i6bn2p3lx33kpabnf9kzs9mv4xws30hbns25q99k";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
|
|
@ -1,14 +1,14 @@
|
|||
{ lib, fetchurl, libarchive }:
|
||||
|
||||
let
|
||||
version = "0.35.9";
|
||||
version = "0.36.0";
|
||||
in fetchurl {
|
||||
name = "sarasa-gothic-${version}";
|
||||
|
||||
# Use the 'ttc' files here for a smaller closure size.
|
||||
# (Using 'ttf' files gives a closure size about 15x larger, as of November 2021.)
|
||||
url = "https://github.com/be5invis/Sarasa-Gothic/releases/download/v${version}/sarasa-gothic-ttc-${version}.7z";
|
||||
sha256 = "sha256-zG1VVI7QRQMC4MBA3otD26LUvnkUxaxt6UkiweY0l1w=";
|
||||
sha256 = "sha256-ENBF7dVFp9lrGGRwNIB0Yg7y1F5XbVivgD2e9pLZQwQ=";
|
||||
|
||||
recursiveHash = true;
|
||||
downloadToTemp = true;
|
||||
|
|
28
pkgs/development/libraries/libwbxml/default.nix
Normal file
28
pkgs/development/libraries/libwbxml/default.nix
Normal file
|
@ -0,0 +1,28 @@
|
|||
{ stdenv, fetchFromGitHub, lib, cmake, expat }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libwbxml";
|
||||
version = "0.11.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libwbxml";
|
||||
repo = "libwbxml";
|
||||
rev = "${pname}-${version}";
|
||||
sha256 = "sha256:1b81rbkd28d9059vh8n5gql73crp8h7av67kkmr6lhicl08fv2xx";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [ expat ];
|
||||
|
||||
postPatch = ''
|
||||
sed -i 's/^SET.*$//' cmake/CMakeLists.txt
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/libwbxml/libwbxml";
|
||||
description = "The WBXML Library (aka libwbxml) contains a library and its associated tools to Parse, Encode and Handle WBXML documents";
|
||||
maintainers = with maintainers; [ mh ];
|
||||
platforms = platforms.linux;
|
||||
license = licenses.lgpl21Plus;
|
||||
};
|
||||
}
|
|
@ -11,7 +11,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "dropbox";
|
||||
version = "11.27.0";
|
||||
version = "11.28.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
|||
owner = "dropbox";
|
||||
repo = "dropbox-sdk-python";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-atIrrK4BgTfu0UaHTqJ66AxEeSJLanrmYx8myrOCOfo=";
|
||||
sha256 = "sha256-xNenBmeCRIYxQqAkV8IDpPpIHyVAYJs1jAFr8w1tz2Y=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "earthly";
|
||||
version = "0.6.8";
|
||||
version = "0.6.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "earthly";
|
||||
repo = "earthly";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-VXBDgBcByONEOznUVbzxySE7rcevIwCk8rVxRxhF0Gc=";
|
||||
sha256 = "sha256-FZHz46GUPG5LgJcuKxheERWcctuHdDWgGPslEAu+j08=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-6lzusbfedDJESJIxsTVGoRnjdtPnMSDdL2OjXIFFL04=";
|
||||
vendorSha256 = "sha256-uUx9C7uEdXjhDWxehGHuhuFQXdUjZAXK3qogESkRm8E=";
|
||||
|
||||
ldflags = [
|
||||
"-s" "-w"
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
buildGoPackage rec {
|
||||
pname = "go-bindata";
|
||||
version = "3.22.0";
|
||||
version = "3.23.0";
|
||||
|
||||
goPackagePath = "github.com/kevinburke/go-bindata";
|
||||
|
||||
|
@ -10,7 +10,7 @@ buildGoPackage rec {
|
|||
owner = "kevinburke";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "10dq77dml5jvvq2jkdq81a9yjg7rncq8iw8r84cc3dz6l9hxzj0x";
|
||||
sha256 = "sha256-pIEkD0HD/6JFOzkvEG9j9yQP7hLWvmXU3MiyvVFH2rY=";
|
||||
};
|
||||
|
||||
subPackages = [ "go-bindata" ];
|
||||
|
|
|
@ -274,7 +274,7 @@ in buildFHSUserEnv rec {
|
|||
name = "steam-run";
|
||||
|
||||
targetPkgs = commonTargetPkgs;
|
||||
inherit multiPkgs extraBuildCommands profile;
|
||||
inherit multiPkgs extraBuildCommands profile extraInstallCommands;
|
||||
|
||||
inherit unshareIpc unsharePid;
|
||||
|
||||
|
|
|
@ -2,18 +2,18 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "cloud-sql-proxy";
|
||||
version = "1.28.1";
|
||||
version = "1.29.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "GoogleCloudPlatform";
|
||||
repo = "cloudsql-proxy";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-mQYzc5OPYEsxBeSRiPHvYvh8grPOgB5sWB9EBrY3a6A=";
|
||||
sha256 = "sha256-V/dNS/tbPPkVpgaCkGa5pfH/vj8y7mO9OQDLhgWbRCE=";
|
||||
};
|
||||
|
||||
subPackages = [ "cmd/cloud_sql_proxy" ];
|
||||
|
||||
vendorSha256 = "sha256-+vuhOrUvA6W6y/6oEvJtsYixyvRzFPzpbw0Qn0AnYRI=";
|
||||
vendorSha256 = "sha256-6td7rDye0sBUhDn9YARvdCgdfS/8z+VY1wYcEcUzHBs=";
|
||||
|
||||
checkFlags = [ "-short" ];
|
||||
|
||||
|
|
|
@ -1,9 +1,17 @@
|
|||
{ mkDerivation, lib, fetchFromGitHub, fetchpatch, cmake, extra-cmake-modules
|
||||
, kauth, krunner
|
||||
, pass, pass-otp ? null }:
|
||||
{ mkDerivation
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, cmake
|
||||
, extra-cmake-modules
|
||||
, kauth
|
||||
, krunner
|
||||
, pass
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "krunner-pass";
|
||||
# when upgrading the version, check if cmakeFlags is still needed
|
||||
version = "1.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
|
@ -13,9 +21,10 @@ mkDerivation rec {
|
|||
sha256 = "032fs2174ls545kjixbhzyd65wgxkw4s5vg8b20irc5c9ak3pxm0";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
kauth krunner
|
||||
pass pass-otp
|
||||
buildInputs = [
|
||||
kauth
|
||||
krunner
|
||||
(pass.withExtensions (p: with p; [ pass-otp ]))
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ cmake extra-cmake-modules ];
|
||||
|
@ -33,6 +42,9 @@ mkDerivation rec {
|
|||
''-DNIXPKGS_PASS=\"${lib.getBin pass}/bin/pass\"''
|
||||
];
|
||||
|
||||
# there are *lots* of pointless warnings in v1.3.0
|
||||
cmakeFlags = [ "-Wno-dev" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Integrates krunner with pass the unix standard password manager (https://www.passwordstore.org/)";
|
||||
homepage = "https://github.com/akermu/krunner-pass";
|
||||
|
|
|
@ -55,6 +55,7 @@ stdenv.mkDerivation rec {
|
|||
"--enable-gtk-doc"
|
||||
"--with-dbus-sys-dir=${placeholder "out"}/share/dbus-1/system.d"
|
||||
"--with-systemdsystemunitdir=${placeholder "out"}/etc/systemd/system"
|
||||
"--disable-werror"
|
||||
];
|
||||
|
||||
preConfigure = "NO_CONFIGURE=1 ./autogen.sh";
|
||||
|
|
|
@ -2574,7 +2574,7 @@ with pkgs;
|
|||
|
||||
cht-sh = callPackage ../tools/misc/cht.sh { };
|
||||
|
||||
cinny = callPackage ../applications/networking/instant-messengers/cinny {};
|
||||
cinny = callPackage ../applications/networking/instant-messengers/cinny { stdenv = stdenvNoCC; };
|
||||
|
||||
ckbcomp = callPackage ../tools/X11/ckbcomp { };
|
||||
|
||||
|
@ -18849,6 +18849,8 @@ with pkgs;
|
|||
|
||||
libvori = callPackage ../development/libraries/libvori { };
|
||||
|
||||
libwbxml = callPackage ../development/libraries/libwbxml { };
|
||||
|
||||
libwebcam = callPackage ../os-specific/linux/libwebcam { };
|
||||
|
||||
libwebp = callPackage ../development/libraries/libwebp { };
|
||||
|
|
Loading…
Reference in a new issue