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

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot]
2024-09-11 06:04:39 +00:00
committed by GitHub
parent 6ed06bc08f 62f0186c41
commit 4ff02731c6
30 changed files with 284 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/tests/modules.sh
+3
View File
@@ -294,6 +294,9 @@ checkConfigOutput '^"42"$' config.value ./declare-coerced-value.nix
checkConfigOutput '^"24"$' config.value ./declare-coerced-value.nix ./define-value-string.nix
checkConfigError 'A definition for option .* is not.*string or signed integer convertible to it.*. Definition values:\n\s*- In .*: \[ \]' config.value ./declare-coerced-value.nix ./define-value-list.nix
# Check coerced option merging.
checkConfigError 'The option .value. in .*/declare-coerced-value.nix. is already declared in .*/declare-coerced-value-no-default.nix.' config.value ./declare-coerced-value.nix ./declare-coerced-value-no-default.nix
# Check coerced value with unsound coercion
checkConfigOutput '^12$' config.value ./declare-coerced-value-unsound.nix
checkConfigError 'A definition for option .* is not of type .*. Definition values:\n\s*- In .*: "1000"' config.value ./declare-coerced-value-unsound.nix ./define-value-string-bigint.nix
lib/tests/modules/declare-coerced-value-no-default.nix
+9
View File
@@ -0,0 +1,9 @@
{ lib, ... }:
{
options = {
value = lib.mkOption {
type = lib.types.coercedTo lib.types.int builtins.toString lib.types.str;
};
};
}
lib/types.nix
+1 -1
View File
@@ -1035,7 +1035,7 @@ rec {
getSubOptions = finalType.getSubOptions;
getSubModules = finalType.getSubModules;
substSubModules = m: coercedTo coercedType coerceFunc (finalType.substSubModules m);
typeMerge = t1: t2: null;
typeMerge = t: null;
functor = (defaultFunctor name) // { wrapped = finalType; };
nestedTypes.coercedType = coercedType;
nestedTypes.finalType = finalType;
maintainers/maintainer-list.nix
+6
View File
@@ -243,6 +243,12 @@
github = "48cf";
githubId = 32851089;
};
_4ever2 = {
email = "eske@cs.au.dk";
github = "4ever2";
githubId = 3417013;
name = "Eske Nielsen";
};
_6543 = {
email = "6543@obermui.de";
github = "6543";
maintainers/scripts/build.nix
+21 -1
View File
@@ -12,7 +12,27 @@
# nix-build build.nix --argstr maintainer <yourname> --argstr system aarch64-linux
let
pkgs = import ./../../default.nix (removeAttrs args [ "maintainer" ]);
# This avoids a common situation for maintainers, where due to Git's behavior of not tracking
# directories, they have an empty directory somewhere in `pkgs/by-name`. Because that directory
# exists, `pkgs/top-level/by-name-overlay.nix` picks it up and attempts to read `package.nix` out
# of it... which doesn't exist, since it's empty.
#
# We don't want to run the code below on every instantiation of `nixpkgs`, as the `pkgs/by-name`
# eval machinery is quite performance sensitive. So we use the internals of the `by-name` overlay
# to implement our own way to avoid an evaluation failure for this script.
#
# See <https://github.com/NixOS/nixpkgs/issues/338227> for more motivation for this code block.
overlay = self: super: {
_internalCallByNamePackageFile =
file: if builtins.pathExists file then super._internalCallByNamePackageFile file else null;
};
nixpkgsArgs = removeAttrs args [ "maintainer" "overlays" ] // {
overlays = args.overlays or [] ++ [ overlay ];
};
pkgs = import ./../../default.nix nixpkgsArgs;
maintainer_ = pkgs.lib.maintainers.${maintainer};
packagesWith = cond: return: set:
(pkgs.lib.flatten
pkgs/applications/networking/sync/storj-uplink/default.nix
+3 -3
View File
@@ -5,18 +5,18 @@
buildGoModule rec {
pname = "storj-uplink";
version = "1.110.3";
version = "1.111.4";
src = fetchFromGitHub {
owner = "storj";
repo = "storj";
rev = "v${version}";
hash = "sha256-hVgFr5fnoSZumNkImMIEbKCu7nIAT72bMi3wnsn95tc=";
hash = "sha256-WwqB0la3JBJ5074Y0erOIC60++pLLbFF3LhekbRBUWA=";
};
subPackages = [ "cmd/uplink" ];
vendorHash = "sha256-iXOL7YtSXTmLMS3nDvuUy2puWK83gbtVmrzD17C9JxU=";
vendorHash = "sha256-dA/XMBnFRDBqBlYz3j0Q6E7asmrixG71Vv52F9WX8ew=";
ldflags = [ "-s" "-w" ];
pkgs/applications/science/chemistry/cp2k/default.nix
+2 -2
View File
@@ -58,13 +58,13 @@ let
in
stdenv.mkDerivation rec {
pname = "cp2k";
version = "2024.2";
version = "2024.3";
src = fetchFromGitHub {
owner = "cp2k";
repo = "cp2k";
rev = "v${version}";
hash = "sha256-KXxqzapdPZggFlxX1rkNcxEYb2+aQIPFclFspxII7aE=";
hash = "sha256-TeVQ0wVUx6d4knwMi9z3LjQZ4ELE6s1TnvwfFz8jbYk=";
fetchSubmodules = true;
};
pkgs/applications/video/mpv/scripts/memo.nix
+3 -3
View File
@@ -7,13 +7,13 @@
buildLua {
pname = "memo";
version = "0-unstable-2024-07-02";
version = "0-unstable-2024-09-03";
src = fetchFromGitHub {
owner = "po5";
repo = "memo";
rev = "43ad5bc37d4ac63a00dd2a8f15b9028789467da7";
hash = "sha256-nHJ1x5R4Rw2YjB3Li3ZFbI3ZdLSqddJFzJlni4NjpH0=";
rev = "e0624611438b2e19ef4b7e24f53461c9d0304b07";
hash = "sha256-6+fI3TdBDfKcozxLcsykavgi17ywqRRhyiMK7PgAzGs=";
};
passthru.updateScript = unstableGitUpdater { };
pkgs/applications/video/xine/ui.nix
-78
View File
@@ -1,78 +0,0 @@
{ lib
, stdenv
, fetchurl
, autoreconfHook
, curl
, libXext
, libXft
, libXi
, libXinerama
, libXtst
, libXv
, libXxf86vm
, libjpeg
, libpng
, lirc
, ncurses
, pkg-config
, readline
, shared-mime-info
, xine-lib
, xorgproto
}:
stdenv.mkDerivation (finalAttrs: {
pname = "xine-ui";
version = "0.99.14";
src = fetchurl {
url = "mirror://sourceforge/xine/xine-ui-${finalAttrs.version}.tar.xz";
hash = "sha256-1NSQ1c7OcOK7mEnJ5ILyz4evAwLUUbYUR2/cw2Qs2cM=";
};
outputs = [ "out" "dev" "lib" "man" ];
nativeBuildInputs = [
autoreconfHook
pkg-config
shared-mime-info
];
buildInputs = [
curl
libXext
libXft
libXi
libXinerama
libXtst
libXv
libXxf86vm
libjpeg
libpng
lirc
ncurses
readline
xine-lib
xorgproto
];
configureFlags = [ "--with-readline=${readline.dev}" ];
env = {
LIRC_CFLAGS="-I${lirc}/include";
LIRC_LIBS="-L ${lirc}/lib -llirc_client";
};
postInstall = ''
substituteInPlace $out/share/applications/xine.desktop \
--replace "MimeType=;" "MimeType="
'';
meta = {
homepage = "https://xine.sourceforge.net/";
description = "Xlib-based frontend for Xine video player";
license = lib.licenses.gpl2Plus;
maintainers = with lib.maintainers; [ AndersonTorres ];
platforms = lib.platforms.linux;
};
})
pkgs/applications/virtualization/containerd/default.nix
+2 -2
View File
@@ -11,13 +11,13 @@
buildGoModule rec {
pname = "containerd";
version = "1.7.21";
version = "1.7.22";
src = fetchFromGitHub {
owner = "containerd";
repo = "containerd";
rev = "v${version}";
hash = "sha256-cL1RKFg+B2gTPMg963DKup5BCLLgF9t9VZn2WlmmWPI=";
hash = "sha256-8IHBKai4PvvTuHPDTgx9wFEBzz4MM7Mwo8Q/bzFRzfk=";
};
vendorHash = null;
pkgs/applications/virtualization/cri-o/default.nix
+2 -2
View File
@@ -15,13 +15,13 @@
buildGoModule rec {
pname = "cri-o";
version = "1.30.5";
version = "1.31.0";
src = fetchFromGitHub {
owner = "cri-o";
repo = "cri-o";
rev = "v${version}";
hash = "sha256-snhuV4hqbqMJK8Fg6vJGJoQ3heCFULK1iIQQB65kiR0=";
hash = "sha256-pY8FRxexf/WG+aGkKZc4EtqO9uxAV7D6EFWirgSEye8=";
};
vendorHash = null;
pkgs/applications/virtualization/crun/default.nix
+2 -2
View File
@@ -39,13 +39,13 @@ let
in
stdenv.mkDerivation rec {
pname = "crun";
version = "1.16.1";
version = "1.17";
src = fetchFromGitHub {
owner = "containers";
repo = pname;
rev = version;
hash = "sha256-OhDzScs8xGs7kRn/xZRPwyqIszD0OuuY4ymrJ9QVDvM=";
hash = "sha256-d2YBpW8KivWYPRPpvXlT5tWPX8hvTCaSkMxdSuswYRA=";
fetchSubmodules = true;
};
pkgs/applications/virtualization/xen/4.17/default.nix
+3 -6
View File
@@ -16,9 +16,6 @@ let
with upstreamPatches;
[
QUBES_REPRODUCIBLE_BUILDS
XSA_458
XSA_460
XSA_461
]
);
in
@@ -26,12 +23,12 @@ in
callPackage (import ../generic/default.nix {
pname = "xen";
branch = "4.17";
version = "4.17.4";
version = "4.17.5";
latest = false;
pkg = {
xen = {
rev = "d530627aaa9b6e03c7f911434bb342fca3d13300";
hash = "sha256-4ltQUzo4XPzGT/7fGt1hnNMqBQBVF7VP+WXD9ZaJcGo=";
rev = "430ce6cd936546ad883ecd1c85ddea32d790604b";
hash = "sha256-UoMdXRW0yWSaQPPV0rgoTZVO2ghdnqWruBHn7+ZjKzI=";
patches = [ ] ++ upstreamPatchList;
};
qemu = {
pkgs/applications/virtualization/xen/4.18/default.nix
+3 -6
View File
@@ -16,9 +16,6 @@ let
with upstreamPatches;
[
QUBES_REPRODUCIBLE_BUILDS
XSA_458
XSA_460
XSA_461
]
);
in
@@ -26,12 +23,12 @@ in
callPackage (import ../generic/default.nix {
pname = "xen";
branch = "4.18";
version = "4.18.2";
version = "4.18.3";
latest = false;
pkg = {
xen = {
rev = "d152a0424677d8b78e00ed1270a583c5dafff16f";
hash = "sha256-pHCjj+Bcy4xQfB9xHU9fccFwVdP2DXrUhdszwGvrdmY=";
rev = "bd51e573a730efc569646379cd59ccba967cde97";
hash = "sha256-OFiFdpPCXR+sWjzFHCORtY4DkWyggvxkcsGdgEyO1ts=";
patches = [ ] ++ upstreamPatchList;
};
qemu = {
pkgs/by-name/st/stalwart-mail/package.nix
+3 -3
View File
@@ -26,7 +26,7 @@ let
# See upstream issue for rocksdb 9.X support
# https://github.com/stalwartlabs/mail-server/issues/407
rocksdb = rocksdb_8_11;
version = "0.9.3";
version = "0.9.4";
in
rustPlatform.buildRustPackage {
pname = "stalwart-mail";
@@ -36,11 +36,11 @@ rustPlatform.buildRustPackage {
owner = "stalwartlabs";
repo = "mail-server";
rev = "refs/tags/v${version}";
hash = "sha256-XjHm9jBpBQcf1qaZJLDSSrPK9Nqi3olG0pMXHdNUjbg=";
hash = "sha256-GDi7kRwI0GujQBJXItQpYZT1I1Hz3DUMyTixJ/lQySY=";
fetchSubmodules = true;
};
cargoHash = "sha256-sFYvEKZVTS5v37CpIl/KjoOY0iWCHLgIJFUdht5SjJY=";
cargoHash = "sha256-7gJi6sykmKRuZZ8svXWlktHnwr78zaE2jxVIt+sZPHg=";
patches = [
# Remove "PermissionsStartOnly" from systemd service files,
pkgs/applications/video/xine/lib.nix → pkgs/by-name/xi/xine-lib/package.nix
+53 -41
View File
@@ -1,44 +1,50 @@
{ lib
, stdenv
, fetchurl
, aalib
, alsa-lib
, autoreconfHook
, ffmpeg
, flac
, libGL
, libGLU
, libX11
, libXext
, libXinerama
, libXv
, libcaca
, libcdio
, libmng
, libmpcdec
, libpulseaudio
, libtheora
, libv4l
, libvorbis
, libxcb
, ncurses
, perl
, pkg-config
, speex
, vcdimager
, zlib
{
lib,
aalib,
alsa-lib,
autoreconfHook,
fetchhg,
ffmpeg,
flac,
libGL,
libGLU,
libX11,
libXext,
libXinerama,
libXv,
libcaca,
libcdio,
libmng,
libmpcdec,
libpulseaudio,
libtheora,
libv4l,
libvorbis,
libxcb,
ncurses,
perl,
pkg-config,
speex,
stdenv,
vcdimager,
zlib,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "xine-lib";
version = "1.2.13";
version = "1.2.13-unstable-2024-06-29";
src = fetchurl {
url = "mirror://sourceforge/xine/xine-lib-${finalAttrs.version}.tar.xz";
hash = "sha256-XxDW1xikpRwX7RsysDHU+bgLBh6CdlNbK+MeWsS3Xm8=";
src = fetchhg {
url = "http://hg.code.sf.net/p/xine/xine-lib-1.2";
rev = "53845e2f6b1f3b69328de5c030c0ab27eb8f043d";
hash = "sha256-O5lIYmNC2TpoY4QbPMsDWxNOoxdw61967Q4QG9d/+Bg=";
};
outputs = [ "out" "dev" "man" ];
outputs = [
"out"
"dev"
"man"
];
nativeBuildInputs = [
autoreconfHook
@@ -54,8 +60,12 @@ stdenv.mkDerivation (finalAttrs: {
libGL
libGLU
libX11
libX11
libXext
libXext
libXinerama
libXinerama
libXv
libXv
libcaca
libcdio
@@ -66,26 +76,28 @@ stdenv.mkDerivation (finalAttrs: {
libv4l
libvorbis
libxcb
libxcb
ncurses
perl
speex
vcdimager
zlib
libX11
libXext
libXinerama
libXv
libxcb
];
env.NIX_LDFLAGS = "-lxcb-shm";
enableParallelBuilding = true;
env.NIX_LDFLAGS = "-lxcb-shm";
strictDeps = true;
meta = {
homepage = "https://xine.sourceforge.net/";
description = "High-performance, portable and reusable multimedia playback engine";
license = with lib.licenses; [ gpl2Plus lgpl2Plus ];
license = with lib.licenses; [
gpl2Plus
lgpl2Plus
];
# No useful mainProgram
maintainers = with lib.maintainers; [ AndersonTorres ];
platforms = lib.platforms.linux;
};
pkgs/by-name/xi/xine-ui/package.nix
+85
View File
@@ -0,0 +1,85 @@
{
lib,
autoreconfHook,
curl,
fetchhg,
libXext,
libXft,
libXi,
libXinerama,
libXtst,
libXv,
libXxf86vm,
libjpeg,
libpng,
lirc,
ncurses,
perl,
pkg-config,
readline,
shared-mime-info,
stdenv,
xine-lib,
xorgproto,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "xine-ui";
version = "0.99.14-unstable-2024-08-26";
src = fetchhg {
url = "http://hg.code.sf.net/p/xine/xine-ui";
rev = "2beaad6bb92e6732585f68af2e346a24e5ad53a5";
hash = "sha256-Y08JX9q4w6pSJRCa5mWN11BnA6mZJSO/yn3X8YyZ6E4=";
};
outputs = [
"out"
"dev"
"lib"
"man"
];
nativeBuildInputs = [
autoreconfHook
pkg-config
shared-mime-info
perl
];
buildInputs = [
curl
libXext
libXft
libXi
libXinerama
libXtst
libXv
libXxf86vm
libjpeg
libpng
lirc
ncurses
readline
xine-lib
xorgproto
];
configureFlags = [ "--with-readline=${readline.dev}" ];
env = {
LIRC_CFLAGS = "-I${lib.getInclude lirc}/include";
LIRC_LIBS = "-L ${lib.getLib lirc}/lib -llirc_client";
};
strictDeps = true;
meta = {
homepage = "https://xine.sourceforge.net/";
description = "Xlib-based frontend for Xine video player";
license = lib.licenses.gpl2Plus;
mainProgram = "xine";
maintainers = with lib.maintainers; [ AndersonTorres ];
platforms = lib.platforms.linux;
};
})
pkgs/by-name/zs/zsh-wd/package.nix
+2 -2
View File
@@ -2,13 +2,13 @@
stdenvNoCC.mkDerivation rec {
pname = "wd";
version = "0.7.1";
version = "0.8.0";
src = fetchFromGitHub {
owner = "mfaerevaag";
repo = "wd";
rev = "v${version}";
sha256 = "sha256-Zc49X/8T66xnDkfotf0p6AVyHHd4P3eNDMOsO1sUryY=";
sha256 = "sha256-rHHCnHa0/t2ij+6rExgvNt2EFBnkgs6l7oE6zL+xc58=";
};
nativeBuildInputs = [ installShellFiles ];
pkgs/development/coq-modules/ElmExtraction/default.nix
+52
View File
@@ -0,0 +1,52 @@
{
lib,
mkCoqDerivation,
which,
coq,
metacoq,
version ? null,
}:
with lib;
mkCoqDerivation {
pname = "ElmExtraction";
repo = "coq-elm-extraction";
owner = "AU-COBRA";
domain = "github.com";
inherit version;
defaultVersion =
with versions;
switch
[
coq.coq-version
metacoq.version
]
[
{
cases = [
(range "8.17" "8.20")
(range "1.3.1" "1.3.2")
];
out = "0.1.0";
}
]
null;
release."0.1.0".sha256 = "EWjubBHsxAl2HuRAfJI3B9qzP2mj89eh0CUc8y7/7Ds=";
releaseRev = v: "v${v}";
propagatedBuildInputs = [
coq.ocamlPackages.findlib
metacoq
];
postPatch = ''patchShebangs ./tests/process-extraction-examples.sh'';
meta = {
description = "A framework for extracting Coq programs to Elm";
maintainers = with maintainers; [ _4ever2 ];
license = licenses.mit;
};
}
pkgs/development/coq-modules/metacoq/default.nix
+2
View File
@@ -16,6 +16,7 @@ let
{ case = "8.17"; out = "1.3.1-8.17"; }
{ case = "8.18"; out = "1.3.1-8.18"; }
{ case = "8.19"; out = "1.3.2-8.19"; }
{ case = "8.20"; out = "1.3.2-8.20"; }
] null;
release = {
"1.0-beta2-8.11".sha256 = "sha256-I9YNk5Di6Udvq5/xpLSNflfjRyRH8fMnRzbo3uhpXNs=";
@@ -33,6 +34,7 @@ let
"1.3.1-8.18".sha256 = "sha256-L6Ym4Auwqaxv5tRmJLSVC812dxCqdUU5aN8+t5HVYzY=";
"1.3.1-8.19".sha256 = "sha256-fZED/Uel1jt5XF83dR6HfyhSkfBdLkET8C/ArDgsm64=";
"1.3.2-8.19".sha256 = "sha256-e5Pm1AhaQrO6JoZylSXYWmeXY033QflQuCBZhxGH8MA=";
"1.3.2-8.20".sha256 = "sha256-4J7Ly4Fc2E/I6YqvzTLntVVls5t94OUOjVMKJyyJdw8=";
};
releaseRev = v: "v${v}";
pkgs/development/libraries/ffmpegthumbnailer/default.nix
+5
View File
@@ -39,6 +39,11 @@ stdenv.mkDerivation rec {
--replace '$'{exec_prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@
'';
postInstall = ''
substituteInPlace $out/share/thumbnailers/ffmpegthumbnailer.thumbnailer \
--replace-fail '=ffmpegthumbnailer' "=$out/bin/ffmpegthumbnailer"
'';
meta = with lib; {
description = "Lightweight video thumbnailer";
longDescription = "FFmpegthumbnailer is a lightweight video
pkgs/development/libraries/libmysqlconnectorcpp/default.nix
+2 -2
View File
@@ -8,11 +8,11 @@
stdenv.mkDerivation rec {
pname = "libmysqlconnectorcpp";
version = "8.4.0";
version = "9.0.0";
src = fetchurl {
url = "https://cdn.mysql.com/Downloads/Connector-C++/mysql-connector-c++-${version}-src.tar.gz";
hash = "sha256-VAs9O00g7Pn5AL9Vu6hwcY5QZy9U+izbEkrfOFeWzos=";
hash = "sha256-7XEbT3sf/fyadgSOGVr/KH4tFd3evgvKhRsJ4UFCKzA=";
};
nativeBuildInputs = [
pkgs/development/libraries/rdkafka/default.nix
+2 -2
View File
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "rdkafka";
version = "2.4.0";
version = "2.5.3";
src = fetchFromGitHub {
owner = "confluentinc";
repo = "librdkafka";
rev = "v${version}";
sha256 = "sha256-RLjshOnMmCdlv73M8siIvBZ5kVG3v2XttkLVPU+BHY4=";
sha256 = "sha256-2AURPvhpgdIm034KEMm7Tmf8Zx/XER76aT6SiINs6wg=";
};
nativeBuildInputs = [ pkg-config python3 which ];
pkgs/development/python-modules/pyfwup/default.nix
+9 -7
View File
@@ -6,13 +6,12 @@
tqdm,
libusb1,
setuptools,
setuptools-git-versioning,
pythonOlder,
}:
buildPythonPackage rec {
pname = "pyfwup";
version = "0.5.0";
version = "0.5.2";
pyproject = true;
@@ -22,19 +21,22 @@ buildPythonPackage rec {
owner = "greatscottgadgets";
repo = "pyfwup";
rev = "refs/tags/${version}";
hash = "sha256-HZaR7X19kWb8w/VcnRHReGPkUBQ/u89BjmkTPpayoxE=";
hash = "sha256-Kyc3f8beTg0W1+U7SvZuNPN1pdsco9rBUfoEtR7AI44=";
};
postPatch = ''
substituteInPlace pyproject.toml \
--replace-fail '"setuptools-git-versioning<2"' "" \
--replace-fail 'dynamic = ["version"]' 'version = "${version}"'
'';
dependencies = [
pyusb
tqdm
libusb1
];
build-system = [
setuptools
setuptools-git-versioning
];
build-system = [ setuptools ];
pythonImportsCheck = [
"fwup"
pkgs/development/tools/go-mockery/default.nix
+2 -2
View File
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "go-mockery";
version = "2.45.0";
version = "2.45.1";
src = fetchFromGitHub {
owner = "vektra";
repo = "mockery";
rev = "v${version}";
sha256 = "sha256-k7mR5UJ9kk/jkjzqpS43/CrbNYPUCz4wJR2j/8HUd5c=";
sha256 = "sha256-9zekTcbojUtVaiA6JiWhY78qyDleNIreFwO3kTmffFg=";
};
preCheck = ''
pkgs/development/tools/systemfd/default.nix
+3 -3
View File
@@ -4,7 +4,7 @@
}:
let
version = "0.4.3";
version = "0.4.4";
in
rustPlatform.buildRustPackage {
@@ -16,10 +16,10 @@ rustPlatform.buildRustPackage {
repo = "systemfd";
owner = "mitsuhiko";
rev = version;
sha256 = "sha256-Ypt9/dqDrurhiEhahVk8gG3QxP2ZKTeL7F0IVUGE8Kw=";
sha256 = "sha256-U+pBKuoMhyIOhLl1nzmxk5yFt9nOq/KZ6rx9JhalLmM=";
};
cargoHash = "sha256-1t+yYqPDMEI39kieGkm+EUVzDBsTlDWQ7iGyjepjc7s=";
cargoHash = "sha256-k8FgdNVjFYO/lflVzRQUwHvdy4+eCNTnTYImdfy1GaQ=";
meta = {
description = "Convenient helper for passing sockets into another process";
pkgs/stdenv/freebsd/default.nix
-2
View File
@@ -485,7 +485,6 @@ in
# we can import the foundational libs from boot-0
# we can import bins and libs that DON'T get imported OR LINKED into the final stdenv from boot-0
curl = prevStage.curlReal;
curlReal = super.curl;
inherit (prevStage)
fetchurl
python3
@@ -511,7 +510,6 @@ in
name = "freebsd";
overrides = prevStage: self: super: {
__bootstrapArchive = bootstrapArchive;
curl = prevStage.curlReal;
fetchurl = prevStage.fetchurlReal;
freebsd = super.freebsd.overrideScope (
self': super': { localesPrev = prevStage.freebsd.localesReal; }
pkgs/tools/networking/netbird/default.nix
+3 -3
View File
@@ -31,16 +31,16 @@ let
in
buildGoModule rec {
pname = "netbird";
version = "0.28.9";
version = "0.29.0";
src = fetchFromGitHub {
owner = "netbirdio";
repo = "netbird";
rev = "v${version}";
hash = "sha256-SM288I+N645vzGmLO5hfDeFDqSJOe11+0VZVPneagHw=";
hash = "sha256-wzAvu8G1VJ/JLLxHwe4po/DkuLoAixLOx6XVatQThm8=";
};
vendorHash = "sha256-UlxylKiszgB2XQ4bZI23/YY/RsFCE7OlHT3DBsRhvCk=";
vendorHash = "sha256-YvfzqKjNxs2xaK0YSw3fNKluF3kIKu2KNSHhaLewNIw=";
nativeBuildInputs = [ installShellFiles ] ++ lib.optional ui pkg-config;
pkgs/top-level/all-packages.nix
-3
View File
@@ -34508,9 +34508,6 @@ with pkgs;
xfractint = callPackage ../applications/graphics/xfractint { };
xine-ui = callPackage ../applications/video/xine/ui.nix { };
xine-lib = callPackage ../applications/video/xine/lib.nix { };
xlsxgrep = callPackage ../applications/search/xlsxgrep { };
xmind = callPackage ../applications/misc/xmind { };
pkgs/top-level/coq-packages.nix
+1
View File
@@ -60,6 +60,7 @@ let
corn = callPackage ../development/coq-modules/corn {};
deriving = callPackage ../development/coq-modules/deriving {};
dpdgraph = callPackage ../development/coq-modules/dpdgraph {};
ElmExtraction = callPackage ../development/coq-modules/ElmExtraction {};
equations = callPackage ../development/coq-modules/equations { };
extructures = callPackage ../development/coq-modules/extructures { };
fiat_HEAD = callPackage ../development/coq-modules/fiat/HEAD.nix {};