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

Merge staging-next into staging

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

15
maintainers/maintainer-list.nix
View File

@ -448,6 +448,15 @@
githubId = 315003;
name = "Adam Saponara";
};
adtya = {
email = "adtya@adtya.xyz";
github = "adtya";
githubId = 22346805;
name = "Adithya Nair";
keys = [{
fingerprint = "51E4 F5AB 1B82 BE45 B422 9CC2 43A5 E25A A5A2 7849";
}];
};
aerialx = {
email = "aaron+nixos@aaronlindsay.com";
github = "AerialX";
@ -9088,6 +9097,12 @@
githubId = 845652;
name = "Kier Davis";
};
kilianar = {
email = "mail@kilianar.de";
github = "kilianar";
githubId = 105428155;
name = "kilianar";
};
kilimnik = {
email = "mail@kilimnik.de";
github = "kilimnik";

3
nixos/modules/services/misc/jellyfin.nix
View File

@ -46,7 +46,8 @@ in
config = mkIf cfg.enable {
systemd.services.jellyfin = {
description = "Jellyfin Media Server";
after = [ "network.target" ];
after = [ "network-online.target" ];
wants = [ "network-online.target" ];
wantedBy = [ "multi-user.target" ];
# This is mostly follows: https://github.com/jellyfin/jellyfin/blob/master/fedora/jellyfin.service

4
pkgs/applications/audio/qpwgraph/default.nix
View File

@ -5,14 +5,14 @@
mkDerivation rec {
pname = "qpwgraph";
version = "0.5.2";
version = "0.5.3";
src = fetchFromGitLab {
domain = "gitlab.freedesktop.org";
owner = "rncbc";
repo = "qpwgraph";
rev = "v${version}";
sha256 = "sha256-qcd19YI2RDoh+vjeelxNajWsUwVokLu0kh35a4oezKA=";
sha256 = "sha256-50KaVpNB5/CTLs2bRbXEinYM23AZxZO/ForrVPFDN8U=";
};
nativeBuildInputs = [ cmake pkg-config ];

1
pkgs/applications/blockchains/monero-cli/default.nix
View File

@ -72,5 +72,6 @@ stdenv.mkDerivation rec {
license = licenses.bsd3;
platforms = platforms.all;
maintainers = with maintainers; [ rnhmjoj ];
mainProgram = "monero-wallet-cli";
};
}

18
pkgs/applications/misc/oranda/default.nix
View File

@ -2,34 +2,28 @@
, rustPlatform
, fetchFromGitHub
, pkg-config
, tailwindcss
, oniguruma
, stdenv
, darwin
, tailwindcss
}:
rustPlatform.buildRustPackage rec {
pname = "oranda";
version = "0.3.1";
version = "0.4.0";
src = fetchFromGitHub {
owner = "axodotdev";
repo = "oranda";
rev = "v${version}";
hash = "sha256-v/4FPDww142V5mx+pHhaHkDiIUN70dwei8mTeZELztc=";
hash = "sha256-PHaqWKsZyNZnEAzEWMzJK6MD0b4O6pkYQG403ONIj0w=";
};
cargoHash = "sha256-Q5EY9PB50DxFXFTPiv3RktI37b2TCDqLVNISxixnspY=";
patches = [
# oranda-generate-css which is used in the build script tries to download
# tailwindcss from the internet, so we have to patch it to use the
# tailwindcss from nixpkgs
./tailwind.patch
];
cargoHash = "sha256-zV7vG1mcgVusWCa4jKNLD+SqzReLZQRotk6nvzPYCU4=";
nativeBuildInputs = [
pkg-config
tailwindcss
];
buildInputs = [
@ -46,7 +40,7 @@ rustPlatform.buildRustPackage rec {
env = {
RUSTONIG_SYSTEM_LIBONIG = true;
TAILWINDCSS = lib.getExe tailwindcss;
ORANDA_USE_TAILWIND_BINARY = true;
} // lib.optionalAttrs stdenv.isDarwin {
# without this, tailwindcss fails with OpenSSL configuration error
OPENSSL_CONF = "";

52
pkgs/applications/misc/oranda/tailwind.patch
View File

@ -1,52 +0,0 @@
--- a/generate-css/src/lib.rs
+++ b/generate-css/src/lib.rs
@@ -28,48 +28,7 @@ pub fn default_css_output_dir() -> Utf8PathBuf {
}
pub fn build_css(dist_dir: &Utf8Path) -> Result<()> {
- // Fetch our cache dir
- let project_dir = ProjectDirs::from("dev", "axo", "oranda")
- .expect("Unable to create cache dir for downloading Tailwind!");
- let cache_dir = project_dir.cache_dir();
- // Figure out our target "double" (tailwind has weird naming around this)
- let double = match (env::consts::OS, env::consts::ARCH) {
- ("linux", "x86_64") => "linux-x64",
- ("linux", "aarch64") => "linux-arm64",
- ("linux", "arm") => "linux-armv7",
- ("macos", "x86_64") => "macos-x64",
- ("macos", "aarch64") => "macos-arm64",
- ("windows", "x86_64") => "windows-x64.exe",
- ("windows", "aarch64") => "windows-arm64.exe",
- _ => "linux-x64",
- };
- let mut binary_path = Utf8PathBuf::from(cache_dir.display().to_string());
- LocalAsset::create_dir_all(&binary_path)?;
- binary_path.push(format!("tailwindcss-{double}"));
- if !binary_path.exists() {
- // Fetch the binary from GitHub if it doesn't exist
- tracing::info!("Fetching Tailwind binary from GitHub release...");
- let url = format!(
- "https://github.com/tailwindlabs/tailwindcss/releases/latest/download/tailwindcss-{double}"
- );
- let handle = tokio::runtime::Handle::current();
- let response = handle.block_on(reqwest::get(url))?;
- let bytes = handle.block_on(response.bytes())?;
- let file = LocalAsset::new(&binary_path, Vec::from(bytes))?;
- file.write(
- binary_path
- .parent()
- .expect("Tailwind binary path has no parent!?"),
- )?;
-
- // On non-Windows platforms, we need to mark the file as executable
- #[cfg(target_family = "unix")]
- {
- use std::os::unix::prelude::PermissionsExt;
- let user_execute = std::fs::Permissions::from_mode(0o755);
- std::fs::set_permissions(&binary_path, user_execute)?;
- }
- }
+ let binary_path = env!("TAILWINDCSS");
tracing::info!("Building oranda CSS using Tailwind...");
let css_src_path = manifest_dir().join(CSS_SRC_PATH);

6
pkgs/applications/networking/cluster/argocd/default.nix
View File

@ -2,17 +2,17 @@
buildGoModule rec {
pname = "argocd";
version = "2.8.3";
version = "2.8.4";
src = fetchFromGitHub {
owner = "argoproj";
repo = "argo-cd";
rev = "v${version}";
hash = "sha256-sVaUItort09n2aShrE0MqOKQps44qNQv0Nox4P21xqg=";
hash = "sha256-ETvAE9kegqtAduXm9/9fmPgJJ2Xq6ZY5J5iGcjHkyKM=";
};
proxyVendor = true; # darwin/linux hash mismatch
vendorHash = "sha256-WeDIvw9KHDL5h/MQ9H1rOZkAlUOzROGw/gwpZB2jvOg=";
vendorHash = "sha256-4vGBi6P0xSfBheTg2/z28l9H07TasqqM8l6YjGgLhvs=";
# Set target as ./cmd per cli-local
# https://github.com/argoproj/argo-cd/blob/master/Makefile#L227

2
pkgs/applications/networking/remote/xrdp/default.nix
View File

@ -10,7 +10,7 @@ let
repo = "xrdp";
rev = "v${version}";
fetchSubmodules = true;
hash = "sha256-8gAP4wOqSmar8JhKRt4qRRwh23coIn0Q8Tt9ClHQSt8=";
hash = "sha256-14qsRfLn+26rm+vyMmOtaBEs8mWfSTIsIVseSC2FjXc=";
};
};

4
pkgs/applications/radio/qradiolink/default.nix
View File

@ -23,13 +23,13 @@
gnuradio3_8.pkgs.mkDerivation rec {
pname = "qradiolink";
version = "0.8.10-1";
version = "0.8.11-1";
src = fetchFromGitHub {
owner = "qradiolink";
repo = "qradiolink";
rev = version;
sha256 = "sha256-DOf5Ct8a9EGpO3YLef+Hw87m5tCVqD30weVOeis9agI=";
sha256 = "sha256-62+eKaLt9DlTebbnLPVJFx68bfWb7BrdQHocyJTfK28=";
};
preBuild = ''

4
pkgs/applications/radio/srsran/default.nix
View File

@ -17,13 +17,13 @@
stdenv.mkDerivation rec {
pname = "srsran";
version = "23.04";
version = "23.04.1";
src = fetchFromGitHub {
owner = "srsran";
repo = "srsran";
rev = "release_${builtins.replaceStrings ["."] ["_"] version}";
sha256 = "sha256-k2KUejn2eBFGknVQCHeYuZd4UUC2Jv0WEI9le9fYoFE=";
sha256 = "sha256-4Mwdar1WUIgT23VjI9CtA5FT5gCm0Su+xK5dld3qfho=";
};
nativeBuildInputs = [ cmake pkg-config ];

39
pkgs/applications/science/math/mpsolve/default.nix Normal file
View File

@ -0,0 +1,39 @@
{ lib
, stdenv
, fetchurl
, gmp
, pkg-config
, qtbase
, wrapQtAppsHook
, gtk3
}:
stdenv.mkDerivation (finalAttrs: {
pname = "mpsolve";
version = "3.2.1";
src = fetchurl {
url = "https://numpi.dm.unipi.it/_media/software/mpsolve/mpsolve-${finalAttrs.version}.tar.gz";
hash = "sha256-PRFCiumrLgIPJMq/vNnk2bIuxXLPcK8NRP6Nrh1R544=";
};
nativeBuildInputs = [
pkg-config
wrapQtAppsHook
];
buildInputs = [
gmp
gtk3
qtbase
];
meta = {
homepage = "https://numpi.dm.unipi.it/scientific-computing-libraries/mpsolve/";
description = "Multiprecision Polynomial Solver";
license = lib.licenses.gpl3Plus;
maintainers = with lib.maintainers; [ kilianar ];
mainProgram = "mpsolve";
platforms = lib.platforms.linux;
};
})

28
pkgs/development/compilers/algol68g/default.nix → pkgs/by-name/al/algol68g/package.nix
View File

@ -4,21 +4,19 @@
, gsl
, plotutils
, postgresql
, withPDFDoc ? true
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "algol68g";
version = "2.8.4";
version = "3.3.22";
src = fetchurl {
url = "https://jmvdveer.home.xs4all.nl/${pname}-${version}.tar.gz";
hash = "sha256-WCPM0MGP4Qo2ihF8w5JHSMSl0P6N/w2dgY/3PDQlZfA=";
url = "https://jmvdveer.home.xs4all.nl/algol68g-${finalAttrs.version}.tar.gz";
hash = "sha256-cSD6lngCy7SC2P7GyUCajk6i863a3vvCjtgZLF0TrIA=";
};
patches = [
# add PNG support
./0001-plotutils-png-support.diff
];
outputs = [ "out" "man" ] ++ lib.optional withPDFDoc "doc";
buildInputs = [
gsl
@ -31,12 +29,12 @@ stdenv.mkDerivation rec {
url = "https://jmvdveer.home.xs4all.nl/learning-algol-68-genie.pdf";
hash = "sha256-QCwn1e/lVfTYTeolCFErvfMhvwCgsBnASqq2K+NYmlU=";
};
in
in lib.optionalString withPDFDoc
''
install -m644 ${pdfdoc} $out/share/doc/${pname}/learning-algol-68-genie.pdf
install -m644 ${pdfdoc} ${placeholder "doc"}/share/doc/algol68g/learning-algol-68-genie.pdf
'';
meta = with lib; {
meta = {
homepage = "https://jmvdveer.home.xs4all.nl/en.algol-68-genie.html";
description = "Algol 68 Genie compiler-interpreter";
longDescription = ''
@ -48,9 +46,9 @@ stdenv.mkDerivation rec {
regular expressions and sounds. It can be linked to GNU plotutils, the GNU
scientific library and PostgreSQL.
'';
license = licenses.gpl3Plus;
maintainers = with maintainers; [ AndersonTorres ];
license = lib.licenses.gpl3Plus;
maintainers = with lib.maintainers; [ AndersonTorres ];
mainProgram = "a68g";
platforms = platforms.unix;
platforms = lib.platforms.unix;
};
}
})

1
pkgs/by-name/he/hello/package.nix
View File

@ -40,6 +40,7 @@ stdenv.mkDerivation (finalAttrs: {
changelog = "https://git.savannah.gnu.org/cgit/hello.git/plain/NEWS?h=v${finalAttrs.version}";
license = licenses.gpl3Plus;
maintainers = [ maintainers.eelco ];
mainProgram = "hello";
platforms = platforms.all;
};
})

27
pkgs/development/compilers/algol68g/0001-plotutils-png-support.diff
View File

@ -1,27 +0,0 @@
diff -Naur algol68g-2.8.4-old/source/plotutils.c algol68g-2.8.4-new/source/plotutils.c
--- algol68g-2.8.4-old/source/plotutils.c 2016-10-11 18:14:48.000000000 -0300
+++ algol68g-2.8.4-new/source/plotutils.c 2021-07-30 02:42:29.762627511 -0300
@@ -1026,10 +1026,10 @@
X_COORD (&DEVICE (f)) = 0;
Y_COORD (&DEVICE (f)) = 0;
return (PLOTTER (&DEVICE (f)));
- } else if (!strcmp (device_type, "gif")) {
-/*------------------------------------+
-| Supported plotter type - pseudo GIF |
-+------------------------------------*/
+ } else if (!strcmp (device_type, "gif") || !strcmp (device_type, "png")) {
+/*-------------------------------------------+
+| Supported plotter type - pseudo GIF or PNG |
++-------------------------------------------*/
char *z = DEREF (char, &A68_PAGE_SIZE (&DEVICE (f))), size[BUFFER_SIZE];
/* Establish page size */
if (!scan_int (&z, &(WINDOW_X_SIZE (&DEVICE (f))))) {
@@ -1067,7 +1067,7 @@
(void) pl_setplparam (PLOTTER_PARAMS (&DEVICE (f)), "BITMAPSIZE", size);
(void) pl_setplparam (PLOTTER_PARAMS (&DEVICE (f)), "BG_COLOR", (void *) "black");
(void) pl_setplparam (PLOTTER_PARAMS (&DEVICE (f)), "GIF_ANIMATION", (void *) "no");
- PLOTTER (&DEVICE (f)) = pl_newpl_r ("gif", NULL, STREAM (&DEVICE (f)), stderr, PLOTTER_PARAMS (&DEVICE (f)));
+ PLOTTER (&DEVICE (f)) = pl_newpl_r (device_type, NULL, STREAM (&DEVICE (f)), stderr, PLOTTER_PARAMS (&DEVICE (f)));
if (PLOTTER (&DEVICE (f)) == NULL) {
diagnostic_node (A68_RUNTIME_ERROR, p, ERROR_DEVICE_CANNOT_OPEN);
exit_genie (p, A68_RUNTIME_ERROR);

4
pkgs/development/compilers/aspectj/default.nix
View File

@ -2,14 +2,14 @@
stdenv.mkDerivation rec {
pname = "aspectj";
version = "1.9.20";
version = "1.9.20.1";
builder = ./builder.sh;
src = let
versionSnakeCase = builtins.replaceStrings ["."] ["_"] version;
in fetchurl {
url = "https://github.com/eclipse/org.aspectj/releases/download/V${versionSnakeCase}/aspectj-${version}.jar";
sha256 = "sha256-zrU7JlEyUwoYxQ+sTaJM4YGVW5NucDXDiEao4glJAk0=";
sha256 = "sha256-nzeDi1WdnIZ5DFxpZFSB/4c6FgV7wRQyO1uxRlaTZBY=";
};
inherit jre;

6
pkgs/development/interpreters/ruby/default.nix
View File

@ -351,9 +351,9 @@ in {
};
ruby_3_3 = generic {
version = rubyVersion "3" "3" "0" "preview1";
sha256 = "sha256-w0VKkRd5uNdHqw6ocEEDDQAtUz7ayySF/lWLcITaJe0=";
cargoSha256 = "sha256-6du7RJo0DH+eYMOoh3L31F3aqfR5+iG1iKauSV1uNcQ=";
version = rubyVersion "3" "3" "0" "preview2";
sha256 = "sha256-MM6LD+EbN7WsCI9aV2V0S5NerEW7ianjgXMVMxRPWZE=";
cargoSha256 = "sha256-GeelTMRFIyvz1QS2L+Q3KAnyQy7jc0ejhx3TdEFVEbk=";
};
}

29
pkgs/development/libraries/libdatachannel/default.nix
View File

@ -12,28 +12,15 @@
, usrsctp
}:
let
# Use usrsctp version specified at https://github.com/paullouisageneau/libdatachannel/tree/master/deps
# Older or newer usrsctp might break libdatachannel, please keep it synced with upstream.
customUsrsctp = usrsctp.overrideAttrs (finalAttrs: previousAttrs: {
version = "unstable-2021-10-08";
src = fetchFromGitHub {
owner = "sctplab";
repo = "usrsctp";
rev = "7c31bd35c79ba67084ce029511193a19ceb97447";
hash = "sha256-KeOR/0WDtG1rjUndwTUOhE21PoS+ETs1Vk7jQYy/vNs=";
};
});
in
stdenv.mkDerivation rec {
pname = "libdatachannel";
version = "0.18.5";
version = "0.19.1";
src = fetchFromGitHub {
owner = "paullouisageneau";
repo = pname;
rev = "v${version}";
hash = "sha256-ognjEDw68DpdQ/4JqcTejP5f9K0zLZGnpr99P/dvHK4=";
hash = "sha256-jsJTECSR3ptiByfYQ00laeKMKJCv5IDkZmilY3jpRrU=";
};
outputs = [ "out" "dev" ];
@ -48,22 +35,16 @@ stdenv.mkDerivation rec {
libnice
openssl
srtp
usrsctp
plog
];
cmakeFlags = [
"-DUSE_NICE=ON"
"-DUSE_SYSTEM_SRTP=ON"
"-DPREFER_SYSTEM_LIB=ON"
"-DNO_EXAMPLES=ON"
];
postPatch = ''
# TODO: Remove when updating to 0.19.x, and add
# -DUSE_SYSTEM_USRSCTP=ON and -DUSE_SYSTEM_PLOG=ON to cmakeFlags instead
mkdir -p deps/{usrsctp,plog}
cp -r --no-preserve=mode ${srcOnly customUsrsctp}/. deps/usrsctp
cp -r --no-preserve=mode ${srcOnly plog}/. deps/plog
'';
postFixup = ''
# Fix shared library path that will be incorrect on move to "dev" output
substituteInPlace "$dev/lib/cmake/LibDataChannel/LibDataChannelTargets-release.cmake" \

4
pkgs/development/libraries/libtommath/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "libtommath";
version = "1.2.0";
version = "1.2.1";
src = fetchurl {
url = "https://github.com/libtom/libtommath/releases/download/v${version}/ltm-${version}.tar.xz";
sha256 = "1c8q1qy88cjhdjlk3g24mra94h34c1ldvkjz0n2988c0yvn5xixp";
sha256 = "sha256-mGAl17N0J2/uLjDpnzZJ5KwNuKAiV6N+4Q6ucqvtDR8=";
};
nativeBuildInputs = [ libtool ];

33
pkgs/development/python-modules/azure-mgmt-maps/default.nix
View File

@ -1,37 +1,48 @@
{ lib
, buildPythonPackage
, fetchPypi
, msrest
, msrestazure
, azure-common
, azure-mgmt-core
, buildPythonPackage
, fetchPypi
, isodate
, pythonOlder
, typing-extensions
}:
buildPythonPackage rec {
pname = "azure-mgmt-maps";
version = "2.0.0";
version = "2.1.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "384e17f76a68b700a4f988478945c3a9721711c0400725afdfcb63cf84e85f0e";
hash = "sha256-XVaml4UuVBanYYHxjB1YT/PvExzgAPbD4gI3Hbc0dI0=";
};
propagatedBuildInputs = [
msrest
msrestazure
isodate
azure-common
azure-mgmt-core
] ++ lib.optionals (pythonOlder "3.8") [
typing-extensions
];
pythonNamespaces = [ "azure.mgmt" ];
pythonNamespaces = [
"azure.mgmt"
];
# has no tests
# Module has no tests
doCheck = false;
pythonImportsCheck = [
"azure.mgmt.maps"
];
meta = with lib; {
description = "This is the Microsoft Azure Maps Client Library";
homepage = "https://github.com/Azure/azure-sdk-for-python";
changelog = "https://github.com/Azure/azure-sdk-for-python/blob/v${version}/sdk/maps/azure-mgmt-maps/CHANGELOG.md";
license = licenses.mit;
maintainers = with maintainers; [ maxwilson ];
};

28
pkgs/development/python-modules/jsonpath-ng/default.nix
View File

@ -1,42 +1,48 @@
{ lib
, buildPythonPackage
, decorator
, fetchFromGitHub
, ply
, pytestCheckHook
, six
, pythonOlder
, setuptools
}:
buildPythonPackage rec {
pname = "jsonpath-ng";
version = "1.5.3";
version = "1.6.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "h2non";
repo = pname;
# missing tag https://github.com/h2non/jsonpath-ng/issues/114
rev = "cce4a3d4063ac8af928795acc53beb27a2bfd101";
hash = "sha256-+9iQHQs5TQhZFeIqMlsa3FFPfZEktAWy1lSdJU7kZrc=";
rev = "refs/tags/v${version}";
hash = "sha256-q4kIH/2+VKdlSa+IhJ3ymHpc5gmml9lW4aJS477/YSo=";
};
propagatedBuildInputs = [
decorator
ply
six
setuptools
];
nativeCheckInputs = [ pytestCheckHook ];
nativeCheckInputs = [
pytestCheckHook
];
disabledTestPaths = [
# Exclude tests that require oslotest
"tests/test_jsonpath_rw_ext.py"
];
pythonImportsCheck = [ "jsonpath_ng" ];
pythonImportsCheck = [
"jsonpath_ng"
];
meta = with lib; {
description = "JSONPath implementation for Python";
description = "JSONPath implementation";
homepage = "https://github.com/h2non/jsonpath-ng";
changelog = "https://github.com/h2non/jsonpath-ng/blob/v${version}/History.md";
license = with licenses; [ asl20 ];
maintainers = with maintainers; [ fab ];
};

16
pkgs/development/python-modules/types-mock/default.nix
View File

@ -5,17 +5,21 @@
buildPythonPackage rec {
pname = "types-mock";
version = "5.1.0.1";
version = "5.1.0.2";
format = "setuptools";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-8H1Z3lDqgWq0A7pOJG/4CwCSY7N3vD93Tf3r8LQD+2A=";
hash = "sha256-3kjTdm5OMDTv2LJtqeCeSQjzHlMTel/i778fur7haZY=";
};
meta = {
description = "This is a PEP 561 type stub package for the mock package. It can be used by type-checking tools like mypy, pyright, pytype, PyCharm, etc. to check code that uses mock.";
# Module has no tests
doCheck = false;
meta = with lib; {
description = "Type stub package for the mock package";
homepage = "https://pypi.org/project/types-mock";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ ];
license = licenses.asl20;
maintainers = with maintainers; [ ];
};
}

4
pkgs/development/tools/analysis/checkov/default.nix
View File

@ -22,14 +22,14 @@ with py.pkgs;
buildPythonApplication rec {
pname = "checkov";
version = "2.4.33";
version = "2.4.39";
format = "setuptools";
src = fetchFromGitHub {
owner = "bridgecrewio";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-lbJlv1D3PvZlvjawkItBt9STdMMJwC5QQAYdUG0HjTI=";
hash = "sha256-QlHYeg9gOd+YiAZ+ei9/Pq+AjTgTakx0d/LjTlvsAIs=";
};
patches = [

8
pkgs/development/tools/biome/default.nix
View File

@ -11,16 +11,16 @@
rustPlatform.buildRustPackage rec {
pname = "biome";
version = "1.1.2";
version = "1.2.1";
src = fetchFromGitHub {
owner = "biomejs";
repo = "biome";
rev = "cli/v${version}";
hash = "sha256-DE5D4WLO41JA9f3zy3sBiBQ8MOQCbosx6p9AqIM3ddc=";
hash = "sha256-/rIPIZX3w28xTn+UyAsB+lgfF0LDmxM92EofcPSCD+4=";
};
cargoHash = "sha256-qP8CyGiWfytjAsxo6xS1ubowzwEqZN0vM/kQSOnS3rw=";
cargoHash = "sha256-5mX4RDACImjiU+nSuN9SzyibIMcUWYCAJfikX2gWIfg=";
nativeBuildInputs = [
pkg-config
@ -37,7 +37,7 @@ rustPlatform.buildRustPackage rec {
git
];
cargoBuildFlags = [ "-p=rome_cli" ];
cargoBuildFlags = [ "-p=biome_cli" ];
cargoTestFlags = cargoBuildFlags;
env = {

6
pkgs/development/tools/rain/default.nix
View File

@ -7,16 +7,16 @@
buildGoModule rec {
pname = "rain";
version = "1.4.4";
version = "1.5.0";
src = fetchFromGitHub {
owner = "aws-cloudformation";
repo = pname;
rev = "v${version}";
sha256 = "sha256-f93BbtMTJFzql3PvkbWZYOnjRoBWcsU3OX1bCBStTqs=";
sha256 = "sha256-vvLvsZhdkxgTREEwLFdF1MwKj1A4rHgJ3y9VdKOl5HE=";
};
vendorHash = "sha256-Z0AB24PdtDREicWjDnVcTM4hhWpF1hpF7Rg/YFgXLN0=";
vendorHash = "sha256-xmpjoNfz+4d7Un0J6yEhkQG2Ax8hL0dw4OQmwrKq3QI=";
subPackages = [ "cmd/rain" ];

12
pkgs/development/tools/refinery-cli/default.nix
View File

@ -1,24 +1,26 @@
{ fetchCrate, lib, openssl, pkg-config, rustPlatform }:
{ fetchCrate, lib, stdenv, openssl, pkg-config, rustPlatform, darwin }:
rustPlatform.buildRustPackage rec {
pname = "refinery-cli";
version = "0.8.10";
version = "0.8.11";
src = fetchCrate {
pname = "refinery_cli";
inherit version;
sha256 = "sha256-6nb/RduzoTK5UtdzYBLdKkYTUrV9A1w1ZePqr3cO534=";
sha256 = "sha256-Dx0xcPQsq5fYrjgCrEjXyQJOpjEF9d1vavTo+LUKSyE=";
};
cargoHash = "sha256-rdxcWsLwhWuqGE5Z698NULg6Y2nkLqiIqEpBpceflk0=";
cargoHash = "sha256-giD9yBbC3Fsgtch6lkMLGkYik/hivK48Um2qWI7EV+A=";
nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl ];
buildInputs = [ openssl ]
++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ];
meta = with lib; {
description = "Run migrations for the Refinery ORM for Rust via the CLI";
homepage = "https://github.com/rust-db/refinery";
changelog = "https://github.com/rust-db/refinery/blob/${version}/CHANGELOG.md";
license = licenses.mit;
maintainers = with maintainers; [ lucperkins ];
};

9
pkgs/development/web/flyctl/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "flyctl";
version = "0.1.90";
version = "0.1.92";
src = fetchFromGitHub {
owner = "superfly";
repo = "flyctl";
rev = "v${version}";
hash = "sha256-dgfPhx2IJxkMji6nw+GSg1xHxyh3xjSr7KLdVv9PbUI=";
hash = "sha256-uW87hlSwHMJ6SIfranaH383EKwvewfNKbuGA4znVEeg=";
};
vendorHash = "sha256-DnTjkv3lPUNB1WIQ2ncUaafdUP+y1t0UfaPfV4PW7VM=";
vendorHash = "sha256-Y1merBgVui0Ot3gb2UbTiLmxlaI4egbsI6vQJgF4mCE=";
subPackages = [ "." ];
@ -58,6 +58,7 @@ buildGoModule rec {
downloadPage = "https://github.com/superfly/flyctl";
homepage = "https://fly.io/";
license = licenses.asl20;
maintainers = with maintainers; [ aaronjanse jsierles techknowlogick viraptor ];
maintainers = with maintainers; [ aaronjanse adtya jsierles techknowlogick viraptor ];
mainProgram = "flyctl";
};
}

8
pkgs/os-specific/linux/firmware/fwupd/default.nix
View File

@ -54,6 +54,7 @@
, libcbor
, xz
, enableFlashrom ? false
, enablePassim ? false
}:
let
@ -123,7 +124,7 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "fwupd";
version = "1.9.4";
version = "1.9.5";
# libfwupd goes to lib
# daemon, plug-ins and libfwupdplugin go to out
@ -134,7 +135,7 @@ stdenv.mkDerivation (finalAttrs: {
owner = "fwupd";
repo = "fwupd";
rev = finalAttrs.version;
hash = "sha256-xjN6nHqg7sQzgojClySQEjLQBdI5291TxPhgLjKzKvk=";
hash = "sha256-dqbFgVgG2RQM5ZHIEIIJOmrjtwlaRXEyY+2OdDs4PGo=";
};
patches = [
@ -220,9 +221,10 @@ stdenv.mkDerivation (finalAttrs: {
"-Dsysconfdir_install=${placeholder "out"}/etc"
"-Defi_os_dir=nixos"
"-Dplugin_modem_manager=enabled"
# We do not want to place the daemon into lib (cyclic reference)
"--libexecdir=${placeholder "out"}/libexec"
] ++ lib.optionals (!enablePassim) [
"-Dpassim=disabled"
] ++ lib.optionals (!haveDell) [
"-Dplugin_dell=disabled"
"-Dplugin_synaptics_mst=disabled"

2
pkgs/servers/calibre-web/default.nix
View File

@ -63,6 +63,8 @@ python.pkgs.buildPythonApplication rec {
# and exit. This is gonna be used to configure calibre-web declaratively, as most of its configuration parameters
# are stored in the DB.
./db-migrations.patch
# environ in tornado.wsgi.WSGIContainer no longer a static method from 6.3 version
./static_environ.patch
];
# calibre-web doesn't follow setuptools directory structure. The following is taken from the script

25
pkgs/servers/calibre-web/static_environ.patch Normal file
View File

@ -0,0 +1,25 @@
diff --git a/cps/tornado_wsgi.py b/cps/tornado_wsgi.py
index af93219c..cf302042 100644
--- a/cps/tornado_wsgi.py
+++ b/cps/tornado_wsgi.py
@@ -53,7 +53,7 @@ class MyWSGIContainer(WSGIContainer):
return response.append
app_response = self.wsgi_application(
- MyWSGIContainer.environ(request), start_response
+ self.environ(request), start_response
)
try:
response.extend(app_response)
@@ -86,9 +86,8 @@ class MyWSGIContainer(WSGIContainer):
request.connection.finish()
self._log(status_code, request)
- @staticmethod
- def environ(request: httputil.HTTPServerRequest) -> Dict[Text, Any]:
- environ = WSGIContainer.environ(request)
+ def environ(self, request: httputil.HTTPServerRequest) -> Dict[Text, Any]:
+ environ = super().environ(request)
environ['RAW_URI'] = request.path
return environ

4
pkgs/servers/jackett/default.nix
View File

@ -9,13 +9,13 @@
buildDotnetModule rec {
pname = "jackett";
version = "0.21.747";
version = "0.21.798";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
hash = "sha512-RSHMDrcg8yuMMXXv5bIfF0k3QyXSIAdA7myvLw+PaTpHQHFZKQ4MkS7nDEGT2vxU2yX872sSIgtRRX7Xcm2mQg==";
hash = "sha512-0GyfhVYs5YQXEYOxnCuOEhbwUAUYPvvXBIf4ylKkzZ7QKuiSYTDlPA+ArkaTQ4IRe7yesTsUMiSolWBOG8dtmw==";
};
projectFile = "src/Jackett.Server/Jackett.Server.csproj";

8
pkgs/servers/miniflux/default.nix
View File

@ -2,7 +2,7 @@
let
pname = "miniflux";
version = "2.0.46";
version = "2.0.48";
in buildGoModule {
inherit pname version;
@ -11,17 +11,17 @@ in buildGoModule {
owner = pname;
repo = "v2";
rev = version;
sha256 = "sha256-a27eKOhW2vHmPktLgqHKqiwtC9T6GRwnOeNReeMsaeM=";
sha256 = "sha256-g2Cnkf022aU/kUkb6N8huB+SFY60uNxyI9BVEycl37c=";
};
vendorHash = "sha256-Oe7el4tE/gwI6qL/fjJgnv1jbNSKrCnq1nBq+dD7Gik=";
vendorHash = "sha256-d4/oDvMRZtetZ7RyCHVnPqA78yPVFyw4UhjfPD1XuMo=";
nativeBuildInputs = [ installShellFiles ];
checkFlags = [ "-skip=TestClient" ]; # skip client tests as they require network access
ldflags = [
"-s" "-w" "-X miniflux.app/version.Version=${version}"
"-s" "-w" "-X miniflux.app/v2/internal/version.Version=${version}"
];
postInstall = ''

6
pkgs/tools/misc/zellij/default.nix
View File

@ -15,16 +15,16 @@
rustPlatform.buildRustPackage rec {
pname = "zellij";
version = "0.38.1";
version = "0.38.2";
src = fetchFromGitHub {
owner = "zellij-org";
repo = "zellij";
rev = "v${version}";
hash = "sha256-3khMo5qMG0qonMnPvuErVYFohUrZLAkaxKZzkMHou8E=";
hash = "sha256-rq7M4g+s44j9jh5GzOjOCBr7VK3m/EQej/Qcnp67NhY=";
};
cargoHash = "sha256-d4UNkbp/ryN/VbK8VO8oYvZ1j6qHKeLRSDqgdT+zIeU=";
cargoHash = "sha256-xK7lLgjVFUISo4stF6MgfgI4mT5qHuph70cyYaLYZ30=";
nativeBuildInputs = [
mandown

2
pkgs/tools/nix/npins/default.nix
View File

@ -19,7 +19,7 @@ in rustPlatform.buildRustPackage rec {
version = src.version;
src = passthru.mkSource sources.npins;
cargoSha256 = "sha256-NDu4nl4Os7Mgal8gBHC6bsZ2Z+Fqt0PlGdLHiPd/8T4=";
cargoSha256 = "sha256-eySVpmCVWBJfyAkTQv+LqojWMO/3r6kBYP1a4z+FYHY=";
buildInputs = lib.optional stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Security ]);
nativeBuildInputs = [ makeWrapper ];

8
pkgs/tools/nix/npins/sources.json
View File

@ -9,10 +9,10 @@
},
"pre_releases": false,
"version_upper_bound": null,
"version": "0.2.0",
"revision": "1205a5c7ff9c05fa2607220345eefcb539429419",
"url": "https://api.github.com/repos/andir/npins/tarball/0.2.0",
"hash": "0knk20ygz4id8hw38fd61d70hm44gzjskrs1ij2ghkqcw02pcq1j"
"version": "0.2.2",
"revision": "a443c58d9c7b818aaea3c47821d7c561faef66ec",
"url": "https://api.github.com/repos/andir/npins/tarball/0.2.2",
"hash": "0rv6m8c9lmzkb76b682w7ax6jy8ls4l4y17wjx98jk64b74qspca"
}
},
"version": 3

4
pkgs/tools/system/dool/default.nix
View File

@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "dool";
version = "1.2.0";
version = "1.3.0";
src = fetchFromGitHub {
owner = "scottchiefbaker";
repo = "dool";
rev = "v${version}";
hash = "sha256-e6gLPmxOZBw6htiJ5Ljob2tQ9xB4kjK8vPs/9WMGER4=";
hash = "sha256-FekCxzB+jZtiPfJ/yAtvCsaNZJJkgWUAFe6hMXznSJw=";
};
buildInputs = [

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

@ -1291,6 +1291,8 @@ with pkgs;
mokutil = callPackage ../tools/security/mokutil { };
mpsolve = libsForQt5.callPackage ../applications/science/math/mpsolve { };
nixBufferBuilders = import ../build-support/emacs/buffer.nix { inherit lib writeText; inherit (emacs.pkgs) inherit-local; };
nix-gitignore = callPackage ../build-support/nix-gitignore { };
@ -15512,8 +15514,6 @@ with pkgs;
alarm-clock-applet = callPackage ../tools/misc/alarm-clock-applet { };
algol68g = callPackage ../development/compilers/algol68g { };
ante = callPackage ../development/compilers/ante { };
armips = callPackage ../development/compilers/armips {