MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-18 07:46:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge master into staging-next

Browse source
This commit is contained in:
github-actions[bot] 2022-06-01 06:05:20 +00:00 committed by GitHub
commit 5f0d8b3c3d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
19 changed files with 182 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
nixos/modules/services/networking/openconnect.nix
View file

@ -9,6 +9,12 @@ let
};
interfaceOptions = {
options = {
autoStart = mkOption {
default = true;
description = "Whether this VPN connection should be started automatically.";
type = types.bool;
};
gateway = mkOption {
description = "Gateway server to connect to.";
example = "gateway.example.com";
@ -95,7 +101,7 @@ let
description = "OpenConnect Interface - ${name}";
requires = [ "network-online.target" ];
after = [ "network.target" "network-online.target" ];
wantedBy = [ "multi-user.target" ];
wantedBy = optional icfg.autoStart "multi-user.target";
serviceConfig = {
Type = "simple";

10
pkgs/applications/graphics/gnome-obfuscate/default.nix
View file

@ -8,7 +8,7 @@
, pkg-config
, python3
, rustPlatform
, wrapGAppsHook
, wrapGAppsHook4
, appstream-glib
, desktop-file-utils
@ -19,20 +19,20 @@
stdenv.mkDerivation rec {
pname = "gnome-obfuscate";
version = "0.0.4";
version = "0.0.7";
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
owner = "World";
repo = "Obfuscate";
rev = version;
sha256 = "sha256-P8Y2Eizn1BMZXuFjGMXF/3oAUzI8ZNTrnbLyU+V6uk4=";
sha256 = "sha256-jEMOg2yHi6K57XhA/7hkwwvedmikoB8pGV3ka+jixq8=";
};
cargoDeps = rustPlatform.fetchCargoTarball {
inherit src;
name = "${pname}-${version}";
sha256 = "sha256-5MzWz5NH2sViIfaP8xOQLreEal5TYkji11VaUgieT3U=";
sha256 = "sha256-P04BeidLXouPLzT/vsa4VC5AOENF0W4gqXqzdmRFhmE=";
};
nativeBuildInputs = [
@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
rustPlatform.cargoSetupHook
rustPlatform.rust.cargo
rustPlatform.rust.rustc
wrapGAppsHook
wrapGAppsHook4
];
buildInputs = [

4
pkgs/applications/office/gnucash/default.nix
View file

@ -26,12 +26,12 @@
stdenv.mkDerivation rec {
pname = "gnucash";
version = "4.9";
version = "4.10";
# raw source code doesn't work out of box; fetchFromGitHub not usable
src = fetchurl {
url = "https://github.com/Gnucash/gnucash/releases/download/${version}/${pname}-${version}.tar.bz2";
hash = "sha256-mlUcMMG3EhmfwiJ6EJr7mE177xjhOBcLvHIlxsH6ty0=";
hash = "sha256-f9S7kZ9uOTiKtHv6Ea9vo/Wem5vWlcfU6SCK+Fy5yTs=";
};
nativeBuildInputs = [

2
pkgs/desktops/gnustep/base/default.nix
View file

@ -25,7 +25,7 @@ gsmakeDerivation rec {
cups
gmp gnutls
libffi binutils-unwrapped
libjpeg libtiff libpng giflib giflib
libjpeg libtiff libpng giflib
libxml2 libxslt libiconv
libobjc libgcrypt
icu

37
pkgs/development/ocaml-modules/tsdl-image/default.nix Normal file
View file

@ -0,0 +1,37 @@
{ buildDunePackage
, dune-configurator
, fetchFromGitHub
, lib
, SDL2
, SDL2_image
, tsdl
}:
buildDunePackage rec {
pname = "tsdl-image";
version = "0.3.2";
src = fetchFromGitHub {
owner = "sanette";
repo = pname;
rev = version;
sha256 = "sha256-u6VYAwq+2oLn2Kw1+KQRVPswAqeKDSAaPfGLPrzn30s=";
};
buildInputs = [
dune-configurator
];
propagatedBuildInputs = [
SDL2
SDL2_image
tsdl
];
meta = with lib; {
description = "OCaml SDL2_image bindings to go with Tsdl";
homepage = "https://github.com/sanette/tsdl-image";
license = licenses.bsd3;
maintainers = with maintainers; [ superherointj ];
};
}

37
pkgs/development/ocaml-modules/tsdl-mixer/default.nix Normal file
View file

@ -0,0 +1,37 @@
{ buildDunePackage
, dune-configurator
, fetchFromGitHub
, lib
, SDL2
, SDL2_mixer
, tsdl
}:
buildDunePackage rec {
pname = "tsdl-mixer";
version = "0.3.2";
src = fetchFromGitHub {
owner = "sanette";
repo = pname;
rev = version;
sha256 = "sha256-UDRhwnanrn87/PYVnacur1z/LsKuUu2G+0QQXjTw/IE=";
};
buildInputs = [
dune-configurator
];
propagatedBuildInputs = [
SDL2
SDL2_mixer
tsdl
];
meta = with lib; {
description = "SDL2_mixer bindings to go with Tsdl";
homepage = "https://github.com/sanette/tsdl-mixer";
license = licenses.bsd3;
maintainers = with maintainers; [ superherointj ];
};
}

37
pkgs/development/ocaml-modules/tsdl-ttf/default.nix Normal file
View file

@ -0,0 +1,37 @@
{ buildDunePackage
, dune-configurator
, fetchFromGitHub
, lib
, SDL2
, SDL2_ttf
, tsdl
}:
buildDunePackage rec {
pname = "tsdl-ttf";
version = "0.3.2";
src = fetchFromGitHub {
owner = "sanette";
repo = pname;
rev = version;
sha256 = "sha256-COBLF9K8thRROJJGeg4wxqrjB3aBa4CGYkf8HdAQ2o0";
};
buildInputs = [
dune-configurator
];
propagatedBuildInputs = [
SDL2
SDL2_ttf
tsdl
];
meta = with lib; {
description = "SDL2_ttf bindings for Ocaml with Tsdl";
homepage = "https://github.com/sanette/tsdl-ttf";
license = licenses.bsd3;
maintainers = with maintainers; [ superherointj ];
};
}

4
pkgs/development/ocaml-modules/tsdl/default.nix
View file

@ -6,7 +6,7 @@ else
let
pname = "tsdl";
version = "0.9.7";
version = "0.9.8";
webpage = "https://erratique.ch/software/${pname}";
in
@ -15,7 +15,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "${webpage}/releases/${pname}-${version}.tbz";
sha256 = "1zwv0ixkigh1gzk5n49rwvz2f2m62jdkkqg40j7dclg4gri7691f";
sha256 = "sha256-zjXz2++42FHmbE0nIDeryNQeX+avGwh9rwAs8O0pZYU=";
};
nativeBuildInputs = [ pkg-config ocaml findlib ocamlbuild topkg ];

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

@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "hahomematic";
version = "1.6.2";
version = "1.7.0";
format = "pyproject";
disabled = pythonOlder "3.9";
@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "danielperna84";
repo = pname;
rev = "refs/tags/${version}";
sha256 = "sha256-x7TaSpmNd0YUgh81Favpo6qZgRsVeIyvvFfH3UCCqsQ=";
sha256 = "sha256-Gu1yMLGkXmARNPX1Erjj1Py4APYAlQ4SI4PyG0QbYeY=";
};
propagatedBuildInputs = [

35
pkgs/development/python-modules/nbclient/default.nix
View file

@ -1,16 +1,18 @@
{ lib
{ async_generator
, buildPythonPackage
, fetchPypi
, pythonOlder
, async_generator
, traitlets
, fetchFromGitHub
, ipykernel
, ipywidgets
, jupyter-client
, lib
, nbconvert
, nbformat
, nest-asyncio
, jupyter-client
, pytest-asyncio
, pytestCheckHook
, pythonOlder
, traitlets
, xmltodict
, nbconvert
, ipywidgets
}:
let nbclient = buildPythonPackage rec {
@ -20,9 +22,11 @@ let nbclient = buildPythonPackage rec {
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-uAcm/B+4mg6Pi+HnfijQAmsejtkLwUPIoMdiLk+M3Z4=";
src = fetchFromGitHub {
owner = "jupyter";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-ofyJNJeNkXbZ9qHLTuzJ13PgEXU9lDQ9NkT4nG/R8Ic=";
};
propagatedBuildInputs = [ async_generator traitlets nbformat nest-asyncio jupyter-client ];
@ -30,7 +34,14 @@ let nbclient = buildPythonPackage rec {
# circular dependencies if enabled by default
doCheck = false;
checkInputs = [ pytestCheckHook xmltodict nbconvert ipywidgets ];
checkInputs = [
ipykernel
ipywidgets
nbconvert
pytest-asyncio
pytestCheckHook
xmltodict
];
preCheck = ''
export HOME=$(mktemp -d)

4
pkgs/development/python-modules/peaqevcore/default.nix
View file

@ -6,14 +6,14 @@
buildPythonPackage rec {
pname = "peaqevcore";
version = "0.1.4";
version = "0.2.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-+L730I30dN+d6oc5HWq578B0Io5j5CjAy3SuIGGjOR8=";
hash = "sha256-M7jBwpo9yMggd81xiWH9SSJ1axGXiC5uQo/jnRcQ3/4=";
};
postPatch = ''

4
pkgs/development/python-modules/pex/default.nix
View file

@ -7,14 +7,14 @@
buildPythonPackage rec {
pname = "pex";
version = "2.1.91";
version = "2.1.92";
format = "flit";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-nlEdCdFxF/maOZtpUwNVExnmqUhdAfzlbrEMxAHvUxE=";
hash = "sha256-LEHbS6rSKQl1APWYjNS8y1edtXDRqSuhfftcuM67K44=";
};
nativeBuildInputs = [

4
pkgs/development/python-modules/pywlroots/default.nix
View file

@ -19,14 +19,14 @@
buildPythonPackage rec {
pname = "pywlroots";
version = "0.15.14";
version = "0.15.15";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "z0PVjVzmAb5cgBdXWMxOdsy0VMMkmewHZaPNBYivXSA=";
sha256 = "Xg1Bd9Q6XV/+vuJH9Huiq2+igdAE/RS8yTvLeJz1l34=";
};
nativeBuildInputs = [ pkg-config ];

4
pkgs/development/python-modules/sphinxcontrib-spelling/default.nix
View file

@ -10,14 +10,14 @@
buildPythonPackage rec {
pname = "sphinxcontrib-spelling";
version = "7.4.1";
version = "7.5.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-OpbyKqxq9JQHOvrLmI2U2NfCtgJ7IFA6jyDa4ysQw74=";
hash = "sha256-2SvcHWPzYbbgoXG51oUYEBdFSFMX8VhhUB44fxt49qs=";
};
nativeBuildInputs = [

6
pkgs/os-specific/linux/firmware/system76-firmware/default.nix
View file

@ -2,13 +2,13 @@
rustPlatform.buildRustPackage rec {
pname = "system76-firmware";
# Check Makefile when updating, make sure postInstall matches make install
version = "1.0.32";
version = "1.0.39";
src = fetchFromGitHub {
owner = "pop-os";
repo = pname;
rev = version;
sha256 = "sha256-EV7byqfoz0sAIkf/hgZh+m7D2+54DEnE4td4CTX6c4s=";
sha256 = "sha256-nPHBL73hmvW9z5SQjmfu+ozMXxUEajNQxNtE/V9QwZ0=";
};
nativeBuildInputs = [ pkg-config makeWrapper ];
@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
cargoBuildFlags = [ "--workspace" ];
cargoSha256 = "sha256-/bf5JQgyFN8TH7o2TWHX5sv/NkxBLJ495iVW8c9Vqis=";
cargoSha256 = "sha256-BrzicLj7FbUqRG1BgQIRqh801tRQpRZkHSiX3ekAYqc=";
# Purposefully don't install systemd unit file, that's for NixOS
postInstall = ''

8
pkgs/shells/zsh/default.nix
View file

@ -13,7 +13,7 @@
, buildPackages }:
let
version = "5.8.1";
version = "5.9";
in
stdenv.mkDerivation {
@ -22,7 +22,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "mirror://sourceforge/zsh/zsh-${version}.tar.xz";
sha256 = "sha256-tpc1ILrOYAtHeSACabHl155fUFrElSBYwRrVu/DdmRk=";
sha256 = "sha256-m40ezt1bXoH78ZGOh2dSp92UjgXBoNuhCrhjhC1FrNU=";
};
patches = [
@ -82,6 +82,8 @@ EOF
${lib.getBin buildPackages.zsh}/bin/zsh -c "zcompile $out/etc/zprofile"
''}
mv $out/etc/zprofile $out/etc/zprofile_zwc_is_used
rm $out/bin/zsh-${version}
'';
# XXX: patch zsh to take zwc if newer _or equal_
@ -97,7 +99,7 @@ EOF
'';
license = "MIT-like";
homepage = "https://www.zsh.org/";
maintainers = with lib.maintainers; [ pSub ];
maintainers = with lib.maintainers; [ pSub artturin ];
platforms = lib.platforms.unix;
};

6
pkgs/tools/package-management/nix-doc/default.nix
View file

@ -2,13 +2,13 @@
rustPlatform.buildRustPackage rec {
pname = "nix-doc";
version = "0.5.3";
version = "0.5.4";
src = fetchFromGitHub {
rev = "v${version}";
owner = "lf-";
repo = "nix-doc";
sha256 = "sha256-H8FNOOjHMUW2wIUfoDhS3eH2AgxxD0LAuX4J9SJyJhg=";
sha256 = "sha256-bijcLIRBfoqirwz98Q3uQjHXSOaaqZECfav4TUvCuxg=";
};
doCheck = true;
@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
nativeBuildInputs = [ pkg-config ];
cargoSha256 = "sha256-BTMFoZ8HqbgUXkVyydOkcQZ10TLE8KsGRdt+xhBKJVc=";
cargoSha256 = "sha256-LpcAMsBeNa2GDGN7+9rTtkQluPfHSnAxanRtDtRahzc=";
meta = with lib; {
description = "An interactive Nix documentation tool";

8
pkgs/tools/system/localtime/default.nix
View file

@ -7,16 +7,16 @@
buildGoModule {
pname = "localtime";
version = "unstable-2021-11-23";
version = "unstable-2022-02-20";
src = fetchFromGitHub {
owner = "Stebalien";
repo = "localtime";
rev = "3e5d6cd64444b2164e87cea03448bfb8eefd6ccd";
sha256 = "sha256-6uxxPq6abtRqM/R2Fw46ynP9PEkHggTSUymLYlQXQRU=";
rev = "c1e10aa4141ed2bb01986b48e0e942e618993c06";
hash = "sha256-bPQ1c2KUTkxx2g7IvLmrKgJKfRHTLlTXLR/QQ0O4CrI=";
};
vendorSha256 = "sha256-sf3sL6aO5jSytT2NtBkA3lhg77RIzbYkSC4fkH+cwwk=";
vendorSha256 = "sha256-12JnEU41sp9qRP07p502EYogveE+aNdfmLwlDRbIdxU=";
postPatch = ''
demoPath="${geoclue2-with-demo-agent}/libexec/geoclue-2.0/demos/agent"

6
pkgs/top-level/ocaml-packages.nix
View file

@ -1367,6 +1367,12 @@ let
tsdl = callPackage ../development/ocaml-modules/tsdl { };
tsdl-image = callPackage ../development/ocaml-modules/tsdl-image { };
tsdl-mixer = callPackage ../development/ocaml-modules/tsdl-mixer { };
tsdl-ttf = callPackage ../development/ocaml-modules/tsdl-ttf { };
twt = callPackage ../development/ocaml-modules/twt { };
uchar = callPackage ../development/ocaml-modules/uchar { };