nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-07 04:34:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge staging-next into staging

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

6
maintainers/maintainer-list.nix
View File

@ -5562,6 +5562,12 @@
githubId = 1550265;
name = "Dominic Steinitz";
};
ifurther = {
email = "55025025+ifurther@users.noreply.github.com";
github = "ifurther";
githubId = 55025025;
name = "Feather Lin";
};
igsha = {
email = "igor.sharonov@gmail.com";
github = "igsha";

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

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "gum";
version = "0.5.0";
version = "0.6.0";
src = fetchFromGitHub {
owner = "charmbracelet";
repo = pname;
rev = "v${version}";
sha256 = "sha256-S+sbfo7F6+bJeHywxM3jkZN+7MNQh9YRyLPHTC4wZnk=";
sha256 = "sha256-pEULArQDwKZzpD0GVH21L1v9xVZiBz91kL/jPJjJav4=";
};
vendorSha256 = "sha256-vvNoO5eABGVwvAzK33uPelmo3BKxfqiYgEXZI7kgeSo=";

4
pkgs/applications/networking/browsers/brave/default.nix
View File

@ -90,11 +90,11 @@ in
stdenv.mkDerivation rec {
pname = "brave";
version = "1.42.88";
version = "1.43.89";
src = fetchurl {
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
sha256 = "sha256-Or3eTLwap6KFhO7ieLyAXS0NKga5eUbd3KyFq/YNg+c=";
sha256 = "sha256-eqwqn4cvVzoEmh206ybG6PWWg56ct53wYyRBOQ8wN5g=";
};
dontConfigure = true;

4
pkgs/applications/science/chemistry/jmol/default.nix
View File

@ -25,14 +25,14 @@ let
};
in
stdenv.mkDerivation rec {
version = "14.32.68";
version = "14.32.73";
pname = "jmol";
src = let
baseVersion = "${lib.versions.major version}.${lib.versions.minor version}";
in fetchurl {
url = "mirror://sourceforge/jmol/Jmol/Version%20${baseVersion}/Jmol%20${version}/Jmol-${version}-binary.tar.gz";
sha256 = "sha256-CCVy+24O5rlAxnd01TeYqcOhDoSrxebfR1Ez7VDDrW4=";
sha256 = "sha256-95bZ6SYPKH+CGHETfdt/0YcUiZaP1gBiNf70GfUd4+M=";
};
patchPhase = ''

4
pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix
View File

@ -9,11 +9,11 @@
buildPythonPackage rec {
pname = "google-cloud-bigquery-storage";
version = "2.14.2";
version = "2.15.0";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-VUCQSpykLuwYrzgz3YImODesRLdr1NuSreGShX2+oEw=";
sha256 = "sha256-v0g6gK4cmELH1cmRl9EDJceEOW3vKgR9GSZ2oHKzrG0=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/google-cloud-dlp/default.nix
View File

@ -14,14 +14,14 @@
buildPythonPackage rec {
pname = "google-cloud-dlp";
version = "3.8.1";
version = "3.9.0";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
hash = "sha256-jNsIpg5M8r7SfzldmcsAqoyKI/7pwwo/Zk7KBwdOxJQ=";
hash = "sha256-fTBNCox9Hbk4iNQfxZZRfNiOozaIL5HTrsN/Parc6m0=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/google-cloud-translate/default.nix
View File

@ -14,14 +14,14 @@
buildPythonPackage rec {
pname = "google-cloud-translate";
version = "3.8.1";
version = "3.8.2";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-1g+bCXNeSMm166qlNU/ZwhC9IMdmPkGAtaxpYfmxOU8=";
hash = "sha256-wxKWoRQ8DW94De9Z0sOYjm+oTXuEcW5Vw3Iu4YITBQ0=";
};
propagatedBuildInputs = [

13
pkgs/development/python-modules/mitmproxy/default.nix
View File

@ -1,6 +1,6 @@
{ lib
, stdenv
, fetchFromGitHub
, fetchpatch
, buildPythonPackage
, pythonOlder
# Mitmproxy requirements
@ -20,7 +20,6 @@
, passlib
, protobuf
, publicsuffix2
, pyasn1
, pyopenssl
, pyparsing
, pyperclip
@ -32,8 +31,6 @@
, wsproto
, zstandard
# Additional check requirements
, beautifulsoup4
, glibcLocales
, hypothesis
, parver
, pytest-asyncio
@ -55,6 +52,14 @@ buildPythonPackage rec {
sha256 = "sha256-nW/WfiY6uF67qNa95tvNvSv/alP2WmzTk34LEBma/04=";
};
patches = [
# Fix onboarding addon tests failing with Flask >= v2.2
(fetchpatch {
url = "https://github.com/mitmproxy/mitmproxy/commit/bc370276a19c1d1039e7a45ecdc23c362626c81a.patch";
hash = "sha256-Cp7RnYpZEuRhlWYOk8BOnAKBAUa7Vy296UmQi3/ufes=";
})
];
propagatedBuildInputs = [
setuptools
# setup.py

31
pkgs/development/python-modules/pyjnius/default.nix Normal file
View File

@ -0,0 +1,31 @@
{ buildPythonPackage
, cython
, fetchPypi
, jdk
, lib
, six
}:
buildPythonPackage rec {
pname = "pyjnius";
version = "1.4.1";
src = fetchPypi {
inherit pname version;
sha256 = "8bc1a1b06fb11df8dd8b8d56f5ecceab614d4ba70cf559c64ae2f146423d53ce";
};
propagatedBuildInputs = [
six
];
nativeBuildInputs = [ jdk cython ];
pythonImportsCheck = [ "jnius" ];
meta = with lib; {
description = "A Python module to access Java classes as Python classes using the Java Native Interface (JNI)";
homepage = "https://github.com/kivy/pyjnius";
license = licenses.mit;
maintainers = with maintainers; [ ifurther ];
};
}

4
pkgs/development/tools/pipenv/default.nix
View File

@ -1,4 +1,5 @@
{ lib
, stdenv
, python3
, installShellFiles
}:
@ -13,6 +14,9 @@ let
pip
virtualenv
virtualenv-clone
]
++ lib.optionals stdenv.hostPlatform.isAndroid [
pyjnius
];
pythonEnv = python3.withPackages runtimeDeps;

15
pkgs/games/freenukum/default.nix
View File

@ -6,6 +6,7 @@
, dejavu_fonts
, SDL2
, SDL2_ttf
, SDL2_image
}:
let
pname = "freenukum";
@ -24,16 +25,17 @@ let
in
rustPlatform.buildRustPackage rec {
inherit pname;
version = "0.3.5";
version = "0.4.0";
src = fetchFromGitLab {
domain = "salsa.debian.org";
owner = "silwol";
repo = pname;
repo = "freenukum";
rev = "v${version}";
sha256 = "0yqfzh0c8fqk92q9kmidy15dc5li0ak1gbn3v7p3xw5fkrzf99gy";
sha256 = "sha256-Tk9n2gPwyPin6JZ4RSO8d/+xVpEz4rF8C2eGKwrAXU0=";
};
cargoSha256 = "1nss5zbdvxkr1mfb6vi6yjxcih99w836kvfr4r3n5dvzlkvga2vf";
cargoSha256 = "sha256-8RfiObWDqZJg+sjjDBk+sRoS5CiECIdNPH79T+O8e8M=";
nativeBuildInputs = [
installShellFiles
@ -42,6 +44,7 @@ rustPlatform.buildRustPackage rec {
buildInputs = [
SDL2
SDL2_ttf
SDL2_image
];
postPatch = ''
@ -55,13 +58,15 @@ rustPlatform.buildRustPackage rec {
${dejavu_fonts}/share/fonts/truetype/DejaVuSans.ttf \
$out/share/fonts/truetype/dejavu/DejaVuSans.ttf
mkdir -p $out/share/doc/freenukum
install -Dm644 README.md CHANGELOG.md COPYING $out/share/doc/freenukum/
install -Dm644 README.md CHANGELOG.md $out/share/doc/freenukum/
installManPage doc/freenukum.6
install -Dm644 "${desktopItem}/share/applications/"* -t $out/share/applications/
'';
meta = with lib; {
description = "Clone of the original Duke Nukum 1 Jump'n Run game";
homepage = "https://salsa.debian.org/silwol/freenukum";
changelog = "https://salsa.debian.org/silwol/freenukum/-/blob/v${version}/CHANGELOG.md";
license = licenses.agpl3Plus;
maintainers = with maintainers; [ _0x4A6F ];
broken = stdenv.isDarwin;

4
pkgs/tools/networking/haproxy/default.nix
View File

@ -11,11 +11,11 @@ assert usePcre -> pcre != null;
stdenv.mkDerivation rec {
pname = "haproxy";
version = "2.6.4";
version = "2.6.5";
src = fetchurl {
url = "https://www.haproxy.org/download/${lib.versions.majorMinor version}/src/${pname}-${version}.tar.gz";
sha256 = "sha256-8H1nraL/Opmf7U40RZwEiVNjMaVJZlrJDLao35H0ook=";
sha256 = "sha256-zp4Z6/zdQ+Ua+KYJDx341RLZct33QvpkimQ7uxkFZgU=";
};
buildInputs = [ openssl zlib ]

1
pkgs/top-level/all-packages.nix
View File

@ -27243,7 +27243,6 @@ with pkgs;
emacs28 = callPackage ../applications/editors/emacs/28.nix {
# use override to enable additional features
libXaw = xorg.libXaw;
Xaw3d = null;
gconf = null;
alsa-lib = null;
acl = null;

2
pkgs/top-level/python-packages.nix
View File

@ -7827,6 +7827,8 @@ in {
pyjks = callPackage ../development/python-modules/pyjks { };
pyjnius = callPackage ../development/python-modules/pyjnius { };
pyjsparser = callPackage ../development/python-modules/pyjsparser { };
pyjwkest = callPackage ../development/python-modules/pyjwkest { };