nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-11 16:23:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot] 2023-05-18 06:01:16 +00:00 committed by GitHub
commit a2d6139522
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
22 changed files with 2479 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/networking/browsers/palemoon/bin.nix
View File

@ -19,7 +19,7 @@
stdenv.mkDerivation rec {
pname = "palemoon-bin";
version = "32.1.1";
version = "32.2.0";
src = fetchzip {
urls = [
@ -27,9 +27,9 @@ stdenv.mkDerivation rec {
"https://rm-us.palemoon.org/release/palemoon-${version}.linux-x86_64-gtk${if withGTK3 then "3" else "2"}.tar.xz"
];
hash = if withGTK3 then
"sha256-Kre+F1AE4bC5hAODYjo+S6TUCpKk8KMnYumQWHz+epY="
"sha256-Bw8L5+3f46lOGJ5xR3bBF7sQWwEFxoK/NH3ngs1i4lU="
else
"sha256-LIsep7KsNhsw3zlmgltu6/4qZEWjGQbUmLqHCabSTfg=";
"sha256-eP7GIsWPFLYmBPUcMPn6vAlsFEAP3Oyy9mhj0oGeMT4=";
};
preferLocalBuild = true;

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

@ -45,7 +45,7 @@ assert with lib.strings; (
stdenv.mkDerivation rec {
pname = "palemoon";
version = "32.1.1";
version = "32.2.0";
src = fetchFromGitea {
domain = "repo.palemoon.org";
@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
repo = "Pale-Moon";
rev = "${version}_Release";
fetchSubmodules = true;
sha256 = "sha256-Z9dBYO5AGDYRLlnEfHUu6thgc2a8OK/tPuRzwp0j9J8=";
sha256 = "sha256-ftY3xSvpAdjnoPsNNL+XyVD6hFPRmReLyrYT5pqSNho=";
};
nativeBuildInputs = [

19
pkgs/applications/networking/freefilesync/default.nix
View File

@ -1,6 +1,6 @@
{ lib
, stdenv
, fetchFromGitHub
, fetchurl
, fetchpatch
, copyDesktopItems
, pkg-config
@ -12,21 +12,20 @@
, libssh2
, openssl
, wxGTK32
, gitUpdater
, makeDesktopItem
}:
stdenv.mkDerivation rec {
pname = "freefilesync";
version = "12.2";
version = "12.3";
src = fetchFromGitHub {
owner = "hkneptune";
repo = "FreeFileSync";
rev = "v${version}";
hash = "sha256-pCXMpK+NF06vgEgX31wyO24+kPhvPhdTeRk1j84nYd0=";
src = fetchurl {
url = "https://freefilesync.org/download/FreeFileSync_${version}_Source.zip";
hash = "sha256-s6jNWqqriL/ePFCUQvLeNxNjHz+nZevD2x1kkw1gDE8=";
};
sourceRoot = ".";
# Patches from Debian
patches = [
# Disable loading of the missing Animal.dat
@ -112,10 +111,6 @@ stdenv.mkDerivation rec {
})
];
passthru.updateScript = gitUpdater {
rev-prefix = "v";
};
meta = with lib; {
description = "Open Source File Synchronization & Backup Software";
homepage = "https://freefilesync.org";

6
pkgs/development/libraries/protobuf/3.8.nix
View File

@ -1,6 +0,0 @@
{ callPackage, ... } @ args:
callPackage ./generic-v3.nix ({
version = "3.8.0";
sha256 = "0vll02a6k46k720wfh25sl4hdai0130s3ix2l1wh6j1lm9pi7bm8";
} // args)

4
pkgs/development/python-modules/ecs-logging/default.nix
View File

@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "ecs-logging";
version = "2.0.0";
version = "2.0.2";
format = "flit";
disabled = pythonOlder "3.8";
@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "elastic";
repo = "ecs-logging-python";
rev = "refs/tags/${version}";
hash = "sha256-2BfZ96D24sfjFD6l+gjp6xXbSJ0kjQD/FhHLI3bpVGM=";
hash = "sha256-CfPpUpzNfPuCAiuNsJrJ1nVLiUCPvclfrK7tByytoQE=";
};
nativeBuildInputs = [

40
pkgs/development/python-modules/edk2-pytool-library/default.nix Normal file
View File

@ -0,0 +1,40 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, setuptools
, setuptools-scm
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "edk2-pytool-library";
version = "0.14.1";
format = "pyproject";
src = fetchFromGitHub {
owner = "tianocore";
repo = "edk2-pytool-library";
rev = "v${version}";
hash = "sha256-l3ZM2xxZrFz7n/uLSd994l+mGJDi4Qw4C2Lg2uyttL8=";
};
nativeBuildInputs = [
setuptools
setuptools-scm
];
nativeCheckInputs = [
pytestCheckHook
];
env.SETUPTOOLS_SCM_PRETEND_VERSION = version;
pythonImportsCheck = [ "edk2toollib" ];
meta = with lib; {
description = "Python library package that supports UEFI development";
homepage = "https://github.com/tianocore/edk2-pytool-library";
license = licenses.bsd2Patent;
maintainers = with maintainers; [ nickcao ];
};
}

4
pkgs/development/python-modules/neo4j/default.nix
View File

@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "neo4j";
version = "5.8.0";
version = "5.8.1";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "neo4j";
repo = "neo4j-python-driver";
rev = "refs/tags/${version}";
hash = "sha256-11fa6scRcC+bQxEccCgxSJaMjwkUVs4DQj1NSaXlpb8=";
hash = "sha256-kcZtfK4OogHvnZT789LfF7yi9jSWSCXPp0QC2RWAe+I=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/python-roborock/default.nix
View File

@ -16,7 +16,7 @@
buildPythonPackage rec {
pname = "python-roborock";
version = "0.18.3";
version = "0.18.5";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -25,7 +25,7 @@ buildPythonPackage rec {
owner = "humbertogontijo";
repo = "python-roborock";
rev = "refs/tags/v${version}";
hash = "sha256-a1X7aRWURteIBVwl+pgHcaeWXAWv+zicz154fJgWVy4=";
hash = "sha256-UyRPaMI1Ur4a4JtBuEoRlEz8E8NB+jGWsPVIk0z9jeg=";
};
nativeBuildInputs = [

4
pkgs/development/python-modules/snapcast/default.nix
View File

@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "snapcast";
version = "2.3.2";
version = "2.3.3";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "happyleavesaoc";
repo = "python-snapcast";
rev = "refs/tags/${version}";
hash = "sha256-kUUKDcHnWA+saqQM7aCfW9NmhG6DYsB21tlEQ3cYNs4=";
hash = "sha256-IFgSO0PjlFb4XJarx50Xnx6dF4tBKk3sLcoLWVdpnk8=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/types-urllib3/default.nix
View File

@ -5,12 +5,12 @@
buildPythonPackage rec {
pname = "types-urllib3";
version = "1.26.25.12";
version = "1.26.25.13";
format = "setuptools";
src = fetchPypi {
inherit pname version;
hash = "sha256-oVVzVc6NNQpVXRQlifMAGQN1fS02wYpm9YjZZZu8kX0=";
hash = "sha256-MwBTjJ3BHa0y6uSCesMT9dmGuLIUlIAfG/l6GsbAOuU=";
};
# Module doesn't have tests

4
pkgs/development/python-modules/yalexs-ble/default.nix
View File

@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "yalexs-ble";
version = "2.1.16";
version = "2.1.17";
format = "pyproject";
disabled = pythonOlder "3.9";
@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "bdraco";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-dA0g5HAvbnN1t2D+JTfphxZUEbUT7NBLY6oCKFNf5E8=";
hash = "sha256-mN3/spDTWJfSCsKcRV24+tIjWmxI1gsO5qGuAZykWY0=";
};
nativeBuildInputs = [

6
pkgs/development/tools/language-servers/verible/default.nix
View File

@ -17,8 +17,8 @@ buildBazelPackage rec {
# These environment variables are read in bazel/build-version.py to create
# a build string shown in the tools --version output.
# If env variables not set, it would attempt to extract it from .git/.
GIT_DATE = "2023-04-14";
GIT_VERSION = "v0.0-3179-g525ffaf7";
GIT_DATE = "2023-05-05";
GIT_VERSION = "v0.0-3253-gf85c768c";
# Derive nix package version from GIT_VERSION: "v1.2-345-abcde" -> "1.2.345"
version = builtins.concatStringsSep "." (lib.take 3 (lib.drop 1 (builtins.splitVersion GIT_VERSION)));
@ -27,7 +27,7 @@ buildBazelPackage rec {
owner = "chipsalliance";
repo = "verible";
rev = "${GIT_VERSION}";
sha256 = "sha256-IXS8yeyryBNpPkCpMcOUsdIlKo447d0a8aZKroFJOzM=";
sha256 = "sha256-scLYQQt6spBImJEYG60ZbIsUfKqWBj2DINjZgFKESoI=";
};
patches = [

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

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "pulumictl";
version = "0.0.42";
version = "0.0.43";
src = fetchFromGitHub {
owner = "pulumi";
repo = "pulumictl";
rev = "v${version}";
sha256 = "sha256-fs+etB/tzqzV3QbQKa4xqsAjtUkr1BdKtTNvRylnKaY=";
sha256 = "sha256-iz0ahzR0+CpNZSLbR9zyIRS5k3y1GYbh7BPif9I6n4k=";
};
vendorHash = "sha256-WzfTS68YIpoZYbm6i0USxXyEyR4px+hrNRbsCTXdJsk=";

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

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "skaffold";
version = "2.4.0";
version = "2.4.1";
src = fetchFromGitHub {
owner = "GoogleContainerTools";
repo = "skaffold";
rev = "v${version}";
hash = "sha256-feUR8R8mlKfSV2ct9EeAcEHJiK7Hb5PAXTnES9UG2Qc=";
hash = "sha256-0sOj5U9GFDFOs6uvgGHQfRFLlAoGk1DwRW4kN0lOIK0=";
};
vendorHash = null;

4
pkgs/tools/misc/android-tools/default.nix
View File

@ -9,11 +9,11 @@ in
stdenv.mkDerivation rec {
pname = "android-tools";
version = "34.0.0";
version = "34.0.1";
src = fetchurl {
url = "https://github.com/nmeum/android-tools/releases/download/${version}/android-tools-${version}.tar.xz";
hash = "sha256-+I7FaGk39/svaJw7BQYSPyOZJ2oUZzFksPlUVKTHuXo=";
hash = "sha256-YCNOy8oZoXp+L0akWBlg1kW3xVuHDZJKIUlMdqb1SOw=";
};
nativeBuildInputs = [ cmake pkg-config perl go ];

14
pkgs/tools/misc/mods/default.nix
View File

@ -1,6 +1,9 @@
{ lib
, buildGoModule
, fetchFromGitHub
, gitUpdater
, testers
, mods
}:
buildGoModule rec {
@ -18,6 +21,17 @@ buildGoModule rec {
ldflags = [ "-s" "-w" "-X=main.version=${version}" ];
passthru = {
updateScript = gitUpdater {
rev-prefix = "v";
ignoredVersions = ".(rc|beta).*";
};
tests.version = testers.testVersion {
package = mods;
};
};
meta = with lib; {
description = "AI on the command line";
homepage = "https://github.com/charmbracelet/mods";

2303
pkgs/tools/misc/ostree-rs-ext/Cargo.lock generated Normal file
View File

File diff suppressed because it is too large Load Diff

81
pkgs/tools/misc/ostree-rs-ext/default.nix Normal file
View File

@ -0,0 +1,81 @@
{ lib
, rustPlatform
, fetchFromGitHub
, pkg-config
, makeWrapper
, glib
, openssl
, zlib
, ostree
, stdenv
, darwin
, util-linux
, skopeo
, gnutar
, ima-evm-utils
}:
rustPlatform.buildRustPackage rec {
pname = "ostree-rs-ext";
version = "0.10.6";
src = fetchFromGitHub {
owner = "ostreedev";
repo = "ostree-rs-ext";
rev = "ostree-ext-v${version}";
hash = "sha256-kk/icUevzKMpAQ6IoruUxuKwTxXHlKLrr63Hch1w7po=";
};
cargoLock = {
lockFile = ./Cargo.lock;
};
postPatch = ''
ln -s ${./Cargo.lock} Cargo.lock
'';
nativeBuildInputs = [
pkg-config
makeWrapper
];
buildInputs = [
glib
openssl
zlib
ostree
] ++ lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.CoreFoundation
darwin.apple_sdk.frameworks.Security
];
checkFlags = [
# these tests expects /var/tmp to be available
"--skip=test_cli_fns"
"--skip=test_container_chunked"
"--skip=test_container_import_export_v1"
"--skip=test_container_var_content"
"--skip=test_container_write_derive"
"--skip=test_container_write_derive_sysroot_hardlink"
"--skip=test_diff"
"--skip=test_tar_export_reproducible"
"--skip=test_tar_export_structure"
"--skip=test_tar_import_empty"
"--skip=test_tar_import_export"
"--skip=test_tar_import_signed"
"--skip=test_tar_write"
"--skip=test_tar_write_tar_layer"
];
postInstall = ''
wrapProgram "$out/bin/${meta.mainProgram}" --prefix PATH : ${lib.makeBinPath [ util-linux skopeo gnutar ostree ima-evm-utils ]}
'';
meta = with lib; {
description = "Rust library with higher level APIs on top of the core ostree API";
homepage = "https://github.com/ostreedev/ostree-rs-ext";
license = with licenses; [ asl20 mit ];
maintainers = with maintainers; [ nickcao ];
mainProgram = "ostree-ext-cli";
};
}

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

@ -6,13 +6,13 @@
buildGoModule rec {
pname = "godns";
version = "2.9.7";
version = "2.9.8";
src = fetchFromGitHub {
owner = "TimothyYe";
repo = "godns";
rev = "refs/tags/v${version}";
hash = "sha256-In0v3WLxUofVaJ78HNDYWKJCjxk9q1GhDg6X2aGg91I=";
hash = "sha256-Nfw3pDqdCeaUKi+MzNIuRTwJHSoUbkJfWRJTAGvkBOQ=";
};
vendorHash = "sha256-iAU62/0MjzxwuMvIobhIZEqDJUpRqwEabnazH7jBRTE=";

4
pkgs/tools/security/exploitdb/default.nix
View File

@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "exploitdb";
version = "2023-05-14";
version = "2023-05-17";
src = fetchFromGitLab {
owner = "exploit-database";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-LC/BIyA6dbTut+2tU9D7PS9AfauRIHfdSY0gF2rVOLI=";
hash = "sha256-WbGtfxnEBOmmK9TjxSWJSEUHaUE9gX1hm9hmA4xkHhU=";
};
nativeBuildInputs = [

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

@ -10907,6 +10907,8 @@ with pkgs;
ostree = callPackage ../tools/misc/ostree { };
ostree-rs-ext = callPackage ../tools/misc/ostree-rs-ext { };
otel-cli = callPackage ../tools/misc/otel-cli { };
otfcc = callPackage ../tools/misc/otfcc { };

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

@ -3115,6 +3115,8 @@ self: super: with self; {
editorconfig = callPackage ../development/python-modules/editorconfig { };
edk2-pytool-library = callPackage ../development/python-modules/edk2-pytool-library { };
edlib = callPackage ../development/python-modules/edlib {
inherit (pkgs) edlib;
};